205 files changed, 124809 insertions, 126876 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"
diff --git a/src/AppDirs.c b/src/AppDirs.c
index 8f16665..e305d97 100644
--- a/src/AppDirs.c
+++ b/src/AppDirs.c
@@ -1,4 +1,4 @@
-/* AppDirs.c generated by valac 0.34.7, the Vala compiler
+/* AppDirs.c generated by valac 0.36.6, the Vala compiler
  * generated from AppDirs.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -138,19 +138,19 @@ GFile* app_dirs_get_thumbnailer_bin (void);
 GFile* app_dirs_get_settings_migrator_bin (void);
 AppDirs* app_dirs_new (void);
 AppDirs* app_dirs_construct (GType object_type);
-static void app_dirs_finalize (AppDirs* obj);
+static void app_dirs_finalize (AppDirs * obj);
 
 
 void app_dirs_init (const gchar* arg0) {
 	GFile* exec_file = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	GFile* _tmp7_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
+	GFile* _tmp7_;
 #line 16 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	g_return_if_fail (arg0 != NULL);
 #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -191,8 +191,8 @@ void app_dirs_terminate (void) {
 
 GFile* app_dirs_get_home_dir (void) {
 	GFile* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	GFile* _tmp1_;
 #line 27 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = g_get_home_dir ();
 #line 27 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -215,16 +215,16 @@ static gpointer _g_object_ref0 (gpointer self) {
 GFile* app_dirs_get_cache_dir (void) {
 	GFile* result = NULL;
 	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp1_;
 #line 31 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp1_ = app_dirs_data_dir;
 #line 31 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp1_ == NULL) {
 #line 224 "AppDirs.c"
-		const gchar* _tmp2_ = NULL;
-		GFile* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
+		const gchar* _tmp2_;
+		GFile* _tmp3_;
+		GFile* _tmp4_;
+		GFile* _tmp5_;
 #line 32 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp2_ = g_get_user_cache_dir ();
 #line 32 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -241,8 +241,8 @@ GFile* app_dirs_get_cache_dir (void) {
 		_g_object_unref0 (_tmp4_);
 #line 243 "AppDirs.c"
 	} else {
-		GFile* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
+		GFile* _tmp6_;
+		GFile* _tmp7_;
 #line 33 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp6_ = app_dirs_data_dir;
 #line 33 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -263,58 +263,58 @@ GFile* app_dirs_get_cache_dir (void) {
 
 void app_dirs_try_migrate_data (void) {
 	GFile* user_plugin_dir = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	GFile* old_dir = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	GFile* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
+	GFile* _tmp7_;
+	GFile* _tmp8_;
 	gboolean _tmp9_ = FALSE;
-	GFile* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
+	GFile* _tmp10_;
+	gboolean _tmp11_;
 	GFile* new_dir = NULL;
-	GFile* _tmp21_ = NULL;
-	GFile* _tmp22_ = NULL;
-	GFile* _tmp23_ = NULL;
-	GFile* _tmp24_ = NULL;
+	GFile* _tmp21_;
+	GFile* _tmp22_;
+	GFile* _tmp23_;
+	GFile* _tmp24_;
 	gboolean _tmp25_ = FALSE;
-	GFile* _tmp26_ = NULL;
-	gboolean _tmp27_ = FALSE;
+	GFile* _tmp26_;
+	gboolean _tmp27_;
 	GFile* cache_dir = NULL;
-	GFile* _tmp30_ = NULL;
+	GFile* _tmp30_;
 	mode_t mask = {0};
-	mode_t _tmp31_ = {0};
-	GFile* _tmp32_ = NULL;
-	gboolean _tmp33_ = FALSE;
-	GFile* _tmp43_ = NULL;
-	GFile* _tmp44_ = NULL;
-	GFile* _tmp45_ = NULL;
-	gchar* _tmp46_ = NULL;
-	gchar* _tmp47_ = NULL;
-	GFile* _tmp48_ = NULL;
-	GFile* _tmp49_ = NULL;
-	GFile* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
-	gchar* _tmp52_ = NULL;
-	GFile* _tmp53_ = NULL;
-	GFile* _tmp54_ = NULL;
-	GFile* _tmp55_ = NULL;
-	gboolean _tmp56_ = FALSE;
-	gboolean _tmp57_ = FALSE;
-	GFile* _tmp71_ = NULL;
-	gchar* _tmp72_ = NULL;
-	gchar* _tmp73_ = NULL;
-	GFile* _tmp74_ = NULL;
-	gchar* _tmp75_ = NULL;
-	gchar* _tmp76_ = NULL;
-	GFile* _tmp77_ = NULL;
-	gchar* _tmp78_ = NULL;
-	gchar* _tmp79_ = NULL;
-	mode_t _tmp80_ = {0};
+	mode_t _tmp31_;
+	GFile* _tmp32_;
+	gboolean _tmp33_;
+	GFile* _tmp42_;
+	GFile* _tmp43_;
+	GFile* _tmp44_;
+	gchar* _tmp45_;
+	gchar* _tmp46_;
+	GFile* _tmp47_;
+	GFile* _tmp48_;
+	GFile* _tmp49_;
+	gchar* _tmp50_;
+	gchar* _tmp51_;
+	GFile* _tmp52_;
+	GFile* _tmp53_;
+	GFile* _tmp54_;
+	gboolean _tmp55_;
+	gboolean _tmp56_;
+	GFile* _tmp69_;
+	gchar* _tmp70_;
+	gchar* _tmp71_;
+	GFile* _tmp72_;
+	gchar* _tmp73_;
+	gchar* _tmp74_;
+	GFile* _tmp75_;
+	gchar* _tmp76_;
+	gchar* _tmp77_;
+	mode_t _tmp78_;
 	GError * _inner_error_ = NULL;
 #line 38 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_user_plugins_dir ();
@@ -351,10 +351,10 @@ void app_dirs_try_migrate_data (void) {
 #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp11_) {
 #line 354 "AppDirs.c"
-		GFile* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		GFile* _tmp14_ = NULL;
-		gboolean _tmp15_ = FALSE;
+		GFile* _tmp12_;
+		GFile* _tmp13_;
+		GFile* _tmp14_;
+		gboolean _tmp15_;
 #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp12_ = user_plugin_dir;
 #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -377,9 +377,9 @@ void app_dirs_try_migrate_data (void) {
 	if (_tmp9_) {
 #line 379 "AppDirs.c"
 		{
-			GFile* _tmp16_ = NULL;
-			GFile* _tmp17_ = NULL;
-			GFile* _tmp18_ = NULL;
+			GFile* _tmp16_;
+			GFile* _tmp17_;
+			GFile* _tmp18_;
 #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp16_ = user_plugin_dir;
 #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -393,11 +393,11 @@ void app_dirs_try_migrate_data (void) {
 #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 396 "AppDirs.c"
-				goto __catch443_g_error;
+				goto __catch444_g_error;
 			}
 		}
-		goto __finally443;
-		__catch443_g_error:
+		goto __finally444;
+		__catch444_g_error:
 		{
 			GError* err = NULL;
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -408,7 +408,7 @@ void app_dirs_try_migrate_data (void) {
 			_g_error_free0 (err);
 #line 410 "AppDirs.c"
 		}
-		__finally443:
+		__finally444:
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -425,8 +425,8 @@ void app_dirs_try_migrate_data (void) {
 		}
 	}
 	{
-		GFile* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
+		GFile* _tmp19_;
+		GFile* _tmp20_;
 #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp19_ = old_dir;
 #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -436,11 +436,11 @@ void app_dirs_try_migrate_data (void) {
 #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 439 "AppDirs.c"
-			goto __catch444_g_error;
+			goto __catch445_g_error;
 		}
 	}
-	goto __finally444;
-	__catch444_g_error:
+	goto __finally445;
+	__catch445_g_error:
 	{
 		GError* err = NULL;
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -451,7 +451,7 @@ void app_dirs_try_migrate_data (void) {
 		_g_error_free0 (err);
 #line 453 "AppDirs.c"
 	}
-	__finally444:
+	__finally445:
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -492,8 +492,8 @@ void app_dirs_try_migrate_data (void) {
 		_tmp25_ = TRUE;
 #line 494 "AppDirs.c"
 	} else {
-		GFile* _tmp28_ = NULL;
-		gboolean _tmp29_ = FALSE;
+		GFile* _tmp28_;
+		gboolean _tmp29_;
 #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp28_ = old_dir;
 #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -530,7 +530,7 @@ void app_dirs_try_migrate_data (void) {
 	if (!_tmp33_) {
 #line 532 "AppDirs.c"
 		{
-			GFile* _tmp34_ = NULL;
+			GFile* _tmp34_;
 #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp34_ = cache_dir;
 #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -538,52 +538,49 @@ void app_dirs_try_migrate_data (void) {
 #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 541 "AppDirs.c"
-				goto __catch445_g_error;
+				goto __catch446_g_error;
 			}
 		}
-		goto __finally445;
-		__catch445_g_error:
+		goto __finally446;
+		__catch446_g_error:
 		{
 			GError* err = NULL;
-			const gchar* _tmp35_ = NULL;
-			GFile* _tmp36_ = NULL;
-			gchar* _tmp37_ = NULL;
-			gchar* _tmp38_ = NULL;
-			GError* _tmp39_ = NULL;
-			const gchar* _tmp40_ = NULL;
-			gchar* _tmp41_ = NULL;
-			gchar* _tmp42_ = NULL;
+			GFile* _tmp35_;
+			gchar* _tmp36_;
+			gchar* _tmp37_;
+			GError* _tmp38_;
+			const gchar* _tmp39_;
+			gchar* _tmp40_;
+			gchar* _tmp41_;
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			err = _inner_error_;
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_inner_error_ = NULL;
 #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp35_ = _ ("Unable to create cache directory %s: %s");
-#line 64 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp36_ = cache_dir;
+			_tmp35_ = cache_dir;
 #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp37_ = g_file_get_path (_tmp36_);
+			_tmp36_ = g_file_get_path (_tmp35_);
 #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp38_ = _tmp37_;
+			_tmp37_ = _tmp36_;
 #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp39_ = err;
+			_tmp38_ = err;
 #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp40_ = _tmp39_->message;
+			_tmp39_ = _tmp38_->message;
 #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp41_ = g_strdup_printf (_tmp35_, _tmp38_, _tmp40_);
+			_tmp40_ = g_strdup_printf (_ ("Unable to create cache directory %s: %s"), _tmp37_, _tmp39_);
 #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp42_ = _tmp41_;
+			_tmp41_ = _tmp40_;
 #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			app_window_panic (_tmp42_);
+			app_window_panic (_tmp41_);
 #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_g_free0 (_tmp42_);
+			_g_free0 (_tmp41_);
 #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_g_free0 (_tmp38_);
+			_g_free0 (_tmp37_);
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_error_free0 (err);
-#line 585 "AppDirs.c"
+#line 582 "AppDirs.c"
 		}
-		__finally445:
+		__finally446:
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -600,125 +597,122 @@ void app_dirs_try_migrate_data (void) {
 			g_clear_error (&_inner_error_);
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return;
-#line 604 "AppDirs.c"
+#line 601 "AppDirs.c"
 		}
 	}
 #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp43_ = old_dir;
+	_tmp42_ = old_dir;
 #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp44_ = g_file_get_child (_tmp43_, "thumbs");
+	_tmp43_ = g_file_get_child (_tmp42_, "thumbs");
 #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp45_ = _tmp44_;
+	_tmp44_ = _tmp43_;
 #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp46_ = g_file_get_path (_tmp45_);
+	_tmp45_ = g_file_get_path (_tmp44_);
 #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp47_ = _tmp46_;
+	_tmp46_ = _tmp45_;
 #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp48_ = cache_dir;
+	_tmp47_ = cache_dir;
 #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp49_ = g_file_get_child (_tmp48_, "thumbs");
+	_tmp48_ = g_file_get_child (_tmp47_, "thumbs");
 #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp50_ = _tmp49_;
+	_tmp49_ = _tmp48_;
 #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp51_ = g_file_get_path (_tmp50_);
+	_tmp50_ = g_file_get_path (_tmp49_);
 #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp52_ = _tmp51_;
+	_tmp51_ = _tmp50_;
 #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	g_rename (_tmp47_, _tmp52_);
+	g_rename (_tmp46_, _tmp51_);
 #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_g_free0 (_tmp52_);
+	_g_free0 (_tmp51_);
 #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_g_object_unref0 (_tmp50_);
+	_g_object_unref0 (_tmp49_);
 #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_g_free0 (_tmp47_);
+	_g_free0 (_tmp46_);
 #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_g_object_unref0 (_tmp45_);
+	_g_object_unref0 (_tmp44_);
 #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp53_ = new_dir;
+	_tmp52_ = new_dir;
 #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp54_ = g_file_get_parent (_tmp53_);
+	_tmp53_ = g_file_get_parent (_tmp52_);
 #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp55_ = _tmp54_;
+	_tmp54_ = _tmp53_;
 #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp56_ = g_file_query_exists (_tmp55_, NULL);
+	_tmp55_ = g_file_query_exists (_tmp54_, NULL);
 #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp57_ = !_tmp56_;
+	_tmp56_ = !_tmp55_;
 #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_g_object_unref0 (_tmp55_);
+	_g_object_unref0 (_tmp54_);
 #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	if (_tmp57_) {
-#line 651 "AppDirs.c"
+	if (_tmp56_) {
+#line 648 "AppDirs.c"
 		{
-			GFile* _tmp58_ = NULL;
-			GFile* _tmp59_ = NULL;
-			GFile* _tmp60_ = NULL;
+			GFile* _tmp57_;
+			GFile* _tmp58_;
+			GFile* _tmp59_;
 #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp58_ = new_dir;
+			_tmp57_ = new_dir;
 #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp59_ = g_file_get_parent (_tmp58_);
+			_tmp58_ = g_file_get_parent (_tmp57_);
 #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp60_ = _tmp59_;
+			_tmp59_ = _tmp58_;
 #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			g_file_make_directory_with_parents (_tmp60_, NULL, &_inner_error_);
+			g_file_make_directory_with_parents (_tmp59_, NULL, &_inner_error_);
 #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_g_object_unref0 (_tmp60_);
+			_g_object_unref0 (_tmp59_);
 #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 668 "AppDirs.c"
-				goto __catch446_g_error;
+#line 665 "AppDirs.c"
+				goto __catch447_g_error;
 			}
 		}
-		goto __finally446;
-		__catch446_g_error:
+		goto __finally447;
+		__catch447_g_error:
 		{
 			GError* err = NULL;
-			const gchar* _tmp61_ = NULL;
-			GFile* _tmp62_ = NULL;
-			GFile* _tmp63_ = NULL;
-			GFile* _tmp64_ = NULL;
-			gchar* _tmp65_ = NULL;
-			gchar* _tmp66_ = NULL;
-			GError* _tmp67_ = NULL;
-			const gchar* _tmp68_ = NULL;
-			gchar* _tmp69_ = NULL;
-			gchar* _tmp70_ = NULL;
+			GFile* _tmp60_;
+			GFile* _tmp61_;
+			GFile* _tmp62_;
+			gchar* _tmp63_;
+			gchar* _tmp64_;
+			GError* _tmp65_;
+			const gchar* _tmp66_;
+			gchar* _tmp67_;
+			gchar* _tmp68_;
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			err = _inner_error_;
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_inner_error_ = NULL;
 #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp61_ = _ ("Unable to create data directory %s: %s");
-#line 74 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp62_ = new_dir;
+			_tmp60_ = new_dir;
 #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp63_ = g_file_get_parent (_tmp62_);
+			_tmp61_ = g_file_get_parent (_tmp60_);
 #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp64_ = _tmp63_;
+			_tmp62_ = _tmp61_;
 #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp65_ = g_file_get_path (_tmp64_);
+			_tmp63_ = g_file_get_path (_tmp62_);
 #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp66_ = _tmp65_;
+			_tmp64_ = _tmp63_;
 #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp67_ = err;
+			_tmp65_ = err;
 #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp68_ = _tmp67_->message;
+			_tmp66_ = _tmp65_->message;
 #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp69_ = g_strdup_printf (_tmp61_, _tmp66_, _tmp68_);
+			_tmp67_ = g_strdup_printf (_ ("Unable to create data directory %s: %s"), _tmp64_, _tmp66_);
 #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp70_ = _tmp69_;
+			_tmp68_ = _tmp67_;
 #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			app_window_panic (_tmp70_);
+			app_window_panic (_tmp68_);
 #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_g_free0 (_tmp70_);
+			_g_free0 (_tmp68_);
 #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_g_free0 (_tmp66_);
+			_g_free0 (_tmp64_);
 #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_g_object_unref0 (_tmp64_);
+			_g_object_unref0 (_tmp62_);
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_error_free0 (err);
-#line 720 "AppDirs.c"
+#line 714 "AppDirs.c"
 		}
-		__finally446:
+		__finally447:
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -735,41 +729,41 @@ void app_dirs_try_migrate_data (void) {
 			g_clear_error (&_inner_error_);
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return;
-#line 739 "AppDirs.c"
+#line 733 "AppDirs.c"
 		}
 	}
 #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp71_ = old_dir;
+	_tmp69_ = old_dir;
 #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp72_ = g_file_get_path (_tmp71_);
+	_tmp70_ = g_file_get_path (_tmp69_);
 #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp73_ = _tmp72_;
+	_tmp71_ = _tmp70_;
 #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp74_ = new_dir;
+	_tmp72_ = new_dir;
 #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp75_ = g_file_get_path (_tmp74_);
+	_tmp73_ = g_file_get_path (_tmp72_);
 #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp76_ = _tmp75_;
+	_tmp74_ = _tmp73_;
 #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	g_rename (_tmp73_, _tmp76_);
+	g_rename (_tmp71_, _tmp74_);
 #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_g_free0 (_tmp76_);
+	_g_free0 (_tmp74_);
 #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_g_free0 (_tmp73_);
+	_g_free0 (_tmp71_);
 #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp77_ = new_dir;
+	_tmp75_ = new_dir;
 #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp78_ = g_file_get_path (_tmp77_);
+	_tmp76_ = g_file_get_path (_tmp75_);
 #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp79_ = _tmp78_;
+	_tmp77_ = _tmp76_;
 #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	g_chmod (_tmp79_, 0700);
+	g_chmod (_tmp77_, 0700);
 #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_g_free0 (_tmp79_);
+	_g_free0 (_tmp77_);
 #line 81 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp80_ = mask;
+	_tmp78_ = mask;
 #line 81 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	umask (_tmp80_);
+	umask (_tmp78_);
 #line 36 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (cache_dir);
 #line 36 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -778,22 +772,22 @@ void app_dirs_try_migrate_data (void) {
 	_g_object_unref0 (old_dir);
 #line 36 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (user_plugin_dir);
-#line 782 "AppDirs.c"
+#line 776 "AppDirs.c"
 }
 
 
 void app_dirs_set_data_dir (const gchar* user_data_dir) {
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GFile* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
+	GFile* _tmp2_;
 	gchar* path = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	GFile* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	const gchar* _tmp5_;
+	gboolean _tmp6_;
+	GFile* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
 #line 85 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	g_return_if_fail (user_data_dir != NULL);
 #line 85 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -818,11 +812,11 @@ void app_dirs_set_data_dir (const gchar* user_data_dir) {
 	_tmp6_ = g_path_is_absolute (_tmp5_);
 #line 90 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp6_) {
-#line 822 "AppDirs.c"
-		GFile* _tmp7_ = NULL;
-		GFile* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
+#line 816 "AppDirs.c"
+		GFile* _tmp7_;
+		GFile* _tmp8_;
+		const gchar* _tmp9_;
+		GFile* _tmp10_;
 #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp7_ = app_dirs_get_home_dir ();
 #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -837,10 +831,10 @@ void app_dirs_set_data_dir (const gchar* user_data_dir) {
 		app_dirs_data_dir = _tmp10_;
 #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp8_);
-#line 841 "AppDirs.c"
+#line 835 "AppDirs.c"
 	} else {
-		const gchar* _tmp11_ = NULL;
-		GFile* _tmp12_ = NULL;
+		const gchar* _tmp11_;
+		GFile* _tmp12_;
 #line 93 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp11_ = path;
 #line 93 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -849,7 +843,7 @@ void app_dirs_set_data_dir (const gchar* user_data_dir) {
 		_g_object_unref0 (app_dirs_data_dir);
 #line 93 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		app_dirs_data_dir = _tmp12_;
-#line 853 "AppDirs.c"
+#line 847 "AppDirs.c"
 	}
 #line 95 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp13_ = app_dirs_data_dir;
@@ -863,84 +857,81 @@ void app_dirs_set_data_dir (const gchar* user_data_dir) {
 	_g_free0 (_tmp15_);
 #line 85 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_free0 (path);
-#line 867 "AppDirs.c"
+#line 861 "AppDirs.c"
 }
 
 
 void app_dirs_verify_data_dir (void) {
 	GFile* data_dir = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 99 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_data_dir ();
 #line 99 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	data_dir = _tmp0_;
-#line 879 "AppDirs.c"
+#line 873 "AppDirs.c"
 	{
-		GFile* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		GFile* _tmp1_;
+		gboolean _tmp2_;
 #line 101 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp1_ = data_dir;
 #line 101 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp2_ = g_file_query_exists (_tmp1_, NULL);
 #line 101 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (!_tmp2_) {
-#line 889 "AppDirs.c"
-			GFile* _tmp3_ = NULL;
+#line 883 "AppDirs.c"
+			GFile* _tmp3_;
 #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp3_ = data_dir;
 #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			g_file_make_directory_with_parents (_tmp3_, NULL, &_inner_error_);
 #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 897 "AppDirs.c"
-				goto __catch447_g_error;
+#line 891 "AppDirs.c"
+				goto __catch448_g_error;
 			}
 		}
 	}
-	goto __finally447;
-	__catch447_g_error:
+	goto __finally448;
+	__catch448_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
+		GFile* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		GError* _tmp7_;
+		const gchar* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		err = _inner_error_;
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_inner_error_ = NULL;
 #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp4_ = _ ("Unable to create data directory %s: %s");
-#line 104 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp5_ = data_dir;
+		_tmp4_ = data_dir;
 #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp6_ = g_file_get_path (_tmp5_);
+		_tmp5_ = g_file_get_path (_tmp4_);
 #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp7_ = _tmp6_;
+		_tmp6_ = _tmp5_;
 #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp8_ = err;
+		_tmp7_ = err;
 #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp9_ = _tmp8_->message;
+		_tmp8_ = _tmp7_->message;
 #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp10_ = g_strdup_printf (_tmp4_, _tmp7_, _tmp9_);
+		_tmp9_ = g_strdup_printf (_ ("Unable to create data directory %s: %s"), _tmp6_, _tmp8_);
 #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp11_ = _tmp10_;
+		_tmp10_ = _tmp9_;
 #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		app_window_panic (_tmp11_);
+		app_window_panic (_tmp10_);
 #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_g_free0 (_tmp11_);
+		_g_free0 (_tmp10_);
 #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_g_free0 (_tmp7_);
+		_g_free0 (_tmp6_);
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_error_free0 (err);
-#line 942 "AppDirs.c"
+#line 933 "AppDirs.c"
 	}
-	__finally447:
+	__finally448:
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -951,88 +942,85 @@ void app_dirs_verify_data_dir (void) {
 		g_clear_error (&_inner_error_);
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return;
-#line 955 "AppDirs.c"
+#line 946 "AppDirs.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (data_dir);
-#line 959 "AppDirs.c"
+#line 950 "AppDirs.c"
 }
 
 
 void app_dirs_verify_cache_dir (void) {
 	GFile* cache_dir = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 110 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_cache_dir ();
 #line 110 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	cache_dir = _tmp0_;
-#line 971 "AppDirs.c"
+#line 962 "AppDirs.c"
 	{
-		GFile* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		GFile* _tmp1_;
+		gboolean _tmp2_;
 #line 112 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp1_ = cache_dir;
 #line 112 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp2_ = g_file_query_exists (_tmp1_, NULL);
 #line 112 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (!_tmp2_) {
-#line 981 "AppDirs.c"
-			GFile* _tmp3_ = NULL;
+#line 972 "AppDirs.c"
+			GFile* _tmp3_;
 #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp3_ = cache_dir;
 #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			g_file_make_directory_with_parents (_tmp3_, NULL, &_inner_error_);
 #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 989 "AppDirs.c"
-				goto __catch448_g_error;
+#line 980 "AppDirs.c"
+				goto __catch449_g_error;
 			}
 		}
 	}
-	goto __finally448;
-	__catch448_g_error:
+	goto __finally449;
+	__catch449_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
+		GFile* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		GError* _tmp7_;
+		const gchar* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		err = _inner_error_;
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_inner_error_ = NULL;
 #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp4_ = _ ("Unable to create cache directory %s: %s");
+		_tmp4_ = cache_dir;
 #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp5_ = cache_dir;
+		_tmp5_ = g_file_get_path (_tmp4_);
 #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp6_ = g_file_get_path (_tmp5_);
-#line 115 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp7_ = _tmp6_;
+		_tmp6_ = _tmp5_;
 #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp8_ = err;
+		_tmp7_ = err;
 #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp9_ = _tmp8_->message;
+		_tmp8_ = _tmp7_->message;
 #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp10_ = g_strdup_printf (_tmp4_, _tmp7_, _tmp9_);
+		_tmp9_ = g_strdup_printf (_ ("Unable to create cache directory %s: %s"), _tmp6_, _tmp8_);
 #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp11_ = _tmp10_;
+		_tmp10_ = _tmp9_;
 #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		app_window_panic (_tmp11_);
+		app_window_panic (_tmp10_);
 #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_g_free0 (_tmp11_);
+		_g_free0 (_tmp10_);
 #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_g_free0 (_tmp7_);
+		_g_free0 (_tmp6_);
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_error_free0 (err);
-#line 1034 "AppDirs.c"
+#line 1022 "AppDirs.c"
 	}
-	__finally448:
+	__finally449:
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1043,11 +1031,11 @@ void app_dirs_verify_cache_dir (void) {
 		g_clear_error (&_inner_error_);
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return;
-#line 1047 "AppDirs.c"
+#line 1035 "AppDirs.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (cache_dir);
-#line 1051 "AppDirs.c"
+#line 1039 "AppDirs.c"
 }
 
 
@@ -1057,17 +1045,17 @@ void app_dirs_verify_cache_dir (void) {
      */
 GFile* app_dirs_get_libexec_dir (void) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp6_ = NULL;
-	GFile* _tmp7_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp6_;
+	GFile* _tmp7_;
 #line 125 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_libexec_dir;
 #line 125 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp0_ == NULL) {
-#line 1068 "AppDirs.c"
-		GFile* _tmp1_ = NULL;
-		GFile* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+#line 1056 "AppDirs.c"
+		GFile* _tmp1_;
+		GFile* _tmp2_;
+		gboolean _tmp3_;
 #line 126 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp1_ = app_dirs_get_install_dir ();
 #line 126 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1078,24 +1066,24 @@ GFile* app_dirs_get_libexec_dir (void) {
 		_g_object_unref0 (_tmp2_);
 #line 126 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (_tmp3_) {
-#line 1082 "AppDirs.c"
-			GFile* _tmp4_ = NULL;
+#line 1070 "AppDirs.c"
+			GFile* _tmp4_;
 #line 128 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp4_ = app_dirs_get_exec_dir ();
 #line 128 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_object_unref0 (app_dirs_libexec_dir);
 #line 128 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			app_dirs_libexec_dir = _tmp4_;
-#line 1090 "AppDirs.c"
+#line 1078 "AppDirs.c"
 		} else {
-			GFile* _tmp5_ = NULL;
+			GFile* _tmp5_;
 #line 130 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp5_ = g_file_new_for_path (RESOURCES_LIBEXECDIR);
 #line 130 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_object_unref0 (app_dirs_libexec_dir);
 #line 130 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			app_dirs_libexec_dir = _tmp5_;
-#line 1099 "AppDirs.c"
+#line 1087 "AppDirs.c"
 		}
 	}
 #line 134 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1106,14 +1094,14 @@ GFile* app_dirs_get_libexec_dir (void) {
 	result = _tmp7_;
 #line 134 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1110 "AppDirs.c"
+#line 1098 "AppDirs.c"
 }
 
 
 GFile* app_dirs_get_install_dir (void) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 139 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_exec_dir;
 #line 139 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1122,23 +1110,23 @@ GFile* app_dirs_get_install_dir (void) {
 	result = _tmp1_;
 #line 139 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1126 "AppDirs.c"
+#line 1114 "AppDirs.c"
 }
 
 
 GFile* app_dirs_get_data_dir (void) {
 	GFile* result = NULL;
 	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp1_;
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp1_ = app_dirs_data_dir;
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp1_ == NULL) {
-#line 1138 "AppDirs.c"
-		const gchar* _tmp2_ = NULL;
-		GFile* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
+#line 1126 "AppDirs.c"
+		const gchar* _tmp2_;
+		GFile* _tmp3_;
+		GFile* _tmp4_;
+		GFile* _tmp5_;
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp2_ = g_get_user_data_dir ();
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1153,10 +1141,10 @@ GFile* app_dirs_get_data_dir (void) {
 		_tmp0_ = _tmp5_;
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp4_);
-#line 1157 "AppDirs.c"
+#line 1145 "AppDirs.c"
 	} else {
-		GFile* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
+		GFile* _tmp6_;
+		GFile* _tmp7_;
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp6_ = app_dirs_data_dir;
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1165,34 +1153,33 @@ GFile* app_dirs_get_data_dir (void) {
 		_g_object_unref0 (_tmp0_);
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp0_ = _tmp7_;
-#line 1169 "AppDirs.c"
+#line 1157 "AppDirs.c"
 	}
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = _tmp0_;
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1175 "AppDirs.c"
+#line 1163 "AppDirs.c"
 }
 
 
 GFile* app_dirs_get_import_dir (void) {
 	GFile* result = NULL;
 	gchar* path = NULL;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	const gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	gboolean _tmp20_ = FALSE;
-	GFile* _tmp23_ = NULL;
-	GFile* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	GFile* _tmp26_ = NULL;
-	GFile* _tmp27_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gboolean _tmp5_;
+	const gchar* _tmp17_;
+	gchar* _tmp18_;
+	const gchar* _tmp19_;
+	gboolean _tmp20_;
+	GFile* _tmp23_;
+	GFile* _tmp24_;
+	GFile* _tmp25_;
+	GFile* _tmp26_;
 #line 149 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = config_facade_get_instance ();
 #line 149 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1211,13 +1198,13 @@ GFile* app_dirs_get_import_dir (void) {
 	_tmp5_ = is_string_empty (_tmp4_);
 #line 150 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp5_) {
-#line 1215 "AppDirs.c"
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
-		const gchar* _tmp15_ = NULL;
-		GFile* _tmp16_ = NULL;
+#line 1202 "AppDirs.c"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		const gchar* _tmp8_;
+		gboolean _tmp9_;
+		const gchar* _tmp15_;
+		GFile* _tmp16_;
 #line 152 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp6_ = path;
 #line 152 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1232,12 +1219,12 @@ GFile* app_dirs_get_import_dir (void) {
 		_tmp9_ = g_path_is_absolute (_tmp8_);
 #line 155 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (!_tmp9_) {
-#line 1236 "AppDirs.c"
-			GFile* _tmp10_ = NULL;
-			GFile* _tmp11_ = NULL;
-			const gchar* _tmp12_ = NULL;
-			GFile* _tmp13_ = NULL;
-			GFile* _tmp14_ = NULL;
+#line 1223 "AppDirs.c"
+			GFile* _tmp10_;
+			GFile* _tmp11_;
+			const gchar* _tmp12_;
+			GFile* _tmp13_;
+			GFile* _tmp14_;
 #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp10_ = app_dirs_get_home_dir ();
 #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1256,7 +1243,7 @@ GFile* app_dirs_get_import_dir (void) {
 			_g_free0 (path);
 #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return result;
-#line 1260 "AppDirs.c"
+#line 1247 "AppDirs.c"
 		}
 #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp15_ = path;
@@ -1268,7 +1255,7 @@ GFile* app_dirs_get_import_dir (void) {
 		_g_free0 (path);
 #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return result;
-#line 1272 "AppDirs.c"
+#line 1259 "AppDirs.c"
 	}
 #line 163 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp17_ = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES);
@@ -1284,9 +1271,9 @@ GFile* app_dirs_get_import_dir (void) {
 	_tmp20_ = is_string_empty (_tmp19_);
 #line 164 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp20_) {
-#line 1288 "AppDirs.c"
-		const gchar* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
+#line 1275 "AppDirs.c"
+		const gchar* _tmp21_;
+		GFile* _tmp22_;
 #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp21_ = path;
 #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1297,57 +1284,55 @@ GFile* app_dirs_get_import_dir (void) {
 		_g_free0 (path);
 #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return result;
-#line 1301 "AppDirs.c"
+#line 1288 "AppDirs.c"
 	}
 #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp23_ = app_dirs_get_home_dir ();
 #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp24_ = _tmp23_;
 #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp25_ = _ ("Pictures");
-#line 168 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp26_ = g_file_get_child (_tmp24_, _tmp25_);
+	_tmp25_ = g_file_get_child (_tmp24_, _ ("Pictures"));
 #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp27_ = _tmp26_;
+	_tmp26_ = _tmp25_;
 #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp24_);
 #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	result = _tmp27_;
+	result = _tmp26_;
 #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_free0 (path);
 #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1321 "AppDirs.c"
+#line 1306 "AppDirs.c"
 }
 
 
 GFile* app_dirs_get_baked_import_dir (time_t tm) {
 	GFile* result = NULL;
 	gchar* pattern = NULL;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	const gchar* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gboolean _tmp5_;
+	const gchar* _tmp9_;
+	gboolean _tmp10_;
 	GDateTime* date = NULL;
-	time_t _tmp12_ = 0;
-	GDateTime* _tmp13_ = NULL;
-	GFile* _tmp14_ = NULL;
-	GFile* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	GFile* _tmp25_ = NULL;
-	GFile* _tmp26_ = NULL;
+	time_t _tmp12_;
+	GDateTime* _tmp13_;
+	GFile* _tmp14_;
+	GFile* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
+	const gchar* _tmp20_;
+	gchar* _tmp21_;
+	gchar* _tmp22_;
+	gchar* _tmp23_;
+	gchar* _tmp24_;
+	GFile* _tmp25_;
+	GFile* _tmp26_;
 #line 173 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = config_facade_get_instance ();
 #line 173 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1366,10 +1351,10 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) {
 	_tmp5_ = is_string_empty (_tmp4_);
 #line 174 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp5_) {
-#line 1370 "AppDirs.c"
-		ConfigFacade* _tmp6_ = NULL;
-		ConfigFacade* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
+#line 1355 "AppDirs.c"
+		ConfigFacade* _tmp6_;
+		ConfigFacade* _tmp7_;
+		gchar* _tmp8_;
 #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp6_ = config_facade_get_instance ();
 #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1382,7 +1367,7 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) {
 		pattern = _tmp8_;
 #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1386 "AppDirs.c"
+#line 1371 "AppDirs.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp9_ = pattern;
@@ -1390,15 +1375,15 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) {
 	_tmp10_ = is_string_empty (_tmp9_);
 #line 176 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp10_) {
-#line 1394 "AppDirs.c"
-		gchar* _tmp11_ = NULL;
+#line 1379 "AppDirs.c"
+		gchar* _tmp11_;
 #line 177 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp11_ = g_strdup ("%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d");
 #line 177 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_free0 (pattern);
 #line 177 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		pattern = _tmp11_;
-#line 1402 "AppDirs.c"
+#line 1387 "AppDirs.c"
 	}
 #line 179 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp12_ = tm;
@@ -1450,18 +1435,18 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) {
 	_g_free0 (pattern);
 #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1454 "AppDirs.c"
+#line 1439 "AppDirs.c"
 }
 
 
 gboolean app_dirs_is_in_import_dir (GFile* file) {
 	gboolean result = FALSE;
 	GFile* import_dir = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	gboolean _tmp4_;
 #line 184 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 185 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1478,11 +1463,11 @@ gboolean app_dirs_is_in_import_dir (GFile* file) {
 	if (_tmp4_) {
 #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp1_ = TRUE;
-#line 1482 "AppDirs.c"
+#line 1467 "AppDirs.c"
 	} else {
-		GFile* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+		GFile* _tmp5_;
+		GFile* _tmp6_;
+		gboolean _tmp7_;
 #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp5_ = file;
 #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1491,7 +1476,7 @@ gboolean app_dirs_is_in_import_dir (GFile* file) {
 		_tmp7_ = g_file_equal (_tmp5_, _tmp6_);
 #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp1_ = _tmp7_;
-#line 1495 "AppDirs.c"
+#line 1480 "AppDirs.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = _tmp1_;
@@ -1499,14 +1484,14 @@ gboolean app_dirs_is_in_import_dir (GFile* file) {
 	_g_object_unref0 (import_dir);
 #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1503 "AppDirs.c"
+#line 1488 "AppDirs.c"
 }
 
 
 void app_dirs_set_import_dir (const gchar* path) {
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	const gchar* _tmp2_;
 #line 190 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	g_return_if_fail (path != NULL);
 #line 191 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1519,14 +1504,14 @@ void app_dirs_set_import_dir (const gchar* path) {
 	configuration_facade_set_import_dir (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_);
 #line 191 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1523 "AppDirs.c"
+#line 1508 "AppDirs.c"
 }
 
 
 GFile* app_dirs_get_exec_dir (void) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 195 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_exec_dir;
 #line 195 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1535,26 +1520,26 @@ GFile* app_dirs_get_exec_dir (void) {
 	result = _tmp1_;
 #line 195 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1539 "AppDirs.c"
+#line 1524 "AppDirs.c"
 }
 
 
 GFile* app_dirs_get_temp_dir (void) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp17_ = NULL;
-	GFile* _tmp18_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp16_;
+	GFile* _tmp17_;
 	GError * _inner_error_ = NULL;
 #line 199 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_tmp_dir;
 #line 199 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp0_ == NULL) {
-#line 1553 "AppDirs.c"
-		const gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
+#line 1538 "AppDirs.c"
+		const gchar* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		GFile* _tmp5_;
 #line 200 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp1_ = g_get_tmp_dir ();
 #line 200 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1571,72 +1556,69 @@ GFile* app_dirs_get_temp_dir (void) {
 		app_dirs_tmp_dir = _tmp5_;
 #line 200 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_free0 (_tmp4_);
-#line 1575 "AppDirs.c"
+#line 1560 "AppDirs.c"
 		{
-			GFile* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GFile* _tmp6_;
+			gboolean _tmp7_;
 #line 203 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp6_ = app_dirs_tmp_dir;
 #line 203 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp7_ = g_file_query_exists (_tmp6_, NULL);
 #line 203 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (!_tmp7_) {
-#line 1585 "AppDirs.c"
-				GFile* _tmp8_ = NULL;
+#line 1570 "AppDirs.c"
+				GFile* _tmp8_;
 #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				_tmp8_ = app_dirs_tmp_dir;
 #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				g_file_make_directory_with_parents (_tmp8_, NULL, &_inner_error_);
 #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1593 "AppDirs.c"
-					goto __catch449_g_error;
+#line 1578 "AppDirs.c"
+					goto __catch450_g_error;
 				}
 			}
 		}
-		goto __finally449;
-		__catch449_g_error:
+		goto __finally450;
+		__catch450_g_error:
 		{
 			GError* err = NULL;
-			const gchar* _tmp9_ = NULL;
-			GFile* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-			gchar* _tmp12_ = NULL;
-			GError* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			gchar* _tmp15_ = NULL;
-			gchar* _tmp16_ = NULL;
+			GFile* _tmp9_;
+			gchar* _tmp10_;
+			gchar* _tmp11_;
+			GError* _tmp12_;
+			const gchar* _tmp13_;
+			gchar* _tmp14_;
+			gchar* _tmp15_;
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			err = _inner_error_;
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_inner_error_ = NULL;
 #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp9_ = _ ("Unable to create temporary directory %s: %s");
+			_tmp9_ = app_dirs_tmp_dir;
 #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp10_ = app_dirs_tmp_dir;
+			_tmp10_ = g_file_get_path (_tmp9_);
 #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp11_ = g_file_get_path (_tmp10_);
-#line 206 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp12_ = _tmp11_;
+			_tmp11_ = _tmp10_;
 #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp13_ = err;
+			_tmp12_ = err;
 #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp14_ = _tmp13_->message;
+			_tmp13_ = _tmp12_->message;
 #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp15_ = g_strdup_printf (_tmp9_, _tmp12_, _tmp14_);
+			_tmp14_ = g_strdup_printf (_ ("Unable to create temporary directory %s: %s"), _tmp11_, _tmp13_);
 #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp16_ = _tmp15_;
+			_tmp15_ = _tmp14_;
 #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			app_window_panic (_tmp16_);
+			app_window_panic (_tmp15_);
 #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_g_free0 (_tmp16_);
+			_g_free0 (_tmp15_);
 #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_g_free0 (_tmp12_);
+			_g_free0 (_tmp11_);
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_error_free0 (err);
-#line 1638 "AppDirs.c"
+#line 1620 "AppDirs.c"
 		}
-		__finally449:
+		__finally450:
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1645,30 +1627,30 @@ GFile* app_dirs_get_temp_dir (void) {
 			g_clear_error (&_inner_error_);
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return NULL;
-#line 1649 "AppDirs.c"
+#line 1631 "AppDirs.c"
 		}
 	}
 #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp17_ = app_dirs_tmp_dir;
+	_tmp16_ = app_dirs_tmp_dir;
 #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp18_ = _g_object_ref0 (_tmp17_);
+	_tmp17_ = _g_object_ref0 (_tmp16_);
 #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	result = _tmp18_;
+	result = _tmp17_;
 #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1660 "AppDirs.c"
+#line 1642 "AppDirs.c"
 }
 
 
 GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 	GFile* result = NULL;
 	GFile* subdir = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	const gchar* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
+	const gchar* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 214 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	g_return_val_if_fail (name != NULL, NULL);
@@ -1690,10 +1672,10 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 	_tmp5_ = subname;
 #line 216 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp5_ != NULL) {
-#line 1694 "AppDirs.c"
-		GFile* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		GFile* _tmp8_ = NULL;
+#line 1676 "AppDirs.c"
+		GFile* _tmp6_;
+		const gchar* _tmp7_;
+		GFile* _tmp8_;
 #line 217 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp6_ = subdir;
 #line 217 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1704,73 +1686,70 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 		_g_object_unref0 (subdir);
 #line 217 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		subdir = _tmp8_;
-#line 1708 "AppDirs.c"
+#line 1690 "AppDirs.c"
 	}
 	{
-		GFile* _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
+		GFile* _tmp9_;
+		gboolean _tmp10_;
 #line 220 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp9_ = subdir;
 #line 220 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp10_ = g_file_query_exists (_tmp9_, NULL);
 #line 220 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (!_tmp10_) {
-#line 1719 "AppDirs.c"
-			GFile* _tmp11_ = NULL;
+#line 1701 "AppDirs.c"
+			GFile* _tmp11_;
 #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp11_ = subdir;
 #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			g_file_make_directory_with_parents (_tmp11_, NULL, &_inner_error_);
 #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1727 "AppDirs.c"
-				goto __catch450_g_error;
+#line 1709 "AppDirs.c"
+				goto __catch451_g_error;
 			}
 		}
 	}
-	goto __finally450;
-	__catch450_g_error:
+	goto __finally451;
+	__catch451_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		GError* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
+		GFile* _tmp12_;
+		gchar* _tmp13_;
+		gchar* _tmp14_;
+		GError* _tmp15_;
+		const gchar* _tmp16_;
+		gchar* _tmp17_;
+		gchar* _tmp18_;
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		err = _inner_error_;
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_inner_error_ = NULL;
 #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp12_ = _ ("Unable to create data subdirectory %s: %s");
+		_tmp12_ = subdir;
 #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp13_ = subdir;
-#line 223 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp14_ = g_file_get_path (_tmp13_);
+		_tmp13_ = g_file_get_path (_tmp12_);
 #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp15_ = _tmp14_;
+		_tmp14_ = _tmp13_;
 #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp16_ = err;
+		_tmp15_ = err;
 #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp17_ = _tmp16_->message;
+		_tmp16_ = _tmp15_->message;
 #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp18_ = g_strdup_printf (_tmp12_, _tmp15_, _tmp17_);
+		_tmp17_ = g_strdup_printf (_ ("Unable to create data subdirectory %s: %s"), _tmp14_, _tmp16_);
 #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp19_ = _tmp18_;
+		_tmp18_ = _tmp17_;
 #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		app_window_panic (_tmp19_);
+		app_window_panic (_tmp18_);
 #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_g_free0 (_tmp19_);
+		_g_free0 (_tmp18_);
 #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_g_free0 (_tmp15_);
+		_g_free0 (_tmp14_);
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_error_free0 (err);
-#line 1772 "AppDirs.c"
+#line 1751 "AppDirs.c"
 	}
-	__finally450:
+	__finally451:
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1781,19 +1760,19 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 		g_clear_error (&_inner_error_);
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return NULL;
-#line 1785 "AppDirs.c"
+#line 1764 "AppDirs.c"
 	}
 #line 227 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = subdir;
 #line 227 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1791 "AppDirs.c"
+#line 1770 "AppDirs.c"
 }
 
 
 void app_dirs_ensure_writable (GFile* dir) {
-	GFile* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GFile* _tmp0_;
+	gboolean _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 230 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	g_return_if_fail (G_IS_FILE (dir));
@@ -1803,18 +1782,18 @@ void app_dirs_ensure_writable (GFile* dir) {
 	_tmp1_ = g_file_query_exists (_tmp0_, NULL);
 #line 231 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp1_) {
-#line 1807 "AppDirs.c"
+#line 1786 "AppDirs.c"
 		{
 			GFileInfo* info = NULL;
-			GFile* _tmp2_ = NULL;
-			GFileInfo* _tmp3_ = NULL;
+			GFile* _tmp2_;
+			GFileInfo* _tmp3_;
 			guint32 mode = 0U;
-			GFileInfo* _tmp4_ = NULL;
-			guint32 _tmp5_ = 0U;
+			GFileInfo* _tmp4_;
+			guint32 _tmp5_;
 			gboolean _tmp6_ = FALSE;
-			GFile* _tmp7_ = NULL;
-			guint32 _tmp8_ = 0U;
-			gboolean _tmp9_ = FALSE;
+			GFile* _tmp7_;
+			guint32 _tmp8_;
+			gboolean _tmp9_;
 #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp2_ = dir;
 #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1823,8 +1802,8 @@ void app_dirs_ensure_writable (GFile* dir) {
 			info = _tmp3_;
 #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1827 "AppDirs.c"
-				goto __catch451_g_error;
+#line 1806 "AppDirs.c"
+				goto __catch452_g_error;
 			}
 #line 234 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp4_ = info;
@@ -1844,85 +1823,79 @@ void app_dirs_ensure_writable (GFile* dir) {
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				_g_object_unref0 (info);
-#line 1848 "AppDirs.c"
-				goto __catch451_g_error;
+#line 1827 "AppDirs.c"
+				goto __catch452_g_error;
 			}
 #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (!_tmp6_) {
-#line 1853 "AppDirs.c"
-				const gchar* _tmp10_ = NULL;
-				GFile* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
-				gchar* _tmp13_ = NULL;
-				gchar* _tmp14_ = NULL;
-				gchar* _tmp15_ = NULL;
-#line 236 "/home/jens/Source/shotwell/src/AppDirs.vala"
-				_tmp10_ = _ ("Could not make directory %s writable");
+#line 1832 "AppDirs.c"
+				GFile* _tmp10_;
+				gchar* _tmp11_;
+				gchar* _tmp12_;
+				gchar* _tmp13_;
+				gchar* _tmp14_;
 #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala"
-				_tmp11_ = dir;
+				_tmp10_ = dir;
 #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala"
-				_tmp12_ = g_file_get_path (_tmp11_);
+				_tmp11_ = g_file_get_path (_tmp10_);
 #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala"
-				_tmp13_ = _tmp12_;
+				_tmp12_ = _tmp11_;
 #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala"
-				_tmp14_ = g_strdup_printf (_tmp10_, _tmp13_);
+				_tmp13_ = g_strdup_printf (_ ("Could not make directory %s writable"), _tmp12_);
 #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala"
-				_tmp15_ = _tmp14_;
+				_tmp14_ = _tmp13_;
 #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala"
-				app_window_panic (_tmp15_);
+				app_window_panic (_tmp14_);
 #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala"
-				_g_free0 (_tmp15_);
+				_g_free0 (_tmp14_);
 #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala"
-				_g_free0 (_tmp13_);
-#line 1878 "AppDirs.c"
+				_g_free0 (_tmp12_);
+#line 1854 "AppDirs.c"
 			}
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_object_unref0 (info);
-#line 1882 "AppDirs.c"
+#line 1858 "AppDirs.c"
 		}
-		goto __finally451;
-		__catch451_g_error:
+		goto __finally452;
+		__catch452_g_error:
 		{
 			GError* err = NULL;
-			const gchar* _tmp16_ = NULL;
-			GFile* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
-			GError* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
-			gchar* _tmp22_ = NULL;
-			gchar* _tmp23_ = NULL;
+			GFile* _tmp15_;
+			gchar* _tmp16_;
+			gchar* _tmp17_;
+			GError* _tmp18_;
+			const gchar* _tmp19_;
+			gchar* _tmp20_;
+			gchar* _tmp21_;
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			err = _inner_error_;
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_inner_error_ = NULL;
 #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp16_ = _ ("Could not make directory %s writable: %s");
+			_tmp15_ = dir;
 #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp17_ = dir;
+			_tmp16_ = g_file_get_path (_tmp15_);
 #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp18_ = g_file_get_path (_tmp17_);
+			_tmp17_ = _tmp16_;
 #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp19_ = _tmp18_;
+			_tmp18_ = err;
 #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp20_ = err;
+			_tmp19_ = _tmp18_->message;
 #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp21_ = _tmp20_->message;
+			_tmp20_ = g_strdup_printf (_ ("Could not make directory %s writable: %s"), _tmp17_, _tmp19_);
 #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp22_ = g_strdup_printf (_tmp16_, _tmp19_, _tmp21_);
+			_tmp21_ = _tmp20_;
 #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_tmp23_ = _tmp22_;
+			app_window_panic (_tmp21_);
 #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			app_window_panic (_tmp23_);
+			_g_free0 (_tmp21_);
 #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_g_free0 (_tmp23_);
-#line 239 "/home/jens/Source/shotwell/src/AppDirs.vala"
-			_g_free0 (_tmp19_);
+			_g_free0 (_tmp17_);
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_error_free0 (err);
-#line 1924 "AppDirs.c"
+#line 1897 "AppDirs.c"
 		}
-		__finally451:
+		__finally452:
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1931,7 +1904,7 @@ void app_dirs_ensure_writable (GFile* dir) {
 			g_clear_error (&_inner_error_);
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return;
-#line 1935 "AppDirs.c"
+#line 1908 "AppDirs.c"
 		}
 	}
 }
@@ -1940,14 +1913,14 @@ void app_dirs_ensure_writable (GFile* dir) {
 GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 	GFile* result = NULL;
 	GFile* subdir = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	GFile* _tmp21_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	const gchar* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
+	const gchar* _tmp6_;
+	GFile* _tmp20_;
 	GError * _inner_error_ = NULL;
 #line 244 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	g_return_val_if_fail (name != NULL, NULL);
@@ -1973,10 +1946,10 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 	_tmp6_ = subname;
 #line 247 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp6_ != NULL) {
-#line 1977 "AppDirs.c"
-		GFile* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
+#line 1950 "AppDirs.c"
+		GFile* _tmp7_;
+		const gchar* _tmp8_;
+		GFile* _tmp9_;
 #line 248 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp7_ = subdir;
 #line 248 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1987,73 +1960,70 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 		_g_object_unref0 (subdir);
 #line 248 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		subdir = _tmp9_;
-#line 1991 "AppDirs.c"
+#line 1964 "AppDirs.c"
 	}
 	{
-		GFile* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
+		GFile* _tmp10_;
+		gboolean _tmp11_;
 #line 251 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp10_ = subdir;
 #line 251 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp11_ = g_file_query_exists (_tmp10_, NULL);
 #line 251 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (!_tmp11_) {
-#line 2002 "AppDirs.c"
-			GFile* _tmp12_ = NULL;
+#line 1975 "AppDirs.c"
+			GFile* _tmp12_;
 #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp12_ = subdir;
 #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			g_file_make_directory_with_parents (_tmp12_, NULL, &_inner_error_);
 #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2010 "AppDirs.c"
-				goto __catch452_g_error;
+#line 1983 "AppDirs.c"
+				goto __catch453_g_error;
 			}
 		}
 	}
-	goto __finally452;
-	__catch452_g_error:
+	goto __finally453;
+	__catch453_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp13_ = NULL;
-		GFile* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		GError* _tmp17_ = NULL;
-		const gchar* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
+		GFile* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		GError* _tmp16_;
+		const gchar* _tmp17_;
+		gchar* _tmp18_;
+		gchar* _tmp19_;
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		err = _inner_error_;
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_inner_error_ = NULL;
 #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp13_ = _ ("Unable to create data subdirectory %s: %s");
-#line 254 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp14_ = subdir;
+		_tmp13_ = subdir;
 #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp15_ = g_file_get_path (_tmp14_);
+		_tmp14_ = g_file_get_path (_tmp13_);
 #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp16_ = _tmp15_;
+		_tmp15_ = _tmp14_;
 #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp17_ = err;
+		_tmp16_ = err;
 #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp18_ = _tmp17_->message;
+		_tmp17_ = _tmp16_->message;
 #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp19_ = g_strdup_printf (_tmp13_, _tmp16_, _tmp18_);
+		_tmp18_ = g_strdup_printf (_ ("Unable to create data subdirectory %s: %s"), _tmp15_, _tmp17_);
 #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp20_ = _tmp19_;
+		_tmp19_ = _tmp18_;
 #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		app_window_panic (_tmp20_);
+		app_window_panic (_tmp19_);
 #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_g_free0 (_tmp20_);
+		_g_free0 (_tmp19_);
 #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_g_free0 (_tmp16_);
+		_g_free0 (_tmp15_);
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_error_free0 (err);
-#line 2055 "AppDirs.c"
+#line 2025 "AppDirs.c"
 	}
-	__finally452:
+	__finally453:
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2064,26 +2034,26 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 		g_clear_error (&_inner_error_);
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return NULL;
-#line 2068 "AppDirs.c"
+#line 2038 "AppDirs.c"
 	}
 #line 257 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp21_ = subdir;
+	_tmp20_ = subdir;
 #line 257 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	app_dirs_ensure_writable (_tmp21_);
+	app_dirs_ensure_writable (_tmp20_);
 #line 258 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = subdir;
 #line 258 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2078 "AppDirs.c"
+#line 2048 "AppDirs.c"
 }
 
 
 GFile* app_dirs_get_lib_dir (void) {
 	GFile* result = NULL;
 	GFile* install_dir = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	GFile* _tmp2_;
 #line 262 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_install_dir ();
 #line 262 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2092,11 +2062,11 @@ GFile* app_dirs_get_lib_dir (void) {
 	_tmp2_ = install_dir;
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp2_ != NULL) {
-#line 2096 "AppDirs.c"
-		GFile* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
+#line 2066 "AppDirs.c"
+		GFile* _tmp3_;
+		GFile* _tmp4_;
+		GFile* _tmp5_;
+		GFile* _tmp6_;
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp3_ = install_dir;
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2111,16 +2081,16 @@ GFile* app_dirs_get_lib_dir (void) {
 		_tmp1_ = _tmp6_;
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp5_);
-#line 2115 "AppDirs.c"
+#line 2085 "AppDirs.c"
 	} else {
-		GFile* _tmp7_ = NULL;
+		GFile* _tmp7_;
 #line 265 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp7_ = app_dirs_get_exec_dir ();
 #line 265 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp1_);
 #line 265 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp1_ = _tmp7_;
-#line 2124 "AppDirs.c"
+#line 2094 "AppDirs.c"
 	}
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = _tmp1_;
@@ -2128,16 +2098,16 @@ GFile* app_dirs_get_lib_dir (void) {
 	_g_object_unref0 (install_dir);
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2132 "AppDirs.c"
+#line 2102 "AppDirs.c"
 }
 
 
 GFile* app_dirs_get_system_plugins_dir (void) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
 #line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_lib_dir ();
 #line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2152,16 +2122,16 @@ GFile* app_dirs_get_system_plugins_dir (void) {
 	result = _tmp3_;
 #line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2156 "AppDirs.c"
+#line 2126 "AppDirs.c"
 }
 
 
 GFile* app_dirs_get_user_plugins_dir (void) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
 #line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_data_dir ();
 #line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2176,19 +2146,19 @@ GFile* app_dirs_get_user_plugins_dir (void) {
 	result = _tmp3_;
 #line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2180 "AppDirs.c"
+#line 2150 "AppDirs.c"
 }
 
 
 GFile* app_dirs_get_log_file (void) {
 	GFile* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 277 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = g_getenv ("SHOTWELL_LOG_FILE");
 #line 277 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp0_ != NULL) {
-#line 2191 "AppDirs.c"
-		const gchar* _tmp1_ = NULL;
+#line 2161 "AppDirs.c"
+		const gchar* _tmp1_;
 #line 278 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp1_ = g_getenv ("SHOTWELL_LOG_FILE");
 #line 278 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2197,10 +2167,10 @@ GFile* app_dirs_get_log_file (void) {
 			result = NULL;
 #line 279 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return result;
-#line 2201 "AppDirs.c"
+#line 2171 "AppDirs.c"
 		} else {
-			const gchar* _tmp2_ = NULL;
-			GFile* _tmp3_ = NULL;
+			const gchar* _tmp2_;
+			GFile* _tmp3_;
 #line 281 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp2_ = g_getenv ("SHOTWELL_LOG_FILE");
 #line 281 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2209,16 +2179,16 @@ GFile* app_dirs_get_log_file (void) {
 			result = _tmp3_;
 #line 281 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return result;
-#line 2213 "AppDirs.c"
+#line 2183 "AppDirs.c"
 		}
 	} else {
-		const gchar* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
-		GFile* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
+		const gchar* _tmp4_;
+		GFile* _tmp5_;
+		GFile* _tmp6_;
+		GFile* _tmp7_;
+		GFile* _tmp8_;
+		GFile* _tmp9_;
+		GFile* _tmp10_;
 #line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp4_ = g_get_user_cache_dir ();
 #line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2241,7 +2211,7 @@ GFile* app_dirs_get_log_file (void) {
 		result = _tmp10_;
 #line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return result;
-#line 2245 "AppDirs.c"
+#line 2215 "AppDirs.c"
 	}
 }
 
@@ -2250,16 +2220,16 @@ GFile* app_dirs_get_thumbnailer_bin (void) {
 	GFile* result = NULL;
 #line 290 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	static const char filename[] = "shotwell-video-thumbnailer";
-#line 2254 "AppDirs.c"
+#line 2224 "AppDirs.c"
 	GFile* f = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
+	gboolean _tmp7_;
 #line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_libexec_dir ();
 #line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2284,12 +2254,12 @@ GFile* app_dirs_get_thumbnailer_bin (void) {
 	_tmp7_ = g_file_query_exists (_tmp6_, NULL);
 #line 292 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp7_) {
-#line 2288 "AppDirs.c"
-		GFile* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
-		GFile* _tmp11_ = NULL;
-		GFile* _tmp12_ = NULL;
+#line 2258 "AppDirs.c"
+		GFile* _tmp8_;
+		GFile* _tmp9_;
+		GFile* _tmp10_;
+		GFile* _tmp11_;
+		GFile* _tmp12_;
 #line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp8_ = app_dirs_get_libexec_dir ();
 #line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2308,13 +2278,13 @@ GFile* app_dirs_get_thumbnailer_bin (void) {
 		_g_object_unref0 (_tmp11_);
 #line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2312 "AppDirs.c"
+#line 2282 "AppDirs.c"
 	}
 #line 296 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = f;
 #line 296 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2318 "AppDirs.c"
+#line 2288 "AppDirs.c"
 }
 
 
@@ -2322,16 +2292,16 @@ GFile* app_dirs_get_settings_migrator_bin (void) {
 	GFile* result = NULL;
 #line 300 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	static const char filename[] = "shotwell-settings-migrator";
-#line 2326 "AppDirs.c"
+#line 2296 "AppDirs.c"
 	GFile* f = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
+	gboolean _tmp7_;
 #line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_libexec_dir ();
 #line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2356,12 +2326,12 @@ GFile* app_dirs_get_settings_migrator_bin (void) {
 	_tmp7_ = g_file_query_exists (_tmp6_, NULL);
 #line 302 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp7_) {
-#line 2360 "AppDirs.c"
-		GFile* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
-		GFile* _tmp11_ = NULL;
-		GFile* _tmp12_ = NULL;
+#line 2330 "AppDirs.c"
+		GFile* _tmp8_;
+		GFile* _tmp9_;
+		GFile* _tmp10_;
+		GFile* _tmp11_;
+		GFile* _tmp12_;
 #line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp8_ = app_dirs_get_libexec_dir ();
 #line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2380,13 +2350,13 @@ GFile* app_dirs_get_settings_migrator_bin (void) {
 		_g_object_unref0 (_tmp11_);
 #line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2384 "AppDirs.c"
+#line 2354 "AppDirs.c"
 	}
 #line 306 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = f;
 #line 306 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2390 "AppDirs.c"
+#line 2360 "AppDirs.c"
 }
 
 
@@ -2396,21 +2366,21 @@ AppDirs* app_dirs_construct (GType object_type) {
 	self = (AppDirs*) g_type_create_instance (object_type);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return self;
-#line 2400 "AppDirs.c"
+#line 2370 "AppDirs.c"
 }
 
 
 AppDirs* app_dirs_new (void) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return app_dirs_construct (TYPE_APP_DIRS);
-#line 2407 "AppDirs.c"
+#line 2377 "AppDirs.c"
 }
 
 
 static void value_app_dirs_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	value->data[0].v_pointer = NULL;
-#line 2414 "AppDirs.c"
+#line 2384 "AppDirs.c"
 }
 
 
@@ -2419,7 +2389,7 @@ static void value_app_dirs_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		app_dirs_unref (value->data[0].v_pointer);
-#line 2423 "AppDirs.c"
+#line 2393 "AppDirs.c"
 	}
 }
 
@@ -2429,11 +2399,11 @@ static void value_app_dirs_copy_value (const GValue* src_value, GValue* dest_val
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		dest_value->data[0].v_pointer = app_dirs_ref (src_value->data[0].v_pointer);
-#line 2433 "AppDirs.c"
+#line 2403 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2437 "AppDirs.c"
+#line 2407 "AppDirs.c"
 	}
 }
 
@@ -2441,66 +2411,66 @@ static void value_app_dirs_copy_value (const GValue* src_value, GValue* dest_val
 static gpointer value_app_dirs_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return value->data[0].v_pointer;
-#line 2445 "AppDirs.c"
+#line 2415 "AppDirs.c"
 }
 
 
 static gchar* value_app_dirs_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (collect_values[0].v_pointer) {
-#line 2452 "AppDirs.c"
-		AppDirs* object;
+#line 2422 "AppDirs.c"
+		AppDirs * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2459 "AppDirs.c"
+#line 2429 "AppDirs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2463 "AppDirs.c"
+#line 2433 "AppDirs.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = app_dirs_ref (object);
-#line 2467 "AppDirs.c"
+#line 2437 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = NULL;
-#line 2471 "AppDirs.c"
+#line 2441 "AppDirs.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return NULL;
-#line 2475 "AppDirs.c"
+#line 2445 "AppDirs.c"
 }
 
 
 static gchar* value_app_dirs_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	AppDirs** object_p;
+	AppDirs ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2486 "AppDirs.c"
+#line 2456 "AppDirs.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		*object_p = NULL;
-#line 2492 "AppDirs.c"
+#line 2462 "AppDirs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2496 "AppDirs.c"
+#line 2466 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		*object_p = app_dirs_ref (value->data[0].v_pointer);
-#line 2500 "AppDirs.c"
+#line 2470 "AppDirs.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return NULL;
-#line 2504 "AppDirs.c"
+#line 2474 "AppDirs.c"
 }
 
 
@@ -2514,7 +2484,7 @@ GParamSpec* param_spec_app_dirs (const gchar* name, const gchar* nick, const gch
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return G_PARAM_SPEC (spec);
-#line 2518 "AppDirs.c"
+#line 2488 "AppDirs.c"
 }
 
 
@@ -2523,12 +2493,12 @@ gpointer value_get_app_dirs (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APP_DIRS), NULL);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return value->data[0].v_pointer;
-#line 2527 "AppDirs.c"
+#line 2497 "AppDirs.c"
 }
 
 
 void value_set_app_dirs (GValue* value, gpointer v_object) {
-	AppDirs* old;
+	AppDirs * old;
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APP_DIRS));
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2543,23 +2513,23 @@ void value_set_app_dirs (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		app_dirs_ref (value->data[0].v_pointer);
-#line 2547 "AppDirs.c"
+#line 2517 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = NULL;
-#line 2551 "AppDirs.c"
+#line 2521 "AppDirs.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		app_dirs_unref (old);
-#line 2557 "AppDirs.c"
+#line 2527 "AppDirs.c"
 	}
 }
 
 
 void value_take_app_dirs (GValue* value, gpointer v_object) {
-	AppDirs* old;
+	AppDirs * old;
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APP_DIRS));
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2572,17 +2542,17 @@ void value_take_app_dirs (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = v_object;
-#line 2576 "AppDirs.c"
+#line 2546 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = NULL;
-#line 2580 "AppDirs.c"
+#line 2550 "AppDirs.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		app_dirs_unref (old);
-#line 2586 "AppDirs.c"
+#line 2556 "AppDirs.c"
 	}
 }
 
@@ -2592,24 +2562,24 @@ static void app_dirs_class_init (AppDirsClass * klass) {
 	app_dirs_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	((AppDirsClass *) klass)->finalize = app_dirs_finalize;
-#line 2596 "AppDirs.c"
+#line 2566 "AppDirs.c"
 }
 
 
 static void app_dirs_instance_init (AppDirs * self) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	self->ref_count = 1;
-#line 2603 "AppDirs.c"
+#line 2573 "AppDirs.c"
 }
 
 
-static void app_dirs_finalize (AppDirs* obj) {
+static void app_dirs_finalize (AppDirs * obj) {
 	AppDirs * self;
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_APP_DIRS, AppDirs);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	g_signal_handlers_destroy (self);
-#line 2613 "AppDirs.c"
+#line 2583 "AppDirs.c"
 }
 
 
@@ -2628,18 +2598,18 @@ GType app_dirs_get_type (void) {
 
 
 gpointer app_dirs_ref (gpointer instance) {
-	AppDirs* self;
+	AppDirs * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return instance;
-#line 2638 "AppDirs.c"
+#line 2608 "AppDirs.c"
 }
 
 
 void app_dirs_unref (gpointer instance) {
-	AppDirs* self;
+	AppDirs * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2647,7 +2617,7 @@ void app_dirs_unref (gpointer instance) {
 		APP_DIRS_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2651 "AppDirs.c"
+#line 2621 "AppDirs.c"
 	}
 }
 
diff --git a/src/AppWindow.c b/src/AppWindow.c
index ca346cb..e2c3a0f 100644
--- a/src/AppWindow.c
+++ b/src/AppWindow.c
@@ -1,4 +1,4 @@
-/* AppWindow.c generated by valac 0.34.7, the Vala compiler
+/* AppWindow.c generated by valac 0.36.6, the Vala compiler
  * generated from AppWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -391,7 +391,7 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow*
 static gboolean _fullscreen_window_on_check_toolbar_invocation_gsource_func (gpointer self);
 static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow* self);
 static gboolean _fullscreen_window_on_check_toolbar_dismissal_gsource_func (gpointer self);
-static void fullscreen_window_finalize (GObject* obj);
+static void fullscreen_window_finalize (GObject * obj);
 #define PAGE_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PAGE_WINDOW, PageWindowPrivate))
 enum  {
 	PAGE_WINDOW_DUMMY_PROPERTY
@@ -424,7 +424,7 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event);
 void page_window_set_busy_cursor (PageWindow* self);
 void spin_event_loop (void);
 void page_window_set_normal_cursor (PageWindow* self);
-static void page_window_finalize (GObject* obj);
+static void page_window_finalize (GObject * obj);
 GType dimensions_get_type (void) G_GNUC_CONST;
 Dimensions* dimensions_dup (const Dimensions* self);
 void dimensions_free (Dimensions* self);
@@ -592,7 +592,7 @@ gboolean command_manager_redo (CommandManager* self);
 void view_collection_select_all (ViewCollection* self);
 void view_collection_unselect_all (ViewCollection* self);
 static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfigure* event);
-static void app_window_finalize (GObject* obj);
+static void app_window_finalize (GObject * obj);
 
 static const GActionEntry FULLSCREEN_WINDOW_entries[1] = {{"LeaveFullscreen", _fullscreen_window_on_close_gsimple_action_activate_callback}};
 static const GActionEntry APP_WINDOW_common_actions[11] = {{"CommonAbout", _app_window_on_about_gsimple_action_activate_callback}, {"CommonQuit", _app_window_on_quit_gsimple_action_activate_callback}, {"CommonFullscreen", _app_window_on_fullscreen_gsimple_action_activate_callback}, {"CommonHelpContents", _app_window_on_help_contents_gsimple_action_activate_callback}, {"CommonHelpFAQ", _app_window_on_help_faq_gsimple_action_activate_callback}, {"CommonHelpReportProblem", _app_window_on_help_report_problem_gsimple_action_activate_callback}, {"CommonUndo", _app_window_on_undo_gsimple_action_activate_callback}, {"CommonRedo", _app_window_on_redo_gsimple_action_activate_callback}, {"CommonJumpToFile", _app_window_on_jump_to_file_gsimple_action_activate_callback}, {"CommonSelectAll", _app_window_on_select_all_gsimple_action_activate_callback}, {"CommonSelectNone", _app_window_on_select_none_gsimple_action_activate_callback}};
@@ -621,56 +621,53 @@ static void _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar (Slidesh
 
 FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 	FullscreenWindow * self = NULL;
-	Page* _tmp0_ = NULL;
+	Page* _tmp0_;
 #line 32 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	static const gchar* accels[] = {"F11", NULL};
 #line 600 "AppWindow.c"
-	AppWindow* _tmp1_ = NULL;
-	AppWindow* _tmp2_ = NULL;
-	GdkScreen* _tmp3_ = NULL;
+	AppWindow* _tmp1_;
+	AppWindow* _tmp2_;
+	GdkScreen* _tmp3_;
 	GdkRectangle monitor = {0};
 	GdkRectangle _tmp4_ = {0};
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	GdkRectangle _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	ConfigFacade* _tmp9_ = NULL;
-	ConfigFacade* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
-	GtkToggleToolButton* _tmp12_ = NULL;
-	GtkToggleToolButton* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	GtkToggleToolButton* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	GtkToggleToolButton* _tmp17_ = NULL;
-	gboolean _tmp18_ = FALSE;
-	GtkToggleToolButton* _tmp19_ = NULL;
-	GtkToolButton* _tmp20_ = NULL;
-	GtkToolButton* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	GtkToolButton* _tmp23_ = NULL;
-	Page* _tmp24_ = NULL;
-	GtkToolbar* _tmp25_ = NULL;
-	GtkToolbar* _tmp26_ = NULL;
-	GtkToolbar* _tmp27_ = NULL;
-	GtkToolbar* _tmp28_ = NULL;
-	GtkToolbar* _tmp29_ = NULL;
-	GtkToolbar* _tmp30_ = NULL;
-	Page* _tmp31_ = NULL;
-	Page* _tmp35_ = NULL;
-	Page* _tmp36_ = NULL;
-	GtkToolbar* _tmp37_ = NULL;
-	GtkToolButton* _tmp38_ = NULL;
-	GtkOverlay* _tmp39_ = NULL;
-	GtkOverlay* _tmp40_ = NULL;
-	Page* _tmp41_ = NULL;
-	GtkOverlay* _tmp42_ = NULL;
-	GtkToolbar* _tmp43_ = NULL;
-	GdkRectangle _tmp44_ = {0};
-	gint _tmp45_ = 0;
-	GdkRectangle _tmp46_ = {0};
-	gint _tmp47_ = 0;
-	Page* _tmp48_ = NULL;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	GdkRectangle _tmp7_;
+	gint _tmp8_;
+	ConfigFacade* _tmp9_;
+	ConfigFacade* _tmp10_;
+	gboolean _tmp11_;
+	GtkToggleToolButton* _tmp12_;
+	GtkToggleToolButton* _tmp13_;
+	GtkToggleToolButton* _tmp14_;
+	GtkToggleToolButton* _tmp15_;
+	gboolean _tmp16_;
+	GtkToggleToolButton* _tmp17_;
+	GtkToolButton* _tmp18_;
+	GtkToolButton* _tmp19_;
+	GtkToolButton* _tmp20_;
+	Page* _tmp21_;
+	GtkToolbar* _tmp22_;
+	GtkToolbar* _tmp23_;
+	GtkToolbar* _tmp24_;
+	GtkToolbar* _tmp25_;
+	GtkToolbar* _tmp26_;
+	GtkToolbar* _tmp27_;
+	Page* _tmp28_;
+	Page* _tmp32_;
+	Page* _tmp33_;
+	GtkToolbar* _tmp34_;
+	GtkToolButton* _tmp35_;
+	GtkOverlay* _tmp36_;
+	GtkOverlay* _tmp37_;
+	Page* _tmp38_;
+	GtkOverlay* _tmp39_;
+	GtkToolbar* _tmp40_;
+	GdkRectangle _tmp41_;
+	gint _tmp42_;
+	GdkRectangle _tmp43_;
+	gint _tmp44_;
+	Page* _tmp45_;
 #line 26 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_PAGE (page), NULL);
 #line 27 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -726,129 +723,123 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 #line 47 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = self->priv->pin_button;
 #line 47 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp14_ = _ ("Pin Toolbar");
-#line 47 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_tool_button_get_type (), GtkToolButton), _tmp14_);
-#line 48 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp15_ = self->priv->pin_button;
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_tool_button_get_type (), GtkToolButton), _ ("Pin Toolbar"));
 #line 48 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp16_ = _ ("Pin the toolbar open");
+	_tmp14_ = self->priv->pin_button;
 #line 48 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_tool_item_get_type (), GtkToolItem), _tmp16_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_tool_item_get_type (), GtkToolItem), _ ("Pin the toolbar open"));
 #line 49 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp17_ = self->priv->pin_button;
+	_tmp15_ = self->priv->pin_button;
 #line 49 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp18_ = self->priv->is_toolbar_dismissal_enabled;
+	_tmp16_ = self->priv->is_toolbar_dismissal_enabled;
 #line 49 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_toggle_tool_button_set_active (_tmp17_, !_tmp18_);
+	gtk_toggle_tool_button_set_active (_tmp15_, !_tmp16_);
 #line 50 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp19_ = self->priv->pin_button;
+	_tmp17_ = self->priv->pin_button;
 #line 50 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tool_button_get_type (), GtkToolButton), "clicked", (GCallback) _fullscreen_window_update_toolbar_dismissal_gtk_tool_button_clicked, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_tool_button_get_type (), GtkToolButton), "clicked", (GCallback) _fullscreen_window_update_toolbar_dismissal_gtk_tool_button_clicked, self, 0);
 #line 52 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp20_ = self->priv->close_button;
+	_tmp18_ = self->priv->close_button;
 #line 52 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_tool_button_set_icon_name (_tmp20_, "view-restore");
-#line 53 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp21_ = self->priv->close_button;
+	gtk_tool_button_set_icon_name (_tmp18_, "view-restore");
 #line 53 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp22_ = _ ("Leave fullscreen");
+	_tmp19_ = self->priv->close_button;
 #line 53 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_item_get_type (), GtkToolItem), _tmp22_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tool_item_get_type (), GtkToolItem), _ ("Leave fullscreen"));
 #line 54 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp23_ = self->priv->close_button;
+	_tmp20_ = self->priv->close_button;
 #line 54 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.LeaveFullscreen");
+	gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.LeaveFullscreen");
 #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp24_ = page;
+	_tmp21_ = page;
 #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp25_ = page_get_toolbar (_tmp24_);
+	_tmp22_ = page_get_toolbar (_tmp21_);
 #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (self->priv->toolbar);
 #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self->priv->toolbar = _tmp25_;
+	self->priv->toolbar = _tmp22_;
 #line 57 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp26_ = self->priv->toolbar;
+	_tmp23_ = self->priv->toolbar;
 #line 57 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_toolbar_set_show_arrow (_tmp26_, FALSE);
+	gtk_toolbar_set_show_arrow (_tmp23_, FALSE);
 #line 58 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp27_ = self->priv->toolbar;
+	_tmp24_ = self->priv->toolbar;
 #line 58 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
 #line 59 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp28_ = self->priv->toolbar;
+	_tmp25_ = self->priv->toolbar;
 #line 59 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 60 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp29_ = self->priv->toolbar;
+	_tmp26_ = self->priv->toolbar;
 #line 60 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), "expand", FALSE, NULL);
+	g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), "expand", FALSE, NULL);
 #line 61 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp30_ = self->priv->toolbar;
+	_tmp27_ = self->priv->toolbar;
 #line 61 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), RESOURCES_TRANSIENT_WINDOW_OPACITY);
+	gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), RESOURCES_TRANSIENT_WINDOW_OPACITY);
 #line 63 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp31_ = page;
+	_tmp28_ = page;
 #line 63 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, TYPE_SLIDESHOW_PAGE)) {
-#line 767 "AppWindow.c"
-		Page* _tmp32_ = NULL;
+	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, TYPE_SLIDESHOW_PAGE)) {
+#line 758 "AppWindow.c"
+		Page* _tmp29_;
 #line 65 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp32_ = page;
+		_tmp29_ = page;
 #line 65 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_SLIDESHOW_PAGE, SlideshowPage), "hide-toolbar", (GCallback) _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar, self, 0);
-#line 773 "AppWindow.c"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_SLIDESHOW_PAGE, SlideshowPage), "hide-toolbar", (GCallback) _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar, self, 0);
+#line 764 "AppWindow.c"
 	} else {
-		GtkToolbar* _tmp33_ = NULL;
-		GtkToggleToolButton* _tmp34_ = NULL;
+		GtkToolbar* _tmp30_;
+		GtkToggleToolButton* _tmp31_;
 #line 68 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp33_ = self->priv->toolbar;
+		_tmp30_ = self->priv->toolbar;
 #line 68 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp34_ = self->priv->pin_button;
+		_tmp31_ = self->priv->pin_button;
 #line 68 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		gtk_toolbar_insert (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 783 "AppWindow.c"
+		gtk_toolbar_insert (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 774 "AppWindow.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp35_ = page;
+	_tmp32_ = page;
 #line 71 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	page_set_cursor_hide_time (_tmp35_, FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC * 1000);
+	page_set_cursor_hide_time (_tmp32_, FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC * 1000);
 #line 72 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp36_ = page;
+	_tmp33_ = page;
 #line 72 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	page_start_cursor_hiding (_tmp36_);
+	page_start_cursor_hiding (_tmp33_);
 #line 74 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp37_ = self->priv->toolbar;
+	_tmp34_ = self->priv->toolbar;
 #line 74 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp38_ = self->priv->close_button;
+	_tmp35_ = self->priv->close_button;
 #line 74 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_toolbar_insert (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 76 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp39_ = self->priv->overlay;
+	_tmp36_ = self->priv->overlay;
 #line 76 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget));
 #line 77 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp40_ = self->priv->overlay;
+	_tmp37_ = self->priv->overlay;
 #line 77 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp41_ = page;
+	_tmp38_ = page;
 #line 77 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
 #line 78 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp42_ = self->priv->overlay;
+	_tmp39_ = self->priv->overlay;
 #line 78 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp43_ = self->priv->toolbar;
+	_tmp40_ = self->priv->toolbar;
 #line 78 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_overlay_add_overlay (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget));
+	gtk_overlay_add_overlay (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget));
 #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp44_ = monitor;
+	_tmp41_ = monitor;
 #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp45_ = _tmp44_.width;
+	_tmp42_ = _tmp41_.width;
 #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp46_ = monitor;
+	_tmp43_ = monitor;
 #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp47_ = _tmp46_.height;
+	_tmp44_ = _tmp43_.height;
 #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp45_, _tmp47_);
+	gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp42_, _tmp44_);
 #line 86 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
 #line 87 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -858,21 +849,21 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 #line 93 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_invoke_toolbar (self);
 #line 96 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp48_ = page;
+	_tmp45_ = page;
 #line 96 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
 #line 99 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), FALSE);
 #line 26 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self;
-#line 841 "AppWindow.c"
+#line 832 "AppWindow.c"
 }
 
 
 FullscreenWindow* fullscreen_window_new (Page* page) {
 #line 26 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return fullscreen_window_construct (TYPE_FULLSCREEN_WINDOW, page);
-#line 848 "AppWindow.c"
+#line 839 "AppWindow.c"
 }
 
 
@@ -881,13 +872,13 @@ void fullscreen_window_disable_toolbar_dismissal (FullscreenWindow* self) {
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
 #line 103 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->is_toolbar_dismissal_enabled = FALSE;
-#line 857 "AppWindow.c"
+#line 848 "AppWindow.c"
 }
 
 
 void fullscreen_window_update_toolbar_dismissal (FullscreenWindow* self) {
-	GtkToggleToolButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GtkToggleToolButton* _tmp0_;
+	gboolean _tmp1_;
 #line 106 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
 #line 107 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -896,18 +887,18 @@ void fullscreen_window_update_toolbar_dismissal (FullscreenWindow* self) {
 	_tmp1_ = gtk_toggle_tool_button_get_active (_tmp0_);
 #line 107 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->is_toolbar_dismissal_enabled = !_tmp1_;
-#line 872 "AppWindow.c"
+#line 863 "AppWindow.c"
 }
 
 
 static void fullscreen_window_get_monitor_geometry (FullscreenWindow* self, GdkRectangle* result) {
 	GdkRectangle monitor = {0};
-	GdkScreen* _tmp0_ = NULL;
-	GdkScreen* _tmp1_ = NULL;
-	AppWindow* _tmp2_ = NULL;
-	AppWindow* _tmp3_ = NULL;
-	GdkWindow* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	GdkScreen* _tmp0_;
+	GdkScreen* _tmp1_;
+	AppWindow* _tmp2_;
+	AppWindow* _tmp3_;
+	GdkWindow* _tmp4_;
+	gint _tmp5_;
 	GdkRectangle _tmp6_ = {0};
 #line 110 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
@@ -933,7 +924,7 @@ static void fullscreen_window_get_monitor_geometry (FullscreenWindow* self, GdkR
 	*result = monitor;
 #line 116 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return;
-#line 909 "AppWindow.c"
+#line 900 "AppWindow.c"
 }
 
 
@@ -941,9 +932,9 @@ static gboolean fullscreen_window_real_configure_event (GtkWidget* base, GdkEven
 	FullscreenWindow * self;
 	gboolean result = FALSE;
 	gboolean _result_ = FALSE;
-	GdkEventConfigure* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	GdkEventConfigure* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 #line 119 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
 #line 119 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -958,9 +949,9 @@ static gboolean fullscreen_window_real_configure_event (GtkWidget* base, GdkEven
 	_tmp2_ = self->priv->switched_to;
 #line 122 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp2_) {
-#line 934 "AppWindow.c"
-		Page* _tmp3_ = NULL;
-		Page* _tmp4_ = NULL;
+#line 925 "AppWindow.c"
+		Page* _tmp3_;
+		Page* _tmp4_;
 #line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
 #line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -971,28 +962,28 @@ static gboolean fullscreen_window_real_configure_event (GtkWidget* base, GdkEven
 		_g_object_unref0 (_tmp4_);
 #line 124 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->priv->switched_to = TRUE;
-#line 947 "AppWindow.c"
+#line 938 "AppWindow.c"
 	}
 #line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _result_;
 #line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 953 "AppWindow.c"
+#line 944 "AppWindow.c"
 }
 
 
 static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
 	FullscreenWindow * self;
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
+	GdkEventKey* _tmp0_;
+	guint _tmp1_;
+	const gchar* _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	AppWindow* _tmp6_ = NULL;
-	AppWindow* _tmp7_ = NULL;
-	GdkEventKey* _tmp8_ = NULL;
+	AppWindow* _tmp6_;
+	AppWindow* _tmp7_;
+	GdkEventKey* _tmp8_;
 	gboolean _tmp9_ = FALSE;
-	gboolean _tmp10_ = FALSE;
+	gboolean _tmp10_;
 #line 130 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
 #line 130 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1011,24 +1002,24 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven
 		result = TRUE;
 #line 135 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 987 "AppWindow.c"
+#line 978 "AppWindow.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->key_press_event != NULL) {
-#line 991 "AppWindow.c"
-		GdkEventKey* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+#line 982 "AppWindow.c"
+		GdkEventKey* _tmp4_;
+		gboolean _tmp5_;
 #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = event;
 #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp4_);
 #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _tmp5_;
-#line 1000 "AppWindow.c"
+#line 991 "AppWindow.c"
 	} else {
 #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = FALSE;
-#line 1004 "AppWindow.c"
+#line 995 "AppWindow.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_) {
@@ -1036,7 +1027,7 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven
 		result = TRUE;
 #line 140 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1012 "AppWindow.c"
+#line 1003 "AppWindow.c"
 	}
 #line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = app_window_get_instance ();
@@ -1054,16 +1045,16 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven
 	result = _tmp10_;
 #line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1030 "AppWindow.c"
+#line 1021 "AppWindow.c"
 }
 
 
 static void fullscreen_window_on_close (FullscreenWindow* self) {
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	AppWindow* _tmp3_ = NULL;
-	AppWindow* _tmp4_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	AppWindow* _tmp3_;
+	AppWindow* _tmp4_;
 #line 146 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
 #line 147 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1086,7 +1077,7 @@ static void fullscreen_window_on_close (FullscreenWindow* self) {
 	app_window_end_fullscreen (_tmp4_);
 #line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1062 "AppWindow.c"
+#line 1053 "AppWindow.c"
 }
 
 
@@ -1095,15 +1086,15 @@ void fullscreen_window_close (FullscreenWindow* self) {
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
 #line 154 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_on_close (self);
-#line 1071 "AppWindow.c"
+#line 1062 "AppWindow.c"
 }
 
 
 static void fullscreen_window_real_destroy (GtkWidget* base) {
 	FullscreenWindow * self;
 	Page* page = NULL;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
+	Page* _tmp0_;
+	Page* _tmp1_;
 #line 157 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
 #line 158 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1116,9 +1107,9 @@ static void fullscreen_window_real_destroy (GtkWidget* base) {
 	_tmp1_ = page;
 #line 161 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 1092 "AppWindow.c"
-		Page* _tmp2_ = NULL;
-		Page* _tmp3_ = NULL;
+#line 1083 "AppWindow.c"
+		Page* _tmp2_;
+		Page* _tmp3_;
 #line 162 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = page;
 #line 162 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1127,21 +1118,21 @@ static void fullscreen_window_real_destroy (GtkWidget* base) {
 		_tmp3_ = page;
 #line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_switching_from (_tmp3_);
-#line 1103 "AppWindow.c"
+#line 1094 "AppWindow.c"
 	}
 #line 166 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	GTK_WIDGET_CLASS (fullscreen_window_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget));
 #line 157 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 1109 "AppWindow.c"
+#line 1100 "AppWindow.c"
 }
 
 
 static gboolean fullscreen_window_real_delete_event (GtkWidget* base, GdkEventAny* event) {
 	FullscreenWindow * self;
 	gboolean result = FALSE;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	AppWindow* _tmp0_;
+	AppWindow* _tmp1_;
 #line 169 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
 #line 169 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1160,7 +1151,7 @@ static gboolean fullscreen_window_real_delete_event (GtkWidget* base, GdkEventAn
 	result = TRUE;
 #line 173 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1136 "AppWindow.c"
+#line 1127 "AppWindow.c"
 }
 
 
@@ -1169,14 +1160,14 @@ static gboolean _fullscreen_window_on_check_toolbar_invocation_gsource_func (gpo
 	result = fullscreen_window_on_check_toolbar_invocation ((FullscreenWindow*) self);
 #line 182 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1145 "AppWindow.c"
+#line 1136 "AppWindow.c"
 }
 
 
 static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, GdkEventMotion* event) {
 	FullscreenWindow * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	gboolean _tmp4_ = FALSE;
 #line 176 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
@@ -1186,24 +1177,24 @@ static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, Gdk
 	_tmp0_ = self->priv->is_toolbar_shown;
 #line 177 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp0_) {
-#line 1162 "AppWindow.c"
+#line 1153 "AppWindow.c"
 		gboolean _tmp1_ = FALSE;
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = self->priv->waiting_for_invoke;
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (!_tmp2_) {
-#line 1169 "AppWindow.c"
-			gboolean _tmp3_ = FALSE;
+#line 1160 "AppWindow.c"
+			gboolean _tmp3_;
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp3_ = fullscreen_window_is_pointer_in_toolbar (self);
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp1_ = _tmp3_;
-#line 1175 "AppWindow.c"
+#line 1166 "AppWindow.c"
 		} else {
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp1_ = FALSE;
-#line 1179 "AppWindow.c"
+#line 1170 "AppWindow.c"
 		}
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (_tmp1_) {
@@ -1211,58 +1202,58 @@ static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, Gdk
 			g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) FULLSCREEN_WINDOW_TOOLBAR_INVOCATION_MSEC, _fullscreen_window_on_check_toolbar_invocation_gsource_func, g_object_ref (self), g_object_unref);
 #line 183 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			self->priv->waiting_for_invoke = TRUE;
-#line 1187 "AppWindow.c"
+#line 1178 "AppWindow.c"
 		}
 	}
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->motion_notify_event != NULL) {
-#line 1192 "AppWindow.c"
-		GdkEventMotion* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+#line 1183 "AppWindow.c"
+		GdkEventMotion* _tmp5_;
+		gboolean _tmp6_;
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = event;
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->motion_notify_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp6_;
-#line 1201 "AppWindow.c"
+#line 1192 "AppWindow.c"
 	} else {
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = FALSE;
-#line 1205 "AppWindow.c"
+#line 1196 "AppWindow.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp4_;
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1211 "AppWindow.c"
+#line 1202 "AppWindow.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 191 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1218 "AppWindow.c"
+#line 1209 "AppWindow.c"
 }
 
 
 static gboolean fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self) {
 	gboolean result = FALSE;
 	GdkDeviceManager* devmgr = NULL;
-	GdkDisplay* _tmp0_ = NULL;
-	GdkDeviceManager* _tmp1_ = NULL;
-	GdkDeviceManager* _tmp2_ = NULL;
-	GdkDeviceManager* _tmp3_ = NULL;
+	GdkDisplay* _tmp0_;
+	GdkDeviceManager* _tmp1_;
+	GdkDeviceManager* _tmp2_;
+	GdkDeviceManager* _tmp3_;
 	gint py = 0;
-	GdkDeviceManager* _tmp4_ = NULL;
-	GdkDevice* _tmp5_ = NULL;
+	GdkDeviceManager* _tmp4_;
+	GdkDevice* _tmp5_;
 	gint _tmp6_ = 0;
 	gint wy = 0;
-	GtkToolbar* _tmp7_ = NULL;
-	GdkWindow* _tmp8_ = NULL;
+	GtkToolbar* _tmp7_;
+	GdkWindow* _tmp8_;
 	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	gint _tmp10_;
+	gint _tmp11_;
 #line 190 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), FALSE);
 #line 191 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1285,7 +1276,7 @@ static gboolean fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self)
 		_g_object_unref0 (devmgr);
 #line 195 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1261 "AppWindow.c"
+#line 1252 "AppWindow.c"
 	}
 #line 199 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = devmgr;
@@ -1313,14 +1304,14 @@ static gboolean fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self)
 	_g_object_unref0 (devmgr);
 #line 204 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1289 "AppWindow.c"
+#line 1280 "AppWindow.c"
 }
 
 
 static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
 #line 207 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), FALSE);
 #line 208 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1333,7 +1324,7 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow*
 		result = FALSE;
 #line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1309 "AppWindow.c"
+#line 1300 "AppWindow.c"
 	}
 #line 213 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = fullscreen_window_is_pointer_in_toolbar (self);
@@ -1343,7 +1334,7 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow*
 		result = FALSE;
 #line 214 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1319 "AppWindow.c"
+#line 1310 "AppWindow.c"
 	}
 #line 216 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_invoke_toolbar (self);
@@ -1351,7 +1342,7 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow*
 	result = FALSE;
 #line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1327 "AppWindow.c"
+#line 1318 "AppWindow.c"
 }
 
 
@@ -1360,12 +1351,12 @@ static gboolean _fullscreen_window_on_check_toolbar_dismissal_gsource_func (gpoi
 	result = fullscreen_window_on_check_toolbar_dismissal ((FullscreenWindow*) self);
 #line 226 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1336 "AppWindow.c"
+#line 1327 "AppWindow.c"
 }
 
 
 static void fullscreen_window_invoke_toolbar (FullscreenWindow* self) {
-	GtkToolbar* _tmp0_ = NULL;
+	GtkToolbar* _tmp0_;
 #line 221 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
 #line 222 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1376,22 +1367,22 @@ static void fullscreen_window_invoke_toolbar (FullscreenWindow* self) {
 	self->priv->is_toolbar_shown = TRUE;
 #line 226 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) FULLSCREEN_WINDOW_TOOLBAR_CHECK_DISMISSAL_MSEC, _fullscreen_window_on_check_toolbar_dismissal_gsource_func, g_object_ref (self), g_object_unref);
-#line 1352 "AppWindow.c"
+#line 1343 "AppWindow.c"
 }
 
 
 static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	time_t _tmp3_ = 0;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+	time_t _tmp3_;
 	time_t now = 0;
-	time_t _tmp5_ = 0;
-	time_t _tmp6_ = 0;
-	time_t _tmp7_ = 0;
-	time_t _tmp8_ = 0;
-	time_t _tmp9_ = 0;
+	time_t _tmp5_;
+	time_t _tmp6_;
+	time_t _tmp7_;
+	time_t _tmp8_;
+	time_t _tmp9_;
 #line 229 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), FALSE);
 #line 230 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1402,7 +1393,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 		result = FALSE;
 #line 231 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1378 "AppWindow.c"
+#line 1369 "AppWindow.c"
 	}
 #line 234 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = self->priv->is_toolbar_dismissal_enabled;
@@ -1412,7 +1403,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 		result = TRUE;
 #line 235 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1388 "AppWindow.c"
+#line 1379 "AppWindow.c"
 	}
 #line 238 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = fullscreen_window_is_pointer_in_toolbar (self);
@@ -1424,14 +1415,14 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 		result = TRUE;
 #line 241 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1400 "AppWindow.c"
+#line 1391 "AppWindow.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = self->priv->left_toolbar_time;
 #line 245 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ == ((time_t) 0)) {
-#line 1406 "AppWindow.c"
-		time_t _tmp4_ = 0;
+#line 1397 "AppWindow.c"
+		time_t _tmp4_;
 #line 246 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = time (NULL);
 #line 246 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1440,7 +1431,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 		result = TRUE;
 #line 248 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1416 "AppWindow.c"
+#line 1407 "AppWindow.c"
 	}
 #line 252 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = time (NULL);
@@ -1462,7 +1453,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 		result = TRUE;
 #line 256 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1438 "AppWindow.c"
+#line 1429 "AppWindow.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_hide_toolbar (self);
@@ -1470,12 +1461,12 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 	result = FALSE;
 #line 260 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1446 "AppWindow.c"
+#line 1437 "AppWindow.c"
 }
 
 
 static void fullscreen_window_hide_toolbar (FullscreenWindow* self) {
-	GtkToolbar* _tmp0_ = NULL;
+	GtkToolbar* _tmp0_;
 #line 263 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
 #line 264 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1484,7 +1475,7 @@ static void fullscreen_window_hide_toolbar (FullscreenWindow* self) {
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
 #line 265 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->is_toolbar_shown = FALSE;
-#line 1460 "AppWindow.c"
+#line 1451 "AppWindow.c"
 }
 
 
@@ -1494,25 +1485,25 @@ static void fullscreen_window_class_init (FullscreenWindowClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_type_class_add_private (klass, sizeof (FullscreenWindowPrivate));
 #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((GtkWidgetClass *) klass)->configure_event = (gboolean (*)(GtkWidget*, GdkEventConfigure*)) fullscreen_window_real_configure_event;
+	((GtkWidgetClass *) klass)->configure_event = (gboolean (*) (GtkWidget *, GdkEventConfigure*)) fullscreen_window_real_configure_event;
 #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) fullscreen_window_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) fullscreen_window_real_key_press_event;
 #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((GtkWidgetClass *) klass)->destroy = (void (*)(GtkWidget*)) fullscreen_window_real_destroy;
+	((GtkWidgetClass *) klass)->destroy = (void (*) (GtkWidget *)) fullscreen_window_real_destroy;
 #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((GtkWidgetClass *) klass)->delete_event = (gboolean (*)(GtkWidget*, GdkEventAny*)) fullscreen_window_real_delete_event;
+	((GtkWidgetClass *) klass)->delete_event = (gboolean (*) (GtkWidget *, GdkEventAny*)) fullscreen_window_real_delete_event;
 #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((GtkWidgetClass *) klass)->motion_notify_event = (gboolean (*)(GtkWidget*, GdkEventMotion*)) fullscreen_window_real_motion_notify_event;
+	((GtkWidgetClass *) klass)->motion_notify_event = (gboolean (*) (GtkWidget *, GdkEventMotion*)) fullscreen_window_real_motion_notify_event;
 #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = fullscreen_window_finalize;
-#line 1481 "AppWindow.c"
+#line 1472 "AppWindow.c"
 }
 
 
 static void fullscreen_window_instance_init (FullscreenWindow * self) {
-	GtkOverlay* _tmp0_ = NULL;
-	GtkToolButton* _tmp1_ = NULL;
-	GtkToggleToolButton* _tmp2_ = NULL;
+	GtkOverlay* _tmp0_;
+	GtkToolButton* _tmp1_;
+	GtkToggleToolButton* _tmp2_;
 #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv = FULLSCREEN_WINDOW_GET_PRIVATE (self);
 #line 12 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1543,11 +1534,11 @@ static void fullscreen_window_instance_init (FullscreenWindow * self) {
 	self->priv->left_toolbar_time = (time_t) 0;
 #line 19 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->switched_to = FALSE;
-#line 1519 "AppWindow.c"
+#line 1510 "AppWindow.c"
 }
 
 
-static void fullscreen_window_finalize (GObject* obj) {
+static void fullscreen_window_finalize (GObject * obj) {
 	FullscreenWindow * self;
 #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
@@ -1561,7 +1552,7 @@ static void fullscreen_window_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->pin_button);
 #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (fullscreen_window_parent_class)->finalize (obj);
-#line 1537 "AppWindow.c"
+#line 1528 "AppWindow.c"
 }
 
 
@@ -1582,7 +1573,7 @@ static void page_window_real_switched_pages (PageWindow* self, Page* old_page, P
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
 #line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 1558 "AppWindow.c"
+#line 1549 "AppWindow.c"
 }
 
 
@@ -1591,16 +1582,16 @@ void page_window_switched_pages (PageWindow* self, Page* old_page, Page* new_pag
 	g_return_if_fail (IS_PAGE_WINDOW (self));
 #line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	PAGE_WINDOW_GET_CLASS (self)->switched_pages (self, old_page, new_page);
-#line 1567 "AppWindow.c"
+#line 1558 "AppWindow.c"
 }
 
 
 PageWindow* page_window_construct (GType object_type) {
 	PageWindow * self = NULL;
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	GtkApplication* _tmp2_ = NULL;
-	GtkApplication* _tmp3_ = NULL;
+	Application* _tmp0_;
+	Application* _tmp1_;
+	GtkApplication* _tmp2_;
+	GtkApplication* _tmp3_;
 #line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = application_get_instance ();
 #line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1621,14 +1612,14 @@ PageWindow* page_window_construct (GType object_type) {
 	gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE);
 #line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self;
-#line 1597 "AppWindow.c"
+#line 1588 "AppWindow.c"
 }
 
 
 Page* page_window_get_current_page (PageWindow* self) {
 	Page* result = NULL;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
+	Page* _tmp0_;
+	Page* _tmp1_;
 #line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_PAGE_WINDOW (self), NULL);
 #line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1639,32 +1630,32 @@ Page* page_window_get_current_page (PageWindow* self) {
 	result = _tmp1_;
 #line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1615 "AppWindow.c"
+#line 1606 "AppWindow.c"
 }
 
 
 static void page_window_real_set_current_page (PageWindow* self, Page* page) {
-	Page* _tmp0_ = NULL;
+	Page* _tmp0_;
 	Page* old_page = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
-	Page* _tmp5_ = NULL;
-	Page* _tmp6_ = NULL;
-	Page* _tmp7_ = NULL;
+	Page* _tmp2_;
+	Page* _tmp3_;
+	Page* _tmp4_;
+	Page* _tmp5_;
+	Page* _tmp6_;
+	Page* _tmp7_;
 #line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
 #line 297 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->current_page;
 #line 297 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 1634 "AppWindow.c"
-		Page* _tmp1_ = NULL;
+#line 1625 "AppWindow.c"
+		Page* _tmp1_;
 #line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = self->priv->current_page;
 #line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_clear_container (_tmp1_);
-#line 1640 "AppWindow.c"
+#line 1631 "AppWindow.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->priv->current_page;
@@ -1690,7 +1681,7 @@ static void page_window_real_set_current_page (PageWindow* self, Page* page) {
 	page_window_switched_pages (self, old_page, _tmp7_);
 #line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (old_page);
-#line 1666 "AppWindow.c"
+#line 1657 "AppWindow.c"
 }
 
 
@@ -1699,26 +1690,26 @@ void page_window_set_current_page (PageWindow* self, Page* page) {
 	g_return_if_fail (IS_PAGE_WINDOW (self));
 #line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	PAGE_WINDOW_GET_CLASS (self)->set_current_page (self, page);
-#line 1675 "AppWindow.c"
+#line 1666 "AppWindow.c"
 }
 
 
 static void page_window_real_clear_current_page (PageWindow* self) {
-	Page* _tmp0_ = NULL;
+	Page* _tmp0_;
 	Page* old_page = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
+	Page* _tmp2_;
+	Page* _tmp3_;
 #line 308 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->current_page;
 #line 308 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 1688 "AppWindow.c"
-		Page* _tmp1_ = NULL;
+#line 1679 "AppWindow.c"
+		Page* _tmp1_;
 #line 309 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = self->priv->current_page;
 #line 309 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_clear_container (_tmp1_);
-#line 1694 "AppWindow.c"
+#line 1685 "AppWindow.c"
 	}
 #line 311 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->priv->current_page;
@@ -1734,7 +1725,7 @@ static void page_window_real_clear_current_page (PageWindow* self) {
 	page_window_switched_pages (self, old_page, NULL);
 #line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (old_page);
-#line 1710 "AppWindow.c"
+#line 1701 "AppWindow.c"
 }
 
 
@@ -1743,7 +1734,7 @@ void page_window_clear_current_page (PageWindow* self) {
 	g_return_if_fail (IS_PAGE_WINDOW (self));
 #line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	PAGE_WINDOW_GET_CLASS (self)->clear_current_page (self);
-#line 1719 "AppWindow.c"
+#line 1710 "AppWindow.c"
 }
 
 
@@ -1751,9 +1742,9 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 	PageWindow * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	GtkWidget* _tmp1_ = NULL;
+	GtkWidget* _tmp1_;
 	gboolean _tmp5_ = FALSE;
-	Page* _tmp6_ = NULL;
+	Page* _tmp6_;
 	gboolean _tmp10_ = FALSE;
 #line 317 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
@@ -1763,9 +1754,9 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 	_tmp1_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
 #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_entry_get_type ())) {
-#line 1739 "AppWindow.c"
-		GtkWidget* _tmp2_ = NULL;
-		GdkEventKey* _tmp3_ = NULL;
+#line 1730 "AppWindow.c"
+		GtkWidget* _tmp2_;
+		GdkEventKey* _tmp3_;
 		gboolean _tmp4_ = FALSE;
 #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
@@ -1775,11 +1766,11 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 		g_signal_emit_by_name (_tmp2_, "key-press-event", _tmp3_, &_tmp4_);
 #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 1751 "AppWindow.c"
+#line 1742 "AppWindow.c"
 	} else {
 #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 1755 "AppWindow.c"
+#line 1746 "AppWindow.c"
 	}
 #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
@@ -1787,16 +1778,16 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 		result = TRUE;
 #line 319 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1763 "AppWindow.c"
+#line 1754 "AppWindow.c"
 	}
 #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = self->priv->current_page;
 #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 1769 "AppWindow.c"
-		Page* _tmp7_ = NULL;
-		GdkEventKey* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
+#line 1760 "AppWindow.c"
+		Page* _tmp7_;
+		GdkEventKey* _tmp8_;
+		gboolean _tmp9_;
 #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = self->priv->current_page;
 #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1805,11 +1796,11 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 		_tmp9_ = page_notify_app_key_pressed (_tmp7_, _tmp8_);
 #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp9_;
-#line 1781 "AppWindow.c"
+#line 1772 "AppWindow.c"
 	} else {
 #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 1785 "AppWindow.c"
+#line 1776 "AppWindow.c"
 	}
 #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
@@ -1817,30 +1808,30 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 		result = TRUE;
 #line 322 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1793 "AppWindow.c"
+#line 1784 "AppWindow.c"
 	}
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event != NULL) {
-#line 1797 "AppWindow.c"
-		GdkEventKey* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
+#line 1788 "AppWindow.c"
+		GdkEventKey* _tmp11_;
+		gboolean _tmp12_;
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = event;
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp11_);
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp12_;
-#line 1806 "AppWindow.c"
+#line 1797 "AppWindow.c"
 	} else {
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = FALSE;
-#line 1810 "AppWindow.c"
+#line 1801 "AppWindow.c"
 	}
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp10_;
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1816 "AppWindow.c"
+#line 1807 "AppWindow.c"
 }
 
 
@@ -1848,9 +1839,9 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 	PageWindow * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	GtkWidget* _tmp1_ = NULL;
+	GtkWidget* _tmp1_;
 	gboolean _tmp5_ = FALSE;
-	Page* _tmp6_ = NULL;
+	Page* _tmp6_;
 	gboolean _tmp10_ = FALSE;
 #line 327 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
@@ -1860,9 +1851,9 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 	_tmp1_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
 #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_entry_get_type ())) {
-#line 1836 "AppWindow.c"
-		GtkWidget* _tmp2_ = NULL;
-		GdkEventKey* _tmp3_ = NULL;
+#line 1827 "AppWindow.c"
+		GtkWidget* _tmp2_;
+		GdkEventKey* _tmp3_;
 		gboolean _tmp4_ = FALSE;
 #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
@@ -1872,11 +1863,11 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 		g_signal_emit_by_name (_tmp2_, "key-release-event", _tmp3_, &_tmp4_);
 #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 1848 "AppWindow.c"
+#line 1839 "AppWindow.c"
 	} else {
 #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 1852 "AppWindow.c"
+#line 1843 "AppWindow.c"
 	}
 #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
@@ -1884,16 +1875,16 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 		result = TRUE;
 #line 329 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1860 "AppWindow.c"
+#line 1851 "AppWindow.c"
 	}
 #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = self->priv->current_page;
 #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 1866 "AppWindow.c"
-		Page* _tmp7_ = NULL;
-		GdkEventKey* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
+#line 1857 "AppWindow.c"
+		Page* _tmp7_;
+		GdkEventKey* _tmp8_;
+		gboolean _tmp9_;
 #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = self->priv->current_page;
 #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1902,11 +1893,11 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 		_tmp9_ = page_notify_app_key_released (_tmp7_, _tmp8_);
 #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp9_;
-#line 1878 "AppWindow.c"
+#line 1869 "AppWindow.c"
 	} else {
 #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 1882 "AppWindow.c"
+#line 1873 "AppWindow.c"
 	}
 #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
@@ -1914,30 +1905,30 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 		result = TRUE;
 #line 332 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1890 "AppWindow.c"
+#line 1881 "AppWindow.c"
 	}
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event != NULL) {
-#line 1894 "AppWindow.c"
-		GdkEventKey* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
+#line 1885 "AppWindow.c"
+		GdkEventKey* _tmp11_;
+		gboolean _tmp12_;
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = event;
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp11_);
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp12_;
-#line 1903 "AppWindow.c"
+#line 1894 "AppWindow.c"
 	} else {
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = FALSE;
-#line 1907 "AppWindow.c"
+#line 1898 "AppWindow.c"
 	}
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp10_;
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1913 "AppWindow.c"
+#line 1904 "AppWindow.c"
 }
 
 
@@ -1945,7 +1936,7 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus*
 	PageWindow * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	Page* _tmp1_ = NULL;
+	Page* _tmp1_;
 	gboolean _tmp5_ = FALSE;
 #line 337 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
@@ -1955,10 +1946,10 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus*
 	_tmp1_ = self->priv->current_page;
 #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 1931 "AppWindow.c"
-		Page* _tmp2_ = NULL;
-		GdkEventFocus* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+#line 1922 "AppWindow.c"
+		Page* _tmp2_;
+		GdkEventFocus* _tmp3_;
+		gboolean _tmp4_;
 #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = self->priv->current_page;
 #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1967,11 +1958,11 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus*
 		_tmp4_ = page_notify_app_focus_in (_tmp2_, _tmp3_);
 #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 1943 "AppWindow.c"
+#line 1934 "AppWindow.c"
 	} else {
 #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 1947 "AppWindow.c"
+#line 1938 "AppWindow.c"
 	}
 #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
@@ -1979,30 +1970,30 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus*
 		result = TRUE;
 #line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1955 "AppWindow.c"
+#line 1946 "AppWindow.c"
 	}
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_in_event != NULL) {
-#line 1959 "AppWindow.c"
-		GdkEventFocus* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+#line 1950 "AppWindow.c"
+		GdkEventFocus* _tmp6_;
+		gboolean _tmp7_;
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = event;
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_in_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp6_);
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp7_;
-#line 1968 "AppWindow.c"
+#line 1959 "AppWindow.c"
 	} else {
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 1972 "AppWindow.c"
+#line 1963 "AppWindow.c"
 	}
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp5_;
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1978 "AppWindow.c"
+#line 1969 "AppWindow.c"
 }
 
 
@@ -2010,7 +2001,7 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus
 	PageWindow * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	Page* _tmp1_ = NULL;
+	Page* _tmp1_;
 	gboolean _tmp5_ = FALSE;
 #line 344 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
@@ -2020,10 +2011,10 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus
 	_tmp1_ = self->priv->current_page;
 #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 1996 "AppWindow.c"
-		Page* _tmp2_ = NULL;
-		GdkEventFocus* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+#line 1987 "AppWindow.c"
+		Page* _tmp2_;
+		GdkEventFocus* _tmp3_;
+		gboolean _tmp4_;
 #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = self->priv->current_page;
 #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2032,11 +2023,11 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus
 		_tmp4_ = page_notify_app_focus_out (_tmp2_, _tmp3_);
 #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 2008 "AppWindow.c"
+#line 1999 "AppWindow.c"
 	} else {
 #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 2012 "AppWindow.c"
+#line 2003 "AppWindow.c"
 	}
 #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
@@ -2044,37 +2035,37 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus
 		result = TRUE;
 #line 346 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 2020 "AppWindow.c"
+#line 2011 "AppWindow.c"
 	}
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event != NULL) {
-#line 2024 "AppWindow.c"
-		GdkEventFocus* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+#line 2015 "AppWindow.c"
+		GdkEventFocus* _tmp6_;
+		gboolean _tmp7_;
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = event;
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp6_);
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp7_;
-#line 2033 "AppWindow.c"
+#line 2024 "AppWindow.c"
 	} else {
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 2037 "AppWindow.c"
+#line 2028 "AppWindow.c"
 	}
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp5_;
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2043 "AppWindow.c"
+#line 2034 "AppWindow.c"
 }
 
 
 static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfigure* event) {
 	PageWindow * self;
 	gboolean result = FALSE;
-	Page* _tmp0_ = NULL;
+	Page* _tmp0_;
 	gboolean _tmp4_ = FALSE;
 #line 351 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
@@ -2084,10 +2075,10 @@ static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfi
 	_tmp0_ = self->priv->current_page;
 #line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 2060 "AppWindow.c"
-		Page* _tmp1_ = NULL;
-		GdkEventConfigure* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+#line 2051 "AppWindow.c"
+		Page* _tmp1_;
+		GdkEventConfigure* _tmp2_;
+		gboolean _tmp3_;
 #line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = self->priv->current_page;
 #line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2100,45 +2091,45 @@ static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfi
 			result = TRUE;
 #line 354 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return result;
-#line 2076 "AppWindow.c"
+#line 2067 "AppWindow.c"
 		}
 	}
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->configure_event != NULL) {
-#line 2081 "AppWindow.c"
-		GdkEventConfigure* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+#line 2072 "AppWindow.c"
+		GdkEventConfigure* _tmp5_;
+		gboolean _tmp6_;
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = event;
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = GTK_WIDGET_CLASS (page_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp6_;
-#line 2090 "AppWindow.c"
+#line 2081 "AppWindow.c"
 	} else {
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = FALSE;
-#line 2094 "AppWindow.c"
+#line 2085 "AppWindow.c"
 	}
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp4_;
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2100 "AppWindow.c"
+#line 2091 "AppWindow.c"
 }
 
 
 void page_window_set_busy_cursor (PageWindow* self) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GdkDisplay* display = NULL;
-	GdkWindow* _tmp1_ = NULL;
-	GdkDisplay* _tmp2_ = NULL;
-	GdkDisplay* _tmp3_ = NULL;
+	GdkWindow* _tmp1_;
+	GdkDisplay* _tmp2_;
+	GdkDisplay* _tmp3_;
 	GdkCursor* cursor = NULL;
-	GdkDisplay* _tmp4_ = NULL;
-	GdkCursor* _tmp5_ = NULL;
-	GdkWindow* _tmp6_ = NULL;
-	GdkCursor* _tmp7_ = NULL;
+	GdkDisplay* _tmp4_;
+	GdkCursor* _tmp5_;
+	GdkWindow* _tmp6_;
+	GdkCursor* _tmp7_;
 #line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE_WINDOW (self));
 #line 361 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2149,7 +2140,7 @@ void page_window_set_busy_cursor (PageWindow* self) {
 	if (_tmp0_ > 0) {
 #line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 2125 "AppWindow.c"
+#line 2116 "AppWindow.c"
 	}
 #line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -2177,21 +2168,21 @@ void page_window_set_busy_cursor (PageWindow* self) {
 	_g_object_unref0 (cursor);
 #line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (display);
-#line 2153 "AppWindow.c"
+#line 2144 "AppWindow.c"
 }
 
 
 void page_window_set_normal_cursor (PageWindow* self) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GdkDisplay* display = NULL;
-	GdkWindow* _tmp3_ = NULL;
-	GdkDisplay* _tmp4_ = NULL;
-	GdkDisplay* _tmp5_ = NULL;
+	GdkWindow* _tmp3_;
+	GdkDisplay* _tmp4_;
+	GdkDisplay* _tmp5_;
 	GdkCursor* cursor = NULL;
-	GdkDisplay* _tmp6_ = NULL;
-	GdkCursor* _tmp7_ = NULL;
-	GdkWindow* _tmp8_ = NULL;
-	GdkCursor* _tmp9_ = NULL;
+	GdkDisplay* _tmp6_;
+	GdkCursor* _tmp7_;
+	GdkWindow* _tmp8_;
+	GdkCursor* _tmp9_;
 #line 370 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE_WINDOW (self));
 #line 371 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2202,10 +2193,10 @@ void page_window_set_normal_cursor (PageWindow* self) {
 		self->priv->busy_counter = 0;
 #line 373 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 2178 "AppWindow.c"
+#line 2169 "AppWindow.c"
 	} else {
-		gint _tmp1_ = 0;
-		gint _tmp2_ = 0;
+		gint _tmp1_;
+		gint _tmp2_;
 #line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = self->priv->busy_counter;
 #line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2216,7 +2207,7 @@ void page_window_set_normal_cursor (PageWindow* self) {
 		if (_tmp2_ > 0) {
 #line 375 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 2192 "AppWindow.c"
+#line 2183 "AppWindow.c"
 		}
 	}
 #line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2245,7 +2236,7 @@ void page_window_set_normal_cursor (PageWindow* self) {
 	_g_object_unref0 (cursor);
 #line 370 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (display);
-#line 2221 "AppWindow.c"
+#line 2212 "AppWindow.c"
 }
 
 
@@ -2255,24 +2246,24 @@ static void page_window_class_init (PageWindowClass * klass) {
 #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_type_class_add_private (klass, sizeof (PageWindowPrivate));
 #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((PageWindowClass *) klass)->switched_pages = (void (*)(PageWindow*, Page*, Page*)) page_window_real_switched_pages;
+	((PageWindowClass *) klass)->switched_pages = (void (*) (PageWindow *, Page*, Page*)) page_window_real_switched_pages;
 #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((PageWindowClass *) klass)->set_current_page = (void (*)(PageWindow*, Page*)) page_window_real_set_current_page;
+	((PageWindowClass *) klass)->set_current_page = (void (*) (PageWindow *, Page*)) page_window_real_set_current_page;
 #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((PageWindowClass *) klass)->clear_current_page = (void (*)(PageWindow*)) page_window_real_clear_current_page;
+	((PageWindowClass *) klass)->clear_current_page = (void (*) (PageWindow *)) page_window_real_clear_current_page;
 #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) page_window_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) page_window_real_key_press_event;
 #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((GtkWidgetClass *) klass)->key_release_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) page_window_real_key_release_event;
+	((GtkWidgetClass *) klass)->key_release_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) page_window_real_key_release_event;
 #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((GtkWidgetClass *) klass)->focus_in_event = (gboolean (*)(GtkWidget*, GdkEventFocus*)) page_window_real_focus_in_event;
+	((GtkWidgetClass *) klass)->focus_in_event = (gboolean (*) (GtkWidget *, GdkEventFocus*)) page_window_real_focus_in_event;
 #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((GtkWidgetClass *) klass)->focus_out_event = (gboolean (*)(GtkWidget*, GdkEventFocus*)) page_window_real_focus_out_event;
+	((GtkWidgetClass *) klass)->focus_out_event = (gboolean (*) (GtkWidget *, GdkEventFocus*)) page_window_real_focus_out_event;
 #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((GtkWidgetClass *) klass)->configure_event = (gboolean (*)(GtkWidget*, GdkEventConfigure*)) page_window_real_configure_event;
+	((GtkWidgetClass *) klass)->configure_event = (gboolean (*) (GtkWidget *, GdkEventConfigure*)) page_window_real_configure_event;
 #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_window_finalize;
-#line 2248 "AppWindow.c"
+#line 2239 "AppWindow.c"
 }
 
 
@@ -2283,11 +2274,11 @@ static void page_window_instance_init (PageWindow * self) {
 	self->priv->current_page = NULL;
 #line 278 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->busy_counter = 0;
-#line 2259 "AppWindow.c"
+#line 2250 "AppWindow.c"
 }
 
 
-static void page_window_finalize (GObject* obj) {
+static void page_window_finalize (GObject * obj) {
 	PageWindow * self;
 #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_WINDOW, PageWindow);
@@ -2295,7 +2286,7 @@ static void page_window_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->current_page);
 #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (page_window_parent_class)->finalize (obj);
-#line 2271 "AppWindow.c"
+#line 2262 "AppWindow.c"
 }
 
 
@@ -2314,101 +2305,101 @@ GType page_window_get_type (void) {
 static void _app_window_on_about_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_about ((AppWindow*) self);
-#line 2290 "AppWindow.c"
+#line 2281 "AppWindow.c"
 }
 
 
 static void _app_window_on_quit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_quit ((AppWindow*) self);
-#line 2297 "AppWindow.c"
+#line 2288 "AppWindow.c"
 }
 
 
 static void _app_window_on_fullscreen_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_fullscreen ((AppWindow*) self);
-#line 2304 "AppWindow.c"
+#line 2295 "AppWindow.c"
 }
 
 
 static void _app_window_on_help_contents_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_help_contents ((AppWindow*) self);
-#line 2311 "AppWindow.c"
+#line 2302 "AppWindow.c"
 }
 
 
 static void _app_window_on_help_faq_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_help_faq ((AppWindow*) self);
-#line 2318 "AppWindow.c"
+#line 2309 "AppWindow.c"
 }
 
 
 static void _app_window_on_help_report_problem_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_help_report_problem ((AppWindow*) self);
-#line 2325 "AppWindow.c"
+#line 2316 "AppWindow.c"
 }
 
 
 static void _app_window_on_undo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_undo ((AppWindow*) self);
-#line 2332 "AppWindow.c"
+#line 2323 "AppWindow.c"
 }
 
 
 static void _app_window_on_redo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_redo ((AppWindow*) self);
-#line 2339 "AppWindow.c"
+#line 2330 "AppWindow.c"
 }
 
 
 static void _app_window_on_jump_to_file_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_jump_to_file ((AppWindow*) self);
-#line 2346 "AppWindow.c"
+#line 2337 "AppWindow.c"
 }
 
 
 static void _app_window_on_select_all_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_select_all ((AppWindow*) self);
-#line 2353 "AppWindow.c"
+#line 2344 "AppWindow.c"
 }
 
 
 static void _app_window_on_select_none_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_select_none ((AppWindow*) self);
-#line 2360 "AppWindow.c"
+#line 2351 "AppWindow.c"
 }
 
 
 static void _app_window_on_command_manager_altered_command_manager_altered (CommandManager* _sender, gboolean can_undo, gboolean can_redo, gpointer self) {
 #line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_command_manager_altered ((AppWindow*) self);
-#line 2367 "AppWindow.c"
+#line 2358 "AppWindow.c"
 }
 
 
 AppWindow* app_window_construct (GType object_type) {
 	AppWindow * self = NULL;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-	Dimensions _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	Dimensions _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	gboolean _tmp14_ = FALSE;
-	CommandManager* _tmp15_ = NULL;
-	CommandManager* _tmp16_ = NULL;
-	CommandManager* _tmp17_ = NULL;
+	AppWindow* _tmp0_;
+	AppWindow* _tmp1_;
+	Dimensions _tmp10_;
+	gint _tmp11_;
+	Dimensions _tmp12_;
+	gint _tmp13_;
+	gboolean _tmp14_;
+	CommandManager* _tmp15_;
+	CommandManager* _tmp16_;
+	CommandManager* _tmp17_;
 	GtkCssProvider* provider = NULL;
-	GtkCssProvider* _tmp18_ = NULL;
+	GtkCssProvider* _tmp18_;
 	GError * _inner_error_ = NULL;
 #line 407 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = (AppWindow*) page_window_construct (object_type);
@@ -2428,9 +2419,9 @@ AppWindow* app_window_construct (GType object_type) {
 	gtk_window_set_default_icon_name ("shotwell");
 #line 416 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_LIBRARY_WINDOW)) {
-#line 2404 "AppWindow.c"
-		ConfigFacade* _tmp2_ = NULL;
-		ConfigFacade* _tmp3_ = NULL;
+#line 2395 "AppWindow.c"
+		ConfigFacade* _tmp2_;
+		ConfigFacade* _tmp3_;
 		gboolean _tmp4_ = FALSE;
 		Dimensions _tmp5_ = {0};
 #line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2445,10 +2436,10 @@ AppWindow* app_window_construct (GType object_type) {
 		self->dimensions = _tmp5_;
 #line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2421 "AppWindow.c"
+#line 2412 "AppWindow.c"
 	} else {
-		ConfigFacade* _tmp6_ = NULL;
-		ConfigFacade* _tmp7_ = NULL;
+		ConfigFacade* _tmp6_;
+		ConfigFacade* _tmp7_;
 		gboolean _tmp8_ = FALSE;
 		Dimensions _tmp9_ = {0};
 #line 419 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2465,7 +2456,7 @@ AppWindow* app_window_construct (GType object_type) {
 		self->dimensions = _tmp9_;
 #line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 2441 "AppWindow.c"
+#line 2432 "AppWindow.c"
 	}
 #line 423 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = self->dimensions;
@@ -2483,7 +2474,7 @@ AppWindow* app_window_construct (GType object_type) {
 	if (_tmp14_) {
 #line 426 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_window_maximize (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 2459 "AppWindow.c"
+#line 2450 "AppWindow.c"
 	}
 #line 428 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = app_window_command_manager;
@@ -2505,28 +2496,28 @@ AppWindow* app_window_construct (GType object_type) {
 	_tmp18_ = gtk_css_provider_new ();
 #line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	provider = _tmp18_;
-#line 2481 "AppWindow.c"
+#line 2472 "AppWindow.c"
 	{
-		GdkScreen* _tmp19_ = NULL;
+		GdkScreen* _tmp19_;
 #line 442 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_css_provider_load_from_data (provider, RESOURCES_CUSTOM_CSS, (gssize) -1, &_inner_error_);
 #line 442 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2488 "AppWindow.c"
-			goto __catch226_g_error;
+#line 2479 "AppWindow.c"
+			goto __catch227_g_error;
 		}
 #line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp19_ = gdk_screen_get_default ();
 #line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_style_context_add_provider_for_screen (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (provider, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-#line 2495 "AppWindow.c"
+#line 2486 "AppWindow.c"
 	}
-	goto __finally226;
-	__catch226_g_error:
+	goto __finally227;
+	__catch227_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
+		GError* _tmp20_;
+		const gchar* _tmp21_;
 #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
 #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2539,9 +2530,9 @@ AppWindow* app_window_construct (GType object_type) {
 		g_debug ("AppWindow.vala:445: Unable to load custom CSS: %s", _tmp21_);
 #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 2515 "AppWindow.c"
+#line 2506 "AppWindow.c"
 	}
-	__finally226:
+	__finally227:
 #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2552,13 +2543,13 @@ AppWindow* app_window_construct (GType object_type) {
 		g_clear_error (&_inner_error_);
 #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return NULL;
-#line 2528 "AppWindow.c"
+#line 2519 "AppWindow.c"
 	}
 #line 407 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (provider);
 #line 407 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self;
-#line 2534 "AppWindow.c"
+#line 2525 "AppWindow.c"
 }
 
 
@@ -2567,7 +2558,7 @@ static void app_window_real_on_fullscreen (AppWindow* self) {
 	g_critical ("Type `%s' does not implement abstract method `app_window_on_fullscreen'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 463 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return;
-#line 2543 "AppWindow.c"
+#line 2534 "AppWindow.c"
 }
 
 
@@ -2576,27 +2567,27 @@ void app_window_on_fullscreen (AppWindow* self) {
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 463 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->on_fullscreen (self);
-#line 2552 "AppWindow.c"
+#line 2543 "AppWindow.c"
 }
 
 
 gboolean app_window_has_instance (void) {
 	gboolean result = FALSE;
-	AppWindow* _tmp0_ = NULL;
+	AppWindow* _tmp0_;
 #line 466 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_instance;
 #line 466 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp0_ != NULL;
 #line 466 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2565 "AppWindow.c"
+#line 2556 "AppWindow.c"
 }
 
 
 AppWindow* app_window_get_instance (void) {
 	AppWindow* result = NULL;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	AppWindow* _tmp0_;
+	AppWindow* _tmp1_;
 #line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_instance;
 #line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2605,14 +2596,14 @@ AppWindow* app_window_get_instance (void) {
 	result = _tmp1_;
 #line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2581 "AppWindow.c"
+#line 2572 "AppWindow.c"
 }
 
 
 FullscreenWindow* app_window_get_fullscreen (void) {
 	FullscreenWindow* result = NULL;
-	FullscreenWindow* _tmp0_ = NULL;
-	FullscreenWindow* _tmp1_ = NULL;
+	FullscreenWindow* _tmp0_;
+	FullscreenWindow* _tmp1_;
 #line 474 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_fullscreen_window;
 #line 474 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2621,15 +2612,15 @@ FullscreenWindow* app_window_get_fullscreen (void) {
 	result = _tmp1_;
 #line 474 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2597 "AppWindow.c"
+#line 2588 "AppWindow.c"
 }
 
 
 GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user) {
 	GtkBuilder* result = NULL;
 	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	void* _tmp6_ = NULL;
+	GtkBuilder* _tmp0_;
+	void* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 477 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (glade_filename != NULL, NULL);
@@ -2637,11 +2628,11 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 	_tmp0_ = gtk_builder_new ();
 #line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	builder = _tmp0_;
-#line 2613 "AppWindow.c"
+#line 2604 "AppWindow.c"
 	{
-		const gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+		const gchar* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
 #line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = glade_filename;
 #line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2654,16 +2645,16 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 		_g_free0 (_tmp3_);
 #line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2630 "AppWindow.c"
-			goto __catch227_g_error;
+#line 2621 "AppWindow.c"
+			goto __catch228_g_error;
 		}
 	}
-	goto __finally227;
-	__catch227_g_error:
+	goto __finally228;
+	__catch228_g_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+		GError* _tmp4_;
+		const gchar* _tmp5_;
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_error_ = _inner_error_;
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2676,9 +2667,9 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 		g_warning ("AppWindow.vala:482: Unable to create Gtk.Builder: %s\n", _tmp5_);
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (_error_);
-#line 2652 "AppWindow.c"
+#line 2643 "AppWindow.c"
 	}
-	__finally227:
+	__finally228:
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2689,7 +2680,7 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 		g_clear_error (&_inner_error_);
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return NULL;
-#line 2665 "AppWindow.c"
+#line 2656 "AppWindow.c"
 	}
 #line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = user;
@@ -2699,13 +2690,13 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 	result = builder;
 #line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2675 "AppWindow.c"
+#line 2666 "AppWindow.c"
 }
 
 
 void app_window_error_message (const gchar* message, GtkWindow* parent) {
-	const gchar* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	GtkWindow* _tmp1_;
 #line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (message != NULL);
 #line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2716,26 +2707,26 @@ void app_window_error_message (const gchar* message, GtkWindow* parent) {
 	_tmp1_ = parent;
 #line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_error_message_with_title (RESOURCES_APP_TITLE, _tmp0_, _tmp1_, TRUE);
-#line 2692 "AppWindow.c"
+#line 2683 "AppWindow.c"
 }
 
 
 void app_window_error_message_with_title (const gchar* title, const gchar* message, GtkWindow* parent, gboolean should_escape) {
 	GtkWindow* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
+	GtkWindow* _tmp1_;
 	GtkMessageDialog* dialog = NULL;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	GtkMessageDialog* _tmp10_ = NULL;
-	GtkMessageDialog* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
+	const gchar* _tmp5_;
+	const gchar* _tmp6_;
+	gboolean _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	GtkMessageDialog* _tmp10_;
+	GtkMessageDialog* _tmp11_;
+	const gchar* _tmp12_;
+	const gchar* _tmp13_;
+	gboolean _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
 #line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (title != NULL);
 #line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2746,9 +2737,9 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa
 	_tmp1_ = parent;
 #line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2722 "AppWindow.c"
-		GtkWindow* _tmp2_ = NULL;
-		GtkWindow* _tmp3_ = NULL;
+#line 2713 "AppWindow.c"
+		GtkWindow* _tmp2_;
+		GtkWindow* _tmp3_;
 #line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
 #line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2757,16 +2748,16 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa
 		_g_object_unref0 (_tmp0_);
 #line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2733 "AppWindow.c"
+#line 2724 "AppWindow.c"
 	} else {
-		AppWindow* _tmp4_ = NULL;
+		AppWindow* _tmp4_;
 #line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
 #line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
 #line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2742 "AppWindow.c"
+#line 2733 "AppWindow.c"
 	}
 #line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
@@ -2812,29 +2803,29 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa
 	_g_object_unref0 (dialog);
 #line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 2788 "AppWindow.c"
+#line 2779 "AppWindow.c"
 }
 
 
 gboolean app_window_negate_affirm_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* title, GtkWindow* parent) {
 	gboolean result = FALSE;
 	GtkWindow* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
+	GtkWindow* _tmp1_;
 	GtkMessageDialog* dialog = NULL;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	GtkMessageDialog* _tmp9_ = NULL;
-	GtkMessageDialog* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
+	const gchar* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	GtkMessageDialog* _tmp9_;
+	GtkMessageDialog* _tmp10_;
+	const gchar* _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	const gchar* _tmp15_;
+	const gchar* _tmp16_;
 	gboolean response = FALSE;
-	gint _tmp17_ = 0;
+	gint _tmp17_;
 #line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, FALSE);
 #line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2847,9 +2838,9 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n
 	_tmp1_ = parent;
 #line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2823 "AppWindow.c"
-		GtkWindow* _tmp2_ = NULL;
-		GtkWindow* _tmp3_ = NULL;
+#line 2814 "AppWindow.c"
+		GtkWindow* _tmp2_;
+		GtkWindow* _tmp3_;
 #line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
 #line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2858,16 +2849,16 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n
 		_g_object_unref0 (_tmp0_);
 #line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2834 "AppWindow.c"
+#line 2825 "AppWindow.c"
 	} else {
-		AppWindow* _tmp4_ = NULL;
+		AppWindow* _tmp4_;
 #line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
 #line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
 #line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2843 "AppWindow.c"
+#line 2834 "AppWindow.c"
 	}
 #line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
@@ -2921,30 +2912,29 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n
 	_g_object_unref0 (_tmp0_);
 #line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2897 "AppWindow.c"
+#line 2888 "AppWindow.c"
 }
 
 
 GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* title, GtkWindow* parent) {
 	GtkResponseType result = 0;
 	GtkWindow* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
+	GtkWindow* _tmp1_;
 	GtkMessageDialog* dialog = NULL;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	GtkMessageDialog* _tmp9_ = NULL;
-	GtkMessageDialog* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
+	const gchar* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	GtkMessageDialog* _tmp9_;
+	GtkMessageDialog* _tmp10_;
+	const gchar* _tmp11_;
+	const gchar* _tmp12_;
+	const gchar* _tmp13_;
+	const gchar* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
 	gint response = 0;
-	gint _tmp18_ = 0;
+	gint _tmp17_;
 #line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
 #line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2957,9 +2947,9 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
 	_tmp1_ = parent;
 #line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2933 "AppWindow.c"
-		GtkWindow* _tmp2_ = NULL;
-		GtkWindow* _tmp3_ = NULL;
+#line 2923 "AppWindow.c"
+		GtkWindow* _tmp2_;
+		GtkWindow* _tmp3_;
 #line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
 #line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2968,16 +2958,16 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
 		_g_object_unref0 (_tmp0_);
 #line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2944 "AppWindow.c"
+#line 2934 "AppWindow.c"
 	} else {
-		AppWindow* _tmp4_ = NULL;
+		AppWindow* _tmp4_;
 #line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
 #line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
 #line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2953 "AppWindow.c"
+#line 2943 "AppWindow.c"
 	}
 #line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
@@ -3002,27 +2992,25 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
 #line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = affirmative;
 #line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp13_ = _ ("_Cancel");
-#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp11_, GTK_RESPONSE_NO, _tmp12_, GTK_RESPONSE_YES, _tmp13_, GTK_RESPONSE_CANCEL, NULL);
+	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp11_, GTK_RESPONSE_NO, _tmp12_, GTK_RESPONSE_YES, _ ("_Cancel"), GTK_RESPONSE_CANCEL, NULL);
 #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp14_ = title;
+	_tmp13_ = title;
 #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp15_ = message;
+	_tmp14_ = message;
 #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp16_ = build_alert_body_text (_tmp14_, _tmp15_, TRUE);
+	_tmp15_ = build_alert_body_text (_tmp13_, _tmp14_, TRUE);
 #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp17_ = _tmp16_;
+	_tmp16_ = _tmp15_;
 #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_message_dialog_set_markup (dialog, _tmp17_);
+	gtk_message_dialog_set_markup (dialog, _tmp16_);
 #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_free0 (_tmp17_);
+	_g_free0 (_tmp16_);
 #line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_set (dialog, "use-markup", TRUE, NULL);
 #line 537 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
+	_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
 #line 537 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	response = _tmp18_;
+	response = _tmp17_;
 #line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
 #line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3033,30 +3021,29 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
 	_g_object_unref0 (_tmp0_);
 #line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3009 "AppWindow.c"
+#line 2997 "AppWindow.c"
 }
 
 
 GtkResponseType app_window_affirm_cancel_question (const gchar* message, const gchar* affirmative, const gchar* title, GtkWindow* parent) {
 	GtkResponseType result = 0;
 	GtkWindow* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
+	GtkWindow* _tmp1_;
 	GtkMessageDialog* dialog = NULL;
-	const gchar* _tmp5_ = NULL;
-	GtkMessageDialog* _tmp6_ = NULL;
-	GtkMessageDialog* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkMessageDialog* _tmp9_ = NULL;
+	const gchar* _tmp5_;
+	GtkMessageDialog* _tmp6_;
+	GtkMessageDialog* _tmp7_;
+	const gchar* _tmp8_;
+	GtkMessageDialog* _tmp9_;
 	const gchar* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	GtkMessageDialog* _tmp13_ = NULL;
-	GtkMessageDialog* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
+	const gchar* _tmp11_;
+	GtkMessageDialog* _tmp13_;
+	GtkMessageDialog* _tmp14_;
+	const gchar* _tmp15_;
 	gint response = 0;
-	GtkMessageDialog* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	GtkMessageDialog* _tmp19_ = NULL;
+	GtkMessageDialog* _tmp16_;
+	gint _tmp17_;
+	GtkMessageDialog* _tmp18_;
 #line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
 #line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3067,9 +3054,9 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
 	_tmp1_ = parent;
 #line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 3043 "AppWindow.c"
-		GtkWindow* _tmp2_ = NULL;
-		GtkWindow* _tmp3_ = NULL;
+#line 3030 "AppWindow.c"
+		GtkWindow* _tmp2_;
+		GtkWindow* _tmp3_;
 #line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
 #line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3078,16 +3065,16 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
 		_g_object_unref0 (_tmp0_);
 #line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 3054 "AppWindow.c"
+#line 3041 "AppWindow.c"
 	} else {
-		AppWindow* _tmp4_ = NULL;
+		AppWindow* _tmp4_;
 #line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
 #line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
 #line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3063 "AppWindow.c"
+#line 3050 "AppWindow.c"
 	}
 #line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = message;
@@ -3111,17 +3098,17 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
 	_tmp11_ = title;
 #line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp11_ != NULL) {
-#line 3087 "AppWindow.c"
-		const gchar* _tmp12_ = NULL;
+#line 3074 "AppWindow.c"
+		const gchar* _tmp12_;
 #line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = title;
 #line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp12_;
-#line 3093 "AppWindow.c"
+#line 3080 "AppWindow.c"
 	} else {
 #line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = RESOURCES_APP_TITLE;
-#line 3097 "AppWindow.c"
+#line 3084 "AppWindow.c"
 	}
 #line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = dialog;
@@ -3132,19 +3119,17 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
 #line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = affirmative;
 #line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp16_ = _ ("_Cancel");
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_YES, _tmp16_, GTK_RESPONSE_CANCEL, NULL);
+	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_YES, _ ("_Cancel"), GTK_RESPONSE_CANCEL, NULL);
 #line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp17_ = dialog;
+	_tmp16_ = dialog;
 #line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_dialog_get_type (), GtkDialog));
+	_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_dialog_get_type (), GtkDialog));
 #line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	response = _tmp18_;
+	response = _tmp17_;
 #line 557 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp19_ = dialog;
+	_tmp18_ = dialog;
 #line 557 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
 #line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = (GtkResponseType) response;
 #line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3153,29 +3138,28 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
 	_g_object_unref0 (_tmp0_);
 #line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3129 "AppWindow.c"
+#line 3114 "AppWindow.c"
 }
 
 
 GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* affirmative_all, const gchar* title, GtkWindow* parent) {
 	GtkResponseType result = 0;
 	GtkWindow* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
+	GtkWindow* _tmp1_;
 	GtkMessageDialog* dialog = NULL;
-	const gchar* _tmp5_ = NULL;
-	GtkMessageDialog* _tmp6_ = NULL;
+	const gchar* _tmp5_;
+	GtkMessageDialog* _tmp6_;
 	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkMessageDialog* _tmp10_ = NULL;
-	GtkMessageDialog* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
+	const gchar* _tmp8_;
+	GtkMessageDialog* _tmp10_;
+	GtkMessageDialog* _tmp11_;
+	const gchar* _tmp12_;
+	const gchar* _tmp13_;
+	const gchar* _tmp14_;
 	gint response = 0;
-	GtkMessageDialog* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	GtkMessageDialog* _tmp18_ = NULL;
+	GtkMessageDialog* _tmp15_;
+	gint _tmp16_;
+	GtkMessageDialog* _tmp17_;
 #line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
 #line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3190,9 +3174,9 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
 	_tmp1_ = parent;
 #line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 3166 "AppWindow.c"
-		GtkWindow* _tmp2_ = NULL;
-		GtkWindow* _tmp3_ = NULL;
+#line 3150 "AppWindow.c"
+		GtkWindow* _tmp2_;
+		GtkWindow* _tmp3_;
 #line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
 #line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3201,16 +3185,16 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
 		_g_object_unref0 (_tmp0_);
 #line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 3177 "AppWindow.c"
+#line 3161 "AppWindow.c"
 	} else {
-		AppWindow* _tmp4_ = NULL;
+		AppWindow* _tmp4_;
 #line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
 #line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
 #line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3186 "AppWindow.c"
+#line 3170 "AppWindow.c"
 	}
 #line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = message;
@@ -3224,17 +3208,17 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
 	_tmp8_ = title;
 #line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp8_ != NULL) {
-#line 3200 "AppWindow.c"
-		const gchar* _tmp9_ = NULL;
+#line 3184 "AppWindow.c"
+		const gchar* _tmp9_;
 #line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = title;
 #line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = _tmp9_;
-#line 3206 "AppWindow.c"
+#line 3190 "AppWindow.c"
 	} else {
 #line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = RESOURCES_APP_TITLE;
-#line 3210 "AppWindow.c"
+#line 3194 "AppWindow.c"
 	}
 #line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = dialog;
@@ -3249,19 +3233,17 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
 #line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = affirmative_all;
 #line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp15_ = _ ("_Cancel");
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_dialog_get_type (), GtkDialog), _tmp12_, GTK_RESPONSE_NO, _tmp13_, GTK_RESPONSE_YES, _tmp14_, GTK_RESPONSE_APPLY, _tmp15_, GTK_RESPONSE_CANCEL, NULL);
+	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_dialog_get_type (), GtkDialog), _tmp12_, GTK_RESPONSE_NO, _tmp13_, GTK_RESPONSE_YES, _tmp14_, GTK_RESPONSE_APPLY, _ ("_Cancel"), GTK_RESPONSE_CANCEL, NULL);
 #line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp16_ = dialog;
+	_tmp15_ = dialog;
 #line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_dialog_get_type (), GtkDialog));
+	_tmp16_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_dialog_get_type (), GtkDialog));
 #line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	response = _tmp17_;
+	response = _tmp16_;
 #line 573 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp18_ = dialog;
+	_tmp17_ = dialog;
 #line 573 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget));
 #line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = (GtkResponseType) response;
 #line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3270,42 +3252,39 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
 	_g_object_unref0 (_tmp0_);
 #line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3246 "AppWindow.c"
+#line 3228 "AppWindow.c"
 }
 
 
 void app_window_database_error (GError* err) {
-	const gchar* _tmp0_ = NULL;
-	GError* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	GError* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp0_ = _ ("A fatal error occurred when accessing Shotwell’s library. Shotwell can" \
-"not continue.\n" \
-"\n" \
-"%s");
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_ = err;
+	_tmp0_ = err;
 #line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp2_ = _tmp1_->message;
+	_tmp1_ = _tmp0_->message;
 #line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
+	_tmp2_ = g_strdup_printf (_ ("A fatal error occurred when accessing Shotwell’s library. Shotwell can" \
+"not continue.\n" \
+"\n" \
+"%s"), _tmp1_);
 #line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_panic (_tmp4_);
+	app_window_panic (_tmp3_);
 #line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_free0 (_tmp4_);
-#line 3270 "AppWindow.c"
+	_g_free0 (_tmp3_);
+#line 3249 "AppWindow.c"
 }
 
 
 void app_window_panic (const gchar* msg) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	Application* _tmp2_ = NULL;
-	Application* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	Application* _tmp2_;
+	Application* _tmp3_;
 #line 583 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (msg != NULL);
 #line 584 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3324,7 +3303,7 @@ void app_window_panic (const gchar* msg) {
 	application_panic (_tmp3_);
 #line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_application_unref0 (_tmp3_);
-#line 3297 "AppWindow.c"
+#line 3276 "AppWindow.c"
 }
 
 
@@ -3333,7 +3312,7 @@ static gchar* app_window_real_get_app_role (AppWindow* self) {
 	g_critical ("Type `%s' does not implement abstract method `app_window_get_app_role'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return NULL;
-#line 3306 "AppWindow.c"
+#line 3285 "AppWindow.c"
 }
 
 
@@ -3342,7 +3321,7 @@ gchar* app_window_get_app_role (AppWindow* self) {
 	g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
 #line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return APP_WINDOW_GET_CLASS (self)->get_app_role (self);
-#line 3315 "AppWindow.c"
+#line 3294 "AppWindow.c"
 }
 
 
@@ -3350,16 +3329,13 @@ void app_window_on_about (AppWindow* self) {
 #line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	static const gchar* artists[] = {"Aachen logo under public domain license https://www.flickr.com/photos/" \
 "30784528@N04/10860988196/", NULL};
-#line 3322 "AppWindow.c"
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
-	GdkPixbuf* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
+#line 3301 "AppWindow.c"
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	GdkPixbuf* _tmp4_;
+	GdkPixbuf* _tmp5_;
 #line 592 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3367,28 +3343,22 @@ void app_window_on_about (AppWindow* self) {
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp2_ = _ (_tmp1_);
-#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp3_ = app_window_get_app_role (self);
-#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp4_ = _tmp3_;
-#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp5_ = _ ("Visit the Shotwell web site");
+	_tmp2_ = app_window_get_app_role (self);
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp6_ = resources_get_icon (RESOURCES_ICON_ABOUT_LOGO, -1);
+	_tmp3_ = _tmp2_;
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp7_ = _tmp6_;
+	_tmp4_ = resources_get_icon (RESOURCES_ICON_ABOUT_LOGO, -1);
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp8_ = _ ("translator-credits");
+	_tmp5_ = _tmp4_;
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_show_about_dialog (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), "version", _tmp2_, "comments", _tmp4_, "copyright", RESOURCES_COPYRIGHT, "website", RESOURCES_HOME_URL, "license", RESOURCES_LICENSE, "website-label", _tmp5_, "authors", RESOURCES_AUTHORS, "logo", _tmp7_, "artists", artists, "translator-credits", _tmp8_, NULL, NULL);
+	gtk_show_about_dialog (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), "version", _ (_tmp1_), "comments", _tmp3_, "copyright", RESOURCES_COPYRIGHT, "website", RESOURCES_HOME_URL, "license", RESOURCES_LICENSE, "website-label", _ ("Visit the Shotwell web site"), "authors", RESOURCES_AUTHORS, "logo", _tmp5_, "artists", artists, "translator-credits", _ ("translator-credits"), NULL, NULL);
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_object_unref0 (_tmp7_);
+	_g_object_unref0 (_tmp5_);
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_free0 (_tmp4_);
+	_g_free0 (_tmp3_);
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp1_);
-#line 3360 "AppWindow.c"
+#line 3330 "AppWindow.c"
 }
 
 
@@ -3396,51 +3366,48 @@ static void app_window_on_help_contents (AppWindow* self) {
 	GError * _inner_error_ = NULL;
 #line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3368 "AppWindow.c"
+#line 3338 "AppWindow.c"
 	{
-		GdkScreen* _tmp0_ = NULL;
+		GdkScreen* _tmp0_;
 #line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
 #line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		resources_launch_help (_tmp0_, NULL, &_inner_error_);
 #line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3377 "AppWindow.c"
-			goto __catch228_g_error;
+#line 3347 "AppWindow.c"
+			goto __catch229_g_error;
 		}
 	}
-	goto __finally228;
-	__catch228_g_error:
+	goto __finally229;
+	__catch229_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp1_ = NULL;
-		GError* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		GError* _tmp1_;
+		const gchar* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
 #line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
 #line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
 #line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp1_ = _ ("Unable to display help: %s");
-#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp2_ = err;
+		_tmp1_ = err;
 #line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp3_ = _tmp2_->message;
+		_tmp2_ = _tmp1_->message;
 #line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp4_ = g_strdup_printf (_tmp1_, _tmp3_);
+		_tmp3_ = g_strdup_printf (_ ("Unable to display help: %s"), _tmp2_);
 #line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = _tmp3_;
 #line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		app_window_error_message (_tmp5_, NULL);
+		app_window_error_message (_tmp4_, NULL);
 #line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_free0 (_tmp5_);
+		_g_free0 (_tmp4_);
 #line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3410 "AppWindow.c"
+#line 3377 "AppWindow.c"
 	}
-	__finally228:
+	__finally229:
 #line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3449,7 +3416,7 @@ static void app_window_on_help_contents (AppWindow* self) {
 		g_clear_error (&_inner_error_);
 #line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3421 "AppWindow.c"
+#line 3388 "AppWindow.c"
 	}
 }
 
@@ -3458,48 +3425,45 @@ static void app_window_on_help_report_problem (AppWindow* self) {
 	GError * _inner_error_ = NULL;
 #line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3430 "AppWindow.c"
+#line 3397 "AppWindow.c"
 	{
 #line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, RESOURCES_BUG_DB_URL, &_inner_error_);
 #line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3436 "AppWindow.c"
-			goto __catch229_g_error;
+#line 3403 "AppWindow.c"
+			goto __catch230_g_error;
 		}
 	}
-	goto __finally229;
-	__catch229_g_error:
+	goto __finally230;
+	__catch230_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp0_ = NULL;
-		GError* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
+		GError* _tmp0_;
+		const gchar* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
 #line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
 #line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
 #line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp0_ = _ ("Unable to navigate to bug database: %s");
-#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp1_ = err;
+		_tmp0_ = err;
 #line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp2_ = _tmp1_->message;
+		_tmp1_ = _tmp0_->message;
 #line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
+		_tmp2_ = g_strdup_printf (_ ("Unable to navigate to bug database: %s"), _tmp1_);
 #line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp4_ = _tmp3_;
+		_tmp3_ = _tmp2_;
 #line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		app_window_error_message (_tmp4_, NULL);
+		app_window_error_message (_tmp3_, NULL);
 #line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_free0 (_tmp4_);
+		_g_free0 (_tmp3_);
 #line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3469 "AppWindow.c"
+#line 3433 "AppWindow.c"
 	}
-	__finally229:
+	__finally230:
 #line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3508,7 +3472,7 @@ static void app_window_on_help_report_problem (AppWindow* self) {
 		g_clear_error (&_inner_error_);
 #line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3480 "AppWindow.c"
+#line 3444 "AppWindow.c"
 	}
 }
 
@@ -3517,48 +3481,45 @@ static void app_window_on_help_faq (AppWindow* self) {
 	GError * _inner_error_ = NULL;
 #line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3489 "AppWindow.c"
+#line 3453 "AppWindow.c"
 	{
 #line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, RESOURCES_FAQ_URL, &_inner_error_);
 #line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3495 "AppWindow.c"
-			goto __catch230_g_error;
+#line 3459 "AppWindow.c"
+			goto __catch231_g_error;
 		}
 	}
-	goto __finally230;
-	__catch230_g_error:
+	goto __finally231;
+	__catch231_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp0_ = NULL;
-		GError* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
+		GError* _tmp0_;
+		const gchar* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
 #line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
 #line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
 #line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp0_ = _ ("Unable to display FAQ: %s");
-#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp1_ = err;
+		_tmp0_ = err;
 #line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp2_ = _tmp1_->message;
+		_tmp1_ = _tmp0_->message;
 #line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
+		_tmp2_ = g_strdup_printf (_ ("Unable to display FAQ: %s"), _tmp1_);
 #line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp4_ = _tmp3_;
+		_tmp3_ = _tmp2_;
 #line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		app_window_error_message (_tmp4_, NULL);
+		app_window_error_message (_tmp3_, NULL);
 #line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_free0 (_tmp4_);
+		_g_free0 (_tmp3_);
 #line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3528 "AppWindow.c"
+#line 3489 "AppWindow.c"
 	}
-	__finally230:
+	__finally231:
 #line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3567,14 +3528,14 @@ static void app_window_on_help_faq (AppWindow* self) {
 		g_clear_error (&_inner_error_);
 #line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3539 "AppWindow.c"
+#line 3500 "AppWindow.c"
 	}
 }
 
 
 static void app_window_real_on_quit (AppWindow* self) {
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
+	Application* _tmp0_;
+	Application* _tmp1_;
 #line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = application_get_instance ();
 #line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3583,7 +3544,7 @@ static void app_window_real_on_quit (AppWindow* self) {
 	application_exit (_tmp1_);
 #line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_application_unref0 (_tmp1_);
-#line 3555 "AppWindow.c"
+#line 3516 "AppWindow.c"
 }
 
 
@@ -3592,28 +3553,28 @@ void app_window_on_quit (AppWindow* self) {
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->on_quit (self);
-#line 3564 "AppWindow.c"
+#line 3525 "AppWindow.c"
 }
 
 
 void app_window_on_jump_to_file (AppWindow* self) {
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gboolean _tmp5_ = FALSE;
+	Page* _tmp0_;
+	Page* _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
+	gint _tmp4_;
+	gboolean _tmp5_;
 	MediaSource* media = NULL;
-	Page* _tmp6_ = NULL;
-	Page* _tmp7_ = NULL;
-	ViewCollection* _tmp8_ = NULL;
-	ViewCollection* _tmp9_ = NULL;
-	DataView* _tmp10_ = NULL;
-	DataView* _tmp11_ = NULL;
-	DataSource* _tmp12_ = NULL;
-	MediaSource* _tmp13_ = NULL;
-	MediaSource* _tmp14_ = NULL;
-	MediaSource* _tmp15_ = NULL;
+	Page* _tmp6_;
+	Page* _tmp7_;
+	ViewCollection* _tmp8_;
+	ViewCollection* _tmp9_;
+	DataView* _tmp10_;
+	DataView* _tmp11_;
+	DataSource* _tmp12_;
+	MediaSource* _tmp13_;
+	MediaSource* _tmp14_;
+	MediaSource* _tmp15_;
 	GError * _inner_error_ = NULL;
 #line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
@@ -3637,7 +3598,7 @@ void app_window_on_jump_to_file (AppWindow* self) {
 	if (_tmp5_) {
 #line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3609 "AppWindow.c"
+#line 3570 "AppWindow.c"
 	}
 #line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
@@ -3659,7 +3620,7 @@ void app_window_on_jump_to_file (AppWindow* self) {
 	if (_tmp13_ == NULL) {
 #line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp12_);
-#line 3631 "AppWindow.c"
+#line 3592 "AppWindow.c"
 	}
 #line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = _tmp13_;
@@ -3679,14 +3640,14 @@ void app_window_on_jump_to_file (AppWindow* self) {
 		_g_object_unref0 (media);
 #line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3651 "AppWindow.c"
+#line 3612 "AppWindow.c"
 	}
 	{
-		AppWindow* _tmp16_ = NULL;
-		AppWindow* _tmp17_ = NULL;
-		MediaSource* _tmp18_ = NULL;
-		GFile* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
+		AppWindow* _tmp16_;
+		AppWindow* _tmp17_;
+		MediaSource* _tmp18_;
+		GFile* _tmp19_;
+		GFile* _tmp20_;
 #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = app_window_get_instance ();
 #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3705,17 +3666,17 @@ void app_window_on_jump_to_file (AppWindow* self) {
 		_g_object_unref0 (_tmp17_);
 #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3677 "AppWindow.c"
-			goto __catch231_g_error;
+#line 3638 "AppWindow.c"
+			goto __catch232_g_error;
 		}
 	}
-	goto __finally231;
-	__catch231_g_error:
+	goto __finally232;
+	__catch232_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
+		GError* _tmp21_;
+		gchar* _tmp22_;
+		gchar* _tmp23_;
 #line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
 #line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3732,9 +3693,9 @@ void app_window_on_jump_to_file (AppWindow* self) {
 		_g_free0 (_tmp23_);
 #line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3704 "AppWindow.c"
+#line 3665 "AppWindow.c"
 	}
-	__finally231:
+	__finally232:
 #line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3745,11 +3706,11 @@ void app_window_on_jump_to_file (AppWindow* self) {
 		g_clear_error (&_inner_error_);
 #line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3717 "AppWindow.c"
+#line 3678 "AppWindow.c"
 	}
 #line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (media);
-#line 3721 "AppWindow.c"
+#line 3682 "AppWindow.c"
 }
 
 
@@ -3759,135 +3720,177 @@ static void app_window_real_destroy (GtkWidget* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
 #line 655 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_quit (self);
-#line 3731 "AppWindow.c"
+#line 3692 "AppWindow.c"
 }
 
 
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 3744 "AppWindow.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 3711 "AppWindow.c"
+	} else {
+		const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 3718 "AppWindow.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = TRUE;
+#line 3724 "AppWindow.c"
+	} else {
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 3734 "AppWindow.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 3738 "AppWindow.c"
+		gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 3746 "AppWindow.c"
+	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GRegex* _tmp9_;
+		GRegex* _tmp10_;
+		gchar* _tmp11_ = NULL;
+		GRegex* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3775 "AppWindow.c"
-				goto __catch232_g_regex_error;
+#line 3778 "AppWindow.c"
+				goto __catch233_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3784 "AppWindow.c"
+#line 3787 "AppWindow.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3800 "AppWindow.c"
-				goto __catch232_g_regex_error;
+#line 3803 "AppWindow.c"
+				goto __catch233_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3811 "AppWindow.c"
+#line 3814 "AppWindow.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 3825 "AppWindow.c"
+#line 3828 "AppWindow.c"
 	}
-	goto __finally232;
-	__catch232_g_regex_error:
+	goto __finally233;
+	__catch233_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 3839 "AppWindow.c"
+#line 3842 "AppWindow.c"
 	}
-	__finally232:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	__finally233:
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 3850 "AppWindow.c"
+#line 3853 "AppWindow.c"
 	}
 }
 
 
 void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 	gchar* tmp = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gboolean _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 658 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
@@ -3903,12 +3906,12 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 	_g_free0 (_tmp1_);
 #line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_) {
-#line 3875 "AppWindow.c"
-		GFile* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+#line 3878 "AppWindow.c"
+		GFile* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		const gchar* _tmp7_;
 #line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = file;
 #line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3935,16 +3938,16 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 			_g_free0 (tmp);
 #line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 3907 "AppWindow.c"
+#line 3910 "AppWindow.c"
 		}
 	} else {
-		GFile* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
+		GFile* _tmp8_;
+		GFile* _tmp9_;
+		GFile* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
+		const gchar* _tmp14_;
 #line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = file;
 #line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3977,19 +3980,19 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 			_g_free0 (tmp);
 #line 668 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 3949 "AppWindow.c"
+#line 3952 "AppWindow.c"
 		}
 	}
 #line 658 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (tmp);
-#line 3954 "AppWindow.c"
+#line 3957 "AppWindow.c"
 }
 
 
 void app_window_show_uri (AppWindow* self, const gchar* url, GError** error) {
-	GdkWindow* _tmp0_ = NULL;
-	GdkScreen* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	GdkWindow* _tmp0_;
+	GdkScreen* _tmp1_;
+	const gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
@@ -4009,7 +4012,7 @@ void app_window_show_uri (AppWindow* self, const gchar* url, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3981 "AppWindow.c"
+#line 3984 "AppWindow.c"
 	}
 }
 
@@ -4017,7 +4020,7 @@ void app_window_show_uri (AppWindow* self, const gchar* url, GError** error) {
 static void app_window_real_add_actions (AppWindow* self) {
 #line 677 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), APP_WINDOW_common_actions, G_N_ELEMENTS (APP_WINDOW_common_actions), self);
-#line 3989 "AppWindow.c"
+#line 3992 "AppWindow.c"
 }
 
 
@@ -4026,23 +4029,23 @@ void app_window_add_actions (AppWindow* self) {
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 676 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->add_actions (self);
-#line 3998 "AppWindow.c"
+#line 4001 "AppWindow.c"
 }
 
 
 void app_window_go_fullscreen (AppWindow* self, Page* page) {
-	FullscreenWindow* _tmp0_ = NULL;
+	FullscreenWindow* _tmp0_;
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
 	FullscreenWindow* fsw = NULL;
-	Page* _tmp4_ = NULL;
-	FullscreenWindow* _tmp5_ = NULL;
-	Page* _tmp6_ = NULL;
-	Page* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
-	FullscreenWindow* _tmp12_ = NULL;
-	FullscreenWindow* _tmp13_ = NULL;
-	FullscreenWindow* _tmp14_ = NULL;
+	Page* _tmp4_;
+	FullscreenWindow* _tmp5_;
+	Page* _tmp6_;
+	Page* _tmp7_;
+	gboolean _tmp8_;
+	FullscreenWindow* _tmp12_;
+	FullscreenWindow* _tmp13_;
+	FullscreenWindow* _tmp14_;
 #line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4051,15 +4054,15 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
 	_tmp0_ = app_window_fullscreen_window;
 #line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 4023 "AppWindow.c"
-		FullscreenWindow* _tmp1_ = NULL;
+#line 4026 "AppWindow.c"
+		FullscreenWindow* _tmp1_;
 #line 683 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = app_window_fullscreen_window;
 #line 683 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
 #line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4031 "AppWindow.c"
+#line 4034 "AppWindow.c"
 	}
 #line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_get_position (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), &_tmp2_, &_tmp3_);
@@ -4087,10 +4090,10 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
 	_g_object_unref0 (_tmp7_);
 #line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp8_) {
-#line 4059 "AppWindow.c"
-		Page* _tmp9_ = NULL;
-		Page* _tmp10_ = NULL;
-		FullscreenWindow* _tmp11_ = NULL;
+#line 4062 "AppWindow.c"
+		Page* _tmp9_;
+		Page* _tmp10_;
+		FullscreenWindow* _tmp11_;
 #line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
 #line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4101,7 +4104,7 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
 		page_switching_to_fullscreen (_tmp10_, _tmp11_);
 #line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 4073 "AppWindow.c"
+#line 4076 "AppWindow.c"
 	}
 #line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = fsw;
@@ -4117,19 +4120,19 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
 #line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (fsw);
-#line 4089 "AppWindow.c"
+#line 4092 "AppWindow.c"
 }
 
 
 void app_window_end_fullscreen (AppWindow* self) {
-	FullscreenWindow* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	Page* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	FullscreenWindow* _tmp9_ = NULL;
-	FullscreenWindow* _tmp10_ = NULL;
+	FullscreenWindow* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	Page* _tmp3_;
+	Page* _tmp4_;
+	gboolean _tmp5_;
+	FullscreenWindow* _tmp9_;
+	FullscreenWindow* _tmp10_;
 #line 700 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4138,7 +4141,7 @@ void app_window_end_fullscreen (AppWindow* self) {
 	if (_tmp0_ == NULL) {
 #line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4110 "AppWindow.c"
+#line 4113 "AppWindow.c"
 	}
 #line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = self->pos_x;
@@ -4158,10 +4161,10 @@ void app_window_end_fullscreen (AppWindow* self) {
 	_g_object_unref0 (_tmp4_);
 #line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
-#line 4130 "AppWindow.c"
-		Page* _tmp6_ = NULL;
-		Page* _tmp7_ = NULL;
-		FullscreenWindow* _tmp8_ = NULL;
+#line 4133 "AppWindow.c"
+		Page* _tmp6_;
+		Page* _tmp7_;
+		FullscreenWindow* _tmp8_;
 #line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
 #line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4172,7 +4175,7 @@ void app_window_end_fullscreen (AppWindow* self) {
 		page_returning_from_fullscreen (_tmp7_, _tmp8_);
 #line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 4144 "AppWindow.c"
+#line 4147 "AppWindow.c"
 	}
 #line 711 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = app_window_fullscreen_window;
@@ -4188,15 +4191,15 @@ void app_window_end_fullscreen (AppWindow* self) {
 	app_window_fullscreen_window = NULL;
 #line 715 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 4160 "AppWindow.c"
+#line 4163 "AppWindow.c"
 }
 
 
 GAction* app_window_get_common_action (AppWindow* self, const gchar* name) {
 	GAction* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	GAction* _tmp1_ = NULL;
-	GAction* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	GAction* _tmp1_;
+	GAction* _tmp2_;
 #line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
 #line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4211,16 +4214,16 @@ GAction* app_window_get_common_action (AppWindow* self, const gchar* name) {
 	result = _tmp2_;
 #line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 4183 "AppWindow.c"
+#line 4186 "AppWindow.c"
 }
 
 
 void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name, gboolean sensitive) {
 	GSimpleAction* action = NULL;
-	const gchar* _tmp0_ = NULL;
-	GAction* _tmp1_ = NULL;
-	GSimpleAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	GAction* _tmp1_;
+	GSimpleAction* _tmp2_;
+	GSimpleAction* _tmp3_;
 #line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4235,7 +4238,7 @@ void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name,
 	if (_tmp2_ == NULL) {
 #line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4207 "AppWindow.c"
+#line 4210 "AppWindow.c"
 	}
 #line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	action = _tmp2_;
@@ -4243,29 +4246,29 @@ void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name,
 	_tmp3_ = action;
 #line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4215 "AppWindow.c"
-		GSimpleAction* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+#line 4218 "AppWindow.c"
+		GSimpleAction* _tmp4_;
+		gboolean _tmp5_;
 #line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
 #line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = sensitive;
 #line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 4224 "AppWindow.c"
+#line 4227 "AppWindow.c"
 	}
 #line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4228 "AppWindow.c"
+#line 4231 "AppWindow.c"
 }
 
 
 void app_window_set_common_action_important (AppWindow* self, const gchar* name, gboolean important) {
 	GSimpleAction* action = NULL;
-	const gchar* _tmp0_ = NULL;
-	GAction* _tmp1_ = NULL;
-	GSimpleAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	GAction* _tmp1_;
+	GSimpleAction* _tmp2_;
+	GSimpleAction* _tmp3_;
 #line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4280,7 +4283,7 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name,
 	if (_tmp2_ == NULL) {
 #line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4252 "AppWindow.c"
+#line 4255 "AppWindow.c"
 	}
 #line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	action = _tmp2_;
@@ -4288,10 +4291,10 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name,
 	_tmp3_ = action;
 #line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4260 "AppWindow.c"
-		GSimpleAction* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		gboolean _tmp6_ = FALSE;
+#line 4263 "AppWindow.c"
+		GSimpleAction* _tmp4_;
+		gboolean _tmp5_;
+		gboolean _tmp6_;
 #line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
 #line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4300,20 +4303,20 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name,
 		_tmp6_ = _tmp5_;
 #line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp6_);
-#line 4272 "AppWindow.c"
+#line 4275 "AppWindow.c"
 	}
 #line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4276 "AppWindow.c"
+#line 4279 "AppWindow.c"
 }
 
 
 void app_window_set_common_action_visible (AppWindow* self, const gchar* name, gboolean visible) {
 	GSimpleAction* action = NULL;
-	const gchar* _tmp0_ = NULL;
-	GAction* _tmp1_ = NULL;
-	GSimpleAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	GAction* _tmp1_;
+	GSimpleAction* _tmp2_;
+	GSimpleAction* _tmp3_;
 #line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4328,7 +4331,7 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g
 	if (_tmp2_ == NULL) {
 #line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4300 "AppWindow.c"
+#line 4303 "AppWindow.c"
 	}
 #line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	action = _tmp2_;
@@ -4336,10 +4339,10 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g
 	_tmp3_ = action;
 #line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4308 "AppWindow.c"
-		GSimpleAction* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		gboolean _tmp6_ = FALSE;
+#line 4311 "AppWindow.c"
+		GSimpleAction* _tmp4_;
+		gboolean _tmp5_;
+		gboolean _tmp6_;
 #line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
 #line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4348,43 +4351,43 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g
 		_tmp6_ = _tmp5_;
 #line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp6_);
-#line 4320 "AppWindow.c"
+#line 4323 "AppWindow.c"
 	}
 #line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4324 "AppWindow.c"
+#line 4327 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
 #line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4331 "AppWindow.c"
+#line 4334 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
 #line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4338 "AppWindow.c"
+#line 4341 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
 #line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4345 "AppWindow.c"
+#line 4348 "AppWindow.c"
 }
 
 
 static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Page* new_page) {
 	AppWindow * self;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp15_ = NULL;
-	Page* _tmp34_ = NULL;
-	Page* _tmp35_ = NULL;
+	Page* _tmp0_;
+	Page* _tmp1_;
+	Page* _tmp2_;
+	Page* _tmp15_;
+	Page* _tmp34_;
+	Page* _tmp35_;
 #line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
 #line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4401,19 +4404,19 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 	_tmp2_ = old_page;
 #line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 4373 "AppWindow.c"
-		Page* _tmp3_ = NULL;
-		ViewCollection* _tmp4_ = NULL;
-		ViewCollection* _tmp5_ = NULL;
-		guint _tmp6_ = 0U;
-		Page* _tmp7_ = NULL;
-		ViewCollection* _tmp8_ = NULL;
-		ViewCollection* _tmp9_ = NULL;
-		guint _tmp10_ = 0U;
-		Page* _tmp11_ = NULL;
-		ViewCollection* _tmp12_ = NULL;
-		ViewCollection* _tmp13_ = NULL;
-		guint _tmp14_ = 0U;
+#line 4376 "AppWindow.c"
+		Page* _tmp3_;
+		ViewCollection* _tmp4_;
+		ViewCollection* _tmp5_;
+		guint _tmp6_;
+		Page* _tmp7_;
+		ViewCollection* _tmp8_;
+		ViewCollection* _tmp9_;
+		guint _tmp10_;
+		Page* _tmp11_;
+		ViewCollection* _tmp12_;
+		ViewCollection* _tmp13_;
+		guint _tmp14_;
 #line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = old_page;
 #line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4450,31 +4453,31 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 		g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _app_window_on_update_common_actions_view_collection_items_state_changed, self);
 #line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 4422 "AppWindow.c"
+#line 4425 "AppWindow.c"
 	}
 #line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = new_page;
 #line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp15_ != NULL) {
-#line 4428 "AppWindow.c"
-		Page* _tmp16_ = NULL;
-		ViewCollection* _tmp17_ = NULL;
-		ViewCollection* _tmp18_ = NULL;
-		Page* _tmp19_ = NULL;
-		ViewCollection* _tmp20_ = NULL;
-		ViewCollection* _tmp21_ = NULL;
-		Page* _tmp22_ = NULL;
-		ViewCollection* _tmp23_ = NULL;
-		ViewCollection* _tmp24_ = NULL;
-		Page* _tmp25_ = NULL;
-		Page* _tmp26_ = NULL;
-		ViewCollection* _tmp27_ = NULL;
-		ViewCollection* _tmp28_ = NULL;
-		gint _tmp29_ = 0;
-		Page* _tmp30_ = NULL;
-		ViewCollection* _tmp31_ = NULL;
-		ViewCollection* _tmp32_ = NULL;
-		gint _tmp33_ = 0;
+#line 4431 "AppWindow.c"
+		Page* _tmp16_;
+		ViewCollection* _tmp17_;
+		ViewCollection* _tmp18_;
+		Page* _tmp19_;
+		ViewCollection* _tmp20_;
+		ViewCollection* _tmp21_;
+		Page* _tmp22_;
+		ViewCollection* _tmp23_;
+		ViewCollection* _tmp24_;
+		Page* _tmp25_;
+		Page* _tmp26_;
+		ViewCollection* _tmp27_;
+		ViewCollection* _tmp28_;
+		gint _tmp29_;
+		Page* _tmp30_;
+		ViewCollection* _tmp31_;
+		ViewCollection* _tmp32_;
+		gint _tmp33_;
 #line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = new_page;
 #line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4529,7 +4532,7 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 		_data_collection_unref0 (_tmp32_);
 #line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp28_);
-#line 4501 "AppWindow.c"
+#line 4504 "AppWindow.c"
 	}
 #line 758 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp34_ = old_page;
@@ -4537,13 +4540,13 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 	_tmp35_ = new_page;
 #line 758 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	PAGE_WINDOW_CLASS (app_window_parent_class)->switched_pages (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), _tmp34_, _tmp35_);
-#line 4509 "AppWindow.c"
+#line 4512 "AppWindow.c"
 }
 
 
 static void app_window_real_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page) {
 	gboolean is_checkerboard = FALSE;
-	Page* _tmp0_ = NULL;
+	Page* _tmp0_;
 #line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
 #line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4556,7 +4559,7 @@ static void app_window_real_update_common_action_availability (AppWindow* self,
 	app_window_set_common_action_sensitive (self, "CommonSelectAll", is_checkerboard);
 #line 768 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_set_common_action_sensitive (self, "CommonSelectNone", is_checkerboard);
-#line 4528 "AppWindow.c"
+#line 4531 "AppWindow.c"
 }
 
 
@@ -4565,26 +4568,26 @@ void app_window_update_common_action_availability (AppWindow* self, Page* old_pa
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->update_common_action_availability (self, old_page, new_page);
-#line 4537 "AppWindow.c"
+#line 4540 "AppWindow.c"
 }
 
 
 static void app_window_real_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count) {
-	Page* _tmp0_ = NULL;
-	gint _tmp2_ = 0;
+	Page* _tmp0_;
+	gint _tmp2_;
 #line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
 #line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page;
 #line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE)) {
-#line 4550 "AppWindow.c"
-		gint _tmp1_ = 0;
+#line 4553 "AppWindow.c"
+		gint _tmp1_;
 #line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = count;
 #line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_set_common_action_sensitive (self, "CommonSelectAll", _tmp1_ > 0);
-#line 4556 "AppWindow.c"
+#line 4559 "AppWindow.c"
 	}
 #line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = selected_count;
@@ -4594,7 +4597,7 @@ static void app_window_real_update_common_actions (AppWindow* self, Page* page,
 	app_window_decorate_undo_action (self);
 #line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_redo_action (self);
-#line 4566 "AppWindow.c"
+#line 4569 "AppWindow.c"
 }
 
 
@@ -4603,14 +4606,14 @@ void app_window_update_common_actions (AppWindow* self, Page* page, gint selecte
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->update_common_actions (self, page, selected_count, count);
-#line 4575 "AppWindow.c"
+#line 4578 "AppWindow.c"
 }
 
 
 static void app_window_on_update_common_actions (AppWindow* self) {
 	Page* page = NULL;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
+	Page* _tmp0_;
+	Page* _tmp1_;
 #line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4621,16 +4624,16 @@ static void app_window_on_update_common_actions (AppWindow* self) {
 	_tmp1_ = page;
 #line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 4593 "AppWindow.c"
-		Page* _tmp2_ = NULL;
-		Page* _tmp3_ = NULL;
-		ViewCollection* _tmp4_ = NULL;
-		ViewCollection* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		Page* _tmp7_ = NULL;
-		ViewCollection* _tmp8_ = NULL;
-		ViewCollection* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
+#line 4596 "AppWindow.c"
+		Page* _tmp2_;
+		Page* _tmp3_;
+		ViewCollection* _tmp4_;
+		ViewCollection* _tmp5_;
+		gint _tmp6_;
+		Page* _tmp7_;
+		ViewCollection* _tmp8_;
+		ViewCollection* _tmp9_;
+		gint _tmp10_;
 #line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = page;
 #line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4655,25 +4658,25 @@ static void app_window_on_update_common_actions (AppWindow* self) {
 		_data_collection_unref0 (_tmp9_);
 #line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 4627 "AppWindow.c"
+#line 4630 "AppWindow.c"
 	}
 #line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 4631 "AppWindow.c"
+#line 4634 "AppWindow.c"
 }
 
 
 void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const gchar* new_label) {
 	GMenu* bar = NULL;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	GMenuModel* _tmp2_ = NULL;
-	GMenu* _tmp3_ = NULL;
-	GMenu* _tmp4_ = NULL;
-	GMenu* _tmp5_ = NULL;
+	Page* _tmp0_;
+	Page* _tmp1_;
+	GMenuModel* _tmp2_;
+	GMenu* _tmp3_;
+	GMenu* _tmp4_;
+	GMenu* _tmp5_;
 	gint items = 0;
-	GMenu* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
+	GMenu* _tmp6_;
+	gint _tmp7_;
 #line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4692,7 +4695,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 	if (_tmp3_ == NULL) {
 #line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp2_);
-#line 4664 "AppWindow.c"
+#line 4667 "AppWindow.c"
 	}
 #line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
@@ -4708,7 +4711,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 		_g_object_unref0 (bar);
 #line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4680 "AppWindow.c"
+#line 4683 "AppWindow.c"
 	}
 #line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = bar;
@@ -4716,38 +4719,38 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 	_tmp7_ = g_menu_model_get_n_items (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_menu_model_get_type (), GMenuModel));
 #line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	items = _tmp7_;
-#line 4688 "AppWindow.c"
+#line 4691 "AppWindow.c"
 	{
 		gint i = 0;
 #line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		i = 0;
-#line 4693 "AppWindow.c"
+#line 4696 "AppWindow.c"
 		{
 			gboolean _tmp8_ = FALSE;
 #line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp8_ = TRUE;
 #line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			while (TRUE) {
-#line 4700 "AppWindow.c"
-				gint _tmp10_ = 0;
-				gint _tmp11_ = 0;
+#line 4703 "AppWindow.c"
+				gint _tmp10_;
+				gint _tmp11_;
 				GMenuModel* model = NULL;
-				GMenu* _tmp12_ = NULL;
-				gint _tmp13_ = 0;
-				GMenuModel* _tmp14_ = NULL;
-				GMenu* _tmp15_ = NULL;
+				GMenu* _tmp12_;
+				gint _tmp13_;
+				GMenuModel* _tmp14_;
+				GMenu* _tmp15_;
 				gint model_items = 0;
-				GMenuModel* _tmp16_ = NULL;
-				gint _tmp17_ = 0;
+				GMenuModel* _tmp16_;
+				gint _tmp17_;
 #line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				if (!_tmp8_) {
-#line 4713 "AppWindow.c"
-					gint _tmp9_ = 0;
+#line 4716 "AppWindow.c"
+					gint _tmp9_;
 #line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					_tmp9_ = i;
 #line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					i = _tmp9_ + 1;
-#line 4719 "AppWindow.c"
+#line 4722 "AppWindow.c"
 				}
 #line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp8_ = FALSE;
@@ -4759,7 +4762,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 				if (!(_tmp10_ < _tmp11_)) {
 #line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					break;
-#line 4731 "AppWindow.c"
+#line 4734 "AppWindow.c"
 				}
 #line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp12_ = bar;
@@ -4777,7 +4780,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 					_g_object_unref0 (model);
 #line 801 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					continue;
-#line 4749 "AppWindow.c"
+#line 4752 "AppWindow.c"
 				}
 #line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp16_ = model;
@@ -4785,38 +4788,38 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 				_tmp17_ = g_menu_model_get_n_items (_tmp16_);
 #line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				model_items = _tmp17_;
-#line 4757 "AppWindow.c"
+#line 4760 "AppWindow.c"
 				{
 					gint j = 0;
 #line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					j = 0;
-#line 4762 "AppWindow.c"
+#line 4765 "AppWindow.c"
 					{
 						gboolean _tmp18_ = FALSE;
 #line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 						_tmp18_ = TRUE;
 #line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 						while (TRUE) {
-#line 4769 "AppWindow.c"
-							gint _tmp20_ = 0;
-							gint _tmp21_ = 0;
+#line 4772 "AppWindow.c"
+							gint _tmp20_;
+							gint _tmp21_;
 							GMenuModel* subsection = NULL;
-							GMenuModel* _tmp22_ = NULL;
-							gint _tmp23_ = 0;
-							GMenuModel* _tmp24_ = NULL;
-							GMenuModel* _tmp25_ = NULL;
+							GMenuModel* _tmp22_;
+							gint _tmp23_;
+							GMenuModel* _tmp24_;
+							GMenuModel* _tmp25_;
 							gint sub_items = 0;
-							GMenuModel* _tmp26_ = NULL;
-							gint _tmp27_ = 0;
+							GMenuModel* _tmp26_;
+							gint _tmp27_;
 #line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							if (!_tmp18_) {
-#line 4782 "AppWindow.c"
-								gint _tmp19_ = 0;
+#line 4785 "AppWindow.c"
+								gint _tmp19_;
 #line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								_tmp19_ = j;
 #line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								j = _tmp19_ + 1;
-#line 4788 "AppWindow.c"
+#line 4791 "AppWindow.c"
 							}
 #line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp18_ = FALSE;
@@ -4828,7 +4831,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 							if (!(_tmp20_ < _tmp21_)) {
 #line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								break;
-#line 4800 "AppWindow.c"
+#line 4803 "AppWindow.c"
 							}
 #line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp22_ = model;
@@ -4846,7 +4849,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 								_g_object_unref0 (subsection);
 #line 809 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								continue;
-#line 4818 "AppWindow.c"
+#line 4821 "AppWindow.c"
 							}
 #line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp26_ = subsection;
@@ -4854,34 +4857,34 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 							_tmp27_ = g_menu_model_get_n_items (_tmp26_);
 #line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							sub_items = _tmp27_;
-#line 4826 "AppWindow.c"
+#line 4829 "AppWindow.c"
 							{
 								gint k = 0;
 #line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								k = 0;
-#line 4831 "AppWindow.c"
+#line 4834 "AppWindow.c"
 								{
 									gboolean _tmp28_ = FALSE;
 #line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 									_tmp28_ = TRUE;
 #line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 									while (TRUE) {
-#line 4838 "AppWindow.c"
-										gint _tmp30_ = 0;
-										gint _tmp31_ = 0;
+#line 4841 "AppWindow.c"
+										gint _tmp30_;
+										gint _tmp31_;
 										GMenuAttributeIter* it = NULL;
-										GMenuModel* _tmp32_ = NULL;
-										gint _tmp33_ = 0;
-										GMenuAttributeIter* _tmp34_ = NULL;
+										GMenuModel* _tmp32_;
+										gint _tmp33_;
+										GMenuAttributeIter* _tmp34_;
 #line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										if (!_tmp28_) {
-#line 4847 "AppWindow.c"
-											gint _tmp29_ = 0;
+#line 4850 "AppWindow.c"
+											gint _tmp29_;
 #line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp29_ = k;
 #line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											k = _tmp29_ + 1;
-#line 4853 "AppWindow.c"
+#line 4856 "AppWindow.c"
 										}
 #line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp28_ = FALSE;
@@ -4893,7 +4896,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 										if (!(_tmp30_ < _tmp31_)) {
 #line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											break;
-#line 4865 "AppWindow.c"
+#line 4868 "AppWindow.c"
 										}
 #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp32_ = subsection;
@@ -4905,13 +4908,13 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 										it = _tmp34_;
 #line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										while (TRUE) {
-#line 4877 "AppWindow.c"
-											GMenuAttributeIter* _tmp35_ = NULL;
-											gboolean _tmp36_ = FALSE;
+#line 4880 "AppWindow.c"
+											GMenuAttributeIter* _tmp35_;
+											gboolean _tmp36_;
 											gboolean _tmp37_ = FALSE;
 											gboolean _tmp38_ = FALSE;
-											GMenuAttributeIter* _tmp39_ = NULL;
-											const gchar* _tmp40_ = NULL;
+											GMenuAttributeIter* _tmp39_;
+											const gchar* _tmp40_;
 #line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp35_ = it;
 #line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4920,7 +4923,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 											if (!_tmp36_) {
 #line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												break;
-#line 4892 "AppWindow.c"
+#line 4895 "AppWindow.c"
 											}
 #line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp39_ = it;
@@ -4928,12 +4931,12 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 											_tmp40_ = g_menu_attribute_iter_get_name (_tmp39_);
 #line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (g_strcmp0 (_tmp40_, "id") == 0) {
-#line 4900 "AppWindow.c"
-												GMenuAttributeIter* _tmp41_ = NULL;
-												GVariant* _tmp42_ = NULL;
-												GVariant* _tmp43_ = NULL;
-												const gchar* _tmp44_ = NULL;
-												const gchar* _tmp45_ = NULL;
+#line 4903 "AppWindow.c"
+												GMenuAttributeIter* _tmp41_;
+												GVariant* _tmp42_;
+												GVariant* _tmp43_;
+												const gchar* _tmp44_;
+												const gchar* _tmp45_;
 #line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp41_ = it;
 #line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4948,36 +4951,36 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 												_tmp38_ = g_strcmp0 (_tmp44_, _tmp45_) == 0;
 #line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_variant_unref0 (_tmp43_);
-#line 4920 "AppWindow.c"
+#line 4923 "AppWindow.c"
 											} else {
 #line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp38_ = FALSE;
-#line 4924 "AppWindow.c"
+#line 4927 "AppWindow.c"
 											}
 #line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (_tmp38_) {
 #line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp37_ = TRUE;
-#line 4930 "AppWindow.c"
+#line 4933 "AppWindow.c"
 											} else {
 												gboolean _tmp46_ = FALSE;
-												GMenuAttributeIter* _tmp47_ = NULL;
-												const gchar* _tmp48_ = NULL;
+												GMenuAttributeIter* _tmp47_;
+												const gchar* _tmp48_;
 #line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp47_ = it;
 #line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp48_ = g_menu_attribute_iter_get_name (_tmp47_);
 #line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												if (g_strcmp0 (_tmp48_, "action") == 0) {
-#line 4941 "AppWindow.c"
-													GMenuAttributeIter* _tmp49_ = NULL;
-													GVariant* _tmp50_ = NULL;
-													GVariant* _tmp51_ = NULL;
-													const gchar* _tmp52_ = NULL;
-													const gchar* _tmp53_ = NULL;
-													gchar* _tmp54_ = NULL;
-													gchar* _tmp55_ = NULL;
-													gboolean _tmp56_ = FALSE;
+#line 4944 "AppWindow.c"
+													GMenuAttributeIter* _tmp49_;
+													GVariant* _tmp50_;
+													GVariant* _tmp51_;
+													const gchar* _tmp52_;
+													const gchar* _tmp53_;
+													gchar* _tmp54_;
+													gchar* _tmp55_;
+													gboolean _tmp56_;
 #line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp49_ = it;
 #line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5000,33 +5003,33 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 													_g_free0 (_tmp55_);
 #line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_g_variant_unref0 (_tmp51_);
-#line 4972 "AppWindow.c"
+#line 4975 "AppWindow.c"
 												} else {
 #line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp46_ = FALSE;
-#line 4976 "AppWindow.c"
+#line 4979 "AppWindow.c"
 												}
 #line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp37_ = _tmp46_;
-#line 4980 "AppWindow.c"
+#line 4983 "AppWindow.c"
 											}
 #line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (_tmp37_) {
-#line 4984 "AppWindow.c"
+#line 4987 "AppWindow.c"
 												GMenu* md = NULL;
-												GMenuModel* _tmp57_ = NULL;
-												GMenu* _tmp58_ = NULL;
+												GMenuModel* _tmp57_;
+												GMenu* _tmp58_;
 												GMenuItem* m = NULL;
-												GMenuModel* _tmp59_ = NULL;
-												gint _tmp60_ = 0;
-												GMenuItem* _tmp61_ = NULL;
-												GMenuItem* _tmp62_ = NULL;
-												const gchar* _tmp63_ = NULL;
-												GMenu* _tmp64_ = NULL;
-												gint _tmp65_ = 0;
-												GMenu* _tmp66_ = NULL;
-												gint _tmp67_ = 0;
-												GMenuItem* _tmp68_ = NULL;
+												GMenuModel* _tmp59_;
+												gint _tmp60_;
+												GMenuItem* _tmp61_;
+												GMenuItem* _tmp62_;
+												const gchar* _tmp63_;
+												GMenu* _tmp64_;
+												gint _tmp65_;
+												GMenu* _tmp66_;
+												gint _tmp67_;
+												GMenuItem* _tmp68_;
 #line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp57_ = subsection;
 #line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5075,44 +5078,44 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 												_g_object_unref0 (bar);
 #line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												return;
-#line 5047 "AppWindow.c"
+#line 5050 "AppWindow.c"
 											}
 										}
 #line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_g_object_unref0 (it);
-#line 5052 "AppWindow.c"
+#line 5055 "AppWindow.c"
 									}
 								}
 							}
 #line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_g_object_unref0 (subsection);
-#line 5058 "AppWindow.c"
+#line 5061 "AppWindow.c"
 						}
 					}
 				}
 #line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_g_object_unref0 (model);
-#line 5064 "AppWindow.c"
+#line 5067 "AppWindow.c"
 			}
 		}
 	}
 #line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (bar);
-#line 5070 "AppWindow.c"
+#line 5073 "AppWindow.c"
 }
 
 
 static gpointer _command_manager_ref0 (gpointer self) {
 #line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self ? command_manager_ref (self) : NULL;
-#line 5077 "AppWindow.c"
+#line 5080 "AppWindow.c"
 }
 
 
 CommandManager* app_window_get_command_manager (void) {
 	CommandManager* result = NULL;
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
 #line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
 #line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5121,7 +5124,7 @@ CommandManager* app_window_get_command_manager (void) {
 	result = _tmp1_;
 #line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 5093 "AppWindow.c"
+#line 5096 "AppWindow.c"
 }
 
 
@@ -5132,22 +5135,22 @@ static void app_window_on_command_manager_altered (AppWindow* self) {
 	app_window_decorate_undo_action (self);
 #line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_redo_action (self);
-#line 5104 "AppWindow.c"
+#line 5107 "AppWindow.c"
 }
 
 
 static void app_window_decorate_command_manager_action (AppWindow* self, const gchar* name, const gchar* prefix, const gchar* default_explanation, CommandDescription* desc) {
 	GSimpleAction* action = NULL;
-	const gchar* _tmp0_ = NULL;
-	GAction* _tmp1_ = NULL;
-	GSimpleAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	GAction* _tmp1_;
+	GSimpleAction* _tmp2_;
+	GSimpleAction* _tmp3_;
 	gchar* label = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	CommandDescription* _tmp6_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	CommandDescription* _tmp6_;
+	const gchar* _tmp18_;
+	const gchar* _tmp19_;
 #line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5168,7 +5171,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 	if (_tmp2_ == NULL) {
 #line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 5140 "AppWindow.c"
+#line 5143 "AppWindow.c"
 	}
 #line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	action = _tmp2_;
@@ -5180,7 +5183,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 		_g_object_unref0 (action);
 #line 847 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 5152 "AppWindow.c"
+#line 5155 "AppWindow.c"
 	}
 #line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = prefix;
@@ -5192,15 +5195,15 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 	_tmp6_ = desc;
 #line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 5164 "AppWindow.c"
-		const gchar* _tmp7_ = NULL;
-		CommandDescription* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		GSimpleAction* _tmp14_ = NULL;
+#line 5167 "AppWindow.c"
+		const gchar* _tmp7_;
+		CommandDescription* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
+		GSimpleAction* _tmp14_;
 #line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = label;
 #line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5227,11 +5230,11 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 		_tmp14_ = action;
 #line 854 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp14_, TRUE);
-#line 5199 "AppWindow.c"
+#line 5202 "AppWindow.c"
 	} else {
-		const gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		GSimpleAction* _tmp17_ = NULL;
+		const gchar* _tmp15_;
+		gchar* _tmp16_;
+		GSimpleAction* _tmp17_;
 #line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp15_ = prefix;
 #line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5244,7 +5247,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 		_tmp17_ = action;
 #line 857 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp17_, FALSE);
-#line 5216 "AppWindow.c"
+#line 5219 "AppWindow.c"
 	}
 #line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = name;
@@ -5256,15 +5259,15 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 	_g_free0 (label);
 #line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 5228 "AppWindow.c"
+#line 5231 "AppWindow.c"
 }
 
 
 void app_window_decorate_undo_action (AppWindow* self) {
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
-	CommandDescription* _tmp2_ = NULL;
-	CommandDescription* _tmp3_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
+	CommandDescription* _tmp2_;
+	CommandDescription* _tmp3_;
 #line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5281,15 +5284,15 @@ void app_window_decorate_undo_action (AppWindow* self) {
 	_g_object_unref0 (_tmp3_);
 #line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 5253 "AppWindow.c"
+#line 5256 "AppWindow.c"
 }
 
 
 void app_window_decorate_redo_action (AppWindow* self) {
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
-	CommandDescription* _tmp2_ = NULL;
-	CommandDescription* _tmp3_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
+	CommandDescription* _tmp2_;
+	CommandDescription* _tmp3_;
 #line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5306,39 +5309,39 @@ void app_window_decorate_redo_action (AppWindow* self) {
 	_g_object_unref0 (_tmp3_);
 #line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 5278 "AppWindow.c"
+#line 5281 "AppWindow.c"
 }
 
 
 static void app_window_on_undo (AppWindow* self) {
-	CommandManager* _tmp0_ = NULL;
+	CommandManager* _tmp0_;
 #line 872 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 873 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
 #line 873 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	command_manager_undo (_tmp0_);
-#line 5290 "AppWindow.c"
+#line 5293 "AppWindow.c"
 }
 
 
 static void app_window_on_redo (AppWindow* self) {
-	CommandManager* _tmp0_ = NULL;
+	CommandManager* _tmp0_;
 #line 876 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
 #line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	command_manager_redo (_tmp0_);
-#line 5302 "AppWindow.c"
+#line 5305 "AppWindow.c"
 }
 
 
 static void app_window_on_select_all (AppWindow* self) {
 	Page* page = NULL;
-	Page* _tmp0_ = NULL;
-	CheckerboardPage* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
+	Page* _tmp0_;
+	CheckerboardPage* _tmp1_;
+	Page* _tmp2_;
 #line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5349,7 +5352,7 @@ static void app_window_on_select_all (AppWindow* self) {
 	if (_tmp1_ == NULL) {
 #line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 5321 "AppWindow.c"
+#line 5324 "AppWindow.c"
 	}
 #line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
@@ -5357,10 +5360,10 @@ static void app_window_on_select_all (AppWindow* self) {
 	_tmp2_ = page;
 #line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 5329 "AppWindow.c"
-		Page* _tmp3_ = NULL;
-		ViewCollection* _tmp4_ = NULL;
-		ViewCollection* _tmp5_ = NULL;
+#line 5332 "AppWindow.c"
+		Page* _tmp3_;
+		ViewCollection* _tmp4_;
+		ViewCollection* _tmp5_;
 #line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
 #line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5371,19 +5374,19 @@ static void app_window_on_select_all (AppWindow* self) {
 		view_collection_select_all (_tmp5_);
 #line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 5343 "AppWindow.c"
+#line 5346 "AppWindow.c"
 	}
 #line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 5347 "AppWindow.c"
+#line 5350 "AppWindow.c"
 }
 
 
 static void app_window_on_select_none (AppWindow* self) {
 	Page* page = NULL;
-	Page* _tmp0_ = NULL;
-	CheckerboardPage* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
+	Page* _tmp0_;
+	CheckerboardPage* _tmp1_;
+	Page* _tmp2_;
 #line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5394,7 +5397,7 @@ static void app_window_on_select_none (AppWindow* self) {
 	if (_tmp1_ == NULL) {
 #line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 5366 "AppWindow.c"
+#line 5369 "AppWindow.c"
 	}
 #line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
@@ -5402,10 +5405,10 @@ static void app_window_on_select_none (AppWindow* self) {
 	_tmp2_ = page;
 #line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 5374 "AppWindow.c"
-		Page* _tmp3_ = NULL;
-		ViewCollection* _tmp4_ = NULL;
-		ViewCollection* _tmp5_ = NULL;
+#line 5377 "AppWindow.c"
+		Page* _tmp3_;
+		ViewCollection* _tmp4_;
+		ViewCollection* _tmp5_;
 #line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
 #line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5416,22 +5419,22 @@ static void app_window_on_select_none (AppWindow* self) {
 		view_collection_unselect_all (_tmp5_);
 #line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 5388 "AppWindow.c"
+#line 5391 "AppWindow.c"
 	}
 #line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 5392 "AppWindow.c"
+#line 5395 "AppWindow.c"
 }
 
 
 static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfigure* event) {
 	AppWindow * self;
 	gboolean result = FALSE;
-	GdkWindow* _tmp0_ = NULL;
-	GdkWindowState _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
-	GdkEventConfigure* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	GdkWindow* _tmp0_;
+	GdkWindowState _tmp1_;
+	gboolean _tmp2_;
+	GdkEventConfigure* _tmp5_;
+	gboolean _tmp6_;
 #line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
 #line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5446,7 +5449,7 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig
 	_tmp2_ = self->maximized;
 #line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp2_) {
-#line 5418 "AppWindow.c"
+#line 5421 "AppWindow.c"
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 #line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5455,7 +5458,7 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig
 		self->dimensions.width = _tmp3_;
 #line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions.height = _tmp4_;
-#line 5427 "AppWindow.c"
+#line 5430 "AppWindow.c"
 	}
 #line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = event;
@@ -5465,7 +5468,7 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig
 	result = _tmp6_;
 #line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 5437 "AppWindow.c"
+#line 5440 "AppWindow.c"
 }
 
 
@@ -5473,26 +5476,26 @@ static void app_window_class_init (AppWindowClass * klass) {
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_parent_class = g_type_class_peek_parent (klass);
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((AppWindowClass *) klass)->on_fullscreen = (void (*)(AppWindow*)) app_window_real_on_fullscreen;
+	((AppWindowClass *) klass)->on_fullscreen = (void (*) (AppWindow *)) app_window_real_on_fullscreen;
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((AppWindowClass *) klass)->get_app_role = (gchar* (*)(AppWindow*)) app_window_real_get_app_role;
+	((AppWindowClass *) klass)->get_app_role = (gchar* (*) (AppWindow *)) app_window_real_get_app_role;
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((AppWindowClass *) klass)->on_quit = (void (*)(AppWindow*)) app_window_real_on_quit;
+	((AppWindowClass *) klass)->on_quit = (void (*) (AppWindow *)) app_window_real_on_quit;
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((GtkWidgetClass *) klass)->destroy = (void (*)(GtkWidget*)) app_window_real_destroy;
+	((GtkWidgetClass *) klass)->destroy = (void (*) (GtkWidget *)) app_window_real_destroy;
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((AppWindowClass *) klass)->add_actions = (void (*)(AppWindow*)) app_window_real_add_actions;
+	((AppWindowClass *) klass)->add_actions = (void (*) (AppWindow *)) app_window_real_add_actions;
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((PageWindowClass *) klass)->switched_pages = (void (*)(PageWindow*, Page*, Page*)) app_window_real_switched_pages;
+	((PageWindowClass *) klass)->switched_pages = (void (*) (PageWindow *, Page*, Page*)) app_window_real_switched_pages;
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((AppWindowClass *) klass)->update_common_action_availability = (void (*)(AppWindow*, Page*, Page*)) app_window_real_update_common_action_availability;
+	((AppWindowClass *) klass)->update_common_action_availability = (void (*) (AppWindow *, Page*, Page*)) app_window_real_update_common_action_availability;
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((AppWindowClass *) klass)->update_common_actions = (void (*)(AppWindow*, Page*, gint, gint)) app_window_real_update_common_actions;
+	((AppWindowClass *) klass)->update_common_actions = (void (*) (AppWindow *, Page*, gint, gint)) app_window_real_update_common_actions;
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((GtkWidgetClass *) klass)->configure_event = (gboolean (*)(GtkWidget*, GdkEventConfigure*)) app_window_real_configure_event;
+	((GtkWidgetClass *) klass)->configure_event = (gboolean (*) (GtkWidget *, GdkEventConfigure*)) app_window_real_configure_event;
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = app_window_finalize;
-#line 5464 "AppWindow.c"
+#line 5467 "AppWindow.c"
 }
 
 
@@ -5503,17 +5506,17 @@ static void app_window_instance_init (AppWindow * self) {
 	self->pos_x = 0;
 #line 405 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->pos_y = 0;
-#line 5475 "AppWindow.c"
+#line 5478 "AppWindow.c"
 }
 
 
-static void app_window_finalize (GObject* obj) {
+static void app_window_finalize (GObject * obj) {
 	AppWindow * self;
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_APP_WINDOW, AppWindow);
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (app_window_parent_class)->finalize (obj);
-#line 5485 "AppWindow.c"
+#line 5488 "AppWindow.c"
 }
 
 
diff --git a/src/Application.c b/src/Application.c
index 7405100..3d0d2d9 100644
--- a/src/Application.c
+++ b/src/Application.c
@@ -1,4 +1,4 @@
-/* Application.c generated by valac 0.34.7, the Vala compiler
+/* Application.c generated by valac 0.36.6, the Vala compiler
  * generated from Application.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -61,6 +61,13 @@ typedef struct _LibraryWindow LibraryWindow;
 typedef struct _LibraryWindowClass LibraryWindowClass;
 #define _g_free0(var) (var = (g_free (var), NULL))
 typedef struct _ParamSpecApplication ParamSpecApplication;
+enum  {
+	APPLICATION_STARTING_SIGNAL,
+	APPLICATION_EXITING_SIGNAL,
+	APPLICATION_INIT_DONE_SIGNAL,
+	APPLICATION_LAST_SIGNAL
+};
+static guint application_signals[APPLICATION_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -143,26 +150,26 @@ gint application_get_run_return_value (Application* self);
 static void application_real_starting (Application* self);
 static void application_real_exiting (Application* self, gboolean panicked);
 static void application_real_init_done (Application* self);
-static void application_finalize (Application* obj);
+static void application_finalize (Application * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
 void application_set_raw_thumbs_fix_required (Application* self, gboolean should_fixup) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 24 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
 #line 25 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = should_fixup;
 #line 25 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->fixup_raw_thumbs = _tmp0_;
-#line 160 "Application.c"
+#line 167 "Application.c"
 }
 
 
 gboolean application_get_raw_thumbs_fix_required (Application* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_val_if_fail (IS_APPLICATION (self), FALSE);
 #line 29 "/home/jens/Source/shotwell/src/Application.vala"
@@ -171,21 +178,21 @@ gboolean application_get_raw_thumbs_fix_required (Application* self) {
 	result = _tmp0_;
 #line 29 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 175 "Application.c"
+#line 182 "Application.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 33 "/home/jens/Source/shotwell/src/Application.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 182 "Application.c"
+#line 189 "Application.c"
 }
 
 
 GtkApplication* application_get_system_app (Application* self) {
 	GtkApplication* result = NULL;
-	GtkApplication* _tmp0_ = NULL;
-	GtkApplication* _tmp1_ = NULL;
+	GtkApplication* _tmp0_;
+	GtkApplication* _tmp1_;
 #line 32 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_val_if_fail (IS_APPLICATION (self), NULL);
 #line 33 "/home/jens/Source/shotwell/src/Application.vala"
@@ -196,7 +203,7 @@ GtkApplication* application_get_system_app (Application* self) {
 	result = _tmp1_;
 #line 33 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 200 "Application.c"
+#line 207 "Application.c"
 }
 
 
@@ -205,31 +212,31 @@ static gint _application_on_command_line_g_application_command_line (GApplicatio
 	result = application_on_command_line (command_line);
 #line 65 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 209 "Application.c"
+#line 216 "Application.c"
 }
 
 
 static void _application_on_activated_g_application_activate (GApplication* _sender, gpointer self) {
 #line 68 "/home/jens/Source/shotwell/src/Application.vala"
 	application_on_activated ();
-#line 216 "Application.c"
+#line 223 "Application.c"
 }
 
 
 static void _application_on_activated_g_application_startup (GApplication* _sender, gpointer self) {
 #line 69 "/home/jens/Source/shotwell/src/Application.vala"
 	application_on_activated ();
-#line 223 "Application.c"
+#line 230 "Application.c"
 }
 
 
 static Application* application_construct (GType object_type, gboolean is_direct) {
 	Application* self = NULL;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	GtkApplication* _tmp7_ = NULL;
-	GtkApplication* _tmp8_ = NULL;
+	gboolean _tmp0_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
+	GtkApplication* _tmp7_;
+	GtkApplication* _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 39 "/home/jens/Source/shotwell/src/Application.vala"
 	self = (Application*) g_type_create_instance (object_type);
@@ -237,39 +244,39 @@ static Application* application_construct (GType object_type, gboolean is_direct
 	_tmp0_ = is_direct;
 #line 40 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_) {
-#line 241 "Application.c"
-		GtkApplication* _tmp1_ = NULL;
+#line 248 "Application.c"
+		GtkApplication* _tmp1_;
 #line 45 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp1_ = gtk_application_new ("org.yorba.shotwell-direct", G_APPLICATION_HANDLES_OPEN | G_APPLICATION_NON_UNIQUE);
 #line 45 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (self->priv->system_app);
 #line 45 "/home/jens/Source/shotwell/src/Application.vala"
 		self->priv->system_app = _tmp1_;
-#line 249 "Application.c"
+#line 256 "Application.c"
 	} else {
-		GtkApplication* _tmp2_ = NULL;
+		GtkApplication* _tmp2_;
 #line 51 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp2_ = gtk_application_new ("org.yorba.shotwell", G_APPLICATION_HANDLES_OPEN | G_APPLICATION_HANDLES_COMMAND_LINE);
 #line 51 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (self->priv->system_app);
 #line 51 "/home/jens/Source/shotwell/src/Application.vala"
 		self->priv->system_app = _tmp2_;
-#line 258 "Application.c"
+#line 265 "Application.c"
 	}
 	{
-		GtkApplication* _tmp3_ = NULL;
+		GtkApplication* _tmp3_;
 #line 57 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp3_ = self->priv->system_app;
 #line 57 "/home/jens/Source/shotwell/src/Application.vala"
 		g_application_register (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_application_get_type (), GApplication), NULL, &_inner_error_);
 #line 57 "/home/jens/Source/shotwell/src/Application.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 268 "Application.c"
-			goto __catch559_g_error;
+#line 275 "Application.c"
+			goto __catch560_g_error;
 		}
 	}
-	goto __finally559;
-	__catch559_g_error:
+	goto __finally560;
+	__catch560_g_error:
 	{
 		GError* e = NULL;
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
@@ -280,9 +287,9 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		application_panic (self);
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_error_free0 (e);
-#line 284 "Application.c"
+#line 291 "Application.c"
 	}
-	__finally559:
+	__finally560:
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
@@ -291,7 +298,7 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		g_clear_error (&_inner_error_);
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
 		return NULL;
-#line 295 "Application.c"
+#line 302 "Application.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp4_ = is_direct;
@@ -301,13 +308,13 @@ static Application* application_construct (GType object_type, gboolean is_direct
 	_tmp5_ = self->priv->direct;
 #line 64 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!_tmp5_) {
-#line 305 "Application.c"
-		GtkApplication* _tmp6_ = NULL;
+#line 312 "Application.c"
+		GtkApplication* _tmp6_;
 #line 65 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp6_ = self->priv->system_app;
 #line 65 "/home/jens/Source/shotwell/src/Application.vala"
 		g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_application_get_type (), GApplication), "command-line", (GCallback) _application_on_command_line_g_application_command_line, NULL);
-#line 311 "Application.c"
+#line 318 "Application.c"
 	}
 #line 68 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp7_ = self->priv->system_app;
@@ -319,14 +326,14 @@ static Application* application_construct (GType object_type, gboolean is_direct
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, g_application_get_type (), GApplication), "startup", (GCallback) _application_on_activated_g_application_startup, NULL);
 #line 39 "/home/jens/Source/shotwell/src/Application.vala"
 	return self;
-#line 323 "Application.c"
+#line 330 "Application.c"
 }
 
 
 static Application* application_new (gboolean is_direct) {
 #line 39 "/home/jens/Source/shotwell/src/Application.vala"
 	return application_construct (TYPE_APPLICATION, is_direct);
-#line 330 "Application.c"
+#line 337 "Application.c"
 }
 
 
@@ -336,11 +343,11 @@ static Application* application_new (gboolean is_direct) {
      * instance.
      */
 void application_send_to_primary_instance (gchar** argv, int argv_length1) {
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	GtkApplication* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	Application* _tmp0_;
+	Application* _tmp1_;
+	GtkApplication* _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
 #line 78 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
 #line 78 "/home/jens/Source/shotwell/src/Application.vala"
@@ -355,7 +362,7 @@ void application_send_to_primary_instance (gchar** argv, int argv_length1) {
 	g_application_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_application_get_type (), GApplication), _tmp3__length1, _tmp3_);
 #line 78 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 359 "Application.c"
+#line 366 "Application.c"
 }
 
 
@@ -365,9 +372,9 @@ void application_send_to_primary_instance (gchar** argv, int argv_length1) {
      * should only be called if we are _not_ the primary instance.
      */
 void application_present_primary_instance (void) {
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	GtkApplication* _tmp2_ = NULL;
+	Application* _tmp0_;
+	Application* _tmp1_;
+	GtkApplication* _tmp2_;
 #line 87 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
 #line 87 "/home/jens/Source/shotwell/src/Application.vala"
@@ -378,17 +385,17 @@ void application_present_primary_instance (void) {
 	g_application_activate (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_application_get_type (), GApplication));
 #line 87 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 382 "Application.c"
+#line 389 "Application.c"
 }
 
 
 gboolean application_get_is_remote (void) {
 	gboolean result = FALSE;
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	GtkApplication* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	Application* _tmp0_;
+	Application* _tmp1_;
+	GtkApplication* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
 #line 91 "/home/jens/Source/shotwell/src/Application.vala"
@@ -405,16 +412,16 @@ gboolean application_get_is_remote (void) {
 	result = _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 409 "Application.c"
+#line 416 "Application.c"
 }
 
 
 gboolean application_get_is_direct (void) {
 	gboolean result = FALSE;
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	Application* _tmp0_;
+	Application* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 95 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
 #line 95 "/home/jens/Source/shotwell/src/Application.vala"
@@ -429,17 +436,17 @@ gboolean application_get_is_direct (void) {
 	result = _tmp3_;
 #line 95 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 433 "Application.c"
+#line 440 "Application.c"
 }
 
 
 void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_length1) {
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	GtkApplication* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
+	Application* _tmp0_;
+	Application* _tmp1_;
+	GtkApplication* _tmp2_;
+	const gchar* _tmp3_;
+	gchar** _tmp4_;
+	gint _tmp4__length1;
 #line 98 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (action != NULL);
 #line 99 "/home/jens/Source/shotwell/src/Application.vala"
@@ -458,15 +465,15 @@ void application_set_accels_for_action (const gchar* action, gchar** accel, int
 	gtk_application_set_accels_for_action (_tmp2_, _tmp3_, _tmp4_);
 #line 99 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 462 "Application.c"
+#line 469 "Application.c"
 }
 
 
 void application_set_menubar (GMenuModel* model) {
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	GtkApplication* _tmp2_ = NULL;
-	GMenuModel* _tmp3_ = NULL;
+	Application* _tmp0_;
+	Application* _tmp1_;
+	GtkApplication* _tmp2_;
+	GMenuModel* _tmp3_;
 #line 102 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail ((model == NULL) || G_IS_MENU_MODEL (model));
 #line 103 "/home/jens/Source/shotwell/src/Application.vala"
@@ -481,7 +488,7 @@ void application_set_menubar (GMenuModel* model) {
 	gtk_application_set_menubar (_tmp2_, _tmp3_);
 #line 103 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 485 "Application.c"
+#line 492 "Application.c"
 }
 
 
@@ -494,13 +501,13 @@ void application_set_menubar (GMenuModel* model) {
      * will trigger this and exit, and we'll need to bring the window back up...
      */
 void application_on_activated (void) {
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
+	Application* _tmp0_;
+	Application* _tmp1_;
 	LibraryWindow* lw = NULL;
-	AppWindow* _tmp2_ = NULL;
-	LibraryWindow* _tmp3_ = NULL;
+	AppWindow* _tmp2_;
+	LibraryWindow* _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	LibraryWindow* _tmp5_ = NULL;
+	LibraryWindow* _tmp5_;
 #line 115 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
 #line 115 "/home/jens/Source/shotwell/src/Application.vala"
@@ -515,7 +522,7 @@ void application_on_activated (void) {
 	if (_tmp3_ == NULL) {
 #line 117 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (_tmp2_);
-#line 519 "Application.c"
+#line 526 "Application.c"
 	}
 #line 117 "/home/jens/Source/shotwell/src/Application.vala"
 	lw = _tmp3_;
@@ -523,23 +530,23 @@ void application_on_activated (void) {
 	_tmp5_ = lw;
 #line 118 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp5_ != NULL) {
-#line 527 "Application.c"
-		gboolean _tmp6_ = FALSE;
+#line 534 "Application.c"
+		gboolean _tmp6_;
 #line 118 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp6_ = application_get_is_direct ();
 #line 118 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = !_tmp6_;
-#line 533 "Application.c"
+#line 540 "Application.c"
 	} else {
 #line 118 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = FALSE;
-#line 537 "Application.c"
+#line 544 "Application.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp4_) {
-#line 541 "Application.c"
-		LibraryWindow* _tmp7_ = NULL;
-		LibraryWindow* _tmp8_ = NULL;
+#line 548 "Application.c"
+		LibraryWindow* _tmp7_;
+		LibraryWindow* _tmp8_;
 #line 119 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp7_ = library_window_get_app ();
 #line 119 "/home/jens/Source/shotwell/src/Application.vala"
@@ -548,11 +555,11 @@ void application_on_activated (void) {
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow));
 #line 119 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (_tmp8_);
-#line 552 "Application.c"
+#line 559 "Application.c"
 	}
 #line 114 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (lw);
-#line 556 "Application.c"
+#line 563 "Application.c"
 }
 
 
@@ -567,13 +574,13 @@ void application_on_activated (void) {
 gint application_on_command_line (GApplicationCommandLine* acl) {
 	gint result = 0;
 	gchar** argv = NULL;
-	GApplicationCommandLine* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar** _tmp2_ = NULL;
-	gint argv_length1 = 0;
-	gint _argv_size_ = 0;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	GApplicationCommandLine* _tmp0_;
+	gint _tmp1_;
+	gchar** _tmp2_;
+	gint argv_length1;
+	gint _argv_size_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
 #line 131 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_val_if_fail (G_IS_APPLICATION_COMMAND_LINE (acl), 0);
 #line 132 "/home/jens/Source/shotwell/src/Application.vala"
@@ -592,14 +599,14 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
 	_tmp3__length1 = argv_length1;
 #line 134 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp3_ != NULL) {
-#line 596 "Application.c"
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
+#line 603 "Application.c"
+		gchar** _tmp4_;
+		gint _tmp4__length1;
 #line 135 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = argv;
 #line 135 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4__length1 = argv_length1;
-#line 603 "Application.c"
+#line 610 "Application.c"
 		{
 			gchar** s_collection = NULL;
 			gint s_collection_length1 = 0;
@@ -611,19 +618,19 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
 			s_collection_length1 = _tmp4__length1;
 #line 135 "/home/jens/Source/shotwell/src/Application.vala"
 			for (s_it = 0; s_it < _tmp4__length1; s_it = s_it + 1) {
-#line 615 "Application.c"
-				gchar* _tmp5_ = NULL;
+#line 622 "Application.c"
+				gchar* _tmp5_;
 				gchar* s = NULL;
 #line 135 "/home/jens/Source/shotwell/src/Application.vala"
 				_tmp5_ = g_strdup (s_collection[s_it]);
 #line 135 "/home/jens/Source/shotwell/src/Application.vala"
 				s = _tmp5_;
-#line 622 "Application.c"
+#line 629 "Application.c"
 				{
 					LibraryWindow* lw = NULL;
-					AppWindow* _tmp6_ = NULL;
-					LibraryWindow* _tmp7_ = NULL;
-					LibraryWindow* _tmp8_ = NULL;
+					AppWindow* _tmp6_;
+					LibraryWindow* _tmp7_;
+					LibraryWindow* _tmp8_;
 #line 136 "/home/jens/Source/shotwell/src/Application.vala"
 					_tmp6_ = app_window_get_instance ();
 #line 136 "/home/jens/Source/shotwell/src/Application.vala"
@@ -632,7 +639,7 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
 					if (_tmp7_ == NULL) {
 #line 136 "/home/jens/Source/shotwell/src/Application.vala"
 						_g_object_unref0 (_tmp6_);
-#line 636 "Application.c"
+#line 643 "Application.c"
 					}
 #line 136 "/home/jens/Source/shotwell/src/Application.vala"
 					lw = _tmp7_;
@@ -640,22 +647,22 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
 					_tmp8_ = lw;
 #line 137 "/home/jens/Source/shotwell/src/Application.vala"
 					if (_tmp8_ != NULL) {
-#line 644 "Application.c"
-						LibraryWindow* _tmp9_ = NULL;
-						const gchar* _tmp10_ = NULL;
+#line 651 "Application.c"
+						LibraryWindow* _tmp9_;
+						const gchar* _tmp10_;
 #line 138 "/home/jens/Source/shotwell/src/Application.vala"
 						_tmp9_ = lw;
 #line 138 "/home/jens/Source/shotwell/src/Application.vala"
 						_tmp10_ = s;
 #line 138 "/home/jens/Source/shotwell/src/Application.vala"
 						library_window_mounted_camera_shell_notification (_tmp9_, _tmp10_, FALSE);
-#line 653 "Application.c"
+#line 660 "Application.c"
 					}
 #line 135 "/home/jens/Source/shotwell/src/Application.vala"
 					_g_object_unref0 (lw);
 #line 135 "/home/jens/Source/shotwell/src/Application.vala"
 					_g_free0 (s);
-#line 659 "Application.c"
+#line 666 "Application.c"
 				}
 			}
 		}
@@ -668,7 +675,7 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
 	argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
 #line 143 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 672 "Application.c"
+#line 679 "Application.c"
 }
 
 
@@ -684,14 +691,14 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
      * call this first will lead to an assertion.
      */
 void application_init (gboolean is_direct) {
-	Application* _tmp0_ = NULL;
+	Application* _tmp0_;
 #line 158 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_instance;
 #line 158 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_ == NULL) {
-#line 693 "Application.c"
-		gboolean _tmp1_ = FALSE;
-		Application* _tmp2_ = NULL;
+#line 700 "Application.c"
+		gboolean _tmp1_;
+		Application* _tmp2_;
 #line 159 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp1_ = is_direct;
 #line 159 "/home/jens/Source/shotwell/src/Application.vala"
@@ -700,14 +707,14 @@ void application_init (gboolean is_direct) {
 		_application_unref0 (application_instance);
 #line 159 "/home/jens/Source/shotwell/src/Application.vala"
 		application_instance = _tmp2_;
-#line 704 "Application.c"
+#line 711 "Application.c"
 	}
 }
 
 
 void application_terminate (void) {
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
+	Application* _tmp0_;
+	Application* _tmp1_;
 #line 163 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
 #line 163 "/home/jens/Source/shotwell/src/Application.vala"
@@ -716,22 +723,22 @@ void application_terminate (void) {
 	application_exit (_tmp1_);
 #line 163 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 720 "Application.c"
+#line 727 "Application.c"
 }
 
 
 static gpointer _application_ref0 (gpointer self) {
 #line 169 "/home/jens/Source/shotwell/src/Application.vala"
 	return self ? application_ref (self) : NULL;
-#line 727 "Application.c"
+#line 734 "Application.c"
 }
 
 
 Application* application_get_instance (void) {
 	Application* result = NULL;
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	Application* _tmp2_ = NULL;
+	Application* _tmp0_;
+	Application* _tmp1_;
+	Application* _tmp2_;
 #line 167 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_instance;
 #line 167 "/home/jens/Source/shotwell/src/Application.vala"
@@ -744,26 +751,26 @@ Application* application_get_instance (void) {
 	result = _tmp2_;
 #line 169 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 748 "Application.c"
+#line 755 "Application.c"
 }
 
 
 void application_start (Application* self, gchar** argv, int argv_length1) {
-	gboolean _tmp0_ = FALSE;
-	AppWindow* _tmp1_ = NULL;
-	AppWindow* _tmp2_ = NULL;
-	GtkApplication* _tmp3_ = NULL;
-	AppWindow* _tmp4_ = NULL;
-	AppWindow* _tmp5_ = NULL;
-	GtkApplication* _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	gint _tmp8_ = 0;
-	gboolean _tmp9_ = FALSE;
-	GtkApplication* _tmp12_ = NULL;
-	guint _tmp13_ = 0U;
-	GtkApplication* _tmp14_ = NULL;
-	guint _tmp15_ = 0U;
+	gboolean _tmp0_;
+	AppWindow* _tmp1_;
+	AppWindow* _tmp2_;
+	GtkApplication* _tmp3_;
+	AppWindow* _tmp4_;
+	AppWindow* _tmp5_;
+	GtkApplication* _tmp6_;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
+	gint _tmp8_;
+	gboolean _tmp9_;
+	GtkApplication* _tmp12_;
+	guint _tmp13_;
+	GtkApplication* _tmp14_;
+	guint _tmp15_;
 #line 172 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
 #line 173 "/home/jens/Source/shotwell/src/Application.vala"
@@ -772,12 +779,12 @@ void application_start (Application* self, gchar** argv, int argv_length1) {
 	if (_tmp0_) {
 #line 174 "/home/jens/Source/shotwell/src/Application.vala"
 		return;
-#line 776 "Application.c"
+#line 783 "Application.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->running = TRUE;
 #line 178 "/home/jens/Source/shotwell/src/Application.vala"
-	g_signal_emit_by_name (self, "starting");
+	g_signal_emit (self, application_signals[APPLICATION_STARTING_SIGNAL], 0);
 #line 180 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = app_window_get_instance ();
 #line 180 "/home/jens/Source/shotwell/src/Application.vala"
@@ -810,16 +817,16 @@ void application_start (Application* self, gchar** argv, int argv_length1) {
 	_tmp9_ = self->priv->direct;
 #line 184 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!_tmp9_) {
-#line 814 "Application.c"
-		GtkApplication* _tmp10_ = NULL;
-		guint _tmp11_ = 0U;
+#line 821 "Application.c"
+		GtkApplication* _tmp10_;
+		guint _tmp11_;
 #line 185 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp10_ = self->priv->system_app;
 #line 185 "/home/jens/Source/shotwell/src/Application.vala"
 		g_signal_parse_name ("command-line", g_application_get_type (), &_tmp11_, NULL, FALSE);
 #line 185 "/home/jens/Source/shotwell/src/Application.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_application_get_type (), GApplication), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _application_on_command_line_g_application_command_line, NULL);
-#line 823 "Application.c"
+#line 830 "Application.c"
 	}
 #line 188 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp12_ = self->priv->system_app;
@@ -835,14 +842,14 @@ void application_start (Application* self, gchar** argv, int argv_length1) {
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, g_application_get_type (), GApplication), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _application_on_activated_g_application_startup, NULL);
 #line 191 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->running = FALSE;
-#line 839 "Application.c"
+#line 846 "Application.c"
 }
 
 
 void application_exit (Application* self) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	GtkApplication* _tmp3_ = NULL;
+	gboolean _tmp1_;
+	GtkApplication* _tmp3_;
 #line 194 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
 #line 197 "/home/jens/Source/shotwell/src/Application.vala"
@@ -851,35 +858,35 @@ void application_exit (Application* self) {
 	if (_tmp1_) {
 #line 197 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp0_ = TRUE;
-#line 855 "Application.c"
+#line 862 "Application.c"
 	} else {
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 197 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp2_ = self->priv->running;
 #line 197 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp0_ = !_tmp2_;
-#line 862 "Application.c"
+#line 869 "Application.c"
 	}
 #line 197 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_) {
 #line 198 "/home/jens/Source/shotwell/src/Application.vala"
 		return;
-#line 868 "Application.c"
+#line 875 "Application.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->exiting_fired = TRUE;
 #line 202 "/home/jens/Source/shotwell/src/Application.vala"
-	g_signal_emit_by_name (self, "exiting", FALSE);
+	g_signal_emit (self, application_signals[APPLICATION_EXITING_SIGNAL], 0, FALSE);
 #line 204 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = self->priv->system_app;
 #line 204 "/home/jens/Source/shotwell/src/Application.vala"
 	g_application_release (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_application_get_type (), GApplication));
-#line 878 "Application.c"
+#line 885 "Application.c"
 }
 
 
 void application_panic (Application* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 209 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
 #line 210 "/home/jens/Source/shotwell/src/Application.vala"
@@ -889,12 +896,12 @@ void application_panic (Application* self) {
 #line 211 "/home/jens/Source/shotwell/src/Application.vala"
 		self->priv->exiting_fired = TRUE;
 #line 212 "/home/jens/Source/shotwell/src/Application.vala"
-		g_signal_emit_by_name (self, "exiting", TRUE);
-#line 894 "Application.c"
+		g_signal_emit (self, application_signals[APPLICATION_EXITING_SIGNAL], 0, TRUE);
+#line 901 "Application.c"
 	}
 #line 214 "/home/jens/Source/shotwell/src/Application.vala"
 	exit (1);
-#line 898 "Application.c"
+#line 905 "Application.c"
 }
 
 
@@ -907,13 +914,13 @@ void application_panic (Application* self) {
      */
 guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, const gchar* reason) {
 	guint result = 0U;
-	GtkApplication* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-	AppWindow* _tmp2_ = NULL;
-	GtkApplicationInhibitFlags _tmp3_ = 0;
-	const gchar* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	guint _tmp6_ = 0U;
+	GtkApplication* _tmp0_;
+	AppWindow* _tmp1_;
+	AppWindow* _tmp2_;
+	GtkApplicationInhibitFlags _tmp3_;
+	const gchar* _tmp4_;
+	guint _tmp5_;
+	guint _tmp6_;
 #line 224 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_val_if_fail (IS_APPLICATION (self), 0U);
 #line 225 "/home/jens/Source/shotwell/src/Application.vala"
@@ -936,7 +943,7 @@ guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, c
 	result = _tmp6_;
 #line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 940 "Application.c"
+#line 947 "Application.c"
 }
 
 
@@ -945,8 +952,8 @@ guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, c
      * Gtk.Application.uninhibit().
      */
 void application_uninhibit (Application* self, guint cookie) {
-	GtkApplication* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	GtkApplication* _tmp0_;
+	guint _tmp1_;
 #line 232 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
 #line 233 "/home/jens/Source/shotwell/src/Application.vala"
@@ -955,13 +962,13 @@ void application_uninhibit (Application* self, guint cookie) {
 	_tmp1_ = cookie;
 #line 233 "/home/jens/Source/shotwell/src/Application.vala"
 	gtk_application_uninhibit (_tmp0_, _tmp1_);
-#line 959 "Application.c"
+#line 966 "Application.c"
 }
 
 
 gint application_get_run_return_value (Application* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 236 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_val_if_fail (IS_APPLICATION (self), 0);
 #line 237 "/home/jens/Source/shotwell/src/Application.vala"
@@ -970,7 +977,7 @@ gint application_get_run_return_value (Application* self) {
 	result = _tmp0_;
 #line 237 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 974 "Application.c"
+#line 981 "Application.c"
 }
 
 
@@ -989,7 +996,7 @@ static void application_real_init_done (Application* self) {
 static void value_application_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	value->data[0].v_pointer = NULL;
-#line 993 "Application.c"
+#line 1000 "Application.c"
 }
 
 
@@ -998,7 +1005,7 @@ static void value_application_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		application_unref (value->data[0].v_pointer);
-#line 1002 "Application.c"
+#line 1009 "Application.c"
 	}
 }
 
@@ -1008,11 +1015,11 @@ static void value_application_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		dest_value->data[0].v_pointer = application_ref (src_value->data[0].v_pointer);
-#line 1012 "Application.c"
+#line 1019 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1016 "Application.c"
+#line 1023 "Application.c"
 	}
 }
 
@@ -1020,66 +1027,66 @@ static void value_application_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_application_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return value->data[0].v_pointer;
-#line 1024 "Application.c"
+#line 1031 "Application.c"
 }
 
 
 static gchar* value_application_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (collect_values[0].v_pointer) {
-#line 1031 "Application.c"
-		Application* object;
+#line 1038 "Application.c"
+		Application * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1038 "Application.c"
+#line 1045 "Application.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1042 "Application.c"
+#line 1049 "Application.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = application_ref (object);
-#line 1046 "Application.c"
+#line 1053 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 1050 "Application.c"
+#line 1057 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return NULL;
-#line 1054 "Application.c"
+#line 1061 "Application.c"
 }
 
 
 static gchar* value_application_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	Application** object_p;
+	Application ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1065 "Application.c"
+#line 1072 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		*object_p = NULL;
-#line 1071 "Application.c"
+#line 1078 "Application.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1075 "Application.c"
+#line 1082 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		*object_p = application_ref (value->data[0].v_pointer);
-#line 1079 "Application.c"
+#line 1086 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return NULL;
-#line 1083 "Application.c"
+#line 1090 "Application.c"
 }
 
 
@@ -1093,7 +1100,7 @@ GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return G_PARAM_SPEC (spec);
-#line 1097 "Application.c"
+#line 1104 "Application.c"
 }
 
 
@@ -1102,12 +1109,12 @@ gpointer value_get_application (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APPLICATION), NULL);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return value->data[0].v_pointer;
-#line 1106 "Application.c"
+#line 1113 "Application.c"
 }
 
 
 void value_set_application (GValue* value, gpointer v_object) {
-	Application* old;
+	Application * old;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APPLICATION));
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
@@ -1122,23 +1129,23 @@ void value_set_application (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		application_ref (value->data[0].v_pointer);
-#line 1126 "Application.c"
+#line 1133 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 1130 "Application.c"
+#line 1137 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		application_unref (old);
-#line 1136 "Application.c"
+#line 1143 "Application.c"
 	}
 }
 
 
 void value_take_application (GValue* value, gpointer v_object) {
-	Application* old;
+	Application * old;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APPLICATION));
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
@@ -1151,17 +1158,17 @@ void value_take_application (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = v_object;
-#line 1155 "Application.c"
+#line 1162 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 1159 "Application.c"
+#line 1166 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		application_unref (old);
-#line 1165 "Application.c"
+#line 1172 "Application.c"
 	}
 }
 
@@ -1180,12 +1187,12 @@ static void application_class_init (ApplicationClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	((ApplicationClass *) klass)->init_done = application_real_init_done;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
-	g_signal_new ("starting", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, starting), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	application_signals[APPLICATION_STARTING_SIGNAL] = g_signal_new ("starting", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, starting), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
-	g_signal_new ("exiting", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, exiting), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+	application_signals[APPLICATION_EXITING_SIGNAL] = g_signal_new ("exiting", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, exiting), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
-	g_signal_new ("init_done", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, init_done), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1189 "Application.c"
+	application_signals[APPLICATION_INIT_DONE_SIGNAL] = g_signal_new ("init-done", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, init_done), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 1196 "Application.c"
 }
 
 
@@ -1204,11 +1211,11 @@ static void application_instance_init (Application * self) {
 	self->priv->exiting_fired = FALSE;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	self->ref_count = 1;
-#line 1208 "Application.c"
+#line 1215 "Application.c"
 }
 
 
-static void application_finalize (Application* obj) {
+static void application_finalize (Application * obj) {
 	Application * self;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_APPLICATION, Application);
@@ -1216,7 +1223,7 @@ static void application_finalize (Application* obj) {
 	g_signal_handlers_destroy (self);
 #line 9 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (self->priv->system_app);
-#line 1220 "Application.c"
+#line 1227 "Application.c"
 }
 
 
@@ -1235,18 +1242,18 @@ GType application_get_type (void) {
 
 
 gpointer application_ref (gpointer instance) {
-	Application* self;
+	Application * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return instance;
-#line 1245 "Application.c"
+#line 1252 "Application.c"
 }
 
 
 void application_unref (gpointer instance) {
-	Application* self;
+	Application * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1254,7 +1261,7 @@ void application_unref (gpointer instance) {
 		APPLICATION_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1258 "Application.c"
+#line 1265 "Application.c"
 	}
 }
 
diff --git a/src/BatchImport.c b/src/BatchImport.c
index 0f80e48..89be92d 100644
--- a/src/BatchImport.c
+++ b/src/BatchImport.c
@@ -1,4 +1,4 @@
-/* BatchImport.c generated by valac 0.34.7, the Vala compiler
+/* BatchImport.c generated by valac 0.36.6, the Vala compiler
  * generated from BatchImport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -672,6 +672,17 @@ typedef struct _EventSourceCollectionClass EventSourceCollectionClass;
 
 typedef struct _TagSourceCollection TagSourceCollection;
 typedef struct _TagSourceCollectionClass TagSourceCollectionClass;
+enum  {
+	BATCH_IMPORT_STARTING_SIGNAL,
+	BATCH_IMPORT_PREPARING_SIGNAL,
+	BATCH_IMPORT_PROGRESS_SIGNAL,
+	BATCH_IMPORT_IMPORTED_SIGNAL,
+	BATCH_IMPORT_FATAL_ERROR_SIGNAL,
+	BATCH_IMPORT_IMPORT_JOB_FAILED_SIGNAL,
+	BATCH_IMPORT_IMPORT_COMPLETE_SIGNAL,
+	BATCH_IMPORT_LAST_SIGNAL
+};
+static guint batch_import_signals[BATCH_IMPORT_LAST_SIGNAL] = {0};
 typedef struct _DuplicatedFilePrivate DuplicatedFilePrivate;
 #define _video_id_free0(var) ((var == NULL) ? NULL : (var = (video_id_free (var), NULL)))
 #define _photo_id_free0(var) ((var == NULL) ? NULL : (var = (photo_id_free (var), NULL)))
@@ -823,8 +834,8 @@ struct _BatchImportJobClass {
 	gchar* (*get_path) (BatchImportJob* self);
 	DuplicatedFile* (*get_duplicated_file) (BatchImportJob* self);
 	void (*set_associated) (BatchImportJob* self, BatchImportJob* associated);
-	gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile** file_or_dir);
-	gboolean (*prepare) (BatchImportJob* self, GFile** file_to_import, gboolean* copy_to_library, GError** error);
+	gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir);
+	gboolean (*prepare) (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
 	gboolean (*complete) (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
 	time_t (*get_exposure_time_override) (BatchImportJob* self);
 };
@@ -1100,7 +1111,9 @@ struct _BatchImportProcessPreparedFilesData {
 	int _state_;
 	GObject* _source_object_;
 	GAsyncResult* _res_;
-	GSimpleAsyncResult* _async_result;
+	GTask* _async_result;
+	GAsyncReadyCallback _callback_;
+	gboolean _task_complete_;
 	BatchImport* self;
 	GeeList* list;
 	GeeList* _prepared_file_list;
@@ -1702,16 +1715,16 @@ DuplicatedFile* batch_import_job_get_duplicated_file (BatchImportJob* self);
 static DuplicatedFile* batch_import_job_real_get_duplicated_file (BatchImportJob* self);
 void batch_import_job_set_associated (BatchImportJob* self, BatchImportJob* associated);
 static void batch_import_job_real_set_associated (BatchImportJob* self, BatchImportJob* associated);
-gboolean batch_import_job_determine_file_size (BatchImportJob* self, guint64* filesize, GFile** file_or_dir);
-static gboolean batch_import_job_real_determine_file_size (BatchImportJob* self, guint64* filesize, GFile** file_or_dir);
-gboolean batch_import_job_prepare (BatchImportJob* self, GFile** file_to_import, gboolean* copy_to_library, GError** error);
-static gboolean batch_import_job_real_prepare (BatchImportJob* self, GFile** file_to_import, gboolean* copy_to_library, GError** error);
+gboolean batch_import_job_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir);
+static gboolean batch_import_job_real_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir);
+gboolean batch_import_job_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
+static gboolean batch_import_job_real_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
 gboolean batch_import_job_complete (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
 static gboolean batch_import_job_real_complete (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
 time_t batch_import_job_get_exposure_time_override (BatchImportJob* self);
 static time_t batch_import_job_real_get_exposure_time_override (BatchImportJob* self);
 BatchImportJob* batch_import_job_construct (GType object_type);
-static void batch_import_job_finalize (BatchImportJob* obj);
+static void batch_import_job_finalize (BatchImportJob * obj);
 GType file_import_job_get_type (void) G_GNUC_CONST;
 #define FILE_IMPORT_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_FILE_IMPORT_JOB, FileImportJobPrivate))
 enum  {
@@ -1726,10 +1739,10 @@ gboolean query_is_directory (GFile* file);
 static gchar* file_import_job_real_get_basename (BatchImportJob* base);
 static gchar* file_import_job_real_get_path (BatchImportJob* base);
 static void file_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated);
-static gboolean file_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile** file);
-static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile** file_to_import, gboolean* copy, GError** error);
+static gboolean file_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file);
+static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy, GError** error);
 GFile* file_import_job_get_file (FileImportJob* self);
-static void file_import_job_finalize (BatchImportJob* obj);
+static void file_import_job_finalize (BatchImportJob * obj);
 GType import_id_get_type (void) G_GNUC_CONST;
 ImportID* import_id_dup (const ImportID* self);
 void import_id_free (ImportID* self);
@@ -1749,7 +1762,7 @@ ViewCollection* view_collection_construct (GType object_type, const gchar* name)
 BatchImportRoll* batch_import_roll_new (void);
 BatchImportRoll* batch_import_roll_construct (GType object_type);
 void import_id_generate (ImportID* result);
-static void batch_import_roll_finalize (BatchImportRoll* obj);
+static void batch_import_roll_finalize (BatchImportRoll * obj);
 gpointer batch_import_result_ref (gpointer instance);
 void batch_import_result_unref (gpointer instance);
 GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1764,7 +1777,7 @@ BatchImportResult* batch_import_result_new (BatchImportJob* job, GFile* file, co
 BatchImportResult* batch_import_result_construct (GType object_type, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, DuplicatedFile* duplicate_of, ImportResult _result_);
 BatchImportResult* batch_import_result_new_from_error (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result);
 BatchImportResult* batch_import_result_construct_from_error (GType object_type, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result);
-static void batch_import_result_finalize (BatchImportResult* obj);
+static void batch_import_result_finalize (BatchImportResult * obj);
 gpointer import_manifest_ref (gpointer instance);
 void import_manifest_unref (gpointer instance);
 GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1778,7 +1791,7 @@ enum  {
 ImportManifest* import_manifest_new (GeeList* prefailed, GeeList* pre_already_imported);
 ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed, GeeList* pre_already_imported);
 void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_result);
-static void import_manifest_finalize (ImportManifest* obj);
+static void import_manifest_finalize (ImportManifest * obj);
 GType batch_import_get_type (void) G_GNUC_CONST;
 gpointer prepared_file_ref (gpointer instance);
 void prepared_file_unref (gpointer instance);
@@ -1913,6 +1926,7 @@ GType prepared_file_cluster_get_type (void) G_GNUC_CONST;
 static void batch_import_process_prepared_files (BatchImport* self, GeeList* list, GAsyncReadyCallback _callback_, gpointer _user_data_);
 static void batch_import_process_prepared_files_finish (BatchImport* self, GAsyncResult* _res_);
 static void batch_import_process_prepared_files_data_free (gpointer _data);
+static void batch_import_process_prepared_files_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data);
 static gboolean batch_import_process_prepared_files_co (BatchImportProcessPreparedFilesData* _data_);
 static gboolean _batch_import_process_prepared_files_co_gsource_func (gpointer self);
 GType library_photo_source_collection_state_get_type (void) G_GNUC_CONST;
@@ -2004,8 +2018,8 @@ GType tombstone_get_type (void) G_GNUC_CONST;
 GType tombstone_source_collection_get_type (void) G_GNUC_CONST;
 Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, GFile* file);
 void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, Tombstone* tombstone);
-ImportResult video_import_create (VideoImportParams* params, Video** video);
-ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto** photo);
+ImportResult video_import_create (VideoImportParams* params, Video* * video);
+ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto* * photo);
 GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST;
 gpointer thumbnails_ref (gpointer instance);
 void thumbnails_unref (gpointer instance);
@@ -2071,12 +2085,13 @@ void media_source_collection_import_many (MediaSourceCollection* self, GeeCollec
 void event_generate_many_events (GeeCollection* sources, ViewCollection* events_so_far);
 void data_collection_thaw_notifications (DataCollection* self);
 void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistry* self);
+guint64 media_source_get_master_filesize (MediaSource* self);
 static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void g_cclosure_user_marshal_VOID__ENUM_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void batch_import_finalize (GObject* obj);
+static void batch_import_finalize (GObject * obj);
 #define DUPLICATED_FILE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DUPLICATED_FILE, DuplicatedFilePrivate))
 enum  {
 	DUPLICATED_FILE_DUMMY_PROPERTY
@@ -2088,7 +2103,7 @@ gboolean video_id_is_valid (VideoID *self);
 GFile* duplicated_file_get_file (DuplicatedFile* self);
 LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, PhotoID* photo_id);
 Video* video_source_collection_fetch (VideoSourceCollection* self, VideoID* video_id);
-static void duplicated_file_finalize (GObject* obj);
+static void duplicated_file_finalize (GObject * obj);
 enum  {
 	BACKGROUND_IMPORT_JOB_DUMMY_PROPERTY
 };
@@ -2106,7 +2121,7 @@ gboolean background_job_is_cancelled (BackgroundJob* self);
 void background_import_job_abort (BackgroundImportJob* self, ImportResult _result_);
 void background_import_job_report_failure (BackgroundImportJob* self, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, ImportResult _result_);
 void background_import_job_report_error (BackgroundImportJob* self, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result);
-static void background_import_job_finalize (BackgroundJob* obj);
+static void background_import_job_finalize (BackgroundJob * obj);
 enum  {
 	FILE_TO_PREPARE_DUMMY_PROPERTY
 };
@@ -2117,7 +2132,7 @@ gchar* file_to_prepare_get_parent_path (FileToPrepare* self);
 gchar* file_to_prepare_get_path (FileToPrepare* self);
 gchar* file_to_prepare_get_basename (FileToPrepare* self);
 gboolean file_to_prepare_is_directory (FileToPrepare* self);
-static void file_to_prepare_finalize (FileToPrepare* obj);
+static void file_to_prepare_finalize (FileToPrepare * obj);
 #define WORK_SNIFFER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_WORK_SNIFFER, WorkSnifferPrivate))
 enum  {
 	WORK_SNIFFER_DUMMY_PROPERTY
@@ -2127,7 +2142,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b);
 gint utf8_cs_compare (void* a, void* b);
 static gint ___lambda11__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
 gboolean is_string_empty (const gchar* s);
 gpointer photo_file_format_properties_ref (gpointer instance);
 void photo_file_format_properties_unref (gpointer instance);
@@ -2147,20 +2162,20 @@ GCancellable* background_job_get_cancellable (BackgroundJob* self);
 gboolean photo_is_file_image (GFile* file);
 gboolean photo_file_format_is_file_supported (GFile* file);
 gboolean video_reader_is_supported_video_file (GFile* file);
-static void work_sniffer_finalize (BackgroundJob* obj);
+static void work_sniffer_finalize (BackgroundJob * obj);
 enum  {
 	PREPARED_FILE_DUMMY_PROPERTY
 };
 PreparedFile* prepared_file_new (BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video);
 PreparedFile* prepared_file_construct (GType object_type, BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video);
-static void prepared_file_finalize (PreparedFile* obj);
+static void prepared_file_finalize (PreparedFile * obj);
 enum  {
 	PREPARED_FILE_CLUSTER_DUMMY_PROPERTY
 };
 PreparedFileCluster* prepared_file_cluster_new (GeeArrayList* list);
 PreparedFileCluster* prepared_file_cluster_construct (GType object_type, GeeArrayList* list);
 InterlockedNotificationObject* interlocked_notification_object_construct (GType object_type);
-static void prepared_file_cluster_finalize (NotificationObject* obj);
+static void prepared_file_cluster_finalize (NotificationObject * obj);
 #define PREPARE_FILES_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PREPARE_FILES_JOB, PrepareFilesJobPrivate))
 enum  {
 	PREPARE_FILES_JOB_DUMMY_PROPERTY
@@ -2169,8 +2184,8 @@ GFile* app_dirs_get_import_dir (void);
 static gint prepare_files_job_get_test_variable (const gchar* name);
 void background_job_set_notification_priority (BackgroundJob* self, gint priority);
 static void prepare_files_job_real_execute (BackgroundJob* base);
-static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImportJob* job, GFile** file, gboolean* copy_to_library);
-static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, BatchImportJob* job, GFile* file, GFile* associated_file, gboolean copy_to_library, PreparedFile** prepared_file);
+static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImportJob* job, GFile* * file, gboolean* copy_to_library);
+static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, BatchImportJob* job, GFile* file, GFile* associated_file, gboolean copy_to_library, PreparedFile* * prepared_file);
 void background_job_notify (BackgroundJob* self, NotificationCallback callback, void* callback_target, NotificationObject* user);
 gchar* md5_file (GFile* file, GError** error);
 PhotoFileFormat photo_file_format_get_by_file_extension (GFile* file);
@@ -2195,7 +2210,7 @@ PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError**
 guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_preview, int* result_length1);
 gchar* md5_binary (guint8* buffer, gsize length);
 guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_length1);
-static void prepare_files_job_finalize (BackgroundJob* obj);
+static void prepare_files_job_finalize (BackgroundJob * obj);
 enum  {
 	READY_FOR_IMPORT_DUMMY_PROPERTY
 };
@@ -2208,7 +2223,7 @@ void value_set_video_row (GValue* value, gpointer v_object);
 void value_take_video_row (GValue* value, gpointer v_object);
 gpointer value_get_video_row (const GValue* value);
 GType video_row_get_type (void) G_GNUC_CONST;
-static void ready_for_import_finalize (ReadyForImport* obj);
+static void ready_for_import_finalize (ReadyForImport * obj);
 #define PREPARED_FILE_IMPORT_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJobPrivate))
 enum  {
 	PREPARED_FILE_IMPORT_JOB_DUMMY_PROPERTY
@@ -2224,19 +2239,19 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params);
 PhotoImportParams* photo_import_params_new (GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails);
 PhotoImportParams* photo_import_params_construct (GType object_type, GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails);
 ImportResult photo_prepare_for_import (PhotoImportParams* params);
-static void prepared_file_import_job_finalize (BackgroundJob* obj);
+static void prepared_file_import_job_finalize (BackgroundJob * obj);
 enum  {
 	COMPLETED_IMPORT_OBJECT_DUMMY_PROPERTY
 };
 GType thumbnail_cache_size_get_type (void) G_GNUC_CONST;
 GdkPixbuf* thumbnails_get (Thumbnails* self, ThumbnailCacheSize size);
-static void completed_import_object_finalize (CompletedImportObject* obj);
+static void completed_import_object_finalize (CompletedImportObject * obj);
 enum  {
 	THUMBNAIL_WRITER_JOB_DUMMY_PROPERTY
 };
 static void thumbnail_writer_job_real_execute (BackgroundJob* base);
 void thumbnail_cache_import_thumbnails (ThumbnailSource* source, Thumbnails* thumbnails, gboolean force, GError** error);
-static void thumbnail_writer_job_finalize (BackgroundJob* obj);
+static void thumbnail_writer_job_finalize (BackgroundJob * obj);
 
 
 gchar* import_result_to_string (ImportResult self) {
@@ -2245,80 +2260,65 @@ gchar* import_result_to_string (ImportResult self) {
 	switch (self) {
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_SUCCESS:
-#line 2249 "BatchImport.c"
+#line 2264 "BatchImport.c"
 		{
-			const gchar* _tmp0_ = NULL;
-			gchar* _tmp1_ = NULL;
-#line 26 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp0_ = _ ("Success");
+			gchar* _tmp0_;
 #line 26 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp1_ = g_strdup (_tmp0_);
+			_tmp0_ = g_strdup (_ ("Success"));
 #line 26 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			result = _tmp1_;
+			result = _tmp0_;
 #line 26 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2261 "BatchImport.c"
+#line 2273 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_FILE_ERROR:
-#line 2265 "BatchImport.c"
+#line 2277 "BatchImport.c"
 		{
-			const gchar* _tmp2_ = NULL;
-			gchar* _tmp3_ = NULL;
-#line 29 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp2_ = _ ("File error");
+			gchar* _tmp1_;
 #line 29 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp3_ = g_strdup (_tmp2_);
+			_tmp1_ = g_strdup (_ ("File error"));
 #line 29 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			result = _tmp3_;
+			result = _tmp1_;
 #line 29 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2277 "BatchImport.c"
+#line 2286 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_DECODE_ERROR:
-#line 2281 "BatchImport.c"
+#line 2290 "BatchImport.c"
 		{
-			const gchar* _tmp4_ = NULL;
-			gchar* _tmp5_ = NULL;
+			gchar* _tmp2_;
 #line 32 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp4_ = _ ("Unable to decode file");
+			_tmp2_ = g_strdup (_ ("Unable to decode file"));
 #line 32 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp5_ = g_strdup (_tmp4_);
-#line 32 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			result = _tmp5_;
+			result = _tmp2_;
 #line 32 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2293 "BatchImport.c"
+#line 2299 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_DATABASE_ERROR:
-#line 2297 "BatchImport.c"
+#line 2303 "BatchImport.c"
 		{
-			const gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
-#line 35 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp6_ = _ ("Database error");
+			gchar* _tmp3_;
 #line 35 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp7_ = g_strdup (_tmp6_);
+			_tmp3_ = g_strdup (_ ("Database error"));
 #line 35 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			result = _tmp7_;
+			result = _tmp3_;
 #line 35 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2309 "BatchImport.c"
+#line 2312 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_USER_ABORT:
-#line 2313 "BatchImport.c"
+#line 2316 "BatchImport.c"
 		{
-			const gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
-#line 38 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp8_ = _ ("User aborted import");
+			gchar* _tmp4_;
 #line 38 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp9_ = g_strdup (_tmp8_);
+			_tmp4_ = g_strdup (_ ("User aborted import"));
 #line 38 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			result = _tmp9_;
+			result = _tmp4_;
 #line 38 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
 #line 2325 "BatchImport.c"
@@ -2327,159 +2327,129 @@ gchar* import_result_to_string (ImportResult self) {
 		case IMPORT_RESULT_NOT_A_FILE:
 #line 2329 "BatchImport.c"
 		{
-			const gchar* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-#line 41 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp10_ = _ ("Not a file");
+			gchar* _tmp5_;
 #line 41 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp11_ = g_strdup (_tmp10_);
+			_tmp5_ = g_strdup (_ ("Not a file"));
 #line 41 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			result = _tmp11_;
+			result = _tmp5_;
 #line 41 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2341 "BatchImport.c"
+#line 2338 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_PHOTO_EXISTS:
-#line 2345 "BatchImport.c"
+#line 2342 "BatchImport.c"
 		{
-			const gchar* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-#line 44 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp12_ = _ ("File already exists in database");
+			gchar* _tmp6_;
 #line 44 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp13_ = g_strdup (_tmp12_);
+			_tmp6_ = g_strdup (_ ("File already exists in database"));
 #line 44 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			result = _tmp13_;
+			result = _tmp6_;
 #line 44 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2357 "BatchImport.c"
+#line 2351 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_UNSUPPORTED_FORMAT:
-#line 2361 "BatchImport.c"
+#line 2355 "BatchImport.c"
 		{
-			const gchar* _tmp14_ = NULL;
-			gchar* _tmp15_ = NULL;
+			gchar* _tmp7_;
 #line 47 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp14_ = _ ("Unsupported file format");
+			_tmp7_ = g_strdup (_ ("Unsupported file format"));
 #line 47 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp15_ = g_strdup (_tmp14_);
-#line 47 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			result = _tmp15_;
+			result = _tmp7_;
 #line 47 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2373 "BatchImport.c"
+#line 2364 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_NOT_AN_IMAGE:
-#line 2377 "BatchImport.c"
+#line 2368 "BatchImport.c"
 		{
-			const gchar* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
-#line 50 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp16_ = _ ("Not an image file");
+			gchar* _tmp8_;
 #line 50 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp17_ = g_strdup (_tmp16_);
+			_tmp8_ = g_strdup (_ ("Not an image file"));
 #line 50 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			result = _tmp17_;
+			result = _tmp8_;
 #line 50 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2389 "BatchImport.c"
+#line 2377 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_DISK_FAILURE:
-#line 2393 "BatchImport.c"
+#line 2381 "BatchImport.c"
 		{
-			const gchar* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
+			gchar* _tmp9_;
 #line 53 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp18_ = _ ("Disk failure");
+			_tmp9_ = g_strdup (_ ("Disk failure"));
 #line 53 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp19_ = g_strdup (_tmp18_);
-#line 53 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			result = _tmp19_;
+			result = _tmp9_;
 #line 53 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2405 "BatchImport.c"
+#line 2390 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_DISK_FULL:
-#line 2409 "BatchImport.c"
+#line 2394 "BatchImport.c"
 		{
-			const gchar* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
-#line 56 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp20_ = _ ("Disk full");
+			gchar* _tmp10_;
 #line 56 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp21_ = g_strdup (_tmp20_);
+			_tmp10_ = g_strdup (_ ("Disk full"));
 #line 56 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			result = _tmp21_;
+			result = _tmp10_;
 #line 56 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2421 "BatchImport.c"
+#line 2403 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_CAMERA_ERROR:
-#line 2425 "BatchImport.c"
+#line 2407 "BatchImport.c"
 		{
-			const gchar* _tmp22_ = NULL;
-			gchar* _tmp23_ = NULL;
+			gchar* _tmp11_;
 #line 59 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp22_ = _ ("Camera error");
+			_tmp11_ = g_strdup (_ ("Camera error"));
 #line 59 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp23_ = g_strdup (_tmp22_);
-#line 59 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			result = _tmp23_;
+			result = _tmp11_;
 #line 59 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2437 "BatchImport.c"
+#line 2416 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_FILE_WRITE_ERROR:
-#line 2441 "BatchImport.c"
+#line 2420 "BatchImport.c"
 		{
-			const gchar* _tmp24_ = NULL;
-			gchar* _tmp25_ = NULL;
-#line 62 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp24_ = _ ("File write error");
+			gchar* _tmp12_;
 #line 62 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp25_ = g_strdup (_tmp24_);
+			_tmp12_ = g_strdup (_ ("File write error"));
 #line 62 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			result = _tmp25_;
+			result = _tmp12_;
 #line 62 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2453 "BatchImport.c"
+#line 2429 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE:
-#line 2457 "BatchImport.c"
+#line 2433 "BatchImport.c"
 		{
-			const gchar* _tmp26_ = NULL;
-			gchar* _tmp27_ = NULL;
-#line 65 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp26_ = _ ("Corrupt image file");
+			gchar* _tmp13_;
 #line 65 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp27_ = g_strdup (_tmp26_);
+			_tmp13_ = g_strdup (_ ("Corrupt image file"));
 #line 65 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			result = _tmp27_;
+			result = _tmp13_;
 #line 65 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2469 "BatchImport.c"
+#line 2442 "BatchImport.c"
 		}
 		default:
 		{
-			const gchar* _tmp28_ = NULL;
-			gchar* _tmp29_ = NULL;
-#line 68 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp28_ = _ ("Imported failed (%d)");
+			gchar* _tmp14_;
 #line 68 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp29_ = g_strdup_printf (_tmp28_, (gint) self);
+			_tmp14_ = g_strdup_printf (_ ("Imported failed (%d)"), (gint) self);
 #line 68 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			result = _tmp29_;
+			result = _tmp14_;
 #line 68 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2483 "BatchImport.c"
+#line 2453 "BatchImport.c"
 		}
 	}
 }
@@ -2495,13 +2465,13 @@ gboolean import_result_is_abort (ImportResult self) {
 		case IMPORT_RESULT_DISK_FAILURE:
 #line 73 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_USER_ABORT:
-#line 2499 "BatchImport.c"
+#line 2469 "BatchImport.c"
 		{
 #line 77 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = TRUE;
 #line 77 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2505 "BatchImport.c"
+#line 2475 "BatchImport.c"
 		}
 		default:
 		{
@@ -2509,7 +2479,7 @@ gboolean import_result_is_abort (ImportResult self) {
 			result = FALSE;
 #line 80 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2513 "BatchImport.c"
+#line 2483 "BatchImport.c"
 		}
 	}
 }
@@ -2523,13 +2493,13 @@ gboolean import_result_is_nonuser_abort (ImportResult self) {
 		case IMPORT_RESULT_DISK_FULL:
 #line 85 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_DISK_FAILURE:
-#line 2527 "BatchImport.c"
+#line 2497 "BatchImport.c"
 		{
 #line 88 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = TRUE;
 #line 88 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2533 "BatchImport.c"
+#line 2503 "BatchImport.c"
 		}
 		default:
 		{
@@ -2537,7 +2507,7 @@ gboolean import_result_is_nonuser_abort (ImportResult self) {
 			result = FALSE;
 #line 91 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2541 "BatchImport.c"
+#line 2511 "BatchImport.c"
 		}
 	}
 }
@@ -2546,23 +2516,23 @@ gboolean import_result_is_nonuser_abort (ImportResult self) {
 static gpointer _g_error_copy0 (gpointer self) {
 #line 97 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 2550 "BatchImport.c"
+#line 2520 "BatchImport.c"
 }
 
 
 ImportResult import_result_convert_error (GError* err, ImportResult default_result) {
 	ImportResult result = 0;
-	GError* _tmp0_ = NULL;
-	ImportResult _tmp32_ = 0;
+	GError* _tmp0_;
+	ImportResult _tmp32_;
 #line 96 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = err;
 #line 96 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_->domain == G_FILE_ERROR) {
-#line 2562 "BatchImport.c"
+#line 2532 "BatchImport.c"
 		GError* ferr = NULL;
-		GError* _tmp1_ = NULL;
-		GError* _tmp2_ = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp1_;
+		GError* _tmp2_;
+		GError* _tmp3_;
 #line 97 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = err;
 #line 97 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2579,9 +2549,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 			_g_error_free0 (ferr);
 #line 100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2583 "BatchImport.c"
+#line 2553 "BatchImport.c"
 		} else {
-			GError* _tmp4_ = NULL;
+			GError* _tmp4_;
 #line 101 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp4_ = ferr;
 #line 101 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2592,9 +2562,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 				_g_error_free0 (ferr);
 #line 102 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return result;
-#line 2596 "BatchImport.c"
+#line 2566 "BatchImport.c"
 			} else {
-				GError* _tmp5_ = NULL;
+				GError* _tmp5_;
 #line 103 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp5_ = ferr;
 #line 103 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2605,9 +2575,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 					_g_error_free0 (ferr);
 #line 104 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					return result;
-#line 2609 "BatchImport.c"
+#line 2579 "BatchImport.c"
 				} else {
-					GError* _tmp6_ = NULL;
+					GError* _tmp6_;
 #line 105 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp6_ = ferr;
 #line 105 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2618,9 +2588,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 						_g_error_free0 (ferr);
 #line 106 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						return result;
-#line 2622 "BatchImport.c"
+#line 2592 "BatchImport.c"
 					} else {
-						GError* _tmp7_ = NULL;
+						GError* _tmp7_;
 #line 107 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp7_ = ferr;
 #line 107 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2631,7 +2601,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 							_g_error_free0 (ferr);
 #line 108 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							return result;
-#line 2635 "BatchImport.c"
+#line 2605 "BatchImport.c"
 						} else {
 #line 110 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							result = IMPORT_RESULT_FILE_ERROR;
@@ -2639,7 +2609,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 							_g_error_free0 (ferr);
 #line 110 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							return result;
-#line 2643 "BatchImport.c"
+#line 2613 "BatchImport.c"
 						}
 					}
 				}
@@ -2647,18 +2617,18 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 		}
 #line 96 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_error_free0 (ferr);
-#line 2651 "BatchImport.c"
+#line 2621 "BatchImport.c"
 	} else {
-		GError* _tmp8_ = NULL;
+		GError* _tmp8_;
 #line 111 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = err;
 #line 111 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp8_->domain == G_IO_ERROR) {
-#line 2658 "BatchImport.c"
+#line 2628 "BatchImport.c"
 			GError* ioerr = NULL;
-			GError* _tmp9_ = NULL;
-			GError* _tmp10_ = NULL;
-			GError* _tmp11_ = NULL;
+			GError* _tmp9_;
+			GError* _tmp10_;
+			GError* _tmp11_;
 #line 112 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp9_ = err;
 #line 112 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2675,9 +2645,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 				_g_error_free0 (ioerr);
 #line 115 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return result;
-#line 2679 "BatchImport.c"
+#line 2649 "BatchImport.c"
 			} else {
-				GError* _tmp12_ = NULL;
+				GError* _tmp12_;
 #line 116 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp12_ = ioerr;
 #line 116 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2688,9 +2658,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 					_g_error_free0 (ioerr);
 #line 117 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					return result;
-#line 2692 "BatchImport.c"
+#line 2662 "BatchImport.c"
 				} else {
-					GError* _tmp13_ = NULL;
+					GError* _tmp13_;
 #line 118 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp13_ = ioerr;
 #line 118 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2701,9 +2671,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 						_g_error_free0 (ioerr);
 #line 119 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						return result;
-#line 2705 "BatchImport.c"
+#line 2675 "BatchImport.c"
 					} else {
-						GError* _tmp14_ = NULL;
+						GError* _tmp14_;
 #line 120 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp14_ = ioerr;
 #line 120 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2714,9 +2684,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 							_g_error_free0 (ioerr);
 #line 121 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							return result;
-#line 2718 "BatchImport.c"
+#line 2688 "BatchImport.c"
 						} else {
-							GError* _tmp15_ = NULL;
+							GError* _tmp15_;
 #line 122 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp15_ = ioerr;
 #line 122 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2727,9 +2697,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 								_g_error_free0 (ioerr);
 #line 123 "/home/jens/Source/shotwell/src/BatchImport.vala"
 								return result;
-#line 2731 "BatchImport.c"
+#line 2701 "BatchImport.c"
 							} else {
-								GError* _tmp16_ = NULL;
+								GError* _tmp16_;
 #line 124 "/home/jens/Source/shotwell/src/BatchImport.vala"
 								_tmp16_ = ioerr;
 #line 124 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2740,7 +2710,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 									_g_error_free0 (ioerr);
 #line 125 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									return result;
-#line 2744 "BatchImport.c"
+#line 2714 "BatchImport.c"
 								} else {
 #line 127 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									result = IMPORT_RESULT_FILE_ERROR;
@@ -2748,7 +2718,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 									_g_error_free0 (ioerr);
 #line 127 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									return result;
-#line 2752 "BatchImport.c"
+#line 2722 "BatchImport.c"
 								}
 							}
 						}
@@ -2757,9 +2727,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 			}
 #line 111 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (ioerr);
-#line 2761 "BatchImport.c"
+#line 2731 "BatchImport.c"
 		} else {
-			GError* _tmp17_ = NULL;
+			GError* _tmp17_;
 #line 128 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp17_ = err;
 #line 128 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2768,18 +2738,18 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 				result = IMPORT_RESULT_CAMERA_ERROR;
 #line 129 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return result;
-#line 2772 "BatchImport.c"
+#line 2742 "BatchImport.c"
 			} else {
-				GError* _tmp18_ = NULL;
+				GError* _tmp18_;
 #line 130 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp18_ = err;
 #line 130 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp18_->domain == GDK_PIXBUF_ERROR) {
-#line 2779 "BatchImport.c"
+#line 2749 "BatchImport.c"
 					GError* pixbuferr = NULL;
-					GError* _tmp19_ = NULL;
-					GError* _tmp20_ = NULL;
-					GError* _tmp21_ = NULL;
+					GError* _tmp19_;
+					GError* _tmp20_;
+					GError* _tmp21_;
 #line 131 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp19_ = err;
 #line 131 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2796,15 +2766,15 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 						_g_error_free0 (pixbuferr);
 #line 134 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						return result;
-#line 2800 "BatchImport.c"
+#line 2770 "BatchImport.c"
 					} else {
-						GError* _tmp22_ = NULL;
+						GError* _tmp22_;
 #line 135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp22_ = pixbuferr;
 #line 135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (g_error_matches (_tmp22_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY)) {
-#line 2807 "BatchImport.c"
-							ImportResult _tmp23_ = 0;
+#line 2777 "BatchImport.c"
+							ImportResult _tmp23_;
 #line 136 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp23_ = default_result;
 #line 136 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2813,15 +2783,15 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 							_g_error_free0 (pixbuferr);
 #line 136 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							return result;
-#line 2817 "BatchImport.c"
+#line 2787 "BatchImport.c"
 						} else {
-							GError* _tmp24_ = NULL;
+							GError* _tmp24_;
 #line 137 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp24_ = pixbuferr;
 #line 137 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							if (g_error_matches (_tmp24_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_BAD_OPTION)) {
-#line 2824 "BatchImport.c"
-								ImportResult _tmp25_ = 0;
+#line 2794 "BatchImport.c"
+								ImportResult _tmp25_;
 #line 138 "/home/jens/Source/shotwell/src/BatchImport.vala"
 								_tmp25_ = default_result;
 #line 138 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2830,9 +2800,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 								_g_error_free0 (pixbuferr);
 #line 138 "/home/jens/Source/shotwell/src/BatchImport.vala"
 								return result;
-#line 2834 "BatchImport.c"
+#line 2804 "BatchImport.c"
 							} else {
-								GError* _tmp26_ = NULL;
+								GError* _tmp26_;
 #line 139 "/home/jens/Source/shotwell/src/BatchImport.vala"
 								_tmp26_ = pixbuferr;
 #line 139 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2843,15 +2813,15 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 									_g_error_free0 (pixbuferr);
 #line 140 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									return result;
-#line 2847 "BatchImport.c"
+#line 2817 "BatchImport.c"
 								} else {
-									GError* _tmp27_ = NULL;
+									GError* _tmp27_;
 #line 141 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									_tmp27_ = pixbuferr;
 #line 141 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									if (g_error_matches (_tmp27_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION)) {
-#line 2854 "BatchImport.c"
-										ImportResult _tmp28_ = 0;
+#line 2824 "BatchImport.c"
+										ImportResult _tmp28_;
 #line 142 "/home/jens/Source/shotwell/src/BatchImport.vala"
 										_tmp28_ = default_result;
 #line 142 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2860,15 +2830,15 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 										_g_error_free0 (pixbuferr);
 #line 142 "/home/jens/Source/shotwell/src/BatchImport.vala"
 										return result;
-#line 2864 "BatchImport.c"
+#line 2834 "BatchImport.c"
 									} else {
-										GError* _tmp29_ = NULL;
+										GError* _tmp29_;
 #line 143 "/home/jens/Source/shotwell/src/BatchImport.vala"
 										_tmp29_ = pixbuferr;
 #line 143 "/home/jens/Source/shotwell/src/BatchImport.vala"
 										if (g_error_matches (_tmp29_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED)) {
-#line 2871 "BatchImport.c"
-											ImportResult _tmp30_ = 0;
+#line 2841 "BatchImport.c"
+											ImportResult _tmp30_;
 #line 144 "/home/jens/Source/shotwell/src/BatchImport.vala"
 											_tmp30_ = default_result;
 #line 144 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2877,9 +2847,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 											_g_error_free0 (pixbuferr);
 #line 144 "/home/jens/Source/shotwell/src/BatchImport.vala"
 											return result;
-#line 2881 "BatchImport.c"
+#line 2851 "BatchImport.c"
 										} else {
-											ImportResult _tmp31_ = 0;
+											ImportResult _tmp31_;
 #line 146 "/home/jens/Source/shotwell/src/BatchImport.vala"
 											_tmp31_ = default_result;
 #line 146 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2888,7 +2858,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 											_g_error_free0 (pixbuferr);
 #line 146 "/home/jens/Source/shotwell/src/BatchImport.vala"
 											return result;
-#line 2892 "BatchImport.c"
+#line 2862 "BatchImport.c"
 										}
 									}
 								}
@@ -2897,7 +2867,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 					}
 #line 130 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_error_free0 (pixbuferr);
-#line 2901 "BatchImport.c"
+#line 2871 "BatchImport.c"
 				}
 			}
 		}
@@ -2908,7 +2878,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 	result = _tmp32_;
 #line 149 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 2912 "BatchImport.c"
+#line 2882 "BatchImport.c"
 }
 
 
@@ -2929,7 +2899,7 @@ static gchar* batch_import_job_real_get_dest_identifier (BatchImportJob* self) {
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_dest_identifier'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 161 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 2933 "BatchImport.c"
+#line 2903 "BatchImport.c"
 }
 
 
@@ -2938,7 +2908,7 @@ gchar* batch_import_job_get_dest_identifier (BatchImportJob* self) {
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
 #line 161 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_dest_identifier (self);
-#line 2942 "BatchImport.c"
+#line 2912 "BatchImport.c"
 }
 
 
@@ -2947,7 +2917,7 @@ static gchar* batch_import_job_real_get_source_identifier (BatchImportJob* self)
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_source_identifier'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 163 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 2951 "BatchImport.c"
+#line 2921 "BatchImport.c"
 }
 
 
@@ -2956,7 +2926,7 @@ gchar* batch_import_job_get_source_identifier (BatchImportJob* self) {
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
 #line 163 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_source_identifier (self);
-#line 2960 "BatchImport.c"
+#line 2930 "BatchImport.c"
 }
 
 
@@ -2966,7 +2936,7 @@ static gboolean batch_import_job_real_is_directory (BatchImportJob* self) {
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_is_directory'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 165 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return _tmp0_;
-#line 2970 "BatchImport.c"
+#line 2940 "BatchImport.c"
 }
 
 
@@ -2975,7 +2945,7 @@ gboolean batch_import_job_is_directory (BatchImportJob* self) {
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
 #line 165 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->is_directory (self);
-#line 2979 "BatchImport.c"
+#line 2949 "BatchImport.c"
 }
 
 
@@ -2984,7 +2954,7 @@ static gchar* batch_import_job_real_get_basename (BatchImportJob* self) {
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_basename'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 167 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 2988 "BatchImport.c"
+#line 2958 "BatchImport.c"
 }
 
 
@@ -2993,7 +2963,7 @@ gchar* batch_import_job_get_basename (BatchImportJob* self) {
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
 #line 167 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_basename (self);
-#line 2997 "BatchImport.c"
+#line 2967 "BatchImport.c"
 }
 
 
@@ -3002,7 +2972,7 @@ static gchar* batch_import_job_real_get_path (BatchImportJob* self) {
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_path'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 169 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 3006 "BatchImport.c"
+#line 2976 "BatchImport.c"
 }
 
 
@@ -3011,7 +2981,7 @@ gchar* batch_import_job_get_path (BatchImportJob* self) {
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
 #line 169 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_path (self);
-#line 3015 "BatchImport.c"
+#line 2985 "BatchImport.c"
 }
 
 
@@ -3021,7 +2991,7 @@ static DuplicatedFile* batch_import_job_real_get_duplicated_file (BatchImportJob
 	result = NULL;
 #line 172 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3025 "BatchImport.c"
+#line 2995 "BatchImport.c"
 }
 
 
@@ -3030,7 +3000,7 @@ DuplicatedFile* batch_import_job_get_duplicated_file (BatchImportJob* self) {
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
 #line 171 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_duplicated_file (self);
-#line 3034 "BatchImport.c"
+#line 3004 "BatchImport.c"
 }
 
 
@@ -3039,7 +3009,7 @@ static void batch_import_job_real_set_associated (BatchImportJob* self, BatchImp
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_set_associated'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 176 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return;
-#line 3043 "BatchImport.c"
+#line 3013 "BatchImport.c"
 }
 
 
@@ -3048,45 +3018,45 @@ void batch_import_job_set_associated (BatchImportJob* self, BatchImportJob* asso
 	g_return_if_fail (IS_BATCH_IMPORT_JOB (self));
 #line 176 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BATCH_IMPORT_JOB_GET_CLASS (self)->set_associated (self, associated);
-#line 3052 "BatchImport.c"
+#line 3022 "BatchImport.c"
 }
 
 
-static gboolean batch_import_job_real_determine_file_size (BatchImportJob* self, guint64* filesize, GFile** file_or_dir) {
+static gboolean batch_import_job_real_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir) {
 	gboolean _tmp0_ = FALSE;
 #line 183 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_determine_file_size'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 183 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return _tmp0_;
-#line 3062 "BatchImport.c"
+#line 3032 "BatchImport.c"
 }
 
 
-gboolean batch_import_job_determine_file_size (BatchImportJob* self, guint64* filesize, GFile** file_or_dir) {
+gboolean batch_import_job_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir) {
 #line 183 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
 #line 183 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->determine_file_size (self, filesize, file_or_dir);
-#line 3071 "BatchImport.c"
+#line 3041 "BatchImport.c"
 }
 
 
-static gboolean batch_import_job_real_prepare (BatchImportJob* self, GFile** file_to_import, gboolean* copy_to_library, GError** error) {
+static gboolean batch_import_job_real_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error) {
 	gboolean _tmp0_ = FALSE;
 #line 186 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_prepare'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 186 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return _tmp0_;
-#line 3081 "BatchImport.c"
+#line 3051 "BatchImport.c"
 }
 
 
-gboolean batch_import_job_prepare (BatchImportJob* self, GFile** file_to_import, gboolean* copy_to_library, GError** error) {
+gboolean batch_import_job_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error) {
 #line 186 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
 #line 186 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->prepare (self, file_to_import, copy_to_library, error);
-#line 3090 "BatchImport.c"
+#line 3060 "BatchImport.c"
 }
 
 
@@ -3100,7 +3070,7 @@ static gboolean batch_import_job_real_complete (BatchImportJob* self, MediaSourc
 	result = FALSE;
 #line 197 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3104 "BatchImport.c"
+#line 3074 "BatchImport.c"
 }
 
 
@@ -3109,7 +3079,7 @@ gboolean batch_import_job_complete (BatchImportJob* self, MediaSource* source, B
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
 #line 196 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->complete (self, source, import_roll, error);
-#line 3113 "BatchImport.c"
+#line 3083 "BatchImport.c"
 }
 
 
@@ -3119,7 +3089,7 @@ static time_t batch_import_job_real_get_exposure_time_override (BatchImportJob*
 	result = (time_t) 0;
 #line 203 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3123 "BatchImport.c"
+#line 3093 "BatchImport.c"
 }
 
 
@@ -3128,7 +3098,7 @@ time_t batch_import_job_get_exposure_time_override (BatchImportJob* self) {
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), 0);
 #line 202 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_exposure_time_override (self);
-#line 3132 "BatchImport.c"
+#line 3102 "BatchImport.c"
 }
 
 
@@ -3138,14 +3108,14 @@ BatchImportJob* batch_import_job_construct (GType object_type) {
 	self = (BatchImportJob*) g_type_create_instance (object_type);
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 3142 "BatchImport.c"
+#line 3112 "BatchImport.c"
 }
 
 
 static void value_batch_import_job_init (GValue* value) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 3149 "BatchImport.c"
+#line 3119 "BatchImport.c"
 }
 
 
@@ -3154,7 +3124,7 @@ static void value_batch_import_job_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_job_unref (value->data[0].v_pointer);
-#line 3158 "BatchImport.c"
+#line 3128 "BatchImport.c"
 	}
 }
 
@@ -3164,11 +3134,11 @@ static void value_batch_import_job_copy_value (const GValue* src_value, GValue*
 	if (src_value->data[0].v_pointer) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = batch_import_job_ref (src_value->data[0].v_pointer);
-#line 3168 "BatchImport.c"
+#line 3138 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3172 "BatchImport.c"
+#line 3142 "BatchImport.c"
 	}
 }
 
@@ -3176,66 +3146,66 @@ static void value_batch_import_job_copy_value (const GValue* src_value, GValue*
 static gpointer value_batch_import_job_peek_pointer (const GValue* value) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 3180 "BatchImport.c"
+#line 3150 "BatchImport.c"
 }
 
 
 static gchar* value_batch_import_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 3187 "BatchImport.c"
-		BatchImportJob* object;
+#line 3157 "BatchImport.c"
+		BatchImportJob * object;
 		object = collect_values[0].v_pointer;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3194 "BatchImport.c"
+#line 3164 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3198 "BatchImport.c"
+#line 3168 "BatchImport.c"
 		}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = batch_import_job_ref (object);
-#line 3202 "BatchImport.c"
+#line 3172 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3206 "BatchImport.c"
+#line 3176 "BatchImport.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 3210 "BatchImport.c"
+#line 3180 "BatchImport.c"
 }
 
 
 static gchar* value_batch_import_job_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	BatchImportJob** object_p;
+	BatchImportJob ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3221 "BatchImport.c"
+#line 3191 "BatchImport.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 3227 "BatchImport.c"
+#line 3197 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3231 "BatchImport.c"
+#line 3201 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = batch_import_job_ref (value->data[0].v_pointer);
-#line 3235 "BatchImport.c"
+#line 3205 "BatchImport.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 3239 "BatchImport.c"
+#line 3209 "BatchImport.c"
 }
 
 
@@ -3249,7 +3219,7 @@ GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, c
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 3253 "BatchImport.c"
+#line 3223 "BatchImport.c"
 }
 
 
@@ -3258,12 +3228,12 @@ gpointer value_get_batch_import_job (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_JOB), NULL);
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 3262 "BatchImport.c"
+#line 3232 "BatchImport.c"
 }
 
 
 void value_set_batch_import_job (GValue* value, gpointer v_object) {
-	BatchImportJob* old;
+	BatchImportJob * old;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_JOB));
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3278,23 +3248,23 @@ void value_set_batch_import_job (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_job_ref (value->data[0].v_pointer);
-#line 3282 "BatchImport.c"
+#line 3252 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3286 "BatchImport.c"
+#line 3256 "BatchImport.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_job_unref (old);
-#line 3292 "BatchImport.c"
+#line 3262 "BatchImport.c"
 	}
 }
 
 
 void value_take_batch_import_job (GValue* value, gpointer v_object) {
-	BatchImportJob* old;
+	BatchImportJob * old;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_JOB));
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3307,17 +3277,17 @@ void value_take_batch_import_job (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 3311 "BatchImport.c"
+#line 3281 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3315 "BatchImport.c"
+#line 3285 "BatchImport.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_job_unref (old);
-#line 3321 "BatchImport.c"
+#line 3291 "BatchImport.c"
 	}
 }
 
@@ -3328,45 +3298,45 @@ static void batch_import_job_class_init (BatchImportJobClass * klass) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportJobClass *) klass)->finalize = batch_import_job_finalize;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*)(BatchImportJob*)) batch_import_job_real_get_dest_identifier;
+	((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*) (BatchImportJob *)) batch_import_job_real_get_dest_identifier;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*)(BatchImportJob*)) batch_import_job_real_get_source_identifier;
+	((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*) (BatchImportJob *)) batch_import_job_real_get_source_identifier;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->is_directory = (gboolean (*)(BatchImportJob*)) batch_import_job_real_is_directory;
+	((BatchImportJobClass *) klass)->is_directory = (gboolean (*) (BatchImportJob *)) batch_import_job_real_is_directory;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->get_basename = (gchar* (*)(BatchImportJob*)) batch_import_job_real_get_basename;
+	((BatchImportJobClass *) klass)->get_basename = (gchar* (*) (BatchImportJob *)) batch_import_job_real_get_basename;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->get_path = (gchar* (*)(BatchImportJob*)) batch_import_job_real_get_path;
+	((BatchImportJobClass *) klass)->get_path = (gchar* (*) (BatchImportJob *)) batch_import_job_real_get_path;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->get_duplicated_file = (DuplicatedFile* (*)(BatchImportJob*)) batch_import_job_real_get_duplicated_file;
+	((BatchImportJobClass *) klass)->get_duplicated_file = (DuplicatedFile* (*) (BatchImportJob *)) batch_import_job_real_get_duplicated_file;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->set_associated = (void (*)(BatchImportJob*, BatchImportJob*)) batch_import_job_real_set_associated;
+	((BatchImportJobClass *) klass)->set_associated = (void (*) (BatchImportJob *, BatchImportJob*)) batch_import_job_real_set_associated;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*)(BatchImportJob*, guint64*, GFile**)) batch_import_job_real_determine_file_size;
+	((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*) (BatchImportJob *, guint64*, GFile* *)) batch_import_job_real_determine_file_size;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->prepare = (gboolean (*)(BatchImportJob*, GFile**, gboolean*, GError**)) batch_import_job_real_prepare;
+	((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) batch_import_job_real_prepare;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->complete = (gboolean (*)(BatchImportJob*, MediaSource*, BatchImportRoll*, GError**)) batch_import_job_real_complete;
+	((BatchImportJobClass *) klass)->complete = (gboolean (*) (BatchImportJob *, MediaSource*, BatchImportRoll*, GError**)) batch_import_job_real_complete;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->get_exposure_time_override = (time_t (*)(BatchImportJob*)) batch_import_job_real_get_exposure_time_override;
-#line 3353 "BatchImport.c"
+	((BatchImportJobClass *) klass)->get_exposure_time_override = (time_t (*) (BatchImportJob *)) batch_import_job_real_get_exposure_time_override;
+#line 3323 "BatchImport.c"
 }
 
 
 static void batch_import_job_instance_init (BatchImportJob * self) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 3360 "BatchImport.c"
+#line 3330 "BatchImport.c"
 }
 
 
-static void batch_import_job_finalize (BatchImportJob* obj) {
+static void batch_import_job_finalize (BatchImportJob * obj) {
 	BatchImportJob * self;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT_JOB, BatchImportJob);
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_handlers_destroy (self);
-#line 3370 "BatchImport.c"
+#line 3340 "BatchImport.c"
 }
 
 
@@ -3385,18 +3355,18 @@ GType batch_import_job_get_type (void) {
 
 
 gpointer batch_import_job_ref (gpointer instance) {
-	BatchImportJob* self;
+	BatchImportJob * self;
 	self = instance;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 3395 "BatchImport.c"
+#line 3365 "BatchImport.c"
 }
 
 
 void batch_import_job_unref (gpointer instance) {
-	BatchImportJob* self;
+	BatchImportJob * self;
 	self = instance;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -3404,7 +3374,7 @@ void batch_import_job_unref (gpointer instance) {
 		BATCH_IMPORT_JOB_GET_CLASS (self)->finalize (self);
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3408 "BatchImport.c"
+#line 3378 "BatchImport.c"
 	}
 }
 
@@ -3412,15 +3382,15 @@ void batch_import_job_unref (gpointer instance) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 213 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 3416 "BatchImport.c"
+#line 3386 "BatchImport.c"
 }
 
 
 FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library) {
 	FileImportJob* self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 #line 212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_FILE (file_or_dir), NULL);
 #line 212 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3439,22 +3409,22 @@ FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir,
 	self->priv->copy_to_library = _tmp2_;
 #line 212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 3443 "BatchImport.c"
+#line 3413 "BatchImport.c"
 }
 
 
 FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library) {
 #line 212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return file_import_job_construct (TYPE_FILE_IMPORT_JOB, file_or_dir, copy_to_library);
-#line 3450 "BatchImport.c"
+#line 3420 "BatchImport.c"
 }
 
 
 static gchar* file_import_job_real_get_dest_identifier (BatchImportJob* base) {
 	FileImportJob * self;
 	gchar* result = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
 #line 217 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
 #line 218 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3465,15 +3435,15 @@ static gchar* file_import_job_real_get_dest_identifier (BatchImportJob* base) {
 	result = _tmp1_;
 #line 218 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3469 "BatchImport.c"
+#line 3439 "BatchImport.c"
 }
 
 
 static gchar* file_import_job_real_get_source_identifier (BatchImportJob* base) {
 	FileImportJob * self;
 	gchar* result = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
 #line 221 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
 #line 222 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3484,15 +3454,15 @@ static gchar* file_import_job_real_get_source_identifier (BatchImportJob* base)
 	result = _tmp1_;
 #line 222 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3488 "BatchImport.c"
+#line 3458 "BatchImport.c"
 }
 
 
 static gboolean file_import_job_real_is_directory (BatchImportJob* base) {
 	FileImportJob * self;
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GFile* _tmp0_;
+	gboolean _tmp1_;
 #line 225 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
 #line 226 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3503,15 +3473,15 @@ static gboolean file_import_job_real_is_directory (BatchImportJob* base) {
 	result = _tmp1_;
 #line 226 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3507 "BatchImport.c"
+#line 3477 "BatchImport.c"
 }
 
 
 static gchar* file_import_job_real_get_basename (BatchImportJob* base) {
 	FileImportJob * self;
 	gchar* result = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
 #line 229 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
 #line 230 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3522,7 +3492,7 @@ static gchar* file_import_job_real_get_basename (BatchImportJob* base) {
 	result = _tmp1_;
 #line 230 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3526 "BatchImport.c"
+#line 3496 "BatchImport.c"
 }
 
 
@@ -3530,16 +3500,16 @@ static gchar* file_import_job_real_get_path (BatchImportJob* base) {
 	FileImportJob * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 233 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
 #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = batch_import_job_is_directory (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
 #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_) {
-#line 3541 "BatchImport.c"
-		GFile* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+#line 3511 "BatchImport.c"
+		GFile* _tmp2_;
+		gchar* _tmp3_;
 #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->priv->file_or_dir;
 #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3548,12 +3518,12 @@ static gchar* file_import_job_real_get_path (BatchImportJob* base) {
 		_g_free0 (_tmp0_);
 #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp3_;
-#line 3552 "BatchImport.c"
+#line 3522 "BatchImport.c"
 	} else {
-		GFile* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		GFile* _tmp4_;
+		GFile* _tmp5_;
+		GFile* _tmp6_;
+		gchar* _tmp7_;
 #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = self->priv->file_or_dir;
 #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3568,27 +3538,27 @@ static gchar* file_import_job_real_get_path (BatchImportJob* base) {
 		_tmp0_ = _tmp7_;
 #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp6_);
-#line 3572 "BatchImport.c"
+#line 3542 "BatchImport.c"
 	}
 #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
 #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3578 "BatchImport.c"
+#line 3548 "BatchImport.c"
 }
 
 
 static gpointer _batch_import_job_ref0 (gpointer self) {
 #line 238 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? batch_import_job_ref (self) : NULL;
-#line 3585 "BatchImport.c"
+#line 3555 "BatchImport.c"
 }
 
 
 static void file_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated) {
 	FileImportJob * self;
-	BatchImportJob* _tmp0_ = NULL;
-	FileImportJob* _tmp1_ = NULL;
+	BatchImportJob* _tmp0_;
+	FileImportJob* _tmp1_;
 #line 237 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
 #line 237 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3601,17 +3571,17 @@ static void file_import_job_real_set_associated (BatchImportJob* base, BatchImpo
 	_batch_import_job_unref0 (self->priv->associated);
 #line 238 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->associated = _tmp1_;
-#line 3605 "BatchImport.c"
+#line 3575 "BatchImport.c"
 }
 
 
-static gboolean file_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile** file) {
+static gboolean file_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file) {
 	FileImportJob * self;
 	guint64 _vala_filesize = 0ULL;
 	GFile* _vala_file = NULL;
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 241 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
 #line 242 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3630,32 +3600,32 @@ static gboolean file_import_job_real_determine_file_size (BatchImportJob* base,
 	if (filesize) {
 #line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*filesize = _vala_filesize;
-#line 3634 "BatchImport.c"
+#line 3604 "BatchImport.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (file) {
 #line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*file = _vala_file;
-#line 3640 "BatchImport.c"
+#line 3610 "BatchImport.c"
 	} else {
 #line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_vala_file);
-#line 3644 "BatchImport.c"
+#line 3614 "BatchImport.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3648 "BatchImport.c"
+#line 3618 "BatchImport.c"
 }
 
 
-static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile** file_to_import, gboolean* copy, GError** error) {
+static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy, GError** error) {
 	FileImportJob * self;
 	GFile* _vala_file_to_import = NULL;
 	gboolean _vala_copy = FALSE;
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 #line 248 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
 #line 249 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3676,28 +3646,28 @@ static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile** file
 	if (file_to_import) {
 #line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*file_to_import = _vala_file_to_import;
-#line 3680 "BatchImport.c"
+#line 3650 "BatchImport.c"
 	} else {
 #line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_vala_file_to_import);
-#line 3684 "BatchImport.c"
+#line 3654 "BatchImport.c"
 	}
 #line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (copy) {
 #line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*copy = _vala_copy;
-#line 3690 "BatchImport.c"
+#line 3660 "BatchImport.c"
 	}
 #line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3694 "BatchImport.c"
+#line 3664 "BatchImport.c"
 }
 
 
 GFile* file_import_job_get_file (FileImportJob* self) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 255 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_IMPORT_JOB (self), NULL);
 #line 256 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3708,7 +3678,7 @@ GFile* file_import_job_get_file (FileImportJob* self) {
 	result = _tmp1_;
 #line 256 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3712 "BatchImport.c"
+#line 3682 "BatchImport.c"
 }
 
 
@@ -3720,22 +3690,22 @@ static void file_import_job_class_init (FileImportJobClass * klass) {
 #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_type_class_add_private (klass, sizeof (FileImportJobPrivate));
 #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*)(BatchImportJob*)) file_import_job_real_get_dest_identifier;
+	((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*) (BatchImportJob *)) file_import_job_real_get_dest_identifier;
 #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*)(BatchImportJob*)) file_import_job_real_get_source_identifier;
+	((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*) (BatchImportJob *)) file_import_job_real_get_source_identifier;
 #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->is_directory = (gboolean (*)(BatchImportJob*)) file_import_job_real_is_directory;
+	((BatchImportJobClass *) klass)->is_directory = (gboolean (*) (BatchImportJob *)) file_import_job_real_is_directory;
 #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->get_basename = (gchar* (*)(BatchImportJob*)) file_import_job_real_get_basename;
+	((BatchImportJobClass *) klass)->get_basename = (gchar* (*) (BatchImportJob *)) file_import_job_real_get_basename;
 #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->get_path = (gchar* (*)(BatchImportJob*)) file_import_job_real_get_path;
+	((BatchImportJobClass *) klass)->get_path = (gchar* (*) (BatchImportJob *)) file_import_job_real_get_path;
 #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->set_associated = (void (*)(BatchImportJob*, BatchImportJob*)) file_import_job_real_set_associated;
+	((BatchImportJobClass *) klass)->set_associated = (void (*) (BatchImportJob *, BatchImportJob*)) file_import_job_real_set_associated;
 #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*)(BatchImportJob*, guint64*, GFile**)) file_import_job_real_determine_file_size;
+	((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*) (BatchImportJob *, guint64*, GFile* *)) file_import_job_real_determine_file_size;
 #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BatchImportJobClass *) klass)->prepare = (gboolean (*)(BatchImportJob*, GFile**, gboolean*, GError**)) file_import_job_real_prepare;
-#line 3739 "BatchImport.c"
+	((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) file_import_job_real_prepare;
+#line 3709 "BatchImport.c"
 }
 
 
@@ -3744,11 +3714,11 @@ static void file_import_job_instance_init (FileImportJob * self) {
 	self->priv = FILE_IMPORT_JOB_GET_PRIVATE (self);
 #line 210 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->associated = NULL;
-#line 3748 "BatchImport.c"
+#line 3718 "BatchImport.c"
 }
 
 
-static void file_import_job_finalize (BatchImportJob* obj) {
+static void file_import_job_finalize (BatchImportJob * obj) {
 	FileImportJob * self;
 #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FILE_IMPORT_JOB, FileImportJob);
@@ -3758,7 +3728,7 @@ static void file_import_job_finalize (BatchImportJob* obj) {
 	_batch_import_job_unref0 (self->priv->associated);
 #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BATCH_IMPORT_JOB_CLASS (file_import_job_parent_class)->finalize (obj);
-#line 3762 "BatchImport.c"
+#line 3732 "BatchImport.c"
 }
 
 
@@ -3785,21 +3755,21 @@ BatchImportRoll* batch_import_roll_construct (GType object_type) {
 	self->import_id = _tmp0_;
 #line 267 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 3789 "BatchImport.c"
+#line 3759 "BatchImport.c"
 }
 
 
 BatchImportRoll* batch_import_roll_new (void) {
 #line 267 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return batch_import_roll_construct (TYPE_BATCH_IMPORT_ROLL);
-#line 3796 "BatchImport.c"
+#line 3766 "BatchImport.c"
 }
 
 
 static void value_batch_import_roll_init (GValue* value) {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 3803 "BatchImport.c"
+#line 3773 "BatchImport.c"
 }
 
 
@@ -3808,7 +3778,7 @@ static void value_batch_import_roll_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_roll_unref (value->data[0].v_pointer);
-#line 3812 "BatchImport.c"
+#line 3782 "BatchImport.c"
 	}
 }
 
@@ -3818,11 +3788,11 @@ static void value_batch_import_roll_copy_value (const GValue* src_value, GValue*
 	if (src_value->data[0].v_pointer) {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = batch_import_roll_ref (src_value->data[0].v_pointer);
-#line 3822 "BatchImport.c"
+#line 3792 "BatchImport.c"
 	} else {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3826 "BatchImport.c"
+#line 3796 "BatchImport.c"
 	}
 }
 
@@ -3830,66 +3800,66 @@ static void value_batch_import_roll_copy_value (const GValue* src_value, GValue*
 static gpointer value_batch_import_roll_peek_pointer (const GValue* value) {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 3834 "BatchImport.c"
+#line 3804 "BatchImport.c"
 }
 
 
 static gchar* value_batch_import_roll_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 3841 "BatchImport.c"
-		BatchImportRoll* object;
+#line 3811 "BatchImport.c"
+		BatchImportRoll * object;
 		object = collect_values[0].v_pointer;
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3848 "BatchImport.c"
+#line 3818 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3852 "BatchImport.c"
+#line 3822 "BatchImport.c"
 		}
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = batch_import_roll_ref (object);
-#line 3856 "BatchImport.c"
+#line 3826 "BatchImport.c"
 	} else {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3860 "BatchImport.c"
+#line 3830 "BatchImport.c"
 	}
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 3864 "BatchImport.c"
+#line 3834 "BatchImport.c"
 }
 
 
 static gchar* value_batch_import_roll_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	BatchImportRoll** object_p;
+	BatchImportRoll ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3875 "BatchImport.c"
+#line 3845 "BatchImport.c"
 	}
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 3881 "BatchImport.c"
+#line 3851 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3885 "BatchImport.c"
+#line 3855 "BatchImport.c"
 	} else {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = batch_import_roll_ref (value->data[0].v_pointer);
-#line 3889 "BatchImport.c"
+#line 3859 "BatchImport.c"
 	}
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 3893 "BatchImport.c"
+#line 3863 "BatchImport.c"
 }
 
 
@@ -3903,7 +3873,7 @@ GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 3907 "BatchImport.c"
+#line 3877 "BatchImport.c"
 }
 
 
@@ -3912,12 +3882,12 @@ gpointer value_get_batch_import_roll (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_ROLL), NULL);
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 3916 "BatchImport.c"
+#line 3886 "BatchImport.c"
 }
 
 
 void value_set_batch_import_roll (GValue* value, gpointer v_object) {
-	BatchImportRoll* old;
+	BatchImportRoll * old;
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_ROLL));
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3932,23 +3902,23 @@ void value_set_batch_import_roll (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_roll_ref (value->data[0].v_pointer);
-#line 3936 "BatchImport.c"
+#line 3906 "BatchImport.c"
 	} else {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3940 "BatchImport.c"
+#line 3910 "BatchImport.c"
 	}
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_roll_unref (old);
-#line 3946 "BatchImport.c"
+#line 3916 "BatchImport.c"
 	}
 }
 
 
 void value_take_batch_import_roll (GValue* value, gpointer v_object) {
-	BatchImportRoll* old;
+	BatchImportRoll * old;
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_ROLL));
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3961,17 +3931,17 @@ void value_take_batch_import_roll (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 3965 "BatchImport.c"
+#line 3935 "BatchImport.c"
 	} else {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3969 "BatchImport.c"
+#line 3939 "BatchImport.c"
 	}
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_roll_unref (old);
-#line 3975 "BatchImport.c"
+#line 3945 "BatchImport.c"
 	}
 }
 
@@ -3981,23 +3951,23 @@ static void batch_import_roll_class_init (BatchImportRollClass * klass) {
 	batch_import_roll_parent_class = g_type_class_peek_parent (klass);
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportRollClass *) klass)->finalize = batch_import_roll_finalize;
-#line 3985 "BatchImport.c"
+#line 3955 "BatchImport.c"
 }
 
 
 static void batch_import_roll_instance_init (BatchImportRoll * self) {
-	ViewCollection* _tmp0_ = NULL;
+	ViewCollection* _tmp0_;
 #line 265 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = view_collection_new ("BatchImportRoll generated events");
 #line 265 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->generated_events = _tmp0_;
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 3997 "BatchImport.c"
+#line 3967 "BatchImport.c"
 }
 
 
-static void batch_import_roll_finalize (BatchImportRoll* obj) {
+static void batch_import_roll_finalize (BatchImportRoll * obj) {
 	BatchImportRoll * self;
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT_ROLL, BatchImportRoll);
@@ -4005,7 +3975,7 @@ static void batch_import_roll_finalize (BatchImportRoll* obj) {
 	g_signal_handlers_destroy (self);
 #line 265 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_data_collection_unref0 (self->generated_events);
-#line 4009 "BatchImport.c"
+#line 3979 "BatchImport.c"
 }
 
 
@@ -4024,18 +3994,18 @@ GType batch_import_roll_get_type (void) {
 
 
 gpointer batch_import_roll_ref (gpointer instance) {
-	BatchImportRoll* self;
+	BatchImportRoll * self;
 	self = instance;
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 4034 "BatchImport.c"
+#line 4004 "BatchImport.c"
 }
 
 
 void batch_import_roll_unref (gpointer instance) {
-	BatchImportRoll* self;
+	BatchImportRoll * self;
 	self = instance;
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -4043,24 +4013,24 @@ void batch_import_roll_unref (gpointer instance) {
 		BATCH_IMPORT_ROLL_GET_CLASS (self)->finalize (self);
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4047 "BatchImport.c"
+#line 4017 "BatchImport.c"
 	}
 }
 
 
 BatchImportResult* batch_import_result_construct (GType object_type, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, DuplicatedFile* duplicate_of, ImportResult _result_) {
 	BatchImportResult* self = NULL;
-	BatchImportJob* _tmp0_ = NULL;
-	BatchImportJob* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	DuplicatedFile* _tmp8_ = NULL;
-	DuplicatedFile* _tmp9_ = NULL;
-	ImportResult _tmp10_ = 0;
+	BatchImportJob* _tmp0_;
+	BatchImportJob* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	DuplicatedFile* _tmp8_;
+	DuplicatedFile* _tmp9_;
+	ImportResult _tmp10_;
 #line 287 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL);
 #line 287 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4119,33 +4089,33 @@ BatchImportResult* batch_import_result_construct (GType object_type, BatchImport
 	self->result = _tmp10_;
 #line 287 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 4123 "BatchImport.c"
+#line 4093 "BatchImport.c"
 }
 
 
 BatchImportResult* batch_import_result_new (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, DuplicatedFile* duplicate_of, ImportResult _result_) {
 #line 287 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return batch_import_result_construct (TYPE_BATCH_IMPORT_RESULT, job, file, src_identifier, dest_identifier, duplicate_of, _result_);
-#line 4130 "BatchImport.c"
+#line 4100 "BatchImport.c"
 }
 
 
 BatchImportResult* batch_import_result_construct_from_error (GType object_type, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result) {
 	BatchImportResult* self = NULL;
-	BatchImportJob* _tmp0_ = NULL;
-	BatchImportJob* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GError* _tmp8_ = NULL;
-	ImportResult _tmp9_ = 0;
-	ImportResult _tmp10_ = 0;
-	GError* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	BatchImportJob* _tmp0_;
+	BatchImportJob* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	GError* _tmp8_;
+	ImportResult _tmp9_;
+	ImportResult _tmp10_;
+	GError* _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
 #line 297 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL);
 #line 297 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4208,21 +4178,21 @@ BatchImportResult* batch_import_result_construct_from_error (GType object_type,
 	self->errmsg = _tmp13_;
 #line 297 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 4212 "BatchImport.c"
+#line 4182 "BatchImport.c"
 }
 
 
 BatchImportResult* batch_import_result_new_from_error (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result) {
 #line 297 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return batch_import_result_construct_from_error (TYPE_BATCH_IMPORT_RESULT, job, file, src_identifier, dest_identifier, err, default_result);
-#line 4219 "BatchImport.c"
+#line 4189 "BatchImport.c"
 }
 
 
 static void value_batch_import_result_init (GValue* value) {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 4226 "BatchImport.c"
+#line 4196 "BatchImport.c"
 }
 
 
@@ -4231,7 +4201,7 @@ static void value_batch_import_result_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_result_unref (value->data[0].v_pointer);
-#line 4235 "BatchImport.c"
+#line 4205 "BatchImport.c"
 	}
 }
 
@@ -4241,11 +4211,11 @@ static void value_batch_import_result_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = batch_import_result_ref (src_value->data[0].v_pointer);
-#line 4245 "BatchImport.c"
+#line 4215 "BatchImport.c"
 	} else {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4249 "BatchImport.c"
+#line 4219 "BatchImport.c"
 	}
 }
 
@@ -4253,66 +4223,66 @@ static void value_batch_import_result_copy_value (const GValue* src_value, GValu
 static gpointer value_batch_import_result_peek_pointer (const GValue* value) {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 4257 "BatchImport.c"
+#line 4227 "BatchImport.c"
 }
 
 
 static gchar* value_batch_import_result_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 4264 "BatchImport.c"
-		BatchImportResult* object;
+#line 4234 "BatchImport.c"
+		BatchImportResult * object;
 		object = collect_values[0].v_pointer;
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4271 "BatchImport.c"
+#line 4241 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4275 "BatchImport.c"
+#line 4245 "BatchImport.c"
 		}
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = batch_import_result_ref (object);
-#line 4279 "BatchImport.c"
+#line 4249 "BatchImport.c"
 	} else {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4283 "BatchImport.c"
+#line 4253 "BatchImport.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 4287 "BatchImport.c"
+#line 4257 "BatchImport.c"
 }
 
 
 static gchar* value_batch_import_result_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	BatchImportResult** object_p;
+	BatchImportResult ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4298 "BatchImport.c"
+#line 4268 "BatchImport.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 4304 "BatchImport.c"
+#line 4274 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4308 "BatchImport.c"
+#line 4278 "BatchImport.c"
 	} else {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = batch_import_result_ref (value->data[0].v_pointer);
-#line 4312 "BatchImport.c"
+#line 4282 "BatchImport.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 4316 "BatchImport.c"
+#line 4286 "BatchImport.c"
 }
 
 
@@ -4326,7 +4296,7 @@ GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 4330 "BatchImport.c"
+#line 4300 "BatchImport.c"
 }
 
 
@@ -4335,12 +4305,12 @@ gpointer value_get_batch_import_result (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_RESULT), NULL);
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 4339 "BatchImport.c"
+#line 4309 "BatchImport.c"
 }
 
 
 void value_set_batch_import_result (GValue* value, gpointer v_object) {
-	BatchImportResult* old;
+	BatchImportResult * old;
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_RESULT));
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4355,23 +4325,23 @@ void value_set_batch_import_result (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_result_ref (value->data[0].v_pointer);
-#line 4359 "BatchImport.c"
+#line 4329 "BatchImport.c"
 	} else {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4363 "BatchImport.c"
+#line 4333 "BatchImport.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_result_unref (old);
-#line 4369 "BatchImport.c"
+#line 4339 "BatchImport.c"
 	}
 }
 
 
 void value_take_batch_import_result (GValue* value, gpointer v_object) {
-	BatchImportResult* old;
+	BatchImportResult * old;
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_RESULT));
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4384,17 +4354,17 @@ void value_take_batch_import_result (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 4388 "BatchImport.c"
+#line 4358 "BatchImport.c"
 	} else {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4392 "BatchImport.c"
+#line 4362 "BatchImport.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_result_unref (old);
-#line 4398 "BatchImport.c"
+#line 4368 "BatchImport.c"
 	}
 }
 
@@ -4404,7 +4374,7 @@ static void batch_import_result_class_init (BatchImportResultClass * klass) {
 	batch_import_result_parent_class = g_type_class_peek_parent (klass);
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportResultClass *) klass)->finalize = batch_import_result_finalize;
-#line 4408 "BatchImport.c"
+#line 4378 "BatchImport.c"
 }
 
 
@@ -4413,11 +4383,11 @@ static void batch_import_result_instance_init (BatchImportResult * self) {
 	self->errmsg = NULL;
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 4417 "BatchImport.c"
+#line 4387 "BatchImport.c"
 }
 
 
-static void batch_import_result_finalize (BatchImportResult* obj) {
+static void batch_import_result_finalize (BatchImportResult * obj) {
 	BatchImportResult * self;
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT_RESULT, BatchImportResult);
@@ -4435,7 +4405,7 @@ static void batch_import_result_finalize (BatchImportResult* obj) {
 	_g_free0 (self->errmsg);
 #line 285 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->duplicate_of);
-#line 4439 "BatchImport.c"
+#line 4409 "BatchImport.c"
 }
 
 
@@ -4454,18 +4424,18 @@ GType batch_import_result_get_type (void) {
 
 
 gpointer batch_import_result_ref (gpointer instance) {
-	BatchImportResult* self;
+	BatchImportResult * self;
 	self = instance;
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 4464 "BatchImport.c"
+#line 4434 "BatchImport.c"
 }
 
 
 void batch_import_result_unref (gpointer instance) {
-	BatchImportResult* self;
+	BatchImportResult * self;
 	self = instance;
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -4473,15 +4443,15 @@ void batch_import_result_unref (gpointer instance) {
 		BATCH_IMPORT_RESULT_GET_CLASS (self)->finalize (self);
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4477 "BatchImport.c"
+#line 4447 "BatchImport.c"
 	}
 }
 
 
 ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed, GeeList* pre_already_imported) {
 	ImportManifest* self = NULL;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp22_ = NULL;
+	GeeList* _tmp0_;
+	GeeList* _tmp22_;
 #line 321 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((prefailed == NULL) || GEE_IS_LIST (prefailed), NULL);
 #line 321 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4492,15 +4462,15 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
 	_tmp0_ = prefailed;
 #line 323 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_ != NULL) {
-#line 4496 "BatchImport.c"
+#line 4466 "BatchImport.c"
 		{
 			GeeList* _job_list = NULL;
-			GeeList* _tmp1_ = NULL;
-			GeeList* _tmp2_ = NULL;
+			GeeList* _tmp1_;
+			GeeList* _tmp2_;
 			gint _job_size = 0;
-			GeeList* _tmp3_ = NULL;
-			gint _tmp4_ = 0;
-			gint _tmp5_ = 0;
+			GeeList* _tmp3_;
+			gint _tmp4_;
+			gint _tmp5_;
 			gint _job_index = 0;
 #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp1_ = prefailed;
@@ -4520,25 +4490,25 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
 			_job_index = -1;
 #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			while (TRUE) {
-#line 4524 "BatchImport.c"
-				gint _tmp6_ = 0;
-				gint _tmp7_ = 0;
-				gint _tmp8_ = 0;
+#line 4494 "BatchImport.c"
+				gint _tmp6_;
+				gint _tmp7_;
+				gint _tmp8_;
 				BatchImportJob* job = NULL;
-				GeeList* _tmp9_ = NULL;
-				gint _tmp10_ = 0;
-				gpointer _tmp11_ = NULL;
+				GeeList* _tmp9_;
+				gint _tmp10_;
+				gpointer _tmp11_;
 				BatchImportResult* batch_result = NULL;
-				BatchImportJob* _tmp12_ = NULL;
-				BatchImportJob* _tmp13_ = NULL;
-				gchar* _tmp14_ = NULL;
-				gchar* _tmp15_ = NULL;
-				BatchImportJob* _tmp16_ = NULL;
-				gchar* _tmp17_ = NULL;
-				gchar* _tmp18_ = NULL;
-				BatchImportResult* _tmp19_ = NULL;
-				BatchImportResult* _tmp20_ = NULL;
-				BatchImportResult* _tmp21_ = NULL;
+				BatchImportJob* _tmp12_;
+				BatchImportJob* _tmp13_;
+				gchar* _tmp14_;
+				gchar* _tmp15_;
+				BatchImportJob* _tmp16_;
+				gchar* _tmp17_;
+				gchar* _tmp18_;
+				BatchImportResult* _tmp19_;
+				BatchImportResult* _tmp20_;
+				BatchImportResult* _tmp21_;
 #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp6_ = _job_index;
 #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4551,7 +4521,7 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
 				if (!(_tmp7_ < _tmp8_)) {
 #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					break;
-#line 4555 "BatchImport.c"
+#line 4525 "BatchImport.c"
 				}
 #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp9_ = _job_list;
@@ -4593,26 +4563,26 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
 				_batch_import_result_unref0 (batch_result);
 #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_job_unref0 (job);
-#line 4597 "BatchImport.c"
+#line 4567 "BatchImport.c"
 			}
 #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_job_list);
-#line 4601 "BatchImport.c"
+#line 4571 "BatchImport.c"
 		}
 	}
 #line 333 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp22_ = pre_already_imported;
 #line 333 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp22_ != NULL) {
-#line 4608 "BatchImport.c"
+#line 4578 "BatchImport.c"
 		{
 			GeeList* _job_list = NULL;
-			GeeList* _tmp23_ = NULL;
-			GeeList* _tmp24_ = NULL;
+			GeeList* _tmp23_;
+			GeeList* _tmp24_;
 			gint _job_size = 0;
-			GeeList* _tmp25_ = NULL;
-			gint _tmp26_ = 0;
-			gint _tmp27_ = 0;
+			GeeList* _tmp25_;
+			gint _tmp26_;
+			gint _tmp27_;
 			gint _job_index = 0;
 #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp23_ = pre_already_imported;
@@ -4632,33 +4602,33 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
 			_job_index = -1;
 #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			while (TRUE) {
-#line 4636 "BatchImport.c"
-				gint _tmp28_ = 0;
-				gint _tmp29_ = 0;
-				gint _tmp30_ = 0;
+#line 4606 "BatchImport.c"
+				gint _tmp28_;
+				gint _tmp29_;
+				gint _tmp30_;
 				BatchImportJob* job = NULL;
-				GeeList* _tmp31_ = NULL;
-				gint _tmp32_ = 0;
-				gpointer _tmp33_ = NULL;
+				GeeList* _tmp31_;
+				gint _tmp32_;
+				gpointer _tmp33_;
 				BatchImportResult* batch_result = NULL;
-				BatchImportJob* _tmp34_ = NULL;
-				BatchImportJob* _tmp35_ = NULL;
-				gchar* _tmp36_ = NULL;
-				gchar* _tmp37_ = NULL;
-				GFile* _tmp38_ = NULL;
-				GFile* _tmp39_ = NULL;
-				BatchImportJob* _tmp40_ = NULL;
-				gchar* _tmp41_ = NULL;
-				gchar* _tmp42_ = NULL;
-				BatchImportJob* _tmp43_ = NULL;
-				gchar* _tmp44_ = NULL;
-				gchar* _tmp45_ = NULL;
-				BatchImportJob* _tmp46_ = NULL;
-				DuplicatedFile* _tmp47_ = NULL;
-				DuplicatedFile* _tmp48_ = NULL;
-				BatchImportResult* _tmp49_ = NULL;
-				BatchImportResult* _tmp50_ = NULL;
-				BatchImportResult* _tmp51_ = NULL;
+				BatchImportJob* _tmp34_;
+				BatchImportJob* _tmp35_;
+				gchar* _tmp36_;
+				gchar* _tmp37_;
+				GFile* _tmp38_;
+				GFile* _tmp39_;
+				BatchImportJob* _tmp40_;
+				gchar* _tmp41_;
+				gchar* _tmp42_;
+				BatchImportJob* _tmp43_;
+				gchar* _tmp44_;
+				gchar* _tmp45_;
+				BatchImportJob* _tmp46_;
+				DuplicatedFile* _tmp47_;
+				DuplicatedFile* _tmp48_;
+				BatchImportResult* _tmp49_;
+				BatchImportResult* _tmp50_;
+				BatchImportResult* _tmp51_;
 #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp28_ = _job_index;
 #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4671,7 +4641,7 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
 				if (!(_tmp29_ < _tmp30_)) {
 #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					break;
-#line 4675 "BatchImport.c"
+#line 4645 "BatchImport.c"
 				}
 #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp31_ = _job_list;
@@ -4735,31 +4705,31 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
 				_batch_import_result_unref0 (batch_result);
 #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_job_unref0 (job);
-#line 4739 "BatchImport.c"
+#line 4709 "BatchImport.c"
 			}
 #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_job_list);
-#line 4743 "BatchImport.c"
+#line 4713 "BatchImport.c"
 		}
 	}
 #line 321 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 4748 "BatchImport.c"
+#line 4718 "BatchImport.c"
 }
 
 
 ImportManifest* import_manifest_new (GeeList* prefailed, GeeList* pre_already_imported) {
 #line 321 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return import_manifest_construct (TYPE_IMPORT_MANIFEST, prefailed, pre_already_imported);
-#line 4755 "BatchImport.c"
+#line 4725 "BatchImport.c"
 }
 
 
 void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_result) {
 	gboolean reported = FALSE;
-	BatchImportResult* _tmp0_ = NULL;
-	ImportResult _tmp1_ = 0;
-	gboolean _tmp26_ = FALSE;
+	BatchImportResult* _tmp0_;
+	ImportResult _tmp1_;
+	gboolean _tmp26_;
 #line 345 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (self));
 #line 345 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4774,10 +4744,10 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
 	switch (_tmp1_) {
 #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_SUCCESS:
-#line 4778 "BatchImport.c"
+#line 4748 "BatchImport.c"
 		{
-			GeeList* _tmp2_ = NULL;
-			BatchImportResult* _tmp3_ = NULL;
+			GeeList* _tmp2_;
+			BatchImportResult* _tmp3_;
 #line 349 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp2_ = self->success;
 #line 349 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4786,25 +4756,25 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp3_);
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4790 "BatchImport.c"
+#line 4760 "BatchImport.c"
 		}
 #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_USER_ABORT:
-#line 4794 "BatchImport.c"
+#line 4764 "BatchImport.c"
 		{
 			gboolean _tmp4_ = FALSE;
-			BatchImportResult* _tmp5_ = NULL;
-			GFile* _tmp6_ = NULL;
+			BatchImportResult* _tmp5_;
+			GFile* _tmp6_;
 #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = batch_result;
 #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp6_ = _tmp5_->file;
 #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp6_ != NULL) {
-#line 4805 "BatchImport.c"
-				BatchImportResult* _tmp7_ = NULL;
-				GFile* _tmp8_ = NULL;
-				gboolean _tmp9_ = FALSE;
+#line 4775 "BatchImport.c"
+				BatchImportResult* _tmp7_;
+				GFile* _tmp8_;
+				gboolean _tmp9_;
 #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp7_ = batch_result;
 #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4813,39 +4783,39 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
 				_tmp9_ = query_is_directory (_tmp8_);
 #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp4_ = !_tmp9_;
-#line 4817 "BatchImport.c"
+#line 4787 "BatchImport.c"
 			} else {
 #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp4_ = FALSE;
-#line 4821 "BatchImport.c"
+#line 4791 "BatchImport.c"
 			}
 #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp4_) {
-#line 4825 "BatchImport.c"
-				GeeList* _tmp10_ = NULL;
-				BatchImportResult* _tmp11_ = NULL;
+#line 4795 "BatchImport.c"
+				GeeList* _tmp10_;
+				BatchImportResult* _tmp11_;
 #line 354 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp10_ = self->aborted;
 #line 354 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp11_ = batch_result;
 #line 354 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_);
-#line 4834 "BatchImport.c"
+#line 4804 "BatchImport.c"
 			} else {
 #line 356 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				reported = FALSE;
-#line 4838 "BatchImport.c"
+#line 4808 "BatchImport.c"
 			}
 #line 357 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4842 "BatchImport.c"
+#line 4812 "BatchImport.c"
 		}
 #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_UNSUPPORTED_FORMAT:
-#line 4846 "BatchImport.c"
+#line 4816 "BatchImport.c"
 		{
-			GeeList* _tmp12_ = NULL;
-			BatchImportResult* _tmp13_ = NULL;
+			GeeList* _tmp12_;
+			BatchImportResult* _tmp13_;
 #line 360 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = self->skipped_photos;
 #line 360 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4854,16 +4824,16 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_);
 #line 361 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4858 "BatchImport.c"
+#line 4828 "BatchImport.c"
 		}
 #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_NOT_A_FILE:
 #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_NOT_AN_IMAGE:
-#line 4864 "BatchImport.c"
+#line 4834 "BatchImport.c"
 		{
-			GeeList* _tmp14_ = NULL;
-			BatchImportResult* _tmp15_ = NULL;
+			GeeList* _tmp14_;
+			BatchImportResult* _tmp15_;
 #line 365 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = self->skipped_files;
 #line 365 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4872,14 +4842,14 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_);
 #line 366 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4876 "BatchImport.c"
+#line 4846 "BatchImport.c"
 		}
 #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_PHOTO_EXISTS:
-#line 4880 "BatchImport.c"
+#line 4850 "BatchImport.c"
 		{
-			GeeList* _tmp16_ = NULL;
-			BatchImportResult* _tmp17_ = NULL;
+			GeeList* _tmp16_;
+			BatchImportResult* _tmp17_;
 #line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp16_ = self->already_imported;
 #line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4888,14 +4858,14 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_);
 #line 370 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4892 "BatchImport.c"
+#line 4862 "BatchImport.c"
 		}
 #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_CAMERA_ERROR:
-#line 4896 "BatchImport.c"
+#line 4866 "BatchImport.c"
 		{
-			GeeList* _tmp18_ = NULL;
-			BatchImportResult* _tmp19_ = NULL;
+			GeeList* _tmp18_;
+			BatchImportResult* _tmp19_;
 #line 373 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp18_ = self->camera_failed;
 #line 373 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4904,14 +4874,14 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_);
 #line 374 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4908 "BatchImport.c"
+#line 4878 "BatchImport.c"
 		}
 #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_FILE_WRITE_ERROR:
-#line 4912 "BatchImport.c"
+#line 4882 "BatchImport.c"
 		{
-			GeeList* _tmp20_ = NULL;
-			BatchImportResult* _tmp21_ = NULL;
+			GeeList* _tmp20_;
+			BatchImportResult* _tmp21_;
 #line 377 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp20_ = self->write_failed;
 #line 377 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4920,14 +4890,14 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_);
 #line 378 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4924 "BatchImport.c"
+#line 4894 "BatchImport.c"
 		}
 #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE:
-#line 4928 "BatchImport.c"
+#line 4898 "BatchImport.c"
 		{
-			GeeList* _tmp22_ = NULL;
-			BatchImportResult* _tmp23_ = NULL;
+			GeeList* _tmp22_;
+			BatchImportResult* _tmp23_;
 #line 381 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp22_ = self->corrupt_files;
 #line 381 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4936,12 +4906,12 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
 #line 382 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4940 "BatchImport.c"
+#line 4910 "BatchImport.c"
 		}
 		default:
 		{
-			GeeList* _tmp24_ = NULL;
-			BatchImportResult* _tmp25_ = NULL;
+			GeeList* _tmp24_;
+			BatchImportResult* _tmp25_;
 #line 385 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp24_ = self->failed;
 #line 385 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4950,23 +4920,23 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
 #line 386 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4954 "BatchImport.c"
+#line 4924 "BatchImport.c"
 		}
 	}
 #line 389 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp26_ = reported;
 #line 389 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp26_) {
-#line 4961 "BatchImport.c"
-		GeeList* _tmp27_ = NULL;
-		BatchImportResult* _tmp28_ = NULL;
+#line 4931 "BatchImport.c"
+		GeeList* _tmp27_;
+		BatchImportResult* _tmp28_;
 #line 390 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp27_ = self->all;
 #line 390 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp28_ = batch_result;
 #line 390 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_);
-#line 4970 "BatchImport.c"
+#line 4940 "BatchImport.c"
 	}
 }
 
@@ -4974,7 +4944,7 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
 static void value_import_manifest_init (GValue* value) {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 4978 "BatchImport.c"
+#line 4948 "BatchImport.c"
 }
 
 
@@ -4983,7 +4953,7 @@ static void value_import_manifest_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		import_manifest_unref (value->data[0].v_pointer);
-#line 4987 "BatchImport.c"
+#line 4957 "BatchImport.c"
 	}
 }
 
@@ -4993,11 +4963,11 @@ static void value_import_manifest_copy_value (const GValue* src_value, GValue* d
 	if (src_value->data[0].v_pointer) {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = import_manifest_ref (src_value->data[0].v_pointer);
-#line 4997 "BatchImport.c"
+#line 4967 "BatchImport.c"
 	} else {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5001 "BatchImport.c"
+#line 4971 "BatchImport.c"
 	}
 }
 
@@ -5005,66 +4975,66 @@ static void value_import_manifest_copy_value (const GValue* src_value, GValue* d
 static gpointer value_import_manifest_peek_pointer (const GValue* value) {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 5009 "BatchImport.c"
+#line 4979 "BatchImport.c"
 }
 
 
 static gchar* value_import_manifest_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 5016 "BatchImport.c"
-		ImportManifest* object;
+#line 4986 "BatchImport.c"
+		ImportManifest * object;
 		object = collect_values[0].v_pointer;
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5023 "BatchImport.c"
+#line 4993 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5027 "BatchImport.c"
+#line 4997 "BatchImport.c"
 		}
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = import_manifest_ref (object);
-#line 5031 "BatchImport.c"
+#line 5001 "BatchImport.c"
 	} else {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5035 "BatchImport.c"
+#line 5005 "BatchImport.c"
 	}
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 5039 "BatchImport.c"
+#line 5009 "BatchImport.c"
 }
 
 
 static gchar* value_import_manifest_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	ImportManifest** object_p;
+	ImportManifest ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5050 "BatchImport.c"
+#line 5020 "BatchImport.c"
 	}
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 5056 "BatchImport.c"
+#line 5026 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5060 "BatchImport.c"
+#line 5030 "BatchImport.c"
 	} else {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = import_manifest_ref (value->data[0].v_pointer);
-#line 5064 "BatchImport.c"
+#line 5034 "BatchImport.c"
 	}
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 5068 "BatchImport.c"
+#line 5038 "BatchImport.c"
 }
 
 
@@ -5078,7 +5048,7 @@ GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 5082 "BatchImport.c"
+#line 5052 "BatchImport.c"
 }
 
 
@@ -5087,12 +5057,12 @@ gpointer value_get_import_manifest (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORT_MANIFEST), NULL);
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 5091 "BatchImport.c"
+#line 5061 "BatchImport.c"
 }
 
 
 void value_set_import_manifest (GValue* value, gpointer v_object) {
-	ImportManifest* old;
+	ImportManifest * old;
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORT_MANIFEST));
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5107,23 +5077,23 @@ void value_set_import_manifest (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		import_manifest_ref (value->data[0].v_pointer);
-#line 5111 "BatchImport.c"
+#line 5081 "BatchImport.c"
 	} else {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5115 "BatchImport.c"
+#line 5085 "BatchImport.c"
 	}
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		import_manifest_unref (old);
-#line 5121 "BatchImport.c"
+#line 5091 "BatchImport.c"
 	}
 }
 
 
 void value_take_import_manifest (GValue* value, gpointer v_object) {
-	ImportManifest* old;
+	ImportManifest * old;
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORT_MANIFEST));
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5136,17 +5106,17 @@ void value_take_import_manifest (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 5140 "BatchImport.c"
+#line 5110 "BatchImport.c"
 	} else {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5144 "BatchImport.c"
+#line 5114 "BatchImport.c"
 	}
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		import_manifest_unref (old);
-#line 5150 "BatchImport.c"
+#line 5120 "BatchImport.c"
 	}
 }
 
@@ -5156,22 +5126,22 @@ static void import_manifest_class_init (ImportManifestClass * klass) {
 	import_manifest_parent_class = g_type_class_peek_parent (klass);
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((ImportManifestClass *) klass)->finalize = import_manifest_finalize;
-#line 5160 "BatchImport.c"
+#line 5130 "BatchImport.c"
 }
 
 
 static void import_manifest_instance_init (ImportManifest * self) {
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	GeeArrayList* _tmp2_ = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	GeeArrayList* _tmp4_ = NULL;
-	GeeArrayList* _tmp5_ = NULL;
-	GeeArrayList* _tmp6_ = NULL;
-	GeeArrayList* _tmp7_ = NULL;
-	GeeArrayList* _tmp8_ = NULL;
-	GeeArrayList* _tmp9_ = NULL;
-	GeeArrayList* _tmp10_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp1_;
+	GeeArrayList* _tmp2_;
+	GeeArrayList* _tmp3_;
+	GeeArrayList* _tmp4_;
+	GeeArrayList* _tmp5_;
+	GeeArrayList* _tmp6_;
+	GeeArrayList* _tmp7_;
+	GeeArrayList* _tmp8_;
+	GeeArrayList* _tmp9_;
+	GeeArrayList* _tmp10_;
 #line 309 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 309 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5218,11 +5188,11 @@ static void import_manifest_instance_init (ImportManifest * self) {
 	self->all = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_LIST, GeeList);
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 5222 "BatchImport.c"
+#line 5192 "BatchImport.c"
 }
 
 
-static void import_manifest_finalize (ImportManifest* obj) {
+static void import_manifest_finalize (ImportManifest * obj) {
 	ImportManifest * self;
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_MANIFEST, ImportManifest);
@@ -5250,7 +5220,7 @@ static void import_manifest_finalize (ImportManifest* obj) {
 	_g_object_unref0 (self->corrupt_files);
 #line 319 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->all);
-#line 5254 "BatchImport.c"
+#line 5224 "BatchImport.c"
 }
 
 
@@ -5269,18 +5239,18 @@ GType import_manifest_get_type (void) {
 
 
 gpointer import_manifest_ref (gpointer instance) {
-	ImportManifest* self;
+	ImportManifest * self;
 	self = instance;
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 5279 "BatchImport.c"
+#line 5249 "BatchImport.c"
 }
 
 
 void import_manifest_unref (gpointer instance) {
-	ImportManifest* self;
+	ImportManifest * self;
 	self = instance;
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -5288,7 +5258,7 @@ void import_manifest_unref (gpointer instance) {
 		IMPORT_MANIFEST_GET_CLASS (self)->finalize (self);
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5292 "BatchImport.c"
+#line 5262 "BatchImport.c"
 	}
 }
 
@@ -5296,14 +5266,14 @@ void import_manifest_unref (gpointer instance) {
 static void _batch_import_user_halt_application_exiting (Application* _sender, gboolean panicked, gpointer self) {
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_user_halt ((BatchImport*) self);
-#line 5300 "BatchImport.c"
+#line 5270 "BatchImport.c"
 }
 
 
 static gpointer _batch_import_roll_ref0 (gpointer self) {
 #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? batch_import_roll_ref (self) : NULL;
-#line 5307 "BatchImport.c"
+#line 5277 "BatchImport.c"
 }
 
 
@@ -5312,7 +5282,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
 	result = file_hash ((GFile*) v);
 #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5316 "BatchImport.c"
+#line 5286 "BatchImport.c"
 }
 
 
@@ -5321,7 +5291,7 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer
 	result = file_equal ((GFile*) a, (GFile*) b);
 #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5325 "BatchImport.c"
+#line 5295 "BatchImport.c"
 }
 
 
@@ -5330,30 +5300,30 @@ static gboolean _batch_import_display_imported_timer_gsource_func (gpointer self
 	result = batch_import_display_imported_timer ((BatchImport*) self);
 #line 501 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5334 "BatchImport.c"
+#line 5304 "BatchImport.c"
 }
 
 
 BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest) {
 	BatchImport * self = NULL;
-	GeeIterable* _tmp0_ = NULL;
-	GeeIterable* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	BatchImportImportReporter _tmp4_ = NULL;
-	void* _tmp4__target = NULL;
-	GeeArrayList* _tmp5_ = NULL;
-	GeeArrayList* _tmp6_ = NULL;
-	ImportManifest* _tmp7_ = NULL;
+	GeeIterable* _tmp0_;
+	GeeIterable* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	BatchImportImportReporter _tmp4_;
+	void* _tmp4__target;
+	GeeArrayList* _tmp5_;
+	GeeArrayList* _tmp6_;
+	ImportManifest* _tmp7_;
 	GCancellable* _tmp8_ = NULL;
-	GCancellable* _tmp9_ = NULL;
-	GCancellable* _tmp13_ = NULL;
+	GCancellable* _tmp9_;
+	GCancellable* _tmp13_;
 	BatchImportRoll* _tmp14_ = NULL;
-	BatchImportRoll* _tmp15_ = NULL;
-	BatchImportRoll* _tmp19_ = NULL;
-	ImportManifest* _tmp20_ = NULL;
-	Application* _tmp38_ = NULL;
-	Application* _tmp39_ = NULL;
+	BatchImportRoll* _tmp15_;
+	BatchImportRoll* _tmp19_;
+	ImportManifest* _tmp20_;
+	Application* _tmp38_;
+	Application* _tmp39_;
 #line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (jobs), NULL);
 #line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5408,9 +5378,9 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
 	_tmp9_ = cancellable;
 #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp9_ != NULL) {
-#line 5412 "BatchImport.c"
-		GCancellable* _tmp10_ = NULL;
-		GCancellable* _tmp11_ = NULL;
+#line 5382 "BatchImport.c"
+		GCancellable* _tmp10_;
+		GCancellable* _tmp11_;
 #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = cancellable;
 #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5419,16 +5389,16 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
 		_g_object_unref0 (_tmp8_);
 #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = _tmp11_;
-#line 5423 "BatchImport.c"
+#line 5393 "BatchImport.c"
 	} else {
-		GCancellable* _tmp12_ = NULL;
+		GCancellable* _tmp12_;
 #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp12_ = g_cancellable_new ();
 #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp8_);
 #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = _tmp12_;
-#line 5432 "BatchImport.c"
+#line 5402 "BatchImport.c"
 	}
 #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp13_ = _g_object_ref0 (_tmp8_);
@@ -5440,9 +5410,9 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
 	_tmp15_ = import_roll;
 #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp15_ != NULL) {
-#line 5444 "BatchImport.c"
-		BatchImportRoll* _tmp16_ = NULL;
-		BatchImportRoll* _tmp17_ = NULL;
+#line 5414 "BatchImport.c"
+		BatchImportRoll* _tmp16_;
+		BatchImportRoll* _tmp17_;
 #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp16_ = import_roll;
 #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5451,16 +5421,16 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
 		_batch_import_roll_unref0 (_tmp14_);
 #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = _tmp17_;
-#line 5455 "BatchImport.c"
+#line 5425 "BatchImport.c"
 	} else {
-		BatchImportRoll* _tmp18_ = NULL;
+		BatchImportRoll* _tmp18_;
 #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp18_ = batch_import_roll_new ();
 #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_batch_import_roll_unref0 (_tmp14_);
 #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = _tmp18_;
-#line 5464 "BatchImport.c"
+#line 5434 "BatchImport.c"
 	}
 #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp19_ = _batch_import_roll_ref0 (_tmp14_);
@@ -5472,24 +5442,24 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
 	_tmp20_ = skip_manifest;
 #line 490 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp20_ != NULL) {
-#line 5476 "BatchImport.c"
-		GeeHashSet* _tmp21_ = NULL;
+#line 5446 "BatchImport.c"
+		GeeHashSet* _tmp21_;
 #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp21_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (self->priv->skipset);
 #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->priv->skipset = _tmp21_;
-#line 5484 "BatchImport.c"
+#line 5454 "BatchImport.c"
 		{
 			GeeList* _source_list = NULL;
-			ImportManifest* _tmp22_ = NULL;
-			GeeList* _tmp23_ = NULL;
-			GeeList* _tmp24_ = NULL;
+			ImportManifest* _tmp22_;
+			GeeList* _tmp23_;
+			GeeList* _tmp24_;
 			gint _source_size = 0;
-			GeeList* _tmp25_ = NULL;
-			gint _tmp26_ = 0;
-			gint _tmp27_ = 0;
+			GeeList* _tmp25_;
+			gint _tmp26_;
+			gint _tmp27_;
 			gint _source_index = 0;
 #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp22_ = skip_manifest;
@@ -5511,18 +5481,18 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
 			_source_index = -1;
 #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			while (TRUE) {
-#line 5515 "BatchImport.c"
-				gint _tmp28_ = 0;
-				gint _tmp29_ = 0;
-				gint _tmp30_ = 0;
+#line 5485 "BatchImport.c"
+				gint _tmp28_;
+				gint _tmp29_;
+				gint _tmp30_;
 				MediaSource* source = NULL;
-				GeeList* _tmp31_ = NULL;
-				gint _tmp32_ = 0;
-				gpointer _tmp33_ = NULL;
-				GeeHashSet* _tmp34_ = NULL;
-				MediaSource* _tmp35_ = NULL;
-				GFile* _tmp36_ = NULL;
-				GFile* _tmp37_ = NULL;
+				GeeList* _tmp31_;
+				gint _tmp32_;
+				gpointer _tmp33_;
+				GeeHashSet* _tmp34_;
+				MediaSource* _tmp35_;
+				GFile* _tmp36_;
+				GFile* _tmp37_;
 #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp28_ = _source_index;
 #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5535,7 +5505,7 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
 				if (!(_tmp29_ < _tmp30_)) {
 #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					break;
-#line 5539 "BatchImport.c"
+#line 5509 "BatchImport.c"
 				}
 #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp31_ = _source_list;
@@ -5559,11 +5529,11 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
 				_g_object_unref0 (_tmp37_);
 #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (source);
-#line 5563 "BatchImport.c"
+#line 5533 "BatchImport.c"
 			}
 #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_source_list);
-#line 5567 "BatchImport.c"
+#line 5537 "BatchImport.c"
 		}
 	}
 #line 498 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5582,21 +5552,21 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
 	_g_object_unref0 (_tmp8_);
 #line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 5586 "BatchImport.c"
+#line 5556 "BatchImport.c"
 }
 
 
 BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest) {
 #line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return batch_import_construct (TYPE_BATCH_IMPORT, jobs, name, reporter, reporter_target, prefailed, pre_already_imported, cancellable, import_roll, skip_manifest);
-#line 5593 "BatchImport.c"
+#line 5563 "BatchImport.c"
 }
 
 
 gchar* batch_import_get_name (BatchImport* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 511 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), NULL);
 #line 512 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5607,25 +5577,25 @@ gchar* batch_import_get_name (BatchImport* self) {
 	result = _tmp1_;
 #line 512 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5611 "BatchImport.c"
+#line 5581 "BatchImport.c"
 }
 
 
 void batch_import_user_halt (BatchImport* self) {
-	GCancellable* _tmp0_ = NULL;
+	GCancellable* _tmp0_;
 #line 515 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 516 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->cancellable;
 #line 516 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_cancellable_cancel (_tmp0_);
-#line 5623 "BatchImport.c"
+#line 5593 "BatchImport.c"
 }
 
 
 gboolean batch_import_get_untrash_duplicates (BatchImport* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 519 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE);
 #line 520 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5634,25 +5604,25 @@ gboolean batch_import_get_untrash_duplicates (BatchImport* self) {
 	result = _tmp0_;
 #line 520 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5638 "BatchImport.c"
+#line 5608 "BatchImport.c"
 }
 
 
 void batch_import_set_untrash_duplicates (BatchImport* self, gboolean untrash_duplicates) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 523 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 524 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = untrash_duplicates;
 #line 524 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->untrash_duplicates = _tmp0_;
-#line 5650 "BatchImport.c"
+#line 5620 "BatchImport.c"
 }
 
 
 gboolean batch_import_get_mark_duplicates_online (BatchImport* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 527 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE);
 #line 528 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5661,19 +5631,19 @@ gboolean batch_import_get_mark_duplicates_online (BatchImport* self) {
 	result = _tmp0_;
 #line 528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5665 "BatchImport.c"
+#line 5635 "BatchImport.c"
 }
 
 
 void batch_import_set_mark_duplicates_online (BatchImport* self, gboolean mark_duplicates_online) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 531 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = mark_duplicates_online;
 #line 532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->mark_duplicates_online = _tmp0_;
-#line 5677 "BatchImport.c"
+#line 5647 "BatchImport.c"
 }
 
 
@@ -5682,21 +5652,21 @@ static void batch_import_log_status (BatchImport* self, const gchar* where) {
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 535 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (where != NULL);
-#line 5686 "BatchImport.c"
+#line 5656 "BatchImport.c"
 }
 
 
 static gboolean batch_import_report_failure (BatchImport* self, BatchImportResult* import_result) {
 	gboolean result = FALSE;
 	gboolean proceed = FALSE;
-	ImportManifest* _tmp0_ = NULL;
-	BatchImportResult* _tmp1_ = NULL;
-	BatchImportResult* _tmp2_ = NULL;
-	ImportResult _tmp3_ = 0;
+	ImportManifest* _tmp0_;
+	BatchImportResult* _tmp1_;
+	BatchImportResult* _tmp2_;
+	ImportResult _tmp3_;
 	gboolean _tmp23_ = FALSE;
-	BatchImportResult* _tmp24_ = NULL;
-	ImportResult _tmp25_ = 0;
-	gboolean _tmp26_ = FALSE;
+	BatchImportResult* _tmp24_;
+	ImportResult _tmp25_;
+	gboolean _tmp26_;
 	GError * _inner_error_ = NULL;
 #line 545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE);
@@ -5716,25 +5686,25 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 	_tmp3_ = _tmp2_->result;
 #line 550 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp3_ != IMPORT_RESULT_SUCCESS) {
-#line 5720 "BatchImport.c"
-		BatchImportResult* _tmp4_ = NULL;
+#line 5690 "BatchImport.c"
+		BatchImportResult* _tmp4_;
 		gboolean _tmp5_ = FALSE;
-		BatchImportResult* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
+		BatchImportResult* _tmp6_;
+		GFile* _tmp7_;
 #line 551 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = import_result;
 #line 551 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_signal_emit_by_name (self, "import-job-failed", _tmp4_);
+		g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORT_JOB_FAILED_SIGNAL], 0, _tmp4_);
 #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = import_result;
 #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = _tmp6_->file;
 #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp7_ != NULL) {
-#line 5735 "BatchImport.c"
-			BatchImportResult* _tmp8_ = NULL;
-			ImportResult _tmp9_ = 0;
-			gboolean _tmp10_ = FALSE;
+#line 5705 "BatchImport.c"
+			BatchImportResult* _tmp8_;
+			ImportResult _tmp9_;
+			gboolean _tmp10_;
 #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp8_ = import_result;
 #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5743,25 +5713,25 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 			_tmp10_ = import_result_is_abort (_tmp9_);
 #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = !_tmp10_;
-#line 5747 "BatchImport.c"
+#line 5717 "BatchImport.c"
 		} else {
 #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = FALSE;
-#line 5751 "BatchImport.c"
+#line 5721 "BatchImport.c"
 		}
 #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp5_) {
-#line 5755 "BatchImport.c"
+#line 5725 "BatchImport.c"
 			guint64 filesize = 0ULL;
-			guint64 _tmp22_ = 0ULL;
+			guint64 _tmp22_;
 #line 554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			filesize = (guint64) 0;
-#line 5760 "BatchImport.c"
+#line 5730 "BatchImport.c"
 			{
 				guint64 _tmp11_ = 0ULL;
-				BatchImportResult* _tmp12_ = NULL;
-				GFile* _tmp13_ = NULL;
-				guint64 _tmp14_ = 0ULL;
+				BatchImportResult* _tmp12_;
+				GFile* _tmp13_;
+				guint64 _tmp14_;
 #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp12_ = import_result;
 #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5772,23 +5742,23 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 				_tmp11_ = _tmp14_;
 #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5776 "BatchImport.c"
-					goto __catch410_g_error;
+#line 5746 "BatchImport.c"
+					goto __catch411_g_error;
 				}
 #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				filesize = _tmp11_;
-#line 5781 "BatchImport.c"
+#line 5751 "BatchImport.c"
 			}
-			goto __finally410;
-			__catch410_g_error:
+			goto __finally411;
+			__catch411_g_error:
 			{
 				GError* err = NULL;
-				BatchImportResult* _tmp15_ = NULL;
-				GFile* _tmp16_ = NULL;
-				gchar* _tmp17_ = NULL;
-				gchar* _tmp18_ = NULL;
-				GError* _tmp19_ = NULL;
-				const gchar* _tmp20_ = NULL;
+				BatchImportResult* _tmp15_;
+				GFile* _tmp16_;
+				gchar* _tmp17_;
+				gchar* _tmp18_;
+				GError* _tmp19_;
+				const gchar* _tmp20_;
 #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				err = _inner_error_;
 #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5811,12 +5781,12 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 				_g_free0 (_tmp18_);
 #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_error_free0 (err);
-#line 5815 "BatchImport.c"
+#line 5785 "BatchImport.c"
 			}
-			__finally410:
+			__finally411:
 #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5820 "BatchImport.c"
+#line 5790 "BatchImport.c"
 				gboolean _tmp21_ = FALSE;
 #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5824,13 +5794,13 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 				g_clear_error (&_inner_error_);
 #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return _tmp21_;
-#line 5828 "BatchImport.c"
+#line 5798 "BatchImport.c"
 			}
 #line 563 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp22_ = filesize;
 #line 563 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			batch_import_report_progress (self, _tmp22_);
-#line 5834 "BatchImport.c"
+#line 5804 "BatchImport.c"
 		}
 	}
 #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5841,25 +5811,25 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 	_tmp26_ = import_result_is_nonuser_abort (_tmp25_);
 #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp26_) {
-#line 5845 "BatchImport.c"
-		gboolean _tmp27_ = FALSE;
+#line 5815 "BatchImport.c"
+		gboolean _tmp27_;
 #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp27_ = proceed;
 #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp23_ = _tmp27_;
-#line 5851 "BatchImport.c"
+#line 5821 "BatchImport.c"
 	} else {
 #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp23_ = FALSE;
-#line 5855 "BatchImport.c"
+#line 5825 "BatchImport.c"
 	}
 #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp23_) {
-#line 5859 "BatchImport.c"
-		BatchImportResult* _tmp28_ = NULL;
-		ImportResult _tmp29_ = 0;
-		BatchImportResult* _tmp30_ = NULL;
-		const gchar* _tmp31_ = NULL;
+#line 5829 "BatchImport.c"
+		BatchImportResult* _tmp28_;
+		ImportResult _tmp29_;
+		BatchImportResult* _tmp30_;
+		const gchar* _tmp31_;
 #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp28_ = import_result;
 #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5869,23 +5839,23 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp31_ = _tmp30_->errmsg;
 #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_signal_emit_by_name (self, "fatal-error", _tmp29_, _tmp31_);
+		g_signal_emit (self, batch_import_signals[BATCH_IMPORT_FATAL_ERROR_SIGNAL], 0, _tmp29_, _tmp31_);
 #line 570 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		proceed = FALSE;
-#line 5876 "BatchImport.c"
+#line 5846 "BatchImport.c"
 	}
 #line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = proceed;
 #line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5882 "BatchImport.c"
+#line 5852 "BatchImport.c"
 }
 
 
 static void batch_import_report_progress (BatchImport* self, guint64 increment_of_progress) {
-	guint64 _tmp0_ = 0ULL;
-	guint64 _tmp1_ = 0ULL;
-	guint64 _tmp2_ = 0ULL;
+	guint64 _tmp0_;
+	guint64 _tmp1_;
+	guint64 _tmp2_;
 #line 576 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 577 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5898,11 +5868,11 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o
 	_tmp2_ = self->priv->completed_bytes;
 #line 581 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp2_ == ((guint64) 0)) {
-#line 5902 "BatchImport.c"
+#line 5872 "BatchImport.c"
 		gulong now = 0UL;
-		gulong _tmp3_ = 0UL;
-		gulong _tmp4_ = 0UL;
-		gulong _tmp5_ = 0UL;
+		gulong _tmp3_;
+		gulong _tmp4_;
+		gulong _tmp5_;
 #line 582 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = now_ms ();
 #line 582 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5913,27 +5883,27 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o
 		_tmp5_ = self->priv->last_preparing_ms;
 #line 583 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if ((_tmp4_ - _tmp5_) > ((gulong) 250)) {
-#line 5917 "BatchImport.c"
-			gulong _tmp6_ = 0UL;
+#line 5887 "BatchImport.c"
+			gulong _tmp6_;
 #line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp6_ = now;
 #line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			self->priv->last_preparing_ms = _tmp6_;
 #line 585 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			g_signal_emit_by_name (self, "preparing");
-#line 5925 "BatchImport.c"
+			g_signal_emit (self, batch_import_signals[BATCH_IMPORT_PREPARING_SIGNAL], 0);
+#line 5895 "BatchImport.c"
 		}
 	} else {
-		guint64 _tmp7_ = 0ULL;
+		guint64 _tmp7_;
 #line 587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = increment_of_progress;
 #line 587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp7_ > ((guint64) 0)) {
-#line 5933 "BatchImport.c"
+#line 5903 "BatchImport.c"
 			gulong now = 0UL;
-			gulong _tmp8_ = 0UL;
-			gulong _tmp9_ = 0UL;
-			gulong _tmp10_ = 0UL;
+			gulong _tmp8_;
+			gulong _tmp9_;
+			gulong _tmp10_;
 #line 588 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp8_ = now_ms ();
 #line 588 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5944,10 +5914,10 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o
 			_tmp10_ = self->priv->last_preparing_ms;
 #line 589 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if ((_tmp9_ - _tmp10_) > ((gulong) 250)) {
-#line 5948 "BatchImport.c"
-				gulong _tmp11_ = 0UL;
-				guint64 _tmp12_ = 0ULL;
-				guint64 _tmp13_ = 0ULL;
+#line 5918 "BatchImport.c"
+				gulong _tmp11_;
+				guint64 _tmp12_;
+				guint64 _tmp13_;
 #line 590 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp11_ = now;
 #line 590 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5957,8 +5927,8 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o
 #line 591 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp13_ = self->priv->total_bytes;
 #line 591 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				g_signal_emit_by_name (self, "progress", _tmp12_, _tmp13_);
-#line 5962 "BatchImport.c"
+				g_signal_emit (self, batch_import_signals[BATCH_IMPORT_PROGRESS_SIGNAL], 0, _tmp12_, _tmp13_);
+#line 5932 "BatchImport.c"
 			}
 		}
 	}
@@ -5974,16 +5944,16 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor
 	g_return_val_if_fail (IS_BACKGROUND_IMPORT_JOB (background_job), FALSE);
 #line 597 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	proceed = TRUE;
-#line 5978 "BatchImport.c"
+#line 5948 "BatchImport.c"
 	{
 		GeeList* _import_result_list = NULL;
-		BackgroundImportJob* _tmp0_ = NULL;
-		GeeList* _tmp1_ = NULL;
-		GeeList* _tmp2_ = NULL;
+		BackgroundImportJob* _tmp0_;
+		GeeList* _tmp1_;
+		GeeList* _tmp2_;
 		gint _import_result_size = 0;
-		GeeList* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+		GeeList* _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
 		gint _import_result_index = 0;
 #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = background_job;
@@ -6005,16 +5975,16 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor
 		_import_result_index = -1;
 #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 6009 "BatchImport.c"
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
+#line 5979 "BatchImport.c"
+			gint _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 			BatchImportResult* import_result = NULL;
-			GeeList* _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			gpointer _tmp11_ = NULL;
-			BatchImportResult* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
+			GeeList* _tmp9_;
+			gint _tmp10_;
+			gpointer _tmp11_;
+			BatchImportResult* _tmp12_;
+			gboolean _tmp13_;
 #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp6_ = _import_result_index;
 #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6027,7 +5997,7 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor
 			if (!(_tmp7_ < _tmp8_)) {
 #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 6031 "BatchImport.c"
+#line 6001 "BatchImport.c"
 			}
 #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp9_ = _import_result_list;
@@ -6045,33 +6015,33 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor
 			if (!_tmp13_) {
 #line 601 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				proceed = FALSE;
-#line 6049 "BatchImport.c"
+#line 6019 "BatchImport.c"
 			}
 #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_batch_import_result_unref0 (import_result);
-#line 6053 "BatchImport.c"
+#line 6023 "BatchImport.c"
 		}
 #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_import_result_list);
-#line 6057 "BatchImport.c"
+#line 6027 "BatchImport.c"
 	}
 #line 604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = proceed;
 #line 604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 6063 "BatchImport.c"
+#line 6033 "BatchImport.c"
 }
 
 
 static void batch_import_report_completed (BatchImport* self, const gchar* where) {
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	BatchImportImportReporter _tmp5_ = NULL;
-	void* _tmp5__target = NULL;
-	ImportManifest* _tmp9_ = NULL;
-	BatchImportRoll* _tmp10_ = NULL;
+	gboolean _tmp0_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	BatchImportImportReporter _tmp5_;
+	void* _tmp5__target;
+	ImportManifest* _tmp9_;
+	BatchImportRoll* _tmp10_;
 #line 607 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 607 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6080,14 +6050,14 @@ static void batch_import_report_completed (BatchImport* self, const gchar* where
 	_tmp0_ = self->priv->completed;
 #line 608 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_) {
-#line 6084 "BatchImport.c"
-		const gchar* _tmp1_ = NULL;
+#line 6054 "BatchImport.c"
+		const gchar* _tmp1_;
 #line 609 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = where;
 #line 609 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_error ("BatchImport.vala:609: Attempted to complete already-completed import: " \
 "%s", _tmp1_);
-#line 6090 "BatchImport.c"
+#line 6060 "BatchImport.c"
 	}
 #line 611 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->completed = TRUE;
@@ -6109,11 +6079,11 @@ static void batch_import_report_completed (BatchImport* self, const gchar* where
 	_tmp5__target = self->priv->reporter_target;
 #line 618 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp5_ != NULL) {
-#line 6112 "BatchImport.c"
-		BatchImportImportReporter _tmp6_ = NULL;
-		void* _tmp6__target = NULL;
-		ImportManifest* _tmp7_ = NULL;
-		BatchImportRoll* _tmp8_ = NULL;
+#line 6082 "BatchImport.c"
+		BatchImportImportReporter _tmp6_;
+		void* _tmp6__target;
+		ImportManifest* _tmp7_;
+		BatchImportRoll* _tmp8_;
 #line 619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = self->priv->reporter;
 #line 619 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6124,23 +6094,23 @@ static void batch_import_report_completed (BatchImport* self, const gchar* where
 		_tmp8_ = self->priv->import_roll;
 #line 619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ (_tmp7_, _tmp8_, _tmp6__target);
-#line 6127 "BatchImport.c"
+#line 6097 "BatchImport.c"
 	}
 #line 621 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = self->priv->manifest;
 #line 621 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = self->priv->import_roll;
 #line 621 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_signal_emit_by_name (self, "import-complete", _tmp9_, _tmp10_);
-#line 6135 "BatchImport.c"
+	g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORT_COMPLETE_SIGNAL], 0, _tmp9_, _tmp10_);
+#line 6105 "BatchImport.c"
 }
 
 
 static void batch_import_file_import_complete (BatchImport* self) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	gboolean _tmp4_ = FALSE;
-	gint _tmp5_ = 0;
+	gint _tmp5_;
 #line 625 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 627 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6151,41 +6121,41 @@ static void batch_import_file_import_complete (BatchImport* self) {
 	_tmp1_ = self->priv->file_imports_to_perform;
 #line 628 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != -1) {
-#line 6154 "BatchImport.c"
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+#line 6124 "BatchImport.c"
+		gint _tmp2_;
+		gint _tmp3_;
 #line 629 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->priv->file_imports_completed;
 #line 629 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = self->priv->file_imports_to_perform;
 #line 629 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_assert (_tmp2_ <= _tmp3_, "file_imports_completed <= file_imports_to_perform");
-#line 6163 "BatchImport.c"
+#line 6133 "BatchImport.c"
 	}
 #line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = self->priv->file_imports_to_perform;
 #line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp5_ != -1) {
-#line 6169 "BatchImport.c"
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+#line 6139 "BatchImport.c"
+		gint _tmp6_;
+		gint _tmp7_;
 #line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = self->priv->file_imports_completed;
 #line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = self->priv->file_imports_to_perform;
 #line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = _tmp6_ == _tmp7_;
-#line 6178 "BatchImport.c"
+#line 6148 "BatchImport.c"
 	} else {
 #line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = FALSE;
-#line 6182 "BatchImport.c"
+#line 6152 "BatchImport.c"
 	}
 #line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp4_) {
 #line 634 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_report_completed (self, "completed preparing files, all outstanding imports completed");
-#line 6188 "BatchImport.c"
+#line 6158 "BatchImport.c"
 	}
 }
 
@@ -6193,14 +6163,14 @@ static void batch_import_file_import_complete (BatchImport* self) {
 static void _batch_import_on_work_sniffed_out_completion_callback (BackgroundJob* job, gpointer self) {
 #line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_work_sniffed_out ((BatchImport*) self, job);
-#line 6196 "BatchImport.c"
+#line 6166 "BatchImport.c"
 }
 
 
 static void _batch_import_on_sniffer_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
 #line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_sniffer_cancelled ((BatchImport*) self, job);
-#line 6203 "BatchImport.c"
+#line 6173 "BatchImport.c"
 }
 
 
@@ -6209,19 +6179,19 @@ static gboolean _batch_import_on_sniffer_working_gsource_func (gpointer self) {
 	result = batch_import_on_sniffer_working ((BatchImport*) self);
 #line 646 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 6212 "BatchImport.c"
+#line 6182 "BatchImport.c"
 }
 
 
 void batch_import_schedule (BatchImport* self) {
-	gboolean _tmp0_ = FALSE;
-	Workers* _tmp1_ = NULL;
-	GeeIterable* _tmp2_ = NULL;
-	GCancellable* _tmp3_ = NULL;
-	GeeHashSet* _tmp4_ = NULL;
-	WorkSniffer* _tmp5_ = NULL;
-	WorkSniffer* _tmp6_ = NULL;
-	guint _tmp7_ = 0U;
+	gboolean _tmp0_;
+	Workers* _tmp1_;
+	GeeIterable* _tmp2_;
+	GCancellable* _tmp3_;
+	GeeHashSet* _tmp4_;
+	WorkSniffer* _tmp5_;
+	WorkSniffer* _tmp6_;
+	guint _tmp7_;
 #line 637 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 638 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6231,7 +6201,7 @@ void batch_import_schedule (BatchImport* self) {
 #line 639 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->scheduled = TRUE;
 #line 641 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_signal_emit_by_name (self, "starting");
+	g_signal_emit (self, batch_import_signals[BATCH_IMPORT_STARTING_SIGNAL], 0);
 #line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = batch_import_feeder_workers;
 #line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6252,7 +6222,7 @@ void batch_import_schedule (BatchImport* self) {
 	_tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) BATCH_IMPORT_WORK_SNIFFER_THROBBER_MSEC, _batch_import_on_sniffer_working_gsource_func, g_object_ref (self), g_object_unref);
 #line 646 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->throbber_id = _tmp7_;
-#line 6255 "BatchImport.c"
+#line 6225 "BatchImport.c"
 }
 
 
@@ -6266,56 +6236,56 @@ static gboolean batch_import_on_sniffer_working (BatchImport* self) {
 	result = TRUE;
 #line 656 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 6269 "BatchImport.c"
+#line 6239 "BatchImport.c"
 }
 
 
 static gpointer _background_job_ref0 (gpointer self) {
 #line 662 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? background_job_ref (self) : NULL;
-#line 6276 "BatchImport.c"
+#line 6246 "BatchImport.c"
 }
 
 
 static void _batch_import_on_file_prepared_notification_callback (BackgroundJob* job, NotificationObject* user, gpointer self) {
 #line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_file_prepared ((BatchImport*) self, job, user);
-#line 6283 "BatchImport.c"
+#line 6253 "BatchImport.c"
 }
 
 
 static void _batch_import_on_files_prepared_completion_callback (BackgroundJob* job, gpointer self) {
 #line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_files_prepared ((BatchImport*) self, job);
-#line 6290 "BatchImport.c"
+#line 6260 "BatchImport.c"
 }
 
 
 static void _batch_import_on_file_prepare_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
 #line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_file_prepare_cancelled ((BatchImport*) self, job);
-#line 6297 "BatchImport.c"
+#line 6267 "BatchImport.c"
 }
 
 
 static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob* j) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	WorkSniffer* sniffer = NULL;
-	BackgroundJob* _tmp1_ = NULL;
-	WorkSniffer* _tmp2_ = NULL;
+	BackgroundJob* _tmp1_;
+	WorkSniffer* _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	WorkSniffer* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	WorkSniffer* _tmp10_ = NULL;
-	guint64 _tmp11_ = 0ULL;
+	WorkSniffer* _tmp4_;
+	gboolean _tmp5_;
+	WorkSniffer* _tmp10_;
+	guint64 _tmp11_;
 	PrepareFilesJob* prepare_files_job = NULL;
-	WorkSniffer* _tmp12_ = NULL;
-	GeeList* _tmp13_ = NULL;
-	GCancellable* _tmp14_ = NULL;
-	PrepareFilesJob* _tmp15_ = NULL;
-	Workers* _tmp16_ = NULL;
-	PrepareFilesJob* _tmp17_ = NULL;
-	guint _tmp18_ = 0U;
+	WorkSniffer* _tmp12_;
+	GeeList* _tmp13_;
+	GCancellable* _tmp14_;
+	PrepareFilesJob* _tmp15_;
+	Workers* _tmp16_;
+	PrepareFilesJob* _tmp17_;
+	guint _tmp18_;
 #line 659 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 659 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6340,12 +6310,12 @@ static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob*
 	if (!_tmp5_) {
 #line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = TRUE;
-#line 6343 "BatchImport.c"
+#line 6313 "BatchImport.c"
 	} else {
-		WorkSniffer* _tmp6_ = NULL;
-		GeeList* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
+		WorkSniffer* _tmp6_;
+		GeeList* _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
 #line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = sniffer;
 #line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6356,7 +6326,7 @@ static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob*
 		_tmp9_ = _tmp8_;
 #line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = _tmp9_ == 0;
-#line 6359 "BatchImport.c"
+#line 6329 "BatchImport.c"
 	}
 #line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp3_) {
@@ -6366,7 +6336,7 @@ static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob*
 		_background_job_unref0 (sniffer);
 #line 669 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return;
-#line 6369 "BatchImport.c"
+#line 6339 "BatchImport.c"
 	}
 #line 672 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = sniffer;
@@ -6394,31 +6364,31 @@ static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob*
 	_tmp18_ = self->priv->throbber_id;
 #line 684 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp18_ > ((guint) 0)) {
-#line 6397 "BatchImport.c"
-		guint _tmp19_ = 0U;
+#line 6367 "BatchImport.c"
+		guint _tmp19_;
 #line 685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp19_ = self->priv->throbber_id;
 #line 685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_source_remove (_tmp19_);
 #line 686 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->priv->throbber_id = (guint) 0;
-#line 6405 "BatchImport.c"
+#line 6375 "BatchImport.c"
 	}
 #line 659 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (prepare_files_job);
 #line 659 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (sniffer);
-#line 6411 "BatchImport.c"
+#line 6381 "BatchImport.c"
 }
 
 
 static void batch_import_on_sniffer_cancelled (BatchImport* self, BackgroundJob* j) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	WorkSniffer* sniffer = NULL;
-	BackgroundJob* _tmp1_ = NULL;
-	WorkSniffer* _tmp2_ = NULL;
-	WorkSniffer* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
+	BackgroundJob* _tmp1_;
+	WorkSniffer* _tmp2_;
+	WorkSniffer* _tmp3_;
+	guint _tmp4_;
 #line 690 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 690 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6445,47 +6415,47 @@ static void batch_import_on_sniffer_cancelled (BatchImport* self, BackgroundJob*
 	_tmp4_ = self->priv->throbber_id;
 #line 700 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp4_ > ((guint) 0)) {
-#line 6448 "BatchImport.c"
-		guint _tmp5_ = 0U;
+#line 6418 "BatchImport.c"
+		guint _tmp5_;
 #line 701 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = self->priv->throbber_id;
 #line 701 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_source_remove (_tmp5_);
 #line 702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->priv->throbber_id = (guint) 0;
-#line 6456 "BatchImport.c"
+#line 6426 "BatchImport.c"
 	}
 #line 690 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (sniffer);
-#line 6460 "BatchImport.c"
+#line 6430 "BatchImport.c"
 }
 
 
 static void _batch_import_on_thumbnail_writer_completed_completion_callback (BackgroundJob* job, gpointer self) {
 #line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_thumbnail_writer_completed ((BatchImport*) self, job);
-#line 6467 "BatchImport.c"
+#line 6437 "BatchImport.c"
 }
 
 
 static void _batch_import_on_thumbnail_writer_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
 #line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_thumbnail_writer_cancelled ((BatchImport*) self, job);
-#line 6474 "BatchImport.c"
+#line 6444 "BatchImport.c"
 }
 
 
 static void _batch_import_on_import_files_completed_completion_callback (BackgroundJob* job, gpointer self) {
 #line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_import_files_completed ((BatchImport*) self, job);
-#line 6481 "BatchImport.c"
+#line 6451 "BatchImport.c"
 }
 
 
 static void _batch_import_on_import_files_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
 #line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_import_files_cancelled ((BatchImport*) self, job);
-#line 6488 "BatchImport.c"
+#line 6458 "BatchImport.c"
 }
 
 
@@ -6494,18 +6464,18 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	while (TRUE) {
-#line 6497 "BatchImport.c"
+#line 6467 "BatchImport.c"
 		gboolean _tmp0_ = FALSE;
-		GeeList* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
-		Workers* _tmp7_ = NULL;
-		GeeList* _tmp8_ = NULL;
-		gpointer _tmp9_ = NULL;
-		CompletedImportObject* _tmp10_ = NULL;
-		GCancellable* _tmp11_ = NULL;
-		ThumbnailWriterJob* _tmp12_ = NULL;
-		ThumbnailWriterJob* _tmp13_ = NULL;
+		GeeList* _tmp1_;
+		gint _tmp2_;
+		gint _tmp3_;
+		Workers* _tmp7_;
+		GeeList* _tmp8_;
+		gpointer _tmp9_;
+		CompletedImportObject* _tmp10_;
+		GCancellable* _tmp11_;
+		ThumbnailWriterJob* _tmp12_;
+		ThumbnailWriterJob* _tmp13_;
 #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = self->priv->ready_thumbnails;
 #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6514,10 +6484,10 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
 		_tmp3_ = _tmp2_;
 #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp3_ > 0) {
-#line 6517 "BatchImport.c"
-			Workers* _tmp4_ = NULL;
-			gint _tmp5_ = 0;
-			guint _tmp6_ = 0U;
+#line 6487 "BatchImport.c"
+			Workers* _tmp4_;
+			gint _tmp5_;
+			guint _tmp6_;
 #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp4_ = batch_import_import_workers;
 #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6526,17 +6496,17 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
 			_tmp6_ = self->priv->max_outstanding_import_jobs;
 #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp0_ = ((guint) _tmp5_) < _tmp6_;
-#line 6529 "BatchImport.c"
+#line 6499 "BatchImport.c"
 		} else {
 #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp0_ = FALSE;
-#line 6533 "BatchImport.c"
+#line 6503 "BatchImport.c"
 		}
 #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp0_) {
 #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 6539 "BatchImport.c"
+#line 6509 "BatchImport.c"
 		}
 #line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = batch_import_import_workers;
@@ -6558,24 +6528,24 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
 		_background_job_unref0 (_tmp13_);
 #line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_completed_import_object_unref0 (_tmp10_);
-#line 6561 "BatchImport.c"
+#line 6531 "BatchImport.c"
 	}
 #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	while (TRUE) {
-#line 6565 "BatchImport.c"
+#line 6535 "BatchImport.c"
 		gboolean _tmp14_ = FALSE;
-		GeeList* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
-		gint _tmp17_ = 0;
-		Workers* _tmp21_ = NULL;
-		GeeList* _tmp22_ = NULL;
-		gpointer _tmp23_ = NULL;
-		PreparedFile* _tmp24_ = NULL;
-		BatchImportRoll* _tmp25_ = NULL;
-		ImportID _tmp26_ = {0};
-		GCancellable* _tmp27_ = NULL;
-		PreparedFileImportJob* _tmp28_ = NULL;
-		PreparedFileImportJob* _tmp29_ = NULL;
+		GeeList* _tmp15_;
+		gint _tmp16_;
+		gint _tmp17_;
+		Workers* _tmp21_;
+		GeeList* _tmp22_;
+		gpointer _tmp23_;
+		PreparedFile* _tmp24_;
+		BatchImportRoll* _tmp25_;
+		ImportID _tmp26_;
+		GCancellable* _tmp27_;
+		PreparedFileImportJob* _tmp28_;
+		PreparedFileImportJob* _tmp29_;
 #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp15_ = self->priv->ready_files;
 #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6584,10 +6554,10 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
 		_tmp17_ = _tmp16_;
 #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp17_ > 0) {
-#line 6587 "BatchImport.c"
-			Workers* _tmp18_ = NULL;
-			gint _tmp19_ = 0;
-			guint _tmp20_ = 0U;
+#line 6557 "BatchImport.c"
+			Workers* _tmp18_;
+			gint _tmp19_;
+			guint _tmp20_;
 #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp18_ = batch_import_import_workers;
 #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6596,17 +6566,17 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
 			_tmp20_ = self->priv->max_outstanding_import_jobs;
 #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = ((guint) _tmp19_) < _tmp20_;
-#line 6599 "BatchImport.c"
+#line 6569 "BatchImport.c"
 		} else {
 #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = FALSE;
-#line 6603 "BatchImport.c"
+#line 6573 "BatchImport.c"
 		}
 #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp14_) {
 #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 6609 "BatchImport.c"
+#line 6579 "BatchImport.c"
 		}
 #line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp21_ = batch_import_import_workers;
@@ -6632,7 +6602,7 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
 		_background_job_unref0 (_tmp29_);
 #line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_prepared_file_unref0 (_tmp24_);
-#line 6635 "BatchImport.c"
+#line 6605 "BatchImport.c"
 	}
 }
 
@@ -6640,10 +6610,10 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
 static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFile* prepared_file) {
 	GFile* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	PreparedFile* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PreparedFile* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
+	PreparedFile* _tmp1_;
+	const gchar* _tmp2_;
+	PreparedFile* _tmp11_;
+	const gchar* _tmp12_;
 #line 729 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), NULL);
 #line 729 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6654,11 +6624,11 @@ static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFil
 	_tmp2_ = _tmp1_->full_md5;
 #line 731 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp2_ != NULL) {
-#line 6657 "BatchImport.c"
-		GeeHashMap* _tmp3_ = NULL;
-		PreparedFile* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+#line 6627 "BatchImport.c"
+		GeeHashMap* _tmp3_;
+		PreparedFile* _tmp4_;
+		const gchar* _tmp5_;
+		gboolean _tmp6_;
 #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = self->priv->imported_full_md5_table;
 #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6669,19 +6639,19 @@ static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFil
 		_tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
 #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp6_;
-#line 6672 "BatchImport.c"
+#line 6642 "BatchImport.c"
 	} else {
 #line 731 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = FALSE;
-#line 6676 "BatchImport.c"
+#line 6646 "BatchImport.c"
 	}
 #line 731 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_) {
-#line 6680 "BatchImport.c"
-		GeeHashMap* _tmp7_ = NULL;
-		PreparedFile* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gpointer _tmp10_ = NULL;
+#line 6650 "BatchImport.c"
+		GeeHashMap* _tmp7_;
+		PreparedFile* _tmp8_;
+		const gchar* _tmp9_;
+		gpointer _tmp10_;
 #line 734 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = self->priv->imported_full_md5_table;
 #line 734 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6694,7 +6664,7 @@ static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFil
 		result = (GFile*) _tmp10_;
 #line 734 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 6697 "BatchImport.c"
+#line 6667 "BatchImport.c"
 	}
 #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp11_ = prepared_file;
@@ -6702,12 +6672,12 @@ static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFil
 	_tmp12_ = _tmp11_->full_md5;
 #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp12_ != NULL) {
-#line 6705 "BatchImport.c"
-		GeeHashMap* _tmp13_ = NULL;
-		PreparedFile* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-		PreparedFile* _tmp16_ = NULL;
-		GFile* _tmp17_ = NULL;
+#line 6675 "BatchImport.c"
+		GeeHashMap* _tmp13_;
+		PreparedFile* _tmp14_;
+		const gchar* _tmp15_;
+		PreparedFile* _tmp16_;
+		GFile* _tmp17_;
 #line 739 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = self->priv->imported_full_md5_table;
 #line 739 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6720,34 +6690,34 @@ static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFil
 		_tmp17_ = _tmp16_->file;
 #line 739 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_, _tmp17_);
-#line 6723 "BatchImport.c"
+#line 6693 "BatchImport.c"
 	}
 #line 741 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = NULL;
 #line 741 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 6729 "BatchImport.c"
+#line 6699 "BatchImport.c"
 }
 
 
 static gpointer _notification_object_ref0 (gpointer self) {
 #line 748 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? notification_object_ref (self) : NULL;
-#line 6736 "BatchImport.c"
+#line 6706 "BatchImport.c"
 }
 
 
 static void batch_import_on_file_prepared (BatchImport* self, BackgroundJob* j, NotificationObject* user) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	PreparedFileCluster* cluster = NULL;
-	NotificationObject* _tmp1_ = NULL;
-	PreparedFileCluster* _tmp2_ = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GeeArrayList* _tmp8_ = NULL;
+	NotificationObject* _tmp1_;
+	PreparedFileCluster* _tmp2_;
+	GeeArrayList* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	GeeArrayList* _tmp8_;
 #line 745 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 745 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6784,7 +6754,7 @@ static void batch_import_on_file_prepared (BatchImport* self, BackgroundJob* j,
 	batch_import_process_prepared_files (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_LIST, GeeList), NULL, NULL);
 #line 745 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_notification_object_unref0 (cluster);
-#line 6787 "BatchImport.c"
+#line 6757 "BatchImport.c"
 }
 
 
@@ -6797,21 +6767,45 @@ static void batch_import_process_prepared_files_data_free (gpointer _data) {
 	_g_object_unref0 (_data_->self);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_slice_free (BatchImportProcessPreparedFilesData, _data_);
-#line 6800 "BatchImport.c"
+#line 6770 "BatchImport.c"
+}
+
+
+static void batch_import_process_prepared_files_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) {
+	BatchImportProcessPreparedFilesData* _task_data_;
+#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_task_data_ = g_task_get_task_data (G_TASK (res));
+#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	if (_task_data_->_callback_ != NULL) {
+#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_task_data_->_callback_ (source_object, res, user_data);
+#line 6782 "BatchImport.c"
+	}
+#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_task_data_->_task_complete_ = TRUE;
+#line 6786 "BatchImport.c"
 }
 
 
 static void batch_import_process_prepared_files (BatchImport* self, GeeList* list, GAsyncReadyCallback _callback_, gpointer _user_data_) {
 	BatchImportProcessPreparedFilesData* _data_;
-	BatchImport* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
+	BatchImport* _tmp0_;
+	GeeList* _tmp1_;
+	GeeList* _tmp2_;
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_data_ = g_slice_new0 (BatchImportProcessPreparedFilesData);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, batch_import_process_prepared_files);
+	_data_->_callback_ = _callback_;
+#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_data_->_async_result = g_task_new (G_OBJECT (self), NULL, batch_import_process_prepared_files_async_ready_wrapper, _user_data_);
+#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	if (_callback_ == NULL) {
+#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_data_->_task_complete_ = TRUE;
+#line 6805 "BatchImport.c"
+	}
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, batch_import_process_prepared_files_data_free);
+	g_task_set_task_data (_data_->_async_result, _data_, batch_import_process_prepared_files_data_free);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = _g_object_ref0 (self);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6826,15 +6820,15 @@ static void batch_import_process_prepared_files (BatchImport* self, GeeList* lis
 	_data_->list = _tmp2_;
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_process_prepared_files_co (_data_);
-#line 6829 "BatchImport.c"
+#line 6823 "BatchImport.c"
 }
 
 
 static void batch_import_process_prepared_files_finish (BatchImport* self, GAsyncResult* _res_) {
 	BatchImportProcessPreparedFilesData* _data_;
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
-#line 6837 "BatchImport.c"
+	_data_ = g_task_propagate_pointer (G_TASK (_res_), NULL);
+#line 6831 "BatchImport.c"
 }
 
 
@@ -6843,7 +6837,7 @@ static gboolean _batch_import_process_prepared_files_co_gsource_func (gpointer s
 	result = batch_import_process_prepared_files_co (self);
 #line 759 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 6846 "BatchImport.c"
+#line 6840 "BatchImport.c"
 }
 
 
@@ -6852,40 +6846,30 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 	switch (_data_->_state_) {
 #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case 0:
-#line 6855 "BatchImport.c"
+#line 6849 "BatchImport.c"
 		goto _state_0;
 #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case 1:
-#line 6859 "BatchImport.c"
+#line 6853 "BatchImport.c"
 		goto _state_1;
 		default:
 #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_assert_not_reached ();
-#line 6864 "BatchImport.c"
+#line 6858 "BatchImport.c"
 	}
 	_state_0:
 	{
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_data_->_tmp0_ = NULL;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_tmp0_ = _data_->list;
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_data_->_tmp1_ = NULL;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_tmp1_ = _g_object_ref0 (_data_->_tmp0_);
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_prepared_file_list = _data_->_tmp1_;
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_data_->_tmp2_ = NULL;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_tmp2_ = _data_->_prepared_file_list;
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_data_->_tmp3_ = 0;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_data_->_tmp4_ = 0;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_tmp4_ = _data_->_tmp3_;
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_prepared_file_size = _data_->_tmp4_;
@@ -6894,36 +6878,24 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp5_ = 0;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp5_ = _data_->_prepared_file_index;
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_prepared_file_index = _data_->_tmp5_ + 1;
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp6_ = 0;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp6_ = _data_->_prepared_file_index;
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp7_ = 0;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp7_ = _data_->_prepared_file_size;
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (!(_data_->_tmp6_ < _data_->_tmp7_)) {
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 6914 "BatchImport.c"
+#line 6892 "BatchImport.c"
 			}
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp8_ = NULL;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp8_ = _data_->_prepared_file_list;
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp9_ = 0;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp9_ = _data_->_prepared_file_index;
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp10_ = NULL;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp10_ = gee_list_get (_data_->_tmp8_, _data_->_tmp9_);
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->prepared_file = (PreparedFile*) _data_->_tmp10_;
@@ -6933,42 +6905,30 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 			_data_->_state_ = 1;
 #line 760 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return FALSE;
-#line 6936 "BatchImport.c"
+#line 6908 "BatchImport.c"
 			_state_1:
 			;
 #line 762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->import_result = NULL;
 #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp11_ = NULL;
-#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp11_ = library_photo_global;
 #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp12_ = NULL;
-#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp12_ = _data_->prepared_file;
 #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp13_ = NULL;
-#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp13_ = _data_->_tmp12_->file;
 #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp14_ = 0;
 #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp15_ = NULL;
-#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp15_ = library_photo_source_collection_get_state_by_file (_data_->_tmp11_, _data_->_tmp13_, &_data_->_tmp14_);
 #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->photo_state = _data_->_tmp14_;
 #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->photo = _data_->_tmp15_;
 #line 769 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp16_ = NULL;
-#line 769 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp16_ = _data_->photo;
 #line 769 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_data_->_tmp16_ != NULL) {
 #line 770 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp17_ = 0;
-#line 770 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp17_ = _data_->photo_state;
 #line 770 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				switch (_data_->_tmp17_) {
@@ -6980,79 +6940,43 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE:
 #line 770 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER:
-#line 6983 "BatchImport.c"
+#line 6943 "BatchImport.c"
 					{
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp18_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp18_ = _data_->prepared_file;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp19_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp19_ = _data_->_tmp18_->job;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp20_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp20_ = _data_->prepared_file;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp21_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp21_ = _data_->_tmp20_->file;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp22_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp22_ = _data_->prepared_file;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp23_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp23_ = _data_->_tmp22_->file;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp24_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp24_ = g_file_get_path (_data_->_tmp23_);
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp25_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp25_ = _data_->_tmp24_;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp26_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp26_ = _data_->prepared_file;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp27_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp27_ = _data_->_tmp26_->file;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp28_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp28_ = g_file_get_path (_data_->_tmp27_);
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp29_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp29_ = _data_->_tmp28_;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp30_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp30_ = _data_->photo;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp31_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp31_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp30_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp32_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp32_ = _data_->_tmp31_;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp33_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp33_ = duplicated_file_create_from_file (_data_->_tmp32_);
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp34_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp34_ = _data_->_tmp33_;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp35_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp35_ = batch_import_result_new (_data_->_tmp19_, _data_->_tmp21_, _data_->_tmp25_, _data_->_tmp29_, _data_->_tmp34_, IMPORT_RESULT_PHOTO_EXISTS);
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_batch_import_result_unref0 (_data_->import_result);
@@ -7067,56 +6991,44 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_free0 (_data_->_tmp25_);
 #line 780 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp36_ = 0;
-#line 780 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp36_ = _data_->photo_state;
 #line 780 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp36_ == LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE) {
 #line 781 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp37_ = NULL;
-#line 781 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp37_ = _data_->photo;
 #line 781 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp37_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 7081 "BatchImport.c"
+#line 7001 "BatchImport.c"
 						}
 #line 782 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 7085 "BatchImport.c"
+#line 7005 "BatchImport.c"
 					}
 #line 770 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH:
-#line 7089 "BatchImport.c"
+#line 7009 "BatchImport.c"
 					{
 #line 786 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 7093 "BatchImport.c"
+#line 7013 "BatchImport.c"
 					}
 					default:
 					{
 #line 789 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp38_ = 0;
-#line 789 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp38_ = _data_->photo_state;
 #line 789 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						memset (&_data_->_tmp39_, 0, sizeof (GEnumValue*));
-#line 789 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp39_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _data_->_tmp38_);
 #line 789 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						g_error ("BatchImport.vala:789: Unknown LibraryPhotoSourceCollection state: %s", (_data_->_tmp39_ != NULL) ? _data_->_tmp39_->value_name : NULL);
-#line 7107 "BatchImport.c"
+#line 7023 "BatchImport.c"
 					}
 				}
 			}
 #line 793 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp40_ = NULL;
-#line 793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp40_ = _data_->import_result;
 #line 793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_data_->_tmp40_ != NULL) {
 #line 794 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp41_ = NULL;
-#line 794 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp41_ = _data_->import_result;
 #line 794 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				batch_import_report_failure (_data_->self, _data_->_tmp41_);
@@ -7130,39 +7042,27 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 				_prepared_file_unref0 (_data_->prepared_file);
 #line 797 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 7133 "BatchImport.c"
+#line 7045 "BatchImport.c"
 			}
 #line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp42_ = NULL;
-#line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp42_ = video_global;
 #line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp43_ = NULL;
-#line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp43_ = _data_->prepared_file;
 #line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp44_ = NULL;
-#line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp44_ = _data_->_tmp43_->file;
 #line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp45_ = 0;
 #line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp46_ = NULL;
-#line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp46_ = video_source_collection_get_state_by_file (_data_->_tmp42_, _data_->_tmp44_, &_data_->_tmp45_);
 #line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->video_state = _data_->_tmp45_;
 #line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->video = _data_->_tmp46_;
 #line 802 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp47_ = NULL;
-#line 802 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp47_ = _data_->video;
 #line 802 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_data_->_tmp47_ != NULL) {
 #line 803 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp48_ = 0;
-#line 803 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp48_ = _data_->video_state;
 #line 803 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				switch (_data_->_tmp48_) {
@@ -7170,79 +7070,43 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 					case VIDEO_SOURCE_COLLECTION_STATE_ONLINE:
 #line 803 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case VIDEO_SOURCE_COLLECTION_STATE_OFFLINE:
-#line 7173 "BatchImport.c"
+#line 7073 "BatchImport.c"
 					{
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp49_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp49_ = _data_->prepared_file;
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp50_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp50_ = _data_->_tmp49_->job;
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp51_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp51_ = _data_->prepared_file;
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp52_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp52_ = _data_->_tmp51_->file;
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp53_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp53_ = _data_->prepared_file;
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp54_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp54_ = _data_->_tmp53_->file;
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp55_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp55_ = g_file_get_path (_data_->_tmp54_);
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp56_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp56_ = _data_->_tmp55_;
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp57_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp57_ = _data_->prepared_file;
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp58_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp58_ = _data_->_tmp57_->file;
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp59_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp59_ = g_file_get_path (_data_->_tmp58_);
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp60_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp60_ = _data_->_tmp59_;
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp61_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp61_ = _data_->video;
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp62_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp62_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp61_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp63_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp63_ = _data_->_tmp62_;
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp64_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp64_ = duplicated_file_create_from_file (_data_->_tmp63_);
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp65_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp65_ = _data_->_tmp64_;
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp66_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp66_ = batch_import_result_new (_data_->_tmp50_, _data_->_tmp52_, _data_->_tmp56_, _data_->_tmp60_, _data_->_tmp65_, IMPORT_RESULT_PHOTO_EXISTS);
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_batch_import_result_unref0 (_data_->import_result);
@@ -7257,56 +7121,44 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_free0 (_data_->_tmp56_);
 #line 811 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp67_ = 0;
-#line 811 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp67_ = _data_->video_state;
 #line 811 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp67_ == VIDEO_SOURCE_COLLECTION_STATE_OFFLINE) {
 #line 812 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp68_ = NULL;
-#line 812 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp68_ = _data_->video;
 #line 812 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp68_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 7271 "BatchImport.c"
+#line 7131 "BatchImport.c"
 						}
 #line 813 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 7275 "BatchImport.c"
+#line 7135 "BatchImport.c"
 					}
 #line 803 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case VIDEO_SOURCE_COLLECTION_STATE_TRASH:
-#line 7279 "BatchImport.c"
+#line 7139 "BatchImport.c"
 					{
 #line 817 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 7283 "BatchImport.c"
+#line 7143 "BatchImport.c"
 					}
 					default:
 					{
 #line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp69_ = 0;
-#line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp69_ = _data_->video_state;
 #line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						memset (&_data_->_tmp70_, 0, sizeof (GEnumValue*));
-#line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp70_ = g_enum_get_value (g_type_class_ref (VIDEO_SOURCE_COLLECTION_TYPE_STATE), _data_->_tmp69_);
 #line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						g_error ("BatchImport.vala:820: Unknown VideoSourceCollection state: %s", (_data_->_tmp70_ != NULL) ? _data_->_tmp70_->value_name : NULL);
-#line 7297 "BatchImport.c"
+#line 7153 "BatchImport.c"
 					}
 				}
 			}
 #line 824 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp71_ = NULL;
-#line 824 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp71_ = _data_->import_result;
 #line 824 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_data_->_tmp71_ != NULL) {
 #line 825 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp72_ = NULL;
-#line 825 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp72_ = _data_->import_result;
 #line 825 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				batch_import_report_failure (_data_->self, _data_->_tmp72_);
@@ -7322,195 +7174,115 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 				_prepared_file_unref0 (_data_->prepared_file);
 #line 828 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 7325 "BatchImport.c"
+#line 7177 "BatchImport.c"
 			}
 #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp74_ = NULL;
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp74_ = _data_->prepared_file;
 #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp75_ = FALSE;
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp75_ = _data_->_tmp74_->is_video;
 #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_data_->_tmp75_) {
 #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp76_ = NULL;
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp76_ = _data_->prepared_file;
 #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp77_ = NULL;
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp77_ = _data_->_tmp76_->file;
 #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp78_ = NULL;
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp78_ = _data_->prepared_file;
 #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp79_ = NULL;
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp79_ = _data_->_tmp78_->full_md5;
 #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp80_ = FALSE;
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp80_ = video_is_duplicate (_data_->_tmp77_, _data_->_tmp79_);
 #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp73_ = _data_->_tmp80_;
-#line 7359 "BatchImport.c"
+#line 7197 "BatchImport.c"
 			} else {
 #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp73_ = FALSE;
-#line 7363 "BatchImport.c"
+#line 7201 "BatchImport.c"
 			}
 #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_data_->_tmp73_) {
 #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp81_ = NULL;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp81_ = video_table_get_instance ();
 #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp82_ = NULL;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp82_ = _data_->_tmp81_;
 #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp83_ = NULL;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp83_ = _data_->prepared_file;
 #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp84_ = NULL;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp84_ = _data_->_tmp83_->file;
 #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp85_ = NULL;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp85_ = _data_->prepared_file;
 #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp86_ = NULL;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp86_ = _data_->_tmp85_->full_md5;
 #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp87_ = 0;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp88_ = NULL;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp88_ = video_table_get_duplicate_ids (_data_->_tmp82_, _data_->_tmp84_, _data_->_tmp86_, &_data_->_tmp87_);
 #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp89_ = NULL;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp89__length1 = 0;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp89_ = _data_->_tmp88_;
 #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp89__length1 = _data_->_tmp87_;
 #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_database_table_unref0 (_data_->_tmp82_);
 #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->duplicate_ids_length1 = 0;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_duplicate_ids_size_ = 0;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->duplicate_ids = _data_->_tmp89_;
 #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->duplicate_ids_length1 = _data_->_tmp89__length1;
 #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_duplicate_ids_size_ = _data_->duplicate_ids_length1;
 #line 837 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp90_ = NULL;
-#line 837 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp90__length1 = 0;
-#line 837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp90_ = _data_->duplicate_ids;
 #line 837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp90__length1 = _data_->duplicate_ids_length1;
 #line 837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_vala_assert (_data_->_tmp90__length1 > 0, "duplicate_ids.length > 0");
 #line 839 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp91_ = NULL;
-#line 839 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp91__length1 = 0;
-#line 839 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp91_ = _data_->duplicate_ids;
 #line 839 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp91__length1 = _data_->duplicate_ids_length1;
 #line 839 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				memset (&_data_->_tmp92_, 0, sizeof (VideoID));
-#line 839 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp92_ = _data_->_tmp91_[0];
 #line 839 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp93_ = NULL;
-#line 839 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp93_ = duplicated_file_create_from_video_id (&_data_->_tmp92_);
 #line 839 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->duplicated_file = _data_->_tmp93_;
 #line 842 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->result_code = IMPORT_RESULT_PHOTO_EXISTS;
 #line 843 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp94_ = FALSE;
-#line 843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp94_ = _data_->self->priv->mark_duplicates_online;
 #line 843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_data_->_tmp94_) {
 #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp95_ = NULL;
-#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp95_ = video_global;
 #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp96_ = NULL;
-#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp96_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp95_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp97_ = NULL;
-#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp97_ = _data_->_tmp96_;
 #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp98_ = NULL;
-#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp98_ = _data_->prepared_file;
 #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp99_ = NULL;
-#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp99_ = _data_->_tmp98_->file;
 #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp100_ = NULL;
-#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp100_ = media_source_holding_tank_fetch_by_master_file (_data_->_tmp97_, _data_->_tmp99_);
 #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp101_ = NULL;
-#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp101_ = G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp100_, TYPE_VIDEO, Video);
 #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_source_holding_tank_unref0 (_data_->_tmp97_);
 #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->dupe_video = _data_->_tmp101_;
 #line 846 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp102_ = NULL;
-#line 846 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp102_ = _data_->dupe_video;
 #line 846 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_data_->_tmp102_ == NULL) {
 #line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp103_ = NULL;
-#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp103_ = video_global;
 #line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp104_ = NULL;
-#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp104_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp103_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp105_ = NULL;
-#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp105_ = _data_->_tmp104_;
 #line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp106_ = NULL;
-#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp106_ = _data_->prepared_file;
 #line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp107_ = NULL;
-#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp107_ = _data_->_tmp106_->full_md5;
 #line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp108_ = NULL;
-#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp108_ = media_source_holding_tank_fetch_by_md5 (_data_->_tmp105_, _data_->_tmp107_);
 #line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_object_unref0 (_data_->dupe_video);
@@ -7518,29 +7290,19 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 						_data_->dupe_video = G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp108_, TYPE_VIDEO, Video);
 #line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_source_holding_tank_unref0 (_data_->_tmp105_);
-#line 7521 "BatchImport.c"
+#line 7293 "BatchImport.c"
 					}
 #line 849 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp109_ = NULL;
-#line 849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp109_ = _data_->dupe_video;
 #line 849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_data_->_tmp109_ != NULL) {
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp110_ = NULL;
-#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp110_ = _data_->prepared_file;
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp111_ = NULL;
-#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp111_ = _data_->_tmp110_->file;
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp112_ = NULL;
-#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp112_ = g_file_get_path (_data_->_tmp111_);
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp113_ = NULL;
-#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp113_ = _data_->_tmp112_;
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						g_debug ("BatchImport.vala:850: duplicate video found offline, marking as online" \
@@ -7548,22 +7310,14 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_free0 (_data_->_tmp113_);
 #line 853 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp114_ = NULL;
-#line 853 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp114_ = _data_->dupe_video;
 #line 853 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp115_ = NULL;
-#line 853 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp115_ = _data_->prepared_file;
 #line 853 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp116_ = NULL;
-#line 853 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp116_ = _data_->_tmp115_->file;
 #line 853 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp114_, TYPE_MONITORABLE, Monitorable), _data_->_tmp116_);
 #line 854 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp117_ = NULL;
-#line 854 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp117_ = _data_->dupe_video;
 #line 854 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp117_, TYPE_MEDIA_SOURCE, MediaSource));
@@ -7572,26 +7326,16 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 #line 856 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->duplicated_file = NULL;
 #line 858 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp118_ = NULL;
-#line 858 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp118_ = _data_->self->priv->manifest;
 #line 858 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp119_ = NULL;
-#line 858 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp119_ = _data_->_tmp118_->imported;
 #line 858 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp120_ = NULL;
-#line 858 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp120_ = _data_->dupe_video;
 #line 858 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp119_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp120_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 859 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp121_ = NULL;
-#line 859 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp121_ = _data_->dupe_video;
 #line 859 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp122_ = 0ULL;
-#line 859 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp122_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp121_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 859 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						batch_import_report_progress (_data_->self, _data_->_tmp122_);
@@ -7599,71 +7343,41 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 						batch_import_file_import_complete (_data_->self);
 #line 862 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->result_code = IMPORT_RESULT_SUCCESS;
-#line 7601 "BatchImport.c"
+#line 7345 "BatchImport.c"
 					}
 #line 843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_data_->dupe_video);
-#line 7605 "BatchImport.c"
+#line 7349 "BatchImport.c"
 				}
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp123_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp123_ = _data_->prepared_file;
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp124_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp124_ = _data_->_tmp123_->job;
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp125_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp125_ = _data_->prepared_file;
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp126_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp126_ = _data_->_tmp125_->file;
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp127_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp127_ = _data_->prepared_file;
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp128_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp128_ = _data_->_tmp127_->file;
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp129_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp129_ = g_file_get_path (_data_->_tmp128_);
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp130_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp130_ = _data_->_tmp129_;
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp131_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp131_ = _data_->prepared_file;
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp132_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp132_ = _data_->_tmp131_->file;
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp133_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp133_ = g_file_get_path (_data_->_tmp132_);
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp134_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp134_ = _data_->_tmp133_;
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp135_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp135_ = _data_->duplicated_file;
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp136_ = 0;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp136_ = _data_->result_code;
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp137_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp137_ = batch_import_result_new (_data_->_tmp124_, _data_->_tmp126_, _data_->_tmp130_, _data_->_tmp134_, _data_->_tmp135_, _data_->_tmp136_);
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_result_unref0 (_data_->import_result);
@@ -7674,18 +7388,12 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_data_->_tmp130_);
 #line 870 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp138_ = 0;
-#line 870 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp138_ = _data_->result_code;
 #line 870 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_data_->_tmp138_ == IMPORT_RESULT_SUCCESS) {
 #line 871 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp139_ = NULL;
-#line 871 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp139_ = _data_->self->priv->manifest;
 #line 871 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp140_ = NULL;
-#line 871 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp140_ = _data_->import_result;
 #line 871 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					import_manifest_add_result (_data_->_tmp139_, _data_->_tmp140_);
@@ -7703,105 +7411,61 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 					_prepared_file_unref0 (_data_->prepared_file);
 #line 873 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 7705 "BatchImport.c"
+#line 7413 "BatchImport.c"
 				}
 #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_data_->duplicated_file);
 #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->duplicate_ids = (g_free (_data_->duplicate_ids), NULL);
-#line 7711 "BatchImport.c"
+#line 7419 "BatchImport.c"
 			}
 #line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp141_ = NULL;
-#line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp141_ = _data_->prepared_file;
 #line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp142_ = NULL;
-#line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp142_ = batch_import_get_in_current_import (_data_->self, _data_->_tmp141_);
 #line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp143_ = NULL;
-#line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp143_ = _data_->_tmp142_;
 #line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp144_ = FALSE;
-#line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp144_ = _data_->_tmp143_ != NULL;
 #line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_data_->_tmp143_);
 #line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_data_->_tmp144_) {
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp145_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp145_ = _data_->prepared_file;
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp146_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp146_ = _data_->_tmp145_->job;
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp147_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp147_ = _data_->prepared_file;
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp148_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp148_ = _data_->_tmp147_->file;
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp149_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp149_ = _data_->prepared_file;
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp150_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp150_ = _data_->_tmp149_->file;
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp151_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp151_ = g_file_get_path (_data_->_tmp150_);
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp152_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp152_ = _data_->_tmp151_;
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp153_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp153_ = _data_->prepared_file;
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp154_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp154_ = _data_->_tmp153_->file;
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp155_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp155_ = g_file_get_path (_data_->_tmp154_);
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp156_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp156_ = _data_->_tmp155_;
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp157_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp157_ = _data_->prepared_file;
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp158_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp158_ = batch_import_get_in_current_import (_data_->self, _data_->_tmp157_);
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp159_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp159_ = _data_->_tmp158_;
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp160_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp160_ = duplicated_file_create_from_file (_data_->_tmp159_);
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp161_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp161_ = _data_->_tmp160_;
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp162_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp162_ = batch_import_result_new (_data_->_tmp146_, _data_->_tmp148_, _data_->_tmp152_, _data_->_tmp156_, _data_->_tmp161_, IMPORT_RESULT_PHOTO_EXISTS);
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_result_unref0 (_data_->import_result);
@@ -7815,131 +7479,83 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 				_g_free0 (_data_->_tmp156_);
 #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_data_->_tmp152_);
-#line 7817 "BatchImport.c"
+#line 7481 "BatchImport.c"
 			} else {
 #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp163_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp163_ = _data_->prepared_file;
 #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp164_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp164_ = _data_->_tmp163_->file;
 #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp165_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp165_ = _data_->prepared_file;
 #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp166_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp166_ = _data_->_tmp165_->full_md5;
 #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp167_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp167_ = _data_->prepared_file;
 #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp168_ = 0;
-#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp168_ = _data_->_tmp167_->file_format;
 #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp169_ = FALSE;
-#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp169_ = photo_is_duplicate (_data_->_tmp164_, NULL, _data_->_tmp166_, _data_->_tmp168_);
 #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_data_->_tmp169_) {
 #line 886 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp170_ = FALSE;
-#line 886 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp170_ = _data_->self->priv->untrash_duplicates;
 #line 886 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_data_->_tmp170_) {
 #line 889 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp171_ = NULL;
-#line 889 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp171_ = library_photo_global;
 #line 889 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp172_ = NULL;
-#line 889 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp172_ = _data_->prepared_file;
 #line 889 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp173_ = NULL;
-#line 889 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp173_ = _data_->_tmp172_->file;
 #line 889 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp174_ = NULL;
-#line 889 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp174_ = library_photo_source_collection_get_trashed_by_file (_data_->_tmp171_, _data_->_tmp173_);
 #line 889 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_object_unref0 (_data_->photo);
 #line 889 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->photo = _data_->_tmp174_;
 #line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp176_ = NULL;
-#line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp176_ = _data_->photo;
 #line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp176_ == NULL) {
 #line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp177_ = NULL;
-#line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp177_ = _data_->prepared_file;
 #line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp178_ = NULL;
-#line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp178_ = _data_->_tmp177_->full_md5;
 #line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp175_ = _data_->_tmp178_ != NULL;
-#line 7891 "BatchImport.c"
+#line 7525 "BatchImport.c"
 						} else {
 #line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp175_ = FALSE;
-#line 7895 "BatchImport.c"
+#line 7529 "BatchImport.c"
 						}
 #line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp175_) {
 #line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp179_ = NULL;
-#line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp179_ = library_photo_global;
 #line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp180_ = NULL;
-#line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp180_ = _data_->prepared_file;
 #line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp181_ = NULL;
-#line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp181_ = _data_->_tmp180_->full_md5;
 #line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp182_ = NULL;
-#line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp182_ = library_photo_source_collection_get_trashed_by_md5 (_data_->_tmp179_, _data_->_tmp181_);
 #line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_g_object_unref0 (_data_->photo);
 #line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->photo = _data_->_tmp182_;
-#line 7919 "BatchImport.c"
+#line 7545 "BatchImport.c"
 						}
 #line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp183_ = NULL;
-#line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp183_ = _data_->photo;
 #line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp183_ != NULL) {
 #line 895 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp184_ = NULL;
-#line 895 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp184_ = _data_->prepared_file;
 #line 895 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp185_ = NULL;
-#line 895 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp185_ = _data_->_tmp184_->file;
 #line 895 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp186_ = NULL;
-#line 895 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp186_ = g_file_get_path (_data_->_tmp185_);
 #line 895 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp187_ = NULL;
-#line 895 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp187_ = _data_->_tmp186_;
 #line 895 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							g_debug ("BatchImport.vala:895: duplicate linked photo found in trash, untrashin" \
@@ -7947,141 +7563,95 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 #line 895 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_g_free0 (_data_->_tmp187_);
 #line 898 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp188_ = NULL;
-#line 898 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp188_ = _data_->photo;
 #line 898 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp189_ = NULL;
-#line 898 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp189_ = _data_->prepared_file;
 #line 898 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp190_ = NULL;
-#line 898 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp190_ = _data_->_tmp189_->file;
 #line 898 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp188_, TYPE_MONITORABLE, Monitorable), _data_->_tmp190_);
 #line 899 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp191_ = NULL;
-#line 899 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp191_ = _data_->photo;
 #line 899 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							media_source_untrash (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp191_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 900 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp192_ = NULL;
-#line 900 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp192_ = _data_->photo;
 #line 900 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							photo_remove_all_transformations (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp192_, TYPE_PHOTO, Photo));
-#line 7973 "BatchImport.c"
+#line 7579 "BatchImport.c"
 						}
 					}
 #line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp194_ = NULL;
-#line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp194_ = _data_->photo;
 #line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_data_->_tmp194_ == NULL) {
 #line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp195_ = FALSE;
-#line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp195_ = _data_->self->priv->mark_duplicates_online;
 #line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp193_ = _data_->_tmp195_;
-#line 7988 "BatchImport.c"
+#line 7590 "BatchImport.c"
 					} else {
 #line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp193_ = FALSE;
-#line 7992 "BatchImport.c"
+#line 7594 "BatchImport.c"
 					}
 #line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_data_->_tmp193_) {
 #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp196_ = NULL;
-#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp196_ = library_photo_global;
 #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp197_ = NULL;
-#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp197_ = _data_->prepared_file;
 #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp198_ = NULL;
-#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp198_ = _data_->_tmp197_->file;
 #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp199_ = NULL;
-#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp199_ = library_photo_source_collection_get_offline_by_file (_data_->_tmp196_, _data_->_tmp198_);
 #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_object_unref0 (_data_->photo);
 #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->photo = _data_->_tmp199_;
 #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp201_ = NULL;
-#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp201_ = _data_->photo;
 #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp201_ == NULL) {
 #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp202_ = NULL;
-#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp202_ = _data_->prepared_file;
 #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp203_ = NULL;
-#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp203_ = _data_->_tmp202_->full_md5;
 #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp200_ = _data_->_tmp203_ != NULL;
-#line 8032 "BatchImport.c"
+#line 7620 "BatchImport.c"
 						} else {
 #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp200_ = FALSE;
-#line 8036 "BatchImport.c"
+#line 7624 "BatchImport.c"
 						}
 #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp200_) {
 #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp204_ = NULL;
-#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp204_ = library_photo_global;
 #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp205_ = NULL;
-#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp205_ = _data_->prepared_file;
 #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp206_ = NULL;
-#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp206_ = _data_->_tmp205_->full_md5;
 #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp207_ = NULL;
-#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp207_ = library_photo_source_collection_get_offline_by_md5 (_data_->_tmp204_, _data_->_tmp206_);
 #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_g_object_unref0 (_data_->photo);
 #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->photo = _data_->_tmp207_;
-#line 8060 "BatchImport.c"
+#line 7640 "BatchImport.c"
 						}
 #line 911 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp208_ = NULL;
-#line 911 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp208_ = _data_->photo;
 #line 911 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp208_ != NULL) {
 #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp209_ = NULL;
-#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp209_ = _data_->prepared_file;
 #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp210_ = NULL;
-#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp210_ = _data_->_tmp209_->file;
 #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp211_ = NULL;
-#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp211_ = g_file_get_path (_data_->_tmp210_);
 #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp212_ = NULL;
-#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp212_ = _data_->_tmp211_;
 #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							g_debug ("BatchImport.vala:912: duplicate photo found marked offline, marking on" \
@@ -8089,85 +7659,49 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_g_free0 (_data_->_tmp212_);
 #line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp213_ = NULL;
-#line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp213_ = _data_->photo;
 #line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp214_ = NULL;
-#line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp214_ = _data_->prepared_file;
 #line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp215_ = NULL;
-#line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp215_ = _data_->_tmp214_->file;
 #line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp213_, TYPE_MONITORABLE, Monitorable), _data_->_tmp215_);
 #line 916 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp216_ = NULL;
-#line 916 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp216_ = _data_->photo;
 #line 916 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp216_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 8108 "BatchImport.c"
+#line 7670 "BatchImport.c"
 						}
 					}
 #line 920 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp217_ = NULL;
-#line 920 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp217_ = _data_->photo;
 #line 920 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_data_->_tmp217_ != NULL) {
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp218_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp218_ = _data_->prepared_file;
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp219_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp219_ = _data_->_tmp218_->job;
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp220_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp220_ = _data_->prepared_file;
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp221_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp221_ = _data_->_tmp220_->file;
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp222_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp222_ = _data_->prepared_file;
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp223_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp223_ = _data_->_tmp222_->file;
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp224_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp224_ = g_file_get_path (_data_->_tmp223_);
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp225_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp225_ = _data_->_tmp224_;
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp226_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp226_ = _data_->prepared_file;
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp227_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp227_ = _data_->_tmp226_->file;
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp228_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp228_ = g_file_get_path (_data_->_tmp227_);
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp229_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp229_ = _data_->_tmp228_;
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp230_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp230_ = batch_import_result_new (_data_->_tmp219_, _data_->_tmp221_, _data_->_tmp225_, _data_->_tmp229_, NULL, IMPORT_RESULT_SUCCESS);
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_batch_import_result_unref0 (_data_->import_result);
@@ -8178,36 +7712,22 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_free0 (_data_->_tmp225_);
 #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp231_ = NULL;
-#line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp231_ = _data_->self->priv->manifest;
 #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp232_ = NULL;
-#line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp232_ = _data_->_tmp231_->imported;
 #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp233_ = NULL;
-#line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp233_ = _data_->photo;
 #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp232_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp233_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp234_ = NULL;
-#line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp234_ = _data_->self->priv->manifest;
 #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp235_ = NULL;
-#line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp235_ = _data_->import_result;
 #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						import_manifest_add_result (_data_->_tmp234_, _data_->_tmp235_);
 #line 928 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp236_ = NULL;
-#line 928 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp236_ = _data_->photo;
 #line 928 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp237_ = 0ULL;
-#line 928 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp237_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp236_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 928 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						batch_import_report_progress (_data_->self, _data_->_tmp237_);
@@ -8223,169 +7743,93 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 						_prepared_file_unref0 (_data_->prepared_file);
 #line 931 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						continue;
-#line 8223 "BatchImport.c"
+#line 7743 "BatchImport.c"
 					}
 #line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp238_ = NULL;
-#line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp238_ = _data_->prepared_file;
 #line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp239_ = NULL;
-#line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp239_ = _data_->_tmp238_->file;
 #line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp240_ = NULL;
-#line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp240_ = g_file_get_path (_data_->_tmp239_);
 #line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp241_ = NULL;
-#line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp241_ = _data_->_tmp240_;
 #line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					g_debug ("BatchImport.vala:934: duplicate photo detected, not importing %s", _data_->_tmp241_);
 #line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_free0 (_data_->_tmp241_);
 #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp242_ = NULL;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp242_ = photo_table_get_instance ();
 #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp243_ = NULL;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp243_ = _data_->_tmp242_;
 #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp244_ = NULL;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp244_ = _data_->prepared_file;
 #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp245_ = NULL;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp245_ = _data_->_tmp244_->file;
 #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp246_ = NULL;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp246_ = _data_->prepared_file;
 #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp247_ = NULL;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp247_ = _data_->_tmp246_->full_md5;
 #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp248_ = NULL;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp248_ = _data_->prepared_file;
 #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp249_ = 0;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp249_ = _data_->_tmp248_->file_format;
 #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp250_ = 0;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp251_ = NULL;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp251_ = photo_table_get_duplicate_ids (_data_->_tmp243_, _data_->_tmp245_, NULL, _data_->_tmp247_, _data_->_tmp249_, &_data_->_tmp250_);
 #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp252_ = NULL;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp252__length1 = 0;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp252_ = _data_->_tmp251_;
 #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp252__length1 = _data_->_tmp250_;
 #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_database_table_unref0 (_data_->_tmp243_);
 #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->photo_ids_length1 = 0;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_photo_ids_size_ = 0;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->photo_ids = _data_->_tmp252_;
 #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->photo_ids_length1 = _data_->_tmp252__length1;
 #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_photo_ids_size_ = _data_->photo_ids_length1;
 #line 939 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp253_ = NULL;
-#line 939 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp253__length1 = 0;
-#line 939 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp253_ = _data_->photo_ids;
 #line 939 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp253__length1 = _data_->photo_ids_length1;
 #line 939 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_vala_assert (_data_->_tmp253__length1 > 0, "photo_ids.length > 0");
 #line 941 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp254_ = NULL;
-#line 941 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp254__length1 = 0;
-#line 941 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp254_ = _data_->photo_ids;
 #line 941 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp254__length1 = _data_->photo_ids_length1;
 #line 941 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					memset (&_data_->_tmp255_, 0, sizeof (PhotoID));
-#line 941 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp255_ = _data_->_tmp254_[0];
 #line 941 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp256_ = NULL;
-#line 941 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp256_ = duplicated_file_create_from_photo_id (&_data_->_tmp255_);
 #line 941 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_vala1_duplicated_file = _data_->_tmp256_;
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp257_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp257_ = _data_->prepared_file;
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp258_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp258_ = _data_->_tmp257_->job;
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp259_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp259_ = _data_->prepared_file;
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp260_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp260_ = _data_->_tmp259_->file;
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp261_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp261_ = _data_->prepared_file;
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp262_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp262_ = _data_->_tmp261_->file;
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp263_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp263_ = g_file_get_path (_data_->_tmp262_);
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp264_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp264_ = _data_->_tmp263_;
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp265_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp265_ = _data_->prepared_file;
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp266_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp266_ = _data_->_tmp265_->file;
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp267_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp267_ = g_file_get_path (_data_->_tmp266_);
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp268_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp268_ = _data_->_tmp267_;
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp269_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp269_ = _data_->_vala1_duplicated_file;
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp270_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp270_ = batch_import_result_new (_data_->_tmp258_, _data_->_tmp260_, _data_->_tmp264_, _data_->_tmp268_, _data_->_tmp269_, IMPORT_RESULT_PHOTO_EXISTS);
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_batch_import_result_unref0 (_data_->import_result);
@@ -8399,18 +7843,14 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 					_g_object_unref0 (_data_->_vala1_duplicated_file);
 #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->photo_ids = (g_free (_data_->photo_ids), NULL);
-#line 8399 "BatchImport.c"
+#line 7843 "BatchImport.c"
 				}
 			}
 #line 948 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp271_ = NULL;
-#line 948 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp271_ = _data_->import_result;
 #line 948 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_data_->_tmp271_ != NULL) {
 #line 949 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp272_ = NULL;
-#line 949 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp272_ = _data_->import_result;
 #line 949 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				batch_import_report_failure (_data_->self, _data_->_tmp272_);
@@ -8426,17 +7866,13 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 				_prepared_file_unref0 (_data_->prepared_file);
 #line 952 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 8426 "BatchImport.c"
+#line 7866 "BatchImport.c"
 			}
 #line 955 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			batch_import_report_progress (_data_->self, (guint64) 0);
 #line 956 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp273_ = NULL;
-#line 956 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp273_ = _data_->self->priv->ready_files;
 #line 956 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp274_ = NULL;
-#line 956 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp274_ = _data_->prepared_file;
 #line 956 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp273_, GEE_TYPE_COLLECTION, GeeCollection), _data_->_tmp274_);
@@ -8448,45 +7884,46 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 			_batch_import_result_unref0 (_data_->import_result);
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_data_->prepared_file);
-#line 8448 "BatchImport.c"
+#line 7884 "BatchImport.c"
 		}
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_data_->_prepared_file_list);
-#line 8452 "BatchImport.c"
+#line 7888 "BatchImport.c"
 	}
 #line 959 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_import_jobs (_data_->self);
 #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_data_->_state_ == 0) {
+	g_task_return_pointer (_data_->_async_result, _data_, NULL);
 #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8460 "BatchImport.c"
-	} else {
+	if (_data_->_state_ != 0) {
+#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		while (_data_->_task_complete_ != TRUE) {
 #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_simple_async_result_complete (_data_->_async_result);
-#line 8464 "BatchImport.c"
+			g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
+#line 7900 "BatchImport.c"
+		}
 	}
 #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_object_unref (_data_->_async_result);
 #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return FALSE;
-#line 8470 "BatchImport.c"
+#line 7907 "BatchImport.c"
 }
 
 
 static void batch_import_done_preparing_files (BatchImport* self, BackgroundJob* j, const gchar* caller) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	PrepareFilesJob* prepare_files_job = NULL;
-	BackgroundJob* _tmp1_ = NULL;
-	PrepareFilesJob* _tmp2_ = NULL;
-	PrepareFilesJob* _tmp3_ = NULL;
-	PrepareFilesJob* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	const gchar* _tmp8_ = NULL;
+	BackgroundJob* _tmp1_;
+	PrepareFilesJob* _tmp2_;
+	PrepareFilesJob* _tmp3_;
+	PrepareFilesJob* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	const gchar* _tmp8_;
 	gboolean _tmp9_ = FALSE;
-	gint _tmp10_ = 0;
+	gint _tmp10_;
 #line 962 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 962 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8529,60 +7966,60 @@ static void batch_import_done_preparing_files (BatchImport* self, BackgroundJob*
 	_tmp10_ = self->priv->file_imports_to_perform;
 #line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp10_ == 0) {
-#line 8529 "BatchImport.c"
-		gboolean _tmp11_ = FALSE;
+#line 7966 "BatchImport.c"
+		gboolean _tmp11_;
 #line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = self->priv->completed;
 #line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = !_tmp11_;
-#line 8535 "BatchImport.c"
+#line 7972 "BatchImport.c"
 	} else {
 #line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = FALSE;
-#line 8539 "BatchImport.c"
+#line 7976 "BatchImport.c"
 	}
 #line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp9_) {
 #line 981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_report_completed (self, "no files prepared for import");
-#line 8545 "BatchImport.c"
+#line 7982 "BatchImport.c"
 	} else {
 		gboolean _tmp12_ = FALSE;
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
+		gint _tmp13_;
+		gint _tmp14_;
 #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = self->priv->file_imports_completed;
 #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = self->priv->file_imports_to_perform;
 #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp13_ == _tmp14_) {
-#line 8556 "BatchImport.c"
-			gboolean _tmp15_ = FALSE;
+#line 7993 "BatchImport.c"
+			gboolean _tmp15_;
 #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp15_ = self->priv->completed;
 #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = !_tmp15_;
-#line 8562 "BatchImport.c"
+#line 7999 "BatchImport.c"
 		} else {
 #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = FALSE;
-#line 8566 "BatchImport.c"
+#line 8003 "BatchImport.c"
 		}
 #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp12_) {
 #line 983 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			batch_import_report_completed (self, "completed preparing files, all outstanding imports completed");
-#line 8572 "BatchImport.c"
+#line 8009 "BatchImport.c"
 		}
 	}
 #line 962 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (prepare_files_job);
-#line 8577 "BatchImport.c"
+#line 8014 "BatchImport.c"
 }
 
 
 static void batch_import_on_files_prepared (BatchImport* self, BackgroundJob* j) {
-	BackgroundJob* _tmp0_ = NULL;
+	BackgroundJob* _tmp0_;
 #line 986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 986 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8591,12 +8028,12 @@ static void batch_import_on_files_prepared (BatchImport* self, BackgroundJob* j)
 	_tmp0_ = j;
 #line 987 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_done_preparing_files (self, _tmp0_, "on_files_prepared");
-#line 8591 "BatchImport.c"
+#line 8028 "BatchImport.c"
 }
 
 
 static void batch_import_on_file_prepare_cancelled (BatchImport* self, BackgroundJob* j) {
-	BackgroundJob* _tmp0_ = NULL;
+	BackgroundJob* _tmp0_;
 #line 990 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 990 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8605,21 +8042,21 @@ static void batch_import_on_file_prepare_cancelled (BatchImport* self, Backgroun
 	_tmp0_ = j;
 #line 991 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_done_preparing_files (self, _tmp0_, "on_file_prepare_cancelled");
-#line 8605 "BatchImport.c"
+#line 8042 "BatchImport.c"
 }
 
 
 static void batch_import_on_import_files_completed (BatchImport* self, BackgroundJob* j) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	PreparedFileImportJob* job = NULL;
-	BackgroundJob* _tmp1_ = NULL;
-	PreparedFileImportJob* _tmp2_ = NULL;
-	PreparedFileImportJob* _tmp3_ = NULL;
-	PreparedFile* _tmp4_ = NULL;
-	PreparedFileImportJob* _tmp5_ = NULL;
-	BatchImportResult* _tmp6_ = NULL;
-	PreparedFileImportJob* _tmp12_ = NULL;
-	ReadyForImport* _tmp13_ = NULL;
+	BackgroundJob* _tmp1_;
+	PreparedFileImportJob* _tmp2_;
+	PreparedFileImportJob* _tmp3_;
+	PreparedFile* _tmp4_;
+	PreparedFileImportJob* _tmp5_;
+	BatchImportResult* _tmp6_;
+	PreparedFileImportJob* _tmp12_;
+	ReadyForImport* _tmp13_;
 	GError * _inner_error_ = NULL;
 #line 998 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
@@ -8649,12 +8086,12 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 	_tmp6_ = _tmp5_->failed;
 #line 1009 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp6_ != NULL) {
-#line 8649 "BatchImport.c"
-		PreparedFileImportJob* _tmp7_ = NULL;
-		BatchImportResult* _tmp8_ = NULL;
-		ImportResult _tmp9_ = 0;
-		PreparedFileImportJob* _tmp10_ = NULL;
-		BatchImportResult* _tmp11_ = NULL;
+#line 8086 "BatchImport.c"
+		PreparedFileImportJob* _tmp7_;
+		BatchImportResult* _tmp8_;
+		ImportResult _tmp9_;
+		PreparedFileImportJob* _tmp10_;
+		BatchImportResult* _tmp11_;
 #line 1010 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = job;
 #line 1010 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8671,7 +8108,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 		batch_import_report_failure (self, _tmp11_);
 #line 1013 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
-#line 8671 "BatchImport.c"
+#line 8108 "BatchImport.c"
 	}
 #line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp12_ = job;
@@ -8679,26 +8116,26 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 	_tmp13_ = _tmp12_->ready;
 #line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp13_ != NULL) {
-#line 8679 "BatchImport.c"
-		PreparedFileImportJob* _tmp14_ = NULL;
-		ReadyForImport* _tmp15_ = NULL;
-		BatchImportResult* _tmp16_ = NULL;
-		ImportResult _tmp17_ = 0;
+#line 8116 "BatchImport.c"
+		PreparedFileImportJob* _tmp14_;
+		ReadyForImport* _tmp15_;
+		BatchImportResult* _tmp16_;
+		ImportResult _tmp17_;
 		Tombstone* tombstone = NULL;
-		TombstoneSourceCollection* _tmp18_ = NULL;
-		PreparedFileImportJob* _tmp19_ = NULL;
-		ReadyForImport* _tmp20_ = NULL;
-		GFile* _tmp21_ = NULL;
-		Tombstone* _tmp22_ = NULL;
-		Tombstone* _tmp23_ = NULL;
+		TombstoneSourceCollection* _tmp18_;
+		PreparedFileImportJob* _tmp19_;
+		ReadyForImport* _tmp20_;
+		GFile* _tmp21_;
+		Tombstone* _tmp22_;
+		Tombstone* _tmp23_;
 		MediaSource* source = NULL;
-		PreparedFileImportJob* _tmp26_ = NULL;
-		ReadyForImport* _tmp27_ = NULL;
-		gboolean _tmp28_ = FALSE;
-		PreparedFileImportJob* _tmp87_ = NULL;
-		ReadyForImport* _tmp88_ = NULL;
-		BatchImportResult* _tmp89_ = NULL;
-		ImportResult _tmp90_ = 0;
+		PreparedFileImportJob* _tmp26_;
+		ReadyForImport* _tmp27_;
+		gboolean _tmp28_;
+		PreparedFileImportJob* _tmp87_;
+		ReadyForImport* _tmp88_;
+		BatchImportResult* _tmp89_;
+		ImportResult _tmp90_;
 #line 1019 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = job;
 #line 1019 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8725,16 +8162,16 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 		_tmp23_ = tombstone;
 #line 1022 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp23_ != NULL) {
-#line 8725 "BatchImport.c"
-			TombstoneSourceCollection* _tmp24_ = NULL;
-			Tombstone* _tmp25_ = NULL;
+#line 8162 "BatchImport.c"
+			TombstoneSourceCollection* _tmp24_;
+			Tombstone* _tmp25_;
 #line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp24_ = tombstone_global;
 #line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp25_ = tombstone;
 #line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			tombstone_source_collection_resurrect (_tmp24_, _tmp25_);
-#line 8734 "BatchImport.c"
+#line 8171 "BatchImport.c"
 		}
 #line 1026 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		source = NULL;
@@ -8746,15 +8183,15 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 		_tmp28_ = _tmp27_->is_video;
 #line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp28_) {
-#line 8746 "BatchImport.c"
-			PreparedFileImportJob* _tmp29_ = NULL;
-			ReadyForImport* _tmp30_ = NULL;
-			BatchImportResult* _tmp31_ = NULL;
-			PreparedFileImportJob* _tmp32_ = NULL;
-			ReadyForImport* _tmp33_ = NULL;
-			VideoImportParams* _tmp34_ = NULL;
+#line 8183 "BatchImport.c"
+			PreparedFileImportJob* _tmp29_;
+			ReadyForImport* _tmp30_;
+			BatchImportResult* _tmp31_;
+			PreparedFileImportJob* _tmp32_;
+			ReadyForImport* _tmp33_;
+			VideoImportParams* _tmp34_;
 			Video* _tmp35_ = NULL;
-			ImportResult _tmp36_ = 0;
+			ImportResult _tmp36_;
 #line 1028 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp29_ = job;
 #line 1028 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8775,25 +8212,25 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 			source = G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE, MediaSource);
 #line 1028 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp31_->result = _tmp36_;
-#line 8775 "BatchImport.c"
+#line 8212 "BatchImport.c"
 		} else {
-			PreparedFileImportJob* _tmp37_ = NULL;
-			ReadyForImport* _tmp38_ = NULL;
-			BatchImportResult* _tmp39_ = NULL;
-			PreparedFileImportJob* _tmp40_ = NULL;
-			ReadyForImport* _tmp41_ = NULL;
-			PhotoImportParams* _tmp42_ = NULL;
+			PreparedFileImportJob* _tmp37_;
+			ReadyForImport* _tmp38_;
+			BatchImportResult* _tmp39_;
+			PreparedFileImportJob* _tmp40_;
+			ReadyForImport* _tmp41_;
+			PhotoImportParams* _tmp42_;
 			LibraryPhoto* _tmp43_ = NULL;
-			ImportResult _tmp44_ = 0;
+			ImportResult _tmp44_;
 			Photo* photo = NULL;
-			MediaSource* _tmp45_ = NULL;
-			Photo* _tmp46_ = NULL;
-			PreparedFileImportJob* _tmp47_ = NULL;
-			ReadyForImport* _tmp48_ = NULL;
-			PhotoImportParams* _tmp49_ = NULL;
-			GFile* _tmp50_ = NULL;
-			Photo* _tmp72_ = NULL;
-			PhotoFileFormat _tmp73_ = 0;
+			MediaSource* _tmp45_;
+			Photo* _tmp46_;
+			PreparedFileImportJob* _tmp47_;
+			ReadyForImport* _tmp48_;
+			PhotoImportParams* _tmp49_;
+			GFile* _tmp50_;
+			Photo* _tmp72_;
+			PhotoFileFormat _tmp73_;
 #line 1031 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp37_ = job;
 #line 1031 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8830,23 +8267,23 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 			_tmp50_ = _tmp49_->final_associated_file;
 #line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp50_ != NULL) {
-#line 8830 "BatchImport.c"
+#line 8267 "BatchImport.c"
 				BackingPhotoRow* bpr = NULL;
-				BackingPhotoRow* _tmp51_ = NULL;
-				BackingPhotoRow* _tmp52_ = NULL;
-				BackingPhotoRow* _tmp53_ = NULL;
-				PreparedFileImportJob* _tmp54_ = NULL;
-				ReadyForImport* _tmp55_ = NULL;
-				PhotoImportParams* _tmp56_ = NULL;
-				GFile* _tmp57_ = NULL;
-				gchar* _tmp58_ = NULL;
-				MediaSource* _tmp59_ = NULL;
-				GFile* _tmp60_ = NULL;
-				GFile* _tmp61_ = NULL;
-				gchar* _tmp62_ = NULL;
-				gchar* _tmp63_ = NULL;
-				BackingPhotoRow* _tmp64_ = NULL;
-				const gchar* _tmp65_ = NULL;
+				BackingPhotoRow* _tmp51_;
+				BackingPhotoRow* _tmp52_;
+				BackingPhotoRow* _tmp53_;
+				PreparedFileImportJob* _tmp54_;
+				ReadyForImport* _tmp55_;
+				PhotoImportParams* _tmp56_;
+				GFile* _tmp57_;
+				gchar* _tmp58_;
+				MediaSource* _tmp59_;
+				GFile* _tmp60_;
+				GFile* _tmp61_;
+				gchar* _tmp62_;
+				gchar* _tmp63_;
+				BackingPhotoRow* _tmp64_;
+				const gchar* _tmp65_;
 #line 1037 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp51_ = backing_photo_row_new ();
 #line 1037 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8891,10 +8328,10 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 				_g_free0 (_tmp63_);
 #line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_tmp61_);
-#line 8891 "BatchImport.c"
+#line 8328 "BatchImport.c"
 				{
-					MediaSource* _tmp66_ = NULL;
-					BackingPhotoRow* _tmp67_ = NULL;
+					MediaSource* _tmp66_;
+					BackingPhotoRow* _tmp67_;
 #line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp66_ = source;
 #line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8903,18 +8340,18 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 					photo_add_backing_photo_for_development (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_PHOTO, Photo), RAW_DEVELOPER_CAMERA, _tmp67_, &_inner_error_);
 #line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8903 "BatchImport.c"
-						goto __catch411_g_error;
+#line 8340 "BatchImport.c"
+						goto __catch412_g_error;
 					}
 				}
-				goto __finally411;
-				__catch411_g_error:
+				goto __finally412;
+				__catch412_g_error:
 				{
 					GError* e = NULL;
-					BackingPhotoRow* _tmp68_ = NULL;
-					const gchar* _tmp69_ = NULL;
-					GError* _tmp70_ = NULL;
-					const gchar* _tmp71_ = NULL;
+					BackingPhotoRow* _tmp68_;
+					const gchar* _tmp69_;
+					GError* _tmp70_;
+					const gchar* _tmp71_;
 #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					e = _inner_error_;
 #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8932,9 +8369,9 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 "or: %s", _tmp69_, _tmp71_);
 #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_error_free0 (e);
-#line 8931 "BatchImport.c"
+#line 8368 "BatchImport.c"
 				}
-				__finally411:
+				__finally412:
 #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8953,11 +8390,11 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 					g_clear_error (&_inner_error_);
 #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					return;
-#line 8952 "BatchImport.c"
+#line 8389 "BatchImport.c"
 				}
 #line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_backing_photo_row_unref0 (bpr);
-#line 8956 "BatchImport.c"
+#line 8393 "BatchImport.c"
 			}
 #line 1051 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp72_ = photo;
@@ -8965,18 +8402,18 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 			_tmp73_ = photo_get_master_file_format (_tmp72_);
 #line 1051 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp73_ == PHOTO_FILE_FORMAT_RAW) {
-#line 8964 "BatchImport.c"
+#line 8401 "BatchImport.c"
 				RawDeveloper d = 0;
-				ConfigFacade* _tmp74_ = NULL;
-				ConfigFacade* _tmp75_ = NULL;
-				RawDeveloper _tmp76_ = 0;
-				RawDeveloper _tmp77_ = 0;
+				ConfigFacade* _tmp74_;
+				ConfigFacade* _tmp75_;
+				RawDeveloper _tmp76_;
+				RawDeveloper _tmp77_;
 				gboolean _tmp78_ = FALSE;
-				RawDeveloper _tmp79_ = 0;
-				Photo* _tmp83_ = NULL;
-				RawDeveloper _tmp84_ = 0;
-				Photo* _tmp85_ = NULL;
-				RawDeveloper _tmp86_ = 0;
+				RawDeveloper _tmp79_;
+				Photo* _tmp83_;
+				RawDeveloper _tmp84_;
+				Photo* _tmp85_;
+				RawDeveloper _tmp86_;
 #line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp74_ = config_facade_get_instance ();
 #line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8993,10 +8430,10 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 				_tmp79_ = d;
 #line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp79_ == RAW_DEVELOPER_CAMERA) {
-#line 8992 "BatchImport.c"
-					Photo* _tmp80_ = NULL;
-					RawDeveloper _tmp81_ = 0;
-					gboolean _tmp82_ = FALSE;
+#line 8429 "BatchImport.c"
+					Photo* _tmp80_;
+					RawDeveloper _tmp81_;
+					gboolean _tmp82_;
 #line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp80_ = photo;
 #line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9005,17 +8442,17 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 					_tmp82_ = photo_is_raw_developer_available (_tmp80_, _tmp81_);
 #line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp78_ = !_tmp82_;
-#line 9004 "BatchImport.c"
+#line 8441 "BatchImport.c"
 				} else {
 #line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp78_ = FALSE;
-#line 9008 "BatchImport.c"
+#line 8445 "BatchImport.c"
 				}
 #line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp78_) {
 #line 1054 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					d = RAW_DEVELOPER_EMBEDDED;
-#line 9014 "BatchImport.c"
+#line 8451 "BatchImport.c"
 				}
 #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp83_ = photo;
@@ -9029,11 +8466,11 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 				_tmp86_ = d;
 #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				photo_set_raw_developer (_tmp85_, _tmp86_);
-#line 9028 "BatchImport.c"
+#line 8465 "BatchImport.c"
 			}
 #line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (photo);
-#line 9032 "BatchImport.c"
+#line 8469 "BatchImport.c"
 		}
 #line 1061 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp87_ = job;
@@ -9045,16 +8482,16 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 		_tmp90_ = _tmp89_->result;
 #line 1061 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp90_ != IMPORT_RESULT_SUCCESS) {
-#line 9044 "BatchImport.c"
-			PreparedFileImportJob* _tmp91_ = NULL;
-			ReadyForImport* _tmp92_ = NULL;
-			BatchImportResult* _tmp93_ = NULL;
-			ImportResult _tmp94_ = 0;
-			gchar* _tmp95_ = NULL;
-			gchar* _tmp96_ = NULL;
-			PreparedFileImportJob* _tmp97_ = NULL;
-			ReadyForImport* _tmp98_ = NULL;
-			BatchImportResult* _tmp99_ = NULL;
+#line 8481 "BatchImport.c"
+			PreparedFileImportJob* _tmp91_;
+			ReadyForImport* _tmp92_;
+			BatchImportResult* _tmp93_;
+			ImportResult _tmp94_;
+			gchar* _tmp95_;
+			gchar* _tmp96_;
+			PreparedFileImportJob* _tmp97_;
+			ReadyForImport* _tmp98_;
+			BatchImportResult* _tmp99_;
 #line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp91_ = job;
 #line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9081,23 +8518,23 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 			batch_import_report_failure (self, _tmp99_);
 #line 1065 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			batch_import_file_import_complete (self);
-#line 9080 "BatchImport.c"
+#line 8517 "BatchImport.c"
 		} else {
-			GeeList* _tmp100_ = NULL;
-			MediaSource* _tmp101_ = NULL;
-			PreparedFileImportJob* _tmp102_ = NULL;
-			ReadyForImport* _tmp103_ = NULL;
-			Thumbnails* _tmp104_ = NULL;
-			Thumbnails* _tmp105_ = NULL;
-			PreparedFileImportJob* _tmp106_ = NULL;
-			ReadyForImport* _tmp107_ = NULL;
-			PreparedFile* _tmp108_ = NULL;
-			BatchImportJob* _tmp109_ = NULL;
-			PreparedFileImportJob* _tmp110_ = NULL;
-			ReadyForImport* _tmp111_ = NULL;
-			BatchImportResult* _tmp112_ = NULL;
-			CompletedImportObject* _tmp113_ = NULL;
-			CompletedImportObject* _tmp114_ = NULL;
+			GeeList* _tmp100_;
+			MediaSource* _tmp101_;
+			PreparedFileImportJob* _tmp102_;
+			ReadyForImport* _tmp103_;
+			Thumbnails* _tmp104_;
+			Thumbnails* _tmp105_;
+			PreparedFileImportJob* _tmp106_;
+			ReadyForImport* _tmp107_;
+			PreparedFile* _tmp108_;
+			BatchImportJob* _tmp109_;
+			PreparedFileImportJob* _tmp110_;
+			ReadyForImport* _tmp111_;
+			BatchImportResult* _tmp112_;
+			CompletedImportObject* _tmp113_;
+			CompletedImportObject* _tmp114_;
 #line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp100_ = self->priv->ready_thumbnails;
 #line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9134,33 +8571,33 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 			_completed_import_object_unref0 (_tmp114_);
 #line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_thumbnails_unref0 (_tmp105_);
-#line 9133 "BatchImport.c"
+#line 8570 "BatchImport.c"
 		}
 #line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (source);
 #line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (tombstone);
-#line 9139 "BatchImport.c"
+#line 8576 "BatchImport.c"
 	}
 #line 1072 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_import_jobs (self);
 #line 998 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (job);
-#line 9145 "BatchImport.c"
+#line 8582 "BatchImport.c"
 }
 
 
 static void batch_import_on_import_files_cancelled (BatchImport* self, BackgroundJob* j) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	PreparedFileImportJob* job = NULL;
-	BackgroundJob* _tmp1_ = NULL;
-	PreparedFileImportJob* _tmp2_ = NULL;
-	PreparedFileImportJob* _tmp3_ = NULL;
-	PreparedFile* _tmp4_ = NULL;
-	PreparedFileImportJob* _tmp23_ = NULL;
-	BatchImportResult* _tmp24_ = NULL;
-	PreparedFileImportJob* _tmp27_ = NULL;
-	ReadyForImport* _tmp28_ = NULL;
+	BackgroundJob* _tmp1_;
+	PreparedFileImportJob* _tmp2_;
+	PreparedFileImportJob* _tmp3_;
+	PreparedFile* _tmp4_;
+	PreparedFileImportJob* _tmp23_;
+	BatchImportResult* _tmp24_;
+	PreparedFileImportJob* _tmp27_;
+	ReadyForImport* _tmp28_;
 #line 1075 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 1075 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9183,25 +8620,25 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun
 	_tmp4_ = _tmp3_->not_ready;
 #line 1082 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp4_ != NULL) {
-#line 9182 "BatchImport.c"
-		PreparedFileImportJob* _tmp5_ = NULL;
-		PreparedFile* _tmp6_ = NULL;
-		BatchImportJob* _tmp7_ = NULL;
-		PreparedFileImportJob* _tmp8_ = NULL;
-		PreparedFile* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
-		PreparedFileImportJob* _tmp11_ = NULL;
-		PreparedFile* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		PreparedFileImportJob* _tmp16_ = NULL;
-		PreparedFile* _tmp17_ = NULL;
-		GFile* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		BatchImportResult* _tmp21_ = NULL;
-		BatchImportResult* _tmp22_ = NULL;
+#line 8619 "BatchImport.c"
+		PreparedFileImportJob* _tmp5_;
+		PreparedFile* _tmp6_;
+		BatchImportJob* _tmp7_;
+		PreparedFileImportJob* _tmp8_;
+		PreparedFile* _tmp9_;
+		GFile* _tmp10_;
+		PreparedFileImportJob* _tmp11_;
+		PreparedFile* _tmp12_;
+		GFile* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		PreparedFileImportJob* _tmp16_;
+		PreparedFile* _tmp17_;
+		GFile* _tmp18_;
+		gchar* _tmp19_;
+		gchar* _tmp20_;
+		BatchImportResult* _tmp21_;
+		BatchImportResult* _tmp22_;
 #line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = job;
 #line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9248,7 +8685,7 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun
 		_g_free0 (_tmp15_);
 #line 1086 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
-#line 9247 "BatchImport.c"
+#line 8684 "BatchImport.c"
 	}
 #line 1089 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp23_ = job;
@@ -9256,9 +8693,9 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun
 	_tmp24_ = _tmp23_->failed;
 #line 1089 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp24_ != NULL) {
-#line 9255 "BatchImport.c"
-		PreparedFileImportJob* _tmp25_ = NULL;
-		BatchImportResult* _tmp26_ = NULL;
+#line 8692 "BatchImport.c"
+		PreparedFileImportJob* _tmp25_;
+		BatchImportResult* _tmp26_;
 #line 1090 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp25_ = job;
 #line 1090 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9267,7 +8704,7 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun
 		batch_import_report_failure (self, _tmp26_);
 #line 1091 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
-#line 9266 "BatchImport.c"
+#line 8703 "BatchImport.c"
 	}
 #line 1094 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp27_ = job;
@@ -9275,11 +8712,11 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun
 	_tmp28_ = _tmp27_->ready;
 #line 1094 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp28_ != NULL) {
-#line 9274 "BatchImport.c"
-		PreparedFileImportJob* _tmp29_ = NULL;
-		ReadyForImport* _tmp30_ = NULL;
-		BatchImportResult* _tmp31_ = NULL;
-		BatchImportResult* _tmp32_ = NULL;
+#line 8711 "BatchImport.c"
+		PreparedFileImportJob* _tmp29_;
+		ReadyForImport* _tmp30_;
+		BatchImportResult* _tmp31_;
+		BatchImportResult* _tmp32_;
 #line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp29_ = job;
 #line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9294,35 +8731,35 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun
 		_batch_import_result_unref0 (_tmp32_);
 #line 1096 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
-#line 9293 "BatchImport.c"
+#line 8730 "BatchImport.c"
 	}
 #line 1099 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_import_jobs (self);
 #line 1075 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (job);
-#line 9299 "BatchImport.c"
+#line 8736 "BatchImport.c"
 }
 
 
 static gpointer _completed_import_object_ref0 (gpointer self) {
 #line 1113 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? completed_import_object_ref (self) : NULL;
-#line 9306 "BatchImport.c"
+#line 8743 "BatchImport.c"
 }
 
 
 static void batch_import_on_thumbnail_writer_completed (BatchImport* self, BackgroundJob* j) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	ThumbnailWriterJob* job = NULL;
-	BackgroundJob* _tmp1_ = NULL;
-	ThumbnailWriterJob* _tmp2_ = NULL;
+	BackgroundJob* _tmp1_;
+	ThumbnailWriterJob* _tmp2_;
 	CompletedImportObject* completed = NULL;
-	ThumbnailWriterJob* _tmp3_ = NULL;
-	CompletedImportObject* _tmp4_ = NULL;
-	CompletedImportObject* _tmp5_ = NULL;
-	CompletedImportObject* _tmp6_ = NULL;
-	BatchImportResult* _tmp7_ = NULL;
-	ImportResult _tmp8_ = 0;
+	ThumbnailWriterJob* _tmp3_;
+	CompletedImportObject* _tmp4_;
+	CompletedImportObject* _tmp5_;
+	CompletedImportObject* _tmp6_;
+	BatchImportResult* _tmp7_;
+	ImportResult _tmp8_;
 #line 1109 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 1109 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9355,20 +8792,20 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
 	_tmp8_ = _tmp7_->result;
 #line 1117 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp8_ != IMPORT_RESULT_SUCCESS) {
-#line 9354 "BatchImport.c"
-		CompletedImportObject* _tmp9_ = NULL;
-		MediaSource* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		CompletedImportObject* _tmp13_ = NULL;
-		BatchImportResult* _tmp14_ = NULL;
-		ImportResult _tmp15_ = 0;
-		gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		CompletedImportObject* _tmp18_ = NULL;
-		MediaSource* _tmp19_ = NULL;
-		CompletedImportObject* _tmp26_ = NULL;
-		BatchImportResult* _tmp27_ = NULL;
+#line 8791 "BatchImport.c"
+		CompletedImportObject* _tmp9_;
+		MediaSource* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		CompletedImportObject* _tmp13_;
+		BatchImportResult* _tmp14_;
+		ImportResult _tmp15_;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
+		CompletedImportObject* _tmp18_;
+		MediaSource* _tmp19_;
+		CompletedImportObject* _tmp26_;
+		BatchImportResult* _tmp27_;
 #line 1118 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = completed;
 #line 1118 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9400,35 +8837,35 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
 		_tmp19_ = _tmp18_->source;
 #line 1121 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO)) {
-#line 9398 "BatchImport.c"
-			CompletedImportObject* _tmp20_ = NULL;
-			MediaSource* _tmp21_ = NULL;
+#line 8835 "BatchImport.c"
+			CompletedImportObject* _tmp20_;
+			MediaSource* _tmp21_;
 #line 1122 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp20_ = completed;
 #line 1122 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp21_ = _tmp20_->source;
 #line 1122 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			library_photo_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp21_) : NULL);
-#line 9407 "BatchImport.c"
+#line 8844 "BatchImport.c"
 		} else {
-			CompletedImportObject* _tmp22_ = NULL;
-			MediaSource* _tmp23_ = NULL;
+			CompletedImportObject* _tmp22_;
+			MediaSource* _tmp23_;
 #line 1123 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp22_ = completed;
 #line 1123 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp23_ = _tmp22_->source;
 #line 1123 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_VIDEO)) {
-#line 9417 "BatchImport.c"
-				CompletedImportObject* _tmp24_ = NULL;
-				MediaSource* _tmp25_ = NULL;
+#line 8854 "BatchImport.c"
+				CompletedImportObject* _tmp24_;
+				MediaSource* _tmp25_;
 #line 1124 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp24_ = completed;
 #line 1124 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp25_ = _tmp24_->source;
 #line 1124 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				video_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, TYPE_VIDEO) ? ((Video*) _tmp25_) : NULL);
-#line 9426 "BatchImport.c"
+#line 8863 "BatchImport.c"
 			}
 		}
 #line 1126 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9439,17 +8876,17 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
 		batch_import_report_failure (self, _tmp27_);
 #line 1127 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
-#line 9437 "BatchImport.c"
+#line 8874 "BatchImport.c"
 	} else {
-		ImportManifest* _tmp28_ = NULL;
-		GeeList* _tmp29_ = NULL;
-		CompletedImportObject* _tmp30_ = NULL;
-		MediaSource* _tmp31_ = NULL;
-		ImportManifest* _tmp32_ = NULL;
-		CompletedImportObject* _tmp33_ = NULL;
-		BatchImportResult* _tmp34_ = NULL;
-		GeeList* _tmp35_ = NULL;
-		CompletedImportObject* _tmp36_ = NULL;
+		ImportManifest* _tmp28_;
+		GeeList* _tmp29_;
+		CompletedImportObject* _tmp30_;
+		MediaSource* _tmp31_;
+		ImportManifest* _tmp32_;
+		CompletedImportObject* _tmp33_;
+		BatchImportResult* _tmp34_;
+		GeeList* _tmp35_;
+		CompletedImportObject* _tmp36_;
 #line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp28_ = self->priv->manifest;
 #line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9474,7 +8911,7 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
 		_tmp36_ = completed;
 #line 1132 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), _tmp36_);
-#line 9472 "BatchImport.c"
+#line 8909 "BatchImport.c"
 	}
 #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_import_jobs (self);
@@ -9482,23 +8919,23 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
 	_completed_import_object_unref0 (completed);
 #line 1109 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (job);
-#line 9480 "BatchImport.c"
+#line 8917 "BatchImport.c"
 }
 
 
 static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, BackgroundJob* j) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	ThumbnailWriterJob* job = NULL;
-	BackgroundJob* _tmp1_ = NULL;
-	ThumbnailWriterJob* _tmp2_ = NULL;
+	BackgroundJob* _tmp1_;
+	ThumbnailWriterJob* _tmp2_;
 	CompletedImportObject* completed = NULL;
-	ThumbnailWriterJob* _tmp3_ = NULL;
-	CompletedImportObject* _tmp4_ = NULL;
-	CompletedImportObject* _tmp5_ = NULL;
-	CompletedImportObject* _tmp6_ = NULL;
-	MediaSource* _tmp7_ = NULL;
-	CompletedImportObject* _tmp14_ = NULL;
-	BatchImportResult* _tmp15_ = NULL;
+	ThumbnailWriterJob* _tmp3_;
+	CompletedImportObject* _tmp4_;
+	CompletedImportObject* _tmp5_;
+	CompletedImportObject* _tmp6_;
+	MediaSource* _tmp7_;
+	CompletedImportObject* _tmp14_;
+	BatchImportResult* _tmp15_;
 #line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9529,35 +8966,35 @@ static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, Backg
 	_tmp7_ = _tmp6_->source;
 #line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO)) {
-#line 9527 "BatchImport.c"
-		CompletedImportObject* _tmp8_ = NULL;
-		MediaSource* _tmp9_ = NULL;
+#line 8964 "BatchImport.c"
+		CompletedImportObject* _tmp8_;
+		MediaSource* _tmp9_;
 #line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = completed;
 #line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = _tmp8_->source;
 #line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		library_photo_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp9_) : NULL);
-#line 9536 "BatchImport.c"
+#line 8973 "BatchImport.c"
 	} else {
-		CompletedImportObject* _tmp10_ = NULL;
-		MediaSource* _tmp11_ = NULL;
+		CompletedImportObject* _tmp10_;
+		MediaSource* _tmp11_;
 #line 1148 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = completed;
 #line 1148 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = _tmp10_->source;
 #line 1148 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_VIDEO)) {
-#line 9546 "BatchImport.c"
-			CompletedImportObject* _tmp12_ = NULL;
-			MediaSource* _tmp13_ = NULL;
+#line 8983 "BatchImport.c"
+			CompletedImportObject* _tmp12_;
+			MediaSource* _tmp13_;
 #line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = completed;
 #line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp13_ = _tmp12_->source;
 #line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			video_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_VIDEO) ? ((Video*) _tmp13_) : NULL);
-#line 9555 "BatchImport.c"
+#line 8992 "BatchImport.c"
 		}
 	}
 #line 1151 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9574,43 +9011,43 @@ static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, Backg
 	_completed_import_object_unref0 (completed);
 #line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (job);
-#line 9572 "BatchImport.c"
+#line 9009 "BatchImport.c"
 }
 
 
 static void batch_import_flush_ready_sources (BatchImport* self) {
-	GeeList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	GeeList* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	GeeList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	GeeList* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
 	GeeArrayList* all = NULL;
-	GeeArrayList* _tmp8_ = NULL;
+	GeeArrayList* _tmp8_;
 	GeeArrayList* photos = NULL;
-	GeeArrayList* _tmp9_ = NULL;
+	GeeArrayList* _tmp9_;
 	GeeArrayList* videos = NULL;
-	GeeArrayList* _tmp10_ = NULL;
+	GeeArrayList* _tmp10_;
 	GeeHashMap* completion_list = NULL;
-	GeeHashMap* _tmp11_ = NULL;
-	MediaCollectionRegistry* _tmp41_ = NULL;
-	MediaCollectionRegistry* _tmp42_ = NULL;
-	EventSourceCollection* _tmp43_ = NULL;
-	TagSourceCollection* _tmp44_ = NULL;
-	LibraryPhotoSourceCollection* _tmp45_ = NULL;
-	GeeArrayList* _tmp46_ = NULL;
-	VideoSourceCollection* _tmp47_ = NULL;
-	GeeArrayList* _tmp48_ = NULL;
-	GeeArrayList* _tmp70_ = NULL;
-	BatchImportRoll* _tmp71_ = NULL;
-	ViewCollection* _tmp72_ = NULL;
-	TagSourceCollection* _tmp73_ = NULL;
-	EventSourceCollection* _tmp74_ = NULL;
-	MediaCollectionRegistry* _tmp75_ = NULL;
-	MediaCollectionRegistry* _tmp76_ = NULL;
-	GeeList* _tmp77_ = NULL;
+	GeeHashMap* _tmp11_;
+	MediaCollectionRegistry* _tmp41_;
+	MediaCollectionRegistry* _tmp42_;
+	EventSourceCollection* _tmp43_;
+	TagSourceCollection* _tmp44_;
+	LibraryPhotoSourceCollection* _tmp45_;
+	GeeArrayList* _tmp46_;
+	VideoSourceCollection* _tmp47_;
+	GeeArrayList* _tmp48_;
+	GeeArrayList* _tmp70_;
+	BatchImportRoll* _tmp71_;
+	ViewCollection* _tmp72_;
+	TagSourceCollection* _tmp73_;
+	EventSourceCollection* _tmp74_;
+	MediaCollectionRegistry* _tmp75_;
+	MediaCollectionRegistry* _tmp76_;
+	GeeList* _tmp77_;
 	GError * _inner_error_ = NULL;
 #line 1161 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
@@ -9624,7 +9061,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 	if (_tmp2_ == 0) {
 #line 1163 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return;
-#line 9622 "BatchImport.c"
+#line 9059 "BatchImport.c"
 	}
 #line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = self->priv->ready_sources;
@@ -9656,15 +9093,15 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 	_tmp11_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1173 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	completion_list = _tmp11_;
-#line 9654 "BatchImport.c"
+#line 9091 "BatchImport.c"
 	{
 		GeeList* _completed_list = NULL;
-		GeeList* _tmp12_ = NULL;
-		GeeList* _tmp13_ = NULL;
+		GeeList* _tmp12_;
+		GeeList* _tmp13_;
 		gint _completed_size = 0;
-		GeeList* _tmp14_ = NULL;
-		gint _tmp15_ = 0;
-		gint _tmp16_ = 0;
+		GeeList* _tmp14_;
+		gint _tmp15_;
+		gint _tmp16_;
 		gint _completed_index = 0;
 #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp12_ = self->priv->ready_sources;
@@ -9684,24 +9121,24 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 		_completed_index = -1;
 #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 9682 "BatchImport.c"
-			gint _tmp17_ = 0;
-			gint _tmp18_ = 0;
-			gint _tmp19_ = 0;
+#line 9119 "BatchImport.c"
+			gint _tmp17_;
+			gint _tmp18_;
+			gint _tmp19_;
 			CompletedImportObject* completed = NULL;
-			GeeList* _tmp20_ = NULL;
-			gint _tmp21_ = 0;
-			gpointer _tmp22_ = NULL;
-			GeeArrayList* _tmp23_ = NULL;
-			CompletedImportObject* _tmp24_ = NULL;
-			MediaSource* _tmp25_ = NULL;
-			CompletedImportObject* _tmp26_ = NULL;
-			MediaSource* _tmp27_ = NULL;
-			GeeHashMap* _tmp36_ = NULL;
-			CompletedImportObject* _tmp37_ = NULL;
-			MediaSource* _tmp38_ = NULL;
-			CompletedImportObject* _tmp39_ = NULL;
-			BatchImportJob* _tmp40_ = NULL;
+			GeeList* _tmp20_;
+			gint _tmp21_;
+			gpointer _tmp22_;
+			GeeArrayList* _tmp23_;
+			CompletedImportObject* _tmp24_;
+			MediaSource* _tmp25_;
+			CompletedImportObject* _tmp26_;
+			MediaSource* _tmp27_;
+			GeeHashMap* _tmp36_;
+			CompletedImportObject* _tmp37_;
+			MediaSource* _tmp38_;
+			CompletedImportObject* _tmp39_;
+			BatchImportJob* _tmp40_;
 #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp17_ = _completed_index;
 #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9714,7 +9151,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 			if (!(_tmp18_ < _tmp19_)) {
 #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 9712 "BatchImport.c"
+#line 9149 "BatchImport.c"
 			}
 #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp20_ = _completed_list;
@@ -9738,10 +9175,10 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 			_tmp27_ = _tmp26_->source;
 #line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_LIBRARY_PHOTO)) {
-#line 9736 "BatchImport.c"
-				GeeArrayList* _tmp28_ = NULL;
-				CompletedImportObject* _tmp29_ = NULL;
-				MediaSource* _tmp30_ = NULL;
+#line 9173 "BatchImport.c"
+				GeeArrayList* _tmp28_;
+				CompletedImportObject* _tmp29_;
+				MediaSource* _tmp30_;
 #line 1179 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp28_ = photos;
 #line 1179 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9750,20 +9187,20 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 				_tmp30_ = _tmp29_->source;
 #line 1179 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 9748 "BatchImport.c"
+#line 9185 "BatchImport.c"
 			} else {
-				CompletedImportObject* _tmp31_ = NULL;
-				MediaSource* _tmp32_ = NULL;
+				CompletedImportObject* _tmp31_;
+				MediaSource* _tmp32_;
 #line 1180 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp31_ = completed;
 #line 1180 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp32_ = _tmp31_->source;
 #line 1180 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, TYPE_VIDEO)) {
-#line 9758 "BatchImport.c"
-					GeeArrayList* _tmp33_ = NULL;
-					CompletedImportObject* _tmp34_ = NULL;
-					MediaSource* _tmp35_ = NULL;
+#line 9195 "BatchImport.c"
+					GeeArrayList* _tmp33_;
+					CompletedImportObject* _tmp34_;
+					MediaSource* _tmp35_;
 #line 1181 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp33_ = videos;
 #line 1181 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9772,7 +9209,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 					_tmp35_ = _tmp34_->source;
 #line 1181 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_VIDEO, Video));
-#line 9770 "BatchImport.c"
+#line 9207 "BatchImport.c"
 				}
 			}
 #line 1183 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9789,11 +9226,11 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp38_, _tmp40_);
 #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_completed_import_object_unref0 (completed);
-#line 9787 "BatchImport.c"
+#line 9224 "BatchImport.c"
 		}
 #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_completed_list);
-#line 9791 "BatchImport.c"
+#line 9228 "BatchImport.c"
 	}
 #line 1186 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp41_ = media_collection_registry_get_instance ();
@@ -9823,15 +9260,15 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 	_tmp48_ = videos;
 #line 1191 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	media_source_collection_import_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 9821 "BatchImport.c"
+#line 9258 "BatchImport.c"
 	{
 		GeeIterator* _media_it = NULL;
-		GeeHashMap* _tmp49_ = NULL;
-		GeeSet* _tmp50_ = NULL;
-		GeeSet* _tmp51_ = NULL;
-		GeeSet* _tmp52_ = NULL;
-		GeeIterator* _tmp53_ = NULL;
-		GeeIterator* _tmp54_ = NULL;
+		GeeHashMap* _tmp49_;
+		GeeSet* _tmp50_;
+		GeeSet* _tmp51_;
+		GeeSet* _tmp52_;
+		GeeIterator* _tmp53_;
+		GeeIterator* _tmp54_;
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp49_ = completion_list;
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9850,12 +9287,12 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 		_media_it = _tmp54_;
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 9848 "BatchImport.c"
-			GeeIterator* _tmp55_ = NULL;
-			gboolean _tmp56_ = FALSE;
+#line 9285 "BatchImport.c"
+			GeeIterator* _tmp55_;
+			gboolean _tmp56_;
 			MediaSource* media = NULL;
-			GeeIterator* _tmp57_ = NULL;
-			gpointer _tmp58_ = NULL;
+			GeeIterator* _tmp57_;
+			gpointer _tmp58_;
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp55_ = _media_it;
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9864,7 +9301,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 			if (!_tmp56_) {
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 9862 "BatchImport.c"
+#line 9299 "BatchImport.c"
 			}
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp57_ = _media_it;
@@ -9872,14 +9309,14 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 			_tmp58_ = gee_iterator_get (_tmp57_);
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			media = (MediaSource*) _tmp58_;
-#line 9870 "BatchImport.c"
+#line 9307 "BatchImport.c"
 			{
-				GeeHashMap* _tmp59_ = NULL;
-				MediaSource* _tmp60_ = NULL;
-				gpointer _tmp61_ = NULL;
-				BatchImportJob* _tmp62_ = NULL;
-				MediaSource* _tmp63_ = NULL;
-				BatchImportRoll* _tmp64_ = NULL;
+				GeeHashMap* _tmp59_;
+				MediaSource* _tmp60_;
+				gpointer _tmp61_;
+				BatchImportJob* _tmp62_;
+				MediaSource* _tmp63_;
+				BatchImportRoll* _tmp64_;
 #line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp59_ = completion_list;
 #line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9898,19 +9335,19 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 				_batch_import_job_unref0 (_tmp62_);
 #line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9896 "BatchImport.c"
-					goto __catch412_g_error;
+#line 9333 "BatchImport.c"
+					goto __catch413_g_error;
 				}
 			}
-			goto __finally412;
-			__catch412_g_error:
+			goto __finally413;
+			__catch413_g_error:
 			{
 				GError* err = NULL;
-				MediaSource* _tmp65_ = NULL;
-				gchar* _tmp66_ = NULL;
-				gchar* _tmp67_ = NULL;
-				GError* _tmp68_ = NULL;
-				const gchar* _tmp69_ = NULL;
+				MediaSource* _tmp65_;
+				gchar* _tmp66_;
+				gchar* _tmp67_;
+				GError* _tmp68_;
+				const gchar* _tmp69_;
 #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				err = _inner_error_;
 #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9932,9 +9369,9 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 				_g_free0 (_tmp67_);
 #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_error_free0 (err);
-#line 9929 "BatchImport.c"
+#line 9366 "BatchImport.c"
 			}
-			__finally412:
+			__finally413:
 #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9955,15 +9392,15 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 				g_clear_error (&_inner_error_);
 #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 9952 "BatchImport.c"
+#line 9389 "BatchImport.c"
 			}
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (media);
-#line 9956 "BatchImport.c"
+#line 9393 "BatchImport.c"
 		}
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_media_it);
-#line 9960 "BatchImport.c"
+#line 9397 "BatchImport.c"
 	}
 #line 1204 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp70_ = all;
@@ -10001,29 +9438,29 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 	_g_object_unref0 (photos);
 #line 1161 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (all);
-#line 9998 "BatchImport.c"
+#line 9435 "BatchImport.c"
 }
 
 
 static gboolean batch_import_display_imported_timer (BatchImport* self) {
 	gboolean result = FALSE;
-	GeeList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	GCancellable* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	GeeList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	GCancellable* _tmp4_;
+	gboolean _tmp5_;
 	gint total = 0;
-	GCancellable* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	gint _tmp18_ = 0;
-	GeeList* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	gint _tmp22_ = 0;
-	gboolean _tmp40_ = FALSE;
-	GeeList* _tmp41_ = NULL;
-	gint _tmp42_ = 0;
-	gint _tmp43_ = 0;
+	GCancellable* _tmp9_;
+	gboolean _tmp10_;
+	gint _tmp18_;
+	GeeList* _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
+	gint _tmp22_;
+	gboolean _tmp47_ = FALSE;
+	GeeList* _tmp48_;
+	gint _tmp49_;
+	gint _tmp50_;
 #line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE);
 #line 1216 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10034,15 +9471,15 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 	_tmp2_ = _tmp1_;
 #line 1216 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp2_ == 0) {
-#line 10031 "BatchImport.c"
-		gboolean _tmp3_ = FALSE;
+#line 9468 "BatchImport.c"
+		gboolean _tmp3_;
 #line 1217 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = self->priv->completed;
 #line 1217 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = !_tmp3_;
 #line 1217 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 10039 "BatchImport.c"
+#line 9476 "BatchImport.c"
 	}
 #line 1219 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = self->priv->cancellable;
@@ -10050,10 +9487,10 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 	_tmp5_ = g_cancellable_is_cancelled (_tmp4_);
 #line 1219 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp5_) {
-#line 10047 "BatchImport.c"
-		GeeList* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
+#line 9484 "BatchImport.c"
+		GeeList* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
 #line 1220 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = self->priv->display_imported_queue;
 #line 1220 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10062,7 +9499,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 		_tmp8_ = _tmp7_;
 #line 1220 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_debug ("BatchImport.vala:1220: Importing %d photos at once", _tmp8_);
-#line 10059 "BatchImport.c"
+#line 9496 "BatchImport.c"
 	}
 #line 1222 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, "display_imported_timer");
@@ -10074,10 +9511,10 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 	_tmp10_ = g_cancellable_is_cancelled (_tmp9_);
 #line 1233 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!_tmp10_) {
-#line 10071 "BatchImport.c"
-		GeeList* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
+#line 9508 "BatchImport.c"
+		GeeList* _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
 #line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = self->priv->display_imported_queue;
 #line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10086,11 +9523,11 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 		_tmp13_ = _tmp12_;
 #line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp13_ > BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW) {
-#line 10083 "BatchImport.c"
-			GeeList* _tmp14_ = NULL;
-			gint _tmp15_ = 0;
-			gint _tmp16_ = 0;
-			gint _tmp17_ = 0;
+#line 9520 "BatchImport.c"
+			GeeList* _tmp14_;
+			gint _tmp15_;
+			gint _tmp16_;
+			gint _tmp17_;
 #line 1235 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = self->priv->display_imported_queue;
 #line 1235 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10101,12 +9538,12 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 			_tmp17_ = CLAMP ((_tmp16_ / BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW) + 2, 0, 16);
 #line 1235 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			total = 1 << _tmp17_;
-#line 10098 "BatchImport.c"
+#line 9535 "BatchImport.c"
 		}
 	} else {
 #line 1239 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		total = BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW;
-#line 10103 "BatchImport.c"
+#line 9540 "BatchImport.c"
 	}
 #line 1242 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp18_ = total;
@@ -10122,26 +9559,25 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 	total = _tmp22_;
 #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	while (TRUE) {
-#line 10119 "BatchImport.c"
-		gint _tmp23_ = 0;
+#line 9556 "BatchImport.c"
+		gint _tmp23_;
 		CompletedImportObject* completed_object = NULL;
-		GeeList* _tmp24_ = NULL;
-		gpointer _tmp25_ = NULL;
+		GeeList* _tmp24_;
+		gpointer _tmp25_;
 		GdkPixbuf* user_preview = NULL;
-		CompletedImportObject* _tmp26_ = NULL;
-		GdkPixbuf* _tmp27_ = NULL;
-		GdkPixbuf* _tmp28_ = NULL;
-		CompletedImportObject* _tmp29_ = NULL;
-		CompletedImportObject* _tmp30_ = NULL;
-		GeeList* _tmp31_ = NULL;
-		CompletedImportObject* _tmp32_ = NULL;
-		CompletedImportObject* _tmp33_ = NULL;
-		MediaSource* _tmp34_ = NULL;
-		GdkPixbuf* _tmp35_ = NULL;
-		gint _tmp36_ = 0;
-		CompletedImportObject* _tmp37_ = NULL;
-		MediaSource* _tmp38_ = NULL;
-		guint64 _tmp39_ = 0ULL;
+		CompletedImportObject* _tmp26_;
+		GdkPixbuf* _tmp27_;
+		GdkPixbuf* _tmp28_;
+		CompletedImportObject* _tmp29_;
+		CompletedImportObject* _tmp30_;
+		GeeList* _tmp31_;
+		CompletedImportObject* _tmp32_;
+		CompletedImportObject* _tmp33_;
+		MediaSource* _tmp34_;
+		GdkPixbuf* _tmp35_;
+		gint _tmp36_;
+		CompletedImportObject* _tmp37_;
+		MediaSource* _tmp38_;
 #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp23_ = total;
 #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10150,7 +9586,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 		if (!(_tmp23_ > 0)) {
 #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 10147 "BatchImport.c"
+#line 9583 "BatchImport.c"
 		}
 #line 1253 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp24_ = self->priv->display_imported_queue;
@@ -10193,56 +9629,92 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 #line 1267 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp36_ = total;
 #line 1267 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_signal_emit_by_name (self, "imported", _tmp34_, _tmp35_, _tmp36_);
-#line 1268 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORTED_SIGNAL], 0, _tmp34_, _tmp35_, _tmp36_);
+#line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp37_ = completed_object;
-#line 1268 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp38_ = _tmp37_->source;
-#line 1268 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp39_ = media_source_get_filesize (_tmp38_);
-#line 1268 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		batch_import_report_progress (self, _tmp39_);
-#line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp38_, TYPE_PHOTO_SOURCE)) {
+#line 9633 "BatchImport.c"
+			PhotoSource* photo_source = NULL;
+			CompletedImportObject* _tmp39_;
+			MediaSource* _tmp40_;
+			PhotoSource* _tmp41_;
+			PhotoSource* _tmp42_;
+			guint64 _tmp43_;
+#line 1271 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp39_ = completed_object;
+#line 1271 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp40_ = _tmp39_->source;
+#line 1271 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, TYPE_PHOTO_SOURCE) ? ((PhotoSource*) _tmp40_) : NULL);
+#line 1271 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			photo_source = _tmp41_;
+#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp42_ = photo_source;
+#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp43_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_MEDIA_SOURCE, MediaSource));
+#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			batch_import_report_progress (self, _tmp43_);
+#line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_g_object_unref0 (photo_source);
+#line 9656 "BatchImport.c"
+		} else {
+			CompletedImportObject* _tmp44_;
+			MediaSource* _tmp45_;
+			guint64 _tmp46_;
+#line 1274 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp44_ = completed_object;
+#line 1274 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp45_ = _tmp44_->source;
+#line 1274 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp46_ = media_source_get_filesize (_tmp45_);
+#line 1274 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			batch_import_report_progress (self, _tmp46_);
+#line 9669 "BatchImport.c"
+		}
+#line 1276 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
 #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (user_preview);
 #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_completed_import_object_unref0 (completed_object);
-#line 10205 "BatchImport.c"
+#line 9677 "BatchImport.c"
 	}
-#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp41_ = self->priv->ready_sources;
-#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp42_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp43_ = _tmp42_;
-#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp43_ >= BATCH_IMPORT_READY_SOURCES_COUNT_OVERFLOW) {
-#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp40_ = TRUE;
-#line 10217 "BatchImport.c"
+#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp48_ = self->priv->ready_sources;
+#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp49_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp50_ = _tmp49_;
+#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	if (_tmp50_ >= BATCH_IMPORT_READY_SOURCES_COUNT_OVERFLOW) {
+#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp47_ = TRUE;
+#line 9689 "BatchImport.c"
 	} else {
-		GCancellable* _tmp44_ = NULL;
-		gboolean _tmp45_ = FALSE;
-#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp44_ = self->priv->cancellable;
-#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp45_ = g_cancellable_is_cancelled (_tmp44_);
-#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp40_ = _tmp45_;
-#line 10227 "BatchImport.c"
+		GCancellable* _tmp51_;
+		gboolean _tmp52_;
+#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp51_ = self->priv->cancellable;
+#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp52_ = g_cancellable_is_cancelled (_tmp51_);
+#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp47_ = _tmp52_;
+#line 9699 "BatchImport.c"
 	}
-#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp40_) {
-#line 1273 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	if (_tmp47_) {
+#line 1280 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_flush_ready_sources (self);
-#line 10233 "BatchImport.c"
+#line 9705 "BatchImport.c"
 	}
-#line 1275 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1282 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = TRUE;
-#line 1275 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1282 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10239 "BatchImport.c"
+#line 9711 "BatchImport.c"
 }
 
 
@@ -10261,19 +9733,19 @@ static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GVa
 		data1 = closure->data;
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 10258 "BatchImport.c"
+#line 9730 "BatchImport.c"
 	} else {
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = closure->data;
-#line 10264 "BatchImport.c"
+#line 9736 "BatchImport.c"
 	}
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback = (GMarshalFunc_VOID__UINT64_UINT64) (marshal_data ? marshal_data : cc->callback);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback (data1, g_value_get_uint64 (param_values + 1), g_value_get_uint64 (param_values + 2), data2);
-#line 10270 "BatchImport.c"
+#line 9742 "BatchImport.c"
 }
 
 
@@ -10292,19 +9764,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT (GClosure * closure,
 		data1 = closure->data;
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 10289 "BatchImport.c"
+#line 9761 "BatchImport.c"
 	} else {
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = closure->data;
-#line 10295 "BatchImport.c"
+#line 9767 "BatchImport.c"
 	}
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT_INT) (marshal_data ? marshal_data : cc->callback);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_int (param_values + 3), data2);
-#line 10301 "BatchImport.c"
+#line 9773 "BatchImport.c"
 }
 
 
@@ -10323,19 +9795,19 @@ static void g_cclosure_user_marshal_VOID__ENUM_STRING (GClosure * closure, GValu
 		data1 = closure->data;
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 10320 "BatchImport.c"
+#line 9792 "BatchImport.c"
 	} else {
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = closure->data;
-#line 10326 "BatchImport.c"
+#line 9798 "BatchImport.c"
 	}
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback = (GMarshalFunc_VOID__ENUM_STRING) (marshal_data ? marshal_data : cc->callback);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback (data1, g_value_get_enum (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 10332 "BatchImport.c"
+#line 9804 "BatchImport.c"
 }
 
 
@@ -10354,19 +9826,19 @@ static void g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT (GClosure * closur
 		data1 = closure->data;
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 10351 "BatchImport.c"
+#line 9823 "BatchImport.c"
 	} else {
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = closure->data;
-#line 10357 "BatchImport.c"
+#line 9829 "BatchImport.c"
 	}
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback = (GMarshalFunc_VOID__BATCH_IMPORT_RESULT) (marshal_data ? marshal_data : cc->callback);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback (data1, value_get_batch_import_result (param_values + 1), data2);
-#line 10363 "BatchImport.c"
+#line 9835 "BatchImport.c"
 }
 
 
@@ -10385,26 +9857,26 @@ static void g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL (GCl
 		data1 = closure->data;
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 10382 "BatchImport.c"
+#line 9854 "BatchImport.c"
 	} else {
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = closure->data;
-#line 10388 "BatchImport.c"
+#line 9860 "BatchImport.c"
 	}
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback = (GMarshalFunc_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL) (marshal_data ? marshal_data : cc->callback);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback (data1, value_get_import_manifest (param_values + 1), value_get_batch_import_roll (param_values + 2), data2);
-#line 10394 "BatchImport.c"
+#line 9866 "BatchImport.c"
 }
 
 
 static void batch_import_class_init (BatchImportClass * klass) {
-	Workers* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	Workers* _tmp2_ = NULL;
+	Workers* _tmp0_;
+	guint _tmp1_;
+	Workers* _tmp2_;
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_parent_class = g_type_class_peek_parent (klass);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10412,19 +9884,19 @@ static void batch_import_class_init (BatchImportClass * klass) {
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_OBJECT_CLASS (klass)->finalize = batch_import_finalize;
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_signal_new ("starting", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	batch_import_signals[BATCH_IMPORT_STARTING_SIGNAL] = g_signal_new ("starting", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_signal_new ("preparing", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	batch_import_signals[BATCH_IMPORT_PREPARING_SIGNAL] = g_signal_new ("preparing", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_signal_new ("progress", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT64_UINT64, G_TYPE_NONE, 2, G_TYPE_UINT64, G_TYPE_UINT64);
+	batch_import_signals[BATCH_IMPORT_PROGRESS_SIGNAL] = g_signal_new ("progress", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT64_UINT64, G_TYPE_NONE, 2, G_TYPE_UINT64, G_TYPE_UINT64);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_signal_new ("imported", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, gdk_pixbuf_get_type (), G_TYPE_INT);
+	batch_import_signals[BATCH_IMPORT_IMPORTED_SIGNAL] = g_signal_new ("imported", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, gdk_pixbuf_get_type (), G_TYPE_INT);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_signal_new ("fatal_error", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__ENUM_STRING, G_TYPE_NONE, 2, TYPE_IMPORT_RESULT, G_TYPE_STRING);
+	batch_import_signals[BATCH_IMPORT_FATAL_ERROR_SIGNAL] = g_signal_new ("fatal-error", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__ENUM_STRING, G_TYPE_NONE, 2, TYPE_IMPORT_RESULT, G_TYPE_STRING);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_signal_new ("import_job_failed", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT_RESULT);
+	batch_import_signals[BATCH_IMPORT_IMPORT_JOB_FAILED_SIGNAL] = g_signal_new ("import-job-failed", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT_RESULT);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_signal_new ("import_complete", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL, G_TYPE_NONE, 2, TYPE_IMPORT_MANIFEST, TYPE_BATCH_IMPORT_ROLL);
+	batch_import_signals[BATCH_IMPORT_IMPORT_COMPLETE_SIGNAL] = g_signal_new ("import-complete", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL, G_TYPE_NONE, 2, TYPE_IMPORT_MANIFEST, TYPE_BATCH_IMPORT_ROLL);
 #line 413 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = workers_new ((guint) 1, FALSE);
 #line 413 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10435,17 +9907,17 @@ static void batch_import_class_init (BatchImportClass * klass) {
 	_tmp2_ = workers_new (_tmp1_, FALSE);
 #line 414 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_import_workers = _tmp2_;
-#line 10432 "BatchImport.c"
+#line 9904 "BatchImport.c"
 }
 
 
 static void batch_import_instance_init (BatchImport * self) {
-	GeeHashMap* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	GeeLinkedList* _tmp2_ = NULL;
-	GeeLinkedList* _tmp3_ = NULL;
-	GeeLinkedList* _tmp4_ = NULL;
-	GeeLinkedList* _tmp5_ = NULL;
+	GeeHashMap* _tmp0_;
+	guint _tmp1_;
+	GeeLinkedList* _tmp2_;
+	GeeLinkedList* _tmp3_;
+	GeeLinkedList* _tmp4_;
+	GeeLinkedList* _tmp5_;
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = BATCH_IMPORT_GET_PRIVATE (self);
 #line 419 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10494,15 +9966,15 @@ static void batch_import_instance_init (BatchImport * self) {
 	_tmp5_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL);
 #line 445 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->ready_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList);
-#line 10491 "BatchImport.c"
+#line 9963 "BatchImport.c"
 }
 
 
-static void batch_import_finalize (GObject* obj) {
+static void batch_import_finalize (GObject * obj) {
 	BatchImport * self;
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
+	Application* _tmp0_;
+	Application* _tmp1_;
+	guint _tmp2_;
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT, BatchImport);
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10539,7 +10011,7 @@ static void batch_import_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->ready_sources);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_OBJECT_CLASS (batch_import_parent_class)->finalize (obj);
-#line 10536 "BatchImport.c"
+#line 10008 "BatchImport.c"
 }
 
 
@@ -10557,256 +10029,256 @@ GType batch_import_get_type (void) {
 
 static DuplicatedFile* duplicated_file_construct (GType object_type) {
 	DuplicatedFile * self = NULL;
-#line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (DuplicatedFile*) g_object_new (object_type, NULL);
-#line 1285 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_video_id_free0 (self->priv->video_id);
-#line 1285 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->video_id = NULL;
-#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1293 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_photo_id_free0 (self->priv->photo_id);
-#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1293 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->photo_id = NULL;
-#line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->file);
-#line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->file = NULL;
-#line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 10570 "BatchImport.c"
+#line 10042 "BatchImport.c"
 }
 
 
 static DuplicatedFile* duplicated_file_new (void) {
-#line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return duplicated_file_construct (TYPE_DUPLICATED_FILE);
-#line 10577 "BatchImport.c"
+#line 10049 "BatchImport.c"
 }
 
 
 static gpointer _photo_id_dup0 (gpointer self) {
-#line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? photo_id_dup (self) : NULL;
-#line 10584 "BatchImport.c"
+#line 10056 "BatchImport.c"
 }
 
 
 DuplicatedFile* duplicated_file_create_from_photo_id (PhotoID* photo_id) {
 	DuplicatedFile* result = NULL;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	DuplicatedFile* _result_ = NULL;
-	DuplicatedFile* _tmp1_ = NULL;
-	PhotoID _tmp2_ = {0};
-	PhotoID* _tmp3_ = NULL;
-#line 1290 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	DuplicatedFile* _tmp1_;
+	PhotoID _tmp2_;
+	PhotoID* _tmp3_;
+#line 1297 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (photo_id != NULL, NULL);
-#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1298 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = photo_id_is_valid (photo_id);
-#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1298 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (_tmp0_, "photo_id.is_valid()");
-#line 1293 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1300 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = duplicated_file_new ();
-#line 1293 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1300 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_result_ = _tmp1_;
-#line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = *photo_id;
-#line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = _photo_id_dup0 (&_tmp2_);
-#line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_photo_id_free0 (_result_->priv->photo_id);
-#line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_result_->priv->photo_id = _tmp3_;
-#line 1295 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _result_;
-#line 1295 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10617 "BatchImport.c"
+#line 10089 "BatchImport.c"
 }
 
 
 static gpointer _video_id_dup0 (gpointer self) {
-#line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? video_id_dup (self) : NULL;
-#line 10624 "BatchImport.c"
+#line 10096 "BatchImport.c"
 }
 
 
 DuplicatedFile* duplicated_file_create_from_video_id (VideoID* video_id) {
 	DuplicatedFile* result = NULL;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	DuplicatedFile* _result_ = NULL;
-	DuplicatedFile* _tmp1_ = NULL;
-	VideoID _tmp2_ = {0};
-	VideoID* _tmp3_ = NULL;
-#line 1298 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	DuplicatedFile* _tmp1_;
+	VideoID _tmp2_;
+	VideoID* _tmp3_;
+#line 1305 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (video_id != NULL, NULL);
-#line 1299 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1306 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = video_id_is_valid (video_id);
-#line 1299 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1306 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (_tmp0_, "video_id.is_valid()");
-#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = duplicated_file_new ();
-#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_result_ = _tmp1_;
-#line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = *video_id;
-#line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = _video_id_dup0 (&_tmp2_);
-#line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_video_id_free0 (_result_->priv->video_id);
-#line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_result_->priv->video_id = _tmp3_;
-#line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1310 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _result_;
-#line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1310 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10657 "BatchImport.c"
+#line 10129 "BatchImport.c"
 }
 
 
 DuplicatedFile* duplicated_file_create_from_file (GFile* file) {
 	DuplicatedFile* result = NULL;
 	DuplicatedFile* _result_ = NULL;
-	DuplicatedFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-#line 1306 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	DuplicatedFile* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+#line 1313 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 1307 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1314 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = duplicated_file_new ();
-#line 1307 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1314 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_result_ = _tmp0_;
-#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = file;
-#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (_result_->priv->file);
-#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_result_->priv->file = _tmp2_;
-#line 1311 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _result_;
-#line 1311 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10685 "BatchImport.c"
+#line 10157 "BatchImport.c"
 }
 
 
 GFile* duplicated_file_get_file (DuplicatedFile* self) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-#line 1314 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	GFile* _tmp0_;
+#line 1321 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_DUPLICATED_FILE (self), NULL);
-#line 1315 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->file;
-#line 1315 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_ != NULL) {
-#line 10698 "BatchImport.c"
-		GFile* _tmp1_ = NULL;
-		GFile* _tmp2_ = NULL;
-#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 10170 "BatchImport.c"
+		GFile* _tmp1_;
+		GFile* _tmp2_;
+#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = self->priv->file;
-#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = _tmp2_;
-#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 10709 "BatchImport.c"
+#line 10181 "BatchImport.c"
 	} else {
-		PhotoID* _tmp3_ = NULL;
-#line 1317 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		PhotoID* _tmp3_;
+#line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = self->priv->photo_id;
-#line 1317 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp3_ != NULL) {
-#line 10716 "BatchImport.c"
+#line 10188 "BatchImport.c"
 			Photo* photo_object = NULL;
-			LibraryPhotoSourceCollection* _tmp4_ = NULL;
-			PhotoID* _tmp5_ = NULL;
-			PhotoID _tmp6_ = {0};
-			LibraryPhoto* _tmp7_ = NULL;
-			Photo* _tmp8_ = NULL;
-			GFile* _tmp9_ = NULL;
-			GFile* _tmp10_ = NULL;
-			GFile* _tmp11_ = NULL;
-#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			LibraryPhotoSourceCollection* _tmp4_;
+			PhotoID* _tmp5_;
+			PhotoID _tmp6_;
+			LibraryPhoto* _tmp7_;
+			Photo* _tmp8_;
+			GFile* _tmp9_;
+			GFile* _tmp10_;
+			GFile* _tmp11_;
+#line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp4_ = library_photo_global;
-#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = self->priv->photo_id;
-#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp6_ = *_tmp5_;
-#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp7_ = library_photo_source_collection_fetch (_tmp4_, &_tmp6_);
-#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			photo_object = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO, Photo);
-#line 1319 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp8_ = photo_object;
-#line 1319 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp9_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1319 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (self->priv->file);
-#line 1319 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			self->priv->file = _tmp9_;
-#line 1320 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp10_ = self->priv->file;
-#line 1320 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 1320 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = _tmp11_;
-#line 1320 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (photo_object);
-#line 1320 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 10754 "BatchImport.c"
+#line 10226 "BatchImport.c"
 		} else {
-			VideoID* _tmp12_ = NULL;
-#line 1321 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			VideoID* _tmp12_;
+#line 1328 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = self->priv->video_id;
-#line 1321 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1328 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp12_ != NULL) {
-#line 10761 "BatchImport.c"
+#line 10233 "BatchImport.c"
 				Video* video_object = NULL;
-				VideoSourceCollection* _tmp13_ = NULL;
-				VideoID* _tmp14_ = NULL;
-				VideoID _tmp15_ = {0};
-				Video* _tmp16_ = NULL;
-				Video* _tmp17_ = NULL;
-				GFile* _tmp18_ = NULL;
-				GFile* _tmp19_ = NULL;
-				GFile* _tmp20_ = NULL;
-#line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				VideoSourceCollection* _tmp13_;
+				VideoID* _tmp14_;
+				VideoID _tmp15_;
+				Video* _tmp16_;
+				Video* _tmp17_;
+				GFile* _tmp18_;
+				GFile* _tmp19_;
+				GFile* _tmp20_;
+#line 1329 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp13_ = video_global;
-#line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1329 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp14_ = self->priv->video_id;
-#line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1329 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp15_ = *_tmp14_;
-#line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1329 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp16_ = video_source_collection_fetch (_tmp13_, &_tmp15_);
-#line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1329 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				video_object = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_VIDEO, Video);
-#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1330 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp17_ = video_object;
-#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1330 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp18_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1330 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (self->priv->file);
-#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1330 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				self->priv->file = _tmp18_;
-#line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp19_ = self->priv->file;
-#line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				result = _tmp20_;
-#line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (video_object);
-#line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return result;
-#line 10799 "BatchImport.c"
+#line 10271 "BatchImport.c"
 			} else {
-#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1333 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_assert_not_reached ();
-#line 10803 "BatchImport.c"
+#line 10275 "BatchImport.c"
 			}
 		}
 	}
@@ -10814,36 +10286,36 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) {
 
 
 static void duplicated_file_class_init (DuplicatedFileClass * klass) {
-#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	duplicated_file_parent_class = g_type_class_peek_parent (klass);
-#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_type_class_add_private (klass, sizeof (DuplicatedFilePrivate));
-#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_OBJECT_CLASS (klass)->finalize = duplicated_file_finalize;
-#line 10817 "BatchImport.c"
+#line 10289 "BatchImport.c"
 }
 
 
 static void duplicated_file_instance_init (DuplicatedFile * self) {
-#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = DUPLICATED_FILE_GET_PRIVATE (self);
-#line 10824 "BatchImport.c"
+#line 10296 "BatchImport.c"
 }
 
 
-static void duplicated_file_finalize (GObject* obj) {
+static void duplicated_file_finalize (GObject * obj) {
 	DuplicatedFile * self;
-#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DUPLICATED_FILE, DuplicatedFile);
-#line 1280 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_video_id_free0 (self->priv->video_id);
-#line 1281 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1288 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_photo_id_free0 (self->priv->photo_id);
-#line 1282 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1289 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->file);
-#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_OBJECT_CLASS (duplicated_file_parent_class)->finalize (obj);
-#line 10840 "BatchImport.c"
+#line 10312 "BatchImport.c"
 }
 
 
@@ -10861,302 +10333,302 @@ GType duplicated_file_get_type (void) {
 
 BackgroundImportJob* background_import_job_construct (GType object_type, BatchImport* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) {
 	BackgroundImportJob* self = NULL;
-	BatchImport* _tmp0_ = NULL;
-	CompletionCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	GCancellable* _tmp2_ = NULL;
-	CancellationCallback _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
-#line 1353 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	BatchImport* _tmp0_;
+	CompletionCallback _tmp1_;
+	void* _tmp1__target;
+	GCancellable* _tmp2_;
+	CancellationCallback _tmp3_;
+	void* _tmp3__target;
+#line 1360 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL);
-#line 1353 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1360 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 1355 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = owner;
-#line 1355 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = callback;
-#line 1355 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1__target = callback_target;
-#line 1355 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = cancellable;
-#line 1355 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = cancellation;
-#line 1355 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3__target = cancellation_target;
-#line 1355 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (BackgroundImportJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target, NULL);
-#line 1353 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1360 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 10884 "BatchImport.c"
+#line 10356 "BatchImport.c"
 }
 
 
 ImportResult background_import_job_abort_check (BackgroundImportJob* self) {
 	ImportResult result = 0;
 	gboolean _tmp0_ = FALSE;
-	ImportResult _tmp1_ = 0;
-	ImportResult _tmp3_ = 0;
-#line 1360 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	ImportResult _tmp1_;
+	ImportResult _tmp3_;
+#line 1367 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BACKGROUND_IMPORT_JOB (self), 0);
-#line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = self->abort_flag;
-#line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ == IMPORT_RESULT_SUCCESS) {
-#line 10899 "BatchImport.c"
-		gboolean _tmp2_ = FALSE;
-#line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 10371 "BatchImport.c"
+		gboolean _tmp2_;
+#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp2_;
-#line 10905 "BatchImport.c"
+#line 10377 "BatchImport.c"
 	} else {
-#line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = FALSE;
-#line 10909 "BatchImport.c"
+#line 10381 "BatchImport.c"
 	}
-#line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_) {
-#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1369 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->abort_flag = IMPORT_RESULT_USER_ABORT;
-#line 10915 "BatchImport.c"
+#line 10387 "BatchImport.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1371 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = self->abort_flag;
-#line 1364 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1371 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp3_;
-#line 1364 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1371 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10923 "BatchImport.c"
+#line 10395 "BatchImport.c"
 }
 
 
 void background_import_job_abort (BackgroundImportJob* self, ImportResult _result_) {
-	ImportResult _tmp0_ = 0;
-#line 1367 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	ImportResult _tmp0_;
+#line 1374 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_IMPORT_JOB (self));
-#line 1369 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1376 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->abort_flag;
-#line 1369 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1376 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_ == IMPORT_RESULT_SUCCESS) {
-#line 10935 "BatchImport.c"
-		ImportResult _tmp1_ = 0;
-#line 1370 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 10407 "BatchImport.c"
+		ImportResult _tmp1_;
+#line 1377 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = _result_;
-#line 1370 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1377 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->abort_flag = _tmp1_;
-#line 10941 "BatchImport.c"
+#line 10413 "BatchImport.c"
 	}
 }
 
 
 void background_import_job_report_failure (BackgroundImportJob* self, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, ImportResult _result_) {
-	ImportResult _tmp0_ = 0;
-	ImportResult _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
-	GeeList* _tmp8_ = NULL;
-	BatchImportJob* _tmp9_ = NULL;
-	GFile* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	ImportResult _tmp13_ = 0;
-	BatchImportResult* _tmp14_ = NULL;
-	BatchImportResult* _tmp15_ = NULL;
-#line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	ImportResult _tmp0_;
+	ImportResult _tmp1_;
+	gboolean _tmp2_;
+	GeeList* _tmp8_;
+	BatchImportJob* _tmp9_;
+	GFile* _tmp10_;
+	const gchar* _tmp11_;
+	const gchar* _tmp12_;
+	ImportResult _tmp13_;
+	BatchImportResult* _tmp14_;
+	BatchImportResult* _tmp15_;
+#line 1380 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_IMPORT_JOB (self));
-#line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1380 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_JOB (job));
-#line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1380 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail ((file == NULL) || G_IS_FILE (file));
-#line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1380 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (src_identifier != NULL);
-#line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1380 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (dest_identifier != NULL);
-#line 1375 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1382 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = _result_;
-#line 1375 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1382 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (_tmp0_ != IMPORT_RESULT_SUCCESS, "result != ImportResult.SUCCESS");
-#line 1378 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _result_;
-#line 1378 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = import_result_is_abort (_tmp1_);
-#line 1378 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp2_) {
-#line 10978 "BatchImport.c"
-		ImportResult _tmp3_ = 0;
-#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 10450 "BatchImport.c"
+		ImportResult _tmp3_;
+#line 1386 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = _result_;
-#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1386 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		background_import_job_abort (self, _tmp3_);
-#line 10984 "BatchImport.c"
+#line 10456 "BatchImport.c"
 	} else {
-		const gchar* _tmp4_ = NULL;
-		ImportResult _tmp5_ = 0;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-#line 1381 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		const gchar* _tmp4_;
+		ImportResult _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = src_identifier;
-#line 1381 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = _result_;
-#line 1381 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = import_result_to_string (_tmp5_);
-#line 1381 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = _tmp6_;
-#line 1381 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_warning ("BatchImport.vala:1381: Import failure %s: %s", _tmp4_, _tmp7_);
-#line 1381 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		g_warning ("BatchImport.vala:1388: Import failure %s: %s", _tmp4_, _tmp7_);
+#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp7_);
-#line 11002 "BatchImport.c"
+#line 10474 "BatchImport.c"
 	}
-#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = self->failed;
-#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = job;
-#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = file;
-#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp11_ = src_identifier;
-#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp12_ = dest_identifier;
-#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp13_ = _result_;
-#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp14_ = batch_import_result_new (_tmp9_, _tmp10_, _tmp11_, _tmp12_, NULL, _tmp13_);
-#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp15_ = _tmp14_;
-#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_);
-#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (_tmp15_);
-#line 11024 "BatchImport.c"
+#line 10496 "BatchImport.c"
 }
 
 
 void background_import_job_report_error (BackgroundImportJob* self, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result) {
 	ImportResult _result_ = 0;
-	GError* _tmp0_ = NULL;
-	ImportResult _tmp1_ = 0;
-	ImportResult _tmp2_ = 0;
-	const gchar* _tmp3_ = NULL;
-	GError* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	ImportResult _tmp6_ = 0;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	ImportResult _tmp9_ = 0;
-	gboolean _tmp10_ = FALSE;
-	GeeList* _tmp12_ = NULL;
-	BatchImportJob* _tmp13_ = NULL;
-	GFile* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	GError* _tmp17_ = NULL;
-	ImportResult _tmp18_ = 0;
-	BatchImportResult* _tmp19_ = NULL;
-	BatchImportResult* _tmp20_ = NULL;
-#line 1387 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	GError* _tmp0_;
+	ImportResult _tmp1_;
+	ImportResult _tmp2_;
+	const gchar* _tmp3_;
+	GError* _tmp4_;
+	const gchar* _tmp5_;
+	ImportResult _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	ImportResult _tmp9_;
+	gboolean _tmp10_;
+	GeeList* _tmp12_;
+	BatchImportJob* _tmp13_;
+	GFile* _tmp14_;
+	const gchar* _tmp15_;
+	const gchar* _tmp16_;
+	GError* _tmp17_;
+	ImportResult _tmp18_;
+	BatchImportResult* _tmp19_;
+	BatchImportResult* _tmp20_;
+#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_IMPORT_JOB (self));
-#line 1387 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_JOB (job));
-#line 1387 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail ((file == NULL) || G_IS_FILE (file));
-#line 1387 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (src_identifier != NULL);
-#line 1387 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (dest_identifier != NULL);
-#line 1389 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = err;
-#line 1389 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = default_result;
-#line 1389 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = import_result_convert_error (_tmp0_, _tmp1_);
-#line 1389 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_result_ = _tmp2_;
-#line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = src_identifier;
-#line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = err;
-#line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _tmp4_->message;
-#line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = _result_;
-#line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = import_result_to_string (_tmp6_);
-#line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = _tmp7_;
-#line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_warning ("BatchImport.vala:1391: Import error %s: %s (%s)", _tmp3_, _tmp5_, _tmp8_);
-#line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	g_warning ("BatchImport.vala:1398: Import error %s: %s (%s)", _tmp3_, _tmp5_, _tmp8_);
+#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp8_);
-#line 1393 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1400 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = _result_;
-#line 1393 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1400 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = import_result_is_abort (_tmp9_);
-#line 1393 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1400 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp10_) {
-#line 11090 "BatchImport.c"
-		ImportResult _tmp11_ = 0;
-#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 10562 "BatchImport.c"
+		ImportResult _tmp11_;
+#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = _result_;
-#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		background_import_job_abort (self, _tmp11_);
-#line 11096 "BatchImport.c"
+#line 10568 "BatchImport.c"
 	}
-#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp12_ = self->failed;
-#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp13_ = job;
-#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp14_ = file;
-#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp15_ = src_identifier;
-#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp16_ = dest_identifier;
-#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp17_ = err;
-#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp18_ = default_result;
-#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp19_ = batch_import_result_new_from_error (_tmp13_, _tmp14_, _tmp15_, _tmp16_, _tmp17_, _tmp18_);
-#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp20_ = _tmp19_;
-#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_);
-#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (_tmp20_);
-#line 11120 "BatchImport.c"
+#line 10592 "BatchImport.c"
 }
 
 
 static void background_import_job_class_init (BackgroundImportJobClass * klass) {
-#line 1349 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1356 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	background_import_job_parent_class = g_type_class_peek_parent (klass);
-#line 1349 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1356 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->finalize = background_import_job_finalize;
-#line 11129 "BatchImport.c"
+#line 10601 "BatchImport.c"
 }
 
 
 static void background_import_job_instance_init (BackgroundImportJob * self) {
-	GeeArrayList* _tmp0_ = NULL;
-#line 1350 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	GeeArrayList* _tmp0_;
+#line 1357 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->abort_flag = IMPORT_RESULT_SUCCESS;
-#line 1351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1358 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
-#line 1351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1358 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->failed = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 11141 "BatchImport.c"
+#line 10613 "BatchImport.c"
 }
 
 
-static void background_import_job_finalize (BackgroundJob* obj) {
+static void background_import_job_finalize (BackgroundJob * obj) {
 	BackgroundImportJob * self;
-#line 1349 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1356 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob);
-#line 1351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1358 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->failed);
-#line 1349 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1356 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (background_import_job_parent_class)->finalize (obj);
-#line 11153 "BatchImport.c"
+#line 10625 "BatchImport.c"
 }
 
 
@@ -11174,498 +10646,498 @@ GType background_import_job_get_type (void) {
 
 FileToPrepare* file_to_prepare_construct (GType object_type, BatchImportJob* job, GFile* file, gboolean copy_to_library) {
 	FileToPrepare* self = NULL;
-	BatchImportJob* _tmp0_ = NULL;
-	BatchImportJob* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	BatchImportJob* _tmp0_;
+	BatchImportJob* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	gboolean _tmp4_;
+#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL);
-#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL);
-#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (FileToPrepare*) g_type_create_instance (object_type);
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = job;
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _batch_import_job_ref0 (_tmp0_);
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->job);
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->job = _tmp1_;
-#line 1409 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1416 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = file;
-#line 1409 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1416 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1409 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1416 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->file);
-#line 1409 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1416 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->file = _tmp3_;
-#line 1410 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1417 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = copy_to_library;
-#line 1410 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1417 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->copy_to_library = _tmp4_;
-#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 11204 "BatchImport.c"
+#line 10676 "BatchImport.c"
 }
 
 
 FileToPrepare* file_to_prepare_new (BatchImportJob* job, GFile* file, gboolean copy_to_library) {
-#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return file_to_prepare_construct (TYPE_FILE_TO_PREPARE, job, file, copy_to_library);
-#line 11211 "BatchImport.c"
+#line 10683 "BatchImport.c"
 }
 
 
 static gpointer _file_to_prepare_ref0 (gpointer self) {
-#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1421 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? file_to_prepare_ref (self) : NULL;
-#line 11218 "BatchImport.c"
+#line 10690 "BatchImport.c"
 }
 
 
 void file_to_prepare_set_associated (FileToPrepare* self, FileToPrepare* a) {
-	FileToPrepare* _tmp0_ = NULL;
-	FileToPrepare* _tmp1_ = NULL;
-#line 1413 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	FileToPrepare* _tmp0_;
+	FileToPrepare* _tmp1_;
+#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_FILE_TO_PREPARE (self));
-#line 1413 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail ((a == NULL) || IS_FILE_TO_PREPARE (a));
-#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1421 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = a;
-#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1421 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _file_to_prepare_ref0 (_tmp0_);
-#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1421 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_file_to_prepare_unref0 (self->associated);
-#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1421 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->associated = _tmp1_;
-#line 11237 "BatchImport.c"
+#line 10709 "BatchImport.c"
 }
 
 
 gchar* file_to_prepare_get_parent_path (FileToPrepare* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-#line 1417 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	GFile* _tmp1_;
+#line 1424 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (self), NULL);
-#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = self->file;
-#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 11251 "BatchImport.c"
-		GFile* _tmp2_ = NULL;
-		GFile* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 10723 "BatchImport.c"
+		GFile* _tmp2_;
+		GFile* _tmp3_;
+		GFile* _tmp4_;
+		gchar* _tmp5_;
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->file;
-#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = g_file_get_parent (_tmp2_);
-#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = _tmp3_;
-#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = g_file_get_path (_tmp4_);
-#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp0_);
-#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp5_;
-#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp4_);
-#line 11270 "BatchImport.c"
+#line 10742 "BatchImport.c"
 	} else {
-		BatchImportJob* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		BatchImportJob* _tmp6_;
+		gchar* _tmp7_;
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = self->job;
-#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = batch_import_job_get_path (_tmp6_);
-#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp0_);
-#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp7_;
-#line 11282 "BatchImport.c"
+#line 10754 "BatchImport.c"
 	}
-#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
-#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 11288 "BatchImport.c"
+#line 10760 "BatchImport.c"
 }
 
 
 gchar* file_to_prepare_get_path (FileToPrepare* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-#line 1421 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	GFile* _tmp1_;
+#line 1428 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (self), NULL);
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = self->file;
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 11302 "BatchImport.c"
-		GFile* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 10774 "BatchImport.c"
+		GFile* _tmp2_;
+		gchar* _tmp3_;
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->file;
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = g_file_get_path (_tmp2_);
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp0_);
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp3_;
-#line 11313 "BatchImport.c"
+#line 10785 "BatchImport.c"
 	} else {
-		BatchImportJob* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
-		GFile* _tmp8_ = NULL;
-		BatchImportJob* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		GFile* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		BatchImportJob* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		GFile* _tmp7_;
+		GFile* _tmp8_;
+		BatchImportJob* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+		GFile* _tmp12_;
+		GFile* _tmp13_;
+		gchar* _tmp14_;
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = self->job;
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = batch_import_job_get_path (_tmp4_);
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = _tmp5_;
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = g_file_new_for_path (_tmp6_);
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = _tmp7_;
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = self->job;
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = batch_import_job_get_basename (_tmp9_);
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = _tmp10_;
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp12_ = g_file_get_child (_tmp8_, _tmp11_);
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = _tmp12_;
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = g_file_get_path (_tmp13_);
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp0_);
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp14_;
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp13_);
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp11_);
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp8_);
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp6_);
-#line 11360 "BatchImport.c"
+#line 10832 "BatchImport.c"
 	}
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
-#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 11366 "BatchImport.c"
+#line 10838 "BatchImport.c"
 }
 
 
 gchar* file_to_prepare_get_basename (FileToPrepare* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-#line 1426 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	GFile* _tmp1_;
+#line 1433 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (self), NULL);
-#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = self->file;
-#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 11380 "BatchImport.c"
-		GFile* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 10852 "BatchImport.c"
+		GFile* _tmp2_;
+		gchar* _tmp3_;
+#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->file;
-#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = g_file_get_basename (_tmp2_);
-#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp0_);
-#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp3_;
-#line 11391 "BatchImport.c"
+#line 10863 "BatchImport.c"
 	} else {
-		BatchImportJob* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		BatchImportJob* _tmp4_;
+		gchar* _tmp5_;
+#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = self->job;
-#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = batch_import_job_get_basename (_tmp4_);
-#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp0_);
-#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp5_;
-#line 11403 "BatchImport.c"
+#line 10875 "BatchImport.c"
 	}
-#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
-#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 11409 "BatchImport.c"
+#line 10881 "BatchImport.c"
 }
 
 
 gboolean file_to_prepare_is_directory (FileToPrepare* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	GFile* _tmp1_ = NULL;
-#line 1430 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	GFile* _tmp1_;
+#line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (self), FALSE);
-#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = self->file;
-#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 11423 "BatchImport.c"
-		GFile* _tmp2_ = NULL;
-		GFileType _tmp3_ = 0;
-#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 10895 "BatchImport.c"
+		GFile* _tmp2_;
+		GFileType _tmp3_;
+#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->file;
-#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = g_file_query_file_type (_tmp2_, G_FILE_QUERY_INFO_NONE, NULL);
-#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp3_ == G_FILE_TYPE_DIRECTORY;
-#line 11432 "BatchImport.c"
+#line 10904 "BatchImport.c"
 	} else {
-		BatchImportJob* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-#line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		BatchImportJob* _tmp4_;
+		gboolean _tmp5_;
+#line 1439 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = self->job;
-#line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1439 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = batch_import_job_is_directory (_tmp4_);
-#line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1439 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp5_;
-#line 11442 "BatchImport.c"
+#line 10914 "BatchImport.c"
 	}
-#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
-#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 11448 "BatchImport.c"
+#line 10920 "BatchImport.c"
 }
 
 
 static void value_file_to_prepare_init (GValue* value) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 11455 "BatchImport.c"
+#line 10927 "BatchImport.c"
 }
 
 
 static void value_file_to_prepare_free_value (GValue* value) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_to_prepare_unref (value->data[0].v_pointer);
-#line 11464 "BatchImport.c"
+#line 10936 "BatchImport.c"
 	}
 }
 
 
 static void value_file_to_prepare_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = file_to_prepare_ref (src_value->data[0].v_pointer);
-#line 11474 "BatchImport.c"
+#line 10946 "BatchImport.c"
 	} else {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 11478 "BatchImport.c"
+#line 10950 "BatchImport.c"
 	}
 }
 
 
 static gpointer value_file_to_prepare_peek_pointer (const GValue* value) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 11486 "BatchImport.c"
+#line 10958 "BatchImport.c"
 }
 
 
 static gchar* value_file_to_prepare_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 11493 "BatchImport.c"
-		FileToPrepare* object;
+#line 10965 "BatchImport.c"
+		FileToPrepare * object;
 		object = collect_values[0].v_pointer;
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11500 "BatchImport.c"
+#line 10972 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11504 "BatchImport.c"
+#line 10976 "BatchImport.c"
 		}
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = file_to_prepare_ref (object);
-#line 11508 "BatchImport.c"
+#line 10980 "BatchImport.c"
 	} else {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 11512 "BatchImport.c"
+#line 10984 "BatchImport.c"
 	}
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 11516 "BatchImport.c"
+#line 10988 "BatchImport.c"
 }
 
 
 static gchar* value_file_to_prepare_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	FileToPrepare** object_p;
+	FileToPrepare ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 11527 "BatchImport.c"
+#line 10999 "BatchImport.c"
 	}
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 11533 "BatchImport.c"
+#line 11005 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 11537 "BatchImport.c"
+#line 11009 "BatchImport.c"
 	} else {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = file_to_prepare_ref (value->data[0].v_pointer);
-#line 11541 "BatchImport.c"
+#line 11013 "BatchImport.c"
 	}
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 11545 "BatchImport.c"
+#line 11017 "BatchImport.c"
 }
 
 
 GParamSpec* param_spec_file_to_prepare (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecFileToPrepare* spec;
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_FILE_TO_PREPARE), NULL);
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 11559 "BatchImport.c"
+#line 11031 "BatchImport.c"
 }
 
 
 gpointer value_get_file_to_prepare (const GValue* value) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FILE_TO_PREPARE), NULL);
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 11568 "BatchImport.c"
+#line 11040 "BatchImport.c"
 }
 
 
 void value_set_file_to_prepare (GValue* value, gpointer v_object) {
-	FileToPrepare* old;
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	FileToPrepare * old;
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FILE_TO_PREPARE));
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_FILE_TO_PREPARE));
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_to_prepare_ref (value->data[0].v_pointer);
-#line 11588 "BatchImport.c"
+#line 11060 "BatchImport.c"
 	} else {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 11592 "BatchImport.c"
+#line 11064 "BatchImport.c"
 	}
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_to_prepare_unref (old);
-#line 11598 "BatchImport.c"
+#line 11070 "BatchImport.c"
 	}
 }
 
 
 void value_take_file_to_prepare (GValue* value, gpointer v_object) {
-	FileToPrepare* old;
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	FileToPrepare * old;
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FILE_TO_PREPARE));
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_FILE_TO_PREPARE));
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 11617 "BatchImport.c"
+#line 11089 "BatchImport.c"
 	} else {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 11621 "BatchImport.c"
+#line 11093 "BatchImport.c"
 	}
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_to_prepare_unref (old);
-#line 11627 "BatchImport.c"
+#line 11099 "BatchImport.c"
 	}
 }
 
 
 static void file_to_prepare_class_init (FileToPrepareClass * klass) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	file_to_prepare_parent_class = g_type_class_peek_parent (klass);
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((FileToPrepareClass *) klass)->finalize = file_to_prepare_finalize;
-#line 11637 "BatchImport.c"
+#line 11109 "BatchImport.c"
 }
 
 
 static void file_to_prepare_instance_init (FileToPrepare * self) {
-#line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1412 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->associated = NULL;
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 11646 "BatchImport.c"
+#line 11118 "BatchImport.c"
 }
 
 
-static void file_to_prepare_finalize (FileToPrepare* obj) {
+static void file_to_prepare_finalize (FileToPrepare * obj) {
 	FileToPrepare * self;
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FILE_TO_PREPARE, FileToPrepare);
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_handlers_destroy (self);
-#line 1402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1409 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->job);
-#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1410 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->file);
-#line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1412 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_file_to_prepare_unref0 (self->associated);
-#line 11662 "BatchImport.c"
+#line 11134 "BatchImport.c"
 }
 
 
@@ -11684,857 +11156,857 @@ GType file_to_prepare_get_type (void) {
 
 
 gpointer file_to_prepare_ref (gpointer instance) {
-	FileToPrepare* self;
+	FileToPrepare * self;
 	self = instance;
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 11687 "BatchImport.c"
+#line 11159 "BatchImport.c"
 }
 
 
 void file_to_prepare_unref (gpointer instance) {
-	FileToPrepare* self;
+	FileToPrepare * self;
 	self = instance;
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		FILE_TO_PREPARE_GET_CLASS (self)->finalize (self);
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 11700 "BatchImport.c"
+#line 11172 "BatchImport.c"
 	}
 }
 
 
 WorkSniffer* work_sniffer_construct (GType object_type, BatchImport* owner, GeeIterable* jobs, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, GeeHashSet* skipset) {
 	WorkSniffer* self = NULL;
-	BatchImport* _tmp0_ = NULL;
-	CompletionCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	GCancellable* _tmp2_ = NULL;
-	CancellationCallback _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
-	GeeIterable* _tmp4_ = NULL;
-	GeeIterable* _tmp5_ = NULL;
-	GeeHashSet* _tmp6_ = NULL;
-	GeeHashSet* _tmp7_ = NULL;
-#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	BatchImport* _tmp0_;
+	CompletionCallback _tmp1_;
+	void* _tmp1__target;
+	GCancellable* _tmp2_;
+	CancellationCallback _tmp3_;
+	void* _tmp3__target;
+	GeeIterable* _tmp4_;
+	GeeIterable* _tmp5_;
+	GeeHashSet* _tmp6_;
+	GeeHashSet* _tmp7_;
+#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL);
-#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (jobs), NULL);
-#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((skipset == NULL) || GEE_IS_HASH_SET (skipset), NULL);
-#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = owner;
-#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = callback;
-#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1__target = callback_target;
-#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = cancellable;
-#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = cancellation;
-#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3__target = cancellation_target;
-#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (WorkSniffer*) background_import_job_construct (object_type, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target);
-#line 1447 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1454 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = jobs;
-#line 1447 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1454 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 1447 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1454 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->jobs);
-#line 1447 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1454 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->jobs = _tmp5_;
-#line 1448 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = skipset;
-#line 1448 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 1448 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->skipset);
-#line 1448 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->skipset = _tmp7_;
-#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 11757 "BatchImport.c"
+#line 11229 "BatchImport.c"
 }
 
 
 WorkSniffer* work_sniffer_new (BatchImport* owner, GeeIterable* jobs, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, GeeHashSet* skipset) {
-#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return work_sniffer_construct (TYPE_WORK_SNIFFER, owner, jobs, callback, callback_target, cancellable, cancellation, cancellation_target, skipset);
-#line 11764 "BatchImport.c"
+#line 11236 "BatchImport.c"
 }
 
 
 static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b) {
 	gint result = 0;
 	FileToPrepare* file_a = NULL;
-	FileToPrepare* _tmp0_ = NULL;
-	FileToPrepare* _tmp1_ = NULL;
+	FileToPrepare* _tmp0_;
+	FileToPrepare* _tmp1_;
 	FileToPrepare* file_b = NULL;
-	FileToPrepare* _tmp2_ = NULL;
-	FileToPrepare* _tmp3_ = NULL;
+	FileToPrepare* _tmp2_;
+	FileToPrepare* _tmp3_;
 	gchar* sa = NULL;
-	gchar* _tmp4_ = NULL;
+	gchar* _tmp4_;
 	gchar* sb = NULL;
-	gchar* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-#line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	gchar* _tmp5_;
+	gint _tmp6_;
+#line 1490 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (a), 0);
-#line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1490 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (b), 0);
-#line 1484 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = a;
-#line 1484 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _file_to_prepare_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_FILE_TO_PREPARE, FileToPrepare));
-#line 1484 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	file_a = _tmp1_;
-#line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1492 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = b;
-#line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1492 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = _file_to_prepare_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_FILE_TO_PREPARE, FileToPrepare));
-#line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1492 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	file_b = _tmp3_;
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = file_to_prepare_get_path (file_a);
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	sa = _tmp4_;
-#line 1487 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = file_to_prepare_get_path (file_b);
-#line 1487 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	sb = _tmp5_;
-#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = utf8_cs_compare (sa, sb);
-#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp6_;
-#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (sb);
-#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (sa);
-#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_file_to_prepare_unref0 (file_b);
-#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_file_to_prepare_unref0 (file_a);
-#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 11819 "BatchImport.c"
+#line 11291 "BatchImport.c"
 }
 
 
 static gint ___lambda11__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = __lambda11_ ((WorkSniffer*) self, (FileToPrepare*) a, (FileToPrepare*) b);
-#line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1490 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 11828 "BatchImport.c"
+#line 11300 "BatchImport.c"
 }
 
 
 static void work_sniffer_real_execute (BackgroundJob* base) {
 	WorkSniffer * self;
 	GeeList* sorted = NULL;
-	GeeArrayList* _tmp26_ = NULL;
-	GeeList* _tmp42_ = NULL;
+	GeeArrayList* _tmp26_;
+	GeeList* _tmp42_;
 	GError * _inner_error_ = NULL;
-#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_WORK_SNIFFER, WorkSniffer);
-#line 11840 "BatchImport.c"
+#line 11312 "BatchImport.c"
 	{
 		GeeIterator* _job_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
+#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = self->priv->jobs;
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = gee_iterable_iterator (_tmp0_);
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_job_it = _tmp1_;
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 11853 "BatchImport.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 11325 "BatchImport.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			BatchImportJob* job = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			ImportResult _result_ = 0;
-			ImportResult _tmp6_ = 0;
-			ImportResult _tmp7_ = 0;
-			gboolean _tmp25_ = FALSE;
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			ImportResult _tmp6_;
+			ImportResult _tmp7_;
+			gboolean _tmp25_;
+#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp2_ = _job_it;
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (!_tmp3_) {
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 11871 "BatchImport.c"
+#line 11343 "BatchImport.c"
 			}
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp4_ = _job_it;
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			job = (BatchImportJob*) _tmp5_;
-#line 1456 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1463 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp6_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
-#line 1456 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1463 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_result_ = _tmp6_;
-#line 1457 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp7_ = _result_;
-#line 1457 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp7_ != IMPORT_RESULT_SUCCESS) {
-#line 11887 "BatchImport.c"
-				BatchImportJob* _tmp8_ = NULL;
-				BatchImportJob* _tmp9_ = NULL;
-				gchar* _tmp10_ = NULL;
-				gchar* _tmp11_ = NULL;
-				BatchImportJob* _tmp12_ = NULL;
-				gchar* _tmp13_ = NULL;
-				gchar* _tmp14_ = NULL;
-				ImportResult _tmp15_ = 0;
-#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 11359 "BatchImport.c"
+				BatchImportJob* _tmp8_;
+				BatchImportJob* _tmp9_;
+				gchar* _tmp10_;
+				gchar* _tmp11_;
+				BatchImportJob* _tmp12_;
+				gchar* _tmp13_;
+				gchar* _tmp14_;
+				ImportResult _tmp15_;
+#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp8_ = job;
-#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp9_ = job;
-#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp10_ = batch_import_job_get_source_identifier (_tmp9_);
-#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp11_ = _tmp10_;
-#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp12_ = job;
-#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp13_ = batch_import_job_get_dest_identifier (_tmp12_);
-#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp14_ = _tmp13_;
-#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp15_ = _result_;
-#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp8_, NULL, _tmp11_, _tmp14_, _tmp15_);
-#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp14_);
-#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp11_);
-#line 1461 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1468 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_job_unref0 (job);
-#line 1461 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1468 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 11922 "BatchImport.c"
+#line 11394 "BatchImport.c"
 			}
 			{
-				BatchImportJob* _tmp16_ = NULL;
-#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				BatchImportJob* _tmp16_;
+#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp16_ = job;
-#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				work_sniffer_sniff_job (self, _tmp16_, &_inner_error_);
-#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11932 "BatchImport.c"
-					goto __catch413_g_error;
+#line 11404 "BatchImport.c"
+					goto __catch414_g_error;
 				}
 			}
-			goto __finally413;
-			__catch413_g_error:
+			goto __finally414;
+			__catch414_g_error:
 			{
 				GError* err = NULL;
-				BatchImportJob* _tmp17_ = NULL;
-				BatchImportJob* _tmp18_ = NULL;
-				gchar* _tmp19_ = NULL;
-				gchar* _tmp20_ = NULL;
-				BatchImportJob* _tmp21_ = NULL;
-				gchar* _tmp22_ = NULL;
-				gchar* _tmp23_ = NULL;
-				GError* _tmp24_ = NULL;
-#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				BatchImportJob* _tmp17_;
+				BatchImportJob* _tmp18_;
+				gchar* _tmp19_;
+				gchar* _tmp20_;
+				BatchImportJob* _tmp21_;
+				gchar* _tmp22_;
+				gchar* _tmp23_;
+				GError* _tmp24_;
+#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				err = _inner_error_;
-#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_inner_error_ = NULL;
-#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp17_ = job;
-#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp18_ = job;
-#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp19_ = batch_import_job_get_source_identifier (_tmp18_);
-#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp20_ = _tmp19_;
-#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp21_ = job;
-#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp22_ = batch_import_job_get_dest_identifier (_tmp21_);
-#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp23_ = _tmp22_;
-#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp24_ = err;
-#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp17_, NULL, _tmp20_, _tmp23_, _tmp24_, IMPORT_RESULT_FILE_ERROR);
-#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp23_);
-#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp20_);
-#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_error_free0 (err);
-#line 11976 "BatchImport.c"
+#line 11448 "BatchImport.c"
 			}
-			__finally413:
-#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			__finally414:
+#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_job_unref0 (job);
-#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_job_it);
-#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_clear_error (&_inner_error_);
-#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 11991 "BatchImport.c"
+#line 11463 "BatchImport.c"
 			}
-#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1478 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp25_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1478 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp25_) {
-#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_job_unref0 (job);
-#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 12001 "BatchImport.c"
+#line 11473 "BatchImport.c"
 			}
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_batch_import_job_unref0 (job);
-#line 12005 "BatchImport.c"
+#line 11477 "BatchImport.c"
 		}
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_job_it);
-#line 12009 "BatchImport.c"
+#line 11481 "BatchImport.c"
 	}
-#line 1478 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp26_ = gee_array_list_new (TYPE_FILE_TO_PREPARE, (GBoxedCopyFunc) file_to_prepare_ref, (GDestroyNotify) file_to_prepare_unref, NULL, NULL, NULL);
-#line 1478 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	sorted = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_LIST, GeeList);
-#line 12015 "BatchImport.c"
+#line 11487 "BatchImport.c"
 	{
 		GeeList* _ftp_list = NULL;
-		GeeList* _tmp27_ = NULL;
-		GeeList* _tmp28_ = NULL;
+		GeeList* _tmp27_;
+		GeeList* _tmp28_;
 		gint _ftp_size = 0;
-		GeeList* _tmp29_ = NULL;
-		gint _tmp30_ = 0;
-		gint _tmp31_ = 0;
+		GeeList* _tmp29_;
+		gint _tmp30_;
+		gint _tmp31_;
 		gint _ftp_index = 0;
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp27_ = self->files_to_prepare;
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_ftp_list = _tmp28_;
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp29_ = _ftp_list;
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp31_ = _tmp30_;
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_ftp_size = _tmp31_;
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_ftp_index = -1;
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 12043 "BatchImport.c"
-			gint _tmp32_ = 0;
-			gint _tmp33_ = 0;
-			gint _tmp34_ = 0;
+#line 11515 "BatchImport.c"
+			gint _tmp32_;
+			gint _tmp33_;
+			gint _tmp34_;
 			FileToPrepare* ftp = NULL;
-			GeeList* _tmp35_ = NULL;
-			gint _tmp36_ = 0;
-			gpointer _tmp37_ = NULL;
-			FileToPrepare* _tmp38_ = NULL;
-			gboolean _tmp39_ = FALSE;
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			GeeList* _tmp35_;
+			gint _tmp36_;
+			gpointer _tmp37_;
+			FileToPrepare* _tmp38_;
+			gboolean _tmp39_;
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp32_ = _ftp_index;
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_ftp_index = _tmp32_ + 1;
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp33_ = _ftp_index;
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp34_ = _ftp_size;
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (!(_tmp33_ < _tmp34_)) {
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 12065 "BatchImport.c"
+#line 11537 "BatchImport.c"
 			}
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp35_ = _ftp_list;
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp36_ = _ftp_index;
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp37_ = gee_list_get (_tmp35_, _tmp36_);
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			ftp = (FileToPrepare*) _tmp37_;
-#line 1480 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1487 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp38_ = ftp;
-#line 1480 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1487 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp39_ = file_to_prepare_is_directory (_tmp38_);
-#line 1480 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1487 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (!_tmp39_) {
-#line 12081 "BatchImport.c"
-				GeeList* _tmp40_ = NULL;
-				FileToPrepare* _tmp41_ = NULL;
-#line 1481 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 11553 "BatchImport.c"
+				GeeList* _tmp40_;
+				FileToPrepare* _tmp41_;
+#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp40_ = sorted;
-#line 1481 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp41_ = ftp;
-#line 1481 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_COLLECTION, GeeCollection), _tmp41_);
-#line 12090 "BatchImport.c"
+#line 11562 "BatchImport.c"
 			}
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_file_to_prepare_unref0 (ftp);
-#line 12094 "BatchImport.c"
+#line 11566 "BatchImport.c"
 		}
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_ftp_list);
-#line 12098 "BatchImport.c"
+#line 11570 "BatchImport.c"
 	}
-#line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1490 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp42_ = sorted;
-#line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1490 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	gee_list_sort (_tmp42_, ___lambda11__gcompare_data_func, background_job_ref (self), background_job_unref);
-#line 12104 "BatchImport.c"
+#line 11576 "BatchImport.c"
 	{
 		gint i = 0;
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		i = 0;
-#line 12109 "BatchImport.c"
+#line 11581 "BatchImport.c"
 		{
 			gboolean _tmp43_ = FALSE;
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp43_ = TRUE;
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			while (TRUE) {
-#line 12116 "BatchImport.c"
-				gint _tmp45_ = 0;
-				GeeList* _tmp46_ = NULL;
-				gint _tmp47_ = 0;
-				gint _tmp48_ = 0;
+#line 11588 "BatchImport.c"
+				gint _tmp45_;
+				GeeList* _tmp46_;
+				gint _tmp47_;
+				gint _tmp48_;
 				gchar* name = NULL;
 				gchar* ext = NULL;
 				FileToPrepare* ftp = NULL;
-				GeeList* _tmp49_ = NULL;
-				gint _tmp50_ = 0;
-				gpointer _tmp51_ = NULL;
-				FileToPrepare* _tmp52_ = NULL;
-				gchar* _tmp53_ = NULL;
-				gchar* _tmp54_ = NULL;
+				GeeList* _tmp49_;
+				gint _tmp50_;
+				gpointer _tmp51_;
+				FileToPrepare* _tmp52_;
+				gchar* _tmp53_;
+				gchar* _tmp54_;
 				gchar* _tmp55_ = NULL;
 				gchar* _tmp56_ = NULL;
-				const gchar* _tmp57_ = NULL;
-				gboolean _tmp58_ = FALSE;
-				RawFileFormatProperties* _tmp59_ = NULL;
-				RawFileFormatProperties* _tmp60_ = NULL;
-				const gchar* _tmp61_ = NULL;
-				gboolean _tmp62_ = FALSE;
-				gboolean _tmp63_ = FALSE;
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				const gchar* _tmp57_;
+				gboolean _tmp58_;
+				RawFileFormatProperties* _tmp59_;
+				RawFileFormatProperties* _tmp60_;
+				const gchar* _tmp61_;
+				gboolean _tmp62_;
+				gboolean _tmp63_;
+#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (!_tmp43_) {
-#line 12141 "BatchImport.c"
-					gint _tmp44_ = 0;
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 11613 "BatchImport.c"
+					gint _tmp44_;
+#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp44_ = i;
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					i = _tmp44_ + 1;
-#line 12147 "BatchImport.c"
+#line 11619 "BatchImport.c"
 				}
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp43_ = FALSE;
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp45_ = i;
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp46_ = sorted;
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp47_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp48_ = _tmp47_;
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (!(_tmp45_ < _tmp48_)) {
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					break;
-#line 12163 "BatchImport.c"
+#line 11635 "BatchImport.c"
 				}
-#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp49_ = sorted;
-#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp50_ = i;
-#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp51_ = gee_list_get (_tmp49_, _tmp50_);
-#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				ftp = (FileToPrepare*) _tmp51_;
-#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp52_ = ftp;
-#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp53_ = file_to_prepare_get_basename (_tmp52_);
-#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp54_ = _tmp53_;
-#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				disassemble_filename (_tmp54_, &_tmp55_, &_tmp56_);
-#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (name);
-#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				name = _tmp55_;
-#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (ext);
-#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				ext = _tmp56_;
-#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp54_);
-#line 1498 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp57_ = ext;
-#line 1498 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp58_ = is_string_empty (_tmp57_);
-#line 1498 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp58_) {
-#line 1499 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_file_to_prepare_unref0 (ftp);
-#line 1499 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_free0 (ext);
-#line 1499 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_free0 (name);
-#line 1499 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 12205 "BatchImport.c"
+#line 11677 "BatchImport.c"
 				}
-#line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp59_ = raw_file_format_properties_get_instance ();
-#line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp60_ = _tmp59_;
-#line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp61_ = ext;
-#line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp62_ = photo_file_format_properties_is_recognized_extension (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties), _tmp61_);
-#line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp63_ = _tmp62_;
-#line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_photo_file_format_properties_unref0 (_tmp60_);
-#line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp63_) {
-#line 12221 "BatchImport.c"
+#line 11693 "BatchImport.c"
 					gboolean _tmp64_ = FALSE;
-					gint _tmp65_ = 0;
-#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					gint _tmp65_;
+#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp65_ = i;
-#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_tmp65_ > 0) {
-#line 12228 "BatchImport.c"
-						FileToPrepare* _tmp66_ = NULL;
-						GeeList* _tmp67_ = NULL;
-						gint _tmp68_ = 0;
-						gpointer _tmp69_ = NULL;
-						FileToPrepare* _tmp70_ = NULL;
-						gboolean _tmp71_ = FALSE;
-#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 11700 "BatchImport.c"
+						FileToPrepare* _tmp66_;
+						GeeList* _tmp67_;
+						gint _tmp68_;
+						gpointer _tmp69_;
+						FileToPrepare* _tmp70_;
+						gboolean _tmp71_;
+#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp66_ = ftp;
-#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp67_ = sorted;
-#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp68_ = i;
-#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp69_ = gee_list_get (_tmp67_, _tmp68_ - 1);
-#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp70_ = (FileToPrepare*) _tmp69_;
-#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp71_ = work_sniffer_is_paired (self, _tmp66_, _tmp70_);
-#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp64_ = _tmp71_;
-#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_file_to_prepare_unref0 (_tmp70_);
-#line 12251 "BatchImport.c"
+#line 11723 "BatchImport.c"
 					} else {
-#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp64_ = FALSE;
-#line 12255 "BatchImport.c"
+#line 11727 "BatchImport.c"
 					}
-#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_tmp64_) {
-#line 12259 "BatchImport.c"
+#line 11731 "BatchImport.c"
 						FileToPrepare* associated_file = NULL;
-						GeeList* _tmp72_ = NULL;
-						gint _tmp73_ = 0;
-						gpointer _tmp74_ = NULL;
-						GeeList* _tmp75_ = NULL;
-						FileToPrepare* _tmp76_ = NULL;
-						FileToPrepare* _tmp77_ = NULL;
-						FileToPrepare* _tmp78_ = NULL;
-#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala"
+						GeeList* _tmp72_;
+						gint _tmp73_;
+						gpointer _tmp74_;
+						GeeList* _tmp75_;
+						FileToPrepare* _tmp76_;
+						FileToPrepare* _tmp77_;
+						FileToPrepare* _tmp78_;
+#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp72_ = sorted;
-#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp73_ = i;
-#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp74_ = gee_list_get (_tmp72_, _tmp73_ - 1);
-#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						associated_file = (FileToPrepare*) _tmp74_;
-#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1513 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp75_ = self->files_to_prepare;
-#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1513 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp76_ = associated_file;
-#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1513 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_COLLECTION, GeeCollection), _tmp76_);
-#line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1514 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp77_ = ftp;
-#line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1514 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp78_ = associated_file;
-#line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1514 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						file_to_prepare_set_associated (_tmp77_, _tmp78_);
-#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_file_to_prepare_unref0 (associated_file);
-#line 12290 "BatchImport.c"
+#line 11762 "BatchImport.c"
 					} else {
 						gboolean _tmp79_ = FALSE;
-						gint _tmp80_ = 0;
-						GeeList* _tmp81_ = NULL;
-						gint _tmp82_ = 0;
-						gint _tmp83_ = 0;
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+						gint _tmp80_;
+						GeeList* _tmp81_;
+						gint _tmp82_;
+						gint _tmp83_;
+#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp80_ = i;
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp81_ = sorted;
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp82_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp83_ = _tmp82_;
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_tmp80_ < (_tmp83_ - 1)) {
-#line 12307 "BatchImport.c"
-							FileToPrepare* _tmp84_ = NULL;
-							GeeList* _tmp85_ = NULL;
-							gint _tmp86_ = 0;
-							gpointer _tmp87_ = NULL;
-							FileToPrepare* _tmp88_ = NULL;
-							gboolean _tmp89_ = FALSE;
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 11779 "BatchImport.c"
+							FileToPrepare* _tmp84_;
+							GeeList* _tmp85_;
+							gint _tmp86_;
+							gpointer _tmp87_;
+							FileToPrepare* _tmp88_;
+							gboolean _tmp89_;
+#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp84_ = ftp;
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp85_ = sorted;
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp86_ = i;
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp87_ = gee_list_get (_tmp85_, _tmp86_ + 1);
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp88_ = (FileToPrepare*) _tmp87_;
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp89_ = work_sniffer_is_paired (self, _tmp84_, _tmp88_);
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp79_ = _tmp89_;
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_file_to_prepare_unref0 (_tmp88_);
-#line 12330 "BatchImport.c"
+#line 11802 "BatchImport.c"
 						} else {
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp79_ = FALSE;
-#line 12334 "BatchImport.c"
+#line 11806 "BatchImport.c"
 						}
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_tmp79_) {
-#line 12338 "BatchImport.c"
+#line 11810 "BatchImport.c"
 							FileToPrepare* associated_file = NULL;
-							GeeList* _tmp90_ = NULL;
-							gint _tmp91_ = 0;
-							gpointer _tmp92_ = NULL;
-							GeeList* _tmp93_ = NULL;
-							FileToPrepare* _tmp94_ = NULL;
-							FileToPrepare* _tmp95_ = NULL;
-							FileToPrepare* _tmp96_ = NULL;
-#line 1509 "/home/jens/Source/shotwell/src/BatchImport.vala"
+							GeeList* _tmp90_;
+							gint _tmp91_;
+							gpointer _tmp92_;
+							GeeList* _tmp93_;
+							FileToPrepare* _tmp94_;
+							FileToPrepare* _tmp95_;
+							FileToPrepare* _tmp96_;
+#line 1516 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp90_ = sorted;
-#line 1509 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1516 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp91_ = i;
-#line 1509 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1516 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp92_ = gee_list_get (_tmp90_, _tmp91_ + 1);
-#line 1509 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1516 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							associated_file = (FileToPrepare*) _tmp92_;
-#line 1510 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp93_ = self->files_to_prepare;
-#line 1510 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp94_ = associated_file;
-#line 1510 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, GEE_TYPE_COLLECTION, GeeCollection), _tmp94_);
-#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1518 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp95_ = ftp;
-#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1518 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp96_ = associated_file;
-#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1518 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							file_to_prepare_set_associated (_tmp95_, _tmp96_);
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_file_to_prepare_unref0 (associated_file);
-#line 12369 "BatchImport.c"
+#line 11841 "BatchImport.c"
 						}
 					}
 				}
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_file_to_prepare_unref0 (ftp);
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (ext);
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (name);
-#line 12379 "BatchImport.c"
+#line 11851 "BatchImport.c"
 			}
 		}
 	}
-#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (sorted);
-#line 12385 "BatchImport.c"
+#line 11857 "BatchImport.c"
 }
 
 
 static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, FileToPrepare* maybe_paired) {
 	gboolean result = FALSE;
-	FileToPrepare* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	FileToPrepare* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	FileToPrepare* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	FileToPrepare* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gboolean _tmp6_;
 	gchar* name = NULL;
 	gchar* ext = NULL;
 	gchar* test_name = NULL;
 	gchar* test_ext = NULL;
-	FileToPrepare* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
+	FileToPrepare* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
 	gchar* _tmp10_ = NULL;
 	gchar* _tmp11_ = NULL;
-	JfifFileFormatProperties* _tmp12_ = NULL;
-	JfifFileFormatProperties* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	gboolean _tmp16_ = FALSE;
-	FileToPrepare* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
+	JfifFileFormatProperties* _tmp12_;
+	JfifFileFormatProperties* _tmp13_;
+	const gchar* _tmp14_;
+	gboolean _tmp15_;
+	gboolean _tmp16_;
+	FileToPrepare* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
 	gchar* _tmp20_ = NULL;
 	gchar* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	const gchar* _tmp23_ = NULL;
-#line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	const gchar* _tmp22_;
+	const gchar* _tmp23_;
+#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_WORK_SNIFFER (self), FALSE);
-#line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (raw), FALSE);
-#line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (maybe_paired), FALSE);
-#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = raw;
-#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = file_to_prepare_get_parent_path (_tmp0_);
-#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = _tmp1_;
-#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = maybe_paired;
-#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = file_to_prepare_get_parent_path (_tmp3_);
-#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _tmp4_;
-#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = g_strcmp0 (_tmp2_, _tmp5_) != 0;
-#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp5_);
-#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp2_);
-#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp6_) {
-#line 1522 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = FALSE;
-#line 1522 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 12449 "BatchImport.c"
+#line 11921 "BatchImport.c"
 	}
-#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = maybe_paired;
-#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = file_to_prepare_get_basename (_tmp7_);
-#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = _tmp8_;
-#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	disassemble_filename (_tmp9_, &_tmp10_, &_tmp11_);
-#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (test_name);
-#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	test_name = _tmp10_;
-#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (test_ext);
-#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	test_ext = _tmp11_;
-#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp9_);
-#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp12_ = jfif_file_format_properties_get_instance ();
-#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp13_ = _tmp12_;
-#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp14_ = test_ext;
-#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp15_ = photo_file_format_properties_is_recognized_extension (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties), _tmp14_);
-#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp16_ = !_tmp15_;
-#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_photo_file_format_properties_unref0 (_tmp13_);
-#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp16_) {
-#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = FALSE;
-#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (test_ext);
-#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (test_name);
-#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (ext);
-#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (name);
-#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 12495 "BatchImport.c"
+#line 11967 "BatchImport.c"
 	}
-#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp17_ = raw;
-#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp18_ = file_to_prepare_get_basename (_tmp17_);
-#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp19_ = _tmp18_;
-#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	disassemble_filename (_tmp19_, &_tmp20_, &_tmp21_);
-#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (name);
-#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	name = _tmp20_;
-#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (ext);
-#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	ext = _tmp21_;
-#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp19_);
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp22_ = name;
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp23_ = test_name;
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = g_strcmp0 (_tmp22_, _tmp23_) == 0;
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (test_ext);
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (test_name);
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (ext);
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (name);
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 12531 "BatchImport.c"
+#line 12003 "BatchImport.c"
 }
 
 
@@ -12542,747 +12014,747 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 	guint64 size = 0ULL;
 	GFile* file_or_dir = NULL;
 	gboolean determined_size = FALSE;
-	BatchImportJob* _tmp0_ = NULL;
+	BatchImportJob* _tmp0_;
 	guint64 _tmp1_ = 0ULL;
 	GFile* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	BatchImportJob* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	BatchImportJob* _tmp7_;
+	gboolean _tmp8_;
 	GError * _inner_error_ = NULL;
-#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_WORK_SNIFFER (self));
-#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_JOB (job));
-#line 1538 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = job;
-#line 1538 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = batch_import_job_determine_file_size (_tmp0_, &_tmp1_, &_tmp2_);
-#line 1538 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	size = _tmp1_;
-#line 1538 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (file_or_dir);
-#line 1538 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	file_or_dir = _tmp2_;
-#line 1538 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	determined_size = _tmp3_;
-#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1546 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = determined_size;
-#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1546 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp4_) {
-#line 12567 "BatchImport.c"
-		guint64 _tmp5_ = 0ULL;
-		guint64 _tmp6_ = 0ULL;
-#line 1540 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 12039 "BatchImport.c"
+		guint64 _tmp5_;
+		guint64 _tmp6_;
+#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = self->total_bytes;
-#line 1540 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = size;
-#line 1540 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->total_bytes = _tmp5_ + _tmp6_;
-#line 12576 "BatchImport.c"
+#line 12048 "BatchImport.c"
 	}
-#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = job;
-#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = batch_import_job_is_directory (_tmp7_);
-#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp8_) {
-#line 12584 "BatchImport.c"
+#line 12056 "BatchImport.c"
 		GFile* dir = NULL;
 		gboolean copy_to_library = FALSE;
 		gboolean _tmp9_ = FALSE;
-		BatchImportJob* _tmp10_ = NULL;
+		BatchImportJob* _tmp10_;
 		GFile* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
-		gboolean _tmp13_ = FALSE;
-		GFile* _tmp21_ = NULL;
-		gboolean _tmp22_ = FALSE;
-#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		gboolean _tmp13_;
+		GFile* _tmp21_;
+		gboolean _tmp22_;
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = job;
-#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = batch_import_job_prepare (_tmp10_, &_tmp11_, &_tmp12_, &_inner_error_);
-#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (dir);
-#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dir = _tmp11_;
-#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		copy_to_library = _tmp12_;
-#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = _tmp13_;
-#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (dir);
-#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (file_or_dir);
-#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12616 "BatchImport.c"
+#line 12088 "BatchImport.c"
 		}
-#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp9_) {
-#line 12620 "BatchImport.c"
-			BatchImportJob* _tmp14_ = NULL;
-			BatchImportJob* _tmp15_ = NULL;
-			gchar* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
-			BatchImportJob* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
-			gchar* _tmp20_ = NULL;
-#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 12092 "BatchImport.c"
+			BatchImportJob* _tmp14_;
+			BatchImportJob* _tmp15_;
+			gchar* _tmp16_;
+			gchar* _tmp17_;
+			BatchImportJob* _tmp18_;
+			gchar* _tmp19_;
+			gchar* _tmp20_;
+#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = job;
-#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp15_ = job;
-#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp16_ = batch_import_job_get_source_identifier (_tmp15_);
-#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp17_ = _tmp16_;
-#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp18_ = job;
-#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp19_ = batch_import_job_get_dest_identifier (_tmp18_);
-#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp20_ = _tmp19_;
-#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp14_, NULL, _tmp17_, _tmp20_, IMPORT_RESULT_FILE_ERROR);
-#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp20_);
-#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp17_);
-#line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (dir);
-#line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (file_or_dir);
-#line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12654 "BatchImport.c"
+#line 12126 "BatchImport.c"
 		}
-#line 1553 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1560 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp21_ = dir;
-#line 1553 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1560 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp22_ = query_is_directory (_tmp21_);
-#line 1553 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1560 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_assert (_tmp22_, "query_is_directory(dir)");
-#line 12662 "BatchImport.c"
+#line 12134 "BatchImport.c"
 		{
-			BatchImportJob* _tmp23_ = NULL;
-			GFile* _tmp24_ = NULL;
-			gboolean _tmp25_ = FALSE;
-#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			BatchImportJob* _tmp23_;
+			GFile* _tmp24_;
+			gboolean _tmp25_;
+#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp23_ = job;
-#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp24_ = dir;
-#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp25_ = copy_to_library;
-#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			work_sniffer_search_dir (self, _tmp23_, _tmp24_, _tmp25_, &_inner_error_);
-#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12677 "BatchImport.c"
-				goto __catch414_g_error;
+#line 12149 "BatchImport.c"
+				goto __catch415_g_error;
 			}
 		}
-		goto __finally414;
-		__catch414_g_error:
+		goto __finally415;
+		__catch415_g_error:
 		{
 			GError* err = NULL;
-			BatchImportJob* _tmp26_ = NULL;
-			GFile* _tmp27_ = NULL;
-			BatchImportJob* _tmp28_ = NULL;
-			gchar* _tmp29_ = NULL;
-			gchar* _tmp30_ = NULL;
-			GFile* _tmp31_ = NULL;
-			gchar* _tmp32_ = NULL;
-			gchar* _tmp33_ = NULL;
-			GError* _tmp34_ = NULL;
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			BatchImportJob* _tmp26_;
+			GFile* _tmp27_;
+			BatchImportJob* _tmp28_;
+			gchar* _tmp29_;
+			gchar* _tmp30_;
+			GFile* _tmp31_;
+			gchar* _tmp32_;
+			gchar* _tmp33_;
+			GError* _tmp34_;
+#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			err = _inner_error_;
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_inner_error_ = NULL;
-#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp26_ = job;
-#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp27_ = dir;
-#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp28_ = job;
-#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp29_ = batch_import_job_get_source_identifier (_tmp28_);
-#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp30_ = _tmp29_;
-#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp31_ = dir;
-#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp32_ = g_file_get_path (_tmp31_);
-#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp33_ = _tmp32_;
-#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp34_ = err;
-#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp26_, _tmp27_, _tmp30_, _tmp33_, _tmp34_, IMPORT_RESULT_FILE_ERROR);
-#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp33_);
-#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp30_);
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 12724 "BatchImport.c"
+#line 12196 "BatchImport.c"
 		}
-		__finally414:
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		__finally415:
+#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (dir);
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (file_or_dir);
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12737 "BatchImport.c"
+#line 12209 "BatchImport.c"
 		}
-#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (dir);
-#line 12741 "BatchImport.c"
+#line 12213 "BatchImport.c"
 	} else {
-		gboolean _tmp35_ = FALSE;
+		gboolean _tmp35_;
 		gboolean _tmp43_ = FALSE;
 		gboolean _tmp44_ = FALSE;
-		GFile* _tmp45_ = NULL;
-		GeeList* _tmp50_ = NULL;
-		BatchImportJob* _tmp51_ = NULL;
-		FileToPrepare* _tmp52_ = NULL;
-		FileToPrepare* _tmp53_ = NULL;
-#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		GFile* _tmp45_;
+		GeeList* _tmp50_;
+		BatchImportJob* _tmp51_;
+		FileToPrepare* _tmp52_;
+		FileToPrepare* _tmp53_;
+#line 1570 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp35_ = determined_size;
-#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1570 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp35_) {
-#line 12755 "BatchImport.c"
+#line 12227 "BatchImport.c"
 			guint64 _tmp36_ = 0ULL;
-			GFile* _tmp37_ = NULL;
-			GCancellable* _tmp38_ = NULL;
-			GCancellable* _tmp39_ = NULL;
-			guint64 _tmp40_ = 0ULL;
-			guint64 _tmp41_ = 0ULL;
-			guint64 _tmp42_ = 0ULL;
-#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			GFile* _tmp37_;
+			GCancellable* _tmp38_;
+			GCancellable* _tmp39_;
+			guint64 _tmp40_;
+			guint64 _tmp41_;
+			guint64 _tmp42_;
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp37_ = file_or_dir;
-#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp38_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp39_ = _tmp38_;
-#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp40_ = query_total_file_size (_tmp37_, _tmp39_, &_inner_error_);
-#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp41_ = _tmp40_;
-#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_tmp39_);
-#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp36_ = _tmp41_;
-#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (file_or_dir);
-#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 12785 "BatchImport.c"
+#line 12257 "BatchImport.c"
 			}
-#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp42_ = self->total_bytes;
-#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			self->total_bytes = _tmp42_ + _tmp36_;
-#line 12791 "BatchImport.c"
+#line 12263 "BatchImport.c"
 		}
-#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp45_ = file_or_dir;
-#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp45_ != NULL) {
-#line 12797 "BatchImport.c"
-			GeeHashSet* _tmp46_ = NULL;
-#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 12269 "BatchImport.c"
+			GeeHashSet* _tmp46_;
+#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp46_ = self->priv->skipset;
-#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp44_ = _tmp46_ != NULL;
-#line 12803 "BatchImport.c"
+#line 12275 "BatchImport.c"
 		} else {
-#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp44_ = FALSE;
-#line 12807 "BatchImport.c"
+#line 12279 "BatchImport.c"
 		}
-#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp44_) {
-#line 12811 "BatchImport.c"
-			GeeHashSet* _tmp47_ = NULL;
-			GFile* _tmp48_ = NULL;
-			gboolean _tmp49_ = FALSE;
-#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 12283 "BatchImport.c"
+			GeeHashSet* _tmp47_;
+			GFile* _tmp48_;
+			gboolean _tmp49_;
+#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp47_ = self->priv->skipset;
-#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp48_ = file_or_dir;
-#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp49_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp48_);
-#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp43_ = _tmp49_;
-#line 12823 "BatchImport.c"
+#line 12295 "BatchImport.c"
 		} else {
-#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp43_ = FALSE;
-#line 12827 "BatchImport.c"
+#line 12299 "BatchImport.c"
 		}
-#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp43_) {
-#line 1568 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (file_or_dir);
-#line 1568 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12835 "BatchImport.c"
+#line 12307 "BatchImport.c"
 		}
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp50_ = self->files_to_prepare;
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp51_ = job;
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp52_ = file_to_prepare_new (_tmp51_, NULL, TRUE);
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp53_ = _tmp52_;
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection), _tmp53_);
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_file_to_prepare_unref0 (_tmp53_);
-#line 12849 "BatchImport.c"
+#line 12321 "BatchImport.c"
 	}
-#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (file_or_dir);
-#line 12853 "BatchImport.c"
+#line 12325 "BatchImport.c"
 }
 
 
 void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir, gboolean copy_to_library, GError** error) {
 	GFileEnumerator* enumerator = NULL;
-	GFile* _tmp0_ = NULL;
-	GFileEnumerator* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFileEnumerator* _tmp1_;
 	GFileInfo* info = NULL;
 	GError * _inner_error_ = NULL;
-#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_WORK_SNIFFER (self));
-#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_JOB (job));
-#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_IS_FILE (dir));
-#line 1576 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = dir;
-#line 1576 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = g_file_enumerate_children (_tmp0_, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
-#line 1576 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	enumerator = _tmp1_;
-#line 1576 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1576 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1576 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return;
-#line 12881 "BatchImport.c"
+#line 12353 "BatchImport.c"
 	}
-#line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1586 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	info = NULL;
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	while (TRUE) {
-#line 12887 "BatchImport.c"
+#line 12359 "BatchImport.c"
 		GFileInfo* _tmp2_ = NULL;
-		GFileEnumerator* _tmp3_ = NULL;
-		GCancellable* _tmp4_ = NULL;
-		GCancellable* _tmp5_ = NULL;
-		GFileInfo* _tmp6_ = NULL;
-		GFileInfo* _tmp7_ = NULL;
-		GFileInfo* _tmp8_ = NULL;
-		GFileInfo* _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
+		GFileEnumerator* _tmp3_;
+		GCancellable* _tmp4_;
+		GCancellable* _tmp5_;
+		GFileInfo* _tmp6_;
+		GFileInfo* _tmp7_;
+		GFileInfo* _tmp8_;
+		GFileInfo* _tmp9_;
+		gboolean _tmp10_;
 		GFile* child = NULL;
-		GFile* _tmp11_ = NULL;
-		GFileInfo* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		GFile* _tmp14_ = NULL;
+		GFile* _tmp11_;
+		GFileInfo* _tmp12_;
+		const gchar* _tmp13_;
+		GFile* _tmp14_;
 		GFileType file_type = 0;
-		GFileInfo* _tmp15_ = NULL;
-		GFileType _tmp16_ = 0;
-		GFileType _tmp17_ = 0;
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		GFileInfo* _tmp15_;
+		GFileType _tmp16_;
+		GFileType _tmp17_;
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = enumerator;
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = _tmp4_;
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = g_file_enumerator_next_file (_tmp3_, _tmp5_, &_inner_error_);
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = _tmp6_;
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp5_);
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = _tmp7_;
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (info);
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (enumerator);
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12930 "BatchImport.c"
+#line 12402 "BatchImport.c"
 		}
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = _tmp2_;
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = NULL;
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (info);
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		info = _tmp8_;
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = info;
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!(_tmp9_ != NULL)) {
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_tmp2_);
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 12948 "BatchImport.c"
+#line 12420 "BatchImport.c"
 		}
-#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1589 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1589 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp10_) {
-#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1590 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_tmp2_);
-#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1590 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 12958 "BatchImport.c"
+#line 12430 "BatchImport.c"
 		}
-#line 1585 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = dir;
-#line 1585 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp12_ = info;
-#line 1585 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = g_file_info_get_name (_tmp12_);
-#line 1585 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = g_file_get_child (_tmp11_, _tmp13_);
-#line 1585 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		child = _tmp14_;
-#line 1586 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp15_ = info;
-#line 1586 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp16_ = g_file_info_get_file_type (_tmp15_);
-#line 1586 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_type = _tmp16_;
-#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp17_ = file_type;
-#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp17_ == G_FILE_TYPE_DIRECTORY) {
-#line 12980 "BatchImport.c"
-			GFileInfo* _tmp18_ = NULL;
-			const gchar* _tmp19_ = NULL;
-			gboolean _tmp20_ = FALSE;
-#line 1589 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 12452 "BatchImport.c"
+			GFileInfo* _tmp18_;
+			const gchar* _tmp19_;
+			gboolean _tmp20_;
+#line 1596 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp18_ = info;
-#line 1589 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1596 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp19_ = g_file_info_get_name (_tmp18_);
-#line 1589 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1596 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp20_ = g_str_has_prefix (_tmp19_, ".");
-#line 1589 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1596 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp20_) {
-#line 1590 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1597 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (child);
-#line 1590 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1597 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_tmp2_);
-#line 1590 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1597 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 12998 "BatchImport.c"
+#line 12470 "BatchImport.c"
 			}
 			{
-				BatchImportJob* _tmp21_ = NULL;
-				GFile* _tmp22_ = NULL;
-				gboolean _tmp23_ = FALSE;
-#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				BatchImportJob* _tmp21_;
+				GFile* _tmp22_;
+				gboolean _tmp23_;
+#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp21_ = job;
-#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp22_ = child;
-#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp23_ = copy_to_library;
-#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				work_sniffer_search_dir (self, _tmp21_, _tmp22_, _tmp23_, &_inner_error_);
-#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13014 "BatchImport.c"
-					goto __catch415_g_error;
+#line 12486 "BatchImport.c"
+					goto __catch416_g_error;
 				}
 			}
-			goto __finally415;
-			__catch415_g_error:
+			goto __finally416;
+			__catch416_g_error:
 			{
 				GError* err = NULL;
-				BatchImportJob* _tmp24_ = NULL;
-				GFile* _tmp25_ = NULL;
-				GFile* _tmp26_ = NULL;
-				gchar* _tmp27_ = NULL;
-				gchar* _tmp28_ = NULL;
-				GFile* _tmp29_ = NULL;
-				gchar* _tmp30_ = NULL;
-				gchar* _tmp31_ = NULL;
-				GError* _tmp32_ = NULL;
-#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				BatchImportJob* _tmp24_;
+				GFile* _tmp25_;
+				GFile* _tmp26_;
+				gchar* _tmp27_;
+				gchar* _tmp28_;
+				GFile* _tmp29_;
+				gchar* _tmp30_;
+				gchar* _tmp31_;
+				GError* _tmp32_;
+#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				err = _inner_error_;
-#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_inner_error_ = NULL;
-#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp24_ = job;
-#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp25_ = child;
-#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp26_ = child;
-#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp27_ = g_file_get_path (_tmp26_);
-#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp28_ = _tmp27_;
-#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp29_ = child;
-#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp30_ = g_file_get_path (_tmp29_);
-#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp31_ = _tmp30_;
-#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp32_ = err;
-#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp24_, _tmp25_, _tmp28_, _tmp31_, _tmp32_, IMPORT_RESULT_FILE_ERROR);
-#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp31_);
-#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp28_);
-#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_error_free0 (err);
-#line 13061 "BatchImport.c"
+#line 12533 "BatchImport.c"
 			}
-			__finally415:
-#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			__finally416:
+#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (child);
-#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_tmp2_);
-#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (info);
-#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (enumerator);
-#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 13078 "BatchImport.c"
+#line 12550 "BatchImport.c"
 			}
 		} else {
-			GFileType _tmp33_ = 0;
-#line 1598 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			GFileType _tmp33_;
+#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp33_ = file_type;
-#line 1598 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp33_ == G_FILE_TYPE_REGULAR) {
-#line 13086 "BatchImport.c"
+#line 12558 "BatchImport.c"
 				gboolean _tmp34_ = FALSE;
-				GeeHashSet* _tmp35_ = NULL;
+				GeeHashSet* _tmp35_;
 				gboolean _tmp39_ = FALSE;
 				gboolean _tmp40_ = FALSE;
-				GFile* _tmp41_ = NULL;
-				gboolean _tmp42_ = FALSE;
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				GFile* _tmp41_;
+				gboolean _tmp42_;
+#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp35_ = self->priv->skipset;
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp35_ != NULL) {
-#line 13097 "BatchImport.c"
-					GeeHashSet* _tmp36_ = NULL;
-					GFile* _tmp37_ = NULL;
-					gboolean _tmp38_ = FALSE;
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 12569 "BatchImport.c"
+					GeeHashSet* _tmp36_;
+					GFile* _tmp37_;
+					gboolean _tmp38_;
+#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp36_ = self->priv->skipset;
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp37_ = child;
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp38_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp37_);
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp34_ = _tmp38_;
-#line 13109 "BatchImport.c"
+#line 12581 "BatchImport.c"
 				} else {
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp34_ = FALSE;
-#line 13113 "BatchImport.c"
+#line 12585 "BatchImport.c"
 				}
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp34_) {
-#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (child);
-#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_tmp2_);
-#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 13123 "BatchImport.c"
+#line 12595 "BatchImport.c"
 				}
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp41_ = child;
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp42_ = photo_is_file_image (_tmp41_);
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp42_) {
-#line 13131 "BatchImport.c"
-					GFile* _tmp43_ = NULL;
-					gboolean _tmp44_ = FALSE;
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 12603 "BatchImport.c"
+					GFile* _tmp43_;
+					gboolean _tmp44_;
+#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp43_ = child;
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp44_ = photo_file_format_is_file_supported (_tmp43_);
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp40_ = _tmp44_;
-#line 13140 "BatchImport.c"
+#line 12612 "BatchImport.c"
 				} else {
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp40_ = FALSE;
-#line 13144 "BatchImport.c"
+#line 12616 "BatchImport.c"
 				}
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp40_) {
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp39_ = TRUE;
-#line 13150 "BatchImport.c"
+#line 12622 "BatchImport.c"
 				} else {
-					GFile* _tmp45_ = NULL;
-					gboolean _tmp46_ = FALSE;
-#line 1603 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					GFile* _tmp45_;
+					gboolean _tmp46_;
+#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp45_ = child;
-#line 1603 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp46_ = video_reader_is_supported_video_file (_tmp45_);
-#line 1603 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp39_ = _tmp46_;
-#line 13160 "BatchImport.c"
+#line 12632 "BatchImport.c"
 				}
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp39_) {
-#line 13164 "BatchImport.c"
-					guint64 _tmp47_ = 0ULL;
-					GFileInfo* _tmp48_ = NULL;
-					gint64 _tmp49_ = 0LL;
-					GeeList* _tmp50_ = NULL;
-					BatchImportJob* _tmp51_ = NULL;
-					GFile* _tmp52_ = NULL;
-					gboolean _tmp53_ = FALSE;
-					FileToPrepare* _tmp54_ = NULL;
-					FileToPrepare* _tmp55_ = NULL;
-#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 12636 "BatchImport.c"
+					guint64 _tmp47_;
+					GFileInfo* _tmp48_;
+					gint64 _tmp49_;
+					GeeList* _tmp50_;
+					BatchImportJob* _tmp51_;
+					GFile* _tmp52_;
+					gboolean _tmp53_;
+					FileToPrepare* _tmp54_;
+					FileToPrepare* _tmp55_;
+#line 1611 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp47_ = self->total_bytes;
-#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1611 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp48_ = info;
-#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1611 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp49_ = g_file_info_get_size (_tmp48_);
-#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1611 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					self->total_bytes = _tmp47_ + _tmp49_;
-#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp50_ = self->files_to_prepare;
-#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp51_ = job;
-#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp52_ = child;
-#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp53_ = copy_to_library;
-#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp54_ = file_to_prepare_new (_tmp51_, _tmp52_, _tmp53_);
-#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp55_ = _tmp54_;
-#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection), _tmp55_);
-#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_file_to_prepare_unref0 (_tmp55_);
-#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (child);
-#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_tmp2_);
-#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 13204 "BatchImport.c"
+#line 12676 "BatchImport.c"
 				}
 			} else {
-				GFile* _tmp56_ = NULL;
-				gchar* _tmp57_ = NULL;
-				gchar* _tmp58_ = NULL;
-				GFileType _tmp59_ = 0;
-#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				GFile* _tmp56_;
+				gchar* _tmp57_;
+				gchar* _tmp58_;
+				GFileType _tmp59_;
+#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp56_ = child;
-#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp57_ = g_file_get_path (_tmp56_);
-#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp58_ = _tmp57_;
-#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp59_ = file_type;
-#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				g_warning ("BatchImport.vala:1610: Ignoring import of %s file type %d", _tmp58_, (gint) _tmp59_);
-#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				g_warning ("BatchImport.vala:1617: Ignoring import of %s file type %d", _tmp58_, (gint) _tmp59_);
+#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp58_);
-#line 13223 "BatchImport.c"
+#line 12695 "BatchImport.c"
 			}
 		}
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (child);
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp2_);
-#line 13230 "BatchImport.c"
+#line 12702 "BatchImport.c"
 	}
-#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (info);
-#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (enumerator);
-#line 13236 "BatchImport.c"
+#line 12708 "BatchImport.c"
 }
 
 
 static void work_sniffer_class_init (WorkSnifferClass * klass) {
-#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	work_sniffer_parent_class = g_type_class_peek_parent (klass);
-#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->finalize = work_sniffer_finalize;
-#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_type_class_add_private (klass, sizeof (WorkSnifferPrivate));
-#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) work_sniffer_real_execute;
-#line 13249 "BatchImport.c"
+#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) work_sniffer_real_execute;
+#line 12721 "BatchImport.c"
 }
 
 
 static void work_sniffer_instance_init (WorkSniffer * self) {
-	GeeArrayList* _tmp0_ = NULL;
-#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	GeeArrayList* _tmp0_;
+#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = WORK_SNIFFER_GET_PRIVATE (self);
-#line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1444 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = gee_array_list_new (TYPE_FILE_TO_PREPARE, (GBoxedCopyFunc) file_to_prepare_ref, (GDestroyNotify) file_to_prepare_unref, NULL, NULL, NULL);
-#line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1444 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->files_to_prepare = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->total_bytes = (guint64) 0;
-#line 13263 "BatchImport.c"
+#line 12735 "BatchImport.c"
 }
 
 
-static void work_sniffer_finalize (BackgroundJob* obj) {
+static void work_sniffer_finalize (BackgroundJob * obj) {
 	WorkSniffer * self;
-#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_WORK_SNIFFER, WorkSniffer);
-#line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1444 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->files_to_prepare);
-#line 1440 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1447 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->jobs);
-#line 1441 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1448 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->skipset);
-#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (work_sniffer_parent_class)->finalize (obj);
-#line 13279 "BatchImport.c"
+#line 12751 "BatchImport.c"
 }
 
 
@@ -13300,354 +12772,354 @@ GType work_sniffer_get_type (void) {
 
 PreparedFile* prepared_file_construct (GType object_type, BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video) {
 	PreparedFile* self = NULL;
-	BatchImportJob* _tmp0_ = NULL;
-	BatchImportJob* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	PhotoFileFormat _tmp17_ = 0;
-	guint64 _tmp18_ = 0ULL;
-	gboolean _tmp19_ = FALSE;
-#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	BatchImportJob* _tmp0_;
+	BatchImportJob* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	const gchar* _tmp8_;
+	gchar* _tmp9_;
+	gboolean _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
+	const gchar* _tmp13_;
+	gchar* _tmp14_;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
+	PhotoFileFormat _tmp17_;
+	guint64 _tmp18_;
+	gboolean _tmp19_;
+#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL);
-#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((associated_file == NULL) || G_IS_FILE (associated_file), NULL);
-#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (source_id != NULL, NULL);
-#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (dest_id != NULL, NULL);
-#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (PreparedFile*) g_type_create_instance (object_type);
-#line 1634 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = job;
-#line 1634 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _batch_import_job_ref0 (_tmp0_);
-#line 1634 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->job);
-#line 1634 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->job = _tmp1_;
-#line 1635 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1642 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->result = IMPORT_RESULT_SUCCESS;
-#line 1636 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = file;
-#line 1636 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1636 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->file);
-#line 1636 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->file = _tmp3_;
-#line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1644 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = associated_file;
-#line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1644 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1644 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->associated_file);
-#line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1644 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->associated_file = _tmp5_;
-#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1645 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = source_id;
-#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1645 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1645 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->source_id);
-#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1645 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->source_id = _tmp7_;
-#line 1639 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1646 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = dest_id;
-#line 1639 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1646 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = g_strdup (_tmp8_);
-#line 1639 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1646 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->dest_id);
-#line 1639 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1646 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->dest_id = _tmp9_;
-#line 1640 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1647 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = copy_to_library;
-#line 1640 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1647 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->copy_to_library = _tmp10_;
-#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1648 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp11_ = exif_md5;
-#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1648 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp12_ = g_strdup (_tmp11_);
-#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1648 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->exif_md5);
-#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1648 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->exif_md5 = _tmp12_;
-#line 1642 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1649 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp13_ = thumbnail_md5;
-#line 1642 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1649 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp14_ = g_strdup (_tmp13_);
-#line 1642 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1649 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->thumbnail_md5);
-#line 1642 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1649 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->thumbnail_md5 = _tmp14_;
-#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp15_ = full_md5;
-#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp16_ = g_strdup (_tmp15_);
-#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->full_md5);
-#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->full_md5 = _tmp16_;
-#line 1644 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1651 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp17_ = file_format;
-#line 1644 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1651 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->file_format = _tmp17_;
-#line 1645 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1652 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp18_ = filesize;
-#line 1645 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1652 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->filesize = _tmp18_;
-#line 1646 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp19_ = is_video;
-#line 1646 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->is_video = _tmp19_;
-#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 13413 "BatchImport.c"
+#line 12885 "BatchImport.c"
 }
 
 
 PreparedFile* prepared_file_new (BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video) {
-#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return prepared_file_construct (TYPE_PREPARED_FILE, job, file, associated_file, source_id, dest_id, copy_to_library, exif_md5, thumbnail_md5, full_md5, file_format, filesize, is_video);
-#line 13420 "BatchImport.c"
+#line 12892 "BatchImport.c"
 }
 
 
 static void value_prepared_file_init (GValue* value) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 13427 "BatchImport.c"
+#line 12899 "BatchImport.c"
 }
 
 
 static void value_prepared_file_free_value (GValue* value) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		prepared_file_unref (value->data[0].v_pointer);
-#line 13436 "BatchImport.c"
+#line 12908 "BatchImport.c"
 	}
 }
 
 
 static void value_prepared_file_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = prepared_file_ref (src_value->data[0].v_pointer);
-#line 13446 "BatchImport.c"
+#line 12918 "BatchImport.c"
 	} else {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 13450 "BatchImport.c"
+#line 12922 "BatchImport.c"
 	}
 }
 
 
 static gpointer value_prepared_file_peek_pointer (const GValue* value) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 13458 "BatchImport.c"
+#line 12930 "BatchImport.c"
 }
 
 
 static gchar* value_prepared_file_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 13465 "BatchImport.c"
-		PreparedFile* object;
+#line 12937 "BatchImport.c"
+		PreparedFile * object;
 		object = collect_values[0].v_pointer;
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13472 "BatchImport.c"
+#line 12944 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13476 "BatchImport.c"
+#line 12948 "BatchImport.c"
 		}
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = prepared_file_ref (object);
-#line 13480 "BatchImport.c"
+#line 12952 "BatchImport.c"
 	} else {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 13484 "BatchImport.c"
+#line 12956 "BatchImport.c"
 	}
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 13488 "BatchImport.c"
+#line 12960 "BatchImport.c"
 }
 
 
 static gchar* value_prepared_file_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PreparedFile** object_p;
+	PreparedFile ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 13499 "BatchImport.c"
+#line 12971 "BatchImport.c"
 	}
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 13505 "BatchImport.c"
+#line 12977 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 13509 "BatchImport.c"
+#line 12981 "BatchImport.c"
 	} else {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = prepared_file_ref (value->data[0].v_pointer);
-#line 13513 "BatchImport.c"
+#line 12985 "BatchImport.c"
 	}
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 13517 "BatchImport.c"
+#line 12989 "BatchImport.c"
 }
 
 
 GParamSpec* param_spec_prepared_file (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPreparedFile* spec;
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PREPARED_FILE), NULL);
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 13531 "BatchImport.c"
+#line 13003 "BatchImport.c"
 }
 
 
 gpointer value_get_prepared_file (const GValue* value) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREPARED_FILE), NULL);
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 13540 "BatchImport.c"
+#line 13012 "BatchImport.c"
 }
 
 
 void value_set_prepared_file (GValue* value, gpointer v_object) {
-	PreparedFile* old;
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	PreparedFile * old;
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREPARED_FILE));
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PREPARED_FILE));
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		prepared_file_ref (value->data[0].v_pointer);
-#line 13560 "BatchImport.c"
+#line 13032 "BatchImport.c"
 	} else {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 13564 "BatchImport.c"
+#line 13036 "BatchImport.c"
 	}
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		prepared_file_unref (old);
-#line 13570 "BatchImport.c"
+#line 13042 "BatchImport.c"
 	}
 }
 
 
 void value_take_prepared_file (GValue* value, gpointer v_object) {
-	PreparedFile* old;
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	PreparedFile * old;
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREPARED_FILE));
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PREPARED_FILE));
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 13589 "BatchImport.c"
+#line 13061 "BatchImport.c"
 	} else {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 13593 "BatchImport.c"
+#line 13065 "BatchImport.c"
 	}
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		prepared_file_unref (old);
-#line 13599 "BatchImport.c"
+#line 13071 "BatchImport.c"
 	}
 }
 
 
 static void prepared_file_class_init (PreparedFileClass * klass) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	prepared_file_parent_class = g_type_class_peek_parent (klass);
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((PreparedFileClass *) klass)->finalize = prepared_file_finalize;
-#line 13609 "BatchImport.c"
+#line 13081 "BatchImport.c"
 }
 
 
 static void prepared_file_instance_init (PreparedFile * self) {
-#line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1627 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->associated_file = NULL;
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 13618 "BatchImport.c"
+#line 13090 "BatchImport.c"
 }
 
 
-static void prepared_file_finalize (PreparedFile* obj) {
+static void prepared_file_finalize (PreparedFile * obj) {
 	PreparedFile * self;
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARED_FILE, PreparedFile);
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_handlers_destroy (self);
-#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1624 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->job);
-#line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->file);
-#line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1627 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->associated_file);
-#line 1621 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1628 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->source_id);
-#line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->dest_id);
-#line 1624 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->exif_md5);
-#line 1625 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->thumbnail_md5);
-#line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1633 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->full_md5);
-#line 13644 "BatchImport.c"
+#line 13116 "BatchImport.c"
 }
 
 
@@ -13666,65 +13138,65 @@ GType prepared_file_get_type (void) {
 
 
 gpointer prepared_file_ref (gpointer instance) {
-	PreparedFile* self;
+	PreparedFile * self;
 	self = instance;
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 13669 "BatchImport.c"
+#line 13141 "BatchImport.c"
 }
 
 
 void prepared_file_unref (gpointer instance) {
-	PreparedFile* self;
+	PreparedFile * self;
 	self = instance;
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		PREPARED_FILE_GET_CLASS (self)->finalize (self);
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 13682 "BatchImport.c"
+#line 13154 "BatchImport.c"
 	}
 }
 
 
 PreparedFileCluster* prepared_file_cluster_construct (GType object_type, GeeArrayList* list) {
 	PreparedFileCluster* self = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-#line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp1_;
+#line 1660 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (GEE_IS_ARRAY_LIST (list), NULL);
-#line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1660 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (PreparedFileCluster*) interlocked_notification_object_construct (object_type);
-#line 1654 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = list;
-#line 1654 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1654 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->list);
-#line 1654 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->list = _tmp1_;
-#line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1660 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 13705 "BatchImport.c"
+#line 13177 "BatchImport.c"
 }
 
 
 PreparedFileCluster* prepared_file_cluster_new (GeeArrayList* list) {
-#line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1660 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return prepared_file_cluster_construct (TYPE_PREPARED_FILE_CLUSTER, list);
-#line 13712 "BatchImport.c"
+#line 13184 "BatchImport.c"
 }
 
 
 static void prepared_file_cluster_class_init (PreparedFileClusterClass * klass) {
-#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1657 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	prepared_file_cluster_parent_class = g_type_class_peek_parent (klass);
-#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1657 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((NotificationObjectClass *) klass)->finalize = prepared_file_cluster_finalize;
-#line 13721 "BatchImport.c"
+#line 13193 "BatchImport.c"
 }
 
 
@@ -13732,15 +13204,15 @@ static void prepared_file_cluster_instance_init (PreparedFileCluster * self) {
 }
 
 
-static void prepared_file_cluster_finalize (NotificationObject* obj) {
+static void prepared_file_cluster_finalize (NotificationObject * obj) {
 	PreparedFileCluster * self;
-#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1657 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARED_FILE_CLUSTER, PreparedFileCluster);
-#line 1651 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->list);
-#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1657 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	NOTIFICATION_OBJECT_CLASS (prepared_file_cluster_parent_class)->finalize (obj);
-#line 13737 "BatchImport.c"
+#line 13209 "BatchImport.c"
 }
 
 
@@ -13758,1836 +13230,1836 @@ GType prepared_file_cluster_get_type (void) {
 
 PrepareFilesJob* prepare_files_job_construct (GType object_type, BatchImport* owner, GeeList* files_to_prepare, NotificationCallback notification, void* notification_target, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) {
 	PrepareFilesJob* self = NULL;
-	BatchImport* _tmp0_ = NULL;
-	CompletionCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	GCancellable* _tmp2_ = NULL;
-	CancellationCallback _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
-	GeeList* _tmp4_ = NULL;
-	GeeList* _tmp5_ = NULL;
-	NotificationCallback _tmp6_ = NULL;
-	void* _tmp6__target = NULL;
-	GFile* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	BatchImport* _tmp0_;
+	CompletionCallback _tmp1_;
+	void* _tmp1__target;
+	GCancellable* _tmp2_;
+	CancellationCallback _tmp3_;
+	void* _tmp3__target;
+	GeeList* _tmp4_;
+	GeeList* _tmp5_;
+	NotificationCallback _tmp6_;
+	void* _tmp6__target;
+	GFile* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL);
-#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (GEE_IS_LIST (files_to_prepare), NULL);
-#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 1674 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = owner;
-#line 1674 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = callback;
-#line 1674 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1__target = callback_target;
-#line 1674 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = cancellable;
-#line 1674 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = cancellation;
-#line 1674 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3__target = cancellation_target;
-#line 1674 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (PrepareFilesJob*) background_import_job_construct (object_type, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target);
-#line 1676 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1683 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = files_to_prepare;
-#line 1676 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1683 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 1676 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1683 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->files_to_prepare);
-#line 1676 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1683 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->files_to_prepare = _tmp5_;
-#line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1684 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = notification;
-#line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1684 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6__target = notification_target;
-#line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1684 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->notification = _tmp6_;
-#line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1684 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->notification_target = _tmp6__target;
-#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = app_dirs_get_import_dir ();
-#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->library_dir);
-#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->library_dir = _tmp7_;
-#line 1679 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1686 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = prepare_files_job_get_test_variable ("SHOTWELL_FAIL_EVERY");
-#line 1679 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1686 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->fail_every = _tmp8_;
-#line 1680 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1687 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = prepare_files_job_get_test_variable ("SHOTWELL_SKIP_EVERY");
-#line 1680 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1687 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->skip_every = _tmp9_;
-#line 1682 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1689 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	background_job_set_notification_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW);
-#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 13822 "BatchImport.c"
+#line 13294 "BatchImport.c"
 }
 
 
 PrepareFilesJob* prepare_files_job_new (BatchImport* owner, GeeList* files_to_prepare, NotificationCallback notification, void* notification_target, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) {
-#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return prepare_files_job_construct (TYPE_PREPARE_FILES_JOB, owner, files_to_prepare, notification, notification_target, callback, callback_target, cancellable, cancellation, cancellation_target);
-#line 13829 "BatchImport.c"
+#line 13301 "BatchImport.c"
 }
 
 
 static gint prepare_files_job_get_test_variable (const gchar* name) {
 	gint result = 0;
 	gchar* value = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	gint _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
-	const gchar* _tmp5_ = NULL;
-#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	const gchar* _tmp5_;
+#line 1692 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (name != NULL, 0);
-#line 1686 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1693 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = name;
-#line 1686 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1693 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = g_getenv (_tmp0_);
-#line 1686 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1693 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1686 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1693 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value = _tmp2_;
-#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = value;
-#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp5_ == NULL) {
-#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = TRUE;
-#line 13858 "BatchImport.c"
+#line 13330 "BatchImport.c"
 	} else {
-		const gchar* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
-#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		const gchar* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
+#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = value;
-#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = strlen (_tmp6_);
-#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = _tmp7_;
-#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = _tmp8_ == 0;
-#line 13871 "BatchImport.c"
+#line 13343 "BatchImport.c"
 	}
-#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp4_) {
-#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = 0;
-#line 13877 "BatchImport.c"
+#line 13349 "BatchImport.c"
 	} else {
-		const gchar* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		const gchar* _tmp9_;
+		gint _tmp10_;
+#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = value;
-#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = atoi (_tmp9_);
-#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = _tmp10_;
-#line 13887 "BatchImport.c"
+#line 13359 "BatchImport.c"
 	}
-#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp3_;
-#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (value);
-#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 13895 "BatchImport.c"
+#line 13367 "BatchImport.c"
 }
 
 
 static void prepare_files_job_real_execute (BackgroundJob* base) {
 	PrepareFilesJob * self;
 	GTimer* timer = NULL;
-	GTimer* _tmp0_ = NULL;
+	GTimer* _tmp0_;
 	GeeArrayList* list = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	GeeArrayList* _tmp90_ = NULL;
-	gint _tmp91_ = 0;
-	gint _tmp92_ = 0;
-#line 1691 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	GeeArrayList* _tmp1_;
+	GeeArrayList* _tmp90_;
+	gint _tmp91_;
+	gint _tmp92_;
+#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PREPARE_FILES_JOB, PrepareFilesJob);
-#line 1692 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1699 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = g_timer_new ();
-#line 1692 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1699 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	timer = _tmp0_;
-#line 1694 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL);
-#line 1694 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	list = _tmp1_;
-#line 13918 "BatchImport.c"
+#line 13390 "BatchImport.c"
 	{
 		GeeList* _file_to_prepare_list = NULL;
-		GeeList* _tmp2_ = NULL;
-		GeeList* _tmp3_ = NULL;
+		GeeList* _tmp2_;
+		GeeList* _tmp3_;
 		gint _file_to_prepare_size = 0;
-		GeeList* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+		GeeList* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 		gint _file_to_prepare_index = 0;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->priv->files_to_prepare;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_file_to_prepare_list = _tmp3_;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = _file_to_prepare_list;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = _tmp5_;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_file_to_prepare_size = _tmp6_;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_file_to_prepare_index = -1;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 13946 "BatchImport.c"
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
+#line 13418 "BatchImport.c"
+			gint _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
 			FileToPrepare* file_to_prepare = NULL;
-			GeeList* _tmp10_ = NULL;
-			gint _tmp11_ = 0;
-			gpointer _tmp12_ = NULL;
+			GeeList* _tmp10_;
+			gint _tmp11_;
+			gpointer _tmp12_;
 			ImportResult _result_ = 0;
-			ImportResult _tmp13_ = 0;
-			ImportResult _tmp14_ = 0;
+			ImportResult _tmp13_;
+			ImportResult _tmp14_;
 			BatchImportJob* job = NULL;
-			FileToPrepare* _tmp26_ = NULL;
-			BatchImportJob* _tmp27_ = NULL;
-			BatchImportJob* _tmp28_ = NULL;
+			FileToPrepare* _tmp26_;
+			BatchImportJob* _tmp27_;
+			BatchImportJob* _tmp28_;
 			GFile* file = NULL;
-			FileToPrepare* _tmp29_ = NULL;
-			GFile* _tmp30_ = NULL;
-			GFile* _tmp31_ = NULL;
+			FileToPrepare* _tmp29_;
+			GFile* _tmp30_;
+			GFile* _tmp31_;
 			GFile* _tmp32_ = NULL;
-			FileToPrepare* _tmp33_ = NULL;
-			FileToPrepare* _tmp34_ = NULL;
+			FileToPrepare* _tmp33_;
+			FileToPrepare* _tmp34_;
 			GFile* associated = NULL;
-			GFile* _tmp38_ = NULL;
+			GFile* _tmp38_;
 			gboolean copy_to_library = FALSE;
-			FileToPrepare* _tmp39_ = NULL;
-			gboolean _tmp40_ = FALSE;
-			GFile* _tmp41_ = NULL;
+			FileToPrepare* _tmp39_;
+			gboolean _tmp40_;
+			GFile* _tmp41_;
 			gboolean _tmp46_ = FALSE;
-			GFile* _tmp47_ = NULL;
+			GFile* _tmp47_;
 			PreparedFile* prepared_file = NULL;
-			BatchImportJob* _tmp55_ = NULL;
-			GFile* _tmp56_ = NULL;
-			GFile* _tmp57_ = NULL;
-			gboolean _tmp58_ = FALSE;
+			BatchImportJob* _tmp55_;
+			GFile* _tmp56_;
+			GFile* _tmp57_;
+			gboolean _tmp58_;
 			PreparedFile* _tmp59_ = NULL;
-			ImportResult _tmp60_ = 0;
-			ImportResult _tmp61_ = 0;
+			ImportResult _tmp60_;
+			ImportResult _tmp61_;
 			gboolean _tmp74_ = FALSE;
-			GeeArrayList* _tmp75_ = NULL;
-			gint _tmp76_ = 0;
-			gint _tmp77_ = 0;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			GeeArrayList* _tmp75_;
+			gint _tmp76_;
+			gint _tmp77_;
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp7_ = _file_to_prepare_index;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_file_to_prepare_index = _tmp7_ + 1;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp8_ = _file_to_prepare_index;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp9_ = _file_to_prepare_size;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 14000 "BatchImport.c"
+#line 13472 "BatchImport.c"
 			}
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp10_ = _file_to_prepare_list;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp11_ = _file_to_prepare_index;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			file_to_prepare = (FileToPrepare*) _tmp12_;
-#line 1696 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp13_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
-#line 1696 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_result_ = _tmp13_;
-#line 1697 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = _result_;
-#line 1697 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp14_ != IMPORT_RESULT_SUCCESS) {
-#line 14018 "BatchImport.c"
-				FileToPrepare* _tmp15_ = NULL;
-				BatchImportJob* _tmp16_ = NULL;
-				FileToPrepare* _tmp17_ = NULL;
-				BatchImportJob* _tmp18_ = NULL;
-				gchar* _tmp19_ = NULL;
-				gchar* _tmp20_ = NULL;
-				FileToPrepare* _tmp21_ = NULL;
-				BatchImportJob* _tmp22_ = NULL;
-				gchar* _tmp23_ = NULL;
-				gchar* _tmp24_ = NULL;
-				ImportResult _tmp25_ = 0;
-#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 13490 "BatchImport.c"
+				FileToPrepare* _tmp15_;
+				BatchImportJob* _tmp16_;
+				FileToPrepare* _tmp17_;
+				BatchImportJob* _tmp18_;
+				gchar* _tmp19_;
+				gchar* _tmp20_;
+				FileToPrepare* _tmp21_;
+				BatchImportJob* _tmp22_;
+				gchar* _tmp23_;
+				gchar* _tmp24_;
+				ImportResult _tmp25_;
+#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp15_ = file_to_prepare;
-#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp16_ = _tmp15_->job;
-#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp17_ = file_to_prepare;
-#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp18_ = _tmp17_->job;
-#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp19_ = batch_import_job_get_dest_identifier (_tmp18_);
-#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp20_ = _tmp19_;
-#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp21_ = file_to_prepare;
-#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp22_ = _tmp21_->job;
-#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp23_ = batch_import_job_get_source_identifier (_tmp22_);
-#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp24_ = _tmp23_;
-#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp25_ = _result_;
-#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp16_, NULL, _tmp20_, _tmp24_, _tmp25_);
-#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp24_);
-#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp20_);
-#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1708 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_file_to_prepare_unref0 (file_to_prepare);
-#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1708 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 14062 "BatchImport.c"
+#line 13534 "BatchImport.c"
 			}
-#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp26_ = file_to_prepare;
-#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp27_ = _tmp26_->job;
-#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp28_ = _batch_import_job_ref0 (_tmp27_);
-#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			job = _tmp28_;
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp29_ = file_to_prepare;
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp30_ = _tmp29_->file;
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp31_ = _g_object_ref0 (_tmp30_);
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			file = _tmp31_;
-#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp33_ = file_to_prepare;
-#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp34_ = _tmp33_->associated;
-#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp34_ != NULL) {
-#line 14086 "BatchImport.c"
-				FileToPrepare* _tmp35_ = NULL;
-				FileToPrepare* _tmp36_ = NULL;
-				GFile* _tmp37_ = NULL;
-#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 13558 "BatchImport.c"
+				FileToPrepare* _tmp35_;
+				FileToPrepare* _tmp36_;
+				GFile* _tmp37_;
+#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp35_ = file_to_prepare;
-#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp36_ = _tmp35_->associated;
-#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp37_ = _tmp36_->file;
-#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp32_ = _tmp37_;
-#line 14098 "BatchImport.c"
+#line 13570 "BatchImport.c"
 			} else {
-#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp32_ = NULL;
-#line 14102 "BatchImport.c"
+#line 13574 "BatchImport.c"
 			}
-#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp38_ = _g_object_ref0 (_tmp32_);
-#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			associated = _tmp38_;
-#line 1707 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1714 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp39_ = file_to_prepare;
-#line 1707 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1714 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp40_ = _tmp39_->copy_to_library;
-#line 1707 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1714 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			copy_to_library = _tmp40_;
-#line 1710 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1717 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp41_ = file;
-#line 1710 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1717 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp41_ == NULL) {
-#line 14118 "BatchImport.c"
-				BatchImportJob* _tmp42_ = NULL;
+#line 13590 "BatchImport.c"
+				BatchImportJob* _tmp42_;
 				GFile* _tmp43_ = NULL;
 				gboolean _tmp44_ = FALSE;
-				gboolean _tmp45_ = FALSE;
-#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				gboolean _tmp45_;
+#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp42_ = job;
-#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp45_ = prepare_files_job_create_file (self, _tmp42_, &_tmp43_, &_tmp44_);
-#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (file);
-#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				file = _tmp43_;
-#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				copy_to_library = _tmp44_;
-#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (!_tmp45_) {
-#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (associated);
-#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (file);
-#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_batch_import_job_unref0 (job);
-#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_file_to_prepare_unref0 (file_to_prepare);
-#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 14145 "BatchImport.c"
+#line 13617 "BatchImport.c"
 				}
 			}
-#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp47_ = associated;
-#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp47_ == NULL) {
-#line 14152 "BatchImport.c"
-				FileToPrepare* _tmp48_ = NULL;
-				FileToPrepare* _tmp49_ = NULL;
-#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 13624 "BatchImport.c"
+				FileToPrepare* _tmp48_;
+				FileToPrepare* _tmp49_;
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp48_ = file_to_prepare;
-#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp49_ = _tmp48_->associated;
-#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp46_ = _tmp49_ != NULL;
-#line 14161 "BatchImport.c"
+#line 13633 "BatchImport.c"
 			} else {
-#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp46_ = FALSE;
-#line 14165 "BatchImport.c"
+#line 13637 "BatchImport.c"
 			}
-#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp46_) {
-#line 14169 "BatchImport.c"
-				FileToPrepare* _tmp50_ = NULL;
-				FileToPrepare* _tmp51_ = NULL;
-				BatchImportJob* _tmp52_ = NULL;
+#line 13641 "BatchImport.c"
+				FileToPrepare* _tmp50_;
+				FileToPrepare* _tmp51_;
+				BatchImportJob* _tmp52_;
 				GFile* _tmp53_ = NULL;
 				gboolean _tmp54_ = FALSE;
-#line 1716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp50_ = file_to_prepare;
-#line 1716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp51_ = _tmp50_->associated;
-#line 1716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp52_ = _tmp51_->job;
-#line 1716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				prepare_files_job_create_file (self, _tmp52_, &_tmp53_, &_tmp54_);
-#line 1716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (associated);
-#line 1716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				associated = _tmp53_;
-#line 1716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				copy_to_library = _tmp54_;
-#line 14189 "BatchImport.c"
+#line 13661 "BatchImport.c"
 			}
-#line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp55_ = job;
-#line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp56_ = file;
-#line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp57_ = associated;
-#line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp58_ = copy_to_library;
-#line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp60_ = prepare_files_job_prepare_file (self, _tmp55_, _tmp56_, _tmp57_, _tmp58_, &_tmp59_);
-#line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (prepared_file);
-#line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			prepared_file = _tmp59_;
-#line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_result_ = _tmp60_;
-#line 1721 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1728 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp61_ = _result_;
-#line 1721 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1728 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp61_ == IMPORT_RESULT_SUCCESS) {
-#line 14211 "BatchImport.c"
-				gint _tmp62_ = 0;
-				GeeArrayList* _tmp63_ = NULL;
-				PreparedFile* _tmp64_ = NULL;
-#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 13683 "BatchImport.c"
+				gint _tmp62_;
+				GeeArrayList* _tmp63_;
+				PreparedFile* _tmp64_;
+#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp62_ = self->prepared_files;
-#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				self->prepared_files = _tmp62_ + 1;
-#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp63_ = list;
-#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp64_ = prepared_file;
-#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp64_);
-#line 14225 "BatchImport.c"
+#line 13697 "BatchImport.c"
 			} else {
-				BatchImportJob* _tmp65_ = NULL;
-				GFile* _tmp66_ = NULL;
-				BatchImportJob* _tmp67_ = NULL;
-				gchar* _tmp68_ = NULL;
-				gchar* _tmp69_ = NULL;
-				GFile* _tmp70_ = NULL;
-				gchar* _tmp71_ = NULL;
-				gchar* _tmp72_ = NULL;
-				ImportResult _tmp73_ = 0;
-#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				BatchImportJob* _tmp65_;
+				GFile* _tmp66_;
+				BatchImportJob* _tmp67_;
+				gchar* _tmp68_;
+				gchar* _tmp69_;
+				GFile* _tmp70_;
+				gchar* _tmp71_;
+				gchar* _tmp72_;
+				ImportResult _tmp73_;
+#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp65_ = job;
-#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp66_ = file;
-#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp67_ = job;
-#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp68_ = batch_import_job_get_source_identifier (_tmp67_);
-#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp69_ = _tmp68_;
-#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp70_ = file;
-#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp71_ = g_file_get_path (_tmp70_);
-#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp72_ = _tmp71_;
-#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp73_ = _result_;
-#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp65_, _tmp66_, _tmp69_, _tmp72_, _tmp73_);
-#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp72_);
-#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp69_);
-#line 14260 "BatchImport.c"
+#line 13732 "BatchImport.c"
 			}
-#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp75_ = list;
-#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp76_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp77_ = _tmp76_;
-#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp77_ >= BATCH_IMPORT_REPORT_EVERY_N_PREPARED_FILES) {
-#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp74_ = TRUE;
-#line 14272 "BatchImport.c"
+#line 13744 "BatchImport.c"
 			} else {
 				gboolean _tmp78_ = FALSE;
-				GTimer* _tmp79_ = NULL;
-				gdouble _tmp80_ = 0.0;
-#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				GTimer* _tmp79_;
+				gdouble _tmp80_;
+#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp79_ = timer;
-#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp80_ = g_timer_elapsed (_tmp79_, NULL);
-#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if ((_tmp80_ * 1000.0) > ((gdouble) BATCH_IMPORT_REPORT_PREPARED_FILES_EVERY_N_MSEC)) {
-#line 14283 "BatchImport.c"
-					GeeArrayList* _tmp81_ = NULL;
-					gint _tmp82_ = 0;
-					gint _tmp83_ = 0;
-#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 13755 "BatchImport.c"
+					GeeArrayList* _tmp81_;
+					gint _tmp82_;
+					gint _tmp83_;
+#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp81_ = list;
-#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp82_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp83_ = _tmp82_;
-#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp78_ = _tmp83_ > 0;
-#line 14295 "BatchImport.c"
+#line 13767 "BatchImport.c"
 				} else {
-#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp78_ = FALSE;
-#line 14299 "BatchImport.c"
+#line 13771 "BatchImport.c"
 				}
-#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp74_ = _tmp78_;
-#line 14303 "BatchImport.c"
+#line 13775 "BatchImport.c"
 			}
-#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp74_) {
-#line 14307 "BatchImport.c"
+#line 13779 "BatchImport.c"
 				PreparedFileCluster* cluster = NULL;
-				GeeArrayList* _tmp84_ = NULL;
-				PreparedFileCluster* _tmp85_ = NULL;
-				GeeArrayList* _tmp86_ = NULL;
-				NotificationCallback _tmp87_ = NULL;
-				void* _tmp87__target = NULL;
-				PreparedFileCluster* _tmp88_ = NULL;
-				GTimer* _tmp89_ = NULL;
-#line 1734 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				GeeArrayList* _tmp84_;
+				PreparedFileCluster* _tmp85_;
+				GeeArrayList* _tmp86_;
+				NotificationCallback _tmp87_;
+				void* _tmp87__target;
+				PreparedFileCluster* _tmp88_;
+				GTimer* _tmp89_;
+#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp84_ = list;
-#line 1734 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp85_ = prepared_file_cluster_new (_tmp84_);
-#line 1734 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				cluster = _tmp85_;
-#line 1735 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp86_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL);
-#line 1735 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (list);
-#line 1735 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				list = _tmp86_;
-#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp87_ = self->priv->notification;
-#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp87__target = self->priv->notification_target;
-#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp88_ = cluster;
-#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				background_job_notify (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), _tmp87_, _tmp87__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_NOTIFICATION_OBJECT, NotificationObject));
-#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp89_ = timer;
-#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_timer_start (_tmp89_);
-#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_notification_object_unref0 (cluster);
-#line 14342 "BatchImport.c"
+#line 13814 "BatchImport.c"
 			}
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (prepared_file);
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (associated);
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (file);
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_batch_import_job_unref0 (job);
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_file_to_prepare_unref0 (file_to_prepare);
-#line 14354 "BatchImport.c"
+#line 13826 "BatchImport.c"
 		}
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_file_to_prepare_list);
-#line 14358 "BatchImport.c"
+#line 13830 "BatchImport.c"
 	}
-#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp90_ = list;
-#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp91_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp92_ = _tmp91_;
-#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp92_ > 0) {
-#line 14368 "BatchImport.c"
+#line 13840 "BatchImport.c"
 		ImportResult _result_ = 0;
-		ImportResult _tmp93_ = 0;
-		ImportResult _tmp94_ = 0;
-#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		ImportResult _tmp93_;
+		ImportResult _tmp94_;
+#line 1749 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp93_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
-#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1749 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_result_ = _tmp93_;
-#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp94_ = _result_;
-#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp94_ == IMPORT_RESULT_SUCCESS) {
-#line 14380 "BatchImport.c"
-			NotificationCallback _tmp95_ = NULL;
-			void* _tmp95__target = NULL;
-			GeeArrayList* _tmp96_ = NULL;
-			PreparedFileCluster* _tmp97_ = NULL;
-			PreparedFileCluster* _tmp98_ = NULL;
-#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 13852 "BatchImport.c"
+			NotificationCallback _tmp95_;
+			void* _tmp95__target;
+			GeeArrayList* _tmp96_;
+			PreparedFileCluster* _tmp97_;
+			PreparedFileCluster* _tmp98_;
+#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp95_ = self->priv->notification;
-#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp95__target = self->priv->notification_target;
-#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp96_ = list;
-#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp97_ = prepared_file_cluster_new (_tmp96_);
-#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp98_ = _tmp97_;
-#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			background_job_notify (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), _tmp95_, _tmp95__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, TYPE_NOTIFICATION_OBJECT, NotificationObject));
-#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_notification_object_unref0 (_tmp98_);
-#line 14400 "BatchImport.c"
+#line 13872 "BatchImport.c"
 		} else {
-			gint _tmp99_ = 0;
-			GeeArrayList* _tmp100_ = NULL;
-			gint _tmp101_ = 0;
-			gint _tmp102_ = 0;
-			gint _tmp103_ = 0;
-			GeeArrayList* _tmp104_ = NULL;
-			gint _tmp105_ = 0;
-			gint _tmp106_ = 0;
-#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			gint _tmp99_;
+			GeeArrayList* _tmp100_;
+			gint _tmp101_;
+			gint _tmp102_;
+			gint _tmp103_;
+			GeeArrayList* _tmp104_;
+			gint _tmp105_;
+			gint _tmp106_;
+#line 1754 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp99_ = self->prepared_files;
-#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1754 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp100_ = list;
-#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1754 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp101_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1754 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp102_ = _tmp101_;
-#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1754 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_vala_assert (_tmp99_ >= _tmp102_, "prepared_files >= list.size");
-#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1755 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp103_ = self->prepared_files;
-#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1755 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp104_ = list;
-#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1755 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp105_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1755 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp106_ = _tmp105_;
-#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1755 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			self->prepared_files = _tmp103_ - _tmp106_;
-#line 14430 "BatchImport.c"
+#line 13902 "BatchImport.c"
 			{
 				GeeArrayList* _prepared_file_list = NULL;
-				GeeArrayList* _tmp107_ = NULL;
-				GeeArrayList* _tmp108_ = NULL;
+				GeeArrayList* _tmp107_;
+				GeeArrayList* _tmp108_;
 				gint _prepared_file_size = 0;
-				GeeArrayList* _tmp109_ = NULL;
-				gint _tmp110_ = 0;
-				gint _tmp111_ = 0;
+				GeeArrayList* _tmp109_;
+				gint _tmp110_;
+				gint _tmp111_;
 				gint _prepared_file_index = 0;
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp107_ = list;
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp108_ = _g_object_ref0 (_tmp107_);
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_list = _tmp108_;
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp109_ = _prepared_file_list;
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp110_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp111_ = _tmp110_;
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_size = _tmp111_;
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_index = -1;
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				while (TRUE) {
-#line 14458 "BatchImport.c"
-					gint _tmp112_ = 0;
-					gint _tmp113_ = 0;
-					gint _tmp114_ = 0;
+#line 13930 "BatchImport.c"
+					gint _tmp112_;
+					gint _tmp113_;
+					gint _tmp114_;
 					PreparedFile* prepared_file = NULL;
-					GeeArrayList* _tmp115_ = NULL;
-					gint _tmp116_ = 0;
-					gpointer _tmp117_ = NULL;
-					PreparedFile* _tmp118_ = NULL;
-					BatchImportJob* _tmp119_ = NULL;
-					PreparedFile* _tmp120_ = NULL;
-					GFile* _tmp121_ = NULL;
-					PreparedFile* _tmp122_ = NULL;
-					BatchImportJob* _tmp123_ = NULL;
-					gchar* _tmp124_ = NULL;
-					gchar* _tmp125_ = NULL;
-					PreparedFile* _tmp126_ = NULL;
-					GFile* _tmp127_ = NULL;
-					gchar* _tmp128_ = NULL;
-					gchar* _tmp129_ = NULL;
-					ImportResult _tmp130_ = 0;
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					GeeArrayList* _tmp115_;
+					gint _tmp116_;
+					gpointer _tmp117_;
+					PreparedFile* _tmp118_;
+					BatchImportJob* _tmp119_;
+					PreparedFile* _tmp120_;
+					GFile* _tmp121_;
+					PreparedFile* _tmp122_;
+					BatchImportJob* _tmp123_;
+					gchar* _tmp124_;
+					gchar* _tmp125_;
+					PreparedFile* _tmp126_;
+					GFile* _tmp127_;
+					gchar* _tmp128_;
+					gchar* _tmp129_;
+					ImportResult _tmp130_;
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp112_ = _prepared_file_index;
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_prepared_file_index = _tmp112_ + 1;
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp113_ = _prepared_file_index;
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp114_ = _prepared_file_size;
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (!(_tmp113_ < _tmp114_)) {
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 14491 "BatchImport.c"
+#line 13963 "BatchImport.c"
 					}
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp115_ = _prepared_file_list;
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp116_ = _prepared_file_index;
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp117_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp116_);
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					prepared_file = (PreparedFile*) _tmp117_;
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp118_ = prepared_file;
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp119_ = _tmp118_->job;
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp120_ = prepared_file;
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp121_ = _tmp120_->file;
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp122_ = prepared_file;
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp123_ = _tmp122_->job;
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp124_ = batch_import_job_get_source_identifier (_tmp123_);
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp125_ = _tmp124_;
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp126_ = prepared_file;
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp127_ = _tmp126_->file;
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp128_ = g_file_get_path (_tmp127_);
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp129_ = _tmp128_;
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp130_ = _result_;
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp119_, _tmp121_, _tmp125_, _tmp129_, _tmp130_);
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_free0 (_tmp129_);
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_free0 (_tmp125_);
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_prepared_file_unref0 (prepared_file);
-#line 14535 "BatchImport.c"
+#line 14007 "BatchImport.c"
 				}
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_prepared_file_list);
-#line 14539 "BatchImport.c"
+#line 14011 "BatchImport.c"
 			}
 		}
 	}
-#line 1691 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (list);
-#line 1691 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_timer_destroy0 (timer);
-#line 14547 "BatchImport.c"
+#line 14019 "BatchImport.c"
 }
 
 
-static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImportJob* job, GFile** file, gboolean* copy_to_library) {
+static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImportJob* job, GFile* * file, gboolean* copy_to_library) {
 	GFile* _vala_file = NULL;
 	gboolean _vala_copy_to_library = FALSE;
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1760 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1767 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_PREPARE_FILES_JOB (self), FALSE);
-#line 1760 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1767 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), FALSE);
-#line 14560 "BatchImport.c"
+#line 14032 "BatchImport.c"
 	{
 		gboolean _tmp0_ = FALSE;
-		BatchImportJob* _tmp1_ = NULL;
+		BatchImportJob* _tmp1_;
 		GFile* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
-#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		gboolean _tmp4_;
+#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = job;
-#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = batch_import_job_prepare (_tmp1_, &_tmp2_, &_tmp3_, &_inner_error_);
-#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_vala_file);
-#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_file = _tmp2_;
-#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_copy_to_library = _tmp3_;
-#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp4_;
-#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14581 "BatchImport.c"
-			goto __catch416_g_error;
+#line 14053 "BatchImport.c"
+			goto __catch417_g_error;
 		}
-#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp0_) {
-#line 14586 "BatchImport.c"
-			BatchImportJob* _tmp5_ = NULL;
-			BatchImportJob* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
-			gchar* _tmp8_ = NULL;
-			BatchImportJob* _tmp9_ = NULL;
-			gchar* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 14058 "BatchImport.c"
+			BatchImportJob* _tmp5_;
+			BatchImportJob* _tmp6_;
+			gchar* _tmp7_;
+			gchar* _tmp8_;
+			BatchImportJob* _tmp9_;
+			gchar* _tmp10_;
+			gchar* _tmp11_;
+#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = job;
-#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp6_ = job;
-#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp7_ = batch_import_job_get_source_identifier (_tmp6_);
-#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp8_ = _tmp7_;
-#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp9_ = job;
-#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp10_ = batch_import_job_get_dest_identifier (_tmp9_);
-#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp11_ = _tmp10_;
-#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp5_, NULL, _tmp8_, _tmp11_, IMPORT_RESULT_FILE_ERROR);
-#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp11_);
-#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp8_);
-#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = FALSE;
-#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (file) {
-#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*file = _vala_file;
-#line 14620 "BatchImport.c"
+#line 14092 "BatchImport.c"
 			} else {
-#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_vala_file);
-#line 14624 "BatchImport.c"
+#line 14096 "BatchImport.c"
 			}
-#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (copy_to_library) {
-#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*copy_to_library = _vala_copy_to_library;
-#line 14630 "BatchImport.c"
+#line 14102 "BatchImport.c"
 			}
-#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 14634 "BatchImport.c"
+#line 14106 "BatchImport.c"
 		}
 	}
-	goto __finally416;
-	__catch416_g_error:
+	goto __finally417;
+	__catch417_g_error:
 	{
 		GError* err = NULL;
-		BatchImportJob* _tmp12_ = NULL;
-		BatchImportJob* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		BatchImportJob* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-		GError* _tmp19_ = NULL;
-#line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		BatchImportJob* _tmp12_;
+		BatchImportJob* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		BatchImportJob* _tmp16_;
+		gchar* _tmp17_;
+		gchar* _tmp18_;
+		GError* _tmp19_;
+#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		err = _inner_error_;
-#line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_inner_error_ = NULL;
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp12_ = job;
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = job;
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = batch_import_job_get_source_identifier (_tmp13_);
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp15_ = _tmp14_;
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp16_ = job;
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp17_ = batch_import_job_get_dest_identifier (_tmp16_);
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp18_ = _tmp17_;
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp19_ = err;
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp12_, NULL, _tmp15_, _tmp18_, _tmp19_, IMPORT_RESULT_FILE_ERROR);
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp18_);
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp15_);
-#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = FALSE;
-#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_error_free0 (err);
-#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (file) {
-#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*file = _vala_file;
-#line 14683 "BatchImport.c"
+#line 14155 "BatchImport.c"
 		} else {
-#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_vala_file);
-#line 14687 "BatchImport.c"
+#line 14159 "BatchImport.c"
 		}
-#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (copy_to_library) {
-#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*copy_to_library = _vala_copy_to_library;
-#line 14693 "BatchImport.c"
+#line 14165 "BatchImport.c"
 		}
-#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 14697 "BatchImport.c"
+#line 14169 "BatchImport.c"
 	}
-	__finally416:
-#line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	__finally417:
+#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14702 "BatchImport.c"
+#line 14174 "BatchImport.c"
 		gboolean _tmp20_ = FALSE;
-#line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_clear_error (&_inner_error_);
-#line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return _tmp20_;
-#line 14710 "BatchImport.c"
+#line 14182 "BatchImport.c"
 	}
-#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = TRUE;
-#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (file) {
-#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*file = _vala_file;
-#line 14718 "BatchImport.c"
+#line 14190 "BatchImport.c"
 	} else {
-#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_vala_file);
-#line 14722 "BatchImport.c"
+#line 14194 "BatchImport.c"
 	}
-#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (copy_to_library) {
-#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*copy_to_library = _vala_copy_to_library;
-#line 14728 "BatchImport.c"
+#line 14200 "BatchImport.c"
 	}
-#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 14732 "BatchImport.c"
+#line 14204 "BatchImport.c"
 }
 
 
-static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, BatchImportJob* job, GFile* file, GFile* associated_file, gboolean copy_to_library, PreparedFile** prepared_file) {
+static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, BatchImportJob* job, GFile* file, GFile* associated_file, gboolean copy_to_library, PreparedFile* * prepared_file) {
 	PreparedFile* _vala_prepared_file = NULL;
 	ImportResult result = 0;
 	gboolean is_video = FALSE;
-	GFile* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GFile* _tmp0_;
+	gboolean _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp3_;
 	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	gint _tmp14_ = 0;
+	gboolean _tmp7_;
+	gint _tmp10_;
+	gint _tmp11_;
+	gint _tmp14_;
 	gchar* exif_only_md5 = NULL;
 	gchar* thumbnail_md5 = NULL;
 	gchar* full_md5 = NULL;
 	PhotoFileFormat file_format = 0;
-	GFile* _tmp28_ = NULL;
-	PhotoFileFormat _tmp29_ = 0;
-	gboolean _tmp30_ = FALSE;
+	GFile* _tmp28_;
+	PhotoFileFormat _tmp29_;
+	gboolean _tmp30_;
 	guint64 filesize = 0ULL;
 	gboolean is_in_library_dir = FALSE;
-	GFile* _tmp82_ = NULL;
-	GFile* _tmp83_ = NULL;
-	gboolean _tmp84_ = FALSE;
+	GFile* _tmp82_;
+	GFile* _tmp83_;
+	gboolean _tmp84_;
 	gboolean _tmp85_ = FALSE;
-	gboolean _tmp86_ = FALSE;
-	BatchImportJob* _tmp88_ = NULL;
-	GFile* _tmp89_ = NULL;
-	GFile* _tmp90_ = NULL;
-	BatchImportJob* _tmp91_ = NULL;
-	gchar* _tmp92_ = NULL;
-	gchar* _tmp93_ = NULL;
-	BatchImportJob* _tmp94_ = NULL;
-	gchar* _tmp95_ = NULL;
-	gchar* _tmp96_ = NULL;
-	const gchar* _tmp97_ = NULL;
-	const gchar* _tmp98_ = NULL;
-	const gchar* _tmp99_ = NULL;
-	PhotoFileFormat _tmp100_ = 0;
-	guint64 _tmp101_ = 0ULL;
-	gboolean _tmp102_ = FALSE;
-	PreparedFile* _tmp103_ = NULL;
+	gboolean _tmp86_;
+	BatchImportJob* _tmp88_;
+	GFile* _tmp89_;
+	GFile* _tmp90_;
+	BatchImportJob* _tmp91_;
+	gchar* _tmp92_;
+	gchar* _tmp93_;
+	BatchImportJob* _tmp94_;
+	gchar* _tmp95_;
+	gchar* _tmp96_;
+	const gchar* _tmp97_;
+	const gchar* _tmp98_;
+	const gchar* _tmp99_;
+	PhotoFileFormat _tmp100_;
+	guint64 _tmp101_;
+	gboolean _tmp102_;
+	PreparedFile* _tmp103_;
 	GError * _inner_error_ = NULL;
-#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_PREPARE_FILES_JOB (self), 0);
-#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), 0);
-#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), 0);
-#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((associated_file == NULL) || G_IS_FILE (associated_file), 0);
-#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (_vala_prepared_file);
-#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_prepared_file = NULL;
-#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = file;
-#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = video_reader_is_supported_video_file (_tmp0_);
-#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	is_video = _tmp1_;
-#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = is_video;
-#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!_tmp3_) {
-#line 14802 "BatchImport.c"
-		GFile* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 14274 "BatchImport.c"
+		GFile* _tmp4_;
+		gboolean _tmp5_;
+#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = file;
-#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = photo_is_file_image (_tmp4_);
-#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = !_tmp5_;
-#line 14811 "BatchImport.c"
+#line 14283 "BatchImport.c"
 	} else {
-#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = FALSE;
-#line 14815 "BatchImport.c"
+#line 14287 "BatchImport.c"
 	}
-#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp2_) {
-#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1791 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = IMPORT_RESULT_NOT_AN_IMAGE;
-#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1791 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (prepared_file) {
-#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1791 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*prepared_file = _vala_prepared_file;
-#line 14825 "BatchImport.c"
+#line 14297 "BatchImport.c"
 		} else {
-#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1791 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_vala_prepared_file);
-#line 14829 "BatchImport.c"
+#line 14301 "BatchImport.c"
 		}
-#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1791 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 14833 "BatchImport.c"
+#line 14305 "BatchImport.c"
 	}
-#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = is_video;
-#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!_tmp7_) {
-#line 14839 "BatchImport.c"
-		GFile* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
-#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 14311 "BatchImport.c"
+		GFile* _tmp8_;
+		gboolean _tmp9_;
+#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = file;
-#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = photo_file_format_is_file_supported (_tmp8_);
-#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = !_tmp9_;
-#line 14848 "BatchImport.c"
+#line 14320 "BatchImport.c"
 	} else {
-#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = FALSE;
-#line 14852 "BatchImport.c"
+#line 14324 "BatchImport.c"
 	}
-#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp6_) {
-#line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
-#line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (prepared_file) {
-#line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*prepared_file = _vala_prepared_file;
-#line 14862 "BatchImport.c"
+#line 14334 "BatchImport.c"
 		} else {
-#line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_vala_prepared_file);
-#line 14866 "BatchImport.c"
+#line 14338 "BatchImport.c"
 		}
-#line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 14870 "BatchImport.c"
+#line 14342 "BatchImport.c"
 	}
-#line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = self->priv->import_file_count;
-#line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->import_file_count = _tmp10_ + 1;
-#line 1792 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp11_ = self->priv->fail_every;
-#line 1792 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp11_ > 0) {
-#line 14880 "BatchImport.c"
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
-#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 14352 "BatchImport.c"
+		gint _tmp12_;
+		gint _tmp13_;
+#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp12_ = self->priv->import_file_count;
-#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = self->priv->fail_every;
-#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if ((_tmp12_ % _tmp13_) == 0) {
-#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = IMPORT_RESULT_FILE_ERROR;
-#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (prepared_file) {
-#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*prepared_file = _vala_prepared_file;
-#line 14895 "BatchImport.c"
+#line 14367 "BatchImport.c"
 			} else {
-#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_unref0 (_vala_prepared_file);
-#line 14899 "BatchImport.c"
+#line 14371 "BatchImport.c"
 			}
-#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 14903 "BatchImport.c"
+#line 14375 "BatchImport.c"
 		}
 	}
-#line 1798 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1805 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp14_ = self->priv->skip_every;
-#line 1798 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1805 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp14_ > 0) {
-#line 14910 "BatchImport.c"
-		gint _tmp15_ = 0;
-		gint _tmp16_ = 0;
-#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 14382 "BatchImport.c"
+		gint _tmp15_;
+		gint _tmp16_;
+#line 1806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp15_ = self->priv->import_file_count;
-#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp16_ = self->priv->skip_every;
-#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if ((_tmp15_ % _tmp16_) == 0) {
-#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = IMPORT_RESULT_NOT_A_FILE;
-#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (prepared_file) {
-#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*prepared_file = _vala_prepared_file;
-#line 14925 "BatchImport.c"
+#line 14397 "BatchImport.c"
 			} else {
-#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_unref0 (_vala_prepared_file);
-#line 14929 "BatchImport.c"
+#line 14401 "BatchImport.c"
 			}
-#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 14933 "BatchImport.c"
+#line 14405 "BatchImport.c"
 		}
 	}
-#line 1803 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	exif_only_md5 = NULL;
-#line 1804 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	thumbnail_md5 = NULL;
-#line 1805 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1812 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	full_md5 = NULL;
-#line 14942 "BatchImport.c"
+#line 14414 "BatchImport.c"
 	{
 		gchar* _tmp17_ = NULL;
-		GFile* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		GFile* _tmp18_;
+		gchar* _tmp19_;
+		gchar* _tmp20_;
+#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp18_ = file;
-#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp19_ = md5_file (_tmp18_, &_inner_error_);
-#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp17_ = _tmp19_;
-#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14956 "BatchImport.c"
-			goto __catch417_g_error;
+#line 14428 "BatchImport.c"
+			goto __catch418_g_error;
 		}
-#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp20_ = _tmp17_;
-#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp17_ = NULL;
-#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (full_md5);
-#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		full_md5 = _tmp20_;
-#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp17_);
-#line 14969 "BatchImport.c"
+#line 14441 "BatchImport.c"
 	}
-	goto __finally417;
-	__catch417_g_error:
+	goto __finally418;
+	__catch418_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
-		GError* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-		GError* _tmp26_ = NULL;
-		ImportResult _tmp27_ = 0;
-#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		GFile* _tmp21_;
+		gchar* _tmp22_;
+		gchar* _tmp23_;
+		GError* _tmp24_;
+		const gchar* _tmp25_;
+		GError* _tmp26_;
+		ImportResult _tmp27_;
+#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		err = _inner_error_;
-#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_inner_error_ = NULL;
-#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp21_ = file;
-#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp22_ = g_file_get_path (_tmp21_);
-#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp23_ = _tmp22_;
-#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp24_ = err;
-#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp25_ = _tmp24_->message;
-#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_warning ("BatchImport.vala:1813: Unable to perform MD5 checksum on file %s: %s", _tmp23_, _tmp25_);
-#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		g_warning ("BatchImport.vala:1820: Unable to perform MD5 checksum on file %s: %s", _tmp23_, _tmp25_);
+#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp23_);
-#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp26_ = err;
-#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp27_ = import_result_convert_error (_tmp26_, IMPORT_RESULT_FILE_ERROR);
-#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = _tmp27_;
-#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_error_free0 (err);
-#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (full_md5);
-#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (thumbnail_md5);
-#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (exif_only_md5);
-#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (prepared_file) {
-#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*prepared_file = _vala_prepared_file;
-#line 15018 "BatchImport.c"
+#line 14490 "BatchImport.c"
 		} else {
-#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_vala_prepared_file);
-#line 15022 "BatchImport.c"
+#line 14494 "BatchImport.c"
 		}
-#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 15026 "BatchImport.c"
+#line 14498 "BatchImport.c"
 	}
-	__finally417:
-#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	__finally418:
+#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (full_md5);
-#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (thumbnail_md5);
-#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (exif_only_md5);
-#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_clear_error (&_inner_error_);
-#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return 0;
-#line 15043 "BatchImport.c"
+#line 14515 "BatchImport.c"
 	}
-#line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp28_ = file;
-#line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp29_ = photo_file_format_get_by_file_extension (_tmp28_);
-#line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	file_format = _tmp29_;
-#line 1822 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1829 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp30_ = is_video;
-#line 1822 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1829 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!_tmp30_) {
-#line 15055 "BatchImport.c"
-		PhotoFileFormat _tmp31_ = 0;
+#line 14527 "BatchImport.c"
+		PhotoFileFormat _tmp31_;
 		PhotoFileReader* reader = NULL;
-		PhotoFileFormat _tmp35_ = 0;
-		GFile* _tmp36_ = NULL;
-		gchar* _tmp37_ = NULL;
-		gchar* _tmp38_ = NULL;
-		PhotoFileReader* _tmp39_ = NULL;
-		PhotoFileReader* _tmp40_ = NULL;
+		PhotoFileFormat _tmp35_;
+		GFile* _tmp36_;
+		gchar* _tmp37_;
+		gchar* _tmp38_;
+		PhotoFileReader* _tmp39_;
+		PhotoFileReader* _tmp40_;
 		PhotoMetadata* metadata = NULL;
-		PhotoMetadata* _tmp50_ = NULL;
-#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		PhotoMetadata* _tmp50_;
+#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp31_ = file_format;
-#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp31_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 15070 "BatchImport.c"
-			GFile* _tmp32_ = NULL;
-			gchar* _tmp33_ = NULL;
-			gchar* _tmp34_ = NULL;
-#line 1824 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 14542 "BatchImport.c"
+			GFile* _tmp32_;
+			gchar* _tmp33_;
+			gchar* _tmp34_;
+#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp32_ = file;
-#line 1824 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp33_ = g_file_get_path (_tmp32_);
-#line 1824 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp34_ = _tmp33_;
-#line 1824 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			g_warning ("BatchImport.vala:1824: Skipping %s: unrecognized file extension", _tmp34_);
-#line 1824 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			g_warning ("BatchImport.vala:1831: Skipping %s: unrecognized file extension", _tmp34_);
+#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp34_);
-#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
-#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (full_md5);
-#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (thumbnail_md5);
-#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (exif_only_md5);
-#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (prepared_file) {
-#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*prepared_file = _vala_prepared_file;
-#line 15096 "BatchImport.c"
+#line 14568 "BatchImport.c"
 			} else {
-#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_unref0 (_vala_prepared_file);
-#line 15100 "BatchImport.c"
+#line 14572 "BatchImport.c"
 			}
-#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 15104 "BatchImport.c"
+#line 14576 "BatchImport.c"
 		}
-#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp35_ = file_format;
-#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp36_ = file;
-#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp37_ = g_file_get_path (_tmp36_);
-#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp38_ = _tmp37_;
-#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp39_ = photo_file_format_create_reader (_tmp35_, _tmp38_);
-#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp40_ = _tmp39_;
-#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp38_);
-#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		reader = _tmp40_;
-#line 1829 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1836 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		metadata = NULL;
-#line 15124 "BatchImport.c"
+#line 14596 "BatchImport.c"
 		{
 			PhotoMetadata* _tmp41_ = NULL;
-			PhotoFileReader* _tmp42_ = NULL;
-			PhotoMetadata* _tmp43_ = NULL;
-			PhotoMetadata* _tmp44_ = NULL;
-#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			PhotoFileReader* _tmp42_;
+			PhotoMetadata* _tmp43_;
+			PhotoMetadata* _tmp44_;
+#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp42_ = reader;
-#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp43_ = photo_file_reader_read_metadata (_tmp42_, &_inner_error_);
-#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp41_ = _tmp43_;
-#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15138 "BatchImport.c"
-				goto __catch418_g_error;
+#line 14610 "BatchImport.c"
+				goto __catch419_g_error;
 			}
-#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp44_ = _tmp41_;
-#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp41_ = NULL;
-#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_media_metadata_unref0 (metadata);
-#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			metadata = _tmp44_;
-#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_media_metadata_unref0 (_tmp41_);
-#line 15151 "BatchImport.c"
+#line 14623 "BatchImport.c"
 		}
-		goto __finally418;
-		__catch418_g_error:
+		goto __finally419;
+		__catch419_g_error:
 		{
 			GError* err = NULL;
-			GFile* _tmp45_ = NULL;
-			gchar* _tmp46_ = NULL;
-			gchar* _tmp47_ = NULL;
-			GError* _tmp48_ = NULL;
-			const gchar* _tmp49_ = NULL;
-#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			GFile* _tmp45_;
+			gchar* _tmp46_;
+			gchar* _tmp47_;
+			GError* _tmp48_;
+			const gchar* _tmp49_;
+#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			err = _inner_error_;
-#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_inner_error_ = NULL;
-#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp45_ = file;
-#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp46_ = g_file_get_path (_tmp45_);
-#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp47_ = _tmp46_;
-#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp48_ = err;
-#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp49_ = _tmp48_->message;
-#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			g_warning ("BatchImport.vala:1833: Unable to read metadata for %s (%s): continuing" \
+#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			g_warning ("BatchImport.vala:1840: Unable to read metadata for %s (%s): continuing" \
 " to attempt import", _tmp47_, _tmp49_);
-#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp47_);
-#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 15182 "BatchImport.c"
+#line 14654 "BatchImport.c"
 		}
-		__finally418:
-#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		__finally419:
+#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_media_metadata_unref0 (metadata);
-#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (full_md5);
-#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (thumbnail_md5);
-#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (exif_only_md5);
-#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_clear_error (&_inner_error_);
-#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return 0;
-#line 15203 "BatchImport.c"
+#line 14675 "BatchImport.c"
 		}
-#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp50_ = metadata;
-#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp50_ != NULL) {
-#line 15209 "BatchImport.c"
+#line 14681 "BatchImport.c"
 			guint8* flattened_sans_thumbnail = NULL;
-			PhotoMetadata* _tmp51_ = NULL;
-			gint _tmp52_ = 0;
-			guint8* _tmp53_ = NULL;
-			gint flattened_sans_thumbnail_length1 = 0;
-			gint _flattened_sans_thumbnail_size_ = 0;
+			PhotoMetadata* _tmp51_;
+			gint _tmp52_;
+			guint8* _tmp53_;
+			gint flattened_sans_thumbnail_length1;
+			gint _flattened_sans_thumbnail_size_;
 			gboolean _tmp54_ = FALSE;
-			guint8* _tmp55_ = NULL;
-			gint _tmp55__length1 = 0;
+			guint8* _tmp55_;
+			gint _tmp55__length1;
 			guint8* flattened_thumbnail = NULL;
-			PhotoMetadata* _tmp60_ = NULL;
-			gint _tmp61_ = 0;
-			guint8* _tmp62_ = NULL;
-			gint flattened_thumbnail_length1 = 0;
-			gint _flattened_thumbnail_size_ = 0;
+			PhotoMetadata* _tmp60_;
+			gint _tmp61_;
+			guint8* _tmp62_;
+			gint flattened_thumbnail_length1;
+			gint _flattened_thumbnail_size_;
 			gboolean _tmp63_ = FALSE;
-			guint8* _tmp64_ = NULL;
-			gint _tmp64__length1 = 0;
-#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			guint8* _tmp64_;
+			gint _tmp64__length1;
+#line 1845 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp51_ = metadata;
-#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1845 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp53_ = photo_metadata_flatten_exif (_tmp51_, FALSE, &_tmp52_);
-#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1845 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			flattened_sans_thumbnail = _tmp53_;
-#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1845 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			flattened_sans_thumbnail_length1 = _tmp52_;
-#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1845 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_flattened_sans_thumbnail_size_ = flattened_sans_thumbnail_length1;
-#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp55_ = flattened_sans_thumbnail;
-#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp55__length1 = flattened_sans_thumbnail_length1;
-#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp55_ != NULL) {
-#line 15244 "BatchImport.c"
-				guint8* _tmp56_ = NULL;
-				gint _tmp56__length1 = 0;
-#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 14716 "BatchImport.c"
+				guint8* _tmp56_;
+				gint _tmp56__length1;
+#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp56_ = flattened_sans_thumbnail;
-#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp56__length1 = flattened_sans_thumbnail_length1;
-#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp54_ = _tmp56__length1 > 0;
-#line 15253 "BatchImport.c"
+#line 14725 "BatchImport.c"
 			} else {
-#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp54_ = FALSE;
-#line 15257 "BatchImport.c"
+#line 14729 "BatchImport.c"
 			}
-#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp54_) {
-#line 15261 "BatchImport.c"
-				guint8* _tmp57_ = NULL;
-				gint _tmp57__length1 = 0;
-				guint8* _tmp58_ = NULL;
-				gint _tmp58__length1 = 0;
-				gchar* _tmp59_ = NULL;
-#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 14733 "BatchImport.c"
+				guint8* _tmp57_;
+				gint _tmp57__length1;
+				guint8* _tmp58_;
+				gint _tmp58__length1;
+				gchar* _tmp59_;
+#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp57_ = flattened_sans_thumbnail;
-#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp57__length1 = flattened_sans_thumbnail_length1;
-#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp58_ = flattened_sans_thumbnail;
-#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp58__length1 = flattened_sans_thumbnail_length1;
-#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp59_ = md5_binary (_tmp57_, (gsize) _tmp58__length1);
-#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (exif_only_md5);
-#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				exif_only_md5 = _tmp59_;
-#line 15281 "BatchImport.c"
+#line 14753 "BatchImport.c"
 			}
-#line 1842 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp60_ = metadata;
-#line 1842 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp62_ = photo_metadata_flatten_exif_preview (_tmp60_, &_tmp61_);
-#line 1842 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			flattened_thumbnail = _tmp62_;
-#line 1842 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			flattened_thumbnail_length1 = _tmp61_;
-#line 1842 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_flattened_thumbnail_size_ = flattened_thumbnail_length1;
-#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp64_ = flattened_thumbnail;
-#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp64__length1 = flattened_thumbnail_length1;
-#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp64_ != NULL) {
-#line 15299 "BatchImport.c"
-				guint8* _tmp65_ = NULL;
-				gint _tmp65__length1 = 0;
-#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 14771 "BatchImport.c"
+				guint8* _tmp65_;
+				gint _tmp65__length1;
+#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp65_ = flattened_thumbnail;
-#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp65__length1 = flattened_thumbnail_length1;
-#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp63_ = _tmp65__length1 > 0;
-#line 15308 "BatchImport.c"
+#line 14780 "BatchImport.c"
 			} else {
-#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp63_ = FALSE;
-#line 15312 "BatchImport.c"
+#line 14784 "BatchImport.c"
 			}
-#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp63_) {
-#line 15316 "BatchImport.c"
-				guint8* _tmp66_ = NULL;
-				gint _tmp66__length1 = 0;
-				guint8* _tmp67_ = NULL;
-				gint _tmp67__length1 = 0;
-				gchar* _tmp68_ = NULL;
-#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 14788 "BatchImport.c"
+				guint8* _tmp66_;
+				gint _tmp66__length1;
+				guint8* _tmp67_;
+				gint _tmp67__length1;
+				gchar* _tmp68_;
+#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp66_ = flattened_thumbnail;
-#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp66__length1 = flattened_thumbnail_length1;
-#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp67_ = flattened_thumbnail;
-#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp67__length1 = flattened_thumbnail_length1;
-#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp68_ = md5_binary (_tmp66_, (gsize) _tmp67__length1);
-#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (thumbnail_md5);
-#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				thumbnail_md5 = _tmp68_;
-#line 15336 "BatchImport.c"
+#line 14808 "BatchImport.c"
 			}
-#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			flattened_thumbnail = (g_free (flattened_thumbnail), NULL);
-#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 15342 "BatchImport.c"
+#line 14814 "BatchImport.c"
 		}
-#line 1822 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1829 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_media_metadata_unref0 (metadata);
-#line 1822 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1829 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 15348 "BatchImport.c"
+#line 14820 "BatchImport.c"
 	}
-#line 1848 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	filesize = (guint64) 0;
-#line 15352 "BatchImport.c"
+#line 14824 "BatchImport.c"
 	{
 		guint64 _tmp69_ = 0ULL;
-		GFile* _tmp70_ = NULL;
-		GCancellable* _tmp71_ = NULL;
-		GCancellable* _tmp72_ = NULL;
-		guint64 _tmp73_ = 0ULL;
-		guint64 _tmp74_ = 0ULL;
-#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		GFile* _tmp70_;
+		GCancellable* _tmp71_;
+		GCancellable* _tmp72_;
+		guint64 _tmp73_;
+		guint64 _tmp74_;
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp70_ = file;
-#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp71_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp72_ = _tmp71_;
-#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp73_ = query_total_file_size (_tmp70_, _tmp72_, &_inner_error_);
-#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp74_ = _tmp73_;
-#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp72_);
-#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp69_ = _tmp74_;
-#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15376 "BatchImport.c"
-			goto __catch419_g_error;
+#line 14848 "BatchImport.c"
+			goto __catch420_g_error;
 		}
-#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		filesize = _tmp69_;
-#line 15381 "BatchImport.c"
+#line 14853 "BatchImport.c"
 	}
-	goto __finally419;
-	__catch419_g_error:
+	goto __finally420;
+	__catch420_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp75_ = NULL;
-		gchar* _tmp76_ = NULL;
-		gchar* _tmp77_ = NULL;
-		GError* _tmp78_ = NULL;
-		const gchar* _tmp79_ = NULL;
-		GError* _tmp80_ = NULL;
-		ImportResult _tmp81_ = 0;
-#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		GFile* _tmp75_;
+		gchar* _tmp76_;
+		gchar* _tmp77_;
+		GError* _tmp78_;
+		const gchar* _tmp79_;
+		GError* _tmp80_;
+		ImportResult _tmp81_;
+#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		err = _inner_error_;
-#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_inner_error_ = NULL;
-#line 1852 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp75_ = file;
-#line 1852 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp76_ = g_file_get_path (_tmp75_);
-#line 1852 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp77_ = _tmp76_;
-#line 1852 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp78_ = err;
-#line 1852 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp79_ = _tmp78_->message;
-#line 1852 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_warning ("BatchImport.vala:1852: Unable to query file size of %s: %s", _tmp77_, _tmp79_);
-#line 1852 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		g_warning ("BatchImport.vala:1859: Unable to query file size of %s: %s", _tmp77_, _tmp79_);
+#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp77_);
-#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp80_ = err;
-#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp81_ = import_result_convert_error (_tmp80_, IMPORT_RESULT_FILE_ERROR);
-#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = _tmp81_;
-#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_error_free0 (err);
-#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (full_md5);
-#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (thumbnail_md5);
-#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (exif_only_md5);
-#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (prepared_file) {
-#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*prepared_file = _vala_prepared_file;
-#line 15430 "BatchImport.c"
+#line 14902 "BatchImport.c"
 		} else {
-#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_vala_prepared_file);
-#line 15434 "BatchImport.c"
+#line 14906 "BatchImport.c"
 		}
-#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 15438 "BatchImport.c"
+#line 14910 "BatchImport.c"
 	}
-	__finally419:
-#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	__finally420:
+#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (full_md5);
-#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (thumbnail_md5);
-#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (exif_only_md5);
-#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_clear_error (&_inner_error_);
-#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return 0;
-#line 15455 "BatchImport.c"
+#line 14927 "BatchImport.c"
 	}
-#line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp82_ = file;
-#line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp83_ = self->priv->library_dir;
-#line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp84_ = g_file_has_prefix (_tmp82_, _tmp83_);
-#line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	is_in_library_dir = _tmp84_;
-#line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp86_ = copy_to_library;
-#line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp86_) {
-#line 15469 "BatchImport.c"
-		gboolean _tmp87_ = FALSE;
-#line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 14941 "BatchImport.c"
+		gboolean _tmp87_;
+#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp87_ = is_in_library_dir;
-#line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp85_ = !_tmp87_;
-#line 15475 "BatchImport.c"
+#line 14947 "BatchImport.c"
 	} else {
-#line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp85_ = FALSE;
-#line 15479 "BatchImport.c"
+#line 14951 "BatchImport.c"
 	}
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp88_ = job;
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp89_ = file;
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp90_ = associated_file;
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp91_ = job;
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp92_ = batch_import_job_get_source_identifier (_tmp91_);
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp93_ = _tmp92_;
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp94_ = job;
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp95_ = batch_import_job_get_dest_identifier (_tmp94_);
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp96_ = _tmp95_;
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp97_ = exif_only_md5;
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp98_ = thumbnail_md5;
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp99_ = full_md5;
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp100_ = file_format;
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp101_ = filesize;
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp102_ = is_video;
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp103_ = prepared_file_new (_tmp88_, _tmp89_, _tmp90_, _tmp93_, _tmp96_, _tmp85_, _tmp97_, _tmp98_, _tmp99_, _tmp100_, _tmp101_, _tmp102_);
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (_vala_prepared_file);
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_prepared_file = _tmp103_;
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp96_);
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp93_);
-#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = IMPORT_RESULT_SUCCESS;
-#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (full_md5);
-#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (thumbnail_md5);
-#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (exif_only_md5);
-#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (prepared_file) {
-#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*prepared_file = _vala_prepared_file;
-#line 15533 "BatchImport.c"
+#line 15005 "BatchImport.c"
 	} else {
-#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_prepared_file_unref0 (_vala_prepared_file);
-#line 15537 "BatchImport.c"
+#line 15009 "BatchImport.c"
 	}
-#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 15541 "BatchImport.c"
+#line 15013 "BatchImport.c"
 }
 
 
 static void prepare_files_job_class_init (PrepareFilesJobClass * klass) {
-#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	prepare_files_job_parent_class = g_type_class_peek_parent (klass);
-#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->finalize = prepare_files_job_finalize;
-#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_type_class_add_private (klass, sizeof (PrepareFilesJobPrivate));
-#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) prepare_files_job_real_execute;
-#line 15554 "BatchImport.c"
+#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) prepare_files_job_real_execute;
+#line 15026 "BatchImport.c"
 }
 
 
 static void prepare_files_job_instance_init (PrepareFilesJob * self) {
-#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = PREPARE_FILES_JOB_GET_PRIVATE (self);
-#line 1660 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->prepared_files = 0;
 #line 1667 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	self->prepared_files = 0;
+#line 1674 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->import_file_count = 0;
-#line 1668 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1675 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->fail_every = 0;
-#line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1676 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->skip_every = 0;
-#line 15569 "BatchImport.c"
+#line 15041 "BatchImport.c"
 }
 
 
-static void prepare_files_job_finalize (BackgroundJob* obj) {
+static void prepare_files_job_finalize (BackgroundJob * obj) {
 	PrepareFilesJob * self;
-#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARE_FILES_JOB, PrepareFilesJob);
-#line 1662 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->files_to_prepare);
-#line 1664 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->library_dir);
-#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (prepare_files_job_parent_class)->finalize (obj);
-#line 15583 "BatchImport.c"
+#line 15055 "BatchImport.c"
 }
 
 
@@ -15604,596 +15076,596 @@ GType prepare_files_job_get_type (void) {
 
 
 static gpointer _prepared_file_ref0 (gpointer self) {
-#line 1886 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? prepared_file_ref (self) : NULL;
-#line 15602 "BatchImport.c"
+#line 15074 "BatchImport.c"
 }
 
 
 static gpointer _batch_import_result_ref0 (gpointer self) {
-#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1894 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? batch_import_result_ref (self) : NULL;
-#line 15609 "BatchImport.c"
+#line 15081 "BatchImport.c"
 }
 
 
 static gpointer _video_import_params_ref0 (gpointer self) {
-#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? video_import_params_ref (self) : NULL;
-#line 15616 "BatchImport.c"
+#line 15088 "BatchImport.c"
 }
 
 
 static gpointer _photo_import_params_ref0 (gpointer self) {
-#line 1889 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? photo_import_params_ref (self) : NULL;
-#line 15623 "BatchImport.c"
+#line 15095 "BatchImport.c"
 }
 
 
 ReadyForImport* ready_for_import_construct (GType object_type, GFile* final_file, PreparedFile* prepared_file, PhotoImportParams* photo_import_params, VideoImportParams* video_import_params, BatchImportResult* batch_result) {
 	ReadyForImport* self = NULL;
-	PreparedFile* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GFile* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	PreparedFile* _tmp10_ = NULL;
-	PreparedFile* _tmp11_ = NULL;
-	BatchImportResult* _tmp12_ = NULL;
-	BatchImportResult* _tmp13_ = NULL;
-	VideoImportParams* _tmp14_ = NULL;
-	VideoImportParams* _tmp15_ = NULL;
-	PhotoImportParams* _tmp16_ = NULL;
-	PhotoImportParams* _tmp17_ = NULL;
-	PreparedFile* _tmp18_ = NULL;
-	gboolean _tmp19_ = FALSE;
-#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	PreparedFile* _tmp0_;
+	gboolean _tmp1_;
+	GFile* _tmp8_;
+	GFile* _tmp9_;
+	PreparedFile* _tmp10_;
+	PreparedFile* _tmp11_;
+	BatchImportResult* _tmp12_;
+	BatchImportResult* _tmp13_;
+	VideoImportParams* _tmp14_;
+	VideoImportParams* _tmp15_;
+	PhotoImportParams* _tmp16_;
+	PhotoImportParams* _tmp17_;
+	PreparedFile* _tmp18_;
+	gboolean _tmp19_;
+#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_FILE (final_file), NULL);
-#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_PREPARED_FILE (prepared_file), NULL);
-#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((photo_import_params == NULL) || IS_PHOTO_IMPORT_PARAMS (photo_import_params), NULL);
-#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((video_import_params == NULL) || IS_VIDEO_IMPORT_PARAMS (video_import_params), NULL);
-#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_RESULT (batch_result), NULL);
-#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (ReadyForImport*) g_type_create_instance (object_type);
-#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = prepared_file;
-#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _tmp0_->is_video;
-#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_) {
-#line 15661 "BatchImport.c"
+#line 15133 "BatchImport.c"
 		gboolean _tmp2_ = FALSE;
-		VideoImportParams* _tmp3_ = NULL;
-#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		VideoImportParams* _tmp3_;
+#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = video_import_params;
-#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp3_ != NULL) {
-#line 15668 "BatchImport.c"
-			PhotoImportParams* _tmp4_ = NULL;
-#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 15140 "BatchImport.c"
+			PhotoImportParams* _tmp4_;
+#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp4_ = photo_import_params;
-#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp2_ = _tmp4_ == NULL;
-#line 15674 "BatchImport.c"
+#line 15146 "BatchImport.c"
 		} else {
-#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp2_ = FALSE;
-#line 15678 "BatchImport.c"
+#line 15150 "BatchImport.c"
 		}
-#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_assert (_tmp2_, "(video_import_params != null) && (photo_import_params == null)");
-#line 15682 "BatchImport.c"
+#line 15154 "BatchImport.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
-		VideoImportParams* _tmp6_ = NULL;
-#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		VideoImportParams* _tmp6_;
+#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = video_import_params;
-#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp6_ == NULL) {
-#line 15690 "BatchImport.c"
-			PhotoImportParams* _tmp7_ = NULL;
-#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 15162 "BatchImport.c"
+			PhotoImportParams* _tmp7_;
+#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp7_ = photo_import_params;
-#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = _tmp7_ != NULL;
-#line 15696 "BatchImport.c"
+#line 15168 "BatchImport.c"
 		} else {
-#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = FALSE;
-#line 15700 "BatchImport.c"
+#line 15172 "BatchImport.c"
 		}
-#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_assert (_tmp5_, "(video_import_params == null) && (photo_import_params != null)");
-#line 15704 "BatchImport.c"
+#line 15176 "BatchImport.c"
 	}
-#line 1885 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1892 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = final_file;
-#line 1885 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1892 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1885 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1892 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->final_file);
-#line 1885 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1892 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->final_file = _tmp9_;
-#line 1886 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = prepared_file;
-#line 1886 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp11_ = _prepared_file_ref0 (_tmp10_);
-#line 1886 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (self->prepared_file);
-#line 1886 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->prepared_file = _tmp11_;
-#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1894 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp12_ = batch_result;
-#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1894 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp13_ = _batch_import_result_ref0 (_tmp12_);
-#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1894 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (self->batch_result);
-#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1894 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->batch_result = _tmp13_;
-#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp14_ = video_import_params;
-#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp15_ = _video_import_params_ref0 (_tmp14_);
-#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_video_import_params_unref0 (self->video_import_params);
-#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->video_import_params = _tmp15_;
-#line 1889 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp16_ = photo_import_params;
-#line 1889 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp17_ = _photo_import_params_ref0 (_tmp16_);
-#line 1889 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_photo_import_params_unref0 (self->photo_import_params);
-#line 1889 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->photo_import_params = _tmp17_;
-#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp18_ = prepared_file;
-#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp19_ = _tmp18_->is_video;
-#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->is_video = _tmp19_;
-#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 15754 "BatchImport.c"
+#line 15226 "BatchImport.c"
 }
 
 
 ReadyForImport* ready_for_import_new (GFile* final_file, PreparedFile* prepared_file, PhotoImportParams* photo_import_params, VideoImportParams* video_import_params, BatchImportResult* batch_result) {
-#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return ready_for_import_construct (TYPE_READY_FOR_IMPORT, final_file, prepared_file, photo_import_params, video_import_params, batch_result);
-#line 15761 "BatchImport.c"
+#line 15233 "BatchImport.c"
 }
 
 
 BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 	BatchImportResult* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	GFile* _tmp1_ = NULL;
-	PreparedFile* _tmp14_ = NULL;
-	BatchImportJob* _tmp15_ = NULL;
-	PreparedFile* _tmp16_ = NULL;
-	GFile* _tmp17_ = NULL;
-	PreparedFile* _tmp18_ = NULL;
-	BatchImportJob* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	PreparedFile* _tmp22_ = NULL;
-	BatchImportJob* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	BatchImportResult* _tmp26_ = NULL;
-	BatchImportResult* _tmp27_ = NULL;
-	BatchImportResult* _tmp28_ = NULL;
+	GFile* _tmp1_;
+	PreparedFile* _tmp14_;
+	BatchImportJob* _tmp15_;
+	PreparedFile* _tmp16_;
+	GFile* _tmp17_;
+	PreparedFile* _tmp18_;
+	BatchImportJob* _tmp19_;
+	gchar* _tmp20_;
+	gchar* _tmp21_;
+	PreparedFile* _tmp22_;
+	BatchImportJob* _tmp23_;
+	gchar* _tmp24_;
+	gchar* _tmp25_;
+	BatchImportResult* _tmp26_;
+	BatchImportResult* _tmp27_;
+	BatchImportResult* _tmp28_;
 	GError * _inner_error_ = NULL;
-#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1900 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_READY_FOR_IMPORT (self), NULL);
-#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = self->final_file;
-#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 15791 "BatchImport.c"
-		GFile* _tmp2_ = NULL;
-		PreparedFile* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 15263 "BatchImport.c"
+		GFile* _tmp2_;
+		PreparedFile* _tmp3_;
+		GFile* _tmp4_;
+#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->final_file;
-#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = self->prepared_file;
-#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = _tmp3_->file;
-#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp2_ != _tmp4_;
-#line 15803 "BatchImport.c"
+#line 15275 "BatchImport.c"
 	} else {
-#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = FALSE;
-#line 15807 "BatchImport.c"
+#line 15279 "BatchImport.c"
 	}
-#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_) {
-#line 15811 "BatchImport.c"
-		GFile* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 15283 "BatchImport.c"
+		GFile* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = self->final_file;
-#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = g_file_get_path (_tmp5_);
-#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = _tmp6_;
-#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_debug ("BatchImport.vala:1896: Deleting aborted import copy %s", _tmp7_);
-#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		g_debug ("BatchImport.vala:1903: Deleting aborted import copy %s", _tmp7_);
+#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp7_);
-#line 15825 "BatchImport.c"
+#line 15297 "BatchImport.c"
 		{
-			GFile* _tmp8_ = NULL;
-#line 1898 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			GFile* _tmp8_;
+#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp8_ = self->final_file;
-#line 1898 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_file_delete (_tmp8_, NULL, &_inner_error_);
-#line 1898 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15834 "BatchImport.c"
-				goto __catch420_g_error;
+#line 15306 "BatchImport.c"
+				goto __catch421_g_error;
 			}
 		}
-		goto __finally420;
-		__catch420_g_error:
+		goto __finally421;
+		__catch421_g_error:
 		{
 			GError* err = NULL;
-			GFile* _tmp9_ = NULL;
-			gchar* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-			GError* _tmp12_ = NULL;
-			const gchar* _tmp13_ = NULL;
-#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			GFile* _tmp9_;
+			gchar* _tmp10_;
+			gchar* _tmp11_;
+			GError* _tmp12_;
+			const gchar* _tmp13_;
+#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			err = _inner_error_;
-#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_inner_error_ = NULL;
-#line 1900 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp9_ = self->final_file;
-#line 1900 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp10_ = g_file_get_path (_tmp9_);
-#line 1900 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp11_ = _tmp10_;
-#line 1900 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = err;
-#line 1900 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp13_ = _tmp12_->message;
-#line 1900 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			g_warning ("BatchImport.vala:1900: Unable to delete copy of imported file (aborted" \
+#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			g_warning ("BatchImport.vala:1907: Unable to delete copy of imported file (aborted" \
 " import) %s: %s", _tmp11_, _tmp13_);
-#line 1900 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp11_);
-#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 15867 "BatchImport.c"
+#line 15339 "BatchImport.c"
 		}
-		__finally420:
-#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		__finally421:
+#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_clear_error (&_inner_error_);
-#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return NULL;
-#line 15878 "BatchImport.c"
+#line 15350 "BatchImport.c"
 		}
 	}
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp14_ = self->prepared_file;
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp15_ = _tmp14_->job;
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp16_ = self->prepared_file;
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp17_ = _tmp16_->file;
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp18_ = self->prepared_file;
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp19_ = _tmp18_->job;
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp20_ = batch_import_job_get_source_identifier (_tmp19_);
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp21_ = _tmp20_;
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp22_ = self->prepared_file;
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp23_ = _tmp22_->job;
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp24_ = batch_import_job_get_dest_identifier (_tmp23_);
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp25_ = _tmp24_;
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp26_ = batch_import_result_new (_tmp15_, _tmp17_, _tmp21_, _tmp25_, NULL, IMPORT_RESULT_USER_ABORT);
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (self->batch_result);
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->batch_result = _tmp26_;
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp25_);
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp21_);
-#line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1916 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp27_ = self->batch_result;
-#line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1916 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp28_ = _batch_import_result_ref0 (_tmp27_);
-#line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1916 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp28_;
-#line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1916 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 15923 "BatchImport.c"
+#line 15395 "BatchImport.c"
 }
 
 
 static gpointer _thumbnails_ref0 (gpointer self) {
-#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? thumbnails_ref (self) : NULL;
-#line 15930 "BatchImport.c"
+#line 15402 "BatchImport.c"
 }
 
 
 Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) {
 	Thumbnails* result = NULL;
 	Thumbnails* _tmp0_ = NULL;
-	PhotoImportParams* _tmp1_ = NULL;
-	Thumbnails* _tmp6_ = NULL;
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	PhotoImportParams* _tmp1_;
+	Thumbnails* _tmp6_;
+#line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_READY_FOR_IMPORT (self), NULL);
-#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = self->photo_import_params;
-#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 15945 "BatchImport.c"
-		PhotoImportParams* _tmp2_ = NULL;
-		Thumbnails* _tmp3_ = NULL;
-#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 15417 "BatchImport.c"
+		PhotoImportParams* _tmp2_;
+		Thumbnails* _tmp3_;
+#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->photo_import_params;
-#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = _tmp2_->thumbnails;
-#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp3_;
-#line 15954 "BatchImport.c"
+#line 15426 "BatchImport.c"
 	} else {
-		VideoImportParams* _tmp4_ = NULL;
-		Thumbnails* _tmp5_ = NULL;
-#line 1914 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		VideoImportParams* _tmp4_;
+		Thumbnails* _tmp5_;
+#line 1921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = self->video_import_params;
-#line 1914 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = _tmp4_->thumbnails;
-#line 1914 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp5_;
-#line 15964 "BatchImport.c"
+#line 15436 "BatchImport.c"
 	}
-#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = _thumbnails_ref0 (_tmp0_);
-#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp6_;
-#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 15972 "BatchImport.c"
+#line 15444 "BatchImport.c"
 }
 
 
 static void value_ready_for_import_init (GValue* value) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 15979 "BatchImport.c"
+#line 15451 "BatchImport.c"
 }
 
 
 static void value_ready_for_import_free_value (GValue* value) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		ready_for_import_unref (value->data[0].v_pointer);
-#line 15988 "BatchImport.c"
+#line 15460 "BatchImport.c"
 	}
 }
 
 
 static void value_ready_for_import_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = ready_for_import_ref (src_value->data[0].v_pointer);
-#line 15998 "BatchImport.c"
+#line 15470 "BatchImport.c"
 	} else {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 16002 "BatchImport.c"
+#line 15474 "BatchImport.c"
 	}
 }
 
 
 static gpointer value_ready_for_import_peek_pointer (const GValue* value) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 16010 "BatchImport.c"
+#line 15482 "BatchImport.c"
 }
 
 
 static gchar* value_ready_for_import_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 16017 "BatchImport.c"
-		ReadyForImport* object;
+#line 15489 "BatchImport.c"
+		ReadyForImport * object;
 		object = collect_values[0].v_pointer;
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 16024 "BatchImport.c"
+#line 15496 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 16028 "BatchImport.c"
+#line 15500 "BatchImport.c"
 		}
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = ready_for_import_ref (object);
-#line 16032 "BatchImport.c"
+#line 15504 "BatchImport.c"
 	} else {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 16036 "BatchImport.c"
+#line 15508 "BatchImport.c"
 	}
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 16040 "BatchImport.c"
+#line 15512 "BatchImport.c"
 }
 
 
 static gchar* value_ready_for_import_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	ReadyForImport** object_p;
+	ReadyForImport ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 16051 "BatchImport.c"
+#line 15523 "BatchImport.c"
 	}
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 16057 "BatchImport.c"
+#line 15529 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 16061 "BatchImport.c"
+#line 15533 "BatchImport.c"
 	} else {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = ready_for_import_ref (value->data[0].v_pointer);
-#line 16065 "BatchImport.c"
+#line 15537 "BatchImport.c"
 	}
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 16069 "BatchImport.c"
+#line 15541 "BatchImport.c"
 }
 
 
 GParamSpec* param_spec_ready_for_import (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecReadyForImport* spec;
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_READY_FOR_IMPORT), NULL);
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 16083 "BatchImport.c"
+#line 15555 "BatchImport.c"
 }
 
 
 gpointer value_get_ready_for_import (const GValue* value) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_READY_FOR_IMPORT), NULL);
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 16092 "BatchImport.c"
+#line 15564 "BatchImport.c"
 }
 
 
 void value_set_ready_for_import (GValue* value, gpointer v_object) {
-	ReadyForImport* old;
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	ReadyForImport * old;
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_READY_FOR_IMPORT));
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_READY_FOR_IMPORT));
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		ready_for_import_ref (value->data[0].v_pointer);
-#line 16112 "BatchImport.c"
+#line 15584 "BatchImport.c"
 	} else {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 16116 "BatchImport.c"
+#line 15588 "BatchImport.c"
 	}
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		ready_for_import_unref (old);
-#line 16122 "BatchImport.c"
+#line 15594 "BatchImport.c"
 	}
 }
 
 
 void value_take_ready_for_import (GValue* value, gpointer v_object) {
-	ReadyForImport* old;
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	ReadyForImport * old;
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_READY_FOR_IMPORT));
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_READY_FOR_IMPORT));
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 16141 "BatchImport.c"
+#line 15613 "BatchImport.c"
 	} else {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 16145 "BatchImport.c"
+#line 15617 "BatchImport.c"
 	}
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		ready_for_import_unref (old);
-#line 16151 "BatchImport.c"
+#line 15623 "BatchImport.c"
 	}
 }
 
 
 static void ready_for_import_class_init (ReadyForImportClass * klass) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	ready_for_import_parent_class = g_type_class_peek_parent (klass);
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((ReadyForImportClass *) klass)->finalize = ready_for_import_finalize;
-#line 16161 "BatchImport.c"
+#line 15633 "BatchImport.c"
 }
 
 
 static void ready_for_import_instance_init (ReadyForImport * self) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 16168 "BatchImport.c"
+#line 15640 "BatchImport.c"
 }
 
 
-static void ready_for_import_finalize (ReadyForImport* obj) {
+static void ready_for_import_finalize (ReadyForImport * obj) {
 	ReadyForImport * self;
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_READY_FOR_IMPORT, ReadyForImport);
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_handlers_destroy (self);
-#line 1870 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->final_file);
-#line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1878 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (self->prepared_file);
-#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1879 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_photo_import_params_unref0 (self->photo_import_params);
-#line 1873 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_video_import_params_unref0 (self->video_import_params);
-#line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (self->batch_result);
-#line 16188 "BatchImport.c"
+#line 15660 "BatchImport.c"
 }
 
 
@@ -16212,761 +15684,761 @@ GType ready_for_import_get_type (void) {
 
 
 gpointer ready_for_import_ref (gpointer instance) {
-	ReadyForImport* self;
+	ReadyForImport * self;
 	self = instance;
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 16213 "BatchImport.c"
+#line 15685 "BatchImport.c"
 }
 
 
 void ready_for_import_unref (gpointer instance) {
-	ReadyForImport* self;
+	ReadyForImport * self;
 	self = instance;
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		READY_FOR_IMPORT_GET_CLASS (self)->finalize (self);
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 16226 "BatchImport.c"
+#line 15698 "BatchImport.c"
 	}
 }
 
 
 PreparedFileImportJob* prepared_file_import_job_construct (GType object_type, BatchImport* owner, PreparedFile* prepared_file, ImportID* import_id, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) {
 	PreparedFileImportJob* self = NULL;
-	BatchImport* _tmp0_ = NULL;
-	CompletionCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	GCancellable* _tmp2_ = NULL;
-	CancellationCallback _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
-	ImportID _tmp4_ = {0};
-	PreparedFile* _tmp5_ = NULL;
-	PreparedFile* _tmp6_ = NULL;
-#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	BatchImport* _tmp0_;
+	CompletionCallback _tmp1_;
+	void* _tmp1__target;
+	GCancellable* _tmp2_;
+	CancellationCallback _tmp3_;
+	void* _tmp3__target;
+	ImportID _tmp4_;
+	PreparedFile* _tmp5_;
+	PreparedFile* _tmp6_;
+#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL);
-#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_PREPARED_FILE (prepared_file), NULL);
-#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (import_id != NULL, NULL);
-#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = owner;
-#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = callback;
-#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1__target = callback_target;
-#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = cancellable;
-#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = cancellation;
-#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3__target = cancellation_target;
-#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (PreparedFileImportJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target, NULL);
-#line 1929 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = *import_id;
-#line 1929 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->import_id = _tmp4_;
-#line 1930 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1937 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = prepared_file;
-#line 1930 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1937 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = _prepared_file_ref0 (_tmp5_);
-#line 1930 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1937 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (self->not_ready);
-#line 1930 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1937 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->not_ready = _tmp6_;
-#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1939 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW);
-#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 16280 "BatchImport.c"
+#line 15752 "BatchImport.c"
 }
 
 
 PreparedFileImportJob* prepared_file_import_job_new (BatchImport* owner, PreparedFile* prepared_file, ImportID* import_id, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) {
-#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return prepared_file_import_job_construct (TYPE_PREPARED_FILE_IMPORT_JOB, owner, prepared_file, import_id, callback, callback_target, cancellable, cancellation, cancellation_target);
-#line 16287 "BatchImport.c"
+#line 15759 "BatchImport.c"
 }
 
 
 static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 	PreparedFileImportJob * self;
 	PreparedFile* prepared_file = NULL;
-	PreparedFile* _tmp0_ = NULL;
-	PreparedFile* _tmp1_ = NULL;
+	PreparedFile* _tmp0_;
+	PreparedFile* _tmp1_;
 	GFile* final_file = NULL;
-	PreparedFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
+	PreparedFile* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
 	GFile* final_associated_file = NULL;
-	PreparedFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	GFile* _tmp7_ = NULL;
-	PreparedFile* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
-	GFile* _tmp51_ = NULL;
-	gchar* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
+	PreparedFile* _tmp5_;
+	GFile* _tmp6_;
+	GFile* _tmp7_;
+	PreparedFile* _tmp8_;
+	gboolean _tmp9_;
+	GFile* _tmp51_;
+	gchar* _tmp52_;
+	gchar* _tmp53_;
 	ImportResult _result_ = 0;
 	VideoImportParams* video_import_params = NULL;
 	PhotoImportParams* photo_import_params = NULL;
-	PreparedFile* _tmp54_ = NULL;
-	gboolean _tmp55_ = FALSE;
+	PreparedFile* _tmp54_;
+	gboolean _tmp55_;
 	gboolean _tmp82_ = FALSE;
-	ImportResult _tmp83_ = 0;
+	ImportResult _tmp83_;
 	BatchImportResult* batch_result = NULL;
-	PreparedFile* _tmp96_ = NULL;
-	BatchImportJob* _tmp97_ = NULL;
-	GFile* _tmp98_ = NULL;
-	GFile* _tmp99_ = NULL;
-	gchar* _tmp100_ = NULL;
-	gchar* _tmp101_ = NULL;
-	GFile* _tmp102_ = NULL;
-	gchar* _tmp103_ = NULL;
-	gchar* _tmp104_ = NULL;
-	ImportResult _tmp105_ = 0;
-	BatchImportResult* _tmp106_ = NULL;
-	BatchImportResult* _tmp107_ = NULL;
-	BatchImportResult* _tmp108_ = NULL;
-	ImportResult _tmp109_ = 0;
+	PreparedFile* _tmp96_;
+	BatchImportJob* _tmp97_;
+	GFile* _tmp98_;
+	GFile* _tmp99_;
+	gchar* _tmp100_;
+	gchar* _tmp101_;
+	GFile* _tmp102_;
+	gchar* _tmp103_;
+	gchar* _tmp104_;
+	ImportResult _tmp105_;
+	BatchImportResult* _tmp106_;
+	BatchImportResult* _tmp107_;
+	BatchImportResult* _tmp108_;
+	ImportResult _tmp109_;
 	GError * _inner_error_ = NULL;
-#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob);
-#line 1936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->not_ready;
-#line 1936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _prepared_file_ref0 (_tmp0_);
-#line 1936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	prepared_file = _tmp1_;
-#line 1937 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1944 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (self->not_ready);
-#line 1937 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1944 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->not_ready = NULL;
-#line 1939 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = prepared_file;
-#line 1939 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = _tmp2_->file;
-#line 1939 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 1939 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	final_file = _tmp4_;
-#line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = prepared_file;
-#line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = _tmp5_->associated_file;
-#line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	final_associated_file = _tmp7_;
-#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = prepared_file;
-#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = _tmp8_->copy_to_library;
-#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp9_) {
-#line 16366 "BatchImport.c"
+#line 15838 "BatchImport.c"
 		{
 			GFile* _tmp10_ = NULL;
-			PreparedFile* _tmp11_ = NULL;
-			GFile* _tmp12_ = NULL;
-			GFile* _tmp13_ = NULL;
-			GFile* _tmp14_ = NULL;
-			GFile* _tmp15_ = NULL;
-			GFile* _tmp29_ = NULL;
-#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			PreparedFile* _tmp11_;
+			GFile* _tmp12_;
+			GFile* _tmp13_;
+			GFile* _tmp14_;
+			GFile* _tmp15_;
+			GFile* _tmp29_;
+#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp11_ = prepared_file;
-#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = _tmp11_->file;
-#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp13_ = library_files_duplicate (_tmp12_, NULL, NULL, TRUE, &_inner_error_);
-#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp10_ = _tmp13_;
-#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16385 "BatchImport.c"
-				goto __catch421_g_error;
+#line 15857 "BatchImport.c"
+				goto __catch422_g_error;
 			}
-#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = _tmp10_;
-#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp10_ = NULL;
-#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (final_file);
-#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			final_file = _tmp14_;
-#line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp15_ = final_file;
-#line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp15_ == NULL) {
-#line 16400 "BatchImport.c"
-				PreparedFile* _tmp16_ = NULL;
-				BatchImportJob* _tmp17_ = NULL;
-				PreparedFile* _tmp18_ = NULL;
-				GFile* _tmp19_ = NULL;
-				PreparedFile* _tmp20_ = NULL;
-				GFile* _tmp21_ = NULL;
-				gchar* _tmp22_ = NULL;
-				gchar* _tmp23_ = NULL;
-				PreparedFile* _tmp24_ = NULL;
-				GFile* _tmp25_ = NULL;
-				gchar* _tmp26_ = NULL;
-				gchar* _tmp27_ = NULL;
-				BatchImportResult* _tmp28_ = NULL;
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 15872 "BatchImport.c"
+				PreparedFile* _tmp16_;
+				BatchImportJob* _tmp17_;
+				PreparedFile* _tmp18_;
+				GFile* _tmp19_;
+				PreparedFile* _tmp20_;
+				GFile* _tmp21_;
+				gchar* _tmp22_;
+				gchar* _tmp23_;
+				PreparedFile* _tmp24_;
+				GFile* _tmp25_;
+				gchar* _tmp26_;
+				gchar* _tmp27_;
+				BatchImportResult* _tmp28_;
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp16_ = prepared_file;
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp17_ = _tmp16_->job;
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp18_ = prepared_file;
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp19_ = _tmp18_->file;
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp20_ = prepared_file;
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp21_ = _tmp20_->file;
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp22_ = g_file_get_path (_tmp21_);
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp23_ = _tmp22_;
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp24_ = prepared_file;
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp25_ = _tmp24_->file;
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp26_ = g_file_get_path (_tmp25_);
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp27_ = _tmp26_;
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp28_ = batch_import_result_new (_tmp17_, _tmp19_, _tmp23_, _tmp27_, NULL, IMPORT_RESULT_FILE_ERROR);
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_result_unref0 (self->failed);
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				self->failed = _tmp28_;
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp27_);
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp23_);
-#line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_tmp10_);
-#line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (final_associated_file);
-#line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (final_file);
-#line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_unref0 (prepared_file);
-#line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 16458 "BatchImport.c"
+#line 15930 "BatchImport.c"
 			}
-#line 1955 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1962 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp29_ = final_associated_file;
-#line 1955 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1962 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp29_ != NULL) {
-#line 16464 "BatchImport.c"
+#line 15936 "BatchImport.c"
 				GFile* _tmp30_ = NULL;
-				PreparedFile* _tmp31_ = NULL;
-				GFile* _tmp32_ = NULL;
-				GFile* _tmp33_ = NULL;
-				GFile* _tmp34_ = NULL;
-#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				PreparedFile* _tmp31_;
+				GFile* _tmp32_;
+				GFile* _tmp33_;
+				GFile* _tmp34_;
+#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp31_ = prepared_file;
-#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp32_ = _tmp31_->associated_file;
-#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp33_ = library_files_duplicate (_tmp32_, NULL, NULL, TRUE, &_inner_error_);
-#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp30_ = _tmp33_;
-#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_tmp10_);
-#line 16482 "BatchImport.c"
-					goto __catch421_g_error;
+#line 15954 "BatchImport.c"
+					goto __catch422_g_error;
 				}
-#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp34_ = _tmp30_;
-#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp30_ = NULL;
-#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (final_associated_file);
-#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				final_associated_file = _tmp34_;
-#line 1955 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1962 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_tmp30_);
-#line 16495 "BatchImport.c"
+#line 15967 "BatchImport.c"
 			}
-#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_tmp10_);
-#line 16499 "BatchImport.c"
+#line 15971 "BatchImport.c"
 		}
-		goto __finally421;
-		__catch421_g_error:
+		goto __finally422;
+		__catch422_g_error:
 		{
 			GError* err = NULL;
 			gchar* _tmp35_ = NULL;
-			GFile* _tmp36_ = NULL;
+			GFile* _tmp36_;
 			gchar* filename = NULL;
-			gchar* _tmp42_ = NULL;
-			PreparedFile* _tmp43_ = NULL;
-			BatchImportJob* _tmp44_ = NULL;
-			PreparedFile* _tmp45_ = NULL;
-			GFile* _tmp46_ = NULL;
-			const gchar* _tmp47_ = NULL;
-			const gchar* _tmp48_ = NULL;
-			GError* _tmp49_ = NULL;
-			BatchImportResult* _tmp50_ = NULL;
-#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			gchar* _tmp42_;
+			PreparedFile* _tmp43_;
+			BatchImportJob* _tmp44_;
+			PreparedFile* _tmp45_;
+			GFile* _tmp46_;
+			const gchar* _tmp47_;
+			const gchar* _tmp48_;
+			GError* _tmp49_;
+			BatchImportResult* _tmp50_;
+#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			err = _inner_error_;
-#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_inner_error_ = NULL;
-#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp36_ = final_file;
-#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp36_ != NULL) {
-#line 16525 "BatchImport.c"
-				GFile* _tmp37_ = NULL;
-				gchar* _tmp38_ = NULL;
-#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 15997 "BatchImport.c"
+				GFile* _tmp37_;
+				gchar* _tmp38_;
+#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp37_ = final_file;
-#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp38_ = g_file_get_path (_tmp37_);
-#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp35_);
-#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp35_ = _tmp38_;
-#line 16536 "BatchImport.c"
+#line 16008 "BatchImport.c"
 			} else {
-				PreparedFile* _tmp39_ = NULL;
-				const gchar* _tmp40_ = NULL;
-				gchar* _tmp41_ = NULL;
-#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				PreparedFile* _tmp39_;
+				const gchar* _tmp40_;
+				gchar* _tmp41_;
+#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp39_ = prepared_file;
-#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp40_ = _tmp39_->source_id;
-#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp41_ = g_strdup (_tmp40_);
-#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp35_);
-#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp35_ = _tmp41_;
-#line 16551 "BatchImport.c"
+#line 16023 "BatchImport.c"
 			}
-#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp42_ = g_strdup (_tmp35_);
-#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			filename = _tmp42_;
-#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp43_ = prepared_file;
-#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp44_ = _tmp43_->job;
-#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp45_ = prepared_file;
-#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp46_ = _tmp45_->file;
-#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp47_ = filename;
-#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp48_ = filename;
-#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp49_ = err;
-#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp50_ = batch_import_result_new_from_error (_tmp44_, _tmp46_, _tmp47_, _tmp48_, _tmp49_, IMPORT_RESULT_FILE_ERROR);
-#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_batch_import_result_unref0 (self->failed);
-#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			self->failed = _tmp50_;
-#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (filename);
-#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp35_);
-#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (final_associated_file);
-#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (final_file);
-#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (prepared_file);
-#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 16591 "BatchImport.c"
+#line 16063 "BatchImport.c"
 		}
-		__finally421:
-#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		__finally422:
+#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (final_associated_file);
-#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (final_file);
-#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (prepared_file);
-#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_clear_error (&_inner_error_);
-#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 16608 "BatchImport.c"
+#line 16080 "BatchImport.c"
 		}
 	}
-#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1974 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp51_ = final_file;
-#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1974 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp52_ = g_file_get_path (_tmp51_);
-#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1974 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp53_ = _tmp52_;
-#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_debug ("BatchImport.vala:1967: Importing %s", _tmp53_);
-#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1974 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	g_debug ("BatchImport.vala:1974: Importing %s", _tmp53_);
+#line 1974 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp53_);
-#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1976 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_result_ = IMPORT_RESULT_SUCCESS;
-#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	video_import_params = NULL;
-#line 1971 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1978 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	photo_import_params = NULL;
-#line 1972 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp54_ = prepared_file;
-#line 1972 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp55_ = _tmp54_->is_video;
-#line 1972 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp55_) {
-#line 16633 "BatchImport.c"
-		GFile* _tmp56_ = NULL;
-		ImportID _tmp57_ = {0};
-		PreparedFile* _tmp58_ = NULL;
-		const gchar* _tmp59_ = NULL;
-		Thumbnails* _tmp60_ = NULL;
-		Thumbnails* _tmp61_ = NULL;
-		PreparedFile* _tmp62_ = NULL;
-		BatchImportJob* _tmp63_ = NULL;
-		time_t _tmp64_ = 0;
-		VideoImportParams* _tmp65_ = NULL;
-		VideoImportParams* _tmp66_ = NULL;
-		ImportResult _tmp67_ = 0;
-#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 16105 "BatchImport.c"
+		GFile* _tmp56_;
+		ImportID _tmp57_;
+		PreparedFile* _tmp58_;
+		const gchar* _tmp59_;
+		Thumbnails* _tmp60_;
+		Thumbnails* _tmp61_;
+		PreparedFile* _tmp62_;
+		BatchImportJob* _tmp63_;
+		time_t _tmp64_;
+		VideoImportParams* _tmp65_;
+		VideoImportParams* _tmp66_;
+		ImportResult _tmp67_;
+#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp56_ = final_file;
-#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp57_ = self->priv->import_id;
-#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp58_ = prepared_file;
-#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp59_ = _tmp58_->full_md5;
-#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp60_ = thumbnails_new ();
-#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp61_ = _tmp60_;
-#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp62_ = prepared_file;
-#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp63_ = _tmp62_->job;
-#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp64_ = batch_import_job_get_exposure_time_override (_tmp63_);
-#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp65_ = video_import_params_new (_tmp56_, &_tmp57_, _tmp59_, _tmp61_, _tmp64_);
-#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_video_import_params_unref0 (video_import_params);
-#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		video_import_params = _tmp65_;
-#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_thumbnails_unref0 (_tmp61_);
-#line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1984 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp66_ = video_import_params;
-#line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1984 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp67_ = video_reader_prepare_for_import (_tmp66_);
-#line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1984 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_result_ = _tmp67_;
-#line 16678 "BatchImport.c"
+#line 16150 "BatchImport.c"
 	} else {
-		GFile* _tmp68_ = NULL;
-		GFile* _tmp69_ = NULL;
-		ImportID _tmp70_ = {0};
-		PreparedFile* _tmp71_ = NULL;
-		const gchar* _tmp72_ = NULL;
-		PreparedFile* _tmp73_ = NULL;
-		const gchar* _tmp74_ = NULL;
-		PreparedFile* _tmp75_ = NULL;
-		const gchar* _tmp76_ = NULL;
-		Thumbnails* _tmp77_ = NULL;
-		Thumbnails* _tmp78_ = NULL;
-		PhotoImportParams* _tmp79_ = NULL;
-		PhotoImportParams* _tmp80_ = NULL;
-		ImportResult _tmp81_ = 0;
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		GFile* _tmp68_;
+		GFile* _tmp69_;
+		ImportID _tmp70_;
+		PreparedFile* _tmp71_;
+		const gchar* _tmp72_;
+		PreparedFile* _tmp73_;
+		const gchar* _tmp74_;
+		PreparedFile* _tmp75_;
+		const gchar* _tmp76_;
+		Thumbnails* _tmp77_;
+		Thumbnails* _tmp78_;
+		PhotoImportParams* _tmp79_;
+		PhotoImportParams* _tmp80_;
+		ImportResult _tmp81_;
+#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp68_ = final_file;
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp69_ = final_associated_file;
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp70_ = self->priv->import_id;
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp71_ = prepared_file;
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp72_ = _tmp71_->exif_md5;
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp73_ = prepared_file;
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp74_ = _tmp73_->thumbnail_md5;
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp75_ = prepared_file;
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp76_ = _tmp75_->full_md5;
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp77_ = thumbnails_new ();
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp78_ = _tmp77_;
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp79_ = photo_import_params_new (_tmp68_, _tmp69_, &_tmp70_, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL, _tmp72_, _tmp74_, _tmp76_, _tmp78_);
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_photo_import_params_unref0 (photo_import_params);
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		photo_import_params = _tmp79_;
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_thumbnails_unref0 (_tmp78_);
-#line 1983 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1990 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp80_ = photo_import_params;
-#line 1983 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1990 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp81_ = photo_prepare_for_import (_tmp80_);
-#line 1983 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1990 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_result_ = _tmp81_;
-#line 16730 "BatchImport.c"
+#line 16202 "BatchImport.c"
 	}
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp83_ = _result_;
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp83_ != IMPORT_RESULT_SUCCESS) {
-#line 16736 "BatchImport.c"
-		GFile* _tmp84_ = NULL;
-		PreparedFile* _tmp85_ = NULL;
-		GFile* _tmp86_ = NULL;
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 16208 "BatchImport.c"
+		GFile* _tmp84_;
+		PreparedFile* _tmp85_;
+		GFile* _tmp86_;
+#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp84_ = final_file;
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp85_ = prepared_file;
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp86_ = _tmp85_->file;
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp82_ = _tmp84_ != _tmp86_;
-#line 16748 "BatchImport.c"
+#line 16220 "BatchImport.c"
 	} else {
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp82_ = FALSE;
-#line 16752 "BatchImport.c"
+#line 16224 "BatchImport.c"
 	}
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp82_) {
-#line 16756 "BatchImport.c"
-		GFile* _tmp87_ = NULL;
-		gchar* _tmp88_ = NULL;
-		gchar* _tmp89_ = NULL;
-#line 1987 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 16228 "BatchImport.c"
+		GFile* _tmp87_;
+		gchar* _tmp88_;
+		gchar* _tmp89_;
+#line 1994 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp87_ = final_file;
-#line 1987 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1994 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp88_ = g_file_get_path (_tmp87_);
-#line 1987 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1994 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp89_ = _tmp88_;
-#line 1987 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_debug ("BatchImport.vala:1987: Deleting failed imported copy %s", _tmp89_);
-#line 1987 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1994 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		g_debug ("BatchImport.vala:1994: Deleting failed imported copy %s", _tmp89_);
+#line 1994 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp89_);
-#line 16770 "BatchImport.c"
+#line 16242 "BatchImport.c"
 		{
-			GFile* _tmp90_ = NULL;
-#line 1989 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			GFile* _tmp90_;
+#line 1996 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp90_ = final_file;
-#line 1989 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1996 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_file_delete (_tmp90_, NULL, &_inner_error_);
-#line 1989 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1996 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16779 "BatchImport.c"
-				goto __catch422_g_error;
+#line 16251 "BatchImport.c"
+				goto __catch423_g_error;
 			}
 		}
-		goto __finally422;
-		__catch422_g_error:
+		goto __finally423;
+		__catch423_g_error:
 		{
 			GError* err = NULL;
-			GFile* _tmp91_ = NULL;
-			gchar* _tmp92_ = NULL;
-			gchar* _tmp93_ = NULL;
-			GError* _tmp94_ = NULL;
-			const gchar* _tmp95_ = NULL;
-#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			GFile* _tmp91_;
+			gchar* _tmp92_;
+			gchar* _tmp93_;
+			GError* _tmp94_;
+			const gchar* _tmp95_;
+#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			err = _inner_error_;
-#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_inner_error_ = NULL;
-#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp91_ = final_file;
-#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp92_ = g_file_get_path (_tmp91_);
-#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp93_ = _tmp92_;
-#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp94_ = err;
-#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp95_ = _tmp94_->message;
-#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			g_warning ("BatchImport.vala:1992: Unable to delete copy of imported file %s: %s", _tmp93_, _tmp95_);
-#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			g_warning ("BatchImport.vala:1999: Unable to delete copy of imported file %s: %s", _tmp93_, _tmp95_);
+#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp93_);
-#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 16812 "BatchImport.c"
+#line 16284 "BatchImport.c"
 		}
-		__finally422:
-#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		__finally423:
+#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_photo_import_params_unref0 (photo_import_params);
-#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_video_import_params_unref0 (video_import_params);
-#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (final_associated_file);
-#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (final_file);
-#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (prepared_file);
-#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_clear_error (&_inner_error_);
-#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 16833 "BatchImport.c"
+#line 16305 "BatchImport.c"
 		}
 	}
-#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp96_ = prepared_file;
-#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp97_ = _tmp96_->job;
-#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp98_ = final_file;
-#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp99_ = final_file;
-#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp100_ = g_file_get_path (_tmp99_);
-#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp101_ = _tmp100_;
-#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp102_ = final_file;
-#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp103_ = g_file_get_path (_tmp102_);
-#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp104_ = _tmp103_;
-#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp105_ = _result_;
-#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp106_ = batch_import_result_new (_tmp97_, _tmp98_, _tmp101_, _tmp104_, NULL, _tmp105_);
-#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp107_ = _tmp106_;
-#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp104_);
-#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp101_);
-#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_result = _tmp107_;
-#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2006 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp108_ = batch_result;
-#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2006 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp109_ = _tmp108_->result;
-#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2006 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp109_ != IMPORT_RESULT_SUCCESS) {
-#line 16872 "BatchImport.c"
-		BatchImportResult* _tmp110_ = NULL;
-		BatchImportResult* _tmp111_ = NULL;
-#line 2000 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 16344 "BatchImport.c"
+		BatchImportResult* _tmp110_;
+		BatchImportResult* _tmp111_;
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp110_ = batch_result;
-#line 2000 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp111_ = _batch_import_result_ref0 (_tmp110_);
-#line 2000 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_batch_import_result_unref0 (self->failed);
-#line 2000 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->failed = _tmp111_;
-#line 16883 "BatchImport.c"
+#line 16355 "BatchImport.c"
 	} else {
-		GFile* _tmp112_ = NULL;
-		PreparedFile* _tmp113_ = NULL;
-		PhotoImportParams* _tmp114_ = NULL;
-		VideoImportParams* _tmp115_ = NULL;
-		BatchImportResult* _tmp116_ = NULL;
-		ReadyForImport* _tmp117_ = NULL;
-#line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		GFile* _tmp112_;
+		PreparedFile* _tmp113_;
+		PhotoImportParams* _tmp114_;
+		VideoImportParams* _tmp115_;
+		BatchImportResult* _tmp116_;
+		ReadyForImport* _tmp117_;
+#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp112_ = final_file;
-#line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp113_ = prepared_file;
-#line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp114_ = photo_import_params;
-#line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp115_ = video_import_params;
-#line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp116_ = batch_result;
-#line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp117_ = ready_for_import_new (_tmp112_, _tmp113_, _tmp114_, _tmp115_, _tmp116_);
-#line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_ready_for_import_unref0 (self->ready);
-#line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->ready = _tmp117_;
-#line 16907 "BatchImport.c"
+#line 16379 "BatchImport.c"
 	}
-#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (batch_result);
-#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_photo_import_params_unref0 (photo_import_params);
-#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_video_import_params_unref0 (video_import_params);
-#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (final_associated_file);
-#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (final_file);
-#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (prepared_file);
-#line 16921 "BatchImport.c"
+#line 16393 "BatchImport.c"
 }
 
 
 static void prepared_file_import_job_class_init (PreparedFileImportJobClass * klass) {
-#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	prepared_file_import_job_parent_class = g_type_class_peek_parent (klass);
-#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->finalize = prepared_file_import_job_finalize;
-#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_type_class_add_private (klass, sizeof (PreparedFileImportJobPrivate));
-#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) prepared_file_import_job_real_execute;
-#line 16934 "BatchImport.c"
+#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) prepared_file_import_job_real_execute;
+#line 16406 "BatchImport.c"
 }
 
 
 static void prepared_file_import_job_instance_init (PreparedFileImportJob * self) {
-#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = PREPARED_FILE_IMPORT_JOB_GET_PRIVATE (self);
-#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ready = NULL;
-#line 1921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1928 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->failed = NULL;
-#line 16945 "BatchImport.c"
+#line 16417 "BatchImport.c"
 }
 
 
-static void prepared_file_import_job_finalize (BackgroundJob* obj) {
+static void prepared_file_import_job_finalize (BackgroundJob * obj) {
 	PreparedFileImportJob * self;
-#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob);
-#line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1926 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (self->not_ready);
-#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_ready_for_import_unref0 (self->ready);
-#line 1921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1928 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (self->failed);
-#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (prepared_file_import_job_parent_class)->finalize (obj);
-#line 16961 "BatchImport.c"
+#line 16433 "BatchImport.c"
 }
 
 
@@ -16984,292 +16456,292 @@ GType prepared_file_import_job_get_type (void) {
 
 CompletedImportObject* completed_import_object_construct (GType object_type, MediaSource* source, Thumbnails* thumbnails, BatchImportJob* original_job, BatchImportResult* import_result) {
 	CompletedImportObject* self = NULL;
-	Thumbnails* _tmp0_ = NULL;
-	Thumbnails* _tmp1_ = NULL;
-	BatchImportResult* _tmp2_ = NULL;
-	BatchImportResult* _tmp3_ = NULL;
-	MediaSource* _tmp4_ = NULL;
-	MediaSource* _tmp5_ = NULL;
-	BatchImportJob* _tmp6_ = NULL;
-	BatchImportJob* _tmp7_ = NULL;
-	Thumbnails* _tmp8_ = NULL;
-	GdkPixbuf* _tmp9_ = NULL;
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	Thumbnails* _tmp0_;
+	Thumbnails* _tmp1_;
+	BatchImportResult* _tmp2_;
+	BatchImportResult* _tmp3_;
+	MediaSource* _tmp4_;
+	MediaSource* _tmp5_;
+	BatchImportJob* _tmp6_;
+	BatchImportJob* _tmp7_;
+	Thumbnails* _tmp8_;
+	GdkPixbuf* _tmp9_;
+#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_THUMBNAILS (thumbnails), NULL);
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (original_job), NULL);
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_RESULT (import_result), NULL);
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (CompletedImportObject*) g_type_create_instance (object_type);
-#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2023 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = thumbnails;
-#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2023 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _thumbnails_ref0 (_tmp0_);
-#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2023 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_thumbnails_unref0 (self->thumbnails);
-#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2023 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->thumbnails = _tmp1_;
-#line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = import_result;
-#line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = _batch_import_result_ref0 (_tmp2_);
-#line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (self->batch_result);
-#line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->batch_result = _tmp3_;
-#line 2018 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = source;
-#line 2018 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 2018 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->source);
-#line 2018 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->source = _tmp5_;
-#line 2019 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2026 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = original_job;
-#line 2019 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2026 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = _batch_import_job_ref0 (_tmp6_);
-#line 2019 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2026 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->original_job);
-#line 2019 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2026 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->original_job = _tmp7_;
-#line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = thumbnails;
-#line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = thumbnails_get (_tmp8_, THUMBNAIL_CACHE_SIZE_LARGEST);
-#line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->user_preview);
-#line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->user_preview = _tmp9_;
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 17041 "BatchImport.c"
+#line 16513 "BatchImport.c"
 }
 
 
 CompletedImportObject* completed_import_object_new (MediaSource* source, Thumbnails* thumbnails, BatchImportJob* original_job, BatchImportResult* import_result) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return completed_import_object_construct (TYPE_COMPLETED_IMPORT_OBJECT, source, thumbnails, original_job, import_result);
-#line 17048 "BatchImport.c"
+#line 16520 "BatchImport.c"
 }
 
 
 static void value_completed_import_object_init (GValue* value) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 17055 "BatchImport.c"
+#line 16527 "BatchImport.c"
 }
 
 
 static void value_completed_import_object_free_value (GValue* value) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		completed_import_object_unref (value->data[0].v_pointer);
-#line 17064 "BatchImport.c"
+#line 16536 "BatchImport.c"
 	}
 }
 
 
 static void value_completed_import_object_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = completed_import_object_ref (src_value->data[0].v_pointer);
-#line 17074 "BatchImport.c"
+#line 16546 "BatchImport.c"
 	} else {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 17078 "BatchImport.c"
+#line 16550 "BatchImport.c"
 	}
 }
 
 
 static gpointer value_completed_import_object_peek_pointer (const GValue* value) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 17086 "BatchImport.c"
+#line 16558 "BatchImport.c"
 }
 
 
 static gchar* value_completed_import_object_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 17093 "BatchImport.c"
-		CompletedImportObject* object;
+#line 16565 "BatchImport.c"
+		CompletedImportObject * object;
 		object = collect_values[0].v_pointer;
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 17100 "BatchImport.c"
+#line 16572 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 17104 "BatchImport.c"
+#line 16576 "BatchImport.c"
 		}
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = completed_import_object_ref (object);
-#line 17108 "BatchImport.c"
+#line 16580 "BatchImport.c"
 	} else {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 17112 "BatchImport.c"
+#line 16584 "BatchImport.c"
 	}
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 17116 "BatchImport.c"
+#line 16588 "BatchImport.c"
 }
 
 
 static gchar* value_completed_import_object_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	CompletedImportObject** object_p;
+	CompletedImportObject ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 17127 "BatchImport.c"
+#line 16599 "BatchImport.c"
 	}
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 17133 "BatchImport.c"
+#line 16605 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 17137 "BatchImport.c"
+#line 16609 "BatchImport.c"
 	} else {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = completed_import_object_ref (value->data[0].v_pointer);
-#line 17141 "BatchImport.c"
+#line 16613 "BatchImport.c"
 	}
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 17145 "BatchImport.c"
+#line 16617 "BatchImport.c"
 }
 
 
 GParamSpec* param_spec_completed_import_object (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecCompletedImportObject* spec;
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_COMPLETED_IMPORT_OBJECT), NULL);
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 17159 "BatchImport.c"
+#line 16631 "BatchImport.c"
 }
 
 
 gpointer value_get_completed_import_object (const GValue* value) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMPLETED_IMPORT_OBJECT), NULL);
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 17168 "BatchImport.c"
+#line 16640 "BatchImport.c"
 }
 
 
 void value_set_completed_import_object (GValue* value, gpointer v_object) {
-	CompletedImportObject* old;
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	CompletedImportObject * old;
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMPLETED_IMPORT_OBJECT));
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_COMPLETED_IMPORT_OBJECT));
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		completed_import_object_ref (value->data[0].v_pointer);
-#line 17188 "BatchImport.c"
+#line 16660 "BatchImport.c"
 	} else {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 17192 "BatchImport.c"
+#line 16664 "BatchImport.c"
 	}
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		completed_import_object_unref (old);
-#line 17198 "BatchImport.c"
+#line 16670 "BatchImport.c"
 	}
 }
 
 
 void value_take_completed_import_object (GValue* value, gpointer v_object) {
-	CompletedImportObject* old;
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	CompletedImportObject * old;
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMPLETED_IMPORT_OBJECT));
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_COMPLETED_IMPORT_OBJECT));
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 17217 "BatchImport.c"
+#line 16689 "BatchImport.c"
 	} else {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 17221 "BatchImport.c"
+#line 16693 "BatchImport.c"
 	}
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		completed_import_object_unref (old);
-#line 17227 "BatchImport.c"
+#line 16699 "BatchImport.c"
 	}
 }
 
 
 static void completed_import_object_class_init (CompletedImportObjectClass * klass) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	completed_import_object_parent_class = g_type_class_peek_parent (klass);
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((CompletedImportObjectClass *) klass)->finalize = completed_import_object_finalize;
-#line 17237 "BatchImport.c"
+#line 16709 "BatchImport.c"
 }
 
 
 static void completed_import_object_instance_init (CompletedImportObject * self) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 17244 "BatchImport.c"
+#line 16716 "BatchImport.c"
 }
 
 
-static void completed_import_object_finalize (CompletedImportObject* obj) {
+static void completed_import_object_finalize (CompletedImportObject * obj) {
 	CompletedImportObject * self;
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COMPLETED_IMPORT_OBJECT, CompletedImportObject);
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_handlers_destroy (self);
-#line 2008 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_thumbnails_unref0 (self->thumbnails);
-#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (self->batch_result);
-#line 2010 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->source);
-#line 2011 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2018 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->original_job);
-#line 2012 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2019 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->user_preview);
-#line 17264 "BatchImport.c"
+#line 16736 "BatchImport.c"
 }
 
 
@@ -17288,183 +16760,183 @@ GType completed_import_object_get_type (void) {
 
 
 gpointer completed_import_object_ref (gpointer instance) {
-	CompletedImportObject* self;
+	CompletedImportObject * self;
 	self = instance;
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 17289 "BatchImport.c"
+#line 16761 "BatchImport.c"
 }
 
 
 void completed_import_object_unref (gpointer instance) {
-	CompletedImportObject* self;
+	CompletedImportObject * self;
 	self = instance;
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		COMPLETED_IMPORT_OBJECT_GET_CLASS (self)->finalize (self);
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 17302 "BatchImport.c"
+#line 16774 "BatchImport.c"
 	}
 }
 
 
 ThumbnailWriterJob* thumbnail_writer_job_construct (GType object_type, BatchImport* owner, CompletedImportObject* completed_import_source, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancel_callback, void* cancel_callback_target) {
 	ThumbnailWriterJob* self = NULL;
-	BatchImport* _tmp0_ = NULL;
-	CompletionCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	GCancellable* _tmp2_ = NULL;
-	CancellationCallback _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
-	CompletedImportObject* _tmp4_ = NULL;
-	Thumbnails* _tmp5_ = NULL;
-	CompletedImportObject* _tmp6_ = NULL;
-	CompletedImportObject* _tmp7_ = NULL;
-#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	BatchImport* _tmp0_;
+	CompletionCallback _tmp1_;
+	void* _tmp1__target;
+	GCancellable* _tmp2_;
+	CancellationCallback _tmp3_;
+	void* _tmp3__target;
+	CompletedImportObject* _tmp4_;
+	Thumbnails* _tmp5_;
+	CompletedImportObject* _tmp6_;
+	CompletedImportObject* _tmp7_;
+#line 2034 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL);
-#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2034 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_COMPLETED_IMPORT_OBJECT (completed_import_source), NULL);
-#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2034 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 2029 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = owner;
-#line 2029 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = callback;
-#line 2029 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1__target = callback_target;
-#line 2029 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = cancellable;
-#line 2029 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = cancel_callback;
-#line 2029 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3__target = cancel_callback_target;
-#line 2029 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (ThumbnailWriterJob*) background_import_job_construct (object_type, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target);
-#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = completed_import_source;
-#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _tmp4_->thumbnails;
-#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (_tmp5_ != NULL, "completed_import_source.thumbnails != null");
-#line 2032 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = completed_import_source;
-#line 2032 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = _completed_import_object_ref0 (_tmp6_);
-#line 2032 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_completed_import_object_unref0 (self->completed_import_source);
-#line 2032 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->completed_import_source = _tmp7_;
-#line 2034 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2041 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW);
-#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2034 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 17357 "BatchImport.c"
+#line 16829 "BatchImport.c"
 }
 
 
 ThumbnailWriterJob* thumbnail_writer_job_new (BatchImport* owner, CompletedImportObject* completed_import_source, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancel_callback, void* cancel_callback_target) {
-#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2034 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return thumbnail_writer_job_construct (TYPE_THUMBNAIL_WRITER_JOB, owner, completed_import_source, callback, callback_target, cancellable, cancel_callback, cancel_callback_target);
-#line 17364 "BatchImport.c"
+#line 16836 "BatchImport.c"
 }
 
 
 static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 	ThumbnailWriterJob * self;
-	CompletedImportObject* _tmp10_ = NULL;
+	CompletedImportObject* _tmp10_;
 	GError * _inner_error_ = NULL;
-#line 2037 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2044 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob);
-#line 17374 "BatchImport.c"
+#line 16846 "BatchImport.c"
 	{
-		CompletedImportObject* _tmp0_ = NULL;
-		MediaSource* _tmp1_ = NULL;
-		CompletedImportObject* _tmp2_ = NULL;
-		Thumbnails* _tmp3_ = NULL;
-		CompletedImportObject* _tmp4_ = NULL;
-		BatchImportResult* _tmp5_ = NULL;
-#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		CompletedImportObject* _tmp0_;
+		MediaSource* _tmp1_;
+		CompletedImportObject* _tmp2_;
+		Thumbnails* _tmp3_;
+		CompletedImportObject* _tmp4_;
+		BatchImportResult* _tmp5_;
+#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = self->completed_import_source;
-#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = _tmp0_->source;
-#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->completed_import_source;
-#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = _tmp2_->thumbnails;
-#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		thumbnail_cache_import_thumbnails (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp3_, TRUE, &_inner_error_);
-#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17394 "BatchImport.c"
-			goto __catch423_g_error;
+#line 16866 "BatchImport.c"
+			goto __catch424_g_error;
 		}
-#line 2041 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = self->completed_import_source;
-#line 2041 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = _tmp4_->batch_result;
-#line 2041 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_->result = IMPORT_RESULT_SUCCESS;
-#line 17403 "BatchImport.c"
+#line 16875 "BatchImport.c"
 	}
-	goto __finally423;
-	__catch423_g_error:
+	goto __finally424;
+	__catch424_g_error:
 	{
 		GError* err = NULL;
-		CompletedImportObject* _tmp6_ = NULL;
-		BatchImportResult* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-		ImportResult _tmp9_ = 0;
-#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		CompletedImportObject* _tmp6_;
+		BatchImportResult* _tmp7_;
+		GError* _tmp8_;
+		ImportResult _tmp9_;
+#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		err = _inner_error_;
-#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_inner_error_ = NULL;
-#line 2043 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2050 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = self->completed_import_source;
-#line 2043 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2050 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = _tmp6_->batch_result;
-#line 2043 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2050 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = err;
-#line 2043 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2050 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = import_result_convert_error (_tmp8_, IMPORT_RESULT_FILE_ERROR);
-#line 2043 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2050 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_->result = _tmp9_;
-#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_error_free0 (err);
-#line 17429 "BatchImport.c"
+#line 16901 "BatchImport.c"
 	}
-	__finally423:
-#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	__finally424:
+#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_clear_error (&_inner_error_);
-#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return;
-#line 17440 "BatchImport.c"
+#line 16912 "BatchImport.c"
 	}
-#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = self->completed_import_source;
-#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_thumbnails_unref0 (_tmp10_->thumbnails);
-#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_->thumbnails = NULL;
-#line 17448 "BatchImport.c"
+#line 16920 "BatchImport.c"
 }
 
 
 static void thumbnail_writer_job_class_init (ThumbnailWriterJobClass * klass) {
-#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	thumbnail_writer_job_parent_class = g_type_class_peek_parent (klass);
-#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->finalize = thumbnail_writer_job_finalize;
-#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) thumbnail_writer_job_real_execute;
-#line 17459 "BatchImport.c"
+#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) thumbnail_writer_job_real_execute;
+#line 16931 "BatchImport.c"
 }
 
 
@@ -17472,15 +16944,15 @@ static void thumbnail_writer_job_instance_init (ThumbnailWriterJob * self) {
 }
 
 
-static void thumbnail_writer_job_finalize (BackgroundJob* obj) {
+static void thumbnail_writer_job_finalize (BackgroundJob * obj) {
 	ThumbnailWriterJob * self;
-#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob);
-#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2032 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_completed_import_object_unref0 (self->completed_import_source);
-#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (thumbnail_writer_job_parent_class)->finalize (obj);
-#line 17475 "BatchImport.c"
+#line 16947 "BatchImport.c"
 }
 
 
diff --git a/src/BatchImport.vala b/src/BatchImport.vala
index 27cf4da..8e4ae5c 100644
--- a/src/BatchImport.vala
+++ b/src/BatchImport.vala
@@ -1265,7 +1265,14 @@ public class BatchImport : Object {
             ready_sources.add(completed_object);
             
             imported(completed_object.source, user_preview, total);
-            report_progress(completed_object.source.get_filesize());
+            // If we have a photo, use master size. For RAW import, we might end up with reporting
+            // the size of the (much smaller) JPEG which will look like no progress at all
+            if (completed_object.source is PhotoSource) {
+                var photo_source = completed_object.source as PhotoSource;
+                report_progress(photo_source.get_master_filesize());
+            } else {
+                report_progress(completed_object.source.get_filesize());
+            }
             file_import_complete();
         }
         
diff --git a/src/Box.c b/src/Box.c
index eb62af4..331f476 100644
--- a/src/Box.c
+++ b/src/Box.c
@@ -1,4 +1,4 @@
-/* Box.c generated by valac 0.34.7, the Vala compiler
+/* Box.c generated by valac 0.36.6, the Vala compiler
  * generated from Box.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -131,13 +131,13 @@ GType box_location_get_type (void) {
 BoxComplements box_complements_derive (gboolean horizontal_complement, gboolean vertical_complement) {
 	BoxComplements result = 0;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 27 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp1_ = horizontal_complement;
 #line 27 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp1_) {
 #line 140 "Box.c"
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 27 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp2_ = vertical_complement;
 #line 27 "/home/jens/Source/shotwell/src/Box.vala"
@@ -156,7 +156,7 @@ BoxComplements box_complements_derive (gboolean horizontal_complement, gboolean
 		return result;
 #line 158 "Box.c"
 	} else {
-		gboolean _tmp3_ = FALSE;
+		gboolean _tmp3_;
 #line 29 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp3_ = horizontal_complement;
 #line 29 "/home/jens/Source/shotwell/src/Box.vala"
@@ -167,7 +167,7 @@ BoxComplements box_complements_derive (gboolean horizontal_complement, gboolean
 			return result;
 #line 169 "Box.c"
 		} else {
-			gboolean _tmp4_ = FALSE;
+			gboolean _tmp4_;
 #line 31 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp4_ = vertical_complement;
 #line 31 "/home/jens/Source/shotwell/src/Box.vala"
@@ -201,18 +201,18 @@ GType box_complements_get_type (void) {
 
 
 void box_init (Box *self, gint left, gint top, gint right, gint bottom) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp7_;
+	gint _tmp8_;
+	gint _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
 #line 46 "/home/jens/Source/shotwell/src/Box.vala"
 	memset (self, 0, sizeof (Box));
 #line 48 "/home/jens/Source/shotwell/src/Box.vala"
@@ -234,7 +234,7 @@ void box_init (Box *self, gint left, gint top, gint right, gint bottom) {
 #line 53 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp4_ <= _tmp5_) {
 #line 237 "Box.c"
-		gint _tmp6_ = 0;
+		gint _tmp6_;
 #line 54 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp6_ = left;
 #line 54 "/home/jens/Source/shotwell/src/Box.vala"
@@ -248,7 +248,7 @@ void box_init (Box *self, gint left, gint top, gint right, gint bottom) {
 #line 56 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp7_ <= _tmp8_) {
 #line 251 "Box.c"
-		gint _tmp9_ = 0;
+		gint _tmp9_;
 #line 57 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp9_ = top;
 #line 57 "/home/jens/Source/shotwell/src/Box.vala"
@@ -276,18 +276,18 @@ void box_init (Box *self, gint left, gint top, gint right, gint bottom) {
 
 
 void box_from_rectangle (GdkRectangle* rect, Box* result) {
-	GdkRectangle _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	GdkRectangle _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	GdkRectangle _tmp10_ = {0};
-	gint _tmp11_ = 0;
+	GdkRectangle _tmp0_;
+	gint _tmp1_;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
+	GdkRectangle _tmp10_;
+	gint _tmp11_;
 	Box _tmp12_ = {0};
 #line 65 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (rect != NULL);
@@ -326,18 +326,18 @@ void box_from_rectangle (GdkRectangle* rect, Box* result) {
 
 
 void box_from_allocation (GtkAllocation* alloc, Box* result) {
-	GtkAllocation _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GtkAllocation _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GtkAllocation _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	GtkAllocation _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	GtkAllocation _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	GtkAllocation _tmp10_ = {0};
-	gint _tmp11_ = 0;
+	GtkAllocation _tmp0_;
+	gint _tmp1_;
+	GtkAllocation _tmp2_;
+	gint _tmp3_;
+	GtkAllocation _tmp4_;
+	gint _tmp5_;
+	GtkAllocation _tmp6_;
+	gint _tmp7_;
+	GtkAllocation _tmp8_;
+	gint _tmp9_;
+	GtkAllocation _tmp10_;
+	gint _tmp11_;
 	Box _tmp12_ = {0};
 #line 69 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (alloc != NULL);
@@ -376,26 +376,26 @@ void box_from_allocation (GtkAllocation* alloc, Box* result) {
 
 
 void box_from_points (GdkPoint* corner1, GdkPoint* corner2, Box* result) {
-	GdkPoint _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GdkPoint _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	GdkPoint _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	GdkPoint _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	GdkPoint _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	GdkPoint _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	GdkPoint _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	GdkPoint _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	GdkPoint _tmp0_;
+	gint _tmp1_;
+	GdkPoint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	GdkPoint _tmp5_;
+	gint _tmp6_;
+	GdkPoint _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	GdkPoint _tmp10_;
+	gint _tmp11_;
+	GdkPoint _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	GdkPoint _tmp15_;
+	gint _tmp16_;
+	GdkPoint _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 	Box _tmp20_ = {0};
 #line 75 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (corner1 != NULL);
@@ -452,18 +452,18 @@ void box_from_points (GdkPoint* corner1, GdkPoint* corner2, Box* result) {
 
 
 void box_from_center (GdkPoint* center, gint width, gint height, Box* result) {
-	GdkPoint _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	GdkPoint _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	GdkPoint _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	GdkPoint _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	GdkPoint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	GdkPoint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	GdkPoint _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	GdkPoint _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 	Box _tmp12_ = {0};
 #line 80 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (center != NULL);
@@ -503,10 +503,10 @@ void box_from_center (GdkPoint* center, gint width, gint height, Box* result) {
 
 gint box_get_width (Box *self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 86 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).right;
 #line 86 "/home/jens/Source/shotwell/src/Box.vala"
@@ -527,10 +527,10 @@ gint box_get_width (Box *self) {
 
 gint box_get_height (Box *self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 92 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).bottom;
 #line 92 "/home/jens/Source/shotwell/src/Box.vala"
@@ -554,13 +554,13 @@ gboolean box_is_valid (Box *self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
+	gint _tmp3_;
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp3_ = (*self).left;
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp3_ >= 0) {
 #line 563 "Box.c"
-		gint _tmp4_ = 0;
+		gint _tmp4_;
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp4_ = (*self).top;
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
@@ -574,8 +574,8 @@ gboolean box_is_valid (Box *self) {
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp2_) {
 #line 577 "Box.c"
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+		gint _tmp5_;
+		gint _tmp6_;
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp5_ = (*self).right;
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
@@ -591,8 +591,8 @@ gboolean box_is_valid (Box *self) {
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp1_) {
 #line 594 "Box.c"
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
+		gint _tmp7_;
+		gint _tmp8_;
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp7_ = (*self).bottom;
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
@@ -618,9 +618,9 @@ gboolean box_equals (Box *self, Box* box) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
-	Box _tmp4_ = {0};
-	gint _tmp5_ = 0;
+	gint _tmp3_;
+	Box _tmp4_;
+	gint _tmp5_;
 #line 101 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_val_if_fail (box != NULL, FALSE);
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
@@ -632,9 +632,9 @@ gboolean box_equals (Box *self, Box* box) {
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp3_ == _tmp5_) {
 #line 635 "Box.c"
-		gint _tmp6_ = 0;
-		Box _tmp7_ = {0};
-		gint _tmp8_ = 0;
+		gint _tmp6_;
+		Box _tmp7_;
+		gint _tmp8_;
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp6_ = (*self).top;
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
@@ -652,9 +652,9 @@ gboolean box_equals (Box *self, Box* box) {
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp2_) {
 #line 655 "Box.c"
-		gint _tmp9_ = 0;
-		Box _tmp10_ = {0};
-		gint _tmp11_ = 0;
+		gint _tmp9_;
+		Box _tmp10_;
+		gint _tmp11_;
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp9_ = (*self).right;
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
@@ -672,9 +672,9 @@ gboolean box_equals (Box *self, Box* box) {
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp1_) {
 #line 675 "Box.c"
-		gint _tmp12_ = 0;
-		Box _tmp13_ = {0};
-		gint _tmp14_ = 0;
+		gint _tmp12_;
+		Box _tmp13_;
+		gint _tmp14_;
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp12_ = (*self).bottom;
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
@@ -699,10 +699,10 @@ gboolean box_equals (Box *self, Box* box) {
 
 void box_adjust_width (Box *self, gint width) {
 	gint center_x = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 107 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).left;
 #line 107 "/home/jens/Source/shotwell/src/Box.vala"
@@ -723,10 +723,10 @@ void box_adjust_width (Box *self, gint width) {
 
 void box_adjust_height (Box *self, gint height) {
 	gint center_y = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 114 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).top;
 #line 114 "/home/jens/Source/shotwell/src/Box.vala"
@@ -749,34 +749,34 @@ void box_get_scaled (Box *self, Dimensions* scaled, Box* result) {
 	gdouble x_scale = 0.0;
 	gdouble y_scale = 0.0;
 	Dimensions _tmp0_ = {0};
-	Dimensions _tmp1_ = {0};
+	Dimensions _tmp1_;
 	gdouble _tmp2_ = 0.0;
 	gdouble _tmp3_ = 0.0;
 	gint l = 0;
-	gint _tmp4_ = 0;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
+	gint _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
 	gint t = 0;
-	gint _tmp7_ = 0;
-	gdouble _tmp8_ = 0.0;
-	gdouble _tmp9_ = 0.0;
+	gint _tmp7_;
+	gdouble _tmp8_;
+	gdouble _tmp9_;
 	gint r = 0;
-	gint _tmp10_ = 0;
-	Dimensions _tmp11_ = {0};
-	gint _tmp12_ = 0;
+	gint _tmp10_;
+	Dimensions _tmp11_;
+	gint _tmp12_;
 	gint b = 0;
-	gint _tmp13_ = 0;
-	Dimensions _tmp14_ = {0};
-	gint _tmp15_ = 0;
+	gint _tmp13_;
+	Dimensions _tmp14_;
+	gint _tmp15_;
 	Box box = {0};
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	gint _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 	gboolean _tmp20_ = FALSE;
-	gint _tmp21_ = 0;
-	Dimensions _tmp22_ = {0};
-	gint _tmp23_ = 0;
+	gint _tmp21_;
+	Dimensions _tmp22_;
+	gint _tmp23_;
 #line 119 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (scaled != NULL);
 #line 121 "/home/jens/Source/shotwell/src/Box.vala"
@@ -843,9 +843,9 @@ void box_get_scaled (Box *self, Dimensions* scaled, Box* result) {
 		_tmp20_ = TRUE;
 #line 845 "Box.c"
 	} else {
-		gint _tmp24_ = 0;
-		Dimensions _tmp25_ = {0};
-		gint _tmp26_ = 0;
+		gint _tmp24_;
+		Dimensions _tmp25_;
+		gint _tmp26_;
 #line 131 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp24_ = box_get_height (&box);
 #line 131 "/home/jens/Source/shotwell/src/Box.vala"
@@ -869,35 +869,35 @@ void box_get_scaled (Box *self, Dimensions* scaled, Box* result) {
 void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled, Box* result) {
 	gdouble x_scale = 0.0;
 	gdouble y_scale = 0.0;
-	Dimensions _tmp0_ = {0};
+	Dimensions _tmp0_;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
 	gint l = 0;
-	gint _tmp3_ = 0;
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
+	gint _tmp3_;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
 	gint t = 0;
-	gint _tmp6_ = 0;
-	gdouble _tmp7_ = 0.0;
-	gdouble _tmp8_ = 0.0;
+	gint _tmp6_;
+	gdouble _tmp7_;
+	gdouble _tmp8_;
 	gint r = 0;
-	gint _tmp9_ = 0;
-	gdouble _tmp10_ = 0.0;
-	gdouble _tmp11_ = 0.0;
+	gint _tmp9_;
+	gdouble _tmp10_;
+	gdouble _tmp11_;
 	gint b = 0;
-	gint _tmp12_ = 0;
-	gdouble _tmp13_ = 0.0;
-	gdouble _tmp14_ = 0.0;
-	gint _tmp15_ = 0;
-	Dimensions _tmp16_ = {0};
-	gint _tmp17_ = 0;
-	gint _tmp20_ = 0;
-	Dimensions _tmp21_ = {0};
-	gint _tmp22_ = 0;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
+	gint _tmp12_;
+	gdouble _tmp13_;
+	gdouble _tmp14_;
+	gint _tmp15_;
+	Dimensions _tmp16_;
+	gint _tmp17_;
+	gint _tmp20_;
+	Dimensions _tmp21_;
+	gint _tmp22_;
+	gint _tmp25_;
+	gint _tmp26_;
+	gint _tmp27_;
+	gint _tmp28_;
 	Box _tmp29_ = {0};
 #line 136 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (original != NULL);
@@ -952,8 +952,8 @@ void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled
 #line 146 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp15_ >= _tmp17_) {
 #line 955 "Box.c"
-		Dimensions _tmp18_ = {0};
-		gint _tmp19_ = 0;
+		Dimensions _tmp18_;
+		gint _tmp19_;
 #line 147 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp18_ = *scaled;
 #line 147 "/home/jens/Source/shotwell/src/Box.vala"
@@ -971,8 +971,8 @@ void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled
 #line 149 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp20_ >= _tmp22_) {
 #line 974 "Box.c"
-		Dimensions _tmp23_ = {0};
-		gint _tmp24_ = 0;
+		Dimensions _tmp23_;
+		gint _tmp24_;
 #line 150 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp23_ = *scaled;
 #line 150 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1000,14 +1000,14 @@ void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled
 
 
 void box_get_offset (Box *self, gint xofs, gint yofs, Box* result) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	Box _tmp8_ = {0};
 #line 156 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).left;
@@ -1036,8 +1036,8 @@ void box_get_offset (Box *self, gint xofs, gint yofs, Box* result) {
 
 
 void box_get_dimensions (Box *self, Dimensions* result) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	Dimensions _tmp2_ = {0};
 #line 160 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = box_get_width (&(*self));
@@ -1056,11 +1056,11 @@ void box_get_dimensions (Box *self, Dimensions* result) {
 void box_get_points (Box *self, GdkPoint* top_left, GdkPoint* bottom_right) {
 	GdkPoint _vala_top_left = {0};
 	GdkPoint _vala_bottom_right = {0};
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	GdkPoint _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	gint _tmp3_;
+	gint _tmp4_;
 	GdkPoint _tmp5_ = {0};
 #line 164 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).left;
@@ -1099,10 +1099,10 @@ void box_get_points (Box *self, GdkPoint* top_left, GdkPoint* bottom_right) {
 
 void box_get_rectangle (Box *self, GdkRectangle* result) {
 	GdkRectangle rect = {0};
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 169 "/home/jens/Source/shotwell/src/Box.vala"
 	memset (&rect, 0, sizeof (GdkRectangle));
 #line 170 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1130,10 +1130,10 @@ void box_get_rectangle (Box *self, GdkRectangle* result) {
 
 
 void box_get_center (Box *self, GdkPoint* result) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	GdkPoint _tmp4_ = {0};
 #line 179 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).left;
@@ -1157,17 +1157,17 @@ void box_get_center (Box *self, GdkPoint* result) {
 
 void box_rotate_clockwise (Box *self, Dimensions* space, Box* result) {
 	gint l = 0;
-	Dimensions _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	Dimensions _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gint t = 0;
-	gint _tmp3_ = 0;
+	gint _tmp3_;
 	gint r = 0;
-	Dimensions _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	Dimensions _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 	gint b = 0;
-	gint _tmp7_ = 0;
+	gint _tmp7_;
 	Box _tmp8_ = {0};
 #line 182 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (space != NULL);
@@ -1207,17 +1207,17 @@ void box_rotate_clockwise (Box *self, Dimensions* space, Box* result) {
 
 void box_rotate_counterclockwise (Box *self, Dimensions* space, Box* result) {
 	gint l = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gint t = 0;
-	Dimensions _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	Dimensions _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	gint r = 0;
-	gint _tmp4_ = 0;
+	gint _tmp4_;
 	gint b = 0;
-	Dimensions _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	Dimensions _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	Box _tmp8_ = {0};
 #line 191 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (space != NULL);
@@ -1257,15 +1257,15 @@ void box_rotate_counterclockwise (Box *self, Dimensions* space, Box* result) {
 
 void box_flip_left_to_right (Box *self, Dimensions* space, Box* result) {
 	gint l = 0;
-	Dimensions _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	Dimensions _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gint r = 0;
-	Dimensions _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	Dimensions _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	Box _tmp8_ = {0};
 #line 200 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (space != NULL);
@@ -1301,15 +1301,15 @@ void box_flip_left_to_right (Box *self, Dimensions* space, Box* result) {
 
 void box_flip_top_to_bottom (Box *self, Dimensions* space, Box* result) {
 	gint t = 0;
-	Dimensions _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	Dimensions _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gint b = 0;
-	Dimensions _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	Dimensions _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	Box _tmp8_ = {0};
 #line 207 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (space != NULL);
@@ -1346,28 +1346,28 @@ void box_flip_top_to_bottom (Box *self, Dimensions* space, Box* result) {
 gboolean box_intersects (Box *self, Box* compare) {
 	gboolean result = FALSE;
 	gint left_intersect = 0;
-	gint _tmp0_ = 0;
-	Box _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	Box _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	gint top_intersect = 0;
-	gint _tmp4_ = 0;
-	Box _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	gint _tmp4_;
+	Box _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	gint right_intersect = 0;
-	gint _tmp8_ = 0;
-	Box _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	gint _tmp8_;
+	Box _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 	gint bottom_intersect = 0;
-	gint _tmp12_ = 0;
-	Box _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
+	gint _tmp12_;
+	Box _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
 	gboolean _tmp16_ = FALSE;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
+	gint _tmp17_;
+	gint _tmp18_;
 #line 214 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_val_if_fail (compare != NULL, FALSE);
 #line 215 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1417,8 +1417,8 @@ gboolean box_intersects (Box *self, Box* compare) {
 #line 220 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp17_ >= _tmp18_) {
 #line 1420 "Box.c"
-		gint _tmp19_ = 0;
-		gint _tmp20_ = 0;
+		gint _tmp19_;
+		gint _tmp20_;
 #line 220 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp19_ = bottom_intersect;
 #line 220 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1440,14 +1440,14 @@ gboolean box_intersects (Box *self, Box* compare) {
 
 
 void box_get_reduced (Box *self, gint amount, Box* result) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	Box _tmp8_ = {0};
 #line 224 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).left;
@@ -1476,14 +1476,14 @@ void box_get_reduced (Box *self, gint amount, Box* result) {
 
 
 void box_get_expanded (Box *self, gint amount, Box* result) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	Box _tmp8_ = {0};
 #line 228 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).left;
@@ -1516,9 +1516,9 @@ gboolean box_contains (Box *self, GdkPoint* point) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	GdkPoint _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	GdkPoint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 231 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_val_if_fail (point != NULL, FALSE);
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1530,9 +1530,9 @@ gboolean box_contains (Box *self, GdkPoint* point) {
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp4_ >= _tmp5_) {
 #line 1533 "Box.c"
-		GdkPoint _tmp6_ = {0};
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
+		GdkPoint _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp6_ = *point;
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1550,9 +1550,9 @@ gboolean box_contains (Box *self, GdkPoint* point) {
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp2_) {
 #line 1553 "Box.c"
-		GdkPoint _tmp9_ = {0};
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
+		GdkPoint _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp9_ = *point;
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1570,9 +1570,9 @@ gboolean box_contains (Box *self, GdkPoint* point) {
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp1_) {
 #line 1573 "Box.c"
-		GdkPoint _tmp12_ = {0};
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
+		GdkPoint _tmp12_;
+		gint _tmp13_;
+		gint _tmp14_;
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp12_ = *point;
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1602,16 +1602,16 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 	gboolean _vala_vertical_enlarged = FALSE;
 	BoxComplements result = 0;
 	gboolean horizontal_complement = FALSE;
-	Box _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	Box _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gboolean vertical_complement = FALSE;
-	Box _tmp36_ = {0};
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	gboolean _tmp72_ = FALSE;
-	gboolean _tmp73_ = FALSE;
-	BoxComplements _tmp74_ = 0;
+	Box _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
+	gboolean _tmp72_;
+	gboolean _tmp73_;
+	BoxComplements _tmp74_;
 #line 238 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_val_if_fail (resized != NULL, 0);
 #line 241 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1625,13 +1625,13 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 #line 242 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp1_ < _tmp2_) {
 #line 1628 "Box.c"
-		Box _tmp3_ = {0};
-		gint _tmp4_ = 0;
-		Box _tmp5_ = {0};
-		gint _tmp6_ = 0;
-		Box _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
+		Box _tmp3_;
+		gint _tmp4_;
+		Box _tmp5_;
+		gint _tmp6_;
+		Box _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
 #line 244 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp3_ = *resized;
 #line 244 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1652,9 +1652,9 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 		_vala_horizontal_enlarged = TRUE;
 #line 1654 "Box.c"
 	} else {
-		Box _tmp10_ = {0};
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
+		Box _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
 #line 246 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp10_ = *resized;
 #line 246 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1664,11 +1664,11 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 #line 246 "/home/jens/Source/shotwell/src/Box.vala"
 		if (_tmp11_ > _tmp12_) {
 #line 1667 "Box.c"
-			gint _tmp13_ = 0;
-			gint _tmp14_ = 0;
-			gint _tmp15_ = 0;
-			Box _tmp16_ = {0};
-			gint _tmp17_ = 0;
+			gint _tmp13_;
+			gint _tmp14_;
+			gint _tmp15_;
+			Box _tmp16_;
+			gint _tmp17_;
 #line 248 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp13_ = (*self).left;
 #line 248 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1685,9 +1685,9 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 			_vala_horizontal_enlarged = FALSE;
 #line 1687 "Box.c"
 		} else {
-			Box _tmp18_ = {0};
-			gint _tmp19_ = 0;
-			gint _tmp20_ = 0;
+			Box _tmp18_;
+			gint _tmp19_;
+			gint _tmp20_;
 #line 250 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp18_ = *resized;
 #line 250 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1697,11 +1697,11 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 #line 250 "/home/jens/Source/shotwell/src/Box.vala"
 			if (_tmp19_ < _tmp20_) {
 #line 1700 "Box.c"
-				gint _tmp21_ = 0;
-				Box _tmp22_ = {0};
-				gint _tmp23_ = 0;
-				gint _tmp24_ = 0;
-				gint _tmp25_ = 0;
+				gint _tmp21_;
+				Box _tmp22_;
+				gint _tmp23_;
+				gint _tmp24_;
+				gint _tmp25_;
 #line 252 "/home/jens/Source/shotwell/src/Box.vala"
 				_tmp21_ = (*self).left;
 #line 252 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1718,9 +1718,9 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 				_vala_horizontal_enlarged = FALSE;
 #line 1720 "Box.c"
 			} else {
-				Box _tmp26_ = {0};
-				gint _tmp27_ = 0;
-				gint _tmp28_ = 0;
+				Box _tmp26_;
+				gint _tmp27_;
+				gint _tmp28_;
 #line 254 "/home/jens/Source/shotwell/src/Box.vala"
 				_tmp26_ = *resized;
 #line 254 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1730,13 +1730,13 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 #line 254 "/home/jens/Source/shotwell/src/Box.vala"
 				if (_tmp27_ > _tmp28_) {
 #line 1733 "Box.c"
-					Box _tmp29_ = {0};
-					gint _tmp30_ = 0;
-					gint _tmp31_ = 0;
-					Box _tmp32_ = {0};
-					gint _tmp33_ = 0;
-					Box _tmp34_ = {0};
-					gint _tmp35_ = 0;
+					Box _tmp29_;
+					gint _tmp30_;
+					gint _tmp31_;
+					Box _tmp32_;
+					gint _tmp33_;
+					Box _tmp34_;
+					gint _tmp35_;
 #line 256 "/home/jens/Source/shotwell/src/Box.vala"
 					_tmp29_ = *resized;
 #line 256 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1779,13 +1779,13 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 #line 265 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp37_ < _tmp38_) {
 #line 1782 "Box.c"
-		Box _tmp39_ = {0};
-		gint _tmp40_ = 0;
-		Box _tmp41_ = {0};
-		gint _tmp42_ = 0;
-		gint _tmp43_ = 0;
-		Box _tmp44_ = {0};
-		gint _tmp45_ = 0;
+		Box _tmp39_;
+		gint _tmp40_;
+		Box _tmp41_;
+		gint _tmp42_;
+		gint _tmp43_;
+		Box _tmp44_;
+		gint _tmp45_;
 #line 267 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp39_ = *resized;
 #line 267 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1806,9 +1806,9 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 		_vala_vertical_enlarged = TRUE;
 #line 1808 "Box.c"
 	} else {
-		Box _tmp46_ = {0};
-		gint _tmp47_ = 0;
-		gint _tmp48_ = 0;
+		Box _tmp46_;
+		gint _tmp47_;
+		gint _tmp48_;
 #line 269 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp46_ = *resized;
 #line 269 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1818,11 +1818,11 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 #line 269 "/home/jens/Source/shotwell/src/Box.vala"
 		if (_tmp47_ > _tmp48_) {
 #line 1821 "Box.c"
-			gint _tmp49_ = 0;
-			gint _tmp50_ = 0;
-			Box _tmp51_ = {0};
-			gint _tmp52_ = 0;
-			gint _tmp53_ = 0;
+			gint _tmp49_;
+			gint _tmp50_;
+			Box _tmp51_;
+			gint _tmp52_;
+			gint _tmp53_;
 #line 271 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp49_ = (*self).left;
 #line 271 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1839,9 +1839,9 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 			_vala_vertical_enlarged = FALSE;
 #line 1841 "Box.c"
 		} else {
-			Box _tmp54_ = {0};
-			gint _tmp55_ = 0;
-			gint _tmp56_ = 0;
+			Box _tmp54_;
+			gint _tmp55_;
+			gint _tmp56_;
 #line 273 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp54_ = *resized;
 #line 273 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1851,11 +1851,11 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 #line 273 "/home/jens/Source/shotwell/src/Box.vala"
 			if (_tmp55_ < _tmp56_) {
 #line 1854 "Box.c"
-				Box _tmp57_ = {0};
-				gint _tmp58_ = 0;
-				gint _tmp59_ = 0;
-				gint _tmp60_ = 0;
-				gint _tmp61_ = 0;
+				Box _tmp57_;
+				gint _tmp58_;
+				gint _tmp59_;
+				gint _tmp60_;
+				gint _tmp61_;
 #line 275 "/home/jens/Source/shotwell/src/Box.vala"
 				_tmp57_ = *resized;
 #line 275 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1872,9 +1872,9 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 				_vala_vertical_enlarged = FALSE;
 #line 1874 "Box.c"
 			} else {
-				Box _tmp62_ = {0};
-				gint _tmp63_ = 0;
-				gint _tmp64_ = 0;
+				Box _tmp62_;
+				gint _tmp63_;
+				gint _tmp64_;
 #line 277 "/home/jens/Source/shotwell/src/Box.vala"
 				_tmp62_ = *resized;
 #line 277 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1884,13 +1884,13 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 #line 277 "/home/jens/Source/shotwell/src/Box.vala"
 				if (_tmp63_ > _tmp64_) {
 #line 1887 "Box.c"
-					gint _tmp65_ = 0;
-					Box _tmp66_ = {0};
-					gint _tmp67_ = 0;
-					Box _tmp68_ = {0};
-					gint _tmp69_ = 0;
-					Box _tmp70_ = {0};
-					gint _tmp71_ = 0;
+					gint _tmp65_;
+					Box _tmp66_;
+					gint _tmp67_;
+					Box _tmp68_;
+					gint _tmp69_;
+					Box _tmp70_;
+					gint _tmp71_;
 #line 279 "/home/jens/Source/shotwell/src/Box.vala"
 					_tmp65_ = (*self).right;
 #line 279 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1966,23 +1966,23 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 	Box _vala_horizontal_shifted = {0};
 	Box _vala_vertical_shifted = {0};
 	BoxComplements result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	gboolean horizontal_complement = FALSE;
 	gboolean _tmp4_ = FALSE;
-	Box _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	Box _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	gboolean vertical_complement = FALSE;
 	gboolean _tmp42_ = FALSE;
-	Box _tmp43_ = {0};
-	gint _tmp44_ = 0;
-	gint _tmp45_ = 0;
-	gboolean _tmp80_ = FALSE;
-	gboolean _tmp81_ = FALSE;
-	BoxComplements _tmp82_ = 0;
+	Box _tmp43_;
+	gint _tmp44_;
+	gint _tmp45_;
+	gboolean _tmp80_;
+	gboolean _tmp81_;
+	BoxComplements _tmp82_;
 #line 293 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_val_if_fail (shifted != NULL, 0);
 #line 295 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2008,9 +2008,9 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 299 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp6_ < _tmp7_) {
 #line 2011 "Box.c"
-		Box _tmp8_ = {0};
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
+		Box _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
 #line 299 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp8_ = *shifted;
 #line 299 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2028,18 +2028,18 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 299 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp4_) {
 #line 2031 "Box.c"
-		gint _tmp11_ = 0;
-		Box _tmp12_ = {0};
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
-		gint _tmp15_ = 0;
-		Box _tmp16_ = {0};
-		gint _tmp17_ = 0;
-		Box _tmp18_ = {0};
-		gint _tmp19_ = 0;
-		Box _tmp20_ = {0};
-		gint _tmp21_ = 0;
-		gint _tmp22_ = 0;
+		gint _tmp11_;
+		Box _tmp12_;
+		gint _tmp13_;
+		gint _tmp14_;
+		gint _tmp15_;
+		Box _tmp16_;
+		gint _tmp17_;
+		Box _tmp18_;
+		gint _tmp19_;
+		Box _tmp20_;
+		gint _tmp21_;
+		gint _tmp22_;
 #line 301 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp11_ = (*self).left;
 #line 301 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2071,9 +2071,9 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 2072 "Box.c"
 	} else {
 		gboolean _tmp23_ = FALSE;
-		Box _tmp24_ = {0};
-		gint _tmp25_ = 0;
-		gint _tmp26_ = 0;
+		Box _tmp24_;
+		gint _tmp25_;
+		gint _tmp26_;
 #line 303 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp24_ = *shifted;
 #line 303 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2083,9 +2083,9 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 303 "/home/jens/Source/shotwell/src/Box.vala"
 		if (_tmp25_ > _tmp26_) {
 #line 2086 "Box.c"
-			Box _tmp27_ = {0};
-			gint _tmp28_ = 0;
-			gint _tmp29_ = 0;
+			Box _tmp27_;
+			gint _tmp28_;
+			gint _tmp29_;
 #line 303 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp27_ = *shifted;
 #line 303 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2103,18 +2103,18 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 303 "/home/jens/Source/shotwell/src/Box.vala"
 		if (_tmp23_) {
 #line 2106 "Box.c"
-			gint _tmp30_ = 0;
-			gint _tmp31_ = 0;
-			gint _tmp32_ = 0;
-			Box _tmp33_ = {0};
-			gint _tmp34_ = 0;
-			Box _tmp35_ = {0};
-			gint _tmp36_ = 0;
-			gint _tmp37_ = 0;
-			Box _tmp38_ = {0};
-			gint _tmp39_ = 0;
-			Box _tmp40_ = {0};
-			gint _tmp41_ = 0;
+			gint _tmp30_;
+			gint _tmp31_;
+			gint _tmp32_;
+			Box _tmp33_;
+			gint _tmp34_;
+			Box _tmp35_;
+			gint _tmp36_;
+			gint _tmp37_;
+			Box _tmp38_;
+			gint _tmp39_;
+			Box _tmp40_;
+			gint _tmp41_;
 #line 305 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp30_ = (*self).left;
 #line 305 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2165,9 +2165,9 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 315 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp44_ < _tmp45_) {
 #line 2168 "Box.c"
-		Box _tmp46_ = {0};
-		gint _tmp47_ = 0;
-		gint _tmp48_ = 0;
+		Box _tmp46_;
+		gint _tmp47_;
+		gint _tmp48_;
 #line 315 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp46_ = *shifted;
 #line 315 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2185,18 +2185,18 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 315 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp42_) {
 #line 2188 "Box.c"
-		Box _tmp49_ = {0};
-		gint _tmp50_ = 0;
-		gint _tmp51_ = 0;
-		gint _tmp52_ = 0;
-		gint _tmp53_ = 0;
-		Box _tmp54_ = {0};
-		gint _tmp55_ = 0;
-		Box _tmp56_ = {0};
-		gint _tmp57_ = 0;
-		gint _tmp58_ = 0;
-		Box _tmp59_ = {0};
-		gint _tmp60_ = 0;
+		Box _tmp49_;
+		gint _tmp50_;
+		gint _tmp51_;
+		gint _tmp52_;
+		gint _tmp53_;
+		Box _tmp54_;
+		gint _tmp55_;
+		Box _tmp56_;
+		gint _tmp57_;
+		gint _tmp58_;
+		Box _tmp59_;
+		gint _tmp60_;
 #line 317 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp49_ = *shifted;
 #line 317 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2228,9 +2228,9 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 2229 "Box.c"
 	} else {
 		gboolean _tmp61_ = FALSE;
-		Box _tmp62_ = {0};
-		gint _tmp63_ = 0;
-		gint _tmp64_ = 0;
+		Box _tmp62_;
+		gint _tmp63_;
+		gint _tmp64_;
 #line 319 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp62_ = *shifted;
 #line 319 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2240,9 +2240,9 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 319 "/home/jens/Source/shotwell/src/Box.vala"
 		if (_tmp63_ > _tmp64_) {
 #line 2243 "Box.c"
-			Box _tmp65_ = {0};
-			gint _tmp66_ = 0;
-			gint _tmp67_ = 0;
+			Box _tmp65_;
+			gint _tmp66_;
+			gint _tmp67_;
 #line 319 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp65_ = *shifted;
 #line 319 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2260,18 +2260,18 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 319 "/home/jens/Source/shotwell/src/Box.vala"
 		if (_tmp61_) {
 #line 2263 "Box.c"
-			gint _tmp68_ = 0;
-			gint _tmp69_ = 0;
-			Box _tmp70_ = {0};
-			gint _tmp71_ = 0;
-			gint _tmp72_ = 0;
-			gint _tmp73_ = 0;
-			Box _tmp74_ = {0};
-			gint _tmp75_ = 0;
-			Box _tmp76_ = {0};
-			gint _tmp77_ = 0;
-			Box _tmp78_ = {0};
-			gint _tmp79_ = 0;
+			gint _tmp68_;
+			gint _tmp69_;
+			Box _tmp70_;
+			gint _tmp71_;
+			gint _tmp72_;
+			gint _tmp73_;
+			Box _tmp74_;
+			gint _tmp75_;
+			Box _tmp76_;
+			gint _tmp77_;
+			Box _tmp78_;
+			gint _tmp79_;
 #line 321 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp68_ = (*self).left;
 #line 321 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2350,30 +2350,30 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 
 
 void box_rubber_band (Box *self, GdkPoint* point, Box* result) {
-	GdkPoint _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GdkPoint _tmp2_ = {0};
-	gint _tmp3_ = 0;
+	GdkPoint _tmp0_;
+	gint _tmp1_;
+	GdkPoint _tmp2_;
+	gint _tmp3_;
 	gint t = 0;
-	gint _tmp4_ = 0;
-	GdkPoint _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	gint _tmp4_;
+	GdkPoint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	gint b = 0;
-	gint _tmp8_ = 0;
-	GdkPoint _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	gint _tmp8_;
+	GdkPoint _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 	gint l = 0;
-	gint _tmp12_ = 0;
-	GdkPoint _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
+	gint _tmp12_;
+	GdkPoint _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
 	gint r = 0;
-	gint _tmp16_ = 0;
-	GdkPoint _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	gint _tmp16_;
+	GdkPoint _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 	Box _tmp20_ = {0};
 #line 333 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (point != NULL);
@@ -2441,15 +2441,15 @@ void box_rubber_band (Box *self, GdkPoint* point, Box* result) {
 
 gchar* box_to_string (Box *self) {
 	gchar* result = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	Dimensions _tmp4_ = {0};
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
 #line 346 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).left;
 #line 346 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2481,11 +2481,11 @@ gchar* box_to_string (Box *self) {
 static gboolean box_in_zone (gdouble pos, gint zone) {
 	gboolean result = FALSE;
 	gint top_zone = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gint bottom_zone = 0;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
-	gboolean _tmp3_ = FALSE;
+	gint _tmp1_;
+	gdouble _tmp2_;
+	gboolean _tmp3_;
 #line 350 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = zone;
 #line 350 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2509,10 +2509,10 @@ static gboolean box_in_zone (gdouble pos, gint zone) {
 static gboolean box_in_between (gdouble pos, gint top, gint bottom) {
 	gboolean result = FALSE;
 	gint ipos = 0;
-	gdouble _tmp0_ = 0.0;
+	gdouble _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 357 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = pos;
 #line 357 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2524,8 +2524,8 @@ static gboolean box_in_between (gdouble pos, gint top, gint bottom) {
 #line 359 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp2_ > _tmp3_) {
 #line 2527 "Box.c"
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+		gint _tmp4_;
+		gint _tmp5_;
 #line 359 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp4_ = ipos;
 #line 359 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2549,14 +2549,14 @@ static gboolean box_in_between (gdouble pos, gint top, gint bottom) {
 static gboolean box_near_in_between (gdouble pos, gint top, gint bottom) {
 	gboolean result = FALSE;
 	gint ipos = 0;
-	gdouble _tmp0_ = 0.0;
+	gdouble _tmp0_;
 	gint top_zone = 0;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 	gint bottom_zone = 0;
-	gint _tmp2_ = 0;
+	gint _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 363 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = pos;
 #line 363 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2576,8 +2576,8 @@ static gboolean box_near_in_between (gdouble pos, gint top, gint bottom) {
 #line 367 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp4_ > _tmp5_) {
 #line 2579 "Box.c"
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		gint _tmp6_;
+		gint _tmp7_;
 #line 367 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp6_ = ipos;
 #line 367 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2601,19 +2601,19 @@ static gboolean box_near_in_between (gdouble pos, gint top, gint bottom) {
 BoxLocation box_approx_location (Box *self, gint x, gint y) {
 	BoxLocation result = 0;
 	gboolean near_width = FALSE;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	gboolean near_height = FALSE;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gboolean _tmp7_ = FALSE;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gboolean _tmp7_;
 	gboolean _tmp8_ = FALSE;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	gboolean _tmp11_ = FALSE;
+	gint _tmp9_;
+	gint _tmp10_;
+	gboolean _tmp11_;
 #line 371 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = x;
 #line 371 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2643,7 +2643,7 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 374 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp11_) {
 #line 2646 "Box.c"
-		gboolean _tmp12_ = FALSE;
+		gboolean _tmp12_;
 #line 374 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp12_ = near_height;
 #line 374 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2657,9 +2657,9 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 374 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp8_) {
 #line 2660 "Box.c"
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
-		gboolean _tmp15_ = FALSE;
+		gint _tmp13_;
+		gint _tmp14_;
+		gboolean _tmp15_;
 #line 375 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp13_ = y;
 #line 375 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2674,9 +2674,9 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 			return result;
 #line 2676 "Box.c"
 		} else {
-			gint _tmp16_ = 0;
-			gint _tmp17_ = 0;
-			gboolean _tmp18_ = FALSE;
+			gint _tmp16_;
+			gint _tmp17_;
+			gboolean _tmp18_;
 #line 377 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp16_ = y;
 #line 377 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2700,9 +2700,9 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 		}
 	} else {
 		gboolean _tmp19_ = FALSE;
-		gint _tmp20_ = 0;
-		gint _tmp21_ = 0;
-		gboolean _tmp22_ = FALSE;
+		gint _tmp20_;
+		gint _tmp21_;
+		gboolean _tmp22_;
 #line 382 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp20_ = x;
 #line 382 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2712,7 +2712,7 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 382 "/home/jens/Source/shotwell/src/Box.vala"
 		if (_tmp22_) {
 #line 2715 "Box.c"
-			gboolean _tmp23_ = FALSE;
+			gboolean _tmp23_;
 #line 382 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp23_ = near_height;
 #line 382 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2726,9 +2726,9 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 382 "/home/jens/Source/shotwell/src/Box.vala"
 		if (_tmp19_) {
 #line 2729 "Box.c"
-			gint _tmp24_ = 0;
-			gint _tmp25_ = 0;
-			gboolean _tmp26_ = FALSE;
+			gint _tmp24_;
+			gint _tmp25_;
+			gboolean _tmp26_;
 #line 383 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp24_ = y;
 #line 383 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2743,9 +2743,9 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 				return result;
 #line 2745 "Box.c"
 			} else {
-				gint _tmp27_ = 0;
-				gint _tmp28_ = 0;
-				gboolean _tmp29_ = FALSE;
+				gint _tmp27_;
+				gint _tmp28_;
+				gboolean _tmp29_;
 #line 385 "/home/jens/Source/shotwell/src/Box.vala"
 				_tmp27_ = y;
 #line 385 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2769,9 +2769,9 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 			}
 		} else {
 			gboolean _tmp30_ = FALSE;
-			gint _tmp31_ = 0;
-			gint _tmp32_ = 0;
-			gboolean _tmp33_ = FALSE;
+			gint _tmp31_;
+			gint _tmp32_;
+			gboolean _tmp33_;
 #line 390 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp31_ = y;
 #line 390 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2781,7 +2781,7 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 390 "/home/jens/Source/shotwell/src/Box.vala"
 			if (_tmp33_) {
 #line 2784 "Box.c"
-				gboolean _tmp34_ = FALSE;
+				gboolean _tmp34_;
 #line 390 "/home/jens/Source/shotwell/src/Box.vala"
 				_tmp34_ = near_width;
 #line 390 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2801,9 +2801,9 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 2802 "Box.c"
 			} else {
 				gboolean _tmp35_ = FALSE;
-				gint _tmp36_ = 0;
-				gint _tmp37_ = 0;
-				gboolean _tmp38_ = FALSE;
+				gint _tmp36_;
+				gint _tmp37_;
+				gboolean _tmp38_;
 #line 393 "/home/jens/Source/shotwell/src/Box.vala"
 				_tmp36_ = y;
 #line 393 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2813,7 +2813,7 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 393 "/home/jens/Source/shotwell/src/Box.vala"
 				if (_tmp38_) {
 #line 2816 "Box.c"
-					gboolean _tmp39_ = FALSE;
+					gboolean _tmp39_;
 #line 393 "/home/jens/Source/shotwell/src/Box.vala"
 					_tmp39_ = near_width;
 #line 393 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2833,10 +2833,10 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 2834 "Box.c"
 				} else {
 					gboolean _tmp40_ = FALSE;
-					gint _tmp41_ = 0;
-					gint _tmp42_ = 0;
-					gint _tmp43_ = 0;
-					gboolean _tmp44_ = FALSE;
+					gint _tmp41_;
+					gint _tmp42_;
+					gint _tmp43_;
+					gboolean _tmp44_;
 #line 396 "/home/jens/Source/shotwell/src/Box.vala"
 					_tmp41_ = x;
 #line 396 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2848,10 +2848,10 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 396 "/home/jens/Source/shotwell/src/Box.vala"
 					if (_tmp44_) {
 #line 2851 "Box.c"
-						gint _tmp45_ = 0;
-						gint _tmp46_ = 0;
-						gint _tmp47_ = 0;
-						gboolean _tmp48_ = FALSE;
+						gint _tmp45_;
+						gint _tmp46_;
+						gint _tmp47_;
+						gboolean _tmp48_;
 #line 396 "/home/jens/Source/shotwell/src/Box.vala"
 						_tmp45_ = y;
 #line 396 "/home/jens/Source/shotwell/src/Box.vala"
diff --git a/src/CheckerboardLayout.c b/src/CheckerboardLayout.c
index c67c8cc..ba1ba15 100644
--- a/src/CheckerboardLayout.c
+++ b/src/CheckerboardLayout.c
@@ -1,4 +1,4 @@
-/* CheckerboardLayout.c generated by valac 0.34.7, the Vala compiler
+/* CheckerboardLayout.c generated by valac 0.36.6, the Vala compiler
  * generated from CheckerboardLayout.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -458,7 +458,7 @@ void checkerboard_item_text_clear_pango_layout (CheckerboardItemText* self);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
-static void checkerboard_item_text_finalize (CheckerboardItemText* obj);
+static void checkerboard_item_text_finalize (CheckerboardItemText * obj);
 GType data_object_get_type (void) G_GNUC_CONST;
 gpointer alteration_ref (gpointer instance);
 void alteration_unref (gpointer instance);
@@ -485,7 +485,7 @@ GType tag_get_type (void) G_GNUC_CONST;
 #define CHECKERBOARD_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CHECKERBOARD_ITEM, CheckerboardItemPrivate))
 enum  {
 	CHECKERBOARD_ITEM_DUMMY_PROPERTY,
-	CHECKERBOARD_ITEM_HAS_TAGS
+	CHECKERBOARD_ITEM_HAS_TAGS_PROPERTY
 };
 void dimensions_init (Dimensions *self, gint width, gint height);
 #define CHECKERBOARD_ITEM_PROP_SHOW_TITLES "show-titles"
@@ -588,7 +588,7 @@ static void checkerboard_item_real_visibility_changed (DataView* base, gboolean
 static gboolean checkerboard_item_query_tooltip_on_text (CheckerboardItem* self, CheckerboardItemText* text, GtkTooltip* tooltip);
 gboolean checkerboard_item_query_tooltip (CheckerboardItem* self, gint x, gint y, GtkTooltip* tooltip);
 gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect);
-static void checkerboard_item_finalize (GObject* obj);
+static void checkerboard_item_finalize (GObject * obj);
 static void _vala_checkerboard_item_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_checkerboard_item_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 GType checkerboard_layout_get_type (void) G_GNUC_CONST;
@@ -711,19 +711,19 @@ static gboolean checkerboard_layout_real_focus_out_event (GtkWidget* base, GdkEv
 enum  {
 	CHECKERBOARD_LAYOUT_LAYOUT_ROW_DUMMY_PROPERTY
 };
-static void checkerboard_layout_layout_row_finalize (CheckerboardLayoutLayoutRow* obj);
-static void checkerboard_layout_finalize (GObject* obj);
+static void checkerboard_layout_layout_row_finalize (CheckerboardLayoutLayoutRow * obj);
+static void checkerboard_layout_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
 CheckerboardItemText* checkerboard_item_text_construct (GType object_type, const gchar* text, PangoAlignment alignment, gboolean marked_up) {
 	CheckerboardItemText* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	PangoAlignment _tmp3_ = 0;
-	gboolean _tmp4_ = FALSE;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gboolean _tmp2_;
+	PangoAlignment _tmp3_;
+	gboolean _tmp4_;
 #line 19 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (text != NULL, NULL);
 #line 19 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -763,8 +763,8 @@ CheckerboardItemText* checkerboard_item_text_new (const gchar* text, PangoAlignm
 
 static gboolean checkerboard_item_text_is_single_line (CheckerboardItemText* self) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 #line 28 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM_TEXT (self), FALSE);
 #line 29 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -781,7 +781,7 @@ static gboolean checkerboard_item_text_is_single_line (CheckerboardItemText* sel
 
 gboolean checkerboard_item_text_is_marked_up (CheckerboardItemText* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 32 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM_TEXT (self), FALSE);
 #line 33 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -798,8 +798,8 @@ gboolean checkerboard_item_text_is_set_to (CheckerboardItemText* self, const gch
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 36 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM_TEXT (self), FALSE);
 #line 36 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -811,8 +811,8 @@ gboolean checkerboard_item_text_is_set_to (CheckerboardItemText* self, const gch
 #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp2_ == _tmp3_) {
 #line 814 "CheckerboardLayout.c"
-		PangoAlignment _tmp4_ = 0;
-		PangoAlignment _tmp5_ = 0;
+		PangoAlignment _tmp4_;
+		PangoAlignment _tmp5_;
 #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = self->priv->alignment;
 #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -828,8 +828,8 @@ gboolean checkerboard_item_text_is_set_to (CheckerboardItemText* self, const gch
 #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_) {
 #line 831 "CheckerboardLayout.c"
-		const gchar* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+		const gchar* _tmp6_;
+		const gchar* _tmp7_;
 #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = self->priv->text;
 #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -852,8 +852,8 @@ gboolean checkerboard_item_text_is_set_to (CheckerboardItemText* self, const gch
 
 gchar* checkerboard_item_text_get_text (CheckerboardItemText* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 40 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM_TEXT (self), NULL);
 #line 41 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -870,8 +870,8 @@ gchar* checkerboard_item_text_get_text (CheckerboardItemText* self) {
 
 gint checkerboard_item_text_get_height (CheckerboardItemText* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 44 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM_TEXT (self), 0);
 #line 45 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -901,10 +901,10 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 PangoLayout* checkerboard_item_text_get_pango_layout (CheckerboardItemText* self, gint max_width) {
 	PangoLayout* result = NULL;
-	PangoLayout* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	PangoLayout* _tmp4_ = NULL;
-	PangoLayout* _tmp5_ = NULL;
+	PangoLayout* _tmp0_;
+	gint _tmp1_;
+	PangoLayout* _tmp4_;
+	PangoLayout* _tmp5_;
 #line 51 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM_TEXT (self), NULL);
 #line 52 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -920,8 +920,8 @@ PangoLayout* checkerboard_item_text_get_pango_layout (CheckerboardItemText* self
 #line 55 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ > 0) {
 #line 923 "CheckerboardLayout.c"
-		PangoLayout* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
+		PangoLayout* _tmp2_;
+		gint _tmp3_;
 #line 56 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->layout;
 #line 56 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -955,7 +955,7 @@ void checkerboard_item_text_clear_pango_layout (CheckerboardItemText* self) {
 
 static void checkerboard_item_text_update_height (CheckerboardItemText* self) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM_TEXT (self));
 #line 66 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -963,7 +963,7 @@ static void checkerboard_item_text_update_height (CheckerboardItemText* self) {
 #line 66 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != 0) {
 #line 966 "CheckerboardLayout.c"
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 66 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->single_line;
 #line 66 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -977,7 +977,7 @@ static void checkerboard_item_text_update_height (CheckerboardItemText* self) {
 #line 66 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
 #line 980 "CheckerboardLayout.c"
-		gint _tmp3_ = 0;
+		gint _tmp3_;
 #line 67 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = checkerboard_item_text_one_line_height;
 #line 67 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -992,15 +992,15 @@ static void checkerboard_item_text_update_height (CheckerboardItemText* self) {
 
 
 static void checkerboard_item_text_create_pango (CheckerboardItemText* self) {
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-	PangoLayout* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	PangoLayout* _tmp8_ = NULL;
-	PangoLayout* _tmp9_ = NULL;
-	PangoAlignment _tmp10_ = 0;
+	AppWindow* _tmp0_;
+	AppWindow* _tmp1_;
+	PangoLayout* _tmp2_;
+	gboolean _tmp3_;
+	PangoLayout* _tmp8_;
+	PangoLayout* _tmp9_;
+	PangoAlignment _tmp10_;
 	gboolean _tmp11_ = FALSE;
-	gint _tmp12_ = 0;
+	gint _tmp12_;
 #line 72 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM_TEXT (self));
 #line 74 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1020,8 +1020,8 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) {
 #line 75 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (!_tmp3_) {
 #line 1023 "CheckerboardLayout.c"
-		PangoLayout* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+		PangoLayout* _tmp4_;
+		const gchar* _tmp5_;
 #line 76 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = self->priv->layout;
 #line 76 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1030,8 +1030,8 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) {
 		pango_layout_set_text (_tmp4_, _tmp5_, -1);
 #line 1032 "CheckerboardLayout.c"
 	} else {
-		PangoLayout* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+		PangoLayout* _tmp6_;
+		const gchar* _tmp7_;
 #line 78 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = self->priv->layout;
 #line 78 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1055,7 +1055,7 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) {
 #line 85 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp12_ != 0) {
 #line 1058 "CheckerboardLayout.c"
-		gboolean _tmp13_ = FALSE;
+		gboolean _tmp13_;
 #line 85 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = self->priv->single_line;
 #line 85 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1069,7 +1069,7 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) {
 #line 85 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp11_) {
 #line 1072 "CheckerboardLayout.c"
-		gint _tmp14_ = 0;
+		gint _tmp14_;
 #line 86 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp14_ = checkerboard_item_text_one_line_height;
 #line 86 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1077,11 +1077,11 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) {
 #line 1078 "CheckerboardLayout.c"
 	} else {
 		gint width = 0;
-		PangoLayout* _tmp15_ = NULL;
+		PangoLayout* _tmp15_;
 		gint _tmp16_ = 0;
 		gint _tmp17_ = 0;
 		gboolean _tmp18_ = FALSE;
-		gint _tmp19_ = 0;
+		gint _tmp19_;
 #line 89 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp15_ = self->priv->layout;
 #line 89 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1095,7 +1095,7 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) {
 #line 92 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp19_ == 0) {
 #line 1098 "CheckerboardLayout.c"
-			gboolean _tmp20_ = FALSE;
+			gboolean _tmp20_;
 #line 92 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp20_ = self->priv->single_line;
 #line 92 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1109,7 +1109,7 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) {
 #line 92 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp18_) {
 #line 1112 "CheckerboardLayout.c"
-			gint _tmp21_ = 0;
+			gint _tmp21_;
 #line 93 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp21_ = self->priv->height;
 #line 93 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1162,7 +1162,7 @@ static gchar* value_checkerboard_item_text_collect_value (GValue* value, guint n
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (collect_values[0].v_pointer) {
 #line 1165 "CheckerboardLayout.c"
-		CheckerboardItemText* object;
+		CheckerboardItemText * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1189,7 +1189,7 @@ static gchar* value_checkerboard_item_text_collect_value (GValue* value, guint n
 
 
 static gchar* value_checkerboard_item_text_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	CheckerboardItemText** object_p;
+	CheckerboardItemText ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (!object_p) {
@@ -1241,7 +1241,7 @@ gpointer value_get_checkerboard_item_text (const GValue* value) {
 
 
 void value_set_checkerboard_item_text (GValue* value, gpointer v_object) {
-	CheckerboardItemText* old;
+	CheckerboardItemText * old;
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CHECKERBOARD_ITEM_TEXT));
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1272,7 +1272,7 @@ void value_set_checkerboard_item_text (GValue* value, gpointer v_object) {
 
 
 void value_take_checkerboard_item_text (GValue* value, gpointer v_object) {
-	CheckerboardItemText* old;
+	CheckerboardItemText * old;
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CHECKERBOARD_ITEM_TEXT));
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1328,7 +1328,7 @@ static void checkerboard_item_text_instance_init (CheckerboardItemText * self) {
 }
 
 
-static void checkerboard_item_text_finalize (CheckerboardItemText* obj) {
+static void checkerboard_item_text_finalize (CheckerboardItemText * obj) {
 	CheckerboardItemText * self;
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHECKERBOARD_ITEM_TEXT, CheckerboardItemText);
@@ -1357,7 +1357,7 @@ GType checkerboard_item_text_get_type (void) {
 
 
 gpointer checkerboard_item_text_ref (gpointer instance) {
-	CheckerboardItemText* self;
+	CheckerboardItemText * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1368,7 +1368,7 @@ gpointer checkerboard_item_text_ref (gpointer instance) {
 
 
 void checkerboard_item_text_unref (gpointer instance) {
-	CheckerboardItemText* self;
+	CheckerboardItemText * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1383,133 +1383,175 @@ void checkerboard_item_text_unref (gpointer instance) {
 
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 1394 "CheckerboardLayout.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 1400 "CheckerboardLayout.c"
+	} else {
+		const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 1407 "CheckerboardLayout.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = TRUE;
+#line 1413 "CheckerboardLayout.c"
+	} else {
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 1423 "CheckerboardLayout.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 1427 "CheckerboardLayout.c"
+		gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 1435 "CheckerboardLayout.c"
+	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GRegex* _tmp9_;
+		GRegex* _tmp10_;
+		gchar* _tmp11_ = NULL;
+		GRegex* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1425 "CheckerboardLayout.c"
-				goto __catch242_g_regex_error;
+#line 1467 "CheckerboardLayout.c"
+				goto __catch243_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 1434 "CheckerboardLayout.c"
+#line 1476 "CheckerboardLayout.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1450 "CheckerboardLayout.c"
-				goto __catch242_g_regex_error;
+#line 1492 "CheckerboardLayout.c"
+				goto __catch243_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 1461 "CheckerboardLayout.c"
+#line 1503 "CheckerboardLayout.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1475 "CheckerboardLayout.c"
+#line 1517 "CheckerboardLayout.c"
 	}
-	goto __finally242;
-	__catch242_g_regex_error:
+	goto __finally243;
+	__catch243_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 1489 "CheckerboardLayout.c"
+#line 1531 "CheckerboardLayout.c"
 	}
-	__finally242:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	__finally243:
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 1500 "CheckerboardLayout.c"
+#line 1542 "CheckerboardLayout.c"
 	}
 }
 
 
 CheckerboardItem* checkerboard_item_construct (GType object_type, ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment) {
 	CheckerboardItem * self = NULL;
-	ThumbnailSource* _tmp0_ = NULL;
-	Dimensions _tmp1_ = {0};
-	const gchar* _tmp2_ = NULL;
-	PangoAlignment _tmp3_ = 0;
-	gboolean _tmp4_ = FALSE;
-	CheckerboardItemText* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
+	ThumbnailSource* _tmp0_;
+	Dimensions _tmp1_;
+	const gchar* _tmp2_;
+	PangoAlignment _tmp3_;
+	gboolean _tmp4_;
+	CheckerboardItemText* _tmp5_;
+	const gchar* _tmp6_;
 #line 141 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_THUMBNAIL_SOURCE (source), NULL);
 #line 141 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1540,13 +1582,13 @@ CheckerboardItem* checkerboard_item_construct (GType object_type, ThumbnailSourc
 	_tmp6_ = comment;
 #line 152 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp6_ != NULL) {
-#line 1544 "CheckerboardLayout.c"
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		PangoAlignment _tmp10_ = 0;
-		gboolean _tmp11_ = FALSE;
-		CheckerboardItemText* _tmp12_ = NULL;
+#line 1586 "CheckerboardLayout.c"
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		PangoAlignment _tmp10_;
+		gboolean _tmp11_;
+		CheckerboardItemText* _tmp12_;
 #line 153 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = comment;
 #line 153 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1565,11 +1607,11 @@ CheckerboardItem* checkerboard_item_construct (GType object_type, ThumbnailSourc
 		self->priv->comment = _tmp12_;
 #line 153 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_free0 (_tmp9_);
-#line 1569 "CheckerboardLayout.c"
+#line 1611 "CheckerboardLayout.c"
 	}
 #line 141 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return self;
-#line 1573 "CheckerboardLayout.c"
+#line 1615 "CheckerboardLayout.c"
 }
 
 
@@ -1577,16 +1619,16 @@ static gchar* checkerboard_item_real_get_name (DataObject* base) {
 	CheckerboardItem * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	CheckerboardItemText* _tmp1_ = NULL;
+	CheckerboardItemText* _tmp1_;
 #line 163 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
 #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->title;
 #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 1588 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+#line 1630 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp2_;
+		gchar* _tmp3_;
 #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->title;
 #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1595,38 +1637,38 @@ static gchar* checkerboard_item_real_get_name (DataObject* base) {
 		_g_free0 (_tmp0_);
 #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp3_;
-#line 1599 "CheckerboardLayout.c"
+#line 1641 "CheckerboardLayout.c"
 	} else {
-		gchar* _tmp4_ = NULL;
+		gchar* _tmp4_;
 #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = DATA_OBJECT_CLASS (checkerboard_item_parent_class)->get_name (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_VIEW, ThumbnailView), TYPE_DATA_OBJECT, DataObject));
 #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_free0 (_tmp0_);
 #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp4_;
-#line 1608 "CheckerboardLayout.c"
+#line 1650 "CheckerboardLayout.c"
 	}
 #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
 #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 1614 "CheckerboardLayout.c"
+#line 1656 "CheckerboardLayout.c"
 }
 
 
 gchar* checkerboard_item_get_title (CheckerboardItem* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	CheckerboardItemText* _tmp1_ = NULL;
+	CheckerboardItemText* _tmp1_;
 #line 167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL);
 #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->title;
 #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 1628 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+#line 1670 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp2_;
+		gchar* _tmp3_;
 #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->title;
 #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1635,38 +1677,38 @@ gchar* checkerboard_item_get_title (CheckerboardItem* self) {
 		_g_free0 (_tmp0_);
 #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp3_;
-#line 1639 "CheckerboardLayout.c"
+#line 1681 "CheckerboardLayout.c"
 	} else {
-		gchar* _tmp4_ = NULL;
+		gchar* _tmp4_;
 #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = g_strdup ("");
 #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_free0 (_tmp0_);
 #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp4_;
-#line 1648 "CheckerboardLayout.c"
+#line 1690 "CheckerboardLayout.c"
 	}
 #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
 #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 1654 "CheckerboardLayout.c"
+#line 1696 "CheckerboardLayout.c"
 }
 
 
 gchar* checkerboard_item_get_comment (CheckerboardItem* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	CheckerboardItemText* _tmp1_ = NULL;
+	CheckerboardItemText* _tmp1_;
 #line 171 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL);
 #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->comment;
 #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 1668 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+#line 1710 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp2_;
+		gchar* _tmp3_;
 #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->comment;
 #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1675,33 +1717,33 @@ gchar* checkerboard_item_get_comment (CheckerboardItem* self) {
 		_g_free0 (_tmp0_);
 #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp3_;
-#line 1679 "CheckerboardLayout.c"
+#line 1721 "CheckerboardLayout.c"
 	} else {
-		gchar* _tmp4_ = NULL;
+		gchar* _tmp4_;
 #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = g_strdup ("");
 #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_free0 (_tmp0_);
 #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp4_;
-#line 1688 "CheckerboardLayout.c"
+#line 1730 "CheckerboardLayout.c"
 	}
 #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
 #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 1694 "CheckerboardLayout.c"
+#line 1736 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_set_title (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment) {
 	gboolean _tmp0_ = FALSE;
-	CheckerboardItemText* _tmp1_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	PangoAlignment _tmp8_ = 0;
-	gboolean _tmp9_ = FALSE;
-	CheckerboardItemText* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
+	CheckerboardItemText* _tmp1_;
+	const gchar* _tmp7_;
+	PangoAlignment _tmp8_;
+	gboolean _tmp9_;
+	CheckerboardItemText* _tmp10_;
+	gboolean _tmp11_;
 #line 175 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 175 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1710,12 +1752,12 @@ void checkerboard_item_set_title (CheckerboardItem* self, const gchar* text, gbo
 	_tmp1_ = self->priv->title;
 #line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 1714 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-		PangoAlignment _tmp5_ = 0;
-		gboolean _tmp6_ = FALSE;
+#line 1756 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp2_;
+		const gchar* _tmp3_;
+		gboolean _tmp4_;
+		PangoAlignment _tmp5_;
+		gboolean _tmp6_;
 #line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->title;
 #line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1728,17 +1770,17 @@ void checkerboard_item_set_title (CheckerboardItem* self, const gchar* text, gbo
 		_tmp6_ = checkerboard_item_text_is_set_to (_tmp2_, _tmp3_, _tmp4_, _tmp5_);
 #line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp6_;
-#line 1732 "CheckerboardLayout.c"
+#line 1774 "CheckerboardLayout.c"
 	} else {
 #line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = FALSE;
-#line 1736 "CheckerboardLayout.c"
+#line 1778 "CheckerboardLayout.c"
 	}
 #line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
 #line 178 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 1742 "CheckerboardLayout.c"
+#line 1784 "CheckerboardLayout.c"
 	}
 #line 180 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = text;
@@ -1760,14 +1802,14 @@ void checkerboard_item_set_title (CheckerboardItem* self, const gchar* text, gbo
 		checkerboard_item_recalc_size (self, "set_title");
 #line 184 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 1764 "CheckerboardLayout.c"
+#line 1806 "CheckerboardLayout.c"
 	}
 }
 
 
 void checkerboard_item_clear_title (CheckerboardItem* self) {
-	CheckerboardItemText* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	CheckerboardItemText* _tmp0_;
+	gboolean _tmp1_;
 #line 188 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 189 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1776,7 +1818,7 @@ void checkerboard_item_clear_title (CheckerboardItem* self) {
 	if (_tmp0_ == NULL) {
 #line 190 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 1780 "CheckerboardLayout.c"
+#line 1822 "CheckerboardLayout.c"
 	}
 #line 192 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_checkerboard_item_text_unref0 (self->priv->title);
@@ -1790,15 +1832,15 @@ void checkerboard_item_clear_title (CheckerboardItem* self) {
 		checkerboard_item_recalc_size (self, "clear_title");
 #line 196 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 1794 "CheckerboardLayout.c"
+#line 1836 "CheckerboardLayout.c"
 	}
 }
 
 
 static void checkerboard_item_set_title_visible (CheckerboardItem* self, gboolean visible) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 #line 200 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 201 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1809,7 +1851,7 @@ static void checkerboard_item_set_title_visible (CheckerboardItem* self, gboolea
 	if (_tmp0_ == _tmp1_) {
 #line 202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 1813 "CheckerboardLayout.c"
+#line 1855 "CheckerboardLayout.c"
 	}
 #line 204 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = visible;
@@ -1819,20 +1861,20 @@ static void checkerboard_item_set_title_visible (CheckerboardItem* self, gboolea
 	checkerboard_item_recalc_size (self, "set_title_visible");
 #line 207 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 1823 "CheckerboardLayout.c"
+#line 1865 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_set_comment (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment) {
 	gboolean _tmp0_ = FALSE;
-	CheckerboardItemText* _tmp1_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	PangoAlignment _tmp10_ = 0;
-	gboolean _tmp11_ = FALSE;
-	CheckerboardItemText* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
+	CheckerboardItemText* _tmp1_;
+	const gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	PangoAlignment _tmp10_;
+	gboolean _tmp11_;
+	CheckerboardItemText* _tmp12_;
+	gboolean _tmp13_;
 #line 210 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 210 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1841,12 +1883,12 @@ void checkerboard_item_set_comment (CheckerboardItem* self, const gchar* text, g
 	_tmp1_ = self->priv->comment;
 #line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 1845 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-		PangoAlignment _tmp5_ = 0;
-		gboolean _tmp6_ = FALSE;
+#line 1887 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp2_;
+		const gchar* _tmp3_;
+		gboolean _tmp4_;
+		PangoAlignment _tmp5_;
+		gboolean _tmp6_;
 #line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->comment;
 #line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1859,17 +1901,17 @@ void checkerboard_item_set_comment (CheckerboardItem* self, const gchar* text, g
 		_tmp6_ = checkerboard_item_text_is_set_to (_tmp2_, _tmp3_, _tmp4_, _tmp5_);
 #line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp6_;
-#line 1863 "CheckerboardLayout.c"
+#line 1905 "CheckerboardLayout.c"
 	} else {
 #line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = FALSE;
-#line 1867 "CheckerboardLayout.c"
+#line 1909 "CheckerboardLayout.c"
 	}
 #line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
 #line 213 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 1873 "CheckerboardLayout.c"
+#line 1915 "CheckerboardLayout.c"
 	}
 #line 215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = text;
@@ -1897,14 +1939,14 @@ void checkerboard_item_set_comment (CheckerboardItem* self, const gchar* text, g
 		checkerboard_item_recalc_size (self, "set_comment");
 #line 219 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 1901 "CheckerboardLayout.c"
+#line 1943 "CheckerboardLayout.c"
 	}
 }
 
 
 void checkerboard_item_clear_comment (CheckerboardItem* self) {
-	CheckerboardItemText* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	CheckerboardItemText* _tmp0_;
+	gboolean _tmp1_;
 #line 223 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 224 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1913,7 +1955,7 @@ void checkerboard_item_clear_comment (CheckerboardItem* self) {
 	if (_tmp0_ == NULL) {
 #line 225 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 1917 "CheckerboardLayout.c"
+#line 1959 "CheckerboardLayout.c"
 	}
 #line 227 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_checkerboard_item_text_unref0 (self->priv->comment);
@@ -1927,15 +1969,15 @@ void checkerboard_item_clear_comment (CheckerboardItem* self) {
 		checkerboard_item_recalc_size (self, "clear_comment");
 #line 231 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 1931 "CheckerboardLayout.c"
+#line 1973 "CheckerboardLayout.c"
 	}
 }
 
 
 static void checkerboard_item_set_comment_visible (CheckerboardItem* self, gboolean visible) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 #line 235 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 236 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1946,7 +1988,7 @@ static void checkerboard_item_set_comment_visible (CheckerboardItem* self, gbool
 	if (_tmp0_ == _tmp1_) {
 #line 237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 1950 "CheckerboardLayout.c"
+#line 1992 "CheckerboardLayout.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = visible;
@@ -1956,22 +1998,22 @@ static void checkerboard_item_set_comment_visible (CheckerboardItem* self, gbool
 	checkerboard_item_recalc_size (self, "set_comment_visible");
 #line 242 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 1960 "CheckerboardLayout.c"
+#line 2002 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, PangoAlignment alignment) {
 	gboolean _tmp0_ = FALSE;
-	GeeCollection* _tmp1_ = NULL;
-	PangoAlignment _tmp5_ = 0;
+	GeeCollection* _tmp1_;
+	PangoAlignment _tmp5_;
 	gchar* text = NULL;
-	gboolean _tmp6_ = FALSE;
+	gboolean _tmp6_;
 	gboolean _tmp14_ = FALSE;
-	CheckerboardItemText* _tmp15_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	PangoAlignment _tmp21_ = 0;
-	CheckerboardItemText* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
+	CheckerboardItemText* _tmp15_;
+	const gchar* _tmp20_;
+	PangoAlignment _tmp21_;
+	CheckerboardItemText* _tmp22_;
+	gboolean _tmp23_;
 #line 245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1980,10 +2022,10 @@ void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, Pa
 	_tmp1_ = tags;
 #line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 1984 "CheckerboardLayout.c"
-		GeeCollection* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+#line 2026 "CheckerboardLayout.c"
+		GeeCollection* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = tags;
 #line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1992,11 +2034,11 @@ void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, Pa
 		_tmp4_ = _tmp3_;
 #line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp4_ > 0;
-#line 1996 "CheckerboardLayout.c"
+#line 2038 "CheckerboardLayout.c"
 	} else {
 #line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = FALSE;
-#line 2000 "CheckerboardLayout.c"
+#line 2042 "CheckerboardLayout.c"
 	}
 #line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_item_set_has_tags (self, _tmp0_);
@@ -2008,13 +2050,13 @@ void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, Pa
 	_tmp6_ = self->priv->_has_tags;
 #line 250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp6_) {
-#line 2012 "CheckerboardLayout.c"
-		GeeCollection* _tmp7_ = NULL;
-		GeeCollection* _tmp8_ = NULL;
-		GeeCollection* _tmp9_ = NULL;
-		GeeList* _tmp10_ = NULL;
-		GeeList* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
+#line 2054 "CheckerboardLayout.c"
+		GeeCollection* _tmp7_;
+		GeeCollection* _tmp8_;
+		GeeCollection* _tmp9_;
+		GeeList* _tmp10_;
+		GeeList* _tmp11_;
+		gchar* _tmp12_;
 #line 251 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = tags;
 #line 251 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2039,26 +2081,26 @@ void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, Pa
 		_g_free0 (text);
 #line 253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		text = _tmp12_;
-#line 2043 "CheckerboardLayout.c"
+#line 2085 "CheckerboardLayout.c"
 	} else {
-		gchar* _tmp13_ = NULL;
+		gchar* _tmp13_;
 #line 255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = g_strdup ("<small>.</small>");
 #line 255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_free0 (text);
 #line 255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		text = _tmp13_;
-#line 2052 "CheckerboardLayout.c"
+#line 2094 "CheckerboardLayout.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp15_ = self->priv->subtitle;
 #line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp15_ != NULL) {
-#line 2058 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
-		PangoAlignment _tmp18_ = 0;
-		gboolean _tmp19_ = FALSE;
+#line 2100 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp16_;
+		const gchar* _tmp17_;
+		PangoAlignment _tmp18_;
+		gboolean _tmp19_;
 #line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp16_ = self->priv->subtitle;
 #line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2069,11 +2111,11 @@ void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, Pa
 		_tmp19_ = checkerboard_item_text_is_set_to (_tmp16_, _tmp17_, TRUE, _tmp18_);
 #line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp14_ = _tmp19_;
-#line 2073 "CheckerboardLayout.c"
+#line 2115 "CheckerboardLayout.c"
 	} else {
 #line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp14_ = FALSE;
-#line 2077 "CheckerboardLayout.c"
+#line 2119 "CheckerboardLayout.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp14_) {
@@ -2081,7 +2123,7 @@ void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, Pa
 		_g_free0 (text);
 #line 259 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 2085 "CheckerboardLayout.c"
+#line 2127 "CheckerboardLayout.c"
 	}
 #line 260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp20_ = text;
@@ -2101,11 +2143,11 @@ void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, Pa
 		checkerboard_item_recalc_size (self, "set_subtitle");
 #line 264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 2105 "CheckerboardLayout.c"
+#line 2147 "CheckerboardLayout.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_free0 (text);
-#line 2109 "CheckerboardLayout.c"
+#line 2151 "CheckerboardLayout.c"
 }
 
 
@@ -2120,20 +2162,20 @@ void checkerboard_item_clear_tags (CheckerboardItem* self) {
 	_g_object_unref0 (self->priv->user_visible_tag_list);
 #line 271 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->user_visible_tag_list = NULL;
-#line 2124 "CheckerboardLayout.c"
+#line 2166 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_highlight_user_visible_tag (CheckerboardItem* self, gint index) {
-	GeeList* _tmp0_ = NULL;
+	GeeList* _tmp0_;
 	gchar* text = NULL;
-	GeeList* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	PangoAlignment _tmp5_ = 0;
-	CheckerboardItemText* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
+	GeeList* _tmp1_;
+	gint _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	PangoAlignment _tmp5_;
+	CheckerboardItemText* _tmp6_;
+	gboolean _tmp7_;
 #line 274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2164,24 +2206,24 @@ void checkerboard_item_highlight_user_visible_tag (CheckerboardItem* self, gint
 	if (_tmp7_) {
 #line 280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 2168 "CheckerboardLayout.c"
+#line 2210 "CheckerboardLayout.c"
 	}
 #line 274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_free0 (text);
-#line 2172 "CheckerboardLayout.c"
+#line 2214 "CheckerboardLayout.c"
 }
 
 
 Tag* checkerboard_item_get_user_visible_tag (CheckerboardItem* self, gint index) {
 	Tag* result = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	GeeList* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	GeeList* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gpointer _tmp7_ = NULL;
+	gint _tmp0_;
+	gint _tmp1_;
+	GeeList* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	GeeList* _tmp5_;
+	gint _tmp6_;
+	gpointer _tmp7_;
 #line 283 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL);
 #line 283 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2206,23 +2248,23 @@ Tag* checkerboard_item_get_user_visible_tag (CheckerboardItem* self, gint index)
 	result = (Tag*) _tmp7_;
 #line 285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2210 "CheckerboardLayout.c"
+#line 2252 "CheckerboardLayout.c"
 }
 
 
 PangoLayout* checkerboard_item_get_tag_list_layout (CheckerboardItem* self) {
 	PangoLayout* result = NULL;
 	PangoLayout* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL);
 #line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->_has_tags;
 #line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_) {
-#line 2224 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp2_ = NULL;
-		PangoLayout* _tmp3_ = NULL;
+#line 2266 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp2_;
+		PangoLayout* _tmp3_;
 #line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->subtitle;
 #line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2231,25 +2273,25 @@ PangoLayout* checkerboard_item_get_tag_list_layout (CheckerboardItem* self) {
 		_g_object_unref0 (_tmp0_);
 #line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp3_;
-#line 2235 "CheckerboardLayout.c"
+#line 2277 "CheckerboardLayout.c"
 	} else {
 #line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (_tmp0_);
 #line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = NULL;
-#line 2241 "CheckerboardLayout.c"
+#line 2283 "CheckerboardLayout.c"
 	}
 #line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
 #line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2247 "CheckerboardLayout.c"
+#line 2289 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_get_subtitle_allocation (CheckerboardItem* self, GdkRectangle* result) {
-	CheckerboardItemText* _tmp0_ = NULL;
-	GdkRectangle _tmp1_ = {0};
+	CheckerboardItemText* _tmp0_;
+	GdkRectangle _tmp1_;
 #line 292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 293 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2260,23 +2302,23 @@ void checkerboard_item_get_subtitle_allocation (CheckerboardItem* self, GdkRecta
 	*result = _tmp1_;
 #line 293 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return;
-#line 2264 "CheckerboardLayout.c"
+#line 2306 "CheckerboardLayout.c"
 }
 
 
 gchar* checkerboard_item_get_subtitle (CheckerboardItem* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	CheckerboardItemText* _tmp1_ = NULL;
+	CheckerboardItemText* _tmp1_;
 #line 296 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL);
 #line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->subtitle;
 #line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 2278 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+#line 2320 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp2_;
+		gchar* _tmp3_;
 #line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->subtitle;
 #line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2285,33 +2327,33 @@ gchar* checkerboard_item_get_subtitle (CheckerboardItem* self) {
 		_g_free0 (_tmp0_);
 #line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp3_;
-#line 2289 "CheckerboardLayout.c"
+#line 2331 "CheckerboardLayout.c"
 	} else {
-		gchar* _tmp4_ = NULL;
+		gchar* _tmp4_;
 #line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = g_strdup ("");
 #line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_free0 (_tmp0_);
 #line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp4_;
-#line 2298 "CheckerboardLayout.c"
+#line 2340 "CheckerboardLayout.c"
 	}
 #line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
 #line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2304 "CheckerboardLayout.c"
+#line 2346 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_set_subtitle (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment) {
 	gboolean _tmp0_ = FALSE;
-	CheckerboardItemText* _tmp1_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	PangoAlignment _tmp8_ = 0;
-	gboolean _tmp9_ = FALSE;
-	CheckerboardItemText* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
+	CheckerboardItemText* _tmp1_;
+	const gchar* _tmp7_;
+	PangoAlignment _tmp8_;
+	gboolean _tmp9_;
+	CheckerboardItemText* _tmp10_;
+	gboolean _tmp11_;
 #line 300 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 300 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2320,12 +2362,12 @@ void checkerboard_item_set_subtitle (CheckerboardItem* self, const gchar* text,
 	_tmp1_ = self->priv->subtitle;
 #line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 2324 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-		PangoAlignment _tmp5_ = 0;
-		gboolean _tmp6_ = FALSE;
+#line 2366 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp2_;
+		const gchar* _tmp3_;
+		gboolean _tmp4_;
+		PangoAlignment _tmp5_;
+		gboolean _tmp6_;
 #line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->subtitle;
 #line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2338,17 +2380,17 @@ void checkerboard_item_set_subtitle (CheckerboardItem* self, const gchar* text,
 		_tmp6_ = checkerboard_item_text_is_set_to (_tmp2_, _tmp3_, _tmp4_, _tmp5_);
 #line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp6_;
-#line 2342 "CheckerboardLayout.c"
+#line 2384 "CheckerboardLayout.c"
 	} else {
 #line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = FALSE;
-#line 2346 "CheckerboardLayout.c"
+#line 2388 "CheckerboardLayout.c"
 	}
 #line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
 #line 303 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 2352 "CheckerboardLayout.c"
+#line 2394 "CheckerboardLayout.c"
 	}
 #line 305 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = text;
@@ -2370,14 +2412,14 @@ void checkerboard_item_set_subtitle (CheckerboardItem* self, const gchar* text,
 		checkerboard_item_recalc_size (self, "set_subtitle");
 #line 309 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 2374 "CheckerboardLayout.c"
+#line 2416 "CheckerboardLayout.c"
 	}
 }
 
 
 void checkerboard_item_clear_subtitle (CheckerboardItem* self) {
-	CheckerboardItemText* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	CheckerboardItemText* _tmp0_;
+	gboolean _tmp1_;
 #line 313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 314 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2386,7 +2428,7 @@ void checkerboard_item_clear_subtitle (CheckerboardItem* self) {
 	if (_tmp0_ == NULL) {
 #line 315 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 2390 "CheckerboardLayout.c"
+#line 2432 "CheckerboardLayout.c"
 	}
 #line 317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_checkerboard_item_text_unref0 (self->priv->subtitle);
@@ -2400,15 +2442,15 @@ void checkerboard_item_clear_subtitle (CheckerboardItem* self) {
 		checkerboard_item_recalc_size (self, "clear_subtitle");
 #line 321 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 2404 "CheckerboardLayout.c"
+#line 2446 "CheckerboardLayout.c"
 	}
 }
 
 
 static void checkerboard_item_set_subtitle_visible (CheckerboardItem* self, gboolean visible) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 #line 325 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 326 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2419,7 +2461,7 @@ static void checkerboard_item_set_subtitle_visible (CheckerboardItem* self, gboo
 	if (_tmp0_ == _tmp1_) {
 #line 327 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 2423 "CheckerboardLayout.c"
+#line 2465 "CheckerboardLayout.c"
 	}
 #line 329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = visible;
@@ -2429,25 +2471,25 @@ static void checkerboard_item_set_subtitle_visible (CheckerboardItem* self, gboo
 	checkerboard_item_recalc_size (self, "set_subtitle_visible");
 #line 332 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 2433 "CheckerboardLayout.c"
+#line 2475 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_set_is_cursor (CheckerboardItem* self, gboolean is_cursor) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 335 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = is_cursor;
 #line 336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->is_cursor = _tmp0_;
-#line 2445 "CheckerboardLayout.c"
+#line 2487 "CheckerboardLayout.c"
 }
 
 
 gboolean checkerboard_item_get_is_cursor (CheckerboardItem* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 339 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), FALSE);
 #line 340 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2456,7 +2498,7 @@ gboolean checkerboard_item_get_is_cursor (CheckerboardItem* self) {
 	result = _tmp0_;
 #line 340 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2460 "CheckerboardLayout.c"
+#line 2502 "CheckerboardLayout.c"
 }
 
 
@@ -2465,7 +2507,7 @@ static void _vala_GValue_free (GValue* self) {
 	g_value_unset (self);
 #line 344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_free (self);
-#line 2469 "CheckerboardLayout.c"
+#line 2511 "CheckerboardLayout.c"
 }
 
 
@@ -2474,25 +2516,25 @@ static void checkerboard_item_real_notify_membership_changed (DataObject* base,
 	gboolean title_visible = FALSE;
 	GValue* _tmp0_ = NULL;
 	GValue _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp2_;
 	gboolean comment_visible = FALSE;
 	GValue* _tmp3_ = NULL;
 	GValue _tmp4_ = {0};
-	gboolean _tmp5_ = FALSE;
+	gboolean _tmp5_;
 	gboolean subtitle_visible = FALSE;
 	GValue* _tmp6_ = NULL;
 	GValue _tmp7_ = {0};
-	gboolean _tmp8_ = FALSE;
+	gboolean _tmp8_;
 	gboolean altered = FALSE;
-	gboolean _tmp9_ = FALSE;
-	gboolean _tmp10_ = FALSE;
-	gboolean _tmp12_ = FALSE;
-	gboolean _tmp13_ = FALSE;
-	gboolean _tmp15_ = FALSE;
-	gboolean _tmp16_ = FALSE;
+	gboolean _tmp9_;
+	gboolean _tmp10_;
+	gboolean _tmp12_;
+	gboolean _tmp13_;
+	gboolean _tmp15_;
+	gboolean _tmp16_;
 	gboolean _tmp18_ = FALSE;
-	gboolean _tmp19_ = FALSE;
-	DataCollection* _tmp21_ = NULL;
+	gboolean _tmp19_;
+	DataCollection* _tmp21_;
 #line 343 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
 #line 343 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2547,15 +2589,15 @@ static void checkerboard_item_real_notify_membership_changed (DataObject* base,
 	_tmp10_ = title_visible;
 #line 349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp9_ != _tmp10_) {
-#line 2551 "CheckerboardLayout.c"
-		gboolean _tmp11_ = FALSE;
+#line 2593 "CheckerboardLayout.c"
+		gboolean _tmp11_;
 #line 350 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp11_ = title_visible;
 #line 350 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->title_visible = _tmp11_;
 #line 351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		altered = TRUE;
-#line 2559 "CheckerboardLayout.c"
+#line 2601 "CheckerboardLayout.c"
 	}
 #line 354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp12_ = self->priv->comment_visible;
@@ -2563,15 +2605,15 @@ static void checkerboard_item_real_notify_membership_changed (DataObject* base,
 	_tmp13_ = comment_visible;
 #line 354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp12_ != _tmp13_) {
-#line 2567 "CheckerboardLayout.c"
-		gboolean _tmp14_ = FALSE;
+#line 2609 "CheckerboardLayout.c"
+		gboolean _tmp14_;
 #line 355 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp14_ = comment_visible;
 #line 355 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->comment_visible = _tmp14_;
 #line 356 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		altered = TRUE;
-#line 2575 "CheckerboardLayout.c"
+#line 2617 "CheckerboardLayout.c"
 	}
 #line 359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp15_ = self->priv->subtitle_visible;
@@ -2579,15 +2621,15 @@ static void checkerboard_item_real_notify_membership_changed (DataObject* base,
 	_tmp16_ = subtitle_visible;
 #line 359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp15_ != _tmp16_) {
-#line 2583 "CheckerboardLayout.c"
-		gboolean _tmp17_ = FALSE;
+#line 2625 "CheckerboardLayout.c"
+		gboolean _tmp17_;
 #line 360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp17_ = subtitle_visible;
 #line 360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->subtitle_visible = _tmp17_;
 #line 361 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		altered = TRUE;
-#line 2591 "CheckerboardLayout.c"
+#line 2633 "CheckerboardLayout.c"
 	}
 #line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp19_ = altered;
@@ -2595,14 +2637,14 @@ static void checkerboard_item_real_notify_membership_changed (DataObject* base,
 	if (_tmp19_) {
 #line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp18_ = TRUE;
-#line 2599 "CheckerboardLayout.c"
+#line 2641 "CheckerboardLayout.c"
 	} else {
-		gboolean _tmp20_ = FALSE;
+		gboolean _tmp20_;
 #line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp20_ = dimensions_has_area (&self->requisition);
 #line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp18_ = !_tmp20_;
-#line 2606 "CheckerboardLayout.c"
+#line 2648 "CheckerboardLayout.c"
 	}
 #line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp18_) {
@@ -2610,24 +2652,24 @@ static void checkerboard_item_real_notify_membership_changed (DataObject* base,
 		checkerboard_item_recalc_size (self, "notify_membership_changed");
 #line 366 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 2614 "CheckerboardLayout.c"
+#line 2656 "CheckerboardLayout.c"
 	}
 #line 369 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp21_ = collection;
 #line 369 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	DATA_OBJECT_CLASS (checkerboard_item_parent_class)->notify_membership_changed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_VIEW, ThumbnailView), TYPE_DATA_OBJECT, DataObject), _tmp21_);
-#line 2620 "CheckerboardLayout.c"
+#line 2662 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_item_real_notify_collection_property_set (DataObject* base, const gchar* name, GValue* old, GValue* val) {
 	CheckerboardItem * self;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GQuark _tmp3_ = 0U;
-	const gchar* _tmp7_ = NULL;
-	GValue* _tmp8_ = NULL;
-	GValue _tmp9_ = {0};
+	const gchar* _tmp7_;
+	GValue* _tmp8_;
+	GValue _tmp9_;
 #line 372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
 #line 372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2644,49 +2686,49 @@ static void checkerboard_item_real_notify_collection_property_set (DataObject* b
 	if (_tmp3_ == g_quark_from_string (CHECKERBOARD_ITEM_PROP_SHOW_TITLES)) {
 #line 373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		switch (0) {
-#line 2648 "CheckerboardLayout.c"
+#line 2690 "CheckerboardLayout.c"
 			default:
 			{
-				GValue _tmp4_ = {0};
+				GValue _tmp4_;
 #line 375 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp4_ = *val;
 #line 375 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				checkerboard_item_set_title_visible (self, g_value_get_boolean (&_tmp4_));
 #line 376 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 2658 "CheckerboardLayout.c"
+#line 2700 "CheckerboardLayout.c"
 			}
 		}
 	} else if (_tmp3_ == g_quark_from_string (CHECKERBOARD_ITEM_PROP_SHOW_COMMENTS)) {
 #line 373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		switch (0) {
-#line 2664 "CheckerboardLayout.c"
+#line 2706 "CheckerboardLayout.c"
 			default:
 			{
-				GValue _tmp5_ = {0};
+				GValue _tmp5_;
 #line 379 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp5_ = *val;
 #line 379 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				checkerboard_item_set_comment_visible (self, g_value_get_boolean (&_tmp5_));
 #line 380 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 2674 "CheckerboardLayout.c"
+#line 2716 "CheckerboardLayout.c"
 			}
 		}
 	} else if (_tmp3_ == g_quark_from_string (CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES)) {
 #line 373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		switch (0) {
-#line 2680 "CheckerboardLayout.c"
+#line 2722 "CheckerboardLayout.c"
 			default:
 			{
-				GValue _tmp6_ = {0};
+				GValue _tmp6_;
 #line 383 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp6_ = *val;
 #line 383 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				checkerboard_item_set_subtitle_visible (self, g_value_get_boolean (&_tmp6_));
 #line 384 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 2690 "CheckerboardLayout.c"
+#line 2732 "CheckerboardLayout.c"
 			}
 		}
 	}
@@ -2698,14 +2740,14 @@ static void checkerboard_item_real_notify_collection_property_set (DataObject* b
 	_tmp9_ = *val;
 #line 387 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	DATA_OBJECT_CLASS (checkerboard_item_parent_class)->notify_collection_property_set (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_VIEW, ThumbnailView), TYPE_DATA_OBJECT, DataObject), _tmp7_, _tmp8_, &_tmp9_);
-#line 2702 "CheckerboardLayout.c"
+#line 2744 "CheckerboardLayout.c"
 }
 
 
 gint checkerboard_item_get_alignment_point (CheckerboardItem* self) {
 	gint result = 0;
-	Dimensions _tmp0_ = {0};
-	gint _tmp1_ = 0;
+	Dimensions _tmp0_;
+	gint _tmp1_;
 #line 393 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), 0);
 #line 394 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2716,14 +2758,14 @@ gint checkerboard_item_get_alignment_point (CheckerboardItem* self) {
 	result = (CHECKERBOARD_ITEM_FRAME_WIDTH + CHECKERBOARD_ITEM_BORDER_WIDTH) + _tmp1_;
 #line 394 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2720 "CheckerboardLayout.c"
+#line 2762 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_item_real_exposed (CheckerboardItem* self) {
 #line 398 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->exposure = TRUE;
-#line 2727 "CheckerboardLayout.c"
+#line 2769 "CheckerboardLayout.c"
 }
 
 
@@ -2732,51 +2774,51 @@ void checkerboard_item_exposed (CheckerboardItem* self) {
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 397 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	CHECKERBOARD_ITEM_GET_CLASS (self)->exposed (self);
-#line 2736 "CheckerboardLayout.c"
+#line 2778 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_item_real_unexposed (CheckerboardItem* self) {
-	CheckerboardItemText* _tmp0_ = NULL;
-	CheckerboardItemText* _tmp2_ = NULL;
-	CheckerboardItemText* _tmp4_ = NULL;
+	CheckerboardItemText* _tmp0_;
+	CheckerboardItemText* _tmp2_;
+	CheckerboardItemText* _tmp4_;
 #line 402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->exposure = FALSE;
 #line 404 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->title;
 #line 404 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_ != NULL) {
-#line 2750 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp1_ = NULL;
+#line 2792 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp1_;
 #line 405 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp1_ = self->priv->title;
 #line 405 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_text_clear_pango_layout (_tmp1_);
-#line 2756 "CheckerboardLayout.c"
+#line 2798 "CheckerboardLayout.c"
 	}
 #line 407 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = self->priv->comment;
 #line 407 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp2_ != NULL) {
-#line 2762 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp3_ = NULL;
+#line 2804 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp3_;
 #line 408 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = self->priv->comment;
 #line 408 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_text_clear_pango_layout (_tmp3_);
-#line 2768 "CheckerboardLayout.c"
+#line 2810 "CheckerboardLayout.c"
 	}
 #line 410 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = self->priv->subtitle;
 #line 410 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp4_ != NULL) {
-#line 2774 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp5_ = NULL;
+#line 2816 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp5_;
 #line 411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = self->priv->subtitle;
 #line 411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_text_clear_pango_layout (_tmp5_);
-#line 2780 "CheckerboardLayout.c"
+#line 2822 "CheckerboardLayout.c"
 	}
 }
 
@@ -2786,20 +2828,20 @@ void checkerboard_item_unexposed (CheckerboardItem* self) {
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 401 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	CHECKERBOARD_ITEM_GET_CLASS (self)->unexposed (self);
-#line 2790 "CheckerboardLayout.c"
+#line 2832 "CheckerboardLayout.c"
 }
 
 
 static gboolean checkerboard_item_real_is_exposed (CheckerboardItem* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->exposure;
 #line 415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
 #line 415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2803 "CheckerboardLayout.c"
+#line 2845 "CheckerboardLayout.c"
 }
 
 
@@ -2808,13 +2850,13 @@ gboolean checkerboard_item_is_exposed (CheckerboardItem* self) {
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), FALSE);
 #line 414 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return CHECKERBOARD_ITEM_GET_CLASS (self)->is_exposed (self);
-#line 2812 "CheckerboardLayout.c"
+#line 2854 "CheckerboardLayout.c"
 }
 
 
 gboolean checkerboard_item_has_image (CheckerboardItem* self) {
 	gboolean result = FALSE;
-	GdkPixbuf* _tmp0_ = NULL;
+	GdkPixbuf* _tmp0_;
 #line 418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), FALSE);
 #line 419 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2823,14 +2865,14 @@ gboolean checkerboard_item_has_image (CheckerboardItem* self) {
 	result = _tmp0_ != NULL;
 #line 419 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2827 "CheckerboardLayout.c"
+#line 2869 "CheckerboardLayout.c"
 }
 
 
 GdkPixbuf* checkerboard_item_get_image (CheckerboardItem* self) {
 	GdkPixbuf* result = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
 #line 422 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL);
 #line 423 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2841,16 +2883,16 @@ GdkPixbuf* checkerboard_item_get_image (CheckerboardItem* self) {
 	result = _tmp1_;
 #line 423 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2845 "CheckerboardLayout.c"
+#line 2887 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_set_image (CheckerboardItem* self, GdkPixbuf* pixbuf) {
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	GdkPixbuf* _tmp2_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
 	Dimensions _tmp5_ = {0};
 #line 426 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
@@ -2882,15 +2924,15 @@ void checkerboard_item_set_image (CheckerboardItem* self, GdkPixbuf* pixbuf) {
 	checkerboard_item_recalc_size (self, "set_image");
 #line 432 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 2886 "CheckerboardLayout.c"
+#line 2928 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_clear_image (CheckerboardItem* self, Dimensions* dim) {
 	gboolean had_image = FALSE;
-	GdkPixbuf* _tmp0_ = NULL;
-	Dimensions _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
+	GdkPixbuf* _tmp0_;
+	Dimensions _tmp1_;
+	gboolean _tmp2_;
 #line 435 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 435 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2919,48 +2961,48 @@ void checkerboard_item_clear_image (CheckerboardItem* self, Dimensions* dim) {
 	if (_tmp2_) {
 #line 445 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 2923 "CheckerboardLayout.c"
+#line 2965 "CheckerboardLayout.c"
 	}
 }
 
 
 gint checkerboard_item_get_max_width (gint scale) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 451 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = scale;
 #line 451 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = (CHECKERBOARD_ITEM_FRAME_WIDTH * 2) + _tmp0_;
 #line 451 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2937 "CheckerboardLayout.c"
+#line 2979 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_item_recalc_size (CheckerboardItem* self, const gchar* reason) {
 	Dimensions old_requisition = {0};
-	Dimensions _tmp0_ = {0};
+	Dimensions _tmp0_;
 	gint _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-	CheckerboardItemText* _tmp3_ = NULL;
+	CheckerboardItemText* _tmp3_;
 	gint title_height = 0;
 	gint _tmp7_ = 0;
 	gboolean _tmp8_ = FALSE;
-	CheckerboardItemText* _tmp9_ = NULL;
+	CheckerboardItemText* _tmp9_;
 	gint comment_height = 0;
 	gint _tmp13_ = 0;
 	gboolean _tmp14_ = FALSE;
-	CheckerboardItemText* _tmp15_ = NULL;
+	CheckerboardItemText* _tmp15_;
 	gint subtitle_height = 0;
-	Dimensions _tmp19_ = {0};
-	gint _tmp20_ = 0;
-	Dimensions _tmp21_ = {0};
-	gint _tmp22_ = 0;
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	Dimensions _tmp26_ = {0};
-	gboolean _tmp27_ = FALSE;
+	Dimensions _tmp19_;
+	gint _tmp20_;
+	Dimensions _tmp21_;
+	gint _tmp22_;
+	gint _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	Dimensions _tmp26_;
+	gboolean _tmp27_;
 #line 454 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 454 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2973,34 +3015,34 @@ static void checkerboard_item_recalc_size (CheckerboardItem* self, const gchar*
 	_tmp3_ = self->priv->title;
 #line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp3_ != NULL) {
-#line 2977 "CheckerboardLayout.c"
-		gboolean _tmp4_ = FALSE;
+#line 3019 "CheckerboardLayout.c"
+		gboolean _tmp4_;
 #line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = self->priv->title_visible;
 #line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = _tmp4_;
-#line 2983 "CheckerboardLayout.c"
+#line 3025 "CheckerboardLayout.c"
 	} else {
 #line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = FALSE;
-#line 2987 "CheckerboardLayout.c"
+#line 3029 "CheckerboardLayout.c"
 	}
 #line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp2_) {
-#line 2991 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
+#line 3033 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp5_;
+		gint _tmp6_;
 #line 459 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = self->priv->title;
 #line 459 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = checkerboard_item_text_get_height (_tmp5_);
 #line 459 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp1_ = _tmp6_ + CHECKERBOARD_ITEM_LABEL_PADDING;
-#line 3000 "CheckerboardLayout.c"
+#line 3042 "CheckerboardLayout.c"
 	} else {
 #line 459 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp1_ = 0;
-#line 3004 "CheckerboardLayout.c"
+#line 3046 "CheckerboardLayout.c"
 	}
 #line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	title_height = _tmp1_;
@@ -3008,34 +3050,34 @@ static void checkerboard_item_recalc_size (CheckerboardItem* self, const gchar*
 	_tmp9_ = self->priv->comment;
 #line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp9_ != NULL) {
-#line 3012 "CheckerboardLayout.c"
-		gboolean _tmp10_ = FALSE;
+#line 3054 "CheckerboardLayout.c"
+		gboolean _tmp10_;
 #line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp10_ = self->priv->comment_visible;
 #line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = _tmp10_;
-#line 3018 "CheckerboardLayout.c"
+#line 3060 "CheckerboardLayout.c"
 	} else {
 #line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = FALSE;
-#line 3022 "CheckerboardLayout.c"
+#line 3064 "CheckerboardLayout.c"
 	}
 #line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp8_) {
-#line 3026 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
+#line 3068 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp11_;
+		gint _tmp12_;
 #line 461 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp11_ = self->priv->comment;
 #line 461 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp12_ = checkerboard_item_text_get_height (_tmp11_);
 #line 461 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = _tmp12_ + CHECKERBOARD_ITEM_LABEL_PADDING;
-#line 3035 "CheckerboardLayout.c"
+#line 3077 "CheckerboardLayout.c"
 	} else {
 #line 461 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = 0;
-#line 3039 "CheckerboardLayout.c"
+#line 3081 "CheckerboardLayout.c"
 	}
 #line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	comment_height = _tmp7_;
@@ -3043,34 +3085,34 @@ static void checkerboard_item_recalc_size (CheckerboardItem* self, const gchar*
 	_tmp15_ = self->priv->subtitle;
 #line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp15_ != NULL) {
-#line 3047 "CheckerboardLayout.c"
-		gboolean _tmp16_ = FALSE;
+#line 3089 "CheckerboardLayout.c"
+		gboolean _tmp16_;
 #line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp16_ = self->priv->subtitle_visible;
 #line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp14_ = _tmp16_;
-#line 3053 "CheckerboardLayout.c"
+#line 3095 "CheckerboardLayout.c"
 	} else {
 #line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp14_ = FALSE;
-#line 3057 "CheckerboardLayout.c"
+#line 3099 "CheckerboardLayout.c"
 	}
 #line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp14_) {
-#line 3061 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
+#line 3103 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp17_;
+		gint _tmp18_;
 #line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp17_ = self->priv->subtitle;
 #line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp18_ = checkerboard_item_text_get_height (_tmp17_);
 #line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = _tmp18_ + CHECKERBOARD_ITEM_LABEL_PADDING;
-#line 3070 "CheckerboardLayout.c"
+#line 3112 "CheckerboardLayout.c"
 	} else {
 #line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = 0;
-#line 3074 "CheckerboardLayout.c"
+#line 3116 "CheckerboardLayout.c"
 	}
 #line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	subtitle_height = _tmp13_;
@@ -3100,19 +3142,19 @@ static void checkerboard_item_recalc_size (CheckerboardItem* self, const gchar*
 	if (!_tmp27_) {
 #line 484 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_geometry_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 3104 "CheckerboardLayout.c"
+#line 3146 "CheckerboardLayout.c"
 	}
 }
 
 
 void checkerboard_item_get_border_dimensions (Dimensions* object_dim, gint border_width, Dimensions* result) {
 	Dimensions dimensions = {0};
-	Dimensions _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	Dimensions _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	Dimensions _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	Dimensions _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 488 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (object_dim != NULL);
 #line 489 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -3137,18 +3179,18 @@ void checkerboard_item_get_border_dimensions (Dimensions* object_dim, gint borde
 	*result = dimensions;
 #line 492 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return;
-#line 3141 "CheckerboardLayout.c"
+#line 3183 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_get_border_origin (GdkPoint* object_origin, gint border_width, GdkPoint* result) {
 	GdkPoint origin = {0};
-	GdkPoint _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	GdkPoint _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	GdkPoint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	GdkPoint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 495 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (object_origin != NULL);
 #line 496 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -3173,95 +3215,95 @@ void checkerboard_item_get_border_origin (GdkPoint* object_origin, gint border_w
 	*result = origin;
 #line 499 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return;
-#line 3177 "CheckerboardLayout.c"
+#line 3219 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_item_real_paint_shadow (CheckerboardItem* self, cairo_t* ctx, Dimensions* dimensions, GdkPoint* origin, gint radius, gfloat initial_alpha) {
 	gdouble rgb_all = 0.0;
-	cairo_t* _tmp0_ = NULL;
-	GdkPoint _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	Dimensions _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	GdkPoint _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gfloat _tmp9_ = 0.0F;
-	cairo_t* _tmp10_ = NULL;
-	GdkPoint _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	Dimensions _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	GdkPoint _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	Dimensions _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	gfloat _tmp20_ = 0.0F;
-	cairo_t* _tmp21_ = NULL;
-	GdkPoint _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	GdkPoint _tmp25_ = {0};
-	gint _tmp26_ = 0;
-	Dimensions _tmp27_ = {0};
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	gfloat _tmp30_ = 0.0F;
+	cairo_t* _tmp0_;
+	GdkPoint _tmp1_;
+	gint _tmp2_;
+	Dimensions _tmp3_;
+	gint _tmp4_;
+	GdkPoint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	gfloat _tmp9_;
+	cairo_t* _tmp10_;
+	GdkPoint _tmp11_;
+	gint _tmp12_;
+	Dimensions _tmp13_;
+	gint _tmp14_;
+	GdkPoint _tmp15_;
+	gint _tmp16_;
+	Dimensions _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	gfloat _tmp20_;
+	cairo_t* _tmp21_;
+	GdkPoint _tmp22_;
+	gint _tmp23_;
+	gint _tmp24_;
+	GdkPoint _tmp25_;
+	gint _tmp26_;
+	Dimensions _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
+	gfloat _tmp30_;
 	cairo_pattern_t* lr = NULL;
-	GdkPoint _tmp31_ = {0};
-	gint _tmp32_ = 0;
-	Dimensions _tmp33_ = {0};
-	gint _tmp34_ = 0;
-	GdkPoint _tmp35_ = {0};
-	gint _tmp36_ = 0;
-	Dimensions _tmp37_ = {0};
-	gint _tmp38_ = 0;
-	gint _tmp39_ = 0;
-	cairo_pattern_t* _tmp40_ = NULL;
-	gfloat _tmp41_ = 0.0F;
-	cairo_t* _tmp42_ = NULL;
-	cairo_t* _tmp43_ = NULL;
-	GdkPoint _tmp44_ = {0};
-	gint _tmp45_ = 0;
-	gint _tmp46_ = 0;
-	GdkPoint _tmp47_ = {0};
-	gint _tmp48_ = 0;
-	Dimensions _tmp49_ = {0};
-	gint _tmp50_ = 0;
-	Dimensions _tmp51_ = {0};
-	gint _tmp52_ = 0;
-	gint _tmp53_ = 0;
-	gint _tmp54_ = 0;
-	cairo_t* _tmp55_ = NULL;
+	GdkPoint _tmp31_;
+	gint _tmp32_;
+	Dimensions _tmp33_;
+	gint _tmp34_;
+	GdkPoint _tmp35_;
+	gint _tmp36_;
+	Dimensions _tmp37_;
+	gint _tmp38_;
+	gint _tmp39_;
+	cairo_pattern_t* _tmp40_;
+	gfloat _tmp41_;
+	cairo_t* _tmp42_;
+	cairo_t* _tmp43_;
+	GdkPoint _tmp44_;
+	gint _tmp45_;
+	gint _tmp46_;
+	GdkPoint _tmp47_;
+	gint _tmp48_;
+	Dimensions _tmp49_;
+	gint _tmp50_;
+	Dimensions _tmp51_;
+	gint _tmp52_;
+	gint _tmp53_;
+	gint _tmp54_;
+	cairo_t* _tmp55_;
 	cairo_pattern_t* td = NULL;
-	GdkPoint _tmp56_ = {0};
-	gint _tmp57_ = 0;
-	Dimensions _tmp58_ = {0};
-	gint _tmp59_ = 0;
-	GdkPoint _tmp60_ = {0};
-	gint _tmp61_ = 0;
-	Dimensions _tmp62_ = {0};
-	gint _tmp63_ = 0;
-	gint _tmp64_ = 0;
-	cairo_pattern_t* _tmp65_ = NULL;
-	gfloat _tmp66_ = 0.0F;
-	cairo_t* _tmp67_ = NULL;
-	cairo_t* _tmp68_ = NULL;
-	GdkPoint _tmp69_ = {0};
-	gint _tmp70_ = 0;
-	Dimensions _tmp71_ = {0};
-	gint _tmp72_ = 0;
-	GdkPoint _tmp73_ = {0};
-	gint _tmp74_ = 0;
-	gint _tmp75_ = 0;
-	gint _tmp76_ = 0;
-	Dimensions _tmp77_ = {0};
-	gint _tmp78_ = 0;
-	gint _tmp79_ = 0;
-	cairo_t* _tmp80_ = NULL;
+	GdkPoint _tmp56_;
+	gint _tmp57_;
+	Dimensions _tmp58_;
+	gint _tmp59_;
+	GdkPoint _tmp60_;
+	gint _tmp61_;
+	Dimensions _tmp62_;
+	gint _tmp63_;
+	gint _tmp64_;
+	cairo_pattern_t* _tmp65_;
+	gfloat _tmp66_;
+	cairo_t* _tmp67_;
+	cairo_t* _tmp68_;
+	GdkPoint _tmp69_;
+	gint _tmp70_;
+	Dimensions _tmp71_;
+	gint _tmp72_;
+	GdkPoint _tmp73_;
+	gint _tmp74_;
+	gint _tmp75_;
+	gint _tmp76_;
+	Dimensions _tmp77_;
+	gint _tmp78_;
+	gint _tmp79_;
+	cairo_t* _tmp80_;
 #line 502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (ctx != NULL);
 #line 502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -3466,7 +3508,7 @@ static void checkerboard_item_real_paint_shadow (CheckerboardItem* self, cairo_t
 	_cairo_pattern_destroy0 (td);
 #line 502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_cairo_pattern_destroy0 (lr);
-#line 3470 "CheckerboardLayout.c"
+#line 3512 "CheckerboardLayout.c"
 }
 
 
@@ -3475,37 +3517,37 @@ void checkerboard_item_paint_shadow (CheckerboardItem* self, cairo_t* ctx, Dimen
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	CHECKERBOARD_ITEM_GET_CLASS (self)->paint_shadow (self, ctx, dimensions, origin, radius, initial_alpha);
-#line 3479 "CheckerboardLayout.c"
+#line 3521 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_paint_shadow_in_corner (CheckerboardItem* self, cairo_t* ctx, gint x, gint y, gdouble rgb_all, gfloat radius, gfloat initial_alpha, gdouble arc1, gdouble arc2) {
 	cairo_pattern_t* p = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gfloat _tmp4_ = 0.0F;
-	cairo_pattern_t* _tmp5_ = NULL;
-	gdouble _tmp6_ = 0.0;
-	gdouble _tmp7_ = 0.0;
-	gdouble _tmp8_ = 0.0;
-	gfloat _tmp9_ = 0.0F;
-	gdouble _tmp10_ = 0.0;
-	gdouble _tmp11_ = 0.0;
-	gdouble _tmp12_ = 0.0;
-	cairo_t* _tmp13_ = NULL;
-	cairo_t* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	cairo_t* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	gfloat _tmp20_ = 0.0F;
-	gdouble _tmp21_ = 0.0;
-	gdouble _tmp22_ = 0.0;
-	cairo_t* _tmp23_ = NULL;
-	cairo_t* _tmp24_ = NULL;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gfloat _tmp4_;
+	cairo_pattern_t* _tmp5_;
+	gdouble _tmp6_;
+	gdouble _tmp7_;
+	gdouble _tmp8_;
+	gfloat _tmp9_;
+	gdouble _tmp10_;
+	gdouble _tmp11_;
+	gdouble _tmp12_;
+	cairo_t* _tmp13_;
+	cairo_t* _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	cairo_t* _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	gfloat _tmp20_;
+	gdouble _tmp21_;
+	gdouble _tmp22_;
+	cairo_t* _tmp23_;
+	cairo_t* _tmp24_;
 #line 536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -3578,12 +3620,12 @@ void checkerboard_item_paint_shadow_in_corner (CheckerboardItem* self, cairo_t*
 	cairo_fill (_tmp24_);
 #line 536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_cairo_pattern_destroy0 (p);
-#line 3582 "CheckerboardLayout.c"
+#line 3624 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_item_real_paint_border (CheckerboardItem* self, cairo_t* ctx, Dimensions* object_dimensions, GdkPoint* object_origin, gint border_width) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (ctx != NULL);
 #line 548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -3594,21 +3636,21 @@ static void checkerboard_item_real_paint_border (CheckerboardItem* self, cairo_t
 	_tmp0_ = border_width;
 #line 550 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_ == 1) {
-#line 3598 "CheckerboardLayout.c"
-		cairo_t* _tmp1_ = NULL;
-		GdkPoint _tmp2_ = {0};
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
-		GdkPoint _tmp5_ = {0};
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-		Dimensions _tmp8_ = {0};
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-		Dimensions _tmp11_ = {0};
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
-		cairo_t* _tmp14_ = NULL;
+#line 3640 "CheckerboardLayout.c"
+		cairo_t* _tmp1_;
+		GdkPoint _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
+		GdkPoint _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
+		Dimensions _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
+		Dimensions _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
+		cairo_t* _tmp14_;
 #line 551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp1_ = ctx;
 #line 551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -3641,26 +3683,26 @@ static void checkerboard_item_real_paint_border (CheckerboardItem* self, cairo_t
 		_tmp14_ = ctx;
 #line 554 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_fill (_tmp14_);
-#line 3645 "CheckerboardLayout.c"
+#line 3687 "CheckerboardLayout.c"
 	} else {
 		Dimensions dimensions = {0};
-		Dimensions _tmp15_ = {0};
-		gint _tmp16_ = 0;
+		Dimensions _tmp15_;
+		gint _tmp16_;
 		Dimensions _tmp17_ = {0};
 		GdkPoint origin = {0};
-		GdkPoint _tmp18_ = {0};
-		gint _tmp19_ = 0;
+		GdkPoint _tmp18_;
+		gint _tmp19_;
 		GdkPoint _tmp20_ = {0};
 		gdouble scale = 0.0;
-		Dimensions _tmp21_ = {0};
-		gint _tmp22_ = 0;
-		Dimensions _tmp23_ = {0};
-		gint _tmp24_ = 0;
-		gint _tmp25_ = 0;
-		cairo_t* _tmp26_ = NULL;
-		Dimensions _tmp27_ = {0};
-		GdkPoint _tmp28_ = {0};
-		gdouble _tmp29_ = 0.0;
+		Dimensions _tmp21_;
+		gint _tmp22_;
+		Dimensions _tmp23_;
+		gint _tmp24_;
+		gint _tmp25_;
+		cairo_t* _tmp26_;
+		Dimensions _tmp27_;
+		GdkPoint _tmp28_;
+		gdouble _tmp29_;
 #line 556 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp15_ = *object_dimensions;
 #line 556 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -3699,7 +3741,7 @@ static void checkerboard_item_real_paint_border (CheckerboardItem* self, cairo_t
 		_tmp29_ = scale;
 #line 561 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		draw_rounded_corners_filled (_tmp26_, &_tmp27_, &_tmp28_, 0.25 * _tmp29_);
-#line 3703 "CheckerboardLayout.c"
+#line 3745 "CheckerboardLayout.c"
 	}
 }
 
@@ -3709,20 +3751,20 @@ void checkerboard_item_paint_border (CheckerboardItem* self, cairo_t* ctx, Dimen
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	CHECKERBOARD_ITEM_GET_CLASS (self)->paint_border (self, ctx, object_dimensions, object_origin, border_width);
-#line 3713 "CheckerboardLayout.c"
+#line 3755 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_item_real_paint_image (CheckerboardItem* self, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin) {
-	GdkPixbuf* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	cairo_t* _tmp12_ = NULL;
-	GdkPixbuf* _tmp13_ = NULL;
-	GdkPoint _tmp14_ = {0};
-	gint _tmp15_ = 0;
-	GdkPoint _tmp16_ = {0};
-	gint _tmp17_ = 0;
-	cairo_t* _tmp18_ = NULL;
+	GdkPixbuf* _tmp0_;
+	gboolean _tmp1_;
+	cairo_t* _tmp12_;
+	GdkPixbuf* _tmp13_;
+	GdkPoint _tmp14_;
+	gint _tmp15_;
+	GdkPoint _tmp16_;
+	gint _tmp17_;
+	cairo_t* _tmp18_;
 #line 565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (ctx != NULL);
 #line 565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -3735,17 +3777,17 @@ static void checkerboard_item_real_paint_image (CheckerboardItem* self, cairo_t*
 	_tmp1_ = gdk_pixbuf_get_has_alpha (_tmp0_);
 #line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_) {
-#line 3739 "CheckerboardLayout.c"
-		cairo_t* _tmp2_ = NULL;
-		GdkPoint _tmp3_ = {0};
-		gint _tmp4_ = 0;
-		GdkPoint _tmp5_ = {0};
-		gint _tmp6_ = 0;
-		GdkPixbuf* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		GdkPixbuf* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		cairo_t* _tmp11_ = NULL;
+#line 3781 "CheckerboardLayout.c"
+		cairo_t* _tmp2_;
+		GdkPoint _tmp3_;
+		gint _tmp4_;
+		GdkPoint _tmp5_;
+		gint _tmp6_;
+		GdkPixbuf* _tmp7_;
+		gint _tmp8_;
+		GdkPixbuf* _tmp9_;
+		gint _tmp10_;
+		cairo_t* _tmp11_;
 #line 567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = ctx;
 #line 567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -3770,7 +3812,7 @@ static void checkerboard_item_real_paint_image (CheckerboardItem* self, cairo_t*
 		_tmp11_ = ctx;
 #line 568 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_fill (_tmp11_);
-#line 3774 "CheckerboardLayout.c"
+#line 3816 "CheckerboardLayout.c"
 	}
 #line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp12_ = ctx;
@@ -3790,7 +3832,7 @@ static void checkerboard_item_real_paint_image (CheckerboardItem* self, cairo_t*
 	_tmp18_ = ctx;
 #line 571 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	cairo_paint (_tmp18_);
-#line 3794 "CheckerboardLayout.c"
+#line 3836 "CheckerboardLayout.c"
 }
 
 
@@ -3799,18 +3841,18 @@ void checkerboard_item_paint_image (CheckerboardItem* self, cairo_t* ctx, GdkPix
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	CHECKERBOARD_ITEM_GET_CLASS (self)->paint_image (self, ctx, pixbuf, origin);
-#line 3803 "CheckerboardLayout.c"
+#line 3845 "CheckerboardLayout.c"
 }
 
 
 static gint checkerboard_item_get_selection_border_width (CheckerboardItem* self, gint scale) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 574 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), 0);
 #line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -3827,17 +3869,17 @@ static gint checkerboard_item_get_selection_border_width (CheckerboardItem* self
 	if (_tmp1_ <= ((_tmp3_ + _tmp5_) / 3)) {
 #line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = 2;
-#line 3831 "CheckerboardLayout.c"
+#line 3873 "CheckerboardLayout.c"
 	} else {
 #line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = 3;
-#line 3835 "CheckerboardLayout.c"
+#line 3877 "CheckerboardLayout.c"
 	}
 #line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_ + CHECKERBOARD_ITEM_BORDER_WIDTH;
 #line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 3841 "CheckerboardLayout.c"
+#line 3883 "CheckerboardLayout.c"
 }
 
 
@@ -3847,7 +3889,7 @@ static GdkPixbuf* checkerboard_item_real_get_top_left_trinket (CheckerboardItem*
 	result = NULL;
 #line 580 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 3851 "CheckerboardLayout.c"
+#line 3893 "CheckerboardLayout.c"
 }
 
 
@@ -3856,7 +3898,7 @@ GdkPixbuf* checkerboard_item_get_top_left_trinket (CheckerboardItem* self, gint
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL);
 #line 579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return CHECKERBOARD_ITEM_GET_CLASS (self)->get_top_left_trinket (self, scale);
-#line 3860 "CheckerboardLayout.c"
+#line 3902 "CheckerboardLayout.c"
 }
 
 
@@ -3866,7 +3908,7 @@ static GdkPixbuf* checkerboard_item_real_get_top_right_trinket (CheckerboardItem
 	result = NULL;
 #line 584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 3870 "CheckerboardLayout.c"
+#line 3912 "CheckerboardLayout.c"
 }
 
 
@@ -3875,7 +3917,7 @@ GdkPixbuf* checkerboard_item_get_top_right_trinket (CheckerboardItem* self, gint
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL);
 #line 583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return CHECKERBOARD_ITEM_GET_CLASS (self)->get_top_right_trinket (self, scale);
-#line 3879 "CheckerboardLayout.c"
+#line 3921 "CheckerboardLayout.c"
 }
 
 
@@ -3885,7 +3927,7 @@ static GdkPixbuf* checkerboard_item_real_get_bottom_left_trinket (CheckerboardIt
 	result = NULL;
 #line 588 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 3889 "CheckerboardLayout.c"
+#line 3931 "CheckerboardLayout.c"
 }
 
 
@@ -3894,7 +3936,7 @@ GdkPixbuf* checkerboard_item_get_bottom_left_trinket (CheckerboardItem* self, gi
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL);
 #line 587 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return CHECKERBOARD_ITEM_GET_CLASS (self)->get_bottom_left_trinket (self, scale);
-#line 3898 "CheckerboardLayout.c"
+#line 3940 "CheckerboardLayout.c"
 }
 
 
@@ -3904,7 +3946,7 @@ static GdkPixbuf* checkerboard_item_real_get_bottom_right_trinket (CheckerboardI
 	result = NULL;
 #line 592 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 3908 "CheckerboardLayout.c"
+#line 3950 "CheckerboardLayout.c"
 }
 
 
@@ -3913,69 +3955,69 @@ GdkPixbuf* checkerboard_item_get_bottom_right_trinket (CheckerboardItem* self, g
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL);
 #line 591 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return CHECKERBOARD_ITEM_GET_CLASS (self)->get_bottom_right_trinket (self, scale);
-#line 3917 "CheckerboardLayout.c"
+#line 3959 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_color, GdkRGBA* selected_color, GdkRGBA* text_color, GdkRGBA* border_color) {
 	GdkPoint pixbuf_origin = {0};
-	GdkRectangle _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	cairo_t* _tmp4_ = NULL;
-	cairo_t* _tmp5_ = NULL;
-	GdkRGBA _tmp6_ = {0};
-	gdouble _tmp7_ = 0.0;
-	GdkRGBA _tmp8_ = {0};
-	gdouble _tmp9_ = 0.0;
-	GdkRGBA _tmp10_ = {0};
-	gdouble _tmp11_ = 0.0;
-	GdkRGBA _tmp12_ = {0};
-	gdouble _tmp13_ = 0.0;
-	GdkRGBA* _tmp14_ = NULL;
-	gboolean _tmp24_ = FALSE;
-	gboolean _tmp45_ = FALSE;
-	GdkRGBA* _tmp57_ = NULL;
-	GdkPixbuf* _tmp72_ = NULL;
-	cairo_t* _tmp87_ = NULL;
-	GdkRGBA _tmp88_ = {0};
-	gdouble _tmp89_ = 0.0;
-	GdkRGBA _tmp90_ = {0};
-	gdouble _tmp91_ = 0.0;
-	GdkRGBA _tmp92_ = {0};
-	gdouble _tmp93_ = 0.0;
-	GdkRGBA _tmp94_ = {0};
-	gdouble _tmp95_ = 0.0;
+	GdkRectangle _tmp0_;
+	gint _tmp1_;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	cairo_t* _tmp4_;
+	cairo_t* _tmp5_;
+	GdkRGBA _tmp6_;
+	gdouble _tmp7_;
+	GdkRGBA _tmp8_;
+	gdouble _tmp9_;
+	GdkRGBA _tmp10_;
+	gdouble _tmp11_;
+	GdkRGBA _tmp12_;
+	gdouble _tmp13_;
+	GdkRGBA* _tmp14_;
+	gboolean _tmp24_;
+	gboolean _tmp45_;
+	GdkRGBA* _tmp57_;
+	GdkPixbuf* _tmp72_;
+	cairo_t* _tmp87_;
+	GdkRGBA _tmp88_;
+	gdouble _tmp89_;
+	GdkRGBA _tmp90_;
+	gdouble _tmp91_;
+	GdkRGBA _tmp92_;
+	gdouble _tmp93_;
+	GdkRGBA _tmp94_;
+	gdouble _tmp95_;
 	gint text_y = 0;
-	GdkRectangle _tmp96_ = {0};
-	gint _tmp97_ = 0;
-	Dimensions _tmp98_ = {0};
-	gint _tmp99_ = 0;
+	GdkRectangle _tmp96_;
+	gint _tmp97_;
+	Dimensions _tmp98_;
+	gint _tmp99_;
 	gboolean _tmp100_ = FALSE;
-	CheckerboardItemText* _tmp101_ = NULL;
+	CheckerboardItemText* _tmp101_;
 	gboolean _tmp130_ = FALSE;
-	CheckerboardItemText* _tmp131_ = NULL;
+	CheckerboardItemText* _tmp131_;
 	gboolean _tmp160_ = FALSE;
-	CheckerboardItemText* _tmp161_ = NULL;
-	cairo_t* _tmp187_ = NULL;
-	GdkRGBA _tmp188_ = {0};
-	gdouble _tmp189_ = 0.0;
-	GdkRGBA _tmp190_ = {0};
-	gdouble _tmp191_ = 0.0;
-	GdkRGBA _tmp192_ = {0};
-	gdouble _tmp193_ = 0.0;
-	GdkRGBA _tmp194_ = {0};
-	gdouble _tmp195_ = 0.0;
+	CheckerboardItemText* _tmp161_;
+	cairo_t* _tmp187_;
+	GdkRGBA _tmp188_;
+	gdouble _tmp189_;
+	GdkRGBA _tmp190_;
+	gdouble _tmp191_;
+	GdkRGBA _tmp192_;
+	gdouble _tmp193_;
+	GdkRGBA _tmp194_;
+	gdouble _tmp195_;
 	GdkPixbuf* trinket = NULL;
-	GdkPixbuf* _tmp196_ = NULL;
-	GdkPixbuf* _tmp197_ = NULL;
-	GdkPixbuf* _tmp219_ = NULL;
-	GdkPixbuf* _tmp220_ = NULL;
-	GdkPixbuf* _tmp238_ = NULL;
-	GdkPixbuf* _tmp239_ = NULL;
-	GdkPixbuf* _tmp262_ = NULL;
-	GdkPixbuf* _tmp263_ = NULL;
+	GdkPixbuf* _tmp196_;
+	GdkPixbuf* _tmp197_;
+	GdkPixbuf* _tmp219_;
+	GdkPixbuf* _tmp220_;
+	GdkPixbuf* _tmp238_;
+	GdkPixbuf* _tmp239_;
+	GdkPixbuf* _tmp262_;
+	GdkPixbuf* _tmp263_;
 #line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -4028,17 +4070,17 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 	_tmp14_ = border_color;
 #line 607 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp14_ != NULL) {
-#line 4032 "CheckerboardLayout.c"
-		cairo_t* _tmp15_ = NULL;
+#line 4074 "CheckerboardLayout.c"
+		cairo_t* _tmp15_;
 		Dimensions shadow_dim = {0};
-		Dimensions _tmp16_ = {0};
-		gint _tmp17_ = 0;
-		Dimensions _tmp18_ = {0};
-		gint _tmp19_ = 0;
-		cairo_t* _tmp20_ = NULL;
-		Dimensions _tmp21_ = {0};
-		GdkPoint _tmp22_ = {0};
-		cairo_t* _tmp23_ = NULL;
+		Dimensions _tmp16_;
+		gint _tmp17_;
+		Dimensions _tmp18_;
+		gint _tmp19_;
+		cairo_t* _tmp20_;
+		Dimensions _tmp21_;
+		GdkPoint _tmp22_;
+		cairo_t* _tmp23_;
 #line 608 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp15_ = ctx;
 #line 608 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -4069,33 +4111,33 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		_tmp23_ = ctx;
 #line 613 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_restore (_tmp23_);
-#line 4073 "CheckerboardLayout.c"
+#line 4115 "CheckerboardLayout.c"
 	}
 #line 617 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp24_ = self->priv->is_cursor;
 #line 617 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp24_) {
-#line 4079 "CheckerboardLayout.c"
-		cairo_t* _tmp25_ = NULL;
-		cairo_t* _tmp26_ = NULL;
-		GdkRGBA* _tmp27_ = NULL;
-		gdouble _tmp28_ = 0.0;
-		GdkRGBA* _tmp29_ = NULL;
-		gdouble _tmp30_ = 0.0;
-		GdkRGBA* _tmp31_ = NULL;
-		gdouble _tmp32_ = 0.0;
-		GdkRGBA* _tmp33_ = NULL;
-		gdouble _tmp34_ = 0.0;
-		cairo_t* _tmp35_ = NULL;
-		Dimensions _tmp36_ = {0};
-		GdkPoint _tmp37_ = {0};
-		Dimensions _tmp38_ = {0};
-		gint _tmp39_ = 0;
-		Dimensions _tmp40_ = {0};
-		gint _tmp41_ = 0;
-		gint _tmp42_ = 0;
-		gint _tmp43_ = 0;
-		cairo_t* _tmp44_ = NULL;
+#line 4121 "CheckerboardLayout.c"
+		cairo_t* _tmp25_;
+		cairo_t* _tmp26_;
+		GdkRGBA* _tmp27_;
+		gdouble _tmp28_;
+		GdkRGBA* _tmp29_;
+		gdouble _tmp30_;
+		GdkRGBA* _tmp31_;
+		gdouble _tmp32_;
+		GdkRGBA* _tmp33_;
+		gdouble _tmp34_;
+		cairo_t* _tmp35_;
+		Dimensions _tmp36_;
+		GdkPoint _tmp37_;
+		Dimensions _tmp38_;
+		gint _tmp39_;
+		Dimensions _tmp40_;
+		gint _tmp41_;
+		gint _tmp42_;
+		gint _tmp43_;
+		cairo_t* _tmp44_;
 #line 618 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp25_ = ctx;
 #line 618 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -4144,24 +4186,24 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		_tmp44_ = ctx;
 #line 623 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_restore (_tmp44_);
-#line 4148 "CheckerboardLayout.c"
+#line 4190 "CheckerboardLayout.c"
 	}
 #line 627 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp45_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
 #line 627 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp45_) {
-#line 4154 "CheckerboardLayout.c"
-		cairo_t* _tmp46_ = NULL;
-		cairo_t* _tmp47_ = NULL;
-		Dimensions _tmp48_ = {0};
-		GdkPoint _tmp49_ = {0};
-		Dimensions _tmp50_ = {0};
-		gint _tmp51_ = 0;
-		Dimensions _tmp52_ = {0};
-		gint _tmp53_ = 0;
-		gint _tmp54_ = 0;
-		gint _tmp55_ = 0;
-		cairo_t* _tmp56_ = NULL;
+#line 4196 "CheckerboardLayout.c"
+		cairo_t* _tmp46_;
+		cairo_t* _tmp47_;
+		Dimensions _tmp48_;
+		GdkPoint _tmp49_;
+		Dimensions _tmp50_;
+		gint _tmp51_;
+		Dimensions _tmp52_;
+		gint _tmp53_;
+		gint _tmp54_;
+		gint _tmp55_;
+		cairo_t* _tmp56_;
 #line 629 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp46_ = ctx;
 #line 629 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -4190,27 +4232,27 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		_tmp56_ = ctx;
 #line 632 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_restore (_tmp56_);
-#line 4194 "CheckerboardLayout.c"
+#line 4236 "CheckerboardLayout.c"
 	}
 #line 636 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp57_ = border_color;
 #line 636 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp57_ != NULL) {
-#line 4200 "CheckerboardLayout.c"
-		cairo_t* _tmp58_ = NULL;
-		cairo_t* _tmp59_ = NULL;
-		GdkRGBA* _tmp60_ = NULL;
-		gdouble _tmp61_ = 0.0;
-		GdkRGBA* _tmp62_ = NULL;
-		gdouble _tmp63_ = 0.0;
-		GdkRGBA* _tmp64_ = NULL;
-		gdouble _tmp65_ = 0.0;
-		GdkRGBA* _tmp66_ = NULL;
-		gdouble _tmp67_ = 0.0;
-		cairo_t* _tmp68_ = NULL;
-		Dimensions _tmp69_ = {0};
-		GdkPoint _tmp70_ = {0};
-		cairo_t* _tmp71_ = NULL;
+#line 4242 "CheckerboardLayout.c"
+		cairo_t* _tmp58_;
+		cairo_t* _tmp59_;
+		GdkRGBA* _tmp60_;
+		gdouble _tmp61_;
+		GdkRGBA* _tmp62_;
+		gdouble _tmp63_;
+		GdkRGBA* _tmp64_;
+		gdouble _tmp65_;
+		GdkRGBA* _tmp66_;
+		gdouble _tmp67_;
+		cairo_t* _tmp68_;
+		Dimensions _tmp69_;
+		GdkPoint _tmp70_;
+		cairo_t* _tmp71_;
 #line 637 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp58_ = ctx;
 #line 637 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -4247,27 +4289,27 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		_tmp71_ = ctx;
 #line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_restore (_tmp71_);
-#line 4251 "CheckerboardLayout.c"
+#line 4293 "CheckerboardLayout.c"
 	}
 #line 644 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp72_ = self->priv->display_pixbuf;
 #line 644 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp72_ != NULL) {
-#line 4257 "CheckerboardLayout.c"
-		cairo_t* _tmp73_ = NULL;
-		cairo_t* _tmp74_ = NULL;
-		GdkRGBA _tmp75_ = {0};
-		gdouble _tmp76_ = 0.0;
-		GdkRGBA _tmp77_ = {0};
-		gdouble _tmp78_ = 0.0;
-		GdkRGBA _tmp79_ = {0};
-		gdouble _tmp80_ = 0.0;
-		GdkRGBA _tmp81_ = {0};
-		gdouble _tmp82_ = 0.0;
-		cairo_t* _tmp83_ = NULL;
-		GdkPixbuf* _tmp84_ = NULL;
-		GdkPoint _tmp85_ = {0};
-		cairo_t* _tmp86_ = NULL;
+#line 4299 "CheckerboardLayout.c"
+		cairo_t* _tmp73_;
+		cairo_t* _tmp74_;
+		GdkRGBA _tmp75_;
+		gdouble _tmp76_;
+		GdkRGBA _tmp77_;
+		gdouble _tmp78_;
+		GdkRGBA _tmp79_;
+		gdouble _tmp80_;
+		GdkRGBA _tmp81_;
+		gdouble _tmp82_;
+		cairo_t* _tmp83_;
+		GdkPixbuf* _tmp84_;
+		GdkPoint _tmp85_;
+		cairo_t* _tmp86_;
 #line 645 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp73_ = ctx;
 #line 645 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -4304,7 +4346,7 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		_tmp86_ = ctx;
 #line 648 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_restore (_tmp86_);
-#line 4308 "CheckerboardLayout.c"
+#line 4350 "CheckerboardLayout.c"
 	}
 #line 651 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp87_ = ctx;
@@ -4340,48 +4382,48 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 	_tmp101_ = self->priv->title;
 #line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp101_ != NULL) {
-#line 4344 "CheckerboardLayout.c"
-		gboolean _tmp102_ = FALSE;
+#line 4386 "CheckerboardLayout.c"
+		gboolean _tmp102_;
 #line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp102_ = self->priv->title_visible;
 #line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp100_ = _tmp102_;
-#line 4350 "CheckerboardLayout.c"
+#line 4392 "CheckerboardLayout.c"
 	} else {
 #line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp100_ = FALSE;
-#line 4354 "CheckerboardLayout.c"
+#line 4396 "CheckerboardLayout.c"
 	}
 #line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp100_) {
-#line 4358 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp103_ = NULL;
-		GdkRectangle _tmp104_ = {0};
-		gint _tmp105_ = 0;
-		CheckerboardItemText* _tmp106_ = NULL;
-		gint _tmp107_ = 0;
-		CheckerboardItemText* _tmp108_ = NULL;
-		Dimensions _tmp109_ = {0};
-		gint _tmp110_ = 0;
-		CheckerboardItemText* _tmp111_ = NULL;
-		CheckerboardItemText* _tmp112_ = NULL;
-		gint _tmp113_ = 0;
-		cairo_t* _tmp114_ = NULL;
-		CheckerboardItemText* _tmp115_ = NULL;
-		GdkRectangle _tmp116_ = {0};
-		gint _tmp117_ = 0;
-		CheckerboardItemText* _tmp118_ = NULL;
-		GdkRectangle _tmp119_ = {0};
-		gint _tmp120_ = 0;
-		cairo_t* _tmp121_ = NULL;
-		CheckerboardItemText* _tmp122_ = NULL;
-		Dimensions _tmp123_ = {0};
-		gint _tmp124_ = 0;
-		PangoLayout* _tmp125_ = NULL;
-		PangoLayout* _tmp126_ = NULL;
-		gint _tmp127_ = 0;
-		CheckerboardItemText* _tmp128_ = NULL;
-		gint _tmp129_ = 0;
+#line 4400 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp103_;
+		GdkRectangle _tmp104_;
+		gint _tmp105_;
+		CheckerboardItemText* _tmp106_;
+		gint _tmp107_;
+		CheckerboardItemText* _tmp108_;
+		Dimensions _tmp109_;
+		gint _tmp110_;
+		CheckerboardItemText* _tmp111_;
+		CheckerboardItemText* _tmp112_;
+		gint _tmp113_;
+		cairo_t* _tmp114_;
+		CheckerboardItemText* _tmp115_;
+		GdkRectangle _tmp116_;
+		gint _tmp117_;
+		CheckerboardItemText* _tmp118_;
+		GdkRectangle _tmp119_;
+		gint _tmp120_;
+		cairo_t* _tmp121_;
+		CheckerboardItemText* _tmp122_;
+		Dimensions _tmp123_;
+		gint _tmp124_;
+		PangoLayout* _tmp125_;
+		PangoLayout* _tmp126_;
+		gint _tmp127_;
+		CheckerboardItemText* _tmp128_;
+		gint _tmp129_;
 #line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp103_ = self->priv->title;
 #line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -4452,54 +4494,54 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		_tmp129_ = checkerboard_item_text_get_height (_tmp128_);
 #line 666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		text_y = _tmp127_ + (_tmp129_ + CHECKERBOARD_ITEM_LABEL_PADDING);
-#line 4456 "CheckerboardLayout.c"
+#line 4498 "CheckerboardLayout.c"
 	}
 #line 669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp131_ = self->priv->comment;
 #line 669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp131_ != NULL) {
-#line 4462 "CheckerboardLayout.c"
-		gboolean _tmp132_ = FALSE;
+#line 4504 "CheckerboardLayout.c"
+		gboolean _tmp132_;
 #line 669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp132_ = self->priv->comment_visible;
 #line 669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp130_ = _tmp132_;
-#line 4468 "CheckerboardLayout.c"
+#line 4510 "CheckerboardLayout.c"
 	} else {
 #line 669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp130_ = FALSE;
-#line 4472 "CheckerboardLayout.c"
+#line 4514 "CheckerboardLayout.c"
 	}
 #line 669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp130_) {
-#line 4476 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp133_ = NULL;
-		GdkRectangle _tmp134_ = {0};
-		gint _tmp135_ = 0;
-		CheckerboardItemText* _tmp136_ = NULL;
-		gint _tmp137_ = 0;
-		CheckerboardItemText* _tmp138_ = NULL;
-		Dimensions _tmp139_ = {0};
-		gint _tmp140_ = 0;
-		CheckerboardItemText* _tmp141_ = NULL;
-		CheckerboardItemText* _tmp142_ = NULL;
-		gint _tmp143_ = 0;
-		cairo_t* _tmp144_ = NULL;
-		CheckerboardItemText* _tmp145_ = NULL;
-		GdkRectangle _tmp146_ = {0};
-		gint _tmp147_ = 0;
-		CheckerboardItemText* _tmp148_ = NULL;
-		GdkRectangle _tmp149_ = {0};
-		gint _tmp150_ = 0;
-		cairo_t* _tmp151_ = NULL;
-		CheckerboardItemText* _tmp152_ = NULL;
-		Dimensions _tmp153_ = {0};
-		gint _tmp154_ = 0;
-		PangoLayout* _tmp155_ = NULL;
-		PangoLayout* _tmp156_ = NULL;
-		gint _tmp157_ = 0;
-		CheckerboardItemText* _tmp158_ = NULL;
-		gint _tmp159_ = 0;
+#line 4518 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp133_;
+		GdkRectangle _tmp134_;
+		gint _tmp135_;
+		CheckerboardItemText* _tmp136_;
+		gint _tmp137_;
+		CheckerboardItemText* _tmp138_;
+		Dimensions _tmp139_;
+		gint _tmp140_;
+		CheckerboardItemText* _tmp141_;
+		CheckerboardItemText* _tmp142_;
+		gint _tmp143_;
+		cairo_t* _tmp144_;
+		CheckerboardItemText* _tmp145_;
+		GdkRectangle _tmp146_;
+		gint _tmp147_;
+		CheckerboardItemText* _tmp148_;
+		GdkRectangle _tmp149_;
+		gint _tmp150_;
+		cairo_t* _tmp151_;
+		CheckerboardItemText* _tmp152_;
+		Dimensions _tmp153_;
+		gint _tmp154_;
+		PangoLayout* _tmp155_;
+		PangoLayout* _tmp156_;
+		gint _tmp157_;
+		CheckerboardItemText* _tmp158_;
+		gint _tmp159_;
 #line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp133_ = self->priv->comment;
 #line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -4570,51 +4612,51 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		_tmp159_ = checkerboard_item_text_get_height (_tmp158_);
 #line 678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		text_y = _tmp157_ + (_tmp159_ + CHECKERBOARD_ITEM_LABEL_PADDING);
-#line 4574 "CheckerboardLayout.c"
+#line 4616 "CheckerboardLayout.c"
 	}
 #line 681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp161_ = self->priv->subtitle;
 #line 681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp161_ != NULL) {
-#line 4580 "CheckerboardLayout.c"
-		gboolean _tmp162_ = FALSE;
+#line 4622 "CheckerboardLayout.c"
+		gboolean _tmp162_;
 #line 681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp162_ = self->priv->subtitle_visible;
 #line 681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp160_ = _tmp162_;
-#line 4586 "CheckerboardLayout.c"
+#line 4628 "CheckerboardLayout.c"
 	} else {
 #line 681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp160_ = FALSE;
-#line 4590 "CheckerboardLayout.c"
+#line 4632 "CheckerboardLayout.c"
 	}
 #line 681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp160_) {
-#line 4594 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp163_ = NULL;
-		GdkRectangle _tmp164_ = {0};
-		gint _tmp165_ = 0;
-		CheckerboardItemText* _tmp166_ = NULL;
-		gint _tmp167_ = 0;
-		CheckerboardItemText* _tmp168_ = NULL;
-		Dimensions _tmp169_ = {0};
-		gint _tmp170_ = 0;
-		CheckerboardItemText* _tmp171_ = NULL;
-		CheckerboardItemText* _tmp172_ = NULL;
-		gint _tmp173_ = 0;
-		cairo_t* _tmp174_ = NULL;
-		CheckerboardItemText* _tmp175_ = NULL;
-		GdkRectangle _tmp176_ = {0};
-		gint _tmp177_ = 0;
-		CheckerboardItemText* _tmp178_ = NULL;
-		GdkRectangle _tmp179_ = {0};
-		gint _tmp180_ = 0;
-		cairo_t* _tmp181_ = NULL;
-		CheckerboardItemText* _tmp182_ = NULL;
-		Dimensions _tmp183_ = {0};
-		gint _tmp184_ = 0;
-		PangoLayout* _tmp185_ = NULL;
-		PangoLayout* _tmp186_ = NULL;
+#line 4636 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp163_;
+		GdkRectangle _tmp164_;
+		gint _tmp165_;
+		CheckerboardItemText* _tmp166_;
+		gint _tmp167_;
+		CheckerboardItemText* _tmp168_;
+		Dimensions _tmp169_;
+		gint _tmp170_;
+		CheckerboardItemText* _tmp171_;
+		CheckerboardItemText* _tmp172_;
+		gint _tmp173_;
+		cairo_t* _tmp174_;
+		CheckerboardItemText* _tmp175_;
+		GdkRectangle _tmp176_;
+		gint _tmp177_;
+		CheckerboardItemText* _tmp178_;
+		GdkRectangle _tmp179_;
+		gint _tmp180_;
+		cairo_t* _tmp181_;
+		CheckerboardItemText* _tmp182_;
+		Dimensions _tmp183_;
+		gint _tmp184_;
+		PangoLayout* _tmp185_;
+		PangoLayout* _tmp186_;
 #line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp163_ = self->priv->subtitle;
 #line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -4677,7 +4719,7 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		pango_cairo_show_layout (_tmp181_, _tmp186_);
 #line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (_tmp186_);
-#line 4681 "CheckerboardLayout.c"
+#line 4723 "CheckerboardLayout.c"
 	}
 #line 693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp187_ = ctx;
@@ -4707,30 +4749,30 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 	_tmp197_ = trinket;
 #line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp197_ != NULL) {
-#line 4711 "CheckerboardLayout.c"
+#line 4753 "CheckerboardLayout.c"
 		gint x = 0;
-		GdkPoint _tmp198_ = {0};
-		gint _tmp199_ = 0;
-		gint _tmp200_ = 0;
+		GdkPoint _tmp198_;
+		gint _tmp199_;
+		gint _tmp200_;
 		gint y = 0;
-		GdkPoint _tmp201_ = {0};
-		gint _tmp202_ = 0;
-		Dimensions _tmp203_ = {0};
-		gint _tmp204_ = 0;
-		GdkPixbuf* _tmp205_ = NULL;
-		gint _tmp206_ = 0;
-		cairo_t* _tmp207_ = NULL;
-		GdkPixbuf* _tmp208_ = NULL;
-		gint _tmp209_ = 0;
-		gint _tmp210_ = 0;
-		cairo_t* _tmp211_ = NULL;
-		gint _tmp212_ = 0;
-		gint _tmp213_ = 0;
-		GdkPixbuf* _tmp214_ = NULL;
-		gint _tmp215_ = 0;
-		GdkPixbuf* _tmp216_ = NULL;
-		gint _tmp217_ = 0;
-		cairo_t* _tmp218_ = NULL;
+		GdkPoint _tmp201_;
+		gint _tmp202_;
+		Dimensions _tmp203_;
+		gint _tmp204_;
+		GdkPixbuf* _tmp205_;
+		gint _tmp206_;
+		cairo_t* _tmp207_;
+		GdkPixbuf* _tmp208_;
+		gint _tmp209_;
+		gint _tmp210_;
+		cairo_t* _tmp211_;
+		gint _tmp212_;
+		gint _tmp213_;
+		GdkPixbuf* _tmp214_;
+		gint _tmp215_;
+		GdkPixbuf* _tmp216_;
+		gint _tmp217_;
+		cairo_t* _tmp218_;
 #line 699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp198_ = pixbuf_origin;
 #line 699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -4783,7 +4825,7 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		_tmp218_ = ctx;
 #line 704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_fill (_tmp218_);
-#line 4787 "CheckerboardLayout.c"
+#line 4829 "CheckerboardLayout.c"
 	}
 #line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp219_ = checkerboard_item_get_top_left_trinket (self, CHECKERBOARD_ITEM_TRINKET_SCALE);
@@ -4795,26 +4837,26 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 	_tmp220_ = trinket;
 #line 708 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp220_ != NULL) {
-#line 4799 "CheckerboardLayout.c"
+#line 4841 "CheckerboardLayout.c"
 		gint x = 0;
-		GdkPoint _tmp221_ = {0};
-		gint _tmp222_ = 0;
-		gint _tmp223_ = 0;
+		GdkPoint _tmp221_;
+		gint _tmp222_;
+		gint _tmp223_;
 		gint y = 0;
-		GdkPoint _tmp224_ = {0};
-		gint _tmp225_ = 0;
-		cairo_t* _tmp226_ = NULL;
-		GdkPixbuf* _tmp227_ = NULL;
-		gint _tmp228_ = 0;
-		gint _tmp229_ = 0;
-		cairo_t* _tmp230_ = NULL;
-		gint _tmp231_ = 0;
-		gint _tmp232_ = 0;
-		GdkPixbuf* _tmp233_ = NULL;
-		gint _tmp234_ = 0;
-		GdkPixbuf* _tmp235_ = NULL;
-		gint _tmp236_ = 0;
-		cairo_t* _tmp237_ = NULL;
+		GdkPoint _tmp224_;
+		gint _tmp225_;
+		cairo_t* _tmp226_;
+		GdkPixbuf* _tmp227_;
+		gint _tmp228_;
+		gint _tmp229_;
+		cairo_t* _tmp230_;
+		gint _tmp231_;
+		gint _tmp232_;
+		GdkPixbuf* _tmp233_;
+		gint _tmp234_;
+		GdkPixbuf* _tmp235_;
+		gint _tmp236_;
+		cairo_t* _tmp237_;
 #line 709 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp221_ = pixbuf_origin;
 #line 709 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -4859,7 +4901,7 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		_tmp237_ = ctx;
 #line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_fill (_tmp237_);
-#line 4863 "CheckerboardLayout.c"
+#line 4905 "CheckerboardLayout.c"
 	}
 #line 716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp238_ = checkerboard_item_get_top_right_trinket (self, CHECKERBOARD_ITEM_TRINKET_SCALE);
@@ -4871,31 +4913,31 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 	_tmp239_ = trinket;
 #line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp239_ != NULL) {
-#line 4875 "CheckerboardLayout.c"
+#line 4917 "CheckerboardLayout.c"
 		gint x = 0;
-		GdkPoint _tmp240_ = {0};
-		gint _tmp241_ = 0;
-		Dimensions _tmp242_ = {0};
-		gint _tmp243_ = 0;
-		GdkPixbuf* _tmp244_ = NULL;
-		gint _tmp245_ = 0;
-		gint _tmp246_ = 0;
-		gint _tmp247_ = 0;
+		GdkPoint _tmp240_;
+		gint _tmp241_;
+		Dimensions _tmp242_;
+		gint _tmp243_;
+		GdkPixbuf* _tmp244_;
+		gint _tmp245_;
+		gint _tmp246_;
+		gint _tmp247_;
 		gint y = 0;
-		GdkPoint _tmp248_ = {0};
-		gint _tmp249_ = 0;
-		cairo_t* _tmp250_ = NULL;
-		GdkPixbuf* _tmp251_ = NULL;
-		gint _tmp252_ = 0;
-		gint _tmp253_ = 0;
-		cairo_t* _tmp254_ = NULL;
-		gint _tmp255_ = 0;
-		gint _tmp256_ = 0;
-		GdkPixbuf* _tmp257_ = NULL;
-		gint _tmp258_ = 0;
-		GdkPixbuf* _tmp259_ = NULL;
-		gint _tmp260_ = 0;
-		cairo_t* _tmp261_ = NULL;
+		GdkPoint _tmp248_;
+		gint _tmp249_;
+		cairo_t* _tmp250_;
+		GdkPixbuf* _tmp251_;
+		gint _tmp252_;
+		gint _tmp253_;
+		cairo_t* _tmp254_;
+		gint _tmp255_;
+		gint _tmp256_;
+		GdkPixbuf* _tmp257_;
+		gint _tmp258_;
+		GdkPixbuf* _tmp259_;
+		gint _tmp260_;
+		cairo_t* _tmp261_;
 #line 718 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp240_ = pixbuf_origin;
 #line 718 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -4950,7 +4992,7 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		_tmp261_ = ctx;
 #line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_fill (_tmp261_);
-#line 4954 "CheckerboardLayout.c"
+#line 4996 "CheckerboardLayout.c"
 	}
 #line 726 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp262_ = checkerboard_item_get_bottom_right_trinket (self, CHECKERBOARD_ITEM_TRINKET_SCALE);
@@ -4962,36 +5004,36 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 	_tmp263_ = trinket;
 #line 727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp263_ != NULL) {
-#line 4966 "CheckerboardLayout.c"
+#line 5008 "CheckerboardLayout.c"
 		gint x = 0;
-		GdkPoint _tmp264_ = {0};
-		gint _tmp265_ = 0;
-		Dimensions _tmp266_ = {0};
-		gint _tmp267_ = 0;
-		GdkPixbuf* _tmp268_ = NULL;
-		gint _tmp269_ = 0;
-		gint _tmp270_ = 0;
-		gint _tmp271_ = 0;
+		GdkPoint _tmp264_;
+		gint _tmp265_;
+		Dimensions _tmp266_;
+		gint _tmp267_;
+		GdkPixbuf* _tmp268_;
+		gint _tmp269_;
+		gint _tmp270_;
+		gint _tmp271_;
 		gint y = 0;
-		GdkPoint _tmp272_ = {0};
-		gint _tmp273_ = 0;
-		Dimensions _tmp274_ = {0};
-		gint _tmp275_ = 0;
-		GdkPixbuf* _tmp276_ = NULL;
-		gint _tmp277_ = 0;
-		gint _tmp278_ = 0;
-		cairo_t* _tmp279_ = NULL;
-		GdkPixbuf* _tmp280_ = NULL;
-		gint _tmp281_ = 0;
-		gint _tmp282_ = 0;
-		cairo_t* _tmp283_ = NULL;
-		gint _tmp284_ = 0;
-		gint _tmp285_ = 0;
-		GdkPixbuf* _tmp286_ = NULL;
-		gint _tmp287_ = 0;
-		GdkPixbuf* _tmp288_ = NULL;
-		gint _tmp289_ = 0;
-		cairo_t* _tmp290_ = NULL;
+		GdkPoint _tmp272_;
+		gint _tmp273_;
+		Dimensions _tmp274_;
+		gint _tmp275_;
+		GdkPixbuf* _tmp276_;
+		gint _tmp277_;
+		gint _tmp278_;
+		cairo_t* _tmp279_;
+		GdkPixbuf* _tmp280_;
+		gint _tmp281_;
+		gint _tmp282_;
+		cairo_t* _tmp283_;
+		gint _tmp284_;
+		gint _tmp285_;
+		GdkPixbuf* _tmp286_;
+		gint _tmp287_;
+		GdkPixbuf* _tmp288_;
+		gint _tmp289_;
+		cairo_t* _tmp290_;
 #line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp264_ = pixbuf_origin;
 #line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5056,17 +5098,17 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		_tmp290_ = ctx;
 #line 734 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_fill (_tmp290_);
-#line 5060 "CheckerboardLayout.c"
+#line 5102 "CheckerboardLayout.c"
 	}
 #line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (trinket);
-#line 5064 "CheckerboardLayout.c"
+#line 5106 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_set_horizontal_trinket_offset (CheckerboardItem* self, gint horizontal_trinket_offset) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 738 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 739 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5077,13 +5119,13 @@ void checkerboard_item_set_horizontal_trinket_offset (CheckerboardItem* self, gi
 	_tmp1_ = horizontal_trinket_offset;
 #line 740 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->horizontal_trinket_offset = _tmp1_;
-#line 5081 "CheckerboardLayout.c"
+#line 5123 "CheckerboardLayout.c"
 }
 
 
 gint checkerboard_item_get_horizontal_trinket_offset (CheckerboardItem* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 743 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), 0);
 #line 744 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5092,13 +5134,13 @@ gint checkerboard_item_get_horizontal_trinket_offset (CheckerboardItem* self) {
 	result = _tmp0_;
 #line 744 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 5096 "CheckerboardLayout.c"
+#line 5138 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_set_grid_coordinates (CheckerboardItem* self, gint col, gint row) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 747 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 748 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5109,13 +5151,13 @@ void checkerboard_item_set_grid_coordinates (CheckerboardItem* self, gint col, g
 	_tmp1_ = row;
 #line 749 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->row = _tmp1_;
-#line 5113 "CheckerboardLayout.c"
+#line 5155 "CheckerboardLayout.c"
 }
 
 
 gint checkerboard_item_get_column (CheckerboardItem* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 752 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), 0);
 #line 753 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5124,13 +5166,13 @@ gint checkerboard_item_get_column (CheckerboardItem* self) {
 	result = _tmp0_;
 #line 753 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 5128 "CheckerboardLayout.c"
+#line 5170 "CheckerboardLayout.c"
 }
 
 
 gint checkerboard_item_get_row (CheckerboardItem* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 756 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), 0);
 #line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5139,18 +5181,18 @@ gint checkerboard_item_get_row (CheckerboardItem* self) {
 	result = _tmp0_;
 #line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 5143 "CheckerboardLayout.c"
+#line 5185 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_brighten (CheckerboardItem* self) {
 	gboolean _tmp0_ = FALSE;
-	GdkPixbuf* _tmp1_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
-	GdkPixbuf* _tmp7_ = NULL;
+	GdkPixbuf* _tmp1_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	GdkPixbuf* _tmp6_;
+	GdkPixbuf* _tmp7_;
 #line 760 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 762 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5159,20 +5201,20 @@ void checkerboard_item_brighten (CheckerboardItem* self) {
 	if (_tmp1_ != NULL) {
 #line 762 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = TRUE;
-#line 5163 "CheckerboardLayout.c"
+#line 5205 "CheckerboardLayout.c"
 	} else {
-		GdkPixbuf* _tmp2_ = NULL;
+		GdkPixbuf* _tmp2_;
 #line 762 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->pixbuf;
 #line 762 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 5170 "CheckerboardLayout.c"
+#line 5212 "CheckerboardLayout.c"
 	}
 #line 762 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
 #line 763 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 5176 "CheckerboardLayout.c"
+#line 5218 "CheckerboardLayout.c"
 	}
 #line 766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = self->priv->pixbuf;
@@ -5196,15 +5238,15 @@ void checkerboard_item_brighten (CheckerboardItem* self) {
 	self->priv->display_pixbuf = _tmp7_;
 #line 771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 5200 "CheckerboardLayout.c"
+#line 5242 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_unbrighten (CheckerboardItem* self) {
 	gboolean _tmp0_ = FALSE;
-	GdkPixbuf* _tmp1_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
+	GdkPixbuf* _tmp1_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
 #line 774 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 776 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5213,20 +5255,20 @@ void checkerboard_item_unbrighten (CheckerboardItem* self) {
 	if (_tmp1_ == NULL) {
 #line 776 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = TRUE;
-#line 5217 "CheckerboardLayout.c"
+#line 5259 "CheckerboardLayout.c"
 	} else {
-		GdkPixbuf* _tmp2_ = NULL;
+		GdkPixbuf* _tmp2_;
 #line 776 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->pixbuf;
 #line 776 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 5224 "CheckerboardLayout.c"
+#line 5266 "CheckerboardLayout.c"
 	}
 #line 776 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
 #line 777 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 5230 "CheckerboardLayout.c"
+#line 5272 "CheckerboardLayout.c"
 	}
 #line 779 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->brightened);
@@ -5242,14 +5284,14 @@ void checkerboard_item_unbrighten (CheckerboardItem* self) {
 	self->priv->display_pixbuf = _tmp4_;
 #line 784 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 5246 "CheckerboardLayout.c"
+#line 5288 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_item_real_visibility_changed (DataView* base, gboolean visible) {
 	CheckerboardItem * self;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
 #line 787 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
 #line 789 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5258,25 +5300,25 @@ static void checkerboard_item_real_visibility_changed (DataView* base, gboolean
 	if (!_tmp0_) {
 #line 790 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_unbrighten (self);
-#line 5262 "CheckerboardLayout.c"
+#line 5304 "CheckerboardLayout.c"
 	}
 #line 792 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = visible;
 #line 792 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	DATA_VIEW_CLASS (checkerboard_item_parent_class)->visibility_changed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_VIEW, ThumbnailView), TYPE_DATA_VIEW, DataView), _tmp1_);
-#line 5268 "CheckerboardLayout.c"
+#line 5310 "CheckerboardLayout.c"
 }
 
 
 static gboolean checkerboard_item_query_tooltip_on_text (CheckerboardItem* self, CheckerboardItemText* text, GtkTooltip* tooltip) {
 	gboolean result = FALSE;
-	CheckerboardItemText* _tmp0_ = NULL;
-	PangoLayout* _tmp1_ = NULL;
-	PangoLayout* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	CheckerboardItemText* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	CheckerboardItemText* _tmp0_;
+	PangoLayout* _tmp1_;
+	PangoLayout* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	CheckerboardItemText* _tmp5_;
+	gboolean _tmp6_;
 #line 795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), FALSE);
 #line 795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5301,7 +5343,7 @@ static gboolean checkerboard_item_query_tooltip_on_text (CheckerboardItem* self,
 		result = FALSE;
 #line 797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 5305 "CheckerboardLayout.c"
+#line 5347 "CheckerboardLayout.c"
 	}
 #line 799 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = text;
@@ -5309,11 +5351,11 @@ static gboolean checkerboard_item_query_tooltip_on_text (CheckerboardItem* self,
 	_tmp6_ = checkerboard_item_text_is_marked_up (_tmp5_);
 #line 799 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp6_) {
-#line 5313 "CheckerboardLayout.c"
-		GtkTooltip* _tmp7_ = NULL;
-		CheckerboardItemText* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
+#line 5355 "CheckerboardLayout.c"
+		GtkTooltip* _tmp7_;
+		CheckerboardItemText* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
 #line 800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = tooltip;
 #line 800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5326,12 +5368,12 @@ static gboolean checkerboard_item_query_tooltip_on_text (CheckerboardItem* self,
 		gtk_tooltip_set_markup (_tmp7_, _tmp10_);
 #line 800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_free0 (_tmp10_);
-#line 5330 "CheckerboardLayout.c"
+#line 5372 "CheckerboardLayout.c"
 	} else {
-		GtkTooltip* _tmp11_ = NULL;
-		CheckerboardItemText* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
+		GtkTooltip* _tmp11_;
+		CheckerboardItemText* _tmp12_;
+		gchar* _tmp13_;
+		gchar* _tmp14_;
 #line 802 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp11_ = tooltip;
 #line 802 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5344,13 +5386,13 @@ static gboolean checkerboard_item_query_tooltip_on_text (CheckerboardItem* self,
 		gtk_tooltip_set_text (_tmp11_, _tmp14_);
 #line 802 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_free0 (_tmp14_);
-#line 5348 "CheckerboardLayout.c"
+#line 5390 "CheckerboardLayout.c"
 	}
 #line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = TRUE;
 #line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 5354 "CheckerboardLayout.c"
+#line 5396 "CheckerboardLayout.c"
 }
 
 
@@ -5358,13 +5400,13 @@ gboolean checkerboard_item_query_tooltip (CheckerboardItem* self, gint x, gint y
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	CheckerboardItemText* _tmp2_ = NULL;
+	CheckerboardItemText* _tmp2_;
 	gboolean _tmp12_ = FALSE;
 	gboolean _tmp13_ = FALSE;
-	CheckerboardItemText* _tmp14_ = NULL;
+	CheckerboardItemText* _tmp14_;
 	gboolean _tmp24_ = FALSE;
 	gboolean _tmp25_ = FALSE;
-	CheckerboardItemText* _tmp26_ = NULL;
+	CheckerboardItemText* _tmp26_;
 #line 807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), FALSE);
 #line 807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5373,26 +5415,26 @@ gboolean checkerboard_item_query_tooltip (CheckerboardItem* self, gint x, gint y
 	_tmp2_ = self->priv->title;
 #line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp2_ != NULL) {
-#line 5377 "CheckerboardLayout.c"
-		gboolean _tmp3_ = FALSE;
+#line 5419 "CheckerboardLayout.c"
+		gboolean _tmp3_;
 #line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = self->priv->title_visible;
 #line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp1_ = _tmp3_;
-#line 5383 "CheckerboardLayout.c"
+#line 5425 "CheckerboardLayout.c"
 	} else {
 #line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp1_ = FALSE;
-#line 5387 "CheckerboardLayout.c"
+#line 5429 "CheckerboardLayout.c"
 	}
 #line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_) {
-#line 5391 "CheckerboardLayout.c"
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
-		CheckerboardItemText* _tmp6_ = NULL;
-		GdkRectangle _tmp7_ = {0};
-		gboolean _tmp8_ = FALSE;
+#line 5433 "CheckerboardLayout.c"
+		gint _tmp4_;
+		gint _tmp5_;
+		CheckerboardItemText* _tmp6_;
+		GdkRectangle _tmp7_;
+		gboolean _tmp8_;
 #line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = x;
 #line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5405,18 +5447,18 @@ gboolean checkerboard_item_query_tooltip (CheckerboardItem* self, gint x, gint y
 		_tmp8_ = coord_in_rectangle (_tmp4_, _tmp5_, &_tmp7_);
 #line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp8_;
-#line 5409 "CheckerboardLayout.c"
+#line 5451 "CheckerboardLayout.c"
 	} else {
 #line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = FALSE;
-#line 5413 "CheckerboardLayout.c"
+#line 5455 "CheckerboardLayout.c"
 	}
 #line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
-#line 5417 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp9_ = NULL;
-		GtkTooltip* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
+#line 5459 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp9_;
+		GtkTooltip* _tmp10_;
+		gboolean _tmp11_;
 #line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp9_ = self->priv->title;
 #line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5427,32 +5469,32 @@ gboolean checkerboard_item_query_tooltip (CheckerboardItem* self, gint x, gint y
 		result = _tmp11_;
 #line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 5431 "CheckerboardLayout.c"
+#line 5473 "CheckerboardLayout.c"
 	}
 #line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp14_ = self->priv->comment;
 #line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp14_ != NULL) {
-#line 5437 "CheckerboardLayout.c"
-		gboolean _tmp15_ = FALSE;
+#line 5479 "CheckerboardLayout.c"
+		gboolean _tmp15_;
 #line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp15_ = self->priv->comment_visible;
 #line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = _tmp15_;
-#line 5443 "CheckerboardLayout.c"
+#line 5485 "CheckerboardLayout.c"
 	} else {
 #line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = FALSE;
-#line 5447 "CheckerboardLayout.c"
+#line 5489 "CheckerboardLayout.c"
 	}
 #line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp13_) {
-#line 5451 "CheckerboardLayout.c"
-		gint _tmp16_ = 0;
-		gint _tmp17_ = 0;
-		CheckerboardItemText* _tmp18_ = NULL;
-		GdkRectangle _tmp19_ = {0};
-		gboolean _tmp20_ = FALSE;
+#line 5493 "CheckerboardLayout.c"
+		gint _tmp16_;
+		gint _tmp17_;
+		CheckerboardItemText* _tmp18_;
+		GdkRectangle _tmp19_;
+		gboolean _tmp20_;
 #line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp16_ = x;
 #line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5465,18 +5507,18 @@ gboolean checkerboard_item_query_tooltip (CheckerboardItem* self, gint x, gint y
 		_tmp20_ = coord_in_rectangle (_tmp16_, _tmp17_, &_tmp19_);
 #line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp12_ = _tmp20_;
-#line 5469 "CheckerboardLayout.c"
+#line 5511 "CheckerboardLayout.c"
 	} else {
 #line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp12_ = FALSE;
-#line 5473 "CheckerboardLayout.c"
+#line 5515 "CheckerboardLayout.c"
 	}
 #line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp12_) {
-#line 5477 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp21_ = NULL;
-		GtkTooltip* _tmp22_ = NULL;
-		gboolean _tmp23_ = FALSE;
+#line 5519 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp21_;
+		GtkTooltip* _tmp22_;
+		gboolean _tmp23_;
 #line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp21_ = self->priv->comment;
 #line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5487,32 +5529,32 @@ gboolean checkerboard_item_query_tooltip (CheckerboardItem* self, gint x, gint y
 		result = _tmp23_;
 #line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 5491 "CheckerboardLayout.c"
+#line 5533 "CheckerboardLayout.c"
 	}
 #line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp26_ = self->priv->subtitle;
 #line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp26_ != NULL) {
-#line 5497 "CheckerboardLayout.c"
-		gboolean _tmp27_ = FALSE;
+#line 5539 "CheckerboardLayout.c"
+		gboolean _tmp27_;
 #line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp27_ = self->priv->subtitle_visible;
 #line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp25_ = _tmp27_;
-#line 5503 "CheckerboardLayout.c"
+#line 5545 "CheckerboardLayout.c"
 	} else {
 #line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp25_ = FALSE;
-#line 5507 "CheckerboardLayout.c"
+#line 5549 "CheckerboardLayout.c"
 	}
 #line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp25_) {
-#line 5511 "CheckerboardLayout.c"
-		gint _tmp28_ = 0;
-		gint _tmp29_ = 0;
-		CheckerboardItemText* _tmp30_ = NULL;
-		GdkRectangle _tmp31_ = {0};
-		gboolean _tmp32_ = FALSE;
+#line 5553 "CheckerboardLayout.c"
+		gint _tmp28_;
+		gint _tmp29_;
+		CheckerboardItemText* _tmp30_;
+		GdkRectangle _tmp31_;
+		gboolean _tmp32_;
 #line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp28_ = x;
 #line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5525,18 +5567,18 @@ gboolean checkerboard_item_query_tooltip (CheckerboardItem* self, gint x, gint y
 		_tmp32_ = coord_in_rectangle (_tmp28_, _tmp29_, &_tmp31_);
 #line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp24_ = _tmp32_;
-#line 5529 "CheckerboardLayout.c"
+#line 5571 "CheckerboardLayout.c"
 	} else {
 #line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp24_ = FALSE;
-#line 5533 "CheckerboardLayout.c"
+#line 5575 "CheckerboardLayout.c"
 	}
 #line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp24_) {
-#line 5537 "CheckerboardLayout.c"
-		CheckerboardItemText* _tmp33_ = NULL;
-		GtkTooltip* _tmp34_ = NULL;
-		gboolean _tmp35_ = FALSE;
+#line 5579 "CheckerboardLayout.c"
+		CheckerboardItemText* _tmp33_;
+		GtkTooltip* _tmp34_;
+		gboolean _tmp35_;
 #line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp33_ = self->priv->subtitle;
 #line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5547,19 +5589,19 @@ gboolean checkerboard_item_query_tooltip (CheckerboardItem* self, gint x, gint y
 		result = _tmp35_;
 #line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 5551 "CheckerboardLayout.c"
+#line 5593 "CheckerboardLayout.c"
 	}
 #line 817 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = FALSE;
 #line 817 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 5557 "CheckerboardLayout.c"
+#line 5599 "CheckerboardLayout.c"
 }
 
 
 gboolean checkerboard_item_get_has_tags (CheckerboardItem* self) {
 	gboolean result;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), FALSE);
 #line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5568,21 +5610,25 @@ gboolean checkerboard_item_get_has_tags (CheckerboardItem* self) {
 	result = _tmp0_;
 #line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 5572 "CheckerboardLayout.c"
+#line 5614 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_item_set_has_tags (CheckerboardItem* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
 #line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp0_ = value;
+	if (checkerboard_item_get_has_tags (self) != value) {
+#line 5623 "CheckerboardLayout.c"
+		gboolean _tmp0_;
+#line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+		_tmp0_ = value;
 #line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	self->priv->_has_tags = _tmp0_;
+		self->priv->_has_tags = _tmp0_;
 #line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	g_object_notify ((GObject *) self, "has-tags");
-#line 5586 "CheckerboardLayout.c"
+		g_object_notify ((GObject *) self, "has-tags");
+#line 5631 "CheckerboardLayout.c"
+	}
 }
 
 
@@ -5592,33 +5638,33 @@ static void checkerboard_item_class_init (CheckerboardItemClass * klass) {
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_type_class_add_private (klass, sizeof (CheckerboardItemPrivate));
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) checkerboard_item_real_get_name;
+	((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) checkerboard_item_real_get_name;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((DataObjectClass *) klass)->notify_membership_changed = (void (*)(DataObject*, DataCollection*)) checkerboard_item_real_notify_membership_changed;
+	((DataObjectClass *) klass)->notify_membership_changed = (void (*) (DataObject *, DataCollection*)) checkerboard_item_real_notify_membership_changed;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((DataObjectClass *) klass)->notify_collection_property_set = (void (*)(DataObject*, const gchar*, GValue*, GValue*)) checkerboard_item_real_notify_collection_property_set;
+	((DataObjectClass *) klass)->notify_collection_property_set = (void (*) (DataObject *, const gchar*, GValue*, GValue*)) checkerboard_item_real_notify_collection_property_set;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->exposed = (void (*)(CheckerboardItem*)) checkerboard_item_real_exposed;
+	((CheckerboardItemClass *) klass)->exposed = (void (*) (CheckerboardItem *)) checkerboard_item_real_exposed;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->unexposed = (void (*)(CheckerboardItem*)) checkerboard_item_real_unexposed;
+	((CheckerboardItemClass *) klass)->unexposed = (void (*) (CheckerboardItem *)) checkerboard_item_real_unexposed;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->is_exposed = (gboolean (*)(CheckerboardItem*)) checkerboard_item_real_is_exposed;
+	((CheckerboardItemClass *) klass)->is_exposed = (gboolean (*) (CheckerboardItem *)) checkerboard_item_real_is_exposed;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->paint_shadow = (void (*)(CheckerboardItem*, cairo_t*, Dimensions*, GdkPoint*, gint, gfloat)) checkerboard_item_real_paint_shadow;
+	((CheckerboardItemClass *) klass)->paint_shadow = (void (*) (CheckerboardItem *, cairo_t*, Dimensions*, GdkPoint*, gint, gfloat)) checkerboard_item_real_paint_shadow;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->paint_border = (void (*)(CheckerboardItem*, cairo_t*, Dimensions*, GdkPoint*, gint)) checkerboard_item_real_paint_border;
+	((CheckerboardItemClass *) klass)->paint_border = (void (*) (CheckerboardItem *, cairo_t*, Dimensions*, GdkPoint*, gint)) checkerboard_item_real_paint_border;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->paint_image = (void (*)(CheckerboardItem*, cairo_t*, GdkPixbuf*, GdkPoint*)) checkerboard_item_real_paint_image;
+	((CheckerboardItemClass *) klass)->paint_image = (void (*) (CheckerboardItem *, cairo_t*, GdkPixbuf*, GdkPoint*)) checkerboard_item_real_paint_image;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->get_top_left_trinket = (GdkPixbuf* (*)(CheckerboardItem*, gint)) checkerboard_item_real_get_top_left_trinket;
+	((CheckerboardItemClass *) klass)->get_top_left_trinket = (GdkPixbuf* (*) (CheckerboardItem *, gint)) checkerboard_item_real_get_top_left_trinket;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->get_top_right_trinket = (GdkPixbuf* (*)(CheckerboardItem*, gint)) checkerboard_item_real_get_top_right_trinket;
+	((CheckerboardItemClass *) klass)->get_top_right_trinket = (GdkPixbuf* (*) (CheckerboardItem *, gint)) checkerboard_item_real_get_top_right_trinket;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->get_bottom_left_trinket = (GdkPixbuf* (*)(CheckerboardItem*, gint)) checkerboard_item_real_get_bottom_left_trinket;
+	((CheckerboardItemClass *) klass)->get_bottom_left_trinket = (GdkPixbuf* (*) (CheckerboardItem *, gint)) checkerboard_item_real_get_bottom_left_trinket;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->get_bottom_right_trinket = (GdkPixbuf* (*)(CheckerboardItem*, gint)) checkerboard_item_real_get_bottom_right_trinket;
+	((CheckerboardItemClass *) klass)->get_bottom_right_trinket = (GdkPixbuf* (*) (CheckerboardItem *, gint)) checkerboard_item_real_get_bottom_right_trinket;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((DataViewClass *) klass)->visibility_changed = (void (*)(DataView*, gboolean)) checkerboard_item_real_visibility_changed;
+	((DataViewClass *) klass)->visibility_changed = (void (*) (DataView *, gboolean)) checkerboard_item_real_visibility_changed;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_checkerboard_item_get_property;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5626,8 +5672,8 @@ static void checkerboard_item_class_init (CheckerboardItemClass * klass) {
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	G_OBJECT_CLASS (klass)->finalize = checkerboard_item_finalize;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), CHECKERBOARD_ITEM_HAS_TAGS, g_param_spec_boolean ("has-tags", "has-tags", "has-tags", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 5631 "CheckerboardLayout.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), CHECKERBOARD_ITEM_HAS_TAGS_PROPERTY, g_param_spec_boolean ("has-tags", "has-tags", "has-tags", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 5677 "CheckerboardLayout.c"
 }
 
 
@@ -5672,11 +5718,11 @@ static void checkerboard_item_instance_init (CheckerboardItem * self) {
 	self->priv->row = -1;
 #line 139 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->horizontal_trinket_offset = 0;
-#line 5676 "CheckerboardLayout.c"
+#line 5722 "CheckerboardLayout.c"
 }
 
 
-static void checkerboard_item_finalize (GObject* obj) {
+static void checkerboard_item_finalize (GObject * obj) {
 	CheckerboardItem * self;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
@@ -5698,7 +5744,7 @@ static void checkerboard_item_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->brightened);
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	G_OBJECT_CLASS (checkerboard_item_parent_class)->finalize (obj);
-#line 5702 "CheckerboardLayout.c"
+#line 5748 "CheckerboardLayout.c"
 }
 
 
@@ -5720,18 +5766,18 @@ static void _vala_checkerboard_item_get_property (GObject * object, guint proper
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	switch (property_id) {
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-		case CHECKERBOARD_ITEM_HAS_TAGS:
+		case CHECKERBOARD_ITEM_HAS_TAGS_PROPERTY:
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_value_set_boolean (value, checkerboard_item_get_has_tags (self));
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		break;
-#line 5729 "CheckerboardLayout.c"
+#line 5775 "CheckerboardLayout.c"
 		default:
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		break;
-#line 5735 "CheckerboardLayout.c"
+#line 5781 "CheckerboardLayout.c"
 	}
 }
 
@@ -5742,18 +5788,18 @@ static void _vala_checkerboard_item_set_property (GObject * object, guint proper
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	switch (property_id) {
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-		case CHECKERBOARD_ITEM_HAS_TAGS:
+		case CHECKERBOARD_ITEM_HAS_TAGS_PROPERTY:
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_set_has_tags (self, g_value_get_boolean (value));
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		break;
-#line 5751 "CheckerboardLayout.c"
+#line 5797 "CheckerboardLayout.c"
 		default:
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		break;
-#line 5757 "CheckerboardLayout.c"
+#line 5803 "CheckerboardLayout.c"
 	}
 }
 
@@ -5761,112 +5807,112 @@ static void _vala_checkerboard_item_set_property (GObject * object, guint proper
 static void _checkerboard_layout_on_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
 #line 907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_contents_altered ((CheckerboardLayout*) self, added, removed);
-#line 5765 "CheckerboardLayout.c"
+#line 5811 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_items_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_items_altered ((CheckerboardLayout*) self);
-#line 5772 "CheckerboardLayout.c"
+#line 5818 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_items_state_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
 #line 909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_items_state_changed ((CheckerboardLayout*) self, changed);
-#line 5779 "CheckerboardLayout.c"
+#line 5825 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_items_visibility_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
 #line 910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_items_visibility_changed ((CheckerboardLayout*) self, changed);
-#line 5786 "CheckerboardLayout.c"
+#line 5832 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_ordering_changed_data_collection_ordering_changed (DataCollection* _sender, gpointer self) {
 #line 911 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_ordering_changed ((CheckerboardLayout*) self);
-#line 5793 "CheckerboardLayout.c"
+#line 5839 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_views_altered_view_collection_views_altered (ViewCollection* _sender, GeeCollection* views, gpointer self) {
 #line 912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_views_altered ((CheckerboardLayout*) self, views);
-#line 5800 "CheckerboardLayout.c"
+#line 5846 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_geometries_altered_view_collection_geometries_altered (ViewCollection* _sender, GeeCollection* views, gpointer self) {
 #line 913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_geometries_altered ((CheckerboardLayout*) self);
-#line 5807 "CheckerboardLayout.c"
+#line 5853 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_items_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) {
 #line 914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_items_selection_changed ((CheckerboardLayout*) self);
-#line 5814 "CheckerboardLayout.c"
+#line 5860 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_items_selection_changed_view_collection_items_unselected (ViewCollection* _sender, GeeIterable* unselected, gpointer self) {
 #line 915 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_items_selection_changed ((CheckerboardLayout*) self);
-#line 5821 "CheckerboardLayout.c"
+#line 5867 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
 #line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_viewport_shifted ((CheckerboardLayout*) self);
-#line 5828 "CheckerboardLayout.c"
+#line 5874 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) {
 #line 924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_viewport_resized ((CheckerboardLayout*) self);
-#line 5835 "CheckerboardLayout.c"
+#line 5881 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_colors_changed_config_facade_colors_changed (ConfigFacade* _sender, gpointer self) {
 #line 926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_colors_changed ((CheckerboardLayout*) self);
-#line 5842 "CheckerboardLayout.c"
+#line 5888 "CheckerboardLayout.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 879 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 5849 "CheckerboardLayout.c"
+#line 5895 "CheckerboardLayout.c"
 }
 
 
 CheckerboardLayout* checkerboard_layout_construct (GType object_type, ViewCollection* view) {
 	CheckerboardLayout * self = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	ViewCollection* _tmp8_ = NULL;
-	ViewCollection* _tmp9_ = NULL;
-	ViewCollection* _tmp10_ = NULL;
-	ConfigFacade* _tmp11_ = NULL;
-	ConfigFacade* _tmp12_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
+	ViewCollection* _tmp8_;
+	ViewCollection* _tmp9_;
+	ViewCollection* _tmp10_;
+	ConfigFacade* _tmp11_;
+	ConfigFacade* _tmp12_;
 	GdkRGBA _tmp13_ = {0};
-	ConfigFacade* _tmp14_ = NULL;
-	ConfigFacade* _tmp15_ = NULL;
+	ConfigFacade* _tmp14_;
+	ConfigFacade* _tmp15_;
 #line 878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (view), NULL);
 #line 878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5939,26 +5985,26 @@ CheckerboardLayout* checkerboard_layout_construct (GType object_type, ViewCollec
 	gtk_widget_set_has_tooltip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return self;
-#line 5943 "CheckerboardLayout.c"
+#line 5989 "CheckerboardLayout.c"
 }
 
 
 CheckerboardLayout* checkerboard_layout_new (ViewCollection* view) {
 #line 878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return checkerboard_layout_construct (TYPE_CHECKERBOARD_LAYOUT, view);
-#line 5950 "CheckerboardLayout.c"
+#line 5996 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_layout_set_adjustments (CheckerboardLayout* self, GtkAdjustment* hadjustment, GtkAdjustment* vadjustment) {
-	GtkAdjustment* _tmp0_ = NULL;
-	GtkAdjustment* _tmp1_ = NULL;
-	GtkAdjustment* _tmp2_ = NULL;
-	GtkAdjustment* _tmp3_ = NULL;
-	GtkAdjustment* _tmp4_ = NULL;
-	GtkAdjustment* _tmp5_ = NULL;
-	GtkContainer* _tmp6_ = NULL;
-	GtkContainer* _tmp7_ = NULL;
+	GtkAdjustment* _tmp0_;
+	GtkAdjustment* _tmp1_;
+	GtkAdjustment* _tmp2_;
+	GtkAdjustment* _tmp3_;
+	GtkAdjustment* _tmp4_;
+	GtkAdjustment* _tmp5_;
+	GtkContainer* _tmp6_;
+	GtkContainer* _tmp7_;
 #line 929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -5995,25 +6041,25 @@ void checkerboard_layout_set_adjustments (CheckerboardLayout* self, GtkAdjustmen
 	_tmp7_ = _tmp6_;
 #line 938 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), "size-allocate", (GCallback) _checkerboard_layout_on_viewport_resized_gtk_widget_size_allocate, self, 0);
-#line 5999 "CheckerboardLayout.c"
+#line 6045 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_layout_set_scale (CheckerboardLayout* self, gint scale) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 943 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 944 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = scale;
 #line 944 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->scale = _tmp0_;
-#line 6011 "CheckerboardLayout.c"
+#line 6057 "CheckerboardLayout.c"
 }
 
 
 gint checkerboard_layout_get_scale (CheckerboardLayout* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), 0);
 #line 948 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6022,13 +6068,13 @@ gint checkerboard_layout_get_scale (CheckerboardLayout* self) {
 	result = _tmp0_;
 #line 948 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 6026 "CheckerboardLayout.c"
+#line 6072 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_layout_set_name (CheckerboardLayout* self, const gchar* name) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 951 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 951 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6041,7 +6087,7 @@ void checkerboard_layout_set_name (CheckerboardLayout* self, const gchar* name)
 	_g_free0 (self->priv->page_name);
 #line 952 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->page_name = _tmp1_;
-#line 6045 "CheckerboardLayout.c"
+#line 6091 "CheckerboardLayout.c"
 }
 
 
@@ -6049,11 +6095,11 @@ static void checkerboard_layout_on_viewport_resized (CheckerboardLayout* self) {
 	GtkRequisition req = {0};
 	GtkRequisition _tmp0_ = {0};
 	GtkAllocation parent_allocation = {0};
-	GtkContainer* _tmp1_ = NULL;
-	GtkContainer* _tmp2_ = NULL;
+	GtkContainer* _tmp1_;
+	GtkContainer* _tmp2_;
 	GtkAllocation _tmp3_ = {0};
-	const gchar* _tmp4_ = NULL;
-	gboolean _tmp15_ = FALSE;
+	const gchar* _tmp4_;
+	gboolean _tmp15_;
 #line 955 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6072,20 +6118,20 @@ static void checkerboard_layout_on_viewport_resized (CheckerboardLayout* self) {
 	_tmp4_ = self->priv->message;
 #line 962 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp4_ == NULL) {
-#line 6076 "CheckerboardLayout.c"
-		GtkRequisition _tmp5_ = {0};
-		gint _tmp6_ = 0;
+#line 6122 "CheckerboardLayout.c"
+		GtkRequisition _tmp5_;
+		gint _tmp6_;
 #line 971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = req;
 #line 971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = _tmp5_.height;
 #line 971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp6_ != 0) {
-#line 6085 "CheckerboardLayout.c"
-			GtkAllocation _tmp7_ = {0};
-			gint _tmp8_ = 0;
-			GtkRequisition _tmp9_ = {0};
-			gint _tmp10_ = 0;
+#line 6131 "CheckerboardLayout.c"
+			GtkAllocation _tmp7_;
+			gint _tmp8_;
+			GtkRequisition _tmp9_;
+			gint _tmp10_;
 #line 972 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp7_ = parent_allocation;
 #line 972 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6096,13 +6142,13 @@ static void checkerboard_layout_on_viewport_resized (CheckerboardLayout* self) {
 			_tmp10_ = _tmp9_.height;
 #line 972 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp8_ - CHECKERBOARD_LAYOUT_SCROLLBAR_PLACEHOLDER_WIDTH, _tmp10_);
-#line 6100 "CheckerboardLayout.c"
+#line 6146 "CheckerboardLayout.c"
 		}
 	} else {
-		GtkAllocation _tmp11_ = {0};
-		gint _tmp12_ = 0;
-		GtkAllocation _tmp13_ = {0};
-		gint _tmp14_ = 0;
+		GtkAllocation _tmp11_;
+		gint _tmp12_;
+		GtkAllocation _tmp13_;
+		gint _tmp14_;
 #line 976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp11_ = parent_allocation;
 #line 976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6113,7 +6159,7 @@ static void checkerboard_layout_on_viewport_resized (CheckerboardLayout* self) {
 		_tmp14_ = _tmp13_.height;
 #line 976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp12_, _tmp14_);
-#line 6117 "CheckerboardLayout.c"
+#line 6163 "CheckerboardLayout.c"
 	}
 #line 981 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_viewport_resized (self);
@@ -6123,11 +6169,11 @@ static void checkerboard_layout_on_viewport_resized (CheckerboardLayout* self) {
 	if (!_tmp15_) {
 #line 984 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_clear_anchor (self);
-#line 6127 "CheckerboardLayout.c"
+#line 6173 "CheckerboardLayout.c"
 	} else {
 #line 986 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->size_allocate_due_to_reflow = FALSE;
-#line 6131 "CheckerboardLayout.c"
+#line 6177 "CheckerboardLayout.c"
 	}
 }
 
@@ -6141,7 +6187,7 @@ static void checkerboard_layout_on_viewport_shifted (CheckerboardLayout* self) {
 	checkerboard_layout_need_exposure (self, "on_viewport_shift");
 #line 993 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_clear_anchor (self);
-#line 6145 "CheckerboardLayout.c"
+#line 6191 "CheckerboardLayout.c"
 }
 
 
@@ -6150,12 +6196,12 @@ static void checkerboard_layout_on_items_selection_changed (CheckerboardLayout*
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 997 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_clear_anchor (self);
-#line 6154 "CheckerboardLayout.c"
+#line 6200 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_clear_anchor (CheckerboardLayout* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6164,31 +6210,31 @@ static void checkerboard_layout_clear_anchor (CheckerboardLayout* self) {
 	if (_tmp0_) {
 #line 1002 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 6168 "CheckerboardLayout.c"
+#line 6214 "CheckerboardLayout.c"
 	}
 #line 1004 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->anchor);
 #line 1004 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->anchor = NULL;
-#line 6174 "CheckerboardLayout.c"
+#line 6220 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_update_anchor (CheckerboardLayout* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	GeeList* items_on_page = NULL;
-	GdkRectangle _tmp1_ = {0};
-	GeeList* _tmp2_ = NULL;
-	GeeList* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	GtkAdjustment* _tmp21_ = NULL;
-	gdouble _tmp22_ = 0.0;
-	GeeList* _tmp23_ = NULL;
-	GeeList* _tmp24_ = NULL;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	gpointer _tmp27_ = NULL;
+	GdkRectangle _tmp1_;
+	GeeList* _tmp2_;
+	GeeList* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	GtkAdjustment* _tmp21_;
+	gdouble _tmp22_;
+	GeeList* _tmp23_;
+	GeeList* _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
+	gpointer _tmp27_;
 #line 1007 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1008 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6217,16 +6263,16 @@ static void checkerboard_layout_update_anchor (CheckerboardLayout* self) {
 		_g_object_unref0 (items_on_page);
 #line 1013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 6221 "CheckerboardLayout.c"
+#line 6267 "CheckerboardLayout.c"
 	}
 	{
 		GeeList* _item_list = NULL;
-		GeeList* _tmp6_ = NULL;
-		GeeList* _tmp7_ = NULL;
+		GeeList* _tmp6_;
+		GeeList* _tmp7_;
 		gint _item_size = 0;
-		GeeList* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
+		GeeList* _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
 		gint _item_index = 0;
 #line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = items_on_page;
@@ -6246,16 +6292,16 @@ static void checkerboard_layout_update_anchor (CheckerboardLayout* self) {
 		_item_index = -1;
 #line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		while (TRUE) {
-#line 6250 "CheckerboardLayout.c"
-			gint _tmp11_ = 0;
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
+#line 6296 "CheckerboardLayout.c"
+			gint _tmp11_;
+			gint _tmp12_;
+			gint _tmp13_;
 			CheckerboardItem* item = NULL;
-			GeeList* _tmp14_ = NULL;
-			gint _tmp15_ = 0;
-			gpointer _tmp16_ = NULL;
-			CheckerboardItem* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
+			GeeList* _tmp14_;
+			gint _tmp15_;
+			gpointer _tmp16_;
+			CheckerboardItem* _tmp17_;
+			gboolean _tmp18_;
 #line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp11_ = _item_index;
 #line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6268,7 +6314,7 @@ static void checkerboard_layout_update_anchor (CheckerboardLayout* self) {
 			if (!(_tmp12_ < _tmp13_)) {
 #line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 6272 "CheckerboardLayout.c"
+#line 6318 "CheckerboardLayout.c"
 			}
 #line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp14_ = _item_list;
@@ -6284,9 +6330,9 @@ static void checkerboard_layout_update_anchor (CheckerboardLayout* self) {
 			_tmp18_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_VIEW, DataView));
 #line 1017 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp18_) {
-#line 6288 "CheckerboardLayout.c"
-				CheckerboardItem* _tmp19_ = NULL;
-				CheckerboardItem* _tmp20_ = NULL;
+#line 6334 "CheckerboardLayout.c"
+				CheckerboardItem* _tmp19_;
+				CheckerboardItem* _tmp20_;
 #line 1018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp19_ = item;
 #line 1018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6303,15 +6349,15 @@ static void checkerboard_layout_update_anchor (CheckerboardLayout* self) {
 				_g_object_unref0 (items_on_page);
 #line 1019 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				return;
-#line 6307 "CheckerboardLayout.c"
+#line 6353 "CheckerboardLayout.c"
 			}
 #line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_g_object_unref0 (item);
-#line 6311 "CheckerboardLayout.c"
+#line 6357 "CheckerboardLayout.c"
 		}
 #line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (_item_list);
-#line 6315 "CheckerboardLayout.c"
+#line 6361 "CheckerboardLayout.c"
 	}
 #line 1023 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp21_ = self->priv->vadjustment;
@@ -6327,7 +6373,7 @@ static void checkerboard_layout_update_anchor (CheckerboardLayout* self) {
 		_g_object_unref0 (items_on_page);
 #line 1025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 6331 "CheckerboardLayout.c"
+#line 6377 "CheckerboardLayout.c"
 	}
 #line 1030 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp23_ = items_on_page;
@@ -6345,30 +6391,30 @@ static void checkerboard_layout_update_anchor (CheckerboardLayout* self) {
 	self->priv->anchor = (CheckerboardItem*) _tmp27_;
 #line 1007 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (items_on_page);
-#line 6349 "CheckerboardLayout.c"
+#line 6395 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_center_on_anchor (CheckerboardLayout* self, gdouble upper) {
-	CheckerboardItem* _tmp0_ = NULL;
+	CheckerboardItem* _tmp0_;
 	gdouble anchor_pos = 0.0;
-	CheckerboardItem* _tmp1_ = NULL;
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	CheckerboardItem* _tmp4_ = NULL;
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	GtkAdjustment* _tmp7_ = NULL;
-	gdouble _tmp8_ = 0.0;
-	GtkAdjustment* _tmp9_ = NULL;
-	gdouble _tmp10_ = 0.0;
-	GtkAdjustment* _tmp11_ = NULL;
-	gdouble _tmp12_ = 0.0;
-	GtkAdjustment* _tmp13_ = NULL;
-	gdouble _tmp14_ = 0.0;
-	GtkAdjustment* _tmp15_ = NULL;
-	gdouble _tmp16_ = 0.0;
-	gdouble _tmp17_ = 0.0;
+	CheckerboardItem* _tmp1_;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	CheckerboardItem* _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	GtkAdjustment* _tmp7_;
+	gdouble _tmp8_;
+	GtkAdjustment* _tmp9_;
+	gdouble _tmp10_;
+	GtkAdjustment* _tmp11_;
+	gdouble _tmp12_;
+	GtkAdjustment* _tmp13_;
+	gdouble _tmp14_;
+	GtkAdjustment* _tmp15_;
+	gdouble _tmp16_;
+	gdouble _tmp17_;
 #line 1033 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6377,7 +6423,7 @@ static void checkerboard_layout_center_on_anchor (CheckerboardLayout* self, gdou
 	if (_tmp0_ == NULL) {
 #line 1035 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 6381 "CheckerboardLayout.c"
+#line 6427 "CheckerboardLayout.c"
 	}
 #line 1037 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->in_center_on_anchor = TRUE;
@@ -6421,20 +6467,20 @@ static void checkerboard_layout_center_on_anchor (CheckerboardLayout* self, gdou
 	gtk_adjustment_set_value (_tmp9_, _tmp17_);
 #line 1044 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->in_center_on_anchor = FALSE;
-#line 6425 "CheckerboardLayout.c"
+#line 6471 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_layout_set_cursor (CheckerboardLayout* self, CheckerboardItem* item) {
 	GeeHashSet* collection = NULL;
-	GeeHashSet* _tmp0_ = NULL;
-	CheckerboardItem* _tmp1_ = NULL;
-	CheckerboardItem* _tmp8_ = NULL;
-	CheckerboardItem* _tmp9_ = NULL;
-	CheckerboardItem* _tmp10_ = NULL;
-	GeeHashSet* _tmp11_ = NULL;
-	CheckerboardItem* _tmp12_ = NULL;
-	GeeHashSet* _tmp13_ = NULL;
+	GeeHashSet* _tmp0_;
+	CheckerboardItem* _tmp1_;
+	CheckerboardItem* _tmp8_;
+	CheckerboardItem* _tmp9_;
+	CheckerboardItem* _tmp10_;
+	GeeHashSet* _tmp11_;
+	CheckerboardItem* _tmp12_;
+	GeeHashSet* _tmp13_;
 #line 1047 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1047 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6447,11 +6493,11 @@ void checkerboard_layout_set_cursor (CheckerboardLayout* self, CheckerboardItem*
 	_tmp1_ = self->priv->cursor;
 #line 1049 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 6451 "CheckerboardLayout.c"
-		CheckerboardItem* _tmp2_ = NULL;
-		ViewCollection* _tmp3_ = NULL;
-		CheckerboardItem* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+#line 6497 "CheckerboardLayout.c"
+		CheckerboardItem* _tmp2_;
+		ViewCollection* _tmp3_;
+		CheckerboardItem* _tmp4_;
+		gboolean _tmp5_;
 #line 1050 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->cursor;
 #line 1050 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6464,16 +6510,16 @@ void checkerboard_layout_set_cursor (CheckerboardLayout* self, CheckerboardItem*
 		_tmp5_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject));
 #line 1052 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp5_) {
-#line 6468 "CheckerboardLayout.c"
-			GeeHashSet* _tmp6_ = NULL;
-			CheckerboardItem* _tmp7_ = NULL;
+#line 6514 "CheckerboardLayout.c"
+			GeeHashSet* _tmp6_;
+			CheckerboardItem* _tmp7_;
 #line 1053 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp6_ = collection;
 #line 1053 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp7_ = self->priv->cursor;
 #line 1053 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_VIEW, DataView));
-#line 6477 "CheckerboardLayout.c"
+#line 6523 "CheckerboardLayout.c"
 		}
 	}
 #line 1056 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6500,14 +6546,14 @@ void checkerboard_layout_set_cursor (CheckerboardLayout* self, CheckerboardItem*
 	checkerboard_layout_on_items_state_changed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 1047 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (collection);
-#line 6504 "CheckerboardLayout.c"
+#line 6550 "CheckerboardLayout.c"
 }
 
 
 CheckerboardItem* checkerboard_layout_get_cursor (CheckerboardLayout* self) {
 	CheckerboardItem* result = NULL;
-	CheckerboardItem* _tmp0_ = NULL;
-	CheckerboardItem* _tmp1_ = NULL;
+	CheckerboardItem* _tmp0_;
+	CheckerboardItem* _tmp1_;
 #line 1062 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL);
 #line 1063 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6518,13 +6564,13 @@ CheckerboardItem* checkerboard_layout_get_cursor (CheckerboardLayout* self) {
 	result = _tmp1_;
 #line 1063 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 6522 "CheckerboardLayout.c"
+#line 6568 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_on_contents_altered (CheckerboardLayout* self, GeeIterable* added, GeeIterable* removed) {
-	GeeIterable* _tmp0_ = NULL;
-	GeeIterable* _tmp1_ = NULL;
+	GeeIterable* _tmp0_;
+	GeeIterable* _tmp1_;
 #line 1067 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1067 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6539,17 +6585,17 @@ static void checkerboard_layout_on_contents_altered (CheckerboardLayout* self, G
 		_g_free0 (self->priv->message);
 #line 1070 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->message = NULL;
-#line 6543 "CheckerboardLayout.c"
+#line 6589 "CheckerboardLayout.c"
 	}
 #line 1072 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = removed;
 #line 1072 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 6549 "CheckerboardLayout.c"
+#line 6595 "CheckerboardLayout.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp2_ = NULL;
-			GeeIterator* _tmp3_ = NULL;
+			GeeIterable* _tmp2_;
+			GeeIterator* _tmp3_;
 #line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp2_ = removed;
 #line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6558,14 +6604,14 @@ static void checkerboard_layout_on_contents_altered (CheckerboardLayout* self, G
 			_object_it = _tmp3_;
 #line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			while (TRUE) {
-#line 6562 "CheckerboardLayout.c"
-				GeeIterator* _tmp4_ = NULL;
-				gboolean _tmp5_ = FALSE;
+#line 6608 "CheckerboardLayout.c"
+				GeeIterator* _tmp4_;
+				gboolean _tmp5_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp6_ = NULL;
-				gpointer _tmp7_ = NULL;
-				GeeHashSet* _tmp8_ = NULL;
-				DataObject* _tmp9_ = NULL;
+				GeeIterator* _tmp6_;
+				gpointer _tmp7_;
+				GeeHashSet* _tmp8_;
+				DataObject* _tmp9_;
 #line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp4_ = _object_it;
 #line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6574,7 +6620,7 @@ static void checkerboard_layout_on_contents_altered (CheckerboardLayout* self, G
 				if (!_tmp5_) {
 #line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 6578 "CheckerboardLayout.c"
+#line 6624 "CheckerboardLayout.c"
 				}
 #line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp6_ = _object_it;
@@ -6590,11 +6636,11 @@ static void checkerboard_layout_on_contents_altered (CheckerboardLayout* self, G
 				gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
 #line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (object);
-#line 6594 "CheckerboardLayout.c"
+#line 6640 "CheckerboardLayout.c"
 			}
 #line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_g_object_unref0 (_object_it);
-#line 6598 "CheckerboardLayout.c"
+#line 6644 "CheckerboardLayout.c"
 		}
 	}
 #line 1079 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6607,7 +6653,7 @@ static void checkerboard_layout_on_contents_altered (CheckerboardLayout* self, G
 	self->priv->_item_rows_size_ = self->priv->item_rows_length1;
 #line 1081 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_need_reflow (self, "on_contents_altered");
-#line 6611 "CheckerboardLayout.c"
+#line 6657 "CheckerboardLayout.c"
 }
 
 
@@ -6616,12 +6662,12 @@ static void checkerboard_layout_on_items_altered (CheckerboardLayout* self) {
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1085 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_need_reflow (self, "on_items_altered");
-#line 6620 "CheckerboardLayout.c"
+#line 6666 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_on_items_state_changed (CheckerboardLayout* self, GeeIterable* changed) {
-	GeeIterable* _tmp0_ = NULL;
+	GeeIterable* _tmp0_;
 #line 1088 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1088 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6630,7 +6676,7 @@ static void checkerboard_layout_on_items_state_changed (CheckerboardLayout* self
 	_tmp0_ = changed;
 #line 1089 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_items_dirty (self, "on_items_state_changed", _tmp0_);
-#line 6634 "CheckerboardLayout.c"
+#line 6680 "CheckerboardLayout.c"
 }
 
 
@@ -6641,7 +6687,7 @@ static void checkerboard_layout_on_items_visibility_changed (CheckerboardLayout*
 	g_return_if_fail (GEE_IS_ITERABLE (changed));
 #line 1093 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_need_reflow (self, "on_items_visibility_changed");
-#line 6645 "CheckerboardLayout.c"
+#line 6691 "CheckerboardLayout.c"
 }
 
 
@@ -6650,12 +6696,12 @@ static void checkerboard_layout_on_ordering_changed (CheckerboardLayout* self) {
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1097 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_need_reflow (self, "on_ordering_changed");
-#line 6654 "CheckerboardLayout.c"
+#line 6700 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_on_views_altered (CheckerboardLayout* self, GeeCollection* altered) {
-	GeeCollection* _tmp0_ = NULL;
+	GeeCollection* _tmp0_;
 #line 1100 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1100 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6664,7 +6710,7 @@ static void checkerboard_layout_on_views_altered (CheckerboardLayout* self, GeeC
 	_tmp0_ = altered;
 #line 1101 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_items_dirty (self, "on_views_altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 6668 "CheckerboardLayout.c"
+#line 6714 "CheckerboardLayout.c"
 }
 
 
@@ -6673,7 +6719,7 @@ static void checkerboard_layout_on_geometries_altered (CheckerboardLayout* self)
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1105 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_need_reflow (self, "on_geometries_altered");
-#line 6677 "CheckerboardLayout.c"
+#line 6723 "CheckerboardLayout.c"
 }
 
 
@@ -6682,13 +6728,13 @@ static gboolean _checkerboard_layout_do_reflow_gsource_func (gpointer self) {
 	result = checkerboard_layout_do_reflow ((CheckerboardLayout*) self);
 #line 1121 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 6686 "CheckerboardLayout.c"
+#line 6732 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_need_reflow (CheckerboardLayout* self, const gchar* caller) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
 #line 1108 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1108 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6699,7 +6745,7 @@ static void checkerboard_layout_need_reflow (CheckerboardLayout* self, const gch
 	if (_tmp0_) {
 #line 1110 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 6703 "CheckerboardLayout.c"
+#line 6749 "CheckerboardLayout.c"
 	}
 #line 1112 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->is_in_view;
@@ -6709,13 +6755,13 @@ static void checkerboard_layout_need_reflow (CheckerboardLayout* self, const gch
 		self->priv->reflow_needed = TRUE;
 #line 1114 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 6713 "CheckerboardLayout.c"
+#line 6759 "CheckerboardLayout.c"
 	}
 #line 1120 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->flow_scheduled = TRUE;
 #line 1121 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_idle_add_full (G_PRIORITY_HIGH, _checkerboard_layout_do_reflow_gsource_func, g_object_ref (self), g_object_unref);
-#line 6719 "CheckerboardLayout.c"
+#line 6765 "CheckerboardLayout.c"
 }
 
 
@@ -6733,7 +6779,7 @@ static gboolean checkerboard_layout_do_reflow (CheckerboardLayout* self) {
 	result = FALSE;
 #line 1130 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 6737 "CheckerboardLayout.c"
+#line 6783 "CheckerboardLayout.c"
 }
 
 
@@ -6746,16 +6792,16 @@ static void checkerboard_layout_need_exposure (CheckerboardLayout* self, const g
 	self->priv->exposure_dirty = TRUE;
 #line 1138 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 6750 "CheckerboardLayout.c"
+#line 6796 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_layout_set_message (CheckerboardLayout* self, const gchar* text) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
 #line 1141 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1142 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6766,7 +6812,7 @@ void checkerboard_layout_set_message (CheckerboardLayout* self, const gchar* tex
 	if (g_strcmp0 (_tmp0_, _tmp1_) == 0) {
 #line 1143 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 6770 "CheckerboardLayout.c"
+#line 6816 "CheckerboardLayout.c"
 	}
 #line 1145 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = text;
@@ -6780,24 +6826,24 @@ void checkerboard_layout_set_message (CheckerboardLayout* self, const gchar* tex
 	_tmp4_ = text;
 #line 1147 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp4_ != NULL) {
-#line 6784 "CheckerboardLayout.c"
-		GtkContainer* _tmp5_ = NULL;
-		GtkContainer* _tmp6_ = NULL;
+#line 6830 "CheckerboardLayout.c"
+		GtkContainer* _tmp5_;
+		GtkContainer* _tmp6_;
 #line 1150 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 1150 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = _tmp5_;
 #line 1150 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp6_ != NULL) {
-#line 6793 "CheckerboardLayout.c"
+#line 6839 "CheckerboardLayout.c"
 			GtkAllocation parent_allocation = {0};
-			GtkContainer* _tmp7_ = NULL;
-			GtkContainer* _tmp8_ = NULL;
+			GtkContainer* _tmp7_;
+			GtkContainer* _tmp8_;
 			GtkAllocation _tmp9_ = {0};
-			GtkAllocation _tmp10_ = {0};
-			gint _tmp11_ = 0;
-			GtkAllocation _tmp12_ = {0};
-			gint _tmp13_ = 0;
+			GtkAllocation _tmp10_;
+			gint _tmp11_;
+			GtkAllocation _tmp12_;
+			gint _tmp13_;
 #line 1152 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp7_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 1152 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6816,12 +6862,12 @@ void checkerboard_layout_set_message (CheckerboardLayout* self, const gchar* tex
 			_tmp13_ = _tmp12_.height;
 #line 1154 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp11_, _tmp13_);
-#line 6820 "CheckerboardLayout.c"
+#line 6866 "CheckerboardLayout.c"
 		}
 	} else {
 #line 1158 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_need_reflow (self, "set_message");
-#line 6825 "CheckerboardLayout.c"
+#line 6871 "CheckerboardLayout.c"
 	}
 }
 
@@ -6831,36 +6877,36 @@ void checkerboard_layout_unset_message (CheckerboardLayout* self) {
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1163 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_set_message (self, NULL);
-#line 6835 "CheckerboardLayout.c"
+#line 6881 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_update_visible_page (CheckerboardLayout* self) {
 	gboolean _tmp0_ = FALSE;
-	GtkAdjustment* _tmp1_ = NULL;
+	GtkAdjustment* _tmp1_;
 #line 1166 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->hadjustment;
 #line 1167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 6848 "CheckerboardLayout.c"
-		GtkAdjustment* _tmp2_ = NULL;
+#line 6894 "CheckerboardLayout.c"
+		GtkAdjustment* _tmp2_;
 #line 1167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->vadjustment;
 #line 1167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 6854 "CheckerboardLayout.c"
+#line 6900 "CheckerboardLayout.c"
 	} else {
 #line 1167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = FALSE;
-#line 6858 "CheckerboardLayout.c"
+#line 6904 "CheckerboardLayout.c"
 	}
 #line 1167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
-#line 6862 "CheckerboardLayout.c"
-		GtkAdjustment* _tmp3_ = NULL;
-		GtkAdjustment* _tmp4_ = NULL;
+#line 6908 "CheckerboardLayout.c"
+		GtkAdjustment* _tmp3_;
+		GtkAdjustment* _tmp4_;
 		GdkRectangle _tmp5_ = {0};
 #line 1168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = self->priv->hadjustment;
@@ -6870,14 +6916,14 @@ static void checkerboard_layout_update_visible_page (CheckerboardLayout* self) {
 		get_adjustment_page (_tmp3_, _tmp4_, &_tmp5_);
 #line 1168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->visible_page = _tmp5_;
-#line 6874 "CheckerboardLayout.c"
+#line 6920 "CheckerboardLayout.c"
 	}
 }
 
 
 void checkerboard_layout_set_in_view (CheckerboardLayout* self, gboolean in_view) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
 #line 1171 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6888,24 +6934,24 @@ void checkerboard_layout_set_in_view (CheckerboardLayout* self, gboolean in_view
 	_tmp1_ = in_view;
 #line 1174 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_) {
-#line 6892 "CheckerboardLayout.c"
-		gboolean _tmp2_ = FALSE;
+#line 6938 "CheckerboardLayout.c"
+		gboolean _tmp2_;
 #line 1175 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->reflow_needed;
 #line 1175 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp2_) {
 #line 1176 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			checkerboard_layout_need_reflow (self, "set_in_view (true)");
-#line 6900 "CheckerboardLayout.c"
+#line 6946 "CheckerboardLayout.c"
 		} else {
 #line 1178 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			checkerboard_layout_need_exposure (self, "set_in_view (true)");
-#line 6904 "CheckerboardLayout.c"
+#line 6950 "CheckerboardLayout.c"
 		}
 	} else {
 #line 1180 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_unexpose_items (self, "set_in_view (false)");
-#line 6909 "CheckerboardLayout.c"
+#line 6955 "CheckerboardLayout.c"
 	}
 }
 
@@ -6913,27 +6959,27 @@ void checkerboard_layout_set_in_view (CheckerboardLayout* self, gboolean in_view
 static gpointer _checkerboard_layout_layout_row_ref0 (gpointer self) {
 #line 1196 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return self ? checkerboard_layout_layout_row_ref (self) : NULL;
-#line 6917 "CheckerboardLayout.c"
+#line 6963 "CheckerboardLayout.c"
 }
 
 
 CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* self, gdouble xd, gdouble yd) {
 	CheckerboardItem* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp1_;
 	gint x = 0;
-	gdouble _tmp3_ = 0.0;
+	gdouble _tmp3_;
 	gint y = 0;
-	gdouble _tmp4_ = 0.0;
+	gdouble _tmp4_;
 	CheckerboardLayoutLayoutRow* in_range = NULL;
 	gint min = 0;
 	gint max = 0;
-	CheckerboardLayoutLayoutRow** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	CheckerboardLayoutLayoutRow* _tmp30_ = NULL;
-	CheckerboardLayoutLayoutRow* _tmp31_ = NULL;
-	CheckerboardItem** _tmp32_ = NULL;
-	gint _tmp32__length1 = 0;
+	CheckerboardLayoutLayoutRow** _tmp5_;
+	gint _tmp5__length1;
+	CheckerboardLayoutLayoutRow* _tmp30_;
+	CheckerboardLayoutLayoutRow* _tmp31_;
+	CheckerboardItem** _tmp32_;
+	gint _tmp32__length1;
 #line 1183 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL);
 #line 1184 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6942,17 +6988,17 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 	if (_tmp1_ != NULL) {
 #line 1184 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = TRUE;
-#line 6946 "CheckerboardLayout.c"
+#line 6992 "CheckerboardLayout.c"
 	} else {
-		CheckerboardLayoutLayoutRow** _tmp2_ = NULL;
-		gint _tmp2__length1 = 0;
+		CheckerboardLayoutLayoutRow** _tmp2_;
+		gint _tmp2__length1;
 #line 1184 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->item_rows;
 #line 1184 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2__length1 = self->priv->item_rows_length1;
 #line 1184 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 6956 "CheckerboardLayout.c"
+#line 7002 "CheckerboardLayout.c"
 	}
 #line 1184 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
@@ -6960,7 +7006,7 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 		result = NULL;
 #line 1185 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 6964 "CheckerboardLayout.c"
+#line 7010 "CheckerboardLayout.c"
 	}
 #line 1187 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = xd;
@@ -6980,31 +7026,31 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 	_tmp5__length1 = self->priv->item_rows_length1;
 #line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	max = _tmp5__length1;
-#line 6984 "CheckerboardLayout.c"
+#line 7030 "CheckerboardLayout.c"
 	{
 		gboolean _tmp6_ = FALSE;
 #line 1194 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = TRUE;
 #line 1194 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		while (TRUE) {
-#line 6991 "CheckerboardLayout.c"
+#line 7037 "CheckerboardLayout.c"
 			gint mid = 0;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
+			gint _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
 			CheckerboardLayoutLayoutRow* row = NULL;
-			CheckerboardLayoutLayoutRow** _tmp10_ = NULL;
-			gint _tmp10__length1 = 0;
-			gint _tmp11_ = 0;
-			CheckerboardLayoutLayoutRow* _tmp12_ = NULL;
-			CheckerboardLayoutLayoutRow* _tmp13_ = NULL;
+			CheckerboardLayoutLayoutRow** _tmp10_;
+			gint _tmp10__length1;
+			gint _tmp11_;
+			CheckerboardLayoutLayoutRow* _tmp12_;
+			CheckerboardLayoutLayoutRow* _tmp13_;
 			gboolean _tmp14_ = FALSE;
-			CheckerboardLayoutLayoutRow* _tmp15_ = NULL;
-			gint _tmp28_ = 0;
-			gint _tmp29_ = 0;
+			CheckerboardLayoutLayoutRow* _tmp15_;
+			gint _tmp28_;
+			gint _tmp29_;
 #line 1194 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (!_tmp6_) {
-#line 7008 "CheckerboardLayout.c"
+#line 7054 "CheckerboardLayout.c"
 			}
 #line 1194 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp6_ = FALSE;
@@ -7034,11 +7080,11 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 			if (_tmp15_ == NULL) {
 #line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp14_ = TRUE;
-#line 7038 "CheckerboardLayout.c"
+#line 7084 "CheckerboardLayout.c"
 			} else {
-				gint _tmp16_ = 0;
-				CheckerboardLayoutLayoutRow* _tmp17_ = NULL;
-				gint _tmp18_ = 0;
+				gint _tmp16_;
+				CheckerboardLayoutLayoutRow* _tmp17_;
+				gint _tmp18_;
 #line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp16_ = y;
 #line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -7047,23 +7093,23 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 				_tmp18_ = _tmp17_->y;
 #line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp14_ = _tmp16_ < _tmp18_;
-#line 7051 "CheckerboardLayout.c"
+#line 7097 "CheckerboardLayout.c"
 			}
 #line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp14_) {
-#line 7055 "CheckerboardLayout.c"
-				gint _tmp19_ = 0;
+#line 7101 "CheckerboardLayout.c"
+				gint _tmp19_;
 #line 1201 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp19_ = mid;
 #line 1201 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				max = _tmp19_ - 1;
-#line 7061 "CheckerboardLayout.c"
+#line 7107 "CheckerboardLayout.c"
 			} else {
-				gint _tmp20_ = 0;
-				CheckerboardLayoutLayoutRow* _tmp21_ = NULL;
-				gint _tmp22_ = 0;
-				CheckerboardLayoutLayoutRow* _tmp23_ = NULL;
-				gint _tmp24_ = 0;
+				gint _tmp20_;
+				CheckerboardLayoutLayoutRow* _tmp21_;
+				gint _tmp22_;
+				CheckerboardLayoutLayoutRow* _tmp23_;
+				gint _tmp24_;
 #line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp20_ = y;
 #line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -7076,16 +7122,16 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 				_tmp24_ = _tmp23_->height;
 #line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp20_ > (_tmp22_ + _tmp24_)) {
-#line 7080 "CheckerboardLayout.c"
-					gint _tmp25_ = 0;
+#line 7126 "CheckerboardLayout.c"
+					gint _tmp25_;
 #line 1204 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp25_ = mid;
 #line 1204 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					min = _tmp25_ + 1;
-#line 7086 "CheckerboardLayout.c"
+#line 7132 "CheckerboardLayout.c"
 				} else {
-					CheckerboardLayoutLayoutRow* _tmp26_ = NULL;
-					CheckerboardLayoutLayoutRow* _tmp27_ = NULL;
+					CheckerboardLayoutLayoutRow* _tmp26_;
+					CheckerboardLayoutLayoutRow* _tmp27_;
 #line 1207 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp26_ = row;
 #line 1207 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -7098,7 +7144,7 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 					_checkerboard_layout_layout_row_unref0 (row);
 #line 1209 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 7102 "CheckerboardLayout.c"
+#line 7148 "CheckerboardLayout.c"
 				}
 			}
 #line 1212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -7111,11 +7157,11 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 				_checkerboard_layout_layout_row_unref0 (row);
 #line 1213 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 7115 "CheckerboardLayout.c"
+#line 7161 "CheckerboardLayout.c"
 			}
 #line 1194 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_checkerboard_layout_layout_row_unref0 (row);
-#line 7119 "CheckerboardLayout.c"
+#line 7165 "CheckerboardLayout.c"
 		}
 	}
 #line 1216 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -7128,7 +7174,7 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 		_checkerboard_layout_layout_row_unref0 (in_range);
 #line 1217 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 7132 "CheckerboardLayout.c"
+#line 7178 "CheckerboardLayout.c"
 	}
 #line 1220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp31_ = in_range;
@@ -7136,7 +7182,7 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 	_tmp32_ = _tmp31_->items;
 #line 1220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp32__length1 = _tmp31_->items_length1;
-#line 7140 "CheckerboardLayout.c"
+#line 7186 "CheckerboardLayout.c"
 	{
 		CheckerboardItem** item_collection = NULL;
 		gint item_collection_length1 = 0;
@@ -7148,29 +7194,29 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 		item_collection_length1 = _tmp32__length1;
 #line 1220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		for (item_it = 0; item_it < _tmp32__length1; item_it = item_it + 1) {
-#line 7152 "CheckerboardLayout.c"
-			CheckerboardItem* _tmp33_ = NULL;
+#line 7198 "CheckerboardLayout.c"
+			CheckerboardItem* _tmp33_;
 			CheckerboardItem* item = NULL;
 #line 1220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp33_ = _g_object_ref0 (item_collection[item_it]);
 #line 1220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			item = _tmp33_;
-#line 7159 "CheckerboardLayout.c"
+#line 7205 "CheckerboardLayout.c"
 			{
-				CheckerboardItem* _tmp34_ = NULL;
-				gint _tmp35_ = 0;
-				CheckerboardItem* _tmp36_ = NULL;
-				GdkRectangle _tmp37_ = {0};
-				gint _tmp38_ = 0;
+				CheckerboardItem* _tmp34_;
+				gint _tmp35_;
+				CheckerboardItem* _tmp36_;
+				GdkRectangle _tmp37_;
+				gint _tmp38_;
 				gboolean _tmp39_ = FALSE;
 				gboolean _tmp40_ = FALSE;
-				gint _tmp41_ = 0;
-				CheckerboardItem* _tmp42_ = NULL;
-				GdkRectangle _tmp43_ = {0};
-				gint _tmp44_ = 0;
-				CheckerboardItem* _tmp45_ = NULL;
-				GdkRectangle _tmp46_ = {0};
-				gint _tmp47_ = 0;
+				gint _tmp41_;
+				CheckerboardItem* _tmp42_;
+				GdkRectangle _tmp43_;
+				gint _tmp44_;
+				CheckerboardItem* _tmp45_;
+				GdkRectangle _tmp46_;
+				gint _tmp47_;
 #line 1223 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp34_ = item;
 #line 1223 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -7179,7 +7225,7 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 					_g_object_unref0 (item);
 #line 1224 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					continue;
-#line 7183 "CheckerboardLayout.c"
+#line 7229 "CheckerboardLayout.c"
 				}
 #line 1226 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp35_ = x;
@@ -7195,7 +7241,7 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 					_g_object_unref0 (item);
 #line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 7199 "CheckerboardLayout.c"
+#line 7245 "CheckerboardLayout.c"
 				}
 #line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp41_ = x;
@@ -7213,11 +7259,11 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 				_tmp47_ = _tmp46_.width;
 #line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp41_ <= (_tmp44_ + _tmp47_)) {
-#line 7217 "CheckerboardLayout.c"
-					gint _tmp48_ = 0;
-					CheckerboardItem* _tmp49_ = NULL;
-					GdkRectangle _tmp50_ = {0};
-					gint _tmp51_ = 0;
+#line 7263 "CheckerboardLayout.c"
+					gint _tmp48_;
+					CheckerboardItem* _tmp49_;
+					GdkRectangle _tmp50_;
+					gint _tmp51_;
 #line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp48_ = y;
 #line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -7228,22 +7274,22 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 					_tmp51_ = _tmp50_.y;
 #line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp40_ = _tmp48_ >= _tmp51_;
-#line 7232 "CheckerboardLayout.c"
+#line 7278 "CheckerboardLayout.c"
 				} else {
 #line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp40_ = FALSE;
-#line 7236 "CheckerboardLayout.c"
+#line 7282 "CheckerboardLayout.c"
 				}
 #line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp40_) {
-#line 7240 "CheckerboardLayout.c"
-					gint _tmp52_ = 0;
-					CheckerboardItem* _tmp53_ = NULL;
-					GdkRectangle _tmp54_ = {0};
-					gint _tmp55_ = 0;
-					CheckerboardItem* _tmp56_ = NULL;
-					GdkRectangle _tmp57_ = {0};
-					gint _tmp58_ = 0;
+#line 7286 "CheckerboardLayout.c"
+					gint _tmp52_;
+					CheckerboardItem* _tmp53_;
+					GdkRectangle _tmp54_;
+					gint _tmp55_;
+					CheckerboardItem* _tmp56_;
+					GdkRectangle _tmp57_;
+					gint _tmp58_;
 #line 1234 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp52_ = y;
 #line 1234 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -7260,11 +7306,11 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 					_tmp58_ = _tmp57_.height;
 #line 1234 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp39_ = _tmp52_ <= (_tmp55_ + _tmp58_);
-#line 7264 "CheckerboardLayout.c"
+#line 7310 "CheckerboardLayout.c"
 				} else {
 #line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp39_ = FALSE;
-#line 7268 "CheckerboardLayout.c"
+#line 7314 "CheckerboardLayout.c"
 				}
 #line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp39_) {
@@ -7274,11 +7320,11 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 					_checkerboard_layout_layout_row_unref0 (in_range);
 #line 1235 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					return result;
-#line 7278 "CheckerboardLayout.c"
+#line 7324 "CheckerboardLayout.c"
 				}
 #line 1220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (item);
-#line 7282 "CheckerboardLayout.c"
+#line 7328 "CheckerboardLayout.c"
 			}
 		}
 	}
@@ -7288,68 +7334,68 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 	_checkerboard_layout_layout_row_unref0 (in_range);
 #line 1238 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 7292 "CheckerboardLayout.c"
+#line 7338 "CheckerboardLayout.c"
 }
 
 
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_ = 0L;
-	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 7310 "CheckerboardLayout.c"
+#line 7356 "CheckerboardLayout.c"
 }
 
 
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 7333 "CheckerboardLayout.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 7379 "CheckerboardLayout.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 7341 "CheckerboardLayout.c"
+#line 7387 "CheckerboardLayout.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 7353 "CheckerboardLayout.c"
+#line 7399 "CheckerboardLayout.c"
 	}
 }
 
@@ -7358,138 +7404,138 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 7377 "CheckerboardLayout.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 7423 "CheckerboardLayout.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 7383 "CheckerboardLayout.c"
+#line 7429 "CheckerboardLayout.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 7387 "CheckerboardLayout.c"
+#line 7433 "CheckerboardLayout.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 7391 "CheckerboardLayout.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 7437 "CheckerboardLayout.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 7403 "CheckerboardLayout.c"
+#line 7449 "CheckerboardLayout.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 7413 "CheckerboardLayout.c"
+#line 7459 "CheckerboardLayout.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 7419 "CheckerboardLayout.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 7465 "CheckerboardLayout.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 7433 "CheckerboardLayout.c"
+#line 7479 "CheckerboardLayout.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 7443 "CheckerboardLayout.c"
+#line 7489 "CheckerboardLayout.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 7449 "CheckerboardLayout.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 7495 "CheckerboardLayout.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 7458 "CheckerboardLayout.c"
+#line 7504 "CheckerboardLayout.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 7478 "CheckerboardLayout.c"
+#line 7524 "CheckerboardLayout.c"
 }
 
 
 gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos) {
 	gint result = 0;
 	gint sep_len = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gint len = 0;
-	const gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	const gchar* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 	gboolean _tmp6_ = FALSE;
-	gint _tmp7_ = 0;
+	gint _tmp7_;
 	gint index = 0;
 #line 1241 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (tag_list != NULL, 0);
@@ -7517,17 +7563,17 @@ gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos)
 	if (_tmp7_ < 0) {
 #line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = TRUE;
-#line 7521 "CheckerboardLayout.c"
+#line 7567 "CheckerboardLayout.c"
 	} else {
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
+		gint _tmp8_;
+		gint _tmp9_;
 #line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = pos;
 #line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp9_ = len;
 #line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = _tmp8_ >= _tmp9_;
-#line 7531 "CheckerboardLayout.c"
+#line 7577 "CheckerboardLayout.c"
 	}
 #line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp6_) {
@@ -7535,37 +7581,37 @@ gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos)
 		result = -1;
 #line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 7539 "CheckerboardLayout.c"
+#line 7585 "CheckerboardLayout.c"
 	}
 	{
 		gint i = 0;
 #line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		i = 0;
-#line 7545 "CheckerboardLayout.c"
+#line 7591 "CheckerboardLayout.c"
 		{
 			gboolean _tmp10_ = FALSE;
 #line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp10_ = TRUE;
 #line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			while (TRUE) {
-#line 7552 "CheckerboardLayout.c"
-				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
+#line 7598 "CheckerboardLayout.c"
+				gint _tmp12_;
+				gint _tmp13_;
 				gboolean _tmp14_ = FALSE;
-				const gchar* _tmp15_ = NULL;
-				gint _tmp16_ = 0;
-				gchar _tmp17_ = '\0';
-				gint _tmp18_ = 0;
-				gchar _tmp19_ = '\0';
+				const gchar* _tmp15_;
+				gint _tmp16_;
+				gchar _tmp17_;
+				gint _tmp18_;
+				gchar _tmp19_;
 #line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (!_tmp10_) {
-#line 7563 "CheckerboardLayout.c"
-					gint _tmp11_ = 0;
+#line 7609 "CheckerboardLayout.c"
+					gint _tmp11_;
 #line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp11_ = i;
 #line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					i = _tmp11_ + 1;
-#line 7569 "CheckerboardLayout.c"
+#line 7615 "CheckerboardLayout.c"
 				}
 #line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp10_ = FALSE;
@@ -7577,7 +7623,7 @@ gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos)
 				if (!(_tmp12_ < _tmp13_)) {
 #line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 7581 "CheckerboardLayout.c"
+#line 7627 "CheckerboardLayout.c"
 				}
 #line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp15_ = tag_list;
@@ -7591,31 +7637,31 @@ gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos)
 				_tmp19_ = string_get (TAG_TAG_LIST_SEPARATOR_STRING, (glong) _tmp18_);
 #line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp17_ == _tmp19_) {
-#line 7595 "CheckerboardLayout.c"
-					gint _tmp20_ = 0;
-					gint _tmp21_ = 0;
+#line 7641 "CheckerboardLayout.c"
+					gint _tmp20_;
+					gint _tmp21_;
 #line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp20_ = pos;
 #line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp21_ = i;
 #line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp14_ = _tmp20_ >= _tmp21_;
-#line 7604 "CheckerboardLayout.c"
+#line 7650 "CheckerboardLayout.c"
 				} else {
 #line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp14_ = FALSE;
-#line 7608 "CheckerboardLayout.c"
+#line 7654 "CheckerboardLayout.c"
 				}
 #line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp14_) {
-#line 7612 "CheckerboardLayout.c"
-					const gchar* _tmp22_ = NULL;
-					gint _tmp23_ = 0;
-					gint _tmp24_ = 0;
-					gint _tmp25_ = 0;
-					gchar* _tmp26_ = NULL;
-					gchar* _tmp27_ = NULL;
-					gboolean _tmp28_ = FALSE;
+#line 7658 "CheckerboardLayout.c"
+					const gchar* _tmp22_;
+					gint _tmp23_;
+					gint _tmp24_;
+					gint _tmp25_;
+					gchar* _tmp26_;
+					gchar* _tmp27_;
+					gboolean _tmp28_;
 #line 1251 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp22_ = tag_list;
 #line 1251 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -7638,7 +7684,7 @@ gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos)
 						result = -1;
 #line 1252 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						return result;
-#line 7642 "CheckerboardLayout.c"
+#line 7688 "CheckerboardLayout.c"
 					}
 				}
 			}
@@ -7646,36 +7692,36 @@ gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos)
 	}
 #line 1259 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	index = 0;
-#line 7650 "CheckerboardLayout.c"
+#line 7696 "CheckerboardLayout.c"
 	{
 		gint i = 0;
 #line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		i = 0;
-#line 7655 "CheckerboardLayout.c"
+#line 7701 "CheckerboardLayout.c"
 		{
 			gboolean _tmp29_ = FALSE;
 #line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp29_ = TRUE;
 #line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			while (TRUE) {
-#line 7662 "CheckerboardLayout.c"
-				gint _tmp31_ = 0;
-				gint _tmp32_ = 0;
+#line 7708 "CheckerboardLayout.c"
+				gint _tmp31_;
+				gint _tmp32_;
 				gboolean _tmp33_ = FALSE;
 				gboolean _tmp34_ = FALSE;
-				const gchar* _tmp35_ = NULL;
-				gint _tmp36_ = 0;
-				gchar _tmp37_ = '\0';
-				gchar _tmp38_ = '\0';
+				const gchar* _tmp35_;
+				gint _tmp36_;
+				gchar _tmp37_;
+				gchar _tmp38_;
 #line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (!_tmp29_) {
-#line 7673 "CheckerboardLayout.c"
-					gint _tmp30_ = 0;
+#line 7719 "CheckerboardLayout.c"
+					gint _tmp30_;
 #line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp30_ = i;
 #line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					i = _tmp30_ + 1;
-#line 7679 "CheckerboardLayout.c"
+#line 7725 "CheckerboardLayout.c"
 				}
 #line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp29_ = FALSE;
@@ -7687,7 +7733,7 @@ gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos)
 				if (!(_tmp31_ < _tmp32_)) {
 #line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 7691 "CheckerboardLayout.c"
+#line 7737 "CheckerboardLayout.c"
 				}
 #line 1261 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp35_ = tag_list;
@@ -7699,10 +7745,10 @@ gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos)
 				_tmp38_ = string_get (TAG_TAG_LIST_SEPARATOR_STRING, (glong) 0);
 #line 1261 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp37_ == _tmp38_) {
-#line 7703 "CheckerboardLayout.c"
-					gint _tmp39_ = 0;
-					gint _tmp40_ = 0;
-					gint _tmp41_ = 0;
+#line 7749 "CheckerboardLayout.c"
+					gint _tmp39_;
+					gint _tmp40_;
+					gint _tmp41_;
 #line 1262 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp39_ = i;
 #line 1262 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -7711,20 +7757,20 @@ gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos)
 					_tmp41_ = len;
 #line 1262 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp34_ = (_tmp39_ + _tmp40_) <= _tmp41_;
-#line 7715 "CheckerboardLayout.c"
+#line 7761 "CheckerboardLayout.c"
 				} else {
 #line 1261 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp34_ = FALSE;
-#line 7719 "CheckerboardLayout.c"
+#line 7765 "CheckerboardLayout.c"
 				}
 #line 1261 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp34_) {
-#line 7723 "CheckerboardLayout.c"
-					const gchar* _tmp42_ = NULL;
-					gint _tmp43_ = 0;
-					gint _tmp44_ = 0;
-					gchar* _tmp45_ = NULL;
-					gchar* _tmp46_ = NULL;
+#line 7769 "CheckerboardLayout.c"
+					const gchar* _tmp42_;
+					gint _tmp43_;
+					gint _tmp44_;
+					gchar* _tmp45_;
+					gchar* _tmp46_;
 #line 1263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp42_ = tag_list;
 #line 1263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -7739,18 +7785,18 @@ gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos)
 					_tmp33_ = g_strcmp0 (_tmp46_, TAG_TAG_LIST_SEPARATOR_STRING) == 0;
 #line 1263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_g_free0 (_tmp46_);
-#line 7743 "CheckerboardLayout.c"
+#line 7789 "CheckerboardLayout.c"
 				} else {
 #line 1261 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp33_ = FALSE;
-#line 7747 "CheckerboardLayout.c"
+#line 7793 "CheckerboardLayout.c"
 				}
 #line 1261 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp33_) {
-#line 7751 "CheckerboardLayout.c"
-					gint _tmp47_ = 0;
-					gint _tmp48_ = 0;
-					gint _tmp49_ = 0;
+#line 7797 "CheckerboardLayout.c"
+					gint _tmp47_;
+					gint _tmp48_;
+					gint _tmp49_;
 #line 1264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp47_ = index;
 #line 1264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -7761,7 +7807,7 @@ gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos)
 					_tmp49_ = sep_len;
 #line 1265 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					i = _tmp48_ + (_tmp49_ - 1);
-#line 7765 "CheckerboardLayout.c"
+#line 7811 "CheckerboardLayout.c"
 				}
 			}
 		}
@@ -7770,35 +7816,35 @@ gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos)
 	result = index;
 #line 1268 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 7774 "CheckerboardLayout.c"
+#line 7820 "CheckerboardLayout.c"
 }
 
 
 static gint checkerboard_layout_internal_handle_tag_mouse_event (CheckerboardLayout* self, CheckerboardItem* item, gint x, gint y) {
 	gint result = 0;
 	PangoLayout* layout = NULL;
-	CheckerboardItem* _tmp0_ = NULL;
-	PangoLayout* _tmp1_ = NULL;
-	PangoLayout* _tmp2_ = NULL;
+	CheckerboardItem* _tmp0_;
+	PangoLayout* _tmp1_;
+	PangoLayout* _tmp2_;
 	GdkRectangle rect = {0};
-	CheckerboardItem* _tmp3_ = NULL;
+	CheckerboardItem* _tmp3_;
 	GdkRectangle _tmp4_ = {0};
 	gint index = 0;
 	gint trailing = 0;
 	gint px = 0;
-	gint _tmp5_ = 0;
-	GdkRectangle _tmp6_ = {0};
-	gint _tmp7_ = 0;
+	gint _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
 	gint py = 0;
-	gint _tmp8_ = 0;
-	GdkRectangle _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	PangoLayout* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
+	gint _tmp8_;
+	GdkRectangle _tmp9_;
+	gint _tmp10_;
+	PangoLayout* _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
 	gint _tmp14_ = 0;
 	gint _tmp15_ = 0;
-	gboolean _tmp16_ = FALSE;
+	gboolean _tmp16_;
 #line 1271 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), 0);
 #line 1271 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -7819,7 +7865,7 @@ static gint checkerboard_layout_internal_handle_tag_mouse_event (CheckerboardLay
 		_g_object_unref0 (layout);
 #line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 7823 "CheckerboardLayout.c"
+#line 7869 "CheckerboardLayout.c"
 	}
 #line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = item;
@@ -7857,11 +7903,11 @@ static gint checkerboard_layout_internal_handle_tag_mouse_event (CheckerboardLay
 	trailing = _tmp15_;
 #line 1279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp16_) {
-#line 7861 "CheckerboardLayout.c"
-		PangoLayout* _tmp17_ = NULL;
-		const gchar* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
-		gint _tmp20_ = 0;
+#line 7907 "CheckerboardLayout.c"
+		PangoLayout* _tmp17_;
+		const gchar* _tmp18_;
+		gint _tmp19_;
+		gint _tmp20_;
 #line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp17_ = layout;
 #line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -7876,7 +7922,7 @@ static gint checkerboard_layout_internal_handle_tag_mouse_event (CheckerboardLay
 		_g_object_unref0 (layout);
 #line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 7880 "CheckerboardLayout.c"
+#line 7926 "CheckerboardLayout.c"
 	}
 #line 1281 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = -1;
@@ -7884,24 +7930,24 @@ static gint checkerboard_layout_internal_handle_tag_mouse_event (CheckerboardLay
 	_g_object_unref0 (layout);
 #line 1281 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 7888 "CheckerboardLayout.c"
+#line 7934 "CheckerboardLayout.c"
 }
 
 
 gboolean checkerboard_layout_handle_mouse_motion (CheckerboardLayout* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	CheckerboardItem* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	CheckerboardItem* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 	gint tag_index = 0;
-	CheckerboardItem* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	CheckerboardItem* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	CheckerboardItem* _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	CheckerboardItem* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 #line 1284 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), FALSE);
 #line 1284 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -7916,14 +7962,14 @@ gboolean checkerboard_layout_handle_mouse_motion (CheckerboardLayout* self, Chec
 	if (!_tmp3_) {
 #line 1285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = TRUE;
-#line 7920 "CheckerboardLayout.c"
+#line 7966 "CheckerboardLayout.c"
 	} else {
-		gboolean _tmp4_ = FALSE;
+		gboolean _tmp4_;
 #line 1285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = checkerboard_layout_is_drag_select_active (self);
 #line 1285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp4_;
-#line 7927 "CheckerboardLayout.c"
+#line 7973 "CheckerboardLayout.c"
 	}
 #line 1285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
@@ -7931,7 +7977,7 @@ gboolean checkerboard_layout_handle_mouse_motion (CheckerboardLayout* self, Chec
 		result = FALSE;
 #line 1286 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 7935 "CheckerboardLayout.c"
+#line 7981 "CheckerboardLayout.c"
 	}
 #line 1287 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = item;
@@ -7955,20 +8001,20 @@ gboolean checkerboard_layout_handle_mouse_motion (CheckerboardLayout* self, Chec
 	result = _tmp11_ >= 0;
 #line 1289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 7959 "CheckerboardLayout.c"
+#line 8005 "CheckerboardLayout.c"
 }
 
 
 gboolean checkerboard_layout_handle_left_click (CheckerboardLayout* self, CheckerboardItem* item, gdouble xd, gdouble yd, GdkModifierType mask) {
 	gboolean result = FALSE;
 	gint tag_index = 0;
-	CheckerboardItem* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
-	gdouble _tmp4_ = 0.0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	CheckerboardItem* _tmp0_;
+	gdouble _tmp1_;
+	gdouble _tmp2_;
+	gdouble _tmp3_;
+	gdouble _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 #line 1292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), FALSE);
 #line 1292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -7991,14 +8037,14 @@ gboolean checkerboard_layout_handle_left_click (CheckerboardLayout* self, Checke
 	_tmp6_ = tag_index;
 #line 1294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp6_ >= 0) {
-#line 7995 "CheckerboardLayout.c"
+#line 8041 "CheckerboardLayout.c"
 		Tag* tag = NULL;
-		CheckerboardItem* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		Tag* _tmp9_ = NULL;
-		LibraryWindow* _tmp10_ = NULL;
-		LibraryWindow* _tmp11_ = NULL;
-		Tag* _tmp12_ = NULL;
+		CheckerboardItem* _tmp7_;
+		gint _tmp8_;
+		Tag* _tmp9_;
+		LibraryWindow* _tmp10_;
+		LibraryWindow* _tmp11_;
+		Tag* _tmp12_;
 #line 1295 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = item;
 #line 1295 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8023,20 +8069,20 @@ gboolean checkerboard_layout_handle_left_click (CheckerboardLayout* self, Checke
 		_g_object_unref0 (tag);
 #line 1297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 8027 "CheckerboardLayout.c"
+#line 8073 "CheckerboardLayout.c"
 	}
 #line 1299 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = FALSE;
 #line 1299 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 8033 "CheckerboardLayout.c"
+#line 8079 "CheckerboardLayout.c"
 }
 
 
 GeeList* checkerboard_layout_get_visible_items (CheckerboardLayout* self) {
 	GeeList* result = NULL;
-	GdkRectangle _tmp0_ = {0};
-	GeeList* _tmp1_ = NULL;
+	GdkRectangle _tmp0_;
+	GeeList* _tmp1_;
 #line 1302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL);
 #line 1303 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8047,19 +8093,19 @@ GeeList* checkerboard_layout_get_visible_items (CheckerboardLayout* self) {
 	result = _tmp1_;
 #line 1303 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 8051 "CheckerboardLayout.c"
+#line 8097 "CheckerboardLayout.c"
 }
 
 
 GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangle* area) {
 	GeeList* result = NULL;
 	GeeArrayList* intersects = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 	GtkAllocation allocation = {0};
 	GtkAllocation _tmp1_ = {0};
 	GdkRectangle bitbucket = {0};
-	CheckerboardLayoutLayoutRow** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	CheckerboardLayoutLayoutRow** _tmp2_;
+	gint _tmp2__length1;
 #line 1306 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL);
 #line 1306 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8078,7 +8124,7 @@ GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangl
 	_tmp2_ = self->priv->item_rows;
 #line 1313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2__length1 = self->priv->item_rows_length1;
-#line 8082 "CheckerboardLayout.c"
+#line 8128 "CheckerboardLayout.c"
 	{
 		CheckerboardLayoutLayoutRow** row_collection = NULL;
 		gint row_collection_length1 = 0;
@@ -8090,38 +8136,38 @@ GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangl
 		row_collection_length1 = _tmp2__length1;
 #line 1313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		for (row_it = 0; row_it < _tmp2__length1; row_it = row_it + 1) {
-#line 8094 "CheckerboardLayout.c"
-			CheckerboardLayoutLayoutRow* _tmp3_ = NULL;
+#line 8140 "CheckerboardLayout.c"
+			CheckerboardLayoutLayoutRow* _tmp3_;
 			CheckerboardLayoutLayoutRow* row = NULL;
 #line 1313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp3_ = _checkerboard_layout_layout_row_ref0 (row_collection[row_it]);
 #line 1313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			row = _tmp3_;
-#line 8101 "CheckerboardLayout.c"
+#line 8147 "CheckerboardLayout.c"
 			{
-				CheckerboardLayoutLayoutRow* _tmp4_ = NULL;
-				GdkRectangle _tmp5_ = {0};
-				gint _tmp6_ = 0;
-				GdkRectangle _tmp7_ = {0};
-				gint _tmp8_ = 0;
-				CheckerboardLayoutLayoutRow* _tmp9_ = NULL;
-				gint _tmp10_ = 0;
-				CheckerboardLayoutLayoutRow* _tmp11_ = NULL;
-				gint _tmp12_ = 0;
-				CheckerboardLayoutLayoutRow* _tmp13_ = NULL;
-				gint _tmp14_ = 0;
-				GdkRectangle _tmp15_ = {0};
-				gint _tmp16_ = 0;
+				CheckerboardLayoutLayoutRow* _tmp4_;
+				GdkRectangle _tmp5_;
+				gint _tmp6_;
+				GdkRectangle _tmp7_;
+				gint _tmp8_;
+				CheckerboardLayoutLayoutRow* _tmp9_;
+				gint _tmp10_;
+				CheckerboardLayoutLayoutRow* _tmp11_;
+				gint _tmp12_;
+				CheckerboardLayoutLayoutRow* _tmp13_;
+				gint _tmp14_;
+				GdkRectangle _tmp15_;
+				gint _tmp16_;
 				GdkRectangle row_rect = {0};
-				CheckerboardLayoutLayoutRow* _tmp17_ = NULL;
-				gint _tmp18_ = 0;
-				GtkAllocation _tmp19_ = {0};
-				gint _tmp20_ = 0;
-				CheckerboardLayoutLayoutRow* _tmp21_ = NULL;
-				gint _tmp22_ = 0;
-				GdkRectangle _tmp23_ = {0};
+				CheckerboardLayoutLayoutRow* _tmp17_;
+				gint _tmp18_;
+				GtkAllocation _tmp19_;
+				gint _tmp20_;
+				CheckerboardLayoutLayoutRow* _tmp21_;
+				gint _tmp22_;
+				GdkRectangle _tmp23_;
 				GdkRectangle _tmp24_ = {0};
-				gboolean _tmp25_ = FALSE;
+				gboolean _tmp25_;
 #line 1314 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp4_ = row;
 #line 1314 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8130,7 +8176,7 @@ GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangl
 					_checkerboard_layout_layout_row_unref0 (row);
 #line 1315 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					continue;
-#line 8134 "CheckerboardLayout.c"
+#line 8180 "CheckerboardLayout.c"
 				}
 #line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp5_ = *area;
@@ -8150,7 +8196,7 @@ GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangl
 					_checkerboard_layout_layout_row_unref0 (row);
 #line 1319 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 8154 "CheckerboardLayout.c"
+#line 8200 "CheckerboardLayout.c"
 				}
 #line 1322 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp11_ = row;
@@ -8170,7 +8216,7 @@ GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangl
 					_checkerboard_layout_layout_row_unref0 (row);
 #line 1324 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					continue;
-#line 8174 "CheckerboardLayout.c"
+#line 8220 "CheckerboardLayout.c"
 				}
 #line 1328 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				memset (&row_rect, 0, sizeof (GdkRectangle));
@@ -8202,17 +8248,17 @@ GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangl
 				bitbucket = _tmp24_;
 #line 1334 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp25_) {
-#line 8206 "CheckerboardLayout.c"
-					CheckerboardLayoutLayoutRow* _tmp26_ = NULL;
-					CheckerboardItem** _tmp27_ = NULL;
-					gint _tmp27__length1 = 0;
+#line 8252 "CheckerboardLayout.c"
+					CheckerboardLayoutLayoutRow* _tmp26_;
+					CheckerboardItem** _tmp27_;
+					gint _tmp27__length1;
 #line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp26_ = row;
 #line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp27_ = _tmp26_->items;
 #line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp27__length1 = _tmp26_->items_length1;
-#line 8216 "CheckerboardLayout.c"
+#line 8262 "CheckerboardLayout.c"
 					{
 						CheckerboardItem** item_collection = NULL;
 						gint item_collection_length1 = 0;
@@ -8224,20 +8270,20 @@ GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangl
 						item_collection_length1 = _tmp27__length1;
 #line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						for (item_it = 0; item_it < _tmp27__length1; item_it = item_it + 1) {
-#line 8228 "CheckerboardLayout.c"
-							CheckerboardItem* _tmp28_ = NULL;
+#line 8274 "CheckerboardLayout.c"
+							CheckerboardItem* _tmp28_;
 							CheckerboardItem* item = NULL;
 #line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp28_ = _g_object_ref0 (item_collection[item_it]);
 #line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							item = _tmp28_;
-#line 8235 "CheckerboardLayout.c"
+#line 8281 "CheckerboardLayout.c"
 							{
-								CheckerboardItem* _tmp29_ = NULL;
-								CheckerboardItem* _tmp30_ = NULL;
-								GdkRectangle _tmp31_ = {0};
+								CheckerboardItem* _tmp29_;
+								CheckerboardItem* _tmp30_;
+								GdkRectangle _tmp31_;
 								GdkRectangle _tmp32_ = {0};
-								gboolean _tmp33_ = FALSE;
+								gboolean _tmp33_;
 #line 1337 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 								_tmp29_ = item;
 #line 1337 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8246,7 +8292,7 @@ GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangl
 									_g_object_unref0 (item);
 #line 1338 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 									continue;
-#line 8250 "CheckerboardLayout.c"
+#line 8296 "CheckerboardLayout.c"
 								}
 #line 1340 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 								_tmp30_ = item;
@@ -8258,27 +8304,27 @@ GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangl
 								bitbucket = _tmp32_;
 #line 1340 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 								if (_tmp33_) {
-#line 8262 "CheckerboardLayout.c"
-									GeeArrayList* _tmp34_ = NULL;
-									CheckerboardItem* _tmp35_ = NULL;
+#line 8308 "CheckerboardLayout.c"
+									GeeArrayList* _tmp34_;
+									CheckerboardItem* _tmp35_;
 #line 1341 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 									_tmp34_ = intersects;
 #line 1341 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 									_tmp35_ = item;
 #line 1341 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 									gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp35_);
-#line 8271 "CheckerboardLayout.c"
+#line 8317 "CheckerboardLayout.c"
 								}
 #line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 								_g_object_unref0 (item);
-#line 8275 "CheckerboardLayout.c"
+#line 8321 "CheckerboardLayout.c"
 							}
 						}
 					}
 				}
 #line 1313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_checkerboard_layout_layout_row_unref0 (row);
-#line 8282 "CheckerboardLayout.c"
+#line 8328 "CheckerboardLayout.c"
 			}
 		}
 	}
@@ -8286,34 +8332,34 @@ GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangl
 	result = G_TYPE_CHECK_INSTANCE_CAST (intersects, GEE_TYPE_LIST, GeeList);
 #line 1346 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 8290 "CheckerboardLayout.c"
+#line 8336 "CheckerboardLayout.c"
 }
 
 
 CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout* self, CheckerboardItem* item, CompassPoint point) {
 	CheckerboardItem* result = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	ViewCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	gint col = 0;
-	CheckerboardItem* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	CheckerboardItem* _tmp4_;
+	gint _tmp5_;
 	gint row = 0;
-	CheckerboardItem* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
+	CheckerboardItem* _tmp6_;
+	gint _tmp7_;
 	gboolean _tmp8_ = FALSE;
-	gint _tmp9_ = 0;
-	CompassPoint _tmp14_ = 0;
+	gint _tmp9_;
+	CompassPoint _tmp14_;
 	CheckerboardItem* new_item = NULL;
-	gint _tmp35_ = 0;
-	gint _tmp36_ = 0;
-	CheckerboardItem* _tmp37_ = NULL;
+	gint _tmp35_;
+	gint _tmp36_;
+	CheckerboardItem* _tmp37_;
 	gboolean _tmp38_ = FALSE;
-	CheckerboardItem* _tmp39_ = NULL;
+	CheckerboardItem* _tmp39_;
 	CheckerboardItem* _tmp47_ = NULL;
-	CheckerboardItem* _tmp48_ = NULL;
-	CheckerboardItem* _tmp51_ = NULL;
+	CheckerboardItem* _tmp48_;
+	CheckerboardItem* _tmp51_;
 #line 1349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL);
 #line 1349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8328,7 +8374,7 @@ CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout*
 		result = NULL;
 #line 1351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 8332 "CheckerboardLayout.c"
+#line 8378 "CheckerboardLayout.c"
 	}
 #line 1353 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = self->priv->columns;
@@ -8356,21 +8402,21 @@ CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout*
 	if (_tmp9_ < 0) {
 #line 1359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = TRUE;
-#line 8360 "CheckerboardLayout.c"
+#line 8406 "CheckerboardLayout.c"
 	} else {
-		gint _tmp10_ = 0;
+		gint _tmp10_;
 #line 1359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp10_ = row;
 #line 1359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = _tmp10_ < 0;
-#line 8367 "CheckerboardLayout.c"
+#line 8413 "CheckerboardLayout.c"
 	}
 #line 1359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp8_) {
-#line 8371 "CheckerboardLayout.c"
-		CheckerboardItem* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
+#line 8417 "CheckerboardLayout.c"
+		CheckerboardItem* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
 #line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp11_ = item;
 #line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8386,7 +8432,7 @@ CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout*
 		result = NULL;
 #line 1362 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 8389 "CheckerboardLayout.c"
+#line 8435 "CheckerboardLayout.c"
 	}
 #line 1365 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp14_ = point;
@@ -8394,10 +8440,10 @@ CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout*
 	switch (_tmp14_) {
 #line 1365 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		case COMPASS_POINT_NORTH:
-#line 8397 "CheckerboardLayout.c"
+#line 8443 "CheckerboardLayout.c"
 		{
-			gint _tmp15_ = 0;
-			gint _tmp16_ = 0;
+			gint _tmp15_;
+			gint _tmp16_;
 #line 1367 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp15_ = row;
 #line 1367 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8408,19 +8454,19 @@ CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout*
 			if (_tmp16_ < 0) {
 #line 1368 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				row = 0;
-#line 8411 "CheckerboardLayout.c"
+#line 8457 "CheckerboardLayout.c"
 			}
 #line 1369 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			break;
-#line 8415 "CheckerboardLayout.c"
+#line 8461 "CheckerboardLayout.c"
 		}
 #line 1365 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		case COMPASS_POINT_SOUTH:
-#line 8419 "CheckerboardLayout.c"
+#line 8465 "CheckerboardLayout.c"
 		{
-			gint _tmp17_ = 0;
-			gint _tmp18_ = 0;
-			gint _tmp19_ = 0;
+			gint _tmp17_;
+			gint _tmp18_;
+			gint _tmp19_;
 #line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp17_ = row;
 #line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8431,25 +8477,25 @@ CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout*
 			_tmp19_ = self->priv->rows;
 #line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp18_ >= _tmp19_) {
-#line 8434 "CheckerboardLayout.c"
-				gint _tmp20_ = 0;
+#line 8480 "CheckerboardLayout.c"
+				gint _tmp20_;
 #line 1373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp20_ = self->priv->rows;
 #line 1373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				row = _tmp20_ - 1;
-#line 8440 "CheckerboardLayout.c"
+#line 8486 "CheckerboardLayout.c"
 			}
 #line 1374 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			break;
-#line 8444 "CheckerboardLayout.c"
+#line 8490 "CheckerboardLayout.c"
 		}
 #line 1365 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		case COMPASS_POINT_EAST:
-#line 8448 "CheckerboardLayout.c"
+#line 8494 "CheckerboardLayout.c"
 		{
-			gint _tmp21_ = 0;
-			gint _tmp22_ = 0;
-			gint _tmp23_ = 0;
+			gint _tmp21_;
+			gint _tmp22_;
+			gint _tmp23_;
 #line 1377 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp21_ = col;
 #line 1377 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8460,10 +8506,10 @@ CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout*
 			_tmp23_ = self->priv->columns;
 #line 1377 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp22_ >= _tmp23_) {
-#line 8463 "CheckerboardLayout.c"
-				gint _tmp24_ = 0;
-				gint _tmp25_ = 0;
-				gint _tmp26_ = 0;
+#line 8509 "CheckerboardLayout.c"
+				gint _tmp24_;
+				gint _tmp25_;
+				gint _tmp26_;
 #line 1378 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp24_ = row;
 #line 1378 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8474,9 +8520,9 @@ CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout*
 				_tmp26_ = self->priv->rows;
 #line 1378 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp25_ >= _tmp26_) {
-#line 8477 "CheckerboardLayout.c"
-					gint _tmp27_ = 0;
-					gint _tmp28_ = 0;
+#line 8523 "CheckerboardLayout.c"
+					gint _tmp27_;
+					gint _tmp28_;
 #line 1379 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp27_ = self->priv->rows;
 #line 1379 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8485,23 +8531,23 @@ CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout*
 					_tmp28_ = self->priv->columns;
 #line 1380 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					col = _tmp28_ - 1;
-#line 8488 "CheckerboardLayout.c"
+#line 8534 "CheckerboardLayout.c"
 				} else {
 #line 1382 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					col = 0;
-#line 8492 "CheckerboardLayout.c"
+#line 8538 "CheckerboardLayout.c"
 				}
 			}
 #line 1385 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			break;
-#line 8497 "CheckerboardLayout.c"
+#line 8543 "CheckerboardLayout.c"
 		}
 #line 1365 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		case COMPASS_POINT_WEST:
-#line 8501 "CheckerboardLayout.c"
+#line 8547 "CheckerboardLayout.c"
 		{
-			gint _tmp29_ = 0;
-			gint _tmp30_ = 0;
+			gint _tmp29_;
+			gint _tmp30_;
 #line 1388 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp29_ = col;
 #line 1388 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8510,9 +8556,9 @@ CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout*
 			_tmp30_ = col;
 #line 1388 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp30_ < 0) {
-#line 8513 "CheckerboardLayout.c"
-				gint _tmp31_ = 0;
-				gint _tmp32_ = 0;
+#line 8559 "CheckerboardLayout.c"
+				gint _tmp31_;
+				gint _tmp32_;
 #line 1389 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp31_ = row;
 #line 1389 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8525,28 +8571,28 @@ CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout*
 					row = 0;
 #line 1391 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					col = 0;
-#line 8528 "CheckerboardLayout.c"
+#line 8574 "CheckerboardLayout.c"
 				} else {
-					gint _tmp33_ = 0;
+					gint _tmp33_;
 #line 1393 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp33_ = self->priv->columns;
 #line 1393 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					col = _tmp33_ - 1;
-#line 8535 "CheckerboardLayout.c"
+#line 8581 "CheckerboardLayout.c"
 				}
 			}
 #line 1396 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			break;
-#line 8540 "CheckerboardLayout.c"
+#line 8586 "CheckerboardLayout.c"
 		}
 		default:
 		{
-			CompassPoint _tmp34_ = 0;
+			CompassPoint _tmp34_;
 #line 1399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp34_ = point;
 #line 1399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			g_error ("CheckerboardLayout.vala:1399: Bad compass point %d", (gint) _tmp34_);
-#line 8549 "CheckerboardLayout.c"
+#line 8595 "CheckerboardLayout.c"
 		}
 	}
 #line 1402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8561,27 +8607,27 @@ CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout*
 	_tmp39_ = new_item;
 #line 1404 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp39_ == NULL) {
-#line 8564 "CheckerboardLayout.c"
-		CompassPoint _tmp40_ = 0;
+#line 8610 "CheckerboardLayout.c"
+		CompassPoint _tmp40_;
 #line 1404 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp40_ = point;
 #line 1404 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp38_ = _tmp40_ == COMPASS_POINT_SOUTH;
-#line 8570 "CheckerboardLayout.c"
+#line 8616 "CheckerboardLayout.c"
 	} else {
 #line 1404 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp38_ = FALSE;
-#line 8574 "CheckerboardLayout.c"
+#line 8620 "CheckerboardLayout.c"
 	}
 #line 1404 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp38_) {
-#line 8578 "CheckerboardLayout.c"
-		ViewCollection* _tmp41_ = NULL;
-		DataView* _tmp42_ = NULL;
-		CheckerboardItem* _tmp43_ = NULL;
-		gint _tmp44_ = 0;
-		CheckerboardItem* _tmp45_ = NULL;
-		gint _tmp46_ = 0;
+#line 8624 "CheckerboardLayout.c"
+		ViewCollection* _tmp41_;
+		DataView* _tmp42_;
+		CheckerboardItem* _tmp43_;
+		gint _tmp44_;
+		CheckerboardItem* _tmp45_;
+		gint _tmp46_;
 #line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp41_ = self->priv->view;
 #line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8604,27 +8650,27 @@ CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout*
 			_g_object_unref0 (new_item);
 #line 1408 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			new_item = NULL;
-#line 8607 "CheckerboardLayout.c"
+#line 8653 "CheckerboardLayout.c"
 		}
 	}
 #line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp48_ = new_item;
 #line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp48_ != NULL) {
-#line 8614 "CheckerboardLayout.c"
-		CheckerboardItem* _tmp49_ = NULL;
+#line 8660 "CheckerboardLayout.c"
+		CheckerboardItem* _tmp49_;
 #line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp49_ = new_item;
 #line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp47_ = _tmp49_;
-#line 8620 "CheckerboardLayout.c"
+#line 8666 "CheckerboardLayout.c"
 	} else {
-		CheckerboardItem* _tmp50_ = NULL;
+		CheckerboardItem* _tmp50_;
 #line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp50_ = item;
 #line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp47_ = _tmp50_;
-#line 8627 "CheckerboardLayout.c"
+#line 8673 "CheckerboardLayout.c"
 	}
 #line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp51_ = _g_object_ref0 (_tmp47_);
@@ -8634,32 +8680,32 @@ CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout*
 	_g_object_unref0 (new_item);
 #line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 8637 "CheckerboardLayout.c"
+#line 8683 "CheckerboardLayout.c"
 }
 
 
 CheckerboardItem* checkerboard_layout_get_item_at_coordinate (CheckerboardLayout* self, gint col, gint row) {
 	CheckerboardItem* result = NULL;
-	gint _tmp0_ = 0;
-	CheckerboardLayoutLayoutRow** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	gint _tmp0_;
+	CheckerboardLayoutLayoutRow** _tmp1_;
+	gint _tmp1__length1;
 	CheckerboardLayoutLayoutRow* item_row = NULL;
-	CheckerboardLayoutLayoutRow** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	gint _tmp3_ = 0;
-	CheckerboardLayoutLayoutRow* _tmp4_ = NULL;
-	CheckerboardLayoutLayoutRow* _tmp5_ = NULL;
-	CheckerboardLayoutLayoutRow* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	CheckerboardLayoutLayoutRow* _tmp8_ = NULL;
-	CheckerboardItem** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	CheckerboardLayoutLayoutRow* _tmp10_ = NULL;
-	CheckerboardItem** _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-	gint _tmp12_ = 0;
-	CheckerboardItem* _tmp13_ = NULL;
-	CheckerboardItem* _tmp14_ = NULL;
+	CheckerboardLayoutLayoutRow** _tmp2_;
+	gint _tmp2__length1;
+	gint _tmp3_;
+	CheckerboardLayoutLayoutRow* _tmp4_;
+	CheckerboardLayoutLayoutRow* _tmp5_;
+	CheckerboardLayoutLayoutRow* _tmp6_;
+	gint _tmp7_;
+	CheckerboardLayoutLayoutRow* _tmp8_;
+	CheckerboardItem** _tmp9_;
+	gint _tmp9__length1;
+	CheckerboardLayoutLayoutRow* _tmp10_;
+	CheckerboardItem** _tmp11_;
+	gint _tmp11__length1;
+	gint _tmp12_;
+	CheckerboardItem* _tmp13_;
+	CheckerboardItem* _tmp14_;
 #line 1414 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL);
 #line 1415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8674,7 +8720,7 @@ CheckerboardItem* checkerboard_layout_get_item_at_coordinate (CheckerboardLayout
 		result = NULL;
 #line 1416 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 8677 "CheckerboardLayout.c"
+#line 8723 "CheckerboardLayout.c"
 	}
 #line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = self->priv->item_rows;
@@ -8698,7 +8744,7 @@ CheckerboardItem* checkerboard_layout_get_item_at_coordinate (CheckerboardLayout
 		_checkerboard_layout_layout_row_unref0 (item_row);
 #line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 8701 "CheckerboardLayout.c"
+#line 8747 "CheckerboardLayout.c"
 	}
 #line 1422 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = col;
@@ -8716,7 +8762,7 @@ CheckerboardItem* checkerboard_layout_get_item_at_coordinate (CheckerboardLayout
 		_checkerboard_layout_layout_row_unref0 (item_row);
 #line 1423 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 8719 "CheckerboardLayout.c"
+#line 8765 "CheckerboardLayout.c"
 	}
 #line 1425 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp10_ = item_row;
@@ -8736,21 +8782,21 @@ CheckerboardItem* checkerboard_layout_get_item_at_coordinate (CheckerboardLayout
 	_checkerboard_layout_layout_row_unref0 (item_row);
 #line 1425 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 8739 "CheckerboardLayout.c"
+#line 8785 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_layout_set_drag_select_origin (CheckerboardLayout* self, gint x, gint y) {
 	GtkAllocation allocation = {0};
 	GtkAllocation _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GtkAllocation _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	GtkAllocation _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	gint _tmp1_;
+	GtkAllocation _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	GtkAllocation _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 #line 1428 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8779,28 +8825,28 @@ void checkerboard_layout_set_drag_select_origin (CheckerboardLayout* self, gint
 	_tmp8_ = CLAMP (_tmp5_, 0, _tmp7_);
 #line 1435 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->drag_origin.y = _tmp8_;
-#line 8782 "CheckerboardLayout.c"
+#line 8828 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_layout_set_drag_select_endpoint (CheckerboardLayout* self, gint x, gint y) {
 	GtkAllocation allocation = {0};
 	GtkAllocation _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GtkAllocation _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	GtkAllocation _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	gint _tmp1_;
+	GtkAllocation _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	GtkAllocation _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 	GdkRectangle old_selection_band = {0};
-	GdkRectangle _tmp9_ = {0};
-	GdkPoint _tmp10_ = {0};
-	GdkPoint _tmp11_ = {0};
+	GdkRectangle _tmp9_;
+	GdkPoint _tmp10_;
+	GdkPoint _tmp11_;
 	Box _tmp12_ = {0};
 	GdkRectangle _tmp13_ = {0};
-	GdkWindow* _tmp14_ = NULL;
+	GdkWindow* _tmp14_;
 #line 1438 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1440 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8845,18 +8891,18 @@ void checkerboard_layout_set_drag_select_endpoint (CheckerboardLayout* self, gin
 	_tmp14_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 1451 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp14_ != NULL) {
-#line 8848 "CheckerboardLayout.c"
+#line 8894 "CheckerboardLayout.c"
 		GdkRectangle _union_ = {0};
-		GdkRectangle _tmp15_ = {0};
+		GdkRectangle _tmp15_;
 		GdkRectangle _tmp16_ = {0};
-		GdkRectangle _tmp17_ = {0};
-		gint _tmp18_ = 0;
-		GdkRectangle _tmp19_ = {0};
-		gint _tmp20_ = 0;
-		GdkRectangle _tmp21_ = {0};
-		gint _tmp22_ = 0;
-		GdkRectangle _tmp23_ = {0};
-		gint _tmp24_ = 0;
+		GdkRectangle _tmp17_;
+		gint _tmp18_;
+		GdkRectangle _tmp19_;
+		gint _tmp20_;
+		GdkRectangle _tmp21_;
+		gint _tmp22_;
+		GdkRectangle _tmp23_;
+		gint _tmp24_;
 #line 1453 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp15_ = old_selection_band;
 #line 1453 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8881,18 +8927,18 @@ void checkerboard_layout_set_drag_select_endpoint (CheckerboardLayout* self, gin
 		_tmp24_ = _tmp23_.height;
 #line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		gtk_widget_queue_draw_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp18_, _tmp20_, _tmp22_, _tmp24_);
-#line 8884 "CheckerboardLayout.c"
+#line 8930 "CheckerboardLayout.c"
 	}
 }
 
 
 GeeList* checkerboard_layout_items_in_selection_band (CheckerboardLayout* self) {
 	GeeList* result = NULL;
-	GdkRectangle _tmp0_ = {0};
+	GdkRectangle _tmp0_;
 	Dimensions _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-	GdkRectangle _tmp3_ = {0};
-	GeeList* _tmp4_ = NULL;
+	gboolean _tmp2_;
+	GdkRectangle _tmp3_;
+	GeeList* _tmp4_;
 #line 1459 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL);
 #line 1460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8907,7 +8953,7 @@ GeeList* checkerboard_layout_items_in_selection_band (CheckerboardLayout* self)
 		result = NULL;
 #line 1461 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 8910 "CheckerboardLayout.c"
+#line 8956 "CheckerboardLayout.c"
 	}
 #line 1463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = self->priv->selection_band;
@@ -8917,15 +8963,15 @@ GeeList* checkerboard_layout_items_in_selection_band (CheckerboardLayout* self)
 	result = _tmp4_;
 #line 1463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 8920 "CheckerboardLayout.c"
+#line 8966 "CheckerboardLayout.c"
 }
 
 
 gboolean checkerboard_layout_is_drag_select_active (CheckerboardLayout* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	GdkPoint _tmp1_ = {0};
-	gint _tmp2_ = 0;
+	GdkPoint _tmp1_;
+	gint _tmp2_;
 #line 1466 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), FALSE);
 #line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8934,26 +8980,26 @@ gboolean checkerboard_layout_is_drag_select_active (CheckerboardLayout* self) {
 	_tmp2_ = _tmp1_.x;
 #line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp2_ >= 0) {
-#line 8937 "CheckerboardLayout.c"
-		GdkPoint _tmp3_ = {0};
-		gint _tmp4_ = 0;
+#line 8983 "CheckerboardLayout.c"
+		GdkPoint _tmp3_;
+		gint _tmp4_;
 #line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = self->priv->drag_origin;
 #line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = _tmp3_.y;
 #line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp4_ >= 0;
-#line 8946 "CheckerboardLayout.c"
+#line 8992 "CheckerboardLayout.c"
 	} else {
 #line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = FALSE;
-#line 8950 "CheckerboardLayout.c"
+#line 8996 "CheckerboardLayout.c"
 	}
 #line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
 #line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 8956 "CheckerboardLayout.c"
+#line 9002 "CheckerboardLayout.c"
 }
 
 
@@ -8972,14 +9018,14 @@ void checkerboard_layout_clear_drag_select (CheckerboardLayout* self) {
 	self->priv->drag_endpoint.y = -1;
 #line 1478 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 8975 "CheckerboardLayout.c"
+#line 9021 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_viewport_resized (CheckerboardLayout* self) {
-	GdkRectangle _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GdkRectangle _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 1481 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1483 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8992,16 +9038,16 @@ static void checkerboard_layout_viewport_resized (CheckerboardLayout* self) {
 	_tmp2_ = self->priv->last_width;
 #line 1486 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != _tmp2_) {
-#line 8995 "CheckerboardLayout.c"
+#line 9041 "CheckerboardLayout.c"
 		gint old_width = 0;
-		gint _tmp3_ = 0;
-		GdkRectangle _tmp4_ = {0};
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
-		GdkRectangle _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
+		gint _tmp3_;
+		GdkRectangle _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
+		GdkRectangle _tmp7_;
+		gint _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
 #line 1487 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = self->priv->last_width;
 #line 1487 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9026,11 +9072,11 @@ static void checkerboard_layout_viewport_resized (CheckerboardLayout* self) {
 		checkerboard_layout_need_reflow (self, _tmp10_);
 #line 1490 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_free0 (_tmp10_);
-#line 9029 "CheckerboardLayout.c"
+#line 9075 "CheckerboardLayout.c"
 	} else {
-		gint _tmp11_ = 0;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
+		gint _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
 #line 1493 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp11_ = self->priv->last_width;
 #line 1493 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9041,20 +9087,20 @@ static void checkerboard_layout_viewport_resized (CheckerboardLayout* self) {
 		checkerboard_layout_need_exposure (self, _tmp13_);
 #line 1493 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_free0 (_tmp13_);
-#line 9044 "CheckerboardLayout.c"
+#line 9090 "CheckerboardLayout.c"
 	}
 }
 
 
 static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gchar* caller) {
 	GeeHashSet* new_exposed_items = NULL;
-	GeeHashSet* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
+	GeeHashSet* _tmp0_;
+	ViewCollection* _tmp1_;
 	GeeList* items = NULL;
-	GeeList* _tmp2_ = NULL;
-	GeeHashSet* _tmp27_ = NULL;
-	GeeHashSet* _tmp28_ = NULL;
-	ViewCollection* _tmp29_ = NULL;
+	GeeList* _tmp2_;
+	GeeHashSet* _tmp27_;
+	GeeHashSet* _tmp28_;
+	ViewCollection* _tmp29_;
 #line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9071,15 +9117,15 @@ static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gc
 	_tmp2_ = checkerboard_layout_get_visible_items (self);
 #line 1504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	items = _tmp2_;
-#line 9074 "CheckerboardLayout.c"
+#line 9120 "CheckerboardLayout.c"
 	{
 		GeeList* _item_list = NULL;
-		GeeList* _tmp3_ = NULL;
-		GeeList* _tmp4_ = NULL;
+		GeeList* _tmp3_;
+		GeeList* _tmp4_;
 		gint _item_size = 0;
-		GeeList* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		GeeList* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 		gint _item_index = 0;
 #line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = items;
@@ -9099,19 +9145,19 @@ static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gc
 		_item_index = -1;
 #line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		while (TRUE) {
-#line 9102 "CheckerboardLayout.c"
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
-			gint _tmp10_ = 0;
+#line 9148 "CheckerboardLayout.c"
+			gint _tmp8_;
+			gint _tmp9_;
+			gint _tmp10_;
 			CheckerboardItem* item = NULL;
-			GeeList* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			gpointer _tmp13_ = NULL;
-			GeeHashSet* _tmp14_ = NULL;
-			CheckerboardItem* _tmp15_ = NULL;
-			GeeHashSet* _tmp16_ = NULL;
-			CheckerboardItem* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
+			GeeList* _tmp11_;
+			gint _tmp12_;
+			gpointer _tmp13_;
+			GeeHashSet* _tmp14_;
+			CheckerboardItem* _tmp15_;
+			GeeHashSet* _tmp16_;
+			CheckerboardItem* _tmp17_;
+			gboolean _tmp18_;
 #line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp8_ = _item_index;
 #line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9124,7 +9170,7 @@ static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gc
 			if (!(_tmp9_ < _tmp10_)) {
 #line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 9127 "CheckerboardLayout.c"
+#line 9173 "CheckerboardLayout.c"
 			}
 #line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp11_ = _item_list;
@@ -9148,26 +9194,26 @@ static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gc
 			_tmp18_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
 #line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (!_tmp18_) {
-#line 9151 "CheckerboardLayout.c"
-				CheckerboardItem* _tmp19_ = NULL;
+#line 9197 "CheckerboardLayout.c"
+				CheckerboardItem* _tmp19_;
 #line 1510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp19_ = item;
 #line 1510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				checkerboard_item_exposed (_tmp19_);
-#line 9157 "CheckerboardLayout.c"
+#line 9203 "CheckerboardLayout.c"
 			}
 #line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_g_object_unref0 (item);
-#line 9161 "CheckerboardLayout.c"
+#line 9207 "CheckerboardLayout.c"
 		}
 #line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (_item_list);
-#line 9165 "CheckerboardLayout.c"
+#line 9211 "CheckerboardLayout.c"
 	}
 	{
 		GeeIterator* _item_it = NULL;
-		GeeHashSet* _tmp20_ = NULL;
-		GeeIterator* _tmp21_ = NULL;
+		GeeHashSet* _tmp20_;
+		GeeIterator* _tmp21_;
 #line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp20_ = self->priv->exposed_items;
 #line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9176,13 +9222,13 @@ static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gc
 		_item_it = _tmp21_;
 #line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		while (TRUE) {
-#line 9179 "CheckerboardLayout.c"
-			GeeIterator* _tmp22_ = NULL;
-			gboolean _tmp23_ = FALSE;
+#line 9225 "CheckerboardLayout.c"
+			GeeIterator* _tmp22_;
+			gboolean _tmp23_;
 			CheckerboardItem* item = NULL;
-			GeeIterator* _tmp24_ = NULL;
-			gpointer _tmp25_ = NULL;
-			CheckerboardItem* _tmp26_ = NULL;
+			GeeIterator* _tmp24_;
+			gpointer _tmp25_;
+			CheckerboardItem* _tmp26_;
 #line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp22_ = _item_it;
 #line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9191,7 +9237,7 @@ static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gc
 			if (!_tmp23_) {
 #line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 9194 "CheckerboardLayout.c"
+#line 9240 "CheckerboardLayout.c"
 			}
 #line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp24_ = _item_it;
@@ -9205,11 +9251,11 @@ static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gc
 			checkerboard_item_unexposed (_tmp26_);
 #line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_g_object_unref0 (item);
-#line 9208 "CheckerboardLayout.c"
+#line 9254 "CheckerboardLayout.c"
 		}
 #line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (_item_it);
-#line 9212 "CheckerboardLayout.c"
+#line 9258 "CheckerboardLayout.c"
 	}
 #line 1518 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp27_ = new_exposed_items;
@@ -9229,14 +9275,14 @@ static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gc
 	_g_object_unref0 (items);
 #line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (new_exposed_items);
-#line 9232 "CheckerboardLayout.c"
+#line 9278 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_unexpose_items (CheckerboardLayout* self, const gchar* caller) {
-	ViewCollection* _tmp0_ = NULL;
-	GeeHashSet* _tmp8_ = NULL;
-	ViewCollection* _tmp9_ = NULL;
+	ViewCollection* _tmp0_;
+	GeeHashSet* _tmp8_;
+	ViewCollection* _tmp9_;
 #line 1530 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1530 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9245,11 +9291,11 @@ static void checkerboard_layout_unexpose_items (CheckerboardLayout* self, const
 	_tmp0_ = self->priv->view;
 #line 1531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection));
-#line 9248 "CheckerboardLayout.c"
+#line 9294 "CheckerboardLayout.c"
 	{
 		GeeIterator* _item_it = NULL;
-		GeeHashSet* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeHashSet* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp1_ = self->priv->exposed_items;
 #line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9258,13 +9304,13 @@ static void checkerboard_layout_unexpose_items (CheckerboardLayout* self, const
 		_item_it = _tmp2_;
 #line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		while (TRUE) {
-#line 9261 "CheckerboardLayout.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 9307 "CheckerboardLayout.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			CheckerboardItem* item = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
-			CheckerboardItem* _tmp7_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
+			CheckerboardItem* _tmp7_;
 #line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp3_ = _item_it;
 #line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9273,7 +9319,7 @@ static void checkerboard_layout_unexpose_items (CheckerboardLayout* self, const
 			if (!_tmp4_) {
 #line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 9276 "CheckerboardLayout.c"
+#line 9322 "CheckerboardLayout.c"
 			}
 #line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp5_ = _item_it;
@@ -9287,11 +9333,11 @@ static void checkerboard_layout_unexpose_items (CheckerboardLayout* self, const
 			checkerboard_item_unexposed (_tmp7_);
 #line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_g_object_unref0 (item);
-#line 9290 "CheckerboardLayout.c"
+#line 9336 "CheckerboardLayout.c"
 		}
 #line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (_item_it);
-#line 9294 "CheckerboardLayout.c"
+#line 9340 "CheckerboardLayout.c"
 	}
 #line 1536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp8_ = self->priv->exposed_items;
@@ -9303,31 +9349,31 @@ static void checkerboard_layout_unexpose_items (CheckerboardLayout* self, const
 	_tmp9_ = self->priv->view;
 #line 1542 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection));
-#line 9306 "CheckerboardLayout.c"
+#line 9352 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* caller) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	GtkAllocation allocation = {0};
 	GtkAllocation _tmp1_ = {0};
 	gint _tmp2_ = 0;
-	GdkRectangle _tmp3_ = {0};
-	gint _tmp4_ = 0;
+	GdkRectangle _tmp3_;
+	gint _tmp4_;
 	gint visible_width = 0;
-	gint _tmp9_ = 0;
+	gint _tmp9_;
 	gint total_items = 0;
-	ViewCollection* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
+	ViewCollection* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
 	gboolean _tmp15_ = FALSE;
-	CheckerboardItem* _tmp16_ = NULL;
+	CheckerboardItem* _tmp16_;
 	gint max_cols = 0;
-	gint _tmp19_ = 0;
-	gint _tmp64_ = 0;
+	gint _tmp19_;
+	gint _tmp64_;
 	gint max_rows = 0;
-	gint _tmp65_ = 0;
-	gint _tmp66_ = 0;
+	gint _tmp65_;
+	gint _tmp66_;
 	gint row = 0;
 	gint tallest = 0;
 	gint widest = 0;
@@ -9335,42 +9381,42 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 	gint total_width = 0;
 	gint col = 0;
 	gint* column_widths = NULL;
-	gint _tmp67_ = 0;
-	gint* _tmp68_ = NULL;
-	gint column_widths_length1 = 0;
-	gint _column_widths_size_ = 0;
+	gint _tmp67_;
+	gint* _tmp68_;
+	gint column_widths_length1;
+	gint _column_widths_size_;
 	gint* row_heights = NULL;
-	gint _tmp69_ = 0;
-	gint* _tmp70_ = NULL;
-	gint row_heights_length1 = 0;
-	gint _row_heights_size_ = 0;
+	gint _tmp69_;
+	gint* _tmp70_;
+	gint row_heights_length1;
+	gint _row_heights_size_;
 	gint* alignment_points = NULL;
-	gint _tmp71_ = 0;
-	gint* _tmp72_ = NULL;
-	gint alignment_points_length1 = 0;
-	gint _alignment_points_size_ = 0;
+	gint _tmp71_;
+	gint* _tmp72_;
+	gint alignment_points_length1;
+	gint _alignment_points_size_;
 	gint gutter = 0;
-	gint _tmp183_ = 0;
-	CheckerboardLayoutLayoutRow** _tmp184_ = NULL;
+	gint _tmp183_;
+	CheckerboardLayoutLayoutRow** _tmp184_;
 	gint x = 0;
-	gint _tmp185_ = 0;
+	gint _tmp185_;
 	gint y = 0;
 	CheckerboardLayoutLayoutRow* current_row = NULL;
-	CheckerboardLayoutLayoutRow* _tmp255_ = NULL;
-	gint _tmp261_ = 0;
-	gint _tmp262_ = 0;
-	gint _tmp263_ = 0;
-	gint _tmp264_ = 0;
+	CheckerboardLayoutLayoutRow* _tmp255_;
+	gint _tmp261_;
+	gint _tmp262_;
+	gint _tmp263_;
+	gint _tmp264_;
 	gint total_height = 0;
-	gint _tmp265_ = 0;
-	gint* _tmp266_ = NULL;
-	gint _tmp266__length1 = 0;
-	gint _tmp267_ = 0;
-	gint _tmp268_ = 0;
+	gint _tmp265_;
+	gint* _tmp266_;
+	gint _tmp266__length1;
+	gint _tmp267_;
+	gint _tmp268_;
 	gboolean _tmp269_ = FALSE;
-	gint _tmp270_ = 0;
-	GtkAllocation _tmp271_ = {0};
-	gint _tmp272_ = 0;
+	gint _tmp270_;
+	GtkAllocation _tmp271_;
+	gint _tmp272_;
 #line 1548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9383,7 +9429,7 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 	if (_tmp0_ != NULL) {
 #line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 9386 "CheckerboardLayout.c"
+#line 9432 "CheckerboardLayout.c"
 	}
 #line 1556 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp1_);
@@ -9395,26 +9441,26 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 	_tmp4_ = _tmp3_.width;
 #line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp4_ > 0) {
-#line 9398 "CheckerboardLayout.c"
-		GdkRectangle _tmp5_ = {0};
-		gint _tmp6_ = 0;
+#line 9444 "CheckerboardLayout.c"
+		GdkRectangle _tmp5_;
+		gint _tmp6_;
 #line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = self->priv->visible_page;
 #line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = _tmp5_.width;
 #line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = _tmp6_;
-#line 9407 "CheckerboardLayout.c"
+#line 9453 "CheckerboardLayout.c"
 	} else {
-		GtkAllocation _tmp7_ = {0};
-		gint _tmp8_ = 0;
+		GtkAllocation _tmp7_;
+		gint _tmp8_;
 #line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = allocation;
 #line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = _tmp7_.width;
 #line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = _tmp8_;
-#line 9417 "CheckerboardLayout.c"
+#line 9463 "CheckerboardLayout.c"
 	}
 #line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	visible_width = _tmp2_;
@@ -9424,7 +9470,7 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 	if (_tmp9_ <= 1) {
 #line 1567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 9427 "CheckerboardLayout.c"
+#line 9473 "CheckerboardLayout.c"
 	}
 #line 1569 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp10_ = self->priv->view;
@@ -9436,9 +9482,9 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 	_tmp12_ = total_items;
 #line 1572 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp12_ == 0) {
-#line 9439 "CheckerboardLayout.c"
-		gint _tmp13_ = 0;
-		CheckerboardLayoutLayoutRow** _tmp14_ = NULL;
+#line 9485 "CheckerboardLayout.c"
+		gint _tmp13_;
+		CheckerboardLayoutLayoutRow** _tmp14_;
 #line 1573 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = visible_width;
 #line 1573 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9455,7 +9501,7 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 		self->priv->_item_rows_size_ = self->priv->item_rows_length1;
 #line 1576 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 9458 "CheckerboardLayout.c"
+#line 9504 "CheckerboardLayout.c"
 	}
 #line 1584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp16_ = self->priv->anchor;
@@ -9463,23 +9509,23 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 	if (_tmp16_ == NULL) {
 #line 1584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp15_ = TRUE;
-#line 9466 "CheckerboardLayout.c"
+#line 9512 "CheckerboardLayout.c"
 	} else {
-		CheckerboardItem* _tmp17_ = NULL;
-		gboolean _tmp18_ = FALSE;
+		CheckerboardItem* _tmp17_;
+		gboolean _tmp18_;
 #line 1584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp17_ = self->priv->anchor;
 #line 1584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp18_ = data_view_is_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_VIEW, DataView));
 #line 1584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp15_ = !_tmp18_;
-#line 9476 "CheckerboardLayout.c"
+#line 9522 "CheckerboardLayout.c"
 	}
 #line 1584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp15_) {
 #line 1585 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_update_anchor (self);
-#line 9482 "CheckerboardLayout.c"
+#line 9528 "CheckerboardLayout.c"
 	}
 #line 1588 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->item_rows = (_vala_array_free (self->priv->item_rows, self->priv->item_rows_length1, (GDestroyNotify) checkerboard_layout_layout_row_unref), NULL);
@@ -9495,17 +9541,17 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 	_tmp19_ = self->priv->scale;
 #line 1594 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp19_ > 0) {
-#line 9498 "CheckerboardLayout.c"
+#line 9544 "CheckerboardLayout.c"
 		gint remaining_width = 0;
-		gint _tmp20_ = 0;
+		gint _tmp20_;
 		gint max_item_width = 0;
-		gint _tmp21_ = 0;
-		gint _tmp22_ = 0;
-		gint _tmp23_ = 0;
-		gint _tmp24_ = 0;
-		gint _tmp25_ = 0;
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
+		gint _tmp21_;
+		gint _tmp22_;
+		gint _tmp23_;
+		gint _tmp24_;
+		gint _tmp25_;
+		gint _tmp33_;
+		gint _tmp34_;
 #line 1596 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp20_ = visible_width;
 #line 1596 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9528,23 +9574,23 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 		if (_tmp25_ <= 0) {
 #line 1600 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			max_cols = 1;
-#line 9531 "CheckerboardLayout.c"
+#line 9577 "CheckerboardLayout.c"
 		}
 #line 1603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		while (TRUE) {
-#line 9535 "CheckerboardLayout.c"
+#line 9581 "CheckerboardLayout.c"
 			gboolean _tmp26_ = FALSE;
-			gint _tmp27_ = 0;
-			gint _tmp32_ = 0;
+			gint _tmp27_;
+			gint _tmp32_;
 #line 1603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp27_ = max_cols;
 #line 1603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp27_ > 1) {
-#line 9543 "CheckerboardLayout.c"
-				gint _tmp28_ = 0;
-				gint _tmp29_ = 0;
-				gint _tmp30_ = 0;
-				gint _tmp31_ = 0;
+#line 9589 "CheckerboardLayout.c"
+				gint _tmp28_;
+				gint _tmp29_;
+				gint _tmp30_;
+				gint _tmp31_;
 #line 1604 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp28_ = max_cols;
 #line 1604 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9555,23 +9601,23 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 				_tmp31_ = remaining_width;
 #line 1604 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp26_ = ((_tmp28_ * _tmp29_) + ((_tmp30_ - 1) * CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING)) > _tmp31_;
-#line 9558 "CheckerboardLayout.c"
+#line 9604 "CheckerboardLayout.c"
 			} else {
 #line 1603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp26_ = FALSE;
-#line 9562 "CheckerboardLayout.c"
+#line 9608 "CheckerboardLayout.c"
 			}
 #line 1603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (!_tmp26_) {
 #line 1603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 9568 "CheckerboardLayout.c"
+#line 9614 "CheckerboardLayout.c"
 			}
 #line 1609 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp32_ = max_cols;
 #line 1609 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			max_cols = _tmp32_ - 1;
-#line 9574 "CheckerboardLayout.c"
+#line 9620 "CheckerboardLayout.c"
 		}
 #line 1613 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp33_ = total_items;
@@ -9579,21 +9625,21 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 		_tmp34_ = max_cols;
 #line 1613 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp33_ < _tmp34_) {
-#line 9582 "CheckerboardLayout.c"
-			gint _tmp35_ = 0;
+#line 9628 "CheckerboardLayout.c"
+			gint _tmp35_;
 #line 1614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp35_ = total_items;
 #line 1614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			max_cols = _tmp35_;
-#line 9588 "CheckerboardLayout.c"
+#line 9634 "CheckerboardLayout.c"
 		}
 	} else {
 		gint x = 0;
 		gint col = 0;
 		gint row_width = 0;
 		gint widest_row = 0;
-		gint _tmp61_ = 0;
-		gint _tmp62_ = 0;
+		gint _tmp61_;
+		gint _tmp62_;
 #line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		x = CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING;
 #line 1622 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9602,49 +9648,49 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 		row_width = 0;
 #line 1624 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		widest_row = 0;
-#line 9605 "CheckerboardLayout.c"
+#line 9651 "CheckerboardLayout.c"
 		{
 			gint ctr = 0;
 #line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			ctr = 0;
-#line 9610 "CheckerboardLayout.c"
+#line 9656 "CheckerboardLayout.c"
 			{
 				gboolean _tmp36_ = FALSE;
 #line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp36_ = TRUE;
 #line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				while (TRUE) {
-#line 9617 "CheckerboardLayout.c"
-					gint _tmp38_ = 0;
-					gint _tmp39_ = 0;
+#line 9663 "CheckerboardLayout.c"
+					gint _tmp38_;
+					gint _tmp39_;
 					CheckerboardItem* item = NULL;
-					ViewCollection* _tmp40_ = NULL;
-					gint _tmp41_ = 0;
-					DataObject* _tmp42_ = NULL;
+					ViewCollection* _tmp40_;
+					gint _tmp41_;
+					DataObject* _tmp42_;
 					Dimensions req = {0};
-					CheckerboardItem* _tmp43_ = NULL;
-					Dimensions _tmp44_ = {0};
-					gboolean _tmp45_ = FALSE;
-					gint _tmp46_ = 0;
-					Dimensions _tmp47_ = {0};
-					gint _tmp48_ = 0;
-					gint _tmp49_ = 0;
-					gint _tmp54_ = 0;
-					Dimensions _tmp55_ = {0};
-					gint _tmp56_ = 0;
-					gint _tmp57_ = 0;
-					Dimensions _tmp58_ = {0};
-					gint _tmp59_ = 0;
-					gint _tmp60_ = 0;
+					CheckerboardItem* _tmp43_;
+					Dimensions _tmp44_;
+					gboolean _tmp45_;
+					gint _tmp46_;
+					Dimensions _tmp47_;
+					gint _tmp48_;
+					gint _tmp49_;
+					gint _tmp54_;
+					Dimensions _tmp55_;
+					gint _tmp56_;
+					gint _tmp57_;
+					Dimensions _tmp58_;
+					gint _tmp59_;
+					gint _tmp60_;
 #line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					if (!_tmp36_) {
-#line 9641 "CheckerboardLayout.c"
-						gint _tmp37_ = 0;
+#line 9687 "CheckerboardLayout.c"
+						gint _tmp37_;
 #line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp37_ = ctr;
 #line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						ctr = _tmp37_ + 1;
-#line 9647 "CheckerboardLayout.c"
+#line 9693 "CheckerboardLayout.c"
 					}
 #line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp36_ = FALSE;
@@ -9656,7 +9702,7 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 					if (!(_tmp38_ < _tmp39_)) {
 #line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						break;
-#line 9659 "CheckerboardLayout.c"
+#line 9705 "CheckerboardLayout.c"
 					}
 #line 1627 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp40_ = self->priv->view;
@@ -9686,18 +9732,18 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 					_tmp49_ = visible_width;
 #line 1634 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					if (((_tmp46_ + _tmp48_) + CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING) > _tmp49_) {
-#line 9689 "CheckerboardLayout.c"
-						gint _tmp50_ = 0;
-						gint _tmp51_ = 0;
+#line 9735 "CheckerboardLayout.c"
+						gint _tmp50_;
+						gint _tmp51_;
 #line 1635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp50_ = row_width;
 #line 1635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp51_ = widest_row;
 #line 1635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						if (_tmp50_ > _tmp51_) {
-#line 9698 "CheckerboardLayout.c"
-							gint _tmp52_ = 0;
-							gint _tmp53_ = 0;
+#line 9744 "CheckerboardLayout.c"
+							gint _tmp52_;
+							gint _tmp53_;
 #line 1636 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp52_ = row_width;
 #line 1636 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9706,7 +9752,7 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 							_tmp53_ = col;
 #line 1637 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							max_cols = _tmp53_;
-#line 9709 "CheckerboardLayout.c"
+#line 9755 "CheckerboardLayout.c"
 						}
 #line 1640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						col = 0;
@@ -9714,7 +9760,7 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 						x = CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING;
 #line 1642 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						row_width = 0;
-#line 9717 "CheckerboardLayout.c"
+#line 9763 "CheckerboardLayout.c"
 					}
 #line 1645 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp54_ = x;
@@ -9738,7 +9784,7 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 					col = _tmp60_ + 1;
 #line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_g_object_unref0 (item);
-#line 9741 "CheckerboardLayout.c"
+#line 9787 "CheckerboardLayout.c"
 				}
 			}
 		}
@@ -9748,13 +9794,13 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 		_tmp62_ = widest_row;
 #line 1652 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp61_ > _tmp62_) {
-#line 9751 "CheckerboardLayout.c"
-			gint _tmp63_ = 0;
+#line 9797 "CheckerboardLayout.c"
+			gint _tmp63_;
 #line 1653 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp63_ = col;
 #line 1653 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			max_cols = _tmp63_;
-#line 9757 "CheckerboardLayout.c"
+#line 9803 "CheckerboardLayout.c"
 		}
 	}
 #line 1661 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9811,80 +9857,80 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 	_alignment_points_size_ = alignment_points_length1;
 #line 1675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gutter = 0;
-#line 9814 "CheckerboardLayout.c"
+#line 9860 "CheckerboardLayout.c"
 	{
 		gboolean _tmp73_ = FALSE;
 #line 1677 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp73_ = TRUE;
 #line 1677 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		while (TRUE) {
-#line 9821 "CheckerboardLayout.c"
-			gint _tmp129_ = 0;
-			gint _tmp138_ = 0;
-			gint _tmp139_ = 0;
-			gint _tmp140_ = 0;
-			gint _tmp141_ = 0;
-			gint _tmp142_ = 0;
+#line 9867 "CheckerboardLayout.c"
+			gint _tmp129_;
+			gint _tmp138_;
+			gint _tmp139_;
+			gint _tmp140_;
+			gint _tmp141_;
+			gint _tmp142_;
 #line 1677 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (!_tmp73_) {
-#line 9830 "CheckerboardLayout.c"
+#line 9876 "CheckerboardLayout.c"
 			}
 #line 1677 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp73_ = FALSE;
-#line 9834 "CheckerboardLayout.c"
+#line 9880 "CheckerboardLayout.c"
 			{
 				gint ctr = 0;
 #line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				ctr = 0;
-#line 9839 "CheckerboardLayout.c"
+#line 9885 "CheckerboardLayout.c"
 				{
 					gboolean _tmp74_ = FALSE;
 #line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp74_ = TRUE;
 #line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					while (TRUE) {
-#line 9846 "CheckerboardLayout.c"
-						gint _tmp76_ = 0;
-						gint _tmp77_ = 0;
+#line 9892 "CheckerboardLayout.c"
+						gint _tmp76_;
+						gint _tmp77_;
 						CheckerboardItem* item = NULL;
-						ViewCollection* _tmp78_ = NULL;
-						gint _tmp79_ = 0;
-						DataObject* _tmp80_ = NULL;
+						ViewCollection* _tmp78_;
+						gint _tmp79_;
+						DataObject* _tmp80_;
 						Dimensions req = {0};
-						CheckerboardItem* _tmp81_ = NULL;
-						Dimensions _tmp82_ = {0};
+						CheckerboardItem* _tmp81_;
+						Dimensions _tmp82_;
 						gint alignment_point = 0;
-						CheckerboardItem* _tmp83_ = NULL;
-						gint _tmp84_ = 0;
-						gint _tmp85_ = 0;
-						Dimensions _tmp86_ = {0};
-						gint _tmp87_ = 0;
-						Dimensions _tmp88_ = {0};
-						gint _tmp89_ = 0;
-						gint _tmp90_ = 0;
-						Dimensions _tmp93_ = {0};
-						gint _tmp94_ = 0;
-						gint _tmp95_ = 0;
-						gint _tmp98_ = 0;
-						gint _tmp99_ = 0;
-						gint* _tmp101_ = NULL;
-						gint _tmp101__length1 = 0;
-						gint _tmp102_ = 0;
-						gint _tmp103_ = 0;
-						Dimensions _tmp104_ = {0};
-						gint _tmp105_ = 0;
-						gint _tmp118_ = 0;
-						gint _tmp119_ = 0;
-						gint _tmp120_ = 0;
+						CheckerboardItem* _tmp83_;
+						gint _tmp84_;
+						gint _tmp85_;
+						Dimensions _tmp86_;
+						gint _tmp87_;
+						Dimensions _tmp88_;
+						gint _tmp89_;
+						gint _tmp90_;
+						Dimensions _tmp93_;
+						gint _tmp94_;
+						gint _tmp95_;
+						gint _tmp98_;
+						gint _tmp99_;
+						gint* _tmp101_;
+						gint _tmp101__length1;
+						gint _tmp102_;
+						gint _tmp103_;
+						Dimensions _tmp104_;
+						gint _tmp105_;
+						gint _tmp118_;
+						gint _tmp119_;
+						gint _tmp120_;
 #line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						if (!_tmp74_) {
-#line 9881 "CheckerboardLayout.c"
-							gint _tmp75_ = 0;
+#line 9927 "CheckerboardLayout.c"
+							gint _tmp75_;
 #line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp75_ = ctr;
 #line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							ctr = _tmp75_ + 1;
-#line 9887 "CheckerboardLayout.c"
+#line 9933 "CheckerboardLayout.c"
 						}
 #line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp74_ = FALSE;
@@ -9896,7 +9942,7 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 						if (!(_tmp76_ < _tmp77_)) {
 #line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							break;
-#line 9899 "CheckerboardLayout.c"
+#line 9945 "CheckerboardLayout.c"
 						}
 #line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp78_ = self->priv->view;
@@ -9934,16 +9980,16 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 						_tmp90_ = tallest;
 #line 1686 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						if (_tmp89_ > _tmp90_) {
-#line 9937 "CheckerboardLayout.c"
-							Dimensions _tmp91_ = {0};
-							gint _tmp92_ = 0;
+#line 9983 "CheckerboardLayout.c"
+							Dimensions _tmp91_;
+							gint _tmp92_;
 #line 1687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp91_ = req;
 #line 1687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp92_ = _tmp91_.height;
 #line 1687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							tallest = _tmp92_;
-#line 9946 "CheckerboardLayout.c"
+#line 9992 "CheckerboardLayout.c"
 						}
 #line 1689 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp93_ = req;
@@ -9953,16 +9999,16 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 						_tmp95_ = widest;
 #line 1689 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						if (_tmp94_ > _tmp95_) {
-#line 9956 "CheckerboardLayout.c"
-							Dimensions _tmp96_ = {0};
-							gint _tmp97_ = 0;
+#line 10002 "CheckerboardLayout.c"
+							Dimensions _tmp96_;
+							gint _tmp97_;
 #line 1690 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp96_ = req;
 #line 1690 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp97_ = _tmp96_.width;
 #line 1690 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							widest = _tmp97_;
-#line 9965 "CheckerboardLayout.c"
+#line 10011 "CheckerboardLayout.c"
 						}
 #line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp98_ = alignment_point;
@@ -9970,13 +10016,13 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 						_tmp99_ = row_alignment_point;
 #line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						if (_tmp98_ > _tmp99_) {
-#line 9973 "CheckerboardLayout.c"
-							gint _tmp100_ = 0;
+#line 10019 "CheckerboardLayout.c"
+							gint _tmp100_;
 #line 1693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp100_ = alignment_point;
 #line 1693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							row_alignment_point = _tmp100_;
-#line 9979 "CheckerboardLayout.c"
+#line 10025 "CheckerboardLayout.c"
 						}
 #line 1697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp101_ = column_widths;
@@ -9992,21 +10038,21 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 						_tmp105_ = _tmp104_.width;
 #line 1697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						if (_tmp103_ < _tmp105_) {
-#line 9995 "CheckerboardLayout.c"
-							gint _tmp106_ = 0;
-							gint* _tmp107_ = NULL;
-							gint _tmp107__length1 = 0;
-							gint _tmp108_ = 0;
-							gint _tmp109_ = 0;
-							gint* _tmp110_ = NULL;
-							gint _tmp110__length1 = 0;
-							gint _tmp111_ = 0;
-							Dimensions _tmp112_ = {0};
-							gint _tmp113_ = 0;
-							gint _tmp114_ = 0;
-							gint _tmp115_ = 0;
-							Dimensions _tmp116_ = {0};
-							gint _tmp117_ = 0;
+#line 10041 "CheckerboardLayout.c"
+							gint _tmp106_;
+							gint* _tmp107_;
+							gint _tmp107__length1;
+							gint _tmp108_;
+							gint _tmp109_;
+							gint* _tmp110_;
+							gint _tmp110__length1;
+							gint _tmp111_;
+							Dimensions _tmp112_;
+							gint _tmp113_;
+							gint _tmp114_;
+							gint _tmp115_;
+							Dimensions _tmp116_;
+							gint _tmp117_;
 #line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp106_ = total_width;
 #line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -10041,7 +10087,7 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 							_tmp117_ = _tmp116_.width;
 #line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							total_width = _tmp115_ + _tmp117_;
-#line 10044 "CheckerboardLayout.c"
+#line 10090 "CheckerboardLayout.c"
 						}
 #line 1703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp118_ = col;
@@ -10053,17 +10099,17 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 						_tmp120_ = max_cols;
 #line 1703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						if (_tmp119_ >= _tmp120_) {
-#line 10056 "CheckerboardLayout.c"
-							gint* _tmp121_ = NULL;
-							gint _tmp121__length1 = 0;
-							gint _tmp122_ = 0;
-							gint _tmp123_ = 0;
-							gint _tmp124_ = 0;
-							gint* _tmp125_ = NULL;
-							gint _tmp125__length1 = 0;
-							gint _tmp126_ = 0;
-							gint _tmp127_ = 0;
-							gint _tmp128_ = 0;
+#line 10102 "CheckerboardLayout.c"
+							gint* _tmp121_;
+							gint _tmp121__length1;
+							gint _tmp122_;
+							gint _tmp123_;
+							gint _tmp124_;
+							gint* _tmp125_;
+							gint _tmp125__length1;
+							gint _tmp126_;
+							gint _tmp127_;
+							gint _tmp128_;
 #line 1704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp121_ = alignment_points;
 #line 1704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -10096,11 +10142,11 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 							row_alignment_point = 0;
 #line 1709 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							tallest = 0;
-#line 10099 "CheckerboardLayout.c"
+#line 10145 "CheckerboardLayout.c"
 						}
 #line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_g_object_unref0 (item);
-#line 10103 "CheckerboardLayout.c"
+#line 10149 "CheckerboardLayout.c"
 					}
 				}
 			}
@@ -10108,17 +10154,17 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 			_tmp129_ = col;
 #line 1714 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp129_ != 0) {
-#line 10111 "CheckerboardLayout.c"
-				gint* _tmp130_ = NULL;
-				gint _tmp130__length1 = 0;
-				gint _tmp131_ = 0;
-				gint _tmp132_ = 0;
-				gint _tmp133_ = 0;
-				gint* _tmp134_ = NULL;
-				gint _tmp134__length1 = 0;
-				gint _tmp135_ = 0;
-				gint _tmp136_ = 0;
-				gint _tmp137_ = 0;
+#line 10157 "CheckerboardLayout.c"
+				gint* _tmp130_;
+				gint _tmp130__length1;
+				gint _tmp131_;
+				gint _tmp132_;
+				gint _tmp133_;
+				gint* _tmp134_;
+				gint _tmp134__length1;
+				gint _tmp135_;
+				gint _tmp136_;
+				gint _tmp137_;
 #line 1715 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp130_ = alignment_points;
 #line 1715 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -10143,7 +10189,7 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 				_tmp134_[_tmp135_] = _tmp136_;
 #line 1716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp137_ = _tmp134_[_tmp135_];
-#line 10146 "CheckerboardLayout.c"
+#line 10192 "CheckerboardLayout.c"
 			}
 #line 1721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp138_ = visible_width;
@@ -10159,22 +10205,22 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 			if (_tmp141_ == 1) {
 #line 1725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 10162 "CheckerboardLayout.c"
+#line 10208 "CheckerboardLayout.c"
 			}
 #line 1730 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp142_ = gutter;
 #line 1730 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp142_ < CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING) {
-#line 10168 "CheckerboardLayout.c"
-				gint _tmp143_ = 0;
-				gint _tmp144_ = 0;
-				gint _tmp145_ = 0;
-				gint _tmp146_ = 0;
-				gint* _tmp147_ = NULL;
-				gint _tmp148_ = 0;
-				gint* _tmp149_ = NULL;
-				gint _tmp150_ = 0;
-				gint* _tmp151_ = NULL;
+#line 10214 "CheckerboardLayout.c"
+				gint _tmp143_;
+				gint _tmp144_;
+				gint _tmp145_;
+				gint _tmp146_;
+				gint* _tmp147_;
+				gint _tmp148_;
+				gint* _tmp149_;
+				gint _tmp150_;
+				gint* _tmp151_;
 #line 1731 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp143_ = max_cols;
 #line 1731 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -10233,11 +10279,11 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 				alignment_points_length1 = _tmp150_;
 #line 1747 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_alignment_points_size_ = alignment_points_length1;
-#line 10236 "CheckerboardLayout.c"
+#line 10282 "CheckerboardLayout.c"
 			} else {
 #line 1749 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 10240 "CheckerboardLayout.c"
+#line 10286 "CheckerboardLayout.c"
 			}
 		}
 	}
@@ -10245,57 +10291,57 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 	col = 0;
 #line 1762 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	row = 0;
-#line 10248 "CheckerboardLayout.c"
+#line 10294 "CheckerboardLayout.c"
 	{
 		gint ctr = 0;
 #line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		ctr = 0;
-#line 10253 "CheckerboardLayout.c"
+#line 10299 "CheckerboardLayout.c"
 		{
 			gboolean _tmp152_ = FALSE;
 #line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp152_ = TRUE;
 #line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			while (TRUE) {
-#line 10260 "CheckerboardLayout.c"
-				gint _tmp154_ = 0;
-				gint _tmp155_ = 0;
+#line 10306 "CheckerboardLayout.c"
+				gint _tmp154_;
+				gint _tmp155_;
 				CheckerboardItem* item = NULL;
-				ViewCollection* _tmp156_ = NULL;
-				gint _tmp157_ = 0;
-				DataObject* _tmp158_ = NULL;
+				ViewCollection* _tmp156_;
+				gint _tmp157_;
+				DataObject* _tmp158_;
 				Dimensions req = {0};
-				CheckerboardItem* _tmp159_ = NULL;
-				Dimensions _tmp160_ = {0};
+				CheckerboardItem* _tmp159_;
+				Dimensions _tmp160_;
 				gint true_height = 0;
-				Dimensions _tmp161_ = {0};
-				gint _tmp162_ = 0;
-				gint* _tmp163_ = NULL;
-				gint _tmp163__length1 = 0;
-				gint _tmp164_ = 0;
-				gint _tmp165_ = 0;
-				CheckerboardItem* _tmp166_ = NULL;
-				gint _tmp167_ = 0;
-				gint _tmp168_ = 0;
-				Dimensions _tmp169_ = {0};
-				gint _tmp170_ = 0;
-				gint _tmp171_ = 0;
-				gint* _tmp172_ = NULL;
-				gint _tmp172__length1 = 0;
-				gint _tmp173_ = 0;
-				gint _tmp174_ = 0;
-				gint _tmp179_ = 0;
-				gint _tmp180_ = 0;
-				gint _tmp181_ = 0;
+				Dimensions _tmp161_;
+				gint _tmp162_;
+				gint* _tmp163_;
+				gint _tmp163__length1;
+				gint _tmp164_;
+				gint _tmp165_;
+				CheckerboardItem* _tmp166_;
+				gint _tmp167_;
+				gint _tmp168_;
+				Dimensions _tmp169_;
+				gint _tmp170_;
+				gint _tmp171_;
+				gint* _tmp172_;
+				gint _tmp172__length1;
+				gint _tmp173_;
+				gint _tmp174_;
+				gint _tmp179_;
+				gint _tmp180_;
+				gint _tmp181_;
 #line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (!_tmp152_) {
-#line 10292 "CheckerboardLayout.c"
-					gint _tmp153_ = 0;
+#line 10338 "CheckerboardLayout.c"
+					gint _tmp153_;
 #line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp153_ = ctr;
 #line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					ctr = _tmp153_ + 1;
-#line 10298 "CheckerboardLayout.c"
+#line 10344 "CheckerboardLayout.c"
 				}
 #line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp152_ = FALSE;
@@ -10307,7 +10353,7 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 				if (!(_tmp154_ < _tmp155_)) {
 #line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 10310 "CheckerboardLayout.c"
+#line 10356 "CheckerboardLayout.c"
 				}
 #line 1765 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp156_ = self->priv->view;
@@ -10361,12 +10407,12 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 				_tmp174_ = _tmp172_[_tmp173_];
 #line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp171_ > _tmp174_) {
-#line 10364 "CheckerboardLayout.c"
-					gint* _tmp175_ = NULL;
-					gint _tmp175__length1 = 0;
-					gint _tmp176_ = 0;
-					gint _tmp177_ = 0;
-					gint _tmp178_ = 0;
+#line 10410 "CheckerboardLayout.c"
+					gint* _tmp175_;
+					gint _tmp175__length1;
+					gint _tmp176_;
+					gint _tmp177_;
+					gint _tmp178_;
 #line 1780 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp175_ = row_heights;
 #line 1780 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -10379,7 +10425,7 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 					_tmp175_[_tmp176_] = _tmp177_;
 #line 1780 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp178_ = _tmp175_[_tmp176_];
-#line 10382 "CheckerboardLayout.c"
+#line 10428 "CheckerboardLayout.c"
 				}
 #line 1784 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp179_ = col;
@@ -10391,19 +10437,19 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 				_tmp181_ = max_cols;
 #line 1784 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp180_ >= _tmp181_) {
-#line 10394 "CheckerboardLayout.c"
-					gint _tmp182_ = 0;
+#line 10440 "CheckerboardLayout.c"
+					gint _tmp182_;
 #line 1785 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					col = 0;
 #line 1786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp182_ = row;
 #line 1786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					row = _tmp182_ + 1;
-#line 10402 "CheckerboardLayout.c"
+#line 10448 "CheckerboardLayout.c"
 				}
 #line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (item);
-#line 10406 "CheckerboardLayout.c"
+#line 10452 "CheckerboardLayout.c"
 			}
 		}
 	}
@@ -10431,85 +10477,85 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 	row = 0;
 #line 1798 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	current_row = NULL;
-#line 10434 "CheckerboardLayout.c"
+#line 10480 "CheckerboardLayout.c"
 	{
 		gint ctr = 0;
 #line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		ctr = 0;
-#line 10439 "CheckerboardLayout.c"
+#line 10485 "CheckerboardLayout.c"
 		{
 			gboolean _tmp186_ = FALSE;
 #line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp186_ = TRUE;
 #line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			while (TRUE) {
-#line 10446 "CheckerboardLayout.c"
-				gint _tmp188_ = 0;
-				gint _tmp189_ = 0;
+#line 10492 "CheckerboardLayout.c"
+				gint _tmp188_;
+				gint _tmp189_;
 				CheckerboardItem* item = NULL;
-				ViewCollection* _tmp190_ = NULL;
-				gint _tmp191_ = 0;
-				DataObject* _tmp192_ = NULL;
+				ViewCollection* _tmp190_;
+				gint _tmp191_;
+				DataObject* _tmp192_;
 				Dimensions req = {0};
-				CheckerboardItem* _tmp193_ = NULL;
-				Dimensions _tmp194_ = {0};
+				CheckerboardItem* _tmp193_;
+				Dimensions _tmp194_;
 				gint xpadding = 0;
-				gint* _tmp195_ = NULL;
-				gint _tmp195__length1 = 0;
-				gint _tmp196_ = 0;
-				gint _tmp197_ = 0;
-				Dimensions _tmp198_ = {0};
-				gint _tmp199_ = 0;
-				gint _tmp200_ = 0;
+				gint* _tmp195_;
+				gint _tmp195__length1;
+				gint _tmp196_;
+				gint _tmp197_;
+				Dimensions _tmp198_;
+				gint _tmp199_;
+				gint _tmp200_;
 				gint ypadding = 0;
-				gint* _tmp201_ = NULL;
-				gint _tmp201__length1 = 0;
-				gint _tmp202_ = 0;
-				gint _tmp203_ = 0;
-				CheckerboardItem* _tmp204_ = NULL;
-				gint _tmp205_ = 0;
-				gint _tmp206_ = 0;
-				CheckerboardItem* _tmp207_ = NULL;
-				gint _tmp208_ = 0;
-				gint _tmp209_ = 0;
-				CheckerboardItem* _tmp210_ = NULL;
-				gint _tmp211_ = 0;
-				gint _tmp212_ = 0;
-				CheckerboardItem* _tmp213_ = NULL;
-				Dimensions _tmp214_ = {0};
-				gint _tmp215_ = 0;
-				CheckerboardItem* _tmp216_ = NULL;
-				Dimensions _tmp217_ = {0};
-				gint _tmp218_ = 0;
-				CheckerboardItem* _tmp219_ = NULL;
-				gint _tmp220_ = 0;
-				gint _tmp221_ = 0;
-				CheckerboardLayoutLayoutRow* _tmp222_ = NULL;
-				CheckerboardLayoutLayoutRow* _tmp229_ = NULL;
-				CheckerboardItem** _tmp230_ = NULL;
-				gint _tmp230__length1 = 0;
-				gint _tmp231_ = 0;
-				CheckerboardItem* _tmp232_ = NULL;
-				CheckerboardItem* _tmp233_ = NULL;
-				CheckerboardItem* _tmp234_ = NULL;
-				gint _tmp235_ = 0;
-				gint* _tmp236_ = NULL;
-				gint _tmp236__length1 = 0;
-				gint _tmp237_ = 0;
-				gint _tmp238_ = 0;
-				gint _tmp239_ = 0;
-				gint _tmp240_ = 0;
-				gint _tmp241_ = 0;
-				gint _tmp242_ = 0;
+				gint* _tmp201_;
+				gint _tmp201__length1;
+				gint _tmp202_;
+				gint _tmp203_;
+				CheckerboardItem* _tmp204_;
+				gint _tmp205_;
+				gint _tmp206_;
+				CheckerboardItem* _tmp207_;
+				gint _tmp208_;
+				gint _tmp209_;
+				CheckerboardItem* _tmp210_;
+				gint _tmp211_;
+				gint _tmp212_;
+				CheckerboardItem* _tmp213_;
+				Dimensions _tmp214_;
+				gint _tmp215_;
+				CheckerboardItem* _tmp216_;
+				Dimensions _tmp217_;
+				gint _tmp218_;
+				CheckerboardItem* _tmp219_;
+				gint _tmp220_;
+				gint _tmp221_;
+				CheckerboardLayoutLayoutRow* _tmp222_;
+				CheckerboardLayoutLayoutRow* _tmp229_;
+				CheckerboardItem** _tmp230_;
+				gint _tmp230__length1;
+				gint _tmp231_;
+				CheckerboardItem* _tmp232_;
+				CheckerboardItem* _tmp233_;
+				CheckerboardItem* _tmp234_;
+				gint _tmp235_;
+				gint* _tmp236_;
+				gint _tmp236__length1;
+				gint _tmp237_;
+				gint _tmp238_;
+				gint _tmp239_;
+				gint _tmp240_;
+				gint _tmp241_;
+				gint _tmp242_;
 #line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (!_tmp186_) {
-#line 10506 "CheckerboardLayout.c"
-					gint _tmp187_ = 0;
+#line 10552 "CheckerboardLayout.c"
+					gint _tmp187_;
 #line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp187_ = ctr;
 #line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					ctr = _tmp187_ + 1;
-#line 10512 "CheckerboardLayout.c"
+#line 10558 "CheckerboardLayout.c"
 				}
 #line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp186_ = FALSE;
@@ -10521,7 +10567,7 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 				if (!(_tmp188_ < _tmp189_)) {
 #line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 10524 "CheckerboardLayout.c"
+#line 10570 "CheckerboardLayout.c"
 				}
 #line 1801 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp190_ = self->priv->view;
@@ -10617,14 +10663,14 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 				_tmp222_ = current_row;
 #line 1820 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp222_ == NULL) {
-#line 10620 "CheckerboardLayout.c"
-					gint _tmp223_ = 0;
-					gint* _tmp224_ = NULL;
-					gint _tmp224__length1 = 0;
-					gint _tmp225_ = 0;
-					gint _tmp226_ = 0;
-					gint _tmp227_ = 0;
-					CheckerboardLayoutLayoutRow* _tmp228_ = NULL;
+#line 10666 "CheckerboardLayout.c"
+					gint _tmp223_;
+					gint* _tmp224_;
+					gint _tmp224__length1;
+					gint _tmp225_;
+					gint _tmp226_;
+					gint _tmp227_;
+					CheckerboardLayoutLayoutRow* _tmp228_;
 #line 1821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp223_ = y;
 #line 1821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -10643,7 +10689,7 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 					_checkerboard_layout_layout_row_unref0 (current_row);
 #line 1821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					current_row = _tmp228_;
-#line 10646 "CheckerboardLayout.c"
+#line 10692 "CheckerboardLayout.c"
 				}
 #line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp229_ = current_row;
@@ -10687,21 +10733,21 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 				_tmp242_ = max_cols;
 #line 1828 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp241_ >= _tmp242_) {
-#line 10690 "CheckerboardLayout.c"
-					CheckerboardLayoutLayoutRow* _tmp243_ = NULL;
-					CheckerboardLayoutLayoutRow** _tmp244_ = NULL;
-					gint _tmp244__length1 = 0;
-					gint _tmp245_ = 0;
-					CheckerboardLayoutLayoutRow* _tmp246_ = NULL;
-					CheckerboardLayoutLayoutRow* _tmp247_ = NULL;
-					CheckerboardLayoutLayoutRow* _tmp248_ = NULL;
-					gint _tmp249_ = 0;
-					gint _tmp250_ = 0;
-					gint* _tmp251_ = NULL;
-					gint _tmp251__length1 = 0;
-					gint _tmp252_ = 0;
-					gint _tmp253_ = 0;
-					gint _tmp254_ = 0;
+#line 10736 "CheckerboardLayout.c"
+					CheckerboardLayoutLayoutRow* _tmp243_;
+					CheckerboardLayoutLayoutRow** _tmp244_;
+					gint _tmp244__length1;
+					gint _tmp245_;
+					CheckerboardLayoutLayoutRow* _tmp246_;
+					CheckerboardLayoutLayoutRow* _tmp247_;
+					CheckerboardLayoutLayoutRow* _tmp248_;
+					gint _tmp249_;
+					gint _tmp250_;
+					gint* _tmp251_;
+					gint _tmp251__length1;
+					gint _tmp252_;
+					gint _tmp253_;
+					gint _tmp254_;
 #line 1829 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp243_ = current_row;
 #line 1829 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -10748,11 +10794,11 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 					_tmp254_ = row;
 #line 1836 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					row = _tmp254_ + 1;
-#line 10751 "CheckerboardLayout.c"
+#line 10797 "CheckerboardLayout.c"
 				}
 #line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (item);
-#line 10755 "CheckerboardLayout.c"
+#line 10801 "CheckerboardLayout.c"
 			}
 		}
 	}
@@ -10760,13 +10806,13 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 	_tmp255_ = current_row;
 #line 1841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp255_ != NULL) {
-#line 10763 "CheckerboardLayout.c"
-		CheckerboardLayoutLayoutRow** _tmp256_ = NULL;
-		gint _tmp256__length1 = 0;
-		gint _tmp257_ = 0;
-		CheckerboardLayoutLayoutRow* _tmp258_ = NULL;
-		CheckerboardLayoutLayoutRow* _tmp259_ = NULL;
-		CheckerboardLayoutLayoutRow* _tmp260_ = NULL;
+#line 10809 "CheckerboardLayout.c"
+		CheckerboardLayoutLayoutRow** _tmp256_;
+		gint _tmp256__length1;
+		gint _tmp257_;
+		CheckerboardLayoutLayoutRow* _tmp258_;
+		CheckerboardLayoutLayoutRow* _tmp259_;
+		CheckerboardLayoutLayoutRow* _tmp260_;
 #line 1842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp256_ = self->priv->item_rows;
 #line 1842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -10783,7 +10829,7 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 		_tmp256_[_tmp257_] = _tmp259_;
 #line 1842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp260_ = _tmp256_[_tmp257_];
-#line 10786 "CheckerboardLayout.c"
+#line 10832 "CheckerboardLayout.c"
 	}
 #line 1845 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp261_ = max_cols;
@@ -10821,11 +10867,11 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 	if (_tmp270_ != _tmp272_) {
 #line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp269_ = TRUE;
-#line 10824 "CheckerboardLayout.c"
+#line 10870 "CheckerboardLayout.c"
 	} else {
-		gint _tmp273_ = 0;
-		GtkAllocation _tmp274_ = {0};
-		gint _tmp275_ = 0;
+		gint _tmp273_;
+		GtkAllocation _tmp274_;
+		gint _tmp275_;
 #line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp273_ = total_height;
 #line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -10834,14 +10880,14 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 		_tmp275_ = _tmp274_.height;
 #line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp269_ = _tmp273_ != _tmp275_;
-#line 10837 "CheckerboardLayout.c"
+#line 10883 "CheckerboardLayout.c"
 	}
 #line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp269_) {
-#line 10841 "CheckerboardLayout.c"
-		gint _tmp276_ = 0;
-		gint _tmp277_ = 0;
-		gint _tmp278_ = 0;
+#line 10887 "CheckerboardLayout.c"
+		gint _tmp276_;
+		gint _tmp277_;
+		gint _tmp278_;
 #line 1857 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp276_ = visible_width;
 #line 1857 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -10854,7 +10900,7 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 		_tmp278_ = total_height;
 #line 1861 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_center_on_anchor (self, (gdouble) _tmp278_);
-#line 10857 "CheckerboardLayout.c"
+#line 10903 "CheckerboardLayout.c"
 	}
 #line 1548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_checkerboard_layout_layout_row_unref0 (current_row);
@@ -10864,15 +10910,15 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 	row_heights = (g_free (row_heights), NULL);
 #line 1548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	column_widths = (g_free (column_widths), NULL);
-#line 10867 "CheckerboardLayout.c"
+#line 10913 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gchar* reason, GeeIterable* items) {
 	GdkRectangle dirty = {0};
 	gboolean _tmp35_ = FALSE;
-	GdkRectangle _tmp36_ = {0};
-	gint _tmp37_ = 0;
+	GdkRectangle _tmp36_;
+	gint _tmp37_;
 #line 1865 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1865 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -10881,11 +10927,11 @@ static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gch
 	g_return_if_fail (GEE_IS_ITERABLE (items));
 #line 1866 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	memset (&dirty, 0, sizeof (GdkRectangle));
-#line 10884 "CheckerboardLayout.c"
+#line 10930 "CheckerboardLayout.c"
 	{
 		GeeIterator* _data_view_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = items;
 #line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -10894,32 +10940,32 @@ static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gch
 		_data_view_it = _tmp1_;
 #line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		while (TRUE) {
-#line 10897 "CheckerboardLayout.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 10943 "CheckerboardLayout.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataView* data_view = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			CheckerboardItem* item = NULL;
-			DataView* _tmp6_ = NULL;
-			CheckerboardItem* _tmp7_ = NULL;
-			CheckerboardItem* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
-			ViewCollection* _tmp10_ = NULL;
-			CheckerboardItem* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
+			DataView* _tmp6_;
+			CheckerboardItem* _tmp7_;
+			CheckerboardItem* _tmp8_;
+			gboolean _tmp9_;
+			ViewCollection* _tmp10_;
+			CheckerboardItem* _tmp11_;
+			gboolean _tmp12_;
 			gboolean _tmp13_ = FALSE;
-			CheckerboardItem* _tmp14_ = NULL;
-			GdkRectangle _tmp15_ = {0};
-			gint _tmp16_ = 0;
+			CheckerboardItem* _tmp14_;
+			GdkRectangle _tmp15_;
+			gint _tmp16_;
 			GdkRectangle intersection = {0};
-			CheckerboardItem* _tmp23_ = NULL;
-			GdkRectangle _tmp24_ = {0};
+			CheckerboardItem* _tmp23_;
+			GdkRectangle _tmp24_;
 			GdkRectangle _tmp25_ = {0};
-			gboolean _tmp26_ = FALSE;
+			gboolean _tmp26_;
 			gboolean _tmp27_ = FALSE;
-			GdkRectangle _tmp28_ = {0};
-			gint _tmp29_ = 0;
+			GdkRectangle _tmp28_;
+			gint _tmp29_;
 #line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp2_ = _data_view_it;
 #line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -10928,7 +10974,7 @@ static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gch
 			if (!_tmp3_) {
 #line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 10931 "CheckerboardLayout.c"
+#line 10977 "CheckerboardLayout.c"
 			}
 #line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp4_ = _data_view_it;
@@ -10954,7 +11000,7 @@ static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gch
 				_g_object_unref0 (data_view);
 #line 1871 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				continue;
-#line 10957 "CheckerboardLayout.c"
+#line 11003 "CheckerboardLayout.c"
 			}
 #line 1873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp10_ = self->priv->view;
@@ -10974,11 +11020,11 @@ static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gch
 			if (_tmp16_ <= 0) {
 #line 1877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp13_ = TRUE;
-#line 10977 "CheckerboardLayout.c"
+#line 11023 "CheckerboardLayout.c"
 			} else {
-				CheckerboardItem* _tmp17_ = NULL;
-				GdkRectangle _tmp18_ = {0};
-				gint _tmp19_ = 0;
+				CheckerboardItem* _tmp17_;
+				GdkRectangle _tmp18_;
+				gint _tmp19_;
 #line 1877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp17_ = item;
 #line 1877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -10987,14 +11033,14 @@ static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gch
 				_tmp19_ = _tmp18_.height;
 #line 1877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp13_ = _tmp19_ <= 0;
-#line 10990 "CheckerboardLayout.c"
+#line 11036 "CheckerboardLayout.c"
 			}
 #line 1877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp13_) {
-#line 10994 "CheckerboardLayout.c"
-				const gchar* _tmp20_ = NULL;
-				gchar* _tmp21_ = NULL;
-				gchar* _tmp22_ = NULL;
+#line 11040 "CheckerboardLayout.c"
+				const gchar* _tmp20_;
+				gchar* _tmp21_;
+				gchar* _tmp22_;
 #line 1878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp20_ = reason;
 #line 1878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -11013,7 +11059,7 @@ static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gch
 				_g_object_unref0 (_data_view_it);
 #line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				return;
-#line 11016 "CheckerboardLayout.c"
+#line 11062 "CheckerboardLayout.c"
 			}
 #line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			memset (&intersection, 0, sizeof (GdkRectangle));
@@ -11033,7 +11079,7 @@ static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gch
 				_g_object_unref0 (data_view);
 #line 1886 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				continue;
-#line 11036 "CheckerboardLayout.c"
+#line 11082 "CheckerboardLayout.c"
 			}
 #line 1889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp28_ = dirty;
@@ -11043,29 +11089,29 @@ static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gch
 			if (_tmp29_ == 0) {
 #line 1889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp27_ = TRUE;
-#line 11046 "CheckerboardLayout.c"
+#line 11092 "CheckerboardLayout.c"
 			} else {
-				GdkRectangle _tmp30_ = {0};
-				gint _tmp31_ = 0;
+				GdkRectangle _tmp30_;
+				gint _tmp31_;
 #line 1889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp30_ = dirty;
 #line 1889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp31_ = _tmp30_.height;
 #line 1889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp27_ = _tmp31_ == 0;
-#line 11056 "CheckerboardLayout.c"
+#line 11102 "CheckerboardLayout.c"
 			}
 #line 1889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp27_) {
-#line 11060 "CheckerboardLayout.c"
-				GdkRectangle _tmp32_ = {0};
+#line 11106 "CheckerboardLayout.c"
+				GdkRectangle _tmp32_;
 #line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp32_ = intersection;
 #line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				dirty = _tmp32_;
-#line 11066 "CheckerboardLayout.c"
+#line 11112 "CheckerboardLayout.c"
 			} else {
-				GdkRectangle _tmp33_ = {0};
+				GdkRectangle _tmp33_;
 				GdkRectangle _tmp34_ = {0};
 #line 1892 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp33_ = intersection;
@@ -11073,17 +11119,17 @@ static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gch
 				gdk_rectangle_union (&dirty, &_tmp33_, &_tmp34_);
 #line 1892 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				dirty = _tmp34_;
-#line 11076 "CheckerboardLayout.c"
+#line 11122 "CheckerboardLayout.c"
 			}
 #line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_g_object_unref0 (item);
 #line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_g_object_unref0 (data_view);
-#line 11082 "CheckerboardLayout.c"
+#line 11128 "CheckerboardLayout.c"
 		}
 #line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (_data_view_it);
-#line 11086 "CheckerboardLayout.c"
+#line 11132 "CheckerboardLayout.c"
 	}
 #line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp36_ = dirty;
@@ -11091,32 +11137,32 @@ static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gch
 	_tmp37_ = _tmp36_.width;
 #line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp37_ > 0) {
-#line 11094 "CheckerboardLayout.c"
-		GdkRectangle _tmp38_ = {0};
-		gint _tmp39_ = 0;
+#line 11140 "CheckerboardLayout.c"
+		GdkRectangle _tmp38_;
+		gint _tmp39_;
 #line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp38_ = dirty;
 #line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp39_ = _tmp38_.height;
 #line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp35_ = _tmp39_ > 0;
-#line 11103 "CheckerboardLayout.c"
+#line 11149 "CheckerboardLayout.c"
 	} else {
 #line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp35_ = FALSE;
-#line 11107 "CheckerboardLayout.c"
+#line 11153 "CheckerboardLayout.c"
 	}
 #line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp35_) {
-#line 11111 "CheckerboardLayout.c"
-		GdkRectangle _tmp40_ = {0};
-		gint _tmp41_ = 0;
-		GdkRectangle _tmp42_ = {0};
-		gint _tmp43_ = 0;
-		GdkRectangle _tmp44_ = {0};
-		gint _tmp45_ = 0;
-		GdkRectangle _tmp46_ = {0};
-		gint _tmp47_ = 0;
+#line 11157 "CheckerboardLayout.c"
+		GdkRectangle _tmp40_;
+		gint _tmp41_;
+		GdkRectangle _tmp42_;
+		gint _tmp43_;
+		GdkRectangle _tmp44_;
+		gint _tmp45_;
+		GdkRectangle _tmp46_;
+		gint _tmp47_;
 #line 1900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp40_ = dirty;
 #line 1900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -11135,7 +11181,7 @@ static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gch
 		_tmp47_ = _tmp46_.height;
 #line 1900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		gtk_widget_queue_draw_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp41_, _tmp43_, _tmp45_, _tmp47_);
-#line 11138 "CheckerboardLayout.c"
+#line 11184 "CheckerboardLayout.c"
 	}
 }
 
@@ -11148,22 +11194,22 @@ static void checkerboard_layout_real_map (GtkWidget* base) {
 	GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->map (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget));
 #line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_set_colors (self, TRUE);
-#line 11151 "CheckerboardLayout.c"
+#line 11197 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_set_colors (CheckerboardLayout* self, gboolean in_focus) {
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
 	GdkRGBA _tmp3_ = {0};
-	ConfigFacade* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
+	ConfigFacade* _tmp4_;
+	ConfigFacade* _tmp5_;
 	GdkRGBA _tmp6_ = {0};
-	ConfigFacade* _tmp7_ = NULL;
-	ConfigFacade* _tmp8_ = NULL;
+	ConfigFacade* _tmp7_;
+	ConfigFacade* _tmp8_;
 	GdkRGBA _tmp9_ = {0};
-	GtkStyleContext* _tmp10_ = NULL;
+	GtkStyleContext* _tmp10_;
 	GdkRGBA _tmp11_ = {0};
 #line 1910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
@@ -11205,13 +11251,13 @@ static void checkerboard_layout_set_colors (CheckerboardLayout* self, gboolean i
 	gtk_style_context_get_background_color (_tmp10_, GTK_STATE_FLAG_NORMAL, &_tmp11_);
 #line 1915 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->bg_color = _tmp11_;
-#line 11208 "CheckerboardLayout.c"
+#line 11254 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_real_size_allocate (GtkWidget* base, GtkAllocation* allocation) {
 	CheckerboardLayout * self;
-	GtkAllocation _tmp0_ = {0};
+	GtkAllocation _tmp0_;
 #line 1918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout);
 #line 1918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -11222,7 +11268,7 @@ static void checkerboard_layout_real_size_allocate (GtkWidget* base, GtkAllocati
 	GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->size_allocate (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), &_tmp0_);
 #line 1921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_viewport_resized (self);
-#line 11225 "CheckerboardLayout.c"
+#line 11271 "CheckerboardLayout.c"
 }
 
 
@@ -11231,16 +11277,16 @@ static gboolean checkerboard_layout_real_draw (GtkWidget* base, cairo_t* ctx) {
 	gboolean result = FALSE;
 	GtkAllocation allocation = {0};
 	GtkAllocation _tmp0_ = {0};
-	GtkStyleContext* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
-	GtkAllocation _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	GtkAllocation _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	const gchar* _tmp7_ = NULL;
+	GtkStyleContext* _tmp1_;
+	cairo_t* _tmp2_;
+	GtkAllocation _tmp3_;
+	gint _tmp4_;
+	GtkAllocation _tmp5_;
+	gint _tmp6_;
+	const gchar* _tmp7_;
 	gboolean _tmp60_ = FALSE;
 	gboolean _result_ = FALSE;
-	cairo_t* _tmp63_ = NULL;
+	cairo_t* _tmp63_;
 #line 1924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout);
 #line 1924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -11267,24 +11313,24 @@ static gboolean checkerboard_layout_real_draw (GtkWidget* base, cairo_t* ctx) {
 	_tmp7_ = self->priv->message;
 #line 1937 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp7_ == NULL) {
-#line 11270 "CheckerboardLayout.c"
-		gboolean _tmp8_ = FALSE;
+#line 11316 "CheckerboardLayout.c"
+		gboolean _tmp8_;
 #line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = self->priv->exposure_dirty;
 #line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp8_) {
 #line 1943 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			checkerboard_layout_expose_items (self, "draw");
-#line 11278 "CheckerboardLayout.c"
+#line 11324 "CheckerboardLayout.c"
 		}
 		{
 			GeeList* _item_list = NULL;
-			GdkRectangle _tmp9_ = {0};
-			GeeList* _tmp10_ = NULL;
+			GdkRectangle _tmp9_;
+			GeeList* _tmp10_;
 			gint _item_size = 0;
-			GeeList* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
+			GeeList* _tmp11_;
+			gint _tmp12_;
+			gint _tmp13_;
 			gint _item_index = 0;
 #line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp9_ = self->priv->visible_page;
@@ -11304,22 +11350,22 @@ static gboolean checkerboard_layout_real_draw (GtkWidget* base, cairo_t* ctx) {
 			_item_index = -1;
 #line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			while (TRUE) {
-#line 11307 "CheckerboardLayout.c"
-				gint _tmp14_ = 0;
-				gint _tmp15_ = 0;
-				gint _tmp16_ = 0;
+#line 11353 "CheckerboardLayout.c"
+				gint _tmp14_;
+				gint _tmp15_;
+				gint _tmp16_;
 				CheckerboardItem* item = NULL;
-				GeeList* _tmp17_ = NULL;
-				gint _tmp18_ = 0;
-				gpointer _tmp19_ = NULL;
+				GeeList* _tmp17_;
+				gint _tmp18_;
+				gpointer _tmp19_;
 				GdkRGBA _tmp20_ = {0};
-				CheckerboardItem* _tmp21_ = NULL;
-				gboolean _tmp22_ = FALSE;
-				CheckerboardItem* _tmp25_ = NULL;
-				cairo_t* _tmp26_ = NULL;
-				GdkRGBA _tmp27_ = {0};
-				GdkRGBA _tmp28_ = {0};
-				GdkRGBA _tmp29_ = {0};
+				CheckerboardItem* _tmp21_;
+				gboolean _tmp22_;
+				CheckerboardItem* _tmp25_;
+				cairo_t* _tmp26_;
+				GdkRGBA _tmp27_;
+				GdkRGBA _tmp28_;
+				GdkRGBA _tmp29_;
 #line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp14_ = _item_index;
 #line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -11332,7 +11378,7 @@ static gboolean checkerboard_layout_real_draw (GtkWidget* base, cairo_t* ctx) {
 				if (!(_tmp15_ < _tmp16_)) {
 #line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 11335 "CheckerboardLayout.c"
+#line 11381 "CheckerboardLayout.c"
 				}
 #line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp17_ = _item_list;
@@ -11348,20 +11394,20 @@ static gboolean checkerboard_layout_real_draw (GtkWidget* base, cairo_t* ctx) {
 				_tmp22_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_VIEW, DataView));
 #line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp22_) {
-#line 11351 "CheckerboardLayout.c"
-					GdkRGBA _tmp23_ = {0};
+#line 11397 "CheckerboardLayout.c"
+					GdkRGBA _tmp23_;
 #line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp23_ = self->priv->selected_color;
 #line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp20_ = _tmp23_;
-#line 11357 "CheckerboardLayout.c"
+#line 11403 "CheckerboardLayout.c"
 				} else {
-					GdkRGBA _tmp24_ = {0};
+					GdkRGBA _tmp24_;
 #line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp24_ = self->priv->unselected_color;
 #line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp20_ = _tmp24_;
-#line 11364 "CheckerboardLayout.c"
+#line 11410 "CheckerboardLayout.c"
 				}
 #line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp25_ = item;
@@ -11377,46 +11423,46 @@ static gboolean checkerboard_layout_real_draw (GtkWidget* base, cairo_t* ctx) {
 				checkerboard_item_paint (_tmp25_, _tmp26_, &_tmp27_, &_tmp20_, &_tmp28_, &_tmp29_);
 #line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (item);
-#line 11380 "CheckerboardLayout.c"
+#line 11426 "CheckerboardLayout.c"
 			}
 #line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_g_object_unref0 (_item_list);
-#line 11384 "CheckerboardLayout.c"
+#line 11430 "CheckerboardLayout.c"
 		}
 	} else {
 		PangoLayout* pango_layout = NULL;
-		const gchar* _tmp30_ = NULL;
-		PangoLayout* _tmp31_ = NULL;
+		const gchar* _tmp30_;
+		PangoLayout* _tmp31_;
 		gint text_width = 0;
 		gint text_height = 0;
-		PangoLayout* _tmp32_ = NULL;
+		PangoLayout* _tmp32_;
 		gint _tmp33_ = 0;
 		gint _tmp34_ = 0;
 		GtkAllocation _tmp35_ = {0};
 		gint x = 0;
-		GtkAllocation _tmp36_ = {0};
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
+		GtkAllocation _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
 		gint _tmp39_ = 0;
-		gint _tmp40_ = 0;
+		gint _tmp40_;
 		gint y = 0;
-		GtkAllocation _tmp42_ = {0};
-		gint _tmp43_ = 0;
-		gint _tmp44_ = 0;
+		GtkAllocation _tmp42_;
+		gint _tmp43_;
+		gint _tmp44_;
 		gint _tmp45_ = 0;
-		gint _tmp46_ = 0;
-		cairo_t* _tmp48_ = NULL;
-		GdkRGBA _tmp49_ = {0};
-		gdouble _tmp50_ = 0.0;
-		GdkRGBA _tmp51_ = {0};
-		gdouble _tmp52_ = 0.0;
-		GdkRGBA _tmp53_ = {0};
-		gdouble _tmp54_ = 0.0;
-		cairo_t* _tmp55_ = NULL;
-		gint _tmp56_ = 0;
-		gint _tmp57_ = 0;
-		cairo_t* _tmp58_ = NULL;
-		PangoLayout* _tmp59_ = NULL;
+		gint _tmp46_;
+		cairo_t* _tmp48_;
+		GdkRGBA _tmp49_;
+		gdouble _tmp50_;
+		GdkRGBA _tmp51_;
+		gdouble _tmp52_;
+		GdkRGBA _tmp53_;
+		gdouble _tmp54_;
+		cairo_t* _tmp55_;
+		gint _tmp56_;
+		gint _tmp57_;
+		cairo_t* _tmp58_;
+		PangoLayout* _tmp59_;
 #line 1952 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp30_ = self->priv->message;
 #line 1952 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -11447,17 +11493,17 @@ static gboolean checkerboard_layout_real_draw (GtkWidget* base, cairo_t* ctx) {
 		_tmp40_ = x;
 #line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp40_ > 0) {
-#line 11450 "CheckerboardLayout.c"
-			gint _tmp41_ = 0;
+#line 11496 "CheckerboardLayout.c"
+			gint _tmp41_;
 #line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp41_ = x;
 #line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp39_ = _tmp41_ / 2;
-#line 11456 "CheckerboardLayout.c"
+#line 11502 "CheckerboardLayout.c"
 		} else {
 #line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp39_ = 0;
-#line 11460 "CheckerboardLayout.c"
+#line 11506 "CheckerboardLayout.c"
 		}
 #line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		x = _tmp39_;
@@ -11473,17 +11519,17 @@ static gboolean checkerboard_layout_real_draw (GtkWidget* base, cairo_t* ctx) {
 		_tmp46_ = y;
 #line 1962 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp46_ > 0) {
-#line 11476 "CheckerboardLayout.c"
-			gint _tmp47_ = 0;
+#line 11522 "CheckerboardLayout.c"
+			gint _tmp47_;
 #line 1962 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp47_ = y;
 #line 1962 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp45_ = _tmp47_ / 2;
-#line 11482 "CheckerboardLayout.c"
+#line 11528 "CheckerboardLayout.c"
 		} else {
 #line 1962 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp45_ = 0;
-#line 11486 "CheckerboardLayout.c"
+#line 11532 "CheckerboardLayout.c"
 		}
 #line 1962 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		y = _tmp45_;
@@ -11519,24 +11565,24 @@ static gboolean checkerboard_layout_real_draw (GtkWidget* base, cairo_t* ctx) {
 		pango_cairo_show_layout (_tmp58_, _tmp59_);
 #line 1937 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (pango_layout);
-#line 11522 "CheckerboardLayout.c"
+#line 11568 "CheckerboardLayout.c"
 	}
 #line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->draw != NULL) {
-#line 11526 "CheckerboardLayout.c"
-		cairo_t* _tmp61_ = NULL;
-		gboolean _tmp62_ = FALSE;
+#line 11572 "CheckerboardLayout.c"
+		cairo_t* _tmp61_;
+		gboolean _tmp62_;
 #line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp61_ = ctx;
 #line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp62_ = GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->draw (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), _tmp61_);
 #line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp60_ = _tmp62_;
-#line 11535 "CheckerboardLayout.c"
+#line 11581 "CheckerboardLayout.c"
 	} else {
 #line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp60_ = TRUE;
-#line 11539 "CheckerboardLayout.c"
+#line 11585 "CheckerboardLayout.c"
 	}
 #line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_result_ = _tmp60_;
@@ -11548,45 +11594,45 @@ static gboolean checkerboard_layout_real_draw (GtkWidget* base, cairo_t* ctx) {
 	result = _result_;
 #line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 11551 "CheckerboardLayout.c"
+#line 11597 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_draw_selection_band (CheckerboardLayout* self, cairo_t* ctx) {
 	gboolean _tmp0_ = FALSE;
-	GdkRectangle _tmp1_ = {0};
-	gint _tmp2_ = 0;
+	GdkRectangle _tmp1_;
+	gint _tmp2_;
 	gboolean _tmp5_ = FALSE;
-	GtkAdjustment* _tmp6_ = NULL;
+	GtkAdjustment* _tmp6_;
 	GdkRectangle visible_page = {0};
-	GtkAdjustment* _tmp8_ = NULL;
-	GtkAdjustment* _tmp9_ = NULL;
+	GtkAdjustment* _tmp8_;
+	GtkAdjustment* _tmp9_;
 	GdkRectangle _tmp10_ = {0};
 	GdkRectangle visible_band = {0};
-	GdkRectangle _tmp11_ = {0};
+	GdkRectangle _tmp11_;
 	GdkRectangle _tmp12_ = {0};
 	gboolean _tmp13_ = FALSE;
-	GdkRectangle _tmp14_ = {0};
-	gint _tmp15_ = 0;
-	cairo_t* _tmp35_ = NULL;
-	cairo_t* _tmp36_ = NULL;
-	cairo_t* _tmp37_ = NULL;
-	GdkRGBA _tmp38_ = {0};
-	gdouble _tmp39_ = 0.0;
-	GdkRGBA _tmp40_ = {0};
-	gdouble _tmp41_ = 0.0;
-	GdkRGBA _tmp42_ = {0};
-	gdouble _tmp43_ = 0.0;
-	cairo_t* _tmp44_ = NULL;
-	GdkRectangle _tmp45_ = {0};
-	gint _tmp46_ = 0;
-	GdkRectangle _tmp47_ = {0};
-	gint _tmp48_ = 0;
-	GdkRectangle _tmp49_ = {0};
-	gint _tmp50_ = 0;
-	GdkRectangle _tmp51_ = {0};
-	gint _tmp52_ = 0;
-	cairo_t* _tmp53_ = NULL;
+	GdkRectangle _tmp14_;
+	gint _tmp15_;
+	cairo_t* _tmp35_;
+	cairo_t* _tmp36_;
+	cairo_t* _tmp37_;
+	GdkRGBA _tmp38_;
+	gdouble _tmp39_;
+	GdkRGBA _tmp40_;
+	gdouble _tmp41_;
+	GdkRGBA _tmp42_;
+	gdouble _tmp43_;
+	cairo_t* _tmp44_;
+	GdkRectangle _tmp45_;
+	gint _tmp46_;
+	GdkRectangle _tmp47_;
+	gint _tmp48_;
+	GdkRectangle _tmp49_;
+	gint _tmp50_;
+	GdkRectangle _tmp51_;
+	gint _tmp52_;
+	cairo_t* _tmp53_;
 #line 1977 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
 #line 1977 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -11599,23 +11645,23 @@ static void checkerboard_layout_draw_selection_band (CheckerboardLayout* self, c
 	if (_tmp2_ <= 1) {
 #line 1979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = TRUE;
-#line 11602 "CheckerboardLayout.c"
+#line 11648 "CheckerboardLayout.c"
 	} else {
-		GdkRectangle _tmp3_ = {0};
-		gint _tmp4_ = 0;
+		GdkRectangle _tmp3_;
+		gint _tmp4_;
 #line 1979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = self->priv->selection_band;
 #line 1979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = _tmp3_.height;
 #line 1979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp4_ <= 1;
-#line 11612 "CheckerboardLayout.c"
+#line 11658 "CheckerboardLayout.c"
 	}
 #line 1979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
 #line 1980 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 11618 "CheckerboardLayout.c"
+#line 11664 "CheckerboardLayout.c"
 	}
 #line 1983 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp6_ = self->priv->hadjustment;
@@ -11623,20 +11669,20 @@ static void checkerboard_layout_draw_selection_band (CheckerboardLayout* self, c
 	if (_tmp6_ == NULL) {
 #line 1983 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = TRUE;
-#line 11626 "CheckerboardLayout.c"
+#line 11672 "CheckerboardLayout.c"
 	} else {
-		GtkAdjustment* _tmp7_ = NULL;
+		GtkAdjustment* _tmp7_;
 #line 1983 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = self->priv->vadjustment;
 #line 1983 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = _tmp7_ == NULL;
-#line 11633 "CheckerboardLayout.c"
+#line 11679 "CheckerboardLayout.c"
 	}
 #line 1983 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp5_) {
 #line 1984 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 11639 "CheckerboardLayout.c"
+#line 11685 "CheckerboardLayout.c"
 	}
 #line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp8_ = self->priv->hadjustment;
@@ -11660,41 +11706,41 @@ static void checkerboard_layout_draw_selection_band (CheckerboardLayout* self, c
 	_tmp15_ = _tmp14_.width;
 #line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp15_ > 1) {
-#line 11663 "CheckerboardLayout.c"
-		GdkRectangle _tmp16_ = {0};
-		gint _tmp17_ = 0;
+#line 11709 "CheckerboardLayout.c"
+		GdkRectangle _tmp16_;
+		gint _tmp17_;
 #line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp16_ = visible_band;
 #line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp17_ = _tmp16_.height;
 #line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = _tmp17_ > 1;
-#line 11672 "CheckerboardLayout.c"
+#line 11718 "CheckerboardLayout.c"
 	} else {
 #line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = FALSE;
-#line 11676 "CheckerboardLayout.c"
+#line 11722 "CheckerboardLayout.c"
 	}
 #line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp13_) {
-#line 11680 "CheckerboardLayout.c"
-		cairo_t* _tmp18_ = NULL;
-		GdkRGBA _tmp19_ = {0};
-		gdouble _tmp20_ = 0.0;
-		GdkRGBA _tmp21_ = {0};
-		gdouble _tmp22_ = 0.0;
-		GdkRGBA _tmp23_ = {0};
-		gdouble _tmp24_ = 0.0;
-		cairo_t* _tmp25_ = NULL;
-		GdkRectangle _tmp26_ = {0};
-		gint _tmp27_ = 0;
-		GdkRectangle _tmp28_ = {0};
-		gint _tmp29_ = 0;
-		GdkRectangle _tmp30_ = {0};
-		gint _tmp31_ = 0;
-		GdkRectangle _tmp32_ = {0};
-		gint _tmp33_ = 0;
-		cairo_t* _tmp34_ = NULL;
+#line 11726 "CheckerboardLayout.c"
+		cairo_t* _tmp18_;
+		GdkRGBA _tmp19_;
+		gdouble _tmp20_;
+		GdkRGBA _tmp21_;
+		gdouble _tmp22_;
+		GdkRGBA _tmp23_;
+		gdouble _tmp24_;
+		cairo_t* _tmp25_;
+		GdkRectangle _tmp26_;
+		gint _tmp27_;
+		GdkRectangle _tmp28_;
+		gint _tmp29_;
+		GdkRectangle _tmp30_;
+		gint _tmp31_;
+		GdkRectangle _tmp32_;
+		gint _tmp33_;
+		cairo_t* _tmp34_;
 #line 1993 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp18_ = ctx;
 #line 1993 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -11735,7 +11781,7 @@ static void checkerboard_layout_draw_selection_band (CheckerboardLayout* self, c
 		_tmp34_ = ctx;
 #line 1997 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_fill (_tmp34_);
-#line 11738 "CheckerboardLayout.c"
+#line 11784 "CheckerboardLayout.c"
 	}
 #line 2003 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp35_ = ctx;
@@ -11785,7 +11831,7 @@ static void checkerboard_layout_draw_selection_band (CheckerboardLayout* self, c
 	_tmp53_ = ctx;
 #line 2008 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	cairo_stroke (_tmp53_);
-#line 11788 "CheckerboardLayout.c"
+#line 11834 "CheckerboardLayout.c"
 }
 
 
@@ -11793,11 +11839,11 @@ static gboolean checkerboard_layout_real_query_tooltip (GtkWidget* base, gint x,
 	CheckerboardLayout * self;
 	gboolean result = FALSE;
 	CheckerboardItem* item = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	CheckerboardItem* _tmp2_ = NULL;
+	gint _tmp0_;
+	gint _tmp1_;
+	CheckerboardItem* _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	CheckerboardItem* _tmp4_ = NULL;
+	CheckerboardItem* _tmp4_;
 #line 2011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout);
 #line 2011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -11814,12 +11860,12 @@ static gboolean checkerboard_layout_real_query_tooltip (GtkWidget* base, gint x,
 	_tmp4_ = item;
 #line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp4_ != NULL) {
-#line 11817 "CheckerboardLayout.c"
-		CheckerboardItem* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-		GtkTooltip* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
+#line 11863 "CheckerboardLayout.c"
+		CheckerboardItem* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
+		GtkTooltip* _tmp8_;
+		gboolean _tmp9_;
 #line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = item;
 #line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -11832,11 +11878,11 @@ static gboolean checkerboard_layout_real_query_tooltip (GtkWidget* base, gint x,
 		_tmp9_ = checkerboard_item_query_tooltip (_tmp5_, _tmp6_, _tmp7_, _tmp8_);
 #line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = _tmp9_;
-#line 11835 "CheckerboardLayout.c"
+#line 11881 "CheckerboardLayout.c"
 	} else {
 #line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = FALSE;
-#line 11839 "CheckerboardLayout.c"
+#line 11885 "CheckerboardLayout.c"
 	}
 #line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp3_;
@@ -11844,13 +11890,13 @@ static gboolean checkerboard_layout_real_query_tooltip (GtkWidget* base, gint x,
 	_g_object_unref0 (item);
 #line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 11847 "CheckerboardLayout.c"
+#line 11893 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_on_colors_changed (CheckerboardLayout* self) {
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
 	GdkRGBA _tmp2_ = {0};
 #line 2017 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
@@ -11866,18 +11912,18 @@ static void checkerboard_layout_on_colors_changed (CheckerboardLayout* self) {
 	_g_object_unref0 (_tmp1_);
 #line 2019 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_set_colors (self, TRUE);
-#line 11869 "CheckerboardLayout.c"
+#line 11915 "CheckerboardLayout.c"
 }
 
 
 static gboolean checkerboard_layout_real_focus_in_event (GtkWidget* base, GdkEventFocus* event) {
 	CheckerboardLayout * self;
 	gboolean result = FALSE;
-	ViewCollection* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	GdkEventFocus* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	ViewCollection* _tmp0_;
+	GeeList* _tmp1_;
+	GeeList* _tmp2_;
+	GdkEventFocus* _tmp3_;
+	gboolean _tmp4_;
 #line 2022 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout);
 #line 2022 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -11902,18 +11948,18 @@ static gboolean checkerboard_layout_real_focus_in_event (GtkWidget* base, GdkEve
 	result = _tmp4_;
 #line 2026 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 11905 "CheckerboardLayout.c"
+#line 11951 "CheckerboardLayout.c"
 }
 
 
 static gboolean checkerboard_layout_real_focus_out_event (GtkWidget* base, GdkEventFocus* event) {
 	CheckerboardLayout * self;
 	gboolean result = FALSE;
-	ViewCollection* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	GdkEventFocus* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	ViewCollection* _tmp0_;
+	GeeList* _tmp1_;
+	GeeList* _tmp2_;
+	GdkEventFocus* _tmp3_;
+	gboolean _tmp4_;
 #line 2029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout);
 #line 2029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -11938,16 +11984,16 @@ static gboolean checkerboard_layout_real_focus_out_event (GtkWidget* base, GdkEv
 	result = _tmp4_;
 #line 2033 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 11941 "CheckerboardLayout.c"
+#line 11987 "CheckerboardLayout.c"
 }
 
 
 static CheckerboardLayoutLayoutRow* checkerboard_layout_layout_row_construct (GType object_type, gint y, gint height, gint num_in_row) {
 	CheckerboardLayoutLayoutRow* self = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	CheckerboardItem** _tmp3_ = NULL;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	CheckerboardItem** _tmp3_;
 #line 843 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = (CheckerboardLayoutLayoutRow*) g_type_create_instance (object_type);
 #line 844 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -11972,21 +12018,21 @@ static CheckerboardLayoutLayoutRow* checkerboard_layout_layout_row_construct (GT
 	self->_items_size_ = self->items_length1;
 #line 843 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return self;
-#line 11975 "CheckerboardLayout.c"
+#line 12021 "CheckerboardLayout.c"
 }
 
 
 static CheckerboardLayoutLayoutRow* checkerboard_layout_layout_row_new (gint y, gint height, gint num_in_row) {
 #line 843 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return checkerboard_layout_layout_row_construct (CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW, y, height, num_in_row);
-#line 11982 "CheckerboardLayout.c"
+#line 12028 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_value_layout_row_init (GValue* value) {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	value->data[0].v_pointer = NULL;
-#line 11989 "CheckerboardLayout.c"
+#line 12035 "CheckerboardLayout.c"
 }
 
 
@@ -11995,7 +12041,7 @@ static void checkerboard_layout_value_layout_row_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_layout_row_unref (value->data[0].v_pointer);
-#line 11998 "CheckerboardLayout.c"
+#line 12044 "CheckerboardLayout.c"
 	}
 }
 
@@ -12005,11 +12051,11 @@ static void checkerboard_layout_value_layout_row_copy_value (const GValue* src_v
 	if (src_value->data[0].v_pointer) {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		dest_value->data[0].v_pointer = checkerboard_layout_layout_row_ref (src_value->data[0].v_pointer);
-#line 12008 "CheckerboardLayout.c"
+#line 12054 "CheckerboardLayout.c"
 	} else {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 12012 "CheckerboardLayout.c"
+#line 12058 "CheckerboardLayout.c"
 	}
 }
 
@@ -12017,66 +12063,66 @@ static void checkerboard_layout_value_layout_row_copy_value (const GValue* src_v
 static gpointer checkerboard_layout_value_layout_row_peek_pointer (const GValue* value) {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return value->data[0].v_pointer;
-#line 12020 "CheckerboardLayout.c"
+#line 12066 "CheckerboardLayout.c"
 }
 
 
 static gchar* checkerboard_layout_value_layout_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (collect_values[0].v_pointer) {
-#line 12027 "CheckerboardLayout.c"
-		CheckerboardLayoutLayoutRow* object;
+#line 12073 "CheckerboardLayout.c"
+		CheckerboardLayoutLayoutRow * object;
 		object = collect_values[0].v_pointer;
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12034 "CheckerboardLayout.c"
+#line 12080 "CheckerboardLayout.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12038 "CheckerboardLayout.c"
+#line 12084 "CheckerboardLayout.c"
 		}
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		value->data[0].v_pointer = checkerboard_layout_layout_row_ref (object);
-#line 12042 "CheckerboardLayout.c"
+#line 12088 "CheckerboardLayout.c"
 	} else {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		value->data[0].v_pointer = NULL;
-#line 12046 "CheckerboardLayout.c"
+#line 12092 "CheckerboardLayout.c"
 	}
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return NULL;
-#line 12050 "CheckerboardLayout.c"
+#line 12096 "CheckerboardLayout.c"
 }
 
 
 static gchar* checkerboard_layout_value_layout_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	CheckerboardLayoutLayoutRow** object_p;
+	CheckerboardLayoutLayoutRow ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (!object_p) {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 12061 "CheckerboardLayout.c"
+#line 12107 "CheckerboardLayout.c"
 	}
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (!value->data[0].v_pointer) {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		*object_p = NULL;
-#line 12067 "CheckerboardLayout.c"
+#line 12113 "CheckerboardLayout.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		*object_p = value->data[0].v_pointer;
-#line 12071 "CheckerboardLayout.c"
+#line 12117 "CheckerboardLayout.c"
 	} else {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		*object_p = checkerboard_layout_layout_row_ref (value->data[0].v_pointer);
-#line 12075 "CheckerboardLayout.c"
+#line 12121 "CheckerboardLayout.c"
 	}
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return NULL;
-#line 12079 "CheckerboardLayout.c"
+#line 12125 "CheckerboardLayout.c"
 }
 
 
@@ -12090,7 +12136,7 @@ static GParamSpec* checkerboard_layout_param_spec_layout_row (const gchar* name,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return G_PARAM_SPEC (spec);
-#line 12093 "CheckerboardLayout.c"
+#line 12139 "CheckerboardLayout.c"
 }
 
 
@@ -12099,12 +12145,12 @@ static gpointer checkerboard_layout_value_get_layout_row (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW), NULL);
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return value->data[0].v_pointer;
-#line 12102 "CheckerboardLayout.c"
+#line 12148 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_value_set_layout_row (GValue* value, gpointer v_object) {
-	CheckerboardLayoutLayoutRow* old;
+	CheckerboardLayoutLayoutRow * old;
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW));
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -12119,23 +12165,23 @@ static void checkerboard_layout_value_set_layout_row (GValue* value, gpointer v_
 		value->data[0].v_pointer = v_object;
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_layout_row_ref (value->data[0].v_pointer);
-#line 12122 "CheckerboardLayout.c"
+#line 12168 "CheckerboardLayout.c"
 	} else {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		value->data[0].v_pointer = NULL;
-#line 12126 "CheckerboardLayout.c"
+#line 12172 "CheckerboardLayout.c"
 	}
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (old) {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_layout_row_unref (old);
-#line 12132 "CheckerboardLayout.c"
+#line 12178 "CheckerboardLayout.c"
 	}
 }
 
 
 static void checkerboard_layout_value_take_layout_row (GValue* value, gpointer v_object) {
-	CheckerboardLayoutLayoutRow* old;
+	CheckerboardLayoutLayoutRow * old;
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW));
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -12148,17 +12194,17 @@ static void checkerboard_layout_value_take_layout_row (GValue* value, gpointer v
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		value->data[0].v_pointer = v_object;
-#line 12151 "CheckerboardLayout.c"
+#line 12197 "CheckerboardLayout.c"
 	} else {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		value->data[0].v_pointer = NULL;
-#line 12155 "CheckerboardLayout.c"
+#line 12201 "CheckerboardLayout.c"
 	}
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (old) {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_layout_row_unref (old);
-#line 12161 "CheckerboardLayout.c"
+#line 12207 "CheckerboardLayout.c"
 	}
 }
 
@@ -12168,18 +12214,18 @@ static void checkerboard_layout_layout_row_class_init (CheckerboardLayoutLayoutR
 	checkerboard_layout_layout_row_parent_class = g_type_class_peek_parent (klass);
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	((CheckerboardLayoutLayoutRowClass *) klass)->finalize = checkerboard_layout_layout_row_finalize;
-#line 12171 "CheckerboardLayout.c"
+#line 12217 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_layout_row_instance_init (CheckerboardLayoutLayoutRow * self) {
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->ref_count = 1;
-#line 12178 "CheckerboardLayout.c"
+#line 12224 "CheckerboardLayout.c"
 }
 
 
-static void checkerboard_layout_layout_row_finalize (CheckerboardLayoutLayoutRow* obj) {
+static void checkerboard_layout_layout_row_finalize (CheckerboardLayoutLayoutRow * obj) {
 	CheckerboardLayoutLayoutRow * self;
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW, CheckerboardLayoutLayoutRow);
@@ -12187,7 +12233,7 @@ static void checkerboard_layout_layout_row_finalize (CheckerboardLayoutLayoutRow
 	g_signal_handlers_destroy (self);
 #line 841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->items = (_vala_array_free (self->items, self->items_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 12190 "CheckerboardLayout.c"
+#line 12236 "CheckerboardLayout.c"
 }
 
 
@@ -12206,18 +12252,18 @@ static GType checkerboard_layout_layout_row_get_type (void) {
 
 
 static gpointer checkerboard_layout_layout_row_ref (gpointer instance) {
-	CheckerboardLayoutLayoutRow* self;
+	CheckerboardLayoutLayoutRow * self;
 	self = instance;
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return instance;
-#line 12215 "CheckerboardLayout.c"
+#line 12261 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_layout_row_unref (gpointer instance) {
-	CheckerboardLayoutLayoutRow* self;
+	CheckerboardLayoutLayoutRow * self;
 	self = instance;
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -12225,7 +12271,7 @@ static void checkerboard_layout_layout_row_unref (gpointer instance) {
 		CHECKERBOARD_LAYOUT_LAYOUT_ROW_GET_CLASS (self)->finalize (self);
 #line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 12228 "CheckerboardLayout.c"
+#line 12274 "CheckerboardLayout.c"
 	}
 }
 
@@ -12236,26 +12282,26 @@ static void checkerboard_layout_class_init (CheckerboardLayoutClass * klass) {
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_type_class_add_private (klass, sizeof (CheckerboardLayoutPrivate));
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((GtkWidgetClass *) klass)->map = (void (*)(GtkWidget*)) checkerboard_layout_real_map;
+	((GtkWidgetClass *) klass)->map = (void (*) (GtkWidget *)) checkerboard_layout_real_map;
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((GtkWidgetClass *) klass)->size_allocate = (void (*)(GtkWidget*, GtkAllocation*)) checkerboard_layout_real_size_allocate;
+	((GtkWidgetClass *) klass)->size_allocate = (void (*) (GtkWidget *, GtkAllocation*)) checkerboard_layout_real_size_allocate;
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((GtkWidgetClass *) klass)->draw = (gboolean (*)(GtkWidget*, cairo_t*)) checkerboard_layout_real_draw;
+	((GtkWidgetClass *) klass)->draw = (gboolean (*) (GtkWidget *, cairo_t*)) checkerboard_layout_real_draw;
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((GtkWidgetClass *) klass)->query_tooltip = (gboolean (*)(GtkWidget*, gint, gint, gboolean, GtkTooltip*)) checkerboard_layout_real_query_tooltip;
+	((GtkWidgetClass *) klass)->query_tooltip = (gboolean (*) (GtkWidget *, gint, gint, gboolean, GtkTooltip*)) checkerboard_layout_real_query_tooltip;
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((GtkWidgetClass *) klass)->focus_in_event = (gboolean (*)(GtkWidget*, GdkEventFocus*)) checkerboard_layout_real_focus_in_event;
+	((GtkWidgetClass *) klass)->focus_in_event = (gboolean (*) (GtkWidget *, GdkEventFocus*)) checkerboard_layout_real_focus_in_event;
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((GtkWidgetClass *) klass)->focus_out_event = (gboolean (*)(GtkWidget*, GdkEventFocus*)) checkerboard_layout_real_focus_out_event;
+	((GtkWidgetClass *) klass)->focus_out_event = (gboolean (*) (GtkWidget *, GdkEventFocus*)) checkerboard_layout_real_focus_out_event;
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	G_OBJECT_CLASS (klass)->finalize = checkerboard_layout_finalize;
-#line 12252 "CheckerboardLayout.c"
+#line 12298 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_instance_init (CheckerboardLayout * self) {
-	gchar* _tmp0_ = NULL;
-	GeeHashSet* _tmp1_ = NULL;
+	gchar* _tmp0_;
+	GeeHashSet* _tmp1_;
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv = CHECKERBOARD_LAYOUT_GET_PRIVATE (self);
 #line 851 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -12310,37 +12356,37 @@ static void checkerboard_layout_instance_init (CheckerboardLayout * self) {
 	self->priv->is_in_view = FALSE;
 #line 876 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->reflow_needed = FALSE;
-#line 12313 "CheckerboardLayout.c"
+#line 12359 "CheckerboardLayout.c"
 }
 
 
-static void checkerboard_layout_finalize (GObject* obj) {
+static void checkerboard_layout_finalize (GObject * obj) {
 	CheckerboardLayout * self;
-	ViewCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	ViewCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	ViewCollection* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	ViewCollection* _tmp6_ = NULL;
-	guint _tmp7_ = 0U;
-	ViewCollection* _tmp8_ = NULL;
-	guint _tmp9_ = 0U;
-	ViewCollection* _tmp10_ = NULL;
-	guint _tmp11_ = 0U;
-	ViewCollection* _tmp12_ = NULL;
-	guint _tmp13_ = 0U;
-	ViewCollection* _tmp14_ = NULL;
-	guint _tmp15_ = 0U;
-	ViewCollection* _tmp16_ = NULL;
-	guint _tmp17_ = 0U;
-	GtkAdjustment* _tmp18_ = NULL;
-	GtkAdjustment* _tmp21_ = NULL;
-	GtkContainer* _tmp24_ = NULL;
-	GtkContainer* _tmp25_ = NULL;
-	ConfigFacade* _tmp29_ = NULL;
-	ConfigFacade* _tmp30_ = NULL;
-	guint _tmp31_ = 0U;
+	ViewCollection* _tmp0_;
+	guint _tmp1_;
+	ViewCollection* _tmp2_;
+	guint _tmp3_;
+	ViewCollection* _tmp4_;
+	guint _tmp5_;
+	ViewCollection* _tmp6_;
+	guint _tmp7_;
+	ViewCollection* _tmp8_;
+	guint _tmp9_;
+	ViewCollection* _tmp10_;
+	guint _tmp11_;
+	ViewCollection* _tmp12_;
+	guint _tmp13_;
+	ViewCollection* _tmp14_;
+	guint _tmp15_;
+	ViewCollection* _tmp16_;
+	guint _tmp17_;
+	GtkAdjustment* _tmp18_;
+	GtkAdjustment* _tmp21_;
+	GtkContainer* _tmp24_;
+	GtkContainer* _tmp25_;
+	ConfigFacade* _tmp29_;
+	ConfigFacade* _tmp30_;
+	guint _tmp31_;
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout);
 #line 907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -12401,31 +12447,31 @@ static void checkerboard_layout_finalize (GObject* obj) {
 	_tmp18_ = self->priv->hadjustment;
 #line 917 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp18_ != NULL) {
-#line 12404 "CheckerboardLayout.c"
-		GtkAdjustment* _tmp19_ = NULL;
-		guint _tmp20_ = 0U;
+#line 12450 "CheckerboardLayout.c"
+		GtkAdjustment* _tmp19_;
+		guint _tmp20_;
 #line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp19_ = self->priv->hadjustment;
 #line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_signal_parse_name ("value-changed", gtk_adjustment_get_type (), &_tmp20_, NULL, FALSE);
 #line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed, self);
-#line 12413 "CheckerboardLayout.c"
+#line 12459 "CheckerboardLayout.c"
 	}
 #line 920 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp21_ = self->priv->vadjustment;
 #line 920 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp21_ != NULL) {
-#line 12419 "CheckerboardLayout.c"
-		GtkAdjustment* _tmp22_ = NULL;
-		guint _tmp23_ = 0U;
+#line 12465 "CheckerboardLayout.c"
+		GtkAdjustment* _tmp22_;
+		guint _tmp23_;
 #line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp22_ = self->priv->vadjustment;
 #line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_signal_parse_name ("value-changed", gtk_adjustment_get_type (), &_tmp23_, NULL, FALSE);
 #line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_signal_handlers_disconnect_matched (_tmp22_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp23_, 0, NULL, (GCallback) _checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed, self);
-#line 12428 "CheckerboardLayout.c"
+#line 12474 "CheckerboardLayout.c"
 	}
 #line 923 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp24_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -12433,10 +12479,10 @@ static void checkerboard_layout_finalize (GObject* obj) {
 	_tmp25_ = _tmp24_;
 #line 923 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp25_ != NULL) {
-#line 12436 "CheckerboardLayout.c"
-		GtkContainer* _tmp26_ = NULL;
-		GtkContainer* _tmp27_ = NULL;
-		guint _tmp28_ = 0U;
+#line 12482 "CheckerboardLayout.c"
+		GtkContainer* _tmp26_;
+		GtkContainer* _tmp27_;
+		guint _tmp28_;
 #line 924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp26_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -12445,7 +12491,7 @@ static void checkerboard_layout_finalize (GObject* obj) {
 		g_signal_parse_name ("size-allocate", gtk_widget_get_type (), &_tmp28_, NULL, FALSE);
 #line 924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp28_, 0, NULL, (GCallback) _checkerboard_layout_on_viewport_resized_gtk_widget_size_allocate, self);
-#line 12448 "CheckerboardLayout.c"
+#line 12494 "CheckerboardLayout.c"
 	}
 #line 926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp29_ = config_facade_get_instance ();
@@ -12477,7 +12523,7 @@ static void checkerboard_layout_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->cursor);
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	G_OBJECT_CLASS (checkerboard_layout_parent_class)->finalize (obj);
-#line 12480 "CheckerboardLayout.c"
+#line 12526 "CheckerboardLayout.c"
 }
 
 
diff --git a/src/CollectionPage.c b/src/CollectionPage.c
index d44af2c..87f07c8 100644
--- a/src/CollectionPage.c
+++ b/src/CollectionPage.c
@@ -1,4 +1,4 @@
-/* CollectionPage.c generated by valac 0.34.7, the Vala compiler
+/* CollectionPage.c generated by valac 0.36.6, the Vala compiler
  * generated from CollectionPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1035,7 +1035,7 @@ CollectionViewManager* collection_view_manager_construct (GType object_type, Col
 ViewManager* view_manager_construct (GType object_type);
 static DataView* collection_view_manager_real_create_view (ViewManager* base, DataSource* source);
 DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source);
-static void collection_view_manager_finalize (ViewManager* obj);
+static void collection_view_manager_finalize (ViewManager * obj);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType fullscreen_window_get_type (void) G_GNUC_CONST;
 gpointer injection_group_ref (gpointer instance);
@@ -1167,12 +1167,12 @@ static void collection_page_real_remove_actions (Page* base, GActionMap* map);
 void page_remove_actions (Page* self, GActionMap* map);
 static InjectionGroup** collection_page_real_init_collect_injection_groups (Page* base, int* result_length1);
 InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1);
-static void _vala_array_add76 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add77 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add78 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add79 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add80 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add81 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add76 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add77 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add78 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add79 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add80 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add81 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
 static gboolean collection_page_selection_has_video (CollectionPage* self);
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
@@ -1377,7 +1377,7 @@ enum  {
 static guint collection_page_collection_search_view_filter_real_get_criteria (SearchViewFilter* base);
 GType search_filter_criteria_get_type (void) G_GNUC_CONST;
 DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type);
-static void collection_page_finalize (GObject* obj);
+static void collection_page_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -1392,8 +1392,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page) {
 	CollectionViewManager* self = NULL;
-	CollectionPage* _tmp0_ = NULL;
-	CollectionPage* _tmp1_ = NULL;
+	CollectionPage* _tmp0_;
+	CollectionPage* _tmp1_;
 #line 10 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (page), NULL);
 #line 10 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -1422,9 +1422,9 @@ CollectionViewManager* collection_view_manager_new (CollectionPage* page) {
 static DataView* collection_view_manager_real_create_view (ViewManager* base, DataSource* source) {
 	CollectionViewManager * self;
 	DataView* result = NULL;
-	CollectionPage* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	DataView* _tmp2_ = NULL;
+	CollectionPage* _tmp0_;
+	DataSource* _tmp1_;
+	DataView* _tmp2_;
 #line 14 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager);
 #line 14 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -1451,7 +1451,7 @@ static void collection_view_manager_class_init (CollectionViewManagerClass * kla
 #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_type_class_add_private (klass, sizeof (CollectionViewManagerPrivate));
 #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) collection_view_manager_real_create_view;
+	((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) collection_view_manager_real_create_view;
 #line 1456 "CollectionPage.c"
 }
 
@@ -1463,7 +1463,7 @@ static void collection_view_manager_instance_init (CollectionViewManager * self)
 }
 
 
-static void collection_view_manager_finalize (ViewManager* obj) {
+static void collection_view_manager_finalize (ViewManager * obj) {
 	CollectionViewManager * self;
 #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager);
@@ -1615,11 +1615,11 @@ static void _collection_page_on_external_app_changed_configuration_facade_extern
 
 CollectionPage* collection_page_construct (GType object_type, const gchar* page_name) {
 	CollectionPage * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	ConfigFacade* _tmp4_ = NULL;
+	const gchar* _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	ConfigFacade* _tmp3_;
+	ConfigFacade* _tmp4_;
 #line 32 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
 #line 33 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -1657,9 +1657,9 @@ CollectionPage* collection_page_construct (GType object_type, const gchar* page_
 static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
 	CollectionPage * self;
 	GtkToolbar* result = NULL;
-	GtkToolbar* _tmp0_ = NULL;
-	GtkToolbar* _tmp28_ = NULL;
-	GtkToolbar* _tmp29_ = NULL;
+	GtkToolbar* _tmp0_;
+	GtkToolbar* _tmp28_;
+	GtkToolbar* _tmp29_;
 #line 46 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
 #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -1667,38 +1667,38 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
 #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp0_ == NULL) {
 #line 1670 "CollectionPage.c"
-		GtkToolbar* _tmp1_ = NULL;
-		GtkToolbar* _tmp2_ = NULL;
+		GtkToolbar* _tmp1_;
+		GtkToolbar* _tmp2_;
 		GtkSeparatorToolItem* separator = NULL;
-		GtkSeparatorToolItem* _tmp3_ = NULL;
-		GtkSeparatorToolItem* _tmp4_ = NULL;
-		GtkSeparatorToolItem* _tmp5_ = NULL;
-		GtkToolbar* _tmp6_ = NULL;
-		GtkToolbar* _tmp7_ = NULL;
-		GtkSeparatorToolItem* _tmp8_ = NULL;
+		GtkSeparatorToolItem* _tmp3_;
+		GtkSeparatorToolItem* _tmp4_;
+		GtkSeparatorToolItem* _tmp5_;
+		GtkToolbar* _tmp6_;
+		GtkToolbar* _tmp7_;
+		GtkSeparatorToolItem* _tmp8_;
 		GtkSeparatorToolItem* drawn_separator = NULL;
-		GtkSeparatorToolItem* _tmp9_ = NULL;
-		GtkSeparatorToolItem* _tmp10_ = NULL;
-		GtkSeparatorToolItem* _tmp11_ = NULL;
-		GtkToolbar* _tmp12_ = NULL;
-		GtkToolbar* _tmp13_ = NULL;
-		GtkSeparatorToolItem* _tmp14_ = NULL;
+		GtkSeparatorToolItem* _tmp9_;
+		GtkSeparatorToolItem* _tmp10_;
+		GtkSeparatorToolItem* _tmp11_;
+		GtkToolbar* _tmp12_;
+		GtkToolbar* _tmp13_;
+		GtkSeparatorToolItem* _tmp14_;
 		MediaPageZoomSliderAssembly* zoom_slider_assembly = NULL;
-		MediaPageZoomSliderAssembly* _tmp15_ = NULL;
-		MediaPageZoomSliderAssembly* _tmp16_ = NULL;
-		GtkToolbar* _tmp17_ = NULL;
-		GtkToolbar* _tmp18_ = NULL;
-		MediaPageZoomSliderAssembly* _tmp19_ = NULL;
+		MediaPageZoomSliderAssembly* _tmp15_;
+		MediaPageZoomSliderAssembly* _tmp16_;
+		GtkToolbar* _tmp17_;
+		GtkToolbar* _tmp18_;
+		MediaPageZoomSliderAssembly* _tmp19_;
 		GtkToolButton* rotate_button = NULL;
-		GtkBuilder* _tmp20_ = NULL;
-		GObject* _tmp21_ = NULL;
-		GtkToolButton* _tmp22_ = NULL;
+		GtkBuilder* _tmp20_;
+		GObject* _tmp21_;
+		GtkToolButton* _tmp22_;
 		GtkBindingSet* binding_set = NULL;
-		GtkToolButton* _tmp23_ = NULL;
-		GObjectClass* _tmp24_ = NULL;
-		GtkBindingSet* _tmp25_ = NULL;
-		GtkBindingSet* _tmp26_ = NULL;
-		GtkBindingSet* _tmp27_ = NULL;
+		GtkToolButton* _tmp23_;
+		GObjectClass* _tmp24_;
+		GtkBindingSet* _tmp25_;
+		GtkBindingSet* _tmp26_;
+		GtkBindingSet* _tmp27_;
 #line 48 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = PAGE_CLASS (collection_page_parent_class)->get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page));
 #line 48 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -1820,206 +1820,149 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
 static InjectionGroup* collection_page_create_file_menu_injectables (void) {
 	InjectionGroup* result = NULL;
 	InjectionGroup* group = NULL;
-	InjectionGroup* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	InjectionGroup* _tmp0_;
 #line 78 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("FileExtrasPlaceholder");
 #line 78 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
 #line 80 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp1_ = _ ("_Print");
-#line 80 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp1_, "Print", "<Primary>p");
+	injection_group_add_menu_item (group, _ ("_Print"), "Print", "<Primary>p");
 #line 81 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_separator (group);
 #line 82 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp2_ = _ ("_Publish");
-#line 82 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp2_, "Publish", "<Primary><Shift>p");
-#line 83 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp3_ = _ ("Send _To…");
+	injection_group_add_menu_item (group, _ ("_Publish"), "Publish", "<Primary><Shift>p");
 #line 83 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp3_, "SendTo", NULL);
+	injection_group_add_menu_item (group, _ ("Send _To…"), "SendTo", NULL);
 #line 84 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp4_ = _ ("Set as _Desktop Background");
-#line 84 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp4_, "SetBackground", "<Primary>b");
+	injection_group_add_menu_item (group, _ ("Set as _Desktop Background"), "SetBackground", "<Primary>b");
 #line 86 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
 #line 86 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1855 "CollectionPage.c"
+#line 1843 "CollectionPage.c"
 }
 
 
 static InjectionGroup* collection_page_create_edit_menu_injectables (void) {
 	InjectionGroup* result = NULL;
 	InjectionGroup* group = NULL;
-	InjectionGroup* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	InjectionGroup* _tmp0_;
 #line 90 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("EditExtrasPlaceholder");
 #line 90 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
 #line 92 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp1_ = _ ("_Duplicate");
-#line 92 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp1_, "Duplicate", "<Primary>D");
+	injection_group_add_menu_item (group, _ ("_Duplicate"), "Duplicate", "<Primary>D");
 #line 94 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
 #line 94 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1876 "CollectionPage.c"
+#line 1861 "CollectionPage.c"
 }
 
 
 static InjectionGroup* collection_page_create_view_menu_fullscreen_injectables (void) {
 	InjectionGroup* result = NULL;
 	InjectionGroup* group = NULL;
-	InjectionGroup* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	InjectionGroup* _tmp0_;
 #line 98 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("ViewExtrasFullscreenSlideshowPlaceholder");
 #line 98 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
 #line 100 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp1_ = _ ("Fullscreen");
-#line 100 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp1_, "CommonFullscreen", "F11");
+	injection_group_add_menu_item (group, _ ("Fullscreen"), "CommonFullscreen", "F11");
 #line 101 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_separator (group);
 #line 102 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp2_ = _ ("S_lideshow");
-#line 102 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp2_, "Slideshow", "F5");
+	injection_group_add_menu_item (group, _ ("S_lideshow"), "Slideshow", "F5");
 #line 104 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
 #line 104 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1904 "CollectionPage.c"
+#line 1883 "CollectionPage.c"
 }
 
 
 static InjectionGroup* collection_page_create_photos_menu_edits_injectables (void) {
 	InjectionGroup* result = NULL;
 	InjectionGroup* group = NULL;
-	InjectionGroup* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
+	InjectionGroup* _tmp0_;
 #line 108 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("PhotosExtrasEditsPlaceholder");
 #line 108 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
 #line 110 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp1_ = _ ("Rotate _Right");
-#line 110 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp1_, "RotateClockwise", "<Primary>r");
-#line 113 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp2_ = _ ("Rotate _Left");
+	injection_group_add_menu_item (group, _ ("Rotate _Right"), "RotateClockwise", "<Primary>r");
 #line 113 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp2_, "RotateCounterclockwise", "<Primary><Shift>r");
+	injection_group_add_menu_item (group, _ ("Rotate _Left"), "RotateCounterclockwise", "<Primary><Shift>r");
 #line 116 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp3_ = _ ("Flip Hori_zontally");
-#line 116 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp3_, "FlipHorizontally", NULL);
-#line 117 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp4_ = _ ("Flip Verti_cally");
+	injection_group_add_menu_item (group, _ ("Flip Hori_zontally"), "FlipHorizontally", NULL);
 #line 117 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp4_, "FlipVertically", NULL);
+	injection_group_add_menu_item (group, _ ("Flip Verti_cally"), "FlipVertically", NULL);
 #line 118 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_separator (group);
 #line 119 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp5_ = _ ("_Enhance");
-#line 119 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp5_, "Enhance", NULL);
-#line 120 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp6_ = _ ("Re_vert to Original");
+	injection_group_add_menu_item (group, _ ("_Enhance"), "Enhance", NULL);
 #line 120 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp6_, "Revert", NULL);
+	injection_group_add_menu_item (group, _ ("Re_vert to Original"), "Revert", NULL);
 #line 121 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_separator (group);
 #line 122 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp7_ = _ ("_Copy Color Adjustments");
-#line 122 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp7_, "CopyColorAdjustments", "<Primary><Shift>c");
-#line 125 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp8_ = _ ("_Paste Color Adjustments");
+	injection_group_add_menu_item (group, _ ("_Copy Color Adjustments"), "CopyColorAdjustments", "<Primary><Shift>c");
 #line 125 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp8_, "PasteColorAdjustments", "<Primary><Shift>v");
+	injection_group_add_menu_item (group, _ ("_Paste Color Adjustments"), "PasteColorAdjustments", "<Primary><Shift>v");
 #line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
 #line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1964 "CollectionPage.c"
+#line 1919 "CollectionPage.c"
 }
 
 
 static InjectionGroup* collection_page_create_photos_menu_date_injectables (void) {
 	InjectionGroup* result = NULL;
 	InjectionGroup* group = NULL;
-	InjectionGroup* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	InjectionGroup* _tmp0_;
 #line 133 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("PhotosExtrasDateTimePlaceholder");
 #line 133 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
 #line 135 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp1_ = _ ("Adjust Date and Time…");
-#line 135 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp1_, "AdjustDateTime", NULL);
+	injection_group_add_menu_item (group, _ ("Adjust Date and Time…"), "AdjustDateTime", NULL);
 #line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
 #line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1985 "CollectionPage.c"
+#line 1937 "CollectionPage.c"
 }
 
 
 static InjectionGroup* collection_page_create_photos_menu_externals_injectables (void) {
 	InjectionGroup* result = NULL;
 	InjectionGroup* group = NULL;
-	InjectionGroup* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	InjectionGroup* _tmp0_;
 #line 141 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("PhotosExtrasExternalsPlaceholder");
 #line 141 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
 #line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp1_ = _ ("Open With E_xternal Editor");
-#line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp1_, "ExternalEdit", "<Primary>Return");
+	injection_group_add_menu_item (group, _ ("Open With E_xternal Editor"), "ExternalEdit", "<Primary>Return");
 #line 146 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp2_ = _ ("Open With RA_W Editor");
-#line 146 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp2_, "ExternalEditRAW", "<Primary><Shift>Return");
-#line 149 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp3_ = _ ("_Play");
+	injection_group_add_menu_item (group, _ ("Open With RA_W Editor"), "ExternalEditRAW", "<Primary><Shift>Return");
 #line 149 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp3_, "PlayVideo", "<Primary>Y");
+	injection_group_add_menu_item (group, _ ("_Play"), "PlayVideo", "<Primary>Y");
 #line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
 #line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2016 "CollectionPage.c"
+#line 1959 "CollectionPage.c"
 }
 
 
 static void collection_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	CollectionPage * self;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2032,14 +1975,14 @@ static void collection_page_real_init_collect_ui_filenames (Page* base, GeeList*
 	_tmp1_ = ui_filenames;
 #line 157 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "collection.ui");
-#line 2036 "CollectionPage.c"
+#line 1979 "CollectionPage.c"
 }
 
 
 static void collection_page_real_add_actions (Page* base, GActionMap* map) {
 	CollectionPage * self;
-	GActionMap* _tmp0_ = NULL;
-	GActionMap* _tmp1_ = NULL;
+	GActionMap* _tmp0_;
+	GActionMap* _tmp1_;
 #line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
 #line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2052,13 +1995,13 @@ static void collection_page_real_add_actions (Page* base, GActionMap* map) {
 	_tmp1_ = map;
 #line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_action_map_add_action_entries (_tmp1_, COLLECTION_PAGE_entries, G_N_ELEMENTS (COLLECTION_PAGE_entries), self);
-#line 2056 "CollectionPage.c"
+#line 1999 "CollectionPage.c"
 }
 
 
 static void collection_page_real_remove_actions (Page* base, GActionMap* map) {
 	CollectionPage * self;
-	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp0_;
 #line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
 #line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2067,7 +2010,7 @@ static void collection_page_real_remove_actions (Page* base, GActionMap* map) {
 	_tmp0_ = map;
 #line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	PAGE_CLASS (collection_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_);
-#line 2071 "CollectionPage.c"
+#line 2014 "CollectionPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -2079,15 +2022,15 @@ static void collection_page_real_remove_actions (Page* base, GActionMap* map) {
 		entry_collection_length1 = G_N_ELEMENTS (COLLECTION_PAGE_entries);
 #line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (COLLECTION_PAGE_entries); entry_it = entry_it + 1) {
-#line 2083 "CollectionPage.c"
+#line 2026 "CollectionPage.c"
 			GActionEntry entry = {0};
 #line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			entry = entry_collection[entry_it];
-#line 2087 "CollectionPage.c"
+#line 2030 "CollectionPage.c"
 			{
-				GActionMap* _tmp1_ = NULL;
-				GActionEntry _tmp2_ = {0};
-				const gchar* _tmp3_ = NULL;
+				GActionMap* _tmp1_;
+				GActionEntry _tmp2_;
+				const gchar* _tmp3_;
 #line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp1_ = map;
 #line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2096,112 +2039,112 @@ static void collection_page_real_remove_actions (Page* base, GActionMap* map) {
 				_tmp3_ = _tmp2_.name;
 #line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 2100 "CollectionPage.c"
+#line 2043 "CollectionPage.c"
 			}
 		}
 	}
 }
 
 
-static void _vala_array_add76 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add76 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
 #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2114 "CollectionPage.c"
+#line 2057 "CollectionPage.c"
 	}
 #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2120 "CollectionPage.c"
+#line 2063 "CollectionPage.c"
 }
 
 
-static void _vala_array_add77 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add77 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2131 "CollectionPage.c"
+#line 2074 "CollectionPage.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2137 "CollectionPage.c"
+#line 2080 "CollectionPage.c"
 }
 
 
-static void _vala_array_add78 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add78 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2148 "CollectionPage.c"
+#line 2091 "CollectionPage.c"
 	}
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2154 "CollectionPage.c"
+#line 2097 "CollectionPage.c"
 }
 
 
-static void _vala_array_add79 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add79 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2165 "CollectionPage.c"
+#line 2108 "CollectionPage.c"
 	}
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2171 "CollectionPage.c"
+#line 2114 "CollectionPage.c"
 }
 
 
-static void _vala_array_add80 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add80 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2182 "CollectionPage.c"
+#line 2125 "CollectionPage.c"
 	}
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2188 "CollectionPage.c"
+#line 2131 "CollectionPage.c"
 }
 
 
-static void _vala_array_add81 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add81 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2199 "CollectionPage.c"
+#line 2142 "CollectionPage.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2205 "CollectionPage.c"
+#line 2148 "CollectionPage.c"
 }
 
 
@@ -2209,30 +2152,30 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page
 	CollectionPage * self;
 	InjectionGroup** result = NULL;
 	InjectionGroup** groups = NULL;
-	gint _tmp0_ = 0;
-	InjectionGroup** _tmp1_ = NULL;
-	gint groups_length1 = 0;
-	gint _groups_size_ = 0;
-	InjectionGroup** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	InjectionGroup* _tmp3_ = NULL;
-	InjectionGroup** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	InjectionGroup* _tmp5_ = NULL;
-	InjectionGroup** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	InjectionGroup* _tmp7_ = NULL;
-	InjectionGroup** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	InjectionGroup* _tmp9_ = NULL;
-	InjectionGroup** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	InjectionGroup* _tmp11_ = NULL;
-	InjectionGroup** _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	InjectionGroup* _tmp13_ = NULL;
-	InjectionGroup** _tmp14_ = NULL;
-	gint _tmp14__length1 = 0;
+	gint _tmp0_;
+	InjectionGroup** _tmp1_;
+	gint groups_length1;
+	gint _groups_size_;
+	InjectionGroup** _tmp2_;
+	gint _tmp2__length1;
+	InjectionGroup* _tmp3_;
+	InjectionGroup** _tmp4_;
+	gint _tmp4__length1;
+	InjectionGroup* _tmp5_;
+	InjectionGroup** _tmp6_;
+	gint _tmp6__length1;
+	InjectionGroup* _tmp7_;
+	InjectionGroup** _tmp8_;
+	gint _tmp8__length1;
+	InjectionGroup* _tmp9_;
+	InjectionGroup** _tmp10_;
+	gint _tmp10__length1;
+	InjectionGroup* _tmp11_;
+	InjectionGroup** _tmp12_;
+	gint _tmp12__length1;
+	InjectionGroup* _tmp13_;
+	InjectionGroup** _tmp14_;
+	gint _tmp14__length1;
 #line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
 #line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2299,24 +2242,24 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page
 	if (result_length1) {
 #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*result_length1 = _tmp14__length1;
-#line 2303 "CollectionPage.c"
+#line 2246 "CollectionPage.c"
 	}
 #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp14_;
 #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2309 "CollectionPage.c"
+#line 2252 "CollectionPage.c"
 }
 
 
 static gboolean collection_page_selection_has_video (CollectionPage* self) {
 	gboolean result = FALSE;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	GeeList* _tmp2_;
+	GeeCollection* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
 #line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
 #line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2339,18 +2282,18 @@ static gboolean collection_page_selection_has_video (CollectionPage* self) {
 	result = _tmp5_;
 #line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2343 "CollectionPage.c"
+#line 2286 "CollectionPage.c"
 }
 
 
 static gboolean collection_page_page_has_photo (CollectionPage* self) {
 	gboolean result = FALSE;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	GeeCollection* _tmp2_;
+	GeeCollection* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
 #line 209 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
 #line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2373,18 +2316,18 @@ static gboolean collection_page_page_has_photo (CollectionPage* self) {
 	result = _tmp5_;
 #line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2377 "CollectionPage.c"
+#line 2320 "CollectionPage.c"
 }
 
 
 static gboolean collection_page_selection_has_photo (CollectionPage* self) {
 	gboolean result = FALSE;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	GeeList* _tmp2_;
+	GeeCollection* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
 #line 213 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
 #line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2407,14 +2350,14 @@ static gboolean collection_page_selection_has_photo (CollectionPage* self) {
 	result = _tmp5_;
 #line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2411 "CollectionPage.c"
+#line 2354 "CollectionPage.c"
 }
 
 
 static void collection_page_real_init_actions (Page* base, gint selected_count, gint count) {
 	CollectionPage * self;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 217 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
 #line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2437,68 +2380,68 @@ static void collection_page_real_init_actions (Page* base, gint selected_count,
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", TRUE);
 #line 227 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", TRUE);
-#line 2441 "CollectionPage.c"
+#line 2384 "CollectionPage.c"
 }
 
 
 static void collection_page_real_update_actions (Page* base, gint selected_count, gint count) {
 	CollectionPage * self;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	AppWindow* _tmp0_;
+	AppWindow* _tmp1_;
+	Page* _tmp2_;
+	Page* _tmp3_;
+	gboolean _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 	gboolean one_selected = FALSE;
-	gint _tmp7_ = 0;
+	gint _tmp7_;
 	gboolean has_selected = FALSE;
-	gint _tmp8_ = 0;
+	gint _tmp8_;
 	gboolean primary_is_video = FALSE;
-	gboolean _tmp9_ = FALSE;
+	gboolean _tmp9_;
 	gboolean selection_has_videos = FALSE;
-	gboolean _tmp17_ = FALSE;
+	gboolean _tmp17_;
 	gboolean page_has_photos = FALSE;
-	gboolean _tmp18_ = FALSE;
+	gboolean _tmp18_;
 	gboolean _tmp19_ = FALSE;
-	gboolean _tmp20_ = FALSE;
-	gboolean _tmp22_ = FALSE;
+	gboolean _tmp20_;
+	gboolean _tmp22_;
 	gboolean _tmp23_ = FALSE;
-	gboolean _tmp24_ = FALSE;
+	gboolean _tmp24_;
 	gboolean _tmp30_ = FALSE;
 	gboolean _tmp31_ = FALSE;
 	gboolean _tmp32_ = FALSE;
-	gboolean _tmp33_ = FALSE;
+	gboolean _tmp33_;
 	gboolean _tmp47_ = FALSE;
-	gboolean _tmp48_ = FALSE;
+	gboolean _tmp48_;
 	gboolean _tmp50_ = FALSE;
-	gboolean _tmp51_ = FALSE;
+	gboolean _tmp51_;
 	gboolean _tmp53_ = FALSE;
 	gboolean _tmp54_ = FALSE;
-	gboolean _tmp55_ = FALSE;
+	gboolean _tmp55_;
 	gboolean _tmp64_ = FALSE;
 	gboolean _tmp65_ = FALSE;
-	gboolean _tmp66_ = FALSE;
+	gboolean _tmp66_;
 	gboolean _tmp69_ = FALSE;
-	gboolean _tmp70_ = FALSE;
+	gboolean _tmp70_;
 	gboolean _tmp72_ = FALSE;
-	gboolean _tmp73_ = FALSE;
+	gboolean _tmp73_;
 	gboolean _tmp75_ = FALSE;
-	gboolean _tmp76_ = FALSE;
+	gboolean _tmp76_;
 	gboolean _tmp78_ = FALSE;
-	gboolean _tmp79_ = FALSE;
-	gboolean _tmp81_ = FALSE;
-	gboolean _tmp82_ = FALSE;
-	gboolean _tmp83_ = FALSE;
-	gboolean _tmp84_ = FALSE;
+	gboolean _tmp79_;
+	gboolean _tmp81_;
+	gboolean _tmp82_;
+	gboolean _tmp83_;
+	gboolean _tmp84_;
 	gboolean _tmp85_ = FALSE;
-	gboolean _tmp86_ = FALSE;
+	gboolean _tmp86_;
 	gboolean _tmp88_ = FALSE;
-	gboolean _tmp89_ = FALSE;
-	gboolean _tmp91_ = FALSE;
+	gboolean _tmp89_;
+	gboolean _tmp91_;
 	gboolean _tmp92_ = FALSE;
-	gboolean _tmp93_ = FALSE;
-	gboolean _tmp95_ = FALSE;
+	gboolean _tmp93_;
+	gboolean _tmp95_;
 #line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
 #line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2519,7 +2462,7 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	if (_tmp4_) {
 #line 233 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 2523 "CollectionPage.c"
+#line 2466 "CollectionPage.c"
 	}
 #line 236 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = selected_count;
@@ -2541,14 +2484,14 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp9_ = has_selected;
 #line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_) {
-#line 2545 "CollectionPage.c"
-		ViewCollection* _tmp10_ = NULL;
-		ViewCollection* _tmp11_ = NULL;
-		DataView* _tmp12_ = NULL;
-		DataView* _tmp13_ = NULL;
-		DataSource* _tmp14_ = NULL;
-		DataSource* _tmp15_ = NULL;
-		gboolean _tmp16_ = FALSE;
+#line 2488 "CollectionPage.c"
+		ViewCollection* _tmp10_;
+		ViewCollection* _tmp11_;
+		DataView* _tmp12_;
+		DataView* _tmp13_;
+		DataSource* _tmp14_;
+		DataSource* _tmp15_;
+		gboolean _tmp16_;
 #line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2573,7 +2516,7 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		if (_tmp16_) {
 #line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			primary_is_video = TRUE;
-#line 2577 "CollectionPage.c"
+#line 2520 "CollectionPage.c"
 		}
 	}
 #line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2588,17 +2531,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp20_ = has_selected;
 #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp20_) {
-#line 2592 "CollectionPage.c"
-		gboolean _tmp21_ = FALSE;
+#line 2535 "CollectionPage.c"
+		gboolean _tmp21_;
 #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp21_ = selection_has_videos;
 #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = !_tmp21_;
-#line 2598 "CollectionPage.c"
+#line 2541 "CollectionPage.c"
 	} else {
 #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = FALSE;
-#line 2602 "CollectionPage.c"
+#line 2545 "CollectionPage.c"
 	}
 #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Duplicate", _tmp19_);
@@ -2610,12 +2553,12 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp24_ = one_selected;
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp24_) {
-#line 2614 "CollectionPage.c"
-		ConfigFacade* _tmp25_ = NULL;
-		ConfigFacade* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
-		gchar* _tmp28_ = NULL;
-		gboolean _tmp29_ = FALSE;
+#line 2557 "CollectionPage.c"
+		ConfigFacade* _tmp25_;
+		ConfigFacade* _tmp26_;
+		gchar* _tmp27_;
+		gchar* _tmp28_;
+		gboolean _tmp29_;
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp25_ = config_facade_get_instance ();
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2632,11 +2575,11 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		_g_free0 (_tmp28_);
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp26_);
-#line 2636 "CollectionPage.c"
+#line 2579 "CollectionPage.c"
 	} else {
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = FALSE;
-#line 2640 "CollectionPage.c"
+#line 2583 "CollectionPage.c"
 	}
 #line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp23_);
@@ -2644,28 +2587,28 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp33_ = one_selected;
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp33_) {
-#line 2648 "CollectionPage.c"
-		gboolean _tmp34_ = FALSE;
+#line 2591 "CollectionPage.c"
+		gboolean _tmp34_;
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp34_ = primary_is_video;
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp32_ = !_tmp34_;
-#line 2654 "CollectionPage.c"
+#line 2597 "CollectionPage.c"
 	} else {
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp32_ = FALSE;
-#line 2658 "CollectionPage.c"
+#line 2601 "CollectionPage.c"
 	}
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp32_) {
-#line 2662 "CollectionPage.c"
-		ViewCollection* _tmp35_ = NULL;
-		ViewCollection* _tmp36_ = NULL;
-		DataView* _tmp37_ = NULL;
-		DataView* _tmp38_ = NULL;
-		DataSource* _tmp39_ = NULL;
-		Photo* _tmp40_ = NULL;
-		PhotoFileFormat _tmp41_ = 0;
+#line 2605 "CollectionPage.c"
+		ViewCollection* _tmp35_;
+		ViewCollection* _tmp36_;
+		DataView* _tmp37_;
+		DataView* _tmp38_;
+		DataSource* _tmp39_;
+		Photo* _tmp40_;
+		PhotoFileFormat _tmp41_;
 #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2688,20 +2631,20 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		_g_object_unref0 (_tmp38_);
 #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp36_);
-#line 2692 "CollectionPage.c"
+#line 2635 "CollectionPage.c"
 	} else {
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp31_ = FALSE;
-#line 2696 "CollectionPage.c"
+#line 2639 "CollectionPage.c"
 	}
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp31_) {
-#line 2700 "CollectionPage.c"
-		ConfigFacade* _tmp42_ = NULL;
-		ConfigFacade* _tmp43_ = NULL;
-		gchar* _tmp44_ = NULL;
-		gchar* _tmp45_ = NULL;
-		gboolean _tmp46_ = FALSE;
+#line 2643 "CollectionPage.c"
+		ConfigFacade* _tmp42_;
+		ConfigFacade* _tmp43_;
+		gchar* _tmp44_;
+		gchar* _tmp45_;
+		gboolean _tmp46_;
 #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp42_ = config_facade_get_instance ();
 #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2718,11 +2661,11 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		_g_free0 (_tmp45_);
 #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp43_);
-#line 2722 "CollectionPage.c"
+#line 2665 "CollectionPage.c"
 	} else {
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp30_ = FALSE;
-#line 2726 "CollectionPage.c"
+#line 2669 "CollectionPage.c"
 	}
 #line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp30_);
@@ -2730,17 +2673,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp48_ = selection_has_videos;
 #line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp48_) {
-#line 2734 "CollectionPage.c"
-		gboolean _tmp49_ = FALSE;
+#line 2677 "CollectionPage.c"
+		gboolean _tmp49_;
 #line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp49_ = collection_page_can_revert_selected (self);
 #line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp47_ = _tmp49_;
-#line 2740 "CollectionPage.c"
+#line 2683 "CollectionPage.c"
 	} else {
 #line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp47_ = FALSE;
-#line 2744 "CollectionPage.c"
+#line 2687 "CollectionPage.c"
 	}
 #line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp47_);
@@ -2748,17 +2691,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp51_ = selection_has_videos;
 #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp51_) {
-#line 2752 "CollectionPage.c"
-		gboolean _tmp52_ = FALSE;
+#line 2695 "CollectionPage.c"
+		gboolean _tmp52_;
 #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp52_ = has_selected;
 #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp50_ = _tmp52_;
-#line 2758 "CollectionPage.c"
+#line 2701 "CollectionPage.c"
 	} else {
 #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp50_ = FALSE;
-#line 2762 "CollectionPage.c"
+#line 2705 "CollectionPage.c"
 	}
 #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp50_);
@@ -2766,28 +2709,28 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp55_ = selection_has_videos;
 #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp55_) {
-#line 2770 "CollectionPage.c"
-		gboolean _tmp56_ = FALSE;
+#line 2713 "CollectionPage.c"
+		gboolean _tmp56_;
 #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp56_ = one_selected;
 #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp54_ = _tmp56_;
-#line 2776 "CollectionPage.c"
+#line 2719 "CollectionPage.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp54_ = FALSE;
-#line 2780 "CollectionPage.c"
+#line 2723 "CollectionPage.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp54_) {
-#line 2784 "CollectionPage.c"
-		ViewCollection* _tmp57_ = NULL;
-		ViewCollection* _tmp58_ = NULL;
-		DataView* _tmp59_ = NULL;
-		DataView* _tmp60_ = NULL;
-		DataSource* _tmp61_ = NULL;
-		Photo* _tmp62_ = NULL;
-		gboolean _tmp63_ = FALSE;
+#line 2727 "CollectionPage.c"
+		ViewCollection* _tmp57_;
+		ViewCollection* _tmp58_;
+		DataView* _tmp59_;
+		DataView* _tmp60_;
+		DataSource* _tmp61_;
+		Photo* _tmp62_;
+		gboolean _tmp63_;
 #line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp57_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2810,11 +2753,11 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		_g_object_unref0 (_tmp60_);
 #line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp58_);
-#line 2814 "CollectionPage.c"
+#line 2757 "CollectionPage.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp53_ = FALSE;
-#line 2818 "CollectionPage.c"
+#line 2761 "CollectionPage.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp53_);
@@ -2822,31 +2765,31 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp66_ = selection_has_videos;
 #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp66_) {
-#line 2826 "CollectionPage.c"
-		gboolean _tmp67_ = FALSE;
+#line 2769 "CollectionPage.c"
+		gboolean _tmp67_;
 #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp67_ = has_selected;
 #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp65_ = _tmp67_;
-#line 2832 "CollectionPage.c"
+#line 2775 "CollectionPage.c"
 	} else {
 #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp65_ = FALSE;
-#line 2836 "CollectionPage.c"
+#line 2779 "CollectionPage.c"
 	}
 #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp65_) {
-#line 2840 "CollectionPage.c"
-		gboolean _tmp68_ = FALSE;
+#line 2783 "CollectionPage.c"
+		gboolean _tmp68_;
 #line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp68_ = pixel_transformation_bundle_has_copied_color_adjustments ();
 #line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp64_ = _tmp68_;
-#line 2846 "CollectionPage.c"
+#line 2789 "CollectionPage.c"
 	} else {
 #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp64_ = FALSE;
-#line 2850 "CollectionPage.c"
+#line 2793 "CollectionPage.c"
 	}
 #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp64_);
@@ -2854,17 +2797,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp70_ = selection_has_videos;
 #line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp70_) {
-#line 2858 "CollectionPage.c"
-		gboolean _tmp71_ = FALSE;
+#line 2801 "CollectionPage.c"
+		gboolean _tmp71_;
 #line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp71_ = has_selected;
 #line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp69_ = _tmp71_;
-#line 2864 "CollectionPage.c"
+#line 2807 "CollectionPage.c"
 	} else {
 #line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp69_ = FALSE;
-#line 2868 "CollectionPage.c"
+#line 2811 "CollectionPage.c"
 	}
 #line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp69_);
@@ -2872,17 +2815,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp73_ = selection_has_videos;
 #line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp73_) {
-#line 2876 "CollectionPage.c"
-		gboolean _tmp74_ = FALSE;
+#line 2819 "CollectionPage.c"
+		gboolean _tmp74_;
 #line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp74_ = has_selected;
 #line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp72_ = _tmp74_;
-#line 2882 "CollectionPage.c"
+#line 2825 "CollectionPage.c"
 	} else {
 #line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp72_ = FALSE;
-#line 2886 "CollectionPage.c"
+#line 2829 "CollectionPage.c"
 	}
 #line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp72_);
@@ -2890,17 +2833,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp76_ = selection_has_videos;
 #line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp76_) {
-#line 2894 "CollectionPage.c"
-		gboolean _tmp77_ = FALSE;
+#line 2837 "CollectionPage.c"
+		gboolean _tmp77_;
 #line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp77_ = has_selected;
 #line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp75_ = _tmp77_;
-#line 2900 "CollectionPage.c"
+#line 2843 "CollectionPage.c"
 	} else {
 #line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp75_ = FALSE;
-#line 2904 "CollectionPage.c"
+#line 2847 "CollectionPage.c"
 	}
 #line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp75_);
@@ -2908,17 +2851,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp79_ = selection_has_videos;
 #line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp79_) {
-#line 2912 "CollectionPage.c"
-		gboolean _tmp80_ = FALSE;
+#line 2855 "CollectionPage.c"
+		gboolean _tmp80_;
 #line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp80_ = has_selected;
 #line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp78_ = _tmp80_;
-#line 2918 "CollectionPage.c"
+#line 2861 "CollectionPage.c"
 	} else {
 #line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp78_ = FALSE;
-#line 2922 "CollectionPage.c"
+#line 2865 "CollectionPage.c"
 	}
 #line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp78_);
@@ -2942,17 +2885,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp86_ = page_has_photos;
 #line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp86_) {
-#line 2946 "CollectionPage.c"
-		gboolean _tmp87_ = FALSE;
+#line 2889 "CollectionPage.c"
+		gboolean _tmp87_;
 #line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp87_ = primary_is_video;
 #line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp85_ = !_tmp87_;
-#line 2952 "CollectionPage.c"
+#line 2895 "CollectionPage.c"
 	} else {
 #line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp85_ = FALSE;
-#line 2956 "CollectionPage.c"
+#line 2899 "CollectionPage.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Slideshow", _tmp85_);
@@ -2960,17 +2903,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp89_ = selection_has_videos;
 #line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp89_) {
-#line 2964 "CollectionPage.c"
-		gboolean _tmp90_ = FALSE;
+#line 2907 "CollectionPage.c"
+		gboolean _tmp90_;
 #line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp90_ = has_selected;
 #line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp88_ = _tmp90_;
-#line 2970 "CollectionPage.c"
+#line 2913 "CollectionPage.c"
 	} else {
 #line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp88_ = FALSE;
-#line 2974 "CollectionPage.c"
+#line 2917 "CollectionPage.c"
 	}
 #line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp88_);
@@ -2982,17 +2925,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp93_ = selection_has_videos;
 #line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp93_) {
-#line 2986 "CollectionPage.c"
-		gboolean _tmp94_ = FALSE;
+#line 2929 "CollectionPage.c"
+		gboolean _tmp94_;
 #line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp94_ = has_selected;
 #line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp92_ = _tmp94_;
-#line 2992 "CollectionPage.c"
+#line 2935 "CollectionPage.c"
 	} else {
 #line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp92_ = FALSE;
-#line 2996 "CollectionPage.c"
+#line 2939 "CollectionPage.c"
 	}
 #line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp92_);
@@ -3000,12 +2943,12 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp95_ = has_selected;
 #line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp95_) {
-#line 3004 "CollectionPage.c"
+#line 2947 "CollectionPage.c"
 		const gchar* _tmp96_ = NULL;
-		gboolean _tmp97_ = FALSE;
+		gboolean _tmp97_;
 		gchar* label = NULL;
-		gchar* _tmp98_ = NULL;
-		const gchar* _tmp99_ = NULL;
+		gchar* _tmp98_;
+		const gchar* _tmp99_;
 #line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_debug ("CollectionPage.vala:284: Setting action label for SetBackground...");
 #line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3014,11 +2957,11 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		if (_tmp97_) {
 #line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp96_ = RESOURCES_SET_BACKGROUND_MENU;
-#line 3018 "CollectionPage.c"
+#line 2961 "CollectionPage.c"
 		} else {
 #line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp96_ = RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU;
-#line 3022 "CollectionPage.c"
+#line 2965 "CollectionPage.c"
 		}
 #line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp98_ = g_strdup (_tmp96_);
@@ -3030,7 +2973,7 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp99_);
 #line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (label);
-#line 3034 "CollectionPage.c"
+#line 2977 "CollectionPage.c"
 	}
 }
 
@@ -3040,15 +2983,15 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
 #line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 3044 "CollectionPage.c"
+#line 2987 "CollectionPage.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = altered;
 #line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3067,26 +3010,26 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 		_object_it = _tmp5_;
 #line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 3071 "CollectionPage.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 3014 "CollectionPage.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			DataView* view = NULL;
-			DataObject* _tmp10_ = NULL;
-			DataView* _tmp11_ = NULL;
+			DataObject* _tmp10_;
+			DataView* _tmp11_;
 			gboolean _tmp12_ = FALSE;
-			DataView* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
+			DataView* _tmp13_;
+			gboolean _tmp14_;
 			LibraryPhoto* photo = NULL;
-			DataView* _tmp20_ = NULL;
-			DataSource* _tmp21_ = NULL;
-			LibraryPhoto* _tmp22_ = NULL;
-			LibraryPhoto* _tmp23_ = NULL;
-			gboolean _tmp24_ = FALSE;
-			LibraryPhoto* _tmp25_ = NULL;
-			gboolean _tmp26_ = FALSE;
+			DataView* _tmp20_;
+			DataSource* _tmp21_;
+			LibraryPhoto* _tmp22_;
+			LibraryPhoto* _tmp23_;
+			gboolean _tmp24_;
+			LibraryPhoto* _tmp25_;
+			gboolean _tmp26_;
 #line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp6_ = _object_it;
 #line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3095,7 +3038,7 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 			if (!_tmp7_) {
 #line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3099 "CollectionPage.c"
+#line 3042 "CollectionPage.c"
 			}
 #line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _object_it;
@@ -3117,13 +3060,13 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 			if (!_tmp14_) {
 #line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp12_ = TRUE;
-#line 3121 "CollectionPage.c"
+#line 3064 "CollectionPage.c"
 			} else {
-				GeeMap* _tmp15_ = NULL;
-				DataView* _tmp16_ = NULL;
-				gpointer _tmp17_ = NULL;
-				Alteration* _tmp18_ = NULL;
-				gboolean _tmp19_ = FALSE;
+				GeeMap* _tmp15_;
+				DataView* _tmp16_;
+				gpointer _tmp17_;
+				Alteration* _tmp18_;
+				gboolean _tmp19_;
 #line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = altered;
 #line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3138,7 +3081,7 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 				_tmp12_ = !_tmp19_;
 #line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_alteration_unref0 (_tmp18_);
-#line 3142 "CollectionPage.c"
+#line 3085 "CollectionPage.c"
 			}
 #line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp12_) {
@@ -3148,7 +3091,7 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 				_g_object_unref0 (object);
 #line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				continue;
-#line 3152 "CollectionPage.c"
+#line 3095 "CollectionPage.c"
 			}
 #line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = view;
@@ -3160,7 +3103,7 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 			if (_tmp22_ == NULL) {
 #line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp21_);
-#line 3164 "CollectionPage.c"
+#line 3107 "CollectionPage.c"
 			}
 #line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp22_;
@@ -3176,7 +3119,7 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 				_g_object_unref0 (object);
 #line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				continue;
-#line 3180 "CollectionPage.c"
+#line 3123 "CollectionPage.c"
 			}
 #line 307 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp24_ = collection_page_can_revert_selected (self);
@@ -3196,20 +3139,20 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 			_g_object_unref0 (object);
 #line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			break;
-#line 3200 "CollectionPage.c"
+#line 3143 "CollectionPage.c"
 		}
 #line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_object_it);
-#line 3204 "CollectionPage.c"
+#line 3147 "CollectionPage.c"
 	}
 }
 
 
 static void collection_page_on_print (CollectionPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 #line 314 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
 #line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3224,13 +3167,13 @@ static void collection_page_on_print (CollectionPage* self) {
 	_data_collection_unref0 (_tmp1_);
 #line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 3228 "CollectionPage.c"
-		PrintManager* _tmp4_ = NULL;
-		PrintManager* _tmp5_ = NULL;
-		ViewCollection* _tmp6_ = NULL;
-		ViewCollection* _tmp7_ = NULL;
-		GeeList* _tmp8_ = NULL;
-		GeeCollection* _tmp9_ = NULL;
+#line 3171 "CollectionPage.c"
+		PrintManager* _tmp4_;
+		PrintManager* _tmp5_;
+		ViewCollection* _tmp6_;
+		ViewCollection* _tmp7_;
+		GeeList* _tmp8_;
+		GeeCollection* _tmp9_;
 #line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = print_manager_get_instance ();
 #line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3251,19 +3194,19 @@ static void collection_page_on_print (CollectionPage* self) {
 		_data_collection_unref0 (_tmp7_);
 #line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 3255 "CollectionPage.c"
+#line 3198 "CollectionPage.c"
 	}
 }
 
 
 static void collection_page_on_external_app_changed (CollectionPage* self) {
 	gint selected_count = 0;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	gint _tmp5_ = 0;
+	gint _tmp5_;
 #line 321 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
 #line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3282,11 +3225,11 @@ static void collection_page_on_external_app_changed (CollectionPage* self) {
 	_tmp5_ = selected_count;
 #line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_ == 1) {
-#line 3286 "CollectionPage.c"
-		ConfigFacade* _tmp6_ = NULL;
-		ConfigFacade* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+#line 3229 "CollectionPage.c"
+		ConfigFacade* _tmp6_;
+		ConfigFacade* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = config_facade_get_instance ();
 #line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3301,36 +3244,36 @@ static void collection_page_on_external_app_changed (CollectionPage* self) {
 		_g_free0 (_tmp9_);
 #line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3305 "CollectionPage.c"
+#line 3248 "CollectionPage.c"
 	} else {
 #line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = FALSE;
-#line 3309 "CollectionPage.c"
+#line 3252 "CollectionPage.c"
 	}
 #line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp4_);
-#line 3313 "CollectionPage.c"
+#line 3256 "CollectionPage.c"
 }
 
 
 static void collection_page_real_on_item_activated (CheckerboardPage* base, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
 	CollectionPage * self;
 	Thumbnail* thumbnail = NULL;
-	CheckerboardItem* _tmp0_ = NULL;
-	Thumbnail* _tmp1_ = NULL;
-	Thumbnail* _tmp2_ = NULL;
-	MediaSource* _tmp3_ = NULL;
-	MediaSource* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	CheckerboardItem* _tmp0_;
+	Thumbnail* _tmp1_;
+	Thumbnail* _tmp2_;
+	MediaSource* _tmp3_;
+	MediaSource* _tmp4_;
+	gboolean _tmp5_;
 	LibraryPhoto* photo = NULL;
-	Thumbnail* _tmp6_ = NULL;
-	MediaSource* _tmp7_ = NULL;
-	LibraryPhoto* _tmp8_ = NULL;
-	LibraryPhoto* _tmp9_ = NULL;
-	LibraryPhoto* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	CheckerboardPageActivator _tmp13_ = 0;
+	Thumbnail* _tmp6_;
+	MediaSource* _tmp7_;
+	LibraryPhoto* _tmp8_;
+	LibraryPhoto* _tmp9_;
+	LibraryPhoto* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	CheckerboardPageActivator _tmp13_;
 #line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
 #line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3361,7 +3304,7 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec
 		_g_object_unref0 (thumbnail);
 #line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3365 "CollectionPage.c"
+#line 3308 "CollectionPage.c"
 	}
 #line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = thumbnail;
@@ -3373,7 +3316,7 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec
 	if (_tmp8_ == NULL) {
 #line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3377 "CollectionPage.c"
+#line 3320 "CollectionPage.c"
 	}
 #line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp8_;
@@ -3387,7 +3330,7 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec
 		_g_object_unref0 (thumbnail);
 #line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3391 "CollectionPage.c"
+#line 3334 "CollectionPage.c"
 	}
 #line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
@@ -3403,9 +3346,9 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec
 	_tmp13_ = activator;
 #line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp13_ == CHECKERBOARD_PAGE_ACTIVATOR_MOUSE) {
-#line 3407 "CollectionPage.c"
-		CheckerboardPageKeyboardModifiers _tmp14_ = {0};
-		gboolean _tmp15_ = FALSE;
+#line 3350 "CollectionPage.c"
+		CheckerboardPageKeyboardModifiers _tmp14_;
+		gboolean _tmp15_;
 #line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = *modifiers;
 #line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3414,11 +3357,11 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec
 		if (_tmp15_) {
 #line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			collection_page_on_external_edit (self);
-#line 3418 "CollectionPage.c"
+#line 3361 "CollectionPage.c"
 		} else {
-			LibraryWindow* _tmp16_ = NULL;
-			LibraryWindow* _tmp17_ = NULL;
-			LibraryPhoto* _tmp18_ = NULL;
+			LibraryWindow* _tmp16_;
+			LibraryWindow* _tmp17_;
+			LibraryPhoto* _tmp18_;
 #line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = library_window_get_app ();
 #line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3429,45 +3372,45 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec
 			library_window_switch_to_photo_page (_tmp17_, self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo));
 #line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp17_);
-#line 3433 "CollectionPage.c"
+#line 3376 "CollectionPage.c"
 		}
 	} else {
-		CheckerboardPageActivator _tmp19_ = 0;
+		CheckerboardPageActivator _tmp19_;
 #line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = activator;
 #line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp19_ == CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD) {
-#line 3441 "CollectionPage.c"
+#line 3384 "CollectionPage.c"
 			gboolean _tmp20_ = FALSE;
-			CheckerboardPageKeyboardModifiers _tmp21_ = {0};
-			gboolean _tmp22_ = FALSE;
+			CheckerboardPageKeyboardModifiers _tmp21_;
+			gboolean _tmp22_;
 #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = *modifiers;
 #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _tmp21_.shift_pressed;
 #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp22_) {
-#line 3451 "CollectionPage.c"
-				CheckerboardPageKeyboardModifiers _tmp23_ = {0};
-				gboolean _tmp24_ = FALSE;
+#line 3394 "CollectionPage.c"
+				CheckerboardPageKeyboardModifiers _tmp23_;
+				gboolean _tmp24_;
 #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp23_ = *modifiers;
 #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp24_ = _tmp23_.ctrl_pressed;
 #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = !_tmp24_;
-#line 3460 "CollectionPage.c"
+#line 3403 "CollectionPage.c"
 			} else {
 #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = FALSE;
-#line 3464 "CollectionPage.c"
+#line 3407 "CollectionPage.c"
 			}
 #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp20_) {
-#line 3468 "CollectionPage.c"
-				LibraryWindow* _tmp25_ = NULL;
-				LibraryWindow* _tmp26_ = NULL;
-				LibraryPhoto* _tmp27_ = NULL;
+#line 3411 "CollectionPage.c"
+				LibraryWindow* _tmp25_;
+				LibraryWindow* _tmp26_;
+				LibraryPhoto* _tmp27_;
 #line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp25_ = library_window_get_app ();
 #line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3478,7 +3421,7 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec
 				library_window_switch_to_photo_page (_tmp26_, self, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_PHOTO, Photo));
 #line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp26_);
-#line 3482 "CollectionPage.c"
+#line 3425 "CollectionPage.c"
 			}
 		}
 	}
@@ -3486,7 +3429,7 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec
 	_g_object_unref0 (photo);
 #line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (thumbnail);
-#line 3490 "CollectionPage.c"
+#line 3433 "CollectionPage.c"
 }
 
 
@@ -3494,10 +3437,10 @@ static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey
 	CollectionPage * self;
 	gboolean result = FALSE;
 	gboolean handled = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	GdkEventKey* _tmp0_;
+	guint _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
 	GQuark _tmp5_ = 0U;
 #line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label0 = 0;
@@ -3519,9 +3462,9 @@ static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey
 	static GQuark _tmp4_label8 = 0;
 #line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label9 = 0;
-#line 3523 "CollectionPage.c"
+#line 3466 "CollectionPage.c"
 	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_ = FALSE;
+	gboolean _tmp9_;
 #line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
 #line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3542,10 +3485,10 @@ static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey
 	if ((((((((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("Page_Up")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("KP_Page_Up"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("Page_Down"))))) || (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("KP_Page_Down"))))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("Home"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Home"))))) || (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("End"))))) || (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_End"))))) {
 #line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3546 "CollectionPage.c"
+#line 3489 "CollectionPage.c"
 			default:
 			{
-				GdkEventKey* _tmp6_ = NULL;
+				GdkEventKey* _tmp6_;
 				gboolean _tmp7_ = FALSE;
 #line 374 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp6_ = event;
@@ -3553,46 +3496,46 @@ static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey
 				g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp6_, &_tmp7_);
 #line 375 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3557 "CollectionPage.c"
+#line 3500 "CollectionPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("bracketright")))) {
 #line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3563 "CollectionPage.c"
+#line 3506 "CollectionPage.c"
 			default:
 			{
 #line 378 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
 #line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3570 "CollectionPage.c"
+#line 3513 "CollectionPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("bracketleft")))) {
 #line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3576 "CollectionPage.c"
+#line 3519 "CollectionPage.c"
 			default:
 			{
 #line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
 #line 383 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3583 "CollectionPage.c"
+#line 3526 "CollectionPage.c"
 			}
 		}
 	} else {
 #line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3589 "CollectionPage.c"
+#line 3532 "CollectionPage.c"
 			default:
 			{
 #line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				handled = FALSE;
 #line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3596 "CollectionPage.c"
+#line 3539 "CollectionPage.c"
 			}
 		}
 	}
@@ -3602,84 +3545,84 @@ static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey
 	if (_tmp9_) {
 #line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = TRUE;
-#line 3606 "CollectionPage.c"
+#line 3549 "CollectionPage.c"
 	} else {
-		GdkEventKey* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
+		GdkEventKey* _tmp10_;
+		gboolean _tmp11_;
 #line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = event;
 #line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = PAGE_CLASS (collection_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp10_);
 #line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _tmp11_;
-#line 3616 "CollectionPage.c"
+#line 3559 "CollectionPage.c"
 	}
 #line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
 #line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 3622 "CollectionPage.c"
+#line 3565 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
 #line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_export_completed ((CollectionPage*) self);
-#line 3629 "CollectionPage.c"
+#line 3572 "CollectionPage.c"
 }
 
 
 static void collection_page_real_on_export (MediaPage* base) {
 	CollectionPage * self;
-	ExporterUI* _tmp0_ = NULL;
+	ExporterUI* _tmp0_;
 	GeeCollection* export_list = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	GeeList* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
-	GeeCollection* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	GeeList* _tmp3_;
+	GeeCollection* _tmp4_;
+	GeeCollection* _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	gboolean has_some_photos = FALSE;
-	gboolean _tmp8_ = FALSE;
+	gboolean _tmp8_;
 	gboolean has_some_videos = FALSE;
-	gboolean _tmp9_ = FALSE;
+	gboolean _tmp9_;
 	gboolean _tmp10_ = FALSE;
-	gboolean _tmp11_ = FALSE;
-	gboolean _tmp13_ = FALSE;
+	gboolean _tmp11_;
+	gboolean _tmp13_;
 	gchar* title = NULL;
-	gboolean _tmp16_ = FALSE;
+	gboolean _tmp16_;
 	ExportDialog* export_dialog = NULL;
-	const gchar* _tmp31_ = NULL;
-	ExportDialog* _tmp32_ = NULL;
-	ExportFormatParameters _tmp33_ = {0};
-	gboolean _tmp34_ = FALSE;
+	const gchar* _tmp27_;
+	ExportDialog* _tmp28_;
+	ExportFormatParameters _tmp29_ = {0};
+	gboolean _tmp30_;
 	ExportFormatParameters export_params = {0};
 	gint scale = 0;
 	ScaleConstraint constraint = 0;
-	ExportDialog* _tmp37_ = NULL;
-	gint _tmp38_ = 0;
-	ScaleConstraint _tmp39_ = 0;
-	gboolean _tmp40_ = FALSE;
+	ExportDialog* _tmp33_;
+	gint _tmp34_ = 0;
+	ScaleConstraint _tmp35_ = 0;
+	gboolean _tmp36_;
 	Scaling scaling = {0};
-	ScaleConstraint _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	Scaling _tmp43_ = {0};
-	GeeCollection* _tmp44_ = NULL;
-	gint _tmp45_ = 0;
-	gint _tmp46_ = 0;
+	ScaleConstraint _tmp37_;
+	gint _tmp38_;
+	Scaling _tmp39_ = {0};
+	GeeCollection* _tmp40_;
+	gint _tmp41_;
+	gint _tmp42_;
 	GFile* export_dir = NULL;
-	const gchar* _tmp81_ = NULL;
-	GFile* _tmp82_ = NULL;
-	GFile* _tmp83_ = NULL;
-	GeeCollection* _tmp84_ = NULL;
-	GFile* _tmp85_ = NULL;
-	Scaling _tmp86_ = {0};
-	ExportFormatParameters _tmp87_ = {0};
-	Exporter* _tmp88_ = NULL;
-	Exporter* _tmp89_ = NULL;
-	ExporterUI* _tmp90_ = NULL;
-	ExporterUI* _tmp91_ = NULL;
+	const gchar* _tmp77_;
+	GFile* _tmp78_;
+	GFile* _tmp79_;
+	GeeCollection* _tmp80_;
+	GFile* _tmp81_;
+	Scaling _tmp82_;
+	ExportFormatParameters _tmp83_;
+	Exporter* _tmp84_;
+	Exporter* _tmp85_;
+	ExporterUI* _tmp86_;
+	ExporterUI* _tmp87_;
 	GError * _inner_error_ = NULL;
 #line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
@@ -3689,7 +3632,7 @@ static void collection_page_real_on_export (MediaPage* base) {
 	if (_tmp0_ != NULL) {
 #line 395 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3693 "CollectionPage.c"
+#line 3636 "CollectionPage.c"
 	}
 #line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -3715,7 +3658,7 @@ static void collection_page_real_on_export (MediaPage* base) {
 		_g_object_unref0 (export_list);
 #line 400 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3719 "CollectionPage.c"
+#line 3662 "CollectionPage.c"
 	}
 #line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = collection_page_selection_has_photo (self);
@@ -3731,14 +3674,14 @@ static void collection_page_real_on_export (MediaPage* base) {
 	if (_tmp11_) {
 #line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = TRUE;
-#line 3735 "CollectionPage.c"
+#line 3678 "CollectionPage.c"
 	} else {
-		gboolean _tmp12_ = FALSE;
+		gboolean _tmp12_;
 #line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = has_some_videos;
 #line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp12_;
-#line 3742 "CollectionPage.c"
+#line 3685 "CollectionPage.c"
 	}
 #line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_assert (_tmp10_, "has_some_photos || has_some_videos");
@@ -3746,9 +3689,9 @@ static void collection_page_real_on_export (MediaPage* base) {
 	_tmp13_ = has_some_photos;
 #line 408 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp13_) {
-#line 3750 "CollectionPage.c"
-		GeeCollection* _tmp14_ = NULL;
-		ExporterUI* _tmp15_ = NULL;
+#line 3693 "CollectionPage.c"
+		GeeCollection* _tmp14_;
+		ExporterUI* _tmp15_;
 #line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = export_list;
 #line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3761,7 +3704,7 @@ static void collection_page_real_on_export (MediaPage* base) {
 		_g_object_unref0 (export_list);
 #line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3765 "CollectionPage.c"
+#line 3708 "CollectionPage.c"
 	}
 #line 413 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	title = NULL;
@@ -3769,12 +3712,12 @@ static void collection_page_real_on_export (MediaPage* base) {
 	_tmp16_ = has_some_videos;
 #line 414 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp16_) {
-#line 3773 "CollectionPage.c"
+#line 3716 "CollectionPage.c"
 		const gchar* _tmp17_ = NULL;
-		GeeCollection* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
-		gint _tmp20_ = 0;
-		gchar* _tmp23_ = NULL;
+		GeeCollection* _tmp18_;
+		gint _tmp19_;
+		gint _tmp20_;
+		gchar* _tmp21_;
 #line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = export_list;
 #line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3783,104 +3726,90 @@ static void collection_page_real_on_export (MediaPage* base) {
 		_tmp20_ = _tmp19_;
 #line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp20_ == 1) {
-#line 3787 "CollectionPage.c"
-			const gchar* _tmp21_ = NULL;
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp21_ = _ ("Export Photo/Video");
 #line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp17_ = _tmp21_;
-#line 3793 "CollectionPage.c"
+			_tmp17_ = _ ("Export Photo/Video");
+#line 3732 "CollectionPage.c"
 		} else {
-			const gchar* _tmp22_ = NULL;
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp22_ = _ ("Export Photos/Videos");
 #line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp17_ = _tmp22_;
-#line 3800 "CollectionPage.c"
+			_tmp17_ = _ ("Export Photos/Videos");
+#line 3736 "CollectionPage.c"
 		}
 #line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp23_ = g_strdup (_tmp17_);
+		_tmp21_ = g_strdup (_tmp17_);
 #line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
 #line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		title = _tmp23_;
-#line 3808 "CollectionPage.c"
+		title = _tmp21_;
+#line 3744 "CollectionPage.c"
 	} else {
-		const gchar* _tmp24_ = NULL;
-		GeeCollection* _tmp25_ = NULL;
-		gint _tmp26_ = 0;
-		gint _tmp27_ = 0;
-		gchar* _tmp30_ = NULL;
-#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp25_ = export_list;
+		const gchar* _tmp22_ = NULL;
+		GeeCollection* _tmp23_;
+		gint _tmp24_;
+		gint _tmp25_;
+		gchar* _tmp26_;
 #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp26_ = gee_collection_get_size (_tmp25_);
+		_tmp23_ = export_list;
 #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp27_ = _tmp26_;
+		_tmp24_ = gee_collection_get_size (_tmp23_);
 #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		if (_tmp27_ == 1) {
-#line 3823 "CollectionPage.c"
-			const gchar* _tmp28_ = NULL;
+		_tmp25_ = _tmp24_;
 #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp28_ = _ ("Export Photo");
+		if (_tmp25_ == 1) {
 #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp24_ = _tmp28_;
-#line 3829 "CollectionPage.c"
+			_tmp22_ = _ ("Export Photo");
+#line 3761 "CollectionPage.c"
 		} else {
-			const gchar* _tmp29_ = NULL;
-#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp29_ = _ ("Export Photos");
 #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp24_ = _tmp29_;
-#line 3836 "CollectionPage.c"
+			_tmp22_ = _ ("Export Photos");
+#line 3765 "CollectionPage.c"
 		}
 #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp30_ = g_strdup (_tmp24_);
+		_tmp26_ = g_strdup (_tmp22_);
 #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
 #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		title = _tmp30_;
-#line 3844 "CollectionPage.c"
+		title = _tmp26_;
+#line 3773 "CollectionPage.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp31_ = title;
+	_tmp27_ = title;
 #line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp32_ = export_dialog_new (_tmp31_);
+	_tmp28_ = export_dialog_new (_tmp27_);
 #line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	g_object_ref_sink (_tmp32_);
+	g_object_ref_sink (_tmp28_);
 #line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	export_dialog = _tmp32_;
+	export_dialog = _tmp28_;
 #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp34_ = has_some_videos;
+	_tmp30_ = has_some_videos;
 #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp34_) {
-#line 3858 "CollectionPage.c"
-		ExportFormatParameters _tmp35_ = {0};
+	if (_tmp30_) {
+#line 3787 "CollectionPage.c"
+		ExportFormatParameters _tmp31_ = {0};
 #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		export_format_parameters_current (&_tmp35_);
+		export_format_parameters_current (&_tmp31_);
 #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp33_ = _tmp35_;
-#line 3864 "CollectionPage.c"
+		_tmp29_ = _tmp31_;
+#line 3793 "CollectionPage.c"
 	} else {
-		ExportFormatParameters _tmp36_ = {0};
+		ExportFormatParameters _tmp32_ = {0};
 #line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		export_format_parameters_last (&_tmp36_);
+		export_format_parameters_last (&_tmp32_);
 #line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp33_ = _tmp36_;
-#line 3871 "CollectionPage.c"
+		_tmp29_ = _tmp32_;
+#line 3800 "CollectionPage.c"
 	}
 #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	export_params = _tmp33_;
+	export_params = _tmp29_;
 #line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp37_ = export_dialog;
+	_tmp33_ = export_dialog;
 #line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp40_ = export_dialog_execute (_tmp37_, &_tmp38_, &_tmp39_, &export_params);
+	_tmp36_ = export_dialog_execute (_tmp33_, &_tmp34_, &_tmp35_, &export_params);
 #line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	scale = _tmp38_;
+	scale = _tmp34_;
 #line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	constraint = _tmp39_;
+	constraint = _tmp35_;
 #line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp40_) {
+	if (!_tmp36_) {
 #line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
 #line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3889,111 +3818,111 @@ static void collection_page_real_on_export (MediaPage* base) {
 		_g_object_unref0 (export_list);
 #line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3893 "CollectionPage.c"
+#line 3822 "CollectionPage.c"
 	}
 #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp41_ = constraint;
+	_tmp37_ = constraint;
 #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp42_ = scale;
+	_tmp38_ = scale;
 #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	scaling_for_constraint (_tmp41_, _tmp42_, FALSE, &_tmp43_);
+	scaling_for_constraint (_tmp37_, _tmp38_, FALSE, &_tmp39_);
 #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	scaling = _tmp43_;
+	scaling = _tmp39_;
 #line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp44_ = export_list;
+	_tmp40_ = export_list;
 #line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp45_ = gee_collection_get_size (_tmp44_);
+	_tmp41_ = gee_collection_get_size (_tmp40_);
 #line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp46_ = _tmp45_;
+	_tmp42_ = _tmp41_;
 #line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp46_ == 1) {
-#line 3911 "CollectionPage.c"
+	if (_tmp42_ == 1) {
+#line 3840 "CollectionPage.c"
 		LibraryPhoto* photo = NULL;
 		GFile* save_as = NULL;
-		LibraryPhoto* _tmp55_ = NULL;
-		ExportFormatParameters _tmp56_ = {0};
-		gchar* _tmp57_ = NULL;
-		gchar* _tmp58_ = NULL;
-		GFile* _tmp59_ = NULL;
-		GFile* _tmp60_ = NULL;
-		GFile* _tmp61_ = NULL;
+		LibraryPhoto* _tmp51_;
+		ExportFormatParameters _tmp52_;
+		gchar* _tmp53_;
+		gchar* _tmp54_;
+		GFile* _tmp55_;
+		GFile* _tmp56_;
+		GFile* _tmp57_;
 #line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo = NULL;
-#line 3923 "CollectionPage.c"
+#line 3852 "CollectionPage.c"
 		{
 			GeeIterator* _p_it = NULL;
-			GeeCollection* _tmp47_ = NULL;
-			GeeIterator* _tmp48_ = NULL;
+			GeeCollection* _tmp43_;
+			GeeIterator* _tmp44_;
 #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp47_ = export_list;
+			_tmp43_ = export_list;
 #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp48_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_COLLECTION, GeeCollection), GEE_TYPE_ITERABLE, GeeIterable));
+			_tmp44_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection), GEE_TYPE_ITERABLE, GeeIterable));
 #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_p_it = _tmp48_;
+			_p_it = _tmp44_;
 #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			while (TRUE) {
-#line 3936 "CollectionPage.c"
-				GeeIterator* _tmp49_ = NULL;
-				gboolean _tmp50_ = FALSE;
+#line 3865 "CollectionPage.c"
+				GeeIterator* _tmp45_;
+				gboolean _tmp46_;
 				LibraryPhoto* p = NULL;
-				GeeIterator* _tmp51_ = NULL;
-				gpointer _tmp52_ = NULL;
-				LibraryPhoto* _tmp53_ = NULL;
-				LibraryPhoto* _tmp54_ = NULL;
+				GeeIterator* _tmp47_;
+				gpointer _tmp48_;
+				LibraryPhoto* _tmp49_;
+				LibraryPhoto* _tmp50_;
 #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				_tmp49_ = _p_it;
+				_tmp45_ = _p_it;
 #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				_tmp50_ = gee_iterator_next (_tmp49_);
+				_tmp46_ = gee_iterator_next (_tmp45_);
 #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				if (!_tmp50_) {
+				if (!_tmp46_) {
 #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					break;
-#line 3952 "CollectionPage.c"
+#line 3881 "CollectionPage.c"
 				}
 #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				_tmp51_ = _p_it;
+				_tmp47_ = _p_it;
 #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				_tmp52_ = gee_iterator_get (_tmp51_);
+				_tmp48_ = gee_iterator_get (_tmp47_);
 #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				p = (LibraryPhoto*) _tmp52_;
+				p = (LibraryPhoto*) _tmp48_;
 #line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				_tmp53_ = p;
+				_tmp49_ = p;
 #line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				_tmp54_ = _g_object_ref0 (_tmp53_);
+				_tmp50_ = _g_object_ref0 (_tmp49_);
 #line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
 #line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				photo = _tmp54_;
+				photo = _tmp50_;
 #line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (p);
 #line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3972 "CollectionPage.c"
+#line 3901 "CollectionPage.c"
 			}
 #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_p_it);
-#line 3976 "CollectionPage.c"
+#line 3905 "CollectionPage.c"
 		}
 #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp55_ = photo;
+		_tmp51_ = photo;
 #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp56_ = export_params;
+		_tmp52_ = export_params;
 #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp57_ = photo_get_export_basename_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PHOTO, Photo), &_tmp56_);
+		_tmp53_ = photo_get_export_basename_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_PHOTO, Photo), &_tmp52_);
 #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp58_ = _tmp57_;
+		_tmp54_ = _tmp53_;
 #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp59_ = export_ui_choose_file (_tmp58_);
+		_tmp55_ = export_ui_choose_file (_tmp54_);
 #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp60_ = _tmp59_;
+		_tmp56_ = _tmp55_;
 #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_free0 (_tmp58_);
+		_g_free0 (_tmp54_);
 #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		save_as = _tmp60_;
+		save_as = _tmp56_;
 #line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp61_ = save_as;
+		_tmp57_ = save_as;
 #line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		if (_tmp61_ == NULL) {
+		if (_tmp57_ == NULL) {
 #line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (save_as);
 #line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4006,102 +3935,102 @@ static void collection_page_real_on_export (MediaPage* base) {
 			_g_object_unref0 (export_list);
 #line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 4010 "CollectionPage.c"
+#line 3939 "CollectionPage.c"
 		}
 		{
-			AppWindow* _tmp62_ = NULL;
-			AppWindow* _tmp63_ = NULL;
-			LibraryPhoto* _tmp64_ = NULL;
-			GFile* _tmp65_ = NULL;
-			Scaling _tmp66_ = {0};
-			ExportFormatParameters _tmp67_ = {0};
-			JpegQuality _tmp68_ = 0;
-			LibraryPhoto* _tmp69_ = NULL;
-			ExportFormatParameters _tmp70_ = {0};
-			PhotoFileFormat _tmp71_ = 0;
-			ExportFormatParameters _tmp72_ = {0};
-			ExportFormatMode _tmp73_ = 0;
-			ExportFormatParameters _tmp74_ = {0};
-			gboolean _tmp75_ = FALSE;
-			AppWindow* _tmp76_ = NULL;
-			AppWindow* _tmp77_ = NULL;
+			AppWindow* _tmp58_;
+			AppWindow* _tmp59_;
+			LibraryPhoto* _tmp60_;
+			GFile* _tmp61_;
+			Scaling _tmp62_;
+			ExportFormatParameters _tmp63_;
+			JpegQuality _tmp64_;
+			LibraryPhoto* _tmp65_;
+			ExportFormatParameters _tmp66_;
+			PhotoFileFormat _tmp67_;
+			ExportFormatParameters _tmp68_;
+			ExportFormatMode _tmp69_;
+			ExportFormatParameters _tmp70_;
+			gboolean _tmp71_;
+			AppWindow* _tmp72_;
+			AppWindow* _tmp73_;
 #line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp62_ = app_window_get_instance ();
+			_tmp58_ = app_window_get_instance ();
 #line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp63_ = _tmp62_;
+			_tmp59_ = _tmp58_;
 #line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_PAGE_WINDOW, PageWindow));
+			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, TYPE_PAGE_WINDOW, PageWindow));
 #line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_g_object_unref0 (_tmp63_);
+			_g_object_unref0 (_tmp59_);
 #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp64_ = photo;
+			_tmp60_ = photo;
 #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp65_ = save_as;
+			_tmp61_ = save_as;
 #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp66_ = scaling;
+			_tmp62_ = scaling;
 #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp67_ = export_params;
+			_tmp63_ = export_params;
 #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp68_ = _tmp67_.quality;
+			_tmp64_ = _tmp63_.quality;
 #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp69_ = photo;
+			_tmp65_ = photo;
 #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp70_ = export_params;
+			_tmp66_ = export_params;
 #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp71_ = photo_get_export_format_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_PHOTO, Photo), &_tmp70_);
+			_tmp67_ = photo_get_export_format_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_PHOTO, Photo), &_tmp66_);
 #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp72_ = export_params;
+			_tmp68_ = export_params;
 #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp73_ = _tmp72_.mode;
+			_tmp69_ = _tmp68_.mode;
 #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp74_ = export_params;
+			_tmp70_ = export_params;
 #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp75_ = _tmp74_.export_metadata;
+			_tmp71_ = _tmp70_.export_metadata;
 #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_PHOTO, Photo), _tmp65_, &_tmp66_, _tmp68_, _tmp71_, _tmp73_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp75_, &_inner_error_);
+			photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_PHOTO, Photo), _tmp61_, &_tmp62_, _tmp64_, _tmp67_, _tmp69_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp71_, &_inner_error_);
 #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4065 "CollectionPage.c"
-				goto __catch233_g_error;
+#line 3994 "CollectionPage.c"
+				goto __catch234_g_error;
 			}
 #line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp76_ = app_window_get_instance ();
+			_tmp72_ = app_window_get_instance ();
 #line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp77_ = _tmp76_;
+			_tmp73_ = _tmp72_;
 #line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_PAGE_WINDOW, PageWindow));
+			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_PAGE_WINDOW, PageWindow));
 #line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_g_object_unref0 (_tmp77_);
-#line 4076 "CollectionPage.c"
+			_g_object_unref0 (_tmp73_);
+#line 4005 "CollectionPage.c"
 		}
-		goto __finally233;
-		__catch233_g_error:
+		goto __finally234;
+		__catch234_g_error:
 		{
 			GError* err = NULL;
-			AppWindow* _tmp78_ = NULL;
-			AppWindow* _tmp79_ = NULL;
-			GFile* _tmp80_ = NULL;
+			AppWindow* _tmp74_;
+			AppWindow* _tmp75_;
+			GFile* _tmp76_;
 #line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			err = _inner_error_;
 #line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_inner_error_ = NULL;
 #line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp78_ = app_window_get_instance ();
+			_tmp74_ = app_window_get_instance ();
 #line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp79_ = _tmp78_;
+			_tmp75_ = _tmp74_;
 #line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_PAGE_WINDOW, PageWindow));
+			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_PAGE_WINDOW, PageWindow));
 #line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_g_object_unref0 (_tmp79_);
+			_g_object_unref0 (_tmp75_);
 #line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp80_ = save_as;
+			_tmp76_ = save_as;
 #line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			export_error_dialog (_tmp80_, FALSE);
+			export_error_dialog (_tmp76_, FALSE);
 #line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_error_free0 (err);
-#line 4103 "CollectionPage.c"
+#line 4032 "CollectionPage.c"
 		}
-		__finally233:
+		__finally234:
 #line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4120,7 +4049,7 @@ static void collection_page_real_on_export (MediaPage* base) {
 			g_clear_error (&_inner_error_);
 #line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 4124 "CollectionPage.c"
+#line 4053 "CollectionPage.c"
 		}
 #line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (save_as);
@@ -4134,18 +4063,18 @@ static void collection_page_real_on_export (MediaPage* base) {
 		_g_object_unref0 (export_list);
 #line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4138 "CollectionPage.c"
+#line 4067 "CollectionPage.c"
 	}
 #line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp81_ = title;
+	_tmp77_ = title;
 #line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp82_ = export_ui_choose_dir (_tmp81_);
+	_tmp78_ = export_ui_choose_dir (_tmp77_);
 #line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	export_dir = _tmp82_;
+	export_dir = _tmp78_;
 #line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp83_ = export_dir;
+	_tmp79_ = export_dir;
 #line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp83_ == NULL) {
+	if (_tmp79_ == NULL) {
 #line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dir);
 #line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4156,32 +4085,32 @@ static void collection_page_real_on_export (MediaPage* base) {
 		_g_object_unref0 (export_list);
 #line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4160 "CollectionPage.c"
+#line 4089 "CollectionPage.c"
 	}
 #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp84_ = export_list;
+	_tmp80_ = export_list;
 #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp85_ = export_dir;
+	_tmp81_ = export_dir;
 #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp86_ = scaling;
+	_tmp82_ = scaling;
 #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp87_ = export_params;
+	_tmp83_ = export_params;
 #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp88_ = exporter_new (_tmp84_, _tmp85_, &_tmp86_, &_tmp87_, FALSE);
+	_tmp84_ = exporter_new (_tmp80_, _tmp81_, &_tmp82_, &_tmp83_, FALSE);
 #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp89_ = _tmp88_;
+	_tmp85_ = _tmp84_;
 #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp90_ = exporter_ui_new (_tmp89_);
+	_tmp86_ = exporter_ui_new (_tmp85_);
 #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
 #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	self->priv->exporter = _tmp90_;
+	self->priv->exporter = _tmp86_;
 #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_g_object_unref0 (_tmp89_);
+	_g_object_unref0 (_tmp85_);
 #line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp91_ = self->priv->exporter;
+	_tmp87_ = self->priv->exporter;
 #line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	exporter_ui_export (_tmp91_, _collection_page_on_export_completed_exporter_completion_callback, self);
+	exporter_ui_export (_tmp87_, _collection_page_on_export_completed_exporter_completion_callback, self);
 #line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_dir);
 #line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4190,7 +4119,7 @@ static void collection_page_real_on_export (MediaPage* base) {
 	_g_free0 (title);
 #line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_list);
-#line 4194 "CollectionPage.c"
+#line 4123 "CollectionPage.c"
 }
 
 
@@ -4201,7 +4130,7 @@ static void collection_page_on_export_completed (CollectionPage* self) {
 	_exporter_ui_unref0 (self->priv->exporter);
 #line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv->exporter = NULL;
-#line 4205 "CollectionPage.c"
+#line 4134 "CollectionPage.c"
 }
 
 
@@ -4209,17 +4138,17 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 	gboolean result = FALSE;
 #line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 4213 "CollectionPage.c"
+#line 4142 "CollectionPage.c"
 	{
 		GeeList* _source_list = NULL;
-		ViewCollection* _tmp0_ = NULL;
-		ViewCollection* _tmp1_ = NULL;
-		GeeList* _tmp2_ = NULL;
-		GeeList* _tmp3_ = NULL;
+		ViewCollection* _tmp0_;
+		ViewCollection* _tmp1_;
+		GeeList* _tmp2_;
+		GeeList* _tmp3_;
 		gint _source_size = 0;
-		GeeList* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+		GeeList* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 		gint _source_index = 0;
 #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -4245,19 +4174,19 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 		_source_index = -1;
 #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 4249 "CollectionPage.c"
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
+#line 4178 "CollectionPage.c"
+			gint _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
 			DataSource* source = NULL;
-			GeeList* _tmp10_ = NULL;
-			gint _tmp11_ = 0;
-			gpointer _tmp12_ = NULL;
+			GeeList* _tmp10_;
+			gint _tmp11_;
+			gpointer _tmp12_;
 			LibraryPhoto* photo = NULL;
-			DataSource* _tmp13_ = NULL;
-			LibraryPhoto* _tmp14_ = NULL;
+			DataSource* _tmp13_;
+			LibraryPhoto* _tmp14_;
 			gboolean _tmp15_ = FALSE;
-			LibraryPhoto* _tmp16_ = NULL;
+			LibraryPhoto* _tmp16_;
 #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = _source_index;
 #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4270,7 +4199,7 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 			if (!(_tmp8_ < _tmp9_)) {
 #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4274 "CollectionPage.c"
+#line 4203 "CollectionPage.c"
 			}
 #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = _source_list;
@@ -4290,10 +4219,10 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 			_tmp16_ = photo;
 #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp16_ != NULL) {
-#line 4294 "CollectionPage.c"
+#line 4223 "CollectionPage.c"
 				gboolean _tmp17_ = FALSE;
-				LibraryPhoto* _tmp18_ = NULL;
-				gboolean _tmp19_ = FALSE;
+				LibraryPhoto* _tmp18_;
+				gboolean _tmp19_;
 #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = photo;
 #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4302,25 +4231,25 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 				if (_tmp19_) {
 #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp17_ = TRUE;
-#line 4306 "CollectionPage.c"
+#line 4235 "CollectionPage.c"
 				} else {
-					LibraryPhoto* _tmp20_ = NULL;
-					gboolean _tmp21_ = FALSE;
+					LibraryPhoto* _tmp20_;
+					gboolean _tmp21_;
 #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp20_ = photo;
 #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp21_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo));
 #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp17_ = _tmp21_;
-#line 4316 "CollectionPage.c"
+#line 4245 "CollectionPage.c"
 				}
 #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = _tmp17_;
-#line 4320 "CollectionPage.c"
+#line 4249 "CollectionPage.c"
 			} else {
 #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = FALSE;
-#line 4324 "CollectionPage.c"
+#line 4253 "CollectionPage.c"
 			}
 #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp15_) {
@@ -4334,23 +4263,23 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 				_g_object_unref0 (_source_list);
 #line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				return result;
-#line 4338 "CollectionPage.c"
+#line 4267 "CollectionPage.c"
 			}
 #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
 #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (source);
-#line 4344 "CollectionPage.c"
+#line 4273 "CollectionPage.c"
 		}
 #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_source_list);
-#line 4348 "CollectionPage.c"
+#line 4277 "CollectionPage.c"
 	}
 #line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = FALSE;
 #line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 4354 "CollectionPage.c"
+#line 4283 "CollectionPage.c"
 }
 
 
@@ -4358,17 +4287,17 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
 	gboolean result = FALSE;
 #line 488 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 4362 "CollectionPage.c"
+#line 4291 "CollectionPage.c"
 	{
 		GeeList* _source_list = NULL;
-		ViewCollection* _tmp0_ = NULL;
-		ViewCollection* _tmp1_ = NULL;
-		GeeList* _tmp2_ = NULL;
-		GeeList* _tmp3_ = NULL;
+		ViewCollection* _tmp0_;
+		ViewCollection* _tmp1_;
+		GeeList* _tmp2_;
+		GeeList* _tmp3_;
 		gint _source_size = 0;
-		GeeList* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+		GeeList* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 		gint _source_index = 0;
 #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -4394,19 +4323,19 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
 		_source_index = -1;
 #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 4398 "CollectionPage.c"
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
+#line 4327 "CollectionPage.c"
+			gint _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
 			DataSource* source = NULL;
-			GeeList* _tmp10_ = NULL;
-			gint _tmp11_ = 0;
-			gpointer _tmp12_ = NULL;
+			GeeList* _tmp10_;
+			gint _tmp11_;
+			gpointer _tmp12_;
 			LibraryPhoto* photo = NULL;
-			DataSource* _tmp13_ = NULL;
-			LibraryPhoto* _tmp14_ = NULL;
+			DataSource* _tmp13_;
+			LibraryPhoto* _tmp14_;
 			gboolean _tmp15_ = FALSE;
-			LibraryPhoto* _tmp16_ = NULL;
+			LibraryPhoto* _tmp16_;
 #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = _source_index;
 #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4419,7 +4348,7 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
 			if (!(_tmp8_ < _tmp9_)) {
 #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4423 "CollectionPage.c"
+#line 4352 "CollectionPage.c"
 			}
 #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = _source_list;
@@ -4439,20 +4368,20 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
 			_tmp16_ = photo;
 #line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp16_ != NULL) {
-#line 4443 "CollectionPage.c"
-				LibraryPhoto* _tmp17_ = NULL;
-				gboolean _tmp18_ = FALSE;
+#line 4372 "CollectionPage.c"
+				LibraryPhoto* _tmp17_;
+				gboolean _tmp18_;
 #line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp17_ = photo;
 #line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo));
 #line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = _tmp18_;
-#line 4452 "CollectionPage.c"
+#line 4381 "CollectionPage.c"
 			} else {
 #line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = FALSE;
-#line 4456 "CollectionPage.c"
+#line 4385 "CollectionPage.c"
 			}
 #line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp15_) {
@@ -4466,43 +4395,41 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
 				_g_object_unref0 (_source_list);
 #line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				return result;
-#line 4470 "CollectionPage.c"
+#line 4399 "CollectionPage.c"
 			}
 #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
 #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (source);
-#line 4476 "CollectionPage.c"
+#line 4405 "CollectionPage.c"
 		}
 #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_source_list);
-#line 4480 "CollectionPage.c"
+#line 4409 "CollectionPage.c"
 	}
 #line 495 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = FALSE;
 #line 495 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 4486 "CollectionPage.c"
+#line 4415 "CollectionPage.c"
 }
 
 
 static void collection_page_on_rotate_clockwise (CollectionPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	RotateMultipleCommand* command = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
-	GeeList* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	RotateMultipleCommand* _tmp10_ = NULL;
-	RotateMultipleCommand* _tmp11_ = NULL;
-	CommandManager* _tmp12_ = NULL;
-	CommandManager* _tmp13_ = NULL;
-	RotateMultipleCommand* _tmp14_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	GeeList* _tmp6_;
+	GeeList* _tmp7_;
+	RotateMultipleCommand* _tmp8_;
+	RotateMultipleCommand* _tmp9_;
+	CommandManager* _tmp10_;
+	CommandManager* _tmp11_;
+	RotateMultipleCommand* _tmp12_;
 #line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
 #line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4519,7 +4446,7 @@ static void collection_page_on_rotate_clockwise (CollectionPage* self) {
 	if (_tmp3_) {
 #line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4523 "CollectionPage.c"
+#line 4450 "CollectionPage.c"
 	}
 #line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -4530,40 +4457,36 @@ static void collection_page_on_rotate_clockwise (CollectionPage* self) {
 #line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
 #line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp8_ = _ ("Rotating");
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp9_ = _ ("Undoing Rotate");
+	_tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP, _ ("Rotating"), _ ("Undoing Rotate"));
 #line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP, _tmp8_, _tmp9_);
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp11_ = _tmp10_;
+	_tmp9_ = _tmp8_;
 #line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
 #line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
 #line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	command = _tmp11_;
+	command = _tmp9_;
 #line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp13_ = _tmp12_;
+	_tmp11_ = _tmp10_;
 #line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp14_ = command;
+	_tmp12_ = command;
 #line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
 #line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_command_manager_unref0 (_tmp13_);
+	_command_manager_unref0 (_tmp11_);
 #line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4559 "CollectionPage.c"
+#line 4482 "CollectionPage.c"
 }
 
 
 static void collection_page_on_publish (CollectionPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 #line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
 #line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4578,11 +4501,11 @@ static void collection_page_on_publish (CollectionPage* self) {
 	_data_collection_unref0 (_tmp1_);
 #line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 4582 "CollectionPage.c"
-		ViewCollection* _tmp4_ = NULL;
-		ViewCollection* _tmp5_ = NULL;
-		GeeList* _tmp6_ = NULL;
-		GeeCollection* _tmp7_ = NULL;
+#line 4505 "CollectionPage.c"
+		ViewCollection* _tmp4_;
+		ViewCollection* _tmp5_;
+		GeeList* _tmp6_;
+		GeeCollection* _tmp7_;
 #line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4597,28 +4520,26 @@ static void collection_page_on_publish (CollectionPage* self) {
 		_g_object_unref0 (_tmp7_);
 #line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 4601 "CollectionPage.c"
+#line 4524 "CollectionPage.c"
 	}
 }
 
 
 static void collection_page_on_rotate_counterclockwise (CollectionPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	RotateMultipleCommand* command = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
-	GeeList* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	RotateMultipleCommand* _tmp10_ = NULL;
-	RotateMultipleCommand* _tmp11_ = NULL;
-	CommandManager* _tmp12_ = NULL;
-	CommandManager* _tmp13_ = NULL;
-	RotateMultipleCommand* _tmp14_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	GeeList* _tmp6_;
+	GeeList* _tmp7_;
+	RotateMultipleCommand* _tmp8_;
+	RotateMultipleCommand* _tmp9_;
+	CommandManager* _tmp10_;
+	CommandManager* _tmp11_;
+	RotateMultipleCommand* _tmp12_;
 #line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
 #line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4635,7 +4556,7 @@ static void collection_page_on_rotate_counterclockwise (CollectionPage* self) {
 	if (_tmp3_) {
 #line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4639 "CollectionPage.c"
+#line 4560 "CollectionPage.c"
 	}
 #line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -4646,52 +4567,46 @@ static void collection_page_on_rotate_counterclockwise (CollectionPage* self) {
 #line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
 #line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp8_ = _ ("Rotating");
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp9_ = _ ("Undoing Rotate");
+	_tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP, _ ("Rotating"), _ ("Undoing Rotate"));
 #line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP, _tmp8_, _tmp9_);
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp11_ = _tmp10_;
+	_tmp9_ = _tmp8_;
 #line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
 #line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
 #line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	command = _tmp11_;
+	command = _tmp9_;
 #line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp13_ = _tmp12_;
+	_tmp11_ = _tmp10_;
 #line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp14_ = command;
+	_tmp12_ = command;
 #line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
 #line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_command_manager_unref0 (_tmp13_);
+	_command_manager_unref0 (_tmp11_);
 #line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4675 "CollectionPage.c"
+#line 4592 "CollectionPage.c"
 }
 
 
 static void collection_page_on_flip_horizontally (CollectionPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	RotateMultipleCommand* command = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
-	GeeList* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	RotateMultipleCommand* _tmp10_ = NULL;
-	RotateMultipleCommand* _tmp11_ = NULL;
-	CommandManager* _tmp12_ = NULL;
-	CommandManager* _tmp13_ = NULL;
-	RotateMultipleCommand* _tmp14_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	GeeList* _tmp6_;
+	GeeList* _tmp7_;
+	RotateMultipleCommand* _tmp8_;
+	RotateMultipleCommand* _tmp9_;
+	CommandManager* _tmp10_;
+	CommandManager* _tmp11_;
+	RotateMultipleCommand* _tmp12_;
 #line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
 #line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4708,7 +4623,7 @@ static void collection_page_on_flip_horizontally (CollectionPage* self) {
 	if (_tmp3_) {
 #line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4712 "CollectionPage.c"
+#line 4627 "CollectionPage.c"
 	}
 #line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -4719,52 +4634,46 @@ static void collection_page_on_flip_horizontally (CollectionPage* self) {
 #line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
 #line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp8_ = _ ("Flipping Horizontally");
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp9_ = _ ("Undoing Flip Horizontally");
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "", _tmp8_, _tmp9_);
+	_tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "", _ ("Flipping Horizontally"), _ ("Undoing Flip Horizontally"));
 #line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp11_ = _tmp10_;
+	_tmp9_ = _tmp8_;
 #line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
 #line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
 #line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	command = _tmp11_;
+	command = _tmp9_;
 #line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp13_ = _tmp12_;
+	_tmp11_ = _tmp10_;
 #line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp14_ = command;
+	_tmp12_ = command;
 #line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
 #line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_command_manager_unref0 (_tmp13_);
+	_command_manager_unref0 (_tmp11_);
 #line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4748 "CollectionPage.c"
+#line 4659 "CollectionPage.c"
 }
 
 
 static void collection_page_on_flip_vertically (CollectionPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	RotateMultipleCommand* command = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
-	GeeList* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	RotateMultipleCommand* _tmp10_ = NULL;
-	RotateMultipleCommand* _tmp11_ = NULL;
-	CommandManager* _tmp12_ = NULL;
-	CommandManager* _tmp13_ = NULL;
-	RotateMultipleCommand* _tmp14_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	GeeList* _tmp6_;
+	GeeList* _tmp7_;
+	RotateMultipleCommand* _tmp8_;
+	RotateMultipleCommand* _tmp9_;
+	CommandManager* _tmp10_;
+	CommandManager* _tmp11_;
+	RotateMultipleCommand* _tmp12_;
 #line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
 #line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4781,7 +4690,7 @@ static void collection_page_on_flip_vertically (CollectionPage* self) {
 	if (_tmp3_) {
 #line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4785 "CollectionPage.c"
+#line 4694 "CollectionPage.c"
 	}
 #line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -4792,51 +4701,47 @@ static void collection_page_on_flip_vertically (CollectionPage* self) {
 #line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
 #line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp8_ = _ ("Flipping Vertically");
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp9_ = _ ("Undoing Flip Vertically");
+	_tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "", _ ("Flipping Vertically"), _ ("Undoing Flip Vertically"));
 #line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "", _tmp8_, _tmp9_);
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp11_ = _tmp10_;
+	_tmp9_ = _tmp8_;
 #line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
 #line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
 #line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	command = _tmp11_;
+	command = _tmp9_;
 #line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp13_ = _tmp12_;
+	_tmp11_ = _tmp10_;
 #line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp14_ = command;
+	_tmp12_ = command;
 #line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
 #line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_command_manager_unref0 (_tmp13_);
+	_command_manager_unref0 (_tmp11_);
 #line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4821 "CollectionPage.c"
+#line 4726 "CollectionPage.c"
 }
 
 
 static void collection_page_on_revert (CollectionPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 	RevertMultipleCommand* command = NULL;
-	ViewCollection* _tmp27_ = NULL;
-	ViewCollection* _tmp28_ = NULL;
-	GeeList* _tmp29_ = NULL;
-	GeeList* _tmp30_ = NULL;
-	RevertMultipleCommand* _tmp31_ = NULL;
-	RevertMultipleCommand* _tmp32_ = NULL;
-	CommandManager* _tmp33_ = NULL;
-	CommandManager* _tmp34_ = NULL;
-	RevertMultipleCommand* _tmp35_ = NULL;
+	ViewCollection* _tmp27_;
+	ViewCollection* _tmp28_;
+	GeeList* _tmp29_;
+	GeeList* _tmp30_;
+	RevertMultipleCommand* _tmp31_;
+	RevertMultipleCommand* _tmp32_;
+	CommandManager* _tmp33_;
+	CommandManager* _tmp34_;
+	RevertMultipleCommand* _tmp35_;
 #line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
 #line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4853,21 +4758,21 @@ static void collection_page_on_revert (CollectionPage* self) {
 	if (_tmp3_) {
 #line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4857 "CollectionPage.c"
+#line 4762 "CollectionPage.c"
 	}
 #line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = collection_page_can_revert_editable_selected (self);
 #line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp4_) {
-#line 4863 "CollectionPage.c"
-		AppWindow* _tmp5_ = NULL;
-		AppWindow* _tmp6_ = NULL;
-		ViewCollection* _tmp7_ = NULL;
-		ViewCollection* _tmp8_ = NULL;
-		GeeList* _tmp9_ = NULL;
-		GeeCollection* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
-		gboolean _tmp12_ = FALSE;
+#line 4768 "CollectionPage.c"
+		AppWindow* _tmp5_;
+		AppWindow* _tmp6_;
+		ViewCollection* _tmp7_;
+		ViewCollection* _tmp8_;
+		GeeList* _tmp9_;
+		GeeCollection* _tmp10_;
+		gboolean _tmp11_;
+		gboolean _tmp12_;
 #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = app_window_get_instance ();
 #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4894,18 +4799,18 @@ static void collection_page_on_revert (CollectionPage* self) {
 		if (_tmp12_) {
 #line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 4898 "CollectionPage.c"
+#line 4803 "CollectionPage.c"
 		}
 		{
 			GeeList* _object_list = NULL;
-			ViewCollection* _tmp13_ = NULL;
-			ViewCollection* _tmp14_ = NULL;
-			GeeList* _tmp15_ = NULL;
-			GeeList* _tmp16_ = NULL;
+			ViewCollection* _tmp13_;
+			ViewCollection* _tmp14_;
+			GeeList* _tmp15_;
+			GeeList* _tmp16_;
 			gint _object_size = 0;
-			GeeList* _tmp17_ = NULL;
-			gint _tmp18_ = 0;
-			gint _tmp19_ = 0;
+			GeeList* _tmp17_;
+			gint _tmp18_;
+			gint _tmp19_;
 			gint _object_index = 0;
 #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -4931,15 +4836,15 @@ static void collection_page_on_revert (CollectionPage* self) {
 			_object_index = -1;
 #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			while (TRUE) {
-#line 4935 "CollectionPage.c"
-				gint _tmp20_ = 0;
-				gint _tmp21_ = 0;
-				gint _tmp22_ = 0;
+#line 4840 "CollectionPage.c"
+				gint _tmp20_;
+				gint _tmp21_;
+				gint _tmp22_;
 				DataObject* object = NULL;
-				GeeList* _tmp23_ = NULL;
-				gint _tmp24_ = 0;
-				gpointer _tmp25_ = NULL;
-				DataObject* _tmp26_ = NULL;
+				GeeList* _tmp23_;
+				gint _tmp24_;
+				gpointer _tmp25_;
+				DataObject* _tmp26_;
 #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = _object_index;
 #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4952,7 +4857,7 @@ static void collection_page_on_revert (CollectionPage* self) {
 				if (!(_tmp21_ < _tmp22_)) {
 #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					break;
-#line 4956 "CollectionPage.c"
+#line 4861 "CollectionPage.c"
 				}
 #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp23_ = _object_list;
@@ -4968,11 +4873,11 @@ static void collection_page_on_revert (CollectionPage* self) {
 				photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_PHOTO, Photo), TRUE);
 #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 4972 "CollectionPage.c"
+#line 4877 "CollectionPage.c"
 			}
 #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_object_list);
-#line 4976 "CollectionPage.c"
+#line 4881 "CollectionPage.c"
 		}
 	}
 #line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5005,25 +4910,25 @@ static void collection_page_on_revert (CollectionPage* self) {
 	_command_manager_unref0 (_tmp34_);
 #line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5009 "CollectionPage.c"
+#line 4914 "CollectionPage.c"
 }
 
 
 void collection_page_on_copy_adjustments (CollectionPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	Photo* photo = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	DataView* _tmp6_ = NULL;
-	DataView* _tmp7_ = NULL;
-	DataSource* _tmp8_ = NULL;
-	Photo* _tmp9_ = NULL;
-	Photo* _tmp10_ = NULL;
-	PixelTransformationBundle* _tmp11_ = NULL;
-	PixelTransformationBundle* _tmp12_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	DataView* _tmp6_;
+	DataView* _tmp7_;
+	DataSource* _tmp8_;
+	Photo* _tmp9_;
+	Photo* _tmp10_;
+	PixelTransformationBundle* _tmp11_;
+	PixelTransformationBundle* _tmp12_;
 #line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
 #line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5040,7 +4945,7 @@ void collection_page_on_copy_adjustments (CollectionPage* self) {
 	if (_tmp3_) {
 #line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5044 "CollectionPage.c"
+#line 4949 "CollectionPage.c"
 	}
 #line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5074,29 +4979,29 @@ void collection_page_on_copy_adjustments (CollectionPage* self) {
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE);
 #line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 5078 "CollectionPage.c"
+#line 4983 "CollectionPage.c"
 }
 
 
 void collection_page_on_paste_adjustments (CollectionPage* self) {
 	PixelTransformationBundle* copied_adjustments = NULL;
-	PixelTransformationBundle* _tmp0_ = NULL;
+	PixelTransformationBundle* _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gboolean _tmp5_ = FALSE;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
+	gint _tmp4_;
+	gboolean _tmp5_;
 	AdjustColorsMultipleCommand* command = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	ViewCollection* _tmp8_ = NULL;
-	GeeList* _tmp9_ = NULL;
-	GeeList* _tmp10_ = NULL;
-	PixelTransformationBundle* _tmp11_ = NULL;
-	AdjustColorsMultipleCommand* _tmp12_ = NULL;
-	AdjustColorsMultipleCommand* _tmp13_ = NULL;
-	CommandManager* _tmp14_ = NULL;
-	CommandManager* _tmp15_ = NULL;
-	AdjustColorsMultipleCommand* _tmp16_ = NULL;
+	ViewCollection* _tmp7_;
+	ViewCollection* _tmp8_;
+	GeeList* _tmp9_;
+	GeeList* _tmp10_;
+	PixelTransformationBundle* _tmp11_;
+	AdjustColorsMultipleCommand* _tmp12_;
+	AdjustColorsMultipleCommand* _tmp13_;
+	CommandManager* _tmp14_;
+	CommandManager* _tmp15_;
+	AdjustColorsMultipleCommand* _tmp16_;
 #line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
 #line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5117,14 +5022,14 @@ void collection_page_on_paste_adjustments (CollectionPage* self) {
 	if (_tmp5_) {
 #line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = TRUE;
-#line 5121 "CollectionPage.c"
+#line 5026 "CollectionPage.c"
 	} else {
-		PixelTransformationBundle* _tmp6_ = NULL;
+		PixelTransformationBundle* _tmp6_;
 #line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = copied_adjustments;
 #line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp6_ == NULL;
-#line 5128 "CollectionPage.c"
+#line 5033 "CollectionPage.c"
 	}
 #line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp1_) {
@@ -5132,7 +5037,7 @@ void collection_page_on_paste_adjustments (CollectionPage* self) {
 		_pixel_transformation_bundle_unref0 (copied_adjustments);
 #line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5136 "CollectionPage.c"
+#line 5041 "CollectionPage.c"
 	}
 #line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5168,25 +5073,25 @@ void collection_page_on_paste_adjustments (CollectionPage* self) {
 	_g_object_unref0 (command);
 #line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 5172 "CollectionPage.c"
+#line 5077 "CollectionPage.c"
 }
 
 
 static void collection_page_on_enhance (CollectionPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	EnhanceMultipleCommand* command = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
-	GeeList* _tmp7_ = NULL;
-	EnhanceMultipleCommand* _tmp8_ = NULL;
-	EnhanceMultipleCommand* _tmp9_ = NULL;
-	CommandManager* _tmp10_ = NULL;
-	CommandManager* _tmp11_ = NULL;
-	EnhanceMultipleCommand* _tmp12_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	GeeList* _tmp6_;
+	GeeList* _tmp7_;
+	EnhanceMultipleCommand* _tmp8_;
+	EnhanceMultipleCommand* _tmp9_;
+	CommandManager* _tmp10_;
+	CommandManager* _tmp11_;
+	EnhanceMultipleCommand* _tmp12_;
 #line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
 #line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5203,7 +5108,7 @@ static void collection_page_on_enhance (CollectionPage* self) {
 	if (_tmp3_) {
 #line 582 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5207 "CollectionPage.c"
+#line 5112 "CollectionPage.c"
 	}
 #line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5235,25 +5140,25 @@ static void collection_page_on_enhance (CollectionPage* self) {
 	_command_manager_unref0 (_tmp11_);
 #line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5239 "CollectionPage.c"
+#line 5144 "CollectionPage.c"
 }
 
 
 static void collection_page_on_duplicate_photo (CollectionPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	DuplicateMultiplePhotosCommand* command = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
-	GeeList* _tmp7_ = NULL;
-	DuplicateMultiplePhotosCommand* _tmp8_ = NULL;
-	DuplicateMultiplePhotosCommand* _tmp9_ = NULL;
-	CommandManager* _tmp10_ = NULL;
-	CommandManager* _tmp11_ = NULL;
-	DuplicateMultiplePhotosCommand* _tmp12_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	GeeList* _tmp6_;
+	GeeList* _tmp7_;
+	DuplicateMultiplePhotosCommand* _tmp8_;
+	DuplicateMultiplePhotosCommand* _tmp9_;
+	CommandManager* _tmp10_;
+	CommandManager* _tmp11_;
+	DuplicateMultiplePhotosCommand* _tmp12_;
 #line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
 #line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5270,7 +5175,7 @@ static void collection_page_on_duplicate_photo (CollectionPage* self) {
 	if (_tmp3_) {
 #line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5274 "CollectionPage.c"
+#line 5179 "CollectionPage.c"
 	}
 #line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5302,41 +5207,41 @@ static void collection_page_on_duplicate_photo (CollectionPage* self) {
 	_command_manager_unref0 (_tmp11_);
 #line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5306 "CollectionPage.c"
+#line 5211 "CollectionPage.c"
 }
 
 
 static void collection_page_on_adjust_date_time (CollectionPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	gboolean selected_has_videos = FALSE;
 	gboolean only_videos_selected = FALSE;
 	Dateable* photo_source = NULL;
-	ViewCollection* _tmp21_ = NULL;
-	ViewCollection* _tmp22_ = NULL;
-	DataView* _tmp23_ = NULL;
-	DataView* _tmp24_ = NULL;
-	DataSource* _tmp25_ = NULL;
-	Dateable* _tmp26_ = NULL;
+	ViewCollection* _tmp21_;
+	ViewCollection* _tmp22_;
+	DataView* _tmp23_;
+	DataView* _tmp24_;
+	DataSource* _tmp25_;
+	Dateable* _tmp26_;
 	AdjustDateTimeDialog* dialog = NULL;
-	Dateable* _tmp27_ = NULL;
-	ViewCollection* _tmp28_ = NULL;
-	ViewCollection* _tmp29_ = NULL;
-	gint _tmp30_ = 0;
-	gboolean _tmp31_ = FALSE;
-	gboolean _tmp32_ = FALSE;
-	AdjustDateTimeDialog* _tmp33_ = NULL;
-	AdjustDateTimeDialog* _tmp34_ = NULL;
+	Dateable* _tmp27_;
+	ViewCollection* _tmp28_;
+	ViewCollection* _tmp29_;
+	gint _tmp30_;
+	gboolean _tmp31_;
+	gboolean _tmp32_;
+	AdjustDateTimeDialog* _tmp33_;
+	AdjustDateTimeDialog* _tmp34_;
 	gint64 time_shift = 0LL;
 	gboolean keep_relativity = FALSE;
 	gboolean modify_originals = FALSE;
-	AdjustDateTimeDialog* _tmp35_ = NULL;
+	AdjustDateTimeDialog* _tmp35_;
 	gint64 _tmp36_ = 0LL;
 	gboolean _tmp37_ = FALSE;
 	gboolean _tmp38_ = FALSE;
-	gboolean _tmp39_ = FALSE;
+	gboolean _tmp39_;
 #line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
 #line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5353,23 +5258,23 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 	if (_tmp3_) {
 #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5357 "CollectionPage.c"
+#line 5262 "CollectionPage.c"
 	}
 #line 601 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	selected_has_videos = FALSE;
 #line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	only_videos_selected = TRUE;
-#line 5363 "CollectionPage.c"
+#line 5268 "CollectionPage.c"
 	{
 		GeeList* _dv_list = NULL;
-		ViewCollection* _tmp4_ = NULL;
-		ViewCollection* _tmp5_ = NULL;
-		GeeList* _tmp6_ = NULL;
-		GeeList* _tmp7_ = NULL;
+		ViewCollection* _tmp4_;
+		ViewCollection* _tmp5_;
+		GeeList* _tmp6_;
+		GeeList* _tmp7_;
 		gint _dv_size = 0;
-		GeeList* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
+		GeeList* _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
 		gint _dv_index = 0;
 #line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5395,18 +5300,18 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 		_dv_index = -1;
 #line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 5399 "CollectionPage.c"
-			gint _tmp11_ = 0;
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
+#line 5304 "CollectionPage.c"
+			gint _tmp11_;
+			gint _tmp12_;
+			gint _tmp13_;
 			DataView* dv = NULL;
-			GeeList* _tmp14_ = NULL;
-			gint _tmp15_ = 0;
-			gpointer _tmp16_ = NULL;
-			DataView* _tmp17_ = NULL;
-			DataSource* _tmp18_ = NULL;
-			DataSource* _tmp19_ = NULL;
-			gboolean _tmp20_ = FALSE;
+			GeeList* _tmp14_;
+			gint _tmp15_;
+			gpointer _tmp16_;
+			DataView* _tmp17_;
+			DataSource* _tmp18_;
+			DataSource* _tmp19_;
+			gboolean _tmp20_;
 #line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _dv_index;
 #line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5419,7 +5324,7 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 			if (!(_tmp12_ < _tmp13_)) {
 #line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 5423 "CollectionPage.c"
+#line 5328 "CollectionPage.c"
 			}
 #line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _dv_list;
@@ -5443,19 +5348,19 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 			if (_tmp20_) {
 #line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				selected_has_videos = TRUE;
-#line 5447 "CollectionPage.c"
+#line 5352 "CollectionPage.c"
 			} else {
 #line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				only_videos_selected = FALSE;
-#line 5451 "CollectionPage.c"
+#line 5356 "CollectionPage.c"
 			}
 #line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (dv);
-#line 5455 "CollectionPage.c"
+#line 5360 "CollectionPage.c"
 		}
 #line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_dv_list);
-#line 5459 "CollectionPage.c"
+#line 5364 "CollectionPage.c"
 	}
 #line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5509,20 +5414,20 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 	modify_originals = _tmp38_;
 #line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp39_) {
-#line 5513 "CollectionPage.c"
+#line 5418 "CollectionPage.c"
 		AdjustDateTimePhotosCommand* command = NULL;
-		ViewCollection* _tmp40_ = NULL;
-		ViewCollection* _tmp41_ = NULL;
-		GeeList* _tmp42_ = NULL;
-		GeeList* _tmp43_ = NULL;
-		gint64 _tmp44_ = 0LL;
-		gboolean _tmp45_ = FALSE;
-		gboolean _tmp46_ = FALSE;
-		AdjustDateTimePhotosCommand* _tmp47_ = NULL;
-		AdjustDateTimePhotosCommand* _tmp48_ = NULL;
-		CommandManager* _tmp49_ = NULL;
-		CommandManager* _tmp50_ = NULL;
-		AdjustDateTimePhotosCommand* _tmp51_ = NULL;
+		ViewCollection* _tmp40_;
+		ViewCollection* _tmp41_;
+		GeeList* _tmp42_;
+		GeeList* _tmp43_;
+		gint64 _tmp44_;
+		gboolean _tmp45_;
+		gboolean _tmp46_;
+		AdjustDateTimePhotosCommand* _tmp47_;
+		AdjustDateTimePhotosCommand* _tmp48_;
+		CommandManager* _tmp49_;
+		CommandManager* _tmp50_;
+		AdjustDateTimePhotosCommand* _tmp51_;
 #line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5559,28 +5464,28 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 		_command_manager_unref0 (_tmp50_);
 #line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (command);
-#line 5563 "CollectionPage.c"
+#line 5468 "CollectionPage.c"
 	}
 #line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (dialog);
 #line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo_source);
-#line 5569 "CollectionPage.c"
+#line 5474 "CollectionPage.c"
 }
 
 
 static void collection_page_on_external_edit (CollectionPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	Photo* photo = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	DataView* _tmp6_ = NULL;
-	DataView* _tmp7_ = NULL;
-	DataSource* _tmp8_ = NULL;
-	Photo* _tmp9_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	DataView* _tmp6_;
+	DataView* _tmp7_;
+	DataSource* _tmp8_;
+	Photo* _tmp9_;
 	GError * _inner_error_ = NULL;
 #line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
@@ -5598,7 +5503,7 @@ static void collection_page_on_external_edit (CollectionPage* self) {
 	if (_tmp3_) {
 #line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5602 "CollectionPage.c"
+#line 5507 "CollectionPage.c"
 	}
 #line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5618,13 +5523,13 @@ static void collection_page_on_external_edit (CollectionPage* self) {
 	_data_collection_unref0 (_tmp5_);
 #line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 5622 "CollectionPage.c"
+#line 5527 "CollectionPage.c"
 	{
-		AppWindow* _tmp10_ = NULL;
-		AppWindow* _tmp11_ = NULL;
-		Photo* _tmp12_ = NULL;
-		AppWindow* _tmp13_ = NULL;
-		AppWindow* _tmp14_ = NULL;
+		AppWindow* _tmp10_;
+		AppWindow* _tmp11_;
+		Photo* _tmp12_;
+		AppWindow* _tmp13_;
+		AppWindow* _tmp14_;
 #line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = app_window_get_instance ();
 #line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5639,8 +5544,8 @@ static void collection_page_on_external_edit (CollectionPage* self) {
 		photo_open_with_external_editor (_tmp12_, &_inner_error_);
 #line 632 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5643 "CollectionPage.c"
-			goto __catch234_g_error;
+#line 5548 "CollectionPage.c"
+			goto __catch235_g_error;
 		}
 #line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = app_window_get_instance ();
@@ -5650,16 +5555,16 @@ static void collection_page_on_external_edit (CollectionPage* self) {
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE_WINDOW, PageWindow));
 #line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 5654 "CollectionPage.c"
+#line 5559 "CollectionPage.c"
 	}
-	goto __finally234;
-	__catch234_g_error:
+	goto __finally235;
+	__catch235_g_error:
 	{
 		GError* err = NULL;
-		AppWindow* _tmp15_ = NULL;
-		AppWindow* _tmp16_ = NULL;
-		GError* _tmp17_ = NULL;
-		Photo* _tmp18_ = NULL;
+		AppWindow* _tmp15_;
+		AppWindow* _tmp16_;
+		GError* _tmp17_;
+		Photo* _tmp18_;
 #line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		err = _inner_error_;
 #line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5680,9 +5585,9 @@ static void collection_page_on_external_edit (CollectionPage* self) {
 		open_external_editor_error_dialog (_tmp17_, _tmp18_);
 #line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_error_free0 (err);
-#line 5684 "CollectionPage.c"
+#line 5589 "CollectionPage.c"
 	}
-	__finally234:
+	__finally235:
 #line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5693,28 +5598,28 @@ static void collection_page_on_external_edit (CollectionPage* self) {
 		g_clear_error (&_inner_error_);
 #line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5697 "CollectionPage.c"
+#line 5602 "CollectionPage.c"
 	}
 #line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 5701 "CollectionPage.c"
+#line 5606 "CollectionPage.c"
 }
 
 
 static void collection_page_on_external_edit_raw (CollectionPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	Photo* photo = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	DataView* _tmp6_ = NULL;
-	DataView* _tmp7_ = NULL;
-	DataSource* _tmp8_ = NULL;
-	Photo* _tmp9_ = NULL;
-	Photo* _tmp10_ = NULL;
-	PhotoFileFormat _tmp11_ = 0;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	DataView* _tmp6_;
+	DataView* _tmp7_;
+	DataSource* _tmp8_;
+	Photo* _tmp9_;
+	Photo* _tmp10_;
+	PhotoFileFormat _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
@@ -5732,7 +5637,7 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 	if (_tmp3_) {
 #line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5736 "CollectionPage.c"
+#line 5641 "CollectionPage.c"
 	}
 #line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5762,14 +5667,14 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		_g_object_unref0 (photo);
 #line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5766 "CollectionPage.c"
+#line 5671 "CollectionPage.c"
 	}
 	{
-		AppWindow* _tmp12_ = NULL;
-		AppWindow* _tmp13_ = NULL;
-		Photo* _tmp14_ = NULL;
-		AppWindow* _tmp15_ = NULL;
-		AppWindow* _tmp16_ = NULL;
+		AppWindow* _tmp12_;
+		AppWindow* _tmp13_;
+		Photo* _tmp14_;
+		AppWindow* _tmp15_;
+		AppWindow* _tmp16_;
 #line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = app_window_get_instance ();
 #line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5784,8 +5689,8 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		photo_open_with_raw_external_editor (_tmp14_, &_inner_error_);
 #line 650 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5788 "CollectionPage.c"
-			goto __catch235_g_error;
+#line 5693 "CollectionPage.c"
+			goto __catch236_g_error;
 		}
 #line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = app_window_get_instance ();
@@ -5795,17 +5700,17 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow));
 #line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 5799 "CollectionPage.c"
+#line 5704 "CollectionPage.c"
 	}
-	goto __finally235;
-	__catch235_g_error:
+	goto __finally236;
+	__catch236_g_error:
 	{
 		GError* err = NULL;
-		AppWindow* _tmp17_ = NULL;
-		AppWindow* _tmp18_ = NULL;
-		GError* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
+		AppWindow* _tmp17_;
+		AppWindow* _tmp18_;
+		GError* _tmp19_;
+		gchar* _tmp20_;
+		gchar* _tmp21_;
 #line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		err = _inner_error_;
 #line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5830,9 +5735,9 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		_g_free0 (_tmp21_);
 #line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_error_free0 (err);
-#line 5834 "CollectionPage.c"
+#line 5739 "CollectionPage.c"
 	}
-	__finally235:
+	__finally236:
 #line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5843,27 +5748,27 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		g_clear_error (&_inner_error_);
 #line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5847 "CollectionPage.c"
+#line 5752 "CollectionPage.c"
 	}
 #line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 5851 "CollectionPage.c"
+#line 5756 "CollectionPage.c"
 }
 
 
 void collection_page_on_set_background (CollectionPage* self) {
 	GeeArrayList* photos = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	GeeList* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
-	GeeArrayList* _tmp5_ = NULL;
+	GeeArrayList* _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	GeeList* _tmp3_;
+	GeeCollection* _tmp4_;
+	GeeArrayList* _tmp5_;
 	gboolean desktop = FALSE;
 	gboolean screensaver = FALSE;
-	GeeArrayList* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	GeeArrayList* _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 #line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
 #line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5894,13 +5799,13 @@ void collection_page_on_set_background (CollectionPage* self) {
 	_tmp8_ = _tmp7_;
 #line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_ == 1) {
-#line 5898 "CollectionPage.c"
+#line 5803 "CollectionPage.c"
 		SetBackgroundPhotoDialog* dialog = NULL;
-		SetBackgroundPhotoDialog* _tmp9_ = NULL;
-		SetBackgroundPhotoDialog* _tmp10_ = NULL;
+		SetBackgroundPhotoDialog* _tmp9_;
+		SetBackgroundPhotoDialog* _tmp10_;
 		gboolean _tmp11_ = FALSE;
 		gboolean _tmp12_ = FALSE;
-		gboolean _tmp13_ = FALSE;
+		gboolean _tmp13_;
 #line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = set_background_photo_dialog_new ();
 #line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5917,16 +5822,16 @@ void collection_page_on_set_background (CollectionPage* self) {
 		screensaver = _tmp12_;
 #line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp13_) {
-#line 5921 "CollectionPage.c"
-			AppWindow* _tmp14_ = NULL;
-			AppWindow* _tmp15_ = NULL;
-			GeeArrayList* _tmp16_ = NULL;
-			gpointer _tmp17_ = NULL;
-			LibraryPhoto* _tmp18_ = NULL;
-			gboolean _tmp19_ = FALSE;
-			gboolean _tmp20_ = FALSE;
-			AppWindow* _tmp21_ = NULL;
-			AppWindow* _tmp22_ = NULL;
+#line 5826 "CollectionPage.c"
+			AppWindow* _tmp14_;
+			AppWindow* _tmp15_;
+			GeeArrayList* _tmp16_;
+			gpointer _tmp17_;
+			LibraryPhoto* _tmp18_;
+			gboolean _tmp19_;
+			gboolean _tmp20_;
+			AppWindow* _tmp21_;
+			AppWindow* _tmp22_;
 #line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = app_window_get_instance ();
 #line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5957,15 +5862,15 @@ void collection_page_on_set_background (CollectionPage* self) {
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE_WINDOW, PageWindow));
 #line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp22_);
-#line 5961 "CollectionPage.c"
+#line 5866 "CollectionPage.c"
 		}
 #line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (dialog);
-#line 5965 "CollectionPage.c"
+#line 5870 "CollectionPage.c"
 	} else {
-		GeeArrayList* _tmp23_ = NULL;
-		gint _tmp24_ = 0;
-		gint _tmp25_ = 0;
+		GeeArrayList* _tmp23_;
+		gint _tmp24_;
+		gint _tmp25_;
 #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = photos;
 #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5974,15 +5879,15 @@ void collection_page_on_set_background (CollectionPage* self) {
 		_tmp25_ = _tmp24_;
 #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp25_ > 1) {
-#line 5978 "CollectionPage.c"
+#line 5883 "CollectionPage.c"
 			SetBackgroundSlideshowDialog* dialog = NULL;
-			SetBackgroundSlideshowDialog* _tmp26_ = NULL;
+			SetBackgroundSlideshowDialog* _tmp26_;
 			gint delay = 0;
-			SetBackgroundSlideshowDialog* _tmp27_ = NULL;
+			SetBackgroundSlideshowDialog* _tmp27_;
 			gint _tmp28_ = 0;
 			gboolean _tmp29_ = FALSE;
 			gboolean _tmp30_ = FALSE;
-			gboolean _tmp31_ = FALSE;
+			gboolean _tmp31_;
 #line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp26_ = set_background_slideshow_dialog_new ();
 #line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6001,15 +5906,15 @@ void collection_page_on_set_background (CollectionPage* self) {
 			screensaver = _tmp30_;
 #line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp31_) {
-#line 6005 "CollectionPage.c"
-				AppWindow* _tmp32_ = NULL;
-				AppWindow* _tmp33_ = NULL;
-				GeeArrayList* _tmp34_ = NULL;
-				gint _tmp35_ = 0;
-				gboolean _tmp36_ = FALSE;
-				gboolean _tmp37_ = FALSE;
-				AppWindow* _tmp38_ = NULL;
-				AppWindow* _tmp39_ = NULL;
+#line 5910 "CollectionPage.c"
+				AppWindow* _tmp32_;
+				AppWindow* _tmp33_;
+				GeeArrayList* _tmp34_;
+				gint _tmp35_;
+				gboolean _tmp36_;
+				gboolean _tmp37_;
+				AppWindow* _tmp38_;
+				AppWindow* _tmp39_;
 #line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp32_ = app_window_get_instance ();
 #line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6036,55 +5941,55 @@ void collection_page_on_set_background (CollectionPage* self) {
 				page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PAGE_WINDOW, PageWindow));
 #line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp39_);
-#line 6040 "CollectionPage.c"
+#line 5945 "CollectionPage.c"
 			}
 #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (dialog);
-#line 6044 "CollectionPage.c"
+#line 5949 "CollectionPage.c"
 		}
 	}
 #line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photos);
-#line 6049 "CollectionPage.c"
+#line 5954 "CollectionPage.c"
 }
 
 
 static void collection_page_on_slideshow (CollectionPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	GeeList* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gboolean _tmp8_ = FALSE;
+	ViewCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	gint _tmp7_;
+	gboolean _tmp8_;
 	GeeList* sources = NULL;
-	GeeList* _tmp15_ = NULL;
+	GeeList* _tmp15_;
 	gboolean _tmp16_ = FALSE;
-	GeeList* _tmp17_ = NULL;
+	GeeList* _tmp17_;
 	Thumbnail* thumbnail = NULL;
-	ViewCollection* _tmp21_ = NULL;
-	ViewCollection* _tmp22_ = NULL;
-	GeeList* _tmp23_ = NULL;
-	gpointer _tmp24_ = NULL;
-	DataSource* _tmp25_ = NULL;
-	DataView* _tmp26_ = NULL;
-	Thumbnail* _tmp27_ = NULL;
-	Thumbnail* _tmp28_ = NULL;
+	ViewCollection* _tmp21_;
+	ViewCollection* _tmp22_;
+	GeeList* _tmp23_;
+	gpointer _tmp24_;
+	DataSource* _tmp25_;
+	DataView* _tmp26_;
+	Thumbnail* _tmp27_;
+	Thumbnail* _tmp28_;
 	LibraryPhoto* photo = NULL;
-	Thumbnail* _tmp29_ = NULL;
-	MediaSource* _tmp30_ = NULL;
-	LibraryPhoto* _tmp31_ = NULL;
-	LibraryPhoto* _tmp32_ = NULL;
-	AppWindow* _tmp33_ = NULL;
-	AppWindow* _tmp34_ = NULL;
-	LibraryPhotoSourceCollection* _tmp35_ = NULL;
-	ViewCollection* _tmp36_ = NULL;
-	ViewCollection* _tmp37_ = NULL;
-	LibraryPhoto* _tmp38_ = NULL;
-	SlideshowPage* _tmp39_ = NULL;
-	SlideshowPage* _tmp40_ = NULL;
+	Thumbnail* _tmp29_;
+	MediaSource* _tmp30_;
+	LibraryPhoto* _tmp31_;
+	LibraryPhoto* _tmp32_;
+	AppWindow* _tmp33_;
+	AppWindow* _tmp34_;
+	LibraryPhotoSourceCollection* _tmp35_;
+	ViewCollection* _tmp36_;
+	ViewCollection* _tmp37_;
+	LibraryPhoto* _tmp38_;
+	SlideshowPage* _tmp39_;
+	SlideshowPage* _tmp40_;
 #line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
 #line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6101,7 +6006,7 @@ static void collection_page_on_slideshow (CollectionPage* self) {
 	if (_tmp3_) {
 #line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6105 "CollectionPage.c"
+#line 6010 "CollectionPage.c"
 	}
 #line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -6115,10 +6020,10 @@ static void collection_page_on_slideshow (CollectionPage* self) {
 	_data_collection_unref0 (_tmp6_);
 #line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_) {
-#line 6119 "CollectionPage.c"
-		ViewCollection* _tmp9_ = NULL;
-		ViewCollection* _tmp10_ = NULL;
-		GeeList* _tmp11_ = NULL;
+#line 6024 "CollectionPage.c"
+		ViewCollection* _tmp9_;
+		ViewCollection* _tmp10_;
+		GeeList* _tmp11_;
 #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6131,11 +6036,11 @@ static void collection_page_on_slideshow (CollectionPage* self) {
 		_tmp4_ = _tmp11_;
 #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 6135 "CollectionPage.c"
+#line 6040 "CollectionPage.c"
 	} else {
-		ViewCollection* _tmp12_ = NULL;
-		ViewCollection* _tmp13_ = NULL;
-		GeeList* _tmp14_ = NULL;
+		ViewCollection* _tmp12_;
+		ViewCollection* _tmp13_;
+		GeeList* _tmp14_;
 #line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6148,7 +6053,7 @@ static void collection_page_on_slideshow (CollectionPage* self) {
 		_tmp4_ = _tmp14_;
 #line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 6152 "CollectionPage.c"
+#line 6057 "CollectionPage.c"
 	}
 #line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp15_ = _g_object_ref0 (_tmp4_);
@@ -6160,11 +6065,11 @@ static void collection_page_on_slideshow (CollectionPage* self) {
 	if (_tmp17_ == NULL) {
 #line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = TRUE;
-#line 6164 "CollectionPage.c"
+#line 6069 "CollectionPage.c"
 	} else {
-		GeeList* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
-		gint _tmp20_ = 0;
+		GeeList* _tmp18_;
+		gint _tmp19_;
+		gint _tmp20_;
 #line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = sources;
 #line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6173,7 +6078,7 @@ static void collection_page_on_slideshow (CollectionPage* self) {
 		_tmp20_ = _tmp19_;
 #line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp20_ == 0;
-#line 6177 "CollectionPage.c"
+#line 6082 "CollectionPage.c"
 	}
 #line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp16_) {
@@ -6183,7 +6088,7 @@ static void collection_page_on_slideshow (CollectionPage* self) {
 		_g_object_unref0 (_tmp4_);
 #line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6187 "CollectionPage.c"
+#line 6092 "CollectionPage.c"
 	}
 #line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -6217,7 +6122,7 @@ static void collection_page_on_slideshow (CollectionPage* self) {
 		_g_object_unref0 (_tmp4_);
 #line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6221 "CollectionPage.c"
+#line 6126 "CollectionPage.c"
 	}
 #line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = thumbnail;
@@ -6229,7 +6134,7 @@ static void collection_page_on_slideshow (CollectionPage* self) {
 	if (_tmp31_ == NULL) {
 #line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp30_);
-#line 6233 "CollectionPage.c"
+#line 6138 "CollectionPage.c"
 	}
 #line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp31_;
@@ -6247,7 +6152,7 @@ static void collection_page_on_slideshow (CollectionPage* self) {
 		_g_object_unref0 (_tmp4_);
 #line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6251 "CollectionPage.c"
+#line 6156 "CollectionPage.c"
 	}
 #line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = app_window_get_instance ();
@@ -6283,7 +6188,7 @@ static void collection_page_on_slideshow (CollectionPage* self) {
 	_g_object_unref0 (sources);
 #line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6287 "CollectionPage.c"
+#line 6192 "CollectionPage.c"
 }
 
 
@@ -6291,12 +6196,12 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e
 	CollectionPage * self;
 	gboolean result = FALSE;
 	GtkToolButton* rotate_button = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	GtkToolButton* _tmp2_ = NULL;
-	GtkToolButton* _tmp3_ = NULL;
-	GdkEventKey* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	GtkBuilder* _tmp0_;
+	GObject* _tmp1_;
+	GtkToolButton* _tmp2_;
+	GtkToolButton* _tmp3_;
+	GdkEventKey* _tmp7_;
+	gboolean _tmp8_;
 #line 706 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
 #line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6311,10 +6216,10 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e
 	_tmp3_ = rotate_button;
 #line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6315 "CollectionPage.c"
-		GtkToolButton* _tmp4_ = NULL;
-		GtkToolButton* _tmp5_ = NULL;
-		GtkToolButton* _tmp6_ = NULL;
+#line 6220 "CollectionPage.c"
+		GtkToolButton* _tmp4_;
+		GtkToolButton* _tmp5_;
+		GtkToolButton* _tmp6_;
 #line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = rotate_button;
 #line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6327,7 +6232,7 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e
 		_tmp6_ = rotate_button;
 #line 711 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CCW_TOOLTIP);
-#line 6331 "CollectionPage.c"
+#line 6236 "CollectionPage.c"
 	}
 #line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = event;
@@ -6339,7 +6244,7 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e
 	_g_object_unref0 (rotate_button);
 #line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6343 "CollectionPage.c"
+#line 6248 "CollectionPage.c"
 }
 
 
@@ -6347,12 +6252,12 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey*
 	CollectionPage * self;
 	gboolean result = FALSE;
 	GtkToolButton* rotate_button = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	GtkToolButton* _tmp2_ = NULL;
-	GtkToolButton* _tmp3_ = NULL;
-	GdkEventKey* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	GtkBuilder* _tmp0_;
+	GObject* _tmp1_;
+	GtkToolButton* _tmp2_;
+	GtkToolButton* _tmp3_;
+	GdkEventKey* _tmp7_;
+	gboolean _tmp8_;
 #line 717 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
 #line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6367,10 +6272,10 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey*
 	_tmp3_ = rotate_button;
 #line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6371 "CollectionPage.c"
-		GtkToolButton* _tmp4_ = NULL;
-		GtkToolButton* _tmp5_ = NULL;
-		GtkToolButton* _tmp6_ = NULL;
+#line 6276 "CollectionPage.c"
+		GtkToolButton* _tmp4_;
+		GtkToolButton* _tmp5_;
+		GtkToolButton* _tmp6_;
 #line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = rotate_button;
 #line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6383,7 +6288,7 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey*
 		_tmp6_ = rotate_button;
 #line 722 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP);
-#line 6387 "CollectionPage.c"
+#line 6292 "CollectionPage.c"
 	}
 #line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = event;
@@ -6395,22 +6300,22 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey*
 	_g_object_unref0 (rotate_button);
 #line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6399 "CollectionPage.c"
+#line 6304 "CollectionPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
 #line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 6406 "CollectionPage.c"
+#line 6311 "CollectionPage.c"
 }
 
 
 static SearchViewFilter* collection_page_real_get_search_view_filter (CheckerboardPage* base) {
 	CollectionPage * self;
 	SearchViewFilter* result = NULL;
-	CollectionPageCollectionSearchViewFilter* _tmp0_ = NULL;
-	SearchViewFilter* _tmp1_ = NULL;
+	CollectionPageCollectionSearchViewFilter* _tmp0_;
+	SearchViewFilter* _tmp1_;
 #line 728 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
 #line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6421,7 +6326,7 @@ static SearchViewFilter* collection_page_real_get_search_view_filter (Checkerboa
 	result = _tmp1_;
 #line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6425 "CollectionPage.c"
+#line 6330 "CollectionPage.c"
 }
 
 
@@ -6434,7 +6339,7 @@ static guint collection_page_collection_search_view_filter_real_get_criteria (Se
 	result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH);
 #line 24 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6438 "CollectionPage.c"
+#line 6343 "CollectionPage.c"
 }
 
 
@@ -6444,14 +6349,14 @@ CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view
 	self = (CollectionPageCollectionSearchViewFilter*) default_search_view_filter_construct (object_type);
 #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return self;
-#line 6448 "CollectionPage.c"
+#line 6353 "CollectionPage.c"
 }
 
 
 CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_new (void) {
 #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return collection_page_collection_search_view_filter_construct (COLLECTION_PAGE_TYPE_COLLECTION_SEARCH_VIEW_FILTER);
-#line 6455 "CollectionPage.c"
+#line 6360 "CollectionPage.c"
 }
 
 
@@ -6459,8 +6364,8 @@ static void collection_page_collection_search_view_filter_class_init (Collection
 #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_collection_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) collection_page_collection_search_view_filter_real_get_criteria;
-#line 6464 "CollectionPage.c"
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) collection_page_collection_search_view_filter_real_get_criteria;
+#line 6369 "CollectionPage.c"
 }
 
 
@@ -6486,39 +6391,39 @@ static void collection_page_class_init (CollectionPageClass * klass) {
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_type_class_add_private (klass, sizeof (CollectionPagePrivate));
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	((PageClass *) klass)->get_toolbar = (GtkToolbar* (*)(Page*)) collection_page_real_get_toolbar;
+	((PageClass *) klass)->get_toolbar = (GtkToolbar* (*) (Page *)) collection_page_real_get_toolbar;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) collection_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) collection_page_real_init_collect_ui_filenames;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) collection_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) collection_page_real_add_actions;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) collection_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) collection_page_real_remove_actions;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	((PageClass *) klass)->init_collect_injection_groups = (InjectionGroup** (*)(Page*, int*)) collection_page_real_init_collect_injection_groups;
+	((PageClass *) klass)->init_collect_injection_groups = (InjectionGroup** (*) (Page *, int*)) collection_page_real_init_collect_injection_groups;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	((PageClass *) klass)->init_actions = (void (*)(Page*, gint, gint)) collection_page_real_init_actions;
+	((PageClass *) klass)->init_actions = (void (*) (Page *, gint, gint)) collection_page_real_init_actions;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) collection_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) collection_page_real_update_actions;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	((CheckerboardPageClass *) klass)->on_item_activated = (void (*)(CheckerboardPage*, CheckerboardItem*, CheckerboardPageActivator, CheckerboardPageKeyboardModifiers*)) collection_page_real_on_item_activated;
+	((CheckerboardPageClass *) klass)->on_item_activated = (void (*) (CheckerboardPage *, CheckerboardItem*, CheckerboardPageActivator, CheckerboardPageKeyboardModifiers*)) collection_page_real_on_item_activated;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	((PageClass *) klass)->on_app_key_pressed = (gboolean (*)(Page*, GdkEventKey*)) collection_page_real_on_app_key_pressed;
+	((PageClass *) klass)->on_app_key_pressed = (gboolean (*) (Page *, GdkEventKey*)) collection_page_real_on_app_key_pressed;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	((MediaPageClass *) klass)->on_export = (void (*)(MediaPage*)) collection_page_real_on_export;
+	((MediaPageClass *) klass)->on_export = (void (*) (MediaPage *)) collection_page_real_on_export;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	((PageClass *) klass)->on_ctrl_pressed = (gboolean (*)(Page*, GdkEventKey*)) collection_page_real_on_ctrl_pressed;
+	((PageClass *) klass)->on_ctrl_pressed = (gboolean (*) (Page *, GdkEventKey*)) collection_page_real_on_ctrl_pressed;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	((PageClass *) klass)->on_ctrl_released = (gboolean (*)(Page*, GdkEventKey*)) collection_page_real_on_ctrl_released;
+	((PageClass *) klass)->on_ctrl_released = (gboolean (*) (Page *, GdkEventKey*)) collection_page_real_on_ctrl_released;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) collection_page_real_get_search_view_filter;
+	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) collection_page_real_get_search_view_filter;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = collection_page_finalize;
-#line 6517 "CollectionPage.c"
+#line 6422 "CollectionPage.c"
 }
 
 
 static void collection_page_instance_init (CollectionPage * self) {
-	CollectionPageCollectionSearchViewFilter* _tmp0_ = NULL;
+	CollectionPageCollectionSearchViewFilter* _tmp0_;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv = COLLECTION_PAGE_GET_PRIVATE (self);
 #line 29 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6527,11 +6432,11 @@ static void collection_page_instance_init (CollectionPage * self) {
 	_tmp0_ = collection_page_collection_search_view_filter_new ();
 #line 30 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv->search_filter = _tmp0_;
-#line 6531 "CollectionPage.c"
+#line 6436 "CollectionPage.c"
 }
 
 
-static void collection_page_finalize (GObject* obj) {
+static void collection_page_finalize (GObject * obj) {
 	CollectionPage * self;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COLLECTION_PAGE, CollectionPage);
@@ -6541,7 +6446,7 @@ static void collection_page_finalize (GObject* obj) {
 	_view_filter_unref0 (self->priv->search_filter);
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	G_OBJECT_CLASS (collection_page_parent_class)->finalize (obj);
-#line 6545 "CollectionPage.c"
+#line 6450 "CollectionPage.c"
 }
 
 
diff --git a/src/ColorTransformation.c b/src/ColorTransformation.c
index 05b6c8b..2297f3f 100644
--- a/src/ColorTransformation.c
+++ b/src/ColorTransformation.c
@@ -1,4 +1,4 @@
-/* ColorTransformation.c generated by valac 0.34.7, the Vala compiler
+/* ColorTransformation.c generated by valac 0.36.6, the Vala compiler
  * generated from ColorTransformation.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -699,7 +699,7 @@ PixelTransformer* pixel_transformer_new (void);
 PixelTransformer* pixel_transformer_construct (GType object_type);
 void pixel_transformer_attach_transformation (PixelTransformer* self, PixelTransformation* trans);
 PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformationBundle* self);
-static void pixel_transformation_bundle_finalize (PixelTransformationBundle* obj);
+static void pixel_transformation_bundle_finalize (PixelTransformationBundle * obj);
 #define PIXEL_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PIXEL_TRANSFORMATION, PixelTransformationPrivate))
 enum  {
 	PIXEL_TRANSFORMATION_DUMMY_PROPERTY
@@ -719,7 +719,7 @@ static void pixel_transformation_real_transform_pixel_rgb (PixelTransformation*
 static gchar* pixel_transformation_real_to_string (PixelTransformation* self);
 PixelTransformation* pixel_transformation_copy (PixelTransformation* self);
 static PixelTransformation* pixel_transformation_real_copy (PixelTransformation* self);
-static void pixel_transformation_finalize (PixelTransformation* obj);
+static void pixel_transformation_finalize (PixelTransformation * obj);
 enum  {
 	RGB_TRANSFORMATION_DUMMY_PROPERTY
 };
@@ -733,7 +733,7 @@ static void rgb_transformation_real_transform_pixel_hsv (PixelTransformation* ba
 static void rgb_transformation_real_transform_pixel_rgb (PixelTransformation* base, RGBAnalyticPixel* p, RGBAnalyticPixel* result);
 static gboolean rgb_transformation_real_is_identity (PixelTransformation* base);
 static PixelTransformation* rgb_transformation_real_copy (PixelTransformation* base);
-static void rgb_transformation_finalize (PixelTransformation* obj);
+static void rgb_transformation_finalize (PixelTransformation * obj);
 enum  {
 	HSV_TRANSFORMATION_DUMMY_PROPERTY
 };
@@ -747,7 +747,7 @@ enum  {
 #define TINT_TRANSFORMATION_INTENSITY_FACTOR 0.25f
 #define TINT_TRANSFORMATION_MIN_PARAMETER (-16.0f)
 #define TINT_TRANSFORMATION_MAX_PARAMETER 16.0f
-static void tint_transformation_finalize (PixelTransformation* obj);
+static void tint_transformation_finalize (PixelTransformation * obj);
 #define TEMPERATURE_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformationPrivate))
 enum  {
 	TEMPERATURE_TRANSFORMATION_DUMMY_PROPERTY
@@ -755,21 +755,21 @@ enum  {
 #define TEMPERATURE_TRANSFORMATION_INTENSITY_FACTOR 0.33f
 #define TEMPERATURE_TRANSFORMATION_MIN_PARAMETER (-16.0f)
 #define TEMPERATURE_TRANSFORMATION_MAX_PARAMETER 16.0f
-static void temperature_transformation_finalize (PixelTransformation* obj);
+static void temperature_transformation_finalize (PixelTransformation * obj);
 #define SATURATION_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SATURATION_TRANSFORMATION, SaturationTransformationPrivate))
 enum  {
 	SATURATION_TRANSFORMATION_DUMMY_PROPERTY
 };
 #define SATURATION_TRANSFORMATION_MIN_PARAMETER (-16.0f)
 #define SATURATION_TRANSFORMATION_MAX_PARAMETER 16.0f
-static void saturation_transformation_finalize (PixelTransformation* obj);
+static void saturation_transformation_finalize (PixelTransformation * obj);
 #define EXPOSURE_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformationPrivate))
 enum  {
 	EXPOSURE_TRANSFORMATION_DUMMY_PROPERTY
 };
 #define EXPOSURE_TRANSFORMATION_MIN_PARAMETER (-16.0f)
 #define EXPOSURE_TRANSFORMATION_MAX_PARAMETER 16.0f
-static void exposure_transformation_finalize (PixelTransformation* obj);
+static void exposure_transformation_finalize (PixelTransformation * obj);
 #define CONTRAST_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformationPrivate))
 enum  {
 	CONTRAST_TRANSFORMATION_DUMMY_PROPERTY
@@ -777,7 +777,7 @@ enum  {
 #define CONTRAST_TRANSFORMATION_MIN_PARAMETER (-16.0f)
 #define CONTRAST_TRANSFORMATION_MAX_PARAMETER 16.0f
 #define CONTRAST_TRANSFORMATION_MAX_CONTRAST_ADJUSTMENT 0.5f
-static void contrast_transformation_finalize (PixelTransformation* obj);
+static void contrast_transformation_finalize (PixelTransformation * obj);
 #define PIXEL_TRANSFORMER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PIXEL_TRANSFORMER, PixelTransformerPrivate))
 enum  {
 	PIXEL_TRANSFORMER_DUMMY_PROPERTY
@@ -790,7 +790,7 @@ void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTran
 void pixel_transformer_transform_pixbuf (PixelTransformer* self, GdkPixbuf* pixbuf, GCancellable* cancellable);
 void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPixbuf* source, GdkPixbuf* dest, GCancellable* cancellable);
 void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pixel_cache, int* fp_pixel_cache_length1, GdkPixbuf* dest);
-static void pixel_transformer_finalize (PixelTransformer* obj);
+static void pixel_transformer_finalize (PixelTransformer * obj);
 gpointer rgb_histogram_ref (gpointer instance);
 void rgb_histogram_unref (gpointer instance);
 GParamSpec* param_spec_rgb_histogram (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -814,7 +814,7 @@ static gint rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, gi
 static void rgb_histogram_smooth_extrema (RGBHistogram* self, gint** count_data, int* count_data_length1);
 static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self);
 GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self);
-static void rgb_histogram_finalize (RGBHistogram* obj);
+static void rgb_histogram_finalize (RGBHistogram * obj);
 gpointer intensity_histogram_ref (gpointer instance);
 void intensity_histogram_unref (gpointer instance);
 GParamSpec* param_spec_intensity_histogram (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -829,7 +829,7 @@ enum  {
 IntensityHistogram* intensity_histogram_new (GdkPixbuf* pixbuf);
 IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf* pixbuf);
 gfloat intensity_histogram_get_cumulative_probability (IntensityHistogram* self, gint level);
-static void intensity_histogram_finalize (IntensityHistogram* obj);
+static void intensity_histogram_finalize (IntensityHistogram * obj);
 #define EXPANSION_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformationPrivate))
 enum  {
 	EXPANSION_TRANSFORMATION_DUMMY_PROPERTY
@@ -845,7 +845,7 @@ gint expansion_transformation_get_white_point (ExpansionTransformation* self);
 gint expansion_transformation_get_black_point (ExpansionTransformation* self);
 static gboolean expansion_transformation_real_is_identity (PixelTransformation* base);
 static PixelTransformation* expansion_transformation_real_copy (PixelTransformation* base);
-static void expansion_transformation_finalize (PixelTransformation* obj);
+static void expansion_transformation_finalize (PixelTransformation * obj);
 #define SHADOW_DETAIL_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformationPrivate))
 enum  {
 	SHADOW_DETAIL_TRANSFORMATION_DUMMY_PROPERTY
@@ -869,12 +869,12 @@ gfloat hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationF
 static void shadow_detail_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* pixel, HSVAnalyticPixel* result);
 static PixelTransformation* shadow_detail_transformation_real_copy (PixelTransformation* base);
 static gboolean shadow_detail_transformation_real_is_identity (PixelTransformation* base);
-static void shadow_detail_transformation_finalize (PixelTransformation* obj);
+static void shadow_detail_transformation_finalize (PixelTransformation * obj);
 #define HERMITE_GAMMA_APPROXIMATION_FUNCTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION, HermiteGammaApproximationFunctionPrivate))
 enum  {
 	HERMITE_GAMMA_APPROXIMATION_FUNCTION_DUMMY_PROPERTY
 };
-static void hermite_gamma_approximation_function_finalize (HermiteGammaApproximationFunction* obj);
+static void hermite_gamma_approximation_function_finalize (HermiteGammaApproximationFunction * obj);
 #define HIGHLIGHT_DETAIL_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformationPrivate))
 enum  {
 	HIGHLIGHT_DETAIL_TRANSFORMATION_DUMMY_PROPERTY
@@ -888,7 +888,7 @@ enum  {
 static void highlight_detail_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* pixel, HSVAnalyticPixel* result);
 static PixelTransformation* highlight_detail_transformation_real_copy (PixelTransformation* base);
 static gboolean highlight_detail_transformation_real_is_identity (PixelTransformation* base);
-static void highlight_detail_transformation_finalize (PixelTransformation* obj);
+static void highlight_detail_transformation_finalize (PixelTransformation * obj);
 #define AUTO_ENHANCE_SHADOW_DETECT_MIN_INTENSITY 8
 #define AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY 100
 #define AUTO_ENHANCE_SHADOW_DETECT_INTENSITY_RANGE (AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY - AUTO_ENHANCE_SHADOW_DETECT_MIN_INTENSITY)
@@ -914,12 +914,12 @@ void rgb_analytic_pixel_init (RGBAnalyticPixel *self) {
 
 
 void rgb_analytic_pixel_init_from_components (RGBAnalyticPixel *self, gfloat red, gfloat green, gfloat blue) {
-	gfloat _tmp0_ = 0.0F;
-	gfloat _tmp1_ = 0.0F;
-	gfloat _tmp2_ = 0.0F;
-	gfloat _tmp3_ = 0.0F;
-	gfloat _tmp4_ = 0.0F;
-	gfloat _tmp5_ = 0.0F;
+	gfloat _tmp0_;
+	gfloat _tmp1_;
+	gfloat _tmp2_;
+	gfloat _tmp3_;
+	gfloat _tmp4_;
+	gfloat _tmp5_;
 #line 20 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	memset (self, 0, sizeof (RGBAnalyticPixel));
 #line 22 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -945,9 +945,9 @@ void rgb_analytic_pixel_init_from_components (RGBAnalyticPixel *self, gfloat red
 
 
 void rgb_analytic_pixel_init_from_quantized_components (RGBAnalyticPixel *self, guchar red_quantized, guchar green_quantized, guchar blue_quantized) {
-	guchar _tmp0_ = '\0';
-	guchar _tmp1_ = '\0';
-	guchar _tmp2_ = '\0';
+	guchar _tmp0_;
+	guchar _tmp1_;
+	guchar _tmp2_;
 #line 27 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	memset (self, 0, sizeof (RGBAnalyticPixel));
 #line 29 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -969,12 +969,12 @@ void rgb_analytic_pixel_init_from_quantized_components (RGBAnalyticPixel *self,
 void rgb_analytic_pixel_init_from_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel* hsv_pixel) {
 	RGBAnalyticPixel from_hsv = {0};
 	RGBAnalyticPixel _tmp0_ = {0};
-	RGBAnalyticPixel _tmp1_ = {0};
-	gfloat _tmp2_ = 0.0F;
-	RGBAnalyticPixel _tmp3_ = {0};
-	gfloat _tmp4_ = 0.0F;
-	RGBAnalyticPixel _tmp5_ = {0};
-	gfloat _tmp6_ = 0.0F;
+	RGBAnalyticPixel _tmp1_;
+	gfloat _tmp2_;
+	RGBAnalyticPixel _tmp3_;
+	gfloat _tmp4_;
+	RGBAnalyticPixel _tmp5_;
+	gfloat _tmp6_;
 #line 34 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (hsv_pixel != NULL);
 #line 34 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1007,7 +1007,7 @@ void rgb_analytic_pixel_init_from_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel*
 
 guchar rgb_analytic_pixel_quantized_red (RGBAnalyticPixel *self) {
 	guchar result = '\0';
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 #line 42 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = (*self).red;
 #line 42 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1020,7 +1020,7 @@ guchar rgb_analytic_pixel_quantized_red (RGBAnalyticPixel *self) {
 
 guchar rgb_analytic_pixel_quantized_green (RGBAnalyticPixel *self) {
 	guchar result = '\0';
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 #line 46 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = (*self).green;
 #line 46 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1033,7 +1033,7 @@ guchar rgb_analytic_pixel_quantized_green (RGBAnalyticPixel *self) {
 
 guchar rgb_analytic_pixel_quantized_blue (RGBAnalyticPixel *self) {
 	guchar result = '\0';
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 #line 50 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = (*self).blue;
 #line 50 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1048,9 +1048,9 @@ gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, RGBAnalyticPixel* rh
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	gfloat _tmp2_ = 0.0F;
-	RGBAnalyticPixel* _tmp3_ = NULL;
-	gfloat _tmp4_ = 0.0F;
+	gfloat _tmp2_;
+	RGBAnalyticPixel* _tmp3_;
+	gfloat _tmp4_;
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = (*self).red;
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1060,9 +1060,9 @@ gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, RGBAnalyticPixel* rh
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ == _tmp4_) {
 #line 1063 "ColorTransformation.c"
-		gfloat _tmp5_ = 0.0F;
-		RGBAnalyticPixel* _tmp6_ = NULL;
-		gfloat _tmp7_ = 0.0F;
+		gfloat _tmp5_;
+		RGBAnalyticPixel* _tmp6_;
+		gfloat _tmp7_;
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = (*self).green;
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1080,9 +1080,9 @@ gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, RGBAnalyticPixel* rh
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp1_) {
 #line 1083 "ColorTransformation.c"
-		gfloat _tmp8_ = 0.0F;
-		RGBAnalyticPixel* _tmp9_ = NULL;
-		gfloat _tmp10_ = 0.0F;
+		gfloat _tmp8_;
+		RGBAnalyticPixel* _tmp9_;
+		gfloat _tmp10_;
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_ = (*self).blue;
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1107,9 +1107,9 @@ gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, RGBAnalyticPixel* rh
 
 guint rgb_analytic_pixel_hash_code (RGBAnalyticPixel *self) {
 	guint result = 0U;
-	gfloat _tmp0_ = 0.0F;
-	gfloat _tmp1_ = 0.0F;
-	gfloat _tmp2_ = 0.0F;
+	gfloat _tmp0_;
+	gfloat _tmp1_;
+	gfloat _tmp2_;
 #line 58 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = (*self).red;
 #line 58 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1180,12 +1180,12 @@ void hsv_analytic_pixel_init (HSVAnalyticPixel *self) {
 
 
 void hsv_analytic_pixel_init_from_components (HSVAnalyticPixel *self, gfloat hue, gfloat saturation, gfloat light_value) {
-	gfloat _tmp0_ = 0.0F;
-	gfloat _tmp1_ = 0.0F;
-	gfloat _tmp2_ = 0.0F;
-	gfloat _tmp3_ = 0.0F;
-	gfloat _tmp4_ = 0.0F;
-	gfloat _tmp5_ = 0.0F;
+	gfloat _tmp0_;
+	gfloat _tmp1_;
+	gfloat _tmp2_;
+	gfloat _tmp3_;
+	gfloat _tmp4_;
+	gfloat _tmp5_;
 #line 80 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	memset (self, 0, sizeof (HSVAnalyticPixel));
 #line 82 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1211,9 +1211,9 @@ void hsv_analytic_pixel_init_from_components (HSVAnalyticPixel *self, gfloat hue
 
 
 void hsv_analytic_pixel_init_from_quantized_components (HSVAnalyticPixel *self, guchar hue_quantized, guchar saturation_quantized, guchar light_value_quantized) {
-	guchar _tmp0_ = '\0';
-	guchar _tmp1_ = '\0';
-	guchar _tmp2_ = '\0';
+	guchar _tmp0_;
+	guchar _tmp1_;
+	guchar _tmp2_;
 #line 87 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	memset (self, 0, sizeof (HSVAnalyticPixel));
 #line 89 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1234,33 +1234,33 @@ void hsv_analytic_pixel_init_from_quantized_components (HSVAnalyticPixel *self,
 
 void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* p) {
 	gfloat max_component = 0.0F;
-	RGBAnalyticPixel _tmp0_ = {0};
-	gfloat _tmp1_ = 0.0F;
-	RGBAnalyticPixel _tmp2_ = {0};
-	gfloat _tmp3_ = 0.0F;
-	gfloat _tmp4_ = 0.0F;
-	RGBAnalyticPixel _tmp5_ = {0};
-	gfloat _tmp6_ = 0.0F;
-	gfloat _tmp7_ = 0.0F;
+	RGBAnalyticPixel _tmp0_;
+	gfloat _tmp1_;
+	RGBAnalyticPixel _tmp2_;
+	gfloat _tmp3_;
+	gfloat _tmp4_;
+	RGBAnalyticPixel _tmp5_;
+	gfloat _tmp6_;
+	gfloat _tmp7_;
 	gfloat min_component = 0.0F;
-	RGBAnalyticPixel _tmp8_ = {0};
-	gfloat _tmp9_ = 0.0F;
-	RGBAnalyticPixel _tmp10_ = {0};
-	gfloat _tmp11_ = 0.0F;
-	gfloat _tmp12_ = 0.0F;
-	RGBAnalyticPixel _tmp13_ = {0};
-	gfloat _tmp14_ = 0.0F;
-	gfloat _tmp15_ = 0.0F;
-	gfloat _tmp16_ = 0.0F;
+	RGBAnalyticPixel _tmp8_;
+	gfloat _tmp9_;
+	RGBAnalyticPixel _tmp10_;
+	gfloat _tmp11_;
+	gfloat _tmp12_;
+	RGBAnalyticPixel _tmp13_;
+	gfloat _tmp14_;
+	gfloat _tmp15_;
+	gfloat _tmp16_;
 	gfloat _tmp17_ = 0.0F;
-	gfloat _tmp18_ = 0.0F;
-	gfloat _tmp22_ = 0.0F;
-	gfloat _tmp53_ = 0.0F;
-	gfloat _tmp54_ = 0.0F;
-	gfloat _tmp55_ = 0.0F;
-	gfloat _tmp56_ = 0.0F;
-	gfloat _tmp57_ = 0.0F;
-	gfloat _tmp58_ = 0.0F;
+	gfloat _tmp18_;
+	gfloat _tmp22_;
+	gfloat _tmp53_;
+	gfloat _tmp54_;
+	gfloat _tmp55_;
+	gfloat _tmp56_;
+	gfloat _tmp57_;
+	gfloat _tmp58_;
 #line 94 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (p != NULL);
 #line 94 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1310,9 +1310,9 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 #line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp18_ != 0.0f) {
 #line 1313 "ColorTransformation.c"
-		gfloat _tmp19_ = 0.0F;
-		gfloat _tmp20_ = 0.0F;
-		gfloat _tmp21_ = 0.0F;
+		gfloat _tmp19_;
+		gfloat _tmp20_;
+		gfloat _tmp21_;
 #line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp19_ = max_component;
 #line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1338,14 +1338,14 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 #line 1339 "ColorTransformation.c"
 	} else {
 		gfloat delta = 0.0F;
-		gfloat _tmp23_ = 0.0F;
-		gfloat _tmp24_ = 0.0F;
-		RGBAnalyticPixel _tmp25_ = {0};
-		gfloat _tmp26_ = 0.0F;
-		gfloat _tmp27_ = 0.0F;
-		gfloat _tmp49_ = 0.0F;
-		gfloat _tmp50_ = 0.0F;
-		gfloat _tmp52_ = 0.0F;
+		gfloat _tmp23_;
+		gfloat _tmp24_;
+		RGBAnalyticPixel _tmp25_;
+		gfloat _tmp26_;
+		gfloat _tmp27_;
+		gfloat _tmp49_;
+		gfloat _tmp50_;
+		gfloat _tmp52_;
 #line 105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp23_ = max_component;
 #line 105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1361,11 +1361,11 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 #line 106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp26_ == _tmp27_) {
 #line 1364 "ColorTransformation.c"
-			RGBAnalyticPixel _tmp28_ = {0};
-			gfloat _tmp29_ = 0.0F;
-			RGBAnalyticPixel _tmp30_ = {0};
-			gfloat _tmp31_ = 0.0F;
-			gfloat _tmp32_ = 0.0F;
+			RGBAnalyticPixel _tmp28_;
+			gfloat _tmp29_;
+			RGBAnalyticPixel _tmp30_;
+			gfloat _tmp31_;
+			gfloat _tmp32_;
 #line 107 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp28_ = *p;
 #line 107 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1380,9 +1380,9 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 			(*self).hue = (_tmp29_ - _tmp31_) / _tmp32_;
 #line 1382 "ColorTransformation.c"
 		} else {
-			RGBAnalyticPixel _tmp33_ = {0};
-			gfloat _tmp34_ = 0.0F;
-			gfloat _tmp35_ = 0.0F;
+			RGBAnalyticPixel _tmp33_;
+			gfloat _tmp34_;
+			gfloat _tmp35_;
 #line 108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp33_ = *p;
 #line 108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1392,11 +1392,11 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 #line 108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp34_ == _tmp35_) {
 #line 1395 "ColorTransformation.c"
-				RGBAnalyticPixel _tmp36_ = {0};
-				gfloat _tmp37_ = 0.0F;
-				RGBAnalyticPixel _tmp38_ = {0};
-				gfloat _tmp39_ = 0.0F;
-				gfloat _tmp40_ = 0.0F;
+				RGBAnalyticPixel _tmp36_;
+				gfloat _tmp37_;
+				RGBAnalyticPixel _tmp38_;
+				gfloat _tmp39_;
+				gfloat _tmp40_;
 #line 109 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp36_ = *p;
 #line 109 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1411,9 +1411,9 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 				(*self).hue = 2.0f + ((_tmp37_ - _tmp39_) / _tmp40_);
 #line 1413 "ColorTransformation.c"
 			} else {
-				RGBAnalyticPixel _tmp41_ = {0};
-				gfloat _tmp42_ = 0.0F;
-				gfloat _tmp43_ = 0.0F;
+				RGBAnalyticPixel _tmp41_;
+				gfloat _tmp42_;
+				gfloat _tmp43_;
 #line 110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp41_ = *p;
 #line 110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1423,11 +1423,11 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 #line 110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp42_ == _tmp43_) {
 #line 1426 "ColorTransformation.c"
-					RGBAnalyticPixel _tmp44_ = {0};
-					gfloat _tmp45_ = 0.0F;
-					RGBAnalyticPixel _tmp46_ = {0};
-					gfloat _tmp47_ = 0.0F;
-					gfloat _tmp48_ = 0.0F;
+					RGBAnalyticPixel _tmp44_;
+					gfloat _tmp45_;
+					RGBAnalyticPixel _tmp46_;
+					gfloat _tmp47_;
+					gfloat _tmp48_;
 #line 111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp44_ = *p;
 #line 111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1453,7 +1453,7 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 #line 115 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp50_ < 0.0f) {
 #line 1456 "ColorTransformation.c"
-			gfloat _tmp51_ = 0.0F;
+			gfloat _tmp51_;
 #line 116 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp51_ = (*self).hue;
 #line 116 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1490,7 +1490,7 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 
 void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result) {
 	RGBAnalyticPixel _result_ = {0};
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 #line 127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rgb_analytic_pixel_init (&_result_);
 #line 129 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1498,9 +1498,9 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 #line 129 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp0_ == 0.0f) {
 #line 1501 "ColorTransformation.c"
-		gfloat _tmp1_ = 0.0F;
-		gfloat _tmp2_ = 0.0F;
-		gfloat _tmp3_ = 0.0F;
+		gfloat _tmp1_;
+		gfloat _tmp2_;
+		gfloat _tmp3_;
 #line 130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = (*self).light_value;
 #line 130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1516,27 +1516,27 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 #line 1517 "ColorTransformation.c"
 	} else {
 		gfloat hue_denorm = 0.0F;
-		gfloat _tmp4_ = 0.0F;
-		gfloat _tmp5_ = 0.0F;
+		gfloat _tmp4_;
+		gfloat _tmp5_;
 		gfloat hue_hexant = 0.0F;
-		gfloat _tmp6_ = 0.0F;
+		gfloat _tmp6_;
 		gint hexant_i_part = 0;
-		gfloat _tmp7_ = 0.0F;
+		gfloat _tmp7_;
 		gfloat hexant_f_part = 0.0F;
-		gfloat _tmp8_ = 0.0F;
-		gint _tmp9_ = 0;
+		gfloat _tmp8_;
+		gint _tmp9_;
 		gfloat p = 0.0F;
-		gfloat _tmp10_ = 0.0F;
-		gfloat _tmp11_ = 0.0F;
+		gfloat _tmp10_;
+		gfloat _tmp11_;
 		gfloat q = 0.0F;
-		gfloat _tmp12_ = 0.0F;
-		gfloat _tmp13_ = 0.0F;
-		gfloat _tmp14_ = 0.0F;
+		gfloat _tmp12_;
+		gfloat _tmp13_;
+		gfloat _tmp14_;
 		gfloat t = 0.0F;
-		gfloat _tmp15_ = 0.0F;
-		gfloat _tmp16_ = 0.0F;
-		gfloat _tmp17_ = 0.0F;
-		gint _tmp18_ = 0;
+		gfloat _tmp15_;
+		gfloat _tmp16_;
+		gfloat _tmp17_;
+		gint _tmp18_;
 #line 134 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = (*self).hue;
 #line 134 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1593,9 +1593,9 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 			case 0:
 #line 1595 "ColorTransformation.c"
 			{
-				gfloat _tmp19_ = 0.0F;
-				gfloat _tmp20_ = 0.0F;
-				gfloat _tmp21_ = 0.0F;
+				gfloat _tmp19_;
+				gfloat _tmp20_;
+				gfloat _tmp21_;
 #line 159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp19_ = (*self).light_value;
 #line 159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1616,9 +1616,9 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 			case 1:
 #line 1618 "ColorTransformation.c"
 			{
-				gfloat _tmp22_ = 0.0F;
-				gfloat _tmp23_ = 0.0F;
-				gfloat _tmp24_ = 0.0F;
+				gfloat _tmp22_;
+				gfloat _tmp23_;
+				gfloat _tmp24_;
 #line 165 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp22_ = q;
 #line 165 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1639,9 +1639,9 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 			case 2:
 #line 1641 "ColorTransformation.c"
 			{
-				gfloat _tmp25_ = 0.0F;
-				gfloat _tmp26_ = 0.0F;
-				gfloat _tmp27_ = 0.0F;
+				gfloat _tmp25_;
+				gfloat _tmp26_;
+				gfloat _tmp27_;
 #line 171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp25_ = p;
 #line 171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1662,9 +1662,9 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 			case 3:
 #line 1664 "ColorTransformation.c"
 			{
-				gfloat _tmp28_ = 0.0F;
-				gfloat _tmp29_ = 0.0F;
-				gfloat _tmp30_ = 0.0F;
+				gfloat _tmp28_;
+				gfloat _tmp29_;
+				gfloat _tmp30_;
 #line 177 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp28_ = p;
 #line 177 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1685,9 +1685,9 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 			case 4:
 #line 1687 "ColorTransformation.c"
 			{
-				gfloat _tmp31_ = 0.0F;
-				gfloat _tmp32_ = 0.0F;
-				gfloat _tmp33_ = 0.0F;
+				gfloat _tmp31_;
+				gfloat _tmp32_;
+				gfloat _tmp33_;
 #line 183 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp31_ = t;
 #line 183 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1708,9 +1708,9 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 			case 5:
 #line 1710 "ColorTransformation.c"
 			{
-				gfloat _tmp34_ = 0.0F;
-				gfloat _tmp35_ = 0.0F;
-				gfloat _tmp36_ = 0.0F;
+				gfloat _tmp34_;
+				gfloat _tmp35_;
+				gfloat _tmp36_;
 #line 189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp34_ = (*self).light_value;
 #line 189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1748,9 +1748,9 @@ gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, HSVAnalyticPixel* rh
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	gfloat _tmp2_ = 0.0F;
-	HSVAnalyticPixel _tmp3_ = {0};
-	gfloat _tmp4_ = 0.0F;
+	gfloat _tmp2_;
+	HSVAnalyticPixel _tmp3_;
+	gfloat _tmp4_;
 #line 202 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (rhs != NULL, FALSE);
 #line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1762,9 +1762,9 @@ gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, HSVAnalyticPixel* rh
 #line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ == _tmp4_) {
 #line 1764 "ColorTransformation.c"
-		gfloat _tmp5_ = 0.0F;
-		HSVAnalyticPixel _tmp6_ = {0};
-		gfloat _tmp7_ = 0.0F;
+		gfloat _tmp5_;
+		HSVAnalyticPixel _tmp6_;
+		gfloat _tmp7_;
 #line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = (*self).saturation;
 #line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1782,9 +1782,9 @@ gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, HSVAnalyticPixel* rh
 #line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp1_) {
 #line 1784 "ColorTransformation.c"
-		gfloat _tmp8_ = 0.0F;
-		HSVAnalyticPixel _tmp9_ = {0};
-		gfloat _tmp10_ = 0.0F;
+		gfloat _tmp8_;
+		HSVAnalyticPixel _tmp9_;
+		gfloat _tmp10_;
 #line 204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_ = (*self).light_value;
 #line 204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1809,9 +1809,9 @@ gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, HSVAnalyticPixel* rh
 
 guint hsv_analytic_pixel_hash_code (HSVAnalyticPixel *self) {
 	guint result = 0U;
-	gfloat _tmp0_ = 0.0F;
-	gfloat _tmp1_ = 0.0F;
-	gfloat _tmp2_ = 0.0F;
+	gfloat _tmp0_;
+	gfloat _tmp1_;
+	gfloat _tmp2_;
 #line 208 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = (*self).hue;
 #line 208 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1918,8 +1918,8 @@ static gpointer _pixel_transformation_bundle_ref0 (gpointer self) {
 
 PixelTransformationBundle* pixel_transformation_bundle_get_copied_color_adjustments (void) {
 	PixelTransformationBundle* result = NULL;
-	PixelTransformationBundle* _tmp0_ = NULL;
-	PixelTransformationBundle* _tmp1_ = NULL;
+	PixelTransformationBundle* _tmp0_;
+	PixelTransformationBundle* _tmp1_;
 #line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixel_transformation_bundle_copied_color_adjustments;
 #line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1933,8 +1933,8 @@ PixelTransformationBundle* pixel_transformation_bundle_get_copied_color_adjustme
 
 
 void pixel_transformation_bundle_set_copied_color_adjustments (PixelTransformationBundle* adjustments) {
-	PixelTransformationBundle* _tmp0_ = NULL;
-	PixelTransformationBundle* _tmp1_ = NULL;
+	PixelTransformationBundle* _tmp0_;
+	PixelTransformationBundle* _tmp1_;
 #line 247 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (adjustments));
 #line 248 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1951,7 +1951,7 @@ void pixel_transformation_bundle_set_copied_color_adjustments (PixelTransformati
 
 gboolean pixel_transformation_bundle_has_copied_color_adjustments (void) {
 	gboolean result = FALSE;
-	PixelTransformationBundle* _tmp0_ = NULL;
+	PixelTransformationBundle* _tmp0_;
 #line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixel_transformation_bundle_copied_color_adjustments;
 #line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1963,10 +1963,10 @@ gboolean pixel_transformation_bundle_has_copied_color_adjustments (void) {
 
 
 void pixel_transformation_bundle_set (PixelTransformationBundle* self, PixelTransformation* transformation) {
-	GeeHashMap* _tmp0_ = NULL;
-	PixelTransformation* _tmp1_ = NULL;
-	PixelTransformationType _tmp2_ = 0;
-	PixelTransformation* _tmp3_ = NULL;
+	GeeHashMap* _tmp0_;
+	PixelTransformation* _tmp1_;
+	PixelTransformationType _tmp2_;
+	PixelTransformation* _tmp3_;
 #line 255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self));
 #line 255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -1986,22 +1986,22 @@ void pixel_transformation_bundle_set (PixelTransformationBundle* self, PixelTran
 
 
 void pixel_transformation_bundle_set_to_identity (PixelTransformationBundle* self) {
-	ExpansionTransformation* _tmp0_ = NULL;
-	ExpansionTransformation* _tmp1_ = NULL;
-	ShadowDetailTransformation* _tmp2_ = NULL;
-	ShadowDetailTransformation* _tmp3_ = NULL;
-	HighlightDetailTransformation* _tmp4_ = NULL;
-	HighlightDetailTransformation* _tmp5_ = NULL;
-	TemperatureTransformation* _tmp6_ = NULL;
-	TemperatureTransformation* _tmp7_ = NULL;
-	TintTransformation* _tmp8_ = NULL;
-	TintTransformation* _tmp9_ = NULL;
-	SaturationTransformation* _tmp10_ = NULL;
-	SaturationTransformation* _tmp11_ = NULL;
-	ExposureTransformation* _tmp12_ = NULL;
-	ExposureTransformation* _tmp13_ = NULL;
-	ContrastTransformation* _tmp14_ = NULL;
-	ContrastTransformation* _tmp15_ = NULL;
+	ExpansionTransformation* _tmp0_;
+	ExpansionTransformation* _tmp1_;
+	ShadowDetailTransformation* _tmp2_;
+	ShadowDetailTransformation* _tmp3_;
+	HighlightDetailTransformation* _tmp4_;
+	HighlightDetailTransformation* _tmp5_;
+	TemperatureTransformation* _tmp6_;
+	TemperatureTransformation* _tmp7_;
+	TintTransformation* _tmp8_;
+	TintTransformation* _tmp9_;
+	SaturationTransformation* _tmp10_;
+	SaturationTransformation* _tmp11_;
+	ExposureTransformation* _tmp12_;
+	ExposureTransformation* _tmp13_;
+	ContrastTransformation* _tmp14_;
+	ContrastTransformation* _tmp15_;
 #line 259 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self));
 #line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2074,37 +2074,37 @@ void pixel_transformation_bundle_set_to_identity (PixelTransformationBundle* sel
 
 void pixel_transformation_bundle_load (PixelTransformationBundle* self, KeyValueMap* store) {
 	gchar* expansion_params_encoded = NULL;
-	KeyValueMap* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	KeyValueMap* _tmp8_ = NULL;
-	gfloat _tmp9_ = 0.0F;
-	ShadowDetailTransformation* _tmp10_ = NULL;
-	ShadowDetailTransformation* _tmp11_ = NULL;
-	KeyValueMap* _tmp12_ = NULL;
-	gfloat _tmp13_ = 0.0F;
-	HighlightDetailTransformation* _tmp14_ = NULL;
-	HighlightDetailTransformation* _tmp15_ = NULL;
-	KeyValueMap* _tmp16_ = NULL;
-	gfloat _tmp17_ = 0.0F;
-	TemperatureTransformation* _tmp18_ = NULL;
-	TemperatureTransformation* _tmp19_ = NULL;
-	KeyValueMap* _tmp20_ = NULL;
-	gfloat _tmp21_ = 0.0F;
-	TintTransformation* _tmp22_ = NULL;
-	TintTransformation* _tmp23_ = NULL;
-	KeyValueMap* _tmp24_ = NULL;
-	gfloat _tmp25_ = 0.0F;
-	SaturationTransformation* _tmp26_ = NULL;
-	SaturationTransformation* _tmp27_ = NULL;
-	KeyValueMap* _tmp28_ = NULL;
-	gfloat _tmp29_ = 0.0F;
-	ExposureTransformation* _tmp30_ = NULL;
-	ExposureTransformation* _tmp31_ = NULL;
-	KeyValueMap* _tmp32_ = NULL;
-	gfloat _tmp33_ = 0.0F;
-	ContrastTransformation* _tmp34_ = NULL;
-	ContrastTransformation* _tmp35_ = NULL;
+	KeyValueMap* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	KeyValueMap* _tmp8_;
+	gfloat _tmp9_;
+	ShadowDetailTransformation* _tmp10_;
+	ShadowDetailTransformation* _tmp11_;
+	KeyValueMap* _tmp12_;
+	gfloat _tmp13_;
+	HighlightDetailTransformation* _tmp14_;
+	HighlightDetailTransformation* _tmp15_;
+	KeyValueMap* _tmp16_;
+	gfloat _tmp17_;
+	TemperatureTransformation* _tmp18_;
+	TemperatureTransformation* _tmp19_;
+	KeyValueMap* _tmp20_;
+	gfloat _tmp21_;
+	TintTransformation* _tmp22_;
+	TintTransformation* _tmp23_;
+	KeyValueMap* _tmp24_;
+	gfloat _tmp25_;
+	SaturationTransformation* _tmp26_;
+	SaturationTransformation* _tmp27_;
+	KeyValueMap* _tmp28_;
+	gfloat _tmp29_;
+	ExposureTransformation* _tmp30_;
+	ExposureTransformation* _tmp31_;
+	KeyValueMap* _tmp32_;
+	gfloat _tmp33_;
+	ContrastTransformation* _tmp34_;
+	ContrastTransformation* _tmp35_;
 #line 270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self));
 #line 270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2120,8 +2120,8 @@ void pixel_transformation_bundle_load (PixelTransformationBundle* self, KeyValue
 #line 272 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_strcmp0 (_tmp2_, "-") == 0) {
 #line 2122 "ColorTransformation.c"
-		ExpansionTransformation* _tmp3_ = NULL;
-		ExpansionTransformation* _tmp4_ = NULL;
+		ExpansionTransformation* _tmp3_;
+		ExpansionTransformation* _tmp4_;
 #line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = expansion_transformation_new_from_extrema (0, 255);
 #line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2132,9 +2132,9 @@ void pixel_transformation_bundle_load (PixelTransformationBundle* self, KeyValue
 		_pixel_transformation_unref0 (_tmp4_);
 #line 2133 "ColorTransformation.c"
 	} else {
-		const gchar* _tmp5_ = NULL;
-		ExpansionTransformation* _tmp6_ = NULL;
-		ExpansionTransformation* _tmp7_ = NULL;
+		const gchar* _tmp5_;
+		ExpansionTransformation* _tmp6_;
+		ExpansionTransformation* _tmp7_;
 #line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = expansion_params_encoded;
 #line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2240,33 +2240,33 @@ void pixel_transformation_bundle_load (PixelTransformationBundle* self, KeyValue
 KeyValueMap* pixel_transformation_bundle_save (PixelTransformationBundle* self, const gchar* group) {
 	KeyValueMap* result = NULL;
 	KeyValueMap* store = NULL;
-	const gchar* _tmp0_ = NULL;
-	KeyValueMap* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	KeyValueMap* _tmp1_;
 	ExpansionTransformation* new_expansion_trans = NULL;
-	PixelTransformation* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	PixelTransformation* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 	ShadowDetailTransformation* new_shadows_trans = NULL;
-	PixelTransformation* _tmp5_ = NULL;
-	gfloat _tmp6_ = 0.0F;
+	PixelTransformation* _tmp5_;
+	gfloat _tmp6_;
 	HighlightDetailTransformation* new_highlight_trans = NULL;
-	PixelTransformation* _tmp7_ = NULL;
-	gfloat _tmp8_ = 0.0F;
+	PixelTransformation* _tmp7_;
+	gfloat _tmp8_;
 	TemperatureTransformation* new_temp_trans = NULL;
-	PixelTransformation* _tmp9_ = NULL;
-	gfloat _tmp10_ = 0.0F;
+	PixelTransformation* _tmp9_;
+	gfloat _tmp10_;
 	TintTransformation* new_tint_trans = NULL;
-	PixelTransformation* _tmp11_ = NULL;
-	gfloat _tmp12_ = 0.0F;
+	PixelTransformation* _tmp11_;
+	gfloat _tmp12_;
 	SaturationTransformation* new_sat_trans = NULL;
-	PixelTransformation* _tmp13_ = NULL;
-	gfloat _tmp14_ = 0.0F;
+	PixelTransformation* _tmp13_;
+	gfloat _tmp14_;
 	ExposureTransformation* new_exposure_trans = NULL;
-	PixelTransformation* _tmp15_ = NULL;
-	gfloat _tmp16_ = 0.0F;
+	PixelTransformation* _tmp15_;
+	gfloat _tmp16_;
 	ContrastTransformation* new_contrast_trans = NULL;
-	PixelTransformation* _tmp17_ = NULL;
-	gfloat _tmp18_ = 0.0F;
+	PixelTransformation* _tmp17_;
+	gfloat _tmp18_;
 #line 286 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), NULL);
 #line 286 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2387,9 +2387,9 @@ KeyValueMap* pixel_transformation_bundle_save (PixelTransformationBundle* self,
 
 gint pixel_transformation_bundle_get_count (PixelTransformationBundle* self) {
 	gint result = 0;
-	GeeHashMap* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeHashMap* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), 0);
 #line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2408,9 +2408,9 @@ gint pixel_transformation_bundle_get_count (PixelTransformationBundle* self) {
 
 PixelTransformation* pixel_transformation_bundle_get_transformation (PixelTransformationBundle* self, PixelTransformationType type) {
 	PixelTransformation* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	PixelTransformationType _tmp1_ = 0;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	PixelTransformationType _tmp1_;
+	gpointer _tmp2_;
 #line 336 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), NULL);
 #line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2429,9 +2429,9 @@ PixelTransformation* pixel_transformation_bundle_get_transformation (PixelTransf
 
 GeeIterable* pixel_transformation_bundle_get_transformations (PixelTransformationBundle* self) {
 	GeeIterable* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp2_;
 #line 340 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), NULL);
 #line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2455,10 +2455,10 @@ gboolean pixel_transformation_bundle_is_identity (PixelTransformationBundle* sel
 #line 2455 "ColorTransformation.c"
 	{
 		GeeIterator* _adjustment_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterable* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterable* _tmp1_;
+		GeeIterator* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = pixel_transformation_bundle_get_transformations (self);
 #line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2474,13 +2474,13 @@ gboolean pixel_transformation_bundle_is_identity (PixelTransformationBundle* sel
 #line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
 #line 2476 "ColorTransformation.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			PixelTransformation* adjustment = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
-			PixelTransformation* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			PixelTransformation* _tmp8_;
+			gboolean _tmp9_;
 #line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp4_ = _adjustment_it;
 #line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2532,7 +2532,7 @@ gboolean pixel_transformation_bundle_is_identity (PixelTransformationBundle* sel
 PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransformationBundle* self) {
 	PixelTransformer* result = NULL;
 	PixelTransformer* transformer = NULL;
-	PixelTransformer* _tmp0_ = NULL;
+	PixelTransformer* _tmp0_;
 #line 353 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), NULL);
 #line 354 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2542,10 +2542,10 @@ PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransfo
 #line 2542 "ColorTransformation.c"
 	{
 		GeeIterator* _transformation_it = NULL;
-		GeeIterable* _tmp1_ = NULL;
-		GeeIterable* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
+		GeeIterable* _tmp1_;
+		GeeIterable* _tmp2_;
+		GeeIterator* _tmp3_;
+		GeeIterator* _tmp4_;
 #line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = pixel_transformation_bundle_get_transformations (self);
 #line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2561,13 +2561,13 @@ PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransfo
 #line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
 #line 2563 "ColorTransformation.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			PixelTransformation* transformation = NULL;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
-			PixelTransformer* _tmp9_ = NULL;
-			PixelTransformation* _tmp10_ = NULL;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			PixelTransformer* _tmp9_;
+			PixelTransformation* _tmp10_;
 #line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp5_ = _transformation_it;
 #line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2609,7 +2609,7 @@ PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransfo
 PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformationBundle* self) {
 	PixelTransformationBundle* result = NULL;
 	PixelTransformationBundle* bundle = NULL;
-	PixelTransformationBundle* _tmp0_ = NULL;
+	PixelTransformationBundle* _tmp0_;
 #line 361 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), NULL);
 #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2619,10 +2619,10 @@ PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformation
 #line 2619 "ColorTransformation.c"
 	{
 		GeeIterator* _transformation_it = NULL;
-		GeeIterable* _tmp1_ = NULL;
-		GeeIterable* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
+		GeeIterable* _tmp1_;
+		GeeIterable* _tmp2_;
+		GeeIterator* _tmp3_;
+		GeeIterator* _tmp4_;
 #line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = pixel_transformation_bundle_get_transformations (self);
 #line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2638,13 +2638,13 @@ PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformation
 #line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
 #line 2640 "ColorTransformation.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			PixelTransformation* transformation = NULL;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
-			PixelTransformationBundle* _tmp9_ = NULL;
-			PixelTransformation* _tmp10_ = NULL;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			PixelTransformationBundle* _tmp9_;
+			PixelTransformation* _tmp10_;
 #line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp5_ = _transformation_it;
 #line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2725,7 +2725,7 @@ static gchar* value_pixel_transformation_bundle_collect_value (GValue* value, gu
 #line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
 #line 2727 "ColorTransformation.c"
-		PixelTransformationBundle* object;
+		PixelTransformationBundle * object;
 		object = collect_values[0].v_pointer;
 #line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -2752,7 +2752,7 @@ static gchar* value_pixel_transformation_bundle_collect_value (GValue* value, gu
 
 
 static gchar* value_pixel_transformation_bundle_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PixelTransformationBundle** object_p;
+	PixelTransformationBundle ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
@@ -2804,7 +2804,7 @@ gpointer value_get_pixel_transformation_bundle (const GValue* value) {
 
 
 void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object) {
-	PixelTransformationBundle* old;
+	PixelTransformationBundle * old;
 #line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION_BUNDLE));
 #line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2835,7 +2835,7 @@ void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object) {
 
 
 void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object) {
-	PixelTransformationBundle* old;
+	PixelTransformationBundle * old;
 #line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION_BUNDLE));
 #line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2875,13 +2875,13 @@ static void pixel_transformation_bundle_class_init (PixelTransformationBundleCla
 
 
 static void pixel_transformation_bundle_instance_init (PixelTransformationBundle * self) {
-	void* _tmp0_ = NULL;
-	GDestroyNotify _tmp1_ = NULL;
-	GeeHashDataFunc _tmp2_ = NULL;
-	void* _tmp3_ = NULL;
-	GDestroyNotify _tmp4_ = NULL;
-	GeeEqualDataFunc _tmp5_ = NULL;
-	GeeHashMap* _tmp6_ = NULL;
+	void* _tmp0_;
+	GDestroyNotify _tmp1_;
+	GeeHashDataFunc _tmp2_;
+	void* _tmp3_;
+	GDestroyNotify _tmp4_;
+	GeeEqualDataFunc _tmp5_;
+	GeeHashMap* _tmp6_;
 #line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = PIXEL_TRANSFORMATION_BUNDLE_GET_PRIVATE (self);
 #line 237 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2898,7 +2898,7 @@ static void pixel_transformation_bundle_instance_init (PixelTransformationBundle
 }
 
 
-static void pixel_transformation_bundle_finalize (PixelTransformationBundle* obj) {
+static void pixel_transformation_bundle_finalize (PixelTransformationBundle * obj) {
 	PixelTransformationBundle * self;
 #line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundle);
@@ -2925,7 +2925,7 @@ GType pixel_transformation_bundle_get_type (void) {
 
 
 gpointer pixel_transformation_bundle_ref (gpointer instance) {
-	PixelTransformationBundle* self;
+	PixelTransformationBundle * self;
 	self = instance;
 #line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -2936,7 +2936,7 @@ gpointer pixel_transformation_bundle_ref (gpointer instance) {
 
 
 void pixel_transformation_bundle_unref (gpointer instance) {
-	PixelTransformationBundle* self;
+	PixelTransformationBundle * self;
 	self = instance;
 #line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2951,7 +2951,7 @@ void pixel_transformation_bundle_unref (gpointer instance) {
 
 PixelTransformation* pixel_transformation_construct (GType object_type, PixelTransformationType type) {
 	PixelTransformation* self = NULL;
-	PixelTransformationType _tmp0_ = 0;
+	PixelTransformationType _tmp0_;
 #line 373 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (PixelTransformation*) g_type_create_instance (object_type);
 #line 374 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2966,7 +2966,7 @@ PixelTransformation* pixel_transformation_construct (GType object_type, PixelTra
 
 PixelTransformationType pixel_transformation_get_transformation_type (PixelTransformation* self) {
 	PixelTransformationType result = 0;
-	PixelTransformationType _tmp0_ = 0;
+	PixelTransformationType _tmp0_;
 #line 377 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (self), 0);
 #line 378 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -3054,7 +3054,7 @@ gboolean pixel_transformation_is_identity (PixelTransformation* self) {
 
 
 static void pixel_transformation_real_transform_pixel_hsv (PixelTransformation* self, HSVAnalyticPixel* p, HSVAnalyticPixel* result) {
-	HSVAnalyticPixel _tmp0_ = {0};
+	HSVAnalyticPixel _tmp0_;
 #line 396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (p != NULL);
 #line 397 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -3077,7 +3077,7 @@ void pixel_transformation_transform_pixel_hsv (PixelTransformation* self, HSVAna
 
 
 static void pixel_transformation_real_transform_pixel_rgb (PixelTransformation* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result) {
-	RGBAnalyticPixel _tmp0_ = {0};
+	RGBAnalyticPixel _tmp0_;
 #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (p != NULL);
 #line 401 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -3101,7 +3101,7 @@ void pixel_transformation_transform_pixel_rgb (PixelTransformation* self, RGBAna
 
 static gchar* pixel_transformation_real_to_string (PixelTransformation* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 405 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = g_strdup ("PixelTransformation");
 #line 405 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -3181,7 +3181,7 @@ static gchar* value_pixel_transformation_collect_value (GValue* value, guint n_c
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
 #line 3183 "ColorTransformation.c"
-		PixelTransformation* object;
+		PixelTransformation * object;
 		object = collect_values[0].v_pointer;
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -3208,7 +3208,7 @@ static gchar* value_pixel_transformation_collect_value (GValue* value, guint n_c
 
 
 static gchar* value_pixel_transformation_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PixelTransformation** object_p;
+	PixelTransformation ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
@@ -3260,7 +3260,7 @@ gpointer value_get_pixel_transformation (const GValue* value) {
 
 
 void value_set_pixel_transformation (GValue* value, gpointer v_object) {
-	PixelTransformation* old;
+	PixelTransformation * old;
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION));
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -3291,7 +3291,7 @@ void value_set_pixel_transformation (GValue* value, gpointer v_object) {
 
 
 void value_take_pixel_transformation (GValue* value, gpointer v_object) {
-	PixelTransformation* old;
+	PixelTransformation * old;
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION));
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -3327,21 +3327,21 @@ static void pixel_transformation_class_init (PixelTransformationClass * klass) {
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (PixelTransformationPrivate));
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->get_preferred_format = (PixelFormat (*)(PixelTransformation*)) pixel_transformation_real_get_preferred_format;
+	((PixelTransformationClass *) klass)->get_preferred_format = (PixelFormat (*) (PixelTransformation *)) pixel_transformation_real_get_preferred_format;
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->get_composition_mode = (CompositionMode (*)(PixelTransformation*)) pixel_transformation_real_get_composition_mode;
+	((PixelTransformationClass *) klass)->get_composition_mode = (CompositionMode (*) (PixelTransformation *)) pixel_transformation_real_get_composition_mode;
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->compose_with = (void (*)(PixelTransformation*, PixelTransformation*)) pixel_transformation_real_compose_with;
+	((PixelTransformationClass *) klass)->compose_with = (void (*) (PixelTransformation *, PixelTransformation*)) pixel_transformation_real_compose_with;
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->is_identity = (gboolean (*)(PixelTransformation*)) pixel_transformation_real_is_identity;
+	((PixelTransformationClass *) klass)->is_identity = (gboolean (*) (PixelTransformation *)) pixel_transformation_real_is_identity;
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*)(PixelTransformation*, HSVAnalyticPixel*, HSVAnalyticPixel*)) pixel_transformation_real_transform_pixel_hsv;
+	((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*) (PixelTransformation *, HSVAnalyticPixel*, HSVAnalyticPixel*)) pixel_transformation_real_transform_pixel_hsv;
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->transform_pixel_rgb = (void (*)(PixelTransformation*, RGBAnalyticPixel*, RGBAnalyticPixel*)) pixel_transformation_real_transform_pixel_rgb;
+	((PixelTransformationClass *) klass)->transform_pixel_rgb = (void (*) (PixelTransformation *, RGBAnalyticPixel*, RGBAnalyticPixel*)) pixel_transformation_real_transform_pixel_rgb;
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->to_string = (gchar* (*)(PixelTransformation*)) pixel_transformation_real_to_string;
+	((PixelTransformationClass *) klass)->to_string = (gchar* (*) (PixelTransformation *)) pixel_transformation_real_to_string;
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*)(PixelTransformation*)) pixel_transformation_real_copy;
+	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*) (PixelTransformation *)) pixel_transformation_real_copy;
 #line 3345 "ColorTransformation.c"
 }
 
@@ -3355,7 +3355,7 @@ static void pixel_transformation_instance_init (PixelTransformation * self) {
 }
 
 
-static void pixel_transformation_finalize (PixelTransformation* obj) {
+static void pixel_transformation_finalize (PixelTransformation * obj) {
 	PixelTransformation * self;
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXEL_TRANSFORMATION, PixelTransformation);
@@ -3380,7 +3380,7 @@ GType pixel_transformation_get_type (void) {
 
 
 gpointer pixel_transformation_ref (gpointer instance) {
-	PixelTransformation* self;
+	PixelTransformation * self;
 	self = instance;
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -3391,7 +3391,7 @@ gpointer pixel_transformation_ref (gpointer instance) {
 
 
 void pixel_transformation_unref (gpointer instance) {
-	PixelTransformation* self;
+	PixelTransformation * self;
 	self = instance;
 #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -3406,8 +3406,8 @@ void pixel_transformation_unref (gpointer instance) {
 
 RGBTransformation* rgb_transformation_construct (GType object_type, PixelTransformationType type) {
 	RGBTransformation* self = NULL;
-	PixelTransformationType _tmp0_ = 0;
-	gfloat* _tmp1_ = NULL;
+	PixelTransformationType _tmp0_;
+	gfloat* _tmp1_;
 #line 421 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = type;
 #line 421 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -3500,513 +3500,513 @@ static gpointer _pixel_transformation_ref0 (gpointer self) {
 
 static void rgb_transformation_real_compose_with (PixelTransformation* base, PixelTransformation* other) {
 	RGBTransformation * self;
-	PixelTransformation* _tmp0_ = NULL;
-	CompositionMode _tmp1_ = 0;
+	PixelTransformation* _tmp0_;
+	CompositionMode _tmp1_;
 	RGBTransformation* transform = NULL;
-	PixelTransformation* _tmp2_ = NULL;
-	RGBTransformation* _tmp3_ = NULL;
+	PixelTransformation* _tmp2_;
+	RGBTransformation* _tmp3_;
 	gfloat* result_matrix_entries = NULL;
-	gfloat* _tmp4_ = NULL;
-	gint result_matrix_entries_length1 = 0;
-	gint _result_matrix_entries_size_ = 0;
-	gfloat* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	RGBTransformation* _tmp6_ = NULL;
-	gfloat* _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	gfloat _tmp8_ = 0.0F;
-	gfloat* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	gfloat _tmp10_ = 0.0F;
-	RGBTransformation* _tmp11_ = NULL;
-	gfloat* _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	gfloat _tmp13_ = 0.0F;
-	gfloat* _tmp14_ = NULL;
-	gint _tmp14__length1 = 0;
-	gfloat _tmp15_ = 0.0F;
-	RGBTransformation* _tmp16_ = NULL;
-	gfloat* _tmp17_ = NULL;
-	gint _tmp17__length1 = 0;
-	gfloat _tmp18_ = 0.0F;
-	gfloat* _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
-	gfloat _tmp20_ = 0.0F;
-	RGBTransformation* _tmp21_ = NULL;
-	gfloat* _tmp22_ = NULL;
-	gint _tmp22__length1 = 0;
-	gfloat _tmp23_ = 0.0F;
-	gfloat* _tmp24_ = NULL;
-	gint _tmp24__length1 = 0;
-	gfloat _tmp25_ = 0.0F;
-	gfloat _tmp26_ = 0.0F;
-	gfloat* _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
-	RGBTransformation* _tmp28_ = NULL;
-	gfloat* _tmp29_ = NULL;
-	gint _tmp29__length1 = 0;
-	gfloat _tmp30_ = 0.0F;
-	gfloat* _tmp31_ = NULL;
-	gint _tmp31__length1 = 0;
-	gfloat _tmp32_ = 0.0F;
-	RGBTransformation* _tmp33_ = NULL;
-	gfloat* _tmp34_ = NULL;
-	gint _tmp34__length1 = 0;
-	gfloat _tmp35_ = 0.0F;
-	gfloat* _tmp36_ = NULL;
-	gint _tmp36__length1 = 0;
-	gfloat _tmp37_ = 0.0F;
-	RGBTransformation* _tmp38_ = NULL;
-	gfloat* _tmp39_ = NULL;
-	gint _tmp39__length1 = 0;
-	gfloat _tmp40_ = 0.0F;
-	gfloat* _tmp41_ = NULL;
-	gint _tmp41__length1 = 0;
-	gfloat _tmp42_ = 0.0F;
-	RGBTransformation* _tmp43_ = NULL;
-	gfloat* _tmp44_ = NULL;
-	gint _tmp44__length1 = 0;
-	gfloat _tmp45_ = 0.0F;
-	gfloat* _tmp46_ = NULL;
-	gint _tmp46__length1 = 0;
-	gfloat _tmp47_ = 0.0F;
-	gfloat _tmp48_ = 0.0F;
-	gfloat* _tmp49_ = NULL;
-	gint _tmp49__length1 = 0;
-	RGBTransformation* _tmp50_ = NULL;
-	gfloat* _tmp51_ = NULL;
-	gint _tmp51__length1 = 0;
-	gfloat _tmp52_ = 0.0F;
-	gfloat* _tmp53_ = NULL;
-	gint _tmp53__length1 = 0;
-	gfloat _tmp54_ = 0.0F;
-	RGBTransformation* _tmp55_ = NULL;
-	gfloat* _tmp56_ = NULL;
-	gint _tmp56__length1 = 0;
-	gfloat _tmp57_ = 0.0F;
-	gfloat* _tmp58_ = NULL;
-	gint _tmp58__length1 = 0;
-	gfloat _tmp59_ = 0.0F;
-	RGBTransformation* _tmp60_ = NULL;
-	gfloat* _tmp61_ = NULL;
-	gint _tmp61__length1 = 0;
-	gfloat _tmp62_ = 0.0F;
-	gfloat* _tmp63_ = NULL;
-	gint _tmp63__length1 = 0;
-	gfloat _tmp64_ = 0.0F;
-	RGBTransformation* _tmp65_ = NULL;
-	gfloat* _tmp66_ = NULL;
-	gint _tmp66__length1 = 0;
-	gfloat _tmp67_ = 0.0F;
-	gfloat* _tmp68_ = NULL;
-	gint _tmp68__length1 = 0;
-	gfloat _tmp69_ = 0.0F;
-	gfloat _tmp70_ = 0.0F;
-	gfloat* _tmp71_ = NULL;
-	gint _tmp71__length1 = 0;
-	RGBTransformation* _tmp72_ = NULL;
-	gfloat* _tmp73_ = NULL;
-	gint _tmp73__length1 = 0;
-	gfloat _tmp74_ = 0.0F;
-	gfloat* _tmp75_ = NULL;
-	gint _tmp75__length1 = 0;
-	gfloat _tmp76_ = 0.0F;
-	RGBTransformation* _tmp77_ = NULL;
-	gfloat* _tmp78_ = NULL;
-	gint _tmp78__length1 = 0;
-	gfloat _tmp79_ = 0.0F;
-	gfloat* _tmp80_ = NULL;
-	gint _tmp80__length1 = 0;
-	gfloat _tmp81_ = 0.0F;
-	RGBTransformation* _tmp82_ = NULL;
-	gfloat* _tmp83_ = NULL;
-	gint _tmp83__length1 = 0;
-	gfloat _tmp84_ = 0.0F;
-	gfloat* _tmp85_ = NULL;
-	gint _tmp85__length1 = 0;
-	gfloat _tmp86_ = 0.0F;
-	RGBTransformation* _tmp87_ = NULL;
-	gfloat* _tmp88_ = NULL;
-	gint _tmp88__length1 = 0;
-	gfloat _tmp89_ = 0.0F;
-	gfloat* _tmp90_ = NULL;
-	gint _tmp90__length1 = 0;
-	gfloat _tmp91_ = 0.0F;
-	gfloat _tmp92_ = 0.0F;
-	gfloat* _tmp93_ = NULL;
-	gint _tmp93__length1 = 0;
-	RGBTransformation* _tmp94_ = NULL;
-	gfloat* _tmp95_ = NULL;
-	gint _tmp95__length1 = 0;
-	gfloat _tmp96_ = 0.0F;
-	gfloat* _tmp97_ = NULL;
-	gint _tmp97__length1 = 0;
-	gfloat _tmp98_ = 0.0F;
-	RGBTransformation* _tmp99_ = NULL;
-	gfloat* _tmp100_ = NULL;
-	gint _tmp100__length1 = 0;
-	gfloat _tmp101_ = 0.0F;
-	gfloat* _tmp102_ = NULL;
-	gint _tmp102__length1 = 0;
-	gfloat _tmp103_ = 0.0F;
-	RGBTransformation* _tmp104_ = NULL;
-	gfloat* _tmp105_ = NULL;
-	gint _tmp105__length1 = 0;
-	gfloat _tmp106_ = 0.0F;
-	gfloat* _tmp107_ = NULL;
-	gint _tmp107__length1 = 0;
-	gfloat _tmp108_ = 0.0F;
-	RGBTransformation* _tmp109_ = NULL;
-	gfloat* _tmp110_ = NULL;
-	gint _tmp110__length1 = 0;
-	gfloat _tmp111_ = 0.0F;
-	gfloat* _tmp112_ = NULL;
-	gint _tmp112__length1 = 0;
-	gfloat _tmp113_ = 0.0F;
-	gfloat _tmp114_ = 0.0F;
-	gfloat* _tmp115_ = NULL;
-	gint _tmp115__length1 = 0;
-	RGBTransformation* _tmp116_ = NULL;
-	gfloat* _tmp117_ = NULL;
-	gint _tmp117__length1 = 0;
-	gfloat _tmp118_ = 0.0F;
-	gfloat* _tmp119_ = NULL;
-	gint _tmp119__length1 = 0;
-	gfloat _tmp120_ = 0.0F;
-	RGBTransformation* _tmp121_ = NULL;
-	gfloat* _tmp122_ = NULL;
-	gint _tmp122__length1 = 0;
-	gfloat _tmp123_ = 0.0F;
-	gfloat* _tmp124_ = NULL;
-	gint _tmp124__length1 = 0;
-	gfloat _tmp125_ = 0.0F;
-	RGBTransformation* _tmp126_ = NULL;
-	gfloat* _tmp127_ = NULL;
-	gint _tmp127__length1 = 0;
-	gfloat _tmp128_ = 0.0F;
-	gfloat* _tmp129_ = NULL;
-	gint _tmp129__length1 = 0;
-	gfloat _tmp130_ = 0.0F;
-	RGBTransformation* _tmp131_ = NULL;
-	gfloat* _tmp132_ = NULL;
-	gint _tmp132__length1 = 0;
-	gfloat _tmp133_ = 0.0F;
-	gfloat* _tmp134_ = NULL;
-	gint _tmp134__length1 = 0;
-	gfloat _tmp135_ = 0.0F;
-	gfloat _tmp136_ = 0.0F;
-	gfloat* _tmp137_ = NULL;
-	gint _tmp137__length1 = 0;
-	RGBTransformation* _tmp138_ = NULL;
-	gfloat* _tmp139_ = NULL;
-	gint _tmp139__length1 = 0;
-	gfloat _tmp140_ = 0.0F;
-	gfloat* _tmp141_ = NULL;
-	gint _tmp141__length1 = 0;
-	gfloat _tmp142_ = 0.0F;
-	RGBTransformation* _tmp143_ = NULL;
-	gfloat* _tmp144_ = NULL;
-	gint _tmp144__length1 = 0;
-	gfloat _tmp145_ = 0.0F;
-	gfloat* _tmp146_ = NULL;
-	gint _tmp146__length1 = 0;
-	gfloat _tmp147_ = 0.0F;
-	RGBTransformation* _tmp148_ = NULL;
-	gfloat* _tmp149_ = NULL;
-	gint _tmp149__length1 = 0;
-	gfloat _tmp150_ = 0.0F;
-	gfloat* _tmp151_ = NULL;
-	gint _tmp151__length1 = 0;
-	gfloat _tmp152_ = 0.0F;
-	RGBTransformation* _tmp153_ = NULL;
-	gfloat* _tmp154_ = NULL;
-	gint _tmp154__length1 = 0;
-	gfloat _tmp155_ = 0.0F;
-	gfloat* _tmp156_ = NULL;
-	gint _tmp156__length1 = 0;
-	gfloat _tmp157_ = 0.0F;
-	gfloat _tmp158_ = 0.0F;
-	gfloat* _tmp159_ = NULL;
-	gint _tmp159__length1 = 0;
-	RGBTransformation* _tmp160_ = NULL;
-	gfloat* _tmp161_ = NULL;
-	gint _tmp161__length1 = 0;
-	gfloat _tmp162_ = 0.0F;
-	gfloat* _tmp163_ = NULL;
-	gint _tmp163__length1 = 0;
-	gfloat _tmp164_ = 0.0F;
-	RGBTransformation* _tmp165_ = NULL;
-	gfloat* _tmp166_ = NULL;
-	gint _tmp166__length1 = 0;
-	gfloat _tmp167_ = 0.0F;
-	gfloat* _tmp168_ = NULL;
-	gint _tmp168__length1 = 0;
-	gfloat _tmp169_ = 0.0F;
-	RGBTransformation* _tmp170_ = NULL;
-	gfloat* _tmp171_ = NULL;
-	gint _tmp171__length1 = 0;
-	gfloat _tmp172_ = 0.0F;
-	gfloat* _tmp173_ = NULL;
-	gint _tmp173__length1 = 0;
-	gfloat _tmp174_ = 0.0F;
-	RGBTransformation* _tmp175_ = NULL;
-	gfloat* _tmp176_ = NULL;
-	gint _tmp176__length1 = 0;
-	gfloat _tmp177_ = 0.0F;
-	gfloat* _tmp178_ = NULL;
-	gint _tmp178__length1 = 0;
-	gfloat _tmp179_ = 0.0F;
-	gfloat _tmp180_ = 0.0F;
-	gfloat* _tmp181_ = NULL;
-	gint _tmp181__length1 = 0;
-	RGBTransformation* _tmp182_ = NULL;
-	gfloat* _tmp183_ = NULL;
-	gint _tmp183__length1 = 0;
-	gfloat _tmp184_ = 0.0F;
-	gfloat* _tmp185_ = NULL;
-	gint _tmp185__length1 = 0;
-	gfloat _tmp186_ = 0.0F;
-	RGBTransformation* _tmp187_ = NULL;
-	gfloat* _tmp188_ = NULL;
-	gint _tmp188__length1 = 0;
-	gfloat _tmp189_ = 0.0F;
-	gfloat* _tmp190_ = NULL;
-	gint _tmp190__length1 = 0;
-	gfloat _tmp191_ = 0.0F;
-	RGBTransformation* _tmp192_ = NULL;
-	gfloat* _tmp193_ = NULL;
-	gint _tmp193__length1 = 0;
-	gfloat _tmp194_ = 0.0F;
-	gfloat* _tmp195_ = NULL;
-	gint _tmp195__length1 = 0;
-	gfloat _tmp196_ = 0.0F;
-	RGBTransformation* _tmp197_ = NULL;
-	gfloat* _tmp198_ = NULL;
-	gint _tmp198__length1 = 0;
-	gfloat _tmp199_ = 0.0F;
-	gfloat* _tmp200_ = NULL;
-	gint _tmp200__length1 = 0;
-	gfloat _tmp201_ = 0.0F;
-	gfloat _tmp202_ = 0.0F;
-	gfloat* _tmp203_ = NULL;
-	gint _tmp203__length1 = 0;
-	RGBTransformation* _tmp204_ = NULL;
-	gfloat* _tmp205_ = NULL;
-	gint _tmp205__length1 = 0;
-	gfloat _tmp206_ = 0.0F;
-	gfloat* _tmp207_ = NULL;
-	gint _tmp207__length1 = 0;
-	gfloat _tmp208_ = 0.0F;
-	RGBTransformation* _tmp209_ = NULL;
-	gfloat* _tmp210_ = NULL;
-	gint _tmp210__length1 = 0;
-	gfloat _tmp211_ = 0.0F;
-	gfloat* _tmp212_ = NULL;
-	gint _tmp212__length1 = 0;
-	gfloat _tmp213_ = 0.0F;
-	RGBTransformation* _tmp214_ = NULL;
-	gfloat* _tmp215_ = NULL;
-	gint _tmp215__length1 = 0;
-	gfloat _tmp216_ = 0.0F;
-	gfloat* _tmp217_ = NULL;
-	gint _tmp217__length1 = 0;
-	gfloat _tmp218_ = 0.0F;
-	RGBTransformation* _tmp219_ = NULL;
-	gfloat* _tmp220_ = NULL;
-	gint _tmp220__length1 = 0;
-	gfloat _tmp221_ = 0.0F;
-	gfloat* _tmp222_ = NULL;
-	gint _tmp222__length1 = 0;
-	gfloat _tmp223_ = 0.0F;
-	gfloat _tmp224_ = 0.0F;
-	gfloat* _tmp225_ = NULL;
-	gint _tmp225__length1 = 0;
-	RGBTransformation* _tmp226_ = NULL;
-	gfloat* _tmp227_ = NULL;
-	gint _tmp227__length1 = 0;
-	gfloat _tmp228_ = 0.0F;
-	gfloat* _tmp229_ = NULL;
-	gint _tmp229__length1 = 0;
-	gfloat _tmp230_ = 0.0F;
-	RGBTransformation* _tmp231_ = NULL;
-	gfloat* _tmp232_ = NULL;
-	gint _tmp232__length1 = 0;
-	gfloat _tmp233_ = 0.0F;
-	gfloat* _tmp234_ = NULL;
-	gint _tmp234__length1 = 0;
-	gfloat _tmp235_ = 0.0F;
-	RGBTransformation* _tmp236_ = NULL;
-	gfloat* _tmp237_ = NULL;
-	gint _tmp237__length1 = 0;
-	gfloat _tmp238_ = 0.0F;
-	gfloat* _tmp239_ = NULL;
-	gint _tmp239__length1 = 0;
-	gfloat _tmp240_ = 0.0F;
-	RGBTransformation* _tmp241_ = NULL;
-	gfloat* _tmp242_ = NULL;
-	gint _tmp242__length1 = 0;
-	gfloat _tmp243_ = 0.0F;
-	gfloat* _tmp244_ = NULL;
-	gint _tmp244__length1 = 0;
-	gfloat _tmp245_ = 0.0F;
-	gfloat _tmp246_ = 0.0F;
-	gfloat* _tmp247_ = NULL;
-	gint _tmp247__length1 = 0;
-	RGBTransformation* _tmp248_ = NULL;
-	gfloat* _tmp249_ = NULL;
-	gint _tmp249__length1 = 0;
-	gfloat _tmp250_ = 0.0F;
-	gfloat* _tmp251_ = NULL;
-	gint _tmp251__length1 = 0;
-	gfloat _tmp252_ = 0.0F;
-	RGBTransformation* _tmp253_ = NULL;
-	gfloat* _tmp254_ = NULL;
-	gint _tmp254__length1 = 0;
-	gfloat _tmp255_ = 0.0F;
-	gfloat* _tmp256_ = NULL;
-	gint _tmp256__length1 = 0;
-	gfloat _tmp257_ = 0.0F;
-	RGBTransformation* _tmp258_ = NULL;
-	gfloat* _tmp259_ = NULL;
-	gint _tmp259__length1 = 0;
-	gfloat _tmp260_ = 0.0F;
-	gfloat* _tmp261_ = NULL;
-	gint _tmp261__length1 = 0;
-	gfloat _tmp262_ = 0.0F;
-	RGBTransformation* _tmp263_ = NULL;
-	gfloat* _tmp264_ = NULL;
-	gint _tmp264__length1 = 0;
-	gfloat _tmp265_ = 0.0F;
-	gfloat* _tmp266_ = NULL;
-	gint _tmp266__length1 = 0;
-	gfloat _tmp267_ = 0.0F;
-	gfloat _tmp268_ = 0.0F;
-	gfloat* _tmp269_ = NULL;
-	gint _tmp269__length1 = 0;
-	RGBTransformation* _tmp270_ = NULL;
-	gfloat* _tmp271_ = NULL;
-	gint _tmp271__length1 = 0;
-	gfloat _tmp272_ = 0.0F;
-	gfloat* _tmp273_ = NULL;
-	gint _tmp273__length1 = 0;
-	gfloat _tmp274_ = 0.0F;
-	RGBTransformation* _tmp275_ = NULL;
-	gfloat* _tmp276_ = NULL;
-	gint _tmp276__length1 = 0;
-	gfloat _tmp277_ = 0.0F;
-	gfloat* _tmp278_ = NULL;
-	gint _tmp278__length1 = 0;
-	gfloat _tmp279_ = 0.0F;
-	RGBTransformation* _tmp280_ = NULL;
-	gfloat* _tmp281_ = NULL;
-	gint _tmp281__length1 = 0;
-	gfloat _tmp282_ = 0.0F;
-	gfloat* _tmp283_ = NULL;
-	gint _tmp283__length1 = 0;
-	gfloat _tmp284_ = 0.0F;
-	RGBTransformation* _tmp285_ = NULL;
-	gfloat* _tmp286_ = NULL;
-	gint _tmp286__length1 = 0;
-	gfloat _tmp287_ = 0.0F;
-	gfloat* _tmp288_ = NULL;
-	gint _tmp288__length1 = 0;
-	gfloat _tmp289_ = 0.0F;
-	gfloat _tmp290_ = 0.0F;
-	gfloat* _tmp291_ = NULL;
-	gint _tmp291__length1 = 0;
-	RGBTransformation* _tmp292_ = NULL;
-	gfloat* _tmp293_ = NULL;
-	gint _tmp293__length1 = 0;
-	gfloat _tmp294_ = 0.0F;
-	gfloat* _tmp295_ = NULL;
-	gint _tmp295__length1 = 0;
-	gfloat _tmp296_ = 0.0F;
-	RGBTransformation* _tmp297_ = NULL;
-	gfloat* _tmp298_ = NULL;
-	gint _tmp298__length1 = 0;
-	gfloat _tmp299_ = 0.0F;
-	gfloat* _tmp300_ = NULL;
-	gint _tmp300__length1 = 0;
-	gfloat _tmp301_ = 0.0F;
-	RGBTransformation* _tmp302_ = NULL;
-	gfloat* _tmp303_ = NULL;
-	gint _tmp303__length1 = 0;
-	gfloat _tmp304_ = 0.0F;
-	gfloat* _tmp305_ = NULL;
-	gint _tmp305__length1 = 0;
-	gfloat _tmp306_ = 0.0F;
-	RGBTransformation* _tmp307_ = NULL;
-	gfloat* _tmp308_ = NULL;
-	gint _tmp308__length1 = 0;
-	gfloat _tmp309_ = 0.0F;
-	gfloat* _tmp310_ = NULL;
-	gint _tmp310__length1 = 0;
-	gfloat _tmp311_ = 0.0F;
-	gfloat _tmp312_ = 0.0F;
-	gfloat* _tmp313_ = NULL;
-	gint _tmp313__length1 = 0;
-	RGBTransformation* _tmp314_ = NULL;
-	gfloat* _tmp315_ = NULL;
-	gint _tmp315__length1 = 0;
-	gfloat _tmp316_ = 0.0F;
-	gfloat* _tmp317_ = NULL;
-	gint _tmp317__length1 = 0;
-	gfloat _tmp318_ = 0.0F;
-	RGBTransformation* _tmp319_ = NULL;
-	gfloat* _tmp320_ = NULL;
-	gint _tmp320__length1 = 0;
-	gfloat _tmp321_ = 0.0F;
-	gfloat* _tmp322_ = NULL;
-	gint _tmp322__length1 = 0;
-	gfloat _tmp323_ = 0.0F;
-	RGBTransformation* _tmp324_ = NULL;
-	gfloat* _tmp325_ = NULL;
-	gint _tmp325__length1 = 0;
-	gfloat _tmp326_ = 0.0F;
-	gfloat* _tmp327_ = NULL;
-	gint _tmp327__length1 = 0;
-	gfloat _tmp328_ = 0.0F;
-	RGBTransformation* _tmp329_ = NULL;
-	gfloat* _tmp330_ = NULL;
-	gint _tmp330__length1 = 0;
-	gfloat _tmp331_ = 0.0F;
-	gfloat* _tmp332_ = NULL;
-	gint _tmp332__length1 = 0;
-	gfloat _tmp333_ = 0.0F;
-	gfloat _tmp334_ = 0.0F;
-	gfloat* _tmp335_ = NULL;
-	gint _tmp335__length1 = 0;
-	RGBTransformation* _tmp336_ = NULL;
-	gfloat* _tmp337_ = NULL;
-	gint _tmp337__length1 = 0;
-	gfloat _tmp338_ = 0.0F;
-	gfloat* _tmp339_ = NULL;
-	gint _tmp339__length1 = 0;
-	gfloat _tmp340_ = 0.0F;
-	RGBTransformation* _tmp341_ = NULL;
-	gfloat* _tmp342_ = NULL;
-	gint _tmp342__length1 = 0;
-	gfloat _tmp343_ = 0.0F;
-	gfloat* _tmp344_ = NULL;
-	gint _tmp344__length1 = 0;
-	gfloat _tmp345_ = 0.0F;
-	RGBTransformation* _tmp346_ = NULL;
-	gfloat* _tmp347_ = NULL;
-	gint _tmp347__length1 = 0;
-	gfloat _tmp348_ = 0.0F;
-	gfloat* _tmp349_ = NULL;
-	gint _tmp349__length1 = 0;
-	gfloat _tmp350_ = 0.0F;
-	RGBTransformation* _tmp351_ = NULL;
-	gfloat* _tmp352_ = NULL;
-	gint _tmp352__length1 = 0;
-	gfloat _tmp353_ = 0.0F;
-	gfloat* _tmp354_ = NULL;
-	gint _tmp354__length1 = 0;
-	gfloat _tmp355_ = 0.0F;
-	gfloat _tmp356_ = 0.0F;
+	gfloat* _tmp4_;
+	gint result_matrix_entries_length1;
+	gint _result_matrix_entries_size_;
+	gfloat* _tmp5_;
+	gint _tmp5__length1;
+	RGBTransformation* _tmp6_;
+	gfloat* _tmp7_;
+	gint _tmp7__length1;
+	gfloat _tmp8_;
+	gfloat* _tmp9_;
+	gint _tmp9__length1;
+	gfloat _tmp10_;
+	RGBTransformation* _tmp11_;
+	gfloat* _tmp12_;
+	gint _tmp12__length1;
+	gfloat _tmp13_;
+	gfloat* _tmp14_;
+	gint _tmp14__length1;
+	gfloat _tmp15_;
+	RGBTransformation* _tmp16_;
+	gfloat* _tmp17_;
+	gint _tmp17__length1;
+	gfloat _tmp18_;
+	gfloat* _tmp19_;
+	gint _tmp19__length1;
+	gfloat _tmp20_;
+	RGBTransformation* _tmp21_;
+	gfloat* _tmp22_;
+	gint _tmp22__length1;
+	gfloat _tmp23_;
+	gfloat* _tmp24_;
+	gint _tmp24__length1;
+	gfloat _tmp25_;
+	gfloat _tmp26_;
+	gfloat* _tmp27_;
+	gint _tmp27__length1;
+	RGBTransformation* _tmp28_;
+	gfloat* _tmp29_;
+	gint _tmp29__length1;
+	gfloat _tmp30_;
+	gfloat* _tmp31_;
+	gint _tmp31__length1;
+	gfloat _tmp32_;
+	RGBTransformation* _tmp33_;
+	gfloat* _tmp34_;
+	gint _tmp34__length1;
+	gfloat _tmp35_;
+	gfloat* _tmp36_;
+	gint _tmp36__length1;
+	gfloat _tmp37_;
+	RGBTransformation* _tmp38_;
+	gfloat* _tmp39_;
+	gint _tmp39__length1;
+	gfloat _tmp40_;
+	gfloat* _tmp41_;
+	gint _tmp41__length1;
+	gfloat _tmp42_;
+	RGBTransformation* _tmp43_;
+	gfloat* _tmp44_;
+	gint _tmp44__length1;
+	gfloat _tmp45_;
+	gfloat* _tmp46_;
+	gint _tmp46__length1;
+	gfloat _tmp47_;
+	gfloat _tmp48_;
+	gfloat* _tmp49_;
+	gint _tmp49__length1;
+	RGBTransformation* _tmp50_;
+	gfloat* _tmp51_;
+	gint _tmp51__length1;
+	gfloat _tmp52_;
+	gfloat* _tmp53_;
+	gint _tmp53__length1;
+	gfloat _tmp54_;
+	RGBTransformation* _tmp55_;
+	gfloat* _tmp56_;
+	gint _tmp56__length1;
+	gfloat _tmp57_;
+	gfloat* _tmp58_;
+	gint _tmp58__length1;
+	gfloat _tmp59_;
+	RGBTransformation* _tmp60_;
+	gfloat* _tmp61_;
+	gint _tmp61__length1;
+	gfloat _tmp62_;
+	gfloat* _tmp63_;
+	gint _tmp63__length1;
+	gfloat _tmp64_;
+	RGBTransformation* _tmp65_;
+	gfloat* _tmp66_;
+	gint _tmp66__length1;
+	gfloat _tmp67_;
+	gfloat* _tmp68_;
+	gint _tmp68__length1;
+	gfloat _tmp69_;
+	gfloat _tmp70_;
+	gfloat* _tmp71_;
+	gint _tmp71__length1;
+	RGBTransformation* _tmp72_;
+	gfloat* _tmp73_;
+	gint _tmp73__length1;
+	gfloat _tmp74_;
+	gfloat* _tmp75_;
+	gint _tmp75__length1;
+	gfloat _tmp76_;
+	RGBTransformation* _tmp77_;
+	gfloat* _tmp78_;
+	gint _tmp78__length1;
+	gfloat _tmp79_;
+	gfloat* _tmp80_;
+	gint _tmp80__length1;
+	gfloat _tmp81_;
+	RGBTransformation* _tmp82_;
+	gfloat* _tmp83_;
+	gint _tmp83__length1;
+	gfloat _tmp84_;
+	gfloat* _tmp85_;
+	gint _tmp85__length1;
+	gfloat _tmp86_;
+	RGBTransformation* _tmp87_;
+	gfloat* _tmp88_;
+	gint _tmp88__length1;
+	gfloat _tmp89_;
+	gfloat* _tmp90_;
+	gint _tmp90__length1;
+	gfloat _tmp91_;
+	gfloat _tmp92_;
+	gfloat* _tmp93_;
+	gint _tmp93__length1;
+	RGBTransformation* _tmp94_;
+	gfloat* _tmp95_;
+	gint _tmp95__length1;
+	gfloat _tmp96_;
+	gfloat* _tmp97_;
+	gint _tmp97__length1;
+	gfloat _tmp98_;
+	RGBTransformation* _tmp99_;
+	gfloat* _tmp100_;
+	gint _tmp100__length1;
+	gfloat _tmp101_;
+	gfloat* _tmp102_;
+	gint _tmp102__length1;
+	gfloat _tmp103_;
+	RGBTransformation* _tmp104_;
+	gfloat* _tmp105_;
+	gint _tmp105__length1;
+	gfloat _tmp106_;
+	gfloat* _tmp107_;
+	gint _tmp107__length1;
+	gfloat _tmp108_;
+	RGBTransformation* _tmp109_;
+	gfloat* _tmp110_;
+	gint _tmp110__length1;
+	gfloat _tmp111_;
+	gfloat* _tmp112_;
+	gint _tmp112__length1;
+	gfloat _tmp113_;
+	gfloat _tmp114_;
+	gfloat* _tmp115_;
+	gint _tmp115__length1;
+	RGBTransformation* _tmp116_;
+	gfloat* _tmp117_;
+	gint _tmp117__length1;
+	gfloat _tmp118_;
+	gfloat* _tmp119_;
+	gint _tmp119__length1;
+	gfloat _tmp120_;
+	RGBTransformation* _tmp121_;
+	gfloat* _tmp122_;
+	gint _tmp122__length1;
+	gfloat _tmp123_;
+	gfloat* _tmp124_;
+	gint _tmp124__length1;
+	gfloat _tmp125_;
+	RGBTransformation* _tmp126_;
+	gfloat* _tmp127_;
+	gint _tmp127__length1;
+	gfloat _tmp128_;
+	gfloat* _tmp129_;
+	gint _tmp129__length1;
+	gfloat _tmp130_;
+	RGBTransformation* _tmp131_;
+	gfloat* _tmp132_;
+	gint _tmp132__length1;
+	gfloat _tmp133_;
+	gfloat* _tmp134_;
+	gint _tmp134__length1;
+	gfloat _tmp135_;
+	gfloat _tmp136_;
+	gfloat* _tmp137_;
+	gint _tmp137__length1;
+	RGBTransformation* _tmp138_;
+	gfloat* _tmp139_;
+	gint _tmp139__length1;
+	gfloat _tmp140_;
+	gfloat* _tmp141_;
+	gint _tmp141__length1;
+	gfloat _tmp142_;
+	RGBTransformation* _tmp143_;
+	gfloat* _tmp144_;
+	gint _tmp144__length1;
+	gfloat _tmp145_;
+	gfloat* _tmp146_;
+	gint _tmp146__length1;
+	gfloat _tmp147_;
+	RGBTransformation* _tmp148_;
+	gfloat* _tmp149_;
+	gint _tmp149__length1;
+	gfloat _tmp150_;
+	gfloat* _tmp151_;
+	gint _tmp151__length1;
+	gfloat _tmp152_;
+	RGBTransformation* _tmp153_;
+	gfloat* _tmp154_;
+	gint _tmp154__length1;
+	gfloat _tmp155_;
+	gfloat* _tmp156_;
+	gint _tmp156__length1;
+	gfloat _tmp157_;
+	gfloat _tmp158_;
+	gfloat* _tmp159_;
+	gint _tmp159__length1;
+	RGBTransformation* _tmp160_;
+	gfloat* _tmp161_;
+	gint _tmp161__length1;
+	gfloat _tmp162_;
+	gfloat* _tmp163_;
+	gint _tmp163__length1;
+	gfloat _tmp164_;
+	RGBTransformation* _tmp165_;
+	gfloat* _tmp166_;
+	gint _tmp166__length1;
+	gfloat _tmp167_;
+	gfloat* _tmp168_;
+	gint _tmp168__length1;
+	gfloat _tmp169_;
+	RGBTransformation* _tmp170_;
+	gfloat* _tmp171_;
+	gint _tmp171__length1;
+	gfloat _tmp172_;
+	gfloat* _tmp173_;
+	gint _tmp173__length1;
+	gfloat _tmp174_;
+	RGBTransformation* _tmp175_;
+	gfloat* _tmp176_;
+	gint _tmp176__length1;
+	gfloat _tmp177_;
+	gfloat* _tmp178_;
+	gint _tmp178__length1;
+	gfloat _tmp179_;
+	gfloat _tmp180_;
+	gfloat* _tmp181_;
+	gint _tmp181__length1;
+	RGBTransformation* _tmp182_;
+	gfloat* _tmp183_;
+	gint _tmp183__length1;
+	gfloat _tmp184_;
+	gfloat* _tmp185_;
+	gint _tmp185__length1;
+	gfloat _tmp186_;
+	RGBTransformation* _tmp187_;
+	gfloat* _tmp188_;
+	gint _tmp188__length1;
+	gfloat _tmp189_;
+	gfloat* _tmp190_;
+	gint _tmp190__length1;
+	gfloat _tmp191_;
+	RGBTransformation* _tmp192_;
+	gfloat* _tmp193_;
+	gint _tmp193__length1;
+	gfloat _tmp194_;
+	gfloat* _tmp195_;
+	gint _tmp195__length1;
+	gfloat _tmp196_;
+	RGBTransformation* _tmp197_;
+	gfloat* _tmp198_;
+	gint _tmp198__length1;
+	gfloat _tmp199_;
+	gfloat* _tmp200_;
+	gint _tmp200__length1;
+	gfloat _tmp201_;
+	gfloat _tmp202_;
+	gfloat* _tmp203_;
+	gint _tmp203__length1;
+	RGBTransformation* _tmp204_;
+	gfloat* _tmp205_;
+	gint _tmp205__length1;
+	gfloat _tmp206_;
+	gfloat* _tmp207_;
+	gint _tmp207__length1;
+	gfloat _tmp208_;
+	RGBTransformation* _tmp209_;
+	gfloat* _tmp210_;
+	gint _tmp210__length1;
+	gfloat _tmp211_;
+	gfloat* _tmp212_;
+	gint _tmp212__length1;
+	gfloat _tmp213_;
+	RGBTransformation* _tmp214_;
+	gfloat* _tmp215_;
+	gint _tmp215__length1;
+	gfloat _tmp216_;
+	gfloat* _tmp217_;
+	gint _tmp217__length1;
+	gfloat _tmp218_;
+	RGBTransformation* _tmp219_;
+	gfloat* _tmp220_;
+	gint _tmp220__length1;
+	gfloat _tmp221_;
+	gfloat* _tmp222_;
+	gint _tmp222__length1;
+	gfloat _tmp223_;
+	gfloat _tmp224_;
+	gfloat* _tmp225_;
+	gint _tmp225__length1;
+	RGBTransformation* _tmp226_;
+	gfloat* _tmp227_;
+	gint _tmp227__length1;
+	gfloat _tmp228_;
+	gfloat* _tmp229_;
+	gint _tmp229__length1;
+	gfloat _tmp230_;
+	RGBTransformation* _tmp231_;
+	gfloat* _tmp232_;
+	gint _tmp232__length1;
+	gfloat _tmp233_;
+	gfloat* _tmp234_;
+	gint _tmp234__length1;
+	gfloat _tmp235_;
+	RGBTransformation* _tmp236_;
+	gfloat* _tmp237_;
+	gint _tmp237__length1;
+	gfloat _tmp238_;
+	gfloat* _tmp239_;
+	gint _tmp239__length1;
+	gfloat _tmp240_;
+	RGBTransformation* _tmp241_;
+	gfloat* _tmp242_;
+	gint _tmp242__length1;
+	gfloat _tmp243_;
+	gfloat* _tmp244_;
+	gint _tmp244__length1;
+	gfloat _tmp245_;
+	gfloat _tmp246_;
+	gfloat* _tmp247_;
+	gint _tmp247__length1;
+	RGBTransformation* _tmp248_;
+	gfloat* _tmp249_;
+	gint _tmp249__length1;
+	gfloat _tmp250_;
+	gfloat* _tmp251_;
+	gint _tmp251__length1;
+	gfloat _tmp252_;
+	RGBTransformation* _tmp253_;
+	gfloat* _tmp254_;
+	gint _tmp254__length1;
+	gfloat _tmp255_;
+	gfloat* _tmp256_;
+	gint _tmp256__length1;
+	gfloat _tmp257_;
+	RGBTransformation* _tmp258_;
+	gfloat* _tmp259_;
+	gint _tmp259__length1;
+	gfloat _tmp260_;
+	gfloat* _tmp261_;
+	gint _tmp261__length1;
+	gfloat _tmp262_;
+	RGBTransformation* _tmp263_;
+	gfloat* _tmp264_;
+	gint _tmp264__length1;
+	gfloat _tmp265_;
+	gfloat* _tmp266_;
+	gint _tmp266__length1;
+	gfloat _tmp267_;
+	gfloat _tmp268_;
+	gfloat* _tmp269_;
+	gint _tmp269__length1;
+	RGBTransformation* _tmp270_;
+	gfloat* _tmp271_;
+	gint _tmp271__length1;
+	gfloat _tmp272_;
+	gfloat* _tmp273_;
+	gint _tmp273__length1;
+	gfloat _tmp274_;
+	RGBTransformation* _tmp275_;
+	gfloat* _tmp276_;
+	gint _tmp276__length1;
+	gfloat _tmp277_;
+	gfloat* _tmp278_;
+	gint _tmp278__length1;
+	gfloat _tmp279_;
+	RGBTransformation* _tmp280_;
+	gfloat* _tmp281_;
+	gint _tmp281__length1;
+	gfloat _tmp282_;
+	gfloat* _tmp283_;
+	gint _tmp283__length1;
+	gfloat _tmp284_;
+	RGBTransformation* _tmp285_;
+	gfloat* _tmp286_;
+	gint _tmp286__length1;
+	gfloat _tmp287_;
+	gfloat* _tmp288_;
+	gint _tmp288__length1;
+	gfloat _tmp289_;
+	gfloat _tmp290_;
+	gfloat* _tmp291_;
+	gint _tmp291__length1;
+	RGBTransformation* _tmp292_;
+	gfloat* _tmp293_;
+	gint _tmp293__length1;
+	gfloat _tmp294_;
+	gfloat* _tmp295_;
+	gint _tmp295__length1;
+	gfloat _tmp296_;
+	RGBTransformation* _tmp297_;
+	gfloat* _tmp298_;
+	gint _tmp298__length1;
+	gfloat _tmp299_;
+	gfloat* _tmp300_;
+	gint _tmp300__length1;
+	gfloat _tmp301_;
+	RGBTransformation* _tmp302_;
+	gfloat* _tmp303_;
+	gint _tmp303__length1;
+	gfloat _tmp304_;
+	gfloat* _tmp305_;
+	gint _tmp305__length1;
+	gfloat _tmp306_;
+	RGBTransformation* _tmp307_;
+	gfloat* _tmp308_;
+	gint _tmp308__length1;
+	gfloat _tmp309_;
+	gfloat* _tmp310_;
+	gint _tmp310__length1;
+	gfloat _tmp311_;
+	gfloat _tmp312_;
+	gfloat* _tmp313_;
+	gint _tmp313__length1;
+	RGBTransformation* _tmp314_;
+	gfloat* _tmp315_;
+	gint _tmp315__length1;
+	gfloat _tmp316_;
+	gfloat* _tmp317_;
+	gint _tmp317__length1;
+	gfloat _tmp318_;
+	RGBTransformation* _tmp319_;
+	gfloat* _tmp320_;
+	gint _tmp320__length1;
+	gfloat _tmp321_;
+	gfloat* _tmp322_;
+	gint _tmp322__length1;
+	gfloat _tmp323_;
+	RGBTransformation* _tmp324_;
+	gfloat* _tmp325_;
+	gint _tmp325__length1;
+	gfloat _tmp326_;
+	gfloat* _tmp327_;
+	gint _tmp327__length1;
+	gfloat _tmp328_;
+	RGBTransformation* _tmp329_;
+	gfloat* _tmp330_;
+	gint _tmp330__length1;
+	gfloat _tmp331_;
+	gfloat* _tmp332_;
+	gint _tmp332__length1;
+	gfloat _tmp333_;
+	gfloat _tmp334_;
+	gfloat* _tmp335_;
+	gint _tmp335__length1;
+	RGBTransformation* _tmp336_;
+	gfloat* _tmp337_;
+	gint _tmp337__length1;
+	gfloat _tmp338_;
+	gfloat* _tmp339_;
+	gint _tmp339__length1;
+	gfloat _tmp340_;
+	RGBTransformation* _tmp341_;
+	gfloat* _tmp342_;
+	gint _tmp342__length1;
+	gfloat _tmp343_;
+	gfloat* _tmp344_;
+	gint _tmp344__length1;
+	gfloat _tmp345_;
+	RGBTransformation* _tmp346_;
+	gfloat* _tmp347_;
+	gint _tmp347__length1;
+	gfloat _tmp348_;
+	gfloat* _tmp349_;
+	gint _tmp349__length1;
+	gfloat _tmp350_;
+	RGBTransformation* _tmp351_;
+	gfloat* _tmp352_;
+	gint _tmp352__length1;
+	gfloat _tmp353_;
+	gfloat* _tmp354_;
+	gint _tmp354__length1;
+	gfloat _tmp355_;
+	gfloat _tmp356_;
 	gboolean _tmp366_ = FALSE;
-	gboolean _tmp367_ = FALSE;
+	gboolean _tmp367_;
 #line 442 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
 #line 442 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -5072,19 +5072,19 @@ static void rgb_transformation_real_compose_with (PixelTransformation* base, Pix
 #line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 5074 "ColorTransformation.c"
-				gint _tmp359_ = 0;
-				gfloat* _tmp360_ = NULL;
-				gint _tmp360__length1 = 0;
-				gint _tmp361_ = 0;
-				gfloat* _tmp362_ = NULL;
-				gint _tmp362__length1 = 0;
-				gint _tmp363_ = 0;
-				gfloat _tmp364_ = 0.0F;
-				gfloat _tmp365_ = 0.0F;
+				gint _tmp359_;
+				gfloat* _tmp360_;
+				gint _tmp360__length1;
+				gint _tmp361_;
+				gfloat* _tmp362_;
+				gint _tmp362__length1;
+				gint _tmp363_;
+				gfloat _tmp364_;
+				gfloat _tmp365_;
 #line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp357_) {
 #line 5086 "ColorTransformation.c"
-					gint _tmp358_ = 0;
+					gint _tmp358_;
 #line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp358_ = i;
 #line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -5128,8 +5128,8 @@ static void rgb_transformation_real_compose_with (PixelTransformation* base, Pix
 #line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp367_) {
 #line 5130 "ColorTransformation.c"
-		RGBTransformation* _tmp368_ = NULL;
-		gboolean _tmp369_ = FALSE;
+		RGBTransformation* _tmp368_;
+		gboolean _tmp369_;
 #line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp368_ = transform;
 #line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -5178,71 +5178,71 @@ static void rgb_transformation_real_transform_pixel_hsv (PixelTransformation* ba
 static void rgb_transformation_real_transform_pixel_rgb (PixelTransformation* base, RGBAnalyticPixel* p, RGBAnalyticPixel* result) {
 	RGBTransformation * self;
 	gfloat red_out = 0.0F;
-	RGBAnalyticPixel _tmp0_ = {0};
-	gfloat _tmp1_ = 0.0F;
-	gfloat* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	gfloat _tmp3_ = 0.0F;
-	RGBAnalyticPixel _tmp4_ = {0};
-	gfloat _tmp5_ = 0.0F;
-	gfloat* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	gfloat _tmp7_ = 0.0F;
-	RGBAnalyticPixel _tmp8_ = {0};
-	gfloat _tmp9_ = 0.0F;
-	gfloat* _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	gfloat _tmp11_ = 0.0F;
-	gfloat* _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	gfloat _tmp13_ = 0.0F;
-	gfloat _tmp14_ = 0.0F;
-	gfloat _tmp15_ = 0.0F;
+	RGBAnalyticPixel _tmp0_;
+	gfloat _tmp1_;
+	gfloat* _tmp2_;
+	gint _tmp2__length1;
+	gfloat _tmp3_;
+	RGBAnalyticPixel _tmp4_;
+	gfloat _tmp5_;
+	gfloat* _tmp6_;
+	gint _tmp6__length1;
+	gfloat _tmp7_;
+	RGBAnalyticPixel _tmp8_;
+	gfloat _tmp9_;
+	gfloat* _tmp10_;
+	gint _tmp10__length1;
+	gfloat _tmp11_;
+	gfloat* _tmp12_;
+	gint _tmp12__length1;
+	gfloat _tmp13_;
+	gfloat _tmp14_;
+	gfloat _tmp15_;
 	gfloat green_out = 0.0F;
-	RGBAnalyticPixel _tmp16_ = {0};
-	gfloat _tmp17_ = 0.0F;
-	gfloat* _tmp18_ = NULL;
-	gint _tmp18__length1 = 0;
-	gfloat _tmp19_ = 0.0F;
-	RGBAnalyticPixel _tmp20_ = {0};
-	gfloat _tmp21_ = 0.0F;
-	gfloat* _tmp22_ = NULL;
-	gint _tmp22__length1 = 0;
-	gfloat _tmp23_ = 0.0F;
-	RGBAnalyticPixel _tmp24_ = {0};
-	gfloat _tmp25_ = 0.0F;
-	gfloat* _tmp26_ = NULL;
-	gint _tmp26__length1 = 0;
-	gfloat _tmp27_ = 0.0F;
-	gfloat* _tmp28_ = NULL;
-	gint _tmp28__length1 = 0;
-	gfloat _tmp29_ = 0.0F;
-	gfloat _tmp30_ = 0.0F;
-	gfloat _tmp31_ = 0.0F;
+	RGBAnalyticPixel _tmp16_;
+	gfloat _tmp17_;
+	gfloat* _tmp18_;
+	gint _tmp18__length1;
+	gfloat _tmp19_;
+	RGBAnalyticPixel _tmp20_;
+	gfloat _tmp21_;
+	gfloat* _tmp22_;
+	gint _tmp22__length1;
+	gfloat _tmp23_;
+	RGBAnalyticPixel _tmp24_;
+	gfloat _tmp25_;
+	gfloat* _tmp26_;
+	gint _tmp26__length1;
+	gfloat _tmp27_;
+	gfloat* _tmp28_;
+	gint _tmp28__length1;
+	gfloat _tmp29_;
+	gfloat _tmp30_;
+	gfloat _tmp31_;
 	gfloat blue_out = 0.0F;
-	RGBAnalyticPixel _tmp32_ = {0};
-	gfloat _tmp33_ = 0.0F;
-	gfloat* _tmp34_ = NULL;
-	gint _tmp34__length1 = 0;
-	gfloat _tmp35_ = 0.0F;
-	RGBAnalyticPixel _tmp36_ = {0};
-	gfloat _tmp37_ = 0.0F;
-	gfloat* _tmp38_ = NULL;
-	gint _tmp38__length1 = 0;
-	gfloat _tmp39_ = 0.0F;
-	RGBAnalyticPixel _tmp40_ = {0};
-	gfloat _tmp41_ = 0.0F;
-	gfloat* _tmp42_ = NULL;
-	gint _tmp42__length1 = 0;
-	gfloat _tmp43_ = 0.0F;
-	gfloat* _tmp44_ = NULL;
-	gint _tmp44__length1 = 0;
-	gfloat _tmp45_ = 0.0F;
-	gfloat _tmp46_ = 0.0F;
-	gfloat _tmp47_ = 0.0F;
-	gfloat _tmp48_ = 0.0F;
-	gfloat _tmp49_ = 0.0F;
-	gfloat _tmp50_ = 0.0F;
+	RGBAnalyticPixel _tmp32_;
+	gfloat _tmp33_;
+	gfloat* _tmp34_;
+	gint _tmp34__length1;
+	gfloat _tmp35_;
+	RGBAnalyticPixel _tmp36_;
+	gfloat _tmp37_;
+	gfloat* _tmp38_;
+	gint _tmp38__length1;
+	gfloat _tmp39_;
+	RGBAnalyticPixel _tmp40_;
+	gfloat _tmp41_;
+	gfloat* _tmp42_;
+	gint _tmp42__length1;
+	gfloat _tmp43_;
+	gfloat* _tmp44_;
+	gint _tmp44__length1;
+	gfloat _tmp45_;
+	gfloat _tmp46_;
+	gfloat _tmp47_;
+	gfloat _tmp48_;
+	gfloat _tmp49_;
+	gfloat _tmp50_;
 	RGBAnalyticPixel _tmp51_ = {0};
 #line 561 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
@@ -5399,7 +5399,7 @@ static void rgb_transformation_real_transform_pixel_rgb (PixelTransformation* ba
 static gboolean rgb_transformation_real_is_identity (PixelTransformation* base) {
 	RGBTransformation * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 583 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
 #line 584 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -5416,8 +5416,8 @@ static PixelTransformation* rgb_transformation_real_copy (PixelTransformation* b
 	RGBTransformation * self;
 	PixelTransformation* result = NULL;
 	RGBTransformation* _result_ = NULL;
-	PixelTransformationType _tmp0_ = 0;
-	RGBTransformation* _tmp1_ = NULL;
+	PixelTransformationType _tmp0_;
+	RGBTransformation* _tmp1_;
 #line 587 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
 #line 588 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -5439,20 +5439,20 @@ static PixelTransformation* rgb_transformation_real_copy (PixelTransformation* b
 #line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 5441 "ColorTransformation.c"
-				gint _tmp4_ = 0;
-				RGBTransformation* _tmp5_ = NULL;
-				gfloat* _tmp6_ = NULL;
-				gint _tmp6__length1 = 0;
-				gint _tmp7_ = 0;
-				gfloat* _tmp8_ = NULL;
-				gint _tmp8__length1 = 0;
-				gint _tmp9_ = 0;
-				gfloat _tmp10_ = 0.0F;
-				gfloat _tmp11_ = 0.0F;
+				gint _tmp4_;
+				RGBTransformation* _tmp5_;
+				gfloat* _tmp6_;
+				gint _tmp6__length1;
+				gint _tmp7_;
+				gfloat* _tmp8_;
+				gint _tmp8__length1;
+				gint _tmp9_;
+				gfloat _tmp10_;
+				gfloat _tmp11_;
 #line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp2_) {
 #line 5454 "ColorTransformation.c"
-					gint _tmp3_ = 0;
+					gint _tmp3_;
 #line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp3_ = i;
 #line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -5507,19 +5507,19 @@ static void rgb_transformation_class_init (RGBTransformationClass * klass) {
 #line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = rgb_transformation_finalize;
 #line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->get_preferred_format = (PixelFormat (*)(PixelTransformation*)) rgb_transformation_real_get_preferred_format;
+	((PixelTransformationClass *) klass)->get_preferred_format = (PixelFormat (*) (PixelTransformation *)) rgb_transformation_real_get_preferred_format;
 #line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->get_composition_mode = (CompositionMode (*)(PixelTransformation*)) rgb_transformation_real_get_composition_mode;
+	((PixelTransformationClass *) klass)->get_composition_mode = (CompositionMode (*) (PixelTransformation *)) rgb_transformation_real_get_composition_mode;
 #line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->compose_with = (void (*)(PixelTransformation*, PixelTransformation*)) rgb_transformation_real_compose_with;
+	((PixelTransformationClass *) klass)->compose_with = (void (*) (PixelTransformation *, PixelTransformation*)) rgb_transformation_real_compose_with;
 #line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*)(PixelTransformation*, HSVAnalyticPixel*, HSVAnalyticPixel*)) rgb_transformation_real_transform_pixel_hsv;
+	((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*) (PixelTransformation *, HSVAnalyticPixel*, HSVAnalyticPixel*)) rgb_transformation_real_transform_pixel_hsv;
 #line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->transform_pixel_rgb = (void (*)(PixelTransformation*, RGBAnalyticPixel*, RGBAnalyticPixel*)) rgb_transformation_real_transform_pixel_rgb;
+	((PixelTransformationClass *) klass)->transform_pixel_rgb = (void (*) (PixelTransformation *, RGBAnalyticPixel*, RGBAnalyticPixel*)) rgb_transformation_real_transform_pixel_rgb;
 #line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->is_identity = (gboolean (*)(PixelTransformation*)) rgb_transformation_real_is_identity;
+	((PixelTransformationClass *) klass)->is_identity = (gboolean (*) (PixelTransformation *)) rgb_transformation_real_is_identity;
 #line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*)(PixelTransformation*)) rgb_transformation_real_copy;
+	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*) (PixelTransformation *)) rgb_transformation_real_copy;
 #line 5523 "ColorTransformation.c"
 }
 
@@ -5531,7 +5531,7 @@ static void rgb_transformation_instance_init (RGBTransformation * self) {
 }
 
 
-static void rgb_transformation_finalize (PixelTransformation* obj) {
+static void rgb_transformation_finalize (PixelTransformation * obj) {
 	RGBTransformation * self;
 #line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RGB_TRANSFORMATION, RGBTransformation);
@@ -5557,7 +5557,7 @@ GType rgb_transformation_get_type (void) {
 
 HSVTransformation* hsv_transformation_construct (GType object_type, PixelTransformationType type) {
 	HSVTransformation* self = NULL;
-	PixelTransformationType _tmp0_ = 0;
+	PixelTransformationType _tmp0_;
 #line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = type;
 #line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -5608,9 +5608,9 @@ static void hsv_transformation_class_init (HSVTransformationClass * klass) {
 #line 598 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	hsv_transformation_parent_class = g_type_class_peek_parent (klass);
 #line 598 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->get_preferred_format = (PixelFormat (*)(PixelTransformation*)) hsv_transformation_real_get_preferred_format;
+	((PixelTransformationClass *) klass)->get_preferred_format = (PixelFormat (*) (PixelTransformation *)) hsv_transformation_real_get_preferred_format;
 #line 598 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->transform_pixel_rgb = (void (*)(PixelTransformation*, RGBAnalyticPixel*, RGBAnalyticPixel*)) hsv_transformation_real_transform_pixel_rgb;
+	((PixelTransformationClass *) klass)->transform_pixel_rgb = (void (*) (PixelTransformation *, RGBAnalyticPixel*, RGBAnalyticPixel*)) hsv_transformation_real_transform_pixel_rgb;
 #line 5614 "ColorTransformation.c"
 }
 
@@ -5633,9 +5633,9 @@ GType hsv_transformation_get_type (void) {
 
 TintTransformation* tint_transformation_construct (GType object_type, gfloat client_param) {
 	TintTransformation* self = NULL;
-	gfloat _tmp0_ = 0.0F;
-	gfloat _tmp1_ = 0.0F;
-	gfloat _tmp2_ = 0.0F;
+	gfloat _tmp0_;
+	gfloat _tmp1_;
+	gfloat _tmp2_;
 #line 620 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (TintTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_TINT);
 #line 622 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -5650,20 +5650,20 @@ TintTransformation* tint_transformation_construct (GType object_type, gfloat cli
 	if (_tmp2_ != 0.0f) {
 #line 5651 "ColorTransformation.c"
 		gfloat adjusted_param = 0.0F;
-		gfloat _tmp3_ = 0.0F;
-		gfloat _tmp4_ = 0.0F;
-		gfloat* _tmp5_ = NULL;
-		gint _tmp5__length1 = 0;
-		gfloat _tmp6_ = 0.0F;
-		gfloat _tmp7_ = 0.0F;
-		gfloat* _tmp8_ = NULL;
-		gint _tmp8__length1 = 0;
-		gfloat _tmp9_ = 0.0F;
-		gfloat _tmp10_ = 0.0F;
-		gfloat* _tmp11_ = NULL;
-		gint _tmp11__length1 = 0;
-		gfloat _tmp12_ = 0.0F;
-		gfloat _tmp13_ = 0.0F;
+		gfloat _tmp3_;
+		gfloat _tmp4_;
+		gfloat* _tmp5_;
+		gint _tmp5__length1;
+		gfloat _tmp6_;
+		gfloat _tmp7_;
+		gfloat* _tmp8_;
+		gint _tmp8__length1;
+		gfloat _tmp9_;
+		gfloat _tmp10_;
+		gfloat* _tmp11_;
+		gint _tmp11__length1;
+		gfloat _tmp12_;
+		gfloat _tmp13_;
 #line 625 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = self->priv->parameter;
 #line 625 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -5721,7 +5721,7 @@ TintTransformation* tint_transformation_new (gfloat client_param) {
 
 gfloat tint_transformation_get_parameter (TintTransformation* self) {
 	gfloat result = 0.0F;
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 #line 636 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_TINT_TRANSFORMATION (self), 0.0F);
 #line 637 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -5752,7 +5752,7 @@ static void tint_transformation_instance_init (TintTransformation * self) {
 }
 
 
-static void tint_transformation_finalize (PixelTransformation* obj) {
+static void tint_transformation_finalize (PixelTransformation * obj) {
 	TintTransformation * self;
 #line 612 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TINT_TRANSFORMATION, TintTransformation);
@@ -5776,9 +5776,9 @@ GType tint_transformation_get_type (void) {
 
 TemperatureTransformation* temperature_transformation_construct (GType object_type, gfloat client_parameter) {
 	TemperatureTransformation* self = NULL;
-	gfloat _tmp0_ = 0.0F;
-	gfloat _tmp1_ = 0.0F;
-	gfloat _tmp2_ = 0.0F;
+	gfloat _tmp0_;
+	gfloat _tmp1_;
+	gfloat _tmp2_;
 #line 649 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (TemperatureTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE);
 #line 651 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -5793,20 +5793,20 @@ TemperatureTransformation* temperature_transformation_construct (GType object_ty
 	if (_tmp2_ != 0.0f) {
 #line 5794 "ColorTransformation.c"
 		gfloat adjusted_param = 0.0F;
-		gfloat _tmp3_ = 0.0F;
-		gfloat _tmp4_ = 0.0F;
-		gfloat* _tmp5_ = NULL;
-		gint _tmp5__length1 = 0;
-		gfloat _tmp6_ = 0.0F;
-		gfloat _tmp7_ = 0.0F;
-		gfloat* _tmp8_ = NULL;
-		gint _tmp8__length1 = 0;
-		gfloat _tmp9_ = 0.0F;
-		gfloat _tmp10_ = 0.0F;
-		gfloat* _tmp11_ = NULL;
-		gint _tmp11__length1 = 0;
-		gfloat _tmp12_ = 0.0F;
-		gfloat _tmp13_ = 0.0F;
+		gfloat _tmp3_;
+		gfloat _tmp4_;
+		gfloat* _tmp5_;
+		gint _tmp5__length1;
+		gfloat _tmp6_;
+		gfloat _tmp7_;
+		gfloat* _tmp8_;
+		gint _tmp8__length1;
+		gfloat _tmp9_;
+		gfloat _tmp10_;
+		gfloat* _tmp11_;
+		gint _tmp11__length1;
+		gfloat _tmp12_;
+		gfloat _tmp13_;
 #line 654 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = self->priv->parameter;
 #line 654 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -5864,7 +5864,7 @@ TemperatureTransformation* temperature_transformation_new (gfloat client_paramet
 
 gfloat temperature_transformation_get_parameter (TemperatureTransformation* self) {
 	gfloat result = 0.0F;
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 #line 665 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_TEMPERATURE_TRANSFORMATION (self), 0.0F);
 #line 666 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -5895,7 +5895,7 @@ static void temperature_transformation_instance_init (TemperatureTransformation
 }
 
 
-static void temperature_transformation_finalize (PixelTransformation* obj) {
+static void temperature_transformation_finalize (PixelTransformation * obj) {
 	TemperatureTransformation * self;
 #line 641 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation);
@@ -5919,9 +5919,9 @@ GType temperature_transformation_get_type (void) {
 
 SaturationTransformation* saturation_transformation_construct (GType object_type, gfloat client_parameter) {
 	SaturationTransformation* self = NULL;
-	gfloat _tmp0_ = 0.0F;
-	gfloat _tmp1_ = 0.0F;
-	gfloat _tmp2_ = 0.0F;
+	gfloat _tmp0_;
+	gfloat _tmp1_;
+	gfloat _tmp2_;
 #line 677 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (SaturationTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_SATURATION);
 #line 679 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -5936,57 +5936,57 @@ SaturationTransformation* saturation_transformation_construct (GType object_type
 	if (_tmp2_ != 0.0f) {
 #line 5937 "ColorTransformation.c"
 		gfloat adjusted_param = 0.0F;
-		gfloat _tmp3_ = 0.0F;
-		gfloat _tmp4_ = 0.0F;
+		gfloat _tmp3_;
+		gfloat _tmp4_;
 		gfloat one_third = 0.0F;
-		gfloat* _tmp5_ = NULL;
-		gint _tmp5__length1 = 0;
-		gfloat _tmp6_ = 0.0F;
-		gfloat _tmp7_ = 0.0F;
-		gfloat _tmp8_ = 0.0F;
-		gfloat _tmp9_ = 0.0F;
-		gfloat* _tmp10_ = NULL;
-		gint _tmp10__length1 = 0;
-		gfloat _tmp11_ = 0.0F;
-		gfloat _tmp12_ = 0.0F;
-		gfloat _tmp13_ = 0.0F;
-		gfloat* _tmp14_ = NULL;
-		gint _tmp14__length1 = 0;
-		gfloat _tmp15_ = 0.0F;
-		gfloat _tmp16_ = 0.0F;
-		gfloat _tmp17_ = 0.0F;
-		gfloat* _tmp18_ = NULL;
-		gint _tmp18__length1 = 0;
-		gfloat _tmp19_ = 0.0F;
-		gfloat _tmp20_ = 0.0F;
-		gfloat _tmp21_ = 0.0F;
-		gfloat* _tmp22_ = NULL;
-		gint _tmp22__length1 = 0;
-		gfloat _tmp23_ = 0.0F;
-		gfloat _tmp24_ = 0.0F;
-		gfloat _tmp25_ = 0.0F;
-		gfloat _tmp26_ = 0.0F;
-		gfloat* _tmp27_ = NULL;
-		gint _tmp27__length1 = 0;
-		gfloat _tmp28_ = 0.0F;
-		gfloat _tmp29_ = 0.0F;
-		gfloat _tmp30_ = 0.0F;
-		gfloat* _tmp31_ = NULL;
-		gint _tmp31__length1 = 0;
-		gfloat _tmp32_ = 0.0F;
-		gfloat _tmp33_ = 0.0F;
-		gfloat _tmp34_ = 0.0F;
-		gfloat* _tmp35_ = NULL;
-		gint _tmp35__length1 = 0;
-		gfloat _tmp36_ = 0.0F;
-		gfloat _tmp37_ = 0.0F;
-		gfloat _tmp38_ = 0.0F;
-		gfloat* _tmp39_ = NULL;
-		gint _tmp39__length1 = 0;
-		gfloat _tmp40_ = 0.0F;
-		gfloat _tmp41_ = 0.0F;
-		gfloat _tmp42_ = 0.0F;
-		gfloat _tmp43_ = 0.0F;
+		gfloat* _tmp5_;
+		gint _tmp5__length1;
+		gfloat _tmp6_;
+		gfloat _tmp7_;
+		gfloat _tmp8_;
+		gfloat _tmp9_;
+		gfloat* _tmp10_;
+		gint _tmp10__length1;
+		gfloat _tmp11_;
+		gfloat _tmp12_;
+		gfloat _tmp13_;
+		gfloat* _tmp14_;
+		gint _tmp14__length1;
+		gfloat _tmp15_;
+		gfloat _tmp16_;
+		gfloat _tmp17_;
+		gfloat* _tmp18_;
+		gint _tmp18__length1;
+		gfloat _tmp19_;
+		gfloat _tmp20_;
+		gfloat _tmp21_;
+		gfloat* _tmp22_;
+		gint _tmp22__length1;
+		gfloat _tmp23_;
+		gfloat _tmp24_;
+		gfloat _tmp25_;
+		gfloat _tmp26_;
+		gfloat* _tmp27_;
+		gint _tmp27__length1;
+		gfloat _tmp28_;
+		gfloat _tmp29_;
+		gfloat _tmp30_;
+		gfloat* _tmp31_;
+		gint _tmp31__length1;
+		gfloat _tmp32_;
+		gfloat _tmp33_;
+		gfloat _tmp34_;
+		gfloat* _tmp35_;
+		gint _tmp35__length1;
+		gfloat _tmp36_;
+		gfloat _tmp37_;
+		gfloat _tmp38_;
+		gfloat* _tmp39_;
+		gint _tmp39__length1;
+		gfloat _tmp40_;
+		gfloat _tmp41_;
+		gfloat _tmp42_;
+		gfloat _tmp43_;
 #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = self->priv->parameter;
 #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6130,7 +6130,7 @@ SaturationTransformation* saturation_transformation_new (gfloat client_parameter
 
 gfloat saturation_transformation_get_parameter (SaturationTransformation* self) {
 	gfloat result = 0.0F;
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 #line 706 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_SATURATION_TRANSFORMATION (self), 0.0F);
 #line 707 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6161,7 +6161,7 @@ static void saturation_transformation_instance_init (SaturationTransformation *
 }
 
 
-static void saturation_transformation_finalize (PixelTransformation* obj) {
+static void saturation_transformation_finalize (PixelTransformation * obj) {
 	SaturationTransformation * self;
 #line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation);
@@ -6185,9 +6185,9 @@ GType saturation_transformation_get_type (void) {
 
 ExposureTransformation* exposure_transformation_construct (GType object_type, gfloat client_parameter) {
 	ExposureTransformation* self = NULL;
-	gfloat _tmp0_ = 0.0F;
-	gfloat _tmp1_ = 0.0F;
-	gfloat _tmp2_ = 0.0F;
+	gfloat _tmp0_;
+	gfloat _tmp1_;
+	gfloat _tmp2_;
 #line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (ExposureTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_EXPOSURE);
 #line 720 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6202,19 +6202,19 @@ ExposureTransformation* exposure_transformation_construct (GType object_type, gf
 	if (_tmp2_ != 0.0f) {
 #line 6203 "ColorTransformation.c"
 		gfloat adjusted_param = 0.0F;
-		gfloat _tmp3_ = 0.0F;
-		gfloat* _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
-		gfloat _tmp5_ = 0.0F;
-		gfloat _tmp6_ = 0.0F;
-		gfloat* _tmp7_ = NULL;
-		gint _tmp7__length1 = 0;
-		gfloat _tmp8_ = 0.0F;
-		gfloat _tmp9_ = 0.0F;
-		gfloat* _tmp10_ = NULL;
-		gint _tmp10__length1 = 0;
-		gfloat _tmp11_ = 0.0F;
-		gfloat _tmp12_ = 0.0F;
+		gfloat _tmp3_;
+		gfloat* _tmp4_;
+		gint _tmp4__length1;
+		gfloat _tmp5_;
+		gfloat _tmp6_;
+		gfloat* _tmp7_;
+		gint _tmp7__length1;
+		gfloat _tmp8_;
+		gfloat _tmp9_;
+		gfloat* _tmp10_;
+		gint _tmp10__length1;
+		gfloat _tmp11_;
+		gfloat _tmp12_;
 #line 724 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = self->priv->parameter;
 #line 724 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6268,7 +6268,7 @@ ExposureTransformation* exposure_transformation_new (gfloat client_parameter) {
 
 gfloat exposure_transformation_get_parameter (ExposureTransformation* self) {
 	gfloat result = 0.0F;
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 #line 734 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_EXPOSURE_TRANSFORMATION (self), 0.0F);
 #line 735 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6299,7 +6299,7 @@ static void exposure_transformation_instance_init (ExposureTransformation * self
 }
 
 
-static void exposure_transformation_finalize (PixelTransformation* obj) {
+static void exposure_transformation_finalize (PixelTransformation * obj) {
 	ExposureTransformation * self;
 #line 711 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation);
@@ -6323,9 +6323,9 @@ GType exposure_transformation_get_type (void) {
 
 ContrastTransformation* contrast_transformation_construct (GType object_type, gfloat client_parameter) {
 	ContrastTransformation* self = NULL;
-	gfloat _tmp0_ = 0.0F;
-	gfloat _tmp1_ = 0.0F;
-	gfloat _tmp2_ = 0.0F;
+	gfloat _tmp0_;
+	gfloat _tmp1_;
+	gfloat _tmp2_;
 #line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (ContrastTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_CONTRAST);
 #line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6340,35 +6340,35 @@ ContrastTransformation* contrast_transformation_construct (GType object_type, gf
 	if (_tmp2_ != 0.0f) {
 #line 6341 "ColorTransformation.c"
 		gfloat contrast_adjustment = 0.0F;
-		gfloat _tmp3_ = 0.0F;
+		gfloat _tmp3_;
 		gfloat component_coefficient = 0.0F;
-		gfloat _tmp4_ = 0.0F;
+		gfloat _tmp4_;
 		gfloat component_offset = 0.0F;
-		gfloat _tmp5_ = 0.0F;
-		gfloat* _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-		gfloat _tmp7_ = 0.0F;
-		gfloat _tmp8_ = 0.0F;
-		gfloat* _tmp9_ = NULL;
-		gint _tmp9__length1 = 0;
-		gfloat _tmp10_ = 0.0F;
-		gfloat _tmp11_ = 0.0F;
-		gfloat* _tmp12_ = NULL;
-		gint _tmp12__length1 = 0;
-		gfloat _tmp13_ = 0.0F;
-		gfloat _tmp14_ = 0.0F;
-		gfloat* _tmp15_ = NULL;
-		gint _tmp15__length1 = 0;
-		gfloat _tmp16_ = 0.0F;
-		gfloat _tmp17_ = 0.0F;
-		gfloat* _tmp18_ = NULL;
-		gint _tmp18__length1 = 0;
-		gfloat _tmp19_ = 0.0F;
-		gfloat _tmp20_ = 0.0F;
-		gfloat* _tmp21_ = NULL;
-		gint _tmp21__length1 = 0;
-		gfloat _tmp22_ = 0.0F;
-		gfloat _tmp23_ = 0.0F;
+		gfloat _tmp5_;
+		gfloat* _tmp6_;
+		gint _tmp6__length1;
+		gfloat _tmp7_;
+		gfloat _tmp8_;
+		gfloat* _tmp9_;
+		gint _tmp9__length1;
+		gfloat _tmp10_;
+		gfloat _tmp11_;
+		gfloat* _tmp12_;
+		gint _tmp12__length1;
+		gfloat _tmp13_;
+		gfloat _tmp14_;
+		gfloat* _tmp15_;
+		gint _tmp15__length1;
+		gfloat _tmp16_;
+		gfloat _tmp17_;
+		gfloat* _tmp18_;
+		gint _tmp18__length1;
+		gfloat _tmp19_;
+		gfloat _tmp20_;
+		gfloat* _tmp21_;
+		gint _tmp21__length1;
+		gfloat _tmp22_;
+		gfloat _tmp23_;
 #line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = self->priv->parameter;
 #line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6460,7 +6460,7 @@ ContrastTransformation* contrast_transformation_new (gfloat client_parameter) {
 
 gfloat contrast_transformation_get_parameter (ContrastTransformation* self) {
 	gfloat result = 0.0F;
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 #line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_CONTRAST_TRANSFORMATION (self), 0.0F);
 #line 771 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6491,7 +6491,7 @@ static void contrast_transformation_instance_init (ContrastTransformation * self
 }
 
 
-static void contrast_transformation_finalize (PixelTransformation* obj) {
+static void contrast_transformation_finalize (PixelTransformation * obj) {
 	ContrastTransformation * self;
 #line 739 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation);
@@ -6540,7 +6540,7 @@ static gpointer _g_object_ref0 (gpointer self) {
 PixelTransformer* pixel_transformer_copy (PixelTransformer* self) {
 	PixelTransformer* result = NULL;
 	PixelTransformer* clone = NULL;
-	PixelTransformer* _tmp0_ = NULL;
+	PixelTransformer* _tmp0_;
 #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMER (self), NULL);
 #line 785 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6550,12 +6550,12 @@ PixelTransformer* pixel_transformer_copy (PixelTransformer* self) {
 #line 6550 "ColorTransformation.c"
 	{
 		GeeArrayList* _transformation_list = NULL;
-		GeeArrayList* _tmp1_ = NULL;
-		GeeArrayList* _tmp2_ = NULL;
+		GeeArrayList* _tmp1_;
+		GeeArrayList* _tmp2_;
 		gint _transformation_size = 0;
-		GeeArrayList* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+		GeeArrayList* _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
 		gint _transformation_index = 0;
 #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = self->priv->transformations;
@@ -6576,16 +6576,16 @@ PixelTransformer* pixel_transformer_copy (PixelTransformer* self) {
 #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
 #line 6578 "ColorTransformation.c"
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
+			gint _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 			PixelTransformation* transformation = NULL;
-			GeeArrayList* _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			gpointer _tmp11_ = NULL;
-			PixelTransformer* _tmp12_ = NULL;
-			GeeArrayList* _tmp13_ = NULL;
-			PixelTransformation* _tmp14_ = NULL;
+			GeeArrayList* _tmp9_;
+			gint _tmp10_;
+			gpointer _tmp11_;
+			PixelTransformer* _tmp12_;
+			GeeArrayList* _tmp13_;
+			PixelTransformation* _tmp14_;
 #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp6_ = _transformation_index;
 #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6633,10 +6633,10 @@ PixelTransformer* pixel_transformer_copy (PixelTransformer* self) {
 
 
 static void pixel_transformer_build_optimized_transformations (PixelTransformer* self) {
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	PixelTransformation** _tmp3_ = NULL;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	PixelTransformation** _tmp3_;
 	PixelTransformation* pre_trans = NULL;
 #line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
@@ -6673,26 +6673,26 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer*
 #line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 6675 "ColorTransformation.c"
-				gint _tmp6_ = 0;
-				GeeArrayList* _tmp7_ = NULL;
-				gint _tmp8_ = 0;
-				gint _tmp9_ = 0;
+				gint _tmp6_;
+				GeeArrayList* _tmp7_;
+				gint _tmp8_;
+				gint _tmp9_;
 				PixelTransformation* trans = NULL;
-				GeeArrayList* _tmp10_ = NULL;
-				gint _tmp11_ = 0;
-				gpointer _tmp12_ = NULL;
-				PixelTransformation* _tmp13_ = NULL;
-				gboolean _tmp14_ = FALSE;
+				GeeArrayList* _tmp10_;
+				gint _tmp11_;
+				gpointer _tmp12_;
+				PixelTransformation* _tmp13_;
+				gboolean _tmp14_;
 				PixelTransformation* this_trans = NULL;
-				PixelTransformation* _tmp15_ = NULL;
-				CompositionMode _tmp16_ = 0;
+				PixelTransformation* _tmp15_;
+				CompositionMode _tmp16_;
 				gboolean _tmp21_ = FALSE;
 				gboolean _tmp22_ = FALSE;
-				PixelTransformation* _tmp23_ = NULL;
+				PixelTransformation* _tmp23_;
 #line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp4_) {
 #line 6694 "ColorTransformation.c"
-					gint _tmp5_ = 0;
+					gint _tmp5_;
 #line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp5_ = i;
 #line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6744,8 +6744,8 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer*
 #line 805 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp16_ == COMPOSITION_MODE_NONE) {
 #line 6746 "ColorTransformation.c"
-					PixelTransformation* _tmp17_ = NULL;
-					PixelTransformation* _tmp18_ = NULL;
+					PixelTransformation* _tmp17_;
+					PixelTransformation* _tmp18_;
 #line 806 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp17_ = trans;
 #line 806 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6756,8 +6756,8 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer*
 					this_trans = _tmp18_;
 #line 6757 "ColorTransformation.c"
 				} else {
-					PixelTransformation* _tmp19_ = NULL;
-					PixelTransformation* _tmp20_ = NULL;
+					PixelTransformation* _tmp19_;
+					PixelTransformation* _tmp20_;
 #line 808 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp19_ = trans;
 #line 808 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6773,8 +6773,8 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer*
 #line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp23_ != NULL) {
 #line 6775 "ColorTransformation.c"
-					PixelTransformation* _tmp24_ = NULL;
-					CompositionMode _tmp25_ = 0;
+					PixelTransformation* _tmp24_;
+					CompositionMode _tmp25_;
 #line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp24_ = this_trans;
 #line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6790,10 +6790,10 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer*
 #line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp22_) {
 #line 6792 "ColorTransformation.c"
-					PixelTransformation* _tmp26_ = NULL;
-					CompositionMode _tmp27_ = 0;
-					PixelTransformation* _tmp28_ = NULL;
-					CompositionMode _tmp29_ = 0;
+					PixelTransformation* _tmp26_;
+					CompositionMode _tmp27_;
+					PixelTransformation* _tmp28_;
+					CompositionMode _tmp29_;
 #line 811 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp26_ = this_trans;
 #line 811 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6813,8 +6813,8 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer*
 #line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp21_) {
 #line 6815 "ColorTransformation.c"
-					PixelTransformation* _tmp30_ = NULL;
-					PixelTransformation* _tmp31_ = NULL;
+					PixelTransformation* _tmp30_;
+					PixelTransformation* _tmp31_;
 #line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp30_ = pre_trans;
 #line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6823,14 +6823,14 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer*
 					pixel_transformation_compose_with (_tmp30_, _tmp31_);
 #line 6824 "ColorTransformation.c"
 				} else {
-					PixelTransformation** _tmp32_ = NULL;
-					gint _tmp32__length1 = 0;
-					gint _tmp33_ = 0;
-					PixelTransformation* _tmp34_ = NULL;
-					PixelTransformation* _tmp35_ = NULL;
-					PixelTransformation* _tmp36_ = NULL;
-					PixelTransformation* _tmp37_ = NULL;
-					PixelTransformation* _tmp38_ = NULL;
+					PixelTransformation** _tmp32_;
+					gint _tmp32__length1;
+					gint _tmp33_;
+					PixelTransformation* _tmp34_;
+					PixelTransformation* _tmp35_;
+					PixelTransformation* _tmp36_;
+					PixelTransformation* _tmp37_;
+					PixelTransformation* _tmp38_;
 #line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp32_ = self->priv->optimized_transformations;
 #line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6876,9 +6876,9 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer*
 static void pixel_transformer_apply_transformations (PixelTransformer* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result) {
 	PixelFormat current_format = 0;
 	RGBAnalyticPixel p_rgb = {0};
-	RGBAnalyticPixel _tmp0_ = {0};
+	RGBAnalyticPixel _tmp0_;
 	HSVAnalyticPixel p_hsv = {0};
-	PixelFormat _tmp21_ = 0;
+	PixelFormat _tmp21_;
 #line 820 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
 #line 820 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6904,20 +6904,20 @@ static void pixel_transformer_apply_transformations (PixelTransformer* self, RGB
 #line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 6906 "ColorTransformation.c"
-				gint _tmp3_ = 0;
-				gint _tmp4_ = 0;
+				gint _tmp3_;
+				gint _tmp4_;
 				PixelTransformation* trans = NULL;
-				PixelTransformation** _tmp5_ = NULL;
-				gint _tmp5__length1 = 0;
-				gint _tmp6_ = 0;
-				PixelTransformation* _tmp7_ = NULL;
-				PixelTransformation* _tmp8_ = NULL;
-				PixelTransformation* _tmp9_ = NULL;
-				PixelFormat _tmp10_ = 0;
+				PixelTransformation** _tmp5_;
+				gint _tmp5__length1;
+				gint _tmp6_;
+				PixelTransformation* _tmp7_;
+				PixelTransformation* _tmp8_;
+				PixelTransformation* _tmp9_;
+				PixelFormat _tmp10_;
 #line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp1_) {
 #line 6919 "ColorTransformation.c"
-					gint _tmp2_ = 0;
+					gint _tmp2_;
 #line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp2_ = i;
 #line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6955,9 +6955,9 @@ static void pixel_transformer_apply_transformations (PixelTransformer* self, RGB
 #line 827 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp10_ == PIXEL_FORMAT_RGB) {
 #line 6957 "ColorTransformation.c"
-					PixelFormat _tmp11_ = 0;
-					PixelTransformation* _tmp13_ = NULL;
-					RGBAnalyticPixel _tmp14_ = {0};
+					PixelFormat _tmp11_;
+					PixelTransformation* _tmp13_;
+					RGBAnalyticPixel _tmp14_;
 					RGBAnalyticPixel _tmp15_ = {0};
 #line 828 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp11_ = current_format;
@@ -6983,9 +6983,9 @@ static void pixel_transformer_apply_transformations (PixelTransformer* self, RGB
 					p_rgb = _tmp15_;
 #line 6984 "ColorTransformation.c"
 				} else {
-					PixelFormat _tmp16_ = 0;
-					PixelTransformation* _tmp18_ = NULL;
-					HSVAnalyticPixel _tmp19_ = {0};
+					PixelFormat _tmp16_;
+					PixelTransformation* _tmp18_;
+					HSVAnalyticPixel _tmp19_;
 					HSVAnalyticPixel _tmp20_ = {0};
 #line 834 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp16_ = current_format;
@@ -7038,8 +7038,8 @@ static void pixel_transformer_apply_transformations (PixelTransformer* self, RGB
 
 
 void pixel_transformer_attach_transformation (PixelTransformer* self, PixelTransformation* trans) {
-	GeeArrayList* _tmp0_ = NULL;
-	PixelTransformation* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	PixelTransformation* _tmp1_;
 #line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
 #line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -7063,8 +7063,8 @@ void pixel_transformer_attach_transformation (PixelTransformer* self, PixelTrans
 
 
 void pixel_transformer_detach_transformation (PixelTransformer* self, PixelTransformation* victim) {
-	GeeArrayList* _tmp0_ = NULL;
-	PixelTransformation* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	PixelTransformation* _tmp1_;
 #line 858 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
 #line 858 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -7107,20 +7107,20 @@ void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTran
 #line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 7109 "ColorTransformation.c"
-				gint _tmp2_ = 0;
-				GeeArrayList* _tmp3_ = NULL;
-				gint _tmp4_ = 0;
-				gint _tmp5_ = 0;
-				GeeArrayList* _tmp6_ = NULL;
-				gint _tmp7_ = 0;
-				gpointer _tmp8_ = NULL;
-				PixelTransformation* _tmp9_ = NULL;
-				PixelTransformation* _tmp10_ = NULL;
-				gboolean _tmp11_ = FALSE;
+				gint _tmp2_;
+				GeeArrayList* _tmp3_;
+				gint _tmp4_;
+				gint _tmp5_;
+				GeeArrayList* _tmp6_;
+				gint _tmp7_;
+				gpointer _tmp8_;
+				PixelTransformation* _tmp9_;
+				PixelTransformation* _tmp10_;
+				gboolean _tmp11_;
 #line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp0_) {
 #line 7122 "ColorTransformation.c"
-					gint _tmp1_ = 0;
+					gint _tmp1_;
 #line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp1_ = i;
 #line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -7160,9 +7160,9 @@ void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTran
 #line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp11_) {
 #line 7162 "ColorTransformation.c"
-					GeeArrayList* _tmp12_ = NULL;
-					gint _tmp13_ = 0;
-					PixelTransformation* _tmp14_ = NULL;
+					GeeArrayList* _tmp12_;
+					gint _tmp13_;
+					PixelTransformation* _tmp14_;
 #line 869 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp12_ = self->priv->transformations;
 #line 869 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -7194,9 +7194,9 @@ void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTran
 
 
 void pixel_transformer_transform_pixbuf (PixelTransformer* self, GdkPixbuf* pixbuf, GCancellable* cancellable) {
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	GCancellable* _tmp2_ = NULL;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	GCancellable* _tmp2_;
 #line 879 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
 #line 879 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -7216,25 +7216,25 @@ void pixel_transformer_transform_pixbuf (PixelTransformer* self, GdkPixbuf* pixb
 
 
 void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pixel_cache, int* fp_pixel_cache_length1, GdkPixbuf* dest) {
-	PixelTransformation** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	PixelTransformation** _tmp0_;
+	gint _tmp0__length1;
 	gint dest_width = 0;
-	GdkPixbuf* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	GdkPixbuf* _tmp1_;
+	gint _tmp2_;
 	gint dest_height = 0;
-	GdkPixbuf* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	GdkPixbuf* _tmp3_;
+	gint _tmp4_;
 	gint dest_num_channels = 0;
-	GdkPixbuf* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
+	GdkPixbuf* _tmp5_;
+	gint _tmp6_;
 	gint dest_rowstride = 0;
-	GdkPixbuf* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
+	GdkPixbuf* _tmp7_;
+	gint _tmp8_;
 	guchar* dest_pixels = NULL;
-	GdkPixbuf* _tmp9_ = NULL;
-	guint8* _tmp10_ = NULL;
-	gint dest_pixels_length1 = 0;
-	gint _dest_pixels_size_ = 0;
+	GdkPixbuf* _tmp9_;
+	guint8* _tmp10_;
+	gint dest_pixels_length1;
+	gint _dest_pixels_size_;
 	gint cache_pixel_ticker = 0;
 #line 883 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
@@ -7299,19 +7299,19 @@ void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pi
 #line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 7300 "ColorTransformation.c"
-				gint _tmp13_ = 0;
-				gint _tmp14_ = 0;
+				gint _tmp13_;
+				gint _tmp14_;
 				gint row_start_index = 0;
-				gint _tmp15_ = 0;
-				gint _tmp16_ = 0;
+				gint _tmp15_;
+				gint _tmp16_;
 				gint row_end_index = 0;
-				gint _tmp17_ = 0;
-				gint _tmp18_ = 0;
-				gint _tmp19_ = 0;
+				gint _tmp17_;
+				gint _tmp18_;
+				gint _tmp19_;
 #line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp11_) {
 #line 7312 "ColorTransformation.c"
-					gint _tmp12_ = 0;
+					gint _tmp12_;
 #line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp12_ = j;
 #line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -7347,7 +7347,7 @@ void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pi
 #line 7346 "ColorTransformation.c"
 				{
 					gint i = 0;
-					gint _tmp20_ = 0;
+					gint _tmp20_;
 #line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp20_ = row_start_index;
 #line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -7360,47 +7360,47 @@ void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pi
 #line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						while (TRUE) {
 #line 7361 "ColorTransformation.c"
-							gint _tmp24_ = 0;
-							gint _tmp25_ = 0;
+							gint _tmp24_;
+							gint _tmp25_;
 							RGBAnalyticPixel pixel = {0};
-							gfloat* _tmp26_ = NULL;
-							gint _tmp26__length1 = 0;
-							gint _tmp27_ = 0;
-							gfloat _tmp28_ = 0.0F;
-							gfloat* _tmp29_ = NULL;
-							gint _tmp29__length1 = 0;
-							gint _tmp30_ = 0;
-							gfloat _tmp31_ = 0.0F;
-							gfloat* _tmp32_ = NULL;
-							gint _tmp32__length1 = 0;
-							gint _tmp33_ = 0;
-							gfloat _tmp34_ = 0.0F;
-							gint _tmp35_ = 0;
-							RGBAnalyticPixel _tmp36_ = {0};
+							gfloat* _tmp26_;
+							gint _tmp26__length1;
+							gint _tmp27_;
+							gfloat _tmp28_;
+							gfloat* _tmp29_;
+							gint _tmp29__length1;
+							gint _tmp30_;
+							gfloat _tmp31_;
+							gfloat* _tmp32_;
+							gint _tmp32__length1;
+							gint _tmp33_;
+							gfloat _tmp34_;
+							gint _tmp35_;
+							RGBAnalyticPixel _tmp36_;
 							RGBAnalyticPixel _tmp37_ = {0};
-							guchar* _tmp38_ = NULL;
-							gint _tmp38__length1 = 0;
-							gint _tmp39_ = 0;
-							RGBAnalyticPixel _tmp40_ = {0};
-							gfloat _tmp41_ = 0.0F;
-							guchar _tmp42_ = '\0';
-							guchar* _tmp43_ = NULL;
-							gint _tmp43__length1 = 0;
-							gint _tmp44_ = 0;
-							RGBAnalyticPixel _tmp45_ = {0};
-							gfloat _tmp46_ = 0.0F;
-							guchar _tmp47_ = '\0';
-							guchar* _tmp48_ = NULL;
-							gint _tmp48__length1 = 0;
-							gint _tmp49_ = 0;
-							RGBAnalyticPixel _tmp50_ = {0};
-							gfloat _tmp51_ = 0.0F;
-							guchar _tmp52_ = '\0';
+							guchar* _tmp38_;
+							gint _tmp38__length1;
+							gint _tmp39_;
+							RGBAnalyticPixel _tmp40_;
+							gfloat _tmp41_;
+							guchar _tmp42_;
+							guchar* _tmp43_;
+							gint _tmp43__length1;
+							gint _tmp44_;
+							RGBAnalyticPixel _tmp45_;
+							gfloat _tmp46_;
+							guchar _tmp47_;
+							guchar* _tmp48_;
+							gint _tmp48__length1;
+							gint _tmp49_;
+							RGBAnalyticPixel _tmp50_;
+							gfloat _tmp51_;
+							guchar _tmp52_;
 #line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!_tmp21_) {
 #line 7400 "ColorTransformation.c"
-								gint _tmp22_ = 0;
-								gint _tmp23_ = 0;
+								gint _tmp22_;
+								gint _tmp23_;
 #line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp22_ = i;
 #line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -7510,51 +7510,51 @@ void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pi
 
 
 void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPixbuf* source, GdkPixbuf* dest, GCancellable* cancellable) {
-	GdkPixbuf* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	GdkPixbuf* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	GdkPixbuf* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	GdkPixbuf* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	GdkPixbuf* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	GdkPixbuf* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	PixelTransformation** _tmp18_ = NULL;
-	gint _tmp18__length1 = 0;
+	GdkPixbuf* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	GdkPixbuf* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	GdkPixbuf* _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	GdkPixbuf* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	GdkPixbuf* _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	GdkPixbuf* _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	PixelTransformation** _tmp18_;
+	gint _tmp18__length1;
 	gint n_channels = 0;
-	GdkPixbuf* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
+	GdkPixbuf* _tmp19_;
+	gint _tmp20_;
 	gint rowstride = 0;
-	GdkPixbuf* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
+	GdkPixbuf* _tmp21_;
+	gint _tmp22_;
 	gint width = 0;
-	GdkPixbuf* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
+	GdkPixbuf* _tmp23_;
+	gint _tmp24_;
 	gint height = 0;
-	GdkPixbuf* _tmp25_ = NULL;
-	gint _tmp26_ = 0;
+	GdkPixbuf* _tmp25_;
+	gint _tmp26_;
 	gint rowbytes = 0;
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
+	gint _tmp27_;
+	gint _tmp28_;
 	guchar* source_pixels = NULL;
-	GdkPixbuf* _tmp29_ = NULL;
-	guint8* _tmp30_ = NULL;
-	gint source_pixels_length1 = 0;
-	gint _source_pixels_size_ = 0;
+	GdkPixbuf* _tmp29_;
+	guint8* _tmp30_;
+	gint source_pixels_length1;
+	gint _source_pixels_size_;
 	guchar* dest_pixels = NULL;
-	GdkPixbuf* _tmp31_ = NULL;
-	guint8* _tmp32_ = NULL;
-	gint dest_pixels_length1 = 0;
-	gint _dest_pixels_size_ = 0;
+	GdkPixbuf* _tmp31_;
+	guint8* _tmp32_;
+	gint dest_pixels_length1;
+	gint _dest_pixels_size_;
 #line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
 #line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -7693,20 +7693,20 @@ void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPix
 #line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 7691 "ColorTransformation.c"
-				gint _tmp35_ = 0;
-				gint _tmp36_ = 0;
+				gint _tmp35_;
+				gint _tmp36_;
 				gint row_start_index = 0;
-				gint _tmp37_ = 0;
-				gint _tmp38_ = 0;
+				gint _tmp37_;
+				gint _tmp38_;
 				gint row_end_index = 0;
-				gint _tmp39_ = 0;
-				gint _tmp40_ = 0;
+				gint _tmp39_;
+				gint _tmp40_;
 				gboolean _tmp70_ = FALSE;
-				GCancellable* _tmp71_ = NULL;
+				GCancellable* _tmp71_;
 #line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp33_) {
 #line 7704 "ColorTransformation.c"
-					gint _tmp34_ = 0;
+					gint _tmp34_;
 #line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp34_ = j;
 #line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -7740,7 +7740,7 @@ void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPix
 #line 7736 "ColorTransformation.c"
 				{
 					gint i = 0;
-					gint _tmp41_ = 0;
+					gint _tmp41_;
 #line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp41_ = row_start_index;
 #line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -7753,43 +7753,43 @@ void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPix
 #line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						while (TRUE) {
 #line 7751 "ColorTransformation.c"
-							gint _tmp45_ = 0;
-							gint _tmp46_ = 0;
+							gint _tmp45_;
+							gint _tmp46_;
 							RGBAnalyticPixel current_pixel = {0};
-							guchar* _tmp47_ = NULL;
-							gint _tmp47__length1 = 0;
-							gint _tmp48_ = 0;
-							guchar _tmp49_ = '\0';
-							guchar* _tmp50_ = NULL;
-							gint _tmp50__length1 = 0;
-							gint _tmp51_ = 0;
-							guchar _tmp52_ = '\0';
-							guchar* _tmp53_ = NULL;
-							gint _tmp53__length1 = 0;
-							gint _tmp54_ = 0;
-							guchar _tmp55_ = '\0';
-							RGBAnalyticPixel _tmp56_ = {0};
+							guchar* _tmp47_;
+							gint _tmp47__length1;
+							gint _tmp48_;
+							guchar _tmp49_;
+							guchar* _tmp50_;
+							gint _tmp50__length1;
+							gint _tmp51_;
+							guchar _tmp52_;
+							guchar* _tmp53_;
+							gint _tmp53__length1;
+							gint _tmp54_;
+							guchar _tmp55_;
+							RGBAnalyticPixel _tmp56_;
 							RGBAnalyticPixel _tmp57_ = {0};
-							guchar* _tmp58_ = NULL;
-							gint _tmp58__length1 = 0;
-							gint _tmp59_ = 0;
-							guchar _tmp60_ = '\0';
-							guchar _tmp61_ = '\0';
-							guchar* _tmp62_ = NULL;
-							gint _tmp62__length1 = 0;
-							gint _tmp63_ = 0;
-							guchar _tmp64_ = '\0';
-							guchar _tmp65_ = '\0';
-							guchar* _tmp66_ = NULL;
-							gint _tmp66__length1 = 0;
-							gint _tmp67_ = 0;
-							guchar _tmp68_ = '\0';
-							guchar _tmp69_ = '\0';
+							guchar* _tmp58_;
+							gint _tmp58__length1;
+							gint _tmp59_;
+							guchar _tmp60_;
+							guchar _tmp61_;
+							guchar* _tmp62_;
+							gint _tmp62__length1;
+							gint _tmp63_;
+							guchar _tmp64_;
+							guchar _tmp65_;
+							guchar* _tmp66_;
+							gint _tmp66__length1;
+							gint _tmp67_;
+							guchar _tmp68_;
+							guchar _tmp69_;
 #line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!_tmp42_) {
 #line 7786 "ColorTransformation.c"
-								gint _tmp43_ = 0;
-								gint _tmp44_ = 0;
+								gint _tmp43_;
+								gint _tmp44_;
 #line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp43_ = i;
 #line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -7887,8 +7887,8 @@ void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPix
 #line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp71_ != NULL) {
 #line 7885 "ColorTransformation.c"
-					GCancellable* _tmp72_ = NULL;
-					gboolean _tmp73_ = FALSE;
+					GCancellable* _tmp72_;
+					gboolean _tmp73_;
 #line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp72_ = cancellable;
 #line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -7955,7 +7955,7 @@ static gchar* value_pixel_transformer_collect_value (GValue* value, guint n_coll
 #line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
 #line 7953 "ColorTransformation.c"
-		PixelTransformer* object;
+		PixelTransformer * object;
 		object = collect_values[0].v_pointer;
 #line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -7982,7 +7982,7 @@ static gchar* value_pixel_transformer_collect_value (GValue* value, guint n_coll
 
 
 static gchar* value_pixel_transformer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PixelTransformer** object_p;
+	PixelTransformer ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
@@ -8034,7 +8034,7 @@ gpointer value_get_pixel_transformer (const GValue* value) {
 
 
 void value_set_pixel_transformer (GValue* value, gpointer v_object) {
-	PixelTransformer* old;
+	PixelTransformer * old;
 #line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMER));
 #line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8065,7 +8065,7 @@ void value_set_pixel_transformer (GValue* value, gpointer v_object) {
 
 
 void value_take_pixel_transformer (GValue* value, gpointer v_object) {
-	PixelTransformer* old;
+	PixelTransformer * old;
 #line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMER));
 #line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8105,7 +8105,7 @@ static void pixel_transformer_class_init (PixelTransformerClass * klass) {
 
 
 static void pixel_transformer_instance_init (PixelTransformer * self) {
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 #line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = PIXEL_TRANSFORMER_GET_PRIVATE (self);
 #line 776 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8126,7 +8126,7 @@ static void pixel_transformer_instance_init (PixelTransformer * self) {
 }
 
 
-static void pixel_transformer_finalize (PixelTransformer* obj) {
+static void pixel_transformer_finalize (PixelTransformer * obj) {
 	PixelTransformer * self;
 #line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXEL_TRANSFORMER, PixelTransformer);
@@ -8155,7 +8155,7 @@ GType pixel_transformer_get_type (void) {
 
 
 gpointer pixel_transformer_ref (gpointer instance) {
-	PixelTransformer* self;
+	PixelTransformer * self;
 	self = instance;
 #line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -8166,7 +8166,7 @@ gpointer pixel_transformer_ref (gpointer instance) {
 
 
 void pixel_transformer_unref (gpointer instance) {
-	PixelTransformer* self;
+	PixelTransformer * self;
 	self = instance;
 #line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -8182,22 +8182,22 @@ void pixel_transformer_unref (gpointer instance) {
 RGBHistogram* rgb_histogram_construct (GType object_type, GdkPixbuf* pixbuf) {
 	RGBHistogram* self = NULL;
 	gint sample_bytes = 0;
-	GdkPixbuf* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	GdkPixbuf* _tmp0_;
+	gint _tmp1_;
 	gint pixel_bytes = 0;
-	gint _tmp2_ = 0;
-	GdkPixbuf* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	gint _tmp2_;
+	GdkPixbuf* _tmp3_;
+	gint _tmp4_;
 	gint row_length_bytes = 0;
-	gint _tmp5_ = 0;
-	GdkPixbuf* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	gint _tmp5_;
+	GdkPixbuf* _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 	guchar* pixel_data = NULL;
-	GdkPixbuf* _tmp9_ = NULL;
-	guint8* _tmp10_ = NULL;
-	gint pixel_data_length1 = 0;
-	gint _pixel_data_size_ = 0;
+	GdkPixbuf* _tmp9_;
+	guint8* _tmp10_;
+	gint pixel_data_length1;
+	gint _pixel_data_size_;
 #line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
 #line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8249,28 +8249,28 @@ RGBHistogram* rgb_histogram_construct (GType object_type, GdkPixbuf* pixbuf) {
 #line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 8247 "ColorTransformation.c"
-				gint _tmp13_ = 0;
-				GdkPixbuf* _tmp14_ = NULL;
-				gint _tmp15_ = 0;
-				gint _tmp16_ = 0;
+				gint _tmp13_;
+				GdkPixbuf* _tmp14_;
+				gint _tmp15_;
+				gint _tmp16_;
 				gint row_start_offset = 0;
-				gint _tmp17_ = 0;
-				GdkPixbuf* _tmp18_ = NULL;
-				gint _tmp19_ = 0;
-				gint _tmp20_ = 0;
+				gint _tmp17_;
+				GdkPixbuf* _tmp18_;
+				gint _tmp19_;
+				gint _tmp20_;
 				gint r_offset = 0;
-				gint _tmp21_ = 0;
+				gint _tmp21_;
 				gint g_offset = 0;
-				gint _tmp22_ = 0;
-				gint _tmp23_ = 0;
+				gint _tmp22_;
+				gint _tmp23_;
 				gint b_offset = 0;
-				gint _tmp24_ = 0;
-				gint _tmp25_ = 0;
-				gint _tmp26_ = 0;
+				gint _tmp24_;
+				gint _tmp25_;
+				gint _tmp26_;
 #line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp11_) {
 #line 8268 "ColorTransformation.c"
-					gint _tmp12_ = 0;
+					gint _tmp12_;
 #line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp12_ = y;
 #line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8324,36 +8324,36 @@ RGBHistogram* rgb_histogram_construct (GType object_type, GdkPixbuf* pixbuf) {
 #line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				while (TRUE) {
 #line 8322 "ColorTransformation.c"
-					gint _tmp27_ = 0;
-					gint _tmp28_ = 0;
-					gint _tmp29_ = 0;
-					gint* _tmp30_ = NULL;
-					gint _tmp30__length1 = 0;
-					guchar* _tmp31_ = NULL;
-					gint _tmp31__length1 = 0;
-					gint _tmp32_ = 0;
-					guchar _tmp33_ = '\0';
-					gint _tmp34_ = 0;
-					gint* _tmp35_ = NULL;
-					gint _tmp35__length1 = 0;
-					guchar* _tmp36_ = NULL;
-					gint _tmp36__length1 = 0;
-					gint _tmp37_ = 0;
-					guchar _tmp38_ = '\0';
-					gint _tmp39_ = 0;
-					gint* _tmp40_ = NULL;
-					gint _tmp40__length1 = 0;
-					guchar* _tmp41_ = NULL;
-					gint _tmp41__length1 = 0;
-					gint _tmp42_ = 0;
-					guchar _tmp43_ = '\0';
-					gint _tmp44_ = 0;
-					gint _tmp45_ = 0;
-					gint _tmp46_ = 0;
-					gint _tmp47_ = 0;
-					gint _tmp48_ = 0;
-					gint _tmp49_ = 0;
-					gint _tmp50_ = 0;
+					gint _tmp27_;
+					gint _tmp28_;
+					gint _tmp29_;
+					gint* _tmp30_;
+					gint _tmp30__length1;
+					guchar* _tmp31_;
+					gint _tmp31__length1;
+					gint _tmp32_;
+					guchar _tmp33_;
+					gint _tmp34_;
+					gint* _tmp35_;
+					gint _tmp35__length1;
+					guchar* _tmp36_;
+					gint _tmp36__length1;
+					gint _tmp37_;
+					guchar _tmp38_;
+					gint _tmp39_;
+					gint* _tmp40_;
+					gint _tmp40__length1;
+					guchar* _tmp41_;
+					gint _tmp41__length1;
+					gint _tmp42_;
+					guchar _tmp43_;
+					gint _tmp44_;
+					gint _tmp45_;
+					gint _tmp46_;
+					gint _tmp47_;
+					gint _tmp48_;
+					gint _tmp49_;
+					gint _tmp50_;
 #line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp27_ = b_offset;
 #line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8452,15 +8452,15 @@ RGBHistogram* rgb_histogram_new (GdkPixbuf* pixbuf) {
 
 static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint* buckets, int buckets_length1, gint i) {
 	gint result = 0;
-	gint* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	gint* _tmp0_;
+	gint _tmp0__length1;
 	gboolean _tmp1_ = FALSE;
-	gint _tmp2_ = 0;
-	gint _tmp4_ = 0;
-	gint* _tmp54_ = NULL;
-	gint _tmp54__length1 = 0;
-	gint _tmp55_ = 0;
-	gint _tmp56_ = 0;
+	gint _tmp2_;
+	gint _tmp4_;
+	gint* _tmp54_;
+	gint _tmp54__length1;
+	gint _tmp55_;
+	gint _tmp56_;
 #line 1000 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_RGB_HISTOGRAM (self), 0);
 #line 1001 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8474,7 +8474,7 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 #line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ >= 0) {
 #line 8472 "ColorTransformation.c"
-		gint _tmp3_ = 0;
+		gint _tmp3_;
 #line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = i;
 #line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8492,10 +8492,10 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 #line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp4_ == 0) {
 #line 8490 "ColorTransformation.c"
-		gint* _tmp5_ = NULL;
-		gint _tmp5__length1 = 0;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		gint* _tmp5_;
+		gint _tmp5__length1;
+		gint _tmp6_;
+		gint _tmp7_;
 #line 1005 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = buckets;
 #line 1005 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8507,10 +8507,10 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 #line 1005 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp7_ > 0) {
 #line 8505 "ColorTransformation.c"
-			gint* _tmp8_ = NULL;
-			gint _tmp8__length1 = 0;
-			gint _tmp9_ = 0;
-			gint _tmp10_ = 0;
+			gint* _tmp8_;
+			gint _tmp8__length1;
+			gint _tmp9_;
+			gint _tmp10_;
 #line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp8_ = buckets;
 #line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8522,14 +8522,14 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 #line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp10_ > 0) {
 #line 8520 "ColorTransformation.c"
-				gint* _tmp11_ = NULL;
-				gint _tmp11__length1 = 0;
-				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
-				gint* _tmp14_ = NULL;
-				gint _tmp14__length1 = 0;
-				gint _tmp15_ = 0;
-				gint _tmp16_ = 0;
+				gint* _tmp11_;
+				gint _tmp11__length1;
+				gint _tmp12_;
+				gint _tmp13_;
+				gint* _tmp14_;
+				gint _tmp14__length1;
+				gint _tmp15_;
+				gint _tmp16_;
 #line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11_ = buckets;
 #line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8549,10 +8549,10 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 #line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp13_ > (2 * _tmp16_)) {
 #line 8547 "ColorTransformation.c"
-					gint* _tmp17_ = NULL;
-					gint _tmp17__length1 = 0;
-					gint _tmp18_ = 0;
-					gint _tmp19_ = 0;
+					gint* _tmp17_;
+					gint _tmp17__length1;
+					gint _tmp18_;
+					gint _tmp19_;
 #line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp17_ = buckets;
 #line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8570,16 +8570,16 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 			}
 		}
 	} else {
-		gint _tmp20_ = 0;
+		gint _tmp20_;
 #line 1009 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp20_ = i;
 #line 1009 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp20_ == 255) {
 #line 8574 "ColorTransformation.c"
-			gint* _tmp21_ = NULL;
-			gint _tmp21__length1 = 0;
-			gint _tmp22_ = 0;
-			gint _tmp23_ = 0;
+			gint* _tmp21_;
+			gint _tmp21__length1;
+			gint _tmp22_;
+			gint _tmp23_;
 #line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp21_ = buckets;
 #line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8591,10 +8591,10 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 #line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp23_ > 0) {
 #line 8589 "ColorTransformation.c"
-				gint* _tmp24_ = NULL;
-				gint _tmp24__length1 = 0;
-				gint _tmp25_ = 0;
-				gint _tmp26_ = 0;
+				gint* _tmp24_;
+				gint _tmp24__length1;
+				gint _tmp25_;
+				gint _tmp26_;
 #line 1011 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp24_ = buckets;
 #line 1011 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8606,14 +8606,14 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 #line 1011 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp26_ > 0) {
 #line 8604 "ColorTransformation.c"
-					gint* _tmp27_ = NULL;
-					gint _tmp27__length1 = 0;
-					gint _tmp28_ = 0;
-					gint _tmp29_ = 0;
-					gint* _tmp30_ = NULL;
-					gint _tmp30__length1 = 0;
-					gint _tmp31_ = 0;
-					gint _tmp32_ = 0;
+					gint* _tmp27_;
+					gint _tmp27__length1;
+					gint _tmp28_;
+					gint _tmp29_;
+					gint* _tmp30_;
+					gint _tmp30__length1;
+					gint _tmp31_;
+					gint _tmp32_;
 #line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp27_ = buckets;
 #line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8633,10 +8633,10 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 #line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (_tmp29_ > (2 * _tmp32_)) {
 #line 8631 "ColorTransformation.c"
-						gint* _tmp33_ = NULL;
-						gint _tmp33__length1 = 0;
-						gint _tmp34_ = 0;
-						gint _tmp35_ = 0;
+						gint* _tmp33_;
+						gint _tmp33__length1;
+						gint _tmp34_;
+						gint _tmp35_;
 #line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp33_ = buckets;
 #line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8654,10 +8654,10 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 				}
 			}
 		} else {
-			gint* _tmp36_ = NULL;
-			gint _tmp36__length1 = 0;
-			gint _tmp37_ = 0;
-			gint _tmp38_ = 0;
+			gint* _tmp36_;
+			gint _tmp36__length1;
+			gint _tmp37_;
+			gint _tmp38_;
 #line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp36_ = buckets;
 #line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8669,18 +8669,18 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 #line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp38_ > 0) {
 #line 8667 "ColorTransformation.c"
-				gint* _tmp39_ = NULL;
-				gint _tmp39__length1 = 0;
-				gint _tmp40_ = 0;
-				gint _tmp41_ = 0;
-				gint* _tmp42_ = NULL;
-				gint _tmp42__length1 = 0;
-				gint _tmp43_ = 0;
-				gint _tmp44_ = 0;
-				gint* _tmp45_ = NULL;
-				gint _tmp45__length1 = 0;
-				gint _tmp46_ = 0;
-				gint _tmp47_ = 0;
+				gint* _tmp39_;
+				gint _tmp39__length1;
+				gint _tmp40_;
+				gint _tmp41_;
+				gint* _tmp42_;
+				gint _tmp42__length1;
+				gint _tmp43_;
+				gint _tmp44_;
+				gint* _tmp45_;
+				gint _tmp45__length1;
+				gint _tmp46_;
+				gint _tmp47_;
 #line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp39_ = buckets;
 #line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8708,14 +8708,14 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 #line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp41_ > ((_tmp44_ + _tmp47_) / 2)) {
 #line 8706 "ColorTransformation.c"
-					gint* _tmp48_ = NULL;
-					gint _tmp48__length1 = 0;
-					gint _tmp49_ = 0;
-					gint _tmp50_ = 0;
-					gint* _tmp51_ = NULL;
-					gint _tmp51__length1 = 0;
-					gint _tmp52_ = 0;
-					gint _tmp53_ = 0;
+					gint* _tmp48_;
+					gint _tmp48__length1;
+					gint _tmp49_;
+					gint _tmp50_;
+					gint* _tmp51_;
+					gint _tmp51__length1;
+					gint _tmp52_;
+					gint _tmp53_;
 #line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp48_ = buckets;
 #line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8759,15 +8759,15 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 
 static gint rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, gint* buckets, int buckets_length1, gint i) {
 	gint result = 0;
-	gint* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	gint* _tmp0_;
+	gint _tmp0__length1;
 	gboolean _tmp1_ = FALSE;
-	gint _tmp2_ = 0;
-	gint _tmp4_ = 0;
-	gint* _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
+	gint _tmp2_;
+	gint _tmp4_;
+	gint* _tmp27_;
+	gint _tmp27__length1;
+	gint _tmp28_;
+	gint _tmp29_;
 #line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_RGB_HISTOGRAM (self), 0);
 #line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8781,7 +8781,7 @@ static gint rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, gi
 #line 1025 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ >= 0) {
 #line 8779 "ColorTransformation.c"
-		gint _tmp3_ = 0;
+		gint _tmp3_;
 #line 1025 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = i;
 #line 1025 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8799,10 +8799,10 @@ static gint rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, gi
 #line 1027 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp4_ == 0) {
 #line 8797 "ColorTransformation.c"
-		gint* _tmp5_ = NULL;
-		gint _tmp5__length1 = 0;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		gint* _tmp5_;
+		gint _tmp5__length1;
+		gint _tmp6_;
+		gint _tmp7_;
 #line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = buckets;
 #line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8817,16 +8817,16 @@ static gint rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, gi
 		return result;
 #line 8814 "ColorTransformation.c"
 	} else {
-		gint _tmp8_ = 0;
+		gint _tmp8_;
 #line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_ = i;
 #line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp8_ == 255) {
 #line 8821 "ColorTransformation.c"
-			gint* _tmp9_ = NULL;
-			gint _tmp9__length1 = 0;
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
+			gint* _tmp9_;
+			gint _tmp9__length1;
+			gint _tmp10_;
+			gint _tmp11_;
 #line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9_ = buckets;
 #line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8841,10 +8841,10 @@ static gint rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, gi
 			return result;
 #line 8838 "ColorTransformation.c"
 		} else {
-			gint* _tmp12_ = NULL;
-			gint _tmp12__length1 = 0;
-			gint _tmp13_ = 0;
-			gint _tmp14_ = 0;
+			gint* _tmp12_;
+			gint _tmp12__length1;
+			gint _tmp13_;
+			gint _tmp14_;
 #line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp12_ = buckets;
 #line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8856,10 +8856,10 @@ static gint rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, gi
 #line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp14_ == 0) {
 #line 8854 "ColorTransformation.c"
-				gint* _tmp15_ = NULL;
-				gint _tmp15__length1 = 0;
-				gint _tmp16_ = 0;
-				gint _tmp17_ = 0;
+				gint* _tmp15_;
+				gint _tmp15__length1;
+				gint _tmp16_;
+				gint _tmp17_;
 #line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15_ = buckets;
 #line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8871,10 +8871,10 @@ static gint rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, gi
 #line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp17_ > 0) {
 #line 8869 "ColorTransformation.c"
-					gint* _tmp18_ = NULL;
-					gint _tmp18__length1 = 0;
-					gint _tmp19_ = 0;
-					gint _tmp20_ = 0;
+					gint* _tmp18_;
+					gint _tmp18__length1;
+					gint _tmp19_;
+					gint _tmp20_;
 #line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp18_ = buckets;
 #line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8886,14 +8886,14 @@ static gint rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, gi
 #line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (_tmp20_ > 0) {
 #line 8884 "ColorTransformation.c"
-						gint* _tmp21_ = NULL;
-						gint _tmp21__length1 = 0;
-						gint _tmp22_ = 0;
-						gint _tmp23_ = 0;
-						gint* _tmp24_ = NULL;
-						gint _tmp24__length1 = 0;
-						gint _tmp25_ = 0;
-						gint _tmp26_ = 0;
+						gint* _tmp21_;
+						gint _tmp21__length1;
+						gint _tmp22_;
+						gint _tmp23_;
+						gint* _tmp24_;
+						gint _tmp24__length1;
+						gint _tmp25_;
+						gint _tmp26_;
 #line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp21_ = buckets;
 #line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8937,170 +8937,170 @@ static gint rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, gi
 
 
 static void rgb_histogram_smooth_extrema (RGBHistogram* self, gint** count_data, int* count_data_length1) {
-	gint* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gint* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gint* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	gint _tmp3_ = 0;
-	gint* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	gint _tmp5_ = 0;
-	gint* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gint* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	gint* _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	gint _tmp11_ = 0;
-	gint* _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	gint _tmp13_ = 0;
-	gint* _tmp14_ = NULL;
-	gint _tmp14__length1 = 0;
-	gint _tmp15_ = 0;
-	gint* _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	gint* _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
-	gint* _tmp20_ = NULL;
-	gint _tmp20__length1 = 0;
-	gint _tmp21_ = 0;
-	gint* _tmp22_ = NULL;
-	gint _tmp22__length1 = 0;
-	gint _tmp23_ = 0;
-	gint* _tmp24_ = NULL;
-	gint _tmp24__length1 = 0;
-	gint _tmp25_ = 0;
-	gint* _tmp26_ = NULL;
-	gint _tmp26__length1 = 0;
-	gint _tmp27_ = 0;
-	gint* _tmp28_ = NULL;
-	gint _tmp28__length1 = 0;
-	gint _tmp29_ = 0;
-	gint _tmp30_ = 0;
-	gint* _tmp31_ = NULL;
-	gint _tmp31__length1 = 0;
-	gint* _tmp32_ = NULL;
-	gint _tmp32__length1 = 0;
-	gint _tmp33_ = 0;
-	gint* _tmp34_ = NULL;
-	gint _tmp34__length1 = 0;
-	gint _tmp35_ = 0;
-	gint* _tmp36_ = NULL;
-	gint _tmp36__length1 = 0;
-	gint _tmp37_ = 0;
-	gint* _tmp38_ = NULL;
-	gint _tmp38__length1 = 0;
-	gint _tmp39_ = 0;
-	gint* _tmp40_ = NULL;
-	gint _tmp40__length1 = 0;
-	gint _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	gint* _tmp43_ = NULL;
-	gint _tmp43__length1 = 0;
-	gint* _tmp44_ = NULL;
-	gint _tmp44__length1 = 0;
-	gint _tmp45_ = 0;
-	gint* _tmp46_ = NULL;
-	gint _tmp46__length1 = 0;
-	gint _tmp47_ = 0;
-	gint* _tmp48_ = NULL;
-	gint _tmp48__length1 = 0;
-	gint _tmp49_ = 0;
-	gint* _tmp50_ = NULL;
-	gint _tmp50__length1 = 0;
-	gint _tmp51_ = 0;
-	gint* _tmp52_ = NULL;
-	gint _tmp52__length1 = 0;
-	gint _tmp53_ = 0;
-	gint _tmp54_ = 0;
-	gint* _tmp55_ = NULL;
-	gint _tmp55__length1 = 0;
-	gint* _tmp56_ = NULL;
-	gint _tmp56__length1 = 0;
-	gint _tmp57_ = 0;
-	gint* _tmp58_ = NULL;
-	gint _tmp58__length1 = 0;
-	gint _tmp59_ = 0;
-	gint* _tmp60_ = NULL;
-	gint _tmp60__length1 = 0;
-	gint _tmp61_ = 0;
-	gint _tmp62_ = 0;
-	gint* _tmp63_ = NULL;
-	gint _tmp63__length1 = 0;
-	gint* _tmp64_ = NULL;
-	gint _tmp64__length1 = 0;
-	gint _tmp65_ = 0;
-	gint* _tmp66_ = NULL;
-	gint _tmp66__length1 = 0;
-	gint _tmp67_ = 0;
-	gint* _tmp68_ = NULL;
-	gint _tmp68__length1 = 0;
-	gint _tmp69_ = 0;
-	gint* _tmp70_ = NULL;
-	gint _tmp70__length1 = 0;
-	gint _tmp71_ = 0;
-	gint _tmp72_ = 0;
-	gint* _tmp73_ = NULL;
-	gint _tmp73__length1 = 0;
-	gint* _tmp74_ = NULL;
-	gint _tmp74__length1 = 0;
-	gint _tmp75_ = 0;
-	gint* _tmp76_ = NULL;
-	gint _tmp76__length1 = 0;
-	gint _tmp77_ = 0;
-	gint* _tmp78_ = NULL;
-	gint _tmp78__length1 = 0;
-	gint _tmp79_ = 0;
-	gint* _tmp80_ = NULL;
-	gint _tmp80__length1 = 0;
-	gint _tmp81_ = 0;
-	gint* _tmp82_ = NULL;
-	gint _tmp82__length1 = 0;
-	gint _tmp83_ = 0;
-	gint _tmp84_ = 0;
-	gint* _tmp85_ = NULL;
-	gint _tmp85__length1 = 0;
-	gint* _tmp86_ = NULL;
-	gint _tmp86__length1 = 0;
-	gint _tmp87_ = 0;
-	gint* _tmp88_ = NULL;
-	gint _tmp88__length1 = 0;
-	gint _tmp89_ = 0;
-	gint* _tmp90_ = NULL;
-	gint _tmp90__length1 = 0;
-	gint _tmp91_ = 0;
-	gint* _tmp92_ = NULL;
-	gint _tmp92__length1 = 0;
-	gint _tmp93_ = 0;
-	gint* _tmp94_ = NULL;
-	gint _tmp94__length1 = 0;
-	gint _tmp95_ = 0;
-	gint _tmp96_ = 0;
-	gint* _tmp97_ = NULL;
-	gint _tmp97__length1 = 0;
-	gint* _tmp98_ = NULL;
-	gint _tmp98__length1 = 0;
-	gint _tmp99_ = 0;
-	gint* _tmp100_ = NULL;
-	gint _tmp100__length1 = 0;
-	gint _tmp101_ = 0;
-	gint* _tmp102_ = NULL;
-	gint _tmp102__length1 = 0;
-	gint _tmp103_ = 0;
-	gint* _tmp104_ = NULL;
-	gint _tmp104__length1 = 0;
-	gint _tmp105_ = 0;
-	gint* _tmp106_ = NULL;
-	gint _tmp106__length1 = 0;
-	gint _tmp107_ = 0;
-	gint _tmp108_ = 0;
+	gint* _tmp0_;
+	gint _tmp0__length1;
+	gint* _tmp1_;
+	gint _tmp1__length1;
+	gint* _tmp2_;
+	gint _tmp2__length1;
+	gint _tmp3_;
+	gint* _tmp4_;
+	gint _tmp4__length1;
+	gint _tmp5_;
+	gint* _tmp6_;
+	gint _tmp6__length1;
+	gint _tmp7_;
+	gint _tmp8_;
+	gint* _tmp9_;
+	gint _tmp9__length1;
+	gint* _tmp10_;
+	gint _tmp10__length1;
+	gint _tmp11_;
+	gint* _tmp12_;
+	gint _tmp12__length1;
+	gint _tmp13_;
+	gint* _tmp14_;
+	gint _tmp14__length1;
+	gint _tmp15_;
+	gint* _tmp16_;
+	gint _tmp16__length1;
+	gint _tmp17_;
+	gint _tmp18_;
+	gint* _tmp19_;
+	gint _tmp19__length1;
+	gint* _tmp20_;
+	gint _tmp20__length1;
+	gint _tmp21_;
+	gint* _tmp22_;
+	gint _tmp22__length1;
+	gint _tmp23_;
+	gint* _tmp24_;
+	gint _tmp24__length1;
+	gint _tmp25_;
+	gint* _tmp26_;
+	gint _tmp26__length1;
+	gint _tmp27_;
+	gint* _tmp28_;
+	gint _tmp28__length1;
+	gint _tmp29_;
+	gint _tmp30_;
+	gint* _tmp31_;
+	gint _tmp31__length1;
+	gint* _tmp32_;
+	gint _tmp32__length1;
+	gint _tmp33_;
+	gint* _tmp34_;
+	gint _tmp34__length1;
+	gint _tmp35_;
+	gint* _tmp36_;
+	gint _tmp36__length1;
+	gint _tmp37_;
+	gint* _tmp38_;
+	gint _tmp38__length1;
+	gint _tmp39_;
+	gint* _tmp40_;
+	gint _tmp40__length1;
+	gint _tmp41_;
+	gint _tmp42_;
+	gint* _tmp43_;
+	gint _tmp43__length1;
+	gint* _tmp44_;
+	gint _tmp44__length1;
+	gint _tmp45_;
+	gint* _tmp46_;
+	gint _tmp46__length1;
+	gint _tmp47_;
+	gint* _tmp48_;
+	gint _tmp48__length1;
+	gint _tmp49_;
+	gint* _tmp50_;
+	gint _tmp50__length1;
+	gint _tmp51_;
+	gint* _tmp52_;
+	gint _tmp52__length1;
+	gint _tmp53_;
+	gint _tmp54_;
+	gint* _tmp55_;
+	gint _tmp55__length1;
+	gint* _tmp56_;
+	gint _tmp56__length1;
+	gint _tmp57_;
+	gint* _tmp58_;
+	gint _tmp58__length1;
+	gint _tmp59_;
+	gint* _tmp60_;
+	gint _tmp60__length1;
+	gint _tmp61_;
+	gint _tmp62_;
+	gint* _tmp63_;
+	gint _tmp63__length1;
+	gint* _tmp64_;
+	gint _tmp64__length1;
+	gint _tmp65_;
+	gint* _tmp66_;
+	gint _tmp66__length1;
+	gint _tmp67_;
+	gint* _tmp68_;
+	gint _tmp68__length1;
+	gint _tmp69_;
+	gint* _tmp70_;
+	gint _tmp70__length1;
+	gint _tmp71_;
+	gint _tmp72_;
+	gint* _tmp73_;
+	gint _tmp73__length1;
+	gint* _tmp74_;
+	gint _tmp74__length1;
+	gint _tmp75_;
+	gint* _tmp76_;
+	gint _tmp76__length1;
+	gint _tmp77_;
+	gint* _tmp78_;
+	gint _tmp78__length1;
+	gint _tmp79_;
+	gint* _tmp80_;
+	gint _tmp80__length1;
+	gint _tmp81_;
+	gint* _tmp82_;
+	gint _tmp82__length1;
+	gint _tmp83_;
+	gint _tmp84_;
+	gint* _tmp85_;
+	gint _tmp85__length1;
+	gint* _tmp86_;
+	gint _tmp86__length1;
+	gint _tmp87_;
+	gint* _tmp88_;
+	gint _tmp88__length1;
+	gint _tmp89_;
+	gint* _tmp90_;
+	gint _tmp90__length1;
+	gint _tmp91_;
+	gint* _tmp92_;
+	gint _tmp92__length1;
+	gint _tmp93_;
+	gint* _tmp94_;
+	gint _tmp94__length1;
+	gint _tmp95_;
+	gint _tmp96_;
+	gint* _tmp97_;
+	gint _tmp97__length1;
+	gint* _tmp98_;
+	gint _tmp98__length1;
+	gint _tmp99_;
+	gint* _tmp100_;
+	gint _tmp100__length1;
+	gint _tmp101_;
+	gint* _tmp102_;
+	gint _tmp102__length1;
+	gint _tmp103_;
+	gint* _tmp104_;
+	gint _tmp104__length1;
+	gint _tmp105_;
+	gint* _tmp106_;
+	gint _tmp106__length1;
+	gint _tmp107_;
+	gint _tmp108_;
 #line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM (self));
 #line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -9460,27 +9460,27 @@ static void rgb_histogram_smooth_extrema (RGBHistogram* self, gint** count_data,
 static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	gint* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	gint* _tmp5_ = NULL;
-	gint* _tmp6_ = NULL;
-	gint* _tmp7_ = NULL;
+	gint* _tmp2_;
+	gint _tmp2__length1;
+	gint* _tmp5_;
+	gint* _tmp6_;
+	gint* _tmp7_;
 	gint* temp_red_counts = NULL;
-	gint* _tmp8_ = NULL;
-	gint temp_red_counts_length1 = 0;
-	gint _temp_red_counts_size_ = 0;
+	gint* _tmp8_;
+	gint temp_red_counts_length1;
+	gint _temp_red_counts_size_;
 	gint* temp_green_counts = NULL;
-	gint* _tmp9_ = NULL;
-	gint temp_green_counts_length1 = 0;
-	gint _temp_green_counts_size_ = 0;
+	gint* _tmp9_;
+	gint temp_green_counts_length1;
+	gint _temp_green_counts_size_;
 	gint* temp_blue_counts = NULL;
-	gint* _tmp10_ = NULL;
-	gint temp_blue_counts_length1 = 0;
-	gint _temp_blue_counts_size_ = 0;
+	gint* _tmp10_;
+	gint temp_blue_counts_length1;
+	gint _temp_blue_counts_size_;
 	gint mean_qual_count = 0;
-	gint _tmp87_ = 0;
+	gint _tmp87_;
 	gint constrained_max_qual_count = 0;
-	gint _tmp88_ = 0;
+	gint _tmp88_;
 #line 1071 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM (self));
 #line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -9490,8 +9490,8 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 #line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ != NULL) {
 #line 9488 "ColorTransformation.c"
-		gint* _tmp3_ = NULL;
-		gint _tmp3__length1 = 0;
+		gint* _tmp3_;
+		gint _tmp3__length1;
 #line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = self->priv->qualitative_green_counts;
 #line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -9507,8 +9507,8 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 #line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp1_) {
 #line 9505 "ColorTransformation.c"
-		gint* _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
+		gint* _tmp4_;
+		gint _tmp4__length1;
 #line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = self->priv->qualitative_blue_counts;
 #line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -9594,35 +9594,35 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 #line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 9592 "ColorTransformation.c"
-				gint _tmp13_ = 0;
-				gint* _tmp14_ = NULL;
-				gint _tmp14__length1 = 0;
-				gint _tmp15_ = 0;
-				gint* _tmp16_ = NULL;
-				gint _tmp16__length1 = 0;
-				gint _tmp17_ = 0;
-				gint _tmp18_ = 0;
-				gint _tmp19_ = 0;
-				gint* _tmp20_ = NULL;
-				gint _tmp20__length1 = 0;
-				gint _tmp21_ = 0;
-				gint* _tmp22_ = NULL;
-				gint _tmp22__length1 = 0;
-				gint _tmp23_ = 0;
-				gint _tmp24_ = 0;
-				gint _tmp25_ = 0;
-				gint* _tmp26_ = NULL;
-				gint _tmp26__length1 = 0;
-				gint _tmp27_ = 0;
-				gint* _tmp28_ = NULL;
-				gint _tmp28__length1 = 0;
-				gint _tmp29_ = 0;
-				gint _tmp30_ = 0;
-				gint _tmp31_ = 0;
+				gint _tmp13_;
+				gint* _tmp14_;
+				gint _tmp14__length1;
+				gint _tmp15_;
+				gint* _tmp16_;
+				gint _tmp16__length1;
+				gint _tmp17_;
+				gint _tmp18_;
+				gint _tmp19_;
+				gint* _tmp20_;
+				gint _tmp20__length1;
+				gint _tmp21_;
+				gint* _tmp22_;
+				gint _tmp22__length1;
+				gint _tmp23_;
+				gint _tmp24_;
+				gint _tmp25_;
+				gint* _tmp26_;
+				gint _tmp26__length1;
+				gint _tmp27_;
+				gint* _tmp28_;
+				gint _tmp28__length1;
+				gint _tmp29_;
+				gint _tmp30_;
+				gint _tmp31_;
 #line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp11_) {
 #line 9620 "ColorTransformation.c"
-					gint _tmp12_ = 0;
+					gint _tmp12_;
 #line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp12_ = i;
 #line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -9709,35 +9709,35 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 #line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 9707 "ColorTransformation.c"
-				gint _tmp34_ = 0;
-				gint* _tmp35_ = NULL;
-				gint _tmp35__length1 = 0;
-				gint _tmp36_ = 0;
-				gint* _tmp37_ = NULL;
-				gint _tmp37__length1 = 0;
-				gint _tmp38_ = 0;
-				gint _tmp39_ = 0;
-				gint _tmp40_ = 0;
-				gint* _tmp41_ = NULL;
-				gint _tmp41__length1 = 0;
-				gint _tmp42_ = 0;
-				gint* _tmp43_ = NULL;
-				gint _tmp43__length1 = 0;
-				gint _tmp44_ = 0;
-				gint _tmp45_ = 0;
-				gint _tmp46_ = 0;
-				gint* _tmp47_ = NULL;
-				gint _tmp47__length1 = 0;
-				gint _tmp48_ = 0;
-				gint* _tmp49_ = NULL;
-				gint _tmp49__length1 = 0;
-				gint _tmp50_ = 0;
-				gint _tmp51_ = 0;
-				gint _tmp52_ = 0;
+				gint _tmp34_;
+				gint* _tmp35_;
+				gint _tmp35__length1;
+				gint _tmp36_;
+				gint* _tmp37_;
+				gint _tmp37__length1;
+				gint _tmp38_;
+				gint _tmp39_;
+				gint _tmp40_;
+				gint* _tmp41_;
+				gint _tmp41__length1;
+				gint _tmp42_;
+				gint* _tmp43_;
+				gint _tmp43__length1;
+				gint _tmp44_;
+				gint _tmp45_;
+				gint _tmp46_;
+				gint* _tmp47_;
+				gint _tmp47__length1;
+				gint _tmp48_;
+				gint* _tmp49_;
+				gint _tmp49__length1;
+				gint _tmp50_;
+				gint _tmp51_;
+				gint _tmp52_;
 #line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp32_) {
 #line 9735 "ColorTransformation.c"
-					gint _tmp33_ = 0;
+					gint _tmp33_;
 #line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp33_ = i;
 #line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -9824,35 +9824,35 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 #line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 9822 "ColorTransformation.c"
-				gint _tmp55_ = 0;
-				gint* _tmp56_ = NULL;
-				gint _tmp56__length1 = 0;
-				gint _tmp57_ = 0;
-				gint* _tmp58_ = NULL;
-				gint _tmp58__length1 = 0;
-				gint _tmp59_ = 0;
-				gint _tmp60_ = 0;
-				gint _tmp61_ = 0;
-				gint* _tmp62_ = NULL;
-				gint _tmp62__length1 = 0;
-				gint _tmp63_ = 0;
-				gint* _tmp64_ = NULL;
-				gint _tmp64__length1 = 0;
-				gint _tmp65_ = 0;
-				gint _tmp66_ = 0;
-				gint _tmp67_ = 0;
-				gint* _tmp68_ = NULL;
-				gint _tmp68__length1 = 0;
-				gint _tmp69_ = 0;
-				gint* _tmp70_ = NULL;
-				gint _tmp70__length1 = 0;
-				gint _tmp71_ = 0;
-				gint _tmp72_ = 0;
-				gint _tmp73_ = 0;
+				gint _tmp55_;
+				gint* _tmp56_;
+				gint _tmp56__length1;
+				gint _tmp57_;
+				gint* _tmp58_;
+				gint _tmp58__length1;
+				gint _tmp59_;
+				gint _tmp60_;
+				gint _tmp61_;
+				gint* _tmp62_;
+				gint _tmp62__length1;
+				gint _tmp63_;
+				gint* _tmp64_;
+				gint _tmp64__length1;
+				gint _tmp65_;
+				gint _tmp66_;
+				gint _tmp67_;
+				gint* _tmp68_;
+				gint _tmp68__length1;
+				gint _tmp69_;
+				gint* _tmp70_;
+				gint _tmp70__length1;
+				gint _tmp71_;
+				gint _tmp72_;
+				gint _tmp73_;
 #line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp53_) {
 #line 9850 "ColorTransformation.c"
-					gint _tmp54_ = 0;
+					gint _tmp54_;
 #line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp54_ = i;
 #line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -9942,24 +9942,24 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 #line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 9940 "ColorTransformation.c"
-				gint _tmp76_ = 0;
-				gint _tmp77_ = 0;
-				gint* _tmp78_ = NULL;
-				gint _tmp78__length1 = 0;
-				gint _tmp79_ = 0;
-				gint _tmp80_ = 0;
-				gint* _tmp81_ = NULL;
-				gint _tmp81__length1 = 0;
-				gint _tmp82_ = 0;
-				gint _tmp83_ = 0;
-				gint* _tmp84_ = NULL;
-				gint _tmp84__length1 = 0;
-				gint _tmp85_ = 0;
-				gint _tmp86_ = 0;
+				gint _tmp76_;
+				gint _tmp77_;
+				gint* _tmp78_;
+				gint _tmp78__length1;
+				gint _tmp79_;
+				gint _tmp80_;
+				gint* _tmp81_;
+				gint _tmp81__length1;
+				gint _tmp82_;
+				gint _tmp83_;
+				gint* _tmp84_;
+				gint _tmp84__length1;
+				gint _tmp85_;
+				gint _tmp86_;
 #line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp74_) {
 #line 9957 "ColorTransformation.c"
-					gint _tmp75_ = 0;
+					gint _tmp75_;
 #line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp75_ = i;
 #line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10029,26 +10029,26 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 #line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 10027 "ColorTransformation.c"
-				gint _tmp91_ = 0;
-				gint* _tmp92_ = NULL;
-				gint _tmp92__length1 = 0;
-				gint _tmp93_ = 0;
-				gint _tmp94_ = 0;
-				gint _tmp95_ = 0;
-				gint* _tmp100_ = NULL;
-				gint _tmp100__length1 = 0;
-				gint _tmp101_ = 0;
-				gint _tmp102_ = 0;
-				gint _tmp103_ = 0;
-				gint* _tmp108_ = NULL;
-				gint _tmp108__length1 = 0;
-				gint _tmp109_ = 0;
-				gint _tmp110_ = 0;
-				gint _tmp111_ = 0;
+				gint _tmp91_;
+				gint* _tmp92_;
+				gint _tmp92__length1;
+				gint _tmp93_;
+				gint _tmp94_;
+				gint _tmp95_;
+				gint* _tmp100_;
+				gint _tmp100__length1;
+				gint _tmp101_;
+				gint _tmp102_;
+				gint _tmp103_;
+				gint* _tmp108_;
+				gint _tmp108__length1;
+				gint _tmp109_;
+				gint _tmp110_;
+				gint _tmp111_;
 #line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp89_) {
 #line 10046 "ColorTransformation.c"
-					gint _tmp90_ = 0;
+					gint _tmp90_;
 #line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp90_ = i;
 #line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10078,11 +10078,11 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 #line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp94_ > _tmp95_) {
 #line 10076 "ColorTransformation.c"
-					gint* _tmp96_ = NULL;
-					gint _tmp96__length1 = 0;
-					gint _tmp97_ = 0;
-					gint _tmp98_ = 0;
-					gint _tmp99_ = 0;
+					gint* _tmp96_;
+					gint _tmp96__length1;
+					gint _tmp97_;
+					gint _tmp98_;
+					gint _tmp99_;
 #line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp96_ = self->priv->qualitative_red_counts;
 #line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10110,11 +10110,11 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 #line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp102_ > _tmp103_) {
 #line 10108 "ColorTransformation.c"
-					gint* _tmp104_ = NULL;
-					gint _tmp104__length1 = 0;
-					gint _tmp105_ = 0;
-					gint _tmp106_ = 0;
-					gint _tmp107_ = 0;
+					gint* _tmp104_;
+					gint _tmp104__length1;
+					gint _tmp105_;
+					gint _tmp106_;
+					gint _tmp107_;
 #line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp104_ = self->priv->qualitative_green_counts;
 #line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10142,11 +10142,11 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 #line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp110_ > _tmp111_) {
 #line 10140 "ColorTransformation.c"
-					gint* _tmp112_ = NULL;
-					gint _tmp112__length1 = 0;
-					gint _tmp113_ = 0;
-					gint _tmp114_ = 0;
-					gint _tmp115_ = 0;
+					gint* _tmp112_;
+					gint _tmp112__length1;
+					gint _tmp113_;
+					gint _tmp114_;
+					gint _tmp115_;
 #line 1131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp112_ = self->priv->qualitative_blue_counts;
 #line 1131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10182,9 +10182,9 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 
 GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 	GdkPixbuf* result = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp121_ = NULL;
-	GdkPixbuf* _tmp122_ = NULL;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp121_;
+	GdkPixbuf* _tmp122_;
 #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_RGB_HISTOGRAM (self), NULL);
 #line 1140 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10193,26 +10193,26 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 	if (_tmp0_ == NULL) {
 #line 10190 "ColorTransformation.c"
 		gint max_count = 0;
-		GdkPixbuf* _tmp25_ = NULL;
+		GdkPixbuf* _tmp25_;
 		gint rowstride = 0;
-		GdkPixbuf* _tmp26_ = NULL;
-		gint _tmp27_ = 0;
-		gint _tmp28_ = 0;
+		GdkPixbuf* _tmp26_;
+		gint _tmp27_;
+		gint _tmp28_;
 		gint sample_bytes = 0;
-		GdkPixbuf* _tmp29_ = NULL;
-		gint _tmp30_ = 0;
+		GdkPixbuf* _tmp29_;
+		gint _tmp30_;
 		gint pixel_bytes = 0;
-		gint _tmp31_ = 0;
-		GdkPixbuf* _tmp32_ = NULL;
-		gint _tmp33_ = 0;
+		gint _tmp31_;
+		GdkPixbuf* _tmp32_;
+		gint _tmp33_;
 		gdouble scale_bar = 0.0;
-		gint _tmp34_ = 0;
+		gint _tmp34_;
 		guchar* pixel_data = NULL;
-		GdkPixbuf* _tmp35_ = NULL;
-		guint8* _tmp36_ = NULL;
-		gint pixel_data_length1 = 0;
-		gint _pixel_data_size_ = 0;
-		gint _tmp37_ = 0;
+		GdkPixbuf* _tmp35_;
+		guint8* _tmp36_;
+		gint pixel_data_length1;
+		gint _pixel_data_size_;
+		gint _tmp37_;
 #line 1141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		rgb_histogram_prepare_qualitative_counts (self);
 #line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10230,26 +10230,26 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 #line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				while (TRUE) {
 #line 10228 "ColorTransformation.c"
-					gint _tmp3_ = 0;
-					gint* _tmp4_ = NULL;
-					gint _tmp4__length1 = 0;
-					gint _tmp5_ = 0;
-					gint _tmp6_ = 0;
-					gint _tmp7_ = 0;
-					gint* _tmp11_ = NULL;
-					gint _tmp11__length1 = 0;
-					gint _tmp12_ = 0;
-					gint _tmp13_ = 0;
-					gint _tmp14_ = 0;
-					gint* _tmp18_ = NULL;
-					gint _tmp18__length1 = 0;
-					gint _tmp19_ = 0;
-					gint _tmp20_ = 0;
-					gint _tmp21_ = 0;
+					gint _tmp3_;
+					gint* _tmp4_;
+					gint _tmp4__length1;
+					gint _tmp5_;
+					gint _tmp6_;
+					gint _tmp7_;
+					gint* _tmp11_;
+					gint _tmp11__length1;
+					gint _tmp12_;
+					gint _tmp13_;
+					gint _tmp14_;
+					gint* _tmp18_;
+					gint _tmp18__length1;
+					gint _tmp19_;
+					gint _tmp20_;
+					gint _tmp21_;
 #line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (!_tmp1_) {
 #line 10247 "ColorTransformation.c"
-						gint _tmp2_ = 0;
+						gint _tmp2_;
 #line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp2_ = i;
 #line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10279,10 +10279,10 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 #line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (_tmp6_ > _tmp7_) {
 #line 10277 "ColorTransformation.c"
-						gint* _tmp8_ = NULL;
-						gint _tmp8__length1 = 0;
-						gint _tmp9_ = 0;
-						gint _tmp10_ = 0;
+						gint* _tmp8_;
+						gint _tmp8__length1;
+						gint _tmp9_;
+						gint _tmp10_;
 #line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp8_ = self->priv->qualitative_red_counts;
 #line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10308,10 +10308,10 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 #line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (_tmp13_ > _tmp14_) {
 #line 10306 "ColorTransformation.c"
-						gint* _tmp15_ = NULL;
-						gint _tmp15__length1 = 0;
-						gint _tmp16_ = 0;
-						gint _tmp17_ = 0;
+						gint* _tmp15_;
+						gint _tmp15__length1;
+						gint _tmp16_;
+						gint _tmp17_;
 #line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp15_ = self->priv->qualitative_green_counts;
 #line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10337,10 +10337,10 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 #line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (_tmp20_ > _tmp21_) {
 #line 10335 "ColorTransformation.c"
-						gint* _tmp22_ = NULL;
-						gint _tmp22__length1 = 0;
-						gint _tmp23_ = 0;
-						gint _tmp24_ = 0;
+						gint* _tmp22_;
+						gint _tmp22__length1;
+						gint _tmp23_;
+						gint _tmp24_;
 #line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp22_ = self->priv->qualitative_blue_counts;
 #line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10403,8 +10403,8 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 #line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp37_ == 0) {
 #line 10401 "ColorTransformation.c"
-			GdkPixbuf* _tmp51_ = NULL;
-			GdkPixbuf* _tmp52_ = NULL;
+			GdkPixbuf* _tmp51_;
+			GdkPixbuf* _tmp52_;
 			{
 				gint i = 0;
 #line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10417,22 +10417,22 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 #line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					while (TRUE) {
 #line 10415 "ColorTransformation.c"
-						gint _tmp40_ = 0;
-						gint _tmp41_ = 0;
-						GdkPixbuf* _tmp42_ = NULL;
-						gint _tmp43_ = 0;
-						gint _tmp44_ = 0;
-						GdkPixbuf* _tmp45_ = NULL;
-						gint _tmp46_ = 0;
-						gint _tmp47_ = 0;
-						guchar* _tmp48_ = NULL;
-						gint _tmp48__length1 = 0;
-						gint _tmp49_ = 0;
-						guchar _tmp50_ = '\0';
+						gint _tmp40_;
+						gint _tmp41_;
+						GdkPixbuf* _tmp42_;
+						gint _tmp43_;
+						gint _tmp44_;
+						GdkPixbuf* _tmp45_;
+						gint _tmp46_;
+						gint _tmp47_;
+						guchar* _tmp48_;
+						gint _tmp48__length1;
+						gint _tmp49_;
+						guchar _tmp50_;
 #line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						if (!_tmp38_) {
 #line 10430 "ColorTransformation.c"
-							gint _tmp39_ = 0;
+							gint _tmp39_;
 #line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp39_ = i;
 #line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10499,41 +10499,41 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 #line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				while (TRUE) {
 #line 10497 "ColorTransformation.c"
-					gint _tmp55_ = 0;
+					gint _tmp55_;
 					gint red_bar_height = 0;
-					gint* _tmp56_ = NULL;
-					gint _tmp56__length1 = 0;
-					gint _tmp57_ = 0;
-					gint _tmp58_ = 0;
-					gdouble _tmp59_ = 0.0;
+					gint* _tmp56_;
+					gint _tmp56__length1;
+					gint _tmp57_;
+					gint _tmp58_;
+					gdouble _tmp59_;
 					gint green_bar_height = 0;
-					gint* _tmp60_ = NULL;
-					gint _tmp60__length1 = 0;
-					gint _tmp61_ = 0;
-					gint _tmp62_ = 0;
-					gdouble _tmp63_ = 0.0;
+					gint* _tmp60_;
+					gint _tmp60__length1;
+					gint _tmp61_;
+					gint _tmp62_;
+					gdouble _tmp63_;
 					gint blue_bar_height = 0;
-					gint* _tmp64_ = NULL;
-					gint _tmp64__length1 = 0;
-					gint _tmp65_ = 0;
-					gint _tmp66_ = 0;
-					gdouble _tmp67_ = 0.0;
+					gint* _tmp64_;
+					gint _tmp64__length1;
+					gint _tmp65_;
+					gint _tmp66_;
+					gdouble _tmp67_;
 					gint max_bar_height = 0;
-					gint _tmp68_ = 0;
-					gint _tmp69_ = 0;
-					gint _tmp70_ = 0;
-					gint _tmp71_ = 0;
-					gint _tmp72_ = 0;
+					gint _tmp68_;
+					gint _tmp69_;
+					gint _tmp70_;
+					gint _tmp71_;
+					gint _tmp72_;
 					gint y = 0;
 					gint pixel_index = 0;
-					gint _tmp73_ = 0;
-					gint _tmp74_ = 0;
-					gint _tmp75_ = 0;
-					gint _tmp76_ = 0;
+					gint _tmp73_;
+					gint _tmp74_;
+					gint _tmp75_;
+					gint _tmp76_;
 #line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (!_tmp53_) {
 #line 10531 "ColorTransformation.c"
-						gint _tmp54_ = 0;
+						gint _tmp54_;
 #line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp54_ = x;
 #line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10618,32 +10618,32 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 #line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						while (TRUE) {
 #line 10616 "ColorTransformation.c"
-							gint _tmp79_ = 0;
-							gint _tmp80_ = 0;
-							guchar* _tmp81_ = NULL;
-							gint _tmp81__length1 = 0;
-							gint _tmp82_ = 0;
-							guchar _tmp83_ = '\0';
-							guchar* _tmp84_ = NULL;
-							gint _tmp84__length1 = 0;
-							gint _tmp85_ = 0;
-							guchar _tmp86_ = '\0';
-							guchar* _tmp87_ = NULL;
-							gint _tmp87__length1 = 0;
-							gint _tmp88_ = 0;
-							guchar _tmp89_ = '\0';
-							gint _tmp90_ = 0;
-							gint _tmp91_ = 0;
-							gint _tmp95_ = 0;
-							gint _tmp96_ = 0;
-							gint _tmp100_ = 0;
-							gint _tmp101_ = 0;
-							gint _tmp105_ = 0;
-							gint _tmp106_ = 0;
+							gint _tmp79_;
+							gint _tmp80_;
+							guchar* _tmp81_;
+							gint _tmp81__length1;
+							gint _tmp82_;
+							guchar _tmp83_;
+							guchar* _tmp84_;
+							gint _tmp84__length1;
+							gint _tmp85_;
+							guchar _tmp86_;
+							guchar* _tmp87_;
+							gint _tmp87__length1;
+							gint _tmp88_;
+							guchar _tmp89_;
+							gint _tmp90_;
+							gint _tmp91_;
+							gint _tmp95_;
+							gint _tmp96_;
+							gint _tmp100_;
+							gint _tmp101_;
+							gint _tmp105_;
+							gint _tmp106_;
 #line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!_tmp77_) {
 #line 10641 "ColorTransformation.c"
-								gint _tmp78_ = 0;
+								gint _tmp78_;
 #line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp78_ = y;
 #line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10699,10 +10699,10 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 #line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (_tmp90_ >= ((RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp91_) - 1)) {
 #line 10697 "ColorTransformation.c"
-								guchar* _tmp92_ = NULL;
-								gint _tmp92__length1 = 0;
-								gint _tmp93_ = 0;
-								guchar _tmp94_ = '\0';
+								guchar* _tmp92_;
+								gint _tmp92__length1;
+								gint _tmp93_;
+								guchar _tmp94_;
 #line 1192 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp92_ = pixel_data;
 #line 1192 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10722,10 +10722,10 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 #line 1193 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (_tmp95_ >= ((RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp96_) - 1)) {
 #line 10720 "ColorTransformation.c"
-								guchar* _tmp97_ = NULL;
-								gint _tmp97__length1 = 0;
-								gint _tmp98_ = 0;
-								guchar _tmp99_ = '\0';
+								guchar* _tmp97_;
+								gint _tmp97__length1;
+								gint _tmp98_;
+								guchar _tmp99_;
 #line 1194 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp97_ = pixel_data;
 #line 1194 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10745,10 +10745,10 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 #line 1195 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (_tmp100_ >= ((RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp101_) - 1)) {
 #line 10743 "ColorTransformation.c"
-								guchar* _tmp102_ = NULL;
-								gint _tmp102__length1 = 0;
-								gint _tmp103_ = 0;
-								guchar _tmp104_ = '\0';
+								guchar* _tmp102_;
+								gint _tmp102__length1;
+								gint _tmp103_;
+								guchar _tmp104_;
 #line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp102_ = pixel_data;
 #line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10777,25 +10777,25 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 #line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						while (TRUE) {
 #line 10775 "ColorTransformation.c"
-							gint _tmp109_ = 0;
-							guchar* _tmp110_ = NULL;
-							gint _tmp110__length1 = 0;
-							gint _tmp111_ = 0;
-							guchar _tmp112_ = '\0';
-							guchar* _tmp113_ = NULL;
-							gint _tmp113__length1 = 0;
-							gint _tmp114_ = 0;
-							guchar _tmp115_ = '\0';
-							guchar* _tmp116_ = NULL;
-							gint _tmp116__length1 = 0;
-							gint _tmp117_ = 0;
-							guchar _tmp118_ = '\0';
-							gint _tmp119_ = 0;
-							gint _tmp120_ = 0;
+							gint _tmp109_;
+							guchar* _tmp110_;
+							gint _tmp110__length1;
+							gint _tmp111_;
+							guchar _tmp112_;
+							guchar* _tmp113_;
+							gint _tmp113__length1;
+							gint _tmp114_;
+							guchar _tmp115_;
+							guchar* _tmp116_;
+							gint _tmp116__length1;
+							gint _tmp117_;
+							guchar _tmp118_;
+							gint _tmp119_;
+							gint _tmp120_;
 #line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!_tmp107_) {
 #line 10793 "ColorTransformation.c"
-								gint _tmp108_ = 0;
+								gint _tmp108_;
 #line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp108_ = y;
 #line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -10909,7 +10909,7 @@ static gchar* value_rgb_histogram_collect_value (GValue* value, guint n_collect_
 #line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
 #line 10907 "ColorTransformation.c"
-		RGBHistogram* object;
+		RGBHistogram * object;
 		object = collect_values[0].v_pointer;
 #line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -10936,7 +10936,7 @@ static gchar* value_rgb_histogram_collect_value (GValue* value, guint n_collect_
 
 
 static gchar* value_rgb_histogram_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	RGBHistogram** object_p;
+	RGBHistogram ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
@@ -10988,7 +10988,7 @@ gpointer value_get_rgb_histogram (const GValue* value) {
 
 
 void value_set_rgb_histogram (GValue* value, gpointer v_object) {
-	RGBHistogram* old;
+	RGBHistogram * old;
 #line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_RGB_HISTOGRAM));
 #line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -11019,7 +11019,7 @@ void value_set_rgb_histogram (GValue* value, gpointer v_object) {
 
 
 void value_take_rgb_histogram (GValue* value, gpointer v_object) {
-	RGBHistogram* old;
+	RGBHistogram * old;
 #line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_RGB_HISTOGRAM));
 #line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -11059,9 +11059,9 @@ static void rgb_histogram_class_init (RGBHistogramClass * klass) {
 
 
 static void rgb_histogram_instance_init (RGBHistogram * self) {
-	gint* _tmp0_ = NULL;
-	gint* _tmp1_ = NULL;
-	gint* _tmp2_ = NULL;
+	gint* _tmp0_;
+	gint* _tmp1_;
+	gint* _tmp2_;
 #line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = RGB_HISTOGRAM_GET_PRIVATE (self);
 #line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -11114,7 +11114,7 @@ static void rgb_histogram_instance_init (RGBHistogram * self) {
 }
 
 
-static void rgb_histogram_finalize (RGBHistogram* obj) {
+static void rgb_histogram_finalize (RGBHistogram * obj) {
 	RGBHistogram * self;
 #line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RGB_HISTOGRAM, RGBHistogram);
@@ -11153,7 +11153,7 @@ GType rgb_histogram_get_type (void) {
 
 
 gpointer rgb_histogram_ref (gpointer instance) {
-	RGBHistogram* self;
+	RGBHistogram * self;
 	self = instance;
 #line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -11164,7 +11164,7 @@ gpointer rgb_histogram_ref (gpointer instance) {
 
 
 void rgb_histogram_unref (gpointer instance) {
-	RGBHistogram* self;
+	RGBHistogram * self;
 	self = instance;
 #line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -11180,32 +11180,32 @@ void rgb_histogram_unref (gpointer instance) {
 IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf* pixbuf) {
 	IntensityHistogram* self = NULL;
 	gint n_channels = 0;
-	GdkPixbuf* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	GdkPixbuf* _tmp0_;
+	gint _tmp1_;
 	gint rowstride = 0;
-	GdkPixbuf* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	GdkPixbuf* _tmp2_;
+	gint _tmp3_;
 	gint width = 0;
-	GdkPixbuf* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	GdkPixbuf* _tmp4_;
+	gint _tmp5_;
 	gint height = 0;
-	GdkPixbuf* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
+	GdkPixbuf* _tmp6_;
+	gint _tmp7_;
 	gint rowbytes = 0;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
+	gint _tmp8_;
+	gint _tmp9_;
 	guchar* pixels = NULL;
-	GdkPixbuf* _tmp10_ = NULL;
-	guint8* _tmp11_ = NULL;
-	gint pixels_length1 = 0;
-	gint _pixels_size_ = 0;
+	GdkPixbuf* _tmp10_;
+	guint8* _tmp11_;
+	gint pixels_length1;
+	gint _pixels_size_;
 	gfloat pixel_count = 0.0F;
-	GdkPixbuf* _tmp41_ = NULL;
-	gint _tmp42_ = 0;
-	gint _tmp43_ = 0;
-	GdkPixbuf* _tmp44_ = NULL;
-	gint _tmp45_ = 0;
-	gint _tmp46_ = 0;
+	GdkPixbuf* _tmp41_;
+	gint _tmp42_;
+	gint _tmp43_;
+	GdkPixbuf* _tmp44_;
+	gint _tmp45_;
+	gint _tmp46_;
 	gfloat accumulator = 0.0F;
 #line 1220 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
@@ -11264,18 +11264,18 @@ IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf*
 #line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 11262 "ColorTransformation.c"
-				gint _tmp14_ = 0;
-				gint _tmp15_ = 0;
+				gint _tmp14_;
+				gint _tmp15_;
 				gint row_start_index = 0;
-				gint _tmp16_ = 0;
-				gint _tmp17_ = 0;
+				gint _tmp16_;
+				gint _tmp17_;
 				gint row_end_index = 0;
-				gint _tmp18_ = 0;
-				gint _tmp19_ = 0;
+				gint _tmp18_;
+				gint _tmp19_;
 #line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp12_) {
 #line 11273 "ColorTransformation.c"
-					gint _tmp13_ = 0;
+					gint _tmp13_;
 #line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp13_ = j;
 #line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -11309,7 +11309,7 @@ IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf*
 #line 11305 "ColorTransformation.c"
 				{
 					gint i = 0;
-					gint _tmp20_ = 0;
+					gint _tmp20_;
 #line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp20_ = row_start_index;
 #line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -11322,35 +11322,35 @@ IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf*
 #line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						while (TRUE) {
 #line 11320 "ColorTransformation.c"
-							gint _tmp24_ = 0;
-							gint _tmp25_ = 0;
+							gint _tmp24_;
+							gint _tmp25_;
 							RGBAnalyticPixel pix_rgb = {0};
-							guchar* _tmp26_ = NULL;
-							gint _tmp26__length1 = 0;
-							gint _tmp27_ = 0;
-							guchar _tmp28_ = '\0';
-							guchar* _tmp29_ = NULL;
-							gint _tmp29__length1 = 0;
-							gint _tmp30_ = 0;
-							guchar _tmp31_ = '\0';
-							guchar* _tmp32_ = NULL;
-							gint _tmp32__length1 = 0;
-							gint _tmp33_ = 0;
-							guchar _tmp34_ = '\0';
+							guchar* _tmp26_;
+							gint _tmp26__length1;
+							gint _tmp27_;
+							guchar _tmp28_;
+							guchar* _tmp29_;
+							gint _tmp29__length1;
+							gint _tmp30_;
+							guchar _tmp31_;
+							guchar* _tmp32_;
+							gint _tmp32__length1;
+							gint _tmp33_;
+							guchar _tmp34_;
 							HSVAnalyticPixel pix_hsi = {0};
-							RGBAnalyticPixel _tmp35_ = {0};
+							RGBAnalyticPixel _tmp35_;
 							gint quantized_light_value = 0;
-							HSVAnalyticPixel _tmp36_ = {0};
-							gfloat _tmp37_ = 0.0F;
-							gint* _tmp38_ = NULL;
-							gint _tmp38__length1 = 0;
-							gint _tmp39_ = 0;
-							gint _tmp40_ = 0;
+							HSVAnalyticPixel _tmp36_;
+							gfloat _tmp37_;
+							gint* _tmp38_;
+							gint _tmp38__length1;
+							gint _tmp39_;
+							gint _tmp40_;
 #line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!_tmp21_) {
 #line 11347 "ColorTransformation.c"
-								gint _tmp22_ = 0;
-								gint _tmp23_ = 0;
+								gint _tmp22_;
+								gint _tmp23_;
 #line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp22_ = i;
 #line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -11453,30 +11453,30 @@ IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf*
 #line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 11451 "ColorTransformation.c"
-				gint _tmp49_ = 0;
-				gfloat* _tmp50_ = NULL;
-				gint _tmp50__length1 = 0;
-				gint _tmp51_ = 0;
-				gint* _tmp52_ = NULL;
-				gint _tmp52__length1 = 0;
-				gint _tmp53_ = 0;
-				gint _tmp54_ = 0;
-				gfloat _tmp55_ = 0.0F;
-				gfloat _tmp56_ = 0.0F;
-				gfloat _tmp57_ = 0.0F;
-				gfloat* _tmp58_ = NULL;
-				gint _tmp58__length1 = 0;
-				gint _tmp59_ = 0;
-				gfloat _tmp60_ = 0.0F;
-				gfloat* _tmp61_ = NULL;
-				gint _tmp61__length1 = 0;
-				gint _tmp62_ = 0;
-				gfloat _tmp63_ = 0.0F;
-				gfloat _tmp64_ = 0.0F;
+				gint _tmp49_;
+				gfloat* _tmp50_;
+				gint _tmp50__length1;
+				gint _tmp51_;
+				gint* _tmp52_;
+				gint _tmp52__length1;
+				gint _tmp53_;
+				gint _tmp54_;
+				gfloat _tmp55_;
+				gfloat _tmp56_;
+				gfloat _tmp57_;
+				gfloat* _tmp58_;
+				gint _tmp58__length1;
+				gint _tmp59_;
+				gfloat _tmp60_;
+				gfloat* _tmp61_;
+				gint _tmp61__length1;
+				gint _tmp62_;
+				gfloat _tmp63_;
+				gfloat _tmp64_;
 #line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp47_) {
 #line 11474 "ColorTransformation.c"
-					gint _tmp48_ = 0;
+					gint _tmp48_;
 #line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp48_ = i;
 #line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -11556,12 +11556,12 @@ IntensityHistogram* intensity_histogram_new (GdkPixbuf* pixbuf) {
 
 gfloat intensity_histogram_get_cumulative_probability (IntensityHistogram* self, gint level) {
 	gfloat result = 0.0F;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gfloat* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	gint _tmp3_ = 0;
-	gfloat _tmp4_ = 0.0F;
+	gint _tmp0_;
+	gint _tmp1_;
+	gfloat* _tmp2_;
+	gint _tmp2__length1;
+	gint _tmp3_;
+	gfloat _tmp4_;
 #line 1248 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_INTENSITY_HISTOGRAM (self), 0.0F);
 #line 1250 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -11628,7 +11628,7 @@ static gchar* value_intensity_histogram_collect_value (GValue* value, guint n_co
 #line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
 #line 11626 "ColorTransformation.c"
-		IntensityHistogram* object;
+		IntensityHistogram * object;
 		object = collect_values[0].v_pointer;
 #line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -11655,7 +11655,7 @@ static gchar* value_intensity_histogram_collect_value (GValue* value, guint n_co
 
 
 static gchar* value_intensity_histogram_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	IntensityHistogram** object_p;
+	IntensityHistogram ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
@@ -11707,7 +11707,7 @@ gpointer value_get_intensity_histogram (const GValue* value) {
 
 
 void value_set_intensity_histogram (GValue* value, gpointer v_object) {
-	IntensityHistogram* old;
+	IntensityHistogram * old;
 #line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INTENSITY_HISTOGRAM));
 #line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -11738,7 +11738,7 @@ void value_set_intensity_histogram (GValue* value, gpointer v_object) {
 
 
 void value_take_intensity_histogram (GValue* value, gpointer v_object) {
-	IntensityHistogram* old;
+	IntensityHistogram * old;
 #line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INTENSITY_HISTOGRAM));
 #line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -11778,9 +11778,9 @@ static void intensity_histogram_class_init (IntensityHistogramClass * klass) {
 
 
 static void intensity_histogram_instance_init (IntensityHistogram * self) {
-	gint* _tmp0_ = NULL;
-	gfloat* _tmp1_ = NULL;
-	gfloat* _tmp2_ = NULL;
+	gint* _tmp0_;
+	gfloat* _tmp1_;
+	gfloat* _tmp2_;
 #line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = INTENSITY_HISTOGRAM_GET_PRIVATE (self);
 #line 1216 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -11813,7 +11813,7 @@ static void intensity_histogram_instance_init (IntensityHistogram * self) {
 }
 
 
-static void intensity_histogram_finalize (IntensityHistogram* obj) {
+static void intensity_histogram_finalize (IntensityHistogram * obj) {
 	IntensityHistogram * self;
 #line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_INTENSITY_HISTOGRAM, IntensityHistogram);
@@ -11844,7 +11844,7 @@ GType intensity_histogram_get_type (void) {
 
 
 gpointer intensity_histogram_ref (gpointer instance) {
-	IntensityHistogram* self;
+	IntensityHistogram * self;
 	self = instance;
 #line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -11855,7 +11855,7 @@ gpointer intensity_histogram_ref (gpointer instance) {
 
 
 void intensity_histogram_unref (gpointer instance) {
-	IntensityHistogram* self;
+	IntensityHistogram * self;
 	self = instance;
 #line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -11870,7 +11870,7 @@ void intensity_histogram_unref (gpointer instance) {
 
 ExpansionTransformation* expansion_transformation_construct (GType object_type, IntensityHistogram* histogram) {
 	ExpansionTransformation* self = NULL;
-	gfloat* _tmp0_ = NULL;
+	gfloat* _tmp0_;
 	gfloat LOW_KINK_MASS = 0.0F;
 	gfloat HIGH_KINK_MASS = 0.0F;
 #line 1263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -11894,11 +11894,11 @@ ExpansionTransformation* expansion_transformation_construct (GType object_type,
 #line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	while (TRUE) {
 #line 11892 "ColorTransformation.c"
-		IntensityHistogram* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
-		gfloat _tmp3_ = 0.0F;
-		gfloat _tmp4_ = 0.0F;
-		gint _tmp5_ = 0;
+		IntensityHistogram* _tmp1_;
+		gint _tmp2_;
+		gfloat _tmp3_;
+		gfloat _tmp4_;
+		gint _tmp5_;
 #line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = histogram;
 #line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -11927,11 +11927,11 @@ ExpansionTransformation* expansion_transformation_construct (GType object_type,
 	while (TRUE) {
 #line 11924 "ColorTransformation.c"
 		gboolean _tmp6_ = FALSE;
-		IntensityHistogram* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gfloat _tmp9_ = 0.0F;
-		gfloat _tmp10_ = 0.0F;
-		gint _tmp12_ = 0;
+		IntensityHistogram* _tmp7_;
+		gint _tmp8_;
+		gfloat _tmp9_;
+		gfloat _tmp10_;
+		gint _tmp12_;
 #line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = histogram;
 #line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -11943,7 +11943,7 @@ ExpansionTransformation* expansion_transformation_construct (GType object_type,
 #line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp9_ > _tmp10_) {
 #line 11941 "ColorTransformation.c"
-			gint _tmp11_ = 0;
+			gint _tmp11_;
 #line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp11_ = self->priv->high_kink;
 #line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -11983,14 +11983,14 @@ ExpansionTransformation* expansion_transformation_new (IntensityHistogram* histo
 
 ExpansionTransformation* expansion_transformation_construct_from_extrema (GType object_type, gint black_point, gint white_point) {
 	ExpansionTransformation* self = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp9_;
+	gint _tmp10_;
 #line 1282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (ExpansionTransformation*) hsv_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION);
 #line 1284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12012,7 +12012,7 @@ ExpansionTransformation* expansion_transformation_construct_from_extrema (GType
 #line 1287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp4_ == _tmp5_) {
 #line 12010 "ColorTransformation.c"
-		gint _tmp6_ = 0;
+		gint _tmp6_;
 #line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = black_point;
 #line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12021,7 +12021,7 @@ ExpansionTransformation* expansion_transformation_construct_from_extrema (GType
 			white_point = 1;
 #line 12018 "ColorTransformation.c"
 		} else {
-			gint _tmp7_ = 0;
+			gint _tmp7_;
 #line 1290 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp7_ = white_point;
 #line 1290 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12030,7 +12030,7 @@ ExpansionTransformation* expansion_transformation_construct_from_extrema (GType
 				black_point = 254;
 #line 12027 "ColorTransformation.c"
 			} else {
-				gint _tmp8_ = 0;
+				gint _tmp8_;
 #line 1293 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp8_ = white_point;
 #line 1293 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12065,21 +12065,21 @@ ExpansionTransformation* expansion_transformation_new_from_extrema (gint black_p
 static gchar* string_chug (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1199 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1226 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1228 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1228 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strchug (_tmp1_);
-#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1229 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1229 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 12080 "ColorTransformation.c"
 }
@@ -12088,21 +12088,21 @@ static gchar* string_chug (const gchar* self) {
 static gchar* string_chomp (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1191 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1218 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strchomp (_tmp1_);
-#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 12103 "ColorTransformation.c"
 }
@@ -12110,16 +12110,16 @@ static gchar* string_chomp (const gchar* self) {
 
 ExpansionTransformation* expansion_transformation_construct_from_string (GType object_type, const gchar* encoded_transformation) {
 	ExpansionTransformation* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 	gint num_captured = 0;
-	const gchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
+	const gchar* _tmp7_;
+	gint _tmp8_;
 #line 1302 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (encoded_transformation != NULL, NULL);
 #line 1303 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12168,19 +12168,19 @@ ExpansionTransformation* expansion_transformation_new_from_string (const gchar*
 
 
 static void expansion_transformation_build_remap_table (ExpansionTransformation* self) {
-	gfloat* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	gfloat* _tmp0_;
+	gint _tmp0__length1;
 	gfloat low_kink_f = 0.0F;
-	gint _tmp2_ = 0;
+	gint _tmp2_;
 	gfloat high_kink_f = 0.0F;
-	gint _tmp3_ = 0;
+	gint _tmp3_;
 	gfloat slope = 0.0F;
-	gfloat _tmp4_ = 0.0F;
-	gfloat _tmp5_ = 0.0F;
+	gfloat _tmp4_;
+	gfloat _tmp5_;
 	gfloat intercept = 0.0F;
-	gfloat _tmp6_ = 0.0F;
-	gfloat _tmp7_ = 0.0F;
-	gfloat _tmp8_ = 0.0F;
+	gfloat _tmp6_;
+	gfloat _tmp7_;
+	gfloat _tmp8_;
 	gint i = 0;
 #line 1317 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_EXPANSION_TRANSFORMATION (self));
@@ -12191,7 +12191,7 @@ static void expansion_transformation_build_remap_table (ExpansionTransformation*
 #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp0_ == NULL) {
 #line 12189 "ColorTransformation.c"
-		gfloat* _tmp1_ = NULL;
+		gfloat* _tmp1_;
 #line 1319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = g_new0 (gfloat, 256);
 #line 1319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12236,16 +12236,16 @@ static void expansion_transformation_build_remap_table (ExpansionTransformation*
 #line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
 #line 12234 "ColorTransformation.c"
-			gint _tmp11_ = 0;
-			gint _tmp12_ = 0;
-			gfloat* _tmp13_ = NULL;
-			gint _tmp13__length1 = 0;
-			gint _tmp14_ = 0;
-			gfloat _tmp15_ = 0.0F;
+			gint _tmp11_;
+			gint _tmp12_;
+			gfloat* _tmp13_;
+			gint _tmp13__length1;
+			gint _tmp14_;
+			gfloat _tmp15_;
 #line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!_tmp9_) {
 #line 12243 "ColorTransformation.c"
-				gint _tmp10_ = 0;
+				gint _tmp10_;
 #line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp10_ = i;
 #line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12284,19 +12284,19 @@ static void expansion_transformation_build_remap_table (ExpansionTransformation*
 #line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
 #line 12282 "ColorTransformation.c"
-			gint _tmp18_ = 0;
-			gint _tmp19_ = 0;
-			gfloat* _tmp20_ = NULL;
-			gint _tmp20__length1 = 0;
-			gint _tmp21_ = 0;
-			gfloat _tmp22_ = 0.0F;
-			gint _tmp23_ = 0;
-			gfloat _tmp24_ = 0.0F;
-			gfloat _tmp25_ = 0.0F;
+			gint _tmp18_;
+			gint _tmp19_;
+			gfloat* _tmp20_;
+			gint _tmp20__length1;
+			gint _tmp21_;
+			gfloat _tmp22_;
+			gint _tmp23_;
+			gfloat _tmp24_;
+			gfloat _tmp25_;
 #line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!_tmp16_) {
 #line 12294 "ColorTransformation.c"
-				gint _tmp17_ = 0;
+				gint _tmp17_;
 #line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp17_ = i;
 #line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12341,15 +12341,15 @@ static void expansion_transformation_build_remap_table (ExpansionTransformation*
 #line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
 #line 12339 "ColorTransformation.c"
-			gint _tmp28_ = 0;
-			gfloat* _tmp29_ = NULL;
-			gint _tmp29__length1 = 0;
-			gint _tmp30_ = 0;
-			gfloat _tmp31_ = 0.0F;
+			gint _tmp28_;
+			gfloat* _tmp29_;
+			gint _tmp29__length1;
+			gint _tmp30_;
+			gfloat _tmp31_;
 #line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!_tmp26_) {
 #line 12347 "ColorTransformation.c"
-				gint _tmp27_ = 0;
+				gint _tmp27_;
 #line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp27_ = i;
 #line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12385,16 +12385,16 @@ static void expansion_transformation_build_remap_table (ExpansionTransformation*
 static void expansion_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* pixel, HSVAnalyticPixel* result) {
 	ExpansionTransformation * self;
 	gint remap_index = 0;
-	HSVAnalyticPixel _tmp0_ = {0};
-	gfloat _tmp1_ = 0.0F;
+	HSVAnalyticPixel _tmp0_;
+	gfloat _tmp1_;
 	HSVAnalyticPixel _result_ = {0};
-	HSVAnalyticPixel _tmp2_ = {0};
-	gfloat* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gfloat _tmp4_ = 0.0F;
-	HSVAnalyticPixel _tmp5_ = {0};
-	gfloat _tmp6_ = 0.0F;
-	gfloat _tmp7_ = 0.0F;
+	HSVAnalyticPixel _tmp2_;
+	gfloat* _tmp3_;
+	gint _tmp3__length1;
+	gfloat _tmp4_;
+	HSVAnalyticPixel _tmp5_;
+	gfloat _tmp6_;
+	gfloat _tmp7_;
 #line 1338 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
 #line 1338 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12436,9 +12436,9 @@ static void expansion_transformation_real_transform_pixel_hsv (PixelTransformati
 static gchar* expansion_transformation_real_to_string (PixelTransformation* base) {
 	ExpansionTransformation * self;
 	gchar* result = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
+	gint _tmp0_;
+	gint _tmp1_;
+	gchar* _tmp2_;
 #line 1349 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
 #line 1350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12457,7 +12457,7 @@ static gchar* expansion_transformation_real_to_string (PixelTransformation* base
 
 gint expansion_transformation_get_white_point (ExpansionTransformation* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 1353 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_EXPANSION_TRANSFORMATION (self), 0);
 #line 1354 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12472,7 +12472,7 @@ gint expansion_transformation_get_white_point (ExpansionTransformation* self) {
 
 gint expansion_transformation_get_black_point (ExpansionTransformation* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 1357 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_EXPANSION_TRANSFORMATION (self), 0);
 #line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12489,7 +12489,7 @@ static gboolean expansion_transformation_real_is_identity (PixelTransformation*
 	ExpansionTransformation * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 #line 1361 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
 #line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12497,7 +12497,7 @@ static gboolean expansion_transformation_real_is_identity (PixelTransformation*
 #line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp1_ == 0) {
 #line 12495 "ColorTransformation.c"
-		gint _tmp2_ = 0;
+		gint _tmp2_;
 #line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp2_ = self->priv->high_kink;
 #line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12519,9 +12519,9 @@ static gboolean expansion_transformation_real_is_identity (PixelTransformation*
 static PixelTransformation* expansion_transformation_real_copy (PixelTransformation* base) {
 	ExpansionTransformation * self;
 	PixelTransformation* result = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	ExpansionTransformation* _tmp2_ = NULL;
+	gint _tmp0_;
+	gint _tmp1_;
+	ExpansionTransformation* _tmp2_;
 #line 1365 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
 #line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12546,13 +12546,13 @@ static void expansion_transformation_class_init (ExpansionTransformationClass *
 #line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (ExpansionTransformationPrivate));
 #line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*)(PixelTransformation*, HSVAnalyticPixel*, HSVAnalyticPixel*)) expansion_transformation_real_transform_pixel_hsv;
+	((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*) (PixelTransformation *, HSVAnalyticPixel*, HSVAnalyticPixel*)) expansion_transformation_real_transform_pixel_hsv;
 #line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->to_string = (gchar* (*)(PixelTransformation*)) expansion_transformation_real_to_string;
+	((PixelTransformationClass *) klass)->to_string = (gchar* (*) (PixelTransformation *)) expansion_transformation_real_to_string;
 #line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->is_identity = (gboolean (*)(PixelTransformation*)) expansion_transformation_real_is_identity;
+	((PixelTransformationClass *) klass)->is_identity = (gboolean (*) (PixelTransformation *)) expansion_transformation_real_is_identity;
 #line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*)(PixelTransformation*)) expansion_transformation_real_copy;
+	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*) (PixelTransformation *)) expansion_transformation_real_copy;
 #line 12552 "ColorTransformation.c"
 }
 
@@ -12570,7 +12570,7 @@ static void expansion_transformation_instance_init (ExpansionTransformation * se
 }
 
 
-static void expansion_transformation_finalize (PixelTransformation* obj) {
+static void expansion_transformation_finalize (PixelTransformation * obj) {
 	ExpansionTransformation * self;
 #line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
@@ -12596,15 +12596,15 @@ GType expansion_transformation_get_type (void) {
 
 ShadowDetailTransformation* shadow_detail_transformation_construct (GType object_type, gfloat user_intensity) {
 	ShadowDetailTransformation* self = NULL;
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 	gfloat intensity_adj = 0.0F;
-	gfloat _tmp1_ = 0.0F;
-	gfloat _tmp2_ = 0.0F;
+	gfloat _tmp1_;
+	gfloat _tmp2_;
 	gfloat effect_shift = 0.0F;
-	gfloat _tmp3_ = 0.0F;
+	gfloat _tmp3_;
 	HermiteGammaApproximationFunction* func = NULL;
-	HermiteGammaApproximationFunction* _tmp4_ = NULL;
-	gfloat* _tmp5_ = NULL;
+	HermiteGammaApproximationFunction* _tmp4_;
+	gfloat* _tmp5_;
 #line 1383 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (ShadowDetailTransformation*) hsv_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_SHADOWS);
 #line 1385 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12648,26 +12648,26 @@ ShadowDetailTransformation* shadow_detail_transformation_construct (GType object
 #line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 12646 "ColorTransformation.c"
-				gint _tmp8_ = 0;
+				gint _tmp8_;
 				gfloat x = 0.0F;
-				gint _tmp9_ = 0;
+				gint _tmp9_;
 				gfloat weight = 0.0F;
-				HermiteGammaApproximationFunction* _tmp10_ = NULL;
-				gfloat _tmp11_ = 0.0F;
-				gfloat _tmp12_ = 0.0F;
-				gfloat* _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
-				gint _tmp14_ = 0;
-				gfloat _tmp15_ = 0.0F;
-				gfloat _tmp16_ = 0.0F;
-				gfloat _tmp17_ = 0.0F;
-				gfloat _tmp18_ = 0.0F;
-				gfloat _tmp19_ = 0.0F;
-				gfloat _tmp20_ = 0.0F;
+				HermiteGammaApproximationFunction* _tmp10_;
+				gfloat _tmp11_;
+				gfloat _tmp12_;
+				gfloat* _tmp13_;
+				gint _tmp13__length1;
+				gint _tmp14_;
+				gfloat _tmp15_;
+				gfloat _tmp16_;
+				gfloat _tmp17_;
+				gfloat _tmp18_;
+				gfloat _tmp19_;
+				gfloat _tmp20_;
 #line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp6_) {
 #line 12665 "ColorTransformation.c"
-					gint _tmp7_ = 0;
+					gint _tmp7_;
 #line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp7_ = i;
 #line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12738,13 +12738,13 @@ ShadowDetailTransformation* shadow_detail_transformation_new (gfloat user_intens
 static void shadow_detail_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* pixel, HSVAnalyticPixel* result) {
 	ShadowDetailTransformation * self;
 	HSVAnalyticPixel _result_ = {0};
-	HSVAnalyticPixel _tmp0_ = {0};
-	gfloat* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	HSVAnalyticPixel _tmp2_ = {0};
-	gfloat _tmp3_ = 0.0F;
-	gfloat _tmp4_ = 0.0F;
-	gfloat _tmp5_ = 0.0F;
+	HSVAnalyticPixel _tmp0_;
+	gfloat* _tmp1_;
+	gint _tmp1__length1;
+	HSVAnalyticPixel _tmp2_;
+	gfloat _tmp3_;
+	gfloat _tmp4_;
+	gfloat _tmp5_;
 #line 1400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
 #line 1400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12778,8 +12778,8 @@ static void shadow_detail_transformation_real_transform_pixel_hsv (PixelTransfor
 static PixelTransformation* shadow_detail_transformation_real_copy (PixelTransformation* base) {
 	ShadowDetailTransformation * self;
 	PixelTransformation* result = NULL;
-	gfloat _tmp0_ = 0.0F;
-	ShadowDetailTransformation* _tmp1_ = NULL;
+	gfloat _tmp0_;
+	ShadowDetailTransformation* _tmp1_;
 #line 1406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
 #line 1407 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12797,7 +12797,7 @@ static PixelTransformation* shadow_detail_transformation_real_copy (PixelTransfo
 static gboolean shadow_detail_transformation_real_is_identity (PixelTransformation* base) {
 	ShadowDetailTransformation * self;
 	gboolean result = FALSE;
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 #line 1410 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
 #line 1411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12812,7 +12812,7 @@ static gboolean shadow_detail_transformation_real_is_identity (PixelTransformati
 
 gfloat shadow_detail_transformation_get_parameter (ShadowDetailTransformation* self) {
 	gfloat result = 0.0F;
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 #line 1414 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_SHADOW_DETAIL_TRANSFORMATION (self), 0.0F);
 #line 1415 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12833,11 +12833,11 @@ static void shadow_detail_transformation_class_init (ShadowDetailTransformationC
 #line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (ShadowDetailTransformationPrivate));
 #line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*)(PixelTransformation*, HSVAnalyticPixel*, HSVAnalyticPixel*)) shadow_detail_transformation_real_transform_pixel_hsv;
+	((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*) (PixelTransformation *, HSVAnalyticPixel*, HSVAnalyticPixel*)) shadow_detail_transformation_real_transform_pixel_hsv;
 #line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*)(PixelTransformation*)) shadow_detail_transformation_real_copy;
+	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*) (PixelTransformation *)) shadow_detail_transformation_real_copy;
 #line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->is_identity = (gboolean (*)(PixelTransformation*)) shadow_detail_transformation_real_is_identity;
+	((PixelTransformationClass *) klass)->is_identity = (gboolean (*) (PixelTransformation *)) shadow_detail_transformation_real_is_identity;
 #line 12837 "ColorTransformation.c"
 }
 
@@ -12857,7 +12857,7 @@ static void shadow_detail_transformation_instance_init (ShadowDetailTransformati
 }
 
 
-static void shadow_detail_transformation_finalize (PixelTransformation* obj) {
+static void shadow_detail_transformation_finalize (PixelTransformation * obj) {
 	ShadowDetailTransformation * self;
 #line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
@@ -12883,9 +12883,9 @@ GType shadow_detail_transformation_get_type (void) {
 
 HermiteGammaApproximationFunction* hermite_gamma_approximation_function_construct (GType object_type, gfloat user_interval_upper) {
 	HermiteGammaApproximationFunction* self = NULL;
-	gfloat _tmp0_ = 0.0F;
-	gfloat _tmp1_ = 0.0F;
-	gfloat _tmp2_ = 0.0F;
+	gfloat _tmp0_;
+	gfloat _tmp1_;
+	gfloat _tmp2_;
 #line 1423 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (HermiteGammaApproximationFunction*) g_type_create_instance (object_type);
 #line 1424 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12913,7 +12913,7 @@ HermiteGammaApproximationFunction* hermite_gamma_approximation_function_new (gfl
 
 gfloat hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationFunction* self, gfloat x) {
 	gfloat result = 0.0F;
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 #line 1428 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_HERMITE_GAMMA_APPROXIMATION_FUNCTION (self), 0.0F);
 #line 1429 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12926,8 +12926,8 @@ gfloat hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationF
 		return result;
 #line 12923 "ColorTransformation.c"
 	} else {
-		gfloat _tmp1_ = 0.0F;
-		gfloat _tmp2_ = 0.0F;
+		gfloat _tmp1_;
+		gfloat _tmp2_;
 #line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = x;
 #line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -12941,17 +12941,17 @@ gfloat hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationF
 #line 12937 "ColorTransformation.c"
 		} else {
 			gfloat indep_var = 0.0F;
-			gfloat _tmp3_ = 0.0F;
-			gfloat _tmp4_ = 0.0F;
+			gfloat _tmp3_;
+			gfloat _tmp4_;
 			gfloat dep_var = 0.0F;
-			gfloat _tmp5_ = 0.0F;
-			gfloat _tmp6_ = 0.0F;
-			gfloat _tmp7_ = 0.0F;
-			gfloat _tmp8_ = 0.0F;
-			gfloat _tmp9_ = 0.0F;
-			gfloat _tmp10_ = 0.0F;
-			gfloat _tmp11_ = 0.0F;
-			gfloat _tmp12_ = 0.0F;
+			gfloat _tmp5_;
+			gfloat _tmp6_;
+			gfloat _tmp7_;
+			gfloat _tmp8_;
+			gfloat _tmp9_;
+			gfloat _tmp10_;
+			gfloat _tmp11_;
+			gfloat _tmp12_;
 #line 1434 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp3_ = self->priv->x_scale;
 #line 1434 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -13028,7 +13028,7 @@ static gchar* value_hermite_gamma_approximation_function_collect_value (GValue*
 #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
 #line 13026 "ColorTransformation.c"
-		HermiteGammaApproximationFunction* object;
+		HermiteGammaApproximationFunction * object;
 		object = collect_values[0].v_pointer;
 #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -13055,7 +13055,7 @@ static gchar* value_hermite_gamma_approximation_function_collect_value (GValue*
 
 
 static gchar* value_hermite_gamma_approximation_function_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	HermiteGammaApproximationFunction** object_p;
+	HermiteGammaApproximationFunction ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
@@ -13107,7 +13107,7 @@ gpointer value_get_hermite_gamma_approximation_function (const GValue* value) {
 
 
 void value_set_hermite_gamma_approximation_function (GValue* value, gpointer v_object) {
-	HermiteGammaApproximationFunction* old;
+	HermiteGammaApproximationFunction * old;
 #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION));
 #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -13138,7 +13138,7 @@ void value_set_hermite_gamma_approximation_function (GValue* value, gpointer v_o
 
 
 void value_take_hermite_gamma_approximation_function (GValue* value, gpointer v_object) {
-	HermiteGammaApproximationFunction* old;
+	HermiteGammaApproximationFunction * old;
 #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION));
 #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -13190,7 +13190,7 @@ static void hermite_gamma_approximation_function_instance_init (HermiteGammaAppr
 }
 
 
-static void hermite_gamma_approximation_function_finalize (HermiteGammaApproximationFunction* obj) {
+static void hermite_gamma_approximation_function_finalize (HermiteGammaApproximationFunction * obj) {
 	HermiteGammaApproximationFunction * self;
 #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION, HermiteGammaApproximationFunction);
@@ -13215,7 +13215,7 @@ GType hermite_gamma_approximation_function_get_type (void) {
 
 
 gpointer hermite_gamma_approximation_function_ref (gpointer instance) {
-	HermiteGammaApproximationFunction* self;
+	HermiteGammaApproximationFunction * self;
 	self = instance;
 #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -13226,7 +13226,7 @@ gpointer hermite_gamma_approximation_function_ref (gpointer instance) {
 
 
 void hermite_gamma_approximation_function_unref (gpointer instance) {
-	HermiteGammaApproximationFunction* self;
+	HermiteGammaApproximationFunction * self;
 	self = instance;
 #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -13241,15 +13241,15 @@ void hermite_gamma_approximation_function_unref (gpointer instance) {
 
 HighlightDetailTransformation* highlight_detail_transformation_construct (GType object_type, gfloat user_intensity) {
 	HighlightDetailTransformation* self = NULL;
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 	gfloat intensity_adj = 0.0F;
-	gfloat _tmp1_ = 0.0F;
-	gfloat _tmp2_ = 0.0F;
+	gfloat _tmp1_;
+	gfloat _tmp2_;
 	gfloat effect_shift = 0.0F;
-	gfloat _tmp3_ = 0.0F;
+	gfloat _tmp3_;
 	HermiteGammaApproximationFunction* func = NULL;
-	HermiteGammaApproximationFunction* _tmp4_ = NULL;
-	gfloat* _tmp5_ = NULL;
+	HermiteGammaApproximationFunction* _tmp4_;
+	gfloat* _tmp5_;
 #line 1457 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (HighlightDetailTransformation*) hsv_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS);
 #line 1459 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -13293,26 +13293,26 @@ HighlightDetailTransformation* highlight_detail_transformation_construct (GType
 #line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 13291 "ColorTransformation.c"
-				gint _tmp8_ = 0;
+				gint _tmp8_;
 				gfloat x = 0.0F;
-				gint _tmp9_ = 0;
+				gint _tmp9_;
 				gfloat weight = 0.0F;
-				HermiteGammaApproximationFunction* _tmp10_ = NULL;
-				gfloat _tmp11_ = 0.0F;
-				gfloat _tmp12_ = 0.0F;
-				gfloat* _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
-				gint _tmp14_ = 0;
-				gfloat _tmp15_ = 0.0F;
-				gfloat _tmp16_ = 0.0F;
-				gfloat _tmp17_ = 0.0F;
-				gfloat _tmp18_ = 0.0F;
-				gfloat _tmp19_ = 0.0F;
-				gfloat _tmp20_ = 0.0F;
+				HermiteGammaApproximationFunction* _tmp10_;
+				gfloat _tmp11_;
+				gfloat _tmp12_;
+				gfloat* _tmp13_;
+				gint _tmp13__length1;
+				gint _tmp14_;
+				gfloat _tmp15_;
+				gfloat _tmp16_;
+				gfloat _tmp17_;
+				gfloat _tmp18_;
+				gfloat _tmp19_;
+				gfloat _tmp20_;
 #line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp6_) {
 #line 13310 "ColorTransformation.c"
-					gint _tmp7_ = 0;
+					gint _tmp7_;
 #line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp7_ = i;
 #line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -13383,13 +13383,13 @@ HighlightDetailTransformation* highlight_detail_transformation_new (gfloat user_
 static void highlight_detail_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* pixel, HSVAnalyticPixel* result) {
 	HighlightDetailTransformation * self;
 	HSVAnalyticPixel _result_ = {0};
-	HSVAnalyticPixel _tmp0_ = {0};
-	gfloat* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	HSVAnalyticPixel _tmp2_ = {0};
-	gfloat _tmp3_ = 0.0F;
-	gfloat _tmp4_ = 0.0F;
-	gfloat _tmp5_ = 0.0F;
+	HSVAnalyticPixel _tmp0_;
+	gfloat* _tmp1_;
+	gint _tmp1__length1;
+	HSVAnalyticPixel _tmp2_;
+	gfloat _tmp3_;
+	gfloat _tmp4_;
+	gfloat _tmp5_;
 #line 1474 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
 #line 1474 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -13423,8 +13423,8 @@ static void highlight_detail_transformation_real_transform_pixel_hsv (PixelTrans
 static PixelTransformation* highlight_detail_transformation_real_copy (PixelTransformation* base) {
 	HighlightDetailTransformation * self;
 	PixelTransformation* result = NULL;
-	gfloat _tmp0_ = 0.0F;
-	HighlightDetailTransformation* _tmp1_ = NULL;
+	gfloat _tmp0_;
+	HighlightDetailTransformation* _tmp1_;
 #line 1480 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
 #line 1481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -13442,7 +13442,7 @@ static PixelTransformation* highlight_detail_transformation_real_copy (PixelTran
 static gboolean highlight_detail_transformation_real_is_identity (PixelTransformation* base) {
 	HighlightDetailTransformation * self;
 	gboolean result = FALSE;
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 #line 1484 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
 #line 1485 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -13457,7 +13457,7 @@ static gboolean highlight_detail_transformation_real_is_identity (PixelTransform
 
 gfloat highlight_detail_transformation_get_parameter (HighlightDetailTransformation* self) {
 	gfloat result = 0.0F;
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 #line 1488 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_HIGHLIGHT_DETAIL_TRANSFORMATION (self), 0.0F);
 #line 1489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -13478,11 +13478,11 @@ static void highlight_detail_transformation_class_init (HighlightDetailTransform
 #line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (HighlightDetailTransformationPrivate));
 #line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*)(PixelTransformation*, HSVAnalyticPixel*, HSVAnalyticPixel*)) highlight_detail_transformation_real_transform_pixel_hsv;
+	((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*) (PixelTransformation *, HSVAnalyticPixel*, HSVAnalyticPixel*)) highlight_detail_transformation_real_transform_pixel_hsv;
 #line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*)(PixelTransformation*)) highlight_detail_transformation_real_copy;
+	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*) (PixelTransformation *)) highlight_detail_transformation_real_copy;
 #line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->is_identity = (gboolean (*)(PixelTransformation*)) highlight_detail_transformation_real_is_identity;
+	((PixelTransformationClass *) klass)->is_identity = (gboolean (*) (PixelTransformation *)) highlight_detail_transformation_real_is_identity;
 #line 13482 "ColorTransformation.c"
 }
 
@@ -13502,7 +13502,7 @@ static void highlight_detail_transformation_instance_init (HighlightDetailTransf
 }
 
 
-static void highlight_detail_transformation_finalize (PixelTransformation* obj) {
+static void highlight_detail_transformation_finalize (PixelTransformation * obj) {
 	HighlightDetailTransformation * self;
 #line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
@@ -13529,41 +13529,41 @@ GType highlight_detail_transformation_get_type (void) {
 PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixbuf* pixbuf) {
 	PixelTransformationBundle* result = NULL;
 	PixelTransformationBundle* adjustments = NULL;
-	PixelTransformationBundle* _tmp0_ = NULL;
+	PixelTransformationBundle* _tmp0_;
 	IntensityHistogram* analysis_histogram = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	IntensityHistogram* _tmp2_ = NULL;
+	GdkPixbuf* _tmp1_;
+	IntensityHistogram* _tmp2_;
 	gfloat pct_in_range = 0.0F;
-	IntensityHistogram* _tmp3_ = NULL;
-	gfloat _tmp4_ = 0.0F;
-	IntensityHistogram* _tmp5_ = NULL;
-	gfloat _tmp6_ = 0.0F;
+	IntensityHistogram* _tmp3_;
+	gfloat _tmp4_;
+	IntensityHistogram* _tmp5_;
+	gfloat _tmp6_;
 	gfloat shadow_range_mean_prob_val = 0.0F;
-	IntensityHistogram* _tmp7_ = NULL;
-	gfloat _tmp8_ = 0.0F;
-	IntensityHistogram* _tmp9_ = NULL;
-	gfloat _tmp10_ = 0.0F;
+	IntensityHistogram* _tmp7_;
+	gfloat _tmp8_;
+	IntensityHistogram* _tmp9_;
+	gfloat _tmp10_;
 	gint shadow_mean_intensity = 0;
 	gboolean _tmp18_ = FALSE;
-	gfloat _tmp19_ = 0.0F;
-	PixelTransformationBundle* _tmp46_ = NULL;
-	HighlightDetailTransformation* _tmp47_ = NULL;
-	HighlightDetailTransformation* _tmp48_ = NULL;
-	PixelTransformationBundle* _tmp49_ = NULL;
-	TemperatureTransformation* _tmp50_ = NULL;
-	TemperatureTransformation* _tmp51_ = NULL;
-	PixelTransformationBundle* _tmp52_ = NULL;
-	TintTransformation* _tmp53_ = NULL;
-	TintTransformation* _tmp54_ = NULL;
-	PixelTransformationBundle* _tmp55_ = NULL;
-	ExposureTransformation* _tmp56_ = NULL;
-	ExposureTransformation* _tmp57_ = NULL;
-	PixelTransformationBundle* _tmp58_ = NULL;
-	ContrastTransformation* _tmp59_ = NULL;
-	ContrastTransformation* _tmp60_ = NULL;
-	PixelTransformationBundle* _tmp61_ = NULL;
-	SaturationTransformation* _tmp62_ = NULL;
-	SaturationTransformation* _tmp63_ = NULL;
+	gfloat _tmp19_;
+	PixelTransformationBundle* _tmp46_;
+	HighlightDetailTransformation* _tmp47_;
+	HighlightDetailTransformation* _tmp48_;
+	PixelTransformationBundle* _tmp49_;
+	TemperatureTransformation* _tmp50_;
+	TemperatureTransformation* _tmp51_;
+	PixelTransformationBundle* _tmp52_;
+	TintTransformation* _tmp53_;
+	TintTransformation* _tmp54_;
+	PixelTransformationBundle* _tmp55_;
+	ExposureTransformation* _tmp56_;
+	ExposureTransformation* _tmp57_;
+	PixelTransformationBundle* _tmp58_;
+	ContrastTransformation* _tmp59_;
+	ContrastTransformation* _tmp60_;
+	PixelTransformationBundle* _tmp61_;
+	SaturationTransformation* _tmp62_;
+	SaturationTransformation* _tmp63_;
 #line 1502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
 #line 1503 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -13606,15 +13606,15 @@ PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixb
 #line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
 #line 13604 "ColorTransformation.c"
-			gint _tmp13_ = 0;
-			IntensityHistogram* _tmp14_ = NULL;
-			gint _tmp15_ = 0;
-			gfloat _tmp16_ = 0.0F;
-			gfloat _tmp17_ = 0.0F;
+			gint _tmp13_;
+			IntensityHistogram* _tmp14_;
+			gint _tmp15_;
+			gfloat _tmp16_;
+			gfloat _tmp17_;
 #line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!_tmp11_) {
 #line 13612 "ColorTransformation.c"
-				gint _tmp12_ = 0;
+				gint _tmp12_;
 #line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp12_ = shadow_mean_intensity;
 #line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -13656,13 +13656,13 @@ PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixb
 #line 13652 "ColorTransformation.c"
 	} else {
 		gboolean _tmp20_ = FALSE;
-		gfloat _tmp21_ = 0.0F;
+		gfloat _tmp21_;
 #line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp21_ = pct_in_range;
 #line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp21_ > 20.0f) {
 #line 13660 "ColorTransformation.c"
-			gint _tmp22_ = 0;
+			gint _tmp22_;
 #line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp22_ = shadow_mean_intensity;
 #line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -13681,17 +13681,17 @@ PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixb
 	if (_tmp18_) {
 #line 13678 "ColorTransformation.c"
 		gfloat shadow_trans_effect_size = 0.0F;
-		gint _tmp23_ = 0;
-		gfloat _tmp24_ = 0.0F;
-		PixelTransformationBundle* _tmp25_ = NULL;
-		gfloat _tmp26_ = 0.0F;
-		ShadowDetailTransformation* _tmp27_ = NULL;
-		ShadowDetailTransformation* _tmp28_ = NULL;
+		gint _tmp23_;
+		gfloat _tmp24_;
+		PixelTransformationBundle* _tmp25_;
+		gfloat _tmp26_;
+		ShadowDetailTransformation* _tmp27_;
+		ShadowDetailTransformation* _tmp28_;
 		gint discard_point = 0;
-		PixelTransformationBundle* _tmp35_ = NULL;
-		gint _tmp36_ = 0;
-		ExpansionTransformation* _tmp37_ = NULL;
-		ExpansionTransformation* _tmp38_ = NULL;
+		PixelTransformationBundle* _tmp35_;
+		gint _tmp36_;
+		ExpansionTransformation* _tmp37_;
+		ExpansionTransformation* _tmp38_;
 #line 1529 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp23_ = shadow_mean_intensity;
 #line 1529 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -13722,14 +13722,14 @@ PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixb
 #line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
 #line 13720 "ColorTransformation.c"
-				gint _tmp31_ = 0;
-				IntensityHistogram* _tmp32_ = NULL;
-				gint _tmp33_ = 0;
-				gfloat _tmp34_ = 0.0F;
+				gint _tmp31_;
+				IntensityHistogram* _tmp32_;
+				gint _tmp33_;
+				gfloat _tmp34_;
 #line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp29_) {
 #line 13727 "ColorTransformation.c"
-					gint _tmp30_ = 0;
+					gint _tmp30_;
 #line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp30_ = discard_point;
 #line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -13774,13 +13774,13 @@ PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixb
 		_pixel_transformation_unref0 (_tmp38_);
 #line 13771 "ColorTransformation.c"
 	} else {
-		PixelTransformationBundle* _tmp39_ = NULL;
-		IntensityHistogram* _tmp40_ = NULL;
-		ExpansionTransformation* _tmp41_ = NULL;
-		ExpansionTransformation* _tmp42_ = NULL;
-		PixelTransformationBundle* _tmp43_ = NULL;
-		ShadowDetailTransformation* _tmp44_ = NULL;
-		ShadowDetailTransformation* _tmp45_ = NULL;
+		PixelTransformationBundle* _tmp39_;
+		IntensityHistogram* _tmp40_;
+		ExpansionTransformation* _tmp41_;
+		ExpansionTransformation* _tmp42_;
+		PixelTransformationBundle* _tmp43_;
+		ShadowDetailTransformation* _tmp44_;
+		ShadowDetailTransformation* _tmp45_;
 #line 1549 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp39_ = adjustments;
 #line 1549 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
diff --git a/src/CommandManager.c b/src/CommandManager.c
index a661c01..bc54284 100644
--- a/src/CommandManager.c
+++ b/src/CommandManager.c
@@ -1,4 +1,4 @@
-/* CommandManager.c generated by valac 0.34.7, the Vala compiler
+/* CommandManager.c generated by valac 0.36.6, the Vala compiler
  * generated from CommandManager.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -47,6 +47,11 @@ typedef struct _CommandManagerClass CommandManagerClass;
 typedef struct _CommandManagerPrivate CommandManagerPrivate;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 typedef struct _ParamSpecCommandManager ParamSpecCommandManager;
+enum  {
+	COMMAND_MANAGER_ALTERED_SIGNAL,
+	COMMAND_MANAGER_LAST_SIGNAL
+};
+static guint command_manager_signals[COMMAND_MANAGER_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -103,7 +108,7 @@ struct _ParamSpecCommandManager {
 
 
 static gpointer command_parent_class = NULL;
-static CommandDescriptionIface* command_command_description_parent_iface = NULL;
+static CommandDescriptionIface * command_command_description_parent_iface = NULL;
 static gpointer command_manager_parent_class = NULL;
 
 GType command_description_get_type (void) G_GNUC_CONST;
@@ -138,7 +143,7 @@ gchar* command_get_explanation (Command* self);
 static gchar* command_real_get_explanation (Command* self);
 CommandManager* command_get_command_manager (Command* self);
 void command_internal_set_command_manager (Command* self, CommandManager* manager);
-static void command_finalize (GObject* obj);
+static void command_finalize (GObject * obj);
 #define COMMAND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_COMMAND_MANAGER, CommandManagerPrivate))
 enum  {
 	COMMAND_MANAGER_DUMMY_PROPERTY
@@ -158,7 +163,7 @@ static Command* command_manager_pop (CommandManager* self, GeeArrayList* stack);
 CommandDescription* command_manager_get_redo_description (CommandManager* self);
 gboolean command_manager_redo (CommandManager* self);
 static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void command_manager_finalize (CommandManager* obj);
+static void command_manager_finalize (CommandManager * obj);
 
 
 gchar* command_description_get_name (CommandDescription* self) {
@@ -166,7 +171,7 @@ gchar* command_description_get_name (CommandDescription* self) {
 	g_return_val_if_fail (IS_COMMAND_DESCRIPTION (self), NULL);
 #line 8 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return COMMAND_DESCRIPTION_GET_INTERFACE (self)->get_name (self);
-#line 170 "CommandManager.c"
+#line 175 "CommandManager.c"
 }
 
 
@@ -175,7 +180,7 @@ gchar* command_description_get_explanation (CommandDescription* self) {
 	g_return_val_if_fail (IS_COMMAND_DESCRIPTION (self), NULL);
 #line 10 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return COMMAND_DESCRIPTION_GET_INTERFACE (self)->get_explanation (self);
-#line 179 "CommandManager.c"
+#line 184 "CommandManager.c"
 }
 
 
@@ -186,7 +191,7 @@ static void command_description_base_init (CommandDescriptionIface * iface) {
 	if (!initialized) {
 #line 7 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		initialized = TRUE;
-#line 190 "CommandManager.c"
+#line 195 "CommandManager.c"
 	}
 }
 
@@ -206,10 +211,10 @@ GType command_description_get_type (void) {
 
 Command* command_construct (GType object_type, const gchar* name, const gchar* explanation) {
 	Command * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 32 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 32 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -234,7 +239,7 @@ Command* command_construct (GType object_type, const gchar* name, const gchar* e
 	self->priv->explanation = _tmp3_;
 #line 32 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return self;
-#line 238 "CommandManager.c"
+#line 243 "CommandManager.c"
 }
 
 
@@ -247,7 +252,7 @@ void command_prepare (Command* self) {
 	g_return_if_fail (IS_COMMAND (self));
 #line 43 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	COMMAND_GET_CLASS (self)->prepare (self);
-#line 251 "CommandManager.c"
+#line 256 "CommandManager.c"
 }
 
 
@@ -256,7 +261,7 @@ static void command_real_execute (Command* self) {
 	g_critical ("Type `%s' does not implement abstract method `command_execute'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 46 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return;
-#line 260 "CommandManager.c"
+#line 265 "CommandManager.c"
 }
 
 
@@ -265,7 +270,7 @@ void command_execute (Command* self) {
 	g_return_if_fail (IS_COMMAND (self));
 #line 46 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	COMMAND_GET_CLASS (self)->execute (self);
-#line 269 "CommandManager.c"
+#line 274 "CommandManager.c"
 }
 
 
@@ -274,7 +279,7 @@ static void command_real_undo (Command* self) {
 	g_critical ("Type `%s' does not implement abstract method `command_undo'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 48 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return;
-#line 278 "CommandManager.c"
+#line 283 "CommandManager.c"
 }
 
 
@@ -283,14 +288,14 @@ void command_undo (Command* self) {
 	g_return_if_fail (IS_COMMAND (self));
 #line 48 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	COMMAND_GET_CLASS (self)->undo (self);
-#line 287 "CommandManager.c"
+#line 292 "CommandManager.c"
 }
 
 
 static void command_real_redo (Command* self) {
 #line 51 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	command_execute (self);
-#line 294 "CommandManager.c"
+#line 299 "CommandManager.c"
 }
 
 
@@ -299,7 +304,7 @@ void command_redo (Command* self) {
 	g_return_if_fail (IS_COMMAND (self));
 #line 50 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	COMMAND_GET_CLASS (self)->redo (self);
-#line 303 "CommandManager.c"
+#line 308 "CommandManager.c"
 }
 
 
@@ -311,7 +316,7 @@ static gboolean command_real_compress (Command* self, Command* command) {
 	result = FALSE;
 #line 57 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 315 "CommandManager.c"
+#line 320 "CommandManager.c"
 }
 
 
@@ -320,14 +325,14 @@ gboolean command_compress (Command* self, Command* command) {
 	g_return_val_if_fail (IS_COMMAND (self), FALSE);
 #line 56 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return COMMAND_GET_CLASS (self)->compress (self, command);
-#line 324 "CommandManager.c"
+#line 329 "CommandManager.c"
 }
 
 
 static gchar* command_real_get_name (Command* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 61 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp0_ = self->priv->name;
 #line 61 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -336,7 +341,7 @@ static gchar* command_real_get_name (Command* self) {
 	result = _tmp1_;
 #line 61 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 340 "CommandManager.c"
+#line 345 "CommandManager.c"
 }
 
 
@@ -345,14 +350,14 @@ gchar* command_get_name (Command* self) {
 	g_return_val_if_fail (IS_COMMAND (self), NULL);
 #line 60 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return COMMAND_GET_CLASS (self)->get_name (self);
-#line 349 "CommandManager.c"
+#line 354 "CommandManager.c"
 }
 
 
 static gchar* command_real_get_explanation (Command* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp0_ = self->priv->explanation;
 #line 65 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -361,7 +366,7 @@ static gchar* command_real_get_explanation (Command* self) {
 	result = _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 365 "CommandManager.c"
+#line 370 "CommandManager.c"
 }
 
 
@@ -370,21 +375,21 @@ gchar* command_get_explanation (Command* self) {
 	g_return_val_if_fail (IS_COMMAND (self), NULL);
 #line 64 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return COMMAND_GET_CLASS (self)->get_explanation (self);
-#line 374 "CommandManager.c"
+#line 379 "CommandManager.c"
 }
 
 
 static gpointer _command_manager_ref0 (gpointer self) {
 #line 69 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return self ? command_manager_ref (self) : NULL;
-#line 381 "CommandManager.c"
+#line 386 "CommandManager.c"
 }
 
 
 CommandManager* command_get_command_manager (Command* self) {
 	CommandManager* result = NULL;
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_val_if_fail (IS_COMMAND (self), NULL);
 #line 69 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -395,13 +400,13 @@ CommandManager* command_get_command_manager (Command* self) {
 	result = _tmp1_;
 #line 69 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 399 "CommandManager.c"
+#line 404 "CommandManager.c"
 }
 
 
 void command_internal_set_command_manager (Command* self, CommandManager* manager) {
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
 #line 73 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_if_fail (IS_COMMAND (self));
 #line 73 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -414,7 +419,7 @@ void command_internal_set_command_manager (Command* self, CommandManager* manage
 	_tmp1_ = manager;
 #line 76 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	self->priv->manager = _tmp1_;
-#line 418 "CommandManager.c"
+#line 423 "CommandManager.c"
 }
 
 
@@ -424,22 +429,22 @@ static void command_class_init (CommandClass * klass) {
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_type_class_add_private (klass, sizeof (CommandPrivate));
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	((CommandClass *) klass)->prepare = (void (*)(Command*)) command_real_prepare;
+	((CommandClass *) klass)->prepare = (void (*) (Command *)) command_real_prepare;
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) command_real_execute;
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) command_real_undo;
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	((CommandClass *) klass)->redo = (void (*)(Command*)) command_real_redo;
+	((CommandClass *) klass)->redo = (void (*) (Command *)) command_real_redo;
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) command_real_compress;
+	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) command_real_compress;
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	((CommandClass *) klass)->get_name = (gchar* (*)(Command*)) command_real_get_name;
+	((CommandClass *) klass)->get_name = (gchar* (*) (Command *)) command_real_get_name;
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	((CommandClass *) klass)->get_explanation = (gchar* (*)(Command*)) command_real_get_explanation;
+	((CommandClass *) klass)->get_explanation = (gchar* (*) (Command *)) command_real_get_explanation;
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	G_OBJECT_CLASS (klass)->finalize = command_finalize;
-#line 443 "CommandManager.c"
+#line 448 "CommandManager.c"
 }
 
 
@@ -447,10 +452,10 @@ static void command_command_description_interface_init (CommandDescriptionIface
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	command_command_description_parent_iface = g_type_interface_peek_parent (iface);
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	iface->get_name = (gchar* (*)(CommandDescription*)) command_get_name;
+	iface->get_name = (gchar* (*) (CommandDescription *)) command_get_name;
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	iface->get_explanation = (gchar* (*)(CommandDescription*)) command_get_explanation;
-#line 454 "CommandManager.c"
+	iface->get_explanation = (gchar* (*) (CommandDescription *)) command_get_explanation;
+#line 459 "CommandManager.c"
 }
 
 
@@ -459,11 +464,11 @@ static void command_instance_init (Command * self) {
 	self->priv = COMMAND_GET_PRIVATE (self);
 #line 30 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	self->priv->manager = NULL;
-#line 463 "CommandManager.c"
+#line 468 "CommandManager.c"
 }
 
 
-static void command_finalize (GObject* obj) {
+static void command_finalize (GObject * obj) {
 	Command * self;
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COMMAND, Command);
@@ -473,7 +478,7 @@ static void command_finalize (GObject* obj) {
 	_g_free0 (self->priv->explanation);
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	G_OBJECT_CLASS (command_parent_class)->finalize (obj);
-#line 477 "CommandManager.c"
+#line 482 "CommandManager.c"
 }
 
 
@@ -493,8 +498,8 @@ GType command_get_type (void) {
 
 CommandManager* command_manager_construct (GType object_type, gint depth) {
 	CommandManager* self = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 89 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	self = (CommandManager*) g_type_create_instance (object_type);
 #line 90 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -507,20 +512,20 @@ CommandManager* command_manager_construct (GType object_type, gint depth) {
 	self->priv->depth = _tmp1_;
 #line 89 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return self;
-#line 511 "CommandManager.c"
+#line 516 "CommandManager.c"
 }
 
 
 CommandManager* command_manager_new (gint depth) {
 #line 89 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return command_manager_construct (TYPE_COMMAND_MANAGER, depth);
-#line 518 "CommandManager.c"
+#line 523 "CommandManager.c"
 }
 
 
 void command_manager_reset (CommandManager* self) {
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp1_;
 #line 95 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_if_fail (IS_COMMAND_MANAGER (self));
 #line 96 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -532,24 +537,24 @@ void command_manager_reset (CommandManager* self) {
 #line 97 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 99 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	g_signal_emit_by_name (self, "altered", FALSE, FALSE);
-#line 537 "CommandManager.c"
+	g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, FALSE, FALSE);
+#line 542 "CommandManager.c"
 }
 
 
 void command_manager_execute (CommandManager* self, Command* command) {
-	Command* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
+	Command* _tmp0_;
+	GeeArrayList* _tmp1_;
 	Command* top_command = NULL;
-	GeeArrayList* _tmp2_ = NULL;
-	Command* _tmp3_ = NULL;
-	Command* _tmp4_ = NULL;
-	GeeArrayList* _tmp8_ = NULL;
-	Command* _tmp9_ = NULL;
-	Command* _tmp10_ = NULL;
-	Command* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
-	gboolean _tmp13_ = FALSE;
+	GeeArrayList* _tmp2_;
+	Command* _tmp3_;
+	Command* _tmp4_;
+	GeeArrayList* _tmp8_;
+	Command* _tmp9_;
+	Command* _tmp10_;
+	Command* _tmp11_;
+	gboolean _tmp12_;
+	gboolean _tmp13_;
 #line 102 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_if_fail (IS_COMMAND_MANAGER (self));
 #line 102 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -572,10 +577,10 @@ void command_manager_execute (CommandManager* self, Command* command) {
 	_tmp4_ = top_command;
 #line 111 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	if (_tmp4_ != NULL) {
-#line 576 "CommandManager.c"
-		Command* _tmp5_ = NULL;
-		Command* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+#line 581 "CommandManager.c"
+		Command* _tmp5_;
+		Command* _tmp6_;
+		gboolean _tmp7_;
 #line 112 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		_tmp5_ = top_command;
 #line 112 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -588,7 +593,7 @@ void command_manager_execute (CommandManager* self, Command* command) {
 			_g_object_unref0 (top_command);
 #line 113 "/home/jens/Source/shotwell/src/CommandManager.vala"
 			return;
-#line 592 "CommandManager.c"
+#line 597 "CommandManager.c"
 		}
 	}
 #line 117 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -610,18 +615,18 @@ void command_manager_execute (CommandManager* self, Command* command) {
 #line 123 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp13_ = command_manager_can_redo (self);
 #line 123 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	g_signal_emit_by_name (self, "altered", _tmp12_, _tmp13_);
+	g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, _tmp12_, _tmp13_);
 #line 102 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_g_object_unref0 (top_command);
-#line 617 "CommandManager.c"
+#line 622 "CommandManager.c"
 }
 
 
 gboolean command_manager_can_undo (CommandManager* self) {
 	gboolean result = FALSE;
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 126 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_val_if_fail (IS_COMMAND_MANAGER (self), FALSE);
 #line 127 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -634,14 +639,14 @@ gboolean command_manager_can_undo (CommandManager* self) {
 	result = _tmp2_ > 0;
 #line 127 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 638 "CommandManager.c"
+#line 643 "CommandManager.c"
 }
 
 
 CommandDescription* command_manager_get_undo_description (CommandManager* self) {
 	CommandDescription* result = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	Command* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	Command* _tmp1_;
 #line 130 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_val_if_fail (IS_COMMAND_MANAGER (self), NULL);
 #line 131 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -652,22 +657,22 @@ CommandDescription* command_manager_get_undo_description (CommandManager* self)
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND_DESCRIPTION, CommandDescription);
 #line 131 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 656 "CommandManager.c"
+#line 661 "CommandManager.c"
 }
 
 
 gboolean command_manager_undo (CommandManager* self) {
 	gboolean result = FALSE;
 	Command* command = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	Command* _tmp1_ = NULL;
-	Command* _tmp2_ = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	Command* _tmp4_ = NULL;
-	Command* _tmp5_ = NULL;
-	Command* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	gboolean _tmp8_ = FALSE;
+	GeeArrayList* _tmp0_;
+	Command* _tmp1_;
+	Command* _tmp2_;
+	GeeArrayList* _tmp3_;
+	Command* _tmp4_;
+	Command* _tmp5_;
+	Command* _tmp6_;
+	gboolean _tmp7_;
+	gboolean _tmp8_;
 #line 134 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_val_if_fail (IS_COMMAND_MANAGER (self), FALSE);
 #line 135 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -686,7 +691,7 @@ gboolean command_manager_undo (CommandManager* self) {
 		_g_object_unref0 (command);
 #line 137 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		return result;
-#line 690 "CommandManager.c"
+#line 695 "CommandManager.c"
 	}
 #line 140 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp3_ = self->priv->redo_stack;
@@ -707,22 +712,22 @@ gboolean command_manager_undo (CommandManager* self) {
 #line 147 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp8_ = command_manager_can_redo (self);
 #line 147 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	g_signal_emit_by_name (self, "altered", _tmp7_, _tmp8_);
+	g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, _tmp7_, _tmp8_);
 #line 149 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	result = TRUE;
 #line 149 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_g_object_unref0 (command);
 #line 149 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 718 "CommandManager.c"
+#line 723 "CommandManager.c"
 }
 
 
 gboolean command_manager_can_redo (CommandManager* self) {
 	gboolean result = FALSE;
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 152 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_val_if_fail (IS_COMMAND_MANAGER (self), FALSE);
 #line 153 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -735,14 +740,14 @@ gboolean command_manager_can_redo (CommandManager* self) {
 	result = _tmp2_ > 0;
 #line 153 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 739 "CommandManager.c"
+#line 744 "CommandManager.c"
 }
 
 
 CommandDescription* command_manager_get_redo_description (CommandManager* self) {
 	CommandDescription* result = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	Command* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	Command* _tmp1_;
 #line 156 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_val_if_fail (IS_COMMAND_MANAGER (self), NULL);
 #line 157 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -753,22 +758,22 @@ CommandDescription* command_manager_get_redo_description (CommandManager* self)
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND_DESCRIPTION, CommandDescription);
 #line 157 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 757 "CommandManager.c"
+#line 762 "CommandManager.c"
 }
 
 
 gboolean command_manager_redo (CommandManager* self) {
 	gboolean result = FALSE;
 	Command* command = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	Command* _tmp1_ = NULL;
-	Command* _tmp2_ = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	Command* _tmp4_ = NULL;
-	Command* _tmp5_ = NULL;
-	Command* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	gboolean _tmp8_ = FALSE;
+	GeeArrayList* _tmp0_;
+	Command* _tmp1_;
+	Command* _tmp2_;
+	GeeArrayList* _tmp3_;
+	Command* _tmp4_;
+	Command* _tmp5_;
+	Command* _tmp6_;
+	gboolean _tmp7_;
+	gboolean _tmp8_;
 #line 160 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_val_if_fail (IS_COMMAND_MANAGER (self), FALSE);
 #line 161 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -787,7 +792,7 @@ gboolean command_manager_redo (CommandManager* self) {
 		_g_object_unref0 (command);
 #line 163 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		return result;
-#line 791 "CommandManager.c"
+#line 796 "CommandManager.c"
 	}
 #line 166 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp3_ = self->priv->undo_stack;
@@ -808,23 +813,23 @@ gboolean command_manager_redo (CommandManager* self) {
 #line 173 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp8_ = command_manager_can_redo (self);
 #line 173 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	g_signal_emit_by_name (self, "altered", _tmp7_, _tmp8_);
+	g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, _tmp7_, _tmp8_);
 #line 175 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	result = TRUE;
 #line 175 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_g_object_unref0 (command);
 #line 175 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 819 "CommandManager.c"
+#line 824 "CommandManager.c"
 }
 
 
 static Command* command_manager_top (CommandManager* self, GeeArrayList* stack) {
 	Command* result = NULL;
 	Command* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	GeeArrayList* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 178 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_val_if_fail (IS_COMMAND_MANAGER (self), NULL);
 #line 178 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -837,12 +842,12 @@ static Command* command_manager_top (CommandManager* self, GeeArrayList* stack)
 	_tmp3_ = _tmp2_;
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	if (_tmp3_ > 0) {
-#line 841 "CommandManager.c"
-		GeeArrayList* _tmp4_ = NULL;
-		GeeArrayList* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-		gpointer _tmp8_ = NULL;
+#line 846 "CommandManager.c"
+		GeeArrayList* _tmp4_;
+		GeeArrayList* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
+		gpointer _tmp8_;
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		_tmp4_ = stack;
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -857,25 +862,25 @@ static Command* command_manager_top (CommandManager* self, GeeArrayList* stack)
 		_g_object_unref0 (_tmp0_);
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		_tmp0_ = (Command*) _tmp8_;
-#line 861 "CommandManager.c"
+#line 866 "CommandManager.c"
 	} else {
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		_g_object_unref0 (_tmp0_);
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		_tmp0_ = NULL;
-#line 867 "CommandManager.c"
+#line 872 "CommandManager.c"
 	}
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	result = _tmp0_;
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 873 "CommandManager.c"
+#line 878 "CommandManager.c"
 }
 
 
 static void command_manager_push (CommandManager* self, GeeArrayList* stack, Command* command) {
-	GeeArrayList* _tmp0_ = NULL;
-	Command* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	Command* _tmp1_;
 #line 182 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_if_fail (IS_COMMAND_MANAGER (self));
 #line 182 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -890,14 +895,14 @@ static void command_manager_push (CommandManager* self, GeeArrayList* stack, Com
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
 #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	while (TRUE) {
-#line 894 "CommandManager.c"
-		GeeArrayList* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
-		GeeArrayList* _tmp6_ = NULL;
-		gpointer _tmp7_ = NULL;
-		Command* _tmp8_ = NULL;
+#line 899 "CommandManager.c"
+		GeeArrayList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
+		GeeArrayList* _tmp6_;
+		gpointer _tmp7_;
+		Command* _tmp8_;
 #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		_tmp2_ = stack;
 #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -910,7 +915,7 @@ static void command_manager_push (CommandManager* self, GeeArrayList* stack, Com
 		if (!(_tmp4_ >= _tmp5_)) {
 #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala"
 			break;
-#line 914 "CommandManager.c"
+#line 919 "CommandManager.c"
 		}
 #line 187 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		_tmp6_ = stack;
@@ -920,27 +925,27 @@ static void command_manager_push (CommandManager* self, GeeArrayList* stack, Com
 		_tmp8_ = (Command*) _tmp7_;
 #line 187 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		_g_object_unref0 (_tmp8_);
-#line 924 "CommandManager.c"
+#line 929 "CommandManager.c"
 	}
 }
 
 
 static Command* command_manager_pop (CommandManager* self, GeeArrayList* stack) {
 	Command* result = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	Command* command = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	GeeArrayList* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gpointer _tmp7_ = NULL;
+	GeeArrayList* _tmp3_;
+	GeeArrayList* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gpointer _tmp7_;
 	gboolean removed = FALSE;
-	GeeArrayList* _tmp8_ = NULL;
-	Command* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	gboolean _tmp11_ = FALSE;
+	GeeArrayList* _tmp8_;
+	Command* _tmp9_;
+	gboolean _tmp10_;
+	gboolean _tmp11_;
 #line 190 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_val_if_fail (IS_COMMAND_MANAGER (self), NULL);
 #line 190 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -957,7 +962,7 @@ static Command* command_manager_pop (CommandManager* self, GeeArrayList* stack)
 		result = NULL;
 #line 192 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		return result;
-#line 961 "CommandManager.c"
+#line 966 "CommandManager.c"
 	}
 #line 194 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp3_ = stack;
@@ -987,7 +992,7 @@ static Command* command_manager_pop (CommandManager* self, GeeArrayList* stack)
 	result = command;
 #line 198 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 991 "CommandManager.c"
+#line 996 "CommandManager.c"
 }
 
 
@@ -1006,26 +1011,26 @@ static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN (GClosure * closure, G
 		data1 = closure->data;
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 1010 "CommandManager.c"
+#line 1015 "CommandManager.c"
 	} else {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		data2 = closure->data;
-#line 1016 "CommandManager.c"
+#line 1021 "CommandManager.c"
 	}
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	callback = (GMarshalFunc_VOID__BOOLEAN_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	callback (data1, g_value_get_boolean (param_values + 1), g_value_get_boolean (param_values + 2), data2);
-#line 1022 "CommandManager.c"
+#line 1027 "CommandManager.c"
 }
 
 
 static void value_command_manager_init (GValue* value) {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	value->data[0].v_pointer = NULL;
-#line 1029 "CommandManager.c"
+#line 1034 "CommandManager.c"
 }
 
 
@@ -1034,7 +1039,7 @@ static void value_command_manager_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		command_manager_unref (value->data[0].v_pointer);
-#line 1038 "CommandManager.c"
+#line 1043 "CommandManager.c"
 	}
 }
 
@@ -1044,11 +1049,11 @@ static void value_command_manager_copy_value (const GValue* src_value, GValue* d
 	if (src_value->data[0].v_pointer) {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		dest_value->data[0].v_pointer = command_manager_ref (src_value->data[0].v_pointer);
-#line 1048 "CommandManager.c"
+#line 1053 "CommandManager.c"
 	} else {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1052 "CommandManager.c"
+#line 1057 "CommandManager.c"
 	}
 }
 
@@ -1056,66 +1061,66 @@ static void value_command_manager_copy_value (const GValue* src_value, GValue* d
 static gpointer value_command_manager_peek_pointer (const GValue* value) {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return value->data[0].v_pointer;
-#line 1060 "CommandManager.c"
+#line 1065 "CommandManager.c"
 }
 
 
 static gchar* value_command_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	if (collect_values[0].v_pointer) {
-#line 1067 "CommandManager.c"
-		CommandManager* object;
+#line 1072 "CommandManager.c"
+		CommandManager * object;
 		object = collect_values[0].v_pointer;
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1074 "CommandManager.c"
+#line 1079 "CommandManager.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1078 "CommandManager.c"
+#line 1083 "CommandManager.c"
 		}
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		value->data[0].v_pointer = command_manager_ref (object);
-#line 1082 "CommandManager.c"
+#line 1087 "CommandManager.c"
 	} else {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		value->data[0].v_pointer = NULL;
-#line 1086 "CommandManager.c"
+#line 1091 "CommandManager.c"
 	}
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return NULL;
-#line 1090 "CommandManager.c"
+#line 1095 "CommandManager.c"
 }
 
 
 static gchar* value_command_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	CommandManager** object_p;
+	CommandManager ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	if (!object_p) {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1101 "CommandManager.c"
+#line 1106 "CommandManager.c"
 	}
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	if (!value->data[0].v_pointer) {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		*object_p = NULL;
-#line 1107 "CommandManager.c"
+#line 1112 "CommandManager.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1111 "CommandManager.c"
+#line 1116 "CommandManager.c"
 	} else {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		*object_p = command_manager_ref (value->data[0].v_pointer);
-#line 1115 "CommandManager.c"
+#line 1120 "CommandManager.c"
 	}
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return NULL;
-#line 1119 "CommandManager.c"
+#line 1124 "CommandManager.c"
 }
 
 
@@ -1129,7 +1134,7 @@ GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return G_PARAM_SPEC (spec);
-#line 1133 "CommandManager.c"
+#line 1138 "CommandManager.c"
 }
 
 
@@ -1138,12 +1143,12 @@ gpointer value_get_command_manager (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMMAND_MANAGER), NULL);
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return value->data[0].v_pointer;
-#line 1142 "CommandManager.c"
+#line 1147 "CommandManager.c"
 }
 
 
 void value_set_command_manager (GValue* value, gpointer v_object) {
-	CommandManager* old;
+	CommandManager * old;
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMMAND_MANAGER));
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -1158,23 +1163,23 @@ void value_set_command_manager (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		command_manager_ref (value->data[0].v_pointer);
-#line 1162 "CommandManager.c"
+#line 1167 "CommandManager.c"
 	} else {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		value->data[0].v_pointer = NULL;
-#line 1166 "CommandManager.c"
+#line 1171 "CommandManager.c"
 	}
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	if (old) {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		command_manager_unref (old);
-#line 1172 "CommandManager.c"
+#line 1177 "CommandManager.c"
 	}
 }
 
 
 void value_take_command_manager (GValue* value, gpointer v_object) {
-	CommandManager* old;
+	CommandManager * old;
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMMAND_MANAGER));
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -1187,17 +1192,17 @@ void value_take_command_manager (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		value->data[0].v_pointer = v_object;
-#line 1191 "CommandManager.c"
+#line 1196 "CommandManager.c"
 	} else {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		value->data[0].v_pointer = NULL;
-#line 1195 "CommandManager.c"
+#line 1200 "CommandManager.c"
 	}
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	if (old) {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		command_manager_unref (old);
-#line 1201 "CommandManager.c"
+#line 1206 "CommandManager.c"
 	}
 }
 
@@ -1210,14 +1215,14 @@ static void command_manager_class_init (CommandManagerClass * klass) {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_type_class_add_private (klass, sizeof (CommandManagerPrivate));
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	g_signal_new ("altered", TYPE_COMMAND_MANAGER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN, G_TYPE_NONE, 2, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
-#line 1215 "CommandManager.c"
+	command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL] = g_signal_new ("altered", TYPE_COMMAND_MANAGER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN, G_TYPE_NONE, 2, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
+#line 1220 "CommandManager.c"
 }
 
 
 static void command_manager_instance_init (CommandManager * self) {
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp1_;
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	self->priv = COMMAND_MANAGER_GET_PRIVATE (self);
 #line 84 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -1230,11 +1235,11 @@ static void command_manager_instance_init (CommandManager * self) {
 	self->priv->redo_stack = _tmp1_;
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	self->ref_count = 1;
-#line 1234 "CommandManager.c"
+#line 1239 "CommandManager.c"
 }
 
 
-static void command_manager_finalize (CommandManager* obj) {
+static void command_manager_finalize (CommandManager * obj) {
 	CommandManager * self;
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COMMAND_MANAGER, CommandManager);
@@ -1244,7 +1249,7 @@ static void command_manager_finalize (CommandManager* obj) {
 	_g_object_unref0 (self->priv->undo_stack);
 #line 85 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_g_object_unref0 (self->priv->redo_stack);
-#line 1248 "CommandManager.c"
+#line 1253 "CommandManager.c"
 }
 
 
@@ -1263,18 +1268,18 @@ GType command_manager_get_type (void) {
 
 
 gpointer command_manager_ref (gpointer instance) {
-	CommandManager* self;
+	CommandManager * self;
 	self = instance;
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return instance;
-#line 1273 "CommandManager.c"
+#line 1278 "CommandManager.c"
 }
 
 
 void command_manager_unref (gpointer instance) {
-	CommandManager* self;
+	CommandManager * self;
 	self = instance;
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1282,7 +1287,7 @@ void command_manager_unref (gpointer instance) {
 		COMMAND_MANAGER_GET_CLASS (self)->finalize (self);
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1286 "CommandManager.c"
+#line 1291 "CommandManager.c"
 	}
 }
 
diff --git a/src/Commands.c b/src/Commands.c
index bab2c06..a8e7b47 100644
--- a/src/Commands.c
+++ b/src/Commands.c
@@ -1,4 +1,4 @@
-/* Commands.c generated by valac 0.34.7, the Vala compiler
+/* Commands.c generated by valac 0.36.6, the Vala compiler
  * generated from Commands.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1986,7 +1986,7 @@ GType library_window_get_type (void) G_GNUC_CONST;
 LibraryWindow* library_window_get_app (void);
 void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* controller, Photo* current);
 void page_window_set_current_page (PageWindow* self, Page* page);
-static void page_command_finalize (GObject* obj);
+static void page_command_finalize (GObject * obj);
 GType single_data_source_command_get_type (void) G_GNUC_CONST;
 enum  {
 	SINGLE_DATA_SOURCE_COMMAND_DUMMY_PROPERTY
@@ -2004,7 +2004,7 @@ gpointer value_get_command_manager (const GValue* value);
 GType command_manager_get_type (void) G_GNUC_CONST;
 CommandManager* command_get_command_manager (Command* self);
 void command_manager_reset (CommandManager* self);
-static void single_data_source_command_finalize (GObject* obj);
+static void single_data_source_command_finalize (GObject * obj);
 GType simple_proxyable_command_get_type (void) G_GNUC_CONST;
 gpointer source_proxy_ref (gpointer instance);
 void source_proxy_unref (gpointer instance);
@@ -2031,7 +2031,7 @@ static void simple_proxyable_command_real_undo (Command* base);
 void simple_proxyable_command_undo_on_source (SimpleProxyableCommand* self, DataSource* source);
 static void simple_proxyable_command_real_undo_on_source (SimpleProxyableCommand* self, DataSource* source);
 void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeCollection* proxyables);
-static void simple_proxyable_command_finalize (GObject* obj);
+static void simple_proxyable_command_finalize (GObject * obj);
 GType single_photo_transformation_command_get_type (void) G_GNUC_CONST;
 GType photo_transformation_state_get_type (void) G_GNUC_CONST;
 #define SINGLE_PHOTO_TRANSFORMATION_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SINGLE_PHOTO_TRANSFORMATION_COMMAND, SinglePhotoTransformationCommandPrivate))
@@ -2044,7 +2044,7 @@ SinglePhotoTransformationCommand* single_photo_transformation_command_construct
 PhotoTransformationState* photo_save_transformation_state (Photo* self);
 static void single_photo_transformation_command_real_undo (Command* base);
 gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* state);
-static void single_photo_transformation_command_finalize (GObject* obj);
+static void single_photo_transformation_command_finalize (GObject * obj);
 GType generic_photo_transformation_command_get_type (void) G_GNUC_CONST;
 #define GENERIC_PHOTO_TRANSFORMATION_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND, GenericPhotoTransformationCommandPrivate))
 enum  {
@@ -2062,7 +2062,7 @@ gboolean generic_photo_transformation_command_can_compress (GenericPhotoTransfor
 static gboolean generic_photo_transformation_command_real_can_compress (GenericPhotoTransformationCommand* self, Command* command);
 static gboolean generic_photo_transformation_command_real_compress (Command* base, Command* command);
 void command_execute (Command* self);
-static void generic_photo_transformation_command_finalize (GObject* obj);
+static void generic_photo_transformation_command_finalize (GObject * obj);
 GType multiple_data_source_command_get_type (void) G_GNUC_CONST;
 GType source_collection_get_type (void) G_GNUC_CONST;
 #define MULTIPLE_DATA_SOURCE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommandPrivate))
@@ -2106,7 +2106,7 @@ void progress_dialog_set_fraction (ProgressDialog* self, gint current, gint tota
 void spin_event_loop (void);
 void progress_dialog_close (ProgressDialog* self);
 void page_window_set_normal_cursor (PageWindow* self);
-static void multiple_data_source_command_finalize (GObject* obj);
+static void multiple_data_source_command_finalize (GObject * obj);
 GType multiple_data_source_at_once_command_get_type (void) G_GNUC_CONST;
 #define MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND, MultipleDataSourceAtOnceCommandPrivate))
 enum  {
@@ -2135,7 +2135,7 @@ static void multiple_data_source_at_once_command_real_execute_on_all (MultipleDa
 static void multiple_data_source_at_once_command_real_undo (Command* base);
 void multiple_data_source_at_once_command_undo_on_all (MultipleDataSourceAtOnceCommand* self, GeeCollection* sources);
 static void multiple_data_source_at_once_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* self, GeeCollection* sources);
-static void multiple_data_source_at_once_command_finalize (GObject* obj);
+static void multiple_data_source_at_once_command_finalize (GObject * obj);
 GType multiple_photo_transformation_command_get_type (void) G_GNUC_CONST;
 #define MULTIPLE_PHOTO_TRANSFORMATION_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MULTIPLE_PHOTO_TRANSFORMATION_COMMAND, MultiplePhotoTransformationCommandPrivate))
 enum  {
@@ -2145,7 +2145,7 @@ static void multiple_photo_transformation_command_on_state_broken (MultiplePhoto
 static void _multiple_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, gpointer self);
 MultiplePhotoTransformationCommand* multiple_photo_transformation_command_construct (GType object_type, GeeIterable* iter, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation);
 static void multiple_photo_transformation_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source);
-static void multiple_photo_transformation_command_finalize (GObject* obj);
+static void multiple_photo_transformation_command_finalize (GObject * obj);
 GType rotate_single_command_get_type (void) G_GNUC_CONST;
 GType rotation_get_type (void) G_GNUC_CONST;
 #define ROTATE_SINGLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ROTATE_SINGLE_COMMAND, RotateSingleCommandPrivate))
@@ -2158,7 +2158,7 @@ static void rotate_single_command_real_execute (Command* base);
 void photo_rotate (Photo* self, Rotation rotation);
 static void rotate_single_command_real_undo (Command* base);
 Rotation rotation_opposite (Rotation self);
-static void rotate_single_command_finalize (GObject* obj);
+static void rotate_single_command_finalize (GObject * obj);
 GType rotate_multiple_command_get_type (void) G_GNUC_CONST;
 #define ROTATE_MULTIPLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ROTATE_MULTIPLE_COMMAND, RotateMultipleCommandPrivate))
 enum  {
@@ -2168,7 +2168,7 @@ RotateMultipleCommand* rotate_multiple_command_new (GeeIterable* iter, Rotation
 RotateMultipleCommand* rotate_multiple_command_construct (GType object_type, GeeIterable* iter, Rotation rotation, const gchar* name, const gchar* explanation, const gchar* progress_text, const gchar* undo_progress_text);
 static void rotate_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source);
 static void rotate_multiple_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source);
-static void rotate_multiple_command_finalize (GObject* obj);
+static void rotate_multiple_command_finalize (GObject * obj);
 GType edit_title_command_get_type (void) G_GNUC_CONST;
 #define EDIT_TITLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EDIT_TITLE_COMMAND, EditTitleCommandPrivate))
 enum  {
@@ -2176,12 +2176,12 @@ enum  {
 };
 EditTitleCommand* edit_title_command_new (MediaSource* source, const gchar* new_title);
 EditTitleCommand* edit_title_command_construct (GType object_type, MediaSource* source, const gchar* new_title);
-#define RESOURCES_EDIT_TITLE_LABEL "Edit Title"
+#define RESOURCES_EDIT_TITLE_LABEL NC_ ("Button Label", "Edit Title")
 gchar* media_source_get_title (MediaSource* self);
 static void edit_title_command_real_execute (Command* base);
 void media_source_set_title (MediaSource* self, const gchar* title);
 static void edit_title_command_real_undo (Command* base);
-static void edit_title_command_finalize (GObject* obj);
+static void edit_title_command_finalize (GObject * obj);
 GType edit_comment_command_get_type (void) G_GNUC_CONST;
 #define EDIT_COMMENT_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EDIT_COMMENT_COMMAND, EditCommentCommandPrivate))
 enum  {
@@ -2194,7 +2194,7 @@ gchar* media_source_get_comment (MediaSource* self);
 static void edit_comment_command_real_execute (Command* base);
 gboolean media_source_set_comment (MediaSource* self, const gchar* comment);
 static void edit_comment_command_real_undo (Command* base);
-static void edit_comment_command_finalize (GObject* obj);
+static void edit_comment_command_finalize (GObject * obj);
 GType edit_multiple_titles_command_get_type (void) G_GNUC_CONST;
 enum  {
 	EDIT_MULTIPLE_TITLES_COMMAND_DUMMY_PROPERTY
@@ -2203,7 +2203,7 @@ EditMultipleTitlesCommand* edit_multiple_titles_command_new (GeeCollection* medi
 EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_type, GeeCollection* media_sources, const gchar* new_title);
 static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources);
 static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources);
-static void edit_multiple_titles_command_finalize (GObject* obj);
+static void edit_multiple_titles_command_finalize (GObject * obj);
 GType edit_multiple_comments_command_get_type (void) G_GNUC_CONST;
 enum  {
 	EDIT_MULTIPLE_COMMENTS_COMMAND_DUMMY_PROPERTY
@@ -2212,7 +2212,7 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_new (GeeCollection*
 EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType object_type, GeeCollection* media_sources, const gchar* new_comment);
 static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources);
 static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources);
-static void edit_multiple_comments_command_finalize (GObject* obj);
+static void edit_multiple_comments_command_finalize (GObject * obj);
 GType rename_event_command_get_type (void) G_GNUC_CONST;
 #define RENAME_EVENT_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_RENAME_EVENT_COMMAND, RenameEventCommandPrivate))
 enum  {
@@ -2227,7 +2227,7 @@ gchar* event_get_raw_name (Event* self);
 static void rename_event_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source);
 gboolean event_rename (Event* self, const gchar* name);
 static void rename_event_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source);
-static void rename_event_command_finalize (GObject* obj);
+static void rename_event_command_finalize (GObject * obj);
 GType edit_event_comment_command_get_type (void) G_GNUC_CONST;
 #define EDIT_EVENT_COMMENT_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EDIT_EVENT_COMMENT_COMMAND, EditEventCommentCommandPrivate))
 enum  {
@@ -2239,7 +2239,7 @@ gchar* event_source_get_comment (EventSource* self);
 static void edit_event_comment_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source);
 gboolean event_source_set_comment (EventSource* self, const gchar* comment);
 static void edit_event_comment_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source);
-static void edit_event_comment_command_finalize (GObject* obj);
+static void edit_event_comment_command_finalize (GObject * obj);
 GType set_key_photo_command_get_type (void) G_GNUC_CONST;
 #define SET_KEY_PHOTO_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_KEY_PHOTO_COMMAND, SetKeyPhotoCommandPrivate))
 enum  {
@@ -2252,7 +2252,7 @@ MediaSource* event_get_primary_source (Event* self);
 static void set_key_photo_command_real_execute (Command* base);
 gboolean event_set_primary_source (Event* self, MediaSource* source);
 static void set_key_photo_command_real_undo (Command* base);
-static void set_key_photo_command_finalize (GObject* obj);
+static void set_key_photo_command_finalize (GObject * obj);
 GType revert_single_command_get_type (void) G_GNUC_CONST;
 enum  {
 	REVERT_SINGLE_COMMAND_DUMMY_PROPERTY
@@ -2303,7 +2303,7 @@ void data_collection_freeze_notifications (DataCollection* self);
 void photo_set_straighten (Photo* self, gdouble theta);
 void photo_set_crop (Photo* self, Box* crop);
 void data_collection_thaw_notifications (DataCollection* self);
-static void straighten_command_finalize (GObject* obj);
+static void straighten_command_finalize (GObject * obj);
 GType crop_command_get_type (void) G_GNUC_CONST;
 #define CROP_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CROP_COMMAND, CropCommandPrivate))
 enum  {
@@ -2312,7 +2312,7 @@ enum  {
 CropCommand* crop_command_new (Photo* photo, Box* crop, const gchar* name, const gchar* explanation);
 CropCommand* crop_command_construct (GType object_type, Photo* photo, Box* crop, const gchar* name, const gchar* explanation);
 static void crop_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo);
-static void crop_command_finalize (GObject* obj);
+static void crop_command_finalize (GObject * obj);
 GType adjust_colors_single_command_get_type (void) G_GNUC_CONST;
 gpointer pixel_transformation_bundle_ref (gpointer instance);
 void pixel_transformation_bundle_unref (gpointer instance);
@@ -2330,7 +2330,7 @@ AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_
 static void adjust_colors_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo);
 void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_adjustments);
 static gboolean adjust_colors_single_command_real_can_compress (GenericPhotoTransformationCommand* base, Command* command);
-static void adjust_colors_single_command_finalize (GObject* obj);
+static void adjust_colors_single_command_finalize (GObject * obj);
 GType adjust_colors_multiple_command_get_type (void) G_GNUC_CONST;
 #define ADJUST_COLORS_MULTIPLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADJUST_COLORS_MULTIPLE_COMMAND, AdjustColorsMultipleCommandPrivate))
 enum  {
@@ -2339,7 +2339,7 @@ enum  {
 AdjustColorsMultipleCommand* adjust_colors_multiple_command_new (GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation);
 AdjustColorsMultipleCommand* adjust_colors_multiple_command_construct (GType object_type, GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation);
 static void adjust_colors_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source);
-static void adjust_colors_multiple_command_finalize (GObject* obj);
+static void adjust_colors_multiple_command_finalize (GObject * obj);
 GType redeye_command_get_type (void) G_GNUC_CONST;
 GType editing_tools_redeye_instance_get_type (void) G_GNUC_CONST;
 EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self);
@@ -2352,7 +2352,7 @@ RedeyeCommand* redeye_command_new (Photo* photo, EditingToolsRedeyeInstance* red
 RedeyeCommand* redeye_command_construct (GType object_type, Photo* photo, EditingToolsRedeyeInstance* redeye_instance, const gchar* name, const gchar* explanation);
 static void redeye_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo);
 void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye);
-static void redeye_command_finalize (GObject* obj);
+static void redeye_command_finalize (GObject * obj);
 GType move_photos_command_get_type (void) G_GNUC_CONST;
 GType move_photos_command_real_move_photos_command_get_type (void) G_GNUC_CONST;
 enum  {
@@ -2380,8 +2380,8 @@ void library_window_switch_to_event (LibraryWindow* self, Event* event);
 static void move_photos_command_real_move_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source);
 gboolean media_source_set_event (MediaSource* self, Event* new_event);
 static void move_photos_command_real_move_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source);
-static void move_photos_command_real_move_photos_command_finalize (GObject* obj);
-static void move_photos_command_finalize (GObject* obj);
+static void move_photos_command_real_move_photos_command_finalize (GObject * obj);
+static void move_photos_command_finalize (GObject * obj);
 GType new_event_command_get_type (void) G_GNUC_CONST;
 enum  {
 	NEW_EVENT_COMMAND_DUMMY_PROPERTY
@@ -2432,7 +2432,7 @@ static void duplicate_multiple_photos_command_real_undo_on_source (MultipleDataS
 GType marker_get_type (void) G_GNUC_CONST;
 Marker* data_collection_mark (DataCollection* self, DataObject* object);
 gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed);
-static void duplicate_multiple_photos_command_finalize (GObject* obj);
+static void duplicate_multiple_photos_command_finalize (GObject * obj);
 GType set_rating_single_command_get_type (void) G_GNUC_CONST;
 GType rating_get_type (void) G_GNUC_CONST;
 #define SET_RATING_SINGLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_RATING_SINGLE_COMMAND, SetRatingSingleCommandPrivate))
@@ -2452,7 +2452,7 @@ void media_source_set_rating (MediaSource* self, Rating rating);
 void media_source_increase_rating (MediaSource* self);
 void media_source_decrease_rating (MediaSource* self);
 static void set_rating_single_command_real_undo (Command* base);
-static void set_rating_single_command_finalize (GObject* obj);
+static void set_rating_single_command_finalize (GObject * obj);
 GType set_rating_command_get_type (void) G_GNUC_CONST;
 #define SET_RATING_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_RATING_COMMAND, SetRatingCommandPrivate))
 enum  {
@@ -2468,7 +2468,7 @@ static void set_rating_command_real_execute (Command* base);
 static void set_rating_command_real_undo (Command* base);
 static void set_rating_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source);
 static void set_rating_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source);
-static void set_rating_command_finalize (GObject* obj);
+static void set_rating_command_finalize (GObject * obj);
 GType set_raw_developer_command_get_type (void) G_GNUC_CONST;
 GType raw_developer_get_type (void) G_GNUC_CONST;
 #define SET_RAW_DEVELOPER_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommandPrivate))
@@ -2488,7 +2488,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d);
 static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source);
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 PhotoFileFormat photo_get_master_file_format (Photo* self);
-static void set_raw_developer_command_finalize (GObject* obj);
+static void set_raw_developer_command_finalize (GObject * obj);
 GType adjust_date_time_photo_command_get_type (void) G_GNUC_CONST;
 GType dateable_get_type (void) G_GNUC_CONST;
 #define ADJUST_DATE_TIME_PHOTO_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADJUST_DATE_TIME_PHOTO_COMMAND, AdjustDateTimePhotoCommandPrivate))
@@ -2514,7 +2514,7 @@ void event_generate_single_event (MediaSource* media, ViewCollection* events_so_
 static void adjust_date_time_photo_command_real_undo (Command* base);
 void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** error);
 void dateable_set_exposure_time (Dateable* self, time_t target_time);
-static void adjust_date_time_photo_command_finalize (GObject* obj);
+static void adjust_date_time_photo_command_finalize (GObject * obj);
 GType adjust_date_time_photos_command_get_type (void) G_GNUC_CONST;
 #define ADJUST_DATE_TIME_PHOTOS_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommandPrivate))
 enum  {
@@ -2529,7 +2529,7 @@ static void adjust_date_time_photos_command_real_undo (Command* base);
 static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosCommand* self, Dateable* dateable, time_t exposure_time);
 static void adjust_date_time_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source);
 static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source);
-static void adjust_date_time_photos_command_finalize (GObject* obj);
+static void adjust_date_time_photos_command_finalize (GObject * obj);
 GType add_tags_command_get_type (void) G_GNUC_CONST;
 #define ADD_TAGS_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADD_TAGS_COMMAND, AddTagsCommandPrivate))
 enum  {
@@ -2551,7 +2551,7 @@ static void add_tags_command_real_execute (Command* base);
 void tag_attach_many (Tag* self, GeeCollection* sources);
 static void add_tags_command_real_undo (Command* base);
 GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources);
-static void add_tags_command_finalize (GObject* obj);
+static void add_tags_command_finalize (GObject * obj);
 GType rename_tag_command_get_type (void) G_GNUC_CONST;
 #define RENAME_TAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_RENAME_TAG_COMMAND, RenameTagCommandPrivate))
 enum  {
@@ -2566,7 +2566,7 @@ static void rename_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 gboolean tag_rename (Tag* self, const gchar* name);
 gchar* resources_rename_tag_exists_message (const gchar* name);
 static void rename_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source);
-static void rename_tag_command_finalize (GObject* obj);
+static void rename_tag_command_finalize (GObject * obj);
 GType delete_tag_command_get_type (void) G_GNUC_CONST;
 #define DELETE_TAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DELETE_TAG_COMMAND, DeleteTagCommandPrivate))
 enum  {
@@ -2581,7 +2581,7 @@ static void delete_tag_command_on_proxy_broken (DeleteTagCommand* self);
 static void _delete_tag_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self);
 GType tag_source_collection_get_type (void) G_GNUC_CONST;
 static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source);
-static void delete_tag_command_finalize (GObject* obj);
+static void delete_tag_command_finalize (GObject * obj);
 GType new_child_tag_command_get_type (void) G_GNUC_CONST;
 #define NEW_CHILD_TAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_NEW_CHILD_TAG_COMMAND, NewChildTagCommandPrivate))
 enum  {
@@ -2593,7 +2593,7 @@ static void new_child_tag_command_real_execute_on_source (SimpleProxyableCommand
 Tag* tag_create_new_child (Tag* self);
 static void new_child_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source);
 Tag* new_child_tag_command_get_created_child (NewChildTagCommand* self);
-static void new_child_tag_command_finalize (GObject* obj);
+static void new_child_tag_command_finalize (GObject * obj);
 GType new_root_tag_command_get_type (void) G_GNUC_CONST;
 #define NEW_ROOT_TAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_NEW_ROOT_TAG_COMMAND, NewRootTagCommandPrivate))
 enum  {
@@ -2605,7 +2605,7 @@ static void new_root_tag_command_real_execute (Command* base);
 Tag* tag_create_new_root (void);
 static void new_root_tag_command_real_undo (Command* base);
 Tag* new_root_tag_command_get_created_tag (NewRootTagCommand* self);
-static void new_root_tag_command_finalize (GObject* obj);
+static void new_root_tag_command_finalize (GObject * obj);
 GType reparent_tag_command_get_type (void) G_GNUC_CONST;
 #define REPARENT_TAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_REPARENT_TAG_COMMAND, ReparentTagCommandPrivate))
 enum  {
@@ -2642,7 +2642,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 static void reparent_tag_command_real_execute (Command* base);
 static void reparent_tag_command_real_undo (Command* base);
 void hierarchical_tag_utilities_cleanup_root_path (const gchar* path);
-static void reparent_tag_command_finalize (GObject* obj);
+static void reparent_tag_command_finalize (GObject * obj);
 GType modify_tags_command_get_type (void) G_GNUC_CONST;
 #define MODIFY_TAGS_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommandPrivate))
 enum  {
@@ -2656,7 +2656,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, MediaSource* source);
 static void modify_tags_command_real_execute (Command* base);
 static void modify_tags_command_real_undo (Command* base);
-static void modify_tags_command_finalize (GObject* obj);
+static void modify_tags_command_finalize (GObject * obj);
 GType tag_untag_photos_command_get_type (void) G_GNUC_CONST;
 #define TAG_UNTAG_PHOTOS_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TAG_UNTAG_PHOTOS_COMMAND, TagUntagPhotosCommandPrivate))
 enum  {
@@ -2673,7 +2673,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag* tag);
 static void tag_untag_photos_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source);
 gchar* data_object_to_string (DataObject* self);
-static void tag_untag_photos_command_finalize (GObject* obj);
+static void tag_untag_photos_command_finalize (GObject * obj);
 GType rename_saved_search_command_get_type (void) G_GNUC_CONST;
 GType saved_search_get_type (void) G_GNUC_CONST;
 #define RENAME_SAVED_SEARCH_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommandPrivate))
@@ -2687,7 +2687,7 @@ static void rename_saved_search_command_real_execute (Command* base);
 gboolean saved_search_rename (SavedSearch* self, const gchar* new_name);
 gchar* resources_rename_search_exists_message (const gchar* name);
 static void rename_saved_search_command_real_undo (Command* base);
-static void rename_saved_search_command_finalize (GObject* obj);
+static void rename_saved_search_command_finalize (GObject * obj);
 GType delete_saved_search_command_get_type (void) G_GNUC_CONST;
 #define DELETE_SAVED_SEARCH_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DELETE_SAVED_SEARCH_COMMAND, DeleteSavedSearchCommandPrivate))
 enum  {
@@ -2708,7 +2708,7 @@ SavedSearchTable* saved_search_table_get_instance (void);
 void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search);
 static void delete_saved_search_command_real_undo (Command* base);
 void saved_search_reconstitute (SavedSearch* self);
-static void delete_saved_search_command_finalize (GObject* obj);
+static void delete_saved_search_command_finalize (GObject * obj);
 GType trash_untrash_photos_command_get_type (void) G_GNUC_CONST;
 #define TRASH_UNTRASH_PHOTOS_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TRASH_UNTRASH_PHOTOS_COMMAND, TrashUntrashPhotosCommandPrivate))
 enum  {
@@ -2728,7 +2728,7 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 static void trash_untrash_photos_command_real_undo (Command* base);
 void media_source_trash (MediaSource* self);
 void media_source_untrash (MediaSource* self);
-static void trash_untrash_photos_command_finalize (GObject* obj);
+static void trash_untrash_photos_command_finalize (GObject * obj);
 GType flag_unflag_command_get_type (void) G_GNUC_CONST;
 #define FLAG_UNFLAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_FLAG_UNFLAG_COMMAND, FlagUnflagCommandPrivate))
 enum  {
@@ -2747,7 +2747,7 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
 GType flaggable_get_type (void) G_GNUC_CONST;
 void flaggable_mark_flagged (Flaggable* self);
 void flaggable_mark_unflagged (Flaggable* self);
-static void flag_unflag_command_finalize (GObject* obj);
+static void flag_unflag_command_finalize (GObject * obj);
 
 
 static void _page_command_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) {
@@ -2780,12 +2780,12 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 PageCommand* page_command_construct (GType object_type, const gchar* name, const gchar* explanation) {
 	PageCommand * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	AppWindow* _tmp2_ = NULL;
-	AppWindow* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
-	Page* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	AppWindow* _tmp2_;
+	AppWindow* _tmp3_;
+	Page* _tmp4_;
+	Page* _tmp5_;
 #line 15 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 15 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2813,11 +2813,11 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
 #line 20 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp5_ != NULL) {
 #line 2816 "Commands.c"
-		Page* _tmp6_ = NULL;
+		Page* _tmp6_;
 		LibraryPhotoPage* photo_page = NULL;
-		Page* _tmp7_ = NULL;
-		LibraryPhotoPage* _tmp8_ = NULL;
-		LibraryPhotoPage* _tmp9_ = NULL;
+		Page* _tmp7_;
+		LibraryPhotoPage* _tmp8_;
+		LibraryPhotoPage* _tmp9_;
 #line 21 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp6_ = self->priv->page;
 #line 21 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2833,12 +2833,12 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
 #line 28 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp9_ != NULL) {
 #line 2836 "Commands.c"
-			LibraryPhotoPage* _tmp10_ = NULL;
-			Photo* _tmp11_ = NULL;
-			LibraryPhotoPage* _tmp12_ = NULL;
-			CollectionPage* _tmp13_ = NULL;
+			LibraryPhotoPage* _tmp10_;
+			Photo* _tmp11_;
+			LibraryPhotoPage* _tmp12_;
+			CollectionPage* _tmp13_;
 			gboolean _tmp14_ = FALSE;
-			Photo* _tmp15_ = NULL;
+			Photo* _tmp15_;
 #line 29 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp10_ = photo_page;
 #line 29 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2860,7 +2860,7 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
 #line 32 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp15_ != NULL) {
 #line 2863 "Commands.c"
-				CollectionPage* _tmp16_ = NULL;
+				CollectionPage* _tmp16_;
 #line 32 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp16_ = self->priv->collection_page;
 #line 32 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2874,8 +2874,8 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
 #line 32 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp14_) {
 #line 2877 "Commands.c"
-				Photo* _tmp17_ = NULL;
-				CollectionPage* _tmp18_ = NULL;
+				Photo* _tmp17_;
+				CollectionPage* _tmp18_;
 #line 33 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp17_ = self->priv->library_photo;
 #line 33 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2908,7 +2908,7 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
 
 
 void page_command_set_auto_return_to_page (PageCommand* self, gboolean auto_return) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 54 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_PAGE_COMMAND (self));
 #line 55 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2921,7 +2921,7 @@ void page_command_set_auto_return_to_page (PageCommand* self, gboolean auto_retu
 
 static void page_command_real_prepare (Command* base) {
 	PageCommand * self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 58 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_COMMAND, PageCommand);
 #line 59 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2940,9 +2940,9 @@ static void page_command_real_prepare (Command* base) {
 
 void page_command_return_to_page (PageCommand* self) {
 	LibraryPhotoPage* photo_page = NULL;
-	Page* _tmp0_ = NULL;
-	LibraryPhotoPage* _tmp1_ = NULL;
-	LibraryPhotoPage* _tmp2_ = NULL;
+	Page* _tmp0_;
+	LibraryPhotoPage* _tmp1_;
+	LibraryPhotoPage* _tmp2_;
 #line 65 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_PAGE_COMMAND (self));
 #line 66 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2957,13 +2957,13 @@ void page_command_return_to_page (PageCommand* self) {
 	if (_tmp2_ != NULL) {
 #line 2959 "Commands.c"
 		gboolean _tmp3_ = FALSE;
-		Photo* _tmp4_ = NULL;
+		Photo* _tmp4_;
 #line 69 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = self->priv->library_photo;
 #line 69 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp4_ != NULL) {
 #line 2966 "Commands.c"
-			CollectionPage* _tmp5_ = NULL;
+			CollectionPage* _tmp5_;
 #line 69 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = self->priv->collection_page;
 #line 69 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2979,12 +2979,12 @@ void page_command_return_to_page (PageCommand* self) {
 #line 2980 "Commands.c"
 			gboolean photo_in_collection = FALSE;
 			gint count = 0;
-			CollectionPage* _tmp6_ = NULL;
-			ViewCollection* _tmp7_ = NULL;
-			ViewCollection* _tmp8_ = NULL;
-			gint _tmp9_ = 0;
-			gint _tmp10_ = 0;
-			gboolean _tmp25_ = FALSE;
+			CollectionPage* _tmp6_;
+			ViewCollection* _tmp7_;
+			ViewCollection* _tmp8_;
+			gint _tmp9_;
+			gint _tmp10_;
+			gboolean _tmp25_;
 #line 70 "/home/jens/Source/shotwell/src/Commands.vala"
 			photo_in_collection = FALSE;
 #line 71 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3014,22 +3014,22 @@ void page_command_return_to_page (PageCommand* self) {
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 					while (TRUE) {
 #line 3017 "Commands.c"
-						gint _tmp13_ = 0;
-						gint _tmp14_ = 0;
-						CollectionPage* _tmp15_ = NULL;
-						ViewCollection* _tmp16_ = NULL;
-						ViewCollection* _tmp17_ = NULL;
-						gint _tmp18_ = 0;
-						DataObject* _tmp19_ = NULL;
-						Thumbnail* _tmp20_ = NULL;
-						MediaSource* _tmp21_ = NULL;
-						MediaSource* _tmp22_ = NULL;
-						Photo* _tmp23_ = NULL;
-						gboolean _tmp24_ = FALSE;
+						gint _tmp13_;
+						gint _tmp14_;
+						CollectionPage* _tmp15_;
+						ViewCollection* _tmp16_;
+						ViewCollection* _tmp17_;
+						gint _tmp18_;
+						DataObject* _tmp19_;
+						Thumbnail* _tmp20_;
+						MediaSource* _tmp21_;
+						MediaSource* _tmp22_;
+						Photo* _tmp23_;
+						gboolean _tmp24_;
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 						if (!_tmp11_) {
 #line 3032 "Commands.c"
-							gint _tmp12_ = 0;
+							gint _tmp12_;
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 							_tmp12_ = i;
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3090,10 +3090,10 @@ void page_command_return_to_page (PageCommand* self) {
 #line 79 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp25_) {
 #line 3093 "Commands.c"
-				LibraryWindow* _tmp26_ = NULL;
-				LibraryWindow* _tmp27_ = NULL;
-				CollectionPage* _tmp28_ = NULL;
-				Photo* _tmp29_ = NULL;
+				LibraryWindow* _tmp26_;
+				LibraryWindow* _tmp27_;
+				CollectionPage* _tmp28_;
+				Photo* _tmp29_;
 #line 80 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp26_ = library_window_get_app ();
 #line 80 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3110,15 +3110,15 @@ void page_command_return_to_page (PageCommand* self) {
 			}
 		}
 	} else {
-		Page* _tmp30_ = NULL;
+		Page* _tmp30_;
 #line 82 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp30_ = self->priv->page;
 #line 82 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp30_ != NULL) {
 #line 3119 "Commands.c"
-			AppWindow* _tmp31_ = NULL;
-			AppWindow* _tmp32_ = NULL;
-			Page* _tmp33_ = NULL;
+			AppWindow* _tmp31_;
+			AppWindow* _tmp32_;
+			Page* _tmp33_;
 #line 83 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp31_ = app_window_get_instance ();
 #line 83 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3139,8 +3139,8 @@ void page_command_return_to_page (PageCommand* self) {
 
 
 static void page_command_on_page_destroyed (PageCommand* self) {
-	Page* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	Page* _tmp0_;
+	guint _tmp1_;
 #line 86 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_PAGE_COMMAND (self));
 #line 87 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3158,8 +3158,8 @@ static void page_command_on_page_destroyed (PageCommand* self) {
 
 
 static void page_command_on_photo_destroyed (PageCommand* self) {
-	Photo* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	Photo* _tmp0_;
+	guint _tmp1_;
 #line 91 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_PAGE_COMMAND (self));
 #line 92 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3177,8 +3177,8 @@ static void page_command_on_photo_destroyed (PageCommand* self) {
 
 
 static void page_command_on_controller_destroyed (PageCommand* self) {
-	CollectionPage* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	CollectionPage* _tmp0_;
+	guint _tmp1_;
 #line 96 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_PAGE_COMMAND (self));
 #line 97 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3201,7 +3201,7 @@ static void page_command_class_init (PageCommandClass * klass) {
 #line 9 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (PageCommandPrivate));
 #line 9 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->prepare = (void (*)(Command*)) page_command_real_prepare;
+	((CommandClass *) klass)->prepare = (void (*) (Command *)) page_command_real_prepare;
 #line 9 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_command_finalize;
 #line 3208 "Commands.c"
@@ -3221,11 +3221,11 @@ static void page_command_instance_init (PageCommand * self) {
 }
 
 
-static void page_command_finalize (GObject* obj) {
+static void page_command_finalize (GObject * obj) {
 	PageCommand * self;
-	Page* _tmp0_ = NULL;
-	Photo* _tmp3_ = NULL;
-	CollectionPage* _tmp6_ = NULL;
+	Page* _tmp0_;
+	Photo* _tmp3_;
+	CollectionPage* _tmp6_;
 #line 9 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_COMMAND, PageCommand);
 #line 44 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3233,8 +3233,8 @@ static void page_command_finalize (GObject* obj) {
 #line 44 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ != NULL) {
 #line 3236 "Commands.c"
-		Page* _tmp1_ = NULL;
-		guint _tmp2_ = 0U;
+		Page* _tmp1_;
+		guint _tmp2_;
 #line 45 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = self->priv->page;
 #line 45 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3248,8 +3248,8 @@ static void page_command_finalize (GObject* obj) {
 #line 47 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ != NULL) {
 #line 3251 "Commands.c"
-		Photo* _tmp4_ = NULL;
-		guint _tmp5_ = 0U;
+		Photo* _tmp4_;
+		guint _tmp5_;
 #line 48 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = self->priv->library_photo;
 #line 48 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3263,8 +3263,8 @@ static void page_command_finalize (GObject* obj) {
 #line 50 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp6_ != NULL) {
 #line 3266 "Commands.c"
-		CollectionPage* _tmp7_ = NULL;
-		guint _tmp8_ = 0U;
+		CollectionPage* _tmp7_;
+		guint _tmp8_;
 #line 51 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = self->priv->collection_page;
 #line 51 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3306,11 +3306,11 @@ static void _single_data_source_command_on_source_destroyed_data_source_destroye
 
 SingleDataSourceCommand* single_data_source_command_construct (GType object_type, DataSource* source, const gchar* name, const gchar* explanation) {
 	SingleDataSourceCommand * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	DataSource* _tmp2_ = NULL;
-	DataSource* _tmp3_ = NULL;
-	DataSource* _tmp4_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	DataSource* _tmp2_;
+	DataSource* _tmp3_;
+	DataSource* _tmp4_;
 #line 106 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
 #line 106 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3343,8 +3343,8 @@ SingleDataSourceCommand* single_data_source_command_construct (GType object_type
 
 DataSource* single_data_source_command_get_source (SingleDataSourceCommand* self) {
 	DataSource* result = NULL;
-	DataSource* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	DataSource* _tmp1_;
 #line 118 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_SINGLE_DATA_SOURCE_COMMAND (self), NULL);
 #line 119 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3360,8 +3360,8 @@ DataSource* single_data_source_command_get_source (SingleDataSourceCommand* self
 
 
 static void single_data_source_command_on_source_destroyed (SingleDataSourceCommand* self) {
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
 #line 122 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_SINGLE_DATA_SOURCE_COMMAND (self));
 #line 125 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3389,10 +3389,10 @@ static void single_data_source_command_instance_init (SingleDataSourceCommand *
 }
 
 
-static void single_data_source_command_finalize (GObject* obj) {
+static void single_data_source_command_finalize (GObject * obj) {
 	SingleDataSourceCommand * self;
-	DataSource* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	DataSource* _tmp0_;
+	guint _tmp1_;
 #line 103 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand);
 #line 115 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3430,11 +3430,11 @@ static void _simple_proxyable_command_on_proxy_broken_source_proxy_broken (Sourc
 
 SimpleProxyableCommand* simple_proxyable_command_construct (GType object_type, Proxyable* proxyable, const gchar* name, const gchar* explanation) {
 	SimpleProxyableCommand * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	Proxyable* _tmp2_ = NULL;
-	SourceProxy* _tmp3_ = NULL;
-	SourceProxy* _tmp4_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	Proxyable* _tmp2_;
+	SourceProxy* _tmp3_;
+	SourceProxy* _tmp4_;
 #line 133 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_PROXYABLE (proxyable), NULL);
 #line 133 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3467,9 +3467,9 @@ SimpleProxyableCommand* simple_proxyable_command_construct (GType object_type, P
 
 static void simple_proxyable_command_real_execute (Command* base) {
 	SimpleProxyableCommand * self;
-	SourceProxy* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	DataSource* _tmp2_ = NULL;
+	SourceProxy* _tmp0_;
+	DataSource* _tmp1_;
+	DataSource* _tmp2_;
 #line 145 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommand);
 #line 146 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3506,9 +3506,9 @@ void simple_proxyable_command_execute_on_source (SimpleProxyableCommand* self, D
 
 static void simple_proxyable_command_real_undo (Command* base) {
 	SimpleProxyableCommand * self;
-	SourceProxy* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	DataSource* _tmp2_ = NULL;
+	SourceProxy* _tmp0_;
+	DataSource* _tmp1_;
+	DataSource* _tmp2_;
 #line 151 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommand);
 #line 152 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3551,8 +3551,8 @@ void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeC
 #line 3552 "Commands.c"
 	{
 		GeeIterator* _proxyable_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 162 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = proxyables;
 #line 162 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3562,17 +3562,17 @@ void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeC
 #line 162 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
 #line 3565 "Commands.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			Proxyable* proxyable = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			SourceProxy* added_proxy = NULL;
-			Proxyable* _tmp6_ = NULL;
-			SourceProxy* _tmp7_ = NULL;
-			SourceProxy* _tmp8_ = NULL;
-			GeeHashSet* _tmp9_ = NULL;
-			SourceProxy* _tmp10_ = NULL;
+			Proxyable* _tmp6_;
+			SourceProxy* _tmp7_;
+			SourceProxy* _tmp8_;
+			GeeHashSet* _tmp9_;
+			SourceProxy* _tmp10_;
 #line 162 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp2_ = _proxyable_it;
 #line 162 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3619,14 +3619,14 @@ void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeC
 
 
 void simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self) {
-	GeeHashSet* _tmp8_ = NULL;
+	GeeHashSet* _tmp8_;
 #line 170 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_SIMPLE_PROXYABLE_COMMAND (self));
 #line 3626 "Commands.c"
 	{
 		GeeIterator* _added_proxy_it = NULL;
-		GeeHashSet* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeHashSet* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 171 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->proxies;
 #line 171 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3636,13 +3636,13 @@ void simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self)
 #line 171 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
 #line 3639 "Commands.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			SourceProxy* added_proxy = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			SourceProxy* _tmp6_ = NULL;
-			guint _tmp7_ = 0U;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			SourceProxy* _tmp6_;
+			guint _tmp7_;
 #line 171 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp2_ = _added_proxy_it;
 #line 171 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3682,8 +3682,8 @@ void simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self)
 
 
 static void simple_proxyable_command_on_proxy_broken (SimpleProxyableCommand* self) {
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
 #line 177 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_SIMPLE_PROXYABLE_COMMAND (self));
 #line 178 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3706,13 +3706,13 @@ static void simple_proxyable_command_class_init (SimpleProxyableCommandClass * k
 #line 129 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (SimpleProxyableCommandPrivate));
 #line 129 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) simple_proxyable_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) simple_proxyable_command_real_execute;
 #line 129 "/home/jens/Source/shotwell/src/Commands.vala"
-	((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) simple_proxyable_command_real_execute_on_source;
+	((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) simple_proxyable_command_real_execute_on_source;
 #line 129 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) simple_proxyable_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) simple_proxyable_command_real_undo;
 #line 129 "/home/jens/Source/shotwell/src/Commands.vala"
-	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) simple_proxyable_command_real_undo_on_source;
+	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) simple_proxyable_command_real_undo_on_source;
 #line 129 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = simple_proxyable_command_finalize;
 #line 3719 "Commands.c"
@@ -3720,7 +3720,7 @@ static void simple_proxyable_command_class_init (SimpleProxyableCommandClass * k
 
 
 static void simple_proxyable_command_instance_init (SimpleProxyableCommand * self) {
-	GeeHashSet* _tmp0_ = NULL;
+	GeeHashSet* _tmp0_;
 #line 129 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = SIMPLE_PROXYABLE_COMMAND_GET_PRIVATE (self);
 #line 131 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3731,10 +3731,10 @@ static void simple_proxyable_command_instance_init (SimpleProxyableCommand * sel
 }
 
 
-static void simple_proxyable_command_finalize (GObject* obj) {
+static void simple_proxyable_command_finalize (GObject * obj) {
 	SimpleProxyableCommand * self;
-	SourceProxy* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	SourceProxy* _tmp0_;
+	guint _tmp1_;
 #line 129 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommand);
 #line 141 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3776,12 +3776,12 @@ static void _single_photo_transformation_command_on_state_broken_photo_transform
 
 SinglePhotoTransformationCommand* single_photo_transformation_command_construct (GType object_type, Photo* photo, const gchar* name, const gchar* explanation) {
 	SinglePhotoTransformationCommand * self = NULL;
-	Photo* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	PhotoTransformationState* _tmp4_ = NULL;
-	PhotoTransformationState* _tmp5_ = NULL;
+	Photo* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	Photo* _tmp3_;
+	PhotoTransformationState* _tmp4_;
+	PhotoTransformationState* _tmp5_;
 #line 186 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
 #line 186 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3816,8 +3816,8 @@ SinglePhotoTransformationCommand* single_photo_transformation_command_construct
 
 static void single_photo_transformation_command_real_undo (Command* base) {
 	SinglePhotoTransformationCommand * self;
-	DataSource* _tmp0_ = NULL;
-	PhotoTransformationState* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	PhotoTransformationState* _tmp1_;
 #line 197 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_TRANSFORMATION_COMMAND, SinglePhotoTransformationCommand);
 #line 198 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3831,8 +3831,8 @@ static void single_photo_transformation_command_real_undo (Command* base) {
 
 
 static void single_photo_transformation_command_on_state_broken (SinglePhotoTransformationCommand* self) {
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
 #line 201 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_TRANSFORMATION_COMMAND (self));
 #line 202 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3853,7 +3853,7 @@ static void single_photo_transformation_command_class_init (SinglePhotoTransform
 #line 183 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (SinglePhotoTransformationCommandPrivate));
 #line 183 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) single_photo_transformation_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) single_photo_transformation_command_real_undo;
 #line 183 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = single_photo_transformation_command_finalize;
 #line 3860 "Commands.c"
@@ -3867,10 +3867,10 @@ static void single_photo_transformation_command_instance_init (SinglePhotoTransf
 }
 
 
-static void single_photo_transformation_command_finalize (GObject* obj) {
+static void single_photo_transformation_command_finalize (GObject * obj) {
 	SinglePhotoTransformationCommand * self;
-	PhotoTransformationState* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	PhotoTransformationState* _tmp0_;
+	guint _tmp1_;
 #line 183 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SINGLE_PHOTO_TRANSFORMATION_COMMAND, SinglePhotoTransformationCommand);
 #line 194 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3908,9 +3908,9 @@ static void _generic_photo_transformation_command_on_state_broken_photo_transfor
 
 GenericPhotoTransformationCommand* generic_photo_transformation_command_construct (GType object_type, Photo* photo, const gchar* name, const gchar* explanation) {
 	GenericPhotoTransformationCommand * self = NULL;
-	Photo* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	Photo* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
 #line 210 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
 #line 210 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3934,12 +3934,12 @@ GenericPhotoTransformationCommand* generic_photo_transformation_command_construc
 static void generic_photo_transformation_command_real_execute (Command* base) {
 	GenericPhotoTransformationCommand * self;
 	Photo* photo = NULL;
-	DataSource* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	PhotoTransformationState* _tmp2_ = NULL;
-	PhotoTransformationState* _tmp3_ = NULL;
-	PhotoTransformationState* _tmp4_ = NULL;
-	PhotoTransformationState* _tmp5_ = NULL;
+	DataSource* _tmp0_;
+	Photo* _tmp1_;
+	PhotoTransformationState* _tmp2_;
+	PhotoTransformationState* _tmp3_;
+	PhotoTransformationState* _tmp4_;
+	PhotoTransformationState* _tmp5_;
 #line 222 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND, GenericPhotoTransformationCommand);
 #line 223 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3996,8 +3996,8 @@ void generic_photo_transformation_command_execute_on_photo (GenericPhotoTransfor
 
 static void generic_photo_transformation_command_real_undo (Command* base) {
 	GenericPhotoTransformationCommand * self;
-	DataSource* _tmp0_ = NULL;
-	PhotoTransformationState* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	PhotoTransformationState* _tmp1_;
 #line 236 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND, GenericPhotoTransformationCommand);
 #line 238 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4012,8 +4012,8 @@ static void generic_photo_transformation_command_real_undo (Command* base) {
 
 static void generic_photo_transformation_command_real_redo (Command* base) {
 	GenericPhotoTransformationCommand * self;
-	DataSource* _tmp0_ = NULL;
-	PhotoTransformationState* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	PhotoTransformationState* _tmp1_;
 #line 241 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND, GenericPhotoTransformationCommand);
 #line 243 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4050,19 +4050,19 @@ gboolean generic_photo_transformation_command_can_compress (GenericPhotoTransfor
 static gboolean generic_photo_transformation_command_real_compress (Command* base, Command* command) {
 	GenericPhotoTransformationCommand * self;
 	gboolean result = FALSE;
-	Command* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Command* _tmp0_;
+	gboolean _tmp1_;
 	GenericPhotoTransformationCommand* generic = NULL;
-	Command* _tmp2_ = NULL;
-	GenericPhotoTransformationCommand* _tmp3_ = NULL;
-	GenericPhotoTransformationCommand* _tmp4_ = NULL;
-	GenericPhotoTransformationCommand* _tmp5_ = NULL;
-	DataSource* _tmp6_ = NULL;
-	DataSource* _tmp7_ = NULL;
-	GenericPhotoTransformationCommand* _tmp8_ = NULL;
-	GenericPhotoTransformationCommand* _tmp9_ = NULL;
-	PhotoTransformationState* _tmp10_ = NULL;
-	PhotoTransformationState* _tmp11_ = NULL;
+	Command* _tmp2_;
+	GenericPhotoTransformationCommand* _tmp3_;
+	GenericPhotoTransformationCommand* _tmp4_;
+	GenericPhotoTransformationCommand* _tmp5_;
+	DataSource* _tmp6_;
+	DataSource* _tmp7_;
+	GenericPhotoTransformationCommand* _tmp8_;
+	GenericPhotoTransformationCommand* _tmp9_;
+	PhotoTransformationState* _tmp10_;
+	PhotoTransformationState* _tmp11_;
 #line 250 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND, GenericPhotoTransformationCommand);
 #line 250 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4138,8 +4138,8 @@ static gboolean generic_photo_transformation_command_real_compress (Command* bas
 
 
 static void generic_photo_transformation_command_on_state_broken (GenericPhotoTransformationCommand* self) {
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
 #line 270 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_GENERIC_PHOTO_TRANSFORMATION_COMMAND (self));
 #line 271 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4160,17 +4160,17 @@ static void generic_photo_transformation_command_class_init (GenericPhotoTransfo
 #line 206 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (GenericPhotoTransformationCommandPrivate));
 #line 206 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) generic_photo_transformation_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) generic_photo_transformation_command_real_execute;
 #line 206 "/home/jens/Source/shotwell/src/Commands.vala"
-	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) generic_photo_transformation_command_real_execute_on_photo;
+	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) generic_photo_transformation_command_real_execute_on_photo;
 #line 206 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) generic_photo_transformation_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) generic_photo_transformation_command_real_undo;
 #line 206 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->redo = (void (*)(Command*)) generic_photo_transformation_command_real_redo;
+	((CommandClass *) klass)->redo = (void (*) (Command *)) generic_photo_transformation_command_real_redo;
 #line 206 "/home/jens/Source/shotwell/src/Commands.vala"
-	((GenericPhotoTransformationCommandClass *) klass)->can_compress = (gboolean (*)(GenericPhotoTransformationCommand*, Command*)) generic_photo_transformation_command_real_can_compress;
+	((GenericPhotoTransformationCommandClass *) klass)->can_compress = (gboolean (*) (GenericPhotoTransformationCommand *, Command*)) generic_photo_transformation_command_real_can_compress;
 #line 206 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) generic_photo_transformation_command_real_compress;
+	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) generic_photo_transformation_command_real_compress;
 #line 206 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = generic_photo_transformation_command_finalize;
 #line 4177 "Commands.c"
@@ -4188,10 +4188,10 @@ static void generic_photo_transformation_command_instance_init (GenericPhotoTran
 }
 
 
-static void generic_photo_transformation_command_finalize (GObject* obj) {
+static void generic_photo_transformation_command_finalize (GObject * obj) {
 	GenericPhotoTransformationCommand * self;
-	PhotoTransformationState* _tmp0_ = NULL;
-	PhotoTransformationState* _tmp3_ = NULL;
+	PhotoTransformationState* _tmp0_;
+	PhotoTransformationState* _tmp3_;
 #line 206 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND, GenericPhotoTransformationCommand);
 #line 215 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4199,8 +4199,8 @@ static void generic_photo_transformation_command_finalize (GObject* obj) {
 #line 215 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ != NULL) {
 #line 4202 "Commands.c"
-		PhotoTransformationState* _tmp1_ = NULL;
-		guint _tmp2_ = 0U;
+		PhotoTransformationState* _tmp1_;
+		guint _tmp2_;
 #line 216 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = self->priv->original_state;
 #line 216 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4214,8 +4214,8 @@ static void generic_photo_transformation_command_finalize (GObject* obj) {
 #line 218 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ != NULL) {
 #line 4217 "Commands.c"
-		PhotoTransformationState* _tmp4_ = NULL;
-		guint _tmp5_ = 0U;
+		PhotoTransformationState* _tmp4_;
+		guint _tmp5_;
 #line 219 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = self->priv->transformed_state;
 #line 219 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4255,12 +4255,12 @@ static void _multiple_data_source_command_on_source_destroyed_source_collection_
 
 MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_type, GeeIterable* iter, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation) {
 	MultipleDataSourceCommand * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 285 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
 #line 285 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4296,8 +4296,8 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 #line 4297 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
-		GeeIterable* _tmp6_ = NULL;
-		GeeIterator* _tmp7_ = NULL;
+		GeeIterable* _tmp6_;
+		GeeIterator* _tmp7_;
 #line 292 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp6_ = iter;
 #line 292 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4307,20 +4307,20 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 #line 292 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
 #line 4310 "Commands.c"
-			GeeIterator* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			GeeIterator* _tmp8_;
+			gboolean _tmp9_;
 			DataView* view = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			gpointer _tmp11_ = NULL;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
 			DataSource* source = NULL;
-			DataView* _tmp12_ = NULL;
-			DataSource* _tmp13_ = NULL;
+			DataView* _tmp12_;
+			DataSource* _tmp13_;
 			SourceCollection* collection = NULL;
-			DataSource* _tmp14_ = NULL;
-			DataCollection* _tmp15_ = NULL;
-			SourceCollection* _tmp16_ = NULL;
-			GeeArrayList* _tmp19_ = NULL;
-			DataSource* _tmp20_ = NULL;
+			DataSource* _tmp14_;
+			DataCollection* _tmp15_;
+			SourceCollection* _tmp16_;
+			GeeArrayList* _tmp19_;
+			DataSource* _tmp20_;
 #line 292 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _view_it;
 #line 292 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4354,8 +4354,8 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 #line 296 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp16_ != NULL) {
 #line 4357 "Commands.c"
-				GeeHashSet* _tmp17_ = NULL;
-				SourceCollection* _tmp18_ = NULL;
+				GeeHashSet* _tmp17_;
+				SourceCollection* _tmp18_;
 #line 297 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp17_ = self->priv->hooked_collections;
 #line 297 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4384,8 +4384,8 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 	}
 	{
 		GeeIterator* _current_collection_it = NULL;
-		GeeHashSet* _tmp21_ = NULL;
-		GeeIterator* _tmp22_ = NULL;
+		GeeHashSet* _tmp21_;
+		GeeIterator* _tmp22_;
 #line 302 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp21_ = self->priv->hooked_collections;
 #line 302 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4395,12 +4395,12 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 #line 302 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
 #line 4398 "Commands.c"
-			GeeIterator* _tmp23_ = NULL;
-			gboolean _tmp24_ = FALSE;
+			GeeIterator* _tmp23_;
+			gboolean _tmp24_;
 			SourceCollection* current_collection = NULL;
-			GeeIterator* _tmp25_ = NULL;
-			gpointer _tmp26_ = NULL;
-			SourceCollection* _tmp27_ = NULL;
+			GeeIterator* _tmp25_;
+			gpointer _tmp26_;
+			SourceCollection* _tmp27_;
 #line 302 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp23_ = _current_collection_it;
 #line 302 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4437,8 +4437,8 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 
 GeeIterable* multiple_data_source_command_get_sources (MultipleDataSourceCommand* self) {
 	GeeIterable* result = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeIterable* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeIterable* _tmp1_;
 #line 313 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self), NULL);
 #line 314 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4455,9 +4455,9 @@ GeeIterable* multiple_data_source_command_get_sources (MultipleDataSourceCommand
 
 gint multiple_data_source_command_get_source_count (MultipleDataSourceCommand* self) {
 	gint result = 0;
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 317 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self), 0);
 #line 318 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4475,9 +4475,9 @@ gint multiple_data_source_command_get_source_count (MultipleDataSourceCommand* s
 
 
 static void multiple_data_source_command_on_source_destroyed (MultipleDataSourceCommand* self, DataSource* source) {
-	GeeArrayList* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeArrayList* _tmp0_;
+	DataSource* _tmp1_;
+	gboolean _tmp2_;
 #line 321 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self));
 #line 321 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4491,8 +4491,8 @@ static void multiple_data_source_command_on_source_destroyed (MultipleDataSource
 #line 324 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_) {
 #line 4494 "Commands.c"
-		CommandManager* _tmp3_ = NULL;
-		CommandManager* _tmp4_ = NULL;
+		CommandManager* _tmp3_;
+		CommandManager* _tmp4_;
 #line 325 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command));
 #line 325 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4508,9 +4508,9 @@ static void multiple_data_source_command_on_source_destroyed (MultipleDataSource
 
 static void multiple_data_source_command_real_execute (Command* base) {
 	MultipleDataSourceCommand * self;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	GeeArrayList* _tmp2_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp1_;
+	GeeArrayList* _tmp2_;
 #line 328 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand);
 #line 329 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4551,9 +4551,9 @@ void multiple_data_source_command_execute_on_source (MultipleDataSourceCommand*
 
 static void multiple_data_source_command_real_undo (Command* base) {
 	MultipleDataSourceCommand * self;
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 338 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand);
 #line 339 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4565,8 +4565,8 @@ static void multiple_data_source_command_real_undo (Command* base) {
 #line 339 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ > 0) {
 #line 4568 "Commands.c"
-		GeeArrayList* _tmp3_ = NULL;
-		GeeArrayList* _tmp4_ = NULL;
+		GeeArrayList* _tmp3_;
+		GeeArrayList* _tmp4_;
 #line 340 "/home/jens/Source/shotwell/src/Commands.vala"
 		multiple_data_source_command_start_transaction (self);
 #line 341 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4615,8 +4615,8 @@ static void multiple_data_source_command_start_transaction (MultipleDataSourceCo
 #line 4616 "Commands.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		GeeHashSet* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeHashSet* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 351 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->hooked_collections;
 #line 351 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4626,15 +4626,15 @@ static void multiple_data_source_command_start_transaction (MultipleDataSourceCo
 #line 351 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
 #line 4629 "Commands.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			SourceCollection* sources = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			MediaSourceCollection* media_collection = NULL;
-			SourceCollection* _tmp6_ = NULL;
-			MediaSourceCollection* _tmp7_ = NULL;
-			MediaSourceCollection* _tmp8_ = NULL;
+			SourceCollection* _tmp6_;
+			MediaSourceCollection* _tmp7_;
+			MediaSourceCollection* _tmp8_;
 #line 351 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp2_ = _sources_it;
 #line 351 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4662,9 +4662,9 @@ static void multiple_data_source_command_start_transaction (MultipleDataSourceCo
 #line 353 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp8_ != NULL) {
 #line 4665 "Commands.c"
-				MediaSourceCollection* _tmp9_ = NULL;
-				TransactionController* _tmp10_ = NULL;
-				TransactionController* _tmp11_ = NULL;
+				MediaSourceCollection* _tmp9_;
+				TransactionController* _tmp10_;
+				TransactionController* _tmp11_;
 #line 354 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp9_ = media_collection;
 #line 354 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4694,8 +4694,8 @@ static void multiple_data_source_command_commit_transaction (MultipleDataSourceC
 #line 4695 "Commands.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		GeeHashSet* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeHashSet* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 359 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->hooked_collections;
 #line 359 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4705,15 +4705,15 @@ static void multiple_data_source_command_commit_transaction (MultipleDataSourceC
 #line 359 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
 #line 4708 "Commands.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			SourceCollection* sources = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			MediaSourceCollection* media_collection = NULL;
-			SourceCollection* _tmp6_ = NULL;
-			MediaSourceCollection* _tmp7_ = NULL;
-			MediaSourceCollection* _tmp8_ = NULL;
+			SourceCollection* _tmp6_;
+			MediaSourceCollection* _tmp7_;
+			MediaSourceCollection* _tmp8_;
 #line 359 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp2_ = _sources_it;
 #line 359 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4741,9 +4741,9 @@ static void multiple_data_source_command_commit_transaction (MultipleDataSourceC
 #line 361 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp8_ != NULL) {
 #line 4744 "Commands.c"
-				MediaSourceCollection* _tmp9_ = NULL;
-				TransactionController* _tmp10_ = NULL;
-				TransactionController* _tmp11_ = NULL;
+				MediaSourceCollection* _tmp9_;
+				TransactionController* _tmp10_;
+				TransactionController* _tmp11_;
 #line 362 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp9_ = media_collection;
 #line 362 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4768,26 +4768,26 @@ static void multiple_data_source_command_commit_transaction (MultipleDataSourceC
 
 
 static void multiple_data_source_command_execute_all (MultipleDataSourceCommand* self, gboolean exec, gboolean can_cancel, GeeArrayList* todo, GeeArrayList* completed) {
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	AppWindow* _tmp0_;
+	AppWindow* _tmp1_;
 	gint count = 0;
 	gint total = 0;
-	GeeArrayList* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	GeeArrayList* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	gint two_percent = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gint _tmp5_;
+	gint _tmp6_;
 	const gchar* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	gboolean _tmp8_;
 	gchar* text = NULL;
-	gchar* _tmp11_ = NULL;
+	gchar* _tmp11_;
 	GCancellable* cancellable = NULL;
 	ProgressDialog* progress = NULL;
-	gint _tmp12_ = 0;
-	ProgressDialog* _tmp50_ = NULL;
-	AppWindow* _tmp52_ = NULL;
-	AppWindow* _tmp53_ = NULL;
+	gint _tmp12_;
+	ProgressDialog* _tmp50_;
+	AppWindow* _tmp52_;
+	AppWindow* _tmp53_;
 #line 366 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self));
 #line 366 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4829,14 +4829,14 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp8_) {
 #line 4832 "Commands.c"
-		const gchar* _tmp9_ = NULL;
+		const gchar* _tmp9_;
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp9_ = self->priv->progress_text;
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = _tmp9_;
 #line 4838 "Commands.c"
 	} else {
-		const gchar* _tmp10_ = NULL;
+		const gchar* _tmp10_;
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp10_ = self->priv->undo_progress_text;
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4857,19 +4857,19 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 	if (_tmp12_ >= MULTIPLE_DATA_SOURCE_COMMAND_MIN_OPS_FOR_PROGRESS_WINDOW) {
 #line 4859 "Commands.c"
 		GCancellable* _tmp13_ = NULL;
-		gboolean _tmp14_ = FALSE;
-		GCancellable* _tmp16_ = NULL;
-		AppWindow* _tmp17_ = NULL;
-		AppWindow* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		GCancellable* _tmp20_ = NULL;
-		ProgressDialog* _tmp21_ = NULL;
+		gboolean _tmp14_;
+		GCancellable* _tmp16_;
+		AppWindow* _tmp17_;
+		AppWindow* _tmp18_;
+		const gchar* _tmp19_;
+		GCancellable* _tmp20_;
+		ProgressDialog* _tmp21_;
 #line 381 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp14_ = can_cancel;
 #line 381 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp14_) {
 #line 4872 "Commands.c"
-			GCancellable* _tmp15_ = NULL;
+			GCancellable* _tmp15_;
 #line 381 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp15_ = g_cancellable_new ();
 #line 381 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4914,12 +4914,12 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 	}
 	{
 		GeeArrayList* _source_list = NULL;
-		GeeArrayList* _tmp22_ = NULL;
-		GeeArrayList* _tmp23_ = NULL;
+		GeeArrayList* _tmp22_;
+		GeeArrayList* _tmp23_;
 		gint _source_size = 0;
-		GeeArrayList* _tmp24_ = NULL;
-		gint _tmp25_ = 0;
-		gint _tmp26_ = 0;
+		GeeArrayList* _tmp24_;
+		gint _tmp25_;
+		gint _tmp26_;
 		gint _source_index = 0;
 #line 385 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp22_ = todo;
@@ -4940,16 +4940,16 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 #line 385 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
 #line 4943 "Commands.c"
-			gint _tmp27_ = 0;
-			gint _tmp28_ = 0;
-			gint _tmp29_ = 0;
+			gint _tmp27_;
+			gint _tmp28_;
+			gint _tmp29_;
 			DataSource* source = NULL;
-			GeeArrayList* _tmp30_ = NULL;
-			gint _tmp31_ = 0;
-			gpointer _tmp32_ = NULL;
-			gboolean _tmp33_ = FALSE;
-			GeeArrayList* _tmp36_ = NULL;
-			ProgressDialog* _tmp39_ = NULL;
+			GeeArrayList* _tmp30_;
+			gint _tmp31_;
+			gpointer _tmp32_;
+			gboolean _tmp33_;
+			GeeArrayList* _tmp36_;
+			ProgressDialog* _tmp39_;
 #line 385 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp27_ = _source_index;
 #line 385 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4977,14 +4977,14 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 #line 386 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp33_) {
 #line 4980 "Commands.c"
-				DataSource* _tmp34_ = NULL;
+				DataSource* _tmp34_;
 #line 387 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp34_ = source;
 #line 387 "/home/jens/Source/shotwell/src/Commands.vala"
 				multiple_data_source_command_execute_on_source (self, _tmp34_);
 #line 4986 "Commands.c"
 			} else {
-				DataSource* _tmp35_ = NULL;
+				DataSource* _tmp35_;
 #line 389 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp35_ = source;
 #line 389 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4996,8 +4996,8 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 #line 391 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp36_ != NULL) {
 #line 4999 "Commands.c"
-				GeeArrayList* _tmp37_ = NULL;
-				DataSource* _tmp38_ = NULL;
+				GeeArrayList* _tmp37_;
+				DataSource* _tmp38_;
 #line 392 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp37_ = completed;
 #line 392 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5011,11 +5011,11 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 #line 394 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp39_ != NULL) {
 #line 5014 "Commands.c"
-				gint _tmp40_ = 0;
-				gint _tmp41_ = 0;
-				gint _tmp42_ = 0;
+				gint _tmp40_;
+				gint _tmp41_;
+				gint _tmp42_;
 				gboolean _tmp46_ = FALSE;
-				GCancellable* _tmp47_ = NULL;
+				GCancellable* _tmp47_;
 #line 395 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp40_ = count;
 #line 395 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5027,9 +5027,9 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 #line 395 "/home/jens/Source/shotwell/src/Commands.vala"
 				if ((_tmp41_ % _tmp42_) == 0) {
 #line 5030 "Commands.c"
-					ProgressDialog* _tmp43_ = NULL;
-					gint _tmp44_ = 0;
-					gint _tmp45_ = 0;
+					ProgressDialog* _tmp43_;
+					gint _tmp44_;
+					gint _tmp45_;
 #line 396 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp43_ = progress;
 #line 396 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5047,8 +5047,8 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 #line 400 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (_tmp47_ != NULL) {
 #line 5050 "Commands.c"
-					GCancellable* _tmp48_ = NULL;
-					gboolean _tmp49_ = FALSE;
+					GCancellable* _tmp48_;
+					gboolean _tmp49_;
 #line 400 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp48_ = cancellable;
 #line 400 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5083,7 +5083,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 #line 405 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp50_ != NULL) {
 #line 5086 "Commands.c"
-		ProgressDialog* _tmp51_ = NULL;
+		ProgressDialog* _tmp51_;
 #line 406 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp51_ = progress;
 #line 406 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5114,13 +5114,13 @@ static void multiple_data_source_command_class_init (MultipleDataSourceCommandCl
 #line 275 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (MultipleDataSourceCommandPrivate));
 #line 275 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) multiple_data_source_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) multiple_data_source_command_real_execute;
 #line 275 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) multiple_data_source_command_real_execute_on_source;
+	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) multiple_data_source_command_real_execute_on_source;
 #line 275 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) multiple_data_source_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) multiple_data_source_command_real_undo;
 #line 275 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) multiple_data_source_command_real_undo_on_source;
+	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) multiple_data_source_command_real_undo_on_source;
 #line 275 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = multiple_data_source_command_finalize;
 #line 5127 "Commands.c"
@@ -5128,9 +5128,9 @@ static void multiple_data_source_command_class_init (MultipleDataSourceCommandCl
 
 
 static void multiple_data_source_command_instance_init (MultipleDataSourceCommand * self) {
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	GeeHashSet* _tmp2_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp1_;
+	GeeHashSet* _tmp2_;
 #line 275 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = MULTIPLE_DATA_SOURCE_COMMAND_GET_PRIVATE (self);
 #line 278 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5149,15 +5149,15 @@ static void multiple_data_source_command_instance_init (MultipleDataSourceComman
 }
 
 
-static void multiple_data_source_command_finalize (GObject* obj) {
+static void multiple_data_source_command_finalize (GObject * obj) {
 	MultipleDataSourceCommand * self;
 #line 275 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand);
 #line 5157 "Commands.c"
 	{
 		GeeIterator* _current_collection_it = NULL;
-		GeeHashSet* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeHashSet* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 308 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->hooked_collections;
 #line 308 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5167,13 +5167,13 @@ static void multiple_data_source_command_finalize (GObject* obj) {
 #line 308 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
 #line 5170 "Commands.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			SourceCollection* current_collection = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			SourceCollection* _tmp6_ = NULL;
-			guint _tmp7_ = 0U;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			SourceCollection* _tmp6_;
+			guint _tmp7_;
 #line 308 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp2_ = _current_collection_it;
 #line 308 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5241,10 +5241,10 @@ static void _multiple_data_source_at_once_command_on_sources_destroyed_source_co
 
 MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct (GType object_type, GeeCollection* sources, const gchar* name, const gchar* explanation) {
 	MultipleDataSourceAtOnceCommand * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GeeHashSet* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	GeeHashSet* _tmp2_;
+	GeeCollection* _tmp3_;
 #line 417 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (sources), NULL);
 #line 417 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5266,8 +5266,8 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 #line 5267 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeHashSet* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeHashSet* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 423 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = self->priv->sources;
 #line 423 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5277,16 +5277,16 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 #line 423 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
 #line 5280 "Commands.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			SourceCollection* membership = NULL;
-			DataSource* _tmp10_ = NULL;
-			DataCollection* _tmp11_ = NULL;
-			SourceCollection* _tmp12_ = NULL;
-			SourceCollection* _tmp13_ = NULL;
+			DataSource* _tmp10_;
+			DataCollection* _tmp11_;
+			SourceCollection* _tmp12_;
+			SourceCollection* _tmp13_;
 #line 423 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp6_ = _source_it;
 #line 423 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5322,8 +5322,8 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 #line 425 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp13_ != NULL) {
 #line 5325 "Commands.c"
-				GeeHashSet* _tmp14_ = NULL;
-				SourceCollection* _tmp15_ = NULL;
+				GeeHashSet* _tmp14_;
+				SourceCollection* _tmp15_;
 #line 426 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp14_ = self->priv->hooked_collections;
 #line 426 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5344,8 +5344,8 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 	}
 	{
 		GeeIterator* _source_collection_it = NULL;
-		GeeHashSet* _tmp16_ = NULL;
-		GeeIterator* _tmp17_ = NULL;
+		GeeHashSet* _tmp16_;
+		GeeIterator* _tmp17_;
 #line 429 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp16_ = self->priv->hooked_collections;
 #line 429 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5355,12 +5355,12 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 #line 429 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
 #line 5358 "Commands.c"
-			GeeIterator* _tmp18_ = NULL;
-			gboolean _tmp19_ = FALSE;
+			GeeIterator* _tmp18_;
+			gboolean _tmp19_;
 			SourceCollection* source_collection = NULL;
-			GeeIterator* _tmp20_ = NULL;
-			gpointer _tmp21_ = NULL;
-			SourceCollection* _tmp22_ = NULL;
+			GeeIterator* _tmp20_;
+			gpointer _tmp21_;
+			SourceCollection* _tmp22_;
 #line 429 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp18_ = _source_collection_it;
 #line 429 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5397,13 +5397,13 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 
 static void multiple_data_source_at_once_command_real_execute (Command* base) {
 	MultipleDataSourceAtOnceCommand * self;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-	MediaCollectionRegistry* _tmp2_ = NULL;
-	MediaCollectionRegistry* _tmp3_ = NULL;
-	GeeHashSet* _tmp4_ = NULL;
-	MediaCollectionRegistry* _tmp5_ = NULL;
-	MediaCollectionRegistry* _tmp6_ = NULL;
+	AppWindow* _tmp0_;
+	AppWindow* _tmp1_;
+	MediaCollectionRegistry* _tmp2_;
+	MediaCollectionRegistry* _tmp3_;
+	GeeHashSet* _tmp4_;
+	MediaCollectionRegistry* _tmp5_;
+	MediaCollectionRegistry* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 438 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND, MultipleDataSourceAtOnceCommand);
@@ -5446,11 +5446,11 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 #line 448 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5449 "Commands.c"
-				goto __catch455_database_error;
+				goto __catch456_database_error;
 			}
 			{
-				AppWindow* _tmp7_ = NULL;
-				AppWindow* _tmp8_ = NULL;
+				AppWindow* _tmp7_;
+				AppWindow* _tmp8_;
 #line 452 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp7_ = app_window_get_instance ();
 #line 452 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5470,11 +5470,11 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 #line 5471 "Commands.c"
 		}
 	}
-	goto __finally455;
-	__catch455_database_error:
+	goto __finally456;
+	__catch456_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp9_ = NULL;
+		GError* _tmp9_;
 #line 447 "/home/jens/Source/shotwell/src/Commands.vala"
 		err = _inner_error_;
 #line 447 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5487,10 +5487,10 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 		_g_error_free0 (err);
 #line 5489 "Commands.c"
 	}
-	__finally455:
+	__finally456:
 	{
-		AppWindow* _tmp10_ = NULL;
-		AppWindow* _tmp11_ = NULL;
+		AppWindow* _tmp10_;
+		AppWindow* _tmp11_;
 #line 452 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp10_ = app_window_get_instance ();
 #line 452 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5534,13 +5534,13 @@ void multiple_data_source_at_once_command_execute_on_all (MultipleDataSourceAtOn
 
 static void multiple_data_source_at_once_command_real_undo (Command* base) {
 	MultipleDataSourceAtOnceCommand * self;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-	MediaCollectionRegistry* _tmp2_ = NULL;
-	MediaCollectionRegistry* _tmp3_ = NULL;
-	GeeHashSet* _tmp4_ = NULL;
-	MediaCollectionRegistry* _tmp5_ = NULL;
-	MediaCollectionRegistry* _tmp6_ = NULL;
+	AppWindow* _tmp0_;
+	AppWindow* _tmp1_;
+	MediaCollectionRegistry* _tmp2_;
+	MediaCollectionRegistry* _tmp3_;
+	GeeHashSet* _tmp4_;
+	MediaCollectionRegistry* _tmp5_;
+	MediaCollectionRegistry* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 458 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND, MultipleDataSourceAtOnceCommand);
@@ -5583,11 +5583,11 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 #line 468 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5586 "Commands.c"
-				goto __catch456_database_error;
+				goto __catch457_database_error;
 			}
 			{
-				AppWindow* _tmp7_ = NULL;
-				AppWindow* _tmp8_ = NULL;
+				AppWindow* _tmp7_;
+				AppWindow* _tmp8_;
 #line 472 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp7_ = app_window_get_instance ();
 #line 472 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5607,11 +5607,11 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 #line 5608 "Commands.c"
 		}
 	}
-	goto __finally456;
-	__catch456_database_error:
+	goto __finally457;
+	__catch457_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp9_ = NULL;
+		GError* _tmp9_;
 #line 467 "/home/jens/Source/shotwell/src/Commands.vala"
 		err = _inner_error_;
 #line 467 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5624,10 +5624,10 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 		_g_error_free0 (err);
 #line 5626 "Commands.c"
 	}
-	__finally456:
+	__finally457:
 	{
-		AppWindow* _tmp10_ = NULL;
-		AppWindow* _tmp11_ = NULL;
+		AppWindow* _tmp10_;
+		AppWindow* _tmp11_;
 #line 472 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp10_ = app_window_get_instance ();
 #line 472 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5677,8 +5677,8 @@ static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleD
 #line 5678 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 479 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = destroyed;
 #line 479 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5688,14 +5688,14 @@ static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleD
 #line 479 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
 #line 5691 "Commands.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			GeeHashSet* _tmp6_ = NULL;
-			DataSource* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			GeeHashSet* _tmp6_;
+			DataSource* _tmp7_;
+			gboolean _tmp8_;
 #line 479 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp2_ = _source_it;
 #line 479 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5721,8 +5721,8 @@ static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleD
 #line 480 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp8_) {
 #line 5724 "Commands.c"
-				CommandManager* _tmp9_ = NULL;
-				CommandManager* _tmp10_ = NULL;
+				CommandManager* _tmp9_;
+				CommandManager* _tmp10_;
 #line 481 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp9_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command));
 #line 481 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5754,13 +5754,13 @@ static void multiple_data_source_at_once_command_class_init (MultipleDataSourceA
 #line 413 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (MultipleDataSourceAtOnceCommandPrivate));
 #line 413 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) multiple_data_source_at_once_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) multiple_data_source_at_once_command_real_execute;
 #line 413 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) multiple_data_source_at_once_command_real_execute_on_all;
+	((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) multiple_data_source_at_once_command_real_execute_on_all;
 #line 413 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) multiple_data_source_at_once_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) multiple_data_source_at_once_command_real_undo;
 #line 413 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) multiple_data_source_at_once_command_real_undo_on_all;
+	((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) multiple_data_source_at_once_command_real_undo_on_all;
 #line 413 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = multiple_data_source_at_once_command_finalize;
 #line 5767 "Commands.c"
@@ -5768,8 +5768,8 @@ static void multiple_data_source_at_once_command_class_init (MultipleDataSourceA
 
 
 static void multiple_data_source_at_once_command_instance_init (MultipleDataSourceAtOnceCommand * self) {
-	GeeHashSet* _tmp0_ = NULL;
-	GeeHashSet* _tmp1_ = NULL;
+	GeeHashSet* _tmp0_;
+	GeeHashSet* _tmp1_;
 #line 413 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND_GET_PRIVATE (self);
 #line 414 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5784,15 +5784,15 @@ static void multiple_data_source_at_once_command_instance_init (MultipleDataSour
 }
 
 
-static void multiple_data_source_at_once_command_finalize (GObject* obj) {
+static void multiple_data_source_at_once_command_finalize (GObject * obj) {
 	MultipleDataSourceAtOnceCommand * self;
 #line 413 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND, MultipleDataSourceAtOnceCommand);
 #line 5792 "Commands.c"
 	{
 		GeeIterator* _source_collection_it = NULL;
-		GeeHashSet* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeHashSet* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 434 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->hooked_collections;
 #line 434 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5802,13 +5802,13 @@ static void multiple_data_source_at_once_command_finalize (GObject* obj) {
 #line 434 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
 #line 5805 "Commands.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			SourceCollection* source_collection = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			SourceCollection* _tmp6_ = NULL;
-			guint _tmp7_ = 0U;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			SourceCollection* _tmp6_;
+			guint _tmp7_;
 #line 434 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp2_ = _source_collection_it;
 #line 434 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5870,11 +5870,11 @@ static void _multiple_photo_transformation_command_on_state_broken_photo_transfo
 
 MultiplePhotoTransformationCommand* multiple_photo_transformation_command_construct (GType object_type, GeeIterable* iter, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation) {
 	MultiplePhotoTransformationCommand * self = NULL;
-	GeeIterable* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	GeeIterable* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
 #line 493 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
 #line 493 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5900,12 +5900,12 @@ MultiplePhotoTransformationCommand* multiple_photo_transformation_command_constr
 #line 5901 "Commands.c"
 	{
 		GeeArrayList* _source_list = NULL;
-		GeeArrayList* _tmp5_ = NULL;
-		GeeArrayList* _tmp6_ = NULL;
+		GeeArrayList* _tmp5_;
+		GeeArrayList* _tmp6_;
 		gint _source_size = 0;
-		GeeArrayList* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
+		GeeArrayList* _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
 		gint _source_index = 0;
 #line 497 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list;
@@ -5926,23 +5926,23 @@ MultiplePhotoTransformationCommand* multiple_photo_transformation_command_constr
 #line 497 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
 #line 5929 "Commands.c"
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
-			gint _tmp12_ = 0;
+			gint _tmp10_;
+			gint _tmp11_;
+			gint _tmp12_;
 			DataSource* source = NULL;
-			GeeArrayList* _tmp13_ = NULL;
-			gint _tmp14_ = 0;
-			gpointer _tmp15_ = NULL;
+			GeeArrayList* _tmp13_;
+			gint _tmp14_;
+			gpointer _tmp15_;
 			Photo* photo = NULL;
-			DataSource* _tmp16_ = NULL;
-			Photo* _tmp17_ = NULL;
+			DataSource* _tmp16_;
+			Photo* _tmp17_;
 			PhotoTransformationState* state = NULL;
-			Photo* _tmp18_ = NULL;
-			PhotoTransformationState* _tmp19_ = NULL;
-			PhotoTransformationState* _tmp20_ = NULL;
-			GeeHashMap* _tmp21_ = NULL;
-			Photo* _tmp22_ = NULL;
-			PhotoTransformationState* _tmp23_ = NULL;
+			Photo* _tmp18_;
+			PhotoTransformationState* _tmp19_;
+			PhotoTransformationState* _tmp20_;
+			GeeHashMap* _tmp21_;
+			Photo* _tmp22_;
+			PhotoTransformationState* _tmp23_;
 #line 497 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp10_ = _source_index;
 #line 497 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6010,11 +6010,11 @@ MultiplePhotoTransformationCommand* multiple_photo_transformation_command_constr
 static void multiple_photo_transformation_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) {
 	MultiplePhotoTransformationCommand * self;
 	Photo* photo = NULL;
-	DataSource* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	Photo* _tmp1_;
 	PhotoTransformationState* state = NULL;
-	GeeHashMap* _tmp2_ = NULL;
-	gpointer _tmp3_ = NULL;
+	GeeHashMap* _tmp2_;
+	gpointer _tmp3_;
 #line 511 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MULTIPLE_PHOTO_TRANSFORMATION_COMMAND, MultiplePhotoTransformationCommand);
 #line 511 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6044,8 +6044,8 @@ static void multiple_photo_transformation_command_real_undo_on_source (MultipleD
 
 
 static void multiple_photo_transformation_command_on_state_broken (MultiplePhotoTransformationCommand* self) {
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
 #line 520 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_MULTIPLE_PHOTO_TRANSFORMATION_COMMAND (self));
 #line 521 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6066,7 +6066,7 @@ static void multiple_photo_transformation_command_class_init (MultiplePhotoTrans
 #line 489 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (MultiplePhotoTransformationCommandPrivate));
 #line 489 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) multiple_photo_transformation_command_real_undo_on_source;
+	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) multiple_photo_transformation_command_real_undo_on_source;
 #line 489 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = multiple_photo_transformation_command_finalize;
 #line 6073 "Commands.c"
@@ -6074,7 +6074,7 @@ static void multiple_photo_transformation_command_class_init (MultiplePhotoTrans
 
 
 static void multiple_photo_transformation_command_instance_init (MultiplePhotoTransformationCommand * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 489 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = MULTIPLE_PHOTO_TRANSFORMATION_COMMAND_GET_PRIVATE (self);
 #line 490 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6085,19 +6085,19 @@ static void multiple_photo_transformation_command_instance_init (MultiplePhotoTr
 }
 
 
-static void multiple_photo_transformation_command_finalize (GObject* obj) {
+static void multiple_photo_transformation_command_finalize (GObject * obj) {
 	MultiplePhotoTransformationCommand * self;
 #line 489 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTIPLE_PHOTO_TRANSFORMATION_COMMAND, MultiplePhotoTransformationCommand);
 #line 6093 "Commands.c"
 	{
 		GeeIterator* _state_it = NULL;
-		GeeHashMap* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeHashMap* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->map;
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6117,13 +6117,13 @@ static void multiple_photo_transformation_command_finalize (GObject* obj) {
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
 #line 6120 "Commands.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			PhotoTransformationState* state = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			PhotoTransformationState* _tmp10_ = NULL;
-			guint _tmp11_ = 0U;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			PhotoTransformationState* _tmp10_;
+			guint _tmp11_;
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp6_ = _state_it;
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6176,10 +6176,10 @@ GType multiple_photo_transformation_command_get_type (void) {
 
 RotateSingleCommand* rotate_single_command_construct (GType object_type, Photo* photo, Rotation rotation, const gchar* name, const gchar* explanation) {
 	RotateSingleCommand * self = NULL;
-	Photo* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	Rotation _tmp3_ = 0;
+	Photo* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	Rotation _tmp3_;
 #line 528 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
 #line 528 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6213,8 +6213,8 @@ RotateSingleCommand* rotate_single_command_new (Photo* photo, Rotation rotation,
 
 static void rotate_single_command_real_execute (Command* base) {
 	RotateSingleCommand * self;
-	DataSource* _tmp0_ = NULL;
-	Rotation _tmp1_ = 0;
+	DataSource* _tmp0_;
+	Rotation _tmp1_;
 #line 534 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ROTATE_SINGLE_COMMAND, RotateSingleCommand);
 #line 535 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6229,9 +6229,9 @@ static void rotate_single_command_real_execute (Command* base) {
 
 static void rotate_single_command_real_undo (Command* base) {
 	RotateSingleCommand * self;
-	DataSource* _tmp0_ = NULL;
-	Rotation _tmp1_ = 0;
-	Rotation _tmp2_ = 0;
+	DataSource* _tmp0_;
+	Rotation _tmp1_;
+	Rotation _tmp2_;
 #line 538 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ROTATE_SINGLE_COMMAND, RotateSingleCommand);
 #line 539 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6252,9 +6252,9 @@ static void rotate_single_command_class_init (RotateSingleCommandClass * klass)
 #line 525 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (RotateSingleCommandPrivate));
 #line 525 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) rotate_single_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) rotate_single_command_real_execute;
 #line 525 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) rotate_single_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) rotate_single_command_real_undo;
 #line 525 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = rotate_single_command_finalize;
 #line 6261 "Commands.c"
@@ -6268,7 +6268,7 @@ static void rotate_single_command_instance_init (RotateSingleCommand * self) {
 }
 
 
-static void rotate_single_command_finalize (GObject* obj) {
+static void rotate_single_command_finalize (GObject * obj) {
 	RotateSingleCommand * self;
 #line 525 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ROTATE_SINGLE_COMMAND, RotateSingleCommand);
@@ -6292,12 +6292,12 @@ GType rotate_single_command_get_type (void) {
 
 RotateMultipleCommand* rotate_multiple_command_construct (GType object_type, GeeIterable* iter, Rotation rotation, const gchar* name, const gchar* explanation, const gchar* progress_text, const gchar* undo_progress_text) {
 	RotateMultipleCommand * self = NULL;
-	GeeIterable* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	Rotation _tmp5_ = 0;
+	GeeIterable* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	Rotation _tmp5_;
 #line 546 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
 #line 546 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6339,8 +6339,8 @@ RotateMultipleCommand* rotate_multiple_command_new (GeeIterable* iter, Rotation
 
 static void rotate_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
 	RotateMultipleCommand * self;
-	DataSource* _tmp0_ = NULL;
-	Rotation _tmp1_ = 0;
+	DataSource* _tmp0_;
+	Rotation _tmp1_;
 #line 553 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ROTATE_MULTIPLE_COMMAND, RotateMultipleCommand);
 #line 553 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6357,9 +6357,9 @@ static void rotate_multiple_command_real_execute_on_source (MultipleDataSourceCo
 
 static void rotate_multiple_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) {
 	RotateMultipleCommand * self;
-	DataSource* _tmp0_ = NULL;
-	Rotation _tmp1_ = 0;
-	Rotation _tmp2_ = 0;
+	DataSource* _tmp0_;
+	Rotation _tmp1_;
+	Rotation _tmp2_;
 #line 557 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ROTATE_MULTIPLE_COMMAND, RotateMultipleCommand);
 #line 557 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6382,9 +6382,9 @@ static void rotate_multiple_command_class_init (RotateMultipleCommandClass * kla
 #line 543 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (RotateMultipleCommandPrivate));
 #line 543 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) rotate_multiple_command_real_execute_on_source;
+	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) rotate_multiple_command_real_execute_on_source;
 #line 543 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) rotate_multiple_command_real_undo_on_source;
+	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) rotate_multiple_command_real_undo_on_source;
 #line 543 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = rotate_multiple_command_finalize;
 #line 6391 "Commands.c"
@@ -6398,7 +6398,7 @@ static void rotate_multiple_command_instance_init (RotateMultipleCommand * self)
 }
 
 
-static void rotate_multiple_command_finalize (GObject* obj) {
+static void rotate_multiple_command_finalize (GObject * obj) {
 	RotateMultipleCommand * self;
 #line 543 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ROTATE_MULTIPLE_COMMAND, RotateMultipleCommand);
@@ -6423,62 +6423,59 @@ GType rotate_multiple_command_get_type (void) {
 EditTitleCommand* edit_title_command_construct (GType object_type, MediaSource* source, const gchar* new_title) {
 	EditTitleCommand * self = NULL;
 	gchar* title = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	MediaSource* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	MediaSource* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar* _tmp0_;
+	MediaSource* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	MediaSource* _tmp4_;
+	gchar* _tmp5_;
 #line 566 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
 #line 566 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (new_title != NULL, NULL);
 #line 567 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp0_ = g_dpgettext2 (NULL, "Button Label", RESOURCES_EDIT_TITLE_LABEL);
-#line 567 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (g_dpgettext2 (NULL, "Button Label", RESOURCES_EDIT_TITLE_LABEL));
 #line 567 "/home/jens/Source/shotwell/src/Commands.vala"
-	title = _tmp1_;
+	title = _tmp0_;
 #line 569 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp2_ = source;
+	_tmp1_ = source;
 #line 569 "/home/jens/Source/shotwell/src/Commands.vala"
-	self = (EditTitleCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), title, "");
+	self = (EditTitleCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource), title, "");
 #line 571 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp3_ = new_title;
+	_tmp2_ = new_title;
 #line 571 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp4_ = g_strdup (_tmp3_);
+	_tmp3_ = g_strdup (_tmp2_);
 #line 571 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (self->priv->new_title);
 #line 571 "/home/jens/Source/shotwell/src/Commands.vala"
-	self->priv->new_title = _tmp4_;
+	self->priv->new_title = _tmp3_;
 #line 572 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp5_ = source;
+	_tmp4_ = source;
 #line 572 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp6_ = media_source_get_title (_tmp5_);
+	_tmp5_ = media_source_get_title (_tmp4_);
 #line 572 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (self->priv->old_title);
 #line 572 "/home/jens/Source/shotwell/src/Commands.vala"
-	self->priv->old_title = _tmp6_;
+	self->priv->old_title = _tmp5_;
 #line 566 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (title);
 #line 566 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 6468 "Commands.c"
+#line 6465 "Commands.c"
 }
 
 
 EditTitleCommand* edit_title_command_new (MediaSource* source, const gchar* new_title) {
 #line 566 "/home/jens/Source/shotwell/src/Commands.vala"
 	return edit_title_command_construct (TYPE_EDIT_TITLE_COMMAND, source, new_title);
-#line 6475 "Commands.c"
+#line 6472 "Commands.c"
 }
 
 
 static void edit_title_command_real_execute (Command* base) {
 	EditTitleCommand * self;
-	DataSource* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	const gchar* _tmp1_;
 #line 575 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_TITLE_COMMAND, EditTitleCommand);
 #line 576 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6487,14 +6484,14 @@ static void edit_title_command_real_execute (Command* base) {
 	_tmp1_ = self->priv->new_title;
 #line 576 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 6491 "Commands.c"
+#line 6488 "Commands.c"
 }
 
 
 static void edit_title_command_real_undo (Command* base) {
 	EditTitleCommand * self;
-	DataSource* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	const gchar* _tmp1_;
 #line 579 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_TITLE_COMMAND, EditTitleCommand);
 #line 580 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6503,7 +6500,7 @@ static void edit_title_command_real_undo (Command* base) {
 	_tmp1_ = self->priv->old_title;
 #line 580 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 6507 "Commands.c"
+#line 6504 "Commands.c"
 }
 
 
@@ -6513,23 +6510,23 @@ static void edit_title_command_class_init (EditTitleCommandClass * klass) {
 #line 562 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (EditTitleCommandPrivate));
 #line 562 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) edit_title_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) edit_title_command_real_execute;
 #line 562 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) edit_title_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) edit_title_command_real_undo;
 #line 562 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = edit_title_command_finalize;
-#line 6522 "Commands.c"
+#line 6519 "Commands.c"
 }
 
 
 static void edit_title_command_instance_init (EditTitleCommand * self) {
 #line 562 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = EDIT_TITLE_COMMAND_GET_PRIVATE (self);
-#line 6529 "Commands.c"
+#line 6526 "Commands.c"
 }
 
 
-static void edit_title_command_finalize (GObject* obj) {
+static void edit_title_command_finalize (GObject * obj) {
 	EditTitleCommand * self;
 #line 562 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDIT_TITLE_COMMAND, EditTitleCommand);
@@ -6539,7 +6536,7 @@ static void edit_title_command_finalize (GObject* obj) {
 	_g_free0 (self->priv->old_title);
 #line 562 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (edit_title_command_parent_class)->finalize (obj);
-#line 6543 "Commands.c"
+#line 6540 "Commands.c"
 }
 
 
@@ -6557,11 +6554,11 @@ GType edit_title_command_get_type (void) {
 
 EditCommentCommand* edit_comment_command_construct (GType object_type, MediaSource* source, const gchar* new_comment) {
 	EditCommentCommand * self = NULL;
-	MediaSource* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	MediaSource* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	MediaSource* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	MediaSource* _tmp3_;
+	gchar* _tmp4_;
 #line 588 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
 #line 588 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6588,21 +6585,21 @@ EditCommentCommand* edit_comment_command_construct (GType object_type, MediaSour
 	self->priv->old_comment = _tmp4_;
 #line 588 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 6592 "Commands.c"
+#line 6589 "Commands.c"
 }
 
 
 EditCommentCommand* edit_comment_command_new (MediaSource* source, const gchar* new_comment) {
 #line 588 "/home/jens/Source/shotwell/src/Commands.vala"
 	return edit_comment_command_construct (TYPE_EDIT_COMMENT_COMMAND, source, new_comment);
-#line 6599 "Commands.c"
+#line 6596 "Commands.c"
 }
 
 
 static void edit_comment_command_real_execute (Command* base) {
 	EditCommentCommand * self;
-	DataSource* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	const gchar* _tmp1_;
 #line 595 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_COMMENT_COMMAND, EditCommentCommand);
 #line 596 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6611,14 +6608,14 @@ static void edit_comment_command_real_execute (Command* base) {
 	_tmp1_ = self->priv->new_comment;
 #line 596 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 6615 "Commands.c"
+#line 6612 "Commands.c"
 }
 
 
 static void edit_comment_command_real_undo (Command* base) {
 	EditCommentCommand * self;
-	DataSource* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	const gchar* _tmp1_;
 #line 599 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_COMMENT_COMMAND, EditCommentCommand);
 #line 600 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6627,7 +6624,7 @@ static void edit_comment_command_real_undo (Command* base) {
 	_tmp1_ = self->priv->old_comment;
 #line 600 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 6631 "Commands.c"
+#line 6628 "Commands.c"
 }
 
 
@@ -6637,23 +6634,23 @@ static void edit_comment_command_class_init (EditCommentCommandClass * klass) {
 #line 584 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (EditCommentCommandPrivate));
 #line 584 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) edit_comment_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) edit_comment_command_real_execute;
 #line 584 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) edit_comment_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) edit_comment_command_real_undo;
 #line 584 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = edit_comment_command_finalize;
-#line 6646 "Commands.c"
+#line 6643 "Commands.c"
 }
 
 
 static void edit_comment_command_instance_init (EditCommentCommand * self) {
 #line 584 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = EDIT_COMMENT_COMMAND_GET_PRIVATE (self);
-#line 6653 "Commands.c"
+#line 6650 "Commands.c"
 }
 
 
-static void edit_comment_command_finalize (GObject* obj) {
+static void edit_comment_command_finalize (GObject * obj) {
 	EditCommentCommand * self;
 #line 584 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDIT_COMMENT_COMMAND, EditCommentCommand);
@@ -6663,7 +6660,7 @@ static void edit_comment_command_finalize (GObject* obj) {
 	_g_free0 (self->priv->old_comment);
 #line 584 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (edit_comment_command_parent_class)->finalize (obj);
-#line 6667 "Commands.c"
+#line 6664 "Commands.c"
 }
 
 
@@ -6682,110 +6679,107 @@ GType edit_comment_command_get_type (void) {
 EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_type, GeeCollection* media_sources, const gchar* new_title) {
 	EditMultipleTitlesCommand * self = NULL;
 	gchar* title = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	gchar* _tmp0_;
+	GeeCollection* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 608 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (media_sources), NULL);
 #line 608 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (new_title != NULL, NULL);
 #line 609 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp0_ = g_dpgettext2 (NULL, "Button Label", RESOURCES_EDIT_TITLE_LABEL);
+	_tmp0_ = g_strdup (g_dpgettext2 (NULL, "Button Label", RESOURCES_EDIT_TITLE_LABEL));
 #line 609 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 609 "/home/jens/Source/shotwell/src/Commands.vala"
-	title = _tmp1_;
+	title = _tmp0_;
 #line 611 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp2_ = media_sources;
+	_tmp1_ = media_sources;
 #line 611 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp3_ = title;
+	_tmp2_ = title;
 #line 611 "/home/jens/Source/shotwell/src/Commands.vala"
-	self = (EditMultipleTitlesCommand*) multiple_data_source_at_once_command_construct (object_type, _tmp2_, _tmp3_, "");
+	self = (EditMultipleTitlesCommand*) multiple_data_source_at_once_command_construct (object_type, _tmp1_, _tmp2_, "");
 #line 613 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp4_ = new_title;
+	_tmp3_ = new_title;
 #line 613 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp5_ = g_strdup (_tmp4_);
+	_tmp4_ = g_strdup (_tmp3_);
 #line 613 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (self->new_title);
 #line 613 "/home/jens/Source/shotwell/src/Commands.vala"
-	self->new_title = _tmp5_;
-#line 6716 "Commands.c"
+	self->new_title = _tmp4_;
+#line 6710 "Commands.c"
 	{
 		GeeIterator* _media_it = NULL;
-		GeeCollection* _tmp6_ = NULL;
-		GeeIterator* _tmp7_ = NULL;
+		GeeCollection* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp6_ = media_sources;
+		_tmp5_ = media_sources;
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
-		_media_it = _tmp7_;
+		_media_it = _tmp6_;
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 6729 "Commands.c"
-			GeeIterator* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+#line 6723 "Commands.c"
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			MediaSource* media = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			gpointer _tmp11_ = NULL;
-			GeeHashMap* _tmp12_ = NULL;
-			MediaSource* _tmp13_ = NULL;
-			MediaSource* _tmp14_ = NULL;
-			gchar* _tmp15_ = NULL;
-			gchar* _tmp16_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
+			GeeHashMap* _tmp11_;
+			MediaSource* _tmp12_;
+			MediaSource* _tmp13_;
+			gchar* _tmp14_;
+			gchar* _tmp15_;
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp8_ = _media_it;
+			_tmp7_ = _media_it;
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp9_ = gee_iterator_next (_tmp8_);
+			_tmp8_ = gee_iterator_next (_tmp7_);
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
-			if (!_tmp9_) {
+			if (!_tmp8_) {
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 6748 "Commands.c"
+#line 6742 "Commands.c"
 			}
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp10_ = _media_it;
+			_tmp9_ = _media_it;
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp11_ = gee_iterator_get (_tmp10_);
+			_tmp10_ = gee_iterator_get (_tmp9_);
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
-			media = (MediaSource*) _tmp11_;
+			media = (MediaSource*) _tmp10_;
 #line 615 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp12_ = self->old_titles;
+			_tmp11_ = self->old_titles;
 #line 615 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp13_ = media;
+			_tmp12_ = media;
 #line 615 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp14_ = media;
+			_tmp13_ = media;
 #line 615 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp15_ = media_source_get_title (_tmp14_);
+			_tmp14_ = media_source_get_title (_tmp13_);
 #line 615 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp16_ = _tmp15_;
+			_tmp15_ = _tmp14_;
 #line 615 "/home/jens/Source/shotwell/src/Commands.vala"
-			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp16_);
+			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_, _tmp15_);
 #line 615 "/home/jens/Source/shotwell/src/Commands.vala"
-			_g_free0 (_tmp16_);
+			_g_free0 (_tmp15_);
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (media);
-#line 6772 "Commands.c"
+#line 6766 "Commands.c"
 		}
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_media_it);
-#line 6776 "Commands.c"
+#line 6770 "Commands.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (title);
 #line 608 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 6782 "Commands.c"
+#line 6776 "Commands.c"
 }
 
 
 EditMultipleTitlesCommand* edit_multiple_titles_command_new (GeeCollection* media_sources, const gchar* new_title) {
 #line 608 "/home/jens/Source/shotwell/src/Commands.vala"
 	return edit_multiple_titles_command_construct (TYPE_EDIT_MULTIPLE_TITLES_COMMAND, media_sources, new_title);
-#line 6789 "Commands.c"
+#line 6783 "Commands.c"
 }
 
 
@@ -6795,11 +6789,11 @@ static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSource
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_TITLES_COMMAND, EditMultipleTitlesCommand);
 #line 618 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 6799 "Commands.c"
+#line 6793 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = sources;
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6808,14 +6802,14 @@ static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSource
 		_source_it = _tmp1_;
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 6812 "Commands.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 6806 "Commands.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			DataSource* _tmp6_ = NULL;
-			const gchar* _tmp7_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			DataSource* _tmp6_;
+			const gchar* _tmp7_;
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp2_ = _source_it;
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6824,7 +6818,7 @@ static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSource
 			if (!_tmp3_) {
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 6828 "Commands.c"
+#line 6822 "Commands.c"
 			}
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -6840,11 +6834,11 @@ static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSource
 			media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_);
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 6844 "Commands.c"
+#line 6838 "Commands.c"
 		}
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 6848 "Commands.c"
+#line 6842 "Commands.c"
 	}
 }
 
@@ -6855,11 +6849,11 @@ static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtO
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_TITLES_COMMAND, EditMultipleTitlesCommand);
 #line 623 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 6859 "Commands.c"
+#line 6853 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = sources;
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6868,17 +6862,17 @@ static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtO
 		_source_it = _tmp1_;
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 6872 "Commands.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 6866 "Commands.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			DataSource* _tmp6_ = NULL;
-			GeeHashMap* _tmp7_ = NULL;
-			DataSource* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			gchar* _tmp10_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			DataSource* _tmp6_;
+			GeeHashMap* _tmp7_;
+			DataSource* _tmp8_;
+			gpointer _tmp9_;
+			gchar* _tmp10_;
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp2_ = _source_it;
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6887,7 +6881,7 @@ static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtO
 			if (!_tmp3_) {
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 6891 "Commands.c"
+#line 6885 "Commands.c"
 			}
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -6911,11 +6905,11 @@ static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtO
 			_g_free0 (_tmp10_);
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 6915 "Commands.c"
+#line 6909 "Commands.c"
 		}
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 6919 "Commands.c"
+#line 6913 "Commands.c"
 	}
 }
 
@@ -6924,26 +6918,26 @@ static void edit_multiple_titles_command_class_init (EditMultipleTitlesCommandCl
 #line 604 "/home/jens/Source/shotwell/src/Commands.vala"
 	edit_multiple_titles_command_parent_class = g_type_class_peek_parent (klass);
 #line 604 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) edit_multiple_titles_command_real_execute_on_all;
+	((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) edit_multiple_titles_command_real_execute_on_all;
 #line 604 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) edit_multiple_titles_command_real_undo_on_all;
+	((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) edit_multiple_titles_command_real_undo_on_all;
 #line 604 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = edit_multiple_titles_command_finalize;
-#line 6933 "Commands.c"
+#line 6927 "Commands.c"
 }
 
 
 static void edit_multiple_titles_command_instance_init (EditMultipleTitlesCommand * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 606 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 606 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->old_titles = _tmp0_;
-#line 6943 "Commands.c"
+#line 6937 "Commands.c"
 }
 
 
-static void edit_multiple_titles_command_finalize (GObject* obj) {
+static void edit_multiple_titles_command_finalize (GObject * obj) {
 	EditMultipleTitlesCommand * self;
 #line 604 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDIT_MULTIPLE_TITLES_COMMAND, EditMultipleTitlesCommand);
@@ -6953,7 +6947,7 @@ static void edit_multiple_titles_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->old_titles);
 #line 604 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (edit_multiple_titles_command_parent_class)->finalize (obj);
-#line 6957 "Commands.c"
+#line 6951 "Commands.c"
 }
 
 
@@ -6971,9 +6965,9 @@ GType edit_multiple_titles_command_get_type (void) {
 
 EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType object_type, GeeCollection* media_sources, const gchar* new_comment) {
 	EditMultipleCommentsCommand * self = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	GeeCollection* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 633 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (media_sources), NULL);
 #line 633 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6990,11 +6984,11 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType obj
 	_g_free0 (self->new_comment);
 #line 636 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->new_comment = _tmp2_;
-#line 6994 "Commands.c"
+#line 6988 "Commands.c"
 	{
 		GeeIterator* _media_it = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = media_sources;
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7003,17 +6997,17 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType obj
 		_media_it = _tmp4_;
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 7007 "Commands.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+#line 7001 "Commands.c"
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			MediaSource* media = NULL;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
-			GeeHashMap* _tmp9_ = NULL;
-			MediaSource* _tmp10_ = NULL;
-			MediaSource* _tmp11_ = NULL;
-			gchar* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			GeeHashMap* _tmp9_;
+			MediaSource* _tmp10_;
+			MediaSource* _tmp11_;
+			gchar* _tmp12_;
+			gchar* _tmp13_;
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = _media_it;
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7022,7 +7016,7 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType obj
 			if (!_tmp6_) {
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 7026 "Commands.c"
+#line 7020 "Commands.c"
 			}
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp7_ = _media_it;
@@ -7046,22 +7040,22 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType obj
 			_g_free0 (_tmp13_);
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (media);
-#line 7050 "Commands.c"
+#line 7044 "Commands.c"
 		}
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_media_it);
-#line 7054 "Commands.c"
+#line 7048 "Commands.c"
 	}
 #line 633 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7058 "Commands.c"
+#line 7052 "Commands.c"
 }
 
 
 EditMultipleCommentsCommand* edit_multiple_comments_command_new (GeeCollection* media_sources, const gchar* new_comment) {
 #line 633 "/home/jens/Source/shotwell/src/Commands.vala"
 	return edit_multiple_comments_command_construct (TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, media_sources, new_comment);
-#line 7065 "Commands.c"
+#line 7059 "Commands.c"
 }
 
 
@@ -7071,11 +7065,11 @@ static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSour
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, EditMultipleCommentsCommand);
 #line 641 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 7075 "Commands.c"
+#line 7069 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = sources;
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7084,14 +7078,14 @@ static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSour
 		_source_it = _tmp1_;
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 7088 "Commands.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 7082 "Commands.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			DataSource* _tmp6_ = NULL;
-			const gchar* _tmp7_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			DataSource* _tmp6_;
+			const gchar* _tmp7_;
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp2_ = _source_it;
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7100,7 +7094,7 @@ static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSour
 			if (!_tmp3_) {
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 7104 "Commands.c"
+#line 7098 "Commands.c"
 			}
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -7116,11 +7110,11 @@ static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSour
 			media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_);
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 7120 "Commands.c"
+#line 7114 "Commands.c"
 		}
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 7124 "Commands.c"
+#line 7118 "Commands.c"
 	}
 }
 
@@ -7131,11 +7125,11 @@ static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceA
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, EditMultipleCommentsCommand);
 #line 646 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 7135 "Commands.c"
+#line 7129 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = sources;
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7144,17 +7138,17 @@ static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceA
 		_source_it = _tmp1_;
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 7148 "Commands.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 7142 "Commands.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			DataSource* _tmp6_ = NULL;
-			GeeHashMap* _tmp7_ = NULL;
-			DataSource* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			gchar* _tmp10_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			DataSource* _tmp6_;
+			GeeHashMap* _tmp7_;
+			DataSource* _tmp8_;
+			gpointer _tmp9_;
+			gchar* _tmp10_;
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp2_ = _source_it;
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7163,7 +7157,7 @@ static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceA
 			if (!_tmp3_) {
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 7167 "Commands.c"
+#line 7161 "Commands.c"
 			}
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -7187,11 +7181,11 @@ static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceA
 			_g_free0 (_tmp10_);
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 7191 "Commands.c"
+#line 7185 "Commands.c"
 		}
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 7195 "Commands.c"
+#line 7189 "Commands.c"
 	}
 }
 
@@ -7200,26 +7194,26 @@ static void edit_multiple_comments_command_class_init (EditMultipleCommentsComma
 #line 629 "/home/jens/Source/shotwell/src/Commands.vala"
 	edit_multiple_comments_command_parent_class = g_type_class_peek_parent (klass);
 #line 629 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) edit_multiple_comments_command_real_execute_on_all;
+	((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) edit_multiple_comments_command_real_execute_on_all;
 #line 629 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) edit_multiple_comments_command_real_undo_on_all;
+	((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) edit_multiple_comments_command_real_undo_on_all;
 #line 629 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = edit_multiple_comments_command_finalize;
-#line 7209 "Commands.c"
+#line 7203 "Commands.c"
 }
 
 
 static void edit_multiple_comments_command_instance_init (EditMultipleCommentsCommand * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 631 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 631 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->old_comments = _tmp0_;
-#line 7219 "Commands.c"
+#line 7213 "Commands.c"
 }
 
 
-static void edit_multiple_comments_command_finalize (GObject* obj) {
+static void edit_multiple_comments_command_finalize (GObject * obj) {
 	EditMultipleCommentsCommand * self;
 #line 629 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, EditMultipleCommentsCommand);
@@ -7229,7 +7223,7 @@ static void edit_multiple_comments_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->old_comments);
 #line 629 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (edit_multiple_comments_command_parent_class)->finalize (obj);
-#line 7233 "Commands.c"
+#line 7227 "Commands.c"
 }
 
 
@@ -7247,11 +7241,11 @@ GType edit_multiple_comments_command_get_type (void) {
 
 RenameEventCommand* rename_event_command_construct (GType object_type, Event* event, const gchar* new_name) {
 	RenameEventCommand * self = NULL;
-	Event* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	Event* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	Event* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	Event* _tmp3_;
+	gchar* _tmp4_;
 #line 656 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_EVENT (event), NULL);
 #line 656 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7278,21 +7272,21 @@ RenameEventCommand* rename_event_command_construct (GType object_type, Event* ev
 	self->priv->old_name = _tmp4_;
 #line 656 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7282 "Commands.c"
+#line 7276 "Commands.c"
 }
 
 
 RenameEventCommand* rename_event_command_new (Event* event, const gchar* new_name) {
 #line 656 "/home/jens/Source/shotwell/src/Commands.vala"
 	return rename_event_command_construct (TYPE_RENAME_EVENT_COMMAND, event, new_name);
-#line 7289 "Commands.c"
+#line 7283 "Commands.c"
 }
 
 
 static void rename_event_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) {
 	RenameEventCommand * self;
-	DataSource* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	const gchar* _tmp1_;
 #line 663 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_EVENT_COMMAND, RenameEventCommand);
 #line 663 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7303,14 +7297,14 @@ static void rename_event_command_real_execute_on_source (SimpleProxyableCommand*
 	_tmp1_ = self->priv->new_name;
 #line 664 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_);
-#line 7307 "Commands.c"
+#line 7301 "Commands.c"
 }
 
 
 static void rename_event_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) {
 	RenameEventCommand * self;
-	DataSource* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	const gchar* _tmp1_;
 #line 667 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_EVENT_COMMAND, RenameEventCommand);
 #line 667 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7321,7 +7315,7 @@ static void rename_event_command_real_undo_on_source (SimpleProxyableCommand* ba
 	_tmp1_ = self->priv->old_name;
 #line 668 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_);
-#line 7325 "Commands.c"
+#line 7319 "Commands.c"
 }
 
 
@@ -7331,23 +7325,23 @@ static void rename_event_command_class_init (RenameEventCommandClass * klass) {
 #line 652 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (RenameEventCommandPrivate));
 #line 652 "/home/jens/Source/shotwell/src/Commands.vala"
-	((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) rename_event_command_real_execute_on_source;
+	((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) rename_event_command_real_execute_on_source;
 #line 652 "/home/jens/Source/shotwell/src/Commands.vala"
-	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) rename_event_command_real_undo_on_source;
+	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) rename_event_command_real_undo_on_source;
 #line 652 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = rename_event_command_finalize;
-#line 7340 "Commands.c"
+#line 7334 "Commands.c"
 }
 
 
 static void rename_event_command_instance_init (RenameEventCommand * self) {
 #line 652 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = RENAME_EVENT_COMMAND_GET_PRIVATE (self);
-#line 7347 "Commands.c"
+#line 7341 "Commands.c"
 }
 
 
-static void rename_event_command_finalize (GObject* obj) {
+static void rename_event_command_finalize (GObject * obj) {
 	RenameEventCommand * self;
 #line 652 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RENAME_EVENT_COMMAND, RenameEventCommand);
@@ -7357,7 +7351,7 @@ static void rename_event_command_finalize (GObject* obj) {
 	_g_free0 (self->priv->old_name);
 #line 652 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (rename_event_command_parent_class)->finalize (obj);
-#line 7361 "Commands.c"
+#line 7355 "Commands.c"
 }
 
 
@@ -7375,11 +7369,11 @@ GType rename_event_command_get_type (void) {
 
 EditEventCommentCommand* edit_event_comment_command_construct (GType object_type, Event* event, const gchar* new_comment) {
 	EditEventCommentCommand * self = NULL;
-	Event* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	Event* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	Event* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	Event* _tmp3_;
+	gchar* _tmp4_;
 #line 676 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_EVENT (event), NULL);
 #line 676 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7406,21 +7400,21 @@ EditEventCommentCommand* edit_event_comment_command_construct (GType object_type
 	self->priv->old_comment = _tmp4_;
 #line 676 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7410 "Commands.c"
+#line 7404 "Commands.c"
 }
 
 
 EditEventCommentCommand* edit_event_comment_command_new (Event* event, const gchar* new_comment) {
 #line 676 "/home/jens/Source/shotwell/src/Commands.vala"
 	return edit_event_comment_command_construct (TYPE_EDIT_EVENT_COMMENT_COMMAND, event, new_comment);
-#line 7417 "Commands.c"
+#line 7411 "Commands.c"
 }
 
 
 static void edit_event_comment_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) {
 	EditEventCommentCommand * self;
-	DataSource* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	const gchar* _tmp1_;
 #line 683 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_EVENT_COMMENT_COMMAND, EditEventCommentCommand);
 #line 683 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7431,14 +7425,14 @@ static void edit_event_comment_command_real_execute_on_source (SimpleProxyableCo
 	_tmp1_ = self->priv->new_comment;
 #line 684 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), TYPE_EVENT_SOURCE, EventSource), _tmp1_);
-#line 7435 "Commands.c"
+#line 7429 "Commands.c"
 }
 
 
 static void edit_event_comment_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) {
 	EditEventCommentCommand * self;
-	DataSource* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	const gchar* _tmp1_;
 #line 687 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_EVENT_COMMENT_COMMAND, EditEventCommentCommand);
 #line 687 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7449,7 +7443,7 @@ static void edit_event_comment_command_real_undo_on_source (SimpleProxyableComma
 	_tmp1_ = self->priv->old_comment;
 #line 688 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), TYPE_EVENT_SOURCE, EventSource), _tmp1_);
-#line 7453 "Commands.c"
+#line 7447 "Commands.c"
 }
 
 
@@ -7459,23 +7453,23 @@ static void edit_event_comment_command_class_init (EditEventCommentCommandClass
 #line 672 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (EditEventCommentCommandPrivate));
 #line 672 "/home/jens/Source/shotwell/src/Commands.vala"
-	((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) edit_event_comment_command_real_execute_on_source;
+	((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) edit_event_comment_command_real_execute_on_source;
 #line 672 "/home/jens/Source/shotwell/src/Commands.vala"
-	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) edit_event_comment_command_real_undo_on_source;
+	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) edit_event_comment_command_real_undo_on_source;
 #line 672 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = edit_event_comment_command_finalize;
-#line 7468 "Commands.c"
+#line 7462 "Commands.c"
 }
 
 
 static void edit_event_comment_command_instance_init (EditEventCommentCommand * self) {
 #line 672 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = EDIT_EVENT_COMMENT_COMMAND_GET_PRIVATE (self);
-#line 7475 "Commands.c"
+#line 7469 "Commands.c"
 }
 
 
-static void edit_event_comment_command_finalize (GObject* obj) {
+static void edit_event_comment_command_finalize (GObject * obj) {
 	EditEventCommentCommand * self;
 #line 672 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDIT_EVENT_COMMENT_COMMAND, EditEventCommentCommand);
@@ -7485,7 +7479,7 @@ static void edit_event_comment_command_finalize (GObject* obj) {
 	_g_free0 (self->priv->old_comment);
 #line 672 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (edit_event_comment_command_parent_class)->finalize (obj);
-#line 7489 "Commands.c"
+#line 7483 "Commands.c"
 }
 
 
@@ -7503,11 +7497,11 @@ GType edit_event_comment_command_get_type (void) {
 
 SetKeyPhotoCommand* set_key_photo_command_construct (GType object_type, Event* event, MediaSource* new_primary_source) {
 	SetKeyPhotoCommand * self = NULL;
-	Event* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	MediaSource* _tmp2_ = NULL;
-	Event* _tmp3_ = NULL;
-	MediaSource* _tmp4_ = NULL;
+	Event* _tmp0_;
+	MediaSource* _tmp1_;
+	MediaSource* _tmp2_;
+	Event* _tmp3_;
+	MediaSource* _tmp4_;
 #line 696 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_EVENT (event), NULL);
 #line 696 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7534,21 +7528,21 @@ SetKeyPhotoCommand* set_key_photo_command_construct (GType object_type, Event* e
 	self->priv->old_primary_source = _tmp4_;
 #line 696 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7538 "Commands.c"
+#line 7532 "Commands.c"
 }
 
 
 SetKeyPhotoCommand* set_key_photo_command_new (Event* event, MediaSource* new_primary_source) {
 #line 696 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_key_photo_command_construct (TYPE_SET_KEY_PHOTO_COMMAND, event, new_primary_source);
-#line 7545 "Commands.c"
+#line 7539 "Commands.c"
 }
 
 
 static void set_key_photo_command_real_execute (Command* base) {
 	SetKeyPhotoCommand * self;
-	DataSource* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	MediaSource* _tmp1_;
 #line 703 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_KEY_PHOTO_COMMAND, SetKeyPhotoCommand);
 #line 704 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7557,14 +7551,14 @@ static void set_key_photo_command_real_execute (Command* base) {
 	_tmp1_ = self->priv->new_primary_source;
 #line 704 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_set_primary_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_);
-#line 7561 "Commands.c"
+#line 7555 "Commands.c"
 }
 
 
 static void set_key_photo_command_real_undo (Command* base) {
 	SetKeyPhotoCommand * self;
-	DataSource* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	MediaSource* _tmp1_;
 #line 707 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_KEY_PHOTO_COMMAND, SetKeyPhotoCommand);
 #line 708 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7573,7 +7567,7 @@ static void set_key_photo_command_real_undo (Command* base) {
 	_tmp1_ = self->priv->old_primary_source;
 #line 708 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_set_primary_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_);
-#line 7577 "Commands.c"
+#line 7571 "Commands.c"
 }
 
 
@@ -7583,23 +7577,23 @@ static void set_key_photo_command_class_init (SetKeyPhotoCommandClass * klass) {
 #line 692 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (SetKeyPhotoCommandPrivate));
 #line 692 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) set_key_photo_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) set_key_photo_command_real_execute;
 #line 692 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) set_key_photo_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) set_key_photo_command_real_undo;
 #line 692 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = set_key_photo_command_finalize;
-#line 7592 "Commands.c"
+#line 7586 "Commands.c"
 }
 
 
 static void set_key_photo_command_instance_init (SetKeyPhotoCommand * self) {
 #line 692 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = SET_KEY_PHOTO_COMMAND_GET_PRIVATE (self);
-#line 7599 "Commands.c"
+#line 7593 "Commands.c"
 }
 
 
-static void set_key_photo_command_finalize (GObject* obj) {
+static void set_key_photo_command_finalize (GObject * obj) {
 	SetKeyPhotoCommand * self;
 #line 692 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_KEY_PHOTO_COMMAND, SetKeyPhotoCommand);
@@ -7609,7 +7603,7 @@ static void set_key_photo_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->old_primary_source);
 #line 692 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (set_key_photo_command_parent_class)->finalize (obj);
-#line 7613 "Commands.c"
+#line 7607 "Commands.c"
 }
 
 
@@ -7627,7 +7621,7 @@ GType set_key_photo_command_get_type (void) {
 
 RevertSingleCommand* revert_single_command_construct (GType object_type, Photo* photo) {
 	RevertSingleCommand * self = NULL;
-	Photo* _tmp0_ = NULL;
+	Photo* _tmp0_;
 #line 713 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
 #line 714 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7636,20 +7630,20 @@ RevertSingleCommand* revert_single_command_construct (GType object_type, Photo*
 	self = (RevertSingleCommand*) generic_photo_transformation_command_construct (object_type, _tmp0_, RESOURCES_REVERT_LABEL, "");
 #line 713 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7640 "Commands.c"
+#line 7634 "Commands.c"
 }
 
 
 RevertSingleCommand* revert_single_command_new (Photo* photo) {
 #line 713 "/home/jens/Source/shotwell/src/Commands.vala"
 	return revert_single_command_construct (TYPE_REVERT_SINGLE_COMMAND, photo);
-#line 7647 "Commands.c"
+#line 7641 "Commands.c"
 }
 
 
 static void revert_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) {
 	RevertSingleCommand * self;
-	Photo* _tmp0_ = NULL;
+	Photo* _tmp0_;
 #line 717 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_REVERT_SINGLE_COMMAND, RevertSingleCommand);
 #line 717 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7658,7 +7652,7 @@ static void revert_single_command_real_execute_on_photo (GenericPhotoTransformat
 	_tmp0_ = photo;
 #line 718 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_remove_all_transformations (_tmp0_);
-#line 7662 "Commands.c"
+#line 7656 "Commands.c"
 }
 
 
@@ -7666,12 +7660,12 @@ static gboolean revert_single_command_real_compress (Command* base, Command* com
 	RevertSingleCommand * self;
 	gboolean result = FALSE;
 	RevertSingleCommand* revert_single_command = NULL;
-	Command* _tmp0_ = NULL;
-	RevertSingleCommand* _tmp1_ = NULL;
-	RevertSingleCommand* _tmp2_ = NULL;
-	RevertSingleCommand* _tmp3_ = NULL;
-	DataSource* _tmp4_ = NULL;
-	DataSource* _tmp5_ = NULL;
+	Command* _tmp0_;
+	RevertSingleCommand* _tmp1_;
+	RevertSingleCommand* _tmp2_;
+	RevertSingleCommand* _tmp3_;
+	DataSource* _tmp4_;
+	DataSource* _tmp5_;
 #line 721 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_REVERT_SINGLE_COMMAND, RevertSingleCommand);
 #line 721 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7692,7 +7686,7 @@ static gboolean revert_single_command_real_compress (Command* base, Command* com
 		_g_object_unref0 (revert_single_command);
 #line 724 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 7696 "Commands.c"
+#line 7690 "Commands.c"
 	}
 #line 726 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = revert_single_command;
@@ -7708,7 +7702,7 @@ static gboolean revert_single_command_real_compress (Command* base, Command* com
 		_g_object_unref0 (revert_single_command);
 #line 727 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 7712 "Commands.c"
+#line 7706 "Commands.c"
 	}
 #line 731 "/home/jens/Source/shotwell/src/Commands.vala"
 	result = TRUE;
@@ -7716,7 +7710,7 @@ static gboolean revert_single_command_real_compress (Command* base, Command* com
 	_g_object_unref0 (revert_single_command);
 #line 731 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 7720 "Commands.c"
+#line 7714 "Commands.c"
 }
 
 
@@ -7724,10 +7718,10 @@ static void revert_single_command_class_init (RevertSingleCommandClass * klass)
 #line 712 "/home/jens/Source/shotwell/src/Commands.vala"
 	revert_single_command_parent_class = g_type_class_peek_parent (klass);
 #line 712 "/home/jens/Source/shotwell/src/Commands.vala"
-	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) revert_single_command_real_execute_on_photo;
+	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) revert_single_command_real_execute_on_photo;
 #line 712 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) revert_single_command_real_compress;
-#line 7731 "Commands.c"
+	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) revert_single_command_real_compress;
+#line 7725 "Commands.c"
 }
 
 
@@ -7749,35 +7743,29 @@ GType revert_single_command_get_type (void) {
 
 RevertMultipleCommand* revert_multiple_command_construct (GType object_type, GeeIterable* iter) {
 	RevertMultipleCommand * self = NULL;
-	GeeIterable* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	GeeIterable* _tmp0_;
 #line 736 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
 #line 737 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = iter;
 #line 737 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = _ ("Reverting");
-#line 737 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp2_ = _ ("Undoing Revert");
-#line 737 "/home/jens/Source/shotwell/src/Commands.vala"
-	self = (RevertMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, RESOURCES_REVERT_LABEL, "");
+	self = (RevertMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _ ("Reverting"), _ ("Undoing Revert"), RESOURCES_REVERT_LABEL, "");
 #line 736 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7768 "Commands.c"
+#line 7756 "Commands.c"
 }
 
 
 RevertMultipleCommand* revert_multiple_command_new (GeeIterable* iter) {
 #line 736 "/home/jens/Source/shotwell/src/Commands.vala"
 	return revert_multiple_command_construct (TYPE_REVERT_MULTIPLE_COMMAND, iter);
-#line 7775 "Commands.c"
+#line 7763 "Commands.c"
 }
 
 
 static void revert_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
 	RevertMultipleCommand * self;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 741 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_REVERT_MULTIPLE_COMMAND, RevertMultipleCommand);
 #line 741 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7786,7 +7774,7 @@ static void revert_multiple_command_real_execute_on_source (MultipleDataSourceCo
 	_tmp0_ = source;
 #line 742 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_remove_all_transformations (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo));
-#line 7790 "Commands.c"
+#line 7778 "Commands.c"
 }
 
 
@@ -7794,8 +7782,8 @@ static void revert_multiple_command_class_init (RevertMultipleCommandClass * kla
 #line 735 "/home/jens/Source/shotwell/src/Commands.vala"
 	revert_multiple_command_parent_class = g_type_class_peek_parent (klass);
 #line 735 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) revert_multiple_command_real_execute_on_source;
-#line 7799 "Commands.c"
+	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) revert_multiple_command_real_execute_on_source;
+#line 7787 "Commands.c"
 }
 
 
@@ -7817,7 +7805,7 @@ GType revert_multiple_command_get_type (void) {
 
 EnhanceSingleCommand* enhance_single_command_construct (GType object_type, Photo* photo) {
 	EnhanceSingleCommand * self = NULL;
-	Photo* _tmp0_ = NULL;
+	Photo* _tmp0_;
 #line 747 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
 #line 748 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7826,24 +7814,24 @@ EnhanceSingleCommand* enhance_single_command_construct (GType object_type, Photo
 	self = (EnhanceSingleCommand*) generic_photo_transformation_command_construct (object_type, _tmp0_, RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP);
 #line 747 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7830 "Commands.c"
+#line 7818 "Commands.c"
 }
 
 
 EnhanceSingleCommand* enhance_single_command_new (Photo* photo) {
 #line 747 "/home/jens/Source/shotwell/src/Commands.vala"
 	return enhance_single_command_construct (TYPE_ENHANCE_SINGLE_COMMAND, photo);
-#line 7837 "Commands.c"
+#line 7825 "Commands.c"
 }
 
 
 static void enhance_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) {
 	EnhanceSingleCommand * self;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	AppWindow* _tmp3_ = NULL;
-	AppWindow* _tmp4_ = NULL;
+	AppWindow* _tmp0_;
+	AppWindow* _tmp1_;
+	Photo* _tmp2_;
+	AppWindow* _tmp3_;
+	AppWindow* _tmp4_;
 #line 751 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ENHANCE_SINGLE_COMMAND, EnhanceSingleCommand);
 #line 751 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7868,7 +7856,7 @@ static void enhance_single_command_real_execute_on_photo (GenericPhotoTransforma
 	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE_WINDOW, PageWindow));
 #line 763 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp4_);
-#line 7872 "Commands.c"
+#line 7860 "Commands.c"
 }
 
 
@@ -7876,12 +7864,12 @@ static gboolean enhance_single_command_real_compress (Command* base, Command* co
 	EnhanceSingleCommand * self;
 	gboolean result = FALSE;
 	EnhanceSingleCommand* enhance_single_command = NULL;
-	Command* _tmp0_ = NULL;
-	EnhanceSingleCommand* _tmp1_ = NULL;
-	EnhanceSingleCommand* _tmp2_ = NULL;
-	EnhanceSingleCommand* _tmp3_ = NULL;
-	DataSource* _tmp4_ = NULL;
-	DataSource* _tmp5_ = NULL;
+	Command* _tmp0_;
+	EnhanceSingleCommand* _tmp1_;
+	EnhanceSingleCommand* _tmp2_;
+	EnhanceSingleCommand* _tmp3_;
+	DataSource* _tmp4_;
+	DataSource* _tmp5_;
 #line 766 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ENHANCE_SINGLE_COMMAND, EnhanceSingleCommand);
 #line 766 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7902,7 +7890,7 @@ static gboolean enhance_single_command_real_compress (Command* base, Command* co
 		_g_object_unref0 (enhance_single_command);
 #line 769 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 7906 "Commands.c"
+#line 7894 "Commands.c"
 	}
 #line 771 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = enhance_single_command;
@@ -7918,7 +7906,7 @@ static gboolean enhance_single_command_real_compress (Command* base, Command* co
 		_g_object_unref0 (enhance_single_command);
 #line 772 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 7922 "Commands.c"
+#line 7910 "Commands.c"
 	}
 #line 775 "/home/jens/Source/shotwell/src/Commands.vala"
 	result = TRUE;
@@ -7926,7 +7914,7 @@ static gboolean enhance_single_command_real_compress (Command* base, Command* co
 	_g_object_unref0 (enhance_single_command);
 #line 775 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 7930 "Commands.c"
+#line 7918 "Commands.c"
 }
 
 
@@ -7934,10 +7922,10 @@ static void enhance_single_command_class_init (EnhanceSingleCommandClass * klass
 #line 746 "/home/jens/Source/shotwell/src/Commands.vala"
 	enhance_single_command_parent_class = g_type_class_peek_parent (klass);
 #line 746 "/home/jens/Source/shotwell/src/Commands.vala"
-	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) enhance_single_command_real_execute_on_photo;
+	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) enhance_single_command_real_execute_on_photo;
 #line 746 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) enhance_single_command_real_compress;
-#line 7941 "Commands.c"
+	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) enhance_single_command_real_compress;
+#line 7929 "Commands.c"
 }
 
 
@@ -7959,35 +7947,29 @@ GType enhance_single_command_get_type (void) {
 
 EnhanceMultipleCommand* enhance_multiple_command_construct (GType object_type, GeeIterable* iter) {
 	EnhanceMultipleCommand * self = NULL;
-	GeeIterable* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	GeeIterable* _tmp0_;
 #line 780 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
 #line 781 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = iter;
 #line 781 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = _ ("Enhancing");
-#line 781 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp2_ = _ ("Undoing Enhance");
-#line 781 "/home/jens/Source/shotwell/src/Commands.vala"
-	self = (EnhanceMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP);
+	self = (EnhanceMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _ ("Enhancing"), _ ("Undoing Enhance"), RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP);
 #line 780 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7978 "Commands.c"
+#line 7960 "Commands.c"
 }
 
 
 EnhanceMultipleCommand* enhance_multiple_command_new (GeeIterable* iter) {
 #line 780 "/home/jens/Source/shotwell/src/Commands.vala"
 	return enhance_multiple_command_construct (TYPE_ENHANCE_MULTIPLE_COMMAND, iter);
-#line 7985 "Commands.c"
+#line 7967 "Commands.c"
 }
 
 
 static void enhance_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
 	EnhanceMultipleCommand * self;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 785 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ENHANCE_MULTIPLE_COMMAND, EnhanceMultipleCommand);
 #line 785 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7996,7 +7978,7 @@ static void enhance_multiple_command_real_execute_on_source (MultipleDataSourceC
 	_tmp0_ = source;
 #line 786 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_enhance (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo));
-#line 8000 "Commands.c"
+#line 7982 "Commands.c"
 }
 
 
@@ -8004,8 +7986,8 @@ static void enhance_multiple_command_class_init (EnhanceMultipleCommandClass * k
 #line 779 "/home/jens/Source/shotwell/src/Commands.vala"
 	enhance_multiple_command_parent_class = g_type_class_peek_parent (klass);
 #line 779 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) enhance_multiple_command_real_execute_on_source;
-#line 8009 "Commands.c"
+	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) enhance_multiple_command_real_execute_on_source;
+#line 7991 "Commands.c"
 }
 
 
@@ -8027,11 +8009,11 @@ GType enhance_multiple_command_get_type (void) {
 
 StraightenCommand* straighten_command_construct (GType object_type, Photo* photo, gdouble theta, Box* crop, const gchar* name, const gchar* explanation) {
 	StraightenCommand * self = NULL;
-	Photo* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gdouble _tmp3_ = 0.0;
-	Box _tmp4_ = {0};
+	Photo* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gdouble _tmp3_;
+	Box _tmp4_;
 #line 794 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
 #line 794 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8058,28 +8040,28 @@ StraightenCommand* straighten_command_construct (GType object_type, Photo* photo
 	self->priv->crop = _tmp4_;
 #line 794 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8062 "Commands.c"
+#line 8044 "Commands.c"
 }
 
 
 StraightenCommand* straighten_command_new (Photo* photo, gdouble theta, Box* crop, const gchar* name, const gchar* explanation) {
 #line 794 "/home/jens/Source/shotwell/src/Commands.vala"
 	return straighten_command_construct (TYPE_STRAIGHTEN_COMMAND, photo, theta, crop, name, explanation);
-#line 8069 "Commands.c"
+#line 8051 "Commands.c"
 }
 
 
 static void straighten_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) {
 	StraightenCommand * self;
 	DataCollection* collection = NULL;
-	Photo* _tmp0_ = NULL;
-	DataCollection* _tmp1_ = NULL;
-	DataCollection* _tmp2_ = NULL;
-	Photo* _tmp4_ = NULL;
-	gdouble _tmp5_ = 0.0;
-	Photo* _tmp6_ = NULL;
-	Box _tmp7_ = {0};
-	DataCollection* _tmp8_ = NULL;
+	Photo* _tmp0_;
+	DataCollection* _tmp1_;
+	DataCollection* _tmp2_;
+	Photo* _tmp4_;
+	gdouble _tmp5_;
+	Photo* _tmp6_;
+	Box _tmp7_;
+	DataCollection* _tmp8_;
 #line 801 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRAIGHTEN_COMMAND, StraightenCommand);
 #line 801 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8094,13 +8076,13 @@ static void straighten_command_real_execute_on_photo (GenericPhotoTransformation
 	_tmp2_ = collection;
 #line 804 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ != NULL) {
-#line 8098 "Commands.c"
-		DataCollection* _tmp3_ = NULL;
+#line 8080 "Commands.c"
+		DataCollection* _tmp3_;
 #line 805 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = collection;
 #line 805 "/home/jens/Source/shotwell/src/Commands.vala"
 		data_collection_freeze_notifications (_tmp3_);
-#line 8104 "Commands.c"
+#line 8086 "Commands.c"
 	}
 #line 807 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = photo;
@@ -8118,17 +8100,17 @@ static void straighten_command_real_execute_on_photo (GenericPhotoTransformation
 	_tmp8_ = collection;
 #line 810 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp8_ != NULL) {
-#line 8122 "Commands.c"
-		DataCollection* _tmp9_ = NULL;
+#line 8104 "Commands.c"
+		DataCollection* _tmp9_;
 #line 811 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp9_ = collection;
 #line 811 "/home/jens/Source/shotwell/src/Commands.vala"
 		data_collection_thaw_notifications (_tmp9_);
-#line 8128 "Commands.c"
+#line 8110 "Commands.c"
 	}
 #line 801 "/home/jens/Source/shotwell/src/Commands.vala"
 	_data_collection_unref0 (collection);
-#line 8132 "Commands.c"
+#line 8114 "Commands.c"
 }
 
 
@@ -8138,27 +8120,27 @@ static void straighten_command_class_init (StraightenCommandClass * klass) {
 #line 790 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (StraightenCommandPrivate));
 #line 790 "/home/jens/Source/shotwell/src/Commands.vala"
-	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) straighten_command_real_execute_on_photo;
+	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) straighten_command_real_execute_on_photo;
 #line 790 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = straighten_command_finalize;
-#line 8145 "Commands.c"
+#line 8127 "Commands.c"
 }
 
 
 static void straighten_command_instance_init (StraightenCommand * self) {
 #line 790 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = STRAIGHTEN_COMMAND_GET_PRIVATE (self);
-#line 8152 "Commands.c"
+#line 8134 "Commands.c"
 }
 
 
-static void straighten_command_finalize (GObject* obj) {
+static void straighten_command_finalize (GObject * obj) {
 	StraightenCommand * self;
 #line 790 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_STRAIGHTEN_COMMAND, StraightenCommand);
 #line 790 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (straighten_command_parent_class)->finalize (obj);
-#line 8162 "Commands.c"
+#line 8144 "Commands.c"
 }
 
 
@@ -8176,10 +8158,10 @@ GType straighten_command_get_type (void) {
 
 CropCommand* crop_command_construct (GType object_type, Photo* photo, Box* crop, const gchar* name, const gchar* explanation) {
 	CropCommand * self = NULL;
-	Photo* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	Box _tmp3_ = {0};
+	Photo* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	Box _tmp3_;
 #line 818 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
 #line 818 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8202,21 +8184,21 @@ CropCommand* crop_command_construct (GType object_type, Photo* photo, Box* crop,
 	self->priv->crop = _tmp3_;
 #line 818 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8206 "Commands.c"
+#line 8188 "Commands.c"
 }
 
 
 CropCommand* crop_command_new (Photo* photo, Box* crop, const gchar* name, const gchar* explanation) {
 #line 818 "/home/jens/Source/shotwell/src/Commands.vala"
 	return crop_command_construct (TYPE_CROP_COMMAND, photo, crop, name, explanation);
-#line 8213 "Commands.c"
+#line 8195 "Commands.c"
 }
 
 
 static void crop_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) {
 	CropCommand * self;
-	Photo* _tmp0_ = NULL;
-	Box _tmp1_ = {0};
+	Photo* _tmp0_;
+	Box _tmp1_;
 #line 824 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CROP_COMMAND, CropCommand);
 #line 824 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8227,7 +8209,7 @@ static void crop_command_real_execute_on_photo (GenericPhotoTransformationComman
 	_tmp1_ = self->priv->crop;
 #line 825 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_set_crop (_tmp0_, &_tmp1_);
-#line 8231 "Commands.c"
+#line 8213 "Commands.c"
 }
 
 
@@ -8237,27 +8219,27 @@ static void crop_command_class_init (CropCommandClass * klass) {
 #line 815 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (CropCommandPrivate));
 #line 815 "/home/jens/Source/shotwell/src/Commands.vala"
-	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) crop_command_real_execute_on_photo;
+	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) crop_command_real_execute_on_photo;
 #line 815 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = crop_command_finalize;
-#line 8244 "Commands.c"
+#line 8226 "Commands.c"
 }
 
 
 static void crop_command_instance_init (CropCommand * self) {
 #line 815 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = CROP_COMMAND_GET_PRIVATE (self);
-#line 8251 "Commands.c"
+#line 8233 "Commands.c"
 }
 
 
-static void crop_command_finalize (GObject* obj) {
+static void crop_command_finalize (GObject * obj) {
 	CropCommand * self;
 #line 815 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CROP_COMMAND, CropCommand);
 #line 815 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (crop_command_parent_class)->finalize (obj);
-#line 8261 "Commands.c"
+#line 8243 "Commands.c"
 }
 
 
@@ -8276,17 +8258,17 @@ GType crop_command_get_type (void) {
 static gpointer _pixel_transformation_bundle_ref0 (gpointer self) {
 #line 836 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self ? pixel_transformation_bundle_ref (self) : NULL;
-#line 8280 "Commands.c"
+#line 8262 "Commands.c"
 }
 
 
 AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_type, Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation) {
 	AdjustColorsSingleCommand * self = NULL;
-	Photo* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PixelTransformationBundle* _tmp3_ = NULL;
-	PixelTransformationBundle* _tmp4_ = NULL;
+	Photo* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PixelTransformationBundle* _tmp3_;
+	PixelTransformationBundle* _tmp4_;
 #line 832 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
 #line 832 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8313,25 +8295,25 @@ AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_
 	self->priv->transformations = _tmp4_;
 #line 832 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8317 "Commands.c"
+#line 8299 "Commands.c"
 }
 
 
 AdjustColorsSingleCommand* adjust_colors_single_command_new (Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation) {
 #line 832 "/home/jens/Source/shotwell/src/Commands.vala"
 	return adjust_colors_single_command_construct (TYPE_ADJUST_COLORS_SINGLE_COMMAND, photo, transformations, name, explanation);
-#line 8324 "Commands.c"
+#line 8306 "Commands.c"
 }
 
 
 static void adjust_colors_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) {
 	AdjustColorsSingleCommand * self;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	PixelTransformationBundle* _tmp3_ = NULL;
-	AppWindow* _tmp4_ = NULL;
-	AppWindow* _tmp5_ = NULL;
+	AppWindow* _tmp0_;
+	AppWindow* _tmp1_;
+	Photo* _tmp2_;
+	PixelTransformationBundle* _tmp3_;
+	AppWindow* _tmp4_;
+	AppWindow* _tmp5_;
 #line 839 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_COLORS_SINGLE_COMMAND, AdjustColorsSingleCommand);
 #line 839 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8358,14 +8340,14 @@ static void adjust_colors_single_command_real_execute_on_photo (GenericPhotoTran
 	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE_WINDOW, PageWindow));
 #line 844 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp5_);
-#line 8362 "Commands.c"
+#line 8344 "Commands.c"
 }
 
 
 static gboolean adjust_colors_single_command_real_can_compress (GenericPhotoTransformationCommand* base, Command* command) {
 	AdjustColorsSingleCommand * self;
 	gboolean result = FALSE;
-	Command* _tmp0_ = NULL;
+	Command* _tmp0_;
 #line 847 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_COLORS_SINGLE_COMMAND, AdjustColorsSingleCommand);
 #line 847 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8376,7 +8358,7 @@ static gboolean adjust_colors_single_command_real_can_compress (GenericPhotoTran
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_ADJUST_COLORS_SINGLE_COMMAND);
 #line 848 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 8380 "Commands.c"
+#line 8362 "Commands.c"
 }
 
 
@@ -8386,23 +8368,23 @@ static void adjust_colors_single_command_class_init (AdjustColorsSingleCommandCl
 #line 829 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (AdjustColorsSingleCommandPrivate));
 #line 829 "/home/jens/Source/shotwell/src/Commands.vala"
-	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) adjust_colors_single_command_real_execute_on_photo;
+	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) adjust_colors_single_command_real_execute_on_photo;
 #line 829 "/home/jens/Source/shotwell/src/Commands.vala"
-	((GenericPhotoTransformationCommandClass *) klass)->can_compress = (gboolean (*)(GenericPhotoTransformationCommand*, Command*)) adjust_colors_single_command_real_can_compress;
+	((GenericPhotoTransformationCommandClass *) klass)->can_compress = (gboolean (*) (GenericPhotoTransformationCommand *, Command*)) adjust_colors_single_command_real_can_compress;
 #line 829 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = adjust_colors_single_command_finalize;
-#line 8395 "Commands.c"
+#line 8377 "Commands.c"
 }
 
 
 static void adjust_colors_single_command_instance_init (AdjustColorsSingleCommand * self) {
 #line 829 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = ADJUST_COLORS_SINGLE_COMMAND_GET_PRIVATE (self);
-#line 8402 "Commands.c"
+#line 8384 "Commands.c"
 }
 
 
-static void adjust_colors_single_command_finalize (GObject* obj) {
+static void adjust_colors_single_command_finalize (GObject * obj) {
 	AdjustColorsSingleCommand * self;
 #line 829 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_COLORS_SINGLE_COMMAND, AdjustColorsSingleCommand);
@@ -8410,7 +8392,7 @@ static void adjust_colors_single_command_finalize (GObject* obj) {
 	_pixel_transformation_bundle_unref0 (self->priv->transformations);
 #line 829 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (adjust_colors_single_command_parent_class)->finalize (obj);
-#line 8414 "Commands.c"
+#line 8396 "Commands.c"
 }
 
 
@@ -8428,13 +8410,11 @@ GType adjust_colors_single_command_get_type (void) {
 
 AdjustColorsMultipleCommand* adjust_colors_multiple_command_construct (GType object_type, GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation) {
 	AdjustColorsMultipleCommand * self = NULL;
-	GeeIterable* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	PixelTransformationBundle* _tmp5_ = NULL;
-	PixelTransformationBundle* _tmp6_ = NULL;
+	GeeIterable* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PixelTransformationBundle* _tmp3_;
+	PixelTransformationBundle* _tmp4_;
 #line 855 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
 #line 855 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8446,40 +8426,36 @@ AdjustColorsMultipleCommand* adjust_colors_multiple_command_construct (GType obj
 #line 857 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = iter;
 #line 857 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = _ ("Applying Color Transformations");
-#line 857 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp2_ = _ ("Undoing Color Transformations");
-#line 857 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp3_ = name;
+	_tmp1_ = name;
 #line 857 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp4_ = explanation;
+	_tmp2_ = explanation;
 #line 857 "/home/jens/Source/shotwell/src/Commands.vala"
-	self = (AdjustColorsMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
+	self = (AdjustColorsMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _ ("Applying Color Transformations"), _ ("Undoing Color Transformations"), _tmp1_, _tmp2_);
 #line 860 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp5_ = transformations;
+	_tmp3_ = transformations;
 #line 860 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp6_ = _pixel_transformation_bundle_ref0 (_tmp5_);
+	_tmp4_ = _pixel_transformation_bundle_ref0 (_tmp3_);
 #line 860 "/home/jens/Source/shotwell/src/Commands.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->transformations);
 #line 860 "/home/jens/Source/shotwell/src/Commands.vala"
-	self->priv->transformations = _tmp6_;
+	self->priv->transformations = _tmp4_;
 #line 855 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8469 "Commands.c"
+#line 8445 "Commands.c"
 }
 
 
 AdjustColorsMultipleCommand* adjust_colors_multiple_command_new (GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation) {
 #line 855 "/home/jens/Source/shotwell/src/Commands.vala"
 	return adjust_colors_multiple_command_construct (TYPE_ADJUST_COLORS_MULTIPLE_COMMAND, iter, transformations, name, explanation);
-#line 8476 "Commands.c"
+#line 8452 "Commands.c"
 }
 
 
 static void adjust_colors_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
 	AdjustColorsMultipleCommand * self;
-	DataSource* _tmp0_ = NULL;
-	PixelTransformationBundle* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	PixelTransformationBundle* _tmp1_;
 #line 863 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_COLORS_MULTIPLE_COMMAND, AdjustColorsMultipleCommand);
 #line 863 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8490,7 +8466,7 @@ static void adjust_colors_multiple_command_real_execute_on_source (MultipleDataS
 	_tmp1_ = self->priv->transformations;
 #line 864 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_set_color_adjustments (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_);
-#line 8494 "Commands.c"
+#line 8470 "Commands.c"
 }
 
 
@@ -8500,21 +8476,21 @@ static void adjust_colors_multiple_command_class_init (AdjustColorsMultipleComma
 #line 852 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (AdjustColorsMultipleCommandPrivate));
 #line 852 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) adjust_colors_multiple_command_real_execute_on_source;
+	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) adjust_colors_multiple_command_real_execute_on_source;
 #line 852 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = adjust_colors_multiple_command_finalize;
-#line 8507 "Commands.c"
+#line 8483 "Commands.c"
 }
 
 
 static void adjust_colors_multiple_command_instance_init (AdjustColorsMultipleCommand * self) {
 #line 852 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = ADJUST_COLORS_MULTIPLE_COMMAND_GET_PRIVATE (self);
-#line 8514 "Commands.c"
+#line 8490 "Commands.c"
 }
 
 
-static void adjust_colors_multiple_command_finalize (GObject* obj) {
+static void adjust_colors_multiple_command_finalize (GObject * obj) {
 	AdjustColorsMultipleCommand * self;
 #line 852 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_COLORS_MULTIPLE_COMMAND, AdjustColorsMultipleCommand);
@@ -8522,7 +8498,7 @@ static void adjust_colors_multiple_command_finalize (GObject* obj) {
 	_pixel_transformation_bundle_unref0 (self->priv->transformations);
 #line 852 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (adjust_colors_multiple_command_parent_class)->finalize (obj);
-#line 8526 "Commands.c"
+#line 8502 "Commands.c"
 }
 
 
@@ -8540,10 +8516,10 @@ GType adjust_colors_multiple_command_get_type (void) {
 
 RedeyeCommand* redeye_command_construct (GType object_type, Photo* photo, EditingToolsRedeyeInstance* redeye_instance, const gchar* name, const gchar* explanation) {
 	RedeyeCommand * self = NULL;
-	Photo* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	EditingToolsRedeyeInstance _tmp3_ = {0};
+	Photo* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	EditingToolsRedeyeInstance _tmp3_;
 #line 871 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
 #line 871 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8566,21 +8542,21 @@ RedeyeCommand* redeye_command_construct (GType object_type, Photo* photo, Editin
 	self->priv->redeye_instance = _tmp3_;
 #line 871 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8570 "Commands.c"
+#line 8546 "Commands.c"
 }
 
 
 RedeyeCommand* redeye_command_new (Photo* photo, EditingToolsRedeyeInstance* redeye_instance, const gchar* name, const gchar* explanation) {
 #line 871 "/home/jens/Source/shotwell/src/Commands.vala"
 	return redeye_command_construct (TYPE_REDEYE_COMMAND, photo, redeye_instance, name, explanation);
-#line 8577 "Commands.c"
+#line 8553 "Commands.c"
 }
 
 
 static void redeye_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) {
 	RedeyeCommand * self;
-	Photo* _tmp0_ = NULL;
-	EditingToolsRedeyeInstance _tmp1_ = {0};
+	Photo* _tmp0_;
+	EditingToolsRedeyeInstance _tmp1_;
 #line 878 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_REDEYE_COMMAND, RedeyeCommand);
 #line 878 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8591,7 +8567,7 @@ static void redeye_command_real_execute_on_photo (GenericPhotoTransformationComm
 	_tmp1_ = self->priv->redeye_instance;
 #line 879 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_add_redeye_instance (_tmp0_, &_tmp1_);
-#line 8595 "Commands.c"
+#line 8571 "Commands.c"
 }
 
 
@@ -8601,27 +8577,27 @@ static void redeye_command_class_init (RedeyeCommandClass * klass) {
 #line 868 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (RedeyeCommandPrivate));
 #line 868 "/home/jens/Source/shotwell/src/Commands.vala"
-	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) redeye_command_real_execute_on_photo;
+	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) redeye_command_real_execute_on_photo;
 #line 868 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = redeye_command_finalize;
-#line 8608 "Commands.c"
+#line 8584 "Commands.c"
 }
 
 
 static void redeye_command_instance_init (RedeyeCommand * self) {
 #line 868 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = REDEYE_COMMAND_GET_PRIVATE (self);
-#line 8615 "Commands.c"
+#line 8591 "Commands.c"
 }
 
 
-static void redeye_command_finalize (GObject* obj) {
+static void redeye_command_finalize (GObject * obj) {
 	RedeyeCommand * self;
 #line 868 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_REDEYE_COMMAND, RedeyeCommand);
 #line 868 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (redeye_command_parent_class)->finalize (obj);
-#line 8625 "Commands.c"
+#line 8601 "Commands.c"
 }
 
 
@@ -8639,8 +8615,8 @@ GType redeye_command_get_type (void) {
 
 MovePhotosCommand* move_photos_command_construct (GType object_type, const gchar* name, const gchar* explanation) {
 	MovePhotosCommand * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 #line 967 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 967 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8653,14 +8629,14 @@ MovePhotosCommand* move_photos_command_construct (GType object_type, const gchar
 	self = (MovePhotosCommand*) command_construct (object_type, _tmp0_, _tmp1_);
 #line 967 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8657 "Commands.c"
+#line 8633 "Commands.c"
 }
 
 
 static void move_photos_command_real_prepare (Command* base) {
 	MovePhotosCommand * self;
-	MovePhotosCommandRealMovePhotosCommand* _tmp0_ = NULL;
-	MovePhotosCommandRealMovePhotosCommand* _tmp1_ = NULL;
+	MovePhotosCommandRealMovePhotosCommand* _tmp0_;
+	MovePhotosCommandRealMovePhotosCommand* _tmp1_;
 #line 971 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand);
 #line 972 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8671,14 +8647,14 @@ static void move_photos_command_real_prepare (Command* base) {
 	_tmp1_ = self->real_command;
 #line 973 "/home/jens/Source/shotwell/src/Commands.vala"
 	command_prepare (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND, Command));
-#line 8675 "Commands.c"
+#line 8651 "Commands.c"
 }
 
 
 static void move_photos_command_real_execute (Command* base) {
 	MovePhotosCommand * self;
-	MovePhotosCommandRealMovePhotosCommand* _tmp0_ = NULL;
-	MovePhotosCommandRealMovePhotosCommand* _tmp1_ = NULL;
+	MovePhotosCommandRealMovePhotosCommand* _tmp0_;
+	MovePhotosCommandRealMovePhotosCommand* _tmp1_;
 #line 976 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand);
 #line 977 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8689,14 +8665,14 @@ static void move_photos_command_real_execute (Command* base) {
 	_tmp1_ = self->real_command;
 #line 978 "/home/jens/Source/shotwell/src/Commands.vala"
 	command_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND, Command));
-#line 8693 "Commands.c"
+#line 8669 "Commands.c"
 }
 
 
 static void move_photos_command_real_undo (Command* base) {
 	MovePhotosCommand * self;
-	MovePhotosCommandRealMovePhotosCommand* _tmp0_ = NULL;
-	MovePhotosCommandRealMovePhotosCommand* _tmp1_ = NULL;
+	MovePhotosCommandRealMovePhotosCommand* _tmp0_;
+	MovePhotosCommandRealMovePhotosCommand* _tmp1_;
 #line 981 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand);
 #line 982 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8707,34 +8683,34 @@ static void move_photos_command_real_undo (Command* base) {
 	_tmp1_ = self->real_command;
 #line 983 "/home/jens/Source/shotwell/src/Commands.vala"
 	command_undo (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND, Command));
-#line 8711 "Commands.c"
+#line 8687 "Commands.c"
 }
 
 
 static void _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
 #line 914 "/home/jens/Source/shotwell/src/Commands.vala"
 	move_photos_command_real_move_photos_command_on_proxy_broken ((MovePhotosCommandRealMovePhotosCommand*) self);
-#line 8718 "Commands.c"
+#line 8694 "Commands.c"
 }
 
 
 static gpointer _source_proxy_ref0 (gpointer self) {
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self ? source_proxy_ref (self) : NULL;
-#line 8725 "Commands.c"
+#line 8701 "Commands.c"
 }
 
 
 MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_command_construct (GType object_type, Event* new_event, GeeIterable* source_views, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation) {
 	MovePhotosCommandRealMovePhotosCommand * self = NULL;
-	GeeIterable* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	Event* _tmp30_ = NULL;
-	SourceProxy* _tmp31_ = NULL;
-	SourceProxy* _tmp32_ = NULL;
+	GeeIterable* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	Event* _tmp30_;
+	SourceProxy* _tmp31_;
+	SourceProxy* _tmp32_;
 #line 891 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail ((new_event == NULL) || IS_EVENT (new_event), NULL);
 #line 891 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8759,15 +8735,15 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 	_tmp4_ = explanation;
 #line 893 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = (MovePhotosCommandRealMovePhotosCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 8763 "Commands.c"
+#line 8739 "Commands.c"
 	{
 		GeeArrayList* _source_list = NULL;
-		GeeArrayList* _tmp5_ = NULL;
-		GeeArrayList* _tmp6_ = NULL;
+		GeeArrayList* _tmp5_;
+		GeeArrayList* _tmp6_;
 		gint _source_size = 0;
-		GeeArrayList* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
+		GeeArrayList* _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
 		gint _source_index = 0;
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list;
@@ -8787,28 +8763,28 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 		_source_index = -1;
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 8791 "Commands.c"
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
-			gint _tmp12_ = 0;
+#line 8767 "Commands.c"
+			gint _tmp10_;
+			gint _tmp11_;
+			gint _tmp12_;
 			DataSource* source = NULL;
-			GeeArrayList* _tmp13_ = NULL;
-			gint _tmp14_ = 0;
-			gpointer _tmp15_ = NULL;
+			GeeArrayList* _tmp13_;
+			gint _tmp14_;
+			gpointer _tmp15_;
 			MediaSource* current_media = NULL;
-			DataSource* _tmp16_ = NULL;
-			MediaSource* _tmp17_ = NULL;
+			DataSource* _tmp16_;
+			MediaSource* _tmp17_;
 			Event* old_event = NULL;
-			MediaSource* _tmp18_ = NULL;
-			Event* _tmp19_ = NULL;
+			MediaSource* _tmp18_;
+			Event* _tmp19_;
 			SourceProxy* _tmp20_ = NULL;
-			Event* _tmp21_ = NULL;
+			Event* _tmp21_;
 			SourceProxy* old_event_proxy = NULL;
-			SourceProxy* _tmp24_ = NULL;
-			SourceProxy* _tmp25_ = NULL;
-			GeeHashMap* _tmp27_ = NULL;
-			MediaSource* _tmp28_ = NULL;
-			SourceProxy* _tmp29_ = NULL;
+			SourceProxy* _tmp24_;
+			SourceProxy* _tmp25_;
+			GeeHashMap* _tmp27_;
+			MediaSource* _tmp28_;
+			SourceProxy* _tmp29_;
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp10_ = _source_index;
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8821,7 +8797,7 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 			if (!(_tmp11_ < _tmp12_)) {
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 8825 "Commands.c"
+#line 8801 "Commands.c"
 			}
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp13_ = _source_list;
@@ -8847,9 +8823,9 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 			_tmp21_ = old_event;
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp21_ != NULL) {
-#line 8851 "Commands.c"
-				Event* _tmp22_ = NULL;
-				SourceProxy* _tmp23_ = NULL;
+#line 8827 "Commands.c"
+				Event* _tmp22_;
+				SourceProxy* _tmp23_;
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp22_ = old_event;
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8858,13 +8834,13 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 				_source_proxy_unref0 (_tmp20_);
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp20_ = _tmp23_;
-#line 8862 "Commands.c"
+#line 8838 "Commands.c"
 			} else {
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 				_source_proxy_unref0 (_tmp20_);
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp20_ = NULL;
-#line 8868 "Commands.c"
+#line 8844 "Commands.c"
 			}
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp24_ = _source_proxy_ref0 (_tmp20_);
@@ -8874,13 +8850,13 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 			_tmp25_ = old_event_proxy;
 #line 902 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp25_ != NULL) {
-#line 8878 "Commands.c"
-				SourceProxy* _tmp26_ = NULL;
+#line 8854 "Commands.c"
+				SourceProxy* _tmp26_;
 #line 903 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp26_ = old_event_proxy;
 #line 903 "/home/jens/Source/shotwell/src/Commands.vala"
 				g_signal_connect_object (_tmp26_, "broken", (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self, 0);
-#line 8884 "Commands.c"
+#line 8860 "Commands.c"
 			}
 #line 905 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp27_ = self->priv->old_events;
@@ -8900,11 +8876,11 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 			_g_object_unref0 (current_media);
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 8904 "Commands.c"
+#line 8880 "Commands.c"
 		}
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_list);
-#line 8908 "Commands.c"
+#line 8884 "Commands.c"
 	}
 #line 909 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp30_ = new_event;
@@ -8920,24 +8896,24 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 	g_signal_connect_object (_tmp32_, "broken", (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self, 0);
 #line 891 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8924 "Commands.c"
+#line 8900 "Commands.c"
 }
 
 
 MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_command_new (Event* new_event, GeeIterable* source_views, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation) {
 #line 891 "/home/jens/Source/shotwell/src/Commands.vala"
 	return move_photos_command_real_move_photos_command_construct (MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, new_event, source_views, progress_text, undo_progress_text, name, explanation);
-#line 8931 "Commands.c"
+#line 8907 "Commands.c"
 }
 
 
 static void move_photos_command_real_move_photos_command_real_execute (Command* base) {
 	MovePhotosCommandRealMovePhotosCommand * self;
-	LibraryWindow* _tmp0_ = NULL;
-	LibraryWindow* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	LibraryWindow* _tmp0_;
+	LibraryWindow* _tmp1_;
+	Page* _tmp2_;
+	Page* _tmp3_;
+	gboolean _tmp4_;
 #line 922 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, MovePhotosCommandRealMovePhotosCommand);
 #line 924 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8956,19 +8932,19 @@ static void move_photos_command_real_move_photos_command_real_execute (Command*
 	_g_object_unref0 (_tmp1_);
 #line 924 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp4_) {
-#line 8960 "Commands.c"
+#line 8936 "Commands.c"
 		Event* evt = NULL;
-		LibraryWindow* _tmp5_ = NULL;
-		LibraryWindow* _tmp6_ = NULL;
-		Page* _tmp7_ = NULL;
-		EventPage* _tmp8_ = NULL;
-		Event* _tmp9_ = NULL;
-		Event* _tmp10_ = NULL;
-		Event* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
-		GeeArrayList* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
-		gint _tmp15_ = 0;
+		LibraryWindow* _tmp5_;
+		LibraryWindow* _tmp6_;
+		Page* _tmp7_;
+		EventPage* _tmp8_;
+		Event* _tmp9_;
+		Event* _tmp10_;
+		Event* _tmp11_;
+		gint _tmp12_;
+		GeeArrayList* _tmp13_;
+		gint _tmp14_;
+		gint _tmp15_;
 #line 925 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = library_window_get_app ();
 #line 925 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8999,12 +8975,12 @@ static void move_photos_command_real_move_photos_command_real_execute (Command*
 		_tmp15_ = _tmp14_;
 #line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp12_ == _tmp15_) {
-#line 9003 "Commands.c"
-			LibraryWindow* _tmp16_ = NULL;
-			LibraryWindow* _tmp17_ = NULL;
-			SourceProxy* _tmp18_ = NULL;
-			DataSource* _tmp19_ = NULL;
-			Event* _tmp20_ = NULL;
+#line 8979 "Commands.c"
+			LibraryWindow* _tmp16_;
+			LibraryWindow* _tmp17_;
+			SourceProxy* _tmp18_;
+			DataSource* _tmp19_;
+			Event* _tmp20_;
 #line 931 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp16_ = library_window_get_app ();
 #line 931 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9021,17 +8997,17 @@ static void move_photos_command_real_move_photos_command_real_execute (Command*
 			_g_object_unref0 (_tmp20_);
 #line 931 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_tmp17_);
-#line 9025 "Commands.c"
+#line 9001 "Commands.c"
 		}
 #line 924 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (evt);
-#line 9029 "Commands.c"
+#line 9005 "Commands.c"
 	} else {
-		SourceProxy* _tmp21_ = NULL;
-		DataSource* _tmp22_ = NULL;
-		Event* _tmp23_ = NULL;
-		gint _tmp24_ = 0;
-		gboolean _tmp25_ = FALSE;
+		SourceProxy* _tmp21_;
+		DataSource* _tmp22_;
+		Event* _tmp23_;
+		gint _tmp24_;
+		gboolean _tmp25_;
 #line 937 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp21_ = self->priv->new_event_proxy;
 #line 937 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9046,12 +9022,12 @@ static void move_photos_command_real_move_photos_command_real_execute (Command*
 		_g_object_unref0 (_tmp23_);
 #line 937 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp25_) {
-#line 9050 "Commands.c"
-			LibraryWindow* _tmp26_ = NULL;
-			LibraryWindow* _tmp27_ = NULL;
-			SourceProxy* _tmp28_ = NULL;
-			DataSource* _tmp29_ = NULL;
-			Event* _tmp30_ = NULL;
+#line 9026 "Commands.c"
+			LibraryWindow* _tmp26_;
+			LibraryWindow* _tmp27_;
+			SourceProxy* _tmp28_;
+			DataSource* _tmp29_;
+			Event* _tmp30_;
 #line 939 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp26_ = library_window_get_app ();
 #line 939 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9068,21 +9044,21 @@ static void move_photos_command_real_move_photos_command_real_execute (Command*
 			_g_object_unref0 (_tmp30_);
 #line 939 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_tmp27_);
-#line 9072 "Commands.c"
+#line 9048 "Commands.c"
 		}
 	}
 #line 946 "/home/jens/Source/shotwell/src/Commands.vala"
 	COMMAND_CLASS (move_photos_command_real_move_photos_command_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 9077 "Commands.c"
+#line 9053 "Commands.c"
 }
 
 
 static void move_photos_command_real_move_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
 	MovePhotosCommandRealMovePhotosCommand * self;
-	DataSource* _tmp0_ = NULL;
-	SourceProxy* _tmp1_ = NULL;
-	DataSource* _tmp2_ = NULL;
-	Event* _tmp3_ = NULL;
+	DataSource* _tmp0_;
+	SourceProxy* _tmp1_;
+	DataSource* _tmp2_;
+	Event* _tmp3_;
 #line 949 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, MovePhotosCommandRealMovePhotosCommand);
 #line 949 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9099,22 +9075,22 @@ static void move_photos_command_real_move_photos_command_real_execute_on_source
 	media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
 #line 950 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp3_);
-#line 9103 "Commands.c"
+#line 9079 "Commands.c"
 }
 
 
 static void move_photos_command_real_move_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) {
 	MovePhotosCommandRealMovePhotosCommand * self;
 	MediaSource* current_media = NULL;
-	DataSource* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	MediaSource* _tmp1_;
 	SourceProxy* event_proxy = NULL;
-	GeeHashMap* _tmp2_ = NULL;
-	MediaSource* _tmp3_ = NULL;
-	gpointer _tmp4_ = NULL;
+	GeeHashMap* _tmp2_;
+	MediaSource* _tmp3_;
+	gpointer _tmp4_;
 	Event* _tmp5_ = NULL;
-	SourceProxy* _tmp6_ = NULL;
-	MediaSource* _tmp9_ = NULL;
+	SourceProxy* _tmp6_;
+	MediaSource* _tmp9_;
 #line 953 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, MovePhotosCommandRealMovePhotosCommand);
 #line 953 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9137,9 +9113,9 @@ static void move_photos_command_real_move_photos_command_real_undo_on_source (Mu
 	_tmp6_ = event_proxy;
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp6_ != NULL) {
-#line 9141 "Commands.c"
-		SourceProxy* _tmp7_ = NULL;
-		DataSource* _tmp8_ = NULL;
+#line 9117 "Commands.c"
+		SourceProxy* _tmp7_;
+		DataSource* _tmp8_;
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = event_proxy;
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9148,13 +9124,13 @@ static void move_photos_command_real_move_photos_command_real_undo_on_source (Mu
 		_g_object_unref0 (_tmp5_);
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_EVENT, Event);
-#line 9152 "Commands.c"
+#line 9128 "Commands.c"
 	} else {
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp5_);
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = NULL;
-#line 9158 "Commands.c"
+#line 9134 "Commands.c"
 	}
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp9_ = current_media;
@@ -9166,13 +9142,13 @@ static void move_photos_command_real_move_photos_command_real_undo_on_source (Mu
 	_source_proxy_unref0 (event_proxy);
 #line 953 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (current_media);
-#line 9170 "Commands.c"
+#line 9146 "Commands.c"
 }
 
 
 static void move_photos_command_real_move_photos_command_on_proxy_broken (MovePhotosCommandRealMovePhotosCommand* self) {
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
 #line 960 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (MOVE_PHOTOS_COMMAND_IS_REAL_MOVE_PHOTOS_COMMAND (self));
 #line 961 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9183,7 +9159,7 @@ static void move_photos_command_real_move_photos_command_on_proxy_broken (MovePh
 	command_manager_reset (_tmp1_);
 #line 961 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 9187 "Commands.c"
+#line 9163 "Commands.c"
 }
 
 
@@ -9193,19 +9169,19 @@ static void move_photos_command_real_move_photos_command_class_init (MovePhotosC
 #line 886 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (MovePhotosCommandRealMovePhotosCommandPrivate));
 #line 886 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) move_photos_command_real_move_photos_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) move_photos_command_real_move_photos_command_real_execute;
 #line 886 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) move_photos_command_real_move_photos_command_real_execute_on_source;
+	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) move_photos_command_real_move_photos_command_real_execute_on_source;
 #line 886 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) move_photos_command_real_move_photos_command_real_undo_on_source;
+	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) move_photos_command_real_move_photos_command_real_undo_on_source;
 #line 886 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = move_photos_command_real_move_photos_command_finalize;
-#line 9204 "Commands.c"
+#line 9180 "Commands.c"
 }
 
 
 static void move_photos_command_real_move_photos_command_instance_init (MovePhotosCommandRealMovePhotosCommand * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 886 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = MOVE_PHOTOS_COMMAND_REAL_MOVE_PHOTOS_COMMAND_GET_PRIVATE (self);
 #line 887 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9214,14 +9190,14 @@ static void move_photos_command_real_move_photos_command_instance_init (MovePhot
 	_tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 888 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->old_events = _tmp0_;
-#line 9218 "Commands.c"
+#line 9194 "Commands.c"
 }
 
 
-static void move_photos_command_real_move_photos_command_finalize (GObject* obj) {
+static void move_photos_command_real_move_photos_command_finalize (GObject * obj) {
 	MovePhotosCommandRealMovePhotosCommand * self;
-	SourceProxy* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	SourceProxy* _tmp0_;
+	guint _tmp1_;
 #line 886 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, MovePhotosCommandRealMovePhotosCommand);
 #line 914 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9230,15 +9206,15 @@ static void move_photos_command_real_move_photos_command_finalize (GObject* obj)
 	g_signal_parse_name ("broken", TYPE_SOURCE_PROXY, &_tmp1_, NULL, FALSE);
 #line 914 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self);
-#line 9234 "Commands.c"
+#line 9210 "Commands.c"
 	{
 		GeeIterator* _proxy_it = NULL;
-		GeeHashMap* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeCollection* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
-		GeeIterator* _tmp7_ = NULL;
+		GeeHashMap* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeCollection* _tmp4_;
+		GeeCollection* _tmp5_;
+		GeeIterator* _tmp6_;
+		GeeIterator* _tmp7_;
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = self->priv->old_events;
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9257,13 +9233,13 @@ static void move_photos_command_real_move_photos_command_finalize (GObject* obj)
 		_proxy_it = _tmp7_;
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 9261 "Commands.c"
-			GeeIterator* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+#line 9237 "Commands.c"
+			GeeIterator* _tmp8_;
+			gboolean _tmp9_;
 			SourceProxy* proxy = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			gpointer _tmp11_ = NULL;
-			SourceProxy* _tmp12_ = NULL;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			SourceProxy* _tmp12_;
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _proxy_it;
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9272,7 +9248,7 @@ static void move_photos_command_real_move_photos_command_finalize (GObject* obj)
 			if (!_tmp9_) {
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 9276 "Commands.c"
+#line 9252 "Commands.c"
 			}
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp10_ = _proxy_it;
@@ -9284,24 +9260,24 @@ static void move_photos_command_real_move_photos_command_finalize (GObject* obj)
 			_tmp12_ = proxy;
 #line 917 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp12_ != NULL) {
-#line 9288 "Commands.c"
-				SourceProxy* _tmp13_ = NULL;
-				guint _tmp14_ = 0U;
+#line 9264 "Commands.c"
+				SourceProxy* _tmp13_;
+				guint _tmp14_;
 #line 918 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp13_ = proxy;
 #line 918 "/home/jens/Source/shotwell/src/Commands.vala"
 				g_signal_parse_name ("broken", TYPE_SOURCE_PROXY, &_tmp14_, NULL, FALSE);
 #line 918 "/home/jens/Source/shotwell/src/Commands.vala"
 				g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self);
-#line 9297 "Commands.c"
+#line 9273 "Commands.c"
 			}
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 9301 "Commands.c"
+#line 9277 "Commands.c"
 		}
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_it);
-#line 9305 "Commands.c"
+#line 9281 "Commands.c"
 	}
 #line 887 "/home/jens/Source/shotwell/src/Commands.vala"
 	_source_proxy_unref0 (self->priv->new_event_proxy);
@@ -9309,7 +9285,7 @@ static void move_photos_command_real_move_photos_command_finalize (GObject* obj)
 	_g_object_unref0 (self->priv->old_events);
 #line 886 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (move_photos_command_real_move_photos_command_parent_class)->finalize (obj);
-#line 9313 "Commands.c"
+#line 9289 "Commands.c"
 }
 
 
@@ -9329,14 +9305,14 @@ static void move_photos_command_class_init (MovePhotosCommandClass * klass) {
 #line 883 "/home/jens/Source/shotwell/src/Commands.vala"
 	move_photos_command_parent_class = g_type_class_peek_parent (klass);
 #line 883 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->prepare = (void (*)(Command*)) move_photos_command_real_prepare;
+	((CommandClass *) klass)->prepare = (void (*) (Command *)) move_photos_command_real_prepare;
 #line 883 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) move_photos_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) move_photos_command_real_execute;
 #line 883 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) move_photos_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) move_photos_command_real_undo;
 #line 883 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = move_photos_command_finalize;
-#line 9340 "Commands.c"
+#line 9316 "Commands.c"
 }
 
 
@@ -9344,7 +9320,7 @@ static void move_photos_command_instance_init (MovePhotosCommand * self) {
 }
 
 
-static void move_photos_command_finalize (GObject* obj) {
+static void move_photos_command_finalize (GObject * obj) {
 	MovePhotosCommand * self;
 #line 883 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand);
@@ -9352,7 +9328,7 @@ static void move_photos_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->real_command);
 #line 883 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (move_photos_command_parent_class)->finalize (obj);
-#line 9356 "Commands.c"
+#line 9332 "Commands.c"
 }
 
 
@@ -9371,25 +9347,23 @@ GType move_photos_command_get_type (void) {
 NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* iter) {
 	NewEventCommand * self = NULL;
 	MediaSource* key_source = NULL;
-	MediaSource* _tmp11_ = NULL;
+	MediaSource* _tmp11_;
 	Event* new_event = NULL;
-	MediaSource* _tmp12_ = NULL;
-	Event* _tmp13_ = NULL;
-	GeeIterable* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	MovePhotosCommandRealMovePhotosCommand* _tmp17_ = NULL;
+	MediaSource* _tmp12_;
+	Event* _tmp13_;
+	GeeIterable* _tmp14_;
+	MovePhotosCommandRealMovePhotosCommand* _tmp15_;
 #line 988 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
 #line 989 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = (NewEventCommand*) move_photos_command_construct (object_type, RESOURCES_NEW_EVENT_LABEL, "");
 #line 992 "/home/jens/Source/shotwell/src/Commands.vala"
 	key_source = NULL;
-#line 9389 "Commands.c"
+#line 9363 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = iter;
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9398,16 +9372,16 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 		_view_it = _tmp1_;
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 9402 "Commands.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 9376 "Commands.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataView* view = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			MediaSource* current_source = NULL;
-			DataView* _tmp6_ = NULL;
-			DataSource* _tmp7_ = NULL;
-			MediaSource* _tmp8_ = NULL;
+			DataView* _tmp6_;
+			DataSource* _tmp7_;
+			MediaSource* _tmp8_;
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp2_ = _view_it;
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9416,7 +9390,7 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 			if (!_tmp3_) {
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 9420 "Commands.c"
+#line 9394 "Commands.c"
 			}
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _view_it;
@@ -9434,9 +9408,9 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 			_tmp8_ = key_source;
 #line 996 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp8_ == NULL) {
-#line 9438 "Commands.c"
-				MediaSource* _tmp9_ = NULL;
-				MediaSource* _tmp10_ = NULL;
+#line 9412 "Commands.c"
+				MediaSource* _tmp9_;
+				MediaSource* _tmp10_;
 #line 997 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp9_ = current_source;
 #line 997 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9451,17 +9425,17 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 				_g_object_unref0 (view);
 #line 998 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 9455 "Commands.c"
+#line 9429 "Commands.c"
 			}
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (current_source);
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (view);
-#line 9461 "Commands.c"
+#line 9435 "Commands.c"
 		}
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_view_it);
-#line 9465 "Commands.c"
+#line 9439 "Commands.c"
 	}
 #line 1003 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp11_ = key_source;
@@ -9476,36 +9450,32 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 #line 1007 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp14_ = iter;
 #line 1007 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp15_ = _ ("Creating New Event");
-#line 1007 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp16_ = _ ("Removing Event");
-#line 1007 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp17_ = move_photos_command_real_move_photos_command_new (new_event, _tmp14_, _tmp15_, _tmp16_, RESOURCES_NEW_EVENT_LABEL, "");
+	_tmp15_ = move_photos_command_real_move_photos_command_new (new_event, _tmp14_, _ ("Creating New Event"), _ ("Removing Event"), RESOURCES_NEW_EVENT_LABEL, "");
 #line 1007 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command);
 #line 1007 "/home/jens/Source/shotwell/src/Commands.vala"
-	G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp17_;
+	G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp15_;
 #line 988 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (new_event);
 #line 988 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (key_source);
 #line 988 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 9495 "Commands.c"
+#line 9465 "Commands.c"
 }
 
 
 NewEventCommand* new_event_command_new (GeeIterable* iter) {
 #line 988 "/home/jens/Source/shotwell/src/Commands.vala"
 	return new_event_command_construct (TYPE_NEW_EVENT_COMMAND, iter);
-#line 9502 "Commands.c"
+#line 9472 "Commands.c"
 }
 
 
 static void new_event_command_class_init (NewEventCommandClass * klass) {
 #line 987 "/home/jens/Source/shotwell/src/Commands.vala"
 	new_event_command_parent_class = g_type_class_peek_parent (klass);
-#line 9509 "Commands.c"
+#line 9479 "Commands.c"
 }
 
 
@@ -9527,11 +9497,9 @@ GType new_event_command_get_type (void) {
 
 SetEventCommand* set_event_command_construct (GType object_type, GeeIterable* iter, Event* new_event) {
 	SetEventCommand * self = NULL;
-	Event* _tmp0_ = NULL;
-	GeeIterable* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	MovePhotosCommandRealMovePhotosCommand* _tmp4_ = NULL;
+	Event* _tmp0_;
+	GeeIterable* _tmp1_;
+	MovePhotosCommandRealMovePhotosCommand* _tmp2_;
 #line 1014 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
 #line 1014 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9543,32 +9511,28 @@ SetEventCommand* set_event_command_construct (GType object_type, GeeIterable* it
 #line 1017 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp1_ = iter;
 #line 1017 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp2_ = _ ("Moving Photos to New Event");
-#line 1017 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp3_ = _ ("Setting Photos to Previous Event");
-#line 1017 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp4_ = move_photos_command_real_move_photos_command_new (_tmp0_, _tmp1_, _tmp2_, _tmp3_, RESOURCES_SET_PHOTO_EVENT_LABEL, "");
+	_tmp2_ = move_photos_command_real_move_photos_command_new (_tmp0_, _tmp1_, _ ("Moving Photos to New Event"), _ ("Setting Photos to Previous Event"), RESOURCES_SET_PHOTO_EVENT_LABEL, "");
 #line 1017 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command);
 #line 1017 "/home/jens/Source/shotwell/src/Commands.vala"
-	G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp4_;
+	G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp2_;
 #line 1014 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 9558 "Commands.c"
+#line 9522 "Commands.c"
 }
 
 
 SetEventCommand* set_event_command_new (GeeIterable* iter, Event* new_event) {
 #line 1014 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_event_command_construct (TYPE_SET_EVENT_COMMAND, iter, new_event);
-#line 9565 "Commands.c"
+#line 9529 "Commands.c"
 }
 
 
 static void set_event_command_class_init (SetEventCommandClass * klass) {
 #line 1013 "/home/jens/Source/shotwell/src/Commands.vala"
 	set_event_command_parent_class = g_type_class_peek_parent (klass);
-#line 9572 "Commands.c"
+#line 9536 "Commands.c"
 }
 
 
@@ -9594,16 +9558,14 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 	gint named_evt_src_count = 0;
 	gint unnamed_evt_src_count = 0;
 	GeeArrayList* media_thumbs = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	Event* _tmp48_ = NULL;
-	GeeArrayList* _tmp49_ = NULL;
-	gint _tmp50_ = 0;
-	gint _tmp51_ = 0;
-	Event* _tmp52_ = NULL;
-	GeeArrayList* _tmp53_ = NULL;
-	const gchar* _tmp54_ = NULL;
-	const gchar* _tmp55_ = NULL;
-	MovePhotosCommandRealMovePhotosCommand* _tmp56_ = NULL;
+	GeeArrayList* _tmp0_;
+	Event* _tmp48_;
+	GeeArrayList* _tmp49_;
+	gint _tmp50_;
+	gint _tmp51_;
+	Event* _tmp52_;
+	GeeArrayList* _tmp53_;
+	MovePhotosCommandRealMovePhotosCommand* _tmp54_;
 #line 1024 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
 #line 1025 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9618,11 +9580,11 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 	_tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1034 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_thumbs = _tmp0_;
-#line 9622 "Commands.c"
+#line 9584 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
-		GeeIterable* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeIterable* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = iter;
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9631,16 +9593,16 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 		_view_it = _tmp2_;
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 9635 "Commands.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 9597 "Commands.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			DataView* view = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
 			Event* event = NULL;
-			DataView* _tmp7_ = NULL;
-			DataSource* _tmp8_ = NULL;
-			Event* _tmp9_ = NULL;
+			DataView* _tmp7_;
+			DataSource* _tmp8_;
+			Event* _tmp9_;
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp3_ = _view_it;
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9649,7 +9611,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 			if (!_tmp4_) {
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 9653 "Commands.c"
+#line 9615 "Commands.c"
 			}
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = _view_it;
@@ -9667,13 +9629,13 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 			_tmp9_ = master_event;
 #line 1040 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp9_ == NULL) {
-#line 9671 "Commands.c"
-				Event* _tmp10_ = NULL;
-				Event* _tmp11_ = NULL;
-				Event* _tmp12_ = NULL;
-				gint _tmp13_ = 0;
-				Event* _tmp14_ = NULL;
-				gboolean _tmp15_ = FALSE;
+#line 9633 "Commands.c"
+				Event* _tmp10_;
+				Event* _tmp11_;
+				Event* _tmp12_;
+				gint _tmp13_;
+				Event* _tmp14_;
+				gboolean _tmp15_;
 #line 1043 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp10_ = event;
 #line 1043 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9694,30 +9656,30 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 				_tmp15_ = event_has_name (_tmp14_);
 #line 1045 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (_tmp15_) {
-#line 9698 "Commands.c"
-					Event* _tmp16_ = NULL;
-					gint _tmp17_ = 0;
+#line 9660 "Commands.c"
+					Event* _tmp16_;
+					gint _tmp17_;
 #line 1046 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp16_ = master_event;
 #line 1046 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp17_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT_SOURCE, EventSource));
 #line 1046 "/home/jens/Source/shotwell/src/Commands.vala"
 					named_evt_src_count = _tmp17_;
-#line 9707 "Commands.c"
+#line 9669 "Commands.c"
 				}
 			} else {
-				Event* _tmp18_ = NULL;
-				gboolean _tmp19_ = FALSE;
+				Event* _tmp18_;
+				gboolean _tmp19_;
 #line 1050 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp18_ = event;
 #line 1050 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp19_ = event_has_name (_tmp18_);
 #line 1050 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (_tmp19_) {
-#line 9718 "Commands.c"
-					Event* _tmp20_ = NULL;
-					gint _tmp21_ = 0;
-					gint _tmp22_ = 0;
+#line 9680 "Commands.c"
+					Event* _tmp20_;
+					gint _tmp21_;
+					gint _tmp22_;
 #line 1051 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp20_ = event;
 #line 1051 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9726,11 +9688,11 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 					_tmp22_ = named_evt_src_count;
 #line 1051 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (_tmp21_ > _tmp22_) {
-#line 9730 "Commands.c"
-						Event* _tmp23_ = NULL;
-						gint _tmp24_ = 0;
-						Event* _tmp25_ = NULL;
-						Event* _tmp26_ = NULL;
+#line 9692 "Commands.c"
+						Event* _tmp23_;
+						gint _tmp24_;
+						Event* _tmp25_;
+						Event* _tmp26_;
 #line 1052 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp23_ = event;
 #line 1052 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9745,18 +9707,18 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 						_g_object_unref0 (master_event);
 #line 1053 "/home/jens/Source/shotwell/src/Commands.vala"
 						master_event = _tmp26_;
-#line 9749 "Commands.c"
+#line 9711 "Commands.c"
 					}
 				} else {
-					gint _tmp27_ = 0;
+					gint _tmp27_;
 #line 1055 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp27_ = named_evt_src_count;
 #line 1055 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (_tmp27_ == 0) {
-#line 9757 "Commands.c"
-						Event* _tmp28_ = NULL;
-						gint _tmp29_ = 0;
-						gint _tmp30_ = 0;
+#line 9719 "Commands.c"
+						Event* _tmp28_;
+						gint _tmp29_;
+						gint _tmp30_;
 #line 1059 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp28_ = event;
 #line 1059 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9765,11 +9727,11 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 						_tmp30_ = unnamed_evt_src_count;
 #line 1059 "/home/jens/Source/shotwell/src/Commands.vala"
 						if (_tmp29_ > _tmp30_) {
-#line 9769 "Commands.c"
-							Event* _tmp31_ = NULL;
-							gint _tmp32_ = 0;
-							Event* _tmp33_ = NULL;
-							Event* _tmp34_ = NULL;
+#line 9731 "Commands.c"
+							Event* _tmp31_;
+							gint _tmp32_;
+							Event* _tmp33_;
+							Event* _tmp34_;
 #line 1060 "/home/jens/Source/shotwell/src/Commands.vala"
 							_tmp31_ = event;
 #line 1060 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9784,18 +9746,18 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 							_g_object_unref0 (master_event);
 #line 1061 "/home/jens/Source/shotwell/src/Commands.vala"
 							master_event = _tmp34_;
-#line 9788 "Commands.c"
+#line 9750 "Commands.c"
 						}
 					}
 				}
 			}
 			{
 				GeeIterator* _media_source_it = NULL;
-				Event* _tmp35_ = NULL;
-				GeeCollection* _tmp36_ = NULL;
-				GeeCollection* _tmp37_ = NULL;
-				GeeIterator* _tmp38_ = NULL;
-				GeeIterator* _tmp39_ = NULL;
+				Event* _tmp35_;
+				GeeCollection* _tmp36_;
+				GeeCollection* _tmp37_;
+				GeeIterator* _tmp38_;
+				GeeIterator* _tmp39_;
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp35_ = event;
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9812,16 +9774,16 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 				_media_source_it = _tmp39_;
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 9816 "Commands.c"
-					GeeIterator* _tmp40_ = NULL;
-					gboolean _tmp41_ = FALSE;
+#line 9778 "Commands.c"
+					GeeIterator* _tmp40_;
+					gboolean _tmp41_;
 					MediaSource* media_source = NULL;
-					GeeIterator* _tmp42_ = NULL;
-					gpointer _tmp43_ = NULL;
-					GeeArrayList* _tmp44_ = NULL;
-					MediaSource* _tmp45_ = NULL;
-					ThumbnailView* _tmp46_ = NULL;
-					ThumbnailView* _tmp47_ = NULL;
+					GeeIterator* _tmp42_;
+					gpointer _tmp43_;
+					GeeArrayList* _tmp44_;
+					MediaSource* _tmp45_;
+					ThumbnailView* _tmp46_;
+					ThumbnailView* _tmp47_;
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp40_ = _media_source_it;
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9830,7 +9792,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 					if (!_tmp41_) {
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 9834 "Commands.c"
+#line 9796 "Commands.c"
 					}
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp42_ = _media_source_it;
@@ -9852,21 +9814,21 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 					_g_object_unref0 (_tmp47_);
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (media_source);
-#line 9856 "Commands.c"
+#line 9818 "Commands.c"
 				}
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_media_source_it);
-#line 9860 "Commands.c"
+#line 9822 "Commands.c"
 			}
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (event);
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (view);
-#line 9866 "Commands.c"
+#line 9828 "Commands.c"
 		}
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_view_it);
-#line 9870 "Commands.c"
+#line 9832 "Commands.c"
 	}
 #line 1072 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp48_ = master_event;
@@ -9885,36 +9847,32 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 #line 1075 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp53_ = media_thumbs;
 #line 1075 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp54_ = _ ("Merging");
-#line 1075 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp55_ = _ ("Unmerging");
-#line 1075 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp56_ = move_photos_command_real_move_photos_command_new (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ITERABLE, GeeIterable), _tmp54_, _tmp55_, RESOURCES_MERGE_LABEL, "");
+	_tmp54_ = move_photos_command_real_move_photos_command_new (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ITERABLE, GeeIterable), _ ("Merging"), _ ("Unmerging"), RESOURCES_MERGE_LABEL, "");
 #line 1075 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command);
 #line 1075 "/home/jens/Source/shotwell/src/Commands.vala"
-	G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp56_;
+	G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp54_;
 #line 1024 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (media_thumbs);
 #line 1024 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (master_event);
 #line 1024 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 9904 "Commands.c"
+#line 9862 "Commands.c"
 }
 
 
 MergeEventsCommand* merge_events_command_new (GeeIterable* iter) {
 #line 1024 "/home/jens/Source/shotwell/src/Commands.vala"
 	return merge_events_command_construct (TYPE_MERGE_EVENTS_COMMAND, iter);
-#line 9911 "Commands.c"
+#line 9869 "Commands.c"
 }
 
 
 static void merge_events_command_class_init (MergeEventsCommandClass * klass) {
 #line 1023 "/home/jens/Source/shotwell/src/Commands.vala"
 	merge_events_command_parent_class = g_type_class_peek_parent (klass);
-#line 9918 "Commands.c"
+#line 9876 "Commands.c"
 }
 
 
@@ -9937,51 +9895,45 @@ GType merge_events_command_get_type (void) {
 static void _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 1092 "/home/jens/Source/shotwell/src/Commands.vala"
 	duplicate_multiple_photos_command_on_photo_destroyed ((DuplicateMultiplePhotosCommand*) self, source);
-#line 9941 "Commands.c"
+#line 9899 "Commands.c"
 }
 
 
 DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_construct (GType object_type, GeeIterable* iter) {
 	DuplicateMultiplePhotosCommand * self = NULL;
-	GeeIterable* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	LibraryPhotoSourceCollection* _tmp3_ = NULL;
+	GeeIterable* _tmp0_;
+	LibraryPhotoSourceCollection* _tmp1_;
 #line 1084 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
 #line 1085 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = iter;
 #line 1085 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = _ ("Duplicating photos");
-#line 1085 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp2_ = _ ("Removing duplicated photos");
-#line 1085 "/home/jens/Source/shotwell/src/Commands.vala"
-	self = (DuplicateMultiplePhotosCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, RESOURCES_DUPLICATE_PHOTO_LABEL, RESOURCES_DUPLICATE_PHOTO_TOOLTIP);
+	self = (DuplicateMultiplePhotosCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _ ("Duplicating photos"), _ ("Removing duplicated photos"), RESOURCES_DUPLICATE_PHOTO_LABEL, RESOURCES_DUPLICATE_PHOTO_TOOLTIP);
 #line 1088 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp3_ = library_photo_global;
+	_tmp1_ = library_photo_global;
 #line 1088 "/home/jens/Source/shotwell/src/Commands.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
 #line 1084 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 9967 "Commands.c"
+#line 9919 "Commands.c"
 }
 
 
 DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_new (GeeIterable* iter) {
 #line 1084 "/home/jens/Source/shotwell/src/Commands.vala"
 	return duplicate_multiple_photos_command_construct (TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, iter);
-#line 9974 "Commands.c"
+#line 9926 "Commands.c"
 }
 
 
 static void duplicate_multiple_photos_command_on_photo_destroyed (DuplicateMultiplePhotosCommand* self, DataSource* source) {
-	GeeHashMap* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	DataSource* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
+	GeeHashMap* _tmp0_;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp2_;
+	GeeCollection* _tmp3_;
+	DataSource* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
 #line 1095 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_DUPLICATE_MULTIPLE_PHOTOS_COMMAND (self));
 #line 1095 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10004,9 +9956,9 @@ static void duplicate_multiple_photos_command_on_photo_destroyed (DuplicateMulti
 	_g_object_unref0 (_tmp3_);
 #line 1097 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp6_) {
-#line 10008 "Commands.c"
-		CommandManager* _tmp7_ = NULL;
-		CommandManager* _tmp8_ = NULL;
+#line 9960 "Commands.c"
+		CommandManager* _tmp7_;
+		CommandManager* _tmp8_;
 #line 1098 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command));
 #line 1098 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10015,15 +9967,15 @@ static void duplicate_multiple_photos_command_on_photo_destroyed (DuplicateMulti
 		command_manager_reset (_tmp8_);
 #line 1098 "/home/jens/Source/shotwell/src/Commands.vala"
 		_command_manager_unref0 (_tmp8_);
-#line 10019 "Commands.c"
+#line 9971 "Commands.c"
 	}
 }
 
 
 static void duplicate_multiple_photos_command_real_execute (Command* base) {
 	DuplicateMultiplePhotosCommand * self;
-	GeeHashMap* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	GeeHashMap* _tmp0_;
+	gint _tmp1_;
 #line 1101 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, DuplicateMultiplePhotosCommand);
 #line 1102 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10038,30 +9990,27 @@ static void duplicate_multiple_photos_command_real_execute (Command* base) {
 	_tmp1_ = self->priv->failed;
 #line 1107 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_ > 0) {
-#line 10042 "Commands.c"
+#line 9994 "Commands.c"
 		gchar* error_string = NULL;
-		gint _tmp2_ = 0;
-		const gchar* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gchar* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+		gint _tmp2_;
+		gint _tmp3_;
+		gchar* _tmp4_;
+		const gchar* _tmp5_;
 #line 1108 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = self->priv->failed;
 #line 1108 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp3_ = ngettext ("Unable to duplicate one photo due to a file error", "Unable to duplicate %d photos due to file errors", (gulong) _tmp2_);
+		_tmp3_ = self->priv->failed;
 #line 1108 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp4_ = self->priv->failed;
+		_tmp4_ = g_strdup_printf (ngettext ("Unable to duplicate one photo due to a file error", "Unable to duplicate %d photos due to file errors", (gulong) _tmp2_), _tmp3_);
 #line 1108 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp5_ = g_strdup_printf (_tmp3_, _tmp4_);
-#line 1108 "/home/jens/Source/shotwell/src/Commands.vala"
-		error_string = _tmp5_;
+		error_string = _tmp4_;
 #line 1110 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp6_ = error_string;
+		_tmp5_ = error_string;
 #line 1110 "/home/jens/Source/shotwell/src/Commands.vala"
-		app_window_error_message (_tmp6_, NULL);
+		app_window_error_message (_tmp5_, NULL);
 #line 1107 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (error_string);
-#line 10065 "Commands.c"
+#line 10014 "Commands.c"
 	}
 }
 
@@ -10069,8 +10018,8 @@ static void duplicate_multiple_photos_command_real_execute (Command* base) {
 static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
 	DuplicateMultiplePhotosCommand * self;
 	LibraryPhoto* photo = NULL;
-	DataSource* _tmp0_ = NULL;
-	LibraryPhoto* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	LibraryPhoto* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 1114 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, DuplicateMultiplePhotosCommand);
@@ -10082,19 +10031,19 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
 #line 1115 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo = _tmp1_;
-#line 10086 "Commands.c"
+#line 10035 "Commands.c"
 	{
 		LibraryPhoto* dupe = NULL;
-		LibraryPhoto* _tmp2_ = NULL;
-		GeeHashMap* _tmp3_ = NULL;
+		LibraryPhoto* _tmp2_;
+		GeeHashMap* _tmp3_;
 #line 1118 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = library_photo_duplicate (photo, &_inner_error_);
 #line 1118 "/home/jens/Source/shotwell/src/Commands.vala"
 		dupe = _tmp2_;
 #line 1118 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10097 "Commands.c"
-			goto __catch457_g_error;
+#line 10046 "Commands.c"
+			goto __catch458_g_error;
 		}
 #line 1119 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->dupes;
@@ -10102,19 +10051,19 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo, dupe);
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (dupe);
-#line 10106 "Commands.c"
+#line 10055 "Commands.c"
 	}
-	goto __finally457;
-	__catch457_g_error:
+	goto __finally458;
+	__catch458_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
+		GFile* _tmp4_;
+		GFile* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		GError* _tmp8_;
+		const gchar* _tmp9_;
+		gint _tmp10_;
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
 		err = _inner_error_;
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10143,9 +10092,9 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 		self->priv->failed = _tmp10_ + 1;
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_error_free0 (err);
-#line 10147 "Commands.c"
+#line 10096 "Commands.c"
 	}
-	__finally457:
+	__finally458:
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10156,20 +10105,20 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 		g_clear_error (&_inner_error_);
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
 		return;
-#line 10160 "Commands.c"
+#line 10109 "Commands.c"
 	}
 #line 1114 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 10164 "Commands.c"
+#line 10113 "Commands.c"
 }
 
 
 static void duplicate_multiple_photos_command_real_undo (Command* base) {
 	DuplicateMultiplePhotosCommand * self;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	GeeHashMap* _tmp2_ = NULL;
-	LibraryPhotoSourceCollection* _tmp3_ = NULL;
+	LibraryPhotoSourceCollection* _tmp0_;
+	guint _tmp1_;
+	GeeHashMap* _tmp2_;
+	LibraryPhotoSourceCollection* _tmp3_;
 #line 1126 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, DuplicateMultiplePhotosCommand);
 #line 1128 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10190,23 +10139,23 @@ static void duplicate_multiple_photos_command_real_undo (Command* base) {
 	_tmp3_ = library_photo_global;
 #line 1137 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
-#line 10194 "Commands.c"
+#line 10143 "Commands.c"
 }
 
 
 static void duplicate_multiple_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) {
 	DuplicateMultiplePhotosCommand * self;
 	LibraryPhoto* photo = NULL;
-	DataSource* _tmp0_ = NULL;
-	LibraryPhoto* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	LibraryPhoto* _tmp1_;
 	Marker* marker = NULL;
-	LibraryPhotoSourceCollection* _tmp2_ = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	gpointer _tmp4_ = NULL;
-	LibraryPhoto* _tmp5_ = NULL;
-	Marker* _tmp6_ = NULL;
-	Marker* _tmp7_ = NULL;
-	LibraryPhotoSourceCollection* _tmp8_ = NULL;
+	LibraryPhotoSourceCollection* _tmp2_;
+	GeeHashMap* _tmp3_;
+	gpointer _tmp4_;
+	LibraryPhoto* _tmp5_;
+	Marker* _tmp6_;
+	Marker* _tmp7_;
+	LibraryPhotoSourceCollection* _tmp8_;
 #line 1140 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, DuplicateMultiplePhotosCommand);
 #line 1140 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10241,7 +10190,7 @@ static void duplicate_multiple_photos_command_real_undo_on_source (MultipleDataS
 	_g_object_unref0 (marker);
 #line 1140 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 10245 "Commands.c"
+#line 10194 "Commands.c"
 }
 
 
@@ -10251,21 +10200,21 @@ static void duplicate_multiple_photos_command_class_init (DuplicateMultiplePhoto
 #line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (DuplicateMultiplePhotosCommandPrivate));
 #line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) duplicate_multiple_photos_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) duplicate_multiple_photos_command_real_execute;
 #line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) duplicate_multiple_photos_command_real_execute_on_source;
+	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) duplicate_multiple_photos_command_real_execute_on_source;
 #line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) duplicate_multiple_photos_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) duplicate_multiple_photos_command_real_undo;
 #line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) duplicate_multiple_photos_command_real_undo_on_source;
+	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) duplicate_multiple_photos_command_real_undo_on_source;
 #line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = duplicate_multiple_photos_command_finalize;
-#line 10264 "Commands.c"
+#line 10213 "Commands.c"
 }
 
 
 static void duplicate_multiple_photos_command_instance_init (DuplicateMultiplePhotosCommand * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = DUPLICATE_MULTIPLE_PHOTOS_COMMAND_GET_PRIVATE (self);
 #line 1081 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10274,14 +10223,14 @@ static void duplicate_multiple_photos_command_instance_init (DuplicateMultiplePh
 	self->priv->dupes = _tmp0_;
 #line 1082 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->failed = 0;
-#line 10278 "Commands.c"
+#line 10227 "Commands.c"
 }
 
 
-static void duplicate_multiple_photos_command_finalize (GObject* obj) {
+static void duplicate_multiple_photos_command_finalize (GObject * obj) {
 	DuplicateMultiplePhotosCommand * self;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	LibraryPhotoSourceCollection* _tmp0_;
+	guint _tmp1_;
 #line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, DuplicateMultiplePhotosCommand);
 #line 1092 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10294,7 +10243,7 @@ static void duplicate_multiple_photos_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->dupes);
 #line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (duplicate_multiple_photos_command_parent_class)->finalize (obj);
-#line 10298 "Commands.c"
+#line 10247 "Commands.c"
 }
 
 
@@ -10312,12 +10261,12 @@ GType duplicate_multiple_photos_command_get_type (void) {
 
 SetRatingSingleCommand* set_rating_single_command_construct (GType object_type, DataSource* source, Rating rating) {
 	SetRatingSingleCommand * self = NULL;
-	DataSource* _tmp0_ = NULL;
-	Rating _tmp1_ = 0;
-	const gchar* _tmp2_ = NULL;
-	Rating _tmp3_ = 0;
-	DataSource* _tmp4_ = NULL;
-	Rating _tmp5_ = 0;
+	DataSource* _tmp0_;
+	Rating _tmp1_;
+	const gchar* _tmp2_;
+	Rating _tmp3_;
+	DataSource* _tmp4_;
+	Rating _tmp5_;
 #line 1154 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
 #line 1155 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10342,25 +10291,25 @@ SetRatingSingleCommand* set_rating_single_command_construct (GType object_type,
 	self->priv->last_rating = _tmp5_;
 #line 1154 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 10346 "Commands.c"
+#line 10295 "Commands.c"
 }
 
 
 SetRatingSingleCommand* set_rating_single_command_new (DataSource* source, Rating rating) {
 #line 1154 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_rating_single_command_construct (TYPE_SET_RATING_SINGLE_COMMAND, source, rating);
-#line 10353 "Commands.c"
+#line 10302 "Commands.c"
 }
 
 
 SetRatingSingleCommand* set_rating_single_command_construct_inc_dec (GType object_type, DataSource* source, gboolean is_incrementing) {
 	SetRatingSingleCommand * self = NULL;
 	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	DataSource* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	DataSource* _tmp4_ = NULL;
-	Rating _tmp5_ = 0;
+	gboolean _tmp1_;
+	DataSource* _tmp2_;
+	gboolean _tmp3_;
+	DataSource* _tmp4_;
+	Rating _tmp5_;
 #line 1162 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
 #line 1163 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10369,11 +10318,11 @@ SetRatingSingleCommand* set_rating_single_command_construct_inc_dec (GType objec
 	if (_tmp1_) {
 #line 1163 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = RESOURCES_INCREASE_RATING_LABEL;
-#line 10373 "Commands.c"
+#line 10322 "Commands.c"
 	} else {
 #line 1164 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = RESOURCES_DECREASE_RATING_LABEL;
-#line 10377 "Commands.c"
+#line 10326 "Commands.c"
 	}
 #line 1163 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp2_ = source;
@@ -10393,56 +10342,56 @@ SetRatingSingleCommand* set_rating_single_command_construct_inc_dec (GType objec
 	self->priv->last_rating = _tmp5_;
 #line 1162 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 10397 "Commands.c"
+#line 10346 "Commands.c"
 }
 
 
 SetRatingSingleCommand* set_rating_single_command_new_inc_dec (DataSource* source, gboolean is_incrementing) {
 #line 1162 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_rating_single_command_construct_inc_dec (TYPE_SET_RATING_SINGLE_COMMAND, source, is_incrementing);
-#line 10404 "Commands.c"
+#line 10353 "Commands.c"
 }
 
 
 static void set_rating_single_command_real_execute (Command* base) {
 	SetRatingSingleCommand * self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1171 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RATING_SINGLE_COMMAND, SetRatingSingleCommand);
 #line 1172 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = self->priv->set_direct;
 #line 1172 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 10417 "Commands.c"
-		DataSource* _tmp1_ = NULL;
-		Rating _tmp2_ = 0;
+#line 10366 "Commands.c"
+		DataSource* _tmp1_;
+		Rating _tmp2_;
 #line 1173 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source;
 #line 1173 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = self->priv->new_rating;
 #line 1173 "/home/jens/Source/shotwell/src/Commands.vala"
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), _tmp2_);
-#line 10426 "Commands.c"
+#line 10375 "Commands.c"
 	} else {
-		gboolean _tmp3_ = FALSE;
+		gboolean _tmp3_;
 #line 1175 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->incrementing;
 #line 1175 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp3_) {
-#line 10433 "Commands.c"
-			DataSource* _tmp4_ = NULL;
+#line 10382 "Commands.c"
+			DataSource* _tmp4_;
 #line 1176 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source;
 #line 1176 "/home/jens/Source/shotwell/src/Commands.vala"
 			media_source_increase_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 10439 "Commands.c"
+#line 10388 "Commands.c"
 		} else {
-			DataSource* _tmp5_ = NULL;
+			DataSource* _tmp5_;
 #line 1178 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source;
 #line 1178 "/home/jens/Source/shotwell/src/Commands.vala"
 			media_source_decrease_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 10446 "Commands.c"
+#line 10395 "Commands.c"
 		}
 	}
 }
@@ -10450,8 +10399,8 @@ static void set_rating_single_command_real_execute (Command* base) {
 
 static void set_rating_single_command_real_undo (Command* base) {
 	SetRatingSingleCommand * self;
-	DataSource* _tmp0_ = NULL;
-	Rating _tmp1_ = 0;
+	DataSource* _tmp0_;
+	Rating _tmp1_;
 #line 1182 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RATING_SINGLE_COMMAND, SetRatingSingleCommand);
 #line 1183 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10460,7 +10409,7 @@ static void set_rating_single_command_real_undo (Command* base) {
 	_tmp1_ = self->priv->last_rating;
 #line 1183 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 10464 "Commands.c"
+#line 10413 "Commands.c"
 }
 
 
@@ -10470,29 +10419,29 @@ static void set_rating_single_command_class_init (SetRatingSingleCommandClass *
 #line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (SetRatingSingleCommandPrivate));
 #line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) set_rating_single_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) set_rating_single_command_real_execute;
 #line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) set_rating_single_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) set_rating_single_command_real_undo;
 #line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = set_rating_single_command_finalize;
-#line 10479 "Commands.c"
+#line 10428 "Commands.c"
 }
 
 
 static void set_rating_single_command_instance_init (SetRatingSingleCommand * self) {
 #line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = SET_RATING_SINGLE_COMMAND_GET_PRIVATE (self);
-#line 10486 "Commands.c"
+#line 10435 "Commands.c"
 }
 
 
-static void set_rating_single_command_finalize (GObject* obj) {
+static void set_rating_single_command_finalize (GObject * obj) {
 	SetRatingSingleCommand * self;
 #line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_RATING_SINGLE_COMMAND, SetRatingSingleCommand);
 #line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (set_rating_single_command_parent_class)->finalize (obj);
-#line 10496 "Commands.c"
+#line 10445 "Commands.c"
 }
 
 
@@ -10510,15 +10459,14 @@ GType set_rating_single_command_get_type (void) {
 
 SetRatingCommand* set_rating_command_construct (GType object_type, GeeIterable* iter, Rating rating) {
 	SetRatingCommand * self = NULL;
-	GeeIterable* _tmp0_ = NULL;
-	Rating _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	Rating _tmp5_ = 0;
-	const gchar* _tmp6_ = NULL;
-	Rating _tmp7_ = 0;
-	GeeIterable* _tmp8_ = NULL;
+	GeeIterable* _tmp0_;
+	Rating _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	Rating _tmp4_;
+	const gchar* _tmp5_;
+	Rating _tmp6_;
+	GeeIterable* _tmp7_;
 #line 1194 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
 #line 1195 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10530,130 +10478,114 @@ SetRatingCommand* set_rating_command_construct (GType object_type, GeeIterable*
 #line 1195 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = _tmp2_;
 #line 1195 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp4_ = _ ("Restoring previous rating");
+	_tmp4_ = rating;
 #line 1195 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp5_ = rating;
+	_tmp5_ = resources_rating_label (_tmp4_);
 #line 1195 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp6_ = resources_rating_label (_tmp5_);
-#line 1195 "/home/jens/Source/shotwell/src/Commands.vala"
-	self = (SetRatingCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp3_, _tmp4_, _tmp6_, "");
+	self = (SetRatingCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp3_, _ ("Restoring previous rating"), _tmp5_, "");
 #line 1195 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (_tmp3_);
 #line 1197 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->set_direct = TRUE;
 #line 1198 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp7_ = rating;
+	_tmp6_ = rating;
 #line 1198 "/home/jens/Source/shotwell/src/Commands.vala"
-	self->priv->new_rating = _tmp7_;
+	self->priv->new_rating = _tmp6_;
 #line 1200 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp8_ = iter;
+	_tmp7_ = iter;
 #line 1200 "/home/jens/Source/shotwell/src/Commands.vala"
-	set_rating_command_save_source_states (self, _tmp8_);
+	set_rating_command_save_source_states (self, _tmp7_);
 #line 1194 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 10555 "Commands.c"
+#line 10501 "Commands.c"
 }
 
 
 SetRatingCommand* set_rating_command_new (GeeIterable* iter, Rating rating) {
 #line 1194 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_rating_command_construct (TYPE_SET_RATING_COMMAND, iter, rating);
-#line 10562 "Commands.c"
+#line 10508 "Commands.c"
 }
 
 
 SetRatingCommand* set_rating_command_construct_inc_dec (GType object_type, GeeIterable* iter, gboolean is_incrementing) {
 	SetRatingCommand * self = NULL;
 	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
+	const gchar* _tmp2_ = NULL;
+	gboolean _tmp3_;
 	const gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	const gchar* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
-	GeeIterable* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
-	GeeIterable* _tmp12_ = NULL;
+	gboolean _tmp5_;
+	GeeIterable* _tmp6_;
+	gboolean _tmp7_;
+	GeeIterable* _tmp8_;
 #line 1203 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
 #line 1205 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp1_ = is_incrementing;
 #line 1205 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_) {
-#line 10583 "Commands.c"
-		const gchar* _tmp2_ = NULL;
 #line 1205 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp2_ = _ ("Increasing ratings");
-#line 1205 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp0_ = _tmp2_;
-#line 10589 "Commands.c"
+		_tmp0_ = _ ("Increasing ratings");
+#line 10531 "Commands.c"
 	} else {
-		const gchar* _tmp3_ = NULL;
-#line 1205 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp3_ = _ ("Decreasing ratings");
 #line 1205 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp0_ = _tmp3_;
-#line 10596 "Commands.c"
+		_tmp0_ = _ ("Decreasing ratings");
+#line 10535 "Commands.c"
 	}
 #line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp5_ = is_incrementing;
-#line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
-	if (_tmp5_) {
-#line 10602 "Commands.c"
-		const gchar* _tmp6_ = NULL;
+	_tmp3_ = is_incrementing;
 #line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp6_ = _ ("Decreasing ratings");
+	if (_tmp3_) {
 #line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp4_ = _tmp6_;
-#line 10608 "Commands.c"
+		_tmp2_ = _ ("Decreasing ratings");
+#line 10543 "Commands.c"
 	} else {
-		const gchar* _tmp7_ = NULL;
-#line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp7_ = _ ("Increasing ratings");
 #line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp4_ = _tmp7_;
-#line 10615 "Commands.c"
+		_tmp2_ = _ ("Increasing ratings");
+#line 10547 "Commands.c"
 	}
 #line 1207 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp9_ = is_incrementing;
+	_tmp5_ = is_incrementing;
 #line 1207 "/home/jens/Source/shotwell/src/Commands.vala"
-	if (_tmp9_) {
+	if (_tmp5_) {
 #line 1207 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp8_ = RESOURCES_INCREASE_RATING_LABEL;
-#line 10623 "Commands.c"
+		_tmp4_ = RESOURCES_INCREASE_RATING_LABEL;
+#line 10555 "Commands.c"
 	} else {
 #line 1207 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp8_ = RESOURCES_DECREASE_RATING_LABEL;
-#line 10627 "Commands.c"
+		_tmp4_ = RESOURCES_DECREASE_RATING_LABEL;
+#line 10559 "Commands.c"
 	}
 #line 1204 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp10_ = iter;
+	_tmp6_ = iter;
 #line 1204 "/home/jens/Source/shotwell/src/Commands.vala"
-	self = (SetRatingCommand*) multiple_data_source_command_construct (object_type, _tmp10_, _tmp0_, _tmp4_, _tmp8_, "");
+	self = (SetRatingCommand*) multiple_data_source_command_construct (object_type, _tmp6_, _tmp0_, _tmp2_, _tmp4_, "");
 #line 1209 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->set_direct = FALSE;
 #line 1210 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp11_ = is_incrementing;
+	_tmp7_ = is_incrementing;
 #line 1210 "/home/jens/Source/shotwell/src/Commands.vala"
-	self->priv->incrementing = _tmp11_;
+	self->priv->incrementing = _tmp7_;
 #line 1212 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp12_ = iter;
+	_tmp8_ = iter;
 #line 1212 "/home/jens/Source/shotwell/src/Commands.vala"
-	set_rating_command_save_source_states (self, _tmp12_);
+	set_rating_command_save_source_states (self, _tmp8_);
 #line 1203 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 10645 "Commands.c"
+#line 10577 "Commands.c"
 }
 
 
 SetRatingCommand* set_rating_command_new_inc_dec (GeeIterable* iter, gboolean is_incrementing) {
 #line 1203 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_rating_command_construct_inc_dec (TYPE_SET_RATING_COMMAND, iter, is_incrementing);
-#line 10652 "Commands.c"
+#line 10584 "Commands.c"
 }
 
 
 static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIterable* iter) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 1215 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_SET_RATING_COMMAND (self));
 #line 1215 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10664,11 +10596,11 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt
 	_g_object_unref0 (self->priv->last_rating_map);
 #line 1216 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->last_rating_map = _tmp0_;
-#line 10668 "Commands.c"
+#line 10600 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
-		GeeIterable* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeIterable* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = iter;
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10677,19 +10609,19 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt
 		_view_it = _tmp2_;
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 10681 "Commands.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 10613 "Commands.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			DataView* view = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
 			DataSource* source = NULL;
-			DataView* _tmp7_ = NULL;
-			DataSource* _tmp8_ = NULL;
-			GeeHashMap* _tmp9_ = NULL;
-			DataSource* _tmp10_ = NULL;
-			DataSource* _tmp11_ = NULL;
-			Rating _tmp12_ = 0;
+			DataView* _tmp7_;
+			DataSource* _tmp8_;
+			GeeHashMap* _tmp9_;
+			DataSource* _tmp10_;
+			DataSource* _tmp11_;
+			Rating _tmp12_;
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp3_ = _view_it;
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10698,7 +10630,7 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt
 			if (!_tmp4_) {
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 10702 "Commands.c"
+#line 10634 "Commands.c"
 			}
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = _view_it;
@@ -10726,11 +10658,11 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt
 			_g_object_unref0 (source);
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (view);
-#line 10730 "Commands.c"
+#line 10662 "Commands.c"
 		}
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_view_it);
-#line 10734 "Commands.c"
+#line 10666 "Commands.c"
 	}
 }
 
@@ -10743,7 +10675,7 @@ static void set_rating_command_real_execute (Command* base) {
 	self->priv->action_count = 0;
 #line 1226 "/home/jens/Source/shotwell/src/Commands.vala"
 	COMMAND_CLASS (set_rating_command_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 10747 "Commands.c"
+#line 10679 "Commands.c"
 }
 
 
@@ -10755,13 +10687,13 @@ static void set_rating_command_real_undo (Command* base) {
 	self->priv->action_count = 0;
 #line 1231 "/home/jens/Source/shotwell/src/Commands.vala"
 	COMMAND_CLASS (set_rating_command_parent_class)->undo (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 10759 "Commands.c"
+#line 10691 "Commands.c"
 }
 
 
 static void set_rating_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
 	SetRatingCommand * self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1234 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RATING_COMMAND, SetRatingCommand);
 #line 1234 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10770,36 +10702,36 @@ static void set_rating_command_real_execute_on_source (MultipleDataSourceCommand
 	_tmp0_ = self->priv->set_direct;
 #line 1235 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 10774 "Commands.c"
-		DataSource* _tmp1_ = NULL;
-		Rating _tmp2_ = 0;
+#line 10706 "Commands.c"
+		DataSource* _tmp1_;
+		Rating _tmp2_;
 #line 1236 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = source;
 #line 1236 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = self->priv->new_rating;
 #line 1236 "/home/jens/Source/shotwell/src/Commands.vala"
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), _tmp2_);
-#line 10783 "Commands.c"
+#line 10715 "Commands.c"
 	} else {
-		gboolean _tmp3_ = FALSE;
+		gboolean _tmp3_;
 #line 1238 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->incrementing;
 #line 1238 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp3_) {
-#line 10790 "Commands.c"
-			DataSource* _tmp4_ = NULL;
+#line 10722 "Commands.c"
+			DataSource* _tmp4_;
 #line 1239 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = source;
 #line 1239 "/home/jens/Source/shotwell/src/Commands.vala"
 			media_source_increase_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 10796 "Commands.c"
+#line 10728 "Commands.c"
 		} else {
-			DataSource* _tmp5_ = NULL;
+			DataSource* _tmp5_;
 #line 1241 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = source;
 #line 1241 "/home/jens/Source/shotwell/src/Commands.vala"
 			media_source_decrease_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 10803 "Commands.c"
+#line 10735 "Commands.c"
 		}
 	}
 }
@@ -10807,10 +10739,10 @@ static void set_rating_command_real_execute_on_source (MultipleDataSourceCommand
 
 static void set_rating_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) {
 	SetRatingCommand * self;
-	DataSource* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	DataSource* _tmp2_ = NULL;
-	gpointer _tmp3_ = NULL;
+	DataSource* _tmp0_;
+	GeeHashMap* _tmp1_;
+	DataSource* _tmp2_;
+	gpointer _tmp3_;
 #line 1245 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RATING_COMMAND, SetRatingCommand);
 #line 1245 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10825,7 +10757,7 @@ static void set_rating_command_real_undo_on_source (MultipleDataSourceCommand* b
 	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_);
 #line 1246 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), (Rating) ((gintptr) _tmp3_));
-#line 10829 "Commands.c"
+#line 10761 "Commands.c"
 }
 
 
@@ -10835,16 +10767,16 @@ static void set_rating_command_class_init (SetRatingCommandClass * klass) {
 #line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (SetRatingCommandPrivate));
 #line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) set_rating_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) set_rating_command_real_execute;
 #line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) set_rating_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) set_rating_command_real_undo;
 #line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) set_rating_command_real_execute_on_source;
+	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) set_rating_command_real_execute_on_source;
 #line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) set_rating_command_real_undo_on_source;
+	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) set_rating_command_real_undo_on_source;
 #line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = set_rating_command_finalize;
-#line 10848 "Commands.c"
+#line 10780 "Commands.c"
 }
 
 
@@ -10853,11 +10785,11 @@ static void set_rating_command_instance_init (SetRatingCommand * self) {
 	self->priv = SET_RATING_COMMAND_GET_PRIVATE (self);
 #line 1192 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->action_count = 0;
-#line 10857 "Commands.c"
+#line 10789 "Commands.c"
 }
 
 
-static void set_rating_command_finalize (GObject* obj) {
+static void set_rating_command_finalize (GObject * obj) {
 	SetRatingCommand * self;
 #line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_RATING_COMMAND, SetRatingCommand);
@@ -10865,7 +10797,7 @@ static void set_rating_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->last_rating_map);
 #line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (set_rating_command_parent_class)->finalize (obj);
-#line 10869 "Commands.c"
+#line 10801 "Commands.c"
 }
 
 
@@ -10883,48 +10815,39 @@ GType set_rating_command_get_type (void) {
 
 SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type, GeeIterable* iter, RawDeveloper developer) {
 	SetRawDeveloperCommand * self = NULL;
-	GeeIterable* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	RawDeveloper _tmp4_ = 0;
-	GeeIterable* _tmp5_ = NULL;
+	GeeIterable* _tmp0_;
+	RawDeveloper _tmp1_;
+	GeeIterable* _tmp2_;
 #line 1255 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
 #line 1256 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = iter;
 #line 1256 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = _ ("Setting RAW developer");
-#line 1256 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp2_ = _ ("Restoring previous RAW developer");
-#line 1256 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp3_ = _ ("Set Developer");
-#line 1256 "/home/jens/Source/shotwell/src/Commands.vala"
-	self = (SetRawDeveloperCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, "");
+	self = (SetRawDeveloperCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _ ("Setting RAW developer"), _ ("Restoring previous RAW developer"), _ ("Set Developer"), "");
 #line 1258 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp4_ = developer;
+	_tmp1_ = developer;
 #line 1258 "/home/jens/Source/shotwell/src/Commands.vala"
-	self->priv->new_developer = _tmp4_;
+	self->priv->new_developer = _tmp1_;
 #line 1259 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp5_ = iter;
+	_tmp2_ = iter;
 #line 1259 "/home/jens/Source/shotwell/src/Commands.vala"
-	set_raw_developer_command_save_source_states (self, _tmp5_);
+	set_raw_developer_command_save_source_states (self, _tmp2_);
 #line 1255 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 10915 "Commands.c"
+#line 10838 "Commands.c"
 }
 
 
 SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter, RawDeveloper developer) {
 #line 1255 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_raw_developer_command_construct (TYPE_SET_RAW_DEVELOPER_COMMAND, iter, developer);
-#line 10922 "Commands.c"
+#line 10845 "Commands.c"
 }
 
 
 static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand* self, GeeIterable* iter) {
-	GeeHashMap* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeHashMap* _tmp1_;
 #line 1262 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_SET_RAW_DEVELOPER_COMMAND (self));
 #line 1262 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10941,11 +10864,11 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 	_g_object_unref0 (self->priv->last_transformation_map);
 #line 1264 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->last_transformation_map = _tmp1_;
-#line 10945 "Commands.c"
+#line 10868 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
-		GeeIterable* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeIterable* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = iter;
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10954,18 +10877,18 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 		_view_it = _tmp3_;
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 10958 "Commands.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 10881 "Commands.c"
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			DataView* view = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
 			Photo* photo = NULL;
-			DataView* _tmp8_ = NULL;
-			DataSource* _tmp9_ = NULL;
-			Photo* _tmp10_ = NULL;
-			Photo* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
+			DataView* _tmp8_;
+			DataSource* _tmp9_;
+			Photo* _tmp10_;
+			Photo* _tmp11_;
+			gboolean _tmp12_;
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _view_it;
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10974,7 +10897,7 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 			if (!_tmp5_) {
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 10978 "Commands.c"
+#line 10901 "Commands.c"
 			}
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp6_ = _view_it;
@@ -10992,7 +10915,7 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 			if (_tmp10_ == NULL) {
 #line 1267 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp9_);
-#line 10996 "Commands.c"
+#line 10919 "Commands.c"
 			}
 #line 1267 "/home/jens/Source/shotwell/src/Commands.vala"
 			photo = _tmp10_;
@@ -11002,16 +10925,16 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 			_tmp12_ = set_raw_developer_command_is_raw_photo (self, _tmp11_);
 #line 1268 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp12_) {
-#line 11006 "Commands.c"
-				GeeHashMap* _tmp13_ = NULL;
-				Photo* _tmp14_ = NULL;
-				Photo* _tmp15_ = NULL;
-				RawDeveloper _tmp16_ = 0;
-				GeeHashMap* _tmp17_ = NULL;
-				Photo* _tmp18_ = NULL;
-				Photo* _tmp19_ = NULL;
-				PhotoTransformationState* _tmp20_ = NULL;
-				PhotoTransformationState* _tmp21_ = NULL;
+#line 10929 "Commands.c"
+				GeeHashMap* _tmp13_;
+				Photo* _tmp14_;
+				Photo* _tmp15_;
+				RawDeveloper _tmp16_;
+				GeeHashMap* _tmp17_;
+				Photo* _tmp18_;
+				Photo* _tmp19_;
+				PhotoTransformationState* _tmp20_;
+				PhotoTransformationState* _tmp21_;
 #line 1269 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp13_ = self->priv->last_developer_map;
 #line 1269 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11036,17 +10959,17 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp18_, _tmp21_);
 #line 1270 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp21_);
-#line 11040 "Commands.c"
+#line 10963 "Commands.c"
 			}
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (photo);
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (view);
-#line 11046 "Commands.c"
+#line 10969 "Commands.c"
 		}
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_view_it);
-#line 11050 "Commands.c"
+#line 10973 "Commands.c"
 	}
 }
 
@@ -11057,7 +10980,7 @@ static void set_raw_developer_command_real_execute (Command* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand);
 #line 1276 "/home/jens/Source/shotwell/src/Commands.vala"
 	COMMAND_CLASS (set_raw_developer_command_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 11061 "Commands.c"
+#line 10984 "Commands.c"
 }
 
 
@@ -11067,17 +10990,17 @@ static void set_raw_developer_command_real_undo (Command* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand);
 #line 1280 "/home/jens/Source/shotwell/src/Commands.vala"
 	COMMAND_CLASS (set_raw_developer_command_parent_class)->undo (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 11071 "Commands.c"
+#line 10994 "Commands.c"
 }
 
 
 static void set_raw_developer_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
 	SetRawDeveloperCommand * self;
 	Photo* photo = NULL;
-	DataSource* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	DataSource* _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	gboolean _tmp3_;
 #line 1283 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand);
 #line 1283 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11094,62 +11017,62 @@ static void set_raw_developer_command_real_execute_on_source (MultipleDataSource
 	_tmp3_ = set_raw_developer_command_is_raw_photo (self, _tmp2_);
 #line 1285 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_) {
-#line 11098 "Commands.c"
+#line 11021 "Commands.c"
 		gboolean _tmp4_ = FALSE;
-		RawDeveloper _tmp5_ = 0;
+		RawDeveloper _tmp5_;
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = self->priv->new_developer;
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp5_ == RAW_DEVELOPER_CAMERA) {
-#line 11105 "Commands.c"
-			Photo* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 11028 "Commands.c"
+			Photo* _tmp6_;
+			gboolean _tmp7_;
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp6_ = photo;
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp7_ = photo_is_raw_developer_available (_tmp6_, RAW_DEVELOPER_CAMERA);
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = !_tmp7_;
-#line 11114 "Commands.c"
+#line 11037 "Commands.c"
 		} else {
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = FALSE;
-#line 11118 "Commands.c"
+#line 11041 "Commands.c"
 		}
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp4_) {
-#line 11122 "Commands.c"
-			Photo* _tmp8_ = NULL;
+#line 11045 "Commands.c"
+			Photo* _tmp8_;
 #line 1287 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = photo;
 #line 1287 "/home/jens/Source/shotwell/src/Commands.vala"
 			photo_set_raw_developer (_tmp8_, RAW_DEVELOPER_EMBEDDED);
-#line 11128 "Commands.c"
+#line 11051 "Commands.c"
 		} else {
-			Photo* _tmp9_ = NULL;
-			RawDeveloper _tmp10_ = 0;
+			Photo* _tmp9_;
+			RawDeveloper _tmp10_;
 #line 1289 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = photo;
 #line 1289 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp10_ = self->priv->new_developer;
 #line 1289 "/home/jens/Source/shotwell/src/Commands.vala"
 			photo_set_raw_developer (_tmp9_, _tmp10_);
-#line 11138 "Commands.c"
+#line 11061 "Commands.c"
 		}
 	}
 #line 1283 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 11143 "Commands.c"
+#line 11066 "Commands.c"
 }
 
 
 static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) {
 	SetRawDeveloperCommand * self;
 	Photo* photo = NULL;
-	DataSource* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	DataSource* _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	gboolean _tmp3_;
 #line 1293 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand);
 #line 1293 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11166,16 +11089,16 @@ static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCom
 	_tmp3_ = set_raw_developer_command_is_raw_photo (self, _tmp2_);
 #line 1295 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_) {
-#line 11170 "Commands.c"
-		Photo* _tmp4_ = NULL;
-		GeeHashMap* _tmp5_ = NULL;
-		Photo* _tmp6_ = NULL;
-		gpointer _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
-		GeeHashMap* _tmp9_ = NULL;
-		Photo* _tmp10_ = NULL;
-		gpointer _tmp11_ = NULL;
-		PhotoTransformationState* _tmp12_ = NULL;
+#line 11093 "Commands.c"
+		Photo* _tmp4_;
+		GeeHashMap* _tmp5_;
+		Photo* _tmp6_;
+		gpointer _tmp7_;
+		Photo* _tmp8_;
+		GeeHashMap* _tmp9_;
+		Photo* _tmp10_;
+		gpointer _tmp11_;
+		PhotoTransformationState* _tmp12_;
 #line 1296 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = photo;
 #line 1296 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11200,18 +11123,18 @@ static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCom
 		photo_load_transformation_state (_tmp8_, _tmp12_);
 #line 1297 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp12_);
-#line 11204 "Commands.c"
+#line 11127 "Commands.c"
 	}
 #line 1293 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 11208 "Commands.c"
+#line 11131 "Commands.c"
 }
 
 
 static gboolean set_raw_developer_command_is_raw_photo (SetRawDeveloperCommand* self, Photo* photo) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	Photo* _tmp1_ = NULL;
+	Photo* _tmp1_;
 #line 1301 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_SET_RAW_DEVELOPER_COMMAND (self), FALSE);
 #line 1301 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11220,26 +11143,26 @@ static gboolean set_raw_developer_command_is_raw_photo (SetRawDeveloperCommand*
 	_tmp1_ = photo;
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_ != NULL) {
-#line 11224 "Commands.c"
-		Photo* _tmp2_ = NULL;
-		PhotoFileFormat _tmp3_ = 0;
+#line 11147 "Commands.c"
+		Photo* _tmp2_;
+		PhotoFileFormat _tmp3_;
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = photo;
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = photo_get_master_file_format (_tmp2_);
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = _tmp3_ == PHOTO_FILE_FORMAT_RAW;
-#line 11233 "Commands.c"
+#line 11156 "Commands.c"
 	} else {
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = FALSE;
-#line 11237 "Commands.c"
+#line 11160 "Commands.c"
 	}
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
 	result = _tmp0_;
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 11243 "Commands.c"
+#line 11166 "Commands.c"
 }
 
 
@@ -11249,27 +11172,27 @@ static void set_raw_developer_command_class_init (SetRawDeveloperCommandClass *
 #line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (SetRawDeveloperCommandPrivate));
 #line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) set_raw_developer_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) set_raw_developer_command_real_execute;
 #line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) set_raw_developer_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) set_raw_developer_command_real_undo;
 #line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) set_raw_developer_command_real_execute_on_source;
+	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) set_raw_developer_command_real_execute_on_source;
 #line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) set_raw_developer_command_real_undo_on_source;
+	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) set_raw_developer_command_real_undo_on_source;
 #line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = set_raw_developer_command_finalize;
-#line 11262 "Commands.c"
+#line 11185 "Commands.c"
 }
 
 
 static void set_raw_developer_command_instance_init (SetRawDeveloperCommand * self) {
 #line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = SET_RAW_DEVELOPER_COMMAND_GET_PRIVATE (self);
-#line 11269 "Commands.c"
+#line 11192 "Commands.c"
 }
 
 
-static void set_raw_developer_command_finalize (GObject* obj) {
+static void set_raw_developer_command_finalize (GObject * obj) {
 	SetRawDeveloperCommand * self;
 #line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand);
@@ -11279,7 +11202,7 @@ static void set_raw_developer_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->last_transformation_map);
 #line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (set_raw_developer_command_parent_class)->finalize (obj);
-#line 11283 "Commands.c"
+#line 11206 "Commands.c"
 }
 
 
@@ -11297,11 +11220,11 @@ GType set_raw_developer_command_get_type (void) {
 
 AdjustDateTimePhotoCommand* adjust_date_time_photo_command_construct (GType object_type, Dateable* dateable, gint64 time_shift, gboolean modify_original) {
 	AdjustDateTimePhotoCommand * self = NULL;
-	Dateable* _tmp0_ = NULL;
-	Dateable* _tmp1_ = NULL;
-	Dateable* _tmp2_ = NULL;
-	gint64 _tmp3_ = 0LL;
-	gboolean _tmp4_ = FALSE;
+	Dateable* _tmp0_;
+	Dateable* _tmp1_;
+	Dateable* _tmp2_;
+	gint64 _tmp3_;
+	gboolean _tmp4_;
 #line 1312 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_DATEABLE (dateable), NULL);
 #line 1313 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11326,29 +11249,29 @@ AdjustDateTimePhotoCommand* adjust_date_time_photo_command_construct (GType obje
 	self->priv->modify_original = _tmp4_;
 #line 1312 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 11330 "Commands.c"
+#line 11253 "Commands.c"
 }
 
 
 AdjustDateTimePhotoCommand* adjust_date_time_photo_command_new (Dateable* dateable, gint64 time_shift, gboolean modify_original) {
 #line 1312 "/home/jens/Source/shotwell/src/Commands.vala"
 	return adjust_date_time_photo_command_construct (TYPE_ADJUST_DATE_TIME_PHOTO_COMMAND, dateable, time_shift, modify_original);
-#line 11337 "Commands.c"
+#line 11260 "Commands.c"
 }
 
 
 static void adjust_date_time_photo_command_real_execute (Command* base) {
 	AdjustDateTimePhotoCommand * self;
-	Dateable* _tmp0_ = NULL;
-	Dateable* _tmp1_ = NULL;
-	time_t _tmp2_ = 0;
-	gint64 _tmp3_ = 0LL;
-	Dateable* _tmp4_ = NULL;
-	Event* _tmp5_ = NULL;
+	Dateable* _tmp0_;
+	Dateable* _tmp1_;
+	time_t _tmp2_;
+	gint64 _tmp3_;
+	Dateable* _tmp4_;
+	Event* _tmp5_;
 	ViewCollection* all_events = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	Dateable* _tmp23_ = NULL;
-	ViewCollection* _tmp24_ = NULL;
+	ViewCollection* _tmp6_;
+	Dateable* _tmp23_;
+	ViewCollection* _tmp24_;
 #line 1320 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTO_COMMAND, AdjustDateTimePhotoCommand);
 #line 1321 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11373,14 +11296,14 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 	_tmp6_ = view_collection_new ("tmp");
 #line 1325 "/home/jens/Source/shotwell/src/Commands.vala"
 	all_events = _tmp6_;
-#line 11377 "Commands.c"
+#line 11300 "Commands.c"
 	{
 		GeeIterator* _dobj_it = NULL;
-		EventSourceCollection* _tmp7_ = NULL;
-		GeeCollection* _tmp8_ = NULL;
-		GeeCollection* _tmp9_ = NULL;
-		GeeIterator* _tmp10_ = NULL;
-		GeeIterator* _tmp11_ = NULL;
+		EventSourceCollection* _tmp7_;
+		GeeCollection* _tmp8_;
+		GeeCollection* _tmp9_;
+		GeeIterator* _tmp10_;
+		GeeIterator* _tmp11_;
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = event_global;
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11397,16 +11320,16 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 		_dobj_it = _tmp11_;
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 11401 "Commands.c"
-			GeeIterator* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
+#line 11324 "Commands.c"
+			GeeIterator* _tmp12_;
+			gboolean _tmp13_;
 			DataObject* dobj = NULL;
-			GeeIterator* _tmp14_ = NULL;
-			gpointer _tmp15_ = NULL;
+			GeeIterator* _tmp14_;
+			gpointer _tmp15_;
 			Event* event = NULL;
-			DataObject* _tmp16_ = NULL;
-			Event* _tmp17_ = NULL;
-			Event* _tmp18_ = NULL;
+			DataObject* _tmp16_;
+			Event* _tmp17_;
+			Event* _tmp18_;
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp12_ = _dobj_it;
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11415,7 +11338,7 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 			if (!_tmp13_) {
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 11419 "Commands.c"
+#line 11342 "Commands.c"
 			}
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp14_ = _dobj_it;
@@ -11433,11 +11356,11 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 			_tmp18_ = event;
 #line 1329 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp18_ != NULL) {
-#line 11437 "Commands.c"
-				ViewCollection* _tmp19_ = NULL;
-				Event* _tmp20_ = NULL;
-				EventView* _tmp21_ = NULL;
-				EventView* _tmp22_ = NULL;
+#line 11360 "Commands.c"
+				ViewCollection* _tmp19_;
+				Event* _tmp20_;
+				EventView* _tmp21_;
+				EventView* _tmp22_;
 #line 1330 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp19_ = all_events;
 #line 1330 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11450,17 +11373,17 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 				data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject));
 #line 1330 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp22_);
-#line 11454 "Commands.c"
+#line 11377 "Commands.c"
 			}
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (event);
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (dobj);
-#line 11460 "Commands.c"
+#line 11383 "Commands.c"
 		}
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_dobj_it);
-#line 11464 "Commands.c"
+#line 11387 "Commands.c"
 	}
 #line 1333 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp23_ = self->priv->dateable;
@@ -11470,18 +11393,18 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 	event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_MEDIA_SOURCE, MediaSource), _tmp24_, NULL);
 #line 1320 "/home/jens/Source/shotwell/src/Commands.vala"
 	_data_collection_unref0 (all_events);
-#line 11474 "Commands.c"
+#line 11397 "Commands.c"
 }
 
 
 static void adjust_date_time_photo_command_real_undo (Command* base) {
 	AdjustDateTimePhotoCommand * self;
-	Dateable* _tmp0_ = NULL;
-	Dateable* _tmp1_ = NULL;
-	time_t _tmp2_ = 0;
-	gint64 _tmp3_ = 0LL;
-	Dateable* _tmp4_ = NULL;
-	Event* _tmp5_ = NULL;
+	Dateable* _tmp0_;
+	Dateable* _tmp1_;
+	time_t _tmp2_;
+	gint64 _tmp3_;
+	Dateable* _tmp4_;
+	Event* _tmp5_;
 #line 1336 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTO_COMMAND, AdjustDateTimePhotoCommand);
 #line 1337 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11500,13 +11423,13 @@ static void adjust_date_time_photo_command_real_undo (Command* base) {
 	_tmp5_ = self->priv->prev_event;
 #line 1339 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource), _tmp5_);
-#line 11504 "Commands.c"
+#line 11427 "Commands.c"
 }
 
 
 static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand* self, Dateable* dateable, time_t exposure_time) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 1342 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_PHOTO_COMMAND (self));
@@ -11516,24 +11439,24 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 	_tmp1_ = self->priv->modify_original;
 #line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_) {
-#line 11520 "Commands.c"
-		Dateable* _tmp2_ = NULL;
+#line 11443 "Commands.c"
+		Dateable* _tmp2_;
 #line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = dateable;
 #line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_PHOTO);
-#line 11526 "Commands.c"
+#line 11449 "Commands.c"
 	} else {
 #line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = FALSE;
-#line 11530 "Commands.c"
+#line 11453 "Commands.c"
 	}
 #line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 11534 "Commands.c"
+#line 11457 "Commands.c"
 		{
-			Dateable* _tmp3_ = NULL;
-			time_t _tmp4_ = 0;
+			Dateable* _tmp3_;
+			time_t _tmp4_;
 #line 1345 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp3_ = dateable;
 #line 1345 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11542,28 +11465,25 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 			photo_set_exposure_time_persistent (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO, Photo), _tmp4_, &_inner_error_);
 #line 1345 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11546 "Commands.c"
-				goto __catch458_g_error;
+#line 11469 "Commands.c"
+				goto __catch459_g_error;
 			}
 		}
-		goto __finally458;
-		__catch458_g_error:
+		goto __finally459;
+		__catch459_g_error:
 		{
 			GError* err = NULL;
-			const gchar* _tmp5_ = NULL;
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
 			err = _inner_error_;
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
 			_inner_error_ = NULL;
 #line 1347 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp5_ = _ ("Original photo could not be adjusted.");
-#line 1347 "/home/jens/Source/shotwell/src/Commands.vala"
-			app_window_error_message (_tmp5_, NULL);
+			app_window_error_message (_ ("Original photo could not be adjusted."), NULL);
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_error_free0 (err);
-#line 11565 "Commands.c"
+#line 11485 "Commands.c"
 		}
-		__finally458:
+		__finally459:
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11572,18 +11492,18 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 			g_clear_error (&_inner_error_);
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
 			return;
-#line 11576 "Commands.c"
+#line 11496 "Commands.c"
 		}
 	} else {
-		Dateable* _tmp6_ = NULL;
-		time_t _tmp7_ = 0;
+		Dateable* _tmp5_;
+		time_t _tmp6_;
 #line 1350 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp6_ = dateable;
+		_tmp5_ = dateable;
 #line 1350 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp7_ = exposure_time;
+		_tmp6_ = exposure_time;
 #line 1350 "/home/jens/Source/shotwell/src/Commands.vala"
-		dateable_set_exposure_time (_tmp6_, _tmp7_);
-#line 11587 "Commands.c"
+		dateable_set_exposure_time (_tmp5_, _tmp6_);
+#line 11507 "Commands.c"
 	}
 }
 
@@ -11594,23 +11514,23 @@ static void adjust_date_time_photo_command_class_init (AdjustDateTimePhotoComman
 #line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (AdjustDateTimePhotoCommandPrivate));
 #line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) adjust_date_time_photo_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) adjust_date_time_photo_command_real_execute;
 #line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) adjust_date_time_photo_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) adjust_date_time_photo_command_real_undo;
 #line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = adjust_date_time_photo_command_finalize;
-#line 11603 "Commands.c"
+#line 11523 "Commands.c"
 }
 
 
 static void adjust_date_time_photo_command_instance_init (AdjustDateTimePhotoCommand * self) {
 #line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = ADJUST_DATE_TIME_PHOTO_COMMAND_GET_PRIVATE (self);
-#line 11610 "Commands.c"
+#line 11530 "Commands.c"
 }
 
 
-static void adjust_date_time_photo_command_finalize (GObject* obj) {
+static void adjust_date_time_photo_command_finalize (GObject * obj) {
 	AdjustDateTimePhotoCommand * self;
 #line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_DATE_TIME_PHOTO_COMMAND, AdjustDateTimePhotoCommand);
@@ -11620,7 +11540,7 @@ static void adjust_date_time_photo_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->prev_event);
 #line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (adjust_date_time_photo_command_parent_class)->finalize (obj);
-#line 11624 "Commands.c"
+#line 11544 "Commands.c"
 }
 
 
@@ -11644,217 +11564,211 @@ static time_t* _time_t_dup (time_t* self) {
 	memcpy (dup, self, sizeof (time_t));
 #line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
 	return dup;
-#line 11648 "Commands.c"
+#line 11568 "Commands.c"
 }
 
 
 static gpointer __time_t_dup0 (gpointer self) {
 #line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self ? _time_t_dup (self) : NULL;
-#line 11655 "Commands.c"
+#line 11575 "Commands.c"
 }
 
 
 AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType object_type, GeeIterable* iter, gint64 time_shift, gboolean keep_relativity, gboolean modify_originals) {
 	AdjustDateTimePhotosCommand * self = NULL;
-	GeeIterable* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gint64 _tmp3_ = 0LL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	GeeHashMap* _tmp6_ = NULL;
-	GeeHashMap* _tmp32_ = NULL;
+	GeeIterable* _tmp0_;
+	gint64 _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+	GeeHashMap* _tmp4_;
+	GeeHashMap* _tmp30_;
 #line 1366 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
 #line 1368 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = iter;
 #line 1368 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = _ ("Adjusting Date and Time");
-#line 1368 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp2_ = _ ("Undoing Date and Time Adjustment");
-#line 1368 "/home/jens/Source/shotwell/src/Commands.vala"
-	self = (AdjustDateTimePhotosCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, RESOURCES_ADJUST_DATE_TIME_LABEL, "");
+	self = (AdjustDateTimePhotosCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _ ("Adjusting Date and Time"), _ ("Undoing Date and Time Adjustment"), RESOURCES_ADJUST_DATE_TIME_LABEL, "");
 #line 1371 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp3_ = time_shift;
+	_tmp1_ = time_shift;
 #line 1371 "/home/jens/Source/shotwell/src/Commands.vala"
-	self->priv->time_shift = _tmp3_;
+	self->priv->time_shift = _tmp1_;
 #line 1372 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp4_ = keep_relativity;
+	_tmp2_ = keep_relativity;
 #line 1372 "/home/jens/Source/shotwell/src/Commands.vala"
-	self->priv->keep_relativity = _tmp4_;
+	self->priv->keep_relativity = _tmp2_;
 #line 1373 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp5_ = modify_originals;
+	_tmp3_ = modify_originals;
 #line 1373 "/home/jens/Source/shotwell/src/Commands.vala"
-	self->priv->modify_originals = _tmp5_;
+	self->priv->modify_originals = _tmp3_;
 #line 1377 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp6_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp4_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1377 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->prev_events);
 #line 1377 "/home/jens/Source/shotwell/src/Commands.vala"
-	self->priv->prev_events = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_MAP, GeeMap);
-#line 11697 "Commands.c"
+	self->priv->prev_events = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MAP, GeeMap);
+#line 11611 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
-		GeeIterable* _tmp7_ = NULL;
-		GeeIterator* _tmp8_ = NULL;
+		GeeIterable* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp7_ = iter;
+		_tmp5_ = iter;
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp8_ = gee_iterable_iterator (_tmp7_);
+		_tmp6_ = gee_iterable_iterator (_tmp5_);
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
-		_view_it = _tmp8_;
+		_view_it = _tmp6_;
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 11710 "Commands.c"
-			GeeIterator* _tmp9_ = NULL;
-			gboolean _tmp10_ = FALSE;
+#line 11624 "Commands.c"
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			DataView* view = NULL;
-			GeeIterator* _tmp11_ = NULL;
-			gpointer _tmp12_ = NULL;
-			GeeMap* _tmp13_ = NULL;
-			DataView* _tmp14_ = NULL;
-			DataSource* _tmp15_ = NULL;
-			Dateable* _tmp16_ = NULL;
-			Dateable* _tmp17_ = NULL;
-			DataView* _tmp18_ = NULL;
-			DataSource* _tmp19_ = NULL;
-			MediaSource* _tmp20_ = NULL;
-			MediaSource* _tmp21_ = NULL;
-			Event* _tmp22_ = NULL;
-			Event* _tmp23_ = NULL;
-			time_t* _tmp24_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
+			GeeMap* _tmp11_;
+			DataView* _tmp12_;
+			DataSource* _tmp13_;
+			Dateable* _tmp14_;
+			Dateable* _tmp15_;
+			DataView* _tmp16_;
+			DataSource* _tmp17_;
+			MediaSource* _tmp18_;
+			MediaSource* _tmp19_;
+			Event* _tmp20_;
+			Event* _tmp21_;
+			time_t* _tmp22_;
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp9_ = _view_it;
+			_tmp7_ = _view_it;
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp10_ = gee_iterator_next (_tmp9_);
+			_tmp8_ = gee_iterator_next (_tmp7_);
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
-			if (!_tmp10_) {
+			if (!_tmp8_) {
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 11736 "Commands.c"
+#line 11650 "Commands.c"
 			}
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp11_ = _view_it;
+			_tmp9_ = _view_it;
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp12_ = gee_iterator_get (_tmp11_);
+			_tmp10_ = gee_iterator_get (_tmp9_);
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
-			view = (DataView*) _tmp12_;
+			view = (DataView*) _tmp10_;
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp13_ = self->priv->prev_events;
+			_tmp11_ = self->priv->prev_events;
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp14_ = view;
+			_tmp12_ = view;
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp15_ = data_view_get_source (_tmp14_);
+			_tmp13_ = data_view_get_source (_tmp12_);
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_DATEABLE) ? ((Dateable*) _tmp15_) : NULL;
+			_tmp14_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_DATEABLE) ? ((Dateable*) _tmp13_) : NULL;
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-			if (_tmp16_ == NULL) {
+			if (_tmp14_ == NULL) {
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-				_g_object_unref0 (_tmp15_);
-#line 11756 "Commands.c"
+				_g_object_unref0 (_tmp13_);
+#line 11670 "Commands.c"
 			}
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp17_ = _tmp16_;
+			_tmp15_ = _tmp14_;
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp18_ = view;
+			_tmp16_ = view;
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp19_ = data_view_get_source (_tmp18_);
+			_tmp17_ = data_view_get_source (_tmp16_);
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp19_) : NULL;
+			_tmp18_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp17_) : NULL;
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-			if (_tmp20_ == NULL) {
+			if (_tmp18_ == NULL) {
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-				_g_object_unref0 (_tmp19_);
-#line 11770 "Commands.c"
+				_g_object_unref0 (_tmp17_);
+#line 11684 "Commands.c"
 			}
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp21_ = _tmp20_;
-#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp22_ = media_source_get_event (_tmp21_);
+			_tmp19_ = _tmp18_;
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp23_ = _tmp22_;
+			_tmp20_ = media_source_get_event (_tmp19_);
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-			gee_map_set (_tmp13_, _tmp17_, _tmp23_);
+			_tmp21_ = _tmp20_;
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-			_g_object_unref0 (_tmp23_);
+			gee_map_set (_tmp11_, _tmp15_, _tmp21_);
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_tmp21_);
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
-			_g_object_unref0 (_tmp17_);
+			_g_object_unref0 (_tmp19_);
+#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
+			_g_object_unref0 (_tmp15_);
 #line 1383 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp24_ = self->priv->new_time;
+			_tmp22_ = self->priv->new_time;
 #line 1383 "/home/jens/Source/shotwell/src/Commands.vala"
-			if (_tmp24_ == NULL) {
-#line 11790 "Commands.c"
-				DataView* _tmp25_ = NULL;
-				DataSource* _tmp26_ = NULL;
-				Dateable* _tmp27_ = NULL;
-				time_t _tmp28_ = 0;
-				gint64 _tmp29_ = 0LL;
-				time_t _tmp30_ = 0;
-				time_t* _tmp31_ = NULL;
+			if (_tmp22_ == NULL) {
+#line 11704 "Commands.c"
+				DataView* _tmp23_;
+				DataSource* _tmp24_;
+				Dateable* _tmp25_;
+				time_t _tmp26_;
+				gint64 _tmp27_;
+				time_t _tmp28_;
+				time_t* _tmp29_;
 #line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
-				_tmp25_ = view;
+				_tmp23_ = view;
 #line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
-				_tmp26_ = data_view_get_source (_tmp25_);
+				_tmp24_ = data_view_get_source (_tmp23_);
 #line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
-				_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATEABLE, Dateable);
+				_tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATEABLE, Dateable);
 #line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
-				_tmp28_ = dateable_get_exposure_time (_tmp27_);
+				_tmp26_ = dateable_get_exposure_time (_tmp25_);
 #line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
-				_tmp29_ = time_shift;
+				_tmp27_ = time_shift;
 #line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
-				_tmp30_ = _tmp28_ + ((time_t) _tmp29_);
+				_tmp28_ = _tmp26_ + ((time_t) _tmp27_);
 #line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
-				_tmp31_ = __time_t_dup0 (&_tmp30_);
+				_tmp29_ = __time_t_dup0 (&_tmp28_);
 #line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_free0 (self->priv->new_time);
 #line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
-				self->priv->new_time = _tmp31_;
+				self->priv->new_time = _tmp29_;
 #line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
-				_g_object_unref0 (_tmp27_);
+				_g_object_unref0 (_tmp25_);
 #line 1386 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (view);
 #line 1386 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 11822 "Commands.c"
+#line 11736 "Commands.c"
 			}
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (view);
-#line 11826 "Commands.c"
+#line 11740 "Commands.c"
 		}
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_view_it);
-#line 11830 "Commands.c"
+#line 11744 "Commands.c"
 	}
 #line 1390 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp32_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INVALID, (GBoxedCopyFunc) _time_t_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp30_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INVALID, (GBoxedCopyFunc) _time_t_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1390 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->old_times);
 #line 1390 "/home/jens/Source/shotwell/src/Commands.vala"
-	self->priv->old_times = _tmp32_;
+	self->priv->old_times = _tmp30_;
 #line 1366 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 11840 "Commands.c"
+#line 11754 "Commands.c"
 }
 
 
 AdjustDateTimePhotosCommand* adjust_date_time_photos_command_new (GeeIterable* iter, gint64 time_shift, gboolean keep_relativity, gboolean modify_originals) {
 #line 1366 "/home/jens/Source/shotwell/src/Commands.vala"
 	return adjust_date_time_photos_command_construct (TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, iter, time_shift, keep_relativity, modify_originals);
-#line 11847 "Commands.c"
+#line 11761 "Commands.c"
 }
 
 
 static void adjust_date_time_photos_command_real_execute (Command* base) {
 	AdjustDateTimePhotosCommand * self;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	ViewCollection* all_events = NULL;
-	ViewCollection* _tmp10_ = NULL;
+	ViewCollection* _tmp8_;
 #line 1393 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommand);
 #line 1394 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11873,13 +11787,11 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 	_tmp3_ = _tmp2_;
 #line 1397 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ > 0) {
-#line 11877 "Commands.c"
-		GeeArrayList* _tmp4_ = NULL;
-		GeeArrayList* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-		const gchar* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
+#line 11791 "Commands.c"
+		GeeArrayList* _tmp4_;
+		GeeArrayList* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 #line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = self->priv->error_list;
 #line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11889,183 +11801,179 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 #line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = _tmp6_;
 #line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp8_ = ngettext ("One original photo could not be adjusted.", "The following original photos could not be adjusted.", (gulong) _tmp7_);
-#line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp9_ = _ ("Time Adjustment Error");
-#line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
-		multiple_object_error_dialog (_tmp4_, _tmp8_, _tmp9_);
-#line 11898 "Commands.c"
+		multiple_object_error_dialog (_tmp4_, ngettext ("One original photo could not be adjusted.", "The following original photos could not be adjusted.", (gulong) _tmp7_), _ ("Time Adjustment Error"));
+#line 11806 "Commands.c"
 	}
 #line 1404 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp10_ = view_collection_new ("tmp");
+	_tmp8_ = view_collection_new ("tmp");
 #line 1404 "/home/jens/Source/shotwell/src/Commands.vala"
-	all_events = _tmp10_;
-#line 11904 "Commands.c"
+	all_events = _tmp8_;
+#line 11812 "Commands.c"
 	{
 		GeeIterator* _d_it = NULL;
-		GeeMap* _tmp11_ = NULL;
-		GeeSet* _tmp12_ = NULL;
-		GeeSet* _tmp13_ = NULL;
-		GeeSet* _tmp14_ = NULL;
-		GeeIterator* _tmp15_ = NULL;
-		GeeIterator* _tmp16_ = NULL;
+		GeeMap* _tmp9_;
+		GeeSet* _tmp10_;
+		GeeSet* _tmp11_;
+		GeeSet* _tmp12_;
+		GeeIterator* _tmp13_;
+		GeeIterator* _tmp14_;
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp11_ = self->priv->prev_events;
+		_tmp9_ = self->priv->prev_events;
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp12_ = gee_map_get_keys (_tmp11_);
+		_tmp10_ = gee_map_get_keys (_tmp9_);
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp13_ = _tmp12_;
+		_tmp11_ = _tmp10_;
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp14_ = _tmp13_;
+		_tmp12_ = _tmp11_;
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp16_ = _tmp15_;
+		_tmp14_ = _tmp13_;
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
-		_g_object_unref0 (_tmp14_);
+		_g_object_unref0 (_tmp12_);
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
-		_d_it = _tmp16_;
+		_d_it = _tmp14_;
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 11931 "Commands.c"
-			GeeIterator* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
+#line 11839 "Commands.c"
+			GeeIterator* _tmp15_;
+			gboolean _tmp16_;
 			Dateable* d = NULL;
-			GeeIterator* _tmp19_ = NULL;
-			gpointer _tmp20_ = NULL;
-			Dateable* _tmp37_ = NULL;
-			ViewCollection* _tmp38_ = NULL;
+			GeeIterator* _tmp17_;
+			gpointer _tmp18_;
+			Dateable* _tmp35_;
+			ViewCollection* _tmp36_;
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp17_ = _d_it;
+			_tmp15_ = _d_it;
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp18_ = gee_iterator_next (_tmp17_);
+			_tmp16_ = gee_iterator_next (_tmp15_);
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
-			if (!_tmp18_) {
+			if (!_tmp16_) {
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 11947 "Commands.c"
+#line 11855 "Commands.c"
 			}
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp19_ = _d_it;
+			_tmp17_ = _d_it;
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp20_ = gee_iterator_get (_tmp19_);
+			_tmp18_ = gee_iterator_get (_tmp17_);
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
-			d = (Dateable*) _tmp20_;
-#line 11955 "Commands.c"
+			d = (Dateable*) _tmp18_;
+#line 11863 "Commands.c"
 			{
 				GeeIterator* _dobj_it = NULL;
-				EventSourceCollection* _tmp21_ = NULL;
-				GeeCollection* _tmp22_ = NULL;
-				GeeCollection* _tmp23_ = NULL;
-				GeeIterator* _tmp24_ = NULL;
-				GeeIterator* _tmp25_ = NULL;
+				EventSourceCollection* _tmp19_;
+				GeeCollection* _tmp20_;
+				GeeCollection* _tmp21_;
+				GeeIterator* _tmp22_;
+				GeeIterator* _tmp23_;
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
-				_tmp21_ = event_global;
+				_tmp19_ = event_global;
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
-				_tmp22_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection));
+				_tmp20_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_COLLECTION, DataCollection));
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
-				_tmp23_ = _tmp22_;
+				_tmp21_ = _tmp20_;
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
-				_tmp24_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable));
+				_tmp22_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
-				_tmp25_ = _tmp24_;
+				_tmp23_ = _tmp22_;
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
-				_g_object_unref0 (_tmp23_);
+				_g_object_unref0 (_tmp21_);
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
-				_dobj_it = _tmp25_;
+				_dobj_it = _tmp23_;
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 11979 "Commands.c"
-					GeeIterator* _tmp26_ = NULL;
-					gboolean _tmp27_ = FALSE;
+#line 11887 "Commands.c"
+					GeeIterator* _tmp24_;
+					gboolean _tmp25_;
 					DataObject* dobj = NULL;
-					GeeIterator* _tmp28_ = NULL;
-					gpointer _tmp29_ = NULL;
+					GeeIterator* _tmp26_;
+					gpointer _tmp27_;
 					Event* event = NULL;
-					DataObject* _tmp30_ = NULL;
-					Event* _tmp31_ = NULL;
-					Event* _tmp32_ = NULL;
+					DataObject* _tmp28_;
+					Event* _tmp29_;
+					Event* _tmp30_;
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
-					_tmp26_ = _dobj_it;
+					_tmp24_ = _dobj_it;
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
-					_tmp27_ = gee_iterator_next (_tmp26_);
+					_tmp25_ = gee_iterator_next (_tmp24_);
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
-					if (!_tmp27_) {
+					if (!_tmp25_) {
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 11997 "Commands.c"
+#line 11905 "Commands.c"
 					}
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
-					_tmp28_ = _dobj_it;
+					_tmp26_ = _dobj_it;
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
-					_tmp29_ = gee_iterator_get (_tmp28_);
+					_tmp27_ = gee_iterator_get (_tmp26_);
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
-					dobj = (DataObject*) _tmp29_;
+					dobj = (DataObject*) _tmp27_;
 #line 1408 "/home/jens/Source/shotwell/src/Commands.vala"
-					_tmp30_ = dobj;
+					_tmp28_ = dobj;
 #line 1408 "/home/jens/Source/shotwell/src/Commands.vala"
-					_tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_EVENT) ? ((Event*) _tmp30_) : NULL);
+					_tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, TYPE_EVENT) ? ((Event*) _tmp28_) : NULL);
 #line 1408 "/home/jens/Source/shotwell/src/Commands.vala"
-					event = _tmp31_;
+					event = _tmp29_;
 #line 1409 "/home/jens/Source/shotwell/src/Commands.vala"
-					_tmp32_ = event;
+					_tmp30_ = event;
 #line 1409 "/home/jens/Source/shotwell/src/Commands.vala"
-					if (_tmp32_ != NULL) {
-#line 12015 "Commands.c"
-						ViewCollection* _tmp33_ = NULL;
-						Event* _tmp34_ = NULL;
-						EventView* _tmp35_ = NULL;
-						EventView* _tmp36_ = NULL;
+					if (_tmp30_ != NULL) {
+#line 11923 "Commands.c"
+						ViewCollection* _tmp31_;
+						Event* _tmp32_;
+						EventView* _tmp33_;
+						EventView* _tmp34_;
 #line 1410 "/home/jens/Source/shotwell/src/Commands.vala"
-						_tmp33_ = all_events;
+						_tmp31_ = all_events;
 #line 1410 "/home/jens/Source/shotwell/src/Commands.vala"
-						_tmp34_ = event;
+						_tmp32_ = event;
 #line 1410 "/home/jens/Source/shotwell/src/Commands.vala"
-						_tmp35_ = event_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_EVENT_SOURCE, EventSource));
+						_tmp33_ = event_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_EVENT_SOURCE, EventSource));
 #line 1410 "/home/jens/Source/shotwell/src/Commands.vala"
-						_tmp36_ = _tmp35_;
+						_tmp34_ = _tmp33_;
 #line 1410 "/home/jens/Source/shotwell/src/Commands.vala"
-						data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_OBJECT, DataObject));
+						data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_DATA_OBJECT, DataObject));
 #line 1410 "/home/jens/Source/shotwell/src/Commands.vala"
-						_g_object_unref0 (_tmp36_);
-#line 12032 "Commands.c"
+						_g_object_unref0 (_tmp34_);
+#line 11940 "Commands.c"
 					}
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (event);
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (dobj);
-#line 12038 "Commands.c"
+#line 11946 "Commands.c"
 				}
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_dobj_it);
-#line 12042 "Commands.c"
+#line 11950 "Commands.c"
 			}
 #line 1413 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp37_ = d;
+			_tmp35_ = d;
 #line 1413 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp38_ = all_events;
+			_tmp36_ = all_events;
 #line 1413 "/home/jens/Source/shotwell/src/Commands.vala"
-			event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_MEDIA_SOURCE, MediaSource), _tmp38_, NULL);
+			event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE, MediaSource), _tmp36_, NULL);
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (d);
-#line 12052 "Commands.c"
+#line 11960 "Commands.c"
 		}
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_d_it);
-#line 12056 "Commands.c"
+#line 11964 "Commands.c"
 	}
 #line 1393 "/home/jens/Source/shotwell/src/Commands.vala"
 	_data_collection_unref0 (all_events);
-#line 12060 "Commands.c"
+#line 11968 "Commands.c"
 }
 
 
 static void adjust_date_time_photos_command_real_undo (Command* base) {
 	AdjustDateTimePhotosCommand * self;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 1417 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommand);
 #line 1418 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12084,13 +11992,11 @@ static void adjust_date_time_photos_command_real_undo (Command* base) {
 	_tmp3_ = _tmp2_;
 #line 1421 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ > 0) {
-#line 12088 "Commands.c"
-		GeeArrayList* _tmp4_ = NULL;
-		GeeArrayList* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-		const gchar* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
+#line 11996 "Commands.c"
+		GeeArrayList* _tmp4_;
+		GeeArrayList* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 #line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = self->priv->error_list;
 #line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12100,19 +12006,15 @@ static void adjust_date_time_photos_command_real_undo (Command* base) {
 #line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = _tmp6_;
 #line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp8_ = ngettext ("Time adjustments could not be undone on the following photo file.", "Time adjustments could not be undone on the following photo files.", (gulong) _tmp7_);
-#line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp9_ = _ ("Time Adjustment Error");
-#line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
-		multiple_object_error_dialog (_tmp4_, _tmp8_, _tmp9_);
-#line 12109 "Commands.c"
+		multiple_object_error_dialog (_tmp4_, ngettext ("Time adjustments could not be undone on the following photo file.", "Time adjustments could not be undone on the following photo files.", (gulong) _tmp7_), _ ("Time Adjustment Error"));
+#line 12011 "Commands.c"
 	}
 }
 
 
 static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosCommand* self, Dateable* dateable, time_t exposure_time) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 1429 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_PHOTOS_COMMAND (self));
@@ -12122,24 +12024,24 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 	_tmp1_ = self->priv->modify_originals;
 #line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_) {
-#line 12126 "Commands.c"
-		Dateable* _tmp2_ = NULL;
+#line 12028 "Commands.c"
+		Dateable* _tmp2_;
 #line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = dateable;
 #line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_PHOTO);
-#line 12132 "Commands.c"
+#line 12034 "Commands.c"
 	} else {
 #line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = FALSE;
-#line 12136 "Commands.c"
+#line 12038 "Commands.c"
 	}
 #line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 12140 "Commands.c"
+#line 12042 "Commands.c"
 		{
-			Dateable* _tmp3_ = NULL;
-			time_t _tmp4_ = 0;
+			Dateable* _tmp3_;
+			time_t _tmp4_;
 #line 1435 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp3_ = dateable;
 #line 1435 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12148,16 +12050,16 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 			photo_set_exposure_time_persistent (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO, Photo), _tmp4_, &_inner_error_);
 #line 1435 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12152 "Commands.c"
-				goto __catch459_g_error;
+#line 12054 "Commands.c"
+				goto __catch460_g_error;
 			}
 		}
-		goto __finally459;
-		__catch459_g_error:
+		goto __finally460;
+		__catch460_g_error:
 		{
 			GError* err = NULL;
-			GeeArrayList* _tmp5_ = NULL;
-			Dateable* _tmp6_ = NULL;
+			GeeArrayList* _tmp5_;
+			Dateable* _tmp6_;
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
 			err = _inner_error_;
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12170,9 +12072,9 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp6_);
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_error_free0 (err);
-#line 12174 "Commands.c"
+#line 12076 "Commands.c"
 		}
-		__finally459:
+		__finally460:
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12181,18 +12083,18 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 			g_clear_error (&_inner_error_);
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
 			return;
-#line 12185 "Commands.c"
+#line 12087 "Commands.c"
 		}
 	} else {
-		Dateable* _tmp7_ = NULL;
-		time_t _tmp8_ = 0;
+		Dateable* _tmp7_;
+		time_t _tmp8_;
 #line 1442 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = dateable;
 #line 1442 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp8_ = exposure_time;
 #line 1442 "/home/jens/Source/shotwell/src/Commands.vala"
 		dateable_set_exposure_time (_tmp7_, _tmp8_);
-#line 12196 "Commands.c"
+#line 12098 "Commands.c"
 	}
 }
 
@@ -12200,14 +12102,14 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 static void adjust_date_time_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
 	AdjustDateTimePhotosCommand * self;
 	Dateable* dateable = NULL;
-	DataSource* _tmp0_ = NULL;
-	Dateable* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	Dateable* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp3_;
 	ViewCollection* all_events = NULL;
-	ViewCollection* _tmp16_ = NULL;
-	Dateable* _tmp33_ = NULL;
-	ViewCollection* _tmp34_ = NULL;
+	ViewCollection* _tmp16_;
+	Dateable* _tmp33_;
+	ViewCollection* _tmp34_;
 #line 1446 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommand);
 #line 1446 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12222,28 +12124,28 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 	_tmp3_ = self->priv->keep_relativity;
 #line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_) {
-#line 12226 "Commands.c"
-		Dateable* _tmp4_ = NULL;
-		time_t _tmp5_ = 0;
+#line 12128 "Commands.c"
+		Dateable* _tmp4_;
+		time_t _tmp5_;
 #line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = dateable;
 #line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = dateable_get_exposure_time (_tmp4_);
 #line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp5_ != ((time_t) 0);
-#line 12235 "Commands.c"
+#line 12137 "Commands.c"
 	} else {
 #line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = FALSE;
-#line 12239 "Commands.c"
+#line 12141 "Commands.c"
 	}
 #line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_) {
-#line 12243 "Commands.c"
-		Dateable* _tmp6_ = NULL;
-		Dateable* _tmp7_ = NULL;
-		time_t _tmp8_ = 0;
-		gint64 _tmp9_ = 0LL;
+#line 12145 "Commands.c"
+		Dateable* _tmp6_;
+		Dateable* _tmp7_;
+		time_t _tmp8_;
+		gint64 _tmp9_;
 #line 1450 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp6_ = dateable;
 #line 1450 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12254,14 +12156,14 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 		_tmp9_ = self->priv->time_shift;
 #line 1450 "/home/jens/Source/shotwell/src/Commands.vala"
 		adjust_date_time_photos_command_set_time (self, _tmp6_, _tmp8_ + ((time_t) _tmp9_));
-#line 12258 "Commands.c"
+#line 12160 "Commands.c"
 	} else {
-		GeeHashMap* _tmp10_ = NULL;
-		Dateable* _tmp11_ = NULL;
-		Dateable* _tmp12_ = NULL;
-		time_t _tmp13_ = 0;
-		Dateable* _tmp14_ = NULL;
-		time_t* _tmp15_ = NULL;
+		GeeHashMap* _tmp10_;
+		Dateable* _tmp11_;
+		Dateable* _tmp12_;
+		time_t _tmp13_;
+		Dateable* _tmp14_;
+		time_t* _tmp15_;
 #line 1452 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp10_ = self->priv->old_times;
 #line 1452 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12278,20 +12180,20 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 		_tmp15_ = self->priv->new_time;
 #line 1453 "/home/jens/Source/shotwell/src/Commands.vala"
 		adjust_date_time_photos_command_set_time (self, _tmp14_, *_tmp15_);
-#line 12282 "Commands.c"
+#line 12184 "Commands.c"
 	}
 #line 1456 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp16_ = view_collection_new ("tmp");
 #line 1456 "/home/jens/Source/shotwell/src/Commands.vala"
 	all_events = _tmp16_;
-#line 12288 "Commands.c"
+#line 12190 "Commands.c"
 	{
 		GeeIterator* _dobj_it = NULL;
-		EventSourceCollection* _tmp17_ = NULL;
-		GeeCollection* _tmp18_ = NULL;
-		GeeCollection* _tmp19_ = NULL;
-		GeeIterator* _tmp20_ = NULL;
-		GeeIterator* _tmp21_ = NULL;
+		EventSourceCollection* _tmp17_;
+		GeeCollection* _tmp18_;
+		GeeCollection* _tmp19_;
+		GeeIterator* _tmp20_;
+		GeeIterator* _tmp21_;
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp17_ = event_global;
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12308,16 +12210,16 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 		_dobj_it = _tmp21_;
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 12312 "Commands.c"
-			GeeIterator* _tmp22_ = NULL;
-			gboolean _tmp23_ = FALSE;
+#line 12214 "Commands.c"
+			GeeIterator* _tmp22_;
+			gboolean _tmp23_;
 			DataObject* dobj = NULL;
-			GeeIterator* _tmp24_ = NULL;
-			gpointer _tmp25_ = NULL;
+			GeeIterator* _tmp24_;
+			gpointer _tmp25_;
 			Event* event = NULL;
-			DataObject* _tmp26_ = NULL;
-			Event* _tmp27_ = NULL;
-			Event* _tmp28_ = NULL;
+			DataObject* _tmp26_;
+			Event* _tmp27_;
+			Event* _tmp28_;
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp22_ = _dobj_it;
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12326,7 +12228,7 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 			if (!_tmp23_) {
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 12330 "Commands.c"
+#line 12232 "Commands.c"
 			}
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp24_ = _dobj_it;
@@ -12344,11 +12246,11 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 			_tmp28_ = event;
 #line 1460 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp28_ != NULL) {
-#line 12348 "Commands.c"
-				ViewCollection* _tmp29_ = NULL;
-				Event* _tmp30_ = NULL;
-				EventView* _tmp31_ = NULL;
-				EventView* _tmp32_ = NULL;
+#line 12250 "Commands.c"
+				ViewCollection* _tmp29_;
+				Event* _tmp30_;
+				EventView* _tmp31_;
+				EventView* _tmp32_;
 #line 1461 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp29_ = all_events;
 #line 1461 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12361,17 +12263,17 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 				data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject));
 #line 1461 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp32_);
-#line 12365 "Commands.c"
+#line 12267 "Commands.c"
 			}
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (event);
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (dobj);
-#line 12371 "Commands.c"
+#line 12273 "Commands.c"
 		}
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_dobj_it);
-#line 12375 "Commands.c"
+#line 12277 "Commands.c"
 	}
 #line 1464 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp33_ = dateable;
@@ -12383,23 +12285,23 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 	_data_collection_unref0 (all_events);
 #line 1446 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (dateable);
-#line 12387 "Commands.c"
+#line 12289 "Commands.c"
 }
 
 
 static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) {
 	AdjustDateTimePhotosCommand * self;
 	Dateable* photo = NULL;
-	DataSource* _tmp0_ = NULL;
-	Dateable* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
-	Dateable* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	DataSource* _tmp16_ = NULL;
-	GeeMap* _tmp17_ = NULL;
-	DataSource* _tmp18_ = NULL;
-	gpointer _tmp19_ = NULL;
-	Event* _tmp20_ = NULL;
+	DataSource* _tmp0_;
+	Dateable* _tmp1_;
+	GeeHashMap* _tmp2_;
+	Dateable* _tmp3_;
+	gboolean _tmp4_;
+	DataSource* _tmp16_;
+	GeeMap* _tmp17_;
+	DataSource* _tmp18_;
+	gpointer _tmp19_;
+	Event* _tmp20_;
 #line 1467 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommand);
 #line 1467 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12418,14 +12320,14 @@ static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSou
 	_tmp4_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_);
 #line 1470 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp4_) {
-#line 12422 "Commands.c"
-		Dateable* _tmp5_ = NULL;
-		GeeHashMap* _tmp6_ = NULL;
-		Dateable* _tmp7_ = NULL;
-		gpointer _tmp8_ = NULL;
-		time_t* _tmp9_ = NULL;
-		GeeHashMap* _tmp10_ = NULL;
-		Dateable* _tmp11_ = NULL;
+#line 12324 "Commands.c"
+		Dateable* _tmp5_;
+		GeeHashMap* _tmp6_;
+		Dateable* _tmp7_;
+		gpointer _tmp8_;
+		time_t* _tmp9_;
+		GeeHashMap* _tmp10_;
+		Dateable* _tmp11_;
 #line 1471 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = photo;
 #line 1471 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12446,12 +12348,12 @@ static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSou
 		_tmp11_ = photo;
 #line 1472 "/home/jens/Source/shotwell/src/Commands.vala"
 		gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL);
-#line 12450 "Commands.c"
+#line 12352 "Commands.c"
 	} else {
-		Dateable* _tmp12_ = NULL;
-		Dateable* _tmp13_ = NULL;
-		time_t _tmp14_ = 0;
-		gint64 _tmp15_ = 0LL;
+		Dateable* _tmp12_;
+		Dateable* _tmp13_;
+		time_t _tmp14_;
+		gint64 _tmp15_;
 #line 1474 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp12_ = photo;
 #line 1474 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12462,7 +12364,7 @@ static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSou
 		_tmp15_ = self->priv->time_shift;
 #line 1474 "/home/jens/Source/shotwell/src/Commands.vala"
 		adjust_date_time_photos_command_set_time (self, _tmp12_, _tmp14_ - ((time_t) _tmp15_));
-#line 12466 "Commands.c"
+#line 12368 "Commands.c"
 	}
 #line 1477 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp16_ = source;
@@ -12480,7 +12382,7 @@ static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSou
 	_g_object_unref0 (_tmp20_);
 #line 1467 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 12484 "Commands.c"
+#line 12386 "Commands.c"
 }
 
 
@@ -12490,16 +12392,16 @@ static void adjust_date_time_photos_command_class_init (AdjustDateTimePhotosComm
 #line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (AdjustDateTimePhotosCommandPrivate));
 #line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) adjust_date_time_photos_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) adjust_date_time_photos_command_real_execute;
 #line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) adjust_date_time_photos_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) adjust_date_time_photos_command_real_undo;
 #line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) adjust_date_time_photos_command_real_execute_on_source;
+	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) adjust_date_time_photos_command_real_execute_on_source;
 #line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) adjust_date_time_photos_command_real_undo_on_source;
+	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) adjust_date_time_photos_command_real_undo_on_source;
 #line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = adjust_date_time_photos_command_finalize;
-#line 12503 "Commands.c"
+#line 12405 "Commands.c"
 }
 
 
@@ -12508,11 +12410,11 @@ static void adjust_date_time_photos_command_instance_init (AdjustDateTimePhotosC
 	self->priv = ADJUST_DATE_TIME_PHOTOS_COMMAND_GET_PRIVATE (self);
 #line 1362 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->new_time = NULL;
-#line 12512 "Commands.c"
+#line 12414 "Commands.c"
 }
 
 
-static void adjust_date_time_photos_command_finalize (GObject* obj) {
+static void adjust_date_time_photos_command_finalize (GObject * obj) {
 	AdjustDateTimePhotosCommand * self;
 #line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommand);
@@ -12526,7 +12428,7 @@ static void adjust_date_time_photos_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->error_list);
 #line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (adjust_date_time_photos_command_parent_class)->finalize (obj);
-#line 12530 "Commands.c"
+#line 12432 "Commands.c"
 }
 
 
@@ -12545,27 +12447,27 @@ GType adjust_date_time_photos_command_get_type (void) {
 static void _add_tags_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
 #line 1521 "/home/jens/Source/shotwell/src/Commands.vala"
 	add_tags_command_on_proxy_broken ((AddTagsCommand*) self);
-#line 12549 "Commands.c"
+#line 12451 "Commands.c"
 }
 
 
 static void _add_tags_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 1523 "/home/jens/Source/shotwell/src/Commands.vala"
 	add_tags_command_on_source_destroyed ((AddTagsCommand*) self, source);
-#line 12556 "Commands.c"
+#line 12458 "Commands.c"
 }
 
 
 AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, int paths_length1, GeeCollection* sources) {
 	AddTagsCommand * self = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	LibraryPhotoSourceCollection* _tmp43_ = NULL;
-	VideoSourceCollection* _tmp44_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	LibraryPhotoSourceCollection* _tmp43_;
+	VideoSourceCollection* _tmp44_;
 #line 1485 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (sources), NULL);
 #line 1486 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12584,7 +12486,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 	_tmp3_ = paths;
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3__length1 = paths_length1;
-#line 12588 "Commands.c"
+#line 12490 "Commands.c"
 	{
 		gchar** path_collection = NULL;
 		gint path_collection_length1 = 0;
@@ -12596,20 +12498,20 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 		path_collection_length1 = _tmp3__length1;
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 		for (path_it = 0; path_it < _tmp3__length1; path_it = path_it + 1) {
-#line 12600 "Commands.c"
-			gchar* _tmp4_ = NULL;
+#line 12502 "Commands.c"
+			gchar* _tmp4_;
 			gchar* path = NULL;
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = g_strdup (path_collection[path_it]);
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 			path = _tmp4_;
-#line 12607 "Commands.c"
+#line 12509 "Commands.c"
 			{
 				GeeList* paths_to_create = NULL;
-				const gchar* _tmp5_ = NULL;
-				GeeList* _tmp6_ = NULL;
-				GeeList* _tmp7_ = NULL;
-				const gchar* _tmp8_ = NULL;
+				const gchar* _tmp5_;
+				GeeList* _tmp6_;
+				GeeList* _tmp7_;
+				const gchar* _tmp8_;
 #line 1492 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp5_ = path;
 #line 1492 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12622,15 +12524,15 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 				_tmp8_ = path;
 #line 1494 "/home/jens/Source/shotwell/src/Commands.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp8_);
-#line 12626 "Commands.c"
+#line 12528 "Commands.c"
 				{
 					GeeList* _create_path_list = NULL;
-					GeeList* _tmp9_ = NULL;
-					GeeList* _tmp10_ = NULL;
+					GeeList* _tmp9_;
+					GeeList* _tmp10_;
 					gint _create_path_size = 0;
-					GeeList* _tmp11_ = NULL;
-					gint _tmp12_ = 0;
-					gint _tmp13_ = 0;
+					GeeList* _tmp11_;
+					gint _tmp12_;
+					gint _tmp13_;
 					gint _create_path_index = 0;
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp9_ = paths_to_create;
@@ -12650,25 +12552,25 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 					_create_path_index = -1;
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 					while (TRUE) {
-#line 12654 "Commands.c"
-						gint _tmp14_ = 0;
-						gint _tmp15_ = 0;
-						gint _tmp16_ = 0;
+#line 12556 "Commands.c"
+						gint _tmp14_;
+						gint _tmp15_;
+						gint _tmp16_;
 						gchar* create_path = NULL;
-						GeeList* _tmp17_ = NULL;
-						gint _tmp18_ = 0;
-						gpointer _tmp19_ = NULL;
+						GeeList* _tmp17_;
+						gint _tmp18_;
+						gpointer _tmp19_;
 						Tag* tag = NULL;
-						const gchar* _tmp20_ = NULL;
-						Tag* _tmp21_ = NULL;
+						const gchar* _tmp20_;
+						Tag* _tmp21_;
 						SourceProxy* tag_proxy = NULL;
-						Tag* _tmp22_ = NULL;
-						SourceProxy* _tmp23_ = NULL;
+						Tag* _tmp22_;
+						SourceProxy* _tmp23_;
 						GeeArrayList* add_sources = NULL;
-						GeeArrayList* _tmp24_ = NULL;
-						GeeArrayList* _tmp36_ = NULL;
-						gint _tmp37_ = 0;
-						gint _tmp38_ = 0;
+						GeeArrayList* _tmp24_;
+						GeeArrayList* _tmp36_;
+						gint _tmp37_;
+						gint _tmp38_;
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp14_ = _create_path_index;
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12681,7 +12583,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 						if (!(_tmp15_ < _tmp16_)) {
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 							break;
-#line 12685 "Commands.c"
+#line 12587 "Commands.c"
 						}
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp17_ = _create_path_list;
@@ -12707,11 +12609,11 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 						_tmp24_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1502 "/home/jens/Source/shotwell/src/Commands.vala"
 						add_sources = _tmp24_;
-#line 12711 "Commands.c"
+#line 12613 "Commands.c"
 						{
 							GeeIterator* _source_it = NULL;
-							GeeCollection* _tmp25_ = NULL;
-							GeeIterator* _tmp26_ = NULL;
+							GeeCollection* _tmp25_;
+							GeeIterator* _tmp26_;
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
 							_tmp25_ = sources;
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12720,15 +12622,15 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 							_source_it = _tmp26_;
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
 							while (TRUE) {
-#line 12724 "Commands.c"
-								GeeIterator* _tmp27_ = NULL;
-								gboolean _tmp28_ = FALSE;
+#line 12626 "Commands.c"
+								GeeIterator* _tmp27_;
+								gboolean _tmp28_;
 								MediaSource* source = NULL;
-								GeeIterator* _tmp29_ = NULL;
-								gpointer _tmp30_ = NULL;
-								Tag* _tmp31_ = NULL;
-								MediaSource* _tmp32_ = NULL;
-								gboolean _tmp33_ = FALSE;
+								GeeIterator* _tmp29_;
+								gpointer _tmp30_;
+								Tag* _tmp31_;
+								MediaSource* _tmp32_;
+								gboolean _tmp33_;
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
 								_tmp27_ = _source_it;
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12737,7 +12639,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 								if (!_tmp28_) {
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
 									break;
-#line 12741 "Commands.c"
+#line 12643 "Commands.c"
 								}
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
 								_tmp29_ = _source_it;
@@ -12753,24 +12655,24 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 								_tmp33_ = tag_contains (_tmp31_, _tmp32_);
 #line 1504 "/home/jens/Source/shotwell/src/Commands.vala"
 								if (!_tmp33_) {
-#line 12757 "Commands.c"
-									GeeArrayList* _tmp34_ = NULL;
-									MediaSource* _tmp35_ = NULL;
+#line 12659 "Commands.c"
+									GeeArrayList* _tmp34_;
+									MediaSource* _tmp35_;
 #line 1505 "/home/jens/Source/shotwell/src/Commands.vala"
 									_tmp34_ = add_sources;
 #line 1505 "/home/jens/Source/shotwell/src/Commands.vala"
 									_tmp35_ = source;
 #line 1505 "/home/jens/Source/shotwell/src/Commands.vala"
 									gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp35_);
-#line 12766 "Commands.c"
+#line 12668 "Commands.c"
 								}
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
 								_g_object_unref0 (source);
-#line 12770 "Commands.c"
+#line 12672 "Commands.c"
 							}
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
 							_g_object_unref0 (_source_it);
-#line 12774 "Commands.c"
+#line 12676 "Commands.c"
 						}
 #line 1508 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp36_ = add_sources;
@@ -12780,11 +12682,11 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 						_tmp38_ = _tmp37_;
 #line 1508 "/home/jens/Source/shotwell/src/Commands.vala"
 						if (_tmp38_ > 0) {
-#line 12784 "Commands.c"
-							SourceProxy* _tmp39_ = NULL;
-							GeeHashMap* _tmp40_ = NULL;
-							SourceProxy* _tmp41_ = NULL;
-							GeeArrayList* _tmp42_ = NULL;
+#line 12686 "Commands.c"
+							SourceProxy* _tmp39_;
+							GeeHashMap* _tmp40_;
+							SourceProxy* _tmp41_;
+							GeeArrayList* _tmp42_;
 #line 1509 "/home/jens/Source/shotwell/src/Commands.vala"
 							_tmp39_ = tag_proxy;
 #line 1509 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12797,7 +12699,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 							_tmp42_ = add_sources;
 #line 1510 "/home/jens/Source/shotwell/src/Commands.vala"
 							gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp41_, _tmp42_);
-#line 12801 "Commands.c"
+#line 12703 "Commands.c"
 						}
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (add_sources);
@@ -12807,17 +12709,17 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 						_g_object_unref0 (tag);
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_free0 (create_path);
-#line 12811 "Commands.c"
+#line 12713 "Commands.c"
 					}
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_create_path_list);
-#line 12815 "Commands.c"
+#line 12717 "Commands.c"
 				}
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (paths_to_create);
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_free0 (path);
-#line 12821 "Commands.c"
+#line 12723 "Commands.c"
 			}
 		}
 	}
@@ -12831,14 +12733,14 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _add_tags_command_on_source_destroyed_source_collection_item_destroyed, self, 0);
 #line 1485 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 12835 "Commands.c"
+#line 12737 "Commands.c"
 }
 
 
 AddTagsCommand* add_tags_command_new (gchar** paths, int paths_length1, GeeCollection* sources) {
 #line 1485 "/home/jens/Source/shotwell/src/Commands.vala"
 	return add_tags_command_construct (TYPE_ADD_TAGS_COMMAND, paths, paths_length1, sources);
-#line 12842 "Commands.c"
+#line 12744 "Commands.c"
 }
 
 
@@ -12846,15 +12748,15 @@ static void add_tags_command_real_execute (Command* base) {
 	AddTagsCommand * self;
 #line 1527 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADD_TAGS_COMMAND, AddTagsCommand);
-#line 12850 "Commands.c"
+#line 12752 "Commands.c"
 	{
 		GeeIterator* _tag_proxy_it = NULL;
-		GeeHashMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeHashMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->map;
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12873,19 +12775,19 @@ static void add_tags_command_real_execute (Command* base) {
 		_tag_proxy_it = _tmp5_;
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 12877 "Commands.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 12779 "Commands.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			SourceProxy* tag_proxy = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			SourceProxy* _tmp10_ = NULL;
-			DataSource* _tmp11_ = NULL;
-			Tag* _tmp12_ = NULL;
-			GeeHashMap* _tmp13_ = NULL;
-			SourceProxy* _tmp14_ = NULL;
-			gpointer _tmp15_ = NULL;
-			GeeArrayList* _tmp16_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			SourceProxy* _tmp10_;
+			DataSource* _tmp11_;
+			Tag* _tmp12_;
+			GeeHashMap* _tmp13_;
+			SourceProxy* _tmp14_;
+			gpointer _tmp15_;
+			GeeArrayList* _tmp16_;
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp6_ = _tag_proxy_it;
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12894,7 +12796,7 @@ static void add_tags_command_real_execute (Command* base) {
 			if (!_tmp7_) {
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 12898 "Commands.c"
+#line 12800 "Commands.c"
 			}
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _tag_proxy_it;
@@ -12924,11 +12826,11 @@ static void add_tags_command_real_execute (Command* base) {
 			_g_object_unref0 (_tmp12_);
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (tag_proxy);
-#line 12928 "Commands.c"
+#line 12830 "Commands.c"
 		}
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tag_proxy_it);
-#line 12932 "Commands.c"
+#line 12834 "Commands.c"
 	}
 }
 
@@ -12937,15 +12839,15 @@ static void add_tags_command_real_undo (Command* base) {
 	AddTagsCommand * self;
 #line 1532 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADD_TAGS_COMMAND, AddTagsCommand);
-#line 12941 "Commands.c"
+#line 12843 "Commands.c"
 	{
 		GeeIterator* _tag_proxy_it = NULL;
-		GeeHashMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeHashMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->map;
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12964,22 +12866,22 @@ static void add_tags_command_real_undo (Command* base) {
 		_tag_proxy_it = _tmp5_;
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 12968 "Commands.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 12870 "Commands.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			SourceProxy* tag_proxy = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			Tag* tag = NULL;
-			SourceProxy* _tmp10_ = NULL;
-			DataSource* _tmp11_ = NULL;
-			Tag* _tmp12_ = NULL;
-			GeeHashMap* _tmp13_ = NULL;
-			SourceProxy* _tmp14_ = NULL;
-			gpointer _tmp15_ = NULL;
-			GeeArrayList* _tmp16_ = NULL;
-			GeeMultiMap* _tmp17_ = NULL;
-			GeeMultiMap* _tmp18_ = NULL;
+			SourceProxy* _tmp10_;
+			DataSource* _tmp11_;
+			Tag* _tmp12_;
+			GeeHashMap* _tmp13_;
+			SourceProxy* _tmp14_;
+			gpointer _tmp15_;
+			GeeArrayList* _tmp16_;
+			GeeMultiMap* _tmp17_;
+			GeeMultiMap* _tmp18_;
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp6_ = _tag_proxy_it;
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12988,7 +12890,7 @@ static void add_tags_command_real_undo (Command* base) {
 			if (!_tmp7_) {
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 12992 "Commands.c"
+#line 12894 "Commands.c"
 			}
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _tag_proxy_it;
@@ -13024,11 +12926,11 @@ static void add_tags_command_real_undo (Command* base) {
 			_g_object_unref0 (tag);
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (tag_proxy);
-#line 13028 "Commands.c"
+#line 12930 "Commands.c"
 		}
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tag_proxy_it);
-#line 13032 "Commands.c"
+#line 12934 "Commands.c"
 	}
 }
 
@@ -13038,15 +12940,15 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
 	g_return_if_fail (IS_ADD_TAGS_COMMAND (self));
 #line 1540 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
-#line 13042 "Commands.c"
+#line 12944 "Commands.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		GeeHashMap* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeHashMap* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->map;
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13065,15 +12967,15 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
 		_sources_it = _tmp5_;
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 13069 "Commands.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 12971 "Commands.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			GeeArrayList* sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			GeeArrayList* _tmp10_ = NULL;
-			DataSource* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			GeeArrayList* _tmp10_;
+			DataSource* _tmp11_;
+			gboolean _tmp12_;
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp6_ = _sources_it;
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13082,7 +12984,7 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
 			if (!_tmp7_) {
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 13086 "Commands.c"
+#line 12988 "Commands.c"
 			}
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _sources_it;
@@ -13098,9 +13000,9 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
 			_tmp12_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 1542 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp12_) {
-#line 13102 "Commands.c"
-				CommandManager* _tmp13_ = NULL;
-				CommandManager* _tmp14_ = NULL;
+#line 13004 "Commands.c"
+				CommandManager* _tmp13_;
+				CommandManager* _tmp14_;
 #line 1543 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp13_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command));
 #line 1543 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13115,22 +13017,22 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
 				_g_object_unref0 (_sources_it);
 #line 1545 "/home/jens/Source/shotwell/src/Commands.vala"
 				return;
-#line 13119 "Commands.c"
+#line 13021 "Commands.c"
 			}
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (sources);
-#line 13123 "Commands.c"
+#line 13025 "Commands.c"
 		}
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_sources_it);
-#line 13127 "Commands.c"
+#line 13029 "Commands.c"
 	}
 }
 
 
 static void add_tags_command_on_proxy_broken (AddTagsCommand* self) {
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
 #line 1550 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_ADD_TAGS_COMMAND (self));
 #line 1551 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13141,7 +13043,7 @@ static void add_tags_command_on_proxy_broken (AddTagsCommand* self) {
 	command_manager_reset (_tmp1_);
 #line 1551 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 13145 "Commands.c"
+#line 13047 "Commands.c"
 }
 
 
@@ -13151,44 +13053,44 @@ static void add_tags_command_class_init (AddTagsCommandClass * klass) {
 #line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (AddTagsCommandPrivate));
 #line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) add_tags_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) add_tags_command_real_execute;
 #line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) add_tags_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) add_tags_command_real_undo;
 #line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = add_tags_command_finalize;
-#line 13160 "Commands.c"
+#line 13062 "Commands.c"
 }
 
 
 static void add_tags_command_instance_init (AddTagsCommand * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = ADD_TAGS_COMMAND_GET_PRIVATE (self);
 #line 1482 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = gee_hash_map_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, GEE_TYPE_ARRAY_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1482 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->map = _tmp0_;
-#line 13172 "Commands.c"
+#line 13074 "Commands.c"
 }
 
 
-static void add_tags_command_finalize (GObject* obj) {
+static void add_tags_command_finalize (GObject * obj) {
 	AddTagsCommand * self;
-	LibraryPhotoSourceCollection* _tmp12_ = NULL;
-	guint _tmp13_ = 0U;
-	VideoSourceCollection* _tmp14_ = NULL;
-	guint _tmp15_ = 0U;
+	LibraryPhotoSourceCollection* _tmp12_;
+	guint _tmp13_;
+	VideoSourceCollection* _tmp14_;
+	guint _tmp15_;
 #line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADD_TAGS_COMMAND, AddTagsCommand);
-#line 13184 "Commands.c"
+#line 13086 "Commands.c"
 	{
 		GeeIterator* _tag_proxy_it = NULL;
-		GeeHashMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeHashMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->map;
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13207,14 +13109,14 @@ static void add_tags_command_finalize (GObject* obj) {
 		_tag_proxy_it = _tmp5_;
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 13211 "Commands.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 13113 "Commands.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			SourceProxy* tag_proxy = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			SourceProxy* _tmp10_ = NULL;
-			guint _tmp11_ = 0U;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			SourceProxy* _tmp10_;
+			guint _tmp11_;
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp6_ = _tag_proxy_it;
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13223,7 +13125,7 @@ static void add_tags_command_finalize (GObject* obj) {
 			if (!_tmp7_) {
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 13227 "Commands.c"
+#line 13129 "Commands.c"
 			}
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _tag_proxy_it;
@@ -13239,11 +13141,11 @@ static void add_tags_command_finalize (GObject* obj) {
 			g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _add_tags_command_on_proxy_broken_source_proxy_broken, self);
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (tag_proxy);
-#line 13243 "Commands.c"
+#line 13145 "Commands.c"
 		}
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tag_proxy_it);
-#line 13247 "Commands.c"
+#line 13149 "Commands.c"
 	}
 #line 1523 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp12_ = library_photo_global;
@@ -13261,7 +13163,7 @@ static void add_tags_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->map);
 #line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (add_tags_command_parent_class)->finalize (obj);
-#line 13265 "Commands.c"
+#line 13167 "Commands.c"
 }
 
 
@@ -13279,20 +13181,20 @@ GType add_tags_command_get_type (void) {
 
 RenameTagCommand* rename_tag_command_construct (GType object_type, Tag* tag, const gchar* new_name) {
 	RenameTagCommand * self = NULL;
-	Tag* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	Tag* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	Tag* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	Tag* _tmp0_;
+	Tag* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	Tag* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	Tag* _tmp10_;
+	gchar* _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
 #line 1560 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_TAG (tag), NULL);
 #line 1560 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13343,22 +13245,22 @@ RenameTagCommand* rename_tag_command_construct (GType object_type, Tag* tag, con
 	self->priv->new_name = _tmp13_;
 #line 1560 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 13347 "Commands.c"
+#line 13249 "Commands.c"
 }
 
 
 RenameTagCommand* rename_tag_command_new (Tag* tag, const gchar* new_name) {
 #line 1560 "/home/jens/Source/shotwell/src/Commands.vala"
 	return rename_tag_command_construct (TYPE_RENAME_TAG_COMMAND, tag, new_name);
-#line 13354 "Commands.c"
+#line 13256 "Commands.c"
 }
 
 
 static void rename_tag_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) {
 	RenameTagCommand * self;
-	DataSource* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	DataSource* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 1568 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_TAG_COMMAND, RenameTagCommand);
 #line 1568 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13371,10 +13273,10 @@ static void rename_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 	_tmp2_ = tag_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TAG, Tag), _tmp1_);
 #line 1569 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (!_tmp2_) {
-#line 13375 "Commands.c"
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+#line 13277 "Commands.c"
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 1570 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->new_name;
 #line 1570 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13385,16 +13287,16 @@ static void rename_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 		app_window_error_message (_tmp5_, NULL);
 #line 1570 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp5_);
-#line 13389 "Commands.c"
+#line 13291 "Commands.c"
 	}
 }
 
 
 static void rename_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) {
 	RenameTagCommand * self;
-	DataSource* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	DataSource* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 1573 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_TAG_COMMAND, RenameTagCommand);
 #line 1573 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13407,10 +13309,10 @@ static void rename_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 	_tmp2_ = tag_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TAG, Tag), _tmp1_);
 #line 1574 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (!_tmp2_) {
-#line 13411 "Commands.c"
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+#line 13313 "Commands.c"
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 1575 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->old_name;
 #line 1575 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13421,7 +13323,7 @@ static void rename_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 		app_window_error_message (_tmp5_, NULL);
 #line 1575 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp5_);
-#line 13425 "Commands.c"
+#line 13327 "Commands.c"
 	}
 }
 
@@ -13432,23 +13334,23 @@ static void rename_tag_command_class_init (RenameTagCommandClass * klass) {
 #line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (RenameTagCommandPrivate));
 #line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
-	((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) rename_tag_command_real_execute_on_source;
+	((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) rename_tag_command_real_execute_on_source;
 #line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
-	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) rename_tag_command_real_undo_on_source;
+	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) rename_tag_command_real_undo_on_source;
 #line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = rename_tag_command_finalize;
-#line 13441 "Commands.c"
+#line 13343 "Commands.c"
 }
 
 
 static void rename_tag_command_instance_init (RenameTagCommand * self) {
 #line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = RENAME_TAG_COMMAND_GET_PRIVATE (self);
-#line 13448 "Commands.c"
+#line 13350 "Commands.c"
 }
 
 
-static void rename_tag_command_finalize (GObject* obj) {
+static void rename_tag_command_finalize (GObject * obj) {
 	RenameTagCommand * self;
 #line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RENAME_TAG_COMMAND, RenameTagCommand);
@@ -13458,7 +13360,7 @@ static void rename_tag_command_finalize (GObject* obj) {
 	_g_free0 (self->priv->new_name);
 #line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (rename_tag_command_parent_class)->finalize (obj);
-#line 13462 "Commands.c"
+#line 13364 "Commands.c"
 }
 
 
@@ -13476,15 +13378,15 @@ GType rename_tag_command_get_type (void) {
 
 DeleteTagCommand* delete_tag_command_construct (GType object_type, Tag* tag) {
 	DeleteTagCommand * self = NULL;
-	Tag* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	Tag* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	Tag* _tmp0_;
+	Tag* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	Tag* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
 #line 1582 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_TAG (tag), NULL);
 #line 1583 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13515,40 +13417,40 @@ DeleteTagCommand* delete_tag_command_construct (GType object_type, Tag* tag) {
 	_g_free0 (_tmp3_);
 #line 1582 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 13519 "Commands.c"
+#line 13421 "Commands.c"
 }
 
 
 DeleteTagCommand* delete_tag_command_new (Tag* tag) {
 #line 1582 "/home/jens/Source/shotwell/src/Commands.vala"
 	return delete_tag_command_construct (TYPE_DELETE_TAG_COMMAND, tag);
-#line 13526 "Commands.c"
+#line 13428 "Commands.c"
 }
 
 
 static void _delete_tag_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
 #line 1597 "/home/jens/Source/shotwell/src/Commands.vala"
 	delete_tag_command_on_proxy_broken ((DeleteTagCommand*) self);
-#line 13533 "Commands.c"
+#line 13435 "Commands.c"
 }
 
 
 static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) {
 	DeleteTagCommand * self;
 	Tag* tag = NULL;
-	DataSource* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	Tag* _tmp1_;
 	GeeList* recursive_victims = NULL;
-	Tag* _tmp2_ = NULL;
-	GeeList* _tmp3_ = NULL;
-	GeeList* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	TagSourceCollection* _tmp29_ = NULL;
-	TagSourceCollection* _tmp30_ = NULL;
-	DataSource* _tmp31_ = NULL;
-	Marker* _tmp32_ = NULL;
-	Marker* _tmp33_ = NULL;
+	Tag* _tmp2_;
+	GeeList* _tmp3_;
+	GeeList* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	TagSourceCollection* _tmp29_;
+	TagSourceCollection* _tmp30_;
+	DataSource* _tmp31_;
+	Marker* _tmp32_;
+	Marker* _tmp33_;
 #line 1586 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DELETE_TAG_COMMAND, DeleteTagCommand);
 #line 1586 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13573,23 +13475,23 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 	_tmp6_ = _tmp5_;
 #line 1591 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp6_ > 0) {
-#line 13577 "Commands.c"
-		GeeArrayList* _tmp7_ = NULL;
+#line 13479 "Commands.c"
+		GeeArrayList* _tmp7_;
 #line 1594 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL);
 #line 1594 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (self->priv->recursive_victim_proxies);
 #line 1594 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->recursive_victim_proxies = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList);
-#line 13585 "Commands.c"
+#line 13487 "Commands.c"
 		{
 			GeeList* _victim_list = NULL;
-			GeeList* _tmp8_ = NULL;
-			GeeList* _tmp9_ = NULL;
+			GeeList* _tmp8_;
+			GeeList* _tmp9_;
 			gint _victim_size = 0;
-			GeeList* _tmp10_ = NULL;
-			gint _tmp11_ = 0;
-			gint _tmp12_ = 0;
+			GeeList* _tmp10_;
+			gint _tmp11_;
+			gint _tmp12_;
 			gint _victim_index = 0;
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = recursive_victims;
@@ -13609,25 +13511,25 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 			_victim_index = -1;
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 13613 "Commands.c"
-				gint _tmp13_ = 0;
-				gint _tmp14_ = 0;
-				gint _tmp15_ = 0;
+#line 13515 "Commands.c"
+				gint _tmp13_;
+				gint _tmp14_;
+				gint _tmp15_;
 				Tag* victim = NULL;
-				GeeList* _tmp16_ = NULL;
-				gint _tmp17_ = 0;
-				gpointer _tmp18_ = NULL;
+				GeeList* _tmp16_;
+				gint _tmp17_;
+				gpointer _tmp18_;
 				SourceProxy* proxy = NULL;
-				Tag* _tmp19_ = NULL;
-				SourceProxy* _tmp20_ = NULL;
-				SourceProxy* _tmp21_ = NULL;
-				GeeList* _tmp22_ = NULL;
-				SourceProxy* _tmp23_ = NULL;
-				TagSourceCollection* _tmp24_ = NULL;
-				TagSourceCollection* _tmp25_ = NULL;
-				Tag* _tmp26_ = NULL;
-				Marker* _tmp27_ = NULL;
-				Marker* _tmp28_ = NULL;
+				Tag* _tmp19_;
+				SourceProxy* _tmp20_;
+				SourceProxy* _tmp21_;
+				GeeList* _tmp22_;
+				SourceProxy* _tmp23_;
+				TagSourceCollection* _tmp24_;
+				TagSourceCollection* _tmp25_;
+				Tag* _tmp26_;
+				Marker* _tmp27_;
+				Marker* _tmp28_;
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp13_ = _victim_index;
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13640,7 +13542,7 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 				if (!(_tmp14_ < _tmp15_)) {
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 13644 "Commands.c"
+#line 13546 "Commands.c"
 				}
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp16_ = _victim_list;
@@ -13684,11 +13586,11 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 				_source_proxy_unref0 (proxy);
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (victim);
-#line 13688 "Commands.c"
+#line 13590 "Commands.c"
 			}
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_victim_list);
-#line 13692 "Commands.c"
+#line 13594 "Commands.c"
 		}
 	}
 #line 1605 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13709,14 +13611,14 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 	_g_object_unref0 (recursive_victims);
 #line 1586 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (tag);
-#line 13713 "Commands.c"
+#line 13615 "Commands.c"
 }
 
 
 static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) {
 	DeleteTagCommand * self;
-	DataSource* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	GeeList* _tmp1_;
 #line 1608 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DELETE_TAG_COMMAND, DeleteTagCommand);
 #line 1608 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13729,12 +13631,12 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 	_tmp1_ = self->priv->recursive_victim_proxies;
 #line 1614 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_ != NULL) {
-#line 13733 "Commands.c"
+#line 13635 "Commands.c"
 		{
 			gint i = 0;
-			GeeList* _tmp2_ = NULL;
-			gint _tmp3_ = 0;
-			gint _tmp4_ = 0;
+			GeeList* _tmp2_;
+			gint _tmp3_;
+			gint _tmp4_;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp2_ = self->priv->recursive_victim_proxies;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13743,34 +13645,34 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 			_tmp4_ = _tmp3_;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 			i = _tmp4_ - 1;
-#line 13747 "Commands.c"
+#line 13649 "Commands.c"
 			{
 				gboolean _tmp5_ = FALSE;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp5_ = TRUE;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 13754 "Commands.c"
-					gint _tmp7_ = 0;
+#line 13656 "Commands.c"
+					gint _tmp7_;
 					SourceProxy* proxy = NULL;
-					GeeList* _tmp8_ = NULL;
-					gint _tmp9_ = 0;
-					gpointer _tmp10_ = NULL;
+					GeeList* _tmp8_;
+					gint _tmp9_;
+					gpointer _tmp10_;
 					DataSource* victim_source = NULL;
-					SourceProxy* _tmp11_ = NULL;
-					DataSource* _tmp12_ = NULL;
-					DataSource* _tmp13_ = NULL;
-					SourceProxy* _tmp14_ = NULL;
-					guint _tmp15_ = 0U;
+					SourceProxy* _tmp11_;
+					DataSource* _tmp12_;
+					DataSource* _tmp13_;
+					SourceProxy* _tmp14_;
+					guint _tmp15_;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (!_tmp5_) {
-#line 13768 "Commands.c"
-						gint _tmp6_ = 0;
+#line 13670 "Commands.c"
+						gint _tmp6_;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp6_ = i;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 						i = _tmp6_ - 1;
-#line 13774 "Commands.c"
+#line 13676 "Commands.c"
 					}
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp5_ = FALSE;
@@ -13780,7 +13682,7 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 					if (!(_tmp7_ >= 0)) {
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 13784 "Commands.c"
+#line 13686 "Commands.c"
 					}
 #line 1616 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp8_ = self->priv->recursive_victim_proxies;
@@ -13810,7 +13712,7 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 					_g_object_unref0 (victim_source);
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 					_source_proxy_unref0 (proxy);
-#line 13814 "Commands.c"
+#line 13716 "Commands.c"
 				}
 			}
 		}
@@ -13818,14 +13720,14 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 		_g_object_unref0 (self->priv->recursive_victim_proxies);
 #line 1624 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->recursive_victim_proxies = NULL;
-#line 13822 "Commands.c"
+#line 13724 "Commands.c"
 	}
 }
 
 
 static void delete_tag_command_on_proxy_broken (DeleteTagCommand* self) {
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
 #line 1628 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_DELETE_TAG_COMMAND (self));
 #line 1629 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13836,7 +13738,7 @@ static void delete_tag_command_on_proxy_broken (DeleteTagCommand* self) {
 	command_manager_reset (_tmp1_);
 #line 1629 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 13840 "Commands.c"
+#line 13742 "Commands.c"
 }
 
 
@@ -13846,12 +13748,12 @@ static void delete_tag_command_class_init (DeleteTagCommandClass * klass) {
 #line 1579 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (DeleteTagCommandPrivate));
 #line 1579 "/home/jens/Source/shotwell/src/Commands.vala"
-	((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) delete_tag_command_real_execute_on_source;
+	((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) delete_tag_command_real_execute_on_source;
 #line 1579 "/home/jens/Source/shotwell/src/Commands.vala"
-	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) delete_tag_command_real_undo_on_source;
+	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) delete_tag_command_real_undo_on_source;
 #line 1579 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = delete_tag_command_finalize;
-#line 13855 "Commands.c"
+#line 13757 "Commands.c"
 }
 
 
@@ -13860,11 +13762,11 @@ static void delete_tag_command_instance_init (DeleteTagCommand * self) {
 	self->priv = DELETE_TAG_COMMAND_GET_PRIVATE (self);
 #line 1580 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->recursive_victim_proxies = NULL;
-#line 13864 "Commands.c"
+#line 13766 "Commands.c"
 }
 
 
-static void delete_tag_command_finalize (GObject* obj) {
+static void delete_tag_command_finalize (GObject * obj) {
 	DeleteTagCommand * self;
 #line 1579 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DELETE_TAG_COMMAND, DeleteTagCommand);
@@ -13872,7 +13774,7 @@ static void delete_tag_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->recursive_victim_proxies);
 #line 1579 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (delete_tag_command_parent_class)->finalize (obj);
-#line 13876 "Commands.c"
+#line 13778 "Commands.c"
 }
 
 
@@ -13890,46 +13792,43 @@ GType delete_tag_command_get_type (void) {
 
 NewChildTagCommand* new_child_tag_command_construct (GType object_type, Tag* tag) {
 	NewChildTagCommand * self = NULL;
-	Tag* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	Tag* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	Tag* _tmp0_;
+	Tag* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 1636 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_TAG (tag), NULL);
 #line 1637 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = tag;
 #line 1637 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = _ ("Create Tag");
-#line 1637 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp2_ = tag;
+	_tmp1_ = tag;
 #line 1637 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp3_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
+	_tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
 #line 1637 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 1637 "/home/jens/Source/shotwell/src/Commands.vala"
-	self = (NewChildTagCommand*) simple_proxyable_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROXYABLE, Proxyable), _tmp1_, _tmp4_);
+	self = (NewChildTagCommand*) simple_proxyable_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROXYABLE, Proxyable), _ ("Create Tag"), _tmp3_);
 #line 1637 "/home/jens/Source/shotwell/src/Commands.vala"
-	_g_free0 (_tmp4_);
+	_g_free0 (_tmp3_);
 #line 1636 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 13917 "Commands.c"
+#line 13816 "Commands.c"
 }
 
 
 NewChildTagCommand* new_child_tag_command_new (Tag* tag) {
 #line 1636 "/home/jens/Source/shotwell/src/Commands.vala"
 	return new_child_tag_command_construct (TYPE_NEW_CHILD_TAG_COMMAND, tag);
-#line 13924 "Commands.c"
+#line 13823 "Commands.c"
 }
 
 
 static void new_child_tag_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) {
 	NewChildTagCommand * self;
 	Tag* tag = NULL;
-	DataSource* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
-	Tag* _tmp2_ = NULL;
+	DataSource* _tmp0_;
+	Tag* _tmp1_;
+	Tag* _tmp2_;
 #line 1640 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NEW_CHILD_TAG_COMMAND, NewChildTagCommand);
 #line 1640 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13948,17 +13847,17 @@ static void new_child_tag_command_real_execute_on_source (SimpleProxyableCommand
 	self->priv->created_child = _tmp2_;
 #line 1640 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (tag);
-#line 13952 "Commands.c"
+#line 13851 "Commands.c"
 }
 
 
 static void new_child_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) {
 	NewChildTagCommand * self;
-	TagSourceCollection* _tmp0_ = NULL;
-	TagSourceCollection* _tmp1_ = NULL;
-	Tag* _tmp2_ = NULL;
-	Marker* _tmp3_ = NULL;
-	Marker* _tmp4_ = NULL;
+	TagSourceCollection* _tmp0_;
+	TagSourceCollection* _tmp1_;
+	Tag* _tmp2_;
+	Marker* _tmp3_;
+	Marker* _tmp4_;
 #line 1645 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NEW_CHILD_TAG_COMMAND, NewChildTagCommand);
 #line 1645 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13977,15 +13876,15 @@ static void new_child_tag_command_real_undo_on_source (SimpleProxyableCommand* b
 	source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp4_, TRUE, NULL, NULL, NULL);
 #line 1646 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp4_);
-#line 13981 "Commands.c"
+#line 13880 "Commands.c"
 }
 
 
 Tag* new_child_tag_command_get_created_child (NewChildTagCommand* self) {
 	Tag* result = NULL;
-	Tag* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
-	Tag* _tmp2_ = NULL;
+	Tag* _tmp0_;
+	Tag* _tmp1_;
+	Tag* _tmp2_;
 #line 1649 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_NEW_CHILD_TAG_COMMAND (self), NULL);
 #line 1650 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14000,7 +13899,7 @@ Tag* new_child_tag_command_get_created_child (NewChildTagCommand* self) {
 	result = _tmp2_;
 #line 1652 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 14004 "Commands.c"
+#line 13903 "Commands.c"
 }
 
 
@@ -14010,12 +13909,12 @@ static void new_child_tag_command_class_init (NewChildTagCommandClass * klass) {
 #line 1633 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (NewChildTagCommandPrivate));
 #line 1633 "/home/jens/Source/shotwell/src/Commands.vala"
-	((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) new_child_tag_command_real_execute_on_source;
+	((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) new_child_tag_command_real_execute_on_source;
 #line 1633 "/home/jens/Source/shotwell/src/Commands.vala"
-	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) new_child_tag_command_real_undo_on_source;
+	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) new_child_tag_command_real_undo_on_source;
 #line 1633 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = new_child_tag_command_finalize;
-#line 14019 "Commands.c"
+#line 13918 "Commands.c"
 }
 
 
@@ -14024,11 +13923,11 @@ static void new_child_tag_command_instance_init (NewChildTagCommand * self) {
 	self->priv = NEW_CHILD_TAG_COMMAND_GET_PRIVATE (self);
 #line 1634 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->created_child = NULL;
-#line 14028 "Commands.c"
+#line 13927 "Commands.c"
 }
 
 
-static void new_child_tag_command_finalize (GObject* obj) {
+static void new_child_tag_command_finalize (GObject * obj) {
 	NewChildTagCommand * self;
 #line 1633 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NEW_CHILD_TAG_COMMAND, NewChildTagCommand);
@@ -14036,7 +13935,7 @@ static void new_child_tag_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->created_child);
 #line 1633 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (new_child_tag_command_parent_class)->finalize (obj);
-#line 14040 "Commands.c"
+#line 13939 "Commands.c"
 }
 
 
@@ -14054,37 +13953,34 @@ GType new_child_tag_command_get_type (void) {
 
 NewRootTagCommand* new_root_tag_command_construct (GType object_type) {
 	NewRootTagCommand * self = NULL;
-	const gchar* _tmp0_ = NULL;
-#line 1660 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp0_ = _ ("Create Tag");
 #line 1660 "/home/jens/Source/shotwell/src/Commands.vala"
-	self = (NewRootTagCommand*) page_command_construct (object_type, _tmp0_, "");
+	self = (NewRootTagCommand*) page_command_construct (object_type, _ ("Create Tag"), "");
 #line 1659 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 14065 "Commands.c"
+#line 13961 "Commands.c"
 }
 
 
 NewRootTagCommand* new_root_tag_command_new (void) {
 #line 1659 "/home/jens/Source/shotwell/src/Commands.vala"
 	return new_root_tag_command_construct (TYPE_NEW_ROOT_TAG_COMMAND);
-#line 14072 "Commands.c"
+#line 13968 "Commands.c"
 }
 
 
 static void new_root_tag_command_real_execute (Command* base) {
 	NewRootTagCommand * self;
-	SourceProxy* _tmp0_ = NULL;
+	SourceProxy* _tmp0_;
 #line 1663 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NEW_ROOT_TAG_COMMAND, NewRootTagCommand);
 #line 1664 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = self->priv->created_proxy;
 #line 1664 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ == NULL) {
-#line 14085 "Commands.c"
-		Tag* _tmp1_ = NULL;
-		Tag* _tmp2_ = NULL;
-		SourceProxy* _tmp3_ = NULL;
+#line 13981 "Commands.c"
+		Tag* _tmp1_;
+		Tag* _tmp2_;
+		SourceProxy* _tmp3_;
 #line 1665 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = tag_create_new_root ();
 #line 1665 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14097,11 +13993,11 @@ static void new_root_tag_command_real_execute (Command* base) {
 		self->priv->created_proxy = _tmp3_;
 #line 1665 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp2_);
-#line 14101 "Commands.c"
+#line 13997 "Commands.c"
 	} else {
-		SourceProxy* _tmp4_ = NULL;
-		DataSource* _tmp5_ = NULL;
-		DataSource* _tmp6_ = NULL;
+		SourceProxy* _tmp4_;
+		DataSource* _tmp5_;
+		DataSource* _tmp6_;
 #line 1667 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = self->priv->created_proxy;
 #line 1667 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14110,20 +14006,20 @@ static void new_root_tag_command_real_execute (Command* base) {
 		_tmp6_ = _tmp5_;
 #line 1667 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp6_);
-#line 14114 "Commands.c"
+#line 14010 "Commands.c"
 	}
 }
 
 
 static void new_root_tag_command_real_undo (Command* base) {
 	NewRootTagCommand * self;
-	TagSourceCollection* _tmp0_ = NULL;
-	TagSourceCollection* _tmp1_ = NULL;
-	SourceProxy* _tmp2_ = NULL;
-	DataSource* _tmp3_ = NULL;
-	DataSource* _tmp4_ = NULL;
-	Marker* _tmp5_ = NULL;
-	Marker* _tmp6_ = NULL;
+	TagSourceCollection* _tmp0_;
+	TagSourceCollection* _tmp1_;
+	SourceProxy* _tmp2_;
+	DataSource* _tmp3_;
+	DataSource* _tmp4_;
+	Marker* _tmp5_;
+	Marker* _tmp6_;
 #line 1670 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NEW_ROOT_TAG_COMMAND, NewRootTagCommand);
 #line 1671 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14146,14 +14042,14 @@ static void new_root_tag_command_real_undo (Command* base) {
 	_g_object_unref0 (_tmp6_);
 #line 1671 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp4_);
-#line 14150 "Commands.c"
+#line 14046 "Commands.c"
 }
 
 
 Tag* new_root_tag_command_get_created_tag (NewRootTagCommand* self) {
 	Tag* result = NULL;
-	SourceProxy* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
+	SourceProxy* _tmp0_;
+	DataSource* _tmp1_;
 #line 1674 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_NEW_ROOT_TAG_COMMAND (self), NULL);
 #line 1675 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14164,7 +14060,7 @@ Tag* new_root_tag_command_get_created_tag (NewRootTagCommand* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TAG, Tag);
 #line 1675 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 14168 "Commands.c"
+#line 14064 "Commands.c"
 }
 
 
@@ -14174,12 +14070,12 @@ static void new_root_tag_command_class_init (NewRootTagCommandClass * klass) {
 #line 1656 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (NewRootTagCommandPrivate));
 #line 1656 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) new_root_tag_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) new_root_tag_command_real_execute;
 #line 1656 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) new_root_tag_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) new_root_tag_command_real_undo;
 #line 1656 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = new_root_tag_command_finalize;
-#line 14183 "Commands.c"
+#line 14079 "Commands.c"
 }
 
 
@@ -14188,11 +14084,11 @@ static void new_root_tag_command_instance_init (NewRootTagCommand * self) {
 	self->priv = NEW_ROOT_TAG_COMMAND_GET_PRIVATE (self);
 #line 1657 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->created_proxy = NULL;
-#line 14192 "Commands.c"
+#line 14088 "Commands.c"
 }
 
 
-static void new_root_tag_command_finalize (GObject* obj) {
+static void new_root_tag_command_finalize (GObject * obj) {
 	NewRootTagCommand * self;
 #line 1656 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NEW_ROOT_TAG_COMMAND, NewRootTagCommand);
@@ -14200,7 +14096,7 @@ static void new_root_tag_command_finalize (GObject* obj) {
 	_source_proxy_unref0 (self->priv->created_proxy);
 #line 1656 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (new_root_tag_command_parent_class)->finalize (obj);
-#line 14204 "Commands.c"
+#line 14100 "Commands.c"
 }
 
 
@@ -14219,276 +14115,273 @@ GType new_root_tag_command_get_type (void) {
 static void _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed (SourceCollection* _sender, GeeCollection* destroyed, gpointer self) {
 #line 1724 "/home/jens/Source/shotwell/src/Commands.vala"
 	reparent_tag_command_on_items_destroyed ((ReparentTagCommand*) self, destroyed);
-#line 14223 "Commands.c"
+#line 14119 "Commands.c"
 }
 
 
 ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag, const gchar* new_parent_path) {
 	ReparentTagCommand * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	Tag* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	Tag* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	Tag* _tmp5_;
+	gchar* _tmp6_;
 	gboolean has_children = FALSE;
-	Tag* _tmp8_ = NULL;
-	GeeList* _tmp9_ = NULL;
-	GeeList* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	gboolean _tmp13_ = FALSE;
+	Tag* _tmp7_;
+	GeeList* _tmp8_;
+	GeeList* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	gboolean _tmp12_;
 	gchar* basename = NULL;
-	Tag* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
+	Tag* _tmp13_;
+	gchar* _tmp14_;
+	const gchar* _tmp15_;
 	gchar* new_to_path = NULL;
-	const gchar* _tmp38_ = NULL;
-	gchar* _tmp39_ = NULL;
-	const gchar* _tmp40_ = NULL;
-	TagSourceCollection* _tmp43_ = NULL;
-	const gchar* _tmp44_ = NULL;
-	gboolean _tmp45_ = FALSE;
-	GeeHashSet* _tmp46_ = NULL;
-	Tag* _tmp47_ = NULL;
-	GeeCollection* _tmp48_ = NULL;
-	GeeCollection* _tmp49_ = NULL;
-	LibraryPhotoSourceCollection* _tmp50_ = NULL;
-	VideoSourceCollection* _tmp51_ = NULL;
+	const gchar* _tmp37_;
+	gchar* _tmp38_;
+	const gchar* _tmp39_;
+	TagSourceCollection* _tmp42_;
+	const gchar* _tmp43_;
+	gboolean _tmp44_;
+	GeeHashSet* _tmp45_;
+	Tag* _tmp46_;
+	GeeCollection* _tmp47_;
+	GeeCollection* _tmp48_;
+	LibraryPhotoSourceCollection* _tmp49_;
+	VideoSourceCollection* _tmp50_;
 #line 1694 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_TAG (tag), NULL);
 #line 1694 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (new_parent_path != NULL, NULL);
 #line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp0_ = _ ("Move Tag “%s”");
+	_tmp0_ = tag;
 #line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = tag;
+	_tmp1_ = tag_get_user_visible_name (_tmp0_);
 #line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp2_ = tag_get_user_visible_name (_tmp1_);
-#line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp4_ = g_strdup_printf (_tmp0_, _tmp3_);
+	_tmp3_ = g_strdup_printf (_ ("Move Tag “%s”"), _tmp2_);
 #line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
-	self = (ReparentTagCommand*) page_command_construct (object_type, _tmp5_, "");
+	self = (ReparentTagCommand*) page_command_construct (object_type, _tmp4_, "");
 #line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
-	_g_free0 (_tmp5_);
+	_g_free0 (_tmp4_);
 #line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
-	_g_free0 (_tmp3_);
+	_g_free0 (_tmp2_);
 #line 1697 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp6_ = tag;
+	_tmp5_ = tag;
 #line 1697 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp7_ = tag_get_path (_tmp6_);
+	_tmp6_ = tag_get_path (_tmp5_);
 #line 1697 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (self->priv->from_path);
 #line 1697 "/home/jens/Source/shotwell/src/Commands.vala"
-	self->priv->from_path = _tmp7_;
+	self->priv->from_path = _tmp6_;
 #line 1699 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp8_ = tag;
+	_tmp7_ = tag;
 #line 1699 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp9_ = tag_get_hierarchical_children (_tmp8_);
+	_tmp8_ = tag_get_hierarchical_children (_tmp7_);
 #line 1699 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp10_ = _tmp9_;
+	_tmp9_ = _tmp8_;
 #line 1699 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp11_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1699 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp12_ = _tmp11_;
+	_tmp11_ = _tmp10_;
 #line 1699 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp13_ = _tmp12_ > 0;
+	_tmp12_ = _tmp11_ > 0;
 #line 1699 "/home/jens/Source/shotwell/src/Commands.vala"
-	_g_object_unref0 (_tmp10_);
+	_g_object_unref0 (_tmp9_);
 #line 1699 "/home/jens/Source/shotwell/src/Commands.vala"
-	has_children = _tmp13_;
+	has_children = _tmp12_;
 #line 1700 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp14_ = tag;
+	_tmp13_ = tag;
 #line 1700 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp15_ = tag_get_user_visible_name (_tmp14_);
+	_tmp14_ = tag_get_user_visible_name (_tmp13_);
 #line 1700 "/home/jens/Source/shotwell/src/Commands.vala"
-	basename = _tmp15_;
+	basename = _tmp14_;
 #line 1702 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp16_ = new_parent_path;
+	_tmp15_ = new_parent_path;
 #line 1702 "/home/jens/Source/shotwell/src/Commands.vala"
-	if (g_strcmp0 (_tmp16_, TAG_PATH_SEPARATOR_STRING) == 0) {
-#line 14317 "Commands.c"
-		gchar* _tmp17_ = NULL;
-		gboolean _tmp18_ = FALSE;
-		gchar* _tmp23_ = NULL;
+	if (g_strcmp0 (_tmp15_, TAG_PATH_SEPARATOR_STRING) == 0) {
+#line 14210 "Commands.c"
+		gchar* _tmp16_ = NULL;
+		gboolean _tmp17_;
+		gchar* _tmp22_;
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp18_ = has_children;
+		_tmp17_ = has_children;
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
-		if (_tmp18_) {
-#line 14325 "Commands.c"
-			const gchar* _tmp19_ = NULL;
-			gchar* _tmp20_ = NULL;
+		if (_tmp17_) {
+#line 14218 "Commands.c"
+			const gchar* _tmp18_;
+			gchar* _tmp19_;
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp19_ = basename;
+			_tmp18_ = basename;
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp20_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp19_, NULL);
+			_tmp19_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp18_, NULL);
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
-			_g_free0 (_tmp17_);
+			_g_free0 (_tmp16_);
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp17_ = _tmp20_;
-#line 14336 "Commands.c"
+			_tmp16_ = _tmp19_;
+#line 14229 "Commands.c"
 		} else {
-			const gchar* _tmp21_ = NULL;
-			gchar* _tmp22_ = NULL;
+			const gchar* _tmp20_;
+			gchar* _tmp21_;
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp21_ = basename;
+			_tmp20_ = basename;
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp22_ = g_strdup (_tmp21_);
+			_tmp21_ = g_strdup (_tmp20_);
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
-			_g_free0 (_tmp17_);
+			_g_free0 (_tmp16_);
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp17_ = _tmp22_;
-#line 14348 "Commands.c"
+			_tmp16_ = _tmp21_;
+#line 14241 "Commands.c"
 		}
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp23_ = g_strdup (_tmp17_);
+		_tmp22_ = g_strdup (_tmp16_);
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (self->priv->to_path);
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
-		self->priv->to_path = _tmp23_;
+		self->priv->to_path = _tmp22_;
 #line 1702 "/home/jens/Source/shotwell/src/Commands.vala"
-		_g_free0 (_tmp17_);
-#line 14358 "Commands.c"
+		_g_free0 (_tmp16_);
+#line 14251 "Commands.c"
 	} else {
-		const gchar* _tmp24_ = NULL;
-		gboolean _tmp25_ = FALSE;
+		const gchar* _tmp23_;
+		gboolean _tmp24_;
 #line 1704 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp24_ = new_parent_path;
+		_tmp23_ = new_parent_path;
 #line 1704 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp25_ = g_str_has_prefix (_tmp24_, TAG_PATH_SEPARATOR_STRING);
+		_tmp24_ = g_str_has_prefix (_tmp23_, TAG_PATH_SEPARATOR_STRING);
 #line 1704 "/home/jens/Source/shotwell/src/Commands.vala"
-		if (_tmp25_) {
-#line 14368 "Commands.c"
-			const gchar* _tmp26_ = NULL;
-			gchar* _tmp27_ = NULL;
-			gchar* _tmp28_ = NULL;
-			const gchar* _tmp29_ = NULL;
-			gchar* _tmp30_ = NULL;
+		if (_tmp24_) {
+#line 14261 "Commands.c"
+			const gchar* _tmp25_;
+			gchar* _tmp26_;
+			gchar* _tmp27_;
+			const gchar* _tmp28_;
+			gchar* _tmp29_;
 #line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp26_ = new_parent_path;
+			_tmp25_ = new_parent_path;
 #line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp27_ = g_strconcat (_tmp26_, TAG_PATH_SEPARATOR_STRING, NULL);
+			_tmp26_ = g_strconcat (_tmp25_, TAG_PATH_SEPARATOR_STRING, NULL);
 #line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp28_ = _tmp27_;
+			_tmp27_ = _tmp26_;
 #line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp29_ = basename;
+			_tmp28_ = basename;
 #line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp30_ = g_strconcat (_tmp28_, _tmp29_, NULL);
+			_tmp29_ = g_strconcat (_tmp27_, _tmp28_, NULL);
 #line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (self->priv->to_path);
 #line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
-			self->priv->to_path = _tmp30_;
+			self->priv->to_path = _tmp29_;
 #line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
-			_g_free0 (_tmp28_);
-#line 14390 "Commands.c"
+			_g_free0 (_tmp27_);
+#line 14283 "Commands.c"
 		} else {
-			const gchar* _tmp31_ = NULL;
-			gchar* _tmp32_ = NULL;
-			gchar* _tmp33_ = NULL;
-			gchar* _tmp34_ = NULL;
-			gchar* _tmp35_ = NULL;
-			const gchar* _tmp36_ = NULL;
-			gchar* _tmp37_ = NULL;
+			const gchar* _tmp30_;
+			gchar* _tmp31_;
+			gchar* _tmp32_;
+			gchar* _tmp33_;
+			gchar* _tmp34_;
+			const gchar* _tmp35_;
+			gchar* _tmp36_;
 #line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp31_ = new_parent_path;
+			_tmp30_ = new_parent_path;
 #line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp32_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp31_, NULL);
+			_tmp31_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp30_, NULL);
 #line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp33_ = _tmp32_;
+			_tmp32_ = _tmp31_;
 #line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp34_ = g_strconcat (_tmp33_, TAG_PATH_SEPARATOR_STRING, NULL);
+			_tmp33_ = g_strconcat (_tmp32_, TAG_PATH_SEPARATOR_STRING, NULL);
 #line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp35_ = _tmp34_;
+			_tmp34_ = _tmp33_;
 #line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp36_ = basename;
+			_tmp35_ = basename;
 #line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp37_ = g_strconcat (_tmp35_, _tmp36_, NULL);
+			_tmp36_ = g_strconcat (_tmp34_, _tmp35_, NULL);
 #line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (self->priv->to_path);
 #line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
-			self->priv->to_path = _tmp37_;
+			self->priv->to_path = _tmp36_;
 #line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
-			_g_free0 (_tmp35_);
+			_g_free0 (_tmp34_);
 #line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
-			_g_free0 (_tmp33_);
-#line 14421 "Commands.c"
+			_g_free0 (_tmp32_);
+#line 14314 "Commands.c"
 		}
 	}
 #line 1710 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp38_ = self->priv->to_path;
+	_tmp37_ = self->priv->to_path;
 #line 1710 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp39_ = hierarchical_tag_utilities_get_root_path_form (_tmp38_);
+	_tmp38_ = hierarchical_tag_utilities_get_root_path_form (_tmp37_);
 #line 1710 "/home/jens/Source/shotwell/src/Commands.vala"
-	new_to_path = _tmp39_;
+	new_to_path = _tmp38_;
 #line 1711 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp40_ = new_to_path;
+	_tmp39_ = new_to_path;
 #line 1711 "/home/jens/Source/shotwell/src/Commands.vala"
-	if (_tmp40_ != NULL) {
-#line 14434 "Commands.c"
-		const gchar* _tmp41_ = NULL;
-		gchar* _tmp42_ = NULL;
+	if (_tmp39_ != NULL) {
+#line 14327 "Commands.c"
+		const gchar* _tmp40_;
+		gchar* _tmp41_;
 #line 1712 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp41_ = new_to_path;
+		_tmp40_ = new_to_path;
 #line 1712 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp42_ = g_strdup (_tmp41_);
+		_tmp41_ = g_strdup (_tmp40_);
 #line 1712 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (self->priv->to_path);
 #line 1712 "/home/jens/Source/shotwell/src/Commands.vala"
-		self->priv->to_path = _tmp42_;
-#line 14445 "Commands.c"
+		self->priv->to_path = _tmp41_;
+#line 14338 "Commands.c"
 	}
 #line 1714 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp43_ = tag_global;
+	_tmp42_ = tag_global;
 #line 1714 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp44_ = self->priv->to_path;
+	_tmp43_ = self->priv->to_path;
 #line 1714 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp45_ = tag_source_collection_exists (_tmp43_, _tmp44_, FALSE);
+	_tmp44_ = tag_source_collection_exists (_tmp42_, _tmp43_, FALSE);
 #line 1714 "/home/jens/Source/shotwell/src/Commands.vala"
-	if (_tmp45_) {
+	if (_tmp44_) {
 #line 1715 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->to_path_exists = TRUE;
-#line 14457 "Commands.c"
+#line 14350 "Commands.c"
 	}
 #line 1717 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp46_ = self->priv->sources_in_play;
+	_tmp45_ = self->priv->sources_in_play;
 #line 1717 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp47_ = tag;
+	_tmp46_ = tag;
 #line 1717 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp48_ = tag_get_sources (_tmp47_);
+	_tmp47_ = tag_get_sources (_tmp46_);
 #line 1717 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp49_ = _tmp48_;
+	_tmp48_ = _tmp47_;
 #line 1717 "/home/jens/Source/shotwell/src/Commands.vala"
-	gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_COLLECTION, GeeCollection), _tmp49_);
+	gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_COLLECTION, GeeCollection), _tmp48_);
 #line 1717 "/home/jens/Source/shotwell/src/Commands.vala"
-	_g_object_unref0 (_tmp49_);
+	_g_object_unref0 (_tmp48_);
 #line 1719 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp50_ = library_photo_global;
+	_tmp49_ = library_photo_global;
 #line 1719 "/home/jens/Source/shotwell/src/Commands.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed, self, 0);
 #line 1720 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp51_ = video_global;
+	_tmp50_ = video_global;
 #line 1720 "/home/jens/Source/shotwell/src/Commands.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed, self, 0);
 #line 1694 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (new_to_path);
 #line 1694 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (basename);
 #line 1694 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 14485 "Commands.c"
+#line 14378 "Commands.c"
 }
 
 
 ReparentTagCommand* reparent_tag_command_new (Tag* tag, const gchar* new_parent_path) {
 #line 1694 "/home/jens/Source/shotwell/src/Commands.vala"
 	return reparent_tag_command_construct (TYPE_REPARENT_TAG_COMMAND, tag, new_parent_path);
-#line 14492 "Commands.c"
+#line 14385 "Commands.c"
 }
 
 
@@ -14497,11 +14390,11 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
 	g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
 #line 1728 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (destroyed));
-#line 14501 "Commands.c"
+#line 14394 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = destroyed;
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14510,15 +14403,15 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
 		_source_it = _tmp1_;
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 14514 "Commands.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 14407 "Commands.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			GeeHashSet* _tmp6_ = NULL;
-			DataSource* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			GeeHashSet* _tmp6_;
+			DataSource* _tmp7_;
+			gboolean _tmp8_;
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp2_ = _source_it;
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14527,7 +14420,7 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
 			if (!_tmp3_) {
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 14531 "Commands.c"
+#line 14424 "Commands.c"
 			}
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -14543,9 +14436,9 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
 			_tmp8_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 1730 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp8_) {
-#line 14547 "Commands.c"
-				CommandManager* _tmp9_ = NULL;
-				CommandManager* _tmp10_ = NULL;
+#line 14440 "Commands.c"
+				CommandManager* _tmp9_;
+				CommandManager* _tmp10_;
 #line 1731 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp9_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command));
 #line 1731 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14554,135 +14447,177 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
 				command_manager_reset (_tmp10_);
 #line 1731 "/home/jens/Source/shotwell/src/Commands.vala"
 				_command_manager_unref0 (_tmp10_);
-#line 14558 "Commands.c"
+#line 14451 "Commands.c"
 			}
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 14562 "Commands.c"
+#line 14455 "Commands.c"
 		}
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 14566 "Commands.c"
+#line 14459 "Commands.c"
 	}
 }
 
 
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 14580 "Commands.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 14479 "Commands.c"
+	} else {
+		const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 14486 "Commands.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = TRUE;
+#line 14492 "Commands.c"
+	} else {
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 14502 "Commands.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 14506 "Commands.c"
+		gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 14514 "Commands.c"
+	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GRegex* _tmp9_;
+		GRegex* _tmp10_;
+		gchar* _tmp11_ = NULL;
+		GRegex* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 14611 "Commands.c"
-				goto __catch460_g_regex_error;
+#line 14546 "Commands.c"
+				goto __catch461_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 14620 "Commands.c"
+#line 14555 "Commands.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 14636 "Commands.c"
-				goto __catch460_g_regex_error;
+#line 14571 "Commands.c"
+				goto __catch461_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 14647 "Commands.c"
+#line 14582 "Commands.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 14661 "Commands.c"
+#line 14596 "Commands.c"
 	}
-	goto __finally460;
-	__catch460_g_regex_error:
+	goto __finally461;
+	__catch461_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 14675 "Commands.c"
+#line 14610 "Commands.c"
 	}
-	__finally460:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	__finally461:
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 14686 "Commands.c"
+#line 14621 "Commands.c"
 	}
 }
 
@@ -14690,25 +14625,25 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand* self, const gchar* client_path) {
 	GeeMap* result = NULL;
 	gchar* path = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp6_ = NULL;
+	const gchar* _tmp3_;
+	gchar* _tmp6_;
 	GeeMap* _result_ = NULL;
-	GeeHashMap* _tmp7_ = NULL;
-	TagSourceCollection* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
+	GeeHashMap* _tmp7_;
+	TagSourceCollection* _tmp8_;
+	const gchar* _tmp9_;
+	gboolean _tmp10_;
 	Tag* tag = NULL;
-	const gchar* _tmp11_ = NULL;
-	Tag* _tmp12_ = NULL;
+	const gchar* _tmp11_;
+	Tag* _tmp12_;
 	gchar* path_prefix = NULL;
-	Tag* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
+	Tag* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
 #line 1735 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_REPARENT_TAG_COMMAND (self), NULL);
 #line 1735 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14723,20 +14658,20 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 	_tmp3_ = path;
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ != NULL) {
-#line 14727 "Commands.c"
-		const gchar* _tmp4_ = NULL;
+#line 14662 "Commands.c"
+		const gchar* _tmp4_;
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = path;
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp4_;
-#line 14733 "Commands.c"
+#line 14668 "Commands.c"
 	} else {
-		const gchar* _tmp5_ = NULL;
+		const gchar* _tmp5_;
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = client_path;
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp5_;
-#line 14740 "Commands.c"
+#line 14675 "Commands.c"
 	}
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp6_ = g_strdup (_tmp2_);
@@ -14762,7 +14697,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 		_g_free0 (path);
 #line 1743 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 14766 "Commands.c"
+#line 14701 "Commands.c"
 	}
 #line 1745 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp11_ = path;
@@ -14784,15 +14719,15 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 	_g_free0 (_tmp15_);
 #line 1747 "/home/jens/Source/shotwell/src/Commands.vala"
 	path_prefix = _tmp17_;
-#line 14788 "Commands.c"
+#line 14723 "Commands.c"
 	{
 		GeeList* _t_list = NULL;
-		Tag* _tmp18_ = NULL;
-		GeeList* _tmp19_ = NULL;
+		Tag* _tmp18_;
+		GeeList* _tmp19_;
 		gint _t_size = 0;
-		GeeList* _tmp20_ = NULL;
-		gint _tmp21_ = 0;
-		gint _tmp22_ = 0;
+		GeeList* _tmp20_;
+		gint _tmp21_;
+		gint _tmp22_;
 		gint _t_index = 0;
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp18_ = tag;
@@ -14812,32 +14747,32 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 		_t_index = -1;
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 14816 "Commands.c"
-			gint _tmp23_ = 0;
-			gint _tmp24_ = 0;
-			gint _tmp25_ = 0;
+#line 14751 "Commands.c"
+			gint _tmp23_;
+			gint _tmp24_;
+			gint _tmp25_;
 			Tag* t = NULL;
-			GeeList* _tmp26_ = NULL;
-			gint _tmp27_ = 0;
-			gpointer _tmp28_ = NULL;
+			GeeList* _tmp26_;
+			gint _tmp27_;
+			gpointer _tmp28_;
 			gchar* child_subpath = NULL;
-			Tag* _tmp29_ = NULL;
-			gchar* _tmp30_ = NULL;
-			gchar* _tmp31_ = NULL;
-			const gchar* _tmp32_ = NULL;
-			gchar* _tmp33_ = NULL;
-			gchar* _tmp34_ = NULL;
-			GeeMap* _tmp35_ = NULL;
-			const gchar* _tmp36_ = NULL;
-			GeeHashSet* _tmp37_ = NULL;
-			GeeHashSet* _tmp38_ = NULL;
-			GeeMap* _tmp39_ = NULL;
-			const gchar* _tmp40_ = NULL;
-			gpointer _tmp41_ = NULL;
-			GeeSet* _tmp42_ = NULL;
-			Tag* _tmp43_ = NULL;
-			GeeCollection* _tmp44_ = NULL;
-			GeeCollection* _tmp45_ = NULL;
+			Tag* _tmp29_;
+			gchar* _tmp30_;
+			gchar* _tmp31_;
+			const gchar* _tmp32_;
+			gchar* _tmp33_;
+			gchar* _tmp34_;
+			GeeMap* _tmp35_;
+			const gchar* _tmp36_;
+			GeeHashSet* _tmp37_;
+			GeeHashSet* _tmp38_;
+			GeeMap* _tmp39_;
+			const gchar* _tmp40_;
+			gpointer _tmp41_;
+			GeeSet* _tmp42_;
+			Tag* _tmp43_;
+			GeeCollection* _tmp44_;
+			GeeCollection* _tmp45_;
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp23_ = _t_index;
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14850,7 +14785,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 			if (!(_tmp24_ < _tmp25_)) {
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 14854 "Commands.c"
+#line 14789 "Commands.c"
 			}
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp26_ = _t_list;
@@ -14912,11 +14847,11 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 			_g_free0 (child_subpath);
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (t);
-#line 14916 "Commands.c"
+#line 14851 "Commands.c"
 		}
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_t_list);
-#line 14920 "Commands.c"
+#line 14855 "Commands.c"
 	}
 #line 1755 "/home/jens/Source/shotwell/src/Commands.vala"
 	result = _result_;
@@ -14928,24 +14863,24 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 	_g_free0 (path);
 #line 1755 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 14932 "Commands.c"
+#line 14867 "Commands.c"
 }
 
 
 static void reparent_tag_command_restore_child_attachments_at (ReparentTagCommand* self, const gchar* client_path, GeeMap* child_structure) {
 	gchar* new_path = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp3_;
 	gchar* path = NULL;
-	gchar* _tmp6_ = NULL;
-	TagSourceCollection* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	gchar* _tmp6_;
+	TagSourceCollection* _tmp7_;
+	const gchar* _tmp8_;
+	gboolean _tmp9_;
 	Tag* tag = NULL;
-	const gchar* _tmp10_ = NULL;
-	Tag* _tmp11_ = NULL;
+	const gchar* _tmp10_;
+	Tag* _tmp11_;
 #line 1758 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
 #line 1758 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14962,20 +14897,20 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 	_tmp3_ = new_path;
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ != NULL) {
-#line 14966 "Commands.c"
-		const gchar* _tmp4_ = NULL;
+#line 14901 "Commands.c"
+		const gchar* _tmp4_;
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = new_path;
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp4_;
-#line 14972 "Commands.c"
+#line 14907 "Commands.c"
 	} else {
-		const gchar* _tmp5_ = NULL;
+		const gchar* _tmp5_;
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = client_path;
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp5_;
-#line 14979 "Commands.c"
+#line 14914 "Commands.c"
 	}
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp6_ = g_strdup (_tmp2_);
@@ -14995,15 +14930,15 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 	_tmp11_ = tag_for_path (_tmp10_);
 #line 1765 "/home/jens/Source/shotwell/src/Commands.vala"
 	tag = _tmp11_;
-#line 14999 "Commands.c"
+#line 14934 "Commands.c"
 	{
 		GeeIterator* _child_subpath_it = NULL;
-		GeeMap* _tmp12_ = NULL;
-		GeeSet* _tmp13_ = NULL;
-		GeeSet* _tmp14_ = NULL;
-		GeeSet* _tmp15_ = NULL;
-		GeeIterator* _tmp16_ = NULL;
-		GeeIterator* _tmp17_ = NULL;
+		GeeMap* _tmp12_;
+		GeeSet* _tmp13_;
+		GeeSet* _tmp14_;
+		GeeSet* _tmp15_;
+		GeeIterator* _tmp16_;
+		GeeIterator* _tmp17_;
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp12_ = child_structure;
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15022,29 +14957,29 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 		_child_subpath_it = _tmp17_;
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 15026 "Commands.c"
-			GeeIterator* _tmp18_ = NULL;
-			gboolean _tmp19_ = FALSE;
+#line 14961 "Commands.c"
+			GeeIterator* _tmp18_;
+			gboolean _tmp19_;
 			gchar* child_subpath = NULL;
-			GeeIterator* _tmp20_ = NULL;
-			gpointer _tmp21_ = NULL;
+			GeeIterator* _tmp20_;
+			gpointer _tmp21_;
 			gchar* child_path = NULL;
-			Tag* _tmp22_ = NULL;
-			gchar* _tmp23_ = NULL;
-			gchar* _tmp24_ = NULL;
-			gchar* _tmp25_ = NULL;
-			gchar* _tmp26_ = NULL;
-			const gchar* _tmp27_ = NULL;
-			gchar* _tmp28_ = NULL;
-			gchar* _tmp29_ = NULL;
-			Tag* _tmp30_ = NULL;
-			gchar* _tmp31_ = NULL;
-			gchar* _tmp32_ = NULL;
-			gboolean _tmp33_ = FALSE;
-			gboolean _tmp34_ = FALSE;
-			TagSourceCollection* _tmp43_ = NULL;
-			const gchar* _tmp44_ = NULL;
-			gboolean _tmp45_ = FALSE;
+			Tag* _tmp22_;
+			gchar* _tmp23_;
+			gchar* _tmp24_;
+			gchar* _tmp25_;
+			gchar* _tmp26_;
+			const gchar* _tmp27_;
+			gchar* _tmp28_;
+			gchar* _tmp29_;
+			Tag* _tmp30_;
+			gchar* _tmp31_;
+			gchar* _tmp32_;
+			gboolean _tmp33_;
+			gboolean _tmp34_;
+			TagSourceCollection* _tmp43_;
+			const gchar* _tmp44_;
+			gboolean _tmp45_;
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp18_ = _child_subpath_it;
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15053,7 +14988,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 			if (!_tmp19_) {
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 15057 "Commands.c"
+#line 14992 "Commands.c"
 			}
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp20_ = _child_subpath_it;
@@ -15097,15 +15032,15 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 			_g_free0 (_tmp32_);
 #line 1770 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp34_) {
-#line 15101 "Commands.c"
-				Tag* _tmp35_ = NULL;
-				Tag* _tmp36_ = NULL;
-				gchar* _tmp37_ = NULL;
-				gchar* _tmp38_ = NULL;
-				gchar* _tmp39_ = NULL;
-				gchar* _tmp40_ = NULL;
-				const gchar* _tmp41_ = NULL;
-				gchar* _tmp42_ = NULL;
+#line 15036 "Commands.c"
+				Tag* _tmp35_;
+				Tag* _tmp36_;
+				gchar* _tmp37_;
+				gchar* _tmp38_;
+				gchar* _tmp39_;
+				gchar* _tmp40_;
+				const gchar* _tmp41_;
+				gchar* _tmp42_;
 #line 1771 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp35_ = tag;
 #line 1771 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15132,7 +15067,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 				_g_free0 (_tmp40_);
 #line 1772 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_free0 (_tmp38_);
-#line 15136 "Commands.c"
+#line 15071 "Commands.c"
 			}
 #line 1775 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp43_ = tag_global;
@@ -15142,15 +15077,15 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 			_tmp45_ = tag_source_collection_exists (_tmp43_, _tmp44_, FALSE);
 #line 1775 "/home/jens/Source/shotwell/src/Commands.vala"
 			_vala_assert (_tmp45_, "Tag.global.exists(child_path)");
-#line 15146 "Commands.c"
+#line 15081 "Commands.c"
 			{
 				GeeIterator* _s_it = NULL;
-				GeeMap* _tmp46_ = NULL;
-				const gchar* _tmp47_ = NULL;
-				gpointer _tmp48_ = NULL;
-				GeeSet* _tmp49_ = NULL;
-				GeeIterator* _tmp50_ = NULL;
-				GeeIterator* _tmp51_ = NULL;
+				GeeMap* _tmp46_;
+				const gchar* _tmp47_;
+				gpointer _tmp48_;
+				GeeSet* _tmp49_;
+				GeeIterator* _tmp50_;
+				GeeIterator* _tmp51_;
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp46_ = child_structure;
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15169,16 +15104,16 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 				_s_it = _tmp51_;
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 15173 "Commands.c"
-					GeeIterator* _tmp52_ = NULL;
-					gboolean _tmp53_ = FALSE;
+#line 15108 "Commands.c"
+					GeeIterator* _tmp52_;
+					gboolean _tmp53_;
 					MediaSource* s = NULL;
-					GeeIterator* _tmp54_ = NULL;
-					gpointer _tmp55_ = NULL;
-					const gchar* _tmp56_ = NULL;
-					Tag* _tmp57_ = NULL;
-					Tag* _tmp58_ = NULL;
-					MediaSource* _tmp59_ = NULL;
+					GeeIterator* _tmp54_;
+					gpointer _tmp55_;
+					const gchar* _tmp56_;
+					Tag* _tmp57_;
+					Tag* _tmp58_;
+					MediaSource* _tmp59_;
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp52_ = _s_it;
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15187,7 +15122,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 					if (!_tmp53_) {
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 15191 "Commands.c"
+#line 15126 "Commands.c"
 					}
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp54_ = _s_it;
@@ -15209,21 +15144,21 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 					_g_object_unref0 (_tmp58_);
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (s);
-#line 15213 "Commands.c"
+#line 15148 "Commands.c"
 				}
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_s_it);
-#line 15217 "Commands.c"
+#line 15152 "Commands.c"
 			}
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (child_path);
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (child_subpath);
-#line 15223 "Commands.c"
+#line 15158 "Commands.c"
 		}
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_child_subpath_it);
-#line 15227 "Commands.c"
+#line 15162 "Commands.c"
 	}
 #line 1758 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (tag);
@@ -15231,24 +15166,24 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 	_g_free0 (path);
 #line 1758 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (new_path);
-#line 15235 "Commands.c"
+#line 15170 "Commands.c"
 }
 
 
 static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand* self, const gchar* client_path) {
 	gchar* new_path = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp3_;
 	gchar* path = NULL;
-	gchar* _tmp6_ = NULL;
-	TagSourceCollection* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	gchar* _tmp6_;
+	TagSourceCollection* _tmp7_;
+	const gchar* _tmp8_;
+	gboolean _tmp9_;
 	Tag* tag = NULL;
-	const gchar* _tmp10_ = NULL;
-	Tag* _tmp11_ = NULL;
+	const gchar* _tmp10_;
+	Tag* _tmp11_;
 #line 1782 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
 #line 1782 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15263,20 +15198,20 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 	_tmp3_ = new_path;
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ != NULL) {
-#line 15267 "Commands.c"
-		const gchar* _tmp4_ = NULL;
+#line 15202 "Commands.c"
+		const gchar* _tmp4_;
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = new_path;
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp4_;
-#line 15273 "Commands.c"
+#line 15208 "Commands.c"
 	} else {
-		const gchar* _tmp5_ = NULL;
+		const gchar* _tmp5_;
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = client_path;
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp5_;
-#line 15280 "Commands.c"
+#line 15215 "Commands.c"
 	}
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp6_ = g_strdup (_tmp2_);
@@ -15296,11 +15231,11 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 	_tmp11_ = tag_for_path (_tmp10_);
 #line 1788 "/home/jens/Source/shotwell/src/Commands.vala"
 	tag = _tmp11_;
-#line 15300 "Commands.c"
+#line 15235 "Commands.c"
 	{
 		GeeIterator* _s_it = NULL;
-		GeeHashSet* _tmp12_ = NULL;
-		GeeIterator* _tmp13_ = NULL;
+		GeeHashSet* _tmp12_;
+		GeeIterator* _tmp13_;
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp12_ = self->priv->sources_in_play;
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15309,14 +15244,14 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 		_s_it = _tmp13_;
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 15313 "Commands.c"
-			GeeIterator* _tmp14_ = NULL;
-			gboolean _tmp15_ = FALSE;
+#line 15248 "Commands.c"
+			GeeIterator* _tmp14_;
+			gboolean _tmp15_;
 			MediaSource* s = NULL;
-			GeeIterator* _tmp16_ = NULL;
-			gpointer _tmp17_ = NULL;
-			Tag* _tmp18_ = NULL;
-			MediaSource* _tmp19_ = NULL;
+			GeeIterator* _tmp16_;
+			gpointer _tmp17_;
+			Tag* _tmp18_;
+			MediaSource* _tmp19_;
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp14_ = _s_it;
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15325,7 +15260,7 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 			if (!_tmp15_) {
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 15329 "Commands.c"
+#line 15264 "Commands.c"
 			}
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp16_ = _s_it;
@@ -15341,11 +15276,11 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 			tag_attach (_tmp18_, _tmp19_);
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (s);
-#line 15345 "Commands.c"
+#line 15280 "Commands.c"
 		}
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_s_it);
-#line 15349 "Commands.c"
+#line 15284 "Commands.c"
 	}
 #line 1782 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (tag);
@@ -15353,43 +15288,43 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 	_g_free0 (path);
 #line 1782 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (new_path);
-#line 15357 "Commands.c"
+#line 15292 "Commands.c"
 }
 
 
 static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
-	GeeArrayList* _tmp2_ = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	GeeMap* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	GeeMap* _tmp6_ = NULL;
-	TagSourceCollection* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
+	GeeArrayList* _tmp2_;
+	GeeArrayList* _tmp3_;
+	GeeMap* _tmp4_;
+	const gchar* _tmp5_;
+	GeeMap* _tmp6_;
+	TagSourceCollection* _tmp7_;
+	const gchar* _tmp8_;
+	gboolean _tmp9_;
 	Tag* from_tag = NULL;
-	const gchar* _tmp10_ = NULL;
-	Tag* _tmp11_ = NULL;
-	GeeList* _tmp12_ = NULL;
-	Tag* _tmp13_ = NULL;
-	SourceProxy* _tmp14_ = NULL;
-	SourceProxy* _tmp15_ = NULL;
+	const gchar* _tmp10_;
+	Tag* _tmp11_;
+	GeeList* _tmp12_;
+	Tag* _tmp13_;
+	SourceProxy* _tmp14_;
+	SourceProxy* _tmp15_;
 	GeeList* parent_paths = NULL;
-	const gchar* _tmp16_ = NULL;
-	GeeList* _tmp17_ = NULL;
-	GeeList* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	const gchar* _tmp26_ = NULL;
-	const gchar* _tmp30_ = NULL;
-	const gchar* _tmp42_ = NULL;
-	const gchar* _tmp59_ = NULL;
+	const gchar* _tmp16_;
+	GeeList* _tmp17_;
+	GeeList* _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
+	const gchar* _tmp26_;
+	const gchar* _tmp30_;
+	const gchar* _tmp42_;
+	const gchar* _tmp59_;
 	GeeList* from_children = NULL;
-	Tag* _tmp66_ = NULL;
-	GeeList* _tmp67_ = NULL;
-	const gchar* _tmp81_ = NULL;
-	const gchar* _tmp100_ = NULL;
+	Tag* _tmp66_;
+	GeeList* _tmp67_;
+	const gchar* _tmp81_;
+	const gchar* _tmp100_;
 #line 1794 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
 #line 1795 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15464,12 +15399,12 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 	_tmp20_ = _tmp19_;
 #line 1812 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp20_ > 0) {
-#line 15468 "Commands.c"
-		GeeList* _tmp21_ = NULL;
-		GeeList* _tmp22_ = NULL;
-		gint _tmp23_ = 0;
-		gint _tmp24_ = 0;
-		gpointer _tmp25_ = NULL;
+#line 15403 "Commands.c"
+		GeeList* _tmp21_;
+		GeeList* _tmp22_;
+		gint _tmp23_;
+		gint _tmp24_;
+		gpointer _tmp25_;
 #line 1813 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp21_ = parent_paths;
 #line 1813 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15484,16 +15419,16 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_free0 (self->priv->to_path_parent_path);
 #line 1813 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->to_path_parent_path = (gchar*) _tmp25_;
-#line 15488 "Commands.c"
+#line 15423 "Commands.c"
 	}
 #line 1814 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp26_ = self->priv->to_path_parent_path;
 #line 1814 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp26_ != NULL) {
-#line 15494 "Commands.c"
-		GeeMap* _tmp27_ = NULL;
-		const gchar* _tmp28_ = NULL;
-		GeeMap* _tmp29_ = NULL;
+#line 15429 "Commands.c"
+		GeeMap* _tmp27_;
+		const gchar* _tmp28_;
+		GeeMap* _tmp29_;
 #line 1815 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp27_ = self->priv->existing_dest_child_structure;
 #line 1815 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15506,24 +15441,24 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_object_unref0 (self->priv->existing_dest_child_structure);
 #line 1816 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->existing_dest_child_structure = _tmp29_;
-#line 15510 "Commands.c"
+#line 15445 "Commands.c"
 	}
 #line 1820 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp30_ = self->priv->to_path_parent_path;
 #line 1820 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp30_ == NULL) {
-#line 15516 "Commands.c"
-		GeeMap* _tmp31_ = NULL;
-		GeeSet* _tmp32_ = NULL;
-		const gchar* _tmp33_ = NULL;
-		GeeMap* _tmp34_ = NULL;
-		GeeHashSet* _tmp35_ = NULL;
-		GeeSet* _tmp36_ = NULL;
-		const gchar* _tmp37_ = NULL;
-		Tag* _tmp38_ = NULL;
-		Tag* _tmp39_ = NULL;
-		GeeCollection* _tmp40_ = NULL;
-		GeeCollection* _tmp41_ = NULL;
+#line 15451 "Commands.c"
+		GeeMap* _tmp31_;
+		GeeSet* _tmp32_;
+		const gchar* _tmp33_;
+		GeeMap* _tmp34_;
+		GeeHashSet* _tmp35_;
+		GeeSet* _tmp36_;
+		const gchar* _tmp37_;
+		Tag* _tmp38_;
+		Tag* _tmp39_;
+		GeeCollection* _tmp40_;
+		GeeCollection* _tmp41_;
 #line 1821 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp31_ = self->priv->existing_dest_child_structure;
 #line 1821 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15564,28 +15499,28 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_object_unref0 (_tmp41_);
 #line 1825 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp39_);
-#line 15568 "Commands.c"
+#line 15503 "Commands.c"
 	}
 #line 1829 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp42_ = self->priv->to_path_parent_path;
 #line 1829 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp42_ != NULL) {
-#line 15574 "Commands.c"
+#line 15509 "Commands.c"
 		gchar* new_tpp = NULL;
-		const gchar* _tmp43_ = NULL;
-		gchar* _tmp44_ = NULL;
+		const gchar* _tmp43_;
+		gchar* _tmp44_;
 		const gchar* _tmp45_ = NULL;
-		const gchar* _tmp46_ = NULL;
-		gchar* _tmp49_ = NULL;
-		TagSourceCollection* _tmp50_ = NULL;
-		const gchar* _tmp51_ = NULL;
-		gboolean _tmp52_ = FALSE;
-		GeeList* _tmp53_ = NULL;
-		const gchar* _tmp54_ = NULL;
-		Tag* _tmp55_ = NULL;
-		Tag* _tmp56_ = NULL;
-		SourceProxy* _tmp57_ = NULL;
-		SourceProxy* _tmp58_ = NULL;
+		const gchar* _tmp46_;
+		gchar* _tmp49_;
+		TagSourceCollection* _tmp50_;
+		const gchar* _tmp51_;
+		gboolean _tmp52_;
+		GeeList* _tmp53_;
+		const gchar* _tmp54_;
+		Tag* _tmp55_;
+		Tag* _tmp56_;
+		SourceProxy* _tmp57_;
+		SourceProxy* _tmp58_;
 #line 1830 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp43_ = self->priv->to_path_parent_path;
 #line 1830 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15596,20 +15531,20 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_tmp46_ = new_tpp;
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp46_ != NULL) {
-#line 15600 "Commands.c"
-			const gchar* _tmp47_ = NULL;
+#line 15535 "Commands.c"
+			const gchar* _tmp47_;
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp47_ = new_tpp;
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp45_ = _tmp47_;
-#line 15606 "Commands.c"
+#line 15541 "Commands.c"
 		} else {
-			const gchar* _tmp48_ = NULL;
+			const gchar* _tmp48_;
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp48_ = self->priv->to_path_parent_path;
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp45_ = _tmp48_;
-#line 15613 "Commands.c"
+#line 15548 "Commands.c"
 		}
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp49_ = g_strdup (_tmp45_);
@@ -15645,19 +15580,19 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_object_unref0 (_tmp56_);
 #line 1829 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (new_tpp);
-#line 15649 "Commands.c"
+#line 15584 "Commands.c"
 	}
 #line 1837 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp59_ = self->priv->to_path_parent_path;
 #line 1837 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp59_ == NULL) {
-#line 15655 "Commands.c"
-		GeeList* _tmp60_ = NULL;
-		const gchar* _tmp61_ = NULL;
-		Tag* _tmp62_ = NULL;
-		Tag* _tmp63_ = NULL;
-		SourceProxy* _tmp64_ = NULL;
-		SourceProxy* _tmp65_ = NULL;
+#line 15590 "Commands.c"
+		GeeList* _tmp60_;
+		const gchar* _tmp61_;
+		Tag* _tmp62_;
+		Tag* _tmp63_;
+		SourceProxy* _tmp64_;
+		SourceProxy* _tmp65_;
 #line 1838 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp60_ = self->priv->dest_before_state;
 #line 1838 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15676,7 +15611,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_source_proxy_unref0 (_tmp65_);
 #line 1838 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp63_);
-#line 15680 "Commands.c"
+#line 15615 "Commands.c"
 	}
 #line 1842 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp66_ = from_tag;
@@ -15684,12 +15619,12 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 	_tmp67_ = tag_get_hierarchical_children (_tmp66_);
 #line 1842 "/home/jens/Source/shotwell/src/Commands.vala"
 	from_children = _tmp67_;
-#line 15688 "Commands.c"
+#line 15623 "Commands.c"
 	{
 		gint i = 0;
-		GeeList* _tmp68_ = NULL;
-		gint _tmp69_ = 0;
-		gint _tmp70_ = 0;
+		GeeList* _tmp68_;
+		gint _tmp69_;
+		gint _tmp70_;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp68_ = from_children;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15698,31 +15633,31 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_tmp70_ = _tmp69_;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = _tmp70_ - 1;
-#line 15702 "Commands.c"
+#line 15637 "Commands.c"
 		{
 			gboolean _tmp71_ = FALSE;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp71_ = TRUE;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 15709 "Commands.c"
-				gint _tmp73_ = 0;
-				GeeList* _tmp74_ = NULL;
-				GeeList* _tmp75_ = NULL;
-				gint _tmp76_ = 0;
-				gpointer _tmp77_ = NULL;
-				Tag* _tmp78_ = NULL;
-				SourceProxy* _tmp79_ = NULL;
-				SourceProxy* _tmp80_ = NULL;
+#line 15644 "Commands.c"
+				gint _tmp73_;
+				GeeList* _tmp74_;
+				GeeList* _tmp75_;
+				gint _tmp76_;
+				gpointer _tmp77_;
+				Tag* _tmp78_;
+				SourceProxy* _tmp79_;
+				SourceProxy* _tmp80_;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp71_) {
-#line 15720 "Commands.c"
-					gint _tmp72_ = 0;
+#line 15655 "Commands.c"
+					gint _tmp72_;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp72_ = i;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp72_ - 1;
-#line 15726 "Commands.c"
+#line 15661 "Commands.c"
 				}
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp71_ = FALSE;
@@ -15732,7 +15667,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 				if (!(_tmp73_ >= 0)) {
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 15736 "Commands.c"
+#line 15671 "Commands.c"
 				}
 #line 1844 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp74_ = self->priv->src_before_state;
@@ -15754,7 +15689,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 				_source_proxy_unref0 (_tmp80_);
 #line 1844 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp78_);
-#line 15758 "Commands.c"
+#line 15693 "Commands.c"
 			}
 		}
 	}
@@ -15762,13 +15697,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 	_tmp81_ = self->priv->to_path_parent_path;
 #line 1848 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp81_ != NULL) {
-#line 15766 "Commands.c"
+#line 15701 "Commands.c"
 		GeeList* to_children = NULL;
-		const gchar* _tmp82_ = NULL;
-		Tag* _tmp83_ = NULL;
-		Tag* _tmp84_ = NULL;
-		GeeList* _tmp85_ = NULL;
-		GeeList* _tmp86_ = NULL;
+		const gchar* _tmp82_;
+		Tag* _tmp83_;
+		Tag* _tmp84_;
+		GeeList* _tmp85_;
+		GeeList* _tmp86_;
 #line 1849 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp82_ = self->priv->to_path_parent_path;
 #line 1849 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15783,12 +15718,12 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_object_unref0 (_tmp84_);
 #line 1849 "/home/jens/Source/shotwell/src/Commands.vala"
 		to_children = _tmp86_;
-#line 15787 "Commands.c"
+#line 15722 "Commands.c"
 		{
 			gint i = 0;
-			GeeList* _tmp87_ = NULL;
-			gint _tmp88_ = 0;
-			gint _tmp89_ = 0;
+			GeeList* _tmp87_;
+			gint _tmp88_;
+			gint _tmp89_;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp87_ = to_children;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15797,31 +15732,31 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 			_tmp89_ = _tmp88_;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 			i = _tmp89_ - 1;
-#line 15801 "Commands.c"
+#line 15736 "Commands.c"
 			{
 				gboolean _tmp90_ = FALSE;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp90_ = TRUE;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 15808 "Commands.c"
-					gint _tmp92_ = 0;
-					GeeList* _tmp93_ = NULL;
-					GeeList* _tmp94_ = NULL;
-					gint _tmp95_ = 0;
-					gpointer _tmp96_ = NULL;
-					Tag* _tmp97_ = NULL;
-					SourceProxy* _tmp98_ = NULL;
-					SourceProxy* _tmp99_ = NULL;
+#line 15743 "Commands.c"
+					gint _tmp92_;
+					GeeList* _tmp93_;
+					GeeList* _tmp94_;
+					gint _tmp95_;
+					gpointer _tmp96_;
+					Tag* _tmp97_;
+					SourceProxy* _tmp98_;
+					SourceProxy* _tmp99_;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (!_tmp90_) {
-#line 15819 "Commands.c"
-						gint _tmp91_ = 0;
+#line 15754 "Commands.c"
+						gint _tmp91_;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp91_ = i;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 						i = _tmp91_ - 1;
-#line 15825 "Commands.c"
+#line 15760 "Commands.c"
 					}
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp90_ = FALSE;
@@ -15831,7 +15766,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 					if (!(_tmp92_ >= 0)) {
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 15835 "Commands.c"
+#line 15770 "Commands.c"
 					}
 #line 1851 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp93_ = self->priv->dest_before_state;
@@ -15853,25 +15788,25 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 					_source_proxy_unref0 (_tmp99_);
 #line 1851 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_tmp97_);
-#line 15857 "Commands.c"
+#line 15792 "Commands.c"
 				}
 			}
 		}
 #line 1848 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (to_children);
-#line 15863 "Commands.c"
+#line 15798 "Commands.c"
 	}
 #line 1856 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp100_ = self->priv->to_path_parent_path;
 #line 1856 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp100_ == NULL) {
-#line 15869 "Commands.c"
+#line 15804 "Commands.c"
 		GeeList* to_children = NULL;
-		const gchar* _tmp101_ = NULL;
-		Tag* _tmp102_ = NULL;
-		Tag* _tmp103_ = NULL;
-		GeeList* _tmp104_ = NULL;
-		GeeList* _tmp105_ = NULL;
+		const gchar* _tmp101_;
+		Tag* _tmp102_;
+		Tag* _tmp103_;
+		GeeList* _tmp104_;
+		GeeList* _tmp105_;
 #line 1857 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp101_ = self->priv->to_path;
 #line 1857 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15886,12 +15821,12 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_object_unref0 (_tmp103_);
 #line 1857 "/home/jens/Source/shotwell/src/Commands.vala"
 		to_children = _tmp105_;
-#line 15890 "Commands.c"
+#line 15825 "Commands.c"
 		{
 			gint i = 0;
-			GeeList* _tmp106_ = NULL;
-			gint _tmp107_ = 0;
-			gint _tmp108_ = 0;
+			GeeList* _tmp106_;
+			gint _tmp107_;
+			gint _tmp108_;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp106_ = to_children;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15900,31 +15835,31 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 			_tmp108_ = _tmp107_;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 			i = _tmp108_ - 1;
-#line 15904 "Commands.c"
+#line 15839 "Commands.c"
 			{
 				gboolean _tmp109_ = FALSE;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp109_ = TRUE;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 15911 "Commands.c"
-					gint _tmp111_ = 0;
-					GeeList* _tmp112_ = NULL;
-					GeeList* _tmp113_ = NULL;
-					gint _tmp114_ = 0;
-					gpointer _tmp115_ = NULL;
-					Tag* _tmp116_ = NULL;
-					SourceProxy* _tmp117_ = NULL;
-					SourceProxy* _tmp118_ = NULL;
+#line 15846 "Commands.c"
+					gint _tmp111_;
+					GeeList* _tmp112_;
+					GeeList* _tmp113_;
+					gint _tmp114_;
+					gpointer _tmp115_;
+					Tag* _tmp116_;
+					SourceProxy* _tmp117_;
+					SourceProxy* _tmp118_;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (!_tmp109_) {
-#line 15922 "Commands.c"
-						gint _tmp110_ = 0;
+#line 15857 "Commands.c"
+						gint _tmp110_;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp110_ = i;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 						i = _tmp110_ - 1;
-#line 15928 "Commands.c"
+#line 15863 "Commands.c"
 					}
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp109_ = FALSE;
@@ -15934,7 +15869,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 					if (!(_tmp111_ >= 0)) {
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 15938 "Commands.c"
+#line 15873 "Commands.c"
 					}
 #line 1859 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp112_ = self->priv->dest_before_state;
@@ -15956,13 +15891,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 					_source_proxy_unref0 (_tmp118_);
 #line 1859 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_tmp116_);
-#line 15960 "Commands.c"
+#line 15895 "Commands.c"
 				}
 			}
 		}
 #line 1856 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (to_children);
-#line 15966 "Commands.c"
+#line 15901 "Commands.c"
 	}
 #line 1794 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (from_children);
@@ -15970,50 +15905,50 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 	_g_object_unref0 (parent_paths);
 #line 1794 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (from_tag);
-#line 15974 "Commands.c"
+#line 15909 "Commands.c"
 }
 
 
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 15997 "Commands.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 15932 "Commands.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 16005 "Commands.c"
+#line 15940 "Commands.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 16017 "Commands.c"
+#line 15952 "Commands.c"
 	}
 }
 
@@ -16022,135 +15957,135 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 16041 "Commands.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 15976 "Commands.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 16047 "Commands.c"
+#line 15982 "Commands.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 16051 "Commands.c"
+#line 15986 "Commands.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 16055 "Commands.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 15990 "Commands.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 16067 "Commands.c"
+#line 16002 "Commands.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 16077 "Commands.c"
+#line 16012 "Commands.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 16083 "Commands.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 16018 "Commands.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 16097 "Commands.c"
+#line 16032 "Commands.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 16107 "Commands.c"
+#line 16042 "Commands.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 16113 "Commands.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 16048 "Commands.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 16122 "Commands.c"
+#line 16057 "Commands.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 16142 "Commands.c"
+#line 16077 "Commands.c"
 }
 
 
 static void reparent_tag_command_restore_before_state (ReparentTagCommand* self) {
-	GeeList* _tmp0_ = NULL;
-	GeeMap* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	GeeList* _tmp0_;
+	GeeMap* _tmp1_;
+	const gchar* _tmp2_;
 	const gchar* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
+	const gchar* _tmp11_;
 	gchar* unwind_target = NULL;
-	gchar* _tmp14_ = NULL;
-	const gchar* _tmp93_ = NULL;
+	gchar* _tmp14_;
+	const gchar* _tmp93_;
 #line 1863 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
 #line 1864 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16165,13 +16100,13 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 	_tmp2_ = self->priv->to_path_parent_path;
 #line 1868 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ != NULL) {
-#line 16169 "Commands.c"
+#line 16104 "Commands.c"
 		gchar* new_tpp = NULL;
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
 		const gchar* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp9_ = NULL;
+		const gchar* _tmp6_;
+		gchar* _tmp9_;
 #line 1869 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->to_path_parent_path;
 #line 1869 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16182,20 +16117,20 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_tmp6_ = new_tpp;
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp6_ != NULL) {
-#line 16186 "Commands.c"
-			const gchar* _tmp7_ = NULL;
+#line 16121 "Commands.c"
+			const gchar* _tmp7_;
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp7_ = new_tpp;
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = _tmp7_;
-#line 16192 "Commands.c"
+#line 16127 "Commands.c"
 		} else {
-			const gchar* _tmp8_ = NULL;
+			const gchar* _tmp8_;
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = self->priv->to_path_parent_path;
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = _tmp8_;
-#line 16199 "Commands.c"
+#line 16134 "Commands.c"
 		}
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp9_ = g_strdup (_tmp5_);
@@ -16205,43 +16140,43 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		self->priv->to_path_parent_path = _tmp9_;
 #line 1868 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (new_tpp);
-#line 16209 "Commands.c"
+#line 16144 "Commands.c"
 	}
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp11_ = self->priv->to_path_parent_path;
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp11_ != NULL) {
-#line 16215 "Commands.c"
-		const gchar* _tmp12_ = NULL;
+#line 16150 "Commands.c"
+		const gchar* _tmp12_;
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp12_ = self->priv->to_path_parent_path;
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp10_ = _tmp12_;
-#line 16221 "Commands.c"
+#line 16156 "Commands.c"
 	} else {
-		const gchar* _tmp13_ = NULL;
+		const gchar* _tmp13_;
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp13_ = self->priv->to_path;
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp10_ = _tmp13_;
-#line 16228 "Commands.c"
+#line 16163 "Commands.c"
 	}
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp14_ = g_strdup (_tmp10_);
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 	unwind_target = _tmp14_;
-#line 16234 "Commands.c"
+#line 16169 "Commands.c"
 	{
 		GeeList* _t_list = NULL;
-		const gchar* _tmp15_ = NULL;
-		Tag* _tmp16_ = NULL;
-		Tag* _tmp17_ = NULL;
-		GeeList* _tmp18_ = NULL;
-		GeeList* _tmp19_ = NULL;
+		const gchar* _tmp15_;
+		Tag* _tmp16_;
+		Tag* _tmp17_;
+		GeeList* _tmp18_;
+		GeeList* _tmp19_;
 		gint _t_size = 0;
-		GeeList* _tmp20_ = NULL;
-		gint _tmp21_ = 0;
-		gint _tmp22_ = 0;
+		GeeList* _tmp20_;
+		gint _tmp21_;
+		gint _tmp22_;
 		gint _t_index = 0;
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp15_ = unwind_target;
@@ -16269,26 +16204,26 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_t_index = -1;
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 16273 "Commands.c"
-			gint _tmp23_ = 0;
-			gint _tmp24_ = 0;
-			gint _tmp25_ = 0;
+#line 16208 "Commands.c"
+			gint _tmp23_;
+			gint _tmp24_;
+			gint _tmp25_;
 			Tag* t = NULL;
-			GeeList* _tmp26_ = NULL;
-			gint _tmp27_ = 0;
-			gpointer _tmp28_ = NULL;
+			GeeList* _tmp26_;
+			gint _tmp27_;
+			gpointer _tmp28_;
 			gchar* child_subpath = NULL;
-			Tag* _tmp29_ = NULL;
-			gchar* _tmp30_ = NULL;
-			gchar* _tmp31_ = NULL;
-			const gchar* _tmp32_ = NULL;
-			gchar* _tmp33_ = NULL;
-			gchar* _tmp34_ = NULL;
-			const gchar* _tmp35_ = NULL;
-			gboolean _tmp36_ = FALSE;
-			GeeMap* _tmp39_ = NULL;
-			const gchar* _tmp40_ = NULL;
-			gboolean _tmp41_ = FALSE;
+			Tag* _tmp29_;
+			gchar* _tmp30_;
+			gchar* _tmp31_;
+			const gchar* _tmp32_;
+			gchar* _tmp33_;
+			gchar* _tmp34_;
+			const gchar* _tmp35_;
+			gboolean _tmp36_;
+			GeeMap* _tmp39_;
+			const gchar* _tmp40_;
+			gboolean _tmp41_;
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp23_ = _t_index;
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16301,7 +16236,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 			if (!(_tmp24_ < _tmp25_)) {
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 16305 "Commands.c"
+#line 16240 "Commands.c"
 			}
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp26_ = _t_list;
@@ -16333,9 +16268,9 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 			_tmp36_ = g_str_has_prefix (_tmp35_, TAG_PATH_SEPARATOR_STRING);
 #line 1876 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp36_) {
-#line 16337 "Commands.c"
-				const gchar* _tmp37_ = NULL;
-				gchar* _tmp38_ = NULL;
+#line 16272 "Commands.c"
+				const gchar* _tmp37_;
+				gchar* _tmp38_;
 #line 1877 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp37_ = child_subpath;
 #line 1877 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16344,7 +16279,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				_g_free0 (child_subpath);
 #line 1877 "/home/jens/Source/shotwell/src/Commands.vala"
 				child_subpath = _tmp38_;
-#line 16348 "Commands.c"
+#line 16283 "Commands.c"
 			}
 #line 1879 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp39_ = self->priv->existing_dest_child_structure;
@@ -16354,12 +16289,12 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 			_tmp41_ = gee_map_has_key (_tmp39_, _tmp40_);
 #line 1879 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (!_tmp41_) {
-#line 16358 "Commands.c"
-				TagSourceCollection* _tmp42_ = NULL;
-				TagSourceCollection* _tmp43_ = NULL;
-				Tag* _tmp44_ = NULL;
-				Marker* _tmp45_ = NULL;
-				Marker* _tmp46_ = NULL;
+#line 16293 "Commands.c"
+				TagSourceCollection* _tmp42_;
+				TagSourceCollection* _tmp43_;
+				Tag* _tmp44_;
+				Marker* _tmp45_;
+				Marker* _tmp46_;
 #line 1880 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp42_ = tag_global;
 #line 1880 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16374,14 +16309,14 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp46_, TRUE, NULL, NULL, NULL);
 #line 1880 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp46_);
-#line 16378 "Commands.c"
+#line 16313 "Commands.c"
 			} else {
 				GeeSet* starting_sources = NULL;
-				GeeHashSet* _tmp47_ = NULL;
-				GeeSet* _tmp48_ = NULL;
-				Tag* _tmp49_ = NULL;
-				GeeCollection* _tmp50_ = NULL;
-				GeeCollection* _tmp51_ = NULL;
+				GeeHashSet* _tmp47_;
+				GeeSet* _tmp48_;
+				Tag* _tmp49_;
+				GeeCollection* _tmp50_;
+				GeeCollection* _tmp51_;
 #line 1882 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp47_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1882 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16398,11 +16333,11 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection), _tmp51_);
 #line 1883 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp51_);
-#line 16402 "Commands.c"
+#line 16337 "Commands.c"
 				{
 					GeeIterator* _source_it = NULL;
-					GeeSet* _tmp52_ = NULL;
-					GeeIterator* _tmp53_ = NULL;
+					GeeSet* _tmp52_;
+					GeeIterator* _tmp53_;
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp52_ = starting_sources;
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16411,19 +16346,19 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 					_source_it = _tmp53_;
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
 					while (TRUE) {
-#line 16415 "Commands.c"
-						GeeIterator* _tmp54_ = NULL;
-						gboolean _tmp55_ = FALSE;
+#line 16350 "Commands.c"
+						GeeIterator* _tmp54_;
+						gboolean _tmp55_;
 						MediaSource* source = NULL;
-						GeeIterator* _tmp56_ = NULL;
-						gpointer _tmp57_ = NULL;
-						GeeMap* _tmp58_ = NULL;
-						const gchar* _tmp59_ = NULL;
-						gpointer _tmp60_ = NULL;
-						GeeSet* _tmp61_ = NULL;
-						MediaSource* _tmp62_ = NULL;
-						gboolean _tmp63_ = FALSE;
-						gboolean _tmp64_ = FALSE;
+						GeeIterator* _tmp56_;
+						gpointer _tmp57_;
+						GeeMap* _tmp58_;
+						const gchar* _tmp59_;
+						gpointer _tmp60_;
+						GeeSet* _tmp61_;
+						MediaSource* _tmp62_;
+						gboolean _tmp63_;
+						gboolean _tmp64_;
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp54_ = _source_it;
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16432,7 +16367,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 						if (!_tmp55_) {
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
 							break;
-#line 16436 "Commands.c"
+#line 16371 "Commands.c"
 						}
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp56_ = _source_it;
@@ -16458,11 +16393,11 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 						_g_object_unref0 (_tmp61_);
 #line 1885 "/home/jens/Source/shotwell/src/Commands.vala"
 						if (_tmp64_) {
-#line 16462 "Commands.c"
-							Tag* _tmp65_ = NULL;
-							MediaSource* _tmp66_ = NULL;
-							GeeList* _tmp67_ = NULL;
-							GeeList* _tmp68_ = NULL;
+#line 16397 "Commands.c"
+							Tag* _tmp65_;
+							MediaSource* _tmp66_;
+							GeeList* _tmp67_;
+							GeeList* _tmp68_;
 #line 1886 "/home/jens/Source/shotwell/src/Commands.vala"
 							_tmp65_ = t;
 #line 1886 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16473,61 +16408,61 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 							_tmp68_ = _tmp67_;
 #line 1886 "/home/jens/Source/shotwell/src/Commands.vala"
 							_g_object_unref0 (_tmp68_);
-#line 16477 "Commands.c"
+#line 16412 "Commands.c"
 						}
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (source);
-#line 16481 "Commands.c"
+#line 16416 "Commands.c"
 					}
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_source_it);
-#line 16485 "Commands.c"
+#line 16420 "Commands.c"
 				}
 #line 1879 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (starting_sources);
-#line 16489 "Commands.c"
+#line 16424 "Commands.c"
 			}
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (child_subpath);
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (t);
-#line 16495 "Commands.c"
+#line 16430 "Commands.c"
 		}
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_t_list);
-#line 16499 "Commands.c"
+#line 16434 "Commands.c"
 	}
 	{
 		gint i = 0;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = 0;
-#line 16505 "Commands.c"
+#line 16440 "Commands.c"
 		{
 			gboolean _tmp69_ = FALSE;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp69_ = TRUE;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 16512 "Commands.c"
-				gint _tmp71_ = 0;
-				GeeList* _tmp72_ = NULL;
-				gint _tmp73_ = 0;
-				gint _tmp74_ = 0;
-				GeeList* _tmp75_ = NULL;
-				gint _tmp76_ = 0;
-				gpointer _tmp77_ = NULL;
-				SourceProxy* _tmp78_ = NULL;
-				DataSource* _tmp79_ = NULL;
-				DataSource* _tmp80_ = NULL;
+#line 16447 "Commands.c"
+				gint _tmp71_;
+				GeeList* _tmp72_;
+				gint _tmp73_;
+				gint _tmp74_;
+				GeeList* _tmp75_;
+				gint _tmp76_;
+				gpointer _tmp77_;
+				SourceProxy* _tmp78_;
+				DataSource* _tmp79_;
+				DataSource* _tmp80_;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp69_) {
-#line 16525 "Commands.c"
-					gint _tmp70_ = 0;
+#line 16460 "Commands.c"
+					gint _tmp70_;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp70_ = i;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp70_ + 1;
-#line 16531 "Commands.c"
+#line 16466 "Commands.c"
 				}
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp69_ = FALSE;
@@ -16543,7 +16478,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				if (!(_tmp71_ < _tmp74_)) {
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 16547 "Commands.c"
+#line 16482 "Commands.c"
 				}
 #line 1891 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp75_ = self->priv->src_before_state;
@@ -16561,7 +16496,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				_g_object_unref0 (_tmp80_);
 #line 1891 "/home/jens/Source/shotwell/src/Commands.vala"
 				_source_proxy_unref0 (_tmp78_);
-#line 16565 "Commands.c"
+#line 16500 "Commands.c"
 			}
 		}
 	}
@@ -16569,33 +16504,33 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		gint i = 0;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = 0;
-#line 16573 "Commands.c"
+#line 16508 "Commands.c"
 		{
 			gboolean _tmp81_ = FALSE;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp81_ = TRUE;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 16580 "Commands.c"
-				gint _tmp83_ = 0;
-				GeeList* _tmp84_ = NULL;
-				gint _tmp85_ = 0;
-				gint _tmp86_ = 0;
-				GeeList* _tmp87_ = NULL;
-				gint _tmp88_ = 0;
-				gpointer _tmp89_ = NULL;
-				SourceProxy* _tmp90_ = NULL;
-				DataSource* _tmp91_ = NULL;
-				DataSource* _tmp92_ = NULL;
+#line 16515 "Commands.c"
+				gint _tmp83_;
+				GeeList* _tmp84_;
+				gint _tmp85_;
+				gint _tmp86_;
+				GeeList* _tmp87_;
+				gint _tmp88_;
+				gpointer _tmp89_;
+				SourceProxy* _tmp90_;
+				DataSource* _tmp91_;
+				DataSource* _tmp92_;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp81_) {
-#line 16593 "Commands.c"
-					gint _tmp82_ = 0;
+#line 16528 "Commands.c"
+					gint _tmp82_;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp82_ = i;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp82_ + 1;
-#line 16599 "Commands.c"
+#line 16534 "Commands.c"
 				}
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp81_ = FALSE;
@@ -16611,7 +16546,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				if (!(_tmp83_ < _tmp86_)) {
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 16615 "Commands.c"
+#line 16550 "Commands.c"
 				}
 #line 1894 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp87_ = self->priv->dest_before_state;
@@ -16629,7 +16564,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				_g_object_unref0 (_tmp92_);
 #line 1894 "/home/jens/Source/shotwell/src/Commands.vala"
 				_source_proxy_unref0 (_tmp90_);
-#line 16633 "Commands.c"
+#line 16568 "Commands.c"
 			}
 		}
 	}
@@ -16637,25 +16572,25 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 	_tmp93_ = self->priv->to_path_parent_path;
 #line 1896 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp93_ != NULL) {
-#line 16641 "Commands.c"
+#line 16576 "Commands.c"
 		gchar* new_path = NULL;
-		const gchar* _tmp94_ = NULL;
-		gchar* _tmp95_ = NULL;
+		const gchar* _tmp94_;
+		gchar* _tmp95_;
 		const gchar* _tmp96_ = NULL;
-		const gchar* _tmp97_ = NULL;
+		const gchar* _tmp97_;
 		gchar* path = NULL;
-		gchar* _tmp100_ = NULL;
-		TagSourceCollection* _tmp101_ = NULL;
-		const gchar* _tmp102_ = NULL;
-		gboolean _tmp103_ = FALSE;
+		gchar* _tmp100_;
+		TagSourceCollection* _tmp101_;
+		const gchar* _tmp102_;
+		gboolean _tmp103_;
 		Tag* t = NULL;
-		const gchar* _tmp104_ = NULL;
-		Tag* _tmp105_ = NULL;
+		const gchar* _tmp104_;
+		Tag* _tmp105_;
 		GeeList* kids = NULL;
-		Tag* _tmp106_ = NULL;
-		GeeList* _tmp107_ = NULL;
-		const gchar* _tmp125_ = NULL;
-		GeeMap* _tmp126_ = NULL;
+		Tag* _tmp106_;
+		GeeList* _tmp107_;
+		const gchar* _tmp125_;
+		GeeMap* _tmp126_;
 #line 1897 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp94_ = self->priv->to_path_parent_path;
 #line 1897 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16666,20 +16601,20 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_tmp97_ = new_path;
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp97_ != NULL) {
-#line 16670 "Commands.c"
-			const gchar* _tmp98_ = NULL;
+#line 16605 "Commands.c"
+			const gchar* _tmp98_;
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp98_ = new_path;
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp96_ = _tmp98_;
-#line 16676 "Commands.c"
+#line 16611 "Commands.c"
 		} else {
-			const gchar* _tmp99_ = NULL;
+			const gchar* _tmp99_;
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp99_ = self->priv->to_path_parent_path;
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp96_ = _tmp99_;
-#line 16683 "Commands.c"
+#line 16618 "Commands.c"
 		}
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp100_ = g_strdup (_tmp96_);
@@ -16705,15 +16640,15 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_tmp107_ = tag_get_hierarchical_children (_tmp106_);
 #line 1904 "/home/jens/Source/shotwell/src/Commands.vala"
 		kids = _tmp107_;
-#line 16709 "Commands.c"
+#line 16644 "Commands.c"
 		{
 			GeeList* _kidtag_list = NULL;
-			GeeList* _tmp108_ = NULL;
-			GeeList* _tmp109_ = NULL;
+			GeeList* _tmp108_;
+			GeeList* _tmp109_;
 			gint _kidtag_size = 0;
-			GeeList* _tmp110_ = NULL;
-			gint _tmp111_ = 0;
-			gint _tmp112_ = 0;
+			GeeList* _tmp110_;
+			gint _tmp111_;
+			gint _tmp112_;
 			gint _kidtag_index = 0;
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp108_ = kids;
@@ -16733,20 +16668,20 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 			_kidtag_index = -1;
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 16737 "Commands.c"
-				gint _tmp113_ = 0;
-				gint _tmp114_ = 0;
-				gint _tmp115_ = 0;
+#line 16672 "Commands.c"
+				gint _tmp113_;
+				gint _tmp114_;
+				gint _tmp115_;
 				Tag* kidtag = NULL;
-				GeeList* _tmp116_ = NULL;
-				gint _tmp117_ = 0;
-				gpointer _tmp118_ = NULL;
-				Tag* _tmp119_ = NULL;
-				Tag* _tmp120_ = NULL;
-				GeeCollection* _tmp121_ = NULL;
-				GeeCollection* _tmp122_ = NULL;
-				GeeMultiMap* _tmp123_ = NULL;
-				GeeMultiMap* _tmp124_ = NULL;
+				GeeList* _tmp116_;
+				gint _tmp117_;
+				gpointer _tmp118_;
+				Tag* _tmp119_;
+				Tag* _tmp120_;
+				GeeCollection* _tmp121_;
+				GeeCollection* _tmp122_;
+				GeeMultiMap* _tmp123_;
+				GeeMultiMap* _tmp124_;
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp113_ = _kidtag_index;
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16759,7 +16694,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				if (!(_tmp114_ < _tmp115_)) {
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 16763 "Commands.c"
+#line 16698 "Commands.c"
 				}
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp116_ = _kidtag_list;
@@ -16787,11 +16722,11 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				_g_object_unref0 (_tmp122_);
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (kidtag);
-#line 16791 "Commands.c"
+#line 16726 "Commands.c"
 			}
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_kidtag_list);
-#line 16795 "Commands.c"
+#line 16730 "Commands.c"
 		}
 #line 1908 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp125_ = path;
@@ -16807,31 +16742,31 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_g_free0 (path);
 #line 1896 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (new_path);
-#line 16811 "Commands.c"
+#line 16746 "Commands.c"
 	} else {
-		GeeSet* _tmp127_ = NULL;
-		const gchar* _tmp128_ = NULL;
-		Tag* _tmp129_ = NULL;
-		Tag* _tmp130_ = NULL;
-		const gchar* _tmp131_ = NULL;
-		Tag* _tmp132_ = NULL;
-		Tag* _tmp133_ = NULL;
-		GeeCollection* _tmp134_ = NULL;
-		GeeCollection* _tmp135_ = NULL;
-		GeeMultiMap* _tmp136_ = NULL;
-		GeeMultiMap* _tmp137_ = NULL;
-		const gchar* _tmp138_ = NULL;
-		Tag* _tmp139_ = NULL;
-		Tag* _tmp140_ = NULL;
-		GeeSet* _tmp141_ = NULL;
+		GeeSet* _tmp127_;
+		const gchar* _tmp128_;
+		Tag* _tmp129_;
+		Tag* _tmp130_;
+		const gchar* _tmp131_;
+		Tag* _tmp132_;
+		Tag* _tmp133_;
+		GeeCollection* _tmp134_;
+		GeeCollection* _tmp135_;
+		GeeMultiMap* _tmp136_;
+		GeeMultiMap* _tmp137_;
+		const gchar* _tmp138_;
+		Tag* _tmp139_;
+		Tag* _tmp140_;
+		GeeSet* _tmp141_;
 		GeeList* kids = NULL;
-		const gchar* _tmp142_ = NULL;
-		Tag* _tmp143_ = NULL;
-		Tag* _tmp144_ = NULL;
-		GeeList* _tmp145_ = NULL;
-		GeeList* _tmp146_ = NULL;
-		const gchar* _tmp164_ = NULL;
-		GeeMap* _tmp165_ = NULL;
+		const gchar* _tmp142_;
+		Tag* _tmp143_;
+		Tag* _tmp144_;
+		GeeList* _tmp145_;
+		GeeList* _tmp146_;
+		const gchar* _tmp164_;
+		GeeMap* _tmp165_;
 #line 1910 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp127_ = self->priv->existing_dest_membership;
 #line 1910 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16890,15 +16825,15 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_g_object_unref0 (_tmp144_);
 #line 1914 "/home/jens/Source/shotwell/src/Commands.vala"
 		kids = _tmp146_;
-#line 16894 "Commands.c"
+#line 16829 "Commands.c"
 		{
 			GeeList* _kidtag_list = NULL;
-			GeeList* _tmp147_ = NULL;
-			GeeList* _tmp148_ = NULL;
+			GeeList* _tmp147_;
+			GeeList* _tmp148_;
 			gint _kidtag_size = 0;
-			GeeList* _tmp149_ = NULL;
-			gint _tmp150_ = 0;
-			gint _tmp151_ = 0;
+			GeeList* _tmp149_;
+			gint _tmp150_;
+			gint _tmp151_;
 			gint _kidtag_index = 0;
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp147_ = kids;
@@ -16918,20 +16853,20 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 			_kidtag_index = -1;
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 16922 "Commands.c"
-				gint _tmp152_ = 0;
-				gint _tmp153_ = 0;
-				gint _tmp154_ = 0;
+#line 16857 "Commands.c"
+				gint _tmp152_;
+				gint _tmp153_;
+				gint _tmp154_;
 				Tag* kidtag = NULL;
-				GeeList* _tmp155_ = NULL;
-				gint _tmp156_ = 0;
-				gpointer _tmp157_ = NULL;
-				Tag* _tmp158_ = NULL;
-				Tag* _tmp159_ = NULL;
-				GeeCollection* _tmp160_ = NULL;
-				GeeCollection* _tmp161_ = NULL;
-				GeeMultiMap* _tmp162_ = NULL;
-				GeeMultiMap* _tmp163_ = NULL;
+				GeeList* _tmp155_;
+				gint _tmp156_;
+				gpointer _tmp157_;
+				Tag* _tmp158_;
+				Tag* _tmp159_;
+				GeeCollection* _tmp160_;
+				GeeCollection* _tmp161_;
+				GeeMultiMap* _tmp162_;
+				GeeMultiMap* _tmp163_;
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp152_ = _kidtag_index;
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16944,7 +16879,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				if (!(_tmp153_ < _tmp154_)) {
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 16948 "Commands.c"
+#line 16883 "Commands.c"
 				}
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp155_ = _kidtag_list;
@@ -16972,11 +16907,11 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				_g_object_unref0 (_tmp161_);
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (kidtag);
-#line 16976 "Commands.c"
+#line 16911 "Commands.c"
 			}
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_kidtag_list);
-#line 16980 "Commands.c"
+#line 16915 "Commands.c"
 		}
 #line 1918 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp164_ = self->priv->to_path;
@@ -16986,30 +16921,30 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		reparent_tag_command_restore_child_attachments_at (self, _tmp164_, _tmp165_);
 #line 1896 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (kids);
-#line 16990 "Commands.c"
+#line 16925 "Commands.c"
 	}
 #line 1863 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (unwind_target);
-#line 16994 "Commands.c"
+#line 16929 "Commands.c"
 }
 
 
 static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
-	GeeList* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	TagSourceCollection* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GeeList* _tmp0_;
+	GeeArrayList* _tmp1_;
+	TagSourceCollection* _tmp2_;
+	const gchar* _tmp3_;
+	gboolean _tmp4_;
 	Tag* to_tag = NULL;
-	const gchar* _tmp5_ = NULL;
-	Tag* _tmp6_ = NULL;
-	GeeList* _tmp7_ = NULL;
-	Tag* _tmp8_ = NULL;
-	SourceProxy* _tmp9_ = NULL;
-	SourceProxy* _tmp10_ = NULL;
+	const gchar* _tmp5_;
+	Tag* _tmp6_;
+	GeeList* _tmp7_;
+	Tag* _tmp8_;
+	SourceProxy* _tmp9_;
+	SourceProxy* _tmp10_;
 	GeeList* to_children = NULL;
-	Tag* _tmp11_ = NULL;
-	GeeList* _tmp12_ = NULL;
+	Tag* _tmp11_;
+	GeeList* _tmp12_;
 #line 1922 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
 #line 1923 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17054,12 +16989,12 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 	_tmp12_ = tag_get_hierarchical_children (_tmp11_);
 #line 1933 "/home/jens/Source/shotwell/src/Commands.vala"
 	to_children = _tmp12_;
-#line 17058 "Commands.c"
+#line 16993 "Commands.c"
 	{
 		gint i = 0;
-		GeeList* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
-		gint _tmp15_ = 0;
+		GeeList* _tmp13_;
+		gint _tmp14_;
+		gint _tmp15_;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp13_ = to_children;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17068,31 +17003,31 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 		_tmp15_ = _tmp14_;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = _tmp15_ - 1;
-#line 17072 "Commands.c"
+#line 17007 "Commands.c"
 		{
 			gboolean _tmp16_ = FALSE;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp16_ = TRUE;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 17079 "Commands.c"
-				gint _tmp18_ = 0;
-				GeeList* _tmp19_ = NULL;
-				GeeList* _tmp20_ = NULL;
-				gint _tmp21_ = 0;
-				gpointer _tmp22_ = NULL;
-				Tag* _tmp23_ = NULL;
-				SourceProxy* _tmp24_ = NULL;
-				SourceProxy* _tmp25_ = NULL;
+#line 17014 "Commands.c"
+				gint _tmp18_;
+				GeeList* _tmp19_;
+				GeeList* _tmp20_;
+				gint _tmp21_;
+				gpointer _tmp22_;
+				Tag* _tmp23_;
+				SourceProxy* _tmp24_;
+				SourceProxy* _tmp25_;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp16_) {
-#line 17090 "Commands.c"
-					gint _tmp17_ = 0;
+#line 17025 "Commands.c"
+					gint _tmp17_;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp17_ = i;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp17_ - 1;
-#line 17096 "Commands.c"
+#line 17031 "Commands.c"
 				}
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp16_ = FALSE;
@@ -17102,7 +17037,7 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 				if (!(_tmp18_ >= 0)) {
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 17106 "Commands.c"
+#line 17041 "Commands.c"
 				}
 #line 1935 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp19_ = self->priv->after_state;
@@ -17124,7 +17059,7 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 				_source_proxy_unref0 (_tmp25_);
 #line 1935 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp23_);
-#line 17128 "Commands.c"
+#line 17063 "Commands.c"
 			}
 		}
 	}
@@ -17132,50 +17067,50 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 	_g_object_unref0 (to_children);
 #line 1922 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (to_tag);
-#line 17136 "Commands.c"
+#line 17071 "Commands.c"
 }
 
 
 static void reparent_tag_command_restore_after_state (ReparentTagCommand* self) {
-	GeeList* _tmp0_ = NULL;
+	GeeList* _tmp0_;
 #line 1938 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
 #line 1939 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = self->priv->after_state;
 #line 1939 "/home/jens/Source/shotwell/src/Commands.vala"
 	_vala_assert (_tmp0_ != NULL, "after_state != null");
-#line 17148 "Commands.c"
+#line 17083 "Commands.c"
 	{
 		gint i = 0;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = 0;
-#line 17153 "Commands.c"
+#line 17088 "Commands.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp1_ = TRUE;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 17160 "Commands.c"
-				gint _tmp3_ = 0;
-				GeeList* _tmp4_ = NULL;
-				gint _tmp5_ = 0;
-				gint _tmp6_ = 0;
-				GeeList* _tmp7_ = NULL;
-				gint _tmp8_ = 0;
-				gpointer _tmp9_ = NULL;
-				SourceProxy* _tmp10_ = NULL;
-				DataSource* _tmp11_ = NULL;
-				DataSource* _tmp12_ = NULL;
+#line 17095 "Commands.c"
+				gint _tmp3_;
+				GeeList* _tmp4_;
+				gint _tmp5_;
+				gint _tmp6_;
+				GeeList* _tmp7_;
+				gint _tmp8_;
+				gpointer _tmp9_;
+				SourceProxy* _tmp10_;
+				DataSource* _tmp11_;
+				DataSource* _tmp12_;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp1_) {
-#line 17173 "Commands.c"
-					gint _tmp2_ = 0;
+#line 17108 "Commands.c"
+					gint _tmp2_;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp2_ = i;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp2_ + 1;
-#line 17179 "Commands.c"
+#line 17114 "Commands.c"
 				}
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp1_ = FALSE;
@@ -17191,7 +17126,7 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self)
 				if (!(_tmp3_ < _tmp6_)) {
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 17195 "Commands.c"
+#line 17130 "Commands.c"
 				}
 #line 1942 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp7_ = self->priv->after_state;
@@ -17209,7 +17144,7 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self)
 				_g_object_unref0 (_tmp12_);
 #line 1942 "/home/jens/Source/shotwell/src/Commands.vala"
 				_source_proxy_unref0 (_tmp10_);
-#line 17213 "Commands.c"
+#line 17148 "Commands.c"
 			}
 		}
 	}
@@ -17218,9 +17153,9 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self)
 
 static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const gchar* path) {
 	Tag* new_parent = NULL;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	Tag* _tmp27_ = NULL;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
+	Tag* _tmp27_;
 #line 1945 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
 #line 1945 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17233,13 +17168,13 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 	_tmp1_ = g_str_has_prefix (_tmp0_, TAG_PATH_SEPARATOR_STRING);
 #line 1948 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_) {
-#line 17237 "Commands.c"
+#line 17172 "Commands.c"
 		GeeList* parent_paths = NULL;
-		const gchar* _tmp2_ = NULL;
-		GeeList* _tmp3_ = NULL;
-		GeeList* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+		const gchar* _tmp2_;
+		GeeList* _tmp3_;
+		GeeList* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 #line 1949 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = path;
 #line 1949 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17254,16 +17189,16 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 		_tmp6_ = _tmp5_;
 #line 1950 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp6_ > 0) {
-#line 17258 "Commands.c"
+#line 17193 "Commands.c"
 			gchar* immediate_parent_path = NULL;
-			GeeList* _tmp7_ = NULL;
-			GeeList* _tmp8_ = NULL;
-			gint _tmp9_ = 0;
-			gint _tmp10_ = 0;
-			gpointer _tmp11_ = NULL;
-			TagSourceCollection* _tmp12_ = NULL;
-			const gchar* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
+			GeeList* _tmp7_;
+			GeeList* _tmp8_;
+			gint _tmp9_;
+			gint _tmp10_;
+			gpointer _tmp11_;
+			TagSourceCollection* _tmp12_;
+			const gchar* _tmp13_;
+			gboolean _tmp14_;
 #line 1951 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp7_ = parent_paths;
 #line 1951 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17284,9 +17219,9 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 			_tmp14_ = tag_source_collection_exists (_tmp12_, _tmp13_, FALSE);
 #line 1952 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp14_) {
-#line 17288 "Commands.c"
-				const gchar* _tmp15_ = NULL;
-				Tag* _tmp16_ = NULL;
+#line 17223 "Commands.c"
+				const gchar* _tmp15_;
+				Tag* _tmp16_;
 #line 1953 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp15_ = immediate_parent_path;
 #line 1953 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17295,14 +17230,14 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 				_g_object_unref0 (new_parent);
 #line 1953 "/home/jens/Source/shotwell/src/Commands.vala"
 				new_parent = _tmp16_;
-#line 17299 "Commands.c"
+#line 17234 "Commands.c"
 			} else {
-				TagSourceCollection* _tmp17_ = NULL;
-				const gchar* _tmp18_ = NULL;
-				gchar* _tmp19_ = NULL;
-				gchar* _tmp20_ = NULL;
-				gboolean _tmp21_ = FALSE;
-				gboolean _tmp22_ = FALSE;
+				TagSourceCollection* _tmp17_;
+				const gchar* _tmp18_;
+				gchar* _tmp19_;
+				gchar* _tmp20_;
+				gboolean _tmp21_;
+				gboolean _tmp22_;
 #line 1954 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp17_ = tag_global;
 #line 1954 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17319,11 +17254,11 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 				_g_free0 (_tmp20_);
 #line 1954 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (_tmp22_) {
-#line 17323 "Commands.c"
-					const gchar* _tmp23_ = NULL;
-					gchar* _tmp24_ = NULL;
-					gchar* _tmp25_ = NULL;
-					Tag* _tmp26_ = NULL;
+#line 17258 "Commands.c"
+					const gchar* _tmp23_;
+					gchar* _tmp24_;
+					gchar* _tmp25_;
+					Tag* _tmp26_;
 #line 1955 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp23_ = immediate_parent_path;
 #line 1955 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17338,47 +17273,47 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 					new_parent = _tmp26_;
 #line 1955 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_free0 (_tmp25_);
-#line 17342 "Commands.c"
+#line 17277 "Commands.c"
 				} else {
 #line 1957 "/home/jens/Source/shotwell/src/Commands.vala"
 					g_assert_not_reached ();
-#line 17346 "Commands.c"
+#line 17281 "Commands.c"
 				}
 			}
 #line 1950 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (immediate_parent_path);
-#line 17351 "Commands.c"
+#line 17286 "Commands.c"
 		}
 #line 1948 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (parent_paths);
-#line 17355 "Commands.c"
+#line 17290 "Commands.c"
 	}
 #line 1960 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp27_ = new_parent;
 #line 1960 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp27_ != NULL) {
-#line 17361 "Commands.c"
-		Tag* _tmp28_ = NULL;
+#line 17296 "Commands.c"
+		Tag* _tmp28_;
 #line 1961 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp28_ = new_parent;
 #line 1961 "/home/jens/Source/shotwell/src/Commands.vala"
 		tag_promote (_tmp28_);
-#line 17367 "Commands.c"
+#line 17302 "Commands.c"
 	}
 #line 1945 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (new_parent);
-#line 17371 "Commands.c"
+#line 17306 "Commands.c"
 }
 
 
 static void reparent_tag_command_do_source_parent_detachments (ReparentTagCommand* self) {
-	TagSourceCollection* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	TagSourceCollection* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 	Tag* from_tag = NULL;
-	const gchar* _tmp3_ = NULL;
-	Tag* _tmp4_ = NULL;
-	GeeMap* _tmp5_ = NULL;
+	const gchar* _tmp3_;
+	Tag* _tmp4_;
+	GeeMap* _tmp5_;
 #line 1964 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
 #line 1965 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17399,22 +17334,22 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 	_tmp5_ = self->priv->src_parent_detachments;
 #line 1969 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp5_ == NULL) {
-#line 17403 "Commands.c"
-		GeeHashMap* _tmp6_ = NULL;
+#line 17338 "Commands.c"
+		GeeHashMap* _tmp6_;
 #line 1970 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp6_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1970 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (self->priv->src_parent_detachments);
 #line 1970 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->src_parent_detachments = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_MAP, GeeMap);
-#line 17411 "Commands.c"
+#line 17346 "Commands.c"
 		{
 			GeeIterator* _source_it = NULL;
-			Tag* _tmp7_ = NULL;
-			GeeCollection* _tmp8_ = NULL;
-			GeeCollection* _tmp9_ = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			GeeIterator* _tmp11_ = NULL;
+			Tag* _tmp7_;
+			GeeCollection* _tmp8_;
+			GeeCollection* _tmp9_;
+			GeeIterator* _tmp10_;
+			GeeIterator* _tmp11_;
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp7_ = from_tag;
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17431,19 +17366,19 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 			_source_it = _tmp11_;
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 17435 "Commands.c"
-				GeeIterator* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
+#line 17370 "Commands.c"
+				GeeIterator* _tmp12_;
+				gboolean _tmp13_;
 				MediaSource* source = NULL;
-				GeeIterator* _tmp14_ = NULL;
-				gpointer _tmp15_ = NULL;
+				GeeIterator* _tmp14_;
+				gpointer _tmp15_;
 				Tag* current_parent = NULL;
-				Tag* _tmp16_ = NULL;
-				Tag* _tmp17_ = NULL;
+				Tag* _tmp16_;
+				Tag* _tmp17_;
 				gint running_attach_count = 0;
-				Tag* _tmp18_ = NULL;
-				MediaSource* _tmp19_ = NULL;
-				gint _tmp20_ = 0;
+				Tag* _tmp18_;
+				MediaSource* _tmp19_;
+				gint _tmp20_;
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp12_ = _source_it;
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17452,7 +17387,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 				if (!_tmp13_) {
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 17456 "Commands.c"
+#line 17391 "Commands.c"
 				}
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp14_ = _source_it;
@@ -17476,32 +17411,32 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 				running_attach_count = _tmp20_ + 1;
 #line 1974 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 17480 "Commands.c"
-					Tag* _tmp21_ = NULL;
+#line 17415 "Commands.c"
+					Tag* _tmp21_;
 					gchar* current_parent_path = NULL;
-					Tag* _tmp22_ = NULL;
-					gchar* _tmp23_ = NULL;
-					GeeMap* _tmp24_ = NULL;
-					const gchar* _tmp25_ = NULL;
-					gboolean _tmp26_ = FALSE;
+					Tag* _tmp22_;
+					gchar* _tmp23_;
+					GeeMap* _tmp24_;
+					const gchar* _tmp25_;
+					gboolean _tmp26_;
 					gint curr_parent_attach_count = 0;
-					Tag* _tmp31_ = NULL;
-					MediaSource* _tmp32_ = NULL;
-					gint _tmp33_ = 0;
-					gint _tmp34_ = 0;
-					gint _tmp35_ = 0;
-					gint _tmp36_ = 0;
-					gint _tmp37_ = 0;
-					gint _tmp43_ = 0;
-					Tag* _tmp44_ = NULL;
-					Tag* _tmp45_ = NULL;
+					Tag* _tmp31_;
+					MediaSource* _tmp32_;
+					gint _tmp33_;
+					gint _tmp34_;
+					gint _tmp35_;
+					gint _tmp36_;
+					gint _tmp37_;
+					gint _tmp43_;
+					Tag* _tmp44_;
+					Tag* _tmp45_;
 #line 1974 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp21_ = current_parent;
 #line 1974 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (!(_tmp21_ != NULL)) {
 #line 1974 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 17505 "Commands.c"
+#line 17440 "Commands.c"
 					}
 #line 1975 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp22_ = current_parent;
@@ -17517,11 +17452,11 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 					_tmp26_ = gee_map_has_key (_tmp24_, _tmp25_);
 #line 1976 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (!_tmp26_) {
-#line 17521 "Commands.c"
-						GeeMap* _tmp27_ = NULL;
-						const gchar* _tmp28_ = NULL;
-						GeeHashSet* _tmp29_ = NULL;
-						GeeHashSet* _tmp30_ = NULL;
+#line 17456 "Commands.c"
+						GeeMap* _tmp27_;
+						const gchar* _tmp28_;
+						GeeHashSet* _tmp29_;
+						GeeHashSet* _tmp30_;
 #line 1977 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp27_ = self->priv->src_parent_detachments;
 #line 1977 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17534,7 +17469,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 						gee_map_set (_tmp27_, _tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_SET, GeeSet));
 #line 1977 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (_tmp30_);
-#line 17538 "Commands.c"
+#line 17473 "Commands.c"
 					}
 #line 1979 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp31_ = current_parent;
@@ -17556,12 +17491,12 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 					_tmp37_ = running_attach_count;
 #line 1985 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (_tmp36_ == _tmp37_) {
-#line 17560 "Commands.c"
-						GeeMap* _tmp38_ = NULL;
-						const gchar* _tmp39_ = NULL;
-						gpointer _tmp40_ = NULL;
-						GeeSet* _tmp41_ = NULL;
-						MediaSource* _tmp42_ = NULL;
+#line 17495 "Commands.c"
+						GeeMap* _tmp38_;
+						const gchar* _tmp39_;
+						gpointer _tmp40_;
+						GeeSet* _tmp41_;
+						MediaSource* _tmp42_;
 #line 1986 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp38_ = self->priv->src_parent_detachments;
 #line 1986 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17576,7 +17511,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_);
 #line 1986 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (_tmp41_);
-#line 17580 "Commands.c"
+#line 17515 "Commands.c"
 					}
 #line 1988 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp43_ = running_attach_count;
@@ -17592,27 +17527,27 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 					current_parent = _tmp45_;
 #line 1974 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_free0 (current_parent_path);
-#line 17596 "Commands.c"
+#line 17531 "Commands.c"
 				}
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (current_parent);
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (source);
-#line 17602 "Commands.c"
+#line 17537 "Commands.c"
 			}
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_source_it);
-#line 17606 "Commands.c"
+#line 17541 "Commands.c"
 		}
 	}
 	{
 		GeeIterator* _p_it = NULL;
-		GeeMap* _tmp46_ = NULL;
-		GeeSet* _tmp47_ = NULL;
-		GeeSet* _tmp48_ = NULL;
-		GeeSet* _tmp49_ = NULL;
-		GeeIterator* _tmp50_ = NULL;
-		GeeIterator* _tmp51_ = NULL;
+		GeeMap* _tmp46_;
+		GeeSet* _tmp47_;
+		GeeSet* _tmp48_;
+		GeeSet* _tmp49_;
+		GeeIterator* _tmp50_;
+		GeeIterator* _tmp51_;
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp46_ = self->priv->src_parent_detachments;
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17631,12 +17566,12 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 		_p_it = _tmp51_;
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 17635 "Commands.c"
-			GeeIterator* _tmp52_ = NULL;
-			gboolean _tmp53_ = FALSE;
+#line 17570 "Commands.c"
+			GeeIterator* _tmp52_;
+			gboolean _tmp53_;
 			gchar* p = NULL;
-			GeeIterator* _tmp54_ = NULL;
-			gpointer _tmp55_ = NULL;
+			GeeIterator* _tmp54_;
+			gpointer _tmp55_;
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp52_ = _p_it;
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17645,7 +17580,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 			if (!_tmp53_) {
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 17649 "Commands.c"
+#line 17584 "Commands.c"
 			}
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp54_ = _p_it;
@@ -17653,15 +17588,15 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 			_tmp55_ = gee_iterator_get (_tmp54_);
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 			p = (gchar*) _tmp55_;
-#line 17657 "Commands.c"
+#line 17592 "Commands.c"
 			{
 				GeeIterator* _s_it = NULL;
-				GeeMap* _tmp56_ = NULL;
-				const gchar* _tmp57_ = NULL;
-				gpointer _tmp58_ = NULL;
-				GeeSet* _tmp59_ = NULL;
-				GeeIterator* _tmp60_ = NULL;
-				GeeIterator* _tmp61_ = NULL;
+				GeeMap* _tmp56_;
+				const gchar* _tmp57_;
+				gpointer _tmp58_;
+				GeeSet* _tmp59_;
+				GeeIterator* _tmp60_;
+				GeeIterator* _tmp61_;
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp56_ = self->priv->src_parent_detachments;
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17680,18 +17615,18 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 				_s_it = _tmp61_;
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 17684 "Commands.c"
-					GeeIterator* _tmp62_ = NULL;
-					gboolean _tmp63_ = FALSE;
+#line 17619 "Commands.c"
+					GeeIterator* _tmp62_;
+					gboolean _tmp63_;
 					MediaSource* s = NULL;
-					GeeIterator* _tmp64_ = NULL;
-					gpointer _tmp65_ = NULL;
-					const gchar* _tmp66_ = NULL;
-					Tag* _tmp67_ = NULL;
-					Tag* _tmp68_ = NULL;
-					MediaSource* _tmp69_ = NULL;
-					GeeList* _tmp70_ = NULL;
-					GeeList* _tmp71_ = NULL;
+					GeeIterator* _tmp64_;
+					gpointer _tmp65_;
+					const gchar* _tmp66_;
+					Tag* _tmp67_;
+					Tag* _tmp68_;
+					MediaSource* _tmp69_;
+					GeeList* _tmp70_;
+					GeeList* _tmp71_;
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp62_ = _s_it;
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17700,7 +17635,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 					if (!_tmp63_) {
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 17704 "Commands.c"
+#line 17639 "Commands.c"
 					}
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp64_ = _s_it;
@@ -17726,43 +17661,43 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 					_g_object_unref0 (_tmp68_);
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (s);
-#line 17730 "Commands.c"
+#line 17665 "Commands.c"
 				}
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_s_it);
-#line 17734 "Commands.c"
+#line 17669 "Commands.c"
 			}
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (p);
-#line 17738 "Commands.c"
+#line 17673 "Commands.c"
 		}
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_p_it);
-#line 17742 "Commands.c"
+#line 17677 "Commands.c"
 	}
 #line 1964 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (from_tag);
-#line 17746 "Commands.c"
+#line 17681 "Commands.c"
 }
 
 
 static void reparent_tag_command_do_source_parent_reattachments (ReparentTagCommand* self) {
-	GeeMap* _tmp0_ = NULL;
+	GeeMap* _tmp0_;
 #line 2000 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
 #line 2001 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = self->priv->src_parent_detachments;
 #line 2001 "/home/jens/Source/shotwell/src/Commands.vala"
 	_vala_assert (_tmp0_ != NULL, "src_parent_detachments != null");
-#line 17758 "Commands.c"
+#line 17693 "Commands.c"
 	{
 		GeeIterator* _p_it = NULL;
-		GeeMap* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeSet* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
+		GeeMap* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeSet* _tmp4_;
+		GeeIterator* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = self->priv->src_parent_detachments;
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17781,12 +17716,12 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 		_p_it = _tmp6_;
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 17785 "Commands.c"
-			GeeIterator* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+#line 17720 "Commands.c"
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			gchar* p = NULL;
-			GeeIterator* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp7_ = _p_it;
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17795,7 +17730,7 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 			if (!_tmp8_) {
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 17799 "Commands.c"
+#line 17734 "Commands.c"
 			}
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = _p_it;
@@ -17803,15 +17738,15 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 			_tmp10_ = gee_iterator_get (_tmp9_);
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 			p = (gchar*) _tmp10_;
-#line 17807 "Commands.c"
+#line 17742 "Commands.c"
 			{
 				GeeIterator* _s_it = NULL;
-				GeeMap* _tmp11_ = NULL;
-				const gchar* _tmp12_ = NULL;
-				gpointer _tmp13_ = NULL;
-				GeeSet* _tmp14_ = NULL;
-				GeeIterator* _tmp15_ = NULL;
-				GeeIterator* _tmp16_ = NULL;
+				GeeMap* _tmp11_;
+				const gchar* _tmp12_;
+				gpointer _tmp13_;
+				GeeSet* _tmp14_;
+				GeeIterator* _tmp15_;
+				GeeIterator* _tmp16_;
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp11_ = self->priv->src_parent_detachments;
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17830,16 +17765,16 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 				_s_it = _tmp16_;
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 17834 "Commands.c"
-					GeeIterator* _tmp17_ = NULL;
-					gboolean _tmp18_ = FALSE;
+#line 17769 "Commands.c"
+					GeeIterator* _tmp17_;
+					gboolean _tmp18_;
 					MediaSource* s = NULL;
-					GeeIterator* _tmp19_ = NULL;
-					gpointer _tmp20_ = NULL;
-					const gchar* _tmp21_ = NULL;
-					Tag* _tmp22_ = NULL;
-					Tag* _tmp23_ = NULL;
-					MediaSource* _tmp24_ = NULL;
+					GeeIterator* _tmp19_;
+					gpointer _tmp20_;
+					const gchar* _tmp21_;
+					Tag* _tmp22_;
+					Tag* _tmp23_;
+					MediaSource* _tmp24_;
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp17_ = _s_it;
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17848,7 +17783,7 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 					if (!_tmp18_) {
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 17852 "Commands.c"
+#line 17787 "Commands.c"
 					}
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp19_ = _s_it;
@@ -17870,40 +17805,40 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 					_g_object_unref0 (_tmp23_);
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (s);
-#line 17874 "Commands.c"
+#line 17809 "Commands.c"
 				}
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_s_it);
-#line 17878 "Commands.c"
+#line 17813 "Commands.c"
 			}
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (p);
-#line 17882 "Commands.c"
+#line 17817 "Commands.c"
 		}
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_p_it);
-#line 17886 "Commands.c"
+#line 17821 "Commands.c"
 	}
 }
 
 
 static void reparent_tag_command_do_destination_parent_detachments (ReparentTagCommand* self) {
-	GeeMap* _tmp0_ = NULL;
+	GeeMap* _tmp0_;
 #line 2008 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
 #line 2009 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = self->priv->dest_parent_attachments;
 #line 2009 "/home/jens/Source/shotwell/src/Commands.vala"
 	_vala_assert (_tmp0_ != NULL, "dest_parent_attachments != null");
-#line 17899 "Commands.c"
+#line 17834 "Commands.c"
 	{
 		GeeIterator* _p_it = NULL;
-		GeeMap* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeSet* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
+		GeeMap* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeSet* _tmp4_;
+		GeeIterator* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = self->priv->dest_parent_attachments;
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17922,12 +17857,12 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 		_p_it = _tmp6_;
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 17926 "Commands.c"
-			GeeIterator* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+#line 17861 "Commands.c"
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			gchar* p = NULL;
-			GeeIterator* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp7_ = _p_it;
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17936,7 +17871,7 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 			if (!_tmp8_) {
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 17940 "Commands.c"
+#line 17875 "Commands.c"
 			}
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = _p_it;
@@ -17944,15 +17879,15 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 			_tmp10_ = gee_iterator_get (_tmp9_);
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 			p = (gchar*) _tmp10_;
-#line 17948 "Commands.c"
+#line 17883 "Commands.c"
 			{
 				GeeIterator* _s_it = NULL;
-				GeeMap* _tmp11_ = NULL;
-				const gchar* _tmp12_ = NULL;
-				gpointer _tmp13_ = NULL;
-				GeeSet* _tmp14_ = NULL;
-				GeeIterator* _tmp15_ = NULL;
-				GeeIterator* _tmp16_ = NULL;
+				GeeMap* _tmp11_;
+				const gchar* _tmp12_;
+				gpointer _tmp13_;
+				GeeSet* _tmp14_;
+				GeeIterator* _tmp15_;
+				GeeIterator* _tmp16_;
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp11_ = self->priv->dest_parent_attachments;
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17971,18 +17906,18 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 				_s_it = _tmp16_;
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 17975 "Commands.c"
-					GeeIterator* _tmp17_ = NULL;
-					gboolean _tmp18_ = FALSE;
+#line 17910 "Commands.c"
+					GeeIterator* _tmp17_;
+					gboolean _tmp18_;
 					MediaSource* s = NULL;
-					GeeIterator* _tmp19_ = NULL;
-					gpointer _tmp20_ = NULL;
-					const gchar* _tmp21_ = NULL;
-					Tag* _tmp22_ = NULL;
-					Tag* _tmp23_ = NULL;
-					MediaSource* _tmp24_ = NULL;
-					GeeList* _tmp25_ = NULL;
-					GeeList* _tmp26_ = NULL;
+					GeeIterator* _tmp19_;
+					gpointer _tmp20_;
+					const gchar* _tmp21_;
+					Tag* _tmp22_;
+					Tag* _tmp23_;
+					MediaSource* _tmp24_;
+					GeeList* _tmp25_;
+					GeeList* _tmp26_;
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp17_ = _s_it;
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17991,7 +17926,7 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 					if (!_tmp18_) {
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 17995 "Commands.c"
+#line 17930 "Commands.c"
 					}
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp19_ = _s_it;
@@ -18017,40 +17952,40 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 					_g_object_unref0 (_tmp23_);
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (s);
-#line 18021 "Commands.c"
+#line 17956 "Commands.c"
 				}
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_s_it);
-#line 18025 "Commands.c"
+#line 17960 "Commands.c"
 			}
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (p);
-#line 18029 "Commands.c"
+#line 17964 "Commands.c"
 		}
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_p_it);
-#line 18033 "Commands.c"
+#line 17968 "Commands.c"
 	}
 }
 
 
 static void reparent_tag_command_do_destination_parent_reattachments (ReparentTagCommand* self) {
-	GeeMap* _tmp0_ = NULL;
+	GeeMap* _tmp0_;
 #line 2016 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
 #line 2017 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = self->priv->dest_parent_attachments;
 #line 2017 "/home/jens/Source/shotwell/src/Commands.vala"
 	_vala_assert (_tmp0_ != NULL, "dest_parent_attachments != null");
-#line 18046 "Commands.c"
+#line 17981 "Commands.c"
 	{
 		GeeIterator* _p_it = NULL;
-		GeeMap* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeSet* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
+		GeeMap* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeSet* _tmp4_;
+		GeeIterator* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = self->priv->dest_parent_attachments;
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18069,12 +18004,12 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 		_p_it = _tmp6_;
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 18073 "Commands.c"
-			GeeIterator* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+#line 18008 "Commands.c"
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			gchar* p = NULL;
-			GeeIterator* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp7_ = _p_it;
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18083,7 +18018,7 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 			if (!_tmp8_) {
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 18087 "Commands.c"
+#line 18022 "Commands.c"
 			}
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = _p_it;
@@ -18091,15 +18026,15 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 			_tmp10_ = gee_iterator_get (_tmp9_);
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 			p = (gchar*) _tmp10_;
-#line 18095 "Commands.c"
+#line 18030 "Commands.c"
 			{
 				GeeIterator* _s_it = NULL;
-				GeeMap* _tmp11_ = NULL;
-				const gchar* _tmp12_ = NULL;
-				gpointer _tmp13_ = NULL;
-				GeeSet* _tmp14_ = NULL;
-				GeeIterator* _tmp15_ = NULL;
-				GeeIterator* _tmp16_ = NULL;
+				GeeMap* _tmp11_;
+				const gchar* _tmp12_;
+				gpointer _tmp13_;
+				GeeSet* _tmp14_;
+				GeeIterator* _tmp15_;
+				GeeIterator* _tmp16_;
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp11_ = self->priv->dest_parent_attachments;
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18118,16 +18053,16 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 				_s_it = _tmp16_;
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 18122 "Commands.c"
-					GeeIterator* _tmp17_ = NULL;
-					gboolean _tmp18_ = FALSE;
+#line 18057 "Commands.c"
+					GeeIterator* _tmp17_;
+					gboolean _tmp18_;
 					MediaSource* s = NULL;
-					GeeIterator* _tmp19_ = NULL;
-					gpointer _tmp20_ = NULL;
-					const gchar* _tmp21_ = NULL;
-					Tag* _tmp22_ = NULL;
-					Tag* _tmp23_ = NULL;
-					MediaSource* _tmp24_ = NULL;
+					GeeIterator* _tmp19_;
+					gpointer _tmp20_;
+					const gchar* _tmp21_;
+					Tag* _tmp22_;
+					Tag* _tmp23_;
+					MediaSource* _tmp24_;
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp17_ = _s_it;
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18136,7 +18071,7 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 					if (!_tmp18_) {
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 18140 "Commands.c"
+#line 18075 "Commands.c"
 					}
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp19_ = _s_it;
@@ -18158,37 +18093,37 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 					_g_object_unref0 (_tmp23_);
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (s);
-#line 18162 "Commands.c"
+#line 18097 "Commands.c"
 				}
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_s_it);
-#line 18166 "Commands.c"
+#line 18101 "Commands.c"
 			}
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (p);
-#line 18170 "Commands.c"
+#line 18105 "Commands.c"
 		}
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_p_it);
-#line 18174 "Commands.c"
+#line 18109 "Commands.c"
 	}
 }
 
 
 static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const gchar* from, const gchar* to) {
-	TagSourceCollection* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	TagSourceCollection* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 	Tag* from_tag = NULL;
-	const gchar* _tmp3_ = NULL;
-	Tag* _tmp4_ = NULL;
+	const gchar* _tmp3_;
+	Tag* _tmp4_;
 	Tag* to_tag = NULL;
-	const gchar* _tmp5_ = NULL;
-	Tag* _tmp6_ = NULL;
-	GeeHashMap* _tmp7_ = NULL;
+	const gchar* _tmp5_;
+	Tag* _tmp6_;
+	GeeHashMap* _tmp7_;
 	GeeList* from_children = NULL;
-	Tag* _tmp50_ = NULL;
-	GeeList* _tmp51_ = NULL;
+	Tag* _tmp50_;
+	GeeList* _tmp51_;
 #line 2024 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
 #line 2024 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18221,14 +18156,14 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 	_g_object_unref0 (self->priv->dest_parent_attachments);
 #line 2033 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->dest_parent_attachments = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_MAP, GeeMap);
-#line 18225 "Commands.c"
+#line 18160 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
-		Tag* _tmp8_ = NULL;
-		GeeCollection* _tmp9_ = NULL;
-		GeeCollection* _tmp10_ = NULL;
-		GeeIterator* _tmp11_ = NULL;
-		GeeIterator* _tmp12_ = NULL;
+		Tag* _tmp8_;
+		GeeCollection* _tmp9_;
+		GeeCollection* _tmp10_;
+		GeeIterator* _tmp11_;
+		GeeIterator* _tmp12_;
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp8_ = from_tag;
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18245,15 +18180,15 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 		_source_it = _tmp12_;
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 18249 "Commands.c"
-			GeeIterator* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
+#line 18184 "Commands.c"
+			GeeIterator* _tmp13_;
+			gboolean _tmp14_;
 			MediaSource* source = NULL;
-			GeeIterator* _tmp15_ = NULL;
-			gpointer _tmp16_ = NULL;
+			GeeIterator* _tmp15_;
+			gpointer _tmp16_;
 			Tag* current_parent = NULL;
-			Tag* _tmp17_ = NULL;
-			Tag* _tmp18_ = NULL;
+			Tag* _tmp17_;
+			Tag* _tmp18_;
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp13_ = _source_it;
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18262,7 +18197,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 			if (!_tmp14_) {
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 18266 "Commands.c"
+#line 18201 "Commands.c"
 			}
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp15_ = _source_it;
@@ -18278,26 +18213,26 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 			current_parent = _tmp18_;
 #line 2036 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 18282 "Commands.c"
-				Tag* _tmp19_ = NULL;
+#line 18217 "Commands.c"
+				Tag* _tmp19_;
 				gchar* current_parent_path = NULL;
-				Tag* _tmp20_ = NULL;
-				gchar* _tmp21_ = NULL;
-				GeeMap* _tmp22_ = NULL;
-				const gchar* _tmp23_ = NULL;
-				gboolean _tmp24_ = FALSE;
-				Tag* _tmp29_ = NULL;
-				MediaSource* _tmp30_ = NULL;
-				gboolean _tmp31_ = FALSE;
-				Tag* _tmp37_ = NULL;
-				Tag* _tmp38_ = NULL;
+				Tag* _tmp20_;
+				gchar* _tmp21_;
+				GeeMap* _tmp22_;
+				const gchar* _tmp23_;
+				gboolean _tmp24_;
+				Tag* _tmp29_;
+				MediaSource* _tmp30_;
+				gboolean _tmp31_;
+				Tag* _tmp37_;
+				Tag* _tmp38_;
 #line 2036 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp19_ = current_parent;
 #line 2036 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!(_tmp19_ != NULL)) {
 #line 2036 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 18301 "Commands.c"
+#line 18236 "Commands.c"
 				}
 #line 2037 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp20_ = current_parent;
@@ -18313,11 +18248,11 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				_tmp24_ = gee_map_has_key (_tmp22_, _tmp23_);
 #line 2038 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp24_) {
-#line 18317 "Commands.c"
-					GeeMap* _tmp25_ = NULL;
-					const gchar* _tmp26_ = NULL;
-					GeeHashSet* _tmp27_ = NULL;
-					GeeHashSet* _tmp28_ = NULL;
+#line 18252 "Commands.c"
+					GeeMap* _tmp25_;
+					const gchar* _tmp26_;
+					GeeHashSet* _tmp27_;
+					GeeHashSet* _tmp28_;
 #line 2039 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp25_ = self->priv->dest_parent_attachments;
 #line 2039 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18330,7 +18265,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 					gee_map_set (_tmp25_, _tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_SET, GeeSet));
 #line 2039 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_tmp28_);
-#line 18334 "Commands.c"
+#line 18269 "Commands.c"
 				}
 #line 2041 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp29_ = current_parent;
@@ -18340,12 +18275,12 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				_tmp31_ = tag_contains (_tmp29_, _tmp30_);
 #line 2041 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp31_) {
-#line 18344 "Commands.c"
-					GeeMap* _tmp32_ = NULL;
-					const gchar* _tmp33_ = NULL;
-					gpointer _tmp34_ = NULL;
-					GeeSet* _tmp35_ = NULL;
-					MediaSource* _tmp36_ = NULL;
+#line 18279 "Commands.c"
+					GeeMap* _tmp32_;
+					const gchar* _tmp33_;
+					gpointer _tmp34_;
+					GeeSet* _tmp35_;
+					MediaSource* _tmp36_;
 #line 2042 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp32_ = self->priv->dest_parent_attachments;
 #line 2042 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18360,7 +18295,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), _tmp36_);
 #line 2042 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_tmp35_);
-#line 18364 "Commands.c"
+#line 18299 "Commands.c"
 				}
 #line 2044 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp37_ = current_parent;
@@ -18372,25 +18307,25 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				current_parent = _tmp38_;
 #line 2036 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_free0 (current_parent_path);
-#line 18376 "Commands.c"
+#line 18311 "Commands.c"
 			}
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (current_parent);
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 18382 "Commands.c"
+#line 18317 "Commands.c"
 		}
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 18386 "Commands.c"
+#line 18321 "Commands.c"
 	}
 	{
 		GeeIterator* _source_it = NULL;
-		Tag* _tmp39_ = NULL;
-		GeeCollection* _tmp40_ = NULL;
-		GeeCollection* _tmp41_ = NULL;
-		GeeIterator* _tmp42_ = NULL;
-		GeeIterator* _tmp43_ = NULL;
+		Tag* _tmp39_;
+		GeeCollection* _tmp40_;
+		GeeCollection* _tmp41_;
+		GeeIterator* _tmp42_;
+		GeeIterator* _tmp43_;
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp39_ = from_tag;
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18407,14 +18342,14 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 		_source_it = _tmp43_;
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 18411 "Commands.c"
-			GeeIterator* _tmp44_ = NULL;
-			gboolean _tmp45_ = FALSE;
+#line 18346 "Commands.c"
+			GeeIterator* _tmp44_;
+			gboolean _tmp45_;
 			MediaSource* source = NULL;
-			GeeIterator* _tmp46_ = NULL;
-			gpointer _tmp47_ = NULL;
-			Tag* _tmp48_ = NULL;
-			MediaSource* _tmp49_ = NULL;
+			GeeIterator* _tmp46_;
+			gpointer _tmp47_;
+			Tag* _tmp48_;
+			MediaSource* _tmp49_;
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp44_ = _source_it;
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18423,7 +18358,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 			if (!_tmp45_) {
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 18427 "Commands.c"
+#line 18362 "Commands.c"
 			}
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp46_ = _source_it;
@@ -18439,11 +18374,11 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 			tag_attach (_tmp48_, _tmp49_);
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 18443 "Commands.c"
+#line 18378 "Commands.c"
 		}
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 18447 "Commands.c"
+#line 18382 "Commands.c"
 	}
 #line 2053 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp50_ = from_tag;
@@ -18451,12 +18386,12 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 	_tmp51_ = tag_get_hierarchical_children (_tmp50_);
 #line 2053 "/home/jens/Source/shotwell/src/Commands.vala"
 	from_children = _tmp51_;
-#line 18455 "Commands.c"
+#line 18390 "Commands.c"
 	{
 		gint i = 0;
-		GeeList* _tmp52_ = NULL;
-		gint _tmp53_ = 0;
-		gint _tmp54_ = 0;
+		GeeList* _tmp52_;
+		gint _tmp53_;
+		gint _tmp54_;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp52_ = from_children;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18465,48 +18400,48 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 		_tmp54_ = _tmp53_;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = _tmp54_ - 1;
-#line 18469 "Commands.c"
+#line 18404 "Commands.c"
 		{
 			gboolean _tmp55_ = FALSE;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp55_ = TRUE;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 18476 "Commands.c"
-				gint _tmp57_ = 0;
+#line 18411 "Commands.c"
+				gint _tmp57_;
 				Tag* from_child = NULL;
-				GeeList* _tmp58_ = NULL;
-				gint _tmp59_ = 0;
-				gpointer _tmp60_ = NULL;
+				GeeList* _tmp58_;
+				gint _tmp59_;
+				gpointer _tmp60_;
 				gchar* child_subpath = NULL;
-				Tag* _tmp61_ = NULL;
-				gchar* _tmp62_ = NULL;
-				gchar* _tmp63_ = NULL;
-				const gchar* _tmp64_ = NULL;
-				gchar* _tmp65_ = NULL;
-				gchar* _tmp66_ = NULL;
-				gchar* _tmp67_ = NULL;
-				gchar* _tmp68_ = NULL;
+				Tag* _tmp61_;
+				gchar* _tmp62_;
+				gchar* _tmp63_;
+				const gchar* _tmp64_;
+				gchar* _tmp65_;
+				gchar* _tmp66_;
+				gchar* _tmp67_;
+				gchar* _tmp68_;
 				Tag* to_child = NULL;
-				Tag* _tmp69_ = NULL;
-				gchar* _tmp70_ = NULL;
-				gchar* _tmp71_ = NULL;
-				gchar* _tmp72_ = NULL;
-				gchar* _tmp73_ = NULL;
-				const gchar* _tmp74_ = NULL;
-				gchar* _tmp75_ = NULL;
-				gchar* _tmp76_ = NULL;
-				Tag* _tmp77_ = NULL;
-				Tag* _tmp78_ = NULL;
+				Tag* _tmp69_;
+				gchar* _tmp70_;
+				gchar* _tmp71_;
+				gchar* _tmp72_;
+				gchar* _tmp73_;
+				const gchar* _tmp74_;
+				gchar* _tmp75_;
+				gchar* _tmp76_;
+				Tag* _tmp77_;
+				Tag* _tmp78_;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp55_) {
-#line 18504 "Commands.c"
-					gint _tmp56_ = 0;
+#line 18439 "Commands.c"
+					gint _tmp56_;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp56_ = i;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp56_ - 1;
-#line 18510 "Commands.c"
+#line 18445 "Commands.c"
 				}
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp55_ = FALSE;
@@ -18516,7 +18451,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				if (!(_tmp57_ >= 0)) {
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 18520 "Commands.c"
+#line 18455 "Commands.c"
 				}
 #line 2055 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp58_ = from_children;
@@ -18576,14 +18511,14 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				_g_free0 (_tmp71_);
 #line 2060 "/home/jens/Source/shotwell/src/Commands.vala"
 				to_child = _tmp78_;
-#line 18580 "Commands.c"
+#line 18515 "Commands.c"
 				{
 					GeeIterator* _source_it = NULL;
-					Tag* _tmp79_ = NULL;
-					GeeCollection* _tmp80_ = NULL;
-					GeeCollection* _tmp81_ = NULL;
-					GeeIterator* _tmp82_ = NULL;
-					GeeIterator* _tmp83_ = NULL;
+					Tag* _tmp79_;
+					GeeCollection* _tmp80_;
+					GeeCollection* _tmp81_;
+					GeeIterator* _tmp82_;
+					GeeIterator* _tmp83_;
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp79_ = from_child;
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18600,14 +18535,14 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 					_source_it = _tmp83_;
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
 					while (TRUE) {
-#line 18604 "Commands.c"
-						GeeIterator* _tmp84_ = NULL;
-						gboolean _tmp85_ = FALSE;
+#line 18539 "Commands.c"
+						GeeIterator* _tmp84_;
+						gboolean _tmp85_;
 						MediaSource* source = NULL;
-						GeeIterator* _tmp86_ = NULL;
-						gpointer _tmp87_ = NULL;
-						Tag* _tmp88_ = NULL;
-						MediaSource* _tmp89_ = NULL;
+						GeeIterator* _tmp86_;
+						gpointer _tmp87_;
+						Tag* _tmp88_;
+						MediaSource* _tmp89_;
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp84_ = _source_it;
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18616,7 +18551,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 						if (!_tmp85_) {
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
 							break;
-#line 18620 "Commands.c"
+#line 18555 "Commands.c"
 						}
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp86_ = _source_it;
@@ -18632,11 +18567,11 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 						tag_attach (_tmp88_, _tmp89_);
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (source);
-#line 18636 "Commands.c"
+#line 18571 "Commands.c"
 					}
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_source_it);
-#line 18640 "Commands.c"
+#line 18575 "Commands.c"
 				}
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (to_child);
@@ -18644,7 +18579,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				_g_free0 (child_subpath);
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (from_child);
-#line 18648 "Commands.c"
+#line 18583 "Commands.c"
 			}
 		}
 	}
@@ -18654,29 +18589,29 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 	_g_object_unref0 (to_tag);
 #line 2024 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (from_tag);
-#line 18658 "Commands.c"
+#line 18593 "Commands.c"
 }
 
 
 static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, const gchar* client_path) {
 	gchar* victim_path = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	TagSourceCollection* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	TagSourceCollection* _tmp5_;
+	const gchar* _tmp6_;
+	gboolean _tmp7_;
 	Tag* victim = NULL;
-	const gchar* _tmp8_ = NULL;
-	Tag* _tmp9_ = NULL;
+	const gchar* _tmp8_;
+	Tag* _tmp9_;
 	GeeList* victim_children = NULL;
-	Tag* _tmp10_ = NULL;
-	GeeList* _tmp11_ = NULL;
-	TagSourceCollection* _tmp26_ = NULL;
-	TagSourceCollection* _tmp27_ = NULL;
-	Tag* _tmp28_ = NULL;
-	Marker* _tmp29_ = NULL;
-	Marker* _tmp30_ = NULL;
+	Tag* _tmp10_;
+	GeeList* _tmp11_;
+	TagSourceCollection* _tmp26_;
+	TagSourceCollection* _tmp27_;
+	Tag* _tmp28_;
+	Marker* _tmp29_;
+	Marker* _tmp30_;
 #line 2068 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
 #line 2068 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18691,9 +18626,9 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 	_tmp2_ = victim_path;
 #line 2070 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ == NULL) {
-#line 18695 "Commands.c"
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
+#line 18630 "Commands.c"
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
 #line 2071 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = client_path;
 #line 2071 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18702,7 +18637,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 		_g_free0 (victim_path);
 #line 2071 "/home/jens/Source/shotwell/src/Commands.vala"
 		victim_path = _tmp4_;
-#line 18706 "Commands.c"
+#line 18641 "Commands.c"
 	}
 #line 2073 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp5_ = tag_global;
@@ -18716,7 +18651,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 		_g_free0 (victim_path);
 #line 2074 "/home/jens/Source/shotwell/src/Commands.vala"
 		return;
-#line 18720 "Commands.c"
+#line 18655 "Commands.c"
 	}
 #line 2076 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp8_ = victim_path;
@@ -18730,40 +18665,40 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 	_tmp11_ = tag_get_hierarchical_children (_tmp10_);
 #line 2079 "/home/jens/Source/shotwell/src/Commands.vala"
 	victim_children = _tmp11_;
-#line 18734 "Commands.c"
+#line 18669 "Commands.c"
 	{
 		gint i = 0;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = 0;
-#line 18739 "Commands.c"
+#line 18674 "Commands.c"
 		{
 			gboolean _tmp12_ = FALSE;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp12_ = TRUE;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 18746 "Commands.c"
-				gint _tmp14_ = 0;
-				GeeList* _tmp15_ = NULL;
-				gint _tmp16_ = 0;
-				gint _tmp17_ = 0;
-				TagSourceCollection* _tmp18_ = NULL;
-				TagSourceCollection* _tmp19_ = NULL;
-				GeeList* _tmp20_ = NULL;
-				gint _tmp21_ = 0;
-				gpointer _tmp22_ = NULL;
-				Tag* _tmp23_ = NULL;
-				Marker* _tmp24_ = NULL;
-				Marker* _tmp25_ = NULL;
+#line 18681 "Commands.c"
+				gint _tmp14_;
+				GeeList* _tmp15_;
+				gint _tmp16_;
+				gint _tmp17_;
+				TagSourceCollection* _tmp18_;
+				TagSourceCollection* _tmp19_;
+				GeeList* _tmp20_;
+				gint _tmp21_;
+				gpointer _tmp22_;
+				Tag* _tmp23_;
+				Marker* _tmp24_;
+				Marker* _tmp25_;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp12_) {
-#line 18761 "Commands.c"
-					gint _tmp13_ = 0;
+#line 18696 "Commands.c"
+					gint _tmp13_;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp13_ = i;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp13_ + 1;
-#line 18767 "Commands.c"
+#line 18702 "Commands.c"
 				}
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp12_ = FALSE;
@@ -18779,7 +18714,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 				if (!(_tmp14_ < _tmp17_)) {
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 18783 "Commands.c"
+#line 18718 "Commands.c"
 				}
 #line 2081 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp18_ = tag_global;
@@ -18803,7 +18738,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 				_g_object_unref0 (_tmp25_);
 #line 2081 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp23_);
-#line 18807 "Commands.c"
+#line 18742 "Commands.c"
 			}
 		}
 	}
@@ -18827,24 +18762,24 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 	_g_object_unref0 (victim);
 #line 2068 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (victim_path);
-#line 18831 "Commands.c"
+#line 18766 "Commands.c"
 }
 
 
 static void reparent_tag_command_real_execute (Command* base) {
 	ReparentTagCommand * self;
-	GeeList* _tmp0_ = NULL;
+	GeeList* _tmp0_;
 #line 2087 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_REPARENT_TAG_COMMAND, ReparentTagCommand);
 #line 2088 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = self->priv->after_state;
 #line 2088 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ == NULL) {
-#line 18844 "Commands.c"
-		const gchar* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
+#line 18779 "Commands.c"
+		const gchar* _tmp1_;
+		const gchar* _tmp2_;
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
 #line 2089 "/home/jens/Source/shotwell/src/Commands.vala"
 		reparent_tag_command_save_before_state (self);
 #line 2091 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18865,13 +18800,13 @@ static void reparent_tag_command_real_execute (Command* base) {
 		_tmp4_ = self->priv->from_path;
 #line 2099 "/home/jens/Source/shotwell/src/Commands.vala"
 		reparent_tag_command_destroy_subtree (self, _tmp4_);
-#line 18869 "Commands.c"
+#line 18804 "Commands.c"
 	} else {
-		const gchar* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-		GeeMap* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
+		const gchar* _tmp5_;
+		const gchar* _tmp6_;
+		GeeMap* _tmp7_;
+		const gchar* _tmp8_;
+		const gchar* _tmp9_;
 #line 2101 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = self->priv->to_path;
 #line 2101 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18896,22 +18831,22 @@ static void reparent_tag_command_real_execute (Command* base) {
 		_tmp9_ = self->priv->from_path;
 #line 2111 "/home/jens/Source/shotwell/src/Commands.vala"
 		reparent_tag_command_destroy_subtree (self, _tmp9_);
-#line 18900 "Commands.c"
+#line 18835 "Commands.c"
 	}
 }
 
 
 static void reparent_tag_command_real_undo (Command* base) {
 	ReparentTagCommand * self;
-	GeeList* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp4_ = NULL;
-	GeeMap* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
+	GeeList* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
+	const gchar* _tmp4_;
+	GeeMap* _tmp5_;
+	const gchar* _tmp6_;
+	const gchar* _tmp7_;
+	const gchar* _tmp8_;
+	const gchar* _tmp9_;
 #line 2115 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_REPARENT_TAG_COMMAND, ReparentTagCommand);
 #line 2116 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18928,13 +18863,13 @@ static void reparent_tag_command_real_undo (Command* base) {
 	_tmp2_ = self->priv->to_path_exists;
 #line 2122 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (!_tmp2_) {
-#line 18932 "Commands.c"
-		const gchar* _tmp3_ = NULL;
+#line 18867 "Commands.c"
+		const gchar* _tmp3_;
 #line 2123 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->to_path;
 #line 2123 "/home/jens/Source/shotwell/src/Commands.vala"
 		reparent_tag_command_destroy_subtree (self, _tmp3_);
-#line 18938 "Commands.c"
+#line 18873 "Commands.c"
 	}
 #line 2125 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = self->priv->from_path;
@@ -18962,13 +18897,13 @@ static void reparent_tag_command_real_undo (Command* base) {
 	_tmp9_ = self->priv->to_path_parent_path;
 #line 2133 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp9_ != NULL) {
-#line 18966 "Commands.c"
-		const gchar* _tmp10_ = NULL;
+#line 18901 "Commands.c"
+		const gchar* _tmp10_;
 #line 2134 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp10_ = self->priv->to_path_parent_path;
 #line 2134 "/home/jens/Source/shotwell/src/Commands.vala"
 		hierarchical_tag_utilities_cleanup_root_path (_tmp10_);
-#line 18972 "Commands.c"
+#line 18907 "Commands.c"
 	}
 }
 
@@ -18979,17 +18914,17 @@ static void reparent_tag_command_class_init (ReparentTagCommandClass * klass) {
 #line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (ReparentTagCommandPrivate));
 #line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) reparent_tag_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) reparent_tag_command_real_execute;
 #line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) reparent_tag_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) reparent_tag_command_real_undo;
 #line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = reparent_tag_command_finalize;
-#line 18988 "Commands.c"
+#line 18923 "Commands.c"
 }
 
 
 static void reparent_tag_command_instance_init (ReparentTagCommand * self) {
-	GeeHashSet* _tmp0_ = NULL;
+	GeeHashSet* _tmp0_;
 #line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = REPARENT_TAG_COMMAND_GET_PRIVATE (self);
 #line 1683 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19014,16 +18949,16 @@ static void reparent_tag_command_instance_init (ReparentTagCommand * self) {
 	self->priv->existing_dest_membership = NULL;
 #line 1692 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->to_path_exists = FALSE;
-#line 19018 "Commands.c"
+#line 18953 "Commands.c"
 }
 
 
-static void reparent_tag_command_finalize (GObject* obj) {
+static void reparent_tag_command_finalize (GObject * obj) {
 	ReparentTagCommand * self;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	VideoSourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	LibraryPhotoSourceCollection* _tmp0_;
+	guint _tmp1_;
+	VideoSourceCollection* _tmp2_;
+	guint _tmp3_;
 #line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_REPARENT_TAG_COMMAND, ReparentTagCommand);
 #line 1724 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19064,7 +18999,7 @@ static void reparent_tag_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->existing_dest_membership);
 #line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (reparent_tag_command_parent_class)->finalize (obj);
-#line 19068 "Commands.c"
+#line 19003 "Commands.c"
 }
 
 
@@ -19083,22 +19018,22 @@ GType reparent_tag_command_get_type (void) {
 static void _modify_tags_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
 #line 2179 "/home/jens/Source/shotwell/src/Commands.vala"
 	modify_tags_command_on_proxy_broken ((ModifyTagsCommand*) self);
-#line 19087 "Commands.c"
+#line 19022 "Commands.c"
 }
 
 
 ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource* media, GeeCollection* new_tag_list) {
 	ModifyTagsCommand * self = NULL;
-	MediaSource* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	MediaSource* _tmp2_ = NULL;
+	MediaSource* _tmp0_;
+	MediaSource* _tmp1_;
+	MediaSource* _tmp2_;
 	GeeList* original_tags = NULL;
-	TagSourceCollection* _tmp3_ = NULL;
-	MediaSource* _tmp4_ = NULL;
-	GeeList* _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
+	TagSourceCollection* _tmp3_;
+	MediaSource* _tmp4_;
+	GeeList* _tmp5_;
+	GeeList* _tmp6_;
 	GeeSortedSet* new_paths = NULL;
-	GeeTreeSet* _tmp23_ = NULL;
+	GeeTreeSet* _tmp23_;
 #line 2143 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (media), NULL);
 #line 2143 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19127,15 +19062,15 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 	_tmp6_ = original_tags;
 #line 2150 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp6_ != NULL) {
-#line 19131 "Commands.c"
+#line 19066 "Commands.c"
 		{
 			GeeList* _tag_list = NULL;
-			GeeList* _tmp7_ = NULL;
-			GeeList* _tmp8_ = NULL;
+			GeeList* _tmp7_;
+			GeeList* _tmp8_;
 			gint _tag_size = 0;
-			GeeList* _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
+			GeeList* _tmp9_;
+			gint _tmp10_;
+			gint _tmp11_;
 			gint _tag_index = 0;
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp7_ = original_tags;
@@ -19155,20 +19090,20 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 			_tag_index = -1;
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 19159 "Commands.c"
-				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
-				gint _tmp14_ = 0;
+#line 19094 "Commands.c"
+				gint _tmp12_;
+				gint _tmp13_;
+				gint _tmp14_;
 				Tag* tag = NULL;
-				GeeList* _tmp15_ = NULL;
-				gint _tmp16_ = 0;
-				gpointer _tmp17_ = NULL;
+				GeeList* _tmp15_;
+				gint _tmp16_;
+				gpointer _tmp17_;
 				SourceProxy* proxy = NULL;
-				Tag* _tmp18_ = NULL;
-				SourceProxy* _tmp19_ = NULL;
-				GeeArrayList* _tmp20_ = NULL;
-				SourceProxy* _tmp21_ = NULL;
-				SourceProxy* _tmp22_ = NULL;
+				Tag* _tmp18_;
+				SourceProxy* _tmp19_;
+				GeeArrayList* _tmp20_;
+				SourceProxy* _tmp21_;
+				SourceProxy* _tmp22_;
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp12_ = _tag_index;
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19181,7 +19116,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 				if (!(_tmp13_ < _tmp14_)) {
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 19185 "Commands.c"
+#line 19120 "Commands.c"
 				}
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp15_ = _tag_list;
@@ -19211,22 +19146,22 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 				_source_proxy_unref0 (proxy);
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (tag);
-#line 19215 "Commands.c"
+#line 19150 "Commands.c"
 			}
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_tag_list);
-#line 19219 "Commands.c"
+#line 19154 "Commands.c"
 		}
 	}
 #line 2160 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp23_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 2160 "/home/jens/Source/shotwell/src/Commands.vala"
 	new_paths = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 19226 "Commands.c"
+#line 19161 "Commands.c"
 	{
 		GeeIterator* _new_tag_it = NULL;
-		GeeCollection* _tmp24_ = NULL;
-		GeeIterator* _tmp25_ = NULL;
+		GeeCollection* _tmp24_;
+		GeeIterator* _tmp25_;
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp24_ = new_tag_list;
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19235,21 +19170,21 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 		_new_tag_it = _tmp25_;
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19239 "Commands.c"
-			GeeIterator* _tmp26_ = NULL;
-			gboolean _tmp27_ = FALSE;
+#line 19174 "Commands.c"
+			GeeIterator* _tmp26_;
+			gboolean _tmp27_;
 			Tag* new_tag = NULL;
-			GeeIterator* _tmp28_ = NULL;
-			gpointer _tmp29_ = NULL;
+			GeeIterator* _tmp28_;
+			gpointer _tmp29_;
 			gchar* new_tag_path = NULL;
-			Tag* _tmp30_ = NULL;
-			gchar* _tmp31_ = NULL;
-			GeeSortedSet* _tmp32_ = NULL;
-			const gchar* _tmp33_ = NULL;
-			GeeSortedSet* _tmp34_ = NULL;
-			const gchar* _tmp35_ = NULL;
-			GeeList* _tmp36_ = NULL;
-			GeeList* _tmp37_ = NULL;
+			Tag* _tmp30_;
+			gchar* _tmp31_;
+			GeeSortedSet* _tmp32_;
+			const gchar* _tmp33_;
+			GeeSortedSet* _tmp34_;
+			const gchar* _tmp35_;
+			GeeList* _tmp36_;
+			GeeList* _tmp37_;
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp26_ = _new_tag_it;
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19258,7 +19193,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 			if (!_tmp27_) {
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19262 "Commands.c"
+#line 19197 "Commands.c"
 			}
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp28_ = _new_tag_it;
@@ -19294,16 +19229,16 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 			_g_free0 (new_tag_path);
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (new_tag);
-#line 19298 "Commands.c"
+#line 19233 "Commands.c"
 		}
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_new_tag_it);
-#line 19302 "Commands.c"
+#line 19237 "Commands.c"
 	}
 	{
 		GeeIterator* _path_it = NULL;
-		GeeSortedSet* _tmp38_ = NULL;
-		GeeIterator* _tmp39_ = NULL;
+		GeeSortedSet* _tmp38_;
+		GeeIterator* _tmp39_;
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp38_ = new_paths;
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19312,24 +19247,24 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 		_path_it = _tmp39_;
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19316 "Commands.c"
-			GeeIterator* _tmp40_ = NULL;
-			gboolean _tmp41_ = FALSE;
+#line 19251 "Commands.c"
+			GeeIterator* _tmp40_;
+			gboolean _tmp41_;
 			gchar* path = NULL;
-			GeeIterator* _tmp42_ = NULL;
-			gpointer _tmp43_ = NULL;
-			TagSourceCollection* _tmp44_ = NULL;
-			const gchar* _tmp45_ = NULL;
-			gboolean _tmp46_ = FALSE;
+			GeeIterator* _tmp42_;
+			gpointer _tmp43_;
+			TagSourceCollection* _tmp44_;
+			const gchar* _tmp45_;
+			gboolean _tmp46_;
 			SourceProxy* proxy = NULL;
-			const gchar* _tmp47_ = NULL;
-			Tag* _tmp48_ = NULL;
-			Tag* _tmp49_ = NULL;
-			SourceProxy* _tmp50_ = NULL;
-			SourceProxy* _tmp51_ = NULL;
-			GeeArrayList* _tmp52_ = NULL;
-			SourceProxy* _tmp53_ = NULL;
-			SourceProxy* _tmp54_ = NULL;
+			const gchar* _tmp47_;
+			Tag* _tmp48_;
+			Tag* _tmp49_;
+			SourceProxy* _tmp50_;
+			SourceProxy* _tmp51_;
+			GeeArrayList* _tmp52_;
+			SourceProxy* _tmp53_;
+			SourceProxy* _tmp54_;
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp40_ = _path_it;
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19338,7 +19273,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 			if (!_tmp41_) {
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19342 "Commands.c"
+#line 19277 "Commands.c"
 			}
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp42_ = _path_it;
@@ -19382,11 +19317,11 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 			_source_proxy_unref0 (proxy);
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (path);
-#line 19386 "Commands.c"
+#line 19321 "Commands.c"
 		}
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_path_it);
-#line 19390 "Commands.c"
+#line 19325 "Commands.c"
 	}
 #line 2143 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (new_paths);
@@ -19394,14 +19329,14 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 	_g_object_unref0 (original_tags);
 #line 2143 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 19398 "Commands.c"
+#line 19333 "Commands.c"
 }
 
 
 ModifyTagsCommand* modify_tags_command_new (MediaSource* media, GeeCollection* new_tag_list) {
 #line 2143 "/home/jens/Source/shotwell/src/Commands.vala"
 	return modify_tags_command_construct (TYPE_MODIFY_TAGS_COMMAND, media, new_tag_list);
-#line 19405 "Commands.c"
+#line 19340 "Commands.c"
 }
 
 
@@ -19409,15 +19344,15 @@ static void modify_tags_command_real_execute (Command* base) {
 	ModifyTagsCommand * self;
 #line 2185 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommand);
-#line 19413 "Commands.c"
+#line 19348 "Commands.c"
 	{
 		GeeArrayList* _proxy_list = NULL;
-		GeeArrayList* _tmp0_ = NULL;
-		GeeArrayList* _tmp1_ = NULL;
+		GeeArrayList* _tmp0_;
+		GeeArrayList* _tmp1_;
 		gint _proxy_size = 0;
-		GeeArrayList* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		GeeArrayList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 		gint _proxy_index = 0;
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->to_remove;
@@ -19437,20 +19372,20 @@ static void modify_tags_command_real_execute (Command* base) {
 		_proxy_index = -1;
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19441 "Commands.c"
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
+#line 19376 "Commands.c"
+			gint _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
 			SourceProxy* proxy = NULL;
-			GeeArrayList* _tmp8_ = NULL;
-			gint _tmp9_ = 0;
-			gpointer _tmp10_ = NULL;
-			SourceProxy* _tmp11_ = NULL;
-			DataSource* _tmp12_ = NULL;
-			Tag* _tmp13_ = NULL;
-			MediaSource* _tmp14_ = NULL;
-			GeeList* _tmp15_ = NULL;
-			GeeList* _tmp16_ = NULL;
+			GeeArrayList* _tmp8_;
+			gint _tmp9_;
+			gpointer _tmp10_;
+			SourceProxy* _tmp11_;
+			DataSource* _tmp12_;
+			Tag* _tmp13_;
+			MediaSource* _tmp14_;
+			GeeList* _tmp15_;
+			GeeList* _tmp16_;
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = _proxy_index;
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19463,7 +19398,7 @@ static void modify_tags_command_real_execute (Command* base) {
 			if (!(_tmp6_ < _tmp7_)) {
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19467 "Commands.c"
+#line 19402 "Commands.c"
 			}
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _proxy_list;
@@ -19491,20 +19426,20 @@ static void modify_tags_command_real_execute (Command* base) {
 			_g_object_unref0 (_tmp13_);
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19495 "Commands.c"
+#line 19430 "Commands.c"
 		}
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19499 "Commands.c"
+#line 19434 "Commands.c"
 	}
 	{
 		GeeArrayList* _proxy_list = NULL;
-		GeeArrayList* _tmp17_ = NULL;
-		GeeArrayList* _tmp18_ = NULL;
+		GeeArrayList* _tmp17_;
+		GeeArrayList* _tmp18_;
 		gint _proxy_size = 0;
-		GeeArrayList* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
-		gint _tmp21_ = 0;
+		GeeArrayList* _tmp19_;
+		gint _tmp20_;
+		gint _tmp21_;
 		gint _proxy_index = 0;
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp17_ = self->priv->to_add;
@@ -19524,18 +19459,18 @@ static void modify_tags_command_real_execute (Command* base) {
 		_proxy_index = -1;
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19528 "Commands.c"
-			gint _tmp22_ = 0;
-			gint _tmp23_ = 0;
-			gint _tmp24_ = 0;
+#line 19463 "Commands.c"
+			gint _tmp22_;
+			gint _tmp23_;
+			gint _tmp24_;
 			SourceProxy* proxy = NULL;
-			GeeArrayList* _tmp25_ = NULL;
-			gint _tmp26_ = 0;
-			gpointer _tmp27_ = NULL;
-			SourceProxy* _tmp28_ = NULL;
-			DataSource* _tmp29_ = NULL;
-			Tag* _tmp30_ = NULL;
-			MediaSource* _tmp31_ = NULL;
+			GeeArrayList* _tmp25_;
+			gint _tmp26_;
+			gpointer _tmp27_;
+			SourceProxy* _tmp28_;
+			DataSource* _tmp29_;
+			Tag* _tmp30_;
+			MediaSource* _tmp31_;
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp22_ = _proxy_index;
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19548,7 +19483,7 @@ static void modify_tags_command_real_execute (Command* base) {
 			if (!(_tmp23_ < _tmp24_)) {
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19552 "Commands.c"
+#line 19487 "Commands.c"
 			}
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp25_ = _proxy_list;
@@ -19572,11 +19507,11 @@ static void modify_tags_command_real_execute (Command* base) {
 			_g_object_unref0 (_tmp30_);
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19576 "Commands.c"
+#line 19511 "Commands.c"
 		}
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19580 "Commands.c"
+#line 19515 "Commands.c"
 	}
 }
 
@@ -19585,15 +19520,15 @@ static void modify_tags_command_real_undo (Command* base) {
 	ModifyTagsCommand * self;
 #line 2193 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommand);
-#line 19589 "Commands.c"
+#line 19524 "Commands.c"
 	{
 		GeeArrayList* _proxy_list = NULL;
-		GeeArrayList* _tmp0_ = NULL;
-		GeeArrayList* _tmp1_ = NULL;
+		GeeArrayList* _tmp0_;
+		GeeArrayList* _tmp1_;
 		gint _proxy_size = 0;
-		GeeArrayList* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		GeeArrayList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 		gint _proxy_index = 0;
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->to_add;
@@ -19613,20 +19548,20 @@ static void modify_tags_command_real_undo (Command* base) {
 		_proxy_index = -1;
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19617 "Commands.c"
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
+#line 19552 "Commands.c"
+			gint _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
 			SourceProxy* proxy = NULL;
-			GeeArrayList* _tmp8_ = NULL;
-			gint _tmp9_ = 0;
-			gpointer _tmp10_ = NULL;
-			SourceProxy* _tmp11_ = NULL;
-			DataSource* _tmp12_ = NULL;
-			Tag* _tmp13_ = NULL;
-			MediaSource* _tmp14_ = NULL;
-			GeeList* _tmp15_ = NULL;
-			GeeList* _tmp16_ = NULL;
+			GeeArrayList* _tmp8_;
+			gint _tmp9_;
+			gpointer _tmp10_;
+			SourceProxy* _tmp11_;
+			DataSource* _tmp12_;
+			Tag* _tmp13_;
+			MediaSource* _tmp14_;
+			GeeList* _tmp15_;
+			GeeList* _tmp16_;
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = _proxy_index;
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19639,7 +19574,7 @@ static void modify_tags_command_real_undo (Command* base) {
 			if (!(_tmp6_ < _tmp7_)) {
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19643 "Commands.c"
+#line 19578 "Commands.c"
 			}
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _proxy_list;
@@ -19667,20 +19602,20 @@ static void modify_tags_command_real_undo (Command* base) {
 			_g_object_unref0 (_tmp13_);
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19671 "Commands.c"
+#line 19606 "Commands.c"
 		}
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19675 "Commands.c"
+#line 19610 "Commands.c"
 	}
 	{
 		GeeArrayList* _proxy_list = NULL;
-		GeeArrayList* _tmp17_ = NULL;
-		GeeArrayList* _tmp18_ = NULL;
+		GeeArrayList* _tmp17_;
+		GeeArrayList* _tmp18_;
 		gint _proxy_size = 0;
-		GeeArrayList* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
-		gint _tmp21_ = 0;
+		GeeArrayList* _tmp19_;
+		gint _tmp20_;
+		gint _tmp21_;
 		gint _proxy_index = 0;
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp17_ = self->priv->to_remove;
@@ -19700,18 +19635,18 @@ static void modify_tags_command_real_undo (Command* base) {
 		_proxy_index = -1;
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19704 "Commands.c"
-			gint _tmp22_ = 0;
-			gint _tmp23_ = 0;
-			gint _tmp24_ = 0;
+#line 19639 "Commands.c"
+			gint _tmp22_;
+			gint _tmp23_;
+			gint _tmp24_;
 			SourceProxy* proxy = NULL;
-			GeeArrayList* _tmp25_ = NULL;
-			gint _tmp26_ = 0;
-			gpointer _tmp27_ = NULL;
-			SourceProxy* _tmp28_ = NULL;
-			DataSource* _tmp29_ = NULL;
-			Tag* _tmp30_ = NULL;
-			MediaSource* _tmp31_ = NULL;
+			GeeArrayList* _tmp25_;
+			gint _tmp26_;
+			gpointer _tmp27_;
+			SourceProxy* _tmp28_;
+			DataSource* _tmp29_;
+			Tag* _tmp30_;
+			MediaSource* _tmp31_;
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp22_ = _proxy_index;
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19724,7 +19659,7 @@ static void modify_tags_command_real_undo (Command* base) {
 			if (!(_tmp23_ < _tmp24_)) {
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19728 "Commands.c"
+#line 19663 "Commands.c"
 			}
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp25_ = _proxy_list;
@@ -19748,18 +19683,18 @@ static void modify_tags_command_real_undo (Command* base) {
 			_g_object_unref0 (_tmp30_);
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19752 "Commands.c"
+#line 19687 "Commands.c"
 		}
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19756 "Commands.c"
+#line 19691 "Commands.c"
 	}
 }
 
 
 static void modify_tags_command_on_proxy_broken (ModifyTagsCommand* self) {
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
 #line 2201 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_MODIFY_TAGS_COMMAND (self));
 #line 2202 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19770,7 +19705,7 @@ static void modify_tags_command_on_proxy_broken (ModifyTagsCommand* self) {
 	command_manager_reset (_tmp1_);
 #line 2202 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 19774 "Commands.c"
+#line 19709 "Commands.c"
 }
 
 
@@ -19780,18 +19715,18 @@ static void modify_tags_command_class_init (ModifyTagsCommandClass * klass) {
 #line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (ModifyTagsCommandPrivate));
 #line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) modify_tags_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) modify_tags_command_real_execute;
 #line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) modify_tags_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) modify_tags_command_real_undo;
 #line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = modify_tags_command_finalize;
-#line 19789 "Commands.c"
+#line 19724 "Commands.c"
 }
 
 
 static void modify_tags_command_instance_init (ModifyTagsCommand * self) {
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp1_;
 #line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = MODIFY_TAGS_COMMAND_GET_PRIVATE (self);
 #line 2140 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19802,23 +19737,23 @@ static void modify_tags_command_instance_init (ModifyTagsCommand * self) {
 	_tmp1_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL);
 #line 2141 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->to_remove = _tmp1_;
-#line 19806 "Commands.c"
+#line 19741 "Commands.c"
 }
 
 
-static void modify_tags_command_finalize (GObject* obj) {
+static void modify_tags_command_finalize (GObject * obj) {
 	ModifyTagsCommand * self;
 #line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommand);
-#line 19814 "Commands.c"
+#line 19749 "Commands.c"
 	{
 		GeeArrayList* _proxy_list = NULL;
-		GeeArrayList* _tmp0_ = NULL;
-		GeeArrayList* _tmp1_ = NULL;
+		GeeArrayList* _tmp0_;
+		GeeArrayList* _tmp1_;
 		gint _proxy_size = 0;
-		GeeArrayList* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		GeeArrayList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 		gint _proxy_index = 0;
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->to_add;
@@ -19838,16 +19773,16 @@ static void modify_tags_command_finalize (GObject* obj) {
 		_proxy_index = -1;
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19842 "Commands.c"
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
+#line 19777 "Commands.c"
+			gint _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
 			SourceProxy* proxy = NULL;
-			GeeArrayList* _tmp8_ = NULL;
-			gint _tmp9_ = 0;
-			gpointer _tmp10_ = NULL;
-			SourceProxy* _tmp11_ = NULL;
-			guint _tmp12_ = 0U;
+			GeeArrayList* _tmp8_;
+			gint _tmp9_;
+			gpointer _tmp10_;
+			SourceProxy* _tmp11_;
+			guint _tmp12_;
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = _proxy_index;
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19860,7 +19795,7 @@ static void modify_tags_command_finalize (GObject* obj) {
 			if (!(_tmp6_ < _tmp7_)) {
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19864 "Commands.c"
+#line 19799 "Commands.c"
 			}
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _proxy_list;
@@ -19878,20 +19813,20 @@ static void modify_tags_command_finalize (GObject* obj) {
 			g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _modify_tags_command_on_proxy_broken_source_proxy_broken, self);
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19882 "Commands.c"
+#line 19817 "Commands.c"
 		}
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19886 "Commands.c"
+#line 19821 "Commands.c"
 	}
 	{
 		GeeArrayList* _proxy_list = NULL;
-		GeeArrayList* _tmp13_ = NULL;
-		GeeArrayList* _tmp14_ = NULL;
+		GeeArrayList* _tmp13_;
+		GeeArrayList* _tmp14_;
 		gint _proxy_size = 0;
-		GeeArrayList* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
-		gint _tmp17_ = 0;
+		GeeArrayList* _tmp15_;
+		gint _tmp16_;
+		gint _tmp17_;
 		gint _proxy_index = 0;
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp13_ = self->priv->to_remove;
@@ -19911,16 +19846,16 @@ static void modify_tags_command_finalize (GObject* obj) {
 		_proxy_index = -1;
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19915 "Commands.c"
-			gint _tmp18_ = 0;
-			gint _tmp19_ = 0;
-			gint _tmp20_ = 0;
+#line 19850 "Commands.c"
+			gint _tmp18_;
+			gint _tmp19_;
+			gint _tmp20_;
 			SourceProxy* proxy = NULL;
-			GeeArrayList* _tmp21_ = NULL;
-			gint _tmp22_ = 0;
-			gpointer _tmp23_ = NULL;
-			SourceProxy* _tmp24_ = NULL;
-			guint _tmp25_ = 0U;
+			GeeArrayList* _tmp21_;
+			gint _tmp22_;
+			gpointer _tmp23_;
+			SourceProxy* _tmp24_;
+			guint _tmp25_;
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp18_ = _proxy_index;
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19933,7 +19868,7 @@ static void modify_tags_command_finalize (GObject* obj) {
 			if (!(_tmp19_ < _tmp20_)) {
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19937 "Commands.c"
+#line 19872 "Commands.c"
 			}
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp21_ = _proxy_list;
@@ -19951,11 +19886,11 @@ static void modify_tags_command_finalize (GObject* obj) {
 			g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _modify_tags_command_on_proxy_broken_source_proxy_broken, self);
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19955 "Commands.c"
+#line 19890 "Commands.c"
 		}
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19959 "Commands.c"
+#line 19894 "Commands.c"
 	}
 #line 2139 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->media);
@@ -19965,7 +19900,7 @@ static void modify_tags_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->to_remove);
 #line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (modify_tags_command_parent_class)->finalize (obj);
-#line 19969 "Commands.c"
+#line 19904 "Commands.c"
 }
 
 
@@ -19984,23 +19919,23 @@ GType modify_tags_command_get_type (void) {
 static void _tag_untag_photos_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 2226 "/home/jens/Source/shotwell/src/Commands.vala"
 	tag_untag_photos_command_on_source_destroyed ((TagUntagPhotosCommand*) self, source);
-#line 19988 "Commands.c"
+#line 19923 "Commands.c"
 }
 
 
 TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Tag* tag, GeeCollection* sources, gint count, gboolean attach) {
 	TagUntagPhotosCommand * self = NULL;
 	gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	Tag* _tmp12_ = NULL;
-	Tag* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	GeeCollection* _tmp16_ = NULL;
-	GeeCollection* _tmp17_ = NULL;
-	gboolean _tmp18_ = FALSE;
-	LibraryPhotoSourceCollection* _tmp19_ = NULL;
-	VideoSourceCollection* _tmp20_ = NULL;
+	gboolean _tmp1_;
+	Tag* _tmp12_;
+	Tag* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	GeeCollection* _tmp16_;
+	GeeCollection* _tmp17_;
+	gboolean _tmp18_;
+	LibraryPhotoSourceCollection* _tmp19_;
+	VideoSourceCollection* _tmp20_;
 #line 2212 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_TAG (tag), NULL);
 #line 2212 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20009,12 +19944,12 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta
 	_tmp1_ = attach;
 #line 2214 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_) {
-#line 20013 "Commands.c"
-		Tag* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gchar* _tmp6_ = NULL;
+#line 19948 "Commands.c"
+		Tag* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gint _tmp5_;
+		gchar* _tmp6_;
 #line 2214 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = tag;
 #line 2214 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20031,13 +19966,13 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta
 		_tmp0_ = _tmp6_;
 #line 2214 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp4_);
-#line 20035 "Commands.c"
+#line 19970 "Commands.c"
 	} else {
-		Tag* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gchar* _tmp11_ = NULL;
+		Tag* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		gint _tmp10_;
+		gchar* _tmp11_;
 #line 2215 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = tag;
 #line 2215 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20054,7 +19989,7 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta
 		_tmp0_ = _tmp11_;
 #line 2215 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp9_);
-#line 20058 "Commands.c"
+#line 19993 "Commands.c"
 	}
 #line 2213 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp12_ = tag;
@@ -20092,20 +20027,20 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta
 	_g_free0 (_tmp0_);
 #line 2212 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 20096 "Commands.c"
+#line 20031 "Commands.c"
 }
 
 
 TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, GeeCollection* sources, gint count, gboolean attach) {
 #line 2212 "/home/jens/Source/shotwell/src/Commands.vala"
 	return tag_untag_photos_command_construct (TYPE_TAG_UNTAG_PHOTOS_COMMAND, tag, sources, count, attach);
-#line 20103 "Commands.c"
+#line 20038 "Commands.c"
 }
 
 
 static void tag_untag_photos_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) {
 	TagUntagPhotosCommand * self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 2230 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_UNTAG_PHOTOS_COMMAND, TagUntagPhotosCommand);
 #line 2230 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20114,27 +20049,27 @@ static void tag_untag_photos_command_real_execute_on_source (SimpleProxyableComm
 	_tmp0_ = self->priv->attach;
 #line 2231 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 20118 "Commands.c"
-		DataSource* _tmp1_ = NULL;
+#line 20053 "Commands.c"
+		DataSource* _tmp1_;
 #line 2232 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = source;
 #line 2232 "/home/jens/Source/shotwell/src/Commands.vala"
 		tag_untag_photos_command_do_attach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TAG, Tag));
-#line 20124 "Commands.c"
+#line 20059 "Commands.c"
 	} else {
-		DataSource* _tmp2_ = NULL;
+		DataSource* _tmp2_;
 #line 2234 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = source;
 #line 2234 "/home/jens/Source/shotwell/src/Commands.vala"
 		tag_untag_photos_command_do_detach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_TAG, Tag));
-#line 20131 "Commands.c"
+#line 20066 "Commands.c"
 	}
 }
 
 
 static void tag_untag_photos_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) {
 	TagUntagPhotosCommand * self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 2237 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_UNTAG_PHOTOS_COMMAND, TagUntagPhotosCommand);
 #line 2237 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20143,26 +20078,26 @@ static void tag_untag_photos_command_real_undo_on_source (SimpleProxyableCommand
 	_tmp0_ = self->priv->attach;
 #line 2238 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 20147 "Commands.c"
-		DataSource* _tmp1_ = NULL;
+#line 20082 "Commands.c"
+		DataSource* _tmp1_;
 #line 2239 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = source;
 #line 2239 "/home/jens/Source/shotwell/src/Commands.vala"
 		tag_untag_photos_command_do_detach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TAG, Tag));
-#line 20153 "Commands.c"
+#line 20088 "Commands.c"
 	} else {
-		DataSource* _tmp2_ = NULL;
+		DataSource* _tmp2_;
 #line 2241 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = source;
 #line 2241 "/home/jens/Source/shotwell/src/Commands.vala"
 		tag_untag_photos_command_do_attach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_TAG, Tag));
-#line 20160 "Commands.c"
+#line 20095 "Commands.c"
 	}
 }
 
 
 static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag* tag) {
-	GeeMultiMap* _tmp0_ = NULL;
+	GeeMultiMap* _tmp0_;
 #line 2244 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_TAG_UNTAG_PHOTOS_COMMAND (self));
 #line 2244 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20171,13 +20106,13 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 	_tmp0_ = self->priv->detached_from;
 #line 2246 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ == NULL) {
-#line 20175 "Commands.c"
-		Tag* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeArrayList* _tmp3_ = NULL;
+#line 20110 "Commands.c"
+		Tag* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeArrayList* _tmp3_;
 		Tag* curr_tmp = NULL;
-		Tag* _tmp4_ = NULL;
-		Tag* _tmp5_ = NULL;
+		Tag* _tmp4_;
+		Tag* _tmp5_;
 #line 2247 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = tag;
 #line 2247 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20198,19 +20133,19 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 		curr_tmp = _tmp5_;
 #line 2253 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 20202 "Commands.c"
-			Tag* _tmp6_ = NULL;
-			GeeList* _tmp7_ = NULL;
-			Tag* _tmp8_ = NULL;
-			Tag* _tmp9_ = NULL;
-			Tag* _tmp10_ = NULL;
+#line 20137 "Commands.c"
+			Tag* _tmp6_;
+			GeeList* _tmp7_;
+			Tag* _tmp8_;
+			Tag* _tmp9_;
+			Tag* _tmp10_;
 #line 2253 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp6_ = curr_tmp;
 #line 2253 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (!(_tmp6_ != NULL)) {
 #line 2253 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 20214 "Commands.c"
+#line 20149 "Commands.c"
 			}
 #line 2254 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp7_ = self->priv->attached_to;
@@ -20226,21 +20161,21 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 			_g_object_unref0 (curr_tmp);
 #line 2255 "/home/jens/Source/shotwell/src/Commands.vala"
 			curr_tmp = _tmp10_;
-#line 20230 "Commands.c"
+#line 20165 "Commands.c"
 		}
 #line 2258 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (curr_tmp);
 #line 2258 "/home/jens/Source/shotwell/src/Commands.vala"
 		return;
-#line 20236 "Commands.c"
+#line 20171 "Commands.c"
 	}
 	{
 		GeeIterator* _detached_tag_it = NULL;
-		GeeMultiMap* _tmp11_ = NULL;
-		GeeMultiSet* _tmp12_ = NULL;
-		GeeMultiSet* _tmp13_ = NULL;
-		GeeIterator* _tmp14_ = NULL;
-		GeeIterator* _tmp15_ = NULL;
+		GeeMultiMap* _tmp11_;
+		GeeMultiSet* _tmp12_;
+		GeeMultiSet* _tmp13_;
+		GeeIterator* _tmp14_;
+		GeeIterator* _tmp15_;
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp11_ = self->priv->detached_from;
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20257,17 +20192,17 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 		_detached_tag_it = _tmp15_;
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 20261 "Commands.c"
-			GeeIterator* _tmp16_ = NULL;
-			gboolean _tmp17_ = FALSE;
+#line 20196 "Commands.c"
+			GeeIterator* _tmp16_;
+			gboolean _tmp17_;
 			Tag* detached_tag = NULL;
-			GeeIterator* _tmp18_ = NULL;
-			gpointer _tmp19_ = NULL;
-			Tag* _tmp20_ = NULL;
-			GeeMultiMap* _tmp21_ = NULL;
-			Tag* _tmp22_ = NULL;
-			GeeCollection* _tmp23_ = NULL;
-			GeeCollection* _tmp24_ = NULL;
+			GeeIterator* _tmp18_;
+			gpointer _tmp19_;
+			Tag* _tmp20_;
+			GeeMultiMap* _tmp21_;
+			Tag* _tmp22_;
+			GeeCollection* _tmp23_;
+			GeeCollection* _tmp24_;
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp16_ = _detached_tag_it;
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20276,7 +20211,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 			if (!_tmp17_) {
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 20280 "Commands.c"
+#line 20215 "Commands.c"
 			}
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp18_ = _detached_tag_it;
@@ -20300,11 +20235,11 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 			_g_object_unref0 (_tmp24_);
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (detached_tag);
-#line 20304 "Commands.c"
+#line 20239 "Commands.c"
 		}
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_detached_tag_it);
-#line 20308 "Commands.c"
+#line 20243 "Commands.c"
 	}
 #line 2265 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->detached_from);
@@ -20312,12 +20247,12 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 	self->priv->detached_from = NULL;
 #line 2266 "/home/jens/Source/shotwell/src/Commands.vala"
 	simple_proxyable_command_clear_added_proxies (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommand));
-#line 20316 "Commands.c"
+#line 20251 "Commands.c"
 }
 
 
 static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag* tag) {
-	GeeList* _tmp0_ = NULL;
+	GeeList* _tmp0_;
 #line 2269 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_TAG_UNTAG_PHOTOS_COMMAND (self));
 #line 2269 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20326,13 +20261,13 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 	_tmp0_ = self->priv->attached_to;
 #line 2270 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ == NULL) {
-#line 20330 "Commands.c"
-		Tag* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeMultiMap* _tmp3_ = NULL;
-		GeeMultiMap* _tmp4_ = NULL;
-		GeeSet* _tmp5_ = NULL;
-		GeeSet* _tmp6_ = NULL;
+#line 20265 "Commands.c"
+		Tag* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeMultiMap* _tmp3_;
+		GeeMultiMap* _tmp4_;
+		GeeSet* _tmp5_;
+		GeeSet* _tmp6_;
 #line 2274 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = tag;
 #line 2274 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20353,16 +20288,16 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 		simple_proxyable_command_add_proxyables (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommand), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 2278 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp6_);
-#line 20357 "Commands.c"
+#line 20292 "Commands.c"
 	} else {
 		{
 			GeeList* _t_list = NULL;
-			GeeList* _tmp7_ = NULL;
-			GeeList* _tmp8_ = NULL;
+			GeeList* _tmp7_;
+			GeeList* _tmp8_;
 			gint _t_size = 0;
-			GeeList* _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
+			GeeList* _tmp9_;
+			gint _tmp10_;
+			gint _tmp11_;
 			gint _t_index = 0;
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp7_ = self->priv->attached_to;
@@ -20382,14 +20317,14 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 			_t_index = -1;
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 20386 "Commands.c"
-				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
-				gint _tmp14_ = 0;
+#line 20321 "Commands.c"
+				gint _tmp12_;
+				gint _tmp13_;
+				gint _tmp14_;
 				Tag* t = NULL;
-				GeeList* _tmp15_ = NULL;
-				gint _tmp16_ = 0;
-				gpointer _tmp17_ = NULL;
+				GeeList* _tmp15_;
+				gint _tmp16_;
+				gpointer _tmp17_;
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp12_ = _t_index;
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20402,7 +20337,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 				if (!(_tmp13_ < _tmp14_)) {
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 20406 "Commands.c"
+#line 20341 "Commands.c"
 				}
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp15_ = _t_list;
@@ -20412,11 +20347,11 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 				_tmp17_ = gee_list_get (_tmp15_, _tmp16_);
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 				t = (Tag*) _tmp17_;
-#line 20416 "Commands.c"
+#line 20351 "Commands.c"
 				{
 					GeeIterator* _ms_it = NULL;
-					GeeCollection* _tmp18_ = NULL;
-					GeeIterator* _tmp19_ = NULL;
+					GeeCollection* _tmp18_;
+					GeeIterator* _tmp19_;
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp18_ = self->priv->sources;
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20425,15 +20360,15 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 					_ms_it = _tmp19_;
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
 					while (TRUE) {
-#line 20429 "Commands.c"
-						GeeIterator* _tmp20_ = NULL;
-						gboolean _tmp21_ = FALSE;
+#line 20364 "Commands.c"
+						GeeIterator* _tmp20_;
+						gboolean _tmp21_;
 						MediaSource* ms = NULL;
-						GeeIterator* _tmp22_ = NULL;
-						gpointer _tmp23_ = NULL;
-						Tag* _tmp24_ = NULL;
-						MediaSource* _tmp25_ = NULL;
-						gint _tmp26_ = 0;
+						GeeIterator* _tmp22_;
+						gpointer _tmp23_;
+						Tag* _tmp24_;
+						MediaSource* _tmp25_;
+						gint _tmp26_;
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp20_ = _ms_it;
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20442,7 +20377,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 						if (!_tmp21_) {
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
 							break;
-#line 20446 "Commands.c"
+#line 20381 "Commands.c"
 						}
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp22_ = _ms_it;
@@ -20458,11 +20393,11 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 						_tmp26_ = tag_get_attachment_count (_tmp24_, _tmp25_);
 #line 2283 "/home/jens/Source/shotwell/src/Commands.vala"
 						if (_tmp26_ < 2) {
-#line 20462 "Commands.c"
-							Tag* _tmp27_ = NULL;
-							MediaSource* _tmp28_ = NULL;
-							GeeList* _tmp29_ = NULL;
-							GeeList* _tmp30_ = NULL;
+#line 20397 "Commands.c"
+							Tag* _tmp27_;
+							MediaSource* _tmp28_;
+							GeeList* _tmp29_;
+							GeeList* _tmp30_;
 #line 2285 "/home/jens/Source/shotwell/src/Commands.vala"
 							_tmp27_ = t;
 #line 2285 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20473,35 +20408,35 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 							_tmp30_ = _tmp29_;
 #line 2285 "/home/jens/Source/shotwell/src/Commands.vala"
 							_g_object_unref0 (_tmp30_);
-#line 20477 "Commands.c"
+#line 20412 "Commands.c"
 						}
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (ms);
-#line 20481 "Commands.c"
+#line 20416 "Commands.c"
 					}
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_ms_it);
-#line 20485 "Commands.c"
+#line 20420 "Commands.c"
 				}
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (t);
-#line 20489 "Commands.c"
+#line 20424 "Commands.c"
 			}
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_t_list);
-#line 20493 "Commands.c"
+#line 20428 "Commands.c"
 		}
 	}
 }
 
 
 static void tag_untag_photos_command_on_source_destroyed (TagUntagPhotosCommand* self, DataSource* source) {
-	DataSource* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	DataSource* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	DataSource* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	GeeCollection* _tmp3_;
+	DataSource* _tmp4_;
+	gboolean _tmp5_;
 #line 2292 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_TAG_UNTAG_PHOTOS_COMMAND (self));
 #line 2292 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20524,9 +20459,9 @@ static void tag_untag_photos_command_on_source_destroyed (TagUntagPhotosCommand*
 	_tmp5_ = gee_collection_contains (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 2294 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp5_) {
-#line 20528 "Commands.c"
-		CommandManager* _tmp6_ = NULL;
-		CommandManager* _tmp7_ = NULL;
+#line 20463 "Commands.c"
+		CommandManager* _tmp6_;
+		CommandManager* _tmp7_;
 #line 2295 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp6_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command));
 #line 2295 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20535,7 +20470,7 @@ static void tag_untag_photos_command_on_source_destroyed (TagUntagPhotosCommand*
 		command_manager_reset (_tmp7_);
 #line 2295 "/home/jens/Source/shotwell/src/Commands.vala"
 		_command_manager_unref0 (_tmp7_);
-#line 20539 "Commands.c"
+#line 20474 "Commands.c"
 	}
 }
 
@@ -20546,12 +20481,12 @@ static void tag_untag_photos_command_class_init (TagUntagPhotosCommandClass * kl
 #line 2206 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (TagUntagPhotosCommandPrivate));
 #line 2206 "/home/jens/Source/shotwell/src/Commands.vala"
-	((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) tag_untag_photos_command_real_execute_on_source;
+	((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) tag_untag_photos_command_real_execute_on_source;
 #line 2206 "/home/jens/Source/shotwell/src/Commands.vala"
-	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) tag_untag_photos_command_real_undo_on_source;
+	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) tag_untag_photos_command_real_undo_on_source;
 #line 2206 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = tag_untag_photos_command_finalize;
-#line 20555 "Commands.c"
+#line 20490 "Commands.c"
 }
 
 
@@ -20562,16 +20497,16 @@ static void tag_untag_photos_command_instance_init (TagUntagPhotosCommand * self
 	self->priv->detached_from = NULL;
 #line 2210 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->attached_to = NULL;
-#line 20566 "Commands.c"
+#line 20501 "Commands.c"
 }
 
 
-static void tag_untag_photos_command_finalize (GObject* obj) {
+static void tag_untag_photos_command_finalize (GObject * obj) {
 	TagUntagPhotosCommand * self;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	VideoSourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	LibraryPhotoSourceCollection* _tmp0_;
+	guint _tmp1_;
+	VideoSourceCollection* _tmp2_;
+	guint _tmp3_;
 #line 2206 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TAG_UNTAG_PHOTOS_COMMAND, TagUntagPhotosCommand);
 #line 2226 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20594,7 +20529,7 @@ static void tag_untag_photos_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->attached_to);
 #line 2206 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (tag_untag_photos_command_parent_class)->finalize (obj);
-#line 20598 "Commands.c"
+#line 20533 "Commands.c"
 }
 
 
@@ -20612,22 +20547,22 @@ GType tag_untag_photos_command_get_type (void) {
 
 RenameSavedSearchCommand* rename_saved_search_command_construct (GType object_type, SavedSearch* search, const gchar* new_name) {
 	RenameSavedSearchCommand * self = NULL;
-	SavedSearch* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	SavedSearch* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	SavedSearch* _tmp10_ = NULL;
-	SavedSearch* _tmp11_ = NULL;
-	SavedSearch* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
+	SavedSearch* _tmp0_;
+	SavedSearch* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	SavedSearch* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	SavedSearch* _tmp10_;
+	SavedSearch* _tmp11_;
+	SavedSearch* _tmp12_;
+	gchar* _tmp13_;
+	const gchar* _tmp14_;
+	gchar* _tmp15_;
 #line 2304 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
 #line 2304 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20686,22 +20621,22 @@ RenameSavedSearchCommand* rename_saved_search_command_construct (GType object_ty
 	self->priv->new_name = _tmp15_;
 #line 2304 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 20690 "Commands.c"
+#line 20625 "Commands.c"
 }
 
 
 RenameSavedSearchCommand* rename_saved_search_command_new (SavedSearch* search, const gchar* new_name) {
 #line 2304 "/home/jens/Source/shotwell/src/Commands.vala"
 	return rename_saved_search_command_construct (TYPE_RENAME_SAVED_SEARCH_COMMAND, search, new_name);
-#line 20697 "Commands.c"
+#line 20632 "Commands.c"
 }
 
 
 static void rename_saved_search_command_real_execute (Command* base) {
 	RenameSavedSearchCommand * self;
-	SavedSearch* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	SavedSearch* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 2312 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommand);
 #line 2313 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20712,10 +20647,10 @@ static void rename_saved_search_command_real_execute (Command* base) {
 	_tmp2_ = saved_search_rename (_tmp0_, _tmp1_);
 #line 2313 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (!_tmp2_) {
-#line 20716 "Commands.c"
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+#line 20651 "Commands.c"
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 2314 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->new_name;
 #line 2314 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20726,16 +20661,16 @@ static void rename_saved_search_command_real_execute (Command* base) {
 		app_window_error_message (_tmp5_, NULL);
 #line 2314 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp5_);
-#line 20730 "Commands.c"
+#line 20665 "Commands.c"
 	}
 }
 
 
 static void rename_saved_search_command_real_undo (Command* base) {
 	RenameSavedSearchCommand * self;
-	SavedSearch* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	SavedSearch* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 2317 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommand);
 #line 2318 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20746,10 +20681,10 @@ static void rename_saved_search_command_real_undo (Command* base) {
 	_tmp2_ = saved_search_rename (_tmp0_, _tmp1_);
 #line 2318 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (!_tmp2_) {
-#line 20750 "Commands.c"
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+#line 20685 "Commands.c"
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 2319 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->old_name;
 #line 2319 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20760,7 +20695,7 @@ static void rename_saved_search_command_real_undo (Command* base) {
 		app_window_error_message (_tmp5_, NULL);
 #line 2319 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp5_);
-#line 20764 "Commands.c"
+#line 20699 "Commands.c"
 	}
 }
 
@@ -20771,23 +20706,23 @@ static void rename_saved_search_command_class_init (RenameSavedSearchCommandClas
 #line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (RenameSavedSearchCommandPrivate));
 #line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) rename_saved_search_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) rename_saved_search_command_real_execute;
 #line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) rename_saved_search_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) rename_saved_search_command_real_undo;
 #line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = rename_saved_search_command_finalize;
-#line 20780 "Commands.c"
+#line 20715 "Commands.c"
 }
 
 
 static void rename_saved_search_command_instance_init (RenameSavedSearchCommand * self) {
 #line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = RENAME_SAVED_SEARCH_COMMAND_GET_PRIVATE (self);
-#line 20787 "Commands.c"
+#line 20722 "Commands.c"
 }
 
 
-static void rename_saved_search_command_finalize (GObject* obj) {
+static void rename_saved_search_command_finalize (GObject * obj) {
 	RenameSavedSearchCommand * self;
 #line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommand);
@@ -20799,7 +20734,7 @@ static void rename_saved_search_command_finalize (GObject* obj) {
 	_g_free0 (self->priv->new_name);
 #line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (rename_saved_search_command_parent_class)->finalize (obj);
-#line 20803 "Commands.c"
+#line 20738 "Commands.c"
 }
 
 
@@ -20817,17 +20752,17 @@ GType rename_saved_search_command_get_type (void) {
 
 DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type, SavedSearch* search) {
 	DeleteSavedSearchCommand * self = NULL;
-	SavedSearch* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	SavedSearch* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	SavedSearch* _tmp9_ = NULL;
-	SavedSearch* _tmp10_ = NULL;
+	SavedSearch* _tmp0_;
+	SavedSearch* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	SavedSearch* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	SavedSearch* _tmp9_;
+	SavedSearch* _tmp10_;
 #line 2326 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
 #line 2327 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20866,22 +20801,22 @@ DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_ty
 	self->priv->search = _tmp10_;
 #line 2326 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 20870 "Commands.c"
+#line 20805 "Commands.c"
 }
 
 
 DeleteSavedSearchCommand* delete_saved_search_command_new (SavedSearch* search) {
 #line 2326 "/home/jens/Source/shotwell/src/Commands.vala"
 	return delete_saved_search_command_construct (TYPE_DELETE_SAVED_SEARCH_COMMAND, search);
-#line 20877 "Commands.c"
+#line 20812 "Commands.c"
 }
 
 
 static void delete_saved_search_command_real_execute (Command* base) {
 	DeleteSavedSearchCommand * self;
-	SavedSearchTable* _tmp0_ = NULL;
-	SavedSearchTable* _tmp1_ = NULL;
-	SavedSearch* _tmp2_ = NULL;
+	SavedSearchTable* _tmp0_;
+	SavedSearchTable* _tmp1_;
+	SavedSearch* _tmp2_;
 #line 2332 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DELETE_SAVED_SEARCH_COMMAND, DeleteSavedSearchCommand);
 #line 2333 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20894,20 +20829,20 @@ static void delete_saved_search_command_real_execute (Command* base) {
 	saved_search_table_remove (_tmp1_, _tmp2_);
 #line 2333 "/home/jens/Source/shotwell/src/Commands.vala"
 	_saved_search_table_unref0 (_tmp1_);
-#line 20898 "Commands.c"
+#line 20833 "Commands.c"
 }
 
 
 static void delete_saved_search_command_real_undo (Command* base) {
 	DeleteSavedSearchCommand * self;
-	SavedSearch* _tmp0_ = NULL;
+	SavedSearch* _tmp0_;
 #line 2336 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DELETE_SAVED_SEARCH_COMMAND, DeleteSavedSearchCommand);
 #line 2337 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = self->priv->search;
 #line 2337 "/home/jens/Source/shotwell/src/Commands.vala"
 	saved_search_reconstitute (_tmp0_);
-#line 20911 "Commands.c"
+#line 20846 "Commands.c"
 }
 
 
@@ -20917,23 +20852,23 @@ static void delete_saved_search_command_class_init (DeleteSavedSearchCommandClas
 #line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (DeleteSavedSearchCommandPrivate));
 #line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) delete_saved_search_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) delete_saved_search_command_real_execute;
 #line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) delete_saved_search_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) delete_saved_search_command_real_undo;
 #line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = delete_saved_search_command_finalize;
-#line 20926 "Commands.c"
+#line 20861 "Commands.c"
 }
 
 
 static void delete_saved_search_command_instance_init (DeleteSavedSearchCommand * self) {
 #line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = DELETE_SAVED_SEARCH_COMMAND_GET_PRIVATE (self);
-#line 20933 "Commands.c"
+#line 20868 "Commands.c"
 }
 
 
-static void delete_saved_search_command_finalize (GObject* obj) {
+static void delete_saved_search_command_finalize (GObject * obj) {
 	DeleteSavedSearchCommand * self;
 #line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DELETE_SAVED_SEARCH_COMMAND, DeleteSavedSearchCommand);
@@ -20941,7 +20876,7 @@ static void delete_saved_search_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->search);
 #line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (delete_saved_search_command_parent_class)->finalize (obj);
-#line 20945 "Commands.c"
+#line 20880 "Commands.c"
 }
 
 
@@ -20960,113 +20895,99 @@ GType delete_saved_search_command_get_type (void) {
 static void _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 2358 "/home/jens/Source/shotwell/src/Commands.vala"
 	trash_untrash_photos_command_on_photo_destroyed ((TrashUntrashPhotosCommand*) self, source);
-#line 20964 "Commands.c"
+#line 20899 "Commands.c"
 }
 
 
 TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, GeeCollection* sources, gboolean to_trash) {
 	TrashUntrashPhotosCommand * self = NULL;
 	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	GeeCollection* _tmp8_ = NULL;
-	GeeCollection* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	LibraryPhotoSourceCollection* _tmp11_ = NULL;
-	VideoSourceCollection* _tmp12_ = NULL;
+	gboolean _tmp1_;
+	const gchar* _tmp2_ = NULL;
+	gboolean _tmp3_;
+	GeeCollection* _tmp4_;
+	GeeCollection* _tmp5_;
+	gboolean _tmp6_;
+	LibraryPhotoSourceCollection* _tmp7_;
+	VideoSourceCollection* _tmp8_;
 #line 2345 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (sources), NULL);
 #line 2347 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp1_ = to_trash;
 #line 2347 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_) {
-#line 20985 "Commands.c"
-		const gchar* _tmp2_ = NULL;
 #line 2347 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp2_ = _ ("Move Photos to Trash");
-#line 2347 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp0_ = _tmp2_;
-#line 20991 "Commands.c"
+		_tmp0_ = _ ("Move Photos to Trash");
+#line 20922 "Commands.c"
 	} else {
-		const gchar* _tmp3_ = NULL;
-#line 2347 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp3_ = _ ("Restore Photos from Trash");
 #line 2347 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp0_ = _tmp3_;
-#line 20998 "Commands.c"
+		_tmp0_ = _ ("Restore Photos from Trash");
+#line 20926 "Commands.c"
 	}
 #line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp5_ = to_trash;
+	_tmp3_ = to_trash;
 #line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
-	if (_tmp5_) {
-#line 21004 "Commands.c"
-		const gchar* _tmp6_ = NULL;
-#line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp6_ = _ ("Move the photos to the Shotwell trash");
+	if (_tmp3_) {
 #line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp4_ = _tmp6_;
-#line 21010 "Commands.c"
+		_tmp2_ = _ ("Move the photos to the Shotwell trash");
+#line 20934 "Commands.c"
 	} else {
-		const gchar* _tmp7_ = NULL;
-#line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp7_ = _ ("Restore the photos back to the Shotwell library");
 #line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp4_ = _tmp7_;
-#line 21017 "Commands.c"
+		_tmp2_ = _ ("Restore the photos back to the Shotwell library");
+#line 20938 "Commands.c"
 	}
 #line 2346 "/home/jens/Source/shotwell/src/Commands.vala"
-	self = (TrashUntrashPhotosCommand*) page_command_construct (object_type, _tmp0_, _tmp4_);
+	self = (TrashUntrashPhotosCommand*) page_command_construct (object_type, _tmp0_, _tmp2_);
 #line 2350 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp8_ = sources;
+	_tmp4_ = sources;
 #line 2350 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp9_ = _g_object_ref0 (_tmp8_);
+	_tmp5_ = _g_object_ref0 (_tmp4_);
 #line 2350 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->sources);
 #line 2350 "/home/jens/Source/shotwell/src/Commands.vala"
-	self->priv->sources = _tmp9_;
+	self->priv->sources = _tmp5_;
 #line 2351 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp10_ = to_trash;
+	_tmp6_ = to_trash;
 #line 2351 "/home/jens/Source/shotwell/src/Commands.vala"
-	self->priv->to_trash = _tmp10_;
+	self->priv->to_trash = _tmp6_;
 #line 2353 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp11_ = library_photo_global;
+	_tmp7_ = library_photo_global;
 #line 2353 "/home/jens/Source/shotwell/src/Commands.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
 #line 2354 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp12_ = video_global;
+	_tmp8_ = video_global;
 #line 2354 "/home/jens/Source/shotwell/src/Commands.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
 #line 2345 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 21043 "Commands.c"
+#line 20964 "Commands.c"
 }
 
 
 TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, gboolean to_trash) {
 #line 2345 "/home/jens/Source/shotwell/src/Commands.vala"
 	return trash_untrash_photos_command_construct (TYPE_TRASH_UNTRASH_PHOTOS_COMMAND, sources, to_trash);
-#line 21050 "Commands.c"
+#line 20971 "Commands.c"
 }
 
 
 static ProgressDialog* trash_untrash_photos_command_get_progress_dialog (TrashUntrashPhotosCommand* self, gboolean to_trash) {
 	ProgressDialog* result = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	const gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp4_;
 	ProgressDialog* dialog = NULL;
-	AppWindow* _tmp7_ = NULL;
-	AppWindow* _tmp8_ = NULL;
-	ProgressDialog* _tmp9_ = NULL;
-	ProgressDialog* _tmp10_ = NULL;
-	ProgressDialog* _tmp11_ = NULL;
-	GeeCollection* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
+	AppWindow* _tmp5_;
+	AppWindow* _tmp6_;
+	ProgressDialog* _tmp7_;
+	ProgressDialog* _tmp8_;
+	ProgressDialog* _tmp9_;
+	GeeCollection* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
 #line 2362 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (IS_TRASH_UNTRASH_PHOTOS_COMMAND (self), NULL);
 #line 2363 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21081,58 +21002,51 @@ static ProgressDialog* trash_untrash_photos_command_get_progress_dialog (TrashUn
 		result = NULL;
 #line 2364 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 21085 "Commands.c"
+#line 21006 "Commands.c"
 	}
 #line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = to_trash;
 #line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp4_) {
-#line 21091 "Commands.c"
-		const gchar* _tmp5_ = NULL;
 #line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp5_ = _ ("Moving Photos to Trash");
-#line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp3_ = _tmp5_;
-#line 21097 "Commands.c"
+		_tmp3_ = _ ("Moving Photos to Trash");
+#line 21014 "Commands.c"
 	} else {
-		const gchar* _tmp6_ = NULL;
-#line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp6_ = _ ("Restoring Photos From Trash");
 #line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp3_ = _tmp6_;
-#line 21104 "Commands.c"
+		_tmp3_ = _ ("Restoring Photos From Trash");
+#line 21018 "Commands.c"
 	}
 #line 2366 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp7_ = app_window_get_instance ();
+	_tmp5_ = app_window_get_instance ();
 #line 2366 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp8_ = _tmp7_;
+	_tmp6_ = _tmp5_;
 #line 2366 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp9_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), _tmp3_, NULL);
+	_tmp7_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp3_, NULL);
 #line 2366 "/home/jens/Source/shotwell/src/Commands.vala"
-	g_object_ref_sink (_tmp9_);
+	g_object_ref_sink (_tmp7_);
 #line 2366 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp10_ = _tmp9_;
+	_tmp8_ = _tmp7_;
 #line 2366 "/home/jens/Source/shotwell/src/Commands.vala"
-	_g_object_unref0 (_tmp8_);
+	_g_object_unref0 (_tmp6_);
 #line 2366 "/home/jens/Source/shotwell/src/Commands.vala"
-	dialog = _tmp10_;
+	dialog = _tmp8_;
 #line 2368 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp11_ = dialog;
+	_tmp9_ = dialog;
 #line 2368 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp12_ = self->priv->sources;
+	_tmp10_ = self->priv->sources;
 #line 2368 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp13_ = gee_collection_get_size (_tmp12_);
+	_tmp11_ = gee_collection_get_size (_tmp10_);
 #line 2368 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp14_ = _tmp13_;
+	_tmp12_ = _tmp11_;
 #line 2368 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp15_ = CLAMP (_tmp14_ / 5, 2, 10);
+	_tmp13_ = CLAMP (_tmp12_ / 5, 2, 10);
 #line 2368 "/home/jens/Source/shotwell/src/Commands.vala"
-	progress_dialog_update_display_every (_tmp11_, _tmp15_);
+	progress_dialog_update_display_every (_tmp9_, _tmp13_);
 #line 2370 "/home/jens/Source/shotwell/src/Commands.vala"
 	result = dialog;
 #line 2370 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 21136 "Commands.c"
+#line 21050 "Commands.c"
 }
 
 
@@ -21141,21 +21055,21 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin
 	result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
 #line 2378 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 21145 "Commands.c"
+#line 21059 "Commands.c"
 }
 
 
 static void trash_untrash_photos_command_real_execute (Command* base) {
 	TrashUntrashPhotosCommand * self;
 	ProgressDialog* dialog = NULL;
-	gboolean _tmp0_ = FALSE;
-	ProgressDialog* _tmp1_ = NULL;
+	gboolean _tmp0_;
+	ProgressDialog* _tmp1_;
 	ProgressMonitor monitor = NULL;
-	void* monitor_target = NULL;
-	GDestroyNotify monitor_target_destroy_notify = NULL;
-	ProgressDialog* _tmp2_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	ProgressDialog* _tmp7_ = NULL;
+	void* monitor_target;
+	GDestroyNotify monitor_target_destroy_notify;
+	ProgressDialog* _tmp2_;
+	gboolean _tmp4_;
+	ProgressDialog* _tmp7_;
 #line 2373 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_UNTRASH_PHOTOS_COMMAND, TrashUntrashPhotosCommand);
 #line 2374 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21174,8 +21088,8 @@ static void trash_untrash_photos_command_real_execute (Command* base) {
 	_tmp2_ = dialog;
 #line 2377 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ != NULL) {
-#line 21178 "Commands.c"
-		ProgressDialog* _tmp3_ = NULL;
+#line 21092 "Commands.c"
+		ProgressDialog* _tmp3_;
 #line 2378 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = dialog;
 #line 2378 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21192,44 +21106,44 @@ static void trash_untrash_photos_command_real_execute (Command* base) {
 		monitor_target = g_object_ref (_tmp3_);
 #line 2378 "/home/jens/Source/shotwell/src/Commands.vala"
 		monitor_target_destroy_notify = g_object_unref;
-#line 21196 "Commands.c"
+#line 21110 "Commands.c"
 	}
 #line 2380 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = self->priv->to_trash;
 #line 2380 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp4_) {
-#line 21202 "Commands.c"
-		ProgressMonitor _tmp5_ = NULL;
-		void* _tmp5__target = NULL;
+#line 21116 "Commands.c"
+		ProgressMonitor _tmp5_;
+		void* _tmp5__target;
 #line 2381 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = monitor;
 #line 2381 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5__target = monitor_target;
 #line 2381 "/home/jens/Source/shotwell/src/Commands.vala"
 		trash_untrash_photos_command_trash (self, _tmp5_, _tmp5__target);
-#line 21211 "Commands.c"
+#line 21125 "Commands.c"
 	} else {
-		ProgressMonitor _tmp6_ = NULL;
-		void* _tmp6__target = NULL;
+		ProgressMonitor _tmp6_;
+		void* _tmp6__target;
 #line 2383 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp6_ = monitor;
 #line 2383 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp6__target = monitor_target;
 #line 2383 "/home/jens/Source/shotwell/src/Commands.vala"
 		trash_untrash_photos_command_untrash (self, _tmp6_, _tmp6__target);
-#line 21221 "Commands.c"
+#line 21135 "Commands.c"
 	}
 #line 2385 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp7_ = dialog;
 #line 2385 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp7_ != NULL) {
-#line 21227 "Commands.c"
-		ProgressDialog* _tmp8_ = NULL;
+#line 21141 "Commands.c"
+		ProgressDialog* _tmp8_;
 #line 2386 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp8_ = dialog;
 #line 2386 "/home/jens/Source/shotwell/src/Commands.vala"
 		progress_dialog_close (_tmp8_);
-#line 21233 "Commands.c"
+#line 21147 "Commands.c"
 	}
 #line 2373 "/home/jens/Source/shotwell/src/Commands.vala"
 	(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
@@ -21241,21 +21155,21 @@ static void trash_untrash_photos_command_real_execute (Command* base) {
 	monitor_target_destroy_notify = NULL;
 #line 2373 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (dialog);
-#line 21245 "Commands.c"
+#line 21159 "Commands.c"
 }
 
 
 static void trash_untrash_photos_command_real_undo (Command* base) {
 	TrashUntrashPhotosCommand * self;
 	ProgressDialog* dialog = NULL;
-	gboolean _tmp0_ = FALSE;
-	ProgressDialog* _tmp1_ = NULL;
+	gboolean _tmp0_;
+	ProgressDialog* _tmp1_;
 	ProgressMonitor monitor = NULL;
-	void* monitor_target = NULL;
-	GDestroyNotify monitor_target_destroy_notify = NULL;
-	ProgressDialog* _tmp2_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	ProgressDialog* _tmp7_ = NULL;
+	void* monitor_target;
+	GDestroyNotify monitor_target_destroy_notify;
+	ProgressDialog* _tmp2_;
+	gboolean _tmp4_;
+	ProgressDialog* _tmp7_;
 #line 2389 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_UNTRASH_PHOTOS_COMMAND, TrashUntrashPhotosCommand);
 #line 2390 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21274,8 +21188,8 @@ static void trash_untrash_photos_command_real_undo (Command* base) {
 	_tmp2_ = dialog;
 #line 2393 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ != NULL) {
-#line 21278 "Commands.c"
-		ProgressDialog* _tmp3_ = NULL;
+#line 21192 "Commands.c"
+		ProgressDialog* _tmp3_;
 #line 2394 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = dialog;
 #line 2394 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21292,44 +21206,44 @@ static void trash_untrash_photos_command_real_undo (Command* base) {
 		monitor_target = g_object_ref (_tmp3_);
 #line 2394 "/home/jens/Source/shotwell/src/Commands.vala"
 		monitor_target_destroy_notify = g_object_unref;
-#line 21296 "Commands.c"
+#line 21210 "Commands.c"
 	}
 #line 2396 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = self->priv->to_trash;
 #line 2396 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp4_) {
-#line 21302 "Commands.c"
-		ProgressMonitor _tmp5_ = NULL;
-		void* _tmp5__target = NULL;
+#line 21216 "Commands.c"
+		ProgressMonitor _tmp5_;
+		void* _tmp5__target;
 #line 2397 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = monitor;
 #line 2397 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5__target = monitor_target;
 #line 2397 "/home/jens/Source/shotwell/src/Commands.vala"
 		trash_untrash_photos_command_untrash (self, _tmp5_, _tmp5__target);
-#line 21311 "Commands.c"
+#line 21225 "Commands.c"
 	} else {
-		ProgressMonitor _tmp6_ = NULL;
-		void* _tmp6__target = NULL;
+		ProgressMonitor _tmp6_;
+		void* _tmp6__target;
 #line 2399 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp6_ = monitor;
 #line 2399 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp6__target = monitor_target;
 #line 2399 "/home/jens/Source/shotwell/src/Commands.vala"
 		trash_untrash_photos_command_trash (self, _tmp6_, _tmp6__target);
-#line 21321 "Commands.c"
+#line 21235 "Commands.c"
 	}
 #line 2401 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp7_ = dialog;
 #line 2401 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp7_ != NULL) {
-#line 21327 "Commands.c"
-		ProgressDialog* _tmp8_ = NULL;
+#line 21241 "Commands.c"
+		ProgressDialog* _tmp8_;
 #line 2402 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp8_ = dialog;
 #line 2402 "/home/jens/Source/shotwell/src/Commands.vala"
 		progress_dialog_close (_tmp8_);
-#line 21333 "Commands.c"
+#line 21247 "Commands.c"
 	}
 #line 2389 "/home/jens/Source/shotwell/src/Commands.vala"
 	(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
@@ -21341,28 +21255,28 @@ static void trash_untrash_photos_command_real_undo (Command* base) {
 	monitor_target_destroy_notify = NULL;
 #line 2389 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (dialog);
-#line 21345 "Commands.c"
+#line 21259 "Commands.c"
 }
 
 
 static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self, ProgressMonitor monitor, void* monitor_target) {
 	gint ctr = 0;
 	gint count = 0;
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	LibraryPhotoSourceCollection* _tmp3_ = NULL;
-	TransactionController* _tmp4_ = NULL;
-	TransactionController* _tmp5_ = NULL;
-	VideoSourceCollection* _tmp6_ = NULL;
-	TransactionController* _tmp7_ = NULL;
-	TransactionController* _tmp8_ = NULL;
-	LibraryPhotoSourceCollection* _tmp21_ = NULL;
-	TransactionController* _tmp22_ = NULL;
-	TransactionController* _tmp23_ = NULL;
-	VideoSourceCollection* _tmp24_ = NULL;
-	TransactionController* _tmp25_ = NULL;
-	TransactionController* _tmp26_ = NULL;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	LibraryPhotoSourceCollection* _tmp3_;
+	TransactionController* _tmp4_;
+	TransactionController* _tmp5_;
+	VideoSourceCollection* _tmp6_;
+	TransactionController* _tmp7_;
+	TransactionController* _tmp8_;
+	LibraryPhotoSourceCollection* _tmp21_;
+	TransactionController* _tmp22_;
+	TransactionController* _tmp23_;
+	VideoSourceCollection* _tmp24_;
+	TransactionController* _tmp25_;
+	TransactionController* _tmp26_;
 #line 2405 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_TRASH_UNTRASH_PHOTOS_COMMAND (self));
 #line 2406 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21391,11 +21305,11 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 	_tmp8_ = _tmp7_;
 #line 2410 "/home/jens/Source/shotwell/src/Commands.vala"
 	transaction_controller_begin (_tmp8_);
-#line 21395 "Commands.c"
+#line 21309 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp9_ = NULL;
-		GeeIterator* _tmp10_ = NULL;
+		GeeCollection* _tmp9_;
+		GeeIterator* _tmp10_;
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp9_ = self->priv->sources;
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21404,15 +21318,15 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 		_source_it = _tmp10_;
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 21408 "Commands.c"
-			GeeIterator* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
+#line 21322 "Commands.c"
+			GeeIterator* _tmp11_;
+			gboolean _tmp12_;
 			MediaSource* source = NULL;
-			GeeIterator* _tmp13_ = NULL;
-			gpointer _tmp14_ = NULL;
-			MediaSource* _tmp15_ = NULL;
-			ProgressMonitor _tmp16_ = NULL;
-			void* _tmp16__target = NULL;
+			GeeIterator* _tmp13_;
+			gpointer _tmp14_;
+			MediaSource* _tmp15_;
+			ProgressMonitor _tmp16_;
+			void* _tmp16__target;
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp11_ = _source_it;
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21421,7 +21335,7 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 			if (!_tmp12_) {
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 21425 "Commands.c"
+#line 21339 "Commands.c"
 			}
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp13_ = _source_it;
@@ -21439,12 +21353,12 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 			_tmp16__target = monitor_target;
 #line 2414 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp16_ != NULL) {
-#line 21443 "Commands.c"
-				ProgressMonitor _tmp17_ = NULL;
-				void* _tmp17__target = NULL;
-				gint _tmp18_ = 0;
-				gint _tmp19_ = 0;
-				gint _tmp20_ = 0;
+#line 21357 "Commands.c"
+				ProgressMonitor _tmp17_;
+				void* _tmp17__target;
+				gint _tmp18_;
+				gint _tmp19_;
+				gint _tmp20_;
 #line 2415 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp17_ = monitor;
 #line 2415 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21459,15 +21373,15 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 				_tmp20_ = count;
 #line 2415 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp17_ ((guint64) _tmp19_, (guint64) _tmp20_, TRUE, _tmp17__target);
-#line 21463 "Commands.c"
+#line 21377 "Commands.c"
 			}
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 21467 "Commands.c"
+#line 21381 "Commands.c"
 		}
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 21471 "Commands.c"
+#line 21385 "Commands.c"
 	}
 #line 2418 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp21_ = library_photo_global;
@@ -21485,28 +21399,28 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 	_tmp26_ = _tmp25_;
 #line 2419 "/home/jens/Source/shotwell/src/Commands.vala"
 	transaction_controller_commit (_tmp26_);
-#line 21489 "Commands.c"
+#line 21403 "Commands.c"
 }
 
 
 static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* self, ProgressMonitor monitor, void* monitor_target) {
 	gint ctr = 0;
 	gint count = 0;
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	LibraryPhotoSourceCollection* _tmp3_ = NULL;
-	TransactionController* _tmp4_ = NULL;
-	TransactionController* _tmp5_ = NULL;
-	VideoSourceCollection* _tmp6_ = NULL;
-	TransactionController* _tmp7_ = NULL;
-	TransactionController* _tmp8_ = NULL;
-	LibraryPhotoSourceCollection* _tmp21_ = NULL;
-	TransactionController* _tmp22_ = NULL;
-	TransactionController* _tmp23_ = NULL;
-	VideoSourceCollection* _tmp24_ = NULL;
-	TransactionController* _tmp25_ = NULL;
-	TransactionController* _tmp26_ = NULL;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	LibraryPhotoSourceCollection* _tmp3_;
+	TransactionController* _tmp4_;
+	TransactionController* _tmp5_;
+	VideoSourceCollection* _tmp6_;
+	TransactionController* _tmp7_;
+	TransactionController* _tmp8_;
+	LibraryPhotoSourceCollection* _tmp21_;
+	TransactionController* _tmp22_;
+	TransactionController* _tmp23_;
+	VideoSourceCollection* _tmp24_;
+	TransactionController* _tmp25_;
+	TransactionController* _tmp26_;
 #line 2422 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_TRASH_UNTRASH_PHOTOS_COMMAND (self));
 #line 2423 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21535,11 +21449,11 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 	_tmp8_ = _tmp7_;
 #line 2427 "/home/jens/Source/shotwell/src/Commands.vala"
 	transaction_controller_begin (_tmp8_);
-#line 21539 "Commands.c"
+#line 21453 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp9_ = NULL;
-		GeeIterator* _tmp10_ = NULL;
+		GeeCollection* _tmp9_;
+		GeeIterator* _tmp10_;
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp9_ = self->priv->sources;
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21548,15 +21462,15 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 		_source_it = _tmp10_;
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 21552 "Commands.c"
-			GeeIterator* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
+#line 21466 "Commands.c"
+			GeeIterator* _tmp11_;
+			gboolean _tmp12_;
 			MediaSource* source = NULL;
-			GeeIterator* _tmp13_ = NULL;
-			gpointer _tmp14_ = NULL;
-			MediaSource* _tmp15_ = NULL;
-			ProgressMonitor _tmp16_ = NULL;
-			void* _tmp16__target = NULL;
+			GeeIterator* _tmp13_;
+			gpointer _tmp14_;
+			MediaSource* _tmp15_;
+			ProgressMonitor _tmp16_;
+			void* _tmp16__target;
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp11_ = _source_it;
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21565,7 +21479,7 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 			if (!_tmp12_) {
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 21569 "Commands.c"
+#line 21483 "Commands.c"
 			}
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp13_ = _source_it;
@@ -21583,12 +21497,12 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 			_tmp16__target = monitor_target;
 #line 2431 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp16_ != NULL) {
-#line 21587 "Commands.c"
-				ProgressMonitor _tmp17_ = NULL;
-				void* _tmp17__target = NULL;
-				gint _tmp18_ = 0;
-				gint _tmp19_ = 0;
-				gint _tmp20_ = 0;
+#line 21501 "Commands.c"
+				ProgressMonitor _tmp17_;
+				void* _tmp17__target;
+				gint _tmp18_;
+				gint _tmp19_;
+				gint _tmp20_;
 #line 2432 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp17_ = monitor;
 #line 2432 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21603,15 +21517,15 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 				_tmp20_ = count;
 #line 2432 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp17_ ((guint64) _tmp19_, (guint64) _tmp20_, TRUE, _tmp17__target);
-#line 21607 "Commands.c"
+#line 21521 "Commands.c"
 			}
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 21611 "Commands.c"
+#line 21525 "Commands.c"
 		}
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 21615 "Commands.c"
+#line 21529 "Commands.c"
 	}
 #line 2435 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp21_ = library_photo_global;
@@ -21629,16 +21543,16 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 	_tmp26_ = _tmp25_;
 #line 2436 "/home/jens/Source/shotwell/src/Commands.vala"
 	transaction_controller_commit (_tmp26_);
-#line 21633 "Commands.c"
+#line 21547 "Commands.c"
 }
 
 
 static void trash_untrash_photos_command_on_photo_destroyed (TrashUntrashPhotosCommand* self, DataSource* source) {
-	GeeCollection* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	GeeCollection* _tmp0_;
+	DataSource* _tmp1_;
+	GeeCollection* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 #line 2439 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_TRASH_UNTRASH_PHOTOS_COMMAND (self));
 #line 2439 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21657,9 +21571,9 @@ static void trash_untrash_photos_command_on_photo_destroyed (TrashUntrashPhotosC
 	_tmp4_ = _tmp3_;
 #line 2446 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp4_ == 0) {
-#line 21661 "Commands.c"
-		CommandManager* _tmp5_ = NULL;
-		CommandManager* _tmp6_ = NULL;
+#line 21575 "Commands.c"
+		CommandManager* _tmp5_;
+		CommandManager* _tmp6_;
 #line 2447 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command));
 #line 2447 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21668,7 +21582,7 @@ static void trash_untrash_photos_command_on_photo_destroyed (TrashUntrashPhotosC
 		command_manager_reset (_tmp6_);
 #line 2447 "/home/jens/Source/shotwell/src/Commands.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 21672 "Commands.c"
+#line 21586 "Commands.c"
 	}
 }
 
@@ -21679,28 +21593,28 @@ static void trash_untrash_photos_command_class_init (TrashUntrashPhotosCommandCl
 #line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (TrashUntrashPhotosCommandPrivate));
 #line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) trash_untrash_photos_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) trash_untrash_photos_command_real_execute;
 #line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) trash_untrash_photos_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) trash_untrash_photos_command_real_undo;
 #line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = trash_untrash_photos_command_finalize;
-#line 21688 "Commands.c"
+#line 21602 "Commands.c"
 }
 
 
 static void trash_untrash_photos_command_instance_init (TrashUntrashPhotosCommand * self) {
 #line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = TRASH_UNTRASH_PHOTOS_COMMAND_GET_PRIVATE (self);
-#line 21695 "Commands.c"
+#line 21609 "Commands.c"
 }
 
 
-static void trash_untrash_photos_command_finalize (GObject* obj) {
+static void trash_untrash_photos_command_finalize (GObject * obj) {
 	TrashUntrashPhotosCommand * self;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	VideoSourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	LibraryPhotoSourceCollection* _tmp0_;
+	guint _tmp1_;
+	VideoSourceCollection* _tmp2_;
+	guint _tmp3_;
 #line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TRASH_UNTRASH_PHOTOS_COMMAND, TrashUntrashPhotosCommand);
 #line 2358 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21719,7 +21633,7 @@ static void trash_untrash_photos_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->sources);
 #line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (trash_untrash_photos_command_parent_class)->finalize (obj);
-#line 21723 "Commands.c"
+#line 21637 "Commands.c"
 }
 
 
@@ -21738,122 +21652,115 @@ GType trash_untrash_photos_command_get_type (void) {
 FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollection* sources, gboolean flag) {
 	FlagUnflagCommand * self = NULL;
 	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	GeeCollection* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	GeeCollection* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
+	gboolean _tmp1_;
+	const gchar* _tmp2_ = NULL;
+	gboolean _tmp3_;
+	GeeCollection* _tmp4_;
+	gboolean _tmp5_;
+	GeeCollection* _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 #line 2461 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (sources), NULL);
 #line 2463 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp1_ = flag;
 #line 2463 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_) {
-#line 21756 "Commands.c"
-		const gchar* _tmp2_ = NULL;
-#line 2463 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp2_ = _ ("Flag");
 #line 2463 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp0_ = _tmp2_;
-#line 21762 "Commands.c"
+		_tmp0_ = _ ("Flag");
+#line 21672 "Commands.c"
 	} else {
-		const gchar* _tmp3_ = NULL;
-#line 2463 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp3_ = _ ("Unflag");
 #line 2463 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp0_ = _tmp3_;
-#line 21769 "Commands.c"
+		_tmp0_ = _ ("Unflag");
+#line 21676 "Commands.c"
 	}
 #line 2464 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp5_ = flag;
+	_tmp3_ = flag;
 #line 2464 "/home/jens/Source/shotwell/src/Commands.vala"
-	if (_tmp5_) {
+	if (_tmp3_) {
 #line 2464 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp4_ = FLAG_UNFLAG_COMMAND_FLAG_SELECTED_STRING;
-#line 21777 "Commands.c"
+		_tmp2_ = FLAG_UNFLAG_COMMAND_FLAG_SELECTED_STRING;
+#line 21684 "Commands.c"
 	} else {
 #line 2464 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp4_ = FLAG_UNFLAG_COMMAND_UNFLAG_SELECTED_STRING;
-#line 21781 "Commands.c"
+		_tmp2_ = FLAG_UNFLAG_COMMAND_UNFLAG_SELECTED_STRING;
+#line 21688 "Commands.c"
 	}
 #line 2462 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp6_ = sources;
+	_tmp4_ = sources;
 #line 2462 "/home/jens/Source/shotwell/src/Commands.vala"
-	self = (FlagUnflagCommand*) multiple_data_source_at_once_command_construct (object_type, _tmp6_, _tmp0_, _tmp4_);
+	self = (FlagUnflagCommand*) multiple_data_source_at_once_command_construct (object_type, _tmp4_, _tmp0_, _tmp2_);
 #line 2466 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp7_ = flag;
+	_tmp5_ = flag;
 #line 2466 "/home/jens/Source/shotwell/src/Commands.vala"
-	self->priv->flag = _tmp7_;
+	self->priv->flag = _tmp5_;
 #line 2468 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp8_ = sources;
+	_tmp6_ = sources;
 #line 2468 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp9_ = gee_collection_get_size (_tmp8_);
+	_tmp7_ = gee_collection_get_size (_tmp6_);
 #line 2468 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp10_ = _tmp9_;
+	_tmp8_ = _tmp7_;
 #line 2468 "/home/jens/Source/shotwell/src/Commands.vala"
-	if (_tmp10_ >= FLAG_UNFLAG_COMMAND_MIN_PROGRESS_BAR_THRESHOLD) {
-#line 21799 "Commands.c"
-		const gchar* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
-		ProgressDialog* _tmp13_ = NULL;
-		ProgressDialog* _tmp14_ = NULL;
+	if (_tmp8_ >= FLAG_UNFLAG_COMMAND_MIN_PROGRESS_BAR_THRESHOLD) {
+#line 21706 "Commands.c"
+		const gchar* _tmp9_ = NULL;
+		gboolean _tmp10_;
+		ProgressDialog* _tmp11_;
+		ProgressDialog* _tmp12_;
 #line 2470 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp12_ = flag;
+		_tmp10_ = flag;
 #line 2470 "/home/jens/Source/shotwell/src/Commands.vala"
-		if (_tmp12_) {
+		if (_tmp10_) {
 #line 2470 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp11_ = FLAG_UNFLAG_COMMAND_FLAG_PROGRESS;
-#line 21810 "Commands.c"
+			_tmp9_ = FLAG_UNFLAG_COMMAND_FLAG_PROGRESS;
+#line 21717 "Commands.c"
 		} else {
 #line 2470 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp11_ = FLAG_UNFLAG_COMMAND_UNFLAG_PROGRESS;
-#line 21814 "Commands.c"
+			_tmp9_ = FLAG_UNFLAG_COMMAND_UNFLAG_PROGRESS;
+#line 21721 "Commands.c"
 		}
 #line 2469 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp13_ = progress_dialog_new (NULL, _tmp11_, NULL);
+		_tmp11_ = progress_dialog_new (NULL, _tmp9_, NULL);
 #line 2469 "/home/jens/Source/shotwell/src/Commands.vala"
-		g_object_ref_sink (_tmp13_);
+		g_object_ref_sink (_tmp11_);
 #line 2469 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (self->priv->progress_dialog);
 #line 2469 "/home/jens/Source/shotwell/src/Commands.vala"
-		self->priv->progress_dialog = _tmp13_;
+		self->priv->progress_dialog = _tmp11_;
 #line 2472 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp14_ = self->priv->progress_dialog;
+		_tmp12_ = self->priv->progress_dialog;
 #line 2472 "/home/jens/Source/shotwell/src/Commands.vala"
-		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 21828 "Commands.c"
+		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
+#line 21735 "Commands.c"
 	}
 #line 2461 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 21832 "Commands.c"
+#line 21739 "Commands.c"
 }
 
 
 FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, gboolean flag) {
 #line 2461 "/home/jens/Source/shotwell/src/Commands.vala"
 	return flag_unflag_command_construct (TYPE_FLAG_UNFLAG_COMMAND, sources, flag);
-#line 21839 "Commands.c"
+#line 21746 "Commands.c"
 }
 
 
 static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources) {
 	FlagUnflagCommand * self;
 	gint num_processed = 0;
-	ProgressDialog* _tmp16_ = NULL;
+	ProgressDialog* _tmp16_;
 #line 2476 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLAG_UNFLAG_COMMAND, FlagUnflagCommand);
 #line 2476 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
 #line 2477 "/home/jens/Source/shotwell/src/Commands.vala"
 	num_processed = 0;
-#line 21853 "Commands.c"
+#line 21760 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = sources;
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21862,16 +21769,16 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
 		_source_it = _tmp1_;
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 21866 "Commands.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 21773 "Commands.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			DataSource* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
-			gint _tmp8_ = 0;
-			ProgressDialog* _tmp9_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			DataSource* _tmp6_;
+			gboolean _tmp7_;
+			gint _tmp8_;
+			ProgressDialog* _tmp9_;
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp2_ = _source_it;
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21880,7 +21787,7 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
 			if (!_tmp3_) {
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 21884 "Commands.c"
+#line 21791 "Commands.c"
 			}
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -21902,13 +21809,13 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
 			_tmp9_ = self->priv->progress_dialog;
 #line 2484 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp9_ != NULL) {
-#line 21906 "Commands.c"
-				ProgressDialog* _tmp10_ = NULL;
-				gint _tmp11_ = 0;
-				GeeCollection* _tmp12_ = NULL;
-				gint _tmp13_ = 0;
-				gint _tmp14_ = 0;
-				ProgressDialog* _tmp15_ = NULL;
+#line 21813 "Commands.c"
+				ProgressDialog* _tmp10_;
+				gint _tmp11_;
+				GeeCollection* _tmp12_;
+				gint _tmp13_;
+				gint _tmp14_;
+				ProgressDialog* _tmp15_;
 #line 2485 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp10_ = self->priv->progress_dialog;
 #line 2485 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21927,27 +21834,27 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
 				gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
 #line 2487 "/home/jens/Source/shotwell/src/Commands.vala"
 				spin_event_loop ();
-#line 21931 "Commands.c"
+#line 21838 "Commands.c"
 			}
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 21935 "Commands.c"
+#line 21842 "Commands.c"
 		}
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 21939 "Commands.c"
+#line 21846 "Commands.c"
 	}
 #line 2491 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp16_ = self->priv->progress_dialog;
 #line 2491 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp16_ != NULL) {
-#line 21945 "Commands.c"
-		ProgressDialog* _tmp17_ = NULL;
+#line 21852 "Commands.c"
+		ProgressDialog* _tmp17_;
 #line 2492 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp17_ = self->priv->progress_dialog;
 #line 2492 "/home/jens/Source/shotwell/src/Commands.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget));
-#line 21951 "Commands.c"
+#line 21858 "Commands.c"
 	}
 }
 
@@ -21958,11 +21865,11 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLAG_UNFLAG_COMMAND, FlagUnflagCommand);
 #line 2495 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 21962 "Commands.c"
+#line 21869 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = sources;
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21971,14 +21878,14 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
 		_source_it = _tmp1_;
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 21975 "Commands.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 21882 "Commands.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			DataSource* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			DataSource* _tmp6_;
+			gboolean _tmp7_;
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp2_ = _source_it;
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21987,7 +21894,7 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
 			if (!_tmp3_) {
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 21991 "Commands.c"
+#line 21898 "Commands.c"
 			}
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -22003,20 +21910,20 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
 			flag_unflag_command_flag_unflag (self, _tmp6_, !_tmp7_);
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 22007 "Commands.c"
+#line 21914 "Commands.c"
 		}
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 22011 "Commands.c"
+#line 21918 "Commands.c"
 	}
 }
 
 
 static void flag_unflag_command_flag_unflag (FlagUnflagCommand* self, DataSource* source, gboolean flag) {
 	Flaggable* flaggable = NULL;
-	DataSource* _tmp0_ = NULL;
-	Flaggable* _tmp1_ = NULL;
-	Flaggable* _tmp2_ = NULL;
+	DataSource* _tmp0_;
+	Flaggable* _tmp1_;
+	Flaggable* _tmp2_;
 #line 2500 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_FLAG_UNFLAG_COMMAND (self));
 #line 2500 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -22031,31 +21938,31 @@ static void flag_unflag_command_flag_unflag (FlagUnflagCommand* self, DataSource
 	_tmp2_ = flaggable;
 #line 2502 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ != NULL) {
-#line 22035 "Commands.c"
-		gboolean _tmp3_ = FALSE;
+#line 21942 "Commands.c"
+		gboolean _tmp3_;
 #line 2503 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = flag;
 #line 2503 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp3_) {
-#line 22041 "Commands.c"
-			Flaggable* _tmp4_ = NULL;
+#line 21948 "Commands.c"
+			Flaggable* _tmp4_;
 #line 2504 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = flaggable;
 #line 2504 "/home/jens/Source/shotwell/src/Commands.vala"
 			flaggable_mark_flagged (_tmp4_);
-#line 22047 "Commands.c"
+#line 21954 "Commands.c"
 		} else {
-			Flaggable* _tmp5_ = NULL;
+			Flaggable* _tmp5_;
 #line 2506 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = flaggable;
 #line 2506 "/home/jens/Source/shotwell/src/Commands.vala"
 			flaggable_mark_unflagged (_tmp5_);
-#line 22054 "Commands.c"
+#line 21961 "Commands.c"
 		}
 	}
 #line 2500 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (flaggable);
-#line 22059 "Commands.c"
+#line 21966 "Commands.c"
 }
 
 
@@ -22065,12 +21972,12 @@ static void flag_unflag_command_class_init (FlagUnflagCommandClass * klass) {
 #line 2451 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_type_class_add_private (klass, sizeof (FlagUnflagCommandPrivate));
 #line 2451 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) flag_unflag_command_real_execute_on_all;
+	((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) flag_unflag_command_real_execute_on_all;
 #line 2451 "/home/jens/Source/shotwell/src/Commands.vala"
-	((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) flag_unflag_command_real_undo_on_all;
+	((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) flag_unflag_command_real_undo_on_all;
 #line 2451 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = flag_unflag_command_finalize;
-#line 22074 "Commands.c"
+#line 21981 "Commands.c"
 }
 
 
@@ -22079,11 +21986,11 @@ static void flag_unflag_command_instance_init (FlagUnflagCommand * self) {
 	self->priv = FLAG_UNFLAG_COMMAND_GET_PRIVATE (self);
 #line 2459 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->progress_dialog = NULL;
-#line 22083 "Commands.c"
+#line 21990 "Commands.c"
 }
 
 
-static void flag_unflag_command_finalize (GObject* obj) {
+static void flag_unflag_command_finalize (GObject * obj) {
 	FlagUnflagCommand * self;
 #line 2451 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FLAG_UNFLAG_COMMAND, FlagUnflagCommand);
@@ -22091,7 +21998,7 @@ static void flag_unflag_command_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->progress_dialog);
 #line 2451 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (flag_unflag_command_parent_class)->finalize (obj);
-#line 22095 "Commands.c"
+#line 22002 "Commands.c"
 }
 
 
diff --git a/src/CustomComponents.c b/src/CustomComponents.c
index b9cd57e..80d8368 100644
--- a/src/CustomComponents.c
+++ b/src/CustomComponents.c
@@ -1,4 +1,4 @@
-/* CustomComponents.c generated by valac 0.34.7, the Vala compiler
+/* CustomComponents.c generated by valac 0.36.6, the Vala compiler
  * generated from CustomComponents.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -69,6 +69,11 @@ typedef struct _RGBHistogramClass RGBHistogramClass;
 
 #define RGB_HISTOGRAM_MANIPULATOR_TYPE_LOCATION_CODE (rgb_histogram_manipulator_location_code_get_type ())
 #define _rgb_histogram_unref0(var) ((var == NULL) ? NULL : (var = (rgb_histogram_unref (var), NULL)))
+enum  {
+	RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL,
+	RGB_HISTOGRAM_MANIPULATOR_LAST_SIGNAL
+};
+static guint rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -202,7 +207,7 @@ gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, RGBAnalyticPixel* rh
 guint rgb_analytic_pixel_hash_code (RGBAnalyticPixel *self);
 ThemeLoader* theme_loader_new (void);
 ThemeLoader* theme_loader_construct (GType object_type);
-static void theme_loader_finalize (ThemeLoader* obj);
+static void theme_loader_finalize (ThemeLoader * obj);
 GType rgb_histogram_manipulator_get_type (void) G_GNUC_CONST;
 gpointer rgb_histogram_ref (gpointer instance);
 void rgb_histogram_unref (gpointer instance);
@@ -251,13 +256,13 @@ gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* s
 gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self);
 void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, gint user_nub_pos);
 void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, gint user_nub_pos);
-static void rgb_histogram_manipulator_finalize (GObject* obj);
+static void rgb_histogram_manipulator_finalize (GObject * obj);
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 36 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 261 "CustomComponents.c"
+#line 266 "CustomComponents.c"
 }
 
 
@@ -269,113 +274,113 @@ static GdkColor* _gdk_color_dup (GdkColor* self) {
 	memcpy (dup, self, sizeof (GdkColor));
 #line 38 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return dup;
-#line 273 "CustomComponents.c"
+#line 278 "CustomComponents.c"
 }
 
 
 static gpointer __gdk_color_dup0 (gpointer self) {
 #line 38 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return self ? _gdk_color_dup (self) : NULL;
-#line 280 "CustomComponents.c"
+#line 285 "CustomComponents.c"
 }
 
 
 static void theme_loader_populate_theme_params (void) {
-	ThemeLoaderLightweightColor* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	ThemeLoaderLightweightColor* _tmp1_ = NULL;
+	ThemeLoaderLightweightColor* _tmp0_;
+	gint _tmp0__length1;
+	ThemeLoaderLightweightColor* _tmp1_;
 	GtkSettings* settings = NULL;
-	GtkSettings* _tmp2_ = NULL;
-	GtkSettings* _tmp3_ = NULL;
+	GtkSettings* _tmp2_;
+	GtkSettings* _tmp3_;
 	GHashTable* color_table = NULL;
-	GtkSettings* _tmp4_ = NULL;
-	GHashTable* _tmp5_ = NULL;
-	GHashTable* _tmp6_ = NULL;
+	GtkSettings* _tmp4_;
+	GHashTable* _tmp5_;
+	GHashTable* _tmp6_;
 	GdkColor* base_color = NULL;
-	GHashTable* _tmp7_ = NULL;
-	gconstpointer _tmp8_ = NULL;
-	GdkColor* _tmp9_ = NULL;
+	GHashTable* _tmp7_;
+	gconstpointer _tmp8_;
+	GdkColor* _tmp9_;
 	gboolean _tmp10_ = FALSE;
-	GdkColor* _tmp11_ = NULL;
+	GdkColor* _tmp11_;
 	RGBAnalyticPixel base_color_analytic_rgb = {0};
-	GdkColor* _tmp16_ = NULL;
-	guint16 _tmp17_ = 0U;
-	GdkColor* _tmp18_ = NULL;
-	guint16 _tmp19_ = 0U;
-	GdkColor* _tmp20_ = NULL;
-	guint16 _tmp21_ = 0U;
+	GdkColor* _tmp16_;
+	guint16 _tmp17_;
+	GdkColor* _tmp18_;
+	guint16 _tmp19_;
+	GdkColor* _tmp20_;
+	guint16 _tmp21_;
 	HSVAnalyticPixel base_color_analytic_hsv = {0};
-	RGBAnalyticPixel _tmp22_ = {0};
+	RGBAnalyticPixel _tmp22_;
 	HSVAnalyticPixel bevel_light_analytic_hsv = {0};
-	HSVAnalyticPixel _tmp23_ = {0};
-	gfloat _tmp24_ = 0.0F;
-	HSVAnalyticPixel _tmp25_ = {0};
-	gfloat _tmp26_ = 0.0F;
-	gfloat _tmp27_ = 0.0F;
+	HSVAnalyticPixel _tmp23_;
+	gfloat _tmp24_;
+	HSVAnalyticPixel _tmp25_;
+	gfloat _tmp26_;
+	gfloat _tmp27_;
 	HSVAnalyticPixel bevel_lighter_analytic_hsv = {0};
-	HSVAnalyticPixel _tmp28_ = {0};
-	gfloat _tmp29_ = 0.0F;
-	HSVAnalyticPixel _tmp30_ = {0};
-	gfloat _tmp31_ = 0.0F;
-	gfloat _tmp32_ = 0.0F;
+	HSVAnalyticPixel _tmp28_;
+	gfloat _tmp29_;
+	HSVAnalyticPixel _tmp30_;
+	gfloat _tmp31_;
+	gfloat _tmp32_;
 	HSVAnalyticPixel bevel_dark_analytic_hsv = {0};
-	HSVAnalyticPixel _tmp33_ = {0};
-	gfloat _tmp34_ = 0.0F;
-	HSVAnalyticPixel _tmp35_ = {0};
-	gfloat _tmp36_ = 0.0F;
-	gfloat _tmp37_ = 0.0F;
+	HSVAnalyticPixel _tmp33_;
+	gfloat _tmp34_;
+	HSVAnalyticPixel _tmp35_;
+	gfloat _tmp36_;
+	gfloat _tmp37_;
 	HSVAnalyticPixel bevel_darker_analytic_hsv = {0};
-	HSVAnalyticPixel _tmp38_ = {0};
-	gfloat _tmp39_ = 0.0F;
-	HSVAnalyticPixel _tmp40_ = {0};
-	gfloat _tmp41_ = 0.0F;
-	gfloat _tmp42_ = 0.0F;
+	HSVAnalyticPixel _tmp38_;
+	gfloat _tmp39_;
+	HSVAnalyticPixel _tmp40_;
+	gfloat _tmp41_;
+	gfloat _tmp42_;
 	HSVAnalyticPixel outline_analytic_hsv = {0};
-	HSVAnalyticPixel _tmp43_ = {0};
-	gfloat _tmp44_ = 0.0F;
-	HSVAnalyticPixel _tmp45_ = {0};
-	gfloat _tmp46_ = 0.0F;
-	gfloat _tmp47_ = 0.0F;
+	HSVAnalyticPixel _tmp43_;
+	gfloat _tmp44_;
+	HSVAnalyticPixel _tmp45_;
+	gfloat _tmp46_;
+	gfloat _tmp47_;
 	RGBAnalyticPixel outline_analytic_rgb = {0};
 	RGBAnalyticPixel _tmp48_ = {0};
-	ThemeLoaderLightweightColor* _tmp49_ = NULL;
-	gint _tmp49__length1 = 0;
-	RGBAnalyticPixel _tmp50_ = {0};
+	ThemeLoaderLightweightColor* _tmp49_;
+	gint _tmp49__length1;
+	RGBAnalyticPixel _tmp50_;
 	ThemeLoaderLightweightColor _tmp51_ = {0};
-	ThemeLoaderLightweightColor _tmp52_ = {0};
+	ThemeLoaderLightweightColor _tmp52_;
 	RGBAnalyticPixel bevel_darker_analytic_rgb = {0};
 	RGBAnalyticPixel _tmp53_ = {0};
-	ThemeLoaderLightweightColor* _tmp54_ = NULL;
-	gint _tmp54__length1 = 0;
-	RGBAnalyticPixel _tmp55_ = {0};
+	ThemeLoaderLightweightColor* _tmp54_;
+	gint _tmp54__length1;
+	RGBAnalyticPixel _tmp55_;
 	ThemeLoaderLightweightColor _tmp56_ = {0};
-	ThemeLoaderLightweightColor _tmp57_ = {0};
+	ThemeLoaderLightweightColor _tmp57_;
 	RGBAnalyticPixel bevel_dark_analytic_rgb = {0};
 	RGBAnalyticPixel _tmp58_ = {0};
-	ThemeLoaderLightweightColor* _tmp59_ = NULL;
-	gint _tmp59__length1 = 0;
-	RGBAnalyticPixel _tmp60_ = {0};
+	ThemeLoaderLightweightColor* _tmp59_;
+	gint _tmp59__length1;
+	RGBAnalyticPixel _tmp60_;
 	ThemeLoaderLightweightColor _tmp61_ = {0};
-	ThemeLoaderLightweightColor _tmp62_ = {0};
-	ThemeLoaderLightweightColor* _tmp63_ = NULL;
-	gint _tmp63__length1 = 0;
-	RGBAnalyticPixel _tmp64_ = {0};
+	ThemeLoaderLightweightColor _tmp62_;
+	ThemeLoaderLightweightColor* _tmp63_;
+	gint _tmp63__length1;
+	RGBAnalyticPixel _tmp64_;
 	ThemeLoaderLightweightColor _tmp65_ = {0};
-	ThemeLoaderLightweightColor _tmp66_ = {0};
+	ThemeLoaderLightweightColor _tmp66_;
 	RGBAnalyticPixel bevel_light_analytic_rgb = {0};
 	RGBAnalyticPixel _tmp67_ = {0};
-	ThemeLoaderLightweightColor* _tmp68_ = NULL;
-	gint _tmp68__length1 = 0;
-	RGBAnalyticPixel _tmp69_ = {0};
+	ThemeLoaderLightweightColor* _tmp68_;
+	gint _tmp68__length1;
+	RGBAnalyticPixel _tmp69_;
 	ThemeLoaderLightweightColor _tmp70_ = {0};
-	ThemeLoaderLightweightColor _tmp71_ = {0};
+	ThemeLoaderLightweightColor _tmp71_;
 	RGBAnalyticPixel bevel_lighter_analytic_rgb = {0};
 	RGBAnalyticPixel _tmp72_ = {0};
-	ThemeLoaderLightweightColor* _tmp73_ = NULL;
-	gint _tmp73__length1 = 0;
-	RGBAnalyticPixel _tmp74_ = {0};
+	ThemeLoaderLightweightColor* _tmp73_;
+	gint _tmp73__length1;
+	RGBAnalyticPixel _tmp74_;
 	ThemeLoaderLightweightColor _tmp75_ = {0};
-	ThemeLoaderLightweightColor _tmp76_ = {0};
+	ThemeLoaderLightweightColor _tmp76_;
 #line 31 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp0_ = theme_loader_theme_colors;
 #line 31 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -384,7 +389,7 @@ static void theme_loader_populate_theme_params (void) {
 	if (_tmp0_ != NULL) {
 #line 32 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		return;
-#line 388 "CustomComponents.c"
+#line 393 "CustomComponents.c"
 	}
 #line 34 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp1_ = g_new0 (ThemeLoaderLightweightColor, THEME_LOADER_NUM_SUPPORTED_INTENSITIES);
@@ -422,11 +427,11 @@ static void theme_loader_populate_theme_params (void) {
 	_tmp11_ = base_color;
 #line 39 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (_tmp11_ == NULL) {
-#line 426 "CustomComponents.c"
+#line 431 "CustomComponents.c"
 		GdkColor _tmp12_ = {0};
-		gboolean _tmp13_ = FALSE;
-		GdkColor _tmp14_ = {0};
-		GdkColor* _tmp15_ = NULL;
+		gboolean _tmp13_;
+		GdkColor _tmp14_;
+		GdkColor* _tmp15_;
 #line 39 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp13_ = gdk_color_parse ("#fff", &_tmp12_);
 #line 39 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -439,17 +444,17 @@ static void theme_loader_populate_theme_params (void) {
 		base_color = _tmp15_;
 #line 39 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp10_ = !_tmp13_;
-#line 443 "CustomComponents.c"
+#line 448 "CustomComponents.c"
 	} else {
 #line 39 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp10_ = FALSE;
-#line 447 "CustomComponents.c"
+#line 452 "CustomComponents.c"
 	}
 #line 39 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (_tmp10_) {
 #line 40 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		g_error ("CustomComponents.vala:40: can't parse color");
-#line 453 "CustomComponents.c"
+#line 458 "CustomComponents.c"
 	}
 #line 42 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp16_ = base_color;
@@ -647,18 +652,18 @@ static void theme_loader_populate_theme_params (void) {
 	_g_hash_table_unref0 (color_table);
 #line 30 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_g_object_unref0 (settings);
-#line 651 "CustomComponents.c"
+#line 656 "CustomComponents.c"
 }
 
 
 static void theme_loader_populate_one_theme_param (RGBAnalyticPixel* from, ThemeLoaderLightweightColor* result) {
 	ThemeLoaderLightweightColor into = {0};
-	RGBAnalyticPixel _tmp0_ = {0};
-	gfloat _tmp1_ = 0.0F;
-	RGBAnalyticPixel _tmp2_ = {0};
-	gfloat _tmp3_ = 0.0F;
-	RGBAnalyticPixel _tmp4_ = {0};
-	gfloat _tmp5_ = 0.0F;
+	RGBAnalyticPixel _tmp0_;
+	gfloat _tmp1_;
+	RGBAnalyticPixel _tmp2_;
+	gfloat _tmp3_;
+	RGBAnalyticPixel _tmp4_;
+	gfloat _tmp5_;
 #line 97 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_if_fail (from != NULL);
 #line 98 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -685,7 +690,7 @@ static void theme_loader_populate_one_theme_param (RGBAnalyticPixel* from, Theme
 	*result = into;
 #line 104 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return;
-#line 689 "CustomComponents.c"
+#line 694 "CustomComponents.c"
 }
 
 
@@ -694,7 +699,7 @@ static guint _theme_loader_rgb_pixel_hash_func_gee_hash_data_func (gconstpointer
 	result = theme_loader_rgb_pixel_hash_func ((RGBAnalyticPixel*) v);
 #line 114 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return result;
-#line 698 "CustomComponents.c"
+#line 703 "CustomComponents.c"
 }
 
 
@@ -703,7 +708,7 @@ static gboolean _theme_loader_rgb_pixel_equal_func_gee_equal_data_func (gconstpo
 	result = theme_loader_rgb_pixel_equal_func ((RGBAnalyticPixel*) a, (RGBAnalyticPixel*) b);
 #line 114 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return result;
-#line 707 "CustomComponents.c"
+#line 712 "CustomComponents.c"
 }
 
 
@@ -712,37 +717,37 @@ static gint _theme_loader_hsv_pixel_compare_func_gcompare_func (gconstpointer a,
 	result = theme_loader_hsv_pixel_compare_func (a, b);
 #line 142 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return result;
-#line 716 "CustomComponents.c"
+#line 721 "CustomComponents.c"
 }
 
 
 GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* loaded_pixbuf = NULL;
-	const gchar* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
+	const gchar* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	GdkPixbuf* _tmp2_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
 	GeeHashSet* colors = NULL;
-	GeeHashSet* _tmp5_ = NULL;
+	GeeHashSet* _tmp5_;
 	guchar* pixel_data = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
-	guint8* _tmp7_ = NULL;
-	gint pixel_data_length1 = 0;
-	gint _pixel_data_size_ = 0;
-	GeeHashSet* _tmp39_ = NULL;
-	gint _tmp40_ = 0;
-	gint _tmp41_ = 0;
+	GdkPixbuf* _tmp6_;
+	guint8* _tmp7_;
+	gint pixel_data_length1;
+	gint _pixel_data_size_;
+	GeeHashSet* _tmp39_;
+	gint _tmp40_;
+	gint _tmp41_;
 	HSVAnalyticPixel* hsv_pixels = NULL;
-	HSVAnalyticPixel* _tmp42_ = NULL;
-	gint hsv_pixels_length1 = 0;
-	gint _hsv_pixels_size_ = 0;
+	HSVAnalyticPixel* _tmp42_;
+	gint hsv_pixels_length1;
+	gint _hsv_pixels_size_;
 	gint pixel_ticker = 0;
-	HSVAnalyticPixel* _tmp56_ = NULL;
-	gint _tmp56__length1 = 0;
-	HSVAnalyticPixel* _tmp57_ = NULL;
-	gint _tmp57__length1 = 0;
+	HSVAnalyticPixel* _tmp56_;
+	gint _tmp56__length1;
+	HSVAnalyticPixel* _tmp57_;
+	gint _tmp57__length1;
 #line 107 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_val_if_fail (source_basename != NULL, NULL);
 #line 108 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -775,32 +780,32 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 	pixel_data_length1 = -1;
 #line 117 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_pixel_data_size_ = pixel_data_length1;
-#line 779 "CustomComponents.c"
+#line 784 "CustomComponents.c"
 	{
 		gint j = 0;
 #line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		j = 0;
-#line 784 "CustomComponents.c"
+#line 789 "CustomComponents.c"
 		{
 			gboolean _tmp8_ = FALSE;
 #line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			_tmp8_ = TRUE;
 #line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			while (TRUE) {
-#line 791 "CustomComponents.c"
-				gint _tmp10_ = 0;
-				GdkPixbuf* _tmp11_ = NULL;
-				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
+#line 796 "CustomComponents.c"
+				gint _tmp10_;
+				GdkPixbuf* _tmp11_;
+				gint _tmp12_;
+				gint _tmp13_;
 #line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 				if (!_tmp8_) {
-#line 798 "CustomComponents.c"
-					gint _tmp9_ = 0;
+#line 803 "CustomComponents.c"
+					gint _tmp9_;
 #line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					_tmp9_ = j;
 #line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					j = _tmp9_ + 1;
-#line 804 "CustomComponents.c"
+#line 809 "CustomComponents.c"
 				}
 #line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 				_tmp8_ = FALSE;
@@ -816,57 +821,57 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 				if (!(_tmp10_ < _tmp13_)) {
 #line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					break;
-#line 820 "CustomComponents.c"
+#line 825 "CustomComponents.c"
 				}
 				{
 					gint i = 0;
 #line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					i = 0;
-#line 826 "CustomComponents.c"
+#line 831 "CustomComponents.c"
 					{
 						gboolean _tmp14_ = FALSE;
 #line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 						_tmp14_ = TRUE;
 #line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 						while (TRUE) {
-#line 833 "CustomComponents.c"
-							gint _tmp16_ = 0;
-							GdkPixbuf* _tmp17_ = NULL;
-							gint _tmp18_ = 0;
-							gint _tmp19_ = 0;
+#line 838 "CustomComponents.c"
+							gint _tmp16_;
+							GdkPixbuf* _tmp17_;
+							gint _tmp18_;
+							gint _tmp19_;
 							gint pixel_index = 0;
-							gint _tmp20_ = 0;
-							GdkPixbuf* _tmp21_ = NULL;
-							gint _tmp22_ = 0;
-							gint _tmp23_ = 0;
-							gint _tmp24_ = 0;
-							GdkPixbuf* _tmp25_ = NULL;
-							gint _tmp26_ = 0;
-							gint _tmp27_ = 0;
+							gint _tmp20_;
+							GdkPixbuf* _tmp21_;
+							gint _tmp22_;
+							gint _tmp23_;
+							gint _tmp24_;
+							GdkPixbuf* _tmp25_;
+							gint _tmp26_;
+							gint _tmp27_;
 							RGBAnalyticPixel pixel_color = {0};
-							guchar* _tmp28_ = NULL;
-							gint _tmp28__length1 = 0;
-							gint _tmp29_ = 0;
-							guchar _tmp30_ = '\0';
-							guchar* _tmp31_ = NULL;
-							gint _tmp31__length1 = 0;
-							gint _tmp32_ = 0;
-							guchar _tmp33_ = '\0';
-							guchar* _tmp34_ = NULL;
-							gint _tmp34__length1 = 0;
-							gint _tmp35_ = 0;
-							guchar _tmp36_ = '\0';
-							GeeHashSet* _tmp37_ = NULL;
-							RGBAnalyticPixel _tmp38_ = {0};
+							guchar* _tmp28_;
+							gint _tmp28__length1;
+							gint _tmp29_;
+							guchar _tmp30_;
+							guchar* _tmp31_;
+							gint _tmp31__length1;
+							gint _tmp32_;
+							guchar _tmp33_;
+							guchar* _tmp34_;
+							gint _tmp34__length1;
+							gint _tmp35_;
+							guchar _tmp36_;
+							GeeHashSet* _tmp37_;
+							RGBAnalyticPixel _tmp38_;
 #line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 							if (!_tmp14_) {
-#line 864 "CustomComponents.c"
-								gint _tmp15_ = 0;
+#line 869 "CustomComponents.c"
+								gint _tmp15_;
 #line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 								_tmp15_ = i;
 #line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 								i = _tmp15_ + 1;
-#line 870 "CustomComponents.c"
+#line 875 "CustomComponents.c"
 							}
 #line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 							_tmp14_ = FALSE;
@@ -882,7 +887,7 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 							if (!(_tmp16_ < _tmp19_)) {
 #line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 								break;
-#line 886 "CustomComponents.c"
+#line 891 "CustomComponents.c"
 							}
 #line 120 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 							_tmp20_ = j;
@@ -934,7 +939,7 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 							_tmp38_ = pixel_color;
 #line 125 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 							gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp38_);
-#line 938 "CustomComponents.c"
+#line 943 "CustomComponents.c"
 						}
 					}
 				}
@@ -951,7 +956,7 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 	if (_tmp41_ != THEME_LOADER_NUM_SUPPORTED_INTENSITIES) {
 #line 133 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		g_error ("CustomComponents.vala:133: %s", "ThemeLoader: load_icon: pixbuf does not contain the correct number " "of unique colors");
-#line 955 "CustomComponents.c"
+#line 960 "CustomComponents.c"
 	}
 #line 138 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp42_ = g_new0 (HSVAnalyticPixel, 6);
@@ -963,11 +968,11 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 	_hsv_pixels_size_ = hsv_pixels_length1;
 #line 139 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	pixel_ticker = 0;
-#line 967 "CustomComponents.c"
+#line 972 "CustomComponents.c"
 	{
 		GeeIterator* _rgb_pixel_it = NULL;
-		GeeHashSet* _tmp43_ = NULL;
-		GeeIterator* _tmp44_ = NULL;
+		GeeHashSet* _tmp43_;
+		GeeIterator* _tmp44_;
 #line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp43_ = colors;
 #line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -976,20 +981,20 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 		_rgb_pixel_it = _tmp44_;
 #line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		while (TRUE) {
-#line 980 "CustomComponents.c"
-			GeeIterator* _tmp45_ = NULL;
-			gboolean _tmp46_ = FALSE;
+#line 985 "CustomComponents.c"
+			GeeIterator* _tmp45_;
+			gboolean _tmp46_;
 			RGBAnalyticPixel rgb_pixel = {0};
-			GeeIterator* _tmp47_ = NULL;
-			gpointer _tmp48_ = NULL;
-			RGBAnalyticPixel* _tmp49_ = NULL;
-			RGBAnalyticPixel _tmp50_ = {0};
-			HSVAnalyticPixel* _tmp51_ = NULL;
-			gint _tmp51__length1 = 0;
-			gint _tmp52_ = 0;
-			RGBAnalyticPixel _tmp53_ = {0};
+			GeeIterator* _tmp47_;
+			gpointer _tmp48_;
+			RGBAnalyticPixel* _tmp49_;
+			RGBAnalyticPixel _tmp50_;
+			HSVAnalyticPixel* _tmp51_;
+			gint _tmp51__length1;
+			gint _tmp52_;
+			RGBAnalyticPixel _tmp53_;
 			HSVAnalyticPixel _tmp54_ = {0};
-			HSVAnalyticPixel _tmp55_ = {0};
+			HSVAnalyticPixel _tmp55_;
 #line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			_tmp45_ = _rgb_pixel_it;
 #line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -998,7 +1003,7 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 			if (!_tmp46_) {
 #line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 				break;
-#line 1002 "CustomComponents.c"
+#line 1007 "CustomComponents.c"
 			}
 #line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			_tmp47_ = _rgb_pixel_it;
@@ -1028,11 +1033,11 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 			_tmp51_[_tmp52_] = _tmp54_;
 #line 141 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			_tmp55_ = _tmp51_[_tmp52_];
-#line 1032 "CustomComponents.c"
+#line 1037 "CustomComponents.c"
 		}
 #line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_g_object_unref0 (_rgb_pixel_it);
-#line 1036 "CustomComponents.c"
+#line 1041 "CustomComponents.c"
 	}
 #line 142 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp56_ = hsv_pixels;
@@ -1044,32 +1049,32 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 	_tmp57__length1 = hsv_pixels_length1;
 #line 142 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	qsort (_tmp56_, (gsize) _tmp57__length1, (gsize) sizeof (HSVAnalyticPixel), _theme_loader_hsv_pixel_compare_func_gcompare_func);
-#line 1048 "CustomComponents.c"
+#line 1053 "CustomComponents.c"
 	{
 		gint j = 0;
 #line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		j = 0;
-#line 1053 "CustomComponents.c"
+#line 1058 "CustomComponents.c"
 		{
 			gboolean _tmp58_ = FALSE;
 #line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			_tmp58_ = TRUE;
 #line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			while (TRUE) {
-#line 1060 "CustomComponents.c"
-				gint _tmp60_ = 0;
-				GdkPixbuf* _tmp61_ = NULL;
-				gint _tmp62_ = 0;
-				gint _tmp63_ = 0;
+#line 1065 "CustomComponents.c"
+				gint _tmp60_;
+				GdkPixbuf* _tmp61_;
+				gint _tmp62_;
+				gint _tmp63_;
 #line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 				if (!_tmp58_) {
-#line 1067 "CustomComponents.c"
-					gint _tmp59_ = 0;
+#line 1072 "CustomComponents.c"
+					gint _tmp59_;
 #line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					_tmp59_ = j;
 #line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					j = _tmp59_ + 1;
-#line 1073 "CustomComponents.c"
+#line 1078 "CustomComponents.c"
 				}
 #line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 				_tmp58_ = FALSE;
@@ -1085,85 +1090,85 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 				if (!(_tmp60_ < _tmp63_)) {
 #line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					break;
-#line 1089 "CustomComponents.c"
+#line 1094 "CustomComponents.c"
 				}
 				{
 					gint i = 0;
 #line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					i = 0;
-#line 1095 "CustomComponents.c"
+#line 1100 "CustomComponents.c"
 					{
 						gboolean _tmp64_ = FALSE;
 #line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 						_tmp64_ = TRUE;
 #line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 						while (TRUE) {
-#line 1102 "CustomComponents.c"
-							gint _tmp66_ = 0;
-							GdkPixbuf* _tmp67_ = NULL;
-							gint _tmp68_ = 0;
-							gint _tmp69_ = 0;
+#line 1107 "CustomComponents.c"
+							gint _tmp66_;
+							GdkPixbuf* _tmp67_;
+							gint _tmp68_;
+							gint _tmp69_;
 							gint pixel_index = 0;
-							gint _tmp70_ = 0;
-							GdkPixbuf* _tmp71_ = NULL;
-							gint _tmp72_ = 0;
-							gint _tmp73_ = 0;
-							gint _tmp74_ = 0;
-							GdkPixbuf* _tmp75_ = NULL;
-							gint _tmp76_ = 0;
-							gint _tmp77_ = 0;
+							gint _tmp70_;
+							GdkPixbuf* _tmp71_;
+							gint _tmp72_;
+							gint _tmp73_;
+							gint _tmp74_;
+							GdkPixbuf* _tmp75_;
+							gint _tmp76_;
+							gint _tmp77_;
 							RGBAnalyticPixel pixel_color = {0};
-							guchar* _tmp78_ = NULL;
-							gint _tmp78__length1 = 0;
-							gint _tmp79_ = 0;
-							guchar _tmp80_ = '\0';
-							guchar* _tmp81_ = NULL;
-							gint _tmp81__length1 = 0;
-							gint _tmp82_ = 0;
-							guchar _tmp83_ = '\0';
-							guchar* _tmp84_ = NULL;
-							gint _tmp84__length1 = 0;
-							gint _tmp85_ = 0;
-							guchar _tmp86_ = '\0';
+							guchar* _tmp78_;
+							gint _tmp78__length1;
+							gint _tmp79_;
+							guchar _tmp80_;
+							guchar* _tmp81_;
+							gint _tmp81__length1;
+							gint _tmp82_;
+							guchar _tmp83_;
+							guchar* _tmp84_;
+							gint _tmp84__length1;
+							gint _tmp85_;
+							guchar _tmp86_;
 							HSVAnalyticPixel pixel_color_hsv = {0};
-							RGBAnalyticPixel _tmp87_ = {0};
+							RGBAnalyticPixel _tmp87_;
 							gint this_intensity = 0;
-							guchar* _tmp98_ = NULL;
-							gint _tmp98__length1 = 0;
-							gint _tmp99_ = 0;
-							ThemeLoaderLightweightColor* _tmp100_ = NULL;
-							gint _tmp100__length1 = 0;
-							gint _tmp101_ = 0;
-							ThemeLoaderLightweightColor _tmp102_ = {0};
-							guchar _tmp103_ = '\0';
-							guchar _tmp104_ = '\0';
-							guchar* _tmp105_ = NULL;
-							gint _tmp105__length1 = 0;
-							gint _tmp106_ = 0;
-							ThemeLoaderLightweightColor* _tmp107_ = NULL;
-							gint _tmp107__length1 = 0;
-							gint _tmp108_ = 0;
-							ThemeLoaderLightweightColor _tmp109_ = {0};
-							guchar _tmp110_ = '\0';
-							guchar _tmp111_ = '\0';
-							guchar* _tmp112_ = NULL;
-							gint _tmp112__length1 = 0;
-							gint _tmp113_ = 0;
-							ThemeLoaderLightweightColor* _tmp114_ = NULL;
-							gint _tmp114__length1 = 0;
-							gint _tmp115_ = 0;
-							ThemeLoaderLightweightColor _tmp116_ = {0};
-							guchar _tmp117_ = '\0';
-							guchar _tmp118_ = '\0';
+							guchar* _tmp98_;
+							gint _tmp98__length1;
+							gint _tmp99_;
+							ThemeLoaderLightweightColor* _tmp100_;
+							gint _tmp100__length1;
+							gint _tmp101_;
+							ThemeLoaderLightweightColor _tmp102_;
+							guchar _tmp103_;
+							guchar _tmp104_;
+							guchar* _tmp105_;
+							gint _tmp105__length1;
+							gint _tmp106_;
+							ThemeLoaderLightweightColor* _tmp107_;
+							gint _tmp107__length1;
+							gint _tmp108_;
+							ThemeLoaderLightweightColor _tmp109_;
+							guchar _tmp110_;
+							guchar _tmp111_;
+							guchar* _tmp112_;
+							gint _tmp112__length1;
+							gint _tmp113_;
+							ThemeLoaderLightweightColor* _tmp114_;
+							gint _tmp114__length1;
+							gint _tmp115_;
+							ThemeLoaderLightweightColor _tmp116_;
+							guchar _tmp117_;
+							guchar _tmp118_;
 #line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 							if (!_tmp64_) {
-#line 1161 "CustomComponents.c"
-								gint _tmp65_ = 0;
+#line 1166 "CustomComponents.c"
+								gint _tmp65_;
 #line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 								_tmp65_ = i;
 #line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 								i = _tmp65_ + 1;
-#line 1167 "CustomComponents.c"
+#line 1172 "CustomComponents.c"
 							}
 #line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 							_tmp64_ = FALSE;
@@ -1179,7 +1184,7 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 							if (!(_tmp66_ < _tmp69_)) {
 #line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 								break;
-#line 1183 "CustomComponents.c"
+#line 1188 "CustomComponents.c"
 							}
 #line 148 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 							_tmp70_ = j;
@@ -1231,36 +1236,36 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 							hsv_analytic_pixel_init_from_rgb (&pixel_color_hsv, &_tmp87_);
 #line 153 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 							this_intensity = 0;
-#line 1235 "CustomComponents.c"
+#line 1240 "CustomComponents.c"
 							{
 								gint k = 0;
 #line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 								k = 0;
-#line 1240 "CustomComponents.c"
+#line 1245 "CustomComponents.c"
 								{
 									gboolean _tmp88_ = FALSE;
 #line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 									_tmp88_ = TRUE;
 #line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 									while (TRUE) {
-#line 1247 "CustomComponents.c"
-										gint _tmp90_ = 0;
-										HSVAnalyticPixel* _tmp91_ = NULL;
-										gint _tmp91__length1 = 0;
-										gint _tmp92_ = 0;
-										HSVAnalyticPixel _tmp93_ = {0};
-										gfloat _tmp94_ = 0.0F;
-										HSVAnalyticPixel _tmp95_ = {0};
-										gfloat _tmp96_ = 0.0F;
+#line 1252 "CustomComponents.c"
+										gint _tmp90_;
+										HSVAnalyticPixel* _tmp91_;
+										gint _tmp91__length1;
+										gint _tmp92_;
+										HSVAnalyticPixel _tmp93_;
+										gfloat _tmp94_;
+										HSVAnalyticPixel _tmp95_;
+										gfloat _tmp96_;
 #line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 										if (!_tmp88_) {
-#line 1258 "CustomComponents.c"
-											gint _tmp89_ = 0;
+#line 1263 "CustomComponents.c"
+											gint _tmp89_;
 #line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 											_tmp89_ = k;
 #line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 											k = _tmp89_ + 1;
-#line 1264 "CustomComponents.c"
+#line 1269 "CustomComponents.c"
 										}
 #line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 										_tmp88_ = FALSE;
@@ -1270,7 +1275,7 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 										if (!(_tmp90_ < THEME_LOADER_NUM_SUPPORTED_INTENSITIES)) {
 #line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 											break;
-#line 1274 "CustomComponents.c"
+#line 1279 "CustomComponents.c"
 										}
 #line 155 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 										_tmp91_ = hsv_pixels;
@@ -1288,15 +1293,15 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 										_tmp96_ = _tmp95_.light_value;
 #line 155 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 										if (_tmp94_ == _tmp96_) {
-#line 1292 "CustomComponents.c"
-											gint _tmp97_ = 0;
+#line 1297 "CustomComponents.c"
+											gint _tmp97_;
 #line 156 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 											_tmp97_ = k;
 #line 156 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 											this_intensity = _tmp97_;
 #line 157 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 											break;
-#line 1300 "CustomComponents.c"
+#line 1305 "CustomComponents.c"
 										}
 									}
 								}
@@ -1361,7 +1366,7 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 							_tmp112_[_tmp113_ + 2] = _tmp117_;
 #line 162 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 							_tmp118_ = _tmp112_[_tmp113_ + 2];
-#line 1365 "CustomComponents.c"
+#line 1370 "CustomComponents.c"
 						}
 					}
 				}
@@ -1376,20 +1381,20 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 	_g_object_unref0 (colors);
 #line 166 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return result;
-#line 1380 "CustomComponents.c"
+#line 1385 "CustomComponents.c"
 }
 
 
 static gint theme_loader_hsv_pixel_compare_func (void* pixval1, void* pixval2) {
 	gint result = 0;
 	HSVAnalyticPixel pixel_val_1 = {0};
-	void* _tmp0_ = NULL;
+	void* _tmp0_;
 	HSVAnalyticPixel pixel_val_2 = {0};
-	void* _tmp1_ = NULL;
-	HSVAnalyticPixel _tmp2_ = {0};
-	gfloat _tmp3_ = 0.0F;
-	HSVAnalyticPixel _tmp4_ = {0};
-	gfloat _tmp5_ = 0.0F;
+	void* _tmp1_;
+	HSVAnalyticPixel _tmp2_;
+	gfloat _tmp3_;
+	HSVAnalyticPixel _tmp4_;
+	gfloat _tmp5_;
 #line 170 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp0_ = pixval1;
 #line 170 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -1410,15 +1415,15 @@ static gint theme_loader_hsv_pixel_compare_func (void* pixval1, void* pixval2) {
 	result = (gint) (255.0f * (_tmp3_ - _tmp5_));
 #line 173 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return result;
-#line 1414 "CustomComponents.c"
+#line 1419 "CustomComponents.c"
 }
 
 
 static gboolean theme_loader_rgb_pixel_equal_func (RGBAnalyticPixel* p1, RGBAnalyticPixel* p2) {
 	gboolean result = FALSE;
-	RGBAnalyticPixel* _tmp0_ = NULL;
-	RGBAnalyticPixel* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	RGBAnalyticPixel* _tmp0_;
+	RGBAnalyticPixel* _tmp1_;
+	gboolean _tmp2_;
 #line 177 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp0_ = p1;
 #line 177 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -1429,14 +1434,14 @@ static gboolean theme_loader_rgb_pixel_equal_func (RGBAnalyticPixel* p1, RGBAnal
 	result = _tmp2_;
 #line 177 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return result;
-#line 1433 "CustomComponents.c"
+#line 1438 "CustomComponents.c"
 }
 
 
 static guint theme_loader_rgb_pixel_hash_func (RGBAnalyticPixel* pixel_val) {
 	guint result = 0U;
-	RGBAnalyticPixel* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	RGBAnalyticPixel* _tmp0_;
+	guint _tmp1_;
 #line 181 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp0_ = pixel_val;
 #line 181 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -1445,7 +1450,7 @@ static guint theme_loader_rgb_pixel_hash_func (RGBAnalyticPixel* pixel_val) {
 	result = _tmp1_;
 #line 181 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return result;
-#line 1449 "CustomComponents.c"
+#line 1454 "CustomComponents.c"
 }
 
 
@@ -1455,20 +1460,20 @@ ThemeLoader* theme_loader_construct (GType object_type) {
 	self = (ThemeLoader*) g_type_create_instance (object_type);
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return self;
-#line 1459 "CustomComponents.c"
+#line 1464 "CustomComponents.c"
 }
 
 
 ThemeLoader* theme_loader_new (void) {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return theme_loader_construct (TYPE_THEME_LOADER);
-#line 1466 "CustomComponents.c"
+#line 1471 "CustomComponents.c"
 }
 
 
 static void theme_loader_lightweight_color_init (ThemeLoaderLightweightColor *self) {
-	guchar _tmp0_ = '\0';
-	guchar _tmp1_ = '\0';
+	guchar _tmp0_;
+	guchar _tmp1_;
 #line 15 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	memset (self, 0, sizeof (ThemeLoaderLightweightColor));
 #line 16 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -1481,7 +1486,7 @@ static void theme_loader_lightweight_color_init (ThemeLoaderLightweightColor *se
 	_tmp1_ = (*self).green;
 #line 16 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	(*self).red = _tmp1_;
-#line 1485 "CustomComponents.c"
+#line 1490 "CustomComponents.c"
 }
 
 
@@ -1493,14 +1498,14 @@ static ThemeLoaderLightweightColor* theme_loader_lightweight_color_dup (const Th
 	memcpy (dup, self, sizeof (ThemeLoaderLightweightColor));
 #line 10 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return dup;
-#line 1497 "CustomComponents.c"
+#line 1502 "CustomComponents.c"
 }
 
 
 static void theme_loader_lightweight_color_free (ThemeLoaderLightweightColor* self) {
 #line 10 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_free (self);
-#line 1504 "CustomComponents.c"
+#line 1509 "CustomComponents.c"
 }
 
 
@@ -1518,7 +1523,7 @@ static GType theme_loader_lightweight_color_get_type (void) {
 static void value_theme_loader_init (GValue* value) {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	value->data[0].v_pointer = NULL;
-#line 1522 "CustomComponents.c"
+#line 1527 "CustomComponents.c"
 }
 
 
@@ -1527,7 +1532,7 @@ static void value_theme_loader_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		theme_loader_unref (value->data[0].v_pointer);
-#line 1531 "CustomComponents.c"
+#line 1536 "CustomComponents.c"
 	}
 }
 
@@ -1537,11 +1542,11 @@ static void value_theme_loader_copy_value (const GValue* src_value, GValue* dest
 	if (src_value->data[0].v_pointer) {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		dest_value->data[0].v_pointer = theme_loader_ref (src_value->data[0].v_pointer);
-#line 1541 "CustomComponents.c"
+#line 1546 "CustomComponents.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1545 "CustomComponents.c"
+#line 1550 "CustomComponents.c"
 	}
 }
 
@@ -1549,66 +1554,66 @@ static void value_theme_loader_copy_value (const GValue* src_value, GValue* dest
 static gpointer value_theme_loader_peek_pointer (const GValue* value) {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return value->data[0].v_pointer;
-#line 1553 "CustomComponents.c"
+#line 1558 "CustomComponents.c"
 }
 
 
 static gchar* value_theme_loader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (collect_values[0].v_pointer) {
-#line 1560 "CustomComponents.c"
-		ThemeLoader* object;
+#line 1565 "CustomComponents.c"
+		ThemeLoader * object;
 		object = collect_values[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1567 "CustomComponents.c"
+#line 1572 "CustomComponents.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1571 "CustomComponents.c"
+#line 1576 "CustomComponents.c"
 		}
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		value->data[0].v_pointer = theme_loader_ref (object);
-#line 1575 "CustomComponents.c"
+#line 1580 "CustomComponents.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		value->data[0].v_pointer = NULL;
-#line 1579 "CustomComponents.c"
+#line 1584 "CustomComponents.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return NULL;
-#line 1583 "CustomComponents.c"
+#line 1588 "CustomComponents.c"
 }
 
 
 static gchar* value_theme_loader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	ThemeLoader** object_p;
+	ThemeLoader ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (!object_p) {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1594 "CustomComponents.c"
+#line 1599 "CustomComponents.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (!value->data[0].v_pointer) {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		*object_p = NULL;
-#line 1600 "CustomComponents.c"
+#line 1605 "CustomComponents.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1604 "CustomComponents.c"
+#line 1609 "CustomComponents.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		*object_p = theme_loader_ref (value->data[0].v_pointer);
-#line 1608 "CustomComponents.c"
+#line 1613 "CustomComponents.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return NULL;
-#line 1612 "CustomComponents.c"
+#line 1617 "CustomComponents.c"
 }
 
 
@@ -1622,7 +1627,7 @@ GParamSpec* param_spec_theme_loader (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return G_PARAM_SPEC (spec);
-#line 1626 "CustomComponents.c"
+#line 1631 "CustomComponents.c"
 }
 
 
@@ -1631,12 +1636,12 @@ gpointer value_get_theme_loader (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_THEME_LOADER), NULL);
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return value->data[0].v_pointer;
-#line 1635 "CustomComponents.c"
+#line 1640 "CustomComponents.c"
 }
 
 
 void value_set_theme_loader (GValue* value, gpointer v_object) {
-	ThemeLoader* old;
+	ThemeLoader * old;
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_THEME_LOADER));
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -1651,23 +1656,23 @@ void value_set_theme_loader (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		theme_loader_ref (value->data[0].v_pointer);
-#line 1655 "CustomComponents.c"
+#line 1660 "CustomComponents.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		value->data[0].v_pointer = NULL;
-#line 1659 "CustomComponents.c"
+#line 1664 "CustomComponents.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (old) {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		theme_loader_unref (old);
-#line 1665 "CustomComponents.c"
+#line 1670 "CustomComponents.c"
 	}
 }
 
 
 void value_take_theme_loader (GValue* value, gpointer v_object) {
-	ThemeLoader* old;
+	ThemeLoader * old;
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_THEME_LOADER));
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -1680,17 +1685,17 @@ void value_take_theme_loader (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		value->data[0].v_pointer = v_object;
-#line 1684 "CustomComponents.c"
+#line 1689 "CustomComponents.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		value->data[0].v_pointer = NULL;
-#line 1688 "CustomComponents.c"
+#line 1693 "CustomComponents.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (old) {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		theme_loader_unref (old);
-#line 1694 "CustomComponents.c"
+#line 1699 "CustomComponents.c"
 	}
 }
 
@@ -1700,24 +1705,24 @@ static void theme_loader_class_init (ThemeLoaderClass * klass) {
 	theme_loader_parent_class = g_type_class_peek_parent (klass);
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	((ThemeLoaderClass *) klass)->finalize = theme_loader_finalize;
-#line 1704 "CustomComponents.c"
+#line 1709 "CustomComponents.c"
 }
 
 
 static void theme_loader_instance_init (ThemeLoader * self) {
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	self->ref_count = 1;
-#line 1711 "CustomComponents.c"
+#line 1716 "CustomComponents.c"
 }
 
 
-static void theme_loader_finalize (ThemeLoader* obj) {
+static void theme_loader_finalize (ThemeLoader * obj) {
 	ThemeLoader * self;
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_THEME_LOADER, ThemeLoader);
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_signal_handlers_destroy (self);
-#line 1721 "CustomComponents.c"
+#line 1726 "CustomComponents.c"
 }
 
 
@@ -1736,18 +1741,18 @@ GType theme_loader_get_type (void) {
 
 
 gpointer theme_loader_ref (gpointer instance) {
-	ThemeLoader* self;
+	ThemeLoader * self;
 	self = instance;
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return instance;
-#line 1746 "CustomComponents.c"
+#line 1751 "CustomComponents.c"
 }
 
 
 void theme_loader_unref (gpointer instance) {
-	ThemeLoader* self;
+	ThemeLoader * self;
 	self = instance;
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1755,7 +1760,7 @@ void theme_loader_unref (gpointer instance) {
 		THEME_LOADER_GET_CLASS (self)->finalize (self);
 #line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1759 "CustomComponents.c"
+#line 1764 "CustomComponents.c"
 	}
 }
 
@@ -1777,7 +1782,7 @@ static gboolean _rgb_histogram_manipulator_on_button_press_gtk_widget_button_pre
 	result = rgb_histogram_manipulator_on_button_press ((RGBHistogramManipulator*) self, event);
 #line 240 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return result;
-#line 1781 "CustomComponents.c"
+#line 1786 "CustomComponents.c"
 }
 
 
@@ -1786,7 +1791,7 @@ static gboolean _rgb_histogram_manipulator_on_button_release_gtk_widget_button_r
 	result = rgb_histogram_manipulator_on_button_release ((RGBHistogramManipulator*) self, event);
 #line 241 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return result;
-#line 1790 "CustomComponents.c"
+#line 1795 "CustomComponents.c"
 }
 
 
@@ -1795,15 +1800,15 @@ static gboolean _rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_no
 	result = rgb_histogram_manipulator_on_button_motion ((RGBHistogramManipulator*) self, event);
 #line 242 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return result;
-#line 1799 "CustomComponents.c"
+#line 1804 "CustomComponents.c"
 }
 
 
 RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type) {
 	RGBHistogramManipulator * self = NULL;
-	GtkWidget* _tmp0_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GtkWidget* _tmp0_;
+	GtkWidget* _tmp2_;
+	gboolean _tmp4_;
 #line 216 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	self = (RGBHistogramManipulator*) g_object_new (object_type, NULL);
 #line 217 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -1812,8 +1817,8 @@ RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type)
 	_tmp0_ = rgb_histogram_manipulator_dummy_slider;
 #line 219 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (_tmp0_ == NULL) {
-#line 1816 "CustomComponents.c"
-		GtkScale* _tmp1_ = NULL;
+#line 1821 "CustomComponents.c"
+		GtkScale* _tmp1_;
 #line 220 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp1_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, NULL);
 #line 220 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -1822,14 +1827,14 @@ RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type)
 		_g_object_unref0 (rgb_histogram_manipulator_dummy_slider);
 #line 220 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		rgb_histogram_manipulator_dummy_slider = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget);
-#line 1826 "CustomComponents.c"
+#line 1831 "CustomComponents.c"
 	}
 #line 222 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp2_ = rgb_histogram_manipulator_dummy_frame;
 #line 222 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (_tmp2_ == NULL) {
-#line 1832 "CustomComponents.c"
-		GtkFrame* _tmp3_ = NULL;
+#line 1837 "CustomComponents.c"
+		GtkFrame* _tmp3_;
 #line 223 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp3_ = (GtkFrame*) gtk_frame_new (NULL);
 #line 223 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -1838,18 +1843,18 @@ RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type)
 		_g_object_unref0 (rgb_histogram_manipulator_dummy_frame);
 #line 223 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		rgb_histogram_manipulator_dummy_frame = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget);
-#line 1842 "CustomComponents.c"
+#line 1847 "CustomComponents.c"
 	}
 #line 225 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp4_ = rgb_histogram_manipulator_paths_setup;
 #line 225 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (!_tmp4_) {
-#line 1848 "CustomComponents.c"
-		GtkWidgetPath* _tmp5_ = NULL;
-		GtkWidgetPath* _tmp6_ = NULL;
-		GtkWidgetPath* _tmp7_ = NULL;
-		GtkWidgetPath* _tmp8_ = NULL;
-		GtkWidgetPath* _tmp9_ = NULL;
+#line 1853 "CustomComponents.c"
+		GtkWidgetPath* _tmp5_;
+		GtkWidgetPath* _tmp6_;
+		GtkWidgetPath* _tmp7_;
+		GtkWidgetPath* _tmp8_;
+		GtkWidgetPath* _tmp9_;
 #line 226 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp5_ = rgb_histogram_manipulator_slider_draw_path;
 #line 226 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -1872,7 +1877,7 @@ RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type)
 		gtk_widget_path_iter_add_class (_tmp9_, 0, "default");
 #line 233 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		rgb_histogram_manipulator_paths_setup = TRUE;
-#line 1876 "CustomComponents.c"
+#line 1881 "CustomComponents.c"
 	}
 #line 236 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_BUTTON_PRESS_MASK);
@@ -1888,35 +1893,35 @@ RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type)
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "motion-notify-event", (GCallback) _rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event, self, 0);
 #line 216 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return self;
-#line 1892 "CustomComponents.c"
+#line 1897 "CustomComponents.c"
 }
 
 
 RGBHistogramManipulator* rgb_histogram_manipulator_new (void) {
 #line 216 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return rgb_histogram_manipulator_construct (TYPE_RGB_HISTOGRAM_MANIPULATOR);
-#line 1899 "CustomComponents.c"
+#line 1904 "CustomComponents.c"
 }
 
 
 static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_point (RGBHistogramManipulator* self, gint x, gint y) {
 	RGBHistogramManipulatorLocationCode result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	gboolean _tmp6_ = FALSE;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	gint _tmp7_;
+	gint _tmp8_;
+	gint _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 #line 245 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), 0);
 #line 246 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -1927,7 +1932,7 @@ static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_po
 		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA;
 #line 247 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		return result;
-#line 1931 "CustomComponents.c"
+#line 1936 "CustomComponents.c"
 	}
 #line 249 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp2_ = x;
@@ -1935,20 +1940,20 @@ static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_po
 	_tmp3_ = self->priv->left_nub_position;
 #line 249 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (_tmp2_ > _tmp3_) {
-#line 1939 "CustomComponents.c"
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+#line 1944 "CustomComponents.c"
+		gint _tmp4_;
+		gint _tmp5_;
 #line 249 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp4_ = x;
 #line 249 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp5_ = self->priv->left_nub_position;
 #line 249 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp1_ = _tmp4_ < (_tmp5_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE);
-#line 1948 "CustomComponents.c"
+#line 1953 "CustomComponents.c"
 	} else {
 #line 249 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp1_ = FALSE;
-#line 1952 "CustomComponents.c"
+#line 1957 "CustomComponents.c"
 	}
 #line 249 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (_tmp1_) {
@@ -1956,7 +1961,7 @@ static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_po
 		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB;
 #line 250 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		return result;
-#line 1960 "CustomComponents.c"
+#line 1965 "CustomComponents.c"
 	}
 #line 252 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp7_ = x;
@@ -1964,20 +1969,20 @@ static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_po
 	_tmp8_ = self->priv->right_nub_position;
 #line 252 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (_tmp7_ > _tmp8_) {
-#line 1968 "CustomComponents.c"
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
+#line 1973 "CustomComponents.c"
+		gint _tmp9_;
+		gint _tmp10_;
 #line 252 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp9_ = x;
 #line 252 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp10_ = self->priv->right_nub_position;
 #line 252 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp6_ = _tmp9_ < (_tmp10_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE);
-#line 1977 "CustomComponents.c"
+#line 1982 "CustomComponents.c"
 	} else {
 #line 252 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp6_ = FALSE;
-#line 1981 "CustomComponents.c"
+#line 1986 "CustomComponents.c"
 	}
 #line 252 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (_tmp6_) {
@@ -1985,7 +1990,7 @@ static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_po
 		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB;
 #line 253 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		return result;
-#line 1989 "CustomComponents.c"
+#line 1994 "CustomComponents.c"
 	}
 #line 255 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp11_ = y;
@@ -1995,7 +2000,7 @@ static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_po
 		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA;
 #line 256 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		return result;
-#line 1999 "CustomComponents.c"
+#line 2004 "CustomComponents.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp12_ = x;
@@ -2019,13 +2024,13 @@ static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_po
 		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH;
 #line 260 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		return result;
-#line 2023 "CustomComponents.c"
+#line 2028 "CustomComponents.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH;
 #line 262 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		return result;
-#line 2029 "CustomComponents.c"
+#line 2034 "CustomComponents.c"
 	}
 }
 
@@ -2033,12 +2038,12 @@ static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_po
 static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulator* self, GdkEventButton* event_record) {
 	gboolean result = FALSE;
 	RGBHistogramManipulatorLocationCode loc = 0;
-	GdkEventButton* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	GdkEventButton* _tmp2_ = NULL;
-	gdouble _tmp3_ = 0.0;
-	RGBHistogramManipulatorLocationCode _tmp4_ = 0;
-	RGBHistogramManipulatorLocationCode _tmp5_ = 0;
+	GdkEventButton* _tmp0_;
+	gdouble _tmp1_;
+	GdkEventButton* _tmp2_;
+	gdouble _tmp3_;
+	RGBHistogramManipulatorLocationCode _tmp4_;
+	RGBHistogramManipulatorLocationCode _tmp5_;
 #line 265 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), FALSE);
 #line 265 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -2061,11 +2066,11 @@ static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulat
 	switch (_tmp5_) {
 #line 268 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB:
-#line 2065 "CustomComponents.c"
+#line 2070 "CustomComponents.c"
 		{
-			GdkEventButton* _tmp6_ = NULL;
-			gdouble _tmp7_ = 0.0;
-			gint _tmp8_ = 0;
+			GdkEventButton* _tmp6_;
+			gdouble _tmp7_;
+			gint _tmp8_;
 #line 270 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			_tmp6_ = event_record;
 #line 270 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -2082,15 +2087,15 @@ static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulat
 			result = TRUE;
 #line 273 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			return result;
-#line 2086 "CustomComponents.c"
+#line 2091 "CustomComponents.c"
 		}
 #line 268 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB:
-#line 2090 "CustomComponents.c"
+#line 2095 "CustomComponents.c"
 		{
-			GdkEventButton* _tmp9_ = NULL;
-			gdouble _tmp10_ = 0.0;
-			gint _tmp11_ = 0;
+			GdkEventButton* _tmp9_;
+			gdouble _tmp10_;
+			gint _tmp11_;
 #line 276 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			_tmp9_ = event_record;
 #line 276 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -2107,17 +2112,17 @@ static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulat
 			result = TRUE;
 #line 279 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			return result;
-#line 2111 "CustomComponents.c"
+#line 2116 "CustomComponents.c"
 		}
 #line 268 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH:
-#line 2115 "CustomComponents.c"
+#line 2120 "CustomComponents.c"
 		{
-			GdkEventButton* _tmp12_ = NULL;
-			gdouble _tmp13_ = 0.0;
-			gint _tmp14_ = 0;
-			gint _tmp15_ = 0;
-			gint _tmp16_ = 0;
+			GdkEventButton* _tmp12_;
+			gdouble _tmp13_;
+			gint _tmp14_;
+			gint _tmp15_;
+			gint _tmp16_;
 #line 282 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			_tmp12_ = event_record;
 #line 282 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -2135,24 +2140,24 @@ static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulat
 #line 284 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			rgb_histogram_manipulator_force_update (self);
 #line 285 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			g_signal_emit_by_name (self, "nub-position-changed");
+			g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0);
 #line 286 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			rgb_histogram_manipulator_update_nub_extrema (self);
 #line 287 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			result = TRUE;
 #line 287 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			return result;
-#line 2146 "CustomComponents.c"
+#line 2151 "CustomComponents.c"
 		}
 #line 268 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH:
-#line 2150 "CustomComponents.c"
+#line 2155 "CustomComponents.c"
 		{
-			GdkEventButton* _tmp17_ = NULL;
-			gdouble _tmp18_ = 0.0;
-			gint _tmp19_ = 0;
-			gint _tmp20_ = 0;
-			gint _tmp21_ = 0;
+			GdkEventButton* _tmp17_;
+			gdouble _tmp18_;
+			gint _tmp19_;
+			gint _tmp20_;
+			gint _tmp21_;
 #line 290 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			_tmp17_ = event_record;
 #line 290 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -2170,14 +2175,14 @@ static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulat
 #line 292 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			rgb_histogram_manipulator_force_update (self);
 #line 293 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			g_signal_emit_by_name (self, "nub-position-changed");
+			g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0);
 #line 294 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			rgb_histogram_manipulator_update_nub_extrema (self);
 #line 295 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			result = TRUE;
 #line 295 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			return result;
-#line 2181 "CustomComponents.c"
+#line 2186 "CustomComponents.c"
 		}
 		default:
 		{
@@ -2185,7 +2190,7 @@ static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulat
 			result = FALSE;
 #line 298 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			return result;
-#line 2189 "CustomComponents.c"
+#line 2194 "CustomComponents.c"
 		}
 	}
 }
@@ -2194,7 +2199,7 @@ static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulat
 static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipulator* self, GdkEventButton* event_record) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 302 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), FALSE);
 #line 302 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -2205,22 +2210,22 @@ static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipul
 	if (_tmp1_) {
 #line 303 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp0_ = TRUE;
-#line 2209 "CustomComponents.c"
+#line 2214 "CustomComponents.c"
 	} else {
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 303 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp2_ = self->priv->is_right_nub_tracking;
 #line 303 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp0_ = _tmp2_;
-#line 2216 "CustomComponents.c"
+#line 2221 "CustomComponents.c"
 	}
 #line 303 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (_tmp0_) {
 #line 304 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		g_signal_emit_by_name (self, "nub-position-changed");
+		g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0);
 #line 305 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		rgb_histogram_manipulator_update_nub_extrema (self);
-#line 2224 "CustomComponents.c"
+#line 2229 "CustomComponents.c"
 	}
 #line 308 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	self->priv->is_left_nub_tracking = FALSE;
@@ -2230,15 +2235,15 @@ static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipul
 	result = FALSE;
 #line 311 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return result;
-#line 2234 "CustomComponents.c"
+#line 2239 "CustomComponents.c"
 }
 
 
 static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipulator* self, GdkEventMotion* event_record) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp1_;
+	gboolean _tmp3_;
 #line 314 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), FALSE);
 #line 314 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -2247,17 +2252,17 @@ static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipula
 	_tmp1_ = self->priv->is_left_nub_tracking;
 #line 315 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (!_tmp1_) {
-#line 2251 "CustomComponents.c"
-		gboolean _tmp2_ = FALSE;
+#line 2256 "CustomComponents.c"
+		gboolean _tmp2_;
 #line 315 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp2_ = self->priv->is_right_nub_tracking;
 #line 315 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp0_ = !_tmp2_;
-#line 2257 "CustomComponents.c"
+#line 2262 "CustomComponents.c"
 	} else {
 #line 315 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp0_ = FALSE;
-#line 2261 "CustomComponents.c"
+#line 2266 "CustomComponents.c"
 	}
 #line 315 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (_tmp0_) {
@@ -2265,22 +2270,22 @@ static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipula
 		result = FALSE;
 #line 316 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		return result;
-#line 2269 "CustomComponents.c"
+#line 2274 "CustomComponents.c"
 	}
 #line 318 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp3_ = self->priv->is_left_nub_tracking;
 #line 318 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (_tmp3_) {
-#line 2275 "CustomComponents.c"
+#line 2280 "CustomComponents.c"
 		gint track_x_delta = 0;
-		GdkEventMotion* _tmp4_ = NULL;
-		gdouble _tmp5_ = 0.0;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
+		GdkEventMotion* _tmp4_;
+		gdouble _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
 #line 319 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp4_ = event_record;
 #line 319 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -2303,17 +2308,17 @@ static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipula
 		_tmp11_ = CLAMP (_tmp9_, 0, _tmp10_);
 #line 321 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		self->priv->left_nub_position = _tmp11_;
-#line 2307 "CustomComponents.c"
+#line 2312 "CustomComponents.c"
 	} else {
 		gint track_x_delta = 0;
-		GdkEventMotion* _tmp12_ = NULL;
-		gdouble _tmp13_ = 0.0;
-		gint _tmp14_ = 0;
-		gint _tmp15_ = 0;
-		gint _tmp16_ = 0;
-		gint _tmp17_ = 0;
-		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
+		GdkEventMotion* _tmp12_;
+		gdouble _tmp13_;
+		gint _tmp14_;
+		gint _tmp15_;
+		gint _tmp16_;
+		gint _tmp17_;
+		gint _tmp18_;
+		gint _tmp19_;
 #line 323 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp12_ = event_record;
 #line 323 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -2336,7 +2341,7 @@ static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipula
 		_tmp19_ = CLAMP (_tmp17_, _tmp18_, 255);
 #line 325 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		self->priv->right_nub_position = _tmp19_;
-#line 2340 "CustomComponents.c"
+#line 2345 "CustomComponents.c"
 	}
 #line 328 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	rgb_histogram_manipulator_force_update (self);
@@ -2344,7 +2349,7 @@ static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipula
 	result = TRUE;
 #line 329 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return result;
-#line 2348 "CustomComponents.c"
+#line 2353 "CustomComponents.c"
 }
 
 
@@ -2352,29 +2357,29 @@ static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base, cairo_t* c
 	RGBHistogramManipulator * self;
 	gboolean result = FALSE;
 	GtkBorder padding = {0};
-	GtkStyleContext* _tmp0_ = NULL;
+	GtkStyleContext* _tmp0_;
 	GtkBorder _tmp1_ = {0};
 	GdkRectangle area = {0};
-	GtkBorder _tmp2_ = {0};
-	gint16 _tmp3_ = 0;
-	GtkBorder _tmp4_ = {0};
-	gint16 _tmp5_ = 0;
-	GtkBorder _tmp6_ = {0};
-	gint16 _tmp7_ = 0;
-	GtkBorder _tmp8_ = {0};
-	gint16 _tmp9_ = 0;
-	cairo_t* _tmp10_ = NULL;
-	GdkRectangle _tmp11_ = {0};
-	cairo_t* _tmp12_ = NULL;
-	GdkRectangle _tmp13_ = {0};
-	cairo_t* _tmp14_ = NULL;
-	GdkRectangle _tmp15_ = {0};
-	cairo_t* _tmp16_ = NULL;
-	GdkRectangle _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	cairo_t* _tmp19_ = NULL;
-	GdkRectangle _tmp20_ = {0};
-	gint _tmp21_ = 0;
+	GtkBorder _tmp2_;
+	gint16 _tmp3_;
+	GtkBorder _tmp4_;
+	gint16 _tmp5_;
+	GtkBorder _tmp6_;
+	gint16 _tmp7_;
+	GtkBorder _tmp8_;
+	gint16 _tmp9_;
+	cairo_t* _tmp10_;
+	GdkRectangle _tmp11_;
+	cairo_t* _tmp12_;
+	GdkRectangle _tmp13_;
+	cairo_t* _tmp14_;
+	GdkRectangle _tmp15_;
+	cairo_t* _tmp16_;
+	GdkRectangle _tmp17_;
+	gint _tmp18_;
+	cairo_t* _tmp19_;
+	GdkRectangle _tmp20_;
+	gint _tmp21_;
 #line 332 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator);
 #line 332 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -2449,32 +2454,32 @@ static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base, cairo_t* c
 	result = TRUE;
 #line 347 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return result;
-#line 2453 "CustomComponents.c"
+#line 2458 "CustomComponents.c"
 }
 
 
 static void rgb_histogram_manipulator_draw_histogram_frame (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area) {
 	GdkRectangle framed_area = {0};
-	GdkRectangle _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	GdkRectangle _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	GtkStyleContext* stylectx = NULL;
-	GtkWidget* _tmp5_ = NULL;
-	GtkStyleContext* _tmp6_ = NULL;
-	GtkStyleContext* _tmp7_ = NULL;
-	GtkWidgetPath* _tmp8_ = NULL;
-	GtkWidgetPath* _tmp9_ = NULL;
-	cairo_t* _tmp10_ = NULL;
-	GdkRectangle _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	GdkRectangle _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	GdkRectangle _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	GdkRectangle _tmp17_ = {0};
-	gint _tmp18_ = 0;
+	GtkWidget* _tmp5_;
+	GtkStyleContext* _tmp6_;
+	GtkStyleContext* _tmp7_;
+	GtkWidgetPath* _tmp8_;
+	GtkWidgetPath* _tmp9_;
+	cairo_t* _tmp10_;
+	GdkRectangle _tmp11_;
+	gint _tmp12_;
+	GdkRectangle _tmp13_;
+	gint _tmp14_;
+	GdkRectangle _tmp15_;
+	gint _tmp16_;
+	GdkRectangle _tmp17_;
+	gint _tmp18_;
 #line 350 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
 #line 350 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -2547,38 +2552,38 @@ static void rgb_histogram_manipulator_draw_histogram_frame (RGBHistogramManipula
 	gtk_style_context_restore (stylectx);
 #line 350 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_g_object_unref0 (stylectx);
-#line 2551 "CustomComponents.c"
+#line 2556 "CustomComponents.c"
 }
 
 
 static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area) {
-	RGBHistogram* _tmp0_ = NULL;
+	RGBHistogram* _tmp0_;
 	GdkPixbuf* histogram_graphic = NULL;
-	RGBHistogram* _tmp1_ = NULL;
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
+	RGBHistogram* _tmp1_;
+	GdkPixbuf* _tmp2_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
+	GdkPixbuf* _tmp5_;
 	guchar* pixel_data = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
-	guint8* _tmp7_ = NULL;
-	gint pixel_data_length1 = 0;
-	gint _pixel_data_size_ = 0;
+	GdkPixbuf* _tmp6_;
+	guint8* _tmp7_;
+	gint pixel_data_length1;
+	gint _pixel_data_size_;
 	gint edge_blend_red = 0;
 	gint edge_blend_green = 0;
 	gint edge_blend_blue = 0;
 	gint body_blend_red = 0;
 	gint body_blend_green = 0;
 	gint body_blend_blue = 0;
-	gint _tmp8_ = 0;
-	gint _tmp80_ = 0;
-	cairo_t* _tmp158_ = NULL;
-	GdkPixbuf* _tmp159_ = NULL;
-	GdkRectangle _tmp160_ = {0};
-	gint _tmp161_ = 0;
-	GdkRectangle _tmp162_ = {0};
-	gint _tmp163_ = 0;
-	cairo_t* _tmp164_ = NULL;
+	gint _tmp8_;
+	gint _tmp80_;
+	cairo_t* _tmp158_;
+	GdkPixbuf* _tmp159_;
+	GdkRectangle _tmp160_;
+	gint _tmp161_;
+	GdkRectangle _tmp162_;
+	gint _tmp163_;
+	cairo_t* _tmp164_;
 #line 374 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
 #line 374 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -2591,7 +2596,7 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 	if (_tmp0_ == NULL) {
 #line 376 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		return;
-#line 2595 "CustomComponents.c"
+#line 2600 "CustomComponents.c"
 	}
 #line 378 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp1_ = self->priv->histogram;
@@ -2633,12 +2638,12 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 	_tmp8_ = self->priv->left_nub_position;
 #line 388 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (_tmp8_ > 0) {
-#line 2637 "CustomComponents.c"
+#line 2642 "CustomComponents.c"
 		gint edge_pixel_index = 0;
-		GdkPixbuf* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
+		GdkPixbuf* _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
 #line 389 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp9_ = histogram_graphic;
 #line 389 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -2649,74 +2654,74 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 		_tmp12_ = self->priv->left_nub_position;
 #line 389 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		edge_pixel_index = _tmp11_ * _tmp12_;
-#line 2653 "CustomComponents.c"
+#line 2658 "CustomComponents.c"
 		{
 			gint i = 0;
 #line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			i = 0;
-#line 2658 "CustomComponents.c"
+#line 2663 "CustomComponents.c"
 			{
 				gboolean _tmp13_ = FALSE;
 #line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 				_tmp13_ = TRUE;
 #line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 				while (TRUE) {
-#line 2665 "CustomComponents.c"
-					gint _tmp15_ = 0;
-					GdkPixbuf* _tmp16_ = NULL;
-					gint _tmp17_ = 0;
-					gint _tmp18_ = 0;
+#line 2670 "CustomComponents.c"
+					gint _tmp15_;
+					GdkPixbuf* _tmp16_;
+					gint _tmp17_;
+					gint _tmp18_;
 					gint body_pixel_index = 0;
-					gint _tmp19_ = 0;
-					GdkPixbuf* _tmp20_ = NULL;
-					gint _tmp21_ = 0;
-					gint _tmp22_ = 0;
+					gint _tmp19_;
+					GdkPixbuf* _tmp20_;
+					gint _tmp21_;
+					gint _tmp22_;
 					gint row_last_pixel = 0;
-					gint _tmp23_ = 0;
-					GdkPixbuf* _tmp24_ = NULL;
-					gint _tmp25_ = 0;
-					gint _tmp26_ = 0;
-					gint _tmp27_ = 0;
-					guchar* _tmp55_ = NULL;
-					gint _tmp55__length1 = 0;
-					gint _tmp56_ = 0;
-					guchar* _tmp57_ = NULL;
-					gint _tmp57__length1 = 0;
-					gint _tmp58_ = 0;
-					guchar _tmp59_ = '\0';
-					gint _tmp60_ = 0;
-					guchar _tmp61_ = '\0';
-					guchar* _tmp62_ = NULL;
-					gint _tmp62__length1 = 0;
-					gint _tmp63_ = 0;
-					guchar* _tmp64_ = NULL;
-					gint _tmp64__length1 = 0;
-					gint _tmp65_ = 0;
-					guchar _tmp66_ = '\0';
-					gint _tmp67_ = 0;
-					guchar _tmp68_ = '\0';
-					guchar* _tmp69_ = NULL;
-					gint _tmp69__length1 = 0;
-					gint _tmp70_ = 0;
-					guchar* _tmp71_ = NULL;
-					gint _tmp71__length1 = 0;
-					gint _tmp72_ = 0;
-					guchar _tmp73_ = '\0';
-					gint _tmp74_ = 0;
-					guchar _tmp75_ = '\0';
-					gint _tmp76_ = 0;
-					GdkPixbuf* _tmp77_ = NULL;
-					gint _tmp78_ = 0;
-					gint _tmp79_ = 0;
+					gint _tmp23_;
+					GdkPixbuf* _tmp24_;
+					gint _tmp25_;
+					gint _tmp26_;
+					gint _tmp27_;
+					guchar* _tmp55_;
+					gint _tmp55__length1;
+					gint _tmp56_;
+					guchar* _tmp57_;
+					gint _tmp57__length1;
+					gint _tmp58_;
+					guchar _tmp59_;
+					gint _tmp60_;
+					guchar _tmp61_;
+					guchar* _tmp62_;
+					gint _tmp62__length1;
+					gint _tmp63_;
+					guchar* _tmp64_;
+					gint _tmp64__length1;
+					gint _tmp65_;
+					guchar _tmp66_;
+					gint _tmp67_;
+					guchar _tmp68_;
+					guchar* _tmp69_;
+					gint _tmp69__length1;
+					gint _tmp70_;
+					guchar* _tmp71_;
+					gint _tmp71__length1;
+					gint _tmp72_;
+					guchar _tmp73_;
+					gint _tmp74_;
+					guchar _tmp75_;
+					gint _tmp76_;
+					GdkPixbuf* _tmp77_;
+					gint _tmp78_;
+					gint _tmp79_;
 #line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					if (!_tmp13_) {
-#line 2714 "CustomComponents.c"
-						gint _tmp14_ = 0;
+#line 2719 "CustomComponents.c"
+						gint _tmp14_;
 #line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 						_tmp14_ = i;
 #line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 						i = _tmp14_ + 1;
-#line 2720 "CustomComponents.c"
+#line 2725 "CustomComponents.c"
 					}
 #line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					_tmp13_ = FALSE;
@@ -2732,7 +2737,7 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 					if (!(_tmp15_ < _tmp18_)) {
 #line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 						break;
-#line 2736 "CustomComponents.c"
+#line 2741 "CustomComponents.c"
 					}
 #line 391 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					_tmp19_ = i;
@@ -2758,40 +2763,40 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 					row_last_pixel = _tmp23_ + (_tmp26_ * _tmp27_);
 #line 394 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					while (TRUE) {
-#line 2762 "CustomComponents.c"
-						gint _tmp28_ = 0;
-						gint _tmp29_ = 0;
-						guchar* _tmp30_ = NULL;
-						gint _tmp30__length1 = 0;
-						gint _tmp31_ = 0;
-						guchar* _tmp32_ = NULL;
-						gint _tmp32__length1 = 0;
-						gint _tmp33_ = 0;
-						guchar _tmp34_ = '\0';
-						gint _tmp35_ = 0;
-						guchar _tmp36_ = '\0';
-						guchar* _tmp37_ = NULL;
-						gint _tmp37__length1 = 0;
-						gint _tmp38_ = 0;
-						guchar* _tmp39_ = NULL;
-						gint _tmp39__length1 = 0;
-						gint _tmp40_ = 0;
-						guchar _tmp41_ = '\0';
-						gint _tmp42_ = 0;
-						guchar _tmp43_ = '\0';
-						guchar* _tmp44_ = NULL;
-						gint _tmp44__length1 = 0;
-						gint _tmp45_ = 0;
-						guchar* _tmp46_ = NULL;
-						gint _tmp46__length1 = 0;
-						gint _tmp47_ = 0;
-						guchar _tmp48_ = '\0';
-						gint _tmp49_ = 0;
-						guchar _tmp50_ = '\0';
-						gint _tmp51_ = 0;
-						GdkPixbuf* _tmp52_ = NULL;
-						gint _tmp53_ = 0;
-						gint _tmp54_ = 0;
+#line 2767 "CustomComponents.c"
+						gint _tmp28_;
+						gint _tmp29_;
+						guchar* _tmp30_;
+						gint _tmp30__length1;
+						gint _tmp31_;
+						guchar* _tmp32_;
+						gint _tmp32__length1;
+						gint _tmp33_;
+						guchar _tmp34_;
+						gint _tmp35_;
+						guchar _tmp36_;
+						guchar* _tmp37_;
+						gint _tmp37__length1;
+						gint _tmp38_;
+						guchar* _tmp39_;
+						gint _tmp39__length1;
+						gint _tmp40_;
+						guchar _tmp41_;
+						gint _tmp42_;
+						guchar _tmp43_;
+						guchar* _tmp44_;
+						gint _tmp44__length1;
+						gint _tmp45_;
+						guchar* _tmp46_;
+						gint _tmp46__length1;
+						gint _tmp47_;
+						guchar _tmp48_;
+						gint _tmp49_;
+						guchar _tmp50_;
+						gint _tmp51_;
+						GdkPixbuf* _tmp52_;
+						gint _tmp53_;
+						gint _tmp54_;
 #line 394 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 						_tmp28_ = body_pixel_index;
 #line 394 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -2800,7 +2805,7 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 						if (!(_tmp28_ < _tmp29_)) {
 #line 394 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 							break;
-#line 2804 "CustomComponents.c"
+#line 2809 "CustomComponents.c"
 						}
 #line 395 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 						_tmp30_ = pixel_data;
@@ -2872,7 +2877,7 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 						_tmp54_ = _tmp53_;
 #line 402 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 						body_pixel_index = _tmp51_ + _tmp54_;
-#line 2876 "CustomComponents.c"
+#line 2881 "CustomComponents.c"
 					}
 #line 405 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					_tmp55_ = pixel_data;
@@ -2944,7 +2949,7 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 					_tmp79_ = _tmp78_;
 #line 412 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					edge_pixel_index = _tmp76_ + _tmp79_;
-#line 2948 "CustomComponents.c"
+#line 2953 "CustomComponents.c"
 				}
 			}
 		}
@@ -2965,12 +2970,12 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 	_tmp80_ = self->priv->right_nub_position;
 #line 423 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (_tmp80_ < 255) {
-#line 2969 "CustomComponents.c"
+#line 2974 "CustomComponents.c"
 		gint edge_pixel_index = 0;
-		GdkPixbuf* _tmp81_ = NULL;
-		gint _tmp82_ = 0;
-		gint _tmp83_ = 0;
-		gint _tmp84_ = 0;
+		GdkPixbuf* _tmp81_;
+		gint _tmp82_;
+		gint _tmp83_;
+		gint _tmp84_;
 #line 424 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp81_ = histogram_graphic;
 #line 424 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -2981,80 +2986,80 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 		_tmp84_ = self->priv->right_nub_position;
 #line 424 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		edge_pixel_index = _tmp83_ * _tmp84_;
-#line 2985 "CustomComponents.c"
+#line 2990 "CustomComponents.c"
 		{
 			gint i = 0;
 #line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 			i = 0;
-#line 2990 "CustomComponents.c"
+#line 2995 "CustomComponents.c"
 			{
 				gboolean _tmp85_ = FALSE;
 #line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 				_tmp85_ = TRUE;
 #line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 				while (TRUE) {
-#line 2997 "CustomComponents.c"
-					gint _tmp87_ = 0;
-					GdkPixbuf* _tmp88_ = NULL;
-					gint _tmp89_ = 0;
-					gint _tmp90_ = 0;
+#line 3002 "CustomComponents.c"
+					gint _tmp87_;
+					GdkPixbuf* _tmp88_;
+					gint _tmp89_;
+					gint _tmp90_;
 					gint body_pixel_index = 0;
-					gint _tmp91_ = 0;
-					GdkPixbuf* _tmp92_ = NULL;
-					gint _tmp93_ = 0;
-					gint _tmp94_ = 0;
-					GdkPixbuf* _tmp95_ = NULL;
-					gint _tmp96_ = 0;
-					gint _tmp97_ = 0;
+					gint _tmp91_;
+					GdkPixbuf* _tmp92_;
+					gint _tmp93_;
+					gint _tmp94_;
+					GdkPixbuf* _tmp95_;
+					gint _tmp96_;
+					gint _tmp97_;
 					gint row_last_pixel = 0;
-					gint _tmp98_ = 0;
-					GdkPixbuf* _tmp99_ = NULL;
-					gint _tmp100_ = 0;
-					gint _tmp101_ = 0;
-					GdkPixbuf* _tmp102_ = NULL;
-					gint _tmp103_ = 0;
-					gint _tmp104_ = 0;
-					gint _tmp105_ = 0;
-					guchar* _tmp133_ = NULL;
-					gint _tmp133__length1 = 0;
-					gint _tmp134_ = 0;
-					guchar* _tmp135_ = NULL;
-					gint _tmp135__length1 = 0;
-					gint _tmp136_ = 0;
-					guchar _tmp137_ = '\0';
-					gint _tmp138_ = 0;
-					guchar _tmp139_ = '\0';
-					guchar* _tmp140_ = NULL;
-					gint _tmp140__length1 = 0;
-					gint _tmp141_ = 0;
-					guchar* _tmp142_ = NULL;
-					gint _tmp142__length1 = 0;
-					gint _tmp143_ = 0;
-					guchar _tmp144_ = '\0';
-					gint _tmp145_ = 0;
-					guchar _tmp146_ = '\0';
-					guchar* _tmp147_ = NULL;
-					gint _tmp147__length1 = 0;
-					gint _tmp148_ = 0;
-					guchar* _tmp149_ = NULL;
-					gint _tmp149__length1 = 0;
-					gint _tmp150_ = 0;
-					guchar _tmp151_ = '\0';
-					gint _tmp152_ = 0;
-					guchar _tmp153_ = '\0';
-					gint _tmp154_ = 0;
-					GdkPixbuf* _tmp155_ = NULL;
-					gint _tmp156_ = 0;
-					gint _tmp157_ = 0;
+					gint _tmp98_;
+					GdkPixbuf* _tmp99_;
+					gint _tmp100_;
+					gint _tmp101_;
+					GdkPixbuf* _tmp102_;
+					gint _tmp103_;
+					gint _tmp104_;
+					gint _tmp105_;
+					guchar* _tmp133_;
+					gint _tmp133__length1;
+					gint _tmp134_;
+					guchar* _tmp135_;
+					gint _tmp135__length1;
+					gint _tmp136_;
+					guchar _tmp137_;
+					gint _tmp138_;
+					guchar _tmp139_;
+					guchar* _tmp140_;
+					gint _tmp140__length1;
+					gint _tmp141_;
+					guchar* _tmp142_;
+					gint _tmp142__length1;
+					gint _tmp143_;
+					guchar _tmp144_;
+					gint _tmp145_;
+					guchar _tmp146_;
+					guchar* _tmp147_;
+					gint _tmp147__length1;
+					gint _tmp148_;
+					guchar* _tmp149_;
+					gint _tmp149__length1;
+					gint _tmp150_;
+					guchar _tmp151_;
+					gint _tmp152_;
+					guchar _tmp153_;
+					gint _tmp154_;
+					GdkPixbuf* _tmp155_;
+					gint _tmp156_;
+					gint _tmp157_;
 #line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					if (!_tmp85_) {
-#line 3052 "CustomComponents.c"
-						gint _tmp86_ = 0;
+#line 3057 "CustomComponents.c"
+						gint _tmp86_;
 #line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 						_tmp86_ = i;
 #line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 						i = _tmp86_ + 1;
-#line 3058 "CustomComponents.c"
+#line 3063 "CustomComponents.c"
 					}
 #line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					_tmp85_ = FALSE;
@@ -3070,7 +3075,7 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 					if (!(_tmp87_ < _tmp90_)) {
 #line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 						break;
-#line 3074 "CustomComponents.c"
+#line 3079 "CustomComponents.c"
 					}
 #line 426 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					_tmp91_ = i;
@@ -3108,40 +3113,40 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 					row_last_pixel = (_tmp98_ * _tmp101_) + (_tmp104_ * _tmp105_);
 #line 430 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					while (TRUE) {
-#line 3112 "CustomComponents.c"
-						gint _tmp106_ = 0;
-						gint _tmp107_ = 0;
-						guchar* _tmp108_ = NULL;
-						gint _tmp108__length1 = 0;
-						gint _tmp109_ = 0;
-						guchar* _tmp110_ = NULL;
-						gint _tmp110__length1 = 0;
-						gint _tmp111_ = 0;
-						guchar _tmp112_ = '\0';
-						gint _tmp113_ = 0;
-						guchar _tmp114_ = '\0';
-						guchar* _tmp115_ = NULL;
-						gint _tmp115__length1 = 0;
-						gint _tmp116_ = 0;
-						guchar* _tmp117_ = NULL;
-						gint _tmp117__length1 = 0;
-						gint _tmp118_ = 0;
-						guchar _tmp119_ = '\0';
-						gint _tmp120_ = 0;
-						guchar _tmp121_ = '\0';
-						guchar* _tmp122_ = NULL;
-						gint _tmp122__length1 = 0;
-						gint _tmp123_ = 0;
-						guchar* _tmp124_ = NULL;
-						gint _tmp124__length1 = 0;
-						gint _tmp125_ = 0;
-						guchar _tmp126_ = '\0';
-						gint _tmp127_ = 0;
-						guchar _tmp128_ = '\0';
-						gint _tmp129_ = 0;
-						GdkPixbuf* _tmp130_ = NULL;
-						gint _tmp131_ = 0;
-						gint _tmp132_ = 0;
+#line 3117 "CustomComponents.c"
+						gint _tmp106_;
+						gint _tmp107_;
+						guchar* _tmp108_;
+						gint _tmp108__length1;
+						gint _tmp109_;
+						guchar* _tmp110_;
+						gint _tmp110__length1;
+						gint _tmp111_;
+						guchar _tmp112_;
+						gint _tmp113_;
+						guchar _tmp114_;
+						guchar* _tmp115_;
+						gint _tmp115__length1;
+						gint _tmp116_;
+						guchar* _tmp117_;
+						gint _tmp117__length1;
+						gint _tmp118_;
+						guchar _tmp119_;
+						gint _tmp120_;
+						guchar _tmp121_;
+						guchar* _tmp122_;
+						gint _tmp122__length1;
+						gint _tmp123_;
+						guchar* _tmp124_;
+						gint _tmp124__length1;
+						gint _tmp125_;
+						guchar _tmp126_;
+						gint _tmp127_;
+						guchar _tmp128_;
+						gint _tmp129_;
+						GdkPixbuf* _tmp130_;
+						gint _tmp131_;
+						gint _tmp132_;
 #line 430 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 						_tmp106_ = body_pixel_index;
 #line 430 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -3150,7 +3155,7 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 						if (!(_tmp106_ > _tmp107_)) {
 #line 430 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 							break;
-#line 3154 "CustomComponents.c"
+#line 3159 "CustomComponents.c"
 						}
 #line 431 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 						_tmp108_ = pixel_data;
@@ -3222,7 +3227,7 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 						_tmp132_ = _tmp131_;
 #line 438 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 						body_pixel_index = _tmp129_ - _tmp132_;
-#line 3226 "CustomComponents.c"
+#line 3231 "CustomComponents.c"
 					}
 #line 440 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					_tmp133_ = pixel_data;
@@ -3294,7 +3299,7 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 					_tmp157_ = _tmp156_;
 #line 447 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 					edge_pixel_index = _tmp154_ + _tmp157_;
-#line 3298 "CustomComponents.c"
+#line 3303 "CustomComponents.c"
 				}
 			}
 		}
@@ -3319,24 +3324,24 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 	cairo_paint (_tmp164_);
 #line 374 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_g_object_unref0 (histogram_graphic);
-#line 3323 "CustomComponents.c"
+#line 3328 "CustomComponents.c"
 }
 
 
 static void rgb_histogram_manipulator_draw_trough (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area) {
 	gint trough_x = 0;
-	GdkRectangle _tmp0_ = {0};
-	gint _tmp1_ = 0;
+	GdkRectangle _tmp0_;
+	gint _tmp1_;
 	gint trough_y = 0;
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
 	GtkStyleContext* stylectx = NULL;
-	GtkWidget* _tmp4_ = NULL;
-	GtkStyleContext* _tmp5_ = NULL;
-	GtkStyleContext* _tmp6_ = NULL;
-	GtkWidgetPath* _tmp7_ = NULL;
-	GtkWidgetPath* _tmp8_ = NULL;
-	cairo_t* _tmp9_ = NULL;
+	GtkWidget* _tmp4_;
+	GtkStyleContext* _tmp5_;
+	GtkStyleContext* _tmp6_;
+	GtkWidgetPath* _tmp7_;
+	GtkWidgetPath* _tmp8_;
+	cairo_t* _tmp9_;
 #line 455 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
 #line 455 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -3383,19 +3388,19 @@ static void rgb_histogram_manipulator_draw_trough (RGBHistogramManipulator* self
 	gtk_style_context_restore (stylectx);
 #line 455 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_g_object_unref0 (stylectx);
-#line 3387 "CustomComponents.c"
+#line 3392 "CustomComponents.c"
 }
 
 
 static void rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area, gint position) {
-	cairo_t* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	cairo_t* _tmp7_ = NULL;
+	cairo_t* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	cairo_t* _tmp7_;
 #line 471 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
 #line 471 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -3422,13 +3427,13 @@ static void rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self, c
 	_tmp7_ = ctx;
 #line 473 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	cairo_paint (_tmp7_);
-#line 3426 "CustomComponents.c"
+#line 3431 "CustomComponents.c"
 }
 
 
 static void rgb_histogram_manipulator_force_update (RGBHistogramManipulator* self) {
-	GdkWindow* _tmp0_ = NULL;
-	GdkWindow* _tmp1_ = NULL;
+	GdkWindow* _tmp0_;
+	GdkWindow* _tmp1_;
 #line 476 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
 #line 477 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -3439,13 +3444,13 @@ static void rgb_histogram_manipulator_force_update (RGBHistogramManipulator* sel
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 478 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	gdk_window_process_updates (_tmp1_, TRUE);
-#line 3443 "CustomComponents.c"
+#line 3448 "CustomComponents.c"
 }
 
 
 static void rgb_histogram_manipulator_update_nub_extrema (RGBHistogramManipulator* self) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 481 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
 #line 482 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -3456,13 +3461,13 @@ static void rgb_histogram_manipulator_update_nub_extrema (RGBHistogramManipulato
 	_tmp1_ = self->priv->right_nub_position;
 #line 483 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	self->priv->left_nub_max = (_tmp1_ - RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) - 1;
-#line 3460 "CustomComponents.c"
+#line 3465 "CustomComponents.c"
 }
 
 
 void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, GdkPixbuf* source_pixbuf) {
-	GdkPixbuf* _tmp0_ = NULL;
-	RGBHistogram* _tmp1_ = NULL;
+	GdkPixbuf* _tmp0_;
+	RGBHistogram* _tmp1_;
 #line 488 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
 #line 488 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -3477,13 +3482,13 @@ void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self,
 	self->priv->histogram = _tmp1_;
 #line 490 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	rgb_histogram_manipulator_force_update (self);
-#line 3481 "CustomComponents.c"
+#line 3486 "CustomComponents.c"
 }
 
 
 gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 493 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), 0);
 #line 494 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -3492,13 +3497,13 @@ gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* s
 	result = _tmp0_;
 #line 494 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return result;
-#line 3496 "CustomComponents.c"
+#line 3501 "CustomComponents.c"
 }
 
 
 gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 497 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), 0);
 #line 498 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -3507,33 +3512,33 @@ gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator*
 	result = _tmp0_;
 #line 498 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	return result;
-#line 3511 "CustomComponents.c"
+#line 3516 "CustomComponents.c"
 }
 
 
 void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, gint user_nub_pos) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	gint _tmp1_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 501 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
 #line 502 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp1_ = user_nub_pos;
 #line 502 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (_tmp1_ >= 0) {
-#line 3527 "CustomComponents.c"
-		gint _tmp2_ = 0;
+#line 3532 "CustomComponents.c"
+		gint _tmp2_;
 #line 502 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp2_ = user_nub_pos;
 #line 502 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp0_ = _tmp2_ <= 255;
-#line 3533 "CustomComponents.c"
+#line 3538 "CustomComponents.c"
 	} else {
 #line 502 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp0_ = FALSE;
-#line 3537 "CustomComponents.c"
+#line 3542 "CustomComponents.c"
 	}
 #line 502 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_vala_assert (_tmp0_, "(user_nub_pos >= 0) && (user_nub_pos <= 255)");
@@ -3547,33 +3552,33 @@ void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* s
 	self->priv->left_nub_position = _tmp5_;
 #line 504 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	rgb_histogram_manipulator_update_nub_extrema (self);
-#line 3551 "CustomComponents.c"
+#line 3556 "CustomComponents.c"
 }
 
 
 void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, gint user_nub_pos) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	gint _tmp1_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 507 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
 #line 508 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp1_ = user_nub_pos;
 #line 508 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	if (_tmp1_ >= 0) {
-#line 3567 "CustomComponents.c"
-		gint _tmp2_ = 0;
+#line 3572 "CustomComponents.c"
+		gint _tmp2_;
 #line 508 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp2_ = user_nub_pos;
 #line 508 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp0_ = _tmp2_ <= 255;
-#line 3573 "CustomComponents.c"
+#line 3578 "CustomComponents.c"
 	} else {
 #line 508 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 		_tmp0_ = FALSE;
-#line 3577 "CustomComponents.c"
+#line 3582 "CustomComponents.c"
 	}
 #line 508 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_vala_assert (_tmp0_, "(user_nub_pos >= 0) && (user_nub_pos <= 255)");
@@ -3587,23 +3592,23 @@ void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator*
 	self->priv->right_nub_position = _tmp5_;
 #line 510 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	rgb_histogram_manipulator_update_nub_extrema (self);
-#line 3591 "CustomComponents.c"
+#line 3596 "CustomComponents.c"
 }
 
 
 static void rgb_histogram_manipulator_class_init (RGBHistogramManipulatorClass * klass) {
-	GtkWidgetPath* _tmp0_ = NULL;
-	GtkWidgetPath* _tmp1_ = NULL;
+	GtkWidgetPath* _tmp0_;
+	GtkWidgetPath* _tmp1_;
 #line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	rgb_histogram_manipulator_parent_class = g_type_class_peek_parent (klass);
 #line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	g_type_class_add_private (klass, sizeof (RGBHistogramManipulatorPrivate));
 #line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	((GtkWidgetClass *) klass)->draw = (gboolean (*)(GtkWidget*, cairo_t*)) rgb_histogram_manipulator_real_draw;
+	((GtkWidgetClass *) klass)->draw = (gboolean (*) (GtkWidget *, cairo_t*)) rgb_histogram_manipulator_real_draw;
 #line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	G_OBJECT_CLASS (klass)->finalize = rgb_histogram_manipulator_finalize;
 #line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_signal_new ("nub_position_changed", TYPE_RGB_HISTOGRAM_MANIPULATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL] = g_signal_new ("nub-position-changed", TYPE_RGB_HISTOGRAM_MANIPULATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 203 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp0_ = gtk_widget_path_new ();
 #line 203 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -3612,12 +3617,12 @@ static void rgb_histogram_manipulator_class_init (RGBHistogramManipulatorClass *
 	_tmp1_ = gtk_widget_path_new ();
 #line 204 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	rgb_histogram_manipulator_frame_draw_path = _tmp1_;
-#line 3616 "CustomComponents.c"
+#line 3621 "CustomComponents.c"
 }
 
 
 static void rgb_histogram_manipulator_instance_init (RGBHistogramManipulator * self) {
-	GdkPixbuf* _tmp0_ = NULL;
+	GdkPixbuf* _tmp0_;
 #line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	self->priv = RGB_HISTOGRAM_MANIPULATOR_GET_PRIVATE (self);
 #line 198 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -3642,11 +3647,11 @@ static void rgb_histogram_manipulator_instance_init (RGBHistogramManipulator * s
 	self->priv->track_start_x = 0;
 #line 214 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	self->priv->track_nub_start_position = 0;
-#line 3646 "CustomComponents.c"
+#line 3651 "CustomComponents.c"
 }
 
 
-static void rgb_histogram_manipulator_finalize (GObject* obj) {
+static void rgb_histogram_manipulator_finalize (GObject * obj) {
 	RGBHistogramManipulator * self;
 #line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator);
@@ -3656,7 +3661,7 @@ static void rgb_histogram_manipulator_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->nub_pixbuf);
 #line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	G_OBJECT_CLASS (rgb_histogram_manipulator_parent_class)->finalize (obj);
-#line 3660 "CustomComponents.c"
+#line 3665 "CustomComponents.c"
 }
 
 
diff --git a/src/Debug.c b/src/Debug.c
index e9d753f..3529b39 100644
--- a/src/Debug.c
+++ b/src/Debug.c
@@ -1,4 +1,4 @@
-/* Debug.c generated by valac 0.34.7, the Vala compiler
+/* Debug.c generated by valac 0.36.6, the Vala compiler
  * generated from Debug.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -97,20 +97,20 @@ static void _debug_critical_handler_glog_func (const gchar* log_domain, GLogLeve
 
 
 void debug_init (const gchar* app_version_prefix) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	FILE* _tmp2_ = NULL;
-	FILE* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	FILE* _tmp2_;
+	FILE* _tmp3_;
 	gchar* log_file_error_msg = NULL;
 	GFile* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	const gchar* _tmp5_;
 	GFile* log_file = NULL;
-	GFile* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
-	const gchar* _tmp34_ = NULL;
+	GFile* _tmp7_;
+	GFile* _tmp8_;
+	const gchar* _tmp34_;
 	gboolean _tmp55_ = FALSE;
-	GLogLevelFlags _tmp56_ = 0;
-	const gchar* _tmp58_ = NULL;
+	GLogLevelFlags _tmp56_;
+	const gchar* _tmp58_;
 	GError * _inner_error_ = NULL;
 #line 27 "/home/jens/Source/shotwell/src/Debug.vala"
 	g_return_if_fail (app_version_prefix != NULL);
@@ -137,7 +137,7 @@ void debug_init (const gchar* app_version_prefix) {
 #line 37 "/home/jens/Source/shotwell/src/Debug.vala"
 	if (g_strcmp0 (_tmp5_, DEBUG_LIBRARY_PREFIX) == 0) {
 #line 140 "Debug.c"
-		GFile* _tmp6_ = NULL;
+		GFile* _tmp6_;
 #line 37 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp6_ = app_dirs_get_log_file ();
 #line 37 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -162,13 +162,13 @@ void debug_init (const gchar* app_version_prefix) {
 	if (_tmp8_ != NULL) {
 #line 164 "Debug.c"
 		GFile* log_dir = NULL;
-		GFile* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
-		GFile* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
-		FILE* _tmp26_ = NULL;
-		FILE* _tmp27_ = NULL;
+		GFile* _tmp9_;
+		GFile* _tmp10_;
+		GFile* _tmp23_;
+		gchar* _tmp24_;
+		gchar* _tmp25_;
+		FILE* _tmp26_;
+		FILE* _tmp27_;
 #line 39 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp9_ = log_file;
 #line 39 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -177,8 +177,8 @@ void debug_init (const gchar* app_version_prefix) {
 		log_dir = _tmp10_;
 #line 179 "Debug.c"
 		{
-			GFile* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
+			GFile* _tmp11_;
+			gboolean _tmp12_;
 #line 41 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp11_ = log_dir;
 #line 41 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -187,8 +187,8 @@ void debug_init (const gchar* app_version_prefix) {
 			if (_tmp12_ == FALSE) {
 #line 189 "Debug.c"
 				gboolean _tmp13_ = FALSE;
-				GFile* _tmp14_ = NULL;
-				gboolean _tmp15_ = FALSE;
+				GFile* _tmp14_;
+				gboolean _tmp15_;
 #line 42 "/home/jens/Source/shotwell/src/Debug.vala"
 				_tmp14_ = log_dir;
 #line 42 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -198,15 +198,15 @@ void debug_init (const gchar* app_version_prefix) {
 #line 42 "/home/jens/Source/shotwell/src/Debug.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 201 "Debug.c"
-					goto __catch432_g_error;
+					goto __catch433_g_error;
 				}
 #line 42 "/home/jens/Source/shotwell/src/Debug.vala"
 				if (!_tmp13_) {
 #line 206 "Debug.c"
-					GFile* _tmp16_ = NULL;
-					gchar* _tmp17_ = NULL;
-					gchar* _tmp18_ = NULL;
-					gchar* _tmp19_ = NULL;
+					GFile* _tmp16_;
+					gchar* _tmp17_;
+					gchar* _tmp18_;
+					gchar* _tmp19_;
 #line 43 "/home/jens/Source/shotwell/src/Debug.vala"
 					_tmp16_ = log_dir;
 #line 43 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -225,13 +225,13 @@ void debug_init (const gchar* app_version_prefix) {
 				}
 			}
 		}
-		goto __finally432;
-		__catch432_g_error:
+		goto __finally433;
+		__catch433_g_error:
 		{
 			GError* err = NULL;
-			GError* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
-			gchar* _tmp22_ = NULL;
+			GError* _tmp20_;
+			const gchar* _tmp21_;
+			gchar* _tmp22_;
 #line 40 "/home/jens/Source/shotwell/src/Debug.vala"
 			err = _inner_error_;
 #line 40 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -250,7 +250,7 @@ void debug_init (const gchar* app_version_prefix) {
 			_g_error_free0 (err);
 #line 252 "Debug.c"
 		}
-		__finally432:
+		__finally433:
 #line 40 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 40 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -288,8 +288,8 @@ void debug_init (const gchar* app_version_prefix) {
 #line 54 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (_tmp27_ != NULL) {
 #line 291 "Debug.c"
-			FILE* _tmp28_ = NULL;
-			FILE* _tmp29_ = NULL;
+			FILE* _tmp28_;
+			FILE* _tmp29_;
 #line 55 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp28_ = debug_log_file_stream;
 #line 55 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -300,10 +300,10 @@ void debug_init (const gchar* app_version_prefix) {
 			debug_log_err = _tmp29_;
 #line 302 "Debug.c"
 		} else {
-			GFile* _tmp30_ = NULL;
-			gchar* _tmp31_ = NULL;
-			gchar* _tmp32_ = NULL;
-			gchar* _tmp33_ = NULL;
+			GFile* _tmp30_;
+			gchar* _tmp31_;
+			gchar* _tmp32_;
+			gchar* _tmp33_;
 #line 58 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp30_ = log_file;
 #line 58 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -333,28 +333,28 @@ void debug_init (const gchar* app_version_prefix) {
 #line 334 "Debug.c"
 	} else {
 		GLogLevelFlags _tmp35_ = 0;
-		const gchar* _tmp36_ = NULL;
+		const gchar* _tmp36_;
 		GLogLevelFlags _tmp39_ = 0;
-		const gchar* _tmp40_ = NULL;
+		const gchar* _tmp40_;
 		GLogLevelFlags _tmp43_ = 0;
-		const gchar* _tmp44_ = NULL;
+		const gchar* _tmp44_;
 		GLogLevelFlags _tmp47_ = 0;
-		const gchar* _tmp48_ = NULL;
+		const gchar* _tmp48_;
 		GLogLevelFlags _tmp51_ = 0;
-		const gchar* _tmp52_ = NULL;
+		const gchar* _tmp52_;
 #line 65 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp36_ = g_getenv ("SHOTWELL_INFO");
 #line 65 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (_tmp36_ != NULL) {
 #line 350 "Debug.c"
-			GLogLevelFlags _tmp37_ = 0;
+			GLogLevelFlags _tmp37_;
 #line 66 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp37_ = debug_log_mask;
 #line 66 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp35_ = _tmp37_ | G_LOG_LEVEL_INFO;
 #line 356 "Debug.c"
 		} else {
-			GLogLevelFlags _tmp38_ = 0;
+			GLogLevelFlags _tmp38_;
 #line 67 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp38_ = debug_log_mask;
 #line 67 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -368,14 +368,14 @@ void debug_init (const gchar* app_version_prefix) {
 #line 68 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (_tmp40_ != NULL) {
 #line 371 "Debug.c"
-			GLogLevelFlags _tmp41_ = 0;
+			GLogLevelFlags _tmp41_;
 #line 69 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp41_ = debug_log_mask;
 #line 69 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp39_ = _tmp41_ | G_LOG_LEVEL_DEBUG;
 #line 377 "Debug.c"
 		} else {
-			GLogLevelFlags _tmp42_ = 0;
+			GLogLevelFlags _tmp42_;
 #line 70 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp42_ = debug_log_mask;
 #line 70 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -389,14 +389,14 @@ void debug_init (const gchar* app_version_prefix) {
 #line 71 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (_tmp44_ != NULL) {
 #line 392 "Debug.c"
-			GLogLevelFlags _tmp45_ = 0;
+			GLogLevelFlags _tmp45_;
 #line 72 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp45_ = debug_log_mask;
 #line 72 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp43_ = _tmp45_ | G_LOG_LEVEL_MESSAGE;
 #line 398 "Debug.c"
 		} else {
-			GLogLevelFlags _tmp46_ = 0;
+			GLogLevelFlags _tmp46_;
 #line 73 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp46_ = debug_log_mask;
 #line 73 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -410,14 +410,14 @@ void debug_init (const gchar* app_version_prefix) {
 #line 74 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (_tmp48_ != NULL) {
 #line 413 "Debug.c"
-			GLogLevelFlags _tmp49_ = 0;
+			GLogLevelFlags _tmp49_;
 #line 75 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp49_ = debug_log_mask;
 #line 75 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp47_ = _tmp49_ | G_LOG_LEVEL_WARNING;
 #line 419 "Debug.c"
 		} else {
-			GLogLevelFlags _tmp50_ = 0;
+			GLogLevelFlags _tmp50_;
 #line 76 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp50_ = debug_log_mask;
 #line 76 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -431,14 +431,14 @@ void debug_init (const gchar* app_version_prefix) {
 #line 77 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (_tmp52_ != NULL) {
 #line 434 "Debug.c"
-			GLogLevelFlags _tmp53_ = 0;
+			GLogLevelFlags _tmp53_;
 #line 78 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp53_ = debug_log_mask;
 #line 78 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp51_ = _tmp53_ | G_LOG_LEVEL_CRITICAL;
 #line 440 "Debug.c"
 		} else {
-			GLogLevelFlags _tmp54_ = 0;
+			GLogLevelFlags _tmp54_;
 #line 79 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp54_ = debug_log_mask;
 #line 79 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -464,7 +464,7 @@ void debug_init (const gchar* app_version_prefix) {
 #line 88 "/home/jens/Source/shotwell/src/Debug.vala"
 	if (_tmp56_ == 0) {
 #line 467 "Debug.c"
-		GFile* _tmp57_ = NULL;
+		GFile* _tmp57_;
 #line 88 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp57_ = log_file;
 #line 88 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -486,7 +486,7 @@ void debug_init (const gchar* app_version_prefix) {
 #line 94 "/home/jens/Source/shotwell/src/Debug.vala"
 	if (_tmp58_ != NULL) {
 #line 489 "Debug.c"
-		const gchar* _tmp59_ = NULL;
+		const gchar* _tmp59_;
 #line 95 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp59_ = log_file_error_msg;
 #line 95 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -509,8 +509,8 @@ void debug_terminate (void) {
 
 gboolean debug_is_enabled (GLogLevelFlags flag) {
 	gboolean result = FALSE;
-	GLogLevelFlags _tmp0_ = 0;
-	GLogLevelFlags _tmp1_ = 0;
+	GLogLevelFlags _tmp0_;
+	GLogLevelFlags _tmp1_;
 #line 103 "/home/jens/Source/shotwell/src/Debug.vala"
 	_tmp0_ = debug_log_mask;
 #line 103 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -526,13 +526,13 @@ gboolean debug_is_enabled (GLogLevelFlags flag) {
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return;
 #line 538 "Debug.c"
 }
@@ -540,30 +540,30 @@ static void g_time_local (time_t time, struct tm* result) {
 
 static gchar* g_time_to_string (struct tm *self) {
 	gchar* result = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gchar* _tmp6_ = NULL;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gchar* _tmp6_;
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = (*self).tm_year;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = (*self).tm_mon;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = (*self).tm_mday;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = (*self).tm_hour;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = (*self).tm_min;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp5_ = (*self).tm_sec;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp6_ = g_strdup_printf ("%04d-%02d-%02d %02d:%02d:%02d", _tmp0_ + 1900, _tmp1_ + 1, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp6_;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 569 "Debug.c"
 }
@@ -571,16 +571,16 @@ static gchar* g_time_to_string (struct tm *self) {
 
 void debug_log (FILE* stream, const gchar* prefix, const gchar* message) {
 	time_t now = 0;
-	time_t _tmp0_ = 0;
-	FILE* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	pid_t _tmp3_ = 0;
+	time_t _tmp0_;
+	FILE* _tmp1_;
+	const gchar* _tmp2_;
+	pid_t _tmp3_;
 	struct tm _tmp4_ = {0};
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	FILE* _tmp9_ = NULL;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	const gchar* _tmp7_;
+	const gchar* _tmp8_;
+	FILE* _tmp9_;
 #line 106 "/home/jens/Source/shotwell/src/Debug.vala"
 	g_return_if_fail (stream != NULL);
 #line 106 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -620,7 +620,7 @@ void debug_log (FILE* stream, const gchar* prefix, const gchar* message) {
 
 
 void debug_info_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 118 "/home/jens/Source/shotwell/src/Debug.vala"
 	g_return_if_fail (message != NULL);
 #line 119 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -628,8 +628,8 @@ void debug_info_handler (const gchar* domain, GLogLevelFlags flags, const gchar*
 #line 119 "/home/jens/Source/shotwell/src/Debug.vala"
 	if (_tmp0_) {
 #line 631 "Debug.c"
-		FILE* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		FILE* _tmp1_;
+		const gchar* _tmp2_;
 #line 120 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp1_ = debug_log_out;
 #line 120 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -642,7 +642,7 @@ void debug_info_handler (const gchar* domain, GLogLevelFlags flags, const gchar*
 
 
 void debug_debug_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 123 "/home/jens/Source/shotwell/src/Debug.vala"
 	g_return_if_fail (message != NULL);
 #line 124 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -650,8 +650,8 @@ void debug_debug_handler (const gchar* domain, GLogLevelFlags flags, const gchar
 #line 124 "/home/jens/Source/shotwell/src/Debug.vala"
 	if (_tmp0_) {
 #line 653 "Debug.c"
-		FILE* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		FILE* _tmp1_;
+		const gchar* _tmp2_;
 #line 125 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp1_ = debug_log_out;
 #line 125 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -664,7 +664,7 @@ void debug_debug_handler (const gchar* domain, GLogLevelFlags flags, const gchar
 
 
 void debug_message_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 128 "/home/jens/Source/shotwell/src/Debug.vala"
 	g_return_if_fail (message != NULL);
 #line 129 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -672,8 +672,8 @@ void debug_message_handler (const gchar* domain, GLogLevelFlags flags, const gch
 #line 129 "/home/jens/Source/shotwell/src/Debug.vala"
 	if (_tmp0_) {
 #line 675 "Debug.c"
-		FILE* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		FILE* _tmp1_;
+		const gchar* _tmp2_;
 #line 130 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp1_ = debug_log_err;
 #line 130 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -686,7 +686,7 @@ void debug_message_handler (const gchar* domain, GLogLevelFlags flags, const gch
 
 
 void debug_warning_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 133 "/home/jens/Source/shotwell/src/Debug.vala"
 	g_return_if_fail (message != NULL);
 #line 134 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -694,8 +694,8 @@ void debug_warning_handler (const gchar* domain, GLogLevelFlags flags, const gch
 #line 134 "/home/jens/Source/shotwell/src/Debug.vala"
 	if (_tmp0_) {
 #line 697 "Debug.c"
-		FILE* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		FILE* _tmp1_;
+		const gchar* _tmp2_;
 #line 135 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp1_ = debug_log_err;
 #line 135 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -708,7 +708,7 @@ void debug_warning_handler (const gchar* domain, GLogLevelFlags flags, const gch
 
 
 void debug_critical_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 138 "/home/jens/Source/shotwell/src/Debug.vala"
 	g_return_if_fail (message != NULL);
 #line 139 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -716,9 +716,9 @@ void debug_critical_handler (const gchar* domain, GLogLevelFlags flags, const gc
 #line 139 "/home/jens/Source/shotwell/src/Debug.vala"
 	if (_tmp0_) {
 #line 719 "Debug.c"
-		FILE* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		FILE* _tmp3_ = NULL;
+		FILE* _tmp1_;
+		const gchar* _tmp2_;
+		FILE* _tmp3_;
 #line 140 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp1_ = debug_log_err;
 #line 140 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -730,8 +730,8 @@ void debug_critical_handler (const gchar* domain, GLogLevelFlags flags, const gc
 #line 141 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (_tmp3_ != NULL) {
 #line 733 "Debug.c"
-			FILE* _tmp4_ = NULL;
-			const gchar* _tmp5_ = NULL;
+			FILE* _tmp4_;
+			const gchar* _tmp5_;
 #line 142 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp4_ = stderr;
 #line 142 "/home/jens/Source/shotwell/src/Debug.vala"
diff --git a/src/DesktopIntegration.c b/src/DesktopIntegration.c
index 6354479..c1e90ba 100644
--- a/src/DesktopIntegration.c
+++ b/src/DesktopIntegration.c
@@ -1,4 +1,4 @@
-/* DesktopIntegration.c generated by valac 0.34.7, the Vala compiler
+/* DesktopIntegration.c generated by valac 0.36.6, the Vala compiler
  * generated from DesktopIntegration.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -417,7 +417,7 @@ static void desktop_integration_background_slideshow_xml_builder_write_transitio
 static void desktop_integration_background_slideshow_xml_builder_write_static (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GFile* file, GError** error);
 void desktop_integration_background_slideshow_xml_builder_add_photo (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GFile* file, GError** error);
 GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GError** error);
-static void desktop_integration_background_slideshow_xml_builder_finalize (DesktopIntegrationBackgroundSlideshowXMLBuilder* obj);
+static void desktop_integration_background_slideshow_xml_builder_finalize (DesktopIntegrationBackgroundSlideshowXMLBuilder * obj);
 void desktop_integration_set_background_slideshow (GeeCollection* photos, gdouble duration, gdouble transition, gboolean desktop_background, gboolean screensaver);
 void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, void* monitor_target, guint64 file_count, GCancellable* cancellable, GError** error);
 void scaling_to_fill_screen (GtkWindow* window, Scaling* result);
@@ -430,9 +430,9 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 
 
 void desktop_integration_init (void) {
-	gint _tmp0_ = 0;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gint _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 23 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp0_ = desktop_integration_init_count;
 #line 23 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -456,8 +456,8 @@ void desktop_integration_init (void) {
 
 
 void desktop_integration_terminate (void) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 30 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp0_ = desktop_integration_init_count;
 #line 30 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -482,19 +482,19 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 500 "DesktopIntegration.c"
 }
@@ -503,9 +503,9 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 GAppInfo* desktop_integration_get_default_app_for_mime_types (gchar** mime_types, int mime_types_length1, GeeArrayList* preferred_apps) {
 	GAppInfo* result = NULL;
 	SortedList* external_apps = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	SortedList* _tmp1_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	SortedList* _tmp1_;
 #line 34 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	g_return_val_if_fail (GEE_IS_ARRAY_LIST (preferred_apps), NULL);
 #line 36 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -519,12 +519,12 @@ GAppInfo* desktop_integration_get_default_app_for_mime_types (gchar** mime_types
 #line 520 "DesktopIntegration.c"
 	{
 		GeeArrayList* _preferred_app_list = NULL;
-		GeeArrayList* _tmp2_ = NULL;
-		GeeArrayList* _tmp3_ = NULL;
+		GeeArrayList* _tmp2_;
+		GeeArrayList* _tmp3_;
 		gint _preferred_app_size = 0;
-		GeeArrayList* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+		GeeArrayList* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 		gint _preferred_app_index = 0;
 #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp2_ = preferred_apps;
@@ -545,13 +545,13 @@ GAppInfo* desktop_integration_get_default_app_for_mime_types (gchar** mime_types
 #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		while (TRUE) {
 #line 548 "DesktopIntegration.c"
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
+			gint _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
 			gchar* preferred_app = NULL;
-			GeeArrayList* _tmp10_ = NULL;
-			gint _tmp11_ = 0;
-			gpointer _tmp12_ = NULL;
+			GeeArrayList* _tmp10_;
+			gint _tmp11_;
+			gpointer _tmp12_;
 #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 			_tmp7_ = _preferred_app_index;
 #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -577,8 +577,8 @@ GAppInfo* desktop_integration_get_default_app_for_mime_types (gchar** mime_types
 #line 578 "DesktopIntegration.c"
 			{
 				GeeIterator* _external_app_it = NULL;
-				SortedList* _tmp13_ = NULL;
-				GeeIterator* _tmp14_ = NULL;
+				SortedList* _tmp13_;
+				GeeIterator* _tmp14_;
 #line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 				_tmp13_ = external_apps;
 #line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -588,15 +588,15 @@ GAppInfo* desktop_integration_get_default_app_for_mime_types (gchar** mime_types
 #line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 				while (TRUE) {
 #line 591 "DesktopIntegration.c"
-					GeeIterator* _tmp15_ = NULL;
-					gboolean _tmp16_ = FALSE;
+					GeeIterator* _tmp15_;
+					gboolean _tmp16_;
 					GAppInfo* external_app = NULL;
-					GeeIterator* _tmp17_ = NULL;
-					gpointer _tmp18_ = NULL;
-					GAppInfo* _tmp19_ = NULL;
-					const gchar* _tmp20_ = NULL;
-					const gchar* _tmp21_ = NULL;
-					gboolean _tmp22_ = FALSE;
+					GeeIterator* _tmp17_;
+					gpointer _tmp18_;
+					GAppInfo* _tmp19_;
+					const gchar* _tmp20_;
+					const gchar* _tmp21_;
+					gboolean _tmp22_;
 #line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 					_tmp15_ = _external_app_it;
 #line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -665,16 +665,16 @@ GAppInfo* desktop_integration_get_default_app_for_mime_types (gchar** mime_types
 
 gint64 desktop_integration_app_info_comparator (void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	void* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint64 _tmp9_ = 0LL;
+	void* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	void* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gint _tmp8_;
+	gint64 _tmp9_;
 #line 50 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp0_ = a;
 #line 50 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -735,11 +735,11 @@ static void _g_list_free__g_object_unref0_ (GList* self) {
 SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, int mime_types_length1) {
 	SortedList* result = NULL;
 	SortedList* external_apps = NULL;
-	SortedList* _tmp0_ = NULL;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	SortedList* _tmp0_;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
 #line 54 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp0_ = sorted_list_new (g_app_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _desktop_integration_app_info_comparator_comparator, NULL);
 #line 54 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -773,7 +773,7 @@ SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, int
 #line 61 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		for (mime_type_it = 0; mime_type_it < _tmp2__length1; mime_type_it = mime_type_it + 1) {
 #line 776 "DesktopIntegration.c"
-			gchar* _tmp3_ = NULL;
+			gchar* _tmp3_;
 			gchar* mime_type = NULL;
 #line 61 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 			_tmp3_ = g_strdup (mime_type_collection[mime_type_it]);
@@ -782,11 +782,11 @@ SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, int
 #line 783 "DesktopIntegration.c"
 			{
 				gchar* content_type = NULL;
-				const gchar* _tmp4_ = NULL;
-				gchar* _tmp5_ = NULL;
-				const gchar* _tmp6_ = NULL;
-				const gchar* _tmp7_ = NULL;
-				GList* _tmp8_ = NULL;
+				const gchar* _tmp4_;
+				gchar* _tmp5_;
+				const gchar* _tmp6_;
+				const gchar* _tmp7_;
+				GList* _tmp8_;
 #line 62 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 				_tmp4_ = mime_type;
 #line 62 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -818,7 +818,7 @@ SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, int
 #line 66 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 					for (external_app_it = external_app_collection; external_app_it != NULL; external_app_it = external_app_it->next) {
 #line 821 "DesktopIntegration.c"
-						GAppInfo* _tmp9_ = NULL;
+						GAppInfo* _tmp9_;
 						GAppInfo* external_app = NULL;
 #line 66 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 						_tmp9_ = _g_object_ref0 ((GAppInfo*) external_app_it->data);
@@ -828,14 +828,14 @@ SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, int
 						{
 							gboolean already_contains = FALSE;
 							gboolean _tmp20_ = FALSE;
-							gboolean _tmp21_ = FALSE;
+							gboolean _tmp21_;
 #line 68 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 							already_contains = FALSE;
 #line 835 "DesktopIntegration.c"
 							{
 								GeeIterator* _app_it = NULL;
-								SortedList* _tmp10_ = NULL;
-								GeeIterator* _tmp11_ = NULL;
+								SortedList* _tmp10_;
+								GeeIterator* _tmp11_;
 #line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 								_tmp10_ = external_apps;
 #line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -845,15 +845,15 @@ SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, int
 #line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 								while (TRUE) {
 #line 848 "DesktopIntegration.c"
-									GeeIterator* _tmp12_ = NULL;
-									gboolean _tmp13_ = FALSE;
+									GeeIterator* _tmp12_;
+									gboolean _tmp13_;
 									GAppInfo* app = NULL;
-									GeeIterator* _tmp14_ = NULL;
-									gpointer _tmp15_ = NULL;
-									GAppInfo* _tmp16_ = NULL;
-									const gchar* _tmp17_ = NULL;
-									GAppInfo* _tmp18_ = NULL;
-									const gchar* _tmp19_ = NULL;
+									GeeIterator* _tmp14_;
+									gpointer _tmp15_;
+									GAppInfo* _tmp16_;
+									const gchar* _tmp17_;
+									GAppInfo* _tmp18_;
+									const gchar* _tmp19_;
 #line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 									_tmp12_ = _app_it;
 #line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -901,9 +901,9 @@ SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, int
 #line 78 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 							if (!_tmp21_) {
 #line 904 "DesktopIntegration.c"
-								GAppInfo* _tmp22_ = NULL;
-								const gchar* _tmp23_ = NULL;
-								gboolean _tmp24_ = FALSE;
+								GAppInfo* _tmp22_;
+								const gchar* _tmp23_;
+								gboolean _tmp24_;
 #line 78 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 								_tmp22_ = external_app;
 #line 78 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -921,8 +921,8 @@ SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, int
 #line 78 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 							if (_tmp20_) {
 #line 924 "DesktopIntegration.c"
-								SortedList* _tmp25_ = NULL;
-								GAppInfo* _tmp26_ = NULL;
+								SortedList* _tmp25_;
+								GAppInfo* _tmp26_;
 #line 79 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 								_tmp25_ = external_apps;
 #line 79 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -959,12 +959,12 @@ SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, int
 gchar* desktop_integration_get_app_open_command (GAppInfo* app_info) {
 	gchar* result = NULL;
 	gchar* str = NULL;
-	GAppInfo* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	GAppInfo* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp8_ = NULL;
+	const gchar* _tmp4_;
+	gchar* _tmp8_;
 #line 86 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	g_return_val_if_fail (G_IS_APP_INFO (app_info), NULL);
 #line 87 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -980,15 +980,15 @@ gchar* desktop_integration_get_app_open_command (GAppInfo* app_info) {
 #line 89 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (_tmp4_ != NULL) {
 #line 983 "DesktopIntegration.c"
-		const gchar* _tmp5_ = NULL;
+		const gchar* _tmp5_;
 #line 89 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp5_ = str;
 #line 89 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp3_ = _tmp5_;
 #line 989 "DesktopIntegration.c"
 	} else {
-		GAppInfo* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+		GAppInfo* _tmp6_;
+		const gchar* _tmp7_;
 #line 89 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp6_ = app_info;
 #line 89 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1011,7 +1011,7 @@ gchar* desktop_integration_get_app_open_command (GAppInfo* app_info) {
 
 gboolean desktop_integration_is_send_to_installed (void) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 93 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp0_ = desktop_integration_send_to_installed;
 #line 93 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1023,18 +1023,18 @@ gboolean desktop_integration_is_send_to_installed (void) {
 
 
 void desktop_integration_files_send_to (GFile** files, int files_length1) {
-	GFile** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	GFile** _tmp0_;
+	gint _tmp0__length1;
 	gchar** argv = NULL;
-	GFile** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar** _tmp2_ = NULL;
-	gint argv_length1 = 0;
-	gint _argv_size_ = 0;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	GFile** _tmp1_;
+	gint _tmp1__length1;
+	gchar** _tmp2_;
+	gint argv_length1;
+	gint _argv_size_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 97 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp0_ = files;
@@ -1083,22 +1083,22 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 #line 103 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 			while (TRUE) {
 #line 1086 "DesktopIntegration.c"
-				gint _tmp8_ = 0;
-				GFile** _tmp9_ = NULL;
-				gint _tmp9__length1 = 0;
-				gchar** _tmp10_ = NULL;
-				gint _tmp10__length1 = 0;
-				gint _tmp11_ = 0;
-				GFile** _tmp12_ = NULL;
-				gint _tmp12__length1 = 0;
-				gint _tmp13_ = 0;
-				GFile* _tmp14_ = NULL;
-				gchar* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
+				gint _tmp8_;
+				GFile** _tmp9_;
+				gint _tmp9__length1;
+				gchar** _tmp10_;
+				gint _tmp10__length1;
+				gint _tmp11_;
+				GFile** _tmp12_;
+				gint _tmp12__length1;
+				gint _tmp13_;
+				GFile* _tmp14_;
+				gchar* _tmp15_;
+				gchar* _tmp16_;
 #line 103 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 				if (!_tmp6_) {
 #line 1101 "DesktopIntegration.c"
-					gint _tmp7_ = 0;
+					gint _tmp7_;
 #line 103 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 					_tmp7_ = ctr;
 #line 103 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1146,14 +1146,14 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 		}
 	}
 	{
-		AppWindow* _tmp17_ = NULL;
-		AppWindow* _tmp18_ = NULL;
+		AppWindow* _tmp17_;
+		AppWindow* _tmp18_;
 		GPid child_pid = 0;
-		gchar** _tmp19_ = NULL;
-		gint _tmp19__length1 = 0;
+		gchar** _tmp19_;
+		gint _tmp19__length1;
 		GPid _tmp20_ = 0;
-		AppWindow* _tmp21_ = NULL;
-		AppWindow* _tmp22_ = NULL;
+		AppWindow* _tmp21_;
+		AppWindow* _tmp22_;
 #line 107 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp17_ = app_window_get_instance ();
 #line 107 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1173,7 +1173,7 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 #line 110 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1176 "DesktopIntegration.c"
-			goto __catch566_g_error;
+			goto __catch568_g_error;
 		}
 #line 118 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp21_ = app_window_get_instance ();
@@ -1185,17 +1185,16 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 		_g_object_unref0 (_tmp22_);
 #line 1187 "DesktopIntegration.c"
 	}
-	goto __finally566;
-	__catch566_g_error:
+	goto __finally568;
+	__catch568_g_error:
 	{
 		GError* err = NULL;
-		AppWindow* _tmp23_ = NULL;
-		AppWindow* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-		GError* _tmp26_ = NULL;
-		const gchar* _tmp27_ = NULL;
-		gchar* _tmp28_ = NULL;
-		gchar* _tmp29_ = NULL;
+		AppWindow* _tmp23_;
+		AppWindow* _tmp24_;
+		GError* _tmp25_;
+		const gchar* _tmp26_;
+		gchar* _tmp27_;
+		gchar* _tmp28_;
 #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		err = _inner_error_;
 #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1209,24 +1208,22 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 #line 120 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_g_object_unref0 (_tmp24_);
 #line 121 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp25_ = _ ("Unable to launch Nautilus Send-To: %s");
-#line 121 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp26_ = err;
+		_tmp25_ = err;
 #line 121 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp27_ = _tmp26_->message;
+		_tmp26_ = _tmp25_->message;
 #line 121 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp28_ = g_strdup_printf (_tmp25_, _tmp27_);
+		_tmp27_ = g_strdup_printf (_ ("Unable to launch Nautilus Send-To: %s"), _tmp26_);
 #line 121 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp29_ = _tmp28_;
+		_tmp28_ = _tmp27_;
 #line 121 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		app_window_error_message (_tmp29_, NULL);
+		app_window_error_message (_tmp28_, NULL);
 #line 121 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_g_free0 (_tmp29_);
+		_g_free0 (_tmp28_);
 #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_g_error_free0 (err);
-#line 1228 "DesktopIntegration.c"
+#line 1225 "DesktopIntegration.c"
 	}
-	__finally566:
+	__finally568:
 #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1237,49 +1234,48 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 		g_clear_error (&_inner_error_);
 #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 1241 "DesktopIntegration.c"
+#line 1238 "DesktopIntegration.c"
 	}
 #line 96 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 1245 "DesktopIntegration.c"
+#line 1242 "DesktopIntegration.c"
 }
 
 
 static void _desktop_integration_on_send_to_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
 #line 135 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	desktop_integration_on_send_to_export_completed (exporter, is_cancelled);
-#line 1252 "DesktopIntegration.c"
+#line 1249 "DesktopIntegration.c"
 }
 
 
 void desktop_integration_send_to (GeeCollection* media) {
 	gboolean _tmp0_ = FALSE;
-	GeeCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	GeeCollection* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	ExportDialog* dialog = NULL;
-	const gchar* _tmp5_ = NULL;
-	ExportDialog* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	GeeCollection* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	ExportDialog* _tmp5_;
+	gboolean _tmp6_ = FALSE;
+	GeeCollection* _tmp7_;
+	gboolean _tmp8_;
 	gint scale = 0;
 	ScaleConstraint constraint = 0;
 	ExportFormatParameters export_params = {0};
-	ExportFormatParameters _tmp14_ = {0};
-	ExportDialog* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	ScaleConstraint _tmp17_ = 0;
-	gboolean _tmp18_ = FALSE;
-	GeeCollection* _tmp19_ = NULL;
-	ScaleConstraint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	Scaling _tmp22_ = {0};
-	ExportFormatParameters _tmp23_ = {0};
-	Exporter* _tmp24_ = NULL;
-	Exporter* _tmp25_ = NULL;
-	ExporterUI* _tmp26_ = NULL;
-	ExporterUI* _tmp27_ = NULL;
+	ExportFormatParameters _tmp13_ = {0};
+	ExportDialog* _tmp14_;
+	gint _tmp15_ = 0;
+	ScaleConstraint _tmp16_ = 0;
+	gboolean _tmp17_;
+	GeeCollection* _tmp18_;
+	ScaleConstraint _tmp19_;
+	gint _tmp20_;
+	Scaling _tmp21_ = {0};
+	ExportFormatParameters _tmp22_;
+	Exporter* _tmp23_;
+	Exporter* _tmp24_;
+	ExporterUI* _tmp25_;
+	ExporterUI* _tmp26_;
 #line 125 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media));
 #line 126 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1292,135 +1288,133 @@ void desktop_integration_send_to (GeeCollection* media) {
 	if (_tmp3_ == 0) {
 #line 126 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp0_ = TRUE;
-#line 1296 "DesktopIntegration.c"
+#line 1292 "DesktopIntegration.c"
 	} else {
-		ExporterUI* _tmp4_ = NULL;
+		ExporterUI* _tmp4_;
 #line 126 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp4_ = desktop_integration_send_to_exporter;
 #line 126 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 1303 "DesktopIntegration.c"
+#line 1299 "DesktopIntegration.c"
 	}
 #line 126 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (_tmp0_) {
 #line 127 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 1309 "DesktopIntegration.c"
+#line 1305 "DesktopIntegration.c"
 	}
 #line 129 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp5_ = _ ("Send To");
-#line 129 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp6_ = export_dialog_new (_tmp5_);
+	_tmp5_ = export_dialog_new (_ ("Send To"));
 #line 129 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	g_object_ref_sink (_tmp6_);
+	g_object_ref_sink (_tmp5_);
 #line 129 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	dialog = _tmp6_;
+	dialog = _tmp5_;
 #line 134 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp8_ = media;
+	_tmp7_ = media;
 #line 134 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp9_ = media_source_collection_has_video (_tmp8_);
+	_tmp8_ = media_source_collection_has_video (_tmp7_);
 #line 134 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	if (_tmp9_) {
-#line 1325 "DesktopIntegration.c"
-		GeeCollection* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
+	if (_tmp8_) {
+#line 1319 "DesktopIntegration.c"
+		GeeCollection* _tmp9_;
+		gboolean _tmp10_;
 #line 134 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp10_ = media;
+		_tmp9_ = media;
 #line 134 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp11_ = media_source_collection_has_photo (_tmp10_);
+		_tmp10_ = media_source_collection_has_photo (_tmp9_);
 #line 134 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp7_ = !_tmp11_;
-#line 1334 "DesktopIntegration.c"
+		_tmp6_ = !_tmp10_;
+#line 1328 "DesktopIntegration.c"
 	} else {
 #line 134 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp7_ = FALSE;
-#line 1338 "DesktopIntegration.c"
+		_tmp6_ = FALSE;
+#line 1332 "DesktopIntegration.c"
 	}
 #line 134 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	if (_tmp7_) {
-#line 1342 "DesktopIntegration.c"
-		GeeCollection* _tmp12_ = NULL;
-		ExporterUI* _tmp13_ = NULL;
+	if (_tmp6_) {
+#line 1336 "DesktopIntegration.c"
+		GeeCollection* _tmp11_;
+		ExporterUI* _tmp12_;
 #line 135 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp12_ = media;
+		_tmp11_ = media;
 #line 135 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp13_ = video_export_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _desktop_integration_on_send_to_export_completed_exporter_completion_callback, NULL, TRUE);
+		_tmp12_ = video_export_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), _desktop_integration_on_send_to_export_completed_exporter_completion_callback, NULL, TRUE);
 #line 135 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_exporter_ui_unref0 (desktop_integration_send_to_exporter);
 #line 135 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		desktop_integration_send_to_exporter = _tmp13_;
+		desktop_integration_send_to_exporter = _tmp12_;
 #line 137 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_g_object_unref0 (dialog);
 #line 137 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 1357 "DesktopIntegration.c"
+#line 1351 "DesktopIntegration.c"
 	}
 #line 142 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	export_format_parameters_current (&_tmp14_);
+	export_format_parameters_current (&_tmp13_);
 #line 142 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	export_params = _tmp14_;
+	export_params = _tmp13_;
 #line 143 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp15_ = dialog;
+	_tmp14_ = dialog;
 #line 143 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp18_ = export_dialog_execute (_tmp15_, &_tmp16_, &_tmp17_, &export_params);
+	_tmp17_ = export_dialog_execute (_tmp14_, &_tmp15_, &_tmp16_, &export_params);
 #line 143 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	scale = _tmp16_;
+	scale = _tmp15_;
 #line 143 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	constraint = _tmp17_;
+	constraint = _tmp16_;
 #line 143 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	if (!_tmp18_) {
+	if (!_tmp17_) {
 #line 144 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_g_object_unref0 (dialog);
 #line 144 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 1377 "DesktopIntegration.c"
+#line 1371 "DesktopIntegration.c"
 	}
 #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp19_ = media;
+	_tmp18_ = media;
 #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp20_ = constraint;
+	_tmp19_ = constraint;
 #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp21_ = scale;
+	_tmp20_ = scale;
 #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	scaling_for_constraint (_tmp20_, _tmp21_, FALSE, &_tmp22_);
+	scaling_for_constraint (_tmp19_, _tmp20_, FALSE, &_tmp21_);
 #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp23_ = export_params;
+	_tmp22_ = export_params;
 #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp24_ = exporter_new_for_temp_file (_tmp19_, &_tmp22_, &_tmp23_);
+	_tmp23_ = exporter_new_for_temp_file (_tmp18_, &_tmp21_, &_tmp22_);
 #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp25_ = _tmp24_;
+	_tmp24_ = _tmp23_;
 #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp26_ = exporter_ui_new (_tmp25_);
+	_tmp25_ = exporter_ui_new (_tmp24_);
 #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_exporter_ui_unref0 (desktop_integration_send_to_exporter);
 #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	desktop_integration_send_to_exporter = _tmp26_;
+	desktop_integration_send_to_exporter = _tmp25_;
 #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_g_object_unref0 (_tmp25_);
+	_g_object_unref0 (_tmp24_);
 #line 148 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp27_ = desktop_integration_send_to_exporter;
+	_tmp26_ = desktop_integration_send_to_exporter;
 #line 148 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	exporter_ui_export (_tmp27_, _desktop_integration_on_send_to_export_completed_exporter_completion_callback, NULL);
+	exporter_ui_export (_tmp26_, _desktop_integration_on_send_to_export_completed_exporter_completion_callback, NULL);
 #line 125 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_g_object_unref0 (dialog);
-#line 1407 "DesktopIntegration.c"
+#line 1401 "DesktopIntegration.c"
 }
 
 
 void desktop_integration_on_send_to_export_completed (Exporter* exporter, gboolean is_cancelled) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 151 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	g_return_if_fail (IS_EXPORTER (exporter));
 #line 152 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp0_ = is_cancelled;
 #line 152 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (!_tmp0_) {
-#line 1419 "DesktopIntegration.c"
-		Exporter* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
-		GFile** _tmp3_ = NULL;
-		GFile** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
+#line 1413 "DesktopIntegration.c"
+		Exporter* _tmp1_;
+		gint _tmp2_;
+		GFile** _tmp3_;
+		GFile** _tmp4_;
+		gint _tmp4__length1;
 #line 153 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp1_ = exporter;
 #line 153 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1433,41 +1427,41 @@ void desktop_integration_on_send_to_export_completed (Exporter* exporter, gboole
 		desktop_integration_files_send_to (_tmp4_, _tmp2_);
 #line 153 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp4_ = (_vala_array_free (_tmp4_, _tmp4__length1, (GDestroyNotify) g_object_unref), NULL);
-#line 1437 "DesktopIntegration.c"
+#line 1431 "DesktopIntegration.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_exporter_ui_unref0 (desktop_integration_send_to_exporter);
 #line 155 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	desktop_integration_send_to_exporter = NULL;
-#line 1443 "DesktopIntegration.c"
+#line 1437 "DesktopIntegration.c"
 }
 
 
 void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolean screensaver) {
 	PhotoFileFormat file_format = 0;
-	Photo* _tmp0_ = NULL;
-	PhotoFileFormat _tmp1_ = 0;
+	Photo* _tmp0_;
+	PhotoFileFormat _tmp1_;
 	GFile* save_as = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	PhotoFileFormat _tmp4_ = 0;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GFile* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
-	ConfigFacade* _tmp9_ = NULL;
-	ConfigFacade* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	GFile* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gboolean _tmp16_ = FALSE;
-	gboolean _tmp35_ = FALSE;
-	gboolean _tmp41_ = FALSE;
-	GFile* _tmp47_ = NULL;
-	gchar* _tmp48_ = NULL;
-	gchar* _tmp49_ = NULL;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	PhotoFileFormat _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	GFile* _tmp7_;
+	GFile* _tmp8_;
+	ConfigFacade* _tmp9_;
+	ConfigFacade* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	GFile* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	gboolean _tmp16_;
+	gboolean _tmp34_;
+	gboolean _tmp40_;
+	GFile* _tmp46_;
+	gchar* _tmp47_;
+	gchar* _tmp48_;
 	GError * _inner_error_ = NULL;
 #line 158 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	g_return_if_fail (IS_PHOTO (photo));
@@ -1521,13 +1515,13 @@ void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolea
 	_g_object_unref0 (_tmp10_);
 #line 166 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (_tmp16_) {
-#line 1525 "DesktopIntegration.c"
-		GFile* _tmp17_ = NULL;
-		GFile* _tmp18_ = NULL;
-		PhotoFileFormat _tmp19_ = 0;
-		gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
+#line 1519 "DesktopIntegration.c"
+		GFile* _tmp17_;
+		GFile* _tmp18_;
+		PhotoFileFormat _tmp19_;
+		gchar* _tmp20_;
+		gchar* _tmp21_;
+		GFile* _tmp22_;
 #line 167 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp17_ = app_dirs_get_data_subdir ("wallpaper", NULL);
 #line 167 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1548,13 +1542,13 @@ void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolea
 		_g_free0 (_tmp21_);
 #line 167 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_g_object_unref0 (_tmp18_);
-#line 1552 "DesktopIntegration.c"
+#line 1546 "DesktopIntegration.c"
 	}
 	{
-		Photo* _tmp23_ = NULL;
-		GFile* _tmp24_ = NULL;
+		Photo* _tmp23_;
+		GFile* _tmp24_;
 		Scaling _tmp25_ = {0};
-		PhotoFileFormat _tmp26_ = 0;
+		PhotoFileFormat _tmp26_;
 #line 172 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp23_ = photo;
 #line 172 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1567,57 +1561,54 @@ void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolea
 		photo_export (_tmp23_, _tmp24_, &_tmp25_, JPEG_QUALITY_HIGH, _tmp26_, FALSE, TRUE, &_inner_error_);
 #line 172 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1571 "DesktopIntegration.c"
-			goto __catch567_g_error;
+#line 1565 "DesktopIntegration.c"
+			goto __catch569_g_error;
 		}
 	}
-	goto __finally567;
-	__catch567_g_error:
+	goto __finally569;
+	__catch569_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp27_ = NULL;
-		GFile* _tmp28_ = NULL;
-		gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		GError* _tmp31_ = NULL;
-		const gchar* _tmp32_ = NULL;
-		gchar* _tmp33_ = NULL;
-		gchar* _tmp34_ = NULL;
+		GFile* _tmp27_;
+		gchar* _tmp28_;
+		gchar* _tmp29_;
+		GError* _tmp30_;
+		const gchar* _tmp31_;
+		gchar* _tmp32_;
+		gchar* _tmp33_;
 #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		err = _inner_error_;
 #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_inner_error_ = NULL;
 #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp27_ = _ ("Unable to export background to %s: %s");
-#line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp28_ = save_as;
+		_tmp27_ = save_as;
 #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp29_ = g_file_get_path (_tmp28_);
+		_tmp28_ = g_file_get_path (_tmp27_);
 #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp30_ = _tmp29_;
+		_tmp29_ = _tmp28_;
 #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp31_ = err;
+		_tmp30_ = err;
 #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp32_ = _tmp31_->message;
+		_tmp31_ = _tmp30_->message;
 #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp33_ = g_strdup_printf (_tmp27_, _tmp30_, _tmp32_);
+		_tmp32_ = g_strdup_printf (_ ("Unable to export background to %s: %s"), _tmp29_, _tmp31_);
 #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp34_ = _tmp33_;
+		_tmp33_ = _tmp32_;
 #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		app_window_error_message (_tmp34_, NULL);
+		app_window_error_message (_tmp33_, NULL);
 #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_g_free0 (_tmp34_);
+		_g_free0 (_tmp33_);
 #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_g_free0 (_tmp30_);
+		_g_free0 (_tmp29_);
 #line 177 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_g_error_free0 (err);
 #line 177 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_g_object_unref0 (save_as);
 #line 177 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 1619 "DesktopIntegration.c"
+#line 1610 "DesktopIntegration.c"
 	}
-	__finally567:
+	__finally569:
 #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1628,95 +1619,95 @@ void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolea
 		g_clear_error (&_inner_error_);
 #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 1632 "DesktopIntegration.c"
+#line 1623 "DesktopIntegration.c"
 	}
 #line 180 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp35_ = desktop;
+	_tmp34_ = desktop;
 #line 180 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	if (_tmp35_) {
-#line 1638 "DesktopIntegration.c"
-		ConfigFacade* _tmp36_ = NULL;
-		ConfigFacade* _tmp37_ = NULL;
-		GFile* _tmp38_ = NULL;
-		gchar* _tmp39_ = NULL;
-		gchar* _tmp40_ = NULL;
+	if (_tmp34_) {
+#line 1629 "DesktopIntegration.c"
+		ConfigFacade* _tmp35_;
+		ConfigFacade* _tmp36_;
+		GFile* _tmp37_;
+		gchar* _tmp38_;
+		gchar* _tmp39_;
 #line 181 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp36_ = config_facade_get_instance ();
+		_tmp35_ = config_facade_get_instance ();
 #line 181 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp37_ = _tmp36_;
+		_tmp36_ = _tmp35_;
 #line 181 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp38_ = save_as;
+		_tmp37_ = save_as;
 #line 181 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp39_ = g_file_get_path (_tmp38_);
+		_tmp38_ = g_file_get_path (_tmp37_);
 #line 181 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp40_ = _tmp39_;
+		_tmp39_ = _tmp38_;
 #line 181 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		configuration_facade_set_desktop_background (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp40_);
+		configuration_facade_set_desktop_background (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp39_);
 #line 181 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_g_free0 (_tmp40_);
+		_g_free0 (_tmp39_);
 #line 181 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_g_object_unref0 (_tmp37_);
-#line 1660 "DesktopIntegration.c"
+		_g_object_unref0 (_tmp36_);
+#line 1651 "DesktopIntegration.c"
 	}
 #line 183 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp41_ = screensaver;
+	_tmp40_ = screensaver;
 #line 183 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	if (_tmp41_) {
-#line 1666 "DesktopIntegration.c"
-		ConfigFacade* _tmp42_ = NULL;
-		ConfigFacade* _tmp43_ = NULL;
-		GFile* _tmp44_ = NULL;
-		gchar* _tmp45_ = NULL;
-		gchar* _tmp46_ = NULL;
+	if (_tmp40_) {
+#line 1657 "DesktopIntegration.c"
+		ConfigFacade* _tmp41_;
+		ConfigFacade* _tmp42_;
+		GFile* _tmp43_;
+		gchar* _tmp44_;
+		gchar* _tmp45_;
 #line 184 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp42_ = config_facade_get_instance ();
+		_tmp41_ = config_facade_get_instance ();
 #line 184 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp43_ = _tmp42_;
+		_tmp42_ = _tmp41_;
 #line 184 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp44_ = save_as;
+		_tmp43_ = save_as;
 #line 184 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp45_ = g_file_get_path (_tmp44_);
+		_tmp44_ = g_file_get_path (_tmp43_);
 #line 184 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp46_ = _tmp45_;
+		_tmp45_ = _tmp44_;
 #line 184 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		configuration_facade_set_screensaver (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp46_);
+		configuration_facade_set_screensaver (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp45_);
 #line 184 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_g_free0 (_tmp46_);
+		_g_free0 (_tmp45_);
 #line 184 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_g_object_unref0 (_tmp43_);
-#line 1688 "DesktopIntegration.c"
+		_g_object_unref0 (_tmp42_);
+#line 1679 "DesktopIntegration.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp47_ = save_as;
+	_tmp46_ = save_as;
 #line 187 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp48_ = g_file_get_parse_name (_tmp47_);
+	_tmp47_ = g_file_get_parse_name (_tmp46_);
 #line 187 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp49_ = _tmp48_;
+	_tmp48_ = _tmp47_;
 #line 187 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	g_chmod (_tmp49_, 0644);
+	g_chmod (_tmp48_, 0644);
 #line 187 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_g_free0 (_tmp49_);
+	_g_free0 (_tmp48_);
 #line 158 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_g_object_unref0 (save_as);
-#line 1702 "DesktopIntegration.c"
+#line 1693 "DesktopIntegration.c"
 }
 
 
 DesktopIntegrationBackgroundSlideshowXMLBuilder* desktop_integration_background_slideshow_xml_builder_construct (GType object_type, GFile* destination, gdouble duration, gdouble transition) {
 	DesktopIntegrationBackgroundSlideshowXMLBuilder* self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	GFile* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	GFile* _tmp12_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gdouble _tmp2_;
+	gdouble _tmp3_;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
+	GFile* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	GFile* _tmp12_;
 #line 202 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	g_return_val_if_fail (G_IS_FILE (destination), NULL);
 #line 202 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1767,23 +1758,23 @@ DesktopIntegrationBackgroundSlideshowXMLBuilder* desktop_integration_background_
 	_g_object_unref0 (_tmp6_);
 #line 202 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	return self;
-#line 1771 "DesktopIntegration.c"
+#line 1762 "DesktopIntegration.c"
 }
 
 
 DesktopIntegrationBackgroundSlideshowXMLBuilder* desktop_integration_background_slideshow_xml_builder_new (GFile* destination, gdouble duration, gdouble transition) {
 #line 202 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	return desktop_integration_background_slideshow_xml_builder_construct (DESKTOP_INTEGRATION_TYPE_BACKGROUND_SLIDESHOW_XML_BUILDER, destination, duration, transition);
-#line 1778 "DesktopIntegration.c"
+#line 1769 "DesktopIntegration.c"
 }
 
 
 void desktop_integration_background_slideshow_xml_builder_open (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GError** error) {
 	GFileOutputStream* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFileOutputStream* _tmp2_ = NULL;
-	GDataOutputStream* _tmp3_ = NULL;
-	GDataOutputStream* _tmp4_ = NULL;
+	GFile* _tmp1_;
+	GFileOutputStream* _tmp2_;
+	GDataOutputStream* _tmp3_;
+	GDataOutputStream* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 210 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	g_return_if_fail (DESKTOP_INTEGRATION_IS_BACKGROUND_SLIDESHOW_XML_BUILDER (self));
@@ -1799,7 +1790,7 @@ void desktop_integration_background_slideshow_xml_builder_open (DesktopIntegrati
 		g_propagate_error (error, _inner_error_);
 #line 211 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 1803 "DesktopIntegration.c"
+#line 1794 "DesktopIntegration.c"
 	}
 #line 211 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp3_ = g_data_output_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_output_stream_get_type (), GOutputStream));
@@ -1819,37 +1810,37 @@ void desktop_integration_background_slideshow_xml_builder_open (DesktopIntegrati
 		_g_object_unref0 (_tmp0_);
 #line 212 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 1823 "DesktopIntegration.c"
+#line 1814 "DesktopIntegration.c"
 	}
 #line 210 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_g_object_unref0 (_tmp0_);
-#line 1827 "DesktopIntegration.c"
+#line 1818 "DesktopIntegration.c"
 }
 
 
 static void desktop_integration_background_slideshow_xml_builder_write_transition (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GFile* from, GFile* to, GError** error) {
-	GDataOutputStream* _tmp0_ = NULL;
-	GDataOutputStream* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GDataOutputStream* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	GDataOutputStream* _tmp13_ = NULL;
-	GFile* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	GDataOutputStream* _tmp21_ = NULL;
+	GDataOutputStream* _tmp0_;
+	GDataOutputStream* _tmp1_;
+	gdouble _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GDataOutputStream* _tmp5_;
+	GFile* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	GDataOutputStream* _tmp13_;
+	GFile* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
+	gchar* _tmp20_;
+	GDataOutputStream* _tmp21_;
 	GError * _inner_error_ = NULL;
 #line 215 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	g_return_if_fail (DESKTOP_INTEGRATION_IS_BACKGROUND_SLIDESHOW_XML_BUILDER (self));
@@ -1867,7 +1858,7 @@ static void desktop_integration_background_slideshow_xml_builder_write_transitio
 		g_propagate_error (error, _inner_error_);
 #line 216 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 1871 "DesktopIntegration.c"
+#line 1862 "DesktopIntegration.c"
 	}
 #line 217 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp1_ = self->priv->outs;
@@ -1887,7 +1878,7 @@ static void desktop_integration_background_slideshow_xml_builder_write_transitio
 		g_propagate_error (error, _inner_error_);
 #line 217 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 1891 "DesktopIntegration.c"
+#line 1882 "DesktopIntegration.c"
 	}
 #line 218 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp5_ = self->priv->outs;
@@ -1919,7 +1910,7 @@ static void desktop_integration_background_slideshow_xml_builder_write_transitio
 		g_propagate_error (error, _inner_error_);
 #line 218 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 1923 "DesktopIntegration.c"
+#line 1914 "DesktopIntegration.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp13_ = self->priv->outs;
@@ -1951,7 +1942,7 @@ static void desktop_integration_background_slideshow_xml_builder_write_transitio
 		g_propagate_error (error, _inner_error_);
 #line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 1955 "DesktopIntegration.c"
+#line 1946 "DesktopIntegration.c"
 	}
 #line 220 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp21_ = self->priv->outs;
@@ -1963,26 +1954,26 @@ static void desktop_integration_background_slideshow_xml_builder_write_transitio
 		g_propagate_error (error, _inner_error_);
 #line 220 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 1967 "DesktopIntegration.c"
+#line 1958 "DesktopIntegration.c"
 	}
 }
 
 
 static void desktop_integration_background_slideshow_xml_builder_write_static (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GFile* file, GError** error) {
-	GDataOutputStream* _tmp0_ = NULL;
-	GDataOutputStream* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GDataOutputStream* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	GDataOutputStream* _tmp13_ = NULL;
+	GDataOutputStream* _tmp0_;
+	GDataOutputStream* _tmp1_;
+	gdouble _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GDataOutputStream* _tmp5_;
+	GFile* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	GDataOutputStream* _tmp13_;
 	GError * _inner_error_ = NULL;
 #line 223 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	g_return_if_fail (DESKTOP_INTEGRATION_IS_BACKGROUND_SLIDESHOW_XML_BUILDER (self));
@@ -1998,7 +1989,7 @@ static void desktop_integration_background_slideshow_xml_builder_write_static (D
 		g_propagate_error (error, _inner_error_);
 #line 224 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 2002 "DesktopIntegration.c"
+#line 1993 "DesktopIntegration.c"
 	}
 #line 225 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp1_ = self->priv->outs;
@@ -2018,7 +2009,7 @@ static void desktop_integration_background_slideshow_xml_builder_write_static (D
 		g_propagate_error (error, _inner_error_);
 #line 225 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 2022 "DesktopIntegration.c"
+#line 2013 "DesktopIntegration.c"
 	}
 #line 226 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp5_ = self->priv->outs;
@@ -2050,7 +2041,7 @@ static void desktop_integration_background_slideshow_xml_builder_write_static (D
 		g_propagate_error (error, _inner_error_);
 #line 226 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 2054 "DesktopIntegration.c"
+#line 2045 "DesktopIntegration.c"
 	}
 #line 227 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp13_ = self->priv->outs;
@@ -2062,18 +2053,18 @@ static void desktop_integration_background_slideshow_xml_builder_write_static (D
 		g_propagate_error (error, _inner_error_);
 #line 227 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 2066 "DesktopIntegration.c"
+#line 2057 "DesktopIntegration.c"
 	}
 }
 
 
 void desktop_integration_background_slideshow_xml_builder_add_photo (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GFile* file, GError** error) {
-	GDataOutputStream* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
+	GDataOutputStream* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp4_;
+	GFile* _tmp7_;
+	GFile* _tmp8_;
+	GFile* _tmp9_;
 	GError * _inner_error_ = NULL;
 #line 230 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	g_return_if_fail (DESKTOP_INTEGRATION_IS_BACKGROUND_SLIDESHOW_XML_BUILDER (self));
@@ -2087,9 +2078,9 @@ void desktop_integration_background_slideshow_xml_builder_add_photo (DesktopInte
 	_tmp1_ = self->priv->first_file;
 #line 233 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (_tmp1_ == NULL) {
-#line 2091 "DesktopIntegration.c"
-		GFile* _tmp2_ = NULL;
-		GFile* _tmp3_ = NULL;
+#line 2082 "DesktopIntegration.c"
+		GFile* _tmp2_;
+		GFile* _tmp3_;
 #line 234 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp2_ = file;
 #line 234 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2098,15 +2089,15 @@ void desktop_integration_background_slideshow_xml_builder_add_photo (DesktopInte
 		_g_object_unref0 (self->priv->first_file);
 #line 234 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		self->priv->first_file = _tmp3_;
-#line 2102 "DesktopIntegration.c"
+#line 2093 "DesktopIntegration.c"
 	}
 #line 236 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp4_ = self->priv->last_file;
 #line 236 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (_tmp4_ != NULL) {
-#line 2108 "DesktopIntegration.c"
-		GFile* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
+#line 2099 "DesktopIntegration.c"
+		GFile* _tmp5_;
+		GFile* _tmp6_;
 #line 237 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp5_ = self->priv->last_file;
 #line 237 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2119,7 +2110,7 @@ void desktop_integration_background_slideshow_xml_builder_add_photo (DesktopInte
 			g_propagate_error (error, _inner_error_);
 #line 237 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 			return;
-#line 2123 "DesktopIntegration.c"
+#line 2114 "DesktopIntegration.c"
 		}
 	}
 #line 239 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2132,7 +2123,7 @@ void desktop_integration_background_slideshow_xml_builder_add_photo (DesktopInte
 		g_propagate_error (error, _inner_error_);
 #line 239 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 2136 "DesktopIntegration.c"
+#line 2127 "DesktopIntegration.c"
 	}
 #line 241 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp8_ = file;
@@ -2142,24 +2133,24 @@ void desktop_integration_background_slideshow_xml_builder_add_photo (DesktopInte
 	_g_object_unref0 (self->priv->last_file);
 #line 241 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	self->priv->last_file = _tmp9_;
-#line 2146 "DesktopIntegration.c"
+#line 2137 "DesktopIntegration.c"
 }
 
 
 GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GError** error) {
 	GFile* result = NULL;
-	GDataOutputStream* _tmp0_ = NULL;
+	GDataOutputStream* _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	GFile* _tmp2_ = NULL;
-	GDataOutputStream* _tmp6_ = NULL;
-	GDataOutputStream* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	GFile* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	GFile* _tmp13_ = NULL;
-	GFile* _tmp14_ = NULL;
+	GFile* _tmp2_;
+	GDataOutputStream* _tmp6_;
+	GDataOutputStream* _tmp7_;
+	GFile* _tmp8_;
+	GFile* _tmp9_;
+	GFile* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	GFile* _tmp13_;
+	GFile* _tmp14_;
 	GError * _inner_error_ = NULL;
 #line 244 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	g_return_val_if_fail (DESKTOP_INTEGRATION_IS_BACKGROUND_SLIDESHOW_XML_BUILDER (self), NULL);
@@ -2171,29 +2162,29 @@ GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegr
 		result = NULL;
 #line 246 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return result;
-#line 2175 "DesktopIntegration.c"
+#line 2166 "DesktopIntegration.c"
 	}
 #line 249 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp2_ = self->priv->first_file;
 #line 249 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (_tmp2_ != NULL) {
-#line 2181 "DesktopIntegration.c"
-		GFile* _tmp3_ = NULL;
+#line 2172 "DesktopIntegration.c"
+		GFile* _tmp3_;
 #line 249 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp3_ = self->priv->last_file;
 #line 249 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 2187 "DesktopIntegration.c"
+#line 2178 "DesktopIntegration.c"
 	} else {
 #line 249 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp1_ = FALSE;
-#line 2191 "DesktopIntegration.c"
+#line 2182 "DesktopIntegration.c"
 	}
 #line 249 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (_tmp1_) {
-#line 2195 "DesktopIntegration.c"
-		GFile* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
+#line 2186 "DesktopIntegration.c"
+		GFile* _tmp4_;
+		GFile* _tmp5_;
 #line 250 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp4_ = self->priv->last_file;
 #line 250 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2206,7 +2197,7 @@ GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegr
 			g_propagate_error (error, _inner_error_);
 #line 250 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 			return NULL;
-#line 2210 "DesktopIntegration.c"
+#line 2201 "DesktopIntegration.c"
 		}
 	}
 #line 252 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2219,7 +2210,7 @@ GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegr
 		g_propagate_error (error, _inner_error_);
 #line 252 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return NULL;
-#line 2223 "DesktopIntegration.c"
+#line 2214 "DesktopIntegration.c"
 	}
 #line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp7_ = self->priv->outs;
@@ -2231,7 +2222,7 @@ GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegr
 		g_propagate_error (error, _inner_error_);
 #line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return NULL;
-#line 2235 "DesktopIntegration.c"
+#line 2226 "DesktopIntegration.c"
 	}
 #line 255 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_g_object_unref0 (self->priv->outs);
@@ -2249,7 +2240,7 @@ GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegr
 		g_propagate_error (error, _inner_error_);
 #line 258 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return NULL;
-#line 2253 "DesktopIntegration.c"
+#line 2244 "DesktopIntegration.c"
 	}
 #line 259 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp10_ = self->priv->destination;
@@ -2269,14 +2260,14 @@ GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegr
 	result = _tmp14_;
 #line 261 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	return result;
-#line 2273 "DesktopIntegration.c"
+#line 2264 "DesktopIntegration.c"
 }
 
 
 static void desktop_integration_value_background_slideshow_xml_builder_init (GValue* value) {
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	value->data[0].v_pointer = NULL;
-#line 2280 "DesktopIntegration.c"
+#line 2271 "DesktopIntegration.c"
 }
 
 
@@ -2285,7 +2276,7 @@ static void desktop_integration_value_background_slideshow_xml_builder_free_valu
 	if (value->data[0].v_pointer) {
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		desktop_integration_background_slideshow_xml_builder_unref (value->data[0].v_pointer);
-#line 2289 "DesktopIntegration.c"
+#line 2280 "DesktopIntegration.c"
 	}
 }
 
@@ -2295,11 +2286,11 @@ static void desktop_integration_value_background_slideshow_xml_builder_copy_valu
 	if (src_value->data[0].v_pointer) {
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		dest_value->data[0].v_pointer = desktop_integration_background_slideshow_xml_builder_ref (src_value->data[0].v_pointer);
-#line 2299 "DesktopIntegration.c"
+#line 2290 "DesktopIntegration.c"
 	} else {
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2303 "DesktopIntegration.c"
+#line 2294 "DesktopIntegration.c"
 	}
 }
 
@@ -2307,66 +2298,66 @@ static void desktop_integration_value_background_slideshow_xml_builder_copy_valu
 static gpointer desktop_integration_value_background_slideshow_xml_builder_peek_pointer (const GValue* value) {
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	return value->data[0].v_pointer;
-#line 2311 "DesktopIntegration.c"
+#line 2302 "DesktopIntegration.c"
 }
 
 
 static gchar* desktop_integration_value_background_slideshow_xml_builder_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (collect_values[0].v_pointer) {
-#line 2318 "DesktopIntegration.c"
-		DesktopIntegrationBackgroundSlideshowXMLBuilder* object;
+#line 2309 "DesktopIntegration.c"
+		DesktopIntegrationBackgroundSlideshowXMLBuilder * object;
 		object = collect_values[0].v_pointer;
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2325 "DesktopIntegration.c"
+#line 2316 "DesktopIntegration.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2329 "DesktopIntegration.c"
+#line 2320 "DesktopIntegration.c"
 		}
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		value->data[0].v_pointer = desktop_integration_background_slideshow_xml_builder_ref (object);
-#line 2333 "DesktopIntegration.c"
+#line 2324 "DesktopIntegration.c"
 	} else {
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		value->data[0].v_pointer = NULL;
-#line 2337 "DesktopIntegration.c"
+#line 2328 "DesktopIntegration.c"
 	}
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	return NULL;
-#line 2341 "DesktopIntegration.c"
+#line 2332 "DesktopIntegration.c"
 }
 
 
 static gchar* desktop_integration_value_background_slideshow_xml_builder_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	DesktopIntegrationBackgroundSlideshowXMLBuilder** object_p;
+	DesktopIntegrationBackgroundSlideshowXMLBuilder ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (!object_p) {
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2352 "DesktopIntegration.c"
+#line 2343 "DesktopIntegration.c"
 	}
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (!value->data[0].v_pointer) {
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		*object_p = NULL;
-#line 2358 "DesktopIntegration.c"
+#line 2349 "DesktopIntegration.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2362 "DesktopIntegration.c"
+#line 2353 "DesktopIntegration.c"
 	} else {
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		*object_p = desktop_integration_background_slideshow_xml_builder_ref (value->data[0].v_pointer);
-#line 2366 "DesktopIntegration.c"
+#line 2357 "DesktopIntegration.c"
 	}
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	return NULL;
-#line 2370 "DesktopIntegration.c"
+#line 2361 "DesktopIntegration.c"
 }
 
 
@@ -2380,7 +2371,7 @@ GParamSpec* desktop_integration_param_spec_background_slideshow_xml_builder (con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	return G_PARAM_SPEC (spec);
-#line 2384 "DesktopIntegration.c"
+#line 2375 "DesktopIntegration.c"
 }
 
 
@@ -2389,12 +2380,12 @@ gpointer desktop_integration_value_get_background_slideshow_xml_builder (const G
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DESKTOP_INTEGRATION_TYPE_BACKGROUND_SLIDESHOW_XML_BUILDER), NULL);
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	return value->data[0].v_pointer;
-#line 2393 "DesktopIntegration.c"
+#line 2384 "DesktopIntegration.c"
 }
 
 
 void desktop_integration_value_set_background_slideshow_xml_builder (GValue* value, gpointer v_object) {
-	DesktopIntegrationBackgroundSlideshowXMLBuilder* old;
+	DesktopIntegrationBackgroundSlideshowXMLBuilder * old;
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DESKTOP_INTEGRATION_TYPE_BACKGROUND_SLIDESHOW_XML_BUILDER));
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2409,23 +2400,23 @@ void desktop_integration_value_set_background_slideshow_xml_builder (GValue* val
 		value->data[0].v_pointer = v_object;
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		desktop_integration_background_slideshow_xml_builder_ref (value->data[0].v_pointer);
-#line 2413 "DesktopIntegration.c"
+#line 2404 "DesktopIntegration.c"
 	} else {
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		value->data[0].v_pointer = NULL;
-#line 2417 "DesktopIntegration.c"
+#line 2408 "DesktopIntegration.c"
 	}
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (old) {
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		desktop_integration_background_slideshow_xml_builder_unref (old);
-#line 2423 "DesktopIntegration.c"
+#line 2414 "DesktopIntegration.c"
 	}
 }
 
 
 void desktop_integration_value_take_background_slideshow_xml_builder (GValue* value, gpointer v_object) {
-	DesktopIntegrationBackgroundSlideshowXMLBuilder* old;
+	DesktopIntegrationBackgroundSlideshowXMLBuilder * old;
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DESKTOP_INTEGRATION_TYPE_BACKGROUND_SLIDESHOW_XML_BUILDER));
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2438,17 +2429,17 @@ void desktop_integration_value_take_background_slideshow_xml_builder (GValue* va
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		value->data[0].v_pointer = v_object;
-#line 2442 "DesktopIntegration.c"
+#line 2433 "DesktopIntegration.c"
 	} else {
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		value->data[0].v_pointer = NULL;
-#line 2446 "DesktopIntegration.c"
+#line 2437 "DesktopIntegration.c"
 	}
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (old) {
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		desktop_integration_background_slideshow_xml_builder_unref (old);
-#line 2452 "DesktopIntegration.c"
+#line 2443 "DesktopIntegration.c"
 	}
 }
 
@@ -2460,7 +2451,7 @@ static void desktop_integration_background_slideshow_xml_builder_class_init (Des
 	((DesktopIntegrationBackgroundSlideshowXMLBuilderClass *) klass)->finalize = desktop_integration_background_slideshow_xml_builder_finalize;
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	g_type_class_add_private (klass, sizeof (DesktopIntegrationBackgroundSlideshowXMLBuilderPrivate));
-#line 2464 "DesktopIntegration.c"
+#line 2455 "DesktopIntegration.c"
 }
 
 
@@ -2475,11 +2466,11 @@ static void desktop_integration_background_slideshow_xml_builder_instance_init (
 	self->priv->last_file = NULL;
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	self->ref_count = 1;
-#line 2479 "DesktopIntegration.c"
+#line 2470 "DesktopIntegration.c"
 }
 
 
-static void desktop_integration_background_slideshow_xml_builder_finalize (DesktopIntegrationBackgroundSlideshowXMLBuilder* obj) {
+static void desktop_integration_background_slideshow_xml_builder_finalize (DesktopIntegrationBackgroundSlideshowXMLBuilder * obj) {
 	DesktopIntegrationBackgroundSlideshowXMLBuilder * self;
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DESKTOP_INTEGRATION_TYPE_BACKGROUND_SLIDESHOW_XML_BUILDER, DesktopIntegrationBackgroundSlideshowXMLBuilder);
@@ -2495,7 +2486,7 @@ static void desktop_integration_background_slideshow_xml_builder_finalize (Deskt
 	_g_object_unref0 (self->priv->first_file);
 #line 200 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_g_object_unref0 (self->priv->last_file);
-#line 2499 "DesktopIntegration.c"
+#line 2490 "DesktopIntegration.c"
 }
 
 
@@ -2514,18 +2505,18 @@ GType desktop_integration_background_slideshow_xml_builder_get_type (void) {
 
 
 gpointer desktop_integration_background_slideshow_xml_builder_ref (gpointer instance) {
-	DesktopIntegrationBackgroundSlideshowXMLBuilder* self;
+	DesktopIntegrationBackgroundSlideshowXMLBuilder * self;
 	self = instance;
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	return instance;
-#line 2524 "DesktopIntegration.c"
+#line 2515 "DesktopIntegration.c"
 }
 
 
 void desktop_integration_background_slideshow_xml_builder_unref (gpointer instance) {
-	DesktopIntegrationBackgroundSlideshowXMLBuilder* self;
+	DesktopIntegrationBackgroundSlideshowXMLBuilder * self;
 	self = instance;
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2533,7 +2524,7 @@ void desktop_integration_background_slideshow_xml_builder_unref (gpointer instan
 		DESKTOP_INTEGRATION_BACKGROUND_SLIDESHOW_XML_BUILDER_GET_CLASS (self)->finalize (self);
 #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2537 "DesktopIntegration.c"
+#line 2528 "DesktopIntegration.c"
 	}
 }
 
@@ -2541,33 +2532,33 @@ void desktop_integration_background_slideshow_xml_builder_unref (gpointer instan
 static void _desktop_integration_on_desktop_slideshow_exported_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
 #line 290 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	desktop_integration_on_desktop_slideshow_exported (exporter, is_cancelled);
-#line 2545 "DesktopIntegration.c"
+#line 2536 "DesktopIntegration.c"
 }
 
 
 void desktop_integration_set_background_slideshow (GeeCollection* photos, gdouble duration, gdouble transition, gboolean desktop_background, gboolean screensaver) {
-	ExporterUI* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	ExporterUI* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 	GFile* wallpaper_dir = NULL;
-	GFile* _tmp3_ = NULL;
+	GFile* _tmp3_;
 	GeeSet* exceptions = NULL;
-	GeeHashSet* _tmp4_ = NULL;
-	GeeSet* _tmp5_ = NULL;
-	gdouble _tmp10_ = 0.0;
-	gdouble _tmp11_ = 0.0;
+	GeeHashSet* _tmp4_;
+	GeeSet* _tmp5_;
+	gdouble _tmp10_;
+	gdouble _tmp11_;
 	Exporter* exporter = NULL;
-	GeeCollection* _tmp12_ = NULL;
-	GFile* _tmp13_ = NULL;
-	AppWindow* _tmp14_ = NULL;
-	AppWindow* _tmp15_ = NULL;
+	GeeCollection* _tmp12_;
+	GFile* _tmp13_;
+	AppWindow* _tmp14_;
+	AppWindow* _tmp15_;
 	Scaling _tmp16_ = {0};
 	ExportFormatParameters _tmp17_ = {0};
-	Exporter* _tmp18_ = NULL;
-	Exporter* _tmp19_ = NULL;
-	Exporter* _tmp20_ = NULL;
-	ExporterUI* _tmp21_ = NULL;
-	ExporterUI* _tmp22_ = NULL;
+	Exporter* _tmp18_;
+	Exporter* _tmp19_;
+	Exporter* _tmp20_;
+	ExporterUI* _tmp21_;
+	ExporterUI* _tmp22_;
 	GError * _inner_error_ = NULL;
 #line 265 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (photos));
@@ -2577,7 +2568,7 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl
 	if (_tmp0_ != NULL) {
 #line 268 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 2581 "DesktopIntegration.c"
+#line 2572 "DesktopIntegration.c"
 	}
 #line 270 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp1_ = desktop_background;
@@ -2599,10 +2590,10 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl
 	_tmp5_ = exceptions;
 #line 276 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), DESKTOP_INTEGRATION_DESKTOP_SLIDESHOW_XML_FILENAME);
-#line 2603 "DesktopIntegration.c"
+#line 2594 "DesktopIntegration.c"
 	{
-		GFile* _tmp6_ = NULL;
-		GeeSet* _tmp7_ = NULL;
+		GFile* _tmp6_;
+		GeeSet* _tmp7_;
 #line 278 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp6_ = wallpaper_dir;
 #line 278 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2611,16 +2602,16 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl
 		delete_all_files (_tmp6_, _tmp7_, NULL, NULL, (guint64) 0, NULL, &_inner_error_);
 #line 278 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2615 "DesktopIntegration.c"
-			goto __catch568_g_error;
+#line 2606 "DesktopIntegration.c"
+			goto __catch570_g_error;
 		}
 	}
-	goto __finally568;
-	__catch568_g_error:
+	goto __finally570;
+	__catch570_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
+		GError* _tmp8_;
+		const gchar* _tmp9_;
 #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		err = _inner_error_;
 #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2634,9 +2625,9 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl
 "tory: %s", _tmp9_);
 #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_g_error_free0 (err);
-#line 2637 "DesktopIntegration.c"
+#line 2628 "DesktopIntegration.c"
 	}
-	__finally568:
+	__finally570:
 #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2649,7 +2640,7 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl
 		g_clear_error (&_inner_error_);
 #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 2652 "DesktopIntegration.c"
+#line 2643 "DesktopIntegration.c"
 	}
 #line 283 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp10_ = duration;
@@ -2697,24 +2688,24 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl
 	_g_object_unref0 (exceptions);
 #line 265 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_g_object_unref0 (wallpaper_dir);
-#line 2700 "DesktopIntegration.c"
+#line 2691 "DesktopIntegration.c"
 }
 
 
 void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboolean is_cancelled) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	GFile* xml_file = NULL;
 	DesktopIntegrationBackgroundSlideshowXMLBuilder* xml_builder = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
-	DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp7_ = NULL;
-	DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp8_ = NULL;
-	gboolean _tmp25_ = FALSE;
-	gboolean _tmp31_ = FALSE;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
+	DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp7_;
+	DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp8_;
+	gboolean _tmp24_;
+	gboolean _tmp30_;
 	GError * _inner_error_ = NULL;
 #line 293 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	g_return_if_fail (IS_EXPORTER (exporter));
@@ -2728,7 +2719,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 	if (_tmp0_) {
 #line 297 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 2731 "DesktopIntegration.c"
+#line 2722 "DesktopIntegration.c"
 	}
 #line 299 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	xml_file = NULL;
@@ -2754,30 +2745,30 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 	_g_object_unref0 (_tmp2_);
 #line 300 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	xml_builder = _tmp8_;
-#line 2757 "DesktopIntegration.c"
+#line 2748 "DesktopIntegration.c"
 	{
-		DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp9_ = NULL;
-		Exporter* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		GFile** _tmp12_ = NULL;
+		DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp9_;
+		Exporter* _tmp10_;
+		gint _tmp11_;
+		GFile** _tmp12_;
 		GFile* _tmp16_ = NULL;
-		DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp17_ = NULL;
-		GFile* _tmp18_ = NULL;
-		GFile* _tmp19_ = NULL;
+		DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp17_;
+		GFile* _tmp18_;
+		GFile* _tmp19_;
 #line 304 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp9_ = xml_builder;
 #line 304 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		desktop_integration_background_slideshow_xml_builder_open (_tmp9_, &_inner_error_);
 #line 304 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2773 "DesktopIntegration.c"
-			goto __catch569_g_error;
+#line 2764 "DesktopIntegration.c"
+			goto __catch571_g_error;
 		}
 #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp10_ = exporter;
 #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp12_ = exporter_get_exported_files (_tmp10_, &_tmp11_);
-#line 2780 "DesktopIntegration.c"
+#line 2771 "DesktopIntegration.c"
 		{
 			GFile** file_collection = NULL;
 			gint file_collection_length1 = 0;
@@ -2789,17 +2780,17 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 			file_collection_length1 = _tmp11_;
 #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 			for (file_it = 0; file_it < _tmp11_; file_it = file_it + 1) {
-#line 2792 "DesktopIntegration.c"
-				GFile* _tmp13_ = NULL;
+#line 2783 "DesktopIntegration.c"
+				GFile* _tmp13_;
 				GFile* file = NULL;
 #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 				_tmp13_ = _g_object_ref0 (file_collection[file_it]);
 #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 				file = _tmp13_;
-#line 2799 "DesktopIntegration.c"
+#line 2790 "DesktopIntegration.c"
 				{
-					DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp14_ = NULL;
-					GFile* _tmp15_ = NULL;
+					DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp14_;
+					GFile* _tmp15_;
 #line 307 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 					_tmp14_ = xml_builder;
 #line 307 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2812,17 +2803,17 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 						_g_object_unref0 (file);
 #line 307 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 						file_collection = (_vala_array_free (file_collection, file_collection_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2815 "DesktopIntegration.c"
-						goto __catch569_g_error;
+#line 2806 "DesktopIntegration.c"
+						goto __catch571_g_error;
 					}
 #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 					_g_object_unref0 (file);
-#line 2820 "DesktopIntegration.c"
+#line 2811 "DesktopIntegration.c"
 				}
 			}
 #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 			file_collection = (_vala_array_free (file_collection, file_collection_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2825 "DesktopIntegration.c"
+#line 2816 "DesktopIntegration.c"
 		}
 #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp17_ = xml_builder;
@@ -2832,8 +2823,8 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 		_tmp16_ = _tmp18_;
 #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2835 "DesktopIntegration.c"
-			goto __catch569_g_error;
+#line 2826 "DesktopIntegration.c"
+			goto __catch571_g_error;
 		}
 #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp19_ = _tmp16_;
@@ -2845,35 +2836,32 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 		xml_file = _tmp19_;
 #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_g_object_unref0 (_tmp16_);
-#line 2848 "DesktopIntegration.c"
+#line 2839 "DesktopIntegration.c"
 	}
-	goto __finally569;
-	__catch569_g_error:
+	goto __finally571;
+	__catch571_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp20_ = NULL;
-		GError* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
+		GError* _tmp20_;
+		const gchar* _tmp21_;
+		gchar* _tmp22_;
+		gchar* _tmp23_;
 #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		err = _inner_error_;
 #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_inner_error_ = NULL;
 #line 311 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp20_ = _ ("Unable to prepare desktop slideshow: %s");
-#line 311 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp21_ = err;
+		_tmp20_ = err;
 #line 311 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp22_ = _tmp21_->message;
+		_tmp21_ = _tmp20_->message;
 #line 311 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp23_ = g_strdup_printf (_tmp20_, _tmp22_);
+		_tmp22_ = g_strdup_printf (_ ("Unable to prepare desktop slideshow: %s"), _tmp21_);
 #line 311 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp24_ = _tmp23_;
+		_tmp23_ = _tmp22_;
 #line 311 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		app_window_error_message (_tmp24_, NULL);
+		app_window_error_message (_tmp23_, NULL);
 #line 311 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_g_free0 (_tmp24_);
+		_g_free0 (_tmp23_);
 #line 314 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_g_error_free0 (err);
 #line 314 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2882,9 +2870,9 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 		_g_object_unref0 (xml_file);
 #line 314 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 2885 "DesktopIntegration.c"
+#line 2873 "DesktopIntegration.c"
 	}
-	__finally569:
+	__finally571:
 #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2897,69 +2885,69 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 		g_clear_error (&_inner_error_);
 #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		return;
-#line 2900 "DesktopIntegration.c"
+#line 2888 "DesktopIntegration.c"
 	}
 #line 317 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp25_ = desktop_integration_set_desktop_background;
+	_tmp24_ = desktop_integration_set_desktop_background;
 #line 317 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	if (_tmp25_) {
-#line 2906 "DesktopIntegration.c"
-		ConfigFacade* _tmp26_ = NULL;
-		ConfigFacade* _tmp27_ = NULL;
-		GFile* _tmp28_ = NULL;
-		gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
+	if (_tmp24_) {
+#line 2894 "DesktopIntegration.c"
+		ConfigFacade* _tmp25_;
+		ConfigFacade* _tmp26_;
+		GFile* _tmp27_;
+		gchar* _tmp28_;
+		gchar* _tmp29_;
 #line 318 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp26_ = config_facade_get_instance ();
+		_tmp25_ = config_facade_get_instance ();
 #line 318 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp27_ = _tmp26_;
+		_tmp26_ = _tmp25_;
 #line 318 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp28_ = xml_file;
+		_tmp27_ = xml_file;
 #line 318 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp29_ = g_file_get_path (_tmp28_);
+		_tmp28_ = g_file_get_path (_tmp27_);
 #line 318 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp30_ = _tmp29_;
+		_tmp29_ = _tmp28_;
 #line 318 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		configuration_facade_set_desktop_background (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp30_);
+		configuration_facade_set_desktop_background (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp29_);
 #line 318 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_g_free0 (_tmp30_);
+		_g_free0 (_tmp29_);
 #line 318 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_g_object_unref0 (_tmp27_);
-#line 2928 "DesktopIntegration.c"
+		_g_object_unref0 (_tmp26_);
+#line 2916 "DesktopIntegration.c"
 	}
 #line 320 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp31_ = desktop_integration_set_screensaver;
+	_tmp30_ = desktop_integration_set_screensaver;
 #line 320 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	if (_tmp31_) {
-#line 2934 "DesktopIntegration.c"
-		ConfigFacade* _tmp32_ = NULL;
-		ConfigFacade* _tmp33_ = NULL;
-		GFile* _tmp34_ = NULL;
-		gchar* _tmp35_ = NULL;
-		gchar* _tmp36_ = NULL;
+	if (_tmp30_) {
+#line 2922 "DesktopIntegration.c"
+		ConfigFacade* _tmp31_;
+		ConfigFacade* _tmp32_;
+		GFile* _tmp33_;
+		gchar* _tmp34_;
+		gchar* _tmp35_;
 #line 321 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp32_ = config_facade_get_instance ();
+		_tmp31_ = config_facade_get_instance ();
 #line 321 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp33_ = _tmp32_;
+		_tmp32_ = _tmp31_;
 #line 321 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp34_ = xml_file;
+		_tmp33_ = xml_file;
 #line 321 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp35_ = g_file_get_path (_tmp34_);
+		_tmp34_ = g_file_get_path (_tmp33_);
 #line 321 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp36_ = _tmp35_;
+		_tmp35_ = _tmp34_;
 #line 321 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		configuration_facade_set_screensaver (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp36_);
+		configuration_facade_set_screensaver (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp35_);
 #line 321 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_g_free0 (_tmp36_);
+		_g_free0 (_tmp35_);
 #line 321 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_g_object_unref0 (_tmp33_);
-#line 2956 "DesktopIntegration.c"
+		_g_object_unref0 (_tmp32_);
+#line 2944 "DesktopIntegration.c"
 	}
 #line 293 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_desktop_integration_background_slideshow_xml_builder_unref0 (xml_builder);
 #line 293 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_g_object_unref0 (xml_file);
-#line 2962 "DesktopIntegration.c"
+#line 2950 "DesktopIntegration.c"
 }
 
 
diff --git a/src/Dialogs.c b/src/Dialogs.c
index 7447399..6d3ea34 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -1,4 +1,4 @@
-/* Dialogs.c generated by valac 0.34.7, the Vala compiler
+/* Dialogs.c generated by valac 0.36.6, the Vala compiler
  * generated from Dialogs.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1216,7 +1216,7 @@ void configuration_facade_set_export_quality (ConfigurationFacade* self, JpegQua
 void configuration_facade_set_export_export_metadata (ConfigurationFacade* self, gboolean export_metadata);
 void configuration_facade_set_export_constraint (ConfigurationFacade* self, ScaleConstraint constraint);
 void configuration_facade_set_export_scale (ConfigurationFacade* self, gint scale);
-static void export_dialog_finalize (GObject* obj);
+static void export_dialog_finalize (GObject * obj);
 #define IMPORT_UI_REPORT_FAILURE_COUNT 4
 #define IMPORT_UI_SAVE_RESULTS_BUTTON_NAME _ ("Save Details…")
 #define IMPORT_UI_SAVE_RESULTS_FILE_CHOOSER_TITLE _ ("Save Details")
@@ -1250,7 +1250,7 @@ enum  {
 };
 ImportUIQuestionParams* import_ui_question_params_new (const gchar* question, const gchar* yes_button, const gchar* no_button);
 ImportUIQuestionParams* import_ui_question_params_construct (GType object_type, const gchar* question, const gchar* yes_button, const gchar* no_button);
-static void import_ui_question_params_finalize (ImportUIQuestionParams* obj);
+static void import_ui_question_params_finalize (ImportUIQuestionParams * obj);
 gboolean import_ui_import_has_photos (GeeCollection* import_collection);
 PhotoFileFormat photo_file_format_get_by_file_extension (GFile* file);
 gboolean import_ui_import_has_videos (GeeCollection* import_collection);
@@ -1292,7 +1292,7 @@ static gboolean _text_entry_dialog_mediator_on_modify_validate_text_entry_dialog
 static gboolean text_entry_dialog_mediator_real_on_modify_validate (TextEntryDialogMediator* self, const gchar* text);
 gchar* _text_entry_dialog_mediator_execute (TextEntryDialogMediator* self);
 gchar* text_entry_dialog_execute (TextEntryDialog* self);
-static void text_entry_dialog_mediator_finalize (TextEntryDialogMediator* obj);
+static void text_entry_dialog_mediator_finalize (TextEntryDialogMediator * obj);
 gpointer multi_text_entry_dialog_mediator_ref (gpointer instance);
 void multi_text_entry_dialog_mediator_unref (gpointer instance);
 GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1315,7 +1315,7 @@ static gboolean _multi_text_entry_dialog_mediator_on_modify_validate_multi_text_
 static gboolean multi_text_entry_dialog_mediator_real_on_modify_validate (MultiTextEntryDialogMediator* self, const gchar* text);
 gchar* _multi_text_entry_dialog_mediator_execute (MultiTextEntryDialogMediator* self);
 gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self);
-static void multi_text_entry_dialog_mediator_finalize (MultiTextEntryDialogMediator* obj);
+static void multi_text_entry_dialog_mediator_finalize (MultiTextEntryDialogMediator * obj);
 gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_text, gboolean should_escape);
 gchar* guarded_markup_escape_text (const gchar* plain);
 GType entry_multi_completion_get_type (void) G_GNUC_CONST;
@@ -1330,7 +1330,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_func (GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter, gpointer self);
 static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar* delimiter);
 static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion* base, GtkTreeModel* model, GtkTreeIter* iter);
-static void entry_multi_completion_finalize (GObject* obj);
+static void entry_multi_completion_finalize (GObject * obj);
 GType set_background_photo_dialog_get_type (void) G_GNUC_CONST;
 #define SET_BACKGROUND_PHOTO_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialogPrivate))
 enum  {
@@ -1341,7 +1341,7 @@ SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_ty
 static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self);
 static void _set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
 gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gboolean* desktop_background, gboolean* screensaver);
-static void set_background_photo_dialog_finalize (GObject* obj);
+static void set_background_photo_dialog_finalize (GObject * obj);
 GType set_background_slideshow_dialog_get_type (void) G_GNUC_CONST;
 #define SET_BACKGROUND_SLIDESHOW_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialogPrivate))
 enum  {
@@ -1355,19 +1355,19 @@ static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSl
 static void _set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
 static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self);
 gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self, gint* delay_value, gboolean* desktop_background, gboolean* screensaver);
-static void set_background_slideshow_dialog_finalize (GObject* obj);
+static void set_background_slideshow_dialog_finalize (GObject * obj);
 #define TEXT_ENTRY_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TEXT_ENTRY_DIALOG, TextEntryDialogPrivate))
 enum  {
 	TEXT_ENTRY_DIALOG_DUMMY_PROPERTY
 };
 void text_entry_dialog_on_entry_changed (TextEntryDialog* self);
 static void _text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
-static void text_entry_dialog_finalize (GObject* obj);
+static void text_entry_dialog_finalize (GObject * obj);
 #define MULTI_TEXT_ENTRY_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MULTI_TEXT_ENTRY_DIALOG, MultiTextEntryDialogPrivate))
 enum  {
 	MULTI_TEXT_ENTRY_DIALOG_DUMMY_PROPERTY
 };
-static void multi_text_entry_dialog_finalize (GObject* obj);
+static void multi_text_entry_dialog_finalize (GObject * obj);
 GType event_rename_dialog_get_type (void) G_GNUC_CONST;
 enum  {
 	EVENT_RENAME_DIALOG_DUMMY_PROPERTY
@@ -1424,7 +1424,7 @@ void progress_dialog_set_status (ProgressDialog* self, const gchar* text);
 gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop);
 void spin_event_loop (void);
 void progress_dialog_close (ProgressDialog* self);
-static void progress_dialog_finalize (GObject* obj);
+static void progress_dialog_finalize (GObject * obj);
 GType adjust_date_time_dialog_get_type (void) G_GNUC_CONST;
 static GType adjust_date_time_dialog_time_system_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define ADJUST_DATE_TIME_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialogPrivate))
@@ -1463,7 +1463,7 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
 void configuration_facade_set_keep_relativity (ConfigurationFacade* self, gboolean keep_relativity);
 void configuration_facade_set_modify_originals (ConfigurationFacade* self, gboolean modify_originals);
 void configuration_facade_set_use_24_hour_time (ConfigurationFacade* self, gboolean use_24_hour_time);
-static void adjust_date_time_dialog_finalize (GObject* obj);
+static void adjust_date_time_dialog_finalize (GObject * obj);
 #define MAX_OBJECTS_DISPLAYED 3
 void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message, const gchar* title);
 GType tags_dialog_get_type (void) G_GNUC_CONST;
@@ -1486,7 +1486,7 @@ enum  {
 };
 AddTagsDialog* add_tags_dialog_new (void);
 AddTagsDialog* add_tags_dialog_construct (GType object_type);
-#define RESOURCES_ADD_TAGS_TITLE "Add Tags"
+#define RESOURCES_ADD_TAGS_TITLE NC_ ("Dialog Title", "Add Tags")
 gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1);
 gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length1);
 static gboolean add_tags_dialog_real_on_modify_validate (TextEntryDialogMediator* base, const gchar* text);
@@ -1538,14 +1538,14 @@ GFile* app_dirs_get_import_dir (void);
 static void welcome_dialog_install_import_content (WelcomeDialog* self);
 void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImportMetaHost* self);
 void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEntry* entry);
-static void _vala_array_add109 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value);
-static void _vala_array_add110 (GtkCheckButton*** array, int* length, int* size, GtkCheckButton* value);
+static void _vala_array_add109 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value);
+static void _vala_array_add110 (GtkCheckButton** * array, int* length, int* size, GtkCheckButton* value);
 static void welcome_dialog_on_dismiss (WelcomeDialog* self, gint resp);
 gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** selected_import_entries, int* selected_import_entries_length1, gboolean* do_system_pictures_import);
 static void _welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
-static void _vala_array_add111 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value);
+static void _vala_array_add111 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value);
 static WelcomeServiceEntry** _vala_array_dup29 (WelcomeServiceEntry** self, int length);
-static void welcome_dialog_finalize (GObject* obj);
+static void welcome_dialog_finalize (GObject * obj);
 gpointer preferences_dialog_ref (gpointer instance);
 void preferences_dialog_unref (gpointer instance);
 GParamSpec* param_spec_preferences_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1611,7 +1611,7 @@ static void preferences_dialog_on_default_raw_developer_changed (PreferencesDial
 static void _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
 static gboolean preferences_dialog_map_event (PreferencesDialog* self);
 static gboolean _preferences_dialog_map_event_gtk_widget_map_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
-static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, GtkComboBox* combo_box, gchar** mime_types, int mime_types_length1, const gchar* current_app_executable, SortedList** external_apps);
+static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, GtkComboBox* combo_box, gchar** mime_types, int mime_types_length1, const gchar* current_app_executable, SortedList* * external_apps);
 gchar** photo_file_format_get_editable_mime_types (int* result_length1);
 gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self);
 gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_length1);
@@ -1655,8 +1655,8 @@ void configuration_facade_set_use_lowercase_filenames (ConfigurationFacade* self
 enum  {
 	PREFERENCES_DIALOG_PATH_FORMAT_DUMMY_PROPERTY
 };
-static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat* obj);
-static void preferences_dialog_finalize (PreferencesDialog* obj);
+static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat * obj);
+static void preferences_dialog_finalize (PreferencesDialog * obj);
 GtkResponseType copy_files_dialog (void);
 GType library_photo_get_type (void) G_GNUC_CONST;
 void remove_photos_from_library (GeeCollection* photos);
@@ -1683,22 +1683,19 @@ const JpegQuality EXPORT_DIALOG_QUALITY_ARRAY[4] = {JPEG_QUALITY_LOW, JPEG_QUALI
 gboolean dialogs_confirm_delete_tag (Tag* tag) {
 	gboolean result = FALSE;
 	gint count = 0;
-	Tag* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	Tag* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gchar* msg = NULL;
-	gint _tmp3_ = 0;
-	const gchar* _tmp4_ = NULL;
-	Tag* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
+	gint _tmp3_;
+	Tag* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gint _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	const gchar* _tmp10_;
+	gboolean _tmp11_;
 #line 11 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_TAG (tag), FALSE);
 #line 12 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -1715,104 +1712,87 @@ gboolean dialogs_confirm_delete_tag (Tag* tag) {
 		result = TRUE;
 #line 14 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 1719 "Dialogs.c"
+#line 1716 "Dialogs.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = count;
 #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = ngettext ("This will remove the tag “%s” from one photo. Continue?", "This will remove the tag “%s” from %d photos. Continue?", (gulong) _tmp3_);
+	_tmp4_ = tag;
 #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = tag;
+	_tmp5_ = tag_get_user_visible_name (_tmp4_);
 #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = tag_get_user_visible_name (_tmp5_);
-#line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = count;
+	_tmp7_ = count;
 #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = g_strdup_printf (_tmp4_, _tmp7_, _tmp8_);
+	_tmp8_ = g_strdup_printf (ngettext ("This will remove the tag “%s” from one photo. Continue?", "This will remove the tag “%s” from %d photos. Continue?", (gulong) _tmp3_), _tmp6_, _tmp7_);
 #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = _tmp9_;
+	_tmp9_ = _tmp8_;
 #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp7_);
+	_g_free0 (_tmp6_);
 #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	msg = _tmp10_;
+	msg = _tmp9_;
 #line 20 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = msg;
+	_tmp10_ = msg;
 #line 20 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = _ ("_Cancel");
+	_tmp11_ = app_window_negate_affirm_question (_tmp10_, _ ("_Cancel"), _ ("_Delete"), RESOURCES_DELETE_TAG_TITLE, NULL);
 #line 20 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = _ ("_Delete");
-#line 20 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = app_window_negate_affirm_question (_tmp11_, _tmp12_, _tmp13_, RESOURCES_DELETE_TAG_TITLE, NULL);
-#line 20 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = _tmp14_;
+	result = _tmp11_;
 #line 20 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
 #line 20 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1755 "Dialogs.c"
+#line 1746 "Dialogs.c"
 }
 
 
 gboolean dialogs_confirm_delete_saved_search (SavedSearch* search) {
 	gboolean result = FALSE;
 	gchar* msg = NULL;
-	const gchar* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	SavedSearch* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gboolean _tmp5_;
 #line 24 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), FALSE);
 #line 25 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = _ ("This will remove the saved search “%s”. Continue?");
-#line 25 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = search;
+	_tmp0_ = search;
 #line 25 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
+	_tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject));
 #line 25 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = g_strdup_printf (_tmp0_, _tmp3_);
+	_tmp3_ = g_strdup_printf (_ ("This will remove the saved search “%s”. Continue?"), _tmp2_);
 #line 25 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 25 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp3_);
+	_g_free0 (_tmp2_);
 #line 25 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	msg = _tmp5_;
-#line 28 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = _ ("_Cancel");
-#line 28 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = _ ("_Delete");
+	msg = _tmp4_;
 #line 28 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = app_window_negate_affirm_question (msg, _tmp6_, _tmp7_, RESOURCES_DELETE_SAVED_SEARCH_DIALOG_TITLE, NULL);
+	_tmp5_ = app_window_negate_affirm_question (msg, _ ("_Cancel"), _ ("_Delete"), RESOURCES_DELETE_SAVED_SEARCH_DIALOG_TITLE, NULL);
 #line 28 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = _tmp8_;
+	result = _tmp5_;
 #line 28 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
 #line 28 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1801 "Dialogs.c"
+#line 1783 "Dialogs.c"
 }
 
 
 gboolean dialogs_confirm_warn_developer_changed (gint number) {
 	gboolean result = FALSE;
 	GtkMessageDialog* dialog = NULL;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	const gchar* _tmp3_ = NULL;
-	GtkMessageDialog* _tmp4_ = NULL;
-	GtkMessageDialog* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
+	AppWindow* _tmp0_;
+	AppWindow* _tmp1_;
+	gint _tmp2_;
+	GtkMessageDialog* _tmp3_;
+	GtkMessageDialog* _tmp4_;
 	gint response = 0;
-	gint _tmp7_ = 0;
+	gint _tmp5_;
 #line 33 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = app_window_get_instance ();
 #line 33 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -1820,29 +1800,25 @@ gboolean dialogs_confirm_warn_developer_changed (gint number) {
 #line 33 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = number;
 #line 33 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = ngettext ("Switching developers will undo all changes you have made to this photo" \
+	_tmp3_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "<span weight=\"bold\" size=\"larger\">%s</span>", ngettext ("Switching developers will undo all changes you have made to this photo" \
 " in Shotwell", "Switching developers will undo all changes you have made to these phot" \
-"os in Shotwell", (gulong) _tmp2_);
+"os in Shotwell", (gulong) _tmp2_));
 #line 33 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "<span weight=\"bold\" size=\"larger\">%s</span>", _tmp3_);
-#line 33 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp4_);
+	g_object_ref_sink (_tmp3_);
 #line 33 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 33 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
 #line 33 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	dialog = _tmp5_;
+	dialog = _tmp4_;
 #line 39 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, NULL);
 #line 40 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = _ ("_Switch Developer");
-#line 40 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp6_, GTK_RESPONSE_YES, NULL);
+	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _ ("_Switch Developer"), GTK_RESPONSE_YES, NULL);
 #line 42 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
+	_tmp5_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
 #line 42 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	response = _tmp7_;
+	response = _tmp5_;
 #line 44 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
 #line 46 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -1851,45 +1827,45 @@ gboolean dialogs_confirm_warn_developer_changed (gint number) {
 	_g_object_unref0 (dialog);
 #line 46 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1853 "Dialogs.c"
+#line 1829 "Dialogs.c"
 }
 
 
 GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	const gchar* _tmp4_;
+	gboolean _tmp5_;
 	gchar* file_chooser_title = NULL;
-	gchar* _tmp8_ = NULL;
+	gchar* _tmp6_;
 	GtkFileChooserDialog* chooser = NULL;
-	const gchar* _tmp9_ = NULL;
-	AppWindow* _tmp10_ = NULL;
-	AppWindow* _tmp11_ = NULL;
-	GtkFileChooserDialog* _tmp12_ = NULL;
-	GtkFileChooserDialog* _tmp13_ = NULL;
-	GtkFileChooserDialog* _tmp14_ = NULL;
-	GtkFileChooserDialog* _tmp15_ = NULL;
-	GFile* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	GtkFileChooserDialog* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	GtkFileChooserDialog* _tmp21_ = NULL;
+	const gchar* _tmp7_;
+	AppWindow* _tmp8_;
+	AppWindow* _tmp9_;
+	GtkFileChooserDialog* _tmp10_;
+	GtkFileChooserDialog* _tmp11_;
+	GtkFileChooserDialog* _tmp12_;
+	GtkFileChooserDialog* _tmp13_;
+	GFile* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	GtkFileChooserDialog* _tmp17_;
+	const gchar* _tmp18_;
+	GtkFileChooserDialog* _tmp19_;
 	GFile* file = NULL;
-	GtkFileChooserDialog* _tmp22_ = NULL;
-	gint _tmp23_ = 0;
-	GtkFileChooserDialog* _tmp30_ = NULL;
+	GtkFileChooserDialog* _tmp20_;
+	gint _tmp21_;
+	GtkFileChooserDialog* _tmp28_;
 #line 54 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (current_file_basename != NULL, NULL);
 #line 55 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = export_ui_current_export_dir;
 #line 55 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 1889 "Dialogs.c"
-		const gchar* _tmp1_ = NULL;
-		GFile* _tmp2_ = NULL;
+#line 1865 "Dialogs.c"
+		const gchar* _tmp1_;
+		GFile* _tmp2_;
 #line 56 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = g_get_home_dir ();
 #line 56 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -1898,7 +1874,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 56 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp2_;
-#line 1900 "Dialogs.c"
+#line 1876 "Dialogs.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = current_file_basename;
@@ -1906,110 +1882,103 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_tmp5_ = video_reader_is_supported_video_filename (_tmp4_);
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 1908 "Dialogs.c"
-		const gchar* _tmp6_ = NULL;
-#line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = _ ("Export Video");
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = _tmp6_;
-#line 1914 "Dialogs.c"
+		_tmp3_ = _ ("Export Video");
+#line 1886 "Dialogs.c"
 	} else {
-		const gchar* _tmp7_ = NULL;
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = _ ("Export Photo");
-#line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = _tmp7_;
-#line 1921 "Dialogs.c"
+		_tmp3_ = _ ("Export Photo");
+#line 1890 "Dialogs.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = g_strdup (_tmp3_);
+	_tmp6_ = g_strdup (_tmp3_);
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	file_chooser_title = _tmp8_;
+	file_chooser_title = _tmp6_;
 #line 61 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = file_chooser_title;
+	_tmp7_ = file_chooser_title;
 #line 61 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = app_window_get_instance ();
+	_tmp8_ = app_window_get_instance ();
 #line 61 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = _tmp10_;
+	_tmp9_ = _tmp8_;
 #line 61 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_SAVE_LABEL, GTK_RESPONSE_ACCEPT, NULL, NULL);
+	_tmp10_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_SAVE_LABEL, GTK_RESPONSE_ACCEPT, NULL, NULL);
 #line 61 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp12_);
+	g_object_ref_sink (_tmp10_);
 #line 61 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = _tmp12_;
+	_tmp11_ = _tmp10_;
 #line 61 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp11_);
+	_g_object_unref0 (_tmp9_);
 #line 61 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	chooser = _tmp13_;
+	chooser = _tmp11_;
 #line 64 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = chooser;
+	_tmp12_ = chooser;
 #line 64 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
+	gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
 #line 65 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = chooser;
+	_tmp13_ = chooser;
 #line 65 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = export_ui_current_export_dir;
+	_tmp14_ = export_ui_current_export_dir;
 #line 65 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = g_file_get_path (_tmp16_);
+	_tmp15_ = g_file_get_path (_tmp14_);
 #line 65 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = _tmp17_;
+	_tmp16_ = _tmp15_;
 #line 65 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp18_);
+	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp16_);
 #line 65 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp18_);
+	_g_free0 (_tmp16_);
 #line 66 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp19_ = chooser;
+	_tmp17_ = chooser;
 #line 66 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = current_file_basename;
+	_tmp18_ = current_file_basename;
 #line 66 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp20_);
+	gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp18_);
 #line 67 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = chooser;
+	_tmp19_ = chooser;
 #line 67 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
+	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
 #line 69 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	file = NULL;
 #line 70 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = chooser;
+	_tmp20_ = chooser;
 #line 70 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_dialog_get_type (), GtkDialog));
+	_tmp21_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_dialog_get_type (), GtkDialog));
 #line 70 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp23_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 1977 "Dialogs.c"
-		GtkFileChooserDialog* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
-		GFile* _tmp27_ = NULL;
-		GFile* _tmp28_ = NULL;
-		GFile* _tmp29_ = NULL;
+	if (_tmp21_ == ((gint) GTK_RESPONSE_ACCEPT)) {
+#line 1946 "Dialogs.c"
+		GtkFileChooserDialog* _tmp22_;
+		gchar* _tmp23_;
+		gchar* _tmp24_;
+		GFile* _tmp25_;
+		GFile* _tmp26_;
+		GFile* _tmp27_;
 #line 71 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp24_ = chooser;
+		_tmp22_ = chooser;
 #line 71 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp25_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+		_tmp23_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
 #line 71 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp26_ = _tmp25_;
+		_tmp24_ = _tmp23_;
 #line 71 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp27_ = g_file_new_for_path (_tmp26_);
+		_tmp25_ = g_file_new_for_path (_tmp24_);
 #line 71 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (file);
 #line 71 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		file = _tmp27_;
+		file = _tmp25_;
 #line 71 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp26_);
+		_g_free0 (_tmp24_);
 #line 72 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp28_ = file;
+		_tmp26_ = file;
 #line 72 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp29_ = g_file_get_parent (_tmp28_);
+		_tmp27_ = g_file_get_parent (_tmp26_);
 #line 72 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 72 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		export_ui_current_export_dir = _tmp29_;
-#line 2006 "Dialogs.c"
+		export_ui_current_export_dir = _tmp27_;
+#line 1975 "Dialogs.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp30_ = chooser;
+	_tmp28_ = chooser;
 #line 74 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
 #line 76 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = file;
 #line 76 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2018,43 +1987,43 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_g_free0 (file_chooser_title);
 #line 76 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 2020 "Dialogs.c"
+#line 1989 "Dialogs.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2027 "Dialogs.c"
+#line 1996 "Dialogs.c"
 }
 
 
 GFile* export_ui_choose_dir (const gchar* user_title) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	GFile* _tmp0_;
+	const gchar* _tmp3_;
 	GtkFileChooserDialog* chooser = NULL;
-	const gchar* _tmp5_ = NULL;
-	AppWindow* _tmp6_ = NULL;
-	AppWindow* _tmp7_ = NULL;
-	GtkFileChooserDialog* _tmp8_ = NULL;
-	GtkFileChooserDialog* _tmp9_ = NULL;
-	GtkFileChooserDialog* _tmp10_ = NULL;
-	GFile* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	GtkFileChooserDialog* _tmp14_ = NULL;
+	const gchar* _tmp4_;
+	AppWindow* _tmp5_;
+	AppWindow* _tmp6_;
+	GtkFileChooserDialog* _tmp7_;
+	GtkFileChooserDialog* _tmp8_;
+	GtkFileChooserDialog* _tmp9_;
+	GFile* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	GtkFileChooserDialog* _tmp13_;
 	GFile* dir = NULL;
-	GtkFileChooserDialog* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	GtkFileChooserDialog* _tmp23_ = NULL;
+	GtkFileChooserDialog* _tmp14_;
+	gint _tmp15_;
+	GtkFileChooserDialog* _tmp22_;
 #line 80 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = export_ui_current_export_dir;
 #line 80 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 2054 "Dialogs.c"
-		const gchar* _tmp1_ = NULL;
-		GFile* _tmp2_ = NULL;
+#line 2023 "Dialogs.c"
+		const gchar* _tmp1_;
+		GFile* _tmp2_;
 #line 81 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = g_get_home_dir ();
 #line 81 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2063,108 +2032,104 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 81 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp2_;
-#line 2065 "Dialogs.c"
+#line 2034 "Dialogs.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = user_title;
 #line 83 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == NULL) {
-#line 2071 "Dialogs.c"
-		const gchar* _tmp4_ = NULL;
-#line 84 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = _ ("Export Photos");
 #line 84 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		user_title = _tmp4_;
-#line 2077 "Dialogs.c"
+		user_title = _ ("Export Photos");
+#line 2042 "Dialogs.c"
 	}
 #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = user_title;
+	_tmp4_ = user_title;
 #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = app_window_get_instance ();
+	_tmp5_ = app_window_get_instance ();
 #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_ACCEPT, NULL, NULL);
+	_tmp7_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_ACCEPT, NULL, NULL);
 #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp8_);
+	g_object_ref_sink (_tmp7_);
 #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp7_);
+	_g_object_unref0 (_tmp6_);
 #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	chooser = _tmp9_;
+	chooser = _tmp8_;
 #line 89 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = chooser;
+	_tmp9_ = chooser;
 #line 89 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = export_ui_current_export_dir;
+	_tmp10_ = export_ui_current_export_dir;
 #line 89 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = g_file_get_path (_tmp11_);
+	_tmp11_ = g_file_get_path (_tmp10_);
 #line 89 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = _tmp12_;
+	_tmp12_ = _tmp11_;
 #line 89 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp13_);
+	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp12_);
 #line 89 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp13_);
+	_g_free0 (_tmp12_);
 #line 90 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = chooser;
+	_tmp13_ = chooser;
 #line 90 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
+	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
 #line 92 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dir = NULL;
 #line 93 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = chooser;
+	_tmp14_ = chooser;
 #line 93 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_dialog_get_type (), GtkDialog));
+	_tmp15_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_dialog_get_type (), GtkDialog));
 #line 93 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp16_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2119 "Dialogs.c"
-		GtkFileChooserDialog* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		GFile* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
+	if (_tmp15_ == ((gint) GTK_RESPONSE_ACCEPT)) {
+#line 2084 "Dialogs.c"
+		GtkFileChooserDialog* _tmp16_;
+		gchar* _tmp17_;
+		gchar* _tmp18_;
+		GFile* _tmp19_;
+		GFile* _tmp20_;
+		GFile* _tmp21_;
 #line 94 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp17_ = chooser;
+		_tmp16_ = chooser;
 #line 94 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp18_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+		_tmp17_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
 #line 94 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp19_ = _tmp18_;
+		_tmp18_ = _tmp17_;
 #line 94 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp20_ = g_file_new_for_path (_tmp19_);
+		_tmp19_ = g_file_new_for_path (_tmp18_);
 #line 94 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (dir);
 #line 94 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		dir = _tmp20_;
+		dir = _tmp19_;
 #line 94 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp19_);
+		_g_free0 (_tmp18_);
 #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp21_ = dir;
+		_tmp20_ = dir;
 #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp22_ = _g_object_ref0 (_tmp21_);
+		_tmp21_ = _g_object_ref0 (_tmp20_);
 #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		export_ui_current_export_dir = _tmp22_;
-#line 2148 "Dialogs.c"
+		export_ui_current_export_dir = _tmp21_;
+#line 2113 "Dialogs.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = chooser;
+	_tmp22_ = chooser;
 #line 98 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget));
 #line 100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = dir;
 #line 100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (chooser);
 #line 100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 2160 "Dialogs.c"
+#line 2125 "Dialogs.c"
 }
 
 
 void open_external_editor_error_dialog (GError* err, Photo* photo) {
 	gboolean _tmp0_ = FALSE;
-	GError* _tmp1_ = NULL;
+	GError* _tmp1_;
 #line 107 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PHOTO (photo));
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2173,75 +2138,72 @@ void open_external_editor_error_dialog (GError* err, Photo* photo) {
 	if (g_error_matches (_tmp1_, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) {
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 2175 "Dialogs.c"
+#line 2140 "Dialogs.c"
 	} else {
-		GError* _tmp2_ = NULL;
+		GError* _tmp2_;
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = err;
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = g_error_matches (_tmp2_, G_FILE_ERROR, G_FILE_ERROR_PERM);
-#line 2182 "Dialogs.c"
+#line 2147 "Dialogs.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 2186 "Dialogs.c"
-		const gchar* _tmp3_ = NULL;
-		Photo* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
-		GFile* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
+#line 2151 "Dialogs.c"
+		Photo* _tmp3_;
+		GFile* _tmp4_;
+		GFile* _tmp5_;
+		GFile* _tmp6_;
+		GFile* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = _ ("Shotwell couldn’t create a file for editing this photo because you do " \
-"not have permission to write to %s.");
+		_tmp3_ = photo;
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = photo;
+		_tmp4_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = _tmp5_;
+		_tmp5_ = _tmp4_;
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = g_file_get_parent (_tmp6_);
+		_tmp6_ = g_file_get_parent (_tmp5_);
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = g_file_get_path (_tmp8_);
+		_tmp8_ = g_file_get_path (_tmp7_);
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = _tmp9_;
+		_tmp9_ = _tmp8_;
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp11_ = g_strdup_printf (_tmp3_, _tmp10_);
+		_tmp10_ = g_strdup_printf (_ ("Shotwell couldn’t create a file for editing this photo because you do " \
+"not have permission to write to %s."), _tmp9_);
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = _tmp11_;
+		_tmp11_ = _tmp10_;
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		app_window_error_message (_tmp12_, NULL);
+		app_window_error_message (_tmp11_, NULL);
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp12_);
+		_g_free0 (_tmp11_);
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp10_);
+		_g_free0 (_tmp9_);
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp8_);
+		_g_object_unref0 (_tmp7_);
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp6_);
-#line 2227 "Dialogs.c"
+		_g_object_unref0 (_tmp5_);
+#line 2189 "Dialogs.c"
 	} else {
-		GError* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
+		GError* _tmp12_;
+		gchar* _tmp13_;
+		gchar* _tmp14_;
 #line 116 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp13_ = err;
+		_tmp12_ = err;
 #line 116 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp14_ = resources_launch_editor_failed (_tmp13_);
+		_tmp13_ = resources_launch_editor_failed (_tmp12_);
 #line 116 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp15_ = _tmp14_;
+		_tmp14_ = _tmp13_;
 #line 116 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		app_window_error_message (_tmp15_, NULL);
+		app_window_error_message (_tmp14_, NULL);
 #line 116 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp15_);
-#line 2242 "Dialogs.c"
+		_g_free0 (_tmp14_);
+#line 2204 "Dialogs.c"
 	}
 }
 
@@ -2249,71 +2211,62 @@ void open_external_editor_error_dialog (GError* err, Photo* photo) {
 GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining) {
 	GtkResponseType result = 0;
 	gchar* message = NULL;
-	const gchar* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 	GtkResponseType response = 0;
-	gboolean _tmp6_ = FALSE;
+	gboolean _tmp5_;
 #line 120 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (G_IS_FILE (dest), 0);
 #line 121 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = _ ("Unable to export the following photo due to a file error.\n\n");
-#line 121 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = dest;
+	_tmp0_ = dest;
 #line 121 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = g_file_get_path (_tmp1_);
+	_tmp1_ = g_file_get_path (_tmp0_);
 #line 121 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 121 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = g_strconcat (_tmp0_, _tmp3_, NULL);
+	_tmp3_ = g_strconcat (_ ("Unable to export the following photo due to a file error.\n\n"), _tmp2_, NULL);
 #line 121 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 121 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp3_);
+	_g_free0 (_tmp2_);
 #line 121 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	message = _tmp5_;
+	message = _tmp4_;
 #line 124 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	response = GTK_RESPONSE_NONE;
 #line 126 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = photos_remaining;
+	_tmp5_ = photos_remaining;
 #line 126 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp6_) {
-#line 2282 "Dialogs.c"
-		const gchar* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		GtkResponseType _tmp12_ = 0;
-#line 127 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = message;
+	if (_tmp5_) {
+#line 2241 "Dialogs.c"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		const gchar* _tmp8_;
+		GtkResponseType _tmp9_;
 #line 127 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = _ ("\n\nWould you like to continue exporting?");
+		_tmp6_ = message;
 #line 127 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = g_strconcat (_tmp7_, _tmp8_, NULL);
+		_tmp7_ = g_strconcat (_tmp6_, _ ("\n\nWould you like to continue exporting?"), NULL);
 #line 127 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 127 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp9_;
-#line 128 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = message;
+		message = _tmp7_;
 #line 128 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp11_ = _ ("Con_tinue");
+		_tmp8_ = message;
 #line 128 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = app_window_affirm_cancel_question (_tmp10_, _tmp11_, NULL, NULL);
+		_tmp9_ = app_window_affirm_cancel_question (_tmp8_, _ ("Con_tinue"), NULL, NULL);
 #line 128 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		response = _tmp12_;
-#line 2307 "Dialogs.c"
+		response = _tmp9_;
+#line 2260 "Dialogs.c"
 	} else {
-		const gchar* _tmp13_ = NULL;
+		const gchar* _tmp10_;
 #line 130 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp13_ = message;
+		_tmp10_ = message;
 #line 130 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		app_window_error_message (_tmp13_, NULL);
-#line 2314 "Dialogs.c"
+		app_window_error_message (_tmp10_, NULL);
+#line 2267 "Dialogs.c"
 	}
 #line 133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = response;
@@ -2321,113 +2274,108 @@ GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining) {
 	_g_free0 (message);
 #line 133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 2322 "Dialogs.c"
+#line 2275 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_constraint_changed ((ExportDialog*) self);
-#line 2329 "Dialogs.c"
+#line 2282 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_format_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_format_changed ((ExportDialog*) self);
-#line 2336 "Dialogs.c"
+#line 2289 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 216 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_pixels_changed ((ExportDialog*) self);
-#line 2343 "Dialogs.c"
+#line 2296 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_pixels_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
 #line 217 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_pixels_insert_text ((ExportDialog*) self, new_text, new_text_length, position);
-#line 2350 "Dialogs.c"
+#line 2303 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_activate_gtk_entry_activate (GtkEntry* _sender, gpointer self) {
 #line 218 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_activate ((ExportDialog*) self);
-#line 2357 "Dialogs.c"
+#line 2310 "Dialogs.c"
 }
 
 
 ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	ExportDialog * self = NULL;
 	gboolean use_header = FALSE;
-	GtkSettings* _tmp0_ = NULL;
+	GtkSettings* _tmp0_;
 	gint _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_ = NULL;
+	gboolean _tmp2_;
+	const gchar* _tmp3_;
 	ConfigFacade* config = NULL;
-	ConfigFacade* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	ExportFormatMode _tmp6_ = 0;
-	ConfigFacade* _tmp7_ = NULL;
-	PhotoFileFormat _tmp8_ = 0;
-	ConfigFacade* _tmp9_ = NULL;
-	JpegQuality _tmp10_ = 0;
-	ConfigFacade* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
-	ConfigFacade* _tmp13_ = NULL;
-	ScaleConstraint _tmp14_ = 0;
-	ConfigFacade* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	GtkComboBoxText* _tmp17_ = NULL;
+	ConfigFacade* _tmp4_;
+	ConfigFacade* _tmp5_;
+	ExportFormatMode _tmp6_;
+	ConfigFacade* _tmp7_;
+	PhotoFileFormat _tmp8_;
+	ConfigFacade* _tmp9_;
+	JpegQuality _tmp10_;
+	ConfigFacade* _tmp11_;
+	gboolean _tmp12_;
+	ConfigFacade* _tmp13_;
+	ScaleConstraint _tmp14_;
+	ConfigFacade* _tmp15_;
+	gint _tmp16_;
+	GtkComboBoxText* _tmp17_;
 	gint ctr = 0;
-	GtkComboBoxText* _tmp28_ = NULL;
-	GtkComboBoxText* _tmp38_ = NULL;
-	gint _tmp39_ = 0;
-	PhotoFileFormat* _tmp40_ = NULL;
-	GtkEntry* _tmp46_ = NULL;
-	GtkEntry* _tmp47_ = NULL;
-	GtkEntry* _tmp48_ = NULL;
-	gint _tmp49_ = 0;
-	gchar* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
-	GtkComboBoxText* _tmp52_ = NULL;
-	GtkComboBoxText* _tmp53_ = NULL;
-	GtkEntry* _tmp54_ = NULL;
-	GtkEntry* _tmp55_ = NULL;
-	GtkEntry* _tmp56_ = NULL;
-	const gchar* _tmp57_ = NULL;
-	GtkComboBoxText* _tmp58_ = NULL;
-	GtkComboBoxText* _tmp59_ = NULL;
-	const gchar* _tmp60_ = NULL;
-	GtkComboBoxText* _tmp61_ = NULL;
-	GtkComboBoxText* _tmp62_ = NULL;
-	const gchar* _tmp63_ = NULL;
-	GtkComboBoxText* _tmp64_ = NULL;
-	GtkComboBoxText* _tmp65_ = NULL;
-	const gchar* _tmp66_ = NULL;
-	GtkEntry* _tmp67_ = NULL;
-	GtkEntry* _tmp68_ = NULL;
-	GtkSwitch* _tmp69_ = NULL;
-	const gchar* _tmp70_ = NULL;
-	GtkSwitch* _tmp71_ = NULL;
-	GtkSwitch* _tmp72_ = NULL;
-	GtkSwitch* _tmp73_ = NULL;
-	GtkSwitch* _tmp74_ = NULL;
-	GtkGrid* _tmp75_ = NULL;
-	GtkGrid* _tmp76_ = NULL;
-	GtkGrid* _tmp77_ = NULL;
-	GtkBox* _tmp78_ = NULL;
-	GtkGrid* _tmp79_ = NULL;
-	GtkWidget* _tmp80_ = NULL;
-	GtkWidget* _tmp81_ = NULL;
-	GtkWidget* _tmp82_ = NULL;
-	GtkWidget* _tmp83_ = NULL;
-	GtkWidget* _tmp84_ = NULL;
-	ScaleConstraint _tmp85_ = 0;
-	GtkWidget* _tmp88_ = NULL;
+	GtkComboBoxText* _tmp28_;
+	GtkComboBoxText* _tmp38_;
+	gint _tmp39_;
+	PhotoFileFormat* _tmp40_;
+	GtkEntry* _tmp46_;
+	GtkEntry* _tmp47_;
+	GtkEntry* _tmp48_;
+	gint _tmp49_;
+	gchar* _tmp50_;
+	gchar* _tmp51_;
+	GtkComboBoxText* _tmp52_;
+	GtkComboBoxText* _tmp53_;
+	GtkEntry* _tmp54_;
+	GtkEntry* _tmp55_;
+	GtkEntry* _tmp56_;
+	GtkComboBoxText* _tmp57_;
+	GtkComboBoxText* _tmp58_;
+	GtkComboBoxText* _tmp59_;
+	GtkComboBoxText* _tmp60_;
+	GtkComboBoxText* _tmp61_;
+	GtkComboBoxText* _tmp62_;
+	GtkEntry* _tmp63_;
+	GtkEntry* _tmp64_;
+	GtkSwitch* _tmp65_;
+	GtkSwitch* _tmp66_;
+	GtkSwitch* _tmp67_;
+	GtkSwitch* _tmp68_;
+	GtkSwitch* _tmp69_;
+	GtkGrid* _tmp70_;
+	GtkGrid* _tmp71_;
+	GtkGrid* _tmp72_;
+	GtkBox* _tmp73_;
+	GtkGrid* _tmp74_;
+	GtkWidget* _tmp75_;
+	GtkWidget* _tmp76_;
+	GtkWidget* _tmp77_;
+	GtkWidget* _tmp78_;
+	GtkWidget* _tmp79_;
+	ScaleConstraint _tmp80_;
+	GtkWidget* _tmp83_;
 #line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, NULL);
 #line 169 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2440,11 +2388,11 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	if (_tmp2_) {
 #line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 1;
-#line 2441 "Dialogs.c"
+#line 2389 "Dialogs.c"
 	} else {
 #line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 0;
-#line 2445 "Dialogs.c"
+#line 2393 "Dialogs.c"
 	}
 #line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (ExportDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
@@ -2504,7 +2452,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	self->priv->quality_combo = _tmp17_;
 #line 185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ctr = 0;
-#line 2505 "Dialogs.c"
+#line 2453 "Dialogs.c"
 	{
 		JpegQuality* quality_collection = NULL;
 		gint quality_collection_length1 = 0;
@@ -2516,20 +2464,20 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 		quality_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY);
 #line 186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (quality_it = 0; quality_it < G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY); quality_it = quality_it + 1) {
-#line 2517 "Dialogs.c"
+#line 2465 "Dialogs.c"
 			JpegQuality quality = 0;
 #line 186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			quality = quality_collection[quality_it];
-#line 2521 "Dialogs.c"
+#line 2469 "Dialogs.c"
 			{
-				GtkComboBoxText* _tmp18_ = NULL;
-				JpegQuality _tmp19_ = 0;
-				gchar* _tmp20_ = NULL;
-				gchar* _tmp21_ = NULL;
-				JpegQuality _tmp22_ = 0;
-				ExportFormatParameters _tmp23_ = {0};
-				JpegQuality _tmp24_ = 0;
-				gint _tmp27_ = 0;
+				GtkComboBoxText* _tmp18_;
+				JpegQuality _tmp19_;
+				gchar* _tmp20_;
+				gchar* _tmp21_;
+				JpegQuality _tmp22_;
+				ExportFormatParameters _tmp23_;
+				JpegQuality _tmp24_;
+				gint _tmp27_;
 #line 187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp18_ = self->priv->quality_combo;
 #line 187 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2550,22 +2498,22 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 				_tmp24_ = _tmp23_.quality;
 #line 188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp22_ == _tmp24_) {
-#line 2551 "Dialogs.c"
-					GtkComboBoxText* _tmp25_ = NULL;
-					gint _tmp26_ = 0;
+#line 2499 "Dialogs.c"
+					GtkComboBoxText* _tmp25_;
+					gint _tmp26_;
 #line 189 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp25_ = self->priv->quality_combo;
 #line 189 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp26_ = ctr;
 #line 189 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), _tmp26_);
-#line 2560 "Dialogs.c"
+#line 2508 "Dialogs.c"
 				}
 #line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp27_ = ctr;
 #line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				ctr = _tmp27_ + 1;
-#line 2566 "Dialogs.c"
+#line 2514 "Dialogs.c"
 			}
 		}
 	}
@@ -2579,7 +2527,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	self->priv->constraint_combo = _tmp28_;
 #line 194 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ctr = 0;
-#line 2580 "Dialogs.c"
+#line 2528 "Dialogs.c"
 	{
 		ScaleConstraint* constraint_collection = NULL;
 		gint constraint_collection_length1 = 0;
@@ -2591,19 +2539,19 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 		constraint_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY);
 #line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (constraint_it = 0; constraint_it < G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY); constraint_it = constraint_it + 1) {
-#line 2592 "Dialogs.c"
+#line 2540 "Dialogs.c"
 			ScaleConstraint constraint = 0;
 #line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			constraint = constraint_collection[constraint_it];
-#line 2596 "Dialogs.c"
+#line 2544 "Dialogs.c"
 			{
-				GtkComboBoxText* _tmp29_ = NULL;
-				ScaleConstraint _tmp30_ = 0;
-				gchar* _tmp31_ = NULL;
-				gchar* _tmp32_ = NULL;
-				ScaleConstraint _tmp33_ = 0;
-				ScaleConstraint _tmp34_ = 0;
-				gint _tmp37_ = 0;
+				GtkComboBoxText* _tmp29_;
+				ScaleConstraint _tmp30_;
+				gchar* _tmp31_;
+				gchar* _tmp32_;
+				ScaleConstraint _tmp33_;
+				ScaleConstraint _tmp34_;
+				gint _tmp37_;
 #line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp29_ = self->priv->constraint_combo;
 #line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2622,22 +2570,22 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 				_tmp34_ = export_dialog_current_constraint;
 #line 197 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp33_ == _tmp34_) {
-#line 2623 "Dialogs.c"
-					GtkComboBoxText* _tmp35_ = NULL;
-					gint _tmp36_ = 0;
+#line 2571 "Dialogs.c"
+					GtkComboBoxText* _tmp35_;
+					gint _tmp36_;
 #line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp35_ = self->priv->constraint_combo;
 #line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp36_ = ctr;
 #line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_combo_box_get_type (), GtkComboBox), _tmp36_);
-#line 2632 "Dialogs.c"
+#line 2580 "Dialogs.c"
 				}
 #line 199 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp37_ = ctr;
 #line 199 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				ctr = _tmp37_ + 1;
-#line 2638 "Dialogs.c"
+#line 2586 "Dialogs.c"
 			}
 		}
 	}
@@ -2655,7 +2603,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	export_dialog_format_add_option (self, EXPORT_DIALOG_CURRENT_FORMAT_LABEL);
 #line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp40_ = photo_file_format_get_writeable (&_tmp39_);
-#line 2656 "Dialogs.c"
+#line 2604 "Dialogs.c"
 	{
 		PhotoFileFormat* format_collection = NULL;
 		gint format_collection_length1 = 0;
@@ -2667,17 +2615,17 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 		format_collection_length1 = _tmp39_;
 #line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (format_it = 0; format_it < _tmp39_; format_it = format_it + 1) {
-#line 2668 "Dialogs.c"
+#line 2616 "Dialogs.c"
 			PhotoFileFormat format = 0;
 #line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			format = format_collection[format_it];
-#line 2672 "Dialogs.c"
+#line 2620 "Dialogs.c"
 			{
-				PhotoFileFormat _tmp41_ = 0;
-				PhotoFileFormatProperties* _tmp42_ = NULL;
-				PhotoFileFormatProperties* _tmp43_ = NULL;
-				gchar* _tmp44_ = NULL;
-				gchar* _tmp45_ = NULL;
+				PhotoFileFormat _tmp41_;
+				PhotoFileFormatProperties* _tmp42_;
+				PhotoFileFormatProperties* _tmp43_;
+				gchar* _tmp44_;
+				gchar* _tmp45_;
 #line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp41_ = format;
 #line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2694,12 +2642,12 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 				_g_free0 (_tmp45_);
 #line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_photo_file_format_properties_unref0 (_tmp43_);
-#line 2695 "Dialogs.c"
+#line 2643 "Dialogs.c"
 			}
 		}
 #line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		format_collection = (g_free (format_collection), NULL);
-#line 2700 "Dialogs.c"
+#line 2648 "Dialogs.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = (GtkEntry*) gtk_entry_new ();
@@ -2746,154 +2694,144 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 #line 218 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp56_, "activate", (GCallback) _export_dialog_on_activate_gtk_entry_activate, self, 0);
 #line 221 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp57_ = _ ("_Format:");
-#line 221 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp58_ = self->priv->format_combo;
+	_tmp57_ = self->priv->format_combo;
 #line 221 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_label (self, _tmp57_, 0, 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
+	export_dialog_add_label (self, _ ("_Format:"), 0, 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget));
 #line 222 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp59_ = self->priv->format_combo;
+	_tmp58_ = self->priv->format_combo;
 #line 222 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget), 1, 0);
-#line 224 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp60_ = _ ("_Quality:");
+	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), 1, 0);
 #line 224 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp61_ = self->priv->quality_combo;
+	_tmp59_ = self->priv->quality_combo;
 #line 224 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_label (self, _tmp60_, 0, 1, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget));
+	export_dialog_add_label (self, _ ("_Quality:"), 0, 1, G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget));
 #line 225 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp62_ = self->priv->quality_combo;
+	_tmp60_ = self->priv->quality_combo;
 #line 225 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), 1, 1);
-#line 227 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp63_ = _ ("_Scaling constraint:");
+	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), 1, 1);
 #line 227 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp64_ = self->priv->constraint_combo;
+	_tmp61_ = self->priv->constraint_combo;
 #line 227 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_label (self, _tmp63_, 0, 2, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget));
+	export_dialog_add_label (self, _ ("_Scaling constraint:"), 0, 2, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget));
 #line 228 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp65_ = self->priv->constraint_combo;
+	_tmp62_ = self->priv->constraint_combo;
 #line 228 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), 1, 2);
+	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), 1, 2);
 #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp66_ = _ ("_Pixels:");
+	_tmp63_ = self->priv->pixels_entry;
 #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp67_ = self->priv->pixels_entry;
-#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_label (self, _tmp66_, 0, 3, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget));
+	export_dialog_add_label (self, _ ("_Pixels:"), 0, 3, G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget));
 #line 231 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp68_ = self->priv->pixels_entry;
+	_tmp64_ = self->priv->pixels_entry;
 #line 231 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget), 1, 3);
+	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), 1, 3);
 #line 233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp69_ = (GtkSwitch*) gtk_switch_new ();
+	_tmp65_ = (GtkSwitch*) gtk_switch_new ();
 #line 233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp69_);
+	g_object_ref_sink (_tmp65_);
 #line 233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->export_metadata);
 #line 233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->export_metadata = _tmp69_;
+	self->priv->export_metadata = _tmp65_;
 #line 234 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp70_ = _ ("Export _metadata:");
+	_tmp66_ = self->priv->export_metadata;
 #line 234 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp71_ = self->priv->export_metadata;
-#line 234 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_label (self, _tmp70_, 0, 4, G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget));
+	export_dialog_add_label (self, _ ("Export _metadata:"), 0, 4, G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget));
 #line 235 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp72_ = self->priv->export_metadata;
+	_tmp67_ = self->priv->export_metadata;
 #line 235 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), 1, 4);
+	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), 1, 4);
 #line 236 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp73_ = self->priv->export_metadata;
+	_tmp68_ = self->priv->export_metadata;
 #line 236 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_switch_set_active (_tmp73_, TRUE);
+	gtk_switch_set_active (_tmp68_, TRUE);
 #line 237 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp74_ = self->priv->export_metadata;
+	_tmp69_ = self->priv->export_metadata;
 #line 237 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 239 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp75_ = self->priv->table;
+	_tmp70_ = self->priv->table;
 #line 239 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_grid_set_row_spacing (_tmp75_, (guint) 6);
+	gtk_grid_set_row_spacing (_tmp70_, (guint) 6);
 #line 240 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp76_ = self->priv->table;
+	_tmp71_ = self->priv->table;
 #line 240 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_grid_set_column_spacing (_tmp76_, (guint) 12);
+	gtk_grid_set_column_spacing (_tmp71_, (guint) 12);
 #line 241 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp77_ = self->priv->table;
+	_tmp72_ = self->priv->table;
 #line 241 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_container_get_type (), GtkContainer), (guint) 18);
+	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_container_get_type (), GtkContainer), (guint) 18);
 #line 243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp78_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+	_tmp73_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp79_ = self->priv->table;
+	_tmp74_ = self->priv->table;
 #line 243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
 #line 246 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
 #line 247 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp80_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK);
+	_tmp75_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK);
 #line 247 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp81_ = _g_object_ref0 (_tmp80_);
+	_tmp76_ = _g_object_ref0 (_tmp75_);
 #line 247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->ok_button);
 #line 247 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->ok_button = _tmp81_;
+	self->priv->ok_button = _tmp76_;
 #line 248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
 #line 250 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp82_ = self->priv->ok_button;
+	_tmp77_ = self->priv->ok_button;
 #line 250 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_can_default (_tmp82_, TRUE);
+	gtk_widget_set_can_default (_tmp77_, TRUE);
 #line 251 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp83_ = self->priv->ok_button;
+	_tmp78_ = self->priv->ok_button;
 #line 251 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_set (_tmp83_, "has-default", TRUE, NULL);
+	g_object_set (_tmp78_, "has-default", TRUE, NULL);
 #line 252 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp84_ = self->priv->ok_button;
+	_tmp79_ = self->priv->ok_button;
 #line 252 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp84_);
+	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp79_);
 #line 254 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp85_ = export_dialog_current_constraint;
+	_tmp80_ = export_dialog_current_constraint;
 #line 254 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp85_ == SCALE_CONSTRAINT_ORIGINAL) {
-#line 2858 "Dialogs.c"
-		GtkEntry* _tmp86_ = NULL;
-		GtkComboBoxText* _tmp87_ = NULL;
+	if (_tmp80_ == SCALE_CONSTRAINT_ORIGINAL) {
+#line 2796 "Dialogs.c"
+		GtkEntry* _tmp81_;
+		GtkComboBoxText* _tmp82_;
 #line 255 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp86_ = self->priv->pixels_entry;
+		_tmp81_ = self->priv->pixels_entry;
 #line 255 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, gtk_widget_get_type (), GtkWidget), FALSE);
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 256 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp87_ = self->priv->quality_combo;
+		_tmp82_ = self->priv->quality_combo;
 #line 256 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2869 "Dialogs.c"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 2807 "Dialogs.c"
 	}
 #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp88_ = self->priv->ok_button;
+	_tmp83_ = self->priv->ok_button;
 #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_grab_focus (_tmp88_);
+	gtk_widget_grab_focus (_tmp83_);
 #line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (config);
 #line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 2879 "Dialogs.c"
+#line 2817 "Dialogs.c"
 }
 
 
 ExportDialog* export_dialog_new (const gchar* title) {
 #line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return export_dialog_construct (TYPE_EXPORT_DIALOG, title);
-#line 2886 "Dialogs.c"
+#line 2824 "Dialogs.c"
 }
 
 
 static void export_dialog_format_add_option (ExportDialog* self, const gchar* format_name) {
-	GeeArrayList* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	GeeArrayList* _tmp0_;
+	const gchar* _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	const gchar* _tmp3_;
 #line 262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
 #line 262 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2910,28 +2848,28 @@ static void export_dialog_format_add_option (ExportDialog* self, const gchar* fo
 	_tmp3_ = format_name;
 #line 264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp2_, _tmp3_);
-#line 2911 "Dialogs.c"
+#line 2849 "Dialogs.c"
 }
 
 
 static void export_dialog_format_set_active_text (ExportDialog* self, const gchar* text) {
 	gint selection_ticker = 0;
-	const gchar* _tmp16_ = NULL;
+	const gchar* _tmp16_;
 #line 267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
 #line 267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (text != NULL);
 #line 268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	selection_ticker = 0;
-#line 2924 "Dialogs.c"
+#line 2862 "Dialogs.c"
 	{
 		GeeArrayList* _current_text_list = NULL;
-		GeeArrayList* _tmp0_ = NULL;
-		GeeArrayList* _tmp1_ = NULL;
+		GeeArrayList* _tmp0_;
+		GeeArrayList* _tmp1_;
 		gint _current_text_size = 0;
-		GeeArrayList* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		GeeArrayList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 		gint _current_text_index = 0;
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = self->priv->format_options;
@@ -2951,17 +2889,17 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 		_current_text_index = -1;
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 2952 "Dialogs.c"
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
+#line 2890 "Dialogs.c"
+			gint _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
 			gchar* current_text = NULL;
-			GeeArrayList* _tmp8_ = NULL;
-			gint _tmp9_ = 0;
-			gpointer _tmp10_ = NULL;
-			const gchar* _tmp11_ = NULL;
-			const gchar* _tmp12_ = NULL;
-			gint _tmp15_ = 0;
+			GeeArrayList* _tmp8_;
+			gint _tmp9_;
+			gpointer _tmp10_;
+			const gchar* _tmp11_;
+			const gchar* _tmp12_;
+			gint _tmp15_;
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp5_ = _current_text_index;
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2974,7 +2912,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 			if (!(_tmp6_ < _tmp7_)) {
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 2975 "Dialogs.c"
+#line 2913 "Dialogs.c"
 			}
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = _current_text_list;
@@ -2990,9 +2928,9 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 			_tmp12_ = text;
 #line 271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (g_strcmp0 (_tmp11_, _tmp12_) == 0) {
-#line 2991 "Dialogs.c"
-				GtkComboBoxText* _tmp13_ = NULL;
-				gint _tmp14_ = 0;
+#line 2929 "Dialogs.c"
+				GtkComboBoxText* _tmp13_;
+				gint _tmp14_;
 #line 272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = self->priv->format_combo;
 #line 272 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3005,7 +2943,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 				_g_object_unref0 (_current_text_list);
 #line 273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return;
-#line 3006 "Dialogs.c"
+#line 2944 "Dialogs.c"
 			}
 #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = selection_ticker;
@@ -3013,34 +2951,34 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 			selection_ticker = _tmp15_ + 1;
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (current_text);
-#line 3014 "Dialogs.c"
+#line 2952 "Dialogs.c"
 		}
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_current_text_list);
-#line 3018 "Dialogs.c"
+#line 2956 "Dialogs.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = text;
 #line 278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_error ("Dialogs.vala:278: format_set_active_text: text '%s' isn't in combo box", _tmp16_);
-#line 3024 "Dialogs.c"
+#line 2962 "Dialogs.c"
 }
 
 
 static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self) {
 	PhotoFileFormat result = 0;
 	gint index = 0;
-	GtkComboBoxText* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	GtkComboBoxText* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	PhotoFileFormat* writeable_formats = NULL;
-	gint _tmp4_ = 0;
-	PhotoFileFormat* _tmp5_ = NULL;
-	gint writeable_formats_length1 = 0;
-	gint _writeable_formats_size_ = 0;
-	gint _tmp6_ = 0;
-	PhotoFileFormat _tmp7_ = 0;
+	gint _tmp4_;
+	PhotoFileFormat* _tmp5_;
+	gint writeable_formats_length1;
+	gint _writeable_formats_size_;
+	gint _tmp6_;
+	PhotoFileFormat _tmp7_;
 #line 281 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EXPORT_DIALOG (self), 0);
 #line 282 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3055,7 +2993,7 @@ static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self) {
 	if (_tmp2_ < EXPORT_DIALOG_NUM_SPECIAL_FORMATS) {
 #line 284 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		index = EXPORT_DIALOG_NUM_SPECIAL_FORMATS;
-#line 3056 "Dialogs.c"
+#line 2994 "Dialogs.c"
 	}
 #line 286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = index;
@@ -3079,14 +3017,14 @@ static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self) {
 	writeable_formats = (g_free (writeable_formats), NULL);
 #line 288 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 3080 "Dialogs.c"
+#line 3018 "Dialogs.c"
 }
 
 
 static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, ExportFormatParameters* params) {
 	gchar* result = NULL;
-	ExportFormatParameters _tmp0_ = {0};
-	ExportFormatMode _tmp1_ = 0;
+	ExportFormatParameters _tmp0_;
+	ExportFormatMode _tmp1_;
 #line 291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EXPORT_DIALOG (self), NULL);
 #line 291 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3099,40 +3037,40 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
 	switch (_tmp1_) {
 #line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 3100 "Dialogs.c"
+#line 3038 "Dialogs.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = g_strdup (EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL);
 #line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			result = _tmp2_;
 #line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 3109 "Dialogs.c"
+#line 3047 "Dialogs.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		case EXPORT_FORMAT_MODE_CURRENT:
-#line 3113 "Dialogs.c"
+#line 3051 "Dialogs.c"
 		{
-			gchar* _tmp3_ = NULL;
+			gchar* _tmp3_;
 #line 297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp3_ = g_strdup (EXPORT_DIALOG_CURRENT_FORMAT_LABEL);
 #line 297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			result = _tmp3_;
 #line 297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 3122 "Dialogs.c"
+#line 3060 "Dialogs.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 3126 "Dialogs.c"
+#line 3064 "Dialogs.c"
 		{
-			ExportFormatParameters _tmp4_ = {0};
-			PhotoFileFormat _tmp5_ = 0;
-			PhotoFileFormatProperties* _tmp6_ = NULL;
-			PhotoFileFormatProperties* _tmp7_ = NULL;
-			gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
+			ExportFormatParameters _tmp4_;
+			PhotoFileFormat _tmp5_;
+			PhotoFileFormatProperties* _tmp6_;
+			PhotoFileFormatProperties* _tmp7_;
+			gchar* _tmp8_;
+			gchar* _tmp9_;
 #line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = *params;
 #line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3151,14 +3089,14 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
 			result = _tmp9_;
 #line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 3152 "Dialogs.c"
+#line 3090 "Dialogs.c"
 		}
 		default:
 		{
 #line 303 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_error ("Dialogs.vala:303: get_label_for_parameters: unrecognized export format" \
 " mode");
-#line 3158 "Dialogs.c"
+#line 3096 "Dialogs.c"
 		}
 	}
 }
@@ -3168,16 +3106,16 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	gint _vala_scale = 0;
 	ScaleConstraint _vala_constraint = 0;
 	gboolean result = FALSE;
-	ExportFormatParameters _tmp0_ = {0};
-	ExportFormatMode _tmp1_ = 0;
-	ExportFormatParameters _tmp4_ = {0};
-	ExportFormatMode _tmp5_ = 0;
-	ExportFormatParameters _tmp14_ = {0};
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
+	ExportFormatParameters _tmp0_;
+	ExportFormatMode _tmp1_;
+	ExportFormatParameters _tmp4_;
+	ExportFormatMode _tmp5_;
+	ExportFormatParameters _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
 	gboolean ok = FALSE;
-	gint _tmp17_ = 0;
-	gboolean _tmp18_ = FALSE;
+	gint _tmp17_;
+	gboolean _tmp18_;
 #line 310 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EXPORT_DIALOG (self), FALSE);
 #line 310 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3190,9 +3128,9 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	_tmp1_ = _tmp0_.mode;
 #line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ != EXPORT_FORMAT_MODE_LAST) {
-#line 3190 "Dialogs.c"
-		ScaleConstraint _tmp2_ = 0;
-		GtkComboBoxText* _tmp3_ = NULL;
+#line 3128 "Dialogs.c"
+		ScaleConstraint _tmp2_;
+		GtkComboBoxText* _tmp3_;
 #line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_constraint = SCALE_CONSTRAINT_ORIGINAL;
 #line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3203,7 +3141,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_tmp3_ = self->priv->constraint_combo;
 #line 318 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 3203 "Dialogs.c"
+#line 3141 "Dialogs.c"
 	}
 #line 321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = *parameters;
@@ -3211,27 +3149,27 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	_tmp5_ = _tmp4_.mode;
 #line 321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ == EXPORT_FORMAT_MODE_LAST) {
-#line 3211 "Dialogs.c"
-		ExportFormatParameters _tmp6_ = {0};
+#line 3149 "Dialogs.c"
+		ExportFormatParameters _tmp6_;
 #line 322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = export_dialog_current_parameters;
 #line 322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*parameters = _tmp6_;
-#line 3217 "Dialogs.c"
+#line 3155 "Dialogs.c"
 	} else {
 		gboolean _tmp7_ = FALSE;
-		ExportFormatParameters _tmp8_ = {0};
-		ExportFormatMode _tmp9_ = 0;
+		ExportFormatParameters _tmp8_;
+		ExportFormatMode _tmp9_;
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = *parameters;
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = _tmp8_.mode;
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_ == EXPORT_FORMAT_MODE_SPECIFIED) {
-#line 3228 "Dialogs.c"
-			ExportFormatParameters _tmp10_ = {0};
-			PhotoFileFormat _tmp11_ = 0;
-			gboolean _tmp12_ = FALSE;
+#line 3166 "Dialogs.c"
+			ExportFormatParameters _tmp10_;
+			PhotoFileFormat _tmp11_;
+			gboolean _tmp12_;
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp10_ = *parameters;
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3240,21 +3178,21 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 			_tmp12_ = photo_file_format_can_write (_tmp11_);
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = !_tmp12_;
-#line 3240 "Dialogs.c"
+#line 3178 "Dialogs.c"
 		} else {
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = FALSE;
-#line 3244 "Dialogs.c"
+#line 3182 "Dialogs.c"
 		}
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp7_) {
-#line 3248 "Dialogs.c"
-			PhotoFileFormat _tmp13_ = 0;
+#line 3186 "Dialogs.c"
+			PhotoFileFormat _tmp13_;
 #line 324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = photo_file_format_get_system_default_format ();
 #line 324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			(*parameters).specified_format = _tmp13_;
-#line 3254 "Dialogs.c"
+#line 3192 "Dialogs.c"
 		}
 	}
 #line 326 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3277,45 +3215,45 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	_tmp18_ = ok;
 #line 330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp18_) {
-#line 3277 "Dialogs.c"
+#line 3215 "Dialogs.c"
 		gint index = 0;
-		GtkComboBoxText* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
-		gint _tmp21_ = 0;
-		gint _tmp22_ = 0;
-		ScaleConstraint _tmp23_ = 0;
-		ScaleConstraint _tmp24_ = 0;
-		GtkEntry* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		gint _tmp27_ = 0;
-		ScaleConstraint _tmp28_ = 0;
-		gint _tmp30_ = 0;
+		GtkComboBoxText* _tmp19_;
+		gint _tmp20_;
+		gint _tmp21_;
+		gint _tmp22_;
+		ScaleConstraint _tmp23_;
+		ScaleConstraint _tmp24_;
+		GtkEntry* _tmp25_;
+		const gchar* _tmp26_;
+		gint _tmp27_;
+		ScaleConstraint _tmp28_;
+		gint _tmp30_;
 		gboolean _tmp31_ = FALSE;
-		GtkSwitch* _tmp32_ = NULL;
-		gboolean _tmp33_ = FALSE;
-		gboolean _tmp34_ = FALSE;
-		GtkComboBoxText* _tmp38_ = NULL;
-		gchar* _tmp39_ = NULL;
-		gchar* _tmp40_ = NULL;
-		gboolean _tmp41_ = FALSE;
+		GtkSwitch* _tmp32_;
+		gboolean _tmp33_;
+		gboolean _tmp34_;
+		GtkComboBoxText* _tmp38_;
+		gchar* _tmp39_;
+		gchar* _tmp40_;
+		gboolean _tmp41_;
 		ConfigFacade* config = NULL;
-		ConfigFacade* _tmp57_ = NULL;
-		ConfigFacade* _tmp58_ = NULL;
-		ExportFormatParameters _tmp59_ = {0};
-		ExportFormatMode _tmp60_ = 0;
-		ConfigFacade* _tmp61_ = NULL;
-		ExportFormatParameters _tmp62_ = {0};
-		PhotoFileFormat _tmp63_ = 0;
-		ConfigFacade* _tmp64_ = NULL;
-		ExportFormatParameters _tmp65_ = {0};
-		JpegQuality _tmp66_ = 0;
-		ConfigFacade* _tmp67_ = NULL;
-		ExportFormatParameters _tmp68_ = {0};
-		gboolean _tmp69_ = FALSE;
-		ConfigFacade* _tmp70_ = NULL;
-		ScaleConstraint _tmp71_ = 0;
-		ConfigFacade* _tmp72_ = NULL;
-		gint _tmp73_ = 0;
+		ConfigFacade* _tmp57_;
+		ConfigFacade* _tmp58_;
+		ExportFormatParameters _tmp59_;
+		ExportFormatMode _tmp60_;
+		ConfigFacade* _tmp61_;
+		ExportFormatParameters _tmp62_;
+		PhotoFileFormat _tmp63_;
+		ConfigFacade* _tmp64_;
+		ExportFormatParameters _tmp65_;
+		JpegQuality _tmp66_;
+		ConfigFacade* _tmp67_;
+		ExportFormatParameters _tmp68_;
+		gboolean _tmp69_;
+		ConfigFacade* _tmp70_;
+		ScaleConstraint _tmp71_;
+		ConfigFacade* _tmp72_;
+		gint _tmp73_;
 #line 331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = self->priv->constraint_combo;
 #line 331 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3348,13 +3286,13 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_tmp28_ = _vala_constraint;
 #line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp28_ != SCALE_CONSTRAINT_ORIGINAL) {
-#line 3348 "Dialogs.c"
-			gint _tmp29_ = 0;
+#line 3286 "Dialogs.c"
+			gint _tmp29_;
 #line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = _vala_scale;
 #line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_vala_assert (_tmp29_ > 0, "scale > 0");
-#line 3354 "Dialogs.c"
+#line 3292 "Dialogs.c"
 		}
 #line 339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = _vala_scale;
@@ -3368,10 +3306,10 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_tmp34_ = _tmp33_;
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp34_) {
-#line 3368 "Dialogs.c"
-			GtkSwitch* _tmp35_ = NULL;
-			gboolean _tmp36_ = FALSE;
-			gboolean _tmp37_ = FALSE;
+#line 3306 "Dialogs.c"
+			GtkSwitch* _tmp35_;
+			gboolean _tmp36_;
+			gboolean _tmp37_;
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp35_ = self->priv->export_metadata;
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3380,11 +3318,11 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 			_tmp37_ = _tmp36_;
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = _tmp37_;
-#line 3380 "Dialogs.c"
+#line 3318 "Dialogs.c"
 		} else {
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = FALSE;
-#line 3384 "Dialogs.c"
+#line 3322 "Dialogs.c"
 		}
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		(*parameters).export_metadata = _tmp31_;
@@ -3400,20 +3338,20 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_g_free0 (_tmp40_);
 #line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp41_) {
-#line 3400 "Dialogs.c"
-			ExportFormatMode _tmp42_ = 0;
+#line 3338 "Dialogs.c"
+			ExportFormatMode _tmp42_;
 #line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_UNMODIFIED;
 #line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp42_ = export_dialog_current_parameters.mode;
 #line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			(*parameters).mode = _tmp42_;
-#line 3408 "Dialogs.c"
+#line 3346 "Dialogs.c"
 		} else {
-			GtkComboBoxText* _tmp43_ = NULL;
-			gchar* _tmp44_ = NULL;
-			gchar* _tmp45_ = NULL;
-			gboolean _tmp46_ = FALSE;
+			GtkComboBoxText* _tmp43_;
+			gchar* _tmp44_;
+			gchar* _tmp45_;
+			gboolean _tmp46_;
 #line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp43_ = self->priv->format_combo;
 #line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3426,21 +3364,21 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 			_g_free0 (_tmp45_);
 #line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp46_) {
-#line 3426 "Dialogs.c"
-				ExportFormatMode _tmp47_ = 0;
+#line 3364 "Dialogs.c"
+				ExportFormatMode _tmp47_;
 #line 346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_CURRENT;
 #line 346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp47_ = export_dialog_current_parameters.mode;
 #line 346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				(*parameters).mode = _tmp47_;
-#line 3434 "Dialogs.c"
+#line 3372 "Dialogs.c"
 			} else {
-				ExportFormatMode _tmp48_ = 0;
-				PhotoFileFormat _tmp49_ = 0;
-				PhotoFileFormat _tmp50_ = 0;
-				ExportFormatParameters _tmp51_ = {0};
-				PhotoFileFormat _tmp52_ = 0;
+				ExportFormatMode _tmp48_;
+				PhotoFileFormat _tmp49_;
+				PhotoFileFormat _tmp50_;
+				ExportFormatParameters _tmp51_;
+				PhotoFileFormat _tmp52_;
 #line 348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_SPECIFIED;
 #line 348 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3461,11 +3399,11 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 				_tmp52_ = _tmp51_.specified_format;
 #line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp52_ == PHOTO_FILE_FORMAT_JFIF) {
-#line 3461 "Dialogs.c"
-					GtkComboBoxText* _tmp53_ = NULL;
-					gint _tmp54_ = 0;
-					JpegQuality _tmp55_ = 0;
-					JpegQuality _tmp56_ = 0;
+#line 3399 "Dialogs.c"
+					GtkComboBoxText* _tmp53_;
+					gint _tmp54_;
+					JpegQuality _tmp55_;
+					JpegQuality _tmp56_;
 #line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp53_ = self->priv->quality_combo;
 #line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3478,7 +3416,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 					_tmp56_ = export_dialog_current_parameters.quality;
 #line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					(*parameters).quality = _tmp56_;
-#line 3478 "Dialogs.c"
+#line 3416 "Dialogs.c"
 				}
 			}
 		}
@@ -3532,13 +3470,13 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		configuration_facade_set_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp73_);
 #line 330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (config);
-#line 3532 "Dialogs.c"
+#line 3470 "Dialogs.c"
 	} else {
 #line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_scale = 0;
 #line 364 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_constraint = SCALE_CONSTRAINT_ORIGINAL;
-#line 3538 "Dialogs.c"
+#line 3476 "Dialogs.c"
 	}
 #line 367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -3548,32 +3486,32 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	if (scale) {
 #line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*scale = _vala_scale;
-#line 3548 "Dialogs.c"
+#line 3486 "Dialogs.c"
 	}
 #line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (constraint) {
 #line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*constraint = _vala_constraint;
-#line 3554 "Dialogs.c"
+#line 3492 "Dialogs.c"
 	}
 #line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 3558 "Dialogs.c"
+#line 3496 "Dialogs.c"
 }
 
 
 static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint x, gint y, GtkWidget* widget) {
 	GtkLabel* new_label = NULL;
-	const gchar* _tmp0_ = NULL;
-	GtkLabel* _tmp1_ = NULL;
-	GtkLabel* _tmp2_ = NULL;
-	GtkLabel* _tmp3_ = NULL;
-	GtkLabel* _tmp4_ = NULL;
-	GtkWidget* _tmp5_ = NULL;
-	GtkGrid* _tmp8_ = NULL;
-	GtkLabel* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	const gchar* _tmp0_;
+	GtkLabel* _tmp1_;
+	GtkLabel* _tmp2_;
+	GtkLabel* _tmp3_;
+	GtkLabel* _tmp4_;
+	GtkWidget* _tmp5_;
+	GtkGrid* _tmp8_;
+	GtkLabel* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 #line 372 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
 #line 372 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3604,16 +3542,16 @@ static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint
 	_tmp5_ = widget;
 #line 378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ != NULL) {
-#line 3604 "Dialogs.c"
-		GtkLabel* _tmp6_ = NULL;
-		GtkWidget* _tmp7_ = NULL;
+#line 3542 "Dialogs.c"
+		GtkLabel* _tmp6_;
+		GtkWidget* _tmp7_;
 #line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = new_label;
 #line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = widget;
 #line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_mnemonic_widget (_tmp6_, _tmp7_);
-#line 3613 "Dialogs.c"
+#line 3551 "Dialogs.c"
 	}
 #line 381 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->table;
@@ -3627,19 +3565,19 @@ static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint
 	gtk_grid_attach (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), _tmp10_, _tmp11_, 1, 1);
 #line 372 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (new_label);
-#line 3627 "Dialogs.c"
+#line 3565 "Dialogs.c"
 }
 
 
 static void export_dialog_add_control (ExportDialog* self, GtkWidget* widget, gint x, gint y) {
-	GtkWidget* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
-	GtkWidget* _tmp3_ = NULL;
-	GtkGrid* _tmp4_ = NULL;
-	GtkWidget* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	GtkWidget* _tmp0_;
+	GtkWidget* _tmp1_;
+	GtkWidget* _tmp2_;
+	GtkWidget* _tmp3_;
+	GtkGrid* _tmp4_;
+	GtkWidget* _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 #line 384 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
 #line 384 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3670,30 +3608,30 @@ static void export_dialog_add_control (ExportDialog* self, GtkWidget* widget, gi
 	_tmp7_ = y;
 #line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_grid_attach (_tmp4_, _tmp5_, _tmp6_, _tmp7_, 1, 1);
-#line 3670 "Dialogs.c"
+#line 3608 "Dialogs.c"
 }
 
 
 static void export_dialog_on_constraint_changed (ExportDialog* self) {
 	gboolean original = FALSE;
-	GtkComboBoxText* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	ScaleConstraint _tmp2_ = 0;
+	GtkComboBoxText* _tmp0_;
+	gint _tmp1_;
+	ScaleConstraint _tmp2_;
 	gboolean jpeg = FALSE;
-	GtkComboBoxText* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	PhotoFileFormatProperties* _tmp6_ = NULL;
-	PhotoFileFormatProperties* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	GtkEntry* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	GtkComboBoxText* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	PhotoFileFormatProperties* _tmp6_;
+	PhotoFileFormatProperties* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gboolean _tmp10_;
+	GtkEntry* _tmp11_;
+	gboolean _tmp12_;
 	gboolean _tmp13_ = FALSE;
-	gboolean _tmp14_ = FALSE;
-	GtkComboBoxText* _tmp16_ = NULL;
-	gboolean _tmp17_ = FALSE;
+	gboolean _tmp14_;
+	GtkComboBoxText* _tmp16_;
+	gboolean _tmp17_;
 #line 393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
 #line 394 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3738,17 +3676,17 @@ static void export_dialog_on_constraint_changed (ExportDialog* self) {
 	_tmp14_ = original;
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp14_) {
-#line 3738 "Dialogs.c"
-		gboolean _tmp15_ = FALSE;
+#line 3676 "Dialogs.c"
+		gboolean _tmp15_;
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = jpeg;
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _tmp15_;
-#line 3744 "Dialogs.c"
+#line 3682 "Dialogs.c"
 	} else {
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = FALSE;
-#line 3748 "Dialogs.c"
+#line 3686 "Dialogs.c"
 	}
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->quality_combo;
@@ -3758,30 +3696,30 @@ static void export_dialog_on_constraint_changed (ExportDialog* self) {
 	_tmp17_ = original;
 #line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp17_) {
-#line 3758 "Dialogs.c"
-		GtkWidget* _tmp18_ = NULL;
+#line 3696 "Dialogs.c"
+		GtkWidget* _tmp18_;
 #line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->ok_button;
 #line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (_tmp18_, TRUE);
-#line 3764 "Dialogs.c"
+#line 3702 "Dialogs.c"
 	} else {
 #line 402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_dialog_on_pixels_changed (self);
-#line 3768 "Dialogs.c"
+#line 3706 "Dialogs.c"
 	}
 }
 
 
 static void export_dialog_on_format_changed (ExportDialog* self) {
 	gboolean original = FALSE;
-	GtkComboBoxText* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	ScaleConstraint _tmp2_ = 0;
-	GtkComboBoxText* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	GtkComboBoxText* _tmp0_;
+	gint _tmp1_;
+	ScaleConstraint _tmp2_;
+	GtkComboBoxText* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gboolean _tmp6_;
 #line 405 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
 #line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3804,13 +3742,13 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 	_g_free0 (_tmp5_);
 #line 408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp6_) {
-#line 3804 "Dialogs.c"
-		GtkComboBoxText* _tmp7_ = NULL;
-		GtkComboBoxText* _tmp8_ = NULL;
-		GtkComboBoxText* _tmp9_ = NULL;
-		GtkEntry* _tmp10_ = NULL;
-		GtkSwitch* _tmp11_ = NULL;
-		GtkSwitch* _tmp12_ = NULL;
+#line 3742 "Dialogs.c"
+		GtkComboBoxText* _tmp7_;
+		GtkComboBoxText* _tmp8_;
+		GtkComboBoxText* _tmp9_;
+		GtkEntry* _tmp10_;
+		GtkSwitch* _tmp11_;
+		GtkSwitch* _tmp12_;
 #line 413 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->constraint_combo;
 #line 413 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3835,12 +3773,12 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 		_tmp12_ = self->priv->export_metadata;
 #line 418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 3835 "Dialogs.c"
+#line 3773 "Dialogs.c"
 	} else {
-		GtkComboBoxText* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gboolean _tmp16_ = FALSE;
+		GtkComboBoxText* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		gboolean _tmp16_;
 #line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->format_combo;
 #line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3853,12 +3791,12 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 		_g_free0 (_tmp15_);
 #line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp16_) {
-#line 3853 "Dialogs.c"
-			GtkComboBoxText* _tmp17_ = NULL;
-			GtkComboBoxText* _tmp18_ = NULL;
-			GtkEntry* _tmp19_ = NULL;
-			gboolean _tmp20_ = FALSE;
-			GtkSwitch* _tmp21_ = NULL;
+#line 3791 "Dialogs.c"
+			GtkComboBoxText* _tmp17_;
+			GtkComboBoxText* _tmp18_;
+			GtkEntry* _tmp19_;
+			gboolean _tmp20_;
+			GtkSwitch* _tmp21_;
 #line 426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp17_ = self->priv->constraint_combo;
 #line 426 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3877,15 +3815,15 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 			_tmp21_ = self->priv->export_metadata;
 #line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3877 "Dialogs.c"
+#line 3815 "Dialogs.c"
 		} else {
-			GtkComboBoxText* _tmp22_ = NULL;
+			GtkComboBoxText* _tmp22_;
 			gboolean jpeg = FALSE;
-			PhotoFileFormat _tmp23_ = 0;
+			PhotoFileFormat _tmp23_;
 			gboolean _tmp24_ = FALSE;
-			gboolean _tmp25_ = FALSE;
-			GtkComboBoxText* _tmp27_ = NULL;
-			GtkSwitch* _tmp28_ = NULL;
+			gboolean _tmp25_;
+			GtkComboBoxText* _tmp27_;
+			GtkSwitch* _tmp28_;
 #line 434 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = self->priv->constraint_combo;
 #line 434 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3898,17 +3836,17 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 			_tmp25_ = original;
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp25_) {
-#line 3898 "Dialogs.c"
-				gboolean _tmp26_ = FALSE;
+#line 3836 "Dialogs.c"
+				gboolean _tmp26_;
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp26_ = jpeg;
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = _tmp26_;
-#line 3904 "Dialogs.c"
+#line 3842 "Dialogs.c"
 			} else {
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = FALSE;
-#line 3908 "Dialogs.c"
+#line 3846 "Dialogs.c"
 			}
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = self->priv->quality_combo;
@@ -3918,7 +3856,7 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 			_tmp28_ = self->priv->export_metadata;
 #line 437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3918 "Dialogs.c"
+#line 3856 "Dialogs.c"
 		}
 	}
 }
@@ -3929,15 +3867,15 @@ static void export_dialog_on_activate (ExportDialog* self) {
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
 #line 442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 3929 "Dialogs.c"
+#line 3867 "Dialogs.c"
 }
 
 
 static void export_dialog_on_pixels_changed (ExportDialog* self) {
 	gboolean _tmp0_ = FALSE;
-	GtkEntry* _tmp1_ = NULL;
-	guint16 _tmp2_ = 0U;
-	GtkWidget* _tmp6_ = NULL;
+	GtkEntry* _tmp1_;
+	guint16 _tmp2_;
+	GtkWidget* _tmp6_;
 #line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3946,10 +3884,10 @@ static void export_dialog_on_pixels_changed (ExportDialog* self) {
 	_tmp2_ = gtk_entry_get_text_length (_tmp1_);
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (((gint) _tmp2_) > 0) {
-#line 3946 "Dialogs.c"
-		GtkEntry* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
+#line 3884 "Dialogs.c"
+		GtkEntry* _tmp3_;
+		const gchar* _tmp4_;
+		gint _tmp5_;
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = self->priv->pixels_entry;
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3958,47 +3896,47 @@ static void export_dialog_on_pixels_changed (ExportDialog* self) {
 		_tmp5_ = atoi (_tmp4_);
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp5_ > 0;
-#line 3958 "Dialogs.c"
+#line 3896 "Dialogs.c"
 	} else {
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 3962 "Dialogs.c"
+#line 3900 "Dialogs.c"
 	}
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = self->priv->ok_button;
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (_tmp6_, _tmp0_);
-#line 3968 "Dialogs.c"
+#line 3906 "Dialogs.c"
 }
 
 
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_ = 0L;
-	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 3986 "Dialogs.c"
+#line 3924 "Dialogs.c"
 }
 
 
 static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar* text, gint length, gint* position) {
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	gboolean _tmp0_;
+	gint _tmp1_;
 	gchar* new_text = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	gint _tmp23_ = 0;
-	GtkEntry* _tmp29_ = NULL;
+	gchar* _tmp5_;
+	const gchar* _tmp21_;
+	gint _tmp22_;
+	gint _tmp23_;
+	GtkEntry* _tmp29_;
 #line 449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
 #line 449 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4009,7 +3947,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 	if (_tmp0_) {
 #line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 4009 "Dialogs.c"
+#line 3947 "Dialogs.c"
 	}
 #line 454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->in_insert = TRUE;
@@ -4017,10 +3955,10 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 	_tmp1_ = length;
 #line 456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == -1) {
-#line 4017 "Dialogs.c"
-		const gchar* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+#line 3955 "Dialogs.c"
+		const gchar* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = text;
 #line 457 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4029,40 +3967,40 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 		_tmp4_ = _tmp3_;
 #line 457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		length = (gint) _tmp4_;
-#line 4029 "Dialogs.c"
+#line 3967 "Dialogs.c"
 	}
 #line 460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = g_strdup ("");
 #line 460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	new_text = _tmp5_;
-#line 4035 "Dialogs.c"
+#line 3973 "Dialogs.c"
 	{
 		gint ctr = 0;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		ctr = 0;
-#line 4040 "Dialogs.c"
+#line 3978 "Dialogs.c"
 		{
 			gboolean _tmp6_ = FALSE;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = TRUE;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 4047 "Dialogs.c"
-				gint _tmp8_ = 0;
-				gint _tmp9_ = 0;
-				const gchar* _tmp10_ = NULL;
-				gint _tmp11_ = 0;
-				gchar _tmp12_ = '\0';
-				gboolean _tmp13_ = FALSE;
+#line 3985 "Dialogs.c"
+				gint _tmp8_;
+				gint _tmp9_;
+				const gchar* _tmp10_;
+				gint _tmp11_;
+				gchar _tmp12_;
+				gboolean _tmp13_;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp6_) {
-#line 4056 "Dialogs.c"
-					gint _tmp7_ = 0;
+#line 3994 "Dialogs.c"
+					gint _tmp7_;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp7_ = ctr;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					ctr = _tmp7_ + 1;
-#line 4062 "Dialogs.c"
+#line 4000 "Dialogs.c"
 				}
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
@@ -4074,7 +4012,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 				if (!(_tmp8_ < _tmp9_)) {
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 4074 "Dialogs.c"
+#line 4012 "Dialogs.c"
 				}
 #line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = text;
@@ -4086,14 +4024,14 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 				_tmp13_ = g_ascii_isdigit (_tmp12_);
 #line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp13_) {
-#line 4086 "Dialogs.c"
-					const gchar* _tmp14_ = NULL;
-					const gchar* _tmp15_ = NULL;
-					gint _tmp16_ = 0;
-					gchar _tmp17_ = '\0';
-					gchar* _tmp18_ = NULL;
-					gchar* _tmp19_ = NULL;
-					gchar* _tmp20_ = NULL;
+#line 4024 "Dialogs.c"
+					const gchar* _tmp14_;
+					const gchar* _tmp15_;
+					gint _tmp16_;
+					gchar _tmp17_;
+					gchar* _tmp18_;
+					gchar* _tmp19_;
+					gchar* _tmp20_;
 #line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp14_ = new_text;
 #line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4114,7 +4052,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 					new_text = _tmp20_;
 #line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_g_free0 (_tmp19_);
-#line 4114 "Dialogs.c"
+#line 4052 "Dialogs.c"
 				}
 			}
 		}
@@ -4127,12 +4065,12 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 	_tmp23_ = _tmp22_;
 #line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp23_ > 0) {
-#line 4127 "Dialogs.c"
-		GtkEntry* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		gint _tmp27_ = 0;
-		gint _tmp28_ = 0;
+#line 4065 "Dialogs.c"
+		GtkEntry* _tmp24_;
+		const gchar* _tmp25_;
+		const gchar* _tmp26_;
+		gint _tmp27_;
+		gint _tmp28_;
 #line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = self->priv->pixels_entry;
 #line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4145,7 +4083,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 		_tmp28_ = _tmp27_;
 #line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position);
-#line 4145 "Dialogs.c"
+#line 4083 "Dialogs.c"
 	}
 #line 470 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->pixels_entry;
@@ -4155,7 +4093,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 	self->priv->in_insert = FALSE;
 #line 449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (new_text);
-#line 4155 "Dialogs.c"
+#line 4093 "Dialogs.c"
 }
 
 
@@ -4173,13 +4111,13 @@ static void export_dialog_class_init (ExportDialogClass * klass) {
 	export_dialog_current_parameters = _tmp0_;
 #line 155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_current_scale = EXPORT_DIALOG_DEFAULT_SCALE;
-#line 4173 "Dialogs.c"
+#line 4111 "Dialogs.c"
 }
 
 
 static void export_dialog_instance_init (ExportDialog * self) {
-	GtkGrid* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
+	GtkGrid* _tmp0_;
+	GeeArrayList* _tmp1_;
 #line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = EXPORT_DIALOG_GET_PRIVATE (self);
 #line 157 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4194,11 +4132,11 @@ static void export_dialog_instance_init (ExportDialog * self) {
 	self->priv->format_options = _tmp1_;
 #line 165 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->in_insert = FALSE;
-#line 4194 "Dialogs.c"
+#line 4132 "Dialogs.c"
 }
 
 
-static void export_dialog_finalize (GObject* obj) {
+static void export_dialog_finalize (GObject * obj) {
 	ExportDialog * self;
 #line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPORT_DIALOG, ExportDialog);
@@ -4220,7 +4158,7 @@ static void export_dialog_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->ok_button);
 #line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (export_dialog_parent_class)->finalize (obj);
-#line 4220 "Dialogs.c"
+#line 4158 "Dialogs.c"
 }
 
 
@@ -4238,16 +4176,16 @@ GType export_dialog_get_type (void) {
 
 gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_dest_id) {
 	gchar* result = NULL;
-	GeeList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gchar* list = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp3_;
 	gint remaining = 0;
-	GeeList* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	gint _tmp30_ = 0;
-	gint _tmp31_ = 0;
+	GeeList* _tmp28_;
+	gint _tmp29_;
+	gint _tmp30_;
+	gint _tmp31_;
 #line 482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_LIST (failed), NULL);
 #line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4262,42 +4200,42 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 		result = NULL;
 #line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 4262 "Dialogs.c"
+#line 4200 "Dialogs.c"
 	}
 #line 486 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup ("");
 #line 486 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	list = _tmp3_;
-#line 4268 "Dialogs.c"
+#line 4206 "Dialogs.c"
 	{
 		gint ctr = 0;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		ctr = 0;
-#line 4273 "Dialogs.c"
+#line 4211 "Dialogs.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = TRUE;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 4280 "Dialogs.c"
+#line 4218 "Dialogs.c"
 				gboolean _tmp6_ = FALSE;
-				gint _tmp7_ = 0;
+				gint _tmp7_;
 				const gchar* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
-				const gchar* _tmp24_ = NULL;
-				gchar* _tmp25_ = NULL;
-				gchar* _tmp26_ = NULL;
-				gchar* _tmp27_ = NULL;
+				gboolean _tmp13_;
+				const gchar* _tmp24_;
+				gchar* _tmp25_;
+				gchar* _tmp26_;
+				gchar* _tmp27_;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp4_) {
-#line 4291 "Dialogs.c"
-					gint _tmp5_ = 0;
+#line 4229 "Dialogs.c"
+					gint _tmp5_;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp5_ = ctr;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					ctr = _tmp5_ + 1;
-#line 4297 "Dialogs.c"
+#line 4235 "Dialogs.c"
 				}
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp4_ = FALSE;
@@ -4305,11 +4243,11 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 				_tmp7_ = ctr;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp7_ < IMPORT_UI_REPORT_FAILURE_COUNT) {
-#line 4305 "Dialogs.c"
-					gint _tmp8_ = 0;
-					GeeList* _tmp9_ = NULL;
-					gint _tmp10_ = 0;
-					gint _tmp11_ = 0;
+#line 4243 "Dialogs.c"
+					gint _tmp8_;
+					GeeList* _tmp9_;
+					gint _tmp10_;
+					gint _tmp11_;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp8_ = ctr;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4320,28 +4258,28 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 					_tmp11_ = _tmp10_;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = _tmp8_ < _tmp11_;
-#line 4320 "Dialogs.c"
+#line 4258 "Dialogs.c"
 				} else {
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = FALSE;
-#line 4324 "Dialogs.c"
+#line 4262 "Dialogs.c"
 				}
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp6_) {
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 4330 "Dialogs.c"
+#line 4268 "Dialogs.c"
 				}
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = show_dest_id;
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp13_) {
-#line 4336 "Dialogs.c"
-					GeeList* _tmp14_ = NULL;
-					gint _tmp15_ = 0;
-					gpointer _tmp16_ = NULL;
-					BatchImportResult* _tmp17_ = NULL;
-					const gchar* _tmp18_ = NULL;
+#line 4274 "Dialogs.c"
+					GeeList* _tmp14_;
+					gint _tmp15_;
+					gpointer _tmp16_;
+					BatchImportResult* _tmp17_;
+					const gchar* _tmp18_;
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp14_ = failed;
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4356,13 +4294,13 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 					_tmp12_ = _tmp18_;
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_batch_import_result_unref0 (_tmp17_);
-#line 4356 "Dialogs.c"
+#line 4294 "Dialogs.c"
 				} else {
-					GeeList* _tmp19_ = NULL;
-					gint _tmp20_ = 0;
-					gpointer _tmp21_ = NULL;
-					BatchImportResult* _tmp22_ = NULL;
-					const gchar* _tmp23_ = NULL;
+					GeeList* _tmp19_;
+					gint _tmp20_;
+					gpointer _tmp21_;
+					BatchImportResult* _tmp22_;
+					const gchar* _tmp23_;
 #line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp19_ = failed;
 #line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4377,7 +4315,7 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 					_tmp12_ = _tmp23_;
 #line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_batch_import_result_unref0 (_tmp22_);
-#line 4377 "Dialogs.c"
+#line 4315 "Dialogs.c"
 				}
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = list;
@@ -4393,7 +4331,7 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 				list = _tmp27_;
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp26_);
-#line 4393 "Dialogs.c"
+#line 4331 "Dialogs.c"
 			}
 		}
 	}
@@ -4409,49 +4347,46 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 	_tmp31_ = remaining;
 #line 493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp31_ > 0) {
-#line 4409 "Dialogs.c"
-		const gchar* _tmp32_ = NULL;
-		const gchar* _tmp33_ = NULL;
-		gint _tmp34_ = 0;
-		gchar* _tmp35_ = NULL;
-		gchar* _tmp36_ = NULL;
-		gchar* _tmp37_ = NULL;
+#line 4347 "Dialogs.c"
+		const gchar* _tmp32_;
+		gint _tmp33_;
+		gchar* _tmp34_;
+		gchar* _tmp35_;
+		gchar* _tmp36_;
 #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp32_ = list;
 #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp33_ = _ ("(and %d more)\n");
-#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp34_ = remaining;
+		_tmp33_ = remaining;
 #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp35_ = g_strdup_printf (_tmp33_, _tmp34_);
+		_tmp34_ = g_strdup_printf (_ ("(and %d more)\n"), _tmp33_);
 #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp36_ = _tmp35_;
+		_tmp35_ = _tmp34_;
 #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp37_ = g_strconcat (_tmp32_, _tmp36_, NULL);
+		_tmp36_ = g_strconcat (_tmp32_, _tmp35_, NULL);
 #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (list);
 #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		list = _tmp37_;
+		list = _tmp36_;
 #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp36_);
-#line 4434 "Dialogs.c"
+		_g_free0 (_tmp35_);
+#line 4369 "Dialogs.c"
 	}
 #line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = list;
 #line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4440 "Dialogs.c"
+#line 4375 "Dialogs.c"
 }
 
 
 ImportUIQuestionParams* import_ui_question_params_construct (GType object_type, const gchar* question, const gchar* yes_button, const gchar* no_button) {
 	ImportUIQuestionParams* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (question != NULL, NULL);
 #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4486,21 +4421,21 @@ ImportUIQuestionParams* import_ui_question_params_construct (GType object_type,
 	self->no_button = _tmp5_;
 #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 4486 "Dialogs.c"
+#line 4421 "Dialogs.c"
 }
 
 
 ImportUIQuestionParams* import_ui_question_params_new (const gchar* question, const gchar* yes_button, const gchar* no_button) {
 #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return import_ui_question_params_construct (IMPORT_UI_TYPE_QUESTION_PARAMS, question, yes_button, no_button);
-#line 4493 "Dialogs.c"
+#line 4428 "Dialogs.c"
 }
 
 
 static void import_ui_value_question_params_init (GValue* value) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 4500 "Dialogs.c"
+#line 4435 "Dialogs.c"
 }
 
 
@@ -4509,7 +4444,7 @@ static void import_ui_value_question_params_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (value->data[0].v_pointer);
-#line 4509 "Dialogs.c"
+#line 4444 "Dialogs.c"
 	}
 }
 
@@ -4519,11 +4454,11 @@ static void import_ui_value_question_params_copy_value (const GValue* src_value,
 	if (src_value->data[0].v_pointer) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = import_ui_question_params_ref (src_value->data[0].v_pointer);
-#line 4519 "Dialogs.c"
+#line 4454 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4523 "Dialogs.c"
+#line 4458 "Dialogs.c"
 	}
 }
 
@@ -4531,66 +4466,66 @@ static void import_ui_value_question_params_copy_value (const GValue* src_value,
 static gpointer import_ui_value_question_params_peek_pointer (const GValue* value) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 4531 "Dialogs.c"
+#line 4466 "Dialogs.c"
 }
 
 
 static gchar* import_ui_value_question_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 4538 "Dialogs.c"
-		ImportUIQuestionParams* object;
+#line 4473 "Dialogs.c"
+		ImportUIQuestionParams * object;
 		object = collect_values[0].v_pointer;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4545 "Dialogs.c"
+#line 4480 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4549 "Dialogs.c"
+#line 4484 "Dialogs.c"
 		}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = import_ui_question_params_ref (object);
-#line 4553 "Dialogs.c"
+#line 4488 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4557 "Dialogs.c"
+#line 4492 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 4561 "Dialogs.c"
+#line 4496 "Dialogs.c"
 }
 
 
 static gchar* import_ui_value_question_params_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	ImportUIQuestionParams** object_p;
+	ImportUIQuestionParams ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4572 "Dialogs.c"
+#line 4507 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 4578 "Dialogs.c"
+#line 4513 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4582 "Dialogs.c"
+#line 4517 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = import_ui_question_params_ref (value->data[0].v_pointer);
-#line 4586 "Dialogs.c"
+#line 4521 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 4590 "Dialogs.c"
+#line 4525 "Dialogs.c"
 }
 
 
@@ -4604,7 +4539,7 @@ GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 4604 "Dialogs.c"
+#line 4539 "Dialogs.c"
 }
 
 
@@ -4613,12 +4548,12 @@ gpointer import_ui_value_get_question_params (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, IMPORT_UI_TYPE_QUESTION_PARAMS), NULL);
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 4613 "Dialogs.c"
+#line 4548 "Dialogs.c"
 }
 
 
 void import_ui_value_set_question_params (GValue* value, gpointer v_object) {
-	ImportUIQuestionParams* old;
+	ImportUIQuestionParams * old;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, IMPORT_UI_TYPE_QUESTION_PARAMS));
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4633,23 +4568,23 @@ void import_ui_value_set_question_params (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_ref (value->data[0].v_pointer);
-#line 4633 "Dialogs.c"
+#line 4568 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4637 "Dialogs.c"
+#line 4572 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (old);
-#line 4643 "Dialogs.c"
+#line 4578 "Dialogs.c"
 	}
 }
 
 
 void import_ui_value_take_question_params (GValue* value, gpointer v_object) {
-	ImportUIQuestionParams* old;
+	ImportUIQuestionParams * old;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, IMPORT_UI_TYPE_QUESTION_PARAMS));
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4662,17 +4597,17 @@ void import_ui_value_take_question_params (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 4662 "Dialogs.c"
+#line 4597 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4666 "Dialogs.c"
+#line 4601 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (old);
-#line 4672 "Dialogs.c"
+#line 4607 "Dialogs.c"
 	}
 }
 
@@ -4682,18 +4617,18 @@ static void import_ui_question_params_class_init (ImportUIQuestionParamsClass *
 	import_ui_question_params_parent_class = g_type_class_peek_parent (klass);
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((ImportUIQuestionParamsClass *) klass)->finalize = import_ui_question_params_finalize;
-#line 4682 "Dialogs.c"
+#line 4617 "Dialogs.c"
 }
 
 
 static void import_ui_question_params_instance_init (ImportUIQuestionParams * self) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 4689 "Dialogs.c"
+#line 4624 "Dialogs.c"
 }
 
 
-static void import_ui_question_params_finalize (ImportUIQuestionParams* obj) {
+static void import_ui_question_params_finalize (ImportUIQuestionParams * obj) {
 	ImportUIQuestionParams * self;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, IMPORT_UI_TYPE_QUESTION_PARAMS, ImportUIQuestionParams);
@@ -4705,7 +4640,7 @@ static void import_ui_question_params_finalize (ImportUIQuestionParams* obj) {
 	_g_free0 (self->yes_button);
 #line 502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->no_button);
-#line 4705 "Dialogs.c"
+#line 4640 "Dialogs.c"
 }
 
 
@@ -4724,18 +4659,18 @@ GType import_ui_question_params_get_type (void) {
 
 
 gpointer import_ui_question_params_ref (gpointer instance) {
-	ImportUIQuestionParams* self;
+	ImportUIQuestionParams * self;
 	self = instance;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 4730 "Dialogs.c"
+#line 4665 "Dialogs.c"
 }
 
 
 void import_ui_question_params_unref (gpointer instance) {
-	ImportUIQuestionParams* self;
+	ImportUIQuestionParams * self;
 	self = instance;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -4743,7 +4678,7 @@ void import_ui_question_params_unref (gpointer instance) {
 		IMPORT_UI_QUESTION_PARAMS_GET_CLASS (self)->finalize (self);
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4743 "Dialogs.c"
+#line 4678 "Dialogs.c"
 	}
 }
 
@@ -4752,11 +4687,11 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 	gboolean result = FALSE;
 #line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), FALSE);
-#line 4752 "Dialogs.c"
+#line 4687 "Dialogs.c"
 	{
 		GeeIterator* _current_result_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = import_collection;
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4765,15 +4700,15 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 		_current_result_it = _tmp1_;
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 4765 "Dialogs.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 4700 "Dialogs.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			BatchImportResult* current_result = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			gboolean _tmp6_ = FALSE;
-			BatchImportResult* _tmp7_ = NULL;
-			GFile* _tmp8_ = NULL;
+			BatchImportResult* _tmp7_;
+			GFile* _tmp8_;
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = _current_result_it;
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4782,7 +4717,7 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 			if (!_tmp3_) {
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 4782 "Dialogs.c"
+#line 4717 "Dialogs.c"
 			}
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _current_result_it;
@@ -4796,10 +4731,10 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 			_tmp8_ = _tmp7_->file;
 #line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp8_ != NULL) {
-#line 4796 "Dialogs.c"
-				BatchImportResult* _tmp9_ = NULL;
-				GFile* _tmp10_ = NULL;
-				PhotoFileFormat _tmp11_ = 0;
+#line 4731 "Dialogs.c"
+				BatchImportResult* _tmp9_;
+				GFile* _tmp10_;
+				PhotoFileFormat _tmp11_;
 #line 514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp9_ = current_result;
 #line 514 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4808,11 +4743,11 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 				_tmp11_ = photo_file_format_get_by_file_extension (_tmp10_);
 #line 514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = _tmp11_ != PHOTO_FILE_FORMAT_UNKNOWN;
-#line 4808 "Dialogs.c"
+#line 4743 "Dialogs.c"
 			} else {
 #line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
-#line 4812 "Dialogs.c"
+#line 4747 "Dialogs.c"
 			}
 #line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp6_) {
@@ -4824,21 +4759,21 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 				_g_object_unref0 (_current_result_it);
 #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 4824 "Dialogs.c"
+#line 4759 "Dialogs.c"
 			}
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_batch_import_result_unref0 (current_result);
-#line 4828 "Dialogs.c"
+#line 4763 "Dialogs.c"
 		}
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_current_result_it);
-#line 4832 "Dialogs.c"
+#line 4767 "Dialogs.c"
 	}
 #line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
 #line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4838 "Dialogs.c"
+#line 4773 "Dialogs.c"
 }
 
 
@@ -4846,11 +4781,11 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 	gboolean result = FALSE;
 #line 521 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), FALSE);
-#line 4846 "Dialogs.c"
+#line 4781 "Dialogs.c"
 	{
 		GeeIterator* _current_result_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = import_collection;
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4859,15 +4794,15 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 		_current_result_it = _tmp1_;
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 4859 "Dialogs.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 4794 "Dialogs.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			BatchImportResult* current_result = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			gboolean _tmp6_ = FALSE;
-			BatchImportResult* _tmp7_ = NULL;
-			GFile* _tmp8_ = NULL;
+			BatchImportResult* _tmp7_;
+			GFile* _tmp8_;
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = _current_result_it;
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4876,7 +4811,7 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 			if (!_tmp3_) {
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 4876 "Dialogs.c"
+#line 4811 "Dialogs.c"
 			}
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _current_result_it;
@@ -4890,10 +4825,10 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 			_tmp8_ = _tmp7_->file;
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp8_ != NULL) {
-#line 4890 "Dialogs.c"
-				BatchImportResult* _tmp9_ = NULL;
-				GFile* _tmp10_ = NULL;
-				gboolean _tmp11_ = FALSE;
+#line 4825 "Dialogs.c"
+				BatchImportResult* _tmp9_;
+				GFile* _tmp10_;
+				gboolean _tmp11_;
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp9_ = current_result;
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4902,11 +4837,11 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 				_tmp11_ = video_reader_is_supported_video_file (_tmp10_);
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = _tmp11_;
-#line 4902 "Dialogs.c"
+#line 4837 "Dialogs.c"
 			} else {
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
-#line 4906 "Dialogs.c"
+#line 4841 "Dialogs.c"
 			}
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp6_) {
@@ -4918,34 +4853,34 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 				_g_object_unref0 (_current_result_it);
 #line 524 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 4918 "Dialogs.c"
+#line 4853 "Dialogs.c"
 			}
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_batch_import_result_unref0 (current_result);
-#line 4922 "Dialogs.c"
+#line 4857 "Dialogs.c"
 		}
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_current_result_it);
-#line 4926 "Dialogs.c"
+#line 4861 "Dialogs.c"
 	}
 #line 526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
 #line 526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4932 "Dialogs.c"
+#line 4867 "Dialogs.c"
 }
 
 
 gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, const gchar* photos_msg, const gchar* videos_msg, const gchar* both_msg, const gchar* neither_msg) {
 	gchar* result = NULL;
 	gboolean has_photos = FALSE;
-	GeeCollection* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GeeCollection* _tmp0_;
+	gboolean _tmp1_;
 	gboolean has_videos = FALSE;
-	GeeCollection* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	GeeCollection* _tmp2_;
+	gboolean _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	gboolean _tmp5_;
 #line 529 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), NULL);
 #line 529 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4972,23 +4907,23 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 	_tmp5_ = has_photos;
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 4972 "Dialogs.c"
-		gboolean _tmp6_ = FALSE;
+#line 4907 "Dialogs.c"
+		gboolean _tmp6_;
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = has_videos;
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp6_;
-#line 4978 "Dialogs.c"
+#line 4913 "Dialogs.c"
 	} else {
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = FALSE;
-#line 4982 "Dialogs.c"
+#line 4917 "Dialogs.c"
 	}
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 4986 "Dialogs.c"
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
+#line 4921 "Dialogs.c"
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
 #line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = both_msg;
 #line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4997,16 +4932,16 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 		result = _tmp8_;
 #line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 4997 "Dialogs.c"
+#line 4932 "Dialogs.c"
 	} else {
-		gboolean _tmp9_ = FALSE;
+		gboolean _tmp9_;
 #line 536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = has_photos;
 #line 536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_) {
-#line 5004 "Dialogs.c"
-			const gchar* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
+#line 4939 "Dialogs.c"
+			const gchar* _tmp10_;
+			gchar* _tmp11_;
 #line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp10_ = photos_msg;
 #line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5015,16 +4950,16 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 			result = _tmp11_;
 #line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 5015 "Dialogs.c"
+#line 4950 "Dialogs.c"
 		} else {
-			gboolean _tmp12_ = FALSE;
+			gboolean _tmp12_;
 #line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = has_videos;
 #line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp12_) {
-#line 5022 "Dialogs.c"
-				const gchar* _tmp13_ = NULL;
-				gchar* _tmp14_ = NULL;
+#line 4957 "Dialogs.c"
+				const gchar* _tmp13_;
+				gchar* _tmp14_;
 #line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = videos_msg;
 #line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5033,10 +4968,10 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 				result = _tmp14_;
 #line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 5033 "Dialogs.c"
+#line 4968 "Dialogs.c"
 			} else {
-				const gchar* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
+				const gchar* _tmp15_;
+				gchar* _tmp16_;
 #line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp15_ = neither_msg;
 #line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5045,7 +4980,7 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 				result = _tmp16_;
 #line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 5045 "Dialogs.c"
+#line 4980 "Dialogs.c"
 			}
 		}
 	}
@@ -5055,87 +4990,84 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	gchar* result = NULL;
 	GString* builder = NULL;
-	GString* _tmp0_ = NULL;
+	GString* _tmp0_;
 	gchar* header = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GTimeVal _tmp8_ = {0};
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	GString* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	GTimeVal _tmp7_ = {0};
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	GString* _tmp14_;
+	const gchar* _tmp15_;
 	gchar* subhead = NULL;
-	ImportManifest* _tmp17_ = NULL;
-	GeeList* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	const gchar* _tmp21_ = NULL;
-	ImportManifest* _tmp22_ = NULL;
-	GeeList* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	gchar* _tmp26_ = NULL;
-	const gchar* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	const gchar* _tmp29_ = NULL;
-	ImportManifest* _tmp30_ = NULL;
-	GeeList* _tmp31_ = NULL;
-	gint _tmp32_ = 0;
-	gint _tmp33_ = 0;
-	const gchar* _tmp34_ = NULL;
-	ImportManifest* _tmp35_ = NULL;
-	GeeList* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	gchar* _tmp39_ = NULL;
-	gchar* _tmp40_ = NULL;
-	gchar* _tmp41_ = NULL;
-	const gchar* _tmp42_ = NULL;
-	gchar* _tmp43_ = NULL;
-	GString* _tmp44_ = NULL;
-	const gchar* _tmp45_ = NULL;
+	ImportManifest* _tmp16_;
+	GeeList* _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	ImportManifest* _tmp20_;
+	GeeList* _tmp21_;
+	gint _tmp22_;
+	gint _tmp23_;
+	gchar* _tmp24_;
+	const gchar* _tmp25_;
+	gchar* _tmp26_;
+	const gchar* _tmp27_;
+	ImportManifest* _tmp28_;
+	GeeList* _tmp29_;
+	gint _tmp30_;
+	gint _tmp31_;
+	ImportManifest* _tmp32_;
+	GeeList* _tmp33_;
+	gint _tmp34_;
+	gint _tmp35_;
+	gchar* _tmp36_;
+	gchar* _tmp37_;
+	gchar* _tmp38_;
+	const gchar* _tmp39_;
+	gchar* _tmp40_;
+	GString* _tmp41_;
+	const gchar* _tmp42_;
 	gchar* current_file_summary = NULL;
-	gchar* _tmp46_ = NULL;
-	ImportManifest* _tmp47_ = NULL;
-	GeeList* _tmp48_ = NULL;
-	gint _tmp49_ = 0;
-	gint _tmp50_ = 0;
-	ImportManifest* _tmp87_ = NULL;
-	GeeList* _tmp88_ = NULL;
-	gint _tmp89_ = 0;
-	gint _tmp90_ = 0;
-	ImportManifest* _tmp123_ = NULL;
-	GeeList* _tmp124_ = NULL;
-	gint _tmp125_ = 0;
-	gint _tmp126_ = 0;
-	ImportManifest* _tmp159_ = NULL;
-	GeeList* _tmp160_ = NULL;
-	gint _tmp161_ = 0;
-	gint _tmp162_ = 0;
-	ImportManifest* _tmp195_ = NULL;
-	GeeList* _tmp196_ = NULL;
-	gint _tmp197_ = 0;
-	gint _tmp198_ = 0;
-	ImportManifest* _tmp236_ = NULL;
-	GeeList* _tmp237_ = NULL;
-	gint _tmp238_ = 0;
-	gint _tmp239_ = 0;
-	ImportManifest* _tmp272_ = NULL;
-	GeeList* _tmp273_ = NULL;
-	gint _tmp274_ = 0;
-	gint _tmp275_ = 0;
-	GString* _tmp308_ = NULL;
-	const gchar* _tmp309_ = NULL;
-	gchar* _tmp310_ = NULL;
+	gchar* _tmp43_;
+	ImportManifest* _tmp44_;
+	GeeList* _tmp45_;
+	gint _tmp46_;
+	gint _tmp47_;
+	ImportManifest* _tmp82_;
+	GeeList* _tmp83_;
+	gint _tmp84_;
+	gint _tmp85_;
+	ImportManifest* _tmp116_;
+	GeeList* _tmp117_;
+	gint _tmp118_;
+	gint _tmp119_;
+	ImportManifest* _tmp150_;
+	GeeList* _tmp151_;
+	gint _tmp152_;
+	gint _tmp153_;
+	ImportManifest* _tmp184_;
+	GeeList* _tmp185_;
+	gint _tmp186_;
+	gint _tmp187_;
+	ImportManifest* _tmp222_;
+	GeeList* _tmp223_;
+	gint _tmp224_;
+	gint _tmp225_;
+	ImportManifest* _tmp256_;
+	GeeList* _tmp257_;
+	gint _tmp258_;
+	gint _tmp259_;
+	GString* _tmp290_;
+	const gchar* _tmp291_;
+	gchar* _tmp292_;
 #line 544 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_IMPORT_MANIFEST (manifest), NULL);
 #line 545 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5143,1288 +5075,1237 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 #line 545 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	builder = _tmp0_;
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = _ ("Import Results Report");
+	_tmp1_ = g_strconcat (_ ("Import Results Report"), " (Shotwell ", NULL);
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = g_strconcat (_tmp1_, " (Shotwell ", NULL);
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = g_strconcat (_tmp3_, RESOURCES_APP_VERSION, NULL);
+	_tmp3_ = g_strconcat (_tmp2_, RESOURCES_APP_VERSION, NULL);
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = g_strconcat (_tmp5_, " @ ", NULL);
+	_tmp5_ = g_strconcat (_tmp4_, " @ ", NULL);
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_get_current_time (&_tmp8_);
+	g_get_current_time (&_tmp7_);
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = g_time_val_to_iso8601 (&_tmp8_);
+	_tmp8_ = g_time_val_to_iso8601 (&_tmp7_);
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = _tmp9_;
+	_tmp9_ = _tmp8_;
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = g_strconcat (_tmp7_, _tmp10_, NULL);
+	_tmp10_ = g_strconcat (_tmp6_, _tmp9_, NULL);
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = _tmp11_;
+	_tmp11_ = _tmp10_;
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = g_strconcat (_tmp12_, ")\n\n", NULL);
+	_tmp12_ = g_strconcat (_tmp11_, ")\n\n", NULL);
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = _tmp13_;
+	_tmp13_ = _tmp12_;
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp12_);
+	_g_free0 (_tmp11_);
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp10_);
+	_g_free0 (_tmp9_);
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp7_);
+	_g_free0 (_tmp6_);
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp5_);
+	_g_free0 (_tmp4_);
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp3_);
+	_g_free0 (_tmp2_);
 #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	header = _tmp14_;
+	header = _tmp13_;
 #line 549 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = builder;
+	_tmp14_ = builder;
 #line 549 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = header;
+	_tmp15_ = header;
 #line 549 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_string_append (_tmp15_, _tmp16_);
-#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = manifest;
+	g_string_append (_tmp14_, _tmp15_);
 #line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = _tmp17_->all;
+	_tmp16_ = manifest;
 #line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp17_ = _tmp16_->all;
 #line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = _tmp19_;
+	_tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = ngettext ("Attempted to import %d file.", "Attempted to import %d files.", (gulong) _tmp20_);
+	_tmp19_ = _tmp18_;
 #line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = manifest;
+	_tmp20_ = manifest;
 #line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = _tmp22_->all;
+	_tmp21_ = _tmp20_->all;
 #line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp24_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp22_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = _tmp24_;
+	_tmp23_ = _tmp22_;
 #line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp26_ = g_strdup_printf (_tmp21_, _tmp25_);
+	_tmp24_ = g_strdup_printf (ngettext ("Attempted to import %d file.", "Attempted to import %d files.", (gulong) _tmp19_), _tmp23_);
 #line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	subhead = _tmp26_;
+	subhead = _tmp24_;
 #line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp27_ = subhead;
+	_tmp25_ = subhead;
 #line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp28_ = g_strconcat (_tmp27_, " ", NULL);
+	_tmp26_ = g_strconcat (_tmp25_, " ", NULL);
 #line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (subhead);
 #line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	subhead = _tmp28_;
-#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp29_ = subhead;
+	subhead = _tmp26_;
 #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp30_ = manifest;
+	_tmp27_ = subhead;
 #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp31_ = _tmp30_->success;
+	_tmp28_ = manifest;
 #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp32_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp29_ = _tmp28_->success;
 #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp33_ = _tmp32_;
+	_tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp34_ = ngettext ("Of these, %d file was successfully imported.", "Of these, %d files were successfully imported.", (gulong) _tmp33_);
+	_tmp31_ = _tmp30_;
 #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp35_ = manifest;
+	_tmp32_ = manifest;
 #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp36_ = _tmp35_->success;
+	_tmp33_ = _tmp32_->success;
 #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp37_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp38_ = _tmp37_;
+	_tmp35_ = _tmp34_;
 #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp39_ = g_strdup_printf (_tmp34_, _tmp38_);
+	_tmp36_ = g_strdup_printf (ngettext ("Of these, %d file was successfully imported.", "Of these, %d files were successfully imported.", (gulong) _tmp31_), _tmp35_);
 #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp40_ = _tmp39_;
+	_tmp37_ = _tmp36_;
 #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp41_ = g_strconcat (_tmp29_, _tmp40_, NULL);
+	_tmp38_ = g_strconcat (_tmp27_, _tmp37_, NULL);
 #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (subhead);
 #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	subhead = _tmp41_;
+	subhead = _tmp38_;
 #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp40_);
+	_g_free0 (_tmp37_);
 #line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp42_ = subhead;
+	_tmp39_ = subhead;
 #line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp43_ = g_strconcat (_tmp42_, "\n\n", NULL);
+	_tmp40_ = g_strconcat (_tmp39_, "\n\n", NULL);
 #line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (subhead);
 #line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	subhead = _tmp43_;
+	subhead = _tmp40_;
 #line 558 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp44_ = builder;
+	_tmp41_ = builder;
 #line 558 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp45_ = subhead;
+	_tmp42_ = subhead;
 #line 558 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_string_append (_tmp44_, _tmp45_);
+	g_string_append (_tmp41_, _tmp42_);
 #line 560 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp46_ = g_strdup ("");
+	_tmp43_ = g_strdup ("");
 #line 560 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	current_file_summary = _tmp46_;
+	current_file_summary = _tmp43_;
 #line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp47_ = manifest;
+	_tmp44_ = manifest;
 #line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp48_ = _tmp47_->already_imported;
+	_tmp45_ = _tmp44_->already_imported;
 #line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp49_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp46_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp50_ = _tmp49_;
+	_tmp47_ = _tmp46_;
 #line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp50_ > 0) {
-#line 5278 "Dialogs.c"
-		GString* _tmp51_ = NULL;
-		const gchar* _tmp52_ = NULL;
-		gchar* _tmp53_ = NULL;
-		gchar* _tmp54_ = NULL;
+	if (_tmp47_ > 0) {
+#line 5204 "Dialogs.c"
+		GString* _tmp48_;
+		gchar* _tmp49_;
+		gchar* _tmp50_;
 #line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp51_ = builder;
+		_tmp48_ = builder;
 #line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp52_ = _ ("Duplicate Photos/Videos Not Imported:");
+		_tmp49_ = g_strconcat (_ ("Duplicate Photos/Videos Not Imported:"), "\n\n", NULL);
 #line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp53_ = g_strconcat (_tmp52_, "\n\n", NULL);
-#line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp54_ = _tmp53_;
+		_tmp50_ = _tmp49_;
 #line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_string_append (_tmp51_, _tmp54_);
+		g_string_append (_tmp48_, _tmp50_);
 #line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp54_);
-#line 5295 "Dialogs.c"
+		_g_free0 (_tmp50_);
+#line 5218 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
-			ImportManifest* _tmp55_ = NULL;
-			GeeList* _tmp56_ = NULL;
-			GeeList* _tmp57_ = NULL;
+			ImportManifest* _tmp51_;
+			GeeList* _tmp52_;
+			GeeList* _tmp53_;
 			gint _result_size = 0;
-			GeeList* _tmp58_ = NULL;
-			gint _tmp59_ = 0;
-			gint _tmp60_ = 0;
+			GeeList* _tmp54_;
+			gint _tmp55_;
+			gint _tmp56_;
 			gint _result_index = 0;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp55_ = manifest;
+			_tmp51_ = manifest;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp56_ = _tmp55_->already_imported;
+			_tmp52_ = _tmp51_->already_imported;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp57_ = _g_object_ref0 (_tmp56_);
+			_tmp53_ = _g_object_ref0 (_tmp52_);
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_result_list = _tmp57_;
+			_result_list = _tmp53_;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp58_ = _result_list;
+			_tmp54_ = _result_list;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp59_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp55_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp60_ = _tmp59_;
+			_tmp56_ = _tmp55_;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_result_size = _tmp60_;
+			_result_size = _tmp56_;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5326 "Dialogs.c"
-				gint _tmp61_ = 0;
-				gint _tmp62_ = 0;
-				gint _tmp63_ = 0;
+#line 5249 "Dialogs.c"
+				gint _tmp57_;
+				gint _tmp58_;
+				gint _tmp59_;
 				BatchImportResult* _result_ = NULL;
-				GeeList* _tmp64_ = NULL;
-				gint _tmp65_ = 0;
-				gpointer _tmp66_ = NULL;
-				BatchImportResult* _tmp67_ = NULL;
-				const gchar* _tmp68_ = NULL;
-				gchar* _tmp69_ = NULL;
-				gchar* _tmp70_ = NULL;
-				const gchar* _tmp71_ = NULL;
-				gchar* _tmp72_ = NULL;
-				gchar* _tmp73_ = NULL;
-				gchar* _tmp74_ = NULL;
-				gchar* _tmp75_ = NULL;
-				BatchImportResult* _tmp76_ = NULL;
-				DuplicatedFile* _tmp77_ = NULL;
-				GFile* _tmp78_ = NULL;
-				GFile* _tmp79_ = NULL;
-				gchar* _tmp80_ = NULL;
-				gchar* _tmp81_ = NULL;
-				gchar* _tmp82_ = NULL;
-				gchar* _tmp83_ = NULL;
-				gchar* _tmp84_ = NULL;
-				GString* _tmp85_ = NULL;
-				const gchar* _tmp86_ = NULL;
+				GeeList* _tmp60_;
+				gint _tmp61_;
+				gpointer _tmp62_;
+				BatchImportResult* _tmp63_;
+				const gchar* _tmp64_;
+				gchar* _tmp65_;
+				gchar* _tmp66_;
+				gchar* _tmp67_;
+				gchar* _tmp68_;
+				gchar* _tmp69_;
+				gchar* _tmp70_;
+				BatchImportResult* _tmp71_;
+				DuplicatedFile* _tmp72_;
+				GFile* _tmp73_;
+				GFile* _tmp74_;
+				gchar* _tmp75_;
+				gchar* _tmp76_;
+				gchar* _tmp77_;
+				gchar* _tmp78_;
+				gchar* _tmp79_;
+				GString* _tmp80_;
+				const gchar* _tmp81_;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp61_ = _result_index;
+				_tmp57_ = _result_index;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_result_index = _tmp61_ + 1;
+				_result_index = _tmp57_ + 1;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp62_ = _result_index;
+				_tmp58_ = _result_index;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp63_ = _result_size;
+				_tmp59_ = _result_size;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (!(_tmp62_ < _tmp63_)) {
+				if (!(_tmp58_ < _tmp59_)) {
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5366 "Dialogs.c"
+#line 5288 "Dialogs.c"
 				}
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp64_ = _result_list;
+				_tmp60_ = _result_list;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp65_ = _result_index;
+				_tmp61_ = _result_index;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp66_ = gee_list_get (_tmp64_, _tmp65_);
+				_tmp62_ = gee_list_get (_tmp60_, _tmp61_);
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_result_ = (BatchImportResult*) _tmp66_;
+				_result_ = (BatchImportResult*) _tmp62_;
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp67_ = _result_;
+				_tmp63_ = _result_;
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp68_ = _tmp67_->src_identifier;
+				_tmp64_ = _tmp63_->src_identifier;
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp69_ = g_strconcat (_tmp68_, " ", NULL);
+				_tmp65_ = g_strconcat (_tmp64_, " ", NULL);
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp70_ = _tmp69_;
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp71_ = _ ("duplicates existing media item");
+				_tmp66_ = _tmp65_;
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp72_ = g_strconcat (_tmp70_, _tmp71_, NULL);
+				_tmp67_ = g_strconcat (_tmp66_, _ ("duplicates existing media item"), NULL);
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp73_ = _tmp72_;
+				_tmp68_ = _tmp67_;
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp74_ = g_strconcat (_tmp73_, "\n\t", NULL);
+				_tmp69_ = g_strconcat (_tmp68_, "\n\t", NULL);
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp75_ = _tmp74_;
+				_tmp70_ = _tmp69_;
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp76_ = _result_;
+				_tmp71_ = _result_;
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp77_ = _tmp76_->duplicate_of;
+				_tmp72_ = _tmp71_->duplicate_of;
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp78_ = duplicated_file_get_file (_tmp77_);
+				_tmp73_ = duplicated_file_get_file (_tmp72_);
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp79_ = _tmp78_;
+				_tmp74_ = _tmp73_;
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp80_ = g_file_get_path (_tmp79_);
+				_tmp75_ = g_file_get_path (_tmp74_);
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp81_ = _tmp80_;
+				_tmp76_ = _tmp75_;
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp82_ = g_strconcat (_tmp75_, _tmp81_, NULL);
+				_tmp77_ = g_strconcat (_tmp70_, _tmp76_, NULL);
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp83_ = _tmp82_;
+				_tmp78_ = _tmp77_;
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp84_ = g_strconcat (_tmp83_, "\n\n", NULL);
+				_tmp79_ = g_strconcat (_tmp78_, "\n\n", NULL);
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				current_file_summary = _tmp84_;
+				current_file_summary = _tmp79_;
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp83_);
+				_g_free0 (_tmp78_);
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp81_);
+				_g_free0 (_tmp76_);
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_object_unref0 (_tmp79_);
+				_g_object_unref0 (_tmp74_);
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp75_);
+				_g_free0 (_tmp70_);
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp73_);
+				_g_free0 (_tmp68_);
 #line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp70_);
+				_g_free0 (_tmp66_);
 #line 573 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp85_ = builder;
+				_tmp80_ = builder;
 #line 573 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp86_ = current_file_summary;
+				_tmp81_ = current_file_summary;
 #line 573 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				g_string_append (_tmp85_, _tmp86_);
+				g_string_append (_tmp80_, _tmp81_);
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5436 "Dialogs.c"
+#line 5356 "Dialogs.c"
 			}
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5440 "Dialogs.c"
+#line 5360 "Dialogs.c"
 		}
 	}
 #line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp87_ = manifest;
+	_tmp82_ = manifest;
 #line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp88_ = _tmp87_->camera_failed;
+	_tmp83_ = _tmp82_->camera_failed;
 #line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp89_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp84_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp90_ = _tmp89_;
+	_tmp85_ = _tmp84_;
 #line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp90_ > 0) {
-#line 5453 "Dialogs.c"
-		GString* _tmp91_ = NULL;
-		const gchar* _tmp92_ = NULL;
-		gchar* _tmp93_ = NULL;
-		gchar* _tmp94_ = NULL;
-#line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp91_ = builder;
+	if (_tmp85_ > 0) {
+#line 5373 "Dialogs.c"
+		GString* _tmp86_;
+		gchar* _tmp87_;
+		gchar* _tmp88_;
 #line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp92_ = _ ("Photos/Videos Not Imported Due to Camera Errors:");
+		_tmp86_ = builder;
 #line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp93_ = g_strconcat (_tmp92_, "\n\n", NULL);
+		_tmp87_ = g_strconcat (_ ("Photos/Videos Not Imported Due to Camera Errors:"), "\n\n", NULL);
 #line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp94_ = _tmp93_;
+		_tmp88_ = _tmp87_;
 #line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_string_append (_tmp91_, _tmp94_);
+		g_string_append (_tmp86_, _tmp88_);
 #line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp94_);
-#line 5470 "Dialogs.c"
+		_g_free0 (_tmp88_);
+#line 5387 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
-			ImportManifest* _tmp95_ = NULL;
-			GeeList* _tmp96_ = NULL;
-			GeeList* _tmp97_ = NULL;
+			ImportManifest* _tmp89_;
+			GeeList* _tmp90_;
+			GeeList* _tmp91_;
 			gint _result_size = 0;
-			GeeList* _tmp98_ = NULL;
-			gint _tmp99_ = 0;
-			gint _tmp100_ = 0;
+			GeeList* _tmp92_;
+			gint _tmp93_;
+			gint _tmp94_;
 			gint _result_index = 0;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp95_ = manifest;
+			_tmp89_ = manifest;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp96_ = _tmp95_->camera_failed;
+			_tmp90_ = _tmp89_->camera_failed;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp97_ = _g_object_ref0 (_tmp96_);
+			_tmp91_ = _g_object_ref0 (_tmp90_);
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_result_list = _tmp97_;
+			_result_list = _tmp91_;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp98_ = _result_list;
+			_tmp92_ = _result_list;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp99_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp93_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp100_ = _tmp99_;
+			_tmp94_ = _tmp93_;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_result_size = _tmp100_;
+			_result_size = _tmp94_;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5501 "Dialogs.c"
-				gint _tmp101_ = 0;
-				gint _tmp102_ = 0;
-				gint _tmp103_ = 0;
+#line 5418 "Dialogs.c"
+				gint _tmp95_;
+				gint _tmp96_;
+				gint _tmp97_;
 				BatchImportResult* _result_ = NULL;
-				GeeList* _tmp104_ = NULL;
-				gint _tmp105_ = 0;
-				gpointer _tmp106_ = NULL;
-				BatchImportResult* _tmp107_ = NULL;
-				const gchar* _tmp108_ = NULL;
-				gchar* _tmp109_ = NULL;
-				gchar* _tmp110_ = NULL;
-				const gchar* _tmp111_ = NULL;
-				gchar* _tmp112_ = NULL;
-				gchar* _tmp113_ = NULL;
-				gchar* _tmp114_ = NULL;
-				gchar* _tmp115_ = NULL;
-				BatchImportResult* _tmp116_ = NULL;
-				const gchar* _tmp117_ = NULL;
-				gchar* _tmp118_ = NULL;
-				gchar* _tmp119_ = NULL;
-				gchar* _tmp120_ = NULL;
-				GString* _tmp121_ = NULL;
-				const gchar* _tmp122_ = NULL;
+				GeeList* _tmp98_;
+				gint _tmp99_;
+				gpointer _tmp100_;
+				BatchImportResult* _tmp101_;
+				const gchar* _tmp102_;
+				gchar* _tmp103_;
+				gchar* _tmp104_;
+				gchar* _tmp105_;
+				gchar* _tmp106_;
+				gchar* _tmp107_;
+				gchar* _tmp108_;
+				BatchImportResult* _tmp109_;
+				const gchar* _tmp110_;
+				gchar* _tmp111_;
+				gchar* _tmp112_;
+				gchar* _tmp113_;
+				GString* _tmp114_;
+				const gchar* _tmp115_;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp101_ = _result_index;
+				_tmp95_ = _result_index;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_result_index = _tmp101_ + 1;
+				_result_index = _tmp95_ + 1;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp102_ = _result_index;
+				_tmp96_ = _result_index;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp103_ = _result_size;
+				_tmp97_ = _result_size;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (!(_tmp102_ < _tmp103_)) {
+				if (!(_tmp96_ < _tmp97_)) {
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5537 "Dialogs.c"
+#line 5453 "Dialogs.c"
 				}
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp104_ = _result_list;
+				_tmp98_ = _result_list;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp105_ = _result_index;
+				_tmp99_ = _result_index;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp106_ = gee_list_get (_tmp104_, _tmp105_);
+				_tmp100_ = gee_list_get (_tmp98_, _tmp99_);
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_result_ = (BatchImportResult*) _tmp106_;
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp107_ = _result_;
+				_result_ = (BatchImportResult*) _tmp100_;
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp108_ = _tmp107_->src_identifier;
+				_tmp101_ = _result_;
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp109_ = g_strconcat (_tmp108_, "\n\t", NULL);
+				_tmp102_ = _tmp101_->src_identifier;
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp110_ = _tmp109_;
+				_tmp103_ = g_strconcat (_tmp102_, "\n\t", NULL);
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp111_ = _ ("error message:");
+				_tmp104_ = _tmp103_;
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp112_ = g_strconcat (_tmp110_, _tmp111_, NULL);
+				_tmp105_ = g_strconcat (_tmp104_, _ ("error message:"), NULL);
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp113_ = _tmp112_;
+				_tmp106_ = _tmp105_;
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp114_ = g_strconcat (_tmp113_, " ", NULL);
+				_tmp107_ = g_strconcat (_tmp106_, " ", NULL);
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp115_ = _tmp114_;
+				_tmp108_ = _tmp107_;
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp116_ = _result_;
+				_tmp109_ = _result_;
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp117_ = _tmp116_->errmsg;
+				_tmp110_ = _tmp109_->errmsg;
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp118_ = g_strconcat (_tmp115_, _tmp117_, NULL);
+				_tmp111_ = g_strconcat (_tmp108_, _tmp110_, NULL);
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp119_ = _tmp118_;
+				_tmp112_ = _tmp111_;
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp120_ = g_strconcat (_tmp119_, "\n\n", NULL);
+				_tmp113_ = g_strconcat (_tmp112_, "\n\n", NULL);
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				current_file_summary = _tmp120_;
+				current_file_summary = _tmp113_;
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp119_);
+				_g_free0 (_tmp112_);
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp115_);
+				_g_free0 (_tmp108_);
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp113_);
+				_g_free0 (_tmp106_);
 #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp110_);
+				_g_free0 (_tmp104_);
 #line 587 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp121_ = builder;
+				_tmp114_ = builder;
 #line 587 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp122_ = current_file_summary;
+				_tmp115_ = current_file_summary;
 #line 587 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				g_string_append (_tmp121_, _tmp122_);
+				g_string_append (_tmp114_, _tmp115_);
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5595 "Dialogs.c"
+#line 5509 "Dialogs.c"
 			}
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5599 "Dialogs.c"
+#line 5513 "Dialogs.c"
 		}
 	}
 #line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp123_ = manifest;
+	_tmp116_ = manifest;
 #line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp124_ = _tmp123_->skipped_files;
+	_tmp117_ = _tmp116_->skipped_files;
 #line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp125_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp118_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp126_ = _tmp125_;
+	_tmp119_ = _tmp118_;
 #line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp126_ > 0) {
-#line 5612 "Dialogs.c"
-		GString* _tmp127_ = NULL;
-		const gchar* _tmp128_ = NULL;
-		gchar* _tmp129_ = NULL;
-		gchar* _tmp130_ = NULL;
-#line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp127_ = builder;
+	if (_tmp119_ > 0) {
+#line 5526 "Dialogs.c"
+		GString* _tmp120_;
+		gchar* _tmp121_;
+		gchar* _tmp122_;
 #line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp128_ = _ ("Files Not Imported Because They Weren’t Recognized as Photos or Videos" \
-":");
+		_tmp120_ = builder;
 #line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp129_ = g_strconcat (_tmp128_, "\n\n", NULL);
+		_tmp121_ = g_strconcat (_ ("Files Not Imported Because They Weren’t Recognized as Photos or Videos" \
+":"), "\n\n", NULL);
 #line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp130_ = _tmp129_;
+		_tmp122_ = _tmp121_;
 #line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_string_append (_tmp127_, _tmp130_);
+		g_string_append (_tmp120_, _tmp122_);
 #line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp130_);
-#line 5629 "Dialogs.c"
+		_g_free0 (_tmp122_);
+#line 5540 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
-			ImportManifest* _tmp131_ = NULL;
-			GeeList* _tmp132_ = NULL;
-			GeeList* _tmp133_ = NULL;
+			ImportManifest* _tmp123_;
+			GeeList* _tmp124_;
+			GeeList* _tmp125_;
 			gint _result_size = 0;
-			GeeList* _tmp134_ = NULL;
-			gint _tmp135_ = 0;
-			gint _tmp136_ = 0;
+			GeeList* _tmp126_;
+			gint _tmp127_;
+			gint _tmp128_;
 			gint _result_index = 0;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp131_ = manifest;
+			_tmp123_ = manifest;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp132_ = _tmp131_->skipped_files;
+			_tmp124_ = _tmp123_->skipped_files;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp133_ = _g_object_ref0 (_tmp132_);
+			_tmp125_ = _g_object_ref0 (_tmp124_);
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_result_list = _tmp133_;
+			_result_list = _tmp125_;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp134_ = _result_list;
+			_tmp126_ = _result_list;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp135_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp127_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp136_ = _tmp135_;
+			_tmp128_ = _tmp127_;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_result_size = _tmp136_;
+			_result_size = _tmp128_;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5660 "Dialogs.c"
-				gint _tmp137_ = 0;
-				gint _tmp138_ = 0;
-				gint _tmp139_ = 0;
+#line 5571 "Dialogs.c"
+				gint _tmp129_;
+				gint _tmp130_;
+				gint _tmp131_;
 				BatchImportResult* _result_ = NULL;
-				GeeList* _tmp140_ = NULL;
-				gint _tmp141_ = 0;
-				gpointer _tmp142_ = NULL;
-				BatchImportResult* _tmp143_ = NULL;
-				const gchar* _tmp144_ = NULL;
-				gchar* _tmp145_ = NULL;
-				gchar* _tmp146_ = NULL;
-				const gchar* _tmp147_ = NULL;
-				gchar* _tmp148_ = NULL;
-				gchar* _tmp149_ = NULL;
-				gchar* _tmp150_ = NULL;
-				gchar* _tmp151_ = NULL;
-				BatchImportResult* _tmp152_ = NULL;
-				const gchar* _tmp153_ = NULL;
-				gchar* _tmp154_ = NULL;
-				gchar* _tmp155_ = NULL;
-				gchar* _tmp156_ = NULL;
-				GString* _tmp157_ = NULL;
-				const gchar* _tmp158_ = NULL;
+				GeeList* _tmp132_;
+				gint _tmp133_;
+				gpointer _tmp134_;
+				BatchImportResult* _tmp135_;
+				const gchar* _tmp136_;
+				gchar* _tmp137_;
+				gchar* _tmp138_;
+				gchar* _tmp139_;
+				gchar* _tmp140_;
+				gchar* _tmp141_;
+				gchar* _tmp142_;
+				BatchImportResult* _tmp143_;
+				const gchar* _tmp144_;
+				gchar* _tmp145_;
+				gchar* _tmp146_;
+				gchar* _tmp147_;
+				GString* _tmp148_;
+				const gchar* _tmp149_;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp137_ = _result_index;
+				_tmp129_ = _result_index;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_result_index = _tmp137_ + 1;
+				_result_index = _tmp129_ + 1;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp138_ = _result_index;
+				_tmp130_ = _result_index;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp139_ = _result_size;
+				_tmp131_ = _result_size;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (!(_tmp138_ < _tmp139_)) {
+				if (!(_tmp130_ < _tmp131_)) {
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5696 "Dialogs.c"
+#line 5606 "Dialogs.c"
 				}
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp140_ = _result_list;
+				_tmp132_ = _result_list;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp141_ = _result_index;
+				_tmp133_ = _result_index;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp142_ = gee_list_get (_tmp140_, _tmp141_);
+				_tmp134_ = gee_list_get (_tmp132_, _tmp133_);
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_result_ = (BatchImportResult*) _tmp142_;
+				_result_ = (BatchImportResult*) _tmp134_;
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp143_ = _result_;
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp144_ = _tmp143_->src_identifier;
+				_tmp135_ = _result_;
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp145_ = g_strconcat (_tmp144_, "\n\t", NULL);
+				_tmp136_ = _tmp135_->src_identifier;
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp146_ = _tmp145_;
+				_tmp137_ = g_strconcat (_tmp136_, "\n\t", NULL);
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp147_ = _ ("error message:");
+				_tmp138_ = _tmp137_;
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp148_ = g_strconcat (_tmp146_, _tmp147_, NULL);
+				_tmp139_ = g_strconcat (_tmp138_, _ ("error message:"), NULL);
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp149_ = _tmp148_;
+				_tmp140_ = _tmp139_;
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp150_ = g_strconcat (_tmp149_, " ", NULL);
+				_tmp141_ = g_strconcat (_tmp140_, " ", NULL);
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp151_ = _tmp150_;
+				_tmp142_ = _tmp141_;
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp152_ = _result_;
+				_tmp143_ = _result_;
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp153_ = _tmp152_->errmsg;
+				_tmp144_ = _tmp143_->errmsg;
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp154_ = g_strconcat (_tmp151_, _tmp153_, NULL);
+				_tmp145_ = g_strconcat (_tmp142_, _tmp144_, NULL);
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp155_ = _tmp154_;
+				_tmp146_ = _tmp145_;
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp156_ = g_strconcat (_tmp155_, "\n\n", NULL);
+				_tmp147_ = g_strconcat (_tmp146_, "\n\n", NULL);
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				current_file_summary = _tmp156_;
+				current_file_summary = _tmp147_;
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp155_);
+				_g_free0 (_tmp146_);
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp151_);
+				_g_free0 (_tmp142_);
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp149_);
+				_g_free0 (_tmp140_);
 #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp146_);
+				_g_free0 (_tmp138_);
 #line 602 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp157_ = builder;
+				_tmp148_ = builder;
 #line 602 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp158_ = current_file_summary;
+				_tmp149_ = current_file_summary;
 #line 602 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				g_string_append (_tmp157_, _tmp158_);
+				g_string_append (_tmp148_, _tmp149_);
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5754 "Dialogs.c"
+#line 5662 "Dialogs.c"
 			}
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5758 "Dialogs.c"
+#line 5666 "Dialogs.c"
 		}
 	}
 #line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp159_ = manifest;
+	_tmp150_ = manifest;
 #line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp160_ = _tmp159_->skipped_photos;
+	_tmp151_ = _tmp150_->skipped_photos;
 #line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp161_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp160_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp152_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp151_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp162_ = _tmp161_;
+	_tmp153_ = _tmp152_;
 #line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp162_ > 0) {
-#line 5771 "Dialogs.c"
-		GString* _tmp163_ = NULL;
-		const gchar* _tmp164_ = NULL;
-		gchar* _tmp165_ = NULL;
-		gchar* _tmp166_ = NULL;
+	if (_tmp153_ > 0) {
+#line 5679 "Dialogs.c"
+		GString* _tmp154_;
+		gchar* _tmp155_;
+		gchar* _tmp156_;
 #line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp163_ = builder;
+		_tmp154_ = builder;
 #line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp164_ = _ ("Photos/Videos Not Imported Because They Weren’t in a Format Shotwell U" \
-"nderstands:");
+		_tmp155_ = g_strconcat (_ ("Photos/Videos Not Imported Because They Weren’t in a Format Shotwell U" \
+"nderstands:"), "\n\n", NULL);
 #line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp165_ = g_strconcat (_tmp164_, "\n\n", NULL);
+		_tmp156_ = _tmp155_;
 #line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp166_ = _tmp165_;
+		g_string_append (_tmp154_, _tmp156_);
 #line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_string_append (_tmp163_, _tmp166_);
-#line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp166_);
-#line 5788 "Dialogs.c"
+		_g_free0 (_tmp156_);
+#line 5693 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
-			ImportManifest* _tmp167_ = NULL;
-			GeeList* _tmp168_ = NULL;
-			GeeList* _tmp169_ = NULL;
+			ImportManifest* _tmp157_;
+			GeeList* _tmp158_;
+			GeeList* _tmp159_;
 			gint _result_size = 0;
-			GeeList* _tmp170_ = NULL;
-			gint _tmp171_ = 0;
-			gint _tmp172_ = 0;
+			GeeList* _tmp160_;
+			gint _tmp161_;
+			gint _tmp162_;
 			gint _result_index = 0;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp167_ = manifest;
+			_tmp157_ = manifest;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp168_ = _tmp167_->skipped_photos;
+			_tmp158_ = _tmp157_->skipped_photos;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp169_ = _g_object_ref0 (_tmp168_);
+			_tmp159_ = _g_object_ref0 (_tmp158_);
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_result_list = _tmp169_;
+			_result_list = _tmp159_;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp170_ = _result_list;
+			_tmp160_ = _result_list;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp171_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp170_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp161_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp160_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp172_ = _tmp171_;
+			_tmp162_ = _tmp161_;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_result_size = _tmp172_;
+			_result_size = _tmp162_;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5819 "Dialogs.c"
-				gint _tmp173_ = 0;
-				gint _tmp174_ = 0;
-				gint _tmp175_ = 0;
+#line 5724 "Dialogs.c"
+				gint _tmp163_;
+				gint _tmp164_;
+				gint _tmp165_;
 				BatchImportResult* _result_ = NULL;
-				GeeList* _tmp176_ = NULL;
-				gint _tmp177_ = 0;
-				gpointer _tmp178_ = NULL;
-				BatchImportResult* _tmp179_ = NULL;
-				const gchar* _tmp180_ = NULL;
-				gchar* _tmp181_ = NULL;
-				gchar* _tmp182_ = NULL;
-				const gchar* _tmp183_ = NULL;
-				gchar* _tmp184_ = NULL;
-				gchar* _tmp185_ = NULL;
-				gchar* _tmp186_ = NULL;
-				gchar* _tmp187_ = NULL;
-				BatchImportResult* _tmp188_ = NULL;
-				const gchar* _tmp189_ = NULL;
-				gchar* _tmp190_ = NULL;
-				gchar* _tmp191_ = NULL;
-				gchar* _tmp192_ = NULL;
-				GString* _tmp193_ = NULL;
-				const gchar* _tmp194_ = NULL;
+				GeeList* _tmp166_;
+				gint _tmp167_;
+				gpointer _tmp168_;
+				BatchImportResult* _tmp169_;
+				const gchar* _tmp170_;
+				gchar* _tmp171_;
+				gchar* _tmp172_;
+				gchar* _tmp173_;
+				gchar* _tmp174_;
+				gchar* _tmp175_;
+				gchar* _tmp176_;
+				BatchImportResult* _tmp177_;
+				const gchar* _tmp178_;
+				gchar* _tmp179_;
+				gchar* _tmp180_;
+				gchar* _tmp181_;
+				GString* _tmp182_;
+				const gchar* _tmp183_;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp173_ = _result_index;
+				_tmp163_ = _result_index;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_result_index = _tmp173_ + 1;
+				_result_index = _tmp163_ + 1;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp174_ = _result_index;
+				_tmp164_ = _result_index;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp175_ = _result_size;
+				_tmp165_ = _result_size;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (!(_tmp174_ < _tmp175_)) {
+				if (!(_tmp164_ < _tmp165_)) {
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5855 "Dialogs.c"
+#line 5759 "Dialogs.c"
 				}
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp176_ = _result_list;
+				_tmp166_ = _result_list;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp177_ = _result_index;
+				_tmp167_ = _result_index;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp178_ = gee_list_get (_tmp176_, _tmp177_);
+				_tmp168_ = gee_list_get (_tmp166_, _tmp167_);
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_result_ = (BatchImportResult*) _tmp178_;
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp179_ = _result_;
+				_result_ = (BatchImportResult*) _tmp168_;
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp180_ = _tmp179_->src_identifier;
+				_tmp169_ = _result_;
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp181_ = g_strconcat (_tmp180_, "\n\t", NULL);
+				_tmp170_ = _tmp169_->src_identifier;
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp182_ = _tmp181_;
+				_tmp171_ = g_strconcat (_tmp170_, "\n\t", NULL);
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp183_ = _ ("error message:");
+				_tmp172_ = _tmp171_;
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp184_ = g_strconcat (_tmp182_, _tmp183_, NULL);
+				_tmp173_ = g_strconcat (_tmp172_, _ ("error message:"), NULL);
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp185_ = _tmp184_;
+				_tmp174_ = _tmp173_;
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp186_ = g_strconcat (_tmp185_, " ", NULL);
+				_tmp175_ = g_strconcat (_tmp174_, " ", NULL);
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp187_ = _tmp186_;
+				_tmp176_ = _tmp175_;
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp188_ = _result_;
+				_tmp177_ = _result_;
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp189_ = _tmp188_->errmsg;
+				_tmp178_ = _tmp177_->errmsg;
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp190_ = g_strconcat (_tmp187_, _tmp189_, NULL);
+				_tmp179_ = g_strconcat (_tmp176_, _tmp178_, NULL);
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp191_ = _tmp190_;
+				_tmp180_ = _tmp179_;
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp192_ = g_strconcat (_tmp191_, "\n\n", NULL);
+				_tmp181_ = g_strconcat (_tmp180_, "\n\n", NULL);
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				current_file_summary = _tmp192_;
+				current_file_summary = _tmp181_;
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp191_);
+				_g_free0 (_tmp180_);
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp187_);
+				_g_free0 (_tmp176_);
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp185_);
+				_g_free0 (_tmp174_);
 #line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp182_);
+				_g_free0 (_tmp172_);
 #line 617 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp193_ = builder;
+				_tmp182_ = builder;
 #line 617 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp194_ = current_file_summary;
+				_tmp183_ = current_file_summary;
 #line 617 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				g_string_append (_tmp193_, _tmp194_);
+				g_string_append (_tmp182_, _tmp183_);
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5913 "Dialogs.c"
+#line 5815 "Dialogs.c"
 			}
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5917 "Dialogs.c"
+#line 5819 "Dialogs.c"
 		}
 	}
 #line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp195_ = manifest;
+	_tmp184_ = manifest;
 #line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp196_ = _tmp195_->write_failed;
+	_tmp185_ = _tmp184_->write_failed;
 #line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp197_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp196_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp186_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp185_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp198_ = _tmp197_;
+	_tmp187_ = _tmp186_;
 #line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp198_ > 0) {
-#line 5930 "Dialogs.c"
-		GString* _tmp199_ = NULL;
-		const gchar* _tmp200_ = NULL;
-		gchar* _tmp201_ = NULL;
-		gchar* _tmp202_ = NULL;
-#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp199_ = builder;
+	if (_tmp187_ > 0) {
+#line 5832 "Dialogs.c"
+		GString* _tmp188_;
+		gchar* _tmp189_;
+		gchar* _tmp190_;
 #line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp200_ = _ ("Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into it" \
-"s Library:");
+		_tmp188_ = builder;
 #line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp201_ = g_strconcat (_tmp200_, "\n\n", NULL);
+		_tmp189_ = g_strconcat (_ ("Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into it" \
+"s Library:"), "\n\n", NULL);
 #line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp202_ = _tmp201_;
+		_tmp190_ = _tmp189_;
 #line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_string_append (_tmp199_, _tmp202_);
+		g_string_append (_tmp188_, _tmp190_);
 #line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp202_);
-#line 5947 "Dialogs.c"
+		_g_free0 (_tmp190_);
+#line 5846 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
-			ImportManifest* _tmp203_ = NULL;
-			GeeList* _tmp204_ = NULL;
-			GeeList* _tmp205_ = NULL;
+			ImportManifest* _tmp191_;
+			GeeList* _tmp192_;
+			GeeList* _tmp193_;
 			gint _result_size = 0;
-			GeeList* _tmp206_ = NULL;
-			gint _tmp207_ = 0;
-			gint _tmp208_ = 0;
+			GeeList* _tmp194_;
+			gint _tmp195_;
+			gint _tmp196_;
 			gint _result_index = 0;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp203_ = manifest;
+			_tmp191_ = manifest;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp204_ = _tmp203_->write_failed;
+			_tmp192_ = _tmp191_->write_failed;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp205_ = _g_object_ref0 (_tmp204_);
+			_tmp193_ = _g_object_ref0 (_tmp192_);
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_result_list = _tmp205_;
+			_result_list = _tmp193_;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp206_ = _result_list;
+			_tmp194_ = _result_list;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp207_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp206_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp195_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp194_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp208_ = _tmp207_;
+			_tmp196_ = _tmp195_;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_result_size = _tmp208_;
+			_result_size = _tmp196_;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5978 "Dialogs.c"
-				gint _tmp209_ = 0;
-				gint _tmp210_ = 0;
-				gint _tmp211_ = 0;
+#line 5877 "Dialogs.c"
+				gint _tmp197_;
+				gint _tmp198_;
+				gint _tmp199_;
 				BatchImportResult* _result_ = NULL;
-				GeeList* _tmp212_ = NULL;
-				gint _tmp213_ = 0;
-				gpointer _tmp214_ = NULL;
-				const gchar* _tmp215_ = NULL;
-				BatchImportResult* _tmp216_ = NULL;
-				const gchar* _tmp217_ = NULL;
-				BatchImportResult* _tmp218_ = NULL;
-				const gchar* _tmp219_ = NULL;
-				gchar* _tmp220_ = NULL;
-				gchar* _tmp221_ = NULL;
-				gchar* _tmp222_ = NULL;
-				gchar* _tmp223_ = NULL;
-				const gchar* _tmp224_ = NULL;
-				gchar* _tmp225_ = NULL;
-				gchar* _tmp226_ = NULL;
-				gchar* _tmp227_ = NULL;
-				gchar* _tmp228_ = NULL;
-				BatchImportResult* _tmp229_ = NULL;
-				const gchar* _tmp230_ = NULL;
-				gchar* _tmp231_ = NULL;
-				gchar* _tmp232_ = NULL;
-				gchar* _tmp233_ = NULL;
-				GString* _tmp234_ = NULL;
-				const gchar* _tmp235_ = NULL;
+				GeeList* _tmp200_;
+				gint _tmp201_;
+				gpointer _tmp202_;
+				BatchImportResult* _tmp203_;
+				const gchar* _tmp204_;
+				BatchImportResult* _tmp205_;
+				const gchar* _tmp206_;
+				gchar* _tmp207_;
+				gchar* _tmp208_;
+				gchar* _tmp209_;
+				gchar* _tmp210_;
+				gchar* _tmp211_;
+				gchar* _tmp212_;
+				gchar* _tmp213_;
+				gchar* _tmp214_;
+				BatchImportResult* _tmp215_;
+				const gchar* _tmp216_;
+				gchar* _tmp217_;
+				gchar* _tmp218_;
+				gchar* _tmp219_;
+				GString* _tmp220_;
+				const gchar* _tmp221_;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp209_ = _result_index;
+				_tmp197_ = _result_index;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_result_index = _tmp209_ + 1;
+				_result_index = _tmp197_ + 1;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp210_ = _result_index;
+				_tmp198_ = _result_index;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp211_ = _result_size;
+				_tmp199_ = _result_size;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (!(_tmp210_ < _tmp211_)) {
+				if (!(_tmp198_ < _tmp199_)) {
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 6019 "Dialogs.c"
+#line 5916 "Dialogs.c"
 				}
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp212_ = _result_list;
+				_tmp200_ = _result_list;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp213_ = _result_index;
+				_tmp201_ = _result_index;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp214_ = gee_list_get (_tmp212_, _tmp213_);
+				_tmp202_ = gee_list_get (_tmp200_, _tmp201_);
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_result_ = (BatchImportResult*) _tmp214_;
+				_result_ = (BatchImportResult*) _tmp202_;
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp215_ = _ ("couldn’t copy %s\n\tto %s");
+				_tmp203_ = _result_;
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp216_ = _result_;
+				_tmp204_ = _tmp203_->src_identifier;
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp217_ = _tmp216_->src_identifier;
+				_tmp205_ = _result_;
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp218_ = _result_;
+				_tmp206_ = _tmp205_->dest_identifier;
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp219_ = _tmp218_->dest_identifier;
+				_tmp207_ = g_strdup_printf (_ ("couldn’t copy %s\n\tto %s"), _tmp204_, _tmp206_);
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp220_ = g_strdup_printf (_tmp215_, _tmp217_, _tmp219_);
+				_tmp208_ = _tmp207_;
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp221_ = _tmp220_;
+				_tmp209_ = g_strconcat (_tmp208_, "\n\t", NULL);
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp222_ = g_strconcat (_tmp221_, "\n\t", NULL);
+				_tmp210_ = _tmp209_;
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp223_ = _tmp222_;
+				_tmp211_ = g_strconcat (_tmp210_, _ ("error message:"), NULL);
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp224_ = _ ("error message:");
+				_tmp212_ = _tmp211_;
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp225_ = g_strconcat (_tmp223_, _tmp224_, NULL);
+				_tmp213_ = g_strconcat (_tmp212_, " ", NULL);
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp226_ = _tmp225_;
+				_tmp214_ = _tmp213_;
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp227_ = g_strconcat (_tmp226_, " ", NULL);
+				_tmp215_ = _result_;
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp228_ = _tmp227_;
+				_tmp216_ = _tmp215_->errmsg;
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp229_ = _result_;
+				_tmp217_ = g_strconcat (_tmp214_, _tmp216_, NULL);
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp230_ = _tmp229_->errmsg;
+				_tmp218_ = _tmp217_;
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp231_ = g_strconcat (_tmp228_, _tmp230_, NULL);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp232_ = _tmp231_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp233_ = g_strconcat (_tmp232_, "\n\n", NULL);
+				_tmp219_ = g_strconcat (_tmp218_, "\n\n", NULL);
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				current_file_summary = _tmp233_;
+				current_file_summary = _tmp219_;
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp232_);
+				_g_free0 (_tmp218_);
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp228_);
+				_g_free0 (_tmp214_);
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp226_);
+				_g_free0 (_tmp212_);
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp223_);
+				_g_free0 (_tmp210_);
 #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp221_);
+				_g_free0 (_tmp208_);
 #line 633 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp234_ = builder;
+				_tmp220_ = builder;
 #line 633 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp235_ = current_file_summary;
+				_tmp221_ = current_file_summary;
 #line 633 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				g_string_append (_tmp234_, _tmp235_);
+				g_string_append (_tmp220_, _tmp221_);
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 6089 "Dialogs.c"
+#line 5982 "Dialogs.c"
 			}
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 6093 "Dialogs.c"
+#line 5986 "Dialogs.c"
 		}
 	}
 #line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp236_ = manifest;
+	_tmp222_ = manifest;
 #line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp237_ = _tmp236_->corrupt_files;
+	_tmp223_ = _tmp222_->corrupt_files;
 #line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp238_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp237_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp224_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp223_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp239_ = _tmp238_;
+	_tmp225_ = _tmp224_;
 #line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp239_ > 0) {
-#line 6106 "Dialogs.c"
-		GString* _tmp240_ = NULL;
-		const gchar* _tmp241_ = NULL;
-		gchar* _tmp242_ = NULL;
-		gchar* _tmp243_ = NULL;
+	if (_tmp225_ > 0) {
+#line 5999 "Dialogs.c"
+		GString* _tmp226_;
+		gchar* _tmp227_;
+		gchar* _tmp228_;
 #line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp240_ = builder;
+		_tmp226_ = builder;
 #line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp241_ = _ ("Photos/Videos Not Imported Because Files Are Corrupt:");
+		_tmp227_ = g_strconcat (_ ("Photos/Videos Not Imported Because Files Are Corrupt:"), "\n\n", NULL);
 #line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp242_ = g_strconcat (_tmp241_, "\n\n", NULL);
+		_tmp228_ = _tmp227_;
 #line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp243_ = _tmp242_;
+		g_string_append (_tmp226_, _tmp228_);
 #line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_string_append (_tmp240_, _tmp243_);
-#line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp243_);
-#line 6123 "Dialogs.c"
+		_g_free0 (_tmp228_);
+#line 6013 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
-			ImportManifest* _tmp244_ = NULL;
-			GeeList* _tmp245_ = NULL;
-			GeeList* _tmp246_ = NULL;
+			ImportManifest* _tmp229_;
+			GeeList* _tmp230_;
+			GeeList* _tmp231_;
 			gint _result_size = 0;
-			GeeList* _tmp247_ = NULL;
-			gint _tmp248_ = 0;
-			gint _tmp249_ = 0;
+			GeeList* _tmp232_;
+			gint _tmp233_;
+			gint _tmp234_;
 			gint _result_index = 0;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp244_ = manifest;
+			_tmp229_ = manifest;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp245_ = _tmp244_->corrupt_files;
+			_tmp230_ = _tmp229_->corrupt_files;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp246_ = _g_object_ref0 (_tmp245_);
+			_tmp231_ = _g_object_ref0 (_tmp230_);
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_result_list = _tmp246_;
+			_result_list = _tmp231_;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp247_ = _result_list;
+			_tmp232_ = _result_list;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp248_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp247_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp233_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp232_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp249_ = _tmp248_;
+			_tmp234_ = _tmp233_;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_result_size = _tmp249_;
+			_result_size = _tmp234_;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 6154 "Dialogs.c"
-				gint _tmp250_ = 0;
-				gint _tmp251_ = 0;
-				gint _tmp252_ = 0;
+#line 6044 "Dialogs.c"
+				gint _tmp235_;
+				gint _tmp236_;
+				gint _tmp237_;
 				BatchImportResult* _result_ = NULL;
-				GeeList* _tmp253_ = NULL;
-				gint _tmp254_ = 0;
-				gpointer _tmp255_ = NULL;
-				BatchImportResult* _tmp256_ = NULL;
-				const gchar* _tmp257_ = NULL;
-				gchar* _tmp258_ = NULL;
-				gchar* _tmp259_ = NULL;
-				const gchar* _tmp260_ = NULL;
-				gchar* _tmp261_ = NULL;
-				gchar* _tmp262_ = NULL;
-				gchar* _tmp263_ = NULL;
-				gchar* _tmp264_ = NULL;
-				BatchImportResult* _tmp265_ = NULL;
-				const gchar* _tmp266_ = NULL;
-				gchar* _tmp267_ = NULL;
-				gchar* _tmp268_ = NULL;
-				gchar* _tmp269_ = NULL;
-				GString* _tmp270_ = NULL;
-				const gchar* _tmp271_ = NULL;
+				GeeList* _tmp238_;
+				gint _tmp239_;
+				gpointer _tmp240_;
+				BatchImportResult* _tmp241_;
+				const gchar* _tmp242_;
+				gchar* _tmp243_;
+				gchar* _tmp244_;
+				gchar* _tmp245_;
+				gchar* _tmp246_;
+				gchar* _tmp247_;
+				gchar* _tmp248_;
+				BatchImportResult* _tmp249_;
+				const gchar* _tmp250_;
+				gchar* _tmp251_;
+				gchar* _tmp252_;
+				gchar* _tmp253_;
+				GString* _tmp254_;
+				const gchar* _tmp255_;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp250_ = _result_index;
+				_tmp235_ = _result_index;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_result_index = _tmp250_ + 1;
+				_result_index = _tmp235_ + 1;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp251_ = _result_index;
+				_tmp236_ = _result_index;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp252_ = _result_size;
+				_tmp237_ = _result_size;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (!(_tmp251_ < _tmp252_)) {
+				if (!(_tmp236_ < _tmp237_)) {
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 6190 "Dialogs.c"
+#line 6079 "Dialogs.c"
 				}
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp253_ = _result_list;
+				_tmp238_ = _result_list;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp254_ = _result_index;
+				_tmp239_ = _result_index;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp255_ = gee_list_get (_tmp253_, _tmp254_);
+				_tmp240_ = gee_list_get (_tmp238_, _tmp239_);
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_result_ = (BatchImportResult*) _tmp255_;
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp256_ = _result_;
+				_result_ = (BatchImportResult*) _tmp240_;
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp257_ = _tmp256_->src_identifier;
+				_tmp241_ = _result_;
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp258_ = g_strconcat (_tmp257_, "\n\t", NULL);
+				_tmp242_ = _tmp241_->src_identifier;
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp259_ = _tmp258_;
+				_tmp243_ = g_strconcat (_tmp242_, "\n\t", NULL);
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp260_ = _ ("error message:");
+				_tmp244_ = _tmp243_;
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp261_ = g_strconcat (_tmp259_, _tmp260_, NULL);
+				_tmp245_ = g_strconcat (_tmp244_, _ ("error message:"), NULL);
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp262_ = _tmp261_;
+				_tmp246_ = _tmp245_;
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp263_ = g_strconcat (_tmp262_, " |", NULL);
+				_tmp247_ = g_strconcat (_tmp246_, " |", NULL);
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp264_ = _tmp263_;
+				_tmp248_ = _tmp247_;
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp265_ = _result_;
+				_tmp249_ = _result_;
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp266_ = _tmp265_->errmsg;
+				_tmp250_ = _tmp249_->errmsg;
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp267_ = g_strconcat (_tmp264_, _tmp266_, NULL);
+				_tmp251_ = g_strconcat (_tmp248_, _tmp250_, NULL);
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp268_ = _tmp267_;
+				_tmp252_ = _tmp251_;
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp269_ = g_strconcat (_tmp268_, "|\n\n", NULL);
+				_tmp253_ = g_strconcat (_tmp252_, "|\n\n", NULL);
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				current_file_summary = _tmp269_;
+				current_file_summary = _tmp253_;
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp268_);
+				_g_free0 (_tmp252_);
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp264_);
+				_g_free0 (_tmp248_);
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp262_);
+				_g_free0 (_tmp246_);
 #line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp259_);
+				_g_free0 (_tmp244_);
 #line 648 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp270_ = builder;
+				_tmp254_ = builder;
 #line 648 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp271_ = current_file_summary;
+				_tmp255_ = current_file_summary;
 #line 648 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				g_string_append (_tmp270_, _tmp271_);
+				g_string_append (_tmp254_, _tmp255_);
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 6248 "Dialogs.c"
+#line 6135 "Dialogs.c"
 			}
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 6252 "Dialogs.c"
+#line 6139 "Dialogs.c"
 		}
 	}
 #line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp272_ = manifest;
+	_tmp256_ = manifest;
 #line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp273_ = _tmp272_->failed;
+	_tmp257_ = _tmp256_->failed;
 #line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp274_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp273_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp258_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp257_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp275_ = _tmp274_;
+	_tmp259_ = _tmp258_;
 #line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp275_ > 0) {
-#line 6265 "Dialogs.c"
-		GString* _tmp276_ = NULL;
-		const gchar* _tmp277_ = NULL;
-		gchar* _tmp278_ = NULL;
-		gchar* _tmp279_ = NULL;
+	if (_tmp259_ > 0) {
+#line 6152 "Dialogs.c"
+		GString* _tmp260_;
+		gchar* _tmp261_;
+		gchar* _tmp262_;
 #line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp276_ = builder;
+		_tmp260_ = builder;
 #line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp277_ = _ ("Photos/Videos Not Imported for Other Reasons:");
+		_tmp261_ = g_strconcat (_ ("Photos/Videos Not Imported for Other Reasons:"), "\n\n", NULL);
 #line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp278_ = g_strconcat (_tmp277_, "\n\n", NULL);
-#line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp279_ = _tmp278_;
+		_tmp262_ = _tmp261_;
 #line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_string_append (_tmp276_, _tmp279_);
+		g_string_append (_tmp260_, _tmp262_);
 #line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp279_);
-#line 6282 "Dialogs.c"
+		_g_free0 (_tmp262_);
+#line 6166 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
-			ImportManifest* _tmp280_ = NULL;
-			GeeList* _tmp281_ = NULL;
-			GeeList* _tmp282_ = NULL;
+			ImportManifest* _tmp263_;
+			GeeList* _tmp264_;
+			GeeList* _tmp265_;
 			gint _result_size = 0;
-			GeeList* _tmp283_ = NULL;
-			gint _tmp284_ = 0;
-			gint _tmp285_ = 0;
+			GeeList* _tmp266_;
+			gint _tmp267_;
+			gint _tmp268_;
 			gint _result_index = 0;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp280_ = manifest;
+			_tmp263_ = manifest;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp281_ = _tmp280_->failed;
+			_tmp264_ = _tmp263_->failed;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp282_ = _g_object_ref0 (_tmp281_);
+			_tmp265_ = _g_object_ref0 (_tmp264_);
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_result_list = _tmp282_;
+			_result_list = _tmp265_;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp283_ = _result_list;
+			_tmp266_ = _result_list;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp284_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp283_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp267_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp266_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp285_ = _tmp284_;
+			_tmp268_ = _tmp267_;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_result_size = _tmp285_;
+			_result_size = _tmp268_;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 6313 "Dialogs.c"
-				gint _tmp286_ = 0;
-				gint _tmp287_ = 0;
-				gint _tmp288_ = 0;
+#line 6197 "Dialogs.c"
+				gint _tmp269_;
+				gint _tmp270_;
+				gint _tmp271_;
 				BatchImportResult* _result_ = NULL;
-				GeeList* _tmp289_ = NULL;
-				gint _tmp290_ = 0;
-				gpointer _tmp291_ = NULL;
-				BatchImportResult* _tmp292_ = NULL;
-				const gchar* _tmp293_ = NULL;
-				gchar* _tmp294_ = NULL;
-				gchar* _tmp295_ = NULL;
-				const gchar* _tmp296_ = NULL;
-				gchar* _tmp297_ = NULL;
-				gchar* _tmp298_ = NULL;
-				gchar* _tmp299_ = NULL;
-				gchar* _tmp300_ = NULL;
-				BatchImportResult* _tmp301_ = NULL;
-				const gchar* _tmp302_ = NULL;
-				gchar* _tmp303_ = NULL;
-				gchar* _tmp304_ = NULL;
-				gchar* _tmp305_ = NULL;
-				GString* _tmp306_ = NULL;
-				const gchar* _tmp307_ = NULL;
+				GeeList* _tmp272_;
+				gint _tmp273_;
+				gpointer _tmp274_;
+				BatchImportResult* _tmp275_;
+				const gchar* _tmp276_;
+				gchar* _tmp277_;
+				gchar* _tmp278_;
+				gchar* _tmp279_;
+				gchar* _tmp280_;
+				gchar* _tmp281_;
+				gchar* _tmp282_;
+				BatchImportResult* _tmp283_;
+				const gchar* _tmp284_;
+				gchar* _tmp285_;
+				gchar* _tmp286_;
+				gchar* _tmp287_;
+				GString* _tmp288_;
+				const gchar* _tmp289_;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp286_ = _result_index;
+				_tmp269_ = _result_index;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_result_index = _tmp286_ + 1;
+				_result_index = _tmp269_ + 1;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp287_ = _result_index;
+				_tmp270_ = _result_index;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp288_ = _result_size;
+				_tmp271_ = _result_size;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (!(_tmp287_ < _tmp288_)) {
+				if (!(_tmp270_ < _tmp271_)) {
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 6349 "Dialogs.c"
+#line 6232 "Dialogs.c"
 				}
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp289_ = _result_list;
+				_tmp272_ = _result_list;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp290_ = _result_index;
+				_tmp273_ = _result_index;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp291_ = gee_list_get (_tmp289_, _tmp290_);
+				_tmp274_ = gee_list_get (_tmp272_, _tmp273_);
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_result_ = (BatchImportResult*) _tmp291_;
+				_result_ = (BatchImportResult*) _tmp274_;
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp292_ = _result_;
+				_tmp275_ = _result_;
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp293_ = _tmp292_->src_identifier;
+				_tmp276_ = _tmp275_->src_identifier;
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp294_ = g_strconcat (_tmp293_, "\n\t", NULL);
+				_tmp277_ = g_strconcat (_tmp276_, "\n\t", NULL);
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp295_ = _tmp294_;
+				_tmp278_ = _tmp277_;
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp296_ = _ ("error message:");
+				_tmp279_ = g_strconcat (_tmp278_, _ ("error message:"), NULL);
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp297_ = g_strconcat (_tmp295_, _tmp296_, NULL);
+				_tmp280_ = _tmp279_;
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp298_ = _tmp297_;
+				_tmp281_ = g_strconcat (_tmp280_, " ", NULL);
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp299_ = g_strconcat (_tmp298_, " ", NULL);
+				_tmp282_ = _tmp281_;
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp300_ = _tmp299_;
+				_tmp283_ = _result_;
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp301_ = _result_;
+				_tmp284_ = _tmp283_->errmsg;
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp302_ = _tmp301_->errmsg;
+				_tmp285_ = g_strconcat (_tmp282_, _tmp284_, NULL);
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp303_ = g_strconcat (_tmp300_, _tmp302_, NULL);
+				_tmp286_ = _tmp285_;
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp304_ = _tmp303_;
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp305_ = g_strconcat (_tmp304_, "\n\n", NULL);
+				_tmp287_ = g_strconcat (_tmp286_, "\n\n", NULL);
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				current_file_summary = _tmp305_;
+				current_file_summary = _tmp287_;
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp304_);
+				_g_free0 (_tmp286_);
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp300_);
+				_g_free0 (_tmp282_);
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp298_);
+				_g_free0 (_tmp280_);
 #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp295_);
+				_g_free0 (_tmp278_);
 #line 662 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp306_ = builder;
+				_tmp288_ = builder;
 #line 662 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp307_ = current_file_summary;
+				_tmp289_ = current_file_summary;
 #line 662 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				g_string_append (_tmp306_, _tmp307_);
+				g_string_append (_tmp288_, _tmp289_);
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 6407 "Dialogs.c"
+#line 6288 "Dialogs.c"
 			}
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 6411 "Dialogs.c"
+#line 6292 "Dialogs.c"
 		}
 	}
 #line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp308_ = builder;
+	_tmp290_ = builder;
 #line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp309_ = _tmp308_->str;
+	_tmp291_ = _tmp290_->str;
 #line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp310_ = g_strdup (_tmp309_);
+	_tmp292_ = g_strdup (_tmp291_);
 #line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = _tmp310_;
+	result = _tmp292_;
 #line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (current_file_summary);
 #line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -6435,97 +6316,97 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_g_string_free0 (builder);
 #line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 6432 "Dialogs.c"
+#line 6313 "Dialogs.c"
 }
 
 
 gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest_id, ImportUIQuestionParams* question) {
 	gboolean result = FALSE;
 	gchar* message = NULL;
-	gchar* _tmp0_ = NULL;
-	ImportManifest* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	ImportManifest* _tmp52_ = NULL;
-	GeeList* _tmp53_ = NULL;
-	gint _tmp54_ = 0;
-	gint _tmp55_ = 0;
-	ImportManifest* _tmp118_ = NULL;
-	GeeList* _tmp119_ = NULL;
-	gint _tmp120_ = 0;
-	gint _tmp121_ = 0;
-	ImportManifest* _tmp184_ = NULL;
-	GeeList* _tmp185_ = NULL;
-	gint _tmp186_ = 0;
-	gint _tmp187_ = 0;
-	ImportManifest* _tmp250_ = NULL;
-	GeeList* _tmp251_ = NULL;
-	gint _tmp252_ = 0;
-	gint _tmp253_ = 0;
-	ImportManifest* _tmp316_ = NULL;
-	GeeList* _tmp317_ = NULL;
-	gint _tmp318_ = 0;
-	gint _tmp319_ = 0;
-	ImportManifest* _tmp345_ = NULL;
-	GeeList* _tmp346_ = NULL;
-	gint _tmp347_ = 0;
-	gint _tmp348_ = 0;
-	ImportManifest* _tmp367_ = NULL;
-	GeeList* _tmp368_ = NULL;
-	gint _tmp369_ = 0;
-	gint _tmp370_ = 0;
-	ImportManifest* _tmp433_ = NULL;
-	GeeList* _tmp434_ = NULL;
-	gint _tmp435_ = 0;
-	gint _tmp436_ = 0;
+	gchar* _tmp0_;
+	ImportManifest* _tmp1_;
+	GeeList* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	ImportManifest* _tmp49_;
+	GeeList* _tmp50_;
+	gint _tmp51_;
+	gint _tmp52_;
+	ImportManifest* _tmp111_;
+	GeeList* _tmp112_;
+	gint _tmp113_;
+	gint _tmp114_;
+	ImportManifest* _tmp173_;
+	GeeList* _tmp174_;
+	gint _tmp175_;
+	gint _tmp176_;
+	ImportManifest* _tmp235_;
+	GeeList* _tmp236_;
+	gint _tmp237_;
+	gint _tmp238_;
+	ImportManifest* _tmp297_;
+	GeeList* _tmp298_;
+	gint _tmp299_;
+	gint _tmp300_;
+	ImportManifest* _tmp325_;
+	GeeList* _tmp326_;
+	gint _tmp327_;
+	gint _tmp328_;
+	ImportManifest* _tmp346_;
+	GeeList* _tmp347_;
+	gint _tmp348_;
+	gint _tmp349_;
+	ImportManifest* _tmp408_;
+	GeeList* _tmp409_;
+	gint _tmp410_;
+	gint _tmp411_;
 	gint total = 0;
-	ImportManifest* _tmp481_ = NULL;
-	GeeList* _tmp482_ = NULL;
-	gint _tmp483_ = 0;
-	gint _tmp484_ = 0;
-	ImportManifest* _tmp485_ = NULL;
-	GeeList* _tmp486_ = NULL;
-	gint _tmp487_ = 0;
-	gint _tmp488_ = 0;
-	ImportManifest* _tmp489_ = NULL;
-	GeeList* _tmp490_ = NULL;
-	gint _tmp491_ = 0;
-	gint _tmp492_ = 0;
-	ImportManifest* _tmp493_ = NULL;
-	GeeList* _tmp494_ = NULL;
-	gint _tmp495_ = 0;
-	gint _tmp496_ = 0;
-	ImportManifest* _tmp497_ = NULL;
-	GeeList* _tmp498_ = NULL;
-	gint _tmp499_ = 0;
-	gint _tmp500_ = 0;
-	ImportManifest* _tmp501_ = NULL;
-	GeeList* _tmp502_ = NULL;
-	gint _tmp503_ = 0;
-	gint _tmp504_ = 0;
-	ImportManifest* _tmp505_ = NULL;
-	GeeList* _tmp506_ = NULL;
-	gint _tmp507_ = 0;
-	gint _tmp508_ = 0;
-	ImportManifest* _tmp509_ = NULL;
-	GeeList* _tmp510_ = NULL;
-	gint _tmp511_ = 0;
-	gint _tmp512_ = 0;
-	ImportManifest* _tmp513_ = NULL;
-	GeeList* _tmp514_ = NULL;
-	gint _tmp515_ = 0;
-	gint _tmp516_ = 0;
-	gint _tmp517_ = 0;
-	ImportManifest* _tmp518_ = NULL;
-	GeeList* _tmp519_ = NULL;
-	gint _tmp520_ = 0;
-	gint _tmp521_ = 0;
-	gint _tmp522_ = 0;
+	ImportManifest* _tmp453_;
+	GeeList* _tmp454_;
+	gint _tmp455_;
+	gint _tmp456_;
+	ImportManifest* _tmp457_;
+	GeeList* _tmp458_;
+	gint _tmp459_;
+	gint _tmp460_;
+	ImportManifest* _tmp461_;
+	GeeList* _tmp462_;
+	gint _tmp463_;
+	gint _tmp464_;
+	ImportManifest* _tmp465_;
+	GeeList* _tmp466_;
+	gint _tmp467_;
+	gint _tmp468_;
+	ImportManifest* _tmp469_;
+	GeeList* _tmp470_;
+	gint _tmp471_;
+	gint _tmp472_;
+	ImportManifest* _tmp473_;
+	GeeList* _tmp474_;
+	gint _tmp475_;
+	gint _tmp476_;
+	ImportManifest* _tmp477_;
+	GeeList* _tmp478_;
+	gint _tmp479_;
+	gint _tmp480_;
+	ImportManifest* _tmp481_;
+	GeeList* _tmp482_;
+	gint _tmp483_;
+	gint _tmp484_;
+	ImportManifest* _tmp485_;
+	GeeList* _tmp486_;
+	gint _tmp487_;
+	gint _tmp488_;
+	gint _tmp489_;
+	ImportManifest* _tmp490_;
+	GeeList* _tmp491_;
+	gint _tmp492_;
+	gint _tmp493_;
+	gint _tmp494_;
 	GtkMessageDialog* dialog = NULL;
 	gint dialog_response = 0;
-	ImportUIQuestionParams* _tmp526_ = NULL;
-	gint _tmp606_ = 0;
+	ImportUIQuestionParams* _tmp497_;
+	gint _tmp575_;
 #line 671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_IMPORT_MANIFEST (manifest), FALSE);
 #line 671 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -6544,57 +6425,54 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp4_ = _tmp3_;
 #line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_ > 0) {
-#line 6541 "Dialogs.c"
+#line 6422 "Dialogs.c"
 		gchar* photos_message = NULL;
-		ImportManifest* _tmp5_ = NULL;
-		GeeList* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
-		const gchar* _tmp9_ = NULL;
-		ImportManifest* _tmp10_ = NULL;
-		GeeList* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
-		gchar* _tmp14_ = NULL;
+		ImportManifest* _tmp5_;
+		GeeList* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
+		ImportManifest* _tmp9_;
+		GeeList* _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
+		gchar* _tmp13_;
 		gchar* videos_message = NULL;
-		ImportManifest* _tmp15_ = NULL;
-		GeeList* _tmp16_ = NULL;
-		gint _tmp17_ = 0;
-		gint _tmp18_ = 0;
-		const gchar* _tmp19_ = NULL;
-		ImportManifest* _tmp20_ = NULL;
-		GeeList* _tmp21_ = NULL;
-		gint _tmp22_ = 0;
-		gint _tmp23_ = 0;
-		gchar* _tmp24_ = NULL;
+		ImportManifest* _tmp14_;
+		GeeList* _tmp15_;
+		gint _tmp16_;
+		gint _tmp17_;
+		ImportManifest* _tmp18_;
+		GeeList* _tmp19_;
+		gint _tmp20_;
+		gint _tmp21_;
+		gchar* _tmp22_;
 		gchar* both_message = NULL;
-		ImportManifest* _tmp25_ = NULL;
-		GeeList* _tmp26_ = NULL;
-		gint _tmp27_ = 0;
-		gint _tmp28_ = 0;
-		const gchar* _tmp29_ = NULL;
-		ImportManifest* _tmp30_ = NULL;
-		GeeList* _tmp31_ = NULL;
-		gint _tmp32_ = 0;
-		gint _tmp33_ = 0;
-		gchar* _tmp34_ = NULL;
-		const gchar* _tmp35_ = NULL;
-		ImportManifest* _tmp36_ = NULL;
-		GeeList* _tmp37_ = NULL;
-		const gchar* _tmp38_ = NULL;
-		const gchar* _tmp39_ = NULL;
-		const gchar* _tmp40_ = NULL;
-		const gchar* _tmp41_ = NULL;
-		gchar* _tmp42_ = NULL;
-		gchar* _tmp43_ = NULL;
-		gchar* _tmp44_ = NULL;
-		const gchar* _tmp45_ = NULL;
-		ImportManifest* _tmp46_ = NULL;
-		GeeList* _tmp47_ = NULL;
-		gboolean _tmp48_ = FALSE;
-		gchar* _tmp49_ = NULL;
-		gchar* _tmp50_ = NULL;
-		gchar* _tmp51_ = NULL;
+		ImportManifest* _tmp23_;
+		GeeList* _tmp24_;
+		gint _tmp25_;
+		gint _tmp26_;
+		ImportManifest* _tmp27_;
+		GeeList* _tmp28_;
+		gint _tmp29_;
+		gint _tmp30_;
+		gchar* _tmp31_;
+		const gchar* _tmp32_;
+		ImportManifest* _tmp33_;
+		GeeList* _tmp34_;
+		const gchar* _tmp35_;
+		const gchar* _tmp36_;
+		const gchar* _tmp37_;
+		const gchar* _tmp38_;
+		gchar* _tmp39_;
+		gchar* _tmp40_;
+		gchar* _tmp41_;
+		const gchar* _tmp42_;
+		ImportManifest* _tmp43_;
+		GeeList* _tmp44_;
+		gboolean _tmp45_;
+		gchar* _tmp46_;
+		gchar* _tmp47_;
+		gchar* _tmp48_;
 #line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = manifest;
 #line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -6604,347 +6482,329 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 #line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = _tmp7_;
 #line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = ngettext ("1 duplicate photo was not imported:\n", "%d duplicate photos were not imported:\n", (gulong) _tmp8_);
+		_tmp9_ = manifest;
 #line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = manifest;
+		_tmp10_ = _tmp9_->already_imported;
 #line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp11_ = _tmp10_->already_imported;
+		_tmp11_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp13_ = _tmp12_;
+		_tmp12_ = _tmp11_;
 #line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp14_ = g_strdup_printf (_tmp9_, _tmp13_);
+		_tmp13_ = g_strdup_printf (ngettext ("1 duplicate photo was not imported:\n", "%d duplicate photos were not imported:\n", (gulong) _tmp8_), _tmp12_);
 #line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		photos_message = _tmp14_;
-#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp15_ = manifest;
+		photos_message = _tmp13_;
 #line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp16_ = _tmp15_->already_imported;
+		_tmp14_ = manifest;
 #line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp15_ = _tmp14_->already_imported;
 #line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp18_ = _tmp17_;
+		_tmp16_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp19_ = ngettext ("1 duplicate video was not imported:\n", "%d duplicate videos were not imported:\n", (gulong) _tmp18_);
+		_tmp17_ = _tmp16_;
 #line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp20_ = manifest;
+		_tmp18_ = manifest;
 #line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp21_ = _tmp20_->already_imported;
+		_tmp19_ = _tmp18_->already_imported;
 #line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp22_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp20_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp23_ = _tmp22_;
+		_tmp21_ = _tmp20_;
 #line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp24_ = g_strdup_printf (_tmp19_, _tmp23_);
+		_tmp22_ = g_strdup_printf (ngettext ("1 duplicate video was not imported:\n", "%d duplicate videos were not imported:\n", (gulong) _tmp17_), _tmp21_);
 #line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		videos_message = _tmp24_;
+		videos_message = _tmp22_;
 #line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp25_ = manifest;
+		_tmp23_ = manifest;
 #line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp26_ = _tmp25_->already_imported;
+		_tmp24_ = _tmp23_->already_imported;
 #line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp25_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp28_ = _tmp27_;
-#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp29_ = ngettext ("1 duplicate photo/video was not imported:\n", "%d duplicate photos/videos were not imported:\n", (gulong) _tmp28_);
+		_tmp26_ = _tmp25_;
 #line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp30_ = manifest;
+		_tmp27_ = manifest;
 #line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp31_ = _tmp30_->already_imported;
+		_tmp28_ = _tmp27_->already_imported;
 #line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp32_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp29_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp33_ = _tmp32_;
+		_tmp30_ = _tmp29_;
 #line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp34_ = g_strdup_printf (_tmp29_, _tmp33_);
+		_tmp31_ = g_strdup_printf (ngettext ("1 duplicate photo/video was not imported:\n", "%d duplicate photos/videos were not imported:\n", (gulong) _tmp26_), _tmp30_);
 #line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		both_message = _tmp34_;
+		both_message = _tmp31_;
 #line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp35_ = message;
+		_tmp32_ = message;
 #line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp36_ = manifest;
+		_tmp33_ = manifest;
 #line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp37_ = _tmp36_->already_imported;
+		_tmp34_ = _tmp33_->already_imported;
 #line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp38_ = photos_message;
+		_tmp35_ = photos_message;
 #line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp39_ = videos_message;
+		_tmp36_ = videos_message;
 #line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp40_ = both_message;
+		_tmp37_ = both_message;
 #line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp41_ = both_message;
+		_tmp38_ = both_message;
 #line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp42_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), _tmp38_, _tmp39_, _tmp40_, _tmp41_);
+		_tmp39_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection), _tmp35_, _tmp36_, _tmp37_, _tmp38_);
 #line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp43_ = _tmp42_;
+		_tmp40_ = _tmp39_;
 #line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp44_ = g_strconcat (_tmp35_, _tmp43_, NULL);
+		_tmp41_ = g_strconcat (_tmp32_, _tmp40_, NULL);
 #line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp44_;
+		message = _tmp41_;
 #line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp43_);
+		_g_free0 (_tmp40_);
 #line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp45_ = message;
+		_tmp42_ = message;
 #line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp46_ = manifest;
+		_tmp43_ = manifest;
 #line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp47_ = _tmp46_->already_imported;
+		_tmp44_ = _tmp43_->already_imported;
 #line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp48_ = show_dest_id;
+		_tmp45_ = show_dest_id;
 #line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp49_ = import_ui_generate_import_failure_list (_tmp47_, _tmp48_);
+		_tmp46_ = import_ui_generate_import_failure_list (_tmp44_, _tmp45_);
 #line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp50_ = _tmp49_;
+		_tmp47_ = _tmp46_;
 #line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp51_ = g_strconcat (_tmp45_, _tmp50_, NULL);
+		_tmp48_ = g_strconcat (_tmp42_, _tmp47_, NULL);
 #line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp51_;
+		message = _tmp48_;
 #line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp50_);
+		_g_free0 (_tmp47_);
 #line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (both_message);
 #line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (videos_message);
 #line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 6710 "Dialogs.c"
+#line 6582 "Dialogs.c"
 	}
 #line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp52_ = manifest;
+	_tmp49_ = manifest;
 #line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp53_ = _tmp52_->failed;
+	_tmp50_ = _tmp49_->failed;
 #line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp54_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp51_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp55_ = _tmp54_;
+	_tmp52_ = _tmp51_;
 #line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp55_ > 0) {
-#line 6722 "Dialogs.c"
-		const gchar* _tmp56_ = NULL;
-		gint _tmp57_ = 0;
-		gint _tmp58_ = 0;
+	if (_tmp52_ > 0) {
+#line 6594 "Dialogs.c"
+		const gchar* _tmp53_;
+		gint _tmp54_;
+		gint _tmp55_;
 		gchar* photos_message = NULL;
-		ImportManifest* _tmp61_ = NULL;
-		GeeList* _tmp62_ = NULL;
-		gint _tmp63_ = 0;
-		gint _tmp64_ = 0;
-		const gchar* _tmp65_ = NULL;
-		ImportManifest* _tmp66_ = NULL;
-		GeeList* _tmp67_ = NULL;
-		gint _tmp68_ = 0;
-		gint _tmp69_ = 0;
-		gchar* _tmp70_ = NULL;
+		ImportManifest* _tmp58_;
+		GeeList* _tmp59_;
+		gint _tmp60_;
+		gint _tmp61_;
+		ImportManifest* _tmp62_;
+		GeeList* _tmp63_;
+		gint _tmp64_;
+		gint _tmp65_;
+		gchar* _tmp66_;
 		gchar* videos_message = NULL;
-		ImportManifest* _tmp71_ = NULL;
-		GeeList* _tmp72_ = NULL;
-		gint _tmp73_ = 0;
-		gint _tmp74_ = 0;
-		const gchar* _tmp75_ = NULL;
-		ImportManifest* _tmp76_ = NULL;
-		GeeList* _tmp77_ = NULL;
-		gint _tmp78_ = 0;
-		gint _tmp79_ = 0;
-		gchar* _tmp80_ = NULL;
+		ImportManifest* _tmp67_;
+		GeeList* _tmp68_;
+		gint _tmp69_;
+		gint _tmp70_;
+		ImportManifest* _tmp71_;
+		GeeList* _tmp72_;
+		gint _tmp73_;
+		gint _tmp74_;
+		gchar* _tmp75_;
 		gchar* both_message = NULL;
-		ImportManifest* _tmp81_ = NULL;
-		GeeList* _tmp82_ = NULL;
-		gint _tmp83_ = 0;
-		gint _tmp84_ = 0;
-		const gchar* _tmp85_ = NULL;
-		ImportManifest* _tmp86_ = NULL;
-		GeeList* _tmp87_ = NULL;
-		gint _tmp88_ = 0;
-		gint _tmp89_ = 0;
-		gchar* _tmp90_ = NULL;
+		ImportManifest* _tmp76_;
+		GeeList* _tmp77_;
+		gint _tmp78_;
+		gint _tmp79_;
+		ImportManifest* _tmp80_;
+		GeeList* _tmp81_;
+		gint _tmp82_;
+		gint _tmp83_;
+		gchar* _tmp84_;
 		gchar* neither_message = NULL;
-		ImportManifest* _tmp91_ = NULL;
-		GeeList* _tmp92_ = NULL;
-		gint _tmp93_ = 0;
-		gint _tmp94_ = 0;
-		const gchar* _tmp95_ = NULL;
-		ImportManifest* _tmp96_ = NULL;
-		GeeList* _tmp97_ = NULL;
-		gint _tmp98_ = 0;
-		gint _tmp99_ = 0;
-		gchar* _tmp100_ = NULL;
-		const gchar* _tmp101_ = NULL;
-		ImportManifest* _tmp102_ = NULL;
-		GeeList* _tmp103_ = NULL;
-		const gchar* _tmp104_ = NULL;
-		const gchar* _tmp105_ = NULL;
-		const gchar* _tmp106_ = NULL;
-		const gchar* _tmp107_ = NULL;
-		gchar* _tmp108_ = NULL;
-		gchar* _tmp109_ = NULL;
-		gchar* _tmp110_ = NULL;
-		const gchar* _tmp111_ = NULL;
-		ImportManifest* _tmp112_ = NULL;
-		GeeList* _tmp113_ = NULL;
-		gboolean _tmp114_ = FALSE;
-		gchar* _tmp115_ = NULL;
-		gchar* _tmp116_ = NULL;
-		gchar* _tmp117_ = NULL;
+		ImportManifest* _tmp85_;
+		GeeList* _tmp86_;
+		gint _tmp87_;
+		gint _tmp88_;
+		ImportManifest* _tmp89_;
+		GeeList* _tmp90_;
+		gint _tmp91_;
+		gint _tmp92_;
+		gchar* _tmp93_;
+		const gchar* _tmp94_;
+		ImportManifest* _tmp95_;
+		GeeList* _tmp96_;
+		const gchar* _tmp97_;
+		const gchar* _tmp98_;
+		const gchar* _tmp99_;
+		const gchar* _tmp100_;
+		gchar* _tmp101_;
+		gchar* _tmp102_;
+		gchar* _tmp103_;
+		const gchar* _tmp104_;
+		ImportManifest* _tmp105_;
+		GeeList* _tmp106_;
+		gboolean _tmp107_;
+		gchar* _tmp108_;
+		gchar* _tmp109_;
+		gchar* _tmp110_;
 #line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp56_ = message;
+		_tmp53_ = message;
 #line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp57_ = strlen (_tmp56_);
+		_tmp54_ = strlen (_tmp53_);
 #line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp58_ = _tmp57_;
+		_tmp55_ = _tmp54_;
 #line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp58_ > 0) {
-#line 6795 "Dialogs.c"
-			const gchar* _tmp59_ = NULL;
-			gchar* _tmp60_ = NULL;
+		if (_tmp55_ > 0) {
+#line 6663 "Dialogs.c"
+			const gchar* _tmp56_;
+			gchar* _tmp57_;
 #line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp59_ = message;
+			_tmp56_ = message;
 #line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp60_ = g_strconcat (_tmp59_, "\n", NULL);
+			_tmp57_ = g_strconcat (_tmp56_, "\n", NULL);
 #line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
 #line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			message = _tmp60_;
-#line 6806 "Dialogs.c"
+			message = _tmp57_;
+#line 6674 "Dialogs.c"
 		}
 #line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp61_ = manifest;
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp62_ = _tmp61_->failed;
+		_tmp58_ = manifest;
 #line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp63_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp59_ = _tmp58_->failed;
 #line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp64_ = _tmp63_;
+		_tmp60_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp65_ = ngettext ("1 photo failed to import due to a file or hardware error:\n", "%d photos failed to import due to a file or hardware error:\n", (gulong) _tmp64_);
+		_tmp61_ = _tmp60_;
 #line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp66_ = manifest;
+		_tmp62_ = manifest;
 #line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp67_ = _tmp66_->failed;
+		_tmp63_ = _tmp62_->failed;
 #line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp68_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp64_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp69_ = _tmp68_;
+		_tmp65_ = _tmp64_;
 #line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp70_ = g_strdup_printf (_tmp65_, _tmp69_);
+		_tmp66_ = g_strdup_printf (ngettext ("1 photo failed to import due to a file or hardware error:\n", "%d photos failed to import due to a file or hardware error:\n", (gulong) _tmp61_), _tmp65_);
 #line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		photos_message = _tmp70_;
+		photos_message = _tmp66_;
 #line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp71_ = manifest;
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp72_ = _tmp71_->failed;
+		_tmp67_ = manifest;
 #line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp73_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp68_ = _tmp67_->failed;
 #line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp74_ = _tmp73_;
+		_tmp69_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp75_ = ngettext ("1 video failed to import due to a file or hardware error:\n", "%d videos failed to import due to a file or hardware error:\n", (gulong) _tmp74_);
+		_tmp70_ = _tmp69_;
 #line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp76_ = manifest;
+		_tmp71_ = manifest;
 #line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp77_ = _tmp76_->failed;
+		_tmp72_ = _tmp71_->failed;
 #line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp78_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp73_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp79_ = _tmp78_;
+		_tmp74_ = _tmp73_;
 #line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp80_ = g_strdup_printf (_tmp75_, _tmp79_);
+		_tmp75_ = g_strdup_printf (ngettext ("1 video failed to import due to a file or hardware error:\n", "%d videos failed to import due to a file or hardware error:\n", (gulong) _tmp70_), _tmp74_);
 #line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		videos_message = _tmp80_;
+		videos_message = _tmp75_;
 #line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp81_ = manifest;
+		_tmp76_ = manifest;
 #line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp82_ = _tmp81_->failed;
+		_tmp77_ = _tmp76_->failed;
 #line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp83_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp78_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp84_ = _tmp83_;
+		_tmp79_ = _tmp78_;
 #line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp85_ = ngettext ("1 photo/video failed to import due to a file or hardware error:\n", "%d photos/videos failed to import due to a file or hardware error:\n", (gulong) _tmp84_);
+		_tmp80_ = manifest;
 #line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp86_ = manifest;
+		_tmp81_ = _tmp80_->failed;
 #line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp87_ = _tmp86_->failed;
+		_tmp82_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp88_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp83_ = _tmp82_;
 #line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp89_ = _tmp88_;
+		_tmp84_ = g_strdup_printf (ngettext ("1 photo/video failed to import due to a file or hardware error:\n", "%d photos/videos failed to import due to a file or hardware error:\n", (gulong) _tmp79_), _tmp83_);
 #line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp90_ = g_strdup_printf (_tmp85_, _tmp89_);
-#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		both_message = _tmp90_;
-#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp91_ = manifest;
+		both_message = _tmp84_;
 #line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp92_ = _tmp91_->failed;
+		_tmp85_ = manifest;
 #line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp93_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp86_ = _tmp85_->failed;
 #line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp94_ = _tmp93_;
+		_tmp87_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp95_ = ngettext ("1 file failed to import due to a file or hardware error:\n", "%d files failed to import due to a file or hardware error:\n", (gulong) _tmp94_);
+		_tmp88_ = _tmp87_;
 #line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp96_ = manifest;
+		_tmp89_ = manifest;
 #line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp97_ = _tmp96_->failed;
+		_tmp90_ = _tmp89_->failed;
 #line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp98_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp91_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp99_ = _tmp98_;
+		_tmp92_ = _tmp91_;
 #line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp100_ = g_strdup_printf (_tmp95_, _tmp99_);
+		_tmp93_ = g_strdup_printf (ngettext ("1 file failed to import due to a file or hardware error:\n", "%d files failed to import due to a file or hardware error:\n", (gulong) _tmp88_), _tmp92_);
 #line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		neither_message = _tmp100_;
+		neither_message = _tmp93_;
 #line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp101_ = message;
+		_tmp94_ = message;
 #line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp102_ = manifest;
+		_tmp95_ = manifest;
 #line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp103_ = _tmp102_->failed;
+		_tmp96_ = _tmp95_->failed;
 #line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp104_ = photos_message;
+		_tmp97_ = photos_message;
 #line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp105_ = videos_message;
+		_tmp98_ = videos_message;
 #line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp106_ = both_message;
+		_tmp99_ = both_message;
 #line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp107_ = neither_message;
+		_tmp100_ = neither_message;
 #line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp108_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, GEE_TYPE_COLLECTION, GeeCollection), _tmp104_, _tmp105_, _tmp106_, _tmp107_);
+		_tmp101_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, GEE_TYPE_COLLECTION, GeeCollection), _tmp97_, _tmp98_, _tmp99_, _tmp100_);
 #line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp109_ = _tmp108_;
+		_tmp102_ = _tmp101_;
 #line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp110_ = g_strconcat (_tmp101_, _tmp109_, NULL);
+		_tmp103_ = g_strconcat (_tmp94_, _tmp102_, NULL);
 #line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp110_;
+		message = _tmp103_;
 #line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp109_);
+		_g_free0 (_tmp102_);
 #line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp111_ = message;
+		_tmp104_ = message;
 #line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp112_ = manifest;
+		_tmp105_ = manifest;
 #line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp113_ = _tmp112_->failed;
+		_tmp106_ = _tmp105_->failed;
 #line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp114_ = show_dest_id;
+		_tmp107_ = show_dest_id;
 #line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp115_ = import_ui_generate_import_failure_list (_tmp113_, _tmp114_);
+		_tmp108_ = import_ui_generate_import_failure_list (_tmp106_, _tmp107_);
 #line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp116_ = _tmp115_;
+		_tmp109_ = _tmp108_;
 #line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp117_ = g_strconcat (_tmp111_, _tmp116_, NULL);
+		_tmp110_ = g_strconcat (_tmp104_, _tmp109_, NULL);
 #line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp117_;
+		message = _tmp110_;
 #line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp116_);
+		_g_free0 (_tmp109_);
 #line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (neither_message);
 #line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -6953,246 +6813,234 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 6950 "Dialogs.c"
+#line 6810 "Dialogs.c"
 	}
 #line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp118_ = manifest;
+	_tmp111_ = manifest;
 #line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp119_ = _tmp118_->write_failed;
+	_tmp112_ = _tmp111_->write_failed;
 #line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp120_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp113_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp121_ = _tmp120_;
+	_tmp114_ = _tmp113_;
 #line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp121_ > 0) {
-#line 6962 "Dialogs.c"
-		const gchar* _tmp122_ = NULL;
-		gint _tmp123_ = 0;
-		gint _tmp124_ = 0;
+	if (_tmp114_ > 0) {
+#line 6822 "Dialogs.c"
+		const gchar* _tmp115_;
+		gint _tmp116_;
+		gint _tmp117_;
 		gchar* photos_message = NULL;
-		ImportManifest* _tmp127_ = NULL;
-		GeeList* _tmp128_ = NULL;
-		gint _tmp129_ = 0;
-		gint _tmp130_ = 0;
-		const gchar* _tmp131_ = NULL;
-		ImportManifest* _tmp132_ = NULL;
-		GeeList* _tmp133_ = NULL;
-		gint _tmp134_ = 0;
-		gint _tmp135_ = 0;
-		gchar* _tmp136_ = NULL;
+		ImportManifest* _tmp120_;
+		GeeList* _tmp121_;
+		gint _tmp122_;
+		gint _tmp123_;
+		ImportManifest* _tmp124_;
+		GeeList* _tmp125_;
+		gint _tmp126_;
+		gint _tmp127_;
+		gchar* _tmp128_;
 		gchar* videos_message = NULL;
-		ImportManifest* _tmp137_ = NULL;
-		GeeList* _tmp138_ = NULL;
-		gint _tmp139_ = 0;
-		gint _tmp140_ = 0;
-		const gchar* _tmp141_ = NULL;
-		ImportManifest* _tmp142_ = NULL;
-		GeeList* _tmp143_ = NULL;
-		gint _tmp144_ = 0;
-		gint _tmp145_ = 0;
-		gchar* _tmp146_ = NULL;
+		ImportManifest* _tmp129_;
+		GeeList* _tmp130_;
+		gint _tmp131_;
+		gint _tmp132_;
+		ImportManifest* _tmp133_;
+		GeeList* _tmp134_;
+		gint _tmp135_;
+		gint _tmp136_;
+		gchar* _tmp137_;
 		gchar* both_message = NULL;
-		ImportManifest* _tmp147_ = NULL;
-		GeeList* _tmp148_ = NULL;
-		gint _tmp149_ = 0;
-		gint _tmp150_ = 0;
-		const gchar* _tmp151_ = NULL;
-		ImportManifest* _tmp152_ = NULL;
-		GeeList* _tmp153_ = NULL;
-		gint _tmp154_ = 0;
-		gint _tmp155_ = 0;
-		gchar* _tmp156_ = NULL;
+		ImportManifest* _tmp138_;
+		GeeList* _tmp139_;
+		gint _tmp140_;
+		gint _tmp141_;
+		ImportManifest* _tmp142_;
+		GeeList* _tmp143_;
+		gint _tmp144_;
+		gint _tmp145_;
+		gchar* _tmp146_;
 		gchar* neither_message = NULL;
-		ImportManifest* _tmp157_ = NULL;
-		GeeList* _tmp158_ = NULL;
-		gint _tmp159_ = 0;
-		gint _tmp160_ = 0;
-		const gchar* _tmp161_ = NULL;
-		ImportManifest* _tmp162_ = NULL;
-		GeeList* _tmp163_ = NULL;
-		gint _tmp164_ = 0;
-		gint _tmp165_ = 0;
-		gchar* _tmp166_ = NULL;
-		const gchar* _tmp167_ = NULL;
-		ImportManifest* _tmp168_ = NULL;
-		GeeList* _tmp169_ = NULL;
-		const gchar* _tmp170_ = NULL;
-		const gchar* _tmp171_ = NULL;
-		const gchar* _tmp172_ = NULL;
-		const gchar* _tmp173_ = NULL;
-		gchar* _tmp174_ = NULL;
-		gchar* _tmp175_ = NULL;
-		gchar* _tmp176_ = NULL;
-		const gchar* _tmp177_ = NULL;
-		ImportManifest* _tmp178_ = NULL;
-		GeeList* _tmp179_ = NULL;
-		gboolean _tmp180_ = FALSE;
-		gchar* _tmp181_ = NULL;
-		gchar* _tmp182_ = NULL;
-		gchar* _tmp183_ = NULL;
+		ImportManifest* _tmp147_;
+		GeeList* _tmp148_;
+		gint _tmp149_;
+		gint _tmp150_;
+		ImportManifest* _tmp151_;
+		GeeList* _tmp152_;
+		gint _tmp153_;
+		gint _tmp154_;
+		gchar* _tmp155_;
+		const gchar* _tmp156_;
+		ImportManifest* _tmp157_;
+		GeeList* _tmp158_;
+		const gchar* _tmp159_;
+		const gchar* _tmp160_;
+		const gchar* _tmp161_;
+		const gchar* _tmp162_;
+		gchar* _tmp163_;
+		gchar* _tmp164_;
+		gchar* _tmp165_;
+		const gchar* _tmp166_;
+		ImportManifest* _tmp167_;
+		GeeList* _tmp168_;
+		gboolean _tmp169_;
+		gchar* _tmp170_;
+		gchar* _tmp171_;
+		gchar* _tmp172_;
 #line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp122_ = message;
+		_tmp115_ = message;
 #line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp123_ = strlen (_tmp122_);
+		_tmp116_ = strlen (_tmp115_);
 #line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp124_ = _tmp123_;
+		_tmp117_ = _tmp116_;
 #line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp124_ > 0) {
-#line 7035 "Dialogs.c"
-			const gchar* _tmp125_ = NULL;
-			gchar* _tmp126_ = NULL;
+		if (_tmp117_ > 0) {
+#line 6891 "Dialogs.c"
+			const gchar* _tmp118_;
+			gchar* _tmp119_;
 #line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp125_ = message;
+			_tmp118_ = message;
 #line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp126_ = g_strconcat (_tmp125_, "\n", NULL);
+			_tmp119_ = g_strconcat (_tmp118_, "\n", NULL);
 #line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
 #line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			message = _tmp126_;
-#line 7046 "Dialogs.c"
+			message = _tmp119_;
+#line 6902 "Dialogs.c"
 		}
 #line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp127_ = manifest;
+		_tmp120_ = manifest;
 #line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp128_ = _tmp127_->write_failed;
+		_tmp121_ = _tmp120_->write_failed;
 #line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp129_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp128_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp122_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp130_ = _tmp129_;
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp131_ = ngettext ("1 photo failed to import because the photo library folder was not writ" \
-"able:\n", "%d photos failed to import because the photo library folder was not wr" \
-"itable:\n", (gulong) _tmp130_);
+		_tmp123_ = _tmp122_;
 #line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp132_ = manifest;
+		_tmp124_ = manifest;
 #line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp133_ = _tmp132_->write_failed;
+		_tmp125_ = _tmp124_->write_failed;
 #line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp134_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp126_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp135_ = _tmp134_;
+		_tmp127_ = _tmp126_;
 #line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp136_ = g_strdup_printf (_tmp131_, _tmp135_);
+		_tmp128_ = g_strdup_printf (ngettext ("1 photo failed to import because the photo library folder was not writ" \
+"able:\n", "%d photos failed to import because the photo library folder was not wr" \
+"itable:\n", (gulong) _tmp123_), _tmp127_);
 #line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		photos_message = _tmp136_;
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp137_ = manifest;
+		photos_message = _tmp128_;
 #line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp138_ = _tmp137_->write_failed;
+		_tmp129_ = manifest;
 #line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp139_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp130_ = _tmp129_->write_failed;
 #line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp140_ = _tmp139_;
+		_tmp131_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp141_ = ngettext ("1 video failed to import because the photo library folder was not writ" \
-"able:\n", "%d videos failed to import because the photo library folder was not wr" \
-"itable:\n", (gulong) _tmp140_);
+		_tmp132_ = _tmp131_;
 #line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp142_ = manifest;
+		_tmp133_ = manifest;
 #line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp143_ = _tmp142_->write_failed;
+		_tmp134_ = _tmp133_->write_failed;
 #line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp144_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp135_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp145_ = _tmp144_;
+		_tmp136_ = _tmp135_;
 #line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp146_ = g_strdup_printf (_tmp141_, _tmp145_);
+		_tmp137_ = g_strdup_printf (ngettext ("1 video failed to import because the photo library folder was not writ" \
+"able:\n", "%d videos failed to import because the photo library folder was not wr" \
+"itable:\n", (gulong) _tmp132_), _tmp136_);
 #line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		videos_message = _tmp146_;
+		videos_message = _tmp137_;
 #line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp147_ = manifest;
+		_tmp138_ = manifest;
 #line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp148_ = _tmp147_->write_failed;
+		_tmp139_ = _tmp138_->write_failed;
 #line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp149_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp148_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp150_ = _tmp149_;
+		_tmp140_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp151_ = ngettext ("1 photo/video failed to import because the photo library folder was no" \
-"t writable:\n", "%d photos/videos failed to import because the photo library folder was" \
-" not writable:\n", (gulong) _tmp150_);
+		_tmp141_ = _tmp140_;
 #line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp152_ = manifest;
+		_tmp142_ = manifest;
 #line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp153_ = _tmp152_->write_failed;
+		_tmp143_ = _tmp142_->write_failed;
 #line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp154_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp153_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp144_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp155_ = _tmp154_;
+		_tmp145_ = _tmp144_;
 #line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp156_ = g_strdup_printf (_tmp151_, _tmp155_);
+		_tmp146_ = g_strdup_printf (ngettext ("1 photo/video failed to import because the photo library folder was no" \
+"t writable:\n", "%d photos/videos failed to import because the photo library folder was" \
+" not writable:\n", (gulong) _tmp141_), _tmp145_);
 #line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		both_message = _tmp156_;
-#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp157_ = manifest;
+		both_message = _tmp146_;
 #line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp158_ = _tmp157_->write_failed;
+		_tmp147_ = manifest;
 #line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp159_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp158_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp148_ = _tmp147_->write_failed;
 #line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp160_ = _tmp159_;
+		_tmp149_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp148_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp161_ = ngettext ("1 file failed to import because the photo library folder was not writa" \
-"ble:\n", "%d files failed to import because the photo library folder was not wri" \
-"table:\n", (gulong) _tmp160_);
+		_tmp150_ = _tmp149_;
 #line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp162_ = manifest;
+		_tmp151_ = manifest;
 #line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp163_ = _tmp162_->write_failed;
+		_tmp152_ = _tmp151_->write_failed;
 #line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp164_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp163_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp153_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp152_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp165_ = _tmp164_;
+		_tmp154_ = _tmp153_;
 #line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp166_ = g_strdup_printf (_tmp161_, _tmp165_);
+		_tmp155_ = g_strdup_printf (ngettext ("1 file failed to import because the photo library folder was not writa" \
+"ble:\n", "%d files failed to import because the photo library folder was not wri" \
+"table:\n", (gulong) _tmp150_), _tmp154_);
 #line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		neither_message = _tmp166_;
+		neither_message = _tmp155_;
 #line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp167_ = message;
+		_tmp156_ = message;
 #line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp168_ = manifest;
+		_tmp157_ = manifest;
 #line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp169_ = _tmp168_->write_failed;
+		_tmp158_ = _tmp157_->write_failed;
 #line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp170_ = photos_message;
+		_tmp159_ = photos_message;
 #line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp171_ = videos_message;
+		_tmp160_ = videos_message;
 #line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp172_ = both_message;
+		_tmp161_ = both_message;
 #line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp173_ = neither_message;
+		_tmp162_ = neither_message;
 #line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp174_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp169_, GEE_TYPE_COLLECTION, GeeCollection), _tmp170_, _tmp171_, _tmp172_, _tmp173_);
+		_tmp163_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp158_, GEE_TYPE_COLLECTION, GeeCollection), _tmp159_, _tmp160_, _tmp161_, _tmp162_);
 #line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp175_ = _tmp174_;
+		_tmp164_ = _tmp163_;
 #line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp176_ = g_strconcat (_tmp167_, _tmp175_, NULL);
+		_tmp165_ = g_strconcat (_tmp156_, _tmp164_, NULL);
 #line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp176_;
+		message = _tmp165_;
 #line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp175_);
+		_g_free0 (_tmp164_);
 #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp177_ = message;
+		_tmp166_ = message;
 #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp178_ = manifest;
+		_tmp167_ = manifest;
 #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp179_ = _tmp178_->write_failed;
+		_tmp168_ = _tmp167_->write_failed;
 #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp180_ = show_dest_id;
+		_tmp169_ = show_dest_id;
 #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp181_ = import_ui_generate_import_failure_list (_tmp179_, _tmp180_);
+		_tmp170_ = import_ui_generate_import_failure_list (_tmp168_, _tmp169_);
 #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp182_ = _tmp181_;
+		_tmp171_ = _tmp170_;
 #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp183_ = g_strconcat (_tmp177_, _tmp182_, NULL);
+		_tmp172_ = g_strconcat (_tmp166_, _tmp171_, NULL);
 #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp183_;
+		message = _tmp172_;
 #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp182_);
+		_g_free0 (_tmp171_);
 #line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (neither_message);
 #line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7201,238 +7049,226 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7190 "Dialogs.c"
+#line 7038 "Dialogs.c"
 	}
 #line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp184_ = manifest;
+	_tmp173_ = manifest;
 #line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp185_ = _tmp184_->camera_failed;
+	_tmp174_ = _tmp173_->camera_failed;
 #line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp186_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp185_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp175_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp174_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp187_ = _tmp186_;
+	_tmp176_ = _tmp175_;
 #line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp187_ > 0) {
-#line 7202 "Dialogs.c"
-		const gchar* _tmp188_ = NULL;
-		gint _tmp189_ = 0;
-		gint _tmp190_ = 0;
+	if (_tmp176_ > 0) {
+#line 7050 "Dialogs.c"
+		const gchar* _tmp177_;
+		gint _tmp178_;
+		gint _tmp179_;
 		gchar* photos_message = NULL;
-		ImportManifest* _tmp193_ = NULL;
-		GeeList* _tmp194_ = NULL;
-		gint _tmp195_ = 0;
-		gint _tmp196_ = 0;
-		const gchar* _tmp197_ = NULL;
-		ImportManifest* _tmp198_ = NULL;
-		GeeList* _tmp199_ = NULL;
-		gint _tmp200_ = 0;
-		gint _tmp201_ = 0;
-		gchar* _tmp202_ = NULL;
+		ImportManifest* _tmp182_;
+		GeeList* _tmp183_;
+		gint _tmp184_;
+		gint _tmp185_;
+		ImportManifest* _tmp186_;
+		GeeList* _tmp187_;
+		gint _tmp188_;
+		gint _tmp189_;
+		gchar* _tmp190_;
 		gchar* videos_message = NULL;
-		ImportManifest* _tmp203_ = NULL;
-		GeeList* _tmp204_ = NULL;
-		gint _tmp205_ = 0;
-		gint _tmp206_ = 0;
-		const gchar* _tmp207_ = NULL;
-		ImportManifest* _tmp208_ = NULL;
-		GeeList* _tmp209_ = NULL;
-		gint _tmp210_ = 0;
-		gint _tmp211_ = 0;
-		gchar* _tmp212_ = NULL;
+		ImportManifest* _tmp191_;
+		GeeList* _tmp192_;
+		gint _tmp193_;
+		gint _tmp194_;
+		ImportManifest* _tmp195_;
+		GeeList* _tmp196_;
+		gint _tmp197_;
+		gint _tmp198_;
+		gchar* _tmp199_;
 		gchar* both_message = NULL;
-		ImportManifest* _tmp213_ = NULL;
-		GeeList* _tmp214_ = NULL;
-		gint _tmp215_ = 0;
-		gint _tmp216_ = 0;
-		const gchar* _tmp217_ = NULL;
-		ImportManifest* _tmp218_ = NULL;
-		GeeList* _tmp219_ = NULL;
-		gint _tmp220_ = 0;
-		gint _tmp221_ = 0;
-		gchar* _tmp222_ = NULL;
+		ImportManifest* _tmp200_;
+		GeeList* _tmp201_;
+		gint _tmp202_;
+		gint _tmp203_;
+		ImportManifest* _tmp204_;
+		GeeList* _tmp205_;
+		gint _tmp206_;
+		gint _tmp207_;
+		gchar* _tmp208_;
 		gchar* neither_message = NULL;
-		ImportManifest* _tmp223_ = NULL;
-		GeeList* _tmp224_ = NULL;
-		gint _tmp225_ = 0;
-		gint _tmp226_ = 0;
-		const gchar* _tmp227_ = NULL;
-		ImportManifest* _tmp228_ = NULL;
-		GeeList* _tmp229_ = NULL;
-		gint _tmp230_ = 0;
-		gint _tmp231_ = 0;
-		gchar* _tmp232_ = NULL;
-		const gchar* _tmp233_ = NULL;
-		ImportManifest* _tmp234_ = NULL;
-		GeeList* _tmp235_ = NULL;
-		const gchar* _tmp236_ = NULL;
-		const gchar* _tmp237_ = NULL;
-		const gchar* _tmp238_ = NULL;
-		const gchar* _tmp239_ = NULL;
-		gchar* _tmp240_ = NULL;
-		gchar* _tmp241_ = NULL;
-		gchar* _tmp242_ = NULL;
-		const gchar* _tmp243_ = NULL;
-		ImportManifest* _tmp244_ = NULL;
-		GeeList* _tmp245_ = NULL;
-		gboolean _tmp246_ = FALSE;
-		gchar* _tmp247_ = NULL;
-		gchar* _tmp248_ = NULL;
-		gchar* _tmp249_ = NULL;
+		ImportManifest* _tmp209_;
+		GeeList* _tmp210_;
+		gint _tmp211_;
+		gint _tmp212_;
+		ImportManifest* _tmp213_;
+		GeeList* _tmp214_;
+		gint _tmp215_;
+		gint _tmp216_;
+		gchar* _tmp217_;
+		const gchar* _tmp218_;
+		ImportManifest* _tmp219_;
+		GeeList* _tmp220_;
+		const gchar* _tmp221_;
+		const gchar* _tmp222_;
+		const gchar* _tmp223_;
+		const gchar* _tmp224_;
+		gchar* _tmp225_;
+		gchar* _tmp226_;
+		gchar* _tmp227_;
+		const gchar* _tmp228_;
+		ImportManifest* _tmp229_;
+		GeeList* _tmp230_;
+		gboolean _tmp231_;
+		gchar* _tmp232_;
+		gchar* _tmp233_;
+		gchar* _tmp234_;
 #line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp188_ = message;
+		_tmp177_ = message;
 #line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp189_ = strlen (_tmp188_);
+		_tmp178_ = strlen (_tmp177_);
 #line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp190_ = _tmp189_;
+		_tmp179_ = _tmp178_;
 #line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp190_ > 0) {
-#line 7275 "Dialogs.c"
-			const gchar* _tmp191_ = NULL;
-			gchar* _tmp192_ = NULL;
+		if (_tmp179_ > 0) {
+#line 7119 "Dialogs.c"
+			const gchar* _tmp180_;
+			gchar* _tmp181_;
 #line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp191_ = message;
+			_tmp180_ = message;
 #line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp192_ = g_strconcat (_tmp191_, "\n", NULL);
+			_tmp181_ = g_strconcat (_tmp180_, "\n", NULL);
 #line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
 #line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			message = _tmp192_;
-#line 7286 "Dialogs.c"
+			message = _tmp181_;
+#line 7130 "Dialogs.c"
 		}
 #line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp193_ = manifest;
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp194_ = _tmp193_->camera_failed;
+		_tmp182_ = manifest;
 #line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp195_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp194_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp183_ = _tmp182_->camera_failed;
 #line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp196_ = _tmp195_;
+		_tmp184_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp183_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp197_ = ngettext ("1 photo failed to import due to a camera error:\n", "%d photos failed to import due to a camera error:\n", (gulong) _tmp196_);
+		_tmp185_ = _tmp184_;
 #line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp198_ = manifest;
+		_tmp186_ = manifest;
 #line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp199_ = _tmp198_->camera_failed;
+		_tmp187_ = _tmp186_->camera_failed;
 #line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp200_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp199_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp188_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp187_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp201_ = _tmp200_;
+		_tmp189_ = _tmp188_;
 #line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp202_ = g_strdup_printf (_tmp197_, _tmp201_);
+		_tmp190_ = g_strdup_printf (ngettext ("1 photo failed to import due to a camera error:\n", "%d photos failed to import due to a camera error:\n", (gulong) _tmp185_), _tmp189_);
 #line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		photos_message = _tmp202_;
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp203_ = manifest;
+		photos_message = _tmp190_;
 #line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp204_ = _tmp203_->camera_failed;
+		_tmp191_ = manifest;
 #line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp205_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp204_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp192_ = _tmp191_->camera_failed;
 #line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp206_ = _tmp205_;
+		_tmp193_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp192_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp207_ = ngettext ("1 video failed to import due to a camera error:\n", "%d videos failed to import due to a camera error:\n", (gulong) _tmp206_);
+		_tmp194_ = _tmp193_;
 #line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp208_ = manifest;
+		_tmp195_ = manifest;
 #line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp209_ = _tmp208_->camera_failed;
+		_tmp196_ = _tmp195_->camera_failed;
 #line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp210_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp209_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp197_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp196_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp211_ = _tmp210_;
+		_tmp198_ = _tmp197_;
 #line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp212_ = g_strdup_printf (_tmp207_, _tmp211_);
+		_tmp199_ = g_strdup_printf (ngettext ("1 video failed to import due to a camera error:\n", "%d videos failed to import due to a camera error:\n", (gulong) _tmp194_), _tmp198_);
 #line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		videos_message = _tmp212_;
+		videos_message = _tmp199_;
 #line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp213_ = manifest;
+		_tmp200_ = manifest;
 #line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp214_ = _tmp213_->camera_failed;
+		_tmp201_ = _tmp200_->camera_failed;
 #line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp215_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp214_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp202_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp201_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp216_ = _tmp215_;
+		_tmp203_ = _tmp202_;
 #line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp217_ = ngettext ("1 photo/video failed to import due to a camera error:\n", "%d photos/videos failed to import due to a camera error:\n", (gulong) _tmp216_);
+		_tmp204_ = manifest;
 #line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp218_ = manifest;
+		_tmp205_ = _tmp204_->camera_failed;
 #line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp219_ = _tmp218_->camera_failed;
+		_tmp206_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp205_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp220_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp219_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp207_ = _tmp206_;
 #line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp221_ = _tmp220_;
+		_tmp208_ = g_strdup_printf (ngettext ("1 photo/video failed to import due to a camera error:\n", "%d photos/videos failed to import due to a camera error:\n", (gulong) _tmp203_), _tmp207_);
 #line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp222_ = g_strdup_printf (_tmp217_, _tmp221_);
-#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		both_message = _tmp222_;
-#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp223_ = manifest;
+		both_message = _tmp208_;
 #line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp224_ = _tmp223_->camera_failed;
+		_tmp209_ = manifest;
 #line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp225_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp224_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp210_ = _tmp209_->camera_failed;
 #line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp226_ = _tmp225_;
+		_tmp211_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp210_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp227_ = ngettext ("1 file failed to import due to a camera error:\n", "%d files failed to import due to a camera error:\n", (gulong) _tmp226_);
+		_tmp212_ = _tmp211_;
 #line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp228_ = manifest;
+		_tmp213_ = manifest;
 #line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp229_ = _tmp228_->camera_failed;
+		_tmp214_ = _tmp213_->camera_failed;
 #line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp230_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp229_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp215_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp214_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp231_ = _tmp230_;
+		_tmp216_ = _tmp215_;
 #line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp232_ = g_strdup_printf (_tmp227_, _tmp231_);
+		_tmp217_ = g_strdup_printf (ngettext ("1 file failed to import due to a camera error:\n", "%d files failed to import due to a camera error:\n", (gulong) _tmp212_), _tmp216_);
 #line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		neither_message = _tmp232_;
+		neither_message = _tmp217_;
 #line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp233_ = message;
+		_tmp218_ = message;
 #line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp234_ = manifest;
+		_tmp219_ = manifest;
 #line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp235_ = _tmp234_->camera_failed;
+		_tmp220_ = _tmp219_->camera_failed;
 #line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp236_ = photos_message;
+		_tmp221_ = photos_message;
 #line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp237_ = videos_message;
+		_tmp222_ = videos_message;
 #line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp238_ = both_message;
+		_tmp223_ = both_message;
 #line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp239_ = neither_message;
+		_tmp224_ = neither_message;
 #line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp240_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp235_, GEE_TYPE_COLLECTION, GeeCollection), _tmp236_, _tmp237_, _tmp238_, _tmp239_);
+		_tmp225_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp220_, GEE_TYPE_COLLECTION, GeeCollection), _tmp221_, _tmp222_, _tmp223_, _tmp224_);
 #line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp241_ = _tmp240_;
+		_tmp226_ = _tmp225_;
 #line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp242_ = g_strconcat (_tmp233_, _tmp241_, NULL);
+		_tmp227_ = g_strconcat (_tmp218_, _tmp226_, NULL);
 #line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp242_;
+		message = _tmp227_;
 #line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp241_);
+		_g_free0 (_tmp226_);
 #line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp243_ = message;
+		_tmp228_ = message;
 #line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp244_ = manifest;
+		_tmp229_ = manifest;
 #line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp245_ = _tmp244_->camera_failed;
+		_tmp230_ = _tmp229_->camera_failed;
 #line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp246_ = show_dest_id;
+		_tmp231_ = show_dest_id;
 #line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp247_ = import_ui_generate_import_failure_list (_tmp245_, _tmp246_);
+		_tmp232_ = import_ui_generate_import_failure_list (_tmp230_, _tmp231_);
 #line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp248_ = _tmp247_;
+		_tmp233_ = _tmp232_;
 #line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp249_ = g_strconcat (_tmp243_, _tmp248_, NULL);
+		_tmp234_ = g_strconcat (_tmp228_, _tmp233_, NULL);
 #line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp249_;
+		message = _tmp234_;
 #line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp248_);
+		_g_free0 (_tmp233_);
 #line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (neither_message);
 #line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7441,238 +7277,226 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7430 "Dialogs.c"
+#line 7266 "Dialogs.c"
 	}
 #line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp250_ = manifest;
+	_tmp235_ = manifest;
 #line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp251_ = _tmp250_->corrupt_files;
+	_tmp236_ = _tmp235_->corrupt_files;
 #line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp252_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp251_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp237_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp236_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp253_ = _tmp252_;
+	_tmp238_ = _tmp237_;
 #line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp253_ > 0) {
-#line 7442 "Dialogs.c"
-		const gchar* _tmp254_ = NULL;
-		gint _tmp255_ = 0;
-		gint _tmp256_ = 0;
+	if (_tmp238_ > 0) {
+#line 7278 "Dialogs.c"
+		const gchar* _tmp239_;
+		gint _tmp240_;
+		gint _tmp241_;
 		gchar* photos_message = NULL;
-		ImportManifest* _tmp259_ = NULL;
-		GeeList* _tmp260_ = NULL;
-		gint _tmp261_ = 0;
-		gint _tmp262_ = 0;
-		const gchar* _tmp263_ = NULL;
-		ImportManifest* _tmp264_ = NULL;
-		GeeList* _tmp265_ = NULL;
-		gint _tmp266_ = 0;
-		gint _tmp267_ = 0;
-		gchar* _tmp268_ = NULL;
+		ImportManifest* _tmp244_;
+		GeeList* _tmp245_;
+		gint _tmp246_;
+		gint _tmp247_;
+		ImportManifest* _tmp248_;
+		GeeList* _tmp249_;
+		gint _tmp250_;
+		gint _tmp251_;
+		gchar* _tmp252_;
 		gchar* videos_message = NULL;
-		ImportManifest* _tmp269_ = NULL;
-		GeeList* _tmp270_ = NULL;
-		gint _tmp271_ = 0;
-		gint _tmp272_ = 0;
-		const gchar* _tmp273_ = NULL;
-		ImportManifest* _tmp274_ = NULL;
-		GeeList* _tmp275_ = NULL;
-		gint _tmp276_ = 0;
-		gint _tmp277_ = 0;
-		gchar* _tmp278_ = NULL;
+		ImportManifest* _tmp253_;
+		GeeList* _tmp254_;
+		gint _tmp255_;
+		gint _tmp256_;
+		ImportManifest* _tmp257_;
+		GeeList* _tmp258_;
+		gint _tmp259_;
+		gint _tmp260_;
+		gchar* _tmp261_;
 		gchar* both_message = NULL;
-		ImportManifest* _tmp279_ = NULL;
-		GeeList* _tmp280_ = NULL;
-		gint _tmp281_ = 0;
-		gint _tmp282_ = 0;
-		const gchar* _tmp283_ = NULL;
-		ImportManifest* _tmp284_ = NULL;
-		GeeList* _tmp285_ = NULL;
-		gint _tmp286_ = 0;
-		gint _tmp287_ = 0;
-		gchar* _tmp288_ = NULL;
+		ImportManifest* _tmp262_;
+		GeeList* _tmp263_;
+		gint _tmp264_;
+		gint _tmp265_;
+		ImportManifest* _tmp266_;
+		GeeList* _tmp267_;
+		gint _tmp268_;
+		gint _tmp269_;
+		gchar* _tmp270_;
 		gchar* neither_message = NULL;
-		ImportManifest* _tmp289_ = NULL;
-		GeeList* _tmp290_ = NULL;
-		gint _tmp291_ = 0;
-		gint _tmp292_ = 0;
-		const gchar* _tmp293_ = NULL;
-		ImportManifest* _tmp294_ = NULL;
-		GeeList* _tmp295_ = NULL;
-		gint _tmp296_ = 0;
-		gint _tmp297_ = 0;
-		gchar* _tmp298_ = NULL;
-		const gchar* _tmp299_ = NULL;
-		ImportManifest* _tmp300_ = NULL;
-		GeeList* _tmp301_ = NULL;
-		const gchar* _tmp302_ = NULL;
-		const gchar* _tmp303_ = NULL;
-		const gchar* _tmp304_ = NULL;
-		const gchar* _tmp305_ = NULL;
-		gchar* _tmp306_ = NULL;
-		gchar* _tmp307_ = NULL;
-		gchar* _tmp308_ = NULL;
-		const gchar* _tmp309_ = NULL;
-		ImportManifest* _tmp310_ = NULL;
-		GeeList* _tmp311_ = NULL;
-		gboolean _tmp312_ = FALSE;
-		gchar* _tmp313_ = NULL;
-		gchar* _tmp314_ = NULL;
-		gchar* _tmp315_ = NULL;
+		ImportManifest* _tmp271_;
+		GeeList* _tmp272_;
+		gint _tmp273_;
+		gint _tmp274_;
+		ImportManifest* _tmp275_;
+		GeeList* _tmp276_;
+		gint _tmp277_;
+		gint _tmp278_;
+		gchar* _tmp279_;
+		const gchar* _tmp280_;
+		ImportManifest* _tmp281_;
+		GeeList* _tmp282_;
+		const gchar* _tmp283_;
+		const gchar* _tmp284_;
+		const gchar* _tmp285_;
+		const gchar* _tmp286_;
+		gchar* _tmp287_;
+		gchar* _tmp288_;
+		gchar* _tmp289_;
+		const gchar* _tmp290_;
+		ImportManifest* _tmp291_;
+		GeeList* _tmp292_;
+		gboolean _tmp293_;
+		gchar* _tmp294_;
+		gchar* _tmp295_;
+		gchar* _tmp296_;
 #line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp254_ = message;
+		_tmp239_ = message;
 #line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp255_ = strlen (_tmp254_);
+		_tmp240_ = strlen (_tmp239_);
 #line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp256_ = _tmp255_;
+		_tmp241_ = _tmp240_;
 #line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp256_ > 0) {
-#line 7515 "Dialogs.c"
-			const gchar* _tmp257_ = NULL;
-			gchar* _tmp258_ = NULL;
+		if (_tmp241_ > 0) {
+#line 7347 "Dialogs.c"
+			const gchar* _tmp242_;
+			gchar* _tmp243_;
 #line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp257_ = message;
+			_tmp242_ = message;
 #line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp258_ = g_strconcat (_tmp257_, "\n", NULL);
+			_tmp243_ = g_strconcat (_tmp242_, "\n", NULL);
 #line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
 #line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			message = _tmp258_;
-#line 7526 "Dialogs.c"
+			message = _tmp243_;
+#line 7358 "Dialogs.c"
 		}
 #line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp259_ = manifest;
+		_tmp244_ = manifest;
 #line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp260_ = _tmp259_->corrupt_files;
+		_tmp245_ = _tmp244_->corrupt_files;
 #line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp261_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp260_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp246_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp245_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp262_ = _tmp261_;
+		_tmp247_ = _tmp246_;
 #line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp263_ = ngettext ("1 photo failed to import because it was corrupt:\n", "%d photos failed to import because they were corrupt:\n", (gulong) _tmp262_);
+		_tmp248_ = manifest;
 #line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp264_ = manifest;
+		_tmp249_ = _tmp248_->corrupt_files;
 #line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp265_ = _tmp264_->corrupt_files;
+		_tmp250_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp249_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp266_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp265_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp251_ = _tmp250_;
 #line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp267_ = _tmp266_;
+		_tmp252_ = g_strdup_printf (ngettext ("1 photo failed to import because it was corrupt:\n", "%d photos failed to import because they were corrupt:\n", (gulong) _tmp247_), _tmp251_);
 #line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp268_ = g_strdup_printf (_tmp263_, _tmp267_);
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		photos_message = _tmp268_;
-#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp269_ = manifest;
+		photos_message = _tmp252_;
 #line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp270_ = _tmp269_->corrupt_files;
+		_tmp253_ = manifest;
 #line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp271_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp270_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp254_ = _tmp253_->corrupt_files;
 #line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp272_ = _tmp271_;
+		_tmp255_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp254_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp273_ = ngettext ("1 video failed to import because it was corrupt:\n", "%d videos failed to import because they were corrupt:\n", (gulong) _tmp272_);
+		_tmp256_ = _tmp255_;
 #line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp274_ = manifest;
+		_tmp257_ = manifest;
 #line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp275_ = _tmp274_->corrupt_files;
+		_tmp258_ = _tmp257_->corrupt_files;
 #line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp276_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp275_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp259_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp258_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp277_ = _tmp276_;
+		_tmp260_ = _tmp259_;
 #line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp278_ = g_strdup_printf (_tmp273_, _tmp277_);
+		_tmp261_ = g_strdup_printf (ngettext ("1 video failed to import because it was corrupt:\n", "%d videos failed to import because they were corrupt:\n", (gulong) _tmp256_), _tmp260_);
 #line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		videos_message = _tmp278_;
+		videos_message = _tmp261_;
 #line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp279_ = manifest;
+		_tmp262_ = manifest;
 #line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp280_ = _tmp279_->corrupt_files;
+		_tmp263_ = _tmp262_->corrupt_files;
 #line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp281_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp280_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp264_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp263_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp282_ = _tmp281_;
+		_tmp265_ = _tmp264_;
 #line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp283_ = ngettext ("1 photo/video failed to import because it was corrupt:\n", "%d photos/videos failed to import because they were corrupt:\n", (gulong) _tmp282_);
+		_tmp266_ = manifest;
 #line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp284_ = manifest;
+		_tmp267_ = _tmp266_->corrupt_files;
 #line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp285_ = _tmp284_->corrupt_files;
+		_tmp268_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp267_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp286_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp285_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp269_ = _tmp268_;
 #line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp287_ = _tmp286_;
+		_tmp270_ = g_strdup_printf (ngettext ("1 photo/video failed to import because it was corrupt:\n", "%d photos/videos failed to import because they were corrupt:\n", (gulong) _tmp265_), _tmp269_);
 #line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp288_ = g_strdup_printf (_tmp283_, _tmp287_);
-#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		both_message = _tmp288_;
-#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp289_ = manifest;
+		both_message = _tmp270_;
 #line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp290_ = _tmp289_->corrupt_files;
+		_tmp271_ = manifest;
 #line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp291_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp290_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp272_ = _tmp271_->corrupt_files;
 #line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp292_ = _tmp291_;
+		_tmp273_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp272_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp293_ = ngettext ("1 file failed to import because it was corrupt:\n", "%d files failed to import because it was corrupt:\n", (gulong) _tmp292_);
+		_tmp274_ = _tmp273_;
 #line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp294_ = manifest;
+		_tmp275_ = manifest;
 #line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp295_ = _tmp294_->corrupt_files;
+		_tmp276_ = _tmp275_->corrupt_files;
 #line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp296_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp295_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp277_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp276_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp297_ = _tmp296_;
+		_tmp278_ = _tmp277_;
 #line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp298_ = g_strdup_printf (_tmp293_, _tmp297_);
+		_tmp279_ = g_strdup_printf (ngettext ("1 file failed to import because it was corrupt:\n", "%d files failed to import because it was corrupt:\n", (gulong) _tmp274_), _tmp278_);
 #line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		neither_message = _tmp298_;
+		neither_message = _tmp279_;
 #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp299_ = message;
+		_tmp280_ = message;
 #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp300_ = manifest;
+		_tmp281_ = manifest;
 #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp301_ = _tmp300_->corrupt_files;
+		_tmp282_ = _tmp281_->corrupt_files;
 #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp302_ = photos_message;
+		_tmp283_ = photos_message;
 #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp303_ = videos_message;
+		_tmp284_ = videos_message;
 #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp304_ = both_message;
+		_tmp285_ = both_message;
 #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp305_ = neither_message;
+		_tmp286_ = neither_message;
 #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp306_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp301_, GEE_TYPE_COLLECTION, GeeCollection), _tmp302_, _tmp303_, _tmp304_, _tmp305_);
+		_tmp287_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp282_, GEE_TYPE_COLLECTION, GeeCollection), _tmp283_, _tmp284_, _tmp285_, _tmp286_);
 #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp307_ = _tmp306_;
+		_tmp288_ = _tmp287_;
 #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp308_ = g_strconcat (_tmp299_, _tmp307_, NULL);
+		_tmp289_ = g_strconcat (_tmp280_, _tmp288_, NULL);
 #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp308_;
+		message = _tmp289_;
 #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp307_);
+		_g_free0 (_tmp288_);
 #line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp309_ = message;
+		_tmp290_ = message;
 #line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp310_ = manifest;
+		_tmp291_ = manifest;
 #line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp311_ = _tmp310_->corrupt_files;
+		_tmp292_ = _tmp291_->corrupt_files;
 #line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp312_ = show_dest_id;
+		_tmp293_ = show_dest_id;
 #line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp313_ = import_ui_generate_import_failure_list (_tmp311_, _tmp312_);
+		_tmp294_ = import_ui_generate_import_failure_list (_tmp292_, _tmp293_);
 #line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp314_ = _tmp313_;
+		_tmp295_ = _tmp294_;
 #line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp315_ = g_strconcat (_tmp309_, _tmp314_, NULL);
+		_tmp296_ = g_strconcat (_tmp290_, _tmp295_, NULL);
 #line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp315_;
+		message = _tmp296_;
 #line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp314_);
+		_g_free0 (_tmp295_);
 #line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (neither_message);
 #line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7681,435 +7505,417 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7670 "Dialogs.c"
+#line 7494 "Dialogs.c"
 	}
 #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp316_ = manifest;
+	_tmp297_ = manifest;
 #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp317_ = _tmp316_->skipped_photos;
+	_tmp298_ = _tmp297_->skipped_photos;
 #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp318_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp317_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp299_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp298_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp319_ = _tmp318_;
+	_tmp300_ = _tmp299_;
 #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp319_ > 0) {
-#line 7682 "Dialogs.c"
-		const gchar* _tmp320_ = NULL;
-		gint _tmp321_ = 0;
-		gint _tmp322_ = 0;
+	if (_tmp300_ > 0) {
+#line 7506 "Dialogs.c"
+		const gchar* _tmp301_;
+		gint _tmp302_;
+		gint _tmp303_;
 		gchar* skipped_photos_message = NULL;
-		ImportManifest* _tmp325_ = NULL;
-		GeeList* _tmp326_ = NULL;
-		gint _tmp327_ = 0;
-		gint _tmp328_ = 0;
-		const gchar* _tmp329_ = NULL;
-		ImportManifest* _tmp330_ = NULL;
-		GeeList* _tmp331_ = NULL;
-		gint _tmp332_ = 0;
-		gint _tmp333_ = 0;
-		gchar* _tmp334_ = NULL;
-		const gchar* _tmp335_ = NULL;
-		const gchar* _tmp336_ = NULL;
-		gchar* _tmp337_ = NULL;
-		const gchar* _tmp338_ = NULL;
-		ImportManifest* _tmp339_ = NULL;
-		GeeList* _tmp340_ = NULL;
-		gboolean _tmp341_ = FALSE;
-		gchar* _tmp342_ = NULL;
-		gchar* _tmp343_ = NULL;
-		gchar* _tmp344_ = NULL;
+		ImportManifest* _tmp306_;
+		GeeList* _tmp307_;
+		gint _tmp308_;
+		gint _tmp309_;
+		ImportManifest* _tmp310_;
+		GeeList* _tmp311_;
+		gint _tmp312_;
+		gint _tmp313_;
+		gchar* _tmp314_;
+		const gchar* _tmp315_;
+		const gchar* _tmp316_;
+		gchar* _tmp317_;
+		const gchar* _tmp318_;
+		ImportManifest* _tmp319_;
+		GeeList* _tmp320_;
+		gboolean _tmp321_;
+		gchar* _tmp322_;
+		gchar* _tmp323_;
+		gchar* _tmp324_;
 #line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp320_ = message;
+		_tmp301_ = message;
 #line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp321_ = strlen (_tmp320_);
+		_tmp302_ = strlen (_tmp301_);
 #line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp322_ = _tmp321_;
+		_tmp303_ = _tmp302_;
 #line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp322_ > 0) {
-#line 7715 "Dialogs.c"
-			const gchar* _tmp323_ = NULL;
-			gchar* _tmp324_ = NULL;
+		if (_tmp303_ > 0) {
+#line 7538 "Dialogs.c"
+			const gchar* _tmp304_;
+			gchar* _tmp305_;
 #line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp323_ = message;
+			_tmp304_ = message;
 #line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp324_ = g_strconcat (_tmp323_, "\n", NULL);
+			_tmp305_ = g_strconcat (_tmp304_, "\n", NULL);
 #line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
 #line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			message = _tmp324_;
-#line 7726 "Dialogs.c"
+			message = _tmp305_;
+#line 7549 "Dialogs.c"
 		}
 #line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp325_ = manifest;
-#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp326_ = _tmp325_->skipped_photos;
+		_tmp306_ = manifest;
 #line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp327_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp326_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp307_ = _tmp306_->skipped_photos;
 #line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp328_ = _tmp327_;
+		_tmp308_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp307_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp329_ = ngettext ("1 unsupported photo skipped:\n", "%d unsupported photos skipped:\n", (gulong) _tmp328_);
+		_tmp309_ = _tmp308_;
 #line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp330_ = manifest;
+		_tmp310_ = manifest;
 #line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp331_ = _tmp330_->skipped_photos;
+		_tmp311_ = _tmp310_->skipped_photos;
 #line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp332_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp331_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp312_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp311_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp333_ = _tmp332_;
+		_tmp313_ = _tmp312_;
 #line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp334_ = g_strdup_printf (_tmp329_, _tmp333_);
+		_tmp314_ = g_strdup_printf (ngettext ("1 unsupported photo skipped:\n", "%d unsupported photos skipped:\n", (gulong) _tmp309_), _tmp313_);
 #line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		skipped_photos_message = _tmp334_;
+		skipped_photos_message = _tmp314_;
 #line 795 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp335_ = message;
+		_tmp315_ = message;
 #line 795 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp336_ = skipped_photos_message;
+		_tmp316_ = skipped_photos_message;
 #line 795 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp337_ = g_strconcat (_tmp335_, _tmp336_, NULL);
+		_tmp317_ = g_strconcat (_tmp315_, _tmp316_, NULL);
 #line 795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 795 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp337_;
+		message = _tmp317_;
 #line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp338_ = message;
+		_tmp318_ = message;
 #line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp339_ = manifest;
+		_tmp319_ = manifest;
 #line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp340_ = _tmp339_->skipped_photos;
+		_tmp320_ = _tmp319_->skipped_photos;
 #line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp341_ = show_dest_id;
+		_tmp321_ = show_dest_id;
 #line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp342_ = import_ui_generate_import_failure_list (_tmp340_, _tmp341_);
+		_tmp322_ = import_ui_generate_import_failure_list (_tmp320_, _tmp321_);
 #line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp343_ = _tmp342_;
+		_tmp323_ = _tmp322_;
 #line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp344_ = g_strconcat (_tmp338_, _tmp343_, NULL);
+		_tmp324_ = g_strconcat (_tmp318_, _tmp323_, NULL);
 #line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp344_;
+		message = _tmp324_;
 #line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp343_);
+		_g_free0 (_tmp323_);
 #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (skipped_photos_message);
-#line 7782 "Dialogs.c"
+#line 7603 "Dialogs.c"
 	}
 #line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp345_ = manifest;
+	_tmp325_ = manifest;
 #line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp346_ = _tmp345_->skipped_files;
+	_tmp326_ = _tmp325_->skipped_files;
 #line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp347_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp346_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp327_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp326_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp348_ = _tmp347_;
+	_tmp328_ = _tmp327_;
 #line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp348_ > 0) {
-#line 7794 "Dialogs.c"
-		const gchar* _tmp349_ = NULL;
-		gint _tmp350_ = 0;
-		gint _tmp351_ = 0;
+	if (_tmp328_ > 0) {
+#line 7615 "Dialogs.c"
+		const gchar* _tmp329_;
+		gint _tmp330_;
+		gint _tmp331_;
 		gchar* skipped_files_message = NULL;
-		ImportManifest* _tmp354_ = NULL;
-		GeeList* _tmp355_ = NULL;
-		gint _tmp356_ = 0;
-		gint _tmp357_ = 0;
-		const gchar* _tmp358_ = NULL;
-		ImportManifest* _tmp359_ = NULL;
-		GeeList* _tmp360_ = NULL;
-		gint _tmp361_ = 0;
-		gint _tmp362_ = 0;
-		gchar* _tmp363_ = NULL;
-		const gchar* _tmp364_ = NULL;
-		const gchar* _tmp365_ = NULL;
-		gchar* _tmp366_ = NULL;
+		ImportManifest* _tmp334_;
+		GeeList* _tmp335_;
+		gint _tmp336_;
+		gint _tmp337_;
+		ImportManifest* _tmp338_;
+		GeeList* _tmp339_;
+		gint _tmp340_;
+		gint _tmp341_;
+		gchar* _tmp342_;
+		const gchar* _tmp343_;
+		const gchar* _tmp344_;
+		gchar* _tmp345_;
 #line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp349_ = message;
+		_tmp329_ = message;
 #line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp350_ = strlen (_tmp349_);
+		_tmp330_ = strlen (_tmp329_);
 #line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp351_ = _tmp350_;
+		_tmp331_ = _tmp330_;
 #line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp351_ > 0) {
-#line 7820 "Dialogs.c"
-			const gchar* _tmp352_ = NULL;
-			gchar* _tmp353_ = NULL;
+		if (_tmp331_ > 0) {
+#line 7640 "Dialogs.c"
+			const gchar* _tmp332_;
+			gchar* _tmp333_;
 #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp352_ = message;
+			_tmp332_ = message;
 #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp353_ = g_strconcat (_tmp352_, "\n", NULL);
+			_tmp333_ = g_strconcat (_tmp332_, "\n", NULL);
 #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
 #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			message = _tmp353_;
-#line 7831 "Dialogs.c"
+			message = _tmp333_;
+#line 7651 "Dialogs.c"
 		}
 #line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp354_ = manifest;
-#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp355_ = _tmp354_->skipped_files;
+		_tmp334_ = manifest;
 #line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp356_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp355_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp335_ = _tmp334_->skipped_files;
 #line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp357_ = _tmp356_;
+		_tmp336_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp335_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp358_ = ngettext ("1 non-image file skipped.\n", "%d non-image files skipped.\n", (gulong) _tmp357_);
+		_tmp337_ = _tmp336_;
 #line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp359_ = manifest;
+		_tmp338_ = manifest;
 #line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp360_ = _tmp359_->skipped_files;
+		_tmp339_ = _tmp338_->skipped_files;
 #line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp361_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp360_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp340_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp339_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp362_ = _tmp361_;
+		_tmp341_ = _tmp340_;
 #line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp363_ = g_strdup_printf (_tmp358_, _tmp362_);
+		_tmp342_ = g_strdup_printf (ngettext ("1 non-image file skipped.\n", "%d non-image files skipped.\n", (gulong) _tmp337_), _tmp341_);
 #line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		skipped_files_message = _tmp363_;
+		skipped_files_message = _tmp342_;
 #line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp364_ = message;
+		_tmp343_ = message;
 #line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp365_ = skipped_files_message;
+		_tmp344_ = skipped_files_message;
 #line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp366_ = g_strconcat (_tmp364_, _tmp365_, NULL);
+		_tmp345_ = g_strconcat (_tmp343_, _tmp344_, NULL);
 #line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp366_;
+		message = _tmp345_;
 #line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (skipped_files_message);
-#line 7867 "Dialogs.c"
+#line 7685 "Dialogs.c"
 	}
 #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp367_ = manifest;
+	_tmp346_ = manifest;
 #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp368_ = _tmp367_->aborted;
+	_tmp347_ = _tmp346_->aborted;
 #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp369_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp368_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp348_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp347_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp370_ = _tmp369_;
+	_tmp349_ = _tmp348_;
 #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp370_ > 0) {
-#line 7879 "Dialogs.c"
-		const gchar* _tmp371_ = NULL;
-		gint _tmp372_ = 0;
-		gint _tmp373_ = 0;
+	if (_tmp349_ > 0) {
+#line 7697 "Dialogs.c"
+		const gchar* _tmp350_;
+		gint _tmp351_;
+		gint _tmp352_;
 		gchar* photos_message = NULL;
-		ImportManifest* _tmp376_ = NULL;
-		GeeList* _tmp377_ = NULL;
-		gint _tmp378_ = 0;
-		gint _tmp379_ = 0;
-		const gchar* _tmp380_ = NULL;
-		ImportManifest* _tmp381_ = NULL;
-		GeeList* _tmp382_ = NULL;
-		gint _tmp383_ = 0;
-		gint _tmp384_ = 0;
-		gchar* _tmp385_ = NULL;
+		ImportManifest* _tmp355_;
+		GeeList* _tmp356_;
+		gint _tmp357_;
+		gint _tmp358_;
+		ImportManifest* _tmp359_;
+		GeeList* _tmp360_;
+		gint _tmp361_;
+		gint _tmp362_;
+		gchar* _tmp363_;
 		gchar* videos_message = NULL;
-		ImportManifest* _tmp386_ = NULL;
-		GeeList* _tmp387_ = NULL;
-		gint _tmp388_ = 0;
-		gint _tmp389_ = 0;
-		const gchar* _tmp390_ = NULL;
-		ImportManifest* _tmp391_ = NULL;
-		GeeList* _tmp392_ = NULL;
-		gint _tmp393_ = 0;
-		gint _tmp394_ = 0;
-		gchar* _tmp395_ = NULL;
+		ImportManifest* _tmp364_;
+		GeeList* _tmp365_;
+		gint _tmp366_;
+		gint _tmp367_;
+		ImportManifest* _tmp368_;
+		GeeList* _tmp369_;
+		gint _tmp370_;
+		gint _tmp371_;
+		gchar* _tmp372_;
 		gchar* both_message = NULL;
-		ImportManifest* _tmp396_ = NULL;
-		GeeList* _tmp397_ = NULL;
-		gint _tmp398_ = 0;
-		gint _tmp399_ = 0;
-		const gchar* _tmp400_ = NULL;
-		ImportManifest* _tmp401_ = NULL;
-		GeeList* _tmp402_ = NULL;
-		gint _tmp403_ = 0;
-		gint _tmp404_ = 0;
-		gchar* _tmp405_ = NULL;
+		ImportManifest* _tmp373_;
+		GeeList* _tmp374_;
+		gint _tmp375_;
+		gint _tmp376_;
+		ImportManifest* _tmp377_;
+		GeeList* _tmp378_;
+		gint _tmp379_;
+		gint _tmp380_;
+		gchar* _tmp381_;
 		gchar* neither_message = NULL;
-		ImportManifest* _tmp406_ = NULL;
-		GeeList* _tmp407_ = NULL;
-		gint _tmp408_ = 0;
-		gint _tmp409_ = 0;
-		const gchar* _tmp410_ = NULL;
-		ImportManifest* _tmp411_ = NULL;
-		GeeList* _tmp412_ = NULL;
-		gint _tmp413_ = 0;
-		gint _tmp414_ = 0;
-		gchar* _tmp415_ = NULL;
-		const gchar* _tmp416_ = NULL;
-		ImportManifest* _tmp417_ = NULL;
-		GeeList* _tmp418_ = NULL;
-		const gchar* _tmp419_ = NULL;
-		const gchar* _tmp420_ = NULL;
-		const gchar* _tmp421_ = NULL;
-		const gchar* _tmp422_ = NULL;
-		gchar* _tmp423_ = NULL;
-		gchar* _tmp424_ = NULL;
-		gchar* _tmp425_ = NULL;
-		const gchar* _tmp426_ = NULL;
-		ImportManifest* _tmp427_ = NULL;
-		GeeList* _tmp428_ = NULL;
-		gboolean _tmp429_ = FALSE;
-		gchar* _tmp430_ = NULL;
-		gchar* _tmp431_ = NULL;
-		gchar* _tmp432_ = NULL;
+		ImportManifest* _tmp382_;
+		GeeList* _tmp383_;
+		gint _tmp384_;
+		gint _tmp385_;
+		ImportManifest* _tmp386_;
+		GeeList* _tmp387_;
+		gint _tmp388_;
+		gint _tmp389_;
+		gchar* _tmp390_;
+		const gchar* _tmp391_;
+		ImportManifest* _tmp392_;
+		GeeList* _tmp393_;
+		const gchar* _tmp394_;
+		const gchar* _tmp395_;
+		const gchar* _tmp396_;
+		const gchar* _tmp397_;
+		gchar* _tmp398_;
+		gchar* _tmp399_;
+		gchar* _tmp400_;
+		const gchar* _tmp401_;
+		ImportManifest* _tmp402_;
+		GeeList* _tmp403_;
+		gboolean _tmp404_;
+		gchar* _tmp405_;
+		gchar* _tmp406_;
+		gchar* _tmp407_;
 #line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp371_ = message;
+		_tmp350_ = message;
 #line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp372_ = strlen (_tmp371_);
+		_tmp351_ = strlen (_tmp350_);
 #line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp373_ = _tmp372_;
+		_tmp352_ = _tmp351_;
 #line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp373_ > 0) {
-#line 7952 "Dialogs.c"
-			const gchar* _tmp374_ = NULL;
-			gchar* _tmp375_ = NULL;
+		if (_tmp352_ > 0) {
+#line 7766 "Dialogs.c"
+			const gchar* _tmp353_;
+			gchar* _tmp354_;
 #line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp374_ = message;
+			_tmp353_ = message;
 #line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp375_ = g_strconcat (_tmp374_, "\n", NULL);
+			_tmp354_ = g_strconcat (_tmp353_, "\n", NULL);
 #line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
 #line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			message = _tmp375_;
-#line 7963 "Dialogs.c"
+			message = _tmp354_;
+#line 7777 "Dialogs.c"
 		}
 #line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp376_ = manifest;
+		_tmp355_ = manifest;
 #line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp377_ = _tmp376_->aborted;
+		_tmp356_ = _tmp355_->aborted;
 #line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp378_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp377_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp357_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp356_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp379_ = _tmp378_;
+		_tmp358_ = _tmp357_;
 #line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp380_ = ngettext ("1 photo skipped due to user cancel:\n", "%d photos skipped due to user cancel:\n", (gulong) _tmp379_);
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp381_ = manifest;
+		_tmp359_ = manifest;
 #line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp382_ = _tmp381_->aborted;
+		_tmp360_ = _tmp359_->aborted;
 #line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp383_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp382_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp361_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp360_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp384_ = _tmp383_;
+		_tmp362_ = _tmp361_;
 #line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp385_ = g_strdup_printf (_tmp380_, _tmp384_);
+		_tmp363_ = g_strdup_printf (ngettext ("1 photo skipped due to user cancel:\n", "%d photos skipped due to user cancel:\n", (gulong) _tmp358_), _tmp362_);
 #line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		photos_message = _tmp385_;
+		photos_message = _tmp363_;
 #line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp386_ = manifest;
+		_tmp364_ = manifest;
 #line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp387_ = _tmp386_->aborted;
+		_tmp365_ = _tmp364_->aborted;
 #line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp388_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp387_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp389_ = _tmp388_;
+		_tmp366_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp365_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp390_ = ngettext ("1 video skipped due to user cancel:\n", "%d videos skipped due to user cancel:\n", (gulong) _tmp389_);
+		_tmp367_ = _tmp366_;
 #line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp391_ = manifest;
+		_tmp368_ = manifest;
 #line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp392_ = _tmp391_->aborted;
+		_tmp369_ = _tmp368_->aborted;
 #line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp393_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp392_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp370_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp369_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp394_ = _tmp393_;
+		_tmp371_ = _tmp370_;
 #line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp395_ = g_strdup_printf (_tmp390_, _tmp394_);
+		_tmp372_ = g_strdup_printf (ngettext ("1 video skipped due to user cancel:\n", "%d videos skipped due to user cancel:\n", (gulong) _tmp367_), _tmp371_);
 #line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		videos_message = _tmp395_;
+		videos_message = _tmp372_;
 #line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp396_ = manifest;
+		_tmp373_ = manifest;
 #line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp397_ = _tmp396_->aborted;
+		_tmp374_ = _tmp373_->aborted;
 #line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp398_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp397_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp375_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp374_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp399_ = _tmp398_;
+		_tmp376_ = _tmp375_;
 #line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp400_ = ngettext ("1 photo/video skipped due to user cancel:\n", "%d photos/videos skipped due to user cancel:\n", (gulong) _tmp399_);
+		_tmp377_ = manifest;
 #line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp401_ = manifest;
+		_tmp378_ = _tmp377_->aborted;
 #line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp402_ = _tmp401_->aborted;
+		_tmp379_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp378_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp403_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp402_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp380_ = _tmp379_;
 #line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp404_ = _tmp403_;
+		_tmp381_ = g_strdup_printf (ngettext ("1 photo/video skipped due to user cancel:\n", "%d photos/videos skipped due to user cancel:\n", (gulong) _tmp376_), _tmp380_);
 #line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp405_ = g_strdup_printf (_tmp400_, _tmp404_);
-#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		both_message = _tmp405_;
-#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp406_ = manifest;
+		both_message = _tmp381_;
 #line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp407_ = _tmp406_->aborted;
+		_tmp382_ = manifest;
 #line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp408_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp407_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp383_ = _tmp382_->aborted;
 #line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp409_ = _tmp408_;
+		_tmp384_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp383_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp410_ = ngettext ("1 file skipped due to user cancel:\n", "%d file skipped due to user cancel:\n", (gulong) _tmp409_);
+		_tmp385_ = _tmp384_;
 #line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp411_ = manifest;
+		_tmp386_ = manifest;
 #line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp412_ = _tmp411_->aborted;
+		_tmp387_ = _tmp386_->aborted;
 #line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp413_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp412_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp388_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp387_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp414_ = _tmp413_;
+		_tmp389_ = _tmp388_;
 #line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp415_ = g_strdup_printf (_tmp410_, _tmp414_);
+		_tmp390_ = g_strdup_printf (ngettext ("1 file skipped due to user cancel:\n", "%d file skipped due to user cancel:\n", (gulong) _tmp385_), _tmp389_);
 #line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		neither_message = _tmp415_;
+		neither_message = _tmp390_;
 #line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp416_ = message;
+		_tmp391_ = message;
 #line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp417_ = manifest;
+		_tmp392_ = manifest;
 #line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp418_ = _tmp417_->aborted;
+		_tmp393_ = _tmp392_->aborted;
 #line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp419_ = photos_message;
+		_tmp394_ = photos_message;
 #line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp420_ = videos_message;
+		_tmp395_ = videos_message;
 #line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp421_ = both_message;
+		_tmp396_ = both_message;
 #line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp422_ = neither_message;
+		_tmp397_ = neither_message;
 #line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp423_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp418_, GEE_TYPE_COLLECTION, GeeCollection), _tmp419_, _tmp420_, _tmp421_, _tmp422_);
+		_tmp398_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp393_, GEE_TYPE_COLLECTION, GeeCollection), _tmp394_, _tmp395_, _tmp396_, _tmp397_);
 #line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp424_ = _tmp423_;
+		_tmp399_ = _tmp398_;
 #line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp425_ = g_strconcat (_tmp416_, _tmp424_, NULL);
+		_tmp400_ = g_strconcat (_tmp391_, _tmp399_, NULL);
 #line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp425_;
+		message = _tmp400_;
 #line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp424_);
+		_g_free0 (_tmp399_);
 #line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp426_ = message;
+		_tmp401_ = message;
 #line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp427_ = manifest;
+		_tmp402_ = manifest;
 #line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp428_ = _tmp427_->aborted;
+		_tmp403_ = _tmp402_->aborted;
 #line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp429_ = show_dest_id;
+		_tmp404_ = show_dest_id;
 #line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp430_ = import_ui_generate_import_failure_list (_tmp428_, _tmp429_);
+		_tmp405_ = import_ui_generate_import_failure_list (_tmp403_, _tmp404_);
 #line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp431_ = _tmp430_;
+		_tmp406_ = _tmp405_;
 #line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp432_ = g_strconcat (_tmp426_, _tmp431_, NULL);
+		_tmp407_ = g_strconcat (_tmp401_, _tmp406_, NULL);
 #line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp432_;
+		message = _tmp407_;
 #line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp431_);
+		_g_free0 (_tmp406_);
 #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (neither_message);
 #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -8118,435 +7924,420 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 8107 "Dialogs.c"
+#line 7913 "Dialogs.c"
 	}
 #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp433_ = manifest;
+	_tmp408_ = manifest;
 #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp434_ = _tmp433_->success;
+	_tmp409_ = _tmp408_->success;
 #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp435_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp434_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp410_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp409_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp436_ = _tmp435_;
+	_tmp411_ = _tmp410_;
 #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp436_ > 0) {
-#line 8119 "Dialogs.c"
-		const gchar* _tmp437_ = NULL;
-		gint _tmp438_ = 0;
-		gint _tmp439_ = 0;
+	if (_tmp411_ > 0) {
+#line 7925 "Dialogs.c"
+		const gchar* _tmp412_;
+		gint _tmp413_;
+		gint _tmp414_;
 		gchar* photos_message = NULL;
-		ImportManifest* _tmp442_ = NULL;
-		GeeList* _tmp443_ = NULL;
-		gint _tmp444_ = 0;
-		gint _tmp445_ = 0;
-		const gchar* _tmp446_ = NULL;
-		ImportManifest* _tmp447_ = NULL;
-		GeeList* _tmp448_ = NULL;
-		gint _tmp449_ = 0;
-		gint _tmp450_ = 0;
-		gchar* _tmp451_ = NULL;
+		ImportManifest* _tmp417_;
+		GeeList* _tmp418_;
+		gint _tmp419_;
+		gint _tmp420_;
+		ImportManifest* _tmp421_;
+		GeeList* _tmp422_;
+		gint _tmp423_;
+		gint _tmp424_;
+		gchar* _tmp425_;
 		gchar* videos_message = NULL;
-		ImportManifest* _tmp452_ = NULL;
-		GeeList* _tmp453_ = NULL;
-		gint _tmp454_ = 0;
-		gint _tmp455_ = 0;
-		const gchar* _tmp456_ = NULL;
-		ImportManifest* _tmp457_ = NULL;
-		GeeList* _tmp458_ = NULL;
-		gint _tmp459_ = 0;
-		gint _tmp460_ = 0;
-		gchar* _tmp461_ = NULL;
+		ImportManifest* _tmp426_;
+		GeeList* _tmp427_;
+		gint _tmp428_;
+		gint _tmp429_;
+		ImportManifest* _tmp430_;
+		GeeList* _tmp431_;
+		gint _tmp432_;
+		gint _tmp433_;
+		gchar* _tmp434_;
 		gchar* both_message = NULL;
-		ImportManifest* _tmp462_ = NULL;
-		GeeList* _tmp463_ = NULL;
-		gint _tmp464_ = 0;
-		gint _tmp465_ = 0;
-		const gchar* _tmp466_ = NULL;
-		ImportManifest* _tmp467_ = NULL;
-		GeeList* _tmp468_ = NULL;
-		gint _tmp469_ = 0;
-		gint _tmp470_ = 0;
-		gchar* _tmp471_ = NULL;
-		const gchar* _tmp472_ = NULL;
-		ImportManifest* _tmp473_ = NULL;
-		GeeList* _tmp474_ = NULL;
-		const gchar* _tmp475_ = NULL;
-		const gchar* _tmp476_ = NULL;
-		const gchar* _tmp477_ = NULL;
-		gchar* _tmp478_ = NULL;
-		gchar* _tmp479_ = NULL;
-		gchar* _tmp480_ = NULL;
+		ImportManifest* _tmp435_;
+		GeeList* _tmp436_;
+		gint _tmp437_;
+		gint _tmp438_;
+		ImportManifest* _tmp439_;
+		GeeList* _tmp440_;
+		gint _tmp441_;
+		gint _tmp442_;
+		gchar* _tmp443_;
+		const gchar* _tmp444_;
+		ImportManifest* _tmp445_;
+		GeeList* _tmp446_;
+		const gchar* _tmp447_;
+		const gchar* _tmp448_;
+		const gchar* _tmp449_;
+		gchar* _tmp450_;
+		gchar* _tmp451_;
+		gchar* _tmp452_;
 #line 837 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp437_ = message;
+		_tmp412_ = message;
 #line 837 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp438_ = strlen (_tmp437_);
+		_tmp413_ = strlen (_tmp412_);
 #line 837 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp439_ = _tmp438_;
+		_tmp414_ = _tmp413_;
 #line 837 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp439_ > 0) {
-#line 8173 "Dialogs.c"
-			const gchar* _tmp440_ = NULL;
-			gchar* _tmp441_ = NULL;
+		if (_tmp414_ > 0) {
+#line 7976 "Dialogs.c"
+			const gchar* _tmp415_;
+			gchar* _tmp416_;
 #line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp440_ = message;
+			_tmp415_ = message;
 #line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp441_ = g_strconcat (_tmp440_, "\n", NULL);
+			_tmp416_ = g_strconcat (_tmp415_, "\n", NULL);
 #line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
 #line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			message = _tmp441_;
-#line 8184 "Dialogs.c"
+			message = _tmp416_;
+#line 7987 "Dialogs.c"
 		}
 #line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp442_ = manifest;
-#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp443_ = _tmp442_->success;
+		_tmp417_ = manifest;
 #line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp444_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp443_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp418_ = _tmp417_->success;
 #line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp445_ = _tmp444_;
+		_tmp419_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp418_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp446_ = ngettext ("1 photo successfully imported.\n", "%d photos successfully imported.\n", (gulong) _tmp445_);
+		_tmp420_ = _tmp419_;
 #line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp447_ = manifest;
+		_tmp421_ = manifest;
 #line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp448_ = _tmp447_->success;
+		_tmp422_ = _tmp421_->success;
 #line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp449_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp448_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp423_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp422_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp450_ = _tmp449_;
+		_tmp424_ = _tmp423_;
 #line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp451_ = g_strdup_printf (_tmp446_, _tmp450_);
+		_tmp425_ = g_strdup_printf (ngettext ("1 photo successfully imported.\n", "%d photos successfully imported.\n", (gulong) _tmp420_), _tmp424_);
 #line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		photos_message = _tmp451_;
+		photos_message = _tmp425_;
 #line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp452_ = manifest;
+		_tmp426_ = manifest;
 #line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp453_ = _tmp452_->success;
+		_tmp427_ = _tmp426_->success;
 #line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp454_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp453_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp428_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp427_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp455_ = _tmp454_;
+		_tmp429_ = _tmp428_;
 #line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp456_ = ngettext ("1 video successfully imported.\n", "%d videos successfully imported.\n", (gulong) _tmp455_);
+		_tmp430_ = manifest;
 #line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp457_ = manifest;
+		_tmp431_ = _tmp430_->success;
 #line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp458_ = _tmp457_->success;
+		_tmp432_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp431_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp459_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp458_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp433_ = _tmp432_;
 #line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp460_ = _tmp459_;
+		_tmp434_ = g_strdup_printf (ngettext ("1 video successfully imported.\n", "%d videos successfully imported.\n", (gulong) _tmp429_), _tmp433_);
 #line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp461_ = g_strdup_printf (_tmp456_, _tmp460_);
-#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		videos_message = _tmp461_;
-#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp462_ = manifest;
+		videos_message = _tmp434_;
 #line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp463_ = _tmp462_->success;
+		_tmp435_ = manifest;
 #line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp464_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp463_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp436_ = _tmp435_->success;
 #line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp465_ = _tmp464_;
+		_tmp437_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp436_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp466_ = ngettext ("1 photo/video successfully imported.\n", "%d photos/videos successfully imported.\n", (gulong) _tmp465_);
+		_tmp438_ = _tmp437_;
 #line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp467_ = manifest;
+		_tmp439_ = manifest;
 #line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp468_ = _tmp467_->success;
+		_tmp440_ = _tmp439_->success;
 #line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp469_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp468_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp441_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp440_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp470_ = _tmp469_;
+		_tmp442_ = _tmp441_;
 #line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp471_ = g_strdup_printf (_tmp466_, _tmp470_);
+		_tmp443_ = g_strdup_printf (ngettext ("1 photo/video successfully imported.\n", "%d photos/videos successfully imported.\n", (gulong) _tmp438_), _tmp442_);
 #line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		both_message = _tmp471_;
+		both_message = _tmp443_;
 #line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp472_ = message;
+		_tmp444_ = message;
 #line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp473_ = manifest;
+		_tmp445_ = manifest;
 #line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp474_ = _tmp473_->success;
+		_tmp446_ = _tmp445_->success;
 #line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp475_ = photos_message;
+		_tmp447_ = photos_message;
 #line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp476_ = videos_message;
+		_tmp448_ = videos_message;
 #line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp477_ = both_message;
+		_tmp449_ = both_message;
 #line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp478_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp474_, GEE_TYPE_COLLECTION, GeeCollection), _tmp475_, _tmp476_, _tmp477_, "");
+		_tmp450_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp446_, GEE_TYPE_COLLECTION, GeeCollection), _tmp447_, _tmp448_, _tmp449_, "");
 #line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp479_ = _tmp478_;
+		_tmp451_ = _tmp450_;
 #line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp480_ = g_strconcat (_tmp472_, _tmp479_, NULL);
+		_tmp452_ = g_strconcat (_tmp444_, _tmp451_, NULL);
 #line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp480_;
+		message = _tmp452_;
 #line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp479_);
+		_g_free0 (_tmp451_);
 #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (both_message);
 #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (videos_message);
 #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 8282 "Dialogs.c"
+#line 8079 "Dialogs.c"
 	}
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp481_ = manifest;
+	_tmp453_ = manifest;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp482_ = _tmp481_->success;
+	_tmp454_ = _tmp453_->success;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp483_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp482_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp455_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp454_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp484_ = _tmp483_;
+	_tmp456_ = _tmp455_;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp485_ = manifest;
+	_tmp457_ = manifest;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp486_ = _tmp485_->failed;
+	_tmp458_ = _tmp457_->failed;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp487_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp486_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp459_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp458_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp488_ = _tmp487_;
+	_tmp460_ = _tmp459_;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp489_ = manifest;
+	_tmp461_ = manifest;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp490_ = _tmp489_->camera_failed;
+	_tmp462_ = _tmp461_->camera_failed;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp491_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp490_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp463_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp462_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp492_ = _tmp491_;
+	_tmp464_ = _tmp463_;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp493_ = manifest;
+	_tmp465_ = manifest;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp494_ = _tmp493_->skipped_photos;
+	_tmp466_ = _tmp465_->skipped_photos;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp495_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp494_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp467_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp466_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp496_ = _tmp495_;
+	_tmp468_ = _tmp467_;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp497_ = manifest;
+	_tmp469_ = manifest;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp498_ = _tmp497_->skipped_files;
+	_tmp470_ = _tmp469_->skipped_files;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp499_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp498_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp471_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp470_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp500_ = _tmp499_;
+	_tmp472_ = _tmp471_;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp501_ = manifest;
+	_tmp473_ = manifest;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp502_ = _tmp501_->corrupt_files;
+	_tmp474_ = _tmp473_->corrupt_files;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp503_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp502_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp475_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp474_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp504_ = _tmp503_;
+	_tmp476_ = _tmp475_;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp505_ = manifest;
+	_tmp477_ = manifest;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp506_ = _tmp505_->already_imported;
+	_tmp478_ = _tmp477_->already_imported;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp507_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp506_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp479_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp478_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp508_ = _tmp507_;
+	_tmp480_ = _tmp479_;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp509_ = manifest;
+	_tmp481_ = manifest;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp510_ = _tmp509_->aborted;
+	_tmp482_ = _tmp481_->aborted;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp511_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp510_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp483_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp482_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp512_ = _tmp511_;
+	_tmp484_ = _tmp483_;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp513_ = manifest;
+	_tmp485_ = manifest;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp514_ = _tmp513_->write_failed;
+	_tmp486_ = _tmp485_->write_failed;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp515_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp514_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp487_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp486_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp516_ = _tmp515_;
+	_tmp488_ = _tmp487_;
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	total = (((((((_tmp484_ + _tmp488_) + _tmp492_) + _tmp496_) + _tmp500_) + _tmp504_) + _tmp508_) + _tmp512_) + _tmp516_;
+	total = (((((((_tmp456_ + _tmp460_) + _tmp464_) + _tmp468_) + _tmp472_) + _tmp476_) + _tmp480_) + _tmp484_) + _tmp488_;
 #line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp517_ = total;
+	_tmp489_ = total;
 #line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp518_ = manifest;
+	_tmp490_ = manifest;
 #line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp519_ = _tmp518_->all;
+	_tmp491_ = _tmp490_->all;
 #line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp520_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp519_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp492_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp491_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp521_ = _tmp520_;
+	_tmp493_ = _tmp492_;
 #line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_assert (_tmp517_ == _tmp521_, "total == manifest.all.size");
+	_vala_assert (_tmp489_ == _tmp493_, "total == manifest.all.size");
 #line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp522_ = total;
+	_tmp494_ = total;
 #line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp522_ == 0) {
-#line 8374 "Dialogs.c"
-		const gchar* _tmp523_ = NULL;
-		const gchar* _tmp524_ = NULL;
-		gchar* _tmp525_ = NULL;
-#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp523_ = message;
+	if (_tmp494_ == 0) {
+#line 8171 "Dialogs.c"
+		const gchar* _tmp495_;
+		gchar* _tmp496_;
 #line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp524_ = _ ("No photos or videos imported.\n");
+		_tmp495_ = message;
 #line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp525_ = g_strconcat (_tmp523_, _tmp524_, NULL);
+		_tmp496_ = g_strconcat (_tmp495_, _ ("No photos or videos imported.\n"), NULL);
 #line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp525_;
-#line 8388 "Dialogs.c"
+		message = _tmp496_;
+#line 8182 "Dialogs.c"
 	}
 #line 864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = NULL;
 #line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog_response = (gint) GTK_RESPONSE_NONE;
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp526_ = question;
+	_tmp497_ = question;
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp526_ == NULL) {
-#line 8398 "Dialogs.c"
-		AppWindow* _tmp527_ = NULL;
-		AppWindow* _tmp528_ = NULL;
-		const gchar* _tmp529_ = NULL;
-		GtkMessageDialog* _tmp530_ = NULL;
-		GtkMessageDialog* _tmp531_ = NULL;
-		const gchar* _tmp532_ = NULL;
+	if (_tmp497_ == NULL) {
+#line 8192 "Dialogs.c"
+		AppWindow* _tmp498_;
+		AppWindow* _tmp499_;
+		const gchar* _tmp500_;
+		GtkMessageDialog* _tmp501_;
+		GtkMessageDialog* _tmp502_;
 		GtkWidget* save_results_button = NULL;
-		GtkMessageDialog* _tmp533_ = NULL;
-		GtkWidget* _tmp534_ = NULL;
-		GtkWidget* _tmp535_ = NULL;
-		GtkWidget* _tmp536_ = NULL;
-		ImportManifest* _tmp537_ = NULL;
-		GeeList* _tmp538_ = NULL;
-		gint _tmp539_ = 0;
-		gint _tmp540_ = 0;
-		ImportManifest* _tmp541_ = NULL;
-		GeeList* _tmp542_ = NULL;
-		gint _tmp543_ = 0;
-		gint _tmp544_ = 0;
+		GtkMessageDialog* _tmp503_;
+		GtkWidget* _tmp504_;
+		GtkWidget* _tmp505_;
+		GtkWidget* _tmp506_;
+		ImportManifest* _tmp507_;
+		GeeList* _tmp508_;
+		gint _tmp509_;
+		gint _tmp510_;
+		ImportManifest* _tmp511_;
+		GeeList* _tmp512_;
+		gint _tmp513_;
+		gint _tmp514_;
 		GtkWidget* ok_button = NULL;
-		GtkMessageDialog* _tmp545_ = NULL;
-		GtkWidget* _tmp546_ = NULL;
-		GtkWidget* _tmp547_ = NULL;
-		GtkMessageDialog* _tmp548_ = NULL;
-		GtkWidget* _tmp549_ = NULL;
+		GtkMessageDialog* _tmp515_;
+		GtkWidget* _tmp516_;
+		GtkWidget* _tmp517_;
+		GtkMessageDialog* _tmp518_;
+		GtkWidget* _tmp519_;
 		GtkWindow* dialog_parent = NULL;
-		GtkMessageDialog* _tmp550_ = NULL;
-		GtkContainer* _tmp551_ = NULL;
-		GtkWindow* _tmp552_ = NULL;
-		GtkMessageDialog* _tmp553_ = NULL;
-		gint _tmp554_ = 0;
-		GtkMessageDialog* _tmp555_ = NULL;
-		gint _tmp556_ = 0;
+		GtkMessageDialog* _tmp520_;
+		GtkContainer* _tmp521_;
+		GtkWindow* _tmp522_;
+		GtkMessageDialog* _tmp523_;
+		gint _tmp524_;
+		GtkMessageDialog* _tmp525_;
+		gint _tmp526_;
 #line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp527_ = app_window_get_instance ();
+		_tmp498_ = app_window_get_instance ();
 #line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp528_ = _tmp527_;
+		_tmp499_ = _tmp498_;
 #line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp529_ = message;
+		_tmp500_ = message;
 #line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp530_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp528_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, "%s", _tmp529_);
+		_tmp501_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp499_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, "%s", _tmp500_);
 #line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_ref_sink (_tmp530_);
+		g_object_ref_sink (_tmp501_);
 #line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (dialog);
 #line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		dialog = _tmp530_;
+		dialog = _tmp501_;
 #line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp528_);
+		_g_object_unref0 (_tmp499_);
 #line 869 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp531_ = dialog;
+		_tmp502_ = dialog;
 #line 869 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp532_ = _ ("Import Complete");
-#line 869 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp531_, gtk_window_get_type (), GtkWindow), _tmp532_);
+		gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp502_, gtk_window_get_type (), GtkWindow), _ ("Import Complete"));
 #line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp533_ = dialog;
+		_tmp503_ = dialog;
 #line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp534_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp533_, gtk_dialog_get_type (), GtkDialog), IMPORT_UI_SAVE_RESULTS_BUTTON_NAME, IMPORT_UI_SAVE_RESULTS_RESPONSE_ID);
+		_tmp504_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp503_, gtk_dialog_get_type (), GtkDialog), IMPORT_UI_SAVE_RESULTS_BUTTON_NAME, IMPORT_UI_SAVE_RESULTS_RESPONSE_ID);
 #line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp535_ = _g_object_ref0 (_tmp534_);
+		_tmp505_ = _g_object_ref0 (_tmp504_);
 #line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		save_results_button = _tmp535_;
+		save_results_button = _tmp505_;
 #line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp536_ = save_results_button;
+		_tmp506_ = save_results_button;
 #line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp537_ = manifest;
+		_tmp507_ = manifest;
 #line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp538_ = _tmp537_->success;
+		_tmp508_ = _tmp507_->success;
 #line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp539_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp538_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp509_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp508_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp540_ = _tmp539_;
+		_tmp510_ = _tmp509_;
 #line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp541_ = manifest;
+		_tmp511_ = manifest;
 #line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp542_ = _tmp541_->all;
+		_tmp512_ = _tmp511_->all;
 #line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp543_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp542_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp513_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp512_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp544_ = _tmp543_;
+		_tmp514_ = _tmp513_;
 #line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_visible (_tmp536_, _tmp540_ < _tmp544_);
+		gtk_widget_set_visible (_tmp506_, _tmp510_ < _tmp514_);
 #line 873 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp545_ = dialog;
+		_tmp515_ = dialog;
 #line 873 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp546_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp545_, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK);
+		_tmp516_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp515_, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK);
 #line 873 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp547_ = _g_object_ref0 (_tmp546_);
+		_tmp517_ = _g_object_ref0 (_tmp516_);
 #line 873 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		ok_button = _tmp547_;
+		ok_button = _tmp517_;
 #line 874 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp548_ = dialog;
+		_tmp518_ = dialog;
 #line 874 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp549_ = ok_button;
+		_tmp519_ = ok_button;
 #line 874 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp548_, gtk_window_get_type (), GtkWindow), _tmp549_);
+		gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp518_, gtk_window_get_type (), GtkWindow), _tmp519_);
 #line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp550_ = dialog;
+		_tmp520_ = dialog;
 #line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp551_ = (GtkContainer*) gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp550_, gtk_widget_get_type (), GtkWidget));
+		_tmp521_ = (GtkContainer*) gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp520_, gtk_widget_get_type (), GtkWidget));
 #line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp552_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp551_, gtk_window_get_type (), GtkWindow));
+		_tmp522_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp521_, gtk_window_get_type (), GtkWindow));
 #line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		dialog_parent = _tmp552_;
+		dialog_parent = _tmp522_;
 #line 877 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp553_ = dialog;
+		_tmp523_ = dialog;
 #line 877 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp554_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp553_, gtk_dialog_get_type (), GtkDialog));
+		_tmp524_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp523_, gtk_dialog_get_type (), GtkDialog));
 #line 877 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		dialog_response = _tmp554_;
+		dialog_response = _tmp524_;
 #line 878 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp555_ = dialog;
+		_tmp525_ = dialog;
 #line 878 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp555_, gtk_widget_get_type (), GtkWidget));
+		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp525_, gtk_widget_get_type (), GtkWidget));
 #line 880 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp556_ = dialog_response;
+		_tmp526_ = dialog_response;
 #line 880 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp556_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID) {
-#line 8518 "Dialogs.c"
-			GtkWindow* _tmp557_ = NULL;
-			ImportManifest* _tmp558_ = NULL;
-			gchar* _tmp559_ = NULL;
-			gchar* _tmp560_ = NULL;
+		if (_tmp526_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID) {
+#line 8309 "Dialogs.c"
+			GtkWindow* _tmp527_;
+			ImportManifest* _tmp528_;
+			gchar* _tmp529_;
+			gchar* _tmp530_;
 #line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp557_ = dialog_parent;
+			_tmp527_ = dialog_parent;
 #line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp558_ = manifest;
+			_tmp528_ = manifest;
 #line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp559_ = import_ui_create_result_report_from_manifest (_tmp558_);
+			_tmp529_ = import_ui_create_result_report_from_manifest (_tmp528_);
 #line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp560_ = _tmp559_;
+			_tmp530_ = _tmp529_;
 #line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			import_ui_save_import_results (_tmp557_, _tmp560_);
+			import_ui_save_import_results (_tmp527_, _tmp530_);
 #line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_free0 (_tmp560_);
-#line 8535 "Dialogs.c"
+			_g_free0 (_tmp530_);
+#line 8326 "Dialogs.c"
 		}
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (dialog_parent);
@@ -8554,283 +8345,280 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_object_unref0 (ok_button);
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (save_results_button);
-#line 8543 "Dialogs.c"
+#line 8334 "Dialogs.c"
 	} else {
-		const gchar* _tmp561_ = NULL;
-		ImportUIQuestionParams* _tmp562_ = NULL;
-		const gchar* _tmp563_ = NULL;
-		gchar* _tmp564_ = NULL;
-		gchar* _tmp565_ = NULL;
-		gchar* _tmp566_ = NULL;
-		AppWindow* _tmp567_ = NULL;
-		AppWindow* _tmp568_ = NULL;
-		const gchar* _tmp569_ = NULL;
-		GtkMessageDialog* _tmp570_ = NULL;
-		GtkMessageDialog* _tmp571_ = NULL;
-		const gchar* _tmp572_ = NULL;
+		const gchar* _tmp531_;
+		ImportUIQuestionParams* _tmp532_;
+		const gchar* _tmp533_;
+		gchar* _tmp534_;
+		gchar* _tmp535_;
+		gchar* _tmp536_;
+		AppWindow* _tmp537_;
+		AppWindow* _tmp538_;
+		const gchar* _tmp539_;
+		GtkMessageDialog* _tmp540_;
+		GtkMessageDialog* _tmp541_;
 		GtkWidget* save_results_button = NULL;
-		GtkMessageDialog* _tmp573_ = NULL;
-		GtkWidget* _tmp574_ = NULL;
-		GtkWidget* _tmp575_ = NULL;
-		GtkWidget* _tmp576_ = NULL;
-		ImportManifest* _tmp577_ = NULL;
-		GeeList* _tmp578_ = NULL;
-		gint _tmp579_ = 0;
-		gint _tmp580_ = 0;
-		ImportManifest* _tmp581_ = NULL;
-		GeeList* _tmp582_ = NULL;
-		gint _tmp583_ = 0;
-		gint _tmp584_ = 0;
+		GtkMessageDialog* _tmp542_;
+		GtkWidget* _tmp543_;
+		GtkWidget* _tmp544_;
+		GtkWidget* _tmp545_;
+		ImportManifest* _tmp546_;
+		GeeList* _tmp547_;
+		gint _tmp548_;
+		gint _tmp549_;
+		ImportManifest* _tmp550_;
+		GeeList* _tmp551_;
+		gint _tmp552_;
+		gint _tmp553_;
 		GtkWidget* no_button = NULL;
-		GtkMessageDialog* _tmp585_ = NULL;
-		ImportUIQuestionParams* _tmp586_ = NULL;
-		const gchar* _tmp587_ = NULL;
-		GtkWidget* _tmp588_ = NULL;
-		GtkWidget* _tmp589_ = NULL;
-		GtkMessageDialog* _tmp590_ = NULL;
-		ImportUIQuestionParams* _tmp591_ = NULL;
-		const gchar* _tmp592_ = NULL;
-		GtkMessageDialog* _tmp593_ = NULL;
-		GtkWidget* _tmp594_ = NULL;
-		GtkMessageDialog* _tmp595_ = NULL;
-		gint _tmp596_ = 0;
-		GtkMessageDialog* _tmp604_ = NULL;
-		GtkMessageDialog* _tmp605_ = NULL;
+		GtkMessageDialog* _tmp554_;
+		ImportUIQuestionParams* _tmp555_;
+		const gchar* _tmp556_;
+		GtkWidget* _tmp557_;
+		GtkWidget* _tmp558_;
+		GtkMessageDialog* _tmp559_;
+		ImportUIQuestionParams* _tmp560_;
+		const gchar* _tmp561_;
+		GtkMessageDialog* _tmp562_;
+		GtkWidget* _tmp563_;
+		GtkMessageDialog* _tmp564_;
+		gint _tmp565_;
+		GtkMessageDialog* _tmp573_;
+		GtkMessageDialog* _tmp574_;
 #line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp561_ = message;
+		_tmp531_ = message;
 #line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp562_ = question;
+		_tmp532_ = question;
 #line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp563_ = _tmp562_->question;
+		_tmp533_ = _tmp532_->question;
 #line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp564_ = g_strconcat ("\n", _tmp563_, NULL);
+		_tmp534_ = g_strconcat ("\n", _tmp533_, NULL);
 #line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp565_ = _tmp564_;
+		_tmp535_ = _tmp534_;
 #line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp566_ = g_strconcat (_tmp561_, _tmp565_, NULL);
+		_tmp536_ = g_strconcat (_tmp531_, _tmp535_, NULL);
 #line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
 #line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		message = _tmp566_;
+		message = _tmp536_;
 #line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp565_);
+		_g_free0 (_tmp535_);
 #line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp567_ = app_window_get_instance ();
+		_tmp537_ = app_window_get_instance ();
 #line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp568_ = _tmp567_;
+		_tmp538_ = _tmp537_;
 #line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp569_ = message;
+		_tmp539_ = message;
 #line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp570_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp568_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp569_);
+		_tmp540_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp538_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp539_);
 #line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_ref_sink (_tmp570_);
+		g_object_ref_sink (_tmp540_);
 #line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (dialog);
 #line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		dialog = _tmp570_;
+		dialog = _tmp540_;
 #line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp568_);
-#line 888 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp571_ = dialog;
+		_g_object_unref0 (_tmp538_);
 #line 888 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp572_ = _ ("Import Complete");
+		_tmp541_ = dialog;
 #line 888 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp571_, gtk_window_get_type (), GtkWindow), _tmp572_);
+		gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp541_, gtk_window_get_type (), GtkWindow), _ ("Import Complete"));
 #line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp573_ = dialog;
+		_tmp542_ = dialog;
 #line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp574_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp573_, gtk_dialog_get_type (), GtkDialog), IMPORT_UI_SAVE_RESULTS_BUTTON_NAME, IMPORT_UI_SAVE_RESULTS_RESPONSE_ID);
+		_tmp543_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp542_, gtk_dialog_get_type (), GtkDialog), IMPORT_UI_SAVE_RESULTS_BUTTON_NAME, IMPORT_UI_SAVE_RESULTS_RESPONSE_ID);
 #line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp575_ = _g_object_ref0 (_tmp574_);
+		_tmp544_ = _g_object_ref0 (_tmp543_);
 #line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		save_results_button = _tmp575_;
+		save_results_button = _tmp544_;
 #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp576_ = save_results_button;
+		_tmp545_ = save_results_button;
 #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp577_ = manifest;
+		_tmp546_ = manifest;
 #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp578_ = _tmp577_->success;
+		_tmp547_ = _tmp546_->success;
 #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp579_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp578_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp548_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp547_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp580_ = _tmp579_;
+		_tmp549_ = _tmp548_;
 #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp581_ = manifest;
+		_tmp550_ = manifest;
 #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp582_ = _tmp581_->all;
+		_tmp551_ = _tmp550_->all;
 #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp583_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp582_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp552_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp551_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp584_ = _tmp583_;
+		_tmp553_ = _tmp552_;
 #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_visible (_tmp576_, _tmp580_ < _tmp584_);
+		gtk_widget_set_visible (_tmp545_, _tmp549_ < _tmp553_);
 #line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp585_ = dialog;
+		_tmp554_ = dialog;
 #line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp586_ = question;
+		_tmp555_ = question;
 #line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp587_ = _tmp586_->no_button;
+		_tmp556_ = _tmp555_->no_button;
 #line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp588_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp585_, gtk_dialog_get_type (), GtkDialog), _tmp587_, (gint) GTK_RESPONSE_NO);
+		_tmp557_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp554_, gtk_dialog_get_type (), GtkDialog), _tmp556_, (gint) GTK_RESPONSE_NO);
 #line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp589_ = _g_object_ref0 (_tmp588_);
+		_tmp558_ = _g_object_ref0 (_tmp557_);
 #line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		no_button = _tmp589_;
+		no_button = _tmp558_;
 #line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp590_ = dialog;
+		_tmp559_ = dialog;
 #line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp591_ = question;
+		_tmp560_ = question;
 #line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp592_ = _tmp591_->yes_button;
+		_tmp561_ = _tmp560_->yes_button;
 #line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp590_, gtk_dialog_get_type (), GtkDialog), _tmp592_, (gint) GTK_RESPONSE_YES);
+		gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp559_, gtk_dialog_get_type (), GtkDialog), _tmp561_, (gint) GTK_RESPONSE_YES);
 #line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp593_ = dialog;
+		_tmp562_ = dialog;
 #line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp594_ = no_button;
+		_tmp563_ = no_button;
 #line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp593_, gtk_window_get_type (), GtkWindow), _tmp594_);
+		gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp562_, gtk_window_get_type (), GtkWindow), _tmp563_);
 #line 896 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp595_ = dialog;
+		_tmp564_ = dialog;
 #line 896 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp596_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp595_, gtk_dialog_get_type (), GtkDialog));
+		_tmp565_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp564_, gtk_dialog_get_type (), GtkDialog));
 #line 896 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		dialog_response = _tmp596_;
+		dialog_response = _tmp565_;
 #line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 8687 "Dialogs.c"
-			gint _tmp597_ = 0;
-			GtkMessageDialog* _tmp598_ = NULL;
-			ImportManifest* _tmp599_ = NULL;
-			gchar* _tmp600_ = NULL;
-			gchar* _tmp601_ = NULL;
-			GtkMessageDialog* _tmp602_ = NULL;
-			gint _tmp603_ = 0;
+#line 8475 "Dialogs.c"
+			gint _tmp566_;
+			GtkMessageDialog* _tmp567_;
+			ImportManifest* _tmp568_;
+			gchar* _tmp569_;
+			gchar* _tmp570_;
+			GtkMessageDialog* _tmp571_;
+			gint _tmp572_;
 #line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp597_ = dialog_response;
+			_tmp566_ = dialog_response;
 #line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			if (!(_tmp597_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID)) {
+			if (!(_tmp566_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID)) {
 #line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 8701 "Dialogs.c"
+#line 8489 "Dialogs.c"
 			}
 #line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp598_ = dialog;
+			_tmp567_ = dialog;
 #line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp599_ = manifest;
+			_tmp568_ = manifest;
 #line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp600_ = import_ui_create_result_report_from_manifest (_tmp599_);
+			_tmp569_ = import_ui_create_result_report_from_manifest (_tmp568_);
 #line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp601_ = _tmp600_;
+			_tmp570_ = _tmp569_;
 #line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			import_ui_save_import_results (G_TYPE_CHECK_INSTANCE_CAST (_tmp598_, gtk_window_get_type (), GtkWindow), _tmp601_);
+			import_ui_save_import_results (G_TYPE_CHECK_INSTANCE_CAST (_tmp567_, gtk_window_get_type (), GtkWindow), _tmp570_);
 #line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_free0 (_tmp601_);
+			_g_free0 (_tmp570_);
 #line 899 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp602_ = dialog;
+			_tmp571_ = dialog;
 #line 899 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp603_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp602_, gtk_dialog_get_type (), GtkDialog));
+			_tmp572_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp571_, gtk_dialog_get_type (), GtkDialog));
 #line 899 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			dialog_response = _tmp603_;
-#line 8721 "Dialogs.c"
+			dialog_response = _tmp572_;
+#line 8509 "Dialogs.c"
 		}
 #line 902 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp604_ = dialog;
+		_tmp573_ = dialog;
 #line 902 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp604_, gtk_widget_get_type (), GtkWidget));
+		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp573_, gtk_widget_get_type (), GtkWidget));
 #line 903 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp605_ = dialog;
+		_tmp574_ = dialog;
 #line 903 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp605_, gtk_widget_get_type (), GtkWidget));
+		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp574_, gtk_widget_get_type (), GtkWidget));
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (no_button);
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (save_results_button);
-#line 8735 "Dialogs.c"
+#line 8523 "Dialogs.c"
 	}
 #line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp606_ = dialog_response;
+	_tmp575_ = dialog_response;
 #line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = _tmp606_ == ((gint) GTK_RESPONSE_YES);
+	result = _tmp575_ == ((gint) GTK_RESPONSE_YES);
 #line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
 #line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (message);
 #line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 8747 "Dialogs.c"
+#line 8535 "Dialogs.c"
 }
 
 
 static guint8* string_get_data (const gchar* self, int* result_length1) {
 	guint8* result;
 	guint8* res = NULL;
-	gint res_length1 = 0;
-	gint _res_size_ = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	guint8* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	guint8* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint res_length1;
+	gint _res_size_;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	guint8* _tmp3_;
+	gint _tmp3__length1;
+	guint8* _tmp4_;
+	gint _tmp4__length1;
+#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 8791 "Dialogs.c"
+#line 8579 "Dialogs.c"
 	}
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 8797 "Dialogs.c"
+#line 8585 "Dialogs.c"
 }
 
 
 void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gchar* results_log) {
 	GtkFileChooserDialog* chooser_dialog = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	GtkFileChooserDialog* _tmp1_ = NULL;
-	GtkFileChooserDialog* _tmp2_ = NULL;
-	GtkFileChooserDialog* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GtkFileChooserDialog* _tmp5_ = NULL;
-	GtkFileChooserDialog* _tmp6_ = NULL;
+	GtkWindow* _tmp0_;
+	GtkFileChooserDialog* _tmp1_;
+	GtkFileChooserDialog* _tmp2_;
+	GtkFileChooserDialog* _tmp3_;
+	const gchar* _tmp4_;
+	GtkFileChooserDialog* _tmp5_;
+	GtkFileChooserDialog* _tmp6_;
 	gint dialog_result = 0;
-	GtkFileChooserDialog* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
+	GtkFileChooserDialog* _tmp7_;
+	gint _tmp8_;
 	GFile* chosen_file = NULL;
-	GtkFileChooserDialog* _tmp9_ = NULL;
-	GFile* _tmp10_ = NULL;
-	GtkFileChooserDialog* _tmp11_ = NULL;
-	GtkFileChooserDialog* _tmp12_ = NULL;
+	GtkFileChooserDialog* _tmp9_;
+	GFile* _tmp10_;
+	GtkFileChooserDialog* _tmp11_;
+	GtkFileChooserDialog* _tmp12_;
 	gboolean _tmp13_ = FALSE;
-	gint _tmp14_ = 0;
+	gint _tmp14_;
 	GError * _inner_error_ = NULL;
 #line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail ((chooser_dialog_parent == NULL) || GTK_IS_WINDOW (chooser_dialog_parent));
@@ -8886,32 +8674,32 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 	_tmp14_ = dialog_result;
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 8875 "Dialogs.c"
-		GFile* _tmp15_ = NULL;
+#line 8663 "Dialogs.c"
+		GFile* _tmp15_;
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = chosen_file;
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _tmp15_ != NULL;
-#line 8881 "Dialogs.c"
+#line 8669 "Dialogs.c"
 	} else {
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = FALSE;
-#line 8885 "Dialogs.c"
+#line 8673 "Dialogs.c"
 	}
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp13_) {
-#line 8889 "Dialogs.c"
+#line 8677 "Dialogs.c"
 		{
 			GFileOutputStream* outstream = NULL;
-			GFile* _tmp16_ = NULL;
-			GFileOutputStream* _tmp17_ = NULL;
-			GFileOutputStream* _tmp18_ = NULL;
-			const gchar* _tmp19_ = NULL;
-			guint8* _tmp20_ = NULL;
-			gint _tmp20__length1 = 0;
-			guint8* _tmp21_ = NULL;
-			gint _tmp21__length1 = 0;
-			GFileOutputStream* _tmp22_ = NULL;
+			GFile* _tmp16_;
+			GFileOutputStream* _tmp17_;
+			GFileOutputStream* _tmp18_;
+			const gchar* _tmp19_;
+			guint8* _tmp20_;
+			gint _tmp20__length1;
+			guint8* _tmp21_;
+			gint _tmp21__length1;
+			GFileOutputStream* _tmp22_;
 #line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp16_ = chosen_file;
 #line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -8920,8 +8708,8 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			outstream = _tmp17_;
 #line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8909 "Dialogs.c"
-				goto __catch424_g_error;
+#line 8697 "Dialogs.c"
+				goto __catch425_g_error;
 			}
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = outstream;
@@ -8939,8 +8727,8 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
-#line 8928 "Dialogs.c"
-				goto __catch424_g_error;
+#line 8716 "Dialogs.c"
+				goto __catch425_g_error;
 			}
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = outstream;
@@ -8950,22 +8738,22 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
-#line 8939 "Dialogs.c"
-				goto __catch424_g_error;
+#line 8727 "Dialogs.c"
+				goto __catch425_g_error;
 			}
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (outstream);
-#line 8944 "Dialogs.c"
+#line 8732 "Dialogs.c"
 		}
-		goto __finally424;
-		__catch424_g_error:
+		goto __finally425;
+		__catch425_g_error:
 		{
 			GError* err = NULL;
-			GFile* _tmp23_ = NULL;
-			gchar* _tmp24_ = NULL;
-			gchar* _tmp25_ = NULL;
-			GError* _tmp26_ = NULL;
-			const gchar* _tmp27_ = NULL;
+			GFile* _tmp23_;
+			gchar* _tmp24_;
+			gchar* _tmp25_;
+			GError* _tmp26_;
+			const gchar* _tmp27_;
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			err = _inner_error_;
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -8986,9 +8774,9 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			_g_free0 (_tmp25_);
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_error_free0 (err);
-#line 8975 "Dialogs.c"
+#line 8763 "Dialogs.c"
 		}
-		__finally424:
+		__finally425:
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9001,14 +8789,14 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			g_clear_error (&_inner_error_);
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return;
-#line 8990 "Dialogs.c"
+#line 8778 "Dialogs.c"
 		}
 	}
 #line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (chosen_file);
 #line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (chooser_dialog);
-#line 8997 "Dialogs.c"
+#line 8785 "Dialogs.c"
 }
 
 
@@ -9017,25 +8805,25 @@ static gboolean _text_entry_dialog_mediator_on_modify_validate_text_entry_dialog
 	result = text_entry_dialog_mediator_on_modify_validate ((TextEntryDialogMediator*) self, text);
 #line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9006 "Dialogs.c"
+#line 8794 "Dialogs.c"
 }
 
 
 TextEntryDialogMediator* text_entry_dialog_mediator_construct (GType object_type, const gchar* title, const gchar* label, const gchar* initial_text, GeeCollection* completion_list, const gchar* completion_delimiter) {
 	TextEntryDialogMediator* self = NULL;
 	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	TextEntryDialog* _tmp1_ = NULL;
-	TextEntryDialog* _tmp2_ = NULL;
-	GtkBox* _tmp3_ = NULL;
-	GObject* _tmp4_ = NULL;
-	TextEntryDialog* _tmp5_ = NULL;
-	TextEntryDialog* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	GeeCollection* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
+	GtkBuilder* _tmp0_;
+	TextEntryDialog* _tmp1_;
+	TextEntryDialog* _tmp2_;
+	GtkBox* _tmp3_;
+	GObject* _tmp4_;
+	TextEntryDialog* _tmp5_;
+	TextEntryDialog* _tmp6_;
+	const gchar* _tmp7_;
+	const gchar* _tmp8_;
+	const gchar* _tmp9_;
+	GeeCollection* _tmp10_;
+	const gchar* _tmp11_;
 #line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, NULL);
 #line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9086,7 +8874,7 @@ TextEntryDialogMediator* text_entry_dialog_mediator_construct (GType object_type
 	_g_object_unref0 (builder);
 #line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 9075 "Dialogs.c"
+#line 8863 "Dialogs.c"
 }
 
 
@@ -9098,7 +8886,7 @@ static gboolean text_entry_dialog_mediator_real_on_modify_validate (TextEntryDia
 	result = TRUE;
 #line 950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9087 "Dialogs.c"
+#line 8875 "Dialogs.c"
 }
 
 
@@ -9107,14 +8895,14 @@ gboolean text_entry_dialog_mediator_on_modify_validate (TextEntryDialogMediator*
 	g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG_MEDIATOR (self), FALSE);
 #line 949 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->on_modify_validate (self, text);
-#line 9096 "Dialogs.c"
+#line 8884 "Dialogs.c"
 }
 
 
 gchar* _text_entry_dialog_mediator_execute (TextEntryDialogMediator* self) {
 	gchar* result = NULL;
-	TextEntryDialog* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	TextEntryDialog* _tmp0_;
+	gchar* _tmp1_;
 #line 953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG_MEDIATOR (self), NULL);
 #line 954 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9125,14 +8913,14 @@ gchar* _text_entry_dialog_mediator_execute (TextEntryDialogMediator* self) {
 	result = _tmp1_;
 #line 954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9114 "Dialogs.c"
+#line 8902 "Dialogs.c"
 }
 
 
 static void value_text_entry_dialog_mediator_init (GValue* value) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 9121 "Dialogs.c"
+#line 8909 "Dialogs.c"
 }
 
 
@@ -9141,7 +8929,7 @@ static void value_text_entry_dialog_mediator_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (value->data[0].v_pointer);
-#line 9130 "Dialogs.c"
+#line 8918 "Dialogs.c"
 	}
 }
 
@@ -9151,11 +8939,11 @@ static void value_text_entry_dialog_mediator_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = text_entry_dialog_mediator_ref (src_value->data[0].v_pointer);
-#line 9140 "Dialogs.c"
+#line 8928 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9144 "Dialogs.c"
+#line 8932 "Dialogs.c"
 	}
 }
 
@@ -9163,66 +8951,66 @@ static void value_text_entry_dialog_mediator_copy_value (const GValue* src_value
 static gpointer value_text_entry_dialog_mediator_peek_pointer (const GValue* value) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9152 "Dialogs.c"
+#line 8940 "Dialogs.c"
 }
 
 
 static gchar* value_text_entry_dialog_mediator_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 9159 "Dialogs.c"
-		TextEntryDialogMediator* object;
+#line 8947 "Dialogs.c"
+		TextEntryDialogMediator * object;
 		object = collect_values[0].v_pointer;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9166 "Dialogs.c"
+#line 8954 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9170 "Dialogs.c"
+#line 8958 "Dialogs.c"
 		}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = text_entry_dialog_mediator_ref (object);
-#line 9174 "Dialogs.c"
+#line 8962 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9178 "Dialogs.c"
+#line 8966 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9182 "Dialogs.c"
+#line 8970 "Dialogs.c"
 }
 
 
 static gchar* value_text_entry_dialog_mediator_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	TextEntryDialogMediator** object_p;
+	TextEntryDialogMediator ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9193 "Dialogs.c"
+#line 8981 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 9199 "Dialogs.c"
+#line 8987 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9203 "Dialogs.c"
+#line 8991 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9207 "Dialogs.c"
+#line 8995 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9211 "Dialogs.c"
+#line 8999 "Dialogs.c"
 }
 
 
@@ -9236,7 +9024,7 @@ GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 9225 "Dialogs.c"
+#line 9013 "Dialogs.c"
 }
 
 
@@ -9245,12 +9033,12 @@ gpointer value_get_text_entry_dialog_mediator (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR), NULL);
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9234 "Dialogs.c"
+#line 9022 "Dialogs.c"
 }
 
 
 void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
-	TextEntryDialogMediator* old;
+	TextEntryDialogMediator * old;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR));
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9265,23 +9053,23 @@ void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9254 "Dialogs.c"
+#line 9042 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9258 "Dialogs.c"
+#line 9046 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (old);
-#line 9264 "Dialogs.c"
+#line 9052 "Dialogs.c"
 	}
 }
 
 
 void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
-	TextEntryDialogMediator* old;
+	TextEntryDialogMediator * old;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR));
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9294,17 +9082,17 @@ void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 9283 "Dialogs.c"
+#line 9071 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9287 "Dialogs.c"
+#line 9075 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (old);
-#line 9293 "Dialogs.c"
+#line 9081 "Dialogs.c"
 	}
 }
 
@@ -9317,8 +9105,8 @@ static void text_entry_dialog_mediator_class_init (TextEntryDialogMediatorClass
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (TextEntryDialogMediatorPrivate));
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(TextEntryDialogMediator*, const gchar*)) text_entry_dialog_mediator_real_on_modify_validate;
-#line 9307 "Dialogs.c"
+	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (TextEntryDialogMediator *, const gchar*)) text_entry_dialog_mediator_real_on_modify_validate;
+#line 9095 "Dialogs.c"
 }
 
 
@@ -9327,11 +9115,11 @@ static void text_entry_dialog_mediator_instance_init (TextEntryDialogMediator *
 	self->priv = TEXT_ENTRY_DIALOG_MEDIATOR_GET_PRIVATE (self);
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 9316 "Dialogs.c"
+#line 9104 "Dialogs.c"
 }
 
 
-static void text_entry_dialog_mediator_finalize (TextEntryDialogMediator* obj) {
+static void text_entry_dialog_mediator_finalize (TextEntryDialogMediator * obj) {
 	TextEntryDialogMediator * self;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator);
@@ -9339,7 +9127,7 @@ static void text_entry_dialog_mediator_finalize (TextEntryDialogMediator* obj) {
 	g_signal_handlers_destroy (self);
 #line 938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 9328 "Dialogs.c"
+#line 9116 "Dialogs.c"
 }
 
 
@@ -9358,18 +9146,18 @@ GType text_entry_dialog_mediator_get_type (void) {
 
 
 gpointer text_entry_dialog_mediator_ref (gpointer instance) {
-	TextEntryDialogMediator* self;
+	TextEntryDialogMediator * self;
 	self = instance;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 9353 "Dialogs.c"
+#line 9141 "Dialogs.c"
 }
 
 
 void text_entry_dialog_mediator_unref (gpointer instance) {
-	TextEntryDialogMediator* self;
+	TextEntryDialogMediator * self;
 	self = instance;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -9377,7 +9165,7 @@ void text_entry_dialog_mediator_unref (gpointer instance) {
 		TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->finalize (self);
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9366 "Dialogs.c"
+#line 9154 "Dialogs.c"
 	}
 }
 
@@ -9387,23 +9175,23 @@ static gboolean _multi_text_entry_dialog_mediator_on_modify_validate_multi_text_
 	result = multi_text_entry_dialog_mediator_on_modify_validate ((MultiTextEntryDialogMediator*) self, text);
 #line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9376 "Dialogs.c"
+#line 9164 "Dialogs.c"
 }
 
 
 MultiTextEntryDialogMediator* multi_text_entry_dialog_mediator_construct (GType object_type, const gchar* title, const gchar* label, const gchar* initial_text) {
 	MultiTextEntryDialogMediator* self = NULL;
 	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	MultiTextEntryDialog* _tmp1_ = NULL;
-	MultiTextEntryDialog* _tmp2_ = NULL;
-	GtkBox* _tmp3_ = NULL;
-	GObject* _tmp4_ = NULL;
-	MultiTextEntryDialog* _tmp5_ = NULL;
-	MultiTextEntryDialog* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
+	GtkBuilder* _tmp0_;
+	MultiTextEntryDialog* _tmp1_;
+	MultiTextEntryDialog* _tmp2_;
+	GtkBox* _tmp3_;
+	GObject* _tmp4_;
+	MultiTextEntryDialog* _tmp5_;
+	MultiTextEntryDialog* _tmp6_;
+	const gchar* _tmp7_;
+	const gchar* _tmp8_;
+	const gchar* _tmp9_;
 #line 961 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, NULL);
 #line 961 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9448,7 +9236,7 @@ MultiTextEntryDialogMediator* multi_text_entry_dialog_mediator_construct (GType
 	_g_object_unref0 (builder);
 #line 961 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 9437 "Dialogs.c"
+#line 9225 "Dialogs.c"
 }
 
 
@@ -9460,7 +9248,7 @@ static gboolean multi_text_entry_dialog_mediator_real_on_modify_validate (MultiT
 	result = TRUE;
 #line 970 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9449 "Dialogs.c"
+#line 9237 "Dialogs.c"
 }
 
 
@@ -9469,14 +9257,14 @@ gboolean multi_text_entry_dialog_mediator_on_modify_validate (MultiTextEntryDial
 	g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR (self), FALSE);
 #line 969 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->on_modify_validate (self, text);
-#line 9458 "Dialogs.c"
+#line 9246 "Dialogs.c"
 }
 
 
 gchar* _multi_text_entry_dialog_mediator_execute (MultiTextEntryDialogMediator* self) {
 	gchar* result = NULL;
-	MultiTextEntryDialog* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	MultiTextEntryDialog* _tmp0_;
+	gchar* _tmp1_;
 #line 973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR (self), NULL);
 #line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9487,14 +9275,14 @@ gchar* _multi_text_entry_dialog_mediator_execute (MultiTextEntryDialogMediator*
 	result = _tmp1_;
 #line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9476 "Dialogs.c"
+#line 9264 "Dialogs.c"
 }
 
 
 static void value_multi_text_entry_dialog_mediator_init (GValue* value) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 9483 "Dialogs.c"
+#line 9271 "Dialogs.c"
 }
 
 
@@ -9503,7 +9291,7 @@ static void value_multi_text_entry_dialog_mediator_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (value->data[0].v_pointer);
-#line 9492 "Dialogs.c"
+#line 9280 "Dialogs.c"
 	}
 }
 
@@ -9513,11 +9301,11 @@ static void value_multi_text_entry_dialog_mediator_copy_value (const GValue* src
 	if (src_value->data[0].v_pointer) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = multi_text_entry_dialog_mediator_ref (src_value->data[0].v_pointer);
-#line 9502 "Dialogs.c"
+#line 9290 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9506 "Dialogs.c"
+#line 9294 "Dialogs.c"
 	}
 }
 
@@ -9525,66 +9313,66 @@ static void value_multi_text_entry_dialog_mediator_copy_value (const GValue* src
 static gpointer value_multi_text_entry_dialog_mediator_peek_pointer (const GValue* value) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9514 "Dialogs.c"
+#line 9302 "Dialogs.c"
 }
 
 
 static gchar* value_multi_text_entry_dialog_mediator_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 9521 "Dialogs.c"
-		MultiTextEntryDialogMediator* object;
+#line 9309 "Dialogs.c"
+		MultiTextEntryDialogMediator * object;
 		object = collect_values[0].v_pointer;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9528 "Dialogs.c"
+#line 9316 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9532 "Dialogs.c"
+#line 9320 "Dialogs.c"
 		}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = multi_text_entry_dialog_mediator_ref (object);
-#line 9536 "Dialogs.c"
+#line 9324 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9540 "Dialogs.c"
+#line 9328 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9544 "Dialogs.c"
+#line 9332 "Dialogs.c"
 }
 
 
 static gchar* value_multi_text_entry_dialog_mediator_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	MultiTextEntryDialogMediator** object_p;
+	MultiTextEntryDialogMediator ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9555 "Dialogs.c"
+#line 9343 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 9561 "Dialogs.c"
+#line 9349 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9565 "Dialogs.c"
+#line 9353 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = multi_text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9569 "Dialogs.c"
+#line 9357 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9573 "Dialogs.c"
+#line 9361 "Dialogs.c"
 }
 
 
@@ -9598,7 +9386,7 @@ GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 9587 "Dialogs.c"
+#line 9375 "Dialogs.c"
 }
 
 
@@ -9607,12 +9395,12 @@ gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR), NULL);
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9596 "Dialogs.c"
+#line 9384 "Dialogs.c"
 }
 
 
 void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
-	MultiTextEntryDialogMediator* old;
+	MultiTextEntryDialogMediator * old;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR));
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9627,23 +9415,23 @@ void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_objec
 		value->data[0].v_pointer = v_object;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9616 "Dialogs.c"
+#line 9404 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9620 "Dialogs.c"
+#line 9408 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (old);
-#line 9626 "Dialogs.c"
+#line 9414 "Dialogs.c"
 	}
 }
 
 
 void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
-	MultiTextEntryDialogMediator* old;
+	MultiTextEntryDialogMediator * old;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR));
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9656,17 +9444,17 @@ void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_obje
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 9645 "Dialogs.c"
+#line 9433 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9649 "Dialogs.c"
+#line 9437 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (old);
-#line 9655 "Dialogs.c"
+#line 9443 "Dialogs.c"
 	}
 }
 
@@ -9679,8 +9467,8 @@ static void multi_text_entry_dialog_mediator_class_init (MultiTextEntryDialogMed
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (MultiTextEntryDialogMediatorPrivate));
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(MultiTextEntryDialogMediator*, const gchar*)) multi_text_entry_dialog_mediator_real_on_modify_validate;
-#line 9669 "Dialogs.c"
+	((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (MultiTextEntryDialogMediator *, const gchar*)) multi_text_entry_dialog_mediator_real_on_modify_validate;
+#line 9457 "Dialogs.c"
 }
 
 
@@ -9689,11 +9477,11 @@ static void multi_text_entry_dialog_mediator_instance_init (MultiTextEntryDialog
 	self->priv = MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_PRIVATE (self);
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 9678 "Dialogs.c"
+#line 9466 "Dialogs.c"
 }
 
 
-static void multi_text_entry_dialog_mediator_finalize (MultiTextEntryDialogMediator* obj) {
+static void multi_text_entry_dialog_mediator_finalize (MultiTextEntryDialogMediator * obj) {
 	MultiTextEntryDialogMediator * self;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR, MultiTextEntryDialogMediator);
@@ -9701,7 +9489,7 @@ static void multi_text_entry_dialog_mediator_finalize (MultiTextEntryDialogMedia
 	g_signal_handlers_destroy (self);
 #line 959 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 9690 "Dialogs.c"
+#line 9478 "Dialogs.c"
 }
 
 
@@ -9720,18 +9508,18 @@ GType multi_text_entry_dialog_mediator_get_type (void) {
 
 
 gpointer multi_text_entry_dialog_mediator_ref (gpointer instance) {
-	MultiTextEntryDialogMediator* self;
+	MultiTextEntryDialogMediator * self;
 	self = instance;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 9715 "Dialogs.c"
+#line 9503 "Dialogs.c"
 }
 
 
 void multi_text_entry_dialog_mediator_unref (gpointer instance) {
-	MultiTextEntryDialogMediator* self;
+	MultiTextEntryDialogMediator * self;
 	self = instance;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -9739,33 +9527,33 @@ void multi_text_entry_dialog_mediator_unref (gpointer instance) {
 		MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->finalize (self);
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9728 "Dialogs.c"
+#line 9516 "Dialogs.c"
 	}
 }
 
 
 gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_text, gboolean should_escape) {
 	gchar* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
+	gboolean _tmp0_;
+	const gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
 #line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = should_escape;
 #line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 9746 "Dialogs.c"
-		const gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
+#line 9534 "Dialogs.c"
+		const gchar* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
 #line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = primary_text;
 #line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9790,7 +9578,7 @@ gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_
 		result = _tmp8_;
 #line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 9779 "Dialogs.c"
+#line 9567 "Dialogs.c"
 	}
 #line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = primary_text;
@@ -9810,7 +9598,7 @@ gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_
 	result = _tmp14_;
 #line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9799 "Dialogs.c"
+#line 9587 "Dialogs.c"
 }
 
 
@@ -9819,19 +9607,19 @@ static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_fu
 	result = entry_multi_completion_match_func ((EntryMultiCompletion*) self, completion, key, iter);
 #line 1003 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9808 "Dialogs.c"
+#line 9596 "Dialogs.c"
 }
 
 
 EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCollection* completion_list, const gchar* delimiter) {
 	EntryMultiCompletion * self = NULL;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GeeCollection* _tmp7_ = NULL;
-	GtkListStore* _tmp8_ = NULL;
-	GtkListStore* _tmp9_ = NULL;
+	const gchar* _tmp1_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	GeeCollection* _tmp7_;
+	GtkListStore* _tmp8_;
+	GtkListStore* _tmp9_;
 #line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (completion_list), NULL);
 #line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9842,11 +9630,11 @@ EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCo
 	if (_tmp1_ == NULL) {
 #line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 9831 "Dialogs.c"
+#line 9619 "Dialogs.c"
 	} else {
-		const gchar* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		const gchar* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = delimiter;
 #line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9855,7 +9643,7 @@ EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCo
 		_tmp4_ = _tmp3_;
 #line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp4_ == 1;
-#line 9844 "Dialogs.c"
+#line 9632 "Dialogs.c"
 	}
 #line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp0_, "delimiter == null || delimiter.length == 1");
@@ -9883,25 +9671,25 @@ EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCo
 	gtk_entry_completion_set_match_func (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), _entry_multi_completion_match_func_gtk_entry_completion_match_func, g_object_ref (self), g_object_unref);
 #line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 9872 "Dialogs.c"
+#line 9660 "Dialogs.c"
 }
 
 
 EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, const gchar* delimiter) {
 #line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return entry_multi_completion_construct (TYPE_ENTRY_MULTI_COMPLETION, completion_list, delimiter);
-#line 9879 "Dialogs.c"
+#line 9667 "Dialogs.c"
 }
 
 
 static GtkListStore* entry_multi_completion_create_completion_store (GeeCollection* completion_list) {
 	GtkListStore* result = NULL;
 	GtkListStore* completion_store = NULL;
-	GtkListStore* _tmp0_ = NULL;
+	GtkListStore* _tmp0_;
 	GtkTreeIter store_iter = {0};
 	GeeIterator* completion_iter = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeIterator* _tmp2_ = NULL;
+	GeeCollection* _tmp1_;
+	GeeIterator* _tmp2_;
 #line 1006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (completion_list), NULL);
 #line 1007 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9916,16 +9704,16 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 	completion_iter = _tmp2_;
 #line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	while (TRUE) {
-#line 9905 "Dialogs.c"
-		GeeIterator* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-		GtkListStore* _tmp5_ = NULL;
+#line 9693 "Dialogs.c"
+		GeeIterator* _tmp3_;
+		gboolean _tmp4_;
+		GtkListStore* _tmp5_;
 		GtkTreeIter _tmp6_ = {0};
-		GtkListStore* _tmp7_ = NULL;
-		GtkTreeIter _tmp8_ = {0};
-		GeeIterator* _tmp9_ = NULL;
-		gpointer _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
+		GtkListStore* _tmp7_;
+		GtkTreeIter _tmp8_;
+		GeeIterator* _tmp9_;
+		gpointer _tmp10_;
+		gchar* _tmp11_;
 #line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = completion_iter;
 #line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9934,7 +9722,7 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 		if (!_tmp4_) {
 #line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			break;
-#line 9923 "Dialogs.c"
+#line 9711 "Dialogs.c"
 		}
 #line 1011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = completion_store;
@@ -9956,7 +9744,7 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 		gtk_list_store_set (_tmp7_, &_tmp8_, 0, _tmp11_, -1, -1);
 #line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp11_);
-#line 9945 "Dialogs.c"
+#line 9733 "Dialogs.c"
 	}
 #line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = completion_store;
@@ -9964,89 +9752,89 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 	_g_object_unref0 (completion_iter);
 #line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9953 "Dialogs.c"
+#line 9741 "Dialogs.c"
 }
 
 
 static gchar* string_strip (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 9976 "Dialogs.c"
+#line 9764 "Dialogs.c"
 }
 
 
 static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 9996 "Dialogs.c"
+#line 9784 "Dialogs.c"
 }
 
 
 static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) {
 	gint result = 0;
 	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	gunichar _tmp1_ = 0U;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint _tmp0_;
+	gunichar _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1041 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 10021 "Dialogs.c"
-		gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 9809 "Dialogs.c"
+		gchar* _tmp4_;
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 10029 "Dialogs.c"
+#line 9817 "Dialogs.c"
 	} else {
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 10035 "Dialogs.c"
+#line 9823 "Dialogs.c"
 	}
 }
 
@@ -10054,20 +9842,20 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter) {
 	gboolean result = FALSE;
 	GtkTreeModel* model = NULL;
-	GtkEntryCompletion* _tmp0_ = NULL;
-	GtkTreeModel* _tmp1_ = NULL;
-	GtkTreeModel* _tmp2_ = NULL;
+	GtkEntryCompletion* _tmp0_;
+	GtkTreeModel* _tmp1_;
+	GtkTreeModel* _tmp2_;
 	gchar* possible_match = NULL;
-	GtkTreeModel* _tmp3_ = NULL;
-	GtkTreeIter _tmp4_ = {0};
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	GtkTreeModel* _tmp3_;
+	GtkTreeIter _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
 	gchar* normed_key = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
+	const gchar* _tmp9_;
+	gchar* _tmp10_;
+	const gchar* _tmp11_;
 #line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ENTRY_MULTI_COMPLETION (self), FALSE);
 #line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10114,13 +9902,13 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 	_tmp11_ = self->priv->delimiter;
 #line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp11_ == NULL) {
-#line 10103 "Dialogs.c"
-		const gchar* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gboolean _tmp16_ = FALSE;
-		gboolean _tmp17_ = FALSE;
+#line 9891 "Dialogs.c"
+		const gchar* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		gboolean _tmp16_;
+		gboolean _tmp17_;
 #line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = possible_match;
 #line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10145,27 +9933,27 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 		_g_object_unref0 (model);
 #line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10134 "Dialogs.c"
+#line 9922 "Dialogs.c"
 	} else {
-		const gchar* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		gboolean _tmp20_ = FALSE;
+		const gchar* _tmp18_;
+		const gchar* _tmp19_;
+		gboolean _tmp20_;
 		gchar* last_part = NULL;
-		const gchar* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
-		gchar* _tmp33_ = NULL;
-		const gchar* _tmp34_ = NULL;
-		gchar* _tmp35_ = NULL;
-		gchar* _tmp36_ = NULL;
-		const gchar* _tmp37_ = NULL;
-		gint _tmp38_ = 0;
-		gint _tmp39_ = 0;
-		const gchar* _tmp40_ = NULL;
-		const gchar* _tmp41_ = NULL;
-		gchar* _tmp42_ = NULL;
-		gchar* _tmp43_ = NULL;
-		gboolean _tmp44_ = FALSE;
-		gboolean _tmp45_ = FALSE;
+		const gchar* _tmp31_;
+		gchar* _tmp32_;
+		gchar* _tmp33_;
+		const gchar* _tmp34_;
+		gchar* _tmp35_;
+		gchar* _tmp36_;
+		const gchar* _tmp37_;
+		gint _tmp38_;
+		gint _tmp39_;
+		const gchar* _tmp40_;
+		const gchar* _tmp41_;
+		gchar* _tmp42_;
+		gchar* _tmp43_;
+		gboolean _tmp44_;
+		gboolean _tmp45_;
 #line 1033 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = normed_key;
 #line 1033 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10174,19 +9962,19 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 		_tmp20_ = string_contains (_tmp18_, _tmp19_);
 #line 1033 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp20_) {
-#line 10163 "Dialogs.c"
+#line 9951 "Dialogs.c"
 			gint offset = 0;
-			const gchar* _tmp21_ = NULL;
-			const gchar* _tmp22_ = NULL;
-			const gchar* _tmp23_ = NULL;
-			gchar _tmp24_ = '\0';
-			gint _tmp25_ = 0;
-			gint _tmp26_ = 0;
+			const gchar* _tmp21_;
+			const gchar* _tmp22_;
+			const gchar* _tmp23_;
+			gchar _tmp24_;
+			gint _tmp25_;
+			gint _tmp26_;
 			gint position = 0;
-			GtkWidget* _tmp27_ = NULL;
-			gint _tmp28_ = 0;
-			gint _tmp29_ = 0;
-			gint _tmp30_ = 0;
+			GtkWidget* _tmp27_;
+			gint _tmp28_;
+			gint _tmp29_;
+			gint _tmp30_;
 #line 1035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21_ = normed_key;
 #line 1035 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10223,7 +10011,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 				_g_object_unref0 (model);
 #line 1038 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 10212 "Dialogs.c"
+#line 10000 "Dialogs.c"
 			}
 		}
 #line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10262,7 +10050,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 			_g_object_unref0 (model);
 #line 1044 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 10251 "Dialogs.c"
+#line 10039 "Dialogs.c"
 		}
 #line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp40_ = possible_match;
@@ -10290,7 +10078,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 		_g_object_unref0 (model);
 #line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10279 "Dialogs.c"
+#line 10067 "Dialogs.c"
 	}
 #line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (normed_key);
@@ -10298,50 +10086,50 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 	_g_free0 (possible_match);
 #line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (model);
-#line 10287 "Dialogs.c"
+#line 10075 "Dialogs.c"
 }
 
 
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 10310 "Dialogs.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 10098 "Dialogs.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 10318 "Dialogs.c"
+#line 10106 "Dialogs.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 10330 "Dialogs.c"
+#line 10118 "Dialogs.c"
 	}
 }
 
@@ -10350,123 +10138,123 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 10354 "Dialogs.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 10142 "Dialogs.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 10360 "Dialogs.c"
+#line 10148 "Dialogs.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 10364 "Dialogs.c"
+#line 10152 "Dialogs.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 10368 "Dialogs.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 10156 "Dialogs.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 10380 "Dialogs.c"
+#line 10168 "Dialogs.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 10390 "Dialogs.c"
+#line 10178 "Dialogs.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 10396 "Dialogs.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 10184 "Dialogs.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 10410 "Dialogs.c"
+#line 10198 "Dialogs.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 10420 "Dialogs.c"
+#line 10208 "Dialogs.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 10426 "Dialogs.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 10214 "Dialogs.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 10435 "Dialogs.c"
+#line 10223 "Dialogs.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 10455 "Dialogs.c"
+#line 10243 "Dialogs.c"
 }
 
 
@@ -10474,34 +10262,34 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 	EntryMultiCompletion * self;
 	gboolean result = FALSE;
 	gchar* match = NULL;
-	GtkTreeModel* _tmp0_ = NULL;
-	GtkTreeIter _tmp1_ = {0};
+	GtkTreeModel* _tmp0_;
+	GtkTreeIter _tmp1_;
 	GtkEntry* entry = NULL;
-	GtkWidget* _tmp2_ = NULL;
-	GtkEntry* _tmp3_ = NULL;
+	GtkWidget* _tmp2_;
+	GtkEntry* _tmp3_;
 	gchar* old_text = NULL;
-	GtkEntry* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
+	GtkEntry* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	const gchar* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
 	const gchar* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
+	const gchar* _tmp25_;
 	gchar* new_text = NULL;
-	const gchar* _tmp26_ = NULL;
-	const gchar* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
-	const gchar* _tmp30_ = NULL;
-	gchar* _tmp31_ = NULL;
-	gchar* _tmp32_ = NULL;
-	gchar* _tmp33_ = NULL;
-	gchar* _tmp34_ = NULL;
-	GtkEntry* _tmp35_ = NULL;
-	GtkEntry* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
+	const gchar* _tmp26_;
+	const gchar* _tmp27_;
+	gchar* _tmp28_;
+	gchar* _tmp29_;
+	const gchar* _tmp30_;
+	gchar* _tmp31_;
+	gchar* _tmp32_;
+	gchar* _tmp33_;
+	gchar* _tmp34_;
+	GtkEntry* _tmp35_;
+	GtkEntry* _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
 #line 1050 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletion);
 #line 1050 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10536,10 +10324,10 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 	_tmp9_ = _tmp8_;
 #line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp9_ > 0) {
-#line 10525 "Dialogs.c"
-		const gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
+#line 10313 "Dialogs.c"
+		const gchar* _tmp10_;
+		const gchar* _tmp11_;
+		gboolean _tmp12_;
 #line 1058 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = old_text;
 #line 1058 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10548,28 +10336,28 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 		_tmp12_ = string_contains (_tmp10_, _tmp11_);
 #line 1058 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp12_) {
-#line 10537 "Dialogs.c"
+#line 10325 "Dialogs.c"
 			const gchar* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			const gchar* _tmp15_ = NULL;
-			const gchar* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			gchar _tmp18_ = '\0';
-			gint _tmp19_ = 0;
-			gchar* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
-			gchar* _tmp22_ = NULL;
+			const gchar* _tmp14_;
+			const gchar* _tmp15_;
+			const gchar* _tmp16_;
+			const gchar* _tmp17_;
+			gchar _tmp18_;
+			gint _tmp19_;
+			gchar* _tmp20_;
+			gchar* _tmp21_;
+			gchar* _tmp22_;
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = self->priv->delimiter;
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (g_strcmp0 (_tmp14_, " ") != 0) {
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = " ";
-#line 10554 "Dialogs.c"
+#line 10342 "Dialogs.c"
 			} else {
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = "";
-#line 10558 "Dialogs.c"
+#line 10346 "Dialogs.c"
 			}
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = old_text;
@@ -10593,16 +10381,16 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 			old_text = _tmp22_;
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp21_);
-#line 10582 "Dialogs.c"
+#line 10370 "Dialogs.c"
 		} else {
-			gchar* _tmp23_ = NULL;
+			gchar* _tmp23_;
 #line 1061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = g_strdup ("");
 #line 1061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (old_text);
 #line 1061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			old_text = _tmp23_;
-#line 10591 "Dialogs.c"
+#line 10379 "Dialogs.c"
 		}
 	}
 #line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10611,11 +10399,11 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 	if (g_strcmp0 (_tmp25_, " ") != 0) {
 #line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = " ";
-#line 10600 "Dialogs.c"
+#line 10388 "Dialogs.c"
 	} else {
 #line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = "";
-#line 10604 "Dialogs.c"
+#line 10392 "Dialogs.c"
 	}
 #line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = old_text;
@@ -10665,22 +10453,22 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 	_g_free0 (match);
 #line 1068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 10654 "Dialogs.c"
+#line 10442 "Dialogs.c"
 }
 
 
 static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar* delimiter) {
 	gchar* result = NULL;
 	gchar** split = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint split_length1 = 0;
-	gint _split_size_ = 0;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar** _tmp2_;
+	gchar** _tmp3_;
+	gint split_length1;
+	gint _split_size_;
 	gboolean _tmp4_ = FALSE;
-	gchar** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
+	gchar** _tmp5_;
+	gint _tmp5__length1;
 #line 1072 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (s != NULL, NULL);
 #line 1072 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10703,10 +10491,10 @@ static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar*
 	_tmp5__length1 = split_length1;
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ != NULL) {
-#line 10692 "Dialogs.c"
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-		const gchar* _tmp7_ = NULL;
+#line 10480 "Dialogs.c"
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+		const gchar* _tmp7_;
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = split;
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10715,21 +10503,21 @@ static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar*
 		_tmp7_ = _tmp6_[0];
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp7_ != NULL;
-#line 10704 "Dialogs.c"
+#line 10492 "Dialogs.c"
 	} else {
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = FALSE;
-#line 10708 "Dialogs.c"
+#line 10496 "Dialogs.c"
 	}
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 10712 "Dialogs.c"
-		gchar** _tmp8_ = NULL;
-		gint _tmp8__length1 = 0;
-		gchar** _tmp9_ = NULL;
-		gint _tmp9__length1 = 0;
-		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
+#line 10500 "Dialogs.c"
+		gchar** _tmp8_;
+		gint _tmp8__length1;
+		gchar** _tmp9_;
+		gint _tmp9__length1;
+		const gchar* _tmp10_;
+		gchar* _tmp11_;
 #line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = split;
 #line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10748,9 +10536,9 @@ static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar*
 		split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
 #line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10737 "Dialogs.c"
+#line 10525 "Dialogs.c"
 	} else {
-		gchar* _tmp12_ = NULL;
+		gchar* _tmp12_;
 #line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = g_strdup ("");
 #line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10759,11 +10547,11 @@ static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar*
 		split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
 #line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10748 "Dialogs.c"
+#line 10536 "Dialogs.c"
 	}
 #line 1072 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
-#line 10752 "Dialogs.c"
+#line 10540 "Dialogs.c"
 }
 
 
@@ -10773,21 +10561,21 @@ static void entry_multi_completion_class_init (EntryMultiCompletionClass * klass
 #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (EntryMultiCompletionPrivate));
 #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((GtkEntryCompletionClass *) klass)->match_selected = (gboolean (*)(GtkEntryCompletion*, GtkTreeModel*, GtkTreeIter*)) entry_multi_completion_real_match_selected;
+	((GtkEntryCompletionClass *) klass)->match_selected = (gboolean (*) (GtkEntryCompletion *, GtkTreeModel*, GtkTreeIter*)) entry_multi_completion_real_match_selected;
 #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = entry_multi_completion_finalize;
-#line 10765 "Dialogs.c"
+#line 10553 "Dialogs.c"
 }
 
 
 static void entry_multi_completion_instance_init (EntryMultiCompletion * self) {
 #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = ENTRY_MULTI_COMPLETION_GET_PRIVATE (self);
-#line 10772 "Dialogs.c"
+#line 10560 "Dialogs.c"
 }
 
 
-static void entry_multi_completion_finalize (GObject* obj) {
+static void entry_multi_completion_finalize (GObject * obj) {
 	EntryMultiCompletion * self;
 #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletion);
@@ -10795,7 +10583,7 @@ static void entry_multi_completion_finalize (GObject* obj) {
 	_g_free0 (self->priv->delimiter);
 #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (entry_multi_completion_parent_class)->finalize (obj);
-#line 10784 "Dialogs.c"
+#line 10572 "Dialogs.c"
 }
 
 
@@ -10814,11 +10602,11 @@ GType entry_multi_completion_get_type (void) {
 SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type) {
 	SetBackgroundPhotoDialog * self = NULL;
 	gboolean use_header = FALSE;
-	GtkSettings* _tmp0_ = NULL;
+	GtkSettings* _tmp0_;
 	gint _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
-	AppWindow* _tmp3_ = NULL;
-	AppWindow* _tmp4_ = NULL;
+	gboolean _tmp2_;
+	AppWindow* _tmp3_;
+	AppWindow* _tmp4_;
 #line 1092 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_settings_get_default ();
 #line 1092 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10829,11 +10617,11 @@ SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_ty
 	if (_tmp2_) {
 #line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 1;
-#line 10818 "Dialogs.c"
+#line 10606 "Dialogs.c"
 	} else {
 #line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 0;
-#line 10822 "Dialogs.c"
+#line 10610 "Dialogs.c"
 	}
 #line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (SetBackgroundPhotoDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
@@ -10847,22 +10635,22 @@ SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_ty
 	_g_object_unref0 (_tmp4_);
 #line 1090 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 10836 "Dialogs.c"
+#line 10624 "Dialogs.c"
 }
 
 
 SetBackgroundPhotoDialog* set_background_photo_dialog_new (void) {
 #line 1090 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return set_background_photo_dialog_construct (TYPE_SET_BACKGROUND_PHOTO_DIALOG);
-#line 10843 "Dialogs.c"
+#line 10631 "Dialogs.c"
 }
 
 
 static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self) {
 	gboolean _tmp0_ = FALSE;
-	GtkCheckButton* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	GtkCheckButton* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 1098 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_SET_BACKGROUND_PHOTO_DIALOG (self));
 #line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10875,11 +10663,11 @@ static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoD
 	if (_tmp3_) {
 #line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 10864 "Dialogs.c"
+#line 10652 "Dialogs.c"
 	} else {
-		GtkCheckButton* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		gboolean _tmp6_ = FALSE;
+		GtkCheckButton* _tmp4_;
+		gboolean _tmp5_;
+		gboolean _tmp6_;
 #line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = self->priv->screensaver_checkbox;
 #line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10888,18 +10676,18 @@ static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoD
 		_tmp6_ = _tmp5_;
 #line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp6_;
-#line 10877 "Dialogs.c"
+#line 10665 "Dialogs.c"
 	}
 #line 1099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_);
-#line 10881 "Dialogs.c"
+#line 10669 "Dialogs.c"
 }
 
 
 static void _set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
 #line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	set_background_photo_dialog_on_checkbox_clicked ((SetBackgroundPhotoDialog*) self);
-#line 10888 "Dialogs.c"
+#line 10676 "Dialogs.c"
 }
 
 
@@ -10908,13 +10696,13 @@ gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gb
 	gboolean _vala_screensaver = FALSE;
 	gboolean result = FALSE;
 	gboolean _result_ = FALSE;
-	gint _tmp0_ = 0;
-	GtkCheckButton* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	GtkCheckButton* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
+	gint _tmp0_;
+	GtkCheckButton* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+	GtkCheckButton* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
 #line 1104 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_SET_BACKGROUND_PHOTO_DIALOG (self), FALSE);
 #line 1105 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10949,17 +10737,17 @@ gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gb
 	if (desktop_background) {
 #line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*desktop_background = _vala_desktop_background;
-#line 10938 "Dialogs.c"
+#line 10726 "Dialogs.c"
 	}
 #line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (screensaver) {
 #line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*screensaver = _vala_screensaver;
-#line 10944 "Dialogs.c"
+#line 10732 "Dialogs.c"
 	}
 #line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 10948 "Dialogs.c"
+#line 10736 "Dialogs.c"
 }
 
 
@@ -10981,7 +10769,7 @@ static void set_background_photo_dialog_class_init (SetBackgroundPhotoDialogClas
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "screensaver_checkbox", FALSE, SetBackgroundPhotoDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundPhotoDialogPrivate, screensaver_checkbox));
 #line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_checkbox_clicked", G_CALLBACK(_set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled));
-#line 10970 "Dialogs.c"
+#line 10758 "Dialogs.c"
 }
 
 
@@ -10990,11 +10778,11 @@ static void set_background_photo_dialog_instance_init (SetBackgroundPhotoDialog
 	self->priv = SET_BACKGROUND_PHOTO_DIALOG_GET_PRIVATE (self);
 #line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_init_template (GTK_WIDGET (self));
-#line 10979 "Dialogs.c"
+#line 10767 "Dialogs.c"
 }
 
 
-static void set_background_photo_dialog_finalize (GObject* obj) {
+static void set_background_photo_dialog_finalize (GObject * obj) {
 	SetBackgroundPhotoDialog * self;
 #line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialog);
@@ -11004,7 +10792,7 @@ static void set_background_photo_dialog_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->screensaver_checkbox);
 #line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (set_background_photo_dialog_parent_class)->finalize (obj);
-#line 10993 "Dialogs.c"
+#line 10781 "Dialogs.c"
 }
 
 
@@ -11023,11 +10811,11 @@ GType set_background_photo_dialog_get_type (void) {
 SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType object_type) {
 	SetBackgroundSlideshowDialog * self = NULL;
 	gboolean use_header = FALSE;
-	GtkSettings* _tmp0_ = NULL;
+	GtkSettings* _tmp0_;
 	gint _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
-	AppWindow* _tmp3_ = NULL;
-	AppWindow* _tmp4_ = NULL;
+	gboolean _tmp2_;
+	AppWindow* _tmp3_;
+	AppWindow* _tmp4_;
 #line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_settings_get_default ();
 #line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -11038,11 +10826,11 @@ SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType o
 	if (_tmp2_) {
 #line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 1;
-#line 11027 "Dialogs.c"
+#line 10815 "Dialogs.c"
 	} else {
 #line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 0;
-#line 11031 "Dialogs.c"
+#line 10819 "Dialogs.c"
 	}
 #line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (SetBackgroundSlideshowDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
@@ -11056,14 +10844,14 @@ SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType o
 	_g_object_unref0 (_tmp4_);
 #line 1130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 11045 "Dialogs.c"
+#line 10833 "Dialogs.c"
 }
 
 
 SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void) {
 #line 1130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return set_background_slideshow_dialog_construct (TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG);
-#line 11052 "Dialogs.c"
+#line 10840 "Dialogs.c"
 }
 
 
@@ -11073,15 +10861,15 @@ static void set_background_slideshow_dialog_real_constructed (GObject* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog);
 #line 1138 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	set_background_slideshow_dialog_on_delay_scale_value_changed (self);
-#line 11062 "Dialogs.c"
+#line 10850 "Dialogs.c"
 }
 
 
 static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSlideshowDialog* self) {
 	gboolean _tmp0_ = FALSE;
-	GtkCheckButton* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	GtkCheckButton* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 1142 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self));
 #line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -11094,11 +10882,11 @@ static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSl
 	if (_tmp3_) {
 #line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 11083 "Dialogs.c"
+#line 10871 "Dialogs.c"
 	} else {
-		GtkCheckButton* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		gboolean _tmp6_ = FALSE;
+		GtkCheckButton* _tmp4_;
+		gboolean _tmp5_;
+		gboolean _tmp6_;
 #line 1145 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = self->priv->screensaver_checkbox;
 #line 1145 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -11107,35 +10895,35 @@ static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSl
 		_tmp6_ = _tmp5_;
 #line 1145 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp6_;
-#line 11096 "Dialogs.c"
+#line 10884 "Dialogs.c"
 	}
 #line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_);
-#line 11100 "Dialogs.c"
+#line 10888 "Dialogs.c"
 }
 
 
 static void _set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
 #line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	set_background_slideshow_dialog_on_checkbox_clicked ((SetBackgroundSlideshowDialog*) self);
-#line 11107 "Dialogs.c"
+#line 10895 "Dialogs.c"
 }
 
 
 static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBackgroundSlideshowDialog* self) {
 	gdouble value = 0.0;
-	GtkScale* _tmp0_ = NULL;
-	GtkAdjustment* _tmp1_ = NULL;
-	GtkAdjustment* _tmp2_ = NULL;
-	gdouble _tmp3_ = 0.0;
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
-	gdouble _tmp7_ = 0.0;
+	GtkScale* _tmp0_;
+	GtkAdjustment* _tmp1_;
+	GtkAdjustment* _tmp2_;
+	gdouble _tmp3_;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
+	gdouble _tmp7_;
 	gchar* text = NULL;
-	gint _tmp8_ = 0;
-	GtkLabel* _tmp29_ = NULL;
-	const gchar* _tmp30_ = NULL;
+	gint _tmp8_;
+	GtkLabel* _tmp25_;
+	const gchar* _tmp26_;
 #line 1149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self));
 #line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -11162,127 +10950,115 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 	_tmp8_ = self->priv->delay_value;
 #line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_ < 60) {
-#line 11151 "Dialogs.c"
-		gint _tmp9_ = 0;
-		const gchar* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		gchar* _tmp12_ = NULL;
+#line 10939 "Dialogs.c"
+		gint _tmp9_;
+		gint _tmp10_;
+		gchar* _tmp11_;
 #line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->delay_value;
 #line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = ngettext ("%d second", "%d seconds", (gulong) _tmp9_);
-#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp11_ = self->priv->delay_value;
+		_tmp10_ = self->priv->delay_value;
 #line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = g_strdup_printf (_tmp10_, _tmp11_);
+		_tmp11_ = g_strdup_printf (ngettext ("%d second", "%d seconds", (gulong) _tmp9_), _tmp10_);
 #line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
 #line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		text = _tmp12_;
-#line 11168 "Dialogs.c"
+		text = _tmp11_;
+#line 10953 "Dialogs.c"
 	} else {
-		gint _tmp13_ = 0;
+		gint _tmp12_;
 #line 1161 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp13_ = self->priv->delay_value;
+		_tmp12_ = self->priv->delay_value;
 #line 1161 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp13_ < (60 * 60)) {
-#line 11175 "Dialogs.c"
+		if (_tmp12_ < (60 * 60)) {
+#line 10960 "Dialogs.c"
 			gint minutes = 0;
-			gint _tmp14_ = 0;
-			gint _tmp15_ = 0;
-			const gchar* _tmp16_ = NULL;
-			gint _tmp17_ = 0;
-			gchar* _tmp18_ = NULL;
-			gint _tmp19_ = 0;
+			gint _tmp13_;
+			gint _tmp14_;
+			gint _tmp15_;
+			gchar* _tmp16_;
+			gint _tmp17_;
 #line 1162 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp14_ = self->priv->delay_value;
+			_tmp13_ = self->priv->delay_value;
 #line 1162 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			minutes = _tmp14_ / 60;
+			minutes = _tmp13_ / 60;
 #line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp15_ = minutes;
-#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp16_ = ngettext ("%d minute", "%d minutes", (gulong) _tmp15_);
+			_tmp14_ = minutes;
 #line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp17_ = minutes;
+			_tmp15_ = minutes;
 #line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp18_ = g_strdup_printf (_tmp16_, _tmp17_);
+			_tmp16_ = g_strdup_printf (ngettext ("%d minute", "%d minutes", (gulong) _tmp14_), _tmp15_);
 #line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (text);
 #line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			text = _tmp18_;
+			text = _tmp16_;
 #line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp19_ = minutes;
+			_tmp17_ = minutes;
 #line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			self->priv->delay_value = _tmp19_ * 60;
-#line 11203 "Dialogs.c"
+			self->priv->delay_value = _tmp17_ * 60;
+#line 10985 "Dialogs.c"
 		} else {
-			gint _tmp20_ = 0;
+			gint _tmp18_;
 #line 1165 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp20_ = self->priv->delay_value;
+			_tmp18_ = self->priv->delay_value;
 #line 1165 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			if (_tmp20_ < ((60 * 60) * 24)) {
-#line 11210 "Dialogs.c"
+			if (_tmp18_ < ((60 * 60) * 24)) {
+#line 10992 "Dialogs.c"
 				gint hours = 0;
-				gint _tmp21_ = 0;
-				gint _tmp22_ = 0;
-				const gchar* _tmp23_ = NULL;
-				gint _tmp24_ = 0;
-				gchar* _tmp25_ = NULL;
-				gint _tmp26_ = 0;
+				gint _tmp19_;
+				gint _tmp20_;
+				gint _tmp21_;
+				gchar* _tmp22_;
+				gint _tmp23_;
 #line 1166 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp21_ = self->priv->delay_value;
+				_tmp19_ = self->priv->delay_value;
 #line 1166 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				hours = _tmp21_ / (60 * 60);
-#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp22_ = hours;
+				hours = _tmp19_ / (60 * 60);
 #line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp23_ = ngettext ("%d hour", "%d hours", (gulong) _tmp22_);
+				_tmp20_ = hours;
 #line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp24_ = hours;
+				_tmp21_ = hours;
 #line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp25_ = g_strdup_printf (_tmp23_, _tmp24_);
+				_tmp22_ = g_strdup_printf (ngettext ("%d hour", "%d hours", (gulong) _tmp20_), _tmp21_);
 #line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
 #line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				text = _tmp25_;
+				text = _tmp22_;
 #line 1168 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp26_ = hours;
+				_tmp23_ = hours;
 #line 1168 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				self->priv->delay_value = _tmp26_ * (60 * 60);
-#line 11238 "Dialogs.c"
+				self->priv->delay_value = _tmp23_ * (60 * 60);
+#line 11017 "Dialogs.c"
 			} else {
-				const gchar* _tmp27_ = NULL;
-				gchar* _tmp28_ = NULL;
+				gchar* _tmp24_;
 #line 1170 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp27_ = _ ("1 day");
-#line 1170 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp28_ = g_strdup (_tmp27_);
+				_tmp24_ = g_strdup (_ ("1 day"));
 #line 1170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
 #line 1170 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				text = _tmp28_;
+				text = _tmp24_;
 #line 1171 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				self->priv->delay_value = (60 * 60) * 24;
-#line 11252 "Dialogs.c"
+#line 11028 "Dialogs.c"
 			}
 		}
 	}
 #line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp29_ = self->priv->delay_value_label;
+	_tmp25_ = self->priv->delay_value_label;
 #line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp30_ = text;
+	_tmp26_ = text;
 #line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_label (_tmp29_, _tmp30_);
+	gtk_label_set_label (_tmp25_, _tmp26_);
 #line 1149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (text);
-#line 11264 "Dialogs.c"
+#line 11040 "Dialogs.c"
 }
 
 
 static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	set_background_slideshow_dialog_on_delay_scale_value_changed ((SetBackgroundSlideshowDialog*) self);
-#line 11271 "Dialogs.c"
+#line 11047 "Dialogs.c"
 }
 
 
@@ -11292,14 +11068,14 @@ gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog*
 	gboolean _vala_screensaver = FALSE;
 	gboolean result = FALSE;
 	gboolean _result_ = FALSE;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	GtkCheckButton* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	GtkCheckButton* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
+	gint _tmp0_;
+	gint _tmp1_;
+	GtkCheckButton* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	GtkCheckButton* _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp7_;
 #line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self), FALSE);
 #line 1178 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -11338,23 +11114,23 @@ gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog*
 	if (delay_value) {
 #line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*delay_value = _vala_delay_value;
-#line 11327 "Dialogs.c"
+#line 11103 "Dialogs.c"
 	}
 #line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (desktop_background) {
 #line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*desktop_background = _vala_desktop_background;
-#line 11333 "Dialogs.c"
+#line 11109 "Dialogs.c"
 	}
 #line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (screensaver) {
 #line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*screensaver = _vala_screensaver;
-#line 11339 "Dialogs.c"
+#line 11115 "Dialogs.c"
 	}
 #line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 11343 "Dialogs.c"
+#line 11119 "Dialogs.c"
 }
 
 
@@ -11365,7 +11141,7 @@ static void set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDi
 #line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (SetBackgroundSlideshowDialogPrivate));
 #line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((GObjectClass *) klass)->constructed = (void (*)(GObject*)) set_background_slideshow_dialog_real_constructed;
+	((GObjectClass *) klass)->constructed = (void (*) (GObject *)) set_background_slideshow_dialog_real_constructed;
 #line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = set_background_slideshow_dialog_finalize;
 #line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -11384,7 +11160,7 @@ static void set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDi
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_checkbox_clicked", G_CALLBACK(_set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled));
 #line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_delay_scale_value_changed", G_CALLBACK(_set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed));
-#line 11373 "Dialogs.c"
+#line 11149 "Dialogs.c"
 }
 
 
@@ -11395,11 +11171,11 @@ static void set_background_slideshow_dialog_instance_init (SetBackgroundSlidesho
 	self->priv->delay_value = 0;
 #line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_init_template (GTK_WIDGET (self));
-#line 11384 "Dialogs.c"
+#line 11160 "Dialogs.c"
 }
 
 
-static void set_background_slideshow_dialog_finalize (GObject* obj) {
+static void set_background_slideshow_dialog_finalize (GObject * obj) {
 	SetBackgroundSlideshowDialog * self;
 #line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog);
@@ -11413,7 +11189,7 @@ static void set_background_slideshow_dialog_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->delay_value_label);
 #line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (set_background_slideshow_dialog_parent_class)->finalize (obj);
-#line 11402 "Dialogs.c"
+#line 11178 "Dialogs.c"
 }
 
 
@@ -11432,9 +11208,9 @@ GType set_background_slideshow_dialog_get_type (void) {
 TextEntryDialog* text_entry_dialog_construct (GType object_type) {
 	TextEntryDialog * self = NULL;
 	gboolean use_header = FALSE;
-	GtkSettings* _tmp0_ = NULL;
+	GtkSettings* _tmp0_;
 	gint _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp2_;
 #line 1203 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_settings_get_default ();
 #line 1203 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -11445,30 +11221,30 @@ TextEntryDialog* text_entry_dialog_construct (GType object_type) {
 	if (_tmp2_) {
 #line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 1;
-#line 11434 "Dialogs.c"
+#line 11210 "Dialogs.c"
 	} else {
 #line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 0;
-#line 11438 "Dialogs.c"
+#line 11214 "Dialogs.c"
 	}
 #line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (TextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
 #line 1201 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 11444 "Dialogs.c"
+#line 11220 "Dialogs.c"
 }
 
 
 TextEntryDialog* text_entry_dialog_new (void) {
 #line 1201 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return text_entry_dialog_construct (TYPE_TEXT_ENTRY_DIALOG);
-#line 11451 "Dialogs.c"
+#line 11227 "Dialogs.c"
 }
 
 
 void text_entry_dialog_set_builder (TextEntryDialog* self, GtkBuilder* builder) {
-	GtkBuilder* _tmp0_ = NULL;
-	GtkBuilder* _tmp1_ = NULL;
+	GtkBuilder* _tmp0_;
+	GtkBuilder* _tmp1_;
 #line 1207 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
 #line 1207 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -11481,45 +11257,45 @@ void text_entry_dialog_set_builder (TextEntryDialog* self, GtkBuilder* builder)
 	_g_object_unref0 (self->priv->builder);
 #line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->builder = _tmp1_;
-#line 11470 "Dialogs.c"
+#line 11246 "Dialogs.c"
 }
 
 
 static void _text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text_entry_dialog_on_entry_changed ((TextEntryDialog*) self);
-#line 11477 "Dialogs.c"
+#line 11253 "Dialogs.c"
 }
 
 
 void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text, GeeCollection* completion_list, const gchar* completion_delimiter) {
-	const gchar* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-	AppWindow* _tmp2_ = NULL;
-	GdkWindow* _tmp3_ = NULL;
-	AppWindow* _tmp4_ = NULL;
-	AppWindow* _tmp5_ = NULL;
-	TextEntryDialogOnModifyValidateType _tmp6_ = NULL;
-	void* _tmp6__target = NULL;
+	const gchar* _tmp0_;
+	AppWindow* _tmp1_;
+	AppWindow* _tmp2_;
+	GdkWindow* _tmp3_;
+	AppWindow* _tmp4_;
+	AppWindow* _tmp5_;
+	TextEntryDialogOnModifyValidateType _tmp6_;
+	void* _tmp6__target;
 	GtkLabel* name_label = NULL;
-	GtkBuilder* _tmp7_ = NULL;
-	GObject* _tmp8_ = NULL;
-	GtkLabel* _tmp9_ = NULL;
-	GtkLabel* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	GtkBuilder* _tmp12_ = NULL;
-	GObject* _tmp13_ = NULL;
-	GtkEntry* _tmp14_ = NULL;
+	GtkBuilder* _tmp7_;
+	GObject* _tmp8_;
+	GtkLabel* _tmp9_;
+	GtkLabel* _tmp10_;
+	const gchar* _tmp11_;
+	GtkBuilder* _tmp12_;
+	GObject* _tmp13_;
+	GtkEntry* _tmp14_;
 	const gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	GtkEntry* _tmp18_ = NULL;
-	GtkEntry* _tmp19_ = NULL;
-	GtkEntry* _tmp20_ = NULL;
-	GtkWidget* _tmp21_ = NULL;
-	GtkButton* _tmp22_ = NULL;
-	GtkWidget* _tmp23_ = NULL;
-	GtkButton* _tmp24_ = NULL;
-	GeeCollection* _tmp25_ = NULL;
+	const gchar* _tmp16_;
+	GtkEntry* _tmp18_;
+	GtkEntry* _tmp19_;
+	GtkEntry* _tmp20_;
+	GtkWidget* _tmp21_;
+	GtkButton* _tmp22_;
+	GtkWidget* _tmp23_;
+	GtkButton* _tmp24_;
+	GeeCollection* _tmp25_;
 #line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
 #line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -11588,17 +11364,17 @@ void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyVali
 	_tmp16_ = initial_text;
 #line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp16_ != NULL) {
-#line 11577 "Dialogs.c"
-		const gchar* _tmp17_ = NULL;
+#line 11353 "Dialogs.c"
+		const gchar* _tmp17_;
 #line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = initial_text;
 #line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = _tmp17_;
-#line 11583 "Dialogs.c"
+#line 11359 "Dialogs.c"
 	} else {
 #line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = "";
-#line 11587 "Dialogs.c"
+#line 11363 "Dialogs.c"
 	}
 #line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->entry;
@@ -11634,13 +11410,13 @@ void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyVali
 	_tmp25_ = completion_list;
 #line 1231 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp25_ != NULL) {
-#line 11623 "Dialogs.c"
+#line 11399 "Dialogs.c"
 		EntryMultiCompletion* completion = NULL;
-		GeeCollection* _tmp26_ = NULL;
-		const gchar* _tmp27_ = NULL;
-		EntryMultiCompletion* _tmp28_ = NULL;
-		GtkEntry* _tmp29_ = NULL;
-		EntryMultiCompletion* _tmp30_ = NULL;
+		GeeCollection* _tmp26_;
+		const gchar* _tmp27_;
+		EntryMultiCompletion* _tmp28_;
+		GtkEntry* _tmp29_;
+		EntryMultiCompletion* _tmp30_;
 #line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = completion_list;
 #line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -11657,27 +11433,27 @@ void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyVali
 		gtk_entry_set_completion (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_entry_completion_get_type (), GtkEntryCompletion));
 #line 1231 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (completion);
-#line 11646 "Dialogs.c"
+#line 11422 "Dialogs.c"
 	}
 #line 1237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
 #line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (name_label);
-#line 11652 "Dialogs.c"
+#line 11428 "Dialogs.c"
 }
 
 
 gchar* text_entry_dialog_execute (TextEntryDialog* self) {
 	gchar* result = NULL;
 	gchar* text = NULL;
-	TextEntryDialogOnModifyValidateType _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gint _tmp4_ = 0;
-	GtkEntry* _tmp8_ = NULL;
-	guint _tmp9_ = 0U;
+	TextEntryDialogOnModifyValidateType _tmp0_;
+	void* _tmp0__target;
+	GtkEntry* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
+	gint _tmp4_;
+	GtkEntry* _tmp8_;
+	guint _tmp9_;
 #line 1240 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG (self), NULL);
 #line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -11700,10 +11476,10 @@ gchar* text_entry_dialog_execute (TextEntryDialog* self) {
 	_tmp4_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_ == ((gint) GTK_RESPONSE_OK)) {
-#line 11689 "Dialogs.c"
-		GtkEntry* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 11465 "Dialogs.c"
+		GtkEntry* _tmp5_;
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->entry;
 #line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -11714,7 +11490,7 @@ gchar* text_entry_dialog_execute (TextEntryDialog* self) {
 		_g_free0 (text);
 #line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp7_;
-#line 11703 "Dialogs.c"
+#line 11479 "Dialogs.c"
 	}
 #line 1251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->entry;
@@ -11728,16 +11504,16 @@ gchar* text_entry_dialog_execute (TextEntryDialog* self) {
 	result = text;
 #line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 11717 "Dialogs.c"
+#line 11493 "Dialogs.c"
 }
 
 
 void text_entry_dialog_on_entry_changed (TextEntryDialog* self) {
-	TextEntryDialogOnModifyValidateType _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	TextEntryDialogOnModifyValidateType _tmp0_;
+	void* _tmp0__target;
+	GtkEntry* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 #line 1257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
 #line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -11752,7 +11528,7 @@ void text_entry_dialog_on_entry_changed (TextEntryDialog* self) {
 	_tmp3_ = _tmp0_ (_tmp2_, _tmp0__target);
 #line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp3_);
-#line 11741 "Dialogs.c"
+#line 11517 "Dialogs.c"
 }
 
 
@@ -11763,18 +11539,18 @@ static void text_entry_dialog_class_init (TextEntryDialogClass * klass) {
 	g_type_class_add_private (klass, sizeof (TextEntryDialogPrivate));
 #line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = text_entry_dialog_finalize;
-#line 11752 "Dialogs.c"
+#line 11528 "Dialogs.c"
 }
 
 
 static void text_entry_dialog_instance_init (TextEntryDialog * self) {
 #line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = TEXT_ENTRY_DIALOG_GET_PRIVATE (self);
-#line 11759 "Dialogs.c"
+#line 11535 "Dialogs.c"
 }
 
 
-static void text_entry_dialog_finalize (GObject* obj) {
+static void text_entry_dialog_finalize (GObject * obj) {
 	TextEntryDialog * self;
 #line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEXT_ENTRY_DIALOG, TextEntryDialog);
@@ -11788,7 +11564,7 @@ static void text_entry_dialog_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->button2);
 #line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (text_entry_dialog_parent_class)->finalize (obj);
-#line 11777 "Dialogs.c"
+#line 11553 "Dialogs.c"
 }
 
 
@@ -11807,9 +11583,9 @@ GType text_entry_dialog_get_type (void) {
 MultiTextEntryDialog* multi_text_entry_dialog_construct (GType object_type) {
 	MultiTextEntryDialog * self = NULL;
 	gboolean use_header = FALSE;
-	GtkSettings* _tmp0_ = NULL;
+	GtkSettings* _tmp0_;
 	gint _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp2_;
 #line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_settings_get_default ();
 #line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -11820,30 +11596,30 @@ MultiTextEntryDialog* multi_text_entry_dialog_construct (GType object_type) {
 	if (_tmp2_) {
 #line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 1;
-#line 11809 "Dialogs.c"
+#line 11585 "Dialogs.c"
 	} else {
 #line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 0;
-#line 11813 "Dialogs.c"
+#line 11589 "Dialogs.c"
 	}
 #line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (MultiTextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
 #line 1271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 11819 "Dialogs.c"
+#line 11595 "Dialogs.c"
 }
 
 
 MultiTextEntryDialog* multi_text_entry_dialog_new (void) {
 #line 1271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return multi_text_entry_dialog_construct (TYPE_MULTI_TEXT_ENTRY_DIALOG);
-#line 11826 "Dialogs.c"
+#line 11602 "Dialogs.c"
 }
 
 
 void multi_text_entry_dialog_set_builder (MultiTextEntryDialog* self, GtkBuilder* builder) {
-	GtkBuilder* _tmp0_ = NULL;
-	GtkBuilder* _tmp1_ = NULL;
+	GtkBuilder* _tmp0_;
+	GtkBuilder* _tmp1_;
 #line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self));
 #line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -11856,36 +11632,36 @@ void multi_text_entry_dialog_set_builder (MultiTextEntryDialog* self, GtkBuilder
 	_g_object_unref0 (self->priv->builder);
 #line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->builder = _tmp1_;
-#line 11845 "Dialogs.c"
+#line 11621 "Dialogs.c"
 }
 
 
 void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text) {
-	const gchar* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-	AppWindow* _tmp2_ = NULL;
-	GdkWindow* _tmp3_ = NULL;
-	AppWindow* _tmp4_ = NULL;
-	AppWindow* _tmp5_ = NULL;
-	MultiTextEntryDialogOnModifyValidateType _tmp6_ = NULL;
-	void* _tmp6__target = NULL;
-	GtkBuilder* _tmp7_ = NULL;
-	GObject* _tmp8_ = NULL;
-	GtkTextView* _tmp9_ = NULL;
-	GtkTextView* _tmp10_ = NULL;
-	GtkTextView* _tmp11_ = NULL;
-	GtkTextBuffer* _tmp12_ = NULL;
-	GtkTextBuffer* _tmp13_ = NULL;
+	const gchar* _tmp0_;
+	AppWindow* _tmp1_;
+	AppWindow* _tmp2_;
+	GdkWindow* _tmp3_;
+	AppWindow* _tmp4_;
+	AppWindow* _tmp5_;
+	MultiTextEntryDialogOnModifyValidateType _tmp6_;
+	void* _tmp6__target;
+	GtkBuilder* _tmp7_;
+	GObject* _tmp8_;
+	GtkTextView* _tmp9_;
+	GtkTextView* _tmp10_;
+	GtkTextView* _tmp11_;
+	GtkTextBuffer* _tmp12_;
+	GtkTextBuffer* _tmp13_;
 	const gchar* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	GtkTextView* _tmp17_ = NULL;
-	GtkTextBuffer* _tmp18_ = NULL;
-	GtkTextBuffer* _tmp19_ = NULL;
-	GtkTextView* _tmp20_ = NULL;
-	GtkWidget* _tmp21_ = NULL;
-	GtkButton* _tmp22_ = NULL;
-	GtkWidget* _tmp23_ = NULL;
-	GtkButton* _tmp24_ = NULL;
+	const gchar* _tmp15_;
+	GtkTextView* _tmp17_;
+	GtkTextBuffer* _tmp18_;
+	GtkTextBuffer* _tmp19_;
+	GtkTextView* _tmp20_;
+	GtkWidget* _tmp21_;
+	GtkButton* _tmp22_;
+	GtkWidget* _tmp23_;
+	GtkButton* _tmp24_;
 #line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self));
 #line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -11954,17 +11730,17 @@ void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDi
 	_tmp15_ = initial_text;
 #line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp15_ != NULL) {
-#line 11943 "Dialogs.c"
-		const gchar* _tmp16_ = NULL;
+#line 11719 "Dialogs.c"
+		const gchar* _tmp16_;
 #line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = initial_text;
 #line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = _tmp16_;
-#line 11949 "Dialogs.c"
+#line 11725 "Dialogs.c"
 	} else {
 #line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = "";
-#line 11953 "Dialogs.c"
+#line 11729 "Dialogs.c"
 	}
 #line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = self->priv->entry;
@@ -11996,14 +11772,14 @@ void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDi
 	self->priv->button2 = _tmp24_;
 #line 1298 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 11985 "Dialogs.c"
+#line 11761 "Dialogs.c"
 }
 
 
 gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self) {
 	gchar* result = NULL;
 	gchar* text = NULL;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self), NULL);
 #line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -12014,12 +11790,12 @@ gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self) {
 	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 12003 "Dialogs.c"
-		GtkTextView* _tmp1_ = NULL;
-		GtkTextBuffer* _tmp2_ = NULL;
-		GtkTextBuffer* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+#line 11779 "Dialogs.c"
+		GtkTextView* _tmp1_;
+		GtkTextBuffer* _tmp2_;
+		GtkTextBuffer* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->entry;
 #line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -12034,7 +11810,7 @@ gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self) {
 		_g_free0 (text);
 #line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp5_;
-#line 12023 "Dialogs.c"
+#line 11799 "Dialogs.c"
 	}
 #line 1309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -12042,7 +11818,7 @@ gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self) {
 	result = text;
 #line 1311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12031 "Dialogs.c"
+#line 11807 "Dialogs.c"
 }
 
 
@@ -12053,18 +11829,18 @@ static void multi_text_entry_dialog_class_init (MultiTextEntryDialogClass * klas
 	g_type_class_add_private (klass, sizeof (MultiTextEntryDialogPrivate));
 #line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = multi_text_entry_dialog_finalize;
-#line 12042 "Dialogs.c"
+#line 11818 "Dialogs.c"
 }
 
 
 static void multi_text_entry_dialog_instance_init (MultiTextEntryDialog * self) {
 #line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = MULTI_TEXT_ENTRY_DIALOG_GET_PRIVATE (self);
-#line 12049 "Dialogs.c"
+#line 11825 "Dialogs.c"
 }
 
 
-static void multi_text_entry_dialog_finalize (GObject* obj) {
+static void multi_text_entry_dialog_finalize (GObject * obj) {
 	MultiTextEntryDialog * self;
 #line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTI_TEXT_ENTRY_DIALOG, MultiTextEntryDialog);
@@ -12078,7 +11854,7 @@ static void multi_text_entry_dialog_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->button2);
 #line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (multi_text_entry_dialog_parent_class)->finalize (obj);
-#line 12067 "Dialogs.c"
+#line 11843 "Dialogs.c"
 }
 
 
@@ -12096,36 +11872,30 @@ GType multi_text_entry_dialog_get_type (void) {
 
 EventRenameDialog* event_rename_dialog_construct (GType object_type, const gchar* event_name) {
 	EventRenameDialog* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = _ ("Rename Event");
+	const gchar* _tmp0_;
 #line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = _ ("Name:");
+	_tmp0_ = event_name;
 #line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = event_name;
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (EventRenameDialog*) text_entry_dialog_mediator_construct (object_type, _tmp0_, _tmp1_, _tmp2_, NULL, NULL);
+	self = (EventRenameDialog*) text_entry_dialog_mediator_construct (object_type, _ ("Rename Event"), _ ("Name:"), _tmp0_, NULL, NULL);
 #line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12098 "Dialogs.c"
+#line 11868 "Dialogs.c"
 }
 
 
 EventRenameDialog* event_rename_dialog_new (const gchar* event_name) {
 #line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return event_rename_dialog_construct (TYPE_EVENT_RENAME_DIALOG, event_name);
-#line 12105 "Dialogs.c"
+#line 11875 "Dialogs.c"
 }
 
 
 static gchar* event_rename_dialog_real_execute (EventRenameDialog* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
 #line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -12140,7 +11910,7 @@ static gchar* event_rename_dialog_real_execute (EventRenameDialog* self) {
 	result = _tmp3_;
 #line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12129 "Dialogs.c"
+#line 11899 "Dialogs.c"
 }
 
 
@@ -12149,7 +11919,7 @@ gchar* event_rename_dialog_execute (EventRenameDialog* self) {
 	g_return_val_if_fail (IS_EVENT_RENAME_DIALOG (self), NULL);
 #line 1320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EVENT_RENAME_DIALOG_GET_CLASS (self)->execute (self);
-#line 12138 "Dialogs.c"
+#line 11908 "Dialogs.c"
 }
 
 
@@ -12157,8 +11927,8 @@ static void event_rename_dialog_class_init (EventRenameDialogClass * klass) {
 #line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	event_rename_dialog_parent_class = g_type_class_peek_parent (klass);
 #line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((EventRenameDialogClass *) klass)->execute = (gchar* (*)(EventRenameDialog*)) event_rename_dialog_real_execute;
-#line 12147 "Dialogs.c"
+	((EventRenameDialogClass *) klass)->execute = (gchar* (*) (EventRenameDialog *)) event_rename_dialog_real_execute;
+#line 11917 "Dialogs.c"
 }
 
 
@@ -12180,36 +11950,30 @@ GType event_rename_dialog_get_type (void) {
 
 EditTitleDialog* edit_title_dialog_construct (GType object_type, const gchar* photo_title) {
 	EditTitleDialog* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = C_ ("Dialog Title", "Edit Title");
+	const gchar* _tmp0_;
 #line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = _ ("Title:");
+	_tmp0_ = photo_title;
 #line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = photo_title;
-#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (EditTitleDialog*) text_entry_dialog_mediator_construct (object_type, _tmp0_, _tmp1_, _tmp2_, NULL, NULL);
+	self = (EditTitleDialog*) text_entry_dialog_mediator_construct (object_type, C_ ("Dialog Title", "Edit Title"), _ ("Title:"), _tmp0_, NULL, NULL);
 #line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12182 "Dialogs.c"
+#line 11946 "Dialogs.c"
 }
 
 
 EditTitleDialog* edit_title_dialog_new (const gchar* photo_title) {
 #line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return edit_title_dialog_construct (TYPE_EDIT_TITLE_DIALOG, photo_title);
-#line 12189 "Dialogs.c"
+#line 11953 "Dialogs.c"
 }
 
 
 static gchar* edit_title_dialog_real_execute (EditTitleDialog* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
 #line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -12224,7 +11988,7 @@ static gchar* edit_title_dialog_real_execute (EditTitleDialog* self) {
 	result = _tmp3_;
 #line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12213 "Dialogs.c"
+#line 11977 "Dialogs.c"
 }
 
 
@@ -12233,7 +11997,7 @@ gchar* edit_title_dialog_execute (EditTitleDialog* self) {
 	g_return_val_if_fail (IS_EDIT_TITLE_DIALOG (self), NULL);
 #line 1332 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EDIT_TITLE_DIALOG_GET_CLASS (self)->execute (self);
-#line 12222 "Dialogs.c"
+#line 11986 "Dialogs.c"
 }
 
 
@@ -12248,7 +12012,7 @@ static gboolean edit_title_dialog_real_on_modify_validate (TextEntryDialogMediat
 	result = TRUE;
 #line 1337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12237 "Dialogs.c"
+#line 12001 "Dialogs.c"
 }
 
 
@@ -12256,10 +12020,10 @@ static void edit_title_dialog_class_init (EditTitleDialogClass * klass) {
 #line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	edit_title_dialog_parent_class = g_type_class_peek_parent (klass);
 #line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((EditTitleDialogClass *) klass)->execute = (gchar* (*)(EditTitleDialog*)) edit_title_dialog_real_execute;
+	((EditTitleDialogClass *) klass)->execute = (gchar* (*) (EditTitleDialog *)) edit_title_dialog_real_execute;
 #line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(TextEntryDialogMediator*, const gchar*)) edit_title_dialog_real_on_modify_validate;
-#line 12248 "Dialogs.c"
+	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (TextEntryDialogMediator *, const gchar*)) edit_title_dialog_real_on_modify_validate;
+#line 12012 "Dialogs.c"
 }
 
 
@@ -12282,61 +12046,51 @@ GType edit_title_dialog_get_type (void) {
 EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar* comment, gboolean is_event) {
 	EditCommentDialog* self = NULL;
 	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	gchar* title_tmp = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
+	gchar* _tmp2_;
+	const gchar* _tmp3_;
 #line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = is_event;
 #line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 12280 "Dialogs.c"
-		const gchar* _tmp2_ = NULL;
-#line 1345 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp2_ = _ ("Edit Event Comment");
 #line 1345 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = _tmp2_;
-#line 12286 "Dialogs.c"
+		_tmp0_ = _ ("Edit Event Comment");
+#line 12045 "Dialogs.c"
 	} else {
-		const gchar* _tmp3_ = NULL;
 #line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = _ ("Edit Photo/Video Comment");
-#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = _tmp3_;
-#line 12293 "Dialogs.c"
+		_tmp0_ = _ ("Edit Photo/Video Comment");
+#line 12049 "Dialogs.c"
 	}
 #line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = g_strdup (_tmp0_);
+	_tmp2_ = g_strdup (_tmp0_);
 #line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	title_tmp = _tmp4_;
-#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _ ("Comment:");
+	title_tmp = _tmp2_;
 #line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = comment;
+	_tmp3_ = comment;
 #line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (EditCommentDialog*) multi_text_entry_dialog_mediator_construct (object_type, title_tmp, _tmp5_, _tmp6_);
+	self = (EditCommentDialog*) multi_text_entry_dialog_mediator_construct (object_type, title_tmp, _ ("Comment:"), _tmp3_);
 #line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (title_tmp);
 #line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12309 "Dialogs.c"
+#line 12063 "Dialogs.c"
 }
 
 
 EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event) {
 #line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return edit_comment_dialog_construct (TYPE_EDIT_COMMENT_DIALOG, comment, is_event);
-#line 12316 "Dialogs.c"
+#line 12070 "Dialogs.c"
 }
 
 
 static gchar* edit_comment_dialog_real_execute (EditCommentDialog* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _multi_text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR, MultiTextEntryDialogMediator));
 #line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -12351,7 +12105,7 @@ static gchar* edit_comment_dialog_real_execute (EditCommentDialog* self) {
 	result = _tmp3_;
 #line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12340 "Dialogs.c"
+#line 12094 "Dialogs.c"
 }
 
 
@@ -12360,7 +12114,7 @@ gchar* edit_comment_dialog_execute (EditCommentDialog* self) {
 	g_return_val_if_fail (IS_EDIT_COMMENT_DIALOG (self), NULL);
 #line 1350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EDIT_COMMENT_DIALOG_GET_CLASS (self)->execute (self);
-#line 12349 "Dialogs.c"
+#line 12103 "Dialogs.c"
 }
 
 
@@ -12375,7 +12129,7 @@ static gboolean edit_comment_dialog_real_on_modify_validate (MultiTextEntryDialo
 	result = TRUE;
 #line 1355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12364 "Dialogs.c"
+#line 12118 "Dialogs.c"
 }
 
 
@@ -12383,10 +12137,10 @@ static void edit_comment_dialog_class_init (EditCommentDialogClass * klass) {
 #line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	edit_comment_dialog_parent_class = g_type_class_peek_parent (klass);
 #line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((EditCommentDialogClass *) klass)->execute = (gchar* (*)(EditCommentDialog*)) edit_comment_dialog_real_execute;
+	((EditCommentDialogClass *) klass)->execute = (gchar* (*) (EditCommentDialog *)) edit_comment_dialog_real_execute;
 #line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(MultiTextEntryDialogMediator*, const gchar*)) edit_comment_dialog_real_on_modify_validate;
-#line 12375 "Dialogs.c"
+	((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (MultiTextEntryDialogMediator *, const gchar*)) edit_comment_dialog_real_on_modify_validate;
+#line 12129 "Dialogs.c"
 }
 
 
@@ -12409,20 +12163,18 @@ GType edit_comment_dialog_get_type (void) {
 GtkResponseType remove_from_library_dialog (GtkWindow* owner, const gchar* title, const gchar* user_message, gint count) {
 	GtkResponseType result = 0;
 	gchar* trash_action = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gint _tmp0_;
+	gchar* _tmp1_;
 	GtkMessageDialog* dialog = NULL;
-	GtkWindow* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GtkMessageDialog* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
+	GtkWindow* _tmp2_;
+	const gchar* _tmp3_;
+	GtkMessageDialog* _tmp4_;
+	const gchar* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
 	GtkResponseType _result_ = 0;
-	gint _tmp11_ = 0;
+	gint _tmp9_;
 #line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), 0);
 #line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -12432,43 +12184,39 @@ GtkResponseType remove_from_library_dialog (GtkWindow* owner, const gchar* title
 #line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = count;
 #line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = ngettext ("Remove and _Trash File", "Remove and _Trash Files", (gulong) _tmp0_);
+	_tmp1_ = g_strdup (ngettext ("Remove and _Trash File", "Remove and _Trash Files", (gulong) _tmp0_));
 #line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	trash_action = _tmp2_;
+	trash_action = _tmp1_;
 #line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = owner;
+	_tmp2_ = owner;
 #line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = user_message;
+	_tmp3_ = user_message;
 #line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp3_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CANCEL, "%s", _tmp4_);
+	_tmp4_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp2_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CANCEL, "%s", _tmp3_);
 #line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp5_);
+	g_object_ref_sink (_tmp4_);
 #line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	dialog = _tmp5_;
+	dialog = _tmp4_;
 #line 1367 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = _ ("_Remove From Library");
-#line 1367 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp6_, (gint) GTK_RESPONSE_NO);
+	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _ ("_Remove From Library"), (gint) GTK_RESPONSE_NO);
 #line 1368 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), trash_action, (gint) GTK_RESPONSE_YES);
 #line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = title;
+	_tmp5_ = title;
 #line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = user_message;
+	_tmp6_ = user_message;
 #line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = build_alert_body_text (_tmp7_, _tmp8_, TRUE);
+	_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
 #line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = _tmp9_;
+	_tmp8_ = _tmp7_;
 #line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_message_dialog_set_markup (dialog, _tmp10_);
+	gtk_message_dialog_set_markup (dialog, _tmp8_);
 #line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp10_);
+	_g_free0 (_tmp8_);
 #line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
+	_tmp9_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
 #line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_result_ = (GtkResponseType) _tmp11_;
+	_result_ = (GtkResponseType) _tmp9_;
 #line 1377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
 #line 1379 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -12479,24 +12227,22 @@ GtkResponseType remove_from_library_dialog (GtkWindow* owner, const gchar* title
 	_g_free0 (trash_action);
 #line 1379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12468 "Dialogs.c"
+#line 12216 "Dialogs.c"
 }
 
 
 GtkResponseType remove_from_filesystem_dialog (GtkWindow* owner, const gchar* title, const gchar* user_message) {
 	GtkResponseType result = 0;
 	GtkMessageDialog* dialog = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkMessageDialog* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	GtkWindow* _tmp0_;
+	const gchar* _tmp1_;
+	GtkMessageDialog* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 	GtkResponseType _result_ = 0;
-	gint _tmp9_ = 0;
+	gint _tmp7_;
 #line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), 0);
 #line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -12514,31 +12260,27 @@ GtkResponseType remove_from_filesystem_dialog (GtkWindow* owner, const gchar* ti
 #line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp2_;
 #line 1387 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _ ("_Keep");
-#line 1387 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp3_, (gint) GTK_RESPONSE_NO);
+	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _ ("_Keep"), (gint) GTK_RESPONSE_NO);
 #line 1388 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = _ ("_Delete");
-#line 1388 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp4_, (gint) GTK_RESPONSE_YES);
+	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _ ("_Delete"), (gint) GTK_RESPONSE_YES);
 #line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_NO);
 #line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = title;
+	_tmp3_ = title;
 #line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = user_message;
+	_tmp4_ = user_message;
 #line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
+	_tmp5_ = build_alert_body_text (_tmp3_, _tmp4_, TRUE);
 #line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = _tmp7_;
+	_tmp6_ = _tmp5_;
 #line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_message_dialog_set_markup (dialog, _tmp8_);
+	gtk_message_dialog_set_markup (dialog, _tmp6_);
 #line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp8_);
+	_g_free0 (_tmp6_);
 #line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
+	_tmp7_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
 #line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_result_ = (GtkResponseType) _tmp9_;
+	_result_ = (GtkResponseType) _tmp7_;
 #line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
 #line 1397 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -12547,56 +12289,54 @@ GtkResponseType remove_from_filesystem_dialog (GtkWindow* owner, const gchar* ti
 	_g_object_unref0 (dialog);
 #line 1397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12536 "Dialogs.c"
+#line 12278 "Dialogs.c"
 }
 
 
 gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) {
 	gboolean result = FALSE;
 	gint count = 0;
-	gint _tmp9_ = 0;
+	gint _tmp9_;
 	const gchar* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
+	gint _tmp11_;
 	gchar* headline = NULL;
-	gchar* _tmp14_ = NULL;
+	gchar* _tmp12_;
 	gchar* msg = NULL;
-	gint _tmp15_ = 0;
+	gint _tmp13_;
+	gint _tmp14_;
+	gchar* _tmp15_;
 	const gchar* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	gchar* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
+	gint _tmp17_;
 	gchar* action = NULL;
-	gchar* _tmp23_ = NULL;
+	gchar* _tmp18_;
 	GtkMessageDialog* dialog = NULL;
-	GtkWindow* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	GtkMessageDialog* _tmp26_ = NULL;
-	GtkMessageDialog* _tmp27_ = NULL;
-	const gchar* _tmp28_ = NULL;
-	GtkMessageDialog* _tmp29_ = NULL;
-	const gchar* _tmp30_ = NULL;
-	GtkMessageDialog* _tmp31_ = NULL;
-	const gchar* _tmp32_ = NULL;
-	const gchar* _tmp33_ = NULL;
-	gchar* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
+	GtkWindow* _tmp19_;
+	const gchar* _tmp20_;
+	GtkMessageDialog* _tmp21_;
+	GtkMessageDialog* _tmp22_;
+	GtkMessageDialog* _tmp23_;
+	const gchar* _tmp24_;
+	GtkMessageDialog* _tmp25_;
+	const gchar* _tmp26_;
+	const gchar* _tmp27_;
+	gchar* _tmp28_;
+	gchar* _tmp29_;
 	GtkResponseType _result_ = 0;
-	GtkMessageDialog* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	GtkMessageDialog* _tmp38_ = NULL;
-	GtkResponseType _tmp39_ = 0;
+	GtkMessageDialog* _tmp30_;
+	gint _tmp31_;
+	GtkMessageDialog* _tmp32_;
+	GtkResponseType _tmp33_;
 #line 1400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), FALSE);
 #line 1400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (photos), FALSE);
 #line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	count = 0;
-#line 12581 "Dialogs.c"
+#line 12321 "Dialogs.c"
 	{
 		GeeIterator* _photo_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = photos;
 #line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -12605,14 +12345,14 @@ gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) {
 		_photo_it = _tmp1_;
 #line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 12594 "Dialogs.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 12334 "Dialogs.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			Photo* photo = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			Photo* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			Photo* _tmp6_;
+			gboolean _tmp7_;
 #line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = _photo_it;
 #line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -12621,7 +12361,7 @@ gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) {
 			if (!_tmp3_) {
 #line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 12610 "Dialogs.c"
+#line 12350 "Dialogs.c"
 			}
 #line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _photo_it;
@@ -12635,21 +12375,21 @@ gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) {
 			_tmp7_ = photo_has_editable (_tmp6_);
 #line 1403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp7_) {
-#line 12624 "Dialogs.c"
-				gint _tmp8_ = 0;
+#line 12364 "Dialogs.c"
+				gint _tmp8_;
 #line 1404 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp8_ = count;
 #line 1404 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				count = _tmp8_ + 1;
-#line 12630 "Dialogs.c"
+#line 12370 "Dialogs.c"
 			}
 #line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (photo);
-#line 12634 "Dialogs.c"
+#line 12374 "Dialogs.c"
 		}
 #line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_photo_it);
-#line 12638 "Dialogs.c"
+#line 12378 "Dialogs.c"
 	}
 #line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = count;
@@ -12659,114 +12399,96 @@ gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) {
 		result = FALSE;
 #line 1408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 12648 "Dialogs.c"
+#line 12388 "Dialogs.c"
 	}
 #line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = count;
 #line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp11_ == 1) {
-#line 12654 "Dialogs.c"
-		const gchar* _tmp12_ = NULL;
 #line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = _ ("Revert External Edit?");
-#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = _tmp12_;
-#line 12660 "Dialogs.c"
+		_tmp10_ = _ ("Revert External Edit?");
+#line 12396 "Dialogs.c"
 	} else {
-		const gchar* _tmp13_ = NULL;
 #line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp13_ = _ ("Revert External Edits?");
-#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = _tmp13_;
-#line 12667 "Dialogs.c"
+		_tmp10_ = _ ("Revert External Edits?");
+#line 12400 "Dialogs.c"
 	}
 #line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = g_strdup (_tmp10_);
+	_tmp12_ = g_strdup (_tmp10_);
 #line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	headline = _tmp14_;
-#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = count;
+	headline = _tmp12_;
 #line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = ngettext ("This will destroy all changes made to the external file. Continue?", "This will destroy all changes made to %d external files. Continue?", (gulong) _tmp15_);
+	_tmp13_ = count;
 #line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = count;
+	_tmp14_ = count;
 #line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = g_strdup_printf (_tmp16_, _tmp17_);
+	_tmp15_ = g_strdup_printf (ngettext ("This will destroy all changes made to the external file. Continue?", "This will destroy all changes made to %d external files. Continue?", (gulong) _tmp13_), _tmp14_);
 #line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	msg = _tmp18_;
+	msg = _tmp15_;
 #line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = count;
-#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp20_ == 1) {
-#line 12687 "Dialogs.c"
-		const gchar* _tmp21_ = NULL;
+	_tmp17_ = count;
 #line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp21_ = _ ("Re_vert External Edit");
+	if (_tmp17_ == 1) {
 #line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp19_ = _tmp21_;
-#line 12693 "Dialogs.c"
+		_tmp16_ = _ ("Re_vert External Edit");
+#line 12420 "Dialogs.c"
 	} else {
-		const gchar* _tmp22_ = NULL;
 #line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp22_ = _ ("Re_vert External Edits");
-#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp19_ = _tmp22_;
-#line 12700 "Dialogs.c"
+		_tmp16_ = _ ("Re_vert External Edits");
+#line 12424 "Dialogs.c"
 	}
 #line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = g_strdup (_tmp19_);
+	_tmp18_ = g_strdup (_tmp16_);
 #line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	action = _tmp23_;
+	action = _tmp18_;
 #line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp24_ = owner;
+	_tmp19_ = owner;
 #line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = msg;
+	_tmp20_ = msg;
 #line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp26_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp24_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp25_);
+	_tmp21_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp19_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp20_);
 #line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp26_);
+	g_object_ref_sink (_tmp21_);
 #line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	dialog = _tmp26_;
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp27_ = dialog;
+	dialog = _tmp21_;
 #line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp28_ = _ ("_Cancel");
+	_tmp22_ = dialog;
 #line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_dialog_get_type (), GtkDialog), _tmp28_, (gint) GTK_RESPONSE_CANCEL);
+	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL);
 #line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp29_ = dialog;
+	_tmp23_ = dialog;
 #line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp30_ = action;
+	_tmp24_ = action;
 #line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_dialog_get_type (), GtkDialog), _tmp30_, (gint) GTK_RESPONSE_YES);
+	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_dialog_get_type (), GtkDialog), _tmp24_, (gint) GTK_RESPONSE_YES);
 #line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp31_ = dialog;
+	_tmp25_ = dialog;
 #line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp32_ = headline;
+	_tmp26_ = headline;
 #line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp33_ = msg;
+	_tmp27_ = msg;
 #line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp34_ = build_alert_body_text (_tmp32_, _tmp33_, TRUE);
+	_tmp28_ = build_alert_body_text (_tmp26_, _tmp27_, TRUE);
 #line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp35_ = _tmp34_;
+	_tmp29_ = _tmp28_;
 #line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_message_dialog_set_markup (_tmp31_, _tmp35_);
+	gtk_message_dialog_set_markup (_tmp25_, _tmp29_);
 #line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp35_);
+	_g_free0 (_tmp29_);
 #line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp36_ = dialog;
+	_tmp30_ = dialog;
 #line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp37_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_dialog_get_type (), GtkDialog));
+	_tmp31_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_dialog_get_type (), GtkDialog));
 #line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_result_ = (GtkResponseType) _tmp37_;
+	_result_ = (GtkResponseType) _tmp31_;
 #line 1427 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp38_ = dialog;
+	_tmp32_ = dialog;
 #line 1427 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
 #line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp39_ = _result_;
+	_tmp33_ = _result_;
 #line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = _tmp39_ == GTK_RESPONSE_YES;
+	result = _tmp33_ == GTK_RESPONSE_YES;
 #line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
 #line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -12777,34 +12499,31 @@ gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) {
 	_g_free0 (headline);
 #line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12766 "Dialogs.c"
+#line 12488 "Dialogs.c"
 }
 
 
 gboolean remove_offline_dialog (GtkWindow* owner, gint count) {
 	gboolean result = FALSE;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gchar* msg = NULL;
-	gint _tmp1_ = 0;
-	const gchar* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gchar* _tmp4_ = NULL;
+	gint _tmp1_;
+	gint _tmp2_;
+	gchar* _tmp3_;
 	GtkMessageDialog* dialog = NULL;
-	GtkWindow* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	GtkMessageDialog* _tmp7_ = NULL;
-	GtkMessageDialog* _tmp8_ = NULL;
+	GtkWindow* _tmp4_;
+	const gchar* _tmp5_;
+	GtkMessageDialog* _tmp6_;
+	GtkMessageDialog* _tmp7_;
+	GtkMessageDialog* _tmp8_;
 	const gchar* _tmp9_ = NULL;
-	GtkMessageDialog* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	GtkMessageDialog* _tmp16_ = NULL;
+	gint _tmp10_;
+	GtkMessageDialog* _tmp11_;
 	GtkResponseType _result_ = 0;
-	GtkMessageDialog* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	GtkMessageDialog* _tmp19_ = NULL;
-	GtkResponseType _tmp20_ = 0;
+	GtkMessageDialog* _tmp12_;
+	gint _tmp13_;
+	GtkMessageDialog* _tmp14_;
+	GtkResponseType _tmp15_;
 #line 1432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), FALSE);
 #line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -12815,91 +12534,78 @@ gboolean remove_offline_dialog (GtkWindow* owner, gint count) {
 		result = FALSE;
 #line 1434 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 12804 "Dialogs.c"
+#line 12523 "Dialogs.c"
 	}
 #line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = count;
 #line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = ngettext ("This will remove the photo from the library. Continue?", "This will remove %d photos from the library. Continue?", (gulong) _tmp1_);
-#line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = count;
+	_tmp2_ = count;
 #line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = g_strdup_printf (_tmp2_, _tmp3_);
+	_tmp3_ = g_strdup_printf (ngettext ("This will remove the photo from the library. Continue?", "This will remove %d photos from the library. Continue?", (gulong) _tmp1_), _tmp2_);
 #line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	msg = _tmp4_;
+	msg = _tmp3_;
 #line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = owner;
+	_tmp4_ = owner;
 #line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = msg;
+	_tmp5_ = msg;
 #line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp5_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp6_);
+	_tmp6_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp4_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp5_);
 #line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp7_);
+	g_object_ref_sink (_tmp6_);
 #line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	dialog = _tmp7_;
+	dialog = _tmp6_;
 #line 1443 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = dialog;
-#line 1443 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = _ ("_Cancel");
+	_tmp7_ = dialog;
 #line 1443 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_dialog_get_type (), GtkDialog), _tmp9_, (gint) GTK_RESPONSE_CANCEL);
-#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = dialog;
+	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL);
 #line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = _ ("_Remove");
+	_tmp8_ = dialog;
 #line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_dialog_get_type (), GtkDialog), _tmp11_, (gint) GTK_RESPONSE_OK);
-#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = count;
+	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_dialog_get_type (), GtkDialog), _ ("_Remove"), (gint) GTK_RESPONSE_OK);
 #line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp13_ == 1) {
-#line 12842 "Dialogs.c"
-		const gchar* _tmp14_ = NULL;
+	_tmp10_ = count;
 #line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp14_ = _ ("Remove Photo From Library");
+	if (_tmp10_ == 1) {
 #line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = _tmp14_;
-#line 12848 "Dialogs.c"
+		_tmp9_ = _ ("Remove Photo From Library");
+#line 12557 "Dialogs.c"
 	} else {
-		const gchar* _tmp15_ = NULL;
-#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp15_ = _ ("Remove Photos From Library");
 #line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = _tmp15_;
-#line 12855 "Dialogs.c"
+		_tmp9_ = _ ("Remove Photos From Library");
+#line 12561 "Dialogs.c"
 	}
 #line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = dialog;
+	_tmp11_ = dialog;
 #line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_window_get_type (), GtkWindow), _tmp12_);
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow), _tmp9_);
 #line 1447 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = dialog;
+	_tmp12_ = dialog;
 #line 1447 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_dialog_get_type (), GtkDialog));
+	_tmp13_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_dialog_get_type (), GtkDialog));
 #line 1447 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_result_ = (GtkResponseType) _tmp18_;
+	_result_ = (GtkResponseType) _tmp13_;
 #line 1449 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp19_ = dialog;
+	_tmp14_ = dialog;
 #line 1449 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
 #line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = _result_;
+	_tmp15_ = _result_;
 #line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = _tmp20_ == GTK_RESPONSE_OK;
+	result = _tmp15_ == GTK_RESPONSE_OK;
 #line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
 #line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
 #line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12881 "Dialogs.c"
+#line 12587 "Dialogs.c"
 }
 
 
 static void _progress_dialog_on_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_on_cancel ((ProgressDialog*) self);
-#line 12888 "Dialogs.c"
+#line 12594 "Dialogs.c"
 }
 
 
@@ -12908,37 +12614,37 @@ static gboolean _progress_dialog_on_window_closed_gtk_widget_delete_event (GtkWi
 	result = progress_dialog_on_window_closed ((ProgressDialog*) self);
 #line 1485 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12897 "Dialogs.c"
+#line 12603 "Dialogs.c"
 }
 
 
 ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable) {
 	ProgressDialog * self = NULL;
-	GCancellable* _tmp0_ = NULL;
-	GCancellable* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	GtkWindow* _tmp3_ = NULL;
-	GtkProgressBar* _tmp5_ = NULL;
-	GtkProgressBar* _tmp6_ = NULL;
+	GCancellable* _tmp0_;
+	GCancellable* _tmp1_;
+	const gchar* _tmp2_;
+	GtkWindow* _tmp3_;
+	GtkProgressBar* _tmp5_;
+	GtkProgressBar* _tmp6_;
 	GtkBox* vbox_bar = NULL;
-	GtkBox* _tmp7_ = NULL;
-	GtkBox* _tmp8_ = NULL;
-	GtkProgressBar* _tmp9_ = NULL;
-	GCancellable* _tmp10_ = NULL;
+	GtkBox* _tmp7_;
+	GtkBox* _tmp8_;
+	GtkProgressBar* _tmp9_;
+	GCancellable* _tmp10_;
 	GtkBox* hbox = NULL;
-	GtkBox* _tmp13_ = NULL;
-	GtkBox* _tmp14_ = NULL;
-	GtkBox* _tmp15_ = NULL;
-	GtkButton* _tmp16_ = NULL;
+	GtkBox* _tmp13_;
+	GtkBox* _tmp14_;
+	GtkBox* _tmp15_;
+	GtkButton* _tmp16_;
 	GtkLabel* primary_text_label = NULL;
-	GtkLabel* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
+	GtkLabel* _tmp19_;
+	const gchar* _tmp20_;
+	gchar* _tmp21_;
+	gchar* _tmp22_;
 	GtkBox* vbox = NULL;
-	GtkBox* _tmp23_ = NULL;
-	GtkBox* _tmp24_ = NULL;
-	gulong _tmp25_ = 0UL;
+	GtkBox* _tmp23_;
+	GtkBox* _tmp24_;
+	gulong _tmp25_;
 #line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail ((owner == NULL) || GTK_IS_WINDOW (owner), NULL);
 #line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -12965,13 +12671,13 @@ ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner,
 	_tmp3_ = owner;
 #line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ != NULL) {
-#line 12954 "Dialogs.c"
-		GtkWindow* _tmp4_ = NULL;
+#line 12660 "Dialogs.c"
+		GtkWindow* _tmp4_;
 #line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = owner;
 #line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
-#line 12960 "Dialogs.c"
+#line 12666 "Dialogs.c"
 	}
 #line 1473 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
@@ -13001,9 +12707,9 @@ ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner,
 	_tmp10_ = cancellable;
 #line 1482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp10_ != NULL) {
-#line 12990 "Dialogs.c"
-		GtkButton* _tmp11_ = NULL;
-		GtkButton* _tmp12_ = NULL;
+#line 12696 "Dialogs.c"
+		GtkButton* _tmp11_;
+		GtkButton* _tmp12_;
 #line 1483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
 #line 1483 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -13018,7 +12724,7 @@ ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner,
 		g_signal_connect_object (_tmp12_, "clicked", (GCallback) _progress_dialog_on_cancel_gtk_button_clicked, self, 0);
 #line 1485 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _progress_dialog_on_window_closed_gtk_widget_delete_event, self, 0);
-#line 13007 "Dialogs.c"
+#line 12713 "Dialogs.c"
 	}
 #line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
@@ -13036,16 +12742,16 @@ ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner,
 	_tmp16_ = self->priv->cancel_button;
 #line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp16_ != NULL) {
-#line 13025 "Dialogs.c"
-		GtkBox* _tmp17_ = NULL;
-		GtkButton* _tmp18_ = NULL;
+#line 12731 "Dialogs.c"
+		GtkBox* _tmp17_;
+		GtkButton* _tmp18_;
 #line 1491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = hbox;
 #line 1491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->cancel_button;
 #line 1491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_box_pack_end (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 13034 "Dialogs.c"
+#line 12740 "Dialogs.c"
 	}
 #line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = (GtkLabel*) gtk_label_new ("");
@@ -13111,20 +12817,20 @@ ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner,
 	_g_object_unref0 (vbox_bar);
 #line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 13100 "Dialogs.c"
+#line 12806 "Dialogs.c"
 }
 
 
 ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable) {
 #line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return progress_dialog_construct (TYPE_PROGRESS_DIALOG, owner, text, cancellable);
-#line 13107 "Dialogs.c"
+#line 12813 "Dialogs.c"
 }
 
 
 static void progress_dialog_real_realize (GtkWidget* base) {
 	ProgressDialog * self;
-	GCancellable* _tmp0_ = NULL;
+	GCancellable* _tmp0_;
 #line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PROGRESS_DIALOG, ProgressDialog);
 #line 1516 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -13133,20 +12839,20 @@ static void progress_dialog_real_realize (GtkWidget* base) {
 	_tmp0_ = self->priv->cancellable;
 #line 1519 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 13122 "Dialogs.c"
-		GdkWindow* _tmp1_ = NULL;
+#line 12828 "Dialogs.c"
+		GdkWindow* _tmp1_;
 #line 1520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 1520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gdk_window_set_functions (_tmp1_, GDK_FUNC_MOVE);
-#line 13128 "Dialogs.c"
+#line 12834 "Dialogs.c"
 	}
 }
 
 
 void progress_dialog_update_display_every (ProgressDialog* self, gint update_every) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 1523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
 #line 1524 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -13157,25 +12863,25 @@ void progress_dialog_update_display_every (ProgressDialog* self, gint update_eve
 	_tmp1_ = update_every;
 #line 1526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->update_every = _tmp1_;
-#line 13146 "Dialogs.c"
+#line 12852 "Dialogs.c"
 }
 
 
 void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, gint minimum_on_screen_time_msec) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 1529 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
 #line 1530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = minimum_on_screen_time_msec;
 #line 1530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->minimum_on_screen_time_msec = _tmp0_;
-#line 13158 "Dialogs.c"
+#line 12864 "Dialogs.c"
 }
 
 
 void progress_dialog_set_fraction (ProgressDialog* self, gint current, gint total) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 1533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
 #line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -13184,21 +12890,20 @@ void progress_dialog_set_fraction (ProgressDialog* self, gint current, gint tota
 	_tmp1_ = total;
 #line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_set_percentage (self, ((gdouble) _tmp0_) / ((gdouble) _tmp1_));
-#line 13173 "Dialogs.c"
+#line 12879 "Dialogs.c"
 }
 
 
 void progress_dialog_set_percentage (ProgressDialog* self, gdouble pct) {
-	gdouble _tmp0_ = 0.0;
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
-	GtkProgressBar* _tmp3_ = NULL;
-	gdouble _tmp4_ = 0.0;
-	GtkProgressBar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gdouble _tmp7_ = 0.0;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
+	gdouble _tmp0_;
+	gdouble _tmp1_;
+	gdouble _tmp2_;
+	GtkProgressBar* _tmp3_;
+	gdouble _tmp4_;
+	GtkProgressBar* _tmp5_;
+	gdouble _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
 #line 1537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
 #line 1538 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -13220,24 +12925,22 @@ void progress_dialog_set_percentage (ProgressDialog* self, gdouble pct) {
 #line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->progress_bar;
 #line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = _ ("%d%%");
+	_tmp6_ = pct;
 #line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = pct;
+	_tmp7_ = g_strdup_printf (_ ("%d%%"), (gint) (_tmp6_ * 100.0));
 #line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = g_strdup_printf (_tmp6_, (gint) (_tmp7_ * 100.0));
-#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_progress_bar_set_text (_tmp5_, _tmp9_);
+	gtk_progress_bar_set_text (_tmp5_, _tmp8_);
 #line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp9_);
-#line 13220 "Dialogs.c"
+	_g_free0 (_tmp8_);
+#line 12923 "Dialogs.c"
 }
 
 
 void progress_dialog_set_status (ProgressDialog* self, const gchar* text) {
-	GtkProgressBar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	GtkProgressBar* _tmp0_;
+	const gchar* _tmp1_;
 #line 1551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
 #line 1551 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -13250,18 +12953,18 @@ void progress_dialog_set_status (ProgressDialog* self, const gchar* text) {
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
 #line 1558 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 13239 "Dialogs.c"
+#line 12942 "Dialogs.c"
 }
 
 
 gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	guint64 _tmp1_ = 0ULL;
+	guint64 _tmp1_;
 	gboolean _tmp8_ = FALSE;
-	GCancellable* _tmp9_ = NULL;
+	GCancellable* _tmp9_;
 	gboolean keep_going = FALSE;
-	gboolean _tmp12_ = FALSE;
+	gboolean _tmp12_;
 #line 1562 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PROGRESS_DIALOG (self), FALSE);
 #line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -13270,11 +12973,11 @@ gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 t
 	if (_tmp1_ == G_MAXUINT64) {
 #line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 13259 "Dialogs.c"
+#line 12962 "Dialogs.c"
 	} else {
-		guint64 _tmp2_ = 0ULL;
-		guint64 _tmp3_ = 0ULL;
-		gint _tmp4_ = 0;
+		guint64 _tmp2_;
+		guint64 _tmp3_;
+		gint _tmp4_;
 #line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = count;
 #line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -13283,14 +12986,14 @@ gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 t
 		_tmp4_ = self->priv->update_every;
 #line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = (_tmp2_ - _tmp3_) >= ((guint64) _tmp4_);
-#line 13272 "Dialogs.c"
+#line 12975 "Dialogs.c"
 	}
 #line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 13276 "Dialogs.c"
-		guint64 _tmp5_ = 0ULL;
-		guint64 _tmp6_ = 0ULL;
-		guint64 _tmp7_ = 0ULL;
+#line 12979 "Dialogs.c"
+		guint64 _tmp5_;
+		guint64 _tmp6_;
+		guint64 _tmp7_;
 #line 1564 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = count;
 #line 1564 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -13301,26 +13004,26 @@ gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 t
 		_tmp7_ = count;
 #line 1565 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->last_count = _tmp7_;
-#line 13290 "Dialogs.c"
+#line 12993 "Dialogs.c"
 	}
 #line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = self->priv->cancellable;
 #line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp9_ != NULL) {
-#line 13296 "Dialogs.c"
-		GCancellable* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
+#line 12999 "Dialogs.c"
+		GCancellable* _tmp10_;
+		gboolean _tmp11_;
 #line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->cancellable;
 #line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = g_cancellable_is_cancelled (_tmp10_);
 #line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = !_tmp11_;
-#line 13305 "Dialogs.c"
+#line 13008 "Dialogs.c"
 	} else {
 #line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = TRUE;
-#line 13309 "Dialogs.c"
+#line 13012 "Dialogs.c"
 	}
 #line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	keep_going = _tmp8_;
@@ -13330,13 +13033,13 @@ gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 t
 	if (_tmp12_) {
 #line 1577 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		spin_event_loop ();
-#line 13319 "Dialogs.c"
+#line 13022 "Dialogs.c"
 	}
 #line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = keep_going;
 #line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13325 "Dialogs.c"
+#line 13028 "Dialogs.c"
 }
 
 
@@ -13347,7 +13050,7 @@ void progress_dialog_close (ProgressDialog* self) {
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 1588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 13336 "Dialogs.c"
+#line 13039 "Dialogs.c"
 }
 
 
@@ -13361,39 +13064,39 @@ static gboolean progress_dialog_on_window_closed (ProgressDialog* self) {
 	result = FALSE;
 #line 1593 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13350 "Dialogs.c"
+#line 13053 "Dialogs.c"
 }
 
 
 static void progress_dialog_on_cancel (ProgressDialog* self) {
-	GCancellable* _tmp0_ = NULL;
-	GtkButton* _tmp2_ = NULL;
+	GCancellable* _tmp0_;
+	GtkButton* _tmp2_;
 #line 1597 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
 #line 1598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->cancellable;
 #line 1598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ != NULL) {
-#line 13363 "Dialogs.c"
-		GCancellable* _tmp1_ = NULL;
+#line 13066 "Dialogs.c"
+		GCancellable* _tmp1_;
 #line 1599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->cancellable;
 #line 1599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_cancellable_cancel (_tmp1_);
-#line 13369 "Dialogs.c"
+#line 13072 "Dialogs.c"
 	}
 #line 1601 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->cancel_button;
 #line 1601 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 13375 "Dialogs.c"
+#line 13078 "Dialogs.c"
 }
 
 
 static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 #line 1604 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
 #line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -13402,10 +13105,10 @@ static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) {
 	_tmp2_ = _tmp1_;
 #line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp2_) {
-#line 13391 "Dialogs.c"
-		gulong _tmp3_ = 0UL;
-		gulong _tmp4_ = 0UL;
-		gint _tmp5_ = 0;
+#line 13094 "Dialogs.c"
+		gulong _tmp3_;
+		gulong _tmp4_;
+		gint _tmp5_;
 #line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = now_ms ();
 #line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -13414,22 +13117,22 @@ static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) {
 		_tmp5_ = self->priv->minimum_on_screen_time_msec;
 #line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = (_tmp3_ - _tmp4_) > ((gulong) _tmp5_);
-#line 13403 "Dialogs.c"
+#line 13106 "Dialogs.c"
 	} else {
 #line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 13407 "Dialogs.c"
+#line 13110 "Dialogs.c"
 	}
 #line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 13411 "Dialogs.c"
+#line 13114 "Dialogs.c"
 		gdouble pps = 0.0;
-		gdouble _tmp6_ = 0.0;
-		gint _tmp7_ = 0;
+		gdouble _tmp6_;
+		gint _tmp7_;
 		gdouble ttc = 0.0;
-		gdouble _tmp8_ = 0.0;
-		gdouble _tmp9_ = 0.0;
-		gint _tmp10_ = 0;
+		gdouble _tmp8_;
+		gdouble _tmp9_;
+		gint _tmp10_;
 #line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = pct;
 #line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -13450,7 +13153,7 @@ static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) {
 			gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 1620 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			spin_event_loop ();
-#line 13439 "Dialogs.c"
+#line 13142 "Dialogs.c"
 		}
 	}
 }
@@ -13462,15 +13165,15 @@ static void progress_dialog_class_init (ProgressDialogClass * klass) {
 #line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (ProgressDialogPrivate));
 #line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((GtkWidgetClass *) klass)->realize = (void (*)(GtkWidget*)) progress_dialog_real_realize;
+	((GtkWidgetClass *) klass)->realize = (void (*) (GtkWidget *)) progress_dialog_real_realize;
 #line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = progress_dialog_finalize;
-#line 13454 "Dialogs.c"
+#line 13157 "Dialogs.c"
 }
 
 
 static void progress_dialog_instance_init (ProgressDialog * self) {
-	GtkProgressBar* _tmp0_ = NULL;
+	GtkProgressBar* _tmp0_;
 #line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = PROGRESS_DIALOG_GET_PRIVATE (self);
 #line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -13487,11 +13190,11 @@ static void progress_dialog_instance_init (ProgressDialog * self) {
 	self->priv->update_every = 1;
 #line 1460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->minimum_on_screen_time_msec = 500;
-#line 13476 "Dialogs.c"
+#line 13179 "Dialogs.c"
 }
 
 
-static void progress_dialog_finalize (GObject* obj) {
+static void progress_dialog_finalize (GObject * obj) {
 	ProgressDialog * self;
 #line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_DIALOG, ProgressDialog);
@@ -13503,7 +13206,7 @@ static void progress_dialog_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->cancellable);
 #line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (progress_dialog_parent_class)->finalize (obj);
-#line 13492 "Dialogs.c"
+#line 13195 "Dialogs.c"
 }
 
 
@@ -13534,28 +13237,28 @@ static GType adjust_date_time_dialog_time_system_get_type (void) {
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
 #line 1672 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13523 "Dialogs.c"
+#line 13226 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender, gpointer self) {
 #line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13530 "Dialogs.c"
+#line 13233 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender, gpointer self) {
 #line 1674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13537 "Dialogs.c"
+#line 13240 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender, gpointer self) {
 #line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13544 "Dialogs.c"
+#line 13247 "Dialogs.c"
 }
 
 
@@ -13564,170 +13267,165 @@ static gboolean _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_o
 	result = adjust_date_time_dialog_on_spin_button_output ((AdjustDateTimeDialog*) self, _sender);
 #line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13553 "Dialogs.c"
+#line 13256 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_system_changed ((AdjustDateTimeDialog*) self);
-#line 13560 "Dialogs.c"
+#line 13263 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
 #line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13567 "Dialogs.c"
+#line 13270 "Dialogs.c"
 }
 
 
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return;
-#line 13582 "Dialogs.c"
+#line 13285 "Dialogs.c"
 }
 
 
 AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video) {
 	AdjustDateTimeDialog * self = NULL;
-	Dateable* _tmp0_ = NULL;
+	Dateable* _tmp0_;
 	gboolean use_header = FALSE;
-	GtkSettings* _tmp1_ = NULL;
+	GtkSettings* _tmp1_;
 	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
-	AppWindow* _tmp4_ = NULL;
-	AppWindow* _tmp5_ = NULL;
-	GtkCalendar* _tmp6_ = NULL;
-	GtkCalendar* _tmp7_ = NULL;
-	GtkCalendar* _tmp8_ = NULL;
-	GtkCalendar* _tmp9_ = NULL;
-	GtkCalendar* _tmp10_ = NULL;
-	ConfigFacade* _tmp11_ = NULL;
-	ConfigFacade* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	gboolean _tmp14_ = FALSE;
-	GtkSpinButton* _tmp17_ = NULL;
-	GtkSpinButton* _tmp18_ = NULL;
-	GtkSpinButton* _tmp19_ = NULL;
-	GtkSpinButton* _tmp20_ = NULL;
-	GtkSpinButton* _tmp21_ = NULL;
-	GtkSpinButton* _tmp22_ = NULL;
-	GtkSpinButton* _tmp23_ = NULL;
-	GtkSpinButton* _tmp24_ = NULL;
-	GtkSpinButton* _tmp25_ = NULL;
-	GtkSpinButton* _tmp26_ = NULL;
-	GtkSpinButton* _tmp27_ = NULL;
-	GtkComboBoxText* _tmp28_ = NULL;
-	GtkComboBoxText* _tmp29_ = NULL;
-	const gchar* _tmp30_ = NULL;
-	GtkComboBoxText* _tmp31_ = NULL;
-	const gchar* _tmp32_ = NULL;
-	GtkComboBoxText* _tmp33_ = NULL;
-	const gchar* _tmp34_ = NULL;
-	GtkComboBoxText* _tmp35_ = NULL;
+	gboolean _tmp3_;
+	AppWindow* _tmp4_;
+	AppWindow* _tmp5_;
+	GtkCalendar* _tmp6_;
+	GtkCalendar* _tmp7_;
+	GtkCalendar* _tmp8_;
+	GtkCalendar* _tmp9_;
+	GtkCalendar* _tmp10_;
+	ConfigFacade* _tmp11_;
+	ConfigFacade* _tmp12_;
+	gboolean _tmp13_;
+	gboolean _tmp14_;
+	GtkSpinButton* _tmp17_;
+	GtkSpinButton* _tmp18_;
+	GtkSpinButton* _tmp19_;
+	GtkSpinButton* _tmp20_;
+	GtkSpinButton* _tmp21_;
+	GtkSpinButton* _tmp22_;
+	GtkSpinButton* _tmp23_;
+	GtkSpinButton* _tmp24_;
+	GtkSpinButton* _tmp25_;
+	GtkSpinButton* _tmp26_;
+	GtkSpinButton* _tmp27_;
+	GtkComboBoxText* _tmp28_;
+	GtkComboBoxText* _tmp29_;
+	GtkComboBoxText* _tmp30_;
+	GtkComboBoxText* _tmp31_;
+	GtkComboBoxText* _tmp32_;
 	GtkBox* clock = NULL;
-	GtkBox* _tmp36_ = NULL;
-	GtkBox* _tmp37_ = NULL;
-	GtkSpinButton* _tmp38_ = NULL;
-	GtkBox* _tmp39_ = NULL;
-	GtkLabel* _tmp40_ = NULL;
-	GtkLabel* _tmp41_ = NULL;
-	GtkBox* _tmp42_ = NULL;
-	GtkSpinButton* _tmp43_ = NULL;
-	GtkBox* _tmp44_ = NULL;
-	GtkLabel* _tmp45_ = NULL;
-	GtkLabel* _tmp46_ = NULL;
-	GtkBox* _tmp47_ = NULL;
-	GtkSpinButton* _tmp48_ = NULL;
-	GtkBox* _tmp49_ = NULL;
-	GtkComboBoxText* _tmp50_ = NULL;
-	const gchar* _tmp51_ = NULL;
-	GtkRadioButton* _tmp52_ = NULL;
-	GtkRadioButton* _tmp53_ = NULL;
-	ConfigFacade* _tmp54_ = NULL;
-	ConfigFacade* _tmp55_ = NULL;
-	gboolean _tmp56_ = FALSE;
-	gboolean _tmp57_ = FALSE;
-	gboolean _tmp58_ = FALSE;
-	GtkRadioButton* _tmp60_ = NULL;
-	GtkRadioButton* _tmp61_ = NULL;
-	GSList* _tmp62_ = NULL;
-	const gchar* _tmp63_ = NULL;
-	GtkRadioButton* _tmp64_ = NULL;
-	GtkRadioButton* _tmp65_ = NULL;
-	ConfigFacade* _tmp66_ = NULL;
-	ConfigFacade* _tmp67_ = NULL;
-	gboolean _tmp68_ = FALSE;
-	gboolean _tmp69_ = FALSE;
-	gboolean _tmp70_ = FALSE;
-	GtkRadioButton* _tmp72_ = NULL;
-	GtkRadioButton* _tmp73_ = NULL;
-	gboolean _tmp74_ = FALSE;
+	GtkBox* _tmp33_;
+	GtkBox* _tmp34_;
+	GtkSpinButton* _tmp35_;
+	GtkBox* _tmp36_;
+	GtkLabel* _tmp37_;
+	GtkLabel* _tmp38_;
+	GtkBox* _tmp39_;
+	GtkSpinButton* _tmp40_;
+	GtkBox* _tmp41_;
+	GtkLabel* _tmp42_;
+	GtkLabel* _tmp43_;
+	GtkBox* _tmp44_;
+	GtkSpinButton* _tmp45_;
+	GtkBox* _tmp46_;
+	GtkComboBoxText* _tmp47_;
+	GtkRadioButton* _tmp48_;
+	GtkRadioButton* _tmp49_;
+	ConfigFacade* _tmp50_;
+	ConfigFacade* _tmp51_;
+	gboolean _tmp52_;
+	gboolean _tmp53_ = FALSE;
+	gboolean _tmp54_;
+	GtkRadioButton* _tmp56_;
+	GtkRadioButton* _tmp57_;
+	GSList* _tmp58_;
+	GtkRadioButton* _tmp59_;
+	GtkRadioButton* _tmp60_;
+	ConfigFacade* _tmp61_;
+	ConfigFacade* _tmp62_;
+	gboolean _tmp63_;
+	gboolean _tmp64_ = FALSE;
+	gboolean _tmp65_;
+	GtkRadioButton* _tmp67_;
+	GtkRadioButton* _tmp68_;
+	gboolean _tmp69_;
+	gboolean _tmp78_ = FALSE;
+	ConfigFacade* _tmp79_;
+	ConfigFacade* _tmp80_;
+	gboolean _tmp81_;
+	gboolean _tmp82_;
+	GtkCheckButton* _tmp84_;
 	gboolean _tmp85_ = FALSE;
-	ConfigFacade* _tmp86_ = NULL;
-	ConfigFacade* _tmp87_ = NULL;
-	gboolean _tmp88_ = FALSE;
-	gboolean _tmp89_ = FALSE;
-	GtkCheckButton* _tmp91_ = NULL;
-	gboolean _tmp92_ = FALSE;
-	gboolean _tmp93_ = FALSE;
-	GtkCheckButton* _tmp100_ = NULL;
+	gboolean _tmp86_;
+	GtkCheckButton* _tmp93_;
 	GtkBox* time_content = NULL;
-	GtkBox* _tmp101_ = NULL;
-	GtkBox* _tmp102_ = NULL;
-	GtkCalendar* _tmp103_ = NULL;
-	GtkBox* _tmp104_ = NULL;
-	GtkBox* _tmp105_ = NULL;
-	gboolean _tmp106_ = FALSE;
+	GtkBox* _tmp94_;
+	GtkBox* _tmp95_;
+	GtkCalendar* _tmp96_;
+	GtkBox* _tmp97_;
+	GtkBox* _tmp98_;
+	gboolean _tmp99_;
 	GdkPixbuf* preview = NULL;
 	GtkBox* image_content = NULL;
-	GtkBox* _tmp120_ = NULL;
-	GtkBox* _tmp121_ = NULL;
-	GtkBox* _tmp122_ = NULL;
-	GtkImage* _tmp123_ = NULL;
-	GdkPixbuf* _tmp124_ = NULL;
+	GtkBox* _tmp113_;
+	GtkBox* _tmp114_;
+	GtkBox* _tmp115_;
+	GtkImage* _tmp116_ = NULL;
+	GdkPixbuf* _tmp117_;
 	GtkImage* image = NULL;
-	GtkImage* _tmp128_ = NULL;
-	GtkLabel* _tmp129_ = NULL;
-	GtkBox* _tmp130_ = NULL;
-	GtkImage* _tmp131_ = NULL;
-	GtkBox* _tmp132_ = NULL;
-	GtkLabel* _tmp133_ = NULL;
+	GtkImage* _tmp121_;
+	GtkLabel* _tmp122_;
+	GtkBox* _tmp123_;
+	GtkImage* _tmp124_;
+	GtkBox* _tmp125_;
+	GtkLabel* _tmp126_;
 	GtkBox* hbox = NULL;
-	GtkBox* _tmp134_ = NULL;
-	GtkBox* _tmp135_ = NULL;
-	GtkBox* _tmp136_ = NULL;
-	GtkBox* _tmp137_ = NULL;
-	GtkBox* _tmp138_ = NULL;
-	GtkBox* _tmp139_ = NULL;
-	GtkBox* _tmp140_ = NULL;
-	GtkBox* _tmp141_ = NULL;
-	GtkBox* _tmp142_ = NULL;
-	GtkBox* _tmp143_ = NULL;
-	GtkBox* _tmp144_ = NULL;
-	GtkBox* _tmp145_ = NULL;
-	GtkLabel* _tmp146_ = NULL;
-	GtkLabel* _tmp147_ = NULL;
-	GtkLabel* _tmp148_ = NULL;
-	GtkBox* _tmp149_ = NULL;
-	GtkLabel* _tmp150_ = NULL;
-	Dateable* _tmp151_ = NULL;
-	time_t _tmp152_ = 0;
-	time_t _tmp153_ = 0;
-	time_t _tmp155_ = 0;
-	struct tm _tmp156_ = {0};
-	ConfigFacade* _tmp157_ = NULL;
-	ConfigFacade* _tmp158_ = NULL;
-	gboolean _tmp159_ = FALSE;
+	GtkBox* _tmp127_;
+	GtkBox* _tmp128_;
+	GtkBox* _tmp129_;
+	GtkBox* _tmp130_;
+	GtkBox* _tmp131_;
+	GtkBox* _tmp132_;
+	GtkBox* _tmp133_;
+	GtkBox* _tmp134_;
+	GtkBox* _tmp135_;
+	GtkBox* _tmp136_;
+	GtkBox* _tmp137_;
+	GtkBox* _tmp138_;
+	GtkLabel* _tmp139_;
+	GtkLabel* _tmp140_;
+	GtkLabel* _tmp141_;
+	GtkBox* _tmp142_;
+	GtkLabel* _tmp143_;
+	Dateable* _tmp144_;
+	time_t _tmp145_;
+	time_t _tmp146_;
+	time_t _tmp148_;
+	struct tm _tmp149_ = {0};
+	ConfigFacade* _tmp150_;
+	ConfigFacade* _tmp151_;
+	gboolean _tmp152_;
 	GError * _inner_error_ = NULL;
 #line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_DATEABLE (source), NULL);
@@ -13745,11 +13443,11 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 	if (_tmp3_) {
 #line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = 1;
-#line 13734 "Dialogs.c"
+#line 13432 "Dialogs.c"
 	} else {
 #line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = 0;
-#line 13738 "Dialogs.c"
+#line 13436 "Dialogs.c"
 	}
 #line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (AdjustDateTimeDialog*) g_object_new (object_type, "use-header-bar", _tmp2_, NULL);
@@ -13805,8 +13503,8 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 	_g_object_unref0 (_tmp12_);
 #line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_) {
-#line 13794 "Dialogs.c"
-		GtkSpinButton* _tmp15_ = NULL;
+#line 13492 "Dialogs.c"
+		GtkSpinButton* _tmp15_;
 #line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 23, (gdouble) 1);
 #line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -13815,9 +13513,9 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 		_g_object_unref0 (self->priv->hour);
 #line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->hour = _tmp15_;
-#line 13804 "Dialogs.c"
+#line 13502 "Dialogs.c"
 	} else {
-		GtkSpinButton* _tmp16_ = NULL;
+		GtkSpinButton* _tmp16_;
 #line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 1, (gdouble) 12, (gdouble) 1);
 #line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -13826,7 +13524,7 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 		_g_object_unref0 (self->priv->hour);
 #line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->hour = _tmp16_;
-#line 13815 "Dialogs.c"
+#line 13513 "Dialogs.c"
 	}
 #line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = self->priv->hour;
@@ -13891,414 +13589,398 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 #line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->system;
 #line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp30_ = _ ("AM");
-#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_combo_box_text_append_text (_tmp29_, _tmp30_);
+	gtk_combo_box_text_append_text (_tmp29_, _ ("AM"));
 #line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp31_ = self->priv->system;
+	_tmp30_ = self->priv->system;
 #line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp32_ = _ ("PM");
-#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_combo_box_text_append_text (_tmp31_, _tmp32_);
-#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp33_ = self->priv->system;
+	gtk_combo_box_text_append_text (_tmp30_, _ ("PM"));
 #line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp34_ = _ ("24 Hr");
+	_tmp31_ = self->priv->system;
 #line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_combo_box_text_append_text (_tmp33_, _tmp34_);
+	gtk_combo_box_text_append_text (_tmp31_, _ ("24 Hr"));
 #line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp35_ = self->priv->system;
+	_tmp32_ = self->priv->system;
 #line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed, self, 0);
 #line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp36_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+	_tmp33_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 #line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp36_);
+	g_object_ref_sink (_tmp33_);
 #line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	clock = _tmp36_;
+	clock = _tmp33_;
 #line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp37_ = clock;
+	_tmp34_ = clock;
 #line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp38_ = self->priv->hour;
+	_tmp35_ = self->priv->hour;
 #line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp39_ = clock;
+	_tmp36_ = clock;
 #line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp40_ = (GtkLabel*) gtk_label_new (":");
+	_tmp37_ = (GtkLabel*) gtk_label_new (":");
 #line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp40_);
+	g_object_ref_sink (_tmp37_);
 #line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp41_ = _tmp40_;
+	_tmp38_ = _tmp37_;
 #line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp41_);
+	_g_object_unref0 (_tmp38_);
 #line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp42_ = clock;
+	_tmp39_ = clock;
 #line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp43_ = self->priv->minute;
+	_tmp40_ = self->priv->minute;
 #line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp44_ = clock;
+	_tmp41_ = clock;
 #line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp45_ = (GtkLabel*) gtk_label_new (":");
+	_tmp42_ = (GtkLabel*) gtk_label_new (":");
 #line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp45_);
+	g_object_ref_sink (_tmp42_);
 #line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp46_ = _tmp45_;
+	_tmp43_ = _tmp42_;
 #line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp46_);
+	_g_object_unref0 (_tmp43_);
 #line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp47_ = clock;
+	_tmp44_ = clock;
 #line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp48_ = self->priv->second;
+	_tmp45_ = self->priv->second;
 #line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp49_ = clock;
+	_tmp46_ = clock;
 #line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp50_ = self->priv->system;
+	_tmp47_ = self->priv->system;
 #line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 1711 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
 #line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp51_ = _ ("_Shift photos/videos by the same amount");
+	_tmp48_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (NULL, _ ("_Shift photos/videos by the same amount"));
 #line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp52_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (NULL, _tmp51_);
-#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp52_);
+	g_object_ref_sink (_tmp48_);
 #line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->relativity_radio_button);
 #line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->relativity_radio_button = _tmp52_;
+	self->priv->relativity_radio_button = _tmp48_;
 #line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp53_ = self->priv->relativity_radio_button;
+	_tmp49_ = self->priv->relativity_radio_button;
 #line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp54_ = config_facade_get_instance ();
+	_tmp50_ = config_facade_get_instance ();
 #line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp55_ = _tmp54_;
+	_tmp51_ = _tmp50_;
 #line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp56_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp52_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp56_);
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp52_);
 #line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp55_);
+	_g_object_unref0 (_tmp51_);
 #line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp58_ = display_options;
+	_tmp54_ = display_options;
 #line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp58_) {
-#line 13981 "Dialogs.c"
-		gint _tmp59_ = 0;
+	if (_tmp54_) {
+#line 13671 "Dialogs.c"
+		gint _tmp55_;
 #line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp59_ = photo_count;
+		_tmp55_ = photo_count;
 #line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp57_ = _tmp59_ > 1;
-#line 13987 "Dialogs.c"
+		_tmp53_ = _tmp55_ > 1;
+#line 13677 "Dialogs.c"
 	} else {
 #line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp57_ = FALSE;
-#line 13991 "Dialogs.c"
+		_tmp53_ = FALSE;
+#line 13681 "Dialogs.c"
 	}
 #line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp60_ = self->priv->relativity_radio_button;
+	_tmp56_ = self->priv->relativity_radio_button;
 #line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), _tmp57_);
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp61_ = self->priv->relativity_radio_button;
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget), _tmp53_);
 #line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp62_ = gtk_radio_button_get_group (_tmp61_);
+	_tmp57_ = self->priv->relativity_radio_button;
 #line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp63_ = _ ("Set _all photos/videos to this time");
+	_tmp58_ = gtk_radio_button_get_group (_tmp57_);
 #line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp64_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (_tmp62_, _tmp63_);
+	_tmp59_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (_tmp58_, _ ("Set _all photos/videos to this time"));
 #line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp64_);
+	g_object_ref_sink (_tmp59_);
 #line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->batch_radio_button);
 #line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->batch_radio_button = _tmp64_;
+	self->priv->batch_radio_button = _tmp59_;
 #line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp65_ = self->priv->batch_radio_button;
+	_tmp60_ = self->priv->batch_radio_button;
 #line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp66_ = config_facade_get_instance ();
+	_tmp61_ = config_facade_get_instance ();
 #line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp67_ = _tmp66_;
+	_tmp62_ = _tmp61_;
 #line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp68_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp63_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_toggle_button_get_type (), GtkToggleButton), !_tmp68_);
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_toggle_button_get_type (), GtkToggleButton), !_tmp63_);
 #line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp67_);
+	_g_object_unref0 (_tmp62_);
 #line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp70_ = display_options;
+	_tmp65_ = display_options;
 #line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp70_) {
-#line 14027 "Dialogs.c"
-		gint _tmp71_ = 0;
+	if (_tmp65_) {
+#line 13715 "Dialogs.c"
+		gint _tmp66_;
 #line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp71_ = photo_count;
+		_tmp66_ = photo_count;
 #line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp69_ = _tmp71_ > 1;
-#line 14033 "Dialogs.c"
+		_tmp64_ = _tmp66_ > 1;
+#line 13721 "Dialogs.c"
 	} else {
 #line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp69_ = FALSE;
-#line 14037 "Dialogs.c"
+		_tmp64_ = FALSE;
+#line 13725 "Dialogs.c"
 	}
 #line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp72_ = self->priv->batch_radio_button;
+	_tmp67_ = self->priv->batch_radio_button;
 #line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), _tmp69_);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), _tmp64_);
 #line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp73_ = self->priv->batch_radio_button;
+	_tmp68_ = self->priv->batch_radio_button;
 #line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled, self, 0);
 #line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp74_ = contains_video;
+	_tmp69_ = contains_video;
 #line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp74_) {
-#line 14051 "Dialogs.c"
+	if (_tmp69_) {
+#line 13739 "Dialogs.c"
 		gchar* text = NULL;
-		gint _tmp75_ = 0;
-		const gchar* _tmp76_ = NULL;
-		gchar* _tmp77_ = NULL;
-		const gchar* _tmp78_ = NULL;
-		GtkCheckButton* _tmp79_ = NULL;
+		gint _tmp70_;
+		gchar* _tmp71_;
+		const gchar* _tmp72_;
+		GtkCheckButton* _tmp73_;
 #line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp75_ = photo_count;
+		_tmp70_ = photo_count;
 #line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp76_ = ngettext ("_Modify original photo file", "_Modify original photo files", (gulong) _tmp75_);
+		_tmp71_ = g_strdup (ngettext ("_Modify original photo file", "_Modify original photo files", (gulong) _tmp70_));
 #line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp77_ = g_strdup (_tmp76_);
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		text = _tmp77_;
+		text = _tmp71_;
 #line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp78_ = text;
+		_tmp72_ = text;
 #line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp79_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp78_);
+		_tmp73_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp72_);
 #line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_ref_sink (_tmp79_);
+		g_object_ref_sink (_tmp73_);
 #line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->modify_originals_check_button);
 #line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->modify_originals_check_button = _tmp79_;
+		self->priv->modify_originals_check_button = _tmp73_;
 #line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 14078 "Dialogs.c"
+#line 13763 "Dialogs.c"
 	} else {
 		gchar* text = NULL;
-		gint _tmp80_ = 0;
-		const gchar* _tmp81_ = NULL;
-		gchar* _tmp82_ = NULL;
-		const gchar* _tmp83_ = NULL;
-		GtkCheckButton* _tmp84_ = NULL;
-#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp80_ = photo_count;
+		gint _tmp74_;
+		gchar* _tmp75_;
+		const gchar* _tmp76_;
+		GtkCheckButton* _tmp77_;
 #line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp81_ = ngettext ("_Modify original file", "_Modify original files", (gulong) _tmp80_);
+		_tmp74_ = photo_count;
 #line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp82_ = g_strdup (_tmp81_);
+		_tmp75_ = g_strdup (ngettext ("_Modify original file", "_Modify original files", (gulong) _tmp74_));
 #line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		text = _tmp82_;
+		text = _tmp75_;
 #line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp83_ = text;
+		_tmp76_ = text;
 #line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp84_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp83_);
+		_tmp77_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp76_);
 #line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_ref_sink (_tmp84_);
+		g_object_ref_sink (_tmp77_);
 #line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->modify_originals_check_button);
 #line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->modify_originals_check_button = _tmp84_;
+		self->priv->modify_originals_check_button = _tmp77_;
 #line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 14106 "Dialogs.c"
+#line 13788 "Dialogs.c"
 	}
 #line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp86_ = config_facade_get_instance ();
+	_tmp79_ = config_facade_get_instance ();
 #line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp87_ = _tmp86_;
+	_tmp80_ = _tmp79_;
 #line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp88_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp81_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp89_ = _tmp88_;
+	_tmp82_ = _tmp81_;
 #line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp87_);
+	_g_object_unref0 (_tmp80_);
 #line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp89_) {
-#line 14120 "Dialogs.c"
-		gboolean _tmp90_ = FALSE;
+	if (_tmp82_) {
+#line 13802 "Dialogs.c"
+		gboolean _tmp83_;
 #line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp90_ = display_options;
+		_tmp83_ = display_options;
 #line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp85_ = _tmp90_;
-#line 14126 "Dialogs.c"
+		_tmp78_ = _tmp83_;
+#line 13808 "Dialogs.c"
 	} else {
 #line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp85_ = FALSE;
-#line 14130 "Dialogs.c"
+		_tmp78_ = FALSE;
+#line 13812 "Dialogs.c"
 	}
 #line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp91_ = self->priv->modify_originals_check_button;
+	_tmp84_ = self->priv->modify_originals_check_button;
 #line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp85_);
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp78_);
 #line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp93_ = only_video;
+	_tmp86_ = only_video;
 #line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!_tmp93_) {
-#line 14140 "Dialogs.c"
-		gboolean _tmp94_ = FALSE;
-		ConfigFacade* _tmp95_ = NULL;
-		ConfigFacade* _tmp96_ = NULL;
-		gboolean _tmp97_ = FALSE;
-		gboolean _tmp98_ = FALSE;
+	if (!_tmp86_) {
+#line 13822 "Dialogs.c"
+		gboolean _tmp87_ = FALSE;
+		ConfigFacade* _tmp88_;
+		ConfigFacade* _tmp89_;
+		gboolean _tmp90_;
+		gboolean _tmp91_;
 #line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp95_ = config_facade_get_instance ();
+		_tmp88_ = config_facade_get_instance ();
 #line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp96_ = _tmp95_;
+		_tmp89_ = _tmp88_;
 #line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp97_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+		_tmp90_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp89_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp98_ = !_tmp97_;
+		_tmp91_ = !_tmp90_;
 #line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp96_);
+		_g_object_unref0 (_tmp89_);
 #line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp98_) {
-#line 14158 "Dialogs.c"
-			gboolean _tmp99_ = FALSE;
+		if (_tmp91_) {
+#line 13840 "Dialogs.c"
+			gboolean _tmp92_;
 #line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp99_ = display_options;
+			_tmp92_ = display_options;
 #line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp94_ = _tmp99_;
-#line 14164 "Dialogs.c"
+			_tmp87_ = _tmp92_;
+#line 13846 "Dialogs.c"
 		} else {
 #line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp94_ = FALSE;
-#line 14168 "Dialogs.c"
+			_tmp87_ = FALSE;
+#line 13850 "Dialogs.c"
 		}
 #line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp92_ = _tmp94_;
-#line 14172 "Dialogs.c"
+		_tmp85_ = _tmp87_;
+#line 13854 "Dialogs.c"
 	} else {
 #line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp92_ = FALSE;
-#line 14176 "Dialogs.c"
+		_tmp85_ = FALSE;
+#line 13858 "Dialogs.c"
 	}
 #line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp100_ = self->priv->modify_originals_check_button;
+	_tmp93_ = self->priv->modify_originals_check_button;
 #line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget), _tmp92_);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, gtk_widget_get_type (), GtkWidget), _tmp85_);
 #line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp101_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+	_tmp94_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
 #line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp101_);
+	g_object_ref_sink (_tmp94_);
 #line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	time_content = _tmp101_;
+	time_content = _tmp94_;
 #line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp102_ = time_content;
+	_tmp95_ = time_content;
 #line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp103_ = self->priv->calendar;
+	_tmp96_ = self->priv->calendar;
 #line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp102_, G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp95_, G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
 #line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp104_ = time_content;
+	_tmp97_ = time_content;
 #line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp105_ = clock;
+	_tmp98_ = clock;
 #line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp104_, G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp97_, G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
 #line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp106_ = display_options;
+	_tmp99_ = display_options;
 #line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp106_) {
-#line 14204 "Dialogs.c"
-		GtkBox* _tmp107_ = NULL;
-		GtkRadioButton* _tmp108_ = NULL;
-		GtkBox* _tmp109_ = NULL;
-		GtkRadioButton* _tmp110_ = NULL;
-		GtkBox* _tmp111_ = NULL;
-		GtkCheckButton* _tmp112_ = NULL;
+	if (_tmp99_) {
+#line 13886 "Dialogs.c"
+		GtkBox* _tmp100_;
+		GtkRadioButton* _tmp101_;
+		GtkBox* _tmp102_;
+		GtkRadioButton* _tmp103_;
+		GtkBox* _tmp104_;
+		GtkCheckButton* _tmp105_;
 #line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp107_ = time_content;
+		_tmp100_ = time_content;
 #line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp108_ = self->priv->relativity_radio_button;
+		_tmp101_ = self->priv->relativity_radio_button;
 #line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_box_pack_start (_tmp107_, G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+		gtk_box_pack_start (_tmp100_, G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
 #line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp109_ = time_content;
+		_tmp102_ = time_content;
 #line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp110_ = self->priv->batch_radio_button;
+		_tmp103_ = self->priv->batch_radio_button;
 #line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_box_pack_start (_tmp109_, G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+		gtk_box_pack_start (_tmp102_, G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
 #line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp111_ = time_content;
+		_tmp104_ = time_content;
 #line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp112_ = self->priv->modify_originals_check_button;
+		_tmp105_ = self->priv->modify_originals_check_button;
 #line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_box_pack_start (_tmp111_, G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 14229 "Dialogs.c"
+		gtk_box_pack_start (_tmp104_, G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+#line 13911 "Dialogs.c"
 	}
 #line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preview = NULL;
-#line 14233 "Dialogs.c"
+#line 13915 "Dialogs.c"
 	{
-		GdkPixbuf* _tmp113_ = NULL;
-		Dateable* _tmp114_ = NULL;
-		GdkPixbuf* _tmp115_ = NULL;
-		GdkPixbuf* _tmp116_ = NULL;
+		GdkPixbuf* _tmp106_ = NULL;
+		Dateable* _tmp107_;
+		GdkPixbuf* _tmp108_;
+		GdkPixbuf* _tmp109_;
 #line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp114_ = source;
+		_tmp107_ = source;
 #line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp115_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), ADJUST_DATE_TIME_DIALOG_CALENDAR_THUMBNAIL_SCALE, &_inner_error_);
+		_tmp108_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), ADJUST_DATE_TIME_DIALOG_CALENDAR_THUMBNAIL_SCALE, &_inner_error_);
 #line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp113_ = _tmp115_;
+		_tmp106_ = _tmp108_;
 #line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14247 "Dialogs.c"
-			goto __catch425_g_error;
+#line 13929 "Dialogs.c"
+			goto __catch426_g_error;
 		}
 #line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp116_ = _tmp113_;
+		_tmp109_ = _tmp106_;
 #line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp113_ = NULL;
+		_tmp106_ = NULL;
 #line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (preview);
 #line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		preview = _tmp116_;
+		preview = _tmp109_;
 #line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp113_);
-#line 14260 "Dialogs.c"
+		_g_object_unref0 (_tmp106_);
+#line 13942 "Dialogs.c"
 	}
-	goto __finally425;
-	__catch425_g_error:
+	goto __finally426;
+	__catch426_g_error:
 	{
 		GError* err = NULL;
-		Dateable* _tmp117_ = NULL;
-		gchar* _tmp118_ = NULL;
-		gchar* _tmp119_ = NULL;
+		Dateable* _tmp110_;
+		gchar* _tmp111_;
+		gchar* _tmp112_;
 #line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		err = _inner_error_;
 #line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_inner_error_ = NULL;
 #line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp117_ = source;
+		_tmp110_ = source;
 #line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp118_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, TYPE_DATA_OBJECT, DataObject));
+		_tmp111_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, TYPE_DATA_OBJECT, DataObject));
 #line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp119_ = _tmp118_;
+		_tmp112_ = _tmp111_;
 #line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_warning ("Dialogs.vala:1755: Unable to fetch preview for %s", _tmp119_);
+		g_warning ("Dialogs.vala:1755: Unable to fetch preview for %s", _tmp112_);
 #line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp119_);
+		_g_free0 (_tmp112_);
 #line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_error_free0 (err);
-#line 14285 "Dialogs.c"
+#line 13967 "Dialogs.c"
 	}
-	__finally425:
+	__finally426:
 #line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -14313,184 +13995,184 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 		g_clear_error (&_inner_error_);
 #line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return NULL;
-#line 14302 "Dialogs.c"
+#line 13984 "Dialogs.c"
 	}
 #line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp120_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	_tmp113_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 #line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp120_);
+	g_object_ref_sink (_tmp113_);
 #line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	image_content = _tmp120_;
+	image_content = _tmp113_;
 #line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp121_ = image_content;
+	_tmp114_ = image_content;
 #line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp122_ = image_content;
+	_tmp115_ = image_content;
 #line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_set_homogeneous (_tmp122_, TRUE);
+	gtk_box_set_homogeneous (_tmp115_, TRUE);
 #line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp124_ = preview;
+	_tmp117_ = preview;
 #line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp124_ != NULL) {
-#line 14322 "Dialogs.c"
-		GdkPixbuf* _tmp125_ = NULL;
-		GtkImage* _tmp126_ = NULL;
+	if (_tmp117_ != NULL) {
+#line 14004 "Dialogs.c"
+		GdkPixbuf* _tmp118_;
+		GtkImage* _tmp119_;
 #line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp125_ = preview;
+		_tmp118_ = preview;
 #line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp126_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp125_);
+		_tmp119_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp118_);
 #line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_ref_sink (_tmp126_);
+		g_object_ref_sink (_tmp119_);
 #line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp123_);
+		_g_object_unref0 (_tmp116_);
 #line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp123_ = _tmp126_;
-#line 14335 "Dialogs.c"
+		_tmp116_ = _tmp119_;
+#line 14017 "Dialogs.c"
 	} else {
-		GtkImage* _tmp127_ = NULL;
+		GtkImage* _tmp120_;
 #line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp127_ = (GtkImage*) gtk_image_new ();
+		_tmp120_ = (GtkImage*) gtk_image_new ();
 #line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_ref_sink (_tmp127_);
+		g_object_ref_sink (_tmp120_);
 #line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp123_);
+		_g_object_unref0 (_tmp116_);
 #line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp123_ = _tmp127_;
-#line 14346 "Dialogs.c"
+		_tmp116_ = _tmp120_;
+#line 14028 "Dialogs.c"
 	}
 #line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp128_ = _g_object_ref0 (_tmp123_);
+	_tmp121_ = _g_object_ref0 (_tmp116_);
 #line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	image = _tmp128_;
+	image = _tmp121_;
 #line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp129_ = (GtkLabel*) gtk_label_new (NULL);
+	_tmp122_ = (GtkLabel*) gtk_label_new (NULL);
 #line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp129_);
+	g_object_ref_sink (_tmp122_);
 #line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->original_time_label);
 #line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->original_time_label = _tmp129_;
+	self->priv->original_time_label = _tmp122_;
 #line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp130_ = image_content;
+	_tmp123_ = image_content;
 #line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp131_ = image;
+	_tmp124_ = image;
 #line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp130_, G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp123_, G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
 #line 1764 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp132_ = image_content;
+	_tmp125_ = image_content;
 #line 1764 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp133_ = self->priv->original_time_label;
+	_tmp126_ = self->priv->original_time_label;
 #line 1764 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp132_, G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp125_, G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
 #line 1766 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp134_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+	_tmp127_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
 #line 1766 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp134_);
+	g_object_ref_sink (_tmp127_);
 #line 1766 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	hbox = _tmp134_;
+	hbox = _tmp127_;
 #line 1767 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp135_ = hbox;
+	_tmp128_ = hbox;
 #line 1767 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_container_get_type (), GtkContainer), (guint) 3);
+	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp128_, gtk_container_get_type (), GtkContainer), (guint) 3);
 #line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp136_ = hbox;
+	_tmp129_ = hbox;
 #line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp137_ = image_content;
+	_tmp130_ = image_content;
 #line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp136_, G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp129_, G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
 #line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp138_ = hbox;
+	_tmp131_ = hbox;
 #line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp139_ = time_content;
+	_tmp132_ = time_content;
 #line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp138_, G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp131_, G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
 #line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp140_ = hbox;
+	_tmp133_ = hbox;
 #line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp140_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp141_ = hbox;
+	_tmp134_ = hbox;
 #line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp142_ = hbox;
+	_tmp135_ = hbox;
 #line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_widget_get_type (), GtkWidget), FALSE);
+	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp143_ = hbox;
+	_tmp136_ = hbox;
 #line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_widget_get_type (), GtkWidget), FALSE);
+	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp136_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp144_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+	_tmp137_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp145_ = hbox;
+	_tmp138_ = hbox;
 #line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp145_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
 #line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp146_ = (GtkLabel*) gtk_label_new ("");
+	_tmp139_ = (GtkLabel*) gtk_label_new ("");
 #line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp146_);
+	g_object_ref_sink (_tmp139_);
 #line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->notification);
 #line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->notification = _tmp146_;
+	self->priv->notification = _tmp139_;
 #line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp147_ = self->priv->notification;
+	_tmp140_ = self->priv->notification;
 #line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_line_wrap (_tmp147_, TRUE);
+	gtk_label_set_line_wrap (_tmp140_, TRUE);
 #line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp148_ = self->priv->notification;
+	_tmp141_ = self->priv->notification;
 #line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_justify (_tmp148_, GTK_JUSTIFY_CENTER);
+	gtk_label_set_justify (_tmp141_, GTK_JUSTIFY_CENTER);
 #line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp149_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+	_tmp142_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp150_ = self->priv->notification;
+	_tmp143_ = self->priv->notification;
 #line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp149_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp150_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp151_ = source;
+	_tmp144_ = source;
 #line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp152_ = dateable_get_exposure_time (_tmp151_);
+	_tmp145_ = dateable_get_exposure_time (_tmp144_);
 #line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->original_time = _tmp152_;
+	self->priv->original_time = _tmp145_;
 #line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp153_ = self->priv->original_time;
+	_tmp146_ = self->priv->original_time;
 #line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp153_ == ((time_t) 0)) {
-#line 14448 "Dialogs.c"
-		time_t _tmp154_ = 0;
+	if (_tmp146_ == ((time_t) 0)) {
+#line 14130 "Dialogs.c"
+		time_t _tmp147_;
 #line 1786 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp154_ = time (NULL);
+		_tmp147_ = time (NULL);
 #line 1786 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->original_time = _tmp154_;
+		self->priv->original_time = _tmp147_;
 #line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->no_original_time = TRUE;
-#line 14456 "Dialogs.c"
+#line 14138 "Dialogs.c"
 	}
 #line 1790 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp155_ = self->priv->original_time;
+	_tmp148_ = self->priv->original_time;
 #line 1790 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_time_local (_tmp155_, &_tmp156_);
+	g_time_local (_tmp148_, &_tmp149_);
 #line 1790 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	adjust_date_time_dialog_set_time (self, &_tmp156_);
+	adjust_date_time_dialog_set_time (self, &_tmp149_);
 #line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp157_ = config_facade_get_instance ();
+	_tmp150_ = config_facade_get_instance ();
 #line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp158_ = _tmp157_;
+	_tmp151_ = _tmp150_;
 #line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp159_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp158_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp152_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp151_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	adjust_date_time_dialog_set_original_time_label (self, _tmp159_);
+	adjust_date_time_dialog_set_original_time_label (self, _tmp152_);
 #line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp158_);
+	_g_object_unref0 (_tmp151_);
 #line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (hbox);
 #line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (image);
 #line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp123_);
+	_g_object_unref0 (_tmp116_);
 #line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (image_content);
 #line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -14501,38 +14183,38 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 	_g_object_unref0 (clock);
 #line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 14490 "Dialogs.c"
+#line 14172 "Dialogs.c"
 }
 
 
 AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video) {
 #line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return adjust_date_time_dialog_construct (TYPE_ADJUST_DATE_TIME_DIALOG, source, photo_count, display_options, contains_video, only_video);
-#line 14497 "Dialogs.c"
+#line 14179 "Dialogs.c"
 }
 
 
 static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct tm* time) {
-	GtkCalendar* _tmp0_ = NULL;
-	struct tm _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	struct tm _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	GtkCalendar* _tmp5_ = NULL;
-	struct tm _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	ConfigFacade* _tmp8_ = NULL;
-	ConfigFacade* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	gboolean _tmp11_ = FALSE;
-	GtkSpinButton* _tmp26_ = NULL;
-	struct tm _tmp27_ = {0};
-	gint _tmp28_ = 0;
-	GtkSpinButton* _tmp29_ = NULL;
-	struct tm _tmp30_ = {0};
-	gint _tmp31_ = 0;
-	GtkComboBoxText* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
+	GtkCalendar* _tmp0_;
+	struct tm _tmp1_;
+	gint _tmp2_;
+	struct tm _tmp3_;
+	gint _tmp4_;
+	GtkCalendar* _tmp5_;
+	struct tm _tmp6_;
+	gint _tmp7_;
+	ConfigFacade* _tmp8_;
+	ConfigFacade* _tmp9_;
+	gboolean _tmp10_;
+	gboolean _tmp11_;
+	GtkSpinButton* _tmp26_;
+	struct tm _tmp27_;
+	gint _tmp28_;
+	GtkSpinButton* _tmp29_;
+	struct tm _tmp30_;
+	gint _tmp31_;
+	GtkComboBoxText* _tmp32_;
+	gint _tmp33_;
 #line 1794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
 #line 1794 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -14569,11 +14251,11 @@ static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct
 	_g_object_unref0 (_tmp9_);
 #line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp11_) {
-#line 14558 "Dialogs.c"
-		GtkComboBoxText* _tmp12_ = NULL;
-		GtkSpinButton* _tmp13_ = NULL;
-		struct tm _tmp14_ = {0};
-		gint _tmp15_ = 0;
+#line 14240 "Dialogs.c"
+		GtkComboBoxText* _tmp12_;
+		GtkSpinButton* _tmp13_;
+		struct tm _tmp14_;
+		gint _tmp15_;
 #line 1799 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = self->priv->system;
 #line 1799 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -14586,18 +14268,18 @@ static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct
 		_tmp15_ = _tmp14_.tm_hour;
 #line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp13_, (gdouble) _tmp15_);
-#line 14575 "Dialogs.c"
+#line 14257 "Dialogs.c"
 	} else {
 		gint AMPM_hour = 0;
-		struct tm _tmp16_ = {0};
-		gint _tmp17_ = 0;
+		struct tm _tmp16_;
+		gint _tmp17_;
 		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
-		GtkSpinButton* _tmp21_ = NULL;
+		gint _tmp19_;
+		GtkSpinButton* _tmp21_;
 		AdjustDateTimeDialogTimeSystem _tmp22_ = 0;
-		struct tm _tmp23_ = {0};
-		gint _tmp24_ = 0;
-		GtkComboBoxText* _tmp25_ = NULL;
+		struct tm _tmp23_;
+		gint _tmp24_;
+		GtkComboBoxText* _tmp25_;
 #line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = *time;
 #line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -14610,14 +14292,14 @@ static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct
 		if (_tmp19_ == 0) {
 #line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = 12;
-#line 14599 "Dialogs.c"
+#line 14281 "Dialogs.c"
 		} else {
-			gint _tmp20_ = 0;
+			gint _tmp20_;
 #line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = AMPM_hour;
 #line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = _tmp20_;
-#line 14606 "Dialogs.c"
+#line 14288 "Dialogs.c"
 		}
 #line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = self->priv->hour;
@@ -14631,17 +14313,17 @@ static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct
 		if (_tmp24_ >= 12) {
 #line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM;
-#line 14620 "Dialogs.c"
+#line 14302 "Dialogs.c"
 		} else {
 #line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM;
-#line 14624 "Dialogs.c"
+#line 14306 "Dialogs.c"
 		}
 #line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = self->priv->system;
 #line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp22_);
-#line 14630 "Dialogs.c"
+#line 14312 "Dialogs.c"
 	}
 #line 1807 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = self->priv->minute;
@@ -14665,68 +14347,67 @@ static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct
 	_tmp33_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_get_type (), GtkComboBox));
 #line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) _tmp33_;
-#line 14654 "Dialogs.c"
+#line 14336 "Dialogs.c"
 }
 
 
 static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* result = NULL;
 	gchar* buffer = NULL;
-	gchar* _tmp0_ = NULL;
-	gint buffer_length1 = 0;
-	gint _buffer_size_ = 0;
-	gchar* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	gint buffer_length1;
+	gint _buffer_size_;
+	gchar* _tmp1_;
+	gint _tmp1__length1;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
+#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 14700 "Dialogs.c"
+#line 14382 "Dialogs.c"
 }
 
 
 static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialog* self, gboolean use_24_hr_format) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GtkLabel* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	time_t _tmp7_ = 0;
-	struct tm _tmp8_ = {0};
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
+	gboolean _tmp2_;
+	GtkLabel* _tmp3_;
+	time_t _tmp4_;
+	struct tm _tmp5_ = {0};
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
 #line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
 #line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -14735,78 +14416,69 @@ static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialo
 	if (_tmp0_) {
 #line 1815 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 14724 "Dialogs.c"
+#line 14405 "Dialogs.c"
 	}
 #line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = use_24_hr_format;
 #line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 14730 "Dialogs.c"
-		const gchar* _tmp3_ = NULL;
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = _ ("%m/%d/%Y, %H:%M:%S");
 #line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = _tmp3_;
-#line 14736 "Dialogs.c"
+		_tmp1_ = _ ("%m/%d/%Y, %H:%M:%S");
+#line 14413 "Dialogs.c"
 	} else {
-		const gchar* _tmp4_ = NULL;
 #line 1819 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = _ ("%m/%d/%Y, %I:%M:%S %p");
-#line 1819 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = _tmp4_;
-#line 14743 "Dialogs.c"
+		_tmp1_ = _ ("%m/%d/%Y, %I:%M:%S %p");
+#line 14417 "Dialogs.c"
 	}
 #line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = self->priv->original_time_label;
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = _ ("Original: ");
+	_tmp3_ = self->priv->original_time_label;
 #line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = self->priv->original_time;
+	_tmp4_ = self->priv->original_time;
 #line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_time_local (_tmp7_, &_tmp8_);
+	g_time_local (_tmp4_, &_tmp5_);
 #line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = g_time_format (&_tmp8_, _tmp1_);
+	_tmp6_ = g_time_format (&_tmp5_, _tmp1_);
 #line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = _tmp9_;
+	_tmp7_ = _tmp6_;
 #line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = g_strconcat (_tmp6_, _tmp10_, NULL);
+	_tmp8_ = g_strconcat (_ ("Original: "), _tmp7_, NULL);
 #line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = _tmp11_;
+	_tmp9_ = _tmp8_;
 #line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_text (_tmp5_, _tmp12_);
+	gtk_label_set_text (_tmp3_, _tmp9_);
 #line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp12_);
+	_g_free0 (_tmp9_);
 #line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp10_);
-#line 14767 "Dialogs.c"
+	_g_free0 (_tmp7_);
+#line 14439 "Dialogs.c"
 }
 
 
 static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self) {
 	time_t result = 0;
 	struct tm time = {0};
-	GtkSpinButton* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	GtkSpinButton* _tmp2_ = NULL;
-	gdouble _tmp3_ = 0.0;
+	GtkSpinButton* _tmp0_;
+	gdouble _tmp1_;
+	GtkSpinButton* _tmp2_;
+	gdouble _tmp3_;
 	gint hour = 0;
-	GtkSpinButton* _tmp4_ = NULL;
-	gdouble _tmp5_ = 0.0;
+	GtkSpinButton* _tmp4_;
+	gdouble _tmp5_;
 	gint _tmp6_ = 0;
 	gboolean _tmp7_ = FALSE;
-	gint _tmp8_ = 0;
+	gint _tmp8_;
 	gint _tmp12_ = 0;
-	GtkComboBoxText* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
+	GtkComboBoxText* _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
 	guint year = 0U;
 	guint month = 0U;
 	guint day = 0U;
-	GtkCalendar* _tmp16_ = NULL;
+	GtkCalendar* _tmp16_;
 	guint _tmp17_ = 0U;
 	guint _tmp18_ = 0U;
 	guint _tmp19_ = 0U;
-	time_t _tmp20_ = 0;
+	time_t _tmp20_;
 #line 1822 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), 0);
 #line 1823 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -14833,33 +14505,33 @@ static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self) {
 	_tmp8_ = hour;
 #line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_ == 12) {
-#line 14822 "Dialogs.c"
-		GtkComboBoxText* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
+#line 14494 "Dialogs.c"
+		GtkComboBoxText* _tmp9_;
+		gint _tmp10_;
 #line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->system;
 #line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox));
 #line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp10_ != ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR);
-#line 14831 "Dialogs.c"
+#line 14503 "Dialogs.c"
 	} else {
 #line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = FALSE;
-#line 14835 "Dialogs.c"
+#line 14507 "Dialogs.c"
 	}
 #line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp7_) {
 #line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = 0;
-#line 14841 "Dialogs.c"
+#line 14513 "Dialogs.c"
 	} else {
-		gint _tmp11_ = 0;
+		gint _tmp11_;
 #line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = hour;
 #line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = _tmp11_;
-#line 14848 "Dialogs.c"
+#line 14520 "Dialogs.c"
 	}
 #line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_hour = _tmp6_;
@@ -14871,11 +14543,11 @@ static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self) {
 	if (_tmp14_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM)) {
 #line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = 12;
-#line 14860 "Dialogs.c"
+#line 14532 "Dialogs.c"
 	} else {
 #line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = 0;
-#line 14864 "Dialogs.c"
+#line 14536 "Dialogs.c"
 	}
 #line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = time.tm_hour;
@@ -14905,7 +14577,7 @@ static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self) {
 	result = _tmp20_;
 #line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 14894 "Dialogs.c"
+#line 14566 "Dialogs.c"
 }
 
 
@@ -14915,7 +14587,7 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
 	gboolean _vala_modify_originals = FALSE;
 	gboolean result = FALSE;
 	gboolean response = FALSE;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE);
 #line 1846 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -14926,39 +14598,39 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
 	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 1850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 14915 "Dialogs.c"
-		gboolean _tmp1_ = FALSE;
-		GtkRadioButton* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
-		GtkRadioButton* _tmp7_ = NULL;
-		gboolean _tmp8_ = FALSE;
-		gboolean _tmp9_ = FALSE;
-		GtkCheckButton* _tmp13_ = NULL;
-		gboolean _tmp14_ = FALSE;
-		GtkCheckButton* _tmp15_ = NULL;
-		gboolean _tmp16_ = FALSE;
-		gboolean _tmp17_ = FALSE;
+#line 14587 "Dialogs.c"
+		gboolean _tmp1_;
+		GtkRadioButton* _tmp5_;
+		gboolean _tmp6_;
+		GtkRadioButton* _tmp7_;
+		gboolean _tmp8_;
+		gboolean _tmp9_;
+		GtkCheckButton* _tmp13_;
+		gboolean _tmp14_;
+		GtkCheckButton* _tmp15_;
+		gboolean _tmp16_;
+		gboolean _tmp17_;
 #line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->no_original_time;
 #line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp1_) {
-#line 14931 "Dialogs.c"
-			time_t _tmp2_ = 0;
+#line 14603 "Dialogs.c"
+			time_t _tmp2_;
 #line 1852 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = adjust_date_time_dialog_get_time (self);
 #line 1852 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_vala_time_shift = (gint64) _tmp2_;
-#line 14937 "Dialogs.c"
+#line 14609 "Dialogs.c"
 		} else {
-			time_t _tmp3_ = 0;
-			time_t _tmp4_ = 0;
+			time_t _tmp3_;
+			time_t _tmp4_;
 #line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp3_ = adjust_date_time_dialog_get_time (self);
 #line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = self->priv->original_time;
 #line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_vala_time_shift = (gint64) (_tmp3_ - _tmp4_);
-#line 14947 "Dialogs.c"
+#line 14619 "Dialogs.c"
 		}
 #line 1856 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->relativity_radio_button;
@@ -14974,10 +14646,10 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
 		_tmp9_ = _tmp8_;
 #line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_) {
-#line 14963 "Dialogs.c"
-			ConfigFacade* _tmp10_ = NULL;
-			ConfigFacade* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
+#line 14635 "Dialogs.c"
+			ConfigFacade* _tmp10_;
+			ConfigFacade* _tmp11_;
+			gboolean _tmp12_;
 #line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp10_ = config_facade_get_instance ();
 #line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -14988,7 +14660,7 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
 			configuration_facade_set_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_);
 #line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_tmp11_);
-#line 14977 "Dialogs.c"
+#line 14649 "Dialogs.c"
 		}
 #line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->modify_originals_check_button;
@@ -15004,10 +14676,10 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
 		_tmp17_ = _tmp16_;
 #line 1863 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp17_) {
-#line 14993 "Dialogs.c"
-			ConfigFacade* _tmp18_ = NULL;
-			ConfigFacade* _tmp19_ = NULL;
-			gboolean _tmp20_ = FALSE;
+#line 14665 "Dialogs.c"
+			ConfigFacade* _tmp18_;
+			ConfigFacade* _tmp19_;
+			gboolean _tmp20_;
 #line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = config_facade_get_instance ();
 #line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -15018,11 +14690,11 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
 			configuration_facade_set_modify_originals (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp20_);
 #line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_tmp19_);
-#line 15007 "Dialogs.c"
+#line 14679 "Dialogs.c"
 		}
 #line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		response = TRUE;
-#line 15011 "Dialogs.c"
+#line 14683 "Dialogs.c"
 	} else {
 #line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_time_shift = (gint64) 0;
@@ -15030,7 +14702,7 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
 		_vala_keep_relativity = TRUE;
 #line 1870 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_modify_originals = FALSE;
-#line 15019 "Dialogs.c"
+#line 14691 "Dialogs.c"
 	}
 #line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -15040,33 +14712,33 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
 	if (time_shift) {
 #line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*time_shift = _vala_time_shift;
-#line 15029 "Dialogs.c"
+#line 14701 "Dialogs.c"
 	}
 #line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (keep_relativity) {
 #line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*keep_relativity = _vala_keep_relativity;
-#line 15035 "Dialogs.c"
+#line 14707 "Dialogs.c"
 	}
 #line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (modify_originals) {
 #line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*modify_originals = _vala_modify_originals;
-#line 15041 "Dialogs.c"
+#line 14713 "Dialogs.c"
 	}
 #line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15045 "Dialogs.c"
+#line 14717 "Dialogs.c"
 }
 
 
 static gboolean adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDialog* self, GtkSpinButton* button) {
 	gboolean result = FALSE;
-	GtkSpinButton* _tmp0_ = NULL;
-	GtkSpinButton* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	GtkSpinButton* _tmp0_;
+	GtkSpinButton* _tmp1_;
+	gdouble _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE);
 #line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -15091,19 +14763,19 @@ static gboolean adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDia
 	result = TRUE;
 #line 1883 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15080 "Dialogs.c"
+#line 14752 "Dialogs.c"
 }
 
 
 static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self) {
 	gint64 time_shift = 0LL;
-	time_t _tmp0_ = 0;
-	time_t _tmp1_ = 0;
-	GtkComboBoxText* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	time_t _tmp0_;
+	time_t _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	gint _tmp3_;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-	gint64 _tmp6_ = 0LL;
+	gint64 _tmp6_;
 #line 1886 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
 #line 1887 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -15124,34 +14796,34 @@ static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self)
 	if (_tmp6_ == ((gint64) 0)) {
 #line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = TRUE;
-#line 15113 "Dialogs.c"
+#line 14785 "Dialogs.c"
 	} else {
-		gboolean _tmp7_ = FALSE;
+		gboolean _tmp7_;
 #line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->no_original_time;
 #line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _tmp7_;
-#line 15120 "Dialogs.c"
+#line 14792 "Dialogs.c"
 	}
 #line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
 #line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = TRUE;
-#line 15126 "Dialogs.c"
+#line 14798 "Dialogs.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
-		GtkRadioButton* _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
+		GtkRadioButton* _tmp9_;
+		gboolean _tmp10_;
 #line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->batch_radio_button;
 #line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp10_) {
-#line 15137 "Dialogs.c"
-			GtkRadioButton* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
-			gboolean _tmp13_ = FALSE;
+#line 14809 "Dialogs.c"
+			GtkRadioButton* _tmp11_;
+			gboolean _tmp12_;
+			gboolean _tmp13_;
 #line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = self->priv->batch_radio_button;
 #line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -15160,61 +14832,57 @@ static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self)
 			_tmp13_ = _tmp12_;
 #line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = _tmp13_;
-#line 15149 "Dialogs.c"
+#line 14821 "Dialogs.c"
 		} else {
 #line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = FALSE;
-#line 15153 "Dialogs.c"
+#line 14825 "Dialogs.c"
 		}
 #line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp8_;
-#line 15157 "Dialogs.c"
+#line 14829 "Dialogs.c"
 	}
 #line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 15161 "Dialogs.c"
-		GtkLabel* _tmp14_ = NULL;
+#line 14833 "Dialogs.c"
+		GtkLabel* _tmp14_;
 #line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = self->priv->notification;
 #line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 15167 "Dialogs.c"
+#line 14839 "Dialogs.c"
 	} else {
 		gboolean forward = FALSE;
-		gint64 _tmp15_ = 0LL;
+		gint64 _tmp15_;
 		gint days = 0;
 		gint hours = 0;
 		gint minutes = 0;
 		gint seconds = 0;
-		gint64 _tmp16_ = 0LL;
-		gint64 _tmp17_ = 0LL;
-		gint64 _tmp18_ = 0LL;
-		gint64 _tmp19_ = 0LL;
-		gint64 _tmp20_ = 0LL;
-		gint64 _tmp21_ = 0LL;
-		gint64 _tmp22_ = 0LL;
-		gint64 _tmp23_ = 0LL;
+		gint64 _tmp16_;
+		gint64 _tmp17_;
+		gint64 _tmp18_;
+		gint64 _tmp19_;
+		gint64 _tmp20_;
+		gint64 _tmp21_;
+		gint64 _tmp22_;
+		gint64 _tmp23_;
 		const gchar* _tmp24_ = NULL;
-		gboolean _tmp25_ = FALSE;
+		gboolean _tmp25_;
 		gchar* shift_status = NULL;
-		gchar* _tmp28_ = NULL;
-		GtkLabel* _tmp29_ = NULL;
-		const gchar* _tmp30_ = NULL;
-		gint _tmp31_ = 0;
-		gint _tmp32_ = 0;
-		const gchar* _tmp33_ = NULL;
-		gint _tmp34_ = 0;
-		gint _tmp35_ = 0;
-		const gchar* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
-		const gchar* _tmp39_ = NULL;
-		gint _tmp40_ = 0;
-		gint _tmp41_ = 0;
-		const gchar* _tmp42_ = NULL;
-		gchar* _tmp43_ = NULL;
-		gchar* _tmp44_ = NULL;
-		GtkLabel* _tmp45_ = NULL;
+		gchar* _tmp26_;
+		GtkLabel* _tmp27_;
+		const gchar* _tmp28_;
+		gint _tmp29_;
+		gint _tmp30_;
+		gint _tmp31_;
+		gint _tmp32_;
+		gint _tmp33_;
+		gint _tmp34_;
+		gint _tmp35_;
+		gint _tmp36_;
+		gchar* _tmp37_;
+		gchar* _tmp38_;
+		GtkLabel* _tmp39_;
 #line 1895 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = time_shift;
 #line 1895 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -15253,84 +14921,69 @@ static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self)
 		_tmp25_ = forward;
 #line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp25_) {
-#line 15242 "Dialogs.c"
-			const gchar* _tmp26_ = NULL;
 #line 1908 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp26_ = _ ("Exposure time will be shifted forward by\n" \
+			_tmp24_ = _ ("Exposure time will be shifted forward by\n" \
 "%d %s, %d %s, %d %s, and %d %s.");
-#line 1908 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp24_ = _tmp26_;
-#line 15248 "Dialogs.c"
+#line 14912 "Dialogs.c"
 		} else {
-			const gchar* _tmp27_ = NULL;
 #line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp27_ = _ ("Exposure time will be shifted backward by\n" \
+			_tmp24_ = _ ("Exposure time will be shifted backward by\n" \
 "%d %s, %d %s, %d %s, and %d %s.");
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp24_ = _tmp27_;
-#line 15255 "Dialogs.c"
+#line 14916 "Dialogs.c"
 		}
 #line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp28_ = g_strdup (_tmp24_);
+		_tmp26_ = g_strdup (_tmp24_);
 #line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		shift_status = _tmp28_;
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp29_ = self->priv->notification;
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp30_ = shift_status;
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp31_ = days;
+		shift_status = _tmp26_;
 #line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp32_ = days;
+		_tmp27_ = self->priv->notification;
 #line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp33_ = ngettext ("day", "days", (gulong) _tmp32_);
+		_tmp28_ = shift_status;
 #line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp34_ = hours;
+		_tmp29_ = days;
 #line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp35_ = hours;
+		_tmp30_ = days;
 #line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp36_ = ngettext ("hour", "hours", (gulong) _tmp35_);
+		_tmp31_ = hours;
 #line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp37_ = minutes;
+		_tmp32_ = hours;
 #line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp38_ = minutes;
+		_tmp33_ = minutes;
 #line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp39_ = ngettext ("minute", "minutes", (gulong) _tmp38_);
+		_tmp34_ = minutes;
 #line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp40_ = seconds;
+		_tmp35_ = seconds;
 #line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp41_ = seconds;
+		_tmp36_ = seconds;
 #line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp42_ = ngettext ("second", "seconds", (gulong) _tmp41_);
+		_tmp37_ = g_strdup_printf (_tmp28_, _tmp29_, ngettext ("day", "days", (gulong) _tmp30_), _tmp31_, ngettext ("hour", "hours", (gulong) _tmp32_), _tmp33_, ngettext ("minute", "minutes", (gulong) _tmp34_), _tmp35_, ngettext ("second", "seconds", (gulong) _tmp36_));
 #line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp43_ = g_strdup_printf (_tmp30_, _tmp31_, _tmp33_, _tmp34_, _tmp36_, _tmp37_, _tmp39_, _tmp40_, _tmp42_);
+		_tmp38_ = _tmp37_;
 #line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp44_ = _tmp43_;
+		gtk_label_set_text (_tmp27_, _tmp38_);
 #line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_label_set_text (_tmp29_, _tmp44_);
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp44_);
+		_g_free0 (_tmp38_);
 #line 1916 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp45_ = self->priv->notification;
+		_tmp39_ = self->priv->notification;
 #line 1916 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
+		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
 #line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (shift_status);
-#line 15303 "Dialogs.c"
+#line 14956 "Dialogs.c"
 	}
 }
 
 
 static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog* self) {
-	AdjustDateTimeDialogTimeSystem _tmp0_ = 0;
-	GtkComboBoxText* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	ConfigFacade* _tmp3_ = NULL;
-	ConfigFacade* _tmp4_ = NULL;
-	GtkComboBoxText* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	GtkComboBoxText* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
+	AdjustDateTimeDialogTimeSystem _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	gint _tmp2_;
+	ConfigFacade* _tmp3_;
+	ConfigFacade* _tmp4_;
+	GtkComboBoxText* _tmp5_;
+	gint _tmp6_;
+	GtkComboBoxText* _tmp7_;
+	gint _tmp8_;
 #line 1920 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
 #line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -15343,7 +14996,7 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 	if (_tmp0_ == _tmp2_) {
 #line 1922 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 15330 "Dialogs.c"
+#line 14983 "Dialogs.c"
 	}
 #line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = config_facade_get_instance ();
@@ -15363,17 +15016,17 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 	_tmp8_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox));
 #line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR)) {
-#line 15350 "Dialogs.c"
+#line 15003 "Dialogs.c"
 		gint _tmp9_ = 0;
-		GtkSpinButton* _tmp10_ = NULL;
-		gdouble _tmp11_ = 0.0;
+		GtkSpinButton* _tmp10_;
+		gdouble _tmp11_;
 		gint time = 0;
 		gint _tmp14_ = 0;
-		AdjustDateTimeDialogTimeSystem _tmp15_ = 0;
-		gint _tmp16_ = 0;
-		GtkSpinButton* _tmp17_ = NULL;
-		GtkSpinButton* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
+		AdjustDateTimeDialogTimeSystem _tmp15_;
+		gint _tmp16_;
+		GtkSpinButton* _tmp17_;
+		GtkSpinButton* _tmp18_;
+		gint _tmp19_;
 #line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->hour;
 #line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -15382,17 +15035,17 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 		if (_tmp11_ == 12.0) {
 #line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = 0;
-#line 15369 "Dialogs.c"
+#line 15022 "Dialogs.c"
 		} else {
-			GtkSpinButton* _tmp12_ = NULL;
-			gdouble _tmp13_ = 0.0;
+			GtkSpinButton* _tmp12_;
+			gdouble _tmp13_;
 #line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = self->priv->hour;
 #line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = gtk_spin_button_get_value (_tmp12_);
 #line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = (gint) _tmp13_;
-#line 15379 "Dialogs.c"
+#line 15032 "Dialogs.c"
 		}
 #line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time = _tmp9_;
@@ -15402,11 +15055,11 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 		if (_tmp15_ == ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM) {
 #line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = 12;
-#line 15389 "Dialogs.c"
+#line 15042 "Dialogs.c"
 		} else {
 #line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = 0;
-#line 15393 "Dialogs.c"
+#line 15046 "Dialogs.c"
 		}
 #line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = time;
@@ -15424,15 +15077,15 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 		_tmp19_ = time;
 #line 1933 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp18_, (gdouble) _tmp19_);
-#line 15411 "Dialogs.c"
+#line 15064 "Dialogs.c"
 	} else {
 		gint AMPM_hour = 0;
-		GtkSpinButton* _tmp20_ = NULL;
-		gdouble _tmp21_ = 0.0;
-		GtkSpinButton* _tmp22_ = NULL;
+		GtkSpinButton* _tmp20_;
+		gdouble _tmp21_;
+		GtkSpinButton* _tmp22_;
 		gint _tmp23_ = 0;
-		gint _tmp24_ = 0;
-		GtkSpinButton* _tmp26_ = NULL;
+		gint _tmp24_;
+		GtkSpinButton* _tmp26_;
 #line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = self->priv->hour;
 #line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -15451,24 +15104,24 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 		if (_tmp24_ == 0) {
 #line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = 12;
-#line 15438 "Dialogs.c"
+#line 15091 "Dialogs.c"
 		} else {
-			gint _tmp25_ = 0;
+			gint _tmp25_;
 #line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp25_ = AMPM_hour;
 #line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = _tmp25_;
-#line 15445 "Dialogs.c"
+#line 15098 "Dialogs.c"
 		}
 #line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = self->priv->hour;
 #line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp26_, (gdouble) _tmp23_);
-#line 15451 "Dialogs.c"
+#line 15104 "Dialogs.c"
 	}
 #line 1943 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed (self);
-#line 15455 "Dialogs.c"
+#line 15108 "Dialogs.c"
 }
 
 
@@ -15479,7 +15132,7 @@ static void adjust_date_time_dialog_class_init (AdjustDateTimeDialogClass * klas
 	g_type_class_add_private (klass, sizeof (AdjustDateTimeDialogPrivate));
 #line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = adjust_date_time_dialog_finalize;
-#line 15466 "Dialogs.c"
+#line 15119 "Dialogs.c"
 }
 
 
@@ -15488,11 +15141,11 @@ static void adjust_date_time_dialog_instance_init (AdjustDateTimeDialog * self)
 	self->priv = ADJUST_DATE_TIME_DIALOG_GET_PRIVATE (self);
 #line 1631 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->no_original_time = FALSE;
-#line 15475 "Dialogs.c"
+#line 15128 "Dialogs.c"
 }
 
 
-static void adjust_date_time_dialog_finalize (GObject* obj) {
+static void adjust_date_time_dialog_finalize (GObject * obj) {
 	AdjustDateTimeDialog * self;
 #line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialog);
@@ -15518,7 +15171,7 @@ static void adjust_date_time_dialog_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->notification);
 #line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (adjust_date_time_dialog_parent_class)->finalize (obj);
-#line 15505 "Dialogs.c"
+#line 15158 "Dialogs.c"
 }
 
 
@@ -15536,20 +15189,20 @@ GType adjust_date_time_dialog_get_type (void) {
 
 void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message, const gchar* title) {
 	gchar* dialog_message = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	gint remainder = 0;
-	GeeArrayList* _tmp20_ = NULL;
-	gint _tmp21_ = 0;
-	gint _tmp22_ = 0;
-	gint _tmp23_ = 0;
+	GeeArrayList* _tmp20_;
+	gint _tmp21_;
+	gint _tmp22_;
+	gint _tmp23_;
 	GtkMessageDialog* dialog = NULL;
-	AppWindow* _tmp31_ = NULL;
-	AppWindow* _tmp32_ = NULL;
-	const gchar* _tmp33_ = NULL;
-	GtkMessageDialog* _tmp34_ = NULL;
-	GtkMessageDialog* _tmp35_ = NULL;
-	const gchar* _tmp36_ = NULL;
+	AppWindow* _tmp30_;
+	AppWindow* _tmp31_;
+	const gchar* _tmp32_;
+	GtkMessageDialog* _tmp33_;
+	GtkMessageDialog* _tmp34_;
+	const gchar* _tmp35_;
 #line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_ARRAY_LIST (objects));
 #line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -15562,40 +15215,40 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 	_tmp1_ = g_strconcat (_tmp0_, "\n", NULL);
 #line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog_message = _tmp1_;
-#line 15549 "Dialogs.c"
+#line 15202 "Dialogs.c"
 	{
 		gint i = 0;
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		i = 0;
-#line 15554 "Dialogs.c"
+#line 15207 "Dialogs.c"
 		{
 			gboolean _tmp2_ = FALSE;
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = TRUE;
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 15561 "Dialogs.c"
+#line 15214 "Dialogs.c"
 				gboolean _tmp4_ = FALSE;
-				gint _tmp5_ = 0;
-				const gchar* _tmp10_ = NULL;
-				GeeArrayList* _tmp11_ = NULL;
-				gint _tmp12_ = 0;
-				gpointer _tmp13_ = NULL;
-				DataObject* _tmp14_ = NULL;
-				gchar* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
-				gchar* _tmp17_ = NULL;
-				gchar* _tmp18_ = NULL;
-				gchar* _tmp19_ = NULL;
+				gint _tmp5_;
+				const gchar* _tmp10_;
+				GeeArrayList* _tmp11_;
+				gint _tmp12_;
+				gpointer _tmp13_;
+				DataObject* _tmp14_;
+				gchar* _tmp15_;
+				gchar* _tmp16_;
+				gchar* _tmp17_;
+				gchar* _tmp18_;
+				gchar* _tmp19_;
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp2_) {
-#line 15576 "Dialogs.c"
-					gint _tmp3_ = 0;
+#line 15229 "Dialogs.c"
+					gint _tmp3_;
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp3_ = i;
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					i = _tmp3_ + 1;
-#line 15582 "Dialogs.c"
+#line 15235 "Dialogs.c"
 				}
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp2_ = FALSE;
@@ -15603,11 +15256,11 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 				_tmp5_ = i;
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp5_ < MAX_OBJECTS_DISPLAYED) {
-#line 15590 "Dialogs.c"
-					GeeArrayList* _tmp6_ = NULL;
-					gint _tmp7_ = 0;
-					gint _tmp8_ = 0;
-					gint _tmp9_ = 0;
+#line 15243 "Dialogs.c"
+					GeeArrayList* _tmp6_;
+					gint _tmp7_;
+					gint _tmp8_;
+					gint _tmp9_;
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = objects;
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -15618,17 +15271,17 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 					_tmp9_ = i;
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp4_ = _tmp8_ > _tmp9_;
-#line 15605 "Dialogs.c"
+#line 15258 "Dialogs.c"
 				} else {
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp4_ = FALSE;
-#line 15609 "Dialogs.c"
+#line 15262 "Dialogs.c"
 				}
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp4_) {
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 15615 "Dialogs.c"
+#line 15268 "Dialogs.c"
 				}
 #line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = dialog_message;
@@ -15660,7 +15313,7 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 				_g_free0 (_tmp16_);
 #line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp14_);
-#line 15647 "Dialogs.c"
+#line 15300 "Dialogs.c"
 			}
 		}
 	}
@@ -15676,56 +15329,53 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 	_tmp23_ = remainder;
 #line 1957 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp23_ > 0) {
-#line 15663 "Dialogs.c"
-		const gchar* _tmp24_ = NULL;
-		gint _tmp25_ = 0;
-		const gchar* _tmp26_ = NULL;
-		gint _tmp27_ = 0;
-		gchar* _tmp28_ = NULL;
-		gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
+#line 15316 "Dialogs.c"
+		const gchar* _tmp24_;
+		gint _tmp25_;
+		gint _tmp26_;
+		gchar* _tmp27_;
+		gchar* _tmp28_;
+		gchar* _tmp29_;
 #line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = dialog_message;
 #line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = remainder;
 #line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp26_ = ngettext ("\n\nAnd %d other.", "\n\nAnd %d others.", (gulong) _tmp25_);
+		_tmp26_ = remainder;
 #line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp27_ = remainder;
+		_tmp27_ = g_strdup_printf (ngettext ("\n\nAnd %d other.", "\n\nAnd %d others.", (gulong) _tmp25_), _tmp26_);
 #line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp28_ = g_strdup_printf (_tmp26_, _tmp27_);
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp29_ = _tmp28_;
+		_tmp28_ = _tmp27_;
 #line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp30_ = g_strconcat (_tmp24_, _tmp29_, NULL);
+		_tmp29_ = g_strconcat (_tmp24_, _tmp28_, NULL);
 #line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (dialog_message);
 #line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		dialog_message = _tmp30_;
+		dialog_message = _tmp29_;
 #line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp29_);
-#line 15691 "Dialogs.c"
+		_g_free0 (_tmp28_);
+#line 15341 "Dialogs.c"
 	}
 #line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp31_ = app_window_get_instance ();
+	_tmp30_ = app_window_get_instance ();
 #line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp32_ = _tmp31_;
+	_tmp31_ = _tmp30_;
 #line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp33_ = dialog_message;
+	_tmp32_ = dialog_message;
 #line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp34_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp33_);
+	_tmp33_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp32_);
 #line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp34_);
+	g_object_ref_sink (_tmp33_);
 #line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp35_ = _tmp34_;
+	_tmp34_ = _tmp33_;
 #line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp32_);
+	_g_object_unref0 (_tmp31_);
 #line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	dialog = _tmp35_;
+	dialog = _tmp34_;
 #line 1965 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp36_ = title;
+	_tmp35_ = title;
 #line 1965 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), _tmp36_);
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), _tmp35_);
 #line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
 #line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -15734,19 +15384,19 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 	_g_object_unref0 (dialog);
 #line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (dialog_message);
-#line 15721 "Dialogs.c"
+#line 15371 "Dialogs.c"
 }
 
 
 TagsDialog* tags_dialog_construct (GType object_type, const gchar* title, const gchar* label, const gchar* initial_text) {
 	TagsDialog* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	HierarchicalTagIndex* _tmp3_ = NULL;
-	HierarchicalTagIndex* _tmp4_ = NULL;
-	GeeCollection* _tmp5_ = NULL;
-	GeeCollection* _tmp6_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	HierarchicalTagIndex* _tmp3_;
+	HierarchicalTagIndex* _tmp4_;
+	GeeCollection* _tmp5_;
+	GeeCollection* _tmp6_;
 #line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, NULL);
 #line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -15773,14 +15423,14 @@ TagsDialog* tags_dialog_construct (GType object_type, const gchar* title, const
 	_hierarchical_tag_index_unref0 (_tmp4_);
 #line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 15760 "Dialogs.c"
+#line 15410 "Dialogs.c"
 }
 
 
 static void tags_dialog_class_init (TagsDialogClass * klass) {
 #line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tags_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 15767 "Dialogs.c"
+#line 15417 "Dialogs.c"
 }
 
 
@@ -15803,50 +15453,44 @@ GType tags_dialog_get_type (void) {
 AddTagsDialog* add_tags_dialog_construct (GType object_type) {
 	AddTagsDialog* self = NULL;
 	gchar* title = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	gchar* _tmp0_;
 #line 1980 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = g_dpgettext2 (NULL, "Dialog Title", RESOURCES_ADD_TAGS_TITLE);
+	_tmp0_ = g_strdup (g_dpgettext2 (NULL, "Dialog Title", RESOURCES_ADD_TAGS_TITLE));
 #line 1980 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 1980 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	title = _tmp1_;
-#line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = _ ("Tags (separated by commas):");
+	title = _tmp0_;
 #line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (AddTagsDialog*) tags_dialog_construct (object_type, title, _tmp2_, NULL);
+	self = (AddTagsDialog*) tags_dialog_construct (object_type, title, _ ("Tags (separated by commas):"), NULL);
 #line 1979 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (title);
 #line 1979 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 15807 "Dialogs.c"
+#line 15451 "Dialogs.c"
 }
 
 
 AddTagsDialog* add_tags_dialog_new (void) {
 #line 1979 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return add_tags_dialog_construct (TYPE_ADD_TAGS_DIALOG);
-#line 15814 "Dialogs.c"
+#line 15458 "Dialogs.c"
 }
 
 
 gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1) {
 	gchar** result = NULL;
 	gchar* text = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gchar** _tmp5_ = NULL;
-	gchar** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	gint _tmp7_ = 0;
-	gchar** _tmp8_ = NULL;
-	gchar** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	gchar** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp3_;
+	gchar** _tmp4_;
+	gchar** _tmp5_;
+	gchar** _tmp6_;
+	gint _tmp6__length1;
+	gint _tmp7_;
+	gchar** _tmp8_;
+	gchar** _tmp9_;
+	gint _tmp9__length1;
+	gchar** _tmp10_;
+	gint _tmp10__length1;
 #line 1985 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADD_TAGS_DIALOG (self), NULL);
 #line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -15857,9 +15501,9 @@ gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1) {
 	_tmp1_ = text;
 #line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == NULL) {
-#line 15844 "Dialogs.c"
-		gchar** _tmp2_ = NULL;
-		gint _tmp2__length1 = 0;
+#line 15488 "Dialogs.c"
+		gchar** _tmp2_;
+		gint _tmp2__length1;
 #line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = NULL;
 #line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -15868,7 +15512,7 @@ gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1) {
 		if (result_length1) {
 #line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			*result_length1 = _tmp2__length1;
-#line 15855 "Dialogs.c"
+#line 15499 "Dialogs.c"
 		}
 #line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp2_;
@@ -15876,7 +15520,7 @@ gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1) {
 		_g_free0 (text);
 #line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 15863 "Dialogs.c"
+#line 15507 "Dialogs.c"
 	}
 #line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = text;
@@ -15902,7 +15546,7 @@ gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1) {
 	if (result_length1) {
 #line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*result_length1 = _tmp10__length1;
-#line 15889 "Dialogs.c"
+#line 15533 "Dialogs.c"
 	}
 #line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp10_;
@@ -15910,29 +15554,29 @@ gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1) {
 	_g_free0 (text);
 #line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15897 "Dialogs.c"
+#line 15541 "Dialogs.c"
 }
 
 
 static gboolean add_tags_dialog_real_on_modify_validate (TextEntryDialogMediator* base, const gchar* text) {
 	AddTagsDialog * self;
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 	gchar** names = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gchar** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	gint _tmp6_ = 0;
-	gchar** _tmp7_ = NULL;
-	gchar** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	gint names_length1 = 0;
-	gint _names_size_ = 0;
-	gchar** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
+	const gchar* _tmp2_;
+	gchar** _tmp3_;
+	gchar** _tmp4_;
+	gchar** _tmp5_;
+	gint _tmp5__length1;
+	gint _tmp6_;
+	gchar** _tmp7_;
+	gchar** _tmp8_;
+	gint _tmp8__length1;
+	gint names_length1;
+	gint _names_size_;
+	gchar** _tmp9_;
+	gint _tmp9__length1;
 #line 1995 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADD_TAGS_DIALOG, AddTagsDialog);
 #line 1995 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -15947,7 +15591,7 @@ static gboolean add_tags_dialog_real_on_modify_validate (TextEntryDialogMediator
 		result = FALSE;
 #line 1997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 15934 "Dialogs.c"
+#line 15578 "Dialogs.c"
 	}
 #line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = text;
@@ -15981,7 +15625,7 @@ static gboolean add_tags_dialog_real_on_modify_validate (TextEntryDialogMediator
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
 #line 2003 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15968 "Dialogs.c"
+#line 15612 "Dialogs.c"
 }
 
 
@@ -15989,8 +15633,8 @@ static void add_tags_dialog_class_init (AddTagsDialogClass * klass) {
 #line 1978 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	add_tags_dialog_parent_class = g_type_class_peek_parent (klass);
 #line 1978 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(TextEntryDialogMediator*, const gchar*)) add_tags_dialog_real_on_modify_validate;
-#line 15977 "Dialogs.c"
+	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (TextEntryDialogMediator *, const gchar*)) add_tags_dialog_real_on_modify_validate;
+#line 15621 "Dialogs.c"
 }
 
 
@@ -16012,49 +15656,46 @@ GType add_tags_dialog_get_type (void) {
 
 ModifyTagsDialog* modify_tags_dialog_construct (GType object_type, MediaSource* source) {
 	ModifyTagsDialog* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	MediaSource* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 2008 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
 #line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = _ ("Tags (separated by commas):");
-#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = source;
+	_tmp0_ = source;
 #line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = modify_tags_dialog_get_initial_text (_tmp1_);
+	_tmp1_ = modify_tags_dialog_get_initial_text (_tmp0_);
 #line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (ModifyTagsDialog*) tags_dialog_construct (object_type, RESOURCES_MODIFY_TAGS_LABEL, _tmp0_, _tmp3_);
+	self = (ModifyTagsDialog*) tags_dialog_construct (object_type, RESOURCES_MODIFY_TAGS_LABEL, _ ("Tags (separated by commas):"), _tmp2_);
 #line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp3_);
+	_g_free0 (_tmp2_);
 #line 2008 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 16019 "Dialogs.c"
+#line 15660 "Dialogs.c"
 }
 
 
 ModifyTagsDialog* modify_tags_dialog_new (MediaSource* source) {
 #line 2008 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return modify_tags_dialog_construct (TYPE_MODIFY_TAGS_DIALOG, source);
-#line 16026 "Dialogs.c"
+#line 15667 "Dialogs.c"
 }
 
 
 static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 	gchar* result = NULL;
 	GeeCollection* source_tags = NULL;
-	TagSourceCollection* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
+	TagSourceCollection* _tmp0_;
+	MediaSource* _tmp1_;
+	GeeList* _tmp2_;
+	GeeCollection* _tmp3_;
 	GeeCollection* terminal_tags = NULL;
-	GeeCollection* _tmp4_ = NULL;
-	GeeCollection* _tmp5_ = NULL;
+	GeeCollection* _tmp4_;
+	GeeCollection* _tmp5_;
 	GeeSortedSet* tag_basenames = NULL;
-	GeeTreeSet* _tmp6_ = NULL;
+	GeeTreeSet* _tmp6_;
 	gchar* text = NULL;
 #line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
@@ -16076,7 +15717,7 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 		_g_object_unref0 (source_tags);
 #line 2016 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16063 "Dialogs.c"
+#line 15704 "Dialogs.c"
 	}
 #line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = source_tags;
@@ -16088,11 +15729,11 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 	_tmp6_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_basenames = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 16075 "Dialogs.c"
+#line 15716 "Dialogs.c"
 	{
 		GeeIterator* _tag_it = NULL;
-		GeeCollection* _tmp7_ = NULL;
-		GeeIterator* _tmp8_ = NULL;
+		GeeCollection* _tmp7_;
+		GeeIterator* _tmp8_;
 #line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = terminal_tags;
 #line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -16101,18 +15742,18 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 		_tag_it = _tmp8_;
 #line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 16088 "Dialogs.c"
-			GeeIterator* _tmp9_ = NULL;
-			gboolean _tmp10_ = FALSE;
+#line 15729 "Dialogs.c"
+			GeeIterator* _tmp9_;
+			gboolean _tmp10_;
 			Tag* tag = NULL;
-			GeeIterator* _tmp11_ = NULL;
-			gpointer _tmp12_ = NULL;
-			GeeSortedSet* _tmp13_ = NULL;
-			Tag* _tmp14_ = NULL;
-			gchar* _tmp15_ = NULL;
-			gchar* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
+			GeeIterator* _tmp11_;
+			gpointer _tmp12_;
+			GeeSortedSet* _tmp13_;
+			Tag* _tmp14_;
+			gchar* _tmp15_;
+			gchar* _tmp16_;
+			gchar* _tmp17_;
+			gchar* _tmp18_;
 #line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = _tag_it;
 #line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -16121,7 +15762,7 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 			if (!_tmp10_) {
 #line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 16108 "Dialogs.c"
+#line 15749 "Dialogs.c"
 			}
 #line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = _tag_it;
@@ -16149,19 +15790,19 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 			_g_free0 (_tmp16_);
 #line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (tag);
-#line 16136 "Dialogs.c"
+#line 15777 "Dialogs.c"
 		}
 #line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tag_it);
-#line 16140 "Dialogs.c"
+#line 15781 "Dialogs.c"
 	}
 #line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = NULL;
-#line 16144 "Dialogs.c"
+#line 15785 "Dialogs.c"
 	{
 		GeeIterator* _name_it = NULL;
-		GeeSortedSet* _tmp19_ = NULL;
-		GeeIterator* _tmp20_ = NULL;
+		GeeSortedSet* _tmp19_;
+		GeeIterator* _tmp20_;
 #line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = tag_basenames;
 #line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -16170,16 +15811,16 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 		_name_it = _tmp20_;
 #line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 16157 "Dialogs.c"
-			GeeIterator* _tmp21_ = NULL;
-			gboolean _tmp22_ = FALSE;
+#line 15798 "Dialogs.c"
+			GeeIterator* _tmp21_;
+			gboolean _tmp22_;
 			gchar* name = NULL;
-			GeeIterator* _tmp23_ = NULL;
-			gpointer _tmp24_ = NULL;
-			const gchar* _tmp25_ = NULL;
-			const gchar* _tmp29_ = NULL;
-			const gchar* _tmp30_ = NULL;
-			gchar* _tmp31_ = NULL;
+			GeeIterator* _tmp23_;
+			gpointer _tmp24_;
+			const gchar* _tmp25_;
+			const gchar* _tmp29_;
+			const gchar* _tmp30_;
+			gchar* _tmp31_;
 #line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21_ = _name_it;
 #line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -16188,7 +15829,7 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 			if (!_tmp22_) {
 #line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 16175 "Dialogs.c"
+#line 15816 "Dialogs.c"
 			}
 #line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = _name_it;
@@ -16200,18 +15841,18 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 			_tmp25_ = text;
 #line 2026 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp25_ == NULL) {
-#line 16187 "Dialogs.c"
-				gchar* _tmp26_ = NULL;
+#line 15828 "Dialogs.c"
+				gchar* _tmp26_;
 #line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp26_ = g_strdup ("");
 #line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
 #line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp26_;
-#line 16195 "Dialogs.c"
+#line 15836 "Dialogs.c"
 			} else {
-				const gchar* _tmp27_ = NULL;
-				gchar* _tmp28_ = NULL;
+				const gchar* _tmp27_;
+				gchar* _tmp28_;
 #line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp27_ = text;
 #line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -16220,7 +15861,7 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 				_g_free0 (text);
 #line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp28_;
-#line 16207 "Dialogs.c"
+#line 15848 "Dialogs.c"
 			}
 #line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = text;
@@ -16234,11 +15875,11 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 			text = _tmp31_;
 #line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (name);
-#line 16221 "Dialogs.c"
+#line 15862 "Dialogs.c"
 		}
 #line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_name_it);
-#line 16225 "Dialogs.c"
+#line 15866 "Dialogs.c"
 	}
 #line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = text;
@@ -16250,39 +15891,39 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 	_g_object_unref0 (source_tags);
 #line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16237 "Dialogs.c"
+#line 15878 "Dialogs.c"
 }
 
 
 GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) {
 	GeeArrayList* result = NULL;
 	gchar* text = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GeeArrayList* new_tags = NULL;
-	GeeArrayList* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GeeArrayList* _tmp2_;
+	const gchar* _tmp3_;
+	gboolean _tmp4_;
 	gchar** tag_names = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar** _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gchar** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	gint _tmp9_ = 0;
-	gchar** _tmp10_ = NULL;
-	gchar** _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-	gint tag_names_length1 = 0;
-	gint _tag_names_size_ = 0;
-	HierarchicalTagIndex* _tmp12_ = NULL;
-	HierarchicalTagIndex* _tmp13_ = NULL;
-	gchar** _tmp14_ = NULL;
-	gint _tmp14__length1 = 0;
-	gint _tmp15_ = 0;
-	gchar** _tmp16_ = NULL;
-	gchar** _tmp17_ = NULL;
-	gint _tmp17__length1 = 0;
+	const gchar* _tmp5_;
+	gchar** _tmp6_;
+	gchar** _tmp7_;
+	gchar** _tmp8_;
+	gint _tmp8__length1;
+	gint _tmp9_;
+	gchar** _tmp10_;
+	gchar** _tmp11_;
+	gint _tmp11__length1;
+	gint tag_names_length1;
+	gint _tag_names_size_;
+	HierarchicalTagIndex* _tmp12_;
+	HierarchicalTagIndex* _tmp13_;
+	gchar** _tmp14_;
+	gint _tmp14__length1;
+	gint _tmp15_;
+	gchar** _tmp16_;
+	gchar** _tmp17_;
+	gint _tmp17__length1;
 #line 2037 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MODIFY_TAGS_DIALOG (self), NULL);
 #line 2038 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -16299,7 +15940,7 @@ GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) {
 		_g_free0 (text);
 #line 2040 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16286 "Dialogs.c"
+#line 15927 "Dialogs.c"
 	}
 #line 2042 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
@@ -16317,7 +15958,7 @@ GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) {
 		_g_free0 (text);
 #line 2046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16304 "Dialogs.c"
+#line 15945 "Dialogs.c"
 	}
 #line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = text;
@@ -16365,7 +16006,7 @@ GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) {
 	_tmp17_ = tag_names;
 #line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17__length1 = tag_names_length1;
-#line 16352 "Dialogs.c"
+#line 15993 "Dialogs.c"
 	{
 		gchar** name_collection = NULL;
 		gint name_collection_length1 = 0;
@@ -16377,19 +16018,19 @@ GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) {
 		name_collection_length1 = _tmp17__length1;
 #line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (name_it = 0; name_it < _tmp17__length1; name_it = name_it + 1) {
-#line 16364 "Dialogs.c"
-			gchar* _tmp18_ = NULL;
+#line 16005 "Dialogs.c"
+			gchar* _tmp18_;
 			gchar* name = NULL;
 #line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = g_strdup (name_collection[name_it]);
 #line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			name = _tmp18_;
-#line 16371 "Dialogs.c"
+#line 16012 "Dialogs.c"
 			{
-				GeeArrayList* _tmp19_ = NULL;
-				const gchar* _tmp20_ = NULL;
-				Tag* _tmp21_ = NULL;
-				Tag* _tmp22_ = NULL;
+				GeeArrayList* _tmp19_;
+				const gchar* _tmp20_;
+				Tag* _tmp21_;
+				Tag* _tmp22_;
 #line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp19_ = new_tags;
 #line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -16404,7 +16045,7 @@ GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) {
 				_g_object_unref0 (_tmp22_);
 #line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (name);
-#line 16391 "Dialogs.c"
+#line 16032 "Dialogs.c"
 			}
 		}
 	}
@@ -16416,15 +16057,15 @@ GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) {
 	_g_free0 (text);
 #line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16403 "Dialogs.c"
+#line 16044 "Dialogs.c"
 }
 
 
 static gboolean modify_tags_dialog_real_on_modify_validate (TextEntryDialogMediator* base, const gchar* text) {
 	ModifyTagsDialog * self;
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 #line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MODIFY_TAGS_DIALOG, ModifyTagsDialog);
 #line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -16437,7 +16078,7 @@ static gboolean modify_tags_dialog_real_on_modify_validate (TextEntryDialogMedia
 	result = !_tmp1_;
 #line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16424 "Dialogs.c"
+#line 16065 "Dialogs.c"
 }
 
 
@@ -16445,8 +16086,8 @@ static void modify_tags_dialog_class_init (ModifyTagsDialogClass * klass) {
 #line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	modify_tags_dialog_parent_class = g_type_class_peek_parent (klass);
 #line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(TextEntryDialogMediator*, const gchar*)) modify_tags_dialog_real_on_modify_validate;
-#line 16433 "Dialogs.c"
+	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (TextEntryDialogMediator *, const gchar*)) modify_tags_dialog_real_on_modify_validate;
+#line 16074 "Dialogs.c"
 }
 
 
@@ -16471,7 +16112,7 @@ gchar* welcome_service_entry_get_service_name (WelcomeServiceEntry* self) {
 	g_return_val_if_fail (IS_WELCOME_SERVICE_ENTRY (self), NULL);
 #line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->get_service_name (self);
-#line 16458 "Dialogs.c"
+#line 16099 "Dialogs.c"
 }
 
 
@@ -16480,7 +16121,7 @@ void welcome_service_entry_execute (WelcomeServiceEntry* self) {
 	g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (self));
 #line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->execute (self);
-#line 16467 "Dialogs.c"
+#line 16108 "Dialogs.c"
 }
 
 
@@ -16491,7 +16132,7 @@ static void welcome_service_entry_base_init (WelcomeServiceEntryIface * iface) {
 	if (!initialized) {
 #line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		initialized = TRUE;
-#line 16478 "Dialogs.c"
+#line 16119 "Dialogs.c"
 	}
 }
 
@@ -16511,98 +16152,90 @@ GType welcome_service_entry_get_type (void) {
 
 WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
 	WelcomeDialog * self = NULL;
-	SpitDataImportsWelcomeImportMetaHost* _tmp0_ = NULL;
+	SpitDataImportsWelcomeImportMetaHost* _tmp0_;
 	gboolean show_system_pictures_import = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	GtkWidget* ok_button = NULL;
-	GtkWidget* _tmp2_ = NULL;
-	GtkWidget* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GtkWindow* _tmp5_ = NULL;
+	GtkWidget* _tmp2_;
+	GtkWidget* _tmp3_;
+	GtkWindow* _tmp4_;
 	GtkLabel* primary_text = NULL;
-	GtkLabel* _tmp6_ = NULL;
-	GtkLabel* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	GtkLabel* _tmp11_ = NULL;
-	GtkLabel* _tmp12_ = NULL;
-	GtkLabel* _tmp13_ = NULL;
-	GtkLabel* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	GtkLabel* _tmp18_ = NULL;
-	GtkLabel* _tmp19_ = NULL;
+	GtkLabel* _tmp5_;
+	GtkLabel* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	GtkLabel* _tmp9_;
+	GtkLabel* _tmp10_;
+	GtkLabel* _tmp11_;
+	GtkLabel* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	GtkLabel* _tmp15_;
+	GtkLabel* _tmp16_;
 	GtkImage* image = NULL;
-	GtkImage* _tmp20_ = NULL;
+	GtkImage* _tmp17_;
 	GtkBox* header_text = NULL;
-	GtkBox* _tmp21_ = NULL;
-	GtkBox* _tmp22_ = NULL;
-	GtkLabel* _tmp23_ = NULL;
-	GtkBox* _tmp24_ = NULL;
-	GtkLabel* _tmp25_ = NULL;
+	GtkBox* _tmp18_;
+	GtkBox* _tmp19_;
+	GtkLabel* _tmp20_;
+	GtkBox* _tmp21_;
+	GtkLabel* _tmp22_;
 	GtkBox* header_content = NULL;
-	GtkBox* _tmp26_ = NULL;
-	GtkBox* _tmp27_ = NULL;
-	GtkImage* _tmp28_ = NULL;
-	GtkBox* _tmp29_ = NULL;
-	GtkBox* _tmp30_ = NULL;
+	GtkBox* _tmp23_;
+	GtkBox* _tmp24_;
+	GtkImage* _tmp25_;
+	GtkBox* _tmp26_;
+	GtkBox* _tmp27_;
 	GtkLabel* instructions = NULL;
-	GtkLabel* _tmp31_ = NULL;
+	GtkLabel* _tmp28_;
 	gchar* indent_prefix = NULL;
-	gchar* _tmp32_ = NULL;
-	const gchar* _tmp33_ = NULL;
-	GtkTextDirection _tmp34_ = 0;
+	gchar* _tmp29_;
+	const gchar* _tmp30_ = NULL;
+	GtkTextDirection _tmp31_;
 	gchar* arrow_glyph = NULL;
-	gchar* _tmp35_ = NULL;
-	GtkLabel* _tmp36_ = NULL;
-	const gchar* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
-	gchar* _tmp39_ = NULL;
-	const gchar* _tmp40_ = NULL;
-	gchar* _tmp41_ = NULL;
-	gchar* _tmp42_ = NULL;
-	gchar* _tmp43_ = NULL;
-	gchar* _tmp44_ = NULL;
-	const gchar* _tmp45_ = NULL;
-	gchar* _tmp46_ = NULL;
-	gchar* _tmp47_ = NULL;
-	gchar* _tmp48_ = NULL;
-	gchar* _tmp49_ = NULL;
-	const gchar* _tmp50_ = NULL;
-	const gchar* _tmp51_ = NULL;
-	gchar* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
-	const gchar* _tmp54_ = NULL;
-	const gchar* _tmp55_ = NULL;
-	gchar* _tmp56_ = NULL;
-	gchar* _tmp57_ = NULL;
-	GtkLabel* _tmp58_ = NULL;
-	GtkLabel* _tmp59_ = NULL;
-	GtkBox* _tmp60_ = NULL;
-	GtkBox* _tmp61_ = NULL;
-	GtkBox* _tmp62_ = NULL;
-	GtkBox* _tmp63_ = NULL;
-	gboolean _tmp64_ = FALSE;
-	const gchar* _tmp76_ = NULL;
-	GtkLabel* _tmp77_ = NULL;
-	GtkLabel* _tmp78_ = NULL;
-	GtkLabel* _tmp79_ = NULL;
-	GtkLabel* _tmp80_ = NULL;
+	gchar* _tmp32_;
+	GtkLabel* _tmp33_;
+	const gchar* _tmp34_;
+	gchar* _tmp35_;
+	gchar* _tmp36_;
+	const gchar* _tmp37_;
+	gchar* _tmp38_;
+	gchar* _tmp39_;
+	gchar* _tmp40_;
+	gchar* _tmp41_;
+	const gchar* _tmp42_;
+	gchar* _tmp43_;
+	gchar* _tmp44_;
+	gchar* _tmp45_;
+	gchar* _tmp46_;
+	const gchar* _tmp47_;
+	gchar* _tmp48_;
+	gchar* _tmp49_;
+	gchar* _tmp50_;
+	gchar* _tmp51_;
+	GtkLabel* _tmp52_;
+	GtkLabel* _tmp53_;
+	GtkBox* _tmp54_;
+	GtkBox* _tmp55_;
+	GtkBox* _tmp56_;
+	GtkBox* _tmp57_;
+	gboolean _tmp58_;
+	GtkLabel* _tmp69_;
+	GtkLabel* _tmp70_;
+	GtkLabel* _tmp71_;
+	GtkLabel* _tmp72_;
 	GtkBox* content = NULL;
-	GtkBox* _tmp81_ = NULL;
-	GtkBox* _tmp82_ = NULL;
-	GtkBox* _tmp83_ = NULL;
-	GtkBox* _tmp84_ = NULL;
-	GtkLabel* _tmp85_ = NULL;
-	const gchar* _tmp86_ = NULL;
-	GtkCheckButton* _tmp87_ = NULL;
-	GtkCheckButton* _tmp88_ = NULL;
-	GtkCheckButton* _tmp89_ = NULL;
-	GtkBox* _tmp90_ = NULL;
-	GtkWidget* _tmp91_ = NULL;
-	SpitDataImportsWelcomeImportMetaHost* _tmp92_ = NULL;
+	GtkBox* _tmp73_;
+	GtkBox* _tmp74_;
+	GtkBox* _tmp75_;
+	GtkBox* _tmp76_;
+	GtkLabel* _tmp77_;
+	GtkCheckButton* _tmp78_;
+	GtkCheckButton* _tmp79_;
+	GtkCheckButton* _tmp80_;
+	GtkBox* _tmp81_;
+	GtkWidget* _tmp82_;
+	SpitDataImportsWelcomeImportMetaHost* _tmp83_;
 #line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), NULL);
 #line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -16624,141 +16257,141 @@ WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
 #line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ok_button = _tmp3_;
 #line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = _ ("Welcome!");
-#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _ ("Welcome!"));
 #line 2090 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
 #line 2091 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
 #line 2092 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = owner;
+	_tmp4_ = owner;
 #line 2092 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp5_);
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
 #line 2094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = (GtkLabel*) gtk_label_new ("");
+	_tmp5_ = (GtkLabel*) gtk_label_new ("");
 #line 2094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp6_);
+	g_object_ref_sink (_tmp5_);
 #line 2094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	primary_text = _tmp6_;
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = primary_text;
+	primary_text = _tmp5_;
 #line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = _ ("Welcome to Shotwell!");
+	_tmp6_ = primary_text;
 #line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = g_strdup_printf ("<span size=\"large\" weight=\"bold\">%s</span>", _tmp8_);
+	_tmp7_ = g_strdup_printf ("<span size=\"large\" weight=\"bold\">%s</span>", _ ("Welcome to Shotwell!"));
 #line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = _tmp9_;
+	_tmp8_ = _tmp7_;
 #line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_markup (_tmp7_, _tmp10_);
+	gtk_label_set_markup (_tmp6_, _tmp8_);
 #line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp10_);
+	_g_free0 (_tmp8_);
 #line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = primary_text;
+	_tmp9_ = primary_text;
 #line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_xalign (_tmp11_, 0.0f);
+	gtk_label_set_xalign (_tmp9_, 0.0f);
 #line 2098 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = primary_text;
+	_tmp10_ = primary_text;
 #line 2098 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_yalign (_tmp12_, 0.5f);
+	gtk_label_set_yalign (_tmp10_, 0.5f);
 #line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = (GtkLabel*) gtk_label_new ("");
+	_tmp11_ = (GtkLabel*) gtk_label_new ("");
 #line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp13_);
+	g_object_ref_sink (_tmp11_);
 #line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->secondary_text);
 #line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->secondary_text = _tmp13_;
-#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = self->priv->secondary_text;
+	self->priv->secondary_text = _tmp11_;
 #line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = _ ("To get started, import photos in any of these ways:");
+	_tmp12_ = self->priv->secondary_text;
 #line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = g_strdup_printf ("<span weight=\"normal\">%s</span>", _tmp15_);
+	_tmp13_ = g_strdup_printf ("<span weight=\"normal\">%s</span>", _ ("To get started, import photos in any of these ways:"));
 #line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = _tmp16_;
+	_tmp14_ = _tmp13_;
 #line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_markup (_tmp14_, _tmp17_);
+	gtk_label_set_markup (_tmp12_, _tmp14_);
 #line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp17_);
+	_g_free0 (_tmp14_);
 #line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = self->priv->secondary_text;
+	_tmp15_ = self->priv->secondary_text;
 #line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_xalign (_tmp18_, 0.0f);
+	gtk_label_set_xalign (_tmp15_, 0.0f);
 #line 2103 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp19_ = self->priv->secondary_text;
+	_tmp16_ = self->priv->secondary_text;
 #line 2103 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_yalign (_tmp19_, 0.5f);
+	gtk_label_set_yalign (_tmp16_, 0.5f);
 #line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = (GtkImage*) gtk_image_new_from_icon_name ("shotwell", GTK_ICON_SIZE_DIALOG);
+	_tmp17_ = (GtkImage*) gtk_image_new_from_icon_name ("shotwell", GTK_ICON_SIZE_DIALOG);
 #line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp20_);
+	g_object_ref_sink (_tmp17_);
 #line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	image = _tmp20_;
+	image = _tmp17_;
 #line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	_tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 #line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp21_);
+	g_object_ref_sink (_tmp18_);
 #line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	header_text = _tmp21_;
+	header_text = _tmp18_;
 #line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = header_text;
+	_tmp19_ = header_text;
 #line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = primary_text;
+	_tmp20_ = primary_text;
 #line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 5);
+	gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 5);
 #line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp24_ = header_text;
+	_tmp21_ = header_text;
 #line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = self->priv->secondary_text;
+	_tmp22_ = self->priv->secondary_text;
 #line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp26_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+	_tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 #line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp26_);
+	g_object_ref_sink (_tmp23_);
 #line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	header_content = _tmp26_;
+	header_content = _tmp23_;
 #line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp27_ = header_content;
+	_tmp24_ = header_content;
 #line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp28_ = image;
+	_tmp25_ = image;
 #line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp29_ = header_content;
+	_tmp26_ = header_content;
 #line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp30_ = header_text;
+	_tmp27_ = header_text;
 #line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp31_ = (GtkLabel*) gtk_label_new ("");
+	_tmp28_ = (GtkLabel*) gtk_label_new ("");
 #line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp31_);
+	g_object_ref_sink (_tmp28_);
 #line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	instructions = _tmp31_;
+	instructions = _tmp28_;
 #line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp32_ = g_strdup ("   ");
+	_tmp29_ = g_strdup ("   ");
 #line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	indent_prefix = _tmp32_;
+	indent_prefix = _tmp29_;
 #line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp34_ = gtk_widget_get_direction (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+	_tmp31_ = gtk_widget_get_direction (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp34_ == GTK_TEXT_DIR_RTL) {
+	if (_tmp31_ == GTK_TEXT_DIR_RTL) {
 #line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp33_ = "◂";
-#line 16734 "Dialogs.c"
+		_tmp30_ = "◂";
+#line 16361 "Dialogs.c"
 	} else {
 #line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp33_ = "▸";
-#line 16738 "Dialogs.c"
+		_tmp30_ = "▸";
+#line 16365 "Dialogs.c"
 	}
 #line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp35_ = g_strdup (_tmp33_);
+	_tmp32_ = g_strdup (_tmp30_);
 #line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	arrow_glyph = _tmp35_;
+	arrow_glyph = _tmp32_;
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp36_ = instructions;
+	_tmp33_ = instructions;
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp34_ = indent_prefix;
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp35_ = g_strconcat (_tmp34_, "&#8226; %s\n", NULL);
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp36_ = _tmp35_;
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = indent_prefix;
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -16766,209 +16399,190 @@ WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = _tmp38_;
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp40_ = indent_prefix;
+	_tmp40_ = g_strconcat (_tmp36_, _tmp39_, NULL);
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp41_ = g_strconcat (_tmp40_, "&#8226; %s\n", NULL);
+	_tmp41_ = _tmp40_;
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp42_ = _tmp41_;
+	_tmp42_ = indent_prefix;
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp43_ = g_strconcat (_tmp39_, _tmp42_, NULL);
+	_tmp43_ = g_strconcat (_tmp42_, "&#8226; %s", NULL);
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = _tmp43_;
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp45_ = indent_prefix;
+	_tmp45_ = g_strconcat (_tmp41_, _tmp44_, NULL);
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp46_ = g_strconcat (_tmp45_, "&#8226; %s", NULL);
+	_tmp46_ = _tmp45_;
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp47_ = _tmp46_;
+	_tmp47_ = arrow_glyph;
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp48_ = g_strconcat (_tmp44_, _tmp47_, NULL);
+	_tmp48_ = g_strdup_printf (_ ("Choose <span weight=\"bold\">File %s Import From Folder</span>"), _tmp47_);
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp49_ = _tmp48_;
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp50_ = _ ("Choose <span weight=\"bold\">File %s Import From Folder</span>");
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp51_ = arrow_glyph;
+	_tmp50_ = g_strdup_printf (_tmp46_, _tmp49_, _ ("Drag and drop photos onto the Shotwell window"), _ ("Connect a camera to your computer and import"));
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp52_ = g_strdup_printf (_tmp50_, _tmp51_);
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp53_ = _tmp52_;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp54_ = _ ("Drag and drop photos onto the Shotwell window");
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp55_ = _ ("Connect a camera to your computer and import");
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp56_ = g_strdup_printf (_tmp49_, _tmp53_, _tmp54_, _tmp55_);
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp57_ = _tmp56_;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_markup (_tmp36_, _tmp57_);
+	_tmp51_ = _tmp50_;
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp57_);
+	gtk_label_set_markup (_tmp33_, _tmp51_);
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp53_);
+	_g_free0 (_tmp51_);
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp49_);
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp47_);
+	_g_free0 (_tmp46_);
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp44_);
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp42_);
+	_g_free0 (_tmp41_);
 #line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp39_);
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_free0 (_tmp36_);
 #line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp58_ = instructions;
+	_tmp52_ = instructions;
 #line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_xalign (_tmp58_, 0.0f);
+	gtk_label_set_xalign (_tmp52_, 0.0f);
 #line 2125 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp59_ = instructions;
+	_tmp53_ = instructions;
 #line 2125 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_yalign (_tmp59_, 0.5f);
+	gtk_label_set_yalign (_tmp53_, 0.5f);
 #line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp60_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+	_tmp54_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
 #line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp60_);
+	g_object_ref_sink (_tmp54_);
 #line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_action_checkbox_packer);
 #line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->import_action_checkbox_packer = _tmp60_;
+	self->priv->import_action_checkbox_packer = _tmp54_;
 #line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp61_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+	_tmp55_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
 #line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp61_);
+	g_object_ref_sink (_tmp55_);
 #line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_import_action_checkbox_packer);
 #line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->external_import_action_checkbox_packer = _tmp61_;
+	self->priv->external_import_action_checkbox_packer = _tmp55_;
 #line 2130 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp62_ = self->priv->import_action_checkbox_packer;
+	_tmp56_ = self->priv->import_action_checkbox_packer;
 #line 2130 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp63_ = self->priv->external_import_action_checkbox_packer;
+	_tmp57_ = self->priv->external_import_action_checkbox_packer;
 #line 2130 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget));
 #line 2132 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp64_ = show_system_pictures_import;
+	_tmp58_ = show_system_pictures_import;
 #line 2132 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp64_) {
-#line 16838 "Dialogs.c"
-		const gchar* _tmp65_ = NULL;
-		GFile* _tmp66_ = NULL;
-		GFile* _tmp67_ = NULL;
-		gchar* _tmp68_ = NULL;
-		gchar* _tmp69_ = NULL;
-		gchar* _tmp70_ = NULL;
-		gchar* _tmp71_ = NULL;
-		GtkCheckButton* _tmp72_ = NULL;
-		GtkBox* _tmp73_ = NULL;
-		GtkCheckButton* _tmp74_ = NULL;
-		GtkCheckButton* _tmp75_ = NULL;
-#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp65_ = _ ("_Import photos from your %s folder");
+	if (_tmp58_) {
+#line 16459 "Dialogs.c"
+		GFile* _tmp59_;
+		GFile* _tmp60_;
+		gchar* _tmp61_;
+		gchar* _tmp62_;
+		gchar* _tmp63_;
+		gchar* _tmp64_;
+		GtkCheckButton* _tmp65_;
+		GtkBox* _tmp66_;
+		GtkCheckButton* _tmp67_;
+		GtkCheckButton* _tmp68_;
 #line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp66_ = app_dirs_get_import_dir ();
+		_tmp59_ = app_dirs_get_import_dir ();
 #line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp67_ = _tmp66_;
+		_tmp60_ = _tmp59_;
 #line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp68_ = get_display_pathname (_tmp67_);
+		_tmp61_ = get_display_pathname (_tmp60_);
 #line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp69_ = _tmp68_;
+		_tmp62_ = _tmp61_;
 #line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp70_ = g_strdup_printf (_tmp65_, _tmp69_);
+		_tmp63_ = g_strdup_printf (_ ("_Import photos from your %s folder"), _tmp62_);
 #line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp71_ = _tmp70_;
+		_tmp64_ = _tmp63_;
 #line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp72_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp71_);
+		_tmp65_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp64_);
 #line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_ref_sink (_tmp72_);
+		g_object_ref_sink (_tmp65_);
 #line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->system_pictures_import_check);
 #line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->system_pictures_import_check = _tmp72_;
+		self->priv->system_pictures_import_check = _tmp65_;
 #line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp71_);
+		_g_free0 (_tmp64_);
 #line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp69_);
+		_g_free0 (_tmp62_);
 #line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp67_);
+		_g_object_unref0 (_tmp60_);
 #line 2136 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp73_ = self->priv->import_action_checkbox_packer;
+		_tmp66_ = self->priv->import_action_checkbox_packer;
 #line 2136 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp74_ = self->priv->system_pictures_import_check;
+		_tmp67_ = self->priv->system_pictures_import_check;
 #line 2136 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget));
 #line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp75_ = self->priv->system_pictures_import_check;
+		_tmp68_ = self->priv->system_pictures_import_check;
 #line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 16888 "Dialogs.c"
+		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+#line 16506 "Dialogs.c"
 	}
 #line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp76_ = _ ("You can also import photos in any of these ways:");
-#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp77_ = (GtkLabel*) gtk_label_new (_tmp76_);
+	_tmp69_ = (GtkLabel*) gtk_label_new (_ ("You can also import photos in any of these ways:"));
 #line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp77_);
+	g_object_ref_sink (_tmp69_);
 #line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->instruction_header);
 #line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->instruction_header = _tmp77_;
+	self->priv->instruction_header = _tmp69_;
 #line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp78_ = self->priv->instruction_header;
+	_tmp70_ = self->priv->instruction_header;
 #line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_xalign (_tmp78_, 0.0f);
+	gtk_label_set_xalign (_tmp70_, 0.0f);
 #line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp79_ = self->priv->instruction_header;
+	_tmp71_ = self->priv->instruction_header;
 #line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_yalign (_tmp79_, 0.5f);
+	gtk_label_set_yalign (_tmp71_, 0.5f);
 #line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp80_ = self->priv->instruction_header;
+	_tmp72_ = self->priv->instruction_header;
 #line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), 20);
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), 20);
 #line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp81_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 16);
+	_tmp73_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 16);
 #line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp81_);
+	g_object_ref_sink (_tmp73_);
 #line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	content = _tmp81_;
+	content = _tmp73_;
 #line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp82_ = header_content;
+	_tmp74_ = header_content;
 #line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp83_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+	_tmp75_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
 #line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp83_);
+	g_object_ref_sink (_tmp75_);
 #line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_content);
 #line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->import_content = _tmp83_;
+	self->priv->import_content = _tmp75_;
 #line 2149 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp84_ = self->priv->import_content;
+	_tmp76_ = self->priv->import_content;
 #line 2149 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_widget_get_type (), GtkWidget));
 #line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp85_ = instructions;
+	_tmp77_ = instructions;
 #line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp86_ = _ ("_Don’t show this message again");
+	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp87_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp86_);
+	_tmp78_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_ ("_Don’t show this message again"));
 #line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp87_);
+	g_object_ref_sink (_tmp78_);
 #line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->hide_button);
 #line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->hide_button = _tmp87_;
+	self->priv->hide_button = _tmp78_;
 #line 2153 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp88_ = self->priv->hide_button;
+	_tmp79_ = self->priv->hide_button;
 #line 2153 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
 #line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp89_ = self->priv->hide_button;
+	_tmp80_ = self->priv->hide_button;
 #line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp89_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
+	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
 #line 2155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
 #line 2156 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -16986,19 +16600,19 @@ WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
 #line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12);
 #line 2164 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp90_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+	_tmp81_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 2164 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 2166 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp91_ = ok_button;
+	_tmp82_ = ok_button;
 #line 2166 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_grab_focus (_tmp91_);
+	gtk_widget_grab_focus (_tmp82_);
 #line 2168 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_install_import_content (self);
 #line 2170 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp92_ = self->priv->import_meta_host;
+	_tmp83_ = self->priv->import_meta_host;
 #line 2170 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	spit_data_imports_welcome_import_meta_host_start (_tmp92_);
+	spit_data_imports_welcome_import_meta_host_start (_tmp83_);
 #line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (content);
 #line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17019,22 +16633,22 @@ WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
 	_g_object_unref0 (ok_button);
 #line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 17006 "Dialogs.c"
+#line 16620 "Dialogs.c"
 }
 
 
 WelcomeDialog* welcome_dialog_new (GtkWindow* owner) {
 #line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return welcome_dialog_construct (TYPE_WELCOME_DIALOG, owner);
-#line 17013 "Dialogs.c"
+#line 16627 "Dialogs.c"
 }
 
 
 static void welcome_dialog_install_import_content (WelcomeDialog* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GtkCheckButton** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	GtkCheckButton** _tmp2_;
+	gint _tmp2__length1;
 #line 2173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_DIALOG (self));
 #line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17045,37 +16659,37 @@ static void welcome_dialog_install_import_content (WelcomeDialog* self) {
 	if (_tmp2__length1 > 0) {
 #line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = TRUE;
-#line 17032 "Dialogs.c"
+#line 16646 "Dialogs.c"
 	} else {
-		GtkCheckButton* _tmp3_ = NULL;
+		GtkCheckButton* _tmp3_;
 #line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = self->priv->system_pictures_import_check;
 #line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 17039 "Dialogs.c"
+#line 16653 "Dialogs.c"
 	}
 #line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 17043 "Dialogs.c"
-		gboolean _tmp4_ = FALSE;
+#line 16657 "Dialogs.c"
+		gboolean _tmp4_;
 #line 2176 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = self->priv->import_content_already_installed;
 #line 2176 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp4_ == FALSE;
-#line 17049 "Dialogs.c"
+#line 16663 "Dialogs.c"
 	} else {
 #line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 17053 "Dialogs.c"
+#line 16667 "Dialogs.c"
 	}
 #line 2174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 17057 "Dialogs.c"
-		GtkLabel* _tmp5_ = NULL;
-		GtkBox* _tmp6_ = NULL;
-		GtkBox* _tmp7_ = NULL;
-		GtkBox* _tmp8_ = NULL;
-		GtkLabel* _tmp9_ = NULL;
+#line 16671 "Dialogs.c"
+		GtkLabel* _tmp5_;
+		GtkBox* _tmp6_;
+		GtkBox* _tmp7_;
+		GtkBox* _tmp8_;
+		GtkLabel* _tmp9_;
 #line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->secondary_text;
 #line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17094,68 +16708,67 @@ static void welcome_dialog_install_import_content (WelcomeDialog* self) {
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
 #line 2181 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->import_content_already_installed = TRUE;
-#line 17081 "Dialogs.c"
+#line 16695 "Dialogs.c"
 	}
 }
 
 
-static void _vala_array_add109 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value) {
+static void _vala_array_add109 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value) {
 #line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if ((*length) == (*size)) {
 #line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1);
-#line 17093 "Dialogs.c"
+#line 16707 "Dialogs.c"
 	}
 #line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[(*length)++] = value;
 #line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[*length] = NULL;
-#line 17099 "Dialogs.c"
+#line 16713 "Dialogs.c"
 }
 
 
-static void _vala_array_add110 (GtkCheckButton*** array, int* length, int* size, GtkCheckButton* value) {
+static void _vala_array_add110 (GtkCheckButton** * array, int* length, int* size, GtkCheckButton* value) {
 #line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if ((*length) == (*size)) {
 #line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*array = g_renew (GtkCheckButton*, *array, (*size) + 1);
-#line 17110 "Dialogs.c"
+#line 16724 "Dialogs.c"
 	}
 #line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[(*length)++] = value;
 #line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[*length] = NULL;
-#line 17116 "Dialogs.c"
+#line 16730 "Dialogs.c"
 }
 
 
 void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEntry* entry) {
-	WelcomeServiceEntry* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	WelcomeServiceEntry** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	WelcomeServiceEntry* _tmp6_ = NULL;
-	WelcomeServiceEntry* _tmp7_ = NULL;
+	WelcomeServiceEntry* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	WelcomeServiceEntry** _tmp5_;
+	gint _tmp5__length1;
+	WelcomeServiceEntry* _tmp6_;
+	WelcomeServiceEntry* _tmp7_;
 	GtkCheckButton* entry_check = NULL;
-	const gchar* _tmp8_ = NULL;
-	WelcomeServiceEntry* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	GtkCheckButton* _tmp14_ = NULL;
-	GtkCheckButton* _tmp15_ = NULL;
-	GtkCheckButton** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
-	GtkCheckButton* _tmp17_ = NULL;
-	GtkBox* _tmp18_ = NULL;
+	WelcomeServiceEntry* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	GtkCheckButton* _tmp13_;
+	GtkCheckButton* _tmp14_;
+	GtkCheckButton** _tmp15_;
+	gint _tmp15__length1;
+	GtkCheckButton* _tmp16_;
+	GtkBox* _tmp17_;
 #line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_DIALOG (self));
 #line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17187,48 +16800,46 @@ void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEn
 #line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_array_add109 (&self->priv->external_import_entries, &self->priv->external_import_entries_length1, &self->priv->_external_import_entries_size_, _tmp7_);
 #line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = _ ("Import photos from your %s library");
+	_tmp8_ = entry;
 #line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = entry;
+	_tmp9_ = welcome_service_entry_get_service_name (_tmp8_);
 #line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = welcome_service_entry_get_service_name (_tmp9_);
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = _tmp10_;
+	_tmp10_ = _tmp9_;
 #line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = g_strdup_printf (_tmp8_, _tmp11_);
+	_tmp11_ = g_strdup_printf (_ ("Import photos from your %s library"), _tmp10_);
 #line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = _tmp12_;
+	_tmp12_ = _tmp11_;
 #line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = (GtkCheckButton*) gtk_check_button_new_with_label (_tmp13_);
+	_tmp13_ = (GtkCheckButton*) gtk_check_button_new_with_label (_tmp12_);
 #line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp14_);
+	g_object_ref_sink (_tmp13_);
 #line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = _tmp14_;
+	_tmp14_ = _tmp13_;
 #line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp13_);
+	_g_free0 (_tmp12_);
 #line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp11_);
+	_g_free0 (_tmp10_);
 #line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	entry_check = _tmp15_;
+	entry_check = _tmp14_;
 #line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = self->priv->external_import_checks;
+	_tmp15_ = self->priv->external_import_checks;
 #line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16__length1 = self->priv->external_import_checks_length1;
+	_tmp15__length1 = self->priv->external_import_checks_length1;
 #line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = _g_object_ref0 (entry_check);
+	_tmp16_ = _g_object_ref0 (entry_check);
 #line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_array_add110 (&self->priv->external_import_checks, &self->priv->external_import_checks_length1, &self->priv->_external_import_checks_size_, _tmp17_);
+	_vala_array_add110 (&self->priv->external_import_checks, &self->priv->external_import_checks_length1, &self->priv->_external_import_checks_size_, _tmp16_);
 #line 2191 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
 #line 2192 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = self->priv->external_import_action_checkbox_packer;
+	_tmp17_ = self->priv->external_import_action_checkbox_packer;
 #line 2192 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_widget_get_type (), GtkWidget));
 #line 2193 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_install_import_content (self);
 #line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (entry_check);
-#line 17215 "Dialogs.c"
+#line 16826 "Dialogs.c"
 }
 
 
@@ -17238,7 +16849,7 @@ void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEn
      * images from a camera; please see #4997 for details.
      */
 static void welcome_dialog_on_dismiss (WelcomeDialog* self, gint resp) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 2201 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_DIALOG (self));
 #line 2202 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17247,37 +16858,37 @@ static void welcome_dialog_on_dismiss (WelcomeDialog* self, gint resp) {
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
 #line 2203 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->ok_clicked = TRUE;
-#line 17234 "Dialogs.c"
+#line 16845 "Dialogs.c"
 	}
 #line 2205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 2206 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_main_quit ();
-#line 17240 "Dialogs.c"
+#line 16851 "Dialogs.c"
 }
 
 
 static void _welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
 #line 2212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_on_dismiss ((WelcomeDialog*) self, response_id);
-#line 17247 "Dialogs.c"
+#line 16858 "Dialogs.c"
 }
 
 
-static void _vala_array_add111 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value) {
+static void _vala_array_add111 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value) {
 #line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if ((*length) == (*size)) {
 #line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1);
-#line 17258 "Dialogs.c"
+#line 16869 "Dialogs.c"
 	}
 #line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[(*length)++] = value;
 #line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[*length] = NULL;
-#line 17264 "Dialogs.c"
+#line 16875 "Dialogs.c"
 }
 
 
@@ -17288,17 +16899,17 @@ static WelcomeServiceEntry** _vala_array_dup29 (WelcomeServiceEntry** self, int
 	result = g_new0 (WelcomeServiceEntry*, length + 1);
 #line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	for (i = 0; i < length; i++) {
-#line 17275 "Dialogs.c"
-		WelcomeServiceEntry* _tmp0_ = NULL;
+#line 16886 "Dialogs.c"
+		WelcomeServiceEntry* _tmp0_;
 #line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result[i] = _tmp0_;
-#line 17281 "Dialogs.c"
+#line 16892 "Dialogs.c"
 	}
 #line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 17285 "Dialogs.c"
+#line 16896 "Dialogs.c"
 }
 
 
@@ -17307,21 +16918,21 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 	int _vala_selected_import_entries_length1 = 0;
 	gboolean _vala_do_system_pictures_import = FALSE;
 	gboolean result = FALSE;
-	guint _tmp0_ = 0U;
+	guint _tmp0_;
 	gboolean ok = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	gboolean show_dialog = FALSE;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp2_;
 	WelcomeServiceEntry** _result_ = NULL;
-	WelcomeServiceEntry** _tmp5_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	WelcomeServiceEntry** _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
-	WelcomeServiceEntry** _tmp20_ = NULL;
-	gint _tmp20__length1 = 0;
+	WelcomeServiceEntry** _tmp5_;
+	gint _result__length1;
+	gint __result__size_;
+	WelcomeServiceEntry** _tmp19_;
+	gint _tmp19__length1;
+	WelcomeServiceEntry** _tmp20_;
+	gint _tmp20__length1;
 	gboolean _tmp21_ = FALSE;
-	GtkCheckButton* _tmp22_ = NULL;
+	GtkCheckButton* _tmp22_;
 #line 2209 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_WELCOME_DIALOG (self), FALSE);
 #line 2212 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17346,16 +16957,16 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 	_tmp2_ = ok;
 #line 2228 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 17333 "Dialogs.c"
-		GtkCheckButton* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+#line 16944 "Dialogs.c"
+		GtkCheckButton* _tmp3_;
+		gboolean _tmp4_;
 #line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = self->priv->hide_button;
 #line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		show_dialog = !_tmp4_;
-#line 17342 "Dialogs.c"
+#line 16953 "Dialogs.c"
 	}
 #line 2232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
@@ -17365,36 +16976,36 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 	_result__length1 = 0;
 #line 2232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	__result__size_ = _result__length1;
-#line 17352 "Dialogs.c"
+#line 16963 "Dialogs.c"
 	{
 		gint i = 0;
 #line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		i = 0;
-#line 17357 "Dialogs.c"
+#line 16968 "Dialogs.c"
 		{
 			gboolean _tmp6_ = FALSE;
 #line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = TRUE;
 #line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 17364 "Dialogs.c"
-				gint _tmp8_ = 0;
-				WelcomeServiceEntry** _tmp9_ = NULL;
-				gint _tmp9__length1 = 0;
-				GtkCheckButton** _tmp10_ = NULL;
-				gint _tmp10__length1 = 0;
-				gint _tmp11_ = 0;
-				GtkCheckButton* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
+#line 16975 "Dialogs.c"
+				gint _tmp8_;
+				WelcomeServiceEntry** _tmp9_;
+				gint _tmp9__length1;
+				GtkCheckButton** _tmp10_;
+				gint _tmp10__length1;
+				gint _tmp11_;
+				GtkCheckButton* _tmp12_;
+				gboolean _tmp13_;
 #line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp6_) {
-#line 17375 "Dialogs.c"
-					gint _tmp7_ = 0;
+#line 16986 "Dialogs.c"
+					gint _tmp7_;
 #line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp7_ = i;
 #line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					i = _tmp7_ + 1;
-#line 17381 "Dialogs.c"
+#line 16992 "Dialogs.c"
 				}
 #line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
@@ -17408,7 +17019,7 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 				if (!(_tmp8_ < _tmp9__length1)) {
 #line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 17395 "Dialogs.c"
+#line 17006 "Dialogs.c"
 				}
 #line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = self->priv->external_import_checks;
@@ -17422,14 +17033,14 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 				_tmp13_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp13_ == TRUE) {
-#line 17409 "Dialogs.c"
-					WelcomeServiceEntry** _tmp14_ = NULL;
-					gint _tmp14__length1 = 0;
-					WelcomeServiceEntry** _tmp15_ = NULL;
-					gint _tmp15__length1 = 0;
-					gint _tmp16_ = 0;
-					WelcomeServiceEntry* _tmp17_ = NULL;
-					WelcomeServiceEntry* _tmp18_ = NULL;
+#line 17020 "Dialogs.c"
+					WelcomeServiceEntry** _tmp14_;
+					gint _tmp14__length1;
+					WelcomeServiceEntry** _tmp15_;
+					gint _tmp15__length1;
+					gint _tmp16_;
+					WelcomeServiceEntry* _tmp17_;
+					WelcomeServiceEntry* _tmp18_;
 #line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp14_ = _result_;
 #line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17446,7 +17057,7 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 					_tmp18_ = _g_object_ref0 (_tmp17_);
 #line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_vala_array_add111 (&_result_, &_result__length1, &__result__size_, _tmp18_);
-#line 17433 "Dialogs.c"
+#line 17044 "Dialogs.c"
 				}
 			}
 		}
@@ -17469,20 +17080,20 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 	_tmp22_ = self->priv->system_pictures_import_check;
 #line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp22_ != NULL) {
-#line 17456 "Dialogs.c"
-		GtkCheckButton* _tmp23_ = NULL;
-		gboolean _tmp24_ = FALSE;
+#line 17067 "Dialogs.c"
+		GtkCheckButton* _tmp23_;
+		gboolean _tmp24_;
 #line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = self->priv->system_pictures_import_check;
 #line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = _tmp24_;
-#line 17465 "Dialogs.c"
+#line 17076 "Dialogs.c"
 	} else {
 #line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = FALSE;
-#line 17469 "Dialogs.c"
+#line 17080 "Dialogs.c"
 	}
 #line 2238 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_do_system_pictures_import = _tmp21_;
@@ -17496,39 +17107,39 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 	if (selected_import_entries) {
 #line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*selected_import_entries = _vala_selected_import_entries;
-#line 17483 "Dialogs.c"
+#line 17094 "Dialogs.c"
 	} else {
 #line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_selected_import_entries = (_vala_array_free (_vala_selected_import_entries, _vala_selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 17487 "Dialogs.c"
+#line 17098 "Dialogs.c"
 	}
 #line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (selected_import_entries_length1) {
 #line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*selected_import_entries_length1 = _vala_selected_import_entries_length1;
-#line 17493 "Dialogs.c"
+#line 17104 "Dialogs.c"
 	}
 #line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (do_system_pictures_import) {
 #line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*do_system_pictures_import = _vala_do_system_pictures_import;
-#line 17499 "Dialogs.c"
+#line 17110 "Dialogs.c"
 	}
 #line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 17503 "Dialogs.c"
+#line 17114 "Dialogs.c"
 }
 
 
 static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 	gboolean result = FALSE;
 	GFile* system_pictures = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GFile* _tmp3_ = NULL;
-	GFileType _tmp4_ = 0;
-	gboolean _tmp13_ = FALSE;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
+	GFile* _tmp3_;
+	GFileType _tmp4_;
+	gboolean _tmp10_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = app_dirs_get_import_dir ();
@@ -17546,7 +17157,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 		_g_object_unref0 (system_pictures);
 #line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17533 "Dialogs.c"
+#line 17144 "Dialogs.c"
 	}
 #line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = system_pictures;
@@ -17560,18 +17171,15 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 		_g_object_unref0 (system_pictures);
 #line 2252 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17547 "Dialogs.c"
+#line 17158 "Dialogs.c"
 	}
 	{
 		GFileEnumerator* syspics_child_enum = NULL;
-		GFile* _tmp5_ = NULL;
-		GFileEnumerator* _tmp6_ = NULL;
+		GFile* _tmp5_;
+		GFileEnumerator* _tmp6_;
 		GFileInfo* _tmp7_ = NULL;
-		GFileEnumerator* _tmp8_ = NULL;
-		GFileInfo* _tmp9_ = NULL;
-		GFileInfo* _tmp10_ = NULL;
-		GFileInfo* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
+		GFileEnumerator* _tmp8_;
+		GFileInfo* _tmp9_;
 #line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = system_pictures;
 #line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17580,8 +17188,8 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 		syspics_child_enum = _tmp6_;
 #line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17567 "Dialogs.c"
-			goto __catch426_g_error;
+#line 17175 "Dialogs.c"
+			goto __catch427_g_error;
 		}
 #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = syspics_child_enum;
@@ -17593,21 +17201,11 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (syspics_child_enum);
-#line 17580 "Dialogs.c"
-			goto __catch426_g_error;
+#line 17188 "Dialogs.c"
+			goto __catch427_g_error;
 		}
 #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = _tmp7_;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = NULL;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp11_ = _tmp10_;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = _tmp11_ != NULL;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp11_);
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		result = _tmp12_;
+		result = _tmp7_ != NULL;
 #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp7_);
 #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17616,10 +17214,10 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 		_g_object_unref0 (system_pictures);
 #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17603 "Dialogs.c"
+#line 17201 "Dialogs.c"
 	}
-	goto __finally426;
-	__catch426_g_error:
+	goto __finally427;
+	__catch427_g_error:
 	{
 		GError* e = NULL;
 #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17634,9 +17232,9 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 		_g_object_unref0 (system_pictures);
 #line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17621 "Dialogs.c"
+#line 17219 "Dialogs.c"
 	}
-	__finally426:
+	__finally427:
 #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (system_pictures);
 #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17644,8 +17242,8 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_clear_error (&_inner_error_);
 #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return _tmp13_;
-#line 17632 "Dialogs.c"
+	return _tmp10_;
+#line 17230 "Dialogs.c"
 }
 
 
@@ -17656,13 +17254,13 @@ static void welcome_dialog_class_init (WelcomeDialogClass * klass) {
 	g_type_class_add_private (klass, sizeof (WelcomeDialogPrivate));
 #line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = welcome_dialog_finalize;
-#line 17643 "Dialogs.c"
+#line 17241 "Dialogs.c"
 }
 
 
 static void welcome_dialog_instance_init (WelcomeDialog * self) {
-	GtkCheckButton** _tmp0_ = NULL;
-	WelcomeServiceEntry** _tmp1_ = NULL;
+	GtkCheckButton** _tmp0_;
+	WelcomeServiceEntry** _tmp1_;
 #line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = WELCOME_DIALOG_GET_PRIVATE (self);
 #line 2073 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17687,11 +17285,11 @@ static void welcome_dialog_instance_init (WelcomeDialog * self) {
 	self->priv->import_content_already_installed = FALSE;
 #line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->ok_clicked = FALSE;
-#line 17674 "Dialogs.c"
+#line 17272 "Dialogs.c"
 }
 
 
-static void welcome_dialog_finalize (GObject* obj) {
+static void welcome_dialog_finalize (GObject * obj) {
 	WelcomeDialog * self;
 #line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_WELCOME_DIALOG, WelcomeDialog);
@@ -17717,7 +17315,7 @@ static void welcome_dialog_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->import_meta_host);
 #line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (welcome_dialog_parent_class)->finalize (obj);
-#line 17704 "Dialogs.c"
+#line 17302 "Dialogs.c"
 }
 
 
@@ -17738,21 +17336,21 @@ static gboolean _preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget
 	result = preferences_dialog_on_delete ((PreferencesDialog*) self);
 #line 2308 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 17725 "Dialogs.c"
+#line 17323 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
 #line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_close ((PreferencesDialog*) self);
-#line 17732 "Dialogs.c"
+#line 17330 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
 #line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_value_changed ((PreferencesDialog*) self);
-#line 17739 "Dialogs.c"
+#line 17337 "Dialogs.c"
 }
 
 
@@ -17761,7 +17359,7 @@ static gboolean _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_ev
 	result = preferences_dialog_on_bg_color_reset ((PreferencesDialog*) self, event);
 #line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 17748 "Dialogs.c"
+#line 17346 "Dialogs.c"
 }
 
 
@@ -17770,49 +17368,49 @@ static gboolean _preferences_dialog_on_local_pattern_help_gtk_label_activate_lin
 	result = preferences_dialog_on_local_pattern_help ((PreferencesDialog*) self, uri);
 #line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 17757 "Dialogs.c"
+#line 17355 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_dir_pattern_combo_changed ((PreferencesDialog*) self);
-#line 17764 "Dialogs.c"
+#line 17362 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_dir_pattern_entry_changed ((PreferencesDialog*) self);
-#line 17771 "Dialogs.c"
+#line 17369 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
 #line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_lowercase_toggled ((PreferencesDialog*) self);
-#line 17778 "Dialogs.c"
+#line 17376 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_photo_editor_changed ((PreferencesDialog*) self);
-#line 17785 "Dialogs.c"
+#line 17383 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_raw_editor_changed ((PreferencesDialog*) self);
-#line 17792 "Dialogs.c"
+#line 17390 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_default_raw_developer_changed ((PreferencesDialog*) self);
-#line 17799 "Dialogs.c"
+#line 17397 "Dialogs.c"
 }
 
 
@@ -17821,126 +17419,121 @@ static gboolean _preferences_dialog_map_event_gtk_widget_map_event (GtkWidget* _
 	result = preferences_dialog_map_event ((PreferencesDialog*) self);
 #line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 17808 "Dialogs.c"
+#line 17406 "Dialogs.c"
 }
 
 
 static PreferencesDialog* preferences_dialog_construct (GType object_type) {
 	PreferencesDialog* self = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GtkBuilder* _tmp1_ = NULL;
-	GObject* _tmp2_ = NULL;
-	GtkDialog* _tmp3_ = NULL;
+	GtkBuilder* _tmp0_;
+	GtkBuilder* _tmp1_;
+	GObject* _tmp2_;
+	GtkDialog* _tmp3_;
 	gboolean use_header = FALSE;
-	GtkSettings* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	GtkDialog* _tmp8_ = NULL;
-	AppWindow* _tmp9_ = NULL;
-	AppWindow* _tmp10_ = NULL;
-	GdkWindow* _tmp11_ = NULL;
-	GtkDialog* _tmp12_ = NULL;
-	AppWindow* _tmp13_ = NULL;
-	AppWindow* _tmp14_ = NULL;
-	GtkDialog* _tmp15_ = NULL;
-	GtkDialog* _tmp16_ = NULL;
-	GtkBuilder* _tmp17_ = NULL;
-	GObject* _tmp18_ = NULL;
-	GtkAdjustment* _tmp19_ = NULL;
-	GtkAdjustment* _tmp20_ = NULL;
-	GtkAdjustment* _tmp21_ = NULL;
-	gdouble _tmp22_ = 0.0;
-	ConfigFacade* _tmp23_ = NULL;
-	ConfigFacade* _tmp24_ = NULL;
+	GtkSettings* _tmp4_;
+	gboolean _tmp5_;
+	GtkDialog* _tmp8_;
+	AppWindow* _tmp9_;
+	AppWindow* _tmp10_;
+	GdkWindow* _tmp11_;
+	GtkDialog* _tmp12_;
+	AppWindow* _tmp13_;
+	AppWindow* _tmp14_;
+	GtkDialog* _tmp15_;
+	GtkDialog* _tmp16_;
+	GtkBuilder* _tmp17_;
+	GObject* _tmp18_;
+	GtkAdjustment* _tmp19_;
+	GtkAdjustment* _tmp20_;
+	GtkAdjustment* _tmp21_;
+	gdouble _tmp22_;
+	ConfigFacade* _tmp23_;
+	ConfigFacade* _tmp24_;
 	GdkRGBA _tmp25_ = {0};
-	gdouble _tmp26_ = 0.0;
-	GtkAdjustment* _tmp27_ = NULL;
-	GtkBuilder* _tmp28_ = NULL;
-	GObject* _tmp29_ = NULL;
-	GtkScale* _tmp30_ = NULL;
-	GtkScale* _tmp31_ = NULL;
-	GtkBuilder* _tmp32_ = NULL;
-	GObject* _tmp33_ = NULL;
-	GtkFileChooserButton* _tmp34_ = NULL;
-	GtkBuilder* _tmp35_ = NULL;
-	GObject* _tmp36_ = NULL;
-	GtkComboBox* _tmp37_ = NULL;
-	GtkBuilder* _tmp38_ = NULL;
-	GObject* _tmp39_ = NULL;
-	GtkComboBox* _tmp40_ = NULL;
+	gdouble _tmp26_;
+	GtkAdjustment* _tmp27_;
+	GtkBuilder* _tmp28_;
+	GObject* _tmp29_;
+	GtkScale* _tmp30_;
+	GtkScale* _tmp31_;
+	GtkBuilder* _tmp32_;
+	GObject* _tmp33_;
+	GtkFileChooserButton* _tmp34_;
+	GtkBuilder* _tmp35_;
+	GObject* _tmp36_;
+	GtkComboBox* _tmp37_;
+	GtkBuilder* _tmp38_;
+	GObject* _tmp39_;
+	GtkComboBox* _tmp40_;
 	GtkLabel* pattern_help = NULL;
-	GtkBuilder* _tmp41_ = NULL;
-	GObject* _tmp42_ = NULL;
-	GtkLabel* _tmp43_ = NULL;
+	GtkBuilder* _tmp41_;
+	GObject* _tmp42_;
+	GtkLabel* _tmp43_;
 	gchar* help_path = NULL;
-	gchar* _tmp44_ = NULL;
-	const gchar* _tmp45_ = NULL;
-	GtkBuilder* _tmp59_ = NULL;
-	GObject* _tmp60_ = NULL;
-	GtkComboBoxText* _tmp61_ = NULL;
-	GtkBuilder* _tmp62_ = NULL;
-	GObject* _tmp63_ = NULL;
-	GtkEntry* _tmp64_ = NULL;
-	GtkBuilder* _tmp65_ = NULL;
-	GObject* _tmp66_ = NULL;
-	GtkLabel* _tmp67_ = NULL;
-	const gchar* _tmp68_ = NULL;
-	gchar* _tmp69_ = NULL;
-	gchar* _tmp70_ = NULL;
-	const gchar* _tmp71_ = NULL;
-	gchar* _tmp72_ = NULL;
-	gchar* _tmp73_ = NULL;
-	const gchar* _tmp74_ = NULL;
-	gchar* _tmp75_ = NULL;
-	gchar* _tmp76_ = NULL;
-	const gchar* _tmp77_ = NULL;
-	const gchar* _tmp78_ = NULL;
-	GtkComboBoxText* _tmp79_ = NULL;
-	GtkEntry* _tmp80_ = NULL;
-	GtkBuilder* _tmp81_ = NULL;
-	GObject* _tmp82_ = NULL;
-	GtkComboBoxText* _tmp83_ = NULL;
-	GtkBuilder* _tmp84_ = NULL;
-	GObject* _tmp85_ = NULL;
-	GtkCheckButton* _tmp86_ = NULL;
-	GtkCheckButton* _tmp87_ = NULL;
+	gchar* _tmp44_;
+	const gchar* _tmp45_;
+	GtkBuilder* _tmp57_;
+	GObject* _tmp58_;
+	GtkComboBoxText* _tmp59_;
+	GtkBuilder* _tmp60_;
+	GObject* _tmp61_;
+	GtkEntry* _tmp62_;
+	GtkBuilder* _tmp63_;
+	GObject* _tmp64_;
+	GtkLabel* _tmp65_;
+	gchar* _tmp66_;
+	gchar* _tmp67_;
+	gchar* _tmp68_;
+	gchar* _tmp69_;
+	gchar* _tmp70_;
+	gchar* _tmp71_;
+	GtkComboBoxText* _tmp72_;
+	GtkEntry* _tmp73_;
+	GtkBuilder* _tmp74_;
+	GObject* _tmp75_;
+	GtkComboBoxText* _tmp76_;
+	GtkBuilder* _tmp77_;
+	GObject* _tmp78_;
+	GtkCheckButton* _tmp79_;
+	GtkCheckButton* _tmp80_;
 	GtkNotebook* notebook = NULL;
-	GtkBuilder* _tmp88_ = NULL;
-	GObject* _tmp89_ = NULL;
-	GtkNotebook* _tmp90_ = NULL;
-	GtkWidget* _tmp91_ = NULL;
-	PluginsManifestWidgetMediator* _tmp92_ = NULL;
-	GtkWidget* _tmp93_ = NULL;
-	GtkWidget* _tmp94_ = NULL;
-	GtkComboBox* _tmp95_ = NULL;
-	GtkComboBox* _tmp96_ = NULL;
+	GtkBuilder* _tmp81_;
+	GObject* _tmp82_;
+	GtkNotebook* _tmp83_;
+	GtkWidget* _tmp84_;
+	PluginsManifestWidgetMediator* _tmp85_;
+	GtkWidget* _tmp86_;
+	GtkWidget* _tmp87_;
+	GtkComboBox* _tmp88_;
+	GtkComboBox* _tmp89_;
 	GtkCheckButton* auto_import_button = NULL;
-	GtkBuilder* _tmp97_ = NULL;
-	GObject* _tmp98_ = NULL;
-	GtkCheckButton* _tmp99_ = NULL;
-	ConfigFacade* _tmp100_ = NULL;
-	ConfigFacade* _tmp101_ = NULL;
-	gboolean _tmp102_ = FALSE;
+	GtkBuilder* _tmp90_;
+	GObject* _tmp91_;
+	GtkCheckButton* _tmp92_;
+	ConfigFacade* _tmp93_;
+	ConfigFacade* _tmp94_;
+	gboolean _tmp95_;
 	GtkCheckButton* commit_metadata_button = NULL;
-	GtkBuilder* _tmp103_ = NULL;
-	GObject* _tmp104_ = NULL;
-	GtkCheckButton* _tmp105_ = NULL;
-	ConfigFacade* _tmp106_ = NULL;
-	ConfigFacade* _tmp107_ = NULL;
-	gboolean _tmp108_ = FALSE;
-	GtkBuilder* _tmp109_ = NULL;
-	GObject* _tmp110_ = NULL;
-	GtkComboBoxText* _tmp111_ = NULL;
-	GtkComboBoxText* _tmp112_ = NULL;
-	gchar* _tmp113_ = NULL;
-	gchar* _tmp114_ = NULL;
-	GtkComboBoxText* _tmp115_ = NULL;
-	gchar* _tmp116_ = NULL;
-	gchar* _tmp117_ = NULL;
-	ConfigFacade* _tmp118_ = NULL;
-	ConfigFacade* _tmp119_ = NULL;
-	RawDeveloper _tmp120_ = 0;
-	GtkComboBoxText* _tmp121_ = NULL;
-	GtkDialog* _tmp122_ = NULL;
+	GtkBuilder* _tmp96_;
+	GObject* _tmp97_;
+	GtkCheckButton* _tmp98_;
+	ConfigFacade* _tmp99_;
+	ConfigFacade* _tmp100_;
+	gboolean _tmp101_;
+	GtkBuilder* _tmp102_;
+	GObject* _tmp103_;
+	GtkComboBoxText* _tmp104_;
+	GtkComboBoxText* _tmp105_;
+	gchar* _tmp106_;
+	gchar* _tmp107_;
+	GtkComboBoxText* _tmp108_;
+	gchar* _tmp109_;
+	gchar* _tmp110_;
+	ConfigFacade* _tmp111_;
+	ConfigFacade* _tmp112_;
+	RawDeveloper _tmp113_;
+	GtkComboBoxText* _tmp114_;
+	GtkDialog* _tmp115_;
 #line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (PreferencesDialog*) g_type_create_instance (object_type);
 #line 2297 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17967,10 +17560,10 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) {
 	_tmp5_ = use_header;
 #line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp5_) {
-#line 17954 "Dialogs.c"
+#line 17547 "Dialogs.c"
 		GtkWidget* null_titlebar = NULL;
-		GtkDialog* _tmp6_ = NULL;
-		GtkWidget* _tmp7_ = NULL;
+		GtkDialog* _tmp6_;
+		GtkWidget* _tmp7_;
 #line 2303 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		null_titlebar = NULL;
 #line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17981,7 +17574,7 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) {
 		gtk_window_set_titlebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp7_);
 #line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (null_titlebar);
-#line 17968 "Dialogs.c"
+#line 17561 "Dialogs.c"
 	}
 #line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->dialog;
@@ -18105,274 +17698,258 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) {
 	_tmp45_ = help_path;
 #line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp45_ == NULL) {
-#line 18092 "Dialogs.c"
-		GtkLabel* _tmp46_ = NULL;
-		const gchar* _tmp47_ = NULL;
-		gchar* _tmp48_ = NULL;
-		gchar* _tmp49_ = NULL;
-		gchar* _tmp50_ = NULL;
-		gchar* _tmp51_ = NULL;
+#line 17685 "Dialogs.c"
+		GtkLabel* _tmp46_;
+		gchar* _tmp47_;
+		gchar* _tmp48_;
+		gchar* _tmp49_;
+		gchar* _tmp50_;
 #line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp46_ = pattern_help;
 #line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp47_ = _ ("(Help)");
-#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp48_ = g_strconcat ("<a href=\"" RESOURCES_DIR_PATTERN_URI_SYSWIDE "\">", _tmp47_, NULL);
+		_tmp47_ = g_strconcat ("<a href=\"" RESOURCES_DIR_PATTERN_URI_SYSWIDE "\">", _ ("(Help)"), NULL);
 #line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp49_ = _tmp48_;
+		_tmp48_ = _tmp47_;
 #line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp50_ = g_strconcat (_tmp49_, "</a>", NULL);
+		_tmp49_ = g_strconcat (_tmp48_, "</a>", NULL);
 #line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp51_ = _tmp50_;
+		_tmp50_ = _tmp49_;
 #line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_label_set_markup (_tmp46_, _tmp51_);
+		gtk_label_set_markup (_tmp46_, _tmp50_);
 #line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp51_);
+		_g_free0 (_tmp50_);
 #line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp49_);
-#line 18117 "Dialogs.c"
+		_g_free0 (_tmp48_);
+#line 17707 "Dialogs.c"
 	} else {
-		GtkLabel* _tmp52_ = NULL;
-		const gchar* _tmp53_ = NULL;
-		gchar* _tmp54_ = NULL;
-		gchar* _tmp55_ = NULL;
-		gchar* _tmp56_ = NULL;
-		gchar* _tmp57_ = NULL;
-		GtkLabel* _tmp58_ = NULL;
+		GtkLabel* _tmp51_;
+		gchar* _tmp52_;
+		gchar* _tmp53_;
+		gchar* _tmp54_;
+		gchar* _tmp55_;
+		GtkLabel* _tmp56_;
 #line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp52_ = pattern_help;
+		_tmp51_ = pattern_help;
 #line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp53_ = _ ("(Help)");
+		_tmp52_ = g_strconcat ("<a href=\"dummy:\">", _ ("(Help)"), NULL);
 #line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp54_ = g_strconcat ("<a href=\"dummy:\">", _tmp53_, NULL);
+		_tmp53_ = _tmp52_;
 #line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp55_ = _tmp54_;
+		_tmp54_ = g_strconcat (_tmp53_, "</a>", NULL);
 #line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp56_ = g_strconcat (_tmp55_, "</a>", NULL);
-#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp57_ = _tmp56_;
-#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_label_set_markup (_tmp52_, _tmp57_);
+		_tmp55_ = _tmp54_;
 #line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp57_);
+		gtk_label_set_markup (_tmp51_, _tmp55_);
 #line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp55_);
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_g_free0 (_tmp53_);
 #line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp58_ = pattern_help;
+		_tmp56_ = pattern_help;
 #line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_signal_connect (_tmp58_, "activate-link", (GCallback) _preferences_dialog_on_local_pattern_help_gtk_label_activate_link, self);
-#line 18148 "Dialogs.c"
+		g_signal_connect (_tmp56_, "activate-link", (GCallback) _preferences_dialog_on_local_pattern_help_gtk_label_activate_link, self);
+#line 17735 "Dialogs.c"
 	}
 #line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp59_ = self->priv->builder;
+	_tmp57_ = self->priv->builder;
 #line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp60_ = gtk_builder_get_object (_tmp59_, "dir choser");
+	_tmp58_ = gtk_builder_get_object (_tmp57_, "dir choser");
 #line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp61_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp60_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp60_) : NULL);
+	_tmp59_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp58_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp58_) : NULL);
 #line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_combo);
 #line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->dir_pattern_combo = _tmp61_;
+	self->priv->dir_pattern_combo = _tmp59_;
 #line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp62_ = self->priv->builder;
+	_tmp60_ = self->priv->builder;
 #line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp63_ = gtk_builder_get_object (_tmp62_, "dir_pattern_entry");
+	_tmp61_ = gtk_builder_get_object (_tmp60_, "dir_pattern_entry");
 #line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp64_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp63_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp63_) : NULL);
+	_tmp62_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp61_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp61_) : NULL);
 #line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_entry);
 #line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->dir_pattern_entry = _tmp64_;
+	self->priv->dir_pattern_entry = _tmp62_;
 #line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp65_ = self->priv->builder;
+	_tmp63_ = self->priv->builder;
 #line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp66_ = gtk_builder_get_object (_tmp65_, "dynamic example");
+	_tmp64_ = gtk_builder_get_object (_tmp63_, "dynamic example");
 #line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp67_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp66_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp66_) : NULL);
+	_tmp65_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp64_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp64_) : NULL);
 #line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_example);
 #line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->dir_pattern_example = _tmp67_;
+	self->priv->dir_pattern_example = _tmp65_;
 #line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp68_ = _ ("Year%sMonth%sDay");
+	_tmp66_ = g_strdup_printf (_ ("Year%sMonth%sDay"), G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S);
 #line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp69_ = g_strdup_printf (_tmp68_, G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S);
-#line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp70_ = _tmp69_;
+	_tmp67_ = _tmp66_;
 #line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_add_to_dir_formats (self, _tmp70_, "%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d");
+	preferences_dialog_add_to_dir_formats (self, _tmp67_, "%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d");
 #line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp70_);
-#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp71_ = _ ("Year%sMonth");
+	_g_free0 (_tmp67_);
 #line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp72_ = g_strdup_printf (_tmp71_, G_DIR_SEPARATOR_S);
+	_tmp68_ = g_strdup_printf (_ ("Year%sMonth"), G_DIR_SEPARATOR_S);
 #line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp73_ = _tmp72_;
+	_tmp69_ = _tmp68_;
 #line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_add_to_dir_formats (self, _tmp73_, "%Y" G_DIR_SEPARATOR_S "%m");
+	preferences_dialog_add_to_dir_formats (self, _tmp69_, "%Y" G_DIR_SEPARATOR_S "%m");
 #line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp73_);
+	_g_free0 (_tmp69_);
 #line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp74_ = _ ("Year%sMonth-Day");
+	_tmp70_ = g_strdup_printf (_ ("Year%sMonth-Day"), G_DIR_SEPARATOR_S);
 #line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp75_ = g_strdup_printf (_tmp74_, G_DIR_SEPARATOR_S);
+	_tmp71_ = _tmp70_;
 #line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp76_ = _tmp75_;
-#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_add_to_dir_formats (self, _tmp76_, "%Y" G_DIR_SEPARATOR_S "%m-%d");
+	preferences_dialog_add_to_dir_formats (self, _tmp71_, "%Y" G_DIR_SEPARATOR_S "%m-%d");
 #line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp76_);
+	_g_free0 (_tmp71_);
 #line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp77_ = _ ("Year-Month-Day");
-#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_add_to_dir_formats (self, _tmp77_, "%Y-%m-%d");
-#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp78_ = _ ("Custom");
+	preferences_dialog_add_to_dir_formats (self, _ ("Year-Month-Day"), "%Y-%m-%d");
 #line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_add_to_dir_formats (self, _tmp78_, NULL);
+	preferences_dialog_add_to_dir_formats (self, _ ("Custom"), NULL);
 #line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp79_ = self->priv->dir_pattern_combo;
+	_tmp72_ = self->priv->dir_pattern_combo;
 #line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed, self);
 #line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp80_ = self->priv->dir_pattern_entry;
+	_tmp73_ = self->priv->dir_pattern_entry;
 #line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed, self);
 #line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp81_ = self->priv->builder;
+	_tmp74_ = self->priv->builder;
 #line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp82_ = gtk_builder_get_object (_tmp81_, "dir_structure_label");
+	_tmp75_ = gtk_builder_get_object (_tmp74_, "dir_structure_label");
 #line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp83_ = self->priv->dir_pattern_combo;
+	_tmp76_ = self->priv->dir_pattern_combo;
 #line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_mnemonic_widget (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp82_) : NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_widget_get_type (), GtkWidget));
+	gtk_label_set_mnemonic_widget (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp75_) : NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_widget_get_type (), GtkWidget));
 #line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp84_ = self->priv->builder;
+	_tmp77_ = self->priv->builder;
 #line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp85_ = gtk_builder_get_object (_tmp84_, "lowercase");
+	_tmp78_ = gtk_builder_get_object (_tmp77_, "lowercase");
 #line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp86_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp85_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp85_) : NULL);
+	_tmp79_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp78_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp78_) : NULL);
 #line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->lowercase);
 #line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->lowercase = _tmp86_;
+	self->priv->lowercase = _tmp79_;
 #line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp87_ = self->priv->lowercase;
+	_tmp80_ = self->priv->lowercase;
 #line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled, self);
 #line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp88_ = self->priv->builder;
+	_tmp81_ = self->priv->builder;
 #line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp89_ = gtk_builder_get_object (_tmp88_, "preferences-notebook");
+	_tmp82_ = gtk_builder_get_object (_tmp81_, "preferences-notebook");
 #line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp90_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp89_, gtk_notebook_get_type ()) ? ((GtkNotebook*) _tmp89_) : NULL);
+	_tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, gtk_notebook_get_type ()) ? ((GtkNotebook*) _tmp82_) : NULL);
 #line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	notebook = _tmp90_;
+	notebook = _tmp83_;
 #line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp91_ = gtk_notebook_get_nth_page (notebook, 2);
+	_tmp84_ = gtk_notebook_get_nth_page (notebook, 2);
 #line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp92_ = self->priv->plugins_mediator;
+	_tmp85_ = self->priv->plugins_mediator;
 #line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp93_ = plugins_manifest_widget_mediator_get_widget (_tmp92_);
+	_tmp86_ = plugins_manifest_widget_mediator_get_widget (_tmp85_);
 #line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp94_ = _tmp93_;
+	_tmp87_ = _tmp86_;
 #line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_TYPE (_tmp91_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp91_) : NULL, _tmp94_);
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_TYPE (_tmp84_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp84_) : NULL, _tmp87_);
 #line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_populate_preference_options (self);
 #line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp95_ = self->priv->photo_editor_combo;
+	_tmp88_ = self->priv->photo_editor_combo;
 #line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (_tmp95_, "changed", (GCallback) _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed, self);
+	g_signal_connect (_tmp88_, "changed", (GCallback) _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed, self);
 #line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp96_ = self->priv->raw_editor_combo;
+	_tmp89_ = self->priv->raw_editor_combo;
 #line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (_tmp96_, "changed", (GCallback) _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed, self);
+	g_signal_connect (_tmp89_, "changed", (GCallback) _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed, self);
 #line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp97_ = self->priv->builder;
+	_tmp90_ = self->priv->builder;
 #line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp98_ = gtk_builder_get_object (_tmp97_, "autoimport");
+	_tmp91_ = gtk_builder_get_object (_tmp90_, "autoimport");
 #line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp99_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp98_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp98_) : NULL);
+	_tmp92_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp91_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp91_) : NULL);
 #line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	auto_import_button = _tmp99_;
+	auto_import_button = _tmp92_;
 #line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp100_ = config_facade_get_instance ();
+	_tmp93_ = config_facade_get_instance ();
 #line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp101_ = _tmp100_;
+	_tmp94_ = _tmp93_;
 #line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp102_ = configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp95_ = configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (auto_import_button, gtk_toggle_button_get_type (), GtkToggleButton), _tmp102_);
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (auto_import_button, gtk_toggle_button_get_type (), GtkToggleButton), _tmp95_);
 #line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp101_);
+	_g_object_unref0 (_tmp94_);
 #line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp103_ = self->priv->builder;
+	_tmp96_ = self->priv->builder;
 #line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp104_ = gtk_builder_get_object (_tmp103_, "write_metadata");
+	_tmp97_ = gtk_builder_get_object (_tmp96_, "write_metadata");
 #line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp105_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp104_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp104_) : NULL);
+	_tmp98_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp97_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp97_) : NULL);
 #line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	commit_metadata_button = _tmp105_;
+	commit_metadata_button = _tmp98_;
 #line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp106_ = config_facade_get_instance ();
+	_tmp99_ = config_facade_get_instance ();
 #line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp107_ = _tmp106_;
+	_tmp100_ = _tmp99_;
 #line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp108_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp101_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (commit_metadata_button, gtk_toggle_button_get_type (), GtkToggleButton), _tmp108_);
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (commit_metadata_button, gtk_toggle_button_get_type (), GtkToggleButton), _tmp101_);
 #line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp107_);
+	_g_object_unref0 (_tmp100_);
 #line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp109_ = self->priv->builder;
+	_tmp102_ = self->priv->builder;
 #line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp110_ = gtk_builder_get_object (_tmp109_, "default_raw_developer");
+	_tmp103_ = gtk_builder_get_object (_tmp102_, "default_raw_developer");
 #line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp111_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp110_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp110_) : NULL);
+	_tmp104_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp103_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp103_) : NULL);
 #line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->default_raw_developer_combo);
 #line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->default_raw_developer_combo = _tmp111_;
+	self->priv->default_raw_developer_combo = _tmp104_;
 #line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp112_ = self->priv->default_raw_developer_combo;
+	_tmp105_ = self->priv->default_raw_developer_combo;
 #line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp113_ = raw_developer_get_label (RAW_DEVELOPER_CAMERA);
+	_tmp106_ = raw_developer_get_label (RAW_DEVELOPER_CAMERA);
 #line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp114_ = _tmp113_;
+	_tmp107_ = _tmp106_;
 #line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_combo_box_text_append_text (_tmp112_, _tmp114_);
+	gtk_combo_box_text_append_text (_tmp105_, _tmp107_);
 #line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp114_);
+	_g_free0 (_tmp107_);
 #line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp115_ = self->priv->default_raw_developer_combo;
+	_tmp108_ = self->priv->default_raw_developer_combo;
 #line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp116_ = raw_developer_get_label (RAW_DEVELOPER_SHOTWELL);
+	_tmp109_ = raw_developer_get_label (RAW_DEVELOPER_SHOTWELL);
 #line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp117_ = _tmp116_;
+	_tmp110_ = _tmp109_;
 #line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_combo_box_text_append_text (_tmp115_, _tmp117_);
+	gtk_combo_box_text_append_text (_tmp108_, _tmp110_);
 #line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp117_);
+	_g_free0 (_tmp110_);
 #line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp118_ = config_facade_get_instance ();
+	_tmp111_ = config_facade_get_instance ();
 #line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp119_ = _tmp118_;
+	_tmp112_ = _tmp111_;
 #line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp120_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp113_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_set_raw_developer_combo (self, _tmp120_);
+	preferences_dialog_set_raw_developer_combo (self, _tmp113_);
 #line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp119_);
+	_g_object_unref0 (_tmp112_);
 #line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp121_ = self->priv->default_raw_developer_combo;
+	_tmp114_ = self->priv->default_raw_developer_combo;
 #line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed, self);
 #line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp122_ = self->priv->dialog;
+	_tmp115_ = self->priv->dialog;
 #line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp122_, gtk_widget_get_type (), GtkWidget), "map-event", (GCallback) _preferences_dialog_map_event_gtk_widget_map_event, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, gtk_widget_get_type (), GtkWidget), "map-event", (GCallback) _preferences_dialog_map_event_gtk_widget_map_event, self);
 #line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (commit_metadata_button);
 #line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18385,44 +17962,44 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) {
 	_g_object_unref0 (pattern_help);
 #line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 18372 "Dialogs.c"
+#line 17949 "Dialogs.c"
 }
 
 
 static PreferencesDialog* preferences_dialog_new (void) {
 #line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return preferences_dialog_construct (TYPE_PREFERENCES_DIALOG);
-#line 18379 "Dialogs.c"
+#line 17956 "Dialogs.c"
 }
 
 
 void preferences_dialog_populate_preference_options (PreferencesDialog* self) {
-	GtkComboBox* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	ConfigFacade* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	GtkComboBox* _tmp0_;
+	gint _tmp1_;
+	gchar** _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	ConfigFacade* _tmp4_;
+	ConfigFacade* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
 	SortedList* _tmp8_ = NULL;
-	GtkComboBox* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gchar** _tmp11_ = NULL;
-	gchar** _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	ConfigFacade* _tmp13_ = NULL;
-	ConfigFacade* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
+	GtkComboBox* _tmp9_;
+	gint _tmp10_;
+	gchar** _tmp11_;
+	gchar** _tmp12_;
+	gint _tmp12__length1;
+	ConfigFacade* _tmp13_;
+	ConfigFacade* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
 	SortedList* _tmp17_ = NULL;
-	GtkComboBoxText* _tmp18_ = NULL;
-	GtkEntry* _tmp19_ = NULL;
-	GtkCheckButton* _tmp20_ = NULL;
-	ConfigFacade* _tmp21_ = NULL;
-	ConfigFacade* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
+	GtkComboBoxText* _tmp18_;
+	GtkEntry* _tmp19_;
+	GtkCheckButton* _tmp20_;
+	ConfigFacade* _tmp21_;
+	ConfigFacade* _tmp22_;
+	gboolean _tmp23_;
 #line 2385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
 #line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18499,7 +18076,7 @@ void preferences_dialog_populate_preference_options (PreferencesDialog* self) {
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp23_);
 #line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp22_);
-#line 18486 "Dialogs.c"
+#line 18063 "Dialogs.c"
 }
 
 
@@ -18510,11 +18087,11 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
 #line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (ignore != NULL, FALSE);
-#line 18497 "Dialogs.c"
+#line 18074 "Dialogs.c"
 	{
-		AppWindow* _tmp0_ = NULL;
-		AppWindow* _tmp1_ = NULL;
-		GdkScreen* _tmp2_ = NULL;
+		AppWindow* _tmp0_;
+		AppWindow* _tmp1_;
+		GdkScreen* _tmp2_;
 #line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = app_window_get_instance ();
 #line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18527,16 +18104,16 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel
 		_g_object_unref0 (_tmp1_);
 #line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18514 "Dialogs.c"
-			goto __catch427_g_error;
+#line 18091 "Dialogs.c"
+			goto __catch428_g_error;
 		}
 	}
-	goto __finally427;
-	__catch427_g_error:
+	goto __finally428;
+	__catch428_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
+		GError* _tmp3_;
+		const gchar* _tmp4_;
 #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		e = _inner_error_;
 #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18549,12 +18126,12 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel
 		g_message ("Dialogs.vala:2403: Unable to launch help: %s", _tmp4_);
 #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_error_free0 (e);
-#line 18536 "Dialogs.c"
+#line 18113 "Dialogs.c"
 	}
-	__finally427:
+	__finally428:
 #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18541 "Dialogs.c"
+#line 18118 "Dialogs.c"
 		gboolean _tmp5_ = FALSE;
 #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -18562,46 +18139,46 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel
 		g_clear_error (&_inner_error_);
 #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return _tmp5_;
-#line 18549 "Dialogs.c"
+#line 18126 "Dialogs.c"
 	}
 #line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
 #line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18555 "Dialogs.c"
+#line 18132 "Dialogs.c"
 }
 
 
-static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, GtkComboBox* combo_box, gchar** mime_types, int mime_types_length1, const gchar* current_app_executable, SortedList** external_apps) {
+static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, GtkComboBox* combo_box, gchar** mime_types, int mime_types_length1, const gchar* current_app_executable, SortedList* * external_apps) {
 	SortedList* _vala_external_apps = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	SortedList* _tmp2_ = NULL;
-	SortedList* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	SortedList* _tmp2_;
+	SortedList* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 	GtkCellRendererPixbuf* pixbuf_renderer = NULL;
-	GtkCellRendererPixbuf* _tmp6_ = NULL;
+	GtkCellRendererPixbuf* _tmp6_;
 	GtkCellRendererText* text_renderer = NULL;
-	GtkCellRendererText* _tmp7_ = NULL;
-	GtkComboBox* _tmp8_ = NULL;
-	GtkComboBox* _tmp9_ = NULL;
-	GtkCellRendererPixbuf* _tmp10_ = NULL;
-	GtkComboBox* _tmp11_ = NULL;
-	GtkCellRendererText* _tmp12_ = NULL;
-	GtkComboBox* _tmp13_ = NULL;
-	GtkCellRendererPixbuf* _tmp14_ = NULL;
-	GtkComboBox* _tmp15_ = NULL;
-	GtkCellRendererText* _tmp16_ = NULL;
+	GtkCellRendererText* _tmp7_;
+	GtkComboBox* _tmp8_;
+	GtkComboBox* _tmp9_;
+	GtkCellRendererPixbuf* _tmp10_;
+	GtkComboBox* _tmp11_;
+	GtkCellRendererText* _tmp12_;
+	GtkComboBox* _tmp13_;
+	GtkCellRendererPixbuf* _tmp14_;
+	GtkComboBox* _tmp15_;
+	GtkCellRendererText* _tmp16_;
 	GtkListStore* combo_store = NULL;
-	GtkListStore* _tmp17_ = NULL;
+	GtkListStore* _tmp17_;
 	GtkTreeIter iter = {0};
 	gint current_app = 0;
-	GtkComboBox* _tmp67_ = NULL;
-	GtkListStore* _tmp68_ = NULL;
-	gint _tmp69_ = 0;
+	GtkComboBox* _tmp67_;
+	GtkListStore* _tmp68_;
+	gint _tmp69_;
 	GError * _inner_error_ = NULL;
 #line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
@@ -18637,15 +18214,15 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 		if (external_apps) {
 #line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			*external_apps = _vala_external_apps;
-#line 18624 "Dialogs.c"
+#line 18201 "Dialogs.c"
 		} else {
 #line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_vala_external_apps);
-#line 18628 "Dialogs.c"
+#line 18205 "Dialogs.c"
 		}
 #line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 18632 "Dialogs.c"
+#line 18209 "Dialogs.c"
 	}
 #line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
@@ -18693,11 +18270,11 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 	combo_store = _tmp17_;
 #line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	current_app = -1;
-#line 18680 "Dialogs.c"
+#line 18257 "Dialogs.c"
 	{
 		GeeIterator* _app_it = NULL;
-		SortedList* _tmp18_ = NULL;
-		GeeIterator* _tmp19_ = NULL;
+		SortedList* _tmp18_;
+		GeeIterator* _tmp19_;
 #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = _vala_external_apps;
 #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18706,26 +18283,26 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 		_app_it = _tmp19_;
 #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 18693 "Dialogs.c"
-			GeeIterator* _tmp20_ = NULL;
-			gboolean _tmp21_ = FALSE;
+#line 18270 "Dialogs.c"
+			GeeIterator* _tmp20_;
+			gboolean _tmp21_;
 			GAppInfo* app = NULL;
-			GeeIterator* _tmp22_ = NULL;
-			gpointer _tmp23_ = NULL;
-			GtkListStore* _tmp24_ = NULL;
+			GeeIterator* _tmp22_;
+			gpointer _tmp23_;
+			GtkListStore* _tmp24_;
 			GtkTreeIter _tmp25_ = {0};
 			GIcon* app_icon = NULL;
-			GAppInfo* _tmp26_ = NULL;
-			GIcon* _tmp27_ = NULL;
-			GIcon* _tmp28_ = NULL;
-			GtkListStore* _tmp56_ = NULL;
-			GtkTreeIter _tmp57_ = {0};
-			GAppInfo* _tmp58_ = NULL;
-			const gchar* _tmp59_ = NULL;
+			GAppInfo* _tmp26_;
+			GIcon* _tmp27_;
+			GIcon* _tmp28_;
+			GtkListStore* _tmp56_;
+			GtkTreeIter _tmp57_;
+			GAppInfo* _tmp58_;
+			const gchar* _tmp59_;
 			GValue _tmp60_ = {0};
-			GAppInfo* _tmp61_ = NULL;
-			const gchar* _tmp62_ = NULL;
-			const gchar* _tmp63_ = NULL;
+			GAppInfo* _tmp61_;
+			const gchar* _tmp62_;
+			const gchar* _tmp63_;
 #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = _app_it;
 #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18734,7 +18311,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 			if (!_tmp21_) {
 #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 18721 "Dialogs.c"
+#line 18298 "Dialogs.c"
 			}
 #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = _app_it;
@@ -18756,24 +18333,24 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 			_tmp28_ = _g_object_ref0 (_tmp27_);
 #line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			app_icon = _tmp28_;
-#line 18743 "Dialogs.c"
+#line 18320 "Dialogs.c"
 			{
-				GIcon* _tmp29_ = NULL;
+				GIcon* _tmp29_;
 #line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp29_ = app_icon;
 #line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, g_file_icon_get_type ())) {
-#line 18750 "Dialogs.c"
+#line 18327 "Dialogs.c"
 					GdkPixbuf* _tmp30_ = NULL;
-					GIcon* _tmp31_ = NULL;
-					GFile* _tmp32_ = NULL;
-					gchar* _tmp33_ = NULL;
-					gchar* _tmp34_ = NULL;
-					GdkPixbuf* _tmp35_ = NULL;
-					GdkPixbuf* _tmp36_ = NULL;
-					GtkListStore* _tmp37_ = NULL;
-					GtkTreeIter _tmp38_ = {0};
-					GdkPixbuf* _tmp39_ = NULL;
+					GIcon* _tmp31_;
+					GFile* _tmp32_;
+					gchar* _tmp33_;
+					gchar* _tmp34_;
+					GdkPixbuf* _tmp35_;
+					GdkPixbuf* _tmp36_;
+					GtkListStore* _tmp37_;
+					GtkTreeIter _tmp38_;
+					GdkPixbuf* _tmp39_;
 					GValue _tmp40_ = {0};
 #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp31_ = app_icon;
@@ -18793,8 +18370,8 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 					_tmp30_ = _tmp36_;
 #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18780 "Dialogs.c"
-						goto __catch428_g_error;
+#line 18357 "Dialogs.c"
+						goto __catch429_g_error;
 					}
 #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp37_ = combo_store;
@@ -18812,24 +18389,24 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 					G_IS_VALUE (&_tmp40_) ? (g_value_unset (&_tmp40_), NULL) : NULL;
 #line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_g_object_unref0 (_tmp30_);
-#line 18799 "Dialogs.c"
+#line 18376 "Dialogs.c"
 				} else {
-					GIcon* _tmp41_ = NULL;
+					GIcon* _tmp41_;
 #line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp41_ = app_icon;
 #line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, g_themed_icon_get_type ())) {
-#line 18806 "Dialogs.c"
+#line 18383 "Dialogs.c"
 						GdkPixbuf* icon_pixbuf = NULL;
-						GtkIconTheme* _tmp42_ = NULL;
-						GIcon* _tmp43_ = NULL;
-						gchar** _tmp44_ = NULL;
-						gchar** _tmp45_ = NULL;
-						const gchar* _tmp46_ = NULL;
-						GdkPixbuf* _tmp47_ = NULL;
-						GtkListStore* _tmp48_ = NULL;
-						GtkTreeIter _tmp49_ = {0};
-						GdkPixbuf* _tmp50_ = NULL;
+						GtkIconTheme* _tmp42_;
+						GIcon* _tmp43_;
+						gchar** _tmp44_;
+						gchar** _tmp45_;
+						const gchar* _tmp46_;
+						GdkPixbuf* _tmp47_;
+						GtkListStore* _tmp48_;
+						GtkTreeIter _tmp49_;
+						GdkPixbuf* _tmp50_;
 						GValue _tmp51_ = {0};
 #line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp42_ = gtk_icon_theme_get_default ();
@@ -18845,8 +18422,8 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 						icon_pixbuf = _tmp47_;
 #line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18832 "Dialogs.c"
-							goto __catch428_g_error;
+#line 18409 "Dialogs.c"
+							goto __catch429_g_error;
 						}
 #line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp48_ = combo_store;
@@ -18864,18 +18441,18 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 						G_IS_VALUE (&_tmp51_) ? (g_value_unset (&_tmp51_), NULL) : NULL;
 #line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_g_object_unref0 (icon_pixbuf);
-#line 18851 "Dialogs.c"
+#line 18428 "Dialogs.c"
 					}
 				}
 			}
-			goto __finally428;
-			__catch428_g_error:
+			goto __finally429;
+			__catch429_g_error:
 			{
 				GError* _error_ = NULL;
-				GError* _tmp52_ = NULL;
-				const gchar* _tmp53_ = NULL;
-				gchar* _tmp54_ = NULL;
-				gchar* _tmp55_ = NULL;
+				GError* _tmp52_;
+				const gchar* _tmp53_;
+				gchar* _tmp54_;
+				gchar* _tmp55_;
 #line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_error_ = _inner_error_;
 #line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18894,9 +18471,9 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 				_g_free0 (_tmp55_);
 #line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_error_free0 (_error_);
-#line 18881 "Dialogs.c"
+#line 18458 "Dialogs.c"
 			}
-			__finally428:
+			__finally429:
 #line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18917,7 +18494,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 				g_clear_error (&_inner_error_);
 #line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return;
-#line 18904 "Dialogs.c"
+#line 18481 "Dialogs.c"
 			}
 #line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp56_ = combo_store;
@@ -18943,10 +18520,10 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 			_tmp63_ = current_app_executable;
 #line 2454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (g_strcmp0 (_tmp62_, _tmp63_) == 0) {
-#line 18930 "Dialogs.c"
-				SortedList* _tmp64_ = NULL;
-				GAppInfo* _tmp65_ = NULL;
-				gint _tmp66_ = 0;
+#line 18507 "Dialogs.c"
+				SortedList* _tmp64_;
+				GAppInfo* _tmp65_;
+				gint _tmp66_;
 #line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp64_ = _vala_external_apps;
 #line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18955,17 +18532,17 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 				_tmp66_ = sorted_list_index_of (_tmp64_, _tmp65_);
 #line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_app = _tmp66_;
-#line 18942 "Dialogs.c"
+#line 18519 "Dialogs.c"
 			}
 #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (app_icon);
 #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (app);
-#line 18948 "Dialogs.c"
+#line 18525 "Dialogs.c"
 		}
 #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_app_it);
-#line 18952 "Dialogs.c"
+#line 18529 "Dialogs.c"
 	}
 #line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = combo_box;
@@ -18977,16 +18554,16 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 	_tmp69_ = current_app;
 #line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp69_ != -1) {
-#line 18964 "Dialogs.c"
-		GtkComboBox* _tmp70_ = NULL;
-		gint _tmp71_ = 0;
+#line 18541 "Dialogs.c"
+		GtkComboBox* _tmp70_;
+		gint _tmp71_;
 #line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp70_ = combo_box;
 #line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp71_ = current_app;
 #line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (_tmp70_, _tmp71_);
-#line 18973 "Dialogs.c"
+#line 18550 "Dialogs.c"
 	}
 #line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (combo_store);
@@ -18998,24 +18575,24 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 	if (external_apps) {
 #line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*external_apps = _vala_external_apps;
-#line 18985 "Dialogs.c"
+#line 18562 "Dialogs.c"
 	} else {
 #line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_vala_external_apps);
-#line 18989 "Dialogs.c"
+#line 18566 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkComboBox* combo_box, GtkEntry* entry) {
 	gchar* pattern = NULL;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	gboolean found = FALSE;
-	const gchar* _tmp4_ = NULL;
-	gboolean _tmp32_ = FALSE;
+	const gchar* _tmp4_;
+	gboolean _tmp32_;
 #line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
 #line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19040,19 +18617,19 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 	_tmp4_ = pattern;
 #line 2469 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (NULL != _tmp4_) {
-#line 19027 "Dialogs.c"
+#line 18604 "Dialogs.c"
 		gint i = 0;
 #line 2471 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		i = 0;
-#line 19031 "Dialogs.c"
+#line 18608 "Dialogs.c"
 		{
 			GeeArrayList* _pf_list = NULL;
-			GeeArrayList* _tmp5_ = NULL;
-			GeeArrayList* _tmp6_ = NULL;
+			GeeArrayList* _tmp5_;
+			GeeArrayList* _tmp6_;
 			gint _pf_size = 0;
-			GeeArrayList* _tmp7_ = NULL;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
+			GeeArrayList* _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
 			gint _pf_index = 0;
 #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp5_ = self->priv->path_formats;
@@ -19072,18 +18649,18 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 			_pf_index = -1;
 #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 19059 "Dialogs.c"
-				gint _tmp10_ = 0;
-				gint _tmp11_ = 0;
-				gint _tmp12_ = 0;
+#line 18636 "Dialogs.c"
+				gint _tmp10_;
+				gint _tmp11_;
+				gint _tmp12_;
 				PreferencesDialogPathFormat* pf = NULL;
-				GeeArrayList* _tmp13_ = NULL;
-				gint _tmp14_ = 0;
-				gpointer _tmp15_ = NULL;
-				PreferencesDialogPathFormat* _tmp16_ = NULL;
-				const gchar* _tmp17_ = NULL;
-				const gchar* _tmp18_ = NULL;
-				gint _tmp21_ = 0;
+				GeeArrayList* _tmp13_;
+				gint _tmp14_;
+				gpointer _tmp15_;
+				PreferencesDialogPathFormat* _tmp16_;
+				const gchar* _tmp17_;
+				const gchar* _tmp18_;
+				gint _tmp21_;
 #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = _pf_index;
 #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19096,7 +18673,7 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 				if (!(_tmp11_ < _tmp12_)) {
 #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 19083 "Dialogs.c"
+#line 18660 "Dialogs.c"
 				}
 #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = _pf_list;
@@ -19114,9 +18691,9 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 				_tmp18_ = pattern;
 #line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
-#line 19101 "Dialogs.c"
-					GtkComboBox* _tmp19_ = NULL;
-					gint _tmp20_ = 0;
+#line 18678 "Dialogs.c"
+					GtkComboBox* _tmp19_;
+					gint _tmp20_;
 #line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp19_ = combo_box;
 #line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19129,7 +18706,7 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 					_preferences_dialog_path_format_unref0 (pf);
 #line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 19116 "Dialogs.c"
+#line 18693 "Dialogs.c"
 				}
 #line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp21_ = i;
@@ -19137,20 +18714,20 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 				i = _tmp21_ + 1;
 #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_preferences_dialog_path_format_unref0 (pf);
-#line 19124 "Dialogs.c"
+#line 18701 "Dialogs.c"
 			}
 #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_pf_list);
-#line 19128 "Dialogs.c"
+#line 18705 "Dialogs.c"
 		}
 	} else {
 		gchar* s = NULL;
-		ConfigFacade* _tmp22_ = NULL;
-		ConfigFacade* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		gboolean _tmp27_ = FALSE;
+		ConfigFacade* _tmp22_;
+		ConfigFacade* _tmp23_;
+		gchar* _tmp24_;
+		gchar* _tmp25_;
+		const gchar* _tmp26_;
+		gboolean _tmp27_;
 #line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = config_facade_get_instance ();
 #line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19169,11 +18746,11 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 		_tmp27_ = is_string_empty (_tmp26_);
 #line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (!_tmp27_) {
-#line 19156 "Dialogs.c"
-			GtkComboBox* _tmp28_ = NULL;
-			GeeArrayList* _tmp29_ = NULL;
-			gint _tmp30_ = 0;
-			gint _tmp31_ = 0;
+#line 18733 "Dialogs.c"
+			GtkComboBox* _tmp28_;
+			GeeArrayList* _tmp29_;
+			gint _tmp30_;
+			gint _tmp31_;
 #line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp28_ = combo_box;
 #line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19186,58 +18763,58 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 			gtk_combo_box_set_active (_tmp28_, _tmp31_ - 1);
 #line 2485 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			found = TRUE;
-#line 19173 "Dialogs.c"
+#line 18750 "Dialogs.c"
 		}
 #line 2469 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (s);
-#line 19177 "Dialogs.c"
+#line 18754 "Dialogs.c"
 	}
 #line 2489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = found;
 #line 2489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp32_) {
-#line 19183 "Dialogs.c"
-		GtkComboBox* _tmp33_ = NULL;
+#line 18760 "Dialogs.c"
+		GtkComboBox* _tmp33_;
 #line 2490 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = combo_box;
 #line 2490 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (_tmp33_, 0);
-#line 19189 "Dialogs.c"
+#line 18766 "Dialogs.c"
 	}
 #line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_dir_pattern_combo_changed (self);
 #line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (pattern);
-#line 19195 "Dialogs.c"
+#line 18772 "Dialogs.c"
 }
 
 
 void preferences_dialog_show (void) {
-	PreferencesDialog* _tmp0_ = NULL;
-	PreferencesDialog* _tmp2_ = NULL;
-	PreferencesDialog* _tmp3_ = NULL;
-	GtkDialog* _tmp4_ = NULL;
-	PreferencesDialog* _tmp5_ = NULL;
-	GtkFileChooserButton* _tmp6_ = NULL;
-	GFile* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	PreferencesDialog* _tmp11_ = NULL;
-	GtkDialog* _tmp12_ = NULL;
+	PreferencesDialog* _tmp0_;
+	PreferencesDialog* _tmp2_;
+	PreferencesDialog* _tmp3_;
+	GtkDialog* _tmp4_;
+	PreferencesDialog* _tmp5_;
+	GtkFileChooserButton* _tmp6_;
+	GFile* _tmp7_;
+	GFile* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	PreferencesDialog* _tmp11_;
+	GtkDialog* _tmp12_;
 #line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = preferences_dialog_preferences_dialog;
 #line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 19216 "Dialogs.c"
-		PreferencesDialog* _tmp1_ = NULL;
+#line 18793 "Dialogs.c"
+		PreferencesDialog* _tmp1_;
 #line 2498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = preferences_dialog_new ();
 #line 2498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_preferences_dialog_unref0 (preferences_dialog_preferences_dialog);
 #line 2498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_preferences_dialog = _tmp1_;
-#line 19224 "Dialogs.c"
+#line 18801 "Dialogs.c"
 	}
 #line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = preferences_dialog_preferences_dialog;
@@ -19273,31 +18850,31 @@ void preferences_dialog_show (void) {
 	_tmp12_ = _tmp11_->priv->dialog;
 #line 2506 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow));
-#line 19260 "Dialogs.c"
+#line 18837 "Dialogs.c"
 }
 
 
 static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
 	GtkCheckButton* autoimport = NULL;
-	GtkBuilder* _tmp2_ = NULL;
-	GObject* _tmp3_ = NULL;
-	GtkCheckButton* _tmp4_ = NULL;
-	GtkCheckButton* _tmp5_ = NULL;
+	GtkBuilder* _tmp2_;
+	GObject* _tmp3_;
+	GtkCheckButton* _tmp4_;
+	GtkCheckButton* _tmp5_;
 	GtkCheckButton* commit_metadata = NULL;
-	GtkBuilder* _tmp11_ = NULL;
-	GObject* _tmp12_ = NULL;
-	GtkCheckButton* _tmp13_ = NULL;
-	GtkCheckButton* _tmp14_ = NULL;
-	const gchar* _tmp20_ = NULL;
+	GtkBuilder* _tmp11_;
+	GObject* _tmp12_;
+	GtkCheckButton* _tmp13_;
+	GtkCheckButton* _tmp14_;
+	const gchar* _tmp20_;
 	PreferencesDialogPathFormat* pf = NULL;
-	GeeArrayList* _tmp22_ = NULL;
-	GtkComboBoxText* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	gpointer _tmp25_ = NULL;
-	PreferencesDialogPathFormat* _tmp26_ = NULL;
-	const gchar* _tmp27_ = NULL;
+	GeeArrayList* _tmp22_;
+	GtkComboBoxText* _tmp23_;
+	gint _tmp24_;
+	gpointer _tmp25_;
+	PreferencesDialogPathFormat* _tmp26_;
+	const gchar* _tmp27_;
 #line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
 #line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19320,12 +18897,12 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
 	_tmp5_ = autoimport;
 #line 2515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ != NULL) {
-#line 19307 "Dialogs.c"
-		ConfigFacade* _tmp6_ = NULL;
-		ConfigFacade* _tmp7_ = NULL;
-		GtkCheckButton* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
-		gboolean _tmp10_ = FALSE;
+#line 18884 "Dialogs.c"
+		ConfigFacade* _tmp6_;
+		ConfigFacade* _tmp7_;
+		GtkCheckButton* _tmp8_;
+		gboolean _tmp9_;
+		gboolean _tmp10_;
 #line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = config_facade_get_instance ();
 #line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19340,7 +18917,7 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
 		configuration_facade_set_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp10_);
 #line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp7_);
-#line 19327 "Dialogs.c"
+#line 18904 "Dialogs.c"
 	}
 #line 2518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->builder;
@@ -19354,12 +18931,12 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
 	_tmp14_ = commit_metadata;
 #line 2519 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_ != NULL) {
-#line 19341 "Dialogs.c"
-		ConfigFacade* _tmp15_ = NULL;
-		ConfigFacade* _tmp16_ = NULL;
-		GtkCheckButton* _tmp17_ = NULL;
-		gboolean _tmp18_ = FALSE;
-		gboolean _tmp19_ = FALSE;
+#line 18918 "Dialogs.c"
+		ConfigFacade* _tmp15_;
+		ConfigFacade* _tmp16_;
+		GtkCheckButton* _tmp17_;
+		gboolean _tmp18_;
+		gboolean _tmp19_;
 #line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = config_facade_get_instance ();
 #line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19374,19 +18951,19 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
 		configuration_facade_set_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp19_);
 #line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp16_);
-#line 19361 "Dialogs.c"
+#line 18938 "Dialogs.c"
 	}
 #line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->lib_dir;
 #line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp20_ != NULL) {
-#line 19367 "Dialogs.c"
-		const gchar* _tmp21_ = NULL;
+#line 18944 "Dialogs.c"
+		const gchar* _tmp21_;
 #line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = self->priv->lib_dir;
 #line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		app_dirs_set_import_dir (_tmp21_);
-#line 19373 "Dialogs.c"
+#line 18950 "Dialogs.c"
 	}
 #line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = self->priv->path_formats;
@@ -19404,14 +18981,14 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
 	_tmp27_ = _tmp26_->pattern;
 #line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (NULL == _tmp27_) {
-#line 19391 "Dialogs.c"
-		ConfigFacade* _tmp28_ = NULL;
-		ConfigFacade* _tmp29_ = NULL;
-		GtkEntry* _tmp30_ = NULL;
-		const gchar* _tmp31_ = NULL;
-		const gchar* _tmp32_ = NULL;
-		ConfigFacade* _tmp33_ = NULL;
-		ConfigFacade* _tmp34_ = NULL;
+#line 18968 "Dialogs.c"
+		ConfigFacade* _tmp28_;
+		ConfigFacade* _tmp29_;
+		GtkEntry* _tmp30_;
+		const gchar* _tmp31_;
+		const gchar* _tmp32_;
+		ConfigFacade* _tmp33_;
+		ConfigFacade* _tmp34_;
 #line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = config_facade_get_instance ();
 #line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19434,12 +19011,12 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
 		configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), NULL);
 #line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp34_);
-#line 19421 "Dialogs.c"
+#line 18998 "Dialogs.c"
 	} else {
-		ConfigFacade* _tmp35_ = NULL;
-		ConfigFacade* _tmp36_ = NULL;
-		PreferencesDialogPathFormat* _tmp37_ = NULL;
-		const gchar* _tmp38_ = NULL;
+		ConfigFacade* _tmp35_;
+		ConfigFacade* _tmp36_;
+		PreferencesDialogPathFormat* _tmp37_;
+		const gchar* _tmp38_;
 #line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp35_ = config_facade_get_instance ();
 #line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19452,7 +19029,7 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
 		configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp38_);
 #line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp36_);
-#line 19439 "Dialogs.c"
+#line 19016 "Dialogs.c"
 	}
 #line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_preferences_dialog_path_format_unref0 (pf);
@@ -19460,15 +19037,15 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
 	_g_object_unref0 (commit_metadata);
 #line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (autoimport);
-#line 19447 "Dialogs.c"
+#line 19024 "Dialogs.c"
 }
 
 
 static gboolean preferences_dialog_on_delete (PreferencesDialog* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	GtkDialog* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp0_;
+	GtkDialog* _tmp1_;
+	gboolean _tmp2_;
 #line 2534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
 #line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19479,7 +19056,7 @@ static gboolean preferences_dialog_on_delete (PreferencesDialog* self) {
 		result = TRUE;
 #line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 19466 "Dialogs.c"
+#line 19043 "Dialogs.c"
 	}
 #line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_commit_on_close (self);
@@ -19491,13 +19068,13 @@ static gboolean preferences_dialog_on_delete (PreferencesDialog* self) {
 	result = _tmp2_;
 #line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 19478 "Dialogs.c"
+#line 19055 "Dialogs.c"
 }
 
 
 static void preferences_dialog_on_close (PreferencesDialog* self) {
-	gboolean _tmp0_ = FALSE;
-	GtkDialog* _tmp1_ = NULL;
+	gboolean _tmp0_;
+	GtkDialog* _tmp1_;
 #line 2542 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
 #line 2543 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19506,7 +19083,7 @@ static void preferences_dialog_on_close (PreferencesDialog* self) {
 	if (!_tmp0_) {
 #line 2544 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 19493 "Dialogs.c"
+#line 19070 "Dialogs.c"
 	}
 #line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dialog;
@@ -19514,15 +19091,15 @@ static void preferences_dialog_on_close (PreferencesDialog* self) {
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
 #line 2547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_commit_on_close (self);
-#line 19501 "Dialogs.c"
+#line 19078 "Dialogs.c"
 }
 
 
 static void preferences_dialog_on_value_changed (PreferencesDialog* self) {
-	GtkAdjustment* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	GtkAdjustment* _tmp2_ = NULL;
-	gdouble _tmp3_ = 0.0;
+	GtkAdjustment* _tmp0_;
+	gdouble _tmp1_;
+	GtkAdjustment* _tmp2_;
+	gdouble _tmp3_;
 #line 2550 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
 #line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19535,7 +19112,7 @@ static void preferences_dialog_on_value_changed (PreferencesDialog* self) {
 	_tmp3_ = gtk_adjustment_get_value (_tmp2_);
 #line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_set_background_color (self, ((gdouble) (_tmp1_ - _tmp3_)) / 65535.0);
-#line 19522 "Dialogs.c"
+#line 19099 "Dialogs.c"
 }
 
 
@@ -19543,8 +19120,8 @@ static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, G
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GdkEventButton* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	GdkEventButton* _tmp2_;
+	guint _tmp3_;
 #line 2555 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
 #line 2555 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19555,27 +19132,27 @@ static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, G
 	_tmp3_ = _tmp2_->button;
 #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == ((guint) 1)) {
-#line 19542 "Dialogs.c"
-		GdkEventButton* _tmp4_ = NULL;
-		GdkEventType _tmp5_ = 0;
+#line 19119 "Dialogs.c"
+		GdkEventButton* _tmp4_;
+		GdkEventType _tmp5_;
 #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = event;
 #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _tmp4_->type;
 #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp5_ == GDK_BUTTON_PRESS;
-#line 19551 "Dialogs.c"
+#line 19128 "Dialogs.c"
 	} else {
 #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = FALSE;
-#line 19555 "Dialogs.c"
+#line 19132 "Dialogs.c"
 	}
 #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 19559 "Dialogs.c"
-		GdkEventButton* _tmp6_ = NULL;
-		GdkModifierType _tmp7_ = 0;
-		gboolean _tmp8_ = FALSE;
+#line 19136 "Dialogs.c"
+		GdkEventButton* _tmp6_;
+		GdkModifierType _tmp7_;
+		gboolean _tmp8_;
 #line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = event;
 #line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19584,20 +19161,20 @@ static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, G
 		_tmp8_ = has_only_key_modifier (_tmp7_, GDK_CONTROL_MASK);
 #line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp8_;
-#line 19571 "Dialogs.c"
+#line 19148 "Dialogs.c"
 	} else {
 #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 19575 "Dialogs.c"
+#line 19152 "Dialogs.c"
 	}
 #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 19579 "Dialogs.c"
-		GtkScale* _tmp9_ = NULL;
-		GtkAdjustment* _tmp10_ = NULL;
-		gdouble _tmp11_ = 0.0;
+#line 19156 "Dialogs.c"
+		GtkScale* _tmp9_;
+		GtkAdjustment* _tmp10_;
+		gdouble _tmp11_;
 		GdkRGBA _tmp12_ = {0};
-		gdouble _tmp13_ = 0.0;
+		gdouble _tmp13_;
 #line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->bg_color_slider;
 #line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19616,24 +19193,24 @@ static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, G
 		result = TRUE;
 #line 2563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 19603 "Dialogs.c"
+#line 19180 "Dialogs.c"
 	}
 #line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
 #line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 19609 "Dialogs.c"
+#line 19186 "Dialogs.c"
 }
 
 
 static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog* self) {
 	PreferencesDialogPathFormat* pf = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	GtkComboBoxText* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gpointer _tmp3_ = NULL;
-	PreferencesDialogPathFormat* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	GeeArrayList* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	gint _tmp2_;
+	gpointer _tmp3_;
+	PreferencesDialogPathFormat* _tmp4_;
+	const gchar* _tmp5_;
 #line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
 #line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19652,18 +19229,18 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog*
 	_tmp5_ = _tmp4_->pattern;
 #line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (NULL == _tmp5_) {
-#line 19639 "Dialogs.c"
+#line 19216 "Dialogs.c"
 		gchar* dir_pattern = NULL;
-		ConfigFacade* _tmp6_ = NULL;
-		ConfigFacade* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
-		GtkEntry* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		GtkEntry* _tmp15_ = NULL;
-		GtkEntry* _tmp16_ = NULL;
+		ConfigFacade* _tmp6_;
+		ConfigFacade* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		const gchar* _tmp10_;
+		gboolean _tmp11_;
+		GtkEntry* _tmp13_;
+		const gchar* _tmp14_;
+		GtkEntry* _tmp15_;
+		GtkEntry* _tmp16_;
 #line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = config_facade_get_instance ();
 #line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19682,15 +19259,15 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog*
 		_tmp11_ = is_string_empty (_tmp10_);
 #line 2574 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp11_) {
-#line 19669 "Dialogs.c"
-			gchar* _tmp12_ = NULL;
+#line 19246 "Dialogs.c"
+			gchar* _tmp12_;
 #line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = g_strdup ("");
 #line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (dir_pattern);
 #line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			dir_pattern = _tmp12_;
-#line 19677 "Dialogs.c"
+#line 19254 "Dialogs.c"
 		}
 #line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->dir_pattern_entry;
@@ -19708,13 +19285,13 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog*
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (dir_pattern);
-#line 19695 "Dialogs.c"
+#line 19272 "Dialogs.c"
 	} else {
-		GtkEntry* _tmp17_ = NULL;
-		PreferencesDialogPathFormat* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		GtkEntry* _tmp20_ = NULL;
-		GtkEntry* _tmp21_ = NULL;
+		GtkEntry* _tmp17_;
+		PreferencesDialogPathFormat* _tmp18_;
+		const gchar* _tmp19_;
+		GtkEntry* _tmp20_;
+		GtkEntry* _tmp21_;
 #line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = self->priv->dir_pattern_entry;
 #line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19731,24 +19308,24 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog*
 		_tmp21_ = self->priv->dir_pattern_entry;
 #line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 19718 "Dialogs.c"
+#line 19295 "Dialogs.c"
 	}
 #line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_preferences_dialog_path_format_unref0 (pf);
-#line 19722 "Dialogs.c"
+#line 19299 "Dialogs.c"
 }
 
 
 static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog* self) {
 	gchar* example = NULL;
-	GDateTime* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	GDateTime* _tmp0_;
+	GtkEntry* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
 	gboolean _tmp5_ = FALSE;
-	const gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
+	const gchar* _tmp6_;
+	gboolean _tmp7_;
 #line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
 #line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19769,11 +19346,11 @@ static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog*
 	_tmp7_ = is_string_empty (_tmp6_);
 #line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp7_) {
-#line 19756 "Dialogs.c"
-		GtkEntry* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
+#line 19333 "Dialogs.c"
+		GtkEntry* _tmp8_;
+		const gchar* _tmp9_;
+		const gchar* _tmp10_;
+		gboolean _tmp11_;
 #line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->dir_pattern_entry;
 #line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19784,64 +19361,61 @@ static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog*
 		_tmp11_ = is_string_empty (_tmp10_);
 #line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = !_tmp11_;
-#line 19771 "Dialogs.c"
+#line 19348 "Dialogs.c"
 	} else {
 #line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = FALSE;
-#line 19775 "Dialogs.c"
+#line 19352 "Dialogs.c"
 	}
 #line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 19779 "Dialogs.c"
-		GtkLabel* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		GtkEntry* _tmp14_ = NULL;
-		GtkEntry* _tmp15_ = NULL;
+#line 19356 "Dialogs.c"
+		GtkLabel* _tmp12_;
+		GtkEntry* _tmp13_;
+		GtkEntry* _tmp14_;
 #line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = self->priv->dir_pattern_example;
 #line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp13_ = _ ("Invalid pattern");
-#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_label_set_text (_tmp12_, _tmp13_);
+		gtk_label_set_text (_tmp12_, _ ("Invalid pattern"));
 #line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp14_ = self->priv->dir_pattern_entry;
+		_tmp13_ = self->priv->dir_pattern_entry;
 #line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_entry_set_icon_from_icon_name (_tmp14_, GTK_ENTRY_ICON_SECONDARY, "dialog-error");
+		gtk_entry_set_icon_from_icon_name (_tmp13_, GTK_ENTRY_ICON_SECONDARY, "dialog-error");
 #line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp15_ = self->priv->dir_pattern_entry;
+		_tmp14_ = self->priv->dir_pattern_entry;
 #line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_entry_set_icon_activatable (_tmp15_, GTK_ENTRY_ICON_SECONDARY, FALSE);
+		gtk_entry_set_icon_activatable (_tmp14_, GTK_ENTRY_ICON_SECONDARY, FALSE);
 #line 2593 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_set_allow_closing (self, FALSE);
-#line 19800 "Dialogs.c"
+#line 19374 "Dialogs.c"
 	} else {
-		GtkLabel* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
-		GtkEntry* _tmp18_ = NULL;
+		GtkLabel* _tmp15_;
+		const gchar* _tmp16_;
+		GtkEntry* _tmp17_;
 #line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp16_ = self->priv->dir_pattern_example;
+		_tmp15_ = self->priv->dir_pattern_example;
 #line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp17_ = example;
+		_tmp16_ = example;
 #line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_label_set_text (_tmp16_, _tmp17_);
+		gtk_label_set_text (_tmp15_, _tmp16_);
 #line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp18_ = self->priv->dir_pattern_entry;
+		_tmp17_ = self->priv->dir_pattern_entry;
 #line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_entry_set_icon_from_icon_name (_tmp18_, GTK_ENTRY_ICON_SECONDARY, NULL);
+		gtk_entry_set_icon_from_icon_name (_tmp17_, GTK_ENTRY_ICON_SECONDARY, NULL);
 #line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_set_allow_closing (self, TRUE);
-#line 19817 "Dialogs.c"
+#line 19391 "Dialogs.c"
 	}
 #line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (example);
-#line 19821 "Dialogs.c"
+#line 19395 "Dialogs.c"
 }
 
 
 static void preferences_dialog_set_allow_closing (PreferencesDialog* self, gboolean allow) {
-	GtkDialog* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	GtkDialog* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 #line 2602 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
 #line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19854,13 +19428,13 @@ static void preferences_dialog_set_allow_closing (PreferencesDialog* self, gbool
 	_tmp2_ = allow;
 #line 2604 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->allow_closing = _tmp2_;
-#line 19841 "Dialogs.c"
+#line 19415 "Dialogs.c"
 }
 
 
 static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
 #line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19869,14 +19443,14 @@ static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self) {
 	result = _tmp0_;
 #line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 19856 "Dialogs.c"
+#line 19430 "Dialogs.c"
 }
 
 
 static void preferences_dialog_set_background_color (PreferencesDialog* self, gdouble bg_color_value) {
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gdouble _tmp2_;
 	GdkRGBA _tmp3_ = {0};
 #line 2611 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
@@ -19892,15 +19466,15 @@ static void preferences_dialog_set_background_color (PreferencesDialog* self, gd
 	config_facade_set_bg_color (_tmp1_, &_tmp3_);
 #line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 19879 "Dialogs.c"
+#line 19453 "Dialogs.c"
 }
 
 
 static void preferences_dialog_to_grayscale (PreferencesDialog* self, gdouble color_value, GdkRGBA* result) {
 	GdkRGBA color = {0};
-	gdouble _tmp0_ = 0.0;
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
+	gdouble _tmp0_;
+	gdouble _tmp1_;
+	gdouble _tmp2_;
 #line 2615 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
 #line 2616 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19923,27 +19497,27 @@ static void preferences_dialog_to_grayscale (PreferencesDialog* self, gdouble co
 	*result = color;
 #line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return;
-#line 19910 "Dialogs.c"
+#line 19484 "Dialogs.c"
 }
 
 
 static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self) {
 	gint _tmp0_ = 0;
-	GtkComboBox* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	SortedList* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	GtkComboBox* _tmp1_;
+	gint _tmp2_;
+	SortedList* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 	gint photo_app_choice_index = 0;
 	GAppInfo* app = NULL;
-	SortedList* _tmp11_ = NULL;
-	gpointer _tmp12_ = NULL;
-	ConfigFacade* _tmp13_ = NULL;
-	ConfigFacade* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
+	SortedList* _tmp11_;
+	gpointer _tmp12_;
+	ConfigFacade* _tmp13_;
+	ConfigFacade* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
 #line 2626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
 #line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19958,20 +19532,20 @@ static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self)
 	_tmp5_ = _tmp4_;
 #line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ < _tmp5_) {
-#line 19945 "Dialogs.c"
-		GtkComboBox* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
+#line 19519 "Dialogs.c"
+		GtkComboBox* _tmp6_;
+		gint _tmp7_;
 #line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->photo_editor_combo;
 #line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = gtk_combo_box_get_active (_tmp6_);
 #line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp7_;
-#line 19954 "Dialogs.c"
+#line 19528 "Dialogs.c"
 	} else {
-		SortedList* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
+		SortedList* _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
 #line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->external_photo_apps;
 #line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19980,7 +19554,7 @@ static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self)
 		_tmp10_ = _tmp9_;
 #line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp10_;
-#line 19967 "Dialogs.c"
+#line 19541 "Dialogs.c"
 	}
 #line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	photo_app_choice_index = _tmp0_;
@@ -20014,25 +19588,25 @@ static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self)
 	_g_free0 (_tmp18_);
 #line 2626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (app);
-#line 20001 "Dialogs.c"
+#line 19575 "Dialogs.c"
 }
 
 
 static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) {
 	gint _tmp0_ = 0;
-	GtkComboBox* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	SortedList* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	GtkComboBox* _tmp1_;
+	gint _tmp2_;
+	SortedList* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 	gint raw_app_choice_index = 0;
 	GAppInfo* app = NULL;
-	SortedList* _tmp11_ = NULL;
-	gpointer _tmp12_ = NULL;
-	ConfigFacade* _tmp13_ = NULL;
-	ConfigFacade* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
+	SortedList* _tmp11_;
+	gpointer _tmp12_;
+	ConfigFacade* _tmp13_;
+	ConfigFacade* _tmp14_;
+	const gchar* _tmp15_;
+	const gchar* _tmp16_;
 #line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
 #line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20047,20 +19621,20 @@ static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) {
 	_tmp5_ = _tmp4_;
 #line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ < _tmp5_) {
-#line 20034 "Dialogs.c"
-		GtkComboBox* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
+#line 19608 "Dialogs.c"
+		GtkComboBox* _tmp6_;
+		gint _tmp7_;
 #line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->raw_editor_combo;
 #line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = gtk_combo_box_get_active (_tmp6_);
 #line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp7_;
-#line 20043 "Dialogs.c"
+#line 19617 "Dialogs.c"
 	} else {
-		SortedList* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
+		SortedList* _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
 #line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->external_raw_apps;
 #line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20069,7 +19643,7 @@ static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) {
 		_tmp10_ = _tmp9_;
 #line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp10_;
-#line 20056 "Dialogs.c"
+#line 19630 "Dialogs.c"
 	}
 #line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	raw_app_choice_index = _tmp0_;
@@ -20095,14 +19669,14 @@ static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) {
 	g_debug ("Dialogs.vala:2645: setting external raw editor to: %s", _tmp16_);
 #line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (app);
-#line 20082 "Dialogs.c"
+#line 19656 "Dialogs.c"
 }
 
 
 static RawDeveloper preferences_dialog_raw_developer_from_combo (PreferencesDialog* self) {
 	RawDeveloper result = 0;
-	GtkComboBoxText* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	GtkComboBoxText* _tmp0_;
+	gint _tmp1_;
 #line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), 0);
 #line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20115,46 +19689,46 @@ static RawDeveloper preferences_dialog_raw_developer_from_combo (PreferencesDial
 		result = RAW_DEVELOPER_CAMERA;
 #line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 20102 "Dialogs.c"
+#line 19676 "Dialogs.c"
 	}
 #line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = RAW_DEVELOPER_SHOTWELL;
 #line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20108 "Dialogs.c"
+#line 19682 "Dialogs.c"
 }
 
 
 static void preferences_dialog_set_raw_developer_combo (PreferencesDialog* self, RawDeveloper d) {
-	RawDeveloper _tmp0_ = 0;
+	RawDeveloper _tmp0_;
 #line 2654 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
 #line 2655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = d;
 #line 2655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == RAW_DEVELOPER_CAMERA) {
-#line 20120 "Dialogs.c"
-		GtkComboBoxText* _tmp1_ = NULL;
+#line 19694 "Dialogs.c"
+		GtkComboBoxText* _tmp1_;
 #line 2656 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->default_raw_developer_combo;
 #line 2656 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 20126 "Dialogs.c"
+#line 19700 "Dialogs.c"
 	} else {
-		GtkComboBoxText* _tmp2_ = NULL;
+		GtkComboBoxText* _tmp2_;
 #line 2658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = self->priv->default_raw_developer_combo;
 #line 2658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), 1);
-#line 20133 "Dialogs.c"
+#line 19707 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_on_default_raw_developer_changed (PreferencesDialog* self) {
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	RawDeveloper _tmp2_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	RawDeveloper _tmp2_;
 #line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
 #line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20167,13 +19741,13 @@ static void preferences_dialog_on_default_raw_developer_changed (PreferencesDial
 	configuration_facade_set_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_);
 #line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 20154 "Dialogs.c"
+#line 19728 "Dialogs.c"
 }
 
 
 static void preferences_dialog_on_current_folder_changed (PreferencesDialog* self) {
-	GtkFileChooserButton* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	GtkFileChooserButton* _tmp0_;
+	gchar* _tmp1_;
 #line 2665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
 #line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20184,20 +19758,20 @@ static void preferences_dialog_on_current_folder_changed (PreferencesDialog* sel
 	_g_free0 (self->priv->lib_dir);
 #line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->lib_dir = _tmp1_;
-#line 20171 "Dialogs.c"
+#line 19745 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender, gpointer self) {
 #line 2674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_current_folder_changed ((PreferencesDialog*) self);
-#line 20178 "Dialogs.c"
+#line 19752 "Dialogs.c"
 }
 
 
 static gboolean preferences_dialog_map_event (PreferencesDialog* self) {
 	gboolean result = FALSE;
-	GtkFileChooserButton* _tmp0_ = NULL;
+	GtkFileChooserButton* _tmp0_;
 #line 2669 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
 #line 2674 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20208,18 +19782,18 @@ static gboolean preferences_dialog_map_event (PreferencesDialog* self) {
 	result = TRUE;
 #line 2675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20195 "Dialogs.c"
+#line 19769 "Dialogs.c"
 }
 
 
 static void preferences_dialog_add_to_dir_formats (PreferencesDialog* self, const gchar* name, const gchar* pattern) {
 	PreferencesDialogPathFormat* pf = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PreferencesDialogPathFormat* _tmp2_ = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	GtkComboBoxText* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	PreferencesDialogPathFormat* _tmp2_;
+	GeeArrayList* _tmp3_;
+	GtkComboBoxText* _tmp4_;
+	const gchar* _tmp5_;
 #line 2678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
 #line 2678 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20244,15 +19818,15 @@ static void preferences_dialog_add_to_dir_formats (PreferencesDialog* self, cons
 	gtk_combo_box_text_append_text (_tmp4_, _tmp5_);
 #line 2678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_preferences_dialog_path_format_unref0 (pf);
-#line 20231 "Dialogs.c"
+#line 19805 "Dialogs.c"
 }
 
 
 static void preferences_dialog_on_lowercase_toggled (PreferencesDialog* self) {
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	GtkCheckButton* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	GtkCheckButton* _tmp2_;
+	gboolean _tmp3_;
 #line 2684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
 #line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20267,16 +19841,16 @@ static void preferences_dialog_on_lowercase_toggled (PreferencesDialog* self) {
 	configuration_facade_set_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_);
 #line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 20254 "Dialogs.c"
+#line 19828 "Dialogs.c"
 }
 
 
 static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GType object_type, const gchar* name, const gchar* pattern) {
 	PreferencesDialogPathFormat* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20299,21 +19873,21 @@ static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GT
 	self->pattern = _tmp3_;
 #line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 20286 "Dialogs.c"
+#line 19860 "Dialogs.c"
 }
 
 
 static PreferencesDialogPathFormat* preferences_dialog_path_format_new (const gchar* name, const gchar* pattern) {
 #line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return preferences_dialog_path_format_construct (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, name, pattern);
-#line 20293 "Dialogs.c"
+#line 19867 "Dialogs.c"
 }
 
 
 static void preferences_dialog_value_path_format_init (GValue* value) {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 20300 "Dialogs.c"
+#line 19874 "Dialogs.c"
 }
 
 
@@ -20322,7 +19896,7 @@ static void preferences_dialog_value_path_format_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_unref (value->data[0].v_pointer);
-#line 20309 "Dialogs.c"
+#line 19883 "Dialogs.c"
 	}
 }
 
@@ -20332,11 +19906,11 @@ static void preferences_dialog_value_path_format_copy_value (const GValue* src_v
 	if (src_value->data[0].v_pointer) {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = preferences_dialog_path_format_ref (src_value->data[0].v_pointer);
-#line 20319 "Dialogs.c"
+#line 19893 "Dialogs.c"
 	} else {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 20323 "Dialogs.c"
+#line 19897 "Dialogs.c"
 	}
 }
 
@@ -20344,66 +19918,66 @@ static void preferences_dialog_value_path_format_copy_value (const GValue* src_v
 static gpointer preferences_dialog_value_path_format_peek_pointer (const GValue* value) {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20331 "Dialogs.c"
+#line 19905 "Dialogs.c"
 }
 
 
 static gchar* preferences_dialog_value_path_format_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 20338 "Dialogs.c"
-		PreferencesDialogPathFormat* object;
+#line 19912 "Dialogs.c"
+		PreferencesDialogPathFormat * object;
 		object = collect_values[0].v_pointer;
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20345 "Dialogs.c"
+#line 19919 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20349 "Dialogs.c"
+#line 19923 "Dialogs.c"
 		}
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = preferences_dialog_path_format_ref (object);
-#line 20353 "Dialogs.c"
+#line 19927 "Dialogs.c"
 	} else {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20357 "Dialogs.c"
+#line 19931 "Dialogs.c"
 	}
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20361 "Dialogs.c"
+#line 19935 "Dialogs.c"
 }
 
 
 static gchar* preferences_dialog_value_path_format_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PreferencesDialogPathFormat** object_p;
+	PreferencesDialogPathFormat ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 20372 "Dialogs.c"
+#line 19946 "Dialogs.c"
 	}
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 20378 "Dialogs.c"
+#line 19952 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 20382 "Dialogs.c"
+#line 19956 "Dialogs.c"
 	} else {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = preferences_dialog_path_format_ref (value->data[0].v_pointer);
-#line 20386 "Dialogs.c"
+#line 19960 "Dialogs.c"
 	}
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20390 "Dialogs.c"
+#line 19964 "Dialogs.c"
 }
 
 
@@ -20417,7 +19991,7 @@ static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 20404 "Dialogs.c"
+#line 19978 "Dialogs.c"
 }
 
 
@@ -20426,12 +20000,12 @@ static gpointer preferences_dialog_value_get_path_format (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL);
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20413 "Dialogs.c"
+#line 19987 "Dialogs.c"
 }
 
 
 static void preferences_dialog_value_set_path_format (GValue* value, gpointer v_object) {
-	PreferencesDialogPathFormat* old;
+	PreferencesDialogPathFormat * old;
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20446,23 +20020,23 @@ static void preferences_dialog_value_set_path_format (GValue* value, gpointer v_
 		value->data[0].v_pointer = v_object;
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_ref (value->data[0].v_pointer);
-#line 20433 "Dialogs.c"
+#line 20007 "Dialogs.c"
 	} else {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20437 "Dialogs.c"
+#line 20011 "Dialogs.c"
 	}
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_unref (old);
-#line 20443 "Dialogs.c"
+#line 20017 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_value_take_path_format (GValue* value, gpointer v_object) {
-	PreferencesDialogPathFormat* old;
+	PreferencesDialogPathFormat * old;
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20475,17 +20049,17 @@ static void preferences_dialog_value_take_path_format (GValue* value, gpointer v
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 20462 "Dialogs.c"
+#line 20036 "Dialogs.c"
 	} else {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20466 "Dialogs.c"
+#line 20040 "Dialogs.c"
 	}
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_unref (old);
-#line 20472 "Dialogs.c"
+#line 20046 "Dialogs.c"
 	}
 }
 
@@ -20495,18 +20069,18 @@ static void preferences_dialog_path_format_class_init (PreferencesDialogPathForm
 	preferences_dialog_path_format_parent_class = g_type_class_peek_parent (klass);
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((PreferencesDialogPathFormatClass *) klass)->finalize = preferences_dialog_path_format_finalize;
-#line 20482 "Dialogs.c"
+#line 20056 "Dialogs.c"
 }
 
 
 static void preferences_dialog_path_format_instance_init (PreferencesDialogPathFormat * self) {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 20489 "Dialogs.c"
+#line 20063 "Dialogs.c"
 }
 
 
-static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat* obj) {
+static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat * obj) {
 	PreferencesDialogPathFormat * self;
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PREFERENCES_DIALOG_TYPE_PATH_FORMAT, PreferencesDialogPathFormat);
@@ -20516,7 +20090,7 @@ static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat
 	_g_free0 (self->name);
 #line 2271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->pattern);
-#line 20503 "Dialogs.c"
+#line 20077 "Dialogs.c"
 }
 
 
@@ -20535,18 +20109,18 @@ static GType preferences_dialog_path_format_get_type (void) {
 
 
 static gpointer preferences_dialog_path_format_ref (gpointer instance) {
-	PreferencesDialogPathFormat* self;
+	PreferencesDialogPathFormat * self;
 	self = instance;
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 20528 "Dialogs.c"
+#line 20102 "Dialogs.c"
 }
 
 
 static void preferences_dialog_path_format_unref (gpointer instance) {
-	PreferencesDialogPathFormat* self;
+	PreferencesDialogPathFormat * self;
 	self = instance;
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -20554,7 +20128,7 @@ static void preferences_dialog_path_format_unref (gpointer instance) {
 		PREFERENCES_DIALOG_PATH_FORMAT_GET_CLASS (self)->finalize (self);
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 20541 "Dialogs.c"
+#line 20115 "Dialogs.c"
 	}
 }
 
@@ -20562,7 +20136,7 @@ static void preferences_dialog_path_format_unref (gpointer instance) {
 static void value_preferences_dialog_init (GValue* value) {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 20549 "Dialogs.c"
+#line 20123 "Dialogs.c"
 }
 
 
@@ -20571,7 +20145,7 @@ static void value_preferences_dialog_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_unref (value->data[0].v_pointer);
-#line 20558 "Dialogs.c"
+#line 20132 "Dialogs.c"
 	}
 }
 
@@ -20581,11 +20155,11 @@ static void value_preferences_dialog_copy_value (const GValue* src_value, GValue
 	if (src_value->data[0].v_pointer) {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = preferences_dialog_ref (src_value->data[0].v_pointer);
-#line 20568 "Dialogs.c"
+#line 20142 "Dialogs.c"
 	} else {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 20572 "Dialogs.c"
+#line 20146 "Dialogs.c"
 	}
 }
 
@@ -20593,66 +20167,66 @@ static void value_preferences_dialog_copy_value (const GValue* src_value, GValue
 static gpointer value_preferences_dialog_peek_pointer (const GValue* value) {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20580 "Dialogs.c"
+#line 20154 "Dialogs.c"
 }
 
 
 static gchar* value_preferences_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 20587 "Dialogs.c"
-		PreferencesDialog* object;
+#line 20161 "Dialogs.c"
+		PreferencesDialog * object;
 		object = collect_values[0].v_pointer;
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20594 "Dialogs.c"
+#line 20168 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20598 "Dialogs.c"
+#line 20172 "Dialogs.c"
 		}
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = preferences_dialog_ref (object);
-#line 20602 "Dialogs.c"
+#line 20176 "Dialogs.c"
 	} else {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20606 "Dialogs.c"
+#line 20180 "Dialogs.c"
 	}
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20610 "Dialogs.c"
+#line 20184 "Dialogs.c"
 }
 
 
 static gchar* value_preferences_dialog_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PreferencesDialog** object_p;
+	PreferencesDialog ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 20621 "Dialogs.c"
+#line 20195 "Dialogs.c"
 	}
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 20627 "Dialogs.c"
+#line 20201 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 20631 "Dialogs.c"
+#line 20205 "Dialogs.c"
 	} else {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = preferences_dialog_ref (value->data[0].v_pointer);
-#line 20635 "Dialogs.c"
+#line 20209 "Dialogs.c"
 	}
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20639 "Dialogs.c"
+#line 20213 "Dialogs.c"
 }
 
 
@@ -20666,7 +20240,7 @@ GParamSpec* param_spec_preferences_dialog (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 20653 "Dialogs.c"
+#line 20227 "Dialogs.c"
 }
 
 
@@ -20675,12 +20249,12 @@ gpointer value_get_preferences_dialog (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG), NULL);
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20662 "Dialogs.c"
+#line 20236 "Dialogs.c"
 }
 
 
 void value_set_preferences_dialog (GValue* value, gpointer v_object) {
-	PreferencesDialog* old;
+	PreferencesDialog * old;
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG));
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20695,23 +20269,23 @@ void value_set_preferences_dialog (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_ref (value->data[0].v_pointer);
-#line 20682 "Dialogs.c"
+#line 20256 "Dialogs.c"
 	} else {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20686 "Dialogs.c"
+#line 20260 "Dialogs.c"
 	}
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_unref (old);
-#line 20692 "Dialogs.c"
+#line 20266 "Dialogs.c"
 	}
 }
 
 
 void value_take_preferences_dialog (GValue* value, gpointer v_object) {
-	PreferencesDialog* old;
+	PreferencesDialog * old;
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG));
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20724,17 +20298,17 @@ void value_take_preferences_dialog (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 20711 "Dialogs.c"
+#line 20285 "Dialogs.c"
 	} else {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20715 "Dialogs.c"
+#line 20289 "Dialogs.c"
 	}
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_unref (old);
-#line 20721 "Dialogs.c"
+#line 20295 "Dialogs.c"
 	}
 }
 
@@ -20746,14 +20320,14 @@ static void preferences_dialog_class_init (PreferencesDialogClass * klass) {
 	((PreferencesDialogClass *) klass)->finalize = preferences_dialog_finalize;
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (PreferencesDialogPrivate));
-#line 20733 "Dialogs.c"
+#line 20307 "Dialogs.c"
 }
 
 
 static void preferences_dialog_instance_init (PreferencesDialog * self) {
-	GeeArrayList* _tmp0_ = NULL;
-	GDateTime* _tmp1_ = NULL;
-	PluginsManifestWidgetMediator* _tmp2_ = NULL;
+	GeeArrayList* _tmp0_;
+	GDateTime* _tmp1_;
+	PluginsManifestWidgetMediator* _tmp2_;
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = PREFERENCES_DIALOG_GET_PRIVATE (self);
 #line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20774,11 +20348,11 @@ static void preferences_dialog_instance_init (PreferencesDialog * self) {
 	self->priv->plugins_mediator = _tmp2_;
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 20761 "Dialogs.c"
+#line 20335 "Dialogs.c"
 }
 
 
-static void preferences_dialog_finalize (PreferencesDialog* obj) {
+static void preferences_dialog_finalize (PreferencesDialog * obj) {
 	PreferencesDialog * self;
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREFERENCES_DIALOG, PreferencesDialog);
@@ -20820,7 +20394,7 @@ static void preferences_dialog_finalize (PreferencesDialog* obj) {
 	_plugins_manifest_widget_mediator_unref0 (self->priv->plugins_mediator);
 #line 2294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->default_raw_developer_combo);
-#line 20807 "Dialogs.c"
+#line 20381 "Dialogs.c"
 }
 
 
@@ -20839,18 +20413,18 @@ GType preferences_dialog_get_type (void) {
 
 
 gpointer preferences_dialog_ref (gpointer instance) {
-	PreferencesDialog* self;
+	PreferencesDialog * self;
 	self = instance;
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 20832 "Dialogs.c"
+#line 20406 "Dialogs.c"
 }
 
 
 void preferences_dialog_unref (gpointer instance) {
-	PreferencesDialog* self;
+	PreferencesDialog * self;
 	self = instance;
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -20858,7 +20432,7 @@ void preferences_dialog_unref (gpointer instance) {
 		PREFERENCES_DIALOG_GET_CLASS (self)->finalize (self);
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 20845 "Dialogs.c"
+#line 20419 "Dialogs.c"
 	}
 }
 
@@ -20866,55 +20440,43 @@ void preferences_dialog_unref (gpointer instance) {
 GtkResponseType copy_files_dialog (void) {
 	GtkResponseType result = 0;
 	gchar* msg = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
 	GtkMessageDialog* dialog = NULL;
-	AppWindow* _tmp2_ = NULL;
-	AppWindow* _tmp3_ = NULL;
-	GtkMessageDialog* _tmp4_ = NULL;
-	GtkMessageDialog* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
+	AppWindow* _tmp1_;
+	AppWindow* _tmp2_;
+	GtkMessageDialog* _tmp3_;
+	GtkMessageDialog* _tmp4_;
 	GtkResponseType _result_ = 0;
-	gint _tmp9_ = 0;
-#line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = _ ("Shotwell can copy the photos into your library folder or it can import" \
-" them without copying.");
+	gint _tmp5_;
 #line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (_ ("Shotwell can copy the photos into your library folder or it can import" \
+" them without copying."));
 #line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	msg = _tmp1_;
+	msg = _tmp0_;
 #line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = app_window_get_instance ();
+	_tmp1_ = app_window_get_instance ();
 #line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", msg);
+	_tmp3_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", msg);
 #line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp4_);
+	g_object_ref_sink (_tmp3_);
 #line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp3_);
+	_g_object_unref0 (_tmp2_);
 #line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	dialog = _tmp5_;
-#line 2697 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = _ ("Co_py Photos");
+	dialog = _tmp4_;
 #line 2697 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp6_, (gint) GTK_RESPONSE_ACCEPT);
+	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _ ("Co_py Photos"), (gint) GTK_RESPONSE_ACCEPT);
 #line 2698 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = _ ("_Import in Place");
-#line 2698 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp7_, (gint) GTK_RESPONSE_REJECT);
-#line 2699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = _ ("Import to Library");
+	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _ ("_Import in Place"), (gint) GTK_RESPONSE_REJECT);
 #line 2699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), _tmp8_);
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), _ ("Import to Library"));
 #line 2701 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
+	_tmp5_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
 #line 2701 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_result_ = (GtkResponseType) _tmp9_;
+	_result_ = (GtkResponseType) _tmp5_;
 #line 2703 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
 #line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20925,17 +20487,16 @@ GtkResponseType copy_files_dialog (void) {
 	_g_free0 (msg);
 #line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20911 "Dialogs.c"
+#line 20473 "Dialogs.c"
 }
 
 
 void remove_photos_from_library (GeeCollection* photos) {
 	const gchar* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	GeeCollection* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
+	GeeCollection* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	GeeCollection* _tmp4_;
 #line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (photos));
 #line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20946,28 +20507,19 @@ void remove_photos_from_library (GeeCollection* photos) {
 	_tmp3_ = _tmp2_;
 #line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == 1) {
-#line 20932 "Dialogs.c"
-		const gchar* _tmp4_ = NULL;
 #line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = _ ("Removing Photo From Library");
-#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = _tmp4_;
-#line 20938 "Dialogs.c"
+		_tmp0_ = _ ("Removing Photo From Library");
+#line 20495 "Dialogs.c"
 	} else {
-		const gchar* _tmp5_ = NULL;
-#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = _ ("Removing Photos From Library");
 #line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = _tmp5_;
-#line 20945 "Dialogs.c"
+		_tmp0_ = _ ("Removing Photos From Library");
+#line 20499 "Dialogs.c"
 	}
 #line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = photos;
-#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = _ ("Remove From Library");
+	_tmp4_ = photos;
 #line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	remove_from_app (_tmp6_, _tmp7_, _tmp0_);
-#line 20953 "Dialogs.c"
+	remove_from_app (_tmp4_, _ ("Remove From Library"), _tmp0_);
+#line 20505 "Dialogs.c"
 }
 
 
@@ -20976,77 +20528,77 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin
 	result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
 #line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20962 "Dialogs.c"
+#line 20514 "Dialogs.c"
 }
 
 
 void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const gchar* progress_dialog_text) {
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	GeeArrayList* photos = NULL;
-	GeeArrayList* _tmp3_ = NULL;
+	GeeArrayList* _tmp3_;
 	GeeArrayList* videos = NULL;
-	GeeArrayList* _tmp4_ = NULL;
-	GeeCollection* _tmp5_ = NULL;
-	GeeArrayList* _tmp6_ = NULL;
-	GeeArrayList* _tmp7_ = NULL;
+	GeeArrayList* _tmp4_;
+	GeeCollection* _tmp5_;
+	GeeArrayList* _tmp6_;
+	GeeArrayList* _tmp7_;
 	gchar* user_message = NULL;
 	gboolean _tmp8_ = FALSE;
-	GeeArrayList* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	gboolean _tmp11_ = FALSE;
+	GeeArrayList* _tmp9_;
+	gboolean _tmp10_;
+	gboolean _tmp11_;
 	GtkResponseType _result_ = 0;
-	AppWindow* _tmp42_ = NULL;
-	AppWindow* _tmp43_ = NULL;
-	const gchar* _tmp44_ = NULL;
-	const gchar* _tmp45_ = NULL;
-	GeeCollection* _tmp46_ = NULL;
-	gint _tmp47_ = 0;
-	gint _tmp48_ = 0;
-	GtkResponseType _tmp49_ = 0;
-	GtkResponseType _tmp50_ = 0;
-	gboolean _tmp51_ = FALSE;
-	GtkResponseType _tmp52_ = 0;
+	AppWindow* _tmp39_;
+	AppWindow* _tmp40_;
+	const gchar* _tmp41_;
+	const gchar* _tmp42_;
+	GeeCollection* _tmp43_;
+	gint _tmp44_;
+	gint _tmp45_;
+	GtkResponseType _tmp46_;
+	GtkResponseType _tmp47_;
+	gboolean _tmp48_ = FALSE;
+	GtkResponseType _tmp49_;
 	gboolean delete_backing = FALSE;
-	GtkResponseType _tmp54_ = 0;
-	AppWindow* _tmp55_ = NULL;
-	AppWindow* _tmp56_ = NULL;
+	GtkResponseType _tmp51_;
+	AppWindow* _tmp52_;
+	AppWindow* _tmp53_;
 	ProgressDialog* progress = NULL;
 	ProgressMonitor monitor = NULL;
-	void* monitor_target = NULL;
-	GDestroyNotify monitor_target_destroy_notify = NULL;
-	GeeCollection* _tmp57_ = NULL;
-	gint _tmp58_ = 0;
-	gint _tmp59_ = 0;
+	void* monitor_target;
+	GDestroyNotify monitor_target_destroy_notify;
+	GeeCollection* _tmp54_;
+	gint _tmp55_;
+	gint _tmp56_;
 	GeeArrayList* not_removed_photos = NULL;
-	GeeArrayList* _tmp65_ = NULL;
+	GeeArrayList* _tmp62_;
 	GeeArrayList* not_removed_videos = NULL;
-	GeeArrayList* _tmp66_ = NULL;
-	LibraryPhotoSourceCollection* _tmp67_ = NULL;
-	GeeArrayList* _tmp68_ = NULL;
-	gboolean _tmp69_ = FALSE;
-	ProgressMonitor _tmp70_ = NULL;
-	void* _tmp70__target = NULL;
-	GeeArrayList* _tmp71_ = NULL;
-	VideoSourceCollection* _tmp72_ = NULL;
-	GeeArrayList* _tmp73_ = NULL;
-	gboolean _tmp74_ = FALSE;
-	ProgressMonitor _tmp75_ = NULL;
-	void* _tmp75__target = NULL;
-	GeeArrayList* _tmp76_ = NULL;
+	GeeArrayList* _tmp63_;
+	LibraryPhotoSourceCollection* _tmp64_;
+	GeeArrayList* _tmp65_;
+	gboolean _tmp66_;
+	ProgressMonitor _tmp67_;
+	void* _tmp67__target;
+	GeeArrayList* _tmp68_;
+	VideoSourceCollection* _tmp69_;
+	GeeArrayList* _tmp70_;
+	gboolean _tmp71_;
+	ProgressMonitor _tmp72_;
+	void* _tmp72__target;
+	GeeArrayList* _tmp73_;
 	gint num_not_removed = 0;
-	GeeArrayList* _tmp77_ = NULL;
-	gint _tmp78_ = 0;
-	gint _tmp79_ = 0;
-	GeeArrayList* _tmp80_ = NULL;
-	gint _tmp81_ = 0;
-	gint _tmp82_ = 0;
-	gboolean _tmp83_ = FALSE;
-	gboolean _tmp84_ = FALSE;
-	ProgressDialog* _tmp122_ = NULL;
-	AppWindow* _tmp124_ = NULL;
-	AppWindow* _tmp125_ = NULL;
+	GeeArrayList* _tmp74_;
+	gint _tmp75_;
+	gint _tmp76_;
+	GeeArrayList* _tmp77_;
+	gint _tmp78_;
+	gint _tmp79_;
+	gboolean _tmp80_ = FALSE;
+	gboolean _tmp81_;
+	ProgressDialog* _tmp117_;
+	AppWindow* _tmp119_;
+	AppWindow* _tmp120_;
 #line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
 #line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -21063,7 +20615,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 	if (_tmp2_ == 0) {
 #line 2716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 21049 "Dialogs.c"
+#line 20601 "Dialogs.c"
 	}
 #line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
@@ -21091,10 +20643,10 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 	_tmp11_ = _tmp10_;
 #line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp11_) {
-#line 21077 "Dialogs.c"
-		GeeArrayList* _tmp12_ = NULL;
-		gboolean _tmp13_ = FALSE;
-		gboolean _tmp14_ = FALSE;
+#line 20629 "Dialogs.c"
+		GeeArrayList* _tmp12_;
+		gboolean _tmp13_;
+		gboolean _tmp14_;
 #line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = videos;
 #line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -21103,23 +20655,22 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 		_tmp14_ = _tmp13_;
 #line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = !_tmp14_;
-#line 21089 "Dialogs.c"
+#line 20641 "Dialogs.c"
 	} else {
 #line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = FALSE;
-#line 21093 "Dialogs.c"
+#line 20645 "Dialogs.c"
 	}
 #line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_) {
-#line 21097 "Dialogs.c"
-		GeeCollection* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
-		gint _tmp17_ = 0;
-		const gchar* _tmp18_ = NULL;
-		GeeCollection* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
-		gint _tmp21_ = 0;
-		gchar* _tmp22_ = NULL;
+#line 20649 "Dialogs.c"
+		GeeCollection* _tmp15_;
+		gint _tmp16_;
+		gint _tmp17_;
+		GeeCollection* _tmp18_;
+		gint _tmp19_;
+		gint _tmp20_;
+		gchar* _tmp21_;
 #line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = sources;
 #line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -21127,152 +20678,144 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 #line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = _tmp16_;
 #line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp18_ = ngettext ("This will remove the photo/video from your Shotwell library. Would you" \
+		_tmp18_ = sources;
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp19_ = gee_collection_get_size (_tmp18_);
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp20_ = _tmp19_;
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp21_ = g_strdup_printf (ngettext ("This will remove the photo/video from your Shotwell library. Would you" \
 " also like to move the file to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", "This will remove %d photos/videos from your Shotwell library. Would yo" \
 "u also like to move the files to your desktop trash?\n" \
 "\n" \
-"This action cannot be undone.", (gulong) _tmp17_);
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp19_ = sources;
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp20_ = gee_collection_get_size (_tmp19_);
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp21_ = _tmp20_;
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp22_ = g_strdup_printf (_tmp18_, _tmp21_);
+"This action cannot be undone.", (gulong) _tmp17_), _tmp20_);
 #line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (user_message);
 #line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		user_message = _tmp22_;
-#line 21126 "Dialogs.c"
+		user_message = _tmp21_;
+#line 20675 "Dialogs.c"
 	} else {
-		GeeArrayList* _tmp23_ = NULL;
-		gboolean _tmp24_ = FALSE;
-		gboolean _tmp25_ = FALSE;
+		GeeArrayList* _tmp22_;
+		gboolean _tmp23_;
+		gboolean _tmp24_;
 #line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp23_ = videos;
+		_tmp22_ = videos;
 #line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp24_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp23_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp25_ = _tmp24_;
+		_tmp24_ = _tmp23_;
 #line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (!_tmp25_) {
-#line 21139 "Dialogs.c"
-			GeeCollection* _tmp26_ = NULL;
-			gint _tmp27_ = 0;
-			gint _tmp28_ = 0;
-			const gchar* _tmp29_ = NULL;
-			GeeCollection* _tmp30_ = NULL;
-			gint _tmp31_ = 0;
-			gint _tmp32_ = 0;
-			gchar* _tmp33_ = NULL;
+		if (!_tmp24_) {
+#line 20688 "Dialogs.c"
+			GeeCollection* _tmp25_;
+			gint _tmp26_;
+			gint _tmp27_;
+			GeeCollection* _tmp28_;
+			gint _tmp29_;
+			gint _tmp30_;
+			gchar* _tmp31_;
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+			_tmp25_ = sources;
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+			_tmp26_ = gee_collection_get_size (_tmp25_);
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+			_tmp27_ = _tmp26_;
 #line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp26_ = sources;
+			_tmp28_ = sources;
 #line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp27_ = gee_collection_get_size (_tmp26_);
+			_tmp29_ = gee_collection_get_size (_tmp28_);
 #line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp28_ = _tmp27_;
+			_tmp30_ = _tmp29_;
 #line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp29_ = ngettext ("This will remove the video from your Shotwell library. Would you also " \
+			_tmp31_ = g_strdup_printf (ngettext ("This will remove the video from your Shotwell library. Would you also " \
 "like to move the file to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", "This will remove %d videos from your Shotwell library. Would you also " \
 "like to move the files to your desktop trash?\n" \
 "\n" \
-"This action cannot be undone.", (gulong) _tmp28_);
-#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp30_ = sources;
-#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp31_ = gee_collection_get_size (_tmp30_);
-#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp32_ = _tmp31_;
-#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp33_ = g_strdup_printf (_tmp29_, _tmp32_);
+"This action cannot be undone.", (gulong) _tmp27_), _tmp30_);
 #line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (user_message);
 #line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			user_message = _tmp33_;
-#line 21168 "Dialogs.c"
+			user_message = _tmp31_;
+#line 20714 "Dialogs.c"
 		} else {
-			GeeCollection* _tmp34_ = NULL;
-			gint _tmp35_ = 0;
-			gint _tmp36_ = 0;
-			const gchar* _tmp37_ = NULL;
-			GeeCollection* _tmp38_ = NULL;
-			gint _tmp39_ = 0;
-			gint _tmp40_ = 0;
-			gchar* _tmp41_ = NULL;
+			GeeCollection* _tmp32_;
+			gint _tmp33_;
+			gint _tmp34_;
+			GeeCollection* _tmp35_;
+			gint _tmp36_;
+			gint _tmp37_;
+			gchar* _tmp38_;
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+			_tmp32_ = sources;
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+			_tmp33_ = gee_collection_get_size (_tmp32_);
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+			_tmp34_ = _tmp33_;
 #line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp34_ = sources;
+			_tmp35_ = sources;
 #line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp35_ = gee_collection_get_size (_tmp34_);
+			_tmp36_ = gee_collection_get_size (_tmp35_);
 #line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp36_ = _tmp35_;
+			_tmp37_ = _tmp36_;
 #line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp37_ = ngettext ("This will remove the photo from your Shotwell library. Would you also " \
+			_tmp38_ = g_strdup_printf (ngettext ("This will remove the photo from your Shotwell library. Would you also " \
 "like to move the file to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", "This will remove %d photos from your Shotwell library. Would you also " \
 "like to move the files to your desktop trash?\n" \
 "\n" \
-"This action cannot be undone.", (gulong) _tmp36_);
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp38_ = sources;
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp39_ = gee_collection_get_size (_tmp38_);
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp40_ = _tmp39_;
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp41_ = g_strdup_printf (_tmp37_, _tmp40_);
+"This action cannot be undone.", (gulong) _tmp34_), _tmp37_);
 #line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (user_message);
 #line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			user_message = _tmp41_;
-#line 21198 "Dialogs.c"
+			user_message = _tmp38_;
+#line 20741 "Dialogs.c"
 		}
 	}
 #line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp42_ = app_window_get_instance ();
+	_tmp39_ = app_window_get_instance ();
 #line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp43_ = _tmp42_;
+	_tmp40_ = _tmp39_;
 #line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp44_ = dialog_title;
+	_tmp41_ = dialog_title;
 #line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp45_ = user_message;
+	_tmp42_ = user_message;
 #line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp46_ = sources;
+	_tmp43_ = sources;
 #line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp47_ = gee_collection_get_size (_tmp46_);
+	_tmp44_ = gee_collection_get_size (_tmp43_);
 #line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp48_ = _tmp47_;
+	_tmp45_ = _tmp44_;
 #line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp49_ = remove_from_library_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_window_get_type (), GtkWindow), _tmp44_, _tmp45_, _tmp48_);
+	_tmp46_ = remove_from_library_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_window_get_type (), GtkWindow), _tmp41_, _tmp42_, _tmp45_);
 #line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp50_ = _tmp49_;
+	_tmp47_ = _tmp46_;
 #line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp43_);
+	_g_object_unref0 (_tmp40_);
 #line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_result_ = _tmp50_;
+	_result_ = _tmp47_;
 #line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp52_ = _result_;
+	_tmp49_ = _result_;
 #line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp52_ != GTK_RESPONSE_YES) {
-#line 21227 "Dialogs.c"
-		GtkResponseType _tmp53_ = 0;
+	if (_tmp49_ != GTK_RESPONSE_YES) {
+#line 20770 "Dialogs.c"
+		GtkResponseType _tmp50_;
 #line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp53_ = _result_;
+		_tmp50_ = _result_;
 #line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp51_ = _tmp53_ != GTK_RESPONSE_NO;
-#line 21233 "Dialogs.c"
+		_tmp48_ = _tmp50_ != GTK_RESPONSE_NO;
+#line 20776 "Dialogs.c"
 	} else {
 #line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp51_ = FALSE;
-#line 21237 "Dialogs.c"
+		_tmp48_ = FALSE;
+#line 20780 "Dialogs.c"
 	}
 #line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp51_) {
+	if (_tmp48_) {
 #line 2740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (user_message);
 #line 2740 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -21281,20 +20824,20 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 		_g_object_unref0 (photos);
 #line 2740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 21249 "Dialogs.c"
+#line 20792 "Dialogs.c"
 	}
 #line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp54_ = _result_;
+	_tmp51_ = _result_;
 #line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	delete_backing = _tmp54_ == GTK_RESPONSE_YES;
+	delete_backing = _tmp51_ == GTK_RESPONSE_YES;
 #line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp55_ = app_window_get_instance ();
+	_tmp52_ = app_window_get_instance ();
 #line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp56_ = _tmp55_;
+	_tmp53_ = _tmp52_;
 #line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PAGE_WINDOW, PageWindow));
+	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_PAGE_WINDOW, PageWindow));
 #line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp56_);
+	_g_object_unref0 (_tmp53_);
 #line 2746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress = NULL;
 #line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -21304,37 +20847,37 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 #line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target_destroy_notify = NULL;
 #line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp57_ = sources;
+	_tmp54_ = sources;
 #line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp58_ = gee_collection_get_size (_tmp57_);
+	_tmp55_ = gee_collection_get_size (_tmp54_);
 #line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp59_ = _tmp58_;
+	_tmp56_ = _tmp55_;
 #line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp59_ >= 20) {
-#line 21279 "Dialogs.c"
-		AppWindow* _tmp60_ = NULL;
-		AppWindow* _tmp61_ = NULL;
-		const gchar* _tmp62_ = NULL;
-		ProgressDialog* _tmp63_ = NULL;
-		ProgressDialog* _tmp64_ = NULL;
+	if (_tmp56_ >= 20) {
+#line 20822 "Dialogs.c"
+		AppWindow* _tmp57_;
+		AppWindow* _tmp58_;
+		const gchar* _tmp59_;
+		ProgressDialog* _tmp60_;
+		ProgressDialog* _tmp61_;
 #line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp60_ = app_window_get_instance ();
+		_tmp57_ = app_window_get_instance ();
 #line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp61_ = _tmp60_;
+		_tmp58_ = _tmp57_;
 #line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp62_ = progress_dialog_text;
+		_tmp59_ = progress_dialog_text;
 #line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp63_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_window_get_type (), GtkWindow), _tmp62_, NULL);
+		_tmp60_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_window_get_type (), GtkWindow), _tmp59_, NULL);
 #line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_ref_sink (_tmp63_);
+		g_object_ref_sink (_tmp60_);
 #line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (progress);
 #line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		progress = _tmp63_;
+		progress = _tmp60_;
 #line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp61_);
+		_g_object_unref0 (_tmp58_);
 #line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp64_ = progress;
+		_tmp61_ = progress;
 #line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
 #line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -21346,264 +20889,258 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 #line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor = _progress_dialog_monitor_progress_monitor;
 #line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		monitor_target = g_object_ref (_tmp64_);
+		monitor_target = g_object_ref (_tmp61_);
 #line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target_destroy_notify = g_object_unref;
-#line 21317 "Dialogs.c"
+#line 20860 "Dialogs.c"
 	}
 #line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp65_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp62_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	not_removed_photos = _tmp65_;
+	not_removed_photos = _tmp62_;
 #line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp66_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp63_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	not_removed_videos = _tmp66_;
+	not_removed_videos = _tmp63_;
 #line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp67_ = library_photo_global;
+	_tmp64_ = library_photo_global;
 #line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp68_ = photos;
+	_tmp65_ = photos;
 #line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp69_ = delete_backing;
+	_tmp66_ = delete_backing;
 #line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp70_ = monitor;
+	_tmp67_ = monitor;
 #line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp70__target = monitor_target;
+	_tmp67__target = monitor_target;
 #line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp71_ = not_removed_photos;
+	_tmp68_ = not_removed_photos;
 #line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_COLLECTION, GeeCollection), _tmp69_, _tmp70_, _tmp70__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_LIST, GeeList));
+	media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, GEE_TYPE_COLLECTION, GeeCollection), _tmp66_, _tmp67_, _tmp67__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_LIST, GeeList));
 #line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp72_ = video_global;
+	_tmp69_ = video_global;
 #line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp73_ = videos;
+	_tmp70_ = videos;
 #line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp74_ = delete_backing;
+	_tmp71_ = delete_backing;
 #line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp75_ = monitor;
+	_tmp72_ = monitor;
 #line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp75__target = monitor_target;
+	_tmp72__target = monitor_target;
 #line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp76_ = not_removed_videos;
+	_tmp73_ = not_removed_videos;
 #line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_COLLECTION, GeeCollection), _tmp74_, _tmp75_, _tmp75__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_LIST, GeeList));
+	media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GEE_TYPE_COLLECTION, GeeCollection), _tmp71_, _tmp72_, _tmp72__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_LIST, GeeList));
 #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp77_ = not_removed_photos;
+	_tmp74_ = not_removed_photos;
 #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp78_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+	_tmp75_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp79_ = _tmp78_;
+	_tmp76_ = _tmp75_;
 #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp80_ = not_removed_videos;
+	_tmp77_ = not_removed_videos;
 #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp81_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+	_tmp78_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp82_ = _tmp81_;
+	_tmp79_ = _tmp78_;
 #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	num_not_removed = _tmp79_ + _tmp82_;
+	num_not_removed = _tmp76_ + _tmp79_;
 #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp84_ = delete_backing;
+	_tmp81_ = delete_backing;
 #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp84_) {
-#line 21373 "Dialogs.c"
-		gint _tmp85_ = 0;
+	if (_tmp81_) {
+#line 20916 "Dialogs.c"
+		gint _tmp82_;
 #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp85_ = num_not_removed;
+		_tmp82_ = num_not_removed;
 #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp83_ = _tmp85_ > 0;
-#line 21379 "Dialogs.c"
+		_tmp80_ = _tmp82_ > 0;
+#line 20922 "Dialogs.c"
 	} else {
 #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp83_ = FALSE;
-#line 21383 "Dialogs.c"
+		_tmp80_ = FALSE;
+#line 20926 "Dialogs.c"
 	}
 #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp83_) {
-#line 21387 "Dialogs.c"
+	if (_tmp80_) {
+#line 20930 "Dialogs.c"
 		gchar* not_deleted_message = NULL;
-		gint _tmp86_ = 0;
-		const gchar* _tmp87_ = NULL;
-		gint _tmp88_ = 0;
-		gchar* _tmp89_ = NULL;
+		gint _tmp83_;
+		gint _tmp84_;
+		gchar* _tmp85_;
 		GtkResponseType result_delete = 0;
-		AppWindow* _tmp90_ = NULL;
-		AppWindow* _tmp91_ = NULL;
-		const gchar* _tmp92_ = NULL;
-		const gchar* _tmp93_ = NULL;
-		GtkResponseType _tmp94_ = 0;
-		GtkResponseType _tmp95_ = 0;
-		GtkResponseType _tmp96_ = 0;
-#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp86_ = num_not_removed;
+		AppWindow* _tmp86_;
+		AppWindow* _tmp87_;
+		const gchar* _tmp88_;
+		const gchar* _tmp89_;
+		GtkResponseType _tmp90_;
+		GtkResponseType _tmp91_;
+		GtkResponseType _tmp92_;
 #line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp87_ = ngettext ("The photo or video cannot be moved to your desktop trash. Delete this " \
-"file?", "%d photos/videos cannot be moved to your desktop trash. Delete these f" \
-"iles?", (gulong) _tmp86_);
+		_tmp83_ = num_not_removed;
 #line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp88_ = num_not_removed;
+		_tmp84_ = num_not_removed;
 #line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp89_ = g_strdup_printf (_tmp87_, _tmp88_);
+		_tmp85_ = g_strdup_printf (ngettext ("The photo or video cannot be moved to your desktop trash. Delete this " \
+"file?", "%d photos/videos cannot be moved to your desktop trash. Delete these f" \
+"iles?", (gulong) _tmp83_), _tmp84_);
 #line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		not_deleted_message = _tmp89_;
+		not_deleted_message = _tmp85_;
 #line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp90_ = app_window_get_instance ();
+		_tmp86_ = app_window_get_instance ();
 #line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp91_ = _tmp90_;
+		_tmp87_ = _tmp86_;
 #line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp92_ = dialog_title;
+		_tmp88_ = dialog_title;
 #line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp93_ = not_deleted_message;
+		_tmp89_ = not_deleted_message;
 #line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp94_ = remove_from_filesystem_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, gtk_window_get_type (), GtkWindow), _tmp92_, _tmp93_);
+		_tmp90_ = remove_from_filesystem_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_window_get_type (), GtkWindow), _tmp88_, _tmp89_);
 #line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp95_ = _tmp94_;
+		_tmp91_ = _tmp90_;
 #line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp91_);
+		_g_object_unref0 (_tmp87_);
 #line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		result_delete = _tmp95_;
+		result_delete = _tmp91_;
 #line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp96_ = result_delete;
+		_tmp92_ = result_delete;
 #line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (GTK_RESPONSE_YES == _tmp96_) {
-#line 21431 "Dialogs.c"
+		if (GTK_RESPONSE_YES == _tmp92_) {
+#line 20971 "Dialogs.c"
 			GeeArrayList* not_deleted_photos = NULL;
-			GeeArrayList* _tmp97_ = NULL;
+			GeeArrayList* _tmp93_;
 			GeeArrayList* not_deleted_videos = NULL;
-			GeeArrayList* _tmp98_ = NULL;
-			LibraryPhotoSourceCollection* _tmp99_ = NULL;
-			GeeArrayList* _tmp100_ = NULL;
-			ProgressMonitor _tmp101_ = NULL;
-			void* _tmp101__target = NULL;
-			GeeArrayList* _tmp102_ = NULL;
-			VideoSourceCollection* _tmp103_ = NULL;
-			GeeArrayList* _tmp104_ = NULL;
-			ProgressMonitor _tmp105_ = NULL;
-			void* _tmp105__target = NULL;
-			GeeArrayList* _tmp106_ = NULL;
+			GeeArrayList* _tmp94_;
+			LibraryPhotoSourceCollection* _tmp95_;
+			GeeArrayList* _tmp96_;
+			ProgressMonitor _tmp97_;
+			void* _tmp97__target;
+			GeeArrayList* _tmp98_;
+			VideoSourceCollection* _tmp99_;
+			GeeArrayList* _tmp100_;
+			ProgressMonitor _tmp101_;
+			void* _tmp101__target;
+			GeeArrayList* _tmp102_;
 			gint num_not_deleted = 0;
-			GeeArrayList* _tmp107_ = NULL;
-			gint _tmp108_ = 0;
-			gint _tmp109_ = 0;
-			GeeArrayList* _tmp110_ = NULL;
-			gint _tmp111_ = 0;
-			gint _tmp112_ = 0;
-			gint _tmp113_ = 0;
+			GeeArrayList* _tmp103_;
+			gint _tmp104_;
+			gint _tmp105_;
+			GeeArrayList* _tmp106_;
+			gint _tmp107_;
+			gint _tmp108_;
+			gint _tmp109_;
 #line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp97_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+			_tmp93_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			not_deleted_photos = _tmp97_;
+			not_deleted_photos = _tmp93_;
 #line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp98_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+			_tmp94_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			not_deleted_videos = _tmp98_;
+			not_deleted_videos = _tmp94_;
 #line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp99_ = library_photo_global;
+			_tmp95_ = library_photo_global;
 #line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp100_ = not_removed_photos;
+			_tmp96_ = not_removed_photos;
 #line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp101_ = monitor;
+			_tmp97_ = monitor;
 #line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp101__target = monitor_target;
+			_tmp97__target = monitor_target;
 #line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp102_ = not_deleted_photos;
+			_tmp98_ = not_deleted_photos;
 #line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_COLLECTION, GeeCollection), _tmp101_, _tmp101__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, GEE_TYPE_LIST, GeeList));
+			media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, GEE_TYPE_COLLECTION, GeeCollection), _tmp97_, _tmp97__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, GEE_TYPE_LIST, GeeList));
 #line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp103_ = video_global;
+			_tmp99_ = video_global;
 #line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp104_ = not_removed_videos;
+			_tmp100_ = not_removed_videos;
 #line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp105_ = monitor;
+			_tmp101_ = monitor;
 #line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp105__target = monitor_target;
+			_tmp101__target = monitor_target;
 #line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp106_ = not_deleted_videos;
+			_tmp102_ = not_deleted_videos;
 #line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_COLLECTION, GeeCollection), _tmp105_, _tmp105__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_LIST, GeeList));
+			media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_COLLECTION, GeeCollection), _tmp101_, _tmp101__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, GEE_TYPE_LIST, GeeList));
 #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp107_ = not_deleted_photos;
+			_tmp103_ = not_deleted_photos;
 #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp108_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+			_tmp104_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp109_ = _tmp108_;
+			_tmp105_ = _tmp104_;
 #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp110_ = not_deleted_videos;
+			_tmp106_ = not_deleted_videos;
 #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp111_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+			_tmp107_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp112_ = _tmp111_;
+			_tmp108_ = _tmp107_;
 #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			num_not_deleted = _tmp109_ + _tmp112_;
+			num_not_deleted = _tmp105_ + _tmp108_;
 #line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp113_ = num_not_deleted;
+			_tmp109_ = num_not_deleted;
 #line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			if (_tmp113_ > 0) {
-#line 21504 "Dialogs.c"
+			if (_tmp109_ > 0) {
+#line 21044 "Dialogs.c"
 				gchar* delete_failed_message = NULL;
-				gint _tmp114_ = 0;
-				const gchar* _tmp115_ = NULL;
-				gint _tmp116_ = 0;
-				gchar* _tmp117_ = NULL;
-				const gchar* _tmp118_ = NULL;
-				const gchar* _tmp119_ = NULL;
-				AppWindow* _tmp120_ = NULL;
-				AppWindow* _tmp121_ = NULL;
-#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp114_ = num_not_deleted;
+				gint _tmp110_;
+				gint _tmp111_;
+				gchar* _tmp112_;
+				const gchar* _tmp113_;
+				const gchar* _tmp114_;
+				AppWindow* _tmp115_;
+				AppWindow* _tmp116_;
 #line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp115_ = ngettext ("The photo or video cannot be deleted.", "%d photos/videos cannot be deleted.", (gulong) _tmp114_);
+				_tmp110_ = num_not_deleted;
 #line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp116_ = num_not_deleted;
+				_tmp111_ = num_not_deleted;
 #line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp117_ = g_strdup_printf (_tmp115_, _tmp116_);
+				_tmp112_ = g_strdup_printf (ngettext ("The photo or video cannot be deleted.", "%d photos/videos cannot be deleted.", (gulong) _tmp110_), _tmp111_);
 #line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				delete_failed_message = _tmp117_;
+				delete_failed_message = _tmp112_;
 #line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp118_ = dialog_title;
+				_tmp113_ = dialog_title;
 #line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp119_ = delete_failed_message;
+				_tmp114_ = delete_failed_message;
 #line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp120_ = app_window_get_instance ();
+				_tmp115_ = app_window_get_instance ();
 #line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp121_ = _tmp120_;
+				_tmp116_ = _tmp115_;
 #line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				app_window_error_message_with_title (_tmp118_, _tmp119_, G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_window_get_type (), GtkWindow), TRUE);
+				app_window_error_message_with_title (_tmp113_, _tmp114_, G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_window_get_type (), GtkWindow), TRUE);
 #line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_object_unref0 (_tmp121_);
+				_g_object_unref0 (_tmp116_);
 #line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (delete_failed_message);
-#line 21538 "Dialogs.c"
+#line 21075 "Dialogs.c"
 			}
 #line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (not_deleted_videos);
 #line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (not_deleted_photos);
-#line 21544 "Dialogs.c"
+#line 21081 "Dialogs.c"
 		}
 #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (not_deleted_message);
-#line 21548 "Dialogs.c"
+#line 21085 "Dialogs.c"
 	}
 #line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp122_ = progress;
+	_tmp117_ = progress;
 #line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp122_ != NULL) {
-#line 21554 "Dialogs.c"
-		ProgressDialog* _tmp123_ = NULL;
+	if (_tmp117_ != NULL) {
+#line 21091 "Dialogs.c"
+		ProgressDialog* _tmp118_;
 #line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp123_ = progress;
+		_tmp118_ = progress;
 #line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		progress_dialog_close (_tmp123_);
-#line 21560 "Dialogs.c"
+		progress_dialog_close (_tmp118_);
+#line 21097 "Dialogs.c"
 	}
 #line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp124_ = app_window_get_instance ();
+	_tmp119_ = app_window_get_instance ();
 #line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp125_ = _tmp124_;
+	_tmp120_ = _tmp119_;
 #line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_PAGE_WINDOW, PageWindow));
+	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, TYPE_PAGE_WINDOW, PageWindow));
 #line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp125_);
+	_g_object_unref0 (_tmp120_);
 #line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (not_removed_videos);
 #line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -21624,7 +21161,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 	_g_object_unref0 (videos);
 #line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (photos);
-#line 21590 "Dialogs.c"
+#line 21127 "Dialogs.c"
 }
 
 
diff --git a/src/Dimensions.c b/src/Dimensions.c
index 9756ad1..cf3daa1 100644
--- a/src/Dimensions.c
+++ b/src/Dimensions.c
@@ -1,4 +1,4 @@
-/* Dimensions.c generated by valac 0.34.7, the Vala compiler
+/* Dimensions.c generated by valac 0.36.6, the Vala compiler
  * generated from Dimensions.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -159,83 +159,71 @@ gchar* scale_constraint_to_string (ScaleConstraint self) {
 		case SCALE_CONSTRAINT_ORIGINAL:
 #line 161 "Dimensions.c"
 		{
-			const gchar* _tmp0_ = NULL;
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp0_;
 #line 17 "/home/jens/Source/shotwell/src/Dimensions.vala"
-			_tmp0_ = _ ("Original size");
+			_tmp0_ = g_strdup (_ ("Original size"));
 #line 17 "/home/jens/Source/shotwell/src/Dimensions.vala"
-			_tmp1_ = g_strdup (_tmp0_);
-#line 17 "/home/jens/Source/shotwell/src/Dimensions.vala"
-			result = _tmp1_;
+			result = _tmp0_;
 #line 17 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			return result;
-#line 173 "Dimensions.c"
+#line 170 "Dimensions.c"
 		}
 #line 15 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		case SCALE_CONSTRAINT_DIMENSIONS:
-#line 177 "Dimensions.c"
+#line 174 "Dimensions.c"
 		{
-			const gchar* _tmp2_ = NULL;
-			gchar* _tmp3_ = NULL;
-#line 20 "/home/jens/Source/shotwell/src/Dimensions.vala"
-			_tmp2_ = _ ("Width or height");
+			gchar* _tmp1_;
 #line 20 "/home/jens/Source/shotwell/src/Dimensions.vala"
-			_tmp3_ = g_strdup (_tmp2_);
+			_tmp1_ = g_strdup (_ ("Width or height"));
 #line 20 "/home/jens/Source/shotwell/src/Dimensions.vala"
-			result = _tmp3_;
+			result = _tmp1_;
 #line 20 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			return result;
-#line 189 "Dimensions.c"
+#line 183 "Dimensions.c"
 		}
 #line 15 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		case SCALE_CONSTRAINT_WIDTH:
-#line 193 "Dimensions.c"
+#line 187 "Dimensions.c"
 		{
-			const gchar* _tmp4_ = NULL;
-			gchar* _tmp5_ = NULL;
+			gchar* _tmp2_;
 #line 23 "/home/jens/Source/shotwell/src/Dimensions.vala"
-			_tmp4_ = _ ("Width");
+			_tmp2_ = g_strdup (_ ("Width"));
 #line 23 "/home/jens/Source/shotwell/src/Dimensions.vala"
-			_tmp5_ = g_strdup (_tmp4_);
-#line 23 "/home/jens/Source/shotwell/src/Dimensions.vala"
-			result = _tmp5_;
+			result = _tmp2_;
 #line 23 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			return result;
-#line 205 "Dimensions.c"
+#line 196 "Dimensions.c"
 		}
 #line 15 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		case SCALE_CONSTRAINT_HEIGHT:
-#line 209 "Dimensions.c"
+#line 200 "Dimensions.c"
 		{
-			const gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
-#line 26 "/home/jens/Source/shotwell/src/Dimensions.vala"
-			_tmp6_ = _ ("Height");
+			gchar* _tmp3_;
 #line 26 "/home/jens/Source/shotwell/src/Dimensions.vala"
-			_tmp7_ = g_strdup (_tmp6_);
+			_tmp3_ = g_strdup (_ ("Height"));
 #line 26 "/home/jens/Source/shotwell/src/Dimensions.vala"
-			result = _tmp7_;
+			result = _tmp3_;
 #line 26 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			return result;
-#line 221 "Dimensions.c"
+#line 209 "Dimensions.c"
 		}
 #line 15 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		case SCALE_CONSTRAINT_FILL_VIEWPORT:
-#line 225 "Dimensions.c"
+#line 213 "Dimensions.c"
 		{
-			gchar* _tmp8_ = NULL;
+			gchar* _tmp4_;
 #line 30 "/home/jens/Source/shotwell/src/Dimensions.vala"
-			_tmp8_ = g_strdup ("Fill Viewport");
+			_tmp4_ = g_strdup ("Fill Viewport");
 #line 30 "/home/jens/Source/shotwell/src/Dimensions.vala"
-			result = _tmp8_;
+			result = _tmp4_;
 #line 30 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			return result;
-#line 234 "Dimensions.c"
+#line 222 "Dimensions.c"
 		}
 		default:
 #line 15 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		break;
-#line 239 "Dimensions.c"
+#line 227 "Dimensions.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_warn_if_reached ();
@@ -243,7 +231,7 @@ gchar* scale_constraint_to_string (ScaleConstraint self) {
 	result = NULL;
 #line 35 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 247 "Dimensions.c"
+#line 235 "Dimensions.c"
 }
 
 
@@ -261,13 +249,13 @@ GType scale_constraint_get_type (void) {
 
 void dimensions_init (Dimensions *self, gint width, gint height) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	gint _tmp1_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 #line 43 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	memset (self, 0, sizeof (Dimensions));
 #line 44 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -276,21 +264,21 @@ void dimensions_init (Dimensions *self, gint width, gint height) {
 	if (_tmp1_ < 0) {
 #line 44 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = TRUE;
-#line 280 "Dimensions.c"
+#line 268 "Dimensions.c"
 	} else {
-		gint _tmp2_ = 0;
+		gint _tmp2_;
 #line 44 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp2_ = height;
 #line 44 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = _tmp2_ < 0;
-#line 287 "Dimensions.c"
+#line 275 "Dimensions.c"
 	}
 #line 44 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp0_) {
 #line 45 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		g_warning ("Dimensions.vala:45: Tried to construct a Dimensions object with negati" \
 "ve width or height - forcing sensible default values.");
-#line 293 "Dimensions.c"
+#line 281 "Dimensions.c"
 	}
 #line 47 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp3_ = width;
@@ -308,15 +296,15 @@ void dimensions_init (Dimensions *self, gint width, gint height) {
 	_tmp8_ = CLAMP (_tmp6_, 0, _tmp7_);
 #line 48 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	(*self).height = _tmp8_;
-#line 311 "Dimensions.c"
+#line 299 "Dimensions.c"
 }
 
 
 void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result) {
-	GdkPixbuf* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	GdkPixbuf* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	GdkPixbuf* _tmp0_;
+	gint _tmp1_;
+	GdkPixbuf* _tmp2_;
+	gint _tmp3_;
 	Dimensions _tmp4_ = {0};
 #line 51 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
@@ -334,15 +322,15 @@ void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result) {
 	*result = _tmp4_;
 #line 52 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 337 "Dimensions.c"
+#line 325 "Dimensions.c"
 }
 
 
 void dimensions_for_allocation (GtkAllocation* allocation, Dimensions* result) {
-	GtkAllocation _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GtkAllocation _tmp2_ = {0};
-	gint _tmp3_ = 0;
+	GtkAllocation _tmp0_;
+	gint _tmp1_;
+	GtkAllocation _tmp2_;
+	gint _tmp3_;
 	Dimensions _tmp4_ = {0};
 #line 55 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (allocation != NULL);
@@ -360,18 +348,18 @@ void dimensions_for_allocation (GtkAllocation* allocation, Dimensions* result) {
 	*result = _tmp4_;
 #line 56 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 363 "Dimensions.c"
+#line 351 "Dimensions.c"
 }
 
 
 void dimensions_for_widget_allocation (GtkWidget* widget, Dimensions* result) {
 	GtkAllocation allocation = {0};
-	GtkWidget* _tmp0_ = NULL;
+	GtkWidget* _tmp0_;
 	GtkAllocation _tmp1_ = {0};
-	GtkAllocation _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GtkAllocation _tmp4_ = {0};
-	gint _tmp5_ = 0;
+	GtkAllocation _tmp2_;
+	gint _tmp3_;
+	GtkAllocation _tmp4_;
+	gint _tmp5_;
 	Dimensions _tmp6_ = {0};
 #line 59 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -395,15 +383,15 @@ void dimensions_for_widget_allocation (GtkWidget* widget, Dimensions* result) {
 	*result = _tmp6_;
 #line 63 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 398 "Dimensions.c"
+#line 386 "Dimensions.c"
 }
 
 
 void dimensions_for_rectangle (GdkRectangle* rect, Dimensions* result) {
-	GdkRectangle _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
+	GdkRectangle _tmp0_;
+	gint _tmp1_;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
 	Dimensions _tmp4_ = {0};
 #line 66 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (rect != NULL);
@@ -421,47 +409,47 @@ void dimensions_for_rectangle (GdkRectangle* rect, Dimensions* result) {
 	*result = _tmp4_;
 #line 67 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 424 "Dimensions.c"
+#line 412 "Dimensions.c"
 }
 
 
 gboolean dimensions_has_area (Dimensions *self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp1_ = (*self).width;
 #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp1_ > 0) {
-#line 436 "Dimensions.c"
-		gint _tmp2_ = 0;
+#line 424 "Dimensions.c"
+		gint _tmp2_;
 #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp2_ = (*self).height;
 #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = _tmp2_ > 0;
-#line 442 "Dimensions.c"
+#line 430 "Dimensions.c"
 	} else {
 #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = FALSE;
-#line 446 "Dimensions.c"
+#line 434 "Dimensions.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	result = _tmp0_;
 #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 452 "Dimensions.c"
+#line 440 "Dimensions.c"
 }
 
 
 void dimensions_floor (Dimensions *self, Dimensions* min, Dimensions* result) {
 	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	Dimensions _tmp2_ = {0};
-	gint _tmp3_ = 0;
+	gint _tmp1_;
+	Dimensions _tmp2_;
+	gint _tmp3_;
 	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	Dimensions _tmp9_ = {0};
-	gint _tmp10_ = 0;
+	gint _tmp8_;
+	Dimensions _tmp9_;
+	gint _tmp10_;
 	Dimensions _tmp14_ = {0};
 #line 74 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (min != NULL);
@@ -473,23 +461,23 @@ void dimensions_floor (Dimensions *self, Dimensions* min, Dimensions* result) {
 	_tmp3_ = _tmp2_.width;
 #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp1_ > _tmp3_) {
-#line 476 "Dimensions.c"
-		gint _tmp4_ = 0;
+#line 464 "Dimensions.c"
+		gint _tmp4_;
 #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp4_ = (*self).width;
 #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = _tmp4_;
-#line 482 "Dimensions.c"
+#line 470 "Dimensions.c"
 	} else {
-		Dimensions _tmp5_ = {0};
-		gint _tmp6_ = 0;
+		Dimensions _tmp5_;
+		gint _tmp6_;
 #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp5_ = *min;
 #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp6_ = _tmp5_.width;
 #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = _tmp6_;
-#line 492 "Dimensions.c"
+#line 480 "Dimensions.c"
 	}
 #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp8_ = (*self).height;
@@ -499,23 +487,23 @@ void dimensions_floor (Dimensions *self, Dimensions* min, Dimensions* result) {
 	_tmp10_ = _tmp9_.height;
 #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp8_ > _tmp10_) {
-#line 502 "Dimensions.c"
-		gint _tmp11_ = 0;
+#line 490 "Dimensions.c"
+		gint _tmp11_;
 #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp11_ = (*self).height;
 #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp7_ = _tmp11_;
-#line 508 "Dimensions.c"
+#line 496 "Dimensions.c"
 	} else {
-		Dimensions _tmp12_ = {0};
-		gint _tmp13_ = 0;
+		Dimensions _tmp12_;
+		gint _tmp13_;
 #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp12_ = *min;
 #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp13_ = _tmp12_.height;
 #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp7_ = _tmp13_;
-#line 518 "Dimensions.c"
+#line 506 "Dimensions.c"
 	}
 #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	dimensions_init (&_tmp14_, _tmp0_, _tmp7_);
@@ -523,15 +511,15 @@ void dimensions_floor (Dimensions *self, Dimensions* min, Dimensions* result) {
 	*result = _tmp14_;
 #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 526 "Dimensions.c"
+#line 514 "Dimensions.c"
 }
 
 
 gchar* dimensions_to_string (Dimensions *self) {
 	gchar* result = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
+	gint _tmp0_;
+	gint _tmp1_;
+	gchar* _tmp2_;
 #line 80 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = (*self).width;
 #line 80 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -542,16 +530,16 @@ gchar* dimensions_to_string (Dimensions *self) {
 	result = _tmp2_;
 #line 80 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 545 "Dimensions.c"
+#line 533 "Dimensions.c"
 }
 
 
 gboolean dimensions_equals (Dimensions *self, Dimensions* dim) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	Dimensions _tmp2_ = {0};
-	gint _tmp3_ = 0;
+	gint _tmp1_;
+	Dimensions _tmp2_;
+	gint _tmp3_;
 #line 83 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_val_if_fail (dim != NULL, FALSE);
 #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -562,10 +550,10 @@ gboolean dimensions_equals (Dimensions *self, Dimensions* dim) {
 	_tmp3_ = _tmp2_.width;
 #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp1_ == _tmp3_) {
-#line 565 "Dimensions.c"
-		gint _tmp4_ = 0;
-		Dimensions _tmp5_ = {0};
-		gint _tmp6_ = 0;
+#line 553 "Dimensions.c"
+		gint _tmp4_;
+		Dimensions _tmp5_;
+		gint _tmp6_;
 #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp4_ = (*self).height;
 #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -574,28 +562,28 @@ gboolean dimensions_equals (Dimensions *self, Dimensions* dim) {
 		_tmp6_ = _tmp5_.height;
 #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = _tmp4_ == _tmp6_;
-#line 577 "Dimensions.c"
+#line 565 "Dimensions.c"
 	} else {
 #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = FALSE;
-#line 581 "Dimensions.c"
+#line 569 "Dimensions.c"
 	}
 #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	result = _tmp0_;
 #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 587 "Dimensions.c"
+#line 575 "Dimensions.c"
 }
 
 
 gboolean dimensions_approx_equals (Dimensions *self, Dimensions* dim, gint fudge) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	Dimensions _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	gint _tmp1_;
+	Dimensions _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 88 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_val_if_fail (dim != NULL, FALSE);
 #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -610,12 +598,12 @@ gboolean dimensions_approx_equals (Dimensions *self, Dimensions* dim, gint fudge
 	_tmp5_ = fudge;
 #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp4_ <= _tmp5_) {
-#line 613 "Dimensions.c"
-		gint _tmp6_ = 0;
-		Dimensions _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
+#line 601 "Dimensions.c"
+		gint _tmp6_;
+		Dimensions _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
 #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp6_ = (*self).height;
 #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -628,26 +616,26 @@ gboolean dimensions_approx_equals (Dimensions *self, Dimensions* dim, gint fudge
 		_tmp10_ = fudge;
 #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = _tmp9_ <= _tmp10_;
-#line 631 "Dimensions.c"
+#line 619 "Dimensions.c"
 	} else {
 #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = FALSE;
-#line 635 "Dimensions.c"
+#line 623 "Dimensions.c"
 	}
 #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	result = _tmp0_;
 #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 641 "Dimensions.c"
+#line 629 "Dimensions.c"
 }
 
 
 gboolean dimensions_approx_scaled (Dimensions *self, gint scale, gint fudge) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp1_ = (*self).width;
 #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -656,10 +644,10 @@ gboolean dimensions_approx_scaled (Dimensions *self, gint scale, gint fudge) {
 	_tmp3_ = fudge;
 #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp1_ <= (_tmp2_ + _tmp3_)) {
-#line 659 "Dimensions.c"
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+#line 647 "Dimensions.c"
+		gint _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp4_ = (*self).height;
 #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -668,25 +656,25 @@ gboolean dimensions_approx_scaled (Dimensions *self, gint scale, gint fudge) {
 		_tmp6_ = fudge;
 #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = _tmp4_ <= (_tmp5_ + _tmp6_);
-#line 671 "Dimensions.c"
+#line 659 "Dimensions.c"
 	} else {
 #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = FALSE;
-#line 675 "Dimensions.c"
+#line 663 "Dimensions.c"
 	}
 #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	result = _tmp0_;
 #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 681 "Dimensions.c"
+#line 669 "Dimensions.c"
 }
 
 
 gint dimensions_major_axis (Dimensions *self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 97 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = (*self).width;
 #line 97 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -697,15 +685,15 @@ gint dimensions_major_axis (Dimensions *self) {
 	result = _tmp2_;
 #line 97 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 700 "Dimensions.c"
+#line 688 "Dimensions.c"
 }
 
 
 gint dimensions_minor_axis (Dimensions *self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 101 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = (*self).width;
 #line 101 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -716,17 +704,17 @@ gint dimensions_minor_axis (Dimensions *self) {
 	result = _tmp2_;
 #line 101 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 719 "Dimensions.c"
+#line 707 "Dimensions.c"
 }
 
 
 void dimensions_with_min (Dimensions *self, gint min_width, gint min_height, Dimensions* result) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 	Dimensions _tmp6_ = {0};
 #line 105 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = (*self).width;
@@ -746,17 +734,17 @@ void dimensions_with_min (Dimensions *self, gint min_width, gint min_height, Dim
 	*result = _tmp6_;
 #line 105 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 749 "Dimensions.c"
+#line 737 "Dimensions.c"
 }
 
 
 void dimensions_with_max (Dimensions *self, gint max_width, gint max_height, Dimensions* result) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 	Dimensions _tmp6_ = {0};
 #line 109 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = (*self).width;
@@ -776,22 +764,22 @@ void dimensions_with_max (Dimensions *self, gint max_width, gint max_height, Dim
 	*result = _tmp6_;
 #line 109 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 779 "Dimensions.c"
+#line 767 "Dimensions.c"
 }
 
 
 void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dimensions* result) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	gint _tmp3_;
+	gint _tmp4_;
 	gboolean _tmp15_ = FALSE;
-	gboolean _tmp16_ = FALSE;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
+	gboolean _tmp16_;
+	gint _tmp25_;
+	gint _tmp26_;
+	gint _tmp27_;
+	gint _tmp28_;
 #line 113 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = scale;
 #line 113 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -802,60 +790,60 @@ void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dim
 	_tmp4_ = scale;
 #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp3_ == _tmp4_) {
-#line 805 "Dimensions.c"
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+#line 793 "Dimensions.c"
+		gint _tmp5_;
+		gint _tmp6_;
 #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp5_ = (*self).height;
 #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp6_ = scale;
 #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp2_ = _tmp5_ < _tmp6_;
-#line 814 "Dimensions.c"
+#line 802 "Dimensions.c"
 	} else {
 #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp2_ = FALSE;
-#line 818 "Dimensions.c"
+#line 806 "Dimensions.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp2_) {
 #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp1_ = TRUE;
-#line 824 "Dimensions.c"
+#line 812 "Dimensions.c"
 	} else {
 		gboolean _tmp7_ = FALSE;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
+		gint _tmp8_;
+		gint _tmp9_;
 #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp8_ = (*self).height;
 #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp9_ = scale;
 #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		if (_tmp8_ == _tmp9_) {
-#line 835 "Dimensions.c"
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
+#line 823 "Dimensions.c"
+			gint _tmp10_;
+			gint _tmp11_;
 #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp10_ = (*self).width;
 #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp11_ = scale;
 #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp7_ = _tmp10_ < _tmp11_;
-#line 844 "Dimensions.c"
+#line 832 "Dimensions.c"
 		} else {
 #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp7_ = FALSE;
-#line 848 "Dimensions.c"
+#line 836 "Dimensions.c"
 		}
 #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp1_ = _tmp7_;
-#line 852 "Dimensions.c"
+#line 840 "Dimensions.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp1_) {
-#line 856 "Dimensions.c"
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
+#line 844 "Dimensions.c"
+		gint _tmp12_;
+		gint _tmp13_;
 		Dimensions _tmp14_ = {0};
 #line 117 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp12_ = (*self).width;
@@ -867,50 +855,50 @@ void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dim
 		*result = _tmp14_;
 #line 117 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return;
-#line 870 "Dimensions.c"
+#line 858 "Dimensions.c"
 	}
 #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp16_ = scale_up;
 #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (!_tmp16_) {
-#line 876 "Dimensions.c"
+#line 864 "Dimensions.c"
 		gboolean _tmp17_ = FALSE;
-		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
+		gint _tmp18_;
+		gint _tmp19_;
 #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp18_ = (*self).width;
 #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp19_ = scale;
 #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		if (_tmp18_ < _tmp19_) {
-#line 886 "Dimensions.c"
-			gint _tmp20_ = 0;
-			gint _tmp21_ = 0;
+#line 874 "Dimensions.c"
+			gint _tmp20_;
+			gint _tmp21_;
 #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp20_ = (*self).height;
 #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp21_ = scale;
 #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp17_ = _tmp20_ < _tmp21_;
-#line 895 "Dimensions.c"
+#line 883 "Dimensions.c"
 		} else {
 #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp17_ = FALSE;
-#line 899 "Dimensions.c"
+#line 887 "Dimensions.c"
 		}
 #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp15_ = _tmp17_;
-#line 903 "Dimensions.c"
+#line 891 "Dimensions.c"
 	} else {
 #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp15_ = FALSE;
-#line 907 "Dimensions.c"
+#line 895 "Dimensions.c"
 	}
 #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp15_) {
-#line 911 "Dimensions.c"
-		gint _tmp22_ = 0;
-		gint _tmp23_ = 0;
+#line 899 "Dimensions.c"
+		gint _tmp22_;
+		gint _tmp23_;
 		Dimensions _tmp24_ = {0};
 #line 121 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp22_ = (*self).width;
@@ -922,7 +910,7 @@ void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dim
 		*result = _tmp24_;
 #line 121 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return;
-#line 925 "Dimensions.c"
+#line 913 "Dimensions.c"
 	}
 #line 123 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp25_ = (*self).width;
@@ -934,8 +922,8 @@ void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dim
 	_tmp28_ = scale;
 #line 123 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if ((_tmp25_ - _tmp26_) > (_tmp27_ - _tmp28_)) {
-#line 937 "Dimensions.c"
-		gint _tmp29_ = 0;
+#line 925 "Dimensions.c"
+		gint _tmp29_;
 		Dimensions _tmp30_ = {0};
 #line 124 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp29_ = scale;
@@ -945,9 +933,9 @@ void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dim
 		*result = _tmp30_;
 #line 124 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return;
-#line 948 "Dimensions.c"
+#line 936 "Dimensions.c"
 	} else {
-		gint _tmp31_ = 0;
+		gint _tmp31_;
 		Dimensions _tmp32_ = {0};
 #line 126 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp31_ = scale;
@@ -957,7 +945,7 @@ void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dim
 		*result = _tmp32_;
 #line 126 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return;
-#line 960 "Dimensions.c"
+#line 948 "Dimensions.c"
 	}
 }
 
@@ -965,12 +953,12 @@ void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dim
 void dimensions_get_scale_ratios (Dimensions *self, Dimensions* scaled, gdouble* width_ratio, gdouble* height_ratio) {
 	gdouble _vala_width_ratio = 0.0;
 	gdouble _vala_height_ratio = 0.0;
-	Dimensions _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	Dimensions _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	Dimensions _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	Dimensions _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 129 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (scaled != NULL);
 #line 130 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -993,21 +981,21 @@ void dimensions_get_scale_ratios (Dimensions *self, Dimensions* scaled, gdouble*
 	if (width_ratio) {
 #line 129 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		*width_ratio = _vala_width_ratio;
-#line 996 "Dimensions.c"
+#line 984 "Dimensions.c"
 	}
 #line 129 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (height_ratio) {
 #line 129 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		*height_ratio = _vala_height_ratio;
-#line 1002 "Dimensions.c"
+#line 990 "Dimensions.c"
 	}
 }
 
 
 gdouble dimensions_get_aspect_ratio (Dimensions *self) {
 	gdouble result = 0.0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 135 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = (*self).width;
 #line 135 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -1016,36 +1004,36 @@ gdouble dimensions_get_aspect_ratio (Dimensions *self) {
 	result = ((gdouble) _tmp0_) / _tmp1_;
 #line 135 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 1019 "Dimensions.c"
+#line 1007 "Dimensions.c"
 }
 
 
 void dimensions_get_scaled_proportional (Dimensions *self, Dimensions* viewport, Dimensions* result) {
 	gdouble width_ratio = 0.0;
 	gdouble height_ratio = 0.0;
-	Dimensions _tmp0_ = {0};
+	Dimensions _tmp0_;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
 	gdouble scaled_width = 0.0;
 	gdouble scaled_height = 0.0;
-	gdouble _tmp3_ = 0.0;
-	gdouble _tmp4_ = 0.0;
+	gdouble _tmp3_;
+	gdouble _tmp4_;
 	Dimensions scaled = {0};
-	gdouble _tmp13_ = 0.0;
-	gdouble _tmp14_ = 0.0;
-	gdouble _tmp15_ = 0.0;
-	gdouble _tmp16_ = 0.0;
+	gdouble _tmp13_;
+	gdouble _tmp14_;
+	gdouble _tmp15_;
+	gdouble _tmp16_;
 	Dimensions _tmp17_ = {0};
 	Dimensions _tmp18_ = {0};
 	Dimensions _tmp19_ = {0};
-	Dimensions _tmp20_ = {0};
-	gint _tmp21_ = 0;
-	Dimensions _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	Dimensions _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	Dimensions _tmp26_ = {0};
-	gint _tmp27_ = 0;
+	Dimensions _tmp20_;
+	gint _tmp21_;
+	Dimensions _tmp22_;
+	gint _tmp23_;
+	Dimensions _tmp24_;
+	gint _tmp25_;
+	Dimensions _tmp26_;
+	gint _tmp27_;
 #line 138 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (viewport != NULL);
 #line 140 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -1062,11 +1050,11 @@ void dimensions_get_scaled_proportional (Dimensions *self, Dimensions* viewport,
 	_tmp4_ = height_ratio;
 #line 143 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp3_ < _tmp4_) {
-#line 1065 "Dimensions.c"
-		Dimensions _tmp5_ = {0};
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-		gdouble _tmp8_ = 0.0;
+#line 1053 "Dimensions.c"
+		Dimensions _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
+		gdouble _tmp8_;
 #line 144 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp5_ = *viewport;
 #line 144 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -1079,12 +1067,12 @@ void dimensions_get_scaled_proportional (Dimensions *self, Dimensions* viewport,
 		_tmp8_ = width_ratio;
 #line 145 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		scaled_height = ((gdouble) _tmp7_) * _tmp8_;
-#line 1082 "Dimensions.c"
+#line 1070 "Dimensions.c"
 	} else {
-		gint _tmp9_ = 0;
-		gdouble _tmp10_ = 0.0;
-		Dimensions _tmp11_ = {0};
-		gint _tmp12_ = 0;
+		gint _tmp9_;
+		gdouble _tmp10_;
+		Dimensions _tmp11_;
+		gint _tmp12_;
 #line 147 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp9_ = (*self).width;
 #line 147 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -1097,7 +1085,7 @@ void dimensions_get_scaled_proportional (Dimensions *self, Dimensions* viewport,
 		_tmp12_ = _tmp11_.height;
 #line 148 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		scaled_height = (gdouble) _tmp12_;
-#line 1100 "Dimensions.c"
+#line 1088 "Dimensions.c"
 	}
 #line 151 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp13_ = scaled_width;
@@ -1139,26 +1127,26 @@ void dimensions_get_scaled_proportional (Dimensions *self, Dimensions* viewport,
 	*result = scaled;
 #line 156 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 1142 "Dimensions.c"
+#line 1130 "Dimensions.c"
 }
 
 
 void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewport, Dimensions* result) {
 	gdouble width_ratio = 0.0;
 	gdouble height_ratio = 0.0;
-	Dimensions _tmp0_ = {0};
+	Dimensions _tmp0_;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
 	gdouble scaled_width = 0.0;
 	gdouble scaled_height = 0.0;
 	gboolean _tmp3_ = FALSE;
-	gint _tmp4_ = 0;
-	Dimensions _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	gdouble _tmp32_ = 0.0;
-	gdouble _tmp33_ = 0.0;
-	gdouble _tmp34_ = 0.0;
-	gdouble _tmp35_ = 0.0;
+	gint _tmp4_;
+	Dimensions _tmp5_;
+	gint _tmp6_;
+	gdouble _tmp32_;
+	gdouble _tmp33_;
+	gdouble _tmp34_;
+	gdouble _tmp35_;
 	Dimensions _tmp36_ = {0};
 	Dimensions _tmp37_ = {0};
 	Dimensions _tmp38_ = {0};
@@ -1180,10 +1168,10 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp
 	_tmp6_ = _tmp5_.width;
 #line 164 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp4_ < _tmp6_) {
-#line 1183 "Dimensions.c"
-		gint _tmp7_ = 0;
-		Dimensions _tmp8_ = {0};
-		gint _tmp9_ = 0;
+#line 1171 "Dimensions.c"
+		gint _tmp7_;
+		Dimensions _tmp8_;
+		gint _tmp9_;
 #line 164 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp7_ = (*self).height;
 #line 164 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -1192,19 +1180,19 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp
 		_tmp9_ = _tmp8_.height;
 #line 164 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp3_ = _tmp7_ >= _tmp9_;
-#line 1195 "Dimensions.c"
+#line 1183 "Dimensions.c"
 	} else {
 #line 164 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp3_ = FALSE;
-#line 1199 "Dimensions.c"
+#line 1187 "Dimensions.c"
 	}
 #line 164 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp3_) {
-#line 1203 "Dimensions.c"
-		Dimensions _tmp10_ = {0};
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
-		gdouble _tmp13_ = 0.0;
+#line 1191 "Dimensions.c"
+		Dimensions _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
+		gdouble _tmp13_;
 #line 166 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp10_ = *viewport;
 #line 166 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -1217,12 +1205,12 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp
 		_tmp13_ = width_ratio;
 #line 167 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		scaled_height = ((gdouble) _tmp12_) * _tmp13_;
-#line 1220 "Dimensions.c"
+#line 1208 "Dimensions.c"
 	} else {
 		gboolean _tmp14_ = FALSE;
-		gint _tmp15_ = 0;
-		Dimensions _tmp16_ = {0};
-		gint _tmp17_ = 0;
+		gint _tmp15_;
+		Dimensions _tmp16_;
+		gint _tmp17_;
 #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp15_ = (*self).width;
 #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -1231,10 +1219,10 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp
 		_tmp17_ = _tmp16_.width;
 #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		if (_tmp15_ >= _tmp17_) {
-#line 1234 "Dimensions.c"
-			gint _tmp18_ = 0;
-			Dimensions _tmp19_ = {0};
-			gint _tmp20_ = 0;
+#line 1222 "Dimensions.c"
+			gint _tmp18_;
+			Dimensions _tmp19_;
+			gint _tmp20_;
 #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp18_ = (*self).height;
 #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -1243,19 +1231,19 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp
 			_tmp20_ = _tmp19_.height;
 #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp14_ = _tmp18_ < _tmp20_;
-#line 1246 "Dimensions.c"
+#line 1234 "Dimensions.c"
 		} else {
 #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp14_ = FALSE;
-#line 1250 "Dimensions.c"
+#line 1238 "Dimensions.c"
 		}
 #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		if (_tmp14_) {
-#line 1254 "Dimensions.c"
-			gint _tmp21_ = 0;
-			gdouble _tmp22_ = 0.0;
-			Dimensions _tmp23_ = {0};
-			gint _tmp24_ = 0;
+#line 1242 "Dimensions.c"
+			gint _tmp21_;
+			gdouble _tmp22_;
+			Dimensions _tmp23_;
+			gint _tmp24_;
 #line 170 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp21_ = (*self).width;
 #line 170 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -1268,16 +1256,16 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp
 			_tmp24_ = _tmp23_.height;
 #line 171 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			scaled_height = (gdouble) _tmp24_;
-#line 1271 "Dimensions.c"
+#line 1259 "Dimensions.c"
 		} else {
 			gdouble ratio = 0.0;
-			gdouble _tmp25_ = 0.0;
-			gdouble _tmp26_ = 0.0;
-			gdouble _tmp27_ = 0.0;
-			gint _tmp28_ = 0;
-			gdouble _tmp29_ = 0.0;
-			gint _tmp30_ = 0;
-			gdouble _tmp31_ = 0.0;
+			gdouble _tmp25_;
+			gdouble _tmp26_;
+			gdouble _tmp27_;
+			gint _tmp28_;
+			gdouble _tmp29_;
+			gint _tmp30_;
+			gdouble _tmp31_;
 #line 174 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp25_ = width_ratio;
 #line 174 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -1298,7 +1286,7 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp
 			_tmp31_ = ratio;
 #line 177 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			scaled_height = ((gdouble) _tmp30_) * _tmp31_;
-#line 1301 "Dimensions.c"
+#line 1289 "Dimensions.c"
 		}
 	}
 #line 180 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -1319,37 +1307,37 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp
 	*result = _tmp38_;
 #line 180 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 1322 "Dimensions.c"
+#line 1310 "Dimensions.c"
 }
 
 
 void dimensions_get_scaled_rectangle (Dimensions *self, Dimensions* scaled, GdkRectangle* rect, GdkRectangle* result) {
 	gdouble x_scale = 0.0;
 	gdouble y_scale = 0.0;
-	Dimensions _tmp0_ = {0};
+	Dimensions _tmp0_;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
 	GdkRectangle scaled_rect = {0};
-	GdkRectangle _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
-	GdkRectangle _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	gdouble _tmp9_ = 0.0;
-	gdouble _tmp10_ = 0.0;
-	GdkRectangle _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	gdouble _tmp13_ = 0.0;
-	gdouble _tmp14_ = 0.0;
-	GdkRectangle _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	gdouble _tmp17_ = 0.0;
-	gdouble _tmp18_ = 0.0;
-	GdkRectangle _tmp19_ = {0};
-	gint _tmp20_ = 0;
-	GdkRectangle _tmp21_ = {0};
-	gint _tmp22_ = 0;
+	GdkRectangle _tmp3_;
+	gint _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
+	GdkRectangle _tmp7_;
+	gint _tmp8_;
+	gdouble _tmp9_;
+	gdouble _tmp10_;
+	GdkRectangle _tmp11_;
+	gint _tmp12_;
+	gdouble _tmp13_;
+	gdouble _tmp14_;
+	GdkRectangle _tmp15_;
+	gint _tmp16_;
+	gdouble _tmp17_;
+	gdouble _tmp18_;
+	GdkRectangle _tmp19_;
+	gint _tmp20_;
+	GdkRectangle _tmp21_;
+	gint _tmp22_;
 #line 183 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (scaled != NULL);
 #line 183 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -1412,7 +1400,7 @@ void dimensions_get_scaled_rectangle (Dimensions *self, Dimensions* scaled, GdkR
 	if (_tmp20_ <= 0) {
 #line 194 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		scaled_rect.width = 1;
-#line 1415 "Dimensions.c"
+#line 1403 "Dimensions.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp21_ = scaled_rect;
@@ -1422,28 +1410,28 @@ void dimensions_get_scaled_rectangle (Dimensions *self, Dimensions* scaled, GdkR
 	if (_tmp22_ <= 0) {
 #line 197 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		scaled_rect.height = 1;
-#line 1425 "Dimensions.c"
+#line 1413 "Dimensions.c"
 	}
 #line 199 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	*result = scaled_rect;
 #line 199 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 1431 "Dimensions.c"
+#line 1419 "Dimensions.c"
 }
 
 
 void dimensions_get_scaled_similar (Dimensions *self, Dimensions* original, Dimensions* scaled, Dimensions* result) {
 	gdouble x_scale = 0.0;
 	gdouble y_scale = 0.0;
-	Dimensions _tmp0_ = {0};
+	Dimensions _tmp0_;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
 	gdouble scale = 0.0;
-	gdouble _tmp3_ = 0.0;
-	gint _tmp4_ = 0;
-	gdouble _tmp5_ = 0.0;
-	gint _tmp6_ = 0;
-	gdouble _tmp7_ = 0.0;
+	gdouble _tmp3_;
+	gint _tmp4_;
+	gdouble _tmp5_;
+	gint _tmp6_;
+	gdouble _tmp7_;
 	Dimensions _tmp8_ = {0};
 	Dimensions _tmp9_ = {0};
 	Dimensions _tmp10_ = {0};
@@ -1481,18 +1469,18 @@ void dimensions_get_scaled_similar (Dimensions *self, Dimensions* original, Dime
 	*result = _tmp10_;
 #line 209 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 1484 "Dimensions.c"
+#line 1472 "Dimensions.c"
 }
 
 
 void dimensions_get_scaled_by_width (Dimensions *self, gint scale, Dimensions* result) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gdouble ratio = 0.0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gdouble _tmp5_ = 0.0;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gdouble _tmp5_;
 	Dimensions _tmp6_ = {0};
 	Dimensions _tmp7_ = {0};
 	Dimensions _tmp8_ = {0};
@@ -1522,18 +1510,18 @@ void dimensions_get_scaled_by_width (Dimensions *self, gint scale, Dimensions* r
 	*result = _tmp8_;
 #line 218 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 1525 "Dimensions.c"
+#line 1513 "Dimensions.c"
 }
 
 
 void dimensions_get_scaled_by_height (Dimensions *self, gint scale, Dimensions* result) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gdouble ratio = 0.0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gdouble _tmp4_ = 0.0;
-	gint _tmp5_ = 0;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gdouble _tmp4_;
+	gint _tmp5_;
 	Dimensions _tmp6_ = {0};
 	Dimensions _tmp7_ = {0};
 	Dimensions _tmp8_ = {0};
@@ -1563,22 +1551,22 @@ void dimensions_get_scaled_by_height (Dimensions *self, gint scale, Dimensions*
 	*result = _tmp8_;
 #line 226 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 1566 "Dimensions.c"
+#line 1554 "Dimensions.c"
 }
 
 
 void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleConstraint constraint, Dimensions* result) {
-	ScaleConstraint _tmp0_ = 0;
+	ScaleConstraint _tmp0_;
 #line 230 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = constraint;
 #line 230 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	switch (_tmp0_) {
 #line 230 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		case SCALE_CONSTRAINT_ORIGINAL:
-#line 1578 "Dimensions.c"
+#line 1566 "Dimensions.c"
 		{
-			gint _tmp1_ = 0;
-			gint _tmp2_ = 0;
+			gint _tmp1_;
+			gint _tmp2_;
 			Dimensions _tmp3_ = {0};
 #line 232 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp1_ = (*self).width;
@@ -1590,23 +1578,23 @@ void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleCon
 			*result = _tmp3_;
 #line 232 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			return;
-#line 1593 "Dimensions.c"
+#line 1581 "Dimensions.c"
 		}
 #line 230 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		case SCALE_CONSTRAINT_DIMENSIONS:
-#line 1597 "Dimensions.c"
+#line 1585 "Dimensions.c"
 		{
 			Dimensions _tmp4_ = {0};
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
+			gint _tmp5_;
+			gint _tmp6_;
 #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp5_ = (*self).width;
 #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp6_ = (*self).height;
 #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			if (_tmp5_ >= _tmp6_) {
-#line 1608 "Dimensions.c"
-				gint _tmp7_ = 0;
+#line 1596 "Dimensions.c"
+				gint _tmp7_;
 				Dimensions _tmp8_ = {0};
 #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_tmp7_ = scale;
@@ -1614,9 +1602,9 @@ void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleCon
 				dimensions_get_scaled_by_width (&(*self), _tmp7_, &_tmp8_);
 #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_tmp4_ = _tmp8_;
-#line 1617 "Dimensions.c"
+#line 1605 "Dimensions.c"
 			} else {
-				gint _tmp9_ = 0;
+				gint _tmp9_;
 				Dimensions _tmp10_ = {0};
 #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_tmp9_ = scale;
@@ -1624,19 +1612,19 @@ void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleCon
 				dimensions_get_scaled_by_height (&(*self), _tmp9_, &_tmp10_);
 #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_tmp4_ = _tmp10_;
-#line 1627 "Dimensions.c"
+#line 1615 "Dimensions.c"
 			}
 #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			*result = _tmp4_;
 #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			return;
-#line 1633 "Dimensions.c"
+#line 1621 "Dimensions.c"
 		}
 #line 230 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		case SCALE_CONSTRAINT_WIDTH:
-#line 1637 "Dimensions.c"
+#line 1625 "Dimensions.c"
 		{
-			gint _tmp11_ = 0;
+			gint _tmp11_;
 			Dimensions _tmp12_ = {0};
 #line 238 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp11_ = scale;
@@ -1646,13 +1634,13 @@ void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleCon
 			*result = _tmp12_;
 #line 238 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			return;
-#line 1649 "Dimensions.c"
+#line 1637 "Dimensions.c"
 		}
 #line 230 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		case SCALE_CONSTRAINT_HEIGHT:
-#line 1653 "Dimensions.c"
+#line 1641 "Dimensions.c"
 		{
-			gint _tmp13_ = 0;
+			gint _tmp13_;
 			Dimensions _tmp14_ = {0};
 #line 241 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp13_ = scale;
@@ -1662,16 +1650,16 @@ void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleCon
 			*result = _tmp14_;
 #line 241 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			return;
-#line 1665 "Dimensions.c"
+#line 1653 "Dimensions.c"
 		}
 		default:
 		{
-			ScaleConstraint _tmp15_ = 0;
+			ScaleConstraint _tmp15_;
 #line 244 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp15_ = constraint;
 #line 244 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			g_error ("Dimensions.vala:244: Bad constraint: %d", (gint) _tmp15_);
-#line 1674 "Dimensions.c"
+#line 1662 "Dimensions.c"
 		}
 	}
 }
@@ -1685,14 +1673,14 @@ Dimensions* dimensions_dup (const Dimensions* self) {
 	memcpy (dup, self, sizeof (Dimensions));
 #line 39 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return dup;
-#line 1688 "Dimensions.c"
+#line 1676 "Dimensions.c"
 }
 
 
 void dimensions_free (Dimensions* self) {
 #line 39 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_free (self);
-#line 1695 "Dimensions.c"
+#line 1683 "Dimensions.c"
 }
 
 
@@ -1708,10 +1696,10 @@ GType dimensions_get_type (void) {
 
 
 static void scaling_init (Scaling *self, ScaleConstraint constraint, gint scale, Dimensions* viewport, gboolean scale_up) {
-	ScaleConstraint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	Dimensions _tmp2_ = {0};
-	gboolean _tmp3_ = FALSE;
+	ScaleConstraint _tmp0_;
+	gint _tmp1_;
+	Dimensions _tmp2_;
+	gboolean _tmp3_;
 #line 257 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (viewport != NULL);
 #line 257 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -1732,7 +1720,7 @@ static void scaling_init (Scaling *self, ScaleConstraint constraint, gint scale,
 	_tmp3_ = scale_up;
 #line 261 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	(*self).scale_up = _tmp3_;
-#line 1735 "Dimensions.c"
+#line 1723 "Dimensions.c"
 }
 
 
@@ -1747,14 +1735,14 @@ void scaling_for_original (Scaling* result) {
 	*result = _tmp1_;
 #line 265 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 1750 "Dimensions.c"
+#line 1738 "Dimensions.c"
 }
 
 
 void scaling_for_screen (GtkWindow* window, gboolean scale_up, Scaling* result) {
-	GtkWindow* _tmp0_ = NULL;
+	GtkWindow* _tmp0_;
 	Dimensions _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp2_;
 	Scaling _tmp3_ = {0};
 #line 268 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (GTK_IS_WINDOW (window));
@@ -1770,15 +1758,15 @@ void scaling_for_screen (GtkWindow* window, gboolean scale_up, Scaling* result)
 	*result = _tmp3_;
 #line 269 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 1773 "Dimensions.c"
+#line 1761 "Dimensions.c"
 }
 
 
 void scaling_for_best_fit (gint pixels, gboolean scale_up, Scaling* result) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	Dimensions _tmp2_ = {0};
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp3_;
 	Scaling _tmp4_ = {0};
 #line 273 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = pixels;
@@ -1796,14 +1784,14 @@ void scaling_for_best_fit (gint pixels, gboolean scale_up, Scaling* result) {
 	*result = _tmp4_;
 #line 275 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 1799 "Dimensions.c"
+#line 1787 "Dimensions.c"
 }
 
 
 void scaling_for_viewport (Dimensions* viewport, gboolean scale_up, Scaling* result) {
-	gboolean _tmp0_ = FALSE;
-	Dimensions _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp0_;
+	Dimensions _tmp1_;
+	gboolean _tmp2_;
 	Scaling _tmp3_ = {0};
 #line 278 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (viewport != NULL);
@@ -1821,19 +1809,19 @@ void scaling_for_viewport (Dimensions* viewport, gboolean scale_up, Scaling* res
 	*result = _tmp3_;
 #line 281 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 1824 "Dimensions.c"
+#line 1812 "Dimensions.c"
 }
 
 
 void scaling_for_widget (GtkWidget* widget, gboolean scale_up, Scaling* result) {
 	Dimensions viewport = {0};
-	GtkWidget* _tmp0_ = NULL;
+	GtkWidget* _tmp0_;
 	Dimensions _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-	Dimensions _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	Dimensions _tmp8_ = {0};
-	gboolean _tmp9_ = FALSE;
+	Dimensions _tmp3_;
+	gint _tmp4_;
+	Dimensions _tmp8_;
+	gboolean _tmp9_;
 	Scaling _tmp10_ = {0};
 #line 284 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -1851,21 +1839,21 @@ void scaling_for_widget (GtkWidget* widget, gboolean scale_up, Scaling* result)
 	if (_tmp4_ <= 1) {
 #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp2_ = TRUE;
-#line 1854 "Dimensions.c"
+#line 1842 "Dimensions.c"
 	} else {
-		Dimensions _tmp5_ = {0};
-		gint _tmp6_ = 0;
+		Dimensions _tmp5_;
+		gint _tmp6_;
 #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp5_ = viewport;
 #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp6_ = _tmp5_.height;
 #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp2_ = _tmp6_ <= 1;
-#line 1864 "Dimensions.c"
+#line 1852 "Dimensions.c"
 	}
 #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp2_) {
-#line 1868 "Dimensions.c"
+#line 1856 "Dimensions.c"
 		Scaling _tmp7_ = {0};
 #line 296 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		scaling_for_original (&_tmp7_);
@@ -1873,7 +1861,7 @@ void scaling_for_widget (GtkWidget* widget, gboolean scale_up, Scaling* result)
 		*result = _tmp7_;
 #line 296 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return;
-#line 1876 "Dimensions.c"
+#line 1864 "Dimensions.c"
 	}
 #line 298 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp8_ = viewport;
@@ -1885,15 +1873,15 @@ void scaling_for_widget (GtkWidget* widget, gboolean scale_up, Scaling* result)
 	*result = _tmp10_;
 #line 298 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 1888 "Dimensions.c"
+#line 1876 "Dimensions.c"
 }
 
 
 void scaling_to_fill_viewport (Dimensions* viewport, Scaling* result) {
 	gboolean _tmp0_ = FALSE;
-	Dimensions _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	Dimensions _tmp6_ = {0};
+	Dimensions _tmp1_;
+	gint _tmp2_;
+	Dimensions _tmp6_;
 	Scaling _tmp7_ = {0};
 #line 301 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (viewport != NULL);
@@ -1905,21 +1893,21 @@ void scaling_to_fill_viewport (Dimensions* viewport, Scaling* result) {
 	if (_tmp2_ <= 1) {
 #line 304 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = TRUE;
-#line 1908 "Dimensions.c"
+#line 1896 "Dimensions.c"
 	} else {
-		Dimensions _tmp3_ = {0};
-		gint _tmp4_ = 0;
+		Dimensions _tmp3_;
+		gint _tmp4_;
 #line 304 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp3_ = *viewport;
 #line 304 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp4_ = _tmp3_.height;
 #line 304 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = _tmp4_ <= 1;
-#line 1918 "Dimensions.c"
+#line 1906 "Dimensions.c"
 	}
 #line 304 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp0_) {
-#line 1922 "Dimensions.c"
+#line 1910 "Dimensions.c"
 		Scaling _tmp5_ = {0};
 #line 305 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		scaling_for_original (&_tmp5_);
@@ -1927,7 +1915,7 @@ void scaling_to_fill_viewport (Dimensions* viewport, Scaling* result) {
 		*result = _tmp5_;
 #line 305 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return;
-#line 1930 "Dimensions.c"
+#line 1918 "Dimensions.c"
 	}
 #line 307 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp6_ = *viewport;
@@ -1937,12 +1925,12 @@ void scaling_to_fill_viewport (Dimensions* viewport, Scaling* result) {
 	*result = _tmp7_;
 #line 307 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 1940 "Dimensions.c"
+#line 1928 "Dimensions.c"
 }
 
 
 void scaling_to_fill_screen (GtkWindow* window, Scaling* result) {
-	GtkWindow* _tmp0_ = NULL;
+	GtkWindow* _tmp0_;
 	Dimensions _tmp1_ = {0};
 	Scaling _tmp2_ = {0};
 #line 310 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -1957,15 +1945,15 @@ void scaling_to_fill_screen (GtkWindow* window, Scaling* result) {
 	*result = _tmp2_;
 #line 311 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 1960 "Dimensions.c"
+#line 1948 "Dimensions.c"
 }
 
 
 void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean scale_up, Scaling* result) {
-	ScaleConstraint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	ScaleConstraint _tmp0_;
+	gint _tmp1_;
 	Dimensions _tmp2_ = {0};
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp3_;
 	Scaling _tmp4_ = {0};
 #line 315 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = constraint;
@@ -1981,24 +1969,24 @@ void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean sc
 	*result = _tmp4_;
 #line 315 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 1984 "Dimensions.c"
+#line 1972 "Dimensions.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 319 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1991 "Dimensions.c"
+#line 1979 "Dimensions.c"
 }
 
 
 static void scaling_get_screen_dimensions (GtkWindow* window, Dimensions* result) {
 	GdkScreen* screen = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	GdkScreen* _tmp1_ = NULL;
-	GdkScreen* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	GtkWindow* _tmp0_;
+	GdkScreen* _tmp1_;
+	GdkScreen* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	Dimensions _tmp5_ = {0};
 #line 318 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (GTK_IS_WINDOW (window));
@@ -2022,56 +2010,56 @@ static void scaling_get_screen_dimensions (GtkWindow* window, Dimensions* result
 	_g_object_unref0 (screen);
 #line 321 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 2025 "Dimensions.c"
+#line 2013 "Dimensions.c"
 }
 
 
 static gint scaling_scale_to_pixels (Scaling *self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp1_ = (*self).scale;
 #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp1_ >= 0) {
-#line 2037 "Dimensions.c"
-		gint _tmp2_ = 0;
+#line 2025 "Dimensions.c"
+		gint _tmp2_;
 #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp2_ = (*self).scale;
 #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = _tmp2_;
-#line 2043 "Dimensions.c"
+#line 2031 "Dimensions.c"
 	} else {
 #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = 0;
-#line 2047 "Dimensions.c"
+#line 2035 "Dimensions.c"
 	}
 #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	result = _tmp0_;
 #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 2053 "Dimensions.c"
+#line 2041 "Dimensions.c"
 }
 
 
 gboolean scaling_is_unscaled (Scaling *self) {
 	gboolean result = FALSE;
-	ScaleConstraint _tmp0_ = 0;
+	ScaleConstraint _tmp0_;
 #line 329 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = (*self).constraint;
 #line 329 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	result = _tmp0_ == SCALE_CONSTRAINT_ORIGINAL;
 #line 329 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 2066 "Dimensions.c"
+#line 2054 "Dimensions.c"
 }
 
 
 gboolean scaling_is_best_fit (Scaling *self, Dimensions* original, gint* pixels) {
 	gint _vala_pixels = 0;
 	gboolean result = FALSE;
-	gint _tmp0_ = 0;
-	ScaleConstraint _tmp1_ = 0;
+	gint _tmp0_;
+	ScaleConstraint _tmp1_;
 #line 332 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_val_if_fail (original != NULL, FALSE);
 #line 333 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -2086,11 +2074,11 @@ gboolean scaling_is_best_fit (Scaling *self, Dimensions* original, gint* pixels)
 		if (pixels) {
 #line 336 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			*pixels = _vala_pixels;
-#line 2089 "Dimensions.c"
+#line 2077 "Dimensions.c"
 		}
 #line 336 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return result;
-#line 2093 "Dimensions.c"
+#line 2081 "Dimensions.c"
 	}
 #line 338 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp1_ = (*self).constraint;
@@ -2100,7 +2088,7 @@ gboolean scaling_is_best_fit (Scaling *self, Dimensions* original, gint* pixels)
 		case SCALE_CONSTRAINT_ORIGINAL:
 #line 338 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		case SCALE_CONSTRAINT_FILL_VIEWPORT:
-#line 2103 "Dimensions.c"
+#line 2091 "Dimensions.c"
 		{
 #line 341 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			result = FALSE;
@@ -2108,16 +2096,16 @@ gboolean scaling_is_best_fit (Scaling *self, Dimensions* original, gint* pixels)
 			if (pixels) {
 #line 341 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				*pixels = _vala_pixels;
-#line 2111 "Dimensions.c"
+#line 2099 "Dimensions.c"
 			}
 #line 341 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			return result;
-#line 2115 "Dimensions.c"
+#line 2103 "Dimensions.c"
 		}
 		default:
 		{
-			gint _tmp2_ = 0;
-			gint _tmp3_ = 0;
+			gint _tmp2_;
+			gint _tmp3_;
 #line 344 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp2_ = scaling_scale_to_pixels (&(*self));
 #line 344 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -2132,18 +2120,18 @@ gboolean scaling_is_best_fit (Scaling *self, Dimensions* original, gint* pixels)
 			if (pixels) {
 #line 347 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				*pixels = _vala_pixels;
-#line 2135 "Dimensions.c"
+#line 2123 "Dimensions.c"
 			}
 #line 347 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			return result;
-#line 2139 "Dimensions.c"
+#line 2127 "Dimensions.c"
 		}
 	}
 #line 332 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (pixels) {
 #line 332 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		*pixels = _vala_pixels;
-#line 2146 "Dimensions.c"
+#line 2134 "Dimensions.c"
 	}
 }
 
@@ -2151,8 +2139,8 @@ gboolean scaling_is_best_fit (Scaling *self, Dimensions* original, gint* pixels)
 gboolean scaling_is_best_fit_dimensions (Scaling *self, Dimensions* original, Dimensions* scaled) {
 	Dimensions _vala_scaled = {0};
 	gboolean result = FALSE;
-	gint _tmp0_ = 0;
-	ScaleConstraint _tmp1_ = 0;
+	gint _tmp0_;
+	ScaleConstraint _tmp1_;
 #line 351 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_val_if_fail (original != NULL, FALSE);
 #line 352 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -2167,11 +2155,11 @@ gboolean scaling_is_best_fit_dimensions (Scaling *self, Dimensions* original, Di
 		if (scaled) {
 #line 355 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			*scaled = _vala_scaled;
-#line 2170 "Dimensions.c"
+#line 2158 "Dimensions.c"
 		}
 #line 355 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return result;
-#line 2174 "Dimensions.c"
+#line 2162 "Dimensions.c"
 	}
 #line 357 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp1_ = (*self).constraint;
@@ -2181,7 +2169,7 @@ gboolean scaling_is_best_fit_dimensions (Scaling *self, Dimensions* original, Di
 		case SCALE_CONSTRAINT_ORIGINAL:
 #line 357 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		case SCALE_CONSTRAINT_FILL_VIEWPORT:
-#line 2184 "Dimensions.c"
+#line 2172 "Dimensions.c"
 		{
 #line 360 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			result = FALSE;
@@ -2189,19 +2177,19 @@ gboolean scaling_is_best_fit_dimensions (Scaling *self, Dimensions* original, Di
 			if (scaled) {
 #line 360 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				*scaled = _vala_scaled;
-#line 2192 "Dimensions.c"
+#line 2180 "Dimensions.c"
 			}
 #line 360 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			return result;
-#line 2196 "Dimensions.c"
+#line 2184 "Dimensions.c"
 		}
 		default:
 		{
 			gint pixels = 0;
-			gint _tmp2_ = 0;
-			gint _tmp3_ = 0;
-			gint _tmp4_ = 0;
-			ScaleConstraint _tmp5_ = 0;
+			gint _tmp2_;
+			gint _tmp3_;
+			gint _tmp4_;
+			ScaleConstraint _tmp5_;
 			Dimensions _tmp6_ = {0};
 #line 363 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp2_ = scaling_scale_to_pixels (&(*self));
@@ -2225,18 +2213,18 @@ gboolean scaling_is_best_fit_dimensions (Scaling *self, Dimensions* original, Di
 			if (scaled) {
 #line 368 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				*scaled = _vala_scaled;
-#line 2228 "Dimensions.c"
+#line 2216 "Dimensions.c"
 			}
 #line 368 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			return result;
-#line 2232 "Dimensions.c"
+#line 2220 "Dimensions.c"
 		}
 	}
 #line 351 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (scaled) {
 #line 351 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		*scaled = _vala_scaled;
-#line 2239 "Dimensions.c"
+#line 2227 "Dimensions.c"
 	}
 }
 
@@ -2244,8 +2232,8 @@ gboolean scaling_is_best_fit_dimensions (Scaling *self, Dimensions* original, Di
 gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimensions* scaled) {
 	Dimensions _vala_scaled = {0};
 	gboolean result = FALSE;
-	gint _tmp0_ = 0;
-	ScaleConstraint _tmp1_ = 0;
+	gint _tmp0_;
+	ScaleConstraint _tmp1_;
 #line 372 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_val_if_fail (original != NULL, FALSE);
 #line 373 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -2260,11 +2248,11 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension
 		if (scaled) {
 #line 376 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			*scaled = _vala_scaled;
-#line 2263 "Dimensions.c"
+#line 2251 "Dimensions.c"
 		}
 #line 376 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return result;
-#line 2267 "Dimensions.c"
+#line 2255 "Dimensions.c"
 	}
 #line 378 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp1_ = (*self).constraint;
@@ -2274,7 +2262,7 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension
 		case SCALE_CONSTRAINT_ORIGINAL:
 #line 378 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		case SCALE_CONSTRAINT_FILL_VIEWPORT:
-#line 2277 "Dimensions.c"
+#line 2265 "Dimensions.c"
 		{
 #line 381 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			result = FALSE;
@@ -2282,18 +2270,18 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension
 			if (scaled) {
 #line 381 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				*scaled = _vala_scaled;
-#line 2285 "Dimensions.c"
+#line 2273 "Dimensions.c"
 			}
 #line 381 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			return result;
-#line 2289 "Dimensions.c"
+#line 2277 "Dimensions.c"
 		}
 		default:
 		{
-			gboolean _tmp2_ = FALSE;
+			gboolean _tmp2_;
 			gboolean _tmp3_ = FALSE;
 			gboolean _tmp4_ = FALSE;
-			gboolean _tmp5_ = FALSE;
+			gboolean _tmp5_;
 #line 384 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp2_ = dimensions_has_area (&(*self).viewport);
 #line 384 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -2302,11 +2290,11 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension
 			_tmp5_ = (*self).scale_up;
 #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			if (!_tmp5_) {
-#line 2305 "Dimensions.c"
-				Dimensions _tmp6_ = {0};
-				gint _tmp7_ = 0;
-				Dimensions _tmp8_ = {0};
-				gint _tmp9_ = 0;
+#line 2293 "Dimensions.c"
+				Dimensions _tmp6_;
+				gint _tmp7_;
+				Dimensions _tmp8_;
+				gint _tmp9_;
 #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_tmp6_ = *original;
 #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -2317,19 +2305,19 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension
 				_tmp9_ = _tmp8_.width;
 #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_tmp4_ = _tmp7_ < _tmp9_;
-#line 2320 "Dimensions.c"
+#line 2308 "Dimensions.c"
 			} else {
 #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_tmp4_ = FALSE;
-#line 2324 "Dimensions.c"
+#line 2312 "Dimensions.c"
 			}
 #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			if (_tmp4_) {
-#line 2328 "Dimensions.c"
-				Dimensions _tmp10_ = {0};
-				gint _tmp11_ = 0;
-				Dimensions _tmp12_ = {0};
-				gint _tmp13_ = 0;
+#line 2316 "Dimensions.c"
+				Dimensions _tmp10_;
+				gint _tmp11_;
+				Dimensions _tmp12_;
+				gint _tmp13_;
 #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_tmp10_ = *original;
 #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -2340,23 +2328,23 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension
 				_tmp13_ = _tmp12_.height;
 #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_tmp3_ = _tmp11_ < _tmp13_;
-#line 2343 "Dimensions.c"
+#line 2331 "Dimensions.c"
 			} else {
 #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_tmp3_ = FALSE;
-#line 2347 "Dimensions.c"
+#line 2335 "Dimensions.c"
 			}
 #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			if (_tmp3_) {
-#line 2351 "Dimensions.c"
-				Dimensions _tmp14_ = {0};
+#line 2339 "Dimensions.c"
+				Dimensions _tmp14_;
 #line 387 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_tmp14_ = *original;
 #line 387 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_vala_scaled = _tmp14_;
-#line 2357 "Dimensions.c"
+#line 2345 "Dimensions.c"
 			} else {
-				Dimensions _tmp15_ = {0};
+				Dimensions _tmp15_;
 				Dimensions _tmp16_ = {0};
 #line 389 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_tmp15_ = (*self).viewport;
@@ -2364,7 +2352,7 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension
 				dimensions_get_scaled_proportional (original, &_tmp15_, &_tmp16_);
 #line 389 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_vala_scaled = _tmp16_;
-#line 2367 "Dimensions.c"
+#line 2355 "Dimensions.c"
 			}
 #line 391 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			result = TRUE;
@@ -2372,18 +2360,18 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension
 			if (scaled) {
 #line 391 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				*scaled = _vala_scaled;
-#line 2375 "Dimensions.c"
+#line 2363 "Dimensions.c"
 			}
 #line 391 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			return result;
-#line 2379 "Dimensions.c"
+#line 2367 "Dimensions.c"
 		}
 	}
 #line 372 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (scaled) {
 #line 372 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		*scaled = _vala_scaled;
-#line 2386 "Dimensions.c"
+#line 2374 "Dimensions.c"
 	}
 }
 
@@ -2391,9 +2379,9 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension
 gboolean scaling_is_fill_viewport (Scaling *self, Dimensions* original, Dimensions* scaled) {
 	Dimensions _vala_scaled = {0};
 	gboolean result = FALSE;
-	ScaleConstraint _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
-	Dimensions _tmp2_ = {0};
+	ScaleConstraint _tmp0_;
+	gboolean _tmp1_;
+	Dimensions _tmp2_;
 	Dimensions _tmp3_ = {0};
 #line 395 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_val_if_fail (original != NULL, FALSE);
@@ -2409,11 +2397,11 @@ gboolean scaling_is_fill_viewport (Scaling *self, Dimensions* original, Dimensio
 		if (scaled) {
 #line 399 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			*scaled = _vala_scaled;
-#line 2412 "Dimensions.c"
+#line 2400 "Dimensions.c"
 		}
 #line 399 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return result;
-#line 2416 "Dimensions.c"
+#line 2404 "Dimensions.c"
 	}
 #line 401 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp1_ = dimensions_has_area (&(*self).viewport);
@@ -2431,43 +2419,43 @@ gboolean scaling_is_fill_viewport (Scaling *self, Dimensions* original, Dimensio
 	if (scaled) {
 #line 404 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		*scaled = _vala_scaled;
-#line 2434 "Dimensions.c"
+#line 2422 "Dimensions.c"
 	}
 #line 404 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 2438 "Dimensions.c"
+#line 2426 "Dimensions.c"
 }
 
 
 void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensions* result) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	Dimensions scaled = {0};
-	Dimensions _tmp2_ = {0};
+	Dimensions _tmp2_;
 	Dimensions _tmp3_ = {0};
-	gboolean _tmp4_ = FALSE;
-	Dimensions _tmp5_ = {0};
+	gboolean _tmp4_;
+	Dimensions _tmp5_;
 	Dimensions _tmp6_ = {0};
-	gboolean _tmp7_ = FALSE;
+	gboolean _tmp7_;
 	gboolean is_viewport = FALSE;
-	Dimensions _tmp8_ = {0};
+	Dimensions _tmp8_;
 	Dimensions _tmp9_ = {0};
-	gboolean _tmp10_ = FALSE;
-	gboolean _tmp11_ = FALSE;
+	gboolean _tmp10_;
+	gboolean _tmp11_;
 #line 407 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (original != NULL);
 #line 408 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = scaling_is_unscaled (&(*self));
 #line 408 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp0_) {
-#line 2462 "Dimensions.c"
-		Dimensions _tmp1_ = {0};
+#line 2450 "Dimensions.c"
+		Dimensions _tmp1_;
 #line 409 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp1_ = *original;
 #line 409 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		*result = _tmp1_;
 #line 409 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return;
-#line 2470 "Dimensions.c"
+#line 2458 "Dimensions.c"
 	}
 #line 412 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp2_ = *original;
@@ -2481,7 +2469,7 @@ void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensi
 		*result = scaled;
 #line 413 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return;
-#line 2484 "Dimensions.c"
+#line 2472 "Dimensions.c"
 	}
 #line 415 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp5_ = *original;
@@ -2495,7 +2483,7 @@ void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensi
 		*result = scaled;
 #line 416 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return;
-#line 2498 "Dimensions.c"
+#line 2486 "Dimensions.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp8_ = *original;
@@ -2513,42 +2501,42 @@ void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensi
 	*result = scaled;
 #line 421 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 2516 "Dimensions.c"
+#line 2504 "Dimensions.c"
 }
 
 
 GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInterpType interp, gboolean scale_up) {
 	GdkPixbuf* result = NULL;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	Dimensions pixbuf_dim = {0};
-	GdkPixbuf* _tmp3_ = NULL;
+	GdkPixbuf* _tmp3_;
 	Dimensions _tmp4_ = {0};
 	gint pixels = 0;
-	Dimensions _tmp5_ = {0};
+	Dimensions _tmp5_;
 	gint _tmp6_ = 0;
-	gboolean _tmp7_ = FALSE;
+	gboolean _tmp7_;
 	Dimensions scaled = {0};
-	Dimensions _tmp13_ = {0};
+	Dimensions _tmp13_;
 	Dimensions _tmp14_ = {0};
-	gboolean _tmp15_ = FALSE;
+	gboolean _tmp15_;
 	gboolean is_viewport = FALSE;
-	Dimensions _tmp20_ = {0};
+	Dimensions _tmp20_;
 	Dimensions _tmp21_ = {0};
-	gboolean _tmp22_ = FALSE;
-	gboolean _tmp23_ = FALSE;
-	GdkPixbuf* _tmp24_ = NULL;
-	Dimensions _tmp25_ = {0};
-	GdkInterpType _tmp26_ = 0;
-	GdkPixbuf* _tmp27_ = NULL;
+	gboolean _tmp22_;
+	gboolean _tmp23_;
+	GdkPixbuf* _tmp24_;
+	Dimensions _tmp25_;
+	GdkInterpType _tmp26_;
+	GdkPixbuf* _tmp27_;
 #line 424 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
 #line 425 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = scaling_is_unscaled (&(*self));
 #line 425 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp0_) {
-#line 2549 "Dimensions.c"
-		GdkPixbuf* _tmp1_ = NULL;
-		GdkPixbuf* _tmp2_ = NULL;
+#line 2537 "Dimensions.c"
+		GdkPixbuf* _tmp1_;
+		GdkPixbuf* _tmp2_;
 #line 426 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp1_ = pixbuf;
 #line 426 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -2557,7 +2545,7 @@ GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInter
 		result = _tmp2_;
 #line 426 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return result;
-#line 2560 "Dimensions.c"
+#line 2548 "Dimensions.c"
 	}
 #line 428 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp3_ = pixbuf;
@@ -2573,12 +2561,12 @@ GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInter
 	pixels = _tmp6_;
 #line 431 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp7_) {
-#line 2576 "Dimensions.c"
-		GdkPixbuf* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		GdkInterpType _tmp10_ = 0;
-		gboolean _tmp11_ = FALSE;
-		GdkPixbuf* _tmp12_ = NULL;
+#line 2564 "Dimensions.c"
+		GdkPixbuf* _tmp8_;
+		gint _tmp9_;
+		GdkInterpType _tmp10_;
+		gboolean _tmp11_;
+		GdkPixbuf* _tmp12_;
 #line 432 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp8_ = pixbuf;
 #line 432 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -2593,7 +2581,7 @@ GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInter
 		result = _tmp12_;
 #line 432 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return result;
-#line 2596 "Dimensions.c"
+#line 2584 "Dimensions.c"
 	}
 #line 435 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp13_ = pixbuf_dim;
@@ -2603,11 +2591,11 @@ GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInter
 	scaled = _tmp14_;
 #line 435 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp15_) {
-#line 2606 "Dimensions.c"
-		GdkPixbuf* _tmp16_ = NULL;
-		Dimensions _tmp17_ = {0};
-		GdkInterpType _tmp18_ = 0;
-		GdkPixbuf* _tmp19_ = NULL;
+#line 2594 "Dimensions.c"
+		GdkPixbuf* _tmp16_;
+		Dimensions _tmp17_;
+		GdkInterpType _tmp18_;
+		GdkPixbuf* _tmp19_;
 #line 436 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp16_ = pixbuf;
 #line 436 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -2620,7 +2608,7 @@ GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInter
 		result = _tmp19_;
 #line 436 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return result;
-#line 2623 "Dimensions.c"
+#line 2611 "Dimensions.c"
 	}
 #line 438 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp20_ = pixbuf_dim;
@@ -2646,37 +2634,37 @@ GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInter
 	result = _tmp27_;
 #line 441 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 2649 "Dimensions.c"
+#line 2637 "Dimensions.c"
 }
 
 
 gchar* scaling_to_string (Scaling *self) {
 	gchar* result = NULL;
-	ScaleConstraint _tmp0_ = 0;
+	ScaleConstraint _tmp0_;
 #line 445 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = (*self).constraint;
 #line 445 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp0_ == SCALE_CONSTRAINT_ORIGINAL) {
-#line 2660 "Dimensions.c"
-		gchar* _tmp1_ = NULL;
+#line 2648 "Dimensions.c"
+		gchar* _tmp1_;
 #line 446 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp1_ = g_strdup ("scaling: UNSCALED");
 #line 446 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		result = _tmp1_;
 #line 446 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return result;
-#line 2668 "Dimensions.c"
+#line 2656 "Dimensions.c"
 	} else {
-		ScaleConstraint _tmp2_ = 0;
+		ScaleConstraint _tmp2_;
 #line 447 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp2_ = (*self).constraint;
 #line 447 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		if (_tmp2_ == SCALE_CONSTRAINT_FILL_VIEWPORT) {
-#line 2675 "Dimensions.c"
-			gchar* _tmp3_ = NULL;
-			gchar* _tmp4_ = NULL;
-			gchar* _tmp5_ = NULL;
-			gchar* _tmp6_ = NULL;
+#line 2663 "Dimensions.c"
+			gchar* _tmp3_;
+			gchar* _tmp4_;
+			gchar* _tmp5_;
+			gchar* _tmp6_;
 #line 448 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp3_ = dimensions_to_string (&(*self).viewport);
 #line 448 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -2691,33 +2679,33 @@ gchar* scaling_to_string (Scaling *self) {
 			result = _tmp6_;
 #line 448 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			return result;
-#line 2694 "Dimensions.c"
+#line 2682 "Dimensions.c"
 		} else {
-			gint _tmp7_ = 0;
+			gint _tmp7_;
 #line 449 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp7_ = (*self).scale;
 #line 449 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			if (_tmp7_ != SCALING_NO_SCALE) {
-#line 2701 "Dimensions.c"
+#line 2689 "Dimensions.c"
 				const gchar* _tmp8_ = NULL;
-				gboolean _tmp9_ = FALSE;
-				ScaleConstraint _tmp10_ = 0;
-				gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
-				gint _tmp13_ = 0;
-				gchar* _tmp14_ = NULL;
-				gchar* _tmp15_ = NULL;
+				gboolean _tmp9_;
+				ScaleConstraint _tmp10_;
+				gchar* _tmp11_;
+				gchar* _tmp12_;
+				gint _tmp13_;
+				gchar* _tmp14_;
+				gchar* _tmp15_;
 #line 451 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_tmp9_ = (*self).scale_up;
 #line 451 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				if (_tmp9_) {
 #line 451 "/home/jens/Source/shotwell/src/Dimensions.vala"
 					_tmp8_ = "scaled up";
-#line 2716 "Dimensions.c"
+#line 2704 "Dimensions.c"
 				} else {
 #line 451 "/home/jens/Source/shotwell/src/Dimensions.vala"
 					_tmp8_ = "not scaled up";
-#line 2720 "Dimensions.c"
+#line 2708 "Dimensions.c"
 				}
 #line 450 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_tmp10_ = (*self).constraint;
@@ -2737,25 +2725,25 @@ gchar* scaling_to_string (Scaling *self) {
 				result = _tmp15_;
 #line 450 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				return result;
-#line 2740 "Dimensions.c"
+#line 2728 "Dimensions.c"
 			} else {
 				const gchar* _tmp16_ = NULL;
-				gboolean _tmp17_ = FALSE;
-				gchar* _tmp18_ = NULL;
-				gchar* _tmp19_ = NULL;
-				gchar* _tmp20_ = NULL;
-				gchar* _tmp21_ = NULL;
+				gboolean _tmp17_;
+				gchar* _tmp18_;
+				gchar* _tmp19_;
+				gchar* _tmp20_;
+				gchar* _tmp21_;
 #line 454 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_tmp17_ = (*self).scale_up;
 #line 454 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				if (_tmp17_) {
 #line 454 "/home/jens/Source/shotwell/src/Dimensions.vala"
 					_tmp16_ = "scaled up";
-#line 2754 "Dimensions.c"
+#line 2742 "Dimensions.c"
 				} else {
 #line 454 "/home/jens/Source/shotwell/src/Dimensions.vala"
 					_tmp16_ = "not scaled up";
-#line 2758 "Dimensions.c"
+#line 2746 "Dimensions.c"
 				}
 #line 453 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				_tmp18_ = dimensions_to_string (&(*self).viewport);
@@ -2771,7 +2759,7 @@ gchar* scaling_to_string (Scaling *self) {
 				result = _tmp21_;
 #line 453 "/home/jens/Source/shotwell/src/Dimensions.vala"
 				return result;
-#line 2774 "Dimensions.c"
+#line 2762 "Dimensions.c"
 			}
 		}
 	}
@@ -2782,9 +2770,9 @@ gboolean scaling_equals (Scaling *self, Scaling* scaling) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	ScaleConstraint _tmp2_ = 0;
-	Scaling _tmp3_ = {0};
-	ScaleConstraint _tmp4_ = 0;
+	ScaleConstraint _tmp2_;
+	Scaling _tmp3_;
+	ScaleConstraint _tmp4_;
 #line 457 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
 #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -2795,10 +2783,10 @@ gboolean scaling_equals (Scaling *self, Scaling* scaling) {
 	_tmp4_ = _tmp3_.constraint;
 #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp2_ == _tmp4_) {
-#line 2798 "Dimensions.c"
-		gint _tmp5_ = 0;
-		Scaling _tmp6_ = {0};
-		gint _tmp7_ = 0;
+#line 2786 "Dimensions.c"
+		gint _tmp5_;
+		Scaling _tmp6_;
+		gint _tmp7_;
 #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp5_ = (*self).scale;
 #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -2807,18 +2795,18 @@ gboolean scaling_equals (Scaling *self, Scaling* scaling) {
 		_tmp7_ = _tmp6_.scale;
 #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp1_ = _tmp5_ == _tmp7_;
-#line 2810 "Dimensions.c"
+#line 2798 "Dimensions.c"
 	} else {
 #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp1_ = FALSE;
-#line 2814 "Dimensions.c"
+#line 2802 "Dimensions.c"
 	}
 #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp1_) {
-#line 2818 "Dimensions.c"
-		Scaling _tmp8_ = {0};
-		Dimensions _tmp9_ = {0};
-		gboolean _tmp10_ = FALSE;
+#line 2806 "Dimensions.c"
+		Scaling _tmp8_;
+		Dimensions _tmp9_;
+		gboolean _tmp10_;
 #line 459 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp8_ = *scaling;
 #line 459 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -2827,17 +2815,17 @@ gboolean scaling_equals (Scaling *self, Scaling* scaling) {
 		_tmp10_ = dimensions_equals (&(*self).viewport, &_tmp9_);
 #line 459 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = _tmp10_;
-#line 2830 "Dimensions.c"
+#line 2818 "Dimensions.c"
 	} else {
 #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp0_ = FALSE;
-#line 2834 "Dimensions.c"
+#line 2822 "Dimensions.c"
 	}
 #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	result = _tmp0_;
 #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 2840 "Dimensions.c"
+#line 2828 "Dimensions.c"
 }
 
 
@@ -2849,14 +2837,14 @@ Scaling* scaling_dup (const Scaling* self) {
 	memcpy (dup, self, sizeof (Scaling));
 #line 249 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return dup;
-#line 2852 "Dimensions.c"
+#line 2840 "Dimensions.c"
 }
 
 
 void scaling_free (Scaling* self) {
 #line 249 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_free (self);
-#line 2859 "Dimensions.c"
+#line 2847 "Dimensions.c"
 }
 
 
@@ -2872,12 +2860,12 @@ GType scaling_get_type (void) {
 
 
 void zoom_state_init (ZoomState *self, Dimensions* content_dimensions, Dimensions* viewport_dimensions, gdouble slider_val, GdkPoint* viewport_center) {
-	Dimensions _tmp0_ = {0};
-	Dimensions _tmp1_ = {0};
-	gdouble _tmp2_ = 0.0;
+	Dimensions _tmp0_;
+	Dimensions _tmp1_;
+	gdouble _tmp2_;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-	GdkPoint* _tmp5_ = NULL;
+	GdkPoint* _tmp5_;
 #line 472 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (content_dimensions != NULL);
 #line 472 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -2904,74 +2892,74 @@ void zoom_state_init (ZoomState *self, Dimensions* content_dimensions, Dimension
 	if (_tmp5_ == NULL) {
 #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp4_ = TRUE;
-#line 2907 "Dimensions.c"
+#line 2895 "Dimensions.c"
 	} else {
 		gboolean _tmp6_ = FALSE;
-		GdkPoint* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
+		GdkPoint* _tmp7_;
+		gint _tmp8_;
 #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp7_ = viewport_center;
 #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp8_ = (*_tmp7_).x;
 #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		if (_tmp8_ == 0) {
-#line 2918 "Dimensions.c"
-			GdkPoint* _tmp9_ = NULL;
-			gint _tmp10_ = 0;
+#line 2906 "Dimensions.c"
+			GdkPoint* _tmp9_;
+			gint _tmp10_;
 #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp9_ = viewport_center;
 #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp10_ = (*_tmp9_).y;
 #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp6_ = _tmp10_ == 0;
-#line 2927 "Dimensions.c"
+#line 2915 "Dimensions.c"
 		} else {
 #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp6_ = FALSE;
-#line 2931 "Dimensions.c"
+#line 2919 "Dimensions.c"
 		}
 #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp4_ = _tmp6_;
-#line 2935 "Dimensions.c"
+#line 2923 "Dimensions.c"
 	}
 #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp4_) {
 #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp3_ = TRUE;
-#line 2941 "Dimensions.c"
+#line 2929 "Dimensions.c"
 	} else {
-		gdouble _tmp11_ = 0.0;
+		gdouble _tmp11_;
 #line 481 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp11_ = slider_val;
 #line 481 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp3_ = _tmp11_ == 0.0;
-#line 2948 "Dimensions.c"
+#line 2936 "Dimensions.c"
 	}
 #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp3_) {
 #line 482 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		zoom_state_center_viewport (&(*self));
-#line 2954 "Dimensions.c"
+#line 2942 "Dimensions.c"
 	} else {
-		GdkPoint* _tmp12_ = NULL;
+		GdkPoint* _tmp12_;
 #line 484 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp12_ = viewport_center;
 #line 484 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		(*self).viewport_center = *_tmp12_;
 #line 485 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		zoom_state_clamp_viewport_center (&(*self));
-#line 2963 "Dimensions.c"
+#line 2951 "Dimensions.c"
 	}
 }
 
 
 void zoom_state_init_rescale (ZoomState *self, ZoomState* existing, gdouble new_slider_val) {
-	ZoomState _tmp0_ = {0};
-	Dimensions _tmp1_ = {0};
-	ZoomState _tmp2_ = {0};
-	Dimensions _tmp3_ = {0};
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
+	ZoomState _tmp0_;
+	Dimensions _tmp1_;
+	ZoomState _tmp2_;
+	Dimensions _tmp3_;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
 #line 489 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (existing != NULL);
 #line 489 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3000,20 +2988,20 @@ void zoom_state_init_rescale (ZoomState *self, ZoomState* existing, gdouble new_
 	if (_tmp5_ == 0.0) {
 #line 497 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		zoom_state_center_viewport (&(*self));
-#line 3003 "Dimensions.c"
+#line 2991 "Dimensions.c"
 	} else {
-		gdouble _tmp6_ = 0.0;
-		ZoomState _tmp7_ = {0};
-		GdkPoint _tmp8_ = {0};
-		gint _tmp9_ = 0;
-		ZoomState _tmp10_ = {0};
-		gdouble _tmp11_ = 0.0;
-		gdouble _tmp12_ = 0.0;
-		ZoomState _tmp13_ = {0};
-		GdkPoint _tmp14_ = {0};
-		gint _tmp15_ = 0;
-		ZoomState _tmp16_ = {0};
-		gdouble _tmp17_ = 0.0;
+		gdouble _tmp6_;
+		ZoomState _tmp7_;
+		GdkPoint _tmp8_;
+		gint _tmp9_;
+		ZoomState _tmp10_;
+		gdouble _tmp11_;
+		gdouble _tmp12_;
+		ZoomState _tmp13_;
+		GdkPoint _tmp14_;
+		gint _tmp15_;
+		ZoomState _tmp16_;
+		gdouble _tmp17_;
 #line 499 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp6_ = (*self).zoom_factor;
 #line 499 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3044,25 +3032,25 @@ void zoom_state_init_rescale (ZoomState *self, ZoomState* existing, gdouble new_
 		(*self).viewport_center.y = (gint) (_tmp12_ * (_tmp15_ / _tmp17_));
 #line 503 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		zoom_state_clamp_viewport_center (&(*self));
-#line 3047 "Dimensions.c"
+#line 3035 "Dimensions.c"
 	}
 }
 
 
 void zoom_state_init_rescale_to_isomorphic (ZoomState *self, ZoomState* existing) {
-	ZoomState _tmp0_ = {0};
-	Dimensions _tmp1_ = {0};
-	ZoomState _tmp2_ = {0};
-	Dimensions _tmp3_ = {0};
-	ZoomState _tmp4_ = {0};
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
-	ZoomState _tmp7_ = {0};
-	gdouble _tmp8_ = 0.0;
-	ZoomState _tmp9_ = {0};
-	gdouble _tmp10_ = 0.0;
-	gdouble _tmp11_ = 0.0;
-	gdouble _tmp12_ = 0.0;
+	ZoomState _tmp0_;
+	Dimensions _tmp1_;
+	ZoomState _tmp2_;
+	Dimensions _tmp3_;
+	ZoomState _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
+	ZoomState _tmp7_;
+	gdouble _tmp8_;
+	ZoomState _tmp9_;
+	gdouble _tmp10_;
+	gdouble _tmp11_;
+	gdouble _tmp12_;
 #line 507 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (existing != NULL);
 #line 507 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3105,20 +3093,20 @@ void zoom_state_init_rescale_to_isomorphic (ZoomState *self, ZoomState* existing
 	if (_tmp12_ == 0.0) {
 #line 516 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		zoom_state_center_viewport (&(*self));
-#line 3108 "Dimensions.c"
+#line 3096 "Dimensions.c"
 	} else {
-		gdouble _tmp13_ = 0.0;
-		ZoomState _tmp14_ = {0};
-		GdkPoint _tmp15_ = {0};
-		gint _tmp16_ = 0;
-		ZoomState _tmp17_ = {0};
-		gdouble _tmp18_ = 0.0;
-		gdouble _tmp19_ = 0.0;
-		ZoomState _tmp20_ = {0};
-		GdkPoint _tmp21_ = {0};
-		gint _tmp22_ = 0;
-		ZoomState _tmp23_ = {0};
-		gdouble _tmp24_ = 0.0;
+		gdouble _tmp13_;
+		ZoomState _tmp14_;
+		GdkPoint _tmp15_;
+		gint _tmp16_;
+		ZoomState _tmp17_;
+		gdouble _tmp18_;
+		gdouble _tmp19_;
+		ZoomState _tmp20_;
+		GdkPoint _tmp21_;
+		gint _tmp22_;
+		ZoomState _tmp23_;
+		gdouble _tmp24_;
 #line 518 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp13_ = (*self).zoom_factor;
 #line 518 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3149,19 +3137,19 @@ void zoom_state_init_rescale_to_isomorphic (ZoomState *self, ZoomState* existing
 		(*self).viewport_center.y = (gint) (_tmp19_ * (_tmp22_ / _tmp24_));
 #line 522 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		zoom_state_clamp_viewport_center (&(*self));
-#line 3152 "Dimensions.c"
+#line 3140 "Dimensions.c"
 	}
 }
 
 
 void zoom_state_init_pan (ZoomState *self, ZoomState* existing, GdkPoint* new_viewport_center) {
-	ZoomState _tmp0_ = {0};
-	Dimensions _tmp1_ = {0};
-	ZoomState _tmp2_ = {0};
-	Dimensions _tmp3_ = {0};
-	ZoomState _tmp4_ = {0};
-	gdouble _tmp5_ = 0.0;
-	GdkPoint _tmp6_ = {0};
+	ZoomState _tmp0_;
+	Dimensions _tmp1_;
+	ZoomState _tmp2_;
+	Dimensions _tmp3_;
+	ZoomState _tmp4_;
+	gdouble _tmp5_;
+	GdkPoint _tmp6_;
 #line 526 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (existing != NULL);
 #line 526 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3194,29 +3182,29 @@ void zoom_state_init_pan (ZoomState *self, ZoomState* existing, GdkPoint* new_vi
 	(*self).viewport_center = _tmp6_;
 #line 535 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	zoom_state_clamp_viewport_center (&(*self));
-#line 3197 "Dimensions.c"
+#line 3185 "Dimensions.c"
 }
 
 
 static void zoom_state_clamp_viewport_center (ZoomState *self) {
 	gint zoomed_width = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gint zoomed_height = 0;
-	gint _tmp1_ = 0;
-	GdkPoint _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	Dimensions _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	Dimensions _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	GdkPoint _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	Dimensions _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	Dimensions _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
+	gint _tmp1_;
+	GdkPoint _tmp2_;
+	gint _tmp3_;
+	Dimensions _tmp4_;
+	gint _tmp5_;
+	Dimensions _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	GdkPoint _tmp9_;
+	gint _tmp10_;
+	Dimensions _tmp11_;
+	gint _tmp12_;
+	Dimensions _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
 #line 539 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = zoom_state_get_zoomed_width (&(*self));
 #line 539 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3257,13 +3245,13 @@ static void zoom_state_clamp_viewport_center (ZoomState *self) {
 	_tmp15_ = CLAMP (_tmp10_, _tmp12_ / 2, (zoomed_height - (_tmp14_ / 2)) - 1);
 #line 544 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	(*self).viewport_center.y = _tmp15_;
-#line 3260 "Dimensions.c"
+#line 3248 "Dimensions.c"
 }
 
 
 static void zoom_state_center_viewport (ZoomState *self) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 549 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = zoom_state_get_zoomed_width (&(*self));
 #line 549 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3272,25 +3260,25 @@ static void zoom_state_center_viewport (ZoomState *self) {
 	_tmp1_ = zoom_state_get_zoomed_height (&(*self));
 #line 550 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	(*self).viewport_center.y = _tmp1_ / 2;
-#line 3275 "Dimensions.c"
+#line 3263 "Dimensions.c"
 }
 
 
 static void zoom_state_compute_zoom_factors (ZoomState *self) {
 	gdouble viewport_to_content_x = 0.0;
 	gdouble viewport_to_content_y = 0.0;
-	Dimensions _tmp0_ = {0};
+	Dimensions _tmp0_;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
-	gdouble _tmp7_ = 0.0;
-	gdouble _tmp8_ = 0.0;
-	gdouble _tmp9_ = 0.0;
-	gdouble _tmp10_ = 0.0;
-	gdouble _tmp11_ = 0.0;
+	gdouble _tmp3_;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
+	gdouble _tmp7_;
+	gdouble _tmp8_;
+	gdouble _tmp9_;
+	gdouble _tmp10_;
+	gdouble _tmp11_;
 #line 554 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	(*self).max_factor = 2.0;
 #line 558 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3315,7 +3303,7 @@ static void zoom_state_compute_zoom_factors (ZoomState *self) {
 	if (_tmp6_ > 1.0) {
 #line 562 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		(*self).min_factor = 1.0;
-#line 3318 "Dimensions.c"
+#line 3306 "Dimensions.c"
 	}
 #line 564 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp7_ = (*self).min_factor;
@@ -3329,65 +3317,65 @@ static void zoom_state_compute_zoom_factors (ZoomState *self) {
 	_tmp11_ = pow (_tmp8_ / _tmp9_, _tmp10_);
 #line 564 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	(*self).zoom_factor = _tmp7_ * _tmp11_;
-#line 3332 "Dimensions.c"
+#line 3320 "Dimensions.c"
 }
 
 
 gdouble zoom_state_get_interpolation_factor (ZoomState *self) {
 	gdouble result = 0.0;
-	gdouble _tmp0_ = 0.0;
+	gdouble _tmp0_;
 #line 568 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = (*self).interpolation_factor;
 #line 568 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	result = _tmp0_;
 #line 568 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 3345 "Dimensions.c"
+#line 3333 "Dimensions.c"
 }
 
 
 void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle* result) {
 	gint zoomed_width = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gint zoomed_height = 0;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 	GdkRectangle _result_ = {0};
-	Dimensions _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	Dimensions _tmp14_ = {0};
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	GdkRectangle _tmp24_ = {0};
-	gint _tmp25_ = 0;
+	Dimensions _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
+	Dimensions _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	GdkRectangle _tmp24_;
+	gint _tmp25_;
 	gint right = 0;
-	GdkRectangle _tmp26_ = {0};
-	gint _tmp27_ = 0;
-	Dimensions _tmp28_ = {0};
-	gint _tmp29_ = 0;
-	gint _tmp30_ = 0;
-	gint _tmp31_ = 0;
-	gint _tmp33_ = 0;
-	GdkRectangle _tmp34_ = {0};
-	gint _tmp35_ = 0;
+	GdkRectangle _tmp26_;
+	gint _tmp27_;
+	Dimensions _tmp28_;
+	gint _tmp29_;
+	gint _tmp30_;
+	gint _tmp31_;
+	gint _tmp33_;
+	GdkRectangle _tmp34_;
+	gint _tmp35_;
 	gint bottom = 0;
-	GdkRectangle _tmp36_ = {0};
-	gint _tmp37_ = 0;
-	Dimensions _tmp38_ = {0};
-	gint _tmp39_ = 0;
-	gint _tmp40_ = 0;
-	gint _tmp41_ = 0;
-	gint _tmp43_ = 0;
-	GdkRectangle _tmp44_ = {0};
-	gint _tmp45_ = 0;
-	GdkRectangle _tmp46_ = {0};
-	gint _tmp47_ = 0;
-	gint _tmp48_ = 0;
-	GdkRectangle _tmp49_ = {0};
-	gint _tmp50_ = 0;
-	gint _tmp51_ = 0;
+	GdkRectangle _tmp36_;
+	gint _tmp37_;
+	Dimensions _tmp38_;
+	gint _tmp39_;
+	gint _tmp40_;
+	gint _tmp41_;
+	gint _tmp43_;
+	GdkRectangle _tmp44_;
+	gint _tmp45_;
+	GdkRectangle _tmp46_;
+	gint _tmp47_;
+	gint _tmp48_;
+	GdkRectangle _tmp49_;
+	gint _tmp50_;
+	gint _tmp51_;
 #line 573 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = zoom_state_get_zoomed_width (&(*self));
 #line 573 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3406,11 +3394,11 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle
 	_tmp4_ = zoomed_width;
 #line 578 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp3_ < _tmp4_) {
-#line 3409 "Dimensions.c"
-		GdkPoint _tmp5_ = {0};
-		gint _tmp6_ = 0;
-		Dimensions _tmp7_ = {0};
-		gint _tmp8_ = 0;
+#line 3397 "Dimensions.c"
+		GdkPoint _tmp5_;
+		gint _tmp6_;
+		Dimensions _tmp7_;
+		gint _tmp8_;
 #line 579 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp5_ = (*self).viewport_center;
 #line 579 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3421,11 +3409,11 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle
 		_tmp8_ = _tmp7_.width;
 #line 579 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_result_.x = _tmp6_ - (_tmp8_ / 2);
-#line 3424 "Dimensions.c"
+#line 3412 "Dimensions.c"
 	} else {
-		gint _tmp9_ = 0;
-		Dimensions _tmp10_ = {0};
-		gint _tmp11_ = 0;
+		gint _tmp9_;
+		Dimensions _tmp10_;
+		gint _tmp11_;
 #line 581 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp9_ = zoomed_width;
 #line 581 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3434,7 +3422,7 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle
 		_tmp11_ = _tmp10_.width;
 #line 581 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_result_.x = (_tmp9_ - _tmp11_) / 2;
-#line 3437 "Dimensions.c"
+#line 3425 "Dimensions.c"
 	}
 #line 583 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp12_ = _result_;
@@ -3444,7 +3432,7 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle
 	if (_tmp13_ < 0) {
 #line 584 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_result_.x = 0;
-#line 3447 "Dimensions.c"
+#line 3435 "Dimensions.c"
 	}
 #line 586 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp14_ = (*self).viewport_dimensions;
@@ -3454,11 +3442,11 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle
 	_tmp16_ = zoomed_height;
 #line 586 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp15_ < _tmp16_) {
-#line 3457 "Dimensions.c"
-		GdkPoint _tmp17_ = {0};
-		gint _tmp18_ = 0;
-		Dimensions _tmp19_ = {0};
-		gint _tmp20_ = 0;
+#line 3445 "Dimensions.c"
+		GdkPoint _tmp17_;
+		gint _tmp18_;
+		Dimensions _tmp19_;
+		gint _tmp20_;
 #line 587 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp17_ = (*self).viewport_center;
 #line 587 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3469,11 +3457,11 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle
 		_tmp20_ = _tmp19_.height;
 #line 587 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_result_.y = _tmp18_ - (_tmp20_ / 2);
-#line 3472 "Dimensions.c"
+#line 3460 "Dimensions.c"
 	} else {
-		gint _tmp21_ = 0;
-		Dimensions _tmp22_ = {0};
-		gint _tmp23_ = 0;
+		gint _tmp21_;
+		Dimensions _tmp22_;
+		gint _tmp23_;
 #line 589 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp21_ = zoomed_height;
 #line 589 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3482,7 +3470,7 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle
 		_tmp23_ = _tmp22_.height;
 #line 589 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_result_.y = (_tmp21_ - _tmp23_) / 2;
-#line 3485 "Dimensions.c"
+#line 3473 "Dimensions.c"
 	}
 #line 591 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp24_ = _result_;
@@ -3492,7 +3480,7 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle
 	if (_tmp25_ < 0) {
 #line 592 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_result_.y = 0;
-#line 3495 "Dimensions.c"
+#line 3483 "Dimensions.c"
 	}
 #line 594 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp26_ = _result_;
@@ -3510,13 +3498,13 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle
 	_tmp31_ = zoomed_width;
 #line 595 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp30_ > _tmp31_) {
-#line 3513 "Dimensions.c"
-		gint _tmp32_ = 0;
+#line 3501 "Dimensions.c"
+		gint _tmp32_;
 #line 596 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp32_ = zoomed_width;
 #line 596 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		right = _tmp32_;
-#line 3519 "Dimensions.c"
+#line 3507 "Dimensions.c"
 	}
 #line 597 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp33_ = right;
@@ -3542,13 +3530,13 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle
 	_tmp41_ = zoomed_height;
 #line 600 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp40_ > _tmp41_) {
-#line 3545 "Dimensions.c"
-		gint _tmp42_ = 0;
+#line 3533 "Dimensions.c"
+		gint _tmp42_;
 #line 601 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp42_ = zoomed_height;
 #line 601 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		bottom = _tmp42_;
-#line 3551 "Dimensions.c"
+#line 3539 "Dimensions.c"
 	}
 #line 602 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp43_ = bottom;
@@ -3578,7 +3566,7 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle
 	*result = _result_;
 #line 607 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 3581 "Dimensions.c"
+#line 3569 "Dimensions.c"
 }
 
 
@@ -3586,22 +3574,22 @@ void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, GdkRectangle*
 	GdkRectangle wrt_content = {0};
 	GdkRectangle _tmp0_ = {0};
 	GdkRectangle _result_ = {0};
-	Dimensions _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	GdkRectangle _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	Dimensions _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	GdkRectangle _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	GdkRectangle _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	GdkRectangle _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	GdkRectangle _tmp15_ = {0};
-	gint _tmp16_ = 0;
+	Dimensions _tmp1_;
+	gint _tmp2_;
+	GdkRectangle _tmp3_;
+	gint _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	Dimensions _tmp7_;
+	gint _tmp8_;
+	GdkRectangle _tmp9_;
+	gint _tmp10_;
+	GdkRectangle _tmp11_;
+	gint _tmp12_;
+	GdkRectangle _tmp13_;
+	gint _tmp14_;
+	GdkRectangle _tmp15_;
+	gint _tmp16_;
 #line 613 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	zoom_state_get_viewing_rectangle_wrt_content (&(*self), &_tmp0_);
 #line 613 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3626,7 +3614,7 @@ void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, GdkRectangle*
 	if (_tmp6_ < 0) {
 #line 618 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_result_.x = 0;
-#line 3629 "Dimensions.c"
+#line 3617 "Dimensions.c"
 	}
 #line 619 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp7_ = (*self).viewport_dimensions;
@@ -3646,7 +3634,7 @@ void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, GdkRectangle*
 	if (_tmp12_ < 0) {
 #line 621 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_result_.y = 0;
-#line 3649 "Dimensions.c"
+#line 3637 "Dimensions.c"
 	}
 #line 622 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp13_ = wrt_content;
@@ -3664,69 +3652,69 @@ void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, GdkRectangle*
 	*result = _result_;
 #line 625 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 3667 "Dimensions.c"
+#line 3655 "Dimensions.c"
 }
 
 
 void zoom_state_get_viewing_rectangle_projection (ZoomState *self, GdkPixbuf* for_pixbuf, GdkRectangle* result) {
 	gdouble zoomed_width = 0.0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gdouble zoomed_height = 0.0;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 	gdouble horiz_scale = 0.0;
-	GdkPixbuf* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	GdkPixbuf* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	gdouble vert_scale = 0.0;
-	GdkPixbuf* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	GdkPixbuf* _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	gdouble scale = 0.0;
 	GdkRectangle viewing_rectangle = {0};
 	GdkRectangle _tmp8_ = {0};
 	GdkRectangle _result_ = {0};
-	GdkRectangle _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	GdkRectangle _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	GdkPixbuf* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	GdkRectangle _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	GdkRectangle _tmp19_ = {0};
-	gint _tmp20_ = 0;
-	GdkPixbuf* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
+	GdkRectangle _tmp9_;
+	gint _tmp10_;
+	GdkRectangle _tmp11_;
+	gint _tmp12_;
+	GdkPixbuf* _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	GdkRectangle _tmp17_;
+	gint _tmp18_;
+	GdkRectangle _tmp19_;
+	gint _tmp20_;
+	GdkPixbuf* _tmp21_;
+	gint _tmp22_;
+	gint _tmp23_;
+	gint _tmp24_;
 	gint right = 0;
-	GdkRectangle _tmp25_ = {0};
-	gint _tmp26_ = 0;
-	GdkRectangle _tmp27_ = {0};
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	GdkPixbuf* _tmp30_ = NULL;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
-	gint _tmp33_ = 0;
+	GdkRectangle _tmp25_;
+	gint _tmp26_;
+	GdkRectangle _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
+	GdkPixbuf* _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
+	gint _tmp33_;
 	gint bottom = 0;
-	GdkRectangle _tmp34_ = {0};
-	gint _tmp35_ = 0;
-	GdkRectangle _tmp36_ = {0};
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	GdkPixbuf* _tmp39_ = NULL;
-	gint _tmp40_ = 0;
-	gint _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	gint _tmp43_ = 0;
-	GdkRectangle _tmp44_ = {0};
-	gint _tmp45_ = 0;
-	gint _tmp46_ = 0;
-	GdkRectangle _tmp47_ = {0};
-	gint _tmp48_ = 0;
+	GdkRectangle _tmp34_;
+	gint _tmp35_;
+	GdkRectangle _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
+	GdkPixbuf* _tmp39_;
+	gint _tmp40_;
+	gint _tmp41_;
+	gint _tmp42_;
+	gint _tmp43_;
+	GdkRectangle _tmp44_;
+	gint _tmp45_;
+	gint _tmp46_;
+	GdkRectangle _tmp47_;
+	gint _tmp48_;
 #line 629 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (for_pixbuf));
 #line 630 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3865,28 +3853,28 @@ void zoom_state_get_viewing_rectangle_projection (ZoomState *self, GdkPixbuf* fo
 	*result = _result_;
 #line 651 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 3868 "Dimensions.c"
+#line 3856 "Dimensions.c"
 }
 
 
 gdouble zoom_state_get_zoom_factor (ZoomState *self) {
 	gdouble result = 0.0;
-	gdouble _tmp0_ = 0.0;
+	gdouble _tmp0_;
 #line 656 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = (*self).zoom_factor;
 #line 656 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	result = _tmp0_;
 #line 656 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 3881 "Dimensions.c"
+#line 3869 "Dimensions.c"
 }
 
 
 gint zoom_state_get_zoomed_width (ZoomState *self) {
 	gint result = 0;
-	Dimensions _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
+	Dimensions _tmp0_;
+	gint _tmp1_;
+	gdouble _tmp2_;
 #line 660 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = (*self).content_dimensions;
 #line 660 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3897,15 +3885,15 @@ gint zoom_state_get_zoomed_width (ZoomState *self) {
 	result = (gint) (_tmp1_ * _tmp2_);
 #line 660 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 3900 "Dimensions.c"
+#line 3888 "Dimensions.c"
 }
 
 
 gint zoom_state_get_zoomed_height (ZoomState *self) {
 	gint result = 0;
-	Dimensions _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
+	Dimensions _tmp0_;
+	gint _tmp1_;
+	gdouble _tmp2_;
 #line 664 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = (*self).content_dimensions;
 #line 664 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3916,60 +3904,60 @@ gint zoom_state_get_zoomed_height (ZoomState *self) {
 	result = (gint) (_tmp1_ * _tmp2_);
 #line 664 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 3919 "Dimensions.c"
+#line 3907 "Dimensions.c"
 }
 
 
 void zoom_state_get_viewport_center (ZoomState *self, GdkPoint* result) {
-	GdkPoint _tmp0_ = {0};
+	GdkPoint _tmp0_;
 #line 668 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = (*self).viewport_center;
 #line 668 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	*result = _tmp0_;
 #line 668 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return;
-#line 3931 "Dimensions.c"
+#line 3919 "Dimensions.c"
 }
 
 
 gchar* zoom_state_to_string (ZoomState *self) {
 	gchar* result = NULL;
 	gchar* named_modes = NULL;
-	gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp11_ = FALSE;
-	gboolean _tmp16_ = FALSE;
-	const gchar* _tmp21_ = NULL;
+	gchar* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp6_;
+	gboolean _tmp11_;
+	gboolean _tmp16_;
+	const gchar* _tmp21_;
 	GdkRectangle viewing_rect = {0};
 	GdkRectangle _tmp23_ = {0};
-	Dimensions _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	Dimensions _tmp26_ = {0};
-	gint _tmp27_ = 0;
-	Dimensions _tmp28_ = {0};
-	gint _tmp29_ = 0;
-	Dimensions _tmp30_ = {0};
-	gint _tmp31_ = 0;
-	gdouble _tmp32_ = 0.0;
-	gdouble _tmp33_ = 0.0;
-	gdouble _tmp34_ = 0.0;
-	gint _tmp35_ = 0;
-	gint _tmp36_ = 0;
-	const gchar* _tmp37_ = NULL;
-	GdkRectangle _tmp38_ = {0};
-	gint _tmp39_ = 0;
-	GdkRectangle _tmp40_ = {0};
-	gint _tmp41_ = 0;
-	GdkRectangle _tmp42_ = {0};
-	gint _tmp43_ = 0;
-	GdkRectangle _tmp44_ = {0};
-	gint _tmp45_ = 0;
-	GdkPoint _tmp46_ = {0};
-	gint _tmp47_ = 0;
-	GdkPoint _tmp48_ = {0};
-	gint _tmp49_ = 0;
-	gchar* _tmp50_ = NULL;
+	Dimensions _tmp24_;
+	gint _tmp25_;
+	Dimensions _tmp26_;
+	gint _tmp27_;
+	Dimensions _tmp28_;
+	gint _tmp29_;
+	Dimensions _tmp30_;
+	gint _tmp31_;
+	gdouble _tmp32_;
+	gdouble _tmp33_;
+	gdouble _tmp34_;
+	gint _tmp35_;
+	gint _tmp36_;
+	const gchar* _tmp37_;
+	GdkRectangle _tmp38_;
+	gint _tmp39_;
+	GdkRectangle _tmp40_;
+	gint _tmp41_;
+	GdkRectangle _tmp42_;
+	gint _tmp43_;
+	GdkRectangle _tmp44_;
+	gint _tmp45_;
+	GdkPoint _tmp46_;
+	gint _tmp47_;
+	GdkPoint _tmp48_;
+	gint _tmp49_;
+	gchar* _tmp50_;
 #line 672 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = g_strdup ("");
 #line 672 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -3978,22 +3966,22 @@ gchar* zoom_state_to_string (ZoomState *self) {
 	_tmp1_ = zoom_state_is_min (&(*self));
 #line 673 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp1_) {
-#line 3981 "Dimensions.c"
+#line 3969 "Dimensions.c"
 		const gchar* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp3_ = named_modes;
 #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		if (g_strcmp0 (_tmp3_, "") == 0) {
 #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp2_ = "MIN";
-#line 3992 "Dimensions.c"
+#line 3980 "Dimensions.c"
 		} else {
 #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp2_ = ", MIN";
-#line 3996 "Dimensions.c"
+#line 3984 "Dimensions.c"
 		}
 #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp4_ = named_modes;
@@ -4003,28 +3991,28 @@ gchar* zoom_state_to_string (ZoomState *self) {
 		_g_free0 (named_modes);
 #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		named_modes = _tmp5_;
-#line 4006 "Dimensions.c"
+#line 3994 "Dimensions.c"
 	}
 #line 675 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp6_ = zoom_state_is_default (&(*self));
 #line 675 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp6_) {
-#line 4012 "Dimensions.c"
+#line 4000 "Dimensions.c"
 		const gchar* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
+		const gchar* _tmp8_;
+		const gchar* _tmp9_;
+		gchar* _tmp10_;
 #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp8_ = named_modes;
 #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		if (g_strcmp0 (_tmp8_, "") == 0) {
 #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp7_ = "DEFAULT";
-#line 4023 "Dimensions.c"
+#line 4011 "Dimensions.c"
 		} else {
 #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp7_ = ", DEFAULT";
-#line 4027 "Dimensions.c"
+#line 4015 "Dimensions.c"
 		}
 #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp9_ = named_modes;
@@ -4034,28 +4022,28 @@ gchar* zoom_state_to_string (ZoomState *self) {
 		_g_free0 (named_modes);
 #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		named_modes = _tmp10_;
-#line 4037 "Dimensions.c"
+#line 4025 "Dimensions.c"
 	}
 #line 677 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp11_ = zoom_state_is_isomorphic (&(*self));
 #line 677 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp11_) {
-#line 4043 "Dimensions.c"
+#line 4031 "Dimensions.c"
 		const gchar* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
+		const gchar* _tmp13_;
+		const gchar* _tmp14_;
+		gchar* _tmp15_;
 #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp13_ = named_modes;
 #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		if (g_strcmp0 (_tmp13_, "") == 0) {
 #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp12_ = "ISOMORPHIC";
-#line 4054 "Dimensions.c"
+#line 4042 "Dimensions.c"
 		} else {
 #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp12_ = ", ISOMORPHIC";
-#line 4058 "Dimensions.c"
+#line 4046 "Dimensions.c"
 		}
 #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp14_ = named_modes;
@@ -4065,28 +4053,28 @@ gchar* zoom_state_to_string (ZoomState *self) {
 		_g_free0 (named_modes);
 #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		named_modes = _tmp15_;
-#line 4068 "Dimensions.c"
+#line 4056 "Dimensions.c"
 	}
 #line 679 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp16_ = zoom_state_is_max (&(*self));
 #line 679 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (_tmp16_) {
-#line 4074 "Dimensions.c"
+#line 4062 "Dimensions.c"
 		const gchar* _tmp17_ = NULL;
-		const gchar* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
+		const gchar* _tmp18_;
+		const gchar* _tmp19_;
+		gchar* _tmp20_;
 #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp18_ = named_modes;
 #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		if (g_strcmp0 (_tmp18_, "") == 0) {
 #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp17_ = "MAX";
-#line 4085 "Dimensions.c"
+#line 4073 "Dimensions.c"
 		} else {
 #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			_tmp17_ = ", MAX";
-#line 4089 "Dimensions.c"
+#line 4077 "Dimensions.c"
 		}
 #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp19_ = named_modes;
@@ -4096,21 +4084,21 @@ gchar* zoom_state_to_string (ZoomState *self) {
 		_g_free0 (named_modes);
 #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		named_modes = _tmp20_;
-#line 4099 "Dimensions.c"
+#line 4087 "Dimensions.c"
 	}
 #line 681 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp21_ = named_modes;
 #line 681 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	if (g_strcmp0 (_tmp21_, "") == 0) {
-#line 4105 "Dimensions.c"
-		gchar* _tmp22_ = NULL;
+#line 4093 "Dimensions.c"
+		gchar* _tmp22_;
 #line 682 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_tmp22_ = g_strdup ("(none)");
 #line 682 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		_g_free0 (named_modes);
 #line 682 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		named_modes = _tmp22_;
-#line 4113 "Dimensions.c"
+#line 4101 "Dimensions.c"
 	}
 #line 684 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	zoom_state_get_viewing_rectangle_wrt_content (&(*self), &_tmp23_);
@@ -4184,14 +4172,14 @@ gchar* zoom_state_to_string (ZoomState *self) {
 	_g_free0 (named_modes);
 #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 4179 "Dimensions.c"
+#line 4167 "Dimensions.c"
 }
 
 
 gboolean zoom_state_is_min (ZoomState *self) {
 	gboolean result = FALSE;
-	gdouble _tmp0_ = 0.0;
-	gdouble _tmp1_ = 0.0;
+	gdouble _tmp0_;
+	gdouble _tmp1_;
 #line 698 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = (*self).zoom_factor;
 #line 698 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -4200,27 +4188,27 @@ gboolean zoom_state_is_min (ZoomState *self) {
 	result = _tmp0_ == _tmp1_;
 #line 698 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 4195 "Dimensions.c"
+#line 4183 "Dimensions.c"
 }
 
 
 gboolean zoom_state_is_default (ZoomState *self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 702 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = zoom_state_is_min (&(*self));
 #line 702 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	result = _tmp0_;
 #line 702 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 4208 "Dimensions.c"
+#line 4196 "Dimensions.c"
 }
 
 
 gboolean zoom_state_is_max (ZoomState *self) {
 	gboolean result = FALSE;
-	gdouble _tmp0_ = 0.0;
-	gdouble _tmp1_ = 0.0;
+	gdouble _tmp0_;
+	gdouble _tmp1_;
 #line 706 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = (*self).zoom_factor;
 #line 706 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -4229,50 +4217,50 @@ gboolean zoom_state_is_max (ZoomState *self) {
 	result = _tmp0_ == _tmp1_;
 #line 706 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 4224 "Dimensions.c"
+#line 4212 "Dimensions.c"
 }
 
 
 gboolean zoom_state_is_isomorphic (ZoomState *self) {
 	gboolean result = FALSE;
-	gdouble _tmp0_ = 0.0;
+	gdouble _tmp0_;
 #line 710 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp0_ = (*self).zoom_factor;
 #line 710 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	result = _tmp0_ == 1.0;
 #line 710 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 4237 "Dimensions.c"
+#line 4225 "Dimensions.c"
 }
 
 
 gboolean zoom_state_equals (ZoomState *self, ZoomState* other) {
 	gboolean result = FALSE;
-	ZoomState _tmp0_ = {0};
-	Dimensions _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-	ZoomState _tmp3_ = {0};
-	Dimensions _tmp4_ = {0};
-	gboolean _tmp5_ = FALSE;
-	gdouble _tmp6_ = 0.0;
-	ZoomState _tmp7_ = {0};
-	gdouble _tmp8_ = 0.0;
-	gdouble _tmp9_ = 0.0;
-	ZoomState _tmp10_ = {0};
-	gdouble _tmp11_ = 0.0;
-	gdouble _tmp12_ = 0.0;
-	ZoomState _tmp13_ = {0};
-	gdouble _tmp14_ = 0.0;
-	GdkPoint _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	ZoomState _tmp17_ = {0};
-	GdkPoint _tmp18_ = {0};
-	gint _tmp19_ = 0;
-	GdkPoint _tmp20_ = {0};
-	gint _tmp21_ = 0;
-	ZoomState _tmp22_ = {0};
-	GdkPoint _tmp23_ = {0};
-	gint _tmp24_ = 0;
+	ZoomState _tmp0_;
+	Dimensions _tmp1_;
+	gboolean _tmp2_;
+	ZoomState _tmp3_;
+	Dimensions _tmp4_;
+	gboolean _tmp5_;
+	gdouble _tmp6_;
+	ZoomState _tmp7_;
+	gdouble _tmp8_;
+	gdouble _tmp9_;
+	ZoomState _tmp10_;
+	gdouble _tmp11_;
+	gdouble _tmp12_;
+	ZoomState _tmp13_;
+	gdouble _tmp14_;
+	GdkPoint _tmp15_;
+	gint _tmp16_;
+	ZoomState _tmp17_;
+	GdkPoint _tmp18_;
+	gint _tmp19_;
+	GdkPoint _tmp20_;
+	gint _tmp21_;
+	ZoomState _tmp22_;
+	GdkPoint _tmp23_;
+	gint _tmp24_;
 #line 713 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_return_val_if_fail (other != NULL, FALSE);
 #line 714 "/home/jens/Source/shotwell/src/Dimensions.vala"
@@ -4287,7 +4275,7 @@ gboolean zoom_state_equals (ZoomState *self, ZoomState* other) {
 		result = FALSE;
 #line 715 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return result;
-#line 4282 "Dimensions.c"
+#line 4270 "Dimensions.c"
 	}
 #line 716 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp3_ = *other;
@@ -4301,7 +4289,7 @@ gboolean zoom_state_equals (ZoomState *self, ZoomState* other) {
 		result = FALSE;
 #line 717 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return result;
-#line 4296 "Dimensions.c"
+#line 4284 "Dimensions.c"
 	}
 #line 718 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp6_ = (*self).zoom_factor;
@@ -4315,7 +4303,7 @@ gboolean zoom_state_equals (ZoomState *self, ZoomState* other) {
 		result = FALSE;
 #line 719 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return result;
-#line 4310 "Dimensions.c"
+#line 4298 "Dimensions.c"
 	}
 #line 720 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp9_ = (*self).min_factor;
@@ -4329,7 +4317,7 @@ gboolean zoom_state_equals (ZoomState *self, ZoomState* other) {
 		result = FALSE;
 #line 721 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return result;
-#line 4324 "Dimensions.c"
+#line 4312 "Dimensions.c"
 	}
 #line 722 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp12_ = (*self).max_factor;
@@ -4343,7 +4331,7 @@ gboolean zoom_state_equals (ZoomState *self, ZoomState* other) {
 		result = FALSE;
 #line 723 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return result;
-#line 4338 "Dimensions.c"
+#line 4326 "Dimensions.c"
 	}
 #line 724 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp15_ = (*self).viewport_center;
@@ -4361,7 +4349,7 @@ gboolean zoom_state_equals (ZoomState *self, ZoomState* other) {
 		result = FALSE;
 #line 725 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return result;
-#line 4356 "Dimensions.c"
+#line 4344 "Dimensions.c"
 	}
 #line 726 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	_tmp20_ = (*self).viewport_center;
@@ -4379,13 +4367,13 @@ gboolean zoom_state_equals (ZoomState *self, ZoomState* other) {
 		result = FALSE;
 #line 727 "/home/jens/Source/shotwell/src/Dimensions.vala"
 		return result;
-#line 4374 "Dimensions.c"
+#line 4362 "Dimensions.c"
 	}
 #line 729 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	result = TRUE;
 #line 729 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return result;
-#line 4380 "Dimensions.c"
+#line 4368 "Dimensions.c"
 }
 
 
@@ -4397,14 +4385,14 @@ ZoomState* zoom_state_dup (const ZoomState* self) {
 	memcpy (dup, self, sizeof (ZoomState));
 #line 463 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	return dup;
-#line 4392 "Dimensions.c"
+#line 4380 "Dimensions.c"
 }
 
 
 void zoom_state_free (ZoomState* self) {
 #line 463 "/home/jens/Source/shotwell/src/Dimensions.vala"
 	g_free (self);
-#line 4399 "Dimensions.c"
+#line 4387 "Dimensions.c"
 }
 
 
diff --git a/src/DirectoryMonitor.c b/src/DirectoryMonitor.c
index 045e3ec..f673b36 100644
--- a/src/DirectoryMonitor.c
+++ b/src/DirectoryMonitor.c
@@ -1,4 +1,4 @@
-/* DirectoryMonitor.c generated by valac 0.34.7, the Vala compiler
+/* DirectoryMonitor.c generated by valac 0.36.6, the Vala compiler
  * generated from DirectoryMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -115,6 +115,30 @@ typedef struct _DirectoryMonitorQueryInfoQueueElementPrivate DirectoryMonitorQue
 typedef struct _DirectoryMonitorParamSpecQueryInfoQueueElement DirectoryMonitorParamSpecQueryInfoQueueElement;
 typedef struct _DirectoryMonitorFileInfoMapPrivate DirectoryMonitorFileInfoMapPrivate;
 typedef struct _DirectoryMonitorParamSpecFileInfoMap DirectoryMonitorParamSpecFileInfoMap;
+enum  {
+	DIRECTORY_MONITOR_ROOT_MOVED_SIGNAL,
+	DIRECTORY_MONITOR_ROOT_DELETED_SIGNAL,
+	DIRECTORY_MONITOR_DISCOVERY_STARTED_SIGNAL,
+	DIRECTORY_MONITOR_FILE_DISCOVERED_SIGNAL,
+	DIRECTORY_MONITOR_DIRECTORY_DISCOVERED_SIGNAL,
+	DIRECTORY_MONITOR_DISCOVERY_FAILED_SIGNAL,
+	DIRECTORY_MONITOR_DISCOVERY_COMPLETED_SIGNAL,
+	DIRECTORY_MONITOR_FILE_CREATED_SIGNAL,
+	DIRECTORY_MONITOR_FILE_MOVED_SIGNAL,
+	DIRECTORY_MONITOR_FILE_ALTERED_SIGNAL,
+	DIRECTORY_MONITOR_FILE_ALTERATION_COMPLETED_SIGNAL,
+	DIRECTORY_MONITOR_FILE_ATTRIBUTES_ALTERED_SIGNAL,
+	DIRECTORY_MONITOR_FILE_DELETED_SIGNAL,
+	DIRECTORY_MONITOR_DIRECTORY_CREATED_SIGNAL,
+	DIRECTORY_MONITOR_DIRECTORY_MOVED_SIGNAL,
+	DIRECTORY_MONITOR_DIRECTORY_ALTERED_SIGNAL,
+	DIRECTORY_MONITOR_DIRECTORY_ALTERATION_COMPLETED_SIGNAL,
+	DIRECTORY_MONITOR_DIRECTORY_ATTRIBUTES_ALTERED_SIGNAL,
+	DIRECTORY_MONITOR_DIRECTORY_DELETED_SIGNAL,
+	DIRECTORY_MONITOR_CLOSED_SIGNAL,
+	DIRECTORY_MONITOR_LAST_SIGNAL
+};
+static guint directory_monitor_signals[DIRECTORY_MONITOR_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -197,7 +221,9 @@ struct _DirectoryMonitorAsyncInternalNotifyDirectoryMovedData {
 	int _state_;
 	GObject* _source_object_;
 	GAsyncResult* _res_;
-	GSimpleAsyncResult* _async_result;
+	GTask* _async_result;
+	GAsyncReadyCallback _callback_;
+	gboolean _task_complete_;
 	DirectoryMonitor* self;
 	GFile* old_dir;
 	GFileInfo* old_dir_info;
@@ -297,7 +323,9 @@ struct _DirectoryMonitorAsyncNotifyDirectoryDeletedData {
 	int _state_;
 	GObject* _source_object_;
 	GAsyncResult* _res_;
-	GSimpleAsyncResult* _async_result;
+	GTask* _async_result;
+	GAsyncReadyCallback _callback_;
+	gboolean _task_complete_;
 	DirectoryMonitor* self;
 	GFile* dir;
 	gboolean already_removed;
@@ -356,7 +384,9 @@ struct _DirectoryMonitorExploreAsyncData {
 	int _state_;
 	GObject* _source_object_;
 	GAsyncResult* _res_;
-	GSimpleAsyncResult* _async_result;
+	GTask* _async_result;
+	GAsyncReadyCallback _callback_;
+	gboolean _task_complete_;
 	DirectoryMonitor* self;
 	GFile* dir;
 	GFileInfo* dir_info;
@@ -401,119 +431,118 @@ struct _DirectoryMonitorExploreAsyncData {
 	gchar* _tmp35_;
 	GFileInfo* _tmp36_;
 	GFileType _tmp37_;
-	const gchar* _tmp38_;
-	GFile* _tmp39_;
+	GFile* _tmp38_;
+	gchar* _tmp39_;
 	gchar* _tmp40_;
-	gchar* _tmp41_;
-	GFileInfo* _tmp42_;
-	GFileType _tmp43_;
-	GEnumValue* _tmp44_;
+	GFileInfo* _tmp41_;
+	GFileType _tmp42_;
+	GEnumValue* _tmp43_;
+	gchar* _tmp44_;
 	gchar* _tmp45_;
-	gchar* _tmp46_;
-	gboolean _tmp47_;
+	gboolean _tmp46_;
 	GeeHashMap* dir_map;
 	GeeHashMap* file_map;
 	GFileEnumerator* enumerator;
-	GFile* _tmp48_;
-	GCancellable* _tmp49_;
-	GFileEnumerator* _tmp50_;
-	gboolean _tmp51_;
+	GFile* _tmp47_;
+	GCancellable* _tmp48_;
+	GFileEnumerator* _tmp49_;
+	gboolean _tmp50_;
 	GList* infos;
-	GFileEnumerator* _tmp52_;
-	GCancellable* _tmp53_;
+	GFileEnumerator* _tmp51_;
+	GCancellable* _tmp52_;
+	GList* _tmp53_;
 	GList* _tmp54_;
 	GList* _tmp55_;
-	GList* _tmp56_;
 	GList* info_collection;
 	GList* info_it;
-	GFileInfo* _tmp57_;
+	GFileInfo* _tmp56_;
 	GFileInfo* info;
-	GFileInfo* _tmp58_;
+	GFileInfo* _tmp57_;
+	gchar* _tmp58_;
 	gchar* _tmp59_;
-	gchar* _tmp60_;
-	gboolean _tmp61_;
-	GFileInfo* _tmp62_;
-	GFile* _tmp63_;
+	gboolean _tmp60_;
+	GFileInfo* _tmp61_;
+	GFile* _tmp62_;
+	gchar* _tmp63_;
 	gchar* _tmp64_;
-	gchar* _tmp65_;
-	GFileInfo* _tmp66_;
-	gboolean _tmp67_;
-	GFile* _tmp68_;
-	GFileInfo* _tmp69_;
-	const gchar* _tmp70_;
+	GFileInfo* _tmp65_;
+	gboolean _tmp66_;
+	GFile* _tmp67_;
+	GFileInfo* _tmp68_;
+	const gchar* _tmp69_;
+	GFile* _tmp70_;
 	GFile* _tmp71_;
-	GFile* _tmp72_;
+	gchar* _tmp72_;
 	gchar* _tmp73_;
-	gchar* _tmp74_;
-	GFileInfo* _tmp75_;
-	gboolean _tmp76_;
-	GFileInfo* _tmp77_;
-	GFileType _tmp78_;
+	GFileInfo* _tmp74_;
+	gboolean _tmp75_;
+	GFileInfo* _tmp76_;
+	GFileType _tmp77_;
+	GeeHashMap* _tmp78_;
 	GeeHashMap* _tmp79_;
 	GeeHashMap* _tmp80_;
-	GeeHashMap* _tmp81_;
-	GFile* _tmp82_;
-	GFileInfo* _tmp83_;
-	const gchar* _tmp84_;
+	GFile* _tmp81_;
+	GFileInfo* _tmp82_;
+	const gchar* _tmp83_;
+	GFile* _tmp84_;
 	GFile* _tmp85_;
-	GFile* _tmp86_;
-	GFileInfo* _tmp87_;
+	GFileInfo* _tmp86_;
+	GeeHashMap* _tmp87_;
 	GeeHashMap* _tmp88_;
 	GeeHashMap* _tmp89_;
-	GeeHashMap* _tmp90_;
-	GFile* _tmp91_;
-	GFileInfo* _tmp92_;
-	const gchar* _tmp93_;
+	GFile* _tmp90_;
+	GFileInfo* _tmp91_;
+	const gchar* _tmp92_;
+	GFile* _tmp93_;
 	GFile* _tmp94_;
-	GFile* _tmp95_;
-	GFileInfo* _tmp96_;
+	GFileInfo* _tmp95_;
 	GError* err2;
-	GFile* _tmp97_;
+	GFile* _tmp96_;
+	gchar* _tmp97_;
 	gchar* _tmp98_;
-	gchar* _tmp99_;
-	GError* _tmp100_;
-	const gchar* _tmp101_;
+	GError* _tmp99_;
+	const gchar* _tmp100_;
+	gboolean _tmp101_;
 	gboolean _tmp102_;
-	gboolean _tmp103_;
-	GFile* _tmp104_;
-	GFileInfo* _tmp105_;
-	GFile* _tmp106_;
-	GFileInfo* _tmp107_;
-	GFile* _tmp108_;
-	GFileInfo* _tmp109_;
+	GFile* _tmp103_;
+	GFileInfo* _tmp104_;
+	GFile* _tmp105_;
+	GFileInfo* _tmp106_;
+	GFile* _tmp107_;
+	GFileInfo* _tmp108_;
+	GeeHashMap* _tmp109_;
 	GeeHashMap* _tmp110_;
-	GeeHashMap* _tmp111_;
+	gboolean _tmp111_;
 	gboolean _tmp112_;
 	gboolean _tmp113_;
-	gboolean _tmp114_;
-	GeeHashMap* _tmp115_;
+	GeeHashMap* _tmp114_;
 	GeeIterator* _subdir_it;
-	GeeHashMap* _tmp116_;
+	GeeHashMap* _tmp115_;
+	GeeSet* _tmp116_;
 	GeeSet* _tmp117_;
 	GeeSet* _tmp118_;
-	GeeSet* _tmp119_;
+	GeeIterator* _tmp119_;
 	GeeIterator* _tmp120_;
 	GeeIterator* _tmp121_;
-	GeeIterator* _tmp122_;
-	gboolean _tmp123_;
+	gboolean _tmp122_;
 	GFile* subdir;
-	GeeIterator* _tmp124_;
-	gpointer _tmp125_;
+	GeeIterator* _tmp123_;
+	gpointer _tmp124_;
+	gint _tmp125_;
 	gint _tmp126_;
-	gint _tmp127_;
-	GFile* _tmp128_;
-	GeeHashMap* _tmp129_;
-	GFile* _tmp130_;
-	gpointer _tmp131_;
-	GFileInfo* _tmp132_;
-	gboolean _tmp133_;
-	GFile* _tmp134_;
-	GeeHashMap* _tmp135_;
-	GFile* _tmp136_;
-	gpointer _tmp137_;
-	GFileInfo* _tmp138_;
+	GFile* _tmp127_;
+	GeeHashMap* _tmp128_;
+	GFile* _tmp129_;
+	gpointer _tmp130_;
+	GFileInfo* _tmp131_;
+	gboolean _tmp132_;
+	GFile* _tmp133_;
+	GeeHashMap* _tmp134_;
+	GFile* _tmp135_;
+	gpointer _tmp136_;
+	GFileInfo* _tmp137_;
+	gboolean _tmp138_;
 	gboolean _tmp139_;
-	gboolean _tmp140_;
 	GError * _inner_error_;
 };
 
@@ -521,7 +550,9 @@ struct _DirectoryMonitorNotifyDirectoryFilesData {
 	int _state_;
 	GObject* _source_object_;
 	GAsyncResult* _res_;
-	GSimpleAsyncResult* _async_result;
+	GTask* _async_result;
+	GAsyncReadyCallback _callback_;
+	gboolean _task_complete_;
 	DirectoryMonitor* self;
 	GeeMap* map;
 	gboolean in_discovery;
@@ -656,7 +687,7 @@ static void directory_monitor_real_notify_discovery_failed (DirectoryMonitor* se
 void directory_monitor_notify_discovery_completed (DirectoryMonitor* self);
 static void directory_monitor_real_notify_discovery_completed (DirectoryMonitor* self);
 static void directory_monitor_internal_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info);
-static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, GFile* file, GFileInfo* info, GFile** old_file, GFileInfo** old_file_info);
+static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, GFile* file, GFileInfo* info, GFile* * old_file, GFileInfo* * old_file_info);
 static void directory_monitor_internal_notify_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info);
 void directory_monitor_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info);
 static void directory_monitor_real_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info);
@@ -680,6 +711,7 @@ static void directory_monitor_real_notify_directory_created (DirectoryMonitor* s
 static void directory_monitor_async_internal_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFileInfo* old_dir_info, GFile* new_dir, GFileInfo* new_dir_info, GAsyncReadyCallback _callback_, gpointer _user_data_);
 static void directory_monitor_async_internal_notify_directory_moved_finish (DirectoryMonitor* self, GAsyncResult* _res_);
 static void directory_monitor_async_internal_notify_directory_moved_data_free (gpointer _data);
+static void directory_monitor_async_internal_notify_directory_moved_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data);
 static gboolean directory_monitor_async_internal_notify_directory_moved_co (DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_);
 gboolean file_equal (GFile* a, GFile* b);
 static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self);
@@ -702,6 +734,7 @@ static void directory_monitor_internal_notify_directory_deleted (DirectoryMonito
 static void directory_monitor_async_notify_directory_deleted (DirectoryMonitor* self, GFile* dir, gboolean already_removed, GAsyncReadyCallback _callback_, gpointer _user_data_);
 static void directory_monitor_async_notify_directory_deleted_finish (DirectoryMonitor* self, GAsyncResult* _res_);
 static void directory_monitor_async_notify_directory_deleted_data_free (gpointer _data);
+static void directory_monitor_async_notify_directory_deleted_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data);
 static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_);
 static void directory_monitor_async_notify_directory_deleted_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_);
 static gboolean _directory_monitor_async_notify_directory_deleted_co_gsource_func (gpointer self);
@@ -721,6 +754,7 @@ static void directory_monitor_cancel_monitor (DirectoryMonitor* self, GFileMonit
 static DirectoryMonitorFType directory_monitor_get_ftype (GFileInfo* info);
 const gchar* g_file_type_to_string (GFileType self);
 static void directory_monitor_explore_async_data_free (gpointer _data);
+static void directory_monitor_explore_async_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data);
 static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsyncData* _data_);
 static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info);
 static void directory_monitor_explore_directory_completed (DirectoryMonitor* self, gboolean in_discovery);
@@ -734,6 +768,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self);
 static void directory_monitor_notify_directory_files (DirectoryMonitor* self, GeeMap* map, gboolean in_discovery, GAsyncReadyCallback _callback_, gpointer _user_data_);
 static void directory_monitor_notify_directory_files_finish (DirectoryMonitor* self, GAsyncResult* _res_);
 static void directory_monitor_notify_directory_files_data_free (gpointer _data);
+static void directory_monitor_notify_directory_files_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data);
 static gboolean directory_monitor_notify_directory_files_co (DirectoryMonitorNotifyDirectoryFilesData* _data_);
 static gboolean _directory_monitor_notify_directory_files_co_gsource_func (gpointer self);
 static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info);
@@ -780,15 +815,15 @@ static void directory_monitor_real_closed (DirectoryMonitor* self);
 enum  {
 	DIRECTORY_MONITOR_QUERY_INFO_QUEUE_ELEMENT_DUMMY_PROPERTY
 };
-static void directory_monitor_query_info_queue_element_finalize (DirectoryMonitorQueryInfoQueueElement* obj);
+static void directory_monitor_query_info_queue_element_finalize (DirectoryMonitorQueryInfoQueueElement * obj);
 #define DIRECTORY_MONITOR_FILE_INFO_MAP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP, DirectoryMonitorFileInfoMapPrivate))
 enum  {
 	DIRECTORY_MONITOR_FILE_INFO_MAP_DUMMY_PROPERTY
 };
-static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info, GFile** normalized, gchar** id);
+static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info, GFile* * normalized, gchar* * id);
 static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfoMap* self, GeeCollection* files);
-static void directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMap* obj);
-static void directory_monitor_finalize (GObject* obj);
+static void directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMap * obj);
+static void directory_monitor_finalize (GObject * obj);
 
 
 static GType directory_monitor_ftype_get_type (void) {
@@ -806,16 +841,16 @@ static GType directory_monitor_ftype_get_type (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 465 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 810 "DirectoryMonitor.c"
+#line 845 "DirectoryMonitor.c"
 }
 
 
 DirectoryMonitor* directory_monitor_construct (GType object_type, GFile* root, gboolean recurse, gboolean monitoring) {
 	DirectoryMonitor * self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (G_IS_FILE (root), NULL);
 #line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -838,27 +873,27 @@ DirectoryMonitor* directory_monitor_construct (GType object_type, GFile* root, g
 	self->priv->monitoring = _tmp3_;
 #line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return self;
-#line 842 "DirectoryMonitor.c"
+#line 877 "DirectoryMonitor.c"
 }
 
 
 DirectoryMonitor* directory_monitor_new (GFile* root, gboolean recurse, gboolean monitoring) {
 #line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return directory_monitor_construct (TYPE_DIRECTORY_MONITOR, root, recurse, monitoring);
-#line 849 "DirectoryMonitor.c"
+#line 884 "DirectoryMonitor.c"
 }
 
 
 void directory_monitor_mdbg (const gchar* msg) {
 #line 470 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (msg != NULL);
-#line 856 "DirectoryMonitor.c"
+#line 891 "DirectoryMonitor.c"
 }
 
 
 gboolean directory_monitor_is_recursive (DirectoryMonitor* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 476 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE);
 #line 477 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -867,13 +902,13 @@ gboolean directory_monitor_is_recursive (DirectoryMonitor* self) {
 	result = _tmp0_;
 #line 477 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 871 "DirectoryMonitor.c"
+#line 906 "DirectoryMonitor.c"
 }
 
 
 gboolean directory_monitor_is_monitoring (DirectoryMonitor* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 480 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE);
 #line 481 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -882,15 +917,15 @@ gboolean directory_monitor_is_monitoring (DirectoryMonitor* self) {
 	result = _tmp0_;
 #line 481 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 886 "DirectoryMonitor.c"
+#line 921 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_root_deleted (DirectoryMonitor* self, GFile* root) {
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GFile* _tmp3_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
+	GFile* _tmp3_;
 #line 484 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (root));
 #line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -906,8 +941,8 @@ static void directory_monitor_real_notify_root_deleted (DirectoryMonitor* self,
 #line 488 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp3_ = root;
 #line 488 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "root-deleted", _tmp3_);
-#line 911 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_ROOT_DELETED_SIGNAL], 0, _tmp3_);
+#line 946 "DirectoryMonitor.c"
 }
 
 
@@ -916,25 +951,25 @@ void directory_monitor_notify_root_deleted (DirectoryMonitor* self, GFile* root)
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 484 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_root_deleted (self, root);
-#line 920 "DirectoryMonitor.c"
+#line 955 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_internal_notify_root_moved (DirectoryMonitor* self, GFile* old_root, GFile* new_root, GFileInfo* new_root_info) {
 	gboolean removed = FALSE;
-	DirectoryMonitorFileInfoMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	DirectoryMonitorFileInfoMap* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 	gboolean updated = FALSE;
-	DirectoryMonitorFileInfoMap* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFileInfo* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	GFile* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	GFile* _tmp10_ = NULL;
-	GFileInfo* _tmp11_ = NULL;
+	DirectoryMonitorFileInfoMap* _tmp3_;
+	GFile* _tmp4_;
+	GFileInfo* _tmp5_;
+	gboolean _tmp6_;
+	GFile* _tmp7_;
+	GFile* _tmp8_;
+	GFile* _tmp9_;
+	GFile* _tmp10_;
+	GFileInfo* _tmp11_;
 #line 491 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 491 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -981,25 +1016,25 @@ static void directory_monitor_internal_notify_root_moved (DirectoryMonitor* self
 	_tmp11_ = new_root_info;
 #line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_notify_root_moved (self, _tmp9_, _tmp10_, _tmp11_);
-#line 985 "DirectoryMonitor.c"
+#line 1020 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_root_moved (DirectoryMonitor* self, GFile* old_root, GFile* new_root, GFileInfo* new_root_info) {
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GFile* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	GFile* _tmp11_ = NULL;
-	GFile* _tmp12_ = NULL;
-	GFileInfo* _tmp13_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
+	GFile* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	GFile* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	GFile* _tmp11_;
+	GFile* _tmp12_;
+	GFileInfo* _tmp13_;
 #line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (old_root));
 #line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1045,8 +1080,8 @@ static void directory_monitor_real_notify_root_moved (DirectoryMonitor* self, GF
 #line 507 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp13_ = new_root_info;
 #line 507 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "root-moved", _tmp11_, _tmp12_, _tmp13_);
-#line 1050 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_ROOT_MOVED_SIGNAL], 0, _tmp11_, _tmp12_, _tmp13_);
+#line 1085 "DirectoryMonitor.c"
 }
 
 
@@ -1055,7 +1090,7 @@ void directory_monitor_notify_root_moved (DirectoryMonitor* self, GFile* old_roo
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_root_moved (self, old_root, new_root, new_root_info);
-#line 1059 "DirectoryMonitor.c"
+#line 1094 "DirectoryMonitor.c"
 }
 
 
@@ -1063,8 +1098,8 @@ static void directory_monitor_real_notify_discovery_started (DirectoryMonitor* s
 #line 511 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_mdbg ("discovery started");
 #line 512 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "discovery-started");
-#line 1068 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DISCOVERY_STARTED_SIGNAL], 0);
+#line 1103 "DirectoryMonitor.c"
 }
 
 
@@ -1073,17 +1108,17 @@ void directory_monitor_notify_discovery_started (DirectoryMonitor* self) {
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_discovery_started (self);
-#line 1077 "DirectoryMonitor.c"
+#line 1112 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_internal_notify_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) {
-	DirectoryMonitorFileInfoMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFileInfo* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	GFile* _tmp7_ = NULL;
-	GFileInfo* _tmp8_ = NULL;
+	DirectoryMonitorFileInfoMap* _tmp0_;
+	GFile* _tmp1_;
+	GFileInfo* _tmp2_;
+	gboolean _tmp3_;
+	GFile* _tmp7_;
+	GFileInfo* _tmp8_;
 #line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
 #line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1098,10 +1133,10 @@ static void directory_monitor_real_internal_notify_file_discovered (DirectoryMon
 	_tmp3_ = directory_monitor_file_info_map_update (_tmp0_, _tmp1_, _tmp2_);
 #line 516 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (!_tmp3_) {
-#line 1102 "DirectoryMonitor.c"
-		GFile* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+#line 1137 "DirectoryMonitor.c"
+		GFile* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp4_ = file;
 #line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1115,7 +1150,7 @@ static void directory_monitor_real_internal_notify_file_discovered (DirectoryMon
 		_g_free0 (_tmp6_);
 #line 520 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return;
-#line 1118 "DirectoryMonitor.c"
+#line 1153 "DirectoryMonitor.c"
 	}
 #line 523 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp7_ = file;
@@ -1123,7 +1158,7 @@ static void directory_monitor_real_internal_notify_file_discovered (DirectoryMon
 	_tmp8_ = info;
 #line 523 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_notify_file_discovered (self, _tmp7_, _tmp8_);
-#line 1126 "DirectoryMonitor.c"
+#line 1161 "DirectoryMonitor.c"
 }
 
 
@@ -1132,18 +1167,18 @@ void directory_monitor_internal_notify_file_discovered (DirectoryMonitor* self,
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->internal_notify_file_discovered (self, file, info);
-#line 1135 "DirectoryMonitor.c"
+#line 1170 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) {
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFileInfo* _tmp6_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GFile* _tmp5_;
+	GFileInfo* _tmp6_;
 #line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
 #line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1169,8 +1204,8 @@ static void directory_monitor_real_notify_file_discovered (DirectoryMonitor* sel
 #line 528 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp6_ = info;
 #line 528 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "file-discovered", _tmp5_, _tmp6_);
-#line 1173 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_DISCOVERED_SIGNAL], 0, _tmp5_, _tmp6_);
+#line 1208 "DirectoryMonitor.c"
 }
 
 
@@ -1179,18 +1214,18 @@ void directory_monitor_notify_file_discovered (DirectoryMonitor* self, GFile* fi
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_discovered (self, file, info);
-#line 1182 "DirectoryMonitor.c"
+#line 1217 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_internal_notify_directory_discovered (DirectoryMonitor* self, GFile* dir, GFileInfo* info) {
 	gboolean updated = FALSE;
-	DirectoryMonitorFileInfoMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFileInfo* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	GFile* _tmp4_ = NULL;
-	GFileInfo* _tmp5_ = NULL;
+	DirectoryMonitorFileInfoMap* _tmp0_;
+	GFile* _tmp1_;
+	GFileInfo* _tmp2_;
+	gboolean _tmp3_;
+	GFile* _tmp4_;
+	GFileInfo* _tmp5_;
 #line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (dir));
 #line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1213,7 +1248,7 @@ static void directory_monitor_real_internal_notify_directory_discovered (Directo
 	_tmp5_ = info;
 #line 535 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_notify_directory_discovered (self, _tmp4_, _tmp5_);
-#line 1216 "DirectoryMonitor.c"
+#line 1251 "DirectoryMonitor.c"
 }
 
 
@@ -1222,18 +1257,18 @@ void directory_monitor_internal_notify_directory_discovered (DirectoryMonitor* s
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->internal_notify_directory_discovered (self, dir, info);
-#line 1225 "DirectoryMonitor.c"
+#line 1260 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_directory_discovered (DirectoryMonitor* self, GFile* dir, GFileInfo* info) {
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFileInfo* _tmp6_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GFile* _tmp5_;
+	GFileInfo* _tmp6_;
 #line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (dir));
 #line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1259,8 +1294,8 @@ static void directory_monitor_real_notify_directory_discovered (DirectoryMonitor
 #line 540 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp6_ = info;
 #line 540 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "directory-discovered", _tmp5_, _tmp6_);
-#line 1263 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_DISCOVERED_SIGNAL], 0, _tmp5_, _tmp6_);
+#line 1298 "DirectoryMonitor.c"
 }
 
 
@@ -1269,13 +1304,13 @@ void directory_monitor_notify_directory_discovered (DirectoryMonitor* self, GFil
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_discovered (self, dir, info);
-#line 1272 "DirectoryMonitor.c"
+#line 1307 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_discovery_failed (DirectoryMonitor* self, const gchar* reason) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 #line 543 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (reason != NULL);
 #line 544 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1285,8 +1320,8 @@ static void directory_monitor_real_notify_discovery_failed (DirectoryMonitor* se
 #line 545 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp1_ = reason;
 #line 545 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "discovery-failed", _tmp1_);
-#line 1289 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DISCOVERY_FAILED_SIGNAL], 0, _tmp1_);
+#line 1324 "DirectoryMonitor.c"
 }
 
 
@@ -1295,14 +1330,14 @@ void directory_monitor_notify_discovery_failed (DirectoryMonitor* self, const gc
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 543 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_discovery_failed (self, reason);
-#line 1298 "DirectoryMonitor.c"
+#line 1333 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_discovery_completed (DirectoryMonitor* self) {
 #line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "discovery-completed");
-#line 1305 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DISCOVERY_COMPLETED_SIGNAL], 0);
+#line 1340 "DirectoryMonitor.c"
 }
 
 
@@ -1311,18 +1346,18 @@ void directory_monitor_notify_discovery_completed (DirectoryMonitor* self) {
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 548 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_discovery_completed (self);
-#line 1314 "DirectoryMonitor.c"
+#line 1349 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_internal_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info) {
 	GFile* old_file = NULL;
 	GFileInfo* old_file_info = NULL;
-	GFile* _tmp0_ = NULL;
-	GFileInfo* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFileInfo* _tmp1_;
 	GFile* _tmp2_ = NULL;
 	GFileInfo* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp4_;
 #line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1345,10 +1380,10 @@ static void directory_monitor_internal_notify_file_created (DirectoryMonitor* se
 	old_file_info = _tmp3_;
 #line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp4_) {
-#line 1348 "DirectoryMonitor.c"
-		GFile* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		GFileInfo* _tmp7_ = NULL;
+#line 1383 "DirectoryMonitor.c"
+		GFile* _tmp5_;
+		GFile* _tmp6_;
+		GFileInfo* _tmp7_;
 #line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp5_ = old_file;
 #line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1357,16 +1392,16 @@ static void directory_monitor_internal_notify_file_created (DirectoryMonitor* se
 		_tmp7_ = info;
 #line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_internal_notify_file_moved (self, _tmp5_, _tmp6_, _tmp7_);
-#line 1360 "DirectoryMonitor.c"
+#line 1395 "DirectoryMonitor.c"
 	} else {
 		gboolean updated = FALSE;
-		DirectoryMonitorFileInfoMap* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
-		GFileInfo* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
-		gboolean _tmp12_ = FALSE;
-		GFile* _tmp13_ = NULL;
-		GFileInfo* _tmp14_ = NULL;
+		DirectoryMonitorFileInfoMap* _tmp8_;
+		GFile* _tmp9_;
+		GFileInfo* _tmp10_;
+		gboolean _tmp11_;
+		gboolean _tmp12_;
+		GFile* _tmp13_;
+		GFileInfo* _tmp14_;
 #line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp8_ = self->priv->files;
 #line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1387,24 +1422,24 @@ static void directory_monitor_internal_notify_file_created (DirectoryMonitor* se
 		_tmp14_ = info;
 #line 561 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_notify_file_created (self, _tmp13_, _tmp14_);
-#line 1390 "DirectoryMonitor.c"
+#line 1425 "DirectoryMonitor.c"
 	}
 #line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (old_file_info);
 #line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (old_file);
-#line 1396 "DirectoryMonitor.c"
+#line 1431 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info) {
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFileInfo* _tmp6_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GFile* _tmp5_;
+	GFileInfo* _tmp6_;
 #line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
 #line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1430,8 +1465,8 @@ static void directory_monitor_real_notify_file_created (DirectoryMonitor* self,
 #line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp6_ = info;
 #line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "file-created", _tmp5_, _tmp6_);
-#line 1434 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_CREATED_SIGNAL], 0, _tmp5_, _tmp6_);
+#line 1469 "DirectoryMonitor.c"
 }
 
 
@@ -1440,21 +1475,21 @@ void directory_monitor_notify_file_created (DirectoryMonitor* self, GFile* file,
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_created (self, file, info);
-#line 1443 "DirectoryMonitor.c"
+#line 1478 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_internal_notify_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) {
-	DirectoryMonitorFileInfoMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	DirectoryMonitorFileInfoMap* _tmp0_;
+	GFile* _tmp1_;
 	gboolean updated = FALSE;
-	DirectoryMonitorFileInfoMap* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFileInfo* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	GFile* _tmp6_ = NULL;
-	GFile* _tmp7_ = NULL;
-	GFileInfo* _tmp8_ = NULL;
+	DirectoryMonitorFileInfoMap* _tmp2_;
+	GFile* _tmp3_;
+	GFileInfo* _tmp4_;
+	gboolean _tmp5_;
+	GFile* _tmp6_;
+	GFile* _tmp7_;
+	GFileInfo* _tmp8_;
 #line 570 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 570 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1489,22 +1524,22 @@ static void directory_monitor_internal_notify_file_moved (DirectoryMonitor* self
 	_tmp8_ = new_file_info;
 #line 578 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_notify_file_moved (self, _tmp6_, _tmp7_, _tmp8_);
-#line 1492 "DirectoryMonitor.c"
+#line 1527 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) {
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	GFileInfo* _tmp10_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	GFile* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	GFile* _tmp8_;
+	GFile* _tmp9_;
+	GFileInfo* _tmp10_;
 #line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (old_file));
 #line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1542,8 +1577,8 @@ static void directory_monitor_real_notify_file_moved (DirectoryMonitor* self, GF
 #line 583 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp10_ = new_file_info;
 #line 583 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "file-moved", _tmp8_, _tmp9_, _tmp10_);
-#line 1546 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_MOVED_SIGNAL], 0, _tmp8_, _tmp9_, _tmp10_);
+#line 1581 "DirectoryMonitor.c"
 }
 
 
@@ -1552,17 +1587,17 @@ void directory_monitor_notify_file_moved (DirectoryMonitor* self, GFile* old_fil
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_moved (self, old_file, new_file, new_file_info);
-#line 1555 "DirectoryMonitor.c"
+#line 1590 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_file_altered (DirectoryMonitor* self, GFile* file) {
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GFile* _tmp5_;
 #line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
 #line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1584,8 +1619,8 @@ static void directory_monitor_real_notify_file_altered (DirectoryMonitor* self,
 #line 588 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp5_ = file;
 #line 588 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "file-altered", _tmp5_);
-#line 1588 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_ALTERED_SIGNAL], 0, _tmp5_);
+#line 1623 "DirectoryMonitor.c"
 }
 
 
@@ -1594,18 +1629,18 @@ void directory_monitor_notify_file_altered (DirectoryMonitor* self, GFile* file)
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_altered (self, file);
-#line 1597 "DirectoryMonitor.c"
+#line 1632 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_internal_notify_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info) {
 	gboolean updated = FALSE;
-	DirectoryMonitorFileInfoMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFileInfo* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	GFile* _tmp4_ = NULL;
-	GFileInfo* _tmp5_ = NULL;
+	DirectoryMonitorFileInfoMap* _tmp0_;
+	GFile* _tmp1_;
+	GFileInfo* _tmp2_;
+	gboolean _tmp3_;
+	GFile* _tmp4_;
+	GFileInfo* _tmp5_;
 #line 591 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 591 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1630,18 +1665,18 @@ static void directory_monitor_internal_notify_file_alteration_completed (Directo
 	_tmp5_ = info;
 #line 595 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_notify_file_alteration_completed (self, _tmp4_, _tmp5_);
-#line 1633 "DirectoryMonitor.c"
+#line 1668 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info) {
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFileInfo* _tmp6_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GFile* _tmp5_;
+	GFileInfo* _tmp6_;
 #line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
 #line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1667,8 +1702,8 @@ static void directory_monitor_real_notify_file_alteration_completed (DirectoryMo
 #line 600 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp6_ = info;
 #line 600 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "file-alteration-completed", _tmp5_, _tmp6_);
-#line 1671 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_ALTERATION_COMPLETED_SIGNAL], 0, _tmp5_, _tmp6_);
+#line 1706 "DirectoryMonitor.c"
 }
 
 
@@ -1677,17 +1712,17 @@ void directory_monitor_notify_file_alteration_completed (DirectoryMonitor* self,
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_alteration_completed (self, file, info);
-#line 1680 "DirectoryMonitor.c"
+#line 1715 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_file_attributes_altered (DirectoryMonitor* self, GFile* file) {
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GFile* _tmp5_;
 #line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
 #line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1709,8 +1744,8 @@ static void directory_monitor_real_notify_file_attributes_altered (DirectoryMoni
 #line 605 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp5_ = file;
 #line 605 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "file-attributes-altered", _tmp5_);
-#line 1713 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_ATTRIBUTES_ALTERED_SIGNAL], 0, _tmp5_);
+#line 1748 "DirectoryMonitor.c"
 }
 
 
@@ -1719,16 +1754,16 @@ void directory_monitor_notify_file_attributes_altered (DirectoryMonitor* self, G
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_attributes_altered (self, file);
-#line 1722 "DirectoryMonitor.c"
+#line 1757 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_internal_notify_file_deleted (DirectoryMonitor* self, GFile* file) {
 	gboolean removed = FALSE;
-	DirectoryMonitorFileInfoMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GFile* _tmp3_ = NULL;
+	DirectoryMonitorFileInfoMap* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
+	GFile* _tmp3_;
 #line 608 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 608 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1747,17 +1782,17 @@ static void directory_monitor_internal_notify_file_deleted (DirectoryMonitor* se
 	_tmp3_ = file;
 #line 612 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_notify_file_deleted (self, _tmp3_);
-#line 1750 "DirectoryMonitor.c"
+#line 1785 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_file_deleted (DirectoryMonitor* self, GFile* file) {
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GFile* _tmp5_;
 #line 615 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
 #line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1779,8 +1814,8 @@ static void directory_monitor_real_notify_file_deleted (DirectoryMonitor* self,
 #line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp5_ = file;
 #line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "file-deleted", _tmp5_);
-#line 1783 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_DELETED_SIGNAL], 0, _tmp5_);
+#line 1818 "DirectoryMonitor.c"
 }
 
 
@@ -1789,18 +1824,18 @@ void directory_monitor_notify_file_deleted (DirectoryMonitor* self, GFile* file)
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 615 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_deleted (self, file);
-#line 1792 "DirectoryMonitor.c"
+#line 1827 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_internal_notify_directory_created (DirectoryMonitor* self, GFile* dir, GFileInfo* info) {
 	GFile* old_dir = NULL;
 	GFileInfo* old_dir_info = NULL;
-	GFile* _tmp0_ = NULL;
-	GFileInfo* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFileInfo* _tmp1_;
 	GFile* _tmp2_ = NULL;
 	GFileInfo* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp4_;
 #line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1823,14 +1858,14 @@ static void directory_monitor_internal_notify_directory_created (DirectoryMonito
 	old_dir_info = _tmp3_;
 #line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp4_) {
-#line 1826 "DirectoryMonitor.c"
-		DirectoryMonitorFileInfoMap* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		DirectoryMonitorFileInfoMap* _tmp7_ = NULL;
-		GFile* _tmp8_ = NULL;
-		GFileInfo* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
-		GFileInfo* _tmp11_ = NULL;
+#line 1861 "DirectoryMonitor.c"
+		DirectoryMonitorFileInfoMap* _tmp5_;
+		GFile* _tmp6_;
+		DirectoryMonitorFileInfoMap* _tmp7_;
+		GFile* _tmp8_;
+		GFileInfo* _tmp9_;
+		GFile* _tmp10_;
+		GFileInfo* _tmp11_;
 #line 629 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp5_ = self->priv->files;
 #line 629 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1849,16 +1884,16 @@ static void directory_monitor_internal_notify_directory_created (DirectoryMonito
 		_tmp11_ = info;
 #line 631 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_internal_notify_directory_moved (self, _tmp8_, _tmp9_, _tmp10_, _tmp11_);
-#line 1852 "DirectoryMonitor.c"
+#line 1887 "DirectoryMonitor.c"
 	} else {
 		gboolean updated = FALSE;
-		DirectoryMonitorFileInfoMap* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		GFileInfo* _tmp14_ = NULL;
-		gboolean _tmp15_ = FALSE;
-		gboolean _tmp16_ = FALSE;
-		GFile* _tmp17_ = NULL;
-		GFileInfo* _tmp18_ = NULL;
+		DirectoryMonitorFileInfoMap* _tmp12_;
+		GFile* _tmp13_;
+		GFileInfo* _tmp14_;
+		gboolean _tmp15_;
+		gboolean _tmp16_;
+		GFile* _tmp17_;
+		GFileInfo* _tmp18_;
 #line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp12_ = self->priv->files;
 #line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1879,24 +1914,24 @@ static void directory_monitor_internal_notify_directory_created (DirectoryMonito
 		_tmp18_ = info;
 #line 636 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_notify_directory_created (self, _tmp17_, _tmp18_);
-#line 1882 "DirectoryMonitor.c"
+#line 1917 "DirectoryMonitor.c"
 	}
 #line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (old_dir_info);
 #line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (old_dir);
-#line 1888 "DirectoryMonitor.c"
+#line 1923 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_directory_created (DirectoryMonitor* self, GFile* dir, GFileInfo* info) {
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFileInfo* _tmp6_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GFile* _tmp5_;
+	GFileInfo* _tmp6_;
 #line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (dir));
 #line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1922,8 +1957,8 @@ static void directory_monitor_real_notify_directory_created (DirectoryMonitor* s
 #line 642 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp6_ = info;
 #line 642 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "directory-created", _tmp5_, _tmp6_);
-#line 1926 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_CREATED_SIGNAL], 0, _tmp5_, _tmp6_);
+#line 1961 "DirectoryMonitor.c"
 }
 
 
@@ -1932,15 +1967,15 @@ void directory_monitor_notify_directory_created (DirectoryMonitor* self, GFile*
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_created (self, dir, info);
-#line 1935 "DirectoryMonitor.c"
+#line 1970 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_internal_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFileInfo* old_dir_info, GFile* new_dir, GFileInfo* new_dir_info) {
-	GFile* _tmp0_ = NULL;
-	GFileInfo* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFileInfo* _tmp3_ = NULL;
+	GFile* _tmp0_;
+	GFileInfo* _tmp1_;
+	GFile* _tmp2_;
+	GFileInfo* _tmp3_;
 #line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -1961,7 +1996,7 @@ static void directory_monitor_internal_notify_directory_moved (DirectoryMonitor*
 	_tmp3_ = new_dir_info;
 #line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_async_internal_notify_directory_moved (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_, NULL, NULL);
-#line 1964 "DirectoryMonitor.c"
+#line 1999 "DirectoryMonitor.c"
 }
 
 
@@ -1980,27 +2015,51 @@ static void directory_monitor_async_internal_notify_directory_moved_data_free (g
 	_g_object_unref0 (_data_->self);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_slice_free (DirectoryMonitorAsyncInternalNotifyDirectoryMovedData, _data_);
-#line 1983 "DirectoryMonitor.c"
+#line 2018 "DirectoryMonitor.c"
+}
+
+
+static void directory_monitor_async_internal_notify_directory_moved_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) {
+	DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _task_data_;
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	_task_data_ = g_task_get_task_data (G_TASK (res));
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	if (_task_data_->_callback_ != NULL) {
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+		_task_data_->_callback_ (source_object, res, user_data);
+#line 2030 "DirectoryMonitor.c"
+	}
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	_task_data_->_task_complete_ = TRUE;
+#line 2034 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_async_internal_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFileInfo* old_dir_info, GFile* new_dir, GFileInfo* new_dir_info, GAsyncReadyCallback _callback_, gpointer _user_data_) {
 	DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_;
-	DirectoryMonitor* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFileInfo* _tmp3_ = NULL;
-	GFileInfo* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	GFileInfo* _tmp7_ = NULL;
-	GFileInfo* _tmp8_ = NULL;
+	DirectoryMonitor* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	GFileInfo* _tmp3_;
+	GFileInfo* _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
+	GFileInfo* _tmp7_;
+	GFileInfo* _tmp8_;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_ = g_slice_new0 (DirectoryMonitorAsyncInternalNotifyDirectoryMovedData);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, directory_monitor_async_internal_notify_directory_moved);
+	_data_->_callback_ = _callback_;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, directory_monitor_async_internal_notify_directory_moved_data_free);
+	_data_->_async_result = g_task_new (G_OBJECT (self), NULL, directory_monitor_async_internal_notify_directory_moved_async_ready_wrapper, _user_data_);
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	if (_callback_ == NULL) {
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+		_data_->_task_complete_ = TRUE;
+#line 2059 "DirectoryMonitor.c"
+	}
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	g_task_set_task_data (_data_->_async_result, _data_, directory_monitor_async_internal_notify_directory_moved_data_free);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp0_ = _g_object_ref0 (self);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -2039,15 +2098,15 @@ static void directory_monitor_async_internal_notify_directory_moved (DirectoryMo
 	_data_->new_dir_info = _tmp8_;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_async_internal_notify_directory_moved_co (_data_);
-#line 2042 "DirectoryMonitor.c"
+#line 2101 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_async_internal_notify_directory_moved_finish (DirectoryMonitor* self, GAsyncResult* _res_) {
 	DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
-#line 2050 "DirectoryMonitor.c"
+	_data_ = g_task_propagate_pointer (G_TASK (_res_), NULL);
+#line 2109 "DirectoryMonitor.c"
 }
 
 
@@ -2056,7 +2115,7 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer
 	result = file_equal ((GFile*) a, (GFile*) b);
 #line 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 2059 "DirectoryMonitor.c"
+#line 2118 "DirectoryMonitor.c"
 }
 
 
@@ -2069,8 +2128,10 @@ static void directory_monitor_async_internal_notify_directory_moved_ready (GObje
 #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_res_ = _res_;
 #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	_data_->_task_complete_ = TRUE;
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_async_internal_notify_directory_moved_co (_data_);
-#line 2073 "DirectoryMonitor.c"
+#line 2134 "DirectoryMonitor.c"
 }
 
 
@@ -2079,7 +2140,7 @@ static gboolean _directory_monitor_async_internal_notify_directory_moved_co_gsou
 	result = directory_monitor_async_internal_notify_directory_moved_co (self);
 #line 683 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 2082 "DirectoryMonitor.c"
+#line 2143 "DirectoryMonitor.c"
 }
 
 
@@ -2088,85 +2149,59 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire
 	switch (_data_->_state_) {
 #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case 0:
-#line 2091 "DirectoryMonitor.c"
+#line 2152 "DirectoryMonitor.c"
 		goto _state_0;
 #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case 1:
-#line 2095 "DirectoryMonitor.c"
+#line 2156 "DirectoryMonitor.c"
 		goto _state_1;
 #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case 2:
-#line 2099 "DirectoryMonitor.c"
+#line 2160 "DirectoryMonitor.c"
 		goto _state_2;
 		default:
 #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		g_assert_not_reached ();
-#line 2104 "DirectoryMonitor.c"
+#line 2165 "DirectoryMonitor.c"
 	}
 	_state_0:
 #line 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp0_ = NULL;
-#line 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->file_children = _data_->_tmp0_;
 #line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp1_ = NULL;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->dir_children = _data_->_tmp1_;
 #line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp2_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp2_ = _data_->self->priv->files;
 #line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp3_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp3_ = _data_->old_dir;
 #line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp4_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp4_ = _data_->file_children;
 #line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp5_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp5_ = _data_->dir_children;
 #line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp6_ = 0;
-#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp6_ = directory_monitor_file_info_map_get_children (_data_->_tmp2_, _data_->_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->count = _data_->_tmp6_;
 #line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp7_ = 0;
-#line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp7_ = _data_->count;
 #line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_data_->_tmp7_ > 0) {
-#line 2147 "DirectoryMonitor.c"
+#line 2192 "DirectoryMonitor.c"
 		{
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp8_ = NULL;
-#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp8_ = _data_->dir_children;
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp9_ = NULL;
-#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp9_ = _g_object_ref0 (_data_->_tmp8_);
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_dir_child_list = _data_->_tmp9_;
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp10_ = NULL;
-#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp10_ = _data_->_dir_child_list;
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp11_ = 0;
-#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp12_ = 0;
-#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp12_ = _data_->_tmp11_;
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_dir_child_size = _data_->_tmp12_;
@@ -2175,70 +2210,44 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			while (TRUE) {
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp13_ = 0;
-#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp13_ = _data_->_dir_child_index;
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_dir_child_index = _data_->_tmp13_ + 1;
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp14_ = 0;
-#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp14_ = _data_->_dir_child_index;
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp15_ = 0;
-#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp15_ = _data_->_dir_child_size;
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				if (!(_data_->_tmp14_ < _data_->_tmp15_)) {
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 2195 "DirectoryMonitor.c"
+#line 2224 "DirectoryMonitor.c"
 				}
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp16_ = NULL;
-#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp16_ = _data_->_dir_child_list;
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp17_ = 0;
-#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp17_ = _data_->_dir_child_index;
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp18_ = NULL;
-#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp17_);
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->dir_child = (GFile*) _data_->_tmp18_;
 #line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp19_ = NULL;
-#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp19_ = _data_->self->priv->files;
 #line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp20_ = NULL;
-#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp20_ = _data_->dir_child;
 #line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp21_ = NULL;
-#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp21_ = directory_monitor_file_info_map_get_info (_data_->_tmp19_, _data_->_tmp20_);
 #line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->dir_info = _data_->_tmp21_;
 #line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp22_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp22_ = _data_->dir_info;
 #line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				if (_data_->_tmp22_ == NULL) {
 #line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp23_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_data_->_tmp23_ = _data_->dir_child;
 #line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp24_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_data_->_tmp24_ = g_file_get_path (_data_->_tmp23_);
 #line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp25_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_data_->_tmp25_ = _data_->_tmp24_;
 #line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					g_warning ("DirectoryMonitor.vala:662: Unable to retrieve directory-moved info for" \
@@ -2251,43 +2260,25 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire
 					_g_object_unref0 (_data_->dir_child);
 #line 664 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					continue;
-#line 2253 "DirectoryMonitor.c"
+#line 2262 "DirectoryMonitor.c"
 				}
 #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp26_ = NULL;
-#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp26_ = _data_->dir_child;
 #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp27_ = NULL;
-#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp27_ = _data_->dir_info;
 #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp28_ = NULL;
-#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp28_ = _data_->new_dir;
 #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp29_ = NULL;
-#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp29_ = _data_->dir_child;
 #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp30_ = NULL;
-#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp30_ = g_file_get_basename (_data_->_tmp29_);
 #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp31_ = NULL;
-#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp31_ = _data_->_tmp30_;
 #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp32_ = NULL;
-#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp32_ = g_file_get_child (_data_->_tmp28_, _data_->_tmp31_);
 #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp33_ = NULL;
-#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp33_ = _data_->_tmp32_;
 #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp34_ = NULL;
-#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp34_ = _data_->dir_info;
 #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_state_ = 1;
@@ -2295,7 +2286,7 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire
 				directory_monitor_async_internal_notify_directory_moved (_data_->self, _data_->_tmp26_, _data_->_tmp27_, _data_->_tmp33_, _data_->_tmp34_, directory_monitor_async_internal_notify_directory_moved_ready, _data_);
 #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				return FALSE;
-#line 2297 "DirectoryMonitor.c"
+#line 2288 "DirectoryMonitor.c"
 				_state_1:
 #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				directory_monitor_async_internal_notify_directory_moved_finish (_data_->self, _data_->_res_);
@@ -2307,34 +2298,24 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire
 				_g_object_unref0 (_data_->dir_info);
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_g_object_unref0 (_data_->dir_child);
-#line 2309 "DirectoryMonitor.c"
+#line 2300 "DirectoryMonitor.c"
 			}
 #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (_data_->_dir_child_list);
-#line 2313 "DirectoryMonitor.c"
+#line 2304 "DirectoryMonitor.c"
 		}
 		{
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp35_ = NULL;
-#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp35_ = _data_->file_children;
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp36_ = NULL;
-#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp36_ = _g_object_ref0 (_data_->_tmp35_);
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_file_child_list = _data_->_tmp36_;
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp37_ = NULL;
-#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp37_ = _data_->_file_child_list;
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp38_ = 0;
-#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp38_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp39_ = 0;
-#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp39_ = _data_->_tmp38_;
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_file_child_size = _data_->_tmp39_;
@@ -2343,70 +2324,44 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			while (TRUE) {
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp40_ = 0;
-#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp40_ = _data_->_file_child_index;
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_file_child_index = _data_->_tmp40_ + 1;
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp41_ = 0;
-#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp41_ = _data_->_file_child_index;
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp42_ = 0;
-#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp42_ = _data_->_file_child_size;
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				if (!(_data_->_tmp41_ < _data_->_tmp42_)) {
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 2362 "DirectoryMonitor.c"
+#line 2337 "DirectoryMonitor.c"
 				}
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp43_ = NULL;
-#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp43_ = _data_->_file_child_list;
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp44_ = 0;
-#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp44_ = _data_->_file_child_index;
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp45_ = NULL;
-#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp45_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp43_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp44_);
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->file_child = (GFile*) _data_->_tmp45_;
 #line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp46_ = NULL;
-#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp46_ = _data_->self->priv->files;
 #line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp47_ = NULL;
-#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp47_ = _data_->file_child;
 #line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp48_ = NULL;
-#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp48_ = directory_monitor_file_info_map_get_info (_data_->_tmp46_, _data_->_tmp47_);
 #line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->file_info = _data_->_tmp48_;
 #line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp49_ = NULL;
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp49_ = _data_->file_info;
 #line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				if (_data_->_tmp49_ == NULL) {
 #line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp50_ = NULL;
-#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_data_->_tmp50_ = _data_->file_child;
 #line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp51_ = NULL;
-#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_data_->_tmp51_ = g_file_get_path (_data_->_tmp50_);
 #line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp52_ = NULL;
-#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_data_->_tmp52_ = _data_->_tmp51_;
 #line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					g_warning ("DirectoryMonitor.vala:675: Unable to retrieve directory-moved info for" \
@@ -2419,39 +2374,23 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire
 					_g_object_unref0 (_data_->file_child);
 #line 677 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					continue;
-#line 2420 "DirectoryMonitor.c"
+#line 2375 "DirectoryMonitor.c"
 				}
 #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp53_ = NULL;
-#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp53_ = _data_->file_child;
 #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp54_ = NULL;
-#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp54_ = _data_->new_dir;
 #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp55_ = NULL;
-#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp55_ = _data_->file_child;
 #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp56_ = NULL;
-#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp56_ = g_file_get_basename (_data_->_tmp55_);
 #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp57_ = NULL;
-#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp57_ = _data_->_tmp56_;
 #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp58_ = NULL;
-#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp58_ = g_file_get_child (_data_->_tmp54_, _data_->_tmp57_);
 #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp59_ = NULL;
-#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp59_ = _data_->_tmp58_;
 #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp60_ = NULL;
-#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp60_ = _data_->file_info;
 #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				directory_monitor_internal_notify_file_moved (_data_->self, _data_->_tmp53_, _data_->_tmp59_, _data_->_tmp60_);
@@ -2465,81 +2404,55 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire
 				_data_->_state_ = 2;
 #line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				return FALSE;
-#line 2466 "DirectoryMonitor.c"
+#line 2405 "DirectoryMonitor.c"
 				_state_2:
 				;
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_g_object_unref0 (_data_->file_info);
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_g_object_unref0 (_data_->file_child);
-#line 2473 "DirectoryMonitor.c"
+#line 2412 "DirectoryMonitor.c"
 			}
 #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (_data_->_file_child_list);
-#line 2477 "DirectoryMonitor.c"
+#line 2416 "DirectoryMonitor.c"
 		}
 	}
 #line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp61_ = NULL;
-#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp61_ = _data_->self->priv->files;
 #line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp62_ = NULL;
-#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp62_ = _data_->old_dir;
 #line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_file_info_map_remove (_data_->_tmp61_, _data_->_tmp62_, NULL);
 #line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp63_ = NULL;
-#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp63_ = _data_->self->priv->files;
 #line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp64_ = NULL;
-#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp64_ = _data_->new_dir;
 #line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp65_ = NULL;
-#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp65_ = _data_->new_dir_info;
 #line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp66_ = FALSE;
-#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp66_ = directory_monitor_file_info_map_update (_data_->_tmp63_, _data_->_tmp64_, _data_->_tmp65_);
 #line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->updated = _data_->_tmp66_;
 #line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_vala_assert (_data_->updated, "updated");
 #line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp67_ = NULL;
-#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp67_ = _data_->old_dir;
 #line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp68_ = NULL;
-#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp68_ = _data_->old_dir_info;
 #line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_remove_monitor (_data_->self, _data_->_tmp67_, _data_->_tmp68_);
 #line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp69_ = NULL;
-#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp69_ = _data_->new_dir;
 #line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp70_ = NULL;
-#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp70_ = _data_->new_dir_info;
 #line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_add_monitor (_data_->self, _data_->_tmp69_, _data_->_tmp70_);
 #line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp71_ = NULL;
-#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp71_ = _data_->old_dir;
 #line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp72_ = NULL;
-#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp72_ = _data_->new_dir;
 #line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp73_ = NULL;
-#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp73_ = _data_->new_dir_info;
 #line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_notify_directory_moved (_data_->self, _data_->_tmp71_, _data_->_tmp72_, _data_->_tmp73_);
@@ -2548,38 +2461,39 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire
 #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (_data_->file_children);
 #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	if (_data_->_state_ == 0) {
+	g_task_return_pointer (_data_->_async_result, _data_, NULL);
 #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 2552 "DirectoryMonitor.c"
-	} else {
+	if (_data_->_state_ != 0) {
 #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		g_simple_async_result_complete (_data_->_async_result);
-#line 2556 "DirectoryMonitor.c"
+		while (_data_->_task_complete_ != TRUE) {
+#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+			g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
+#line 2469 "DirectoryMonitor.c"
+		}
 	}
 #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_object_unref (_data_->_async_result);
 #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return FALSE;
-#line 2562 "DirectoryMonitor.c"
+#line 2476 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFile* new_dir, GFileInfo* new_dir_info) {
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	GFileInfo* _tmp10_ = NULL;
-	GFile* _tmp11_ = NULL;
-	GFile* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	GFile* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	GFile* _tmp8_;
+	GFile* _tmp9_;
+	GFileInfo* _tmp10_;
+	GFile* _tmp11_;
+	GFile* _tmp12_;
+	gboolean _tmp13_;
 #line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (old_dir));
 #line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -2617,7 +2531,7 @@ static void directory_monitor_real_notify_directory_moved (DirectoryMonitor* sel
 #line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp10_ = new_dir_info;
 #line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "directory-moved", _tmp8_, _tmp9_, _tmp10_);
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_MOVED_SIGNAL], 0, _tmp8_, _tmp9_, _tmp10_);
 #line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp11_ = old_dir;
 #line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -2626,10 +2540,10 @@ static void directory_monitor_real_notify_directory_moved (DirectoryMonitor* sel
 	_tmp13_ = g_file_equal (_tmp11_, _tmp12_);
 #line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp13_) {
-#line 2627 "DirectoryMonitor.c"
-		GFile* _tmp14_ = NULL;
-		GFile* _tmp15_ = NULL;
-		GFileInfo* _tmp16_ = NULL;
+#line 2541 "DirectoryMonitor.c"
+		GFile* _tmp14_;
+		GFile* _tmp15_;
+		GFileInfo* _tmp16_;
 #line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp14_ = old_dir;
 #line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -2638,7 +2552,7 @@ static void directory_monitor_real_notify_directory_moved (DirectoryMonitor* sel
 		_tmp16_ = new_dir_info;
 #line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_internal_notify_root_moved (self, _tmp14_, _tmp15_, _tmp16_);
-#line 2639 "DirectoryMonitor.c"
+#line 2553 "DirectoryMonitor.c"
 	}
 }
 
@@ -2648,17 +2562,17 @@ void directory_monitor_notify_directory_moved (DirectoryMonitor* self, GFile* ol
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_moved (self, old_dir, new_dir, new_dir_info);
-#line 2649 "DirectoryMonitor.c"
+#line 2563 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_directory_altered (DirectoryMonitor* self, GFile* dir) {
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GFile* _tmp5_;
 #line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (dir));
 #line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -2680,8 +2594,8 @@ static void directory_monitor_real_notify_directory_altered (DirectoryMonitor* s
 #line 712 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp5_ = dir;
 #line 712 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "directory-altered", _tmp5_);
-#line 2682 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ALTERED_SIGNAL], 0, _tmp5_);
+#line 2596 "DirectoryMonitor.c"
 }
 
 
@@ -2690,18 +2604,18 @@ void directory_monitor_notify_directory_altered (DirectoryMonitor* self, GFile*
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_altered (self, dir);
-#line 2691 "DirectoryMonitor.c"
+#line 2605 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_internal_notify_directory_alteration_completed (DirectoryMonitor* self, GFile* dir, GFileInfo* info) {
 	gboolean updated = FALSE;
-	DirectoryMonitorFileInfoMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFileInfo* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	GFile* _tmp4_ = NULL;
-	GFileInfo* _tmp5_ = NULL;
+	DirectoryMonitorFileInfoMap* _tmp0_;
+	GFile* _tmp1_;
+	GFileInfo* _tmp2_;
+	gboolean _tmp3_;
+	GFile* _tmp4_;
+	GFileInfo* _tmp5_;
 #line 715 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 715 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -2726,18 +2640,18 @@ static void directory_monitor_internal_notify_directory_alteration_completed (Di
 	_tmp5_ = info;
 #line 719 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_notify_directory_alteration_completed (self, _tmp4_, _tmp5_);
-#line 2727 "DirectoryMonitor.c"
+#line 2641 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_directory_alteration_completed (DirectoryMonitor* self, GFile* dir, GFileInfo* info) {
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFileInfo* _tmp6_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GFile* _tmp5_;
+	GFileInfo* _tmp6_;
 #line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (dir));
 #line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -2763,8 +2677,8 @@ static void directory_monitor_real_notify_directory_alteration_completed (Direct
 #line 724 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp6_ = info;
 #line 724 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "directory-alteration-completed", _tmp5_, _tmp6_);
-#line 2765 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ALTERATION_COMPLETED_SIGNAL], 0, _tmp5_, _tmp6_);
+#line 2679 "DirectoryMonitor.c"
 }
 
 
@@ -2773,17 +2687,17 @@ void directory_monitor_notify_directory_alteration_completed (DirectoryMonitor*
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_alteration_completed (self, dir, info);
-#line 2774 "DirectoryMonitor.c"
+#line 2688 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_directory_attributes_altered (DirectoryMonitor* self, GFile* dir) {
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GFile* _tmp5_;
 #line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (dir));
 #line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -2805,8 +2719,8 @@ static void directory_monitor_real_notify_directory_attributes_altered (Director
 #line 729 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp5_ = dir;
 #line 729 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "directory-attributes-altered", _tmp5_);
-#line 2807 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ATTRIBUTES_ALTERED_SIGNAL], 0, _tmp5_);
+#line 2721 "DirectoryMonitor.c"
 }
 
 
@@ -2815,17 +2729,17 @@ void directory_monitor_notify_directory_attributes_altered (DirectoryMonitor* se
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_attributes_altered (self, dir);
-#line 2816 "DirectoryMonitor.c"
+#line 2730 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_internal_notify_directory_deleted (DirectoryMonitor* self, GFile* dir) {
 	GFileInfo* info = NULL;
-	DirectoryMonitorFileInfoMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFileInfo* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
+	DirectoryMonitorFileInfoMap* _tmp0_;
+	GFile* _tmp1_;
+	GFileInfo* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
 #line 732 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 732 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -2850,7 +2764,7 @@ static void directory_monitor_internal_notify_directory_deleted (DirectoryMonito
 	directory_monitor_async_notify_directory_deleted (self, _tmp4_, FALSE, NULL, NULL);
 #line 732 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (info);
-#line 2851 "DirectoryMonitor.c"
+#line 2765 "DirectoryMonitor.c"
 }
 
 
@@ -2863,22 +2777,46 @@ static void directory_monitor_async_notify_directory_deleted_data_free (gpointer
 	_g_object_unref0 (_data_->self);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_slice_free (DirectoryMonitorAsyncNotifyDirectoryDeletedData, _data_);
-#line 2864 "DirectoryMonitor.c"
+#line 2778 "DirectoryMonitor.c"
+}
+
+
+static void directory_monitor_async_notify_directory_deleted_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) {
+	DirectoryMonitorAsyncNotifyDirectoryDeletedData* _task_data_;
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	_task_data_ = g_task_get_task_data (G_TASK (res));
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	if (_task_data_->_callback_ != NULL) {
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+		_task_data_->_callback_ (source_object, res, user_data);
+#line 2790 "DirectoryMonitor.c"
+	}
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	_task_data_->_task_complete_ = TRUE;
+#line 2794 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_async_notify_directory_deleted (DirectoryMonitor* self, GFile* dir, gboolean already_removed, GAsyncReadyCallback _callback_, gpointer _user_data_) {
 	DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_;
-	DirectoryMonitor* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	DirectoryMonitor* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	gboolean _tmp3_;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_ = g_slice_new0 (DirectoryMonitorAsyncNotifyDirectoryDeletedData);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, directory_monitor_async_notify_directory_deleted);
+	_data_->_callback_ = _callback_;
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	_data_->_async_result = g_task_new (G_OBJECT (self), NULL, directory_monitor_async_notify_directory_deleted_async_ready_wrapper, _user_data_);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, directory_monitor_async_notify_directory_deleted_data_free);
+	if (_callback_ == NULL) {
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+		_data_->_task_complete_ = TRUE;
+#line 2814 "DirectoryMonitor.c"
+	}
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	g_task_set_task_data (_data_->_async_result, _data_, directory_monitor_async_notify_directory_deleted_data_free);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp0_ = _g_object_ref0 (self);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -2897,15 +2835,15 @@ static void directory_monitor_async_notify_directory_deleted (DirectoryMonitor*
 	_data_->already_removed = _tmp3_;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_async_notify_directory_deleted_co (_data_);
-#line 2898 "DirectoryMonitor.c"
+#line 2836 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_async_notify_directory_deleted_finish (DirectoryMonitor* self, GAsyncResult* _res_) {
 	DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
-#line 2906 "DirectoryMonitor.c"
+	_data_ = g_task_propagate_pointer (G_TASK (_res_), NULL);
+#line 2844 "DirectoryMonitor.c"
 }
 
 
@@ -2918,8 +2856,10 @@ static void directory_monitor_async_notify_directory_deleted_ready (GObject* sou
 #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_res_ = _res_;
 #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	_data_->_task_complete_ = TRUE;
+#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_async_notify_directory_deleted_co (_data_);
-#line 2920 "DirectoryMonitor.c"
+#line 2860 "DirectoryMonitor.c"
 }
 
 
@@ -2928,7 +2868,7 @@ static gboolean _directory_monitor_async_notify_directory_deleted_co_gsource_fun
 	result = directory_monitor_async_notify_directory_deleted_co (self);
 #line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 2929 "DirectoryMonitor.c"
+#line 2869 "DirectoryMonitor.c"
 }
 
 
@@ -2937,85 +2877,59 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo
 	switch (_data_->_state_) {
 #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case 0:
-#line 2938 "DirectoryMonitor.c"
+#line 2878 "DirectoryMonitor.c"
 		goto _state_0;
 #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case 1:
-#line 2942 "DirectoryMonitor.c"
+#line 2882 "DirectoryMonitor.c"
 		goto _state_1;
 #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case 2:
-#line 2946 "DirectoryMonitor.c"
+#line 2886 "DirectoryMonitor.c"
 		goto _state_2;
 		default:
 #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		g_assert_not_reached ();
-#line 2951 "DirectoryMonitor.c"
+#line 2891 "DirectoryMonitor.c"
 	}
 	_state_0:
 #line 750 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp0_ = NULL;
-#line 750 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 750 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->file_children = _data_->_tmp0_;
 #line 751 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp1_ = NULL;
-#line 751 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 751 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->dir_children = _data_->_tmp1_;
 #line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp2_ = NULL;
-#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp2_ = _data_->self->priv->files;
 #line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp3_ = NULL;
-#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp3_ = _data_->dir;
 #line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp4_ = NULL;
-#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp4_ = _data_->file_children;
 #line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp5_ = NULL;
-#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp5_ = _data_->dir_children;
 #line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp6_ = 0;
-#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp6_ = directory_monitor_file_info_map_get_children (_data_->_tmp2_, _data_->_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->count = _data_->_tmp6_;
 #line 753 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp7_ = 0;
-#line 753 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp7_ = _data_->count;
 #line 753 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_data_->_tmp7_ > 0) {
-#line 2994 "DirectoryMonitor.c"
+#line 2918 "DirectoryMonitor.c"
 		{
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp8_ = NULL;
-#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp8_ = _data_->dir_children;
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp9_ = NULL;
-#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp9_ = _g_object_ref0 (_data_->_tmp8_);
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_dir_child_list = _data_->_tmp9_;
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp10_ = NULL;
-#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp10_ = _data_->_dir_child_list;
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp11_ = 0;
-#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp12_ = 0;
-#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp12_ = _data_->_tmp11_;
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_dir_child_size = _data_->_tmp12_;
@@ -3024,42 +2938,28 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			while (TRUE) {
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp13_ = 0;
-#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp13_ = _data_->_dir_child_index;
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_dir_child_index = _data_->_tmp13_ + 1;
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp14_ = 0;
-#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp14_ = _data_->_dir_child_index;
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp15_ = 0;
-#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp15_ = _data_->_dir_child_size;
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				if (!(_data_->_tmp14_ < _data_->_tmp15_)) {
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 3042 "DirectoryMonitor.c"
+#line 2950 "DirectoryMonitor.c"
 				}
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp16_ = NULL;
-#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp16_ = _data_->_dir_child_list;
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp17_ = 0;
-#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp17_ = _data_->_dir_child_index;
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp18_ = NULL;
-#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp17_);
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->dir_child = (GFile*) _data_->_tmp18_;
 #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp19_ = NULL;
-#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp19_ = _data_->dir_child;
 #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_state_ = 1;
@@ -3067,40 +2967,30 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo
 				directory_monitor_async_notify_directory_deleted (_data_->self, _data_->_tmp19_, FALSE, directory_monitor_async_notify_directory_deleted_ready, _data_);
 #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				return FALSE;
-#line 3068 "DirectoryMonitor.c"
+#line 2968 "DirectoryMonitor.c"
 				_state_1:
 #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				directory_monitor_async_notify_directory_deleted_finish (_data_->self, _data_->_res_);
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_g_object_unref0 (_data_->dir_child);
-#line 3074 "DirectoryMonitor.c"
+#line 2974 "DirectoryMonitor.c"
 			}
 #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (_data_->_dir_child_list);
-#line 3078 "DirectoryMonitor.c"
+#line 2978 "DirectoryMonitor.c"
 		}
 		{
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp20_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp20_ = _data_->file_children;
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp21_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp21_ = _g_object_ref0 (_data_->_tmp20_);
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_file_child_list = _data_->_tmp21_;
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp22_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp22_ = _data_->_file_child_list;
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp23_ = 0;
-#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp23_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp24_ = 0;
-#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp24_ = _data_->_tmp23_;
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_file_child_size = _data_->_tmp24_;
@@ -3109,52 +2999,34 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			while (TRUE) {
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp25_ = 0;
-#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp25_ = _data_->_file_child_index;
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_file_child_index = _data_->_tmp25_ + 1;
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp26_ = 0;
-#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp26_ = _data_->_file_child_index;
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp27_ = 0;
-#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp27_ = _data_->_file_child_size;
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				if (!(_data_->_tmp26_ < _data_->_tmp27_)) {
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 3127 "DirectoryMonitor.c"
+#line 3011 "DirectoryMonitor.c"
 				}
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp28_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp28_ = _data_->_file_child_list;
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp29_ = 0;
-#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp29_ = _data_->_file_child_index;
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp30_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp30_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp28_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp29_);
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->file_child = (GFile*) _data_->_tmp30_;
 #line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp31_ = NULL;
-#line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp31_ = _data_->self->priv->files;
 #line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp32_ = NULL;
-#line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp32_ = _data_->file_child;
 #line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				directory_monitor_file_info_map_remove (_data_->_tmp31_, _data_->_tmp32_, NULL);
 #line 769 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp33_ = NULL;
-#line 769 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp33_ = _data_->file_child;
 #line 769 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				directory_monitor_notify_file_deleted (_data_->self, _data_->_tmp33_);
@@ -3164,39 +3036,31 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo
 				_data_->_state_ = 2;
 #line 772 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				return FALSE;
-#line 3165 "DirectoryMonitor.c"
+#line 3037 "DirectoryMonitor.c"
 				_state_2:
 				;
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_g_object_unref0 (_data_->file_child);
-#line 3170 "DirectoryMonitor.c"
+#line 3042 "DirectoryMonitor.c"
 			}
 #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (_data_->_file_child_list);
-#line 3174 "DirectoryMonitor.c"
+#line 3046 "DirectoryMonitor.c"
 		}
 	}
 #line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp34_ = FALSE;
-#line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp34_ = _data_->already_removed;
 #line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (!_data_->_tmp34_) {
 #line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp35_ = NULL;
-#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_tmp35_ = _data_->self->priv->files;
 #line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp36_ = NULL;
-#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_tmp36_ = _data_->dir;
 #line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_file_info_map_remove (_data_->_tmp35_, _data_->_tmp36_, NULL);
-#line 3193 "DirectoryMonitor.c"
+#line 3059 "DirectoryMonitor.c"
 	}
 #line 779 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp37_ = NULL;
-#line 779 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp37_ = _data_->dir;
 #line 779 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_notify_directory_deleted (_data_->self, _data_->_tmp37_);
@@ -3205,33 +3069,34 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo
 #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (_data_->file_children);
 #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	if (_data_->_state_ == 0) {
+	g_task_return_pointer (_data_->_async_result, _data_, NULL);
 #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 3209 "DirectoryMonitor.c"
-	} else {
+	if (_data_->_state_ != 0) {
+#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+		while (_data_->_task_complete_ != TRUE) {
 #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		g_simple_async_result_complete (_data_->_async_result);
-#line 3213 "DirectoryMonitor.c"
+			g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
+#line 3077 "DirectoryMonitor.c"
+		}
 	}
 #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_object_unref (_data_->_async_result);
 #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return FALSE;
-#line 3219 "DirectoryMonitor.c"
+#line 3084 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_directory_deleted (DirectoryMonitor* self, GFile* dir) {
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	GFile* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
+	GFile* _tmp7_;
+	gboolean _tmp8_;
 #line 782 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (dir));
 #line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3253,7 +3118,7 @@ static void directory_monitor_real_notify_directory_deleted (DirectoryMonitor* s
 #line 784 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp5_ = dir;
 #line 784 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "directory-deleted", _tmp5_);
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_DELETED_SIGNAL], 0, _tmp5_);
 #line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp6_ = dir;
 #line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3262,13 +3127,13 @@ static void directory_monitor_real_notify_directory_deleted (DirectoryMonitor* s
 	_tmp8_ = g_file_equal (_tmp6_, _tmp7_);
 #line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp8_) {
-#line 3263 "DirectoryMonitor.c"
-		GFile* _tmp9_ = NULL;
+#line 3128 "DirectoryMonitor.c"
+		GFile* _tmp9_;
 #line 787 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp9_ = dir;
 #line 787 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_notify_root_deleted (self, _tmp9_);
-#line 3269 "DirectoryMonitor.c"
+#line 3134 "DirectoryMonitor.c"
 	}
 }
 
@@ -3278,16 +3143,16 @@ void directory_monitor_notify_directory_deleted (DirectoryMonitor* self, GFile*
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 782 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_deleted (self, dir);
-#line 3279 "DirectoryMonitor.c"
+#line 3144 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_notify_closed (DirectoryMonitor* self) {
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp0_ = self->priv->root;
 #line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3305,8 +3170,8 @@ static void directory_monitor_real_notify_closed (DirectoryMonitor* self) {
 #line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_free0 (_tmp2_);
 #line 792 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_emit_by_name (self, "closed");
-#line 3307 "DirectoryMonitor.c"
+	g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_CLOSED_SIGNAL], 0);
+#line 3172 "DirectoryMonitor.c"
 }
 
 
@@ -3315,14 +3180,14 @@ void directory_monitor_notify_closed (DirectoryMonitor* self) {
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 790 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->notify_closed (self);
-#line 3316 "DirectoryMonitor.c"
+#line 3181 "DirectoryMonitor.c"
 }
 
 
 GFile* directory_monitor_get_root (DirectoryMonitor* self) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 795 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL);
 #line 796 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3333,15 +3198,15 @@ GFile* directory_monitor_get_root (DirectoryMonitor* self) {
 	result = _tmp1_;
 #line 796 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 3334 "DirectoryMonitor.c"
+#line 3199 "DirectoryMonitor.c"
 }
 
 
 gboolean directory_monitor_is_in_root (DirectoryMonitor* self, GFile* file) {
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 #line 799 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE);
 #line 799 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3356,13 +3221,13 @@ gboolean directory_monitor_is_in_root (DirectoryMonitor* self, GFile* file) {
 	result = _tmp2_;
 #line 800 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 3357 "DirectoryMonitor.c"
+#line 3222 "DirectoryMonitor.c"
 }
 
 
 gboolean directory_monitor_has_started (DirectoryMonitor* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 803 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE);
 #line 804 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3371,13 +3236,13 @@ gboolean directory_monitor_has_started (DirectoryMonitor* self) {
 	result = _tmp0_;
 #line 804 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 3372 "DirectoryMonitor.c"
+#line 3237 "DirectoryMonitor.c"
 }
 
 
 void directory_monitor_start_discovery (DirectoryMonitor* self) {
-	gboolean _tmp0_ = FALSE;
-	GFile* _tmp1_ = NULL;
+	gboolean _tmp0_;
+	GFile* _tmp1_;
 #line 807 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 808 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3396,26 +3261,26 @@ void directory_monitor_start_discovery (DirectoryMonitor* self) {
 	_tmp1_ = self->priv->root;
 #line 817 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_explore_async (self, _tmp1_, NULL, TRUE, NULL, NULL);
-#line 3397 "DirectoryMonitor.c"
+#line 3262 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_close (DirectoryMonitor* self) {
-	GCancellable* _tmp0_ = NULL;
-	GeeHashMap* _tmp12_ = NULL;
+	GCancellable* _tmp0_;
+	GeeHashMap* _tmp12_;
 #line 824 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp0_ = self->priv->cancellable;
 #line 824 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_cancellable_cancel (_tmp0_);
-#line 3408 "DirectoryMonitor.c"
+#line 3273 "DirectoryMonitor.c"
 	{
 		GeeIterator* _monitor_it = NULL;
-		GeeHashMap* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
+		GeeHashMap* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeCollection* _tmp4_;
+		GeeIterator* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp1_ = self->priv->monitors;
 #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3434,13 +3299,13 @@ static void directory_monitor_real_close (DirectoryMonitor* self) {
 		_monitor_it = _tmp6_;
 #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		while (TRUE) {
-#line 3435 "DirectoryMonitor.c"
-			GeeIterator* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+#line 3300 "DirectoryMonitor.c"
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			GFileMonitor* monitor = NULL;
-			GeeIterator* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
-			GFileMonitor* _tmp11_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
+			GFileMonitor* _tmp11_;
 #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp7_ = _monitor_it;
 #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3449,7 +3314,7 @@ static void directory_monitor_real_close (DirectoryMonitor* self) {
 			if (!_tmp8_) {
 #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 3450 "DirectoryMonitor.c"
+#line 3315 "DirectoryMonitor.c"
 			}
 #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp9_ = _monitor_it;
@@ -3463,11 +3328,11 @@ static void directory_monitor_real_close (DirectoryMonitor* self) {
 			directory_monitor_cancel_monitor (self, _tmp11_);
 #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 3464 "DirectoryMonitor.c"
+#line 3329 "DirectoryMonitor.c"
 		}
 #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_monitor_it);
-#line 3468 "DirectoryMonitor.c"
+#line 3333 "DirectoryMonitor.c"
 	}
 #line 830 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp12_ = self->priv->monitors;
@@ -3475,7 +3340,7 @@ static void directory_monitor_real_close (DirectoryMonitor* self) {
 	gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 832 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_notify_closed (self);
-#line 3476 "DirectoryMonitor.c"
+#line 3341 "DirectoryMonitor.c"
 }
 
 
@@ -3484,16 +3349,16 @@ void directory_monitor_close (DirectoryMonitor* self) {
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 822 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	DIRECTORY_MONITOR_GET_CLASS (self)->close (self);
-#line 3485 "DirectoryMonitor.c"
+#line 3350 "DirectoryMonitor.c"
 }
 
 
 static DirectoryMonitorFType directory_monitor_get_ftype (GFileInfo* info) {
 	DirectoryMonitorFType result = 0;
 	GFileType file_type = 0;
-	GFileInfo* _tmp0_ = NULL;
-	GFileType _tmp1_ = 0;
-	GFileType _tmp2_ = 0;
+	GFileInfo* _tmp0_;
+	GFileType _tmp1_;
+	GFileType _tmp2_;
 #line 835 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (G_IS_FILE_INFO (info), 0);
 #line 836 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3508,30 +3373,30 @@ static DirectoryMonitorFType directory_monitor_get_ftype (GFileInfo* info) {
 	switch (_tmp2_) {
 #line 837 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_TYPE_REGULAR:
-#line 3509 "DirectoryMonitor.c"
+#line 3374 "DirectoryMonitor.c"
 		{
 #line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			result = DIRECTORY_MONITOR_FTYPE_FILE;
 #line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return result;
-#line 3515 "DirectoryMonitor.c"
+#line 3380 "DirectoryMonitor.c"
 		}
 #line 837 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_TYPE_DIRECTORY:
-#line 3519 "DirectoryMonitor.c"
+#line 3384 "DirectoryMonitor.c"
 		{
 #line 842 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			result = DIRECTORY_MONITOR_FTYPE_DIRECTORY;
 #line 842 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return result;
-#line 3525 "DirectoryMonitor.c"
+#line 3390 "DirectoryMonitor.c"
 		}
 		default:
 		{
-			GFileType _tmp3_ = 0;
+			GFileType _tmp3_;
 			GEnumValue* _tmp4_;
-			gchar* _tmp5_ = NULL;
-			gchar* _tmp6_ = NULL;
+			gchar* _tmp5_;
+			gchar* _tmp6_;
 #line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp3_ = file_type;
 #line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3548,7 +3413,7 @@ static DirectoryMonitorFType directory_monitor_get_ftype (GFileInfo* info) {
 			result = DIRECTORY_MONITOR_FTYPE_UNSUPPORTED;
 #line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return result;
-#line 3549 "DirectoryMonitor.c"
+#line 3414 "DirectoryMonitor.c"
 		}
 	}
 }
@@ -3565,24 +3430,48 @@ static void directory_monitor_explore_async_data_free (gpointer _data) {
 	_g_object_unref0 (_data_->self);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_slice_free (DirectoryMonitorExploreAsyncData, _data_);
-#line 3566 "DirectoryMonitor.c"
+#line 3431 "DirectoryMonitor.c"
+}
+
+
+static void directory_monitor_explore_async_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) {
+	DirectoryMonitorExploreAsyncData* _task_data_;
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	_task_data_ = g_task_get_task_data (G_TASK (res));
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	if (_task_data_->_callback_ != NULL) {
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+		_task_data_->_callback_ (source_object, res, user_data);
+#line 3443 "DirectoryMonitor.c"
+	}
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	_task_data_->_task_complete_ = TRUE;
+#line 3447 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_explore_async (DirectoryMonitor* self, GFile* dir, GFileInfo* dir_info, gboolean in_discovery, GAsyncReadyCallback _callback_, gpointer _user_data_) {
 	DirectoryMonitorExploreAsyncData* _data_;
-	DirectoryMonitor* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFileInfo* _tmp3_ = NULL;
-	GFileInfo* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	DirectoryMonitor* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	GFileInfo* _tmp3_;
+	GFileInfo* _tmp4_;
+	gboolean _tmp5_;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_ = g_slice_new0 (DirectoryMonitorExploreAsyncData);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, directory_monitor_explore_async);
+	_data_->_callback_ = _callback_;
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	_data_->_async_result = g_task_new (G_OBJECT (self), NULL, directory_monitor_explore_async_async_ready_wrapper, _user_data_);
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	if (_callback_ == NULL) {
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+		_data_->_task_complete_ = TRUE;
+#line 3469 "DirectoryMonitor.c"
+	}
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, directory_monitor_explore_async_data_free);
+	g_task_set_task_data (_data_->_async_result, _data_, directory_monitor_explore_async_data_free);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp0_ = _g_object_ref0 (self);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3609,15 +3498,15 @@ static void directory_monitor_explore_async (DirectoryMonitor* self, GFile* dir,
 	_data_->in_discovery = _tmp5_;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_explore_async_co (_data_);
-#line 3610 "DirectoryMonitor.c"
+#line 3499 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_explore_finish (DirectoryMonitor* self, GAsyncResult* _res_) {
 	DirectoryMonitorExploreAsyncData* _data_;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
-#line 3618 "DirectoryMonitor.c"
+	_data_ = g_task_propagate_pointer (G_TASK (_res_), NULL);
+#line 3507 "DirectoryMonitor.c"
 }
 
 
@@ -3630,15 +3519,17 @@ static void directory_monitor_explore_async_ready (GObject* source_object, GAsyn
 #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_res_ = _res_;
 #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	_data_->_task_complete_ = TRUE;
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_explore_async_co (_data_);
-#line 3632 "DirectoryMonitor.c"
+#line 3523 "DirectoryMonitor.c"
 }
 
 
 static void _g_object_unref0_ (gpointer var) {
 #line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
-#line 3639 "DirectoryMonitor.c"
+#line 3530 "DirectoryMonitor.c"
 }
 
 
@@ -3647,7 +3538,7 @@ static void _g_list_free__g_object_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
 #line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_list_free (self);
-#line 3648 "DirectoryMonitor.c"
+#line 3539 "DirectoryMonitor.c"
 }
 
 
@@ -3656,7 +3547,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
 	result = file_hash ((GFile*) v);
 #line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 3657 "DirectoryMonitor.c"
+#line 3548 "DirectoryMonitor.c"
 }
 
 
@@ -3665,63 +3556,49 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 	switch (_data_->_state_) {
 #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case 0:
-#line 3666 "DirectoryMonitor.c"
+#line 3557 "DirectoryMonitor.c"
 		goto _state_0;
 #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case 1:
-#line 3670 "DirectoryMonitor.c"
+#line 3561 "DirectoryMonitor.c"
 		goto _state_1;
 #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case 2:
-#line 3674 "DirectoryMonitor.c"
+#line 3565 "DirectoryMonitor.c"
 		goto _state_2;
 #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case 3:
-#line 3678 "DirectoryMonitor.c"
+#line 3569 "DirectoryMonitor.c"
 		goto _state_3;
 #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case 4:
-#line 3682 "DirectoryMonitor.c"
+#line 3573 "DirectoryMonitor.c"
 		goto _state_4;
 #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case 5:
-#line 3686 "DirectoryMonitor.c"
+#line 3577 "DirectoryMonitor.c"
 		goto _state_5;
 		default:
 #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		g_assert_not_reached ();
-#line 3691 "DirectoryMonitor.c"
+#line 3582 "DirectoryMonitor.c"
 	}
 	_state_0:
 #line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp0_ = NULL;
-#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp0_ = _data_->self->priv->files;
 #line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp1_ = NULL;
-#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp1_ = _data_->dir;
 #line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp2_ = NULL;
-#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp2_ = _data_->dir_info;
 #line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp3_ = FALSE;
-#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp3_ = directory_monitor_file_info_map_contains (_data_->_tmp0_, _data_->_tmp1_, _data_->_tmp2_);
 #line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_data_->_tmp3_) {
 #line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp4_ = NULL;
-#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_tmp4_ = _data_->dir;
 #line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp5_ = NULL;
-#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_tmp5_ = g_file_get_path (_data_->_tmp4_);
 #line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp6_ = NULL;
-#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_tmp6_ = _data_->_tmp5_;
 #line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		g_warning ("DirectoryMonitor.vala:852: Directory loop detected at %s, not explorin" \
@@ -3729,52 +3606,41 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_free0 (_data_->_tmp6_);
 #line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp7_ = FALSE;
-#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_tmp7_ = _data_->in_discovery;
 #line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp7_);
 #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		if (_data_->_state_ == 0) {
+		g_task_return_pointer (_data_->_async_result, _data_, NULL);
 #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 3738 "DirectoryMonitor.c"
-		} else {
+		if (_data_->_state_ != 0) {
+#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+			while (_data_->_task_complete_ != TRUE) {
 #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			g_simple_async_result_complete (_data_->_async_result);
-#line 3742 "DirectoryMonitor.c"
+				g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
+#line 3617 "DirectoryMonitor.c"
+			}
 		}
 #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		g_object_unref (_data_->_async_result);
 #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return FALSE;
-#line 3748 "DirectoryMonitor.c"
+#line 3624 "DirectoryMonitor.c"
 	}
 #line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp8_ = NULL;
-#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp8_ = _data_->dir_info;
 #line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp9_ = NULL;
-#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp9_ = _g_object_ref0 (_data_->_tmp8_);
 #line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->local_dir_info = _data_->_tmp9_;
 #line 861 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp10_ = NULL;
-#line 861 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp10_ = _data_->local_dir_info;
 #line 861 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_data_->_tmp10_ == NULL) {
-#line 3766 "DirectoryMonitor.c"
+#line 3636 "DirectoryMonitor.c"
 		{
 #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp12_ = NULL;
-#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp12_ = _data_->dir;
 #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp13_ = NULL;
-#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp13_ = _data_->self->priv->cancellable;
 #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_state_ = 1;
@@ -3782,22 +3648,18 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 			g_file_query_info_async (_data_->_tmp12_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_DIR_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp13_, directory_monitor_explore_async_ready, _data_);
 #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return FALSE;
-#line 3782 "DirectoryMonitor.c"
+#line 3648 "DirectoryMonitor.c"
 			_state_1:
 #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp14_ = NULL;
-#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp14_ = g_file_query_info_finish (_data_->_tmp12_, _data_->_res_, &_data_->_inner_error_);
 #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp11_ = _data_->_tmp14_;
 #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 3792 "DirectoryMonitor.c"
-				goto __catch480_g_error;
+#line 3656 "DirectoryMonitor.c"
+				goto __catch481_g_error;
 			}
 #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp15_ = NULL;
-#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp15_ = _data_->_tmp11_;
 #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp11_ = NULL;
@@ -3807,42 +3669,30 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 			_data_->local_dir_info = _data_->_tmp15_;
 #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (_data_->_tmp11_);
-#line 3807 "DirectoryMonitor.c"
+#line 3669 "DirectoryMonitor.c"
 		}
-		goto __finally480;
-		__catch480_g_error:
+		goto __finally481;
+		__catch481_g_error:
 		{
 #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->err = _data_->_inner_error_;
 #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_inner_error_ = NULL;
 #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp16_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp16_ = _data_->dir;
 #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp17_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp17_ = g_file_get_path (_data_->_tmp16_);
 #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp18_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp18_ = _data_->_tmp17_;
 #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp19_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp19_ = _data_->err;
 #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp20_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp20_ = _data_->_tmp19_->message;
 #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			g_warning ("DirectoryMonitor.vala:866: Unable to retrieve info on %s: %s", _data_->_tmp18_, _data_->_tmp20_);
 #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_free0 (_data_->_tmp18_);
 #line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp21_ = FALSE;
-#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp21_ = _data_->in_discovery;
 #line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp21_);
@@ -3851,22 +3701,23 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (_data_->local_dir_info);
 #line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			if (_data_->_state_ == 0) {
+			g_task_return_pointer (_data_->_async_result, _data_, NULL);
 #line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 3854 "DirectoryMonitor.c"
-			} else {
+			if (_data_->_state_ != 0) {
 #line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				g_simple_async_result_complete (_data_->_async_result);
-#line 3858 "DirectoryMonitor.c"
+				while (_data_->_task_complete_ != TRUE) {
+#line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+					g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
+#line 3708 "DirectoryMonitor.c"
+				}
 			}
 #line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			g_object_unref (_data_->_async_result);
 #line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return FALSE;
-#line 3864 "DirectoryMonitor.c"
+#line 3715 "DirectoryMonitor.c"
 		}
-		__finally480:
+		__finally481:
 #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3876,570 +3727,412 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			g_clear_error (&_data_->_inner_error_);
 #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+			g_object_unref (_data_->_async_result);
+#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return FALSE;
-#line 3877 "DirectoryMonitor.c"
+#line 3730 "DirectoryMonitor.c"
 		}
 	}
 #line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp22_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp22_ = _data_->local_dir_info;
 #line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp23_ = FALSE;
-#line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp23_ = g_file_info_get_is_hidden (_data_->_tmp22_);
 #line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_data_->_tmp23_) {
 #line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp24_ = NULL;
-#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_tmp24_ = _data_->dir;
 #line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp25_ = NULL;
-#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_tmp25_ = g_file_get_path (_data_->_tmp24_);
 #line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp26_ = NULL;
-#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_tmp26_ = _data_->_tmp25_;
 #line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		g_warning ("DirectoryMonitor.vala:875: Ignoring hidden directory %s", _data_->_tmp26_);
 #line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_free0 (_data_->_tmp26_);
 #line 877 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp27_ = FALSE;
-#line 877 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_tmp27_ = _data_->in_discovery;
 #line 877 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp27_);
 #line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_data_->local_dir_info);
 #line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		if (_data_->_state_ == 0) {
+		g_task_return_pointer (_data_->_async_result, _data_, NULL);
 #line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 3918 "DirectoryMonitor.c"
-		} else {
+		if (_data_->_state_ != 0) {
 #line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			g_simple_async_result_complete (_data_->_async_result);
-#line 3922 "DirectoryMonitor.c"
+			while (_data_->_task_complete_ != TRUE) {
+#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+				g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
+#line 3763 "DirectoryMonitor.c"
+			}
 		}
 #line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		g_object_unref (_data_->_async_result);
 #line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return FALSE;
-#line 3928 "DirectoryMonitor.c"
+#line 3770 "DirectoryMonitor.c"
 	}
 #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp28_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp28_ = _data_->local_dir_info;
 #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp29_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp29_ = get_file_info_id (_data_->_tmp28_);
 #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp30_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp30_ = _data_->_tmp29_;
 #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp31_ = FALSE;
-#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp31_ = _data_->_tmp30_ == NULL;
 #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_free0 (_data_->_tmp30_);
 #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_data_->_tmp31_) {
 #line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp32_ = NULL;
-#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_tmp32_ = _data_->local_dir_info;
 #line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp33_ = NULL;
-#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_tmp33_ = _data_->dir;
 #line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp34_ = NULL;
-#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_tmp34_ = g_file_get_uri (_data_->_tmp33_);
 #line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp35_ = NULL;
-#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_tmp35_ = _data_->_tmp34_;
 #line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		g_file_info_set_attribute_string (_data_->_tmp32_, G_FILE_ATTRIBUTE_ID_FILE, _data_->_tmp35_);
 #line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_free0 (_data_->_tmp35_);
-#line 3970 "DirectoryMonitor.c"
+#line 3796 "DirectoryMonitor.c"
 	}
 #line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp36_ = NULL;
-#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp36_ = _data_->local_dir_info;
 #line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp37_ = 0;
-#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp37_ = g_file_info_get_file_type (_data_->_tmp36_);
 #line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_data_->_tmp37_ != G_FILE_TYPE_DIRECTORY) {
 #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp38_ = NULL;
-#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp38_ = _ ("Unable to monitor %s: Not a directory (%s)");
-#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp39_ = NULL;
-#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp39_ = _data_->dir;
+		_data_->_tmp38_ = _data_->dir;
 #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp40_ = NULL;
+		_data_->_tmp39_ = g_file_get_path (_data_->_tmp38_);
 #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp40_ = g_file_get_path (_data_->_tmp39_);
+		_data_->_tmp40_ = _data_->_tmp39_;
 #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp41_ = NULL;
+		_data_->_tmp41_ = _data_->local_dir_info;
 #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp41_ = _data_->_tmp40_;
-#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp42_ = NULL;
-#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp42_ = _data_->local_dir_info;
-#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp43_ = 0;
-#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp43_ = g_file_info_get_file_type (_data_->_tmp42_);
-#line 892 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		memset (&_data_->_tmp44_, 0, sizeof (GEnumValue*));
+		_data_->_tmp42_ = g_file_info_get_file_type (_data_->_tmp41_);
 #line 892 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp44_ = g_enum_get_value (g_type_class_ref (g_file_type_get_type ()), _data_->_tmp43_);
+		_data_->_tmp43_ = g_enum_get_value (g_type_class_ref (g_file_type_get_type ()), _data_->_tmp42_);
 #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp45_ = NULL;
+		_data_->_tmp44_ = g_strdup_printf (_ ("Unable to monitor %s: Not a directory (%s)"), _data_->_tmp40_, (_data_->_tmp43_ != NULL) ? _data_->_tmp43_->value_name : NULL);
 #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp45_ = g_strdup_printf (_data_->_tmp38_, _data_->_tmp41_, (_data_->_tmp44_ != NULL) ? _data_->_tmp44_->value_name : NULL);
+		_data_->_tmp45_ = _data_->_tmp44_;
 #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp46_ = NULL;
+		directory_monitor_notify_discovery_failed (_data_->self, _data_->_tmp45_);
 #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp46_ = _data_->_tmp45_;
+		_g_free0 (_data_->_tmp45_);
 #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		directory_monitor_notify_discovery_failed (_data_->self, _data_->_tmp46_);
-#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_g_free0 (_data_->_tmp46_);
-#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_g_free0 (_data_->_tmp41_);
-#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp47_ = FALSE;
+		_g_free0 (_data_->_tmp40_);
 #line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp47_ = _data_->in_discovery;
+		_data_->_tmp46_ = _data_->in_discovery;
 #line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp47_);
+		directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp46_);
 #line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_data_->local_dir_info);
 #line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		if (_data_->_state_ == 0) {
+		g_task_return_pointer (_data_->_async_result, _data_, NULL);
 #line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 4036 "DirectoryMonitor.c"
-		} else {
+		if (_data_->_state_ != 0) {
+#line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+			while (_data_->_task_complete_ != TRUE) {
 #line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			g_simple_async_result_complete (_data_->_async_result);
-#line 4040 "DirectoryMonitor.c"
+				g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
+#line 3840 "DirectoryMonitor.c"
+			}
 		}
 #line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		g_object_unref (_data_->_async_result);
 #line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return FALSE;
-#line 4046 "DirectoryMonitor.c"
+#line 3847 "DirectoryMonitor.c"
 	}
 #line 903 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->dir_map = NULL;
 #line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->file_map = NULL;
-#line 4052 "DirectoryMonitor.c"
+#line 3853 "DirectoryMonitor.c"
 	{
 #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp48_ = NULL;
-#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp48_ = _data_->dir;
+		_data_->_tmp47_ = _data_->dir;
 #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp49_ = NULL;
-#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp49_ = _data_->self->priv->cancellable;
+		_data_->_tmp48_ = _data_->self->priv->cancellable;
 #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_state_ = 2;
 #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		g_file_enumerate_children_async (_data_->_tmp48_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp49_, directory_monitor_explore_async_ready, _data_);
+		g_file_enumerate_children_async (_data_->_tmp47_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp48_, directory_monitor_explore_async_ready, _data_);
 #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return FALSE;
-#line 4068 "DirectoryMonitor.c"
+#line 3865 "DirectoryMonitor.c"
 		_state_2:
 #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp50_ = NULL;
-#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp50_ = g_file_enumerate_children_finish (_data_->_tmp48_, _data_->_res_, &_data_->_inner_error_);
+		_data_->_tmp49_ = g_file_enumerate_children_finish (_data_->_tmp47_, _data_->_res_, &_data_->_inner_error_);
 #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->enumerator = _data_->_tmp50_;
+		_data_->enumerator = _data_->_tmp49_;
 #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 4078 "DirectoryMonitor.c"
-			goto __catch481_g_error;
+#line 3873 "DirectoryMonitor.c"
+			goto __catch482_g_error;
 		}
 		{
 #line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp51_ = TRUE;
+			_data_->_tmp50_ = TRUE;
 #line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			while (TRUE) {
 #line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				if (!_data_->_tmp51_) {
-#line 4088 "DirectoryMonitor.c"
+				if (!_data_->_tmp50_) {
+#line 3883 "DirectoryMonitor.c"
 				}
 #line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp51_ = FALSE;
-#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp52_ = NULL;
-#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp52_ = _data_->enumerator;
+				_data_->_tmp50_ = FALSE;
 #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp53_ = NULL;
+				_data_->_tmp51_ = _data_->enumerator;
 #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp53_ = _data_->self->priv->cancellable;
+				_data_->_tmp52_ = _data_->self->priv->cancellable;
 #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_state_ = 3;
 #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				g_file_enumerator_next_files_async (_data_->_tmp52_, 10, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp53_, directory_monitor_explore_async_ready, _data_);
+				g_file_enumerator_next_files_async (_data_->_tmp51_, 10, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp52_, directory_monitor_explore_async_ready, _data_);
 #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				return FALSE;
-#line 4106 "DirectoryMonitor.c"
+#line 3897 "DirectoryMonitor.c"
 				_state_3:
 #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp54_ = NULL;
-#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp54_ = g_file_enumerator_next_files_finish (_data_->_tmp52_, _data_->_res_, &_data_->_inner_error_);
+				_data_->_tmp53_ = g_file_enumerator_next_files_finish (_data_->_tmp51_, _data_->_res_, &_data_->_inner_error_);
 #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->infos = _data_->_tmp54_;
+				_data_->infos = _data_->_tmp53_;
 #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_g_object_unref0 (_data_->enumerator);
-#line 4118 "DirectoryMonitor.c"
-					goto __catch481_g_error;
+#line 3907 "DirectoryMonitor.c"
+					goto __catch482_g_error;
 				}
 #line 912 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp55_ = NULL;
+				_data_->_tmp54_ = _data_->infos;
 #line 912 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp55_ = _data_->infos;
-#line 912 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				if (_data_->_tmp55_ == NULL) {
+				if (_data_->_tmp54_ == NULL) {
 #line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					__g_list_free__g_object_unref0_0 (_data_->infos);
 #line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 4131 "DirectoryMonitor.c"
+#line 3918 "DirectoryMonitor.c"
 				}
 #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp56_ = NULL;
-#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp56_ = _data_->infos;
-#line 4137 "DirectoryMonitor.c"
+				_data_->_tmp55_ = _data_->infos;
+#line 3922 "DirectoryMonitor.c"
 				{
 #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->info_collection = _data_->_tmp56_;
+					_data_->info_collection = _data_->_tmp55_;
 #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					for (_data_->info_it = _data_->info_collection; _data_->info_it != NULL; _data_->info_it = _data_->info_it->next) {
 #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-						_data_->_tmp57_ = NULL;
+						_data_->_tmp56_ = _g_object_ref0 ((GFileInfo*) _data_->info_it->data);
 #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-						_data_->_tmp57_ = _g_object_ref0 ((GFileInfo*) _data_->info_it->data);
-#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-						_data_->info = _data_->_tmp57_;
-#line 4149 "DirectoryMonitor.c"
+						_data_->info = _data_->_tmp56_;
+#line 3932 "DirectoryMonitor.c"
 						{
 #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp58_ = NULL;
-#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp58_ = _data_->info;
-#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp59_ = NULL;
-#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp59_ = get_file_info_id (_data_->_tmp58_);
+							_data_->_tmp57_ = _data_->info;
 #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp60_ = NULL;
+							_data_->_tmp58_ = get_file_info_id (_data_->_tmp57_);
 #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp60_ = _data_->_tmp59_;
+							_data_->_tmp59_ = _data_->_tmp58_;
 #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp61_ = FALSE;
+							_data_->_tmp60_ = _data_->_tmp59_ == NULL;
 #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp61_ = _data_->_tmp60_ == NULL;
+							_g_free0 (_data_->_tmp59_);
 #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_g_free0 (_data_->_tmp60_);
-#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							if (_data_->_tmp61_) {
-#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp62_ = NULL;
-#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp62_ = _data_->info;
-#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp63_ = NULL;
-#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp63_ = _data_->dir;
+							if (_data_->_tmp60_) {
 #line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp64_ = NULL;
+								_data_->_tmp61_ = _data_->info;
 #line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp64_ = g_file_get_uri (_data_->_tmp63_);
+								_data_->_tmp62_ = _data_->dir;
 #line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp65_ = NULL;
+								_data_->_tmp63_ = g_file_get_uri (_data_->_tmp62_);
 #line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp65_ = _data_->_tmp64_;
+								_data_->_tmp64_ = _data_->_tmp63_;
 #line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								g_file_info_set_attribute_string (_data_->_tmp62_, G_FILE_ATTRIBUTE_ID_FILE, _data_->_tmp65_);
+								g_file_info_set_attribute_string (_data_->_tmp61_, G_FILE_ATTRIBUTE_ID_FILE, _data_->_tmp64_);
 #line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_g_free0 (_data_->_tmp65_);
-#line 4191 "DirectoryMonitor.c"
+								_g_free0 (_data_->_tmp64_);
+#line 3958 "DirectoryMonitor.c"
 							}
 #line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp66_ = NULL;
+							_data_->_tmp65_ = _data_->info;
 #line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp66_ = _data_->info;
+							_data_->_tmp66_ = g_file_info_get_is_hidden (_data_->_tmp65_);
 #line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp67_ = FALSE;
-#line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp67_ = g_file_info_get_is_hidden (_data_->_tmp66_);
-#line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							if (_data_->_tmp67_) {
-#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp68_ = NULL;
-#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp68_ = _data_->dir;
-#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp69_ = NULL;
+							if (_data_->_tmp66_) {
 #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp69_ = _data_->info;
+								_data_->_tmp67_ = _data_->dir;
 #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp70_ = NULL;
+								_data_->_tmp68_ = _data_->info;
 #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp70_ = g_file_info_get_name (_data_->_tmp69_);
+								_data_->_tmp69_ = g_file_info_get_name (_data_->_tmp68_);
 #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp71_ = NULL;
+								_data_->_tmp70_ = g_file_get_child (_data_->_tmp67_, _data_->_tmp69_);
 #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp71_ = g_file_get_child (_data_->_tmp68_, _data_->_tmp70_);
+								_data_->_tmp71_ = _data_->_tmp70_;
 #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp72_ = NULL;
+								_data_->_tmp72_ = g_file_get_path (_data_->_tmp71_);
 #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp72_ = _data_->_tmp71_;
+								_data_->_tmp73_ = _data_->_tmp72_;
 #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp73_ = NULL;
+								g_warning ("DirectoryMonitor.vala:922: Skipping hidden file/directory %s", _data_->_tmp73_);
 #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp73_ = g_file_get_path (_data_->_tmp72_);
+								_g_free0 (_data_->_tmp73_);
 #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp74_ = NULL;
-#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_data_->_tmp74_ = _data_->_tmp73_;
-#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								g_warning ("DirectoryMonitor.vala:922: Skipping hidden file/directory %s", _data_->_tmp74_);
-#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_g_free0 (_data_->_tmp74_);
-#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-								_g_object_unref0 (_data_->_tmp72_);
+								_g_object_unref0 (_data_->_tmp71_);
 #line 925 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 								_g_object_unref0 (_data_->info);
 #line 925 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 								continue;
-#line 4241 "DirectoryMonitor.c"
+#line 3990 "DirectoryMonitor.c"
 							}
 #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp75_ = NULL;
-#line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp75_ = _data_->info;
+							_data_->_tmp74_ = _data_->info;
 #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp76_ = FALSE;
+							_data_->_tmp75_ = directory_monitor_is_file_symlink_supported (_data_->_tmp74_);
 #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp76_ = directory_monitor_is_file_symlink_supported (_data_->_tmp75_);
-#line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							if (!_data_->_tmp76_) {
+							if (!_data_->_tmp75_) {
 #line 930 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 								_g_object_unref0 (_data_->info);
 #line 930 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 								continue;
-#line 4257 "DirectoryMonitor.c"
+#line 4002 "DirectoryMonitor.c"
 							}
 #line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp77_ = NULL;
-#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp77_ = _data_->info;
-#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp78_ = 0;
+							_data_->_tmp76_ = _data_->info;
 #line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							_data_->_tmp78_ = g_file_info_get_file_type (_data_->_tmp77_);
+							_data_->_tmp77_ = g_file_info_get_file_type (_data_->_tmp76_);
 #line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-							switch (_data_->_tmp78_) {
+							switch (_data_->_tmp77_) {
 #line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 								case G_FILE_TYPE_REGULAR:
-#line 4271 "DirectoryMonitor.c"
+#line 4012 "DirectoryMonitor.c"
 								{
 #line 934 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp79_ = NULL;
+									_data_->_tmp78_ = _data_->file_map;
 #line 934 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp79_ = _data_->file_map;
-#line 934 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									if (_data_->_tmp79_ == NULL) {
-#line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-										_data_->_tmp80_ = NULL;
+									if (_data_->_tmp78_ == NULL) {
 #line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-										_data_->_tmp80_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+										_data_->_tmp79_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 										_g_object_unref0 (_data_->file_map);
 #line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-										_data_->file_map = _data_->_tmp80_;
-#line 4287 "DirectoryMonitor.c"
+										_data_->file_map = _data_->_tmp79_;
+#line 4024 "DirectoryMonitor.c"
 									}
 #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp81_ = NULL;
-#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp81_ = _data_->file_map;
-#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp82_ = NULL;
-#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp82_ = _data_->dir;
-#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp83_ = NULL;
-#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp83_ = _data_->info;
+									_data_->_tmp80_ = _data_->file_map;
 #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp84_ = NULL;
+									_data_->_tmp81_ = _data_->dir;
 #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp84_ = g_file_info_get_name (_data_->_tmp83_);
+									_data_->_tmp82_ = _data_->info;
 #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp85_ = NULL;
+									_data_->_tmp83_ = g_file_info_get_name (_data_->_tmp82_);
 #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp85_ = g_file_get_child (_data_->_tmp82_, _data_->_tmp84_);
+									_data_->_tmp84_ = g_file_get_child (_data_->_tmp81_, _data_->_tmp83_);
 #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp86_ = NULL;
+									_data_->_tmp85_ = _data_->_tmp84_;
 #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp86_ = _data_->_tmp85_;
+									_data_->_tmp86_ = _data_->info;
 #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp87_ = NULL;
+									gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp80_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp85_, _data_->_tmp86_);
 #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp87_ = _data_->info;
-#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp81_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp86_, _data_->_tmp87_);
-#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_g_object_unref0 (_data_->_tmp86_);
+									_g_object_unref0 (_data_->_tmp85_);
 #line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 									break;
-#line 4323 "DirectoryMonitor.c"
+#line 4046 "DirectoryMonitor.c"
 								}
 #line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 								case G_FILE_TYPE_DIRECTORY:
-#line 4327 "DirectoryMonitor.c"
+#line 4050 "DirectoryMonitor.c"
 								{
 #line 941 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp88_ = NULL;
+									_data_->_tmp87_ = _data_->dir_map;
 #line 941 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp88_ = _data_->dir_map;
-#line 941 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									if (_data_->_tmp88_ == NULL) {
-#line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-										_data_->_tmp89_ = NULL;
+									if (_data_->_tmp87_ == NULL) {
 #line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-										_data_->_tmp89_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+										_data_->_tmp88_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 										_g_object_unref0 (_data_->dir_map);
 #line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-										_data_->dir_map = _data_->_tmp89_;
-#line 4343 "DirectoryMonitor.c"
+										_data_->dir_map = _data_->_tmp88_;
+#line 4062 "DirectoryMonitor.c"
 									}
 #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp90_ = NULL;
-#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp90_ = _data_->dir_map;
-#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp91_ = NULL;
-#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp91_ = _data_->dir;
-#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp92_ = NULL;
-#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp92_ = _data_->info;
-#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp93_ = NULL;
+									_data_->_tmp89_ = _data_->dir_map;
 #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp93_ = g_file_info_get_name (_data_->_tmp92_);
+									_data_->_tmp90_ = _data_->dir;
 #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp94_ = NULL;
+									_data_->_tmp91_ = _data_->info;
 #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp94_ = g_file_get_child (_data_->_tmp91_, _data_->_tmp93_);
+									_data_->_tmp92_ = g_file_info_get_name (_data_->_tmp91_);
 #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp95_ = NULL;
+									_data_->_tmp93_ = g_file_get_child (_data_->_tmp90_, _data_->_tmp92_);
 #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp95_ = _data_->_tmp94_;
+									_data_->_tmp94_ = _data_->_tmp93_;
 #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp96_ = NULL;
+									_data_->_tmp95_ = _data_->info;
 #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_data_->_tmp96_ = _data_->info;
+									gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp89_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp94_, _data_->_tmp95_);
 #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp90_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp95_, _data_->_tmp96_);
-#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-									_g_object_unref0 (_data_->_tmp95_);
+									_g_object_unref0 (_data_->_tmp94_);
 #line 945 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 									break;
-#line 4379 "DirectoryMonitor.c"
+#line 4084 "DirectoryMonitor.c"
 								}
 								default:
 								{
 #line 949 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 									break;
-#line 4385 "DirectoryMonitor.c"
+#line 4090 "DirectoryMonitor.c"
 								}
 							}
 #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 							_g_object_unref0 (_data_->info);
-#line 4390 "DirectoryMonitor.c"
+#line 4095 "DirectoryMonitor.c"
 						}
 					}
 				}
 #line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				__g_list_free__g_object_unref0_0 (_data_->infos);
-#line 4396 "DirectoryMonitor.c"
+#line 4101 "DirectoryMonitor.c"
 			}
 		}
 #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_data_->enumerator);
-#line 4401 "DirectoryMonitor.c"
+#line 4106 "DirectoryMonitor.c"
 	}
-	goto __finally481;
-	__catch481_g_error:
+	goto __finally482;
+	__catch482_g_error:
 	{
 #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->err2 = _data_->_inner_error_;
 #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_inner_error_ = NULL;
 #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp97_ = NULL;
-#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp97_ = _data_->dir;
-#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp98_ = NULL;
-#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp98_ = g_file_get_path (_data_->_tmp97_);
-#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp99_ = NULL;
-#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp99_ = _data_->_tmp98_;
+		_data_->_tmp96_ = _data_->dir;
 #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp100_ = NULL;
+		_data_->_tmp97_ = g_file_get_path (_data_->_tmp96_);
 #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp100_ = _data_->err2;
+		_data_->_tmp98_ = _data_->_tmp97_;
 #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp101_ = NULL;
+		_data_->_tmp99_ = _data_->err2;
 #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp101_ = _data_->_tmp100_->message;
+		_data_->_tmp100_ = _data_->_tmp99_->message;
 #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		g_warning ("DirectoryMonitor.vala:954: Aborted directory traversal of %s: %s", _data_->_tmp99_, _data_->_tmp101_);
+		g_warning ("DirectoryMonitor.vala:954: Aborted directory traversal of %s: %s", _data_->_tmp98_, _data_->_tmp100_);
 #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_g_free0 (_data_->_tmp99_);
+		_g_free0 (_data_->_tmp98_);
 #line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp102_ = FALSE;
+		_data_->_tmp101_ = _data_->in_discovery;
 #line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp102_ = _data_->in_discovery;
-#line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp102_);
+		directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp101_);
 #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_error_free0 (_data_->err2);
 #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4449,22 +4142,23 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_data_->local_dir_info);
 #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		if (_data_->_state_ == 0) {
+		g_task_return_pointer (_data_->_async_result, _data_, NULL);
 #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 4452 "DirectoryMonitor.c"
-		} else {
+		if (_data_->_state_ != 0) {
+#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+			while (_data_->_task_complete_ != TRUE) {
 #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			g_simple_async_result_complete (_data_->_async_result);
-#line 4456 "DirectoryMonitor.c"
+				g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
+#line 4149 "DirectoryMonitor.c"
+			}
 		}
 #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		g_object_unref (_data_->_async_result);
 #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return FALSE;
-#line 4462 "DirectoryMonitor.c"
+#line 4156 "DirectoryMonitor.c"
 	}
-	__finally481:
+	__finally482:
 #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4478,246 +4172,174 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		g_clear_error (&_data_->_inner_error_);
 #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+		g_object_unref (_data_->_async_result);
+#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return FALSE;
-#line 4479 "DirectoryMonitor.c"
+#line 4175 "DirectoryMonitor.c"
 	}
 #line 962 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp103_ = FALSE;
-#line 962 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp103_ = _data_->in_discovery;
+	_data_->_tmp102_ = _data_->in_discovery;
 #line 962 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	if (_data_->_tmp103_) {
+	if (_data_->_tmp102_) {
 #line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp104_ = NULL;
+		_data_->_tmp103_ = _data_->dir;
 #line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp104_ = _data_->dir;
+		_data_->_tmp104_ = _data_->local_dir_info;
 #line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp105_ = NULL;
-#line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp105_ = _data_->local_dir_info;
-#line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		directory_monitor_internal_notify_directory_discovered (_data_->self, _data_->_tmp104_, _data_->_tmp105_);
-#line 4497 "DirectoryMonitor.c"
+		directory_monitor_internal_notify_directory_discovered (_data_->self, _data_->_tmp103_, _data_->_tmp104_);
+#line 4187 "DirectoryMonitor.c"
 	} else {
 #line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp106_ = NULL;
-#line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp106_ = _data_->dir;
+		_data_->_tmp105_ = _data_->dir;
 #line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp107_ = NULL;
+		_data_->_tmp106_ = _data_->local_dir_info;
 #line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp107_ = _data_->local_dir_info;
-#line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		directory_monitor_internal_notify_directory_created (_data_->self, _data_->_tmp106_, _data_->_tmp107_);
-#line 4509 "DirectoryMonitor.c"
+		directory_monitor_internal_notify_directory_created (_data_->self, _data_->_tmp105_, _data_->_tmp106_);
+#line 4195 "DirectoryMonitor.c"
 	}
 #line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp108_ = NULL;
-#line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp108_ = _data_->dir;
+	_data_->_tmp107_ = _data_->dir;
 #line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp109_ = NULL;
+	_data_->_tmp108_ = _data_->local_dir_info;
 #line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp109_ = _data_->local_dir_info;
-#line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	directory_monitor_add_monitor (_data_->self, _data_->_tmp108_, _data_->_tmp109_);
-#line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp110_ = NULL;
+	directory_monitor_add_monitor (_data_->self, _data_->_tmp107_, _data_->_tmp108_);
 #line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp110_ = _data_->file_map;
+	_data_->_tmp109_ = _data_->file_map;
 #line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	if (_data_->_tmp110_ != NULL) {
-#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp111_ = NULL;
+	if (_data_->_tmp109_ != NULL) {
 #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp111_ = _data_->file_map;
-#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp112_ = FALSE;
+		_data_->_tmp110_ = _data_->file_map;
 #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp112_ = _data_->in_discovery;
+		_data_->_tmp111_ = _data_->in_discovery;
 #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_state_ = 4;
 #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		directory_monitor_notify_directory_files (_data_->self, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp111_, GEE_TYPE_MAP, GeeMap), _data_->_tmp112_, directory_monitor_explore_async_ready, _data_);
+		directory_monitor_notify_directory_files (_data_->self, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp110_, GEE_TYPE_MAP, GeeMap), _data_->_tmp111_, directory_monitor_explore_async_ready, _data_);
 #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return FALSE;
-#line 4541 "DirectoryMonitor.c"
+#line 4217 "DirectoryMonitor.c"
 		_state_4:
 #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_notify_directory_files_finish (_data_->self, _data_->_res_);
-#line 4545 "DirectoryMonitor.c"
+#line 4221 "DirectoryMonitor.c"
 	}
 #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp114_ = FALSE;
+	_data_->_tmp113_ = _data_->self->priv->recurse;
 #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp114_ = _data_->self->priv->recurse;
-#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	if (_data_->_tmp114_) {
-#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp115_ = NULL;
+	if (_data_->_tmp113_) {
 #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp115_ = _data_->dir_map;
+		_data_->_tmp114_ = _data_->dir_map;
 #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp113_ = _data_->_tmp115_ != NULL;
-#line 4559 "DirectoryMonitor.c"
+		_data_->_tmp112_ = _data_->_tmp114_ != NULL;
+#line 4231 "DirectoryMonitor.c"
 	} else {
 #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp113_ = FALSE;
-#line 4563 "DirectoryMonitor.c"
+		_data_->_tmp112_ = FALSE;
+#line 4235 "DirectoryMonitor.c"
 	}
 #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	if (_data_->_tmp113_) {
-#line 4567 "DirectoryMonitor.c"
+	if (_data_->_tmp112_) {
+#line 4239 "DirectoryMonitor.c"
 		{
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp116_ = NULL;
+			_data_->_tmp115_ = _data_->dir_map;
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp116_ = _data_->dir_map;
+			_data_->_tmp116_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp115_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp117_ = NULL;
-#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp117_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp116_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp118_ = NULL;
+			_data_->_tmp117_ = _data_->_tmp116_;
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp118_ = _data_->_tmp117_;
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp119_ = NULL;
-#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp119_ = _data_->_tmp118_;
-#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp120_ = NULL;
-#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp120_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp119_, GEE_TYPE_ITERABLE, GeeIterable));
+			_data_->_tmp119_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp118_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp121_ = NULL;
+			_data_->_tmp120_ = _data_->_tmp119_;
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp121_ = _data_->_tmp120_;
+			_g_object_unref0 (_data_->_tmp118_);
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_g_object_unref0 (_data_->_tmp119_);
-#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_subdir_it = _data_->_tmp121_;
+			_data_->_subdir_it = _data_->_tmp120_;
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			while (TRUE) {
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp122_ = NULL;
-#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp122_ = _data_->_subdir_it;
-#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp123_ = FALSE;
+				_data_->_tmp121_ = _data_->_subdir_it;
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp123_ = gee_iterator_next (_data_->_tmp122_);
+				_data_->_tmp122_ = gee_iterator_next (_data_->_tmp121_);
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				if (!_data_->_tmp123_) {
+				if (!_data_->_tmp122_) {
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 4611 "DirectoryMonitor.c"
+#line 4267 "DirectoryMonitor.c"
 				}
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp124_ = NULL;
-#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp124_ = _data_->_subdir_it;
-#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp125_ = NULL;
+				_data_->_tmp123_ = _data_->_subdir_it;
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp125_ = gee_iterator_get (_data_->_tmp124_);
+				_data_->_tmp124_ = gee_iterator_get (_data_->_tmp123_);
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->subdir = (GFile*) _data_->_tmp125_;
+				_data_->subdir = (GFile*) _data_->_tmp124_;
 #line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp126_ = 0;
+				_data_->_tmp125_ = _data_->self->priv->outstanding_exploration_dirs;
 #line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp126_ = _data_->self->priv->outstanding_exploration_dirs;
-#line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->self->priv->outstanding_exploration_dirs = _data_->_tmp126_ + 1;
-#line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp127_ = 0;
+				_data_->self->priv->outstanding_exploration_dirs = _data_->_tmp125_ + 1;
 #line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				_data_->_tmp127_ = _data_->self->priv->outstanding_exploration_dirs;
+				_data_->_tmp126_ = _data_->self->priv->outstanding_exploration_dirs;
 #line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-				if (_data_->_tmp127_ > DIRECTORY_MONITOR_MAX_EXPLORATION_DIRS) {
-#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp128_ = NULL;
+				if (_data_->_tmp126_ > DIRECTORY_MONITOR_MAX_EXPLORATION_DIRS) {
 #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp128_ = _data_->subdir;
+					_data_->_tmp127_ = _data_->subdir;
 #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp129_ = NULL;
+					_data_->_tmp128_ = _data_->dir_map;
 #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp129_ = _data_->dir_map;
+					_data_->_tmp129_ = _data_->subdir;
 #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp130_ = NULL;
+					_data_->_tmp130_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp128_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp129_);
 #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp130_ = _data_->subdir;
+					_data_->_tmp131_ = (GFileInfo*) _data_->_tmp130_;
 #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp131_ = NULL;
-#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp131_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp129_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp130_);
-#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp132_ = NULL;
-#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp132_ = (GFileInfo*) _data_->_tmp131_;
-#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp133_ = FALSE;
-#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp133_ = _data_->in_discovery;
+					_data_->_tmp132_ = _data_->in_discovery;
 #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_data_->_state_ = 5;
 #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					directory_monitor_explore_async (_data_->self, _data_->_tmp128_, _data_->_tmp132_, _data_->_tmp133_, directory_monitor_explore_async_ready, _data_);
+					directory_monitor_explore_async (_data_->self, _data_->_tmp127_, _data_->_tmp131_, _data_->_tmp132_, directory_monitor_explore_async_ready, _data_);
 #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					return FALSE;
-#line 4665 "DirectoryMonitor.c"
+#line 4301 "DirectoryMonitor.c"
 					_state_5:
 #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					directory_monitor_explore_finish (_data_->self, _data_->_res_);
 #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_g_object_unref0 (_data_->_tmp132_);
-#line 4671 "DirectoryMonitor.c"
+					_g_object_unref0 (_data_->_tmp131_);
+#line 4307 "DirectoryMonitor.c"
 				} else {
 #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp134_ = NULL;
-#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp134_ = _data_->subdir;
-#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp135_ = NULL;
-#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp135_ = _data_->dir_map;
-#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp136_ = NULL;
-#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp136_ = _data_->subdir;
+					_data_->_tmp133_ = _data_->subdir;
 #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp137_ = NULL;
+					_data_->_tmp134_ = _data_->dir_map;
 #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp137_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp135_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp136_);
+					_data_->_tmp135_ = _data_->subdir;
 #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp138_ = NULL;
+					_data_->_tmp136_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp134_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp135_);
 #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp138_ = (GFileInfo*) _data_->_tmp137_;
+					_data_->_tmp137_ = (GFileInfo*) _data_->_tmp136_;
 #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp139_ = FALSE;
+					_data_->_tmp138_ = _data_->in_discovery;
 #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_data_->_tmp139_ = _data_->in_discovery;
+					directory_monitor_explore_async (_data_->self, _data_->_tmp133_, _data_->_tmp137_, _data_->_tmp138_, NULL, NULL);
 #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					directory_monitor_explore_async (_data_->self, _data_->_tmp134_, _data_->_tmp138_, _data_->_tmp139_, NULL, NULL);
-#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-					_g_object_unref0 (_data_->_tmp138_);
-#line 4701 "DirectoryMonitor.c"
+					_g_object_unref0 (_data_->_tmp137_);
+#line 4325 "DirectoryMonitor.c"
 				}
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_g_object_unref0 (_data_->subdir);
-#line 4705 "DirectoryMonitor.c"
+#line 4329 "DirectoryMonitor.c"
 			}
 #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (_data_->_subdir_it);
-#line 4709 "DirectoryMonitor.c"
+#line 4333 "DirectoryMonitor.c"
 		}
 	}
 #line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp140_ = FALSE;
-#line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp140_ = _data_->in_discovery;
+	_data_->_tmp139_ = _data_->in_discovery;
 #line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp140_);
+	directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp139_);
 #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (_data_->file_map);
 #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4725,20 +4347,21 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (_data_->local_dir_info);
 #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	if (_data_->_state_ == 0) {
+	g_task_return_pointer (_data_->_async_result, _data_, NULL);
 #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 4728 "DirectoryMonitor.c"
-	} else {
+	if (_data_->_state_ != 0) {
 #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		g_simple_async_result_complete (_data_->_async_result);
-#line 4732 "DirectoryMonitor.c"
+		while (_data_->_task_complete_ != TRUE) {
+#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+			g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
+#line 4354 "DirectoryMonitor.c"
+		}
 	}
 #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_object_unref (_data_->_async_result);
 #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return FALSE;
-#line 4738 "DirectoryMonitor.c"
+#line 4361 "DirectoryMonitor.c"
 }
 
 
@@ -4751,22 +4374,46 @@ static void directory_monitor_notify_directory_files_data_free (gpointer _data)
 	_g_object_unref0 (_data_->self);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_slice_free (DirectoryMonitorNotifyDirectoryFilesData, _data_);
-#line 4751 "DirectoryMonitor.c"
+#line 4374 "DirectoryMonitor.c"
+}
+
+
+static void directory_monitor_notify_directory_files_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) {
+	DirectoryMonitorNotifyDirectoryFilesData* _task_data_;
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	_task_data_ = g_task_get_task_data (G_TASK (res));
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	if (_task_data_->_callback_ != NULL) {
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+		_task_data_->_callback_ (source_object, res, user_data);
+#line 4386 "DirectoryMonitor.c"
+	}
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	_task_data_->_task_complete_ = TRUE;
+#line 4390 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_notify_directory_files (DirectoryMonitor* self, GeeMap* map, gboolean in_discovery, GAsyncReadyCallback _callback_, gpointer _user_data_) {
 	DirectoryMonitorNotifyDirectoryFilesData* _data_;
-	DirectoryMonitor* _tmp0_ = NULL;
-	GeeMap* _tmp1_ = NULL;
-	GeeMap* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	DirectoryMonitor* _tmp0_;
+	GeeMap* _tmp1_;
+	GeeMap* _tmp2_;
+	gboolean _tmp3_;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_ = g_slice_new0 (DirectoryMonitorNotifyDirectoryFilesData);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, directory_monitor_notify_directory_files);
+	_data_->_callback_ = _callback_;
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	_data_->_async_result = g_task_new (G_OBJECT (self), NULL, directory_monitor_notify_directory_files_async_ready_wrapper, _user_data_);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, directory_monitor_notify_directory_files_data_free);
+	if (_callback_ == NULL) {
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+		_data_->_task_complete_ = TRUE;
+#line 4410 "DirectoryMonitor.c"
+	}
+#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+	g_task_set_task_data (_data_->_async_result, _data_, directory_monitor_notify_directory_files_data_free);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp0_ = _g_object_ref0 (self);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4785,15 +4432,15 @@ static void directory_monitor_notify_directory_files (DirectoryMonitor* self, Ge
 	_data_->in_discovery = _tmp3_;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_notify_directory_files_co (_data_);
-#line 4785 "DirectoryMonitor.c"
+#line 4432 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_notify_directory_files_finish (DirectoryMonitor* self, GAsyncResult* _res_) {
 	DirectoryMonitorNotifyDirectoryFilesData* _data_;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
-#line 4793 "DirectoryMonitor.c"
+	_data_ = g_task_propagate_pointer (G_TASK (_res_), NULL);
+#line 4440 "DirectoryMonitor.c"
 }
 
 
@@ -4802,7 +4449,7 @@ static gboolean _directory_monitor_notify_directory_files_co_gsource_func (gpoin
 	result = directory_monitor_notify_directory_files_co (self);
 #line 996 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 4802 "DirectoryMonitor.c"
+#line 4449 "DirectoryMonitor.c"
 }
 
 
@@ -4811,73 +4458,51 @@ static gboolean directory_monitor_notify_directory_files_co (DirectoryMonitorNot
 	switch (_data_->_state_) {
 #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case 0:
-#line 4811 "DirectoryMonitor.c"
+#line 4458 "DirectoryMonitor.c"
 		goto _state_0;
 #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case 1:
-#line 4815 "DirectoryMonitor.c"
+#line 4462 "DirectoryMonitor.c"
 		goto _state_1;
 		default:
 #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		g_assert_not_reached ();
-#line 4820 "DirectoryMonitor.c"
+#line 4467 "DirectoryMonitor.c"
 	}
 	_state_0:
 #line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp0_ = NULL;
-#line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp0_ = _data_->map;
 #line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp1_ = NULL;
-#line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp1_ = gee_map_map_iterator (_data_->_tmp0_);
 #line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->iter = _data_->_tmp1_;
 #line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	while (TRUE) {
 #line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp2_ = NULL;
-#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_tmp2_ = _data_->iter;
 #line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp3_ = FALSE;
-#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_tmp3_ = gee_map_iterator_next (_data_->_tmp2_);
 #line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (!_data_->_tmp3_) {
 #line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 4847 "DirectoryMonitor.c"
+#line 4486 "DirectoryMonitor.c"
 		}
 #line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_data_->_tmp4_ = FALSE;
-#line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->_tmp4_ = _data_->in_discovery;
 #line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (_data_->_tmp4_) {
 #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp5_ = NULL;
-#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp5_ = _data_->iter;
 #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp6_ = NULL;
-#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp6_ = gee_map_iterator_get_key (_data_->_tmp5_);
 #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp7_ = NULL;
-#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp7_ = (GFile*) _data_->_tmp6_;
 #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp8_ = NULL;
-#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp8_ = _data_->iter;
 #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp9_ = NULL;
-#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp9_ = gee_map_iterator_get_value (_data_->_tmp8_);
 #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp10_ = NULL;
-#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp10_ = (GFileInfo*) _data_->_tmp9_;
 #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			directory_monitor_internal_notify_file_discovered (_data_->self, _data_->_tmp7_, _data_->_tmp10_);
@@ -4885,31 +4510,19 @@ static gboolean directory_monitor_notify_directory_files_co (DirectoryMonitorNot
 			_g_object_unref0 (_data_->_tmp10_);
 #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (_data_->_tmp7_);
-#line 4885 "DirectoryMonitor.c"
+#line 4510 "DirectoryMonitor.c"
 		} else {
 #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp11_ = NULL;
-#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp11_ = _data_->iter;
 #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp12_ = NULL;
-#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp12_ = gee_map_iterator_get_key (_data_->_tmp11_);
 #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp13_ = NULL;
-#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp13_ = (GFile*) _data_->_tmp12_;
 #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp14_ = NULL;
-#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp14_ = _data_->iter;
 #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp15_ = NULL;
-#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp15_ = gee_map_iterator_get_value (_data_->_tmp14_);
 #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp16_ = NULL;
-#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp16_ = (GFileInfo*) _data_->_tmp15_;
 #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			directory_monitor_internal_notify_file_created (_data_->self, _data_->_tmp13_, _data_->_tmp16_);
@@ -4917,7 +4530,7 @@ static gboolean directory_monitor_notify_directory_files_co (DirectoryMonitorNot
 			_g_object_unref0 (_data_->_tmp16_);
 #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (_data_->_tmp13_);
-#line 4917 "DirectoryMonitor.c"
+#line 4530 "DirectoryMonitor.c"
 		}
 #line 996 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		g_idle_add_full (DIRECTORY_MONITOR_DEFAULT_PRIORITY, _directory_monitor_notify_directory_files_co_gsource_func, _data_, NULL);
@@ -4925,35 +4538,36 @@ static gboolean directory_monitor_notify_directory_files_co (DirectoryMonitorNot
 		_data_->_state_ = 1;
 #line 997 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return FALSE;
-#line 4925 "DirectoryMonitor.c"
+#line 4538 "DirectoryMonitor.c"
 		_state_1:
 		;
 	}
 #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (_data_->iter);
 #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	if (_data_->_state_ == 0) {
+	g_task_return_pointer (_data_->_async_result, _data_, NULL);
 #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 4935 "DirectoryMonitor.c"
-	} else {
+	if (_data_->_state_ != 0) {
 #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		g_simple_async_result_complete (_data_->_async_result);
-#line 4939 "DirectoryMonitor.c"
+		while (_data_->_task_complete_ != TRUE) {
+#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+			g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
+#line 4552 "DirectoryMonitor.c"
+		}
 	}
 #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_object_unref (_data_->_async_result);
 #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return FALSE;
-#line 4945 "DirectoryMonitor.c"
+#line 4559 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_explore_directory_completed (DirectoryMonitor* self, gboolean in_discovery) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp3_;
 #line 1003 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 1004 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4968,23 +4582,23 @@ static void directory_monitor_explore_directory_completed (DirectoryMonitor* sel
 	_tmp3_ = in_discovery;
 #line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp3_) {
-#line 4968 "DirectoryMonitor.c"
-		gint _tmp4_ = 0;
+#line 4582 "DirectoryMonitor.c"
+		gint _tmp4_;
 #line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp4_ = self->priv->outstanding_exploration_dirs;
 #line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp2_ = _tmp4_ == 0;
-#line 4974 "DirectoryMonitor.c"
+#line 4588 "DirectoryMonitor.c"
 	} else {
 #line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp2_ = FALSE;
-#line 4978 "DirectoryMonitor.c"
+#line 4592 "DirectoryMonitor.c"
 	}
 #line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp2_) {
 #line 1008 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_notify_discovery_completed (self);
-#line 4984 "DirectoryMonitor.c"
+#line 4598 "DirectoryMonitor.c"
 	}
 }
 
@@ -4992,32 +4606,32 @@ static void directory_monitor_explore_directory_completed (DirectoryMonitor* sel
 static void _directory_monitor_on_monitor_notification_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) {
 #line 1036 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_on_monitor_notification ((DirectoryMonitor*) self, file, other_file, event_type);
-#line 4992 "DirectoryMonitor.c"
+#line 4606 "DirectoryMonitor.c"
 }
 
 
 static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* dir, GFileInfo* info) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	gchar* id = NULL;
-	DirectoryMonitorFileInfoMap* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFileInfo* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	GeeHashMap* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	DirectoryMonitorFileInfoMap* _tmp1_;
+	GFile* _tmp2_;
+	GFileInfo* _tmp3_;
+	gchar* _tmp4_;
+	const gchar* _tmp5_;
+	GeeHashMap* _tmp6_;
+	const gchar* _tmp7_;
+	gboolean _tmp8_;
 	GFileMonitor* monitor = NULL;
-	GeeHashMap* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	GFileMonitor* _tmp21_ = NULL;
-	GFileMonitor* _tmp22_ = NULL;
-	GFile* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	gchar* _tmp27_ = NULL;
+	GeeHashMap* _tmp19_;
+	const gchar* _tmp20_;
+	GFileMonitor* _tmp21_;
+	GFileMonitor* _tmp22_;
+	GFile* _tmp23_;
+	gchar* _tmp24_;
+	gchar* _tmp25_;
+	gchar* _tmp26_;
+	gchar* _tmp27_;
 	GError * _inner_error_ = NULL;
 #line 1014 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE);
@@ -5033,7 +4647,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 		result = FALSE;
 #line 1016 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 5033 "DirectoryMonitor.c"
+#line 4647 "DirectoryMonitor.c"
 	}
 #line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp1_ = self->priv->files;
@@ -5055,7 +4669,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 		_g_free0 (id);
 #line 1020 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 5055 "DirectoryMonitor.c"
+#line 4669 "DirectoryMonitor.c"
 	}
 #line 1023 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp6_ = self->priv->monitors;
@@ -5071,16 +4685,16 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 		_g_free0 (id);
 #line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 5071 "DirectoryMonitor.c"
+#line 4685 "DirectoryMonitor.c"
 	}
 #line 1026 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	monitor = NULL;
-#line 5075 "DirectoryMonitor.c"
+#line 4689 "DirectoryMonitor.c"
 	{
 		GFileMonitor* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
-		GFileMonitor* _tmp11_ = NULL;
-		GFileMonitor* _tmp12_ = NULL;
+		GFile* _tmp10_;
+		GFileMonitor* _tmp11_;
+		GFileMonitor* _tmp12_;
 #line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp10_ = dir;
 #line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5089,8 +4703,8 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 		_tmp9_ = _tmp11_;
 #line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5089 "DirectoryMonitor.c"
-			goto __catch482_g_error;
+#line 4703 "DirectoryMonitor.c"
+			goto __catch483_g_error;
 		}
 #line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp12_ = _tmp9_;
@@ -5102,17 +4716,17 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 		monitor = _tmp12_;
 #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_tmp9_);
-#line 5102 "DirectoryMonitor.c"
+#line 4716 "DirectoryMonitor.c"
 	}
-	goto __finally482;
-	__catch482_g_error:
+	goto __finally483;
+	__catch483_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		GError* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
+		GFile* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		GError* _tmp16_;
+		const gchar* _tmp17_;
 #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		err = _inner_error_;
 #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5141,12 +4755,12 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 		_g_free0 (id);
 #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 5141 "DirectoryMonitor.c"
+#line 4755 "DirectoryMonitor.c"
 	}
-	__finally482:
+	__finally483:
 #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5146 "DirectoryMonitor.c"
+#line 4760 "DirectoryMonitor.c"
 		gboolean _tmp18_ = FALSE;
 #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (monitor);
@@ -5158,7 +4772,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 		g_clear_error (&_inner_error_);
 #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return _tmp18_;
-#line 5158 "DirectoryMonitor.c"
+#line 4772 "DirectoryMonitor.c"
 	}
 #line 1035 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp19_ = self->priv->monitors;
@@ -5196,35 +4810,35 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 	_g_free0 (id);
 #line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 5196 "DirectoryMonitor.c"
+#line 4810 "DirectoryMonitor.c"
 }
 
 
 static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile* dir, GFileInfo* info) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	gchar* id = NULL;
-	DirectoryMonitorFileInfoMap* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFileInfo* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	DirectoryMonitorFileInfoMap* _tmp1_;
+	GFile* _tmp2_;
+	GFileInfo* _tmp3_;
+	gchar* _tmp4_;
+	const gchar* _tmp5_;
 	GFileMonitor* monitor = NULL;
-	GeeHashMap* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gpointer _tmp8_ = NULL;
-	GFileMonitor* _tmp9_ = NULL;
+	GeeHashMap* _tmp6_;
+	const gchar* _tmp7_;
+	gpointer _tmp8_;
+	GFileMonitor* _tmp9_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
-	gboolean _tmp13_ = FALSE;
-	GFileMonitor* _tmp14_ = NULL;
-	GFile* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
+	GeeHashMap* _tmp10_;
+	const gchar* _tmp11_;
+	gboolean _tmp12_;
+	gboolean _tmp13_;
+	GFileMonitor* _tmp14_;
+	GFile* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
 #line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE);
 #line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5239,7 +4853,7 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile*
 		result = FALSE;
 #line 1046 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 5239 "DirectoryMonitor.c"
+#line 4853 "DirectoryMonitor.c"
 	}
 #line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp1_ = self->priv->files;
@@ -5261,7 +4875,7 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile*
 		_g_free0 (id);
 #line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 5261 "DirectoryMonitor.c"
+#line 4875 "DirectoryMonitor.c"
 	}
 #line 1052 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp6_ = self->priv->monitors;
@@ -5283,7 +4897,7 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile*
 		_g_free0 (id);
 #line 1054 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 5283 "DirectoryMonitor.c"
+#line 4897 "DirectoryMonitor.c"
 	}
 #line 1056 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp10_ = self->priv->monitors;
@@ -5325,14 +4939,14 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile*
 	_g_free0 (id);
 #line 1063 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 5325 "DirectoryMonitor.c"
+#line 4939 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_cancel_monitor (DirectoryMonitor* self, GFileMonitor* monitor) {
-	GFileMonitor* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	GFileMonitor* _tmp2_ = NULL;
+	GFileMonitor* _tmp0_;
+	guint _tmp1_;
+	GFileMonitor* _tmp2_;
 #line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5347,7 +4961,7 @@ static void directory_monitor_cancel_monitor (DirectoryMonitor* self, GFileMonit
 	_tmp2_ = monitor;
 #line 1068 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_file_monitor_cancel (_tmp2_);
-#line 5347 "DirectoryMonitor.c"
+#line 4961 "DirectoryMonitor.c"
 }
 
 
@@ -5356,7 +4970,7 @@ static void _directory_monitor_query_info_queue_element_on_completed_gasync_read
 	directory_monitor_query_info_queue_element_on_completed ((DirectoryMonitorQueryInfoQueueElement*) self, source_object, res);
 #line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_query_info_queue_element_unref (self);
-#line 5356 "DirectoryMonitor.c"
+#line 4970 "DirectoryMonitor.c"
 }
 
 
@@ -5365,28 +4979,28 @@ static gboolean _directory_monitor_check_for_expired_delete_events_gsource_func
 	result = directory_monitor_check_for_expired_delete_events ((DirectoryMonitor*) self);
 #line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 5365 "DirectoryMonitor.c"
+#line 4979 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, GFile* file, GFile* other_file, GFileMonitorEvent event) {
 	gchar* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFileMonitorEvent _tmp5_ = 0;
+	GFile* _tmp1_;
+	GFileMonitorEvent _tmp5_;
 	GEnumValue* _tmp6_;
-	GFile* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
+	GFile* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
 	DirectoryMonitorQueryInfoQueueElement* query_info = NULL;
-	GFile* _tmp12_ = NULL;
-	GFile* _tmp13_ = NULL;
-	GFileMonitorEvent _tmp14_ = 0;
-	DirectoryMonitorQueryInfoQueueElement* _tmp15_ = NULL;
-	GeeQueue* _tmp16_ = NULL;
-	DirectoryMonitorQueryInfoQueueElement* _tmp17_ = NULL;
-	GFileMonitorEvent _tmp18_ = 0;
+	GFile* _tmp12_;
+	GFile* _tmp13_;
+	GFileMonitorEvent _tmp14_;
+	DirectoryMonitorQueryInfoQueueElement* _tmp15_;
+	GeeQueue* _tmp16_;
+	DirectoryMonitorQueryInfoQueueElement* _tmp17_;
+	GFileMonitorEvent _tmp18_;
 #line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5397,9 +5011,9 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G
 	_tmp1_ = other_file;
 #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp1_ != NULL) {
-#line 5397 "DirectoryMonitor.c"
-		GFile* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+#line 5011 "DirectoryMonitor.c"
+		GFile* _tmp2_;
+		gchar* _tmp3_;
 #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp2_ = other_file;
 #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5408,16 +5022,16 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G
 		_g_free0 (_tmp0_);
 #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp0_ = _tmp3_;
-#line 5408 "DirectoryMonitor.c"
+#line 5022 "DirectoryMonitor.c"
 	} else {
-		gchar* _tmp4_ = NULL;
+		gchar* _tmp4_;
 #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp4_ = g_strdup ("(none)");
 #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_free0 (_tmp0_);
 #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp0_ = _tmp4_;
-#line 5417 "DirectoryMonitor.c"
+#line 5031 "DirectoryMonitor.c"
 	}
 #line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp5_ = event;
@@ -5463,11 +5077,11 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G
 		case G_FILE_MONITOR_EVENT_CREATED:
 #line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-#line 5463 "DirectoryMonitor.c"
+#line 5077 "DirectoryMonitor.c"
 		{
-			GFile* _tmp19_ = NULL;
-			GCancellable* _tmp20_ = NULL;
-			DirectoryMonitorQueryInfoQueueElement* _tmp21_ = NULL;
+			GFile* _tmp19_;
+			GCancellable* _tmp20_;
+			DirectoryMonitorQueryInfoQueueElement* _tmp21_;
 #line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp19_ = file;
 #line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5478,42 +5092,42 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G
 			g_file_query_info_async (_tmp19_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _tmp20_, _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback, directory_monitor_query_info_queue_element_ref (_tmp21_));
 #line 1090 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 5478 "DirectoryMonitor.c"
+#line 5092 "DirectoryMonitor.c"
 		}
 #line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_DELETED:
-#line 5482 "DirectoryMonitor.c"
+#line 5096 "DirectoryMonitor.c"
 		{
-			guint _tmp22_ = 0U;
+			guint _tmp22_;
 #line 1096 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp22_ = self->priv->delete_timer_id;
 #line 1096 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp22_ == ((guint) 0)) {
-#line 5489 "DirectoryMonitor.c"
-				guint _tmp23_ = 0U;
+#line 5103 "DirectoryMonitor.c"
+				guint _tmp23_;
 #line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp23_ = g_timeout_add_full (G_PRIORITY_DEFAULT, DIRECTORY_MONITOR_DELETED_EXPIRATION_MSEC / 2, _directory_monitor_check_for_expired_delete_events_gsource_func, g_object_ref (self), g_object_unref);
 #line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				self->priv->delete_timer_id = _tmp23_;
-#line 5495 "DirectoryMonitor.c"
+#line 5109 "DirectoryMonitor.c"
 			}
 #line 1098 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 5499 "DirectoryMonitor.c"
+#line 5113 "DirectoryMonitor.c"
 		}
 #line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_MOVED:
-#line 5503 "DirectoryMonitor.c"
+#line 5117 "DirectoryMonitor.c"
 		{
-			GFile* _tmp24_ = NULL;
+			GFile* _tmp24_;
 #line 1103 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp24_ = other_file;
 #line 1103 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp24_ != NULL) {
-#line 5510 "DirectoryMonitor.c"
-				GFile* _tmp25_ = NULL;
-				GCancellable* _tmp26_ = NULL;
-				DirectoryMonitorQueryInfoQueueElement* _tmp27_ = NULL;
+#line 5124 "DirectoryMonitor.c"
+				GFile* _tmp25_;
+				GCancellable* _tmp26_;
+				DirectoryMonitorQueryInfoQueueElement* _tmp27_;
 #line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp25_ = other_file;
 #line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5522,10 +5136,10 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G
 				_tmp27_ = query_info;
 #line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				g_file_query_info_async (_tmp25_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _tmp26_, _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback, directory_monitor_query_info_queue_element_ref (_tmp27_));
-#line 5522 "DirectoryMonitor.c"
+#line 5136 "DirectoryMonitor.c"
 			} else {
-				GeeQueue* _tmp28_ = NULL;
-				DirectoryMonitorQueryInfoQueueElement* _tmp29_ = NULL;
+				GeeQueue* _tmp28_;
+				DirectoryMonitorQueryInfoQueueElement* _tmp29_;
 #line 1107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				g_warning ("DirectoryMonitor.vala:1107: Unable to process MOVED event: no other_fi" \
 "le");
@@ -5535,16 +5149,16 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G
 				_tmp29_ = query_info;
 #line 1108 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection), _tmp29_);
-#line 5534 "DirectoryMonitor.c"
+#line 5148 "DirectoryMonitor.c"
 			}
 #line 1110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 5538 "DirectoryMonitor.c"
+#line 5152 "DirectoryMonitor.c"
 		}
 		default:
 		{
-			DirectoryMonitorQueryInfoQueueElement* _tmp30_ = NULL;
-			DirectoryMonitorQueryInfoQueueElement* _tmp31_ = NULL;
+			DirectoryMonitorQueryInfoQueueElement* _tmp30_;
+			DirectoryMonitorQueryInfoQueueElement* _tmp31_;
 #line 1114 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp30_ = query_info;
 #line 1114 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5555,21 +5169,21 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G
 			directory_monitor_process_query_queue (self, _tmp31_);
 #line 1116 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 5554 "DirectoryMonitor.c"
+#line 5168 "DirectoryMonitor.c"
 		}
 	}
 #line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_directory_monitor_query_info_queue_element_unref0 (query_info);
 #line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_free0 (_tmp0_);
-#line 5561 "DirectoryMonitor.c"
+#line 5175 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_process_query_queue (DirectoryMonitor* self, DirectoryMonitorQueryInfoQueueElement* query_info) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	DirectoryMonitorQueryInfoQueueElement* _tmp2_ = NULL;
+	DirectoryMonitorQueryInfoQueueElement* _tmp2_;
 #line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5578,47 +5192,47 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 	_tmp2_ = query_info;
 #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp2_ != NULL) {
-#line 5577 "DirectoryMonitor.c"
-		DirectoryMonitorQueryInfoQueueElement* _tmp3_ = NULL;
-		GFileInfo* _tmp4_ = NULL;
+#line 5191 "DirectoryMonitor.c"
+		DirectoryMonitorQueryInfoQueueElement* _tmp3_;
+		GFileInfo* _tmp4_;
 #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp3_ = query_info;
 #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp4_ = _tmp3_->info;
 #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp1_ = _tmp4_ != NULL;
-#line 5586 "DirectoryMonitor.c"
+#line 5200 "DirectoryMonitor.c"
 	} else {
 #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp1_ = FALSE;
-#line 5590 "DirectoryMonitor.c"
+#line 5204 "DirectoryMonitor.c"
 	}
 #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp1_) {
-#line 5594 "DirectoryMonitor.c"
-		DirectoryMonitorQueryInfoQueueElement* _tmp5_ = NULL;
-		GFileMonitorEvent _tmp6_ = 0;
+#line 5208 "DirectoryMonitor.c"
+		DirectoryMonitorQueryInfoQueueElement* _tmp5_;
+		GFileMonitorEvent _tmp6_;
 #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp5_ = query_info;
 #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp6_ = _tmp5_->event;
 #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp0_ = _tmp6_ == G_FILE_MONITOR_EVENT_CREATED;
-#line 5603 "DirectoryMonitor.c"
+#line 5217 "DirectoryMonitor.c"
 	} else {
 #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp0_ = FALSE;
-#line 5607 "DirectoryMonitor.c"
+#line 5221 "DirectoryMonitor.c"
 	}
 #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp0_) {
-#line 5611 "DirectoryMonitor.c"
+#line 5225 "DirectoryMonitor.c"
 		GFile* match = NULL;
-		DirectoryMonitorFileInfoMap* _tmp7_ = NULL;
-		DirectoryMonitorQueryInfoQueueElement* _tmp8_ = NULL;
-		GFileInfo* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
-		GFile* _tmp11_ = NULL;
+		DirectoryMonitorFileInfoMap* _tmp7_;
+		DirectoryMonitorQueryInfoQueueElement* _tmp8_;
+		GFileInfo* _tmp9_;
+		GFile* _tmp10_;
+		GFile* _tmp11_;
 #line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp7_ = self->priv->files;
 #line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5633,16 +5247,16 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 		_tmp11_ = match;
 #line 1127 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (_tmp11_ != NULL) {
-#line 5632 "DirectoryMonitor.c"
+#line 5246 "DirectoryMonitor.c"
 			gboolean matched = FALSE;
-			gboolean _tmp48_ = FALSE;
+			gboolean _tmp48_;
 #line 1128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			matched = FALSE;
-#line 5637 "DirectoryMonitor.c"
+#line 5251 "DirectoryMonitor.c"
 			{
 				GeeIterator* _enqueued_it = NULL;
-				GeeQueue* _tmp12_ = NULL;
-				GeeIterator* _tmp13_ = NULL;
+				GeeQueue* _tmp12_;
+				GeeIterator* _tmp13_;
 #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp12_ = self->priv->query_info_queue;
 #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5651,36 +5265,36 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 				_enqueued_it = _tmp13_;
 #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				while (TRUE) {
-#line 5650 "DirectoryMonitor.c"
-					GeeIterator* _tmp14_ = NULL;
-					gboolean _tmp15_ = FALSE;
+#line 5264 "DirectoryMonitor.c"
+					GeeIterator* _tmp14_;
+					gboolean _tmp15_;
 					DirectoryMonitorQueryInfoQueueElement* enqueued = NULL;
-					GeeIterator* _tmp16_ = NULL;
-					gpointer _tmp17_ = NULL;
+					GeeIterator* _tmp16_;
+					gpointer _tmp17_;
 					gboolean _tmp18_ = FALSE;
 					gboolean _tmp19_ = FALSE;
-					DirectoryMonitorQueryInfoQueueElement* _tmp20_ = NULL;
-					GFileMonitorEvent _tmp21_ = 0;
-					DirectoryMonitorQueryInfoQueueElement* _tmp28_ = NULL;
-					GFile* _tmp29_ = NULL;
-					gchar* _tmp30_ = NULL;
-					gchar* _tmp31_ = NULL;
-					DirectoryMonitorQueryInfoQueueElement* _tmp32_ = NULL;
-					GFile* _tmp33_ = NULL;
-					gchar* _tmp34_ = NULL;
-					gchar* _tmp35_ = NULL;
-					gchar* _tmp36_ = NULL;
-					gchar* _tmp37_ = NULL;
-					DirectoryMonitorQueryInfoQueueElement* _tmp38_ = NULL;
-					DirectoryMonitorQueryInfoQueueElement* _tmp39_ = NULL;
-					DirectoryMonitorQueryInfoQueueElement* _tmp40_ = NULL;
-					GFile* _tmp41_ = NULL;
-					GFile* _tmp42_ = NULL;
-					DirectoryMonitorQueryInfoQueueElement* _tmp43_ = NULL;
-					DirectoryMonitorQueryInfoQueueElement* _tmp44_ = NULL;
-					GFileInfo* _tmp45_ = NULL;
-					GFileInfo* _tmp46_ = NULL;
-					DirectoryMonitorQueryInfoQueueElement* _tmp47_ = NULL;
+					DirectoryMonitorQueryInfoQueueElement* _tmp20_;
+					GFileMonitorEvent _tmp21_;
+					DirectoryMonitorQueryInfoQueueElement* _tmp28_;
+					GFile* _tmp29_;
+					gchar* _tmp30_;
+					gchar* _tmp31_;
+					DirectoryMonitorQueryInfoQueueElement* _tmp32_;
+					GFile* _tmp33_;
+					gchar* _tmp34_;
+					gchar* _tmp35_;
+					gchar* _tmp36_;
+					gchar* _tmp37_;
+					DirectoryMonitorQueryInfoQueueElement* _tmp38_;
+					DirectoryMonitorQueryInfoQueueElement* _tmp39_;
+					DirectoryMonitorQueryInfoQueueElement* _tmp40_;
+					GFile* _tmp41_;
+					GFile* _tmp42_;
+					DirectoryMonitorQueryInfoQueueElement* _tmp43_;
+					DirectoryMonitorQueryInfoQueueElement* _tmp44_;
+					GFileInfo* _tmp45_;
+					GFileInfo* _tmp46_;
+					DirectoryMonitorQueryInfoQueueElement* _tmp47_;
 #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp14_ = _enqueued_it;
 #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5689,7 +5303,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 					if (!_tmp15_) {
 #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						break;
-#line 5688 "DirectoryMonitor.c"
+#line 5302 "DirectoryMonitor.c"
 					}
 #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp16_ = _enqueued_it;
@@ -5705,28 +5319,28 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 					if (_tmp21_ != G_FILE_MONITOR_EVENT_DELETED) {
 #line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						_tmp19_ = TRUE;
-#line 5704 "DirectoryMonitor.c"
+#line 5318 "DirectoryMonitor.c"
 					} else {
-						DirectoryMonitorQueryInfoQueueElement* _tmp22_ = NULL;
-						gboolean _tmp23_ = FALSE;
+						DirectoryMonitorQueryInfoQueueElement* _tmp22_;
+						gboolean _tmp23_;
 #line 1131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						_tmp22_ = enqueued;
 #line 1131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						_tmp23_ = _tmp22_->completed;
 #line 1131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						_tmp19_ = _tmp23_;
-#line 5714 "DirectoryMonitor.c"
+#line 5328 "DirectoryMonitor.c"
 					}
 #line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					if (_tmp19_) {
 #line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						_tmp18_ = TRUE;
-#line 5720 "DirectoryMonitor.c"
+#line 5334 "DirectoryMonitor.c"
 					} else {
-						GFile* _tmp24_ = NULL;
-						DirectoryMonitorQueryInfoQueueElement* _tmp25_ = NULL;
-						GFile* _tmp26_ = NULL;
-						gboolean _tmp27_ = FALSE;
+						GFile* _tmp24_;
+						DirectoryMonitorQueryInfoQueueElement* _tmp25_;
+						GFile* _tmp26_;
+						gboolean _tmp27_;
 #line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						_tmp24_ = match;
 #line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5737,7 +5351,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 						_tmp27_ = g_file_equal (_tmp24_, _tmp26_);
 #line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						_tmp18_ = !_tmp27_;
-#line 5736 "DirectoryMonitor.c"
+#line 5350 "DirectoryMonitor.c"
 					}
 #line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					if (_tmp18_) {
@@ -5745,7 +5359,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 						_directory_monitor_query_info_queue_element_unref0 (enqueued);
 #line 1133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						continue;
-#line 5744 "DirectoryMonitor.c"
+#line 5358 "DirectoryMonitor.c"
 					}
 #line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp28_ = query_info;
@@ -5813,31 +5427,31 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 					_directory_monitor_query_info_queue_element_unref0 (enqueued);
 #line 1146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 5812 "DirectoryMonitor.c"
+#line 5426 "DirectoryMonitor.c"
 				}
 #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_g_object_unref0 (_enqueued_it);
-#line 5816 "DirectoryMonitor.c"
+#line 5430 "DirectoryMonitor.c"
 			}
 #line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp48_ = matched;
 #line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp48_) {
-#line 5822 "DirectoryMonitor.c"
-				GeeQueue* _tmp49_ = NULL;
-				DirectoryMonitorQueryInfoQueueElement* _tmp50_ = NULL;
+#line 5436 "DirectoryMonitor.c"
+				GeeQueue* _tmp49_;
+				DirectoryMonitorQueryInfoQueueElement* _tmp50_;
 #line 1150 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp49_ = self->priv->query_info_queue;
 #line 1150 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp50_ = query_info;
 #line 1150 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp50_);
-#line 5831 "DirectoryMonitor.c"
+#line 5445 "DirectoryMonitor.c"
 			}
 		}
 #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (match);
-#line 5836 "DirectoryMonitor.c"
+#line 5450 "DirectoryMonitor.c"
 	}
 	{
 		gboolean _tmp51_ = FALSE;
@@ -5845,47 +5459,47 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 		_tmp51_ = TRUE;
 #line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		while (TRUE) {
-#line 5844 "DirectoryMonitor.c"
+#line 5458 "DirectoryMonitor.c"
 			DirectoryMonitorQueryInfoQueueElement* next = NULL;
-			GeeQueue* _tmp52_ = NULL;
-			gpointer _tmp53_ = NULL;
+			GeeQueue* _tmp52_;
+			gpointer _tmp53_;
 			gboolean _tmp54_ = FALSE;
-			DirectoryMonitorQueryInfoQueueElement* _tmp55_ = NULL;
+			DirectoryMonitorQueryInfoQueueElement* _tmp55_;
 			DirectoryMonitorQueryInfoQueueElement* n = NULL;
-			GeeQueue* _tmp58_ = NULL;
-			gpointer _tmp59_ = NULL;
-			DirectoryMonitorQueryInfoQueueElement* _tmp60_ = NULL;
-			DirectoryMonitorQueryInfoQueueElement* _tmp61_ = NULL;
-			DirectoryMonitorQueryInfoQueueElement* _tmp62_ = NULL;
-			guint _tmp63_ = 0U;
-			DirectoryMonitorQueryInfoQueueElement* _tmp64_ = NULL;
-			GFileMonitorEvent _tmp65_ = 0;
+			GeeQueue* _tmp58_;
+			gpointer _tmp59_;
+			DirectoryMonitorQueryInfoQueueElement* _tmp60_;
+			DirectoryMonitorQueryInfoQueueElement* _tmp61_;
+			DirectoryMonitorQueryInfoQueueElement* _tmp62_;
+			guint _tmp63_;
+			DirectoryMonitorQueryInfoQueueElement* _tmp64_;
+			GFileMonitorEvent _tmp65_;
 			GEnumValue* _tmp66_;
-			DirectoryMonitorQueryInfoQueueElement* _tmp67_ = NULL;
-			GFile* _tmp68_ = NULL;
-			gchar* _tmp69_ = NULL;
-			gchar* _tmp70_ = NULL;
-			gchar* _tmp71_ = NULL;
-			gchar* _tmp72_ = NULL;
-			DirectoryMonitorQueryInfoQueueElement* _tmp73_ = NULL;
-			GError* _tmp74_ = NULL;
+			DirectoryMonitorQueryInfoQueueElement* _tmp67_;
+			GFile* _tmp68_;
+			gchar* _tmp69_;
+			gchar* _tmp70_;
+			gchar* _tmp71_;
+			gchar* _tmp72_;
+			DirectoryMonitorQueryInfoQueueElement* _tmp73_;
+			GError* _tmp74_;
 			gboolean _tmp87_ = FALSE;
-			DirectoryMonitorQueryInfoQueueElement* _tmp88_ = NULL;
-			GFileInfo* _tmp89_ = NULL;
+			DirectoryMonitorQueryInfoQueueElement* _tmp88_;
+			GFileInfo* _tmp89_;
 			gboolean _tmp103_ = FALSE;
-			DirectoryMonitorQueryInfoQueueElement* _tmp104_ = NULL;
-			GFileInfo* _tmp105_ = NULL;
-			DirectoryMonitorQueryInfoQueueElement* _tmp118_ = NULL;
-			GFile* _tmp119_ = NULL;
-			DirectoryMonitorQueryInfoQueueElement* _tmp120_ = NULL;
-			GFile* _tmp121_ = NULL;
-			DirectoryMonitorQueryInfoQueueElement* _tmp122_ = NULL;
-			GFileInfo* _tmp123_ = NULL;
-			DirectoryMonitorQueryInfoQueueElement* _tmp124_ = NULL;
-			GFileMonitorEvent _tmp125_ = 0;
+			DirectoryMonitorQueryInfoQueueElement* _tmp104_;
+			GFileInfo* _tmp105_;
+			DirectoryMonitorQueryInfoQueueElement* _tmp118_;
+			GFile* _tmp119_;
+			DirectoryMonitorQueryInfoQueueElement* _tmp120_;
+			GFile* _tmp121_;
+			DirectoryMonitorQueryInfoQueueElement* _tmp122_;
+			GFileInfo* _tmp123_;
+			DirectoryMonitorQueryInfoQueueElement* _tmp124_;
+			GFileMonitorEvent _tmp125_;
 #line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (!_tmp51_) {
-#line 5884 "DirectoryMonitor.c"
+#line 5498 "DirectoryMonitor.c"
 			}
 #line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp51_ = FALSE;
@@ -5901,17 +5515,17 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 			if (_tmp55_ == NULL) {
 #line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp54_ = TRUE;
-#line 5900 "DirectoryMonitor.c"
+#line 5514 "DirectoryMonitor.c"
 			} else {
-				DirectoryMonitorQueryInfoQueueElement* _tmp56_ = NULL;
-				gboolean _tmp57_ = FALSE;
+				DirectoryMonitorQueryInfoQueueElement* _tmp56_;
+				gboolean _tmp57_;
 #line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp56_ = next;
 #line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp57_ = _tmp56_->completed;
 #line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp54_ = !_tmp57_;
-#line 5910 "DirectoryMonitor.c"
+#line 5524 "DirectoryMonitor.c"
 			}
 #line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp54_) {
@@ -5919,7 +5533,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 				_directory_monitor_query_info_queue_element_unref0 (next);
 #line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 5918 "DirectoryMonitor.c"
+#line 5532 "DirectoryMonitor.c"
 			}
 #line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp58_ = self->priv->query_info_queue;
@@ -5967,19 +5581,19 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 			_tmp74_ = _tmp73_->err;
 #line 1168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp74_ != NULL) {
-#line 5966 "DirectoryMonitor.c"
-				DirectoryMonitorQueryInfoQueueElement* _tmp75_ = NULL;
-				GFile* _tmp76_ = NULL;
-				gchar* _tmp77_ = NULL;
-				gchar* _tmp78_ = NULL;
-				DirectoryMonitorQueryInfoQueueElement* _tmp79_ = NULL;
-				GFileMonitorEvent _tmp80_ = 0;
+#line 5580 "DirectoryMonitor.c"
+				DirectoryMonitorQueryInfoQueueElement* _tmp75_;
+				GFile* _tmp76_;
+				gchar* _tmp77_;
+				gchar* _tmp78_;
+				DirectoryMonitorQueryInfoQueueElement* _tmp79_;
+				GFileMonitorEvent _tmp80_;
 				GEnumValue* _tmp81_;
-				DirectoryMonitorQueryInfoQueueElement* _tmp82_ = NULL;
-				GError* _tmp83_ = NULL;
-				const gchar* _tmp84_ = NULL;
-				gchar* _tmp85_ = NULL;
-				gchar* _tmp86_ = NULL;
+				DirectoryMonitorQueryInfoQueueElement* _tmp82_;
+				GError* _tmp83_;
+				const gchar* _tmp84_;
+				gchar* _tmp85_;
+				gchar* _tmp86_;
 #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp75_ = next;
 #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6016,7 +5630,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 				_directory_monitor_query_info_queue_element_unref0 (next);
 #line 1172 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				continue;
-#line 6015 "DirectoryMonitor.c"
+#line 5629 "DirectoryMonitor.c"
 			}
 #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp88_ = next;
@@ -6024,11 +5638,11 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 			_tmp89_ = _tmp88_->info;
 #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp89_ != NULL) {
-#line 6023 "DirectoryMonitor.c"
-				DirectoryMonitorQueryInfoQueueElement* _tmp90_ = NULL;
-				GFileInfo* _tmp91_ = NULL;
-				gchar* _tmp92_ = NULL;
-				gchar* _tmp93_ = NULL;
+#line 5637 "DirectoryMonitor.c"
+				DirectoryMonitorQueryInfoQueueElement* _tmp90_;
+				GFileInfo* _tmp91_;
+				gchar* _tmp92_;
+				gchar* _tmp93_;
 #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp90_ = next;
 #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6041,24 +5655,24 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 				_tmp87_ = _tmp93_ == NULL;
 #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_g_free0 (_tmp93_);
-#line 6040 "DirectoryMonitor.c"
+#line 5654 "DirectoryMonitor.c"
 			} else {
 #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp87_ = FALSE;
-#line 6044 "DirectoryMonitor.c"
+#line 5658 "DirectoryMonitor.c"
 			}
 #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp87_) {
-#line 6048 "DirectoryMonitor.c"
-				DirectoryMonitorQueryInfoQueueElement* _tmp94_ = NULL;
-				GFile* _tmp95_ = NULL;
-				gchar* _tmp96_ = NULL;
-				gchar* _tmp97_ = NULL;
-				DirectoryMonitorQueryInfoQueueElement* _tmp98_ = NULL;
-				GFileMonitorEvent _tmp99_ = 0;
+#line 5662 "DirectoryMonitor.c"
+				DirectoryMonitorQueryInfoQueueElement* _tmp94_;
+				GFile* _tmp95_;
+				gchar* _tmp96_;
+				gchar* _tmp97_;
+				DirectoryMonitorQueryInfoQueueElement* _tmp98_;
+				GFileMonitorEvent _tmp99_;
 				GEnumValue* _tmp100_;
-				gchar* _tmp101_ = NULL;
-				gchar* _tmp102_ = NULL;
+				gchar* _tmp101_;
+				gchar* _tmp102_;
 #line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp94_ = next;
 #line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6089,7 +5703,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 				_directory_monitor_query_info_queue_element_unref0 (next);
 #line 1180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				continue;
-#line 6088 "DirectoryMonitor.c"
+#line 5702 "DirectoryMonitor.c"
 			}
 #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp104_ = next;
@@ -6097,10 +5711,10 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 			_tmp105_ = _tmp104_->info;
 #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp105_ != NULL) {
-#line 6096 "DirectoryMonitor.c"
-				DirectoryMonitorQueryInfoQueueElement* _tmp106_ = NULL;
-				GFileInfo* _tmp107_ = NULL;
-				gboolean _tmp108_ = FALSE;
+#line 5710 "DirectoryMonitor.c"
+				DirectoryMonitorQueryInfoQueueElement* _tmp106_;
+				GFileInfo* _tmp107_;
+				gboolean _tmp108_;
 #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp106_ = next;
 #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6109,24 +5723,24 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 				_tmp108_ = directory_monitor_is_file_symlink_supported (_tmp107_);
 #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp103_ = !_tmp108_;
-#line 6108 "DirectoryMonitor.c"
+#line 5722 "DirectoryMonitor.c"
 			} else {
 #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp103_ = FALSE;
-#line 6112 "DirectoryMonitor.c"
+#line 5726 "DirectoryMonitor.c"
 			}
 #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp103_) {
-#line 6116 "DirectoryMonitor.c"
-				DirectoryMonitorQueryInfoQueueElement* _tmp109_ = NULL;
-				GFile* _tmp110_ = NULL;
-				gchar* _tmp111_ = NULL;
-				gchar* _tmp112_ = NULL;
-				DirectoryMonitorQueryInfoQueueElement* _tmp113_ = NULL;
-				GFileMonitorEvent _tmp114_ = 0;
+#line 5730 "DirectoryMonitor.c"
+				DirectoryMonitorQueryInfoQueueElement* _tmp109_;
+				GFile* _tmp110_;
+				gchar* _tmp111_;
+				gchar* _tmp112_;
+				DirectoryMonitorQueryInfoQueueElement* _tmp113_;
+				GFileMonitorEvent _tmp114_;
 				GEnumValue* _tmp115_;
-				gchar* _tmp116_ = NULL;
-				gchar* _tmp117_ = NULL;
+				gchar* _tmp116_;
+				gchar* _tmp117_;
 #line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp109_ = next;
 #line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6157,7 +5771,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 				_directory_monitor_query_info_queue_element_unref0 (next);
 #line 1188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				continue;
-#line 6156 "DirectoryMonitor.c"
+#line 5770 "DirectoryMonitor.c"
 			}
 #line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp118_ = next;
@@ -6181,7 +5795,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 			_directory_monitor_query_info_queue_element_unref0 (n);
 #line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_directory_monitor_query_info_queue_element_unref0 (next);
-#line 6180 "DirectoryMonitor.c"
+#line 5794 "DirectoryMonitor.c"
 		}
 	}
 }
@@ -6189,15 +5803,15 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 
 static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* self, GFile* file, GFile* other_file, GFileInfo* info, GFileMonitorEvent event) {
 	gchar* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFileMonitorEvent _tmp5_ = 0;
+	GFile* _tmp1_;
+	GFileMonitorEvent _tmp5_;
 	GEnumValue* _tmp6_;
-	GFile* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	GFileMonitorEvent _tmp12_ = 0;
+	GFile* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	GFileMonitorEvent _tmp12_;
 #line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (IS_DIRECTORY_MONITOR (self));
 #line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6210,9 +5824,9 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 	_tmp1_ = other_file;
 #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp1_ != NULL) {
-#line 6209 "DirectoryMonitor.c"
-		GFile* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+#line 5823 "DirectoryMonitor.c"
+		GFile* _tmp2_;
+		gchar* _tmp3_;
 #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp2_ = other_file;
 #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6221,16 +5835,16 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 		_g_free0 (_tmp0_);
 #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp0_ = _tmp3_;
-#line 6220 "DirectoryMonitor.c"
+#line 5834 "DirectoryMonitor.c"
 	} else {
-		gchar* _tmp4_ = NULL;
+		gchar* _tmp4_;
 #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp4_ = g_strdup ("(null)");
 #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_free0 (_tmp0_);
 #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp0_ = _tmp4_;
-#line 6229 "DirectoryMonitor.c"
+#line 5843 "DirectoryMonitor.c"
 	}
 #line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp5_ = event;
@@ -6258,13 +5872,13 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 	switch (_tmp12_) {
 #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_CREATED:
-#line 6257 "DirectoryMonitor.c"
+#line 5871 "DirectoryMonitor.c"
 		{
-			GFileInfo* _tmp13_ = NULL;
+			GFileInfo* _tmp13_;
 			DirectoryMonitorFType ftype = 0;
-			GFileInfo* _tmp14_ = NULL;
-			DirectoryMonitorFType _tmp15_ = 0;
-			DirectoryMonitorFType _tmp16_ = 0;
+			GFileInfo* _tmp14_;
+			DirectoryMonitorFType _tmp15_;
+			DirectoryMonitorFType _tmp16_;
 #line 1204 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp13_ = info;
 #line 1204 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6281,10 +5895,10 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			switch (_tmp16_) {
 #line 1207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6280 "DirectoryMonitor.c"
+#line 5894 "DirectoryMonitor.c"
 				{
-					GFile* _tmp17_ = NULL;
-					GFileInfo* _tmp18_ = NULL;
+					GFile* _tmp17_;
+					GFileInfo* _tmp18_;
 #line 1209 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp17_ = file;
 #line 1209 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6293,15 +5907,15 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					directory_monitor_internal_notify_file_created (self, _tmp17_, _tmp18_);
 #line 1210 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6292 "DirectoryMonitor.c"
+#line 5906 "DirectoryMonitor.c"
 				}
 #line 1207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6296 "DirectoryMonitor.c"
+#line 5910 "DirectoryMonitor.c"
 				{
-					gint _tmp19_ = 0;
-					GFile* _tmp20_ = NULL;
-					GFileInfo* _tmp21_ = NULL;
+					gint _tmp19_;
+					GFile* _tmp20_;
+					GFileInfo* _tmp21_;
 #line 1217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp19_ = self->priv->outstanding_exploration_dirs;
 #line 1217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6314,37 +5928,37 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					directory_monitor_explore_async (self, _tmp20_, _tmp21_, FALSE, NULL, NULL);
 #line 1219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6313 "DirectoryMonitor.c"
+#line 5927 "DirectoryMonitor.c"
 				}
 				default:
 				{
-					DirectoryMonitorFType _tmp22_ = 0;
+					DirectoryMonitorFType _tmp22_;
 #line 1222 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp22_ = ftype;
 #line 1222 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_vala_assert (_tmp22_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
 #line 1223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6324 "DirectoryMonitor.c"
+#line 5938 "DirectoryMonitor.c"
 				}
 			}
 #line 1225 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 6329 "DirectoryMonitor.c"
+#line 5943 "DirectoryMonitor.c"
 		}
 #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_CHANGED:
-#line 6333 "DirectoryMonitor.c"
+#line 5947 "DirectoryMonitor.c"
 		{
-			GFileInfo* _tmp23_ = NULL;
+			GFileInfo* _tmp23_;
 			GFileInfo* local_info = NULL;
-			GFile* _tmp24_ = NULL;
-			GFileInfo* _tmp25_ = NULL;
-			GFileInfo* _tmp26_ = NULL;
+			GFile* _tmp24_;
+			GFileInfo* _tmp25_;
+			GFileInfo* _tmp26_;
 			DirectoryMonitorFType ftype = 0;
-			GFileInfo* _tmp32_ = NULL;
-			DirectoryMonitorFType _tmp33_ = 0;
-			DirectoryMonitorFType _tmp34_ = 0;
+			GFileInfo* _tmp32_;
+			DirectoryMonitorFType _tmp33_;
+			DirectoryMonitorFType _tmp34_;
 #line 1229 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp23_ = info;
 #line 1229 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6359,12 +5973,12 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			_tmp26_ = local_info;
 #line 1232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp26_ == NULL) {
-#line 6358 "DirectoryMonitor.c"
-				GFile* _tmp27_ = NULL;
-				gchar* _tmp28_ = NULL;
-				gchar* _tmp29_ = NULL;
-				gchar* _tmp30_ = NULL;
-				gchar* _tmp31_ = NULL;
+#line 5972 "DirectoryMonitor.c"
+				GFile* _tmp27_;
+				gchar* _tmp28_;
+				gchar* _tmp29_;
+				gchar* _tmp30_;
+				gchar* _tmp31_;
 #line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp27_ = file;
 #line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6385,7 +5999,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 				_g_object_unref0 (local_info);
 #line 1235 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 6384 "DirectoryMonitor.c"
+#line 5998 "DirectoryMonitor.c"
 			}
 #line 1238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp32_ = local_info;
@@ -6399,57 +6013,57 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			switch (_tmp34_) {
 #line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6398 "DirectoryMonitor.c"
+#line 6012 "DirectoryMonitor.c"
 				{
-					GFile* _tmp35_ = NULL;
+					GFile* _tmp35_;
 #line 1241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp35_ = file;
 #line 1241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					directory_monitor_notify_file_altered (self, _tmp35_);
 #line 1242 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6407 "DirectoryMonitor.c"
+#line 6021 "DirectoryMonitor.c"
 				}
 #line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6411 "DirectoryMonitor.c"
+#line 6025 "DirectoryMonitor.c"
 				{
-					GFile* _tmp36_ = NULL;
+					GFile* _tmp36_;
 #line 1245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp36_ = file;
 #line 1245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					directory_monitor_notify_directory_altered (self, _tmp36_);
 #line 1246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6420 "DirectoryMonitor.c"
+#line 6034 "DirectoryMonitor.c"
 				}
 				default:
 				{
-					DirectoryMonitorFType _tmp37_ = 0;
+					DirectoryMonitorFType _tmp37_;
 #line 1249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp37_ = ftype;
 #line 1249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_vala_assert (_tmp37_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
 #line 1250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6431 "DirectoryMonitor.c"
+#line 6045 "DirectoryMonitor.c"
 				}
 			}
 #line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (local_info);
 #line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 6438 "DirectoryMonitor.c"
+#line 6052 "DirectoryMonitor.c"
 		}
 #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-#line 6442 "DirectoryMonitor.c"
+#line 6056 "DirectoryMonitor.c"
 		{
-			GFileInfo* _tmp38_ = NULL;
+			GFileInfo* _tmp38_;
 			DirectoryMonitorFType ftype = 0;
-			GFileInfo* _tmp39_ = NULL;
-			DirectoryMonitorFType _tmp40_ = 0;
-			DirectoryMonitorFType _tmp41_ = 0;
+			GFileInfo* _tmp39_;
+			DirectoryMonitorFType _tmp40_;
+			DirectoryMonitorFType _tmp41_;
 #line 1255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp38_ = info;
 #line 1255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6466,10 +6080,10 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			switch (_tmp41_) {
 #line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6465 "DirectoryMonitor.c"
+#line 6079 "DirectoryMonitor.c"
 				{
-					GFile* _tmp42_ = NULL;
-					GFileInfo* _tmp43_ = NULL;
+					GFile* _tmp42_;
+					GFileInfo* _tmp43_;
 #line 1260 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp42_ = file;
 #line 1260 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6478,14 +6092,14 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					directory_monitor_internal_notify_file_alteration_completed (self, _tmp42_, _tmp43_);
 #line 1261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6477 "DirectoryMonitor.c"
+#line 6091 "DirectoryMonitor.c"
 				}
 #line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6481 "DirectoryMonitor.c"
+#line 6095 "DirectoryMonitor.c"
 				{
-					GFile* _tmp44_ = NULL;
-					GFileInfo* _tmp45_ = NULL;
+					GFile* _tmp44_;
+					GFileInfo* _tmp45_;
 #line 1264 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp44_ = file;
 #line 1264 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6494,34 +6108,34 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					directory_monitor_internal_notify_directory_alteration_completed (self, _tmp44_, _tmp45_);
 #line 1265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6493 "DirectoryMonitor.c"
+#line 6107 "DirectoryMonitor.c"
 				}
 				default:
 				{
-					DirectoryMonitorFType _tmp46_ = 0;
+					DirectoryMonitorFType _tmp46_;
 #line 1268 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp46_ = ftype;
 #line 1268 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_vala_assert (_tmp46_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
 #line 1269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6504 "DirectoryMonitor.c"
+#line 6118 "DirectoryMonitor.c"
 				}
 			}
 #line 1271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 6509 "DirectoryMonitor.c"
+#line 6123 "DirectoryMonitor.c"
 		}
 #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_MOVED:
-#line 6513 "DirectoryMonitor.c"
+#line 6127 "DirectoryMonitor.c"
 		{
-			GFileInfo* _tmp47_ = NULL;
-			GFile* _tmp48_ = NULL;
+			GFileInfo* _tmp47_;
+			GFile* _tmp48_;
 			DirectoryMonitorFType ftype = 0;
-			GFileInfo* _tmp49_ = NULL;
-			DirectoryMonitorFType _tmp50_ = 0;
-			DirectoryMonitorFType _tmp51_ = 0;
+			GFileInfo* _tmp49_;
+			DirectoryMonitorFType _tmp50_;
+			DirectoryMonitorFType _tmp51_;
 #line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp47_ = info;
 #line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6542,11 +6156,11 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			switch (_tmp51_) {
 #line 1280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6541 "DirectoryMonitor.c"
+#line 6155 "DirectoryMonitor.c"
 				{
-					GFile* _tmp52_ = NULL;
-					GFile* _tmp53_ = NULL;
-					GFileInfo* _tmp54_ = NULL;
+					GFile* _tmp52_;
+					GFile* _tmp53_;
+					GFileInfo* _tmp54_;
 #line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp52_ = file;
 #line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6557,21 +6171,21 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					directory_monitor_internal_notify_file_moved (self, _tmp52_, _tmp53_, _tmp54_);
 #line 1283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6556 "DirectoryMonitor.c"
+#line 6170 "DirectoryMonitor.c"
 				}
 #line 1280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6560 "DirectoryMonitor.c"
+#line 6174 "DirectoryMonitor.c"
 				{
 					GFileInfo* old_dir_info = NULL;
-					DirectoryMonitorFileInfoMap* _tmp55_ = NULL;
-					GFile* _tmp56_ = NULL;
-					GFileInfo* _tmp57_ = NULL;
-					GFileInfo* _tmp58_ = NULL;
-					GFile* _tmp62_ = NULL;
-					GFileInfo* _tmp63_ = NULL;
-					GFile* _tmp64_ = NULL;
-					GFileInfo* _tmp65_ = NULL;
+					DirectoryMonitorFileInfoMap* _tmp55_;
+					GFile* _tmp56_;
+					GFileInfo* _tmp57_;
+					GFileInfo* _tmp58_;
+					GFile* _tmp62_;
+					GFileInfo* _tmp63_;
+					GFile* _tmp64_;
+					GFileInfo* _tmp65_;
 #line 1287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp55_ = self->priv->files;
 #line 1287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6584,10 +6198,10 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					_tmp58_ = old_dir_info;
 #line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					if (_tmp58_ == NULL) {
-#line 6583 "DirectoryMonitor.c"
-						GFile* _tmp59_ = NULL;
-						gchar* _tmp60_ = NULL;
-						gchar* _tmp61_ = NULL;
+#line 6197 "DirectoryMonitor.c"
+						GFile* _tmp59_;
+						gchar* _tmp60_;
+						gchar* _tmp61_;
 #line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						_tmp59_ = file;
 #line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6602,7 +6216,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 						_g_object_unref0 (old_dir_info);
 #line 1291 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						break;
-#line 6601 "DirectoryMonitor.c"
+#line 6215 "DirectoryMonitor.c"
 					}
 #line 1294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp62_ = file;
@@ -6618,37 +6232,37 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					_g_object_unref0 (old_dir_info);
 #line 1295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6617 "DirectoryMonitor.c"
+#line 6231 "DirectoryMonitor.c"
 				}
 				default:
 				{
-					DirectoryMonitorFType _tmp66_ = 0;
+					DirectoryMonitorFType _tmp66_;
 #line 1298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp66_ = ftype;
 #line 1298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_vala_assert (_tmp66_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
 #line 1299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6628 "DirectoryMonitor.c"
+#line 6242 "DirectoryMonitor.c"
 				}
 			}
 #line 1301 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 6633 "DirectoryMonitor.c"
+#line 6247 "DirectoryMonitor.c"
 		}
 #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_DELETED:
-#line 6637 "DirectoryMonitor.c"
+#line 6251 "DirectoryMonitor.c"
 		{
-			GFileInfo* _tmp67_ = NULL;
+			GFileInfo* _tmp67_;
 			GFileInfo* local_info = NULL;
-			GFile* _tmp68_ = NULL;
-			GFileInfo* _tmp69_ = NULL;
-			GFileInfo* _tmp70_ = NULL;
+			GFile* _tmp68_;
+			GFileInfo* _tmp69_;
+			GFileInfo* _tmp70_;
 			DirectoryMonitorFType ftype = 0;
-			GFileInfo* _tmp74_ = NULL;
-			DirectoryMonitorFType _tmp75_ = 0;
-			DirectoryMonitorFType _tmp76_ = 0;
+			GFileInfo* _tmp74_;
+			DirectoryMonitorFType _tmp75_;
+			DirectoryMonitorFType _tmp76_;
 #line 1304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp67_ = info;
 #line 1304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6663,10 +6277,10 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			_tmp70_ = local_info;
 #line 1307 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp70_ == NULL) {
-#line 6662 "DirectoryMonitor.c"
-				GFile* _tmp71_ = NULL;
-				gchar* _tmp72_ = NULL;
-				gchar* _tmp73_ = NULL;
+#line 6276 "DirectoryMonitor.c"
+				GFile* _tmp71_;
+				gchar* _tmp72_;
+				gchar* _tmp73_;
 #line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp71_ = file;
 #line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6681,7 +6295,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 				_g_object_unref0 (local_info);
 #line 1310 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 6680 "DirectoryMonitor.c"
+#line 6294 "DirectoryMonitor.c"
 			}
 #line 1313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp74_ = local_info;
@@ -6695,61 +6309,61 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			switch (_tmp76_) {
 #line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6694 "DirectoryMonitor.c"
+#line 6308 "DirectoryMonitor.c"
 				{
-					GFile* _tmp77_ = NULL;
+					GFile* _tmp77_;
 #line 1316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp77_ = file;
 #line 1316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					directory_monitor_internal_notify_file_deleted (self, _tmp77_);
 #line 1317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6703 "DirectoryMonitor.c"
+#line 6317 "DirectoryMonitor.c"
 				}
 #line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6707 "DirectoryMonitor.c"
+#line 6321 "DirectoryMonitor.c"
 				{
-					GFile* _tmp78_ = NULL;
+					GFile* _tmp78_;
 #line 1320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp78_ = file;
 #line 1320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					directory_monitor_internal_notify_directory_deleted (self, _tmp78_);
 #line 1321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6716 "DirectoryMonitor.c"
+#line 6330 "DirectoryMonitor.c"
 				}
 				default:
 				{
-					DirectoryMonitorFType _tmp79_ = 0;
+					DirectoryMonitorFType _tmp79_;
 #line 1324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp79_ = ftype;
 #line 1324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_vala_assert (_tmp79_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
 #line 1325 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6727 "DirectoryMonitor.c"
+#line 6341 "DirectoryMonitor.c"
 				}
 			}
 #line 1327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (local_info);
 #line 1327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 6734 "DirectoryMonitor.c"
+#line 6348 "DirectoryMonitor.c"
 		}
 #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
-#line 6738 "DirectoryMonitor.c"
+#line 6352 "DirectoryMonitor.c"
 		{
-			GFileInfo* _tmp80_ = NULL;
+			GFileInfo* _tmp80_;
 			GFileInfo* local_info = NULL;
-			GFile* _tmp81_ = NULL;
-			GFileInfo* _tmp82_ = NULL;
-			GFileInfo* _tmp83_ = NULL;
+			GFile* _tmp81_;
+			GFileInfo* _tmp82_;
+			GFileInfo* _tmp83_;
 			DirectoryMonitorFType ftype = 0;
-			GFileInfo* _tmp87_ = NULL;
-			DirectoryMonitorFType _tmp88_ = 0;
-			DirectoryMonitorFType _tmp89_ = 0;
+			GFileInfo* _tmp87_;
+			DirectoryMonitorFType _tmp88_;
+			DirectoryMonitorFType _tmp89_;
 #line 1331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp80_ = info;
 #line 1331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6764,10 +6378,10 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			_tmp83_ = local_info;
 #line 1334 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp83_ == NULL) {
-#line 6763 "DirectoryMonitor.c"
-				GFile* _tmp84_ = NULL;
-				gchar* _tmp85_ = NULL;
-				gchar* _tmp86_ = NULL;
+#line 6377 "DirectoryMonitor.c"
+				GFile* _tmp84_;
+				gchar* _tmp85_;
+				gchar* _tmp86_;
 #line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp84_ = file;
 #line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6783,7 +6397,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 				_g_object_unref0 (local_info);
 #line 1337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 6781 "DirectoryMonitor.c"
+#line 6395 "DirectoryMonitor.c"
 			}
 #line 1340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp87_ = local_info;
@@ -6797,61 +6411,61 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			switch (_tmp89_) {
 #line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6795 "DirectoryMonitor.c"
+#line 6409 "DirectoryMonitor.c"
 				{
-					GFile* _tmp90_ = NULL;
+					GFile* _tmp90_;
 #line 1343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp90_ = file;
 #line 1343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					directory_monitor_notify_file_attributes_altered (self, _tmp90_);
 #line 1344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6804 "DirectoryMonitor.c"
+#line 6418 "DirectoryMonitor.c"
 				}
 #line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6808 "DirectoryMonitor.c"
+#line 6422 "DirectoryMonitor.c"
 				{
-					GFile* _tmp91_ = NULL;
+					GFile* _tmp91_;
 #line 1347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp91_ = file;
 #line 1347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					directory_monitor_notify_directory_attributes_altered (self, _tmp91_);
 #line 1348 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6817 "DirectoryMonitor.c"
+#line 6431 "DirectoryMonitor.c"
 				}
 				default:
 				{
-					DirectoryMonitorFType _tmp92_ = 0;
+					DirectoryMonitorFType _tmp92_;
 #line 1351 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp92_ = ftype;
 #line 1351 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_vala_assert (_tmp92_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
 #line 1352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6828 "DirectoryMonitor.c"
+#line 6442 "DirectoryMonitor.c"
 				}
 			}
 #line 1354 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (local_info);
 #line 1354 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 6835 "DirectoryMonitor.c"
+#line 6449 "DirectoryMonitor.c"
 		}
 #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
 #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_UNMOUNTED:
-#line 6841 "DirectoryMonitor.c"
+#line 6455 "DirectoryMonitor.c"
 		{
 #line 1359 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 6845 "DirectoryMonitor.c"
+#line 6459 "DirectoryMonitor.c"
 		}
 		default:
 		{
-			GFileMonitorEvent _tmp93_ = 0;
+			GFileMonitorEvent _tmp93_;
 			GEnumValue* _tmp94_;
 #line 1362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp93_ = event;
@@ -6861,24 +6475,24 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			g_warning ("DirectoryMonitor.vala:1362: Unknown directory monitor event %s", (_tmp94_ != NULL) ? _tmp94_->value_name : NULL);
 #line 1363 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 6859 "DirectoryMonitor.c"
+#line 6473 "DirectoryMonitor.c"
 		}
 	}
 #line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_free0 (_tmp0_);
-#line 6864 "DirectoryMonitor.c"
+#line 6478 "DirectoryMonitor.c"
 }
 
 
-static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, GFile* file, GFileInfo* info, GFile** old_file, GFileInfo** old_file_info) {
+static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, GFile* file, GFileInfo* info, GFile* * old_file, GFileInfo* * old_file_info) {
 	GFile* _vala_old_file = NULL;
 	GFileInfo* _vala_old_file_info = NULL;
 	gboolean result = FALSE;
 	GFile* match = NULL;
-	DirectoryMonitorFileInfoMap* _tmp0_ = NULL;
-	GFileInfo* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	DirectoryMonitorFileInfoMap* _tmp0_;
+	GFileInfo* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
 #line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE);
 #line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6897,15 +6511,15 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G
 	_tmp3_ = match;
 #line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp3_ != NULL) {
-#line 6895 "DirectoryMonitor.c"
-		GFile* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		DirectoryMonitorFileInfoMap* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
-		GFileInfo* _tmp8_ = NULL;
-		DirectoryMonitorFileInfoMap* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
-		GFileInfo* _tmp11_ = NULL;
+#line 6509 "DirectoryMonitor.c"
+		GFile* _tmp4_;
+		GFile* _tmp5_;
+		DirectoryMonitorFileInfoMap* _tmp6_;
+		GFile* _tmp7_;
+		GFileInfo* _tmp8_;
+		DirectoryMonitorFileInfoMap* _tmp9_;
+		GFile* _tmp10_;
+		GFileInfo* _tmp11_;
 #line 1374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp4_ = match;
 #line 1374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6940,25 +6554,25 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G
 		if (old_file) {
 #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			*old_file = _vala_old_file;
-#line 6938 "DirectoryMonitor.c"
+#line 6552 "DirectoryMonitor.c"
 		} else {
 #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (_vala_old_file);
-#line 6942 "DirectoryMonitor.c"
+#line 6556 "DirectoryMonitor.c"
 		}
 #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (old_file_info) {
 #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			*old_file_info = _vala_old_file_info;
-#line 6948 "DirectoryMonitor.c"
+#line 6562 "DirectoryMonitor.c"
 		} else {
 #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (_vala_old_file_info);
-#line 6952 "DirectoryMonitor.c"
+#line 6566 "DirectoryMonitor.c"
 		}
 #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 6956 "DirectoryMonitor.c"
+#line 6570 "DirectoryMonitor.c"
 	}
 #line 1382 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (_vala_old_file);
@@ -6976,36 +6590,36 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G
 	if (old_file) {
 #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		*old_file = _vala_old_file;
-#line 6974 "DirectoryMonitor.c"
+#line 6588 "DirectoryMonitor.c"
 	} else {
 #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_vala_old_file);
-#line 6978 "DirectoryMonitor.c"
+#line 6592 "DirectoryMonitor.c"
 	}
 #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (old_file_info) {
 #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		*old_file_info = _vala_old_file_info;
-#line 6984 "DirectoryMonitor.c"
+#line 6598 "DirectoryMonitor.c"
 	} else {
 #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_vala_old_file_info);
-#line 6988 "DirectoryMonitor.c"
+#line 6602 "DirectoryMonitor.c"
 	}
 #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 6992 "DirectoryMonitor.c"
+#line 6606 "DirectoryMonitor.c"
 }
 
 
 static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMonitor* self) {
 	gboolean result = FALSE;
 	gulong expiration = 0UL;
-	gulong _tmp0_ = 0UL;
+	gulong _tmp0_;
 	gboolean any_deleted = FALSE;
 	gboolean any_expired = FALSE;
-	gboolean _tmp13_ = FALSE;
-	gboolean _tmp14_ = FALSE;
+	gboolean _tmp13_;
+	gboolean _tmp14_;
 #line 1388 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE);
 #line 1389 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7016,11 +6630,11 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
 	any_deleted = FALSE;
 #line 1392 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	any_expired = FALSE;
-#line 7014 "DirectoryMonitor.c"
+#line 6628 "DirectoryMonitor.c"
 	{
 		GeeIterator* _element_it = NULL;
-		GeeQueue* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeQueue* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp1_ = self->priv->query_info_queue;
 #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7029,18 +6643,18 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
 		_element_it = _tmp2_;
 #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		while (TRUE) {
-#line 7027 "DirectoryMonitor.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 6641 "DirectoryMonitor.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			DirectoryMonitorQueryInfoQueueElement* element = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
-			DirectoryMonitorQueryInfoQueueElement* _tmp7_ = NULL;
-			GFileMonitorEvent _tmp8_ = 0;
-			DirectoryMonitorQueryInfoQueueElement* _tmp9_ = NULL;
-			gulong _tmp10_ = 0UL;
-			gulong _tmp11_ = 0UL;
-			DirectoryMonitorQueryInfoQueueElement* _tmp12_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
+			DirectoryMonitorQueryInfoQueueElement* _tmp7_;
+			GFileMonitorEvent _tmp8_;
+			DirectoryMonitorQueryInfoQueueElement* _tmp9_;
+			gulong _tmp10_;
+			gulong _tmp11_;
+			DirectoryMonitorQueryInfoQueueElement* _tmp12_;
 #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp3_ = _element_it;
 #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7049,7 +6663,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
 			if (!_tmp4_) {
 #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 7047 "DirectoryMonitor.c"
+#line 6661 "DirectoryMonitor.c"
 			}
 #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp5_ = _element_it;
@@ -7067,7 +6681,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
 				_directory_monitor_query_info_queue_element_unref0 (element);
 #line 1395 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				continue;
-#line 7065 "DirectoryMonitor.c"
+#line 6679 "DirectoryMonitor.c"
 			}
 #line 1397 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			any_deleted = TRUE;
@@ -7083,7 +6697,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
 				_directory_monitor_query_info_queue_element_unref0 (element);
 #line 1400 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				continue;
-#line 7081 "DirectoryMonitor.c"
+#line 6695 "DirectoryMonitor.c"
 			}
 #line 1403 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp12_ = element;
@@ -7093,11 +6707,11 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
 			any_expired = TRUE;
 #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_directory_monitor_query_info_queue_element_unref0 (element);
-#line 7091 "DirectoryMonitor.c"
+#line 6705 "DirectoryMonitor.c"
 		}
 #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_element_it);
-#line 7095 "DirectoryMonitor.c"
+#line 6709 "DirectoryMonitor.c"
 	}
 #line 1407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp13_ = any_expired;
@@ -7105,7 +6719,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
 	if (_tmp13_) {
 #line 1408 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_process_query_queue (self, NULL);
-#line 7103 "DirectoryMonitor.c"
+#line 6717 "DirectoryMonitor.c"
 	}
 #line 1410 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp14_ = any_deleted;
@@ -7113,21 +6727,21 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
 	if (!_tmp14_) {
 #line 1411 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		self->priv->delete_timer_id = (guint) 0;
-#line 7111 "DirectoryMonitor.c"
+#line 6725 "DirectoryMonitor.c"
 	}
 #line 1413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	result = any_deleted;
 #line 1413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 7117 "DirectoryMonitor.c"
+#line 6731 "DirectoryMonitor.c"
 }
 
 
 GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, GFile* file) {
 	GFileInfo* result = NULL;
-	DirectoryMonitorFileInfoMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFileInfo* _tmp2_ = NULL;
+	DirectoryMonitorFileInfoMap* _tmp0_;
+	GFile* _tmp1_;
+	GFileInfo* _tmp2_;
 #line 1417 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL);
 #line 1417 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7142,14 +6756,14 @@ GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, GFile* file)
 	result = _tmp2_;
 #line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 7140 "DirectoryMonitor.c"
+#line 6754 "DirectoryMonitor.c"
 }
 
 
 GeeCollection* directory_monitor_get_files (DirectoryMonitor* self) {
 	GeeCollection* result = NULL;
-	DirectoryMonitorFileInfoMap* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	DirectoryMonitorFileInfoMap* _tmp0_;
+	GeeCollection* _tmp1_;
 #line 1423 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL);
 #line 1424 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7160,16 +6774,16 @@ GeeCollection* directory_monitor_get_files (DirectoryMonitor* self) {
 	result = _tmp1_;
 #line 1424 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 7158 "DirectoryMonitor.c"
+#line 6772 "DirectoryMonitor.c"
 }
 
 
 GFileInfo* directory_monitor_query_file_info (DirectoryMonitor* self, GFile* file) {
 	GFileInfo* result = NULL;
-	DirectoryMonitorFileInfoMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GCancellable* _tmp2_ = NULL;
-	GFileInfo* _tmp3_ = NULL;
+	DirectoryMonitorFileInfoMap* _tmp0_;
+	GFile* _tmp1_;
+	GCancellable* _tmp2_;
+	GFileInfo* _tmp3_;
 #line 1430 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL);
 #line 1430 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7186,18 +6800,18 @@ GFileInfo* directory_monitor_query_file_info (DirectoryMonitor* self, GFile* fil
 	result = _tmp3_;
 #line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 7184 "DirectoryMonitor.c"
+#line 6798 "DirectoryMonitor.c"
 }
 
 
 gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info) {
 	gboolean result = FALSE;
-	GFileInfo* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GFileInfo* _tmp0_;
+	gboolean _tmp1_;
 	DirectoryMonitorFType ftype = 0;
-	GFileInfo* _tmp2_ = NULL;
-	DirectoryMonitorFType _tmp3_ = 0;
-	DirectoryMonitorFType _tmp4_ = 0;
+	GFileInfo* _tmp2_;
+	DirectoryMonitorFType _tmp3_;
+	DirectoryMonitorFType _tmp4_;
 #line 1441 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE);
 #line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7210,7 +6824,7 @@ gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info) {
 		result = TRUE;
 #line 1443 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 7208 "DirectoryMonitor.c"
+#line 6822 "DirectoryMonitor.c"
 	}
 #line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp2_ = info;
@@ -7224,27 +6838,27 @@ gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info) {
 	switch (_tmp4_) {
 #line 1446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 7222 "DirectoryMonitor.c"
+#line 6836 "DirectoryMonitor.c"
 		{
 #line 1448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			result = DIRECTORY_MONITOR_SUPPORT_DIR_SYMLINKS;
 #line 1448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return result;
-#line 7228 "DirectoryMonitor.c"
+#line 6842 "DirectoryMonitor.c"
 		}
 #line 1446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 7232 "DirectoryMonitor.c"
+#line 6846 "DirectoryMonitor.c"
 		{
 #line 1451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			result = DIRECTORY_MONITOR_SUPPORT_FILE_SYMLINKS;
 #line 1451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return result;
-#line 7238 "DirectoryMonitor.c"
+#line 6852 "DirectoryMonitor.c"
 		}
 		default:
 		{
-			DirectoryMonitorFType _tmp5_ = 0;
+			DirectoryMonitorFType _tmp5_;
 #line 1454 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp5_ = ftype;
 #line 1454 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7253,7 +6867,7 @@ gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info) {
 			result = FALSE;
 #line 1456 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return result;
-#line 7251 "DirectoryMonitor.c"
+#line 6865 "DirectoryMonitor.c"
 		}
 	}
 }
@@ -7266,7 +6880,7 @@ static void directory_monitor_real_root_moved (DirectoryMonitor* self, GFile* ol
 	g_return_if_fail (G_IS_FILE (new_root));
 #line 386 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (new_root_info));
-#line 7264 "DirectoryMonitor.c"
+#line 6878 "DirectoryMonitor.c"
 }
 
 
@@ -7285,26 +6899,26 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closu
 		data1 = closure->data;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7283 "DirectoryMonitor.c"
+#line 6897 "DirectoryMonitor.c"
 	} else {
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		data2 = closure->data;
-#line 7289 "DirectoryMonitor.c"
+#line 6903 "DirectoryMonitor.c"
 	}
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_object (param_values + 3), data2);
-#line 7295 "DirectoryMonitor.c"
+#line 6909 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_root_deleted (DirectoryMonitor* self, GFile* root) {
 #line 394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (root));
-#line 7302 "DirectoryMonitor.c"
+#line 6916 "DirectoryMonitor.c"
 }
 
 
@@ -7317,7 +6931,7 @@ static void directory_monitor_real_file_discovered (DirectoryMonitor* self, GFil
 	g_return_if_fail (G_IS_FILE (file));
 #line 400 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7315 "DirectoryMonitor.c"
+#line 6929 "DirectoryMonitor.c"
 }
 
 
@@ -7336,19 +6950,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 		data1 = closure->data;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7334 "DirectoryMonitor.c"
+#line 6948 "DirectoryMonitor.c"
 	} else {
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		data2 = closure->data;
-#line 7340 "DirectoryMonitor.c"
+#line 6954 "DirectoryMonitor.c"
 	}
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 7346 "DirectoryMonitor.c"
+#line 6960 "DirectoryMonitor.c"
 }
 
 
@@ -7357,14 +6971,14 @@ static void directory_monitor_real_directory_discovered (DirectoryMonitor* self,
 	g_return_if_fail (G_IS_FILE (file));
 #line 403 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7355 "DirectoryMonitor.c"
+#line 6969 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_discovery_failed (DirectoryMonitor* self, const gchar* reason) {
 #line 408 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (reason != NULL);
-#line 7362 "DirectoryMonitor.c"
+#line 6976 "DirectoryMonitor.c"
 }
 
 
@@ -7373,7 +6987,7 @@ static void directory_monitor_real_discovery_completed (DirectoryMonitor* self)
 	self->priv->has_discovery_started = FALSE;
 #line 413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_mdbg ("discovery completed");
-#line 7371 "DirectoryMonitor.c"
+#line 6985 "DirectoryMonitor.c"
 }
 
 
@@ -7382,7 +6996,7 @@ static void directory_monitor_real_file_created (DirectoryMonitor* self, GFile*
 	g_return_if_fail (G_IS_FILE (file));
 #line 416 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7380 "DirectoryMonitor.c"
+#line 6994 "DirectoryMonitor.c"
 }
 
 
@@ -7393,14 +7007,14 @@ static void directory_monitor_real_file_moved (DirectoryMonitor* self, GFile* ol
 	g_return_if_fail (G_IS_FILE (new_file));
 #line 419 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (new_file_info));
-#line 7391 "DirectoryMonitor.c"
+#line 7005 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_file_altered (DirectoryMonitor* self, GFile* file) {
 #line 423 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 7398 "DirectoryMonitor.c"
+#line 7012 "DirectoryMonitor.c"
 }
 
 
@@ -7409,21 +7023,21 @@ static void directory_monitor_real_file_alteration_completed (DirectoryMonitor*
 	g_return_if_fail (G_IS_FILE (file));
 #line 428 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7407 "DirectoryMonitor.c"
+#line 7021 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_file_attributes_altered (DirectoryMonitor* self, GFile* file) {
 #line 431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 7414 "DirectoryMonitor.c"
+#line 7028 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_file_deleted (DirectoryMonitor* self, GFile* file) {
 #line 434 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 7421 "DirectoryMonitor.c"
+#line 7035 "DirectoryMonitor.c"
 }
 
 
@@ -7432,7 +7046,7 @@ static void directory_monitor_real_directory_created (DirectoryMonitor* self, GF
 	g_return_if_fail (G_IS_FILE (dir));
 #line 438 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7430 "DirectoryMonitor.c"
+#line 7044 "DirectoryMonitor.c"
 }
 
 
@@ -7443,14 +7057,14 @@ static void directory_monitor_real_directory_moved (DirectoryMonitor* self, GFil
 	g_return_if_fail (G_IS_FILE (new_dir));
 #line 442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (new_dir_info));
-#line 7441 "DirectoryMonitor.c"
+#line 7055 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_directory_altered (DirectoryMonitor* self, GFile* dir) {
 #line 446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (dir));
-#line 7448 "DirectoryMonitor.c"
+#line 7062 "DirectoryMonitor.c"
 }
 
 
@@ -7459,21 +7073,21 @@ static void directory_monitor_real_directory_alteration_completed (DirectoryMoni
 	g_return_if_fail (G_IS_FILE (dir));
 #line 451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7457 "DirectoryMonitor.c"
+#line 7071 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_directory_attributes_altered (DirectoryMonitor* self, GFile* dir) {
 #line 454 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (dir));
-#line 7464 "DirectoryMonitor.c"
+#line 7078 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_directory_deleted (DirectoryMonitor* self, GFile* dir) {
 #line 458 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (dir));
-#line 7471 "DirectoryMonitor.c"
+#line 7085 "DirectoryMonitor.c"
 }
 
 
@@ -7483,15 +7097,15 @@ static void directory_monitor_real_closed (DirectoryMonitor* self) {
 
 static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue_element_construct (GType object_type, DirectoryMonitor* owner, GFile* file, GFile* other_file, GFileMonitorEvent event) {
 	DirectoryMonitorQueryInfoQueueElement* self = NULL;
-	DirectoryMonitor* _tmp0_ = NULL;
-	DirectoryMonitor* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFileMonitorEvent _tmp6_ = 0;
-	guint _tmp7_ = 0U;
-	gulong _tmp8_ = 0UL;
+	DirectoryMonitor* _tmp0_;
+	DirectoryMonitor* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
+	GFileMonitorEvent _tmp6_;
+	guint _tmp7_;
+	gulong _tmp8_;
 #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (IS_DIRECTORY_MONITOR (owner), NULL);
 #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7540,29 +7154,29 @@ static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue
 	self->time_created_msec = _tmp8_;
 #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return self;
-#line 7538 "DirectoryMonitor.c"
+#line 7152 "DirectoryMonitor.c"
 }
 
 
 static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue_element_new (DirectoryMonitor* owner, GFile* file, GFile* other_file, GFileMonitorEvent event) {
 #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return directory_monitor_query_info_queue_element_construct (DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT, owner, file, other_file, event);
-#line 7545 "DirectoryMonitor.c"
+#line 7159 "DirectoryMonitor.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
 #line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 7552 "DirectoryMonitor.c"
+#line 7166 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_query_info_queue_element_on_completed (DirectoryMonitorQueryInfoQueueElement* self, GObject* source, GAsyncResult* aresult) {
 	GFile* source_file = NULL;
-	GObject* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	DirectoryMonitor* _tmp16_ = NULL;
+	GObject* _tmp0_;
+	GFile* _tmp1_;
+	DirectoryMonitor* _tmp16_;
 	GError * _inner_error_ = NULL;
 #line 106 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (DIRECTORY_MONITOR_IS_QUERY_INFO_QUEUE_ELEMENT (self));
@@ -7576,16 +7190,16 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_file_get_type (), GFile));
 #line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	source_file = _tmp1_;
-#line 7574 "DirectoryMonitor.c"
+#line 7188 "DirectoryMonitor.c"
 	{
 		GFileInfo* _tmp2_ = NULL;
-		GAsyncResult* _tmp3_ = NULL;
-		GFileInfo* _tmp4_ = NULL;
-		GFileInfo* _tmp5_ = NULL;
-		GFileInfo* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
+		GAsyncResult* _tmp3_;
+		GFileInfo* _tmp4_;
+		GFileInfo* _tmp5_;
+		GFileInfo* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		gboolean _tmp9_;
 #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp3_ = aresult;
 #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7594,8 +7208,8 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 		_tmp2_ = _tmp4_;
 #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7592 "DirectoryMonitor.c"
-			goto __catch483_g_error;
+#line 7206 "DirectoryMonitor.c"
+			goto __catch484_g_error;
 		}
 #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp5_ = _tmp2_;
@@ -7617,11 +7231,11 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 		_g_free0 (_tmp8_);
 #line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (_tmp9_) {
-#line 7615 "DirectoryMonitor.c"
-			GFileInfo* _tmp10_ = NULL;
-			GFile* _tmp11_ = NULL;
-			gchar* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
+#line 7229 "DirectoryMonitor.c"
+			GFileInfo* _tmp10_;
+			GFile* _tmp11_;
+			gchar* _tmp12_;
+			gchar* _tmp13_;
 #line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp10_ = self->info;
 #line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7634,18 +7248,18 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 			g_file_info_set_attribute_string (_tmp10_, G_FILE_ATTRIBUTE_ID_FILE, _tmp13_);
 #line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_free0 (_tmp13_);
-#line 7632 "DirectoryMonitor.c"
+#line 7246 "DirectoryMonitor.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_tmp2_);
-#line 7636 "DirectoryMonitor.c"
+#line 7250 "DirectoryMonitor.c"
 	}
-	goto __finally483;
-	__catch483_g_error:
+	goto __finally484;
+	__catch484_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp14_ = NULL;
-		GError* _tmp15_ = NULL;
+		GError* _tmp14_;
+		GError* _tmp15_;
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		err = _inner_error_;
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7660,9 +7274,9 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 		self->err = _tmp15_;
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_error_free0 (err);
-#line 7658 "DirectoryMonitor.c"
+#line 7272 "DirectoryMonitor.c"
 	}
-	__finally483:
+	__finally484:
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7673,7 +7287,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 		g_clear_error (&_inner_error_);
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return;
-#line 7671 "DirectoryMonitor.c"
+#line 7285 "DirectoryMonitor.c"
 	}
 #line 121 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->completed = TRUE;
@@ -7683,14 +7297,14 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 	directory_monitor_process_query_queue (_tmp16_, self);
 #line 106 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (source_file);
-#line 7681 "DirectoryMonitor.c"
+#line 7295 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_value_query_info_queue_element_init (GValue* value) {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	value->data[0].v_pointer = NULL;
-#line 7688 "DirectoryMonitor.c"
+#line 7302 "DirectoryMonitor.c"
 }
 
 
@@ -7699,7 +7313,7 @@ static void directory_monitor_value_query_info_queue_element_free_value (GValue*
 	if (value->data[0].v_pointer) {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_query_info_queue_element_unref (value->data[0].v_pointer);
-#line 7697 "DirectoryMonitor.c"
+#line 7311 "DirectoryMonitor.c"
 	}
 }
 
@@ -7709,11 +7323,11 @@ static void directory_monitor_value_query_info_queue_element_copy_value (const G
 	if (src_value->data[0].v_pointer) {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		dest_value->data[0].v_pointer = directory_monitor_query_info_queue_element_ref (src_value->data[0].v_pointer);
-#line 7707 "DirectoryMonitor.c"
+#line 7321 "DirectoryMonitor.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 7711 "DirectoryMonitor.c"
+#line 7325 "DirectoryMonitor.c"
 	}
 }
 
@@ -7721,66 +7335,66 @@ static void directory_monitor_value_query_info_queue_element_copy_value (const G
 static gpointer directory_monitor_value_query_info_queue_element_peek_pointer (const GValue* value) {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return value->data[0].v_pointer;
-#line 7719 "DirectoryMonitor.c"
+#line 7333 "DirectoryMonitor.c"
 }
 
 
 static gchar* directory_monitor_value_query_info_queue_element_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (collect_values[0].v_pointer) {
-#line 7726 "DirectoryMonitor.c"
-		DirectoryMonitorQueryInfoQueueElement* object;
+#line 7340 "DirectoryMonitor.c"
+		DirectoryMonitorQueryInfoQueueElement * object;
 		object = collect_values[0].v_pointer;
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7733 "DirectoryMonitor.c"
+#line 7347 "DirectoryMonitor.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7737 "DirectoryMonitor.c"
+#line 7351 "DirectoryMonitor.c"
 		}
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = directory_monitor_query_info_queue_element_ref (object);
-#line 7741 "DirectoryMonitor.c"
+#line 7355 "DirectoryMonitor.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 7745 "DirectoryMonitor.c"
+#line 7359 "DirectoryMonitor.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return NULL;
-#line 7749 "DirectoryMonitor.c"
+#line 7363 "DirectoryMonitor.c"
 }
 
 
 static gchar* directory_monitor_value_query_info_queue_element_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	DirectoryMonitorQueryInfoQueueElement** object_p;
+	DirectoryMonitorQueryInfoQueueElement ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (!object_p) {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 7760 "DirectoryMonitor.c"
+#line 7374 "DirectoryMonitor.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (!value->data[0].v_pointer) {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		*object_p = NULL;
-#line 7766 "DirectoryMonitor.c"
+#line 7380 "DirectoryMonitor.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		*object_p = value->data[0].v_pointer;
-#line 7770 "DirectoryMonitor.c"
+#line 7384 "DirectoryMonitor.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		*object_p = directory_monitor_query_info_queue_element_ref (value->data[0].v_pointer);
-#line 7774 "DirectoryMonitor.c"
+#line 7388 "DirectoryMonitor.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return NULL;
-#line 7778 "DirectoryMonitor.c"
+#line 7392 "DirectoryMonitor.c"
 }
 
 
@@ -7794,7 +7408,7 @@ static GParamSpec* directory_monitor_param_spec_query_info_queue_element (const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return G_PARAM_SPEC (spec);
-#line 7792 "DirectoryMonitor.c"
+#line 7406 "DirectoryMonitor.c"
 }
 
 
@@ -7803,12 +7417,12 @@ static gpointer directory_monitor_value_get_query_info_queue_element (const GVal
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT), NULL);
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return value->data[0].v_pointer;
-#line 7801 "DirectoryMonitor.c"
+#line 7415 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_value_set_query_info_queue_element (GValue* value, gpointer v_object) {
-	DirectoryMonitorQueryInfoQueueElement* old;
+	DirectoryMonitorQueryInfoQueueElement * old;
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT));
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7823,23 +7437,23 @@ static void directory_monitor_value_set_query_info_queue_element (GValue* value,
 		value->data[0].v_pointer = v_object;
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_query_info_queue_element_ref (value->data[0].v_pointer);
-#line 7821 "DirectoryMonitor.c"
+#line 7435 "DirectoryMonitor.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 7825 "DirectoryMonitor.c"
+#line 7439 "DirectoryMonitor.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (old) {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_query_info_queue_element_unref (old);
-#line 7831 "DirectoryMonitor.c"
+#line 7445 "DirectoryMonitor.c"
 	}
 }
 
 
 static void directory_monitor_value_take_query_info_queue_element (GValue* value, gpointer v_object) {
-	DirectoryMonitorQueryInfoQueueElement* old;
+	DirectoryMonitorQueryInfoQueueElement * old;
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT));
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7852,17 +7466,17 @@ static void directory_monitor_value_take_query_info_queue_element (GValue* value
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = v_object;
-#line 7850 "DirectoryMonitor.c"
+#line 7464 "DirectoryMonitor.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 7854 "DirectoryMonitor.c"
+#line 7468 "DirectoryMonitor.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (old) {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_query_info_queue_element_unref (old);
-#line 7860 "DirectoryMonitor.c"
+#line 7474 "DirectoryMonitor.c"
 	}
 }
 
@@ -7872,7 +7486,7 @@ static void directory_monitor_query_info_queue_element_class_init (DirectoryMoni
 	directory_monitor_query_info_queue_element_parent_class = g_type_class_peek_parent (klass);
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	((DirectoryMonitorQueryInfoQueueElementClass *) klass)->finalize = directory_monitor_query_info_queue_element_finalize;
-#line 7870 "DirectoryMonitor.c"
+#line 7484 "DirectoryMonitor.c"
 }
 
 
@@ -7885,11 +7499,11 @@ static void directory_monitor_query_info_queue_element_instance_init (DirectoryM
 	self->completed = FALSE;
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->ref_count = 1;
-#line 7883 "DirectoryMonitor.c"
+#line 7497 "DirectoryMonitor.c"
 }
 
 
-static void directory_monitor_query_info_queue_element_finalize (DirectoryMonitorQueryInfoQueueElement* obj) {
+static void directory_monitor_query_info_queue_element_finalize (DirectoryMonitorQueryInfoQueueElement * obj) {
 	DirectoryMonitorQueryInfoQueueElement * self;
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT, DirectoryMonitorQueryInfoQueueElement);
@@ -7905,7 +7519,7 @@ static void directory_monitor_query_info_queue_element_finalize (DirectoryMonito
 	_g_object_unref0 (self->info);
 #line 93 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_error_free0 (self->err);
-#line 7903 "DirectoryMonitor.c"
+#line 7517 "DirectoryMonitor.c"
 }
 
 
@@ -7924,18 +7538,18 @@ static GType directory_monitor_query_info_queue_element_get_type (void) {
 
 
 static gpointer directory_monitor_query_info_queue_element_ref (gpointer instance) {
-	DirectoryMonitorQueryInfoQueueElement* self;
+	DirectoryMonitorQueryInfoQueueElement * self;
 	self = instance;
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return instance;
-#line 7928 "DirectoryMonitor.c"
+#line 7542 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_query_info_queue_element_unref (gpointer instance) {
-	DirectoryMonitorQueryInfoQueueElement* self;
+	DirectoryMonitorQueryInfoQueueElement * self;
 	self = instance;
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -7943,7 +7557,7 @@ static void directory_monitor_query_info_queue_element_unref (gpointer instance)
 		DIRECTORY_MONITOR_QUERY_INFO_QUEUE_ELEMENT_GET_CLASS (self)->finalize (self);
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 7941 "DirectoryMonitor.c"
+#line 7555 "DirectoryMonitor.c"
 	}
 }
 
@@ -7954,38 +7568,38 @@ static DirectoryMonitorFileInfoMap* directory_monitor_file_info_map_construct (G
 	self = (DirectoryMonitorFileInfoMap*) g_type_create_instance (object_type);
 #line 138 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return self;
-#line 7952 "DirectoryMonitor.c"
+#line 7566 "DirectoryMonitor.c"
 }
 
 
 static DirectoryMonitorFileInfoMap* directory_monitor_file_info_map_new (void) {
 #line 138 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return directory_monitor_file_info_map_construct (DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP);
-#line 7959 "DirectoryMonitor.c"
+#line 7573 "DirectoryMonitor.c"
 }
 
 
-static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info, GFile** normalized, gchar** id) {
+static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info, GFile* * normalized, gchar* * id) {
 	GFile* _vala_normalized = NULL;
 	gchar* _vala_id = NULL;
 	gboolean result = FALSE;
 	GFileInfo* local_info = NULL;
-	GFileInfo* _tmp0_ = NULL;
-	GFileInfo* _tmp1_ = NULL;
-	GFileInfo* _tmp2_ = NULL;
+	GFileInfo* _tmp0_;
+	GFileInfo* _tmp1_;
+	GFileInfo* _tmp2_;
 	gchar* file_id = NULL;
-	GFileInfo* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
+	GFileInfo* _tmp7_;
+	gchar* _tmp8_;
+	const gchar* _tmp9_;
 	GFile* known_file = NULL;
-	GeeHashMap* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gpointer _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
+	GeeHashMap* _tmp10_;
+	const gchar* _tmp11_;
+	gpointer _tmp12_;
+	const gchar* _tmp13_;
+	gchar* _tmp14_;
 	GFile* _tmp15_ = NULL;
-	GFile* _tmp16_ = NULL;
-	GFile* _tmp19_ = NULL;
+	GFile* _tmp16_;
+	GFile* _tmp19_;
 #line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE);
 #line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8002,11 +7616,11 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor
 	_tmp2_ = local_info;
 #line 145 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp2_ == NULL) {
-#line 8000 "DirectoryMonitor.c"
-		GeeHashMap* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		gpointer _tmp5_ = NULL;
-		GFileInfo* _tmp6_ = NULL;
+#line 7614 "DirectoryMonitor.c"
+		GeeHashMap* _tmp3_;
+		GFile* _tmp4_;
+		gpointer _tmp5_;
+		GFileInfo* _tmp6_;
 #line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp3_ = self->priv->map;
 #line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8037,25 +7651,25 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor
 			if (normalized) {
 #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				*normalized = _vala_normalized;
-#line 8035 "DirectoryMonitor.c"
+#line 7649 "DirectoryMonitor.c"
 			} else {
 #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_g_object_unref0 (_vala_normalized);
-#line 8039 "DirectoryMonitor.c"
+#line 7653 "DirectoryMonitor.c"
 			}
 #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (id) {
 #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				*id = _vala_id;
-#line 8045 "DirectoryMonitor.c"
+#line 7659 "DirectoryMonitor.c"
 			} else {
 #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_g_free0 (_vala_id);
-#line 8049 "DirectoryMonitor.c"
+#line 7663 "DirectoryMonitor.c"
 			}
 #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return result;
-#line 8053 "DirectoryMonitor.c"
+#line 7667 "DirectoryMonitor.c"
 		}
 	}
 #line 155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8086,25 +7700,25 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor
 		if (normalized) {
 #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			*normalized = _vala_normalized;
-#line 8084 "DirectoryMonitor.c"
+#line 7698 "DirectoryMonitor.c"
 		} else {
 #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (_vala_normalized);
-#line 8088 "DirectoryMonitor.c"
+#line 7702 "DirectoryMonitor.c"
 		}
 #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (id) {
 #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			*id = _vala_id;
-#line 8094 "DirectoryMonitor.c"
+#line 7708 "DirectoryMonitor.c"
 		} else {
 #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_free0 (_vala_id);
-#line 8098 "DirectoryMonitor.c"
+#line 7712 "DirectoryMonitor.c"
 		}
 #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8102 "DirectoryMonitor.c"
+#line 7716 "DirectoryMonitor.c"
 	}
 #line 163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp10_ = self->priv->id_map;
@@ -8126,20 +7740,20 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor
 	_tmp16_ = known_file;
 #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp16_ != NULL) {
-#line 8124 "DirectoryMonitor.c"
-		GFile* _tmp17_ = NULL;
+#line 7738 "DirectoryMonitor.c"
+		GFile* _tmp17_;
 #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp17_ = known_file;
 #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp15_ = _tmp17_;
-#line 8130 "DirectoryMonitor.c"
+#line 7744 "DirectoryMonitor.c"
 	} else {
-		GFile* _tmp18_ = NULL;
+		GFile* _tmp18_;
 #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp18_ = file;
 #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp15_ = _tmp18_;
-#line 8137 "DirectoryMonitor.c"
+#line 7751 "DirectoryMonitor.c"
 	}
 #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp19_ = _g_object_ref0 (_tmp15_);
@@ -8159,51 +7773,51 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor
 	if (normalized) {
 #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		*normalized = _vala_normalized;
-#line 8157 "DirectoryMonitor.c"
+#line 7771 "DirectoryMonitor.c"
 	} else {
 #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_vala_normalized);
-#line 8161 "DirectoryMonitor.c"
+#line 7775 "DirectoryMonitor.c"
 	}
 #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (id) {
 #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		*id = _vala_id;
-#line 8167 "DirectoryMonitor.c"
+#line 7781 "DirectoryMonitor.c"
 	} else {
 #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_free0 (_vala_id);
-#line 8171 "DirectoryMonitor.c"
+#line 7785 "DirectoryMonitor.c"
 	}
 #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 8175 "DirectoryMonitor.c"
+#line 7789 "DirectoryMonitor.c"
 }
 
 
 static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info) {
 	gboolean result = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 	gchar* existing_id = NULL;
-	GFileInfo* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	GFileInfo* _tmp7_;
+	gchar* _tmp8_;
 	gboolean _tmp9_ = FALSE;
-	const gchar* _tmp10_ = NULL;
+	const gchar* _tmp10_;
 	gchar* id = NULL;
 	GFile* normalized = NULL;
-	GFile* _tmp18_ = NULL;
-	GFileInfo* _tmp19_ = NULL;
+	GFile* _tmp18_;
+	GFileInfo* _tmp19_;
 	GFile* _tmp20_ = NULL;
 	gchar* _tmp21_ = NULL;
-	gboolean _tmp22_ = FALSE;
-	GeeHashMap* _tmp23_ = NULL;
-	GFile* _tmp24_ = NULL;
-	GFileInfo* _tmp25_ = NULL;
-	GeeHashMap* _tmp26_ = NULL;
-	const gchar* _tmp27_ = NULL;
-	GFile* _tmp28_ = NULL;
+	gboolean _tmp22_;
+	GeeHashMap* _tmp23_;
+	GFile* _tmp24_;
+	GFileInfo* _tmp25_;
+	GeeHashMap* _tmp26_;
+	const gchar* _tmp27_;
+	GFile* _tmp28_;
 #line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE);
 #line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8218,12 +7832,12 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
 #line 173 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp2_) {
-#line 8216 "DirectoryMonitor.c"
+#line 7830 "DirectoryMonitor.c"
 		gboolean removed = FALSE;
-		GeeHashMap* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		gboolean _tmp6_ = FALSE;
+		GeeHashMap* _tmp3_;
+		GFile* _tmp4_;
+		gboolean _tmp5_;
+		gboolean _tmp6_;
 #line 174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp3_ = self->priv->map;
 #line 174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8236,7 +7850,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo
 		_tmp6_ = removed;
 #line 175 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_vala_assert (_tmp6_, "removed");
-#line 8234 "DirectoryMonitor.c"
+#line 7848 "DirectoryMonitor.c"
 	}
 #line 179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp7_ = info;
@@ -8248,10 +7862,10 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo
 	_tmp10_ = existing_id;
 #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp10_ != NULL) {
-#line 8246 "DirectoryMonitor.c"
-		GeeHashMap* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-		gboolean _tmp13_ = FALSE;
+#line 7860 "DirectoryMonitor.c"
+		GeeHashMap* _tmp11_;
+		const gchar* _tmp12_;
+		gboolean _tmp13_;
 #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp11_ = self->priv->id_map;
 #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8260,20 +7874,20 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo
 		_tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_);
 #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp9_ = _tmp13_;
-#line 8258 "DirectoryMonitor.c"
+#line 7872 "DirectoryMonitor.c"
 	} else {
 #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp9_ = FALSE;
-#line 8262 "DirectoryMonitor.c"
+#line 7876 "DirectoryMonitor.c"
 	}
 #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp9_) {
-#line 8266 "DirectoryMonitor.c"
+#line 7880 "DirectoryMonitor.c"
 		gboolean removed = FALSE;
-		GeeHashMap* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-		gboolean _tmp16_ = FALSE;
-		gboolean _tmp17_ = FALSE;
+		GeeHashMap* _tmp14_;
+		const gchar* _tmp15_;
+		gboolean _tmp16_;
+		gboolean _tmp17_;
 #line 181 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp14_ = self->priv->id_map;
 #line 181 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8286,7 +7900,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo
 		_tmp17_ = removed;
 #line 182 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_vala_assert (_tmp17_, "removed");
-#line 8284 "DirectoryMonitor.c"
+#line 7898 "DirectoryMonitor.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp18_ = file;
@@ -8314,7 +7928,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo
 		_g_free0 (existing_id);
 #line 188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8312 "DirectoryMonitor.c"
+#line 7926 "DirectoryMonitor.c"
 	}
 #line 190 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp23_ = self->priv->map;
@@ -8342,7 +7956,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo
 	_g_free0 (existing_id);
 #line 193 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 8340 "DirectoryMonitor.c"
+#line 7954 "DirectoryMonitor.c"
 }
 
 
@@ -8350,15 +7964,15 @@ static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfo
 	gboolean result = FALSE;
 	gchar* id = NULL;
 	GFile* normalized = NULL;
-	GFile* _tmp0_ = NULL;
-	GFileInfo* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFileInfo* _tmp1_;
 	GFile* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	GeeHashMap* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	GeeHashMap* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
+	gboolean _tmp4_;
+	GeeHashMap* _tmp5_;
+	GFile* _tmp6_;
+	GeeHashMap* _tmp7_;
+	const gchar* _tmp8_;
 #line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE);
 #line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8389,7 +8003,7 @@ static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfo
 		_g_free0 (id);
 #line 200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8387 "DirectoryMonitor.c"
+#line 8001 "DirectoryMonitor.c"
 	}
 #line 202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp5_ = self->priv->map;
@@ -8411,7 +8025,7 @@ static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfo
 	_g_free0 (id);
 #line 205 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 8409 "DirectoryMonitor.c"
+#line 8023 "DirectoryMonitor.c"
 }
 
 
@@ -8420,11 +8034,11 @@ static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfo
 	g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self));
 #line 210 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (files));
-#line 8418 "DirectoryMonitor.c"
+#line 8032 "DirectoryMonitor.c"
 	{
 		GeeIterator* _file_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp0_ = files;
 #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8433,13 +8047,13 @@ static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfo
 		_file_it = _tmp1_;
 #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		while (TRUE) {
-#line 8431 "DirectoryMonitor.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 8045 "DirectoryMonitor.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			GFile* file = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			GFile* _tmp6_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			GFile* _tmp6_;
 #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp2_ = _file_it;
 #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8448,7 +8062,7 @@ static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfo
 			if (!_tmp3_) {
 #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 8446 "DirectoryMonitor.c"
+#line 8060 "DirectoryMonitor.c"
 			}
 #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp4_ = _file_it;
@@ -8462,11 +8076,11 @@ static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfo
 			directory_monitor_file_info_map_remove (self, _tmp6_, NULL);
 #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (file);
-#line 8460 "DirectoryMonitor.c"
+#line 8074 "DirectoryMonitor.c"
 		}
 #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_file_it);
-#line 8464 "DirectoryMonitor.c"
+#line 8078 "DirectoryMonitor.c"
 	}
 }
 
@@ -8475,14 +8089,14 @@ static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileIn
 	gboolean result = FALSE;
 	gchar* id = NULL;
 	GFile* normalized = NULL;
-	GFile* _tmp0_ = NULL;
-	GFileInfo* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFileInfo* _tmp1_;
 	GFile* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	GeeHashMap* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
+	gboolean _tmp4_;
+	GeeHashMap* _tmp5_;
+	const gchar* _tmp6_;
+	gboolean _tmp7_;
 #line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE);
 #line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8513,7 +8127,7 @@ static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileIn
 		_g_free0 (id);
 #line 219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8511 "DirectoryMonitor.c"
+#line 8125 "DirectoryMonitor.c"
 	}
 #line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp5_ = self->priv->id_map;
@@ -8529,19 +8143,19 @@ static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileIn
 	_g_free0 (id);
 #line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 8527 "DirectoryMonitor.c"
+#line 8141 "DirectoryMonitor.c"
 }
 
 
 static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info) {
 	gchar* result = NULL;
-	GFileInfo* _tmp0_ = NULL;
+	GFileInfo* _tmp0_;
 	gchar* id = NULL;
 	GFile* normalized = NULL;
-	GFile* _tmp3_ = NULL;
+	GFile* _tmp3_;
 	GFile* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	gboolean _tmp6_;
 #line 224 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL);
 #line 224 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8552,9 +8166,9 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa
 	_tmp0_ = info;
 #line 226 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp0_ != NULL) {
-#line 8550 "DirectoryMonitor.c"
-		GFileInfo* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
+#line 8164 "DirectoryMonitor.c"
+		GFileInfo* _tmp1_;
+		gchar* _tmp2_;
 #line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp1_ = info;
 #line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8563,7 +8177,7 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa
 		result = _tmp2_;
 #line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8561 "DirectoryMonitor.c"
+#line 8175 "DirectoryMonitor.c"
 	}
 #line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp3_ = file;
@@ -8587,7 +8201,7 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa
 		_g_free0 (id);
 #line 232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8585 "DirectoryMonitor.c"
+#line 8199 "DirectoryMonitor.c"
 	}
 #line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	result = id;
@@ -8595,15 +8209,15 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa
 	_g_object_unref0 (normalized);
 #line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 8593 "DirectoryMonitor.c"
+#line 8207 "DirectoryMonitor.c"
 }
 
 
 static GeeCollection* directory_monitor_file_info_map_get_all (DirectoryMonitorFileInfoMap* self) {
 	GeeCollection* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GeeSet* _tmp1_ = NULL;
-	GeeSet* _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeSet* _tmp1_;
+	GeeSet* _tmp2_;
 #line 237 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL);
 #line 238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8616,26 +8230,26 @@ static GeeCollection* directory_monitor_file_info_map_get_all (DirectoryMonitorF
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 8614 "DirectoryMonitor.c"
+#line 8228 "DirectoryMonitor.c"
 }
 
 
 static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFileInfoMap* self, GFile* file) {
 	GFileInfo* result = NULL;
 	GFileInfo* info = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	GFileInfo* _tmp3_ = NULL;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gpointer _tmp2_;
+	GFileInfo* _tmp3_;
 	gchar* id = NULL;
 	GFile* normalized = NULL;
-	GFile* _tmp4_ = NULL;
+	GFile* _tmp4_;
 	GFile* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	GeeHashMap* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	gpointer _tmp10_ = NULL;
+	gboolean _tmp7_;
+	GeeHashMap* _tmp8_;
+	GFile* _tmp9_;
+	gpointer _tmp10_;
 #line 241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL);
 #line 241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8656,7 +8270,7 @@ static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFile
 		result = info;
 #line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8654 "DirectoryMonitor.c"
+#line 8268 "DirectoryMonitor.c"
 	}
 #line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp4_ = file;
@@ -8682,7 +8296,7 @@ static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFile
 		_g_object_unref0 (info);
 #line 250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8680 "DirectoryMonitor.c"
+#line 8294 "DirectoryMonitor.c"
 	}
 #line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp8_ = self->priv->map;
@@ -8700,31 +8314,31 @@ static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFile
 	_g_object_unref0 (info);
 #line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 8698 "DirectoryMonitor.c"
+#line 8312 "DirectoryMonitor.c"
 }
 
 
 static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFileInfoMap* self, GFile* file, GCancellable* cancellable) {
 	GFileInfo* result = NULL;
 	GFileInfo* info = NULL;
-	GFile* _tmp0_ = NULL;
-	GFileInfo* _tmp1_ = NULL;
-	GFileInfo* _tmp2_ = NULL;
-	GFileInfo* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
+	GFile* _tmp0_;
+	GFileInfo* _tmp1_;
+	GFileInfo* _tmp2_;
+	GFileInfo* _tmp13_;
+	gboolean _tmp14_;
 	gchar* id = NULL;
-	GFileInfo* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
+	GFileInfo* _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
+	const gchar* _tmp18_;
 	GFile* normalized = NULL;
-	GeeHashMap* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	gpointer _tmp25_ = NULL;
-	GFile* _tmp26_ = NULL;
-	GeeHashMap* _tmp27_ = NULL;
-	GFile* _tmp28_ = NULL;
-	gpointer _tmp29_ = NULL;
+	GeeHashMap* _tmp23_;
+	const gchar* _tmp24_;
+	gpointer _tmp25_;
+	GFile* _tmp26_;
+	GeeHashMap* _tmp27_;
+	GFile* _tmp28_;
+	gpointer _tmp29_;
 	GError * _inner_error_ = NULL;
 #line 255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL);
@@ -8746,14 +8360,14 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		result = info;
 #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8744 "DirectoryMonitor.c"
+#line 8358 "DirectoryMonitor.c"
 	}
 	{
 		GFileInfo* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		GCancellable* _tmp5_ = NULL;
-		GFileInfo* _tmp6_ = NULL;
-		GFileInfo* _tmp7_ = NULL;
+		GFile* _tmp4_;
+		GCancellable* _tmp5_;
+		GFileInfo* _tmp6_;
+		GFileInfo* _tmp7_;
 #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp4_ = file;
 #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8764,8 +8378,8 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		_tmp3_ = _tmp6_;
 #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8762 "DirectoryMonitor.c"
-			goto __catch484_g_error;
+#line 8376 "DirectoryMonitor.c"
+			goto __catch485_g_error;
 		}
 #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp7_ = _tmp3_;
@@ -8777,17 +8391,17 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		info = _tmp7_;
 #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_tmp3_);
-#line 8775 "DirectoryMonitor.c"
+#line 8389 "DirectoryMonitor.c"
 	}
-	goto __finally484;
-	__catch484_g_error:
+	goto __finally485;
+	__catch485_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		GError* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
+		GFile* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+		GError* _tmp11_;
+		const gchar* _tmp12_;
 #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		err = _inner_error_;
 #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8814,9 +8428,9 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		_g_object_unref0 (info);
 #line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8812 "DirectoryMonitor.c"
+#line 8426 "DirectoryMonitor.c"
 	}
-	__finally484:
+	__finally485:
 #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8827,7 +8441,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		g_clear_error (&_inner_error_);
 #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return NULL;
-#line 8825 "DirectoryMonitor.c"
+#line 8439 "DirectoryMonitor.c"
 	}
 #line 270 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp13_ = info;
@@ -8841,7 +8455,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		_g_object_unref0 (info);
 #line 271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8839 "DirectoryMonitor.c"
+#line 8453 "DirectoryMonitor.c"
 	}
 #line 273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp15_ = info;
@@ -8855,11 +8469,11 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 	_tmp18_ = id;
 #line 274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp18_ == NULL) {
-#line 8853 "DirectoryMonitor.c"
-		GFileInfo* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
+#line 8467 "DirectoryMonitor.c"
+		GFileInfo* _tmp19_;
+		GFile* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
 #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp19_ = info;
 #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8872,7 +8486,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		g_file_info_set_attribute_string (_tmp19_, G_FILE_ATTRIBUTE_ID_FILE, _tmp22_);
 #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_free0 (_tmp22_);
-#line 8870 "DirectoryMonitor.c"
+#line 8484 "DirectoryMonitor.c"
 	}
 #line 279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp23_ = self->priv->id_map;
@@ -8896,7 +8510,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		_g_object_unref0 (info);
 #line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8894 "DirectoryMonitor.c"
+#line 8508 "DirectoryMonitor.c"
 	}
 #line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp27_ = self->priv->map;
@@ -8914,21 +8528,21 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 	_g_object_unref0 (info);
 #line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 8912 "DirectoryMonitor.c"
+#line 8526 "DirectoryMonitor.c"
 }
 
 
 static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileInfoMap* self, GFileInfo* match) {
 	GFile* result = NULL;
 	gchar* match_id = NULL;
-	GFileInfo* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	GFileInfo* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
 	gint64 match_size = 0LL;
-	GFileInfo* _tmp3_ = NULL;
-	gint64 _tmp4_ = 0LL;
+	GFileInfo* _tmp3_;
+	gint64 _tmp4_;
 	GTimeVal match_time = {0};
-	GFileInfo* _tmp5_ = NULL;
+	GFileInfo* _tmp5_;
 	GTimeVal _tmp6_ = {0};
 #line 286 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL);
@@ -8950,7 +8564,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 		_g_free0 (match_id);
 #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8948 "DirectoryMonitor.c"
+#line 8562 "DirectoryMonitor.c"
 	}
 #line 292 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp3_ = match;
@@ -8964,15 +8578,15 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 	g_file_info_get_modification_time (_tmp5_, &_tmp6_);
 #line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	match_time = _tmp6_;
-#line 8962 "DirectoryMonitor.c"
+#line 8576 "DirectoryMonitor.c"
 	{
 		GeeIterator* _file_it = NULL;
-		GeeHashMap* _tmp7_ = NULL;
-		GeeSet* _tmp8_ = NULL;
-		GeeSet* _tmp9_ = NULL;
-		GeeSet* _tmp10_ = NULL;
-		GeeIterator* _tmp11_ = NULL;
-		GeeIterator* _tmp12_ = NULL;
+		GeeHashMap* _tmp7_;
+		GeeSet* _tmp8_;
+		GeeSet* _tmp9_;
+		GeeSet* _tmp10_;
+		GeeIterator* _tmp11_;
+		GeeIterator* _tmp12_;
 #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp7_ = self->priv->map;
 #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8991,31 +8605,31 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 		_file_it = _tmp12_;
 #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		while (TRUE) {
-#line 8989 "DirectoryMonitor.c"
-			GeeIterator* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
+#line 8603 "DirectoryMonitor.c"
+			GeeIterator* _tmp13_;
+			gboolean _tmp14_;
 			GFile* file = NULL;
-			GeeIterator* _tmp15_ = NULL;
-			gpointer _tmp16_ = NULL;
+			GeeIterator* _tmp15_;
+			gpointer _tmp16_;
 			GFileInfo* info = NULL;
-			GeeHashMap* _tmp17_ = NULL;
-			GFile* _tmp18_ = NULL;
-			gpointer _tmp19_ = NULL;
-			GFileInfo* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
-			gchar* _tmp22_ = NULL;
-			const gchar* _tmp23_ = NULL;
-			gboolean _tmp24_ = FALSE;
-			gint64 _tmp25_ = 0LL;
-			GFileInfo* _tmp26_ = NULL;
-			gint64 _tmp27_ = 0LL;
+			GeeHashMap* _tmp17_;
+			GFile* _tmp18_;
+			gpointer _tmp19_;
+			GFileInfo* _tmp20_;
+			gchar* _tmp21_;
+			gchar* _tmp22_;
+			const gchar* _tmp23_;
+			gboolean _tmp24_;
+			gint64 _tmp25_;
+			GFileInfo* _tmp26_;
+			gint64 _tmp27_;
 			GTimeVal time = {0};
-			GFileInfo* _tmp28_ = NULL;
+			GFileInfo* _tmp28_;
 			GTimeVal _tmp29_ = {0};
-			GTimeVal _tmp30_ = {0};
-			glong _tmp31_ = 0L;
-			GTimeVal _tmp32_ = {0};
-			glong _tmp33_ = 0L;
+			GTimeVal _tmp30_;
+			glong _tmp31_;
+			GTimeVal _tmp32_;
+			glong _tmp33_;
 #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp13_ = _file_it;
 #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9024,7 +8638,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 			if (!_tmp14_) {
 #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 9022 "DirectoryMonitor.c"
+#line 8636 "DirectoryMonitor.c"
 			}
 #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp15_ = _file_it;
@@ -9064,7 +8678,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 				_g_free0 (match_id);
 #line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				return result;
-#line 9062 "DirectoryMonitor.c"
+#line 8676 "DirectoryMonitor.c"
 			}
 #line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp25_ = match_size;
@@ -9080,7 +8694,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 				_g_object_unref0 (file);
 #line 304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				continue;
-#line 9078 "DirectoryMonitor.c"
+#line 8692 "DirectoryMonitor.c"
 			}
 #line 306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp28_ = info;
@@ -9104,7 +8718,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 				_g_object_unref0 (file);
 #line 309 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				continue;
-#line 9102 "DirectoryMonitor.c"
+#line 8716 "DirectoryMonitor.c"
 			}
 #line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			result = file;
@@ -9116,11 +8730,11 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 			_g_free0 (match_id);
 #line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return result;
-#line 9114 "DirectoryMonitor.c"
+#line 8728 "DirectoryMonitor.c"
 		}
 #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_file_it);
-#line 9118 "DirectoryMonitor.c"
+#line 8732 "DirectoryMonitor.c"
 	}
 #line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	result = NULL;
@@ -9128,13 +8742,13 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 	_g_free0 (match_id);
 #line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 9126 "DirectoryMonitor.c"
+#line 8740 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitorFileInfoMap* self, GFile* root, DirectoryMonitorFileInfoMap* descendents) {
 	GeeArrayList* pruned = NULL;
-	GeeArrayList* _tmp28_ = NULL;
+	GeeArrayList* _tmp28_;
 #line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self));
 #line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9143,15 +8757,15 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 	g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (descendents));
 #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	pruned = NULL;
-#line 9141 "DirectoryMonitor.c"
+#line 8755 "DirectoryMonitor.c"
 	{
 		GeeIterator* _file_it = NULL;
-		GeeHashMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeHashMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp0_ = self->priv->map;
 #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9170,15 +8784,15 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 		_file_it = _tmp5_;
 #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		while (TRUE) {
-#line 9168 "DirectoryMonitor.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 8782 "DirectoryMonitor.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			GFile* file = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			GFile* parent = NULL;
-			GFile* _tmp10_ = NULL;
-			GFile* _tmp11_ = NULL;
+			GFile* _tmp10_;
+			GFile* _tmp11_;
 #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp6_ = _file_it;
 #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9187,7 +8801,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 			if (!_tmp7_) {
 #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 9185 "DirectoryMonitor.c"
+#line 8799 "DirectoryMonitor.c"
 			}
 #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp8_ = _file_it;
@@ -9203,20 +8817,20 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 			parent = _tmp11_;
 #line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			while (TRUE) {
-#line 9201 "DirectoryMonitor.c"
-				GFile* _tmp12_ = NULL;
-				GFile* _tmp13_ = NULL;
-				GFile* _tmp14_ = NULL;
-				gboolean _tmp15_ = FALSE;
-				GFile* _tmp26_ = NULL;
-				GFile* _tmp27_ = NULL;
+#line 8815 "DirectoryMonitor.c"
+				GFile* _tmp12_;
+				GFile* _tmp13_;
+				GFile* _tmp14_;
+				gboolean _tmp15_;
+				GFile* _tmp26_;
+				GFile* _tmp27_;
 #line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp12_ = parent;
 #line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				if (!(_tmp12_ != NULL)) {
 #line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 9214 "DirectoryMonitor.c"
+#line 8828 "DirectoryMonitor.c"
 				}
 #line 322 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp13_ = parent;
@@ -9226,29 +8840,29 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 				_tmp15_ = g_file_equal (_tmp13_, _tmp14_);
 #line 322 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				if (_tmp15_) {
-#line 9224 "DirectoryMonitor.c"
-					GeeArrayList* _tmp16_ = NULL;
-					GeeArrayList* _tmp18_ = NULL;
-					GFile* _tmp19_ = NULL;
-					DirectoryMonitorFileInfoMap* _tmp20_ = NULL;
-					GFile* _tmp21_ = NULL;
-					GeeHashMap* _tmp22_ = NULL;
-					GFile* _tmp23_ = NULL;
-					gpointer _tmp24_ = NULL;
-					GFileInfo* _tmp25_ = NULL;
+#line 8838 "DirectoryMonitor.c"
+					GeeArrayList* _tmp16_;
+					GeeArrayList* _tmp18_;
+					GFile* _tmp19_;
+					DirectoryMonitorFileInfoMap* _tmp20_;
+					GFile* _tmp21_;
+					GeeHashMap* _tmp22_;
+					GFile* _tmp23_;
+					gpointer _tmp24_;
+					GFileInfo* _tmp25_;
 #line 323 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp16_ = pruned;
 #line 323 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					if (_tmp16_ == NULL) {
-#line 9238 "DirectoryMonitor.c"
-						GeeArrayList* _tmp17_ = NULL;
+#line 8852 "DirectoryMonitor.c"
+						GeeArrayList* _tmp17_;
 #line 324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						_tmp17_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						_g_object_unref0 (pruned);
 #line 324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						pruned = _tmp17_;
-#line 9246 "DirectoryMonitor.c"
+#line 8860 "DirectoryMonitor.c"
 					}
 #line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp18_ = pruned;
@@ -9274,7 +8888,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 					_g_object_unref0 (_tmp25_);
 #line 329 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 9272 "DirectoryMonitor.c"
+#line 8886 "DirectoryMonitor.c"
 				}
 #line 332 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp26_ = parent;
@@ -9284,33 +8898,33 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 				_g_object_unref0 (parent);
 #line 332 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				parent = _tmp27_;
-#line 9282 "DirectoryMonitor.c"
+#line 8896 "DirectoryMonitor.c"
 			}
 #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (parent);
 #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (file);
-#line 9288 "DirectoryMonitor.c"
+#line 8902 "DirectoryMonitor.c"
 		}
 #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_file_it);
-#line 9292 "DirectoryMonitor.c"
+#line 8906 "DirectoryMonitor.c"
 	}
 #line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp28_ = pruned;
 #line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp28_ != NULL) {
-#line 9298 "DirectoryMonitor.c"
-		GeeArrayList* _tmp29_ = NULL;
+#line 8912 "DirectoryMonitor.c"
+		GeeArrayList* _tmp29_;
 #line 337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp29_ = pruned;
 #line 337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_file_info_map_remove_all (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 9304 "DirectoryMonitor.c"
+#line 8918 "DirectoryMonitor.c"
 	}
 #line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (pruned);
-#line 9308 "DirectoryMonitor.c"
+#line 8922 "DirectoryMonitor.c"
 }
 
 
@@ -9327,15 +8941,15 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 	g_return_val_if_fail (GEE_IS_COLLECTION (dirs), 0);
 #line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	count = 0;
-#line 9325 "DirectoryMonitor.c"
+#line 8939 "DirectoryMonitor.c"
 	{
 		GeeIterator* _file_it = NULL;
-		GeeHashMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeHashMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp0_ = self->priv->map;
 #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9354,25 +8968,25 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 		_file_it = _tmp5_;
 #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		while (TRUE) {
-#line 9352 "DirectoryMonitor.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 8966 "DirectoryMonitor.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			GFile* file = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			GFile* parent = NULL;
-			GFile* _tmp10_ = NULL;
-			GFile* _tmp11_ = NULL;
+			GFile* _tmp10_;
+			GFile* _tmp11_;
 			gboolean _tmp12_ = FALSE;
-			GFile* _tmp13_ = NULL;
+			GFile* _tmp13_;
 			DirectoryMonitorFType ftype = 0;
-			GeeHashMap* _tmp17_ = NULL;
-			GFile* _tmp18_ = NULL;
-			gpointer _tmp19_ = NULL;
-			GFileInfo* _tmp20_ = NULL;
-			DirectoryMonitorFType _tmp21_ = 0;
-			DirectoryMonitorFType _tmp22_ = 0;
-			DirectoryMonitorFType _tmp23_ = 0;
+			GeeHashMap* _tmp17_;
+			GFile* _tmp18_;
+			gpointer _tmp19_;
+			GFileInfo* _tmp20_;
+			DirectoryMonitorFType _tmp21_;
+			DirectoryMonitorFType _tmp22_;
+			DirectoryMonitorFType _tmp23_;
 #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp6_ = _file_it;
 #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9381,7 +8995,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 			if (!_tmp7_) {
 #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 9379 "DirectoryMonitor.c"
+#line 8993 "DirectoryMonitor.c"
 			}
 #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp8_ = _file_it;
@@ -9401,11 +9015,11 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 			if (_tmp13_ == NULL) {
 #line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp12_ = TRUE;
-#line 9399 "DirectoryMonitor.c"
+#line 9013 "DirectoryMonitor.c"
 			} else {
-				GFile* _tmp14_ = NULL;
-				GFile* _tmp15_ = NULL;
-				gboolean _tmp16_ = FALSE;
+				GFile* _tmp14_;
+				GFile* _tmp15_;
+				gboolean _tmp16_;
 #line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp14_ = parent;
 #line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9414,7 +9028,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 				_tmp16_ = g_file_equal (_tmp14_, _tmp15_);
 #line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp12_ = !_tmp16_;
-#line 9412 "DirectoryMonitor.c"
+#line 9026 "DirectoryMonitor.c"
 			}
 #line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp12_) {
@@ -9424,7 +9038,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 				_g_object_unref0 (file);
 #line 347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				continue;
-#line 9422 "DirectoryMonitor.c"
+#line 9036 "DirectoryMonitor.c"
 			}
 #line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp17_ = self->priv->map;
@@ -9448,11 +9062,11 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 			switch (_tmp23_) {
 #line 350 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 9446 "DirectoryMonitor.c"
+#line 9060 "DirectoryMonitor.c"
 				{
-					GeeCollection* _tmp24_ = NULL;
-					GFile* _tmp25_ = NULL;
-					gint _tmp26_ = 0;
+					GeeCollection* _tmp24_;
+					GFile* _tmp25_;
+					gint _tmp26_;
 #line 352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp24_ = files;
 #line 352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9465,15 +9079,15 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 					count = _tmp26_ + 1;
 #line 354 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 9463 "DirectoryMonitor.c"
+#line 9077 "DirectoryMonitor.c"
 				}
 #line 350 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 9467 "DirectoryMonitor.c"
+#line 9081 "DirectoryMonitor.c"
 				{
-					GeeCollection* _tmp27_ = NULL;
-					GFile* _tmp28_ = NULL;
-					gint _tmp29_ = 0;
+					GeeCollection* _tmp27_;
+					GFile* _tmp28_;
+					gint _tmp29_;
 #line 357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp27_ = dirs;
 #line 357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9486,42 +9100,42 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 					count = _tmp29_ + 1;
 #line 359 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 9484 "DirectoryMonitor.c"
+#line 9098 "DirectoryMonitor.c"
 				}
 				default:
 				{
-					DirectoryMonitorFType _tmp30_ = 0;
+					DirectoryMonitorFType _tmp30_;
 #line 362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp30_ = ftype;
 #line 362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_vala_assert (_tmp30_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
 #line 363 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 9495 "DirectoryMonitor.c"
+#line 9109 "DirectoryMonitor.c"
 				}
 			}
 #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (parent);
 #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (file);
-#line 9502 "DirectoryMonitor.c"
+#line 9116 "DirectoryMonitor.c"
 		}
 #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_file_it);
-#line 9506 "DirectoryMonitor.c"
+#line 9120 "DirectoryMonitor.c"
 	}
 #line 367 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	result = count;
 #line 367 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 9512 "DirectoryMonitor.c"
+#line 9126 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_value_file_info_map_init (GValue* value) {
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	value->data[0].v_pointer = NULL;
-#line 9519 "DirectoryMonitor.c"
+#line 9133 "DirectoryMonitor.c"
 }
 
 
@@ -9530,7 +9144,7 @@ static void directory_monitor_value_file_info_map_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_file_info_map_unref (value->data[0].v_pointer);
-#line 9528 "DirectoryMonitor.c"
+#line 9142 "DirectoryMonitor.c"
 	}
 }
 
@@ -9540,11 +9154,11 @@ static void directory_monitor_value_file_info_map_copy_value (const GValue* src_
 	if (src_value->data[0].v_pointer) {
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		dest_value->data[0].v_pointer = directory_monitor_file_info_map_ref (src_value->data[0].v_pointer);
-#line 9538 "DirectoryMonitor.c"
+#line 9152 "DirectoryMonitor.c"
 	} else {
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9542 "DirectoryMonitor.c"
+#line 9156 "DirectoryMonitor.c"
 	}
 }
 
@@ -9552,66 +9166,66 @@ static void directory_monitor_value_file_info_map_copy_value (const GValue* src_
 static gpointer directory_monitor_value_file_info_map_peek_pointer (const GValue* value) {
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return value->data[0].v_pointer;
-#line 9550 "DirectoryMonitor.c"
+#line 9164 "DirectoryMonitor.c"
 }
 
 
 static gchar* directory_monitor_value_file_info_map_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (collect_values[0].v_pointer) {
-#line 9557 "DirectoryMonitor.c"
-		DirectoryMonitorFileInfoMap* object;
+#line 9171 "DirectoryMonitor.c"
+		DirectoryMonitorFileInfoMap * object;
 		object = collect_values[0].v_pointer;
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9564 "DirectoryMonitor.c"
+#line 9178 "DirectoryMonitor.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9568 "DirectoryMonitor.c"
+#line 9182 "DirectoryMonitor.c"
 		}
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = directory_monitor_file_info_map_ref (object);
-#line 9572 "DirectoryMonitor.c"
+#line 9186 "DirectoryMonitor.c"
 	} else {
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 9576 "DirectoryMonitor.c"
+#line 9190 "DirectoryMonitor.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return NULL;
-#line 9580 "DirectoryMonitor.c"
+#line 9194 "DirectoryMonitor.c"
 }
 
 
 static gchar* directory_monitor_value_file_info_map_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	DirectoryMonitorFileInfoMap** object_p;
+	DirectoryMonitorFileInfoMap ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (!object_p) {
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9591 "DirectoryMonitor.c"
+#line 9205 "DirectoryMonitor.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (!value->data[0].v_pointer) {
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		*object_p = NULL;
-#line 9597 "DirectoryMonitor.c"
+#line 9211 "DirectoryMonitor.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9601 "DirectoryMonitor.c"
+#line 9215 "DirectoryMonitor.c"
 	} else {
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		*object_p = directory_monitor_file_info_map_ref (value->data[0].v_pointer);
-#line 9605 "DirectoryMonitor.c"
+#line 9219 "DirectoryMonitor.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return NULL;
-#line 9609 "DirectoryMonitor.c"
+#line 9223 "DirectoryMonitor.c"
 }
 
 
@@ -9625,7 +9239,7 @@ static GParamSpec* directory_monitor_param_spec_file_info_map (const gchar* name
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return G_PARAM_SPEC (spec);
-#line 9623 "DirectoryMonitor.c"
+#line 9237 "DirectoryMonitor.c"
 }
 
 
@@ -9634,12 +9248,12 @@ static gpointer directory_monitor_value_get_file_info_map (const GValue* value)
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP), NULL);
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return value->data[0].v_pointer;
-#line 9632 "DirectoryMonitor.c"
+#line 9246 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_value_set_file_info_map (GValue* value, gpointer v_object) {
-	DirectoryMonitorFileInfoMap* old;
+	DirectoryMonitorFileInfoMap * old;
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP));
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9654,23 +9268,23 @@ static void directory_monitor_value_set_file_info_map (GValue* value, gpointer v
 		value->data[0].v_pointer = v_object;
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_file_info_map_ref (value->data[0].v_pointer);
-#line 9652 "DirectoryMonitor.c"
+#line 9266 "DirectoryMonitor.c"
 	} else {
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 9656 "DirectoryMonitor.c"
+#line 9270 "DirectoryMonitor.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (old) {
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_file_info_map_unref (old);
-#line 9662 "DirectoryMonitor.c"
+#line 9276 "DirectoryMonitor.c"
 	}
 }
 
 
 static void directory_monitor_value_take_file_info_map (GValue* value, gpointer v_object) {
-	DirectoryMonitorFileInfoMap* old;
+	DirectoryMonitorFileInfoMap * old;
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP));
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9683,17 +9297,17 @@ static void directory_monitor_value_take_file_info_map (GValue* value, gpointer
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = v_object;
-#line 9681 "DirectoryMonitor.c"
+#line 9295 "DirectoryMonitor.c"
 	} else {
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 9685 "DirectoryMonitor.c"
+#line 9299 "DirectoryMonitor.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (old) {
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_file_info_map_unref (old);
-#line 9691 "DirectoryMonitor.c"
+#line 9305 "DirectoryMonitor.c"
 	}
 }
 
@@ -9705,13 +9319,13 @@ static void directory_monitor_file_info_map_class_init (DirectoryMonitorFileInfo
 	((DirectoryMonitorFileInfoMapClass *) klass)->finalize = directory_monitor_file_info_map_finalize;
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_type_class_add_private (klass, sizeof (DirectoryMonitorFileInfoMapPrivate));
-#line 9703 "DirectoryMonitor.c"
+#line 9317 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_file_info_map_instance_init (DirectoryMonitorFileInfoMap * self) {
-	GeeHashMap* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeHashMap* _tmp1_;
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->priv = DIRECTORY_MONITOR_FILE_INFO_MAP_GET_PRIVATE (self);
 #line 133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9724,11 +9338,11 @@ static void directory_monitor_file_info_map_instance_init (DirectoryMonitorFileI
 	self->priv->id_map = _tmp1_;
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->ref_count = 1;
-#line 9722 "DirectoryMonitor.c"
+#line 9336 "DirectoryMonitor.c"
 }
 
 
-static void directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMap* obj) {
+static void directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMap * obj) {
 	DirectoryMonitorFileInfoMap * self;
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP, DirectoryMonitorFileInfoMap);
@@ -9738,7 +9352,7 @@ static void directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMa
 	_g_object_unref0 (self->priv->map);
 #line 135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (self->priv->id_map);
-#line 9736 "DirectoryMonitor.c"
+#line 9350 "DirectoryMonitor.c"
 }
 
 
@@ -9757,18 +9371,18 @@ static GType directory_monitor_file_info_map_get_type (void) {
 
 
 static gpointer directory_monitor_file_info_map_ref (gpointer instance) {
-	DirectoryMonitorFileInfoMap* self;
+	DirectoryMonitorFileInfoMap * self;
 	self = instance;
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return instance;
-#line 9761 "DirectoryMonitor.c"
+#line 9375 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_file_info_map_unref (gpointer instance) {
-	DirectoryMonitorFileInfoMap* self;
+	DirectoryMonitorFileInfoMap * self;
 	self = instance;
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -9776,7 +9390,7 @@ static void directory_monitor_file_info_map_unref (gpointer instance) {
 		DIRECTORY_MONITOR_FILE_INFO_MAP_GET_CLASS (self)->finalize (self);
 #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9774 "DirectoryMonitor.c"
+#line 9388 "DirectoryMonitor.c"
 	}
 }
 
@@ -9787,51 +9401,51 @@ static void directory_monitor_class_init (DirectoryMonitorClass * klass) {
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_type_class_add_private (klass, sizeof (DirectoryMonitorPrivate));
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_root_deleted = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_root_deleted;
+	((DirectoryMonitorClass *) klass)->notify_root_deleted = (void (*) (DirectoryMonitor *, GFile*)) directory_monitor_real_notify_root_deleted;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_root_moved = (void (*)(DirectoryMonitor*, GFile*, GFile*, GFileInfo*)) directory_monitor_real_notify_root_moved;
+	((DirectoryMonitorClass *) klass)->notify_root_moved = (void (*) (DirectoryMonitor *, GFile*, GFile*, GFileInfo*)) directory_monitor_real_notify_root_moved;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_discovery_started = (void (*)(DirectoryMonitor*)) directory_monitor_real_notify_discovery_started;
+	((DirectoryMonitorClass *) klass)->notify_discovery_started = (void (*) (DirectoryMonitor *)) directory_monitor_real_notify_discovery_started;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->internal_notify_file_discovered = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_internal_notify_file_discovered;
+	((DirectoryMonitorClass *) klass)->internal_notify_file_discovered = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) directory_monitor_real_internal_notify_file_discovered;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_file_discovered = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_file_discovered;
+	((DirectoryMonitorClass *) klass)->notify_file_discovered = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) directory_monitor_real_notify_file_discovered;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->internal_notify_directory_discovered = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_internal_notify_directory_discovered;
+	((DirectoryMonitorClass *) klass)->internal_notify_directory_discovered = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) directory_monitor_real_internal_notify_directory_discovered;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_directory_discovered = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_discovered;
+	((DirectoryMonitorClass *) klass)->notify_directory_discovered = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_discovered;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_discovery_failed = (void (*)(DirectoryMonitor*, const gchar*)) directory_monitor_real_notify_discovery_failed;
+	((DirectoryMonitorClass *) klass)->notify_discovery_failed = (void (*) (DirectoryMonitor *, const gchar*)) directory_monitor_real_notify_discovery_failed;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_discovery_completed = (void (*)(DirectoryMonitor*)) directory_monitor_real_notify_discovery_completed;
+	((DirectoryMonitorClass *) klass)->notify_discovery_completed = (void (*) (DirectoryMonitor *)) directory_monitor_real_notify_discovery_completed;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_file_created = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_file_created;
+	((DirectoryMonitorClass *) klass)->notify_file_created = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) directory_monitor_real_notify_file_created;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_file_moved = (void (*)(DirectoryMonitor*, GFile*, GFile*, GFileInfo*)) directory_monitor_real_notify_file_moved;
+	((DirectoryMonitorClass *) klass)->notify_file_moved = (void (*) (DirectoryMonitor *, GFile*, GFile*, GFileInfo*)) directory_monitor_real_notify_file_moved;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_file_altered = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_file_altered;
+	((DirectoryMonitorClass *) klass)->notify_file_altered = (void (*) (DirectoryMonitor *, GFile*)) directory_monitor_real_notify_file_altered;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_file_alteration_completed = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_file_alteration_completed;
+	((DirectoryMonitorClass *) klass)->notify_file_alteration_completed = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) directory_monitor_real_notify_file_alteration_completed;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_file_attributes_altered = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_file_attributes_altered;
+	((DirectoryMonitorClass *) klass)->notify_file_attributes_altered = (void (*) (DirectoryMonitor *, GFile*)) directory_monitor_real_notify_file_attributes_altered;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_file_deleted = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_file_deleted;
+	((DirectoryMonitorClass *) klass)->notify_file_deleted = (void (*) (DirectoryMonitor *, GFile*)) directory_monitor_real_notify_file_deleted;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_directory_created = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_created;
+	((DirectoryMonitorClass *) klass)->notify_directory_created = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_created;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_directory_moved = (void (*)(DirectoryMonitor*, GFile*, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_moved;
+	((DirectoryMonitorClass *) klass)->notify_directory_moved = (void (*) (DirectoryMonitor *, GFile*, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_moved;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_directory_altered = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_directory_altered;
+	((DirectoryMonitorClass *) klass)->notify_directory_altered = (void (*) (DirectoryMonitor *, GFile*)) directory_monitor_real_notify_directory_altered;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_directory_alteration_completed = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_alteration_completed;
+	((DirectoryMonitorClass *) klass)->notify_directory_alteration_completed = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_alteration_completed;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_directory_attributes_altered = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_directory_attributes_altered;
+	((DirectoryMonitorClass *) klass)->notify_directory_attributes_altered = (void (*) (DirectoryMonitor *, GFile*)) directory_monitor_real_notify_directory_attributes_altered;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_directory_deleted = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_directory_deleted;
+	((DirectoryMonitorClass *) klass)->notify_directory_deleted = (void (*) (DirectoryMonitor *, GFile*)) directory_monitor_real_notify_directory_deleted;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_closed = (void (*)(DirectoryMonitor*)) directory_monitor_real_notify_closed;
+	((DirectoryMonitorClass *) klass)->notify_closed = (void (*) (DirectoryMonitor *)) directory_monitor_real_notify_closed;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->close = (void (*)(DirectoryMonitor*)) directory_monitor_real_close;
+	((DirectoryMonitorClass *) klass)->close = (void (*) (DirectoryMonitor *)) directory_monitor_real_close;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	((DirectoryMonitorClass *) klass)->root_moved = directory_monitor_real_root_moved;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9875,55 +9489,55 @@ static void directory_monitor_class_init (DirectoryMonitorClass * klass) {
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	G_OBJECT_CLASS (klass)->finalize = directory_monitor_finalize;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("root_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ());
+	directory_monitor_signals[DIRECTORY_MONITOR_ROOT_MOVED_SIGNAL] = g_signal_new ("root-moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("root_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	directory_monitor_signals[DIRECTORY_MONITOR_ROOT_DELETED_SIGNAL] = g_signal_new ("root-deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("discovery_started", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_started), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	directory_monitor_signals[DIRECTORY_MONITOR_DISCOVERY_STARTED_SIGNAL] = g_signal_new ("discovery-started", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_started), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	directory_monitor_signals[DIRECTORY_MONITOR_FILE_DISCOVERED_SIGNAL] = g_signal_new ("file-discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_DISCOVERED_SIGNAL] = g_signal_new ("directory-discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("discovery_failed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_failed), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+	directory_monitor_signals[DIRECTORY_MONITOR_DISCOVERY_FAILED_SIGNAL] = g_signal_new ("discovery-failed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_failed), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("discovery_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_completed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	directory_monitor_signals[DIRECTORY_MONITOR_DISCOVERY_COMPLETED_SIGNAL] = g_signal_new ("discovery-completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_completed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	directory_monitor_signals[DIRECTORY_MONITOR_FILE_CREATED_SIGNAL] = g_signal_new ("file-created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ());
+	directory_monitor_signals[DIRECTORY_MONITOR_FILE_MOVED_SIGNAL] = g_signal_new ("file-moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	directory_monitor_signals[DIRECTORY_MONITOR_FILE_ALTERED_SIGNAL] = g_signal_new ("file-altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	directory_monitor_signals[DIRECTORY_MONITOR_FILE_ALTERATION_COMPLETED_SIGNAL] = g_signal_new ("file-alteration-completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	directory_monitor_signals[DIRECTORY_MONITOR_FILE_ATTRIBUTES_ALTERED_SIGNAL] = g_signal_new ("file-attributes-altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	directory_monitor_signals[DIRECTORY_MONITOR_FILE_DELETED_SIGNAL] = g_signal_new ("file-deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_CREATED_SIGNAL] = g_signal_new ("directory-created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ());
+	directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_MOVED_SIGNAL] = g_signal_new ("directory-moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ALTERED_SIGNAL] = g_signal_new ("directory-altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ALTERATION_COMPLETED_SIGNAL] = g_signal_new ("directory-alteration-completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ATTRIBUTES_ALTERED_SIGNAL] = g_signal_new ("directory-attributes-altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_DELETED_SIGNAL] = g_signal_new ("directory-deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("closed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, closed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 9912 "DirectoryMonitor.c"
+	directory_monitor_signals[DIRECTORY_MONITOR_CLOSED_SIGNAL] = g_signal_new ("closed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, closed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 9526 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_instance_init (DirectoryMonitor * self) {
-	GeeHashMap* _tmp0_ = NULL;
-	GeeLinkedList* _tmp1_ = NULL;
-	DirectoryMonitorFileInfoMap* _tmp2_ = NULL;
-	DirectoryMonitorFileInfoMap* _tmp3_ = NULL;
-	GCancellable* _tmp4_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeLinkedList* _tmp1_;
+	DirectoryMonitorFileInfoMap* _tmp2_;
+	DirectoryMonitorFileInfoMap* _tmp3_;
+	GCancellable* _tmp4_;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->priv = DIRECTORY_MONITOR_GET_PRIVATE (self);
 #line 374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9954,11 +9568,11 @@ static void directory_monitor_instance_init (DirectoryMonitor * self) {
 	self->priv->has_discovery_started = FALSE;
 #line 383 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->priv->delete_timer_id = (guint) 0;
-#line 9952 "DirectoryMonitor.c"
+#line 9566 "DirectoryMonitor.c"
 }
 
 
-static void directory_monitor_finalize (GObject* obj) {
+static void directory_monitor_finalize (GObject * obj) {
 	DirectoryMonitor * self;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECTORY_MONITOR, DirectoryMonitor);
@@ -9976,7 +9590,7 @@ static void directory_monitor_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->cancellable);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	G_OBJECT_CLASS (directory_monitor_parent_class)->finalize (obj);
-#line 9974 "DirectoryMonitor.c"
+#line 9588 "DirectoryMonitor.c"
 }
 
 
diff --git a/src/Event.c b/src/Event.c
index 9f49ff5..c427644 100644
--- a/src/Event.c
+++ b/src/Event.c
@@ -1,4 +1,4 @@
-/* Event.c generated by valac 0.34.7, the Vala compiler
+/* Event.c generated by valac 0.36.6, the Vala compiler
  * generated from Event.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -268,6 +268,11 @@ typedef struct _EventSourceCollectionNoEventViewManagerPrivate EventSourceCollec
 
 typedef struct _ThumbnailView ThumbnailView;
 typedef struct _ThumbnailViewClass ThumbnailViewClass;
+enum  {
+	EVENT_SOURCE_COLLECTION_NO_EVENT_COLLECTION_ALTERED_SIGNAL,
+	EVENT_SOURCE_COLLECTION_LAST_SIGNAL
+};
+static guint event_source_collection_signals[EVENT_SOURCE_COLLECTION_LAST_SIGNAL] = {0};
 typedef struct _DataObjectPrivate DataObjectPrivate;
 typedef struct _DataSourcePrivate DataSourcePrivate;
 
@@ -904,9 +909,9 @@ static EventTable* event_event_table;
 static EventTable* event_event_table = NULL;
 static gpointer event_event_snapshot_parent_class = NULL;
 static gpointer event_event_proxy_parent_class = NULL;
-static ContainerSourceIface* event_container_source_parent_iface = NULL;
-static ProxyableIface* event_proxyable_parent_iface = NULL;
-static IndexableIface* event_indexable_parent_iface = NULL;
+static ContainerSourceIface * event_container_source_parent_iface = NULL;
+static ProxyableIface * event_proxyable_parent_iface = NULL;
+static IndexableIface * event_indexable_parent_iface = NULL;
 
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
@@ -1009,7 +1014,7 @@ ThumbnailView* thumbnail_view_new (ThumbnailSource* source);
 ThumbnailView* thumbnail_view_construct (GType object_type, ThumbnailSource* source);
 GType thumbnail_view_get_type (void) G_GNUC_CONST;
 ViewManager* view_manager_construct (GType object_type);
-static void event_source_collection_finalize (DataCollection* obj);
+static void event_source_collection_finalize (DataCollection * obj);
 gpointer source_holding_tank_ref (gpointer instance);
 void source_holding_tank_unref (gpointer instance);
 GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1260,13 +1265,13 @@ static void event_event_snapshot_real_notify_broken (SourceSnapshot* base);
 EventRow* event_row_new (void);
 EventRow* event_row_construct (GType object_type);
 void source_snapshot_notify_broken (SourceSnapshot* self);
-static void event_event_snapshot_finalize (SourceSnapshot* obj);
+static void event_event_snapshot_finalize (SourceSnapshot * obj);
 enum  {
 	EVENT_EVENT_PROXY_DUMMY_PROPERTY
 };
 SourceProxy* source_proxy_construct (GType object_type, DataSource* source);
 static DataSource* event_event_proxy_real_reconstitute (SourceProxy* base, gint64 object_id, SourceSnapshot* snapshot);
-static void event_finalize (GObject* obj);
+static void event_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -1276,14 +1281,14 @@ static gint64 _event_source_collection_get_event_key_get_source_database_key (Da
 	result = event_source_collection_get_event_key (source);
 #line 25 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 1280 "Event.c"
+#line 1285 "Event.c"
 }
 
 
 EventSourceCollection* event_source_collection_construct (GType object_type) {
 	EventSourceCollection* self = NULL;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	VideoSourceCollection* _tmp1_ = NULL;
+	LibraryPhotoSourceCollection* _tmp0_;
+	VideoSourceCollection* _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/Event.vala"
 	self = (EventSourceCollection*) container_source_collection_construct (object_type, EVENT_TYPENAME, "EventSourceCollection", _event_source_collection_get_event_key_get_source_database_key, NULL);
 #line 27 "/home/jens/Source/shotwell/src/Event.vala"
@@ -1296,39 +1301,39 @@ EventSourceCollection* event_source_collection_construct (GType object_type) {
 	container_source_collection_attach_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_COLLECTION, SourceCollection));
 #line 24 "/home/jens/Source/shotwell/src/Event.vala"
 	return self;
-#line 1300 "Event.c"
+#line 1305 "Event.c"
 }
 
 
 EventSourceCollection* event_source_collection_new (void) {
 #line 24 "/home/jens/Source/shotwell/src/Event.vala"
 	return event_source_collection_construct (TYPE_EVENT_SOURCE_COLLECTION);
-#line 1307 "Event.c"
+#line 1312 "Event.c"
 }
 
 
 static void _event_source_collection_on_no_event_collection_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
 #line 40 "/home/jens/Source/shotwell/src/Event.vala"
 	event_source_collection_on_no_event_collection_altered ((EventSourceCollection*) self, added, removed);
-#line 1314 "Event.c"
+#line 1319 "Event.c"
 }
 
 
 void event_source_collection_init (EventSourceCollection* self) {
-	ViewCollection* _tmp0_ = NULL;
+	ViewCollection* _tmp0_;
 	EventSourceCollectionNoEventViewManager* view_manager = NULL;
-	EventSourceCollectionNoEventViewManager* _tmp1_ = NULL;
+	EventSourceCollectionNoEventViewManager* _tmp1_;
 	Alteration* filter_alteration = NULL;
-	Alteration* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	LibraryPhotoSourceCollection* _tmp4_ = NULL;
-	ViewCollectionMonitor* _tmp5_ = NULL;
-	ViewCollectionMonitor* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	VideoSourceCollection* _tmp8_ = NULL;
-	ViewCollectionMonitor* _tmp9_ = NULL;
-	ViewCollectionMonitor* _tmp10_ = NULL;
-	ViewCollection* _tmp11_ = NULL;
+	Alteration* _tmp2_;
+	ViewCollection* _tmp3_;
+	LibraryPhotoSourceCollection* _tmp4_;
+	ViewCollectionMonitor* _tmp5_;
+	ViewCollectionMonitor* _tmp6_;
+	ViewCollection* _tmp7_;
+	VideoSourceCollection* _tmp8_;
+	ViewCollectionMonitor* _tmp9_;
+	ViewCollectionMonitor* _tmp10_;
+	ViewCollection* _tmp11_;
 #line 31 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (IS_EVENT_SOURCE_COLLECTION (self));
 #line 32 "/home/jens/Source/shotwell/src/Event.vala"
@@ -1373,14 +1378,14 @@ void event_source_collection_init (EventSourceCollection* self) {
 	_alteration_unref0 (filter_alteration);
 #line 31 "/home/jens/Source/shotwell/src/Event.vala"
 	_view_manager_unref0 (view_manager);
-#line 1377 "Event.c"
+#line 1382 "Event.c"
 }
 
 
 static gboolean event_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) {
 	EventSourceCollection * self;
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 43 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_SOURCE_COLLECTION, EventSourceCollection);
 #line 43 "/home/jens/Source/shotwell/src/Event.vala"
@@ -1391,26 +1396,26 @@ static gboolean event_source_collection_real_holds_type_of_source (SourceCollect
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_EVENT);
 #line 44 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 1395 "Event.c"
+#line 1400 "Event.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 48 "/home/jens/Source/shotwell/src/Event.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1402 "Event.c"
+#line 1407 "Event.c"
 }
 
 
 static gint64 event_source_collection_get_event_key (DataSource* source) {
 	gint64 result = 0LL;
 	Event* event = NULL;
-	DataSource* _tmp0_ = NULL;
-	Event* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	Event* _tmp1_;
 	EventID event_id = {0};
 	EventID _tmp2_ = {0};
-	EventID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
+	EventID _tmp3_;
+	gint64 _tmp4_;
 #line 47 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
 #line 48 "/home/jens/Source/shotwell/src/Event.vala"
@@ -1433,15 +1438,15 @@ static gint64 event_source_collection_get_event_key (DataSource* source) {
 	_g_object_unref0 (event);
 #line 51 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 1437 "Event.c"
+#line 1442 "Event.c"
 }
 
 
 Event* event_source_collection_fetch (EventSourceCollection* self, EventID* event_id) {
 	Event* result = NULL;
-	EventID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	DataSource* _tmp2_ = NULL;
+	EventID _tmp0_;
+	gint64 _tmp1_;
+	DataSource* _tmp2_;
 #line 54 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_EVENT_SOURCE_COLLECTION (self), NULL);
 #line 54 "/home/jens/Source/shotwell/src/Event.vala"
@@ -1456,7 +1461,7 @@ Event* event_source_collection_fetch (EventSourceCollection* self, EventID* even
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EVENT, Event);
 #line 55 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 1460 "Event.c"
+#line 1465 "Event.c"
 }
 
 
@@ -1464,13 +1469,13 @@ static GeeCollection* event_source_collection_real_get_containers_holding_source
 	EventSourceCollection * self;
 	GeeCollection* result = NULL;
 	Event* event = NULL;
-	DataSource* _tmp0_ = NULL;
-	Event* _tmp1_ = NULL;
-	Event* _tmp2_ = NULL;
+	DataSource* _tmp0_;
+	Event* _tmp1_;
+	Event* _tmp2_;
 	GeeArrayList* list = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	GeeArrayList* _tmp4_ = NULL;
-	Event* _tmp5_ = NULL;
+	GeeArrayList* _tmp3_;
+	GeeArrayList* _tmp4_;
+	Event* _tmp5_;
 #line 58 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_SOURCE_COLLECTION, EventSourceCollection);
 #line 58 "/home/jens/Source/shotwell/src/Event.vala"
@@ -1491,7 +1496,7 @@ static GeeCollection* event_source_collection_real_get_containers_holding_source
 		_g_object_unref0 (event);
 #line 61 "/home/jens/Source/shotwell/src/Event.vala"
 		return result;
-#line 1495 "Event.c"
+#line 1500 "Event.c"
 	}
 #line 63 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp3_ = gee_array_list_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
@@ -1509,7 +1514,7 @@ static GeeCollection* event_source_collection_real_get_containers_holding_source
 	_g_object_unref0 (event);
 #line 66 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 1513 "Event.c"
+#line 1518 "Event.c"
 }
 
 
@@ -1517,13 +1522,13 @@ static ContainerSource* event_source_collection_real_convert_backlink_to_contain
 	EventSourceCollection * self;
 	ContainerSource* result = NULL;
 	EventID event_id = {0};
-	SourceBacklink* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-	gint64 _tmp2_ = 0LL;
+	SourceBacklink* _tmp0_;
+	gint64 _tmp1_;
+	gint64 _tmp2_;
 	Event* event = NULL;
-	EventID _tmp3_ = {0};
-	Event* _tmp4_ = NULL;
-	Event* _tmp5_ = NULL;
+	EventID _tmp3_;
+	Event* _tmp4_;
+	Event* _tmp5_;
 #line 69 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_SOURCE_COLLECTION, EventSourceCollection);
 #line 69 "/home/jens/Source/shotwell/src/Event.vala"
@@ -1550,14 +1555,14 @@ static ContainerSource* event_source_collection_real_convert_backlink_to_contain
 		result = G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_CONTAINER_SOURCE, ContainerSource);
 #line 74 "/home/jens/Source/shotwell/src/Event.vala"
 		return result;
-#line 1554 "Event.c"
+#line 1559 "Event.c"
 	}
 	{
 		GeeIterator* _container_it = NULL;
-		GeeCollection* _tmp6_ = NULL;
-		GeeCollection* _tmp7_ = NULL;
-		GeeIterator* _tmp8_ = NULL;
-		GeeIterator* _tmp9_ = NULL;
+		GeeCollection* _tmp6_;
+		GeeCollection* _tmp7_;
+		GeeIterator* _tmp8_;
+		GeeIterator* _tmp9_;
 #line 76 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp6_ = container_source_collection_get_holding_tank (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection));
 #line 76 "/home/jens/Source/shotwell/src/Event.vala"
@@ -1572,17 +1577,17 @@ static ContainerSource* event_source_collection_real_convert_backlink_to_contain
 		_container_it = _tmp9_;
 #line 76 "/home/jens/Source/shotwell/src/Event.vala"
 		while (TRUE) {
-#line 1576 "Event.c"
-			GeeIterator* _tmp10_ = NULL;
-			gboolean _tmp11_ = FALSE;
+#line 1581 "Event.c"
+			GeeIterator* _tmp10_;
+			gboolean _tmp11_;
 			ContainerSource* container = NULL;
-			GeeIterator* _tmp12_ = NULL;
-			gpointer _tmp13_ = NULL;
-			ContainerSource* _tmp14_ = NULL;
+			GeeIterator* _tmp12_;
+			gpointer _tmp13_;
+			ContainerSource* _tmp14_;
 			EventID _tmp15_ = {0};
-			gint64 _tmp16_ = 0LL;
-			EventID _tmp17_ = {0};
-			gint64 _tmp18_ = 0LL;
+			gint64 _tmp16_;
+			EventID _tmp17_;
+			gint64 _tmp18_;
 #line 76 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp10_ = _container_it;
 #line 76 "/home/jens/Source/shotwell/src/Event.vala"
@@ -1591,7 +1596,7 @@ static ContainerSource* event_source_collection_real_convert_backlink_to_contain
 			if (!_tmp11_) {
 #line 76 "/home/jens/Source/shotwell/src/Event.vala"
 				break;
-#line 1595 "Event.c"
+#line 1600 "Event.c"
 			}
 #line 76 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp12_ = _container_it;
@@ -1619,15 +1624,15 @@ static ContainerSource* event_source_collection_real_convert_backlink_to_contain
 				_g_object_unref0 (event);
 #line 78 "/home/jens/Source/shotwell/src/Event.vala"
 				return result;
-#line 1623 "Event.c"
+#line 1628 "Event.c"
 			}
 #line 76 "/home/jens/Source/shotwell/src/Event.vala"
 			_g_object_unref0 (container);
-#line 1627 "Event.c"
+#line 1632 "Event.c"
 		}
 #line 76 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_object_unref0 (_container_it);
-#line 1631 "Event.c"
+#line 1636 "Event.c"
 	}
 #line 81 "/home/jens/Source/shotwell/src/Event.vala"
 	result = NULL;
@@ -1635,14 +1640,14 @@ static ContainerSource* event_source_collection_real_convert_backlink_to_contain
 	_g_object_unref0 (event);
 #line 81 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 1639 "Event.c"
+#line 1644 "Event.c"
 }
 
 
 GeeCollection* event_source_collection_get_no_event_objects (EventSourceCollection* self) {
 	GeeCollection* result = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	ViewCollection* _tmp0_;
+	GeeCollection* _tmp1_;
 #line 84 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_EVENT_SOURCE_COLLECTION (self), NULL);
 #line 85 "/home/jens/Source/shotwell/src/Event.vala"
@@ -1653,7 +1658,7 @@ GeeCollection* event_source_collection_get_no_event_objects (EventSourceCollecti
 	result = _tmp1_;
 #line 85 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 1657 "Event.c"
+#line 1662 "Event.c"
 }
 
 
@@ -1665,8 +1670,8 @@ static void event_source_collection_on_no_event_collection_altered (EventSourceC
 #line 88 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
 #line 90 "/home/jens/Source/shotwell/src/Event.vala"
-	g_signal_emit_by_name (self, "no-event-collection-altered");
-#line 1670 "Event.c"
+	g_signal_emit (self, event_source_collection_signals[EVENT_SOURCE_COLLECTION_NO_EVENT_COLLECTION_ALTERED_SIGNAL], 0);
+#line 1675 "Event.c"
 }
 
 
@@ -1674,9 +1679,9 @@ static gboolean event_source_collection_no_event_view_manager_real_include_in_vi
 	EventSourceCollectionNoEventViewManager * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	DataSource* _tmp1_ = NULL;
+	DataSource* _tmp1_;
 	EventID _tmp2_ = {0};
-	gint64 _tmp3_ = 0LL;
+	gint64 _tmp3_;
 #line 13 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENT_SOURCE_COLLECTION_TYPE_NO_EVENT_VIEW_MANAGER, EventSourceCollectionNoEventViewManager);
 #line 13 "/home/jens/Source/shotwell/src/Event.vala"
@@ -1691,31 +1696,31 @@ static gboolean event_source_collection_no_event_view_manager_real_include_in_vi
 	if (_tmp3_ != EVENT_ID_INVALID) {
 #line 15 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp0_ = FALSE;
-#line 1695 "Event.c"
+#line 1700 "Event.c"
 	} else {
-		DataSource* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+		DataSource* _tmp4_;
+		gboolean _tmp5_;
 #line 16 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp4_ = source;
 #line 16 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp5_ = VIEW_MANAGER_CLASS (event_source_collection_no_event_view_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIEW_MANAGER, ViewManager), _tmp4_);
 #line 16 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp0_ = _tmp5_;
-#line 1705 "Event.c"
+#line 1710 "Event.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/Event.vala"
 	result = _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 1711 "Event.c"
+#line 1716 "Event.c"
 }
 
 
 static DataView* event_source_collection_no_event_view_manager_real_create_view (ViewManager* base, DataSource* source) {
 	EventSourceCollectionNoEventViewManager * self;
 	DataView* result = NULL;
-	DataSource* _tmp0_ = NULL;
-	ThumbnailView* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	ThumbnailView* _tmp1_;
 #line 19 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENT_SOURCE_COLLECTION_TYPE_NO_EVENT_VIEW_MANAGER, EventSourceCollectionNoEventViewManager);
 #line 19 "/home/jens/Source/shotwell/src/Event.vala"
@@ -1728,7 +1733,7 @@ static DataView* event_source_collection_no_event_view_manager_real_create_view
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
 #line 20 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 1732 "Event.c"
+#line 1737 "Event.c"
 }
 
 
@@ -1738,14 +1743,14 @@ static EventSourceCollectionNoEventViewManager* event_source_collection_no_event
 	self = (EventSourceCollectionNoEventViewManager*) view_manager_construct (object_type);
 #line 12 "/home/jens/Source/shotwell/src/Event.vala"
 	return self;
-#line 1742 "Event.c"
+#line 1747 "Event.c"
 }
 
 
 static EventSourceCollectionNoEventViewManager* event_source_collection_no_event_view_manager_new (void) {
 #line 12 "/home/jens/Source/shotwell/src/Event.vala"
 	return event_source_collection_no_event_view_manager_construct (EVENT_SOURCE_COLLECTION_TYPE_NO_EVENT_VIEW_MANAGER);
-#line 1749 "Event.c"
+#line 1754 "Event.c"
 }
 
 
@@ -1753,10 +1758,10 @@ static void event_source_collection_no_event_view_manager_class_init (EventSourc
 #line 12 "/home/jens/Source/shotwell/src/Event.vala"
 	event_source_collection_no_event_view_manager_parent_class = g_type_class_peek_parent (klass);
 #line 12 "/home/jens/Source/shotwell/src/Event.vala"
-	((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) event_source_collection_no_event_view_manager_real_include_in_view;
+	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) event_source_collection_no_event_view_manager_real_include_in_view;
 #line 12 "/home/jens/Source/shotwell/src/Event.vala"
-	((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) event_source_collection_no_event_view_manager_real_create_view;
-#line 1760 "Event.c"
+	((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) event_source_collection_no_event_view_manager_real_create_view;
+#line 1765 "Event.c"
 }
 
 
@@ -1784,25 +1789,25 @@ static void event_source_collection_class_init (EventSourceCollectionClass * kla
 #line 7 "/home/jens/Source/shotwell/src/Event.vala"
 	g_type_class_add_private (klass, sizeof (EventSourceCollectionPrivate));
 #line 7 "/home/jens/Source/shotwell/src/Event.vala"
-	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) event_source_collection_real_holds_type_of_source;
+	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) event_source_collection_real_holds_type_of_source;
 #line 7 "/home/jens/Source/shotwell/src/Event.vala"
-	((ContainerSourceCollectionClass *) klass)->get_containers_holding_source = (GeeCollection* (*)(ContainerSourceCollection*, DataSource*)) event_source_collection_real_get_containers_holding_source;
+	((ContainerSourceCollectionClass *) klass)->get_containers_holding_source = (GeeCollection* (*) (ContainerSourceCollection *, DataSource*)) event_source_collection_real_get_containers_holding_source;
 #line 7 "/home/jens/Source/shotwell/src/Event.vala"
-	((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = (ContainerSource* (*)(ContainerSourceCollection*, SourceBacklink*)) event_source_collection_real_convert_backlink_to_container;
+	((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = (ContainerSource* (*) (ContainerSourceCollection *, SourceBacklink*)) event_source_collection_real_convert_backlink_to_container;
 #line 7 "/home/jens/Source/shotwell/src/Event.vala"
-	g_signal_new ("no_event_collection_altered", TYPE_EVENT_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1795 "Event.c"
+	event_source_collection_signals[EVENT_SOURCE_COLLECTION_NO_EVENT_COLLECTION_ALTERED_SIGNAL] = g_signal_new ("no-event-collection-altered", TYPE_EVENT_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 1800 "Event.c"
 }
 
 
 static void event_source_collection_instance_init (EventSourceCollection * self) {
 #line 7 "/home/jens/Source/shotwell/src/Event.vala"
 	self->priv = EVENT_SOURCE_COLLECTION_GET_PRIVATE (self);
-#line 1802 "Event.c"
+#line 1807 "Event.c"
 }
 
 
-static void event_source_collection_finalize (DataCollection* obj) {
+static void event_source_collection_finalize (DataCollection * obj) {
 	EventSourceCollection * self;
 #line 7 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_SOURCE_COLLECTION, EventSourceCollection);
@@ -1810,7 +1815,7 @@ static void event_source_collection_finalize (DataCollection* obj) {
 	_data_collection_unref0 (self->priv->no_event);
 #line 7 "/home/jens/Source/shotwell/src/Event.vala"
 	DATA_COLLECTION_CLASS (event_source_collection_parent_class)->finalize (obj);
-#line 1814 "Event.c"
+#line 1819 "Event.c"
 }
 
 
@@ -1829,35 +1834,35 @@ GType event_source_collection_get_type (void) {
 static void _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered (ThumbnailSource* _sender, gpointer self) {
 #line 238 "/home/jens/Source/shotwell/src/Event.vala"
 	event_on_primary_thumbnail_altered ((Event*) self);
-#line 1833 "Event.c"
+#line 1838 "Event.c"
 }
 
 
 static void _event_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 240 "/home/jens/Source/shotwell/src/Event.vala"
 	event_on_media_altered ((Event*) self, items);
-#line 1840 "Event.c"
+#line 1845 "Event.c"
 }
 
 
 static void _event_on_media_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) {
 #line 241 "/home/jens/Source/shotwell/src/Event.vala"
 	event_on_media_removed ((Event*) self, removed);
-#line 1847 "Event.c"
+#line 1852 "Event.c"
 }
 
 
 static void _event_on_media_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) {
 #line 242 "/home/jens/Source/shotwell/src/Event.vala"
 	event_on_media_added ((Event*) self, added);
-#line 1854 "Event.c"
+#line 1859 "Event.c"
 }
 
 
 static void _event_on_media_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 244 "/home/jens/Source/shotwell/src/Event.vala"
 	event_on_media_destroyed ((Event*) self, source);
-#line 1861 "Event.c"
+#line 1866 "Event.c"
 }
 
 
@@ -1866,7 +1871,7 @@ static gint64 _event_view_comparator_comparator (void* a, void* b, gpointer self
 	result = event_view_comparator (a, b);
 #line 201 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 1870 "Event.c"
+#line 1875 "Event.c"
 }
 
 
@@ -1875,61 +1880,61 @@ static gboolean _event_view_comparator_predicate_comparator_predicate (DataObjec
 	result = event_view_comparator_predicate (object, alteration);
 #line 201 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 1879 "Event.c"
+#line 1884 "Event.c"
 }
 
 
 static Event* event_construct (GType object_type, EventRow* event_row, gint64 object_id) {
 	Event * self = NULL;
-	gint64 _tmp0_ = 0LL;
-	EventRow* _tmp1_ = NULL;
-	EventRow* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	EventRow* _tmp5_ = NULL;
-	EventID _tmp6_ = {0};
-	EventRow* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	EventRow* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
+	gint64 _tmp0_;
+	EventRow* _tmp1_;
+	EventRow* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	EventRow* _tmp5_;
+	EventID _tmp6_;
+	EventRow* _tmp7_;
+	const gchar* _tmp8_;
+	gchar* _tmp9_;
+	EventRow* _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
 	GeeCollection* event_source_ids = NULL;
-	MediaCollectionRegistry* _tmp13_ = NULL;
-	MediaCollectionRegistry* _tmp14_ = NULL;
-	EventID _tmp15_ = {0};
-	GeeCollection* _tmp16_ = NULL;
-	GeeCollection* _tmp17_ = NULL;
+	MediaCollectionRegistry* _tmp13_;
+	MediaCollectionRegistry* _tmp14_;
+	EventID _tmp15_;
+	GeeCollection* _tmp16_;
+	GeeCollection* _tmp17_;
 	GeeArrayList* event_thumbs = NULL;
-	GeeArrayList* _tmp18_ = NULL;
-	EventID _tmp35_ = {0};
-	gint64 _tmp36_ = 0LL;
-	gchar* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
-	gchar* _tmp39_ = NULL;
-	gchar* _tmp40_ = NULL;
-	ViewCollection* _tmp41_ = NULL;
-	ViewCollection* _tmp42_ = NULL;
-	ViewCollection* _tmp43_ = NULL;
-	GeeArrayList* _tmp44_ = NULL;
-	GeeCollection* _tmp45_ = NULL;
-	GeeCollection* _tmp46_ = NULL;
-	GeeArrayList* _tmp47_ = NULL;
-	gint _tmp48_ = 0;
-	gint _tmp49_ = 0;
-	MediaCollectionRegistry* _tmp54_ = NULL;
-	MediaCollectionRegistry* _tmp55_ = NULL;
-	EventRow* _tmp56_ = NULL;
-	const gchar* _tmp57_ = NULL;
-	MediaSource* _tmp58_ = NULL;
+	GeeArrayList* _tmp18_;
+	EventID _tmp35_;
+	gint64 _tmp36_;
+	gchar* _tmp37_;
+	gchar* _tmp38_;
+	gchar* _tmp39_;
+	gchar* _tmp40_;
+	ViewCollection* _tmp41_;
+	ViewCollection* _tmp42_;
+	ViewCollection* _tmp43_;
+	GeeArrayList* _tmp44_;
+	GeeCollection* _tmp45_;
+	GeeCollection* _tmp46_;
+	GeeArrayList* _tmp47_;
+	gint _tmp48_;
+	gint _tmp49_;
+	MediaCollectionRegistry* _tmp54_;
+	MediaCollectionRegistry* _tmp55_;
+	EventRow* _tmp56_;
+	const gchar* _tmp57_;
+	MediaSource* _tmp58_;
 	gboolean _tmp59_ = FALSE;
-	MediaSource* _tmp60_ = NULL;
-	MediaSource* _tmp72_ = NULL;
-	ViewCollection* _tmp74_ = NULL;
-	ViewCollection* _tmp75_ = NULL;
-	ViewCollection* _tmp76_ = NULL;
-	LibraryPhotoSourceCollection* _tmp77_ = NULL;
-	VideoSourceCollection* _tmp78_ = NULL;
+	MediaSource* _tmp60_;
+	MediaSource* _tmp72_;
+	ViewCollection* _tmp74_;
+	ViewCollection* _tmp75_;
+	ViewCollection* _tmp76_;
+	LibraryPhotoSourceCollection* _tmp77_;
+	VideoSourceCollection* _tmp78_;
 #line 180 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_EVENT_ROW (event_row), NULL);
 #line 181 "/home/jens/Source/shotwell/src/Event.vala"
@@ -1992,11 +1997,11 @@ static Event* event_construct (GType object_type, EventRow* event_row, gint64 ob
 	_tmp18_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 192 "/home/jens/Source/shotwell/src/Event.vala"
 	event_thumbs = _tmp18_;
-#line 1996 "Event.c"
+#line 2001 "Event.c"
 	{
 		GeeIterator* _current_source_id_it = NULL;
-		GeeCollection* _tmp19_ = NULL;
-		GeeIterator* _tmp20_ = NULL;
+		GeeCollection* _tmp19_;
+		GeeIterator* _tmp20_;
 #line 193 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp19_ = event_source_ids;
 #line 193 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2005,19 +2010,19 @@ static Event* event_construct (GType object_type, EventRow* event_row, gint64 ob
 		_current_source_id_it = _tmp20_;
 #line 193 "/home/jens/Source/shotwell/src/Event.vala"
 		while (TRUE) {
-#line 2009 "Event.c"
-			GeeIterator* _tmp21_ = NULL;
-			gboolean _tmp22_ = FALSE;
+#line 2014 "Event.c"
+			GeeIterator* _tmp21_;
+			gboolean _tmp22_;
 			gchar* current_source_id = NULL;
-			GeeIterator* _tmp23_ = NULL;
-			gpointer _tmp24_ = NULL;
+			GeeIterator* _tmp23_;
+			gpointer _tmp24_;
 			MediaSource* media = NULL;
-			MediaCollectionRegistry* _tmp25_ = NULL;
-			MediaCollectionRegistry* _tmp26_ = NULL;
-			const gchar* _tmp27_ = NULL;
-			MediaSource* _tmp28_ = NULL;
-			MediaSource* _tmp29_ = NULL;
-			MediaSource* _tmp30_ = NULL;
+			MediaCollectionRegistry* _tmp25_;
+			MediaCollectionRegistry* _tmp26_;
+			const gchar* _tmp27_;
+			MediaSource* _tmp28_;
+			MediaSource* _tmp29_;
+			MediaSource* _tmp30_;
 #line 193 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp21_ = _current_source_id_it;
 #line 193 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2026,7 +2031,7 @@ static Event* event_construct (GType object_type, EventRow* event_row, gint64 ob
 			if (!_tmp22_) {
 #line 193 "/home/jens/Source/shotwell/src/Event.vala"
 				break;
-#line 2030 "Event.c"
+#line 2035 "Event.c"
 			}
 #line 193 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp23_ = _current_source_id_it;
@@ -2052,11 +2057,11 @@ static Event* event_construct (GType object_type, EventRow* event_row, gint64 ob
 			_tmp30_ = media;
 #line 196 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_tmp30_ != NULL) {
-#line 2056 "Event.c"
-				GeeArrayList* _tmp31_ = NULL;
-				MediaSource* _tmp32_ = NULL;
-				ThumbnailView* _tmp33_ = NULL;
-				ThumbnailView* _tmp34_ = NULL;
+#line 2061 "Event.c"
+				GeeArrayList* _tmp31_;
+				MediaSource* _tmp32_;
+				ThumbnailView* _tmp33_;
+				ThumbnailView* _tmp34_;
 #line 197 "/home/jens/Source/shotwell/src/Event.vala"
 				_tmp31_ = event_thumbs;
 #line 197 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2069,17 +2074,17 @@ static Event* event_construct (GType object_type, EventRow* event_row, gint64 ob
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp34_);
 #line 197 "/home/jens/Source/shotwell/src/Event.vala"
 				_g_object_unref0 (_tmp34_);
-#line 2073 "Event.c"
+#line 2078 "Event.c"
 			}
 #line 193 "/home/jens/Source/shotwell/src/Event.vala"
 			_g_object_unref0 (media);
 #line 193 "/home/jens/Source/shotwell/src/Event.vala"
 			_g_free0 (current_source_id);
-#line 2079 "Event.c"
+#line 2084 "Event.c"
 		}
 #line 193 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_object_unref0 (_current_source_id_it);
-#line 2083 "Event.c"
+#line 2088 "Event.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp35_ = self->priv->event_id;
@@ -2125,11 +2130,11 @@ static Event* event_construct (GType object_type, EventRow* event_row, gint64 ob
 	_tmp49_ = _tmp48_;
 #line 206 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp49_ > 0) {
-#line 2129 "Event.c"
-		EventSourceCollection* _tmp50_ = NULL;
-		GeeArrayList* _tmp51_ = NULL;
-		EventSourceCollection* _tmp52_ = NULL;
-		GeeArrayList* _tmp53_ = NULL;
+#line 2134 "Event.c"
+		EventSourceCollection* _tmp50_;
+		GeeArrayList* _tmp51_;
+		EventSourceCollection* _tmp52_;
+		GeeArrayList* _tmp53_;
 #line 207 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp50_ = event_global;
 #line 207 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2142,7 +2147,7 @@ static Event* event_construct (GType object_type, EventRow* event_row, gint64 ob
 		_tmp53_ = event_thumbs;
 #line 208 "/home/jens/Source/shotwell/src/Event.vala"
 		container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, FALSE);
-#line 2146 "Event.c"
+#line 2151 "Event.c"
 	}
 #line 213 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp54_ = media_collection_registry_get_instance ();
@@ -2164,33 +2169,33 @@ static Event* event_construct (GType object_type, EventRow* event_row, gint64 ob
 	_tmp60_ = self->priv->primary_source;
 #line 214 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp60_ == NULL) {
-#line 2168 "Event.c"
-		ViewCollection* _tmp61_ = NULL;
-		gint _tmp62_ = 0;
+#line 2173 "Event.c"
+		ViewCollection* _tmp61_;
+		gint _tmp62_;
 #line 214 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp61_ = self->priv->view;
 #line 214 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp62_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_DATA_COLLECTION, DataCollection));
 #line 214 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp59_ = _tmp62_ > 0;
-#line 2177 "Event.c"
+#line 2182 "Event.c"
 	} else {
 #line 214 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp59_ = FALSE;
-#line 2181 "Event.c"
+#line 2186 "Event.c"
 	}
 #line 214 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp59_) {
-#line 2185 "Event.c"
-		ViewCollection* _tmp63_ = NULL;
-		DataView* _tmp64_ = NULL;
-		DataView* _tmp65_ = NULL;
-		DataSource* _tmp66_ = NULL;
-		EventTable* _tmp67_ = NULL;
-		EventID _tmp68_ = {0};
-		MediaSource* _tmp69_ = NULL;
-		gchar* _tmp70_ = NULL;
-		gchar* _tmp71_ = NULL;
+#line 2190 "Event.c"
+		ViewCollection* _tmp63_;
+		DataView* _tmp64_;
+		DataView* _tmp65_;
+		DataSource* _tmp66_;
+		EventTable* _tmp67_;
+		EventID _tmp68_;
+		MediaSource* _tmp69_;
+		gchar* _tmp70_;
+		gchar* _tmp71_;
 #line 215 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp63_ = self->priv->view;
 #line 215 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2219,19 +2224,19 @@ static Event* event_construct (GType object_type, EventRow* event_row, gint64 ob
 		event_table_set_primary_source_id (_tmp67_, &_tmp68_, _tmp71_);
 #line 216 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_free0 (_tmp71_);
-#line 2223 "Event.c"
+#line 2228 "Event.c"
 	}
 #line 220 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp72_ = self->priv->primary_source;
 #line 220 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp72_ != NULL) {
-#line 2229 "Event.c"
-		MediaSource* _tmp73_ = NULL;
+#line 2234 "Event.c"
+		MediaSource* _tmp73_;
 #line 221 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp73_ = self->priv->primary_source;
 #line 221 "/home/jens/Source/shotwell/src/Event.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), "thumbnail-altered", (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self, 0);
-#line 2235 "Event.c"
+#line 2240 "Event.c"
 	}
 #line 224 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp74_ = self->priv->view;
@@ -2261,21 +2266,21 @@ static Event* event_construct (GType object_type, EventRow* event_row, gint64 ob
 	_g_object_unref0 (event_source_ids);
 #line 180 "/home/jens/Source/shotwell/src/Event.vala"
 	return self;
-#line 2265 "Event.c"
+#line 2270 "Event.c"
 }
 
 
 static Event* event_new (EventRow* event_row, gint64 object_id) {
 #line 180 "/home/jens/Source/shotwell/src/Event.vala"
 	return event_construct (TYPE_EVENT, event_row, object_id);
-#line 2272 "Event.c"
+#line 2277 "Event.c"
 }
 
 
 static gchar* event_real_get_typename (DataSource* base) {
 	Event * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 248 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 249 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2284,7 +2289,7 @@ static gchar* event_real_get_typename (DataSource* base) {
 	result = _tmp0_;
 #line 249 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 2288 "Event.c"
+#line 2293 "Event.c"
 }
 
 
@@ -2292,7 +2297,7 @@ static gint64 event_real_get_instance_id (DataSource* base) {
 	Event * self;
 	gint64 result = 0LL;
 	EventID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	gint64 _tmp1_;
 #line 252 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 253 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2303,7 +2308,7 @@ static gint64 event_real_get_instance_id (DataSource* base) {
 	result = _tmp1_;
 #line 253 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 2307 "Event.c"
+#line 2312 "Event.c"
 }
 
 
@@ -2311,16 +2316,16 @@ static gchar* event_real_get_representative_id (ThumbnailSource* base) {
 	Event * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
+	MediaSource* _tmp1_;
 #line 256 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 257 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp1_ = self->priv->primary_source;
 #line 257 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp1_ != NULL) {
-#line 2322 "Event.c"
-		MediaSource* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+#line 2327 "Event.c"
+		MediaSource* _tmp2_;
+		gchar* _tmp3_;
 #line 257 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp2_ = self->priv->primary_source;
 #line 257 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2329,22 +2334,22 @@ static gchar* event_real_get_representative_id (ThumbnailSource* base) {
 		_g_free0 (_tmp0_);
 #line 257 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp0_ = _tmp3_;
-#line 2333 "Event.c"
+#line 2338 "Event.c"
 	} else {
-		gchar* _tmp4_ = NULL;
+		gchar* _tmp4_;
 #line 257 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp4_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource));
 #line 257 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_free0 (_tmp0_);
 #line 257 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp0_ = _tmp4_;
-#line 2342 "Event.c"
+#line 2347 "Event.c"
 	}
 #line 257 "/home/jens/Source/shotwell/src/Event.vala"
 	result = _tmp0_;
 #line 257 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 2348 "Event.c"
+#line 2353 "Event.c"
 }
 
 
@@ -2352,36 +2357,36 @@ static PhotoFileFormat event_real_get_preferred_thumbnail_format (ThumbnailSourc
 	Event * self;
 	PhotoFileFormat result = 0;
 	PhotoFileFormat _tmp0_ = 0;
-	MediaSource* _tmp1_ = NULL;
+	MediaSource* _tmp1_;
 #line 260 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 261 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp1_ = self->priv->primary_source;
 #line 261 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp1_ != NULL) {
-#line 2363 "Event.c"
-		MediaSource* _tmp2_ = NULL;
-		PhotoFileFormat _tmp3_ = 0;
+#line 2368 "Event.c"
+		MediaSource* _tmp2_;
+		PhotoFileFormat _tmp3_;
 #line 261 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp2_ = self->priv->primary_source;
 #line 261 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp3_ = thumbnail_source_get_preferred_thumbnail_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
 #line 261 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp0_ = _tmp3_;
-#line 2372 "Event.c"
+#line 2377 "Event.c"
 	} else {
-		PhotoFileFormat _tmp4_ = 0;
+		PhotoFileFormat _tmp4_;
 #line 262 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp4_ = photo_file_format_get_system_default_format ();
 #line 262 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp0_ = _tmp4_;
-#line 2379 "Event.c"
+#line 2384 "Event.c"
 	}
 #line 261 "/home/jens/Source/shotwell/src/Event.vala"
 	result = _tmp0_;
 #line 261 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 2385 "Event.c"
+#line 2390 "Event.c"
 }
 
 
@@ -2389,7 +2394,7 @@ static GdkPixbuf* event_real_create_thumbnail (ThumbnailSource* base, gint scale
 	Event * self;
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
+	MediaSource* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 265 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
@@ -2397,10 +2402,10 @@ static GdkPixbuf* event_real_create_thumbnail (ThumbnailSource* base, gint scale
 	_tmp1_ = self->priv->primary_source;
 #line 266 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp1_ != NULL) {
-#line 2401 "Event.c"
-		MediaSource* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		GdkPixbuf* _tmp4_ = NULL;
+#line 2406 "Event.c"
+		MediaSource* _tmp2_;
+		gint _tmp3_;
+		GdkPixbuf* _tmp4_;
 #line 266 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp2_ = self->priv->primary_source;
 #line 266 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2419,44 +2424,44 @@ static GdkPixbuf* event_real_create_thumbnail (ThumbnailSource* base, gint scale
 			_g_object_unref0 (_tmp0_);
 #line 266 "/home/jens/Source/shotwell/src/Event.vala"
 			return NULL;
-#line 2423 "Event.c"
+#line 2428 "Event.c"
 		}
 	} else {
 #line 266 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_object_unref0 (_tmp0_);
 #line 266 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp0_ = NULL;
-#line 2430 "Event.c"
+#line 2435 "Event.c"
 	}
 #line 266 "/home/jens/Source/shotwell/src/Event.vala"
 	result = _tmp0_;
 #line 266 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 2436 "Event.c"
+#line 2441 "Event.c"
 }
 
 
 void event_init (ProgressMonitor monitor, void* monitor_target) {
-	EventTable* _tmp0_ = NULL;
-	EventSourceCollection* _tmp1_ = NULL;
-	EventSourceCollection* _tmp2_ = NULL;
+	EventTable* _tmp0_;
+	EventSourceCollection* _tmp1_;
+	EventSourceCollection* _tmp2_;
 	GeeArrayList* events = NULL;
-	GeeArrayList* _tmp3_ = NULL;
+	GeeArrayList* _tmp3_;
 	GeeArrayList* unlinked = NULL;
-	GeeArrayList* _tmp4_ = NULL;
+	GeeArrayList* _tmp4_;
 	GeeArrayList* event_rows = NULL;
-	EventTable* _tmp5_ = NULL;
-	GeeArrayList* _tmp6_ = NULL;
+	EventTable* _tmp5_;
+	GeeArrayList* _tmp6_;
 	gint count = 0;
-	GeeArrayList* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	EventSourceCollection* _tmp32_ = NULL;
-	GeeArrayList* _tmp33_ = NULL;
-	GeeCollection* _tmp34_ = NULL;
-	GeeCollection* _tmp35_ = NULL;
-	EventSourceCollection* _tmp36_ = NULL;
-	GeeArrayList* _tmp37_ = NULL;
+	GeeArrayList* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	EventSourceCollection* _tmp32_;
+	GeeArrayList* _tmp33_;
+	GeeCollection* _tmp34_;
+	GeeCollection* _tmp35_;
+	EventSourceCollection* _tmp36_;
+	GeeArrayList* _tmp37_;
 #line 270 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp0_ = event_table_get_instance ();
 #line 270 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2495,45 +2500,45 @@ void event_init (ProgressMonitor monitor, void* monitor_target) {
 	_tmp9_ = _tmp8_;
 #line 279 "/home/jens/Source/shotwell/src/Event.vala"
 	count = _tmp9_;
-#line 2499 "Event.c"
+#line 2504 "Event.c"
 	{
 		gint ctr = 0;
 #line 280 "/home/jens/Source/shotwell/src/Event.vala"
 		ctr = 0;
-#line 2504 "Event.c"
+#line 2509 "Event.c"
 		{
 			gboolean _tmp10_ = FALSE;
 #line 280 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp10_ = TRUE;
 #line 280 "/home/jens/Source/shotwell/src/Event.vala"
 			while (TRUE) {
-#line 2511 "Event.c"
-				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
+#line 2516 "Event.c"
+				gint _tmp12_;
+				gint _tmp13_;
 				Event* event = NULL;
-				GeeArrayList* _tmp14_ = NULL;
-				gint _tmp15_ = 0;
-				gpointer _tmp16_ = NULL;
-				EventRow* _tmp17_ = NULL;
-				Event* _tmp18_ = NULL;
-				Event* _tmp19_ = NULL;
-				ProgressMonitor _tmp20_ = NULL;
-				void* _tmp20__target = NULL;
-				Event* _tmp24_ = NULL;
-				gint _tmp25_ = 0;
-				Event* _tmp28_ = NULL;
-				EventSourceCollection* _tmp29_ = NULL;
-				GeeArrayList* _tmp30_ = NULL;
-				Event* _tmp31_ = NULL;
+				GeeArrayList* _tmp14_;
+				gint _tmp15_;
+				gpointer _tmp16_;
+				EventRow* _tmp17_;
+				Event* _tmp18_;
+				Event* _tmp19_;
+				ProgressMonitor _tmp20_;
+				void* _tmp20__target;
+				Event* _tmp24_;
+				gint _tmp25_;
+				Event* _tmp28_;
+				EventSourceCollection* _tmp29_;
+				GeeArrayList* _tmp30_;
+				Event* _tmp31_;
 #line 280 "/home/jens/Source/shotwell/src/Event.vala"
 				if (!_tmp10_) {
-#line 2531 "Event.c"
-					gint _tmp11_ = 0;
+#line 2536 "Event.c"
+					gint _tmp11_;
 #line 280 "/home/jens/Source/shotwell/src/Event.vala"
 					_tmp11_ = ctr;
 #line 280 "/home/jens/Source/shotwell/src/Event.vala"
 					ctr = _tmp11_ + 1;
-#line 2537 "Event.c"
+#line 2542 "Event.c"
 				}
 #line 280 "/home/jens/Source/shotwell/src/Event.vala"
 				_tmp10_ = FALSE;
@@ -2545,7 +2550,7 @@ void event_init (ProgressMonitor monitor, void* monitor_target) {
 				if (!(_tmp12_ < _tmp13_)) {
 #line 280 "/home/jens/Source/shotwell/src/Event.vala"
 					break;
-#line 2549 "Event.c"
+#line 2554 "Event.c"
 				}
 #line 281 "/home/jens/Source/shotwell/src/Event.vala"
 				_tmp14_ = event_rows;
@@ -2569,11 +2574,11 @@ void event_init (ProgressMonitor monitor, void* monitor_target) {
 				_tmp20__target = monitor_target;
 #line 282 "/home/jens/Source/shotwell/src/Event.vala"
 				if (_tmp20_ != NULL) {
-#line 2573 "Event.c"
-					ProgressMonitor _tmp21_ = NULL;
-					void* _tmp21__target = NULL;
-					gint _tmp22_ = 0;
-					gint _tmp23_ = 0;
+#line 2578 "Event.c"
+					ProgressMonitor _tmp21_;
+					void* _tmp21__target;
+					gint _tmp22_;
+					gint _tmp23_;
 #line 283 "/home/jens/Source/shotwell/src/Event.vala"
 					_tmp21_ = monitor;
 #line 283 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2584,7 +2589,7 @@ void event_init (ProgressMonitor monitor, void* monitor_target) {
 					_tmp23_ = count;
 #line 283 "/home/jens/Source/shotwell/src/Event.vala"
 					_tmp21_ ((guint64) _tmp22_, (guint64) _tmp23_, TRUE, _tmp21__target);
-#line 2588 "Event.c"
+#line 2593 "Event.c"
 				}
 #line 285 "/home/jens/Source/shotwell/src/Event.vala"
 				_tmp24_ = event;
@@ -2592,9 +2597,9 @@ void event_init (ProgressMonitor monitor, void* monitor_target) {
 				_tmp25_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_EVENT_SOURCE, EventSource));
 #line 285 "/home/jens/Source/shotwell/src/Event.vala"
 				if (_tmp25_ != 0) {
-#line 2596 "Event.c"
-					GeeArrayList* _tmp26_ = NULL;
-					Event* _tmp27_ = NULL;
+#line 2601 "Event.c"
+					GeeArrayList* _tmp26_;
+					Event* _tmp27_;
 #line 286 "/home/jens/Source/shotwell/src/Event.vala"
 					_tmp26_ = events;
 #line 286 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2605,7 +2610,7 @@ void event_init (ProgressMonitor monitor, void* monitor_target) {
 					_g_object_unref0 (event);
 #line 288 "/home/jens/Source/shotwell/src/Event.vala"
 					continue;
-#line 2609 "Event.c"
+#line 2614 "Event.c"
 				}
 #line 294 "/home/jens/Source/shotwell/src/Event.vala"
 				_tmp28_ = event;
@@ -2621,7 +2626,7 @@ void event_init (ProgressMonitor monitor, void* monitor_target) {
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp31_);
 #line 280 "/home/jens/Source/shotwell/src/Event.vala"
 				_g_object_unref0 (event);
-#line 2625 "Event.c"
+#line 2630 "Event.c"
 			}
 		}
 	}
@@ -2647,7 +2652,7 @@ void event_init (ProgressMonitor monitor, void* monitor_target) {
 	_g_object_unref0 (unlinked);
 #line 269 "/home/jens/Source/shotwell/src/Event.vala"
 	_g_object_unref0 (events);
-#line 2651 "Event.c"
+#line 2656 "Event.c"
 }
 
 
@@ -2657,15 +2662,15 @@ void event_terminate (void) {
 
 static gint64 event_view_comparator (void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	MediaSource* _tmp2_ = NULL;
-	time_t _tmp3_ = 0;
-	void* _tmp4_ = NULL;
-	DataSource* _tmp5_ = NULL;
-	MediaSource* _tmp6_ = NULL;
-	time_t _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	void* _tmp0_;
+	DataSource* _tmp1_;
+	MediaSource* _tmp2_;
+	time_t _tmp3_;
+	void* _tmp4_;
+	DataSource* _tmp5_;
+	MediaSource* _tmp6_;
+	time_t _tmp7_;
+	gint64 _tmp8_;
 #line 306 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp0_ = a;
 #line 306 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2692,14 +2697,14 @@ static gint64 event_view_comparator (void* a, void* b) {
 	result = _tmp8_;
 #line 306 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 2696 "Event.c"
+#line 2701 "Event.c"
 }
 
 
 static gboolean event_view_comparator_predicate (DataObject* object, Alteration* alteration) {
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Alteration* _tmp0_;
+	gboolean _tmp1_;
 #line 310 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
 #line 310 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2712,14 +2717,14 @@ static gboolean event_view_comparator_predicate (DataObject* object, Alteration*
 	result = _tmp1_;
 #line 311 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 2716 "Event.c"
+#line 2721 "Event.c"
 }
 
 
 gchar* event_prep_event_name (const gchar* name) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 319 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp0_ = name;
 #line 319 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2728,15 +2733,15 @@ gchar* event_prep_event_name (const gchar* name) {
 	result = _tmp1_;
 #line 319 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 2732 "Event.c"
+#line 2737 "Event.c"
 }
 
 
 void event_attach (Event* self, MediaSource* source) {
-	ViewCollection* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	ThumbnailView* _tmp2_ = NULL;
-	ThumbnailView* _tmp3_ = NULL;
+	ViewCollection* _tmp0_;
+	MediaSource* _tmp1_;
+	ThumbnailView* _tmp2_;
+	ThumbnailView* _tmp3_;
 #line 327 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (IS_EVENT (self));
 #line 327 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2753,17 +2758,17 @@ void event_attach (Event* self, MediaSource* source) {
 	data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
 #line 328 "/home/jens/Source/shotwell/src/Event.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2757 "Event.c"
+#line 2762 "Event.c"
 }
 
 
 void event_attach_many (Event* self, GeeCollection* media) {
 	GeeArrayList* views = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	ViewCollection* _tmp11_ = NULL;
-	GeeArrayList* _tmp12_ = NULL;
-	GeeCollection* _tmp13_ = NULL;
-	GeeCollection* _tmp14_ = NULL;
+	GeeArrayList* _tmp0_;
+	ViewCollection* _tmp11_;
+	GeeArrayList* _tmp12_;
+	GeeCollection* _tmp13_;
+	GeeCollection* _tmp14_;
 #line 331 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (IS_EVENT (self));
 #line 331 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2772,11 +2777,11 @@ void event_attach_many (Event* self, GeeCollection* media) {
 	_tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 332 "/home/jens/Source/shotwell/src/Event.vala"
 	views = _tmp0_;
-#line 2776 "Event.c"
+#line 2781 "Event.c"
 	{
 		GeeIterator* _current_source_it = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 333 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp1_ = media;
 #line 333 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2785,16 +2790,16 @@ void event_attach_many (Event* self, GeeCollection* media) {
 		_current_source_it = _tmp2_;
 #line 333 "/home/jens/Source/shotwell/src/Event.vala"
 		while (TRUE) {
-#line 2789 "Event.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 2794 "Event.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			MediaSource* current_source = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
-			GeeArrayList* _tmp7_ = NULL;
-			MediaSource* _tmp8_ = NULL;
-			ThumbnailView* _tmp9_ = NULL;
-			ThumbnailView* _tmp10_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
+			GeeArrayList* _tmp7_;
+			MediaSource* _tmp8_;
+			ThumbnailView* _tmp9_;
+			ThumbnailView* _tmp10_;
 #line 333 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp3_ = _current_source_it;
 #line 333 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2803,7 +2808,7 @@ void event_attach_many (Event* self, GeeCollection* media) {
 			if (!_tmp4_) {
 #line 333 "/home/jens/Source/shotwell/src/Event.vala"
 				break;
-#line 2807 "Event.c"
+#line 2812 "Event.c"
 			}
 #line 333 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp5_ = _current_source_it;
@@ -2825,11 +2830,11 @@ void event_attach_many (Event* self, GeeCollection* media) {
 			_g_object_unref0 (_tmp10_);
 #line 333 "/home/jens/Source/shotwell/src/Event.vala"
 			_g_object_unref0 (current_source);
-#line 2829 "Event.c"
+#line 2834 "Event.c"
 		}
 #line 333 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_object_unref0 (_current_source_it);
-#line 2833 "Event.c"
+#line 2838 "Event.c"
 	}
 #line 336 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp11_ = self->priv->view;
@@ -2843,19 +2848,19 @@ void event_attach_many (Event* self, GeeCollection* media) {
 	_g_object_unref0 (_tmp14_);
 #line 331 "/home/jens/Source/shotwell/src/Event.vala"
 	_g_object_unref0 (views);
-#line 2847 "Event.c"
+#line 2852 "Event.c"
 }
 
 
 void event_detach (Event* self, MediaSource* source) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	MediaSource* _tmp3_ = NULL;
-	DataView* _tmp4_ = NULL;
-	DataView* _tmp5_ = NULL;
-	Marker* _tmp6_ = NULL;
-	Marker* _tmp7_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	MediaSource* _tmp3_;
+	DataView* _tmp4_;
+	DataView* _tmp5_;
+	Marker* _tmp6_;
+	Marker* _tmp7_;
 #line 342 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (IS_EVENT (self));
 #line 342 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2882,18 +2887,18 @@ void event_detach (Event* self, MediaSource* source) {
 	_g_object_unref0 (_tmp7_);
 #line 343 "/home/jens/Source/shotwell/src/Event.vala"
 	_g_object_unref0 (_tmp5_);
-#line 2886 "Event.c"
+#line 2891 "Event.c"
 }
 
 
 void event_detach_many (Event* self, GeeCollection* media) {
 	GeeArrayList* views = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	ViewCollection* _tmp13_ = NULL;
-	ViewCollection* _tmp14_ = NULL;
-	GeeArrayList* _tmp15_ = NULL;
-	Marker* _tmp16_ = NULL;
-	Marker* _tmp17_ = NULL;
+	GeeArrayList* _tmp0_;
+	ViewCollection* _tmp13_;
+	ViewCollection* _tmp14_;
+	GeeArrayList* _tmp15_;
+	Marker* _tmp16_;
+	Marker* _tmp17_;
 #line 346 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (IS_EVENT (self));
 #line 346 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2902,11 +2907,11 @@ void event_detach_many (Event* self, GeeCollection* media) {
 	_tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 347 "/home/jens/Source/shotwell/src/Event.vala"
 	views = _tmp0_;
-#line 2906 "Event.c"
+#line 2911 "Event.c"
 	{
 		GeeIterator* _current_source_it = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 348 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp1_ = media;
 #line 348 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2915,17 +2920,17 @@ void event_detach_many (Event* self, GeeCollection* media) {
 		_current_source_it = _tmp2_;
 #line 348 "/home/jens/Source/shotwell/src/Event.vala"
 		while (TRUE) {
-#line 2919 "Event.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 2924 "Event.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			MediaSource* current_source = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
 			ThumbnailView* view = NULL;
-			ViewCollection* _tmp7_ = NULL;
-			MediaSource* _tmp8_ = NULL;
-			DataView* _tmp9_ = NULL;
-			ThumbnailView* _tmp10_ = NULL;
+			ViewCollection* _tmp7_;
+			MediaSource* _tmp8_;
+			DataView* _tmp9_;
+			ThumbnailView* _tmp10_;
 #line 348 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp3_ = _current_source_it;
 #line 348 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2934,7 +2939,7 @@ void event_detach_many (Event* self, GeeCollection* media) {
 			if (!_tmp4_) {
 #line 348 "/home/jens/Source/shotwell/src/Event.vala"
 				break;
-#line 2938 "Event.c"
+#line 2943 "Event.c"
 			}
 #line 348 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp5_ = _current_source_it;
@@ -2954,26 +2959,26 @@ void event_detach_many (Event* self, GeeCollection* media) {
 			_tmp10_ = view;
 #line 350 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_tmp10_ != NULL) {
-#line 2958 "Event.c"
-				GeeArrayList* _tmp11_ = NULL;
-				ThumbnailView* _tmp12_ = NULL;
+#line 2963 "Event.c"
+				GeeArrayList* _tmp11_;
+				ThumbnailView* _tmp12_;
 #line 351 "/home/jens/Source/shotwell/src/Event.vala"
 				_tmp11_ = views;
 #line 351 "/home/jens/Source/shotwell/src/Event.vala"
 				_tmp12_ = view;
 #line 351 "/home/jens/Source/shotwell/src/Event.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp12_);
-#line 2967 "Event.c"
+#line 2972 "Event.c"
 			}
 #line 348 "/home/jens/Source/shotwell/src/Event.vala"
 			_g_object_unref0 (view);
 #line 348 "/home/jens/Source/shotwell/src/Event.vala"
 			_g_object_unref0 (current_source);
-#line 2973 "Event.c"
+#line 2978 "Event.c"
 		}
 #line 348 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_object_unref0 (_current_source_it);
-#line 2977 "Event.c"
+#line 2982 "Event.c"
 	}
 #line 354 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp13_ = self->priv->view;
@@ -2991,7 +2996,7 @@ void event_detach_many (Event* self, GeeCollection* media) {
 	_g_object_unref0 (_tmp17_);
 #line 346 "/home/jens/Source/shotwell/src/Event.vala"
 	_g_object_unref0 (views);
-#line 2995 "Event.c"
+#line 3000 "Event.c"
 }
 
 
@@ -3001,13 +3006,13 @@ gboolean event_contains_media_type (Event* self, const gchar* media_type) {
 	g_return_val_if_fail (IS_EVENT (self), FALSE);
 #line 360 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (media_type != NULL, FALSE);
-#line 3005 "Event.c"
+#line 3010 "Event.c"
 	{
 		GeeIterator* _media_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 361 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp0_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource));
 #line 361 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3022,17 +3027,17 @@ gboolean event_contains_media_type (Event* self, const gchar* media_type) {
 		_media_it = _tmp3_;
 #line 361 "/home/jens/Source/shotwell/src/Event.vala"
 		while (TRUE) {
-#line 3026 "Event.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 3031 "Event.c"
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			MediaSource* media = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
-			MediaSource* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
-			gchar* _tmp10_ = NULL;
-			const gchar* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			MediaSource* _tmp8_;
+			gchar* _tmp9_;
+			gchar* _tmp10_;
+			const gchar* _tmp11_;
+			gboolean _tmp12_;
 #line 361 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp4_ = _media_it;
 #line 361 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3041,7 +3046,7 @@ gboolean event_contains_media_type (Event* self, const gchar* media_type) {
 			if (!_tmp5_) {
 #line 361 "/home/jens/Source/shotwell/src/Event.vala"
 				break;
-#line 3045 "Event.c"
+#line 3050 "Event.c"
 			}
 #line 361 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp6_ = _media_it;
@@ -3071,28 +3076,28 @@ gboolean event_contains_media_type (Event* self, const gchar* media_type) {
 				_g_object_unref0 (_media_it);
 #line 363 "/home/jens/Source/shotwell/src/Event.vala"
 				return result;
-#line 3075 "Event.c"
+#line 3080 "Event.c"
 			}
 #line 361 "/home/jens/Source/shotwell/src/Event.vala"
 			_g_object_unref0 (media);
-#line 3079 "Event.c"
+#line 3084 "Event.c"
 		}
 #line 361 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_object_unref0 (_media_it);
-#line 3083 "Event.c"
+#line 3088 "Event.c"
 	}
 #line 366 "/home/jens/Source/shotwell/src/Event.vala"
 	result = FALSE;
 #line 366 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 3089 "Event.c"
+#line 3094 "Event.c"
 }
 
 
 static GeeArrayList* event_views_to_media (Event* self, GeeIterable* views) {
 	GeeArrayList* result = NULL;
 	GeeArrayList* media = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 #line 369 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_EVENT (self), NULL);
 #line 369 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3101,11 +3106,11 @@ static GeeArrayList* event_views_to_media (Event* self, GeeIterable* views) {
 	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 370 "/home/jens/Source/shotwell/src/Event.vala"
 	media = _tmp0_;
-#line 3105 "Event.c"
+#line 3110 "Event.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeIterable* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 371 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp1_ = views;
 #line 371 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3114,16 +3119,16 @@ static GeeArrayList* event_views_to_media (Event* self, GeeIterable* views) {
 		_object_it = _tmp2_;
 #line 371 "/home/jens/Source/shotwell/src/Event.vala"
 		while (TRUE) {
-#line 3118 "Event.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 3123 "Event.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
-			GeeArrayList* _tmp7_ = NULL;
-			DataObject* _tmp8_ = NULL;
-			DataSource* _tmp9_ = NULL;
-			MediaSource* _tmp10_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
+			GeeArrayList* _tmp7_;
+			DataObject* _tmp8_;
+			DataSource* _tmp9_;
+			MediaSource* _tmp10_;
 #line 371 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp3_ = _object_it;
 #line 371 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3132,7 +3137,7 @@ static GeeArrayList* event_views_to_media (Event* self, GeeIterable* views) {
 			if (!_tmp4_) {
 #line 371 "/home/jens/Source/shotwell/src/Event.vala"
 				break;
-#line 3136 "Event.c"
+#line 3141 "Event.c"
 			}
 #line 371 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp5_ = _object_it;
@@ -3154,30 +3159,30 @@ static GeeArrayList* event_views_to_media (Event* self, GeeIterable* views) {
 			_g_object_unref0 (_tmp10_);
 #line 371 "/home/jens/Source/shotwell/src/Event.vala"
 			_g_object_unref0 (object);
-#line 3158 "Event.c"
+#line 3163 "Event.c"
 		}
 #line 371 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_object_unref0 (_object_it);
-#line 3162 "Event.c"
+#line 3167 "Event.c"
 	}
 #line 374 "/home/jens/Source/shotwell/src/Event.vala"
 	result = media;
 #line 374 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 3168 "Event.c"
+#line 3173 "Event.c"
 }
 
 
 static void event_on_media_added (Event* self, GeeIterable* added) {
 	GeeCollection* media = NULL;
-	GeeIterable* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	EventSourceCollection* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	EventSourceCollection* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	Alteration* _tmp6_ = NULL;
-	Alteration* _tmp7_ = NULL;
+	GeeIterable* _tmp0_;
+	GeeArrayList* _tmp1_;
+	EventSourceCollection* _tmp2_;
+	gboolean _tmp3_;
+	EventSourceCollection* _tmp4_;
+	gboolean _tmp5_;
+	Alteration* _tmp6_;
+	Alteration* _tmp7_;
 #line 377 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (IS_EVENT (self));
 #line 377 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3210,23 +3215,23 @@ static void event_on_media_added (Event* self, GeeIterable* added) {
 	_alteration_unref0 (_tmp7_);
 #line 377 "/home/jens/Source/shotwell/src/Event.vala"
 	_g_object_unref0 (media);
-#line 3214 "Event.c"
+#line 3219 "Event.c"
 }
 
 
 static void event_on_media_removed (Event* self, GeeIterable* removed) {
 	GeeArrayList* media = NULL;
-	GeeIterable* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	EventSourceCollection* _tmp2_ = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	EventSourceCollection* _tmp5_ = NULL;
-	GeeArrayList* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	gint _tmp27_ = 0;
-	Alteration* _tmp29_ = NULL;
-	Alteration* _tmp30_ = NULL;
+	GeeIterable* _tmp0_;
+	GeeArrayList* _tmp1_;
+	EventSourceCollection* _tmp2_;
+	GeeArrayList* _tmp3_;
+	gboolean _tmp4_;
+	EventSourceCollection* _tmp5_;
+	GeeArrayList* _tmp6_;
+	gboolean _tmp7_;
+	gint _tmp27_;
+	Alteration* _tmp29_;
+	Alteration* _tmp30_;
 #line 386 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (IS_EVENT (self));
 #line 386 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3253,15 +3258,15 @@ static void event_on_media_removed (Event* self, GeeIterable* removed) {
 	_tmp7_ = self->priv->unlinking;
 #line 390 "/home/jens/Source/shotwell/src/Event.vala"
 	container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), NULL, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), _tmp7_);
-#line 3257 "Event.c"
+#line 3262 "Event.c"
 	{
 		GeeArrayList* _current_source_list = NULL;
-		GeeArrayList* _tmp8_ = NULL;
-		GeeArrayList* _tmp9_ = NULL;
+		GeeArrayList* _tmp8_;
+		GeeArrayList* _tmp9_;
 		gint _current_source_size = 0;
-		GeeArrayList* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
+		GeeArrayList* _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
 		gint _current_source_index = 0;
 #line 393 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp8_ = media;
@@ -3281,16 +3286,16 @@ static void event_on_media_removed (Event* self, GeeIterable* removed) {
 		_current_source_index = -1;
 #line 393 "/home/jens/Source/shotwell/src/Event.vala"
 		while (TRUE) {
-#line 3285 "Event.c"
-			gint _tmp13_ = 0;
-			gint _tmp14_ = 0;
-			gint _tmp15_ = 0;
+#line 3290 "Event.c"
+			gint _tmp13_;
+			gint _tmp14_;
+			gint _tmp15_;
 			MediaSource* current_source = NULL;
-			GeeArrayList* _tmp16_ = NULL;
-			gint _tmp17_ = 0;
-			gpointer _tmp18_ = NULL;
-			MediaSource* _tmp19_ = NULL;
-			MediaSource* _tmp20_ = NULL;
+			GeeArrayList* _tmp16_;
+			gint _tmp17_;
+			gpointer _tmp18_;
+			MediaSource* _tmp19_;
+			MediaSource* _tmp20_;
 #line 393 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp13_ = _current_source_index;
 #line 393 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3303,7 +3308,7 @@ static void event_on_media_removed (Event* self, GeeIterable* removed) {
 			if (!(_tmp14_ < _tmp15_)) {
 #line 393 "/home/jens/Source/shotwell/src/Event.vala"
 				break;
-#line 3307 "Event.c"
+#line 3312 "Event.c"
 			}
 #line 393 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp16_ = _current_source_list;
@@ -3319,18 +3324,18 @@ static void event_on_media_removed (Event* self, GeeIterable* removed) {
 			_tmp20_ = self->priv->primary_source;
 #line 394 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_tmp19_ == _tmp20_) {
-#line 3323 "Event.c"
-				gint _tmp21_ = 0;
+#line 3328 "Event.c"
+				gint _tmp21_;
 #line 395 "/home/jens/Source/shotwell/src/Event.vala"
 				_tmp21_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource));
 #line 395 "/home/jens/Source/shotwell/src/Event.vala"
 				if (_tmp21_ > 0) {
-#line 3329 "Event.c"
-					ViewCollection* _tmp22_ = NULL;
-					DataView* _tmp23_ = NULL;
-					DataView* _tmp24_ = NULL;
-					DataSource* _tmp25_ = NULL;
-					MediaSource* _tmp26_ = NULL;
+#line 3334 "Event.c"
+					ViewCollection* _tmp22_;
+					DataView* _tmp23_;
+					DataView* _tmp24_;
+					DataSource* _tmp25_;
+					MediaSource* _tmp26_;
 #line 396 "/home/jens/Source/shotwell/src/Event.vala"
 					_tmp22_ = self->priv->view;
 #line 396 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3347,32 +3352,32 @@ static void event_on_media_removed (Event* self, GeeIterable* removed) {
 					_g_object_unref0 (_tmp26_);
 #line 396 "/home/jens/Source/shotwell/src/Event.vala"
 					_g_object_unref0 (_tmp24_);
-#line 3351 "Event.c"
+#line 3356 "Event.c"
 				} else {
 #line 398 "/home/jens/Source/shotwell/src/Event.vala"
 					event_release_primary_source (self);
-#line 3355 "Event.c"
+#line 3360 "Event.c"
 				}
 #line 400 "/home/jens/Source/shotwell/src/Event.vala"
 				_g_object_unref0 (current_source);
 #line 400 "/home/jens/Source/shotwell/src/Event.vala"
 				break;
-#line 3361 "Event.c"
+#line 3366 "Event.c"
 			}
 #line 393 "/home/jens/Source/shotwell/src/Event.vala"
 			_g_object_unref0 (current_source);
-#line 3365 "Event.c"
+#line 3370 "Event.c"
 		}
 #line 393 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_object_unref0 (_current_source_list);
-#line 3369 "Event.c"
+#line 3374 "Event.c"
 	}
 #line 405 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp27_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource));
 #line 405 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp27_ == 0) {
-#line 3375 "Event.c"
-		EventSourceCollection* _tmp28_ = NULL;
+#line 3380 "Event.c"
+		EventSourceCollection* _tmp28_;
 #line 406 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp28_ = event_global;
 #line 406 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3381,7 +3386,7 @@ static void event_on_media_removed (Event* self, GeeIterable* removed) {
 		_g_object_unref0 (media);
 #line 410 "/home/jens/Source/shotwell/src/Event.vala"
 		return;
-#line 3385 "Event.c"
+#line 3390 "Event.c"
 	}
 #line 413 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp29_ = alteration_new_from_list ("contents:removed, metadata:time");
@@ -3393,16 +3398,16 @@ static void event_on_media_removed (Event* self, GeeIterable* removed) {
 	_alteration_unref0 (_tmp30_);
 #line 386 "/home/jens/Source/shotwell/src/Event.vala"
 	_g_object_unref0 (media);
-#line 3397 "Event.c"
+#line 3402 "Event.c"
 }
 
 
 static void event_on_media_destroyed (Event* self, DataSource* source) {
 	ThumbnailView* thumbnail_view = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	DataView* _tmp2_ = NULL;
-	ThumbnailView* _tmp3_ = NULL;
+	ViewCollection* _tmp0_;
+	DataSource* _tmp1_;
+	DataView* _tmp2_;
+	ThumbnailView* _tmp3_;
 #line 416 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (IS_EVENT (self));
 #line 416 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3419,12 +3424,12 @@ static void event_on_media_destroyed (Event* self, DataSource* source) {
 	_tmp3_ = thumbnail_view;
 #line 418 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp3_ != NULL) {
-#line 3423 "Event.c"
-		ViewCollection* _tmp4_ = NULL;
-		ViewCollection* _tmp5_ = NULL;
-		ThumbnailView* _tmp6_ = NULL;
-		Marker* _tmp7_ = NULL;
-		Marker* _tmp8_ = NULL;
+#line 3428 "Event.c"
+		ViewCollection* _tmp4_;
+		ViewCollection* _tmp5_;
+		ThumbnailView* _tmp6_;
+		Marker* _tmp7_;
+		Marker* _tmp8_;
 #line 419 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp4_ = self->priv->view;
 #line 419 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3439,19 +3444,19 @@ static void event_on_media_destroyed (Event* self, DataSource* source) {
 		data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), _tmp8_);
 #line 419 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_object_unref0 (_tmp8_);
-#line 3443 "Event.c"
+#line 3448 "Event.c"
 	}
 #line 416 "/home/jens/Source/shotwell/src/Event.vala"
 	_g_object_unref0 (thumbnail_view);
-#line 3447 "Event.c"
+#line 3452 "Event.c"
 }
 
 
 static void event_real_notify_relinking (DataSource* base, SourceCollection* sources) {
 	Event * self;
-	gint _tmp0_ = 0;
-	MediaSource* _tmp1_ = NULL;
-	SourceCollection* _tmp7_ = NULL;
+	gint _tmp0_;
+	MediaSource* _tmp1_;
+	SourceCollection* _tmp7_;
 #line 422 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 422 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3464,12 +3469,12 @@ static void event_real_notify_relinking (DataSource* base, SourceCollection* sou
 	_tmp1_ = self->priv->primary_source;
 #line 426 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp1_ == NULL) {
-#line 3468 "Event.c"
-		ViewCollection* _tmp2_ = NULL;
-		DataView* _tmp3_ = NULL;
-		DataView* _tmp4_ = NULL;
-		DataSource* _tmp5_ = NULL;
-		MediaSource* _tmp6_ = NULL;
+#line 3473 "Event.c"
+		ViewCollection* _tmp2_;
+		DataView* _tmp3_;
+		DataView* _tmp4_;
+		DataSource* _tmp5_;
+		MediaSource* _tmp6_;
 #line 427 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp2_ = self->priv->view;
 #line 427 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3486,13 +3491,13 @@ static void event_real_notify_relinking (DataSource* base, SourceCollection* sou
 		_g_object_unref0 (_tmp6_);
 #line 427 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_object_unref0 (_tmp4_);
-#line 3490 "Event.c"
+#line 3495 "Event.c"
 	}
 #line 429 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp7_ = sources;
 #line 429 "/home/jens/Source/shotwell/src/Event.vala"
 	DATA_SOURCE_CLASS (event_parent_class)->notify_relinking (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource), TYPE_DATA_SOURCE, DataSource), _tmp7_);
-#line 3496 "Event.c"
+#line 3501 "Event.c"
 }
 
 
@@ -3507,22 +3512,22 @@ static void event_real_notify_relinking (DataSource* base, SourceCollection* sou
      */
 static void event_on_media_altered (Event* self, GeeMap* items) {
 	gboolean should_remake_thumb = FALSE;
-	gboolean _tmp21_ = FALSE;
+	gboolean _tmp21_;
 #line 441 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (IS_EVENT (self));
 #line 441 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (GEE_IS_MAP (items));
 #line 442 "/home/jens/Source/shotwell/src/Event.vala"
 	should_remake_thumb = FALSE;
-#line 3518 "Event.c"
+#line 3523 "Event.c"
 	{
 		GeeIterator* _alteration_it = NULL;
-		GeeMap* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMap* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 444 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp0_ = items;
 #line 444 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3541,16 +3546,16 @@ static void event_on_media_altered (Event* self, GeeMap* items) {
 		_alteration_it = _tmp5_;
 #line 444 "/home/jens/Source/shotwell/src/Event.vala"
 		while (TRUE) {
-#line 3545 "Event.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 3550 "Event.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			Alteration* alteration = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			Alteration* _tmp10_ = NULL;
-			gboolean _tmp11_ = FALSE;
-			Alteration* _tmp19_ = NULL;
-			gboolean _tmp20_ = FALSE;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			Alteration* _tmp10_;
+			gboolean _tmp11_;
+			Alteration* _tmp19_;
+			gboolean _tmp20_;
 #line 444 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp6_ = _alteration_it;
 #line 444 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3559,7 +3564,7 @@ static void event_on_media_altered (Event* self, GeeMap* items) {
 			if (!_tmp7_) {
 #line 444 "/home/jens/Source/shotwell/src/Event.vala"
 				break;
-#line 3563 "Event.c"
+#line 3568 "Event.c"
 			}
 #line 444 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp8_ = _alteration_it;
@@ -3573,13 +3578,13 @@ static void event_on_media_altered (Event* self, GeeMap* items) {
 			_tmp11_ = alteration_has_detail (_tmp10_, "metadata", "exposure-time");
 #line 445 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_tmp11_) {
-#line 3577 "Event.c"
+#line 3582 "Event.c"
 				gchar* alt_list = NULL;
-				gchar* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
-				const gchar* _tmp16_ = NULL;
-				Alteration* _tmp17_ = NULL;
-				Alteration* _tmp18_ = NULL;
+				gchar* _tmp12_;
+				gboolean _tmp13_;
+				const gchar* _tmp16_;
+				Alteration* _tmp17_;
+				Alteration* _tmp18_;
 #line 447 "/home/jens/Source/shotwell/src/Event.vala"
 				_tmp12_ = g_strdup ("metadata:time");
 #line 447 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3588,9 +3593,9 @@ static void event_on_media_altered (Event* self, GeeMap* items) {
 				_tmp13_ = event_has_name (self);
 #line 449 "/home/jens/Source/shotwell/src/Event.vala"
 				if (!_tmp13_) {
-#line 3592 "Event.c"
-					const gchar* _tmp14_ = NULL;
-					gchar* _tmp15_ = NULL;
+#line 3597 "Event.c"
+					const gchar* _tmp14_;
+					gchar* _tmp15_;
 #line 450 "/home/jens/Source/shotwell/src/Event.vala"
 					_tmp14_ = alt_list;
 #line 450 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3599,7 +3604,7 @@ static void event_on_media_altered (Event* self, GeeMap* items) {
 					_g_free0 (alt_list);
 #line 450 "/home/jens/Source/shotwell/src/Event.vala"
 					alt_list = _tmp15_;
-#line 3603 "Event.c"
+#line 3608 "Event.c"
 				}
 #line 452 "/home/jens/Source/shotwell/src/Event.vala"
 				_tmp16_ = alt_list;
@@ -3617,7 +3622,7 @@ static void event_on_media_altered (Event* self, GeeMap* items) {
 				_alteration_unref0 (alteration);
 #line 454 "/home/jens/Source/shotwell/src/Event.vala"
 				break;
-#line 3621 "Event.c"
+#line 3626 "Event.c"
 			}
 #line 457 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp19_ = alteration;
@@ -3627,25 +3632,25 @@ static void event_on_media_altered (Event* self, GeeMap* items) {
 			if (_tmp20_) {
 #line 458 "/home/jens/Source/shotwell/src/Event.vala"
 				should_remake_thumb = TRUE;
-#line 3631 "Event.c"
+#line 3636 "Event.c"
 			}
 #line 444 "/home/jens/Source/shotwell/src/Event.vala"
 			_alteration_unref0 (alteration);
-#line 3635 "Event.c"
+#line 3640 "Event.c"
 		}
 #line 444 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_object_unref0 (_alteration_it);
-#line 3639 "Event.c"
+#line 3644 "Event.c"
 	}
 #line 461 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp21_ = should_remake_thumb;
 #line 461 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp21_) {
-#line 3645 "Event.c"
+#line 3650 "Event.c"
 		gboolean _tmp22_ = FALSE;
-		MediaSource* _tmp23_ = NULL;
-		MediaSource* _tmp24_ = NULL;
-		gboolean _tmp25_ = FALSE;
+		MediaSource* _tmp23_;
+		MediaSource* _tmp24_;
+		gboolean _tmp25_;
 #line 463 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp23_ = event_get_primary_source (self);
 #line 463 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3658,11 +3663,11 @@ static void event_on_media_altered (Event* self, GeeMap* items) {
 		if (_tmp25_) {
 #line 463 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp22_ = TRUE;
-#line 3662 "Event.c"
+#line 3667 "Event.c"
 		} else {
-			MediaSource* _tmp26_ = NULL;
-			MediaSource* _tmp27_ = NULL;
-			Rating _tmp28_ = 0;
+			MediaSource* _tmp26_;
+			MediaSource* _tmp27_;
+			Rating _tmp28_;
 #line 463 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp26_ = event_get_primary_source (self);
 #line 463 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3673,16 +3678,16 @@ static void event_on_media_altered (Event* self, GeeMap* items) {
 			_tmp22_ = _tmp28_ == RATING_REJECTED;
 #line 463 "/home/jens/Source/shotwell/src/Event.vala"
 			_g_object_unref0 (_tmp27_);
-#line 3677 "Event.c"
+#line 3682 "Event.c"
 		}
 #line 463 "/home/jens/Source/shotwell/src/Event.vala"
 		if (_tmp22_) {
-#line 3681 "Event.c"
-			ViewCollection* _tmp29_ = NULL;
-			DataView* _tmp30_ = NULL;
-			DataView* _tmp31_ = NULL;
-			DataSource* _tmp32_ = NULL;
-			MediaSource* _tmp33_ = NULL;
+#line 3686 "Event.c"
+			ViewCollection* _tmp29_;
+			DataView* _tmp30_;
+			DataView* _tmp31_;
+			DataSource* _tmp32_;
+			MediaSource* _tmp33_;
 #line 465 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp29_ = self->priv->view;
 #line 465 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3699,7 +3704,7 @@ static void event_on_media_altered (Event* self, GeeMap* items) {
 			_g_object_unref0 (_tmp33_);
 #line 465 "/home/jens/Source/shotwell/src/Event.vala"
 			_g_object_unref0 (_tmp31_);
-#line 3703 "Event.c"
+#line 3708 "Event.c"
 		}
 	}
 }
@@ -3710,23 +3715,23 @@ Event* event_create_empty_event (MediaSource* source) {
 	GError * _inner_error_ = NULL;
 #line 474 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
-#line 3714 "Event.c"
+#line 3719 "Event.c"
 	{
 		EventRow* _tmp0_ = NULL;
-		EventTable* _tmp1_ = NULL;
-		EventTable* _tmp2_ = NULL;
-		MediaSource* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		EventRow* _tmp6_ = NULL;
-		EventRow* _tmp7_ = NULL;
+		EventTable* _tmp1_;
+		EventTable* _tmp2_;
+		MediaSource* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		EventRow* _tmp6_;
+		EventRow* _tmp7_;
 		Event* event = NULL;
-		Event* _tmp8_ = NULL;
-		EventSourceCollection* _tmp9_ = NULL;
-		Event* _tmp10_ = NULL;
-		Event* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
+		Event* _tmp8_;
+		EventSourceCollection* _tmp9_;
+		Event* _tmp10_;
+		Event* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
 #line 476 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp1_ = event_table_get_instance ();
 #line 476 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3751,8 +3756,8 @@ Event* event_create_empty_event (MediaSource* source) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 476 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3755 "Event.c"
-				goto __catch435_database_error;
+#line 3760 "Event.c"
+				goto __catch436_database_error;
 			}
 #line 476 "/home/jens/Source/shotwell/src/Event.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3760,7 +3765,7 @@ Event* event_create_empty_event (MediaSource* source) {
 			g_clear_error (&_inner_error_);
 #line 476 "/home/jens/Source/shotwell/src/Event.vala"
 			return NULL;
-#line 3764 "Event.c"
+#line 3769 "Event.c"
 		}
 #line 476 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp8_ = event_new (_tmp0_, DATA_OBJECT_INVALID_OBJECT_ID);
@@ -3788,13 +3793,13 @@ Event* event_create_empty_event (MediaSource* source) {
 		_event_row_unref0 (_tmp0_);
 #line 481 "/home/jens/Source/shotwell/src/Event.vala"
 		return result;
-#line 3792 "Event.c"
+#line 3797 "Event.c"
 	}
-	goto __finally435;
-	__catch435_database_error:
+	goto __finally436;
+	__catch436_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp14_ = NULL;
+		GError* _tmp14_;
 #line 475 "/home/jens/Source/shotwell/src/Event.vala"
 		err = _inner_error_;
 #line 475 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3809,35 +3814,35 @@ Event* event_create_empty_event (MediaSource* source) {
 		_g_error_free0 (err);
 #line 485 "/home/jens/Source/shotwell/src/Event.vala"
 		return result;
-#line 3813 "Event.c"
+#line 3818 "Event.c"
 	}
-	__finally435:
+	__finally436:
 #line 475 "/home/jens/Source/shotwell/src/Event.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 475 "/home/jens/Source/shotwell/src/Event.vala"
 	g_clear_error (&_inner_error_);
 #line 475 "/home/jens/Source/shotwell/src/Event.vala"
 	return NULL;
-#line 3822 "Event.c"
+#line 3827 "Event.c"
 }
 
 
 static Event* event_reconstitute (gint64 object_id, EventRow* row) {
 	Event* result = NULL;
-	EventRow* _tmp0_ = NULL;
-	EventTable* _tmp1_ = NULL;
-	EventTable* _tmp2_ = NULL;
-	EventRow* _tmp3_ = NULL;
+	EventRow* _tmp0_;
+	EventTable* _tmp1_;
+	EventTable* _tmp2_;
+	EventRow* _tmp3_;
 	EventID _tmp4_ = {0};
 	Event* event = NULL;
-	EventRow* _tmp5_ = NULL;
-	gint64 _tmp6_ = 0LL;
-	Event* _tmp7_ = NULL;
-	EventSourceCollection* _tmp8_ = NULL;
-	EventSourceCollection* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
+	EventRow* _tmp5_;
+	gint64 _tmp6_;
+	Event* _tmp7_;
+	EventSourceCollection* _tmp8_;
+	EventSourceCollection* _tmp9_;
+	gboolean _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
 #line 490 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_EVENT_ROW (row), NULL);
 #line 491 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3884,7 +3889,7 @@ static Event* event_reconstitute (gint64 object_id, EventRow* row) {
 	result = event;
 #line 498 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 3888 "Event.c"
+#line 3893 "Event.c"
 }
 
 
@@ -3892,11 +3897,11 @@ static gboolean event_real_has_links (ContainerSource* base) {
 	Event * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	LibraryPhotoSourceCollection* _tmp1_ = NULL;
-	SourceBacklink* _tmp2_ = NULL;
-	SourceBacklink* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	LibraryPhotoSourceCollection* _tmp1_;
+	SourceBacklink* _tmp2_;
+	SourceBacklink* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
 #line 501 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 502 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3915,12 +3920,12 @@ static gboolean event_real_has_links (ContainerSource* base) {
 	if (_tmp5_) {
 #line 502 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp0_ = TRUE;
-#line 3919 "Event.c"
+#line 3924 "Event.c"
 	} else {
-		VideoSourceCollection* _tmp6_ = NULL;
-		SourceBacklink* _tmp7_ = NULL;
-		SourceBacklink* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
+		VideoSourceCollection* _tmp6_;
+		SourceBacklink* _tmp7_;
+		SourceBacklink* _tmp8_;
+		gboolean _tmp9_;
 #line 503 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp6_ = video_global;
 #line 503 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3933,20 +3938,20 @@ static gboolean event_real_has_links (ContainerSource* base) {
 		_tmp0_ = _tmp9_;
 #line 503 "/home/jens/Source/shotwell/src/Event.vala"
 		_source_backlink_unref0 (_tmp8_);
-#line 3937 "Event.c"
+#line 3942 "Event.c"
 	}
 #line 502 "/home/jens/Source/shotwell/src/Event.vala"
 	result = _tmp0_;
 #line 502 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 3943 "Event.c"
+#line 3948 "Event.c"
 }
 
 
 static SourceBacklink* event_real_get_backlink (ContainerSource* base) {
 	Event * self;
 	SourceBacklink* result = NULL;
-	SourceBacklink* _tmp0_ = NULL;
+	SourceBacklink* _tmp0_;
 #line 506 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 507 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3955,13 +3960,13 @@ static SourceBacklink* event_real_get_backlink (ContainerSource* base) {
 	result = _tmp0_;
 #line 507 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 3959 "Event.c"
+#line 3964 "Event.c"
 }
 
 
 static void event_real_break_link (ContainerSource* base, DataSource* source) {
 	Event * self;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 510 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 510 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3974,17 +3979,17 @@ static void event_real_break_link (ContainerSource* base, DataSource* source) {
 	media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), NULL);
 #line 515 "/home/jens/Source/shotwell/src/Event.vala"
 	self->priv->unlinking = FALSE;
-#line 3978 "Event.c"
+#line 3983 "Event.c"
 }
 
 
 static void event_real_break_link_many (ContainerSource* base, GeeCollection* sources) {
 	Event * self;
 	GeeArrayList* photos = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 	GeeArrayList* videos = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
+	GeeArrayList* _tmp1_;
+	GeeCollection* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 518 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
@@ -4004,11 +4009,11 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 	_tmp2_ = sources;
 #line 523 "/home/jens/Source/shotwell/src/Event.vala"
 	media_source_collection_filter_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection));
-#line 4008 "Event.c"
+#line 4013 "Event.c"
 	{
-		LibraryPhotoSourceCollection* _tmp3_ = NULL;
-		TransactionController* _tmp4_ = NULL;
-		TransactionController* _tmp5_ = NULL;
+		LibraryPhotoSourceCollection* _tmp3_;
+		TransactionController* _tmp4_;
+		TransactionController* _tmp5_;
 #line 526 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp3_ = library_photo_global;
 #line 526 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4019,18 +4024,18 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 		media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), NULL, _tmp5_, &_inner_error_);
 #line 526 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4023 "Event.c"
-			goto __catch436_g_error;
+#line 4028 "Event.c"
+			goto __catch437_g_error;
 		}
 	}
-	goto __finally436;
-	__catch436_g_error:
+	goto __finally437;
+	__catch437_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+		GError* _tmp6_;
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 525 "/home/jens/Source/shotwell/src/Event.vala"
 		err = _inner_error_;
 #line 525 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4049,9 +4054,9 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 		_g_free0 (_tmp9_);
 #line 525 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_error_free0 (err);
-#line 4053 "Event.c"
+#line 4058 "Event.c"
 	}
-	__finally436:
+	__finally437:
 #line 525 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 525 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4064,12 +4069,12 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 		g_clear_error (&_inner_error_);
 #line 525 "/home/jens/Source/shotwell/src/Event.vala"
 		return;
-#line 4068 "Event.c"
+#line 4073 "Event.c"
 	}
 	{
-		VideoSourceCollection* _tmp10_ = NULL;
-		TransactionController* _tmp11_ = NULL;
-		TransactionController* _tmp12_ = NULL;
+		VideoSourceCollection* _tmp10_;
+		TransactionController* _tmp11_;
+		TransactionController* _tmp12_;
 #line 532 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp10_ = video_global;
 #line 532 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4080,18 +4085,18 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 		media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection), NULL, _tmp12_, &_inner_error_);
 #line 532 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4084 "Event.c"
-			goto __catch437_g_error;
+#line 4089 "Event.c"
+			goto __catch438_g_error;
 		}
 	}
-	goto __finally437;
-	__catch437_g_error:
+	goto __finally438;
+	__catch438_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
+		GError* _tmp13_;
+		const gchar* _tmp14_;
+		gchar* _tmp15_;
+		gchar* _tmp16_;
 #line 531 "/home/jens/Source/shotwell/src/Event.vala"
 		err = _inner_error_;
 #line 531 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4110,9 +4115,9 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 		_g_free0 (_tmp16_);
 #line 531 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_error_free0 (err);
-#line 4114 "Event.c"
+#line 4119 "Event.c"
 	}
-	__finally437:
+	__finally438:
 #line 531 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 531 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4125,7 +4130,7 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 		g_clear_error (&_inner_error_);
 #line 531 "/home/jens/Source/shotwell/src/Event.vala"
 		return;
-#line 4129 "Event.c"
+#line 4134 "Event.c"
 	}
 #line 537 "/home/jens/Source/shotwell/src/Event.vala"
 	self->priv->unlinking = FALSE;
@@ -4133,13 +4138,13 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 	_g_object_unref0 (videos);
 #line 518 "/home/jens/Source/shotwell/src/Event.vala"
 	_g_object_unref0 (photos);
-#line 4137 "Event.c"
+#line 4142 "Event.c"
 }
 
 
 static void event_real_establish_link (ContainerSource* base, DataSource* source) {
 	Event * self;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 540 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 540 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4152,17 +4157,17 @@ static void event_real_establish_link (ContainerSource* base, DataSource* source
 	media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), self);
 #line 545 "/home/jens/Source/shotwell/src/Event.vala"
 	self->priv->relinking = FALSE;
-#line 4156 "Event.c"
+#line 4161 "Event.c"
 }
 
 
 static void event_real_establish_link_many (ContainerSource* base, GeeCollection* sources) {
 	Event * self;
 	GeeArrayList* photos = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 	GeeArrayList* videos = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
+	GeeArrayList* _tmp1_;
+	GeeCollection* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 548 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
@@ -4182,11 +4187,11 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 	_tmp2_ = sources;
 #line 553 "/home/jens/Source/shotwell/src/Event.vala"
 	media_source_collection_filter_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection));
-#line 4186 "Event.c"
+#line 4191 "Event.c"
 	{
-		LibraryPhotoSourceCollection* _tmp3_ = NULL;
-		TransactionController* _tmp4_ = NULL;
-		TransactionController* _tmp5_ = NULL;
+		LibraryPhotoSourceCollection* _tmp3_;
+		TransactionController* _tmp4_;
+		TransactionController* _tmp5_;
 #line 556 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp3_ = library_photo_global;
 #line 556 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4197,18 +4202,18 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 		media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), self, _tmp5_, &_inner_error_);
 #line 556 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4201 "Event.c"
-			goto __catch438_g_error;
+#line 4206 "Event.c"
+			goto __catch439_g_error;
 		}
 	}
-	goto __finally438;
-	__catch438_g_error:
+	goto __finally439;
+	__catch439_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+		GError* _tmp6_;
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 555 "/home/jens/Source/shotwell/src/Event.vala"
 		err = _inner_error_;
 #line 555 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4227,9 +4232,9 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 		_g_free0 (_tmp9_);
 #line 555 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_error_free0 (err);
-#line 4231 "Event.c"
+#line 4236 "Event.c"
 	}
-	__finally438:
+	__finally439:
 #line 555 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 555 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4242,12 +4247,12 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 		g_clear_error (&_inner_error_);
 #line 555 "/home/jens/Source/shotwell/src/Event.vala"
 		return;
-#line 4246 "Event.c"
+#line 4251 "Event.c"
 	}
 	{
-		VideoSourceCollection* _tmp10_ = NULL;
-		TransactionController* _tmp11_ = NULL;
-		TransactionController* _tmp12_ = NULL;
+		VideoSourceCollection* _tmp10_;
+		TransactionController* _tmp11_;
+		TransactionController* _tmp12_;
 #line 562 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp10_ = video_global;
 #line 562 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4258,18 +4263,18 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 		media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection), self, _tmp12_, &_inner_error_);
 #line 562 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4262 "Event.c"
-			goto __catch439_g_error;
+#line 4267 "Event.c"
+			goto __catch440_g_error;
 		}
 	}
-	goto __finally439;
-	__catch439_g_error:
+	goto __finally440;
+	__catch440_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
+		GError* _tmp13_;
+		const gchar* _tmp14_;
+		gchar* _tmp15_;
+		gchar* _tmp16_;
 #line 561 "/home/jens/Source/shotwell/src/Event.vala"
 		err = _inner_error_;
 #line 561 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4288,9 +4293,9 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 		_g_free0 (_tmp16_);
 #line 561 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_error_free0 (err);
-#line 4292 "Event.c"
+#line 4297 "Event.c"
 	}
-	__finally439:
+	__finally440:
 #line 561 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 561 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4303,7 +4308,7 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 		g_clear_error (&_inner_error_);
 #line 561 "/home/jens/Source/shotwell/src/Event.vala"
 		return;
-#line 4307 "Event.c"
+#line 4312 "Event.c"
 	}
 #line 567 "/home/jens/Source/shotwell/src/Event.vala"
 	self->priv->relinking = FALSE;
@@ -4311,433 +4316,433 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 	_g_object_unref0 (videos);
 #line 548 "/home/jens/Source/shotwell/src/Event.vala"
 	_g_object_unref0 (photos);
-#line 4315 "Event.c"
+#line 4320 "Event.c"
 }
 
 
 static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		separator = "";
-#line 4332 "Event.c"
+#line 4337 "Event.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
-#line 4342 "Event.c"
+#line 4347 "Event.c"
 	} else {
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp4_;
+		gint _tmp4__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
-#line 4352 "Event.c"
+#line 4357 "Event.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 4358 "Event.c"
+#line 4363 "Event.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
-#line 4369 "Event.c"
-			gchar** _tmp7_ = NULL;
-			gint _tmp7__length1 = 0;
-			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 4374 "Event.c"
+			gchar** _tmp7_;
+			gint _tmp7__length1;
+			const gchar* _tmp8_;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
-#line 4381 "Event.c"
+#line 4386 "Event.c"
 		} else {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
-#line 4385 "Event.c"
+#line 4390 "Event.c"
 		}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
-#line 4389 "Event.c"
+#line 4394 "Event.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 4393 "Event.c"
+#line 4398 "Event.c"
 		gint i = 0;
 		gsize len = 0UL;
-		gint _tmp31_ = 0;
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
-		gsize _tmp35_ = 0UL;
-		const gchar* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
-		gint _tmp39_ = 0;
+		gint _tmp31_;
+		gint _tmp33_;
+		gint _tmp34_;
+		gsize _tmp35_;
+		const gchar* _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
+		gint _tmp39_;
 		const gchar* res = NULL;
-		gsize _tmp40_ = 0UL;
-		void* _tmp41_ = NULL;
+		gsize _tmp40_;
+		void* _tmp41_;
 		void* ptr = NULL;
-		const gchar* _tmp42_ = NULL;
-		gchar** _tmp43_ = NULL;
-		gint _tmp43__length1 = 0;
-		const gchar* _tmp44_ = NULL;
-		void* _tmp45_ = NULL;
-		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp42_;
+		gchar** _tmp43_;
+		gint _tmp43__length1;
+		const gchar* _tmp44_;
+		void* _tmp45_;
+		const gchar* _tmp62_;
+#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
-#line 4416 "Event.c"
+#line 4421 "Event.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 4425 "Event.c"
+#line 4430 "Event.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
+				gchar** _tmp13_;
+				gint _tmp13__length1;
 				gint _tmp21_ = 0;
-				gchar** _tmp22_ = NULL;
-				gint _tmp22__length1 = 0;
-				gint _tmp23_ = 0;
-				const gchar* _tmp24_ = NULL;
-				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp22_;
+				gint _tmp22__length1;
+				gint _tmp23_;
+				const gchar* _tmp24_;
+				gsize _tmp30_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
-#line 4438 "Event.c"
-					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 4443 "Event.c"
+					gint _tmp10_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
-#line 4444 "Event.c"
+#line 4449 "Event.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
-#line 4454 "Event.c"
-					gint _tmp14_ = 0;
-					gchar** _tmp15_ = NULL;
-					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 4459 "Event.c"
+					gint _tmp14_;
+					gchar** _tmp15_;
+					gint _tmp15__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 4466 "Event.c"
+#line 4471 "Event.c"
 				} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
-#line 4470 "Event.c"
+#line 4475 "Event.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
-#line 4476 "Event.c"
+#line 4481 "Event.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_ = NULL;
-					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp17_;
+					gint _tmp17__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
-#line 4487 "Event.c"
-						gchar** _tmp18_ = NULL;
-						gint _tmp18__length1 = 0;
-						gint _tmp19_ = 0;
-						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 4492 "Event.c"
+						gchar** _tmp18_;
+						gint _tmp18__length1;
+						gint _tmp19_;
+						const gchar* _tmp20_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
-#line 4502 "Event.c"
+#line 4507 "Event.c"
 					} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
-#line 4506 "Event.c"
+#line 4511 "Event.c"
 					}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
-#line 4510 "Event.c"
+#line 4515 "Event.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
-#line 4516 "Event.c"
+#line 4521 "Event.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
-#line 4528 "Event.c"
-					gchar** _tmp25_ = NULL;
-					gint _tmp25__length1 = 0;
-					gint _tmp26_ = 0;
-					const gchar* _tmp27_ = NULL;
-					gint _tmp28_ = 0;
-					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 4533 "Event.c"
+					gchar** _tmp25_;
+					gint _tmp25__length1;
+					gint _tmp26_;
+					const gchar* _tmp27_;
+					gint _tmp28_;
+					gint _tmp29_;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
-#line 4549 "Event.c"
+#line 4554 "Event.c"
 				} else {
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
-#line 4553 "Event.c"
+#line 4558 "Event.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
-#line 4559 "Event.c"
+#line 4564 "Event.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
-#line 4566 "Event.c"
-			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 4571 "Event.c"
+			gchar* _tmp32_;
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return result;
-#line 4574 "Event.c"
+#line 4579 "Event.c"
 		}
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
-#line 4612 "Event.c"
+#line 4617 "Event.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 4621 "Event.c"
-				gint _tmp48_ = 0;
-				gchar** _tmp49_ = NULL;
-				gint _tmp49__length1 = 0;
-				void* _tmp50_ = NULL;
-				const gchar* _tmp51_ = NULL;
-				void* _tmp52_ = NULL;
+#line 4626 "Event.c"
+				gint _tmp48_;
+				gchar** _tmp49_;
+				gint _tmp49__length1;
+				void* _tmp50_;
+				const gchar* _tmp51_;
+				void* _tmp52_;
 				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_ = NULL;
-				gint _tmp54__length1 = 0;
-				gint _tmp55_ = 0;
-				const gchar* _tmp56_ = NULL;
-				void* _tmp60_ = NULL;
-				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp54_;
+				gint _tmp54__length1;
+				gint _tmp55_;
+				const gchar* _tmp56_;
+				void* _tmp60_;
+				void* _tmp61_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
-#line 4637 "Event.c"
-					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 4642 "Event.c"
+					gint _tmp47_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
-#line 4643 "Event.c"
+#line 4648 "Event.c"
 				}
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
-#line 4657 "Event.c"
+#line 4662 "Event.c"
 				}
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
-#line 4677 "Event.c"
-					gchar** _tmp57_ = NULL;
-					gint _tmp57__length1 = 0;
-					gint _tmp58_ = 0;
-					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 4682 "Event.c"
+					gchar** _tmp57_;
+					gint _tmp57__length1;
+					gint _tmp58_;
+					const gchar* _tmp59_;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
-#line 4692 "Event.c"
+#line 4697 "Event.c"
 				} else {
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
-#line 4696 "Event.c"
+#line 4701 "Event.c"
 				}
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
-#line 4704 "Event.c"
+#line 4709 "Event.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 4715 "Event.c"
+#line 4720 "Event.c"
 	} else {
-		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp63_;
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 4724 "Event.c"
+#line 4729 "Event.c"
 	}
 }
 
 
 static void event_update_indexable_keywords (Event* self) {
 	gchar** components = NULL;
-	gchar** _tmp0_ = NULL;
-	gint components_length1 = 0;
-	gint _components_size_ = 0;
+	gchar** _tmp0_;
+	gint components_length1;
+	gint _components_size_;
 	gint i = 0;
 	gchar* rawname = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
 	gchar* comment = NULL;
-	gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gint _tmp15_ = 0;
+	gchar* _tmp8_;
+	const gchar* _tmp9_;
+	gint _tmp15_;
 #line 570 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (IS_EVENT (self));
 #line 571 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4758,13 +4763,13 @@ static void event_update_indexable_keywords (Event* self) {
 	_tmp2_ = rawname;
 #line 575 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp2_ != NULL) {
-#line 4762 "Event.c"
-		gchar** _tmp3_ = NULL;
-		gint _tmp3__length1 = 0;
-		gint _tmp4_ = 0;
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 4767 "Event.c"
+		gchar** _tmp3_;
+		gint _tmp3__length1;
+		gint _tmp4_;
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 576 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp3_ = components;
 #line 576 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4783,7 +4788,7 @@ static void event_update_indexable_keywords (Event* self) {
 		_tmp3_[_tmp4_] = _tmp6_;
 #line 576 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp7_ = _tmp3_[_tmp4_];
-#line 4787 "Event.c"
+#line 4792 "Event.c"
 	}
 #line 578 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp8_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource));
@@ -4793,13 +4798,13 @@ static void event_update_indexable_keywords (Event* self) {
 	_tmp9_ = comment;
 #line 579 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp9_ != NULL) {
-#line 4797 "Event.c"
-		gchar** _tmp10_ = NULL;
-		gint _tmp10__length1 = 0;
-		gint _tmp11_ = 0;
-		const gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
+#line 4802 "Event.c"
+		gchar** _tmp10_;
+		gint _tmp10__length1;
+		gint _tmp11_;
+		const gchar* _tmp12_;
+		gchar* _tmp13_;
+		gchar* _tmp14_;
 #line 580 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp10_ = components;
 #line 580 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4818,7 +4823,7 @@ static void event_update_indexable_keywords (Event* self) {
 		_tmp10_[_tmp11_] = _tmp13_;
 #line 580 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp14_ = _tmp10_[_tmp11_];
-#line 4822 "Event.c"
+#line 4827 "Event.c"
 	}
 #line 582 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp15_ = i;
@@ -4828,17 +4833,17 @@ static void event_update_indexable_keywords (Event* self) {
 		_g_free0 (self->priv->indexable_keywords);
 #line 583 "/home/jens/Source/shotwell/src/Event.vala"
 		self->priv->indexable_keywords = NULL;
-#line 4832 "Event.c"
+#line 4837 "Event.c"
 	} else {
-		gchar** _tmp16_ = NULL;
-		gint _tmp16__length1 = 0;
-		gint _tmp17_ = 0;
-		gchar* _tmp18_ = NULL;
-		gchar** _tmp19_ = NULL;
-		gint _tmp19__length1 = 0;
-		gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
+		gchar** _tmp16_;
+		gint _tmp16__length1;
+		gint _tmp17_;
+		gchar* _tmp18_;
+		gchar** _tmp19_;
+		gint _tmp19__length1;
+		gchar* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
 #line 585 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp16_ = components;
 #line 585 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4867,7 +4872,7 @@ static void event_update_indexable_keywords (Event* self) {
 		self->priv->indexable_keywords = _tmp22_;
 #line 586 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_free0 (_tmp21_);
-#line 4871 "Event.c"
+#line 4876 "Event.c"
 	}
 #line 570 "/home/jens/Source/shotwell/src/Event.vala"
 	_g_free0 (comment);
@@ -4875,14 +4880,14 @@ static void event_update_indexable_keywords (Event* self) {
 	_g_free0 (rawname);
 #line 570 "/home/jens/Source/shotwell/src/Event.vala"
 	components = (_vala_array_free (components, components_length1, (GDestroyNotify) g_free), NULL);
-#line 4879 "Event.c"
+#line 4884 "Event.c"
 }
 
 
 static const gchar* event_real_get_indexable_keywords (Indexable* base) {
 	Event * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 590 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 591 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4891,55 +4896,55 @@ static const gchar* event_real_get_indexable_keywords (Indexable* base) {
 	result = _tmp0_;
 #line 591 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 4895 "Event.c"
+#line 4900 "Event.c"
 }
 
 
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return;
-#line 4910 "Event.c"
+#line 4915 "Event.c"
 }
 
 
 gboolean event_is_in_starting_day (Event* self, time_t time) {
 	gboolean result = FALSE;
-	ViewCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	ViewCollection* _tmp0_;
+	gint _tmp1_;
 	MediaSource* earliest_media = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	DataObject* _tmp3_ = NULL;
-	DataView* _tmp4_ = NULL;
-	DataSource* _tmp5_ = NULL;
-	MediaSource* _tmp6_ = NULL;
+	ViewCollection* _tmp2_;
+	DataObject* _tmp3_;
+	DataView* _tmp4_;
+	DataSource* _tmp5_;
+	MediaSource* _tmp6_;
 	struct tm earliest_tm = {0};
-	MediaSource* _tmp7_ = NULL;
-	time_t _tmp8_ = 0;
+	MediaSource* _tmp7_;
+	time_t _tmp8_;
 	struct tm _tmp9_ = {0};
 	struct tm start_boundary_tm = {0};
-	struct tm _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	struct tm _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	struct tm _tmp14_ = {0};
-	gint _tmp15_ = 0;
+	struct tm _tmp10_;
+	gint _tmp11_;
+	struct tm _tmp12_;
+	gint _tmp13_;
+	struct tm _tmp14_;
+	gint _tmp15_;
 	time_t start_boundary = 0;
-	time_t _tmp16_ = 0;
-	struct tm _tmp17_ = {0};
-	gint _tmp18_ = 0;
+	time_t _tmp16_;
+	struct tm _tmp17_;
+	gint _tmp18_;
 	time_t end_boundary = 0;
-	time_t _tmp20_ = 0;
+	time_t _tmp20_;
 	gboolean _tmp21_ = FALSE;
-	time_t _tmp22_ = 0;
-	time_t _tmp23_ = 0;
+	time_t _tmp22_;
+	time_t _tmp23_;
 #line 594 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_EVENT (self), FALSE);
 #line 599 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4952,7 +4957,7 @@ gboolean event_is_in_starting_day (Event* self, time_t time) {
 		result = FALSE;
 #line 600 "/home/jens/Source/shotwell/src/Event.vala"
 		return result;
-#line 4956 "Event.c"
+#line 4961 "Event.c"
 	}
 #line 603 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp2_ = self->priv->view;
@@ -5014,15 +5019,15 @@ gboolean event_is_in_starting_day (Event* self, time_t time) {
 	_tmp18_ = _tmp17_.tm_hour;
 #line 620 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp18_ < EVENT_EVENT_BOUNDARY_HOUR) {
-#line 5018 "Event.c"
-		time_t _tmp19_ = 0;
+#line 5023 "Event.c"
+		time_t _tmp19_;
 #line 621 "/home/jens/Source/shotwell/src/Event.vala"
 		g_debug ("Event.vala:621: Hour before boundary, shifting back one day");
 #line 622 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp19_ = start_boundary;
 #line 622 "/home/jens/Source/shotwell/src/Event.vala"
 		start_boundary = _tmp19_ - EVENT_TIME_T_DAY;
-#line 5026 "Event.c"
+#line 5031 "Event.c"
 	}
 #line 625 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp20_ = start_boundary;
@@ -5034,20 +5039,20 @@ gboolean event_is_in_starting_day (Event* self, time_t time) {
 	_tmp23_ = start_boundary;
 #line 627 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp22_ >= _tmp23_) {
-#line 5038 "Event.c"
-		time_t _tmp24_ = 0;
-		time_t _tmp25_ = 0;
+#line 5043 "Event.c"
+		time_t _tmp24_;
+		time_t _tmp25_;
 #line 627 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp24_ = time;
 #line 627 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp25_ = end_boundary;
 #line 627 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp21_ = _tmp24_ <= _tmp25_;
-#line 5047 "Event.c"
+#line 5052 "Event.c"
 	} else {
 #line 627 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp21_ = FALSE;
-#line 5051 "Event.c"
+#line 5056 "Event.c"
 	}
 #line 627 "/home/jens/Source/shotwell/src/Event.vala"
 	result = _tmp21_;
@@ -5055,7 +5060,7 @@ gboolean event_is_in_starting_day (Event* self, time_t time) {
 	_g_object_unref0 (earliest_media);
 #line 627 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 5059 "Event.c"
+#line 5064 "Event.c"
 }
 
 
@@ -5063,13 +5068,13 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 	gboolean _vala_new_event = FALSE;
 	Event* result = NULL;
 	time_t exposure_time = 0;
-	MediaSource* _tmp0_ = NULL;
-	time_t _tmp1_ = 0;
+	MediaSource* _tmp0_;
+	time_t _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	time_t _tmp3_ = 0;
+	time_t _tmp3_;
 	gint count = 0;
-	ViewCollection* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
+	ViewCollection* _tmp8_;
+	gint _tmp9_;
 	GError * _inner_error_ = NULL;
 #line 633 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (media), NULL);
@@ -5085,24 +5090,24 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 	_tmp3_ = exposure_time;
 #line 637 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp3_ == ((time_t) 0)) {
-#line 5089 "Event.c"
-		const gchar* _tmp4_ = NULL;
+#line 5094 "Event.c"
+		const gchar* _tmp4_;
 #line 637 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp4_ = event_name;
 #line 637 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp2_ = _tmp4_ == NULL;
-#line 5095 "Event.c"
+#line 5100 "Event.c"
 	} else {
 #line 637 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp2_ = FALSE;
-#line 5099 "Event.c"
+#line 5104 "Event.c"
 	}
 #line 637 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp2_) {
-#line 5103 "Event.c"
-		MediaSource* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 5108 "Event.c"
+		MediaSource* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 638 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp5_ = media;
 #line 638 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5122,11 +5127,11 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 		if (new_event) {
 #line 641 "/home/jens/Source/shotwell/src/Event.vala"
 			*new_event = _vala_new_event;
-#line 5125 "Event.c"
+#line 5130 "Event.c"
 		}
 #line 641 "/home/jens/Source/shotwell/src/Event.vala"
 		return result;
-#line 5129 "Event.c"
+#line 5134 "Event.c"
 	}
 #line 644 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp8_ = events_so_far;
@@ -5134,41 +5139,41 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 	_tmp9_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection));
 #line 644 "/home/jens/Source/shotwell/src/Event.vala"
 	count = _tmp9_;
-#line 5137 "Event.c"
+#line 5142 "Event.c"
 	{
 		gint ctr = 0;
 #line 645 "/home/jens/Source/shotwell/src/Event.vala"
 		ctr = 0;
-#line 5142 "Event.c"
+#line 5147 "Event.c"
 		{
 			gboolean _tmp10_ = FALSE;
 #line 645 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp10_ = TRUE;
 #line 645 "/home/jens/Source/shotwell/src/Event.vala"
 			while (TRUE) {
-#line 5149 "Event.c"
-				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
+#line 5154 "Event.c"
+				gint _tmp12_;
+				gint _tmp13_;
 				Event* event = NULL;
-				ViewCollection* _tmp14_ = NULL;
-				gint _tmp15_ = 0;
-				DataObject* _tmp16_ = NULL;
-				EventView* _tmp17_ = NULL;
-				DataSource* _tmp18_ = NULL;
-				Event* _tmp19_ = NULL;
+				ViewCollection* _tmp14_;
+				gint _tmp15_;
+				DataObject* _tmp16_;
+				EventView* _tmp17_;
+				DataSource* _tmp18_;
+				Event* _tmp19_;
 				gboolean _tmp20_ = FALSE;
 				gboolean _tmp21_ = FALSE;
 				gboolean _tmp22_ = FALSE;
-				const gchar* _tmp23_ = NULL;
+				const gchar* _tmp23_;
 #line 645 "/home/jens/Source/shotwell/src/Event.vala"
 				if (!_tmp10_) {
-#line 5165 "Event.c"
-					gint _tmp11_ = 0;
+#line 5170 "Event.c"
+					gint _tmp11_;
 #line 645 "/home/jens/Source/shotwell/src/Event.vala"
 					_tmp11_ = ctr;
 #line 645 "/home/jens/Source/shotwell/src/Event.vala"
 					ctr = _tmp11_ + 1;
-#line 5171 "Event.c"
+#line 5176 "Event.c"
 				}
 #line 645 "/home/jens/Source/shotwell/src/Event.vala"
 				_tmp10_ = FALSE;
@@ -5180,7 +5185,7 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 				if (!(_tmp12_ < _tmp13_)) {
 #line 645 "/home/jens/Source/shotwell/src/Event.vala"
 					break;
-#line 5183 "Event.c"
+#line 5188 "Event.c"
 				}
 #line 646 "/home/jens/Source/shotwell/src/Event.vala"
 				_tmp14_ = events_so_far;
@@ -5202,28 +5207,28 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 				_tmp23_ = event_name;
 #line 648 "/home/jens/Source/shotwell/src/Event.vala"
 				if (_tmp23_ != NULL) {
-#line 5205 "Event.c"
-					Event* _tmp24_ = NULL;
-					gboolean _tmp25_ = FALSE;
+#line 5210 "Event.c"
+					Event* _tmp24_;
+					gboolean _tmp25_;
 #line 648 "/home/jens/Source/shotwell/src/Event.vala"
 					_tmp24_ = event;
 #line 648 "/home/jens/Source/shotwell/src/Event.vala"
 					_tmp25_ = event_has_name (_tmp24_);
 #line 648 "/home/jens/Source/shotwell/src/Event.vala"
 					_tmp22_ = _tmp25_;
-#line 5214 "Event.c"
+#line 5219 "Event.c"
 				} else {
 #line 648 "/home/jens/Source/shotwell/src/Event.vala"
 					_tmp22_ = FALSE;
-#line 5218 "Event.c"
+#line 5223 "Event.c"
 				}
 #line 648 "/home/jens/Source/shotwell/src/Event.vala"
 				if (_tmp22_) {
-#line 5222 "Event.c"
-					const gchar* _tmp26_ = NULL;
-					Event* _tmp27_ = NULL;
-					gchar* _tmp28_ = NULL;
-					gchar* _tmp29_ = NULL;
+#line 5227 "Event.c"
+					const gchar* _tmp26_;
+					Event* _tmp27_;
+					gchar* _tmp28_;
+					gchar* _tmp29_;
 #line 648 "/home/jens/Source/shotwell/src/Event.vala"
 					_tmp26_ = event_name;
 #line 648 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5236,21 +5241,21 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 					_tmp21_ = g_strcmp0 (_tmp26_, _tmp29_) == 0;
 #line 648 "/home/jens/Source/shotwell/src/Event.vala"
 					_g_free0 (_tmp29_);
-#line 5239 "Event.c"
+#line 5244 "Event.c"
 				} else {
 #line 648 "/home/jens/Source/shotwell/src/Event.vala"
 					_tmp21_ = FALSE;
-#line 5243 "Event.c"
+#line 5248 "Event.c"
 				}
 #line 648 "/home/jens/Source/shotwell/src/Event.vala"
 				if (_tmp21_) {
 #line 648 "/home/jens/Source/shotwell/src/Event.vala"
 					_tmp20_ = TRUE;
-#line 5249 "Event.c"
+#line 5254 "Event.c"
 				} else {
-					Event* _tmp30_ = NULL;
-					time_t _tmp31_ = 0;
-					gboolean _tmp32_ = FALSE;
+					Event* _tmp30_;
+					time_t _tmp31_;
+					gboolean _tmp32_;
 #line 649 "/home/jens/Source/shotwell/src/Event.vala"
 					_tmp30_ = event;
 #line 649 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5259,7 +5264,7 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 					_tmp32_ = event_is_in_starting_day (_tmp30_, _tmp31_);
 #line 649 "/home/jens/Source/shotwell/src/Event.vala"
 					_tmp20_ = _tmp32_;
-#line 5262 "Event.c"
+#line 5267 "Event.c"
 				}
 #line 648 "/home/jens/Source/shotwell/src/Event.vala"
 				if (_tmp20_) {
@@ -5271,34 +5276,34 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 					if (new_event) {
 #line 652 "/home/jens/Source/shotwell/src/Event.vala"
 						*new_event = _vala_new_event;
-#line 5274 "Event.c"
+#line 5279 "Event.c"
 					}
 #line 652 "/home/jens/Source/shotwell/src/Event.vala"
 					return result;
-#line 5278 "Event.c"
+#line 5283 "Event.c"
 				}
 #line 645 "/home/jens/Source/shotwell/src/Event.vala"
 				_g_object_unref0 (event);
-#line 5282 "Event.c"
+#line 5287 "Event.c"
 			}
 		}
 	}
 	{
 		EventRow* _tmp33_ = NULL;
-		EventTable* _tmp34_ = NULL;
-		EventTable* _tmp35_ = NULL;
-		MediaSource* _tmp36_ = NULL;
-		gchar* _tmp37_ = NULL;
-		gchar* _tmp38_ = NULL;
-		EventRow* _tmp39_ = NULL;
-		EventRow* _tmp40_ = NULL;
+		EventTable* _tmp34_;
+		EventTable* _tmp35_;
+		MediaSource* _tmp36_;
+		gchar* _tmp37_;
+		gchar* _tmp38_;
+		EventRow* _tmp39_;
+		EventRow* _tmp40_;
 		Event* event = NULL;
-		Event* _tmp41_ = NULL;
-		const gchar* _tmp42_ = NULL;
-		ViewCollection* _tmp45_ = NULL;
-		Event* _tmp46_ = NULL;
-		EventView* _tmp47_ = NULL;
-		EventView* _tmp48_ = NULL;
+		Event* _tmp41_;
+		const gchar* _tmp42_;
+		ViewCollection* _tmp45_;
+		Event* _tmp46_;
+		EventView* _tmp47_;
+		EventView* _tmp48_;
 #line 658 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp34_ = event_table_get_instance ();
 #line 658 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5323,8 +5328,8 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 658 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5326 "Event.c"
-				goto __catch440_database_error;
+#line 5331 "Event.c"
+				goto __catch441_database_error;
 			}
 #line 658 "/home/jens/Source/shotwell/src/Event.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5332,7 +5337,7 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 			g_clear_error (&_inner_error_);
 #line 658 "/home/jens/Source/shotwell/src/Event.vala"
 			return NULL;
-#line 5335 "Event.c"
+#line 5340 "Event.c"
 		}
 #line 658 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp41_ = event_new (_tmp33_, DATA_OBJECT_INVALID_OBJECT_ID);
@@ -5342,16 +5347,16 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 		_tmp42_ = event_name;
 #line 659 "/home/jens/Source/shotwell/src/Event.vala"
 		if (_tmp42_ != NULL) {
-#line 5345 "Event.c"
-			Event* _tmp43_ = NULL;
-			const gchar* _tmp44_ = NULL;
+#line 5350 "Event.c"
+			Event* _tmp43_;
+			const gchar* _tmp44_;
 #line 660 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp43_ = event;
 #line 660 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp44_ = event_name;
 #line 660 "/home/jens/Source/shotwell/src/Event.vala"
 			event_rename (_tmp43_, _tmp44_);
-#line 5354 "Event.c"
+#line 5359 "Event.c"
 		}
 #line 662 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp45_ = events_so_far;
@@ -5375,17 +5380,17 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 		if (new_event) {
 #line 665 "/home/jens/Source/shotwell/src/Event.vala"
 			*new_event = _vala_new_event;
-#line 5378 "Event.c"
+#line 5383 "Event.c"
 		}
 #line 665 "/home/jens/Source/shotwell/src/Event.vala"
 		return result;
-#line 5382 "Event.c"
+#line 5387 "Event.c"
 	}
-	goto __finally440;
-	__catch440_database_error:
+	goto __finally441;
+	__catch441_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp49_ = NULL;
+		GError* _tmp49_;
 #line 657 "/home/jens/Source/shotwell/src/Event.vala"
 		err = _inner_error_;
 #line 657 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5396,9 +5401,9 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 		app_window_database_error (_tmp49_);
 #line 657 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_error_free0 (err);
-#line 5399 "Event.c"
+#line 5404 "Event.c"
 	}
-	__finally440:
+	__finally441:
 #line 657 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 657 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5407,7 +5412,7 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 		g_clear_error (&_inner_error_);
 #line 657 "/home/jens/Source/shotwell/src/Event.vala"
 		return NULL;
-#line 5410 "Event.c"
+#line 5415 "Event.c"
 	}
 #line 670 "/home/jens/Source/shotwell/src/Event.vala"
 	_vala_new_event = FALSE;
@@ -5417,30 +5422,30 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 	if (new_event) {
 #line 672 "/home/jens/Source/shotwell/src/Event.vala"
 		*new_event = _vala_new_event;
-#line 5420 "Event.c"
+#line 5425 "Event.c"
 	}
 #line 672 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 5424 "Event.c"
+#line 5429 "Event.c"
 }
 
 
 void event_generate_single_event (MediaSource* media, ViewCollection* events_so_far, const gchar* event_name) {
-	MediaSource* _tmp0_ = NULL;
-	Event* _tmp1_ = NULL;
-	Event* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	MediaSource* _tmp0_;
+	Event* _tmp1_;
+	Event* _tmp2_;
+	gboolean _tmp3_;
 	gboolean new_event = FALSE;
 	Event* event = NULL;
-	MediaSource* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
+	MediaSource* _tmp4_;
+	ViewCollection* _tmp5_;
+	const gchar* _tmp6_;
 	gboolean _tmp7_ = FALSE;
-	Event* _tmp8_ = NULL;
-	Event* _tmp9_ = NULL;
-	MediaSource* _tmp10_ = NULL;
-	Event* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	Event* _tmp8_;
+	Event* _tmp9_;
+	MediaSource* _tmp10_;
+	Event* _tmp11_;
+	gboolean _tmp12_;
 #line 675 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (media));
 #line 675 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5459,7 +5464,7 @@ void event_generate_single_event (MediaSource* media, ViewCollection* events_so_
 	if (_tmp3_) {
 #line 679 "/home/jens/Source/shotwell/src/Event.vala"
 		return;
-#line 5462 "Event.c"
+#line 5467 "Event.c"
 	}
 #line 682 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp4_ = media;
@@ -5481,7 +5486,7 @@ void event_generate_single_event (MediaSource* media, ViewCollection* events_so_
 		_g_object_unref0 (event);
 #line 684 "/home/jens/Source/shotwell/src/Event.vala"
 		return;
-#line 5484 "Event.c"
+#line 5489 "Event.c"
 	}
 #line 686 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp10_ = media;
@@ -5493,29 +5498,29 @@ void event_generate_single_event (MediaSource* media, ViewCollection* events_so_
 	_tmp12_ = new_event;
 #line 688 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp12_) {
-#line 5496 "Event.c"
-		EventSourceCollection* _tmp13_ = NULL;
-		Event* _tmp14_ = NULL;
+#line 5501 "Event.c"
+		EventSourceCollection* _tmp13_;
+		Event* _tmp14_;
 #line 689 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp13_ = event_global;
 #line 689 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp14_ = event;
 #line 689 "/home/jens/Source/shotwell/src/Event.vala"
 		data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
-#line 5505 "Event.c"
+#line 5510 "Event.c"
 	}
 #line 675 "/home/jens/Source/shotwell/src/Event.vala"
 	_g_object_unref0 (event);
-#line 5509 "Event.c"
+#line 5514 "Event.c"
 }
 
 
 void event_generate_many_events (GeeCollection* sources, ViewCollection* events_so_far) {
 	GeeCollection* to_add = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeCollection* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	gint _tmp23_ = 0;
+	GeeArrayList* _tmp0_;
+	GeeCollection* _tmp21_;
+	gint _tmp22_;
+	gint _tmp23_;
 #line 692 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
 #line 692 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5524,11 +5529,11 @@ void event_generate_many_events (GeeCollection* sources, ViewCollection* events_
 	_tmp0_ = gee_array_list_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 693 "/home/jens/Source/shotwell/src/Event.vala"
 	to_add = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 5527 "Event.c"
+#line 5532 "Event.c"
 	{
 		GeeIterator* _media_it = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 694 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp1_ = sources;
 #line 694 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5537,26 +5542,26 @@ void event_generate_many_events (GeeCollection* sources, ViewCollection* events_
 		_media_it = _tmp2_;
 #line 694 "/home/jens/Source/shotwell/src/Event.vala"
 		while (TRUE) {
-#line 5540 "Event.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 5545 "Event.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			MediaSource* media = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
-			MediaSource* _tmp7_ = NULL;
-			Event* _tmp8_ = NULL;
-			Event* _tmp9_ = NULL;
-			gboolean _tmp10_ = FALSE;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
+			MediaSource* _tmp7_;
+			Event* _tmp8_;
+			Event* _tmp9_;
+			gboolean _tmp10_;
 			gboolean new_event = FALSE;
 			Event* event = NULL;
-			MediaSource* _tmp11_ = NULL;
-			ViewCollection* _tmp12_ = NULL;
+			MediaSource* _tmp11_;
+			ViewCollection* _tmp12_;
 			gboolean _tmp13_ = FALSE;
-			Event* _tmp14_ = NULL;
-			Event* _tmp15_ = NULL;
-			MediaSource* _tmp16_ = NULL;
-			Event* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
+			Event* _tmp14_;
+			Event* _tmp15_;
+			MediaSource* _tmp16_;
+			Event* _tmp17_;
+			gboolean _tmp18_;
 #line 694 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp3_ = _media_it;
 #line 694 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5565,7 +5570,7 @@ void event_generate_many_events (GeeCollection* sources, ViewCollection* events_
 			if (!_tmp4_) {
 #line 694 "/home/jens/Source/shotwell/src/Event.vala"
 				break;
-#line 5568 "Event.c"
+#line 5573 "Event.c"
 			}
 #line 694 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp5_ = _media_it;
@@ -5589,7 +5594,7 @@ void event_generate_many_events (GeeCollection* sources, ViewCollection* events_
 				_g_object_unref0 (media);
 #line 697 "/home/jens/Source/shotwell/src/Event.vala"
 				continue;
-#line 5592 "Event.c"
+#line 5597 "Event.c"
 			}
 #line 700 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp11_ = media;
@@ -5611,7 +5616,7 @@ void event_generate_many_events (GeeCollection* sources, ViewCollection* events_
 				_g_object_unref0 (media);
 #line 702 "/home/jens/Source/shotwell/src/Event.vala"
 				continue;
-#line 5614 "Event.c"
+#line 5619 "Event.c"
 			}
 #line 704 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp16_ = media;
@@ -5623,26 +5628,26 @@ void event_generate_many_events (GeeCollection* sources, ViewCollection* events_
 			_tmp18_ = new_event;
 #line 706 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_tmp18_) {
-#line 5626 "Event.c"
-				GeeCollection* _tmp19_ = NULL;
-				Event* _tmp20_ = NULL;
+#line 5631 "Event.c"
+				GeeCollection* _tmp19_;
+				Event* _tmp20_;
 #line 707 "/home/jens/Source/shotwell/src/Event.vala"
 				_tmp19_ = to_add;
 #line 707 "/home/jens/Source/shotwell/src/Event.vala"
 				_tmp20_ = event;
 #line 707 "/home/jens/Source/shotwell/src/Event.vala"
 				gee_collection_add (_tmp19_, _tmp20_);
-#line 5635 "Event.c"
+#line 5640 "Event.c"
 			}
 #line 694 "/home/jens/Source/shotwell/src/Event.vala"
 			_g_object_unref0 (event);
 #line 694 "/home/jens/Source/shotwell/src/Event.vala"
 			_g_object_unref0 (media);
-#line 5641 "Event.c"
+#line 5646 "Event.c"
 		}
 #line 694 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_object_unref0 (_media_it);
-#line 5645 "Event.c"
+#line 5650 "Event.c"
 	}
 #line 710 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp21_ = to_add;
@@ -5652,11 +5657,11 @@ void event_generate_many_events (GeeCollection* sources, ViewCollection* events_
 	_tmp23_ = _tmp22_;
 #line 710 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp23_ > 0) {
-#line 5655 "Event.c"
-		EventSourceCollection* _tmp24_ = NULL;
-		GeeCollection* _tmp25_ = NULL;
-		GeeCollection* _tmp26_ = NULL;
-		GeeCollection* _tmp27_ = NULL;
+#line 5660 "Event.c"
+		EventSourceCollection* _tmp24_;
+		GeeCollection* _tmp25_;
+		GeeCollection* _tmp26_;
+		GeeCollection* _tmp27_;
 #line 711 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp24_ = event_global;
 #line 711 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5667,16 +5672,16 @@ void event_generate_many_events (GeeCollection* sources, ViewCollection* events_
 		_tmp27_ = _tmp26_;
 #line 711 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_object_unref0 (_tmp27_);
-#line 5670 "Event.c"
+#line 5675 "Event.c"
 	}
 #line 692 "/home/jens/Source/shotwell/src/Event.vala"
 	_g_object_unref0 (to_add);
-#line 5674 "Event.c"
+#line 5679 "Event.c"
 }
 
 
 void event_get_event_id (Event* self, EventID* result) {
-	EventID _tmp0_ = {0};
+	EventID _tmp0_;
 #line 714 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (IS_EVENT (self));
 #line 715 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5685,14 +5690,14 @@ void event_get_event_id (Event* self, EventID* result) {
 	*result = _tmp0_;
 #line 715 "/home/jens/Source/shotwell/src/Event.vala"
 	return;
-#line 5688 "Event.c"
+#line 5693 "Event.c"
 }
 
 
 static SourceSnapshot* event_real_save_snapshot (DataSource* base) {
 	Event * self;
 	SourceSnapshot* result = NULL;
-	EventEventSnapshot* _tmp0_ = NULL;
+	EventEventSnapshot* _tmp0_;
 #line 718 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 719 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5701,14 +5706,14 @@ static SourceSnapshot* event_real_save_snapshot (DataSource* base) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_SNAPSHOT, SourceSnapshot);
 #line 719 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 5704 "Event.c"
+#line 5709 "Event.c"
 }
 
 
 static SourceProxy* event_real_get_proxy (Proxyable* base) {
 	Event * self;
 	SourceProxy* result = NULL;
-	EventEventProxy* _tmp0_ = NULL;
+	EventEventProxy* _tmp0_;
 #line 722 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 723 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5717,7 +5722,7 @@ static SourceProxy* event_real_get_proxy (Proxyable* base) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_PROXY, SourceProxy);
 #line 723 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 5720 "Event.c"
+#line 5725 "Event.c"
 }
 
 
@@ -5725,11 +5730,11 @@ static gboolean event_real_equals (DataSource* base, DataSource* source) {
 	Event * self;
 	gboolean result = FALSE;
 	Event* event = NULL;
-	DataSource* _tmp0_ = NULL;
-	Event* _tmp1_ = NULL;
-	Event* _tmp2_ = NULL;
-	DataSource* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
+	DataSource* _tmp0_;
+	Event* _tmp1_;
+	Event* _tmp2_;
+	DataSource* _tmp9_;
+	gboolean _tmp10_;
 #line 726 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 726 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5744,18 +5749,18 @@ static gboolean event_real_equals (DataSource* base, DataSource* source) {
 	_tmp2_ = event;
 #line 729 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp2_ != NULL) {
-#line 5747 "Event.c"
-		Event* _tmp3_ = NULL;
+#line 5752 "Event.c"
+		Event* _tmp3_;
 #line 730 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp3_ = event;
 #line 730 "/home/jens/Source/shotwell/src/Event.vala"
 		if (self != _tmp3_) {
-#line 5753 "Event.c"
-			EventID _tmp4_ = {0};
-			gint64 _tmp5_ = 0LL;
-			Event* _tmp6_ = NULL;
-			EventID _tmp7_ = {0};
-			gint64 _tmp8_ = 0LL;
+#line 5758 "Event.c"
+			EventID _tmp4_;
+			gint64 _tmp5_;
+			Event* _tmp6_;
+			EventID _tmp7_;
+			gint64 _tmp8_;
 #line 731 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp4_ = self->priv->event_id;
 #line 731 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5768,7 +5773,7 @@ static gboolean event_real_equals (DataSource* base, DataSource* source) {
 			_tmp8_ = _tmp7_.id;
 #line 731 "/home/jens/Source/shotwell/src/Event.vala"
 			_vala_assert (_tmp5_ != _tmp8_, "event_id.id != event.event_id.id");
-#line 5771 "Event.c"
+#line 5776 "Event.c"
 		}
 	}
 #line 735 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5781,24 +5786,24 @@ static gboolean event_real_equals (DataSource* base, DataSource* source) {
 	_g_object_unref0 (event);
 #line 735 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 5784 "Event.c"
+#line 5789 "Event.c"
 }
 
 
 static gchar* event_real_to_string (DataObject* base) {
 	Event * self;
 	gchar* result = NULL;
-	EventID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gint64 _tmp4_ = 0LL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
+	EventID _tmp0_;
+	gint64 _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gint64 _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
 #line 738 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 739 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5833,24 +5838,24 @@ static gchar* event_real_to_string (DataObject* base) {
 	result = _tmp10_;
 #line 739 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 5836 "Event.c"
+#line 5841 "Event.c"
 }
 
 
 gboolean event_has_name (Event* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp1_;
 #line 742 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_EVENT (self), FALSE);
 #line 743 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp1_ = self->priv->raw_name;
 #line 743 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp1_ != NULL) {
-#line 5850 "Event.c"
-		const gchar* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+#line 5855 "Event.c"
+		const gchar* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 743 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp2_ = self->priv->raw_name;
 #line 743 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5859,44 +5864,44 @@ gboolean event_has_name (Event* self) {
 		_tmp4_ = _tmp3_;
 #line 743 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp0_ = _tmp4_ > 0;
-#line 5862 "Event.c"
+#line 5867 "Event.c"
 	} else {
 #line 743 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp0_ = FALSE;
-#line 5866 "Event.c"
+#line 5871 "Event.c"
 	}
 #line 743 "/home/jens/Source/shotwell/src/Event.vala"
 	result = _tmp0_;
 #line 743 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 5872 "Event.c"
+#line 5877 "Event.c"
 }
 
 
 static gchar* event_real_get_name (DataObject* base) {
 	Event * self;
 	gchar* result = NULL;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	gchar* datestring = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar* _tmp2_;
 	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	const gchar* _tmp4_;
+	gboolean _tmp5_;
 #line 746 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 747 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp0_ = event_has_name (self);
 #line 747 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp0_) {
-#line 5891 "Event.c"
-		gchar* _tmp1_ = NULL;
+#line 5896 "Event.c"
+		gchar* _tmp1_;
 #line 748 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp1_ = event_get_raw_name (self);
 #line 748 "/home/jens/Source/shotwell/src/Event.vala"
 		result = _tmp1_;
 #line 748 "/home/jens/Source/shotwell/src/Event.vala"
 		return result;
-#line 5899 "Event.c"
+#line 5904 "Event.c"
 	}
 #line 751 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp2_ = event_get_formatted_daterange (self);
@@ -5908,9 +5913,9 @@ static gchar* event_real_get_name (DataObject* base) {
 	_tmp5_ = is_string_empty (_tmp4_);
 #line 753 "/home/jens/Source/shotwell/src/Event.vala"
 	if (!_tmp5_) {
-#line 5911 "Event.c"
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 5916 "Event.c"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 753 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp6_ = datestring;
 #line 753 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5919,33 +5924,30 @@ static gchar* event_real_get_name (DataObject* base) {
 		_g_free0 (_tmp3_);
 #line 753 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp3_ = _tmp7_;
-#line 5922 "Event.c"
+#line 5927 "Event.c"
 	} else {
-		const gchar* _tmp8_ = NULL;
-		EventID _tmp9_ = {0};
-		gint64 _tmp10_ = 0LL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-#line 753 "/home/jens/Source/shotwell/src/Event.vala"
-		_tmp8_ = _ ("Event %s");
+		EventID _tmp8_;
+		gint64 _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
 #line 753 "/home/jens/Source/shotwell/src/Event.vala"
-		_tmp9_ = self->priv->event_id;
+		_tmp8_ = self->priv->event_id;
 #line 753 "/home/jens/Source/shotwell/src/Event.vala"
-		_tmp10_ = _tmp9_.id;
+		_tmp9_ = _tmp8_.id;
 #line 753 "/home/jens/Source/shotwell/src/Event.vala"
-		_tmp11_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp10_);
+		_tmp10_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp9_);
 #line 753 "/home/jens/Source/shotwell/src/Event.vala"
-		_tmp12_ = _tmp11_;
+		_tmp11_ = _tmp10_;
 #line 753 "/home/jens/Source/shotwell/src/Event.vala"
-		_tmp13_ = g_strdup_printf (_tmp8_, _tmp12_);
+		_tmp12_ = g_strdup_printf (_ ("Event %s"), _tmp11_);
 #line 753 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_free0 (_tmp3_);
 #line 753 "/home/jens/Source/shotwell/src/Event.vala"
-		_tmp3_ = _tmp13_;
+		_tmp3_ = _tmp12_;
 #line 753 "/home/jens/Source/shotwell/src/Event.vala"
-		_g_free0 (_tmp12_);
-#line 5948 "Event.c"
+		_g_free0 (_tmp11_);
+#line 5950 "Event.c"
 	}
 #line 753 "/home/jens/Source/shotwell/src/Event.vala"
 	result = _tmp3_;
@@ -5953,35 +5955,35 @@ static gchar* event_real_get_name (DataObject* base) {
 	_g_free0 (datestring);
 #line 753 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 5956 "Event.c"
+#line 5958 "Event.c"
 }
 
 
 gchar* event_get_formatted_daterange (Event* self) {
 	gchar* result = NULL;
 	time_t start_time = 0;
-	time_t _tmp0_ = 0;
+	time_t _tmp0_;
 	time_t end_time = 0;
-	time_t _tmp1_ = 0;
+	time_t _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	time_t _tmp3_ = 0;
+	time_t _tmp3_;
 	gboolean _tmp5_ = FALSE;
-	time_t _tmp6_ = 0;
+	time_t _tmp6_;
 	struct tm start = {0};
-	time_t _tmp11_ = 0;
+	time_t _tmp11_;
 	struct tm _tmp12_ = {0};
 	struct tm end = {0};
-	time_t _tmp13_ = 0;
+	time_t _tmp13_;
 	struct tm _tmp14_ = {0};
 	gboolean _tmp15_ = FALSE;
 	gboolean _tmp16_ = FALSE;
-	struct tm _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	struct tm _tmp19_ = {0};
-	gint _tmp20_ = 0;
-	struct tm _tmp32_ = {0};
-	struct tm _tmp33_ = {0};
-	gchar* _tmp34_ = NULL;
+	struct tm _tmp17_;
+	gint _tmp18_;
+	struct tm _tmp19_;
+	gint _tmp20_;
+	struct tm _tmp32_;
+	struct tm _tmp33_;
+	gchar* _tmp34_;
 #line 756 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_EVENT (self), NULL);
 #line 757 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5996,17 +5998,17 @@ gchar* event_get_formatted_daterange (Event* self) {
 	_tmp3_ = end_time;
 #line 760 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp3_ == ((time_t) 0)) {
-#line 5999 "Event.c"
-		time_t _tmp4_ = 0;
+#line 6001 "Event.c"
+		time_t _tmp4_;
 #line 760 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp4_ = start_time;
 #line 760 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp2_ = _tmp4_ == ((time_t) 0);
-#line 6005 "Event.c"
+#line 6007 "Event.c"
 	} else {
 #line 760 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp2_ = FALSE;
-#line 6009 "Event.c"
+#line 6011 "Event.c"
 	}
 #line 760 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp2_) {
@@ -6014,30 +6016,30 @@ gchar* event_get_formatted_daterange (Event* self) {
 		result = NULL;
 #line 761 "/home/jens/Source/shotwell/src/Event.vala"
 		return result;
-#line 6017 "Event.c"
+#line 6019 "Event.c"
 	}
 #line 763 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp6_ = end_time;
 #line 763 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp6_ == ((time_t) 0)) {
-#line 6023 "Event.c"
-		time_t _tmp7_ = 0;
+#line 6025 "Event.c"
+		time_t _tmp7_;
 #line 763 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp7_ = start_time;
 #line 763 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp5_ = _tmp7_ != ((time_t) 0);
-#line 6029 "Event.c"
+#line 6031 "Event.c"
 	} else {
 #line 763 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp5_ = FALSE;
-#line 6033 "Event.c"
+#line 6035 "Event.c"
 	}
 #line 763 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp5_) {
-#line 6037 "Event.c"
-		time_t _tmp8_ = 0;
+#line 6039 "Event.c"
+		time_t _tmp8_;
 		struct tm _tmp9_ = {0};
-		gchar* _tmp10_ = NULL;
+		gchar* _tmp10_;
 #line 764 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp8_ = start_time;
 #line 764 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6048,7 +6050,7 @@ gchar* event_get_formatted_daterange (Event* self) {
 		result = _tmp10_;
 #line 764 "/home/jens/Source/shotwell/src/Event.vala"
 		return result;
-#line 6051 "Event.c"
+#line 6053 "Event.c"
 	}
 #line 766 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp11_ = start_time;
@@ -6072,11 +6074,11 @@ gchar* event_get_formatted_daterange (Event* self) {
 	_tmp20_ = _tmp19_.tm_mday;
 #line 769 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp18_ == _tmp20_) {
-#line 6075 "Event.c"
-		struct tm _tmp21_ = {0};
-		gint _tmp22_ = 0;
-		struct tm _tmp23_ = {0};
-		gint _tmp24_ = 0;
+#line 6077 "Event.c"
+		struct tm _tmp21_;
+		gint _tmp22_;
+		struct tm _tmp23_;
+		gint _tmp24_;
 #line 769 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp21_ = start;
 #line 769 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6087,19 +6089,19 @@ gchar* event_get_formatted_daterange (Event* self) {
 		_tmp24_ = _tmp23_.tm_mon;
 #line 769 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp16_ = _tmp22_ == _tmp24_;
-#line 6090 "Event.c"
+#line 6092 "Event.c"
 	} else {
 #line 769 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp16_ = FALSE;
-#line 6094 "Event.c"
+#line 6096 "Event.c"
 	}
 #line 769 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp16_) {
-#line 6098 "Event.c"
-		struct tm _tmp25_ = {0};
-		gint _tmp26_ = 0;
-		struct tm _tmp27_ = {0};
-		gint _tmp28_ = 0;
+#line 6100 "Event.c"
+		struct tm _tmp25_;
+		gint _tmp26_;
+		struct tm _tmp27_;
+		gint _tmp28_;
 #line 769 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp25_ = start;
 #line 769 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6110,18 +6112,18 @@ gchar* event_get_formatted_daterange (Event* self) {
 		_tmp28_ = _tmp27_.tm_mday;
 #line 769 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp15_ = _tmp26_ == _tmp28_;
-#line 6113 "Event.c"
+#line 6115 "Event.c"
 	} else {
 #line 769 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp15_ = FALSE;
-#line 6117 "Event.c"
+#line 6119 "Event.c"
 	}
 #line 769 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp15_) {
-#line 6121 "Event.c"
-		time_t _tmp29_ = 0;
+#line 6123 "Event.c"
+		time_t _tmp29_;
 		struct tm _tmp30_ = {0};
-		gchar* _tmp31_ = NULL;
+		gchar* _tmp31_;
 #line 770 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp29_ = start_time;
 #line 770 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6132,7 +6134,7 @@ gchar* event_get_formatted_daterange (Event* self) {
 		result = _tmp31_;
 #line 770 "/home/jens/Source/shotwell/src/Event.vala"
 		return result;
-#line 6135 "Event.c"
+#line 6137 "Event.c"
 	}
 #line 772 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp32_ = start;
@@ -6144,14 +6146,14 @@ gchar* event_get_formatted_daterange (Event* self) {
 	result = _tmp34_;
 #line 772 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 6147 "Event.c"
+#line 6149 "Event.c"
 }
 
 
 gchar* event_get_raw_name (Event* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 775 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_EVENT (self), NULL);
 #line 776 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6162,15 +6164,15 @@ gchar* event_get_raw_name (Event* self) {
 	result = _tmp1_;
 #line 776 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 6165 "Event.c"
+#line 6167 "Event.c"
 }
 
 
 static gchar* event_real_get_comment (EventSource* base) {
 	Event * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 779 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 780 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6181,25 +6183,25 @@ static gchar* event_real_get_comment (EventSource* base) {
 	result = _tmp1_;
 #line 780 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 6184 "Event.c"
+#line 6186 "Event.c"
 }
 
 
 gboolean event_rename (Event* self, const gchar* name) {
 	gboolean result = FALSE;
 	gchar* new_name = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gboolean _tmp5_;
 	gboolean renamed = FALSE;
-	EventTable* _tmp7_ = NULL;
-	EventID _tmp8_ = {0};
-	const gchar* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	gboolean _tmp11_ = FALSE;
+	EventTable* _tmp7_;
+	EventID _tmp8_;
+	const gchar* _tmp9_;
+	gboolean _tmp10_;
+	gboolean _tmp11_;
 #line 783 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_EVENT (self), FALSE);
 #line 784 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6220,15 +6222,15 @@ gboolean event_rename (Event* self, const gchar* name) {
 	_g_free0 (_tmp4_);
 #line 787 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp5_) {
-#line 6223 "Event.c"
-		gchar* _tmp6_ = NULL;
+#line 6225 "Event.c"
+		gchar* _tmp6_;
 #line 788 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp6_ = g_strdup ("");
 #line 788 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_free0 (new_name);
 #line 788 "/home/jens/Source/shotwell/src/Event.vala"
 		new_name = _tmp6_;
-#line 6231 "Event.c"
+#line 6233 "Event.c"
 	}
 #line 791 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp7_ = event_event_table;
@@ -6244,11 +6246,11 @@ gboolean event_rename (Event* self, const gchar* name) {
 	_tmp11_ = renamed;
 #line 792 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp11_) {
-#line 6247 "Event.c"
-		const gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		Alteration* _tmp14_ = NULL;
-		Alteration* _tmp15_ = NULL;
+#line 6249 "Event.c"
+		const gchar* _tmp12_;
+		gchar* _tmp13_;
+		Alteration* _tmp14_;
+		Alteration* _tmp15_;
 #line 793 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp12_ = new_name;
 #line 793 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6267,7 +6269,7 @@ gboolean event_rename (Event* self, const gchar* name) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_);
 #line 795 "/home/jens/Source/shotwell/src/Event.vala"
 		_alteration_unref0 (_tmp15_);
-#line 6270 "Event.c"
+#line 6272 "Event.c"
 	}
 #line 798 "/home/jens/Source/shotwell/src/Event.vala"
 	result = renamed;
@@ -6275,7 +6277,7 @@ gboolean event_rename (Event* self, const gchar* name) {
 	_g_free0 (new_name);
 #line 798 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 6278 "Event.c"
+#line 6280 "Event.c"
 }
 
 
@@ -6283,14 +6285,14 @@ static gboolean event_real_set_comment (EventSource* base, const gchar* comment)
 	Event * self;
 	gboolean result = FALSE;
 	gchar* new_comment = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	gboolean committed = FALSE;
-	EventTable* _tmp2_ = NULL;
-	EventID _tmp3_ = {0};
-	const gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
+	EventTable* _tmp2_;
+	EventID _tmp3_;
+	const gchar* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
 #line 801 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 802 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6313,11 +6315,11 @@ static gboolean event_real_set_comment (EventSource* base, const gchar* comment)
 	_tmp6_ = committed;
 #line 805 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp6_) {
-#line 6316 "Event.c"
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		Alteration* _tmp9_ = NULL;
-		Alteration* _tmp10_ = NULL;
+#line 6318 "Event.c"
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
+		Alteration* _tmp9_;
+		Alteration* _tmp10_;
 #line 806 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp7_ = new_comment;
 #line 806 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6336,7 +6338,7 @@ static gboolean event_real_set_comment (EventSource* base, const gchar* comment)
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp10_);
 #line 808 "/home/jens/Source/shotwell/src/Event.vala"
 		_alteration_unref0 (_tmp10_);
-#line 6339 "Event.c"
+#line 6341 "Event.c"
 	}
 #line 811 "/home/jens/Source/shotwell/src/Event.vala"
 	result = committed;
@@ -6344,15 +6346,15 @@ static gboolean event_real_set_comment (EventSource* base, const gchar* comment)
 	_g_free0 (new_comment);
 #line 811 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 6347 "Event.c"
+#line 6349 "Event.c"
 }
 
 
 time_t event_get_creation_time (Event* self) {
 	time_t result = 0;
-	EventTable* _tmp0_ = NULL;
-	EventID _tmp1_ = {0};
-	time_t _tmp2_ = 0;
+	EventTable* _tmp0_;
+	EventID _tmp1_;
+	time_t _tmp2_;
 #line 814 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_EVENT (self), 0);
 #line 815 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6365,7 +6367,7 @@ time_t event_get_creation_time (Event* self) {
 	result = _tmp2_;
 #line 815 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 6368 "Event.c"
+#line 6370 "Event.c"
 }
 
 
@@ -6373,8 +6375,8 @@ static time_t event_real_get_start_time (EventSource* base) {
 	Event * self;
 	time_t result = 0;
 	gint count = 0;
-	ViewCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	ViewCollection* _tmp0_;
+	gint _tmp1_;
 #line 818 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 821 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6383,40 +6385,40 @@ static time_t event_real_get_start_time (EventSource* base) {
 	_tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection));
 #line 821 "/home/jens/Source/shotwell/src/Event.vala"
 	count = _tmp1_;
-#line 6386 "Event.c"
+#line 6388 "Event.c"
 	{
 		gint i = 0;
 #line 822 "/home/jens/Source/shotwell/src/Event.vala"
 		i = 0;
-#line 6391 "Event.c"
+#line 6393 "Event.c"
 		{
 			gboolean _tmp2_ = FALSE;
 #line 822 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp2_ = TRUE;
 #line 822 "/home/jens/Source/shotwell/src/Event.vala"
 			while (TRUE) {
-#line 6398 "Event.c"
-				gint _tmp4_ = 0;
-				gint _tmp5_ = 0;
+#line 6400 "Event.c"
+				gint _tmp4_;
+				gint _tmp5_;
 				time_t time = 0;
-				ViewCollection* _tmp6_ = NULL;
-				gint _tmp7_ = 0;
-				DataObject* _tmp8_ = NULL;
-				DataView* _tmp9_ = NULL;
-				DataSource* _tmp10_ = NULL;
-				MediaSource* _tmp11_ = NULL;
-				time_t _tmp12_ = 0;
-				time_t _tmp13_ = 0;
-				time_t _tmp14_ = 0;
+				ViewCollection* _tmp6_;
+				gint _tmp7_;
+				DataObject* _tmp8_;
+				DataView* _tmp9_;
+				DataSource* _tmp10_;
+				MediaSource* _tmp11_;
+				time_t _tmp12_;
+				time_t _tmp13_;
+				time_t _tmp14_;
 #line 822 "/home/jens/Source/shotwell/src/Event.vala"
 				if (!_tmp2_) {
-#line 6413 "Event.c"
-					gint _tmp3_ = 0;
+#line 6415 "Event.c"
+					gint _tmp3_;
 #line 822 "/home/jens/Source/shotwell/src/Event.vala"
 					_tmp3_ = i;
 #line 822 "/home/jens/Source/shotwell/src/Event.vala"
 					i = _tmp3_ + 1;
-#line 6419 "Event.c"
+#line 6421 "Event.c"
 				}
 #line 822 "/home/jens/Source/shotwell/src/Event.vala"
 				_tmp2_ = FALSE;
@@ -6428,7 +6430,7 @@ static time_t event_real_get_start_time (EventSource* base) {
 				if (!(_tmp4_ < _tmp5_)) {
 #line 822 "/home/jens/Source/shotwell/src/Event.vala"
 					break;
-#line 6431 "Event.c"
+#line 6433 "Event.c"
 				}
 #line 823 "/home/jens/Source/shotwell/src/Event.vala"
 				_tmp6_ = self->priv->view;
@@ -6460,7 +6462,7 @@ static time_t event_real_get_start_time (EventSource* base) {
 					result = time;
 #line 825 "/home/jens/Source/shotwell/src/Event.vala"
 					return result;
-#line 6463 "Event.c"
+#line 6465 "Event.c"
 				}
 			}
 		}
@@ -6469,7 +6471,7 @@ static time_t event_real_get_start_time (EventSource* base) {
 	result = (time_t) 0;
 #line 828 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 6472 "Event.c"
+#line 6474 "Event.c"
 }
 
 
@@ -6477,17 +6479,17 @@ static time_t event_real_get_end_time (EventSource* base) {
 	Event * self;
 	time_t result = 0;
 	gint count = 0;
-	ViewCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	ViewCollection* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	DataObject* _tmp5_ = NULL;
-	DataView* _tmp6_ = NULL;
-	DataSource* _tmp7_ = NULL;
-	MediaSource* _tmp8_ = NULL;
-	time_t _tmp9_ = 0;
-	time_t _tmp10_ = 0;
+	ViewCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	ViewCollection* _tmp3_;
+	gint _tmp4_;
+	DataObject* _tmp5_;
+	DataView* _tmp6_;
+	DataSource* _tmp7_;
+	MediaSource* _tmp8_;
+	time_t _tmp9_;
+	time_t _tmp10_;
 #line 831 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 832 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6504,7 +6506,7 @@ static time_t event_real_get_end_time (EventSource* base) {
 		result = (time_t) 0;
 #line 837 "/home/jens/Source/shotwell/src/Event.vala"
 		return result;
-#line 6507 "Event.c"
+#line 6509 "Event.c"
 	}
 #line 839 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp3_ = self->priv->view;
@@ -6530,7 +6532,7 @@ static time_t event_real_get_end_time (EventSource* base) {
 	result = _tmp10_;
 #line 839 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 6533 "Event.c"
+#line 6535 "Event.c"
 }
 
 
@@ -6542,13 +6544,13 @@ static guint64 event_real_get_total_filesize (EventSource* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 843 "/home/jens/Source/shotwell/src/Event.vala"
 	total = (guint64) 0;
-#line 6545 "Event.c"
+#line 6547 "Event.c"
 	{
 		GeeIterator* _current_source_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 844 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp0_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource));
 #line 844 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6563,15 +6565,15 @@ static guint64 event_real_get_total_filesize (EventSource* base) {
 		_current_source_it = _tmp3_;
 #line 844 "/home/jens/Source/shotwell/src/Event.vala"
 		while (TRUE) {
-#line 6566 "Event.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 6568 "Event.c"
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			MediaSource* current_source = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
-			guint64 _tmp8_ = 0ULL;
-			MediaSource* _tmp9_ = NULL;
-			guint64 _tmp10_ = 0ULL;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			guint64 _tmp8_;
+			MediaSource* _tmp9_;
+			guint64 _tmp10_;
 #line 844 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp4_ = _current_source_it;
 #line 844 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6580,7 +6582,7 @@ static guint64 event_real_get_total_filesize (EventSource* base) {
 			if (!_tmp5_) {
 #line 844 "/home/jens/Source/shotwell/src/Event.vala"
 				break;
-#line 6583 "Event.c"
+#line 6585 "Event.c"
 			}
 #line 844 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp6_ = _current_source_it;
@@ -6598,25 +6600,25 @@ static guint64 event_real_get_total_filesize (EventSource* base) {
 			total = _tmp8_ + _tmp10_;
 #line 844 "/home/jens/Source/shotwell/src/Event.vala"
 			_g_object_unref0 (current_source);
-#line 6601 "Event.c"
+#line 6603 "Event.c"
 		}
 #line 844 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_object_unref0 (_current_source_it);
-#line 6605 "Event.c"
+#line 6607 "Event.c"
 	}
 #line 848 "/home/jens/Source/shotwell/src/Event.vala"
 	result = total;
 #line 848 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 6611 "Event.c"
+#line 6613 "Event.c"
 }
 
 
 static gint event_real_get_media_count (EventSource* base) {
 	Event * self;
 	gint result = 0;
-	ViewCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	ViewCollection* _tmp0_;
+	gint _tmp1_;
 #line 851 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 852 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6627,15 +6629,15 @@ static gint event_real_get_media_count (EventSource* base) {
 	result = _tmp1_;
 #line 852 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 6630 "Event.c"
+#line 6632 "Event.c"
 }
 
 
 static GeeCollection* event_real_get_media (EventSource* base) {
 	Event * self;
 	GeeCollection* result = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	ViewCollection* _tmp0_;
+	GeeCollection* _tmp1_;
 #line 855 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
 #line 856 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6646,15 +6648,15 @@ static GeeCollection* event_real_get_media (EventSource* base) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 856 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 6649 "Event.c"
+#line 6651 "Event.c"
 }
 
 
 void event_mirror_photos (Event* self, ViewCollection* view, CreateView mirroring_ctor, void* mirroring_ctor_target) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	CreateView _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	CreateView _tmp2_;
+	void* _tmp2__target;
 #line 859 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (IS_EVENT (self));
 #line 859 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6669,7 +6671,7 @@ void event_mirror_photos (Event* self, ViewCollection* view, CreateView mirrorin
 	_tmp2__target = mirroring_ctor_target;
 #line 860 "/home/jens/Source/shotwell/src/Event.vala"
 	view_collection_mirror (_tmp0_, _tmp1_, _tmp2_, _tmp2__target, NULL, NULL);
-#line 6672 "Event.c"
+#line 6674 "Event.c"
 }
 
 
@@ -6678,14 +6680,14 @@ static void event_on_primary_thumbnail_altered (Event* self) {
 	g_return_if_fail (IS_EVENT (self));
 #line 864 "/home/jens/Source/shotwell/src/Event.vala"
 	thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 6681 "Event.c"
+#line 6683 "Event.c"
 }
 
 
 MediaSource* event_get_primary_source (Event* self) {
 	MediaSource* result = NULL;
-	MediaSource* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
+	MediaSource* _tmp0_;
+	MediaSource* _tmp1_;
 #line 867 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_EVENT (self), NULL);
 #line 868 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6696,24 +6698,24 @@ MediaSource* event_get_primary_source (Event* self) {
 	result = _tmp1_;
 #line 868 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 6699 "Event.c"
+#line 6701 "Event.c"
 }
 
 
 gboolean event_set_primary_source (Event* self, MediaSource* source) {
 	gboolean result = FALSE;
-	ViewCollection* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	ViewCollection* _tmp0_;
+	MediaSource* _tmp1_;
+	gboolean _tmp2_;
 	gboolean committed = FALSE;
-	EventTable* _tmp3_ = NULL;
-	EventID _tmp4_ = {0};
-	MediaSource* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_ = FALSE;
-	gboolean _tmp10_ = FALSE;
+	EventTable* _tmp3_;
+	EventID _tmp4_;
+	MediaSource* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gboolean _tmp8_;
+	gboolean _tmp9_;
+	gboolean _tmp10_;
 #line 871 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_EVENT (self), FALSE);
 #line 871 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6748,25 +6750,25 @@ gboolean event_set_primary_source (Event* self, MediaSource* source) {
 	_tmp10_ = committed;
 #line 875 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp10_) {
-#line 6751 "Event.c"
-		MediaSource* _tmp11_ = NULL;
-		MediaSource* _tmp14_ = NULL;
-		MediaSource* _tmp15_ = NULL;
-		MediaSource* _tmp16_ = NULL;
+#line 6753 "Event.c"
+		MediaSource* _tmp11_;
+		MediaSource* _tmp14_;
+		MediaSource* _tmp15_;
+		MediaSource* _tmp16_;
 #line 877 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp11_ = self->priv->primary_source;
 #line 877 "/home/jens/Source/shotwell/src/Event.vala"
 		if (_tmp11_ != NULL) {
-#line 6760 "Event.c"
-			MediaSource* _tmp12_ = NULL;
-			guint _tmp13_ = 0U;
+#line 6762 "Event.c"
+			MediaSource* _tmp12_;
+			guint _tmp13_;
 #line 878 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp12_ = self->priv->primary_source;
 #line 878 "/home/jens/Source/shotwell/src/Event.vala"
 			g_signal_parse_name ("thumbnail-altered", TYPE_THUMBNAIL_SOURCE, &_tmp13_, NULL, FALSE);
 #line 878 "/home/jens/Source/shotwell/src/Event.vala"
 			g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self);
-#line 6769 "Event.c"
+#line 6771 "Event.c"
 		}
 #line 880 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp14_ = source;
@@ -6782,20 +6784,20 @@ gboolean event_set_primary_source (Event* self, MediaSource* source) {
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), "thumbnail-altered", (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self, 0);
 #line 883 "/home/jens/Source/shotwell/src/Event.vala"
 		thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 6785 "Event.c"
+#line 6787 "Event.c"
 	}
 #line 886 "/home/jens/Source/shotwell/src/Event.vala"
 	result = committed;
 #line 886 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 6791 "Event.c"
+#line 6793 "Event.c"
 }
 
 
 static void event_release_primary_source (Event* self) {
-	MediaSource* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
+	MediaSource* _tmp0_;
+	MediaSource* _tmp1_;
+	guint _tmp2_;
 #line 889 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (IS_EVENT (self));
 #line 890 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6804,7 +6806,7 @@ static void event_release_primary_source (Event* self) {
 	if (_tmp0_ == NULL) {
 #line 891 "/home/jens/Source/shotwell/src/Event.vala"
 		return;
-#line 6807 "Event.c"
+#line 6809 "Event.c"
 	}
 #line 893 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp1_ = self->priv->primary_source;
@@ -6816,7 +6818,7 @@ static void event_release_primary_source (Event* self) {
 	_g_object_unref0 (self->priv->primary_source);
 #line 894 "/home/jens/Source/shotwell/src/Event.vala"
 	self->priv->primary_source = NULL;
-#line 6819 "Event.c"
+#line 6821 "Event.c"
 }
 
 
@@ -6824,7 +6826,7 @@ static GdkPixbuf* event_real_get_thumbnail (ThumbnailSource* base, gint scale, G
 	Event * self;
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
+	MediaSource* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 897 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
@@ -6832,10 +6834,10 @@ static GdkPixbuf* event_real_get_thumbnail (ThumbnailSource* base, gint scale, G
 	_tmp1_ = self->priv->primary_source;
 #line 898 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp1_ != NULL) {
-#line 6835 "Event.c"
-		MediaSource* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		GdkPixbuf* _tmp4_ = NULL;
+#line 6837 "Event.c"
+		MediaSource* _tmp2_;
+		gint _tmp3_;
+		GdkPixbuf* _tmp4_;
 #line 898 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp2_ = self->priv->primary_source;
 #line 898 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6854,20 +6856,20 @@ static GdkPixbuf* event_real_get_thumbnail (ThumbnailSource* base, gint scale, G
 			_g_object_unref0 (_tmp0_);
 #line 898 "/home/jens/Source/shotwell/src/Event.vala"
 			return NULL;
-#line 6857 "Event.c"
+#line 6859 "Event.c"
 		}
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_object_unref0 (_tmp0_);
 #line 898 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp0_ = NULL;
-#line 6864 "Event.c"
+#line 6866 "Event.c"
 	}
 #line 898 "/home/jens/Source/shotwell/src/Event.vala"
 	result = _tmp0_;
 #line 898 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 6870 "Event.c"
+#line 6872 "Event.c"
 }
 
 
@@ -6878,15 +6880,15 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) {
 	g_return_val_if_fail (IS_EVENT (self), NULL);
 #line 901 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 6881 "Event.c"
+#line 6883 "Event.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
-		MediaSource* _tmp1_ = NULL;
-		MediaSource* _tmp2_ = NULL;
-		Scaling _tmp3_ = {0};
-		GdkPixbuf* _tmp4_ = NULL;
-		GdkPixbuf* _tmp5_ = NULL;
-		GdkPixbuf* _tmp6_ = NULL;
+		MediaSource* _tmp1_;
+		MediaSource* _tmp2_;
+		Scaling _tmp3_;
+		GdkPixbuf* _tmp4_;
+		GdkPixbuf* _tmp5_;
+		GdkPixbuf* _tmp6_;
 #line 903 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp1_ = event_get_primary_source (self);
 #line 903 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6903,8 +6905,8 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) {
 		_tmp0_ = _tmp5_;
 #line 903 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6906 "Event.c"
-			goto __catch441_g_error;
+#line 6908 "Event.c"
+			goto __catch442_g_error;
 		}
 #line 903 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp6_ = _tmp0_;
@@ -6916,10 +6918,10 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) {
 		_g_object_unref0 (_tmp0_);
 #line 903 "/home/jens/Source/shotwell/src/Event.vala"
 		return result;
-#line 6919 "Event.c"
+#line 6921 "Event.c"
 	}
-	goto __finally441;
-	__catch441_g_error:
+	goto __finally442;
+	__catch442_g_error:
 	{
 		GError* err = NULL;
 #line 902 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6932,28 +6934,28 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) {
 		_g_error_free0 (err);
 #line 905 "/home/jens/Source/shotwell/src/Event.vala"
 		return result;
-#line 6935 "Event.c"
+#line 6937 "Event.c"
 	}
-	__finally441:
+	__finally442:
 #line 902 "/home/jens/Source/shotwell/src/Event.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 902 "/home/jens/Source/shotwell/src/Event.vala"
 	g_clear_error (&_inner_error_);
 #line 902 "/home/jens/Source/shotwell/src/Event.vala"
 	return NULL;
-#line 6944 "Event.c"
+#line 6946 "Event.c"
 }
 
 
 static void event_real_destroy (DataSource* base) {
 	Event * self;
-	ViewCollection* _tmp0_ = NULL;
-	PhotoTable* _tmp4_ = NULL;
-	PhotoTable* _tmp5_ = NULL;
-	EventID _tmp6_ = {0};
-	VideoTable* _tmp7_ = NULL;
-	VideoTable* _tmp8_ = NULL;
-	EventID _tmp9_ = {0};
+	ViewCollection* _tmp0_;
+	PhotoTable* _tmp4_;
+	PhotoTable* _tmp5_;
+	EventID _tmp6_;
+	VideoTable* _tmp7_;
+	VideoTable* _tmp8_;
+	EventID _tmp9_;
 	GError * _inner_error_ = NULL;
 #line 909 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
@@ -6961,10 +6963,10 @@ static void event_real_destroy (DataSource* base) {
 	_tmp0_ = self->priv->view;
 #line 911 "/home/jens/Source/shotwell/src/Event.vala"
 	view_collection_halt_all_monitoring (_tmp0_);
-#line 6964 "Event.c"
+#line 6966 "Event.c"
 	{
-		EventTable* _tmp1_ = NULL;
-		EventID _tmp2_ = {0};
+		EventTable* _tmp1_;
+		EventID _tmp2_;
 #line 915 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp1_ = event_event_table;
 #line 915 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6975,8 +6977,8 @@ static void event_real_destroy (DataSource* base) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 915 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6978 "Event.c"
-				goto __catch442_database_error;
+#line 6980 "Event.c"
+				goto __catch443_database_error;
 			}
 #line 915 "/home/jens/Source/shotwell/src/Event.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6984,14 +6986,14 @@ static void event_real_destroy (DataSource* base) {
 			g_clear_error (&_inner_error_);
 #line 915 "/home/jens/Source/shotwell/src/Event.vala"
 			return;
-#line 6987 "Event.c"
+#line 6989 "Event.c"
 		}
 	}
-	goto __finally442;
-	__catch442_database_error:
+	goto __finally443;
+	__catch443_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 914 "/home/jens/Source/shotwell/src/Event.vala"
 		err = _inner_error_;
 #line 914 "/home/jens/Source/shotwell/src/Event.vala"
@@ -7002,9 +7004,9 @@ static void event_real_destroy (DataSource* base) {
 		app_window_database_error (_tmp3_);
 #line 914 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_error_free0 (err);
-#line 7005 "Event.c"
+#line 7007 "Event.c"
 	}
-	__finally442:
+	__finally443:
 #line 914 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 914 "/home/jens/Source/shotwell/src/Event.vala"
@@ -7013,7 +7015,7 @@ static void event_real_destroy (DataSource* base) {
 		g_clear_error (&_inner_error_);
 #line 914 "/home/jens/Source/shotwell/src/Event.vala"
 		return;
-#line 7016 "Event.c"
+#line 7018 "Event.c"
 	}
 #line 921 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp4_ = photo_table_get_instance ();
@@ -7037,28 +7039,28 @@ static void event_real_destroy (DataSource* base) {
 	_database_table_unref0 (_tmp8_);
 #line 924 "/home/jens/Source/shotwell/src/Event.vala"
 	DATA_SOURCE_CLASS (event_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource), TYPE_DATA_SOURCE, DataSource));
-#line 7040 "Event.c"
+#line 7042 "Event.c"
 }
 
 
 static void _event_event_snapshot_on_attached_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 126 "/home/jens/Source/shotwell/src/Event.vala"
 	event_event_snapshot_on_attached_source_destroyed ((EventEventSnapshot*) self, source);
-#line 7047 "Event.c"
+#line 7049 "Event.c"
 }
 
 
 static EventEventSnapshot* event_event_snapshot_construct (GType object_type, Event* event) {
 	EventEventSnapshot* self = NULL;
-	EventTable* _tmp0_ = NULL;
-	EventTable* _tmp1_ = NULL;
-	Event* _tmp2_ = NULL;
+	EventTable* _tmp0_;
+	EventTable* _tmp1_;
+	Event* _tmp2_;
 	EventID _tmp3_ = {0};
-	EventRow* _tmp4_ = NULL;
-	Event* _tmp5_ = NULL;
-	MediaSource* _tmp6_ = NULL;
-	LibraryPhotoSourceCollection* _tmp18_ = NULL;
-	VideoSourceCollection* _tmp19_ = NULL;
+	EventRow* _tmp4_;
+	Event* _tmp5_;
+	MediaSource* _tmp6_;
+	LibraryPhotoSourceCollection* _tmp18_;
+	VideoSourceCollection* _tmp19_;
 #line 110 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_EVENT (event), NULL);
 #line 110 "/home/jens/Source/shotwell/src/Event.vala"
@@ -7087,14 +7089,14 @@ static EventEventSnapshot* event_event_snapshot_construct (GType object_type, Ev
 	_g_object_unref0 (self->priv->primary_source);
 #line 113 "/home/jens/Source/shotwell/src/Event.vala"
 	self->priv->primary_source = _tmp6_;
-#line 7090 "Event.c"
+#line 7092 "Event.c"
 	{
 		GeeIterator* _source_it = NULL;
-		Event* _tmp7_ = NULL;
-		GeeCollection* _tmp8_ = NULL;
-		GeeCollection* _tmp9_ = NULL;
-		GeeIterator* _tmp10_ = NULL;
-		GeeIterator* _tmp11_ = NULL;
+		Event* _tmp7_;
+		GeeCollection* _tmp8_;
+		GeeCollection* _tmp9_;
+		GeeIterator* _tmp10_;
+		GeeIterator* _tmp11_;
 #line 118 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp7_ = event;
 #line 118 "/home/jens/Source/shotwell/src/Event.vala"
@@ -7111,14 +7113,14 @@ static EventEventSnapshot* event_event_snapshot_construct (GType object_type, Ev
 		_source_it = _tmp11_;
 #line 118 "/home/jens/Source/shotwell/src/Event.vala"
 		while (TRUE) {
-#line 7114 "Event.c"
-			GeeIterator* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
+#line 7116 "Event.c"
+			GeeIterator* _tmp12_;
+			gboolean _tmp13_;
 			MediaSource* source = NULL;
-			GeeIterator* _tmp14_ = NULL;
-			gpointer _tmp15_ = NULL;
-			GeeArrayList* _tmp16_ = NULL;
-			MediaSource* _tmp17_ = NULL;
+			GeeIterator* _tmp14_;
+			gpointer _tmp15_;
+			GeeArrayList* _tmp16_;
+			MediaSource* _tmp17_;
 #line 118 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp12_ = _source_it;
 #line 118 "/home/jens/Source/shotwell/src/Event.vala"
@@ -7127,7 +7129,7 @@ static EventEventSnapshot* event_event_snapshot_construct (GType object_type, Ev
 			if (!_tmp13_) {
 #line 118 "/home/jens/Source/shotwell/src/Event.vala"
 				break;
-#line 7130 "Event.c"
+#line 7132 "Event.c"
 			}
 #line 118 "/home/jens/Source/shotwell/src/Event.vala"
 			_tmp14_ = _source_it;
@@ -7143,11 +7145,11 @@ static EventEventSnapshot* event_event_snapshot_construct (GType object_type, Ev
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
 #line 118 "/home/jens/Source/shotwell/src/Event.vala"
 			_g_object_unref0 (source);
-#line 7146 "Event.c"
+#line 7148 "Event.c"
 		}
 #line 118 "/home/jens/Source/shotwell/src/Event.vala"
 		_g_object_unref0 (_source_it);
-#line 7150 "Event.c"
+#line 7152 "Event.c"
 	}
 #line 121 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp18_ = library_photo_global;
@@ -7159,28 +7161,28 @@ static EventEventSnapshot* event_event_snapshot_construct (GType object_type, Ev
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _event_event_snapshot_on_attached_source_destroyed_source_collection_item_destroyed, self);
 #line 110 "/home/jens/Source/shotwell/src/Event.vala"
 	return self;
-#line 7162 "Event.c"
+#line 7164 "Event.c"
 }
 
 
 static EventEventSnapshot* event_event_snapshot_new (Event* event) {
 #line 110 "/home/jens/Source/shotwell/src/Event.vala"
 	return event_event_snapshot_construct (EVENT_TYPE_EVENT_SNAPSHOT, event);
-#line 7169 "Event.c"
+#line 7171 "Event.c"
 }
 
 
 static gpointer _event_row_ref0 (gpointer self) {
 #line 131 "/home/jens/Source/shotwell/src/Event.vala"
 	return self ? event_row_ref (self) : NULL;
-#line 7176 "Event.c"
+#line 7178 "Event.c"
 }
 
 
 static EventRow* event_event_snapshot_get_row (EventEventSnapshot* self) {
 	EventRow* result = NULL;
-	EventRow* _tmp0_ = NULL;
-	EventRow* _tmp1_ = NULL;
+	EventRow* _tmp0_;
+	EventRow* _tmp1_;
 #line 130 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (EVENT_IS_EVENT_SNAPSHOT (self), NULL);
 #line 131 "/home/jens/Source/shotwell/src/Event.vala"
@@ -7191,14 +7193,14 @@ static EventRow* event_event_snapshot_get_row (EventEventSnapshot* self) {
 	result = _tmp1_;
 #line 131 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 7194 "Event.c"
+#line 7196 "Event.c"
 }
 
 
 static void event_event_snapshot_real_notify_broken (SourceSnapshot* base) {
 	EventEventSnapshot * self;
-	EventRow* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
+	EventRow* _tmp0_;
+	GeeArrayList* _tmp1_;
 #line 134 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENT_TYPE_EVENT_SNAPSHOT, EventEventSnapshot);
 #line 135 "/home/jens/Source/shotwell/src/Event.vala"
@@ -7217,16 +7219,16 @@ static void event_event_snapshot_real_notify_broken (SourceSnapshot* base) {
 	gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 139 "/home/jens/Source/shotwell/src/Event.vala"
 	SOURCE_SNAPSHOT_CLASS (event_event_snapshot_parent_class)->notify_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_SNAPSHOT, SourceSnapshot));
-#line 7220 "Event.c"
+#line 7222 "Event.c"
 }
 
 
 static void event_event_snapshot_on_attached_source_destroyed (EventEventSnapshot* self, DataSource* source) {
 	MediaSource* media_source = NULL;
-	DataSource* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	MediaSource* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	MediaSource* _tmp3_ = NULL;
+	MediaSource* _tmp3_;
 #line 142 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (EVENT_IS_EVENT_SNAPSHOT (self));
 #line 142 "/home/jens/Source/shotwell/src/Event.vala"
@@ -7241,10 +7243,10 @@ static void event_event_snapshot_on_attached_source_destroyed (EventEventSnapsho
 	_tmp3_ = media_source;
 #line 146 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp3_ != NULL) {
-#line 7244 "Event.c"
-		MediaSource* _tmp4_ = NULL;
-		MediaSource* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+#line 7246 "Event.c"
+		MediaSource* _tmp4_;
+		MediaSource* _tmp5_;
+		gboolean _tmp6_;
 #line 146 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp4_ = self->priv->primary_source;
 #line 146 "/home/jens/Source/shotwell/src/Event.vala"
@@ -7253,21 +7255,21 @@ static void event_event_snapshot_on_attached_source_destroyed (EventEventSnapsho
 		_tmp6_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_SOURCE, DataSource));
 #line 146 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp2_ = _tmp6_;
-#line 7256 "Event.c"
+#line 7258 "Event.c"
 	} else {
 #line 146 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp2_ = FALSE;
-#line 7260 "Event.c"
+#line 7262 "Event.c"
 	}
 #line 146 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp2_) {
 #line 147 "/home/jens/Source/shotwell/src/Event.vala"
 		source_snapshot_notify_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_SNAPSHOT, SourceSnapshot));
-#line 7266 "Event.c"
+#line 7268 "Event.c"
 	} else {
-		GeeArrayList* _tmp7_ = NULL;
-		MediaSource* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
+		GeeArrayList* _tmp7_;
+		MediaSource* _tmp8_;
+		gboolean _tmp9_;
 #line 148 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp7_ = self->priv->attached_sources;
 #line 148 "/home/jens/Source/shotwell/src/Event.vala"
@@ -7278,12 +7280,12 @@ static void event_event_snapshot_on_attached_source_destroyed (EventEventSnapsho
 		if (_tmp9_) {
 #line 149 "/home/jens/Source/shotwell/src/Event.vala"
 			source_snapshot_notify_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_SNAPSHOT, SourceSnapshot));
-#line 7281 "Event.c"
+#line 7283 "Event.c"
 		}
 	}
 #line 142 "/home/jens/Source/shotwell/src/Event.vala"
 	_g_object_unref0 (media_source);
-#line 7286 "Event.c"
+#line 7288 "Event.c"
 }
 
 
@@ -7295,29 +7297,29 @@ static void event_event_snapshot_class_init (EventEventSnapshotClass * klass) {
 #line 105 "/home/jens/Source/shotwell/src/Event.vala"
 	g_type_class_add_private (klass, sizeof (EventEventSnapshotPrivate));
 #line 105 "/home/jens/Source/shotwell/src/Event.vala"
-	((SourceSnapshotClass *) klass)->notify_broken = (void (*)(SourceSnapshot*)) event_event_snapshot_real_notify_broken;
-#line 7299 "Event.c"
+	((SourceSnapshotClass *) klass)->notify_broken = (void (*) (SourceSnapshot *)) event_event_snapshot_real_notify_broken;
+#line 7301 "Event.c"
 }
 
 
 static void event_event_snapshot_instance_init (EventEventSnapshot * self) {
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 #line 105 "/home/jens/Source/shotwell/src/Event.vala"
 	self->priv = EVENT_EVENT_SNAPSHOT_GET_PRIVATE (self);
 #line 108 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 108 "/home/jens/Source/shotwell/src/Event.vala"
 	self->priv->attached_sources = _tmp0_;
-#line 7311 "Event.c"
+#line 7313 "Event.c"
 }
 
 
-static void event_event_snapshot_finalize (SourceSnapshot* obj) {
+static void event_event_snapshot_finalize (SourceSnapshot * obj) {
 	EventEventSnapshot * self;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	VideoSourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	LibraryPhotoSourceCollection* _tmp0_;
+	guint _tmp1_;
+	VideoSourceCollection* _tmp2_;
+	guint _tmp3_;
 #line 105 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENT_TYPE_EVENT_SNAPSHOT, EventEventSnapshot);
 #line 126 "/home/jens/Source/shotwell/src/Event.vala"
@@ -7340,7 +7342,7 @@ static void event_event_snapshot_finalize (SourceSnapshot* obj) {
 	_g_object_unref0 (self->priv->attached_sources);
 #line 105 "/home/jens/Source/shotwell/src/Event.vala"
 	SOURCE_SNAPSHOT_CLASS (event_event_snapshot_parent_class)->finalize (obj);
-#line 7343 "Event.c"
+#line 7345 "Event.c"
 }
 
 
@@ -7358,7 +7360,7 @@ static GType event_event_snapshot_get_type (void) {
 
 static EventEventProxy* event_event_proxy_construct (GType object_type, Event* event) {
 	EventEventProxy* self = NULL;
-	Event* _tmp0_ = NULL;
+	Event* _tmp0_;
 #line 154 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (IS_EVENT (event), NULL);
 #line 155 "/home/jens/Source/shotwell/src/Event.vala"
@@ -7367,21 +7369,21 @@ static EventEventProxy* event_event_proxy_construct (GType object_type, Event* e
 	self = (EventEventProxy*) source_proxy_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource));
 #line 154 "/home/jens/Source/shotwell/src/Event.vala"
 	return self;
-#line 7370 "Event.c"
+#line 7372 "Event.c"
 }
 
 
 static EventEventProxy* event_event_proxy_new (Event* event) {
 #line 154 "/home/jens/Source/shotwell/src/Event.vala"
 	return event_event_proxy_construct (EVENT_TYPE_EVENT_PROXY, event);
-#line 7377 "Event.c"
+#line 7379 "Event.c"
 }
 
 
 static gpointer _source_snapshot_ref0 (gpointer self) {
 #line 159 "/home/jens/Source/shotwell/src/Event.vala"
 	return self ? source_snapshot_ref (self) : NULL;
-#line 7384 "Event.c"
+#line 7386 "Event.c"
 }
 
 
@@ -7389,13 +7391,13 @@ static DataSource* event_event_proxy_real_reconstitute (SourceProxy* base, gint6
 	EventEventProxy * self;
 	DataSource* result = NULL;
 	EventEventSnapshot* event_snapshot = NULL;
-	SourceSnapshot* _tmp0_ = NULL;
-	EventEventSnapshot* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	EventRow* _tmp3_ = NULL;
-	EventRow* _tmp4_ = NULL;
-	Event* _tmp5_ = NULL;
-	DataSource* _tmp6_ = NULL;
+	SourceSnapshot* _tmp0_;
+	EventEventSnapshot* _tmp1_;
+	gint64 _tmp2_;
+	EventRow* _tmp3_;
+	EventRow* _tmp4_;
+	Event* _tmp5_;
+	DataSource* _tmp6_;
 #line 158 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENT_TYPE_EVENT_PROXY, EventEventProxy);
 #line 158 "/home/jens/Source/shotwell/src/Event.vala"
@@ -7426,7 +7428,7 @@ static DataSource* event_event_proxy_real_reconstitute (SourceProxy* base, gint6
 	_source_snapshot_unref0 (event_snapshot);
 #line 162 "/home/jens/Source/shotwell/src/Event.vala"
 	return result;
-#line 7429 "Event.c"
+#line 7431 "Event.c"
 }
 
 
@@ -7434,8 +7436,8 @@ static void event_event_proxy_class_init (EventEventProxyClass * klass) {
 #line 153 "/home/jens/Source/shotwell/src/Event.vala"
 	event_event_proxy_parent_class = g_type_class_peek_parent (klass);
 #line 153 "/home/jens/Source/shotwell/src/Event.vala"
-	((SourceProxyClass *) klass)->reconstitute = (DataSource* (*)(SourceProxy*, gint64, SourceSnapshot*)) event_event_proxy_real_reconstitute;
-#line 7438 "Event.c"
+	((SourceProxyClass *) klass)->reconstitute = (DataSource* (*) (SourceProxy *, gint64, SourceSnapshot*)) event_event_proxy_real_reconstitute;
+#line 7440 "Event.c"
 }
 
 
@@ -7461,46 +7463,46 @@ static void event_class_init (EventClass * klass) {
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
 	g_type_class_add_private (klass, sizeof (EventPrivate));
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) event_real_get_typename;
+	((DataSourceClass *) klass)->get_typename = (gchar* (*) (DataSource *)) event_real_get_typename;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) event_real_get_instance_id;
+	((DataSourceClass *) klass)->get_instance_id = (gint64 (*) (DataSource *)) event_real_get_instance_id;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((ThumbnailSourceClass *) klass)->get_representative_id = (gchar* (*)(ThumbnailSource*)) event_real_get_representative_id;
+	((ThumbnailSourceClass *) klass)->get_representative_id = (gchar* (*) (ThumbnailSource *)) event_real_get_representative_id;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*)(ThumbnailSource*)) event_real_get_preferred_thumbnail_format;
+	((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*) (ThumbnailSource *)) event_real_get_preferred_thumbnail_format;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) event_real_create_thumbnail;
+	((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) event_real_create_thumbnail;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((DataSourceClass *) klass)->notify_relinking = (void (*)(DataSource*, SourceCollection*)) event_real_notify_relinking;
+	((DataSourceClass *) klass)->notify_relinking = (void (*) (DataSource *, SourceCollection*)) event_real_notify_relinking;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((DataSourceClass *) klass)->save_snapshot = (SourceSnapshot* (*)(DataSource*)) event_real_save_snapshot;
+	((DataSourceClass *) klass)->save_snapshot = (SourceSnapshot* (*) (DataSource *)) event_real_save_snapshot;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((DataSourceClass *) klass)->equals = (gboolean (*)(DataSource*, DataSource*)) event_real_equals;
+	((DataSourceClass *) klass)->equals = (gboolean (*) (DataSource *, DataSource*)) event_real_equals;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) event_real_to_string;
+	((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) event_real_to_string;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) event_real_get_name;
+	((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) event_real_get_name;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((EventSourceClass *) klass)->get_comment = (gchar* (*)(EventSource*)) event_real_get_comment;
+	((EventSourceClass *) klass)->get_comment = (gchar* (*) (EventSource *)) event_real_get_comment;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((EventSourceClass *) klass)->set_comment = (gboolean (*)(EventSource*, const gchar*)) event_real_set_comment;
+	((EventSourceClass *) klass)->set_comment = (gboolean (*) (EventSource *, const gchar*)) event_real_set_comment;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((EventSourceClass *) klass)->get_start_time = (time_t (*)(EventSource*)) event_real_get_start_time;
+	((EventSourceClass *) klass)->get_start_time = (time_t (*) (EventSource *)) event_real_get_start_time;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((EventSourceClass *) klass)->get_end_time = (time_t (*)(EventSource*)) event_real_get_end_time;
+	((EventSourceClass *) klass)->get_end_time = (time_t (*) (EventSource *)) event_real_get_end_time;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((EventSourceClass *) klass)->get_total_filesize = (guint64 (*)(EventSource*)) event_real_get_total_filesize;
+	((EventSourceClass *) klass)->get_total_filesize = (guint64 (*) (EventSource *)) event_real_get_total_filesize;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((EventSourceClass *) klass)->get_media_count = (gint (*)(EventSource*)) event_real_get_media_count;
+	((EventSourceClass *) klass)->get_media_count = (gint (*) (EventSource *)) event_real_get_media_count;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((EventSourceClass *) klass)->get_media = (GeeCollection* (*)(EventSource*)) event_real_get_media;
+	((EventSourceClass *) klass)->get_media = (GeeCollection* (*) (EventSource *)) event_real_get_media;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) event_real_get_thumbnail;
+	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) event_real_get_thumbnail;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	((DataSourceClass *) klass)->destroy = (void (*)(DataSource*)) event_real_destroy;
+	((DataSourceClass *) klass)->destroy = (void (*) (DataSource *)) event_real_destroy;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
 	G_OBJECT_CLASS (klass)->finalize = event_finalize;
-#line 7503 "Event.c"
+#line 7505 "Event.c"
 }
 
 
@@ -7508,18 +7510,18 @@ static void event_container_source_interface_init (ContainerSourceIface * iface)
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
 	event_container_source_parent_iface = g_type_interface_peek_parent (iface);
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	iface->has_links = (gboolean (*)(ContainerSource*)) event_real_has_links;
+	iface->has_links = (gboolean (*) (ContainerSource *)) event_real_has_links;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	iface->get_backlink = (SourceBacklink* (*)(ContainerSource*)) event_real_get_backlink;
+	iface->get_backlink = (SourceBacklink* (*) (ContainerSource *)) event_real_get_backlink;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	iface->break_link = (void (*)(ContainerSource*, DataSource*)) event_real_break_link;
+	iface->break_link = (void (*) (ContainerSource *, DataSource*)) event_real_break_link;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	iface->break_link_many = (void (*)(ContainerSource*, GeeCollection*)) event_real_break_link_many;
+	iface->break_link_many = (void (*) (ContainerSource *, GeeCollection*)) event_real_break_link_many;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	iface->establish_link = (void (*)(ContainerSource*, DataSource*)) event_real_establish_link;
+	iface->establish_link = (void (*) (ContainerSource *, DataSource*)) event_real_establish_link;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	iface->establish_link_many = (void (*)(ContainerSource*, GeeCollection*)) event_real_establish_link_many;
-#line 7522 "Event.c"
+	iface->establish_link_many = (void (*) (ContainerSource *, GeeCollection*)) event_real_establish_link_many;
+#line 7524 "Event.c"
 }
 
 
@@ -7527,8 +7529,8 @@ static void event_proxyable_interface_init (ProxyableIface * iface) {
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
 	event_proxyable_parent_iface = g_type_interface_peek_parent (iface);
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	iface->get_proxy = (SourceProxy* (*)(Proxyable*)) event_real_get_proxy;
-#line 7531 "Event.c"
+	iface->get_proxy = (SourceProxy* (*) (Proxyable *)) event_real_get_proxy;
+#line 7533 "Event.c"
 }
 
 
@@ -7536,8 +7538,8 @@ static void event_indexable_interface_init (IndexableIface * iface) {
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
 	event_indexable_parent_iface = g_type_interface_peek_parent (iface);
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
-	iface->get_indexable_keywords = (const gchar* (*)(Indexable*)) event_real_get_indexable_keywords;
-#line 7540 "Event.c"
+	iface->get_indexable_keywords = (const gchar* (*) (Indexable *)) event_real_get_indexable_keywords;
+#line 7542 "Event.c"
 }
 
 
@@ -7552,39 +7554,39 @@ static void event_instance_init (Event * self) {
 	self->priv->indexable_keywords = NULL;
 #line 178 "/home/jens/Source/shotwell/src/Event.vala"
 	self->priv->comment = NULL;
-#line 7555 "Event.c"
+#line 7557 "Event.c"
 }
 
 
-static void event_finalize (GObject* obj) {
+static void event_finalize (GObject * obj) {
 	Event * self;
-	MediaSource* _tmp0_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
-	ViewCollection* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	ViewCollection* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
-	LibraryPhotoSourceCollection* _tmp9_ = NULL;
-	guint _tmp10_ = 0U;
-	VideoSourceCollection* _tmp11_ = NULL;
-	guint _tmp12_ = 0U;
+	MediaSource* _tmp0_;
+	ViewCollection* _tmp3_;
+	guint _tmp4_;
+	ViewCollection* _tmp5_;
+	guint _tmp6_;
+	ViewCollection* _tmp7_;
+	guint _tmp8_;
+	LibraryPhotoSourceCollection* _tmp9_;
+	guint _tmp10_;
+	VideoSourceCollection* _tmp11_;
+	guint _tmp12_;
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT, Event);
 #line 237 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp0_ = self->priv->primary_source;
 #line 237 "/home/jens/Source/shotwell/src/Event.vala"
 	if (_tmp0_ != NULL) {
-#line 7578 "Event.c"
-		MediaSource* _tmp1_ = NULL;
-		guint _tmp2_ = 0U;
+#line 7580 "Event.c"
+		MediaSource* _tmp1_;
+		guint _tmp2_;
 #line 238 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp1_ = self->priv->primary_source;
 #line 238 "/home/jens/Source/shotwell/src/Event.vala"
 		g_signal_parse_name ("thumbnail-altered", TYPE_THUMBNAIL_SOURCE, &_tmp2_, NULL, FALSE);
 #line 238 "/home/jens/Source/shotwell/src/Event.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self);
-#line 7587 "Event.c"
+#line 7589 "Event.c"
 	}
 #line 240 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp3_ = self->priv->view;
@@ -7628,7 +7630,7 @@ static void event_finalize (GObject* obj) {
 	_g_free0 (self->priv->comment);
 #line 94 "/home/jens/Source/shotwell/src/Event.vala"
 	G_OBJECT_CLASS (event_parent_class)->finalize (obj);
-#line 7631 "Event.c"
+#line 7633 "Event.c"
 }
 
 
diff --git a/src/Exporter.c b/src/Exporter.c
index 60a528c..b0a15a6 100644
--- a/src/Exporter.c
+++ b/src/Exporter.c
@@ -1,4 +1,4 @@
-/* Exporter.c generated by valac 0.34.7, the Vala compiler
+/* Exporter.c generated by valac 0.36.6, the Vala compiler
  * generated from Exporter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -442,7 +442,7 @@ GType background_job_get_type (void) G_GNUC_CONST;
 static void exporter_on_exported (Exporter* self, BackgroundJob* j);
 static GType exporter_export_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType background_job_job_priority_get_type (void) G_GNUC_CONST;
-static void _vala_array_add128 (GFile*** array, int* length, int* size, GFile* value);
+static void _vala_array_add128 (GFile** * array, int* length, int* size, GFile* value);
 static void exporter_on_export_cancelled (Exporter* self, BackgroundJob* j);
 GFile** exporter_get_exported_files (Exporter* self, int* result_length1);
 static GFile** _vala_array_dup30 (GFile** self, int length);
@@ -453,7 +453,7 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
 GType video_source_get_type (void) G_GNUC_CONST;
 GType video_get_type (void) G_GNUC_CONST;
 gchar* media_source_get_basename (MediaSource* self);
-static void _vala_array_add129 (GFile*** array, int* length, int* size, GFile* value);
+static void _vala_array_add129 (GFile** * array, int* length, int* size, GFile* value);
 GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error);
 GFile* app_dirs_get_temp_dir (void);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
@@ -479,8 +479,8 @@ static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self);
 static void exporter_export_job_real_execute (BackgroundJob* base);
 void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error);
 void video_export (Video* self, GFile* dest_file, GError** error);
-static void exporter_export_job_finalize (BackgroundJob* obj);
-static void exporter_finalize (GObject* obj);
+static void exporter_export_job_finalize (BackgroundJob * obj);
+static void exporter_finalize (GObject * obj);
 gpointer exporter_ui_ref (gpointer instance);
 void exporter_ui_unref (gpointer instance);
 GParamSpec* param_spec_exporter_ui (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -514,7 +514,7 @@ void progress_dialog_close (ProgressDialog* self);
 void page_window_set_normal_cursor (PageWindow* self);
 GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* affirmative_all, const gchar* title, GtkWindow* parent);
 GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining);
-static void exporter_ui_finalize (ExporterUI* obj);
+static void exporter_ui_finalize (ExporterUI * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -532,9 +532,9 @@ GType export_format_mode_get_type (void) {
 
 
 static void export_format_parameters_init (ExportFormatParameters *self, ExportFormatMode mode, PhotoFileFormat specified_format, JpegQuality quality) {
-	ExportFormatMode _tmp0_ = 0;
-	PhotoFileFormat _tmp1_ = 0;
-	JpegQuality _tmp2_ = 0;
+	ExportFormatMode _tmp0_;
+	PhotoFileFormat _tmp1_;
+	JpegQuality _tmp2_;
 #line 20 "/home/jens/Source/shotwell/src/Exporter.vala"
 	memset (self, 0, sizeof (ExportFormatParameters));
 #line 22 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -556,7 +556,7 @@ static void export_format_parameters_init (ExportFormatParameters *self, ExportF
 
 
 void export_format_parameters_current (ExportFormatParameters* result) {
-	PhotoFileFormat _tmp0_ = 0;
+	PhotoFileFormat _tmp0_;
 	ExportFormatParameters _tmp1_ = {0};
 #line 29 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_tmp0_ = photo_file_format_get_system_default_format ();
@@ -571,7 +571,7 @@ void export_format_parameters_current (ExportFormatParameters* result) {
 
 
 void export_format_parameters_unmodified (ExportFormatParameters* result) {
-	PhotoFileFormat _tmp0_ = 0;
+	PhotoFileFormat _tmp0_;
 	ExportFormatParameters _tmp1_ = {0};
 #line 34 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_tmp0_ = photo_file_format_get_system_default_format ();
@@ -586,7 +586,7 @@ void export_format_parameters_unmodified (ExportFormatParameters* result) {
 
 
 void export_format_parameters_for_format (PhotoFileFormat format, ExportFormatParameters* result) {
-	PhotoFileFormat _tmp0_ = 0;
+	PhotoFileFormat _tmp0_;
 	ExportFormatParameters _tmp1_ = {0};
 #line 39 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_tmp0_ = format;
@@ -601,7 +601,7 @@ void export_format_parameters_for_format (PhotoFileFormat format, ExportFormatPa
 
 
 void export_format_parameters_last (ExportFormatParameters* result) {
-	PhotoFileFormat _tmp0_ = 0;
+	PhotoFileFormat _tmp0_;
 	ExportFormatParameters _tmp1_ = {0};
 #line 43 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_tmp0_ = photo_file_format_get_system_default_format ();
@@ -616,7 +616,7 @@ void export_format_parameters_last (ExportFormatParameters* result) {
 
 
 void export_format_parameters_for_JPEG (JpegQuality quality, ExportFormatParameters* result) {
-	JpegQuality _tmp0_ = 0;
+	JpegQuality _tmp0_;
 	ExportFormatParameters _tmp1_ = {0};
 #line 48 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_tmp0_ = quality;
@@ -681,13 +681,13 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 Exporter* exporter_construct (GType object_type, GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all) {
 	Exporter * self = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	Scaling _tmp4_ = {0};
-	ExportFormatParameters _tmp5_ = {0};
-	gboolean _tmp6_ = FALSE;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	Scaling _tmp4_;
+	ExportFormatParameters _tmp5_;
+	gboolean _tmp6_;
 #line 122 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (to_export), NULL);
 #line 122 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -739,10 +739,10 @@ Exporter* exporter_new (GeeCollection* to_export, GFile* dir, Scaling* scaling,
 
 Exporter* exporter_construct_for_temp_file (GType object_type, GeeCollection* to_export, Scaling* scaling, ExportFormatParameters* export_params) {
 	Exporter * self = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	Scaling _tmp2_ = {0};
-	ExportFormatParameters _tmp3_ = {0};
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp1_;
+	Scaling _tmp2_;
+	ExportFormatParameters _tmp3_;
 #line 131 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (to_export), NULL);
 #line 131 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -783,19 +783,19 @@ Exporter* exporter_new_for_temp_file (GeeCollection* to_export, Scaling* scaling
 
 
 void exporter_export (Exporter* self, ExporterCompletionCallback completion_callback, void* completion_callback_target, ExporterExportFailedCallback error_callback, void* error_callback_target, ExporterOverwriteCallback overwrite_callback, void* overwrite_callback_target, GCancellable* cancellable, ProgressMonitor monitor, void* monitor_target) {
-	ExporterCompletionCallback _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	ExporterExportFailedCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	ExporterOverwriteCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	ProgressMonitor _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
+	ExporterCompletionCallback _tmp0_;
+	void* _tmp0__target;
+	ExporterExportFailedCallback _tmp1_;
+	void* _tmp1__target;
+	ExporterOverwriteCallback _tmp2_;
+	void* _tmp2__target;
+	ProgressMonitor _tmp3_;
+	void* _tmp3__target;
 	GCancellable* _tmp4_ = NULL;
-	GCancellable* _tmp5_ = NULL;
-	GCancellable* _tmp6_ = NULL;
-	GCancellable* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	GCancellable* _tmp5_;
+	GCancellable* _tmp6_;
+	GCancellable* _tmp8_;
+	gboolean _tmp9_;
 #line 140 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_return_if_fail (IS_EXPORTER (self));
 #line 140 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -841,7 +841,7 @@ void exporter_export (Exporter* self, ExporterCompletionCallback completion_call
 #line 146 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if (_tmp4_ == NULL) {
 #line 844 "Exporter.c"
-		GCancellable* _tmp7_ = NULL;
+		GCancellable* _tmp7_;
 #line 146 "/home/jens/Source/shotwell/src/Exporter.vala"
 		_tmp7_ = g_cancellable_new ();
 #line 146 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -879,7 +879,7 @@ static gpointer _background_job_ref0 (gpointer self) {
 }
 
 
-static void _vala_array_add128 (GFile*** array, int* length, int* size, GFile* value) {
+static void _vala_array_add128 (GFile** * array, int* length, int* size, GFile* value) {
 #line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if ((*length) == (*size)) {
 #line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -898,19 +898,19 @@ static void _vala_array_add128 (GFile*** array, int* length, int* size, GFile* v
 
 static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
 	ExporterExportJob* job = NULL;
-	BackgroundJob* _tmp0_ = NULL;
-	ExporterExportJob* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	BackgroundJob* _tmp0_;
+	ExporterExportJob* _tmp1_;
+	gint _tmp2_;
 	gboolean completed = FALSE;
-	gint _tmp3_ = 0;
-	GeeCollection* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gint _tmp3_;
+	GeeCollection* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 	gboolean _tmp7_ = FALSE;
-	gboolean _tmp8_ = FALSE;
+	gboolean _tmp8_;
 	gboolean _tmp22_ = FALSE;
-	gboolean _tmp23_ = FALSE;
-	gboolean _tmp36_ = FALSE;
+	gboolean _tmp23_;
+	gboolean _tmp36_;
 #line 152 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_return_if_fail (IS_EXPORTER (self));
 #line 152 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -940,8 +940,8 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
 #line 161 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if (!_tmp8_) {
 #line 943 "Exporter.c"
-		ExporterExportJob* _tmp9_ = NULL;
-		GError* _tmp10_ = NULL;
+		ExporterExportJob* _tmp9_;
+		GError* _tmp10_;
 #line 161 "/home/jens/Source/shotwell/src/Exporter.vala"
 		_tmp9_ = job;
 #line 161 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -957,17 +957,17 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
 #line 161 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if (_tmp7_) {
 #line 960 "Exporter.c"
-		ExporterExportFailedCallback _tmp11_ = NULL;
-		void* _tmp11__target = NULL;
-		ExporterExportJob* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		GeeCollection* _tmp14_ = NULL;
-		gint _tmp15_ = 0;
-		gint _tmp16_ = 0;
-		gint _tmp17_ = 0;
-		ExporterExportJob* _tmp18_ = NULL;
-		GError* _tmp19_ = NULL;
-		gboolean _tmp20_ = FALSE;
+		ExporterExportFailedCallback _tmp11_;
+		void* _tmp11__target;
+		ExporterExportJob* _tmp12_;
+		GFile* _tmp13_;
+		GeeCollection* _tmp14_;
+		gint _tmp15_;
+		gint _tmp16_;
+		gint _tmp17_;
+		ExporterExportJob* _tmp18_;
+		GError* _tmp19_;
+		gboolean _tmp20_;
 #line 162 "/home/jens/Source/shotwell/src/Exporter.vala"
 		_tmp11_ = self->priv->error_callback;
 #line 162 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -993,7 +993,7 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
 #line 162 "/home/jens/Source/shotwell/src/Exporter.vala"
 		if (!_tmp20_) {
 #line 996 "Exporter.c"
-			gboolean _tmp21_ = FALSE;
+			gboolean _tmp21_;
 #line 163 "/home/jens/Source/shotwell/src/Exporter.vala"
 			self->priv->aborted = TRUE;
 #line 165 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1013,8 +1013,8 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
 #line 170 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if (!_tmp23_) {
 #line 1016 "Exporter.c"
-		ProgressMonitor _tmp24_ = NULL;
-		void* _tmp24__target = NULL;
+		ProgressMonitor _tmp24_;
+		void* _tmp24__target;
 #line 170 "/home/jens/Source/shotwell/src/Exporter.vala"
 		_tmp24_ = self->priv->monitor;
 #line 170 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1030,13 +1030,13 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
 #line 170 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if (_tmp22_) {
 #line 1033 "Exporter.c"
-		ProgressMonitor _tmp25_ = NULL;
-		void* _tmp25__target = NULL;
-		gint _tmp26_ = 0;
-		GeeCollection* _tmp27_ = NULL;
-		gint _tmp28_ = 0;
-		gint _tmp29_ = 0;
-		gboolean _tmp30_ = FALSE;
+		ProgressMonitor _tmp25_;
+		void* _tmp25__target;
+		gint _tmp26_;
+		GeeCollection* _tmp27_;
+		gint _tmp28_;
+		gint _tmp29_;
+		gboolean _tmp30_;
 #line 171 "/home/jens/Source/shotwell/src/Exporter.vala"
 		_tmp25_ = self->priv->monitor;
 #line 171 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1054,7 +1054,7 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
 #line 171 "/home/jens/Source/shotwell/src/Exporter.vala"
 		if (!_tmp30_) {
 #line 1057 "Exporter.c"
-			gboolean _tmp31_ = FALSE;
+			gboolean _tmp31_;
 #line 172 "/home/jens/Source/shotwell/src/Exporter.vala"
 			self->priv->aborted = TRUE;
 #line 174 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1068,11 +1068,11 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
 #line 1069 "Exporter.c"
 			}
 		} else {
-			GFile** _tmp32_ = NULL;
-			gint _tmp32__length1 = 0;
-			ExporterExportJob* _tmp33_ = NULL;
-			GFile* _tmp34_ = NULL;
-			GFile* _tmp35_ = NULL;
+			GFile** _tmp32_;
+			gint _tmp32__length1;
+			ExporterExportJob* _tmp33_;
+			GFile* _tmp34_;
+			GFile* _tmp35_;
 #line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
 			_tmp32_ = self->priv->exported_files;
 #line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1103,11 +1103,11 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
 
 
 static void exporter_on_export_cancelled (Exporter* self, BackgroundJob* j) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	GeeCollection* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	GeeCollection* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 #line 185 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_return_if_fail (IS_EXPORTER (self));
 #line 185 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1141,7 +1141,7 @@ static GFile** _vala_array_dup30 (GFile** self, int length) {
 #line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
 	for (i = 0; i < length; i++) {
 #line 1144 "Exporter.c"
-		GFile* _tmp0_ = NULL;
+		GFile* _tmp0_;
 #line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1156,12 +1156,12 @@ static GFile** _vala_array_dup30 (GFile** self, int length) {
 
 GFile** exporter_get_exported_files (Exporter* self, int* result_length1) {
 	GFile** result = NULL;
-	GFile** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	GFile** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	GFile** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	GFile** _tmp0_;
+	gint _tmp0__length1;
+	GFile** _tmp1_;
+	gint _tmp1__length1;
+	GFile** _tmp2_;
+	gint _tmp2__length1;
 #line 190 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_return_val_if_fail (IS_EXPORTER (self), NULL);
 #line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1190,7 +1190,7 @@ GFile** exporter_get_exported_files (Exporter* self, int* result_length1) {
 }
 
 
-static void _vala_array_add129 (GFile*** array, int* length, int* size, GFile* value) {
+static void _vala_array_add129 (GFile** * array, int* length, int* size, GFile* value) {
 #line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if ((*length) == (*size)) {
 #line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1210,7 +1210,7 @@ static void _vala_array_add129 (GFile*** array, int* length, int* size, GFile* v
 static gboolean exporter_process_queue (Exporter* self) {
 	gboolean result = FALSE;
 	gint submitted = 0;
-	gint _tmp90_ = 0;
+	gint _tmp89_;
 	GError * _inner_error_ = NULL;
 #line 194 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_return_val_if_fail (IS_EXPORTER (self), FALSE);
@@ -1219,8 +1219,8 @@ static gboolean exporter_process_queue (Exporter* self) {
 #line 1220 "Exporter.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
 		_tmp0_ = self->priv->to_export;
 #line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1230,38 +1230,38 @@ static gboolean exporter_process_queue (Exporter* self) {
 #line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
 		while (TRUE) {
 #line 1233 "Exporter.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			MediaSource* source = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			GFile* use_source_file = NULL;
 			PhotoFileFormat real_export_format = 0;
-			PhotoFileFormat _tmp6_ = 0;
+			PhotoFileFormat _tmp6_;
 			gchar* basename = NULL;
-			MediaSource* _tmp7_ = NULL;
-			const gchar* _tmp19_ = NULL;
-			GFile* _tmp20_ = NULL;
+			MediaSource* _tmp7_;
+			const gchar* _tmp19_;
+			GFile* _tmp20_;
 			GFile* export_dir = NULL;
-			GFile* _tmp33_ = NULL;
-			GFile* _tmp34_ = NULL;
+			GFile* _tmp33_;
+			GFile* _tmp34_;
 			GFile* dest = NULL;
-			GFile* _tmp35_ = NULL;
-			Workers* _tmp75_ = NULL;
-			MediaSource* _tmp76_ = NULL;
-			GFile* _tmp77_ = NULL;
-			Scaling _tmp78_ = {0};
-			ExportFormatParameters _tmp79_ = {0};
-			JpegQuality _tmp80_ = 0;
-			PhotoFileFormat _tmp81_ = 0;
-			GCancellable* _tmp82_ = NULL;
-			ExportFormatParameters _tmp83_ = {0};
-			ExportFormatMode _tmp84_ = 0;
-			ExportFormatParameters _tmp85_ = {0};
-			gboolean _tmp86_ = FALSE;
-			ExporterExportJob* _tmp87_ = NULL;
-			ExporterExportJob* _tmp88_ = NULL;
-			gint _tmp89_ = 0;
+			GFile* _tmp35_;
+			Workers* _tmp74_;
+			MediaSource* _tmp75_;
+			GFile* _tmp76_;
+			Scaling _tmp77_;
+			ExportFormatParameters _tmp78_;
+			JpegQuality _tmp79_;
+			PhotoFileFormat _tmp80_;
+			GCancellable* _tmp81_;
+			ExportFormatParameters _tmp82_;
+			ExportFormatMode _tmp83_;
+			ExportFormatParameters _tmp84_;
+			gboolean _tmp85_;
+			ExporterExportJob* _tmp86_;
+			ExporterExportJob* _tmp87_;
+			gint _tmp88_;
 #line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
 			_tmp2_ = _source_it;
 #line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1292,14 +1292,14 @@ static gboolean exporter_process_queue (Exporter* self) {
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_PHOTO)) {
 #line 1294 "Exporter.c"
 				Photo* photo = NULL;
-				MediaSource* _tmp8_ = NULL;
-				Photo* _tmp9_ = NULL;
-				Photo* _tmp10_ = NULL;
-				ExportFormatParameters _tmp11_ = {0};
-				PhotoFileFormat _tmp12_ = 0;
-				Photo* _tmp13_ = NULL;
-				ExportFormatParameters _tmp14_ = {0};
-				gchar* _tmp15_ = NULL;
+				MediaSource* _tmp8_;
+				Photo* _tmp9_;
+				Photo* _tmp10_;
+				ExportFormatParameters _tmp11_;
+				PhotoFileFormat _tmp12_;
+				Photo* _tmp13_;
+				ExportFormatParameters _tmp14_;
+				gchar* _tmp15_;
 #line 201 "/home/jens/Source/shotwell/src/Exporter.vala"
 				_tmp8_ = source;
 #line 201 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1328,14 +1328,14 @@ static gboolean exporter_process_queue (Exporter* self) {
 				_g_object_unref0 (photo);
 #line 1330 "Exporter.c"
 			} else {
-				MediaSource* _tmp16_ = NULL;
+				MediaSource* _tmp16_;
 #line 204 "/home/jens/Source/shotwell/src/Exporter.vala"
 				_tmp16_ = source;
 #line 204 "/home/jens/Source/shotwell/src/Exporter.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_VIDEO)) {
 #line 1337 "Exporter.c"
-					MediaSource* _tmp17_ = NULL;
-					gchar* _tmp18_ = NULL;
+					MediaSource* _tmp17_;
+					gchar* _tmp18_;
 #line 205 "/home/jens/Source/shotwell/src/Exporter.vala"
 					_tmp17_ = source;
 #line 205 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1356,13 +1356,13 @@ static gboolean exporter_process_queue (Exporter* self) {
 #line 209 "/home/jens/Source/shotwell/src/Exporter.vala"
 			if (_tmp20_ != NULL) {
 #line 1359 "Exporter.c"
-				GFile** _tmp21_ = NULL;
-				gint _tmp21__length1 = 0;
-				GFile* _tmp22_ = NULL;
-				GFile* _tmp23_ = NULL;
-				gint _tmp24_ = 0;
-				ProgressMonitor _tmp25_ = NULL;
-				void* _tmp25__target = NULL;
+				GFile** _tmp21_;
+				gint _tmp21__length1;
+				GFile* _tmp22_;
+				GFile* _tmp23_;
+				gint _tmp24_;
+				ProgressMonitor _tmp25_;
+				void* _tmp25__target;
 #line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
 				_tmp21_ = self->priv->exported_files;
 #line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1384,13 +1384,13 @@ static gboolean exporter_process_queue (Exporter* self) {
 #line 213 "/home/jens/Source/shotwell/src/Exporter.vala"
 				if (_tmp25_ != NULL) {
 #line 1387 "Exporter.c"
-					ProgressMonitor _tmp26_ = NULL;
-					void* _tmp26__target = NULL;
-					gint _tmp27_ = 0;
-					GeeCollection* _tmp28_ = NULL;
-					gint _tmp29_ = 0;
-					gint _tmp30_ = 0;
-					gboolean _tmp31_ = FALSE;
+					ProgressMonitor _tmp26_;
+					void* _tmp26__target;
+					gint _tmp27_;
+					GeeCollection* _tmp28_;
+					gint _tmp29_;
+					gint _tmp30_;
+					gboolean _tmp31_;
 #line 214 "/home/jens/Source/shotwell/src/Exporter.vala"
 					_tmp26_ = self->priv->monitor;
 #line 214 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1408,7 +1408,7 @@ static gboolean exporter_process_queue (Exporter* self) {
 #line 214 "/home/jens/Source/shotwell/src/Exporter.vala"
 					if (!_tmp31_) {
 #line 1411 "Exporter.c"
-						GCancellable* _tmp32_ = NULL;
+						GCancellable* _tmp32_;
 #line 215 "/home/jens/Source/shotwell/src/Exporter.vala"
 						_tmp32_ = self->priv->cancellable;
 #line 215 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1454,13 +1454,13 @@ static gboolean exporter_process_queue (Exporter* self) {
 				{
 					gboolean collision = FALSE;
 					GFile* _tmp36_ = NULL;
-					GFile* _tmp37_ = NULL;
-					GFile* _tmp38_ = NULL;
-					const gchar* _tmp39_ = NULL;
+					GFile* _tmp37_;
+					GFile* _tmp38_;
+					const gchar* _tmp39_;
 					gboolean _tmp40_ = FALSE;
-					GFile* _tmp41_ = NULL;
-					GFile* _tmp42_ = NULL;
-					GFile* _tmp43_ = NULL;
+					GFile* _tmp41_;
+					GFile* _tmp42_;
+					GFile* _tmp43_;
 #line 230 "/home/jens/Source/shotwell/src/Exporter.vala"
 					_tmp37_ = app_dirs_get_temp_dir ();
 #line 230 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1480,7 +1480,7 @@ static gboolean exporter_process_queue (Exporter* self) {
 #line 230 "/home/jens/Source/shotwell/src/Exporter.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1483 "Exporter.c"
-						goto __catch478_g_error;
+						goto __catch479_g_error;
 					}
 #line 230 "/home/jens/Source/shotwell/src/Exporter.vala"
 					_tmp43_ = _tmp36_;
@@ -1494,52 +1494,49 @@ static gboolean exporter_process_queue (Exporter* self) {
 					_g_object_unref0 (_tmp36_);
 #line 1496 "Exporter.c"
 				}
-				goto __finally478;
-				__catch478_g_error:
+				goto __finally479;
+				__catch479_g_error:
 				{
 					GError* err = NULL;
-					const gchar* _tmp44_ = NULL;
-					MediaSource* _tmp45_ = NULL;
-					GFile* _tmp46_ = NULL;
-					GFile* _tmp47_ = NULL;
-					gchar* _tmp48_ = NULL;
-					gchar* _tmp49_ = NULL;
-					GError* _tmp50_ = NULL;
-					const gchar* _tmp51_ = NULL;
-					gchar* _tmp52_ = NULL;
-					gchar* _tmp53_ = NULL;
+					MediaSource* _tmp44_;
+					GFile* _tmp45_;
+					GFile* _tmp46_;
+					gchar* _tmp47_;
+					gchar* _tmp48_;
+					GError* _tmp49_;
+					const gchar* _tmp50_;
+					gchar* _tmp51_;
+					gchar* _tmp52_;
 #line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
 					err = _inner_error_;
 #line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
 					_inner_error_ = NULL;
 #line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp44_ = _ ("Unable to generate a temporary file for %s: %s");
+					_tmp44_ = source;
 #line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp45_ = source;
+					_tmp45_ = media_source_get_file (_tmp44_);
 #line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp46_ = media_source_get_file (_tmp45_);
+					_tmp46_ = _tmp45_;
 #line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp47_ = _tmp46_;
+					_tmp47_ = g_file_get_basename (_tmp46_);
 #line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp48_ = g_file_get_basename (_tmp47_);
+					_tmp48_ = _tmp47_;
 #line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp49_ = _tmp48_;
+					_tmp49_ = err;
 #line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp50_ = err;
+					_tmp50_ = _tmp49_->message;
 #line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp51_ = _tmp50_->message;
+					_tmp51_ = g_strdup_printf (_ ("Unable to generate a temporary file for %s: %s"), _tmp48_, _tmp50_);
 #line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp52_ = g_strdup_printf (_tmp44_, _tmp49_, _tmp51_);
+					_tmp52_ = _tmp51_;
 #line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp53_ = _tmp52_;
+					app_window_error_message (_tmp52_, NULL);
 #line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
-					app_window_error_message (_tmp53_, NULL);
+					_g_free0 (_tmp52_);
 #line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_g_free0 (_tmp53_);
+					_g_free0 (_tmp48_);
 #line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_g_free0 (_tmp49_);
-#line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_g_object_unref0 (_tmp47_);
+					_g_object_unref0 (_tmp46_);
 #line 235 "/home/jens/Source/shotwell/src/Exporter.vala"
 					_g_error_free0 (err);
 #line 235 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1554,13 +1551,13 @@ static gboolean exporter_process_queue (Exporter* self) {
 					_g_object_unref0 (source);
 #line 235 "/home/jens/Source/shotwell/src/Exporter.vala"
 					break;
-#line 1558 "Exporter.c"
+#line 1555 "Exporter.c"
 				}
-				__finally478:
+				__finally479:
 #line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1563 "Exporter.c"
-					gboolean _tmp54_ = FALSE;
+#line 1560 "Exporter.c"
+					gboolean _tmp53_ = FALSE;
 #line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
 					_g_object_unref0 (dest);
 #line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1578,88 +1575,88 @@ static gboolean exporter_process_queue (Exporter* self) {
 #line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
 					g_clear_error (&_inner_error_);
 #line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
-					return _tmp54_;
-#line 1583 "Exporter.c"
+					return _tmp53_;
+#line 1580 "Exporter.c"
 				}
 			} else {
-				GFile* _tmp55_ = NULL;
-				const gchar* _tmp56_ = NULL;
-				GFile* _tmp57_ = NULL;
-				gboolean _tmp58_ = FALSE;
-				gboolean _tmp59_ = FALSE;
+				GFile* _tmp54_;
+				const gchar* _tmp55_;
+				GFile* _tmp56_;
+				gboolean _tmp57_ = FALSE;
+				gboolean _tmp58_;
 #line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
-				_tmp55_ = self->priv->dir;
+				_tmp54_ = self->priv->dir;
 #line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
-				_tmp56_ = basename;
+				_tmp55_ = basename;
 #line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
-				_tmp57_ = g_file_get_child (_tmp55_, _tmp56_);
+				_tmp56_ = g_file_get_child (_tmp54_, _tmp55_);
 #line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
 				_g_object_unref0 (dest);
 #line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
-				dest = _tmp57_;
+				dest = _tmp56_;
 #line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
-				_tmp59_ = self->priv->replace_all;
+				_tmp58_ = self->priv->replace_all;
 #line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
-				if (!_tmp59_) {
-#line 1605 "Exporter.c"
-					GFile* _tmp60_ = NULL;
-					gboolean _tmp61_ = FALSE;
+				if (!_tmp58_) {
+#line 1602 "Exporter.c"
+					GFile* _tmp59_;
+					gboolean _tmp60_;
 #line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp60_ = dest;
+					_tmp59_ = dest;
 #line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp61_ = g_file_query_exists (_tmp60_, NULL);
+					_tmp60_ = g_file_query_exists (_tmp59_, NULL);
 #line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp58_ = _tmp61_;
-#line 1614 "Exporter.c"
+					_tmp57_ = _tmp60_;
+#line 1611 "Exporter.c"
 				} else {
 #line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp58_ = FALSE;
-#line 1618 "Exporter.c"
+					_tmp57_ = FALSE;
+#line 1615 "Exporter.c"
 				}
 #line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
-				if (_tmp58_) {
-#line 1622 "Exporter.c"
-					ExporterOverwriteCallback _tmp62_ = NULL;
-					void* _tmp62__target = NULL;
-					GFile* _tmp63_ = NULL;
-					ExporterOverwrite _tmp64_ = 0;
+				if (_tmp57_) {
+#line 1619 "Exporter.c"
+					ExporterOverwriteCallback _tmp61_;
+					void* _tmp61__target;
+					GFile* _tmp62_;
+					ExporterOverwrite _tmp63_;
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp62_ = self->priv->overwrite_callback;
+					_tmp61_ = self->priv->overwrite_callback;
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp62__target = self->priv->overwrite_callback_target;
+					_tmp61__target = self->priv->overwrite_callback_target;
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp63_ = dest;
+					_tmp62_ = dest;
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp64_ = _tmp62_ (self, _tmp63_, _tmp62__target);
+					_tmp63_ = _tmp61_ (self, _tmp62_, _tmp61__target);
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
-					switch (_tmp64_) {
+					switch (_tmp63_) {
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
 						case EXPORTER_OVERWRITE_YES:
-#line 1639 "Exporter.c"
+#line 1636 "Exporter.c"
 						{
 #line 244 "/home/jens/Source/shotwell/src/Exporter.vala"
 							break;
-#line 1643 "Exporter.c"
+#line 1640 "Exporter.c"
 						}
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
 						case EXPORTER_OVERWRITE_REPLACE_ALL:
-#line 1647 "Exporter.c"
+#line 1644 "Exporter.c"
 						{
 #line 247 "/home/jens/Source/shotwell/src/Exporter.vala"
 							self->priv->replace_all = TRUE;
 #line 248 "/home/jens/Source/shotwell/src/Exporter.vala"
 							break;
-#line 1653 "Exporter.c"
+#line 1650 "Exporter.c"
 						}
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
 						case EXPORTER_OVERWRITE_CANCEL:
-#line 1657 "Exporter.c"
+#line 1654 "Exporter.c"
 						{
-							GCancellable* _tmp65_ = NULL;
+							GCancellable* _tmp64_;
 #line 251 "/home/jens/Source/shotwell/src/Exporter.vala"
-							_tmp65_ = self->priv->cancellable;
+							_tmp64_ = self->priv->cancellable;
 #line 251 "/home/jens/Source/shotwell/src/Exporter.vala"
-							g_cancellable_cancel (_tmp65_);
+							g_cancellable_cancel (_tmp64_);
 #line 253 "/home/jens/Source/shotwell/src/Exporter.vala"
 							result = FALSE;
 #line 253 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1676,56 +1673,56 @@ static gboolean exporter_process_queue (Exporter* self) {
 							_g_object_unref0 (_source_it);
 #line 253 "/home/jens/Source/shotwell/src/Exporter.vala"
 							return result;
-#line 1680 "Exporter.c"
+#line 1677 "Exporter.c"
 						}
 						default:
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
 						case EXPORTER_OVERWRITE_NO:
-#line 1685 "Exporter.c"
+#line 1682 "Exporter.c"
 						{
-							gint _tmp66_ = 0;
-							ProgressMonitor _tmp67_ = NULL;
-							void* _tmp67__target = NULL;
+							gint _tmp65_;
+							ProgressMonitor _tmp66_;
+							void* _tmp66__target;
 #line 257 "/home/jens/Source/shotwell/src/Exporter.vala"
-							_tmp66_ = self->priv->completed_count;
+							_tmp65_ = self->priv->completed_count;
 #line 257 "/home/jens/Source/shotwell/src/Exporter.vala"
-							self->priv->completed_count = _tmp66_ + 1;
+							self->priv->completed_count = _tmp65_ + 1;
 #line 258 "/home/jens/Source/shotwell/src/Exporter.vala"
-							_tmp67_ = self->priv->monitor;
+							_tmp66_ = self->priv->monitor;
 #line 258 "/home/jens/Source/shotwell/src/Exporter.vala"
-							_tmp67__target = self->priv->monitor_target;
+							_tmp66__target = self->priv->monitor_target;
 #line 258 "/home/jens/Source/shotwell/src/Exporter.vala"
-							if (_tmp67_ != NULL) {
-#line 1700 "Exporter.c"
-								ProgressMonitor _tmp68_ = NULL;
-								void* _tmp68__target = NULL;
-								gint _tmp69_ = 0;
-								GeeCollection* _tmp70_ = NULL;
-								gint _tmp71_ = 0;
-								gint _tmp72_ = 0;
-								gboolean _tmp73_ = FALSE;
+							if (_tmp66_ != NULL) {
+#line 1697 "Exporter.c"
+								ProgressMonitor _tmp67_;
+								void* _tmp67__target;
+								gint _tmp68_;
+								GeeCollection* _tmp69_;
+								gint _tmp70_;
+								gint _tmp71_;
+								gboolean _tmp72_;
 #line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
-								_tmp68_ = self->priv->monitor;
+								_tmp67_ = self->priv->monitor;
 #line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
-								_tmp68__target = self->priv->monitor_target;
+								_tmp67__target = self->priv->monitor_target;
 #line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
-								_tmp69_ = self->priv->completed_count;
+								_tmp68_ = self->priv->completed_count;
 #line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
-								_tmp70_ = self->priv->to_export;
+								_tmp69_ = self->priv->to_export;
 #line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
-								_tmp71_ = gee_collection_get_size (_tmp70_);
+								_tmp70_ = gee_collection_get_size (_tmp69_);
 #line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
-								_tmp72_ = _tmp71_;
+								_tmp71_ = _tmp70_;
 #line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
-								_tmp73_ = _tmp68_ ((guint64) _tmp69_, (guint64) _tmp72_, TRUE, _tmp68__target);
+								_tmp72_ = _tmp67_ ((guint64) _tmp68_, (guint64) _tmp71_, TRUE, _tmp67__target);
 #line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
-								if (!_tmp73_) {
-#line 1724 "Exporter.c"
-									GCancellable* _tmp74_ = NULL;
+								if (!_tmp72_) {
+#line 1721 "Exporter.c"
+									GCancellable* _tmp73_;
 #line 260 "/home/jens/Source/shotwell/src/Exporter.vala"
-									_tmp74_ = self->priv->cancellable;
+									_tmp73_ = self->priv->cancellable;
 #line 260 "/home/jens/Source/shotwell/src/Exporter.vala"
-									g_cancellable_cancel (_tmp74_);
+									g_cancellable_cancel (_tmp73_);
 #line 262 "/home/jens/Source/shotwell/src/Exporter.vala"
 									result = FALSE;
 #line 262 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1742,52 +1739,52 @@ static gboolean exporter_process_queue (Exporter* self) {
 									_g_object_unref0 (_source_it);
 #line 262 "/home/jens/Source/shotwell/src/Exporter.vala"
 									return result;
-#line 1746 "Exporter.c"
+#line 1743 "Exporter.c"
 								}
 							}
 #line 266 "/home/jens/Source/shotwell/src/Exporter.vala"
 							continue;
-#line 1751 "Exporter.c"
+#line 1748 "Exporter.c"
 						}
 					}
 				}
 			}
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp75_ = self->priv->workers;
+			_tmp74_ = self->priv->workers;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp76_ = source;
+			_tmp75_ = source;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp77_ = dest;
+			_tmp76_ = dest;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp78_ = self->priv->scaling;
+			_tmp77_ = self->priv->scaling;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp79_ = self->priv->export_params;
+			_tmp78_ = self->priv->export_params;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp80_ = _tmp79_.quality;
+			_tmp79_ = _tmp78_.quality;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp81_ = real_export_format;
+			_tmp80_ = real_export_format;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp82_ = self->priv->cancellable;
+			_tmp81_ = self->priv->cancellable;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp83_ = self->priv->export_params;
+			_tmp82_ = self->priv->export_params;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp84_ = _tmp83_.mode;
+			_tmp83_ = _tmp82_.mode;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp85_ = self->priv->export_params;
+			_tmp84_ = self->priv->export_params;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp86_ = _tmp85_.export_metadata;
+			_tmp85_ = _tmp84_.export_metadata;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp87_ = exporter_export_job_new (self, _tmp76_, _tmp77_, &_tmp78_, &_tmp80_, &_tmp81_, _tmp82_, _tmp84_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp86_);
+			_tmp86_ = exporter_export_job_new (self, _tmp75_, _tmp76_, &_tmp77_, &_tmp79_, &_tmp80_, _tmp81_, _tmp83_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp85_);
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp88_ = _tmp87_;
+			_tmp87_ = _tmp86_;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			workers_enqueue (_tmp75_, G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_BACKGROUND_JOB, BackgroundJob));
+			workers_enqueue (_tmp74_, G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_background_job_unref0 (_tmp88_);
+			_background_job_unref0 (_tmp87_);
 #line 273 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp89_ = submitted;
+			_tmp88_ = submitted;
 #line 273 "/home/jens/Source/shotwell/src/Exporter.vala"
-			submitted = _tmp89_ + 1;
+			submitted = _tmp88_ + 1;
 #line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
 			_g_object_unref0 (dest);
 #line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1798,26 +1795,26 @@ static gboolean exporter_process_queue (Exporter* self) {
 			_g_object_unref0 (use_source_file);
 #line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
 			_g_object_unref0 (source);
-#line 1802 "Exporter.c"
+#line 1799 "Exporter.c"
 		}
 #line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
 		_g_object_unref0 (_source_it);
-#line 1806 "Exporter.c"
+#line 1803 "Exporter.c"
 	}
 #line 276 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp90_ = submitted;
+	_tmp89_ = submitted;
 #line 276 "/home/jens/Source/shotwell/src/Exporter.vala"
-	result = _tmp90_ > 0;
+	result = _tmp89_ > 0;
 #line 276 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return result;
-#line 1814 "Exporter.c"
+#line 1811 "Exporter.c"
 }
 
 
 static void exporter_export_completed (Exporter* self, gboolean is_cancelled) {
-	ExporterCompletionCallback _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	gboolean _tmp1_ = FALSE;
+	ExporterCompletionCallback _tmp0_;
+	void* _tmp0__target;
+	gboolean _tmp1_;
 #line 279 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_return_if_fail (IS_EXPORTER (self));
 #line 280 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1828,28 +1825,28 @@ static void exporter_export_completed (Exporter* self, gboolean is_cancelled) {
 	_tmp1_ = is_cancelled;
 #line 280 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_tmp0_ (self, _tmp1_, _tmp0__target);
-#line 1832 "Exporter.c"
+#line 1829 "Exporter.c"
 }
 
 
 static void _exporter_on_exported_completion_callback (BackgroundJob* job, gpointer self) {
 #line 81 "/home/jens/Source/shotwell/src/Exporter.vala"
 	exporter_on_exported ((Exporter*) self, job);
-#line 1839 "Exporter.c"
+#line 1836 "Exporter.c"
 }
 
 
 static void _exporter_on_export_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
 #line 81 "/home/jens/Source/shotwell/src/Exporter.vala"
 	exporter_on_export_cancelled ((Exporter*) self, job);
-#line 1846 "Exporter.c"
+#line 1843 "Exporter.c"
 }
 
 
 static gpointer _scaling_dup0 (gpointer self) {
 #line 87 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return self ? scaling_dup (self) : NULL;
-#line 1853 "Exporter.c"
+#line 1850 "Exporter.c"
 }
 
 
@@ -1861,14 +1858,14 @@ static JpegQuality* _jpeg_quality_dup (JpegQuality* self) {
 	memcpy (dup, self, sizeof (JpegQuality));
 #line 88 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return dup;
-#line 1865 "Exporter.c"
+#line 1862 "Exporter.c"
 }
 
 
 static gpointer __jpeg_quality_dup0 (gpointer self) {
 #line 88 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return self ? _jpeg_quality_dup (self) : NULL;
-#line 1872 "Exporter.c"
+#line 1869 "Exporter.c"
 }
 
 
@@ -1880,37 +1877,37 @@ static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self) {
 	memcpy (dup, self, sizeof (PhotoFileFormat));
 #line 89 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return dup;
-#line 1884 "Exporter.c"
+#line 1881 "Exporter.c"
 }
 
 
 static gpointer __photo_file_format_dup0 (gpointer self) {
 #line 89 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return self ? _photo_file_format_dup (self) : NULL;
-#line 1891 "Exporter.c"
+#line 1888 "Exporter.c"
 }
 
 
 static ExporterExportJob* exporter_export_job_construct (GType object_type, Exporter* owner, MediaSource* media, GFile* dest, Scaling* scaling, JpegQuality* quality, PhotoFileFormat* format, GCancellable* cancellable, gboolean direct_copy_unmodified, gboolean export_metadata) {
 	ExporterExportJob* self = NULL;
-	Exporter* _tmp0_ = NULL;
-	Exporter* _tmp1_ = NULL;
-	GCancellable* _tmp2_ = NULL;
-	Exporter* _tmp3_ = NULL;
+	Exporter* _tmp0_;
+	Exporter* _tmp1_;
+	GCancellable* _tmp2_;
+	Exporter* _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	MediaSource* _tmp5_ = NULL;
-	MediaSource* _tmp7_ = NULL;
-	MediaSource* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	GFile* _tmp10_ = NULL;
-	Scaling* _tmp11_ = NULL;
-	Scaling* _tmp12_ = NULL;
-	JpegQuality* _tmp13_ = NULL;
-	JpegQuality* _tmp14_ = NULL;
-	PhotoFileFormat* _tmp15_ = NULL;
-	PhotoFileFormat* _tmp16_ = NULL;
-	gboolean _tmp17_ = FALSE;
-	gboolean _tmp18_ = FALSE;
+	MediaSource* _tmp5_;
+	MediaSource* _tmp7_;
+	MediaSource* _tmp8_;
+	GFile* _tmp9_;
+	GFile* _tmp10_;
+	Scaling* _tmp11_;
+	Scaling* _tmp12_;
+	JpegQuality* _tmp13_;
+	JpegQuality* _tmp14_;
+	PhotoFileFormat* _tmp15_;
+	PhotoFileFormat* _tmp16_;
+	gboolean _tmp17_;
+	gboolean _tmp18_;
 #line 78 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_return_val_if_fail (IS_EXPORTER (owner), NULL);
 #line 78 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1935,14 +1932,14 @@ static ExporterExportJob* exporter_export_job_construct (GType object_type, Expo
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_PHOTO)) {
 #line 83 "/home/jens/Source/shotwell/src/Exporter.vala"
 		_tmp4_ = TRUE;
-#line 1939 "Exporter.c"
+#line 1936 "Exporter.c"
 	} else {
-		MediaSource* _tmp6_ = NULL;
+		MediaSource* _tmp6_;
 #line 83 "/home/jens/Source/shotwell/src/Exporter.vala"
 		_tmp6_ = media;
 #line 83 "/home/jens/Source/shotwell/src/Exporter.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_VIDEO);
-#line 1946 "Exporter.c"
+#line 1943 "Exporter.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_vala_assert (_tmp4_, "media is Photo || media is Video");
@@ -1996,21 +1993,21 @@ static ExporterExportJob* exporter_export_job_construct (GType object_type, Expo
 	self->export_metadata = _tmp18_;
 #line 78 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return self;
-#line 2000 "Exporter.c"
+#line 1997 "Exporter.c"
 }
 
 
 static ExporterExportJob* exporter_export_job_new (Exporter* owner, MediaSource* media, GFile* dest, Scaling* scaling, JpegQuality* quality, PhotoFileFormat* format, GCancellable* cancellable, gboolean direct_copy_unmodified, gboolean export_metadata) {
 #line 78 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return exporter_export_job_construct (EXPORTER_TYPE_EXPORT_JOB, owner, media, dest, scaling, quality, format, cancellable, direct_copy_unmodified, export_metadata);
-#line 2007 "Exporter.c"
+#line 2004 "Exporter.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
 #line 102 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 2014 "Exporter.c"
+#line 2011 "Exporter.c"
 }
 
 
@@ -2019,22 +2016,22 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
 	GError * _inner_error_ = NULL;
 #line 94 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EXPORTER_TYPE_EXPORT_JOB, ExporterExportJob);
-#line 2023 "Exporter.c"
+#line 2020 "Exporter.c"
 	{
-		MediaSource* _tmp0_ = NULL;
+		MediaSource* _tmp0_;
 #line 96 "/home/jens/Source/shotwell/src/Exporter.vala"
 		_tmp0_ = self->media;
 #line 96 "/home/jens/Source/shotwell/src/Exporter.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO)) {
-#line 2030 "Exporter.c"
-			MediaSource* _tmp1_ = NULL;
-			GFile* _tmp2_ = NULL;
-			Scaling* _tmp3_ = NULL;
-			JpegQuality* _tmp4_ = NULL;
-			PhotoFileFormat* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
-			gboolean _tmp7_ = FALSE;
-			Scaling _tmp8_ = {0};
+#line 2027 "Exporter.c"
+			MediaSource* _tmp1_;
+			GFile* _tmp2_;
+			Scaling* _tmp3_;
+			JpegQuality* _tmp4_;
+			PhotoFileFormat* _tmp5_;
+			gboolean _tmp6_;
+			gboolean _tmp7_;
+			Scaling _tmp8_;
 #line 97 "/home/jens/Source/shotwell/src/Exporter.vala"
 			_tmp1_ = self->media;
 #line 97 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2055,18 +2052,18 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
 			photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO, Photo), _tmp2_, &_tmp8_, *_tmp4_, *_tmp5_, _tmp6_, _tmp7_, &_inner_error_);
 #line 97 "/home/jens/Source/shotwell/src/Exporter.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2059 "Exporter.c"
-				goto __catch479_g_error;
+#line 2056 "Exporter.c"
+				goto __catch480_g_error;
 			}
 		} else {
-			MediaSource* _tmp9_ = NULL;
+			MediaSource* _tmp9_;
 #line 98 "/home/jens/Source/shotwell/src/Exporter.vala"
 			_tmp9_ = self->media;
 #line 98 "/home/jens/Source/shotwell/src/Exporter.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_VIDEO)) {
-#line 2068 "Exporter.c"
-				MediaSource* _tmp10_ = NULL;
-				GFile* _tmp11_ = NULL;
+#line 2065 "Exporter.c"
+				MediaSource* _tmp10_;
+				GFile* _tmp11_;
 #line 99 "/home/jens/Source/shotwell/src/Exporter.vala"
 				_tmp10_ = self->media;
 #line 99 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2075,18 +2072,18 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
 				video_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_VIDEO, Video), _tmp11_, &_inner_error_);
 #line 99 "/home/jens/Source/shotwell/src/Exporter.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2079 "Exporter.c"
-					goto __catch479_g_error;
+#line 2076 "Exporter.c"
+					goto __catch480_g_error;
 				}
 			}
 		}
 	}
-	goto __finally479;
-	__catch479_g_error:
+	goto __finally480;
+	__catch480_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp12_ = NULL;
-		GError* _tmp13_ = NULL;
+		GError* _tmp12_;
+		GError* _tmp13_;
 #line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
 		err = _inner_error_;
 #line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2101,9 +2098,9 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
 		self->err = _tmp13_;
 #line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
 		_g_error_free0 (err);
-#line 2105 "Exporter.c"
+#line 2102 "Exporter.c"
 	}
-	__finally479:
+	__finally480:
 #line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2112,7 +2109,7 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
 		g_clear_error (&_inner_error_);
 #line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
 		return;
-#line 2116 "Exporter.c"
+#line 2113 "Exporter.c"
 	}
 }
 
@@ -2123,8 +2120,8 @@ static void exporter_export_job_class_init (ExporterExportJobClass * klass) {
 #line 68 "/home/jens/Source/shotwell/src/Exporter.vala"
 	((BackgroundJobClass *) klass)->finalize = exporter_export_job_finalize;
 #line 68 "/home/jens/Source/shotwell/src/Exporter.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) exporter_export_job_real_execute;
-#line 2128 "Exporter.c"
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) exporter_export_job_real_execute;
+#line 2125 "Exporter.c"
 }
 
 
@@ -2135,11 +2132,11 @@ static void exporter_export_job_instance_init (ExporterExportJob * self) {
 	self->direct_copy_unmodified = FALSE;
 #line 76 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self->export_metadata = TRUE;
-#line 2139 "Exporter.c"
+#line 2136 "Exporter.c"
 }
 
 
-static void exporter_export_job_finalize (BackgroundJob* obj) {
+static void exporter_export_job_finalize (BackgroundJob * obj) {
 	ExporterExportJob * self;
 #line 68 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EXPORTER_TYPE_EXPORT_JOB, ExporterExportJob);
@@ -2157,7 +2154,7 @@ static void exporter_export_job_finalize (BackgroundJob* obj) {
 	_g_error_free0 (self->err);
 #line 68 "/home/jens/Source/shotwell/src/Exporter.vala"
 	BACKGROUND_JOB_CLASS (exporter_export_job_parent_class)->finalize (obj);
-#line 2161 "Exporter.c"
+#line 2158 "Exporter.c"
 }
 
 
@@ -2180,14 +2177,14 @@ static void exporter_class_init (ExporterClass * klass) {
 	g_type_class_add_private (klass, sizeof (ExporterPrivate));
 #line 53 "/home/jens/Source/shotwell/src/Exporter.vala"
 	G_OBJECT_CLASS (klass)->finalize = exporter_finalize;
-#line 2184 "Exporter.c"
+#line 2181 "Exporter.c"
 }
 
 
 static void exporter_instance_init (Exporter * self) {
-	GeeArrayList* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	Workers* _tmp2_ = NULL;
+	GeeArrayList* _tmp0_;
+	guint _tmp1_;
+	Workers* _tmp2_;
 #line 53 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self->priv = EXPORTER_GET_PRIVATE (self);
 #line 107 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2204,21 +2201,29 @@ static void exporter_instance_init (Exporter * self) {
 	self->priv->workers = _tmp2_;
 #line 113 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self->priv->completion_callback = NULL;
+#line 113 "/home/jens/Source/shotwell/src/Exporter.vala"
+	self->priv->completion_callback_target = self;
 #line 114 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self->priv->error_callback = NULL;
+#line 114 "/home/jens/Source/shotwell/src/Exporter.vala"
+	self->priv->error_callback_target = self;
 #line 115 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self->priv->overwrite_callback = NULL;
+#line 115 "/home/jens/Source/shotwell/src/Exporter.vala"
+	self->priv->overwrite_callback_target = self;
 #line 116 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self->priv->monitor = NULL;
+#line 116 "/home/jens/Source/shotwell/src/Exporter.vala"
+	self->priv->monitor_target = self;
 #line 118 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self->priv->replace_all = FALSE;
 #line 119 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self->priv->aborted = FALSE;
-#line 2218 "Exporter.c"
+#line 2223 "Exporter.c"
 }
 
 
-static void exporter_finalize (GObject* obj) {
+static void exporter_finalize (GObject * obj) {
 	Exporter * self;
 #line 53 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPORTER, Exporter);
@@ -2234,7 +2239,7 @@ static void exporter_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->cancellable);
 #line 53 "/home/jens/Source/shotwell/src/Exporter.vala"
 	G_OBJECT_CLASS (exporter_parent_class)->finalize (obj);
-#line 2238 "Exporter.c"
+#line 2243 "Exporter.c"
 }
 
 
@@ -2252,8 +2257,8 @@ GType exporter_get_type (void) {
 
 ExporterUI* exporter_ui_construct (GType object_type, Exporter* exporter) {
 	ExporterUI* self = NULL;
-	Exporter* _tmp0_ = NULL;
-	Exporter* _tmp1_ = NULL;
+	Exporter* _tmp0_;
+	Exporter* _tmp1_;
 #line 290 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_return_val_if_fail (IS_EXPORTER (exporter), NULL);
 #line 290 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2268,21 +2273,21 @@ ExporterUI* exporter_ui_construct (GType object_type, Exporter* exporter) {
 	self->priv->exporter = _tmp1_;
 #line 290 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return self;
-#line 2272 "Exporter.c"
+#line 2277 "Exporter.c"
 }
 
 
 ExporterUI* exporter_ui_new (Exporter* exporter) {
 #line 290 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return exporter_ui_construct (TYPE_EXPORTER_UI, exporter);
-#line 2279 "Exporter.c"
+#line 2284 "Exporter.c"
 }
 
 
 static void _exporter_ui_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
 #line 300 "/home/jens/Source/shotwell/src/Exporter.vala"
 	exporter_ui_on_export_completed ((ExporterUI*) self, exporter, is_cancelled);
-#line 2286 "Exporter.c"
+#line 2291 "Exporter.c"
 }
 
 
@@ -2291,7 +2296,7 @@ static gboolean _exporter_ui_on_export_failed_exporter_export_failed_callback (E
 	result = exporter_ui_on_export_failed ((ExporterUI*) self, exporter, file, remaining, err);
 #line 300 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return result;
-#line 2295 "Exporter.c"
+#line 2300 "Exporter.c"
 }
 
 
@@ -2300,7 +2305,7 @@ static ExporterOverwrite _exporter_ui_on_export_overwrite_exporter_overwrite_cal
 	result = exporter_ui_on_export_overwrite ((ExporterUI*) self, exporter, file);
 #line 300 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return result;
-#line 2304 "Exporter.c"
+#line 2309 "Exporter.c"
 }
 
 
@@ -2309,23 +2314,22 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin
 	result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
 #line 300 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return result;
-#line 2313 "Exporter.c"
+#line 2318 "Exporter.c"
 }
 
 
 void exporter_ui_export (ExporterUI* self, ExporterCompletionCallback completion_callback, void* completion_callback_target) {
-	ExporterCompletionCallback _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	AppWindow* _tmp1_ = NULL;
-	AppWindow* _tmp2_ = NULL;
-	AppWindow* _tmp3_ = NULL;
-	AppWindow* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	GCancellable* _tmp6_ = NULL;
-	ProgressDialog* _tmp7_ = NULL;
-	Exporter* _tmp8_ = NULL;
-	GCancellable* _tmp9_ = NULL;
-	ProgressDialog* _tmp10_ = NULL;
+	ExporterCompletionCallback _tmp0_;
+	void* _tmp0__target;
+	AppWindow* _tmp1_;
+	AppWindow* _tmp2_;
+	AppWindow* _tmp3_;
+	AppWindow* _tmp4_;
+	GCancellable* _tmp5_;
+	ProgressDialog* _tmp6_;
+	Exporter* _tmp7_;
+	GCancellable* _tmp8_;
+	ProgressDialog* _tmp9_;
 #line 294 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_return_if_fail (IS_EXPORTER_UI (self));
 #line 295 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2349,39 +2353,37 @@ void exporter_ui_export (ExporterUI* self, ExporterCompletionCallback completion
 #line 299 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_tmp4_ = _tmp3_;
 #line 299 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp5_ = _ ("Exporting");
-#line 299 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp6_ = self->priv->cancellable;
+	_tmp5_ = self->priv->cancellable;
 #line 299 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp7_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow), _tmp5_, _tmp6_);
+	_tmp6_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow), _ ("Exporting"), _tmp5_);
 #line 299 "/home/jens/Source/shotwell/src/Exporter.vala"
-	g_object_ref_sink (_tmp7_);
+	g_object_ref_sink (_tmp6_);
 #line 299 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
 #line 299 "/home/jens/Source/shotwell/src/Exporter.vala"
-	self->priv->progress_dialog = _tmp7_;
+	self->priv->progress_dialog = _tmp6_;
 #line 299 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_g_object_unref0 (_tmp4_);
 #line 300 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp8_ = self->priv->exporter;
+	_tmp7_ = self->priv->exporter;
 #line 300 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp9_ = self->priv->cancellable;
+	_tmp8_ = self->priv->cancellable;
 #line 300 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp10_ = self->priv->progress_dialog;
+	_tmp9_ = self->priv->progress_dialog;
 #line 300 "/home/jens/Source/shotwell/src/Exporter.vala"
-	exporter_export (_tmp8_, _exporter_ui_on_export_completed_exporter_completion_callback, self, _exporter_ui_on_export_failed_exporter_export_failed_callback, self, _exporter_ui_on_export_overwrite_exporter_overwrite_callback, self, _tmp9_, _progress_dialog_monitor_progress_monitor, _tmp10_);
-#line 2374 "Exporter.c"
+	exporter_export (_tmp7_, _exporter_ui_on_export_completed_exporter_completion_callback, self, _exporter_ui_on_export_failed_exporter_export_failed_callback, self, _exporter_ui_on_export_overwrite_exporter_overwrite_callback, self, _tmp8_, _progress_dialog_monitor_progress_monitor, _tmp9_);
+#line 2376 "Exporter.c"
 }
 
 
 static void exporter_ui_on_export_completed (ExporterUI* self, Exporter* exporter, gboolean is_cancelled) {
-	ProgressDialog* _tmp0_ = NULL;
-	AppWindow* _tmp2_ = NULL;
-	AppWindow* _tmp3_ = NULL;
-	ExporterCompletionCallback _tmp4_ = NULL;
-	void* _tmp4__target = NULL;
-	Exporter* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	ProgressDialog* _tmp0_;
+	AppWindow* _tmp2_;
+	AppWindow* _tmp3_;
+	ExporterCompletionCallback _tmp4_;
+	void* _tmp4__target;
+	Exporter* _tmp5_;
+	gboolean _tmp6_;
 #line 304 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_return_if_fail (IS_EXPORTER_UI (self));
 #line 304 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2390,8 +2392,8 @@ static void exporter_ui_on_export_completed (ExporterUI* self, Exporter* exporte
 	_tmp0_ = self->priv->progress_dialog;
 #line 305 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if (_tmp0_ != NULL) {
-#line 2394 "Exporter.c"
-		ProgressDialog* _tmp1_ = NULL;
+#line 2396 "Exporter.c"
+		ProgressDialog* _tmp1_;
 #line 306 "/home/jens/Source/shotwell/src/Exporter.vala"
 		_tmp1_ = self->priv->progress_dialog;
 #line 306 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2400,7 +2402,7 @@ static void exporter_ui_on_export_completed (ExporterUI* self, Exporter* exporte
 		_g_object_unref0 (self->priv->progress_dialog);
 #line 307 "/home/jens/Source/shotwell/src/Exporter.vala"
 		self->priv->progress_dialog = NULL;
-#line 2404 "Exporter.c"
+#line 2406 "Exporter.c"
 	}
 #line 310 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_tmp2_ = app_window_get_instance ();
@@ -2420,29 +2422,24 @@ static void exporter_ui_on_export_completed (ExporterUI* self, Exporter* exporte
 	_tmp6_ = is_cancelled;
 #line 312 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_tmp4_ (_tmp5_, _tmp6_, _tmp4__target);
-#line 2424 "Exporter.c"
+#line 2426 "Exporter.c"
 }
 
 
 static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Exporter* exporter, GFile* file) {
 	ExporterOverwrite result = 0;
-	ProgressDialog* _tmp0_ = NULL;
+	ProgressDialog* _tmp0_;
 	gchar* question = NULL;
-	const gchar* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	GFile* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 	GtkResponseType response = 0;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	GtkResponseType _tmp12_ = 0;
-	ProgressDialog* _tmp13_ = NULL;
-	GtkResponseType _tmp14_ = 0;
+	const gchar* _tmp6_;
+	GtkResponseType _tmp7_;
+	ProgressDialog* _tmp8_;
+	GtkResponseType _tmp9_;
 #line 315 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_return_val_if_fail (IS_EXPORTER_UI (self), 0);
 #line 315 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2454,46 +2451,36 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo
 #line 316 "/home/jens/Source/shotwell/src/Exporter.vala"
 	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_window_get_type (), GtkWindow), FALSE);
 #line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp1_ = _ ("File %s already exists. Replace?");
+	_tmp1_ = file;
 #line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp2_ = file;
+	_tmp2_ = g_file_get_basename (_tmp1_);
 #line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp3_ = g_file_get_basename (_tmp2_);
-#line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp5_ = g_strdup_printf (_tmp1_, _tmp4_);
+	_tmp4_ = g_strdup_printf (_ ("File %s already exists. Replace?"), _tmp3_);
 #line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_g_free0 (_tmp4_);
+	_g_free0 (_tmp3_);
 #line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
-	question = _tmp6_;
-#line 318 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp7_ = question;
-#line 318 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp8_ = _ ("_Skip");
+	question = _tmp5_;
 #line 318 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp9_ = _ ("_Replace");
+	_tmp6_ = question;
 #line 318 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp10_ = _ ("Replace _All");
+	_tmp7_ = app_window_negate_affirm_all_cancel_question (_tmp6_, _ ("_Skip"), _ ("_Replace"), _ ("Replace _All"), _ ("Export"), NULL);
 #line 318 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp11_ = _ ("Export");
-#line 318 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp12_ = app_window_negate_affirm_all_cancel_question (_tmp7_, _tmp8_, _tmp9_, _tmp10_, _tmp11_, NULL);
-#line 318 "/home/jens/Source/shotwell/src/Exporter.vala"
-	response = _tmp12_;
+	response = _tmp7_;
 #line 321 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp13_ = self->priv->progress_dialog;
+	_tmp8_ = self->priv->progress_dialog;
 #line 321 "/home/jens/Source/shotwell/src/Exporter.vala"
-	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_window_get_type (), GtkWindow), TRUE);
+	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), TRUE);
 #line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp14_ = response;
+	_tmp9_ = response;
 #line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
-	switch (_tmp14_) {
+	switch (_tmp9_) {
 #line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
 		case GTK_RESPONSE_APPLY:
-#line 2497 "Exporter.c"
+#line 2484 "Exporter.c"
 		{
 #line 325 "/home/jens/Source/shotwell/src/Exporter.vala"
 			result = EXPORTER_OVERWRITE_REPLACE_ALL;
@@ -2501,11 +2488,11 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo
 			_g_free0 (question);
 #line 325 "/home/jens/Source/shotwell/src/Exporter.vala"
 			return result;
-#line 2505 "Exporter.c"
+#line 2492 "Exporter.c"
 		}
 #line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
 		case GTK_RESPONSE_YES:
-#line 2509 "Exporter.c"
+#line 2496 "Exporter.c"
 		{
 #line 328 "/home/jens/Source/shotwell/src/Exporter.vala"
 			result = EXPORTER_OVERWRITE_YES;
@@ -2513,11 +2500,11 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo
 			_g_free0 (question);
 #line 328 "/home/jens/Source/shotwell/src/Exporter.vala"
 			return result;
-#line 2517 "Exporter.c"
+#line 2504 "Exporter.c"
 		}
 #line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
 		case GTK_RESPONSE_CANCEL:
-#line 2521 "Exporter.c"
+#line 2508 "Exporter.c"
 		{
 #line 331 "/home/jens/Source/shotwell/src/Exporter.vala"
 			result = EXPORTER_OVERWRITE_CANCEL;
@@ -2525,12 +2512,12 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo
 			_g_free0 (question);
 #line 331 "/home/jens/Source/shotwell/src/Exporter.vala"
 			return result;
-#line 2529 "Exporter.c"
+#line 2516 "Exporter.c"
 		}
 		default:
 #line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
 		case GTK_RESPONSE_NO:
-#line 2534 "Exporter.c"
+#line 2521 "Exporter.c"
 		{
 #line 335 "/home/jens/Source/shotwell/src/Exporter.vala"
 			result = EXPORTER_OVERWRITE_NO;
@@ -2538,20 +2525,20 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo
 			_g_free0 (question);
 #line 335 "/home/jens/Source/shotwell/src/Exporter.vala"
 			return result;
-#line 2542 "Exporter.c"
+#line 2529 "Exporter.c"
 		}
 	}
 #line 315 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_g_free0 (question);
-#line 2547 "Exporter.c"
+#line 2534 "Exporter.c"
 }
 
 
 static gboolean exporter_ui_on_export_failed (ExporterUI* self, Exporter* exporter, GFile* file, gint remaining, GError* err) {
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	GtkResponseType _tmp2_ = 0;
+	GFile* _tmp0_;
+	gint _tmp1_;
+	GtkResponseType _tmp2_;
 #line 339 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_return_val_if_fail (IS_EXPORTER_UI (self), FALSE);
 #line 339 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2568,14 +2555,14 @@ static gboolean exporter_ui_on_export_failed (ExporterUI* self, Exporter* export
 	result = _tmp2_ != GTK_RESPONSE_CANCEL;
 #line 340 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return result;
-#line 2572 "Exporter.c"
+#line 2559 "Exporter.c"
 }
 
 
 static void value_exporter_ui_init (GValue* value) {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	value->data[0].v_pointer = NULL;
-#line 2579 "Exporter.c"
+#line 2566 "Exporter.c"
 }
 
 
@@ -2584,7 +2571,7 @@ static void value_exporter_ui_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		exporter_ui_unref (value->data[0].v_pointer);
-#line 2588 "Exporter.c"
+#line 2575 "Exporter.c"
 	}
 }
 
@@ -2594,11 +2581,11 @@ static void value_exporter_ui_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		dest_value->data[0].v_pointer = exporter_ui_ref (src_value->data[0].v_pointer);
-#line 2598 "Exporter.c"
+#line 2585 "Exporter.c"
 	} else {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2602 "Exporter.c"
+#line 2589 "Exporter.c"
 	}
 }
 
@@ -2606,66 +2593,66 @@ static void value_exporter_ui_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_exporter_ui_peek_pointer (const GValue* value) {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return value->data[0].v_pointer;
-#line 2610 "Exporter.c"
+#line 2597 "Exporter.c"
 }
 
 
 static gchar* value_exporter_ui_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if (collect_values[0].v_pointer) {
-#line 2617 "Exporter.c"
-		ExporterUI* object;
+#line 2604 "Exporter.c"
+		ExporterUI * object;
 		object = collect_values[0].v_pointer;
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2624 "Exporter.c"
+#line 2611 "Exporter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2628 "Exporter.c"
+#line 2615 "Exporter.c"
 		}
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		value->data[0].v_pointer = exporter_ui_ref (object);
-#line 2632 "Exporter.c"
+#line 2619 "Exporter.c"
 	} else {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		value->data[0].v_pointer = NULL;
-#line 2636 "Exporter.c"
+#line 2623 "Exporter.c"
 	}
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return NULL;
-#line 2640 "Exporter.c"
+#line 2627 "Exporter.c"
 }
 
 
 static gchar* value_exporter_ui_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	ExporterUI** object_p;
+	ExporterUI ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if (!object_p) {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2651 "Exporter.c"
+#line 2638 "Exporter.c"
 	}
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if (!value->data[0].v_pointer) {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		*object_p = NULL;
-#line 2657 "Exporter.c"
+#line 2644 "Exporter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2661 "Exporter.c"
+#line 2648 "Exporter.c"
 	} else {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		*object_p = exporter_ui_ref (value->data[0].v_pointer);
-#line 2665 "Exporter.c"
+#line 2652 "Exporter.c"
 	}
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return NULL;
-#line 2669 "Exporter.c"
+#line 2656 "Exporter.c"
 }
 
 
@@ -2679,7 +2666,7 @@ GParamSpec* param_spec_exporter_ui (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return G_PARAM_SPEC (spec);
-#line 2683 "Exporter.c"
+#line 2670 "Exporter.c"
 }
 
 
@@ -2688,12 +2675,12 @@ gpointer value_get_exporter_ui (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EXPORTER_UI), NULL);
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return value->data[0].v_pointer;
-#line 2692 "Exporter.c"
+#line 2679 "Exporter.c"
 }
 
 
 void value_set_exporter_ui (GValue* value, gpointer v_object) {
-	ExporterUI* old;
+	ExporterUI * old;
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EXPORTER_UI));
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2708,23 +2695,23 @@ void value_set_exporter_ui (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		exporter_ui_ref (value->data[0].v_pointer);
-#line 2712 "Exporter.c"
+#line 2699 "Exporter.c"
 	} else {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		value->data[0].v_pointer = NULL;
-#line 2716 "Exporter.c"
+#line 2703 "Exporter.c"
 	}
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if (old) {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		exporter_ui_unref (old);
-#line 2722 "Exporter.c"
+#line 2709 "Exporter.c"
 	}
 }
 
 
 void value_take_exporter_ui (GValue* value, gpointer v_object) {
-	ExporterUI* old;
+	ExporterUI * old;
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EXPORTER_UI));
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2737,17 +2724,17 @@ void value_take_exporter_ui (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		value->data[0].v_pointer = v_object;
-#line 2741 "Exporter.c"
+#line 2728 "Exporter.c"
 	} else {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		value->data[0].v_pointer = NULL;
-#line 2745 "Exporter.c"
+#line 2732 "Exporter.c"
 	}
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if (old) {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		exporter_ui_unref (old);
-#line 2751 "Exporter.c"
+#line 2738 "Exporter.c"
 	}
 }
 
@@ -2759,12 +2746,12 @@ static void exporter_ui_class_init (ExporterUIClass * klass) {
 	((ExporterUIClass *) klass)->finalize = exporter_ui_finalize;
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_type_class_add_private (klass, sizeof (ExporterUIPrivate));
-#line 2763 "Exporter.c"
+#line 2750 "Exporter.c"
 }
 
 
 static void exporter_ui_instance_init (ExporterUI * self) {
-	GCancellable* _tmp0_ = NULL;
+	GCancellable* _tmp0_;
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self->priv = EXPORTER_UI_GET_PRIVATE (self);
 #line 286 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2775,13 +2762,15 @@ static void exporter_ui_instance_init (ExporterUI * self) {
 	self->priv->progress_dialog = NULL;
 #line 288 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self->priv->completion_callback = NULL;
+#line 288 "/home/jens/Source/shotwell/src/Exporter.vala"
+	self->priv->completion_callback_target = self;
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self->ref_count = 1;
-#line 2781 "Exporter.c"
+#line 2770 "Exporter.c"
 }
 
 
-static void exporter_ui_finalize (ExporterUI* obj) {
+static void exporter_ui_finalize (ExporterUI * obj) {
 	ExporterUI * self;
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPORTER_UI, ExporterUI);
@@ -2793,7 +2782,7 @@ static void exporter_ui_finalize (ExporterUI* obj) {
 	_g_object_unref0 (self->priv->cancellable);
 #line 287 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 2797 "Exporter.c"
+#line 2786 "Exporter.c"
 }
 
 
@@ -2812,18 +2801,18 @@ GType exporter_ui_get_type (void) {
 
 
 gpointer exporter_ui_ref (gpointer instance) {
-	ExporterUI* self;
+	ExporterUI * self;
 	self = instance;
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return instance;
-#line 2822 "Exporter.c"
+#line 2811 "Exporter.c"
 }
 
 
 void exporter_ui_unref (gpointer instance) {
-	ExporterUI* self;
+	ExporterUI * self;
 	self = instance;
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2831,7 +2820,7 @@ void exporter_ui_unref (gpointer instance) {
 		EXPORTER_UI_GET_CLASS (self)->finalize (self);
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2835 "Exporter.c"
+#line 2824 "Exporter.c"
 	}
 }
 
diff --git a/src/International.c b/src/International.c
index f651a32..422a7e4 100644
--- a/src/International.c
+++ b/src/International.c
@@ -1,4 +1,4 @@
-/* International.c generated by valac 0.34.7, the Vala compiler
+/* International.c generated by valac 0.36.6, the Vala compiler
  * generated from International.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -28,14 +28,14 @@ gchar* international_support_get_langpack_dir_path (gchar** args, int args_lengt
 
 
 void international_support_init (const gchar* package_name, gchar** args, int args_length1, const gchar* locale) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	const gchar* _tmp5_;
+	const gchar* _tmp6_;
 #line 15 "/home/jens/Source/shotwell/src/International.vala"
 	g_return_if_fail (package_name != NULL);
 #line 15 "/home/jens/Source/shotwell/src/International.vala"
@@ -73,20 +73,20 @@ void international_support_init (const gchar* package_name, gchar** args, int ar
 gchar* international_support_get_langpack_dir_path (gchar** args, int args_length1) {
 	gchar* result = NULL;
 	GFile* local_langpack_dir = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	GFile* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
+	GFile* _tmp7_;
+	GFile* _tmp8_;
+	GFile* _tmp9_;
 	gchar* _tmp10_ = NULL;
-	GFile* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	GFile* _tmp11_;
+	gboolean _tmp12_;
 #line 24 "/home/jens/Source/shotwell/src/International.vala"
 	_tmp0_ = args;
 #line 24 "/home/jens/Source/shotwell/src/International.vala"
@@ -124,8 +124,8 @@ gchar* international_support_get_langpack_dir_path (gchar** args, int args_lengt
 #line 28 "/home/jens/Source/shotwell/src/International.vala"
 	if (_tmp12_) {
 #line 127 "International.c"
-		GFile* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
+		GFile* _tmp13_;
+		gchar* _tmp14_;
 #line 28 "/home/jens/Source/shotwell/src/International.vala"
 		_tmp13_ = local_langpack_dir;
 #line 28 "/home/jens/Source/shotwell/src/International.vala"
@@ -136,7 +136,7 @@ gchar* international_support_get_langpack_dir_path (gchar** args, int args_lengt
 		_tmp10_ = _tmp14_;
 #line 138 "International.c"
 	} else {
-		gchar* _tmp15_ = NULL;
+		gchar* _tmp15_;
 #line 29 "/home/jens/Source/shotwell/src/International.vala"
 		_tmp15_ = g_strdup (INTERNATIONAL_SUPPORT_LANGUAGE_SUPPORT_DIRECTORY);
 #line 29 "/home/jens/Source/shotwell/src/International.vala"
diff --git a/src/LibraryFiles.c b/src/LibraryFiles.c
index 0932f18..80acc12 100644
--- a/src/LibraryFiles.c
+++ b/src/LibraryFiles.c
@@ -1,4 +1,4 @@
-/* LibraryFiles.c generated by valac 0.34.7, the Vala compiler
+/* LibraryFiles.c generated by valac 0.36.6, the Vala compiler
  * generated from LibraryFiles.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -37,6 +37,7 @@ typedef struct _MetadataDateTimeClass MetadataDateTimeClass;
 #define _metadata_date_time_unref0(var) ((var == NULL) ? NULL : (var = (metadata_date_time_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define _g_free0(var) (var = (g_free (var), NULL))
 
 #define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
 #define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
@@ -57,7 +58,6 @@ typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
 
 typedef struct _ConfigFacade ConfigFacade;
 typedef struct _ConfigFacadeClass ConfigFacadeClass;
-#define _g_free0(var) (var = (g_free (var), NULL))
 
 #define TYPE_VIDEO_READER (video_reader_get_type ())
 #define VIDEO_READER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIDEO_READER, VideoReader))
@@ -143,11 +143,12 @@ GType metadata_date_time_get_type (void) G_GNUC_CONST;
 MetadataDateTime* media_metadata_get_creation_date_time (MediaMetadata* self);
 time_t metadata_date_time_get_timestamp (MetadataDateTime* self);
 GFile* app_dirs_get_baked_import_dir (time_t tm);
+gchar* library_files_convert_basename (const gchar* basename);
+GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error);
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
 gboolean configuration_facade_get_use_lowercase_filenames (ConfigurationFacade* self);
-GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error);
 GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callback, void* progress_callback_target, gboolean blacklist, GError** error);
 time_t query_file_modified (GFile* file, GError** error);
 gboolean video_reader_is_supported_video_file (GFile* file);
@@ -183,7 +184,7 @@ gchar* md5_file (GFile* file, GError** error);
 static gpointer _g_error_copy0 (gpointer self) {
 #line 33 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 187 "LibraryFiles.c"
+#line 188 "LibraryFiles.c"
 }
 
 
@@ -191,24 +192,19 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 	gboolean _vala_collision = FALSE;
 	GFile* result = NULL;
 	time_t timestamp = 0;
-	time_t _tmp0_ = 0;
-	MediaMetadata* _tmp1_ = NULL;
+	time_t _tmp0_;
+	MediaMetadata* _tmp1_;
 	GFile* dir = NULL;
-	time_t _tmp9_ = 0;
-	GFile* _tmp10_ = NULL;
+	time_t _tmp9_;
+	GFile* _tmp10_;
 	gchar* newbasename = NULL;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	ConfigFacade* _tmp17_ = NULL;
-	ConfigFacade* _tmp18_ = NULL;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
+	GFile* _tmp17_ = NULL;
+	GFile* _tmp18_;
 	gboolean _tmp19_ = FALSE;
-	gboolean _tmp20_ = FALSE;
-	GFile* _tmp23_ = NULL;
-	GFile* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	gboolean _tmp26_ = FALSE;
-	GFile* _tmp27_ = NULL;
-	GFile* _tmp28_ = NULL;
+	GFile* _tmp20_;
+	GFile* _tmp21_;
 	GError * _inner_error_ = NULL;
 #line 13 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	g_return_val_if_fail (basename != NULL, NULL);
@@ -222,11 +218,11 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 	_tmp1_ = metadata;
 #line 19 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (_tmp1_ != NULL) {
-#line 226 "LibraryFiles.c"
+#line 222 "LibraryFiles.c"
 		MetadataDateTime* date_time = NULL;
-		MediaMetadata* _tmp2_ = NULL;
-		MetadataDateTime* _tmp3_ = NULL;
-		MetadataDateTime* _tmp4_ = NULL;
+		MediaMetadata* _tmp2_;
+		MetadataDateTime* _tmp3_;
+		MetadataDateTime* _tmp4_;
 #line 20 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp2_ = metadata;
 #line 20 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -237,34 +233,34 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 		_tmp4_ = date_time;
 #line 21 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (_tmp4_ != NULL) {
-#line 241 "LibraryFiles.c"
-			MetadataDateTime* _tmp5_ = NULL;
-			time_t _tmp6_ = 0;
+#line 237 "LibraryFiles.c"
+			MetadataDateTime* _tmp5_;
+			time_t _tmp6_;
 #line 22 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp5_ = date_time;
 #line 22 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp6_ = metadata_date_time_get_timestamp (_tmp5_);
 #line 22 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			timestamp = _tmp6_;
-#line 250 "LibraryFiles.c"
+#line 246 "LibraryFiles.c"
 		} else {
-			time_t _tmp7_ = 0;
+			time_t _tmp7_;
 #line 23 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp7_ = timestamp;
 #line 23 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (_tmp7_ == ((time_t) 0)) {
-#line 257 "LibraryFiles.c"
-				time_t _tmp8_ = 0;
+#line 253 "LibraryFiles.c"
+				time_t _tmp8_;
 #line 24 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				_tmp8_ = time (NULL);
 #line 24 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				timestamp = _tmp8_;
-#line 263 "LibraryFiles.c"
+#line 259 "LibraryFiles.c"
 			}
 		}
 #line 19 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 268 "LibraryFiles.c"
+#line 264 "LibraryFiles.c"
 	}
 #line 28 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp9_ = timestamp;
@@ -272,24 +268,24 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 	_tmp10_ = app_dirs_get_baked_import_dir (_tmp9_);
 #line 28 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	dir = _tmp10_;
-#line 276 "LibraryFiles.c"
+#line 272 "LibraryFiles.c"
 	{
-		GFile* _tmp11_ = NULL;
+		GFile* _tmp11_;
 #line 30 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp11_ = dir;
 #line 30 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_file_make_directory_with_parents (_tmp11_, NULL, &_inner_error_);
 #line 30 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 285 "LibraryFiles.c"
-			goto __catch462_g_error;
+#line 281 "LibraryFiles.c"
+			goto __catch463_g_error;
 		}
 	}
-	goto __finally462;
-	__catch462_g_error:
+	goto __finally463;
+	__catch463_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp12_ = NULL;
+		GError* _tmp12_;
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		err = _inner_error_;
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -298,9 +294,9 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 		_tmp12_ = err;
 #line 32 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (!g_error_matches (_tmp12_, G_IO_ERROR, G_IO_ERROR_EXISTS)) {
-#line 302 "LibraryFiles.c"
-			GError* _tmp13_ = NULL;
-			GError* _tmp14_ = NULL;
+#line 298 "LibraryFiles.c"
+			GError* _tmp13_;
+			GError* _tmp14_;
 #line 33 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp13_ = err;
 #line 33 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -309,14 +305,14 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 			_inner_error_ = _tmp14_;
 #line 33 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_error_free0 (err);
-#line 313 "LibraryFiles.c"
-			goto __finally462;
+#line 309 "LibraryFiles.c"
+			goto __finally463;
 		}
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
-#line 318 "LibraryFiles.c"
+#line 314 "LibraryFiles.c"
 	}
-	__finally462:
+	__finally463:
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -325,82 +321,103 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 		_g_object_unref0 (dir);
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 329 "LibraryFiles.c"
+#line 325 "LibraryFiles.c"
 	}
 #line 39 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp15_ = basename;
 #line 39 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp16_ = g_strdup (_tmp15_);
+	_tmp16_ = library_files_convert_basename (_tmp15_);
 #line 39 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	newbasename = _tmp16_;
-#line 40 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp17_ = config_facade_get_instance ();
-#line 40 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp18_ = _tmp17_;
-#line 40 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp19_ = configuration_facade_get_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 40 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp20_ = _tmp19_;
-#line 40 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_g_object_unref0 (_tmp18_);
-#line 40 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	if (_tmp20_) {
-#line 349 "LibraryFiles.c"
-		const gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
 #line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp21_ = newbasename;
+	_tmp18_ = dir;
 #line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp22_ = g_utf8_strdown (_tmp21_, (gssize) -1);
+	_tmp20_ = generate_unique_file (_tmp18_, newbasename, &_tmp19_, &_inner_error_);
 #line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_g_free0 (newbasename);
+	_vala_collision = _tmp19_;
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp17_ = _tmp20_;
 #line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		newbasename = _tmp22_;
-#line 360 "LibraryFiles.c"
-	}
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp24_ = dir;
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp25_ = newbasename;
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp27_ = generate_unique_file (_tmp24_, _tmp25_, &_tmp26_, &_inner_error_);
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_vala_collision = _tmp26_;
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp23_ = _tmp27_;
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_free0 (newbasename);
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_object_unref0 (dir);
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 382 "LibraryFiles.c"
+#line 351 "LibraryFiles.c"
 	}
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp28_ = _tmp23_;
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp23_ = NULL;
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	result = _tmp28_;
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_g_object_unref0 (_tmp23_);
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp21_ = _tmp17_;
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp17_ = NULL;
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	result = _tmp21_;
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_g_object_unref0 (_tmp17_);
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_g_free0 (newbasename);
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_g_object_unref0 (dir);
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (collision) {
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		*collision = _vala_collision;
-#line 400 "LibraryFiles.c"
+#line 369 "LibraryFiles.c"
 	}
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	return result;
-#line 404 "LibraryFiles.c"
+#line 373 "LibraryFiles.c"
+}
+
+
+gchar* library_files_convert_basename (const gchar* basename) {
+	gchar* result = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+#line 46 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	g_return_val_if_fail (basename != NULL, NULL);
+#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp0_ = config_facade_get_instance ();
+#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp1_ = _tmp0_;
+#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp2_ = configuration_facade_get_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp3_ = _tmp2_;
+#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_g_object_unref0 (_tmp1_);
+#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	if (_tmp3_) {
+#line 397 "LibraryFiles.c"
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
+#line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp4_ = basename;
+#line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp5_ = g_utf8_strdown (_tmp4_, (gssize) -1);
+#line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		result = _tmp5_;
+#line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		return result;
+#line 408 "LibraryFiles.c"
+	} else {
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp6_ = basename;
+#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp7_ = g_strdup (_tmp6_);
+#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		result = _tmp7_;
+#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		return result;
+#line 420 "LibraryFiles.c"
+	}
 }
 
 
@@ -408,561 +425,541 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 	GFile* result = NULL;
 	time_t timestamp = 0;
 	MediaMetadata* metadata = NULL;
-	GFile* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	GFile* _tmp8_;
+	gboolean _tmp9_;
 	gboolean collision = FALSE;
 	GFile* dest = NULL;
-	GFile* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
-	MediaMetadata* _tmp30_ = NULL;
-	time_t _tmp31_ = 0;
+	GFile* _tmp27_;
+	gchar* _tmp28_;
+	gchar* _tmp29_;
+	MediaMetadata* _tmp30_;
+	time_t _tmp31_;
 	gboolean _tmp32_ = FALSE;
-	GFile* _tmp33_ = NULL;
-	GFile* _tmp34_ = NULL;
-	GFile* _tmp35_ = NULL;
-	gboolean _tmp37_ = FALSE;
+	GFile* _tmp33_;
+	GFile* _tmp34_;
+	GFile* _tmp35_;
+	gboolean _tmp37_;
 	GError * _inner_error_ = NULL;
-#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	g_return_val_if_fail (G_IS_FILE (src), NULL);
-#line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	timestamp = (time_t) 0;
-#line 431 "LibraryFiles.c"
+#line 448 "LibraryFiles.c"
 	{
 		time_t _tmp0_ = 0;
-		GFile* _tmp1_ = NULL;
-		time_t _tmp2_ = 0;
-#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		GFile* _tmp1_;
+		time_t _tmp2_;
+#line 60 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp1_ = src;
-#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 60 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp2_ = query_file_modified (_tmp1_, &_inner_error_);
-#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 60 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp0_ = _tmp2_;
-#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 60 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 444 "LibraryFiles.c"
-			goto __catch463_g_error;
+#line 461 "LibraryFiles.c"
+			goto __catch464_g_error;
 		}
-#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 60 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		timestamp = _tmp0_;
-#line 449 "LibraryFiles.c"
+#line 466 "LibraryFiles.c"
 	}
-	goto __finally463;
-	__catch463_g_error:
+	goto __finally464;
+	__catch464_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-#line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		GFile* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		GError* _tmp6_;
+		const gchar* _tmp7_;
+#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		err = _inner_error_;
-#line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_inner_error_ = NULL;
-#line 52 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp3_ = src;
-#line 52 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp4_ = g_file_get_path (_tmp3_);
-#line 52 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp5_ = _tmp4_;
-#line 52 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp6_ = err;
-#line 52 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp7_ = _tmp6_->message;
-#line 52 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		g_critical ("LibraryFiles.vala:52: Unable to access file modification for %s: %s", _tmp5_, _tmp7_);
-#line 52 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		g_critical ("LibraryFiles.vala:62: Unable to access file modification for %s: %s", _tmp5_, _tmp7_);
+#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_free0 (_tmp5_);
-#line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
-#line 480 "LibraryFiles.c"
+#line 497 "LibraryFiles.c"
 	}
-	__finally463:
-#line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	__finally464:
+#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 489 "LibraryFiles.c"
+#line 506 "LibraryFiles.c"
 	}
-#line 55 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 65 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	metadata = NULL;
-#line 56 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp8_ = src;
-#line 56 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp9_ = video_reader_is_supported_video_file (_tmp8_);
-#line 56 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (_tmp9_) {
-#line 499 "LibraryFiles.c"
+#line 516 "LibraryFiles.c"
 		VideoReader* reader = NULL;
-		GFile* _tmp10_ = NULL;
-		VideoReader* _tmp11_ = NULL;
-#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		GFile* _tmp10_;
+		VideoReader* _tmp11_;
+#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp10_ = src;
-#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp11_ = video_reader_new (_tmp10_);
-#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		reader = _tmp11_;
-#line 509 "LibraryFiles.c"
+#line 526 "LibraryFiles.c"
 		{
 			VideoMetadata* _tmp12_ = NULL;
-			VideoReader* _tmp13_ = NULL;
-			VideoMetadata* _tmp14_ = NULL;
-			VideoMetadata* _tmp15_ = NULL;
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			VideoReader* _tmp13_;
+			VideoMetadata* _tmp14_;
+			VideoMetadata* _tmp15_;
+#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp13_ = reader;
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp14_ = video_reader_read_metadata (_tmp13_, &_inner_error_);
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp12_ = _tmp14_;
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 523 "LibraryFiles.c"
-				goto __catch464_g_error;
+#line 540 "LibraryFiles.c"
+				goto __catch465_g_error;
 			}
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp15_ = _tmp12_;
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp12_ = NULL;
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (metadata);
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			metadata = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_METADATA, MediaMetadata);
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (_tmp12_);
-#line 536 "LibraryFiles.c"
+#line 553 "LibraryFiles.c"
 		}
-		goto __finally464;
-		__catch464_g_error:
+		goto __finally465;
+		__catch465_g_error:
 		{
 			GError* err = NULL;
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			err = _inner_error_;
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_inner_error_ = NULL;
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_error_free0 (err);
-#line 548 "LibraryFiles.c"
+#line 565 "LibraryFiles.c"
 		}
-		__finally464:
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		__finally465:
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			g_propagate_error (error, _inner_error_);
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_video_reader_unref0 (reader);
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (metadata);
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			return NULL;
-#line 561 "LibraryFiles.c"
+#line 578 "LibraryFiles.c"
 		}
-#line 56 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_video_reader_unref0 (reader);
-#line 565 "LibraryFiles.c"
+#line 582 "LibraryFiles.c"
 	} else {
 		PhotoFileReader* reader = NULL;
-		GFile* _tmp16_ = NULL;
-		PhotoFileFormat _tmp17_ = 0;
-		GFile* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		PhotoFileReader* _tmp21_ = NULL;
-		PhotoFileReader* _tmp22_ = NULL;
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		GFile* _tmp16_;
+		PhotoFileFormat _tmp17_;
+		GFile* _tmp18_;
+		gchar* _tmp19_;
+		gchar* _tmp20_;
+		PhotoFileReader* _tmp21_;
+		PhotoFileReader* _tmp22_;
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp16_ = src;
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp17_ = photo_file_format_get_by_file_extension (_tmp16_);
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp18_ = src;
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp19_ = g_file_get_path (_tmp18_);
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp20_ = _tmp19_;
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp21_ = photo_file_format_create_reader (_tmp17_, _tmp20_);
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp22_ = _tmp21_;
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_free0 (_tmp20_);
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		reader = _tmp22_;
-#line 593 "LibraryFiles.c"
+#line 610 "LibraryFiles.c"
 		{
 			PhotoMetadata* _tmp23_ = NULL;
-			PhotoFileReader* _tmp24_ = NULL;
-			PhotoMetadata* _tmp25_ = NULL;
-			PhotoMetadata* _tmp26_ = NULL;
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			PhotoFileReader* _tmp24_;
+			PhotoMetadata* _tmp25_;
+			PhotoMetadata* _tmp26_;
+#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp24_ = reader;
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp25_ = photo_file_reader_read_metadata (_tmp24_, &_inner_error_);
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp23_ = _tmp25_;
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 607 "LibraryFiles.c"
-				goto __catch465_g_error;
+#line 624 "LibraryFiles.c"
+				goto __catch466_g_error;
 			}
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp26_ = _tmp23_;
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp23_ = NULL;
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (metadata);
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			metadata = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_MEDIA_METADATA, MediaMetadata);
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (_tmp23_);
-#line 620 "LibraryFiles.c"
+#line 637 "LibraryFiles.c"
 		}
-		goto __finally465;
-		__catch465_g_error:
+		goto __finally466;
+		__catch466_g_error:
 		{
 			GError* err = NULL;
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			err = _inner_error_;
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_inner_error_ = NULL;
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_error_free0 (err);
-#line 632 "LibraryFiles.c"
+#line 649 "LibraryFiles.c"
 		}
-		__finally465:
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		__finally466:
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			g_propagate_error (error, _inner_error_);
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (metadata);
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			return NULL;
-#line 645 "LibraryFiles.c"
+#line 662 "LibraryFiles.c"
 		}
-#line 56 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 649 "LibraryFiles.c"
+#line 666 "LibraryFiles.c"
 	}
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp27_ = src;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp28_ = g_file_get_basename (_tmp27_);
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp29_ = _tmp28_;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp30_ = metadata;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp31_ = timestamp;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp33_ = library_files_generate_unique_file (_tmp29_, _tmp30_, _tmp31_, &_tmp32_, &_inner_error_);
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	collision = _tmp32_;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp34_ = _tmp33_;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_g_free0 (_tmp29_);
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	dest = _tmp34_;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_media_metadata_unref0 (metadata);
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 679 "LibraryFiles.c"
+#line 696 "LibraryFiles.c"
 	}
-#line 75 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp35_ = dest;
-#line 75 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (_tmp35_ == NULL) {
-#line 685 "LibraryFiles.c"
-		GError* _tmp36_ = NULL;
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 702 "LibraryFiles.c"
+		GError* _tmp36_;
+#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp36_ = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, "Unable to generate unique pathname for destination");
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_inner_error_ = _tmp36_;
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_object_unref0 (dest);
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_media_metadata_unref0 (metadata);
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 699 "LibraryFiles.c"
+#line 716 "LibraryFiles.c"
 	}
-#line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 88 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp37_ = blacklist;
-#line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 88 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (_tmp37_) {
-#line 705 "LibraryFiles.c"
-		GFile* _tmp38_ = NULL;
-#line 79 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 722 "LibraryFiles.c"
+		GFile* _tmp38_;
+#line 89 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp38_ = dest;
-#line 79 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 89 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		library_monitor_blacklist_file (_tmp38_, "LibraryFiles.duplicate");
-#line 711 "LibraryFiles.c"
+#line 728 "LibraryFiles.c"
 	}
 	{
-		GFile* _tmp39_ = NULL;
-		GFile* _tmp40_ = NULL;
-		GFileProgressCallback _tmp41_ = NULL;
-		void* _tmp41__target = NULL;
-		gboolean _tmp42_ = FALSE;
-#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		GFile* _tmp39_;
+		GFile* _tmp40_;
+		GFileProgressCallback _tmp41_;
+		void* _tmp41__target;
+		gboolean _tmp42_;
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp39_ = src;
-#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp40_ = dest;
-#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp41_ = progress_callback;
-#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp41__target = progress_callback_target;
-#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_file_copy (_tmp39_, _tmp40_, G_FILE_COPY_ALL_METADATA | G_FILE_COPY_OVERWRITE, NULL, _tmp41_, _tmp41__target, &_inner_error_);
-#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 731 "LibraryFiles.c"
-			goto __catch466_g_error;
+#line 748 "LibraryFiles.c"
+			goto __catch467_g_error;
 		}
-#line 83 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp42_ = blacklist;
-#line 83 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (_tmp42_) {
-#line 738 "LibraryFiles.c"
-			GFile* _tmp43_ = NULL;
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 755 "LibraryFiles.c"
+			GFile* _tmp43_;
+#line 94 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp43_ = dest;
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 94 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			library_monitor_unblacklist_file (_tmp43_);
-#line 744 "LibraryFiles.c"
+#line 761 "LibraryFiles.c"
 		}
 	}
-	goto __finally466;
-	__catch466_g_error:
+	goto __finally467;
+	__catch467_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp44_ = NULL;
-		gchar* _tmp45_ = NULL;
-		gchar* _tmp46_ = NULL;
-		GError* _tmp47_ = NULL;
-		const gchar* _tmp48_ = NULL;
+		GFile* _tmp44_;
+		gchar* _tmp45_;
+		gchar* _tmp46_;
+		GError* _tmp47_;
+		const gchar* _tmp48_;
 		gboolean _tmp49_ = FALSE;
-		gboolean _tmp50_ = FALSE;
-#line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		gboolean _tmp50_;
+#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		err = _inner_error_;
-#line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_inner_error_ = NULL;
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp44_ = src;
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp45_ = g_file_get_path (_tmp44_);
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp46_ = _tmp45_;
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp47_ = err;
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp48_ = _tmp47_->message;
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		g_message ("LibraryFiles.vala:86: There was a problem copying %s: %s", _tmp46_, _tmp48_);
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		g_message ("LibraryFiles.vala:96: There was a problem copying %s: %s", _tmp46_, _tmp48_);
+#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_free0 (_tmp46_);
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp50_ = blacklist;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (_tmp50_) {
-#line 780 "LibraryFiles.c"
+#line 797 "LibraryFiles.c"
 			gchar* _tmp51_ = NULL;
-			GFile* _tmp52_ = NULL;
-			gchar* _tmp53_ = NULL;
+			GFile* _tmp52_;
+			gchar* _tmp53_;
 			gchar* _tmp54_ = NULL;
-			GFile* _tmp55_ = NULL;
-			gchar* _tmp56_ = NULL;
-			gchar* _tmp57_ = NULL;
-			gchar* _tmp58_ = NULL;
-			gchar* _tmp59_ = NULL;
-			gchar* _tmp60_ = NULL;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			GFile* _tmp55_;
+			gchar* _tmp56_;
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp52_ = src;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp53_ = md5_file (_tmp52_, &_inner_error_);
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp51_ = _tmp53_;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				_g_error_free0 (err);
-#line 801 "LibraryFiles.c"
-				goto __finally466;
+#line 814 "LibraryFiles.c"
+				goto __finally467;
 			}
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp55_ = dest;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp56_ = md5_file (_tmp55_, &_inner_error_);
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp54_ = _tmp56_;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				_g_free0 (_tmp51_);
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				_g_error_free0 (err);
-#line 816 "LibraryFiles.c"
-				goto __finally466;
+#line 829 "LibraryFiles.c"
+				goto __finally467;
 			}
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp57_ = _tmp51_;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp51_ = NULL;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp58_ = _tmp57_;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp59_ = _tmp54_;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp54_ = NULL;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp60_ = _tmp59_;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp49_ = g_strcmp0 (_tmp58_, _tmp60_) != 0;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_g_free0 (_tmp60_);
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_g_free0 (_tmp58_);
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp49_ = g_strcmp0 (_tmp51_, _tmp54_) != 0;
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_free0 (_tmp54_);
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_free0 (_tmp51_);
-#line 841 "LibraryFiles.c"
+#line 838 "LibraryFiles.c"
 		} else {
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp49_ = FALSE;
-#line 845 "LibraryFiles.c"
+#line 842 "LibraryFiles.c"
 		}
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (_tmp49_) {
-#line 849 "LibraryFiles.c"
-			GFile* _tmp61_ = NULL;
-#line 88 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp61_ = dest;
-#line 88 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			library_monitor_unblacklist_file (_tmp61_);
-#line 855 "LibraryFiles.c"
+#line 846 "LibraryFiles.c"
+			GFile* _tmp57_;
+#line 98 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp57_ = dest;
+#line 98 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			library_monitor_unblacklist_file (_tmp57_);
+#line 852 "LibraryFiles.c"
 		}
-#line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
-#line 859 "LibraryFiles.c"
+#line 856 "LibraryFiles.c"
 	}
-	__finally466:
-#line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	__finally467:
+#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_object_unref0 (dest);
-#line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_media_metadata_unref0 (metadata);
-#line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 872 "LibraryFiles.c"
+#line 869 "LibraryFiles.c"
 	}
 	{
 		GFileInfo* info = NULL;
-		GFile* _tmp62_ = NULL;
-		GFileInfo* _tmp63_ = NULL;
+		GFile* _tmp58_;
+		GFileInfo* _tmp59_;
 		guint32 mode = 0U;
-		GFileInfo* _tmp64_ = NULL;
-		guint32 _tmp65_ = 0U;
-		gboolean _tmp66_ = FALSE;
-		GFile* _tmp67_ = NULL;
-		guint32 _tmp68_ = 0U;
-		gboolean _tmp69_ = FALSE;
-#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp62_ = dest;
-#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp63_ = g_file_query_info (_tmp62_, G_FILE_ATTRIBUTE_UNIX_MODE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
-#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		info = _tmp63_;
-#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		GFileInfo* _tmp60_;
+		guint32 _tmp61_;
+		gboolean _tmp62_ = FALSE;
+		GFile* _tmp63_;
+		guint32 _tmp64_;
+		gboolean _tmp65_;
+#line 103 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp58_ = dest;
+#line 103 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp59_ = g_file_query_info (_tmp58_, G_FILE_ATTRIBUTE_UNIX_MODE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+#line 103 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		info = _tmp59_;
+#line 103 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 893 "LibraryFiles.c"
-			goto __catch467_g_error;
+#line 890 "LibraryFiles.c"
+			goto __catch468_g_error;
 		}
-#line 94 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp64_ = info;
-#line 94 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp65_ = g_file_info_get_attribute_uint32 (_tmp64_, G_FILE_ATTRIBUTE_UNIX_MODE);
-#line 94 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		mode = _tmp65_ | 0600;
-#line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp67_ = dest;
-#line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp68_ = mode;
-#line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp69_ = g_file_set_attribute_uint32 (_tmp67_, G_FILE_ATTRIBUTE_UNIX_MODE, _tmp68_, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
-#line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp66_ = _tmp69_;
-#line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 104 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp60_ = info;
+#line 104 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp61_ = g_file_info_get_attribute_uint32 (_tmp60_, G_FILE_ATTRIBUTE_UNIX_MODE);
+#line 104 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		mode = _tmp61_ | 0600;
+#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp63_ = dest;
+#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp64_ = mode;
+#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp65_ = g_file_set_attribute_uint32 (_tmp63_, G_FILE_ATTRIBUTE_UNIX_MODE, _tmp64_, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp62_ = _tmp65_;
+#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_object_unref0 (info);
-#line 914 "LibraryFiles.c"
-			goto __catch467_g_error;
+#line 911 "LibraryFiles.c"
+			goto __catch468_g_error;
 		}
-#line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		if (!_tmp66_) {
-#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			g_warning ("LibraryFiles.vala:96: Could not make file writable");
-#line 921 "LibraryFiles.c"
+#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		if (!_tmp62_) {
+#line 106 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			g_warning ("LibraryFiles.vala:106: Could not make file writable");
+#line 918 "LibraryFiles.c"
 		}
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_object_unref0 (info);
-#line 925 "LibraryFiles.c"
+#line 922 "LibraryFiles.c"
 	}
-	goto __finally467;
-	__catch467_g_error:
+	goto __finally468;
+	__catch468_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp70_ = NULL;
-		const gchar* _tmp71_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		GError* _tmp66_;
+		const gchar* _tmp67_;
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		err = _inner_error_;
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_inner_error_ = NULL;
-#line 99 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp70_ = err;
-#line 99 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp71_ = _tmp70_->message;
-#line 99 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		g_warning ("LibraryFiles.vala:99: Could not make file writable: %s", _tmp71_);
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp66_ = err;
+#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp67_ = _tmp66_->message;
+#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		g_warning ("LibraryFiles.vala:109: Could not make file writable: %s", _tmp67_);
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
-#line 945 "LibraryFiles.c"
+#line 942 "LibraryFiles.c"
 	}
-	__finally467:
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	__finally468:
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_object_unref0 (dest);
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_media_metadata_unref0 (metadata);
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 958 "LibraryFiles.c"
+#line 955 "LibraryFiles.c"
 	}
-#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 112 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	result = dest;
-#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 112 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_media_metadata_unref0 (metadata);
-#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 112 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	return result;
-#line 966 "LibraryFiles.c"
+#line 963 "LibraryFiles.c"
 }
 
 
diff --git a/src/LibraryFiles.vala b/src/LibraryFiles.vala
index 20d43ab..a49b77b 100644
--- a/src/LibraryFiles.vala
+++ b/src/LibraryFiles.vala
@@ -36,13 +36,23 @@ public File? generate_unique_file(string basename, MediaMetadata? metadata, time
     }
     
     // Optionally convert to lower-case.
-    string newbasename = basename;
-    if (Config.Facade.get_instance().get_use_lowercase_filenames())
-        newbasename = newbasename.down();
+    string newbasename = convert_basename(basename);
     
     return global::generate_unique_file(dir, newbasename, out collision);
 }
 
+// Create the basename for files in the library.
+// Depending on the setting USE_LOWERCASE_FILENAMES the basename will be converted to lower case or not
+public string convert_basename(string basename) {
+    if (Config.Facade.get_instance().get_use_lowercase_filenames()) {
+        return basename.down();
+    } else {
+        return basename;
+    }
+
+}
+
+
 // This function is thread-safe.
 private File duplicate(File src, FileProgressCallback? progress_callback, bool blacklist) throws Error {
     time_t timestamp = 0;
@@ -59,7 +69,7 @@ private File duplicate(File src, FileProgressCallback? progress_callback, bool b
             metadata = reader.read_metadata();
         } catch (Error err) {
             // ignored, leave metadata as null
-        }            
+        }
     } else {
         PhotoFileReader reader = PhotoFileFormat.get_by_file_extension(src).create_reader(
             src.get_path());
diff --git a/src/LibraryMonitor.c b/src/LibraryMonitor.c
index a1234fb..7cc9ef6 100644
--- a/src/LibraryMonitor.c
+++ b/src/LibraryMonitor.c
@@ -1,4 +1,4 @@
-/* LibraryMonitor.c generated by valac 0.34.7, the Vala compiler
+/* LibraryMonitor.c generated by valac 0.36.6, the Vala compiler
  * generated from LibraryMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -70,6 +70,12 @@ typedef struct _LibraryMonitorClass LibraryMonitorClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _library_monitor_pool_unref0(var) ((var == NULL) ? NULL : (var = (library_monitor_pool_unref (var), NULL)))
 typedef struct _ParamSpecLibraryMonitorPool ParamSpecLibraryMonitorPool;
+enum  {
+	LIBRARY_MONITOR_POOL_MONITOR_INSTALLED_SIGNAL,
+	LIBRARY_MONITOR_POOL_MONITOR_DESTROYED_SIGNAL,
+	LIBRARY_MONITOR_POOL_LAST_SIGNAL
+};
+static guint library_monitor_pool_signals[LIBRARY_MONITOR_POOL_LAST_SIGNAL] = {0};
 typedef struct _DirectoryMonitorPrivate DirectoryMonitorPrivate;
 typedef struct _LibraryMonitorPrivate LibraryMonitorPrivate;
 
@@ -439,6 +445,13 @@ typedef struct _TombstoneClass TombstoneClass;
 typedef struct _AbstractSemaphore AbstractSemaphore;
 typedef struct _AbstractSemaphoreClass AbstractSemaphoreClass;
 typedef struct _LibraryMonitorParamSpecVerifyJob LibraryMonitorParamSpecVerifyJob;
+enum  {
+	LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL,
+	LIBRARY_MONITOR_AUTO_IMPORT_PREPARING_SIGNAL,
+	LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL,
+	LIBRARY_MONITOR_LAST_SIGNAL
+};
+static guint library_monitor_signals[LIBRARY_MONITOR_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -567,7 +580,9 @@ struct _LibraryMonitorAsyncDiscoveryCompletedData {
 	int _state_;
 	GObject* _source_object_;
 	GAsyncResult* _res_;
-	GSimpleAsyncResult* _async_result;
+	GTask* _async_result;
+	GAsyncReadyCallback _callback_;
+	gboolean _task_complete_;
 	LibraryMonitor* self;
 	GeeHashSet* _tmp0_;
 	gint _tmp1_;
@@ -696,7 +711,9 @@ struct _LibraryMonitorVerifyMonitorableData {
 	int _state_;
 	GObject* _source_object_;
 	GAsyncResult* _res_;
-	GSimpleAsyncResult* _async_result;
+	GTask* _async_result;
+	GAsyncReadyCallback _callback_;
+	gboolean _task_complete_;
 	LibraryMonitor* self;
 	Monitorable* monitorable;
 	MediaMonitor* monitor;
@@ -912,7 +929,7 @@ static gboolean library_monitor_pool_on_start_monitor (LibraryMonitorPool* self)
 static gboolean _library_monitor_pool_on_start_monitor_gsource_func (gpointer self);
 void directory_monitor_close (DirectoryMonitor* self);
 void directory_monitor_start_discovery (DirectoryMonitor* self);
-static void library_monitor_pool_finalize (LibraryMonitorPool* obj);
+static void library_monitor_pool_finalize (LibraryMonitorPool * obj);
 gpointer workers_ref (gpointer instance);
 void workers_unref (gpointer instance);
 GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1011,7 +1028,7 @@ MediaMonitor* media_source_collection_create_media_monitor (MediaSourceCollectio
 void media_monitor_notify_discovery_started (MediaMonitor* self);
 static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* file, GFileInfo* info);
 GType media_monitor_discovered_file_get_type (void) G_GNUC_CONST;
-MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable** monitorable);
+MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable);
 GType tombstone_source_collection_get_type (void) G_GNUC_CONST;
 gboolean tombstone_source_collection_matches (TombstoneSourceCollection* self, GFile* file);
 static gboolean library_monitor_is_supported_filetype (LibraryMonitor* self, GFile* file);
@@ -1019,6 +1036,7 @@ static void library_monitor_real_discovery_completed (DirectoryMonitor* base);
 static void library_monitor_async_discovery_completed (LibraryMonitor* self, GAsyncReadyCallback _callback_, gpointer _user_data_);
 static void library_monitor_async_discovery_completed_finish (LibraryMonitor* self, GAsyncResult* _res_);
 static void library_monitor_async_discovery_completed_data_free (gpointer _data);
+static void library_monitor_async_discovery_completed_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data);
 static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyncDiscoveryCompletedData* _data_);
 static void library_monitor_discovery_stage_completed (LibraryMonitor* self);
 GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, GFile* file);
@@ -1062,10 +1080,11 @@ static void library_monitor_execute_next_verify_job (LibraryMonitor* self);
 static void library_monitor_verify_monitorable (LibraryMonitor* self, Monitorable* monitorable, MediaMonitor* monitor, GAsyncReadyCallback _callback_, gpointer _user_data_);
 static void library_monitor_verify_monitorable_finish (LibraryMonitor* self, GAsyncResult* _res_);
 static void library_monitor_verify_monitorable_data_free (gpointer _data);
+static void library_monitor_verify_monitorable_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data);
 static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonitorableData* _data_);
 GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorable);
 GFile** media_monitor_get_auxilliary_backing_files (MediaMonitor* self, Monitorable* monitorable, int* result_length1);
-static void _vala_array_add130 (GFile*** array, int* length, int* size, GFile* value);
+static void _vala_array_add130 (GFile** * array, int* length, int* size, GFile* value);
 #define UTIL_FILE_ATTRIBUTES "standard::*,time::*,id::file,id::filesystem,etag::value"
 #define DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES UTIL_FILE_ATTRIBUTES
 #define DIRECTORY_MONITOR_FILE_INFO_FLAGS G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS
@@ -1192,18 +1211,18 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base);
 GFile* media_source_get_master_file (MediaSource* self);
 gchar* md5_file (GFile* file, GError** error);
 gchar* media_source_get_master_md5 (MediaSource* self);
-static void library_monitor_find_move_job_finalize (BackgroundJob* obj);
+static void library_monitor_find_move_job_finalize (BackgroundJob * obj);
 enum  {
 	LIBRARY_MONITOR_RUNTIME_FIND_MOVE_JOB_DUMMY_PROPERTY
 };
 static void _library_monitor_on_runtime_find_move_completed_completion_callback (BackgroundJob* job, gpointer self);
 static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* base);
-static void library_monitor_runtime_find_move_job_finalize (BackgroundJob* obj);
+static void library_monitor_runtime_find_move_job_finalize (BackgroundJob * obj);
 enum  {
 	LIBRARY_MONITOR_VERIFY_JOB_DUMMY_PROPERTY
 };
-static void library_monitor_verify_job_finalize (LibraryMonitorVerifyJob* obj);
-static void library_monitor_finalize (GObject* obj);
+static void library_monitor_verify_job_finalize (LibraryMonitorVerifyJob * obj);
+static void library_monitor_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -1214,14 +1233,14 @@ static LibraryMonitorPool* library_monitor_pool_construct (GType object_type) {
 	self = (LibraryMonitorPool*) g_type_create_instance (object_type);
 #line 38 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self;
-#line 1218 "LibraryMonitor.c"
+#line 1237 "LibraryMonitor.c"
 }
 
 
 static LibraryMonitorPool* library_monitor_pool_new (void) {
 #line 38 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return library_monitor_pool_construct (TYPE_LIBRARY_MONITOR_POOL);
-#line 1225 "LibraryMonitor.c"
+#line 1244 "LibraryMonitor.c"
 }
 
 
@@ -1230,52 +1249,52 @@ void library_monitor_pool_init (void) {
 
 
 void library_monitor_pool_terminate (void) {
-	LibraryMonitorPool* _tmp0_ = NULL;
+	LibraryMonitorPool* _tmp0_;
 #line 45 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp0_ = library_monitor_pool_instance;
 #line 45 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp0_ != NULL) {
-#line 1239 "LibraryMonitor.c"
-		LibraryMonitorPool* _tmp1_ = NULL;
+#line 1258 "LibraryMonitor.c"
+		LibraryMonitorPool* _tmp1_;
 #line 46 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = library_monitor_pool_instance;
 #line 46 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_pool_close (_tmp1_);
-#line 1245 "LibraryMonitor.c"
+#line 1264 "LibraryMonitor.c"
 	}
 #line 48 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_library_monitor_pool_unref0 (library_monitor_pool_instance);
 #line 48 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_pool_instance = NULL;
-#line 1251 "LibraryMonitor.c"
+#line 1270 "LibraryMonitor.c"
 }
 
 
 static gpointer _library_monitor_pool_ref0 (gpointer self) {
 #line 55 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self ? library_monitor_pool_ref (self) : NULL;
-#line 1258 "LibraryMonitor.c"
+#line 1277 "LibraryMonitor.c"
 }
 
 
 LibraryMonitorPool* library_monitor_pool_get_instance (void) {
 	LibraryMonitorPool* result = NULL;
-	LibraryMonitorPool* _tmp0_ = NULL;
-	LibraryMonitorPool* _tmp2_ = NULL;
-	LibraryMonitorPool* _tmp3_ = NULL;
+	LibraryMonitorPool* _tmp0_;
+	LibraryMonitorPool* _tmp2_;
+	LibraryMonitorPool* _tmp3_;
 #line 52 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp0_ = library_monitor_pool_instance;
 #line 52 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp0_ == NULL) {
-#line 1271 "LibraryMonitor.c"
-		LibraryMonitorPool* _tmp1_ = NULL;
+#line 1290 "LibraryMonitor.c"
+		LibraryMonitorPool* _tmp1_;
 #line 53 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = library_monitor_pool_new ();
 #line 53 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_library_monitor_pool_unref0 (library_monitor_pool_instance);
 #line 53 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_pool_instance = _tmp1_;
-#line 1279 "LibraryMonitor.c"
+#line 1298 "LibraryMonitor.c"
 	}
 #line 55 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp2_ = library_monitor_pool_instance;
@@ -1285,21 +1304,21 @@ LibraryMonitorPool* library_monitor_pool_get_instance (void) {
 	result = _tmp3_;
 #line 55 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 1289 "LibraryMonitor.c"
+#line 1308 "LibraryMonitor.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 59 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1296 "LibraryMonitor.c"
+#line 1315 "LibraryMonitor.c"
 }
 
 
 LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self) {
 	LibraryMonitor* result = NULL;
-	LibraryMonitor* _tmp0_ = NULL;
-	LibraryMonitor* _tmp1_ = NULL;
+	LibraryMonitor* _tmp0_;
+	LibraryMonitor* _tmp1_;
 #line 58 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_val_if_fail (IS_LIBRARY_MONITOR_POOL (self), NULL);
 #line 59 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -1310,7 +1329,7 @@ LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self) {
 	result = _tmp1_;
 #line 59 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 1314 "LibraryMonitor.c"
+#line 1333 "LibraryMonitor.c"
 }
 
 
@@ -1319,16 +1338,16 @@ static gboolean _library_monitor_pool_on_start_monitor_gsource_func (gpointer se
 	result = library_monitor_pool_on_start_monitor ((LibraryMonitorPool*) self);
 #line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 1323 "LibraryMonitor.c"
+#line 1342 "LibraryMonitor.c"
 }
 
 
 void library_monitor_pool_replace (LibraryMonitorPool* self, LibraryMonitor* replacement, gint start_msec_delay) {
-	LibraryMonitor* _tmp0_ = NULL;
-	LibraryMonitor* _tmp1_ = NULL;
+	LibraryMonitor* _tmp0_;
+	LibraryMonitor* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
-	LibraryMonitor* _tmp7_ = NULL;
+	gint _tmp3_;
+	LibraryMonitor* _tmp7_;
 #line 63 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR_POOL (self));
 #line 63 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -1347,46 +1366,46 @@ void library_monitor_pool_replace (LibraryMonitorPool* self, LibraryMonitor* rep
 	_tmp3_ = start_msec_delay;
 #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp3_ > 0) {
-#line 1351 "LibraryMonitor.c"
-		guint _tmp4_ = 0U;
+#line 1370 "LibraryMonitor.c"
+		guint _tmp4_;
 #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp4_ = self->priv->timer_id;
 #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = _tmp4_ == ((guint) 0);
-#line 1357 "LibraryMonitor.c"
+#line 1376 "LibraryMonitor.c"
 	} else {
 #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = FALSE;
-#line 1361 "LibraryMonitor.c"
+#line 1380 "LibraryMonitor.c"
 	}
 #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp2_) {
-#line 1365 "LibraryMonitor.c"
-		gint _tmp5_ = 0;
-		guint _tmp6_ = 0U;
+#line 1384 "LibraryMonitor.c"
+		gint _tmp5_;
+		guint _tmp6_;
 #line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp5_ = start_msec_delay;
 #line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp5_, _library_monitor_pool_on_start_monitor_gsource_func, library_monitor_pool_ref (self), library_monitor_pool_unref);
 #line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		self->priv->timer_id = _tmp6_;
-#line 1374 "LibraryMonitor.c"
+#line 1393 "LibraryMonitor.c"
 	}
 #line 70 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp7_ = self->priv->monitor;
 #line 70 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	g_signal_emit_by_name (self, "monitor-installed", _tmp7_);
-#line 1380 "LibraryMonitor.c"
+	g_signal_emit (self, library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_INSTALLED_SIGNAL], 0, _tmp7_);
+#line 1399 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_pool_close (LibraryMonitorPool* self) {
-	LibraryMonitor* _tmp0_ = NULL;
-	LibraryMonitor* _tmp1_ = NULL;
+	LibraryMonitor* _tmp0_;
+	LibraryMonitor* _tmp1_;
 	LibraryMonitor* closed = NULL;
-	LibraryMonitor* _tmp2_ = NULL;
-	LibraryMonitor* _tmp3_ = NULL;
-	LibraryMonitor* _tmp4_ = NULL;
+	LibraryMonitor* _tmp2_;
+	LibraryMonitor* _tmp3_;
+	LibraryMonitor* _tmp4_;
 #line 73 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR_POOL (self));
 #line 74 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -1395,7 +1414,7 @@ static void library_monitor_pool_close (LibraryMonitorPool* self) {
 	if (_tmp0_ == NULL) {
 #line 75 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 1399 "LibraryMonitor.c"
+#line 1418 "LibraryMonitor.c"
 	}
 #line 77 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp1_ = self->priv->monitor;
@@ -1414,17 +1433,17 @@ static void library_monitor_pool_close (LibraryMonitorPool* self) {
 #line 81 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp4_ = closed;
 #line 81 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	g_signal_emit_by_name (self, "monitor-destroyed", _tmp4_);
+	g_signal_emit (self, library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_DESTROYED_SIGNAL], 0, _tmp4_);
 #line 73 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (closed);
-#line 1421 "LibraryMonitor.c"
+#line 1440 "LibraryMonitor.c"
 }
 
 
 static gboolean library_monitor_pool_on_start_monitor (LibraryMonitorPool* self) {
 	gboolean result = FALSE;
-	LibraryMonitor* _tmp0_ = NULL;
-	LibraryMonitor* _tmp1_ = NULL;
+	LibraryMonitor* _tmp0_;
+	LibraryMonitor* _tmp1_;
 #line 84 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_val_if_fail (IS_LIBRARY_MONITOR_POOL (self), FALSE);
 #line 86 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -1437,7 +1456,7 @@ static gboolean library_monitor_pool_on_start_monitor (LibraryMonitorPool* self)
 		result = FALSE;
 #line 89 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return result;
-#line 1441 "LibraryMonitor.c"
+#line 1460 "LibraryMonitor.c"
 	}
 #line 91 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp1_ = self->priv->monitor;
@@ -1447,14 +1466,14 @@ static gboolean library_monitor_pool_on_start_monitor (LibraryMonitorPool* self)
 	result = FALSE;
 #line 93 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 1451 "LibraryMonitor.c"
+#line 1470 "LibraryMonitor.c"
 }
 
 
 static void value_library_monitor_pool_init (GValue* value) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	value->data[0].v_pointer = NULL;
-#line 1458 "LibraryMonitor.c"
+#line 1477 "LibraryMonitor.c"
 }
 
 
@@ -1463,7 +1482,7 @@ static void value_library_monitor_pool_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_pool_unref (value->data[0].v_pointer);
-#line 1467 "LibraryMonitor.c"
+#line 1486 "LibraryMonitor.c"
 	}
 }
 
@@ -1473,11 +1492,11 @@ static void value_library_monitor_pool_copy_value (const GValue* src_value, GVal
 	if (src_value->data[0].v_pointer) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		dest_value->data[0].v_pointer = library_monitor_pool_ref (src_value->data[0].v_pointer);
-#line 1477 "LibraryMonitor.c"
+#line 1496 "LibraryMonitor.c"
 	} else {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1481 "LibraryMonitor.c"
+#line 1500 "LibraryMonitor.c"
 	}
 }
 
@@ -1485,66 +1504,66 @@ static void value_library_monitor_pool_copy_value (const GValue* src_value, GVal
 static gpointer value_library_monitor_pool_peek_pointer (const GValue* value) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return value->data[0].v_pointer;
-#line 1489 "LibraryMonitor.c"
+#line 1508 "LibraryMonitor.c"
 }
 
 
 static gchar* value_library_monitor_pool_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (collect_values[0].v_pointer) {
-#line 1496 "LibraryMonitor.c"
-		LibraryMonitorPool* object;
+#line 1515 "LibraryMonitor.c"
+		LibraryMonitorPool * object;
 		object = collect_values[0].v_pointer;
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1503 "LibraryMonitor.c"
+#line 1522 "LibraryMonitor.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1507 "LibraryMonitor.c"
+#line 1526 "LibraryMonitor.c"
 		}
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = library_monitor_pool_ref (object);
-#line 1511 "LibraryMonitor.c"
+#line 1530 "LibraryMonitor.c"
 	} else {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 1515 "LibraryMonitor.c"
+#line 1534 "LibraryMonitor.c"
 	}
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return NULL;
-#line 1519 "LibraryMonitor.c"
+#line 1538 "LibraryMonitor.c"
 }
 
 
 static gchar* value_library_monitor_pool_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	LibraryMonitorPool** object_p;
+	LibraryMonitorPool ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!object_p) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1530 "LibraryMonitor.c"
+#line 1549 "LibraryMonitor.c"
 	}
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!value->data[0].v_pointer) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		*object_p = NULL;
-#line 1536 "LibraryMonitor.c"
+#line 1555 "LibraryMonitor.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1540 "LibraryMonitor.c"
+#line 1559 "LibraryMonitor.c"
 	} else {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		*object_p = library_monitor_pool_ref (value->data[0].v_pointer);
-#line 1544 "LibraryMonitor.c"
+#line 1563 "LibraryMonitor.c"
 	}
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return NULL;
-#line 1548 "LibraryMonitor.c"
+#line 1567 "LibraryMonitor.c"
 }
 
 
@@ -1558,7 +1577,7 @@ GParamSpec* param_spec_library_monitor_pool (const gchar* name, const gchar* nic
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return G_PARAM_SPEC (spec);
-#line 1562 "LibraryMonitor.c"
+#line 1581 "LibraryMonitor.c"
 }
 
 
@@ -1567,12 +1586,12 @@ gpointer value_get_library_monitor_pool (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_LIBRARY_MONITOR_POOL), NULL);
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return value->data[0].v_pointer;
-#line 1571 "LibraryMonitor.c"
+#line 1590 "LibraryMonitor.c"
 }
 
 
 void value_set_library_monitor_pool (GValue* value, gpointer v_object) {
-	LibraryMonitorPool* old;
+	LibraryMonitorPool * old;
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_LIBRARY_MONITOR_POOL));
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -1587,23 +1606,23 @@ void value_set_library_monitor_pool (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_pool_ref (value->data[0].v_pointer);
-#line 1591 "LibraryMonitor.c"
+#line 1610 "LibraryMonitor.c"
 	} else {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 1595 "LibraryMonitor.c"
+#line 1614 "LibraryMonitor.c"
 	}
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (old) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_pool_unref (old);
-#line 1601 "LibraryMonitor.c"
+#line 1620 "LibraryMonitor.c"
 	}
 }
 
 
 void value_take_library_monitor_pool (GValue* value, gpointer v_object) {
-	LibraryMonitorPool* old;
+	LibraryMonitorPool * old;
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_LIBRARY_MONITOR_POOL));
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -1616,17 +1635,17 @@ void value_take_library_monitor_pool (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = v_object;
-#line 1620 "LibraryMonitor.c"
+#line 1639 "LibraryMonitor.c"
 	} else {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 1624 "LibraryMonitor.c"
+#line 1643 "LibraryMonitor.c"
 	}
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (old) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_pool_unref (old);
-#line 1630 "LibraryMonitor.c"
+#line 1649 "LibraryMonitor.c"
 	}
 }
 
@@ -1639,10 +1658,10 @@ static void library_monitor_pool_class_init (LibraryMonitorPoolClass * klass) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_type_class_add_private (klass, sizeof (LibraryMonitorPoolPrivate));
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	g_signal_new ("monitor_installed", TYPE_LIBRARY_MONITOR_POOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_LIBRARY_MONITOR);
+	library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_INSTALLED_SIGNAL] = g_signal_new ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_LIBRARY_MONITOR);
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	g_signal_new ("monitor_destroyed", TYPE_LIBRARY_MONITOR_POOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_LIBRARY_MONITOR);
-#line 1646 "LibraryMonitor.c"
+	library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_DESTROYED_SIGNAL] = g_signal_new ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_LIBRARY_MONITOR);
+#line 1665 "LibraryMonitor.c"
 }
 
 
@@ -1655,11 +1674,11 @@ static void library_monitor_pool_instance_init (LibraryMonitorPool * self) {
 	self->priv->timer_id = (guint) 0;
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->ref_count = 1;
-#line 1659 "LibraryMonitor.c"
+#line 1678 "LibraryMonitor.c"
 }
 
 
-static void library_monitor_pool_finalize (LibraryMonitorPool* obj) {
+static void library_monitor_pool_finalize (LibraryMonitorPool * obj) {
 	LibraryMonitorPool * self;
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_MONITOR_POOL, LibraryMonitorPool);
@@ -1667,7 +1686,7 @@ static void library_monitor_pool_finalize (LibraryMonitorPool* obj) {
 	g_signal_handlers_destroy (self);
 #line 31 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (self->priv->monitor);
-#line 1671 "LibraryMonitor.c"
+#line 1690 "LibraryMonitor.c"
 }
 
 
@@ -1686,18 +1705,18 @@ GType library_monitor_pool_get_type (void) {
 
 
 gpointer library_monitor_pool_ref (gpointer instance) {
-	LibraryMonitorPool* self;
+	LibraryMonitorPool * self;
 	self = instance;
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return instance;
-#line 1696 "LibraryMonitor.c"
+#line 1715 "LibraryMonitor.c"
 }
 
 
 void library_monitor_pool_unref (gpointer instance) {
-	LibraryMonitorPool* self;
+	LibraryMonitorPool * self;
 	self = instance;
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1705,7 +1724,7 @@ void library_monitor_pool_unref (gpointer instance) {
 		LIBRARY_MONITOR_POOL_GET_CLASS (self)->finalize (self);
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1709 "LibraryMonitor.c"
+#line 1728 "LibraryMonitor.c"
 	}
 }
 
@@ -1713,7 +1732,7 @@ void library_monitor_pool_unref (gpointer instance) {
 static void _library_monitor_on_config_changed_configuration_facade_auto_import_from_library_changed (ConfigurationFacade* _sender, gpointer self) {
 #line 247 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_on_config_changed ((LibraryMonitor*) self);
-#line 1717 "LibraryMonitor.c"
+#line 1736 "LibraryMonitor.c"
 }
 
 
@@ -1722,7 +1741,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
 	result = file_hash ((GFile*) v);
 #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 1726 "LibraryMonitor.c"
+#line 1745 "LibraryMonitor.c"
 }
 
 
@@ -1731,14 +1750,14 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer
 	result = file_equal ((GFile*) a, (GFile*) b);
 #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 1735 "LibraryMonitor.c"
+#line 1754 "LibraryMonitor.c"
 }
 
 
 static void _library_monitor_on_unblacklist_file_dequeued_callback (gconstpointer item, gpointer self) {
 #line 207 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_on_unblacklist_file ((GFile*) item);
-#line 1742 "LibraryMonitor.c"
+#line 1761 "LibraryMonitor.c"
 }
 
 
@@ -1747,21 +1766,21 @@ static gboolean _library_monitor_on_flush_import_queue_gsource_func (gpointer se
 	result = library_monitor_on_flush_import_queue ((LibraryMonitor*) self);
 #line 243 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 1751 "LibraryMonitor.c"
+#line 1770 "LibraryMonitor.c"
 }
 
 
 LibraryMonitor* library_monitor_construct (GType object_type, GFile* root, gboolean recurse, gboolean monitoring) {
 	LibraryMonitor * self = NULL;
-	GFile* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	ConfigFacade* _tmp3_ = NULL;
-	ConfigFacade* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	ConfigFacade* _tmp6_ = NULL;
-	ConfigFacade* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
+	GFile* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+	ConfigFacade* _tmp3_;
+	ConfigFacade* _tmp4_;
+	gboolean _tmp5_;
+	ConfigFacade* _tmp6_;
+	ConfigFacade* _tmp7_;
+	guint _tmp8_;
 #line 236 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_val_if_fail (G_IS_FILE (root), NULL);
 #line 237 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -1796,36 +1815,36 @@ LibraryMonitor* library_monitor_construct (GType object_type, GFile* root, gbool
 	self->priv->import_queue_timer_id = _tmp8_;
 #line 236 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self;
-#line 1800 "LibraryMonitor.c"
+#line 1819 "LibraryMonitor.c"
 }
 
 
 LibraryMonitor* library_monitor_new (GFile* root, gboolean recurse, gboolean monitoring) {
 #line 236 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return library_monitor_construct (TYPE_LIBRARY_MONITOR, root, recurse, monitoring);
-#line 1807 "LibraryMonitor.c"
+#line 1826 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_real_close (DirectoryMonitor* base) {
 	LibraryMonitor * self;
-	GCancellable* _tmp0_ = NULL;
-	guint _tmp13_ = 0U;
+	GCancellable* _tmp0_;
+	guint _tmp13_;
 #line 250 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor);
 #line 251 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp0_ = self->priv->cancellable;
 #line 251 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_cancellable_cancel (_tmp0_);
-#line 1821 "LibraryMonitor.c"
+#line 1840 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
-		GeeList* _tmp1_ = NULL;
-		GeeList* _tmp2_ = NULL;
+		GeeList* _tmp1_;
+		GeeList* _tmp2_;
 		gint _monitor_size = 0;
-		GeeList* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+		GeeList* _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
 		gint _monitor_index = 0;
 #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = self->priv->monitors;
@@ -1845,15 +1864,15 @@ static void library_monitor_real_close (DirectoryMonitor* base) {
 		_monitor_index = -1;
 #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 1849 "LibraryMonitor.c"
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
+#line 1868 "LibraryMonitor.c"
+			gint _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 			MediaMonitor* monitor = NULL;
-			GeeList* _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			gpointer _tmp11_ = NULL;
-			MediaMonitor* _tmp12_ = NULL;
+			GeeList* _tmp9_;
+			gint _tmp10_;
+			gpointer _tmp11_;
+			MediaMonitor* _tmp12_;
 #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp6_ = _monitor_index;
 #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -1866,7 +1885,7 @@ static void library_monitor_real_close (DirectoryMonitor* base) {
 			if (!(_tmp7_ < _tmp8_)) {
 #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 1870 "LibraryMonitor.c"
+#line 1889 "LibraryMonitor.c"
 			}
 #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp9_ = _monitor_list;
@@ -1882,41 +1901,41 @@ static void library_monitor_real_close (DirectoryMonitor* base) {
 			media_monitor_close (_tmp12_);
 #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 1886 "LibraryMonitor.c"
+#line 1905 "LibraryMonitor.c"
 		}
 #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 1890 "LibraryMonitor.c"
+#line 1909 "LibraryMonitor.c"
 	}
 #line 256 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp13_ = self->priv->import_queue_timer_id;
 #line 256 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp13_ != ((guint) 0)) {
-#line 1896 "LibraryMonitor.c"
-		guint _tmp14_ = 0U;
+#line 1915 "LibraryMonitor.c"
+		guint _tmp14_;
 #line 257 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp14_ = self->priv->import_queue_timer_id;
 #line 257 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_source_remove (_tmp14_);
 #line 258 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		self->priv->import_queue_timer_id = (guint) 0;
-#line 1904 "LibraryMonitor.c"
+#line 1923 "LibraryMonitor.c"
 	}
 #line 261 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->close (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 1908 "LibraryMonitor.c"
+#line 1927 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaMonitor* monitor, Monitorable* monitorable) {
-	GeeHashMap* _tmp0_ = NULL;
-	MediaMonitor* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GeeHashMap* _tmp7_ = NULL;
-	MediaMonitor* _tmp8_ = NULL;
-	gpointer _tmp9_ = NULL;
-	GeeSet* _tmp10_ = NULL;
-	Monitorable* _tmp11_ = NULL;
+	GeeHashMap* _tmp0_;
+	MediaMonitor* _tmp1_;
+	gboolean _tmp2_;
+	GeeHashMap* _tmp7_;
+	MediaMonitor* _tmp8_;
+	gpointer _tmp9_;
+	GeeSet* _tmp10_;
+	Monitorable* _tmp11_;
 #line 264 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 264 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -1931,11 +1950,11 @@ static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaM
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
 #line 265 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp2_) {
-#line 1935 "LibraryMonitor.c"
-		GeeHashMap* _tmp3_ = NULL;
-		MediaMonitor* _tmp4_ = NULL;
-		GeeHashSet* _tmp5_ = NULL;
-		GeeHashSet* _tmp6_ = NULL;
+#line 1954 "LibraryMonitor.c"
+		GeeHashMap* _tmp3_;
+		MediaMonitor* _tmp4_;
+		GeeHashSet* _tmp5_;
+		GeeHashSet* _tmp6_;
 #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp3_ = self->priv->discovered;
 #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -1948,7 +1967,7 @@ static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaM
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_SET, GeeSet));
 #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1952 "LibraryMonitor.c"
+#line 1971 "LibraryMonitor.c"
 	}
 #line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp7_ = self->priv->discovered;
@@ -1964,28 +1983,28 @@ static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaM
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_);
 #line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (_tmp10_);
-#line 1968 "LibraryMonitor.c"
+#line 1987 "LibraryMonitor.c"
 }
 
 
 static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor* self, Monitorable* monitorable) {
 	MediaMonitor* result = NULL;
-	Monitorable* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
+	Monitorable* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
 #line 271 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_val_if_fail (IS_LIBRARY_MONITOR (self), NULL);
 #line 271 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL);
-#line 1981 "LibraryMonitor.c"
+#line 2000 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
-		GeeList* _tmp0_ = NULL;
-		GeeList* _tmp1_ = NULL;
+		GeeList* _tmp0_;
+		GeeList* _tmp1_;
 		gint _monitor_size = 0;
-		GeeList* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		GeeList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 		gint _monitor_index = 0;
 #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = self->priv->monitors;
@@ -2005,20 +2024,20 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor
 		_monitor_index = -1;
 #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 2009 "LibraryMonitor.c"
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
+#line 2028 "LibraryMonitor.c"
+			gint _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
 			MediaMonitor* monitor = NULL;
-			GeeList* _tmp8_ = NULL;
-			gint _tmp9_ = 0;
-			gpointer _tmp10_ = NULL;
-			MediaMonitor* _tmp11_ = NULL;
-			MediaSourceCollection* _tmp12_ = NULL;
-			MediaSourceCollection* _tmp13_ = NULL;
-			Monitorable* _tmp14_ = NULL;
-			gboolean _tmp15_ = FALSE;
-			gboolean _tmp16_ = FALSE;
+			GeeList* _tmp8_;
+			gint _tmp9_;
+			gpointer _tmp10_;
+			MediaMonitor* _tmp11_;
+			MediaSourceCollection* _tmp12_;
+			MediaSourceCollection* _tmp13_;
+			Monitorable* _tmp14_;
+			gboolean _tmp15_;
+			gboolean _tmp16_;
 #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp5_ = _monitor_index;
 #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2031,7 +2050,7 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor
 			if (!(_tmp6_ < _tmp7_)) {
 #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 2035 "LibraryMonitor.c"
+#line 2054 "LibraryMonitor.c"
 			}
 #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp8_ = _monitor_list;
@@ -2063,15 +2082,15 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor
 				_g_object_unref0 (_monitor_list);
 #line 274 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				return result;
-#line 2067 "LibraryMonitor.c"
+#line 2086 "LibraryMonitor.c"
 			}
 #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 2071 "LibraryMonitor.c"
+#line 2090 "LibraryMonitor.c"
 		}
 #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 2075 "LibraryMonitor.c"
+#line 2094 "LibraryMonitor.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp17_ = monitorable;
@@ -2083,25 +2102,25 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor
 	g_error ("LibraryMonitor.vala:277: Unable to locate MediaMonitor for %s", _tmp19_);
 #line 277 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_free0 (_tmp19_);
-#line 2087 "LibraryMonitor.c"
+#line 2106 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 	LibraryMonitor * self;
-	GeeHashMap* _tmp28_ = NULL;
-	GeeHashSet* _tmp29_ = NULL;
+	GeeHashMap* _tmp28_;
+	GeeHashSet* _tmp29_;
 #line 280 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor);
-#line 2097 "LibraryMonitor.c"
+#line 2116 "LibraryMonitor.c"
 	{
 		GeeIterator* _collection_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2122,18 +2141,18 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 		_collection_it = _tmp5_;
 #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 2126 "LibraryMonitor.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 2145 "LibraryMonitor.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* collection = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			GeeList* _tmp10_ = NULL;
-			MediaSourceCollection* _tmp11_ = NULL;
-			Workers* _tmp12_ = NULL;
-			GCancellable* _tmp13_ = NULL;
-			MediaMonitor* _tmp14_ = NULL;
-			MediaMonitor* _tmp15_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			GeeList* _tmp10_;
+			MediaSourceCollection* _tmp11_;
+			Workers* _tmp12_;
+			GCancellable* _tmp13_;
+			MediaMonitor* _tmp14_;
+			MediaMonitor* _tmp15_;
 #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp6_ = _collection_it;
 #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2142,7 +2161,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 			if (!_tmp7_) {
 #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 2146 "LibraryMonitor.c"
+#line 2165 "LibraryMonitor.c"
 			}
 #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp8_ = _collection_it;
@@ -2168,20 +2187,20 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 			_g_object_unref0 (_tmp15_);
 #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_collection_unref0 (collection);
-#line 2172 "LibraryMonitor.c"
+#line 2191 "LibraryMonitor.c"
 		}
 #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_collection_it);
-#line 2176 "LibraryMonitor.c"
+#line 2195 "LibraryMonitor.c"
 	}
 	{
 		GeeList* _monitor_list = NULL;
-		GeeList* _tmp16_ = NULL;
-		GeeList* _tmp17_ = NULL;
+		GeeList* _tmp16_;
+		GeeList* _tmp17_;
 		gint _monitor_size = 0;
-		GeeList* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
-		gint _tmp20_ = 0;
+		GeeList* _tmp18_;
+		gint _tmp19_;
+		gint _tmp20_;
 		gint _monitor_index = 0;
 #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp16_ = self->priv->monitors;
@@ -2201,15 +2220,15 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 		_monitor_index = -1;
 #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 2205 "LibraryMonitor.c"
-			gint _tmp21_ = 0;
-			gint _tmp22_ = 0;
-			gint _tmp23_ = 0;
+#line 2224 "LibraryMonitor.c"
+			gint _tmp21_;
+			gint _tmp22_;
+			gint _tmp23_;
 			MediaMonitor* monitor = NULL;
-			GeeList* _tmp24_ = NULL;
-			gint _tmp25_ = 0;
-			gpointer _tmp26_ = NULL;
-			MediaMonitor* _tmp27_ = NULL;
+			GeeList* _tmp24_;
+			gint _tmp25_;
+			gpointer _tmp26_;
+			MediaMonitor* _tmp27_;
 #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp21_ = _monitor_index;
 #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2222,7 +2241,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 			if (!(_tmp22_ < _tmp23_)) {
 #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 2226 "LibraryMonitor.c"
+#line 2245 "LibraryMonitor.c"
 			}
 #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp24_ = _monitor_list;
@@ -2238,11 +2257,11 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 			media_monitor_notify_discovery_started (_tmp27_);
 #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 2242 "LibraryMonitor.c"
+#line 2261 "LibraryMonitor.c"
 		}
 #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 2246 "LibraryMonitor.c"
+#line 2265 "LibraryMonitor.c"
 	}
 #line 287 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp28_ = gee_hash_map_new (TYPE_MEDIA_MONITOR, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -2258,7 +2277,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 	self->priv->unknown_files = _tmp29_;
 #line 290 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->discovery_started (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 2262 "LibraryMonitor.c"
+#line 2281 "LibraryMonitor.c"
 }
 
 
@@ -2267,9 +2286,9 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 	Monitorable* representation = NULL;
 	MediaMonitor* representing = NULL;
 	gboolean ignore = FALSE;
-	MediaMonitor* _tmp20_ = NULL;
-	GFile* _tmp36_ = NULL;
-	GFileInfo* _tmp37_ = NULL;
+	MediaMonitor* _tmp20_;
+	GFile* _tmp36_;
+	GFileInfo* _tmp37_;
 #line 293 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor);
 #line 293 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2282,15 +2301,15 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 	representing = NULL;
 #line 296 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	ignore = FALSE;
-#line 2286 "LibraryMonitor.c"
+#line 2305 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
-		GeeList* _tmp0_ = NULL;
-		GeeList* _tmp1_ = NULL;
+		GeeList* _tmp0_;
+		GeeList* _tmp1_;
 		gint _monitor_size = 0;
-		GeeList* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		GeeList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 		gint _monitor_index = 0;
 #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = self->priv->monitors;
@@ -2310,21 +2329,21 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 		_monitor_index = -1;
 #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 2314 "LibraryMonitor.c"
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
+#line 2333 "LibraryMonitor.c"
+			gint _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
 			MediaMonitor* monitor = NULL;
-			GeeList* _tmp8_ = NULL;
-			gint _tmp9_ = 0;
-			gpointer _tmp10_ = NULL;
+			GeeList* _tmp8_;
+			gint _tmp9_;
+			gpointer _tmp10_;
 			MediaMonitorDiscoveredFile _result_ = 0;
-			MediaMonitor* _tmp11_ = NULL;
-			GFile* _tmp12_ = NULL;
-			GFileInfo* _tmp13_ = NULL;
+			MediaMonitor* _tmp11_;
+			GFile* _tmp12_;
+			GFileInfo* _tmp13_;
 			Monitorable* _tmp14_ = NULL;
-			MediaMonitorDiscoveredFile _tmp15_ = 0;
-			MediaMonitorDiscoveredFile _tmp16_ = 0;
+			MediaMonitorDiscoveredFile _tmp15_;
+			MediaMonitorDiscoveredFile _tmp16_;
 #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp5_ = _monitor_index;
 #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2337,7 +2356,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 			if (!(_tmp6_ < _tmp7_)) {
 #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 2341 "LibraryMonitor.c"
+#line 2360 "LibraryMonitor.c"
 			}
 #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp8_ = _monitor_list;
@@ -2365,9 +2384,9 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 			_tmp16_ = _result_;
 #line 300 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp16_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) {
-#line 2369 "LibraryMonitor.c"
-				MediaMonitor* _tmp17_ = NULL;
-				MediaMonitor* _tmp18_ = NULL;
+#line 2388 "LibraryMonitor.c"
+				MediaMonitor* _tmp17_;
+				MediaMonitor* _tmp18_;
 #line 301 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp17_ = monitor;
 #line 301 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2380,9 +2399,9 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 				_g_object_unref0 (monitor);
 #line 303 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 2384 "LibraryMonitor.c"
+#line 2403 "LibraryMonitor.c"
 			} else {
-				MediaMonitorDiscoveredFile _tmp19_ = 0;
+				MediaMonitorDiscoveredFile _tmp19_;
 #line 304 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp19_ = _result_;
 #line 304 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2393,41 +2412,41 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 					_g_object_unref0 (monitor);
 #line 308 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					break;
-#line 2397 "LibraryMonitor.c"
+#line 2416 "LibraryMonitor.c"
 				}
 			}
 #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 2402 "LibraryMonitor.c"
+#line 2421 "LibraryMonitor.c"
 		}
 #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 2406 "LibraryMonitor.c"
+#line 2425 "LibraryMonitor.c"
 	}
 #line 312 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp20_ = representing;
 #line 312 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp20_ != NULL) {
-#line 2412 "LibraryMonitor.c"
+#line 2431 "LibraryMonitor.c"
 		gboolean _tmp21_ = FALSE;
-		Monitorable* _tmp22_ = NULL;
-		MediaMonitor* _tmp24_ = NULL;
-		Monitorable* _tmp25_ = NULL;
+		Monitorable* _tmp22_;
+		MediaMonitor* _tmp24_;
+		Monitorable* _tmp25_;
 #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp22_ = representation;
 #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp22_ != NULL) {
-#line 2421 "LibraryMonitor.c"
-			gboolean _tmp23_ = FALSE;
+#line 2440 "LibraryMonitor.c"
+			gboolean _tmp23_;
 #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp23_ = ignore;
 #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp21_ = !_tmp23_;
-#line 2427 "LibraryMonitor.c"
+#line 2446 "LibraryMonitor.c"
 		} else {
 #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp21_ = FALSE;
-#line 2431 "LibraryMonitor.c"
+#line 2450 "LibraryMonitor.c"
 		}
 #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_vala_assert (_tmp21_, "representation != null && !ignore");
@@ -2437,19 +2456,19 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 		_tmp25_ = representation;
 #line 314 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_add_to_discovered_list (self, _tmp24_, _tmp25_);
-#line 2441 "LibraryMonitor.c"
+#line 2460 "LibraryMonitor.c"
 	} else {
 		gboolean _tmp26_ = FALSE;
 		gboolean _tmp27_ = FALSE;
-		gboolean _tmp28_ = FALSE;
+		gboolean _tmp28_;
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp28_ = ignore;
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (!_tmp28_) {
-#line 2450 "LibraryMonitor.c"
-			TombstoneSourceCollection* _tmp29_ = NULL;
-			GFile* _tmp30_ = NULL;
-			gboolean _tmp31_ = FALSE;
+#line 2469 "LibraryMonitor.c"
+			TombstoneSourceCollection* _tmp29_;
+			GFile* _tmp30_;
+			gboolean _tmp31_;
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp29_ = tombstone_global;
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2458,41 +2477,41 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 			_tmp31_ = tombstone_source_collection_matches (_tmp29_, _tmp30_);
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp27_ = !_tmp31_;
-#line 2462 "LibraryMonitor.c"
+#line 2481 "LibraryMonitor.c"
 		} else {
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp27_ = FALSE;
-#line 2466 "LibraryMonitor.c"
+#line 2485 "LibraryMonitor.c"
 		}
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp27_) {
-#line 2470 "LibraryMonitor.c"
-			GFile* _tmp32_ = NULL;
-			gboolean _tmp33_ = FALSE;
+#line 2489 "LibraryMonitor.c"
+			GFile* _tmp32_;
+			gboolean _tmp33_;
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp32_ = file;
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp33_ = library_monitor_is_supported_filetype (self, _tmp32_);
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp26_ = _tmp33_;
-#line 2479 "LibraryMonitor.c"
+#line 2498 "LibraryMonitor.c"
 		} else {
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp26_ = FALSE;
-#line 2483 "LibraryMonitor.c"
+#line 2502 "LibraryMonitor.c"
 		}
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp26_) {
-#line 2487 "LibraryMonitor.c"
-			GeeHashSet* _tmp34_ = NULL;
-			GFile* _tmp35_ = NULL;
+#line 2506 "LibraryMonitor.c"
+			GeeHashSet* _tmp34_;
+			GFile* _tmp35_;
 #line 316 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp34_ = self->priv->unknown_files;
 #line 316 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp35_ = file;
 #line 316 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp35_);
-#line 2496 "LibraryMonitor.c"
+#line 2515 "LibraryMonitor.c"
 		}
 	}
 #line 319 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2505,7 +2524,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 	_g_object_unref0 (representing);
 #line 293 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (representation);
-#line 2509 "LibraryMonitor.c"
+#line 2528 "LibraryMonitor.c"
 }
 
 
@@ -2515,7 +2534,7 @@ static void library_monitor_real_discovery_completed (DirectoryMonitor* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor);
 #line 323 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_async_discovery_completed (self, NULL, NULL);
-#line 2519 "LibraryMonitor.c"
+#line 2538 "LibraryMonitor.c"
 }
 
 
@@ -2526,34 +2545,58 @@ static void library_monitor_async_discovery_completed_data_free (gpointer _data)
 	_g_object_unref0 (_data_->self);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_slice_free (LibraryMonitorAsyncDiscoveryCompletedData, _data_);
-#line 2530 "LibraryMonitor.c"
+#line 2549 "LibraryMonitor.c"
+}
+
+
+static void library_monitor_async_discovery_completed_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) {
+	LibraryMonitorAsyncDiscoveryCompletedData* _task_data_;
+#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+	_task_data_ = g_task_get_task_data (G_TASK (res));
+#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+	if (_task_data_->_callback_ != NULL) {
+#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+		_task_data_->_callback_ (source_object, res, user_data);
+#line 2561 "LibraryMonitor.c"
+	}
+#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+	_task_data_->_task_complete_ = TRUE;
+#line 2565 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_async_discovery_completed (LibraryMonitor* self, GAsyncReadyCallback _callback_, gpointer _user_data_) {
 	LibraryMonitorAsyncDiscoveryCompletedData* _data_;
-	LibraryMonitor* _tmp0_ = NULL;
+	LibraryMonitor* _tmp0_;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_ = g_slice_new0 (LibraryMonitorAsyncDiscoveryCompletedData);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, library_monitor_async_discovery_completed);
+	_data_->_callback_ = _callback_;
+#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+	_data_->_async_result = g_task_new (G_OBJECT (self), NULL, library_monitor_async_discovery_completed_async_ready_wrapper, _user_data_);
+#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+	if (_callback_ == NULL) {
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, library_monitor_async_discovery_completed_data_free);
+		_data_->_task_complete_ = TRUE;
+#line 2582 "LibraryMonitor.c"
+	}
+#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+	g_task_set_task_data (_data_->_async_result, _data_, library_monitor_async_discovery_completed_data_free);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp0_ = _g_object_ref0 (self);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->self = _tmp0_;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_async_discovery_completed_co (_data_);
-#line 2549 "LibraryMonitor.c"
+#line 2592 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_async_discovery_completed_finish (LibraryMonitor* self, GAsyncResult* _res_) {
 	LibraryMonitorAsyncDiscoveryCompletedData* _data_;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
-#line 2557 "LibraryMonitor.c"
+	_data_ = g_task_propagate_pointer (G_TASK (_res_), NULL);
+#line 2600 "LibraryMonitor.c"
 }
 
 
@@ -2562,7 +2605,7 @@ static gboolean _library_monitor_async_discovery_completed_co_gsource_func (gpoi
 	result = library_monitor_async_discovery_completed_co (self);
 #line 378 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 2566 "LibraryMonitor.c"
+#line 2609 "LibraryMonitor.c"
 }
 
 
@@ -2571,113 +2614,86 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 	switch (_data_->_state_) {
 #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		case 0:
-#line 2575 "LibraryMonitor.c"
+#line 2618 "LibraryMonitor.c"
 		goto _state_0;
 #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		case 1:
-#line 2579 "LibraryMonitor.c"
+#line 2622 "LibraryMonitor.c"
 		goto _state_1;
 		default:
 #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_assert_not_reached ();
-#line 2584 "LibraryMonitor.c"
+#line 2627 "LibraryMonitor.c"
 	}
 	_state_0:
 #line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp0_ = NULL;
-#line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp0_ = _data_->self->priv->unknown_files;
 #line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp1_ = 0;
-#line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp2_ = 0;
-#line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp2_ = _data_->_tmp1_;
 #line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_data_->_tmp2_ == 0) {
 #line 332 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_discovery_stage_completed (_data_->self);
 #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		if (_data_->_state_ == 0) {
+		g_task_return_pointer (_data_->_async_result, _data_, NULL);
 #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 2607 "LibraryMonitor.c"
-		} else {
+		if (_data_->_state_ != 0) {
+#line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+			while (_data_->_task_complete_ != TRUE) {
 #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-			g_simple_async_result_complete (_data_->_async_result);
-#line 2611 "LibraryMonitor.c"
+				g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
+#line 2648 "LibraryMonitor.c"
+			}
 		}
 #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_object_unref (_data_->_async_result);
 #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return FALSE;
-#line 2617 "LibraryMonitor.c"
+#line 2655 "LibraryMonitor.c"
 	}
 #line 337 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp3_ = NULL;
-#line 337 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp3_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 337 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->all_candidates = _data_->_tmp3_;
 #line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp4_ = NULL;
-#line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp4_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->adopted = _data_->_tmp4_;
-#line 2631 "LibraryMonitor.c"
+#line 2665 "LibraryMonitor.c"
 	{
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		_data_->_tmp5_ = NULL;
-#line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_data_->_tmp5_ = _data_->self->priv->unknown_files;
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		_data_->_tmp6_ = NULL;
-#line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_data_->_tmp6_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_data_->_file_it = _data_->_tmp6_;
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-			_data_->_tmp7_ = NULL;
-#line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp7_ = _data_->_file_it;
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-			_data_->_tmp8_ = FALSE;
-#line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp8_ = gee_iterator_next (_data_->_tmp7_);
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (!_data_->_tmp8_) {
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 2657 "LibraryMonitor.c"
+#line 2683 "LibraryMonitor.c"
 			}
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-			_data_->_tmp9_ = NULL;
-#line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp9_ = _data_->_file_it;
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-			_data_->_tmp10_ = NULL;
-#line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp10_ = gee_iterator_get (_data_->_tmp9_);
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->file = (GFile*) _data_->_tmp10_;
 #line 340 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-			_data_->_tmp11_ = NULL;
-#line 340 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp11_ = _data_->file;
 #line 340 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-			_data_->_tmp12_ = NULL;
-#line 340 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp12_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _data_->_tmp11_);
 #line 340 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->info = _data_->_tmp12_;
 #line 341 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-			_data_->_tmp13_ = NULL;
-#line 341 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp13_ = _data_->info;
 #line 341 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_data_->_tmp13_ == NULL) {
@@ -2687,11 +2703,9 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 				_g_object_unref0 (_data_->file);
 #line 342 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 2691 "LibraryMonitor.c"
+#line 2707 "LibraryMonitor.c"
 			}
 #line 345 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-			_data_->_tmp14_ = NULL;
-#line 345 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp14_ = _data_->all_candidates;
 #line 345 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
@@ -2699,29 +2713,19 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 			_data_->candidates = NULL;
 #line 348 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->associated = FALSE;
-#line 2703 "LibraryMonitor.c"
+#line 2717 "LibraryMonitor.c"
 			{
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp15_ = NULL;
-#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp15_ = _data_->self->priv->monitors;
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp16_ = NULL;
-#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp16_ = _g_object_ref0 (_data_->_tmp15_);
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_monitor_list = _data_->_tmp16_;
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp17_ = NULL;
-#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp17_ = _data_->_monitor_list;
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp18_ = 0;
-#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp19_ = 0;
-#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp19_ = _data_->_tmp18_;
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_monitor_size = _data_->_tmp19_;
@@ -2730,56 +2734,36 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				while (TRUE) {
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_data_->_tmp20_ = 0;
-#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp20_ = _data_->_monitor_index;
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_monitor_index = _data_->_tmp20_ + 1;
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_data_->_tmp21_ = 0;
-#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp21_ = _data_->_monitor_index;
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_data_->_tmp22_ = 0;
-#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp22_ = _data_->_monitor_size;
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (!(_data_->_tmp21_ < _data_->_tmp22_)) {
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						break;
-#line 2751 "LibraryMonitor.c"
+#line 2749 "LibraryMonitor.c"
 					}
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_data_->_tmp23_ = NULL;
-#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp23_ = _data_->_monitor_list;
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_data_->_tmp24_ = 0;
-#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp24_ = _data_->_monitor_index;
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_data_->_tmp25_ = NULL;
-#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp25_ = gee_list_get (_data_->_tmp23_, _data_->_tmp24_);
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->monitor = (MediaMonitor*) _data_->_tmp25_;
 #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_data_->_tmp26_ = NULL;
-#line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp26_ = _data_->monitor;
 #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_data_->_tmp27_ = NULL;
-#line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp27_ = _data_->file;
 #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_data_->_tmp28_ = NULL;
-#line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp28_ = _data_->info;
 #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp29_ = 0;
 #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_data_->_tmp30_ = NULL;
-#line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp30_ = media_monitor_candidates_for_unknown_file (_data_->_tmp26_, _data_->_tmp27_, _data_->_tmp28_, &_data_->_tmp29_);
 #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_result_ = _data_->_tmp29_;
@@ -2788,22 +2772,18 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->candidates = _data_->_tmp30_;
 #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_data_->_tmp32_ = 0;
-#line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp32_ = _data_->_result_;
 #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_data_->_tmp32_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) {
 #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp31_ = TRUE;
-#line 2799 "LibraryMonitor.c"
+#line 2781 "LibraryMonitor.c"
 					} else {
 #line 353 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-						_data_->_tmp33_ = 0;
-#line 353 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp33_ = _data_->_result_;
 #line 353 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp31_ = _data_->_tmp33_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE;
-#line 2807 "LibraryMonitor.c"
+#line 2787 "LibraryMonitor.c"
 					}
 #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_data_->_tmp31_) {
@@ -2813,48 +2793,36 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 						_g_object_unref0 (_data_->monitor);
 #line 356 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						break;
-#line 2817 "LibraryMonitor.c"
+#line 2797 "LibraryMonitor.c"
 					} else {
 #line 357 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-						_data_->_tmp34_ = NULL;
-#line 357 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp34_ = _data_->candidates;
 #line 357 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						if (_data_->_tmp34_ != NULL) {
 #line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-							_data_->_tmp35_ = NULL;
-#line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_data_->_tmp35_ = _data_->all_candidates;
 #line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-							_data_->_tmp36_ = NULL;
-#line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_data_->_tmp36_ = _data_->candidates;
 #line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							gee_array_list_add_all (_data_->_tmp35_, _data_->_tmp36_);
-#line 2835 "LibraryMonitor.c"
+#line 2809 "LibraryMonitor.c"
 						}
 					}
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_g_object_unref0 (_data_->monitor);
-#line 2840 "LibraryMonitor.c"
+#line 2814 "LibraryMonitor.c"
 				}
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (_data_->_monitor_list);
-#line 2844 "LibraryMonitor.c"
+#line 2818 "LibraryMonitor.c"
 			}
 #line 362 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-			_data_->_tmp37_ = FALSE;
-#line 362 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp37_ = _data_->associated;
 #line 362 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_data_->_tmp37_) {
 #line 363 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp38_ = NULL;
-#line 363 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp38_ = _data_->adopted;
 #line 363 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp39_ = NULL;
-#line 363 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp39_ = _data_->file;
 #line 363 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _data_->_tmp39_);
@@ -2866,65 +2834,41 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 				_g_object_unref0 (_data_->file);
 #line 365 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 2870 "LibraryMonitor.c"
+#line 2838 "LibraryMonitor.c"
 			}
 #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-			_data_->_tmp40_ = NULL;
-#line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp40_ = _data_->all_candidates;
 #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-			_data_->_tmp41_ = 0;
-#line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp41_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp40_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-			_data_->_tmp42_ = 0;
-#line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp42_ = _data_->_tmp41_;
 #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_data_->_tmp42_ > 0) {
 #line 371 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp43_ = NULL;
-#line 371 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp43_ = _data_->all_candidates;
 #line 371 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp44_ = NULL;
-#line 371 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp44_ = _g_object_ref0 (_data_->_tmp43_);
 #line 371 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->job_candidates = _data_->_tmp44_;
 #line 372 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp45_ = NULL;
-#line 372 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp45_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 372 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (_data_->all_candidates);
 #line 372 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->all_candidates = _data_->_tmp45_;
 #line 374 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp46_ = 0;
-#line 374 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp46_ = _data_->self->priv->checksums_total;
 #line 374 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->self->priv->checksums_total = _data_->_tmp46_ + 1;
 #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp47_ = NULL;
-#line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp47_ = _data_->self->priv->workers;
 #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp48_ = NULL;
-#line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp48_ = _data_->file;
 #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp49_ = NULL;
-#line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp49_ = _data_->job_candidates;
 #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp50_ = NULL;
-#line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp50_ = library_monitor_find_move_job_new (_data_->self, _data_->_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp49_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp51_ = NULL;
-#line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp51_ = _data_->_tmp50_;
 #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				workers_enqueue (_data_->_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp51_, TYPE_BACKGROUND_JOB, BackgroundJob));
@@ -2932,7 +2876,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 				_background_job_unref0 (_data_->_tmp51_);
 #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (_data_->job_candidates);
-#line 2936 "LibraryMonitor.c"
+#line 2880 "LibraryMonitor.c"
 			}
 #line 378 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _library_monitor_async_discovery_completed_co_gsource_func, _data_, NULL);
@@ -2940,7 +2884,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 			_data_->_state_ = 1;
 #line 379 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return FALSE;
-#line 2944 "LibraryMonitor.c"
+#line 2888 "LibraryMonitor.c"
 			_state_1:
 			;
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2949,92 +2893,77 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 			_g_object_unref0 (_data_->info);
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (_data_->file);
-#line 2953 "LibraryMonitor.c"
+#line 2897 "LibraryMonitor.c"
 		}
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_data_->_file_it);
-#line 2957 "LibraryMonitor.c"
+#line 2901 "LibraryMonitor.c"
 	}
 #line 383 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp52_ = NULL;
-#line 383 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp52_ = _data_->self->priv->unknown_files;
 #line 383 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp53_ = NULL;
-#line 383 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp53_ = _data_->adopted;
 #line 383 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp53_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 385 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->self->priv->checksums_completed = 0;
 #line 387 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp54_ = 0;
-#line 387 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp54_ = _data_->self->priv->checksums_total;
 #line 387 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_data_->_tmp54_ == 0) {
 #line 388 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_discovery_stage_completed (_data_->self);
-#line 2979 "LibraryMonitor.c"
+#line 2917 "LibraryMonitor.c"
 	} else {
 #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		_data_->_tmp55_ = 0;
-#line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_data_->_tmp55_ = _data_->self->priv->checksums_total;
 #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		_data_->_tmp56_ = NULL;
-#line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_data_->_tmp56_ = g_strdup_printf ("%d checksum jobs initiated to verify unknown photo files", _data_->_tmp55_);
 #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		_data_->_tmp57_ = NULL;
-#line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_data_->_tmp57_ = _data_->_tmp56_;
 #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		directory_monitor_mdbg (_data_->_tmp57_);
 #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_free0 (_data_->_tmp57_);
 #line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		_data_->_tmp58_ = 0;
-#line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_data_->_tmp58_ = _data_->self->priv->checksums_completed;
 #line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		_data_->_tmp59_ = 0;
-#line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_data_->_tmp59_ = _data_->self->priv->checksums_total;
 #line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		g_signal_emit_by_name (_data_->self, "auto-update-progress", _data_->_tmp58_, _data_->_tmp59_);
-#line 3007 "LibraryMonitor.c"
+		g_signal_emit (_data_->self, library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL], 0, _data_->_tmp58_, _data_->_tmp59_);
+#line 2935 "LibraryMonitor.c"
 	}
 #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (_data_->adopted);
 #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (_data_->all_candidates);
 #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	if (_data_->_state_ == 0) {
+	g_task_return_pointer (_data_->_async_result, _data_, NULL);
 #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 3017 "LibraryMonitor.c"
-	} else {
+	if (_data_->_state_ != 0) {
+#line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+		while (_data_->_task_complete_ != TRUE) {
 #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		g_simple_async_result_complete (_data_->_async_result);
-#line 3021 "LibraryMonitor.c"
+			g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
+#line 2949 "LibraryMonitor.c"
+		}
 	}
 #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_object_unref (_data_->_async_result);
 #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return FALSE;
-#line 3027 "LibraryMonitor.c"
+#line 2956 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_report_checksum_job_completed (LibraryMonitor* self) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 #line 395 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 396 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3052,7 +2981,7 @@ static void library_monitor_report_checksum_job_completed (LibraryMonitor* self)
 #line 399 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp4_ = self->priv->checksums_total;
 #line 399 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	g_signal_emit_by_name (self, "auto-update-progress", _tmp3_, _tmp4_);
+	g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL], 0, _tmp3_, _tmp4_);
 #line 401 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp5_ = self->priv->checksums_completed;
 #line 401 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3061,7 +2990,7 @@ static void library_monitor_report_checksum_job_completed (LibraryMonitor* self)
 	if (_tmp5_ == _tmp6_) {
 #line 402 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_discovery_stage_completed (self);
-#line 3065 "LibraryMonitor.c"
+#line 2994 "LibraryMonitor.c"
 	}
 }
 
@@ -3069,18 +2998,18 @@ static void library_monitor_report_checksum_job_completed (LibraryMonitor* self)
 static gpointer _background_job_ref0 (gpointer self) {
 #line 406 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self ? background_job_ref (self) : NULL;
-#line 3073 "LibraryMonitor.c"
+#line 3002 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_on_find_move_completed (LibraryMonitor* self, BackgroundJob* j) {
 	LibraryMonitorFindMoveJob* job = NULL;
-	BackgroundJob* _tmp0_ = NULL;
-	LibraryMonitorFindMoveJob* _tmp1_ = NULL;
-	LibraryMonitorFindMoveJob* _tmp2_ = NULL;
-	Monitorable* _tmp3_ = NULL;
-	LibraryMonitorFindMoveJob* _tmp28_ = NULL;
-	GError* _tmp29_ = NULL;
+	BackgroundJob* _tmp0_;
+	LibraryMonitorFindMoveJob* _tmp1_;
+	LibraryMonitorFindMoveJob* _tmp2_;
+	Monitorable* _tmp3_;
+	LibraryMonitorFindMoveJob* _tmp28_;
+	GError* _tmp29_;
 #line 405 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 405 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3097,32 +3026,32 @@ static void library_monitor_on_find_move_completed (LibraryMonitor* self, Backgr
 	_tmp3_ = _tmp2_->match;
 #line 411 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp3_ != NULL) {
-#line 3101 "LibraryMonitor.c"
-		LibraryMonitorFindMoveJob* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		LibraryMonitorFindMoveJob* _tmp8_ = NULL;
-		Monitorable* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
+#line 3030 "LibraryMonitor.c"
+		LibraryMonitorFindMoveJob* _tmp4_;
+		GFile* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		LibraryMonitorFindMoveJob* _tmp8_;
+		Monitorable* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
 		MediaMonitor* monitor = NULL;
-		LibraryMonitorFindMoveJob* _tmp14_ = NULL;
-		Monitorable* _tmp15_ = NULL;
-		MediaMonitor* _tmp16_ = NULL;
-		MediaMonitor* _tmp17_ = NULL;
-		LibraryMonitorFindMoveJob* _tmp18_ = NULL;
-		Monitorable* _tmp19_ = NULL;
-		LibraryMonitorFindMoveJob* _tmp20_ = NULL;
-		GFile* _tmp21_ = NULL;
-		GeeHashSet* _tmp22_ = NULL;
-		LibraryMonitorFindMoveJob* _tmp23_ = NULL;
-		GFile* _tmp24_ = NULL;
-		MediaMonitor* _tmp25_ = NULL;
-		LibraryMonitorFindMoveJob* _tmp26_ = NULL;
-		Monitorable* _tmp27_ = NULL;
+		LibraryMonitorFindMoveJob* _tmp14_;
+		Monitorable* _tmp15_;
+		MediaMonitor* _tmp16_;
+		MediaMonitor* _tmp17_;
+		LibraryMonitorFindMoveJob* _tmp18_;
+		Monitorable* _tmp19_;
+		LibraryMonitorFindMoveJob* _tmp20_;
+		GFile* _tmp21_;
+		GeeHashSet* _tmp22_;
+		LibraryMonitorFindMoveJob* _tmp23_;
+		GFile* _tmp24_;
+		MediaMonitor* _tmp25_;
+		LibraryMonitorFindMoveJob* _tmp26_;
+		Monitorable* _tmp27_;
 #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp4_ = job;
 #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3189,7 +3118,7 @@ static void library_monitor_on_find_move_completed (LibraryMonitor* self, Backgr
 		library_monitor_add_to_discovered_list (self, _tmp25_, _tmp27_);
 #line 411 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (monitor);
-#line 3193 "LibraryMonitor.c"
+#line 3122 "LibraryMonitor.c"
 	}
 #line 421 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp28_ = job;
@@ -3197,14 +3126,14 @@ static void library_monitor_on_find_move_completed (LibraryMonitor* self, Backgr
 	_tmp29_ = _tmp28_->err;
 #line 421 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp29_ != NULL) {
-#line 3201 "LibraryMonitor.c"
-		LibraryMonitorFindMoveJob* _tmp30_ = NULL;
-		GFile* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
-		gchar* _tmp33_ = NULL;
-		LibraryMonitorFindMoveJob* _tmp34_ = NULL;
-		GError* _tmp35_ = NULL;
-		const gchar* _tmp36_ = NULL;
+#line 3130 "LibraryMonitor.c"
+		LibraryMonitorFindMoveJob* _tmp30_;
+		GFile* _tmp31_;
+		gchar* _tmp32_;
+		gchar* _tmp33_;
+		LibraryMonitorFindMoveJob* _tmp34_;
+		GError* _tmp35_;
+		const gchar* _tmp36_;
 #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp30_ = job;
 #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3223,13 +3152,13 @@ static void library_monitor_on_find_move_completed (LibraryMonitor* self, Backgr
 		g_warning ("LibraryMonitor.vala:422: Unable to checksum unknown media file %s: %s", _tmp33_, _tmp36_);
 #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_free0 (_tmp33_);
-#line 3227 "LibraryMonitor.c"
+#line 3156 "LibraryMonitor.c"
 	}
 #line 424 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_report_checksum_job_completed (self);
 #line 405 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_background_job_unref0 (job);
-#line 3233 "LibraryMonitor.c"
+#line 3162 "LibraryMonitor.c"
 }
 
 
@@ -3240,25 +3169,25 @@ static void library_monitor_on_find_move_cancelled (LibraryMonitor* self, Backgr
 	g_return_if_fail (IS_BACKGROUND_JOB (j));
 #line 428 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_report_checksum_job_completed (self);
-#line 3244 "LibraryMonitor.c"
+#line 3173 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
-	gboolean _tmp65_ = FALSE;
-	TombstoneSourceCollection* _tmp67_ = NULL;
-	GCancellable* _tmp68_ = NULL;
+	gboolean _tmp65_;
+	TombstoneSourceCollection* _tmp67_;
+	GCancellable* _tmp68_;
 #line 431 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
-#line 3254 "LibraryMonitor.c"
+#line 3183 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
-		GeeList* _tmp0_ = NULL;
-		GeeList* _tmp1_ = NULL;
+		GeeList* _tmp0_;
+		GeeList* _tmp1_;
 		gint _monitor_size = 0;
-		GeeList* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		GeeList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 		gint _monitor_index = 0;
 #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = self->priv->monitors;
@@ -3278,19 +3207,19 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 		_monitor_index = -1;
 #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 3282 "LibraryMonitor.c"
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
+#line 3211 "LibraryMonitor.c"
+			gint _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
 			MediaMonitor* monitor = NULL;
-			GeeList* _tmp8_ = NULL;
-			gint _tmp9_ = 0;
-			gpointer _tmp10_ = NULL;
+			GeeList* _tmp8_;
+			gint _tmp9_;
+			gpointer _tmp10_;
 			GeeSet* monitorables = NULL;
-			GeeHashMap* _tmp11_ = NULL;
-			MediaMonitor* _tmp12_ = NULL;
-			gpointer _tmp13_ = NULL;
-			GeeSet* _tmp14_ = NULL;
+			GeeHashMap* _tmp11_;
+			MediaMonitor* _tmp12_;
+			gpointer _tmp13_;
+			GeeSet* _tmp14_;
 #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp5_ = _monitor_index;
 #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3303,7 +3232,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 			if (!(_tmp6_ < _tmp7_)) {
 #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 3307 "LibraryMonitor.c"
+#line 3236 "LibraryMonitor.c"
 			}
 #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp8_ = _monitor_list;
@@ -3325,11 +3254,11 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 			_tmp14_ = monitorables;
 #line 434 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp14_ != NULL) {
-#line 3329 "LibraryMonitor.c"
+#line 3258 "LibraryMonitor.c"
 				{
 					GeeIterator* _monitorable_it = NULL;
-					GeeSet* _tmp15_ = NULL;
-					GeeIterator* _tmp16_ = NULL;
+					GeeSet* _tmp15_;
+					GeeIterator* _tmp16_;
 #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp15_ = monitorables;
 #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3338,14 +3267,14 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 					_monitorable_it = _tmp16_;
 #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					while (TRUE) {
-#line 3342 "LibraryMonitor.c"
-						GeeIterator* _tmp17_ = NULL;
-						gboolean _tmp18_ = FALSE;
+#line 3271 "LibraryMonitor.c"
+						GeeIterator* _tmp17_;
+						gboolean _tmp18_;
 						Monitorable* monitorable = NULL;
-						GeeIterator* _tmp19_ = NULL;
-						gpointer _tmp20_ = NULL;
-						Monitorable* _tmp21_ = NULL;
-						MediaMonitor* _tmp22_ = NULL;
+						GeeIterator* _tmp19_;
+						gpointer _tmp20_;
+						Monitorable* _tmp21_;
+						MediaMonitor* _tmp22_;
 #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp17_ = _monitorable_it;
 #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3354,7 +3283,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 						if (!_tmp18_) {
 #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							break;
-#line 3358 "LibraryMonitor.c"
+#line 3287 "LibraryMonitor.c"
 						}
 #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp19_ = _monitorable_it;
@@ -3370,22 +3299,22 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 						library_monitor_enqueue_verify_monitorable (self, _tmp21_, _tmp22_);
 #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_g_object_unref0 (monitorable);
-#line 3374 "LibraryMonitor.c"
+#line 3303 "LibraryMonitor.c"
 					}
 #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_g_object_unref0 (_monitorable_it);
-#line 3378 "LibraryMonitor.c"
+#line 3307 "LibraryMonitor.c"
 				}
 			}
 			{
 				GeeIterator* _object_it = NULL;
-				MediaMonitor* _tmp23_ = NULL;
-				MediaSourceCollection* _tmp24_ = NULL;
-				MediaSourceCollection* _tmp25_ = NULL;
-				GeeCollection* _tmp26_ = NULL;
-				GeeCollection* _tmp27_ = NULL;
-				GeeIterator* _tmp28_ = NULL;
-				GeeIterator* _tmp29_ = NULL;
+				MediaMonitor* _tmp23_;
+				MediaSourceCollection* _tmp24_;
+				MediaSourceCollection* _tmp25_;
+				GeeCollection* _tmp26_;
+				GeeCollection* _tmp27_;
+				GeeIterator* _tmp28_;
+				GeeIterator* _tmp29_;
 #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp23_ = monitor;
 #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3408,19 +3337,19 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 				_object_it = _tmp29_;
 #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				while (TRUE) {
-#line 3412 "LibraryMonitor.c"
-					GeeIterator* _tmp30_ = NULL;
-					gboolean _tmp31_ = FALSE;
+#line 3341 "LibraryMonitor.c"
+					GeeIterator* _tmp30_;
+					gboolean _tmp31_;
 					DataObject* object = NULL;
-					GeeIterator* _tmp32_ = NULL;
-					gpointer _tmp33_ = NULL;
+					GeeIterator* _tmp32_;
+					gpointer _tmp33_;
 					Monitorable* monitorable = NULL;
-					DataObject* _tmp34_ = NULL;
-					Monitorable* _tmp35_ = NULL;
+					DataObject* _tmp34_;
+					Monitorable* _tmp35_;
 					gboolean _tmp36_ = FALSE;
-					GeeSet* _tmp37_ = NULL;
-					Monitorable* _tmp41_ = NULL;
-					MediaMonitor* _tmp42_ = NULL;
+					GeeSet* _tmp37_;
+					Monitorable* _tmp41_;
+					MediaMonitor* _tmp42_;
 #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp30_ = _object_it;
 #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3429,7 +3358,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 					if (!_tmp31_) {
 #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						break;
-#line 3433 "LibraryMonitor.c"
+#line 3362 "LibraryMonitor.c"
 					}
 #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp32_ = _object_it;
@@ -3447,10 +3376,10 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 					_tmp37_ = monitorables;
 #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_tmp37_ != NULL) {
-#line 3451 "LibraryMonitor.c"
-						GeeSet* _tmp38_ = NULL;
-						Monitorable* _tmp39_ = NULL;
-						gboolean _tmp40_ = FALSE;
+#line 3380 "LibraryMonitor.c"
+						GeeSet* _tmp38_;
+						Monitorable* _tmp39_;
+						gboolean _tmp40_;
 #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp38_ = monitorables;
 #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3459,11 +3388,11 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 						_tmp40_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection), _tmp39_);
 #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp36_ = _tmp40_;
-#line 3463 "LibraryMonitor.c"
+#line 3392 "LibraryMonitor.c"
 					} else {
 #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp36_ = FALSE;
-#line 3467 "LibraryMonitor.c"
+#line 3396 "LibraryMonitor.c"
 					}
 #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_tmp36_) {
@@ -3473,7 +3402,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 						_g_object_unref0 (object);
 #line 443 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						continue;
-#line 3477 "LibraryMonitor.c"
+#line 3406 "LibraryMonitor.c"
 					}
 #line 445 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp41_ = monitorable;
@@ -3485,23 +3414,23 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 					_g_object_unref0 (monitorable);
 #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_g_object_unref0 (object);
-#line 3489 "LibraryMonitor.c"
+#line 3418 "LibraryMonitor.c"
 				}
 #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (_object_it);
-#line 3493 "LibraryMonitor.c"
+#line 3422 "LibraryMonitor.c"
 			}
 			{
 				GeeIterator* _source_it = NULL;
-				MediaMonitor* _tmp43_ = NULL;
-				MediaSourceCollection* _tmp44_ = NULL;
-				MediaSourceCollection* _tmp45_ = NULL;
-				MediaSourceHoldingTank* _tmp46_ = NULL;
-				MediaSourceHoldingTank* _tmp47_ = NULL;
-				GeeCollection* _tmp48_ = NULL;
-				GeeCollection* _tmp49_ = NULL;
-				GeeIterator* _tmp50_ = NULL;
-				GeeIterator* _tmp51_ = NULL;
+				MediaMonitor* _tmp43_;
+				MediaSourceCollection* _tmp44_;
+				MediaSourceCollection* _tmp45_;
+				MediaSourceHoldingTank* _tmp46_;
+				MediaSourceHoldingTank* _tmp47_;
+				GeeCollection* _tmp48_;
+				GeeCollection* _tmp49_;
+				GeeIterator* _tmp50_;
+				GeeIterator* _tmp51_;
 #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp43_ = monitor;
 #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3530,19 +3459,19 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 				_source_it = _tmp51_;
 #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				while (TRUE) {
-#line 3534 "LibraryMonitor.c"
-					GeeIterator* _tmp52_ = NULL;
-					gboolean _tmp53_ = FALSE;
+#line 3463 "LibraryMonitor.c"
+					GeeIterator* _tmp52_;
+					gboolean _tmp53_;
 					DataSource* source = NULL;
-					GeeIterator* _tmp54_ = NULL;
-					gpointer _tmp55_ = NULL;
+					GeeIterator* _tmp54_;
+					gpointer _tmp55_;
 					Monitorable* monitorable = NULL;
-					DataSource* _tmp56_ = NULL;
-					Monitorable* _tmp57_ = NULL;
+					DataSource* _tmp56_;
+					Monitorable* _tmp57_;
 					gboolean _tmp58_ = FALSE;
-					GeeSet* _tmp59_ = NULL;
-					Monitorable* _tmp63_ = NULL;
-					MediaMonitor* _tmp64_ = NULL;
+					GeeSet* _tmp59_;
+					Monitorable* _tmp63_;
+					MediaMonitor* _tmp64_;
 #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp52_ = _source_it;
 #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3551,7 +3480,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 					if (!_tmp53_) {
 #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						break;
-#line 3555 "LibraryMonitor.c"
+#line 3484 "LibraryMonitor.c"
 					}
 #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp54_ = _source_it;
@@ -3569,10 +3498,10 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 					_tmp59_ = monitorables;
 #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_tmp59_ != NULL) {
-#line 3573 "LibraryMonitor.c"
-						GeeSet* _tmp60_ = NULL;
-						Monitorable* _tmp61_ = NULL;
-						gboolean _tmp62_ = FALSE;
+#line 3502 "LibraryMonitor.c"
+						GeeSet* _tmp60_;
+						Monitorable* _tmp61_;
+						gboolean _tmp62_;
 #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp60_ = monitorables;
 #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3581,11 +3510,11 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 						_tmp62_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_COLLECTION, GeeCollection), _tmp61_);
 #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp58_ = _tmp62_;
-#line 3585 "LibraryMonitor.c"
+#line 3514 "LibraryMonitor.c"
 					} else {
 #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp58_ = FALSE;
-#line 3589 "LibraryMonitor.c"
+#line 3518 "LibraryMonitor.c"
 					}
 #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_tmp58_) {
@@ -3595,7 +3524,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 						_g_object_unref0 (source);
 #line 453 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						continue;
-#line 3599 "LibraryMonitor.c"
+#line 3528 "LibraryMonitor.c"
 					}
 #line 455 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp63_ = monitorable;
@@ -3607,33 +3536,33 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 					_g_object_unref0 (monitorable);
 #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_g_object_unref0 (source);
-#line 3611 "LibraryMonitor.c"
+#line 3540 "LibraryMonitor.c"
 				}
 #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (_source_it);
-#line 3615 "LibraryMonitor.c"
+#line 3544 "LibraryMonitor.c"
 			}
 #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitorables);
 #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 3621 "LibraryMonitor.c"
+#line 3550 "LibraryMonitor.c"
 		}
 #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 3625 "LibraryMonitor.c"
+#line 3554 "LibraryMonitor.c"
 	}
 #line 460 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp65_ = self->priv->auto_import;
 #line 460 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp65_) {
-#line 3631 "LibraryMonitor.c"
-		GeeHashSet* _tmp66_ = NULL;
+#line 3560 "LibraryMonitor.c"
+		GeeHashSet* _tmp66_;
 #line 461 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp66_ = self->priv->unknown_files;
 #line 461 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_enqueue_import_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 3637 "LibraryMonitor.c"
+#line 3566 "LibraryMonitor.c"
 	}
 #line 464 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (self->priv->discovered);
@@ -3651,19 +3580,19 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 	tombstone_source_collection_launch_scan (_tmp67_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp68_);
 #line 472 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->discovery_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 3655 "LibraryMonitor.c"
+#line 3584 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_enqueue_verify_monitorable (LibraryMonitor* self, Monitorable* monitorable, MediaMonitor* monitor) {
 	gboolean offered = FALSE;
-	GeeQueue* _tmp0_ = NULL;
-	Monitorable* _tmp1_ = NULL;
-	MediaMonitor* _tmp2_ = NULL;
-	LibraryMonitorVerifyJob* _tmp3_ = NULL;
-	LibraryMonitorVerifyJob* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
+	GeeQueue* _tmp0_;
+	Monitorable* _tmp1_;
+	MediaMonitor* _tmp2_;
+	LibraryMonitorVerifyJob* _tmp3_;
+	LibraryMonitorVerifyJob* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
 #line 475 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 475 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3692,22 +3621,22 @@ static void library_monitor_enqueue_verify_monitorable (LibraryMonitor* self, Mo
 	_vala_assert (offered, "offered");
 #line 479 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_execute_next_verify_job (self);
-#line 3696 "LibraryMonitor.c"
+#line 3625 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_execute_next_verify_job (LibraryMonitor* self) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 	LibraryMonitorVerifyJob* job = NULL;
-	GeeQueue* _tmp5_ = NULL;
-	gpointer _tmp6_ = NULL;
-	LibraryMonitorVerifyJob* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	LibraryMonitorVerifyJob* _tmp9_ = NULL;
-	Monitorable* _tmp10_ = NULL;
-	LibraryMonitorVerifyJob* _tmp11_ = NULL;
-	MediaMonitor* _tmp12_ = NULL;
+	GeeQueue* _tmp5_;
+	gpointer _tmp6_;
+	LibraryMonitorVerifyJob* _tmp7_;
+	gint _tmp8_;
+	LibraryMonitorVerifyJob* _tmp9_;
+	Monitorable* _tmp10_;
+	LibraryMonitorVerifyJob* _tmp11_;
+	MediaMonitor* _tmp12_;
 #line 482 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3716,11 +3645,11 @@ static void library_monitor_execute_next_verify_job (LibraryMonitor* self) {
 	if (_tmp1_ >= LIBRARY_MONITOR_MAX_VERIFY_EXISTING_MEDIA_JOBS) {
 #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = TRUE;
-#line 3720 "LibraryMonitor.c"
+#line 3649 "LibraryMonitor.c"
 	} else {
-		GeeQueue* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		GeeQueue* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = self->priv->verify_queue;
 #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3729,13 +3658,13 @@ static void library_monitor_execute_next_verify_job (LibraryMonitor* self) {
 		_tmp4_ = _tmp3_;
 #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = _tmp4_ == 0;
-#line 3733 "LibraryMonitor.c"
+#line 3662 "LibraryMonitor.c"
 	}
 #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp0_) {
 #line 484 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 3739 "LibraryMonitor.c"
+#line 3668 "LibraryMonitor.c"
 	}
 #line 486 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp5_ = self->priv->verify_queue;
@@ -3763,7 +3692,7 @@ static void library_monitor_execute_next_verify_job (LibraryMonitor* self) {
 	library_monitor_verify_monitorable (self, _tmp10_, _tmp12_, NULL, NULL);
 #line 482 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_library_monitor_verify_job_unref0 (job);
-#line 3767 "LibraryMonitor.c"
+#line 3696 "LibraryMonitor.c"
 }
 
 
@@ -3778,23 +3707,47 @@ static void library_monitor_verify_monitorable_data_free (gpointer _data) {
 	_g_object_unref0 (_data_->self);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_slice_free (LibraryMonitorVerifyMonitorableData, _data_);
-#line 3782 "LibraryMonitor.c"
+#line 3711 "LibraryMonitor.c"
+}
+
+
+static void library_monitor_verify_monitorable_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) {
+	LibraryMonitorVerifyMonitorableData* _task_data_;
+#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+	_task_data_ = g_task_get_task_data (G_TASK (res));
+#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+	if (_task_data_->_callback_ != NULL) {
+#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+		_task_data_->_callback_ (source_object, res, user_data);
+#line 3723 "LibraryMonitor.c"
+	}
+#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+	_task_data_->_task_complete_ = TRUE;
+#line 3727 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_verify_monitorable (LibraryMonitor* self, Monitorable* monitorable, MediaMonitor* monitor, GAsyncReadyCallback _callback_, gpointer _user_data_) {
 	LibraryMonitorVerifyMonitorableData* _data_;
-	LibraryMonitor* _tmp0_ = NULL;
-	Monitorable* _tmp1_ = NULL;
-	Monitorable* _tmp2_ = NULL;
-	MediaMonitor* _tmp3_ = NULL;
-	MediaMonitor* _tmp4_ = NULL;
+	LibraryMonitor* _tmp0_;
+	Monitorable* _tmp1_;
+	Monitorable* _tmp2_;
+	MediaMonitor* _tmp3_;
+	MediaMonitor* _tmp4_;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_ = g_slice_new0 (LibraryMonitorVerifyMonitorableData);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, library_monitor_verify_monitorable);
+	_data_->_callback_ = _callback_;
+#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+	_data_->_async_result = g_task_new (G_OBJECT (self), NULL, library_monitor_verify_monitorable_async_ready_wrapper, _user_data_);
+#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+	if (_callback_ == NULL) {
+#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+		_data_->_task_complete_ = TRUE;
+#line 3748 "LibraryMonitor.c"
+	}
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, library_monitor_verify_monitorable_data_free);
+	g_task_set_task_data (_data_->_async_result, _data_, library_monitor_verify_monitorable_data_free);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp0_ = _g_object_ref0 (self);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3817,32 +3770,32 @@ static void library_monitor_verify_monitorable (LibraryMonitor* self, Monitorabl
 	_data_->monitor = _tmp4_;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_verify_monitorable_co (_data_);
-#line 3821 "LibraryMonitor.c"
+#line 3774 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_verify_monitorable_finish (LibraryMonitor* self, GAsyncResult* _res_) {
 	LibraryMonitorVerifyMonitorableData* _data_;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
-#line 3829 "LibraryMonitor.c"
+	_data_ = g_task_propagate_pointer (G_TASK (_res_), NULL);
+#line 3782 "LibraryMonitor.c"
 }
 
 
-static void _vala_array_add130 (GFile*** array, int* length, int* size, GFile* value) {
+static void _vala_array_add130 (GFile** * array, int* length, int* size, GFile* value) {
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if ((*length) == (*size)) {
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		*array = g_renew (GFile*, *array, (*size) + 1);
-#line 3840 "LibraryMonitor.c"
+#line 3793 "LibraryMonitor.c"
 	}
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	(*array)[(*length)++] = value;
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	(*array)[*length] = NULL;
-#line 3846 "LibraryMonitor.c"
+#line 3799 "LibraryMonitor.c"
 }
 
 
@@ -3855,8 +3808,10 @@ static void library_monitor_verify_monitorable_ready (GObject* source_object, GA
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_res_ = _res_;
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+	_data_->_task_complete_ = TRUE;
+#line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_verify_monitorable_co (_data_);
-#line 3860 "LibraryMonitor.c"
+#line 3815 "LibraryMonitor.c"
 }
 
 
@@ -3865,7 +3820,7 @@ static gboolean _library_monitor_verify_monitorable_co_gsource_func (gpointer se
 	result = library_monitor_verify_monitorable_co (self);
 #line 530 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 3869 "LibraryMonitor.c"
+#line 3824 "LibraryMonitor.c"
 }
 
 
@@ -3874,107 +3829,69 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 	switch (_data_->_state_) {
 #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		case 0:
-#line 3878 "LibraryMonitor.c"
+#line 3833 "LibraryMonitor.c"
 		goto _state_0;
 #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		case 1:
-#line 3882 "LibraryMonitor.c"
+#line 3837 "LibraryMonitor.c"
 		goto _state_1;
 #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		case 2:
-#line 3886 "LibraryMonitor.c"
+#line 3841 "LibraryMonitor.c"
 		goto _state_2;
 		default:
 #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_assert_not_reached ();
-#line 3891 "LibraryMonitor.c"
+#line 3846 "LibraryMonitor.c"
 	}
 	_state_0:
 #line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp0_ = NULL;
-#line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp0_ = g_new0 (GFile*, 1 + 1);
 #line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->files_length1 = 0;
-#line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_files_size_ = 0;
-#line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->files = _data_->_tmp0_;
 #line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->files_length1 = 1;
 #line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_files_size_ = _data_->files_length1;
 #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp1_ = NULL;
-#line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp1__length1 = 0;
-#line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp1_ = _data_->files;
 #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp1__length1 = _data_->files_length1;
 #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp2_ = NULL;
-#line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp2_ = _data_->monitor;
 #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp3_ = NULL;
-#line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp3_ = _data_->monitorable;
 #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp4_ = NULL;
-#line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp4_ = media_monitor_get_master_file (_data_->_tmp2_, _data_->_tmp3_);
 #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (_data_->_tmp1_[0]);
 #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp1_[0] = _data_->_tmp4_;
 #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp5_ = NULL;
-#line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp5_ = _data_->_tmp1_[0];
 #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp6_ = NULL;
-#line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp6_ = _data_->monitor;
 #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp7_ = NULL;
-#line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp7_ = _data_->monitorable;
 #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp8_ = 0;
-#line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp9_ = NULL;
-#line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp9_ = media_monitor_get_auxilliary_backing_files (_data_->_tmp6_, _data_->_tmp7_, &_data_->_tmp8_);
 #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->aux_files_length1 = 0;
-#line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_aux_files_size_ = 0;
-#line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->aux_files = _data_->_tmp9_;
 #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->aux_files_length1 = _data_->_tmp8_;
 #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_aux_files_size_ = _data_->aux_files_length1;
 #line 498 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp10_ = NULL;
-#line 498 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp10__length1 = 0;
-#line 498 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp10_ = _data_->aux_files;
 #line 498 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp10__length1 = _data_->aux_files_length1;
 #line 498 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_data_->_tmp10_ != NULL) {
 #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		_data_->_tmp11_ = NULL;
-#line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		_data_->_tmp11__length1 = 0;
-#line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_data_->_tmp11_ = _data_->aux_files;
 #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_data_->_tmp11__length1 = _data_->aux_files_length1;
-#line 3978 "LibraryMonitor.c"
+#line 3895 "LibraryMonitor.c"
 		{
 #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->aux_file_collection_length1 = 0;
@@ -3987,34 +3904,24 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			for (_data_->aux_file_it = 0; _data_->aux_file_it < _data_->_tmp11__length1; _data_->aux_file_it = _data_->aux_file_it + 1) {
 #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp12_ = NULL;
-#line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp12_ = _g_object_ref0 (_data_->aux_file_collection[_data_->aux_file_it]);
 #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->aux_file = _data_->_tmp12_;
-#line 3996 "LibraryMonitor.c"
+#line 3911 "LibraryMonitor.c"
 				{
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_data_->_tmp13_ = NULL;
-#line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_data_->_tmp13__length1 = 0;
-#line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp13_ = _data_->files;
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp13__length1 = _data_->files_length1;
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_data_->_tmp14_ = NULL;
-#line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp14_ = _data_->aux_file;
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_data_->_tmp15_ = NULL;
-#line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp15_ = _g_object_ref0 (_data_->_tmp14_);
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_vala_array_add130 (&_data_->files, &_data_->files_length1, &_data_->_files_size_, _data_->_tmp15_);
 #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_g_object_unref0 (_data_->aux_file);
-#line 4018 "LibraryMonitor.c"
+#line 3925 "LibraryMonitor.c"
 				}
 			}
 		}
@@ -4022,7 +3929,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 	{
 #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_data_->ctr = 0;
-#line 4026 "LibraryMonitor.c"
+#line 3933 "LibraryMonitor.c"
 		{
 #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp16_ = TRUE;
@@ -4031,24 +3938,16 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				if (!_data_->_tmp16_) {
 #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_data_->_tmp17_ = 0;
-#line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp17_ = _data_->ctr;
 #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->ctr = _data_->_tmp17_ + 1;
-#line 4040 "LibraryMonitor.c"
+#line 3945 "LibraryMonitor.c"
 				}
 #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp16_ = FALSE;
 #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp18_ = 0;
-#line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp18_ = _data_->ctr;
 #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp19_ = NULL;
-#line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp19__length1 = 0;
-#line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp19_ = _data_->files;
 #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp19__length1 = _data_->files_length1;
@@ -4056,55 +3955,35 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 				if (!(_data_->_tmp18_ < _data_->_tmp19__length1)) {
 #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					break;
-#line 4060 "LibraryMonitor.c"
+#line 3959 "LibraryMonitor.c"
 				}
 #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp20_ = NULL;
-#line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp20__length1 = 0;
-#line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp20_ = _data_->files;
 #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp20__length1 = _data_->files_length1;
 #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp21_ = 0;
-#line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp21_ = _data_->ctr;
 #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp22_ = NULL;
-#line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp22_ = _data_->_tmp20_[_data_->_tmp21_];
 #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp23_ = NULL;
-#line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp23_ = _g_object_ref0 (_data_->_tmp22_);
 #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->file = _data_->_tmp23_;
 #line 506 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp24_ = NULL;
-#line 506 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp24_ = _data_->file;
 #line 506 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp25_ = NULL;
-#line 506 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp25_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _data_->_tmp24_);
 #line 506 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->info = _data_->_tmp25_;
 #line 507 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp26_ = NULL;
-#line 507 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp26_ = _data_->info;
 #line 507 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				if (_data_->_tmp26_ == NULL) {
-#line 4100 "LibraryMonitor.c"
+#line 3983 "LibraryMonitor.c"
 					{
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-						_data_->_tmp28_ = NULL;
-#line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp28_ = _data_->file;
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-						_data_->_tmp29_ = NULL;
-#line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp29_ = _data_->self->priv->cancellable;
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_state_ = 1;
@@ -4112,22 +3991,18 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 						g_file_query_info_async (_data_->_tmp28_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_FILE_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp29_, library_monitor_verify_monitorable_ready, _data_);
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						return FALSE;
-#line 4116 "LibraryMonitor.c"
+#line 3995 "LibraryMonitor.c"
 						_state_1:
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-						_data_->_tmp30_ = NULL;
-#line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp30_ = g_file_query_info_finish (_data_->_tmp28_, _data_->_res_, &_data_->_inner_error_);
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp27_ = _data_->_tmp30_;
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 4126 "LibraryMonitor.c"
-							goto __catch485_g_error;
+#line 4003 "LibraryMonitor.c"
+							goto __catch486_g_error;
 						}
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-						_data_->_tmp31_ = NULL;
-#line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp31_ = _data_->_tmp27_;
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp27_ = NULL;
@@ -4137,10 +4012,10 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 						_data_->info = _data_->_tmp31_;
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_g_object_unref0 (_data_->_tmp27_);
-#line 4141 "LibraryMonitor.c"
+#line 4016 "LibraryMonitor.c"
 					}
-					goto __finally485;
-					__catch485_g_error:
+					goto __finally486;
+					__catch486_g_error:
 					{
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->err = _data_->_inner_error_;
@@ -4148,9 +4023,9 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 						_data_->_inner_error_ = NULL;
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_g_error_free0 (_data_->err);
-#line 4152 "LibraryMonitor.c"
+#line 4027 "LibraryMonitor.c"
 					}
-					__finally485:
+					__finally486:
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4166,113 +4041,81 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						g_clear_error (&_data_->_inner_error_);
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+						g_object_unref (_data_->_async_result);
+#line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						return FALSE;
-#line 4171 "LibraryMonitor.c"
+#line 4048 "LibraryMonitor.c"
 					}
 				}
 #line 517 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp32_ = 0;
-#line 517 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp32_ = _data_->ctr;
 #line 517 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				if (_data_->_tmp32_ == 0) {
 #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_data_->_tmp34_ = NULL;
-#line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp34_ = _data_->info;
 #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_data_->_tmp34_ != NULL) {
 #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-						_data_->_tmp35_ = NULL;
-#line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp35_ = _data_->monitor;
 #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-						_data_->_tmp36_ = NULL;
-#line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp36_ = _data_->monitorable;
 #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-						_data_->_tmp37_ = FALSE;
-#line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp37_ = media_monitor_is_offline (_data_->_tmp35_, _data_->_tmp36_);
 #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp33_ = _data_->_tmp37_;
-#line 4200 "LibraryMonitor.c"
+#line 4067 "LibraryMonitor.c"
 					} else {
 #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp33_ = FALSE;
-#line 4204 "LibraryMonitor.c"
+#line 4071 "LibraryMonitor.c"
 					}
 #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_data_->_tmp33_) {
 #line 519 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-						_data_->_tmp38_ = NULL;
-#line 519 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp38_ = _data_->monitor;
 #line 519 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-						_data_->_tmp39_ = NULL;
-#line 519 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp39_ = _data_->monitorable;
 #line 519 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						media_monitor_update_online (_data_->_tmp38_, _data_->_tmp39_);
-#line 4218 "LibraryMonitor.c"
+#line 4081 "LibraryMonitor.c"
 					} else {
 #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-						_data_->_tmp41_ = NULL;
-#line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp41_ = _data_->info;
 #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						if (_data_->_tmp41_ == NULL) {
 #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-							_data_->_tmp42_ = NULL;
-#line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_data_->_tmp42_ = _data_->monitor;
 #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-							_data_->_tmp43_ = NULL;
-#line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_data_->_tmp43_ = _data_->monitorable;
 #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-							_data_->_tmp44_ = FALSE;
-#line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_data_->_tmp44_ = media_monitor_is_offline (_data_->_tmp42_, _data_->_tmp43_);
 #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_data_->_tmp40_ = !_data_->_tmp44_;
-#line 4240 "LibraryMonitor.c"
+#line 4095 "LibraryMonitor.c"
 						} else {
 #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_data_->_tmp40_ = FALSE;
-#line 4244 "LibraryMonitor.c"
+#line 4099 "LibraryMonitor.c"
 						}
 #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						if (_data_->_tmp40_) {
 #line 521 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-							_data_->_tmp45_ = NULL;
-#line 521 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_data_->_tmp45_ = _data_->monitor;
 #line 521 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-							_data_->_tmp46_ = NULL;
-#line 521 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_data_->_tmp46_ = _data_->monitorable;
 #line 521 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							media_monitor_update_offline (_data_->_tmp45_, _data_->_tmp46_);
-#line 4258 "LibraryMonitor.c"
+#line 4109 "LibraryMonitor.c"
 						}
 					}
 				}
 #line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp47_ = NULL;
-#line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp47_ = _data_->monitor;
 #line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp48_ = NULL;
-#line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp48_ = _data_->monitorable;
 #line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp49_ = NULL;
-#line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp49_ = _data_->file;
 #line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_data_->_tmp50_ = NULL;
-#line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp50_ = _data_->info;
 #line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				media_monitor_update_backing_file_info (_data_->_tmp47_, _data_->_tmp48_, _data_->_tmp49_, _data_->_tmp50_);
@@ -4280,44 +4123,34 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 				_g_object_unref0 (_data_->info);
 #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (_data_->file);
-#line 4284 "LibraryMonitor.c"
+#line 4127 "LibraryMonitor.c"
 			}
 		}
 	}
 #line 527 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp51_ = 0;
-#line 527 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp51_ = _data_->self->priv->completed_monitorable_verifies;
 #line 527 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->self->priv->completed_monitorable_verifies = _data_->_tmp51_ + 1;
 #line 528 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp52_ = 0;
-#line 528 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp52_ = _data_->self->priv->completed_monitorable_verifies;
 #line 528 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp53_ = 0;
-#line 528 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp53_ = _data_->self->priv->total_monitorable_verifies;
 #line 528 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	g_signal_emit_by_name (_data_->self, "auto-update-progress", _data_->_tmp52_, _data_->_tmp53_);
+	g_signal_emit (_data_->self, library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL], 0, _data_->_tmp52_, _data_->_tmp53_);
 #line 530 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_idle_add_full (DIRECTORY_MONITOR_DEFAULT_PRIORITY, _library_monitor_verify_monitorable_co_gsource_func, _data_, NULL);
 #line 531 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_state_ = 2;
 #line 531 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return FALSE;
-#line 4310 "LibraryMonitor.c"
+#line 4147 "LibraryMonitor.c"
 	_state_2:
 	;
 #line 534 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp54_ = 0;
-#line 534 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp54_ = _data_->self->priv->outstanding_verify_jobs;
 #line 534 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_vala_assert (_data_->_tmp54_ > 0, "outstanding_verify_jobs > 0");
 #line 535 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp55_ = 0;
-#line 535 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp55_ = _data_->self->priv->outstanding_verify_jobs;
 #line 535 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->self->priv->outstanding_verify_jobs = _data_->_tmp55_ - 1;
@@ -4328,33 +4161,34 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->files = (_vala_array_free (_data_->files, _data_->files_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	if (_data_->_state_ == 0) {
+	g_task_return_pointer (_data_->_async_result, _data_, NULL);
 #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 4335 "LibraryMonitor.c"
-	} else {
+	if (_data_->_state_ != 0) {
 #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		g_simple_async_result_complete (_data_->_async_result);
-#line 4339 "LibraryMonitor.c"
+		while (_data_->_task_complete_ != TRUE) {
+#line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
+			g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
+#line 4172 "LibraryMonitor.c"
+		}
 	}
 #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_object_unref (_data_->_async_result);
 #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return FALSE;
-#line 4345 "LibraryMonitor.c"
+#line 4179 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_on_config_changed (LibraryMonitor* self) {
 	gboolean value = FALSE;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp7_;
 #line 540 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 541 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4377,7 +4211,7 @@ static void library_monitor_on_config_changed (LibraryMonitor* self) {
 	if (_tmp4_ == _tmp5_) {
 #line 544 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 4381 "LibraryMonitor.c"
+#line 4215 "LibraryMonitor.c"
 	}
 #line 546 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp6_ = value;
@@ -4387,20 +4221,20 @@ static void library_monitor_on_config_changed (LibraryMonitor* self) {
 	_tmp7_ = self->priv->auto_import;
 #line 547 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp7_) {
-#line 4391 "LibraryMonitor.c"
-		gboolean _tmp8_ = FALSE;
+#line 4225 "LibraryMonitor.c"
+		gboolean _tmp8_;
 #line 548 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp8_ = commandline_options_no_runtime_monitoring;
 #line 548 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (!_tmp8_) {
 #line 549 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			library_monitor_import_unrepresented_files (self);
-#line 4399 "LibraryMonitor.c"
+#line 4233 "LibraryMonitor.c"
 		}
 	} else {
 #line 551 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_cancel_batch_imports (self);
-#line 4404 "LibraryMonitor.c"
+#line 4238 "LibraryMonitor.c"
 	}
 }
 
@@ -4408,9 +4242,9 @@ static void library_monitor_on_config_changed (LibraryMonitor* self) {
 static void library_monitor_enqueue_import (LibraryMonitor* self, GFile* file) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GeeHashSet* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GeeHashSet* _tmp2_;
+	GFile* _tmp3_;
+	gboolean _tmp4_;
 #line 555 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 555 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4423,50 +4257,50 @@ static void library_monitor_enqueue_import (LibraryMonitor* self, GFile* file) {
 	_tmp4_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp3_);
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp4_) {
-#line 4427 "LibraryMonitor.c"
-		GFile* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+#line 4261 "LibraryMonitor.c"
+		GFile* _tmp5_;
+		gboolean _tmp6_;
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp5_ = file;
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp6_ = library_monitor_is_supported_filetype (self, _tmp5_);
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = _tmp6_;
-#line 4436 "LibraryMonitor.c"
+#line 4270 "LibraryMonitor.c"
 	} else {
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = FALSE;
-#line 4440 "LibraryMonitor.c"
+#line 4274 "LibraryMonitor.c"
 	}
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp1_) {
-#line 4444 "LibraryMonitor.c"
-		GFile* _tmp7_ = NULL;
-		gboolean _tmp8_ = FALSE;
+#line 4278 "LibraryMonitor.c"
+		GFile* _tmp7_;
+		gboolean _tmp8_;
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp7_ = file;
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp8_ = library_monitor_is_blacklisted (_tmp7_);
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = !_tmp8_;
-#line 4453 "LibraryMonitor.c"
+#line 4287 "LibraryMonitor.c"
 	} else {
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = FALSE;
-#line 4457 "LibraryMonitor.c"
+#line 4291 "LibraryMonitor.c"
 	}
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp0_) {
-#line 4461 "LibraryMonitor.c"
-		GeeHashSet* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
+#line 4295 "LibraryMonitor.c"
+		GeeHashSet* _tmp9_;
+		GFile* _tmp10_;
 #line 557 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp9_ = self->priv->import_queue;
 #line 557 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp10_ = file;
 #line 557 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
-#line 4470 "LibraryMonitor.c"
+#line 4304 "LibraryMonitor.c"
 	}
 }
 
@@ -4476,11 +4310,11 @@ static void library_monitor_enqueue_import_many (LibraryMonitor* self, GeeCollec
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 560 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (files));
-#line 4480 "LibraryMonitor.c"
+#line 4314 "LibraryMonitor.c"
 	{
 		GeeIterator* _file_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = files;
 #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4489,13 +4323,13 @@ static void library_monitor_enqueue_import_many (LibraryMonitor* self, GeeCollec
 		_file_it = _tmp1_;
 #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 4493 "LibraryMonitor.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 4327 "LibraryMonitor.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			GFile* file = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			GFile* _tmp6_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			GFile* _tmp6_;
 #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp2_ = _file_it;
 #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4504,7 +4338,7 @@ static void library_monitor_enqueue_import_many (LibraryMonitor* self, GeeCollec
 			if (!_tmp3_) {
 #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 4508 "LibraryMonitor.c"
+#line 4342 "LibraryMonitor.c"
 			}
 #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp4_ = _file_it;
@@ -4518,18 +4352,18 @@ static void library_monitor_enqueue_import_many (LibraryMonitor* self, GeeCollec
 			library_monitor_enqueue_import (self, _tmp6_);
 #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (file);
-#line 4522 "LibraryMonitor.c"
+#line 4356 "LibraryMonitor.c"
 		}
 #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_file_it);
-#line 4526 "LibraryMonitor.c"
+#line 4360 "LibraryMonitor.c"
 	}
 }
 
 
 static void library_monitor_remove_queued_import (LibraryMonitor* self, GFile* file) {
-	GeeHashSet* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GeeHashSet* _tmp0_;
+	GFile* _tmp1_;
 #line 565 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 565 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4540,39 +4374,39 @@ static void library_monitor_remove_queued_import (LibraryMonitor* self, GFile* f
 	_tmp1_ = file;
 #line 566 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 4544 "LibraryMonitor.c"
+#line 4378 "LibraryMonitor.c"
 }
 
 
 static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 	gboolean result = FALSE;
-	GCancellable* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GeeHashSet* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	BatchImport* _tmp5_ = NULL;
-	GeeHashSet* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
+	GCancellable* _tmp0_;
+	gboolean _tmp1_;
+	GeeHashSet* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	BatchImport* _tmp5_;
+	GeeHashSet* _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
 	time_t now = 0;
-	gulong _tmp11_ = 0UL;
+	gulong _tmp11_;
 	gboolean _tmp12_ = FALSE;
-	BatchImportRoll* _tmp13_ = NULL;
-	time_t _tmp17_ = 0;
+	BatchImportRoll* _tmp13_;
+	time_t _tmp17_;
 	GeeArrayList* jobs = NULL;
-	GeeArrayList* _tmp18_ = NULL;
-	GeeHashSet* _tmp33_ = NULL;
+	GeeArrayList* _tmp18_;
+	GeeHashSet* _tmp33_;
 	BatchImport* importer = NULL;
-	GeeArrayList* _tmp34_ = NULL;
-	BatchImportRoll* _tmp35_ = NULL;
-	BatchImport* _tmp36_ = NULL;
-	BatchImport* _tmp37_ = NULL;
-	BatchImport* _tmp38_ = NULL;
-	GeeArrayList* _tmp39_ = NULL;
-	BatchImport* _tmp40_ = NULL;
+	GeeArrayList* _tmp34_;
+	BatchImportRoll* _tmp35_;
+	BatchImport* _tmp36_;
+	BatchImport* _tmp37_;
+	BatchImport* _tmp38_;
+	GeeArrayList* _tmp39_;
+	BatchImport* _tmp40_;
 #line 569 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_val_if_fail (IS_LIBRARY_MONITOR (self), FALSE);
 #line 570 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4585,7 +4419,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 		result = FALSE;
 #line 571 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return result;
-#line 4589 "LibraryMonitor.c"
+#line 4423 "LibraryMonitor.c"
 	}
 #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp2_ = self->priv->import_queue;
@@ -4599,7 +4433,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 		result = TRUE;
 #line 574 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return result;
-#line 4603 "LibraryMonitor.c"
+#line 4437 "LibraryMonitor.c"
 	}
 #line 578 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp5_ = self->priv->current_batch_import;
@@ -4609,7 +4443,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 		result = TRUE;
 #line 579 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return result;
-#line 4613 "LibraryMonitor.c"
+#line 4447 "LibraryMonitor.c"
 	}
 #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp6_ = self->priv->import_queue;
@@ -4635,29 +4469,29 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 	if (_tmp13_ == NULL) {
 #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp12_ = TRUE;
-#line 4639 "LibraryMonitor.c"
+#line 4473 "LibraryMonitor.c"
 	} else {
-		time_t _tmp14_ = 0;
-		time_t _tmp15_ = 0;
+		time_t _tmp14_;
+		time_t _tmp15_;
 #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp14_ = now;
 #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp15_ = self->priv->last_import_roll_use;
 #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp12_ = (_tmp14_ - _tmp15_) >= ((time_t) LIBRARY_MONITOR_IMPORT_ROLL_QUIET_SEC);
-#line 4649 "LibraryMonitor.c"
+#line 4483 "LibraryMonitor.c"
 	}
 #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp12_) {
-#line 4653 "LibraryMonitor.c"
-		BatchImportRoll* _tmp16_ = NULL;
+#line 4487 "LibraryMonitor.c"
+		BatchImportRoll* _tmp16_;
 #line 588 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp16_ = batch_import_roll_new ();
 #line 588 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_batch_import_roll_unref0 (self->priv->current_import_roll);
 #line 588 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		self->priv->current_import_roll = _tmp16_;
-#line 4661 "LibraryMonitor.c"
+#line 4495 "LibraryMonitor.c"
 	}
 #line 589 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp17_ = now;
@@ -4667,11 +4501,11 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 	_tmp18_ = gee_array_list_new (TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
 #line 591 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	jobs = _tmp18_;
-#line 4671 "LibraryMonitor.c"
+#line 4505 "LibraryMonitor.c"
 	{
 		GeeIterator* _file_it = NULL;
-		GeeHashSet* _tmp19_ = NULL;
-		GeeIterator* _tmp20_ = NULL;
+		GeeHashSet* _tmp19_;
+		GeeIterator* _tmp20_;
 #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp19_ = self->priv->import_queue;
 #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4680,20 +4514,20 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 		_file_it = _tmp20_;
 #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 4684 "LibraryMonitor.c"
-			GeeIterator* _tmp21_ = NULL;
-			gboolean _tmp22_ = FALSE;
+#line 4518 "LibraryMonitor.c"
+			GeeIterator* _tmp21_;
+			gboolean _tmp22_;
 			GFile* file = NULL;
-			GeeIterator* _tmp23_ = NULL;
-			gpointer _tmp24_ = NULL;
-			GFile* _tmp25_ = NULL;
-			gboolean _tmp26_ = FALSE;
-			GeeArrayList* _tmp27_ = NULL;
-			GFile* _tmp28_ = NULL;
-			FileImportJob* _tmp29_ = NULL;
-			FileImportJob* _tmp30_ = NULL;
-			GeeHashSet* _tmp31_ = NULL;
-			GFile* _tmp32_ = NULL;
+			GeeIterator* _tmp23_;
+			gpointer _tmp24_;
+			GFile* _tmp25_;
+			gboolean _tmp26_;
+			GeeArrayList* _tmp27_;
+			GFile* _tmp28_;
+			FileImportJob* _tmp29_;
+			FileImportJob* _tmp30_;
+			GeeHashSet* _tmp31_;
+			GFile* _tmp32_;
 #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp21_ = _file_it;
 #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4702,7 +4536,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 			if (!_tmp22_) {
 #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 4706 "LibraryMonitor.c"
+#line 4540 "LibraryMonitor.c"
 			}
 #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp23_ = _file_it;
@@ -4720,7 +4554,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 				_g_object_unref0 (file);
 #line 594 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 4724 "LibraryMonitor.c"
+#line 4558 "LibraryMonitor.c"
 			}
 #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp27_ = jobs;
@@ -4742,11 +4576,11 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp32_);
 #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (file);
-#line 4746 "LibraryMonitor.c"
+#line 4580 "LibraryMonitor.c"
 		}
 #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_file_it);
-#line 4750 "LibraryMonitor.c"
+#line 4584 "LibraryMonitor.c"
 	}
 #line 600 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp33_ = self->priv->import_queue;
@@ -4784,40 +4618,40 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 	_g_object_unref0 (jobs);
 #line 610 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 4788 "LibraryMonitor.c"
+#line 4622 "LibraryMonitor.c"
 }
 
 
 static void _library_monitor_on_import_preparing_batch_import_preparing (BatchImport* _sender, gpointer self) {
 #line 618 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_on_import_preparing ((LibraryMonitor*) self);
-#line 4795 "LibraryMonitor.c"
+#line 4629 "LibraryMonitor.c"
 }
 
 
 static void _library_monitor_on_import_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) {
 #line 619 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_on_import_progress ((LibraryMonitor*) self, completed_bytes, total_bytes);
-#line 4802 "LibraryMonitor.c"
+#line 4636 "LibraryMonitor.c"
 }
 
 
 static void _library_monitor_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
 #line 620 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_on_import_complete ((LibraryMonitor*) self, _sender, manifest, import_roll);
-#line 4809 "LibraryMonitor.c"
+#line 4643 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) {
 	gboolean _tmp0_ = FALSE;
-	BatchImport* _tmp1_ = NULL;
-	GeeArrayList* _tmp5_ = NULL;
-	gpointer _tmp6_ = NULL;
-	BatchImport* _tmp7_ = NULL;
-	BatchImport* _tmp8_ = NULL;
-	BatchImport* _tmp9_ = NULL;
-	BatchImport* _tmp10_ = NULL;
+	BatchImport* _tmp1_;
+	GeeArrayList* _tmp5_;
+	gpointer _tmp6_;
+	BatchImport* _tmp7_;
+	BatchImport* _tmp8_;
+	BatchImport* _tmp9_;
+	BatchImport* _tmp10_;
 #line 613 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4826,11 +4660,11 @@ static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) {
 	if (_tmp1_ != NULL) {
 #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = TRUE;
-#line 4830 "LibraryMonitor.c"
+#line 4664 "LibraryMonitor.c"
 	} else {
-		GeeArrayList* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		GeeArrayList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = self->priv->batch_import_queue;
 #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4839,13 +4673,13 @@ static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) {
 		_tmp4_ = _tmp3_;
 #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = _tmp4_ == 0;
-#line 4843 "LibraryMonitor.c"
+#line 4677 "LibraryMonitor.c"
 	}
 #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp0_) {
 #line 615 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 4849 "LibraryMonitor.c"
+#line 4683 "LibraryMonitor.c"
 	}
 #line 617 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp5_ = self->priv->batch_import_queue;
@@ -4871,26 +4705,26 @@ static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) {
 	_tmp10_ = self->priv->current_batch_import;
 #line 621 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	batch_import_schedule (_tmp10_);
-#line 4875 "LibraryMonitor.c"
+#line 4709 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_discard_current_batch_import (LibraryMonitor* self) {
-	BatchImport* _tmp0_ = NULL;
+	BatchImport* _tmp0_;
 	gboolean removed = FALSE;
-	GeeArrayList* _tmp1_ = NULL;
-	BatchImport* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	BatchImport* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	BatchImport* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
-	BatchImport* _tmp9_ = NULL;
-	guint _tmp10_ = 0U;
-	GeeArrayList* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
+	GeeArrayList* _tmp1_;
+	BatchImport* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	BatchImport* _tmp5_;
+	guint _tmp6_;
+	BatchImport* _tmp7_;
+	guint _tmp8_;
+	BatchImport* _tmp9_;
+	guint _tmp10_;
+	GeeArrayList* _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
 #line 624 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 625 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4939,43 +4773,43 @@ static void library_monitor_discard_current_batch_import (LibraryMonitor* self)
 	_tmp13_ = _tmp12_;
 #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp13_ == 0) {
-#line 4943 "LibraryMonitor.c"
-		GeeHashSet* _tmp14_ = NULL;
+#line 4777 "LibraryMonitor.c"
+		GeeHashSet* _tmp14_;
 #line 640 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp14_ = self->priv->pending_imports;
 #line 640 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 4949 "LibraryMonitor.c"
+#line 4783 "LibraryMonitor.c"
 	}
 }
 
 
 static void library_monitor_cancel_batch_imports (LibraryMonitor* self) {
 	gint ctr = 0;
-	BatchImport* _tmp16_ = NULL;
-	GeeHashSet* _tmp18_ = NULL;
+	BatchImport* _tmp16_;
+	GeeHashSet* _tmp18_;
 #line 643 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 645 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	ctr = 0;
 #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	while (TRUE) {
-#line 4964 "LibraryMonitor.c"
-		gint _tmp0_ = 0;
-		GeeArrayList* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
-		GeeArrayList* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gpointer _tmp6_ = NULL;
-		BatchImport* _tmp7_ = NULL;
-		BatchImport* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
-		GeeArrayList* _tmp11_ = NULL;
-		GeeArrayList* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
-		gpointer _tmp14_ = NULL;
-		BatchImport* _tmp15_ = NULL;
+#line 4798 "LibraryMonitor.c"
+		gint _tmp0_;
+		GeeArrayList* _tmp1_;
+		gint _tmp2_;
+		gint _tmp3_;
+		GeeArrayList* _tmp4_;
+		gint _tmp5_;
+		gpointer _tmp6_;
+		BatchImport* _tmp7_;
+		BatchImport* _tmp8_;
+		gboolean _tmp9_;
+		GeeArrayList* _tmp11_;
+		GeeArrayList* _tmp12_;
+		gint _tmp13_;
+		gpointer _tmp14_;
+		BatchImport* _tmp15_;
 #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = ctr;
 #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4988,7 +4822,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) {
 		if (!(_tmp0_ < _tmp3_)) {
 #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			break;
-#line 4992 "LibraryMonitor.c"
+#line 4826 "LibraryMonitor.c"
 		}
 #line 647 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp4_ = self->priv->batch_import_queue;
@@ -5006,15 +4840,15 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) {
 		_g_object_unref0 (_tmp7_);
 #line 647 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp9_) {
-#line 5010 "LibraryMonitor.c"
-			gint _tmp10_ = 0;
+#line 4844 "LibraryMonitor.c"
+			gint _tmp10_;
 #line 648 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp10_ = ctr;
 #line 648 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			ctr = _tmp10_ + 1;
 #line 650 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			continue;
-#line 5018 "LibraryMonitor.c"
+#line 4852 "LibraryMonitor.c"
 		}
 #line 653 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp11_ = self->priv->batch_import_queue;
@@ -5030,25 +4864,25 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) {
 		gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_);
 #line 653 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_tmp15_);
-#line 5034 "LibraryMonitor.c"
+#line 4868 "LibraryMonitor.c"
 	}
 #line 657 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp16_ = self->priv->current_batch_import;
 #line 657 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp16_ != NULL) {
-#line 5040 "LibraryMonitor.c"
-		BatchImport* _tmp17_ = NULL;
+#line 4874 "LibraryMonitor.c"
+		BatchImport* _tmp17_;
 #line 658 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp17_ = self->priv->current_batch_import;
 #line 658 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		batch_import_user_halt (_tmp17_);
-#line 5046 "LibraryMonitor.c"
+#line 4880 "LibraryMonitor.c"
 	}
 #line 661 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp18_ = self->priv->pending_imports;
 #line 661 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 5052 "LibraryMonitor.c"
+#line 4886 "LibraryMonitor.c"
 }
 
 
@@ -5056,14 +4890,14 @@ static void library_monitor_on_import_preparing (LibraryMonitor* self) {
 #line 664 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 665 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	g_signal_emit_by_name (self, "auto-import-preparing");
-#line 5061 "LibraryMonitor.c"
+	g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PREPARING_SIGNAL], 0);
+#line 4895 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_on_import_progress (LibraryMonitor* self, guint64 completed_bytes, guint64 total_bytes) {
-	guint64 _tmp0_ = 0ULL;
-	guint64 _tmp1_ = 0ULL;
+	guint64 _tmp0_;
+	guint64 _tmp1_;
 #line 668 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 669 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5071,29 +4905,29 @@ static void library_monitor_on_import_progress (LibraryMonitor* self, guint64 co
 #line 669 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp1_ = total_bytes;
 #line 669 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	g_signal_emit_by_name (self, "auto-import-progress", _tmp0_, _tmp1_);
-#line 5076 "LibraryMonitor.c"
+	g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 4910 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImport* batch_import, ImportManifest* manifest, BatchImportRoll* import_roll) {
-	BatchImport* _tmp0_ = NULL;
-	BatchImport* _tmp1_ = NULL;
-	ImportManifest* _tmp2_ = NULL;
-	GeeList* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	ImportManifest* _tmp25_ = NULL;
-	GeeList* _tmp26_ = NULL;
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
-	GeeHashSet* _tmp59_ = NULL;
-	gint _tmp60_ = 0;
-	gint _tmp61_ = 0;
-	gchar* _tmp62_ = NULL;
-	gchar* _tmp63_ = NULL;
+	BatchImport* _tmp0_;
+	BatchImport* _tmp1_;
+	ImportManifest* _tmp2_;
+	GeeList* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	ImportManifest* _tmp25_;
+	GeeList* _tmp26_;
+	gint _tmp27_;
+	gint _tmp28_;
+	GeeHashSet* _tmp59_;
+	gint _tmp60_;
+	gint _tmp61_;
+	gchar* _tmp62_;
+	gchar* _tmp63_;
 	GError * _inner_error_ = NULL;
 #line 672 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
@@ -5126,17 +4960,17 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 #line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_free0 (_tmp7_);
 #line 677 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	g_signal_emit_by_name (self, "auto-import-progress", (guint64) 0, (guint64) 0);
-#line 5131 "LibraryMonitor.c"
+	g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL], 0, (guint64) 0, (guint64) 0);
+#line 4965 "LibraryMonitor.c"
 	{
 		GeeList* _result_list = NULL;
-		ImportManifest* _tmp8_ = NULL;
-		GeeList* _tmp9_ = NULL;
-		GeeList* _tmp10_ = NULL;
+		ImportManifest* _tmp8_;
+		GeeList* _tmp9_;
+		GeeList* _tmp10_;
 		gint _result_size = 0;
-		GeeList* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
+		GeeList* _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
 		gint _result_index = 0;
 #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp8_ = manifest;
@@ -5158,16 +4992,16 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 		_result_index = -1;
 #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 5162 "LibraryMonitor.c"
-			gint _tmp14_ = 0;
-			gint _tmp15_ = 0;
-			gint _tmp16_ = 0;
+#line 4996 "LibraryMonitor.c"
+			gint _tmp14_;
+			gint _tmp15_;
+			gint _tmp16_;
 			BatchImportResult* _result_ = NULL;
-			GeeList* _tmp17_ = NULL;
-			gint _tmp18_ = 0;
-			gpointer _tmp19_ = NULL;
-			BatchImportResult* _tmp20_ = NULL;
-			GFile* _tmp21_ = NULL;
+			GeeList* _tmp17_;
+			gint _tmp18_;
+			gpointer _tmp19_;
+			BatchImportResult* _tmp20_;
+			GFile* _tmp21_;
 #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp14_ = _result_index;
 #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5180,7 +5014,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 			if (!(_tmp15_ < _tmp16_)) {
 #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 5184 "LibraryMonitor.c"
+#line 5018 "LibraryMonitor.c"
 			}
 #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp17_ = _result_list;
@@ -5196,10 +5030,10 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 			_tmp21_ = _tmp20_->file;
 #line 682 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp21_ != NULL) {
-#line 5200 "LibraryMonitor.c"
-				GeeHashSet* _tmp22_ = NULL;
-				BatchImportResult* _tmp23_ = NULL;
-				GFile* _tmp24_ = NULL;
+#line 5034 "LibraryMonitor.c"
+				GeeHashSet* _tmp22_;
+				BatchImportResult* _tmp23_;
+				GFile* _tmp24_;
 #line 683 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp22_ = self->priv->pending_imports;
 #line 683 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5208,15 +5042,15 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 				_tmp24_ = _tmp23_->file;
 #line 683 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_);
-#line 5212 "LibraryMonitor.c"
+#line 5046 "LibraryMonitor.c"
 			}
 #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_batch_import_result_unref0 (_result_);
-#line 5216 "LibraryMonitor.c"
+#line 5050 "LibraryMonitor.c"
 		}
 #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_result_list);
-#line 5220 "LibraryMonitor.c"
+#line 5054 "LibraryMonitor.c"
 	}
 #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp25_ = manifest;
@@ -5228,23 +5062,23 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 	_tmp28_ = _tmp27_;
 #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp28_ > 0) {
-#line 5232 "LibraryMonitor.c"
+#line 5066 "LibraryMonitor.c"
 		GeeArrayList* to_tombstone = NULL;
-		GeeArrayList* _tmp29_ = NULL;
+		GeeArrayList* _tmp29_;
 #line 687 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp29_ = gee_array_list_new (TYPE_TOMBSTONED_FILE, (GBoxedCopyFunc) tombstoned_file_ref, (GDestroyNotify) tombstoned_file_unref, NULL, NULL, NULL);
 #line 687 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		to_tombstone = _tmp29_;
-#line 5239 "LibraryMonitor.c"
+#line 5073 "LibraryMonitor.c"
 		{
 			GeeList* _result_list = NULL;
-			ImportManifest* _tmp30_ = NULL;
-			GeeList* _tmp31_ = NULL;
-			GeeList* _tmp32_ = NULL;
+			ImportManifest* _tmp30_;
+			GeeList* _tmp31_;
+			GeeList* _tmp32_;
 			gint _result_size = 0;
-			GeeList* _tmp33_ = NULL;
-			gint _tmp34_ = 0;
-			gint _tmp35_ = 0;
+			GeeList* _tmp33_;
+			gint _tmp34_;
+			gint _tmp35_;
 			gint _result_index = 0;
 #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp30_ = manifest;
@@ -5266,26 +5100,26 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 			_result_index = -1;
 #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			while (TRUE) {
-#line 5270 "LibraryMonitor.c"
-				gint _tmp36_ = 0;
-				gint _tmp37_ = 0;
-				gint _tmp38_ = 0;
+#line 5104 "LibraryMonitor.c"
+				gint _tmp36_;
+				gint _tmp37_;
+				gint _tmp38_;
 				BatchImportResult* _result_ = NULL;
-				GeeList* _tmp39_ = NULL;
-				gint _tmp40_ = 0;
-				gpointer _tmp41_ = NULL;
+				GeeList* _tmp39_;
+				gint _tmp40_;
+				gpointer _tmp41_;
 				GFileInfo* info = NULL;
-				BatchImportResult* _tmp42_ = NULL;
-				GFile* _tmp43_ = NULL;
-				GFileInfo* _tmp44_ = NULL;
-				GFileInfo* _tmp45_ = NULL;
-				GeeArrayList* _tmp50_ = NULL;
-				BatchImportResult* _tmp51_ = NULL;
-				GFile* _tmp52_ = NULL;
-				GFileInfo* _tmp53_ = NULL;
-				gint64 _tmp54_ = 0LL;
-				TombstonedFile* _tmp55_ = NULL;
-				TombstonedFile* _tmp56_ = NULL;
+				BatchImportResult* _tmp42_;
+				GFile* _tmp43_;
+				GFileInfo* _tmp44_;
+				GFileInfo* _tmp45_;
+				GeeArrayList* _tmp50_;
+				BatchImportResult* _tmp51_;
+				GFile* _tmp52_;
+				GFileInfo* _tmp53_;
+				gint64 _tmp54_;
+				TombstonedFile* _tmp55_;
+				TombstonedFile* _tmp56_;
 #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp36_ = _result_index;
 #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5298,7 +5132,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 				if (!(_tmp37_ < _tmp38_)) {
 #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					break;
-#line 5302 "LibraryMonitor.c"
+#line 5136 "LibraryMonitor.c"
 				}
 #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp39_ = _result_list;
@@ -5320,11 +5154,11 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 				_tmp45_ = info;
 #line 690 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				if (_tmp45_ == NULL) {
-#line 5324 "LibraryMonitor.c"
-					BatchImportResult* _tmp46_ = NULL;
-					GFile* _tmp47_ = NULL;
-					gchar* _tmp48_ = NULL;
-					gchar* _tmp49_ = NULL;
+#line 5158 "LibraryMonitor.c"
+					BatchImportResult* _tmp46_;
+					GFile* _tmp47_;
+					gchar* _tmp48_;
+					gchar* _tmp49_;
 #line 691 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp46_ = _result_;
 #line 691 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5343,7 +5177,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 					_batch_import_result_unref0 (_result_);
 #line 693 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					continue;
-#line 5347 "LibraryMonitor.c"
+#line 5181 "LibraryMonitor.c"
 				}
 #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp50_ = to_tombstone;
@@ -5367,14 +5201,14 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 				_g_object_unref0 (info);
 #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5371 "LibraryMonitor.c"
+#line 5205 "LibraryMonitor.c"
 			}
 #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (_result_list);
-#line 5375 "LibraryMonitor.c"
+#line 5209 "LibraryMonitor.c"
 		}
 		{
-			GeeArrayList* _tmp57_ = NULL;
+			GeeArrayList* _tmp57_;
 #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp57_ = to_tombstone;
 #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5383,8 +5217,8 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5387 "LibraryMonitor.c"
-					goto __catch486_database_error;
+#line 5221 "LibraryMonitor.c"
+					goto __catch487_database_error;
 				}
 #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (to_tombstone);
@@ -5394,14 +5228,14 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 				g_clear_error (&_inner_error_);
 #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				return;
-#line 5398 "LibraryMonitor.c"
+#line 5232 "LibraryMonitor.c"
 			}
 		}
-		goto __finally486;
-		__catch486_database_error:
+		goto __finally487;
+		__catch487_database_error:
 		{
 			GError* err = NULL;
-			GError* _tmp58_ = NULL;
+			GError* _tmp58_;
 #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			err = _inner_error_;
 #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5412,9 +5246,9 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 			app_window_database_error (_tmp58_);
 #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_error_free0 (err);
-#line 5416 "LibraryMonitor.c"
+#line 5250 "LibraryMonitor.c"
 		}
-		__finally486:
+		__finally487:
 #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5425,11 +5259,11 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 			g_clear_error (&_inner_error_);
 #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return;
-#line 5429 "LibraryMonitor.c"
+#line 5263 "LibraryMonitor.c"
 		}
 #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (to_tombstone);
-#line 5433 "LibraryMonitor.c"
+#line 5267 "LibraryMonitor.c"
 	}
 #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp59_ = self->priv->pending_imports;
@@ -5449,17 +5283,17 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 	library_monitor_discard_current_batch_import (self);
 #line 709 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_schedule_next_batch_import (self);
-#line 5453 "LibraryMonitor.c"
+#line 5287 "LibraryMonitor.c"
 }
 
 
 void library_monitor_blacklist_file (GFile* file, const gchar* reason) {
-	const gchar* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	GFile* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 725 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
@@ -5483,33 +5317,33 @@ void library_monitor_blacklist_file (GFile* file, const gchar* reason) {
 	_g_free0 (_tmp5_);
 #line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_free0 (_tmp3_);
-#line 5487 "LibraryMonitor.c"
+#line 5321 "LibraryMonitor.c"
 	{
-		GeeHashSet* _tmp6_ = NULL;
+		GeeHashSet* _tmp6_;
 #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp6_ = library_monitor_blacklist;
 #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_rec_mutex_lock (&__lock_library_monitor_blacklist);
-#line 5494 "LibraryMonitor.c"
+#line 5328 "LibraryMonitor.c"
 		{
-			GeeHashSet* _tmp7_ = NULL;
-			GFile* _tmp8_ = NULL;
+			GeeHashSet* _tmp7_;
+			GFile* _tmp8_;
 #line 728 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp7_ = library_monitor_blacklist;
 #line 728 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp8_ = file;
 #line 728 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_);
-#line 5504 "LibraryMonitor.c"
+#line 5338 "LibraryMonitor.c"
 		}
-		__finally487:
+		__finally488:
 		{
-			GeeHashSet* _tmp9_ = NULL;
+			GeeHashSet* _tmp9_;
 #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp9_ = library_monitor_blacklist;
 #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			g_rec_mutex_unlock (&__lock_library_monitor_blacklist);
-#line 5513 "LibraryMonitor.c"
+#line 5347 "LibraryMonitor.c"
 		}
 #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5519,7 +5353,7 @@ void library_monitor_blacklist_file (GFile* file, const gchar* reason) {
 			g_clear_error (&_inner_error_);
 #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return;
-#line 5523 "LibraryMonitor.c"
+#line 5357 "LibraryMonitor.c"
 		}
 	}
 }
@@ -5529,19 +5363,19 @@ void library_monitor_unblacklist_file (GFile* file) {
 	GError * _inner_error_ = NULL;
 #line 732 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 5533 "LibraryMonitor.c"
+#line 5367 "LibraryMonitor.c"
 	{
-		GeeHashSet* _tmp0_ = NULL;
+		GeeHashSet* _tmp0_;
 #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = library_monitor_blacklist;
 #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_rec_mutex_lock (&__lock_library_monitor_blacklist);
-#line 5540 "LibraryMonitor.c"
+#line 5374 "LibraryMonitor.c"
 		{
 			gboolean _tmp1_ = FALSE;
-			GeeHashSet* _tmp2_ = NULL;
-			GFile* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+			GeeHashSet* _tmp2_;
+			GFile* _tmp3_;
+			gboolean _tmp4_;
 #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp2_ = library_monitor_blacklist;
 #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5550,10 +5384,10 @@ void library_monitor_unblacklist_file (GFile* file) {
 			_tmp4_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp3_);
 #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp4_) {
-#line 5554 "LibraryMonitor.c"
-				HashTimedQueue* _tmp5_ = NULL;
-				GFile* _tmp6_ = NULL;
-				gboolean _tmp7_ = FALSE;
+#line 5388 "LibraryMonitor.c"
+				HashTimedQueue* _tmp5_;
+				GFile* _tmp6_;
+				gboolean _tmp7_;
 #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp5_ = library_monitor_to_unblacklist;
 #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5562,34 +5396,34 @@ void library_monitor_unblacklist_file (GFile* file) {
 				_tmp7_ = timed_queue_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_TIMED_QUEUE, TimedQueue), _tmp6_);
 #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp1_ = !_tmp7_;
-#line 5566 "LibraryMonitor.c"
+#line 5400 "LibraryMonitor.c"
 			} else {
 #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp1_ = FALSE;
-#line 5570 "LibraryMonitor.c"
+#line 5404 "LibraryMonitor.c"
 			}
 #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp1_) {
-#line 5574 "LibraryMonitor.c"
-				HashTimedQueue* _tmp8_ = NULL;
-				GFile* _tmp9_ = NULL;
+#line 5408 "LibraryMonitor.c"
+				HashTimedQueue* _tmp8_;
+				GFile* _tmp9_;
 #line 737 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp8_ = library_monitor_to_unblacklist;
 #line 737 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp9_ = file;
 #line 737 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				timed_queue_enqueue (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_TIMED_QUEUE, TimedQueue), _tmp9_);
-#line 5583 "LibraryMonitor.c"
+#line 5417 "LibraryMonitor.c"
 			}
 		}
-		__finally488:
+		__finally489:
 		{
-			GeeHashSet* _tmp10_ = NULL;
+			GeeHashSet* _tmp10_;
 #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp10_ = library_monitor_blacklist;
 #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			g_rec_mutex_unlock (&__lock_library_monitor_blacklist);
-#line 5593 "LibraryMonitor.c"
+#line 5427 "LibraryMonitor.c"
 		}
 #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5599,7 +5433,7 @@ void library_monitor_unblacklist_file (GFile* file) {
 			g_clear_error (&_inner_error_);
 #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return;
-#line 5603 "LibraryMonitor.c"
+#line 5437 "LibraryMonitor.c"
 		}
 	}
 }
@@ -5610,18 +5444,18 @@ static void library_monitor_on_unblacklist_file (GFile* file) {
 	GError * _inner_error_ = NULL;
 #line 741 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 5614 "LibraryMonitor.c"
+#line 5448 "LibraryMonitor.c"
 	{
-		GeeHashSet* _tmp0_ = NULL;
+		GeeHashSet* _tmp0_;
 #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = library_monitor_blacklist;
 #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_rec_mutex_lock (&__lock_library_monitor_blacklist);
-#line 5621 "LibraryMonitor.c"
+#line 5455 "LibraryMonitor.c"
 		{
-			GeeHashSet* _tmp1_ = NULL;
-			GFile* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GeeHashSet* _tmp1_;
+			GFile* _tmp2_;
+			gboolean _tmp3_;
 #line 744 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp1_ = library_monitor_blacklist;
 #line 744 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5630,16 +5464,16 @@ static void library_monitor_on_unblacklist_file (GFile* file) {
 			_tmp3_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_);
 #line 744 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			removed = _tmp3_;
-#line 5634 "LibraryMonitor.c"
+#line 5468 "LibraryMonitor.c"
 		}
-		__finally489:
+		__finally490:
 		{
-			GeeHashSet* _tmp4_ = NULL;
+			GeeHashSet* _tmp4_;
 #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp4_ = library_monitor_blacklist;
 #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			g_rec_mutex_unlock (&__lock_library_monitor_blacklist);
-#line 5643 "LibraryMonitor.c"
+#line 5477 "LibraryMonitor.c"
 		}
 #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5649,17 +5483,17 @@ static void library_monitor_on_unblacklist_file (GFile* file) {
 			g_clear_error (&_inner_error_);
 #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return;
-#line 5653 "LibraryMonitor.c"
+#line 5487 "LibraryMonitor.c"
 		}
 	}
 #line 747 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (removed) {
-#line 5658 "LibraryMonitor.c"
-		GFile* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+#line 5492 "LibraryMonitor.c"
+		GFile* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp5_ = file;
 #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5676,11 +5510,11 @@ static void library_monitor_on_unblacklist_file (GFile* file) {
 		_g_free0 (_tmp9_);
 #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_free0 (_tmp7_);
-#line 5680 "LibraryMonitor.c"
+#line 5514 "LibraryMonitor.c"
 	} else {
-		GFile* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
+		GFile* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
 #line 750 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp10_ = file;
 #line 750 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5691,7 +5525,7 @@ static void library_monitor_on_unblacklist_file (GFile* file) {
 		g_warning ("LibraryMonitor.vala:750: File %s was not blacklisted but unblacklisted", _tmp12_);
 #line 750 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_free0 (_tmp12_);
-#line 5695 "LibraryMonitor.c"
+#line 5529 "LibraryMonitor.c"
 	}
 }
 
@@ -5701,19 +5535,19 @@ gboolean library_monitor_is_blacklisted (GFile* file) {
 	GError * _inner_error_ = NULL;
 #line 753 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 5705 "LibraryMonitor.c"
+#line 5539 "LibraryMonitor.c"
 	{
-		GeeHashSet* _tmp0_ = NULL;
+		GeeHashSet* _tmp0_;
 		gboolean _tmp6_ = FALSE;
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = library_monitor_blacklist;
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_rec_mutex_lock (&__lock_library_monitor_blacklist);
-#line 5713 "LibraryMonitor.c"
+#line 5547 "LibraryMonitor.c"
 		{
-			GeeHashSet* _tmp1_ = NULL;
-			GFile* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GeeHashSet* _tmp1_;
+			GFile* _tmp2_;
+			gboolean _tmp3_;
 #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp1_ = library_monitor_blacklist;
 #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5722,27 +5556,27 @@ gboolean library_monitor_is_blacklisted (GFile* file) {
 			_tmp3_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_);
 #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			result = _tmp3_;
-#line 5726 "LibraryMonitor.c"
+#line 5560 "LibraryMonitor.c"
 			{
-				GeeHashSet* _tmp4_ = NULL;
+				GeeHashSet* _tmp4_;
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp4_ = library_monitor_blacklist;
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				g_rec_mutex_unlock (&__lock_library_monitor_blacklist);
-#line 5733 "LibraryMonitor.c"
+#line 5567 "LibraryMonitor.c"
 			}
 #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return result;
-#line 5737 "LibraryMonitor.c"
+#line 5571 "LibraryMonitor.c"
 		}
-		__finally490:
+		__finally491:
 		{
-			GeeHashSet* _tmp5_ = NULL;
+			GeeHashSet* _tmp5_;
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp5_ = library_monitor_blacklist;
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			g_rec_mutex_unlock (&__lock_library_monitor_blacklist);
-#line 5746 "LibraryMonitor.c"
+#line 5580 "LibraryMonitor.c"
 		}
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5750,19 +5584,19 @@ gboolean library_monitor_is_blacklisted (GFile* file) {
 		g_clear_error (&_inner_error_);
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return _tmp6_;
-#line 5754 "LibraryMonitor.c"
+#line 5588 "LibraryMonitor.c"
 	}
 }
 
 
 static gboolean library_monitor_is_supported_filetype (LibraryMonitor* self, GFile* file) {
 	gboolean result = FALSE;
-	MediaCollectionRegistry* _tmp0_ = NULL;
-	MediaCollectionRegistry* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	MediaSourceCollection* _tmp3_ = NULL;
-	MediaSourceCollection* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	MediaCollectionRegistry* _tmp0_;
+	MediaCollectionRegistry* _tmp1_;
+	GFile* _tmp2_;
+	MediaSourceCollection* _tmp3_;
+	MediaSourceCollection* _tmp4_;
+	gboolean _tmp5_;
 #line 759 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_val_if_fail (IS_LIBRARY_MONITOR (self), FALSE);
 #line 759 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5787,14 +5621,14 @@ static gboolean library_monitor_is_supported_filetype (LibraryMonitor* self, GFi
 	result = _tmp5_;
 #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 5791 "LibraryMonitor.c"
+#line 5625 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	GeeArrayList* to_import = NULL;
-	GeeArrayList* _tmp42_ = NULL;
+	GeeArrayList* _tmp42_;
 #line 765 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 766 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5803,17 +5637,17 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 	if (!_tmp0_) {
 #line 767 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 5807 "LibraryMonitor.c"
+#line 5641 "LibraryMonitor.c"
 	}
 #line 769 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	to_import = NULL;
-#line 5811 "LibraryMonitor.c"
+#line 5645 "LibraryMonitor.c"
 	{
 		GeeIterator* _file_it = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
+		GeeCollection* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeIterator* _tmp3_;
+		GeeIterator* _tmp4_;
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = directory_monitor_get_files (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5828,30 +5662,30 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 		_file_it = _tmp4_;
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 5832 "LibraryMonitor.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+#line 5666 "LibraryMonitor.c"
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			GFile* file = NULL;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
 			GFileInfo* info = NULL;
-			GFile* _tmp9_ = NULL;
-			GFileInfo* _tmp10_ = NULL;
+			GFile* _tmp9_;
+			GFileInfo* _tmp10_;
 			gboolean _tmp11_ = FALSE;
-			GFileInfo* _tmp12_ = NULL;
-			GeeHashSet* _tmp15_ = NULL;
-			GFile* _tmp16_ = NULL;
-			gboolean _tmp17_ = FALSE;
-			TombstoneSourceCollection* _tmp18_ = NULL;
-			GFile* _tmp19_ = NULL;
-			gboolean _tmp20_ = FALSE;
+			GFileInfo* _tmp12_;
+			GeeHashSet* _tmp15_;
+			GFile* _tmp16_;
+			gboolean _tmp17_;
+			TombstoneSourceCollection* _tmp18_;
+			GFile* _tmp19_;
+			gboolean _tmp20_;
 			gboolean represented = FALSE;
-			gboolean _tmp35_ = FALSE;
-			GFile* _tmp36_ = NULL;
-			gboolean _tmp37_ = FALSE;
-			GeeArrayList* _tmp38_ = NULL;
-			GeeArrayList* _tmp40_ = NULL;
-			GFile* _tmp41_ = NULL;
+			gboolean _tmp35_;
+			GFile* _tmp36_;
+			gboolean _tmp37_;
+			GeeArrayList* _tmp38_;
+			GeeArrayList* _tmp40_;
+			GFile* _tmp41_;
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp5_ = _file_it;
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5860,7 +5694,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 			if (!_tmp6_) {
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 5864 "LibraryMonitor.c"
+#line 5698 "LibraryMonitor.c"
 			}
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp7_ = _file_it;
@@ -5880,17 +5714,17 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 			if (_tmp12_ == NULL) {
 #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp11_ = TRUE;
-#line 5884 "LibraryMonitor.c"
+#line 5718 "LibraryMonitor.c"
 			} else {
-				GFileInfo* _tmp13_ = NULL;
-				GFileType _tmp14_ = 0;
+				GFileInfo* _tmp13_;
+				GFileType _tmp14_;
 #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp13_ = info;
 #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp14_ = g_file_info_get_file_type (_tmp13_);
 #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp11_ = _tmp14_ != G_FILE_TYPE_REGULAR;
-#line 5894 "LibraryMonitor.c"
+#line 5728 "LibraryMonitor.c"
 			}
 #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp11_) {
@@ -5900,7 +5734,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 				_g_object_unref0 (file);
 #line 773 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 5904 "LibraryMonitor.c"
+#line 5738 "LibraryMonitor.c"
 			}
 #line 775 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp15_ = self->priv->pending_imports;
@@ -5916,7 +5750,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 				_g_object_unref0 (file);
 #line 776 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 5920 "LibraryMonitor.c"
+#line 5754 "LibraryMonitor.c"
 			}
 #line 778 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp18_ = tombstone_global;
@@ -5932,19 +5766,19 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 				_g_object_unref0 (file);
 #line 779 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 5936 "LibraryMonitor.c"
+#line 5770 "LibraryMonitor.c"
 			}
 #line 781 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			represented = FALSE;
-#line 5940 "LibraryMonitor.c"
+#line 5774 "LibraryMonitor.c"
 			{
 				GeeList* _monitor_list = NULL;
-				GeeList* _tmp21_ = NULL;
-				GeeList* _tmp22_ = NULL;
+				GeeList* _tmp21_;
+				GeeList* _tmp22_;
 				gint _monitor_size = 0;
-				GeeList* _tmp23_ = NULL;
-				gint _tmp24_ = 0;
-				gint _tmp25_ = 0;
+				GeeList* _tmp23_;
+				gint _tmp24_;
+				gint _tmp25_;
 				gint _monitor_index = 0;
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp21_ = self->priv->monitors;
@@ -5964,17 +5798,17 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 				_monitor_index = -1;
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				while (TRUE) {
-#line 5968 "LibraryMonitor.c"
-					gint _tmp26_ = 0;
-					gint _tmp27_ = 0;
-					gint _tmp28_ = 0;
+#line 5802 "LibraryMonitor.c"
+					gint _tmp26_;
+					gint _tmp27_;
+					gint _tmp28_;
 					MediaMonitor* monitor = NULL;
-					GeeList* _tmp29_ = NULL;
-					gint _tmp30_ = 0;
-					gpointer _tmp31_ = NULL;
-					MediaMonitor* _tmp32_ = NULL;
-					GFile* _tmp33_ = NULL;
-					gboolean _tmp34_ = FALSE;
+					GeeList* _tmp29_;
+					gint _tmp30_;
+					gpointer _tmp31_;
+					MediaMonitor* _tmp32_;
+					GFile* _tmp33_;
+					gboolean _tmp34_;
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp26_ = _monitor_index;
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5987,7 +5821,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 					if (!(_tmp27_ < _tmp28_)) {
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						break;
-#line 5991 "LibraryMonitor.c"
+#line 5825 "LibraryMonitor.c"
 					}
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp29_ = _monitor_list;
@@ -6011,15 +5845,15 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 						_g_object_unref0 (monitor);
 #line 786 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						break;
-#line 6015 "LibraryMonitor.c"
+#line 5849 "LibraryMonitor.c"
 					}
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_g_object_unref0 (monitor);
-#line 6019 "LibraryMonitor.c"
+#line 5853 "LibraryMonitor.c"
 				}
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (_monitor_list);
-#line 6023 "LibraryMonitor.c"
+#line 5857 "LibraryMonitor.c"
 			}
 #line 790 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp35_ = represented;
@@ -6031,7 +5865,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 				_g_object_unref0 (file);
 #line 791 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 6035 "LibraryMonitor.c"
+#line 5869 "LibraryMonitor.c"
 			}
 #line 793 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp36_ = file;
@@ -6045,21 +5879,21 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 				_g_object_unref0 (file);
 #line 794 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 6049 "LibraryMonitor.c"
+#line 5883 "LibraryMonitor.c"
 			}
 #line 796 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp38_ = to_import;
 #line 796 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp38_ == NULL) {
-#line 6055 "LibraryMonitor.c"
-				GeeArrayList* _tmp39_ = NULL;
+#line 5889 "LibraryMonitor.c"
+				GeeArrayList* _tmp39_;
 #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp39_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (to_import);
 #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				to_import = _tmp39_;
-#line 6063 "LibraryMonitor.c"
+#line 5897 "LibraryMonitor.c"
 			}
 #line 799 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp40_ = to_import;
@@ -6071,34 +5905,34 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 			_g_object_unref0 (info);
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (file);
-#line 6075 "LibraryMonitor.c"
+#line 5909 "LibraryMonitor.c"
 		}
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_file_it);
-#line 6079 "LibraryMonitor.c"
+#line 5913 "LibraryMonitor.c"
 	}
 #line 802 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp42_ = to_import;
 #line 802 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp42_ != NULL) {
-#line 6085 "LibraryMonitor.c"
-		GeeArrayList* _tmp43_ = NULL;
+#line 5919 "LibraryMonitor.c"
+		GeeArrayList* _tmp43_;
 #line 803 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp43_ = to_import;
 #line 803 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_enqueue_import_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 6091 "LibraryMonitor.c"
+#line 5925 "LibraryMonitor.c"
 	}
 #line 765 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (to_import);
-#line 6095 "LibraryMonitor.c"
+#line 5929 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* self, GFile* file) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp2_;
 #line 808 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 808 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6107,27 +5941,27 @@ static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* sel
 	_tmp2_ = self->priv->auto_import;
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp2_) {
-#line 6111 "LibraryMonitor.c"
-		GFile* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+#line 5945 "LibraryMonitor.c"
+		GFile* _tmp3_;
+		gboolean _tmp4_;
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp3_ = file;
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp4_ = library_monitor_is_supported_filetype (self, _tmp3_);
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = _tmp4_;
-#line 6120 "LibraryMonitor.c"
+#line 5954 "LibraryMonitor.c"
 	} else {
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = FALSE;
-#line 6124 "LibraryMonitor.c"
+#line 5958 "LibraryMonitor.c"
 	}
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp1_) {
-#line 6128 "LibraryMonitor.c"
-		TombstoneSourceCollection* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+#line 5962 "LibraryMonitor.c"
+		TombstoneSourceCollection* _tmp5_;
+		GFile* _tmp6_;
+		gboolean _tmp7_;
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp5_ = tombstone_global;
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6136,21 +5970,21 @@ static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* sel
 		_tmp7_ = tombstone_source_collection_matches (_tmp5_, _tmp6_);
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = !_tmp7_;
-#line 6140 "LibraryMonitor.c"
+#line 5974 "LibraryMonitor.c"
 	} else {
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = FALSE;
-#line 6144 "LibraryMonitor.c"
+#line 5978 "LibraryMonitor.c"
 	}
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp0_) {
-#line 6148 "LibraryMonitor.c"
-		GFile* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
+#line 5982 "LibraryMonitor.c"
+		GFile* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		GFile* _tmp13_;
 #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp8_ = file;
 #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6171,20 +6005,20 @@ static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* sel
 		_tmp13_ = file;
 #line 811 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_enqueue_import (self, _tmp13_);
-#line 6175 "LibraryMonitor.c"
+#line 6009 "LibraryMonitor.c"
 	}
 }
 
 
 static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GFile* file, GFileInfo* info) {
 	LibraryMonitor * self;
-	GFile* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GFile* _tmp0_;
+	gboolean _tmp1_;
 	gboolean known = FALSE;
-	gboolean _tmp19_ = FALSE;
-	gboolean _tmp98_ = FALSE;
-	GFile* _tmp100_ = NULL;
-	GFileInfo* _tmp101_ = NULL;
+	gboolean _tmp19_;
+	gboolean _tmp98_;
+	GFile* _tmp100_;
+	GFileInfo* _tmp101_;
 #line 815 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor);
 #line 815 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6197,9 +6031,9 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 	_tmp1_ = library_monitor_is_blacklisted (_tmp0_);
 #line 816 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp1_) {
-#line 6201 "LibraryMonitor.c"
-		GFile* _tmp2_ = NULL;
-		GFileInfo* _tmp3_ = NULL;
+#line 6035 "LibraryMonitor.c"
+		GFile* _tmp2_;
+		GFileInfo* _tmp3_;
 #line 817 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = file;
 #line 817 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6208,19 +6042,19 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 		DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_created (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_, _tmp3_);
 #line 819 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 6212 "LibraryMonitor.c"
+#line 6046 "LibraryMonitor.c"
 	}
 #line 822 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 6216 "LibraryMonitor.c"
+#line 6050 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
-		GeeList* _tmp4_ = NULL;
-		GeeList* _tmp5_ = NULL;
+		GeeList* _tmp4_;
+		GeeList* _tmp5_;
 		gint _monitor_size = 0;
-		GeeList* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
+		GeeList* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
 		gint _monitor_index = 0;
 #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp4_ = self->priv->monitors;
@@ -6240,18 +6074,18 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 		_monitor_index = -1;
 #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 6244 "LibraryMonitor.c"
-			gint _tmp9_ = 0;
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
+#line 6078 "LibraryMonitor.c"
+			gint _tmp9_;
+			gint _tmp10_;
+			gint _tmp11_;
 			MediaMonitor* monitor = NULL;
-			GeeList* _tmp12_ = NULL;
-			gint _tmp13_ = 0;
-			gpointer _tmp14_ = NULL;
-			MediaMonitor* _tmp15_ = NULL;
-			GFile* _tmp16_ = NULL;
-			GFileInfo* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
+			GeeList* _tmp12_;
+			gint _tmp13_;
+			gpointer _tmp14_;
+			MediaMonitor* _tmp15_;
+			GFile* _tmp16_;
+			GFileInfo* _tmp17_;
+			gboolean _tmp18_;
 #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp9_ = _monitor_index;
 #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6264,7 +6098,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 			if (!(_tmp10_ < _tmp11_)) {
 #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 6268 "LibraryMonitor.c"
+#line 6102 "LibraryMonitor.c"
 			}
 #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp12_ = _monitor_list;
@@ -6290,36 +6124,36 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 				_g_object_unref0 (monitor);
 #line 827 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 6294 "LibraryMonitor.c"
+#line 6128 "LibraryMonitor.c"
 			}
 #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 6298 "LibraryMonitor.c"
+#line 6132 "LibraryMonitor.c"
 		}
 #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 6302 "LibraryMonitor.c"
+#line 6136 "LibraryMonitor.c"
 	}
 #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp19_ = known;
 #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp19_) {
-#line 6308 "LibraryMonitor.c"
+#line 6142 "LibraryMonitor.c"
 		GeeHashSet* all_candidates = NULL;
 		gboolean _tmp78_ = FALSE;
 		gboolean _tmp79_ = FALSE;
-		gboolean _tmp80_ = FALSE;
+		gboolean _tmp80_;
 #line 833 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		all_candidates = NULL;
-#line 6315 "LibraryMonitor.c"
+#line 6149 "LibraryMonitor.c"
 		{
 			GeeList* _monitor_list = NULL;
-			GeeList* _tmp20_ = NULL;
-			GeeList* _tmp21_ = NULL;
+			GeeList* _tmp20_;
+			GeeList* _tmp21_;
 			gint _monitor_size = 0;
-			GeeList* _tmp22_ = NULL;
-			gint _tmp23_ = 0;
-			gint _tmp24_ = 0;
+			GeeList* _tmp22_;
+			gint _tmp23_;
+			gint _tmp24_;
 			gint _monitor_index = 0;
 #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp20_ = self->priv->monitors;
@@ -6339,23 +6173,23 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 			_monitor_index = -1;
 #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			while (TRUE) {
-#line 6343 "LibraryMonitor.c"
-				gint _tmp25_ = 0;
-				gint _tmp26_ = 0;
-				gint _tmp27_ = 0;
+#line 6177 "LibraryMonitor.c"
+				gint _tmp25_;
+				gint _tmp26_;
+				gint _tmp27_;
 				MediaMonitor* monitor = NULL;
-				GeeList* _tmp28_ = NULL;
-				gint _tmp29_ = 0;
-				gpointer _tmp30_ = NULL;
+				GeeList* _tmp28_;
+				gint _tmp29_;
+				gpointer _tmp30_;
 				MediaMonitorDiscoveredFile _result_ = 0;
 				GeeCollection* candidates = NULL;
-				MediaMonitor* _tmp31_ = NULL;
-				GFile* _tmp32_ = NULL;
-				GFileInfo* _tmp33_ = NULL;
+				MediaMonitor* _tmp31_;
+				GFile* _tmp32_;
+				GFileInfo* _tmp33_;
 				MediaMonitorDiscoveredFile _tmp34_ = 0;
-				GeeCollection* _tmp35_ = NULL;
+				GeeCollection* _tmp35_;
 				gboolean _tmp36_ = FALSE;
-				MediaMonitorDiscoveredFile _tmp37_ = 0;
+				MediaMonitorDiscoveredFile _tmp37_;
 #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp25_ = _monitor_index;
 #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6368,7 +6202,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 				if (!(_tmp26_ < _tmp27_)) {
 #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					break;
-#line 6372 "LibraryMonitor.c"
+#line 6206 "LibraryMonitor.c"
 				}
 #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp28_ = _monitor_list;
@@ -6396,28 +6230,28 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 				if (_tmp37_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) {
 #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp36_ = TRUE;
-#line 6400 "LibraryMonitor.c"
+#line 6234 "LibraryMonitor.c"
 				} else {
-					MediaMonitorDiscoveredFile _tmp38_ = 0;
+					MediaMonitorDiscoveredFile _tmp38_;
 #line 839 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp38_ = _result_;
 #line 839 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp36_ = _tmp38_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE;
-#line 6407 "LibraryMonitor.c"
+#line 6241 "LibraryMonitor.c"
 				}
 #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				if (_tmp36_) {
-#line 6411 "LibraryMonitor.c"
-					MediaMonitor* _tmp39_ = NULL;
-					gchar* _tmp40_ = NULL;
-					gchar* _tmp41_ = NULL;
-					MediaMonitorDiscoveredFile _tmp42_ = 0;
+#line 6245 "LibraryMonitor.c"
+					MediaMonitor* _tmp39_;
+					gchar* _tmp40_;
+					gchar* _tmp41_;
+					MediaMonitorDiscoveredFile _tmp42_;
 					GEnumValue* _tmp43_;
-					GFile* _tmp44_ = NULL;
-					gchar* _tmp45_ = NULL;
-					gchar* _tmp46_ = NULL;
-					gchar* _tmp47_ = NULL;
-					gchar* _tmp48_ = NULL;
+					GFile* _tmp44_;
+					gchar* _tmp45_;
+					gchar* _tmp46_;
+					gchar* _tmp47_;
+					gchar* _tmp48_;
 #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp39_ = monitor;
 #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6454,18 +6288,18 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 					_g_object_unref0 (monitor);
 #line 845 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					break;
-#line 6458 "LibraryMonitor.c"
+#line 6292 "LibraryMonitor.c"
 				} else {
 					gboolean _tmp49_ = FALSE;
-					GeeCollection* _tmp50_ = NULL;
+					GeeCollection* _tmp50_;
 #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp50_ = candidates;
 #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_tmp50_ != NULL) {
-#line 6466 "LibraryMonitor.c"
-						GeeCollection* _tmp51_ = NULL;
-						gint _tmp52_ = 0;
-						gint _tmp53_ = 0;
+#line 6300 "LibraryMonitor.c"
+						GeeCollection* _tmp51_;
+						gint _tmp52_;
+						gint _tmp53_;
 #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp51_ = candidates;
 #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6474,27 +6308,27 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 						_tmp53_ = _tmp52_;
 #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp49_ = _tmp53_ > 0;
-#line 6478 "LibraryMonitor.c"
+#line 6312 "LibraryMonitor.c"
 					} else {
 #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp49_ = FALSE;
-#line 6482 "LibraryMonitor.c"
+#line 6316 "LibraryMonitor.c"
 					}
 #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_tmp49_) {
-#line 6486 "LibraryMonitor.c"
-						MediaMonitor* _tmp54_ = NULL;
-						gchar* _tmp55_ = NULL;
-						gchar* _tmp56_ = NULL;
-						GeeCollection* _tmp57_ = NULL;
-						gint _tmp58_ = 0;
-						gint _tmp59_ = 0;
-						GFile* _tmp60_ = NULL;
-						gchar* _tmp61_ = NULL;
-						gchar* _tmp62_ = NULL;
-						gchar* _tmp63_ = NULL;
-						gchar* _tmp64_ = NULL;
-						GeeHashSet* _tmp65_ = NULL;
+#line 6320 "LibraryMonitor.c"
+						MediaMonitor* _tmp54_;
+						gchar* _tmp55_;
+						gchar* _tmp56_;
+						GeeCollection* _tmp57_;
+						gint _tmp58_;
+						gint _tmp59_;
+						GFile* _tmp60_;
+						gchar* _tmp61_;
+						gchar* _tmp62_;
+						gchar* _tmp63_;
+						gchar* _tmp64_;
+						GeeHashSet* _tmp65_;
 #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp54_ = monitor;
 #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6529,20 +6363,20 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 						_tmp65_ = all_candidates;
 #line 850 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						if (_tmp65_ == NULL) {
-#line 6533 "LibraryMonitor.c"
-							GeeHashSet* _tmp66_ = NULL;
+#line 6367 "LibraryMonitor.c"
+							GeeHashSet* _tmp66_;
 #line 851 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_tmp66_ = gee_hash_set_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 851 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_g_object_unref0 (all_candidates);
 #line 851 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							all_candidates = _tmp66_;
-#line 6541 "LibraryMonitor.c"
+#line 6375 "LibraryMonitor.c"
 						}
 						{
 							GeeIterator* _candidate_it = NULL;
-							GeeCollection* _tmp67_ = NULL;
-							GeeIterator* _tmp68_ = NULL;
+							GeeCollection* _tmp67_;
+							GeeIterator* _tmp68_;
 #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_tmp67_ = candidates;
 #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6551,15 +6385,15 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 							_candidate_it = _tmp68_;
 #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							while (TRUE) {
-#line 6555 "LibraryMonitor.c"
-								GeeIterator* _tmp69_ = NULL;
-								gboolean _tmp70_ = FALSE;
+#line 6389 "LibraryMonitor.c"
+								GeeIterator* _tmp69_;
+								gboolean _tmp70_;
 								Monitorable* candidate = NULL;
-								GeeIterator* _tmp71_ = NULL;
-								gpointer _tmp72_ = NULL;
-								MediaMonitor* _tmp73_ = NULL;
-								Monitorable* _tmp74_ = NULL;
-								gboolean _tmp75_ = FALSE;
+								GeeIterator* _tmp71_;
+								gpointer _tmp72_;
+								MediaMonitor* _tmp73_;
+								Monitorable* _tmp74_;
+								gboolean _tmp75_;
 #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 								_tmp69_ = _candidate_it;
 #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6568,7 +6402,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 								if (!_tmp70_) {
 #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 									break;
-#line 6572 "LibraryMonitor.c"
+#line 6406 "LibraryMonitor.c"
 								}
 #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 								_tmp71_ = _candidate_it;
@@ -6584,24 +6418,24 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 								_tmp75_ = media_monitor_is_offline (_tmp73_, _tmp74_);
 #line 854 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 								if (_tmp75_) {
-#line 6588 "LibraryMonitor.c"
-									GeeHashSet* _tmp76_ = NULL;
-									Monitorable* _tmp77_ = NULL;
+#line 6422 "LibraryMonitor.c"
+									GeeHashSet* _tmp76_;
+									Monitorable* _tmp77_;
 #line 855 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 									_tmp76_ = all_candidates;
 #line 855 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 									_tmp77_ = candidate;
 #line 855 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 									gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp77_);
-#line 6597 "LibraryMonitor.c"
+#line 6431 "LibraryMonitor.c"
 								}
 #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 								_g_object_unref0 (candidate);
-#line 6601 "LibraryMonitor.c"
+#line 6435 "LibraryMonitor.c"
 							}
 #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_g_object_unref0 (_candidate_it);
-#line 6605 "LibraryMonitor.c"
+#line 6439 "LibraryMonitor.c"
 						}
 					}
 				}
@@ -6609,34 +6443,34 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 				_g_object_unref0 (candidates);
 #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (monitor);
-#line 6613 "LibraryMonitor.c"
+#line 6447 "LibraryMonitor.c"
 			}
 #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (_monitor_list);
-#line 6617 "LibraryMonitor.c"
+#line 6451 "LibraryMonitor.c"
 		}
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp80_ = known;
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (!_tmp80_) {
-#line 6623 "LibraryMonitor.c"
-			GeeHashSet* _tmp81_ = NULL;
+#line 6457 "LibraryMonitor.c"
+			GeeHashSet* _tmp81_;
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp81_ = all_candidates;
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp79_ = _tmp81_ != NULL;
-#line 6629 "LibraryMonitor.c"
+#line 6463 "LibraryMonitor.c"
 		} else {
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp79_ = FALSE;
-#line 6633 "LibraryMonitor.c"
+#line 6467 "LibraryMonitor.c"
 		}
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp79_) {
-#line 6637 "LibraryMonitor.c"
-			GeeHashSet* _tmp82_ = NULL;
-			gint _tmp83_ = 0;
-			gint _tmp84_ = 0;
+#line 6471 "LibraryMonitor.c"
+			GeeHashSet* _tmp82_;
+			gint _tmp83_;
+			gint _tmp84_;
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp82_ = all_candidates;
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6645,28 +6479,28 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 			_tmp84_ = _tmp83_;
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp78_ = _tmp84_ > 0;
-#line 6649 "LibraryMonitor.c"
+#line 6483 "LibraryMonitor.c"
 		} else {
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp78_ = FALSE;
-#line 6653 "LibraryMonitor.c"
+#line 6487 "LibraryMonitor.c"
 		}
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp78_) {
-#line 6657 "LibraryMonitor.c"
-			GeeHashSet* _tmp85_ = NULL;
-			gint _tmp86_ = 0;
-			gint _tmp87_ = 0;
-			GFile* _tmp88_ = NULL;
-			gchar* _tmp89_ = NULL;
-			gchar* _tmp90_ = NULL;
-			gchar* _tmp91_ = NULL;
-			gchar* _tmp92_ = NULL;
-			Workers* _tmp93_ = NULL;
-			GFile* _tmp94_ = NULL;
-			GeeHashSet* _tmp95_ = NULL;
-			LibraryMonitorRuntimeFindMoveJob* _tmp96_ = NULL;
-			LibraryMonitorRuntimeFindMoveJob* _tmp97_ = NULL;
+#line 6491 "LibraryMonitor.c"
+			GeeHashSet* _tmp85_;
+			gint _tmp86_;
+			gint _tmp87_;
+			GFile* _tmp88_;
+			gchar* _tmp89_;
+			gchar* _tmp90_;
+			gchar* _tmp91_;
+			gchar* _tmp92_;
+			Workers* _tmp93_;
+			GFile* _tmp94_;
+			GeeHashSet* _tmp95_;
+			LibraryMonitorRuntimeFindMoveJob* _tmp96_;
+			LibraryMonitorRuntimeFindMoveJob* _tmp97_;
 #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp85_ = all_candidates;
 #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6705,23 +6539,23 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 			_background_job_unref0 (_tmp97_);
 #line 866 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			known = TRUE;
-#line 6709 "LibraryMonitor.c"
+#line 6543 "LibraryMonitor.c"
 		}
 #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (all_candidates);
-#line 6713 "LibraryMonitor.c"
+#line 6547 "LibraryMonitor.c"
 	}
 #line 870 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp98_ = known;
 #line 870 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp98_) {
-#line 6719 "LibraryMonitor.c"
-		GFile* _tmp99_ = NULL;
+#line 6553 "LibraryMonitor.c"
+		GFile* _tmp99_;
 #line 871 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp99_ = file;
 #line 871 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_runtime_unknown_file_discovered (self, _tmp99_);
-#line 6725 "LibraryMonitor.c"
+#line 6559 "LibraryMonitor.c"
 	}
 #line 873 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp100_ = file;
@@ -6729,18 +6563,18 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 	_tmp101_ = info;
 #line 873 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_created (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp100_, _tmp101_);
-#line 6733 "LibraryMonitor.c"
+#line 6567 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self, BackgroundJob* j) {
 	LibraryMonitorRuntimeFindMoveJob* job = NULL;
-	BackgroundJob* _tmp0_ = NULL;
-	LibraryMonitorRuntimeFindMoveJob* _tmp1_ = NULL;
-	LibraryMonitorRuntimeFindMoveJob* _tmp2_ = NULL;
-	GError* _tmp3_ = NULL;
-	LibraryMonitorRuntimeFindMoveJob* _tmp11_ = NULL;
-	Monitorable* _tmp12_ = NULL;
+	BackgroundJob* _tmp0_;
+	LibraryMonitorRuntimeFindMoveJob* _tmp1_;
+	LibraryMonitorRuntimeFindMoveJob* _tmp2_;
+	GError* _tmp3_;
+	LibraryMonitorRuntimeFindMoveJob* _tmp11_;
+	Monitorable* _tmp12_;
 #line 876 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 876 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6757,14 +6591,14 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self
 	_tmp3_ = _tmp2_->err;
 #line 879 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp3_ != NULL) {
-#line 6761 "LibraryMonitor.c"
-		LibraryMonitorRuntimeFindMoveJob* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		LibraryMonitorRuntimeFindMoveJob* _tmp8_ = NULL;
-		GError* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
+#line 6595 "LibraryMonitor.c"
+		LibraryMonitorRuntimeFindMoveJob* _tmp4_;
+		GFile* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		LibraryMonitorRuntimeFindMoveJob* _tmp8_;
+		GError* _tmp9_;
+		const gchar* _tmp10_;
 #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp4_ = job;
 #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6784,7 +6618,7 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self
 "or %s: %s", _tmp7_, _tmp10_);
 #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_free0 (_tmp7_);
-#line 6787 "LibraryMonitor.c"
+#line 6621 "LibraryMonitor.c"
 	}
 #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp11_ = job;
@@ -6792,19 +6626,19 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self
 	_tmp12_ = _tmp11_->match;
 #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp12_ != NULL) {
-#line 6795 "LibraryMonitor.c"
+#line 6629 "LibraryMonitor.c"
 		MediaMonitor* monitor = NULL;
-		LibraryMonitorRuntimeFindMoveJob* _tmp13_ = NULL;
-		Monitorable* _tmp14_ = NULL;
-		MediaMonitor* _tmp15_ = NULL;
-		MediaMonitor* _tmp16_ = NULL;
-		LibraryMonitorRuntimeFindMoveJob* _tmp17_ = NULL;
-		Monitorable* _tmp18_ = NULL;
-		LibraryMonitorRuntimeFindMoveJob* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		MediaMonitor* _tmp21_ = NULL;
-		LibraryMonitorRuntimeFindMoveJob* _tmp22_ = NULL;
-		Monitorable* _tmp23_ = NULL;
+		LibraryMonitorRuntimeFindMoveJob* _tmp13_;
+		Monitorable* _tmp14_;
+		MediaMonitor* _tmp15_;
+		MediaMonitor* _tmp16_;
+		LibraryMonitorRuntimeFindMoveJob* _tmp17_;
+		Monitorable* _tmp18_;
+		LibraryMonitorRuntimeFindMoveJob* _tmp19_;
+		GFile* _tmp20_;
+		MediaMonitor* _tmp21_;
+		LibraryMonitorRuntimeFindMoveJob* _tmp22_;
+		Monitorable* _tmp23_;
 #line 885 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp13_ = job;
 #line 885 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6835,34 +6669,34 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self
 		media_monitor_update_online (_tmp21_, _tmp23_);
 #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (monitor);
-#line 6838 "LibraryMonitor.c"
+#line 6672 "LibraryMonitor.c"
 	} else {
-		LibraryMonitorRuntimeFindMoveJob* _tmp24_ = NULL;
-		GFile* _tmp25_ = NULL;
+		LibraryMonitorRuntimeFindMoveJob* _tmp24_;
+		GFile* _tmp25_;
 #line 890 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp24_ = job;
 #line 890 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp25_ = _tmp24_->file;
 #line 890 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_runtime_unknown_file_discovered (self, _tmp25_);
-#line 6848 "LibraryMonitor.c"
+#line 6682 "LibraryMonitor.c"
 	}
 #line 876 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_background_job_unref0 (job);
-#line 6852 "LibraryMonitor.c"
+#line 6686 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFile* old_file, GFile* new_file, GFileInfo* new_info) {
 	LibraryMonitor * self;
 	gboolean _tmp0_ = FALSE;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 	gboolean known = FALSE;
-	gboolean _tmp24_ = FALSE;
-	GFile* _tmp26_ = NULL;
-	GFile* _tmp27_ = NULL;
-	GFileInfo* _tmp28_ = NULL;
+	gboolean _tmp24_;
+	GFile* _tmp26_;
+	GFile* _tmp27_;
+	GFileInfo* _tmp28_;
 #line 894 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor);
 #line 894 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6879,24 +6713,24 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil
 	if (_tmp2_) {
 #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = TRUE;
-#line 6882 "LibraryMonitor.c"
+#line 6716 "LibraryMonitor.c"
 	} else {
-		GFile* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+		GFile* _tmp3_;
+		gboolean _tmp4_;
 #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp3_ = new_file;
 #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp4_ = library_monitor_is_blacklisted (_tmp3_);
 #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = _tmp4_;
-#line 6892 "LibraryMonitor.c"
+#line 6726 "LibraryMonitor.c"
 	}
 #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp0_) {
-#line 6896 "LibraryMonitor.c"
-		GFile* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		GFileInfo* _tmp7_ = NULL;
+#line 6730 "LibraryMonitor.c"
+		GFile* _tmp5_;
+		GFile* _tmp6_;
+		GFileInfo* _tmp7_;
 #line 896 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp5_ = old_file;
 #line 896 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6907,19 +6741,19 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil
 		DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_moved (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp5_, _tmp6_, _tmp7_);
 #line 898 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 6910 "LibraryMonitor.c"
+#line 6744 "LibraryMonitor.c"
 	}
 #line 901 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 6914 "LibraryMonitor.c"
+#line 6748 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
-		GeeList* _tmp8_ = NULL;
-		GeeList* _tmp9_ = NULL;
+		GeeList* _tmp8_;
+		GeeList* _tmp9_;
 		gint _monitor_size = 0;
-		GeeList* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
+		GeeList* _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
 		gint _monitor_index = 0;
 #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp8_ = self->priv->monitors;
@@ -6939,19 +6773,19 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil
 		_monitor_index = -1;
 #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 6942 "LibraryMonitor.c"
-			gint _tmp13_ = 0;
-			gint _tmp14_ = 0;
-			gint _tmp15_ = 0;
+#line 6776 "LibraryMonitor.c"
+			gint _tmp13_;
+			gint _tmp14_;
+			gint _tmp15_;
 			MediaMonitor* monitor = NULL;
-			GeeList* _tmp16_ = NULL;
-			gint _tmp17_ = 0;
-			gpointer _tmp18_ = NULL;
-			MediaMonitor* _tmp19_ = NULL;
-			GFile* _tmp20_ = NULL;
-			GFile* _tmp21_ = NULL;
-			GFileInfo* _tmp22_ = NULL;
-			gboolean _tmp23_ = FALSE;
+			GeeList* _tmp16_;
+			gint _tmp17_;
+			gpointer _tmp18_;
+			MediaMonitor* _tmp19_;
+			GFile* _tmp20_;
+			GFile* _tmp21_;
+			GFileInfo* _tmp22_;
+			gboolean _tmp23_;
 #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp13_ = _monitor_index;
 #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6964,7 +6798,7 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil
 			if (!(_tmp14_ < _tmp15_)) {
 #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 6967 "LibraryMonitor.c"
+#line 6801 "LibraryMonitor.c"
 			}
 #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp16_ = _monitor_list;
@@ -6992,27 +6826,27 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil
 				_g_object_unref0 (monitor);
 #line 906 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 6995 "LibraryMonitor.c"
+#line 6829 "LibraryMonitor.c"
 			}
 #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 6999 "LibraryMonitor.c"
+#line 6833 "LibraryMonitor.c"
 		}
 #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 7003 "LibraryMonitor.c"
+#line 6837 "LibraryMonitor.c"
 	}
 #line 910 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp24_ = known;
 #line 910 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp24_) {
-#line 7009 "LibraryMonitor.c"
-		GFile* _tmp25_ = NULL;
+#line 6843 "LibraryMonitor.c"
+		GFile* _tmp25_;
 #line 911 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp25_ = new_file;
 #line 911 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_runtime_unknown_file_discovered (self, _tmp25_);
-#line 7015 "LibraryMonitor.c"
+#line 6849 "LibraryMonitor.c"
 	}
 #line 913 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp26_ = old_file;
@@ -7022,17 +6856,17 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil
 	_tmp28_ = new_info;
 #line 913 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_moved (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp26_, _tmp27_, _tmp28_);
-#line 7025 "LibraryMonitor.c"
+#line 6859 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GFile* file) {
 	LibraryMonitor * self;
-	GFile* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GFile* _tmp0_;
+	gboolean _tmp1_;
 	gboolean known = FALSE;
-	gboolean _tmp17_ = FALSE;
-	GFile* _tmp19_ = NULL;
+	gboolean _tmp17_;
+	GFile* _tmp19_;
 #line 916 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor);
 #line 916 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7043,27 +6877,27 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF
 	_tmp1_ = library_monitor_is_blacklisted (_tmp0_);
 #line 917 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp1_) {
-#line 7046 "LibraryMonitor.c"
-		GFile* _tmp2_ = NULL;
+#line 6880 "LibraryMonitor.c"
+		GFile* _tmp2_;
 #line 918 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = file;
 #line 918 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_);
 #line 920 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 7054 "LibraryMonitor.c"
+#line 6888 "LibraryMonitor.c"
 	}
 #line 923 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 7058 "LibraryMonitor.c"
+#line 6892 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
-		GeeList* _tmp3_ = NULL;
-		GeeList* _tmp4_ = NULL;
+		GeeList* _tmp3_;
+		GeeList* _tmp4_;
 		gint _monitor_size = 0;
-		GeeList* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		GeeList* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 		gint _monitor_index = 0;
 #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp3_ = self->priv->monitors;
@@ -7083,17 +6917,17 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF
 		_monitor_index = -1;
 #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 7086 "LibraryMonitor.c"
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
-			gint _tmp10_ = 0;
+#line 6920 "LibraryMonitor.c"
+			gint _tmp8_;
+			gint _tmp9_;
+			gint _tmp10_;
 			MediaMonitor* monitor = NULL;
-			GeeList* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			gpointer _tmp13_ = NULL;
-			MediaMonitor* _tmp14_ = NULL;
-			GFile* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
+			GeeList* _tmp11_;
+			gint _tmp12_;
+			gpointer _tmp13_;
+			MediaMonitor* _tmp14_;
+			GFile* _tmp15_;
+			gboolean _tmp16_;
 #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp8_ = _monitor_index;
 #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7106,7 +6940,7 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF
 			if (!(_tmp9_ < _tmp10_)) {
 #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 7109 "LibraryMonitor.c"
+#line 6943 "LibraryMonitor.c"
 			}
 #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp11_ = _monitor_list;
@@ -7130,43 +6964,43 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF
 				_g_object_unref0 (monitor);
 #line 928 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 7133 "LibraryMonitor.c"
+#line 6967 "LibraryMonitor.c"
 			}
 #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 7137 "LibraryMonitor.c"
+#line 6971 "LibraryMonitor.c"
 		}
 #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 7141 "LibraryMonitor.c"
+#line 6975 "LibraryMonitor.c"
 	}
 #line 932 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp17_ = known;
 #line 932 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp17_) {
-#line 7147 "LibraryMonitor.c"
-		GFile* _tmp18_ = NULL;
+#line 6981 "LibraryMonitor.c"
+		GFile* _tmp18_;
 #line 933 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp18_ = file;
 #line 933 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_runtime_unknown_file_discovered (self, _tmp18_);
-#line 7153 "LibraryMonitor.c"
+#line 6987 "LibraryMonitor.c"
 	}
 #line 935 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp19_ = file;
 #line 935 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp19_);
-#line 7159 "LibraryMonitor.c"
+#line 6993 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_real_notify_file_attributes_altered (DirectoryMonitor* base, GFile* file) {
 	LibraryMonitor * self;
-	GFile* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GFile* _tmp0_;
+	gboolean _tmp1_;
 	gboolean known = FALSE;
-	gboolean _tmp17_ = FALSE;
-	GFile* _tmp19_ = NULL;
+	gboolean _tmp17_;
+	GFile* _tmp19_;
 #line 938 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor);
 #line 938 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7177,27 +7011,27 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito
 	_tmp1_ = library_monitor_is_blacklisted (_tmp0_);
 #line 939 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp1_) {
-#line 7180 "LibraryMonitor.c"
-		GFile* _tmp2_ = NULL;
+#line 7014 "LibraryMonitor.c"
+		GFile* _tmp2_;
 #line 940 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = file;
 #line 940 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_attributes_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_);
 #line 942 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 7188 "LibraryMonitor.c"
+#line 7022 "LibraryMonitor.c"
 	}
 #line 945 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 7192 "LibraryMonitor.c"
+#line 7026 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
-		GeeList* _tmp3_ = NULL;
-		GeeList* _tmp4_ = NULL;
+		GeeList* _tmp3_;
+		GeeList* _tmp4_;
 		gint _monitor_size = 0;
-		GeeList* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		GeeList* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 		gint _monitor_index = 0;
 #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp3_ = self->priv->monitors;
@@ -7217,17 +7051,17 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito
 		_monitor_index = -1;
 #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 7220 "LibraryMonitor.c"
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
-			gint _tmp10_ = 0;
+#line 7054 "LibraryMonitor.c"
+			gint _tmp8_;
+			gint _tmp9_;
+			gint _tmp10_;
 			MediaMonitor* monitor = NULL;
-			GeeList* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			gpointer _tmp13_ = NULL;
-			MediaMonitor* _tmp14_ = NULL;
-			GFile* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
+			GeeList* _tmp11_;
+			gint _tmp12_;
+			gpointer _tmp13_;
+			MediaMonitor* _tmp14_;
+			GFile* _tmp15_;
+			gboolean _tmp16_;
 #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp8_ = _monitor_index;
 #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7240,7 +7074,7 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito
 			if (!(_tmp9_ < _tmp10_)) {
 #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 7243 "LibraryMonitor.c"
+#line 7077 "LibraryMonitor.c"
 			}
 #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp11_ = _monitor_list;
@@ -7264,44 +7098,44 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito
 				_g_object_unref0 (monitor);
 #line 950 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 7267 "LibraryMonitor.c"
+#line 7101 "LibraryMonitor.c"
 			}
 #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 7271 "LibraryMonitor.c"
+#line 7105 "LibraryMonitor.c"
 		}
 #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 7275 "LibraryMonitor.c"
+#line 7109 "LibraryMonitor.c"
 	}
 #line 954 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp17_ = known;
 #line 954 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp17_) {
-#line 7281 "LibraryMonitor.c"
-		GFile* _tmp18_ = NULL;
+#line 7115 "LibraryMonitor.c"
+		GFile* _tmp18_;
 #line 955 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp18_ = file;
 #line 955 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_runtime_unknown_file_discovered (self, _tmp18_);
-#line 7287 "LibraryMonitor.c"
+#line 7121 "LibraryMonitor.c"
 	}
 #line 957 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp19_ = file;
 #line 957 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_attributes_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp19_);
-#line 7293 "LibraryMonitor.c"
+#line 7127 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_real_notify_file_alteration_completed (DirectoryMonitor* base, GFile* file, GFileInfo* info) {
 	LibraryMonitor * self;
-	GFile* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GFile* _tmp0_;
+	gboolean _tmp1_;
 	gboolean known = FALSE;
-	gboolean _tmp19_ = FALSE;
-	GFile* _tmp21_ = NULL;
-	GFileInfo* _tmp22_ = NULL;
+	gboolean _tmp19_;
+	GFile* _tmp21_;
+	GFileInfo* _tmp22_;
 #line 960 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor);
 #line 960 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7314,9 +7148,9 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni
 	_tmp1_ = library_monitor_is_blacklisted (_tmp0_);
 #line 961 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp1_) {
-#line 7317 "LibraryMonitor.c"
-		GFile* _tmp2_ = NULL;
-		GFileInfo* _tmp3_ = NULL;
+#line 7151 "LibraryMonitor.c"
+		GFile* _tmp2_;
+		GFileInfo* _tmp3_;
 #line 962 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = file;
 #line 962 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7325,19 +7159,19 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni
 		DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_alteration_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_, _tmp3_);
 #line 964 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 7328 "LibraryMonitor.c"
+#line 7162 "LibraryMonitor.c"
 	}
 #line 967 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 7332 "LibraryMonitor.c"
+#line 7166 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
-		GeeList* _tmp4_ = NULL;
-		GeeList* _tmp5_ = NULL;
+		GeeList* _tmp4_;
+		GeeList* _tmp5_;
 		gint _monitor_size = 0;
-		GeeList* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
+		GeeList* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
 		gint _monitor_index = 0;
 #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp4_ = self->priv->monitors;
@@ -7357,18 +7191,18 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni
 		_monitor_index = -1;
 #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 7360 "LibraryMonitor.c"
-			gint _tmp9_ = 0;
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
+#line 7194 "LibraryMonitor.c"
+			gint _tmp9_;
+			gint _tmp10_;
+			gint _tmp11_;
 			MediaMonitor* monitor = NULL;
-			GeeList* _tmp12_ = NULL;
-			gint _tmp13_ = 0;
-			gpointer _tmp14_ = NULL;
-			MediaMonitor* _tmp15_ = NULL;
-			GFile* _tmp16_ = NULL;
-			GFileInfo* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
+			GeeList* _tmp12_;
+			gint _tmp13_;
+			gpointer _tmp14_;
+			MediaMonitor* _tmp15_;
+			GFile* _tmp16_;
+			GFileInfo* _tmp17_;
+			gboolean _tmp18_;
 #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp9_ = _monitor_index;
 #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7381,7 +7215,7 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni
 			if (!(_tmp10_ < _tmp11_)) {
 #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 7384 "LibraryMonitor.c"
+#line 7218 "LibraryMonitor.c"
 			}
 #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp12_ = _monitor_list;
@@ -7407,27 +7241,27 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni
 				_g_object_unref0 (monitor);
 #line 972 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 7410 "LibraryMonitor.c"
+#line 7244 "LibraryMonitor.c"
 			}
 #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 7414 "LibraryMonitor.c"
+#line 7248 "LibraryMonitor.c"
 		}
 #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 7418 "LibraryMonitor.c"
+#line 7252 "LibraryMonitor.c"
 	}
 #line 976 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp19_ = known;
 #line 976 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp19_) {
-#line 7424 "LibraryMonitor.c"
-		GFile* _tmp20_ = NULL;
+#line 7258 "LibraryMonitor.c"
+		GFile* _tmp20_;
 #line 977 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp20_ = file;
 #line 977 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_runtime_unknown_file_discovered (self, _tmp20_);
-#line 7430 "LibraryMonitor.c"
+#line 7264 "LibraryMonitor.c"
 	}
 #line 979 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp21_ = file;
@@ -7435,17 +7269,17 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni
 	_tmp22_ = info;
 #line 979 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_alteration_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp21_, _tmp22_);
-#line 7438 "LibraryMonitor.c"
+#line 7272 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GFile* file) {
 	LibraryMonitor * self;
-	GFile* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GFile* _tmp0_;
+	gboolean _tmp1_;
 	gboolean known = FALSE;
-	gboolean _tmp17_ = FALSE;
-	GFile* _tmp28_ = NULL;
+	gboolean _tmp17_;
+	GFile* _tmp28_;
 #line 982 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor);
 #line 982 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7456,27 +7290,27 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF
 	_tmp1_ = library_monitor_is_blacklisted (_tmp0_);
 #line 983 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp1_) {
-#line 7459 "LibraryMonitor.c"
-		GFile* _tmp2_ = NULL;
+#line 7293 "LibraryMonitor.c"
+		GFile* _tmp2_;
 #line 984 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = file;
 #line 984 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_deleted (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_);
 #line 986 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 7467 "LibraryMonitor.c"
+#line 7301 "LibraryMonitor.c"
 	}
 #line 989 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 7471 "LibraryMonitor.c"
+#line 7305 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
-		GeeList* _tmp3_ = NULL;
-		GeeList* _tmp4_ = NULL;
+		GeeList* _tmp3_;
+		GeeList* _tmp4_;
 		gint _monitor_size = 0;
-		GeeList* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		GeeList* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 		gint _monitor_index = 0;
 #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp3_ = self->priv->monitors;
@@ -7496,17 +7330,17 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF
 		_monitor_index = -1;
 #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 7499 "LibraryMonitor.c"
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
-			gint _tmp10_ = 0;
+#line 7333 "LibraryMonitor.c"
+			gint _tmp8_;
+			gint _tmp9_;
+			gint _tmp10_;
 			MediaMonitor* monitor = NULL;
-			GeeList* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			gpointer _tmp13_ = NULL;
-			MediaMonitor* _tmp14_ = NULL;
-			GFile* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
+			GeeList* _tmp11_;
+			gint _tmp12_;
+			gpointer _tmp13_;
+			MediaMonitor* _tmp14_;
+			GFile* _tmp15_;
+			gboolean _tmp16_;
 #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp8_ = _monitor_index;
 #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7519,7 +7353,7 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF
 			if (!(_tmp9_ < _tmp10_)) {
 #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 7522 "LibraryMonitor.c"
+#line 7356 "LibraryMonitor.c"
 			}
 #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp11_ = _monitor_list;
@@ -7543,27 +7377,27 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF
 				_g_object_unref0 (monitor);
 #line 994 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 7546 "LibraryMonitor.c"
+#line 7380 "LibraryMonitor.c"
 			}
 #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 7550 "LibraryMonitor.c"
+#line 7384 "LibraryMonitor.c"
 		}
 #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 7554 "LibraryMonitor.c"
+#line 7388 "LibraryMonitor.c"
 	}
 #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp17_ = known;
 #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp17_) {
-#line 7560 "LibraryMonitor.c"
+#line 7394 "LibraryMonitor.c"
 		Tombstone* tombstone = NULL;
-		TombstoneSourceCollection* _tmp18_ = NULL;
-		GFile* _tmp19_ = NULL;
-		Tombstone* _tmp20_ = NULL;
-		Tombstone* _tmp21_ = NULL;
-		GFile* _tmp27_ = NULL;
+		TombstoneSourceCollection* _tmp18_;
+		GFile* _tmp19_;
+		Tombstone* _tmp20_;
+		Tombstone* _tmp21_;
+		GFile* _tmp27_;
 #line 1000 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp18_ = tombstone_global;
 #line 1000 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7576,12 +7410,12 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF
 		_tmp21_ = tombstone;
 #line 1001 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp21_ != NULL) {
-#line 7579 "LibraryMonitor.c"
-			GFile* _tmp22_ = NULL;
-			gchar* _tmp23_ = NULL;
-			gchar* _tmp24_ = NULL;
-			TombstoneSourceCollection* _tmp25_ = NULL;
-			Tombstone* _tmp26_ = NULL;
+#line 7413 "LibraryMonitor.c"
+			GFile* _tmp22_;
+			gchar* _tmp23_;
+			gchar* _tmp24_;
+			TombstoneSourceCollection* _tmp25_;
+			Tombstone* _tmp26_;
 #line 1002 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp22_ = file;
 #line 1002 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7598,7 +7432,7 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF
 			_tmp26_ = tombstone;
 #line 1003 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			tombstone_source_collection_resurrect (_tmp25_, _tmp26_);
-#line 7601 "LibraryMonitor.c"
+#line 7435 "LibraryMonitor.c"
 		}
 #line 1007 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp27_ = file;
@@ -7606,13 +7440,13 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF
 		library_monitor_remove_queued_import (self, _tmp27_);
 #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (tombstone);
-#line 7609 "LibraryMonitor.c"
+#line 7443 "LibraryMonitor.c"
 	}
 #line 1010 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp28_ = file;
 #line 1010 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_deleted (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp28_);
-#line 7615 "LibraryMonitor.c"
+#line 7449 "LibraryMonitor.c"
 }
 
 
@@ -7631,19 +7465,19 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
 		data1 = closure->data;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7634 "LibraryMonitor.c"
+#line 7468 "LibraryMonitor.c"
 	} else {
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		data2 = closure->data;
-#line 7640 "LibraryMonitor.c"
+#line 7474 "LibraryMonitor.c"
 	}
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 7646 "LibraryMonitor.c"
+#line 7480 "LibraryMonitor.c"
 }
 
 
@@ -7662,47 +7496,47 @@ static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GVa
 		data1 = closure->data;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7665 "LibraryMonitor.c"
+#line 7499 "LibraryMonitor.c"
 	} else {
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		data2 = closure->data;
-#line 7671 "LibraryMonitor.c"
+#line 7505 "LibraryMonitor.c"
 	}
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	callback = (GMarshalFunc_VOID__UINT64_UINT64) (marshal_data ? marshal_data : cc->callback);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	callback (data1, g_value_get_uint64 (param_values + 1), g_value_get_uint64 (param_values + 2), data2);
-#line 7677 "LibraryMonitor.c"
+#line 7511 "LibraryMonitor.c"
 }
 
 
 static void _library_monitor_on_find_move_completed_completion_callback (BackgroundJob* job, gpointer self) {
 #line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_on_find_move_completed ((LibraryMonitor*) self, job);
-#line 7684 "LibraryMonitor.c"
+#line 7518 "LibraryMonitor.c"
 }
 
 
 static void _library_monitor_on_find_move_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
 #line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_on_find_move_cancelled ((LibraryMonitor*) self, job);
-#line 7691 "LibraryMonitor.c"
+#line 7525 "LibraryMonitor.c"
 }
 
 
 static LibraryMonitorFindMoveJob* library_monitor_find_move_job_construct (GType object_type, LibraryMonitor* owner, GFile* file, GeeCollection* candidates) {
 	LibraryMonitorFindMoveJob* self = NULL;
-	LibraryMonitor* _tmp0_ = NULL;
-	LibraryMonitor* _tmp1_ = NULL;
-	LibraryMonitor* _tmp2_ = NULL;
-	GCancellable* _tmp3_ = NULL;
-	LibraryMonitor* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	GeeCollection* _tmp7_ = NULL;
-	GeeCollection* _tmp8_ = NULL;
+	LibraryMonitor* _tmp0_;
+	LibraryMonitor* _tmp1_;
+	LibraryMonitor* _tmp2_;
+	GCancellable* _tmp3_;
+	LibraryMonitor* _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
+	GeeCollection* _tmp7_;
+	GeeCollection* _tmp8_;
 #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_val_if_fail (IS_LIBRARY_MONITOR (owner), NULL);
 #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7741,32 +7575,32 @@ static LibraryMonitorFindMoveJob* library_monitor_find_move_job_construct (GType
 	background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW);
 #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self;
-#line 7744 "LibraryMonitor.c"
+#line 7578 "LibraryMonitor.c"
 }
 
 
 static LibraryMonitorFindMoveJob* library_monitor_find_move_job_new (LibraryMonitor* owner, GFile* file, GeeCollection* candidates) {
 #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return library_monitor_find_move_job_construct (LIBRARY_MONITOR_TYPE_FIND_MOVE_JOB, owner, file, candidates);
-#line 7751 "LibraryMonitor.c"
+#line 7585 "LibraryMonitor.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
 #line 135 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 7758 "LibraryMonitor.c"
+#line 7592 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 	LibraryMonitorFindMoveJob * self;
 	GeeIterator* iter = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	GeeIterator* _tmp1_ = NULL;
-	GeeCollection* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
+	GeeCollection* _tmp0_;
+	GeeIterator* _tmp1_;
+	GeeCollection* _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
 	gchar* md5 = NULL;
 	GError * _inner_error_ = NULL;
 #line 119 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7779,16 +7613,16 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 	iter = _tmp1_;
 #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	while (TRUE) {
-#line 7782 "LibraryMonitor.c"
-		GeeIterator* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		GeeIterator* _tmp4_ = NULL;
-		gpointer _tmp5_ = NULL;
-		Monitorable* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
-		GFile* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
-		gboolean _tmp10_ = FALSE;
+#line 7616 "LibraryMonitor.c"
+		GeeIterator* _tmp2_;
+		gboolean _tmp3_;
+		GeeIterator* _tmp4_;
+		gpointer _tmp5_;
+		Monitorable* _tmp6_;
+		GFile* _tmp7_;
+		GFile* _tmp8_;
+		gboolean _tmp9_;
+		gboolean _tmp10_;
 #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = iter;
 #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7797,7 +7631,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		if (!_tmp3_) {
 #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			break;
-#line 7800 "LibraryMonitor.c"
+#line 7634 "LibraryMonitor.c"
 		}
 #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp4_ = iter;
@@ -7819,13 +7653,13 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (_tmp6_);
 #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp10_) {
-#line 7822 "LibraryMonitor.c"
-			GeeIterator* _tmp11_ = NULL;
+#line 7656 "LibraryMonitor.c"
+			GeeIterator* _tmp11_;
 #line 124 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp11_ = iter;
 #line 124 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			gee_iterator_remove (_tmp11_);
-#line 7828 "LibraryMonitor.c"
+#line 7662 "LibraryMonitor.c"
 		}
 	}
 #line 128 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7840,16 +7674,16 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (iter);
 #line 129 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 7843 "LibraryMonitor.c"
+#line 7677 "LibraryMonitor.c"
 	}
 #line 131 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	md5 = NULL;
-#line 7847 "LibraryMonitor.c"
+#line 7681 "LibraryMonitor.c"
 	{
 		gchar* _tmp15_ = NULL;
-		GFile* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
+		GFile* _tmp16_;
+		gchar* _tmp17_;
+		gchar* _tmp18_;
 #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp16_ = self->file;
 #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7858,8 +7692,8 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		_tmp15_ = _tmp17_;
 #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7861 "LibraryMonitor.c"
-			goto __catch491_g_error;
+#line 7695 "LibraryMonitor.c"
+			goto __catch492_g_error;
 		}
 #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp18_ = _tmp15_;
@@ -7871,14 +7705,14 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		md5 = _tmp18_;
 #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_free0 (_tmp15_);
-#line 7874 "LibraryMonitor.c"
+#line 7708 "LibraryMonitor.c"
 	}
-	goto __finally491;
-	__catch491_g_error:
+	goto __finally492;
+	__catch492_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp19_ = NULL;
-		GError* _tmp20_ = NULL;
+		GError* _tmp19_;
+		GError* _tmp20_;
 #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		err = _inner_error_;
 #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7899,9 +7733,9 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (iter);
 #line 137 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 7902 "LibraryMonitor.c"
+#line 7736 "LibraryMonitor.c"
 	}
-	__finally491:
+	__finally492:
 #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7914,12 +7748,12 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		g_clear_error (&_inner_error_);
 #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 7917 "LibraryMonitor.c"
+#line 7751 "LibraryMonitor.c"
 	}
 	{
 		GeeIterator* _candidate_it = NULL;
-		GeeCollection* _tmp21_ = NULL;
-		GeeIterator* _tmp22_ = NULL;
+		GeeCollection* _tmp21_;
+		GeeIterator* _tmp22_;
 #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp21_ = self->candidates;
 #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7928,20 +7762,20 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		_candidate_it = _tmp22_;
 #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 7931 "LibraryMonitor.c"
-			GeeIterator* _tmp23_ = NULL;
-			gboolean _tmp24_ = FALSE;
+#line 7765 "LibraryMonitor.c"
+			GeeIterator* _tmp23_;
+			gboolean _tmp24_;
 			Monitorable* candidate = NULL;
-			GeeIterator* _tmp25_ = NULL;
-			gpointer _tmp26_ = NULL;
-			Monitorable* _tmp27_ = NULL;
-			gchar* _tmp28_ = NULL;
-			gchar* _tmp29_ = NULL;
-			const gchar* _tmp30_ = NULL;
-			gboolean _tmp31_ = FALSE;
-			Monitorable* _tmp32_ = NULL;
-			Monitorable* _tmp46_ = NULL;
-			Monitorable* _tmp47_ = NULL;
+			GeeIterator* _tmp25_;
+			gpointer _tmp26_;
+			Monitorable* _tmp27_;
+			gchar* _tmp28_;
+			gchar* _tmp29_;
+			const gchar* _tmp30_;
+			gboolean _tmp31_;
+			Monitorable* _tmp32_;
+			Monitorable* _tmp46_;
+			Monitorable* _tmp47_;
 #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp23_ = _candidate_it;
 #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7950,7 +7784,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 			if (!_tmp24_) {
 #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 7953 "LibraryMonitor.c"
+#line 7787 "LibraryMonitor.c"
 			}
 #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp25_ = _candidate_it;
@@ -7976,25 +7810,25 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 				_g_object_unref0 (candidate);
 #line 142 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 7979 "LibraryMonitor.c"
+#line 7813 "LibraryMonitor.c"
 			}
 #line 144 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp32_ = self->match;
 #line 144 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp32_ != NULL) {
-#line 7985 "LibraryMonitor.c"
-				GFile* _tmp33_ = NULL;
-				gchar* _tmp34_ = NULL;
-				gchar* _tmp35_ = NULL;
-				Monitorable* _tmp36_ = NULL;
-				gchar* _tmp37_ = NULL;
-				gchar* _tmp38_ = NULL;
-				Monitorable* _tmp39_ = NULL;
-				gchar* _tmp40_ = NULL;
-				gchar* _tmp41_ = NULL;
-				GeeArrayList* _tmp42_ = NULL;
-				GeeArrayList* _tmp44_ = NULL;
-				Monitorable* _tmp45_ = NULL;
+#line 7819 "LibraryMonitor.c"
+				GFile* _tmp33_;
+				gchar* _tmp34_;
+				gchar* _tmp35_;
+				Monitorable* _tmp36_;
+				gchar* _tmp37_;
+				gchar* _tmp38_;
+				Monitorable* _tmp39_;
+				gchar* _tmp40_;
+				gchar* _tmp41_;
+				GeeArrayList* _tmp42_;
+				GeeArrayList* _tmp44_;
+				Monitorable* _tmp45_;
 #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp33_ = self->file;
 #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8026,15 +7860,15 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 				_tmp42_ = self->losers;
 #line 148 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				if (_tmp42_ == NULL) {
-#line 8028 "LibraryMonitor.c"
-					GeeArrayList* _tmp43_ = NULL;
+#line 7862 "LibraryMonitor.c"
+					GeeArrayList* _tmp43_;
 #line 149 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp43_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 149 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_g_object_unref0 (self->losers);
 #line 149 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					self->losers = _tmp43_;
-#line 8036 "LibraryMonitor.c"
+#line 7870 "LibraryMonitor.c"
 				}
 #line 151 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp44_ = self->losers;
@@ -8046,7 +7880,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 				_g_object_unref0 (candidate);
 #line 153 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 8048 "LibraryMonitor.c"
+#line 7882 "LibraryMonitor.c"
 			}
 #line 156 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp46_ = candidate;
@@ -8058,17 +7892,17 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 			self->match = _tmp47_;
 #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (candidate);
-#line 8060 "LibraryMonitor.c"
+#line 7894 "LibraryMonitor.c"
 		}
 #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_candidate_it);
-#line 8064 "LibraryMonitor.c"
+#line 7898 "LibraryMonitor.c"
 	}
 #line 119 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_free0 (md5);
 #line 119 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (iter);
-#line 8070 "LibraryMonitor.c"
+#line 7904 "LibraryMonitor.c"
 }
 
 
@@ -8078,8 +7912,8 @@ static void library_monitor_find_move_job_class_init (LibraryMonitorFindMoveJobC
 #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	((BackgroundJobClass *) klass)->finalize = library_monitor_find_move_job_finalize;
 #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) library_monitor_find_move_job_real_execute;
-#line 8081 "LibraryMonitor.c"
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) library_monitor_find_move_job_real_execute;
+#line 7915 "LibraryMonitor.c"
 }
 
 
@@ -8090,11 +7924,11 @@ static void library_monitor_find_move_job_instance_init (LibraryMonitorFindMoveJ
 	self->losers = NULL;
 #line 108 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->err = NULL;
-#line 8092 "LibraryMonitor.c"
+#line 7926 "LibraryMonitor.c"
 }
 
 
-static void library_monitor_find_move_job_finalize (BackgroundJob* obj) {
+static void library_monitor_find_move_job_finalize (BackgroundJob * obj) {
 	LibraryMonitorFindMoveJob * self;
 #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_MONITOR_TYPE_FIND_MOVE_JOB, LibraryMonitorFindMoveJob);
@@ -8110,7 +7944,7 @@ static void library_monitor_find_move_job_finalize (BackgroundJob* obj) {
 	_g_error_free0 (self->err);
 #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	BACKGROUND_JOB_CLASS (library_monitor_find_move_job_parent_class)->finalize (obj);
-#line 8112 "LibraryMonitor.c"
+#line 7946 "LibraryMonitor.c"
 }
 
 
@@ -8129,20 +7963,20 @@ static GType library_monitor_find_move_job_get_type (void) {
 static void _library_monitor_on_runtime_find_move_completed_completion_callback (BackgroundJob* job, gpointer self) {
 #line 168 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_on_runtime_find_move_completed ((LibraryMonitor*) self, job);
-#line 8131 "LibraryMonitor.c"
+#line 7965 "LibraryMonitor.c"
 }
 
 
 static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_construct (GType object_type, LibraryMonitor* owner, GFile* file, GeeCollection* candidates) {
 	LibraryMonitorRuntimeFindMoveJob* self = NULL;
-	LibraryMonitor* _tmp0_ = NULL;
-	LibraryMonitor* _tmp1_ = NULL;
-	LibraryMonitor* _tmp2_ = NULL;
-	GCancellable* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GeeCollection* _tmp6_ = NULL;
-	GeeCollection* _tmp7_ = NULL;
+	LibraryMonitor* _tmp0_;
+	LibraryMonitor* _tmp1_;
+	LibraryMonitor* _tmp2_;
+	GCancellable* _tmp3_;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
+	GeeCollection* _tmp6_;
+	GeeCollection* _tmp7_;
 #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_val_if_fail (IS_LIBRARY_MONITOR (owner), NULL);
 #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8179,14 +8013,14 @@ static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_c
 	background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW);
 #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self;
-#line 8181 "LibraryMonitor.c"
+#line 8015 "LibraryMonitor.c"
 }
 
 
 static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_new (LibraryMonitor* owner, GFile* file, GeeCollection* candidates) {
 #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return library_monitor_runtime_find_move_job_construct (LIBRARY_MONITOR_TYPE_RUNTIME_FIND_MOVE_JOB, owner, file, candidates);
-#line 8188 "LibraryMonitor.c"
+#line 8022 "LibraryMonitor.c"
 }
 
 
@@ -8198,12 +8032,12 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_MONITOR_TYPE_RUNTIME_FIND_MOVE_JOB, LibraryMonitorRuntimeFindMoveJob);
 #line 177 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	md5 = NULL;
-#line 8200 "LibraryMonitor.c"
+#line 8034 "LibraryMonitor.c"
 	{
 		gchar* _tmp0_ = NULL;
-		GFile* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+		GFile* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
 #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = self->file;
 #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8212,8 +8046,8 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 		_tmp0_ = _tmp2_;
 #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8214 "LibraryMonitor.c"
-			goto __catch492_g_error;
+#line 8048 "LibraryMonitor.c"
+			goto __catch493_g_error;
 		}
 #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp3_ = _tmp0_;
@@ -8225,14 +8059,14 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 		md5 = _tmp3_;
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_free0 (_tmp0_);
-#line 8227 "LibraryMonitor.c"
+#line 8061 "LibraryMonitor.c"
 	}
-	goto __finally492;
-	__catch492_g_error:
+	goto __finally493;
+	__catch493_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp4_ = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp4_;
+		GError* _tmp5_;
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		err = _inner_error_;
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8251,9 +8085,9 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 		_g_free0 (md5);
 #line 183 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 8253 "LibraryMonitor.c"
+#line 8087 "LibraryMonitor.c"
 	}
-	__finally492:
+	__finally493:
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8264,12 +8098,12 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 		g_clear_error (&_inner_error_);
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 8266 "LibraryMonitor.c"
+#line 8100 "LibraryMonitor.c"
 	}
 	{
 		GeeIterator* _candidate_it = NULL;
-		GeeCollection* _tmp6_ = NULL;
-		GeeIterator* _tmp7_ = NULL;
+		GeeCollection* _tmp6_;
+		GeeIterator* _tmp7_;
 #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp6_ = self->candidates;
 #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8278,17 +8112,17 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 		_candidate_it = _tmp7_;
 #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 8280 "LibraryMonitor.c"
-			GeeIterator* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+#line 8114 "LibraryMonitor.c"
+			GeeIterator* _tmp8_;
+			gboolean _tmp9_;
 			Monitorable* candidate = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			gpointer _tmp11_ = NULL;
-			Monitorable* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			gchar* _tmp14_ = NULL;
-			const gchar* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			Monitorable* _tmp12_;
+			gchar* _tmp13_;
+			gchar* _tmp14_;
+			const gchar* _tmp15_;
+			gboolean _tmp16_;
 #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp8_ = _candidate_it;
 #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8297,7 +8131,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 			if (!_tmp9_) {
 #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 8299 "LibraryMonitor.c"
+#line 8133 "LibraryMonitor.c"
 			}
 #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp10_ = _candidate_it;
@@ -8319,9 +8153,9 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 			_g_free0 (_tmp14_);
 #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp16_) {
-#line 8321 "LibraryMonitor.c"
-				Monitorable* _tmp17_ = NULL;
-				Monitorable* _tmp18_ = NULL;
+#line 8155 "LibraryMonitor.c"
+				Monitorable* _tmp17_;
+				Monitorable* _tmp18_;
 #line 188 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp17_ = candidate;
 #line 188 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8334,19 +8168,19 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 				_g_object_unref0 (candidate);
 #line 190 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 8336 "LibraryMonitor.c"
+#line 8170 "LibraryMonitor.c"
 			}
 #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (candidate);
-#line 8340 "LibraryMonitor.c"
+#line 8174 "LibraryMonitor.c"
 		}
 #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_candidate_it);
-#line 8344 "LibraryMonitor.c"
+#line 8178 "LibraryMonitor.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_free0 (md5);
-#line 8348 "LibraryMonitor.c"
+#line 8182 "LibraryMonitor.c"
 }
 
 
@@ -8356,8 +8190,8 @@ static void library_monitor_runtime_find_move_job_class_init (LibraryMonitorRunt
 #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	((BackgroundJobClass *) klass)->finalize = library_monitor_runtime_find_move_job_finalize;
 #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) library_monitor_runtime_find_move_job_real_execute;
-#line 8359 "LibraryMonitor.c"
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) library_monitor_runtime_find_move_job_real_execute;
+#line 8193 "LibraryMonitor.c"
 }
 
 
@@ -8366,11 +8200,11 @@ static void library_monitor_runtime_find_move_job_instance_init (LibraryMonitorR
 	self->match = NULL;
 #line 165 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->err = NULL;
-#line 8368 "LibraryMonitor.c"
+#line 8202 "LibraryMonitor.c"
 }
 
 
-static void library_monitor_runtime_find_move_job_finalize (BackgroundJob* obj) {
+static void library_monitor_runtime_find_move_job_finalize (BackgroundJob * obj) {
 	LibraryMonitorRuntimeFindMoveJob * self;
 #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_MONITOR_TYPE_RUNTIME_FIND_MOVE_JOB, LibraryMonitorRuntimeFindMoveJob);
@@ -8384,7 +8218,7 @@ static void library_monitor_runtime_find_move_job_finalize (BackgroundJob* obj)
 	_g_error_free0 (self->err);
 #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	BACKGROUND_JOB_CLASS (library_monitor_runtime_find_move_job_parent_class)->finalize (obj);
-#line 8386 "LibraryMonitor.c"
+#line 8220 "LibraryMonitor.c"
 }
 
 
@@ -8402,10 +8236,10 @@ static GType library_monitor_runtime_find_move_job_get_type (void) {
 
 static LibraryMonitorVerifyJob* library_monitor_verify_job_construct (GType object_type, Monitorable* monitorable, MediaMonitor* monitor) {
 	LibraryMonitorVerifyJob* self = NULL;
-	Monitorable* _tmp0_ = NULL;
-	Monitorable* _tmp1_ = NULL;
-	MediaMonitor* _tmp2_ = NULL;
-	MediaMonitor* _tmp3_ = NULL;
+	Monitorable* _tmp0_;
+	Monitorable* _tmp1_;
+	MediaMonitor* _tmp2_;
+	MediaMonitor* _tmp3_;
 #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL);
 #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8430,21 +8264,21 @@ static LibraryMonitorVerifyJob* library_monitor_verify_job_construct (GType obje
 	self->monitor = _tmp3_;
 #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self;
-#line 8432 "LibraryMonitor.c"
+#line 8266 "LibraryMonitor.c"
 }
 
 
 static LibraryMonitorVerifyJob* library_monitor_verify_job_new (Monitorable* monitorable, MediaMonitor* monitor) {
 #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return library_monitor_verify_job_construct (LIBRARY_MONITOR_TYPE_VERIFY_JOB, monitorable, monitor);
-#line 8439 "LibraryMonitor.c"
+#line 8273 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_value_verify_job_init (GValue* value) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	value->data[0].v_pointer = NULL;
-#line 8446 "LibraryMonitor.c"
+#line 8280 "LibraryMonitor.c"
 }
 
 
@@ -8453,7 +8287,7 @@ static void library_monitor_value_verify_job_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_verify_job_unref (value->data[0].v_pointer);
-#line 8455 "LibraryMonitor.c"
+#line 8289 "LibraryMonitor.c"
 	}
 }
 
@@ -8463,11 +8297,11 @@ static void library_monitor_value_verify_job_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		dest_value->data[0].v_pointer = library_monitor_verify_job_ref (src_value->data[0].v_pointer);
-#line 8465 "LibraryMonitor.c"
+#line 8299 "LibraryMonitor.c"
 	} else {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8469 "LibraryMonitor.c"
+#line 8303 "LibraryMonitor.c"
 	}
 }
 
@@ -8475,66 +8309,66 @@ static void library_monitor_value_verify_job_copy_value (const GValue* src_value
 static gpointer library_monitor_value_verify_job_peek_pointer (const GValue* value) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return value->data[0].v_pointer;
-#line 8477 "LibraryMonitor.c"
+#line 8311 "LibraryMonitor.c"
 }
 
 
 static gchar* library_monitor_value_verify_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (collect_values[0].v_pointer) {
-#line 8484 "LibraryMonitor.c"
-		LibraryMonitorVerifyJob* object;
+#line 8318 "LibraryMonitor.c"
+		LibraryMonitorVerifyJob * object;
 		object = collect_values[0].v_pointer;
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8491 "LibraryMonitor.c"
+#line 8325 "LibraryMonitor.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8495 "LibraryMonitor.c"
+#line 8329 "LibraryMonitor.c"
 		}
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = library_monitor_verify_job_ref (object);
-#line 8499 "LibraryMonitor.c"
+#line 8333 "LibraryMonitor.c"
 	} else {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 8503 "LibraryMonitor.c"
+#line 8337 "LibraryMonitor.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return NULL;
-#line 8507 "LibraryMonitor.c"
+#line 8341 "LibraryMonitor.c"
 }
 
 
 static gchar* library_monitor_value_verify_job_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	LibraryMonitorVerifyJob** object_p;
+	LibraryMonitorVerifyJob ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!object_p) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8518 "LibraryMonitor.c"
+#line 8352 "LibraryMonitor.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!value->data[0].v_pointer) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		*object_p = NULL;
-#line 8524 "LibraryMonitor.c"
+#line 8358 "LibraryMonitor.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8528 "LibraryMonitor.c"
+#line 8362 "LibraryMonitor.c"
 	} else {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		*object_p = library_monitor_verify_job_ref (value->data[0].v_pointer);
-#line 8532 "LibraryMonitor.c"
+#line 8366 "LibraryMonitor.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return NULL;
-#line 8536 "LibraryMonitor.c"
+#line 8370 "LibraryMonitor.c"
 }
 
 
@@ -8548,7 +8382,7 @@ static GParamSpec* library_monitor_param_spec_verify_job (const gchar* name, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return G_PARAM_SPEC (spec);
-#line 8550 "LibraryMonitor.c"
+#line 8384 "LibraryMonitor.c"
 }
 
 
@@ -8557,12 +8391,12 @@ static gpointer library_monitor_value_get_verify_job (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, LIBRARY_MONITOR_TYPE_VERIFY_JOB), NULL);
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return value->data[0].v_pointer;
-#line 8559 "LibraryMonitor.c"
+#line 8393 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_value_set_verify_job (GValue* value, gpointer v_object) {
-	LibraryMonitorVerifyJob* old;
+	LibraryMonitorVerifyJob * old;
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, LIBRARY_MONITOR_TYPE_VERIFY_JOB));
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8577,23 +8411,23 @@ static void library_monitor_value_set_verify_job (GValue* value, gpointer v_obje
 		value->data[0].v_pointer = v_object;
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_verify_job_ref (value->data[0].v_pointer);
-#line 8579 "LibraryMonitor.c"
+#line 8413 "LibraryMonitor.c"
 	} else {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 8583 "LibraryMonitor.c"
+#line 8417 "LibraryMonitor.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (old) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_verify_job_unref (old);
-#line 8589 "LibraryMonitor.c"
+#line 8423 "LibraryMonitor.c"
 	}
 }
 
 
 static void library_monitor_value_take_verify_job (GValue* value, gpointer v_object) {
-	LibraryMonitorVerifyJob* old;
+	LibraryMonitorVerifyJob * old;
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, LIBRARY_MONITOR_TYPE_VERIFY_JOB));
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8606,17 +8440,17 @@ static void library_monitor_value_take_verify_job (GValue* value, gpointer v_obj
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = v_object;
-#line 8608 "LibraryMonitor.c"
+#line 8442 "LibraryMonitor.c"
 	} else {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 8612 "LibraryMonitor.c"
+#line 8446 "LibraryMonitor.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (old) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_verify_job_unref (old);
-#line 8618 "LibraryMonitor.c"
+#line 8452 "LibraryMonitor.c"
 	}
 }
 
@@ -8626,18 +8460,18 @@ static void library_monitor_verify_job_class_init (LibraryMonitorVerifyJobClass
 	library_monitor_verify_job_parent_class = g_type_class_peek_parent (klass);
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	((LibraryMonitorVerifyJobClass *) klass)->finalize = library_monitor_verify_job_finalize;
-#line 8628 "LibraryMonitor.c"
+#line 8462 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_verify_job_instance_init (LibraryMonitorVerifyJob * self) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->ref_count = 1;
-#line 8635 "LibraryMonitor.c"
+#line 8469 "LibraryMonitor.c"
 }
 
 
-static void library_monitor_verify_job_finalize (LibraryMonitorVerifyJob* obj) {
+static void library_monitor_verify_job_finalize (LibraryMonitorVerifyJob * obj) {
 	LibraryMonitorVerifyJob * self;
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_MONITOR_TYPE_VERIFY_JOB, LibraryMonitorVerifyJob);
@@ -8647,7 +8481,7 @@ static void library_monitor_verify_job_finalize (LibraryMonitorVerifyJob* obj) {
 	_g_object_unref0 (self->monitorable);
 #line 198 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (self->monitor);
-#line 8649 "LibraryMonitor.c"
+#line 8483 "LibraryMonitor.c"
 }
 
 
@@ -8666,18 +8500,18 @@ static GType library_monitor_verify_job_get_type (void) {
 
 
 static gpointer library_monitor_verify_job_ref (gpointer instance) {
-	LibraryMonitorVerifyJob* self;
+	LibraryMonitorVerifyJob * self;
 	self = instance;
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return instance;
-#line 8674 "LibraryMonitor.c"
+#line 8508 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_verify_job_unref (gpointer instance) {
-	LibraryMonitorVerifyJob* self;
+	LibraryMonitorVerifyJob * self;
 	self = instance;
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -8685,46 +8519,46 @@ static void library_monitor_verify_job_unref (gpointer instance) {
 		LIBRARY_MONITOR_VERIFY_JOB_GET_CLASS (self)->finalize (self);
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8687 "LibraryMonitor.c"
+#line 8521 "LibraryMonitor.c"
 	}
 }
 
 
 static void library_monitor_class_init (LibraryMonitorClass * klass) {
-	GeeHashSet* _tmp0_ = NULL;
-	HashTimedQueue* _tmp1_ = NULL;
+	GeeHashSet* _tmp0_;
+	HashTimedQueue* _tmp1_;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_parent_class = g_type_class_peek_parent (klass);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_type_class_add_private (klass, sizeof (LibraryMonitorPrivate));
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->close = (void (*)(DirectoryMonitor*)) library_monitor_real_close;
+	((DirectoryMonitorClass *) klass)->close = (void (*) (DirectoryMonitor *)) library_monitor_real_close;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->discovery_started = (void (*)(DirectoryMonitor*)) library_monitor_real_discovery_started;
+	((DirectoryMonitorClass *) klass)->discovery_started = (void (*) (DirectoryMonitor *)) library_monitor_real_discovery_started;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->file_discovered = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) library_monitor_real_file_discovered;
+	((DirectoryMonitorClass *) klass)->file_discovered = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) library_monitor_real_file_discovered;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->discovery_completed = (void (*)(DirectoryMonitor*)) library_monitor_real_discovery_completed;
+	((DirectoryMonitorClass *) klass)->discovery_completed = (void (*) (DirectoryMonitor *)) library_monitor_real_discovery_completed;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_file_created = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) library_monitor_real_notify_file_created;
+	((DirectoryMonitorClass *) klass)->notify_file_created = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) library_monitor_real_notify_file_created;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_file_moved = (void (*)(DirectoryMonitor*, GFile*, GFile*, GFileInfo*)) library_monitor_real_notify_file_moved;
+	((DirectoryMonitorClass *) klass)->notify_file_moved = (void (*) (DirectoryMonitor *, GFile*, GFile*, GFileInfo*)) library_monitor_real_notify_file_moved;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_file_altered = (void (*)(DirectoryMonitor*, GFile*)) library_monitor_real_notify_file_altered;
+	((DirectoryMonitorClass *) klass)->notify_file_altered = (void (*) (DirectoryMonitor *, GFile*)) library_monitor_real_notify_file_altered;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_file_attributes_altered = (void (*)(DirectoryMonitor*, GFile*)) library_monitor_real_notify_file_attributes_altered;
+	((DirectoryMonitorClass *) klass)->notify_file_attributes_altered = (void (*) (DirectoryMonitor *, GFile*)) library_monitor_real_notify_file_attributes_altered;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_file_alteration_completed = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) library_monitor_real_notify_file_alteration_completed;
+	((DirectoryMonitorClass *) klass)->notify_file_alteration_completed = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) library_monitor_real_notify_file_alteration_completed;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	((DirectoryMonitorClass *) klass)->notify_file_deleted = (void (*)(DirectoryMonitor*, GFile*)) library_monitor_real_notify_file_deleted;
+	((DirectoryMonitorClass *) klass)->notify_file_deleted = (void (*) (DirectoryMonitor *, GFile*)) library_monitor_real_notify_file_deleted;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_monitor_finalize;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	g_signal_new ("auto_update_progress", TYPE_LIBRARY_MONITOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
+	library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL] = g_signal_new ("auto-update-progress", TYPE_LIBRARY_MONITOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	g_signal_new ("auto_import_preparing", TYPE_LIBRARY_MONITOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PREPARING_SIGNAL] = g_signal_new ("auto-import-preparing", TYPE_LIBRARY_MONITOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	g_signal_new ("auto_import_progress", TYPE_LIBRARY_MONITOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT64_UINT64, G_TYPE_NONE, 2, G_TYPE_UINT64, G_TYPE_UINT64);
+	library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL] = g_signal_new ("auto-import-progress", TYPE_LIBRARY_MONITOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT64_UINT64, G_TYPE_NONE, 2, G_TYPE_UINT64, G_TYPE_UINT64);
 #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_rec_mutex_init (&__lock_library_monitor_blacklist);
 #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8735,19 +8569,19 @@ static void library_monitor_class_init (LibraryMonitorClass * klass) {
 	_tmp1_ = hash_timed_queue_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, (guint) LIBRARY_MONITOR_MIN_BLACKLIST_DURATION_MSEC, _library_monitor_on_unblacklist_file_dequeued_callback, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, G_PRIORITY_LOW);
 #line 207 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_to_unblacklist = _tmp1_;
-#line 8737 "LibraryMonitor.c"
+#line 8571 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_instance_init (LibraryMonitor * self) {
-	guint _tmp0_ = 0U;
-	Workers* _tmp1_ = NULL;
-	GCancellable* _tmp2_ = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	GeeHashSet* _tmp4_ = NULL;
-	GeeHashSet* _tmp5_ = NULL;
-	GeeArrayList* _tmp6_ = NULL;
-	GeeLinkedList* _tmp7_ = NULL;
+	guint _tmp0_;
+	Workers* _tmp1_;
+	GCancellable* _tmp2_;
+	GeeArrayList* _tmp3_;
+	GeeHashSet* _tmp4_;
+	GeeHashSet* _tmp5_;
+	GeeArrayList* _tmp6_;
+	GeeLinkedList* _tmp7_;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->priv = LIBRARY_MONITOR_GET_PRIVATE (self);
 #line 210 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8804,15 +8638,15 @@ static void library_monitor_instance_init (LibraryMonitor * self) {
 	self->priv->completed_monitorable_verifies = 0;
 #line 228 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->priv->total_monitorable_verifies = 0;
-#line 8806 "LibraryMonitor.c"
+#line 8640 "LibraryMonitor.c"
 }
 
 
-static void library_monitor_finalize (GObject* obj) {
+static void library_monitor_finalize (GObject * obj) {
 	LibraryMonitor * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	guint _tmp2_;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_MONITOR, LibraryMonitor);
 #line 247 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8849,7 +8683,7 @@ static void library_monitor_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->verify_queue);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	G_OBJECT_CLASS (library_monitor_parent_class)->finalize (obj);
-#line 8851 "LibraryMonitor.c"
+#line 8685 "LibraryMonitor.c"
 }
 
 
diff --git a/src/MediaDataRepresentation.c b/src/MediaDataRepresentation.c
index e0df289..9a6edc0 100644
--- a/src/MediaDataRepresentation.c
+++ b/src/MediaDataRepresentation.c
@@ -1,4 +1,4 @@
-/* MediaDataRepresentation.c generated by valac 0.34.7, the Vala compiler
+/* MediaDataRepresentation.c generated by valac 0.36.6, the Vala compiler
  * generated from MediaDataRepresentation.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -233,6 +233,11 @@ typedef struct _EventSourceCollectionClass EventSourceCollectionClass;
 
 typedef struct _TransactionController TransactionController;
 typedef struct _TransactionControllerClass TransactionControllerClass;
+enum  {
+	MEDIA_SOURCE_MASTER_REPLACED_SIGNAL,
+	MEDIA_SOURCE_LAST_SIGNAL
+};
+static guint media_source_signals[MEDIA_SOURCE_LAST_SIGNAL] = {0};
 typedef struct _SourceHoldingTankPrivate SourceHoldingTankPrivate;
 
 #define TYPE_DATABASE_SOURCE_HOLDING_TANK (database_source_holding_tank_get_type ())
@@ -394,6 +399,17 @@ typedef struct _AggregateProgressMonitorClass AggregateProgressMonitorClass;
 #define _aggregate_progress_monitor_unref0(var) ((var == NULL) ? NULL : (var = (aggregate_progress_monitor_unref (var), NULL)))
 
 #define TOMBSTONE_TYPE_REASON (tombstone_reason_get_type ())
+enum  {
+	MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_STARTING_SIGNAL,
+	MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_COMPLETED_SIGNAL,
+	MEDIA_SOURCE_COLLECTION_MASTER_FILE_REPLACED_SIGNAL,
+	MEDIA_SOURCE_COLLECTION_TRASHCAN_CONTENTS_ALTERED_SIGNAL,
+	MEDIA_SOURCE_COLLECTION_IMPORT_ROLL_ALTERED_SIGNAL,
+	MEDIA_SOURCE_COLLECTION_OFFLINE_CONTENTS_ALTERED_SIGNAL,
+	MEDIA_SOURCE_COLLECTION_FLAGGED_CONTENTS_ALTERED_SIGNAL,
+	MEDIA_SOURCE_COLLECTION_LAST_SIGNAL
+};
+static guint media_source_collection_signals[MEDIA_SOURCE_COLLECTION_LAST_SIGNAL] = {0};
 
 #define TYPE_MEDIA_COLLECTION_REGISTRY (media_collection_registry_get_type ())
 #define MEDIA_COLLECTION_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistry))
@@ -939,7 +955,7 @@ struct _ParamSpecMediaCollectionRegistry {
 static gpointer backing_file_state_parent_class = NULL;
 static gpointer media_source_parent_class = NULL;
 extern EventSourceCollection* event_global;
-static IndexableIface* media_source_indexable_parent_iface = NULL;
+static IndexableIface * media_source_indexable_parent_iface = NULL;
 static gpointer media_source_holding_tank_parent_class = NULL;
 static gpointer media_source_transaction_controller_parent_class = NULL;
 static gpointer media_source_collection_parent_class = NULL;
@@ -978,7 +994,7 @@ Dimensions* dimensions_dup (const Dimensions* self);
 void dimensions_free (Dimensions* self);
 GType orientation_get_type (void) G_GNUC_CONST;
 GFile* backing_file_state_get_file (BackingFileState* self);
-static void backing_file_state_finalize (BackingFileState* obj);
+static void backing_file_state_finalize (BackingFileState * obj);
 GType data_object_get_type (void) G_GNUC_CONST;
 gpointer alteration_ref (gpointer instance);
 void alteration_unref (gpointer instance);
@@ -1140,7 +1156,7 @@ void media_source_get_import_id (MediaSource* self, ImportID* result);
 static void media_source_real_get_import_id (MediaSource* self, ImportID* result);
 static void media_source_real_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file);
 static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void media_source_finalize (GObject* obj);
+static void media_source_finalize (GObject * obj);
 GType database_source_holding_tank_get_type (void) G_GNUC_CONST;
 GType media_source_holding_tank_get_type (void) G_GNUC_CONST;
 #define MEDIA_SOURCE_HOLDING_TANK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTankPrivate))
@@ -1162,7 +1178,7 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin
 static void media_source_holding_tank_on_master_source_replaced (MediaSourceHoldingTank* self, MediaSource* media_source, GFile* old_file, GFile* new_file);
 static void _media_source_holding_tank_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self);
 void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed);
-static void media_source_holding_tank_finalize (SourceHoldingTank* obj);
+static void media_source_holding_tank_finalize (SourceHoldingTank * obj);
 GType media_source_transaction_controller_get_type (void) G_GNUC_CONST;
 #define MEDIA_SOURCE_TRANSACTION_CONTROLLER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, MediaSourceTransactionControllerPrivate))
 enum  {
@@ -1178,7 +1194,7 @@ static void media_source_transaction_controller_real_commit_impl (TransactionCon
 void data_collection_thaw_notifications (DataCollection* self);
 GQuark database_error_quark (void);
 void database_table_commit_transaction (GError** error);
-static void media_source_transaction_controller_finalize (TransactionController* obj);
+static void media_source_transaction_controller_finalize (TransactionController * obj);
 GType marker_get_type (void) G_GNUC_CONST;
 gpointer source_backlink_ref (gpointer instance);
 void source_backlink_unref (gpointer instance);
@@ -1297,7 +1313,7 @@ static void media_source_collection_real_trashcan_contents_altered (MediaSourceC
 static void media_source_collection_real_import_roll_altered (MediaSourceCollection* self);
 static void media_source_collection_real_offline_contents_altered (MediaSourceCollection* self, GeeCollection* added, GeeCollection* removed);
 static void media_source_collection_real_flagged_contents_altered (MediaSourceCollection* self);
-static void media_source_collection_finalize (DataCollection* obj);
+static void media_source_collection_finalize (DataCollection * obj);
 gpointer media_collection_registry_ref (gpointer instance);
 void media_collection_registry_unref (gpointer instance);
 GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1362,7 +1378,7 @@ GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaColle
 MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaCollectionRegistry* self, GFile* file);
 gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry* self, const gchar* source_id);
 #define VIDEO_TYPENAME "video"
-static void media_collection_registry_finalize (MediaCollectionRegistry* obj);
+static void media_collection_registry_finalize (MediaCollectionRegistry * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
@@ -1370,12 +1386,12 @@ static gint _vala_array_length (gpointer array);
 
 BackingFileState* backing_file_state_construct (GType object_type, const gchar* filepath, gint64 filesize, time_t modification_time, const gchar* md5) {
 	BackingFileState* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	time_t _tmp3_ = 0;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gint64 _tmp2_;
+	time_t _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 13 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 13 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -1406,28 +1422,28 @@ BackingFileState* backing_file_state_construct (GType object_type, const gchar*
 	self->md5 = _tmp5_;
 #line 13 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self;
-#line 1410 "MediaDataRepresentation.c"
+#line 1426 "MediaDataRepresentation.c"
 }
 
 
 BackingFileState* backing_file_state_new (const gchar* filepath, gint64 filesize, time_t modification_time, const gchar* md5) {
 #line 13 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return backing_file_state_construct (TYPE_BACKING_FILE_STATE, filepath, filesize, modification_time, md5);
-#line 1417 "MediaDataRepresentation.c"
+#line 1433 "MediaDataRepresentation.c"
 }
 
 
 BackingFileState* backing_file_state_construct_from_photo_row (GType object_type, BackingPhotoRow* photo_row, const gchar* md5) {
 	BackingFileState* self = NULL;
-	BackingPhotoRow* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	BackingPhotoRow* _tmp3_ = NULL;
-	gint64 _tmp4_ = 0LL;
-	BackingPhotoRow* _tmp5_ = NULL;
-	time_t _tmp6_ = 0;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	BackingPhotoRow* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	BackingPhotoRow* _tmp3_;
+	gint64 _tmp4_;
+	BackingPhotoRow* _tmp5_;
+	time_t _tmp6_;
+	const gchar* _tmp7_;
+	gchar* _tmp8_;
 #line 20 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_BACKING_PHOTO_ROW (photo_row), NULL);
 #line 20 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -1464,21 +1480,21 @@ BackingFileState* backing_file_state_construct_from_photo_row (GType object_type
 	self->md5 = _tmp8_;
 #line 20 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self;
-#line 1468 "MediaDataRepresentation.c"
+#line 1484 "MediaDataRepresentation.c"
 }
 
 
 BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_row, const gchar* md5) {
 #line 20 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return backing_file_state_construct_from_photo_row (TYPE_BACKING_FILE_STATE, photo_row, md5);
-#line 1475 "MediaDataRepresentation.c"
+#line 1491 "MediaDataRepresentation.c"
 }
 
 
 GFile* backing_file_state_get_file (BackingFileState* self) {
 	GFile* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	GFile* _tmp1_;
 #line 27 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_BACKING_FILE_STATE (self), NULL);
 #line 28 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -1489,14 +1505,14 @@ GFile* backing_file_state_get_file (BackingFileState* self) {
 	result = _tmp1_;
 #line 28 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 1493 "MediaDataRepresentation.c"
+#line 1509 "MediaDataRepresentation.c"
 }
 
 
 static void value_backing_file_state_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	value->data[0].v_pointer = NULL;
-#line 1500 "MediaDataRepresentation.c"
+#line 1516 "MediaDataRepresentation.c"
 }
 
 
@@ -1505,7 +1521,7 @@ static void value_backing_file_state_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		backing_file_state_unref (value->data[0].v_pointer);
-#line 1509 "MediaDataRepresentation.c"
+#line 1525 "MediaDataRepresentation.c"
 	}
 }
 
@@ -1515,11 +1531,11 @@ static void value_backing_file_state_copy_value (const GValue* src_value, GValue
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		dest_value->data[0].v_pointer = backing_file_state_ref (src_value->data[0].v_pointer);
-#line 1519 "MediaDataRepresentation.c"
+#line 1535 "MediaDataRepresentation.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1523 "MediaDataRepresentation.c"
+#line 1539 "MediaDataRepresentation.c"
 	}
 }
 
@@ -1527,66 +1543,66 @@ static void value_backing_file_state_copy_value (const GValue* src_value, GValue
 static gpointer value_backing_file_state_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return value->data[0].v_pointer;
-#line 1531 "MediaDataRepresentation.c"
+#line 1547 "MediaDataRepresentation.c"
 }
 
 
 static gchar* value_backing_file_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (collect_values[0].v_pointer) {
-#line 1538 "MediaDataRepresentation.c"
-		BackingFileState* object;
+#line 1554 "MediaDataRepresentation.c"
+		BackingFileState * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1545 "MediaDataRepresentation.c"
+#line 1561 "MediaDataRepresentation.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1549 "MediaDataRepresentation.c"
+#line 1565 "MediaDataRepresentation.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = backing_file_state_ref (object);
-#line 1553 "MediaDataRepresentation.c"
+#line 1569 "MediaDataRepresentation.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = NULL;
-#line 1557 "MediaDataRepresentation.c"
+#line 1573 "MediaDataRepresentation.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 1561 "MediaDataRepresentation.c"
+#line 1577 "MediaDataRepresentation.c"
 }
 
 
 static gchar* value_backing_file_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	BackingFileState** object_p;
+	BackingFileState ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1572 "MediaDataRepresentation.c"
+#line 1588 "MediaDataRepresentation.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*object_p = NULL;
-#line 1578 "MediaDataRepresentation.c"
+#line 1594 "MediaDataRepresentation.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1582 "MediaDataRepresentation.c"
+#line 1598 "MediaDataRepresentation.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*object_p = backing_file_state_ref (value->data[0].v_pointer);
-#line 1586 "MediaDataRepresentation.c"
+#line 1602 "MediaDataRepresentation.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 1590 "MediaDataRepresentation.c"
+#line 1606 "MediaDataRepresentation.c"
 }
 
 
@@ -1600,7 +1616,7 @@ GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return G_PARAM_SPEC (spec);
-#line 1604 "MediaDataRepresentation.c"
+#line 1620 "MediaDataRepresentation.c"
 }
 
 
@@ -1609,12 +1625,12 @@ gpointer value_get_backing_file_state (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_FILE_STATE), NULL);
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return value->data[0].v_pointer;
-#line 1613 "MediaDataRepresentation.c"
+#line 1629 "MediaDataRepresentation.c"
 }
 
 
 void value_set_backing_file_state (GValue* value, gpointer v_object) {
-	BackingFileState* old;
+	BackingFileState * old;
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_FILE_STATE));
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -1629,23 +1645,23 @@ void value_set_backing_file_state (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		backing_file_state_ref (value->data[0].v_pointer);
-#line 1633 "MediaDataRepresentation.c"
+#line 1649 "MediaDataRepresentation.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = NULL;
-#line 1637 "MediaDataRepresentation.c"
+#line 1653 "MediaDataRepresentation.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		backing_file_state_unref (old);
-#line 1643 "MediaDataRepresentation.c"
+#line 1659 "MediaDataRepresentation.c"
 	}
 }
 
 
 void value_take_backing_file_state (GValue* value, gpointer v_object) {
-	BackingFileState* old;
+	BackingFileState * old;
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_FILE_STATE));
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -1658,17 +1674,17 @@ void value_take_backing_file_state (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = v_object;
-#line 1662 "MediaDataRepresentation.c"
+#line 1678 "MediaDataRepresentation.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = NULL;
-#line 1666 "MediaDataRepresentation.c"
+#line 1682 "MediaDataRepresentation.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		backing_file_state_unref (old);
-#line 1672 "MediaDataRepresentation.c"
+#line 1688 "MediaDataRepresentation.c"
 	}
 }
 
@@ -1678,18 +1694,18 @@ static void backing_file_state_class_init (BackingFileStateClass * klass) {
 	backing_file_state_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((BackingFileStateClass *) klass)->finalize = backing_file_state_finalize;
-#line 1682 "MediaDataRepresentation.c"
+#line 1698 "MediaDataRepresentation.c"
 }
 
 
 static void backing_file_state_instance_init (BackingFileState * self) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->ref_count = 1;
-#line 1689 "MediaDataRepresentation.c"
+#line 1705 "MediaDataRepresentation.c"
 }
 
 
-static void backing_file_state_finalize (BackingFileState* obj) {
+static void backing_file_state_finalize (BackingFileState * obj) {
 	BackingFileState * self;
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_FILE_STATE, BackingFileState);
@@ -1699,7 +1715,7 @@ static void backing_file_state_finalize (BackingFileState* obj) {
 	_g_free0 (self->filepath);
 #line 11 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_free0 (self->md5);
-#line 1703 "MediaDataRepresentation.c"
+#line 1719 "MediaDataRepresentation.c"
 }
 
 
@@ -1718,18 +1734,18 @@ GType backing_file_state_get_type (void) {
 
 
 gpointer backing_file_state_ref (gpointer instance) {
-	BackingFileState* self;
+	BackingFileState * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return instance;
-#line 1728 "MediaDataRepresentation.c"
+#line 1744 "MediaDataRepresentation.c"
 }
 
 
 void backing_file_state_unref (gpointer instance) {
-	BackingFileState* self;
+	BackingFileState * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1737,28 +1753,28 @@ void backing_file_state_unref (gpointer instance) {
 		BACKING_FILE_STATE_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1741 "MediaDataRepresentation.c"
+#line 1757 "MediaDataRepresentation.c"
 	}
 }
 
 
 MediaSource* media_source_construct (GType object_type, gint64 object_id) {
 	MediaSource * self = NULL;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 40 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = object_id;
 #line 40 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = (MediaSource*) thumbnail_source_construct (object_type, _tmp0_);
 #line 39 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self;
-#line 1755 "MediaDataRepresentation.c"
+#line 1771 "MediaDataRepresentation.c"
 }
 
 
 inline guint64 media_source_internal_add_flags (guint64 flags, guint64 selector) {
 	guint64 result = 0ULL;
-	guint64 _tmp0_ = 0ULL;
-	guint64 _tmp1_ = 0ULL;
+	guint64 _tmp0_;
+	guint64 _tmp1_;
 #line 44 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = flags;
 #line 44 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -1767,14 +1783,14 @@ inline guint64 media_source_internal_add_flags (guint64 flags, guint64 selector)
 	result = _tmp0_ | _tmp1_;
 #line 44 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 1771 "MediaDataRepresentation.c"
+#line 1787 "MediaDataRepresentation.c"
 }
 
 
 inline guint64 media_source_internal_remove_flags (guint64 flags, guint64 selector) {
 	guint64 result = 0ULL;
-	guint64 _tmp0_ = 0ULL;
-	guint64 _tmp1_ = 0ULL;
+	guint64 _tmp0_;
+	guint64 _tmp1_;
 #line 48 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = flags;
 #line 48 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -1783,14 +1799,14 @@ inline guint64 media_source_internal_remove_flags (guint64 flags, guint64 select
 	result = _tmp0_ & (~_tmp1_);
 #line 48 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 1787 "MediaDataRepresentation.c"
+#line 1803 "MediaDataRepresentation.c"
 }
 
 
 inline gboolean media_source_internal_is_flag_set (guint64 flags, guint64 selector) {
 	gboolean result = FALSE;
-	guint64 _tmp0_ = 0ULL;
-	guint64 _tmp1_ = 0ULL;
+	guint64 _tmp0_;
+	guint64 _tmp1_;
 #line 52 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = flags;
 #line 52 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -1799,13 +1815,13 @@ inline gboolean media_source_internal_is_flag_set (guint64 flags, guint64 select
 	result = (_tmp0_ & _tmp1_) != ((guint64) 0);
 #line 52 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 1803 "MediaDataRepresentation.c"
+#line 1819 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_real_notify_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file) {
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 55 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (G_IS_FILE (old_file));
 #line 55 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -1815,8 +1831,8 @@ static void media_source_real_notify_master_replaced (MediaSource* self, GFile*
 #line 56 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = new_file;
 #line 56 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_signal_emit_by_name (self, "master-replaced", _tmp0_, _tmp1_);
-#line 1820 "MediaDataRepresentation.c"
+	g_signal_emit (self, media_source_signals[MEDIA_SOURCE_MASTER_REPLACED_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 1836 "MediaDataRepresentation.c"
 }
 
 
@@ -1825,26 +1841,26 @@ void media_source_notify_master_replaced (MediaSource* self, GFile* old_file, GF
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
 #line 55 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->notify_master_replaced (self, old_file, new_file);
-#line 1829 "MediaDataRepresentation.c"
+#line 1845 "MediaDataRepresentation.c"
 }
 
 
 static gpointer _alteration_ref0 (gpointer self) {
 #line 60 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self ? alteration_ref (self) : NULL;
-#line 1836 "MediaDataRepresentation.c"
+#line 1852 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_real_notify_altered (DataObject* base, Alteration* alteration) {
 	MediaSource * self;
 	Alteration* local = NULL;
-	Alteration* _tmp0_ = NULL;
-	Alteration* _tmp1_ = NULL;
+	Alteration* _tmp0_;
+	Alteration* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	Alteration* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	Alteration* _tmp11_ = NULL;
+	Alteration* _tmp3_;
+	gboolean _tmp4_;
+	Alteration* _tmp11_;
 #line 59 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource);
 #line 59 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -1863,25 +1879,25 @@ static void media_source_real_notify_altered (DataObject* base, Alteration* alte
 	if (_tmp4_) {
 #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = TRUE;
-#line 1867 "MediaDataRepresentation.c"
+#line 1883 "MediaDataRepresentation.c"
 	} else {
-		Alteration* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		Alteration* _tmp5_;
+		gboolean _tmp6_;
 #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = local;
 #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp6_ = alteration_has_detail (_tmp5_, "backing", "master");
 #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = _tmp6_;
-#line 1877 "MediaDataRepresentation.c"
+#line 1893 "MediaDataRepresentation.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp2_) {
-#line 1881 "MediaDataRepresentation.c"
-		Alteration* _tmp7_ = NULL;
-		Alteration* _tmp8_ = NULL;
-		Alteration* _tmp9_ = NULL;
-		Alteration* _tmp10_ = NULL;
+#line 1897 "MediaDataRepresentation.c"
+		Alteration* _tmp7_;
+		Alteration* _tmp8_;
+		Alteration* _tmp9_;
+		Alteration* _tmp10_;
 #line 63 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_source_update_indexable_keywords (self);
 #line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -1898,7 +1914,7 @@ static void media_source_real_notify_altered (DataObject* base, Alteration* alte
 		local = _tmp10_;
 #line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_alteration_unref0 (_tmp9_);
-#line 1902 "MediaDataRepresentation.c"
+#line 1918 "MediaDataRepresentation.c"
 	}
 #line 67 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp11_ = local;
@@ -1906,15 +1922,15 @@ static void media_source_real_notify_altered (DataObject* base, Alteration* alte
 	DATA_OBJECT_CLASS (media_source_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_OBJECT, DataObject), _tmp11_);
 #line 59 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_alteration_unref0 (local);
-#line 1910 "MediaDataRepresentation.c"
+#line 1926 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_real_notify_membership_changed (DataObject* base, DataCollection* collection) {
 	MediaSource * self;
 	gboolean _tmp0_ = FALSE;
-	DataCollection* _tmp1_ = NULL;
-	DataCollection* _tmp3_ = NULL;
+	DataCollection* _tmp1_;
+	DataCollection* _tmp3_;
 #line 72 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource);
 #line 72 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -1923,44 +1939,44 @@ static void media_source_real_notify_membership_changed (DataObject* base, DataC
 	_tmp1_ = collection;
 #line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp1_ != NULL) {
-#line 1927 "MediaDataRepresentation.c"
-		const gchar* _tmp2_ = NULL;
+#line 1943 "MediaDataRepresentation.c"
+		const gchar* _tmp2_;
 #line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = self->priv->indexable_keywords;
 #line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 1933 "MediaDataRepresentation.c"
+#line 1949 "MediaDataRepresentation.c"
 	} else {
 #line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = FALSE;
-#line 1937 "MediaDataRepresentation.c"
+#line 1953 "MediaDataRepresentation.c"
 	}
 #line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp0_) {
 #line 76 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_source_update_indexable_keywords (self);
-#line 1943 "MediaDataRepresentation.c"
+#line 1959 "MediaDataRepresentation.c"
 	}
 #line 79 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = collection;
 #line 79 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	DATA_OBJECT_CLASS (media_source_parent_class)->notify_membership_changed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_OBJECT, DataObject), _tmp3_);
-#line 1949 "MediaDataRepresentation.c"
+#line 1965 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_update_indexable_keywords (MediaSource* self) {
 	gchar** indexables = NULL;
-	gchar** _tmp0_ = NULL;
-	gint indexables_length1 = 0;
-	gint _indexables_size_ = 0;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	gchar** _tmp0_;
+	gint indexables_length1;
+	gint _indexables_size_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
 #line 82 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
 #line 83 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2003,14 +2019,14 @@ static void media_source_update_indexable_keywords (MediaSource* self) {
 	self->priv->indexable_keywords = _tmp7_;
 #line 82 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	indexables = (_vala_array_free (indexables, indexables_length1, (GDestroyNotify) g_free), NULL);
-#line 2007 "MediaDataRepresentation.c"
+#line 2023 "MediaDataRepresentation.c"
 }
 
 
 static const gchar* media_source_real_get_indexable_keywords (Indexable* base) {
 	MediaSource * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 91 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource);
 #line 92 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2019,7 +2035,7 @@ static const gchar* media_source_real_get_indexable_keywords (Indexable* base) {
 	result = _tmp0_;
 #line 92 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 2023 "MediaDataRepresentation.c"
+#line 2039 "MediaDataRepresentation.c"
 }
 
 
@@ -2029,7 +2045,7 @@ static gboolean media_source_real_set_event_id (MediaSource* self, EventID* id)
 	g_critical ("Type `%s' does not implement abstract method `media_source_set_event_id'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 95 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 2033 "MediaDataRepresentation.c"
+#line 2049 "MediaDataRepresentation.c"
 }
 
 
@@ -2038,14 +2054,14 @@ gboolean media_source_set_event_id (MediaSource* self, EventID* id) {
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE);
 #line 95 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->set_event_id (self, id);
-#line 2042 "MediaDataRepresentation.c"
+#line 2058 "MediaDataRepresentation.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2049 "MediaDataRepresentation.c"
+#line 2065 "MediaDataRepresentation.c"
 }
 
 
@@ -2053,12 +2069,12 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 	gboolean result = FALSE;
 	gboolean ret = FALSE;
 	GFile* file = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp10_ = NULL;
-	GFile* _tmp11_ = NULL;
-	GFile* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	gboolean _tmp14_ = FALSE;
+	GFile* _tmp0_;
+	GFile* _tmp10_;
+	GFile* _tmp11_;
+	GFile* _tmp12_;
+	gboolean _tmp13_;
+	gboolean _tmp14_;
 	GError * _inner_error_ = NULL;
 #line 97 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE);
@@ -2068,11 +2084,11 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 	_tmp0_ = media_source_get_master_file (self);
 #line 99 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	file = _tmp0_;
-#line 2072 "MediaDataRepresentation.c"
+#line 2088 "MediaDataRepresentation.c"
 	{
 		gboolean _tmp1_ = FALSE;
-		GFile* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+		GFile* _tmp2_;
+		gboolean _tmp3_;
 #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = file;
 #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2081,22 +2097,22 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 		_tmp1_ = _tmp3_;
 #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2085 "MediaDataRepresentation.c"
-			goto __catch561_g_error;
+#line 2101 "MediaDataRepresentation.c"
+			goto __catch562_g_error;
 		}
 #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		ret = _tmp1_;
-#line 2090 "MediaDataRepresentation.c"
+#line 2106 "MediaDataRepresentation.c"
 	}
-	goto __finally561;
-	__catch561_g_error:
+	goto __finally562;
+	__catch562_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
+		GFile* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		GError* _tmp7_;
+		const gchar* _tmp8_;
 #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		err = _inner_error_;
 #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2118,12 +2134,12 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 		_g_free0 (_tmp6_);
 #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_error_free0 (err);
-#line 2121 "MediaDataRepresentation.c"
+#line 2137 "MediaDataRepresentation.c"
 	}
-	__finally561:
+	__finally562:
 #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2126 "MediaDataRepresentation.c"
+#line 2142 "MediaDataRepresentation.c"
 		gboolean _tmp9_ = FALSE;
 #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (file);
@@ -2133,7 +2149,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 		g_clear_error (&_inner_error_);
 #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return _tmp9_;
-#line 2136 "MediaDataRepresentation.c"
+#line 2152 "MediaDataRepresentation.c"
 	}
 #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp10_ = file;
@@ -2149,10 +2165,10 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 	_g_object_unref0 (_tmp12_);
 #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp14_) {
-#line 2152 "MediaDataRepresentation.c"
+#line 2168 "MediaDataRepresentation.c"
 		GFile* parent = NULL;
-		GFile* _tmp15_ = NULL;
-		GFile* _tmp16_ = NULL;
+		GFile* _tmp15_;
+		GFile* _tmp16_;
 #line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp15_ = file;
 #line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2161,16 +2177,16 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 		parent = _tmp16_;
 #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 2164 "MediaDataRepresentation.c"
-			GFile* _tmp17_ = NULL;
-			GFile* _tmp18_ = NULL;
-			GFile* _tmp19_ = NULL;
-			gboolean _tmp20_ = FALSE;
-			gboolean _tmp21_ = FALSE;
-			GFile* _tmp22_ = NULL;
-			GFile* _tmp23_ = NULL;
+#line 2180 "MediaDataRepresentation.c"
+			GFile* _tmp17_;
+			GFile* _tmp18_;
+			GFile* _tmp19_;
+			gboolean _tmp20_;
+			gboolean _tmp21_;
+			GFile* _tmp22_;
+			GFile* _tmp23_;
 			gboolean _tmp24_ = FALSE;
-			GFile* _tmp25_ = NULL;
+			GFile* _tmp25_;
 #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp17_ = parent;
 #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2187,7 +2203,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 			if (_tmp21_) {
 #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 2190 "MediaDataRepresentation.c"
+#line 2206 "MediaDataRepresentation.c"
 			}
 #line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp22_ = parent;
@@ -2203,12 +2219,12 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 			if (_tmp25_ == NULL) {
 #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp24_ = TRUE;
-#line 2206 "MediaDataRepresentation.c"
+#line 2222 "MediaDataRepresentation.c"
 			} else {
-				GFile* _tmp26_ = NULL;
-				GFile* _tmp27_ = NULL;
-				GFile* _tmp28_ = NULL;
-				gboolean _tmp29_ = FALSE;
+				GFile* _tmp26_;
+				GFile* _tmp27_;
+				GFile* _tmp28_;
+				gboolean _tmp29_;
 #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp26_ = parent;
 #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2221,18 +2237,18 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				_tmp24_ = _tmp29_;
 #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (_tmp28_);
-#line 2224 "MediaDataRepresentation.c"
+#line 2240 "MediaDataRepresentation.c"
 			}
 #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp24_) {
 #line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 2230 "MediaDataRepresentation.c"
+#line 2246 "MediaDataRepresentation.c"
 			}
 			{
 				gboolean _tmp30_ = FALSE;
-				GFile* _tmp31_ = NULL;
-				gboolean _tmp32_ = FALSE;
+				GFile* _tmp31_;
+				gboolean _tmp32_;
 #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp31_ = parent;
 #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2241,25 +2257,25 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				_tmp30_ = _tmp32_;
 #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2244 "MediaDataRepresentation.c"
-					goto __catch562_g_error;
+#line 2260 "MediaDataRepresentation.c"
+					goto __catch563_g_error;
 				}
 #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (!_tmp30_) {
 #line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					break;
-#line 2251 "MediaDataRepresentation.c"
+#line 2267 "MediaDataRepresentation.c"
 				}
 			}
-			goto __finally562;
-			__catch562_g_error:
+			goto __finally563;
+			__catch563_g_error:
 			{
 				GError* err = NULL;
-				GFile* _tmp33_ = NULL;
-				gchar* _tmp34_ = NULL;
-				gchar* _tmp35_ = NULL;
-				GError* _tmp36_ = NULL;
-				const gchar* _tmp37_ = NULL;
+				GFile* _tmp33_;
+				gchar* _tmp34_;
+				gchar* _tmp35_;
+				GError* _tmp36_;
+				const gchar* _tmp37_;
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				err = _inner_error_;
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2282,12 +2298,12 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				_g_error_free0 (err);
 #line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 2285 "MediaDataRepresentation.c"
+#line 2301 "MediaDataRepresentation.c"
 			}
-			__finally562:
+			__finally563:
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2290 "MediaDataRepresentation.c"
+#line 2306 "MediaDataRepresentation.c"
 				gboolean _tmp38_ = FALSE;
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (parent);
@@ -2299,21 +2315,21 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				g_clear_error (&_inner_error_);
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				return _tmp38_;
-#line 2302 "MediaDataRepresentation.c"
+#line 2318 "MediaDataRepresentation.c"
 			}
 			{
-				GFile* _tmp39_ = NULL;
-				GFile* _tmp40_ = NULL;
-				gchar* _tmp41_ = NULL;
-				gchar* _tmp42_ = NULL;
+				GFile* _tmp39_;
+				GFile* _tmp40_;
+				gchar* _tmp41_;
+				gchar* _tmp42_;
 #line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp39_ = parent;
 #line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_file_delete (_tmp39_, NULL, &_inner_error_);
 #line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2315 "MediaDataRepresentation.c"
-					goto __catch563_g_error;
+#line 2331 "MediaDataRepresentation.c"
+					goto __catch564_g_error;
 				}
 #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp40_ = parent;
@@ -2325,17 +2341,17 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				g_debug ("MediaDataRepresentation.vala:129: Deleted empty directory %s", _tmp42_);
 #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_free0 (_tmp42_);
-#line 2328 "MediaDataRepresentation.c"
+#line 2344 "MediaDataRepresentation.c"
 			}
-			goto __finally563;
-			__catch563_g_error:
+			goto __finally564;
+			__catch564_g_error:
 			{
 				GError* err = NULL;
-				GFile* _tmp43_ = NULL;
-				gchar* _tmp44_ = NULL;
-				gchar* _tmp45_ = NULL;
-				GError* _tmp46_ = NULL;
-				const gchar* _tmp47_ = NULL;
+				GFile* _tmp43_;
+				gchar* _tmp44_;
+				gchar* _tmp45_;
+				GError* _tmp46_;
+				const gchar* _tmp47_;
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				err = _inner_error_;
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2357,12 +2373,12 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				_g_free0 (_tmp45_);
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_error_free0 (err);
-#line 2359 "MediaDataRepresentation.c"
+#line 2375 "MediaDataRepresentation.c"
 			}
-			__finally563:
+			__finally564:
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2364 "MediaDataRepresentation.c"
+#line 2380 "MediaDataRepresentation.c"
 				gboolean _tmp48_ = FALSE;
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (parent);
@@ -2374,12 +2390,12 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				g_clear_error (&_inner_error_);
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				return _tmp48_;
-#line 2376 "MediaDataRepresentation.c"
+#line 2392 "MediaDataRepresentation.c"
 			}
 		}
 #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (parent);
-#line 2381 "MediaDataRepresentation.c"
+#line 2397 "MediaDataRepresentation.c"
 	}
 #line 138 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = ret;
@@ -2387,7 +2403,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 	_g_object_unref0 (file);
 #line 138 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 2389 "MediaDataRepresentation.c"
+#line 2405 "MediaDataRepresentation.c"
 }
 
 
@@ -2395,10 +2411,10 @@ static gchar* media_source_real_get_name (DataObject* base) {
 	MediaSource * self;
 	gchar* result = NULL;
 	gchar* title = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 #line 141 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource);
 #line 142 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2411,18 +2427,18 @@ static gchar* media_source_real_get_name (DataObject* base) {
 	_tmp3_ = is_string_empty (_tmp2_);
 #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp3_) {
-#line 2413 "MediaDataRepresentation.c"
-		gchar* _tmp4_ = NULL;
+#line 2429 "MediaDataRepresentation.c"
+		gchar* _tmp4_;
 #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp4_ = media_source_get_basename (self);
 #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_free0 (_tmp1_);
 #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp4_;
-#line 2421 "MediaDataRepresentation.c"
+#line 2437 "MediaDataRepresentation.c"
 	} else {
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = title;
 #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2431,7 +2447,7 @@ static gchar* media_source_real_get_name (DataObject* base) {
 		_g_free0 (_tmp1_);
 #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp6_;
-#line 2433 "MediaDataRepresentation.c"
+#line 2449 "MediaDataRepresentation.c"
 	}
 #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp1_;
@@ -2439,16 +2455,16 @@ static gchar* media_source_real_get_name (DataObject* base) {
 	_g_free0 (title);
 #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 2441 "MediaDataRepresentation.c"
+#line 2457 "MediaDataRepresentation.c"
 }
 
 
 static gchar* media_source_real_get_basename (MediaSource* self) {
 	gchar* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media_source_get_file (self);
 #line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2463,7 +2479,7 @@ static gchar* media_source_real_get_basename (MediaSource* self) {
 	result = _tmp3_;
 #line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 2465 "MediaDataRepresentation.c"
+#line 2481 "MediaDataRepresentation.c"
 }
 
 
@@ -2472,7 +2488,7 @@ gchar* media_source_get_basename (MediaSource* self) {
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
 #line 147 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_basename (self);
-#line 2474 "MediaDataRepresentation.c"
+#line 2490 "MediaDataRepresentation.c"
 }
 
 
@@ -2481,7 +2497,7 @@ static GFile* media_source_real_get_file (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_file'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 151 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 2483 "MediaDataRepresentation.c"
+#line 2499 "MediaDataRepresentation.c"
 }
 
 
@@ -2490,7 +2506,7 @@ GFile* media_source_get_file (MediaSource* self) {
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
 #line 151 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_file (self);
-#line 2492 "MediaDataRepresentation.c"
+#line 2508 "MediaDataRepresentation.c"
 }
 
 
@@ -2499,7 +2515,7 @@ static GFile* media_source_real_get_master_file (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_master_file'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 152 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 2501 "MediaDataRepresentation.c"
+#line 2517 "MediaDataRepresentation.c"
 }
 
 
@@ -2508,7 +2524,7 @@ GFile* media_source_get_master_file (MediaSource* self) {
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
 #line 152 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_master_file (self);
-#line 2510 "MediaDataRepresentation.c"
+#line 2526 "MediaDataRepresentation.c"
 }
 
 
@@ -2518,7 +2534,7 @@ static guint64 media_source_real_get_master_filesize (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_master_filesize'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 2520 "MediaDataRepresentation.c"
+#line 2536 "MediaDataRepresentation.c"
 }
 
 
@@ -2527,7 +2543,7 @@ guint64 media_source_get_master_filesize (MediaSource* self) {
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0ULL);
 #line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_master_filesize (self);
-#line 2529 "MediaDataRepresentation.c"
+#line 2545 "MediaDataRepresentation.c"
 }
 
 
@@ -2537,7 +2553,7 @@ static guint64 media_source_real_get_filesize (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_filesize'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 2539 "MediaDataRepresentation.c"
+#line 2555 "MediaDataRepresentation.c"
 }
 
 
@@ -2546,7 +2562,7 @@ guint64 media_source_get_filesize (MediaSource* self) {
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0ULL);
 #line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_filesize (self);
-#line 2548 "MediaDataRepresentation.c"
+#line 2564 "MediaDataRepresentation.c"
 }
 
 
@@ -2556,7 +2572,7 @@ static time_t media_source_real_get_timestamp (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_timestamp'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 2558 "MediaDataRepresentation.c"
+#line 2574 "MediaDataRepresentation.c"
 }
 
 
@@ -2565,7 +2581,7 @@ time_t media_source_get_timestamp (MediaSource* self) {
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0);
 #line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_timestamp (self);
-#line 2567 "MediaDataRepresentation.c"
+#line 2583 "MediaDataRepresentation.c"
 }
 
 
@@ -2574,7 +2590,7 @@ static BackingFileState** media_source_real_get_backing_files_state (MediaSource
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_backing_files_state'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 158 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 2576 "MediaDataRepresentation.c"
+#line 2592 "MediaDataRepresentation.c"
 }
 
 
@@ -2583,7 +2599,7 @@ BackingFileState** media_source_get_backing_files_state (MediaSource* self, int*
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
 #line 158 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_backing_files_state (self, result_length1);
-#line 2585 "MediaDataRepresentation.c"
+#line 2601 "MediaDataRepresentation.c"
 }
 
 
@@ -2592,7 +2608,7 @@ static gchar* media_source_real_get_title (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_title'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 2594 "MediaDataRepresentation.c"
+#line 2610 "MediaDataRepresentation.c"
 }
 
 
@@ -2601,7 +2617,7 @@ gchar* media_source_get_title (MediaSource* self) {
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
 #line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_title (self);
-#line 2603 "MediaDataRepresentation.c"
+#line 2619 "MediaDataRepresentation.c"
 }
 
 
@@ -2610,7 +2626,7 @@ static gchar* media_source_real_get_comment (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 161 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 2612 "MediaDataRepresentation.c"
+#line 2628 "MediaDataRepresentation.c"
 }
 
 
@@ -2619,7 +2635,7 @@ gchar* media_source_get_comment (MediaSource* self) {
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
 #line 161 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_comment (self);
-#line 2621 "MediaDataRepresentation.c"
+#line 2637 "MediaDataRepresentation.c"
 }
 
 
@@ -2628,7 +2644,7 @@ static void media_source_real_set_title (MediaSource* self, const gchar* title)
 	g_critical ("Type `%s' does not implement abstract method `media_source_set_title'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2630 "MediaDataRepresentation.c"
+#line 2646 "MediaDataRepresentation.c"
 }
 
 
@@ -2637,7 +2653,7 @@ void media_source_set_title (MediaSource* self, const gchar* title) {
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
 #line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->set_title (self, title);
-#line 2639 "MediaDataRepresentation.c"
+#line 2655 "MediaDataRepresentation.c"
 }
 
 
@@ -2647,7 +2663,7 @@ static gboolean media_source_real_set_comment (MediaSource* self, const gchar* c
 	g_critical ("Type `%s' does not implement abstract method `media_source_set_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 2649 "MediaDataRepresentation.c"
+#line 2665 "MediaDataRepresentation.c"
 }
 
 
@@ -2656,14 +2672,14 @@ gboolean media_source_set_comment (MediaSource* self, const gchar* comment) {
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE);
 #line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->set_comment (self, comment);
-#line 2658 "MediaDataRepresentation.c"
+#line 2674 "MediaDataRepresentation.c"
 }
 
 
 gchar* media_source_prep_title (const gchar* title) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 166 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = title;
 #line 166 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2672,14 +2688,14 @@ gchar* media_source_prep_title (const gchar* title) {
 	result = _tmp1_;
 #line 166 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 2674 "MediaDataRepresentation.c"
+#line 2690 "MediaDataRepresentation.c"
 }
 
 
 gchar* media_source_prep_comment (const gchar* comment) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 171 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = comment;
 #line 171 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2688,7 +2704,7 @@ gchar* media_source_prep_comment (const gchar* comment) {
 	result = _tmp1_;
 #line 171 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 2690 "MediaDataRepresentation.c"
+#line 2706 "MediaDataRepresentation.c"
 }
 
 
@@ -2697,7 +2713,7 @@ static Rating media_source_real_get_rating (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 175 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return 0;
-#line 2699 "MediaDataRepresentation.c"
+#line 2715 "MediaDataRepresentation.c"
 }
 
 
@@ -2706,7 +2722,7 @@ Rating media_source_get_rating (MediaSource* self) {
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0);
 #line 175 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_rating (self);
-#line 2708 "MediaDataRepresentation.c"
+#line 2724 "MediaDataRepresentation.c"
 }
 
 
@@ -2715,7 +2731,7 @@ static void media_source_real_set_rating (MediaSource* self, Rating rating) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_set_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 176 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2717 "MediaDataRepresentation.c"
+#line 2733 "MediaDataRepresentation.c"
 }
 
 
@@ -2724,7 +2740,7 @@ void media_source_set_rating (MediaSource* self, Rating rating) {
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
 #line 176 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->set_rating (self, rating);
-#line 2726 "MediaDataRepresentation.c"
+#line 2742 "MediaDataRepresentation.c"
 }
 
 
@@ -2733,7 +2749,7 @@ static void media_source_real_increase_rating (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_increase_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2735 "MediaDataRepresentation.c"
+#line 2751 "MediaDataRepresentation.c"
 }
 
 
@@ -2742,7 +2758,7 @@ void media_source_increase_rating (MediaSource* self) {
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
 #line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->increase_rating (self);
-#line 2744 "MediaDataRepresentation.c"
+#line 2760 "MediaDataRepresentation.c"
 }
 
 
@@ -2751,7 +2767,7 @@ static void media_source_real_decrease_rating (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_decrease_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2753 "MediaDataRepresentation.c"
+#line 2769 "MediaDataRepresentation.c"
 }
 
 
@@ -2760,7 +2776,7 @@ void media_source_decrease_rating (MediaSource* self) {
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
 #line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->decrease_rating (self);
-#line 2762 "MediaDataRepresentation.c"
+#line 2778 "MediaDataRepresentation.c"
 }
 
 
@@ -2769,7 +2785,7 @@ static void media_source_real_get_dimensions (MediaSource* self, PhotoException
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_dimensions'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2771 "MediaDataRepresentation.c"
+#line 2787 "MediaDataRepresentation.c"
 }
 
 
@@ -2778,7 +2794,7 @@ void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_s
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
 #line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->get_dimensions (self, disallowed_steps, result);
-#line 2780 "MediaDataRepresentation.c"
+#line 2796 "MediaDataRepresentation.c"
 }
 
 
@@ -2787,7 +2803,7 @@ static GdkPixbuf* media_source_real_get_preview_pixbuf (MediaSource* self, Scali
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_preview_pixbuf'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 188 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 2789 "MediaDataRepresentation.c"
+#line 2805 "MediaDataRepresentation.c"
 }
 
 
@@ -2796,7 +2812,7 @@ GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, Scaling* scaling,
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
 #line 188 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_preview_pixbuf (self, scaling, error);
-#line 2798 "MediaDataRepresentation.c"
+#line 2814 "MediaDataRepresentation.c"
 }
 
 
@@ -2806,7 +2822,7 @@ static gboolean media_source_real_is_trashed (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_is_trashed'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 2808 "MediaDataRepresentation.c"
+#line 2824 "MediaDataRepresentation.c"
 }
 
 
@@ -2815,7 +2831,7 @@ gboolean media_source_is_trashed (MediaSource* self) {
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE);
 #line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->is_trashed (self);
-#line 2817 "MediaDataRepresentation.c"
+#line 2833 "MediaDataRepresentation.c"
 }
 
 
@@ -2824,7 +2840,7 @@ static void media_source_real_trash (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_trash'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 191 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2826 "MediaDataRepresentation.c"
+#line 2842 "MediaDataRepresentation.c"
 }
 
 
@@ -2833,7 +2849,7 @@ void media_source_trash (MediaSource* self) {
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
 #line 191 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->trash (self);
-#line 2835 "MediaDataRepresentation.c"
+#line 2851 "MediaDataRepresentation.c"
 }
 
 
@@ -2842,7 +2858,7 @@ static void media_source_real_untrash (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_untrash'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2844 "MediaDataRepresentation.c"
+#line 2860 "MediaDataRepresentation.c"
 }
 
 
@@ -2851,7 +2867,7 @@ void media_source_untrash (MediaSource* self) {
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
 #line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->untrash (self);
-#line 2853 "MediaDataRepresentation.c"
+#line 2869 "MediaDataRepresentation.c"
 }
 
 
@@ -2861,7 +2877,7 @@ static gboolean media_source_real_is_offline (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_is_offline'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 2863 "MediaDataRepresentation.c"
+#line 2879 "MediaDataRepresentation.c"
 }
 
 
@@ -2870,7 +2886,7 @@ gboolean media_source_is_offline (MediaSource* self) {
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE);
 #line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->is_offline (self);
-#line 2872 "MediaDataRepresentation.c"
+#line 2888 "MediaDataRepresentation.c"
 }
 
 
@@ -2879,7 +2895,7 @@ static void media_source_real_mark_offline (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_mark_offline'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 195 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2881 "MediaDataRepresentation.c"
+#line 2897 "MediaDataRepresentation.c"
 }
 
 
@@ -2888,7 +2904,7 @@ void media_source_mark_offline (MediaSource* self) {
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
 #line 195 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->mark_offline (self);
-#line 2890 "MediaDataRepresentation.c"
+#line 2906 "MediaDataRepresentation.c"
 }
 
 
@@ -2897,7 +2913,7 @@ static void media_source_real_mark_online (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_mark_online'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2899 "MediaDataRepresentation.c"
+#line 2915 "MediaDataRepresentation.c"
 }
 
 
@@ -2906,7 +2922,7 @@ void media_source_mark_online (MediaSource* self) {
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
 #line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->mark_online (self);
-#line 2908 "MediaDataRepresentation.c"
+#line 2924 "MediaDataRepresentation.c"
 }
 
 
@@ -2915,7 +2931,7 @@ static gchar* media_source_real_get_master_md5 (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_master_md5'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 2917 "MediaDataRepresentation.c"
+#line 2933 "MediaDataRepresentation.c"
 }
 
 
@@ -2924,7 +2940,7 @@ gchar* media_source_get_master_md5 (MediaSource* self) {
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
 #line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_master_md5 (self);
-#line 2926 "MediaDataRepresentation.c"
+#line 2942 "MediaDataRepresentation.c"
 }
 
 
@@ -2933,7 +2949,7 @@ static void media_source_real_get_event_id (MediaSource* self, EventID* result)
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_event_id'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 202 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2935 "MediaDataRepresentation.c"
+#line 2951 "MediaDataRepresentation.c"
 }
 
 
@@ -2942,30 +2958,30 @@ void media_source_get_event_id (MediaSource* self, EventID* result) {
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
 #line 202 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->get_event_id (self, result);
-#line 2944 "MediaDataRepresentation.c"
+#line 2960 "MediaDataRepresentation.c"
 }
 
 
 Event* media_source_get_event (MediaSource* self) {
 	Event* result = NULL;
-	Event* _tmp0_ = NULL;
+	Event* _tmp0_;
 	EventID event_id = {0};
 	EventID _tmp3_ = {0};
-	gboolean _tmp4_ = FALSE;
-	EventSourceCollection* _tmp5_ = NULL;
-	EventID _tmp6_ = {0};
-	Event* _tmp7_ = NULL;
-	Event* _tmp8_ = NULL;
-	Event* _tmp9_ = NULL;
+	gboolean _tmp4_;
+	EventSourceCollection* _tmp5_;
+	EventID _tmp6_;
+	Event* _tmp7_;
+	Event* _tmp8_;
+	Event* _tmp9_;
 #line 204 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
 #line 205 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->event;
 #line 205 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp0_ != NULL) {
-#line 2965 "MediaDataRepresentation.c"
-		Event* _tmp1_ = NULL;
-		Event* _tmp2_ = NULL;
+#line 2981 "MediaDataRepresentation.c"
+		Event* _tmp1_;
+		Event* _tmp2_;
 #line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = self->priv->event;
 #line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2974,7 +2990,7 @@ Event* media_source_get_event (MediaSource* self) {
 		result = _tmp2_;
 #line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 2976 "MediaDataRepresentation.c"
+#line 2992 "MediaDataRepresentation.c"
 	}
 #line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_get_event_id (self, &_tmp3_);
@@ -2988,7 +3004,7 @@ Event* media_source_get_event (MediaSource* self) {
 		result = NULL;
 #line 210 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 2990 "MediaDataRepresentation.c"
+#line 3006 "MediaDataRepresentation.c"
 	}
 #line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp5_ = event_global;
@@ -3008,23 +3024,23 @@ Event* media_source_get_event (MediaSource* self) {
 	result = _tmp9_;
 #line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 3010 "MediaDataRepresentation.c"
+#line 3026 "MediaDataRepresentation.c"
 }
 
 
 gboolean media_source_set_event (MediaSource* self, Event* new_event) {
 	gboolean result = FALSE;
 	EventID _tmp0_ = {0};
-	Event* _tmp1_ = NULL;
+	Event* _tmp1_;
 	EventID event_id = {0};
 	EventID _tmp4_ = {0};
-	gint64 _tmp5_ = 0LL;
-	EventID _tmp6_ = {0};
-	gint64 _tmp7_ = 0LL;
+	gint64 _tmp5_;
+	EventID _tmp6_;
+	gint64 _tmp7_;
 	gboolean committed = FALSE;
-	EventID _tmp8_ = {0};
-	gboolean _tmp9_ = FALSE;
-	gboolean _tmp10_ = FALSE;
+	EventID _tmp8_;
+	gboolean _tmp9_;
+	gboolean _tmp10_;
 #line 217 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE);
 #line 217 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3033,8 +3049,8 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) {
 	_tmp1_ = new_event;
 #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp1_ != NULL) {
-#line 3035 "MediaDataRepresentation.c"
-		Event* _tmp2_ = NULL;
+#line 3051 "MediaDataRepresentation.c"
+		Event* _tmp2_;
 		EventID _tmp3_ = {0};
 #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = new_event;
@@ -3042,11 +3058,11 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) {
 		event_get_event_id (_tmp2_, &_tmp3_);
 #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = _tmp3_;
-#line 3044 "MediaDataRepresentation.c"
+#line 3060 "MediaDataRepresentation.c"
 	} else {
 #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		event_id_init (&_tmp0_, EVENT_ID_INVALID);
-#line 3048 "MediaDataRepresentation.c"
+#line 3064 "MediaDataRepresentation.c"
 	}
 #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	event_id = _tmp0_;
@@ -3064,7 +3080,7 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) {
 		result = TRUE;
 #line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 3066 "MediaDataRepresentation.c"
+#line 3082 "MediaDataRepresentation.c"
 	}
 #line 222 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp8_ = event_id;
@@ -3076,36 +3092,36 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) {
 	_tmp10_ = committed;
 #line 223 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp10_) {
-#line 3078 "MediaDataRepresentation.c"
-		Event* _tmp11_ = NULL;
-		Event* _tmp13_ = NULL;
-		Event* _tmp15_ = NULL;
-		Event* _tmp16_ = NULL;
-		Alteration* _tmp17_ = NULL;
-		Alteration* _tmp18_ = NULL;
+#line 3094 "MediaDataRepresentation.c"
+		Event* _tmp11_;
+		Event* _tmp13_;
+		Event* _tmp15_;
+		Event* _tmp16_;
+		Alteration* _tmp17_;
+		Alteration* _tmp18_;
 #line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp11_ = self->priv->event;
 #line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (_tmp11_ != NULL) {
-#line 3089 "MediaDataRepresentation.c"
-			Event* _tmp12_ = NULL;
+#line 3105 "MediaDataRepresentation.c"
+			Event* _tmp12_;
 #line 225 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp12_ = self->priv->event;
 #line 225 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			event_detach (_tmp12_, self);
-#line 3095 "MediaDataRepresentation.c"
+#line 3111 "MediaDataRepresentation.c"
 		}
 #line 227 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp13_ = new_event;
 #line 227 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (_tmp13_ != NULL) {
-#line 3101 "MediaDataRepresentation.c"
-			Event* _tmp14_ = NULL;
+#line 3117 "MediaDataRepresentation.c"
+			Event* _tmp14_;
 #line 228 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp14_ = new_event;
 #line 228 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			event_attach (_tmp14_, self);
-#line 3107 "MediaDataRepresentation.c"
+#line 3123 "MediaDataRepresentation.c"
 		}
 #line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp15_ = new_event;
@@ -3123,25 +3139,25 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_);
 #line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_alteration_unref0 (_tmp18_);
-#line 3125 "MediaDataRepresentation.c"
+#line 3141 "MediaDataRepresentation.c"
 	}
 #line 235 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = committed;
 #line 235 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 3131 "MediaDataRepresentation.c"
+#line 3147 "MediaDataRepresentation.c"
 }
 
 
 void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, TransactionController* controller, GError** error) {
 	EventID _tmp0_ = {0};
-	Event* _tmp1_ = NULL;
+	Event* _tmp1_;
 	EventID event_id = {0};
-	TransactionController* _tmp4_ = NULL;
-	Event* _tmp21_ = NULL;
+	TransactionController* _tmp4_;
+	Event* _tmp21_;
 	Alteration* alteration = NULL;
-	Alteration* _tmp24_ = NULL;
-	TransactionController* _tmp33_ = NULL;
+	Alteration* _tmp24_;
+	TransactionController* _tmp33_;
 #line 238 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media_sources));
 #line 238 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3152,8 +3168,8 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event,
 	_tmp1_ = event;
 #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp1_ != NULL) {
-#line 3154 "MediaDataRepresentation.c"
-		Event* _tmp2_ = NULL;
+#line 3170 "MediaDataRepresentation.c"
+		Event* _tmp2_;
 		EventID _tmp3_ = {0};
 #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = event;
@@ -3161,11 +3177,11 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event,
 		event_get_event_id (_tmp2_, &_tmp3_);
 #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = _tmp3_;
-#line 3163 "MediaDataRepresentation.c"
+#line 3179 "MediaDataRepresentation.c"
 	} else {
 #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		event_id_init (&_tmp0_, EVENT_ID_INVALID);
-#line 3167 "MediaDataRepresentation.c"
+#line 3183 "MediaDataRepresentation.c"
 	}
 #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	event_id = _tmp0_;
@@ -3173,11 +3189,11 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event,
 	_tmp4_ = controller;
 #line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	transaction_controller_begin (_tmp4_);
-#line 3175 "MediaDataRepresentation.c"
+#line 3191 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _media_it = NULL;
-		GeeCollection* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
+		GeeCollection* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = media_sources;
 #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3186,21 +3202,21 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event,
 		_media_it = _tmp6_;
 #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 3188 "MediaDataRepresentation.c"
-			GeeIterator* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+#line 3204 "MediaDataRepresentation.c"
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			MediaSource* media = NULL;
-			GeeIterator* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
 			Event* old_event = NULL;
-			MediaSource* _tmp11_ = NULL;
-			Event* _tmp12_ = NULL;
-			Event* _tmp13_ = NULL;
-			MediaSource* _tmp16_ = NULL;
-			EventID _tmp17_ = {0};
-			MediaSource* _tmp18_ = NULL;
-			Event* _tmp19_ = NULL;
-			Event* _tmp20_ = NULL;
+			MediaSource* _tmp11_;
+			Event* _tmp12_;
+			Event* _tmp13_;
+			MediaSource* _tmp16_;
+			EventID _tmp17_;
+			MediaSource* _tmp18_;
+			Event* _tmp19_;
+			Event* _tmp20_;
 #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = _media_it;
 #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3209,7 +3225,7 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event,
 			if (!_tmp8_) {
 #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 3211 "MediaDataRepresentation.c"
+#line 3227 "MediaDataRepresentation.c"
 			}
 #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp9_ = _media_it;
@@ -3227,16 +3243,16 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event,
 			_tmp13_ = old_event;
 #line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp13_ != NULL) {
-#line 3229 "MediaDataRepresentation.c"
-				Event* _tmp14_ = NULL;
-				MediaSource* _tmp15_ = NULL;
+#line 3245 "MediaDataRepresentation.c"
+				Event* _tmp14_;
+				MediaSource* _tmp15_;
 #line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp14_ = old_event;
 #line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp15_ = media;
 #line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				event_detach (_tmp14_, _tmp15_);
-#line 3238 "MediaDataRepresentation.c"
+#line 3254 "MediaDataRepresentation.c"
 			}
 #line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp16_ = media;
@@ -3258,36 +3274,36 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event,
 			_g_object_unref0 (old_event);
 #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (media);
-#line 3260 "MediaDataRepresentation.c"
+#line 3276 "MediaDataRepresentation.c"
 		}
 #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_media_it);
-#line 3264 "MediaDataRepresentation.c"
+#line 3280 "MediaDataRepresentation.c"
 	}
 #line 253 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp21_ = event;
 #line 253 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp21_ != NULL) {
-#line 3270 "MediaDataRepresentation.c"
-		Event* _tmp22_ = NULL;
-		GeeCollection* _tmp23_ = NULL;
+#line 3286 "MediaDataRepresentation.c"
+		Event* _tmp22_;
+		GeeCollection* _tmp23_;
 #line 254 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp22_ = event;
 #line 254 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp23_ = media_sources;
 #line 254 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		event_attach_many (_tmp22_, _tmp23_);
-#line 3279 "MediaDataRepresentation.c"
+#line 3295 "MediaDataRepresentation.c"
 	}
 #line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp24_ = alteration_new ("metadata", "event");
 #line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	alteration = _tmp24_;
-#line 3285 "MediaDataRepresentation.c"
+#line 3301 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _media_it = NULL;
-		GeeCollection* _tmp25_ = NULL;
-		GeeIterator* _tmp26_ = NULL;
+		GeeCollection* _tmp25_;
+		GeeIterator* _tmp26_;
 #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp25_ = media_sources;
 #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3296,14 +3312,14 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event,
 		_media_it = _tmp26_;
 #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 3298 "MediaDataRepresentation.c"
-			GeeIterator* _tmp27_ = NULL;
-			gboolean _tmp28_ = FALSE;
+#line 3314 "MediaDataRepresentation.c"
+			GeeIterator* _tmp27_;
+			gboolean _tmp28_;
 			MediaSource* media = NULL;
-			GeeIterator* _tmp29_ = NULL;
-			gpointer _tmp30_ = NULL;
-			MediaSource* _tmp31_ = NULL;
-			Alteration* _tmp32_ = NULL;
+			GeeIterator* _tmp29_;
+			gpointer _tmp30_;
+			MediaSource* _tmp31_;
+			Alteration* _tmp32_;
 #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp27_ = _media_it;
 #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3312,7 +3328,7 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event,
 			if (!_tmp28_) {
 #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 3314 "MediaDataRepresentation.c"
+#line 3330 "MediaDataRepresentation.c"
 			}
 #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp29_ = _media_it;
@@ -3328,11 +3344,11 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event,
 			data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject), _tmp32_);
 #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (media);
-#line 3330 "MediaDataRepresentation.c"
+#line 3346 "MediaDataRepresentation.c"
 		}
 #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_media_it);
-#line 3334 "MediaDataRepresentation.c"
+#line 3350 "MediaDataRepresentation.c"
 	}
 #line 260 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp33_ = controller;
@@ -3340,7 +3356,7 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event,
 	transaction_controller_commit (_tmp33_);
 #line 238 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_alteration_unref0 (alteration);
-#line 3342 "MediaDataRepresentation.c"
+#line 3358 "MediaDataRepresentation.c"
 }
 
 
@@ -3350,7 +3366,7 @@ static time_t media_source_real_get_exposure_time (MediaSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_exposure_time'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 263 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 3352 "MediaDataRepresentation.c"
+#line 3368 "MediaDataRepresentation.c"
 }
 
 
@@ -3359,7 +3375,7 @@ time_t media_source_get_exposure_time (MediaSource* self) {
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0);
 #line 263 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_exposure_time (self);
-#line 3361 "MediaDataRepresentation.c"
+#line 3377 "MediaDataRepresentation.c"
 }
 
 
@@ -3368,7 +3384,7 @@ static void media_source_real_get_import_id (MediaSource* self, ImportID* result
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_import_id'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 3370 "MediaDataRepresentation.c"
+#line 3386 "MediaDataRepresentation.c"
 }
 
 
@@ -3377,7 +3393,7 @@ void media_source_get_import_id (MediaSource* self, ImportID* result) {
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
 #line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->get_import_id (self, result);
-#line 3379 "MediaDataRepresentation.c"
+#line 3395 "MediaDataRepresentation.c"
 }
 
 
@@ -3386,7 +3402,7 @@ static void media_source_real_master_replaced (MediaSource* self, GFile* old_fil
 	g_return_if_fail (G_IS_FILE (old_file));
 #line 33 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (G_IS_FILE (new_file));
-#line 3388 "MediaDataRepresentation.c"
+#line 3404 "MediaDataRepresentation.c"
 }
 
 
@@ -3405,19 +3421,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 		data1 = closure->data;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 3407 "MediaDataRepresentation.c"
+#line 3423 "MediaDataRepresentation.c"
 	} else {
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		data2 = closure->data;
-#line 3413 "MediaDataRepresentation.c"
+#line 3429 "MediaDataRepresentation.c"
 	}
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 3419 "MediaDataRepresentation.c"
+#line 3435 "MediaDataRepresentation.c"
 }
 
 
@@ -3427,76 +3443,76 @@ static void media_source_class_init (MediaSourceClass * klass) {
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_type_class_add_private (klass, sizeof (MediaSourcePrivate));
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->notify_master_replaced = (void (*)(MediaSource*, GFile*, GFile*)) media_source_real_notify_master_replaced;
+	((MediaSourceClass *) klass)->notify_master_replaced = (void (*) (MediaSource *, GFile*, GFile*)) media_source_real_notify_master_replaced;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) media_source_real_notify_altered;
+	((DataObjectClass *) klass)->notify_altered = (void (*) (DataObject *, Alteration*)) media_source_real_notify_altered;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((DataObjectClass *) klass)->notify_membership_changed = (void (*)(DataObject*, DataCollection*)) media_source_real_notify_membership_changed;
+	((DataObjectClass *) klass)->notify_membership_changed = (void (*) (DataObject *, DataCollection*)) media_source_real_notify_membership_changed;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->set_event_id = (gboolean (*)(MediaSource*, EventID*)) media_source_real_set_event_id;
+	((MediaSourceClass *) klass)->set_event_id = (gboolean (*) (MediaSource *, EventID*)) media_source_real_set_event_id;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) media_source_real_get_name;
+	((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) media_source_real_get_name;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->get_basename = (gchar* (*)(MediaSource*)) media_source_real_get_basename;
+	((MediaSourceClass *) klass)->get_basename = (gchar* (*) (MediaSource *)) media_source_real_get_basename;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->get_file = (GFile* (*)(MediaSource*)) media_source_real_get_file;
+	((MediaSourceClass *) klass)->get_file = (GFile* (*) (MediaSource *)) media_source_real_get_file;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->get_master_file = (GFile* (*)(MediaSource*)) media_source_real_get_master_file;
+	((MediaSourceClass *) klass)->get_master_file = (GFile* (*) (MediaSource *)) media_source_real_get_master_file;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->get_master_filesize = (guint64 (*)(MediaSource*)) media_source_real_get_master_filesize;
+	((MediaSourceClass *) klass)->get_master_filesize = (guint64 (*) (MediaSource *)) media_source_real_get_master_filesize;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->get_filesize = (guint64 (*)(MediaSource*)) media_source_real_get_filesize;
+	((MediaSourceClass *) klass)->get_filesize = (guint64 (*) (MediaSource *)) media_source_real_get_filesize;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->get_timestamp = (time_t (*)(MediaSource*)) media_source_real_get_timestamp;
+	((MediaSourceClass *) klass)->get_timestamp = (time_t (*) (MediaSource *)) media_source_real_get_timestamp;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->get_backing_files_state = (BackingFileState** (*)(MediaSource*, int*)) media_source_real_get_backing_files_state;
+	((MediaSourceClass *) klass)->get_backing_files_state = (BackingFileState** (*) (MediaSource *, int*)) media_source_real_get_backing_files_state;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->get_title = (gchar* (*)(MediaSource*)) media_source_real_get_title;
+	((MediaSourceClass *) klass)->get_title = (gchar* (*) (MediaSource *)) media_source_real_get_title;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->get_comment = (gchar* (*)(MediaSource*)) media_source_real_get_comment;
+	((MediaSourceClass *) klass)->get_comment = (gchar* (*) (MediaSource *)) media_source_real_get_comment;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->set_title = (void (*)(MediaSource*, const gchar*)) media_source_real_set_title;
+	((MediaSourceClass *) klass)->set_title = (void (*) (MediaSource *, const gchar*)) media_source_real_set_title;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->set_comment = (gboolean (*)(MediaSource*, const gchar*)) media_source_real_set_comment;
+	((MediaSourceClass *) klass)->set_comment = (gboolean (*) (MediaSource *, const gchar*)) media_source_real_set_comment;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->get_rating = (Rating (*)(MediaSource*)) media_source_real_get_rating;
+	((MediaSourceClass *) klass)->get_rating = (Rating (*) (MediaSource *)) media_source_real_get_rating;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->set_rating = (void (*)(MediaSource*, Rating)) media_source_real_set_rating;
+	((MediaSourceClass *) klass)->set_rating = (void (*) (MediaSource *, Rating)) media_source_real_set_rating;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->increase_rating = (void (*)(MediaSource*)) media_source_real_increase_rating;
+	((MediaSourceClass *) klass)->increase_rating = (void (*) (MediaSource *)) media_source_real_increase_rating;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->decrease_rating = (void (*)(MediaSource*)) media_source_real_decrease_rating;
+	((MediaSourceClass *) klass)->decrease_rating = (void (*) (MediaSource *)) media_source_real_decrease_rating;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->get_dimensions = (void (*)(MediaSource*, PhotoException, Dimensions*)) media_source_real_get_dimensions;
+	((MediaSourceClass *) klass)->get_dimensions = (void (*) (MediaSource *, PhotoException, Dimensions*)) media_source_real_get_dimensions;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*)(MediaSource*, Scaling*, GError**)) media_source_real_get_preview_pixbuf;
+	((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*) (MediaSource *, Scaling*, GError**)) media_source_real_get_preview_pixbuf;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->is_trashed = (gboolean (*)(MediaSource*)) media_source_real_is_trashed;
+	((MediaSourceClass *) klass)->is_trashed = (gboolean (*) (MediaSource *)) media_source_real_is_trashed;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->trash = (void (*)(MediaSource*)) media_source_real_trash;
+	((MediaSourceClass *) klass)->trash = (void (*) (MediaSource *)) media_source_real_trash;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->untrash = (void (*)(MediaSource*)) media_source_real_untrash;
+	((MediaSourceClass *) klass)->untrash = (void (*) (MediaSource *)) media_source_real_untrash;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->is_offline = (gboolean (*)(MediaSource*)) media_source_real_is_offline;
+	((MediaSourceClass *) klass)->is_offline = (gboolean (*) (MediaSource *)) media_source_real_is_offline;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->mark_offline = (void (*)(MediaSource*)) media_source_real_mark_offline;
+	((MediaSourceClass *) klass)->mark_offline = (void (*) (MediaSource *)) media_source_real_mark_offline;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->mark_online = (void (*)(MediaSource*)) media_source_real_mark_online;
+	((MediaSourceClass *) klass)->mark_online = (void (*) (MediaSource *)) media_source_real_mark_online;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->get_master_md5 = (gchar* (*)(MediaSource*)) media_source_real_get_master_md5;
+	((MediaSourceClass *) klass)->get_master_md5 = (gchar* (*) (MediaSource *)) media_source_real_get_master_md5;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->get_event_id = (void (*)(MediaSource*, EventID*)) media_source_real_get_event_id;
+	((MediaSourceClass *) klass)->get_event_id = (void (*) (MediaSource *, EventID*)) media_source_real_get_event_id;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->get_exposure_time = (time_t (*)(MediaSource*)) media_source_real_get_exposure_time;
+	((MediaSourceClass *) klass)->get_exposure_time = (time_t (*) (MediaSource *)) media_source_real_get_exposure_time;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceClass *) klass)->get_import_id = (void (*)(MediaSource*, ImportID*)) media_source_real_get_import_id;
+	((MediaSourceClass *) klass)->get_import_id = (void (*) (MediaSource *, ImportID*)) media_source_real_get_import_id;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceClass *) klass)->master_replaced = media_source_real_master_replaced;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	G_OBJECT_CLASS (klass)->finalize = media_source_finalize;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_signal_new ("master_replaced", TYPE_MEDIA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceClass, master_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_get_type ());
-#line 3498 "MediaDataRepresentation.c"
+	media_source_signals[MEDIA_SOURCE_MASTER_REPLACED_SIGNAL] = g_signal_new ("master-replaced", TYPE_MEDIA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceClass, master_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_get_type ());
+#line 3514 "MediaDataRepresentation.c"
 }
 
 
@@ -3504,8 +3520,8 @@ static void media_source_indexable_interface_init (IndexableIface * iface) {
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_indexable_parent_iface = g_type_interface_peek_parent (iface);
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	iface->get_indexable_keywords = (const gchar* (*)(Indexable*)) media_source_real_get_indexable_keywords;
-#line 3507 "MediaDataRepresentation.c"
+	iface->get_indexable_keywords = (const gchar* (*) (Indexable *)) media_source_real_get_indexable_keywords;
+#line 3523 "MediaDataRepresentation.c"
 }
 
 
@@ -3516,11 +3532,11 @@ static void media_source_instance_init (MediaSource * self) {
 	self->priv->event = NULL;
 #line 37 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->indexable_keywords = NULL;
-#line 3518 "MediaDataRepresentation.c"
+#line 3534 "MediaDataRepresentation.c"
 }
 
 
-static void media_source_finalize (GObject* obj) {
+static void media_source_finalize (GObject * obj) {
 	MediaSource * self;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE, MediaSource);
@@ -3530,7 +3546,7 @@ static void media_source_finalize (GObject* obj) {
 	_g_free0 (self->priv->indexable_keywords);
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	G_OBJECT_CLASS (media_source_parent_class)->finalize (obj);
-#line 3532 "MediaDataRepresentation.c"
+#line 3548 "MediaDataRepresentation.c"
 }
 
 
@@ -3553,7 +3569,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
 	result = file_hash ((GFile*) v);
 #line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 3555 "MediaDataRepresentation.c"
+#line 3571 "MediaDataRepresentation.c"
 }
 
 
@@ -3562,17 +3578,17 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer
 	result = file_equal ((GFile*) a, (GFile*) b);
 #line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 3564 "MediaDataRepresentation.c"
+#line 3580 "MediaDataRepresentation.c"
 }
 
 
 MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type, MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) {
 	MediaSourceHoldingTank* self = NULL;
-	MediaSourceCollection* _tmp0_ = NULL;
-	SourceHoldingTankCheckToKeep _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	GetSourceDatabaseKey _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
+	MediaSourceCollection* _tmp0_;
+	SourceHoldingTankCheckToKeep _tmp1_;
+	void* _tmp1__target;
+	GetSourceDatabaseKey _tmp2_;
+	void* _tmp2__target;
 #line 272 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (sources), NULL);
 #line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3589,22 +3605,22 @@ MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type,
 	self = (MediaSourceHoldingTank*) database_source_holding_tank_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp1_, _tmp1__target, _tmp2_, _tmp2__target);
 #line 272 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self;
-#line 3591 "MediaDataRepresentation.c"
+#line 3607 "MediaDataRepresentation.c"
 }
 
 
 MediaSourceHoldingTank* media_source_holding_tank_new (MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) {
 #line 272 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return media_source_holding_tank_construct (TYPE_MEDIA_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target, get_key, get_key_target);
-#line 3598 "MediaDataRepresentation.c"
+#line 3614 "MediaDataRepresentation.c"
 }
 
 
 MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self, GFile* file) {
 	MediaSource* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gpointer _tmp2_;
 #line 277 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_HOLDING_TANK (self), NULL);
 #line 277 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3619,7 +3635,7 @@ MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingT
 	result = (MediaSource*) _tmp2_;
 #line 278 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 3621 "MediaDataRepresentation.c"
+#line 3637 "MediaDataRepresentation.c"
 }
 
 
@@ -3629,15 +3645,15 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel
 	g_return_val_if_fail (IS_MEDIA_SOURCE_HOLDING_TANK (self), NULL);
 #line 281 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (md5 != NULL, NULL);
-#line 3631 "MediaDataRepresentation.c"
+#line 3647 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeHashMap* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeHashMap* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = self->priv->master_file_map;
 #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3656,17 +3672,17 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel
 		_source_it = _tmp5_;
 #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 3658 "MediaDataRepresentation.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 3674 "MediaDataRepresentation.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSource* source = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			MediaSource* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-			gchar* _tmp12_ = NULL;
-			const gchar* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			MediaSource* _tmp10_;
+			gchar* _tmp11_;
+			gchar* _tmp12_;
+			const gchar* _tmp13_;
+			gboolean _tmp14_;
 #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _source_it;
 #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3675,7 +3691,7 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel
 			if (!_tmp7_) {
 #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 3677 "MediaDataRepresentation.c"
+#line 3693 "MediaDataRepresentation.c"
 			}
 #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = _source_it;
@@ -3703,37 +3719,37 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel
 				_g_object_unref0 (_source_it);
 #line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				return result;
-#line 3705 "MediaDataRepresentation.c"
+#line 3721 "MediaDataRepresentation.c"
 			}
 #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (source);
-#line 3709 "MediaDataRepresentation.c"
+#line 3725 "MediaDataRepresentation.c"
 		}
 #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_source_it);
-#line 3713 "MediaDataRepresentation.c"
+#line 3729 "MediaDataRepresentation.c"
 	}
 #line 288 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = NULL;
 #line 288 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 3719 "MediaDataRepresentation.c"
+#line 3735 "MediaDataRepresentation.c"
 }
 
 
 static void _media_source_holding_tank_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self) {
 #line 297 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_holding_tank_on_master_source_replaced ((MediaSourceHoldingTank*) self, _sender, old_file, new_file);
-#line 3726 "MediaDataRepresentation.c"
+#line 3742 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed) {
 	MediaSourceHoldingTank * self;
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp15_ = NULL;
-	GeeCollection* _tmp33_ = NULL;
-	GeeCollection* _tmp34_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp15_;
+	GeeCollection* _tmp33_;
+	GeeCollection* _tmp34_;
 #line 291 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank);
 #line 291 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3744,11 +3760,11 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin
 	_tmp0_ = added;
 #line 293 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp0_ != NULL) {
-#line 3746 "MediaDataRepresentation.c"
+#line 3762 "MediaDataRepresentation.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp1_ = NULL;
-			GeeIterator* _tmp2_ = NULL;
+			GeeCollection* _tmp1_;
+			GeeIterator* _tmp2_;
 #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp1_ = added;
 #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3757,21 +3773,21 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin
 			_source_it = _tmp2_;
 #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			while (TRUE) {
-#line 3759 "MediaDataRepresentation.c"
-				GeeIterator* _tmp3_ = NULL;
-				gboolean _tmp4_ = FALSE;
+#line 3775 "MediaDataRepresentation.c"
+				GeeIterator* _tmp3_;
+				gboolean _tmp4_;
 				DataSource* source = NULL;
-				GeeIterator* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
+				GeeIterator* _tmp5_;
+				gpointer _tmp6_;
 				MediaSource* media_source = NULL;
-				DataSource* _tmp7_ = NULL;
-				MediaSource* _tmp8_ = NULL;
-				GeeHashMap* _tmp9_ = NULL;
-				MediaSource* _tmp10_ = NULL;
-				GFile* _tmp11_ = NULL;
-				GFile* _tmp12_ = NULL;
-				MediaSource* _tmp13_ = NULL;
-				MediaSource* _tmp14_ = NULL;
+				DataSource* _tmp7_;
+				MediaSource* _tmp8_;
+				GeeHashMap* _tmp9_;
+				MediaSource* _tmp10_;
+				GFile* _tmp11_;
+				GFile* _tmp12_;
+				MediaSource* _tmp13_;
+				MediaSource* _tmp14_;
 #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp3_ = _source_it;
 #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3780,7 +3796,7 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin
 				if (!_tmp4_) {
 #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					break;
-#line 3782 "MediaDataRepresentation.c"
+#line 3798 "MediaDataRepresentation.c"
 				}
 #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp5_ = _source_it;
@@ -3816,22 +3832,22 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin
 				_g_object_unref0 (media_source);
 #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (source);
-#line 3818 "MediaDataRepresentation.c"
+#line 3834 "MediaDataRepresentation.c"
 			}
 #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (_source_it);
-#line 3822 "MediaDataRepresentation.c"
+#line 3838 "MediaDataRepresentation.c"
 		}
 	}
 #line 301 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp15_ = removed;
 #line 301 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp15_ != NULL) {
-#line 3829 "MediaDataRepresentation.c"
+#line 3845 "MediaDataRepresentation.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp16_ = NULL;
-			GeeIterator* _tmp17_ = NULL;
+			GeeCollection* _tmp16_;
+			GeeIterator* _tmp17_;
 #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp16_ = removed;
 #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3840,25 +3856,25 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin
 			_source_it = _tmp17_;
 #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			while (TRUE) {
-#line 3842 "MediaDataRepresentation.c"
-				GeeIterator* _tmp18_ = NULL;
-				gboolean _tmp19_ = FALSE;
+#line 3858 "MediaDataRepresentation.c"
+				GeeIterator* _tmp18_;
+				gboolean _tmp19_;
 				DataSource* source = NULL;
-				GeeIterator* _tmp20_ = NULL;
-				gpointer _tmp21_ = NULL;
+				GeeIterator* _tmp20_;
+				gpointer _tmp21_;
 				MediaSource* media_source = NULL;
-				DataSource* _tmp22_ = NULL;
-				MediaSource* _tmp23_ = NULL;
+				DataSource* _tmp22_;
+				MediaSource* _tmp23_;
 				gboolean is_removed = FALSE;
-				GeeHashMap* _tmp24_ = NULL;
-				MediaSource* _tmp25_ = NULL;
-				GFile* _tmp26_ = NULL;
-				GFile* _tmp27_ = NULL;
-				gboolean _tmp28_ = FALSE;
-				gboolean _tmp29_ = FALSE;
-				gboolean _tmp30_ = FALSE;
-				MediaSource* _tmp31_ = NULL;
-				guint _tmp32_ = 0U;
+				GeeHashMap* _tmp24_;
+				MediaSource* _tmp25_;
+				GFile* _tmp26_;
+				GFile* _tmp27_;
+				gboolean _tmp28_;
+				gboolean _tmp29_;
+				gboolean _tmp30_;
+				MediaSource* _tmp31_;
+				guint _tmp32_;
 #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp18_ = _source_it;
 #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3867,7 +3883,7 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin
 				if (!_tmp19_) {
 #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					break;
-#line 3869 "MediaDataRepresentation.c"
+#line 3885 "MediaDataRepresentation.c"
 				}
 #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp20_ = _source_it;
@@ -3911,11 +3927,11 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin
 				_g_object_unref0 (media_source);
 #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (source);
-#line 3913 "MediaDataRepresentation.c"
+#line 3929 "MediaDataRepresentation.c"
 			}
 #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (_source_it);
-#line 3917 "MediaDataRepresentation.c"
+#line 3933 "MediaDataRepresentation.c"
 		}
 	}
 #line 310 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3924,18 +3940,18 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin
 	_tmp34_ = removed;
 #line 310 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	SOURCE_HOLDING_TANK_CLASS (media_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTank), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp33_, _tmp34_);
-#line 3926 "MediaDataRepresentation.c"
+#line 3942 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_holding_tank_on_master_source_replaced (MediaSourceHoldingTank* self, MediaSource* media_source, GFile* old_file, GFile* new_file) {
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GeeHashMap* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	MediaSource* _tmp5_ = NULL;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
+	GeeHashMap* _tmp3_;
+	GFile* _tmp4_;
+	MediaSource* _tmp5_;
 #line 313 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_HOLDING_TANK (self));
 #line 313 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3962,7 +3978,7 @@ static void media_source_holding_tank_on_master_source_replaced (MediaSourceHold
 	_tmp5_ = media_source;
 #line 317 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, _tmp5_);
-#line 3964 "MediaDataRepresentation.c"
+#line 3980 "MediaDataRepresentation.c"
 }
 
 
@@ -3974,24 +3990,24 @@ static void media_source_holding_tank_class_init (MediaSourceHoldingTankClass *
 #line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_type_class_add_private (klass, sizeof (MediaSourceHoldingTankPrivate));
 #line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*)(SourceHoldingTank*, GeeCollection*, GeeCollection*)) media_source_holding_tank_real_notify_contents_altered;
-#line 3977 "MediaDataRepresentation.c"
+	((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) media_source_holding_tank_real_notify_contents_altered;
+#line 3993 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_holding_tank_instance_init (MediaSourceHoldingTank * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv = MEDIA_SOURCE_HOLDING_TANK_GET_PRIVATE (self);
 #line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->master_file_map = _tmp0_;
-#line 3989 "MediaDataRepresentation.c"
+#line 4005 "MediaDataRepresentation.c"
 }
 
 
-static void media_source_holding_tank_finalize (SourceHoldingTank* obj) {
+static void media_source_holding_tank_finalize (SourceHoldingTank * obj) {
 	MediaSourceHoldingTank * self;
 #line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank);
@@ -3999,7 +4015,7 @@ static void media_source_holding_tank_finalize (SourceHoldingTank* obj) {
 	_g_object_unref0 (self->priv->master_file_map);
 #line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	SOURCE_HOLDING_TANK_CLASS (media_source_holding_tank_parent_class)->finalize (obj);
-#line 4001 "MediaDataRepresentation.c"
+#line 4017 "MediaDataRepresentation.c"
 }
 
 
@@ -4018,14 +4034,14 @@ GType media_source_holding_tank_get_type (void) {
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 327 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 4020 "MediaDataRepresentation.c"
+#line 4036 "MediaDataRepresentation.c"
 }
 
 
 MediaSourceTransactionController* media_source_transaction_controller_construct (GType object_type, MediaSourceCollection* sources) {
 	MediaSourceTransactionController* self = NULL;
-	MediaSourceCollection* _tmp0_ = NULL;
-	MediaSourceCollection* _tmp1_ = NULL;
+	MediaSourceCollection* _tmp0_;
+	MediaSourceCollection* _tmp1_;
 #line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (sources), NULL);
 #line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4040,20 +4056,20 @@ MediaSourceTransactionController* media_source_transaction_controller_construct
 	self->priv->sources = _tmp1_;
 #line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self;
-#line 4042 "MediaDataRepresentation.c"
+#line 4058 "MediaDataRepresentation.c"
 }
 
 
 MediaSourceTransactionController* media_source_transaction_controller_new (MediaSourceCollection* sources) {
 #line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return media_source_transaction_controller_construct (TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, sources);
-#line 4049 "MediaDataRepresentation.c"
+#line 4065 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_transaction_controller_real_begin_impl (TransactionController* base, GError** error) {
 	MediaSourceTransactionController * self;
-	MediaSourceCollection* _tmp0_ = NULL;
+	MediaSourceCollection* _tmp0_;
 #line 330 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, MediaSourceTransactionController);
 #line 331 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4062,13 +4078,13 @@ static void media_source_transaction_controller_real_begin_impl (TransactionCont
 	_tmp0_ = self->priv->sources;
 #line 332 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection));
-#line 4064 "MediaDataRepresentation.c"
+#line 4080 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_transaction_controller_real_commit_impl (TransactionController* base, GError** error) {
 	MediaSourceTransactionController * self;
-	MediaSourceCollection* _tmp0_ = NULL;
+	MediaSourceCollection* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 335 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, MediaSourceTransactionController);
@@ -4084,7 +4100,7 @@ static void media_source_transaction_controller_real_commit_impl (TransactionCon
 		g_propagate_error (error, _inner_error_);
 #line 337 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return;
-#line 4086 "MediaDataRepresentation.c"
+#line 4102 "MediaDataRepresentation.c"
 	}
 }
 
@@ -4097,21 +4113,21 @@ static void media_source_transaction_controller_class_init (MediaSourceTransacti
 #line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_type_class_add_private (klass, sizeof (MediaSourceTransactionControllerPrivate));
 #line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((TransactionControllerClass *) klass)->begin_impl = (void (*)(TransactionController*, GError**)) media_source_transaction_controller_real_begin_impl;
+	((TransactionControllerClass *) klass)->begin_impl = (void (*) (TransactionController *, GError**)) media_source_transaction_controller_real_begin_impl;
 #line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((TransactionControllerClass *) klass)->commit_impl = (void (*)(TransactionController*, GError**)) media_source_transaction_controller_real_commit_impl;
-#line 4102 "MediaDataRepresentation.c"
+	((TransactionControllerClass *) klass)->commit_impl = (void (*) (TransactionController *, GError**)) media_source_transaction_controller_real_commit_impl;
+#line 4118 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_transaction_controller_instance_init (MediaSourceTransactionController * self) {
 #line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv = MEDIA_SOURCE_TRANSACTION_CONTROLLER_GET_PRIVATE (self);
-#line 4109 "MediaDataRepresentation.c"
+#line 4125 "MediaDataRepresentation.c"
 }
 
 
-static void media_source_transaction_controller_finalize (TransactionController* obj) {
+static void media_source_transaction_controller_finalize (TransactionController * obj) {
 	MediaSourceTransactionController * self;
 #line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, MediaSourceTransactionController);
@@ -4119,7 +4135,7 @@ static void media_source_transaction_controller_finalize (TransactionController*
 	_data_collection_unref0 (self->priv->sources);
 #line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	TRANSACTION_CONTROLLER_CLASS (media_source_transaction_controller_parent_class)->finalize (obj);
-#line 4121 "MediaDataRepresentation.c"
+#line 4137 "MediaDataRepresentation.c"
 }
 
 
@@ -4140,17 +4156,17 @@ static gint _import_id_compare_func_gcompare_data_func (gconstpointer a, gconstp
 	result = import_id_compare_func ((ImportID*) a, (ImportID*) b);
 #line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 4142 "MediaDataRepresentation.c"
+#line 4158 "MediaDataRepresentation.c"
 }
 
 
 MediaSourceCollection* media_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target) {
 	MediaSourceCollection* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	GetSourceDatabaseKey _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	MediaSourceHoldingTank* _tmp2_ = NULL;
-	MediaSourceHoldingTank* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	GetSourceDatabaseKey _tmp1_;
+	void* _tmp1__target;
+	MediaSourceHoldingTank* _tmp2_;
+	MediaSourceHoldingTank* _tmp3_;
 #line 382 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 383 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4175,7 +4191,7 @@ MediaSourceCollection* media_source_collection_construct (GType object_type, con
 	self->priv->offline_bin = _tmp3_;
 #line 382 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self;
-#line 4177 "MediaDataRepresentation.c"
+#line 4193 "MediaDataRepresentation.c"
 }
 
 
@@ -4186,11 +4202,11 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection*
 	g_return_if_fail ((photos == NULL) || GEE_IS_COLLECTION (photos));
 #line 389 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail ((videos == NULL) || GEE_IS_COLLECTION (videos));
-#line 4188 "MediaDataRepresentation.c"
+#line 4204 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media;
 #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4199,14 +4215,14 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection*
 		_source_it = _tmp1_;
 #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 4201 "MediaDataRepresentation.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 4217 "MediaDataRepresentation.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			MediaSource* source = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			gboolean _tmp6_ = FALSE;
-			GeeCollection* _tmp7_ = NULL;
+			GeeCollection* _tmp7_;
 #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp2_ = _source_it;
 #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4215,7 +4231,7 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection*
 			if (!_tmp3_) {
 #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 4217 "MediaDataRepresentation.c"
+#line 4233 "MediaDataRepresentation.c"
 			}
 #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _source_it;
@@ -4227,85 +4243,85 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection*
 			_tmp7_ = photos;
 #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp7_ != NULL) {
-#line 4229 "MediaDataRepresentation.c"
-				MediaSource* _tmp8_ = NULL;
+#line 4245 "MediaDataRepresentation.c"
+				MediaSource* _tmp8_;
 #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp8_ = source;
 #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_LIBRARY_PHOTO);
-#line 4235 "MediaDataRepresentation.c"
+#line 4251 "MediaDataRepresentation.c"
 			} else {
 #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp6_ = FALSE;
-#line 4239 "MediaDataRepresentation.c"
+#line 4255 "MediaDataRepresentation.c"
 			}
 #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp6_) {
-#line 4243 "MediaDataRepresentation.c"
-				GeeCollection* _tmp9_ = NULL;
-				MediaSource* _tmp10_ = NULL;
+#line 4259 "MediaDataRepresentation.c"
+				GeeCollection* _tmp9_;
+				MediaSource* _tmp10_;
 #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp9_ = photos;
 #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp10_ = source;
 #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				gee_collection_add (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 4252 "MediaDataRepresentation.c"
+#line 4268 "MediaDataRepresentation.c"
 			} else {
 				gboolean _tmp11_ = FALSE;
-				GeeCollection* _tmp12_ = NULL;
+				GeeCollection* _tmp12_;
 #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp12_ = videos;
 #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp12_ != NULL) {
-#line 4260 "MediaDataRepresentation.c"
-					MediaSource* _tmp13_ = NULL;
+#line 4276 "MediaDataRepresentation.c"
+					MediaSource* _tmp13_;
 #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp13_ = source;
 #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_VIDEO);
-#line 4266 "MediaDataRepresentation.c"
+#line 4282 "MediaDataRepresentation.c"
 				} else {
 #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp11_ = FALSE;
-#line 4270 "MediaDataRepresentation.c"
+#line 4286 "MediaDataRepresentation.c"
 				}
 #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp11_) {
-#line 4274 "MediaDataRepresentation.c"
-					GeeCollection* _tmp14_ = NULL;
-					MediaSource* _tmp15_ = NULL;
+#line 4290 "MediaDataRepresentation.c"
+					GeeCollection* _tmp14_;
+					MediaSource* _tmp15_;
 #line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp14_ = videos;
 #line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp15_ = source;
 #line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					gee_collection_add (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_VIDEO, Video));
-#line 4283 "MediaDataRepresentation.c"
+#line 4299 "MediaDataRepresentation.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
-					GeeCollection* _tmp17_ = NULL;
+					GeeCollection* _tmp17_;
 #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp17_ = photos;
 #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					if (_tmp17_ != NULL) {
 #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp16_ = TRUE;
-#line 4293 "MediaDataRepresentation.c"
+#line 4309 "MediaDataRepresentation.c"
 					} else {
-						GeeCollection* _tmp18_ = NULL;
+						GeeCollection* _tmp18_;
 #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp18_ = videos;
 #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp16_ = _tmp18_ != NULL;
-#line 4300 "MediaDataRepresentation.c"
+#line 4316 "MediaDataRepresentation.c"
 					}
 #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					if (_tmp16_) {
-#line 4304 "MediaDataRepresentation.c"
-						MediaSource* _tmp19_ = NULL;
-						gchar* _tmp20_ = NULL;
-						gchar* _tmp21_ = NULL;
+#line 4320 "MediaDataRepresentation.c"
+						MediaSource* _tmp19_;
+						gchar* _tmp20_;
+						gchar* _tmp21_;
 #line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp19_ = source;
 #line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4316,17 +4332,17 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection*
 						g_warning ("MediaDataRepresentation.vala:397: Unrecognized media: %s", _tmp21_);
 #line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_g_free0 (_tmp21_);
-#line 4318 "MediaDataRepresentation.c"
+#line 4334 "MediaDataRepresentation.c"
 					}
 				}
 			}
 #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (source);
-#line 4324 "MediaDataRepresentation.c"
+#line 4340 "MediaDataRepresentation.c"
 		}
 #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_source_it);
-#line 4328 "MediaDataRepresentation.c"
+#line 4344 "MediaDataRepresentation.c"
 	}
 }
 
@@ -4335,14 +4351,14 @@ void media_source_collection_count_media (GeeCollection* media, gint* photo_coun
 	gint _vala_photo_count = 0;
 	gint _vala_video_count = 0;
 	GeeArrayList* photos = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 	GeeArrayList* videos = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	GeeArrayList* _tmp1_;
+	GeeCollection* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 #line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media));
 #line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4377,13 +4393,13 @@ void media_source_collection_count_media (GeeCollection* media, gint* photo_coun
 	if (photo_count) {
 #line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*photo_count = _vala_photo_count;
-#line 4379 "MediaDataRepresentation.c"
+#line 4395 "MediaDataRepresentation.c"
 	}
 #line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (video_count) {
 #line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*video_count = _vala_video_count;
-#line 4385 "MediaDataRepresentation.c"
+#line 4401 "MediaDataRepresentation.c"
 	}
 }
 
@@ -4392,11 +4408,11 @@ gboolean media_source_collection_has_photo (GeeCollection* media) {
 	gboolean result = FALSE;
 #line 412 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (media), FALSE);
-#line 4394 "MediaDataRepresentation.c"
+#line 4410 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _current_media_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media;
 #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4405,13 +4421,13 @@ gboolean media_source_collection_has_photo (GeeCollection* media) {
 		_current_media_it = _tmp1_;
 #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 4407 "MediaDataRepresentation.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 4423 "MediaDataRepresentation.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			MediaSource* current_media = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			MediaSource* _tmp6_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			MediaSource* _tmp6_;
 #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp2_ = _current_media_it;
 #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4420,7 +4436,7 @@ gboolean media_source_collection_has_photo (GeeCollection* media) {
 			if (!_tmp3_) {
 #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 4422 "MediaDataRepresentation.c"
+#line 4438 "MediaDataRepresentation.c"
 			}
 #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _current_media_it;
@@ -4440,21 +4456,21 @@ gboolean media_source_collection_has_photo (GeeCollection* media) {
 				_g_object_unref0 (_current_media_it);
 #line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				return result;
-#line 4442 "MediaDataRepresentation.c"
+#line 4458 "MediaDataRepresentation.c"
 			}
 #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (current_media);
-#line 4446 "MediaDataRepresentation.c"
+#line 4462 "MediaDataRepresentation.c"
 		}
 #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_current_media_it);
-#line 4450 "MediaDataRepresentation.c"
+#line 4466 "MediaDataRepresentation.c"
 	}
 #line 419 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = FALSE;
 #line 419 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 4456 "MediaDataRepresentation.c"
+#line 4472 "MediaDataRepresentation.c"
 }
 
 
@@ -4462,11 +4478,11 @@ gboolean media_source_collection_has_video (GeeCollection* media) {
 	gboolean result = FALSE;
 #line 422 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (media), FALSE);
-#line 4464 "MediaDataRepresentation.c"
+#line 4480 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _current_media_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media;
 #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4475,13 +4491,13 @@ gboolean media_source_collection_has_video (GeeCollection* media) {
 		_current_media_it = _tmp1_;
 #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 4477 "MediaDataRepresentation.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 4493 "MediaDataRepresentation.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			MediaSource* current_media = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			MediaSource* _tmp6_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			MediaSource* _tmp6_;
 #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp2_ = _current_media_it;
 #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4490,7 +4506,7 @@ gboolean media_source_collection_has_video (GeeCollection* media) {
 			if (!_tmp3_) {
 #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 4492 "MediaDataRepresentation.c"
+#line 4508 "MediaDataRepresentation.c"
 			}
 #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _current_media_it;
@@ -4510,21 +4526,21 @@ gboolean media_source_collection_has_video (GeeCollection* media) {
 				_g_object_unref0 (_current_media_it);
 #line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				return result;
-#line 4512 "MediaDataRepresentation.c"
+#line 4528 "MediaDataRepresentation.c"
 			}
 #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (current_media);
-#line 4516 "MediaDataRepresentation.c"
+#line 4532 "MediaDataRepresentation.c"
 		}
 #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_current_media_it);
-#line 4520 "MediaDataRepresentation.c"
+#line 4536 "MediaDataRepresentation.c"
 	}
 #line 429 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = FALSE;
 #line 429 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 4526 "MediaDataRepresentation.c"
+#line 4542 "MediaDataRepresentation.c"
 }
 
 
@@ -4533,7 +4549,7 @@ static MediaSourceHoldingTank* media_source_collection_real_create_trashcan (Med
 	g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_trashcan'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 432 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 4535 "MediaDataRepresentation.c"
+#line 4551 "MediaDataRepresentation.c"
 }
 
 
@@ -4542,7 +4558,7 @@ MediaSourceHoldingTank* media_source_collection_create_trashcan (MediaSourceColl
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
 #line 432 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_trashcan (self);
-#line 4544 "MediaDataRepresentation.c"
+#line 4560 "MediaDataRepresentation.c"
 }
 
 
@@ -4551,7 +4567,7 @@ static MediaSourceHoldingTank* media_source_collection_real_create_offline_bin (
 	g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_offline_bin'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 4553 "MediaDataRepresentation.c"
+#line 4569 "MediaDataRepresentation.c"
 }
 
 
@@ -4560,7 +4576,7 @@ MediaSourceHoldingTank* media_source_collection_create_offline_bin (MediaSourceC
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
 #line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_offline_bin (self);
-#line 4562 "MediaDataRepresentation.c"
+#line 4578 "MediaDataRepresentation.c"
 }
 
 
@@ -4569,7 +4585,7 @@ static MediaMonitor* media_source_collection_real_create_media_monitor (MediaSou
 	g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_media_monitor'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 4571 "MediaDataRepresentation.c"
+#line 4587 "MediaDataRepresentation.c"
 }
 
 
@@ -4578,7 +4594,7 @@ MediaMonitor* media_source_collection_create_media_monitor (MediaSourceCollectio
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
 #line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_media_monitor (self, workers, cancellable);
-#line 4580 "MediaDataRepresentation.c"
+#line 4596 "MediaDataRepresentation.c"
 }
 
 
@@ -4587,7 +4603,7 @@ static gchar* media_source_collection_real_get_typename (MediaSourceCollection*
 	g_critical ("Type `%s' does not implement abstract method `media_source_collection_get_typename'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 4589 "MediaDataRepresentation.c"
+#line 4605 "MediaDataRepresentation.c"
 }
 
 
@@ -4596,7 +4612,7 @@ gchar* media_source_collection_get_typename (MediaSourceCollection* self) {
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
 #line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_typename (self);
-#line 4598 "MediaDataRepresentation.c"
+#line 4614 "MediaDataRepresentation.c"
 }
 
 
@@ -4606,7 +4622,7 @@ static gboolean media_source_collection_real_is_file_recognized (MediaSourceColl
 	g_critical ("Type `%s' does not implement abstract method `media_source_collection_is_file_recognized'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 4608 "MediaDataRepresentation.c"
+#line 4624 "MediaDataRepresentation.c"
 }
 
 
@@ -4615,21 +4631,21 @@ gboolean media_source_collection_is_file_recognized (MediaSourceCollection* self
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), FALSE);
 #line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->is_file_recognized (self, file);
-#line 4617 "MediaDataRepresentation.c"
+#line 4633 "MediaDataRepresentation.c"
 }
 
 
 static gpointer _source_holding_tank_ref0 (gpointer self) {
 #line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self ? source_holding_tank_ref (self) : NULL;
-#line 4624 "MediaDataRepresentation.c"
+#line 4640 "MediaDataRepresentation.c"
 }
 
 
 MediaSourceHoldingTank* media_source_collection_get_trashcan (MediaSourceCollection* self) {
 	MediaSourceHoldingTank* result = NULL;
-	MediaSourceHoldingTank* _tmp0_ = NULL;
-	MediaSourceHoldingTank* _tmp1_ = NULL;
+	MediaSourceHoldingTank* _tmp0_;
+	MediaSourceHoldingTank* _tmp1_;
 #line 442 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
 #line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4640,14 +4656,14 @@ MediaSourceHoldingTank* media_source_collection_get_trashcan (MediaSourceCollect
 	result = _tmp1_;
 #line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 4642 "MediaDataRepresentation.c"
+#line 4658 "MediaDataRepresentation.c"
 }
 
 
 MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceCollection* self) {
 	MediaSourceHoldingTank* result = NULL;
-	MediaSourceHoldingTank* _tmp0_ = NULL;
-	MediaSourceHoldingTank* _tmp1_ = NULL;
+	MediaSourceHoldingTank* _tmp0_;
+	MediaSourceHoldingTank* _tmp1_;
 #line 446 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
 #line 447 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4658,7 +4674,7 @@ MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceColl
 	result = _tmp1_;
 #line 447 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 4660 "MediaDataRepresentation.c"
+#line 4676 "MediaDataRepresentation.c"
 }
 
 
@@ -4667,7 +4683,7 @@ static MediaSource* media_source_collection_real_fetch_by_numeric_id (MediaSourc
 	g_critical ("Type `%s' does not implement abstract method `media_source_collection_fetch_by_numeric_id'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 453 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 4669 "MediaDataRepresentation.c"
+#line 4685 "MediaDataRepresentation.c"
 }
 
 
@@ -4676,14 +4692,14 @@ MediaSource* media_source_collection_fetch_by_numeric_id (MediaSourceCollection*
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
 #line 453 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->fetch_by_numeric_id (self, numeric_id);
-#line 4678 "MediaDataRepresentation.c"
+#line 4694 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_real_notify_import_roll_altered (MediaSourceCollection* self) {
 #line 456 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_signal_emit_by_name (self, "import-roll-altered");
-#line 4685 "MediaDataRepresentation.c"
+	g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_IMPORT_ROLL_ALTERED_SIGNAL], 0);
+#line 4701 "MediaDataRepresentation.c"
 }
 
 
@@ -4692,14 +4708,14 @@ void media_source_collection_notify_import_roll_altered (MediaSourceCollection*
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
 #line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_import_roll_altered (self);
-#line 4694 "MediaDataRepresentation.c"
+#line 4710 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_real_notify_flagged_contents_altered (MediaSourceCollection* self) {
 #line 460 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_signal_emit_by_name (self, "flagged-contents-altered");
-#line 4701 "MediaDataRepresentation.c"
+	g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_FLAGGED_CONTENTS_ALTERED_SIGNAL], 0);
+#line 4717 "MediaDataRepresentation.c"
 }
 
 
@@ -4708,19 +4724,19 @@ void media_source_collection_notify_flagged_contents_altered (MediaSourceCollect
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
 #line 459 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_flagged_contents_altered (self);
-#line 4710 "MediaDataRepresentation.c"
+#line 4726 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_real_notify_media_import_starting (MediaSourceCollection* self, GeeCollection* media) {
-	GeeCollection* _tmp0_ = NULL;
+	GeeCollection* _tmp0_;
 #line 463 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media));
 #line 464 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media;
 #line 464 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_signal_emit_by_name (self, "media-import-starting", _tmp0_);
-#line 4722 "MediaDataRepresentation.c"
+	g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_STARTING_SIGNAL], 0, _tmp0_);
+#line 4738 "MediaDataRepresentation.c"
 }
 
 
@@ -4729,19 +4745,19 @@ void media_source_collection_notify_media_import_starting (MediaSourceCollection
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
 #line 463 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_media_import_starting (self, media);
-#line 4731 "MediaDataRepresentation.c"
+#line 4747 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_real_notify_media_import_completed (MediaSourceCollection* self, GeeCollection* media) {
-	GeeCollection* _tmp0_ = NULL;
+	GeeCollection* _tmp0_;
 #line 467 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media));
 #line 468 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media;
 #line 468 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_signal_emit_by_name (self, "media-import-completed", _tmp0_);
-#line 4743 "MediaDataRepresentation.c"
+	g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_COMPLETED_SIGNAL], 0, _tmp0_);
+#line 4759 "MediaDataRepresentation.c"
 }
 
 
@@ -4750,7 +4766,7 @@ void media_source_collection_notify_media_import_completed (MediaSourceCollectio
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
 #line 467 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_media_import_completed (self, media);
-#line 4752 "MediaDataRepresentation.c"
+#line 4768 "MediaDataRepresentation.c"
 }
 
 
@@ -4759,10 +4775,10 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 	GeeArrayList* to_trashcan = NULL;
 	GeeArrayList* to_offline = NULL;
 	gboolean flagged_altered = FALSE;
-	GeeArrayList* _tmp54_ = NULL;
-	GeeArrayList* _tmp58_ = NULL;
-	gboolean _tmp62_ = FALSE;
-	GeeMap* _tmp63_ = NULL;
+	GeeArrayList* _tmp54_;
+	GeeArrayList* _tmp58_;
+	gboolean _tmp62_;
+	GeeMap* _tmp63_;
 #line 471 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection);
 #line 471 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4773,15 +4789,15 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 	to_offline = NULL;
 #line 474 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	flagged_altered = FALSE;
-#line 4775 "MediaDataRepresentation.c"
+#line 4791 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = items;
 #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4800,31 +4816,31 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 		_object_it = _tmp5_;
 #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 4802 "MediaDataRepresentation.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 4818 "MediaDataRepresentation.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			Alteration* alteration = NULL;
-			GeeMap* _tmp10_ = NULL;
-			DataObject* _tmp11_ = NULL;
-			gpointer _tmp12_ = NULL;
+			GeeMap* _tmp10_;
+			DataObject* _tmp11_;
+			gpointer _tmp12_;
 			MediaSource* source = NULL;
-			DataObject* _tmp13_ = NULL;
-			MediaSource* _tmp14_ = NULL;
-			Alteration* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
+			DataObject* _tmp13_;
+			MediaSource* _tmp14_;
+			Alteration* _tmp15_;
+			gboolean _tmp16_;
 			gboolean _tmp17_ = FALSE;
-			MediaSource* _tmp18_ = NULL;
-			gboolean _tmp19_ = FALSE;
+			MediaSource* _tmp18_;
+			gboolean _tmp19_;
 			gboolean _tmp28_ = FALSE;
-			MediaSource* _tmp29_ = NULL;
-			gboolean _tmp30_ = FALSE;
+			MediaSource* _tmp29_;
+			gboolean _tmp30_;
 			Flaggable* flaggable = NULL;
-			MediaSource* _tmp39_ = NULL;
-			Flaggable* _tmp40_ = NULL;
-			Flaggable* _tmp41_ = NULL;
+			MediaSource* _tmp39_;
+			Flaggable* _tmp40_;
+			Flaggable* _tmp41_;
 #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _object_it;
 #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4833,7 +4849,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 			if (!_tmp7_) {
 #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 4835 "MediaDataRepresentation.c"
+#line 4851 "MediaDataRepresentation.c"
 			}
 #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = _object_it;
@@ -4869,7 +4885,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 				_g_object_unref0 (object);
 #line 480 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				continue;
-#line 4871 "MediaDataRepresentation.c"
+#line 4887 "MediaDataRepresentation.c"
 			}
 #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp18_ = source;
@@ -4877,11 +4893,11 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 			_tmp19_ = media_source_is_trashed (_tmp18_);
 #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp19_) {
-#line 4879 "MediaDataRepresentation.c"
-				MediaSourceHoldingTank* _tmp20_ = NULL;
-				MediaSourceHoldingTank* _tmp21_ = NULL;
-				MediaSource* _tmp22_ = NULL;
-				gboolean _tmp23_ = FALSE;
+#line 4895 "MediaDataRepresentation.c"
+				MediaSourceHoldingTank* _tmp20_;
+				MediaSourceHoldingTank* _tmp21_;
+				MediaSource* _tmp22_;
+				gboolean _tmp23_;
 #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp20_ = media_source_collection_get_trashcan (self);
 #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4894,31 +4910,31 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 				_tmp17_ = !_tmp23_;
 #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_source_holding_tank_unref0 (_tmp21_);
-#line 4896 "MediaDataRepresentation.c"
+#line 4912 "MediaDataRepresentation.c"
 			} else {
 #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp17_ = FALSE;
-#line 4900 "MediaDataRepresentation.c"
+#line 4916 "MediaDataRepresentation.c"
 			}
 #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp17_) {
-#line 4904 "MediaDataRepresentation.c"
-				GeeArrayList* _tmp24_ = NULL;
-				GeeArrayList* _tmp26_ = NULL;
-				MediaSource* _tmp27_ = NULL;
+#line 4920 "MediaDataRepresentation.c"
+				GeeArrayList* _tmp24_;
+				GeeArrayList* _tmp26_;
+				MediaSource* _tmp27_;
 #line 483 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp24_ = to_trashcan;
 #line 483 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp24_ == NULL) {
-#line 4912 "MediaDataRepresentation.c"
-					GeeArrayList* _tmp25_ = NULL;
+#line 4928 "MediaDataRepresentation.c"
+					GeeArrayList* _tmp25_;
 #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp25_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_g_object_unref0 (to_trashcan);
 #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					to_trashcan = _tmp25_;
-#line 4920 "MediaDataRepresentation.c"
+#line 4936 "MediaDataRepresentation.c"
 				}
 #line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp26_ = to_trashcan;
@@ -4934,7 +4950,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 				_g_object_unref0 (object);
 #line 489 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				continue;
-#line 4936 "MediaDataRepresentation.c"
+#line 4952 "MediaDataRepresentation.c"
 			}
 #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp29_ = source;
@@ -4942,11 +4958,11 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 			_tmp30_ = media_source_is_offline (_tmp29_);
 #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp30_) {
-#line 4944 "MediaDataRepresentation.c"
-				MediaSourceHoldingTank* _tmp31_ = NULL;
-				MediaSourceHoldingTank* _tmp32_ = NULL;
-				MediaSource* _tmp33_ = NULL;
-				gboolean _tmp34_ = FALSE;
+#line 4960 "MediaDataRepresentation.c"
+				MediaSourceHoldingTank* _tmp31_;
+				MediaSourceHoldingTank* _tmp32_;
+				MediaSource* _tmp33_;
+				gboolean _tmp34_;
 #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp31_ = media_source_collection_get_offline_bin (self);
 #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4959,31 +4975,31 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 				_tmp28_ = !_tmp34_;
 #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_source_holding_tank_unref0 (_tmp32_);
-#line 4961 "MediaDataRepresentation.c"
+#line 4977 "MediaDataRepresentation.c"
 			} else {
 #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp28_ = FALSE;
-#line 4965 "MediaDataRepresentation.c"
+#line 4981 "MediaDataRepresentation.c"
 			}
 #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp28_) {
-#line 4969 "MediaDataRepresentation.c"
-				GeeArrayList* _tmp35_ = NULL;
-				GeeArrayList* _tmp37_ = NULL;
-				MediaSource* _tmp38_ = NULL;
+#line 4985 "MediaDataRepresentation.c"
+				GeeArrayList* _tmp35_;
+				GeeArrayList* _tmp37_;
+				MediaSource* _tmp38_;
 #line 493 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp35_ = to_offline;
 #line 493 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp35_ == NULL) {
-#line 4977 "MediaDataRepresentation.c"
-					GeeArrayList* _tmp36_ = NULL;
+#line 4993 "MediaDataRepresentation.c"
+					GeeArrayList* _tmp36_;
 #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp36_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_g_object_unref0 (to_offline);
 #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					to_offline = _tmp36_;
-#line 4985 "MediaDataRepresentation.c"
+#line 5001 "MediaDataRepresentation.c"
 				}
 #line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp37_ = to_offline;
@@ -4991,7 +5007,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 				_tmp38_ = source;
 #line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp38_);
-#line 4993 "MediaDataRepresentation.c"
+#line 5009 "MediaDataRepresentation.c"
 			}
 #line 499 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp39_ = source;
@@ -5003,20 +5019,20 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 			_tmp41_ = flaggable;
 #line 500 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp41_ != NULL) {
-#line 5005 "MediaDataRepresentation.c"
-				Flaggable* _tmp42_ = NULL;
-				gboolean _tmp43_ = FALSE;
+#line 5021 "MediaDataRepresentation.c"
+				Flaggable* _tmp42_;
+				gboolean _tmp43_;
 #line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp42_ = flaggable;
 #line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp43_ = flaggable_is_flagged (_tmp42_);
 #line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp43_) {
-#line 5014 "MediaDataRepresentation.c"
+#line 5030 "MediaDataRepresentation.c"
 					gboolean _tmp44_ = FALSE;
-					GeeSet* _tmp45_ = NULL;
-					MediaSource* _tmp46_ = NULL;
-					gboolean _tmp47_ = FALSE;
+					GeeSet* _tmp45_;
+					MediaSource* _tmp46_;
+					gboolean _tmp47_;
 #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp45_ = self->priv->flagged;
 #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5027,23 +5043,23 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 					if (_tmp47_) {
 #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp44_ = TRUE;
-#line 5029 "MediaDataRepresentation.c"
+#line 5045 "MediaDataRepresentation.c"
 					} else {
-						gboolean _tmp48_ = FALSE;
+						gboolean _tmp48_;
 #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp48_ = flagged_altered;
 #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp44_ = _tmp48_;
-#line 5036 "MediaDataRepresentation.c"
+#line 5052 "MediaDataRepresentation.c"
 					}
 #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					flagged_altered = _tmp44_;
-#line 5040 "MediaDataRepresentation.c"
+#line 5056 "MediaDataRepresentation.c"
 				} else {
 					gboolean _tmp49_ = FALSE;
-					GeeSet* _tmp50_ = NULL;
-					MediaSource* _tmp51_ = NULL;
-					gboolean _tmp52_ = FALSE;
+					GeeSet* _tmp50_;
+					MediaSource* _tmp51_;
+					gboolean _tmp52_;
 #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp50_ = self->priv->flagged;
 #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5054,18 +5070,18 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 					if (_tmp52_) {
 #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp49_ = TRUE;
-#line 5056 "MediaDataRepresentation.c"
+#line 5072 "MediaDataRepresentation.c"
 					} else {
-						gboolean _tmp53_ = FALSE;
+						gboolean _tmp53_;
 #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp53_ = flagged_altered;
 #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp49_ = _tmp53_;
-#line 5063 "MediaDataRepresentation.c"
+#line 5079 "MediaDataRepresentation.c"
 					}
 #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					flagged_altered = _tmp49_;
-#line 5067 "MediaDataRepresentation.c"
+#line 5083 "MediaDataRepresentation.c"
 				}
 			}
 #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5076,20 +5092,20 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 			_alteration_unref0 (alteration);
 #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (object);
-#line 5078 "MediaDataRepresentation.c"
+#line 5094 "MediaDataRepresentation.c"
 		}
 #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_object_it);
-#line 5082 "MediaDataRepresentation.c"
+#line 5098 "MediaDataRepresentation.c"
 	}
 #line 508 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp54_ = to_trashcan;
 #line 508 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp54_ != NULL) {
-#line 5088 "MediaDataRepresentation.c"
-		MediaSourceHoldingTank* _tmp55_ = NULL;
-		MediaSourceHoldingTank* _tmp56_ = NULL;
-		GeeArrayList* _tmp57_ = NULL;
+#line 5104 "MediaDataRepresentation.c"
+		MediaSourceHoldingTank* _tmp55_;
+		MediaSourceHoldingTank* _tmp56_;
+		GeeArrayList* _tmp57_;
 #line 509 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp55_ = media_source_collection_get_trashcan (self);
 #line 509 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5100,16 +5116,16 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 		source_holding_tank_unlink_and_hold (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 509 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_source_holding_tank_unref0 (_tmp56_);
-#line 5102 "MediaDataRepresentation.c"
+#line 5118 "MediaDataRepresentation.c"
 	}
 #line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp58_ = to_offline;
 #line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp58_ != NULL) {
-#line 5108 "MediaDataRepresentation.c"
-		MediaSourceHoldingTank* _tmp59_ = NULL;
-		MediaSourceHoldingTank* _tmp60_ = NULL;
-		GeeArrayList* _tmp61_ = NULL;
+#line 5124 "MediaDataRepresentation.c"
+		MediaSourceHoldingTank* _tmp59_;
+		MediaSourceHoldingTank* _tmp60_;
+		GeeArrayList* _tmp61_;
 #line 512 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp59_ = media_source_collection_get_offline_bin (self);
 #line 512 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5120,7 +5136,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 		source_holding_tank_unlink_and_hold (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 512 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_source_holding_tank_unref0 (_tmp60_);
-#line 5122 "MediaDataRepresentation.c"
+#line 5138 "MediaDataRepresentation.c"
 	}
 #line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp62_ = flagged_altered;
@@ -5128,7 +5144,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 	if (_tmp62_) {
 #line 515 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_source_collection_notify_flagged_contents_altered (self);
-#line 5130 "MediaDataRepresentation.c"
+#line 5146 "MediaDataRepresentation.c"
 	}
 #line 517 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp63_ = items;
@@ -5138,14 +5154,14 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 	_g_object_unref0 (to_offline);
 #line 471 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (to_trashcan);
-#line 5140 "MediaDataRepresentation.c"
+#line 5156 "MediaDataRepresentation.c"
 }
 
 
 static void _media_source_collection_on_master_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self) {
 #line 529 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_collection_on_master_replaced ((MediaSourceCollection*) self, _sender, old_file, new_file);
-#line 5147 "MediaDataRepresentation.c"
+#line 5163 "MediaDataRepresentation.c"
 }
 
 
@@ -5153,12 +5169,12 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 	MediaSourceCollection * self;
 	gboolean import_roll_changed = FALSE;
 	gboolean flagged_altered = FALSE;
-	GeeIterable* _tmp0_ = NULL;
-	GeeIterable* _tmp38_ = NULL;
-	gboolean _tmp74_ = FALSE;
-	gboolean _tmp75_ = FALSE;
-	GeeIterable* _tmp76_ = NULL;
-	GeeIterable* _tmp77_ = NULL;
+	GeeIterable* _tmp0_;
+	GeeIterable* _tmp38_;
+	gboolean _tmp74_;
+	gboolean _tmp75_;
+	GeeIterable* _tmp76_;
+	GeeIterable* _tmp77_;
 #line 520 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection);
 #line 520 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5173,11 +5189,11 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 	_tmp0_ = added;
 #line 524 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp0_ != NULL) {
-#line 5175 "MediaDataRepresentation.c"
+#line 5191 "MediaDataRepresentation.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp1_ = NULL;
-			GeeIterator* _tmp2_ = NULL;
+			GeeIterable* _tmp1_;
+			GeeIterator* _tmp2_;
 #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp1_ = added;
 #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5186,29 +5202,29 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 			_object_it = _tmp2_;
 #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			while (TRUE) {
-#line 5188 "MediaDataRepresentation.c"
-				GeeIterator* _tmp3_ = NULL;
-				gboolean _tmp4_ = FALSE;
+#line 5204 "MediaDataRepresentation.c"
+				GeeIterator* _tmp3_;
+				gboolean _tmp4_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
+				GeeIterator* _tmp5_;
+				gpointer _tmp6_;
 				MediaSource* media = NULL;
-				DataObject* _tmp7_ = NULL;
-				MediaSource* _tmp8_ = NULL;
-				GeeHashMap* _tmp9_ = NULL;
-				MediaSource* _tmp10_ = NULL;
-				GFile* _tmp11_ = NULL;
-				GFile* _tmp12_ = NULL;
-				MediaSource* _tmp13_ = NULL;
-				MediaSource* _tmp14_ = NULL;
+				DataObject* _tmp7_;
+				MediaSource* _tmp8_;
+				GeeHashMap* _tmp9_;
+				MediaSource* _tmp10_;
+				GFile* _tmp11_;
+				GFile* _tmp12_;
+				MediaSource* _tmp13_;
+				MediaSource* _tmp14_;
 				ImportID import_id = {0};
-				MediaSource* _tmp15_ = NULL;
+				MediaSource* _tmp15_;
 				ImportID _tmp16_ = {0};
-				gboolean _tmp17_ = FALSE;
+				gboolean _tmp17_;
 				Flaggable* flaggable = NULL;
-				MediaSource* _tmp23_ = NULL;
-				Flaggable* _tmp24_ = NULL;
-				Flaggable* _tmp25_ = NULL;
+				MediaSource* _tmp23_;
+				Flaggable* _tmp24_;
+				Flaggable* _tmp25_;
 #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp3_ = _object_it;
 #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5217,7 +5233,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 				if (!_tmp4_) {
 #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					break;
-#line 5219 "MediaDataRepresentation.c"
+#line 5235 "MediaDataRepresentation.c"
 				}
 #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp5_ = _object_it;
@@ -5259,12 +5275,12 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 				_tmp17_ = import_id_is_valid (&import_id);
 #line 532 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp17_) {
-#line 5261 "MediaDataRepresentation.c"
-					GeeTreeSet* _tmp18_ = NULL;
-					ImportID _tmp19_ = {0};
-					GeeMultiMap* _tmp20_ = NULL;
-					ImportID _tmp21_ = {0};
-					MediaSource* _tmp22_ = NULL;
+#line 5277 "MediaDataRepresentation.c"
+					GeeTreeSet* _tmp18_;
+					ImportID _tmp19_;
+					GeeMultiMap* _tmp20_;
+					ImportID _tmp21_;
+					MediaSource* _tmp22_;
 #line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp18_ = self->priv->sorted_import_ids;
 #line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5281,7 +5297,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 					gee_multi_map_set (_tmp20_, &_tmp21_, _tmp22_);
 #line 536 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					import_roll_changed = TRUE;
-#line 5283 "MediaDataRepresentation.c"
+#line 5299 "MediaDataRepresentation.c"
 				}
 #line 539 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp23_ = media;
@@ -5293,20 +5309,20 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 				_tmp25_ = flaggable;
 #line 540 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp25_ != NULL) {
-#line 5295 "MediaDataRepresentation.c"
-					Flaggable* _tmp26_ = NULL;
-					gboolean _tmp27_ = FALSE;
+#line 5311 "MediaDataRepresentation.c"
+					Flaggable* _tmp26_;
+					gboolean _tmp27_;
 #line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp26_ = flaggable;
 #line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp27_ = flaggable_is_flagged (_tmp26_);
 #line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					if (_tmp27_) {
-#line 5304 "MediaDataRepresentation.c"
+#line 5320 "MediaDataRepresentation.c"
 						gboolean _tmp28_ = FALSE;
-						GeeSet* _tmp29_ = NULL;
-						MediaSource* _tmp30_ = NULL;
-						gboolean _tmp31_ = FALSE;
+						GeeSet* _tmp29_;
+						MediaSource* _tmp30_;
+						gboolean _tmp31_;
 #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp29_ = self->priv->flagged;
 #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5317,23 +5333,23 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 						if (_tmp31_) {
 #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 							_tmp28_ = TRUE;
-#line 5319 "MediaDataRepresentation.c"
+#line 5335 "MediaDataRepresentation.c"
 						} else {
-							gboolean _tmp32_ = FALSE;
+							gboolean _tmp32_;
 #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 							_tmp32_ = flagged_altered;
 #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 							_tmp28_ = _tmp32_;
-#line 5326 "MediaDataRepresentation.c"
+#line 5342 "MediaDataRepresentation.c"
 						}
 #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						flagged_altered = _tmp28_;
-#line 5330 "MediaDataRepresentation.c"
+#line 5346 "MediaDataRepresentation.c"
 					} else {
 						gboolean _tmp33_ = FALSE;
-						GeeSet* _tmp34_ = NULL;
-						MediaSource* _tmp35_ = NULL;
-						gboolean _tmp36_ = FALSE;
+						GeeSet* _tmp34_;
+						MediaSource* _tmp35_;
+						gboolean _tmp36_;
 #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp34_ = self->priv->flagged;
 #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5344,18 +5360,18 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 						if (_tmp36_) {
 #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 							_tmp33_ = TRUE;
-#line 5346 "MediaDataRepresentation.c"
+#line 5362 "MediaDataRepresentation.c"
 						} else {
-							gboolean _tmp37_ = FALSE;
+							gboolean _tmp37_;
 #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 							_tmp37_ = flagged_altered;
 #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 							_tmp33_ = _tmp37_;
-#line 5353 "MediaDataRepresentation.c"
+#line 5369 "MediaDataRepresentation.c"
 						}
 #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						flagged_altered = _tmp33_;
-#line 5357 "MediaDataRepresentation.c"
+#line 5373 "MediaDataRepresentation.c"
 					}
 				}
 #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5364,22 +5380,22 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 				_g_object_unref0 (media);
 #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (object);
-#line 5366 "MediaDataRepresentation.c"
+#line 5382 "MediaDataRepresentation.c"
 			}
 #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (_object_it);
-#line 5370 "MediaDataRepresentation.c"
+#line 5386 "MediaDataRepresentation.c"
 		}
 	}
 #line 549 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp38_ = removed;
 #line 549 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp38_ != NULL) {
-#line 5377 "MediaDataRepresentation.c"
+#line 5393 "MediaDataRepresentation.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp39_ = NULL;
-			GeeIterator* _tmp40_ = NULL;
+			GeeIterable* _tmp39_;
+			GeeIterator* _tmp40_;
 #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp39_ = removed;
 #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5388,33 +5404,33 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 			_object_it = _tmp40_;
 #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			while (TRUE) {
-#line 5390 "MediaDataRepresentation.c"
-				GeeIterator* _tmp41_ = NULL;
-				gboolean _tmp42_ = FALSE;
+#line 5406 "MediaDataRepresentation.c"
+				GeeIterator* _tmp41_;
+				gboolean _tmp42_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp43_ = NULL;
-				gpointer _tmp44_ = NULL;
+				GeeIterator* _tmp43_;
+				gpointer _tmp44_;
 				MediaSource* media = NULL;
-				DataObject* _tmp45_ = NULL;
-				MediaSource* _tmp46_ = NULL;
+				DataObject* _tmp45_;
+				MediaSource* _tmp46_;
 				gboolean is_removed = FALSE;
-				GeeHashMap* _tmp47_ = NULL;
-				MediaSource* _tmp48_ = NULL;
-				GFile* _tmp49_ = NULL;
-				GFile* _tmp50_ = NULL;
-				gboolean _tmp51_ = FALSE;
-				gboolean _tmp52_ = FALSE;
-				gboolean _tmp53_ = FALSE;
-				MediaSource* _tmp54_ = NULL;
-				guint _tmp55_ = 0U;
+				GeeHashMap* _tmp47_;
+				MediaSource* _tmp48_;
+				GFile* _tmp49_;
+				GFile* _tmp50_;
+				gboolean _tmp51_;
+				gboolean _tmp52_;
+				gboolean _tmp53_;
+				MediaSource* _tmp54_;
+				guint _tmp55_;
 				ImportID import_id = {0};
-				MediaSource* _tmp56_ = NULL;
+				MediaSource* _tmp56_;
 				ImportID _tmp57_ = {0};
-				gboolean _tmp58_ = FALSE;
+				gboolean _tmp58_;
 				gboolean _tmp69_ = FALSE;
-				GeeSet* _tmp70_ = NULL;
-				MediaSource* _tmp71_ = NULL;
-				gboolean _tmp72_ = FALSE;
+				GeeSet* _tmp70_;
+				MediaSource* _tmp71_;
+				gboolean _tmp72_;
 #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp41_ = _object_it;
 #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5423,7 +5439,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 				if (!_tmp42_) {
 #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					break;
-#line 5425 "MediaDataRepresentation.c"
+#line 5441 "MediaDataRepresentation.c"
 				}
 #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp43_ = _object_it;
@@ -5473,15 +5489,15 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 				_tmp58_ = import_id_is_valid (&import_id);
 #line 558 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp58_) {
-#line 5475 "MediaDataRepresentation.c"
-					GeeMultiMap* _tmp59_ = NULL;
-					ImportID _tmp60_ = {0};
-					MediaSource* _tmp61_ = NULL;
-					gboolean _tmp62_ = FALSE;
-					gboolean _tmp63_ = FALSE;
-					GeeMultiMap* _tmp64_ = NULL;
-					ImportID _tmp65_ = {0};
-					gboolean _tmp66_ = FALSE;
+#line 5491 "MediaDataRepresentation.c"
+					GeeMultiMap* _tmp59_;
+					ImportID _tmp60_;
+					MediaSource* _tmp61_;
+					gboolean _tmp62_;
+					gboolean _tmp63_;
+					GeeMultiMap* _tmp64_;
+					ImportID _tmp65_;
+					gboolean _tmp66_;
 #line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp59_ = self->priv->import_rolls;
 #line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5504,20 +5520,20 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 					_tmp66_ = gee_multi_map_contains (_tmp64_, &_tmp65_);
 #line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					if (!_tmp66_) {
-#line 5506 "MediaDataRepresentation.c"
-						GeeTreeSet* _tmp67_ = NULL;
-						ImportID _tmp68_ = {0};
+#line 5522 "MediaDataRepresentation.c"
+						GeeTreeSet* _tmp67_;
+						ImportID _tmp68_;
 #line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp67_ = self->priv->sorted_import_ids;
 #line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp68_ = import_id;
 #line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp68_);
-#line 5515 "MediaDataRepresentation.c"
+#line 5531 "MediaDataRepresentation.c"
 					}
 #line 564 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					import_roll_changed = TRUE;
-#line 5519 "MediaDataRepresentation.c"
+#line 5535 "MediaDataRepresentation.c"
 				}
 #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp70_ = self->priv->flagged;
@@ -5529,14 +5545,14 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 				if (_tmp72_) {
 #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp69_ = TRUE;
-#line 5531 "MediaDataRepresentation.c"
+#line 5547 "MediaDataRepresentation.c"
 				} else {
-					gboolean _tmp73_ = FALSE;
+					gboolean _tmp73_;
 #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp73_ = flagged_altered;
 #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp69_ = _tmp73_;
-#line 5538 "MediaDataRepresentation.c"
+#line 5554 "MediaDataRepresentation.c"
 				}
 #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				flagged_altered = _tmp69_;
@@ -5544,11 +5560,11 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 				_g_object_unref0 (media);
 #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (object);
-#line 5546 "MediaDataRepresentation.c"
+#line 5562 "MediaDataRepresentation.c"
 			}
 #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (_object_it);
-#line 5550 "MediaDataRepresentation.c"
+#line 5566 "MediaDataRepresentation.c"
 		}
 	}
 #line 571 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5557,7 +5573,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 	if (_tmp74_) {
 #line 572 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_source_collection_notify_import_roll_altered (self);
-#line 5559 "MediaDataRepresentation.c"
+#line 5575 "MediaDataRepresentation.c"
 	}
 #line 574 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp75_ = flagged_altered;
@@ -5565,7 +5581,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 	if (_tmp75_) {
 #line 575 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_source_collection_notify_flagged_contents_altered (self);
-#line 5567 "MediaDataRepresentation.c"
+#line 5583 "MediaDataRepresentation.c"
 	}
 #line 577 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp76_ = added;
@@ -5573,21 +5589,21 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 	_tmp77_ = removed;
 #line 577 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	DATA_COLLECTION_CLASS (media_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp76_, _tmp77_);
-#line 5575 "MediaDataRepresentation.c"
+#line 5591 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_on_master_replaced (MediaSourceCollection* self, MediaSource* media, GFile* old_file, GFile* new_file) {
 	gboolean is_removed = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GeeHashMap* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	MediaSource* _tmp5_ = NULL;
-	MediaSource* _tmp6_ = NULL;
-	GFile* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
+	GeeHashMap* _tmp3_;
+	GFile* _tmp4_;
+	MediaSource* _tmp5_;
+	MediaSource* _tmp6_;
+	GFile* _tmp7_;
+	GFile* _tmp8_;
 #line 580 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
 #line 580 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5621,16 +5637,16 @@ static void media_source_collection_on_master_replaced (MediaSourceCollection* s
 #line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp8_ = new_file;
 #line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_signal_emit_by_name (self, "master-file-replaced", _tmp6_, _tmp7_, _tmp8_);
-#line 5624 "MediaDataRepresentation.c"
+	g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MASTER_FILE_REPLACED_SIGNAL], 0, _tmp6_, _tmp7_, _tmp8_);
+#line 5640 "MediaDataRepresentation.c"
 }
 
 
 MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection* self, GFile* file) {
 	MediaSource* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gpointer _tmp2_;
 #line 589 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
 #line 589 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5645,21 +5661,21 @@ MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection
 	result = (MediaSource*) _tmp2_;
 #line 590 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5647 "MediaDataRepresentation.c"
+#line 5663 "MediaDataRepresentation.c"
 }
 
 
 static MediaSource* media_source_collection_real_fetch_by_source_id (MediaSourceCollection* self, const gchar* source_id) {
 	MediaSource* result = NULL;
 	gchar** components = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar** _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gint components_length1 = 0;
-	gint _components_size_ = 0;
-	const gchar* _tmp3_ = NULL;
-	gint64 _tmp4_ = 0LL;
-	MediaSource* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	gchar** _tmp1_;
+	gchar** _tmp2_;
+	gint components_length1;
+	gint _components_size_;
+	const gchar* _tmp3_;
+	gint64 _tmp4_;
+	MediaSource* _tmp5_;
 #line 593 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (source_id != NULL, NULL);
 #line 594 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5686,7 +5702,7 @@ static MediaSource* media_source_collection_real_fetch_by_source_id (MediaSource
 	components = (_vala_array_free (components, components_length1, (GDestroyNotify) g_free), NULL);
 #line 597 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5688 "MediaDataRepresentation.c"
+#line 5704 "MediaDataRepresentation.c"
 }
 
 
@@ -5695,7 +5711,7 @@ MediaSource* media_source_collection_fetch_by_source_id (MediaSourceCollection*
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
 #line 593 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->fetch_by_source_id (self, source_id);
-#line 5697 "MediaDataRepresentation.c"
+#line 5713 "MediaDataRepresentation.c"
 }
 
 
@@ -5704,7 +5720,7 @@ static GeeCollection* media_source_collection_real_get_event_source_ids (MediaSo
 	g_critical ("Type `%s' does not implement abstract method `media_source_collection_get_event_source_ids'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 600 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 5706 "MediaDataRepresentation.c"
+#line 5722 "MediaDataRepresentation.c"
 }
 
 
@@ -5713,16 +5729,16 @@ GeeCollection* media_source_collection_get_event_source_ids (MediaSourceCollecti
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
 #line 600 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_event_source_ids (self, event_id);
-#line 5715 "MediaDataRepresentation.c"
+#line 5731 "MediaDataRepresentation.c"
 }
 
 
 GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollection* self) {
 	GeeCollection* result = NULL;
-	MediaSourceHoldingTank* _tmp0_ = NULL;
-	MediaSourceHoldingTank* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
+	MediaSourceHoldingTank* _tmp0_;
+	MediaSourceHoldingTank* _tmp1_;
+	GeeCollection* _tmp2_;
+	GeeCollection* _tmp3_;
 #line 602 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
 #line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5739,16 +5755,16 @@ GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollect
 	result = _tmp3_;
 #line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5741 "MediaDataRepresentation.c"
+#line 5757 "MediaDataRepresentation.c"
 }
 
 
 GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceCollection* self) {
 	GeeCollection* result = NULL;
-	MediaSourceHoldingTank* _tmp0_ = NULL;
-	MediaSourceHoldingTank* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
+	MediaSourceHoldingTank* _tmp0_;
+	MediaSourceHoldingTank* _tmp1_;
+	GeeCollection* _tmp2_;
+	GeeCollection* _tmp3_;
 #line 606 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
 #line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5765,15 +5781,15 @@ GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceColl
 	result = _tmp3_;
 #line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5767 "MediaDataRepresentation.c"
+#line 5783 "MediaDataRepresentation.c"
 }
 
 
 GeeCollection* media_source_collection_get_flagged (MediaSourceCollection* self) {
 	GeeCollection* result = NULL;
-	GeeSet* _tmp0_ = NULL;
-	GeeSet* _tmp1_ = NULL;
-	GeeSet* _tmp2_ = NULL;
+	GeeSet* _tmp0_;
+	GeeSet* _tmp1_;
+	GeeSet* _tmp2_;
 #line 610 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
 #line 611 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5786,14 +5802,14 @@ GeeCollection* media_source_collection_get_flagged (MediaSourceCollection* self)
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 611 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5788 "MediaDataRepresentation.c"
+#line 5804 "MediaDataRepresentation.c"
 }
 
 
 GeeSortedSet* media_source_collection_get_import_roll_ids (MediaSourceCollection* self) {
 	GeeSortedSet* result = NULL;
-	GeeTreeSet* _tmp0_ = NULL;
-	GeeSortedSet* _tmp1_ = NULL;
+	GeeTreeSet* _tmp0_;
+	GeeSortedSet* _tmp1_;
 #line 615 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
 #line 616 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5804,16 +5820,16 @@ GeeSortedSet* media_source_collection_get_import_roll_ids (MediaSourceCollection
 	result = _tmp1_;
 #line 616 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5806 "MediaDataRepresentation.c"
+#line 5822 "MediaDataRepresentation.c"
 }
 
 
 ImportID* media_source_collection_get_last_import_id (MediaSourceCollection* self) {
 	ImportID* result = NULL;
 	ImportID* _tmp0_ = NULL;
-	GeeTreeSet* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	GeeTreeSet* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 619 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
 #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5824,9 +5840,9 @@ ImportID* media_source_collection_get_last_import_id (MediaSourceCollection* sel
 	_tmp3_ = _tmp2_;
 #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp3_ != 0) {
-#line 5826 "MediaDataRepresentation.c"
-		GeeTreeSet* _tmp4_ = NULL;
-		gpointer _tmp5_ = NULL;
+#line 5842 "MediaDataRepresentation.c"
+		GeeTreeSet* _tmp4_;
+		gpointer _tmp5_;
 #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp4_ = self->priv->sorted_import_ids;
 #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5835,27 +5851,27 @@ ImportID* media_source_collection_get_last_import_id (MediaSourceCollection* sel
 		_import_id_free0 (_tmp0_);
 #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = (ImportID*) _tmp5_;
-#line 5837 "MediaDataRepresentation.c"
+#line 5853 "MediaDataRepresentation.c"
 	} else {
 #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_import_id_free0 (_tmp0_);
 #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = NULL;
-#line 5843 "MediaDataRepresentation.c"
+#line 5859 "MediaDataRepresentation.c"
 	}
 #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp0_;
 #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5849 "MediaDataRepresentation.c"
+#line 5865 "MediaDataRepresentation.c"
 }
 
 
 GeeCollection* media_source_collection_get_import_roll (MediaSourceCollection* self, ImportID* import_id) {
 	GeeCollection* result = NULL;
-	GeeMultiMap* _tmp0_ = NULL;
-	ImportID _tmp1_ = {0};
-	GeeCollection* _tmp2_ = NULL;
+	GeeMultiMap* _tmp0_;
+	ImportID _tmp1_;
+	GeeCollection* _tmp2_;
 #line 623 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
 #line 623 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5870,14 +5886,14 @@ GeeCollection* media_source_collection_get_import_roll (MediaSourceCollection* s
 	result = _tmp2_;
 #line 624 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5872 "MediaDataRepresentation.c"
+#line 5888 "MediaDataRepresentation.c"
 }
 
 
 void media_source_collection_add_many_to_trash (MediaSourceCollection* self, GeeCollection* sources) {
-	MediaSourceHoldingTank* _tmp0_ = NULL;
-	MediaSourceHoldingTank* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
+	MediaSourceHoldingTank* _tmp0_;
+	MediaSourceHoldingTank* _tmp1_;
+	GeeCollection* _tmp2_;
 #line 627 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
 #line 627 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5892,14 +5908,14 @@ void media_source_collection_add_many_to_trash (MediaSourceCollection* self, Gee
 	source_holding_tank_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp2_);
 #line 628 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 5894 "MediaDataRepresentation.c"
+#line 5910 "MediaDataRepresentation.c"
 }
 
 
 void media_source_collection_add_many_to_offline (MediaSourceCollection* self, GeeCollection* sources) {
-	MediaSourceHoldingTank* _tmp0_ = NULL;
-	MediaSourceHoldingTank* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
+	MediaSourceHoldingTank* _tmp0_;
+	MediaSourceHoldingTank* _tmp1_;
+	GeeCollection* _tmp2_;
 #line 631 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
 #line 631 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5914,16 +5930,16 @@ void media_source_collection_add_many_to_offline (MediaSourceCollection* self, G
 	source_holding_tank_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp2_);
 #line 632 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 5916 "MediaDataRepresentation.c"
+#line 5932 "MediaDataRepresentation.c"
 }
 
 
 gint media_source_collection_get_trashcan_count (MediaSourceCollection* self) {
 	gint result = 0;
-	MediaSourceHoldingTank* _tmp0_ = NULL;
-	MediaSourceHoldingTank* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	MediaSourceHoldingTank* _tmp0_;
+	MediaSourceHoldingTank* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 635 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), 0);
 #line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5940,17 +5956,17 @@ gint media_source_collection_get_trashcan_count (MediaSourceCollection* self) {
 	result = _tmp3_;
 #line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5942 "MediaDataRepresentation.c"
+#line 5958 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_real_import_many (MediaSourceCollection* self, GeeCollection* media) {
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
-	GeeCollection* _tmp5_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp2_;
+	GeeCollection* _tmp3_;
+	GeeCollection* _tmp4_;
+	GeeCollection* _tmp5_;
 #line 642 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media));
 #line 643 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5973,7 +5989,7 @@ static void media_source_collection_real_import_many (MediaSourceCollection* sel
 	_tmp5_ = media;
 #line 649 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_collection_notify_media_import_completed (self, _tmp5_);
-#line 5975 "MediaDataRepresentation.c"
+#line 5991 "MediaDataRepresentation.c"
 }
 
 
@@ -5982,14 +5998,14 @@ void media_source_collection_import_many (MediaSourceCollection* self, GeeCollec
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
 #line 642 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->import_many (self, media);
-#line 5984 "MediaDataRepresentation.c"
+#line 6000 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_real_postprocess_imported_media (MediaSourceCollection* self, GeeCollection* media) {
 #line 654 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media));
-#line 5991 "MediaDataRepresentation.c"
+#line 6007 "MediaDataRepresentation.c"
 }
 
 
@@ -5998,7 +6014,7 @@ void media_source_collection_postprocess_imported_media (MediaSourceCollection*
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
 #line 654 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->postprocess_imported_media (self, media);
-#line 6000 "MediaDataRepresentation.c"
+#line 6016 "MediaDataRepresentation.c"
 }
 
 
@@ -6007,50 +6023,50 @@ static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 cu
 	result = aggregate_progress_monitor_monitor ((AggregateProgressMonitor*) self, current, total);
 #line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 6009 "MediaDataRepresentation.c"
+#line 6025 "MediaDataRepresentation.c"
 }
 
 
 void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCollection* sources, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed) {
-	GeeCollection* _tmp0_ = NULL;
+	GeeCollection* _tmp0_;
 	GeeHashSet* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp2_;
 	GeeHashSet* to_tombstone = NULL;
-	GeeHashSet* _tmp4_ = NULL;
+	GeeHashSet* _tmp4_;
 	GeeArrayList* trashed = NULL;
-	GeeArrayList* _tmp5_ = NULL;
+	GeeArrayList* _tmp5_;
 	GeeArrayList* offlined = NULL;
-	GeeArrayList* _tmp6_ = NULL;
+	GeeArrayList* _tmp6_;
 	GeeArrayList* not_trashed = NULL;
-	GeeArrayList* _tmp7_ = NULL;
+	GeeArrayList* _tmp7_;
 	gint total_count = 0;
-	GeeCollection* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	gint _tmp30_ = 0;
-	GeeArrayList* _tmp31_ = NULL;
-	gint _tmp32_ = 0;
-	gint _tmp33_ = 0;
-	GeeArrayList* _tmp34_ = NULL;
-	gint _tmp35_ = 0;
-	gint _tmp36_ = 0;
-	GeeArrayList* _tmp37_ = NULL;
-	gint _tmp38_ = 0;
-	gint _tmp39_ = 0;
+	GeeCollection* _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
+	gint _tmp30_;
+	GeeArrayList* _tmp31_;
+	gint _tmp32_;
+	gint _tmp33_;
+	GeeArrayList* _tmp34_;
+	gint _tmp35_;
+	gint _tmp36_;
+	GeeArrayList* _tmp37_;
+	gint _tmp38_;
+	gint _tmp39_;
 	AggregateProgressMonitor* agg_monitor = NULL;
-	ProgressMonitor _tmp40_ = NULL;
-	void* _tmp40__target = NULL;
-	GeeArrayList* _tmp45_ = NULL;
-	gint _tmp46_ = 0;
-	gint _tmp47_ = 0;
-	GeeArrayList* _tmp54_ = NULL;
-	gint _tmp55_ = 0;
-	gint _tmp56_ = 0;
-	GeeArrayList* _tmp63_ = NULL;
-	gint _tmp64_ = 0;
-	gint _tmp65_ = 0;
+	ProgressMonitor _tmp40_;
+	void* _tmp40__target;
+	GeeArrayList* _tmp45_;
+	gint _tmp46_;
+	gint _tmp47_;
+	GeeArrayList* _tmp54_;
+	gint _tmp55_;
+	gint _tmp56_;
+	GeeArrayList* _tmp63_;
+	gint _tmp64_;
+	gint _tmp65_;
 	gboolean _tmp72_ = FALSE;
-	GeeHashSet* _tmp73_ = NULL;
+	GeeHashSet* _tmp73_;
 	GError * _inner_error_ = NULL;
 #line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
@@ -6066,21 +6082,21 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 	_tmp2_ = delete_backing;
 #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (!_tmp2_) {
-#line 6068 "MediaDataRepresentation.c"
-		GeeHashSet* _tmp3_ = NULL;
+#line 6084 "MediaDataRepresentation.c"
+		GeeHashSet* _tmp3_;
 #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp1_);
 #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp3_;
-#line 6076 "MediaDataRepresentation.c"
+#line 6092 "MediaDataRepresentation.c"
 	} else {
 #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp1_);
 #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = NULL;
-#line 6082 "MediaDataRepresentation.c"
+#line 6098 "MediaDataRepresentation.c"
 	}
 #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = _g_object_ref0 (_tmp1_);
@@ -6098,11 +6114,11 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 	_tmp7_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 669 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	not_trashed = _tmp7_;
-#line 6100 "MediaDataRepresentation.c"
+#line 6116 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp8_ = NULL;
-		GeeIterator* _tmp9_ = NULL;
+		GeeCollection* _tmp8_;
+		GeeIterator* _tmp9_;
 #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp8_ = sources;
 #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6111,15 +6127,15 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 		_source_it = _tmp9_;
 #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 6113 "MediaDataRepresentation.c"
-			GeeIterator* _tmp10_ = NULL;
-			gboolean _tmp11_ = FALSE;
+#line 6129 "MediaDataRepresentation.c"
+			GeeIterator* _tmp10_;
+			gboolean _tmp11_;
 			MediaSource* source = NULL;
-			GeeIterator* _tmp12_ = NULL;
-			gpointer _tmp13_ = NULL;
-			MediaSource* _tmp14_ = NULL;
-			gboolean _tmp15_ = FALSE;
-			GeeHashSet* _tmp24_ = NULL;
+			GeeIterator* _tmp12_;
+			gpointer _tmp13_;
+			MediaSource* _tmp14_;
+			gboolean _tmp15_;
+			GeeHashSet* _tmp24_;
 #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp10_ = _source_it;
 #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6128,7 +6144,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 			if (!_tmp11_) {
 #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 6130 "MediaDataRepresentation.c"
+#line 6146 "MediaDataRepresentation.c"
 			}
 #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp12_ = _source_it;
@@ -6142,69 +6158,69 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 			_tmp15_ = media_source_is_trashed (_tmp14_);
 #line 671 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp15_) {
-#line 6144 "MediaDataRepresentation.c"
-				GeeArrayList* _tmp16_ = NULL;
-				MediaSource* _tmp17_ = NULL;
+#line 6160 "MediaDataRepresentation.c"
+				GeeArrayList* _tmp16_;
+				MediaSource* _tmp17_;
 #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp16_ = trashed;
 #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp17_ = source;
 #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
-#line 6153 "MediaDataRepresentation.c"
+#line 6169 "MediaDataRepresentation.c"
 			} else {
-				MediaSource* _tmp18_ = NULL;
-				gboolean _tmp19_ = FALSE;
+				MediaSource* _tmp18_;
+				gboolean _tmp19_;
 #line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp18_ = source;
 #line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp19_ = media_source_is_offline (_tmp18_);
 #line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp19_) {
-#line 6163 "MediaDataRepresentation.c"
-					GeeArrayList* _tmp20_ = NULL;
-					MediaSource* _tmp21_ = NULL;
+#line 6179 "MediaDataRepresentation.c"
+					GeeArrayList* _tmp20_;
+					MediaSource* _tmp21_;
 #line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp20_ = offlined;
 #line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp21_ = source;
 #line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_);
-#line 6172 "MediaDataRepresentation.c"
+#line 6188 "MediaDataRepresentation.c"
 				} else {
-					GeeArrayList* _tmp22_ = NULL;
-					MediaSource* _tmp23_ = NULL;
+					GeeArrayList* _tmp22_;
+					MediaSource* _tmp23_;
 #line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp22_ = not_trashed;
 #line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp23_ = source;
 #line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp23_);
-#line 6182 "MediaDataRepresentation.c"
+#line 6198 "MediaDataRepresentation.c"
 				}
 			}
 #line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp24_ = to_tombstone;
 #line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp24_ != NULL) {
-#line 6189 "MediaDataRepresentation.c"
-				GeeHashSet* _tmp25_ = NULL;
-				MediaSource* _tmp26_ = NULL;
+#line 6205 "MediaDataRepresentation.c"
+				GeeHashSet* _tmp25_;
+				MediaSource* _tmp26_;
 #line 679 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp25_ = to_tombstone;
 #line 679 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp26_ = source;
 #line 679 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_);
-#line 6198 "MediaDataRepresentation.c"
+#line 6214 "MediaDataRepresentation.c"
 			}
 #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (source);
-#line 6202 "MediaDataRepresentation.c"
+#line 6218 "MediaDataRepresentation.c"
 		}
 #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_source_it);
-#line 6206 "MediaDataRepresentation.c"
+#line 6222 "MediaDataRepresentation.c"
 	}
 #line 682 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp27_ = sources;
@@ -6244,12 +6260,12 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 	_tmp40__target = monitor_target;
 #line 687 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp40_ != NULL) {
-#line 6246 "MediaDataRepresentation.c"
-		gint _tmp41_ = 0;
-		ProgressMonitor _tmp42_ = NULL;
-		void* _tmp42__target = NULL;
-		AggregateProgressMonitor* _tmp43_ = NULL;
-		AggregateProgressMonitor* _tmp44_ = NULL;
+#line 6262 "MediaDataRepresentation.c"
+		gint _tmp41_;
+		ProgressMonitor _tmp42_;
+		void* _tmp42__target;
+		AggregateProgressMonitor* _tmp43_;
+		AggregateProgressMonitor* _tmp44_;
 #line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp41_ = total_count;
 #line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6268,7 +6284,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 		monitor = _aggregate_progress_monitor_monitor_progress_monitor;
 #line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		monitor_target = _tmp44_;
-#line 6270 "MediaDataRepresentation.c"
+#line 6286 "MediaDataRepresentation.c"
 	}
 #line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp45_ = trashed;
@@ -6278,14 +6294,14 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 	_tmp47_ = _tmp46_;
 #line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp47_ > 0) {
-#line 6280 "MediaDataRepresentation.c"
-		MediaSourceHoldingTank* _tmp48_ = NULL;
-		MediaSourceHoldingTank* _tmp49_ = NULL;
-		GeeArrayList* _tmp50_ = NULL;
-		gboolean _tmp51_ = FALSE;
-		ProgressMonitor _tmp52_ = NULL;
-		void* _tmp52__target = NULL;
-		GeeList* _tmp53_ = NULL;
+#line 6296 "MediaDataRepresentation.c"
+		MediaSourceHoldingTank* _tmp48_;
+		MediaSourceHoldingTank* _tmp49_;
+		GeeArrayList* _tmp50_;
+		gboolean _tmp51_;
+		ProgressMonitor _tmp52_;
+		void* _tmp52__target;
+		GeeList* _tmp53_;
 #line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp48_ = media_source_collection_get_trashcan (self);
 #line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6304,7 +6320,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 		source_holding_tank_destroy_orphans (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_LIST, GeeList), _tmp51_, _tmp52_, _tmp52__target, _tmp53_);
 #line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_source_holding_tank_unref0 (_tmp49_);
-#line 6306 "MediaDataRepresentation.c"
+#line 6322 "MediaDataRepresentation.c"
 	}
 #line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp54_ = offlined;
@@ -6314,14 +6330,14 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 	_tmp56_ = _tmp55_;
 #line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp56_ > 0) {
-#line 6316 "MediaDataRepresentation.c"
-		MediaSourceHoldingTank* _tmp57_ = NULL;
-		MediaSourceHoldingTank* _tmp58_ = NULL;
-		GeeArrayList* _tmp59_ = NULL;
-		gboolean _tmp60_ = FALSE;
-		ProgressMonitor _tmp61_ = NULL;
-		void* _tmp61__target = NULL;
-		GeeList* _tmp62_ = NULL;
+#line 6332 "MediaDataRepresentation.c"
+		MediaSourceHoldingTank* _tmp57_;
+		MediaSourceHoldingTank* _tmp58_;
+		GeeArrayList* _tmp59_;
+		gboolean _tmp60_;
+		ProgressMonitor _tmp61_;
+		void* _tmp61__target;
+		GeeList* _tmp62_;
 #line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp57_ = media_source_collection_get_offline_bin (self);
 #line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6340,7 +6356,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 		source_holding_tank_destroy_orphans (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_LIST, GeeList), _tmp60_, _tmp61_, _tmp61__target, _tmp62_);
 #line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_source_holding_tank_unref0 (_tmp58_);
-#line 6342 "MediaDataRepresentation.c"
+#line 6358 "MediaDataRepresentation.c"
 	}
 #line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp63_ = not_trashed;
@@ -6350,14 +6366,14 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 	_tmp65_ = _tmp64_;
 #line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp65_ > 0) {
-#line 6352 "MediaDataRepresentation.c"
-		GeeArrayList* _tmp66_ = NULL;
-		Marker* _tmp67_ = NULL;
-		Marker* _tmp68_ = NULL;
-		gboolean _tmp69_ = FALSE;
-		ProgressMonitor _tmp70_ = NULL;
-		void* _tmp70__target = NULL;
-		GeeList* _tmp71_ = NULL;
+#line 6368 "MediaDataRepresentation.c"
+		GeeArrayList* _tmp66_;
+		Marker* _tmp67_;
+		Marker* _tmp68_;
+		gboolean _tmp69_;
+		ProgressMonitor _tmp70_;
+		void* _tmp70__target;
+		GeeList* _tmp71_;
 #line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp66_ = not_trashed;
 #line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6376,16 +6392,16 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 		source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp68_, _tmp69_, _tmp70_, _tmp70__target, _tmp71_);
 #line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp68_);
-#line 6378 "MediaDataRepresentation.c"
+#line 6394 "MediaDataRepresentation.c"
 	}
 #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp73_ = to_tombstone;
 #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp73_ != NULL) {
-#line 6384 "MediaDataRepresentation.c"
-		GeeHashSet* _tmp74_ = NULL;
-		gint _tmp75_ = 0;
-		gint _tmp76_ = 0;
+#line 6400 "MediaDataRepresentation.c"
+		GeeHashSet* _tmp74_;
+		gint _tmp75_;
+		gint _tmp76_;
 #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp74_ = to_tombstone;
 #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6394,17 +6410,17 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 		_tmp76_ = _tmp75_;
 #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp72_ = _tmp76_ > 0;
-#line 6396 "MediaDataRepresentation.c"
+#line 6412 "MediaDataRepresentation.c"
 	} else {
 #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp72_ = FALSE;
-#line 6400 "MediaDataRepresentation.c"
+#line 6416 "MediaDataRepresentation.c"
 	}
 #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp72_) {
-#line 6404 "MediaDataRepresentation.c"
+#line 6420 "MediaDataRepresentation.c"
 		{
-			GeeHashSet* _tmp77_ = NULL;
+			GeeHashSet* _tmp77_;
 #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp77_ = to_tombstone;
 #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6413,8 +6429,8 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6415 "MediaDataRepresentation.c"
-					goto __catch564_database_error;
+#line 6431 "MediaDataRepresentation.c"
+					goto __catch565_database_error;
 				}
 #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_aggregate_progress_monitor_unref0 (agg_monitor);
@@ -6434,14 +6450,14 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 				g_clear_error (&_inner_error_);
 #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				return;
-#line 6436 "MediaDataRepresentation.c"
+#line 6452 "MediaDataRepresentation.c"
 			}
 		}
-		goto __finally564;
-		__catch564_database_error:
+		goto __finally565;
+		__catch565_database_error:
 		{
 			GError* err = NULL;
-			GError* _tmp78_ = NULL;
+			GError* _tmp78_;
 #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			err = _inner_error_;
 #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6452,9 +6468,9 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 			app_window_database_error (_tmp78_);
 #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_error_free0 (err);
-#line 6454 "MediaDataRepresentation.c"
+#line 6470 "MediaDataRepresentation.c"
 		}
-		__finally564:
+		__finally565:
 #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6475,7 +6491,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 			g_clear_error (&_inner_error_);
 #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			return;
-#line 6477 "MediaDataRepresentation.c"
+#line 6493 "MediaDataRepresentation.c"
 		}
 	}
 #line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6490,15 +6506,15 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 	_g_object_unref0 (to_tombstone);
 #line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (_tmp1_);
-#line 6492 "MediaDataRepresentation.c"
+#line 6508 "MediaDataRepresentation.c"
 }
 
 
 void media_source_collection_delete_backing_files (MediaSourceCollection* self, GeeCollection* sources, ProgressMonitor monitor, void* monitor_target, GeeList* not_deleted) {
 	gint total_count = 0;
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gint i = 0;
 	GError * _inner_error_ = NULL;
 #line 713 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6517,11 +6533,11 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 	total_count = _tmp2_;
 #line 716 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	i = 1;
-#line 6519 "MediaDataRepresentation.c"
+#line 6535 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
 #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = sources;
 #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6530,23 +6546,27 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 		_source_it = _tmp4_;
 #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 6532 "MediaDataRepresentation.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+#line 6548 "MediaDataRepresentation.c"
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			MediaSource* source = NULL;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
 			GFile* file = NULL;
-			MediaSource* _tmp9_ = NULL;
-			GFile* _tmp10_ = NULL;
+			MediaSource* _tmp9_;
+			GFile* _tmp10_;
+			GFile* masterfile = NULL;
+			MediaSource* _tmp17_;
+			GFile* _tmp18_;
+			GFile* _tmp19_;
 			gboolean deleted = FALSE;
-			GFile* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
-			gboolean _tmp19_ = FALSE;
-			gboolean _tmp20_ = FALSE;
-			ProgressMonitor _tmp24_ = NULL;
-			void* _tmp24__target = NULL;
-			gint _tmp28_ = 0;
+			GFile* _tmp27_;
+			gboolean _tmp28_;
+			gboolean _tmp29_ = FALSE;
+			gboolean _tmp30_;
+			ProgressMonitor _tmp34_;
+			void* _tmp34__target;
+			gint _tmp38_;
 #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = _source_it;
 #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6555,7 +6575,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 			if (!_tmp6_) {
 #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 6557 "MediaDataRepresentation.c"
+#line 6577 "MediaDataRepresentation.c"
 			}
 #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = _source_it;
@@ -6569,28 +6589,28 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 			_tmp10_ = media_source_get_file (_tmp9_);
 #line 719 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			file = _tmp10_;
-#line 6571 "MediaDataRepresentation.c"
+#line 6591 "MediaDataRepresentation.c"
 			{
-				GFile* _tmp11_ = NULL;
+				GFile* _tmp11_;
 #line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp11_ = file;
 #line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_file_delete (_tmp11_, NULL, &_inner_error_);
 #line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6580 "MediaDataRepresentation.c"
-					goto __catch565_g_error;
+#line 6600 "MediaDataRepresentation.c"
+					goto __catch566_g_error;
 				}
 			}
-			goto __finally565;
-			__catch565_g_error:
+			goto __finally566;
+			__catch566_g_error:
 			{
 				GError* err = NULL;
-				GFile* _tmp12_ = NULL;
-				gchar* _tmp13_ = NULL;
-				gchar* _tmp14_ = NULL;
-				GError* _tmp15_ = NULL;
-				const gchar* _tmp16_ = NULL;
+				GFile* _tmp12_;
+				gchar* _tmp13_;
+				gchar* _tmp14_;
+				GError* _tmp15_;
+				const gchar* _tmp16_;
 #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				err = _inner_error_;
 #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6611,9 +6631,9 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 				_g_free0 (_tmp14_);
 #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_error_free0 (err);
-#line 6613 "MediaDataRepresentation.c"
+#line 6633 "MediaDataRepresentation.c"
 			}
-			__finally565:
+			__finally566:
 #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6628,79 +6648,164 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 				g_clear_error (&_inner_error_);
 #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				return;
-#line 6630 "MediaDataRepresentation.c"
+#line 6650 "MediaDataRepresentation.c"
 			}
 #line 727 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			_tmp17_ = file;
+			_tmp17_ = source;
 #line 727 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			_tmp18_ = g_file_query_exists (_tmp17_, NULL);
+			_tmp18_ = media_source_get_master_file (_tmp17_);
 #line 727 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			deleted = !_tmp18_;
-#line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			_tmp20_ = deleted;
+			masterfile = _tmp18_;
 #line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			if (!_tmp20_) {
-#line 6642 "MediaDataRepresentation.c"
-				GeeList* _tmp21_ = NULL;
+			_tmp19_ = masterfile;
 #line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp21_ = not_deleted;
-#line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp19_ = NULL != _tmp21_;
-#line 6648 "MediaDataRepresentation.c"
-			} else {
-#line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp19_ = FALSE;
-#line 6652 "MediaDataRepresentation.c"
-			}
-#line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			if (_tmp19_) {
-#line 6656 "MediaDataRepresentation.c"
-				GeeList* _tmp22_ = NULL;
-				MediaSource* _tmp23_ = NULL;
-#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp22_ = not_deleted;
+			if (_tmp19_ != NULL) {
+#line 6662 "MediaDataRepresentation.c"
+				{
+					GFile* _tmp20_;
+#line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+					_tmp20_ = masterfile;
+#line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+					g_file_delete (_tmp20_, NULL, &_inner_error_);
+#line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+					if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 6671 "MediaDataRepresentation.c"
+						goto __catch567_g_error;
+					}
+				}
+				goto __finally567;
+				__catch567_g_error:
+				{
+					GError* err = NULL;
+					GError* _tmp21_;
 #line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp23_ = source;
+					err = _inner_error_;
 #line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 6665 "MediaDataRepresentation.c"
-			}
-#line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			_tmp24_ = monitor;
+					_inner_error_ = NULL;
 #line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			_tmp24__target = monitor_target;
+					_tmp21_ = err;
 #line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			if (_tmp24_ != NULL) {
-#line 6673 "MediaDataRepresentation.c"
-				ProgressMonitor _tmp25_ = NULL;
-				void* _tmp25__target = NULL;
-				gint _tmp26_ = 0;
-				gint _tmp27_ = 0;
+					if (!g_error_matches (_tmp21_, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) {
+#line 6688 "MediaDataRepresentation.c"
+						GFile* _tmp22_;
+						gchar* _tmp23_;
+						gchar* _tmp24_;
+						GError* _tmp25_;
+						const gchar* _tmp26_;
 #line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp25_ = monitor;
+						_tmp22_ = masterfile;
 #line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp25__target = monitor_target;
+						_tmp23_ = g_file_get_path (_tmp22_);
 #line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp26_ = i;
+						_tmp24_ = _tmp23_;
 #line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp27_ = total_count;
+						_tmp25_ = err;
 #line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp25_ ((guint64) _tmp26_, (guint64) _tmp27_, TRUE, _tmp25__target);
-#line 6688 "MediaDataRepresentation.c"
+						_tmp26_ = _tmp25_->message;
+#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+						g_debug ("MediaDataRepresentation.vala:733: Exception deleting master file %s: %" \
+"s", _tmp24_, _tmp26_);
+#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+						_g_free0 (_tmp24_);
+#line 6708 "MediaDataRepresentation.c"
+					}
+#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+					_g_error_free0 (err);
+#line 6712 "MediaDataRepresentation.c"
+				}
+				__finally567:
+#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+					_g_object_unref0 (masterfile);
+#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+					_g_object_unref0 (file);
+#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+					_g_object_unref0 (source);
+#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+					_g_object_unref0 (_source_it);
+#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+					g_clear_error (&_inner_error_);
+#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+					return;
+#line 6731 "MediaDataRepresentation.c"
+				}
+			}
+#line 738 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			_tmp27_ = file;
+#line 738 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			_tmp28_ = g_file_query_exists (_tmp27_, NULL);
+#line 738 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			deleted = !_tmp28_;
+#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			_tmp30_ = deleted;
+#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			if (!_tmp30_) {
+#line 6744 "MediaDataRepresentation.c"
+				GeeList* _tmp31_;
+#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				_tmp31_ = not_deleted;
+#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				_tmp29_ = NULL != _tmp31_;
+#line 6750 "MediaDataRepresentation.c"
+			} else {
+#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				_tmp29_ = FALSE;
+#line 6754 "MediaDataRepresentation.c"
+			}
+#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			if (_tmp29_) {
+#line 6758 "MediaDataRepresentation.c"
+				GeeList* _tmp32_;
+				MediaSource* _tmp33_;
+#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				_tmp32_ = not_deleted;
+#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				_tmp33_ = source;
+#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection), _tmp33_);
+#line 6767 "MediaDataRepresentation.c"
 			}
-#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			_tmp28_ = i;
-#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			i = _tmp28_ + 1;
+#line 743 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			_tmp34_ = monitor;
+#line 743 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			_tmp34__target = monitor_target;
+#line 743 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			if (_tmp34_ != NULL) {
+#line 6775 "MediaDataRepresentation.c"
+				ProgressMonitor _tmp35_;
+				void* _tmp35__target;
+				gint _tmp36_;
+				gint _tmp37_;
+#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				_tmp35_ = monitor;
+#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				_tmp35__target = monitor_target;
+#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				_tmp36_ = i;
+#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				_tmp37_ = total_count;
+#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				_tmp35_ ((guint64) _tmp36_, (guint64) _tmp37_, TRUE, _tmp35__target);
+#line 6790 "MediaDataRepresentation.c"
+			}
+#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			_tmp38_ = i;
+#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			i = _tmp38_ + 1;
+#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			_g_object_unref0 (masterfile);
 #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (file);
 #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (source);
-#line 6698 "MediaDataRepresentation.c"
+#line 6802 "MediaDataRepresentation.c"
 		}
 #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_source_it);
-#line 6702 "MediaDataRepresentation.c"
+#line 6806 "MediaDataRepresentation.c"
 	}
 }
 
@@ -6710,21 +6815,21 @@ TransactionController* media_source_collection_get_transaction_controller (Media
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
 #line 342 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_transaction_controller (self);
-#line 6712 "MediaDataRepresentation.c"
+#line 6816 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_real_media_import_starting (MediaSourceCollection* self, GeeCollection* media) {
 #line 355 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media));
-#line 6719 "MediaDataRepresentation.c"
+#line 6823 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_real_media_import_completed (MediaSourceCollection* self, GeeCollection* media) {
 #line 362 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media));
-#line 6726 "MediaDataRepresentation.c"
+#line 6830 "MediaDataRepresentation.c"
 }
 
 
@@ -6735,7 +6840,7 @@ static void media_source_collection_real_master_file_replaced (MediaSourceCollec
 	g_return_if_fail (G_IS_FILE (old_file));
 #line 365 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (G_IS_FILE (new_file));
-#line 6737 "MediaDataRepresentation.c"
+#line 6841 "MediaDataRepresentation.c"
 }
 
 
@@ -6754,19 +6859,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closu
 		data1 = closure->data;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 6756 "MediaDataRepresentation.c"
+#line 6860 "MediaDataRepresentation.c"
 	} else {
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		data2 = closure->data;
-#line 6762 "MediaDataRepresentation.c"
+#line 6866 "MediaDataRepresentation.c"
 	}
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_object (param_values + 3), data2);
-#line 6768 "MediaDataRepresentation.c"
+#line 6872 "MediaDataRepresentation.c"
 }
 
 
@@ -6775,7 +6880,7 @@ static void media_source_collection_real_trashcan_contents_altered (MediaSourceC
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
 #line 368 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 6777 "MediaDataRepresentation.c"
+#line 6881 "MediaDataRepresentation.c"
 }
 
 
@@ -6788,7 +6893,7 @@ static void media_source_collection_real_offline_contents_altered (MediaSourceCo
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
 #line 375 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 6790 "MediaDataRepresentation.c"
+#line 6894 "MediaDataRepresentation.c"
 }
 
 
@@ -6804,37 +6909,37 @@ static void media_source_collection_class_init (MediaSourceCollectionClass * kla
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_type_class_add_private (klass, sizeof (MediaSourceCollectionPrivate));
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceCollectionClass *) klass)->create_trashcan = (MediaSourceHoldingTank* (*)(MediaSourceCollection*)) media_source_collection_real_create_trashcan;
+	((MediaSourceCollectionClass *) klass)->create_trashcan = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) media_source_collection_real_create_trashcan;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceCollectionClass *) klass)->create_offline_bin = (MediaSourceHoldingTank* (*)(MediaSourceCollection*)) media_source_collection_real_create_offline_bin;
+	((MediaSourceCollectionClass *) klass)->create_offline_bin = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) media_source_collection_real_create_offline_bin;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceCollectionClass *) klass)->create_media_monitor = (MediaMonitor* (*)(MediaSourceCollection*, Workers*, GCancellable*)) media_source_collection_real_create_media_monitor;
+	((MediaSourceCollectionClass *) klass)->create_media_monitor = (MediaMonitor* (*) (MediaSourceCollection *, Workers*, GCancellable*)) media_source_collection_real_create_media_monitor;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceCollectionClass *) klass)->get_typename = (gchar* (*)(MediaSourceCollection*)) media_source_collection_real_get_typename;
+	((MediaSourceCollectionClass *) klass)->get_typename = (gchar* (*) (MediaSourceCollection *)) media_source_collection_real_get_typename;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceCollectionClass *) klass)->is_file_recognized = (gboolean (*)(MediaSourceCollection*, GFile*)) media_source_collection_real_is_file_recognized;
+	((MediaSourceCollectionClass *) klass)->is_file_recognized = (gboolean (*) (MediaSourceCollection *, GFile*)) media_source_collection_real_is_file_recognized;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = (MediaSource* (*)(MediaSourceCollection*, gint64)) media_source_collection_real_fetch_by_numeric_id;
+	((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = (MediaSource* (*) (MediaSourceCollection *, gint64)) media_source_collection_real_fetch_by_numeric_id;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceCollectionClass *) klass)->notify_import_roll_altered = (void (*)(MediaSourceCollection*)) media_source_collection_real_notify_import_roll_altered;
+	((MediaSourceCollectionClass *) klass)->notify_import_roll_altered = (void (*) (MediaSourceCollection *)) media_source_collection_real_notify_import_roll_altered;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceCollectionClass *) klass)->notify_flagged_contents_altered = (void (*)(MediaSourceCollection*)) media_source_collection_real_notify_flagged_contents_altered;
+	((MediaSourceCollectionClass *) klass)->notify_flagged_contents_altered = (void (*) (MediaSourceCollection *)) media_source_collection_real_notify_flagged_contents_altered;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceCollectionClass *) klass)->notify_media_import_starting = (void (*)(MediaSourceCollection*, GeeCollection*)) media_source_collection_real_notify_media_import_starting;
+	((MediaSourceCollectionClass *) klass)->notify_media_import_starting = (void (*) (MediaSourceCollection *, GeeCollection*)) media_source_collection_real_notify_media_import_starting;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceCollectionClass *) klass)->notify_media_import_completed = (void (*)(MediaSourceCollection*, GeeCollection*)) media_source_collection_real_notify_media_import_completed;
+	((MediaSourceCollectionClass *) klass)->notify_media_import_completed = (void (*) (MediaSourceCollection *, GeeCollection*)) media_source_collection_real_notify_media_import_completed;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((DataCollectionClass *) klass)->items_altered = (void (*)(DataCollection*, GeeMap*)) media_source_collection_real_items_altered;
+	((DataCollectionClass *) klass)->items_altered = (void (*) (DataCollection *, GeeMap*)) media_source_collection_real_items_altered;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((DataCollectionClass *) klass)->notify_contents_altered = (void (*)(DataCollection*, GeeIterable*, GeeIterable*)) media_source_collection_real_notify_contents_altered;
+	((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) media_source_collection_real_notify_contents_altered;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceCollectionClass *) klass)->fetch_by_source_id = (MediaSource* (*)(MediaSourceCollection*, const gchar*)) media_source_collection_real_fetch_by_source_id;
+	((MediaSourceCollectionClass *) klass)->fetch_by_source_id = (MediaSource* (*) (MediaSourceCollection *, const gchar*)) media_source_collection_real_fetch_by_source_id;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceCollectionClass *) klass)->get_event_source_ids = (GeeCollection* (*)(MediaSourceCollection*, EventID*)) media_source_collection_real_get_event_source_ids;
+	((MediaSourceCollectionClass *) klass)->get_event_source_ids = (GeeCollection* (*) (MediaSourceCollection *, EventID*)) media_source_collection_real_get_event_source_ids;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceCollectionClass *) klass)->import_many = (void (*)(MediaSourceCollection*, GeeCollection*)) media_source_collection_real_import_many;
+	((MediaSourceCollectionClass *) klass)->import_many = (void (*) (MediaSourceCollection *, GeeCollection*)) media_source_collection_real_import_many;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	((MediaSourceCollectionClass *) klass)->postprocess_imported_media = (void (*)(MediaSourceCollection*, GeeCollection*)) media_source_collection_real_postprocess_imported_media;
+	((MediaSourceCollectionClass *) klass)->postprocess_imported_media = (void (*) (MediaSourceCollection *, GeeCollection*)) media_source_collection_real_postprocess_imported_media;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->media_import_starting = media_source_collection_real_media_import_starting;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6850,28 +6955,28 @@ static void media_source_collection_class_init (MediaSourceCollectionClass * kla
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->flagged_contents_altered = media_source_collection_real_flagged_contents_altered;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_signal_new ("media_import_starting", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, media_import_starting), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
+	media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_STARTING_SIGNAL] = g_signal_new ("media-import-starting", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, media_import_starting), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_signal_new ("media_import_completed", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, media_import_completed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
+	media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_COMPLETED_SIGNAL] = g_signal_new ("media-import-completed", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, media_import_completed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_signal_new ("master_file_replaced", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, master_file_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, g_file_get_type (), g_file_get_type ());
+	media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MASTER_FILE_REPLACED_SIGNAL] = g_signal_new ("master-file-replaced", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, master_file_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, g_file_get_type (), g_file_get_type ());
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_signal_new ("trashcan_contents_altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, trashcan_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION);
+	media_source_collection_signals[MEDIA_SOURCE_COLLECTION_TRASHCAN_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, trashcan_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION);
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_signal_new ("import_roll_altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, import_roll_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	media_source_collection_signals[MEDIA_SOURCE_COLLECTION_IMPORT_ROLL_ALTERED_SIGNAL] = g_signal_new ("import-roll-altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, import_roll_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_signal_new ("offline_contents_altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, offline_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION);
+	media_source_collection_signals[MEDIA_SOURCE_COLLECTION_OFFLINE_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("offline-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, offline_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION);
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_signal_new ("flagged_contents_altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, flagged_contents_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 6865 "MediaDataRepresentation.c"
+	media_source_collection_signals[MEDIA_SOURCE_COLLECTION_FLAGGED_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("flagged-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, flagged_contents_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 6969 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_instance_init (MediaSourceCollection * self) {
-	GeeHashMap* _tmp0_ = NULL;
-	GeeTreeMultiMap* _tmp1_ = NULL;
-	GeeTreeSet* _tmp2_ = NULL;
-	GeeHashSet* _tmp3_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeTreeMultiMap* _tmp1_;
+	GeeTreeSet* _tmp2_;
+	GeeHashSet* _tmp3_;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv = MEDIA_SOURCE_COLLECTION_GET_PRIVATE (self);
 #line 344 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6894,11 +6999,11 @@ static void media_source_collection_instance_init (MediaSourceCollection * self)
 	_tmp3_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 351 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->flagged = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SET, GeeSet);
-#line 6896 "MediaDataRepresentation.c"
+#line 7000 "MediaDataRepresentation.c"
 }
 
 
-static void media_source_collection_finalize (DataCollection* obj) {
+static void media_source_collection_finalize (DataCollection * obj) {
 	MediaSourceCollection * self;
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection);
@@ -6916,7 +7021,7 @@ static void media_source_collection_finalize (DataCollection* obj) {
 	_g_object_unref0 (self->priv->flagged);
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	DATA_COLLECTION_CLASS (media_source_collection_parent_class)->finalize (obj);
-#line 6918 "MediaDataRepresentation.c"
+#line 7022 "MediaDataRepresentation.c"
 }
 
 
@@ -6933,654 +7038,654 @@ GType media_source_collection_get_type (void) {
 
 
 static void _media_collection_registry_on_init_done_application_init_done (Application* _sender, gpointer self) {
-#line 754 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_collection_registry_on_init_done ((MediaCollectionRegistry*) self);
-#line 6937 "MediaDataRepresentation.c"
+#line 7041 "MediaDataRepresentation.c"
 }
 
 
 static MediaCollectionRegistry* media_collection_registry_construct (GType object_type) {
 	MediaCollectionRegistry* self = NULL;
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-#line 749 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	Application* _tmp0_;
+	Application* _tmp1_;
+#line 760 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = (MediaCollectionRegistry*) g_type_create_instance (object_type);
-#line 750 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 761 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = application_get_instance ();
-#line 750 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 761 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _tmp0_;
-#line 750 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 761 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_connect (_tmp1_, "init-done", (GCallback) _media_collection_registry_on_init_done_application_init_done, self);
-#line 750 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 761 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_application_unref0 (_tmp1_);
-#line 749 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 760 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self;
-#line 6957 "MediaDataRepresentation.c"
+#line 7061 "MediaDataRepresentation.c"
 }
 
 
 static MediaCollectionRegistry* media_collection_registry_new (void) {
-#line 749 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 760 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return media_collection_registry_construct (TYPE_MEDIA_COLLECTION_REGISTRY);
-#line 6964 "MediaDataRepresentation.c"
+#line 7068 "MediaDataRepresentation.c"
 }
 
 
 static void media_collection_registry_on_init_done (MediaCollectionRegistry* self) {
 	LibraryMonitor* library_monitor = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	LibraryMonitor* _tmp3_ = NULL;
-	LibraryMonitor* _tmp4_ = NULL;
-	LibraryMonitorPool* _tmp5_ = NULL;
-	LibraryMonitorPool* _tmp6_ = NULL;
-#line 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
+	LibraryMonitor* _tmp3_;
+	LibraryMonitor* _tmp4_;
+	LibraryMonitorPool* _tmp5_;
+	LibraryMonitorPool* _tmp6_;
+#line 768 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self));
-#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = app_dirs_get_import_dir ();
-#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _tmp0_;
-#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = commandline_options_no_runtime_monitoring;
-#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = library_monitor_new (_tmp1_, TRUE, !_tmp2_);
-#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = _tmp3_;
-#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (_tmp1_);
-#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	library_monitor = _tmp4_;
-#line 762 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 773 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp5_ = library_monitor_pool_get_instance ();
-#line 762 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 773 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp6_ = _tmp5_;
-#line 762 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 773 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	library_monitor_pool_replace (_tmp6_, library_monitor, MEDIA_COLLECTION_REGISTRY_LIBRARY_MONITOR_START_DELAY_MSEC);
-#line 762 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 773 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_library_monitor_pool_unref0 (_tmp6_);
-#line 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 768 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (library_monitor);
-#line 7003 "MediaDataRepresentation.c"
+#line 7107 "MediaDataRepresentation.c"
 }
 
 
 static void _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed (ConfigurationFacade* _sender, gpointer self) {
-#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_collection_registry_on_import_directory_changed ();
-#line 7010 "MediaDataRepresentation.c"
+#line 7114 "MediaDataRepresentation.c"
 }
 
 
 void media_collection_registry_init (void) {
-	MediaCollectionRegistry* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	ConfigFacade* _tmp2_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	MediaCollectionRegistry* _tmp0_;
+	ConfigFacade* _tmp1_;
+	ConfigFacade* _tmp2_;
+#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media_collection_registry_new ();
-#line 766 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_media_collection_registry_unref0 (media_collection_registry_instance);
-#line 766 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_collection_registry_instance = _tmp0_;
-#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = config_facade_get_instance ();
-#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = _tmp1_;
-#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "import-directory-changed", (GCallback) _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed, NULL);
-#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (_tmp2_);
-#line 7032 "MediaDataRepresentation.c"
+#line 7136 "MediaDataRepresentation.c"
 }
 
 
 void media_collection_registry_terminate (void) {
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-#line 771 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	guint _tmp2_;
+#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 771 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _tmp0_;
-#line 771 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_parse_name ("import-directory-changed", TYPE_CONFIGURATION_FACADE, &_tmp2_, NULL, FALSE);
-#line 771 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed, NULL);
-#line 771 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (_tmp1_);
-#line 7050 "MediaDataRepresentation.c"
+#line 7154 "MediaDataRepresentation.c"
 }
 
 
 static void media_collection_registry_on_import_directory_changed (void) {
 	GFile* import_dir = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	LibraryMonitor* current = NULL;
-	LibraryMonitorPool* _tmp1_ = NULL;
-	LibraryMonitorPool* _tmp2_ = NULL;
-	LibraryMonitor* _tmp3_ = NULL;
-	LibraryMonitor* _tmp4_ = NULL;
+	LibraryMonitorPool* _tmp1_;
+	LibraryMonitorPool* _tmp2_;
+	LibraryMonitor* _tmp3_;
+	LibraryMonitor* _tmp4_;
 	gboolean _tmp5_ = FALSE;
-	LibraryMonitor* _tmp6_ = NULL;
+	LibraryMonitor* _tmp6_;
 	LibraryMonitor* replacement = NULL;
-	GFile* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	LibraryMonitor* _tmp14_ = NULL;
-	LibraryMonitorPool* _tmp15_ = NULL;
-	LibraryMonitorPool* _tmp16_ = NULL;
-	LibraryMonitor* _tmp17_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	GFile* _tmp12_;
+	gboolean _tmp13_;
+	LibraryMonitor* _tmp14_;
+	LibraryMonitorPool* _tmp15_;
+	LibraryMonitorPool* _tmp16_;
+	LibraryMonitor* _tmp17_;
+#line 786 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = app_dirs_get_import_dir ();
-#line 775 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 786 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	import_dir = _tmp0_;
-#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = library_monitor_pool_get_instance ();
-#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = _tmp1_;
-#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = library_monitor_pool_get_monitor (_tmp2_);
-#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = _tmp3_;
-#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_library_monitor_pool_unref0 (_tmp2_);
-#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	current = _tmp4_;
-#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp6_ = current;
-#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp6_ != NULL) {
-#line 7091 "MediaDataRepresentation.c"
-		LibraryMonitor* _tmp7_ = NULL;
-		GFile* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
-#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 7195 "MediaDataRepresentation.c"
+		LibraryMonitor* _tmp7_;
+		GFile* _tmp8_;
+		GFile* _tmp9_;
+		GFile* _tmp10_;
+		gboolean _tmp11_;
+#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp7_ = current;
-#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp8_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp9_ = _tmp8_;
-#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp10_ = import_dir;
-#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp11_ = g_file_equal (_tmp9_, _tmp10_);
-#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = _tmp11_;
-#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp9_);
-#line 7111 "MediaDataRepresentation.c"
+#line 7215 "MediaDataRepresentation.c"
 	} else {
-#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = FALSE;
-#line 7115 "MediaDataRepresentation.c"
+#line 7219 "MediaDataRepresentation.c"
 	}
-#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp5_) {
-#line 779 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (current);
-#line 779 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (import_dir);
-#line 779 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return;
-#line 7125 "MediaDataRepresentation.c"
+#line 7229 "MediaDataRepresentation.c"
 	}
-#line 781 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp12_ = import_dir;
-#line 781 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp13_ = commandline_options_no_runtime_monitoring;
-#line 781 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp14_ = library_monitor_new (_tmp12_, TRUE, !_tmp13_);
-#line 781 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	replacement = _tmp14_;
-#line 783 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp15_ = library_monitor_pool_get_instance ();
-#line 783 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp16_ = _tmp15_;
-#line 783 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp17_ = replacement;
-#line 783 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	library_monitor_pool_replace (_tmp16_, _tmp17_, MEDIA_COLLECTION_REGISTRY_LIBRARY_MONITOR_START_DELAY_MSEC);
-#line 783 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_library_monitor_pool_unref0 (_tmp16_);
-#line 774 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 785 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (replacement);
-#line 774 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 785 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (current);
-#line 774 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 785 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (import_dir);
-#line 7151 "MediaDataRepresentation.c"
+#line 7255 "MediaDataRepresentation.c"
 }
 
 
 static gpointer _media_collection_registry_ref0 (gpointer self) {
-#line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self ? media_collection_registry_ref (self) : NULL;
-#line 7158 "MediaDataRepresentation.c"
+#line 7262 "MediaDataRepresentation.c"
 }
 
 
 MediaCollectionRegistry* media_collection_registry_get_instance (void) {
 	MediaCollectionRegistry* result = NULL;
-	MediaCollectionRegistry* _tmp0_ = NULL;
-	MediaCollectionRegistry* _tmp1_ = NULL;
-#line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	MediaCollectionRegistry* _tmp0_;
+	MediaCollectionRegistry* _tmp1_;
+#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media_collection_registry_instance;
-#line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _media_collection_registry_ref0 (_tmp0_);
-#line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp1_;
-#line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 7174 "MediaDataRepresentation.c"
+#line 7278 "MediaDataRepresentation.c"
 }
 
 
 gchar* media_collection_registry_get_typename_from_source_id (const gchar* source_id) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
+#line 801 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (source_id != NULL, NULL);
-#line 793 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = source_id;
-#line 793 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = g_str_has_prefix (_tmp0_, PHOTO_TYPENAME);
-#line 793 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp1_) {
-#line 7190 "MediaDataRepresentation.c"
-		gchar* _tmp2_ = NULL;
-#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 7294 "MediaDataRepresentation.c"
+		gchar* _tmp2_;
+#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = g_strdup (PHOTO_TYPENAME);
-#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		result = _tmp2_;
-#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 7198 "MediaDataRepresentation.c"
+#line 7302 "MediaDataRepresentation.c"
 	} else {
 		gchar** components = NULL;
-		const gchar* _tmp3_ = NULL;
-		gchar** _tmp4_ = NULL;
-		gchar** _tmp5_ = NULL;
-		gint components_length1 = 0;
-		gint _components_size_ = 0;
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-		gchar** _tmp7_ = NULL;
-		gint _tmp7__length1 = 0;
-		const gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		const gchar* _tmp3_;
+		gchar** _tmp4_;
+		gchar** _tmp5_;
+		gint components_length1;
+		gint _components_size_;
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+		gchar** _tmp7_;
+		gint _tmp7__length1;
+		const gchar* _tmp8_;
+		gchar* _tmp9_;
+#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = source_id;
-#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = _tmp4_ = g_strsplit (_tmp3_, "-", 0);
-#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		components = _tmp5_;
-#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		components_length1 = _vala_array_length (_tmp4_);
-#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_components_size_ = components_length1;
-#line 797 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp6_ = components;
-#line 797 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp6__length1 = components_length1;
-#line 797 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_vala_assert (_tmp6__length1 == 2, "components.length == 2");
-#line 799 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp7_ = components;
-#line 799 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp7__length1 = components_length1;
-#line 799 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp8_ = _tmp7_[0];
-#line 799 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp9_ = g_strdup (_tmp8_);
-#line 799 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		result = _tmp9_;
-#line 799 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		components = (_vala_array_free (components, components_length1, (GDestroyNotify) g_free), NULL);
-#line 799 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 7242 "MediaDataRepresentation.c"
+#line 7346 "MediaDataRepresentation.c"
 	}
 }
 
 
 void media_collection_registry_register_collection (MediaCollectionRegistry* self, MediaSourceCollection* collection) {
-	GeeArrayList* _tmp0_ = NULL;
-	MediaSourceCollection* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
-	MediaSourceCollection* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	MediaSourceCollection* _tmp6_ = NULL;
-#line 803 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	GeeArrayList* _tmp0_;
+	MediaSourceCollection* _tmp1_;
+	GeeHashMap* _tmp2_;
+	MediaSourceCollection* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	MediaSourceCollection* _tmp6_;
+#line 814 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self));
-#line 803 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 814 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (collection));
-#line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 815 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->all;
-#line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 815 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = collection;
-#line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 815 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = self->priv->by_typename;
-#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = collection;
-#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = media_source_collection_get_typename (_tmp3_);
-#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp5_ = _tmp4_;
-#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp6_ = collection;
-#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, _tmp6_);
-#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_free0 (_tmp5_);
-#line 7279 "MediaDataRepresentation.c"
+#line 7383 "MediaDataRepresentation.c"
 }
 
 
 MediaSourceCollection* media_collection_registry_get_collection (MediaCollectionRegistry* self, const gchar* typename) {
 	MediaSourceCollection* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-#line 812 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
+#line 823 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL);
-#line 812 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 823 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (typename != NULL, NULL);
-#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->by_typename;
-#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = typename;
-#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = (MediaSourceCollection*) _tmp2_;
-#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 7302 "MediaDataRepresentation.c"
+#line 7406 "MediaDataRepresentation.c"
 }
 
 
 GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self) {
 	GeeCollection* result = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeBidirList* _tmp1_ = NULL;
-	GeeBidirList* _tmp2_ = NULL;
-#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	GeeArrayList* _tmp0_;
+	GeeBidirList* _tmp1_;
+	GeeBidirList* _tmp2_;
+#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL);
-#line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->all;
-#line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = gee_abstract_bidir_list_get_read_only_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_BIDIR_LIST, GeeAbstractBidirList));
-#line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = _tmp1_;
-#line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 7323 "MediaDataRepresentation.c"
+#line 7427 "MediaDataRepresentation.c"
 }
 
 
 void media_collection_registry_freeze_all (MediaCollectionRegistry* self) {
-#line 820 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self));
-#line 7330 "MediaDataRepresentation.c"
+#line 7434 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
-#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		GeeCollection* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
+		GeeIterator* _tmp3_;
+#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media_collection_registry_get_all (self);
-#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp0_;
-#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = _tmp2_;
-#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp1_);
-#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_sources_it = _tmp3_;
-#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7351 "MediaDataRepresentation.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 7455 "MediaDataRepresentation.c"
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
-			MediaSourceCollection* _tmp8_ = NULL;
-#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			MediaSourceCollection* _tmp8_;
+#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _sources_it;
-#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp5_) {
-#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7366 "MediaDataRepresentation.c"
+#line 7470 "MediaDataRepresentation.c"
 			}
-#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _sources_it;
-#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			sources = (MediaSourceCollection*) _tmp7_;
-#line 822 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 833 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = sources;
-#line 822 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 833 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection));
-#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (sources);
-#line 7380 "MediaDataRepresentation.c"
+#line 7484 "MediaDataRepresentation.c"
 		}
-#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_sources_it);
-#line 7384 "MediaDataRepresentation.c"
+#line 7488 "MediaDataRepresentation.c"
 	}
 }
 
 
 void media_collection_registry_thaw_all (MediaCollectionRegistry* self) {
-#line 825 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self));
-#line 7392 "MediaDataRepresentation.c"
+#line 7496 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
-#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		GeeCollection* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
+		GeeIterator* _tmp3_;
+#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media_collection_registry_get_all (self);
-#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp0_;
-#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = _tmp2_;
-#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp1_);
-#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_sources_it = _tmp3_;
-#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7413 "MediaDataRepresentation.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 7517 "MediaDataRepresentation.c"
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
-			MediaSourceCollection* _tmp8_ = NULL;
-#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			MediaSourceCollection* _tmp8_;
+#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _sources_it;
-#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp5_) {
-#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7428 "MediaDataRepresentation.c"
+#line 7532 "MediaDataRepresentation.c"
 			}
-#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _sources_it;
-#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			sources = (MediaSourceCollection*) _tmp7_;
-#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 838 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = sources;
-#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 838 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection));
-#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (sources);
-#line 7442 "MediaDataRepresentation.c"
+#line 7546 "MediaDataRepresentation.c"
 		}
-#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_sources_it);
-#line 7446 "MediaDataRepresentation.c"
+#line 7550 "MediaDataRepresentation.c"
 	}
 }
 
 
 void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry* self) {
-#line 830 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 841 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self));
-#line 7454 "MediaDataRepresentation.c"
+#line 7558 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
-#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		GeeCollection* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
+		GeeIterator* _tmp3_;
+#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media_collection_registry_get_all (self);
-#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp0_;
-#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = _tmp2_;
-#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp1_);
-#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_sources_it = _tmp3_;
-#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7475 "MediaDataRepresentation.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 7579 "MediaDataRepresentation.c"
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
-			MediaSourceCollection* _tmp8_ = NULL;
-			TransactionController* _tmp9_ = NULL;
-			TransactionController* _tmp10_ = NULL;
-#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			MediaSourceCollection* _tmp8_;
+			TransactionController* _tmp9_;
+			TransactionController* _tmp10_;
+#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _sources_it;
-#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp5_) {
-#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7492 "MediaDataRepresentation.c"
+#line 7596 "MediaDataRepresentation.c"
 			}
-#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _sources_it;
-#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			sources = (MediaSourceCollection*) _tmp7_;
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = sources;
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp9_ = media_source_collection_get_transaction_controller (_tmp8_);
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp10_ = _tmp9_;
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			transaction_controller_begin (_tmp10_);
-#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (sources);
-#line 7510 "MediaDataRepresentation.c"
+#line 7614 "MediaDataRepresentation.c"
 		}
-#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_sources_it);
-#line 7514 "MediaDataRepresentation.c"
+#line 7618 "MediaDataRepresentation.c"
 	}
 }
 
 
 void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistry* self) {
-#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self));
-#line 7522 "MediaDataRepresentation.c"
+#line 7626 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
-#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		GeeCollection* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
+		GeeIterator* _tmp3_;
+#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media_collection_registry_get_all (self);
-#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp0_;
-#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = _tmp2_;
-#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp1_);
-#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_sources_it = _tmp3_;
-#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7543 "MediaDataRepresentation.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 7647 "MediaDataRepresentation.c"
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
-			MediaSourceCollection* _tmp8_ = NULL;
-			TransactionController* _tmp9_ = NULL;
-			TransactionController* _tmp10_ = NULL;
-#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			MediaSourceCollection* _tmp8_;
+			TransactionController* _tmp9_;
+			TransactionController* _tmp10_;
+#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _sources_it;
-#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp5_) {
-#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7560 "MediaDataRepresentation.c"
+#line 7664 "MediaDataRepresentation.c"
 			}
-#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _sources_it;
-#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			sources = (MediaSourceCollection*) _tmp7_;
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 848 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = sources;
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 848 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp9_ = media_source_collection_get_transaction_controller (_tmp8_);
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 848 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp10_ = _tmp9_;
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 848 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			transaction_controller_commit (_tmp10_);
-#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (sources);
-#line 7578 "MediaDataRepresentation.c"
+#line 7682 "MediaDataRepresentation.c"
 		}
-#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_sources_it);
-#line 7582 "MediaDataRepresentation.c"
+#line 7686 "MediaDataRepresentation.c"
 	}
 }
 
@@ -7588,206 +7693,206 @@ void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistr
 MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* self, const gchar* source_id) {
 	MediaSource* result = NULL;
 	gchar* typename = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	MediaSourceCollection* collection = NULL;
-	const gchar* _tmp2_ = NULL;
-	MediaSourceCollection* _tmp3_ = NULL;
-	MediaSourceCollection* _tmp4_ = NULL;
-	MediaSourceCollection* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	MediaSource* _tmp9_ = NULL;
-#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	const gchar* _tmp2_;
+	MediaSourceCollection* _tmp3_;
+	MediaSourceCollection* _tmp4_;
+	MediaSourceCollection* _tmp7_;
+	const gchar* _tmp8_;
+	MediaSource* _tmp9_;
+#line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL);
-#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (source_id != NULL, NULL);
-#line 841 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 852 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = source_id;
-#line 841 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 852 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = media_collection_registry_get_typename_from_source_id (_tmp0_);
-#line 841 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 852 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	typename = _tmp1_;
-#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = typename;
-#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = media_collection_registry_get_collection (self, _tmp2_);
-#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	collection = _tmp3_;
-#line 844 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = collection;
-#line 844 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp4_ == NULL) {
-#line 7619 "MediaDataRepresentation.c"
-		const gchar* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 7723 "MediaDataRepresentation.c"
+		const gchar* _tmp5_;
+		const gchar* _tmp6_;
+#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = source_id;
-#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp6_ = typename;
-#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		g_critical ("MediaDataRepresentation.vala:845: source id '%s' has unrecognized medi" \
+#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		g_critical ("MediaDataRepresentation.vala:856: source id '%s' has unrecognized medi" \
 "a type '%s'", _tmp5_, _tmp6_);
-#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		result = NULL;
-#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_data_collection_unref0 (collection);
-#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_free0 (typename);
-#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 7636 "MediaDataRepresentation.c"
+#line 7740 "MediaDataRepresentation.c"
 	}
-#line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp7_ = collection;
-#line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp8_ = source_id;
-#line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp9_ = media_source_collection_fetch_by_source_id (_tmp7_, _tmp8_);
-#line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp9_;
-#line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_data_collection_unref0 (collection);
-#line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_free0 (typename);
-#line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 7652 "MediaDataRepresentation.c"
+#line 7756 "MediaDataRepresentation.c"
 }
 
 
 static gpointer _import_id_dup0 (gpointer self) {
-#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self ? import_id_dup (self) : NULL;
-#line 7659 "MediaDataRepresentation.c"
+#line 7763 "MediaDataRepresentation.c"
 }
 
 
 ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* self) {
 	ImportID* result = NULL;
 	ImportID last_import_id = {0};
-	ImportID _tmp16_ = {0};
-	gint64 _tmp17_ = 0LL;
-#line 852 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	ImportID _tmp16_;
+	gint64 _tmp17_;
+#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL);
-#line 853 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 864 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	import_id_init (&last_import_id, IMPORT_ID_INVALID);
-#line 7672 "MediaDataRepresentation.c"
+#line 7776 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _current_collection_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		GeeCollection* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
+		GeeIterator* _tmp3_;
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media_collection_registry_get_all (self);
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp0_;
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = _tmp2_;
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp1_);
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_current_collection_it = _tmp3_;
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7693 "MediaDataRepresentation.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 7797 "MediaDataRepresentation.c"
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			MediaSourceCollection* current_collection = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
 			ImportID* current_import_id = NULL;
-			MediaSourceCollection* _tmp8_ = NULL;
-			ImportID* _tmp9_ = NULL;
-			ImportID* _tmp10_ = NULL;
-			ImportID* _tmp11_ = NULL;
-			gint64 _tmp12_ = 0LL;
-			ImportID _tmp13_ = {0};
-			gint64 _tmp14_ = 0LL;
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			MediaSourceCollection* _tmp8_;
+			ImportID* _tmp9_;
+			ImportID* _tmp10_;
+			ImportID* _tmp11_;
+			gint64 _tmp12_;
+			ImportID _tmp13_;
+			gint64 _tmp14_;
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _current_collection_it;
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp5_) {
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7715 "MediaDataRepresentation.c"
+#line 7819 "MediaDataRepresentation.c"
 			}
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _current_collection_it;
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			current_collection = (MediaSourceCollection*) _tmp7_;
-#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = current_collection;
-#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp9_ = media_source_collection_get_last_import_id (_tmp8_);
-#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			current_import_id = _tmp9_;
-#line 858 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp10_ = current_import_id;
-#line 858 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp10_ == NULL) {
-#line 859 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_import_id_free0 (current_import_id);
-#line 859 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_data_collection_unref0 (current_collection);
-#line 859 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				continue;
-#line 7739 "MediaDataRepresentation.c"
+#line 7843 "MediaDataRepresentation.c"
 			}
-#line 861 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp11_ = current_import_id;
-#line 861 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp12_ = (*_tmp11_).id;
-#line 861 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp13_ = last_import_id;
-#line 861 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp14_ = _tmp13_.id;
-#line 861 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp12_ > _tmp14_) {
-#line 7751 "MediaDataRepresentation.c"
-				ImportID* _tmp15_ = NULL;
-#line 862 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 7855 "MediaDataRepresentation.c"
+				ImportID* _tmp15_;
+#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp15_ = current_import_id;
-#line 862 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				last_import_id = *_tmp15_;
-#line 7757 "MediaDataRepresentation.c"
+#line 7861 "MediaDataRepresentation.c"
 			}
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_import_id_free0 (current_import_id);
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (current_collection);
-#line 7763 "MediaDataRepresentation.c"
+#line 7867 "MediaDataRepresentation.c"
 		}
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_current_collection_it);
-#line 7767 "MediaDataRepresentation.c"
+#line 7871 "MediaDataRepresentation.c"
 	}
-#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 878 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp16_ = last_import_id;
-#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 878 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp17_ = _tmp16_.id;
-#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 878 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp17_ == IMPORT_ID_INVALID) {
-#line 868 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 879 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		result = NULL;
-#line 868 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 879 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 7779 "MediaDataRepresentation.c"
+#line 7883 "MediaDataRepresentation.c"
 	} else {
-		ImportID* _tmp18_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		ImportID* _tmp18_;
+#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp18_ = _import_id_dup0 (&last_import_id);
-#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		result = _tmp18_;
-#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 7788 "MediaDataRepresentation.c"
+#line 7892 "MediaDataRepresentation.c"
 	}
 }
 
@@ -7795,460 +7900,460 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry*
 GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaCollectionRegistry* self, EventID* event_id) {
 	GeeCollection* result = NULL;
 	GeeArrayList* _result_ = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	GeeArrayList* _tmp0_;
+#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL);
-#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (event_id != NULL, NULL);
-#line 874 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 885 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 874 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 885 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_result_ = _tmp0_;
-#line 7805 "MediaDataRepresentation.c"
+#line 7909 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _current_collection_it = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		GeeCollection* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeIterator* _tmp3_;
+		GeeIterator* _tmp4_;
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = media_collection_registry_get_all (self);
-#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = _tmp1_;
-#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp4_ = _tmp3_;
-#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp2_);
-#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_current_collection_it = _tmp4_;
-#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7826 "MediaDataRepresentation.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+#line 7930 "MediaDataRepresentation.c"
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			MediaSourceCollection* current_collection = NULL;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
-			GeeArrayList* _tmp9_ = NULL;
-			MediaSourceCollection* _tmp10_ = NULL;
-			EventID _tmp11_ = {0};
-			GeeCollection* _tmp12_ = NULL;
-			GeeCollection* _tmp13_ = NULL;
-#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			GeeArrayList* _tmp9_;
+			MediaSourceCollection* _tmp10_;
+			EventID _tmp11_;
+			GeeCollection* _tmp12_;
+			GeeCollection* _tmp13_;
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = _current_collection_it;
-#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = gee_iterator_next (_tmp5_);
-#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp6_) {
-#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7845 "MediaDataRepresentation.c"
+#line 7949 "MediaDataRepresentation.c"
 			}
-#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = _current_collection_it;
-#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = gee_iterator_get (_tmp7_);
-#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			current_collection = (MediaSourceCollection*) _tmp8_;
-#line 877 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp9_ = _result_;
-#line 877 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp10_ = current_collection;
-#line 877 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp11_ = *event_id;
-#line 877 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp12_ = media_source_collection_get_event_source_ids (_tmp10_, &_tmp11_);
-#line 877 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp13_ = _tmp12_;
-#line 877 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			gee_array_list_add_all (_tmp9_, _tmp13_);
-#line 877 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (_tmp13_);
-#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (current_collection);
-#line 7869 "MediaDataRepresentation.c"
+#line 7973 "MediaDataRepresentation.c"
 		}
-#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_current_collection_it);
-#line 7873 "MediaDataRepresentation.c"
+#line 7977 "MediaDataRepresentation.c"
 	}
-#line 880 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 880 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 7879 "MediaDataRepresentation.c"
+#line 7983 "MediaDataRepresentation.c"
 }
 
 
 MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaCollectionRegistry* self, GFile* file) {
 	MediaSourceCollection* result = NULL;
-#line 883 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL);
-#line 883 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 7889 "MediaDataRepresentation.c"
+#line 7993 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _collection_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		GeeCollection* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
+		GeeIterator* _tmp3_;
+#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media_collection_registry_get_all (self);
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp0_;
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = _tmp2_;
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp1_);
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_collection_it = _tmp3_;
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7910 "MediaDataRepresentation.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 8014 "MediaDataRepresentation.c"
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			MediaSourceCollection* collection = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
-			MediaSourceCollection* _tmp8_ = NULL;
-			GFile* _tmp9_ = NULL;
-			gboolean _tmp10_ = FALSE;
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			MediaSourceCollection* _tmp8_;
+			GFile* _tmp9_;
+			gboolean _tmp10_;
+#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _collection_it;
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp5_) {
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7927 "MediaDataRepresentation.c"
+#line 8031 "MediaDataRepresentation.c"
 			}
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _collection_it;
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			collection = (MediaSourceCollection*) _tmp7_;
-#line 885 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = collection;
-#line 885 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp9_ = file;
-#line 885 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp10_ = media_source_collection_is_file_recognized (_tmp8_, _tmp9_);
-#line 885 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp10_) {
-#line 886 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				result = collection;
-#line 886 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (_collection_it);
-#line 886 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				return result;
-#line 7949 "MediaDataRepresentation.c"
+#line 8053 "MediaDataRepresentation.c"
 			}
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (collection);
-#line 7953 "MediaDataRepresentation.c"
+#line 8057 "MediaDataRepresentation.c"
 		}
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_collection_it);
-#line 7957 "MediaDataRepresentation.c"
+#line 8061 "MediaDataRepresentation.c"
 	}
-#line 889 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 900 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = NULL;
-#line 889 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 900 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 7963 "MediaDataRepresentation.c"
+#line 8067 "MediaDataRepresentation.c"
 }
 
 
 gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry* self, const gchar* source_id) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-#line 892 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	const gchar* _tmp3_;
+	gboolean _tmp4_;
+#line 903 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), FALSE);
-#line 893 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 904 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = source_id;
-#line 893 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 904 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = is_string_empty (_tmp0_);
-#line 893 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 904 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp1_) {
-#line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 905 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		result = FALSE;
-#line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 905 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 7986 "MediaDataRepresentation.c"
+#line 8090 "MediaDataRepresentation.c"
 	}
-#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = source_id;
-#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = g_str_has_prefix (_tmp3_, PHOTO_TYPENAME);
-#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp4_) {
-#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = TRUE;
-#line 7996 "MediaDataRepresentation.c"
+#line 8100 "MediaDataRepresentation.c"
 	} else {
-		const gchar* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
-#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		const gchar* _tmp5_;
+		gboolean _tmp6_;
+#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = source_id;
-#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp6_ = g_str_has_prefix (_tmp5_, VIDEO_TYPENAME "-");
-#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = _tmp6_;
-#line 8006 "MediaDataRepresentation.c"
+#line 8110 "MediaDataRepresentation.c"
 	}
-#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp2_;
-#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 8012 "MediaDataRepresentation.c"
+#line 8116 "MediaDataRepresentation.c"
 }
 
 
 static void value_media_collection_registry_init (GValue* value) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	value->data[0].v_pointer = NULL;
-#line 8019 "MediaDataRepresentation.c"
+#line 8123 "MediaDataRepresentation.c"
 }
 
 
 static void value_media_collection_registry_free_value (GValue* value) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (value->data[0].v_pointer) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_collection_registry_unref (value->data[0].v_pointer);
-#line 8028 "MediaDataRepresentation.c"
+#line 8132 "MediaDataRepresentation.c"
 	}
 }
 
 
 static void value_media_collection_registry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (src_value->data[0].v_pointer) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		dest_value->data[0].v_pointer = media_collection_registry_ref (src_value->data[0].v_pointer);
-#line 8038 "MediaDataRepresentation.c"
+#line 8142 "MediaDataRepresentation.c"
 	} else {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8042 "MediaDataRepresentation.c"
+#line 8146 "MediaDataRepresentation.c"
 	}
 }
 
 
 static gpointer value_media_collection_registry_peek_pointer (const GValue* value) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return value->data[0].v_pointer;
-#line 8050 "MediaDataRepresentation.c"
+#line 8154 "MediaDataRepresentation.c"
 }
 
 
 static gchar* value_media_collection_registry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (collect_values[0].v_pointer) {
-#line 8057 "MediaDataRepresentation.c"
-		MediaCollectionRegistry* object;
+#line 8161 "MediaDataRepresentation.c"
+		MediaCollectionRegistry * object;
 		object = collect_values[0].v_pointer;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8064 "MediaDataRepresentation.c"
+#line 8168 "MediaDataRepresentation.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8068 "MediaDataRepresentation.c"
+#line 8172 "MediaDataRepresentation.c"
 		}
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = media_collection_registry_ref (object);
-#line 8072 "MediaDataRepresentation.c"
+#line 8176 "MediaDataRepresentation.c"
 	} else {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = NULL;
-#line 8076 "MediaDataRepresentation.c"
+#line 8180 "MediaDataRepresentation.c"
 	}
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 8080 "MediaDataRepresentation.c"
+#line 8184 "MediaDataRepresentation.c"
 }
 
 
 static gchar* value_media_collection_registry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	MediaCollectionRegistry** object_p;
+	MediaCollectionRegistry ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (!object_p) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8091 "MediaDataRepresentation.c"
+#line 8195 "MediaDataRepresentation.c"
 	}
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (!value->data[0].v_pointer) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*object_p = NULL;
-#line 8097 "MediaDataRepresentation.c"
+#line 8201 "MediaDataRepresentation.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8101 "MediaDataRepresentation.c"
+#line 8205 "MediaDataRepresentation.c"
 	} else {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*object_p = media_collection_registry_ref (value->data[0].v_pointer);
-#line 8105 "MediaDataRepresentation.c"
+#line 8209 "MediaDataRepresentation.c"
 	}
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 8109 "MediaDataRepresentation.c"
+#line 8213 "MediaDataRepresentation.c"
 }
 
 
 GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecMediaCollectionRegistry* spec;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_MEDIA_COLLECTION_REGISTRY), NULL);
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return G_PARAM_SPEC (spec);
-#line 8123 "MediaDataRepresentation.c"
+#line 8227 "MediaDataRepresentation.c"
 }
 
 
 gpointer value_get_media_collection_registry (const GValue* value) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_COLLECTION_REGISTRY), NULL);
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return value->data[0].v_pointer;
-#line 8132 "MediaDataRepresentation.c"
+#line 8236 "MediaDataRepresentation.c"
 }
 
 
 void value_set_media_collection_registry (GValue* value, gpointer v_object) {
-	MediaCollectionRegistry* old;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	MediaCollectionRegistry * old;
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_COLLECTION_REGISTRY));
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	old = value->data[0].v_pointer;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (v_object) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_MEDIA_COLLECTION_REGISTRY));
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = v_object;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_collection_registry_ref (value->data[0].v_pointer);
-#line 8152 "MediaDataRepresentation.c"
+#line 8256 "MediaDataRepresentation.c"
 	} else {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = NULL;
-#line 8156 "MediaDataRepresentation.c"
+#line 8260 "MediaDataRepresentation.c"
 	}
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (old) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_collection_registry_unref (old);
-#line 8162 "MediaDataRepresentation.c"
+#line 8266 "MediaDataRepresentation.c"
 	}
 }
 
 
 void value_take_media_collection_registry (GValue* value, gpointer v_object) {
-	MediaCollectionRegistry* old;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	MediaCollectionRegistry * old;
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_COLLECTION_REGISTRY));
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	old = value->data[0].v_pointer;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (v_object) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_MEDIA_COLLECTION_REGISTRY));
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = v_object;
-#line 8181 "MediaDataRepresentation.c"
+#line 8285 "MediaDataRepresentation.c"
 	} else {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = NULL;
-#line 8185 "MediaDataRepresentation.c"
+#line 8289 "MediaDataRepresentation.c"
 	}
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (old) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_collection_registry_unref (old);
-#line 8191 "MediaDataRepresentation.c"
+#line 8295 "MediaDataRepresentation.c"
 	}
 }
 
 
 static void media_collection_registry_class_init (MediaCollectionRegistryClass * klass) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_collection_registry_parent_class = g_type_class_peek_parent (klass);
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaCollectionRegistryClass *) klass)->finalize = media_collection_registry_finalize;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_type_class_add_private (klass, sizeof (MediaCollectionRegistryPrivate));
-#line 8203 "MediaDataRepresentation.c"
+#line 8307 "MediaDataRepresentation.c"
 }
 
 
 static void media_collection_registry_instance_init (MediaCollectionRegistry * self) {
-	GeeArrayList* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	GeeArrayList* _tmp0_;
+	GeeHashMap* _tmp1_;
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv = MEDIA_COLLECTION_REGISTRY_GET_PRIVATE (self);
-#line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 756 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL);
-#line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 756 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->all = _tmp0_;
-#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_MEDIA_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->by_typename = _tmp1_;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->ref_count = 1;
-#line 8222 "MediaDataRepresentation.c"
+#line 8326 "MediaDataRepresentation.c"
 }
 
 
-static void media_collection_registry_finalize (MediaCollectionRegistry* obj) {
+static void media_collection_registry_finalize (MediaCollectionRegistry * obj) {
 	MediaCollectionRegistry * self;
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	Application* _tmp0_;
+	Application* _tmp1_;
+	guint _tmp2_;
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistry);
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_handlers_destroy (self);
-#line 754 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = application_get_instance ();
-#line 754 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _tmp0_;
-#line 754 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_parse_name ("init-done", TYPE_APPLICATION, &_tmp2_, NULL, FALSE);
-#line 754 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _media_collection_registry_on_init_done_application_init_done, self);
-#line 754 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_application_unref0 (_tmp1_);
-#line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 756 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (self->priv->all);
-#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (self->priv->by_typename);
-#line 8249 "MediaDataRepresentation.c"
+#line 8353 "MediaDataRepresentation.c"
 }
 
 
@@ -8267,26 +8372,26 @@ GType media_collection_registry_get_type (void) {
 
 
 gpointer media_collection_registry_ref (gpointer instance) {
-	MediaCollectionRegistry* self;
+	MediaCollectionRegistry * self;
 	self = instance;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return instance;
-#line 8274 "MediaDataRepresentation.c"
+#line 8378 "MediaDataRepresentation.c"
 }
 
 
 void media_collection_registry_unref (gpointer instance) {
-	MediaCollectionRegistry* self;
+	MediaCollectionRegistry * self;
 	self = instance;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		MEDIA_COLLECTION_REGISTRY_GET_CLASS (self)->finalize (self);
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8287 "MediaDataRepresentation.c"
+#line 8391 "MediaDataRepresentation.c"
 	}
 }
 
diff --git a/src/MediaDataRepresentation.vala b/src/MediaDataRepresentation.vala
index 484404c..e78894f 100644
--- a/src/MediaDataRepresentation.vala
+++ b/src/MediaDataRepresentation.vala
@@ -723,6 +723,17 @@ public abstract class MediaSourceCollection : DatabaseSourceCollection {
                 // Note: we may get an exception even though the delete succeeded.
                 debug("Exception deleting file %s: %s", file.get_path(), err.message);
             }
+
+            var masterfile = source.get_master_file();
+            if (masterfile != null) {
+                try {
+                    masterfile.delete(null);
+                } catch (Error err) {
+                    if (!(err is IOError.NOT_FOUND)) {
+                        debug("Exception deleting master file %s: %s", masterfile.get_path(), err.message);
+                    }
+                }
+            }
             
             bool deleted = !file.query_exists();
             if (!deleted && null != not_deleted) {
diff --git a/src/MediaInterfaces.c b/src/MediaInterfaces.c
index 9e100e1..659af71 100644
--- a/src/MediaInterfaces.c
+++ b/src/MediaInterfaces.c
@@ -1,4 +1,4 @@
-/* MediaInterfaces.c generated by valac 0.34.7, the Vala compiler
+/* MediaInterfaces.c generated by valac 0.36.6, the Vala compiler
  * generated from MediaInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -220,7 +220,7 @@ static void transaction_controller_real_begin_impl (TransactionController* self,
 void transaction_controller_commit (TransactionController* self);
 void transaction_controller_commit_impl (TransactionController* self, GError** error);
 static void transaction_controller_real_commit_impl (TransactionController* self, GError** error);
-static void transaction_controller_finalize (TransactionController* obj);
+static void transaction_controller_finalize (TransactionController * obj);
 GType data_object_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
@@ -260,14 +260,14 @@ void transaction_controller_begin (TransactionController* self) {
 	g_return_if_fail (IS_TRANSACTION_CONTROLLER (self));
 #line 262 "MediaInterfaces.c"
 	{
-		gint _tmp0_ = 0;
+		gint _tmp0_;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		_tmp0_ = self->priv->count;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		g_rec_mutex_lock (&self->priv->__lock_count);
 #line 269 "MediaInterfaces.c"
 		{
-			gint _tmp1_ = 0;
+			gint _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp1_ = self->priv->count;
 #line 65 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -276,7 +276,7 @@ void transaction_controller_begin (TransactionController* self) {
 			if (_tmp1_ != 0) {
 #line 278 "MediaInterfaces.c"
 				{
-					gint _tmp2_ = 0;
+					gint _tmp2_;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp2_ = self->priv->count;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -293,15 +293,15 @@ void transaction_controller_begin (TransactionController* self) {
 #line 69 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 296 "MediaInterfaces.c"
-					goto __catch572_g_error;
+					goto __catch574_g_error;
 				}
 			}
-			goto __finally572;
-			__catch572_g_error:
+			goto __finally574;
+			__catch574_g_error:
 			{
 				GError* err = NULL;
-				gint _tmp3_ = 0;
-				GError* _tmp4_ = NULL;
+				gint _tmp3_;
+				GError* _tmp4_;
 #line 68 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				err = _inner_error_;
 #line 68 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -315,17 +315,17 @@ void transaction_controller_begin (TransactionController* self) {
 #line 74 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (_tmp4_->domain == DATABASE_ERROR) {
 #line 318 "MediaInterfaces.c"
-					GError* _tmp5_ = NULL;
+					GError* _tmp5_;
 #line 75 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp5_ = err;
 #line 75 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					app_window_database_error ((GError*) _tmp5_);
 #line 324 "MediaInterfaces.c"
 				} else {
-					GError* _tmp6_ = NULL;
-					const gchar* _tmp7_ = NULL;
-					gchar* _tmp8_ = NULL;
-					gchar* _tmp9_ = NULL;
+					GError* _tmp6_;
+					const gchar* _tmp7_;
+					gchar* _tmp8_;
+					gchar* _tmp9_;
 #line 77 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp6_ = err;
 #line 77 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -344,12 +344,12 @@ void transaction_controller_begin (TransactionController* self) {
 				_g_error_free0 (err);
 #line 346 "MediaInterfaces.c"
 			}
-			__finally572:
+			__finally574:
 #line 68 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 351 "MediaInterfaces.c"
 				{
-					gint _tmp10_ = 0;
+					gint _tmp10_;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp10_ = self->priv->count;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -365,9 +365,9 @@ void transaction_controller_begin (TransactionController* self) {
 #line 366 "MediaInterfaces.c"
 			}
 		}
-		__finally571:
+		__finally573:
 		{
-			gint _tmp11_ = 0;
+			gint _tmp11_;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp11_ = self->priv->count;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -412,16 +412,16 @@ void transaction_controller_commit (TransactionController* self) {
 	g_return_if_fail (IS_TRANSACTION_CONTROLLER (self));
 #line 414 "MediaInterfaces.c"
 	{
-		gint _tmp0_ = 0;
+		gint _tmp0_;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		_tmp0_ = self->priv->count;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		g_rec_mutex_lock (&self->priv->__lock_count);
 #line 421 "MediaInterfaces.c"
 		{
-			gint _tmp1_ = 0;
-			gint _tmp2_ = 0;
-			gint _tmp3_ = 0;
+			gint _tmp1_;
+			gint _tmp2_;
+			gint _tmp3_;
 #line 87 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp1_ = self->priv->count;
 #line 87 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -436,7 +436,7 @@ void transaction_controller_commit (TransactionController* self) {
 			if (_tmp3_ != 0) {
 #line 438 "MediaInterfaces.c"
 				{
-					gint _tmp4_ = 0;
+					gint _tmp4_;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp4_ = self->priv->count;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -453,14 +453,14 @@ void transaction_controller_commit (TransactionController* self) {
 #line 93 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 456 "MediaInterfaces.c"
-					goto __catch574_g_error;
+					goto __catch576_g_error;
 				}
 			}
-			goto __finally574;
-			__catch574_g_error:
+			goto __finally576;
+			__catch576_g_error:
 			{
 				GError* err = NULL;
-				GError* _tmp5_ = NULL;
+				GError* _tmp5_;
 #line 92 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				err = _inner_error_;
 #line 92 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -470,17 +470,17 @@ void transaction_controller_commit (TransactionController* self) {
 #line 95 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (_tmp5_->domain == DATABASE_ERROR) {
 #line 473 "MediaInterfaces.c"
-					GError* _tmp6_ = NULL;
+					GError* _tmp6_;
 #line 96 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp6_ = err;
 #line 96 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					app_window_database_error ((GError*) _tmp6_);
 #line 479 "MediaInterfaces.c"
 				} else {
-					GError* _tmp7_ = NULL;
-					const gchar* _tmp8_ = NULL;
-					gchar* _tmp9_ = NULL;
-					gchar* _tmp10_ = NULL;
+					GError* _tmp7_;
+					const gchar* _tmp8_;
+					gchar* _tmp9_;
+					gchar* _tmp10_;
 #line 98 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp7_ = err;
 #line 98 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -499,12 +499,12 @@ void transaction_controller_commit (TransactionController* self) {
 				_g_error_free0 (err);
 #line 501 "MediaInterfaces.c"
 			}
-			__finally574:
+			__finally576:
 #line 92 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 506 "MediaInterfaces.c"
 				{
-					gint _tmp11_ = 0;
+					gint _tmp11_;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp11_ = self->priv->count;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -520,9 +520,9 @@ void transaction_controller_commit (TransactionController* self) {
 #line 521 "MediaInterfaces.c"
 			}
 		}
-		__finally573:
+		__finally575:
 		{
-			gint _tmp12_ = 0;
+			gint _tmp12_;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp12_ = self->priv->count;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -603,7 +603,7 @@ static gchar* value_transaction_controller_collect_value (GValue* value, guint n
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	if (collect_values[0].v_pointer) {
 #line 606 "MediaInterfaces.c"
-		TransactionController* object;
+		TransactionController * object;
 		object = collect_values[0].v_pointer;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -630,7 +630,7 @@ static gchar* value_transaction_controller_collect_value (GValue* value, guint n
 
 
 static gchar* value_transaction_controller_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	TransactionController** object_p;
+	TransactionController ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	if (!object_p) {
@@ -682,7 +682,7 @@ gpointer value_get_transaction_controller (const GValue* value) {
 
 
 void value_set_transaction_controller (GValue* value, gpointer v_object) {
-	TransactionController* old;
+	TransactionController * old;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSACTION_CONTROLLER));
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -713,7 +713,7 @@ void value_set_transaction_controller (GValue* value, gpointer v_object) {
 
 
 void value_take_transaction_controller (GValue* value, gpointer v_object) {
-	TransactionController* old;
+	TransactionController * old;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSACTION_CONTROLLER));
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -749,9 +749,9 @@ static void transaction_controller_class_init (TransactionControllerClass * klas
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_type_class_add_private (klass, sizeof (TransactionControllerPrivate));
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	((TransactionControllerClass *) klass)->begin_impl = (void (*)(TransactionController*, GError**)) transaction_controller_real_begin_impl;
+	((TransactionControllerClass *) klass)->begin_impl = (void (*) (TransactionController *, GError**)) transaction_controller_real_begin_impl;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	((TransactionControllerClass *) klass)->commit_impl = (void (*)(TransactionController*, GError**)) transaction_controller_real_commit_impl;
+	((TransactionControllerClass *) klass)->commit_impl = (void (*) (TransactionController *, GError**)) transaction_controller_real_commit_impl;
 #line 756 "MediaInterfaces.c"
 }
 
@@ -769,7 +769,7 @@ static void transaction_controller_instance_init (TransactionController * self)
 }
 
 
-static void transaction_controller_finalize (TransactionController* obj) {
+static void transaction_controller_finalize (TransactionController * obj) {
 	TransactionController * self;
 	GError * _inner_error_ = NULL;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -778,23 +778,23 @@ static void transaction_controller_finalize (TransactionController* obj) {
 	g_signal_handlers_destroy (self);
 #line 780 "MediaInterfaces.c"
 	{
-		gint _tmp0_ = 0;
+		gint _tmp0_;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		_tmp0_ = self->priv->count;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		g_rec_mutex_lock (&self->priv->__lock_count);
 #line 787 "MediaInterfaces.c"
 		{
-			gint _tmp1_ = 0;
+			gint _tmp1_;
 #line 59 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp1_ = self->priv->count;
 #line 59 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_vala_assert (_tmp1_ == 0, "count == 0");
 #line 794 "MediaInterfaces.c"
 		}
-		__finally570:
+		__finally572:
 		{
-			gint _tmp2_ = 0;
+			gint _tmp2_;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp2_ = self->priv->count;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -831,7 +831,7 @@ GType transaction_controller_get_type (void) {
 
 
 gpointer transaction_controller_ref (gpointer instance) {
-	TransactionController* self;
+	TransactionController * self;
 	self = instance;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -842,7 +842,7 @@ gpointer transaction_controller_ref (gpointer instance) {
 
 
 void transaction_controller_unref (gpointer instance) {
-	TransactionController* self;
+	TransactionController * self;
 	self = instance;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -883,10 +883,10 @@ void flaggable_mark_unflagged (Flaggable* self) {
 
 
 void flaggable_mark_many_flagged_unflagged (GeeCollection* flag, GeeCollection* unflag, TransactionController* controller, GError** error) {
-	TransactionController* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp9_ = NULL;
-	TransactionController* _tmp17_ = NULL;
+	TransactionController* _tmp0_;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp9_;
+	TransactionController* _tmp17_;
 #line 121 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail ((flag == NULL) || GEE_IS_COLLECTION (flag));
 #line 121 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -904,8 +904,8 @@ void flaggable_mark_many_flagged_unflagged (GeeCollection* flag, GeeCollection*
 #line 905 "MediaInterfaces.c"
 		{
 			GeeIterator* _flaggable_it = NULL;
-			GeeCollection* _tmp2_ = NULL;
-			GeeIterator* _tmp3_ = NULL;
+			GeeCollection* _tmp2_;
+			GeeIterator* _tmp3_;
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp2_ = flag;
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -915,12 +915,12 @@ void flaggable_mark_many_flagged_unflagged (GeeCollection* flag, GeeCollection*
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			while (TRUE) {
 #line 918 "MediaInterfaces.c"
-				GeeIterator* _tmp4_ = NULL;
-				gboolean _tmp5_ = FALSE;
+				GeeIterator* _tmp4_;
+				gboolean _tmp5_;
 				Flaggable* flaggable = NULL;
-				GeeIterator* _tmp6_ = NULL;
-				gpointer _tmp7_ = NULL;
-				Flaggable* _tmp8_ = NULL;
+				GeeIterator* _tmp6_;
+				gpointer _tmp7_;
+				Flaggable* _tmp8_;
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				_tmp4_ = _flaggable_it;
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -957,8 +957,8 @@ void flaggable_mark_many_flagged_unflagged (GeeCollection* flag, GeeCollection*
 #line 958 "MediaInterfaces.c"
 		{
 			GeeIterator* _flaggable_it = NULL;
-			GeeCollection* _tmp10_ = NULL;
-			GeeIterator* _tmp11_ = NULL;
+			GeeCollection* _tmp10_;
+			GeeIterator* _tmp11_;
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp10_ = unflag;
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -968,12 +968,12 @@ void flaggable_mark_many_flagged_unflagged (GeeCollection* flag, GeeCollection*
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			while (TRUE) {
 #line 971 "MediaInterfaces.c"
-				GeeIterator* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
+				GeeIterator* _tmp12_;
+				gboolean _tmp13_;
 				Flaggable* flaggable = NULL;
-				GeeIterator* _tmp14_ = NULL;
-				gpointer _tmp15_ = NULL;
-				Flaggable* _tmp16_ = NULL;
+				GeeIterator* _tmp14_;
+				gpointer _tmp15_;
+				Flaggable* _tmp16_;
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				_tmp12_ = _flaggable_it;
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1064,10 +1064,10 @@ void monitorable_mark_offline (Monitorable* self) {
 
 
 void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection* offline, TransactionController* controller, GError** error) {
-	TransactionController* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp9_ = NULL;
-	TransactionController* _tmp17_ = NULL;
+	TransactionController* _tmp0_;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp9_;
+	TransactionController* _tmp17_;
 #line 159 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail ((online == NULL) || GEE_IS_COLLECTION (online));
 #line 159 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1085,8 +1085,8 @@ void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection*
 #line 1086 "MediaInterfaces.c"
 		{
 			GeeIterator* _monitorable_it = NULL;
-			GeeCollection* _tmp2_ = NULL;
-			GeeIterator* _tmp3_ = NULL;
+			GeeCollection* _tmp2_;
+			GeeIterator* _tmp3_;
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp2_ = online;
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1096,12 +1096,12 @@ void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection*
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			while (TRUE) {
 #line 1099 "MediaInterfaces.c"
-				GeeIterator* _tmp4_ = NULL;
-				gboolean _tmp5_ = FALSE;
+				GeeIterator* _tmp4_;
+				gboolean _tmp5_;
 				Monitorable* monitorable = NULL;
-				GeeIterator* _tmp6_ = NULL;
-				gpointer _tmp7_ = NULL;
-				Monitorable* _tmp8_ = NULL;
+				GeeIterator* _tmp6_;
+				gpointer _tmp7_;
+				Monitorable* _tmp8_;
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				_tmp4_ = _monitorable_it;
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1138,8 +1138,8 @@ void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection*
 #line 1139 "MediaInterfaces.c"
 		{
 			GeeIterator* _monitorable_it = NULL;
-			GeeCollection* _tmp10_ = NULL;
-			GeeIterator* _tmp11_ = NULL;
+			GeeCollection* _tmp10_;
+			GeeIterator* _tmp11_;
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp10_ = offline;
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1149,12 +1149,12 @@ void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection*
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			while (TRUE) {
 #line 1152 "MediaInterfaces.c"
-				GeeIterator* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
+				GeeIterator* _tmp12_;
+				gboolean _tmp13_;
 				Monitorable* monitorable = NULL;
-				GeeIterator* _tmp14_ = NULL;
-				gpointer _tmp15_ = NULL;
-				Monitorable* _tmp16_ = NULL;
+				GeeIterator* _tmp14_;
+				gpointer _tmp15_;
+				Monitorable* _tmp16_;
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				_tmp12_ = _monitorable_it;
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1202,11 +1202,11 @@ void monitorable_set_master_file (Monitorable* self, GFile* file) {
 
 
 void monitorable_set_many_master_file (GeeMap* map, TransactionController* controller, GError** error) {
-	TransactionController* _tmp0_ = NULL;
+	TransactionController* _tmp0_;
 	GeeMapIterator* map_iter = NULL;
-	GeeMap* _tmp1_ = NULL;
-	GeeMapIterator* _tmp2_ = NULL;
-	TransactionController* _tmp11_ = NULL;
+	GeeMap* _tmp1_;
+	GeeMapIterator* _tmp2_;
+	TransactionController* _tmp11_;
 #line 178 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
 #line 178 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1224,14 +1224,14 @@ void monitorable_set_many_master_file (GeeMap* map, TransactionController* contr
 #line 183 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	while (TRUE) {
 #line 1227 "MediaInterfaces.c"
-		GeeMapIterator* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-		GeeMapIterator* _tmp5_ = NULL;
-		gpointer _tmp6_ = NULL;
-		Monitorable* _tmp7_ = NULL;
-		GeeMapIterator* _tmp8_ = NULL;
-		gpointer _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
+		GeeMapIterator* _tmp3_;
+		gboolean _tmp4_;
+		GeeMapIterator* _tmp5_;
+		gpointer _tmp6_;
+		Monitorable* _tmp7_;
+		GeeMapIterator* _tmp8_;
+		gpointer _tmp9_;
+		GFile* _tmp10_;
 #line 183 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		_tmp3_ = map_iter;
 #line 183 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1282,11 +1282,11 @@ void monitorable_set_master_timestamp (Monitorable* self, GFileInfo* info) {
 
 
 void monitorable_set_many_master_timestamp (GeeMap* map, TransactionController* controller, GError** error) {
-	TransactionController* _tmp0_ = NULL;
+	TransactionController* _tmp0_;
 	GeeMapIterator* map_iter = NULL;
-	GeeMap* _tmp1_ = NULL;
-	GeeMapIterator* _tmp2_ = NULL;
-	TransactionController* _tmp11_ = NULL;
+	GeeMap* _tmp1_;
+	GeeMapIterator* _tmp2_;
+	TransactionController* _tmp11_;
 #line 191 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
 #line 191 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1304,14 +1304,14 @@ void monitorable_set_many_master_timestamp (GeeMap* map, TransactionController*
 #line 196 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	while (TRUE) {
 #line 1307 "MediaInterfaces.c"
-		GeeMapIterator* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-		GeeMapIterator* _tmp5_ = NULL;
-		gpointer _tmp6_ = NULL;
-		Monitorable* _tmp7_ = NULL;
-		GeeMapIterator* _tmp8_ = NULL;
-		gpointer _tmp9_ = NULL;
-		GFileInfo* _tmp10_ = NULL;
+		GeeMapIterator* _tmp3_;
+		gboolean _tmp4_;
+		GeeMapIterator* _tmp5_;
+		gpointer _tmp6_;
+		Monitorable* _tmp7_;
+		GeeMapIterator* _tmp8_;
+		gpointer _tmp9_;
+		GFileInfo* _tmp10_;
 #line 196 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		_tmp3_ = map_iter;
 #line 196 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
diff --git a/src/MediaMetadata.c b/src/MediaMetadata.c
index b2e19cf..4bad2b6 100644
--- a/src/MediaMetadata.c
+++ b/src/MediaMetadata.c
@@ -1,4 +1,4 @@
-/* MediaMetadata.c generated by valac 0.34.7, the Vala compiler
+/* MediaMetadata.c generated by valac 0.36.6, the Vala compiler
  * generated from MediaMetadata.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -124,7 +124,7 @@ gchar* media_metadata_get_title (MediaMetadata* self);
 static gchar* media_metadata_real_get_title (MediaMetadata* self);
 gchar* media_metadata_get_comment (MediaMetadata* self);
 static gchar* media_metadata_real_get_comment (MediaMetadata* self);
-static void media_metadata_finalize (MediaMetadata* obj);
+static void media_metadata_finalize (MediaMetadata * obj);
 GType metadata_rational_get_type (void) G_GNUC_CONST;
 MetadataRational* metadata_rational_dup (const MetadataRational* self);
 void metadata_rational_free (MetadataRational* self);
@@ -151,7 +151,7 @@ gchar* metadata_date_time_get_exif_label (MetadataDateTime* self);
 gchar* metadata_date_time_to_exif_date_time (time_t timestamp);
 gchar* metadata_date_time_get_xmp_label (MetadataDateTime* self);
 gchar* metadata_date_time_to_string (MetadataDateTime* self);
-static void metadata_date_time_finalize (MetadataDateTime* obj);
+static void metadata_date_time_finalize (MetadataDateTime * obj);
 
 
 MediaMetadata* media_metadata_construct (GType object_type) {
@@ -278,7 +278,7 @@ static gchar* value_media_metadata_collect_value (GValue* value, guint n_collect
 #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	if (collect_values[0].v_pointer) {
 #line 281 "MediaMetadata.c"
-		MediaMetadata* object;
+		MediaMetadata * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -305,7 +305,7 @@ static gchar* value_media_metadata_collect_value (GValue* value, guint n_collect
 
 
 static gchar* value_media_metadata_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	MediaMetadata** object_p;
+	MediaMetadata ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	if (!object_p) {
@@ -357,7 +357,7 @@ gpointer value_get_media_metadata (const GValue* value) {
 
 
 void value_set_media_metadata (GValue* value, gpointer v_object) {
-	MediaMetadata* old;
+	MediaMetadata * old;
 #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_METADATA));
 #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -388,7 +388,7 @@ void value_set_media_metadata (GValue* value, gpointer v_object) {
 
 
 void value_take_media_metadata (GValue* value, gpointer v_object) {
-	MediaMetadata* old;
+	MediaMetadata * old;
 #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_METADATA));
 #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -422,13 +422,13 @@ static void media_metadata_class_init (MediaMetadataClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	((MediaMetadataClass *) klass)->finalize = media_metadata_finalize;
 #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
-	((MediaMetadataClass *) klass)->read_from_file = (void (*)(MediaMetadata*, GFile*, GError**)) media_metadata_real_read_from_file;
+	((MediaMetadataClass *) klass)->read_from_file = (void (*) (MediaMetadata *, GFile*, GError**)) media_metadata_real_read_from_file;
 #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
-	((MediaMetadataClass *) klass)->get_creation_date_time = (MetadataDateTime* (*)(MediaMetadata*)) media_metadata_real_get_creation_date_time;
+	((MediaMetadataClass *) klass)->get_creation_date_time = (MetadataDateTime* (*) (MediaMetadata *)) media_metadata_real_get_creation_date_time;
 #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
-	((MediaMetadataClass *) klass)->get_title = (gchar* (*)(MediaMetadata*)) media_metadata_real_get_title;
+	((MediaMetadataClass *) klass)->get_title = (gchar* (*) (MediaMetadata *)) media_metadata_real_get_title;
 #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
-	((MediaMetadataClass *) klass)->get_comment = (gchar* (*)(MediaMetadata*)) media_metadata_real_get_comment;
+	((MediaMetadataClass *) klass)->get_comment = (gchar* (*) (MediaMetadata *)) media_metadata_real_get_comment;
 #line 433 "MediaMetadata.c"
 }
 
@@ -440,7 +440,7 @@ static void media_metadata_instance_init (MediaMetadata * self) {
 }
 
 
-static void media_metadata_finalize (MediaMetadata* obj) {
+static void media_metadata_finalize (MediaMetadata * obj) {
 	MediaMetadata * self;
 #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_METADATA, MediaMetadata);
@@ -465,7 +465,7 @@ GType media_metadata_get_type (void) {
 
 
 gpointer media_metadata_ref (gpointer instance) {
-	MediaMetadata* self;
+	MediaMetadata * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -476,7 +476,7 @@ gpointer media_metadata_ref (gpointer instance) {
 
 
 void media_metadata_unref (gpointer instance) {
-	MediaMetadata* self;
+	MediaMetadata * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -490,8 +490,8 @@ void media_metadata_unref (gpointer instance) {
 
 
 void metadata_rational_init (MetadataRational *self, gint numerator, gint denominator) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 24 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	memset (self, 0, sizeof (MetadataRational));
 #line 25 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -509,13 +509,13 @@ void metadata_rational_init (MetadataRational *self, gint numerator, gint denomi
 static gboolean metadata_rational_is_component_valid (MetadataRational *self, gint component) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 #line 30 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	_tmp1_ = component;
 #line 30 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	if (_tmp1_ >= 0) {
 #line 518 "MediaMetadata.c"
-		gint _tmp2_ = 0;
+		gint _tmp2_;
 #line 30 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 		_tmp2_ = component;
 #line 30 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -537,8 +537,8 @@ static gboolean metadata_rational_is_component_valid (MetadataRational *self, gi
 gboolean metadata_rational_is_valid (MetadataRational *self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
+	gint _tmp1_;
+	gboolean _tmp2_;
 #line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	_tmp1_ = (*self).numerator;
 #line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -546,8 +546,8 @@ gboolean metadata_rational_is_valid (MetadataRational *self) {
 #line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	if (_tmp2_) {
 #line 549 "MediaMetadata.c"
-		gint _tmp3_ = 0;
-		gboolean _tmp4_ = FALSE;
+		gint _tmp3_;
+		gboolean _tmp4_;
 #line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 		_tmp3_ = (*self).denominator;
 #line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -571,15 +571,15 @@ gboolean metadata_rational_is_valid (MetadataRational *self) {
 gchar* metadata_rational_to_string (MetadataRational *self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	_tmp1_ = metadata_rational_is_valid (&(*self));
 #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	if (_tmp1_) {
 #line 580 "MediaMetadata.c"
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
-		gchar* _tmp4_ = NULL;
+		gint _tmp2_;
+		gint _tmp3_;
+		gchar* _tmp4_;
 #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 		_tmp2_ = (*self).numerator;
 #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -592,7 +592,7 @@ gchar* metadata_rational_to_string (MetadataRational *self) {
 		_tmp0_ = _tmp4_;
 #line 594 "MediaMetadata.c"
 	} else {
-		gchar* _tmp5_ = NULL;
+		gchar* _tmp5_;
 #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 		_tmp5_ = g_strdup ("");
 #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -646,7 +646,7 @@ GQuark metadata_date_time_error_quark (void) {
 
 MetadataDateTime* metadata_date_time_construct (GType object_type, time_t timestamp) {
 	MetadataDateTime* self = NULL;
-	time_t _tmp0_ = 0;
+	time_t _tmp0_;
 #line 51 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	self = (MetadataDateTime*) g_type_create_instance (object_type);
 #line 52 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -668,9 +668,9 @@ MetadataDateTime* metadata_date_time_new (time_t timestamp) {
 
 MetadataDateTime* metadata_date_time_construct_from_exif (GType object_type, const gchar* label, GError** error) {
 	MetadataDateTime* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	time_t _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 55 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	g_return_val_if_fail (label != NULL, NULL);
@@ -685,8 +685,8 @@ MetadataDateTime* metadata_date_time_construct_from_exif (GType object_type, con
 #line 56 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	if (!_tmp2_) {
 #line 688 "MediaMetadata.c"
-		const gchar* _tmp3_ = NULL;
-		GError* _tmp4_ = NULL;
+		const gchar* _tmp3_;
+		GError* _tmp4_;
 #line 57 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 		_tmp3_ = label;
 #line 57 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -727,7 +727,7 @@ MetadataDateTime* metadata_date_time_new_from_exif (const gchar* label, GError**
 
 MetadataDateTime* metadata_date_time_construct_from_iptc (GType object_type, const gchar* date, const gchar* time, GError** error) {
 	MetadataDateTime* self = NULL;
-	GError* _tmp0_ = NULL;
+	GError* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 60 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	g_return_val_if_fail (date != NULL, NULL);
@@ -773,10 +773,10 @@ MetadataDateTime* metadata_date_time_new_from_iptc (const gchar* date, const gch
 MetadataDateTime* metadata_date_time_construct_from_xmp (GType object_type, const gchar* label, GError** error) {
 	MetadataDateTime* self = NULL;
 	GTimeVal time_val = {0};
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GTimeVal _tmp4_ = {0};
-	glong _tmp5_ = 0L;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
+	GTimeVal _tmp4_;
+	glong _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 65 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	g_return_val_if_fail (label != NULL, NULL);
@@ -791,8 +791,8 @@ MetadataDateTime* metadata_date_time_construct_from_xmp (GType object_type, cons
 #line 67 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	if (!_tmp1_) {
 #line 794 "MediaMetadata.c"
-		const gchar* _tmp2_ = NULL;
-		GError* _tmp3_ = NULL;
+		const gchar* _tmp2_;
+		GError* _tmp3_;
 #line 68 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 		_tmp2_ = label;
 #line 68 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -839,7 +839,7 @@ MetadataDateTime* metadata_date_time_new_from_xmp (const gchar* label, GError**
 
 time_t metadata_date_time_get_timestamp (MetadataDateTime* self) {
 	time_t result = 0;
-	time_t _tmp0_ = 0;
+	time_t _tmp0_;
 #line 73 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	g_return_val_if_fail (IS_METADATA_DATE_TIME (self), 0);
 #line 74 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -854,8 +854,8 @@ time_t metadata_date_time_get_timestamp (MetadataDateTime* self) {
 
 gchar* metadata_date_time_get_exif_label (MetadataDateTime* self) {
 	gchar* result = NULL;
-	time_t _tmp0_ = 0;
-	gchar* _tmp1_ = NULL;
+	time_t _tmp0_;
+	gchar* _tmp1_;
 #line 77 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	g_return_val_if_fail (IS_METADATA_DATE_TIME (self), NULL);
 #line 78 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -873,8 +873,8 @@ gchar* metadata_date_time_get_exif_label (MetadataDateTime* self) {
 gchar* metadata_date_time_get_xmp_label (MetadataDateTime* self) {
 	gchar* result = NULL;
 	GTimeVal time_val = {0};
-	time_t _tmp0_ = 0;
-	gchar* _tmp1_ = NULL;
+	time_t _tmp0_;
+	gchar* _tmp1_;
 #line 83 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	g_return_val_if_fail (IS_METADATA_DATE_TIME (self), NULL);
 #line 84 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -899,18 +899,18 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t*
 	time_t _vala_timestamp = 0;
 	gboolean result = FALSE;
 	struct tm tm = {0};
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	const gchar* _tmp0_;
+	gint _tmp1_;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp10_ = FALSE;
 	gboolean _tmp11_ = FALSE;
-	struct tm _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	time_t _tmp26_ = 0;
+	struct tm _tmp12_;
+	gint _tmp13_;
+	gint _tmp24_;
+	gint _tmp25_;
+	time_t _tmp26_;
 #line 91 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	g_return_val_if_fail (date_time != NULL, FALSE);
 #line 92 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -925,11 +925,11 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t*
 	if (_tmp1_ != 6) {
 #line 927 "MediaMetadata.c"
 		gchar* tmp = NULL;
-		const gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
+		const gchar* _tmp2_;
+		gchar* _tmp3_;
+		const gchar* _tmp4_;
+		const gchar* _tmp5_;
+		gint _tmp6_;
 #line 100 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 		_tmp2_ = date_time;
 #line 100 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -974,8 +974,8 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t*
 		_tmp11_ = TRUE;
 #line 976 "MediaMetadata.c"
 	} else {
-		struct tm _tmp14_ = {0};
-		gint _tmp15_ = 0;
+		struct tm _tmp14_;
+		gint _tmp15_;
 #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 		_tmp14_ = tm;
 #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -990,8 +990,8 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t*
 		_tmp10_ = TRUE;
 #line 992 "MediaMetadata.c"
 	} else {
-		struct tm _tmp16_ = {0};
-		gint _tmp17_ = 0;
+		struct tm _tmp16_;
+		gint _tmp17_;
 #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 		_tmp16_ = tm;
 #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -1006,8 +1006,8 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t*
 		_tmp9_ = TRUE;
 #line 1008 "MediaMetadata.c"
 	} else {
-		struct tm _tmp18_ = {0};
-		gint _tmp19_ = 0;
+		struct tm _tmp18_;
+		gint _tmp19_;
 #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 		_tmp18_ = tm;
 #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -1022,8 +1022,8 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t*
 		_tmp8_ = TRUE;
 #line 1024 "MediaMetadata.c"
 	} else {
-		struct tm _tmp20_ = {0};
-		gint _tmp21_ = 0;
+		struct tm _tmp20_;
+		gint _tmp21_;
 #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 		_tmp20_ = tm;
 #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -1038,8 +1038,8 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t*
 		_tmp7_ = TRUE;
 #line 1040 "MediaMetadata.c"
 	} else {
-		struct tm _tmp22_ = {0};
-		gint _tmp23_ = 0;
+		struct tm _tmp22_;
+		gint _tmp23_;
 #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 		_tmp22_ = tm;
 #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -1093,13 +1093,13 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t*
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return;
 #line 1105 "MediaMetadata.c"
 }
@@ -1108,44 +1108,44 @@ static void g_time_local (time_t time, struct tm* result) {
 static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* result = NULL;
 	gchar* buffer = NULL;
-	gchar* _tmp0_ = NULL;
-	gint buffer_length1 = 0;
-	gint _buffer_size_ = 0;
-	gchar* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	gint buffer_length1;
+	gint _buffer_size_;
+	gchar* _tmp1_;
+	gint _tmp1__length1;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
+#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 1151 "MediaMetadata.c"
 }
@@ -1153,9 +1153,9 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 
 gchar* metadata_date_time_to_exif_date_time (time_t timestamp) {
 	gchar* result = NULL;
-	time_t _tmp0_ = 0;
+	time_t _tmp0_;
 	struct tm _tmp1_ = {0};
-	gchar* _tmp2_ = NULL;
+	gchar* _tmp2_;
 #line 121 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	_tmp0_ = timestamp;
 #line 121 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -1172,8 +1172,8 @@ gchar* metadata_date_time_to_exif_date_time (time_t timestamp) {
 
 gchar* metadata_date_time_to_string (MetadataDateTime* self) {
 	gchar* result = NULL;
-	time_t _tmp0_ = 0;
-	gchar* _tmp1_ = NULL;
+	time_t _tmp0_;
+	gchar* _tmp1_;
 #line 124 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	g_return_val_if_fail (IS_METADATA_DATE_TIME (self), NULL);
 #line 125 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -1230,7 +1230,7 @@ static gchar* value_metadata_date_time_collect_value (GValue* value, guint n_col
 #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	if (collect_values[0].v_pointer) {
 #line 1233 "MediaMetadata.c"
-		MetadataDateTime* object;
+		MetadataDateTime * object;
 		object = collect_values[0].v_pointer;
 #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1257,7 +1257,7 @@ static gchar* value_metadata_date_time_collect_value (GValue* value, guint n_col
 
 
 static gchar* value_metadata_date_time_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	MetadataDateTime** object_p;
+	MetadataDateTime ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	if (!object_p) {
@@ -1309,7 +1309,7 @@ gpointer value_get_metadata_date_time (const GValue* value) {
 
 
 void value_set_metadata_date_time (GValue* value, gpointer v_object) {
-	MetadataDateTime* old;
+	MetadataDateTime * old;
 #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_METADATA_DATE_TIME));
 #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -1340,7 +1340,7 @@ void value_set_metadata_date_time (GValue* value, gpointer v_object) {
 
 
 void value_take_metadata_date_time (GValue* value, gpointer v_object) {
-	MetadataDateTime* old;
+	MetadataDateTime * old;
 #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_METADATA_DATE_TIME));
 #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
@@ -1388,7 +1388,7 @@ static void metadata_date_time_instance_init (MetadataDateTime * self) {
 }
 
 
-static void metadata_date_time_finalize (MetadataDateTime* obj) {
+static void metadata_date_time_finalize (MetadataDateTime * obj) {
 	MetadataDateTime * self;
 #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_METADATA_DATE_TIME, MetadataDateTime);
@@ -1413,7 +1413,7 @@ GType metadata_date_time_get_type (void) {
 
 
 gpointer metadata_date_time_ref (gpointer instance) {
-	MetadataDateTime* self;
+	MetadataDateTime * self;
 	self = instance;
 #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1424,7 +1424,7 @@ gpointer metadata_date_time_ref (gpointer instance) {
 
 
 void metadata_date_time_unref (gpointer instance) {
-	MetadataDateTime* self;
+	MetadataDateTime * self;
 	self = instance;
 #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c
index 6bf6a2d..b06e19e 100644
--- a/src/MediaMonitor.c
+++ b/src/MediaMonitor.c
@@ -1,4 +1,4 @@
-/* MediaMonitor.c generated by valac 0.34.7, the Vala compiler
+/* MediaMonitor.c generated by valac 0.36.6, the Vala compiler
  * generated from MediaMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -242,7 +242,7 @@ struct _MediaMonitorClass {
 	MonitorableUpdates* (*create_updates) (MediaMonitor* self, Monitorable* monitorable);
 	void (*on_media_source_destroyed) (MediaMonitor* self, DataSource* source);
 	void (*notify_discovery_started) (MediaMonitor* self);
-	MediaMonitorDiscoveredFile (*notify_file_discovered) (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable** monitorable);
+	MediaMonitorDiscoveredFile (*notify_file_discovered) (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable);
 	GeeCollection* (*candidates_for_unknown_file) (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_);
 	GFile** (*get_auxilliary_backing_files) (MediaMonitor* self, Monitorable* monitorable, int* result_length1);
 	void (*update_backing_file_info) (MediaMonitor* self, Monitorable* monitorable, GFile* file, GFileInfo* info);
@@ -319,7 +319,7 @@ void monitorable_updates_reset_online_offline (MonitorableUpdates* self);
 static void monitorable_updates_real_reset_online_offline (MonitorableUpdates* self);
 gboolean monitorable_updates_is_all_updated (MonitorableUpdates* self);
 static gboolean monitorable_updates_real_is_all_updated (MonitorableUpdates* self);
-static void monitorable_updates_finalize (MonitorableUpdates* obj);
+static void monitorable_updates_finalize (MonitorableUpdates * obj);
 GType media_monitor_get_type (void) G_GNUC_CONST;
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
@@ -364,8 +364,8 @@ static void media_monitor_real_on_media_source_destroyed (MediaMonitor* self, Da
 void media_monitor_remove_updates (MediaMonitor* self, Monitorable* monitorable);
 void media_monitor_notify_discovery_started (MediaMonitor* self);
 static void media_monitor_real_notify_discovery_started (MediaMonitor* self);
-MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable** monitorable);
-static MediaMonitorDiscoveredFile media_monitor_real_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable** monitorable);
+MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable);
+static MediaMonitorDiscoveredFile media_monitor_real_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable);
 GeeCollection* media_monitor_candidates_for_unknown_file (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_);
 static GeeCollection* media_monitor_real_candidates_for_unknown_file (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_);
 GFile** media_monitor_get_auxilliary_backing_files (MediaMonitor* self, Monitorable* monitorable, int* result_length1);
@@ -418,7 +418,7 @@ void transaction_controller_commit (TransactionController* self);
 GQuark database_error_quark (void);
 void app_window_database_error (GError* err);
 void app_window_panic (const gchar* msg);
-static void media_monitor_finalize (GObject* obj);
+static void media_monitor_finalize (GObject * obj);
 
 
 static gpointer _g_object_ref0 (gpointer self) {
@@ -430,8 +430,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 MonitorableUpdates* monitorable_updates_construct (GType object_type, Monitorable* monitorable) {
 	MonitorableUpdates* self = NULL;
-	Monitorable* _tmp0_ = NULL;
-	Monitorable* _tmp1_ = NULL;
+	Monitorable* _tmp0_;
+	Monitorable* _tmp1_;
 #line 17 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL);
 #line 17 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -459,8 +459,8 @@ MonitorableUpdates* monitorable_updates_new (Monitorable* monitorable) {
 
 GFile* monitorable_updates_get_master_file (MonitorableUpdates* self) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 21 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MONITORABLE_UPDATES (self), NULL);
 #line 22 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -477,8 +477,8 @@ GFile* monitorable_updates_get_master_file (MonitorableUpdates* self) {
 
 GFileInfo* monitorable_updates_get_master_file_info (MonitorableUpdates* self) {
 	GFileInfo* result = NULL;
-	GFileInfo* _tmp0_ = NULL;
-	GFileInfo* _tmp1_ = NULL;
+	GFileInfo* _tmp0_;
+	GFileInfo* _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MONITORABLE_UPDATES (self), NULL);
 #line 26 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -495,7 +495,7 @@ GFileInfo* monitorable_updates_get_master_file_info (MonitorableUpdates* self) {
 
 static gboolean monitorable_updates_real_is_in_alteration (MonitorableUpdates* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 30 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_tmp0_ = self->priv->master_in_alteration;
 #line 30 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -517,7 +517,7 @@ gboolean monitorable_updates_is_in_alteration (MonitorableUpdates* self) {
 
 gboolean monitorable_updates_is_set_offline (MonitorableUpdates* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 33 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MONITORABLE_UPDATES (self), FALSE);
 #line 34 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -532,7 +532,7 @@ gboolean monitorable_updates_is_set_offline (MonitorableUpdates* self) {
 
 gboolean monitorable_updates_is_set_online (MonitorableUpdates* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 37 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MONITORABLE_UPDATES (self), FALSE);
 #line 38 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -546,9 +546,9 @@ gboolean monitorable_updates_is_set_online (MonitorableUpdates* self) {
 
 
 static void monitorable_updates_real_set_master_file (MonitorableUpdates* self, GFile* file) {
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
 #line 41 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_if_fail ((file == NULL) || G_IS_FILE (file));
 #line 42 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -580,8 +580,8 @@ void monitorable_updates_set_master_file (MonitorableUpdates* self, GFile* file)
 
 
 static void monitorable_updates_real_set_master_file_info_altered (MonitorableUpdates* self, gboolean altered) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
 #line 49 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_tmp0_ = altered;
 #line 49 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -607,9 +607,9 @@ void monitorable_updates_set_master_file_info_altered (MonitorableUpdates* self,
 
 
 static void monitorable_updates_real_set_master_file_info (MonitorableUpdates* self, GFileInfo* info) {
-	GFileInfo* _tmp0_ = NULL;
-	GFileInfo* _tmp1_ = NULL;
-	GFileInfo* _tmp2_ = NULL;
+	GFileInfo* _tmp0_;
+	GFileInfo* _tmp1_;
+	GFileInfo* _tmp2_;
 #line 55 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info));
 #line 56 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -641,7 +641,7 @@ void monitorable_updates_set_master_file_info (MonitorableUpdates* self, GFileIn
 
 
 static void monitorable_updates_real_set_master_in_alteration (MonitorableUpdates* self, gboolean in_alteration) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 63 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_tmp0_ = in_alteration;
 #line 63 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -660,7 +660,7 @@ void monitorable_updates_set_master_in_alteration (MonitorableUpdates* self, gbo
 
 
 static void monitorable_updates_real_set_master_alterations_complete (MonitorableUpdates* self, GFileInfo* info) {
-	GFileInfo* _tmp0_ = NULL;
+	GFileInfo* _tmp0_;
 #line 66 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
 #line 67 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -753,13 +753,13 @@ static gboolean monitorable_updates_real_is_all_updated (MonitorableUpdates* sel
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-	GFile* _tmp5_ = NULL;
+	GFile* _tmp5_;
 #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_tmp5_ = self->priv->master_file;
 #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp5_ == NULL) {
 #line 762 "MediaMonitor.c"
-		gboolean _tmp6_ = FALSE;
+		gboolean _tmp6_;
 #line 93 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp6_ = self->priv->master_file_info_altered;
 #line 93 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -773,7 +773,7 @@ static gboolean monitorable_updates_real_is_all_updated (MonitorableUpdates* sel
 #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp4_) {
 #line 776 "MediaMonitor.c"
-		GFileInfo* _tmp7_ = NULL;
+		GFileInfo* _tmp7_;
 #line 94 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp7_ = self->priv->master_file_info;
 #line 94 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -787,7 +787,7 @@ static gboolean monitorable_updates_real_is_all_updated (MonitorableUpdates* sel
 #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp3_) {
 #line 790 "MediaMonitor.c"
-		gboolean _tmp8_ = FALSE;
+		gboolean _tmp8_;
 #line 95 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp8_ = self->priv->master_in_alteration;
 #line 95 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -801,7 +801,7 @@ static gboolean monitorable_updates_real_is_all_updated (MonitorableUpdates* sel
 #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp2_) {
 #line 804 "MediaMonitor.c"
-		gboolean _tmp9_ = FALSE;
+		gboolean _tmp9_;
 #line 96 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp9_ = self->priv->online;
 #line 96 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -815,7 +815,7 @@ static gboolean monitorable_updates_real_is_all_updated (MonitorableUpdates* sel
 #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp1_) {
 #line 818 "MediaMonitor.c"
-		gboolean _tmp10_ = FALSE;
+		gboolean _tmp10_;
 #line 97 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp10_ = self->priv->offline;
 #line 97 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -885,7 +885,7 @@ static gchar* value_monitorable_updates_collect_value (GValue* value, guint n_co
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (collect_values[0].v_pointer) {
 #line 888 "MediaMonitor.c"
-		MonitorableUpdates* object;
+		MonitorableUpdates * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -912,7 +912,7 @@ static gchar* value_monitorable_updates_collect_value (GValue* value, guint n_co
 
 
 static gchar* value_monitorable_updates_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	MonitorableUpdates** object_p;
+	MonitorableUpdates ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (!object_p) {
@@ -964,7 +964,7 @@ gpointer value_get_monitorable_updates (const GValue* value) {
 
 
 void value_set_monitorable_updates (GValue* value, gpointer v_object) {
-	MonitorableUpdates* old;
+	MonitorableUpdates * old;
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MONITORABLE_UPDATES));
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -995,7 +995,7 @@ void value_set_monitorable_updates (GValue* value, gpointer v_object) {
 
 
 void value_take_monitorable_updates (GValue* value, gpointer v_object) {
-	MonitorableUpdates* old;
+	MonitorableUpdates * old;
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MONITORABLE_UPDATES));
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1031,25 +1031,25 @@ static void monitorable_updates_class_init (MonitorableUpdatesClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_type_class_add_private (klass, sizeof (MonitorableUpdatesPrivate));
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->is_in_alteration = (gboolean (*)(MonitorableUpdates*)) monitorable_updates_real_is_in_alteration;
+	((MonitorableUpdatesClass *) klass)->is_in_alteration = (gboolean (*) (MonitorableUpdates *)) monitorable_updates_real_is_in_alteration;
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->set_master_file = (void (*)(MonitorableUpdates*, GFile*)) monitorable_updates_real_set_master_file;
+	((MonitorableUpdatesClass *) klass)->set_master_file = (void (*) (MonitorableUpdates *, GFile*)) monitorable_updates_real_set_master_file;
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->set_master_file_info_altered = (void (*)(MonitorableUpdates*, gboolean)) monitorable_updates_real_set_master_file_info_altered;
+	((MonitorableUpdatesClass *) klass)->set_master_file_info_altered = (void (*) (MonitorableUpdates *, gboolean)) monitorable_updates_real_set_master_file_info_altered;
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->set_master_file_info = (void (*)(MonitorableUpdates*, GFileInfo*)) monitorable_updates_real_set_master_file_info;
+	((MonitorableUpdatesClass *) klass)->set_master_file_info = (void (*) (MonitorableUpdates *, GFileInfo*)) monitorable_updates_real_set_master_file_info;
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->set_master_in_alteration = (void (*)(MonitorableUpdates*, gboolean)) monitorable_updates_real_set_master_in_alteration;
+	((MonitorableUpdatesClass *) klass)->set_master_in_alteration = (void (*) (MonitorableUpdates *, gboolean)) monitorable_updates_real_set_master_in_alteration;
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->set_master_alterations_complete = (void (*)(MonitorableUpdates*, GFileInfo*)) monitorable_updates_real_set_master_alterations_complete;
+	((MonitorableUpdatesClass *) klass)->set_master_alterations_complete = (void (*) (MonitorableUpdates *, GFileInfo*)) monitorable_updates_real_set_master_alterations_complete;
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->mark_offline = (void (*)(MonitorableUpdates*)) monitorable_updates_real_mark_offline;
+	((MonitorableUpdatesClass *) klass)->mark_offline = (void (*) (MonitorableUpdates *)) monitorable_updates_real_mark_offline;
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->mark_online = (void (*)(MonitorableUpdates*)) monitorable_updates_real_mark_online;
+	((MonitorableUpdatesClass *) klass)->mark_online = (void (*) (MonitorableUpdates *)) monitorable_updates_real_mark_online;
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->reset_online_offline = (void (*)(MonitorableUpdates*)) monitorable_updates_real_reset_online_offline;
+	((MonitorableUpdatesClass *) klass)->reset_online_offline = (void (*) (MonitorableUpdates *)) monitorable_updates_real_reset_online_offline;
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*)(MonitorableUpdates*)) monitorable_updates_real_is_all_updated;
+	((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*) (MonitorableUpdates *)) monitorable_updates_real_is_all_updated;
 #line 1054 "MediaMonitor.c"
 }
 
@@ -1075,7 +1075,7 @@ static void monitorable_updates_instance_init (MonitorableUpdates * self) {
 }
 
 
-static void monitorable_updates_finalize (MonitorableUpdates* obj) {
+static void monitorable_updates_finalize (MonitorableUpdates * obj) {
 	MonitorableUpdates * self;
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MONITORABLE_UPDATES, MonitorableUpdates);
@@ -1106,7 +1106,7 @@ GType monitorable_updates_get_type (void) {
 
 
 gpointer monitorable_updates_ref (gpointer instance) {
-	MonitorableUpdates* self;
+	MonitorableUpdates * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1117,7 +1117,7 @@ gpointer monitorable_updates_ref (gpointer instance) {
 
 
 void monitorable_updates_unref (gpointer instance) {
-	MonitorableUpdates* self;
+	MonitorableUpdates * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1174,13 +1174,13 @@ static gboolean _media_monitor_on_flush_pending_updates_gsource_func (gpointer s
 
 MediaMonitor* media_monitor_construct (GType object_type, MediaSourceCollection* sources, GCancellable* cancellable) {
 	MediaMonitor * self = NULL;
-	MediaSourceCollection* _tmp0_ = NULL;
-	MediaSourceCollection* _tmp1_ = NULL;
-	GCancellable* _tmp2_ = NULL;
-	GCancellable* _tmp3_ = NULL;
-	MediaSourceCollection* _tmp4_ = NULL;
-	MediaSourceCollection* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
+	MediaSourceCollection* _tmp0_;
+	MediaSourceCollection* _tmp1_;
+	GCancellable* _tmp2_;
+	GCancellable* _tmp3_;
+	MediaSourceCollection* _tmp4_;
+	MediaSourceCollection* _tmp5_;
+	guint _tmp6_;
 #line 118 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (sources), NULL);
 #line 118 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1254,12 +1254,12 @@ void media_monitor_close (MediaMonitor* self) {
 
 static gchar* media_monitor_real_to_string (MediaMonitor* self) {
 	gchar* result = NULL;
-	MediaSourceCollection* _tmp0_ = NULL;
-	MediaSourceCollection* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	MediaSourceCollection* _tmp0_;
+	MediaSourceCollection* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 140 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_tmp0_ = media_monitor_get_media_source_collection (self);
 #line 140 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1295,8 +1295,8 @@ gchar* media_monitor_to_string (MediaMonitor* self) {
 
 static MonitorableUpdates* media_monitor_real_create_updates (MediaMonitor* self, Monitorable* monitorable) {
 	MonitorableUpdates* result = NULL;
-	Monitorable* _tmp0_ = NULL;
-	MonitorableUpdates* _tmp1_ = NULL;
+	Monitorable* _tmp0_;
+	MonitorableUpdates* _tmp1_;
 #line 143 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL);
 #line 144 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1321,7 +1321,7 @@ MonitorableUpdates* media_monitor_create_updates (MediaMonitor* self, Monitorabl
 
 
 static void media_monitor_real_on_media_source_destroyed (MediaMonitor* self, DataSource* source) {
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 147 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
 #line 148 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1354,7 +1354,7 @@ void media_monitor_notify_discovery_started (MediaMonitor* self) {
 }
 
 
-static MediaMonitorDiscoveredFile media_monitor_real_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable** monitorable) {
+static MediaMonitorDiscoveredFile media_monitor_real_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable) {
 #line 160 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_discovered'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 160 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1363,7 +1363,7 @@ static MediaMonitorDiscoveredFile media_monitor_real_notify_file_discovered (Med
 }
 
 
-MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable** monitorable) {
+MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable) {
 #line 160 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MEDIA_MONITOR (self), 0);
 #line 160 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1392,8 +1392,8 @@ GeeCollection* media_monitor_candidates_for_unknown_file (MediaMonitor* self, GF
 
 static GFile** media_monitor_real_get_auxilliary_backing_files (MediaMonitor* self, Monitorable* monitorable, int* result_length1) {
 	GFile** result = NULL;
-	GFile** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	GFile** _tmp0_;
+	gint _tmp0__length1;
 #line 172 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL);
 #line 173 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1598,9 +1598,9 @@ void media_monitor_mdbg (const gchar* msg) {
 
 gboolean media_monitor_has_pending_updates (MediaMonitor* self) {
 	gboolean result = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeHashMap* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 209 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
 #line 210 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1619,9 +1619,9 @@ gboolean media_monitor_has_pending_updates (MediaMonitor* self) {
 
 GeeCollection* media_monitor_get_monitorables (MediaMonitor* self) {
 	GeeCollection* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GeeSet* _tmp1_ = NULL;
-	GeeSet* _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeSet* _tmp1_;
+	GeeSet* _tmp2_;
 #line 213 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL);
 #line 214 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1641,15 +1641,15 @@ GeeCollection* media_monitor_get_monitorables (MediaMonitor* self) {
 MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, Monitorable* monitorable) {
 	MonitorableUpdates* result = NULL;
 	MonitorableUpdates* updates = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	Monitorable* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	MonitorableUpdates* _tmp3_ = NULL;
-	Monitorable* _tmp4_ = NULL;
-	MonitorableUpdates* _tmp5_ = NULL;
-	GeeHashMap* _tmp6_ = NULL;
-	Monitorable* _tmp7_ = NULL;
-	MonitorableUpdates* _tmp8_ = NULL;
+	GeeHashMap* _tmp0_;
+	Monitorable* _tmp1_;
+	gpointer _tmp2_;
+	MonitorableUpdates* _tmp3_;
+	Monitorable* _tmp4_;
+	MonitorableUpdates* _tmp5_;
+	GeeHashMap* _tmp6_;
+	Monitorable* _tmp7_;
+	MonitorableUpdates* _tmp8_;
 #line 219 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL);
 #line 219 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1698,9 +1698,9 @@ MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, Monitorable
 
 MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, Monitorable* monitorable) {
 	MonitorableUpdates* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	Monitorable* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	Monitorable* _tmp1_;
+	gpointer _tmp2_;
 #line 230 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL);
 #line 230 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1720,8 +1720,8 @@ MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, Moni
 
 
 void media_monitor_remove_updates (MediaMonitor* self, Monitorable* monitorable) {
-	GeeHashMap* _tmp0_ = NULL;
-	Monitorable* _tmp1_ = NULL;
+	GeeHashMap* _tmp0_;
+	Monitorable* _tmp1_;
 #line 234 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_if_fail (IS_MEDIA_MONITOR (self));
 #line 234 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1739,10 +1739,10 @@ void media_monitor_remove_updates (MediaMonitor* self, Monitorable* monitorable)
 gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable) {
 	gboolean result = FALSE;
 	MonitorableUpdates* updates = NULL;
-	Monitorable* _tmp0_ = NULL;
-	MonitorableUpdates* _tmp1_ = NULL;
+	Monitorable* _tmp0_;
+	MonitorableUpdates* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	MonitorableUpdates* _tmp3_ = NULL;
+	MonitorableUpdates* _tmp3_;
 #line 238 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
 #line 238 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1758,8 +1758,8 @@ gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable)
 #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp3_ != NULL) {
 #line 1761 "MediaMonitor.c"
-		MonitorableUpdates* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+		MonitorableUpdates* _tmp4_;
+		gboolean _tmp5_;
 #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp4_ = updates;
 #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1768,8 +1768,8 @@ gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable)
 		_tmp2_ = _tmp5_;
 #line 1770 "MediaMonitor.c"
 	} else {
-		Monitorable* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+		Monitorable* _tmp6_;
+		gboolean _tmp7_;
 #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp6_ = monitorable;
 #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1791,10 +1791,10 @@ gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable)
 gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable) {
 	gboolean result = FALSE;
 	MonitorableUpdates* updates = NULL;
-	Monitorable* _tmp0_ = NULL;
-	MonitorableUpdates* _tmp1_ = NULL;
+	Monitorable* _tmp0_;
+	MonitorableUpdates* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	MonitorableUpdates* _tmp3_ = NULL;
+	MonitorableUpdates* _tmp3_;
 #line 244 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
 #line 244 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1810,8 +1810,8 @@ gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable)
 #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp3_ != NULL) {
 #line 1813 "MediaMonitor.c"
-		MonitorableUpdates* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+		MonitorableUpdates* _tmp4_;
+		gboolean _tmp5_;
 #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp4_ = updates;
 #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1820,8 +1820,8 @@ gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable)
 		_tmp2_ = _tmp5_;
 #line 1822 "MediaMonitor.c"
 	} else {
-		Monitorable* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+		Monitorable* _tmp6_;
+		gboolean _tmp7_;
 #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp6_ = monitorable;
 #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1843,11 +1843,11 @@ gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable)
 GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorable) {
 	GFile* result = NULL;
 	MonitorableUpdates* updates = NULL;
-	Monitorable* _tmp0_ = NULL;
-	MonitorableUpdates* _tmp1_ = NULL;
+	Monitorable* _tmp0_;
+	MonitorableUpdates* _tmp1_;
 	GFile* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-	MonitorableUpdates* _tmp4_ = NULL;
+	MonitorableUpdates* _tmp4_;
 #line 250 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL);
 #line 250 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1863,9 +1863,9 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab
 #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp4_ != NULL) {
 #line 1866 "MediaMonitor.c"
-		MonitorableUpdates* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
+		MonitorableUpdates* _tmp5_;
+		GFile* _tmp6_;
+		GFile* _tmp7_;
 #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp5_ = updates;
 #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1885,8 +1885,8 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab
 #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp3_) {
 #line 1888 "MediaMonitor.c"
-		MonitorableUpdates* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
+		MonitorableUpdates* _tmp8_;
+		GFile* _tmp9_;
 #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp8_ = updates;
 #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1897,8 +1897,8 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab
 		_tmp2_ = _tmp9_;
 #line 1899 "MediaMonitor.c"
 	} else {
-		Monitorable* _tmp10_ = NULL;
-		GFile* _tmp11_ = NULL;
+		Monitorable* _tmp10_;
+		GFile* _tmp11_;
 #line 254 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp10_ = monitorable;
 #line 254 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1920,10 +1920,10 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab
 
 
 void media_monitor_update_master_file (MediaMonitor* self, Monitorable* monitorable, GFile* file) {
-	Monitorable* _tmp0_ = NULL;
-	MonitorableUpdates* _tmp1_ = NULL;
-	MonitorableUpdates* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	Monitorable* _tmp0_;
+	MonitorableUpdates* _tmp1_;
+	MonitorableUpdates* _tmp2_;
+	GFile* _tmp3_;
 #line 257 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_if_fail (IS_MEDIA_MONITOR (self));
 #line 257 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1947,9 +1947,9 @@ void media_monitor_update_master_file (MediaMonitor* self, Monitorable* monitora
 
 
 void media_monitor_update_master_file_info_altered (MediaMonitor* self, Monitorable* monitorable) {
-	Monitorable* _tmp0_ = NULL;
-	MonitorableUpdates* _tmp1_ = NULL;
-	MonitorableUpdates* _tmp2_ = NULL;
+	Monitorable* _tmp0_;
+	MonitorableUpdates* _tmp1_;
+	MonitorableUpdates* _tmp2_;
 #line 261 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_if_fail (IS_MEDIA_MONITOR (self));
 #line 261 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1969,10 +1969,10 @@ void media_monitor_update_master_file_info_altered (MediaMonitor* self, Monitora
 
 
 void media_monitor_update_master_file_in_alteration (MediaMonitor* self, Monitorable* monitorable, gboolean in_alteration) {
-	Monitorable* _tmp0_ = NULL;
-	MonitorableUpdates* _tmp1_ = NULL;
-	MonitorableUpdates* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	Monitorable* _tmp0_;
+	MonitorableUpdates* _tmp1_;
+	MonitorableUpdates* _tmp2_;
+	gboolean _tmp3_;
 #line 265 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_if_fail (IS_MEDIA_MONITOR (self));
 #line 265 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1994,10 +1994,10 @@ void media_monitor_update_master_file_in_alteration (MediaMonitor* self, Monitor
 
 
 void media_monitor_update_master_file_alterations_completed (MediaMonitor* self, Monitorable* monitorable, GFileInfo* info) {
-	Monitorable* _tmp0_ = NULL;
-	MonitorableUpdates* _tmp1_ = NULL;
-	MonitorableUpdates* _tmp2_ = NULL;
-	GFileInfo* _tmp3_ = NULL;
+	Monitorable* _tmp0_;
+	MonitorableUpdates* _tmp1_;
+	MonitorableUpdates* _tmp2_;
+	GFileInfo* _tmp3_;
 #line 269 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_if_fail (IS_MEDIA_MONITOR (self));
 #line 269 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2021,9 +2021,9 @@ void media_monitor_update_master_file_alterations_completed (MediaMonitor* self,
 
 
 void media_monitor_update_online (MediaMonitor* self, Monitorable* monitorable) {
-	Monitorable* _tmp0_ = NULL;
-	MonitorableUpdates* _tmp1_ = NULL;
-	MonitorableUpdates* _tmp2_ = NULL;
+	Monitorable* _tmp0_;
+	MonitorableUpdates* _tmp1_;
+	MonitorableUpdates* _tmp2_;
 #line 273 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_if_fail (IS_MEDIA_MONITOR (self));
 #line 273 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2043,9 +2043,9 @@ void media_monitor_update_online (MediaMonitor* self, Monitorable* monitorable)
 
 
 void media_monitor_update_offline (MediaMonitor* self, Monitorable* monitorable) {
-	Monitorable* _tmp0_ = NULL;
-	MonitorableUpdates* _tmp1_ = NULL;
-	MonitorableUpdates* _tmp2_ = NULL;
+	Monitorable* _tmp0_;
+	MonitorableUpdates* _tmp1_;
+	MonitorableUpdates* _tmp2_;
 #line 277 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_if_fail (IS_MEDIA_MONITOR (self));
 #line 277 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2069,10 +2069,10 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 	GeeMap* set_master_file_info = NULL;
 	GeeArrayList* to_offline = NULL;
 	GeeArrayList* to_online = NULL;
-	GeeMap* _tmp53_ = NULL;
-	GeeMap* _tmp63_ = NULL;
+	GeeMap* _tmp53_;
+	GeeMap* _tmp63_;
 	gboolean _tmp73_ = FALSE;
-	GeeArrayList* _tmp74_ = NULL;
+	GeeArrayList* _tmp74_;
 	GError * _inner_error_ = NULL;
 #line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (all_updates));
@@ -2089,8 +2089,8 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 #line 2090 "MediaMonitor.c"
 	{
 		GeeIterator* _updates_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp0_ = all_updates;
 #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2100,24 +2100,24 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		while (TRUE) {
 #line 2103 "MediaMonitor.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			MonitorableUpdates* updates = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			gint _tmp6_ = 0;
-			MonitorableUpdates* _tmp7_ = NULL;
-			GFile* _tmp8_ = NULL;
-			GFile* _tmp9_ = NULL;
-			gboolean _tmp10_ = FALSE;
-			MonitorableUpdates* _tmp21_ = NULL;
-			GFileInfo* _tmp22_ = NULL;
-			GFileInfo* _tmp23_ = NULL;
-			gboolean _tmp24_ = FALSE;
-			MonitorableUpdates* _tmp35_ = NULL;
-			gboolean _tmp36_ = FALSE;
-			MonitorableUpdates* _tmp44_ = NULL;
-			gboolean _tmp45_ = FALSE;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			gint _tmp6_;
+			MonitorableUpdates* _tmp7_;
+			GFile* _tmp8_;
+			GFile* _tmp9_;
+			gboolean _tmp10_;
+			MonitorableUpdates* _tmp21_;
+			GFileInfo* _tmp22_;
+			GFileInfo* _tmp23_;
+			gboolean _tmp24_;
+			MonitorableUpdates* _tmp35_;
+			gboolean _tmp36_;
+			MonitorableUpdates* _tmp44_;
+			gboolean _tmp45_;
 #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp2_ = _updates_it;
 #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2157,21 +2157,21 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 #line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (_tmp10_) {
 #line 2160 "MediaMonitor.c"
-				GeeMap* _tmp11_ = NULL;
-				GeeMap* _tmp13_ = NULL;
-				MonitorableUpdates* _tmp14_ = NULL;
-				Monitorable* _tmp15_ = NULL;
-				MonitorableUpdates* _tmp16_ = NULL;
-				GFile* _tmp17_ = NULL;
-				GFile* _tmp18_ = NULL;
-				MonitorableUpdates* _tmp19_ = NULL;
-				gint _tmp20_ = 0;
+				GeeMap* _tmp11_;
+				GeeMap* _tmp13_;
+				MonitorableUpdates* _tmp14_;
+				Monitorable* _tmp15_;
+				MonitorableUpdates* _tmp16_;
+				GFile* _tmp17_;
+				GFile* _tmp18_;
+				MonitorableUpdates* _tmp19_;
+				gint _tmp20_;
 #line 297 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				_tmp11_ = set_master_file;
 #line 297 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				if (_tmp11_ == NULL) {
 #line 2174 "MediaMonitor.c"
-					GeeHashMap* _tmp12_ = NULL;
+					GeeHashMap* _tmp12_;
 #line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 					_tmp12_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2219,21 +2219,21 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 #line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (_tmp24_) {
 #line 2222 "MediaMonitor.c"
-				GeeMap* _tmp25_ = NULL;
-				GeeMap* _tmp27_ = NULL;
-				MonitorableUpdates* _tmp28_ = NULL;
-				Monitorable* _tmp29_ = NULL;
-				MonitorableUpdates* _tmp30_ = NULL;
-				GFileInfo* _tmp31_ = NULL;
-				GFileInfo* _tmp32_ = NULL;
-				MonitorableUpdates* _tmp33_ = NULL;
-				gint _tmp34_ = 0;
+				GeeMap* _tmp25_;
+				GeeMap* _tmp27_;
+				MonitorableUpdates* _tmp28_;
+				Monitorable* _tmp29_;
+				MonitorableUpdates* _tmp30_;
+				GFileInfo* _tmp31_;
+				GFileInfo* _tmp32_;
+				MonitorableUpdates* _tmp33_;
+				gint _tmp34_;
 #line 306 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				_tmp25_ = set_master_file_info;
 #line 306 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				if (_tmp25_ == NULL) {
 #line 2236 "MediaMonitor.c"
-					GeeHashMap* _tmp26_ = NULL;
+					GeeHashMap* _tmp26_;
 #line 307 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 					_tmp26_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 307 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2275,18 +2275,18 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 #line 314 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (_tmp36_) {
 #line 2278 "MediaMonitor.c"
-				GeeArrayList* _tmp37_ = NULL;
-				GeeArrayList* _tmp39_ = NULL;
-				MonitorableUpdates* _tmp40_ = NULL;
-				Monitorable* _tmp41_ = NULL;
-				MonitorableUpdates* _tmp42_ = NULL;
-				gint _tmp43_ = 0;
+				GeeArrayList* _tmp37_;
+				GeeArrayList* _tmp39_;
+				MonitorableUpdates* _tmp40_;
+				Monitorable* _tmp41_;
+				MonitorableUpdates* _tmp42_;
+				gint _tmp43_;
 #line 315 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				_tmp37_ = to_offline;
 #line 315 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				if (_tmp37_ == NULL) {
 #line 2289 "MediaMonitor.c"
-					GeeArrayList* _tmp38_ = NULL;
+					GeeArrayList* _tmp38_;
 #line 316 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 					_tmp38_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 316 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2320,18 +2320,18 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 #line 323 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (_tmp45_) {
 #line 2323 "MediaMonitor.c"
-				GeeArrayList* _tmp46_ = NULL;
-				GeeArrayList* _tmp48_ = NULL;
-				MonitorableUpdates* _tmp49_ = NULL;
-				Monitorable* _tmp50_ = NULL;
-				MonitorableUpdates* _tmp51_ = NULL;
-				gint _tmp52_ = 0;
+				GeeArrayList* _tmp46_;
+				GeeArrayList* _tmp48_;
+				MonitorableUpdates* _tmp49_;
+				Monitorable* _tmp50_;
+				MonitorableUpdates* _tmp51_;
+				gint _tmp52_;
 #line 324 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				_tmp46_ = to_online;
 #line 324 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				if (_tmp46_ == NULL) {
 #line 2334 "MediaMonitor.c"
-					GeeArrayList* _tmp47_ = NULL;
+					GeeArrayList* _tmp47_;
 #line 325 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 					_tmp47_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 325 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2371,15 +2371,15 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 #line 333 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp53_ != NULL) {
 #line 2374 "MediaMonitor.c"
-		GeeMap* _tmp54_ = NULL;
-		gint _tmp55_ = 0;
-		gint _tmp56_ = 0;
-		gchar* _tmp57_ = NULL;
-		gchar* _tmp58_ = NULL;
-		gchar* _tmp59_ = NULL;
-		gchar* _tmp60_ = NULL;
-		GeeMap* _tmp61_ = NULL;
-		TransactionController* _tmp62_ = NULL;
+		GeeMap* _tmp54_;
+		gint _tmp55_;
+		gint _tmp56_;
+		gchar* _tmp57_;
+		gchar* _tmp58_;
+		gchar* _tmp59_;
+		gchar* _tmp60_;
+		GeeMap* _tmp61_;
+		TransactionController* _tmp62_;
 #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp54_ = set_master_file;
 #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2428,15 +2428,15 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 #line 339 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp63_ != NULL) {
 #line 2431 "MediaMonitor.c"
-		GeeMap* _tmp64_ = NULL;
-		gint _tmp65_ = 0;
-		gint _tmp66_ = 0;
-		gchar* _tmp67_ = NULL;
-		gchar* _tmp68_ = NULL;
-		gchar* _tmp69_ = NULL;
-		gchar* _tmp70_ = NULL;
-		GeeMap* _tmp71_ = NULL;
-		TransactionController* _tmp72_ = NULL;
+		GeeMap* _tmp64_;
+		gint _tmp65_;
+		gint _tmp66_;
+		gchar* _tmp67_;
+		gchar* _tmp68_;
+		gchar* _tmp69_;
+		gchar* _tmp70_;
+		GeeMap* _tmp71_;
+		TransactionController* _tmp72_;
 #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp64_ = set_master_file_info;
 #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2488,7 +2488,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 		_tmp73_ = TRUE;
 #line 2490 "MediaMonitor.c"
 	} else {
-		GeeArrayList* _tmp75_ = NULL;
+		GeeArrayList* _tmp75_;
 #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp75_ = to_online;
 #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2499,24 +2499,24 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 	if (_tmp73_) {
 #line 2501 "MediaMonitor.c"
 		gint _tmp76_ = 0;
-		GeeArrayList* _tmp77_ = NULL;
+		GeeArrayList* _tmp77_;
 		gint _tmp81_ = 0;
-		GeeArrayList* _tmp82_ = NULL;
-		gchar* _tmp86_ = NULL;
-		gchar* _tmp87_ = NULL;
-		gchar* _tmp88_ = NULL;
-		gchar* _tmp89_ = NULL;
-		GeeArrayList* _tmp90_ = NULL;
-		GeeArrayList* _tmp91_ = NULL;
-		TransactionController* _tmp92_ = NULL;
+		GeeArrayList* _tmp82_;
+		gchar* _tmp86_;
+		gchar* _tmp87_;
+		gchar* _tmp88_;
+		gchar* _tmp89_;
+		GeeArrayList* _tmp90_;
+		GeeArrayList* _tmp91_;
+		TransactionController* _tmp92_;
 #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp77_ = to_online;
 #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		if (_tmp77_ != NULL) {
 #line 2517 "MediaMonitor.c"
-			GeeArrayList* _tmp78_ = NULL;
-			gint _tmp79_ = 0;
-			gint _tmp80_ = 0;
+			GeeArrayList* _tmp78_;
+			gint _tmp79_;
+			gint _tmp80_;
 #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp78_ = to_online;
 #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2536,9 +2536,9 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		if (_tmp82_ != NULL) {
 #line 2539 "MediaMonitor.c"
-			GeeArrayList* _tmp83_ = NULL;
-			gint _tmp84_ = 0;
-			gint _tmp85_ = 0;
+			GeeArrayList* _tmp83_;
+			gint _tmp84_;
+			gint _tmp85_;
 #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp83_ = to_offline;
 #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2622,23 +2622,23 @@ static gpointer _transaction_controller_ref0 (gpointer self) {
 
 static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 	gboolean result = FALSE;
-	GCancellable* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GeeHashMap* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	GCancellable* _tmp0_;
+	gboolean _tmp1_;
+	GeeHashMap* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	GTimer* timer = NULL;
-	GTimer* _tmp5_ = NULL;
+	GTimer* _tmp5_;
 	GeeArrayList* to_process = NULL;
 	GeeArrayList* to_remove = NULL;
 	gint op_count = 0;
-	GeeArrayList* _tmp29_ = NULL;
-	GeeArrayList* _tmp48_ = NULL;
+	GeeArrayList* _tmp29_;
+	GeeArrayList* _tmp47_;
 	gdouble elapsed = 0.0;
-	GTimer* _tmp61_ = NULL;
-	gdouble _tmp62_ = 0.0;
-	gboolean _tmp63_ = FALSE;
-	gdouble _tmp64_ = 0.0;
+	GTimer* _tmp60_;
+	gdouble _tmp61_;
+	gboolean _tmp62_ = FALSE;
+	gdouble _tmp63_;
 	GError * _inner_error_ = NULL;
 #line 356 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
@@ -2679,12 +2679,12 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 #line 2680 "MediaMonitor.c"
 	{
 		GeeIterator* _updates_it = NULL;
-		GeeHashMap* _tmp6_ = NULL;
-		GeeCollection* _tmp7_ = NULL;
-		GeeCollection* _tmp8_ = NULL;
-		GeeCollection* _tmp9_ = NULL;
-		GeeIterator* _tmp10_ = NULL;
-		GeeIterator* _tmp11_ = NULL;
+		GeeHashMap* _tmp6_;
+		GeeCollection* _tmp7_;
+		GeeCollection* _tmp8_;
+		GeeCollection* _tmp9_;
+		GeeIterator* _tmp10_;
+		GeeIterator* _tmp11_;
 #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp6_ = self->priv->pending_updates;
 #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2704,18 +2704,18 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		while (TRUE) {
 #line 2707 "MediaMonitor.c"
-			GeeIterator* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
+			GeeIterator* _tmp12_;
+			gboolean _tmp13_;
 			MonitorableUpdates* updates = NULL;
-			GeeIterator* _tmp14_ = NULL;
-			gpointer _tmp15_ = NULL;
-			MonitorableUpdates* _tmp16_ = NULL;
-			gboolean _tmp17_ = FALSE;
-			MonitorableUpdates* _tmp18_ = NULL;
-			gboolean _tmp19_ = FALSE;
-			GeeArrayList* _tmp25_ = NULL;
-			GeeArrayList* _tmp27_ = NULL;
-			MonitorableUpdates* _tmp28_ = NULL;
+			GeeIterator* _tmp14_;
+			gpointer _tmp15_;
+			MonitorableUpdates* _tmp16_;
+			gboolean _tmp17_;
+			MonitorableUpdates* _tmp18_;
+			gboolean _tmp19_;
+			GeeArrayList* _tmp25_;
+			GeeArrayList* _tmp27_;
+			MonitorableUpdates* _tmp28_;
 #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp12_ = _updates_it;
 #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2751,16 +2751,16 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 #line 374 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (_tmp19_) {
 #line 2754 "MediaMonitor.c"
-				GeeArrayList* _tmp20_ = NULL;
-				GeeArrayList* _tmp22_ = NULL;
-				MonitorableUpdates* _tmp23_ = NULL;
-				Monitorable* _tmp24_ = NULL;
+				GeeArrayList* _tmp20_;
+				GeeArrayList* _tmp22_;
+				MonitorableUpdates* _tmp23_;
+				Monitorable* _tmp24_;
 #line 375 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				_tmp20_ = to_remove;
 #line 375 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				if (_tmp20_ == NULL) {
 #line 2763 "MediaMonitor.c"
-					GeeArrayList* _tmp21_ = NULL;
+					GeeArrayList* _tmp21_;
 #line 376 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 					_tmp21_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 376 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2788,7 +2788,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 #line 382 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (_tmp25_ == NULL) {
 #line 2791 "MediaMonitor.c"
-				GeeArrayList* _tmp26_ = NULL;
+				GeeArrayList* _tmp26_;
 #line 383 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				_tmp26_ = gee_array_list_new (TYPE_MONITORABLE_UPDATES, (GBoxedCopyFunc) monitorable_updates_ref, (GDestroyNotify) monitorable_updates_unref, NULL, NULL, NULL);
 #line 383 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2819,12 +2819,12 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 	if (_tmp29_ != NULL) {
 #line 2821 "MediaMonitor.c"
 		TransactionController* controller = NULL;
-		MediaSourceCollection* _tmp30_ = NULL;
-		MediaSourceCollection* _tmp31_ = NULL;
-		TransactionController* _tmp32_ = NULL;
-		TransactionController* _tmp33_ = NULL;
-		TransactionController* _tmp34_ = NULL;
-		TransactionController* _tmp35_ = NULL;
+		MediaSourceCollection* _tmp30_;
+		MediaSourceCollection* _tmp31_;
+		TransactionController* _tmp32_;
+		TransactionController* _tmp33_;
+		TransactionController* _tmp34_;
+		TransactionController* _tmp35_;
 #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp30_ = media_monitor_get_media_source_collection (self);
 #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2843,10 +2843,10 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 		controller = _tmp35_;
 #line 2845 "MediaMonitor.c"
 		{
-			TransactionController* _tmp36_ = NULL;
-			GeeArrayList* _tmp37_ = NULL;
-			TransactionController* _tmp38_ = NULL;
-			TransactionController* _tmp39_ = NULL;
+			TransactionController* _tmp36_;
+			GeeArrayList* _tmp37_;
+			TransactionController* _tmp38_;
+			TransactionController* _tmp39_;
 #line 393 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp36_ = controller;
 #line 393 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2860,7 +2860,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 #line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2863 "MediaMonitor.c"
-				goto __catch583_g_error;
+				goto __catch585_g_error;
 			}
 #line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp39_ = controller;
@@ -2868,11 +2868,11 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 			transaction_controller_commit (_tmp39_);
 #line 2870 "MediaMonitor.c"
 		}
-		goto __finally583;
-		__catch583_g_error:
+		goto __finally585;
+		__catch585_g_error:
 		{
 			GError* err = NULL;
-			GError* _tmp40_ = NULL;
+			GError* _tmp40_;
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			err = _inner_error_;
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2882,43 +2882,40 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 #line 397 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (_tmp40_->domain == DATABASE_ERROR) {
 #line 2885 "MediaMonitor.c"
-				GError* _tmp41_ = NULL;
+				GError* _tmp41_;
 #line 398 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				_tmp41_ = err;
 #line 398 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				app_window_database_error ((GError*) _tmp41_);
 #line 2891 "MediaMonitor.c"
 			} else {
-				const gchar* _tmp42_ = NULL;
-				GError* _tmp43_ = NULL;
-				const gchar* _tmp44_ = NULL;
-				gchar* _tmp45_ = NULL;
-				gchar* _tmp46_ = NULL;
-#line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp42_ = _ ("Unable to process monitoring updates: %s");
+				GError* _tmp42_;
+				const gchar* _tmp43_;
+				gchar* _tmp44_;
+				gchar* _tmp45_;
 #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp43_ = err;
+				_tmp42_ = err;
 #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp44_ = _tmp43_->message;
+				_tmp43_ = _tmp42_->message;
 #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp45_ = g_strdup_printf (_tmp42_, _tmp44_);
+				_tmp44_ = g_strdup_printf (_ ("Unable to process monitoring updates: %s"), _tmp43_);
 #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp46_ = _tmp45_;
+				_tmp45_ = _tmp44_;
 #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				app_window_panic (_tmp46_);
+				app_window_panic (_tmp45_);
 #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_g_free0 (_tmp46_);
-#line 2912 "MediaMonitor.c"
+				_g_free0 (_tmp45_);
+#line 2909 "MediaMonitor.c"
 			}
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_g_error_free0 (err);
-#line 2916 "MediaMonitor.c"
+#line 2913 "MediaMonitor.c"
 		}
-		__finally583:
+		__finally585:
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2921 "MediaMonitor.c"
-			gboolean _tmp47_ = FALSE;
+#line 2918 "MediaMonitor.c"
+			gboolean _tmp46_ = FALSE;
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_transaction_controller_unref0 (controller);
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2932,138 +2929,138 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			g_clear_error (&_inner_error_);
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-			return _tmp47_;
-#line 2937 "MediaMonitor.c"
+			return _tmp46_;
+#line 2934 "MediaMonitor.c"
 		}
 #line 389 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_transaction_controller_unref0 (controller);
-#line 2941 "MediaMonitor.c"
+#line 2938 "MediaMonitor.c"
 	}
 #line 404 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	_tmp48_ = to_remove;
+	_tmp47_ = to_remove;
 #line 404 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	if (_tmp48_ != NULL) {
-#line 2947 "MediaMonitor.c"
+	if (_tmp47_ != NULL) {
+#line 2944 "MediaMonitor.c"
 		{
 			GeeArrayList* _monitorable_list = NULL;
-			GeeArrayList* _tmp49_ = NULL;
-			GeeArrayList* _tmp50_ = NULL;
+			GeeArrayList* _tmp48_;
+			GeeArrayList* _tmp49_;
 			gint _monitorable_size = 0;
-			GeeArrayList* _tmp51_ = NULL;
-			gint _tmp52_ = 0;
-			gint _tmp53_ = 0;
+			GeeArrayList* _tmp50_;
+			gint _tmp51_;
+			gint _tmp52_;
 			gint _monitorable_index = 0;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-			_tmp49_ = to_remove;
+			_tmp48_ = to_remove;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-			_tmp50_ = _g_object_ref0 (_tmp49_);
+			_tmp49_ = _g_object_ref0 (_tmp48_);
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-			_monitorable_list = _tmp50_;
+			_monitorable_list = _tmp49_;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-			_tmp51_ = _monitorable_list;
+			_tmp50_ = _monitorable_list;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-			_tmp52_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+			_tmp51_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-			_tmp53_ = _tmp52_;
+			_tmp52_ = _tmp51_;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-			_monitorable_size = _tmp53_;
+			_monitorable_size = _tmp52_;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_monitorable_index = -1;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			while (TRUE) {
-#line 2975 "MediaMonitor.c"
-				gint _tmp54_ = 0;
-				gint _tmp55_ = 0;
-				gint _tmp56_ = 0;
+#line 2972 "MediaMonitor.c"
+				gint _tmp53_;
+				gint _tmp54_;
+				gint _tmp55_;
 				Monitorable* monitorable = NULL;
-				GeeArrayList* _tmp57_ = NULL;
-				gint _tmp58_ = 0;
-				gpointer _tmp59_ = NULL;
-				Monitorable* _tmp60_ = NULL;
+				GeeArrayList* _tmp56_;
+				gint _tmp57_;
+				gpointer _tmp58_;
+				Monitorable* _tmp59_;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp54_ = _monitorable_index;
+				_tmp53_ = _monitorable_index;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_monitorable_index = _tmp54_ + 1;
+				_monitorable_index = _tmp53_ + 1;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp55_ = _monitorable_index;
+				_tmp54_ = _monitorable_index;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp56_ = _monitorable_size;
+				_tmp55_ = _monitorable_size;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				if (!(_tmp55_ < _tmp56_)) {
+				if (!(_tmp54_ < _tmp55_)) {
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 					break;
-#line 2996 "MediaMonitor.c"
+#line 2993 "MediaMonitor.c"
 				}
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp57_ = _monitorable_list;
+				_tmp56_ = _monitorable_list;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp58_ = _monitorable_index;
+				_tmp57_ = _monitorable_index;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp59_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp58_);
+				_tmp58_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp57_);
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				monitorable = (Monitorable*) _tmp59_;
+				monitorable = (Monitorable*) _tmp58_;
 #line 406 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp60_ = monitorable;
+				_tmp59_ = monitorable;
 #line 406 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				media_monitor_remove_updates (self, _tmp60_);
+				media_monitor_remove_updates (self, _tmp59_);
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				_g_object_unref0 (monitorable);
-#line 3012 "MediaMonitor.c"
+#line 3009 "MediaMonitor.c"
 			}
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_g_object_unref0 (_monitorable_list);
-#line 3016 "MediaMonitor.c"
+#line 3013 "MediaMonitor.c"
 		}
 	}
 #line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	_tmp61_ = timer;
+	_tmp60_ = timer;
 #line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	_tmp62_ = g_timer_elapsed (_tmp61_, NULL);
+	_tmp61_ = g_timer_elapsed (_tmp60_, NULL);
 #line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	elapsed = _tmp62_;
+	elapsed = _tmp61_;
 #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	_tmp64_ = elapsed;
+	_tmp63_ = elapsed;
 #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	if (_tmp64_ > 0.01) {
+	if (_tmp63_ > 0.01) {
 #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp63_ = TRUE;
-#line 3031 "MediaMonitor.c"
+		_tmp62_ = TRUE;
+#line 3028 "MediaMonitor.c"
 	} else {
-		gint _tmp65_ = 0;
+		gint _tmp64_;
 #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp65_ = op_count;
+		_tmp64_ = op_count;
 #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp63_ = _tmp65_ > 0;
-#line 3038 "MediaMonitor.c"
+		_tmp62_ = _tmp64_ > 0;
+#line 3035 "MediaMonitor.c"
 	}
 #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	if (_tmp63_) {
-#line 3042 "MediaMonitor.c"
-		gchar* _tmp66_ = NULL;
-		gchar* _tmp67_ = NULL;
-		gdouble _tmp68_ = 0.0;
-		gint _tmp69_ = 0;
-		gchar* _tmp70_ = NULL;
-		gchar* _tmp71_ = NULL;
+	if (_tmp62_) {
+#line 3039 "MediaMonitor.c"
+		gchar* _tmp65_;
+		gchar* _tmp66_;
+		gdouble _tmp67_;
+		gint _tmp68_;
+		gchar* _tmp69_;
+		gchar* _tmp70_;
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp66_ = media_monitor_to_string (self);
+		_tmp65_ = media_monitor_to_string (self);
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp67_ = _tmp66_;
+		_tmp66_ = _tmp65_;
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp68_ = elapsed;
+		_tmp67_ = elapsed;
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp69_ = op_count;
+		_tmp68_ = op_count;
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp70_ = g_strdup_printf ("Total pending queue time for %s: %lf (%d ops)", _tmp67_, _tmp68_, _tmp69_);
+		_tmp69_ = g_strdup_printf ("Total pending queue time for %s: %lf (%d ops)", _tmp66_, _tmp67_, _tmp68_);
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp71_ = _tmp70_;
+		_tmp70_ = _tmp69_;
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		media_monitor_mdbg (_tmp71_);
+		media_monitor_mdbg (_tmp70_);
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_g_free0 (_tmp71_);
+		_g_free0 (_tmp70_);
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_g_free0 (_tmp67_);
-#line 3067 "MediaMonitor.c"
+		_g_free0 (_tmp66_);
+#line 3064 "MediaMonitor.c"
 	}
 #line 415 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	result = TRUE;
@@ -3075,7 +3072,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 	_g_timer_destroy0 (timer);
 #line 415 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	return result;
-#line 3079 "MediaMonitor.c"
+#line 3076 "MediaMonitor.c"
 }
 
 
@@ -3085,51 +3082,51 @@ static void media_monitor_class_init (MediaMonitorClass * klass) {
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_type_class_add_private (klass, sizeof (MediaMonitorPrivate));
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->get_media_source_collection = (MediaSourceCollection* (*)(MediaMonitor*)) media_monitor_real_get_media_source_collection;
+	((MediaMonitorClass *) klass)->get_media_source_collection = (MediaSourceCollection* (*) (MediaMonitor *)) media_monitor_real_get_media_source_collection;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->close = (void (*)(MediaMonitor*)) media_monitor_real_close;
+	((MediaMonitorClass *) klass)->close = (void (*) (MediaMonitor *)) media_monitor_real_close;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->to_string = (gchar* (*)(MediaMonitor*)) media_monitor_real_to_string;
+	((MediaMonitorClass *) klass)->to_string = (gchar* (*) (MediaMonitor *)) media_monitor_real_to_string;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->create_updates = (MonitorableUpdates* (*)(MediaMonitor*, Monitorable*)) media_monitor_real_create_updates;
+	((MediaMonitorClass *) klass)->create_updates = (MonitorableUpdates* (*) (MediaMonitor *, Monitorable*)) media_monitor_real_create_updates;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->on_media_source_destroyed = (void (*)(MediaMonitor*, DataSource*)) media_monitor_real_on_media_source_destroyed;
+	((MediaMonitorClass *) klass)->on_media_source_destroyed = (void (*) (MediaMonitor *, DataSource*)) media_monitor_real_on_media_source_destroyed;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_discovery_started = (void (*)(MediaMonitor*)) media_monitor_real_notify_discovery_started;
+	((MediaMonitorClass *) klass)->notify_discovery_started = (void (*) (MediaMonitor *)) media_monitor_real_notify_discovery_started;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_discovered = (MediaMonitorDiscoveredFile (*)(MediaMonitor*, GFile*, GFileInfo*, Monitorable**)) media_monitor_real_notify_file_discovered;
+	((MediaMonitorClass *) klass)->notify_file_discovered = (MediaMonitorDiscoveredFile (*) (MediaMonitor *, GFile*, GFileInfo*, Monitorable* *)) media_monitor_real_notify_file_discovered;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->candidates_for_unknown_file = (GeeCollection* (*)(MediaMonitor*, GFile*, GFileInfo*, MediaMonitorDiscoveredFile*)) media_monitor_real_candidates_for_unknown_file;
+	((MediaMonitorClass *) klass)->candidates_for_unknown_file = (GeeCollection* (*) (MediaMonitor *, GFile*, GFileInfo*, MediaMonitorDiscoveredFile*)) media_monitor_real_candidates_for_unknown_file;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->get_auxilliary_backing_files = (GFile** (*)(MediaMonitor*, Monitorable*, int*)) media_monitor_real_get_auxilliary_backing_files;
+	((MediaMonitorClass *) klass)->get_auxilliary_backing_files = (GFile** (*) (MediaMonitor *, Monitorable*, int*)) media_monitor_real_get_auxilliary_backing_files;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->update_backing_file_info = (void (*)(MediaMonitor*, Monitorable*, GFile*, GFileInfo*)) media_monitor_real_update_backing_file_info;
+	((MediaMonitorClass *) klass)->update_backing_file_info = (void (*) (MediaMonitor *, Monitorable*, GFile*, GFileInfo*)) media_monitor_real_update_backing_file_info;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_discovery_completing = (void (*)(MediaMonitor*)) media_monitor_real_notify_discovery_completing;
+	((MediaMonitorClass *) klass)->notify_discovery_completing = (void (*) (MediaMonitor *)) media_monitor_real_notify_discovery_completing;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->is_file_represented = (gboolean (*)(MediaMonitor*, GFile*)) media_monitor_real_is_file_represented;
+	((MediaMonitorClass *) klass)->is_file_represented = (gboolean (*) (MediaMonitor *, GFile*)) media_monitor_real_is_file_represented;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_created = (gboolean (*)(MediaMonitor*, GFile*, GFileInfo*)) media_monitor_real_notify_file_created;
+	((MediaMonitorClass *) klass)->notify_file_created = (gboolean (*) (MediaMonitor *, GFile*, GFileInfo*)) media_monitor_real_notify_file_created;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_moved = (gboolean (*)(MediaMonitor*, GFile*, GFile*, GFileInfo*)) media_monitor_real_notify_file_moved;
+	((MediaMonitorClass *) klass)->notify_file_moved = (gboolean (*) (MediaMonitor *, GFile*, GFile*, GFileInfo*)) media_monitor_real_notify_file_moved;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_altered = (gboolean (*)(MediaMonitor*, GFile*)) media_monitor_real_notify_file_altered;
+	((MediaMonitorClass *) klass)->notify_file_altered = (gboolean (*) (MediaMonitor *, GFile*)) media_monitor_real_notify_file_altered;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_attributes_altered = (gboolean (*)(MediaMonitor*, GFile*)) media_monitor_real_notify_file_attributes_altered;
+	((MediaMonitorClass *) klass)->notify_file_attributes_altered = (gboolean (*) (MediaMonitor *, GFile*)) media_monitor_real_notify_file_attributes_altered;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_alteration_completed = (gboolean (*)(MediaMonitor*, GFile*, GFileInfo*)) media_monitor_real_notify_file_alteration_completed;
+	((MediaMonitorClass *) klass)->notify_file_alteration_completed = (gboolean (*) (MediaMonitor *, GFile*, GFileInfo*)) media_monitor_real_notify_file_alteration_completed;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_deleted = (gboolean (*)(MediaMonitor*, GFile*)) media_monitor_real_notify_file_deleted;
+	((MediaMonitorClass *) klass)->notify_file_deleted = (gboolean (*) (MediaMonitor *, GFile*)) media_monitor_real_notify_file_deleted;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	((MediaMonitorClass *) klass)->process_updates = (void (*)(MediaMonitor*, GeeCollection*, TransactionController*, gint*, GError**)) media_monitor_real_process_updates;
+	((MediaMonitorClass *) klass)->process_updates = (void (*) (MediaMonitor *, GeeCollection*, TransactionController*, gint*, GError**)) media_monitor_real_process_updates;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	G_OBJECT_CLASS (klass)->finalize = media_monitor_finalize;
-#line 3128 "MediaMonitor.c"
+#line 3125 "MediaMonitor.c"
 }
 
 
 static void media_monitor_instance_init (MediaMonitor * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	self->priv = MEDIA_MONITOR_GET_PRIVATE (self);
 #line 114 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -3138,16 +3135,16 @@ static void media_monitor_instance_init (MediaMonitor * self) {
 	self->priv->pending_updates = _tmp0_;
 #line 116 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	self->priv->pending_updates_timer_id = (guint) 0;
-#line 3142 "MediaMonitor.c"
+#line 3139 "MediaMonitor.c"
 }
 
 
-static void media_monitor_finalize (GObject* obj) {
+static void media_monitor_finalize (GObject * obj) {
 	MediaMonitor * self;
-	MediaSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	MediaSourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	MediaSourceCollection* _tmp0_;
+	guint _tmp1_;
+	MediaSourceCollection* _tmp2_;
+	guint _tmp3_;
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_MONITOR, MediaMonitor);
 #line 130 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -3170,7 +3167,7 @@ static void media_monitor_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->pending_updates);
 #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	G_OBJECT_CLASS (media_monitor_parent_class)->finalize (obj);
-#line 3174 "MediaMonitor.c"
+#line 3171 "MediaMonitor.c"
 }
 
 
diff --git a/src/MediaPage.c b/src/MediaPage.c
index a6f60b1..7dd7c65 100644
--- a/src/MediaPage.c
+++ b/src/MediaPage.c
@@ -1,4 +1,4 @@
-/* MediaPage.c generated by valac 0.34.7, the Vala compiler
+/* MediaPage.c generated by valac 0.36.6, the Vala compiler
  * generated from MediaPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -652,6 +652,11 @@ typedef struct _SetRawDeveloperCommandClass SetRawDeveloperCommandClass;
 typedef struct _CheckerboardLayout CheckerboardLayout;
 typedef struct _CheckerboardLayoutClass CheckerboardLayoutClass;
 typedef struct _MediaPageZoomSliderAssemblyPrivate MediaPageZoomSliderAssemblyPrivate;
+enum  {
+	MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_ZOOM_CHANGED_SIGNAL,
+	MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_LAST_SIGNAL
+};
+static guint media_page_zoom_slider_assembly_signals[MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -1013,7 +1018,7 @@ void checkerboard_item_set_title (CheckerboardItem* self, const gchar* text, gbo
 gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self);
 gchar* natural_collate_collate_key (gchar* str);
 gchar* checkerboard_item_get_title (CheckerboardItem* self);
-static void media_source_item_finalize (GObject* obj);
+static void media_source_item_finalize (GObject * obj);
 GType page_get_type (void) G_GNUC_CONST;
 GType page_window_get_type (void) G_GNUC_CONST;
 GType fullscreen_window_get_type (void) G_GNUC_CONST;
@@ -1441,8 +1446,8 @@ static gboolean _media_page_zoom_slider_assembly_on_zoom_in_pressed_gtk_widget_b
 gint media_page_zoom_slider_assembly_slider_to_scale (gdouble value);
 void media_page_zoom_slider_assembly_snap_to_min (MediaPageZoomSliderAssembly* self);
 void media_page_zoom_slider_assembly_snap_to_max (MediaPageZoomSliderAssembly* self);
-static void media_page_zoom_slider_assembly_finalize (GObject* obj);
-static void media_page_finalize (GObject* obj);
+static void media_page_zoom_slider_assembly_finalize (GObject * obj);
+static void media_page_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -1450,13 +1455,13 @@ static const GActionEntry MEDIA_PAGE_entries[30] = {{"Export", _media_page_on_ex
 
 MediaSourceItem* media_source_item_construct (GType object_type, ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment) {
 	MediaSourceItem * self = NULL;
-	ThumbnailSource* _tmp0_ = NULL;
-	Dimensions _tmp1_ = {0};
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	PangoAlignment _tmp5_ = 0;
-	GdkPixbuf* _tmp6_ = NULL;
+	ThumbnailSource* _tmp0_;
+	Dimensions _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gboolean _tmp4_;
+	PangoAlignment _tmp5_;
+	GdkPixbuf* _tmp6_;
 #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_THUMBNAIL_SOURCE (source), NULL);
 #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -1481,39 +1486,39 @@ MediaSourceItem* media_source_item_construct (GType object_type, ThumbnailSource
 	_tmp6_ = media_source_item_basis_sprocket_pixbuf;
 #line 19 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp6_ == NULL) {
-#line 1485 "MediaPage.c"
-		GdkPixbuf* _tmp7_ = NULL;
+#line 1490 "MediaPage.c"
+		GdkPixbuf* _tmp7_;
 #line 20 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = resources_load_icon ("sprocket.png", 0);
 #line 20 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (media_source_item_basis_sprocket_pixbuf);
 #line 20 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_source_item_basis_sprocket_pixbuf = _tmp7_;
-#line 1493 "MediaPage.c"
+#line 1498 "MediaPage.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self;
-#line 1497 "MediaPage.c"
+#line 1502 "MediaPage.c"
 }
 
 
 MediaSourceItem* media_source_item_new (ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment) {
 #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return media_source_item_construct (TYPE_MEDIA_SOURCE_ITEM, source, initial_pixbuf_dim, title, comment, marked_up, alignment);
-#line 1504 "MediaPage.c"
+#line 1509 "MediaPage.c"
 }
 
 
 static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin) {
 	MediaSourceItem * self;
 	Dimensions pixbuf_dim = {0};
-	GdkPixbuf* _tmp0_ = NULL;
+	GdkPixbuf* _tmp0_;
 	Dimensions _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-	cairo_t* _tmp21_ = NULL;
-	GdkPixbuf* _tmp22_ = NULL;
-	GdkPoint _tmp23_ = {0};
-	gboolean _tmp24_ = FALSE;
+	gboolean _tmp2_;
+	cairo_t* _tmp21_;
+	GdkPixbuf* _tmp22_;
+	GdkPoint _tmp23_;
+	gboolean _tmp24_;
 #line 23 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem);
 #line 23 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -1534,20 +1539,20 @@ static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t*
 	if (!_tmp2_) {
 #line 31 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		checkerboard_item_set_horizontal_trinket_offset (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), 0);
-#line 1538 "MediaPage.c"
+#line 1543 "MediaPage.c"
 	} else {
 		gdouble reduction_factor = 0.0;
-		gint _tmp3_ = 0;
+		gint _tmp3_;
 		gint reduced_size = 0;
-		gdouble _tmp4_ = 0.0;
-		GdkPixbuf* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		gdouble _tmp4_;
+		GdkPixbuf* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 		gboolean _tmp8_ = FALSE;
-		GdkPixbuf* _tmp9_ = NULL;
-		GdkPixbuf* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
-		gint _tmp20_ = 0;
+		GdkPixbuf* _tmp9_;
+		GdkPixbuf* _tmp18_;
+		gint _tmp19_;
+		gint _tmp20_;
 #line 33 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = dimensions_major_axis (&pixbuf_dim);
 #line 33 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -1568,12 +1573,12 @@ static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t*
 		if (_tmp9_ == NULL) {
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = TRUE;
-#line 1572 "MediaPage.c"
+#line 1577 "MediaPage.c"
 		} else {
-			gint _tmp10_ = 0;
-			GdkPixbuf* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
+			gint _tmp10_;
+			GdkPixbuf* _tmp11_;
+			gint _tmp12_;
+			gint _tmp13_;
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = reduced_size;
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -1584,15 +1589,15 @@ static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t*
 			_tmp13_ = _tmp12_;
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = _tmp10_ != _tmp13_;
-#line 1588 "MediaPage.c"
+#line 1593 "MediaPage.c"
 		}
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (_tmp8_) {
-#line 1592 "MediaPage.c"
-			GdkPixbuf* _tmp14_ = NULL;
-			gint _tmp15_ = 0;
-			gint _tmp16_ = 0;
-			GdkPixbuf* _tmp17_ = NULL;
+#line 1597 "MediaPage.c"
+			GdkPixbuf* _tmp14_;
+			gint _tmp15_;
+			gint _tmp16_;
+			GdkPixbuf* _tmp17_;
 #line 38 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = media_source_item_basis_sprocket_pixbuf;
 #line 38 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -1605,7 +1610,7 @@ static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t*
 			_g_object_unref0 (media_source_item_current_sprocket_pixbuf);
 #line 38 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			media_source_item_current_sprocket_pixbuf = _tmp17_;
-#line 1609 "MediaPage.c"
+#line 1614 "MediaPage.c"
 		}
 #line 42 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = media_source_item_current_sprocket_pixbuf;
@@ -1615,7 +1620,7 @@ static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t*
 		_tmp20_ = _tmp19_;
 #line 42 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		checkerboard_item_set_horizontal_trinket_offset (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp20_);
-#line 1619 "MediaPage.c"
+#line 1624 "MediaPage.c"
 	}
 #line 45 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp21_ = ctx;
@@ -1629,10 +1634,10 @@ static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t*
 	_tmp24_ = self->priv->enable_sprockets;
 #line 47 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp24_) {
-#line 1633 "MediaPage.c"
-		cairo_t* _tmp25_ = NULL;
-		GdkPoint _tmp26_ = {0};
-		Dimensions _tmp27_ = {0};
+#line 1638 "MediaPage.c"
+		cairo_t* _tmp25_;
+		GdkPoint _tmp26_;
+		Dimensions _tmp27_;
 #line 48 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp25_ = ctx;
 #line 48 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -1641,21 +1646,21 @@ static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t*
 		_tmp27_ = pixbuf_dim;
 #line 48 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_source_item_paint_sprockets (self, _tmp25_, &_tmp26_, &_tmp27_);
-#line 1645 "MediaPage.c"
+#line 1650 "MediaPage.c"
 	}
 }
 
 
 void media_source_item_paint_one_sprocket (MediaSourceItem* self, cairo_t* ctx, GdkPoint* origin) {
-	cairo_t* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkPoint _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	GdkPoint _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	cairo_t* _tmp7_ = NULL;
-	cairo_t* _tmp8_ = NULL;
+	cairo_t* _tmp0_;
+	cairo_t* _tmp1_;
+	GdkPixbuf* _tmp2_;
+	GdkPoint _tmp3_;
+	gint _tmp4_;
+	GdkPoint _tmp5_;
+	gint _tmp6_;
+	cairo_t* _tmp7_;
+	cairo_t* _tmp8_;
 #line 52 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_ITEM (self));
 #line 52 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -1688,34 +1693,34 @@ void media_source_item_paint_one_sprocket (MediaSourceItem* self, cairo_t* ctx,
 	_tmp8_ = ctx;
 #line 56 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	cairo_restore (_tmp8_);
-#line 1692 "MediaPage.c"
+#line 1697 "MediaPage.c"
 }
 
 
 void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, GdkPoint* item_origin, Dimensions* item_dimensions) {
 	gint num_sprockets = 0;
-	Dimensions _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GdkPixbuf* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	Dimensions _tmp0_;
+	gint _tmp1_;
+	GdkPixbuf* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	GdkPoint left_paint_location = {0};
-	GdkPoint _tmp5_ = {0};
+	GdkPoint _tmp5_;
 	GdkPoint right_paint_location = {0};
-	GdkPoint _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	Dimensions _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	GdkPixbuf* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
+	GdkPoint _tmp6_;
+	gint _tmp7_;
+	Dimensions _tmp8_;
+	gint _tmp9_;
+	GdkPixbuf* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
 	gint straggler_pixels = 0;
-	Dimensions _tmp29_ = {0};
-	gint _tmp30_ = 0;
-	GdkPixbuf* _tmp31_ = NULL;
-	gint _tmp32_ = 0;
-	gint _tmp33_ = 0;
-	gint _tmp34_ = 0;
+	Dimensions _tmp29_;
+	gint _tmp30_;
+	GdkPixbuf* _tmp31_;
+	gint _tmp32_;
+	gint _tmp33_;
+	gint _tmp34_;
 #line 59 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_ITEM (self));
 #line 59 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -1758,42 +1763,42 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk
 	_tmp12_ = _tmp11_;
 #line 65 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	right_paint_location.x = _tmp7_ + (_tmp9_ - _tmp12_);
-#line 1762 "MediaPage.c"
+#line 1767 "MediaPage.c"
 	{
 		gint i = 0;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		i = 0;
-#line 1767 "MediaPage.c"
+#line 1772 "MediaPage.c"
 		{
 			gboolean _tmp13_ = FALSE;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = TRUE;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			while (TRUE) {
-#line 1774 "MediaPage.c"
-				gint _tmp15_ = 0;
-				gint _tmp16_ = 0;
-				cairo_t* _tmp17_ = NULL;
-				GdkPoint _tmp18_ = {0};
-				cairo_t* _tmp19_ = NULL;
-				GdkPoint _tmp20_ = {0};
-				gint _tmp21_ = 0;
-				GdkPixbuf* _tmp22_ = NULL;
-				gint _tmp23_ = 0;
-				gint _tmp24_ = 0;
-				gint _tmp25_ = 0;
-				GdkPixbuf* _tmp26_ = NULL;
-				gint _tmp27_ = 0;
-				gint _tmp28_ = 0;
+#line 1779 "MediaPage.c"
+				gint _tmp15_;
+				gint _tmp16_;
+				cairo_t* _tmp17_;
+				GdkPoint _tmp18_;
+				cairo_t* _tmp19_;
+				GdkPoint _tmp20_;
+				gint _tmp21_;
+				GdkPixbuf* _tmp22_;
+				gint _tmp23_;
+				gint _tmp24_;
+				gint _tmp25_;
+				GdkPixbuf* _tmp26_;
+				gint _tmp27_;
+				gint _tmp28_;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (!_tmp13_) {
-#line 1791 "MediaPage.c"
-					gint _tmp14_ = 0;
+#line 1796 "MediaPage.c"
+					gint _tmp14_;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp14_ = i;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					i = _tmp14_ + 1;
-#line 1797 "MediaPage.c"
+#line 1802 "MediaPage.c"
 				}
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp13_ = FALSE;
@@ -1805,7 +1810,7 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk
 				if (!(_tmp15_ < _tmp16_)) {
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					break;
-#line 1809 "MediaPage.c"
+#line 1814 "MediaPage.c"
 				}
 #line 67 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp17_ = ctx;
@@ -1839,7 +1844,7 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk
 				_tmp28_ = _tmp27_;
 #line 71 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				right_paint_location.y = _tmp25_ + _tmp28_;
-#line 1843 "MediaPage.c"
+#line 1848 "MediaPage.c"
 			}
 		}
 	}
@@ -1859,39 +1864,39 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk
 	_tmp34_ = straggler_pixels;
 #line 75 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp34_ > 0) {
-#line 1863 "MediaPage.c"
-		cairo_t* _tmp35_ = NULL;
-		cairo_t* _tmp36_ = NULL;
-		GdkPixbuf* _tmp37_ = NULL;
-		GdkPoint _tmp38_ = {0};
-		gint _tmp39_ = 0;
-		GdkPoint _tmp40_ = {0};
-		gint _tmp41_ = 0;
-		cairo_t* _tmp42_ = NULL;
-		GdkPoint _tmp43_ = {0};
-		gint _tmp44_ = 0;
-		GdkPoint _tmp45_ = {0};
-		gint _tmp46_ = 0;
-		GdkPixbuf* _tmp47_ = NULL;
-		gint _tmp48_ = 0;
-		gint _tmp49_ = 0;
-		cairo_t* _tmp50_ = NULL;
-		cairo_t* _tmp51_ = NULL;
-		GdkPixbuf* _tmp52_ = NULL;
-		GdkPoint _tmp53_ = {0};
-		gint _tmp54_ = 0;
-		GdkPoint _tmp55_ = {0};
-		gint _tmp56_ = 0;
-		cairo_t* _tmp57_ = NULL;
-		GdkPoint _tmp58_ = {0};
-		gint _tmp59_ = 0;
-		GdkPoint _tmp60_ = {0};
-		gint _tmp61_ = 0;
-		GdkPixbuf* _tmp62_ = NULL;
-		gint _tmp63_ = 0;
-		gint _tmp64_ = 0;
-		cairo_t* _tmp65_ = NULL;
-		cairo_t* _tmp66_ = NULL;
+#line 1868 "MediaPage.c"
+		cairo_t* _tmp35_;
+		cairo_t* _tmp36_;
+		GdkPixbuf* _tmp37_;
+		GdkPoint _tmp38_;
+		gint _tmp39_;
+		GdkPoint _tmp40_;
+		gint _tmp41_;
+		cairo_t* _tmp42_;
+		GdkPoint _tmp43_;
+		gint _tmp44_;
+		GdkPoint _tmp45_;
+		gint _tmp46_;
+		GdkPixbuf* _tmp47_;
+		gint _tmp48_;
+		gint _tmp49_;
+		cairo_t* _tmp50_;
+		cairo_t* _tmp51_;
+		GdkPixbuf* _tmp52_;
+		GdkPoint _tmp53_;
+		gint _tmp54_;
+		GdkPoint _tmp55_;
+		gint _tmp56_;
+		cairo_t* _tmp57_;
+		GdkPoint _tmp58_;
+		gint _tmp59_;
+		GdkPoint _tmp60_;
+		gint _tmp61_;
+		GdkPixbuf* _tmp62_;
+		gint _tmp63_;
+		gint _tmp64_;
+		cairo_t* _tmp65_;
+		cairo_t* _tmp66_;
 #line 76 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp35_ = ctx;
 #line 76 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -1972,27 +1977,27 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk
 		_tmp66_ = ctx;
 #line 90 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		cairo_restore (_tmp66_);
-#line 1976 "MediaPage.c"
+#line 1981 "MediaPage.c"
 	}
 }
 
 
 void media_source_item_set_enable_sprockets (MediaSourceItem* self, gboolean enable_sprockets) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 94 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_ITEM (self));
 #line 95 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = enable_sprockets;
 #line 95 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->enable_sprockets = _tmp0_;
-#line 1989 "MediaPage.c"
+#line 1994 "MediaPage.c"
 }
 
 
 void media_source_item_set_title (MediaSourceItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment) {
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	PangoAlignment _tmp2_ = 0;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
+	PangoAlignment _tmp2_;
 #line 98 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_ITEM (self));
 #line 98 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -2009,24 +2014,24 @@ void media_source_item_set_title (MediaSourceItem* self, const gchar* text, gboo
 	_g_free0 (self->priv->natural_collation_key);
 #line 101 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->natural_collation_key = NULL;
-#line 2013 "MediaPage.c"
+#line 2018 "MediaPage.c"
 }
 
 
 gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 104 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_ITEM (self), NULL);
 #line 105 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->natural_collation_key;
 #line 105 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ == NULL) {
-#line 2028 "MediaPage.c"
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
+#line 2033 "MediaPage.c"
+		gchar* _tmp1_;
+		gchar* _tmp2_;
 #line 106 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = checkerboard_item_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
 #line 106 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -2035,7 +2040,7 @@ gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self) {
 		_g_free0 (self->priv->natural_collation_key);
 #line 106 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		self->priv->natural_collation_key = _tmp2_;
-#line 2039 "MediaPage.c"
+#line 2044 "MediaPage.c"
 	}
 #line 108 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = self->priv->natural_collation_key;
@@ -2045,7 +2050,7 @@ gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self) {
 	result = _tmp4_;
 #line 108 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 2049 "MediaPage.c"
+#line 2054 "MediaPage.c"
 }
 
 
@@ -2055,10 +2060,10 @@ static void media_source_item_class_init (MediaSourceItemClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_type_class_add_private (klass, sizeof (MediaSourceItemPrivate));
 #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((CheckerboardItemClass *) klass)->paint_image = (void (*)(CheckerboardItem*, cairo_t*, GdkPixbuf*, GdkPoint*)) media_source_item_real_paint_image;
+	((CheckerboardItemClass *) klass)->paint_image = (void (*) (CheckerboardItem *, cairo_t*, GdkPixbuf*, GdkPoint*)) media_source_item_real_paint_image;
 #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = media_source_item_finalize;
-#line 2062 "MediaPage.c"
+#line 2067 "MediaPage.c"
 }
 
 
@@ -2069,11 +2074,11 @@ static void media_source_item_instance_init (MediaSourceItem * self) {
 	self->priv->enable_sprockets = FALSE;
 #line 12 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->natural_collation_key = NULL;
-#line 2073 "MediaPage.c"
+#line 2078 "MediaPage.c"
 }
 
 
-static void media_source_item_finalize (GObject* obj) {
+static void media_source_item_finalize (GObject * obj) {
 	MediaSourceItem * self;
 #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem);
@@ -2081,7 +2086,7 @@ static void media_source_item_finalize (GObject* obj) {
 	_g_free0 (self->priv->natural_collation_key);
 #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (media_source_item_parent_class)->finalize (obj);
-#line 2085 "MediaPage.c"
+#line 2090 "MediaPage.c"
 }
 
 
@@ -2112,254 +2117,254 @@ GType media_page_sort_by_get_type (void) {
 static void _media_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_export ((MediaPage*) self);
-#line 2116 "MediaPage.c"
+#line 2121 "MediaPage.c"
 }
 
 
 static void _media_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_send_to ((MediaPage*) self);
-#line 2123 "MediaPage.c"
+#line 2128 "MediaPage.c"
 }
 
 
 static void _media_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_remove_from_library ((MediaPage*) self);
-#line 2130 "MediaPage.c"
+#line 2135 "MediaPage.c"
 }
 
 
 static void _media_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_move_to_trash ((MediaPage*) self);
-#line 2137 "MediaPage.c"
+#line 2142 "MediaPage.c"
 }
 
 
 static void _media_page_on_new_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_new_event ((MediaPage*) self);
-#line 2144 "MediaPage.c"
+#line 2149 "MediaPage.c"
 }
 
 
 static void _media_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_add_tags ((MediaPage*) self);
-#line 2151 "MediaPage.c"
+#line 2156 "MediaPage.c"
 }
 
 
 static void _media_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_modify_tags ((MediaPage*) self);
-#line 2158 "MediaPage.c"
+#line 2163 "MediaPage.c"
 }
 
 
 static void _media_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_increase_size ((MediaPage*) self);
-#line 2165 "MediaPage.c"
+#line 2170 "MediaPage.c"
 }
 
 
 static void _media_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_decrease_size ((MediaPage*) self);
-#line 2172 "MediaPage.c"
+#line 2177 "MediaPage.c"
 }
 
 
 static void _media_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_flag_unflag ((MediaPage*) self);
-#line 2179 "MediaPage.c"
+#line 2184 "MediaPage.c"
 }
 
 
 static void _media_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_increase_rating ((MediaPage*) self);
-#line 2186 "MediaPage.c"
+#line 2191 "MediaPage.c"
 }
 
 
 static void _media_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_decrease_rating ((MediaPage*) self);
-#line 2193 "MediaPage.c"
+#line 2198 "MediaPage.c"
 }
 
 
 static void _media_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_rate_rejected ((MediaPage*) self);
-#line 2200 "MediaPage.c"
+#line 2205 "MediaPage.c"
 }
 
 
 static void _media_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_rate_unrated ((MediaPage*) self);
-#line 2207 "MediaPage.c"
+#line 2212 "MediaPage.c"
 }
 
 
 static void _media_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_rate_one ((MediaPage*) self);
-#line 2214 "MediaPage.c"
+#line 2219 "MediaPage.c"
 }
 
 
 static void _media_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_rate_two ((MediaPage*) self);
-#line 2221 "MediaPage.c"
+#line 2226 "MediaPage.c"
 }
 
 
 static void _media_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_rate_three ((MediaPage*) self);
-#line 2228 "MediaPage.c"
+#line 2233 "MediaPage.c"
 }
 
 
 static void _media_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_rate_four ((MediaPage*) self);
-#line 2235 "MediaPage.c"
+#line 2240 "MediaPage.c"
 }
 
 
 static void _media_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_rate_five ((MediaPage*) self);
-#line 2242 "MediaPage.c"
+#line 2247 "MediaPage.c"
 }
 
 
 static void _media_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_edit_title ((MediaPage*) self);
-#line 2249 "MediaPage.c"
+#line 2254 "MediaPage.c"
 }
 
 
 static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_edit_comment ((MediaPage*) self);
-#line 2256 "MediaPage.c"
+#line 2261 "MediaPage.c"
 }
 
 
 static void _media_page_on_play_video_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_play_video ((MediaPage*) self);
-#line 2263 "MediaPage.c"
+#line 2268 "MediaPage.c"
 }
 
 
 static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_on_action_toggle ((Page*) self, action, parameter);
-#line 2270 "MediaPage.c"
+#line 2275 "MediaPage.c"
 }
 
 
 static void _media_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_display_titles ((MediaPage*) self, action, value);
-#line 2277 "MediaPage.c"
+#line 2282 "MediaPage.c"
 }
 
 
 static void _media_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_display_comments ((MediaPage*) self, action, value);
-#line 2284 "MediaPage.c"
+#line 2289 "MediaPage.c"
 }
 
 
 static void _media_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_display_ratings ((MediaPage*) self, action, value);
-#line 2291 "MediaPage.c"
+#line 2296 "MediaPage.c"
 }
 
 
 static void _media_page_on_display_tags_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_display_tags ((MediaPage*) self, action, value);
-#line 2298 "MediaPage.c"
+#line 2303 "MediaPage.c"
 }
 
 
 static void _page_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_on_action_radio ((Page*) self, action, parameter);
-#line 2305 "MediaPage.c"
+#line 2310 "MediaPage.c"
 }
 
 
 static void _media_page_on_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_sort_changed ((MediaPage*) self, action, value);
-#line 2312 "MediaPage.c"
+#line 2317 "MediaPage.c"
 }
 
 
 static void _media_page_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 252 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_media_altered ((MediaPage*) self, items);
-#line 2319 "MediaPage.c"
+#line 2324 "MediaPage.c"
 }
 
 
 MediaPage* media_page_construct (GType object_type, const gchar* page_name) {
 	MediaPage * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	MediaViewTracker* _tmp3_ = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	ViewCollection* _tmp8_ = NULL;
-	ViewCollection* _tmp9_ = NULL;
-	ConfigFacade* _tmp10_ = NULL;
-	ConfigFacade* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	const gchar* _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	MediaViewTracker* _tmp3_;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
+	ViewCollection* _tmp8_;
+	ViewCollection* _tmp9_;
+	ConfigFacade* _tmp10_;
+	ConfigFacade* _tmp11_;
+	gboolean _tmp12_;
 	GValue _tmp13_ = {0};
-	ViewCollection* _tmp14_ = NULL;
-	ViewCollection* _tmp15_ = NULL;
-	ConfigFacade* _tmp16_ = NULL;
-	ConfigFacade* _tmp17_ = NULL;
-	gboolean _tmp18_ = FALSE;
+	ViewCollection* _tmp14_;
+	ViewCollection* _tmp15_;
+	ConfigFacade* _tmp16_;
+	ConfigFacade* _tmp17_;
+	gboolean _tmp18_;
 	GValue _tmp19_ = {0};
-	ViewCollection* _tmp20_ = NULL;
-	ViewCollection* _tmp21_ = NULL;
-	ConfigFacade* _tmp22_ = NULL;
-	ConfigFacade* _tmp23_ = NULL;
-	gboolean _tmp24_ = FALSE;
+	ViewCollection* _tmp20_;
+	ViewCollection* _tmp21_;
+	ConfigFacade* _tmp22_;
+	ConfigFacade* _tmp23_;
+	gboolean _tmp24_;
 	GValue _tmp25_ = {0};
-	ViewCollection* _tmp26_ = NULL;
-	ViewCollection* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
+	ViewCollection* _tmp26_;
+	ViewCollection* _tmp27_;
+	gint _tmp28_;
 	GValue _tmp29_ = {0};
-	ViewCollection* _tmp30_ = NULL;
-	ViewCollection* _tmp31_ = NULL;
-	ConfigFacade* _tmp32_ = NULL;
-	ConfigFacade* _tmp33_ = NULL;
-	gboolean _tmp34_ = FALSE;
+	ViewCollection* _tmp30_;
+	ViewCollection* _tmp31_;
+	ConfigFacade* _tmp32_;
+	ConfigFacade* _tmp33_;
+	gboolean _tmp34_;
 	GValue _tmp35_ = {0};
-	ViewCollection* _tmp36_ = NULL;
-	ViewCollection* _tmp37_ = NULL;
-	DragAndDropHandler* _tmp38_ = NULL;
+	ViewCollection* _tmp36_;
+	ViewCollection* _tmp37_;
+	DragAndDropHandler* _tmp38_;
 #line 247 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
 #line 248 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -2514,19 +2519,19 @@ MediaPage* media_page_construct (GType object_type, const gchar* page_name) {
 	self->priv->dnd_handler = _tmp38_;
 #line 247 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self;
-#line 2518 "MediaPage.c"
+#line 2523 "MediaPage.c"
 }
 
 
 static gint media_page_compute_zoom_scale_increase (gint current_scale) {
 	gint result = 0;
 	gint new_scale = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 271 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = current_scale;
 #line 271 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -2545,19 +2550,19 @@ static gint media_page_compute_zoom_scale_increase (gint current_scale) {
 	result = _tmp5_;
 #line 272 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 2549 "MediaPage.c"
+#line 2554 "MediaPage.c"
 }
 
 
 static gint media_page_compute_zoom_scale_decrease (gint current_scale) {
 	gint result = 0;
 	gint new_scale = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 276 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = current_scale;
 #line 276 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -2576,14 +2581,14 @@ static gint media_page_compute_zoom_scale_decrease (gint current_scale) {
 	result = _tmp5_;
 #line 277 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 2580 "MediaPage.c"
+#line 2585 "MediaPage.c"
 }
 
 
 static void media_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	MediaPage * self;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
 #line 280 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 280 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -2596,122 +2601,122 @@ static void media_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_f
 	_tmp1_ = ui_filenames;
 #line 283 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "media.ui");
-#line 2600 "MediaPage.c"
+#line 2605 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new23 (gboolean value) {
 #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2607 "MediaPage.c"
+#line 2612 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new24 (gboolean value) {
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2614 "MediaPage.c"
+#line 2619 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new25 (gboolean value) {
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2621 "MediaPage.c"
+#line 2626 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new26 (gboolean value) {
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2628 "MediaPage.c"
+#line 2633 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new27 (gchar* value) {
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 2635 "MediaPage.c"
+#line 2640 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new28 (const gchar* value) {
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 2642 "MediaPage.c"
+#line 2647 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new29 (const gchar* value) {
 #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 2649 "MediaPage.c"
+#line 2654 "MediaPage.c"
 }
 
 
 static void _media_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) {
 #line 341 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_raw_developer_changed ((MediaPage*) self, _sender, value);
-#line 2656 "MediaPage.c"
+#line 2661 "MediaPage.c"
 }
 
 
 static void media_page_real_add_actions (Page* base, GActionMap* map) {
 	MediaPage * self;
-	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp0_;
 	gboolean sort_order = FALSE;
 	gint sort_by = 0;
 	gboolean _tmp1_ = FALSE;
 	gint _tmp2_ = 0;
-	GActionMap* _tmp3_ = NULL;
-	GAction* _tmp4_ = NULL;
-	GAction* _tmp5_ = NULL;
-	ConfigFacade* _tmp6_ = NULL;
-	ConfigFacade* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
-	GVariant* _tmp9_ = NULL;
-	GAction* _tmp10_ = NULL;
-	GAction* _tmp11_ = NULL;
-	ConfigFacade* _tmp12_ = NULL;
-	ConfigFacade* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
-	GVariant* _tmp15_ = NULL;
-	GAction* _tmp16_ = NULL;
-	GAction* _tmp17_ = NULL;
-	ConfigFacade* _tmp18_ = NULL;
-	ConfigFacade* _tmp19_ = NULL;
-	gboolean _tmp20_ = FALSE;
-	GVariant* _tmp21_ = NULL;
-	GAction* _tmp22_ = NULL;
-	GAction* _tmp23_ = NULL;
-	ConfigFacade* _tmp24_ = NULL;
-	ConfigFacade* _tmp25_ = NULL;
-	gboolean _tmp26_ = FALSE;
-	GVariant* _tmp27_ = NULL;
-	GAction* _tmp28_ = NULL;
-	GAction* _tmp29_ = NULL;
-	gint _tmp30_ = 0;
-	gchar* _tmp31_ = NULL;
-	gchar* _tmp32_ = NULL;
-	GVariant* _tmp33_ = NULL;
+	GActionMap* _tmp3_;
+	GAction* _tmp4_;
+	GAction* _tmp5_;
+	ConfigFacade* _tmp6_;
+	ConfigFacade* _tmp7_;
+	gboolean _tmp8_;
+	GVariant* _tmp9_;
+	GAction* _tmp10_;
+	GAction* _tmp11_;
+	ConfigFacade* _tmp12_;
+	ConfigFacade* _tmp13_;
+	gboolean _tmp14_;
+	GVariant* _tmp15_;
+	GAction* _tmp16_;
+	GAction* _tmp17_;
+	ConfigFacade* _tmp18_;
+	ConfigFacade* _tmp19_;
+	gboolean _tmp20_;
+	GVariant* _tmp21_;
+	GAction* _tmp22_;
+	GAction* _tmp23_;
+	ConfigFacade* _tmp24_;
+	ConfigFacade* _tmp25_;
+	gboolean _tmp26_;
+	GVariant* _tmp27_;
+	GAction* _tmp28_;
+	GAction* _tmp29_;
+	gint _tmp30_;
+	gchar* _tmp31_;
+	gchar* _tmp32_;
+	GVariant* _tmp33_;
 	const gchar* _tmp34_ = NULL;
-	gboolean _tmp35_ = FALSE;
-	GAction* _tmp36_ = NULL;
-	GAction* _tmp37_ = NULL;
-	GVariant* _tmp38_ = NULL;
+	gboolean _tmp35_;
+	GAction* _tmp36_;
+	GAction* _tmp37_;
+	GVariant* _tmp38_;
 	RawDeveloper d = 0;
-	ConfigFacade* _tmp39_ = NULL;
-	ConfigFacade* _tmp40_ = NULL;
-	RawDeveloper _tmp41_ = 0;
-	RawDeveloper _tmp42_ = 0;
+	ConfigFacade* _tmp39_;
+	ConfigFacade* _tmp40_;
+	RawDeveloper _tmp41_;
+	RawDeveloper _tmp42_;
 	const gchar* _tmp43_ = NULL;
-	RawDeveloper _tmp44_ = 0;
+	RawDeveloper _tmp44_;
 	GSimpleAction* action = NULL;
-	const GVariantType* _tmp45_ = NULL;
-	GVariant* _tmp46_ = NULL;
-	GSimpleAction* _tmp47_ = NULL;
-	GSimpleAction* _tmp48_ = NULL;
-	GActionMap* _tmp49_ = NULL;
+	const GVariantType* _tmp45_;
+	GVariant* _tmp46_;
+	GSimpleAction* _tmp47_;
+	GSimpleAction* _tmp48_;
+	GActionMap* _tmp49_;
 #line 323 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 323 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -2836,11 +2841,11 @@ static void media_page_real_add_actions (Page* base, GActionMap* map) {
 	if (_tmp35_) {
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp34_ = "ascending";
-#line 2840 "MediaPage.c"
+#line 2845 "MediaPage.c"
 	} else {
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp34_ = "descending";
-#line 2844 "MediaPage.c"
+#line 2849 "MediaPage.c"
 	}
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp36_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Sort");
@@ -2872,11 +2877,11 @@ static void media_page_real_add_actions (Page* base, GActionMap* map) {
 	if (_tmp44_ == RAW_DEVELOPER_SHOTWELL) {
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp43_ = "Shotwell";
-#line 2876 "MediaPage.c"
+#line 2881 "MediaPage.c"
 	} else {
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp43_ = "Camera";
-#line 2880 "MediaPage.c"
+#line 2885 "MediaPage.c"
 	}
 #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp45_ = G_VARIANT_TYPE_STRING;
@@ -2900,13 +2905,13 @@ static void media_page_real_add_actions (Page* base, GActionMap* map) {
 	g_action_map_add_action (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction));
 #line 323 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (action);
-#line 2904 "MediaPage.c"
+#line 2909 "MediaPage.c"
 }
 
 
 static void media_page_real_remove_actions (Page* base, GActionMap* map) {
 	MediaPage * self;
-	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp0_;
 #line 346 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 346 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -2915,7 +2920,7 @@ static void media_page_real_remove_actions (Page* base, GActionMap* map) {
 	_tmp0_ = map;
 #line 347 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	PAGE_CLASS (media_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 2919 "MediaPage.c"
+#line 2924 "MediaPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -2927,15 +2932,15 @@ static void media_page_real_remove_actions (Page* base, GActionMap* map) {
 		entry_collection_length1 = G_N_ELEMENTS (MEDIA_PAGE_entries);
 #line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (MEDIA_PAGE_entries); entry_it = entry_it + 1) {
-#line 2931 "MediaPage.c"
+#line 2936 "MediaPage.c"
 			GActionEntry entry = {0};
 #line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			entry = entry_collection[entry_it];
-#line 2935 "MediaPage.c"
+#line 2940 "MediaPage.c"
 			{
-				GActionMap* _tmp1_ = NULL;
-				GActionEntry _tmp2_ = {0};
-				const gchar* _tmp3_ = NULL;
+				GActionMap* _tmp1_;
+				GActionEntry _tmp2_;
+				const gchar* _tmp3_;
 #line 349 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp1_ = map;
 #line 349 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -2944,7 +2949,7 @@ static void media_page_real_remove_actions (Page* base, GActionMap* map) {
 				_tmp3_ = _tmp2_.name;
 #line 349 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 2948 "MediaPage.c"
+#line 2953 "MediaPage.c"
 			}
 		}
 	}
@@ -2953,24 +2958,24 @@ static void media_page_real_remove_actions (Page* base, GActionMap* map) {
 
 static void media_page_real_update_actions (Page* base, gint selected_count, gint count) {
 	MediaPage * self;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	gboolean _tmp11_ = FALSE;
-	gint _tmp13_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	gboolean _tmp11_;
+	gint _tmp13_;
 	gboolean _tmp14_ = FALSE;
-	gint _tmp15_ = 0;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	gint _tmp22_ = 0;
+	gint _tmp15_;
+	gint _tmp20_;
+	gint _tmp21_;
+	gint _tmp22_;
 #line 353 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 354 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3013,17 +3018,17 @@ static void media_page_real_update_actions (Page* base, gint selected_count, gin
 	_tmp11_ = desktop_integration_is_send_to_installed ();
 #line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp11_) {
-#line 3017 "MediaPage.c"
-		gint _tmp12_ = 0;
+#line 3022 "MediaPage.c"
+		gint _tmp12_;
 #line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = selected_count;
 #line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", _tmp12_ > 0);
-#line 3023 "MediaPage.c"
+#line 3028 "MediaPage.c"
 	} else {
 #line 365 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", FALSE);
-#line 3027 "MediaPage.c"
+#line 3032 "MediaPage.c"
 	}
 #line 367 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = selected_count;
@@ -3037,11 +3042,11 @@ static void media_page_real_update_actions (Page* base, gint selected_count, gin
 	_tmp15_ = selected_count;
 #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp15_ == 1) {
-#line 3041 "MediaPage.c"
-		ViewCollection* _tmp16_ = NULL;
-		ViewCollection* _tmp17_ = NULL;
-		DataSource* _tmp18_ = NULL;
-		DataSource* _tmp19_ = NULL;
+#line 3046 "MediaPage.c"
+		ViewCollection* _tmp16_;
+		ViewCollection* _tmp17_;
+		DataSource* _tmp18_;
+		DataSource* _tmp19_;
 #line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3056,11 +3061,11 @@ static void media_page_real_update_actions (Page* base, gint selected_count, gin
 		_g_object_unref0 (_tmp19_);
 #line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 3060 "MediaPage.c"
+#line 3065 "MediaPage.c"
 	} else {
 #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp14_ = FALSE;
-#line 3064 "MediaPage.c"
+#line 3069 "MediaPage.c"
 	}
 #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PlayVideo", _tmp14_);
@@ -3074,7 +3079,7 @@ static void media_page_real_update_actions (Page* base, gint selected_count, gin
 	_tmp22_ = count;
 #line 377 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	PAGE_CLASS (media_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp21_, _tmp22_);
-#line 3078 "MediaPage.c"
+#line 3083 "MediaPage.c"
 }
 
 
@@ -3083,15 +3088,15 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 3087 "MediaPage.c"
+#line 3092 "MediaPage.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = altered;
 #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3110,18 +3115,18 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
 		_object_it = _tmp5_;
 #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3114 "MediaPage.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 3119 "MediaPage.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			GeeMap* _tmp10_ = NULL;
-			DataObject* _tmp11_ = NULL;
-			gpointer _tmp12_ = NULL;
-			Alteration* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
-			gboolean _tmp15_ = FALSE;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			GeeMap* _tmp10_;
+			DataObject* _tmp11_;
+			gpointer _tmp12_;
+			Alteration* _tmp13_;
+			gboolean _tmp14_;
+			gboolean _tmp15_;
 #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp6_ = _object_it;
 #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3130,7 +3135,7 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
 			if (!_tmp7_) {
 #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3134 "MediaPage.c"
+#line 3139 "MediaPage.c"
 			}
 #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = _object_it;
@@ -3154,10 +3159,10 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
 			_alteration_unref0 (_tmp13_);
 #line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp15_) {
-#line 3158 "MediaPage.c"
-				ViewCollection* _tmp16_ = NULL;
-				ViewCollection* _tmp17_ = NULL;
-				gint _tmp18_ = 0;
+#line 3163 "MediaPage.c"
+				ViewCollection* _tmp16_;
+				ViewCollection* _tmp17_;
+				gint _tmp18_;
 #line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3172,29 +3177,29 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
 				_g_object_unref0 (object);
 #line 385 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3176 "MediaPage.c"
+#line 3181 "MediaPage.c"
 			}
 #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (object);
-#line 3180 "MediaPage.c"
+#line 3185 "MediaPage.c"
 		}
 #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_object_it);
-#line 3184 "MediaPage.c"
+#line 3189 "MediaPage.c"
 	}
 }
 
 
 static void media_page_update_rating_sensitivities (MediaPage* self) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-	gboolean _tmp8_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp7_;
+	gboolean _tmp8_;
 #line 390 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 391 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3233,20 +3238,20 @@ static void media_page_update_rating_sensitivities (MediaPage* self) {
 	_tmp8_ = media_page_can_decrease_selected_rating (self);
 #line 399 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp8_);
-#line 3237 "MediaPage.c"
+#line 3242 "MediaPage.c"
 }
 
 
 static void media_page_update_development_menu_item_sensitivity (MediaPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	GeeList* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gboolean _tmp6_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	GeeList* _tmp2_;
+	GeeList* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gboolean _tmp6_;
 	gboolean is_raw = FALSE;
-	gboolean _tmp27_ = FALSE;
+	gboolean _tmp27_;
 #line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3273,21 +3278,21 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", FALSE);
 #line 405 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 3277 "MediaPage.c"
+#line 3282 "MediaPage.c"
 	}
 #line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	is_raw = FALSE;
-#line 3281 "MediaPage.c"
+#line 3286 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
-		ViewCollection* _tmp7_ = NULL;
-		ViewCollection* _tmp8_ = NULL;
-		GeeList* _tmp9_ = NULL;
-		GeeList* _tmp10_ = NULL;
+		ViewCollection* _tmp7_;
+		ViewCollection* _tmp8_;
+		GeeList* _tmp9_;
+		GeeList* _tmp10_;
 		gint _view_size = 0;
-		GeeList* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
+		GeeList* _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
 		gint _view_index = 0;
 #line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -3313,20 +3318,20 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 		_view_index = -1;
 #line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3317 "MediaPage.c"
-			gint _tmp14_ = 0;
-			gint _tmp15_ = 0;
-			gint _tmp16_ = 0;
+#line 3322 "MediaPage.c"
+			gint _tmp14_;
+			gint _tmp15_;
+			gint _tmp16_;
 			DataView* view = NULL;
-			GeeList* _tmp17_ = NULL;
-			gint _tmp18_ = 0;
-			gpointer _tmp19_ = NULL;
+			GeeList* _tmp17_;
+			gint _tmp18_;
+			gpointer _tmp19_;
 			Photo* photo = NULL;
-			DataView* _tmp20_ = NULL;
-			MediaSource* _tmp21_ = NULL;
-			Photo* _tmp22_ = NULL;
+			DataView* _tmp20_;
+			MediaSource* _tmp21_;
+			Photo* _tmp22_;
 			gboolean _tmp23_ = FALSE;
-			Photo* _tmp24_ = NULL;
+			Photo* _tmp24_;
 #line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = _view_index;
 #line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3339,7 +3344,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 			if (!(_tmp15_ < _tmp16_)) {
 #line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3343 "MediaPage.c"
+#line 3348 "MediaPage.c"
 			}
 #line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = _view_list;
@@ -3359,7 +3364,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 			if (_tmp22_ == NULL) {
 #line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_tmp21_);
-#line 3363 "MediaPage.c"
+#line 3368 "MediaPage.c"
 			}
 #line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			photo = _tmp22_;
@@ -3367,20 +3372,20 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 			_tmp24_ = photo;
 #line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp24_ != NULL) {
-#line 3371 "MediaPage.c"
-				Photo* _tmp25_ = NULL;
-				PhotoFileFormat _tmp26_ = 0;
+#line 3376 "MediaPage.c"
+				Photo* _tmp25_;
+				PhotoFileFormat _tmp26_;
 #line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp25_ = photo;
 #line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp26_ = photo_get_master_file_format (_tmp25_);
 #line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp23_ = _tmp26_ == PHOTO_FILE_FORMAT_RAW;
-#line 3380 "MediaPage.c"
+#line 3385 "MediaPage.c"
 			} else {
 #line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp23_ = FALSE;
-#line 3384 "MediaPage.c"
+#line 3389 "MediaPage.c"
 			}
 #line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp23_) {
@@ -3392,50 +3397,50 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 				_g_object_unref0 (view);
 #line 415 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3396 "MediaPage.c"
+#line 3401 "MediaPage.c"
 			}
 #line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (photo);
 #line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3402 "MediaPage.c"
+#line 3407 "MediaPage.c"
 		}
 #line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3406 "MediaPage.c"
+#line 3411 "MediaPage.c"
 	}
 #line 420 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp27_ = is_raw;
 #line 420 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp27_);
-#line 3412 "MediaPage.c"
+#line 3417 "MediaPage.c"
 }
 
 
 static void media_page_update_flag_action (MediaPage* self, gint selected_count) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 424 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = selected_count;
 #line 424 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_ > 0);
-#line 3424 "MediaPage.c"
+#line 3429 "MediaPage.c"
 }
 
 
 static gpointer _core_tracker_ref0 (gpointer self) {
 #line 428 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 3431 "MediaPage.c"
+#line 3436 "MediaPage.c"
 }
 
 
 static CoreViewTracker* media_page_real_get_view_tracker (CheckerboardPage* base) {
 	MediaPage * self;
 	CoreViewTracker* result = NULL;
-	MediaViewTracker* _tmp0_ = NULL;
-	CoreViewTracker* _tmp1_ = NULL;
+	MediaViewTracker* _tmp0_;
+	CoreViewTracker* _tmp1_;
 #line 427 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 428 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3446,20 +3451,20 @@ static CoreViewTracker* media_page_real_get_view_tracker (CheckerboardPage* base
 	result = _tmp1_;
 #line 428 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3450 "MediaPage.c"
+#line 3455 "MediaPage.c"
 }
 
 
 void media_page_set_display_ratings (MediaPage* self, gboolean display) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
+	gboolean _tmp4_;
 	GValue _tmp5_ = {0};
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
+	gboolean _tmp8_;
 #line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3498,7 +3503,7 @@ void media_page_set_display_ratings (MediaPage* self, gboolean display) {
 	_tmp8_ = display;
 #line 436 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings", _tmp8_);
-#line 3502 "MediaPage.c"
+#line 3507 "MediaPage.c"
 }
 
 
@@ -3506,17 +3511,17 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 	gboolean result = FALSE;
 #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 3510 "MediaPage.c"
+#line 3515 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
-		ViewCollection* _tmp0_ = NULL;
-		ViewCollection* _tmp1_ = NULL;
-		GeeList* _tmp2_ = NULL;
-		GeeList* _tmp3_ = NULL;
+		ViewCollection* _tmp0_;
+		ViewCollection* _tmp1_;
+		GeeList* _tmp2_;
+		GeeList* _tmp3_;
 		gint _view_size = 0;
-		GeeList* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+		GeeList* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 		gint _view_index = 0;
 #line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -3542,20 +3547,20 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 		_view_index = -1;
 #line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3546 "MediaPage.c"
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
+#line 3551 "MediaPage.c"
+			gint _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
 			DataView* view = NULL;
-			GeeList* _tmp10_ = NULL;
-			gint _tmp11_ = 0;
-			gpointer _tmp12_ = NULL;
-			DataView* _tmp13_ = NULL;
-			MediaSource* _tmp14_ = NULL;
-			MediaSource* _tmp15_ = NULL;
-			Rating _tmp16_ = 0;
-			Rating _tmp17_ = 0;
-			gboolean _tmp18_ = FALSE;
+			GeeList* _tmp10_;
+			gint _tmp11_;
+			gpointer _tmp12_;
+			DataView* _tmp13_;
+			MediaSource* _tmp14_;
+			MediaSource* _tmp15_;
+			Rating _tmp16_;
+			Rating _tmp17_;
+			gboolean _tmp18_;
 #line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _view_index;
 #line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3568,7 +3573,7 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 			if (!(_tmp8_ < _tmp9_)) {
 #line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3572 "MediaPage.c"
+#line 3577 "MediaPage.c"
 			}
 #line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
@@ -3602,21 +3607,21 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 				_g_object_unref0 (_view_list);
 #line 442 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 3606 "MediaPage.c"
+#line 3611 "MediaPage.c"
 			}
 #line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3610 "MediaPage.c"
+#line 3615 "MediaPage.c"
 		}
 #line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3614 "MediaPage.c"
+#line 3619 "MediaPage.c"
 	}
 #line 445 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
 #line 445 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3620 "MediaPage.c"
+#line 3625 "MediaPage.c"
 }
 
 
@@ -3624,17 +3629,17 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 	gboolean result = FALSE;
 #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 3628 "MediaPage.c"
+#line 3633 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
-		ViewCollection* _tmp0_ = NULL;
-		ViewCollection* _tmp1_ = NULL;
-		GeeList* _tmp2_ = NULL;
-		GeeList* _tmp3_ = NULL;
+		ViewCollection* _tmp0_;
+		ViewCollection* _tmp1_;
+		GeeList* _tmp2_;
+		GeeList* _tmp3_;
 		gint _view_size = 0;
-		GeeList* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+		GeeList* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 		gint _view_index = 0;
 #line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -3660,20 +3665,20 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 		_view_index = -1;
 #line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3664 "MediaPage.c"
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
+#line 3669 "MediaPage.c"
+			gint _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
 			DataView* view = NULL;
-			GeeList* _tmp10_ = NULL;
-			gint _tmp11_ = 0;
-			gpointer _tmp12_ = NULL;
-			DataView* _tmp13_ = NULL;
-			MediaSource* _tmp14_ = NULL;
-			MediaSource* _tmp15_ = NULL;
-			Rating _tmp16_ = 0;
-			gboolean _tmp17_ = FALSE;
-			gboolean _tmp18_ = FALSE;
+			GeeList* _tmp10_;
+			gint _tmp11_;
+			gpointer _tmp12_;
+			DataView* _tmp13_;
+			MediaSource* _tmp14_;
+			MediaSource* _tmp15_;
+			Rating _tmp16_;
+			gboolean _tmp17_;
+			gboolean _tmp18_;
 #line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _view_index;
 #line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3686,7 +3691,7 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 			if (!(_tmp8_ < _tmp9_)) {
 #line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3690 "MediaPage.c"
+#line 3695 "MediaPage.c"
 			}
 #line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
@@ -3720,21 +3725,21 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 				_g_object_unref0 (_view_list);
 #line 451 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 3724 "MediaPage.c"
+#line 3729 "MediaPage.c"
 			}
 #line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3728 "MediaPage.c"
+#line 3733 "MediaPage.c"
 		}
 #line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3732 "MediaPage.c"
+#line 3737 "MediaPage.c"
 	}
 #line 454 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
 #line 454 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3738 "MediaPage.c"
+#line 3743 "MediaPage.c"
 }
 
 
@@ -3742,17 +3747,17 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 	gboolean result = FALSE;
 #line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 3746 "MediaPage.c"
+#line 3751 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
-		ViewCollection* _tmp0_ = NULL;
-		ViewCollection* _tmp1_ = NULL;
-		GeeList* _tmp2_ = NULL;
-		GeeList* _tmp3_ = NULL;
+		ViewCollection* _tmp0_;
+		ViewCollection* _tmp1_;
+		GeeList* _tmp2_;
+		GeeList* _tmp3_;
 		gint _view_size = 0;
-		GeeList* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+		GeeList* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 		gint _view_index = 0;
 #line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -3778,20 +3783,20 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 		_view_index = -1;
 #line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3782 "MediaPage.c"
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
+#line 3787 "MediaPage.c"
+			gint _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
 			DataView* view = NULL;
-			GeeList* _tmp10_ = NULL;
-			gint _tmp11_ = 0;
-			gpointer _tmp12_ = NULL;
-			DataView* _tmp13_ = NULL;
-			MediaSource* _tmp14_ = NULL;
-			MediaSource* _tmp15_ = NULL;
-			Rating _tmp16_ = 0;
-			gboolean _tmp17_ = FALSE;
-			gboolean _tmp18_ = FALSE;
+			GeeList* _tmp10_;
+			gint _tmp11_;
+			gpointer _tmp12_;
+			DataView* _tmp13_;
+			MediaSource* _tmp14_;
+			MediaSource* _tmp15_;
+			Rating _tmp16_;
+			gboolean _tmp17_;
+			gboolean _tmp18_;
 #line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _view_index;
 #line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3804,7 +3809,7 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 			if (!(_tmp8_ < _tmp9_)) {
 #line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3808 "MediaPage.c"
+#line 3813 "MediaPage.c"
 			}
 #line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
@@ -3838,27 +3843,27 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 				_g_object_unref0 (_view_list);
 #line 460 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 3842 "MediaPage.c"
+#line 3847 "MediaPage.c"
 			}
 #line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3846 "MediaPage.c"
+#line 3851 "MediaPage.c"
 		}
 #line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3850 "MediaPage.c"
+#line 3855 "MediaPage.c"
 	}
 #line 463 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
 #line 463 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3856 "MediaPage.c"
+#line 3861 "MediaPage.c"
 }
 
 
 MediaPageZoomSliderAssembly* media_page_create_zoom_slider_assembly (MediaPage* self) {
 	MediaPageZoomSliderAssembly* result = NULL;
-	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
+	MediaPageZoomSliderAssembly* _tmp0_;
 #line 466 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
 #line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3869,15 +3874,15 @@ MediaPageZoomSliderAssembly* media_page_create_zoom_slider_assembly (MediaPage*
 	result = _tmp0_;
 #line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3873 "MediaPage.c"
+#line 3878 "MediaPage.c"
 }
 
 
 static gboolean media_page_real_on_mousewheel_up (Page* base, GdkEventScroll* event) {
 	MediaPage * self;
 	gboolean result = FALSE;
-	GdkEventScroll* _tmp0_ = NULL;
-	GdkModifierType _tmp1_ = 0;
+	GdkEventScroll* _tmp0_;
+	GdkModifierType _tmp1_;
 #line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3894,10 +3899,10 @@ static gboolean media_page_real_on_mousewheel_up (Page* base, GdkEventScroll* ev
 		result = TRUE;
 #line 473 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3898 "MediaPage.c"
+#line 3903 "MediaPage.c"
 	} else {
-		GdkEventScroll* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+		GdkEventScroll* _tmp2_;
+		gboolean _tmp3_;
 #line 475 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = event;
 #line 475 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3906,7 +3911,7 @@ static gboolean media_page_real_on_mousewheel_up (Page* base, GdkEventScroll* ev
 		result = _tmp3_;
 #line 475 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3910 "MediaPage.c"
+#line 3915 "MediaPage.c"
 	}
 }
 
@@ -3914,8 +3919,8 @@ static gboolean media_page_real_on_mousewheel_up (Page* base, GdkEventScroll* ev
 static gboolean media_page_real_on_mousewheel_down (Page* base, GdkEventScroll* event) {
 	MediaPage * self;
 	gboolean result = FALSE;
-	GdkEventScroll* _tmp0_ = NULL;
-	GdkModifierType _tmp1_ = 0;
+	GdkEventScroll* _tmp0_;
+	GdkModifierType _tmp1_;
 #line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3932,10 +3937,10 @@ static gboolean media_page_real_on_mousewheel_down (Page* base, GdkEventScroll*
 		result = TRUE;
 #line 482 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3936 "MediaPage.c"
+#line 3941 "MediaPage.c"
 	} else {
-		GdkEventScroll* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+		GdkEventScroll* _tmp2_;
+		gboolean _tmp3_;
 #line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = event;
 #line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3944,16 +3949,16 @@ static gboolean media_page_real_on_mousewheel_down (Page* base, GdkEventScroll*
 		result = _tmp3_;
 #line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3948 "MediaPage.c"
+#line 3953 "MediaPage.c"
 	}
 }
 
 
 static void media_page_on_send_to (MediaPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	GeeList* _tmp2_;
+	GeeCollection* _tmp3_;
 #line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 489 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3970,24 +3975,24 @@ static void media_page_on_send_to (MediaPage* self) {
 	_g_object_unref0 (_tmp3_);
 #line 489 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 3974 "MediaPage.c"
+#line 3979 "MediaPage.c"
 }
 
 
 void media_page_on_play_video (MediaPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	Video* video = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	DataView* _tmp6_ = NULL;
-	DataView* _tmp7_ = NULL;
-	DataSource* _tmp8_ = NULL;
-	Video* _tmp9_ = NULL;
-	Video* _tmp10_ = NULL;
-	Video* _tmp11_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	DataView* _tmp6_;
+	DataView* _tmp7_;
+	DataSource* _tmp8_;
+	Video* _tmp9_;
+	Video* _tmp10_;
+	Video* _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
@@ -4005,7 +4010,7 @@ void media_page_on_play_video (MediaPage* self) {
 	if (_tmp3_) {
 #line 494 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4009 "MediaPage.c"
+#line 4014 "MediaPage.c"
 	}
 #line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -4023,7 +4028,7 @@ void media_page_on_play_video (MediaPage* self) {
 	if (_tmp9_ == NULL) {
 #line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 4027 "MediaPage.c"
+#line 4032 "MediaPage.c"
 	}
 #line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = _tmp9_;
@@ -4041,14 +4046,14 @@ void media_page_on_play_video (MediaPage* self) {
 		_g_object_unref0 (video);
 #line 498 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4045 "MediaPage.c"
+#line 4050 "MediaPage.c"
 	}
 	{
-		Video* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		GFile* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
+		Video* _tmp12_;
+		GFile* _tmp13_;
+		GFile* _tmp14_;
+		gchar* _tmp15_;
+		gchar* _tmp16_;
 #line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = video;
 #line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4067,42 +4072,39 @@ void media_page_on_play_video (MediaPage* self) {
 		_g_object_unref0 (_tmp14_);
 #line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4071 "MediaPage.c"
-			goto __catch560_g_error;
+#line 4076 "MediaPage.c"
+			goto __catch561_g_error;
 		}
 	}
-	goto __finally560;
-	__catch560_g_error:
+	goto __finally561;
+	__catch561_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp17_ = NULL;
-		GError* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
+		GError* _tmp17_;
+		const gchar* _tmp18_;
+		gchar* _tmp19_;
+		gchar* _tmp20_;
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		e = _inner_error_;
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_inner_error_ = NULL;
 #line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp17_ = _ ("Shotwell was unable to play the selected video:\n%s");
-#line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp18_ = e;
+		_tmp17_ = e;
 #line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp19_ = _tmp18_->message;
+		_tmp18_ = _tmp17_->message;
 #line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp20_ = g_strdup_printf (_tmp17_, _tmp19_);
+		_tmp19_ = g_strdup_printf (_ ("Shotwell was unable to play the selected video:\n%s"), _tmp18_);
 #line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp21_ = _tmp20_;
+		_tmp20_ = _tmp19_;
 #line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		app_window_error_message (_tmp21_, NULL);
+		app_window_error_message (_tmp20_, NULL);
 #line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_free0 (_tmp21_);
+		_g_free0 (_tmp20_);
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_error_free0 (e);
-#line 4104 "MediaPage.c"
+#line 4106 "MediaPage.c"
 	}
-	__finally560:
+	__finally561:
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4113,11 +4115,11 @@ void media_page_on_play_video (MediaPage* self) {
 		g_clear_error (&_inner_error_);
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4117 "MediaPage.c"
+#line 4119 "MediaPage.c"
 	}
 #line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (video);
-#line 4121 "MediaPage.c"
+#line 4123 "MediaPage.c"
 }
 
 
@@ -4125,10 +4127,10 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 	MediaPage * self;
 	gboolean result = FALSE;
 	gboolean handled = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	GdkEventKey* _tmp0_;
+	guint _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
 	GQuark _tmp5_ = 0U;
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label0 = 0;
@@ -4178,9 +4180,9 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 	static GQuark _tmp4_label22 = 0;
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label23 = 0;
-#line 4182 "MediaPage.c"
+#line 4184 "MediaPage.c"
 	gboolean _tmp30_ = FALSE;
-	gboolean _tmp31_ = FALSE;
+	gboolean _tmp31_;
 #line 508 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 508 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4201,160 +4203,160 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 	if (((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("equal")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("plus"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("KP_Add"))))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4205 "MediaPage.c"
+#line 4207 "MediaPage.c"
 			default:
 			{
 #line 514 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize");
 #line 515 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4212 "MediaPage.c"
+#line 4214 "MediaPage.c"
 			}
 		}
 	} else if (((_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("minus")))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Subtract"))))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4218 "MediaPage.c"
+#line 4220 "MediaPage.c"
 			default:
 			{
 #line 520 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize");
 #line 521 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4225 "MediaPage.c"
+#line 4227 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("period")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4231 "MediaPage.c"
+#line 4233 "MediaPage.c"
 			default:
 			{
 #line 524 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating");
 #line 525 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4238 "MediaPage.c"
+#line 4240 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("comma")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4244 "MediaPage.c"
+#line 4246 "MediaPage.c"
 			default:
 			{
 #line 528 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating");
 #line 529 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4251 "MediaPage.c"
+#line 4253 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("KP_1")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4257 "MediaPage.c"
+#line 4259 "MediaPage.c"
 			default:
 			{
 #line 532 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne");
 #line 533 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4264 "MediaPage.c"
+#line 4266 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("KP_2")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4270 "MediaPage.c"
+#line 4272 "MediaPage.c"
 			default:
 			{
 #line 536 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo");
 #line 537 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4277 "MediaPage.c"
+#line 4279 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label10) ? _tmp4_label10 : (_tmp4_label10 = g_quark_from_static_string ("KP_3")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4283 "MediaPage.c"
+#line 4285 "MediaPage.c"
 			default:
 			{
 #line 540 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree");
 #line 541 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4290 "MediaPage.c"
+#line 4292 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label11) ? _tmp4_label11 : (_tmp4_label11 = g_quark_from_static_string ("KP_4")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4296 "MediaPage.c"
+#line 4298 "MediaPage.c"
 			default:
 			{
 #line 544 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour");
 #line 545 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4303 "MediaPage.c"
+#line 4305 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label12) ? _tmp4_label12 : (_tmp4_label12 = g_quark_from_static_string ("KP_5")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4309 "MediaPage.c"
+#line 4311 "MediaPage.c"
 			default:
 			{
 #line 548 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive");
 #line 549 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4316 "MediaPage.c"
+#line 4318 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label13) ? _tmp4_label13 : (_tmp4_label13 = g_quark_from_static_string ("KP_0")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4322 "MediaPage.c"
+#line 4324 "MediaPage.c"
 			default:
 			{
 #line 552 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated");
 #line 553 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4329 "MediaPage.c"
+#line 4331 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label14) ? _tmp4_label14 : (_tmp4_label14 = g_quark_from_static_string ("KP_9")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4335 "MediaPage.c"
+#line 4337 "MediaPage.c"
 			default:
 			{
 #line 556 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected");
 #line 557 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4342 "MediaPage.c"
+#line 4344 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label15) ? _tmp4_label15 : (_tmp4_label15 = g_quark_from_static_string ("exclam")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4348 "MediaPage.c"
+#line 4350 "MediaPage.c"
 			default:
 			{
-				gboolean _tmp6_ = FALSE;
+				gboolean _tmp6_;
 #line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp6_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp6_) {
-#line 4356 "MediaPage.c"
-					SearchViewFilter* _tmp7_ = NULL;
-					SearchViewFilter* _tmp8_ = NULL;
+#line 4358 "MediaPage.c"
+					SearchViewFilter* _tmp7_;
+					SearchViewFilter* _tmp8_;
 #line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp7_ = checkerboard_page_get_search_view_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
 #line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4363,27 +4365,27 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 					search_view_filter_set_rating_filter (_tmp8_, RATING_FILTER_ONE_OR_HIGHER);
 #line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp8_);
-#line 4367 "MediaPage.c"
+#line 4369 "MediaPage.c"
 				}
 #line 562 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4371 "MediaPage.c"
+#line 4373 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label16) ? _tmp4_label16 : (_tmp4_label16 = g_quark_from_static_string ("at")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4377 "MediaPage.c"
+#line 4379 "MediaPage.c"
 			default:
 			{
-				gboolean _tmp9_ = FALSE;
+				gboolean _tmp9_;
 #line 565 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp9_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 565 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp9_) {
-#line 4385 "MediaPage.c"
-					SearchViewFilter* _tmp10_ = NULL;
-					SearchViewFilter* _tmp11_ = NULL;
+#line 4387 "MediaPage.c"
+					SearchViewFilter* _tmp10_;
+					SearchViewFilter* _tmp11_;
 #line 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp10_ = checkerboard_page_get_search_view_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
 #line 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4392,27 +4394,27 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 					search_view_filter_set_rating_filter (_tmp11_, RATING_FILTER_TWO_OR_HIGHER);
 #line 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp11_);
-#line 4396 "MediaPage.c"
+#line 4398 "MediaPage.c"
 				}
 #line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4400 "MediaPage.c"
+#line 4402 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label17) ? _tmp4_label17 : (_tmp4_label17 = g_quark_from_static_string ("numbersign")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4406 "MediaPage.c"
+#line 4408 "MediaPage.c"
 			default:
 			{
-				gboolean _tmp12_ = FALSE;
+				gboolean _tmp12_;
 #line 570 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp12_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 570 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp12_) {
-#line 4414 "MediaPage.c"
-					SearchViewFilter* _tmp13_ = NULL;
-					SearchViewFilter* _tmp14_ = NULL;
+#line 4416 "MediaPage.c"
+					SearchViewFilter* _tmp13_;
+					SearchViewFilter* _tmp14_;
 #line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp13_ = checkerboard_page_get_search_view_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
 #line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4421,27 +4423,27 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 					search_view_filter_set_rating_filter (_tmp14_, RATING_FILTER_THREE_OR_HIGHER);
 #line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp14_);
-#line 4425 "MediaPage.c"
+#line 4427 "MediaPage.c"
 				}
 #line 572 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4429 "MediaPage.c"
+#line 4431 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label18) ? _tmp4_label18 : (_tmp4_label18 = g_quark_from_static_string ("dollar")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4435 "MediaPage.c"
+#line 4437 "MediaPage.c"
 			default:
 			{
-				gboolean _tmp15_ = FALSE;
+				gboolean _tmp15_;
 #line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp15_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp15_) {
-#line 4443 "MediaPage.c"
-					SearchViewFilter* _tmp16_ = NULL;
-					SearchViewFilter* _tmp17_ = NULL;
+#line 4445 "MediaPage.c"
+					SearchViewFilter* _tmp16_;
+					SearchViewFilter* _tmp17_;
 #line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp16_ = checkerboard_page_get_search_view_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
 #line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4450,27 +4452,27 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 					search_view_filter_set_rating_filter (_tmp17_, RATING_FILTER_FOUR_OR_HIGHER);
 #line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp17_);
-#line 4454 "MediaPage.c"
+#line 4456 "MediaPage.c"
 				}
 #line 577 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4458 "MediaPage.c"
+#line 4460 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label19) ? _tmp4_label19 : (_tmp4_label19 = g_quark_from_static_string ("percent")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4464 "MediaPage.c"
+#line 4466 "MediaPage.c"
 			default:
 			{
-				gboolean _tmp18_ = FALSE;
+				gboolean _tmp18_;
 #line 580 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp18_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 580 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp18_) {
-#line 4472 "MediaPage.c"
-					SearchViewFilter* _tmp19_ = NULL;
-					SearchViewFilter* _tmp20_ = NULL;
+#line 4474 "MediaPage.c"
+					SearchViewFilter* _tmp19_;
+					SearchViewFilter* _tmp20_;
 #line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp19_ = checkerboard_page_get_search_view_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
 #line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4479,27 +4481,27 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 					search_view_filter_set_rating_filter (_tmp20_, RATING_FILTER_FIVE_OR_HIGHER);
 #line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp20_);
-#line 4483 "MediaPage.c"
+#line 4485 "MediaPage.c"
 				}
 #line 582 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4487 "MediaPage.c"
+#line 4489 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label20) ? _tmp4_label20 : (_tmp4_label20 = g_quark_from_static_string ("parenright")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4493 "MediaPage.c"
+#line 4495 "MediaPage.c"
 			default:
 			{
-				gboolean _tmp21_ = FALSE;
+				gboolean _tmp21_;
 #line 585 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp21_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 585 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp21_) {
-#line 4501 "MediaPage.c"
-					SearchViewFilter* _tmp22_ = NULL;
-					SearchViewFilter* _tmp23_ = NULL;
+#line 4503 "MediaPage.c"
+					SearchViewFilter* _tmp22_;
+					SearchViewFilter* _tmp23_;
 #line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp22_ = checkerboard_page_get_search_view_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
 #line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4508,27 +4510,27 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 					search_view_filter_set_rating_filter (_tmp23_, RATING_FILTER_UNRATED_OR_HIGHER);
 #line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp23_);
-#line 4512 "MediaPage.c"
+#line 4514 "MediaPage.c"
 				}
 #line 587 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4516 "MediaPage.c"
+#line 4518 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label21) ? _tmp4_label21 : (_tmp4_label21 = g_quark_from_static_string ("parenleft")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4522 "MediaPage.c"
+#line 4524 "MediaPage.c"
 			default:
 			{
-				gboolean _tmp24_ = FALSE;
+				gboolean _tmp24_;
 #line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp24_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp24_) {
-#line 4530 "MediaPage.c"
-					SearchViewFilter* _tmp25_ = NULL;
-					SearchViewFilter* _tmp26_ = NULL;
+#line 4532 "MediaPage.c"
+					SearchViewFilter* _tmp25_;
+					SearchViewFilter* _tmp26_;
 #line 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp25_ = checkerboard_page_get_search_view_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
 #line 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4537,27 +4539,27 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 					search_view_filter_set_rating_filter (_tmp26_, RATING_FILTER_REJECTED_OR_HIGHER);
 #line 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp26_);
-#line 4541 "MediaPage.c"
+#line 4543 "MediaPage.c"
 				}
 #line 592 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4545 "MediaPage.c"
+#line 4547 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label22) ? _tmp4_label22 : (_tmp4_label22 = g_quark_from_static_string ("asterisk")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4551 "MediaPage.c"
+#line 4553 "MediaPage.c"
 			default:
 			{
-				gboolean _tmp27_ = FALSE;
+				gboolean _tmp27_;
 #line 595 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp27_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 595 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp27_) {
-#line 4559 "MediaPage.c"
-					SearchViewFilter* _tmp28_ = NULL;
-					SearchViewFilter* _tmp29_ = NULL;
+#line 4561 "MediaPage.c"
+					SearchViewFilter* _tmp28_;
+					SearchViewFilter* _tmp29_;
 #line 596 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp28_ = checkerboard_page_get_search_view_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
 #line 596 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4566,37 +4568,37 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 					search_view_filter_set_rating_filter (_tmp29_, RATING_FILTER_REJECTED_ONLY);
 #line 596 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp29_);
-#line 4570 "MediaPage.c"
+#line 4572 "MediaPage.c"
 				}
 #line 597 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4574 "MediaPage.c"
+#line 4576 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label23) ? _tmp4_label23 : (_tmp4_label23 = g_quark_from_static_string ("slash")))) {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4580 "MediaPage.c"
+#line 4582 "MediaPage.c"
 			default:
 			{
 #line 600 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
 #line 601 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4587 "MediaPage.c"
+#line 4589 "MediaPage.c"
 			}
 		}
 	} else {
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4593 "MediaPage.c"
+#line 4595 "MediaPage.c"
 			default:
 			{
 #line 604 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				handled = FALSE;
 #line 605 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4600 "MediaPage.c"
+#line 4602 "MediaPage.c"
 			}
 		}
 	}
@@ -4606,48 +4608,48 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 	if (_tmp31_) {
 #line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp30_ = TRUE;
-#line 4610 "MediaPage.c"
+#line 4612 "MediaPage.c"
 	} else {
-		GdkEventKey* _tmp32_ = NULL;
-		gboolean _tmp33_ = FALSE;
+		GdkEventKey* _tmp32_;
+		gboolean _tmp33_;
 #line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp32_ = event;
 #line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp33_ = PAGE_CLASS (media_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp32_);
 #line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp30_ = _tmp33_;
-#line 4620 "MediaPage.c"
+#line 4622 "MediaPage.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp30_;
 #line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 4626 "MediaPage.c"
+#line 4628 "MediaPage.c"
 }
 
 
 static void media_page_real_switched_to (Page* base) {
 	MediaPage * self;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	ConfigFacade* _tmp5_ = NULL;
-	ConfigFacade* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	ConfigFacade* _tmp8_ = NULL;
-	ConfigFacade* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	ConfigFacade* _tmp11_ = NULL;
-	ConfigFacade* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	ViewCollection* _tmp14_ = NULL;
-	ViewCollection* _tmp15_ = NULL;
-	ViewCollection* _tmp16_ = NULL;
-	ViewCollection* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gboolean _tmp19_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	gboolean _tmp4_;
+	ConfigFacade* _tmp5_;
+	ConfigFacade* _tmp6_;
+	gboolean _tmp7_;
+	ConfigFacade* _tmp8_;
+	ConfigFacade* _tmp9_;
+	gboolean _tmp10_;
+	ConfigFacade* _tmp11_;
+	ConfigFacade* _tmp12_;
+	gboolean _tmp13_;
+	ViewCollection* _tmp14_;
+	ViewCollection* _tmp15_;
+	ViewCollection* _tmp16_;
+	ViewCollection* _tmp17_;
+	gint _tmp18_;
+	gboolean _tmp19_;
 #line 611 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 612 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4720,13 +4722,13 @@ static void media_page_real_switched_to (Page* base) {
 	_data_collection_unref0 (_tmp17_);
 #line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp19_) {
-#line 4724 "MediaPage.c"
+#line 4726 "MediaPage.c"
 		CheckerboardItem* selected = NULL;
-		ViewCollection* _tmp20_ = NULL;
-		ViewCollection* _tmp21_ = NULL;
-		DataView* _tmp22_ = NULL;
-		CheckerboardItem* _tmp23_ = NULL;
-		CheckerboardItem* _tmp24_ = NULL;
+		ViewCollection* _tmp20_;
+		ViewCollection* _tmp21_;
+		DataView* _tmp22_;
+		CheckerboardItem* _tmp23_;
+		CheckerboardItem* _tmp24_;
 #line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4743,21 +4745,21 @@ static void media_page_real_switched_to (Page* base) {
 		_tmp24_ = selected;
 #line 626 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (_tmp24_ != NULL) {
-#line 4747 "MediaPage.c"
-			CheckerboardItem* _tmp25_ = NULL;
+#line 4749 "MediaPage.c"
+			CheckerboardItem* _tmp25_;
 #line 627 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp25_ = selected;
 #line 627 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			checkerboard_page_cursor_to_item (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp25_);
-#line 4753 "MediaPage.c"
+#line 4755 "MediaPage.c"
 		}
 #line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (selected);
-#line 4757 "MediaPage.c"
+#line 4759 "MediaPage.c"
 	}
 #line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_sync_sort (self);
-#line 4761 "MediaPage.c"
+#line 4763 "MediaPage.c"
 }
 
 
@@ -4769,28 +4771,28 @@ static void media_page_real_switching_from (Page* base) {
 	media_page_disconnect_slider (self);
 #line 636 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	PAGE_CLASS (media_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
-#line 4773 "MediaPage.c"
+#line 4775 "MediaPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 640 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 4780 "MediaPage.c"
+#line 4782 "MediaPage.c"
 }
 
 
 static void _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed (MediaPageZoomSliderAssembly* _sender, gpointer self) {
 #line 641 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_zoom_changed ((MediaPage*) self);
-#line 4787 "MediaPage.c"
+#line 4789 "MediaPage.c"
 }
 
 
 void media_page_connect_slider (MediaPage* self, MediaPageZoomSliderAssembly* slider) {
-	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
-	MediaPageZoomSliderAssembly* _tmp1_ = NULL;
-	MediaPageZoomSliderAssembly* _tmp2_ = NULL;
+	MediaPageZoomSliderAssembly* _tmp0_;
+	MediaPageZoomSliderAssembly* _tmp1_;
+	MediaPageZoomSliderAssembly* _tmp2_;
 #line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4809,16 +4811,16 @@ void media_page_connect_slider (MediaPage* self, MediaPageZoomSliderAssembly* sl
 	g_signal_connect_object (_tmp2_, "zoom-changed", (GCallback) _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed, self, 0);
 #line 642 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_load_persistent_thumbnail_scale (self);
-#line 4813 "MediaPage.c"
+#line 4815 "MediaPage.c"
 }
 
 
 static void media_page_save_persistent_thumbnail_scale (MediaPage* self) {
-	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	ConfigFacade* _tmp2_ = NULL;
-	MediaPageZoomSliderAssembly* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	MediaPageZoomSliderAssembly* _tmp0_;
+	ConfigFacade* _tmp1_;
+	ConfigFacade* _tmp2_;
+	MediaPageZoomSliderAssembly* _tmp3_;
+	gint _tmp4_;
 #line 645 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4827,7 +4829,7 @@ static void media_page_save_persistent_thumbnail_scale (MediaPage* self) {
 	if (_tmp0_ == NULL) {
 #line 647 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4831 "MediaPage.c"
+#line 4833 "MediaPage.c"
 	}
 #line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = config_facade_get_instance ();
@@ -4841,20 +4843,20 @@ static void media_page_save_persistent_thumbnail_scale (MediaPage* self) {
 	configuration_facade_set_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_);
 #line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 4845 "MediaPage.c"
+#line 4847 "MediaPage.c"
 }
 
 
 static void media_page_load_persistent_thumbnail_scale (MediaPage* self) {
-	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
+	MediaPageZoomSliderAssembly* _tmp0_;
 	gint persistent_scale = 0;
-	ConfigFacade* _tmp1_ = NULL;
-	ConfigFacade* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	MediaPageZoomSliderAssembly* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	ConfigFacade* _tmp1_;
+	ConfigFacade* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	MediaPageZoomSliderAssembly* _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 #line 652 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 653 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4863,7 +4865,7 @@ static void media_page_load_persistent_thumbnail_scale (MediaPage* self) {
 	if (_tmp0_ == NULL) {
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4867 "MediaPage.c"
+#line 4869 "MediaPage.c"
 	}
 #line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = config_facade_get_instance ();
@@ -4887,14 +4889,14 @@ static void media_page_load_persistent_thumbnail_scale (MediaPage* self) {
 	_tmp7_ = persistent_scale;
 #line 659 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_thumb_size (self, _tmp7_);
-#line 4891 "MediaPage.c"
+#line 4893 "MediaPage.c"
 }
 
 
 void media_page_disconnect_slider (MediaPage* self) {
-	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
-	MediaPageZoomSliderAssembly* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
+	MediaPageZoomSliderAssembly* _tmp0_;
+	MediaPageZoomSliderAssembly* _tmp1_;
+	guint _tmp2_;
 #line 662 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 663 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4903,7 +4905,7 @@ void media_page_disconnect_slider (MediaPage* self) {
 	if (_tmp0_ == NULL) {
 #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4907 "MediaPage.c"
+#line 4909 "MediaPage.c"
 	}
 #line 666 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = self->priv->connected_slider;
@@ -4915,30 +4917,30 @@ void media_page_disconnect_slider (MediaPage* self) {
 	_g_object_unref0 (self->priv->connected_slider);
 #line 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->connected_slider = NULL;
-#line 4919 "MediaPage.c"
+#line 4921 "MediaPage.c"
 }
 
 
 static void media_page_real_on_zoom_changed (MediaPage* self) {
-	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
+	MediaPageZoomSliderAssembly* _tmp0_;
 #line 671 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
 #line 671 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 4929 "MediaPage.c"
-		MediaPageZoomSliderAssembly* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
+#line 4931 "MediaPage.c"
+		MediaPageZoomSliderAssembly* _tmp1_;
+		gint _tmp2_;
 #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = self->priv->connected_slider;
 #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = media_page_zoom_slider_assembly_get_scale (_tmp1_);
 #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_set_thumb_size (self, _tmp2_);
-#line 4938 "MediaPage.c"
+#line 4940 "MediaPage.c"
 	}
 #line 674 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_save_persistent_thumbnail_scale (self);
-#line 4942 "MediaPage.c"
+#line 4944 "MediaPage.c"
 }
 
 
@@ -4947,7 +4949,7 @@ void media_page_on_zoom_changed (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_zoom_changed (self);
-#line 4951 "MediaPage.c"
+#line 4953 "MediaPage.c"
 }
 
 
@@ -4956,7 +4958,7 @@ static void media_page_real_on_export (MediaPage* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_page_on_export'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 4960 "MediaPage.c"
+#line 4962 "MediaPage.c"
 }
 
 
@@ -4965,14 +4967,14 @@ void media_page_on_export (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_export (self);
-#line 4969 "MediaPage.c"
+#line 4971 "MediaPage.c"
 }
 
 
 static void media_page_real_on_increase_size (MediaPage* self) {
 #line 680 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_increase_zoom_level (self);
-#line 4976 "MediaPage.c"
+#line 4978 "MediaPage.c"
 }
 
 
@@ -4981,14 +4983,14 @@ void media_page_on_increase_size (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 679 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_increase_size (self);
-#line 4985 "MediaPage.c"
+#line 4987 "MediaPage.c"
 }
 
 
 static void media_page_real_on_decrease_size (MediaPage* self) {
 #line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_decrease_zoom_level (self);
-#line 4992 "MediaPage.c"
+#line 4994 "MediaPage.c"
 }
 
 
@@ -4997,25 +4999,25 @@ void media_page_on_decrease_size (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 683 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_decrease_size (self);
-#line 5001 "MediaPage.c"
+#line 5003 "MediaPage.c"
 }
 
 
 static void media_page_on_add_tags (MediaPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	AddTagsDialog* dialog = NULL;
-	AddTagsDialog* _tmp4_ = NULL;
+	AddTagsDialog* _tmp4_;
 	gchar** names = NULL;
-	AddTagsDialog* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gchar** _tmp7_ = NULL;
-	gint names_length1 = 0;
-	gint _names_size_ = 0;
-	gchar** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
+	AddTagsDialog* _tmp5_;
+	gint _tmp6_;
+	gchar** _tmp7_;
+	gint names_length1;
+	gint _names_size_;
+	gchar** _tmp8_;
+	gint _tmp8__length1;
 #line 687 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 688 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5032,7 +5034,7 @@ static void media_page_on_add_tags (MediaPage* self) {
 	if (_tmp3_) {
 #line 689 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5036 "MediaPage.c"
+#line 5038 "MediaPage.c"
 	}
 #line 691 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = add_tags_dialog_new ();
@@ -5054,23 +5056,23 @@ static void media_page_on_add_tags (MediaPage* self) {
 	_tmp8__length1 = names_length1;
 #line 694 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp8_ != NULL) {
-#line 5058 "MediaPage.c"
-		CommandManager* _tmp9_ = NULL;
-		CommandManager* _tmp10_ = NULL;
-		HierarchicalTagIndex* _tmp11_ = NULL;
-		HierarchicalTagIndex* _tmp12_ = NULL;
-		gchar** _tmp13_ = NULL;
-		gint _tmp13__length1 = 0;
-		gint _tmp14_ = 0;
-		gchar** _tmp15_ = NULL;
-		gchar** _tmp16_ = NULL;
-		gint _tmp16__length1 = 0;
-		ViewCollection* _tmp17_ = NULL;
-		ViewCollection* _tmp18_ = NULL;
-		GeeList* _tmp19_ = NULL;
-		GeeCollection* _tmp20_ = NULL;
-		AddTagsCommand* _tmp21_ = NULL;
-		AddTagsCommand* _tmp22_ = NULL;
+#line 5060 "MediaPage.c"
+		CommandManager* _tmp9_;
+		CommandManager* _tmp10_;
+		HierarchicalTagIndex* _tmp11_;
+		HierarchicalTagIndex* _tmp12_;
+		gchar** _tmp13_;
+		gint _tmp13__length1;
+		gint _tmp14_;
+		gchar** _tmp15_;
+		gchar** _tmp16_;
+		gint _tmp16__length1;
+		ViewCollection* _tmp17_;
+		ViewCollection* _tmp18_;
+		GeeList* _tmp19_;
+		GeeCollection* _tmp20_;
+		AddTagsCommand* _tmp21_;
+		AddTagsCommand* _tmp22_;
 #line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5115,41 +5117,41 @@ static void media_page_on_add_tags (MediaPage* self) {
 		_hierarchical_tag_index_unref0 (_tmp12_);
 #line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp10_);
-#line 5119 "MediaPage.c"
+#line 5121 "MediaPage.c"
 	}
 #line 687 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
 #line 687 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 5125 "MediaPage.c"
+#line 5127 "MediaPage.c"
 }
 
 
 static void media_page_on_modify_tags (MediaPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	MediaSource* media = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	DataView* _tmp6_ = NULL;
-	DataView* _tmp7_ = NULL;
-	DataSource* _tmp8_ = NULL;
-	MediaSource* _tmp9_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	DataView* _tmp6_;
+	DataView* _tmp7_;
+	DataSource* _tmp8_;
+	MediaSource* _tmp9_;
 	ModifyTagsDialog* dialog = NULL;
-	MediaSource* _tmp10_ = NULL;
-	ModifyTagsDialog* _tmp11_ = NULL;
+	MediaSource* _tmp10_;
+	ModifyTagsDialog* _tmp11_;
 	GeeArrayList* new_tags = NULL;
-	ModifyTagsDialog* _tmp12_ = NULL;
-	GeeArrayList* _tmp13_ = NULL;
-	GeeArrayList* _tmp14_ = NULL;
-	CommandManager* _tmp15_ = NULL;
-	CommandManager* _tmp16_ = NULL;
-	MediaSource* _tmp17_ = NULL;
-	GeeArrayList* _tmp18_ = NULL;
-	ModifyTagsCommand* _tmp19_ = NULL;
-	ModifyTagsCommand* _tmp20_ = NULL;
+	ModifyTagsDialog* _tmp12_;
+	GeeArrayList* _tmp13_;
+	GeeArrayList* _tmp14_;
+	CommandManager* _tmp15_;
+	CommandManager* _tmp16_;
+	MediaSource* _tmp17_;
+	GeeArrayList* _tmp18_;
+	ModifyTagsCommand* _tmp19_;
+	ModifyTagsCommand* _tmp20_;
 #line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5166,7 +5168,7 @@ static void media_page_on_modify_tags (MediaPage* self) {
 	if (_tmp3_) {
 #line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5170 "MediaPage.c"
+#line 5172 "MediaPage.c"
 	}
 #line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5210,7 +5212,7 @@ static void media_page_on_modify_tags (MediaPage* self) {
 		_g_object_unref0 (media);
 #line 711 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5214 "MediaPage.c"
+#line 5216 "MediaPage.c"
 	}
 #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5236,20 +5238,20 @@ static void media_page_on_modify_tags (MediaPage* self) {
 	_text_entry_dialog_mediator_unref0 (dialog);
 #line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media);
-#line 5240 "MediaPage.c"
+#line 5242 "MediaPage.c"
 }
 
 
 static void media_page_set_display_tags (MediaPage* self, gboolean display) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
+	gboolean _tmp4_;
 	GValue _tmp5_ = {0};
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
+	gboolean _tmp8_;
 #line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 717 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5288,15 +5290,15 @@ static void media_page_set_display_tags (MediaPage* self, gboolean display) {
 	_tmp8_ = display;
 #line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags", _tmp8_);
-#line 5292 "MediaPage.c"
+#line 5294 "MediaPage.c"
 }
 
 
 static void media_page_on_new_event (MediaPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 #line 724 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 725 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5311,15 +5313,15 @@ static void media_page_on_new_event (MediaPage* self) {
 	_data_collection_unref0 (_tmp1_);
 #line 725 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 5315 "MediaPage.c"
-		CommandManager* _tmp4_ = NULL;
-		CommandManager* _tmp5_ = NULL;
-		ViewCollection* _tmp6_ = NULL;
-		ViewCollection* _tmp7_ = NULL;
-		GeeList* _tmp8_ = NULL;
-		GeeList* _tmp9_ = NULL;
-		NewEventCommand* _tmp10_ = NULL;
-		NewEventCommand* _tmp11_ = NULL;
+#line 5317 "MediaPage.c"
+		CommandManager* _tmp4_;
+		CommandManager* _tmp5_;
+		ViewCollection* _tmp6_;
+		ViewCollection* _tmp7_;
+		GeeList* _tmp8_;
+		GeeList* _tmp9_;
+		NewEventCommand* _tmp10_;
+		NewEventCommand* _tmp11_;
 #line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5346,28 +5348,28 @@ static void media_page_on_new_event (MediaPage* self) {
 		_data_collection_unref0 (_tmp7_);
 #line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp5_);
-#line 5350 "MediaPage.c"
+#line 5352 "MediaPage.c"
 	}
 }
 
 
 static void media_page_on_flag_unflag (MediaPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	GeeCollection* sources = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
-	GeeCollection* _tmp7_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	GeeList* _tmp6_;
+	GeeCollection* _tmp7_;
 	gboolean flag = FALSE;
-	CommandManager* _tmp20_ = NULL;
-	CommandManager* _tmp21_ = NULL;
-	GeeCollection* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
-	FlagUnflagCommand* _tmp24_ = NULL;
-	FlagUnflagCommand* _tmp25_ = NULL;
+	CommandManager* _tmp20_;
+	CommandManager* _tmp21_;
+	GeeCollection* _tmp22_;
+	gboolean _tmp23_;
+	FlagUnflagCommand* _tmp24_;
+	FlagUnflagCommand* _tmp25_;
 #line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5384,7 +5386,7 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 	if (_tmp3_) {
 #line 731 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5388 "MediaPage.c"
+#line 5390 "MediaPage.c"
 	}
 #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5400,11 +5402,11 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 	sources = _tmp7_;
 #line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	flag = FALSE;
-#line 5404 "MediaPage.c"
+#line 5406 "MediaPage.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp8_ = NULL;
-		GeeIterator* _tmp9_ = NULL;
+		GeeCollection* _tmp8_;
+		GeeIterator* _tmp9_;
 #line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp8_ = sources;
 #line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5413,17 +5415,17 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 		_source_it = _tmp9_;
 #line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 5417 "MediaPage.c"
-			GeeIterator* _tmp10_ = NULL;
-			gboolean _tmp11_ = FALSE;
+#line 5419 "MediaPage.c"
+			GeeIterator* _tmp10_;
+			gboolean _tmp11_;
 			MediaSource* source = NULL;
-			GeeIterator* _tmp12_ = NULL;
-			gpointer _tmp13_ = NULL;
+			GeeIterator* _tmp12_;
+			gpointer _tmp13_;
 			Flaggable* flaggable = NULL;
-			MediaSource* _tmp14_ = NULL;
-			Flaggable* _tmp15_ = NULL;
+			MediaSource* _tmp14_;
+			Flaggable* _tmp15_;
 			gboolean _tmp16_ = FALSE;
-			Flaggable* _tmp17_ = NULL;
+			Flaggable* _tmp17_;
 #line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _source_it;
 #line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5432,7 +5434,7 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 			if (!_tmp11_) {
 #line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 5436 "MediaPage.c"
+#line 5438 "MediaPage.c"
 			}
 #line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = _source_it;
@@ -5450,20 +5452,20 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 			_tmp17_ = flaggable;
 #line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp17_ != NULL) {
-#line 5454 "MediaPage.c"
-				Flaggable* _tmp18_ = NULL;
-				gboolean _tmp19_ = FALSE;
+#line 5456 "MediaPage.c"
+				Flaggable* _tmp18_;
+				gboolean _tmp19_;
 #line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp18_ = flaggable;
 #line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp19_ = flaggable_is_flagged (_tmp18_);
 #line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp16_ = !_tmp19_;
-#line 5463 "MediaPage.c"
+#line 5465 "MediaPage.c"
 			} else {
 #line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp16_ = FALSE;
-#line 5467 "MediaPage.c"
+#line 5469 "MediaPage.c"
 			}
 #line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp16_) {
@@ -5475,17 +5477,17 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 				_g_object_unref0 (source);
 #line 743 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 5479 "MediaPage.c"
+#line 5481 "MediaPage.c"
 			}
 #line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (flaggable);
 #line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (source);
-#line 5485 "MediaPage.c"
+#line 5487 "MediaPage.c"
 		}
 #line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_source_it);
-#line 5489 "MediaPage.c"
+#line 5491 "MediaPage.c"
 	}
 #line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5507,25 +5509,25 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 	_command_manager_unref0 (_tmp21_);
 #line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (sources);
-#line 5511 "MediaPage.c"
+#line 5513 "MediaPage.c"
 }
 
 
 static void media_page_real_on_increase_rating (MediaPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	SetRatingCommand* command = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
-	GeeList* _tmp7_ = NULL;
-	SetRatingCommand* _tmp8_ = NULL;
-	SetRatingCommand* _tmp9_ = NULL;
-	CommandManager* _tmp10_ = NULL;
-	CommandManager* _tmp11_ = NULL;
-	SetRatingCommand* _tmp12_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	GeeList* _tmp6_;
+	GeeList* _tmp7_;
+	SetRatingCommand* _tmp8_;
+	SetRatingCommand* _tmp9_;
+	CommandManager* _tmp10_;
+	CommandManager* _tmp11_;
+	SetRatingCommand* _tmp12_;
 #line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5540,7 +5542,7 @@ static void media_page_real_on_increase_rating (MediaPage* self) {
 	if (_tmp3_) {
 #line 752 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5544 "MediaPage.c"
+#line 5546 "MediaPage.c"
 	}
 #line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5574,7 +5576,7 @@ static void media_page_real_on_increase_rating (MediaPage* self) {
 	media_page_update_rating_sensitivities (self);
 #line 750 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 5578 "MediaPage.c"
+#line 5580 "MediaPage.c"
 }
 
 
@@ -5583,25 +5585,25 @@ void media_page_on_increase_rating (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 750 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_increase_rating (self);
-#line 5587 "MediaPage.c"
+#line 5589 "MediaPage.c"
 }
 
 
 static void media_page_real_on_decrease_rating (MediaPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	SetRatingCommand* command = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
-	GeeList* _tmp7_ = NULL;
-	SetRatingCommand* _tmp8_ = NULL;
-	SetRatingCommand* _tmp9_ = NULL;
-	CommandManager* _tmp10_ = NULL;
-	CommandManager* _tmp11_ = NULL;
-	SetRatingCommand* _tmp12_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	GeeList* _tmp6_;
+	GeeList* _tmp7_;
+	SetRatingCommand* _tmp8_;
+	SetRatingCommand* _tmp9_;
+	CommandManager* _tmp10_;
+	CommandManager* _tmp11_;
+	SetRatingCommand* _tmp12_;
 #line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5616,7 +5618,7 @@ static void media_page_real_on_decrease_rating (MediaPage* self) {
 	if (_tmp3_) {
 #line 762 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5620 "MediaPage.c"
+#line 5622 "MediaPage.c"
 	}
 #line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5650,7 +5652,7 @@ static void media_page_real_on_decrease_rating (MediaPage* self) {
 	media_page_update_rating_sensitivities (self);
 #line 760 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 5654 "MediaPage.c"
+#line 5656 "MediaPage.c"
 }
 
 
@@ -5659,26 +5661,26 @@ void media_page_on_decrease_rating (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 760 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_decrease_rating (self);
-#line 5663 "MediaPage.c"
+#line 5665 "MediaPage.c"
 }
 
 
 static void media_page_real_on_set_rating (MediaPage* self, Rating rating) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	SetRatingCommand* command = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
-	GeeList* _tmp7_ = NULL;
-	Rating _tmp8_ = 0;
-	SetRatingCommand* _tmp9_ = NULL;
-	SetRatingCommand* _tmp10_ = NULL;
-	CommandManager* _tmp11_ = NULL;
-	CommandManager* _tmp12_ = NULL;
-	SetRatingCommand* _tmp13_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	GeeList* _tmp6_;
+	GeeList* _tmp7_;
+	Rating _tmp8_;
+	SetRatingCommand* _tmp9_;
+	SetRatingCommand* _tmp10_;
+	CommandManager* _tmp11_;
+	CommandManager* _tmp12_;
+	SetRatingCommand* _tmp13_;
 #line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5693,7 +5695,7 @@ static void media_page_real_on_set_rating (MediaPage* self, Rating rating) {
 	if (_tmp3_) {
 #line 772 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5697 "MediaPage.c"
+#line 5699 "MediaPage.c"
 	}
 #line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5729,7 +5731,7 @@ static void media_page_real_on_set_rating (MediaPage* self, Rating rating) {
 	media_page_update_rating_sensitivities (self);
 #line 770 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 5733 "MediaPage.c"
+#line 5735 "MediaPage.c"
 }
 
 
@@ -5738,14 +5740,14 @@ void media_page_on_set_rating (MediaPage* self, Rating rating) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 770 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_set_rating (self, rating);
-#line 5742 "MediaPage.c"
+#line 5744 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_rejected (MediaPage* self) {
 #line 781 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_REJECTED);
-#line 5749 "MediaPage.c"
+#line 5751 "MediaPage.c"
 }
 
 
@@ -5754,14 +5756,14 @@ void media_page_on_rate_rejected (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_rejected (self);
-#line 5758 "MediaPage.c"
+#line 5760 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_unrated (MediaPage* self) {
 #line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_UNRATED);
-#line 5765 "MediaPage.c"
+#line 5767 "MediaPage.c"
 }
 
 
@@ -5770,14 +5772,14 @@ void media_page_on_rate_unrated (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 784 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_unrated (self);
-#line 5774 "MediaPage.c"
+#line 5776 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_one (MediaPage* self) {
 #line 789 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_ONE);
-#line 5781 "MediaPage.c"
+#line 5783 "MediaPage.c"
 }
 
 
@@ -5786,14 +5788,14 @@ void media_page_on_rate_one (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 788 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_one (self);
-#line 5790 "MediaPage.c"
+#line 5792 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_two (MediaPage* self) {
 #line 793 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_TWO);
-#line 5797 "MediaPage.c"
+#line 5799 "MediaPage.c"
 }
 
 
@@ -5802,14 +5804,14 @@ void media_page_on_rate_two (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_two (self);
-#line 5806 "MediaPage.c"
+#line 5808 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_three (MediaPage* self) {
 #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_THREE);
-#line 5813 "MediaPage.c"
+#line 5815 "MediaPage.c"
 }
 
 
@@ -5818,14 +5820,14 @@ void media_page_on_rate_three (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 796 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_three (self);
-#line 5822 "MediaPage.c"
+#line 5824 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_four (MediaPage* self) {
 #line 801 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_FOUR);
-#line 5829 "MediaPage.c"
+#line 5831 "MediaPage.c"
 }
 
 
@@ -5834,14 +5836,14 @@ void media_page_on_rate_four (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_four (self);
-#line 5838 "MediaPage.c"
+#line 5840 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_five (MediaPage* self) {
 #line 805 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_FIVE);
-#line 5845 "MediaPage.c"
+#line 5847 "MediaPage.c"
 }
 
 
@@ -5850,15 +5852,15 @@ void media_page_on_rate_five (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 804 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_five (self);
-#line 5854 "MediaPage.c"
+#line 5856 "MediaPage.c"
 }
 
 
 static void media_page_on_remove_from_library (MediaPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	GeeList* _tmp2_;
+	GeeCollection* _tmp3_;
 #line 808 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5875,31 +5877,31 @@ static void media_page_on_remove_from_library (MediaPage* self) {
 	_g_object_unref0 (_tmp3_);
 #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 5879 "MediaPage.c"
+#line 5881 "MediaPage.c"
 }
 
 
 static void media_page_real_on_move_to_trash (MediaPage* self) {
 	CheckerboardItem* restore_point = NULL;
-	CheckerboardItem* _tmp0_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gboolean _tmp9_ = FALSE;
+	CheckerboardItem* _tmp0_;
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
+	gint _tmp8_;
+	gboolean _tmp9_;
 	gboolean _tmp18_ = FALSE;
-	CheckerboardItem* _tmp19_ = NULL;
+	CheckerboardItem* _tmp19_;
 #line 813 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	restore_point = NULL;
 #line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)->cursor;
 #line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 5898 "MediaPage.c"
-		ViewCollection* _tmp1_ = NULL;
-		ViewCollection* _tmp2_ = NULL;
-		CheckerboardItem* _tmp3_ = NULL;
-		DataView* _tmp4_ = NULL;
-		CheckerboardItem* _tmp5_ = NULL;
+#line 5900 "MediaPage.c"
+		ViewCollection* _tmp1_;
+		ViewCollection* _tmp2_;
+		CheckerboardItem* _tmp3_;
+		DataView* _tmp4_;
+		CheckerboardItem* _tmp5_;
 #line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5914,7 +5916,7 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 		if (_tmp5_ == NULL) {
 #line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp4_);
-#line 5918 "MediaPage.c"
+#line 5920 "MediaPage.c"
 		}
 #line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (restore_point);
@@ -5922,7 +5924,7 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 		restore_point = _tmp5_;
 #line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 5926 "MediaPage.c"
+#line 5928 "MediaPage.c"
 	}
 #line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5936,15 +5938,15 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 	_data_collection_unref0 (_tmp7_);
 #line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp9_) {
-#line 5940 "MediaPage.c"
-		CommandManager* _tmp10_ = NULL;
-		CommandManager* _tmp11_ = NULL;
-		ViewCollection* _tmp12_ = NULL;
-		ViewCollection* _tmp13_ = NULL;
-		GeeList* _tmp14_ = NULL;
-		GeeCollection* _tmp15_ = NULL;
-		TrashUntrashPhotosCommand* _tmp16_ = NULL;
-		TrashUntrashPhotosCommand* _tmp17_ = NULL;
+#line 5942 "MediaPage.c"
+		CommandManager* _tmp10_;
+		CommandManager* _tmp11_;
+		ViewCollection* _tmp12_;
+		ViewCollection* _tmp13_;
+		GeeList* _tmp14_;
+		GeeCollection* _tmp15_;
+		TrashUntrashPhotosCommand* _tmp16_;
+		TrashUntrashPhotosCommand* _tmp17_;
 #line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5971,17 +5973,17 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 		_data_collection_unref0 (_tmp13_);
 #line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp11_);
-#line 5975 "MediaPage.c"
+#line 5977 "MediaPage.c"
 	}
 #line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp19_ = restore_point;
 #line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp19_ != NULL) {
-#line 5981 "MediaPage.c"
-		ViewCollection* _tmp20_ = NULL;
-		ViewCollection* _tmp21_ = NULL;
-		CheckerboardItem* _tmp22_ = NULL;
-		gboolean _tmp23_ = FALSE;
+#line 5983 "MediaPage.c"
+		ViewCollection* _tmp20_;
+		ViewCollection* _tmp21_;
+		CheckerboardItem* _tmp22_;
+		gboolean _tmp23_;
 #line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5994,25 +5996,25 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 		_tmp18_ = _tmp23_;
 #line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp21_);
-#line 5998 "MediaPage.c"
+#line 6000 "MediaPage.c"
 	} else {
 #line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = FALSE;
-#line 6002 "MediaPage.c"
+#line 6004 "MediaPage.c"
 	}
 #line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp18_) {
-#line 6006 "MediaPage.c"
-		CheckerboardItem* _tmp24_ = NULL;
+#line 6008 "MediaPage.c"
+		CheckerboardItem* _tmp24_;
 #line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp24_ = restore_point;
 #line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		checkerboard_page_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp24_);
-#line 6012 "MediaPage.c"
+#line 6014 "MediaPage.c"
 	}
 #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (restore_point);
-#line 6016 "MediaPage.c"
+#line 6018 "MediaPage.c"
 }
 
 
@@ -6021,32 +6023,32 @@ void media_page_on_move_to_trash (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_move_to_trash (self);
-#line 6025 "MediaPage.c"
+#line 6027 "MediaPage.c"
 }
 
 
 static void media_page_real_on_edit_title (MediaPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	GeeList* media_sources = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
-	GeeList* _tmp7_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	GeeList* _tmp6_;
+	GeeList* _tmp7_;
 	EditTitleDialog* edit_title_dialog = NULL;
-	GeeList* _tmp8_ = NULL;
-	gpointer _tmp9_ = NULL;
-	MediaSource* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	EditTitleDialog* _tmp13_ = NULL;
-	EditTitleDialog* _tmp14_ = NULL;
+	GeeList* _tmp8_;
+	gpointer _tmp9_;
+	MediaSource* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	EditTitleDialog* _tmp13_;
+	EditTitleDialog* _tmp14_;
 	gchar* new_title = NULL;
-	EditTitleDialog* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
+	EditTitleDialog* _tmp15_;
+	gchar* _tmp16_;
+	const gchar* _tmp17_;
 #line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6061,7 +6063,7 @@ static void media_page_real_on_edit_title (MediaPage* self) {
 	if (_tmp3_) {
 #line 831 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 6065 "MediaPage.c"
+#line 6067 "MediaPage.c"
 	}
 #line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -6105,13 +6107,13 @@ static void media_page_real_on_edit_title (MediaPage* self) {
 	_tmp17_ = new_title;
 #line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp17_ != NULL) {
-#line 6109 "MediaPage.c"
-		CommandManager* _tmp18_ = NULL;
-		CommandManager* _tmp19_ = NULL;
-		GeeList* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		EditMultipleTitlesCommand* _tmp22_ = NULL;
-		EditMultipleTitlesCommand* _tmp23_ = NULL;
+#line 6111 "MediaPage.c"
+		CommandManager* _tmp18_;
+		CommandManager* _tmp19_;
+		GeeList* _tmp20_;
+		const gchar* _tmp21_;
+		EditMultipleTitlesCommand* _tmp22_;
+		EditMultipleTitlesCommand* _tmp23_;
 #line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6130,7 +6132,7 @@ static void media_page_real_on_edit_title (MediaPage* self) {
 		_g_object_unref0 (_tmp23_);
 #line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp19_);
-#line 6134 "MediaPage.c"
+#line 6136 "MediaPage.c"
 	}
 #line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (new_title);
@@ -6138,7 +6140,7 @@ static void media_page_real_on_edit_title (MediaPage* self) {
 	_text_entry_dialog_mediator_unref0 (edit_title_dialog);
 #line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media_sources);
-#line 6142 "MediaPage.c"
+#line 6144 "MediaPage.c"
 }
 
 
@@ -6147,32 +6149,32 @@ void media_page_on_edit_title (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_edit_title (self);
-#line 6151 "MediaPage.c"
+#line 6153 "MediaPage.c"
 }
 
 
 static void media_page_real_on_edit_comment (MediaPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	GeeList* media_sources = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
-	GeeList* _tmp7_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	GeeList* _tmp6_;
+	GeeList* _tmp7_;
 	EditCommentDialog* edit_comment_dialog = NULL;
-	GeeList* _tmp8_ = NULL;
-	gpointer _tmp9_ = NULL;
-	MediaSource* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	EditCommentDialog* _tmp13_ = NULL;
-	EditCommentDialog* _tmp14_ = NULL;
+	GeeList* _tmp8_;
+	gpointer _tmp9_;
+	MediaSource* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	EditCommentDialog* _tmp13_;
+	EditCommentDialog* _tmp14_;
 	gchar* new_comment = NULL;
-	EditCommentDialog* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
+	EditCommentDialog* _tmp15_;
+	gchar* _tmp16_;
+	const gchar* _tmp17_;
 #line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6187,7 +6189,7 @@ static void media_page_real_on_edit_comment (MediaPage* self) {
 	if (_tmp3_) {
 #line 843 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 6191 "MediaPage.c"
+#line 6193 "MediaPage.c"
 	}
 #line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -6231,13 +6233,13 @@ static void media_page_real_on_edit_comment (MediaPage* self) {
 	_tmp17_ = new_comment;
 #line 849 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp17_ != NULL) {
-#line 6235 "MediaPage.c"
-		CommandManager* _tmp18_ = NULL;
-		CommandManager* _tmp19_ = NULL;
-		GeeList* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		EditMultipleCommentsCommand* _tmp22_ = NULL;
-		EditMultipleCommentsCommand* _tmp23_ = NULL;
+#line 6237 "MediaPage.c"
+		CommandManager* _tmp18_;
+		CommandManager* _tmp19_;
+		GeeList* _tmp20_;
+		const gchar* _tmp21_;
+		EditMultipleCommentsCommand* _tmp22_;
+		EditMultipleCommentsCommand* _tmp23_;
 #line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6256,7 +6258,7 @@ static void media_page_real_on_edit_comment (MediaPage* self) {
 		_g_object_unref0 (_tmp23_);
 #line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp19_);
-#line 6260 "MediaPage.c"
+#line 6262 "MediaPage.c"
 	}
 #line 841 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (new_comment);
@@ -6264,7 +6266,7 @@ static void media_page_real_on_edit_comment (MediaPage* self) {
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
 #line 841 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media_sources);
-#line 6268 "MediaPage.c"
+#line 6270 "MediaPage.c"
 }
 
 
@@ -6273,18 +6275,18 @@ void media_page_on_edit_comment (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 841 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_edit_comment (self);
-#line 6277 "MediaPage.c"
+#line 6279 "MediaPage.c"
 }
 
 
 static void media_page_real_on_display_titles (MediaPage* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GVariant* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
+	GVariant* _tmp0_;
+	gboolean _tmp1_;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	GSimpleAction* _tmp4_;
+	GVariant* _tmp5_;
 #line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 854 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6309,7 +6311,7 @@ static void media_page_real_on_display_titles (MediaPage* self, GSimpleAction* a
 	_tmp5_ = value;
 #line 859 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6313 "MediaPage.c"
+#line 6315 "MediaPage.c"
 }
 
 
@@ -6318,18 +6320,18 @@ void media_page_on_display_titles (MediaPage* self, GSimpleAction* action, GVari
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_titles (self, action, value);
-#line 6322 "MediaPage.c"
+#line 6324 "MediaPage.c"
 }
 
 
 static void media_page_real_on_display_comments (MediaPage* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GVariant* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
+	GVariant* _tmp0_;
+	gboolean _tmp1_;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	GSimpleAction* _tmp4_;
+	GVariant* _tmp5_;
 #line 862 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 863 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6354,7 +6356,7 @@ static void media_page_real_on_display_comments (MediaPage* self, GSimpleAction*
 	_tmp5_ = value;
 #line 868 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6358 "MediaPage.c"
+#line 6360 "MediaPage.c"
 }
 
 
@@ -6363,18 +6365,18 @@ void media_page_on_display_comments (MediaPage* self, GSimpleAction* action, GVa
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 862 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_comments (self, action, value);
-#line 6367 "MediaPage.c"
+#line 6369 "MediaPage.c"
 }
 
 
 static void media_page_real_on_display_ratings (MediaPage* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GVariant* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
+	GVariant* _tmp0_;
+	gboolean _tmp1_;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	GSimpleAction* _tmp4_;
+	GVariant* _tmp5_;
 #line 871 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 872 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6399,7 +6401,7 @@ static void media_page_real_on_display_ratings (MediaPage* self, GSimpleAction*
 	_tmp5_ = value;
 #line 877 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6403 "MediaPage.c"
+#line 6405 "MediaPage.c"
 }
 
 
@@ -6408,18 +6410,18 @@ void media_page_on_display_ratings (MediaPage* self, GSimpleAction* action, GVar
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 871 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_ratings (self, action, value);
-#line 6412 "MediaPage.c"
+#line 6414 "MediaPage.c"
 }
 
 
 static void media_page_real_on_display_tags (MediaPage* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GVariant* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
+	GVariant* _tmp0_;
+	gboolean _tmp1_;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	GSimpleAction* _tmp4_;
+	GVariant* _tmp5_;
 #line 880 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 881 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6444,7 +6446,7 @@ static void media_page_real_on_display_tags (MediaPage* self, GSimpleAction* act
 	_tmp5_ = value;
 #line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6448 "MediaPage.c"
+#line 6450 "MediaPage.c"
 }
 
 
@@ -6453,7 +6455,7 @@ void media_page_on_display_tags (MediaPage* self, GSimpleAction* action, GVarian
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 880 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_tags (self, action, value);
-#line 6457 "MediaPage.c"
+#line 6459 "MediaPage.c"
 }
 
 
@@ -6462,7 +6464,7 @@ static void media_page_real_get_config_photos_sort (MediaPage* self, gboolean* s
 	g_critical ("Type `%s' does not implement abstract method `media_page_get_config_photos_sort'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 889 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 6466 "MediaPage.c"
+#line 6468 "MediaPage.c"
 }
 
 
@@ -6471,7 +6473,7 @@ void media_page_get_config_photos_sort (MediaPage* self, gboolean* sort_order, g
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 889 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->get_config_photos_sort (self, sort_order, sort_by);
-#line 6475 "MediaPage.c"
+#line 6477 "MediaPage.c"
 }
 
 
@@ -6480,7 +6482,7 @@ static void media_page_real_set_config_photos_sort (MediaPage* self, gboolean so
 	g_critical ("Type `%s' does not implement abstract method `media_page_set_config_photos_sort'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 891 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 6484 "MediaPage.c"
+#line 6486 "MediaPage.c"
 }
 
 
@@ -6489,17 +6491,17 @@ void media_page_set_config_photos_sort (MediaPage* self, gboolean sort_order, gi
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 891 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->set_config_photos_sort (self, sort_order, sort_by);
-#line 6493 "MediaPage.c"
+#line 6495 "MediaPage.c"
 }
 
 
 static void media_page_real_on_sort_changed (MediaPage* self, GSimpleAction* action, GVariant* value) {
-	GSimpleAction* _tmp0_ = NULL;
-	GVariant* _tmp1_ = NULL;
+	GSimpleAction* _tmp0_;
+	GVariant* _tmp1_;
 	gint sort_by = 0;
-	gint _tmp2_ = 0;
+	gint _tmp2_;
 	gboolean sort_order = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp3_;
 #line 893 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 894 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6520,7 +6522,7 @@ static void media_page_real_on_sort_changed (MediaPage* self, GSimpleAction* act
 	media_page_set_view_comparator (self, sort_by, sort_order);
 #line 900 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_config_photos_sort (self, sort_order, sort_by);
-#line 6524 "MediaPage.c"
+#line 6526 "MediaPage.c"
 }
 
 
@@ -6529,24 +6531,24 @@ void media_page_on_sort_changed (MediaPage* self, GSimpleAction* action, GVarian
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 893 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_sort_changed (self, action, value);
-#line 6533 "MediaPage.c"
+#line 6535 "MediaPage.c"
 }
 
 
 static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction* action, GVariant* value) {
 	RawDeveloper developer = 0;
-	GVariant* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	GVariant* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
 	GQuark _tmp4_ = 0U;
 #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp3_label0 = 0;
 #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp3_label1 = 0;
-#line 6547 "MediaPage.c"
-	RawDeveloper _tmp5_ = 0;
-	GSimpleAction* _tmp6_ = NULL;
-	GVariant* _tmp7_ = NULL;
+#line 6549 "MediaPage.c"
+	RawDeveloper _tmp5_;
+	GSimpleAction* _tmp6_;
+	GVariant* _tmp7_;
 #line 903 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 903 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6565,38 +6567,38 @@ static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction*
 	if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Shotwell")))) {
 #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6569 "MediaPage.c"
+#line 6571 "MediaPage.c"
 			default:
 			{
 #line 909 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				developer = RAW_DEVELOPER_SHOTWELL;
 #line 910 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6576 "MediaPage.c"
+#line 6578 "MediaPage.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) {
 #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6582 "MediaPage.c"
+#line 6584 "MediaPage.c"
 			default:
 			{
 #line 912 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				developer = RAW_DEVELOPER_CAMERA;
 #line 913 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6589 "MediaPage.c"
+#line 6591 "MediaPage.c"
 			}
 		}
 	} else {
 #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6595 "MediaPage.c"
+#line 6597 "MediaPage.c"
 			default:
 			{
 #line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6600 "MediaPage.c"
+#line 6602 "MediaPage.c"
 			}
 		}
 	}
@@ -6610,20 +6612,20 @@ static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction*
 	_tmp7_ = value;
 #line 920 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp6_, _tmp7_);
-#line 6614 "MediaPage.c"
+#line 6616 "MediaPage.c"
 }
 
 
 static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	gboolean need_warn = FALSE;
 	GeeArrayList* to_set = NULL;
-	GeeArrayList* _tmp4_ = NULL;
+	GeeArrayList* _tmp4_;
 	gboolean _tmp31_ = FALSE;
-	gboolean _tmp32_ = FALSE;
+	gboolean _tmp32_;
 #line 924 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 924 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6638,7 +6640,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 	if (_tmp3_) {
 #line 925 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 6642 "MediaPage.c"
+#line 6644 "MediaPage.c"
 	}
 #line 930 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	need_warn = FALSE;
@@ -6646,17 +6648,17 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 	_tmp4_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	to_set = _tmp4_;
-#line 6650 "MediaPage.c"
+#line 6652 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
-		ViewCollection* _tmp5_ = NULL;
-		ViewCollection* _tmp6_ = NULL;
-		GeeList* _tmp7_ = NULL;
-		GeeList* _tmp8_ = NULL;
+		ViewCollection* _tmp5_;
+		ViewCollection* _tmp6_;
+		GeeList* _tmp7_;
+		GeeList* _tmp8_;
 		gint _view_size = 0;
-		GeeList* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
+		GeeList* _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
 		gint _view_index = 0;
 #line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -6682,20 +6684,20 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 		_view_index = -1;
 #line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 6686 "MediaPage.c"
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
-			gint _tmp14_ = 0;
+#line 6688 "MediaPage.c"
+			gint _tmp12_;
+			gint _tmp13_;
+			gint _tmp14_;
 			DataView* view = NULL;
-			GeeList* _tmp15_ = NULL;
-			gint _tmp16_ = 0;
-			gpointer _tmp17_ = NULL;
+			GeeList* _tmp15_;
+			gint _tmp16_;
+			gpointer _tmp17_;
 			Photo* p = NULL;
-			DataView* _tmp18_ = NULL;
-			DataSource* _tmp19_ = NULL;
-			Photo* _tmp20_ = NULL;
+			DataView* _tmp18_;
+			DataSource* _tmp19_;
+			Photo* _tmp20_;
 			gboolean _tmp21_ = FALSE;
-			Photo* _tmp22_ = NULL;
+			Photo* _tmp22_;
 #line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = _view_index;
 #line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6708,7 +6710,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 			if (!(_tmp13_ < _tmp14_)) {
 #line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6712 "MediaPage.c"
+#line 6714 "MediaPage.c"
 			}
 #line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _view_list;
@@ -6728,7 +6730,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 			if (_tmp20_ == NULL) {
 #line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_tmp19_);
-#line 6732 "MediaPage.c"
+#line 6734 "MediaPage.c"
 			}
 #line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			p = _tmp20_;
@@ -6736,11 +6738,11 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 			_tmp22_ = p;
 #line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp22_ != NULL) {
-#line 6740 "MediaPage.c"
-				RawDeveloper _tmp23_ = 0;
-				Photo* _tmp24_ = NULL;
-				RawDeveloper _tmp25_ = 0;
-				gboolean _tmp26_ = FALSE;
+#line 6742 "MediaPage.c"
+				RawDeveloper _tmp23_;
+				Photo* _tmp24_;
+				RawDeveloper _tmp25_;
+				gboolean _tmp26_;
 #line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp23_ = rd;
 #line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6751,19 +6753,19 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 				_tmp26_ = raw_developer_is_equivalent (_tmp23_, _tmp25_);
 #line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp21_ = !_tmp26_;
-#line 6755 "MediaPage.c"
+#line 6757 "MediaPage.c"
 			} else {
 #line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp21_ = FALSE;
-#line 6759 "MediaPage.c"
+#line 6761 "MediaPage.c"
 			}
 #line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp21_) {
-#line 6763 "MediaPage.c"
-				GeeArrayList* _tmp27_ = NULL;
-				DataView* _tmp28_ = NULL;
-				Photo* _tmp29_ = NULL;
-				gboolean _tmp30_ = FALSE;
+#line 6765 "MediaPage.c"
+				GeeArrayList* _tmp27_;
+				DataView* _tmp28_;
+				Photo* _tmp29_;
+				gboolean _tmp30_;
 #line 937 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp27_ = to_set;
 #line 937 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6778,18 +6780,18 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 				if (_tmp30_) {
 #line 940 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					need_warn = TRUE;
-#line 6782 "MediaPage.c"
+#line 6784 "MediaPage.c"
 				}
 			}
 #line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (p);
 #line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 6789 "MediaPage.c"
+#line 6791 "MediaPage.c"
 		}
 #line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 6793 "MediaPage.c"
+#line 6795 "MediaPage.c"
 	}
 #line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp32_ = need_warn;
@@ -6797,12 +6799,12 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 	if (!_tmp32_) {
 #line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp31_ = TRUE;
-#line 6801 "MediaPage.c"
+#line 6803 "MediaPage.c"
 	} else {
-		GeeArrayList* _tmp33_ = NULL;
-		gint _tmp34_ = 0;
-		gint _tmp35_ = 0;
-		gboolean _tmp36_ = FALSE;
+		GeeArrayList* _tmp33_;
+		gint _tmp34_;
+		gint _tmp35_;
+		gboolean _tmp36_;
 #line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp33_ = to_set;
 #line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6813,18 +6815,18 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 		_tmp36_ = dialogs_confirm_warn_developer_changed (_tmp35_);
 #line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp31_ = _tmp36_;
-#line 6817 "MediaPage.c"
+#line 6819 "MediaPage.c"
 	}
 #line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp31_) {
-#line 6821 "MediaPage.c"
+#line 6823 "MediaPage.c"
 		SetRawDeveloperCommand* command = NULL;
-		GeeArrayList* _tmp37_ = NULL;
-		RawDeveloper _tmp38_ = 0;
-		SetRawDeveloperCommand* _tmp39_ = NULL;
-		CommandManager* _tmp40_ = NULL;
-		CommandManager* _tmp41_ = NULL;
-		SetRawDeveloperCommand* _tmp42_ = NULL;
+		GeeArrayList* _tmp37_;
+		RawDeveloper _tmp38_;
+		SetRawDeveloperCommand* _tmp39_;
+		CommandManager* _tmp40_;
+		CommandManager* _tmp41_;
+		SetRawDeveloperCommand* _tmp42_;
 #line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp37_ = to_set;
 #line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6847,11 +6849,11 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 		media_page_update_development_menu_item_sensitivity (self);
 #line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (command);
-#line 6851 "MediaPage.c"
+#line 6853 "MediaPage.c"
 	}
 #line 923 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (to_set);
-#line 6855 "MediaPage.c"
+#line 6857 "MediaPage.c"
 }
 
 
@@ -6860,14 +6862,14 @@ void media_page_developer_changed (MediaPage* self, RawDeveloper rd) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 923 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->developer_changed (self, rd);
-#line 6864 "MediaPage.c"
+#line 6866 "MediaPage.c"
 }
 
 
 static void media_page_real_set_display_titles (CheckerboardPage* base, gboolean display) {
 	MediaPage * self;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
 #line 953 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 954 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6878,14 +6880,14 @@ static void media_page_real_set_display_titles (CheckerboardPage* base, gboolean
 	_tmp1_ = display;
 #line 956 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_);
-#line 6882 "MediaPage.c"
+#line 6884 "MediaPage.c"
 }
 
 
 static void media_page_real_set_display_comments (CheckerboardPage* base, gboolean display) {
 	MediaPage * self;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
 #line 959 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6896,14 +6898,14 @@ static void media_page_real_set_display_comments (CheckerboardPage* base, gboole
 	_tmp1_ = display;
 #line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment", _tmp1_);
-#line 6900 "MediaPage.c"
+#line 6902 "MediaPage.c"
 }
 
 
 static GAction* media_page_sort_by_title_action (MediaPage* self) {
 	GAction* result = NULL;
 	GAction* action = NULL;
-	GAction* _tmp0_ = NULL;
+	GAction* _tmp0_;
 #line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
 #line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6916,14 +6918,14 @@ static GAction* media_page_sort_by_title_action (MediaPage* self) {
 	result = action;
 #line 968 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6920 "MediaPage.c"
+#line 6922 "MediaPage.c"
 }
 
 
 static GAction* media_page_sort_ascending_action (MediaPage* self) {
 	GAction* result = NULL;
 	GAction* action = NULL;
-	GAction* _tmp0_ = NULL;
+	GAction* _tmp0_;
 #line 971 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
 #line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6936,19 +6938,19 @@ static GAction* media_page_sort_ascending_action (MediaPage* self) {
 	result = action;
 #line 974 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6940 "MediaPage.c"
+#line 6942 "MediaPage.c"
 }
 
 
 gint media_page_get_menu_sort_by (MediaPage* self) {
 	gint result = 0;
-	GAction* _tmp0_ = NULL;
-	GAction* _tmp1_ = NULL;
-	GVariant* _tmp2_ = NULL;
-	GVariant* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	GAction* _tmp0_;
+	GAction* _tmp1_;
+	GVariant* _tmp2_;
+	GVariant* _tmp3_;
+	const gchar* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 #line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), 0);
 #line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6973,24 +6975,24 @@ gint media_page_get_menu_sort_by (MediaPage* self) {
 	result = _tmp6_;
 #line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6977 "MediaPage.c"
+#line 6979 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new30 (const gchar* value) {
 #line 984 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 6984 "MediaPage.c"
+#line 6986 "MediaPage.c"
 }
 
 
 void media_page_set_menu_sort_by (MediaPage* self, gint val) {
 	gchar* sort = NULL;
-	gint _tmp0_ = 0;
-	gchar* _tmp1_ = NULL;
-	GAction* _tmp2_ = NULL;
-	GAction* _tmp3_ = NULL;
-	GVariant* _tmp4_ = NULL;
+	gint _tmp0_;
+	gchar* _tmp1_;
+	GAction* _tmp2_;
+	GAction* _tmp3_;
+	GVariant* _tmp4_;
 #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 983 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7013,18 +7015,18 @@ void media_page_set_menu_sort_by (MediaPage* self, gint val) {
 	_g_object_unref0 (_tmp3_);
 #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (sort);
-#line 7017 "MediaPage.c"
+#line 7019 "MediaPage.c"
 }
 
 
 gboolean media_page_get_menu_sort_order (MediaPage* self) {
 	gboolean result = FALSE;
-	GAction* _tmp0_ = NULL;
-	GAction* _tmp1_ = NULL;
-	GVariant* _tmp2_ = NULL;
-	GVariant* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	GAction* _tmp0_;
+	GAction* _tmp1_;
+	GVariant* _tmp2_;
+	GVariant* _tmp3_;
+	const gchar* _tmp4_;
+	gboolean _tmp5_;
 #line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
 #line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7047,23 +7049,23 @@ gboolean media_page_get_menu_sort_order (MediaPage* self) {
 	result = _tmp5_;
 #line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7051 "MediaPage.c"
+#line 7053 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new31 (const gchar* value) {
 #line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 7058 "MediaPage.c"
+#line 7060 "MediaPage.c"
 }
 
 
 void media_page_set_menu_sort_order (MediaPage* self, gboolean ascending) {
 	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GAction* _tmp2_ = NULL;
-	GAction* _tmp3_ = NULL;
-	GVariant* _tmp4_ = NULL;
+	gboolean _tmp1_;
+	GAction* _tmp2_;
+	GAction* _tmp3_;
+	GVariant* _tmp4_;
 #line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7072,11 +7074,11 @@ void media_page_set_menu_sort_order (MediaPage* self, gboolean ascending) {
 	if (_tmp1_) {
 #line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = "ascending";
-#line 7076 "MediaPage.c"
+#line 7078 "MediaPage.c"
 	} else {
 #line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = "descending";
-#line 7080 "MediaPage.c"
+#line 7082 "MediaPage.c"
 	}
 #line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = media_page_sort_ascending_action (self);
@@ -7090,7 +7092,7 @@ void media_page_set_menu_sort_order (MediaPage* self, gboolean ascending) {
 	_g_variant_unref0 (_tmp4_);
 #line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 7094 "MediaPage.c"
+#line 7096 "MediaPage.c"
 }
 
 
@@ -7099,7 +7101,7 @@ static gint64 _thumbnail_title_ascending_comparator_comparator (void* a, void* b
 	result = thumbnail_title_ascending_comparator (a, b);
 #line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7103 "MediaPage.c"
+#line 7105 "MediaPage.c"
 }
 
 
@@ -7108,7 +7110,7 @@ static gint64 _thumbnail_title_descending_comparator_comparator (void* a, void*
 	result = thumbnail_title_descending_comparator (a, b);
 #line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7112 "MediaPage.c"
+#line 7114 "MediaPage.c"
 }
 
 
@@ -7117,7 +7119,7 @@ static gboolean _thumbnail_title_comparator_predicate_comparator_predicate (Data
 	result = thumbnail_title_comparator_predicate (object, alteration);
 #line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7121 "MediaPage.c"
+#line 7123 "MediaPage.c"
 }
 
 
@@ -7126,7 +7128,7 @@ static gint64 _thumbnail_exposure_time_ascending_comparator_comparator (void* a,
 	result = thumbnail_exposure_time_ascending_comparator (a, b);
 #line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7130 "MediaPage.c"
+#line 7132 "MediaPage.c"
 }
 
 
@@ -7135,7 +7137,7 @@ static gint64 _thumbnail_exposure_time_desending_comparator_comparator (void* a,
 	result = thumbnail_exposure_time_desending_comparator (a, b);
 #line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7139 "MediaPage.c"
+#line 7141 "MediaPage.c"
 }
 
 
@@ -7144,7 +7146,7 @@ static gboolean _thumbnail_exposure_time_comparator_predicate_comparator_predica
 	result = thumbnail_exposure_time_comparator_predicate (object, alteration);
 #line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7148 "MediaPage.c"
+#line 7150 "MediaPage.c"
 }
 
 
@@ -7153,7 +7155,7 @@ static gint64 _thumbnail_rating_ascending_comparator_comparator (void* a, void*
 	result = thumbnail_rating_ascending_comparator (a, b);
 #line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7157 "MediaPage.c"
+#line 7159 "MediaPage.c"
 }
 
 
@@ -7162,7 +7164,7 @@ static gint64 _thumbnail_rating_descending_comparator_comparator (void* a, void*
 	result = thumbnail_rating_descending_comparator (a, b);
 #line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7166 "MediaPage.c"
+#line 7168 "MediaPage.c"
 }
 
 
@@ -7171,7 +7173,7 @@ static gboolean _thumbnail_rating_comparator_predicate_comparator_predicate (Dat
 	result = thumbnail_rating_comparator_predicate (object, alteration);
 #line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7175 "MediaPage.c"
+#line 7177 "MediaPage.c"
 }
 
 
@@ -7180,7 +7182,7 @@ static gint64 _thumbnail_filename_ascending_comparator_comparator (void* a, void
 	result = thumbnail_filename_ascending_comparator (a, b);
 #line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7184 "MediaPage.c"
+#line 7186 "MediaPage.c"
 }
 
 
@@ -7189,7 +7191,7 @@ static gint64 _thumbnail_filename_descending_comparator_comparator (void* a, voi
 	result = thumbnail_filename_descending_comparator (a, b);
 #line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7193 "MediaPage.c"
+#line 7195 "MediaPage.c"
 }
 
 
@@ -7198,7 +7200,7 @@ static gboolean _thumbnail_filename_comparator_predicate_comparator_predicate (D
 	result = thumbnail_filename_comparator_predicate (object, alteration);
 #line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7202 "MediaPage.c"
+#line 7204 "MediaPage.c"
 }
 
 
@@ -7209,13 +7211,13 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 	ComparatorPredicate predicate = NULL;
 	void* predicate_target = NULL;
 	GDestroyNotify predicate_target_destroy_notify = NULL;
-	gint _tmp0_ = 0;
-	ViewCollection* _tmp8_ = NULL;
-	ViewCollection* _tmp9_ = NULL;
-	Comparator _tmp10_ = NULL;
-	void* _tmp10__target = NULL;
-	ComparatorPredicate _tmp11_ = NULL;
-	void* _tmp11__target = NULL;
+	gint _tmp0_;
+	ViewCollection* _tmp8_;
+	ViewCollection* _tmp9_;
+	Comparator _tmp10_;
+	void* _tmp10__target;
+	ComparatorPredicate _tmp11_;
+	void* _tmp11__target;
 #line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7224,9 +7226,9 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 	switch (_tmp0_) {
 #line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_TITLE:
-#line 7228 "MediaPage.c"
+#line 7230 "MediaPage.c"
 		{
-			gboolean _tmp1_ = FALSE;
+			gboolean _tmp1_;
 #line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp1_ = ascending;
 #line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7245,7 +7247,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 				comparator_target = NULL;
 #line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7249 "MediaPage.c"
+#line 7251 "MediaPage.c"
 			} else {
 #line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
@@ -7261,7 +7263,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 				comparator_target = NULL;
 #line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7265 "MediaPage.c"
+#line 7267 "MediaPage.c"
 			}
 #line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
@@ -7279,13 +7281,13 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 			predicate_target_destroy_notify = NULL;
 #line 1006 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7283 "MediaPage.c"
+#line 7285 "MediaPage.c"
 		}
 #line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_EXPOSURE_DATE:
-#line 7287 "MediaPage.c"
+#line 7289 "MediaPage.c"
 		{
-			gboolean _tmp2_ = FALSE;
+			gboolean _tmp2_;
 #line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp2_ = ascending;
 #line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7304,7 +7306,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 				comparator_target = NULL;
 #line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7308 "MediaPage.c"
+#line 7310 "MediaPage.c"
 			} else {
 #line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
@@ -7320,7 +7322,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 				comparator_target = NULL;
 #line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7324 "MediaPage.c"
+#line 7326 "MediaPage.c"
 			}
 #line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
@@ -7338,13 +7340,13 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 			predicate_target_destroy_notify = NULL;
 #line 1013 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7342 "MediaPage.c"
+#line 7344 "MediaPage.c"
 		}
 #line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_RATING:
-#line 7346 "MediaPage.c"
+#line 7348 "MediaPage.c"
 		{
-			gboolean _tmp3_ = FALSE;
+			gboolean _tmp3_;
 #line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp3_ = ascending;
 #line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7363,7 +7365,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 				comparator_target = NULL;
 #line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7367 "MediaPage.c"
+#line 7369 "MediaPage.c"
 			} else {
 #line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
@@ -7379,7 +7381,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 				comparator_target = NULL;
 #line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7383 "MediaPage.c"
+#line 7385 "MediaPage.c"
 			}
 #line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
@@ -7397,13 +7399,13 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 			predicate_target_destroy_notify = NULL;
 #line 1020 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7401 "MediaPage.c"
+#line 7403 "MediaPage.c"
 		}
 #line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_FILENAME:
-#line 7405 "MediaPage.c"
+#line 7407 "MediaPage.c"
 		{
-			gboolean _tmp4_ = FALSE;
+			gboolean _tmp4_;
 #line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp4_ = ascending;
 #line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7422,7 +7424,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 				comparator_target = NULL;
 #line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7426 "MediaPage.c"
+#line 7428 "MediaPage.c"
 			} else {
 #line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
@@ -7438,7 +7440,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 				comparator_target = NULL;
 #line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7442 "MediaPage.c"
+#line 7444 "MediaPage.c"
 			}
 #line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
@@ -7456,13 +7458,13 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 			predicate_target_destroy_notify = NULL;
 #line 1027 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7460 "MediaPage.c"
+#line 7462 "MediaPage.c"
 		}
 		default:
 		{
-			gint _tmp5_ = 0;
-			gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
+			gint _tmp5_;
+			gchar* _tmp6_;
+			gchar* _tmp7_;
 #line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp5_ = media_page_get_menu_sort_by (self);
 #line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7503,7 +7505,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 			predicate_target_destroy_notify = NULL;
 #line 1033 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7507 "MediaPage.c"
+#line 7509 "MediaPage.c"
 		}
 	}
 #line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7538,7 +7540,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 	comparator_target = NULL;
 #line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	comparator_target_destroy_notify = NULL;
-#line 7542 "MediaPage.c"
+#line 7544 "MediaPage.c"
 }
 
 
@@ -7561,7 +7563,7 @@ void media_page_sync_sort (MediaPage* self) {
 	media_page_set_menu_sort_order (self, sort_ascending);
 #line 1061 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_view_comparator (self, sort_by, sort_ascending);
-#line 7565 "MediaPage.c"
+#line 7567 "MediaPage.c"
 }
 
 
@@ -7573,30 +7575,30 @@ static void media_page_real_destroy (GtkWidget* base) {
 	media_page_disconnect_slider (self);
 #line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	GTK_WIDGET_CLASS (media_page_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), gtk_widget_get_type (), GtkWidget));
-#line 7577 "MediaPage.c"
+#line 7579 "MediaPage.c"
 }
 
 
 void media_page_increase_zoom_level (MediaPage* self) {
-	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
+	MediaPageZoomSliderAssembly* _tmp0_;
 #line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
 #line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 7589 "MediaPage.c"
-		MediaPageZoomSliderAssembly* _tmp1_ = NULL;
+#line 7591 "MediaPage.c"
+		MediaPageZoomSliderAssembly* _tmp1_;
 #line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = self->priv->connected_slider;
 #line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_zoom_slider_assembly_increase_step (_tmp1_);
-#line 7595 "MediaPage.c"
+#line 7597 "MediaPage.c"
 	} else {
 		gint new_scale = 0;
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		gint _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = media_page_get_thumb_size (self);
 #line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7609,31 +7611,31 @@ void media_page_increase_zoom_level (MediaPage* self) {
 		_tmp4_ = new_scale;
 #line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_set_thumb_size (self, _tmp4_);
-#line 7613 "MediaPage.c"
+#line 7615 "MediaPage.c"
 	}
 }
 
 
 void media_page_decrease_zoom_level (MediaPage* self) {
-	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
+	MediaPageZoomSliderAssembly* _tmp0_;
 #line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 1081 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
 #line 1081 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 7626 "MediaPage.c"
-		MediaPageZoomSliderAssembly* _tmp1_ = NULL;
+#line 7628 "MediaPage.c"
+		MediaPageZoomSliderAssembly* _tmp1_;
 #line 1082 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = self->priv->connected_slider;
 #line 1082 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_zoom_slider_assembly_decrease_step (_tmp1_);
-#line 7632 "MediaPage.c"
+#line 7634 "MediaPage.c"
 	} else {
 		gint new_scale = 0;
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		gint _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = media_page_get_thumb_size (self);
 #line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7646,16 +7648,16 @@ void media_page_decrease_zoom_level (MediaPage* self) {
 		_tmp4_ = new_scale;
 #line 1086 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_set_thumb_size (self, _tmp4_);
-#line 7650 "MediaPage.c"
+#line 7652 "MediaPage.c"
 	}
 }
 
 
 static DataView* media_page_real_create_thumbnail (MediaPage* self, DataSource* source) {
 	DataView* result = NULL;
-	DataSource* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	Thumbnail* _tmp2_ = NULL;
+	DataSource* _tmp0_;
+	gint _tmp1_;
+	Thumbnail* _tmp2_;
 #line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
 #line 1091 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7668,7 +7670,7 @@ static DataView* media_page_real_create_thumbnail (MediaPage* self, DataSource*
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView);
 #line 1091 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7672 "MediaPage.c"
+#line 7674 "MediaPage.c"
 }
 
 
@@ -7677,37 +7679,37 @@ DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source) {
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
 #line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return MEDIA_PAGE_GET_CLASS (self)->create_thumbnail (self, source);
-#line 7681 "MediaPage.c"
+#line 7683 "MediaPage.c"
 }
 
 
 void media_page_set_thumb_size (MediaPage* self, gint new_scale) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	CheckerboardLayout* _tmp10_ = NULL;
-	CheckerboardLayout* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	ViewCollection* _tmp13_ = NULL;
-	ViewCollection* _tmp14_ = NULL;
-	ViewCollection* _tmp15_ = NULL;
-	ViewCollection* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	CheckerboardLayout* _tmp10_;
+	CheckerboardLayout* _tmp11_;
+	gint _tmp12_;
+	ViewCollection* _tmp13_;
+	ViewCollection* _tmp14_;
+	ViewCollection* _tmp15_;
+	ViewCollection* _tmp16_;
+	gint _tmp17_;
 	GValue _tmp18_ = {0};
-	ViewCollection* _tmp19_ = NULL;
-	ViewCollection* _tmp20_ = NULL;
-	gint _tmp21_ = 0;
-	gint _tmp22_ = 0;
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
+	ViewCollection* _tmp19_;
+	ViewCollection* _tmp20_;
+	gint _tmp21_;
+	gint _tmp22_;
+	gint _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
 #line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7718,20 +7720,20 @@ void media_page_set_thumb_size (MediaPage* self, gint new_scale) {
 	if (_tmp1_ == _tmp2_) {
 #line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = TRUE;
-#line 7722 "MediaPage.c"
+#line 7724 "MediaPage.c"
 	} else {
-		gboolean _tmp3_ = FALSE;
+		gboolean _tmp3_;
 #line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = !_tmp3_;
-#line 7729 "MediaPage.c"
+#line 7731 "MediaPage.c"
 	}
 #line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_) {
 #line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 7735 "MediaPage.c"
+#line 7737 "MediaPage.c"
 	}
 #line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = new_scale;
@@ -7805,20 +7807,20 @@ void media_page_set_thumb_size (MediaPage* self, gint new_scale) {
 	_tmp26_ = _tmp25_;
 #line 1109 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp24_ > _tmp26_);
-#line 7809 "MediaPage.c"
+#line 7811 "MediaPage.c"
 }
 
 
 gint media_page_get_thumb_size (MediaPage* self) {
 	gint result = 0;
-	CheckerboardLayout* _tmp0_ = NULL;
-	CheckerboardLayout* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
-	CheckerboardLayout* _tmp9_ = NULL;
-	CheckerboardLayout* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
+	CheckerboardLayout* _tmp0_;
+	CheckerboardLayout* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
+	CheckerboardLayout* _tmp9_;
+	CheckerboardLayout* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
 #line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), 0);
 #line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7833,12 +7835,12 @@ gint media_page_get_thumb_size (MediaPage* self) {
 	_g_object_unref0 (_tmp1_);
 #line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 7837 "MediaPage.c"
-		CheckerboardLayout* _tmp4_ = NULL;
-		CheckerboardLayout* _tmp5_ = NULL;
-		ConfigFacade* _tmp6_ = NULL;
-		ConfigFacade* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
+#line 7839 "MediaPage.c"
+		CheckerboardLayout* _tmp4_;
+		CheckerboardLayout* _tmp5_;
+		ConfigFacade* _tmp6_;
+		ConfigFacade* _tmp7_;
+		gint _tmp8_;
 #line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
 #line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7855,7 +7857,7 @@ gint media_page_get_thumb_size (MediaPage* self) {
 		_g_object_unref0 (_tmp7_);
 #line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp5_);
-#line 7859 "MediaPage.c"
+#line 7861 "MediaPage.c"
 	}
 #line 1116 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
@@ -7871,7 +7873,7 @@ gint media_page_get_thumb_size (MediaPage* self) {
 	result = _tmp12_;
 #line 1116 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7875 "MediaPage.c"
+#line 7877 "MediaPage.c"
 }
 
 
@@ -7880,14 +7882,14 @@ static gboolean _media_page_zoom_slider_assembly_on_zoom_out_pressed_gtk_widget_
 	result = media_page_zoom_slider_assembly_on_zoom_out_pressed ((MediaPageZoomSliderAssembly*) self, event);
 #line 144 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7884 "MediaPage.c"
+#line 7886 "MediaPage.c"
 }
 
 
 static void _media_page_zoom_slider_assembly_on_slider_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 155 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_zoom_slider_assembly_on_slider_changed ((MediaPageZoomSliderAssembly*) self);
-#line 7891 "MediaPage.c"
+#line 7893 "MediaPage.c"
 }
 
 
@@ -7896,46 +7898,45 @@ static gboolean _media_page_zoom_slider_assembly_on_zoom_in_pressed_gtk_widget_b
 	result = media_page_zoom_slider_assembly_on_zoom_in_pressed ((MediaPageZoomSliderAssembly*) self, event);
 #line 168 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7900 "MediaPage.c"
+#line 7902 "MediaPage.c"
 }
 
 
 MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_construct (GType object_type) {
 	MediaPageZoomSliderAssembly * self = NULL;
 	GtkBox* zoom_group = NULL;
-	GtkBox* _tmp0_ = NULL;
+	GtkBox* _tmp0_;
 	GtkImage* zoom_out = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	GdkPixbuf* _tmp2_ = NULL;
-	GtkImage* _tmp3_ = NULL;
-	GtkImage* _tmp4_ = NULL;
+	GdkPixbuf* _tmp1_;
+	GdkPixbuf* _tmp2_;
+	GtkImage* _tmp3_;
+	GtkImage* _tmp4_;
 	GtkEventBox* zoom_out_box = NULL;
-	GtkEventBox* _tmp5_ = NULL;
+	GtkEventBox* _tmp5_;
 	gint persisted_scale = 0;
-	ConfigFacade* _tmp6_ = NULL;
-	ConfigFacade* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	gdouble _tmp10_ = 0.0;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	gdouble _tmp13_ = 0.0;
-	GtkAdjustment* _tmp14_ = NULL;
-	GtkAdjustment* _tmp15_ = NULL;
-	GtkScale* _tmp16_ = NULL;
-	GtkScale* _tmp17_ = NULL;
-	GtkScale* _tmp18_ = NULL;
-	GtkScale* _tmp19_ = NULL;
-	GtkScale* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	GtkScale* _tmp22_ = NULL;
+	ConfigFacade* _tmp6_;
+	ConfigFacade* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	gdouble _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	gdouble _tmp13_;
+	GtkAdjustment* _tmp14_;
+	GtkAdjustment* _tmp15_;
+	GtkScale* _tmp16_;
+	GtkScale* _tmp17_;
+	GtkScale* _tmp18_;
+	GtkScale* _tmp19_;
+	GtkScale* _tmp20_;
+	GtkScale* _tmp21_;
 	GtkImage* zoom_in = NULL;
-	GdkPixbuf* _tmp23_ = NULL;
-	GdkPixbuf* _tmp24_ = NULL;
-	GtkImage* _tmp25_ = NULL;
-	GtkImage* _tmp26_ = NULL;
+	GdkPixbuf* _tmp22_;
+	GdkPixbuf* _tmp23_;
+	GtkImage* _tmp24_;
+	GtkImage* _tmp25_;
 	GtkEventBox* zoom_in_box = NULL;
-	GtkEventBox* _tmp27_ = NULL;
+	GtkEventBox* _tmp26_;
 #line 135 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = (MediaPageZoomSliderAssembly*) g_object_new (object_type, NULL);
 #line 136 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -8027,33 +8028,31 @@ MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_construct (GType ob
 #line 158 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp20_ = self->priv->slider;
 #line 158 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp21_ = _ ("Adjust the size of the thumbnails");
-#line 158 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), _tmp21_);
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), _ ("Adjust the size of the thumbnails"));
 #line 160 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp22_ = self->priv->slider;
+	_tmp21_ = self->priv->slider;
 #line 160 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE);
+	_tmp22_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE);
 #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp24_ = _tmp23_;
+	_tmp23_ = _tmp22_;
 #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp25_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp24_);
+	_tmp24_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp23_);
 #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_object_ref_sink (_tmp25_);
+	g_object_ref_sink (_tmp24_);
 #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp26_ = _tmp25_;
+	_tmp25_ = _tmp24_;
 #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp24_);
+	_g_object_unref0 (_tmp23_);
 #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	zoom_in = _tmp26_;
+	zoom_in = _tmp25_;
 #line 164 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp27_ = (GtkEventBox*) gtk_event_box_new ();
+	_tmp26_ = (GtkEventBox*) gtk_event_box_new ();
 #line 164 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_object_ref_sink (_tmp27_);
+	g_object_ref_sink (_tmp26_);
 #line 164 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	zoom_in_box = _tmp27_;
+	zoom_in_box = _tmp26_;
 #line 165 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gtk_event_box_set_above_child (zoom_in_box, TRUE);
 #line 166 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -8078,28 +8077,28 @@ MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_construct (GType ob
 	_g_object_unref0 (zoom_group);
 #line 135 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self;
-#line 8082 "MediaPage.c"
+#line 8081 "MediaPage.c"
 }
 
 
 MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_new (void) {
 #line 135 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return media_page_zoom_slider_assembly_construct (MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY);
-#line 8089 "MediaPage.c"
+#line 8088 "MediaPage.c"
 }
 
 
 gdouble media_page_zoom_slider_assembly_scale_to_slider (gint value) {
 	gdouble result = 0.0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 #line 176 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = value;
 #line 176 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -8126,20 +8125,20 @@ gdouble media_page_zoom_slider_assembly_scale_to_slider (gint value) {
 	result = (gdouble) ((_tmp6_ - _tmp8_) / MEDIA_PAGE_SLIDER_STEPPING);
 #line 179 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 8130 "MediaPage.c"
+#line 8129 "MediaPage.c"
 }
 
 
 gint media_page_zoom_slider_assembly_slider_to_scale (gdouble value) {
 	gint result = 0;
 	gint res = 0;
-	gdouble _tmp0_ = 0.0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gdouble _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 #line 183 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = value;
 #line 183 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -8164,7 +8163,7 @@ gint media_page_zoom_slider_assembly_slider_to_scale (gdouble value) {
 	result = res;
 #line 188 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 8168 "MediaPage.c"
+#line 8167 "MediaPage.c"
 }
 
 
@@ -8180,7 +8179,7 @@ static gboolean media_page_zoom_slider_assembly_on_zoom_out_pressed (MediaPageZo
 	result = TRUE;
 #line 193 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 8184 "MediaPage.c"
+#line 8183 "MediaPage.c"
 }
 
 
@@ -8196,7 +8195,7 @@ static gboolean media_page_zoom_slider_assembly_on_zoom_in_pressed (MediaPageZoo
 	result = TRUE;
 #line 198 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 8200 "MediaPage.c"
+#line 8199 "MediaPage.c"
 }
 
 
@@ -8204,16 +8203,16 @@ static void media_page_zoom_slider_assembly_on_slider_changed (MediaPageZoomSlid
 #line 201 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self));
 #line 202 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_signal_emit_by_name (self, "zoom-changed");
-#line 8209 "MediaPage.c"
+	g_signal_emit (self, media_page_zoom_slider_assembly_signals[MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_ZOOM_CHANGED_SIGNAL], 0);
+#line 8208 "MediaPage.c"
 }
 
 
 void media_page_zoom_slider_assembly_snap_to_min (MediaPageZoomSliderAssembly* self) {
-	GtkScale* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gdouble _tmp3_ = 0.0;
+	GtkScale* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gdouble _tmp3_;
 #line 205 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self));
 #line 206 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -8226,15 +8225,15 @@ void media_page_zoom_slider_assembly_snap_to_min (MediaPageZoomSliderAssembly* s
 	_tmp3_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp2_);
 #line 206 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp3_);
-#line 8230 "MediaPage.c"
+#line 8229 "MediaPage.c"
 }
 
 
 void media_page_zoom_slider_assembly_snap_to_max (MediaPageZoomSliderAssembly* self) {
-	GtkScale* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gdouble _tmp3_ = 0.0;
+	GtkScale* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gdouble _tmp3_;
 #line 209 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self));
 #line 210 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -8247,19 +8246,19 @@ void media_page_zoom_slider_assembly_snap_to_max (MediaPageZoomSliderAssembly* s
 	_tmp3_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp2_);
 #line 210 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp3_);
-#line 8251 "MediaPage.c"
+#line 8250 "MediaPage.c"
 }
 
 
 void media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly* self) {
 	gint new_scale = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	GtkScale* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gdouble _tmp6_ = 0.0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	GtkScale* _tmp4_;
+	gint _tmp5_;
+	gdouble _tmp6_;
 #line 213 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self));
 #line 214 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -8276,7 +8275,7 @@ void media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly*
 	if (_tmp2_ == _tmp3_) {
 #line 217 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 8280 "MediaPage.c"
+#line 8279 "MediaPage.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = self->priv->slider;
@@ -8286,19 +8285,19 @@ void media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly*
 	_tmp6_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp5_);
 #line 219 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), _tmp6_);
-#line 8290 "MediaPage.c"
+#line 8289 "MediaPage.c"
 }
 
 
 void media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly* self) {
 	gint new_scale = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	GtkScale* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gdouble _tmp6_ = 0.0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	GtkScale* _tmp4_;
+	gint _tmp5_;
+	gdouble _tmp6_;
 #line 222 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self));
 #line 223 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -8315,7 +8314,7 @@ void media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly*
 	if (_tmp2_ == _tmp3_) {
 #line 226 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 8319 "MediaPage.c"
+#line 8318 "MediaPage.c"
 	}
 #line 228 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = self->priv->slider;
@@ -8325,15 +8324,15 @@ void media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly*
 	_tmp6_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp5_);
 #line 228 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), _tmp6_);
-#line 8329 "MediaPage.c"
+#line 8328 "MediaPage.c"
 }
 
 
 gint media_page_zoom_slider_assembly_get_scale (MediaPageZoomSliderAssembly* self) {
 	gint result = 0;
-	GtkScale* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	gint _tmp2_ = 0;
+	GtkScale* _tmp0_;
+	gdouble _tmp1_;
+	gint _tmp2_;
 #line 231 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self), 0);
 #line 232 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -8346,16 +8345,16 @@ gint media_page_zoom_slider_assembly_get_scale (MediaPageZoomSliderAssembly* sel
 	result = _tmp2_;
 #line 232 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 8350 "MediaPage.c"
+#line 8349 "MediaPage.c"
 }
 
 
 void media_page_zoom_slider_assembly_set_scale (MediaPageZoomSliderAssembly* self, gint scale) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	GtkScale* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gdouble _tmp4_ = 0.0;
+	gint _tmp0_;
+	gint _tmp1_;
+	GtkScale* _tmp2_;
+	gint _tmp3_;
+	gdouble _tmp4_;
 #line 235 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self));
 #line 236 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -8366,7 +8365,7 @@ void media_page_zoom_slider_assembly_set_scale (MediaPageZoomSliderAssembly* sel
 	if (_tmp0_ == _tmp1_) {
 #line 237 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 8370 "MediaPage.c"
+#line 8369 "MediaPage.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = self->priv->slider;
@@ -8376,7 +8375,7 @@ void media_page_zoom_slider_assembly_set_scale (MediaPageZoomSliderAssembly* sel
 	_tmp4_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp3_);
 #line 239 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), _tmp4_);
-#line 8380 "MediaPage.c"
+#line 8379 "MediaPage.c"
 }
 
 
@@ -8388,19 +8387,19 @@ static void media_page_zoom_slider_assembly_class_init (MediaPageZoomSliderAssem
 #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = media_page_zoom_slider_assembly_finalize;
 #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_signal_new ("zoom_changed", MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 8393 "MediaPage.c"
+	media_page_zoom_slider_assembly_signals[MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_ZOOM_CHANGED_SIGNAL] = g_signal_new ("zoom-changed", MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 8392 "MediaPage.c"
 }
 
 
 static void media_page_zoom_slider_assembly_instance_init (MediaPageZoomSliderAssembly * self) {
 #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv = MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_GET_PRIVATE (self);
-#line 8400 "MediaPage.c"
+#line 8399 "MediaPage.c"
 }
 
 
-static void media_page_zoom_slider_assembly_finalize (GObject* obj) {
+static void media_page_zoom_slider_assembly_finalize (GObject * obj) {
 	MediaPageZoomSliderAssembly * self;
 #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY, MediaPageZoomSliderAssembly);
@@ -8410,7 +8409,7 @@ static void media_page_zoom_slider_assembly_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->adjustment);
 #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (media_page_zoom_slider_assembly_parent_class)->finalize (obj);
-#line 8414 "MediaPage.c"
+#line 8413 "MediaPage.c"
 }
 
 
@@ -8432,86 +8431,86 @@ static void media_page_class_init (MediaPageClass * klass) {
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_type_class_add_private (klass, sizeof (MediaPagePrivate));
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) media_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) media_page_real_init_collect_ui_filenames;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) media_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) media_page_real_add_actions;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) media_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) media_page_real_remove_actions;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) media_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) media_page_real_update_actions;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*)(CheckerboardPage*)) media_page_real_get_view_tracker;
+	((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*) (CheckerboardPage *)) media_page_real_get_view_tracker;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((PageClass *) klass)->on_mousewheel_up = (gboolean (*)(Page*, GdkEventScroll*)) media_page_real_on_mousewheel_up;
+	((PageClass *) klass)->on_mousewheel_up = (gboolean (*) (Page *, GdkEventScroll*)) media_page_real_on_mousewheel_up;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((PageClass *) klass)->on_mousewheel_down = (gboolean (*)(Page*, GdkEventScroll*)) media_page_real_on_mousewheel_down;
+	((PageClass *) klass)->on_mousewheel_down = (gboolean (*) (Page *, GdkEventScroll*)) media_page_real_on_mousewheel_down;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((PageClass *) klass)->on_app_key_pressed = (gboolean (*)(Page*, GdkEventKey*)) media_page_real_on_app_key_pressed;
+	((PageClass *) klass)->on_app_key_pressed = (gboolean (*) (Page *, GdkEventKey*)) media_page_real_on_app_key_pressed;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((PageClass *) klass)->switched_to = (void (*)(Page*)) media_page_real_switched_to;
+	((PageClass *) klass)->switched_to = (void (*) (Page *)) media_page_real_switched_to;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((PageClass *) klass)->switching_from = (void (*)(Page*)) media_page_real_switching_from;
+	((PageClass *) klass)->switching_from = (void (*) (Page *)) media_page_real_switching_from;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_zoom_changed = (void (*)(MediaPage*)) media_page_real_on_zoom_changed;
+	((MediaPageClass *) klass)->on_zoom_changed = (void (*) (MediaPage *)) media_page_real_on_zoom_changed;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_export = (void (*)(MediaPage*)) media_page_real_on_export;
+	((MediaPageClass *) klass)->on_export = (void (*) (MediaPage *)) media_page_real_on_export;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_increase_size = (void (*)(MediaPage*)) media_page_real_on_increase_size;
+	((MediaPageClass *) klass)->on_increase_size = (void (*) (MediaPage *)) media_page_real_on_increase_size;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_decrease_size = (void (*)(MediaPage*)) media_page_real_on_decrease_size;
+	((MediaPageClass *) klass)->on_decrease_size = (void (*) (MediaPage *)) media_page_real_on_decrease_size;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_increase_rating = (void (*)(MediaPage*)) media_page_real_on_increase_rating;
+	((MediaPageClass *) klass)->on_increase_rating = (void (*) (MediaPage *)) media_page_real_on_increase_rating;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_decrease_rating = (void (*)(MediaPage*)) media_page_real_on_decrease_rating;
+	((MediaPageClass *) klass)->on_decrease_rating = (void (*) (MediaPage *)) media_page_real_on_decrease_rating;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_set_rating = (void (*)(MediaPage*, Rating)) media_page_real_on_set_rating;
+	((MediaPageClass *) klass)->on_set_rating = (void (*) (MediaPage *, Rating)) media_page_real_on_set_rating;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_rate_rejected = (void (*)(MediaPage*)) media_page_real_on_rate_rejected;
+	((MediaPageClass *) klass)->on_rate_rejected = (void (*) (MediaPage *)) media_page_real_on_rate_rejected;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_rate_unrated = (void (*)(MediaPage*)) media_page_real_on_rate_unrated;
+	((MediaPageClass *) klass)->on_rate_unrated = (void (*) (MediaPage *)) media_page_real_on_rate_unrated;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_rate_one = (void (*)(MediaPage*)) media_page_real_on_rate_one;
+	((MediaPageClass *) klass)->on_rate_one = (void (*) (MediaPage *)) media_page_real_on_rate_one;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_rate_two = (void (*)(MediaPage*)) media_page_real_on_rate_two;
+	((MediaPageClass *) klass)->on_rate_two = (void (*) (MediaPage *)) media_page_real_on_rate_two;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_rate_three = (void (*)(MediaPage*)) media_page_real_on_rate_three;
+	((MediaPageClass *) klass)->on_rate_three = (void (*) (MediaPage *)) media_page_real_on_rate_three;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_rate_four = (void (*)(MediaPage*)) media_page_real_on_rate_four;
+	((MediaPageClass *) klass)->on_rate_four = (void (*) (MediaPage *)) media_page_real_on_rate_four;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_rate_five = (void (*)(MediaPage*)) media_page_real_on_rate_five;
+	((MediaPageClass *) klass)->on_rate_five = (void (*) (MediaPage *)) media_page_real_on_rate_five;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_move_to_trash = (void (*)(MediaPage*)) media_page_real_on_move_to_trash;
+	((MediaPageClass *) klass)->on_move_to_trash = (void (*) (MediaPage *)) media_page_real_on_move_to_trash;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_edit_title = (void (*)(MediaPage*)) media_page_real_on_edit_title;
+	((MediaPageClass *) klass)->on_edit_title = (void (*) (MediaPage *)) media_page_real_on_edit_title;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_edit_comment = (void (*)(MediaPage*)) media_page_real_on_edit_comment;
+	((MediaPageClass *) klass)->on_edit_comment = (void (*) (MediaPage *)) media_page_real_on_edit_comment;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_display_titles = (void (*)(MediaPage*, GSimpleAction*, GVariant*)) media_page_real_on_display_titles;
+	((MediaPageClass *) klass)->on_display_titles = (void (*) (MediaPage *, GSimpleAction*, GVariant*)) media_page_real_on_display_titles;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_display_comments = (void (*)(MediaPage*, GSimpleAction*, GVariant*)) media_page_real_on_display_comments;
+	((MediaPageClass *) klass)->on_display_comments = (void (*) (MediaPage *, GSimpleAction*, GVariant*)) media_page_real_on_display_comments;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_display_ratings = (void (*)(MediaPage*, GSimpleAction*, GVariant*)) media_page_real_on_display_ratings;
+	((MediaPageClass *) klass)->on_display_ratings = (void (*) (MediaPage *, GSimpleAction*, GVariant*)) media_page_real_on_display_ratings;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_display_tags = (void (*)(MediaPage*, GSimpleAction*, GVariant*)) media_page_real_on_display_tags;
+	((MediaPageClass *) klass)->on_display_tags = (void (*) (MediaPage *, GSimpleAction*, GVariant*)) media_page_real_on_display_tags;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) media_page_real_get_config_photos_sort;
+	((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) media_page_real_get_config_photos_sort;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) media_page_real_set_config_photos_sort;
+	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) media_page_real_set_config_photos_sort;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->on_sort_changed = (void (*)(MediaPage*, GSimpleAction*, GVariant*)) media_page_real_on_sort_changed;
+	((MediaPageClass *) klass)->on_sort_changed = (void (*) (MediaPage *, GSimpleAction*, GVariant*)) media_page_real_on_sort_changed;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->developer_changed = (void (*)(MediaPage*, RawDeveloper)) media_page_real_developer_changed;
+	((MediaPageClass *) klass)->developer_changed = (void (*) (MediaPage *, RawDeveloper)) media_page_real_developer_changed;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((CheckerboardPageClass *) klass)->set_display_titles = (void (*)(CheckerboardPage*, gboolean)) media_page_real_set_display_titles;
+	((CheckerboardPageClass *) klass)->set_display_titles = (void (*) (CheckerboardPage *, gboolean)) media_page_real_set_display_titles;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((CheckerboardPageClass *) klass)->set_display_comments = (void (*)(CheckerboardPage*, gboolean)) media_page_real_set_display_comments;
+	((CheckerboardPageClass *) klass)->set_display_comments = (void (*) (CheckerboardPage *, gboolean)) media_page_real_set_display_comments;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((GtkWidgetClass *) klass)->destroy = (void (*)(GtkWidget*)) media_page_real_destroy;
+	((GtkWidgetClass *) klass)->destroy = (void (*) (GtkWidget *)) media_page_real_destroy;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((MediaPageClass *) klass)->create_thumbnail = (DataView* (*)(MediaPage*, DataSource*)) media_page_real_create_thumbnail;
+	((MediaPageClass *) klass)->create_thumbnail = (DataView* (*) (MediaPage *, DataSource*)) media_page_real_create_thumbnail;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = media_page_finalize;
-#line 8515 "MediaPage.c"
+#line 8514 "MediaPage.c"
 }
 
 
@@ -8522,11 +8521,11 @@ static void media_page_instance_init (MediaPage * self) {
 	self->priv->connected_slider = NULL;
 #line 244 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->dnd_handler = NULL;
-#line 8526 "MediaPage.c"
+#line 8525 "MediaPage.c"
 }
 
 
-static void media_page_finalize (GObject* obj) {
+static void media_page_finalize (GObject * obj) {
 	MediaPage * self;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_PAGE, MediaPage);
@@ -8538,7 +8537,7 @@ static void media_page_finalize (GObject* obj) {
 	_core_tracker_unref0 (self->priv->tracker);
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (media_page_parent_class)->finalize (obj);
-#line 8542 "MediaPage.c"
+#line 8541 "MediaPage.c"
 }
 
 
diff --git a/src/MediaViewTracker.c b/src/MediaViewTracker.c
index 1bedba7..e9756dd 100644
--- a/src/MediaViewTracker.c
+++ b/src/MediaViewTracker.c
@@ -1,4 +1,4 @@
-/* MediaViewTracker.c generated by valac 0.34.7, the Vala compiler
+/* MediaViewTracker.c generated by valac 0.36.6, the Vala compiler
  * generated from MediaViewTracker.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -168,8 +168,6 @@ typedef struct _PhotoClass PhotoClass;
 
 #define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ())
 
-#define TYPE_RAW_DEVELOPER (raw_developer_get_type ())
-
 #define TYPE_VIDEO_SOURCE (video_source_get_type ())
 #define VIDEO_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIDEO_SOURCE, VideoSource))
 #define VIDEO_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VIDEO_SOURCE, VideoSourceClass))
@@ -266,12 +264,6 @@ typedef enum  {
 	PHOTO_FILE_FORMAT_UNKNOWN
 } PhotoFileFormat;
 
-typedef enum  {
-	RAW_DEVELOPER_SHOTWELL = 0,
-	RAW_DEVELOPER_CAMERA,
-	RAW_DEVELOPER_EMBEDDED
-} RawDeveloper;
-
 struct _FlaggableIface {
 	GTypeInterface parent_iface;
 	gboolean (*is_flagged) (Flaggable* self);
@@ -282,7 +274,7 @@ struct _FlaggableIface {
 
 static gpointer media_view_tracker_parent_class = NULL;
 static gpointer media_accumulator_parent_class = NULL;
-static CoreTrackerAccumulatorIface* media_accumulator_core_tracker_accumulator_parent_iface = NULL;
+static CoreTrackerAccumulatorIface * media_accumulator_core_tracker_accumulator_parent_iface = NULL;
 
 gpointer core_tracker_ref (gpointer instance);
 void core_tracker_unref (gpointer instance);
@@ -321,7 +313,7 @@ gpointer value_get_alteration (const GValue* value);
 GType alteration_get_type (void) G_GNUC_CONST;
 GType core_tracker_accumulator_get_type (void) G_GNUC_CONST;
 void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected);
-static void media_view_tracker_finalize (CoreTracker* obj);
+static void media_view_tracker_finalize (CoreTracker * obj);
 enum  {
 	MEDIA_ACCUMULATOR_DUMMY_PROPERTY
 };
@@ -335,8 +327,6 @@ GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 PhotoFileFormat photo_get_master_file_format (Photo* self);
-GType raw_developer_get_type (void) G_GNUC_CONST;
-gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d);
 GType video_source_get_type (void) G_GNUC_CONST;
 GType flaggable_get_type (void) G_GNUC_CONST;
 gboolean flaggable_is_flagged (Flaggable* self);
@@ -346,15 +336,15 @@ gchar* media_accumulator_to_string (MediaAccumulator* self);
 GType video_get_type (void) G_GNUC_CONST;
 static gboolean media_accumulator_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration);
 gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail);
-static void media_accumulator_finalize (GObject* obj);
+static void media_accumulator_finalize (GObject * obj);
 
 
 MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollection* collection) {
 	MediaViewTracker* self = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	MediaAccumulator* _tmp1_ = NULL;
-	MediaAccumulator* _tmp2_ = NULL;
-	MediaAccumulator* _tmp3_ = NULL;
+	ViewCollection* _tmp0_;
+	MediaAccumulator* _tmp1_;
+	MediaAccumulator* _tmp2_;
+	MediaAccumulator* _tmp3_;
 #line 12 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (collection), NULL);
 #line 13 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
@@ -371,14 +361,14 @@ MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollectio
 	core_view_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_VIEW_TRACKER, CoreViewTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator));
 #line 12 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return self;
-#line 375 "MediaViewTracker.c"
+#line 365 "MediaViewTracker.c"
 }
 
 
 MediaViewTracker* media_view_tracker_new (ViewCollection* collection) {
 #line 12 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return media_view_tracker_construct (TYPE_MEDIA_VIEW_TRACKER, collection);
-#line 382 "MediaViewTracker.c"
+#line 372 "MediaViewTracker.c"
 }
 
 
@@ -387,14 +377,14 @@ static void media_view_tracker_class_init (MediaViewTrackerClass * klass) {
 	media_view_tracker_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	((CoreTrackerClass *) klass)->finalize = media_view_tracker_finalize;
-#line 391 "MediaViewTracker.c"
+#line 381 "MediaViewTracker.c"
 }
 
 
 static void media_view_tracker_instance_init (MediaViewTracker * self) {
-	MediaAccumulator* _tmp0_ = NULL;
-	MediaAccumulator* _tmp1_ = NULL;
-	MediaAccumulator* _tmp2_ = NULL;
+	MediaAccumulator* _tmp0_;
+	MediaAccumulator* _tmp1_;
+	MediaAccumulator* _tmp2_;
 #line 8 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp0_ = media_accumulator_new ();
 #line 8 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
@@ -407,11 +397,11 @@ static void media_view_tracker_instance_init (MediaViewTracker * self) {
 	_tmp2_ = media_accumulator_new ();
 #line 10 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self->selected = _tmp2_;
-#line 411 "MediaViewTracker.c"
+#line 401 "MediaViewTracker.c"
 }
 
 
-static void media_view_tracker_finalize (CoreTracker* obj) {
+static void media_view_tracker_finalize (CoreTracker * obj) {
 	MediaViewTracker * self;
 #line 7 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_VIEW_TRACKER, MediaViewTracker);
@@ -423,7 +413,7 @@ static void media_view_tracker_finalize (CoreTracker* obj) {
 	_g_object_unref0 (self->selected);
 #line 7 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	CORE_TRACKER_CLASS (media_view_tracker_parent_class)->finalize (obj);
-#line 427 "MediaViewTracker.c"
+#line 417 "MediaViewTracker.c"
 }
 
 
@@ -442,7 +432,7 @@ GType media_view_tracker_get_type (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 31 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 446 "MediaViewTracker.c"
+#line 436 "MediaViewTracker.c"
 }
 
 
@@ -450,18 +440,18 @@ static gboolean media_accumulator_real_include (CoreTrackerAccumulator* base, Da
 	MediaAccumulator * self;
 	gboolean result = FALSE;
 	DataSource* source = NULL;
-	DataObject* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	DataObject* _tmp0_;
+	DataSource* _tmp1_;
+	gint _tmp2_;
 	Photo* photo = NULL;
-	DataSource* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	Photo* _tmp5_ = NULL;
+	DataSource* _tmp3_;
+	Photo* _tmp4_;
+	Photo* _tmp5_;
 	Flaggable* flaggable = NULL;
-	DataSource* _tmp17_ = NULL;
-	Flaggable* _tmp18_ = NULL;
-	gboolean _tmp19_ = FALSE;
-	Flaggable* _tmp20_ = NULL;
+	DataSource* _tmp14_;
+	Flaggable* _tmp15_;
+	gboolean _tmp16_ = FALSE;
+	Flaggable* _tmp17_;
 #line 26 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_ACCUMULATOR, MediaAccumulator);
 #line 26 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
@@ -486,117 +476,100 @@ static gboolean media_accumulator_real_include (CoreTrackerAccumulator* base, Da
 	_tmp5_ = photo;
 #line 32 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	if (_tmp5_ != NULL) {
-#line 490 "MediaViewTracker.c"
-		Photo* _tmp6_ = NULL;
-		PhotoFileFormat _tmp7_ = 0;
-		gboolean _tmp9_ = FALSE;
-		Photo* _tmp10_ = NULL;
-		PhotoFileFormat _tmp11_ = 0;
+#line 480 "MediaViewTracker.c"
+		Photo* _tmp6_;
+		PhotoFileFormat _tmp7_;
+		Photo* _tmp9_;
+		PhotoFileFormat _tmp10_;
 #line 33 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp6_ = photo;
 #line 33 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp7_ = photo_get_master_file_format (_tmp6_);
 #line 33 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		if (_tmp7_ == PHOTO_FILE_FORMAT_RAW) {
-#line 502 "MediaViewTracker.c"
-			gint _tmp8_ = 0;
+#line 491 "MediaViewTracker.c"
+			gint _tmp8_;
 #line 34 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 			_tmp8_ = self->raw;
 #line 34 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 			self->raw = _tmp8_ + 1;
-#line 508 "MediaViewTracker.c"
+#line 497 "MediaViewTracker.c"
 		}
 #line 37 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp10_ = photo;
-#line 37 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp11_ = photo_get_master_file_format (_tmp10_);
+		_tmp9_ = photo;
 #line 37 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		if (_tmp11_ != PHOTO_FILE_FORMAT_RAW) {
+		_tmp10_ = photo_get_master_file_format (_tmp9_);
 #line 37 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp9_ = TRUE;
-#line 518 "MediaViewTracker.c"
-		} else {
-			Photo* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
+		if (_tmp10_ != PHOTO_FILE_FORMAT_RAW) {
+#line 505 "MediaViewTracker.c"
+			gint _tmp11_;
 #line 38 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp12_ = photo;
+			_tmp11_ = self->photos;
 #line 38 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp13_ = photo_is_raw_developer_available (_tmp12_, RAW_DEVELOPER_CAMERA);
-#line 38 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp9_ = _tmp13_;
-#line 528 "MediaViewTracker.c"
-		}
-#line 37 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		if (_tmp9_) {
-#line 532 "MediaViewTracker.c"
-			gint _tmp14_ = 0;
-#line 39 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp14_ = self->photos;
-#line 39 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			self->photos = _tmp14_ + 1;
-#line 538 "MediaViewTracker.c"
+			self->photos = _tmp11_ + 1;
+#line 511 "MediaViewTracker.c"
 		}
 	} else {
-		DataSource* _tmp15_ = NULL;
+		DataSource* _tmp12_;
+#line 40 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp12_ = source;
+#line 40 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_VIDEO_SOURCE)) {
+#line 519 "MediaViewTracker.c"
+			gint _tmp13_;
 #line 41 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp15_ = source;
+			_tmp13_ = self->videos;
 #line 41 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO_SOURCE)) {
-#line 546 "MediaViewTracker.c"
-			gint _tmp16_ = 0;
-#line 42 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp16_ = self->videos;
-#line 42 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			self->videos = _tmp16_ + 1;
-#line 552 "MediaViewTracker.c"
+			self->videos = _tmp13_ + 1;
+#line 525 "MediaViewTracker.c"
 		}
 	}
+#line 44 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	_tmp14_ = source;
+#line 44 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp14_) : NULL);
+#line 44 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	flaggable = _tmp15_;
 #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp17_ = source;
+	_tmp17_ = flaggable;
 #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp17_) : NULL);
+	if (_tmp17_ != NULL) {
+#line 538 "MediaViewTracker.c"
+		Flaggable* _tmp18_;
+		gboolean _tmp19_;
 #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	flaggable = _tmp18_;
-#line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp20_ = flaggable;
-#line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp20_ != NULL) {
-#line 565 "MediaViewTracker.c"
-		Flaggable* _tmp21_ = NULL;
-		gboolean _tmp22_ = FALSE;
-#line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp21_ = flaggable;
-#line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp22_ = flaggable_is_flagged (_tmp21_);
-#line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp19_ = _tmp22_;
-#line 574 "MediaViewTracker.c"
+		_tmp18_ = flaggable;
+#line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp19_ = flaggable_is_flagged (_tmp18_);
+#line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp16_ = _tmp19_;
+#line 547 "MediaViewTracker.c"
 	} else {
-#line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp19_ = FALSE;
-#line 578 "MediaViewTracker.c"
+#line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp16_ = FALSE;
+#line 551 "MediaViewTracker.c"
 	}
+#line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	if (_tmp16_) {
+#line 555 "MediaViewTracker.c"
+		gint _tmp20_;
 #line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp19_) {
-#line 582 "MediaViewTracker.c"
-		gint _tmp23_ = 0;
-#line 47 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp23_ = self->flagged;
-#line 47 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		self->flagged = _tmp23_ + 1;
-#line 588 "MediaViewTracker.c"
+		_tmp20_ = self->flagged;
+#line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		self->flagged = _tmp20_ + 1;
+#line 561 "MediaViewTracker.c"
 	}
-#line 50 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 49 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	result = TRUE;
-#line 50 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 49 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_g_object_unref0 (flaggable);
-#line 50 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 49 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_g_object_unref0 (photo);
-#line 50 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 49 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_g_object_unref0 (source);
-#line 50 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 49 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return result;
-#line 600 "MediaViewTracker.c"
+#line 573 "MediaViewTracker.c"
 }
 
 
@@ -604,341 +577,324 @@ static gboolean media_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 	MediaAccumulator * self;
 	gboolean result = FALSE;
 	DataSource* source = NULL;
-	DataObject* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp12_ = 0;
+	DataObject* _tmp0_;
+	DataSource* _tmp1_;
+	gint _tmp2_;
+	gint _tmp12_;
 	Photo* photo = NULL;
-	DataSource* _tmp13_ = NULL;
-	Photo* _tmp14_ = NULL;
-	Photo* _tmp15_ = NULL;
+	DataSource* _tmp13_;
+	Photo* _tmp14_;
+	Photo* _tmp15_;
 	Flaggable* flaggable = NULL;
-	DataSource* _tmp30_ = NULL;
-	Flaggable* _tmp31_ = NULL;
-	gboolean _tmp32_ = FALSE;
-	Flaggable* _tmp33_ = NULL;
-#line 53 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	DataSource* _tmp27_;
+	Flaggable* _tmp28_;
+	gboolean _tmp29_ = FALSE;
+	Flaggable* _tmp30_;
+#line 52 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_ACCUMULATOR, MediaAccumulator);
-#line 53 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 52 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 54 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 53 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp0_ = object;
-#line 54 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 53 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp1_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView));
-#line 54 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 53 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	source = _tmp1_;
-#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 55 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp2_ = self->total;
-#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 55 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	if (_tmp2_ < 1) {
-#line 635 "MediaViewTracker.c"
-		DataObject* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GType _tmp6_ = 0UL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 608 "MediaViewTracker.c"
+		DataObject* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		GType _tmp6_;
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp3_ = object;
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp4_ = data_object_to_string (_tmp3_);
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp5_ = _tmp4_;
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp6_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject));
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp7_ = g_type_name (_tmp6_);
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp8_ = media_accumulator_to_string (self);
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp9_ = _tmp8_;
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp10_ = g_strdup_printf ("Tried to remove DataObject %s from empty %s (%s)", _tmp5_, _tmp7_, _tmp9_);
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp11_ = _tmp10_;
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		g_warning ("MediaViewTracker.vala:57: %s", _tmp11_);
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		g_warning ("MediaViewTracker.vala:56: %s", _tmp11_);
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_g_free0 (_tmp11_);
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_g_free0 (_tmp9_);
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_g_free0 (_tmp5_);
-#line 59 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 58 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		result = FALSE;
-#line 59 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 58 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_g_object_unref0 (source);
-#line 59 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 58 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		return result;
-#line 677 "MediaViewTracker.c"
+#line 650 "MediaViewTracker.c"
 	}
-#line 61 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 60 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp12_ = self->total;
-#line 61 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 60 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self->total = _tmp12_ - 1;
-#line 63 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 62 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp13_ = source;
-#line 63 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 62 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_PHOTO) ? ((Photo*) _tmp13_) : NULL);
-#line 63 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 62 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	photo = _tmp14_;
-#line 64 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 63 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp15_ = photo;
-#line 64 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 63 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	if (_tmp15_ != NULL) {
-#line 693 "MediaViewTracker.c"
-		Photo* _tmp16_ = NULL;
-		PhotoFileFormat _tmp17_ = 0;
-		gboolean _tmp20_ = FALSE;
-		Photo* _tmp21_ = NULL;
-		PhotoFileFormat _tmp22_ = 0;
-#line 65 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 666 "MediaViewTracker.c"
+		Photo* _tmp16_;
+		PhotoFileFormat _tmp17_;
+		Photo* _tmp20_;
+		PhotoFileFormat _tmp21_;
+#line 64 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp16_ = photo;
-#line 65 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 64 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp17_ = photo_get_master_file_format (_tmp16_);
-#line 65 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 64 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		if (_tmp17_ == PHOTO_FILE_FORMAT_RAW) {
-#line 705 "MediaViewTracker.c"
-			gint _tmp18_ = 0;
-			gint _tmp19_ = 0;
-#line 66 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 677 "MediaViewTracker.c"
+			gint _tmp18_;
+			gint _tmp19_;
+#line 65 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 			_tmp18_ = self->raw;
-#line 66 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 65 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 			_vala_assert (_tmp18_ > 0, "raw > 0");
-#line 67 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 66 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 			_tmp19_ = self->raw;
-#line 67 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 66 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 			self->raw = _tmp19_ - 1;
-#line 716 "MediaViewTracker.c"
+#line 688 "MediaViewTracker.c"
 		}
+#line 69 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp20_ = photo;
+#line 69 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp21_ = photo_get_master_file_format (_tmp20_);
+#line 69 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		if (_tmp21_ != PHOTO_FILE_FORMAT_RAW) {
+#line 696 "MediaViewTracker.c"
+			gint _tmp22_;
+			gint _tmp23_;
 #line 70 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp21_ = photo;
-#line 70 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp22_ = photo_get_master_file_format (_tmp21_);
+			_tmp22_ = self->photos;
 #line 70 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		if (_tmp22_ != PHOTO_FILE_FORMAT_RAW) {
-#line 70 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp20_ = TRUE;
-#line 726 "MediaViewTracker.c"
-		} else {
-			Photo* _tmp23_ = NULL;
-			gboolean _tmp24_ = FALSE;
+			_vala_assert (_tmp22_ > 0, "photos > 0");
 #line 71 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp23_ = photo;
+			_tmp23_ = self->photos;
 #line 71 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp24_ = photo_is_raw_developer_available (_tmp23_, RAW_DEVELOPER_CAMERA);
-#line 71 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp20_ = _tmp24_;
-#line 736 "MediaViewTracker.c"
+			self->photos = _tmp23_ - 1;
+#line 707 "MediaViewTracker.c"
 		}
-#line 70 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		if (_tmp20_) {
-#line 740 "MediaViewTracker.c"
-			gint _tmp25_ = 0;
-			gint _tmp26_ = 0;
-#line 72 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp25_ = self->photos;
-#line 72 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_vala_assert (_tmp25_ > 0, "photos > 0");
+	} else {
+		DataSource* _tmp24_;
 #line 73 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp26_ = self->photos;
+		_tmp24_ = source;
 #line 73 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			self->photos = _tmp26_ - 1;
-#line 751 "MediaViewTracker.c"
-		}
-	} else {
-		DataSource* _tmp27_ = NULL;
+		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, TYPE_VIDEO)) {
+#line 715 "MediaViewTracker.c"
+			gint _tmp25_;
+			gint _tmp26_;
+#line 74 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+			_tmp25_ = self->videos;
+#line 74 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+			_vala_assert (_tmp25_ > 0, "videos > 0");
 #line 75 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp27_ = source;
+			_tmp26_ = self->videos;
 #line 75 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_VIDEO)) {
-#line 759 "MediaViewTracker.c"
-			gint _tmp28_ = 0;
-			gint _tmp29_ = 0;
-#line 76 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp28_ = self->videos;
-#line 76 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_vala_assert (_tmp28_ > 0, "videos > 0");
-#line 77 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp29_ = self->videos;
-#line 77 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			self->videos = _tmp29_ - 1;
-#line 770 "MediaViewTracker.c"
+			self->videos = _tmp26_ - 1;
+#line 726 "MediaViewTracker.c"
 		}
 	}
+#line 78 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	_tmp27_ = source;
+#line 78 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp27_) : NULL);
+#line 78 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	flaggable = _tmp28_;
+#line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	_tmp30_ = flaggable;
+#line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	if (_tmp30_ != NULL) {
+#line 739 "MediaViewTracker.c"
+		Flaggable* _tmp31_;
+		gboolean _tmp32_;
+#line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp31_ = flaggable;
+#line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp32_ = flaggable_is_flagged (_tmp31_);
+#line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp29_ = _tmp32_;
+#line 748 "MediaViewTracker.c"
+	} else {
+#line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp29_ = FALSE;
+#line 752 "MediaViewTracker.c"
+	}
+#line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	if (_tmp29_) {
+#line 756 "MediaViewTracker.c"
+		gint _tmp33_;
+		gint _tmp34_;
 #line 80 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp30_ = source;
-#line 80 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp30_) : NULL);
+		_tmp33_ = self->flagged;
 #line 80 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	flaggable = _tmp31_;
+		_vala_assert (_tmp33_ > 0, "flagged > 0");
 #line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp33_ = flaggable;
+		_tmp34_ = self->flagged;
 #line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp33_ != NULL) {
-#line 783 "MediaViewTracker.c"
-		Flaggable* _tmp34_ = NULL;
-		gboolean _tmp35_ = FALSE;
-#line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp34_ = flaggable;
-#line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp35_ = flaggable_is_flagged (_tmp34_);
-#line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp32_ = _tmp35_;
-#line 792 "MediaViewTracker.c"
-	} else {
-#line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp32_ = FALSE;
-#line 796 "MediaViewTracker.c"
-	}
-#line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp32_) {
-#line 800 "MediaViewTracker.c"
-		gint _tmp36_ = 0;
-		gint _tmp37_ = 0;
-#line 82 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp36_ = self->flagged;
-#line 82 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_vala_assert (_tmp36_ > 0, "flagged > 0");
-#line 83 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp37_ = self->flagged;
-#line 83 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		self->flagged = _tmp37_ - 1;
-#line 811 "MediaViewTracker.c"
+		self->flagged = _tmp34_ - 1;
+#line 767 "MediaViewTracker.c"
 	}
-#line 87 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 85 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	result = TRUE;
-#line 87 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 85 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_g_object_unref0 (flaggable);
-#line 87 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 85 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_g_object_unref0 (photo);
-#line 87 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 85 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_g_object_unref0 (source);
-#line 87 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 85 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return result;
-#line 823 "MediaViewTracker.c"
+#line 779 "MediaViewTracker.c"
 }
 
 
 static gboolean media_accumulator_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration) {
 	MediaAccumulator * self;
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Alteration* _tmp0_;
+	gboolean _tmp1_;
 	Flaggable* flaggable = NULL;
-	DataObject* _tmp2_ = NULL;
-	DataSource* _tmp3_ = NULL;
-	Flaggable* _tmp4_ = NULL;
-	Flaggable* _tmp5_ = NULL;
-	Flaggable* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-#line 90 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	DataObject* _tmp2_;
+	DataSource* _tmp3_;
+	Flaggable* _tmp4_;
+	Flaggable* _tmp5_;
+	Flaggable* _tmp6_;
+	gboolean _tmp7_;
+#line 88 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_ACCUMULATOR, MediaAccumulator);
-#line 90 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 88 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 90 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 88 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
-#line 93 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 91 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp0_ = alteration;
-#line 93 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 91 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp1_ = alteration_has_detail (_tmp0_, "metadata", "flagged");
-#line 93 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 91 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	if (!_tmp1_) {
-#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 92 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		result = FALSE;
-#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 92 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		return result;
-#line 855 "MediaViewTracker.c"
+#line 811 "MediaViewTracker.c"
 	}
-#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp2_ = object;
-#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp3_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView));
-#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp3_) : NULL;
-#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	if (_tmp4_ == NULL) {
-#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_g_object_unref0 (_tmp3_);
-#line 867 "MediaViewTracker.c"
+#line 823 "MediaViewTracker.c"
 	}
-#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	flaggable = _tmp4_;
-#line 97 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 95 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp5_ = flaggable;
-#line 97 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 95 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	if (_tmp5_ == NULL) {
-#line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		result = FALSE;
-#line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_g_object_unref0 (flaggable);
-#line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		return result;
-#line 881 "MediaViewTracker.c"
+#line 837 "MediaViewTracker.c"
 	}
-#line 100 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp6_ = flaggable;
-#line 100 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp7_ = flaggable_is_flagged (_tmp6_);
-#line 100 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	if (_tmp7_) {
-#line 889 "MediaViewTracker.c"
-		gint _tmp8_ = 0;
-#line 101 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 845 "MediaViewTracker.c"
+		gint _tmp8_;
+#line 99 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp8_ = self->flagged;
-#line 101 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 99 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		self->flagged = _tmp8_ + 1;
-#line 895 "MediaViewTracker.c"
+#line 851 "MediaViewTracker.c"
 	} else {
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-#line 103 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		gint _tmp9_;
+		gint _tmp10_;
+#line 101 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp9_ = self->flagged;
-#line 103 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 101 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_vala_assert (_tmp9_ > 0, "flagged > 0");
-#line 104 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 102 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp10_ = self->flagged;
-#line 104 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 102 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		self->flagged = _tmp10_ - 1;
-#line 907 "MediaViewTracker.c"
+#line 863 "MediaViewTracker.c"
 	}
-#line 107 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 105 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	result = TRUE;
-#line 107 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 105 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_g_object_unref0 (flaggable);
-#line 107 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 105 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return result;
-#line 915 "MediaViewTracker.c"
+#line 871 "MediaViewTracker.c"
 }
 
 
 gchar* media_accumulator_to_string (MediaAccumulator* self) {
 	gchar* result = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gchar* _tmp4_ = NULL;
-#line 110 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gchar* _tmp4_;
+#line 108 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	g_return_val_if_fail (IS_MEDIA_ACCUMULATOR (self), NULL);
-#line 111 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 109 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp0_ = self->photos;
-#line 111 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 109 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp1_ = self->videos;
-#line 111 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 109 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp2_ = self->raw;
-#line 111 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 109 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp3_ = self->flagged;
-#line 111 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 109 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp4_ = g_strdup_printf ("%d photos/%d videos/%d raw/%d flagged", _tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 111 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 109 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	result = _tmp4_;
-#line 111 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 109 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return result;
-#line 942 "MediaViewTracker.c"
+#line 898 "MediaViewTracker.c"
 }
 
 
@@ -948,14 +904,14 @@ MediaAccumulator* media_accumulator_construct (GType object_type) {
 	self = (MediaAccumulator*) g_object_new (object_type, NULL);
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return self;
-#line 952 "MediaViewTracker.c"
+#line 908 "MediaViewTracker.c"
 }
 
 
 MediaAccumulator* media_accumulator_new (void) {
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return media_accumulator_construct (TYPE_MEDIA_ACCUMULATOR);
-#line 959 "MediaViewTracker.c"
+#line 915 "MediaViewTracker.c"
 }
 
 
@@ -964,7 +920,7 @@ static void media_accumulator_class_init (MediaAccumulatorClass * klass) {
 	media_accumulator_parent_class = g_type_class_peek_parent (klass);
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	G_OBJECT_CLASS (klass)->finalize = media_accumulator_finalize;
-#line 968 "MediaViewTracker.c"
+#line 924 "MediaViewTracker.c"
 }
 
 
@@ -972,12 +928,12 @@ static void media_accumulator_core_tracker_accumulator_interface_init (CoreTrack
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	media_accumulator_core_tracker_accumulator_parent_iface = g_type_interface_peek_parent (iface);
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	iface->include = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) media_accumulator_real_include;
+	iface->include = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) media_accumulator_real_include;
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	iface->uninclude = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) media_accumulator_real_uninclude;
+	iface->uninclude = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) media_accumulator_real_uninclude;
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	iface->altered = (gboolean (*)(CoreTrackerAccumulator*, DataObject*, Alteration*)) media_accumulator_real_altered;
-#line 981 "MediaViewTracker.c"
+	iface->altered = (gboolean (*) (CoreTrackerAccumulator *, DataObject*, Alteration*)) media_accumulator_real_altered;
+#line 937 "MediaViewTracker.c"
 }
 
 
@@ -992,17 +948,17 @@ static void media_accumulator_instance_init (MediaAccumulator * self) {
 	self->raw = 0;
 #line 24 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self->flagged = 0;
-#line 996 "MediaViewTracker.c"
+#line 952 "MediaViewTracker.c"
 }
 
 
-static void media_accumulator_finalize (GObject* obj) {
+static void media_accumulator_finalize (GObject * obj) {
 	MediaAccumulator * self;
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_ACCUMULATOR, MediaAccumulator);
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	G_OBJECT_CLASS (media_accumulator_parent_class)->finalize (obj);
-#line 1006 "MediaViewTracker.c"
+#line 962 "MediaViewTracker.c"
 }
 
 
diff --git a/src/MediaViewTracker.vala b/src/MediaViewTracker.vala
index 27fcf4a..ee96339 100644
--- a/src/MediaViewTracker.vala
+++ b/src/MediaViewTracker.vala
@@ -34,8 +34,7 @@ public class MediaAccumulator : Object, Core.TrackerAccumulator {
                 raw++;
             }
             
-            if (photo.get_master_file_format() != PhotoFileFormat.RAW || 
-                photo.is_raw_developer_available(RawDeveloper.CAMERA)) {
+            if (photo.get_master_file_format() != PhotoFileFormat.RAW) {
                 photos++;
             }
         } else if (source is VideoSource) {
@@ -67,8 +66,7 @@ public class MediaAccumulator : Object, Core.TrackerAccumulator {
                 raw--;
             }
             
-            if (photo.get_master_file_format() != PhotoFileFormat.RAW || 
-                photo.is_raw_developer_available(RawDeveloper.CAMERA)) {
+            if (photo.get_master_file_format() != PhotoFileFormat.RAW) {
                 assert(photos > 0);
                 photos--;
             }
@@ -111,4 +109,3 @@ public class MediaAccumulator : Object, Core.TrackerAccumulator {
         return "%d photos/%d videos/%d raw/%d flagged".printf(photos, videos, raw, flagged);
     }
 }
-
diff --git a/src/MetadataWriter.c b/src/MetadataWriter.c
index 1a9aeea..555f600 100644
--- a/src/MetadataWriter.c
+++ b/src/MetadataWriter.c
@@ -1,4 +1,4 @@
-/* MetadataWriter.c generated by valac 0.34.7, the Vala compiler
+/* MetadataWriter.c generated by valac 0.36.6, the Vala compiler
  * generated from MetadataWriter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -415,6 +415,11 @@ typedef struct _MetadataDateTimeClass MetadataDateTimeClass;
 #define _metadata_date_time_unref0(var) ((var == NULL) ? NULL : (var = (metadata_date_time_unref (var), NULL)))
 
 #define TYPE_ORIENTATION (orientation_get_type ())
+enum  {
+	METADATA_WRITER_PROGRESS_SIGNAL,
+	METADATA_WRITER_LAST_SIGNAL
+};
+static guint metadata_writer_signals[METADATA_WRITER_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -775,11 +780,11 @@ GType photo_metadata_get_type (void) G_GNUC_CONST;
 PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error);
 static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommitJob* self, PhotoMetadata* metadata, gboolean skip_orientation);
 void library_monitor_blacklist_file (GFile* file, const gchar* reason);
-gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportMasterState** state, GError** error);
+gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportMasterState* * state, GError** error);
 void library_monitor_unblacklist_file (GFile* file);
 PhotoFileFormat* photo_get_editable_file_format (Photo* self);
 PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error);
-gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportEditableState** state, GError** error);
+gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportEditableState* * state, GError** error);
 gchar* media_source_get_title (MediaSource* self);
 gchar* media_metadata_get_title (MediaMetadata* self);
 GType photo_metadata_set_option_get_type (void) G_GNUC_CONST;
@@ -816,143 +821,143 @@ void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientatio
 void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, const gchar* version);
 #define RESOURCES_APP_TITLE "Shotwell"
 #define RESOURCES_APP_VERSION _VERSION
-static void metadata_writer_commit_job_finalize (BackgroundJob* obj);
-static void metadata_writer_finalize (GObject* obj);
+static void metadata_writer_commit_job_finalize (BackgroundJob * obj);
+static void metadata_writer_finalize (GObject * obj);
 
 static const gchar* METADATA_WRITER_INTERESTED_PHOTO_METADATA_DETAILS[4] = {"name", "comment", "rating", "exposure-time"};
 
 static void _metadata_writer_on_config_changed_configuration_facade_commit_metadata_to_masters_changed (ConfigurationFacade* _sender, gpointer self) {
 #line 220 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_config_changed ((MetadataWriter*) self);
-#line 828 "MetadataWriter.c"
+#line 833 "MetadataWriter.c"
 }
 
 
 static void _metadata_writer_on_importing_photos_media_source_collection_media_import_starting (MediaSourceCollection* _sender, GeeCollection* media, gpointer self) {
 #line 222 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_importing_photos ((MetadataWriter*) self, media);
-#line 835 "MetadataWriter.c"
+#line 840 "MetadataWriter.c"
 }
 
 
 static void _metadata_writer_on_photos_imported_media_source_collection_media_import_completed (MediaSourceCollection* _sender, GeeCollection* media, gpointer self) {
 #line 223 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_photos_imported ((MetadataWriter*) self, media);
-#line 842 "MetadataWriter.c"
+#line 847 "MetadataWriter.c"
 }
 
 
 static void _metadata_writer_on_photos_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
 #line 224 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_photos_added_removed ((MetadataWriter*) self, added, removed);
-#line 849 "MetadataWriter.c"
+#line 854 "MetadataWriter.c"
 }
 
 
 static void _metadata_writer_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 225 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_photos_altered ((MetadataWriter*) self, items);
-#line 856 "MetadataWriter.c"
+#line 861 "MetadataWriter.c"
 }
 
 
 static void _metadata_writer_on_collection_frozen_data_collection_frozen (DataCollection* _sender, gpointer self) {
 #line 226 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_collection_frozen ((MetadataWriter*) self);
-#line 863 "MetadataWriter.c"
+#line 868 "MetadataWriter.c"
 }
 
 
 static void _metadata_writer_on_collection_thawed_data_collection_thawed (DataCollection* _sender, gpointer self) {
 #line 227 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_collection_thawed ((MetadataWriter*) self);
-#line 870 "MetadataWriter.c"
+#line 875 "MetadataWriter.c"
 }
 
 
 static void _metadata_writer_on_photos_destroyed_source_collection_items_destroyed (SourceCollection* _sender, GeeCollection* destroyed, gpointer self) {
 #line 228 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_photos_destroyed ((MetadataWriter*) self, destroyed);
-#line 877 "MetadataWriter.c"
+#line 882 "MetadataWriter.c"
 }
 
 
 static void _metadata_writer_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 230 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_tags_altered ((MetadataWriter*) self, items);
-#line 884 "MetadataWriter.c"
+#line 889 "MetadataWriter.c"
 }
 
 
 static void _metadata_writer_on_tag_contents_altered_container_source_collection_container_contents_altered (ContainerSourceCollection* _sender, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked, gpointer self) {
 #line 231 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_tag_contents_altered ((MetadataWriter*) self, container, added, relinked, removed, unlinked);
-#line 891 "MetadataWriter.c"
+#line 896 "MetadataWriter.c"
 }
 
 
 static void _metadata_writer_on_tag_backlink_removed_container_source_collection_backlink_to_container_removed (ContainerSourceCollection* _sender, ContainerSource* container, GeeCollection* sources, gpointer self) {
 #line 232 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_tag_backlink_removed ((MetadataWriter*) self, container, sources);
-#line 898 "MetadataWriter.c"
+#line 903 "MetadataWriter.c"
 }
 
 
 static void _metadata_writer_on_application_exiting_application_exiting (Application* _sender, gboolean panicked, gpointer self) {
 #line 236 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_application_exiting ((MetadataWriter*) self);
-#line 905 "MetadataWriter.c"
+#line 910 "MetadataWriter.c"
 }
 
 
 static void _metadata_writer_on_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) {
 #line 238 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_monitor_installed ((MetadataWriter*) self, monitor);
-#line 912 "MetadataWriter.c"
+#line 917 "MetadataWriter.c"
 }
 
 
 static void _metadata_writer_on_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) {
 #line 239 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_monitor_destroyed ((MetadataWriter*) self, monitor);
-#line 919 "MetadataWriter.c"
+#line 924 "MetadataWriter.c"
 }
 
 
 static void _metadata_writer_on_photo_dequeued_dequeued_callback (gconstpointer item, gpointer self) {
 #line 180 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_photo_dequeued ((MetadataWriter*) self, (LibraryPhoto*) item);
-#line 926 "MetadataWriter.c"
+#line 931 "MetadataWriter.c"
 }
 
 
 static MetadataWriter* metadata_writer_construct (GType object_type) {
 	MetadataWriter * self = NULL;
-	HashTimedQueue* _tmp0_ = NULL;
-	HashTimedQueue* _tmp1_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	ConfigFacade* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	ConfigFacade* _tmp8_ = NULL;
-	ConfigFacade* _tmp9_ = NULL;
-	LibraryPhotoSourceCollection* _tmp10_ = NULL;
-	LibraryPhotoSourceCollection* _tmp11_ = NULL;
-	LibraryPhotoSourceCollection* _tmp12_ = NULL;
-	LibraryPhotoSourceCollection* _tmp13_ = NULL;
-	LibraryPhotoSourceCollection* _tmp14_ = NULL;
-	LibraryPhotoSourceCollection* _tmp15_ = NULL;
-	LibraryPhotoSourceCollection* _tmp16_ = NULL;
-	TagSourceCollection* _tmp17_ = NULL;
-	TagSourceCollection* _tmp18_ = NULL;
-	TagSourceCollection* _tmp19_ = NULL;
-	TagSourceCollection* _tmp20_ = NULL;
-	TagSourceCollection* _tmp21_ = NULL;
-	Application* _tmp22_ = NULL;
-	Application* _tmp23_ = NULL;
-	LibraryMonitorPool* _tmp24_ = NULL;
-	LibraryMonitorPool* _tmp25_ = NULL;
-	LibraryMonitorPool* _tmp26_ = NULL;
-	LibraryMonitorPool* _tmp27_ = NULL;
+	HashTimedQueue* _tmp0_;
+	HashTimedQueue* _tmp1_;
+	ConfigFacade* _tmp5_;
+	ConfigFacade* _tmp6_;
+	gboolean _tmp7_;
+	ConfigFacade* _tmp8_;
+	ConfigFacade* _tmp9_;
+	LibraryPhotoSourceCollection* _tmp10_;
+	LibraryPhotoSourceCollection* _tmp11_;
+	LibraryPhotoSourceCollection* _tmp12_;
+	LibraryPhotoSourceCollection* _tmp13_;
+	LibraryPhotoSourceCollection* _tmp14_;
+	LibraryPhotoSourceCollection* _tmp15_;
+	LibraryPhotoSourceCollection* _tmp16_;
+	TagSourceCollection* _tmp17_;
+	TagSourceCollection* _tmp18_;
+	TagSourceCollection* _tmp19_;
+	TagSourceCollection* _tmp20_;
+	TagSourceCollection* _tmp21_;
+	Application* _tmp22_;
+	Application* _tmp23_;
+	LibraryMonitorPool* _tmp24_;
+	LibraryMonitorPool* _tmp25_;
+	LibraryMonitorPool* _tmp26_;
+	LibraryMonitorPool* _tmp27_;
 #line 179 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self = (MetadataWriter*) g_object_new (object_type, NULL);
 #line 180 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -967,7 +972,7 @@ static MetadataWriter* metadata_writer_construct (GType object_type) {
 	timed_queue_set_dequeue_spacing_msec (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TIMED_QUEUE, TimedQueue), METADATA_WRITER_COMMIT_SPACING_MSEC);
 #line 186 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_pause (self);
-#line 971 "MetadataWriter.c"
+#line 976 "MetadataWriter.c"
 	{
 		const gchar** detail_collection = NULL;
 		gint detail_collection_length1 = 0;
@@ -979,17 +984,17 @@ static MetadataWriter* metadata_writer_construct (GType object_type) {
 		detail_collection_length1 = G_N_ELEMENTS (METADATA_WRITER_INTERESTED_PHOTO_METADATA_DETAILS);
 #line 189 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		for (detail_it = 0; detail_it < G_N_ELEMENTS (METADATA_WRITER_INTERESTED_PHOTO_METADATA_DETAILS); detail_it = detail_it + 1) {
-#line 983 "MetadataWriter.c"
-			gchar* _tmp2_ = NULL;
+#line 988 "MetadataWriter.c"
+			gchar* _tmp2_;
 			gchar* detail = NULL;
 #line 189 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp2_ = g_strdup (detail_collection[detail_it]);
 #line 189 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			detail = _tmp2_;
-#line 990 "MetadataWriter.c"
+#line 995 "MetadataWriter.c"
 			{
-				GeeHashSet* _tmp3_ = NULL;
-				const gchar* _tmp4_ = NULL;
+				GeeHashSet* _tmp3_;
+				const gchar* _tmp4_;
 #line 190 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp3_ = self->priv->interested_photo_details;
 #line 190 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -998,7 +1003,7 @@ static MetadataWriter* metadata_writer_construct (GType object_type) {
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
 #line 189 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_g_free0 (detail);
-#line 1002 "MetadataWriter.c"
+#line 1007 "MetadataWriter.c"
 			}
 		}
 	}
@@ -1096,62 +1101,62 @@ static MetadataWriter* metadata_writer_construct (GType object_type) {
 	_library_monitor_pool_unref0 (_tmp27_);
 #line 179 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	return self;
-#line 1100 "MetadataWriter.c"
+#line 1105 "MetadataWriter.c"
 }
 
 
 static MetadataWriter* metadata_writer_new (void) {
 #line 179 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	return metadata_writer_construct (TYPE_METADATA_WRITER);
-#line 1107 "MetadataWriter.c"
+#line 1112 "MetadataWriter.c"
 }
 
 
 void metadata_writer_init (void) {
-	MetadataWriter* _tmp0_ = NULL;
+	MetadataWriter* _tmp0_;
 #line 243 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp0_ = metadata_writer_new ();
 #line 243 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_g_object_unref0 (metadata_writer_instance);
 #line 243 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_instance = _tmp0_;
-#line 1119 "MetadataWriter.c"
+#line 1124 "MetadataWriter.c"
 }
 
 
 void metadata_writer_terminate (void) {
-	MetadataWriter* _tmp0_ = NULL;
+	MetadataWriter* _tmp0_;
 #line 247 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp0_ = metadata_writer_instance;
 #line 247 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp0_ != NULL) {
-#line 1129 "MetadataWriter.c"
-		MetadataWriter* _tmp1_ = NULL;
+#line 1134 "MetadataWriter.c"
+		MetadataWriter* _tmp1_;
 #line 248 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp1_ = metadata_writer_instance;
 #line 248 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		metadata_writer_close (_tmp1_);
-#line 1135 "MetadataWriter.c"
+#line 1140 "MetadataWriter.c"
 	}
 #line 250 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_g_object_unref0 (metadata_writer_instance);
 #line 250 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_instance = NULL;
-#line 1141 "MetadataWriter.c"
+#line 1146 "MetadataWriter.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 254 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1148 "MetadataWriter.c"
+#line 1153 "MetadataWriter.c"
 }
 
 
 MetadataWriter* metadata_writer_get_instance (void) {
 	MetadataWriter* result = NULL;
-	MetadataWriter* _tmp0_ = NULL;
-	MetadataWriter* _tmp1_ = NULL;
+	MetadataWriter* _tmp0_;
+	MetadataWriter* _tmp1_;
 #line 254 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp0_ = metadata_writer_instance;
 #line 254 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1160,14 +1165,14 @@ MetadataWriter* metadata_writer_get_instance (void) {
 	result = _tmp1_;
 #line 254 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	return result;
-#line 1164 "MetadataWriter.c"
+#line 1169 "MetadataWriter.c"
 }
 
 
 void metadata_writer_force_rescan (MetadataWriter* self) {
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
+	LibraryPhotoSourceCollection* _tmp0_;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp2_;
 #line 258 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 259 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1180,13 +1185,13 @@ void metadata_writer_force_rescan (MetadataWriter* self) {
 	metadata_writer_schedule_if_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable), "force rescan");
 #line 259 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1184 "MetadataWriter.c"
+#line 1189 "MetadataWriter.c"
 }
 
 
 void metadata_writer_pause (MetadataWriter* self) {
-	gint _tmp0_ = 0;
-	HashTimedQueue* _tmp1_ = NULL;
+	gint _tmp0_;
+	HashTimedQueue* _tmp1_;
 #line 262 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 263 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1197,22 +1202,22 @@ void metadata_writer_pause (MetadataWriter* self) {
 	if (_tmp0_ != 0) {
 #line 264 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		return;
-#line 1201 "MetadataWriter.c"
+#line 1206 "MetadataWriter.c"
 	}
 #line 266 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp1_ = self->priv->dirty;
 #line 266 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	timed_queue_pause (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TIMED_QUEUE, TimedQueue));
 #line 268 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-	g_signal_emit_by_name (self, "progress", (guint) 0, (guint) 0);
-#line 1209 "MetadataWriter.c"
+	g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, (guint) 0, (guint) 0);
+#line 1214 "MetadataWriter.c"
 }
 
 
 void metadata_writer_unpause (MetadataWriter* self) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	HashTimedQueue* _tmp4_ = NULL;
+	gint _tmp1_;
+	HashTimedQueue* _tmp4_;
 #line 271 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 272 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1221,10 +1226,10 @@ void metadata_writer_unpause (MetadataWriter* self) {
 	if (_tmp1_ == 0) {
 #line 272 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp0_ = TRUE;
-#line 1225 "MetadataWriter.c"
+#line 1230 "MetadataWriter.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		gint _tmp2_;
+		gint _tmp3_;
 #line 272 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp2_ = self->priv->pause_count;
 #line 272 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1233,24 +1238,24 @@ void metadata_writer_unpause (MetadataWriter* self) {
 		_tmp3_ = self->priv->pause_count;
 #line 272 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 1237 "MetadataWriter.c"
+#line 1242 "MetadataWriter.c"
 	}
 #line 272 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp0_) {
 #line 273 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		return;
-#line 1243 "MetadataWriter.c"
+#line 1248 "MetadataWriter.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp4_ = self->priv->dirty;
 #line 275 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	timed_queue_unpause (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_TIMED_QUEUE, TimedQueue));
-#line 1249 "MetadataWriter.c"
+#line 1254 "MetadataWriter.c"
 }
 
 
 void metadata_writer_close (MetadataWriter* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 278 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 279 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1259,26 +1264,26 @@ void metadata_writer_close (MetadataWriter* self) {
 	if (_tmp0_) {
 #line 280 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		return;
-#line 1263 "MetadataWriter.c"
+#line 1268 "MetadataWriter.c"
 	}
 #line 282 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_cancel_all (self, TRUE);
 #line 284 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->priv->closed = TRUE;
-#line 1269 "MetadataWriter.c"
+#line 1274 "MetadataWriter.c"
 }
 
 
 static void metadata_writer_on_config_changed (MetadataWriter* self) {
 	gboolean value = FALSE;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp7_;
 #line 287 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 288 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1301,7 +1306,7 @@ static void metadata_writer_on_config_changed (MetadataWriter* self) {
 	if (_tmp4_ == _tmp5_) {
 #line 291 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		return;
-#line 1305 "MetadataWriter.c"
+#line 1310 "MetadataWriter.c"
 	}
 #line 293 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp6_ = value;
@@ -1313,11 +1318,11 @@ static void metadata_writer_on_config_changed (MetadataWriter* self) {
 	if (_tmp7_) {
 #line 295 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		metadata_writer_force_rescan (self);
-#line 1317 "MetadataWriter.c"
+#line 1322 "MetadataWriter.c"
 	} else {
 #line 297 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		metadata_writer_cancel_all (self, FALSE);
-#line 1321 "MetadataWriter.c"
+#line 1326 "MetadataWriter.c"
 	}
 }
 
@@ -1327,19 +1332,19 @@ static void metadata_writer_on_application_exiting (MetadataWriter* self) {
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 301 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_close (self);
-#line 1331 "MetadataWriter.c"
+#line 1336 "MetadataWriter.c"
 }
 
 
 static void _metadata_writer_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) {
 #line 305 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_discovery_completed ((MetadataWriter*) self);
-#line 1338 "MetadataWriter.c"
+#line 1343 "MetadataWriter.c"
 }
 
 
 static void metadata_writer_on_monitor_installed (MetadataWriter* self, LibraryMonitor* monitor) {
-	LibraryMonitor* _tmp0_ = NULL;
+	LibraryMonitor* _tmp0_;
 #line 304 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 304 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1348,13 +1353,13 @@ static void metadata_writer_on_monitor_installed (MetadataWriter* self, LibraryM
 	_tmp0_ = monitor;
 #line 305 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _metadata_writer_on_discovery_completed_directory_monitor_discovery_completed, self, 0);
-#line 1352 "MetadataWriter.c"
+#line 1357 "MetadataWriter.c"
 }
 
 
 static void metadata_writer_on_monitor_destroyed (MetadataWriter* self, LibraryMonitor* monitor) {
-	LibraryMonitor* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	LibraryMonitor* _tmp0_;
+	guint _tmp1_;
 #line 308 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 308 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1365,7 +1370,7 @@ static void metadata_writer_on_monitor_destroyed (MetadataWriter* self, LibraryM
 	g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp1_, NULL, FALSE);
 #line 309 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _metadata_writer_on_discovery_completed_directory_monitor_discovery_completed, self);
-#line 1369 "MetadataWriter.c"
+#line 1374 "MetadataWriter.c"
 }
 
 
@@ -1374,7 +1379,7 @@ static void metadata_writer_on_discovery_completed (MetadataWriter* self) {
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 313 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_unpause (self);
-#line 1378 "MetadataWriter.c"
+#line 1383 "MetadataWriter.c"
 }
 
 
@@ -1383,7 +1388,7 @@ static void metadata_writer_on_collection_frozen (MetadataWriter* self) {
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 317 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_pause (self);
-#line 1387 "MetadataWriter.c"
+#line 1392 "MetadataWriter.c"
 }
 
 
@@ -1392,13 +1397,13 @@ static void metadata_writer_on_collection_thawed (MetadataWriter* self) {
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 321 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_unpause (self);
-#line 1396 "MetadataWriter.c"
+#line 1401 "MetadataWriter.c"
 }
 
 
 static void metadata_writer_on_importing_photos (MetadataWriter* self, GeeCollection* media_sources) {
-	GeeHashSet* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	GeeHashSet* _tmp0_;
+	GeeCollection* _tmp1_;
 #line 324 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 324 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1409,13 +1414,13 @@ static void metadata_writer_on_importing_photos (MetadataWriter* self, GeeCollec
 	_tmp1_ = media_sources;
 #line 325 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1413 "MetadataWriter.c"
+#line 1418 "MetadataWriter.c"
 }
 
 
 static void metadata_writer_on_photos_imported (MetadataWriter* self, GeeCollection* media_sources) {
-	GeeHashSet* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	GeeHashSet* _tmp0_;
+	GeeCollection* _tmp1_;
 #line 328 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 328 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1426,14 +1431,14 @@ static void metadata_writer_on_photos_imported (MetadataWriter* self, GeeCollect
 	_tmp1_ = media_sources;
 #line 329 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1430 "MetadataWriter.c"
+#line 1435 "MetadataWriter.c"
 }
 
 
 static void metadata_writer_on_photos_added_removed (MetadataWriter* self, GeeIterable* added, GeeIterable* removed) {
 	gboolean _tmp0_ = FALSE;
-	GeeIterable* _tmp1_ = NULL;
-	GeeIterable* _tmp4_ = NULL;
+	GeeIterable* _tmp1_;
+	GeeIterable* _tmp4_;
 #line 332 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 332 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1444,42 +1449,42 @@ static void metadata_writer_on_photos_added_removed (MetadataWriter* self, GeeIt
 	_tmp1_ = added;
 #line 335 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp1_ != NULL) {
-#line 1448 "MetadataWriter.c"
-		gboolean _tmp2_ = FALSE;
+#line 1453 "MetadataWriter.c"
+		gboolean _tmp2_;
 #line 335 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp2_ = self->priv->enabled;
 #line 335 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp0_ = _tmp2_;
-#line 1454 "MetadataWriter.c"
+#line 1459 "MetadataWriter.c"
 	} else {
 #line 335 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp0_ = FALSE;
-#line 1458 "MetadataWriter.c"
+#line 1463 "MetadataWriter.c"
 	}
 #line 335 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp0_) {
-#line 1462 "MetadataWriter.c"
-		GeeIterable* _tmp3_ = NULL;
+#line 1467 "MetadataWriter.c"
+		GeeIterable* _tmp3_;
 #line 336 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp3_ = added;
 #line 336 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		metadata_writer_schedule_if_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable), "added to LibraryPhoto.global");
-#line 1468 "MetadataWriter.c"
+#line 1473 "MetadataWriter.c"
 	}
 #line 339 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp4_ = removed;
 #line 339 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp4_ != NULL) {
-#line 1474 "MetadataWriter.c"
+#line 1479 "MetadataWriter.c"
 		gboolean cancelled = FALSE;
-		gboolean _tmp15_ = FALSE;
+		gboolean _tmp15_;
 #line 340 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		cancelled = FALSE;
-#line 1479 "MetadataWriter.c"
+#line 1484 "MetadataWriter.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp5_ = NULL;
-			GeeIterator* _tmp6_ = NULL;
+			GeeIterable* _tmp5_;
+			GeeIterator* _tmp6_;
 #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp5_ = removed;
 #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1488,15 +1493,15 @@ static void metadata_writer_on_photos_added_removed (MetadataWriter* self, GeeIt
 			_object_it = _tmp6_;
 #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			while (TRUE) {
-#line 1492 "MetadataWriter.c"
-				GeeIterator* _tmp7_ = NULL;
-				gboolean _tmp8_ = FALSE;
+#line 1497 "MetadataWriter.c"
+				GeeIterator* _tmp7_;
+				gboolean _tmp8_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp9_ = NULL;
-				gpointer _tmp10_ = NULL;
+				GeeIterator* _tmp9_;
+				gpointer _tmp10_;
 				gboolean _tmp11_ = FALSE;
-				DataObject* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
+				DataObject* _tmp12_;
+				gboolean _tmp13_;
 #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp7_ = _object_it;
 #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1505,7 +1510,7 @@ static void metadata_writer_on_photos_added_removed (MetadataWriter* self, GeeIt
 				if (!_tmp8_) {
 #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					break;
-#line 1509 "MetadataWriter.c"
+#line 1514 "MetadataWriter.c"
 				}
 #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp9_ = _object_it;
@@ -1521,39 +1526,39 @@ static void metadata_writer_on_photos_added_removed (MetadataWriter* self, GeeIt
 				if (_tmp13_) {
 #line 342 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp11_ = TRUE;
-#line 1525 "MetadataWriter.c"
+#line 1530 "MetadataWriter.c"
 				} else {
-					gboolean _tmp14_ = FALSE;
+					gboolean _tmp14_;
 #line 342 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp14_ = cancelled;
 #line 342 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp11_ = _tmp14_;
-#line 1532 "MetadataWriter.c"
+#line 1537 "MetadataWriter.c"
 				}
 #line 342 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				cancelled = _tmp11_;
 #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_g_object_unref0 (object);
-#line 1538 "MetadataWriter.c"
+#line 1543 "MetadataWriter.c"
 			}
 #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (_object_it);
-#line 1542 "MetadataWriter.c"
+#line 1547 "MetadataWriter.c"
 		}
 #line 344 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp15_ = cancelled;
 #line 344 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (_tmp15_) {
-#line 1548 "MetadataWriter.c"
-			guint _tmp16_ = 0U;
-			guint _tmp17_ = 0U;
+#line 1553 "MetadataWriter.c"
+			guint _tmp16_;
+			guint _tmp17_;
 #line 345 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp16_ = self->priv->outstanding_completed;
 #line 345 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp17_ = self->priv->outstanding_total;
 #line 345 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-			g_signal_emit_by_name (self, "progress", _tmp16_, _tmp17_);
-#line 1557 "MetadataWriter.c"
+			g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, _tmp16_, _tmp17_);
+#line 1562 "MetadataWriter.c"
 		}
 	}
 }
@@ -1561,22 +1566,22 @@ static void metadata_writer_on_photos_added_removed (MetadataWriter* self, GeeIt
 
 static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* items) {
 	GeeHashSet* photos = NULL;
-	GeeHashSet* _tmp39_ = NULL;
+	GeeHashSet* _tmp39_;
 #line 349 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 349 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (GEE_IS_MAP (items));
 #line 350 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	photos = NULL;
-#line 1572 "MetadataWriter.c"
+#line 1577 "MetadataWriter.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp0_ = items;
 #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1595,27 +1600,27 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite
 		_object_it = _tmp5_;
 #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		while (TRUE) {
-#line 1599 "MetadataWriter.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 1604 "MetadataWriter.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			LibraryPhoto* photo = NULL;
-			DataObject* _tmp10_ = NULL;
-			LibraryPhoto* _tmp11_ = NULL;
-			LibraryPhoto* _tmp12_ = NULL;
-			LibraryPhoto* _tmp13_ = NULL;
+			DataObject* _tmp10_;
+			LibraryPhoto* _tmp11_;
+			LibraryPhoto* _tmp12_;
+			LibraryPhoto* _tmp13_;
 			Alteration* alteration = NULL;
-			GeeMap* _tmp14_ = NULL;
-			DataObject* _tmp15_ = NULL;
-			gpointer _tmp16_ = NULL;
-			Alteration* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
+			GeeMap* _tmp14_;
+			DataObject* _tmp15_;
+			gpointer _tmp16_;
+			Alteration* _tmp17_;
+			gboolean _tmp18_;
 			GeeCollection* details = NULL;
-			Alteration* _tmp23_ = NULL;
-			GeeCollection* _tmp24_ = NULL;
-			GeeCollection* _tmp25_ = NULL;
+			Alteration* _tmp23_;
+			GeeCollection* _tmp24_;
+			GeeCollection* _tmp25_;
 #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp6_ = _object_it;
 #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1624,7 +1629,7 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite
 			if (!_tmp7_) {
 #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				break;
-#line 1628 "MetadataWriter.c"
+#line 1633 "MetadataWriter.c"
 			}
 #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp8_ = _object_it;
@@ -1650,7 +1655,7 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite
 				_g_object_unref0 (object);
 #line 357 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				continue;
-#line 1654 "MetadataWriter.c"
+#line 1659 "MetadataWriter.c"
 			}
 #line 359 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp14_ = items;
@@ -1666,23 +1671,23 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite
 			_tmp18_ = alteration_has_detail (_tmp17_, "image", "orientation");
 #line 362 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (_tmp18_) {
-#line 1670 "MetadataWriter.c"
-				GeeHashSet* _tmp19_ = NULL;
-				GeeHashSet* _tmp21_ = NULL;
-				LibraryPhoto* _tmp22_ = NULL;
+#line 1675 "MetadataWriter.c"
+				GeeHashSet* _tmp19_;
+				GeeHashSet* _tmp21_;
+				LibraryPhoto* _tmp22_;
 #line 363 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp19_ = photos;
 #line 363 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				if (_tmp19_ == NULL) {
-#line 1678 "MetadataWriter.c"
-					GeeHashSet* _tmp20_ = NULL;
+#line 1683 "MetadataWriter.c"
+					GeeHashSet* _tmp20_;
 #line 364 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp20_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 364 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_g_object_unref0 (photos);
 #line 364 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					photos = _tmp20_;
-#line 1686 "MetadataWriter.c"
+#line 1691 "MetadataWriter.c"
 				}
 #line 366 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp21_ = photos;
@@ -1698,7 +1703,7 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite
 				_g_object_unref0 (object);
 #line 368 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				continue;
-#line 1702 "MetadataWriter.c"
+#line 1707 "MetadataWriter.c"
 			}
 #line 372 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp23_ = alteration;
@@ -1720,12 +1725,12 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite
 				_g_object_unref0 (object);
 #line 374 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				continue;
-#line 1724 "MetadataWriter.c"
+#line 1729 "MetadataWriter.c"
 			}
 			{
 				GeeIterator* _detail_it = NULL;
-				GeeCollection* _tmp26_ = NULL;
-				GeeIterator* _tmp27_ = NULL;
+				GeeCollection* _tmp26_;
+				GeeIterator* _tmp27_;
 #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp26_ = details;
 #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1734,15 +1739,15 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite
 				_detail_it = _tmp27_;
 #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				while (TRUE) {
-#line 1738 "MetadataWriter.c"
-					GeeIterator* _tmp28_ = NULL;
-					gboolean _tmp29_ = FALSE;
+#line 1743 "MetadataWriter.c"
+					GeeIterator* _tmp28_;
+					gboolean _tmp29_;
 					gchar* detail = NULL;
-					GeeIterator* _tmp30_ = NULL;
-					gpointer _tmp31_ = NULL;
-					GeeHashSet* _tmp32_ = NULL;
-					const gchar* _tmp33_ = NULL;
-					gboolean _tmp34_ = FALSE;
+					GeeIterator* _tmp30_;
+					gpointer _tmp31_;
+					GeeHashSet* _tmp32_;
+					const gchar* _tmp33_;
+					gboolean _tmp34_;
 #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp28_ = _detail_it;
 #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1751,7 +1756,7 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite
 					if (!_tmp29_) {
 #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						break;
-#line 1755 "MetadataWriter.c"
+#line 1760 "MetadataWriter.c"
 					}
 #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp30_ = _detail_it;
@@ -1767,23 +1772,23 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite
 					_tmp34_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp33_);
 #line 378 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					if (_tmp34_) {
-#line 1771 "MetadataWriter.c"
-						GeeHashSet* _tmp35_ = NULL;
-						GeeHashSet* _tmp37_ = NULL;
-						LibraryPhoto* _tmp38_ = NULL;
+#line 1776 "MetadataWriter.c"
+						GeeHashSet* _tmp35_;
+						GeeHashSet* _tmp37_;
+						LibraryPhoto* _tmp38_;
 #line 379 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						_tmp35_ = photos;
 #line 379 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						if (_tmp35_ == NULL) {
-#line 1779 "MetadataWriter.c"
-							GeeHashSet* _tmp36_ = NULL;
+#line 1784 "MetadataWriter.c"
+							GeeHashSet* _tmp36_;
 #line 380 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 							_tmp36_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 380 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 							_g_object_unref0 (photos);
 #line 380 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 							photos = _tmp36_;
-#line 1787 "MetadataWriter.c"
+#line 1792 "MetadataWriter.c"
 						}
 #line 382 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						_tmp37_ = photos;
@@ -1795,15 +1800,15 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite
 						_g_free0 (detail);
 #line 384 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						break;
-#line 1799 "MetadataWriter.c"
+#line 1804 "MetadataWriter.c"
 					}
 #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_g_free0 (detail);
-#line 1803 "MetadataWriter.c"
+#line 1808 "MetadataWriter.c"
 				}
 #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_g_object_unref0 (_detail_it);
-#line 1807 "MetadataWriter.c"
+#line 1812 "MetadataWriter.c"
 			}
 #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (details);
@@ -1813,27 +1818,27 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite
 			_g_object_unref0 (photo);
 #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (object);
-#line 1817 "MetadataWriter.c"
+#line 1822 "MetadataWriter.c"
 		}
 #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_object_unref0 (_object_it);
-#line 1821 "MetadataWriter.c"
+#line 1826 "MetadataWriter.c"
 	}
 #line 389 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp39_ = photos;
 #line 389 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp39_ != NULL) {
-#line 1827 "MetadataWriter.c"
-		GeeHashSet* _tmp40_ = NULL;
+#line 1832 "MetadataWriter.c"
+		GeeHashSet* _tmp40_;
 #line 390 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp40_ = photos;
 #line 390 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_COLLECTION, GeeCollection), "alteration", FALSE);
-#line 1833 "MetadataWriter.c"
+#line 1838 "MetadataWriter.c"
 	}
 #line 349 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_g_object_unref0 (photos);
-#line 1837 "MetadataWriter.c"
+#line 1842 "MetadataWriter.c"
 }
 
 
@@ -1842,11 +1847,11 @@ static void metadata_writer_on_photos_destroyed (MetadataWriter* self, GeeCollec
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 393 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (destroyed));
-#line 1846 "MetadataWriter.c"
+#line 1851 "MetadataWriter.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp0_ = destroyed;
 #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1855,18 +1860,18 @@ static void metadata_writer_on_photos_destroyed (MetadataWriter* self, GeeCollec
 		_source_it = _tmp1_;
 #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		while (TRUE) {
-#line 1859 "MetadataWriter.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 1864 "MetadataWriter.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			LibraryPhoto* photo = NULL;
-			DataSource* _tmp6_ = NULL;
-			LibraryPhoto* _tmp7_ = NULL;
-			LibraryPhoto* _tmp8_ = NULL;
-			GeeHashSet* _tmp9_ = NULL;
-			LibraryPhoto* _tmp10_ = NULL;
+			DataSource* _tmp6_;
+			LibraryPhoto* _tmp7_;
+			LibraryPhoto* _tmp8_;
+			GeeHashSet* _tmp9_;
+			LibraryPhoto* _tmp10_;
 #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp2_ = _source_it;
 #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1875,7 +1880,7 @@ static void metadata_writer_on_photos_destroyed (MetadataWriter* self, GeeCollec
 			if (!_tmp3_) {
 #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				break;
-#line 1879 "MetadataWriter.c"
+#line 1884 "MetadataWriter.c"
 			}
 #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp4_ = _source_it;
@@ -1903,33 +1908,33 @@ static void metadata_writer_on_photos_destroyed (MetadataWriter* self, GeeCollec
 			_g_object_unref0 (photo);
 #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (source);
-#line 1907 "MetadataWriter.c"
+#line 1912 "MetadataWriter.c"
 		}
 #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_object_unref0 (_source_it);
-#line 1911 "MetadataWriter.c"
+#line 1916 "MetadataWriter.c"
 	}
 }
 
 
 static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map) {
 	GeeHashSet* photos = NULL;
-	GeeHashSet* _tmp32_ = NULL;
+	GeeHashSet* _tmp32_;
 #line 401 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 401 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
 #line 402 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	photos = NULL;
-#line 1925 "MetadataWriter.c"
+#line 1930 "MetadataWriter.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp0_ = map;
 #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1948,19 +1953,19 @@ static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map)
 		_object_it = _tmp5_;
 #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		while (TRUE) {
-#line 1952 "MetadataWriter.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 1957 "MetadataWriter.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			GeeMap* _tmp10_ = NULL;
-			DataObject* _tmp11_ = NULL;
-			gpointer _tmp12_ = NULL;
-			Alteration* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
-			gboolean _tmp15_ = FALSE;
-			GeeHashSet* _tmp16_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			GeeMap* _tmp10_;
+			DataObject* _tmp11_;
+			gpointer _tmp12_;
+			Alteration* _tmp13_;
+			gboolean _tmp14_;
+			gboolean _tmp15_;
+			GeeHashSet* _tmp16_;
 #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp6_ = _object_it;
 #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1969,7 +1974,7 @@ static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map)
 			if (!_tmp7_) {
 #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				break;
-#line 1973 "MetadataWriter.c"
+#line 1978 "MetadataWriter.c"
 			}
 #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp8_ = _object_it;
@@ -1997,29 +2002,29 @@ static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map)
 				_g_object_unref0 (object);
 #line 405 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				continue;
-#line 2001 "MetadataWriter.c"
+#line 2006 "MetadataWriter.c"
 			}
 #line 407 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp16_ = photos;
 #line 407 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (_tmp16_ == NULL) {
-#line 2007 "MetadataWriter.c"
-				GeeHashSet* _tmp17_ = NULL;
+#line 2012 "MetadataWriter.c"
+				GeeHashSet* _tmp17_;
 #line 408 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp17_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 408 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_g_object_unref0 (photos);
 #line 408 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				photos = _tmp17_;
-#line 2015 "MetadataWriter.c"
+#line 2020 "MetadataWriter.c"
 			}
 			{
 				GeeIterator* _media_it = NULL;
-				DataObject* _tmp18_ = NULL;
-				GeeCollection* _tmp19_ = NULL;
-				GeeCollection* _tmp20_ = NULL;
-				GeeIterator* _tmp21_ = NULL;
-				GeeIterator* _tmp22_ = NULL;
+				DataObject* _tmp18_;
+				GeeCollection* _tmp19_;
+				GeeCollection* _tmp20_;
+				GeeIterator* _tmp21_;
+				GeeIterator* _tmp22_;
 #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp18_ = object;
 #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2036,16 +2041,16 @@ static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map)
 				_media_it = _tmp22_;
 #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				while (TRUE) {
-#line 2040 "MetadataWriter.c"
-					GeeIterator* _tmp23_ = NULL;
-					gboolean _tmp24_ = FALSE;
+#line 2045 "MetadataWriter.c"
+					GeeIterator* _tmp23_;
+					gboolean _tmp24_;
 					MediaSource* media = NULL;
-					GeeIterator* _tmp25_ = NULL;
-					gpointer _tmp26_ = NULL;
+					GeeIterator* _tmp25_;
+					gpointer _tmp26_;
 					LibraryPhoto* photo = NULL;
-					MediaSource* _tmp27_ = NULL;
-					LibraryPhoto* _tmp28_ = NULL;
-					LibraryPhoto* _tmp29_ = NULL;
+					MediaSource* _tmp27_;
+					LibraryPhoto* _tmp28_;
+					LibraryPhoto* _tmp29_;
 #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp23_ = _media_it;
 #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2054,7 +2059,7 @@ static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map)
 					if (!_tmp24_) {
 #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						break;
-#line 2058 "MetadataWriter.c"
+#line 2063 "MetadataWriter.c"
 					}
 #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp25_ = _media_it;
@@ -2072,61 +2077,61 @@ static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map)
 					_tmp29_ = photo;
 #line 412 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					if (_tmp29_ != NULL) {
-#line 2076 "MetadataWriter.c"
-						GeeHashSet* _tmp30_ = NULL;
-						LibraryPhoto* _tmp31_ = NULL;
+#line 2081 "MetadataWriter.c"
+						GeeHashSet* _tmp30_;
+						LibraryPhoto* _tmp31_;
 #line 413 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						_tmp30_ = photos;
 #line 413 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						_tmp31_ = photo;
 #line 413 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp31_);
-#line 2085 "MetadataWriter.c"
+#line 2090 "MetadataWriter.c"
 					}
 #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_g_object_unref0 (photo);
 #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_g_object_unref0 (media);
-#line 2091 "MetadataWriter.c"
+#line 2096 "MetadataWriter.c"
 				}
 #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_g_object_unref0 (_media_it);
-#line 2095 "MetadataWriter.c"
+#line 2100 "MetadataWriter.c"
 			}
 #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (object);
-#line 2099 "MetadataWriter.c"
+#line 2104 "MetadataWriter.c"
 		}
 #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_object_unref0 (_object_it);
-#line 2103 "MetadataWriter.c"
+#line 2108 "MetadataWriter.c"
 	}
 #line 417 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp32_ = photos;
 #line 417 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp32_ != NULL) {
-#line 2109 "MetadataWriter.c"
-		GeeHashSet* _tmp33_ = NULL;
+#line 2114 "MetadataWriter.c"
+		GeeHashSet* _tmp33_;
 #line 418 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp33_ = photos;
 #line 418 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), "tag renamed", FALSE);
-#line 2115 "MetadataWriter.c"
+#line 2120 "MetadataWriter.c"
 	}
 #line 401 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_g_object_unref0 (photos);
-#line 2119 "MetadataWriter.c"
+#line 2124 "MetadataWriter.c"
 }
 
 
 static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, ContainerSource* container, GeeCollection* added, gboolean relinking, GeeCollection* removed, gboolean unlinking) {
 	Tag* tag = NULL;
-	ContainerSource* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
+	ContainerSource* _tmp0_;
+	Tag* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	GeeCollection* _tmp3_ = NULL;
+	GeeCollection* _tmp3_;
 	gboolean _tmp27_ = FALSE;
-	GeeCollection* _tmp28_ = NULL;
+	GeeCollection* _tmp28_;
 #line 421 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 421 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2145,38 +2150,38 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta
 	_tmp3_ = added;
 #line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp3_ != NULL) {
-#line 2149 "MetadataWriter.c"
-		gboolean _tmp4_ = FALSE;
+#line 2154 "MetadataWriter.c"
+		gboolean _tmp4_;
 #line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp4_ = relinking;
 #line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp2_ = !_tmp4_;
-#line 2155 "MetadataWriter.c"
+#line 2160 "MetadataWriter.c"
 	} else {
 #line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp2_ = FALSE;
-#line 2159 "MetadataWriter.c"
+#line 2164 "MetadataWriter.c"
 	}
 #line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp2_) {
-#line 2163 "MetadataWriter.c"
+#line 2168 "MetadataWriter.c"
 		GeeArrayList* added_photos = NULL;
-		GeeArrayList* _tmp5_ = NULL;
-		GeeArrayList* _tmp21_ = NULL;
-		Tag* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
+		GeeArrayList* _tmp5_;
+		GeeArrayList* _tmp21_;
+		Tag* _tmp22_;
+		gchar* _tmp23_;
+		gchar* _tmp24_;
+		gchar* _tmp25_;
+		gchar* _tmp26_;
 #line 426 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 426 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		added_photos = _tmp5_;
-#line 2176 "MetadataWriter.c"
+#line 2181 "MetadataWriter.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp6_ = NULL;
-			GeeIterator* _tmp7_ = NULL;
+			GeeCollection* _tmp6_;
+			GeeIterator* _tmp7_;
 #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp6_ = added;
 #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2185,17 +2190,17 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta
 			_source_it = _tmp7_;
 #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			while (TRUE) {
-#line 2189 "MetadataWriter.c"
-				GeeIterator* _tmp8_ = NULL;
-				gboolean _tmp9_ = FALSE;
+#line 2194 "MetadataWriter.c"
+				GeeIterator* _tmp8_;
+				gboolean _tmp9_;
 				DataSource* source = NULL;
-				GeeIterator* _tmp10_ = NULL;
-				gpointer _tmp11_ = NULL;
+				GeeIterator* _tmp10_;
+				gpointer _tmp11_;
 				LibraryPhoto* photo = NULL;
-				DataSource* _tmp12_ = NULL;
-				LibraryPhoto* _tmp13_ = NULL;
+				DataSource* _tmp12_;
+				LibraryPhoto* _tmp13_;
 				gboolean _tmp14_ = FALSE;
-				LibraryPhoto* _tmp15_ = NULL;
+				LibraryPhoto* _tmp15_;
 #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp8_ = _source_it;
 #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2204,7 +2209,7 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta
 				if (!_tmp9_) {
 #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					break;
-#line 2208 "MetadataWriter.c"
+#line 2213 "MetadataWriter.c"
 				}
 #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp10_ = _source_it;
@@ -2222,10 +2227,10 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta
 				_tmp15_ = photo;
 #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				if (_tmp15_ != NULL) {
-#line 2226 "MetadataWriter.c"
-					GeeHashSet* _tmp16_ = NULL;
-					LibraryPhoto* _tmp17_ = NULL;
-					gboolean _tmp18_ = FALSE;
+#line 2231 "MetadataWriter.c"
+					GeeHashSet* _tmp16_;
+					LibraryPhoto* _tmp17_;
+					gboolean _tmp18_;
 #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp16_ = self->priv->importing_photos;
 #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2234,34 +2239,34 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta
 					_tmp18_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
 #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp14_ = !_tmp18_;
-#line 2238 "MetadataWriter.c"
+#line 2243 "MetadataWriter.c"
 				} else {
 #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp14_ = FALSE;
-#line 2242 "MetadataWriter.c"
+#line 2247 "MetadataWriter.c"
 				}
 #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				if (_tmp14_) {
-#line 2246 "MetadataWriter.c"
-					GeeArrayList* _tmp19_ = NULL;
-					LibraryPhoto* _tmp20_ = NULL;
+#line 2251 "MetadataWriter.c"
+					GeeArrayList* _tmp19_;
+					LibraryPhoto* _tmp20_;
 #line 430 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp19_ = added_photos;
 #line 430 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp20_ = photo;
 #line 430 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_);
-#line 2255 "MetadataWriter.c"
+#line 2260 "MetadataWriter.c"
 				}
 #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_g_object_unref0 (photo);
 #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_g_object_unref0 (source);
-#line 2261 "MetadataWriter.c"
+#line 2266 "MetadataWriter.c"
 			}
 #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (_source_it);
-#line 2265 "MetadataWriter.c"
+#line 2270 "MetadataWriter.c"
 		}
 #line 433 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp21_ = added_photos;
@@ -2283,44 +2288,44 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta
 		_g_free0 (_tmp24_);
 #line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_object_unref0 (added_photos);
-#line 2287 "MetadataWriter.c"
+#line 2292 "MetadataWriter.c"
 	}
 #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp28_ = removed;
 #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp28_ != NULL) {
-#line 2293 "MetadataWriter.c"
-		gboolean _tmp29_ = FALSE;
+#line 2298 "MetadataWriter.c"
+		gboolean _tmp29_;
 #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp29_ = unlinking;
 #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp27_ = !_tmp29_;
-#line 2299 "MetadataWriter.c"
+#line 2304 "MetadataWriter.c"
 	} else {
 #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp27_ = FALSE;
-#line 2303 "MetadataWriter.c"
+#line 2308 "MetadataWriter.c"
 	}
 #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp27_) {
-#line 2307 "MetadataWriter.c"
+#line 2312 "MetadataWriter.c"
 		GeeArrayList* removed_photos = NULL;
-		GeeArrayList* _tmp30_ = NULL;
-		GeeArrayList* _tmp42_ = NULL;
-		Tag* _tmp43_ = NULL;
-		gchar* _tmp44_ = NULL;
-		gchar* _tmp45_ = NULL;
-		gchar* _tmp46_ = NULL;
-		gchar* _tmp47_ = NULL;
+		GeeArrayList* _tmp30_;
+		GeeArrayList* _tmp42_;
+		Tag* _tmp43_;
+		gchar* _tmp44_;
+		gchar* _tmp45_;
+		gchar* _tmp46_;
+		gchar* _tmp47_;
 #line 437 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp30_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 437 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		removed_photos = _tmp30_;
-#line 2320 "MetadataWriter.c"
+#line 2325 "MetadataWriter.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp31_ = NULL;
-			GeeIterator* _tmp32_ = NULL;
+			GeeCollection* _tmp31_;
+			GeeIterator* _tmp32_;
 #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp31_ = removed;
 #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2329,16 +2334,16 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta
 			_source_it = _tmp32_;
 #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			while (TRUE) {
-#line 2333 "MetadataWriter.c"
-				GeeIterator* _tmp33_ = NULL;
-				gboolean _tmp34_ = FALSE;
+#line 2338 "MetadataWriter.c"
+				GeeIterator* _tmp33_;
+				gboolean _tmp34_;
 				DataSource* source = NULL;
-				GeeIterator* _tmp35_ = NULL;
-				gpointer _tmp36_ = NULL;
+				GeeIterator* _tmp35_;
+				gpointer _tmp36_;
 				LibraryPhoto* photo = NULL;
-				DataSource* _tmp37_ = NULL;
-				LibraryPhoto* _tmp38_ = NULL;
-				LibraryPhoto* _tmp39_ = NULL;
+				DataSource* _tmp37_;
+				LibraryPhoto* _tmp38_;
+				LibraryPhoto* _tmp39_;
 #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp33_ = _source_it;
 #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2347,7 +2352,7 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta
 				if (!_tmp34_) {
 #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					break;
-#line 2351 "MetadataWriter.c"
+#line 2356 "MetadataWriter.c"
 				}
 #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp35_ = _source_it;
@@ -2365,26 +2370,26 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta
 				_tmp39_ = photo;
 #line 440 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				if (_tmp39_ != NULL) {
-#line 2369 "MetadataWriter.c"
-					GeeArrayList* _tmp40_ = NULL;
-					LibraryPhoto* _tmp41_ = NULL;
+#line 2374 "MetadataWriter.c"
+					GeeArrayList* _tmp40_;
+					LibraryPhoto* _tmp41_;
 #line 441 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp40_ = removed_photos;
 #line 441 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp41_ = photo;
 #line 441 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp41_);
-#line 2378 "MetadataWriter.c"
+#line 2383 "MetadataWriter.c"
 				}
 #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_g_object_unref0 (photo);
 #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_g_object_unref0 (source);
-#line 2384 "MetadataWriter.c"
+#line 2389 "MetadataWriter.c"
 			}
 #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (_source_it);
-#line 2388 "MetadataWriter.c"
+#line 2393 "MetadataWriter.c"
 		}
 #line 444 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp42_ = removed_photos;
@@ -2406,23 +2411,23 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta
 		_g_free0 (_tmp45_);
 #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_object_unref0 (removed_photos);
-#line 2410 "MetadataWriter.c"
+#line 2415 "MetadataWriter.c"
 	}
 #line 421 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_g_object_unref0 (tag);
-#line 2414 "MetadataWriter.c"
+#line 2419 "MetadataWriter.c"
 }
 
 
 static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, ContainerSource* container, GeeCollection* sources) {
 	GeeArrayList* photos = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp12_ = NULL;
-	ContainerSource* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp12_;
+	ContainerSource* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
 #line 448 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 448 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2433,11 +2438,11 @@ static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, Conta
 	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 449 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	photos = _tmp0_;
-#line 2437 "MetadataWriter.c"
+#line 2442 "MetadataWriter.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp1_ = sources;
 #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2446,16 +2451,16 @@ static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, Conta
 		_source_it = _tmp2_;
 #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		while (TRUE) {
-#line 2450 "MetadataWriter.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 2455 "MetadataWriter.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
 			LibraryPhoto* photo = NULL;
-			DataSource* _tmp7_ = NULL;
-			LibraryPhoto* _tmp8_ = NULL;
-			LibraryPhoto* _tmp9_ = NULL;
+			DataSource* _tmp7_;
+			LibraryPhoto* _tmp8_;
+			LibraryPhoto* _tmp9_;
 #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp3_ = _source_it;
 #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2464,7 +2469,7 @@ static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, Conta
 			if (!_tmp4_) {
 #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				break;
-#line 2468 "MetadataWriter.c"
+#line 2473 "MetadataWriter.c"
 			}
 #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp5_ = _source_it;
@@ -2482,26 +2487,26 @@ static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, Conta
 			_tmp9_ = photo;
 #line 452 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (_tmp9_ != NULL) {
-#line 2486 "MetadataWriter.c"
-				GeeArrayList* _tmp10_ = NULL;
-				LibraryPhoto* _tmp11_ = NULL;
+#line 2491 "MetadataWriter.c"
+				GeeArrayList* _tmp10_;
+				LibraryPhoto* _tmp11_;
 #line 453 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp10_ = photos;
 #line 453 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp11_ = photo;
 #line 453 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_);
-#line 2495 "MetadataWriter.c"
+#line 2500 "MetadataWriter.c"
 			}
 #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (photo);
 #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (source);
-#line 2501 "MetadataWriter.c"
+#line 2506 "MetadataWriter.c"
 		}
 #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_object_unref0 (_source_it);
-#line 2505 "MetadataWriter.c"
+#line 2510 "MetadataWriter.c"
 	}
 #line 456 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp12_ = photos;
@@ -2523,14 +2528,14 @@ static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, Conta
 	_g_free0 (_tmp15_);
 #line 448 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_g_object_unref0 (photos);
-#line 2527 "MetadataWriter.c"
+#line 2532 "MetadataWriter.c"
 }
 
 
 static void metadata_writer_count_enqueued_work (MetadataWriter* self, gint count, gboolean report) {
-	guint _tmp0_ = 0U;
-	gint _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
+	guint _tmp0_;
+	gint _tmp1_;
+	gboolean _tmp2_;
 #line 459 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 460 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2543,27 +2548,27 @@ static void metadata_writer_count_enqueued_work (MetadataWriter* self, gint coun
 	_tmp2_ = report;
 #line 466 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp2_) {
-#line 2547 "MetadataWriter.c"
-		guint _tmp3_ = 0U;
-		guint _tmp4_ = 0U;
+#line 2552 "MetadataWriter.c"
+		guint _tmp3_;
+		guint _tmp4_;
 #line 467 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp3_ = self->priv->outstanding_completed;
 #line 467 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp4_ = self->priv->outstanding_total;
 #line 467 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-		g_signal_emit_by_name (self, "progress", _tmp3_, _tmp4_);
-#line 2556 "MetadataWriter.c"
+		g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, _tmp3_, _tmp4_);
+#line 2561 "MetadataWriter.c"
 	}
 }
 
 
 static void metadata_writer_count_cancelled_work (MetadataWriter* self, gint count, gboolean report) {
 	guint _tmp0_ = 0U;
-	guint _tmp1_ = 0U;
-	gint _tmp2_ = 0;
-	guint _tmp5_ = 0U;
-	guint _tmp6_ = 0U;
-	gboolean _tmp7_ = FALSE;
+	guint _tmp1_;
+	gint _tmp2_;
+	guint _tmp5_;
+	guint _tmp6_;
+	gboolean _tmp7_;
 #line 470 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2572,20 +2577,20 @@ static void metadata_writer_count_cancelled_work (MetadataWriter* self, gint cou
 	_tmp2_ = count;
 #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp1_ >= ((guint) _tmp2_)) {
-#line 2576 "MetadataWriter.c"
-		guint _tmp3_ = 0U;
-		gint _tmp4_ = 0;
+#line 2581 "MetadataWriter.c"
+		guint _tmp3_;
+		gint _tmp4_;
 #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp3_ = self->priv->outstanding_total;
 #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp4_ = count;
 #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp0_ = _tmp3_ - _tmp4_;
-#line 2585 "MetadataWriter.c"
+#line 2590 "MetadataWriter.c"
 	} else {
 #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp0_ = (guint) 0;
-#line 2589 "MetadataWriter.c"
+#line 2594 "MetadataWriter.c"
 	}
 #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->priv->outstanding_total = _tmp0_;
@@ -2599,32 +2604,32 @@ static void metadata_writer_count_cancelled_work (MetadataWriter* self, gint cou
 		self->priv->outstanding_completed = (guint) 0;
 #line 474 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		self->priv->outstanding_total = (guint) 0;
-#line 2603 "MetadataWriter.c"
+#line 2608 "MetadataWriter.c"
 	}
 #line 481 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp7_ = report;
 #line 481 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp7_) {
-#line 2609 "MetadataWriter.c"
-		guint _tmp8_ = 0U;
-		guint _tmp9_ = 0U;
+#line 2614 "MetadataWriter.c"
+		guint _tmp8_;
+		guint _tmp9_;
 #line 482 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp8_ = self->priv->outstanding_completed;
 #line 482 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp9_ = self->priv->outstanding_total;
 #line 482 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-		g_signal_emit_by_name (self, "progress", _tmp8_, _tmp9_);
-#line 2618 "MetadataWriter.c"
+		g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, _tmp8_, _tmp9_);
+#line 2623 "MetadataWriter.c"
 	}
 }
 
 
 static void metadata_writer_count_completed_work (MetadataWriter* self, gint count, gboolean report) {
-	guint _tmp0_ = 0U;
-	gint _tmp1_ = 0;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
+	guint _tmp0_;
+	gint _tmp1_;
+	guint _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
 #line 485 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 486 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2643,29 +2648,29 @@ static void metadata_writer_count_completed_work (MetadataWriter* self, gint cou
 		self->priv->outstanding_completed = (guint) 0;
 #line 489 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		self->priv->outstanding_total = (guint) 0;
-#line 2647 "MetadataWriter.c"
+#line 2652 "MetadataWriter.c"
 	}
 #line 496 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp4_ = report;
 #line 496 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp4_) {
-#line 2653 "MetadataWriter.c"
-		guint _tmp5_ = 0U;
-		guint _tmp6_ = 0U;
+#line 2658 "MetadataWriter.c"
+		guint _tmp5_;
+		guint _tmp6_;
 #line 497 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp5_ = self->priv->outstanding_completed;
 #line 497 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp6_ = self->priv->outstanding_total;
 #line 497 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-		g_signal_emit_by_name (self, "progress", _tmp5_, _tmp6_);
-#line 2662 "MetadataWriter.c"
+		g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, _tmp5_, _tmp6_);
+#line 2667 "MetadataWriter.c"
 	}
 }
 
 
 static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable* media_sources, const gchar* reason) {
 	GeeArrayList* photos = NULL;
-	GeeArrayList* _tmp18_ = NULL;
+	GeeArrayList* _tmp18_;
 #line 500 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 500 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2674,11 +2679,11 @@ static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable
 	g_return_if_fail (reason != NULL);
 #line 501 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	photos = NULL;
-#line 2678 "MetadataWriter.c"
+#line 2683 "MetadataWriter.c"
 	{
 		GeeIterator* _media_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp0_ = media_sources;
 #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2687,21 +2692,21 @@ static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable
 		_media_it = _tmp1_;
 #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		while (TRUE) {
-#line 2691 "MetadataWriter.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 2696 "MetadataWriter.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			MediaSource* media = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			LibraryPhoto* photo = NULL;
-			MediaSource* _tmp6_ = NULL;
-			LibraryPhoto* _tmp7_ = NULL;
-			LibraryPhoto* _tmp8_ = NULL;
-			GeeHashSet* _tmp9_ = NULL;
-			LibraryPhoto* _tmp10_ = NULL;
-			gboolean _tmp11_ = FALSE;
-			LibraryPhoto* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
+			MediaSource* _tmp6_;
+			LibraryPhoto* _tmp7_;
+			LibraryPhoto* _tmp8_;
+			GeeHashSet* _tmp9_;
+			LibraryPhoto* _tmp10_;
+			gboolean _tmp11_;
+			LibraryPhoto* _tmp12_;
+			gboolean _tmp13_;
 #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp2_ = _media_it;
 #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2710,7 +2715,7 @@ static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable
 			if (!_tmp3_) {
 #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				break;
-#line 2714 "MetadataWriter.c"
+#line 2719 "MetadataWriter.c"
 			}
 #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp4_ = _media_it;
@@ -2734,7 +2739,7 @@ static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable
 				_g_object_unref0 (media);
 #line 505 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				continue;
-#line 2738 "MetadataWriter.c"
+#line 2743 "MetadataWriter.c"
 			}
 #line 508 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp9_ = self->priv->importing_photos;
@@ -2750,7 +2755,7 @@ static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable
 				_g_object_unref0 (media);
 #line 509 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				continue;
-#line 2754 "MetadataWriter.c"
+#line 2759 "MetadataWriter.c"
 			}
 #line 511 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp12_ = photo;
@@ -2758,23 +2763,23 @@ static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable
 			_tmp13_ = photo_is_master_metadata_dirty (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO, Photo));
 #line 511 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (_tmp13_) {
-#line 2762 "MetadataWriter.c"
-				GeeArrayList* _tmp14_ = NULL;
-				GeeArrayList* _tmp16_ = NULL;
-				LibraryPhoto* _tmp17_ = NULL;
+#line 2767 "MetadataWriter.c"
+				GeeArrayList* _tmp14_;
+				GeeArrayList* _tmp16_;
+				LibraryPhoto* _tmp17_;
 #line 512 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp14_ = photos;
 #line 512 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				if (_tmp14_ == NULL) {
-#line 2770 "MetadataWriter.c"
-					GeeArrayList* _tmp15_ = NULL;
+#line 2775 "MetadataWriter.c"
+					GeeArrayList* _tmp15_;
 #line 513 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp15_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 513 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_g_object_unref0 (photos);
 #line 513 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					photos = _tmp15_;
-#line 2778 "MetadataWriter.c"
+#line 2783 "MetadataWriter.c"
 				}
 #line 515 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp16_ = photos;
@@ -2782,49 +2787,49 @@ static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable
 				_tmp17_ = photo;
 #line 515 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
-#line 2786 "MetadataWriter.c"
+#line 2791 "MetadataWriter.c"
 			}
 #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (photo);
 #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (media);
-#line 2792 "MetadataWriter.c"
+#line 2797 "MetadataWriter.c"
 		}
 #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_object_unref0 (_media_it);
-#line 2796 "MetadataWriter.c"
+#line 2801 "MetadataWriter.c"
 	}
 #line 519 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp18_ = photos;
 #line 519 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp18_ != NULL) {
-#line 2802 "MetadataWriter.c"
-		GeeArrayList* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
+#line 2807 "MetadataWriter.c"
+		GeeArrayList* _tmp19_;
+		const gchar* _tmp20_;
 #line 520 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp19_ = photos;
 #line 520 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp20_ = reason;
 #line 520 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_, TRUE);
-#line 2811 "MetadataWriter.c"
+#line 2816 "MetadataWriter.c"
 	}
 #line 500 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_g_object_unref0 (photos);
-#line 2815 "MetadataWriter.c"
+#line 2820 "MetadataWriter.c"
 }
 
 
 static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollection* photos, const gchar* reason, gboolean already_marked) {
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gboolean _tmp10_ = FALSE;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp10_;
 	gboolean _tmp28_ = FALSE;
-	gboolean _tmp29_ = FALSE;
-	GeeCollection* _tmp41_ = NULL;
-	gint _tmp42_ = 0;
-	gint _tmp43_ = 0;
+	gboolean _tmp29_;
+	GeeCollection* _tmp41_;
+	gint _tmp42_;
+	gint _tmp43_;
 	GError * _inner_error_ = NULL;
 #line 524 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
@@ -2842,12 +2847,12 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 	if (_tmp2_ == 0) {
 #line 526 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		return;
-#line 2846 "MetadataWriter.c"
+#line 2851 "MetadataWriter.c"
 	}
 	{
 		GeeIterator* _photo_it = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
 #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp3_ = photos;
 #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2856,13 +2861,13 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 		_photo_it = _tmp4_;
 #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		while (TRUE) {
-#line 2860 "MetadataWriter.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+#line 2865 "MetadataWriter.c"
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			LibraryPhoto* photo = NULL;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
-			LibraryPhoto* _tmp9_ = NULL;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			LibraryPhoto* _tmp9_;
 #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp5_ = _photo_it;
 #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2871,7 +2876,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			if (!_tmp6_) {
 #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				break;
-#line 2875 "MetadataWriter.c"
+#line 2880 "MetadataWriter.c"
 			}
 #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp7_ = _photo_it;
@@ -2885,24 +2890,24 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			metadata_writer_cancel_job (self, _tmp9_);
 #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (photo);
-#line 2889 "MetadataWriter.c"
+#line 2894 "MetadataWriter.c"
 		}
 #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_object_unref0 (_photo_it);
-#line 2893 "MetadataWriter.c"
+#line 2898 "MetadataWriter.c"
 	}
 #line 533 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp10_ = already_marked;
 #line 533 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (!_tmp10_) {
-#line 2899 "MetadataWriter.c"
+#line 2904 "MetadataWriter.c"
 		{
-			LibraryPhotoSourceCollection* _tmp11_ = NULL;
-			TransactionController* _tmp12_ = NULL;
-			TransactionController* _tmp13_ = NULL;
-			LibraryPhotoSourceCollection* _tmp21_ = NULL;
-			TransactionController* _tmp22_ = NULL;
-			TransactionController* _tmp23_ = NULL;
+			LibraryPhotoSourceCollection* _tmp11_;
+			TransactionController* _tmp12_;
+			TransactionController* _tmp13_;
+			LibraryPhotoSourceCollection* _tmp21_;
+			TransactionController* _tmp22_;
+			TransactionController* _tmp23_;
 #line 535 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp11_ = library_photo_global;
 #line 535 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2911,11 +2916,11 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			_tmp13_ = _tmp12_;
 #line 535 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			transaction_controller_begin (_tmp13_);
-#line 2915 "MetadataWriter.c"
+#line 2920 "MetadataWriter.c"
 			{
 				GeeIterator* _photo_it = NULL;
-				GeeCollection* _tmp14_ = NULL;
-				GeeIterator* _tmp15_ = NULL;
+				GeeCollection* _tmp14_;
+				GeeIterator* _tmp15_;
 #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp14_ = photos;
 #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2924,13 +2929,13 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 				_photo_it = _tmp15_;
 #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				while (TRUE) {
-#line 2928 "MetadataWriter.c"
-					GeeIterator* _tmp16_ = NULL;
-					gboolean _tmp17_ = FALSE;
+#line 2933 "MetadataWriter.c"
+					GeeIterator* _tmp16_;
+					gboolean _tmp17_;
 					LibraryPhoto* photo = NULL;
-					GeeIterator* _tmp18_ = NULL;
-					gpointer _tmp19_ = NULL;
-					LibraryPhoto* _tmp20_ = NULL;
+					GeeIterator* _tmp18_;
+					gpointer _tmp19_;
+					LibraryPhoto* _tmp20_;
 #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp16_ = _photo_it;
 #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2939,7 +2944,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 					if (!_tmp17_) {
 #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						break;
-#line 2943 "MetadataWriter.c"
+#line 2948 "MetadataWriter.c"
 					}
 #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_tmp18_ = _photo_it;
@@ -2957,16 +2962,16 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 						_g_object_unref0 (photo);
 #line 538 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						_g_object_unref0 (_photo_it);
-#line 2961 "MetadataWriter.c"
-						goto __catch553_g_error;
+#line 2966 "MetadataWriter.c"
+						goto __catch554_g_error;
 					}
 #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_g_object_unref0 (photo);
-#line 2966 "MetadataWriter.c"
+#line 2971 "MetadataWriter.c"
 				}
 #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_g_object_unref0 (_photo_it);
-#line 2970 "MetadataWriter.c"
+#line 2975 "MetadataWriter.c"
 			}
 #line 540 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp21_ = library_photo_global;
@@ -2976,13 +2981,13 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			_tmp23_ = _tmp22_;
 #line 540 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			transaction_controller_commit (_tmp23_);
-#line 2980 "MetadataWriter.c"
+#line 2985 "MetadataWriter.c"
 		}
-		goto __finally553;
-		__catch553_g_error:
+		goto __finally554;
+		__catch554_g_error:
 		{
 			GError* err = NULL;
-			GError* _tmp24_ = NULL;
+			GError* _tmp24_;
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			err = _inner_error_;
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2991,29 +2996,29 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			_tmp24_ = err;
 #line 542 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (_tmp24_->domain == DATABASE_ERROR) {
-#line 2995 "MetadataWriter.c"
-				GError* _tmp25_ = NULL;
+#line 3000 "MetadataWriter.c"
+				GError* _tmp25_;
 #line 543 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp25_ = err;
 #line 543 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				app_window_database_error ((GError*) _tmp25_);
-#line 3001 "MetadataWriter.c"
+#line 3006 "MetadataWriter.c"
 			} else {
-				GError* _tmp26_ = NULL;
-				const gchar* _tmp27_ = NULL;
+				GError* _tmp26_;
+				const gchar* _tmp27_;
 #line 545 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp26_ = err;
 #line 545 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp27_ = _tmp26_->message;
 #line 545 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				g_error ("MetadataWriter.vala:545: Unable to mark metadata as dirty: %s", _tmp27_);
-#line 3011 "MetadataWriter.c"
+#line 3016 "MetadataWriter.c"
 			}
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_error_free0 (err);
-#line 3015 "MetadataWriter.c"
+#line 3020 "MetadataWriter.c"
 		}
-		__finally553:
+		__finally554:
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3022,7 +3027,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			g_clear_error (&_inner_error_);
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			return;
-#line 3026 "MetadataWriter.c"
+#line 3031 "MetadataWriter.c"
 		}
 	}
 #line 551 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3031,25 +3036,25 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 	if (_tmp29_) {
 #line 551 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp28_ = TRUE;
-#line 3035 "MetadataWriter.c"
+#line 3040 "MetadataWriter.c"
 	} else {
-		gboolean _tmp30_ = FALSE;
+		gboolean _tmp30_;
 #line 551 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp30_ = self->priv->enabled;
 #line 551 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp28_ = !_tmp30_;
-#line 3042 "MetadataWriter.c"
+#line 3047 "MetadataWriter.c"
 	}
 #line 551 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp28_) {
 #line 552 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		return;
-#line 3048 "MetadataWriter.c"
+#line 3053 "MetadataWriter.c"
 	}
 	{
 		GeeIterator* _photo_it = NULL;
-		GeeCollection* _tmp31_ = NULL;
-		GeeIterator* _tmp32_ = NULL;
+		GeeCollection* _tmp31_;
+		GeeIterator* _tmp32_;
 #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp31_ = photos;
 #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3058,17 +3063,17 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 		_photo_it = _tmp32_;
 #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		while (TRUE) {
-#line 3062 "MetadataWriter.c"
-			GeeIterator* _tmp33_ = NULL;
-			gboolean _tmp34_ = FALSE;
+#line 3067 "MetadataWriter.c"
+			GeeIterator* _tmp33_;
+			gboolean _tmp34_;
 			LibraryPhoto* photo = NULL;
-			GeeIterator* _tmp35_ = NULL;
-			gpointer _tmp36_ = NULL;
+			GeeIterator* _tmp35_;
+			gpointer _tmp36_;
 			gboolean enqueued = FALSE;
-			HashTimedQueue* _tmp37_ = NULL;
-			LibraryPhoto* _tmp38_ = NULL;
-			gboolean _tmp39_ = FALSE;
-			gboolean _tmp40_ = FALSE;
+			HashTimedQueue* _tmp37_;
+			LibraryPhoto* _tmp38_;
+			gboolean _tmp39_;
+			gboolean _tmp40_;
 #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp33_ = _photo_it;
 #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3077,7 +3082,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			if (!_tmp34_) {
 #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				break;
-#line 3081 "MetadataWriter.c"
+#line 3086 "MetadataWriter.c"
 			}
 #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp35_ = _photo_it;
@@ -3099,11 +3104,11 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			_vala_assert (_tmp40_, "enqueued");
 #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (photo);
-#line 3103 "MetadataWriter.c"
+#line 3108 "MetadataWriter.c"
 		}
 #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_object_unref0 (_photo_it);
-#line 3107 "MetadataWriter.c"
+#line 3112 "MetadataWriter.c"
 	}
 #line 563 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp41_ = photos;
@@ -3113,28 +3118,28 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 	_tmp43_ = _tmp42_;
 #line 563 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_count_enqueued_work (self, _tmp43_, TRUE);
-#line 3117 "MetadataWriter.c"
+#line 3122 "MetadataWriter.c"
 }
 
 
 static void metadata_writer_cancel_all (MetadataWriter* self, gboolean wait) {
-	HashTimedQueue* _tmp0_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	HashTimedQueue* _tmp0_;
+	gboolean _tmp12_;
 #line 566 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 567 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp0_ = self->priv->dirty;
 #line 567 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	timed_queue_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TIMED_QUEUE, TimedQueue));
-#line 3130 "MetadataWriter.c"
+#line 3135 "MetadataWriter.c"
 	{
 		GeeIterator* _job_it = NULL;
-		GeeHashMap* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
+		GeeHashMap* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeCollection* _tmp4_;
+		GeeIterator* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp1_ = self->priv->pending;
 #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3153,13 +3158,13 @@ static void metadata_writer_cancel_all (MetadataWriter* self, gboolean wait) {
 		_job_it = _tmp6_;
 #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		while (TRUE) {
-#line 3157 "MetadataWriter.c"
-			GeeIterator* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+#line 3162 "MetadataWriter.c"
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			MetadataWriterCommitJob* job = NULL;
-			GeeIterator* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
-			MetadataWriterCommitJob* _tmp11_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
+			MetadataWriterCommitJob* _tmp11_;
 #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp7_ = _job_it;
 #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3168,7 +3173,7 @@ static void metadata_writer_cancel_all (MetadataWriter* self, gboolean wait) {
 			if (!_tmp8_) {
 #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				break;
-#line 3172 "MetadataWriter.c"
+#line 3177 "MetadataWriter.c"
 			}
 #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp9_ = _job_it;
@@ -3182,39 +3187,39 @@ static void metadata_writer_cancel_all (MetadataWriter* self, gboolean wait) {
 			background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_background_job_unref0 (job);
-#line 3186 "MetadataWriter.c"
+#line 3191 "MetadataWriter.c"
 		}
 #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_object_unref0 (_job_it);
-#line 3190 "MetadataWriter.c"
+#line 3195 "MetadataWriter.c"
 	}
 #line 572 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp12_ = wait;
 #line 572 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp12_) {
-#line 3196 "MetadataWriter.c"
-		Workers* _tmp13_ = NULL;
+#line 3201 "MetadataWriter.c"
+		Workers* _tmp13_;
 #line 573 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp13_ = self->priv->workers;
 #line 573 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		workers_wait_for_empty_queue (_tmp13_);
-#line 3202 "MetadataWriter.c"
+#line 3207 "MetadataWriter.c"
 	}
 #line 575 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_count_cancelled_work (self, G_MAXINT, TRUE);
-#line 3206 "MetadataWriter.c"
+#line 3211 "MetadataWriter.c"
 }
 
 
 static gboolean metadata_writer_cancel_job (MetadataWriter* self, LibraryPhoto* photo) {
 	gboolean result = FALSE;
 	gboolean cancelled = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	LibraryPhoto* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	HashTimedQueue* _tmp11_ = NULL;
-	LibraryPhoto* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
+	GeeHashMap* _tmp0_;
+	LibraryPhoto* _tmp1_;
+	gboolean _tmp2_;
+	HashTimedQueue* _tmp11_;
+	LibraryPhoto* _tmp12_;
+	gboolean _tmp13_;
 #line 578 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_val_if_fail (IS_METADATA_WRITER (self), FALSE);
 #line 578 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3229,16 +3234,16 @@ static gboolean metadata_writer_cancel_job (MetadataWriter* self, LibraryPhoto*
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
 #line 581 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp2_) {
-#line 3233 "MetadataWriter.c"
+#line 3238 "MetadataWriter.c"
 		MetadataWriterCommitJob* j = NULL;
-		GeeHashMap* _tmp3_ = NULL;
-		LibraryPhoto* _tmp4_ = NULL;
-		gpointer _tmp5_ = NULL;
-		GeeHashSet* _tmp6_ = NULL;
-		MetadataWriterCommitJob* _tmp7_ = NULL;
-		MetadataWriterCommitJob* _tmp8_ = NULL;
-		GeeHashMap* _tmp9_ = NULL;
-		LibraryPhoto* _tmp10_ = NULL;
+		GeeHashMap* _tmp3_;
+		LibraryPhoto* _tmp4_;
+		gpointer _tmp5_;
+		GeeHashSet* _tmp6_;
+		MetadataWriterCommitJob* _tmp7_;
+		MetadataWriterCommitJob* _tmp8_;
+		GeeHashMap* _tmp9_;
+		LibraryPhoto* _tmp10_;
 #line 582 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp3_ = self->priv->pending;
 #line 582 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3267,7 +3272,7 @@ static gboolean metadata_writer_cancel_job (MetadataWriter* self, LibraryPhoto*
 		cancelled = TRUE;
 #line 581 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_background_job_unref0 (j);
-#line 3271 "MetadataWriter.c"
+#line 3276 "MetadataWriter.c"
 	}
 #line 589 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp11_ = self->priv->dirty;
@@ -3277,15 +3282,15 @@ static gboolean metadata_writer_cancel_job (MetadataWriter* self, LibraryPhoto*
 	_tmp13_ = timed_queue_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_TIMED_QUEUE, TimedQueue), _tmp12_);
 #line 589 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp13_) {
-#line 3281 "MetadataWriter.c"
+#line 3286 "MetadataWriter.c"
 		gboolean removed = FALSE;
-		HashTimedQueue* _tmp14_ = NULL;
-		LibraryPhoto* _tmp15_ = NULL;
-		gboolean _tmp16_ = FALSE;
-		gboolean _tmp17_ = FALSE;
-		HashTimedQueue* _tmp18_ = NULL;
-		LibraryPhoto* _tmp19_ = NULL;
-		gboolean _tmp20_ = FALSE;
+		HashTimedQueue* _tmp14_;
+		LibraryPhoto* _tmp15_;
+		gboolean _tmp16_;
+		gboolean _tmp17_;
+		HashTimedQueue* _tmp18_;
+		LibraryPhoto* _tmp19_;
+		gboolean _tmp20_;
 #line 590 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp14_ = self->priv->dirty;
 #line 590 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3310,36 +3315,36 @@ static gboolean metadata_writer_cancel_job (MetadataWriter* self, LibraryPhoto*
 		metadata_writer_count_cancelled_work (self, 1, FALSE);
 #line 596 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		cancelled = TRUE;
-#line 3314 "MetadataWriter.c"
+#line 3319 "MetadataWriter.c"
 	}
 #line 599 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	result = cancelled;
 #line 599 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	return result;
-#line 3320 "MetadataWriter.c"
+#line 3325 "MetadataWriter.c"
 }
 
 
 static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhoto* photo) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	GeeSet* keywords = NULL;
 	GeeCollection* tags = NULL;
-	TagSourceCollection* _tmp1_ = NULL;
-	LibraryPhoto* _tmp2_ = NULL;
-	GeeList* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
-	GeeHashMap* _tmp16_ = NULL;
-	LibraryPhoto* _tmp17_ = NULL;
-	gboolean _tmp18_ = FALSE;
+	TagSourceCollection* _tmp1_;
+	LibraryPhoto* _tmp2_;
+	GeeList* _tmp3_;
+	GeeCollection* _tmp4_;
+	GeeHashMap* _tmp16_;
+	LibraryPhoto* _tmp17_;
+	gboolean _tmp18_;
 	MetadataWriterCommitJob* job = NULL;
-	LibraryPhoto* _tmp20_ = NULL;
-	GeeSet* _tmp21_ = NULL;
-	MetadataWriterCommitJob* _tmp22_ = NULL;
-	GeeHashMap* _tmp23_ = NULL;
-	LibraryPhoto* _tmp24_ = NULL;
-	MetadataWriterCommitJob* _tmp25_ = NULL;
-	Workers* _tmp26_ = NULL;
-	MetadataWriterCommitJob* _tmp27_ = NULL;
+	LibraryPhoto* _tmp20_;
+	GeeSet* _tmp21_;
+	MetadataWriterCommitJob* _tmp22_;
+	GeeHashMap* _tmp23_;
+	LibraryPhoto* _tmp24_;
+	MetadataWriterCommitJob* _tmp25_;
+	Workers* _tmp26_;
+	MetadataWriterCommitJob* _tmp27_;
 #line 602 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 602 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3352,7 +3357,7 @@ static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhot
 		metadata_writer_count_cancelled_work (self, 1, TRUE);
 #line 606 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		return;
-#line 3356 "MetadataWriter.c"
+#line 3361 "MetadataWriter.c"
 	}
 #line 609 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	keywords = NULL;
@@ -3368,19 +3373,19 @@ static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhot
 	_tmp4_ = tags;
 #line 611 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp4_ != NULL) {
-#line 3372 "MetadataWriter.c"
-		GeeHashSet* _tmp5_ = NULL;
+#line 3377 "MetadataWriter.c"
+		GeeHashSet* _tmp5_;
 #line 612 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp5_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 612 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_object_unref0 (keywords);
 #line 612 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_SET, GeeSet);
-#line 3380 "MetadataWriter.c"
+#line 3385 "MetadataWriter.c"
 		{
 			GeeIterator* _tag_it = NULL;
-			GeeCollection* _tmp6_ = NULL;
-			GeeIterator* _tmp7_ = NULL;
+			GeeCollection* _tmp6_;
+			GeeIterator* _tmp7_;
 #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp6_ = tags;
 #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3389,16 +3394,16 @@ static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhot
 			_tag_it = _tmp7_;
 #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			while (TRUE) {
-#line 3393 "MetadataWriter.c"
-				GeeIterator* _tmp8_ = NULL;
-				gboolean _tmp9_ = FALSE;
+#line 3398 "MetadataWriter.c"
+				GeeIterator* _tmp8_;
+				gboolean _tmp9_;
 				Tag* tag = NULL;
-				GeeIterator* _tmp10_ = NULL;
-				gpointer _tmp11_ = NULL;
-				GeeSet* _tmp12_ = NULL;
-				Tag* _tmp13_ = NULL;
-				gchar* _tmp14_ = NULL;
-				gchar* _tmp15_ = NULL;
+				GeeIterator* _tmp10_;
+				gpointer _tmp11_;
+				GeeSet* _tmp12_;
+				Tag* _tmp13_;
+				gchar* _tmp14_;
+				gchar* _tmp15_;
 #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp8_ = _tag_it;
 #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3407,7 +3412,7 @@ static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhot
 				if (!_tmp9_) {
 #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					break;
-#line 3411 "MetadataWriter.c"
+#line 3416 "MetadataWriter.c"
 				}
 #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp10_ = _tag_it;
@@ -3429,11 +3434,11 @@ static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhot
 				_g_free0 (_tmp15_);
 #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_g_object_unref0 (tag);
-#line 3433 "MetadataWriter.c"
+#line 3438 "MetadataWriter.c"
 			}
 #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (_tag_it);
-#line 3437 "MetadataWriter.c"
+#line 3442 "MetadataWriter.c"
 		}
 	}
 #line 618 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3444,13 +3449,13 @@ static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhot
 	_tmp18_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_);
 #line 618 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp18_) {
-#line 3448 "MetadataWriter.c"
-		LibraryPhoto* _tmp19_ = NULL;
+#line 3453 "MetadataWriter.c"
+		LibraryPhoto* _tmp19_;
 #line 619 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp19_ = photo;
 #line 619 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		metadata_writer_cancel_job (self, _tmp19_);
-#line 3454 "MetadataWriter.c"
+#line 3459 "MetadataWriter.c"
 	}
 #line 621 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp20_ = photo;
@@ -3480,38 +3485,38 @@ static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhot
 	_g_object_unref0 (tags);
 #line 602 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_g_object_unref0 (keywords);
-#line 3484 "MetadataWriter.c"
+#line 3489 "MetadataWriter.c"
 }
 
 
 static gpointer _background_job_ref0 (gpointer self) {
 #line 632 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	return self ? background_job_ref (self) : NULL;
-#line 3491 "MetadataWriter.c"
+#line 3496 "MetadataWriter.c"
 }
 
 
 static void metadata_writer_on_update_completed (MetadataWriter* self, BackgroundJob* j) {
 	MetadataWriterCommitJob* job = NULL;
-	BackgroundJob* _tmp0_ = NULL;
-	MetadataWriterCommitJob* _tmp1_ = NULL;
-	MetadataWriterCommitJob* _tmp2_ = NULL;
-	GError* _tmp3_ = NULL;
+	BackgroundJob* _tmp0_;
+	MetadataWriterCommitJob* _tmp1_;
+	MetadataWriterCommitJob* _tmp2_;
+	GError* _tmp3_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp44_ = NULL;
-	MetadataWriterCommitJob* _tmp45_ = NULL;
-	LibraryPhoto* _tmp46_ = NULL;
-	gboolean _tmp47_ = FALSE;
-	gboolean _tmp48_ = FALSE;
-	LibraryPhotoSourceCollection* _tmp49_ = NULL;
-	TransactionController* _tmp50_ = NULL;
-	TransactionController* _tmp51_ = NULL;
+	GeeHashMap* _tmp44_;
+	MetadataWriterCommitJob* _tmp45_;
+	LibraryPhoto* _tmp46_;
+	gboolean _tmp47_;
+	gboolean _tmp48_;
+	LibraryPhotoSourceCollection* _tmp49_;
+	TransactionController* _tmp50_;
+	TransactionController* _tmp51_;
 	gboolean _tmp52_ = FALSE;
-	MetadataWriterCommitJob* _tmp53_ = NULL;
-	PhotoReimportMasterState* _tmp54_ = NULL;
-	LibraryPhotoSourceCollection* _tmp86_ = NULL;
-	TransactionController* _tmp87_ = NULL;
-	TransactionController* _tmp88_ = NULL;
+	MetadataWriterCommitJob* _tmp53_;
+	PhotoReimportMasterState* _tmp54_;
+	LibraryPhotoSourceCollection* _tmp86_;
+	TransactionController* _tmp87_;
+	TransactionController* _tmp88_;
 	GError * _inner_error_ = NULL;
 #line 631 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
@@ -3529,14 +3534,14 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 	_tmp3_ = _tmp2_->err;
 #line 634 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp3_ != NULL) {
-#line 3533 "MetadataWriter.c"
-		MetadataWriterCommitJob* _tmp4_ = NULL;
-		LibraryPhoto* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		MetadataWriterCommitJob* _tmp8_ = NULL;
-		GError* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
+#line 3538 "MetadataWriter.c"
+		MetadataWriterCommitJob* _tmp4_;
+		LibraryPhoto* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		MetadataWriterCommitJob* _tmp8_;
+		GError* _tmp9_;
+		const gchar* _tmp10_;
 #line 635 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp4_ = job;
 #line 635 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3555,28 +3560,28 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 		g_warning ("MetadataWriter.vala:635: Unable to write metadata to %s: %s", _tmp7_, _tmp10_);
 #line 635 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_free0 (_tmp7_);
-#line 3559 "MetadataWriter.c"
+#line 3564 "MetadataWriter.c"
 	} else {
-		MetadataWriterCommitJob* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
-		MetadataWriterCommitJob* _tmp25_ = NULL;
-		LibraryPhoto* _tmp26_ = NULL;
-		GFile* _tmp27_ = NULL;
-		GFile* _tmp28_ = NULL;
-		gboolean _tmp29_ = FALSE;
+		MetadataWriterCommitJob* _tmp11_;
+		gboolean _tmp12_;
+		MetadataWriterCommitJob* _tmp25_;
+		LibraryPhoto* _tmp26_;
+		GFile* _tmp27_;
+		GFile* _tmp28_;
+		gboolean _tmp29_;
 #line 637 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp11_ = job;
 #line 637 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp12_ = _tmp11_->wrote_master;
 #line 637 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (_tmp12_) {
-#line 3574 "MetadataWriter.c"
-			MetadataWriterCommitJob* _tmp13_ = NULL;
-			LibraryPhoto* _tmp14_ = NULL;
-			GFile* _tmp15_ = NULL;
-			GFile* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
+#line 3579 "MetadataWriter.c"
+			MetadataWriterCommitJob* _tmp13_;
+			LibraryPhoto* _tmp14_;
+			GFile* _tmp15_;
+			GFile* _tmp16_;
+			gchar* _tmp17_;
+			gchar* _tmp18_;
 #line 638 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp13_ = job;
 #line 638 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3595,14 +3600,14 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 			_g_free0 (_tmp18_);
 #line 638 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (_tmp16_);
-#line 3599 "MetadataWriter.c"
+#line 3604 "MetadataWriter.c"
 		} else {
-			MetadataWriterCommitJob* _tmp19_ = NULL;
-			LibraryPhoto* _tmp20_ = NULL;
-			GFile* _tmp21_ = NULL;
-			GFile* _tmp22_ = NULL;
-			gchar* _tmp23_ = NULL;
-			gchar* _tmp24_ = NULL;
+			MetadataWriterCommitJob* _tmp19_;
+			LibraryPhoto* _tmp20_;
+			GFile* _tmp21_;
+			GFile* _tmp22_;
+			gchar* _tmp23_;
+			gchar* _tmp24_;
 #line 640 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp19_ = job;
 #line 640 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3621,7 +3626,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 			_g_free0 (_tmp24_);
 #line 640 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (_tmp22_);
-#line 3625 "MetadataWriter.c"
+#line 3630 "MetadataWriter.c"
 		}
 #line 642 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp25_ = job;
@@ -3637,22 +3642,22 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 		_g_object_unref0 (_tmp28_);
 #line 642 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (_tmp29_) {
-#line 3641 "MetadataWriter.c"
-			MetadataWriterCommitJob* _tmp30_ = NULL;
-			gboolean _tmp31_ = FALSE;
+#line 3646 "MetadataWriter.c"
+			MetadataWriterCommitJob* _tmp30_;
+			gboolean _tmp31_;
 #line 643 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp30_ = job;
 #line 643 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp31_ = _tmp30_->wrote_editable;
 #line 643 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (_tmp31_) {
-#line 3650 "MetadataWriter.c"
-				MetadataWriterCommitJob* _tmp32_ = NULL;
-				LibraryPhoto* _tmp33_ = NULL;
-				GFile* _tmp34_ = NULL;
-				GFile* _tmp35_ = NULL;
-				gchar* _tmp36_ = NULL;
-				gchar* _tmp37_ = NULL;
+#line 3655 "MetadataWriter.c"
+				MetadataWriterCommitJob* _tmp32_;
+				LibraryPhoto* _tmp33_;
+				GFile* _tmp34_;
+				GFile* _tmp35_;
+				gchar* _tmp36_;
+				gchar* _tmp37_;
 #line 644 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp32_ = job;
 #line 644 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3671,14 +3676,14 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 				_g_free0 (_tmp37_);
 #line 644 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_g_object_unref0 (_tmp35_);
-#line 3675 "MetadataWriter.c"
+#line 3680 "MetadataWriter.c"
 			} else {
-				MetadataWriterCommitJob* _tmp38_ = NULL;
-				LibraryPhoto* _tmp39_ = NULL;
-				GFile* _tmp40_ = NULL;
-				GFile* _tmp41_ = NULL;
-				gchar* _tmp42_ = NULL;
-				gchar* _tmp43_ = NULL;
+				MetadataWriterCommitJob* _tmp38_;
+				LibraryPhoto* _tmp39_;
+				GFile* _tmp40_;
+				GFile* _tmp41_;
+				gchar* _tmp42_;
+				gchar* _tmp43_;
 #line 646 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp38_ = job;
 #line 646 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3697,7 +3702,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 				_g_free0 (_tmp43_);
 #line 646 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_g_object_unref0 (_tmp41_);
-#line 3701 "MetadataWriter.c"
+#line 3706 "MetadataWriter.c"
 			}
 		}
 	}
@@ -3731,25 +3736,25 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 	if (_tmp54_ != NULL) {
 #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp52_ = TRUE;
-#line 3735 "MetadataWriter.c"
+#line 3740 "MetadataWriter.c"
 	} else {
-		MetadataWriterCommitJob* _tmp55_ = NULL;
-		PhotoReimportEditableState* _tmp56_ = NULL;
+		MetadataWriterCommitJob* _tmp55_;
+		PhotoReimportEditableState* _tmp56_;
 #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp55_ = job;
 #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp56_ = _tmp55_->reimport_editable_state;
 #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp52_ = _tmp56_ != NULL;
-#line 3745 "MetadataWriter.c"
+#line 3750 "MetadataWriter.c"
 	}
 #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp52_) {
-#line 3749 "MetadataWriter.c"
-		LibraryPhoto* _tmp57_ = NULL;
-		MetadataWriterCommitJob* _tmp58_ = NULL;
-		LibraryPhoto* _tmp59_ = NULL;
-		LibraryPhoto* _tmp60_ = NULL;
+#line 3754 "MetadataWriter.c"
+		LibraryPhoto* _tmp57_;
+		MetadataWriterCommitJob* _tmp58_;
+		LibraryPhoto* _tmp59_;
+		LibraryPhoto* _tmp60_;
 #line 660 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp57_ = self->priv->ignore_photo_alteration;
 #line 660 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3764,23 +3769,23 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 		_g_object_unref0 (self->priv->ignore_photo_alteration);
 #line 661 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		self->priv->ignore_photo_alteration = _tmp60_;
-#line 3768 "MetadataWriter.c"
+#line 3773 "MetadataWriter.c"
 		{
-			MetadataWriterCommitJob* _tmp61_ = NULL;
-			PhotoReimportMasterState* _tmp62_ = NULL;
-			MetadataWriterCommitJob* _tmp70_ = NULL;
-			PhotoReimportEditableState* _tmp71_ = NULL;
+			MetadataWriterCommitJob* _tmp61_;
+			PhotoReimportMasterState* _tmp62_;
+			MetadataWriterCommitJob* _tmp70_;
+			PhotoReimportEditableState* _tmp71_;
 #line 663 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp61_ = job;
 #line 663 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp62_ = _tmp61_->reimport_master_state;
 #line 663 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (_tmp62_ != NULL) {
-#line 3780 "MetadataWriter.c"
-				MetadataWriterCommitJob* _tmp63_ = NULL;
-				LibraryPhoto* _tmp64_ = NULL;
-				MetadataWriterCommitJob* _tmp65_ = NULL;
-				PhotoReimportMasterState* _tmp66_ = NULL;
+#line 3785 "MetadataWriter.c"
+				MetadataWriterCommitJob* _tmp63_;
+				LibraryPhoto* _tmp64_;
+				MetadataWriterCommitJob* _tmp65_;
+				PhotoReimportMasterState* _tmp66_;
 #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp63_ = job;
 #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3795,13 +3800,13 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3799 "MetadataWriter.c"
-						goto __catch554_database_error;
+#line 3804 "MetadataWriter.c"
+						goto __catch555_database_error;
 					}
 					{
-						LibraryPhoto* _tmp67_ = NULL;
-						MetadataWriterCommitJob* _tmp68_ = NULL;
-						LibraryPhoto* _tmp69_ = NULL;
+						LibraryPhoto* _tmp67_;
+						MetadataWriterCommitJob* _tmp68_;
+						LibraryPhoto* _tmp69_;
 #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						_tmp67_ = self->priv->ignore_photo_alteration;
 #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3814,7 +3819,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 						_g_object_unref0 (self->priv->ignore_photo_alteration);
 #line 673 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						self->priv->ignore_photo_alteration = NULL;
-#line 3818 "MetadataWriter.c"
+#line 3823 "MetadataWriter.c"
 					}
 #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_background_job_unref0 (job);
@@ -3824,7 +3829,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 					g_clear_error (&_inner_error_);
 #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					return;
-#line 3828 "MetadataWriter.c"
+#line 3833 "MetadataWriter.c"
 				}
 			}
 #line 666 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3833,11 +3838,11 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 			_tmp71_ = _tmp70_->reimport_editable_state;
 #line 666 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (_tmp71_ != NULL) {
-#line 3837 "MetadataWriter.c"
-				MetadataWriterCommitJob* _tmp72_ = NULL;
-				LibraryPhoto* _tmp73_ = NULL;
-				MetadataWriterCommitJob* _tmp74_ = NULL;
-				PhotoReimportEditableState* _tmp75_ = NULL;
+#line 3842 "MetadataWriter.c"
+				MetadataWriterCommitJob* _tmp72_;
+				LibraryPhoto* _tmp73_;
+				MetadataWriterCommitJob* _tmp74_;
+				PhotoReimportEditableState* _tmp75_;
 #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp72_ = job;
 #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3852,13 +3857,13 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3856 "MetadataWriter.c"
-						goto __catch554_database_error;
+#line 3861 "MetadataWriter.c"
+						goto __catch555_database_error;
 					}
 					{
-						LibraryPhoto* _tmp76_ = NULL;
-						MetadataWriterCommitJob* _tmp77_ = NULL;
-						LibraryPhoto* _tmp78_ = NULL;
+						LibraryPhoto* _tmp76_;
+						MetadataWriterCommitJob* _tmp77_;
+						LibraryPhoto* _tmp78_;
 #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						_tmp76_ = self->priv->ignore_photo_alteration;
 #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3871,7 +3876,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 						_g_object_unref0 (self->priv->ignore_photo_alteration);
 #line 673 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						self->priv->ignore_photo_alteration = NULL;
-#line 3875 "MetadataWriter.c"
+#line 3880 "MetadataWriter.c"
 					}
 #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_background_job_unref0 (job);
@@ -3881,15 +3886,15 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 					g_clear_error (&_inner_error_);
 #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					return;
-#line 3885 "MetadataWriter.c"
+#line 3890 "MetadataWriter.c"
 				}
 			}
 		}
-		goto __finally554;
-		__catch554_database_error:
+		goto __finally555;
+		__catch555_database_error:
 		{
 			GError* err = NULL;
-			GError* _tmp79_ = NULL;
+			GError* _tmp79_;
 #line 662 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			err = _inner_error_;
 #line 662 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3900,13 +3905,13 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 			app_window_database_error (_tmp79_);
 #line 662 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_error_free0 (err);
-#line 3904 "MetadataWriter.c"
+#line 3909 "MetadataWriter.c"
 		}
-		__finally554:
+		__finally555:
 		{
-			LibraryPhoto* _tmp80_ = NULL;
-			MetadataWriterCommitJob* _tmp81_ = NULL;
-			LibraryPhoto* _tmp82_ = NULL;
+			LibraryPhoto* _tmp80_;
+			MetadataWriterCommitJob* _tmp81_;
+			LibraryPhoto* _tmp82_;
 #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp80_ = self->priv->ignore_photo_alteration;
 #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3919,7 +3924,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 			_g_object_unref0 (self->priv->ignore_photo_alteration);
 #line 673 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			self->priv->ignore_photo_alteration = NULL;
-#line 3923 "MetadataWriter.c"
+#line 3928 "MetadataWriter.c"
 		}
 #line 662 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -3931,13 +3936,13 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 			g_clear_error (&_inner_error_);
 #line 662 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			return;
-#line 3935 "MetadataWriter.c"
+#line 3940 "MetadataWriter.c"
 		}
 	} else {
 	}
 	{
-		MetadataWriterCommitJob* _tmp83_ = NULL;
-		LibraryPhoto* _tmp84_ = NULL;
+		MetadataWriterCommitJob* _tmp83_;
+		LibraryPhoto* _tmp84_;
 #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp83_ = job;
 #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3948,8 +3953,8 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3952 "MetadataWriter.c"
-				goto __catch555_database_error;
+#line 3957 "MetadataWriter.c"
+				goto __catch556_database_error;
 			}
 #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_background_job_unref0 (job);
@@ -3959,14 +3964,14 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 			g_clear_error (&_inner_error_);
 #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			return;
-#line 3963 "MetadataWriter.c"
+#line 3968 "MetadataWriter.c"
 		}
 	}
-	goto __finally555;
-	__catch555_database_error:
+	goto __finally556;
+	__catch556_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp85_ = NULL;
+		GError* _tmp85_;
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		err = _inner_error_;
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3977,9 +3982,9 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 		app_window_database_error (_tmp85_);
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_error_free0 (err);
-#line 3981 "MetadataWriter.c"
+#line 3986 "MetadataWriter.c"
 	}
-	__finally555:
+	__finally556:
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3990,7 +3995,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 		g_clear_error (&_inner_error_);
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		return;
-#line 3994 "MetadataWriter.c"
+#line 3999 "MetadataWriter.c"
 	}
 #line 688 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp86_ = library_photo_global;
@@ -4004,15 +4009,15 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 	metadata_writer_count_completed_work (self, 1, TRUE);
 #line 631 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_background_job_unref0 (job);
-#line 4008 "MetadataWriter.c"
+#line 4013 "MetadataWriter.c"
 }
 
 
 static void metadata_writer_on_update_cancelled (MetadataWriter* self, BackgroundJob* j) {
 	gboolean removed = FALSE;
-	GeeHashSet* _tmp0_ = NULL;
-	BackgroundJob* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashSet* _tmp0_;
+	BackgroundJob* _tmp1_;
+	gboolean _tmp2_;
 #line 693 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (IS_METADATA_WRITER (self));
 #line 693 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4029,7 +4034,7 @@ static void metadata_writer_on_update_cancelled (MetadataWriter* self, Backgroun
 	_vala_assert (removed, "removed");
 #line 697 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_count_cancelled_work (self, 1, TRUE);
-#line 4033 "MetadataWriter.c"
+#line 4038 "MetadataWriter.c"
 }
 
 
@@ -4048,47 +4053,47 @@ static void g_cclosure_user_marshal_VOID__UINT_UINT (GClosure * closure, GValue
 		data1 = closure->data;
 #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4052 "MetadataWriter.c"
+#line 4057 "MetadataWriter.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		data2 = closure->data;
-#line 4058 "MetadataWriter.c"
+#line 4063 "MetadataWriter.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	callback = (GMarshalFunc_VOID__UINT_UINT) (marshal_data ? marshal_data : cc->callback);
 #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	callback (data1, g_value_get_uint (param_values + 1), g_value_get_uint (param_values + 2), data2);
-#line 4064 "MetadataWriter.c"
+#line 4069 "MetadataWriter.c"
 }
 
 
 static void _metadata_writer_on_update_completed_completion_callback (BackgroundJob* job, gpointer self) {
 #line 30 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_update_completed ((MetadataWriter*) self, job);
-#line 4071 "MetadataWriter.c"
+#line 4076 "MetadataWriter.c"
 }
 
 
 static void _metadata_writer_on_update_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
 #line 30 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	metadata_writer_on_update_cancelled ((MetadataWriter*) self, job);
-#line 4078 "MetadataWriter.c"
+#line 4083 "MetadataWriter.c"
 }
 
 
 static MetadataWriterCommitJob* metadata_writer_commit_job_construct (GType object_type, MetadataWriter* owner, LibraryPhoto* photo, GeeSet* keywords) {
 	MetadataWriterCommitJob* self = NULL;
-	MetadataWriter* _tmp0_ = NULL;
-	MetadataWriter* _tmp1_ = NULL;
-	GCancellable* _tmp2_ = NULL;
-	GCancellable* _tmp3_ = NULL;
-	MetadataWriter* _tmp4_ = NULL;
-	LibraryPhoto* _tmp5_ = NULL;
-	LibraryPhoto* _tmp6_ = NULL;
-	GeeSet* _tmp7_ = NULL;
-	GeeSet* _tmp8_ = NULL;
+	MetadataWriter* _tmp0_;
+	MetadataWriter* _tmp1_;
+	GCancellable* _tmp2_;
+	GCancellable* _tmp3_;
+	MetadataWriter* _tmp4_;
+	LibraryPhoto* _tmp5_;
+	LibraryPhoto* _tmp6_;
+	GeeSet* _tmp7_;
+	GeeSet* _tmp8_;
 #line 29 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_val_if_fail (IS_METADATA_WRITER (owner), NULL);
 #line 29 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4127,21 +4132,21 @@ static MetadataWriterCommitJob* metadata_writer_commit_job_construct (GType obje
 	self->current_keywords = _tmp8_;
 #line 29 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	return self;
-#line 4131 "MetadataWriter.c"
+#line 4136 "MetadataWriter.c"
 }
 
 
 static MetadataWriterCommitJob* metadata_writer_commit_job_new (MetadataWriter* owner, LibraryPhoto* photo, GeeSet* keywords) {
 #line 29 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	return metadata_writer_commit_job_construct (METADATA_WRITER_TYPE_COMMIT_JOB, owner, photo, keywords);
-#line 4138 "MetadataWriter.c"
+#line 4143 "MetadataWriter.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
 #line 41 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 4145 "MetadataWriter.c"
+#line 4150 "MetadataWriter.c"
 }
 
 
@@ -4150,29 +4155,29 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) {
 	GError * _inner_error_ = NULL;
 #line 36 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, METADATA_WRITER_TYPE_COMMIT_JOB, MetadataWriterCommitJob);
-#line 4154 "MetadataWriter.c"
+#line 4159 "MetadataWriter.c"
 	{
 #line 38 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		metadata_writer_commit_job_commit_master (self, &_inner_error_);
 #line 38 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4160 "MetadataWriter.c"
-			goto __catch556_g_error;
+#line 4165 "MetadataWriter.c"
+			goto __catch557_g_error;
 		}
 #line 39 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		metadata_writer_commit_job_commit_editable (self, &_inner_error_);
 #line 39 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4167 "MetadataWriter.c"
-			goto __catch556_g_error;
+#line 4172 "MetadataWriter.c"
+			goto __catch557_g_error;
 		}
 	}
-	goto __finally556;
-	__catch556_g_error:
+	goto __finally557;
+	__catch557_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp0_ = NULL;
-		GError* _tmp1_ = NULL;
+		GError* _tmp0_;
+		GError* _tmp1_;
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		err = _inner_error_;
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4187,9 +4192,9 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) {
 		self->err = _tmp1_;
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_error_free0 (err);
-#line 4191 "MetadataWriter.c"
+#line 4196 "MetadataWriter.c"
 	}
-	__finally556:
+	__finally557:
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4198,24 +4203,24 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) {
 		g_clear_error (&_inner_error_);
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		return;
-#line 4202 "MetadataWriter.c"
+#line 4207 "MetadataWriter.c"
 	}
 }
 
 
 static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* self, GError** error) {
 	gboolean skip_orientation = FALSE;
-	LibraryPhoto* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	LibraryPhoto* _tmp2_ = NULL;
-	PhotoFileFormat _tmp3_ = 0;
-	gboolean _tmp4_ = FALSE;
+	LibraryPhoto* _tmp0_;
+	gboolean _tmp1_;
+	LibraryPhoto* _tmp2_;
+	PhotoFileFormat _tmp3_;
+	gboolean _tmp4_;
 	PhotoMetadata* metadata = NULL;
-	LibraryPhoto* _tmp5_ = NULL;
-	PhotoMetadata* _tmp6_ = NULL;
-	PhotoMetadata* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_ = FALSE;
+	LibraryPhoto* _tmp5_;
+	PhotoMetadata* _tmp6_;
+	PhotoMetadata* _tmp7_;
+	gboolean _tmp8_;
+	gboolean _tmp9_;
 	GError * _inner_error_ = NULL;
 #line 45 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (METADATA_WRITER_IS_COMMIT_JOB (self));
@@ -4235,7 +4240,7 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s
 	if (!_tmp4_) {
 #line 52 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		return;
-#line 4239 "MetadataWriter.c"
+#line 4244 "MetadataWriter.c"
 	}
 #line 54 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp5_ = self->photo;
@@ -4249,7 +4254,7 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s
 		g_propagate_error (error, _inner_error_);
 #line 54 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		return;
-#line 4253 "MetadataWriter.c"
+#line 4258 "MetadataWriter.c"
 	}
 #line 55 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp7_ = metadata;
@@ -4259,10 +4264,10 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s
 	_tmp9_ = metadata_writer_commit_job_update_metadata (self, _tmp7_, _tmp8_);
 #line 55 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp9_) {
-#line 4263 "MetadataWriter.c"
-		LibraryPhoto* _tmp10_ = NULL;
-		GFile* _tmp11_ = NULL;
-		GFile* _tmp12_ = NULL;
+#line 4268 "MetadataWriter.c"
+		LibraryPhoto* _tmp10_;
+		GFile* _tmp11_;
+		GFile* _tmp12_;
 #line 56 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp10_ = self->photo;
 #line 56 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4273,10 +4278,10 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s
 		library_monitor_blacklist_file (_tmp12_, "MetadataWriter.commit_master");
 #line 56 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_object_unref0 (_tmp12_);
-#line 4277 "MetadataWriter.c"
+#line 4282 "MetadataWriter.c"
 		{
-			LibraryPhoto* _tmp13_ = NULL;
-			PhotoMetadata* _tmp14_ = NULL;
+			LibraryPhoto* _tmp13_;
+			PhotoMetadata* _tmp14_;
 			PhotoReimportMasterState* _tmp15_ = NULL;
 #line 58 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp13_ = self->photo;
@@ -4290,15 +4295,15 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s
 			self->reimport_master_state = _tmp15_;
 #line 58 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4294 "MetadataWriter.c"
-				goto __finally557;
+#line 4299 "MetadataWriter.c"
+				goto __finally558;
 			}
 		}
-		__finally557:
+		__finally558:
 		{
-			LibraryPhoto* _tmp16_ = NULL;
-			GFile* _tmp17_ = NULL;
-			GFile* _tmp18_ = NULL;
+			LibraryPhoto* _tmp16_;
+			GFile* _tmp17_;
+			GFile* _tmp18_;
 #line 60 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp16_ = self->photo;
 #line 60 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4309,7 +4314,7 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s
 			library_monitor_unblacklist_file (_tmp18_);
 #line 60 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (_tmp18_);
-#line 4313 "MetadataWriter.c"
+#line 4318 "MetadataWriter.c"
 		}
 #line 57 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -4319,27 +4324,27 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s
 			_media_metadata_unref0 (metadata);
 #line 57 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			return;
-#line 4323 "MetadataWriter.c"
+#line 4328 "MetadataWriter.c"
 		}
 	}
 #line 64 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->wrote_master = TRUE;
 #line 45 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_media_metadata_unref0 (metadata);
-#line 4330 "MetadataWriter.c"
+#line 4335 "MetadataWriter.c"
 }
 
 
 static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob* self, GError** error) {
 	gboolean _tmp0_ = FALSE;
-	LibraryPhoto* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	LibraryPhoto* _tmp1_;
+	gboolean _tmp2_;
 	PhotoMetadata* metadata = NULL;
-	LibraryPhoto* _tmp7_ = NULL;
-	PhotoMetadata* _tmp8_ = NULL;
-	PhotoMetadata* _tmp9_ = NULL;
-	PhotoMetadata* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
+	LibraryPhoto* _tmp7_;
+	PhotoMetadata* _tmp8_;
+	PhotoMetadata* _tmp9_;
+	PhotoMetadata* _tmp10_;
+	gboolean _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 67 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (METADATA_WRITER_IS_COMMIT_JOB (self));
@@ -4351,12 +4356,12 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob*
 	if (!_tmp2_) {
 #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp0_ = TRUE;
-#line 4355 "MetadataWriter.c"
+#line 4360 "MetadataWriter.c"
 	} else {
-		LibraryPhoto* _tmp3_ = NULL;
-		PhotoFileFormat* _tmp4_ = NULL;
-		PhotoFileFormat* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		LibraryPhoto* _tmp3_;
+		PhotoFileFormat* _tmp4_;
+		PhotoFileFormat* _tmp5_;
+		gboolean _tmp6_;
 #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp3_ = self->photo;
 #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4369,13 +4374,13 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob*
 		_tmp0_ = !_tmp6_;
 #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_free0 (_tmp5_);
-#line 4373 "MetadataWriter.c"
+#line 4378 "MetadataWriter.c"
 	}
 #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp0_) {
 #line 69 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		return;
-#line 4379 "MetadataWriter.c"
+#line 4384 "MetadataWriter.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp7_ = self->photo;
@@ -4389,7 +4394,7 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob*
 		g_propagate_error (error, _inner_error_);
 #line 71 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		return;
-#line 4393 "MetadataWriter.c"
+#line 4398 "MetadataWriter.c"
 	}
 #line 72 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp9_ = metadata;
@@ -4401,10 +4406,10 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob*
 	_tmp11_ = metadata_writer_commit_job_update_metadata (self, _tmp10_, FALSE);
 #line 74 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp11_) {
-#line 4405 "MetadataWriter.c"
-		LibraryPhoto* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		GFile* _tmp14_ = NULL;
+#line 4410 "MetadataWriter.c"
+		LibraryPhoto* _tmp12_;
+		GFile* _tmp13_;
+		GFile* _tmp14_;
 #line 75 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp12_ = self->photo;
 #line 75 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4415,10 +4420,10 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob*
 		library_monitor_blacklist_file (_tmp14_, "MetadataWriter.commit_editable");
 #line 75 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_object_unref0 (_tmp14_);
-#line 4419 "MetadataWriter.c"
+#line 4424 "MetadataWriter.c"
 		{
-			LibraryPhoto* _tmp15_ = NULL;
-			PhotoMetadata* _tmp16_ = NULL;
+			LibraryPhoto* _tmp15_;
+			PhotoMetadata* _tmp16_;
 			PhotoReimportEditableState* _tmp17_ = NULL;
 #line 77 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp15_ = self->photo;
@@ -4432,15 +4437,15 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob*
 			self->reimport_editable_state = _tmp17_;
 #line 77 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4436 "MetadataWriter.c"
-				goto __finally558;
+#line 4441 "MetadataWriter.c"
+				goto __finally559;
 			}
 		}
-		__finally558:
+		__finally559:
 		{
-			LibraryPhoto* _tmp18_ = NULL;
-			GFile* _tmp19_ = NULL;
-			GFile* _tmp20_ = NULL;
+			LibraryPhoto* _tmp18_;
+			GFile* _tmp19_;
+			GFile* _tmp20_;
 #line 79 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp18_ = self->photo;
 #line 79 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4451,7 +4456,7 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob*
 			library_monitor_unblacklist_file (_tmp20_);
 #line 79 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (_tmp20_);
-#line 4455 "MetadataWriter.c"
+#line 4460 "MetadataWriter.c"
 		}
 #line 76 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -4461,14 +4466,14 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob*
 			_media_metadata_unref0 (metadata);
 #line 76 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			return;
-#line 4465 "MetadataWriter.c"
+#line 4470 "MetadataWriter.c"
 		}
 	}
 #line 83 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->wrote_editable = TRUE;
 #line 67 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_media_metadata_unref0 (metadata);
-#line 4472 "MetadataWriter.c"
+#line 4477 "MetadataWriter.c"
 }
 
 
@@ -4476,48 +4481,48 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 	gboolean result = FALSE;
 	gboolean changed = FALSE;
 	gchar* current_title = NULL;
-	LibraryPhoto* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PhotoMetadata* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	LibraryPhoto* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PhotoMetadata* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gboolean _tmp6_;
 	gchar* current_comment = NULL;
-	LibraryPhoto* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	PhotoMetadata* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
+	LibraryPhoto* _tmp9_;
+	gchar* _tmp10_;
+	const gchar* _tmp11_;
+	PhotoMetadata* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	gboolean _tmp15_;
 	Rating current_rating = 0;
-	LibraryPhoto* _tmp18_ = NULL;
-	Rating _tmp19_ = 0;
-	Rating _tmp20_ = 0;
-	PhotoMetadata* _tmp21_ = NULL;
-	Rating _tmp22_ = 0;
+	LibraryPhoto* _tmp18_;
+	Rating _tmp19_;
+	Rating _tmp20_;
+	PhotoMetadata* _tmp21_;
+	Rating _tmp22_;
 	time_t current_exposure_time = 0;
-	LibraryPhoto* _tmp25_ = NULL;
-	time_t _tmp26_ = 0;
+	LibraryPhoto* _tmp25_;
+	time_t _tmp26_;
 	time_t metadata_exposure_time = 0;
 	MetadataDateTime* metadata_exposure_date_time = NULL;
-	PhotoMetadata* _tmp27_ = NULL;
-	MetadataDateTime* _tmp28_ = NULL;
-	MetadataDateTime* _tmp29_ = NULL;
-	time_t _tmp32_ = 0;
-	time_t _tmp33_ = 0;
+	PhotoMetadata* _tmp27_;
+	MetadataDateTime* _tmp28_;
+	MetadataDateTime* _tmp29_;
+	time_t _tmp32_;
+	time_t _tmp33_;
 	GeeSet* safe_keywords = NULL;
-	GeeHashSet* _tmp39_ = NULL;
-	GeeSet* _tmp40_ = NULL;
-	GeeSet* _tmp53_ = NULL;
-	PhotoMetadata* _tmp54_ = NULL;
-	GeeSet* _tmp55_ = NULL;
-	GeeSet* _tmp56_ = NULL;
-	gboolean _tmp57_ = FALSE;
-	gboolean _tmp58_ = FALSE;
-	gboolean _tmp61_ = FALSE;
-	gboolean _tmp69_ = FALSE;
+	GeeHashSet* _tmp39_;
+	GeeSet* _tmp40_;
+	GeeSet* _tmp53_;
+	PhotoMetadata* _tmp54_;
+	GeeSet* _tmp55_;
+	GeeSet* _tmp56_;
+	gboolean _tmp57_;
+	gboolean _tmp58_;
+	gboolean _tmp61_;
+	gboolean _tmp69_;
 #line 86 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_val_if_fail (METADATA_WRITER_IS_COMMIT_JOB (self), FALSE);
 #line 86 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4544,9 +4549,9 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 	_g_free0 (_tmp5_);
 #line 91 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp6_) {
-#line 4548 "MetadataWriter.c"
-		PhotoMetadata* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
+#line 4553 "MetadataWriter.c"
+		PhotoMetadata* _tmp7_;
+		const gchar* _tmp8_;
 #line 92 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp7_ = metadata;
 #line 92 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4555,7 +4560,7 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 		photo_metadata_set_title (_tmp7_, _tmp8_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 93 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		changed = TRUE;
-#line 4559 "MetadataWriter.c"
+#line 4564 "MetadataWriter.c"
 	}
 #line 97 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp9_ = self->photo;
@@ -4577,9 +4582,9 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 	_g_free0 (_tmp14_);
 #line 98 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp15_) {
-#line 4581 "MetadataWriter.c"
-		PhotoMetadata* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
+#line 4586 "MetadataWriter.c"
+		PhotoMetadata* _tmp16_;
+		const gchar* _tmp17_;
 #line 99 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp16_ = metadata;
 #line 99 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4588,7 +4593,7 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 		photo_metadata_set_comment (_tmp16_, _tmp17_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 100 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		changed = TRUE;
-#line 4592 "MetadataWriter.c"
+#line 4597 "MetadataWriter.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp18_ = self->photo;
@@ -4604,9 +4609,9 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 	_tmp22_ = photo_metadata_get_rating (_tmp21_);
 #line 105 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp20_ != _tmp22_) {
-#line 4608 "MetadataWriter.c"
-		PhotoMetadata* _tmp23_ = NULL;
-		Rating _tmp24_ = 0;
+#line 4613 "MetadataWriter.c"
+		PhotoMetadata* _tmp23_;
+		Rating _tmp24_;
 #line 106 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp23_ = metadata;
 #line 106 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4615,7 +4620,7 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 		photo_metadata_set_rating (_tmp23_, _tmp24_);
 #line 107 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		changed = TRUE;
-#line 4619 "MetadataWriter.c"
+#line 4624 "MetadataWriter.c"
 	}
 #line 111 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp25_ = self->photo;
@@ -4635,16 +4640,16 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 	_tmp29_ = metadata_exposure_date_time;
 #line 114 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp29_ != NULL) {
-#line 4639 "MetadataWriter.c"
-		MetadataDateTime* _tmp30_ = NULL;
-		time_t _tmp31_ = 0;
+#line 4644 "MetadataWriter.c"
+		MetadataDateTime* _tmp30_;
+		time_t _tmp31_;
 #line 115 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp30_ = metadata_exposure_date_time;
 #line 115 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp31_ = metadata_date_time_get_timestamp (_tmp30_);
 #line 115 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		metadata_exposure_time = _tmp31_;
-#line 4648 "MetadataWriter.c"
+#line 4653 "MetadataWriter.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp32_ = current_exposure_time;
@@ -4652,17 +4657,17 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 	_tmp33_ = metadata_exposure_time;
 #line 116 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp32_ != _tmp33_) {
-#line 4656 "MetadataWriter.c"
+#line 4661 "MetadataWriter.c"
 		MetadataDateTime* _tmp34_ = NULL;
-		time_t _tmp35_ = 0;
-		PhotoMetadata* _tmp38_ = NULL;
+		time_t _tmp35_;
+		PhotoMetadata* _tmp38_;
 #line 117 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp35_ = current_exposure_time;
 #line 117 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (_tmp35_ != ((time_t) 0)) {
-#line 4664 "MetadataWriter.c"
-			time_t _tmp36_ = 0;
-			MetadataDateTime* _tmp37_ = NULL;
+#line 4669 "MetadataWriter.c"
+			time_t _tmp36_;
+			MetadataDateTime* _tmp37_;
 #line 118 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp36_ = current_exposure_time;
 #line 118 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4671,13 +4676,13 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 			_metadata_date_time_unref0 (_tmp34_);
 #line 118 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp34_ = _tmp37_;
-#line 4675 "MetadataWriter.c"
+#line 4680 "MetadataWriter.c"
 		} else {
 #line 119 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_metadata_date_time_unref0 (_tmp34_);
 #line 119 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp34_ = NULL;
-#line 4681 "MetadataWriter.c"
+#line 4686 "MetadataWriter.c"
 		}
 #line 117 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp38_ = metadata;
@@ -4687,7 +4692,7 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 		changed = TRUE;
 #line 116 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_metadata_date_time_unref0 (_tmp34_);
-#line 4691 "MetadataWriter.c"
+#line 4696 "MetadataWriter.c"
 	}
 #line 124 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp39_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -4697,11 +4702,11 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 	_tmp40_ = self->current_keywords;
 #line 133 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp40_ != NULL) {
-#line 4701 "MetadataWriter.c"
+#line 4706 "MetadataWriter.c"
 		{
 			GeeIterator* _tmp_it = NULL;
-			GeeSet* _tmp41_ = NULL;
-			GeeIterator* _tmp42_ = NULL;
+			GeeSet* _tmp41_;
+			GeeIterator* _tmp42_;
 #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp41_ = self->current_keywords;
 #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4710,19 +4715,19 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 			_tmp_it = _tmp42_;
 #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			while (TRUE) {
-#line 4714 "MetadataWriter.c"
-				GeeIterator* _tmp43_ = NULL;
-				gboolean _tmp44_ = FALSE;
+#line 4719 "MetadataWriter.c"
+				GeeIterator* _tmp43_;
+				gboolean _tmp44_;
 				gchar* tmp = NULL;
-				GeeIterator* _tmp45_ = NULL;
-				gpointer _tmp46_ = NULL;
+				GeeIterator* _tmp45_;
+				gpointer _tmp46_;
 				Tag* tag = NULL;
-				const gchar* _tmp47_ = NULL;
-				Tag* _tmp48_ = NULL;
-				GeeSet* _tmp49_ = NULL;
-				Tag* _tmp50_ = NULL;
-				gchar* _tmp51_ = NULL;
-				gchar* _tmp52_ = NULL;
+				const gchar* _tmp47_;
+				Tag* _tmp48_;
+				GeeSet* _tmp49_;
+				Tag* _tmp50_;
+				gchar* _tmp51_;
+				gchar* _tmp52_;
 #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp43_ = _tmp_it;
 #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4731,7 +4736,7 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 				if (!_tmp44_) {
 #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					break;
-#line 4735 "MetadataWriter.c"
+#line 4740 "MetadataWriter.c"
 				}
 #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_tmp45_ = _tmp_it;
@@ -4761,11 +4766,11 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 				_g_object_unref0 (tag);
 #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_g_free0 (tmp);
-#line 4765 "MetadataWriter.c"
+#line 4770 "MetadataWriter.c"
 			}
 #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_g_object_unref0 (_tmp_it);
-#line 4769 "MetadataWriter.c"
+#line 4774 "MetadataWriter.c"
 		}
 	}
 #line 140 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4784,9 +4789,9 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 	_g_object_unref0 (_tmp56_);
 #line 140 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp58_) {
-#line 4788 "MetadataWriter.c"
-		PhotoMetadata* _tmp59_ = NULL;
-		GeeSet* _tmp60_ = NULL;
+#line 4793 "MetadataWriter.c"
+		PhotoMetadata* _tmp59_;
+		GeeSet* _tmp60_;
 #line 141 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp59_ = metadata;
 #line 141 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4795,19 +4800,19 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 		photo_metadata_set_keywords (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_COLLECTION, GeeCollection), PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 142 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		changed = TRUE;
-#line 4799 "MetadataWriter.c"
+#line 4804 "MetadataWriter.c"
 	}
 #line 146 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp61_ = skip_orientation;
 #line 146 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (!_tmp61_) {
-#line 4805 "MetadataWriter.c"
+#line 4810 "MetadataWriter.c"
 		Orientation current_orientation = 0;
-		LibraryPhoto* _tmp62_ = NULL;
-		Orientation _tmp63_ = 0;
-		Orientation _tmp64_ = 0;
-		PhotoMetadata* _tmp65_ = NULL;
-		Orientation _tmp66_ = 0;
+		LibraryPhoto* _tmp62_;
+		Orientation _tmp63_;
+		Orientation _tmp64_;
+		PhotoMetadata* _tmp65_;
+		Orientation _tmp66_;
 #line 147 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp62_ = self->photo;
 #line 147 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4822,9 +4827,9 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 		_tmp66_ = photo_metadata_get_orientation (_tmp65_);
 #line 148 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (_tmp64_ != _tmp66_) {
-#line 4826 "MetadataWriter.c"
-			PhotoMetadata* _tmp67_ = NULL;
-			Orientation _tmp68_ = 0;
+#line 4831 "MetadataWriter.c"
+			PhotoMetadata* _tmp67_;
+			Orientation _tmp68_;
 #line 149 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_tmp67_ = metadata;
 #line 149 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4833,20 +4838,20 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 			photo_metadata_set_orientation (_tmp67_, _tmp68_);
 #line 150 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			changed = TRUE;
-#line 4837 "MetadataWriter.c"
+#line 4842 "MetadataWriter.c"
 		}
 	}
 #line 155 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_tmp69_ = changed;
 #line 155 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (_tmp69_) {
-#line 4844 "MetadataWriter.c"
-		PhotoMetadata* _tmp70_ = NULL;
+#line 4849 "MetadataWriter.c"
+		PhotoMetadata* _tmp70_;
 #line 156 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp70_ = metadata;
 #line 156 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		photo_metadata_set_software (_tmp70_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
-#line 4850 "MetadataWriter.c"
+#line 4855 "MetadataWriter.c"
 	}
 #line 158 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	result = changed;
@@ -4860,7 +4865,7 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 	_g_free0 (current_title);
 #line 158 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	return result;
-#line 4864 "MetadataWriter.c"
+#line 4869 "MetadataWriter.c"
 }
 
 
@@ -4870,8 +4875,8 @@ static void metadata_writer_commit_job_class_init (MetadataWriterCommitJobClass
 #line 20 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	((BackgroundJobClass *) klass)->finalize = metadata_writer_commit_job_finalize;
 #line 20 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) metadata_writer_commit_job_real_execute;
-#line 4875 "MetadataWriter.c"
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) metadata_writer_commit_job_real_execute;
+#line 4880 "MetadataWriter.c"
 }
 
 
@@ -4886,11 +4891,11 @@ static void metadata_writer_commit_job_instance_init (MetadataWriterCommitJob *
 	self->wrote_master = FALSE;
 #line 27 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->wrote_editable = FALSE;
-#line 4890 "MetadataWriter.c"
+#line 4895 "MetadataWriter.c"
 }
 
 
-static void metadata_writer_commit_job_finalize (BackgroundJob* obj) {
+static void metadata_writer_commit_job_finalize (BackgroundJob * obj) {
 	MetadataWriterCommitJob * self;
 #line 20 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, METADATA_WRITER_TYPE_COMMIT_JOB, MetadataWriterCommitJob);
@@ -4906,7 +4911,7 @@ static void metadata_writer_commit_job_finalize (BackgroundJob* obj) {
 	_g_error_free0 (self->err);
 #line 20 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	BACKGROUND_JOB_CLASS (metadata_writer_commit_job_parent_class)->finalize (obj);
-#line 4910 "MetadataWriter.c"
+#line 4915 "MetadataWriter.c"
 }
 
 
@@ -4930,17 +4935,17 @@ static void metadata_writer_class_init (MetadataWriterClass * klass) {
 #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	G_OBJECT_CLASS (klass)->finalize = metadata_writer_finalize;
 #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-	g_signal_new ("progress", TYPE_METADATA_WRITER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT_UINT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
-#line 4935 "MetadataWriter.c"
+	metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL] = g_signal_new ("progress", TYPE_METADATA_WRITER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT_UINT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
+#line 4940 "MetadataWriter.c"
 }
 
 
 static void metadata_writer_instance_init (MetadataWriter * self) {
-	Workers* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	GeeHashSet* _tmp2_ = NULL;
-	GeeHashSet* _tmp3_ = NULL;
-	GeeHashSet* _tmp4_ = NULL;
+	Workers* _tmp0_;
+	GeeHashMap* _tmp1_;
+	GeeHashSet* _tmp2_;
+	GeeHashSet* _tmp3_;
+	GeeHashSet* _tmp4_;
 #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->priv = METADATA_WRITER_GET_PRIVATE (self);
 #line 164 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4975,48 +4980,48 @@ static void metadata_writer_instance_init (MetadataWriter * self) {
 	_tmp4_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 175 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->priv->importing_photos = _tmp4_;
-#line 4979 "MetadataWriter.c"
+#line 4984 "MetadataWriter.c"
 }
 
 
-static void metadata_writer_finalize (GObject* obj) {
+static void metadata_writer_finalize (GObject * obj) {
 	MetadataWriter * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	LibraryPhotoSourceCollection* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
-	LibraryPhotoSourceCollection* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	LibraryPhotoSourceCollection* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
-	LibraryPhotoSourceCollection* _tmp9_ = NULL;
-	guint _tmp10_ = 0U;
-	LibraryPhotoSourceCollection* _tmp11_ = NULL;
-	guint _tmp12_ = 0U;
-	LibraryPhotoSourceCollection* _tmp13_ = NULL;
-	guint _tmp14_ = 0U;
-	LibraryPhotoSourceCollection* _tmp15_ = NULL;
-	guint _tmp16_ = 0U;
-	TagSourceCollection* _tmp17_ = NULL;
-	guint _tmp18_ = 0U;
-	TagSourceCollection* _tmp19_ = NULL;
-	guint _tmp20_ = 0U;
-	TagSourceCollection* _tmp21_ = NULL;
-	guint _tmp22_ = 0U;
-	TagSourceCollection* _tmp23_ = NULL;
-	guint _tmp24_ = 0U;
-	TagSourceCollection* _tmp25_ = NULL;
-	guint _tmp26_ = 0U;
-	Application* _tmp27_ = NULL;
-	Application* _tmp28_ = NULL;
-	guint _tmp29_ = 0U;
-	LibraryMonitorPool* _tmp30_ = NULL;
-	LibraryMonitorPool* _tmp31_ = NULL;
-	guint _tmp32_ = 0U;
-	LibraryMonitorPool* _tmp33_ = NULL;
-	LibraryMonitorPool* _tmp34_ = NULL;
-	guint _tmp35_ = 0U;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	guint _tmp2_;
+	LibraryPhotoSourceCollection* _tmp3_;
+	guint _tmp4_;
+	LibraryPhotoSourceCollection* _tmp5_;
+	guint _tmp6_;
+	LibraryPhotoSourceCollection* _tmp7_;
+	guint _tmp8_;
+	LibraryPhotoSourceCollection* _tmp9_;
+	guint _tmp10_;
+	LibraryPhotoSourceCollection* _tmp11_;
+	guint _tmp12_;
+	LibraryPhotoSourceCollection* _tmp13_;
+	guint _tmp14_;
+	LibraryPhotoSourceCollection* _tmp15_;
+	guint _tmp16_;
+	TagSourceCollection* _tmp17_;
+	guint _tmp18_;
+	TagSourceCollection* _tmp19_;
+	guint _tmp20_;
+	TagSourceCollection* _tmp21_;
+	guint _tmp22_;
+	TagSourceCollection* _tmp23_;
+	guint _tmp24_;
+	TagSourceCollection* _tmp25_;
+	guint _tmp26_;
+	Application* _tmp27_;
+	Application* _tmp28_;
+	guint _tmp29_;
+	LibraryMonitorPool* _tmp30_;
+	LibraryMonitorPool* _tmp31_;
+	guint _tmp32_;
+	LibraryMonitorPool* _tmp33_;
+	LibraryMonitorPool* _tmp34_;
+	guint _tmp35_;
 #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_METADATA_WRITER, MetadataWriter);
 #line 220 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -5147,7 +5152,7 @@ static void metadata_writer_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->importing_photos);
 #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	G_OBJECT_CLASS (metadata_writer_parent_class)->finalize (obj);
-#line 5151 "MetadataWriter.c"
+#line 5156 "MetadataWriter.c"
 }
 
 
diff --git a/src/NaturalCollate.c b/src/NaturalCollate.c
index 97255d0..cc78916 100644
--- a/src/NaturalCollate.c
+++ b/src/NaturalCollate.c
@@ -1,4 +1,4 @@
-/* NaturalCollate.c generated by valac 0.34.7, the Vala compiler
+/* NaturalCollate.c generated by valac 0.36.6, the Vala compiler
  * generated from NaturalCollate.vala, do not modify */
 
 
@@ -25,17 +25,17 @@ gchar* natural_collate_collate_key (gchar* str);
 
 static gunichar string_get_char (const gchar* self, glong index) {
 	gunichar result = 0U;
-	glong _tmp0_ = 0L;
-	gunichar _tmp1_ = 0U;
-#line 1116 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gunichar _tmp1_;
+#line 1140 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0U);
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 41 "NaturalCollate.c"
 }
@@ -43,17 +43,17 @@ static gunichar string_get_char (const gchar* self, glong index) {
 
 static gint string_index_of_nth_char (const gchar* self, glong c) {
 	gint result = 0;
-	glong _tmp0_ = 0L;
-	gchar* _tmp1_ = NULL;
-#line 1136 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gchar* _tmp1_;
+#line 1160 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1161 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = c;
-#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1161 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = g_utf8_offset_to_pointer (self, _tmp0_);
-#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1161 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = (gint) (_tmp1_ - ((gchar*) self));
-#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1161 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 59 "NaturalCollate.c"
 }
@@ -62,41 +62,41 @@ static gint string_index_of_nth_char (const gchar* self, glong c) {
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 82 "NaturalCollate.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 90 "NaturalCollate.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 102 "NaturalCollate.c"
 	}
@@ -107,121 +107,121 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 126 "NaturalCollate.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 132 "NaturalCollate.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 136 "NaturalCollate.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 140 "NaturalCollate.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 152 "NaturalCollate.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 162 "NaturalCollate.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 168 "NaturalCollate.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 182 "NaturalCollate.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 192 "NaturalCollate.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 198 "NaturalCollate.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 207 "NaturalCollate.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 227 "NaturalCollate.c"
 }
@@ -238,22 +238,22 @@ gint natural_collate_read_number (gchar* s, gint* byte_index) {
 	while (TRUE) {
 #line 240 "NaturalCollate.c"
 		gboolean _tmp0_ = FALSE;
-		const gchar* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
-		const gchar* _tmp9_ = NULL;
-		gunichar _tmp10_ = 0U;
-		gint _tmp11_ = 0;
+		const gchar* _tmp1_;
+		gint _tmp2_;
+		gint _tmp3_;
+		gint _tmp7_;
+		gint _tmp8_;
+		const gchar* _tmp9_;
+		gunichar _tmp10_;
+		gint _tmp11_;
 		gint second_char = 0;
-		const gchar* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
-		const gchar* _tmp14_ = NULL;
-		gint _tmp15_ = 0;
-		gchar* _tmp16_ = NULL;
-		gint _tmp17_ = 0;
-		gint _tmp18_ = 0;
+		const gchar* _tmp12_;
+		gint _tmp13_;
+		const gchar* _tmp14_;
+		gint _tmp15_;
+		gchar* _tmp16_;
+		gint _tmp17_;
+		gint _tmp18_;
 #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 		_tmp1_ = s;
 #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
@@ -263,9 +263,9 @@ gint natural_collate_read_number (gchar* s, gint* byte_index) {
 #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 		if (_tmp3_ != 0) {
 #line 266 "NaturalCollate.c"
-			const gchar* _tmp4_ = NULL;
-			gunichar _tmp5_ = 0U;
-			gboolean _tmp6_ = FALSE;
+			const gchar* _tmp4_;
+			gunichar _tmp5_;
+			gboolean _tmp6_;
 #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 			_tmp4_ = s;
 #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
@@ -336,17 +336,17 @@ gint natural_collate_read_number (gchar* s, gint* byte_index) {
 
 gint natural_collate_compare (const gchar* str1, const gchar* str2) {
 	gint result = 0;
-	GCompareFunc _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
+	GCompareFunc _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
 #line 43 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 	g_return_val_if_fail (str1 != NULL, 0);
 #line 43 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
@@ -387,19 +387,19 @@ gint natural_collate_compare (const gchar* str1, const gchar* str2) {
 
 static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 405 "NaturalCollate.c"
 }
@@ -408,19 +408,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 static gchar* g_unichar_to_string (gunichar self) {
 	gchar* result = NULL;
 	gchar* str = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 941 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 949 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 7);
-#line 941 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 949 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	str = (gchar*) _tmp0_;
-#line 942 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 950 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = str;
-#line 942 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 950 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_unichar_to_utf8 (self, _tmp1_);
-#line 943 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 951 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = str;
-#line 943 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 951 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 426 "NaturalCollate.c"
 }
@@ -428,18 +428,18 @@ static gchar* g_unichar_to_string (gunichar self) {
 
 gchar* natural_collate_collate_key (gchar* str) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 	gchar* _result_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar* _tmp2_;
 	gboolean eos = FALSE;
-	const gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	const gchar* _tmp70_ = NULL;
-	gchar* _tmp71_ = NULL;
-	gchar* _tmp72_ = NULL;
-	gchar* _tmp73_ = NULL;
+	const gchar* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	const gchar* _tmp70_;
+	gchar* _tmp71_;
+	gchar* _tmp72_;
+	gchar* _tmp73_;
 #line 47 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 	g_return_val_if_fail (str != NULL, NULL);
 #line 53 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
@@ -463,28 +463,28 @@ gchar* natural_collate_collate_key (gchar* str) {
 #line 57 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 	while (TRUE) {
 #line 466 "NaturalCollate.c"
-		gboolean _tmp6_ = FALSE;
-		const gchar* _tmp7_ = NULL;
-		gboolean _tmp8_ = FALSE;
+		gboolean _tmp6_;
+		const gchar* _tmp7_;
+		gboolean _tmp8_;
 		gint position = 0;
-		const gchar* _tmp17_ = NULL;
-		const gchar* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
-		gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-		gint _tmp26_ = 0;
-		gchar* _tmp27_ = NULL;
-		const gchar* _tmp28_ = NULL;
-		gint _tmp29_ = 0;
-		gint _tmp30_ = 0;
-		gboolean _tmp31_ = FALSE;
-		const gchar* _tmp67_ = NULL;
-		gint _tmp68_ = 0;
-		gint _tmp69_ = 0;
+		const gchar* _tmp17_;
+		const gchar* _tmp18_;
+		gint _tmp19_;
+		gchar* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
+		gchar* _tmp23_;
+		gchar* _tmp24_;
+		const gchar* _tmp25_;
+		gint _tmp26_;
+		gchar* _tmp27_;
+		const gchar* _tmp28_;
+		gint _tmp29_;
+		gint _tmp30_;
+		gboolean _tmp31_;
+		const gchar* _tmp67_;
+		gint _tmp68_;
+		gint _tmp69_;
 #line 57 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 		_tmp6_ = eos;
 #line 57 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
@@ -504,14 +504,14 @@ gchar* natural_collate_collate_key (gchar* str) {
 #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 		while (TRUE) {
 #line 507 "NaturalCollate.c"
-			const gchar* _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			gunichar _tmp11_ = 0U;
-			gchar* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
-			gboolean _tmp15_ = FALSE;
-			gint _tmp16_ = 0;
+			const gchar* _tmp9_;
+			gint _tmp10_;
+			gunichar _tmp11_;
+			gchar* _tmp12_;
+			gchar* _tmp13_;
+			gboolean _tmp14_;
+			gboolean _tmp15_;
+			gint _tmp16_;
 #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 			_tmp9_ = str;
 #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
@@ -590,35 +590,35 @@ gchar* natural_collate_collate_key (gchar* str) {
 		if (!_tmp31_) {
 #line 592 "NaturalCollate.c"
 			gint number = 0;
-			const gchar* _tmp32_ = NULL;
-			gchar* _tmp33_ = NULL;
-			gint _tmp34_ = 0;
-			const gchar* _tmp35_ = NULL;
-			gint _tmp36_ = 0;
-			gchar* _tmp37_ = NULL;
+			const gchar* _tmp32_;
+			gchar* _tmp33_;
+			gint _tmp34_;
+			const gchar* _tmp35_;
+			gint _tmp36_;
+			gchar* _tmp37_;
 			gint number_of_superdigits = 0;
-			gint _tmp38_ = 0;
-			gchar* _tmp39_ = NULL;
-			gchar* _tmp40_ = NULL;
-			gint _tmp41_ = 0;
-			gint _tmp42_ = 0;
-			gint _tmp43_ = 0;
+			gint _tmp38_;
+			gchar* _tmp39_;
+			gchar* _tmp40_;
+			gint _tmp41_;
+			gint _tmp42_;
+			gint _tmp43_;
 			gchar* to_append = NULL;
-			gchar* _tmp44_ = NULL;
-			const gchar* _tmp53_ = NULL;
-			gint _tmp54_ = 0;
-			gchar* _tmp55_ = NULL;
-			gchar* _tmp56_ = NULL;
-			gchar* _tmp57_ = NULL;
-			const gchar* _tmp58_ = NULL;
-			gchar* _tmp59_ = NULL;
-			gchar* _tmp60_ = NULL;
-			gchar* _tmp61_ = NULL;
-			gchar* _tmp62_ = NULL;
-			gchar* _tmp63_ = NULL;
-			gchar* _tmp64_ = NULL;
-			const gchar* _tmp65_ = NULL;
-			gchar* _tmp66_ = NULL;
+			gchar* _tmp44_;
+			const gchar* _tmp53_;
+			gint _tmp54_;
+			gchar* _tmp55_;
+			gchar* _tmp56_;
+			gchar* _tmp57_;
+			const gchar* _tmp58_;
+			gchar* _tmp59_;
+			gchar* _tmp60_;
+			gchar* _tmp61_;
+			gchar* _tmp62_;
+			gchar* _tmp63_;
+			gchar* _tmp64_;
+			const gchar* _tmp65_;
+			gchar* _tmp66_;
 #line 76 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 			_tmp32_ = str;
 #line 76 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
@@ -670,16 +670,16 @@ gchar* natural_collate_collate_key (gchar* str) {
 #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 					while (TRUE) {
 #line 673 "NaturalCollate.c"
-						gint _tmp47_ = 0;
-						gint _tmp48_ = 0;
-						const gchar* _tmp49_ = NULL;
-						gchar* _tmp50_ = NULL;
-						gchar* _tmp51_ = NULL;
-						gchar* _tmp52_ = NULL;
+						gint _tmp47_;
+						gint _tmp48_;
+						const gchar* _tmp49_;
+						gchar* _tmp50_;
+						gchar* _tmp51_;
+						gchar* _tmp52_;
 #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 						if (!_tmp45_) {
 #line 682 "NaturalCollate.c"
-							gint _tmp46_ = 0;
+							gint _tmp46_;
 #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 							_tmp46_ = i;
 #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
diff --git a/src/Orientation.c b/src/Orientation.c
index eb6a450..87ca64c 100644
--- a/src/Orientation.c
+++ b/src/Orientation.c
@@ -1,4 +1,4 @@
-/* Orientation.c generated by valac 0.34.7, the Vala compiler
+/* Orientation.c generated by valac 0.36.6, the Vala compiler
  * generated from Orientation.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -102,7 +102,7 @@ gchar* orientation_to_string (Orientation self) {
 		case ORIENTATION_TOP_LEFT:
 #line 104 "Orientation.c"
 		{
-			gchar* _tmp0_ = NULL;
+			gchar* _tmp0_;
 #line 22 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp0_ = g_strdup ("top-left");
 #line 22 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -115,7 +115,7 @@ gchar* orientation_to_string (Orientation self) {
 		case ORIENTATION_TOP_RIGHT:
 #line 117 "Orientation.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp1_ = g_strdup ("top-right");
 #line 25 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -128,7 +128,7 @@ gchar* orientation_to_string (Orientation self) {
 		case ORIENTATION_BOTTOM_RIGHT:
 #line 130 "Orientation.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 28 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp2_ = g_strdup ("bottom-right");
 #line 28 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -141,7 +141,7 @@ gchar* orientation_to_string (Orientation self) {
 		case ORIENTATION_BOTTOM_LEFT:
 #line 143 "Orientation.c"
 		{
-			gchar* _tmp3_ = NULL;
+			gchar* _tmp3_;
 #line 31 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp3_ = g_strdup ("bottom-left");
 #line 31 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -154,7 +154,7 @@ gchar* orientation_to_string (Orientation self) {
 		case ORIENTATION_LEFT_TOP:
 #line 156 "Orientation.c"
 		{
-			gchar* _tmp4_ = NULL;
+			gchar* _tmp4_;
 #line 34 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp4_ = g_strdup ("left-top");
 #line 34 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -167,7 +167,7 @@ gchar* orientation_to_string (Orientation self) {
 		case ORIENTATION_RIGHT_TOP:
 #line 169 "Orientation.c"
 		{
-			gchar* _tmp5_ = NULL;
+			gchar* _tmp5_;
 #line 37 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp5_ = g_strdup ("right-top");
 #line 37 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -180,7 +180,7 @@ gchar* orientation_to_string (Orientation self) {
 		case ORIENTATION_RIGHT_BOTTOM:
 #line 182 "Orientation.c"
 		{
-			gchar* _tmp6_ = NULL;
+			gchar* _tmp6_;
 #line 40 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp6_ = g_strdup ("right-bottom");
 #line 40 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -193,7 +193,7 @@ gchar* orientation_to_string (Orientation self) {
 		case ORIENTATION_LEFT_BOTTOM:
 #line 195 "Orientation.c"
 		{
-			gchar* _tmp7_ = NULL;
+			gchar* _tmp7_;
 #line 43 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp7_ = g_strdup ("left-bottom");
 #line 43 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -204,7 +204,7 @@ gchar* orientation_to_string (Orientation self) {
 		}
 		default:
 		{
-			gchar* _tmp8_ = NULL;
+			gchar* _tmp8_;
 #line 46 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp8_ = g_strdup_printf ("unknown orientation %d", (gint) self);
 #line 46 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -595,7 +595,7 @@ Orientation orientation_flip_left_to_right (Orientation self) {
 
 Orientation orientation_perform (Orientation self, Rotation rotation) {
 	Orientation result = 0;
-	Rotation _tmp0_ = 0;
+	Rotation _tmp0_;
 #line 175 "/home/jens/Source/shotwell/src/Orientation.vala"
 	_tmp0_ = rotation;
 #line 175 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -604,7 +604,7 @@ Orientation orientation_perform (Orientation self, Rotation rotation) {
 		case ROTATION_CLOCKWISE:
 #line 606 "Orientation.c"
 		{
-			Orientation _tmp1_ = 0;
+			Orientation _tmp1_;
 #line 177 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp1_ = orientation_rotate_clockwise (self);
 #line 177 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -617,7 +617,7 @@ Orientation orientation_perform (Orientation self, Rotation rotation) {
 		case ROTATION_COUNTERCLOCKWISE:
 #line 619 "Orientation.c"
 		{
-			Orientation _tmp2_ = 0;
+			Orientation _tmp2_;
 #line 180 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp2_ = orientation_rotate_counterclockwise (self);
 #line 180 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -630,7 +630,7 @@ Orientation orientation_perform (Orientation self, Rotation rotation) {
 		case ROTATION_MIRROR:
 #line 632 "Orientation.c"
 		{
-			Orientation _tmp3_ = 0;
+			Orientation _tmp3_;
 #line 183 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp3_ = orientation_flip_left_to_right (self);
 #line 183 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -643,7 +643,7 @@ Orientation orientation_perform (Orientation self, Rotation rotation) {
 		case ROTATION_UPSIDE_DOWN:
 #line 645 "Orientation.c"
 		{
-			Orientation _tmp4_ = 0;
+			Orientation _tmp4_;
 #line 186 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp4_ = orientation_flip_top_to_bottom (self);
 #line 186 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -654,7 +654,7 @@ Orientation orientation_perform (Orientation self, Rotation rotation) {
 		}
 		default:
 		{
-			Rotation _tmp5_ = 0;
+			Rotation _tmp5_;
 #line 189 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp5_ = rotation;
 #line 189 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -673,9 +673,9 @@ Rotation* orientation_to_rotations (Orientation self, int* result_length1) {
 		case ORIENTATION_TOP_LEFT:
 #line 675 "Orientation.c"
 		{
-			Rotation* _tmp0_ = NULL;
-			Rotation* _tmp1_ = NULL;
-			gint _tmp1__length1 = 0;
+			Rotation* _tmp0_;
+			Rotation* _tmp1_;
+			gint _tmp1__length1;
 #line 197 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp0_ = g_new0 (Rotation, 0);
 #line 197 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -698,9 +698,9 @@ Rotation* orientation_to_rotations (Orientation self, int* result_length1) {
 		case ORIENTATION_TOP_RIGHT:
 #line 700 "Orientation.c"
 		{
-			Rotation* _tmp2_ = NULL;
-			Rotation* _tmp3_ = NULL;
-			gint _tmp3__length1 = 0;
+			Rotation* _tmp2_;
+			Rotation* _tmp3_;
+			gint _tmp3__length1;
 #line 200 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp2_ = g_new0 (Rotation, 1);
 #line 200 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -725,9 +725,9 @@ Rotation* orientation_to_rotations (Orientation self, int* result_length1) {
 		case ORIENTATION_BOTTOM_RIGHT:
 #line 727 "Orientation.c"
 		{
-			Rotation* _tmp4_ = NULL;
-			Rotation* _tmp5_ = NULL;
-			gint _tmp5__length1 = 0;
+			Rotation* _tmp4_;
+			Rotation* _tmp5_;
+			gint _tmp5__length1;
 #line 203 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp4_ = g_new0 (Rotation, 1);
 #line 203 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -752,9 +752,9 @@ Rotation* orientation_to_rotations (Orientation self, int* result_length1) {
 		case ORIENTATION_BOTTOM_LEFT:
 #line 754 "Orientation.c"
 		{
-			Rotation* _tmp6_ = NULL;
-			Rotation* _tmp7_ = NULL;
-			gint _tmp7__length1 = 0;
+			Rotation* _tmp6_;
+			Rotation* _tmp7_;
+			gint _tmp7__length1;
 #line 207 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp6_ = g_new0 (Rotation, 2);
 #line 207 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -781,9 +781,9 @@ Rotation* orientation_to_rotations (Orientation self, int* result_length1) {
 		case ORIENTATION_LEFT_TOP:
 #line 783 "Orientation.c"
 		{
-			Rotation* _tmp8_ = NULL;
-			Rotation* _tmp9_ = NULL;
-			gint _tmp9__length1 = 0;
+			Rotation* _tmp8_;
+			Rotation* _tmp9_;
+			gint _tmp9__length1;
 #line 210 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp8_ = g_new0 (Rotation, 2);
 #line 210 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -810,9 +810,9 @@ Rotation* orientation_to_rotations (Orientation self, int* result_length1) {
 		case ORIENTATION_RIGHT_TOP:
 #line 812 "Orientation.c"
 		{
-			Rotation* _tmp10_ = NULL;
-			Rotation* _tmp11_ = NULL;
-			gint _tmp11__length1 = 0;
+			Rotation* _tmp10_;
+			Rotation* _tmp11_;
+			gint _tmp11__length1;
 #line 213 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp10_ = g_new0 (Rotation, 1);
 #line 213 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -837,9 +837,9 @@ Rotation* orientation_to_rotations (Orientation self, int* result_length1) {
 		case ORIENTATION_RIGHT_BOTTOM:
 #line 839 "Orientation.c"
 		{
-			Rotation* _tmp12_ = NULL;
-			Rotation* _tmp13_ = NULL;
-			gint _tmp13__length1 = 0;
+			Rotation* _tmp12_;
+			Rotation* _tmp13_;
+			gint _tmp13__length1;
 #line 216 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp12_ = g_new0 (Rotation, 2);
 #line 216 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -866,9 +866,9 @@ Rotation* orientation_to_rotations (Orientation self, int* result_length1) {
 		case ORIENTATION_LEFT_BOTTOM:
 #line 868 "Orientation.c"
 		{
-			Rotation* _tmp14_ = NULL;
-			Rotation* _tmp15_ = NULL;
-			gint _tmp15__length1 = 0;
+			Rotation* _tmp14_;
+			Rotation* _tmp15_;
+			gint _tmp15__length1;
 #line 219 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp14_ = g_new0 (Rotation, 1);
 #line 219 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -914,7 +914,7 @@ void orientation_rotate_dimensions (Orientation self, Dimensions* dim, Dimension
 		case ORIENTATION_BOTTOM_LEFT:
 #line 916 "Orientation.c"
 		{
-			Dimensions _tmp0_ = {0};
+			Dimensions _tmp0_;
 #line 233 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp0_ = *dim;
 #line 233 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -933,10 +933,10 @@ void orientation_rotate_dimensions (Orientation self, Dimensions* dim, Dimension
 		case ORIENTATION_LEFT_BOTTOM:
 #line 935 "Orientation.c"
 		{
-			Dimensions _tmp1_ = {0};
-			gint _tmp2_ = 0;
-			Dimensions _tmp3_ = {0};
-			gint _tmp4_ = 0;
+			Dimensions _tmp1_;
+			gint _tmp2_;
+			Dimensions _tmp3_;
+			gint _tmp4_;
 			Dimensions _tmp5_ = {0};
 #line 240 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp1_ = *dim;
@@ -965,7 +965,7 @@ void orientation_rotate_dimensions (Orientation self, Dimensions* dim, Dimension
 
 
 void orientation_derotate_dimensions (Orientation self, Dimensions* dim, Dimensions* result) {
-	Dimensions _tmp0_ = {0};
+	Dimensions _tmp0_;
 	Dimensions _tmp1_ = {0};
 #line 247 "/home/jens/Source/shotwell/src/Orientation.vala"
 	g_return_if_fail (dim != NULL);
@@ -999,8 +999,8 @@ GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf) {
 		case ORIENTATION_TOP_LEFT:
 #line 1001 "Orientation.c"
 		{
-			GdkPixbuf* _tmp0_ = NULL;
-			GdkPixbuf* _tmp1_ = NULL;
+			GdkPixbuf* _tmp0_;
+			GdkPixbuf* _tmp1_;
 #line 256 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp0_ = pixbuf;
 #line 256 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1017,8 +1017,8 @@ GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf) {
 		case ORIENTATION_TOP_RIGHT:
 #line 1019 "Orientation.c"
 		{
-			GdkPixbuf* _tmp2_ = NULL;
-			GdkPixbuf* _tmp3_ = NULL;
+			GdkPixbuf* _tmp2_;
+			GdkPixbuf* _tmp3_;
 #line 261 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp2_ = pixbuf;
 #line 261 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1035,8 +1035,8 @@ GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf) {
 		case ORIENTATION_BOTTOM_RIGHT:
 #line 1037 "Orientation.c"
 		{
-			GdkPixbuf* _tmp4_ = NULL;
-			GdkPixbuf* _tmp5_ = NULL;
+			GdkPixbuf* _tmp4_;
+			GdkPixbuf* _tmp5_;
 #line 265 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp4_ = pixbuf;
 #line 265 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1053,8 +1053,8 @@ GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf) {
 		case ORIENTATION_BOTTOM_LEFT:
 #line 1055 "Orientation.c"
 		{
-			GdkPixbuf* _tmp6_ = NULL;
-			GdkPixbuf* _tmp7_ = NULL;
+			GdkPixbuf* _tmp6_;
+			GdkPixbuf* _tmp7_;
 #line 270 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp6_ = pixbuf;
 #line 270 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1071,10 +1071,10 @@ GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf) {
 		case ORIENTATION_LEFT_TOP:
 #line 1073 "Orientation.c"
 		{
-			GdkPixbuf* _tmp8_ = NULL;
-			GdkPixbuf* _tmp9_ = NULL;
-			GdkPixbuf* _tmp10_ = NULL;
-			GdkPixbuf* _tmp11_ = NULL;
+			GdkPixbuf* _tmp8_;
+			GdkPixbuf* _tmp9_;
+			GdkPixbuf* _tmp10_;
+			GdkPixbuf* _tmp11_;
 #line 274 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp8_ = pixbuf;
 #line 274 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1097,8 +1097,8 @@ GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf) {
 		case ORIENTATION_RIGHT_TOP:
 #line 1099 "Orientation.c"
 		{
-			GdkPixbuf* _tmp12_ = NULL;
-			GdkPixbuf* _tmp13_ = NULL;
+			GdkPixbuf* _tmp12_;
+			GdkPixbuf* _tmp13_;
 #line 278 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp12_ = pixbuf;
 #line 278 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1115,10 +1115,10 @@ GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf) {
 		case ORIENTATION_RIGHT_BOTTOM:
 #line 1117 "Orientation.c"
 		{
-			GdkPixbuf* _tmp14_ = NULL;
-			GdkPixbuf* _tmp15_ = NULL;
-			GdkPixbuf* _tmp16_ = NULL;
-			GdkPixbuf* _tmp17_ = NULL;
+			GdkPixbuf* _tmp14_;
+			GdkPixbuf* _tmp15_;
+			GdkPixbuf* _tmp16_;
+			GdkPixbuf* _tmp17_;
 #line 282 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp14_ = pixbuf;
 #line 282 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1141,8 +1141,8 @@ GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf) {
 		case ORIENTATION_LEFT_BOTTOM:
 #line 1143 "Orientation.c"
 		{
-			GdkPixbuf* _tmp18_ = NULL;
-			GdkPixbuf* _tmp19_ = NULL;
+			GdkPixbuf* _tmp18_;
+			GdkPixbuf* _tmp19_;
 #line 286 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp18_ = pixbuf;
 #line 286 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1171,19 +1171,19 @@ GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf) {
 
 
 void orientation_rotate_point (Orientation self, Dimensions* space, GdkPoint* point, GdkPoint* result) {
-	gboolean _tmp0_ = FALSE;
-	GdkPoint _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	GdkPoint _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	Dimensions _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	GdkPoint _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	GdkPoint _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	Dimensions _tmp11_ = {0};
-	gint _tmp12_ = 0;
+	gboolean _tmp0_;
+	GdkPoint _tmp1_;
+	gint _tmp2_;
+	GdkPoint _tmp3_;
+	gint _tmp4_;
+	Dimensions _tmp5_;
+	gint _tmp6_;
+	GdkPoint _tmp7_;
+	gint _tmp8_;
+	GdkPoint _tmp9_;
+	gint _tmp10_;
+	Dimensions _tmp11_;
+	gint _tmp12_;
 	GdkPoint rotated = {0};
 #line 297 "/home/jens/Source/shotwell/src/Orientation.vala"
 	g_return_if_fail (space != NULL);
@@ -1233,7 +1233,7 @@ void orientation_rotate_point (Orientation self, Dimensions* space, GdkPoint* po
 		case ORIENTATION_TOP_LEFT:
 #line 1235 "Orientation.c"
 		{
-			GdkPoint _tmp13_ = {0};
+			GdkPoint _tmp13_;
 #line 309 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp13_ = *point;
 #line 309 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1246,12 +1246,12 @@ void orientation_rotate_point (Orientation self, Dimensions* space, GdkPoint* po
 		case ORIENTATION_TOP_RIGHT:
 #line 1248 "Orientation.c"
 		{
-			Dimensions _tmp14_ = {0};
-			gint _tmp15_ = 0;
-			GdkPoint _tmp16_ = {0};
-			gint _tmp17_ = 0;
-			GdkPoint _tmp18_ = {0};
-			gint _tmp19_ = 0;
+			Dimensions _tmp14_;
+			gint _tmp15_;
+			GdkPoint _tmp16_;
+			gint _tmp17_;
+			GdkPoint _tmp18_;
+			gint _tmp19_;
 #line 314 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp14_ = *space;
 #line 314 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1276,14 +1276,14 @@ void orientation_rotate_point (Orientation self, Dimensions* space, GdkPoint* po
 		case ORIENTATION_BOTTOM_RIGHT:
 #line 1278 "Orientation.c"
 		{
-			Dimensions _tmp20_ = {0};
-			gint _tmp21_ = 0;
-			GdkPoint _tmp22_ = {0};
-			gint _tmp23_ = 0;
-			Dimensions _tmp24_ = {0};
-			gint _tmp25_ = 0;
-			GdkPoint _tmp26_ = {0};
-			gint _tmp27_ = 0;
+			Dimensions _tmp20_;
+			gint _tmp21_;
+			GdkPoint _tmp22_;
+			gint _tmp23_;
+			Dimensions _tmp24_;
+			gint _tmp25_;
+			GdkPoint _tmp26_;
+			gint _tmp27_;
 #line 320 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp20_ = *space;
 #line 320 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1312,12 +1312,12 @@ void orientation_rotate_point (Orientation self, Dimensions* space, GdkPoint* po
 		case ORIENTATION_BOTTOM_LEFT:
 #line 1314 "Orientation.c"
 		{
-			GdkPoint _tmp28_ = {0};
-			gint _tmp29_ = 0;
-			Dimensions _tmp30_ = {0};
-			gint _tmp31_ = 0;
-			GdkPoint _tmp32_ = {0};
-			gint _tmp33_ = 0;
+			GdkPoint _tmp28_;
+			gint _tmp29_;
+			Dimensions _tmp30_;
+			gint _tmp31_;
+			GdkPoint _tmp32_;
+			gint _tmp33_;
 #line 326 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp28_ = *point;
 #line 326 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1342,10 +1342,10 @@ void orientation_rotate_point (Orientation self, Dimensions* space, GdkPoint* po
 		case ORIENTATION_LEFT_TOP:
 #line 1344 "Orientation.c"
 		{
-			GdkPoint _tmp34_ = {0};
-			gint _tmp35_ = 0;
-			GdkPoint _tmp36_ = {0};
-			gint _tmp37_ = 0;
+			GdkPoint _tmp34_;
+			gint _tmp35_;
+			GdkPoint _tmp36_;
+			gint _tmp37_;
 #line 332 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp34_ = *point;
 #line 332 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1366,12 +1366,12 @@ void orientation_rotate_point (Orientation self, Dimensions* space, GdkPoint* po
 		case ORIENTATION_RIGHT_TOP:
 #line 1368 "Orientation.c"
 		{
-			Dimensions _tmp38_ = {0};
-			gint _tmp39_ = 0;
-			GdkPoint _tmp40_ = {0};
-			gint _tmp41_ = 0;
-			GdkPoint _tmp42_ = {0};
-			gint _tmp43_ = 0;
+			Dimensions _tmp38_;
+			gint _tmp39_;
+			GdkPoint _tmp40_;
+			gint _tmp41_;
+			GdkPoint _tmp42_;
+			gint _tmp43_;
 #line 338 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp38_ = *space;
 #line 338 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1396,14 +1396,14 @@ void orientation_rotate_point (Orientation self, Dimensions* space, GdkPoint* po
 		case ORIENTATION_RIGHT_BOTTOM:
 #line 1398 "Orientation.c"
 		{
-			Dimensions _tmp44_ = {0};
-			gint _tmp45_ = 0;
-			GdkPoint _tmp46_ = {0};
-			gint _tmp47_ = 0;
-			Dimensions _tmp48_ = {0};
-			gint _tmp49_ = 0;
-			GdkPoint _tmp50_ = {0};
-			gint _tmp51_ = 0;
+			Dimensions _tmp44_;
+			gint _tmp45_;
+			GdkPoint _tmp46_;
+			gint _tmp47_;
+			Dimensions _tmp48_;
+			gint _tmp49_;
+			GdkPoint _tmp50_;
+			gint _tmp51_;
 #line 344 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp44_ = *space;
 #line 344 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1432,12 +1432,12 @@ void orientation_rotate_point (Orientation self, Dimensions* space, GdkPoint* po
 		case ORIENTATION_LEFT_BOTTOM:
 #line 1434 "Orientation.c"
 		{
-			GdkPoint _tmp52_ = {0};
-			gint _tmp53_ = 0;
-			Dimensions _tmp54_ = {0};
-			gint _tmp55_ = 0;
-			GdkPoint _tmp56_ = {0};
-			gint _tmp57_ = 0;
+			GdkPoint _tmp52_;
+			gint _tmp53_;
+			Dimensions _tmp54_;
+			gint _tmp55_;
+			GdkPoint _tmp56_;
+			gint _tmp57_;
 #line 350 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp52_ = *point;
 #line 350 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1474,7 +1474,7 @@ void orientation_rotate_point (Orientation self, Dimensions* space, GdkPoint* po
 
 
 void orientation_derotate_point (Orientation self, Dimensions* space, GdkPoint* point, GdkPoint* result) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	GdkPoint derotated = {0};
 #line 362 "/home/jens/Source/shotwell/src/Orientation.vala"
 	g_return_if_fail (space != NULL);
@@ -1492,7 +1492,7 @@ void orientation_derotate_point (Orientation self, Dimensions* space, GdkPoint*
 		case ORIENTATION_TOP_LEFT:
 #line 1494 "Orientation.c"
 		{
-			GdkPoint _tmp1_ = {0};
+			GdkPoint _tmp1_;
 #line 370 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp1_ = *point;
 #line 370 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1505,12 +1505,12 @@ void orientation_derotate_point (Orientation self, Dimensions* space, GdkPoint*
 		case ORIENTATION_TOP_RIGHT:
 #line 1507 "Orientation.c"
 		{
-			Dimensions _tmp2_ = {0};
-			gint _tmp3_ = 0;
-			GdkPoint _tmp4_ = {0};
-			gint _tmp5_ = 0;
-			GdkPoint _tmp6_ = {0};
-			gint _tmp7_ = 0;
+			Dimensions _tmp2_;
+			gint _tmp3_;
+			GdkPoint _tmp4_;
+			gint _tmp5_;
+			GdkPoint _tmp6_;
+			gint _tmp7_;
 #line 375 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp2_ = *space;
 #line 375 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1535,14 +1535,14 @@ void orientation_derotate_point (Orientation self, Dimensions* space, GdkPoint*
 		case ORIENTATION_BOTTOM_RIGHT:
 #line 1537 "Orientation.c"
 		{
-			Dimensions _tmp8_ = {0};
-			gint _tmp9_ = 0;
-			GdkPoint _tmp10_ = {0};
-			gint _tmp11_ = 0;
-			Dimensions _tmp12_ = {0};
-			gint _tmp13_ = 0;
-			GdkPoint _tmp14_ = {0};
-			gint _tmp15_ = 0;
+			Dimensions _tmp8_;
+			gint _tmp9_;
+			GdkPoint _tmp10_;
+			gint _tmp11_;
+			Dimensions _tmp12_;
+			gint _tmp13_;
+			GdkPoint _tmp14_;
+			gint _tmp15_;
 #line 381 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp8_ = *space;
 #line 381 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1571,12 +1571,12 @@ void orientation_derotate_point (Orientation self, Dimensions* space, GdkPoint*
 		case ORIENTATION_BOTTOM_LEFT:
 #line 1573 "Orientation.c"
 		{
-			GdkPoint _tmp16_ = {0};
-			gint _tmp17_ = 0;
-			Dimensions _tmp18_ = {0};
-			gint _tmp19_ = 0;
-			GdkPoint _tmp20_ = {0};
-			gint _tmp21_ = 0;
+			GdkPoint _tmp16_;
+			gint _tmp17_;
+			Dimensions _tmp18_;
+			gint _tmp19_;
+			GdkPoint _tmp20_;
+			gint _tmp21_;
 #line 387 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp16_ = *point;
 #line 387 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1601,10 +1601,10 @@ void orientation_derotate_point (Orientation self, Dimensions* space, GdkPoint*
 		case ORIENTATION_LEFT_TOP:
 #line 1603 "Orientation.c"
 		{
-			GdkPoint _tmp22_ = {0};
-			gint _tmp23_ = 0;
-			GdkPoint _tmp24_ = {0};
-			gint _tmp25_ = 0;
+			GdkPoint _tmp22_;
+			gint _tmp23_;
+			GdkPoint _tmp24_;
+			gint _tmp25_;
 #line 393 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp22_ = *point;
 #line 393 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1625,12 +1625,12 @@ void orientation_derotate_point (Orientation self, Dimensions* space, GdkPoint*
 		case ORIENTATION_RIGHT_TOP:
 #line 1627 "Orientation.c"
 		{
-			GdkPoint _tmp26_ = {0};
-			gint _tmp27_ = 0;
-			Dimensions _tmp28_ = {0};
-			gint _tmp29_ = 0;
-			GdkPoint _tmp30_ = {0};
-			gint _tmp31_ = 0;
+			GdkPoint _tmp26_;
+			gint _tmp27_;
+			Dimensions _tmp28_;
+			gint _tmp29_;
+			GdkPoint _tmp30_;
+			gint _tmp31_;
 #line 399 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp26_ = *point;
 #line 399 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1655,14 +1655,14 @@ void orientation_derotate_point (Orientation self, Dimensions* space, GdkPoint*
 		case ORIENTATION_RIGHT_BOTTOM:
 #line 1657 "Orientation.c"
 		{
-			Dimensions _tmp32_ = {0};
-			gint _tmp33_ = 0;
-			GdkPoint _tmp34_ = {0};
-			gint _tmp35_ = 0;
-			Dimensions _tmp36_ = {0};
-			gint _tmp37_ = 0;
-			GdkPoint _tmp38_ = {0};
-			gint _tmp39_ = 0;
+			Dimensions _tmp32_;
+			gint _tmp33_;
+			GdkPoint _tmp34_;
+			gint _tmp35_;
+			Dimensions _tmp36_;
+			gint _tmp37_;
+			GdkPoint _tmp38_;
+			gint _tmp39_;
 #line 405 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp32_ = *space;
 #line 405 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1691,12 +1691,12 @@ void orientation_derotate_point (Orientation self, Dimensions* space, GdkPoint*
 		case ORIENTATION_LEFT_BOTTOM:
 #line 1693 "Orientation.c"
 		{
-			Dimensions _tmp40_ = {0};
-			gint _tmp41_ = 0;
-			GdkPoint _tmp42_ = {0};
-			gint _tmp43_ = 0;
-			GdkPoint _tmp44_ = {0};
-			gint _tmp45_ = 0;
+			Dimensions _tmp40_;
+			gint _tmp41_;
+			GdkPoint _tmp42_;
+			gint _tmp43_;
+			GdkPoint _tmp44_;
+			gint _tmp45_;
 #line 411 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp40_ = *space;
 #line 411 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1737,34 +1737,34 @@ void orientation_rotate_box (Orientation self, Dimensions* space, Box* box, Box*
 	GdkPoint bottom_right = {0};
 	GdkPoint _tmp0_ = {0};
 	GdkPoint _tmp1_ = {0};
-	GdkPoint _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	Dimensions _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	GdkPoint _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	Dimensions _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	GdkPoint _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	Dimensions _tmp14_ = {0};
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	GdkPoint _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	Dimensions _tmp19_ = {0};
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	Dimensions _tmp22_ = {0};
-	GdkPoint _tmp23_ = {0};
+	GdkPoint _tmp2_;
+	gint _tmp3_;
+	Dimensions _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	GdkPoint _tmp7_;
+	gint _tmp8_;
+	Dimensions _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	GdkPoint _tmp12_;
+	gint _tmp13_;
+	Dimensions _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	GdkPoint _tmp17_;
+	gint _tmp18_;
+	Dimensions _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
+	Dimensions _tmp22_;
+	GdkPoint _tmp23_;
 	GdkPoint _tmp24_ = {0};
-	Dimensions _tmp25_ = {0};
-	GdkPoint _tmp26_ = {0};
+	Dimensions _tmp25_;
+	GdkPoint _tmp26_;
 	GdkPoint _tmp27_ = {0};
-	GdkPoint _tmp28_ = {0};
-	GdkPoint _tmp29_ = {0};
+	GdkPoint _tmp28_;
+	GdkPoint _tmp29_;
 	Box _tmp30_ = {0};
 #line 423 "/home/jens/Source/shotwell/src/Orientation.vala"
 	g_return_if_fail (space != NULL);
@@ -1859,14 +1859,14 @@ void orientation_derotate_box (Orientation self, Dimensions* space, Box* box, Bo
 	GdkPoint bottom_right = {0};
 	GdkPoint _tmp0_ = {0};
 	GdkPoint _tmp1_ = {0};
-	Dimensions _tmp2_ = {0};
-	GdkPoint _tmp3_ = {0};
+	Dimensions _tmp2_;
+	GdkPoint _tmp3_;
 	GdkPoint _tmp4_ = {0};
-	Dimensions _tmp5_ = {0};
-	GdkPoint _tmp6_ = {0};
+	Dimensions _tmp5_;
+	GdkPoint _tmp6_;
 	GdkPoint _tmp7_ = {0};
-	GdkPoint _tmp8_ = {0};
-	GdkPoint _tmp9_ = {0};
+	GdkPoint _tmp8_;
+	GdkPoint _tmp9_;
 	Box _tmp10_ = {0};
 #line 440 "/home/jens/Source/shotwell/src/Orientation.vala"
 	g_return_if_fail (space != NULL);
@@ -1930,8 +1930,8 @@ GdkPixbuf* rotation_perform (Rotation self, GdkPixbuf* pixbuf) {
 		case ROTATION_CLOCKWISE:
 #line 1932 "Orientation.c"
 		{
-			GdkPixbuf* _tmp0_ = NULL;
-			GdkPixbuf* _tmp1_ = NULL;
+			GdkPixbuf* _tmp0_;
+			GdkPixbuf* _tmp1_;
 #line 460 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp0_ = pixbuf;
 #line 460 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1946,8 +1946,8 @@ GdkPixbuf* rotation_perform (Rotation self, GdkPixbuf* pixbuf) {
 		case ROTATION_COUNTERCLOCKWISE:
 #line 1948 "Orientation.c"
 		{
-			GdkPixbuf* _tmp2_ = NULL;
-			GdkPixbuf* _tmp3_ = NULL;
+			GdkPixbuf* _tmp2_;
+			GdkPixbuf* _tmp3_;
 #line 463 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp2_ = pixbuf;
 #line 463 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1962,8 +1962,8 @@ GdkPixbuf* rotation_perform (Rotation self, GdkPixbuf* pixbuf) {
 		case ROTATION_MIRROR:
 #line 1964 "Orientation.c"
 		{
-			GdkPixbuf* _tmp4_ = NULL;
-			GdkPixbuf* _tmp5_ = NULL;
+			GdkPixbuf* _tmp4_;
+			GdkPixbuf* _tmp5_;
 #line 466 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp4_ = pixbuf;
 #line 466 "/home/jens/Source/shotwell/src/Orientation.vala"
@@ -1978,8 +1978,8 @@ GdkPixbuf* rotation_perform (Rotation self, GdkPixbuf* pixbuf) {
 		case ROTATION_UPSIDE_DOWN:
 #line 1980 "Orientation.c"
 		{
-			GdkPixbuf* _tmp6_ = NULL;
-			GdkPixbuf* _tmp7_ = NULL;
+			GdkPixbuf* _tmp6_;
+			GdkPixbuf* _tmp7_;
 #line 469 "/home/jens/Source/shotwell/src/Orientation.vala"
 			_tmp6_ = pixbuf;
 #line 469 "/home/jens/Source/shotwell/src/Orientation.vala"
diff --git a/src/Page.c b/src/Page.c
index dd27679..c6a223c 100644
--- a/src/Page.c
+++ b/src/Page.c
@@ -1,4 +1,4 @@
-/* Page.c generated by valac 0.34.7, the Vala compiler
+/* Page.c generated by valac 0.36.6, the Vala compiler
  * generated from Page.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -16,9 +16,9 @@
 #include <gio/gio.h>
 #include <gdk/gdk.h>
 #include <cairo.h>
-#include <glib/gi18n-lib.h>
 #include <float.h>
 #include <math.h>
+#include <glib/gi18n-lib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
@@ -903,8 +903,8 @@ void injection_group_add_separator (InjectionGroup* self);
 enum  {
 	INJECTION_GROUP_ELEMENT_DUMMY_PROPERTY
 };
-static void injection_group_element_finalize (InjectionGroupElement* obj);
-static void injection_group_finalize (InjectionGroup* obj);
+static void injection_group_element_finalize (InjectionGroupElement * obj);
+static void injection_group_finalize (InjectionGroup * obj);
 GType page_get_type (void) G_GNUC_CONST;
 GType page_window_get_type (void) G_GNUC_CONST;
 GType fullscreen_window_get_type (void) G_GNUC_CONST;
@@ -1156,7 +1156,7 @@ static void page_real_set_page_cursor (Page* self, GdkCursorType cursor_type);
 static gboolean page_on_hide_cursor (Page* self);
 static gboolean _page_on_hide_cursor_gsource_func (gpointer self);
 void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const gchar* new_label);
-static void page_finalize (GObject* obj);
+static void page_finalize (GObject * obj);
 GType checkerboard_page_get_type (void) G_GNUC_CONST;
 GType thumbnail_view_get_type (void) G_GNUC_CONST;
 GType checkerboard_item_get_type (void) G_GNUC_CONST;
@@ -1306,7 +1306,7 @@ void data_collection_thaw_notifications (DataCollection* self);
 void checkerboard_page_set_display_comments (CheckerboardPage* self, gboolean display);
 static void checkerboard_page_real_set_display_comments (CheckerboardPage* self, gboolean display);
 #define CHECKERBOARD_ITEM_PROP_SHOW_COMMENTS "show-comments"
-static void checkerboard_page_finalize (GObject* obj);
+static void checkerboard_page_finalize (GObject * obj);
 GType single_photo_page_get_type (void) G_GNUC_CONST;
 GType zoom_buffer_get_type (void) G_GNUC_CONST;
 GType single_photo_page_update_reason_get_type (void) G_GNUC_CONST;
@@ -1423,7 +1423,7 @@ static void single_photo_page_real_on_previous_photo (SinglePhotoPage* self);
 void single_photo_page_on_next_photo (SinglePhotoPage* self);
 static void single_photo_page_real_on_next_photo (SinglePhotoPage* self);
 static gboolean single_photo_page_real_key_press_event (GtkWidget* base, GdkEventKey* event);
-static void single_photo_page_finalize (GObject* obj);
+static void single_photo_page_finalize (GObject * obj);
 gpointer drag_and_drop_handler_ref (gpointer instance);
 void drag_and_drop_handler_unref (gpointer instance);
 GParamSpec* param_spec_drag_and_drop_handler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1482,7 +1482,7 @@ ExporterUI* exporter_ui_construct (GType object_type, Exporter* exporter);
 void exporter_ui_export (ExporterUI* self, ExporterCompletionCallback completion_callback, void* completion_callback_target);
 static void drag_and_drop_handler_on_export_completed (DragAndDropHandler* self);
 static void _drag_and_drop_handler_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self);
-static void drag_and_drop_handler_finalize (DragAndDropHandler* obj);
+static void drag_and_drop_handler_finalize (DragAndDropHandler * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -1490,8 +1490,8 @@ static const GtkTargetEntry DRAG_AND_DROP_HANDLER_SOURCE_TARGET_ENTRIES[2] = {{"
 
 InjectionGroup* injection_group_construct (GType object_type, const gchar* path) {
 	InjectionGroup* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 31 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (path != NULL, NULL);
 #line 31 "/home/jens/Source/shotwell/src/Page.vala"
@@ -1519,8 +1519,8 @@ InjectionGroup* injection_group_new (const gchar* path) {
 
 gchar* injection_group_get_path (InjectionGroup* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 35 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_INJECTION_GROUP (self), NULL);
 #line 36 "/home/jens/Source/shotwell/src/Page.vala"
@@ -1544,8 +1544,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 GeeList* injection_group_get_elements (InjectionGroup* self) {
 	GeeList* result = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeList* _tmp1_;
 #line 39 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_INJECTION_GROUP (self), NULL);
 #line 40 "/home/jens/Source/shotwell/src/Page.vala"
@@ -1561,12 +1561,12 @@ GeeList* injection_group_get_elements (InjectionGroup* self) {
 
 
 void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator) {
-	GeeArrayList* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	InjectionGroupElement* _tmp4_ = NULL;
-	InjectionGroupElement* _tmp5_ = NULL;
+	GeeArrayList* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	InjectionGroupElement* _tmp4_;
+	InjectionGroupElement* _tmp5_;
 #line 43 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_INJECTION_GROUP (self));
 #line 43 "/home/jens/Source/shotwell/src/Page.vala"
@@ -1592,11 +1592,11 @@ void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, con
 
 
 void injection_group_add_menu (InjectionGroup* self, const gchar* name, const gchar* action) {
-	GeeArrayList* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	InjectionGroupElement* _tmp3_ = NULL;
-	InjectionGroupElement* _tmp4_ = NULL;
+	GeeArrayList* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	InjectionGroupElement* _tmp3_;
+	InjectionGroupElement* _tmp4_;
 #line 47 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_INJECTION_GROUP (self));
 #line 47 "/home/jens/Source/shotwell/src/Page.vala"
@@ -1620,12 +1620,12 @@ void injection_group_add_menu (InjectionGroup* self, const gchar* name, const gc
 
 
 void injection_group_add_separator (InjectionGroup* self) {
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	InjectionGroupElement* _tmp4_ = NULL;
-	InjectionGroupElement* _tmp5_ = NULL;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	InjectionGroupElement* _tmp4_;
+	InjectionGroupElement* _tmp5_;
 #line 51 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_INJECTION_GROUP (self));
 #line 52 "/home/jens/Source/shotwell/src/Page.vala"
@@ -1666,14 +1666,14 @@ GType injection_group_element_item_type_get_type (void) {
 
 InjectionGroupElement* injection_group_element_construct (GType object_type, const gchar* name, const gchar* action, const gchar* accellerator, InjectionGroupElementItemType kind) {
 	InjectionGroupElement* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	InjectionGroupElementItemType _tmp9_ = 0;
+	const gchar* _tmp3_;
+	gchar* _tmp6_;
+	const gchar* _tmp7_;
+	gchar* _tmp8_;
+	InjectionGroupElementItemType _tmp9_;
 #line 19 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 19 "/home/jens/Source/shotwell/src/Page.vala"
@@ -1691,14 +1691,14 @@ InjectionGroupElement* injection_group_element_construct (GType object_type, con
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
 #line 1694 "Page.c"
-		const gchar* _tmp4_ = NULL;
+		const gchar* _tmp4_;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = _tmp4_;
 #line 1700 "Page.c"
 	} else {
-		const gchar* _tmp5_ = NULL;
+		const gchar* _tmp5_;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = name;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
@@ -1778,7 +1778,7 @@ static gchar* injection_group_value_element_collect_value (GValue* value, guint
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	if (collect_values[0].v_pointer) {
 #line 1781 "Page.c"
-		InjectionGroupElement* object;
+		InjectionGroupElement * object;
 		object = collect_values[0].v_pointer;
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1805,7 +1805,7 @@ static gchar* injection_group_value_element_collect_value (GValue* value, guint
 
 
 static gchar* injection_group_value_element_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	InjectionGroupElement** object_p;
+	InjectionGroupElement ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!object_p) {
@@ -1857,7 +1857,7 @@ gpointer injection_group_value_get_element (const GValue* value) {
 
 
 void injection_group_value_set_element (GValue* value, gpointer v_object) {
-	InjectionGroupElement* old;
+	InjectionGroupElement * old;
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, INJECTION_GROUP_TYPE_ELEMENT));
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
@@ -1888,7 +1888,7 @@ void injection_group_value_set_element (GValue* value, gpointer v_object) {
 
 
 void injection_group_value_take_element (GValue* value, gpointer v_object) {
-	InjectionGroupElement* old;
+	InjectionGroupElement * old;
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, INJECTION_GROUP_TYPE_ELEMENT));
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
@@ -1932,7 +1932,7 @@ static void injection_group_element_instance_init (InjectionGroupElement * self)
 }
 
 
-static void injection_group_element_finalize (InjectionGroupElement* obj) {
+static void injection_group_element_finalize (InjectionGroupElement * obj) {
 	InjectionGroupElement * self;
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, INJECTION_GROUP_TYPE_ELEMENT, InjectionGroupElement);
@@ -1963,7 +1963,7 @@ GType injection_group_element_get_type (void) {
 
 
 gpointer injection_group_element_ref (gpointer instance) {
-	InjectionGroupElement* self;
+	InjectionGroupElement * self;
 	self = instance;
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1974,7 +1974,7 @@ gpointer injection_group_element_ref (gpointer instance) {
 
 
 void injection_group_element_unref (gpointer instance) {
-	InjectionGroupElement* self;
+	InjectionGroupElement * self;
 	self = instance;
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2029,7 +2029,7 @@ static gchar* value_injection_group_collect_value (GValue* value, guint n_collec
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	if (collect_values[0].v_pointer) {
 #line 2032 "Page.c"
-		InjectionGroup* object;
+		InjectionGroup * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -2056,7 +2056,7 @@ static gchar* value_injection_group_collect_value (GValue* value, guint n_collec
 
 
 static gchar* value_injection_group_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	InjectionGroup** object_p;
+	InjectionGroup ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!object_p) {
@@ -2108,7 +2108,7 @@ gpointer value_get_injection_group (const GValue* value) {
 
 
 void value_set_injection_group (GValue* value, gpointer v_object) {
-	InjectionGroup* old;
+	InjectionGroup * old;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INJECTION_GROUP));
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2139,7 +2139,7 @@ void value_set_injection_group (GValue* value, gpointer v_object) {
 
 
 void value_take_injection_group (GValue* value, gpointer v_object) {
-	InjectionGroup* old;
+	InjectionGroup * old;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INJECTION_GROUP));
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2179,7 +2179,7 @@ static void injection_group_class_init (InjectionGroupClass * klass) {
 
 
 static void injection_group_instance_init (InjectionGroup * self) {
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = INJECTION_GROUP_GET_PRIVATE (self);
 #line 28 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2194,7 +2194,7 @@ static void injection_group_instance_init (InjectionGroup * self) {
 }
 
 
-static void injection_group_finalize (InjectionGroup* obj) {
+static void injection_group_finalize (InjectionGroup * obj) {
 	InjectionGroup * self;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_INJECTION_GROUP, InjectionGroup);
@@ -2223,7 +2223,7 @@ GType injection_group_get_type (void) {
 
 
 gpointer injection_group_ref (gpointer instance) {
-	InjectionGroup* self;
+	InjectionGroup * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -2234,7 +2234,7 @@ gpointer injection_group_ref (gpointer instance) {
 
 
 void injection_group_unref (gpointer instance) {
-	InjectionGroup* self;
+	InjectionGroup * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2265,12 +2265,12 @@ static void _page_attach_view_signals_gtk_widget_realize (GtkWidget* _sender, gp
 
 Page* page_construct (GType object_type, const gchar* page_name) {
 	Page * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	ViewCollection* _tmp5_;
 	GdkPoint _tmp6_ = {0};
 #line 89 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
@@ -2318,12 +2318,12 @@ Page* page_construct (GType object_type, const gchar* page_name) {
 
 static void page_real_destroy (GtkWidget* base) {
 	Page * self;
-	gboolean _tmp0_ = FALSE;
-	ViewCollection* _tmp1_ = NULL;
-	GtkToolbar* _tmp2_ = NULL;
-	OneShotScheduler* _tmp4_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	gboolean _tmp0_;
+	ViewCollection* _tmp1_;
+	GtkToolbar* _tmp2_;
+	OneShotScheduler* _tmp4_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
 #line 111 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE, Page);
 #line 112 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2349,7 +2349,7 @@ static void page_real_destroy (GtkWidget* base) {
 #line 123 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
 #line 2352 "Page.c"
-		GtkToolbar* _tmp3_ = NULL;
+		GtkToolbar* _tmp3_;
 #line 124 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->toolbar;
 #line 124 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2361,7 +2361,7 @@ static void page_real_destroy (GtkWidget* base) {
 #line 127 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
 #line 2364 "Page.c"
-		OneShotScheduler* _tmp5_ = NULL;
+		OneShotScheduler* _tmp5_;
 #line 128 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->update_actions_scheduler;
 #line 128 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2386,8 +2386,8 @@ static void page_real_destroy (GtkWidget* base) {
 
 gchar* page_get_page_name (Page* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 137 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
 #line 138 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2403,8 +2403,8 @@ gchar* page_get_page_name (Page* self) {
 
 
 static void page_real_set_page_name (Page* self, const gchar* page_name) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 141 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (page_name != NULL);
 #line 142 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2430,8 +2430,8 @@ void page_set_page_name (Page* self, const gchar* page_name) {
 
 gchar* page_to_string (Page* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 145 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
 #line 146 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2455,8 +2455,8 @@ static gpointer _data_collection_ref0 (gpointer self) {
 
 ViewCollection* page_get_view (Page* self) {
 	ViewCollection* result = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
 #line 149 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
 #line 150 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2473,8 +2473,8 @@ ViewCollection* page_get_view (Page* self) {
 
 GtkWindow* page_get_container (Page* self) {
 	GtkWindow* result = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
+	GtkWindow* _tmp0_;
+	GtkWindow* _tmp1_;
 #line 153 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
 #line 154 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2490,9 +2490,9 @@ GtkWindow* page_get_container (Page* self) {
 
 
 static void page_real_set_container (Page* self, GtkWindow* container) {
-	GtkWindow* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
-	GtkWindow* _tmp2_ = NULL;
+	GtkWindow* _tmp0_;
+	GtkWindow* _tmp1_;
+	GtkWindow* _tmp2_;
 #line 157 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GTK_IS_WINDOW (container));
 #line 158 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2591,17 +2591,17 @@ static void _page_on_event_source_realize_gtk_widget_realize (GtkWidget* _sender
 
 
 void page_set_event_source (Page* self, GtkWidget* event_source) {
-	GtkWidget* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
-	GtkWidget* _tmp3_ = NULL;
-	GtkWidget* _tmp4_ = NULL;
-	GtkWidget* _tmp5_ = NULL;
-	GtkWidget* _tmp6_ = NULL;
-	GtkWidget* _tmp7_ = NULL;
-	GtkWidget* _tmp8_ = NULL;
-	GtkWidget* _tmp9_ = NULL;
-	GtkWidget* _tmp10_ = NULL;
+	GtkWidget* _tmp0_;
+	GtkWidget* _tmp1_;
+	GtkWidget* _tmp2_;
+	GtkWidget* _tmp3_;
+	GtkWidget* _tmp4_;
+	GtkWidget* _tmp5_;
+	GtkWidget* _tmp6_;
+	GtkWidget* _tmp7_;
+	GtkWidget* _tmp8_;
+	GtkWidget* _tmp9_;
+	GtkWidget* _tmp10_;
 #line 167 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 167 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2625,7 +2625,7 @@ void page_set_event_source (Page* self, GtkWidget* event_source) {
 #line 174 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event_source;
 #line 174 "/home/jens/Source/shotwell/src/Page.vala"
-	gtk_widget_add_events (_tmp4_, (gint) ((((((GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK) | GDK_POINTER_MOTION_MASK) | GDK_POINTER_MOTION_HINT_MASK) | GDK_BUTTON_MOTION_MASK) | GDK_LEAVE_NOTIFY_MASK) | GDK_SCROLL_MASK));
+	gtk_widget_add_events (_tmp4_, (gint) (((((((GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK) | GDK_POINTER_MOTION_MASK) | GDK_POINTER_MOTION_HINT_MASK) | GDK_BUTTON_MOTION_MASK) | GDK_LEAVE_NOTIFY_MASK) | GDK_SCROLL_MASK) | GDK_SMOOTH_SCROLL_MASK));
 #line 178 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event_source;
 #line 178 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2655,17 +2655,17 @@ void page_set_event_source (Page* self, GtkWidget* event_source) {
 
 
 static void page_detach_event_source (Page* self) {
-	GtkWidget* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	GtkWidget* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
-	GtkWidget* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	GtkWidget* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
-	GtkWidget* _tmp9_ = NULL;
-	guint _tmp10_ = 0U;
+	GtkWidget* _tmp0_;
+	GtkWidget* _tmp1_;
+	guint _tmp2_;
+	GtkWidget* _tmp3_;
+	guint _tmp4_;
+	GtkWidget* _tmp5_;
+	guint _tmp6_;
+	GtkWidget* _tmp7_;
+	guint _tmp8_;
+	GtkWidget* _tmp9_;
+	guint _tmp10_;
 #line 186 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 187 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2718,8 +2718,8 @@ static void page_detach_event_source (Page* self) {
 
 GtkWidget* page_get_event_source (Page* self) {
 	GtkWidget* result = NULL;
-	GtkWidget* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkWidget* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 201 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
 #line 202 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2744,11 +2744,11 @@ static gpointer _injection_group_ref0 (gpointer self) {
 GMenuModel* page_get_menubar (Page* self) {
 	GMenuModel* result = NULL;
 	GMenu* model = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	GMenu* _tmp2_ = NULL;
-	GMenu* _tmp3_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	GtkBuilder* _tmp0_;
+	GObject* _tmp1_;
+	GMenu* _tmp2_;
+	GMenu* _tmp3_;
+	gboolean _tmp5_;
 #line 206 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
 #line 207 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2764,7 +2764,7 @@ GMenuModel* page_get_menubar (Page* self) {
 #line 208 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == NULL) {
 #line 2767 "Page.c"
-		GMenu* _tmp4_ = NULL;
+		GMenu* _tmp4_;
 #line 209 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = g_menu_new ();
 #line 209 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2781,12 +2781,12 @@ GMenuModel* page_get_menubar (Page* self) {
 	if (!_tmp5_) {
 #line 2783 "Page.c"
 		InjectionGroup** injection_groups = NULL;
-		gint _tmp6_ = 0;
-		InjectionGroup** _tmp7_ = NULL;
-		gint injection_groups_length1 = 0;
-		gint _injection_groups_size_ = 0;
-		InjectionGroup** _tmp8_ = NULL;
-		gint _tmp8__length1 = 0;
+		gint _tmp6_;
+		InjectionGroup** _tmp7_;
+		gint injection_groups_length1;
+		gint _injection_groups_size_;
+		InjectionGroup** _tmp8_;
+		gint _tmp8__length1;
 #line 214 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_init_collect_injection_groups (self, &_tmp6_);
 #line 214 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2812,7 +2812,7 @@ GMenuModel* page_get_menubar (Page* self) {
 #line 215 "/home/jens/Source/shotwell/src/Page.vala"
 			for (group_it = 0; group_it < _tmp8__length1; group_it = group_it + 1) {
 #line 2815 "Page.c"
-				InjectionGroup* _tmp9_ = NULL;
+				InjectionGroup* _tmp9_;
 				InjectionGroup* group = NULL;
 #line 215 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = _injection_group_ref0 (group_collection[group_it]);
@@ -2821,8 +2821,8 @@ GMenuModel* page_get_menubar (Page* self) {
 #line 2822 "Page.c"
 				{
 					gint items = 0;
-					GMenu* _tmp10_ = NULL;
-					gint _tmp11_ = 0;
+					GMenu* _tmp10_;
+					gint _tmp11_;
 #line 216 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = model;
 #line 216 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2842,24 +2842,24 @@ GMenuModel* page_get_menubar (Page* self) {
 #line 217 "/home/jens/Source/shotwell/src/Page.vala"
 							while (TRUE) {
 #line 2845 "Page.c"
-								gint _tmp14_ = 0;
-								gint _tmp15_ = 0;
+								gint _tmp14_;
+								gint _tmp15_;
 								GMenuModel* submenu = NULL;
-								GMenu* _tmp16_ = NULL;
-								gint _tmp17_ = 0;
-								GMenuModel* _tmp18_ = NULL;
+								GMenu* _tmp16_;
+								gint _tmp17_;
+								GMenuModel* _tmp18_;
 								GMenuModel* section = NULL;
-								GMenuModel* _tmp19_ = NULL;
-								InjectionGroup* _tmp20_ = NULL;
-								gchar* _tmp21_ = NULL;
-								gchar* _tmp22_ = NULL;
-								GMenuModel* _tmp23_ = NULL;
-								GMenuModel* _tmp24_ = NULL;
-								GMenuModel* _tmp25_ = NULL;
+								GMenuModel* _tmp19_;
+								InjectionGroup* _tmp20_;
+								gchar* _tmp21_;
+								gchar* _tmp22_;
+								GMenuModel* _tmp23_;
+								GMenuModel* _tmp24_;
+								GMenuModel* _tmp25_;
 #line 217 "/home/jens/Source/shotwell/src/Page.vala"
 								if (!_tmp12_) {
 #line 2862 "Page.c"
-									gint _tmp13_ = 0;
+									gint _tmp13_;
 #line 217 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp13_ = i;
 #line 217 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2916,12 +2916,12 @@ GMenuModel* page_get_menubar (Page* self) {
 								}
 								{
 									GeeList* _element_list = NULL;
-									InjectionGroup* _tmp26_ = NULL;
-									GeeList* _tmp27_ = NULL;
+									InjectionGroup* _tmp26_;
+									GeeList* _tmp27_;
 									gint _element_size = 0;
-									GeeList* _tmp28_ = NULL;
-									gint _tmp29_ = 0;
-									gint _tmp30_ = 0;
+									GeeList* _tmp28_;
+									gint _tmp29_;
+									gint _tmp30_;
 									gint _element_index = 0;
 #line 227 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp26_ = group;
@@ -2942,18 +2942,18 @@ GMenuModel* page_get_menubar (Page* self) {
 #line 227 "/home/jens/Source/shotwell/src/Page.vala"
 									while (TRUE) {
 #line 2945 "Page.c"
-										gint _tmp31_ = 0;
-										gint _tmp32_ = 0;
-										gint _tmp33_ = 0;
+										gint _tmp31_;
+										gint _tmp32_;
+										gint _tmp33_;
 										InjectionGroupElement* element = NULL;
-										GeeList* _tmp34_ = NULL;
-										gint _tmp35_ = 0;
-										gpointer _tmp36_ = NULL;
+										GeeList* _tmp34_;
+										gint _tmp35_;
+										gpointer _tmp36_;
 										GMenu* menu = NULL;
-										GMenuModel* _tmp37_ = NULL;
-										GMenu* _tmp38_ = NULL;
-										InjectionGroupElement* _tmp39_ = NULL;
-										InjectionGroupElementItemType _tmp40_ = 0;
+										GMenuModel* _tmp37_;
+										GMenu* _tmp38_;
+										InjectionGroupElement* _tmp39_;
+										InjectionGroupElementItemType _tmp40_;
 #line 227 "/home/jens/Source/shotwell/src/Page.vala"
 										_tmp31_ = _element_index;
 #line 227 "/home/jens/Source/shotwell/src/Page.vala"
@@ -2993,18 +2993,18 @@ GMenuModel* page_get_menubar (Page* self) {
 #line 2994 "Page.c"
 											{
 												GMenuItem* item = NULL;
-												InjectionGroupElement* _tmp41_ = NULL;
-												const gchar* _tmp42_ = NULL;
-												InjectionGroupElement* _tmp43_ = NULL;
-												const gchar* _tmp44_ = NULL;
-												gchar* _tmp45_ = NULL;
-												gchar* _tmp46_ = NULL;
-												GMenuItem* _tmp47_ = NULL;
-												GMenuItem* _tmp48_ = NULL;
-												InjectionGroupElement* _tmp49_ = NULL;
-												const gchar* _tmp50_ = NULL;
-												GMenu* _tmp54_ = NULL;
-												GMenuItem* _tmp55_ = NULL;
+												InjectionGroupElement* _tmp41_;
+												const gchar* _tmp42_;
+												InjectionGroupElement* _tmp43_;
+												const gchar* _tmp44_;
+												gchar* _tmp45_;
+												gchar* _tmp46_;
+												GMenuItem* _tmp47_;
+												GMenuItem* _tmp48_;
+												InjectionGroupElement* _tmp49_;
+												const gchar* _tmp50_;
+												GMenu* _tmp54_;
+												GMenuItem* _tmp55_;
 #line 231 "/home/jens/Source/shotwell/src/Page.vala"
 												_tmp41_ = element;
 #line 231 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3032,9 +3032,9 @@ GMenuModel* page_get_menubar (Page* self) {
 #line 233 "/home/jens/Source/shotwell/src/Page.vala"
 												if (_tmp50_ != NULL) {
 #line 3035 "Page.c"
-													GMenuItem* _tmp51_ = NULL;
-													InjectionGroupElement* _tmp52_ = NULL;
-													const gchar* _tmp53_ = NULL;
+													GMenuItem* _tmp51_;
+													InjectionGroupElement* _tmp52_;
+													const gchar* _tmp53_;
 #line 234 "/home/jens/Source/shotwell/src/Page.vala"
 													_tmp51_ = item;
 #line 234 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3104,26 +3104,26 @@ GMenuModel* page_get_menubar (Page* self) {
 
 static GtkToolbar* page_real_get_toolbar (Page* self) {
 	GtkToolbar* result = NULL;
-	GtkToolbar* _tmp0_ = NULL;
-	GtkToolbar* _tmp12_ = NULL;
-	GtkToolbar* _tmp13_ = NULL;
+	GtkToolbar* _tmp0_;
+	GtkToolbar* _tmp12_;
+	GtkToolbar* _tmp13_;
 #line 255 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->toolbar;
 #line 255 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
 #line 3115 "Page.c"
 		GtkToolbar* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		GtkToolbar* _tmp8_ = NULL;
-		GtkToolbar* _tmp9_ = NULL;
-		GtkStyleContext* _tmp10_ = NULL;
-		GtkToolbar* _tmp11_ = NULL;
+		const gchar* _tmp2_;
+		GtkToolbar* _tmp8_;
+		GtkToolbar* _tmp9_;
+		GtkStyleContext* _tmp10_;
+		GtkToolbar* _tmp11_;
 #line 256 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->toolbar_path;
 #line 256 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp2_ == NULL) {
 #line 3126 "Page.c"
-			GtkToolbar* _tmp3_ = NULL;
+			GtkToolbar* _tmp3_;
 #line 256 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = (GtkToolbar*) gtk_toolbar_new ();
 #line 256 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3134,10 +3134,10 @@ static GtkToolbar* page_real_get_toolbar (Page* self) {
 			_tmp1_ = _tmp3_;
 #line 3136 "Page.c"
 		} else {
-			GtkBuilder* _tmp4_ = NULL;
-			const gchar* _tmp5_ = NULL;
-			GObject* _tmp6_ = NULL;
-			GtkToolbar* _tmp7_ = NULL;
+			GtkBuilder* _tmp4_;
+			const gchar* _tmp5_;
+			GObject* _tmp6_;
+			GtkToolbar* _tmp7_;
 #line 257 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = self->builder;
 #line 257 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3214,10 +3214,10 @@ GtkMenu* page_get_page_context_menu (Page* self) {
 
 static void page_real_switching_from (Page* self) {
 	GActionMap* map = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	GActionMap* _tmp1_ = NULL;
-	GActionMap* _tmp2_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	GtkWindow* _tmp0_;
+	GActionMap* _tmp1_;
+	GActionMap* _tmp2_;
+	const gchar* _tmp4_;
 #line 270 "/home/jens/Source/shotwell/src/Page.vala"
 	self->in_view = FALSE;
 #line 272 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3237,7 +3237,7 @@ static void page_real_switching_from (Page* self) {
 #line 273 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
 #line 3240 "Page.c"
-		GActionMap* _tmp3_ = NULL;
+		GActionMap* _tmp3_;
 #line 274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = map;
 #line 274 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3271,19 +3271,19 @@ void page_switching_from (Page* self) {
 
 static void page_real_switched_to (Page* self) {
 	GActionMap* map = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	GActionMap* _tmp1_ = NULL;
-	GActionMap* _tmp2_ = NULL;
+	GtkWindow* _tmp0_;
+	GActionMap* _tmp1_;
+	GActionMap* _tmp2_;
 	gint selected_count = 0;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	gint count = 0;
-	ViewCollection* _tmp8_ = NULL;
-	ViewCollection* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	ViewCollection* _tmp8_;
+	ViewCollection* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 #line 281 "/home/jens/Source/shotwell/src/Page.vala"
 	self->in_view = TRUE;
 #line 282 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3305,7 +3305,7 @@ static void page_real_switched_to (Page* self) {
 #line 284 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
 #line 3308 "Page.c"
-		GActionMap* _tmp3_ = NULL;
+		GActionMap* _tmp3_;
 #line 285 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = map;
 #line 285 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3372,7 +3372,7 @@ void page_ready (Page* self) {
 
 gboolean page_is_in_view (Page* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 297 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
 #line 298 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3386,7 +3386,7 @@ gboolean page_is_in_view (Page* self) {
 
 
 static void page_real_switching_to_fullscreen (Page* self, FullscreenWindow* fsw) {
-	FullscreenWindow* _tmp0_ = NULL;
+	FullscreenWindow* _tmp0_;
 #line 301 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
 #line 302 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3407,7 +3407,7 @@ void page_switching_to_fullscreen (Page* self, FullscreenWindow* fsw) {
 
 
 static void page_real_returning_from_fullscreen (Page* self, FullscreenWindow* fsw) {
-	FullscreenWindow* _tmp0_ = NULL;
+	FullscreenWindow* _tmp0_;
 #line 305 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
 #line 306 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3432,8 +3432,8 @@ void page_returning_from_fullscreen (Page* self, FullscreenWindow* fsw) {
 GAction* page_get_action (Page* self, const gchar* name) {
 	GAction* result = NULL;
 	GActionMap* map = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	GActionMap* _tmp5_ = NULL;
+	GtkWindow* _tmp0_;
+	GActionMap* _tmp5_;
 #line 310 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
 #line 310 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3445,8 +3445,8 @@ GAction* page_get_action (Page* self, const gchar* name) {
 #line 312 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW)) {
 #line 3448 "Page.c"
-		GtkWindow* _tmp1_ = NULL;
-		GActionMap* _tmp2_ = NULL;
+		GtkWindow* _tmp1_;
+		GActionMap* _tmp2_;
 #line 313 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->container;
 #line 313 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3457,8 +3457,8 @@ GAction* page_get_action (Page* self, const gchar* name) {
 		map = _tmp2_;
 #line 3459 "Page.c"
 	} else {
-		AppWindow* _tmp3_ = NULL;
-		GActionMap* _tmp4_ = NULL;
+		AppWindow* _tmp3_;
+		GActionMap* _tmp4_;
 #line 315 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = app_window_get_instance ();
 #line 315 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3480,10 +3480,10 @@ GAction* page_get_action (Page* self, const gchar* name) {
 #line 318 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_ != NULL) {
 #line 3483 "Page.c"
-		GActionMap* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		GAction* _tmp8_ = NULL;
-		GAction* _tmp9_ = NULL;
+		GActionMap* _tmp6_;
+		const gchar* _tmp7_;
+		GAction* _tmp8_;
+		GAction* _tmp9_;
 #line 319 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = map;
 #line 319 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3512,10 +3512,10 @@ GAction* page_get_action (Page* self, const gchar* name) {
 
 void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive) {
 	GSimpleAction* action = NULL;
-	const gchar* _tmp0_ = NULL;
-	GAction* _tmp1_ = NULL;
-	GSimpleAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	GAction* _tmp1_;
+	GSimpleAction* _tmp2_;
+	GSimpleAction* _tmp3_;
 #line 325 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 325 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3539,8 +3539,8 @@ void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitiv
 #line 327 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
 #line 3542 "Page.c"
-		GSimpleAction* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+		GSimpleAction* _tmp4_;
+		gboolean _tmp5_;
 #line 328 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
 #line 328 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3556,8 +3556,8 @@ void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitiv
 
 
 void page_set_action_important (Page* self, const gchar* name, gboolean important) {
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 #line 331 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 331 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3573,8 +3573,8 @@ void page_set_action_important (Page* self, const gchar* name, gboolean importan
 
 
 void page_set_action_visible (Page* self, const gchar* name, gboolean visible) {
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 #line 335 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 335 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3590,7 +3590,7 @@ void page_set_action_visible (Page* self, const gchar* name, gboolean visible) {
 
 
 void page_set_action_short_label (Page* self, const gchar* name, const gchar* short_label) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 339 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 339 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3607,13 +3607,13 @@ void page_set_action_short_label (Page* self, const gchar* name, const gchar* sh
 
 void page_set_action_details (Page* self, const gchar* name, const gchar* label, const gchar* tooltip, gboolean sensitive) {
 	GSimpleAction* action = NULL;
-	const gchar* _tmp0_ = NULL;
-	GAction* _tmp1_ = NULL;
-	GSimpleAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GSimpleAction* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	const gchar* _tmp0_;
+	GAction* _tmp1_;
+	GSimpleAction* _tmp2_;
+	GSimpleAction* _tmp3_;
+	const gchar* _tmp4_;
+	GSimpleAction* _tmp7_;
+	gboolean _tmp8_;
 #line 343 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 343 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3647,8 +3647,8 @@ void page_set_action_details (Page* self, const gchar* name, const gchar* label,
 #line 349 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
 #line 3650 "Page.c"
-		const gchar* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+		const gchar* _tmp5_;
+		const gchar* _tmp6_;
 #line 350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = name;
 #line 350 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3671,9 +3671,9 @@ void page_set_action_details (Page* self, const gchar* name, const gchar* label,
 
 void page_activate_action (Page* self, const gchar* name) {
 	GAction* action = NULL;
-	const gchar* _tmp0_ = NULL;
-	GAction* _tmp1_ = NULL;
-	GAction* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	GAction* _tmp1_;
+	GAction* _tmp2_;
 #line 355 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 355 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3689,7 +3689,7 @@ void page_activate_action (Page* self, const gchar* name) {
 #line 358 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
 #line 3692 "Page.c"
-		GAction* _tmp3_ = NULL;
+		GAction* _tmp3_;
 #line 359 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = action;
 #line 359 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3705,10 +3705,10 @@ void page_activate_action (Page* self, const gchar* name) {
 GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_warning) {
 	GAction* result = NULL;
 	GAction* action = NULL;
-	const gchar* _tmp0_ = NULL;
-	GAction* _tmp1_ = NULL;
-	GAction* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	const gchar* _tmp0_;
+	GAction* _tmp1_;
+	GAction* _tmp2_;
+	gboolean _tmp3_;
 #line 362 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
 #line 362 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3734,9 +3734,9 @@ GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_war
 #line 368 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
 #line 3737 "Page.c"
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		const gchar* _tmp6_;
 #line 369 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_page_name (self);
 #line 369 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3761,10 +3761,10 @@ GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_war
 
 void page_set_common_action_sensitive (Page* self, const gchar* name, gboolean sensitive) {
 	GSimpleAction* action = NULL;
-	const gchar* _tmp0_ = NULL;
-	GAction* _tmp1_ = NULL;
-	GSimpleAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	GAction* _tmp1_;
+	GSimpleAction* _tmp2_;
+	GSimpleAction* _tmp3_;
 #line 374 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 374 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3788,8 +3788,8 @@ void page_set_common_action_sensitive (Page* self, const gchar* name, gboolean s
 #line 376 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
 #line 3791 "Page.c"
-		GSimpleAction* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+		GSimpleAction* _tmp4_;
+		gboolean _tmp5_;
 #line 377 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
 #line 377 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3805,7 +3805,7 @@ void page_set_common_action_sensitive (Page* self, const gchar* name, gboolean s
 
 
 void page_set_common_action_label (Page* self, const gchar* name, const gchar* label) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 380 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 380 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3821,7 +3821,7 @@ void page_set_common_action_label (Page* self, const gchar* name, const gchar* l
 
 
 void page_set_common_action_important (Page* self, const gchar* name, gboolean important) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 384 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 384 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3836,10 +3836,10 @@ void page_set_common_action_important (Page* self, const gchar* name, gboolean i
 
 void page_activate_common_action (Page* self, const gchar* name) {
 	GSimpleAction* action = NULL;
-	const gchar* _tmp0_ = NULL;
-	GAction* _tmp1_ = NULL;
-	GSimpleAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	GAction* _tmp1_;
+	GSimpleAction* _tmp2_;
+	GSimpleAction* _tmp3_;
 #line 388 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 388 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3863,7 +3863,7 @@ void page_activate_common_action (Page* self, const gchar* name) {
 #line 390 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
 #line 3866 "Page.c"
-		GSimpleAction* _tmp4_ = NULL;
+		GSimpleAction* _tmp4_;
 #line 391 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
 #line 391 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3878,7 +3878,7 @@ void page_activate_common_action (Page* self, const gchar* name) {
 
 gboolean page_get_ctrl_pressed (Page* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 394 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
 #line 395 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3893,7 +3893,7 @@ gboolean page_get_ctrl_pressed (Page* self) {
 
 gboolean page_get_alt_pressed (Page* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 398 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
 #line 399 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3908,7 +3908,7 @@ gboolean page_get_alt_pressed (Page* self) {
 
 gboolean page_get_shift_pressed (Page* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 402 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
 #line 403 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3923,7 +3923,7 @@ gboolean page_get_shift_pressed (Page* self) {
 
 gboolean page_get_super_pressed (Page* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 406 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
 #line 407 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3945,10 +3945,10 @@ static GVariant* _variant_new20 (gboolean value) {
 
 void page_set_action_active (Page* self, const gchar* name, gboolean active) {
 	GSimpleAction* action = NULL;
-	const gchar* _tmp0_ = NULL;
-	GAction* _tmp1_ = NULL;
-	GSimpleAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	GAction* _tmp1_;
+	GSimpleAction* _tmp2_;
+	GSimpleAction* _tmp3_;
 #line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 410 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3972,9 +3972,9 @@ void page_set_action_active (Page* self, const gchar* name, gboolean active) {
 #line 412 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
 #line 3975 "Page.c"
-		GSimpleAction* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		GVariant* _tmp6_ = NULL;
+		GSimpleAction* _tmp4_;
+		gboolean _tmp5_;
+		GVariant* _tmp6_;
 #line 413 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
 #line 413 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3999,26 +3999,26 @@ static gboolean page_get_modifiers (Page* self, gboolean* ctrl, gboolean* alt, g
 	gboolean _vala_shift = FALSE;
 	gboolean _vala_super = FALSE;
 	gboolean result = FALSE;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-	GdkWindow* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	AppWindow* _tmp0_;
+	AppWindow* _tmp1_;
+	GdkWindow* _tmp2_;
+	gboolean _tmp3_;
 	gint x = 0;
 	gint y = 0;
 	GdkModifierType mask = 0;
-	AppWindow* _tmp4_ = NULL;
-	AppWindow* _tmp5_ = NULL;
-	GdkWindow* _tmp6_ = NULL;
-	GdkDisplay* _tmp7_ = NULL;
-	GdkDeviceManager* _tmp8_ = NULL;
-	GdkDevice* _tmp9_ = NULL;
+	AppWindow* _tmp4_;
+	AppWindow* _tmp5_;
+	GdkWindow* _tmp6_;
+	GdkDisplay* _tmp7_;
+	GdkDeviceManager* _tmp8_;
+	GdkDevice* _tmp9_;
 	gint _tmp10_ = 0;
 	gint _tmp11_ = 0;
 	GdkModifierType _tmp12_ = 0;
-	GdkModifierType _tmp13_ = 0;
-	GdkModifierType _tmp14_ = 0;
-	GdkModifierType _tmp15_ = 0;
-	GdkModifierType _tmp16_ = 0;
+	GdkModifierType _tmp13_;
+	GdkModifierType _tmp14_;
+	GdkModifierType _tmp15_;
+	GdkModifierType _tmp16_;
 #line 417 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
 #line 418 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4150,19 +4150,19 @@ static void page_update_modifiers (Page* self) {
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp4_;
 	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
+	gboolean _tmp6_;
 	gboolean _tmp11_ = FALSE;
-	gboolean _tmp12_ = FALSE;
+	gboolean _tmp12_;
 	gboolean _tmp17_ = FALSE;
-	gboolean _tmp18_ = FALSE;
+	gboolean _tmp18_;
 	gboolean _tmp23_ = FALSE;
-	gboolean _tmp24_ = FALSE;
-	gboolean _tmp29_ = FALSE;
-	gboolean _tmp30_ = FALSE;
-	gboolean _tmp31_ = FALSE;
-	gboolean _tmp32_ = FALSE;
+	gboolean _tmp24_;
+	gboolean _tmp29_;
+	gboolean _tmp30_;
+	gboolean _tmp31_;
+	gboolean _tmp32_;
 #line 440 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 443 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4186,7 +4186,7 @@ static void page_update_modifiers (Page* self) {
 #line 448 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_) {
 #line 4189 "Page.c"
-		gboolean _tmp7_ = FALSE;
+		gboolean _tmp7_;
 #line 448 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = ctrl_currently_pressed;
 #line 448 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4204,13 +4204,13 @@ static void page_update_modifiers (Page* self) {
 #line 4205 "Page.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
-		gboolean _tmp9_ = FALSE;
+		gboolean _tmp9_;
 #line 450 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->ctrl_pressed;
 #line 450 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp9_) {
 #line 4213 "Page.c"
-			gboolean _tmp10_ = FALSE;
+			gboolean _tmp10_;
 #line 450 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = ctrl_currently_pressed;
 #line 450 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4233,7 +4233,7 @@ static void page_update_modifiers (Page* self) {
 #line 453 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_) {
 #line 4236 "Page.c"
-		gboolean _tmp13_ = FALSE;
+		gboolean _tmp13_;
 #line 453 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = alt_currently_pressed;
 #line 453 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4251,13 +4251,13 @@ static void page_update_modifiers (Page* self) {
 #line 4252 "Page.c"
 	} else {
 		gboolean _tmp14_ = FALSE;
-		gboolean _tmp15_ = FALSE;
+		gboolean _tmp15_;
 #line 455 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = self->priv->alt_pressed;
 #line 455 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp15_) {
 #line 4260 "Page.c"
-			gboolean _tmp16_ = FALSE;
+			gboolean _tmp16_;
 #line 455 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = alt_currently_pressed;
 #line 455 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4280,7 +4280,7 @@ static void page_update_modifiers (Page* self) {
 #line 458 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp18_) {
 #line 4283 "Page.c"
-		gboolean _tmp19_ = FALSE;
+		gboolean _tmp19_;
 #line 458 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = shift_currently_pressed;
 #line 458 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4298,13 +4298,13 @@ static void page_update_modifiers (Page* self) {
 #line 4299 "Page.c"
 	} else {
 		gboolean _tmp20_ = FALSE;
-		gboolean _tmp21_ = FALSE;
+		gboolean _tmp21_;
 #line 460 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = self->priv->shift_pressed;
 #line 460 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp21_) {
 #line 4307 "Page.c"
-			gboolean _tmp22_ = FALSE;
+			gboolean _tmp22_;
 #line 460 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = shift_currently_pressed;
 #line 460 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4327,7 +4327,7 @@ static void page_update_modifiers (Page* self) {
 #line 463 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp24_) {
 #line 4330 "Page.c"
-		gboolean _tmp25_ = FALSE;
+		gboolean _tmp25_;
 #line 463 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = super_currently_pressed;
 #line 463 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4345,13 +4345,13 @@ static void page_update_modifiers (Page* self) {
 #line 4346 "Page.c"
 	} else {
 		gboolean _tmp26_ = FALSE;
-		gboolean _tmp27_ = FALSE;
+		gboolean _tmp27_;
 #line 465 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = self->priv->super_pressed;
 #line 465 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp27_) {
 #line 4354 "Page.c"
-			gboolean _tmp28_ = FALSE;
+			gboolean _tmp28_;
 #line 465 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = super_currently_pressed;
 #line 465 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4392,9 +4392,9 @@ static void page_update_modifiers (Page* self) {
 PageWindow* page_get_page_window (Page* self) {
 	PageWindow* result = NULL;
 	GtkWidget* p = NULL;
-	GtkContainer* _tmp0_ = NULL;
-	GtkContainer* _tmp1_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
+	GtkContainer* _tmp0_;
+	GtkContainer* _tmp1_;
+	GtkWidget* _tmp2_;
 #line 474 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
 #line 475 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4408,12 +4408,12 @@ PageWindow* page_get_page_window (Page* self) {
 #line 476 "/home/jens/Source/shotwell/src/Page.vala"
 	while (TRUE) {
 #line 4411 "Page.c"
-		GtkWidget* _tmp3_ = NULL;
-		GtkWidget* _tmp4_ = NULL;
-		GtkWidget* _tmp7_ = NULL;
-		GtkContainer* _tmp8_ = NULL;
-		GtkContainer* _tmp9_ = NULL;
-		GtkWidget* _tmp10_ = NULL;
+		GtkWidget* _tmp3_;
+		GtkWidget* _tmp4_;
+		GtkWidget* _tmp7_;
+		GtkContainer* _tmp8_;
+		GtkContainer* _tmp9_;
+		GtkWidget* _tmp10_;
 #line 476 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = p;
 #line 476 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4427,8 +4427,8 @@ PageWindow* page_get_page_window (Page* self) {
 #line 477 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_PAGE_WINDOW)) {
 #line 4430 "Page.c"
-			GtkWidget* _tmp5_ = NULL;
-			PageWindow* _tmp6_ = NULL;
+			GtkWidget* _tmp5_;
+			PageWindow* _tmp6_;
 #line 478 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = p;
 #line 478 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4467,7 +4467,7 @@ PageWindow* page_get_page_window (Page* self) {
 
 CommandManager* page_get_command_manager (Page* self) {
 	CommandManager* result = NULL;
-	CommandManager* _tmp0_ = NULL;
+	CommandManager* _tmp0_;
 #line 486 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
 #line 487 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4528,13 +4528,13 @@ static GVariant* _variant_new22 (gboolean value) {
 
 void page_on_action_toggle (Page* self, GAction* action, GVariant* value) {
 	GVariant* new_state = NULL;
-	GAction* _tmp0_ = NULL;
-	GVariant* _tmp1_ = NULL;
-	GVariant* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	GVariant* _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
-	GAction* _tmp6_ = NULL;
+	GAction* _tmp0_;
+	GVariant* _tmp1_;
+	GVariant* _tmp2_;
+	gboolean _tmp3_;
+	GVariant* _tmp4_;
+	GVariant* _tmp5_;
+	GAction* _tmp6_;
 #line 493 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 493 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4566,8 +4566,8 @@ void page_on_action_toggle (Page* self, GAction* action, GVariant* value) {
 
 
 void page_on_action_radio (Page* self, GAction* action, GVariant* value) {
-	GAction* _tmp0_ = NULL;
-	GVariant* _tmp1_ = NULL;
+	GAction* _tmp0_;
+	GVariant* _tmp1_;
 #line 498 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 498 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4584,11 +4584,11 @@ void page_on_action_radio (Page* self, GAction* action, GVariant* value) {
 
 static void page_add_ui (Page* self) {
 	GeeList* ui_filenames = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	GeeArrayList* _tmp0_;
+	GeeList* _tmp1_;
+	GeeList* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 #line 502 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 504 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4608,8 +4608,8 @@ static void page_add_ui (Page* self) {
 #line 506 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == 0) {
 #line 4611 "Page.c"
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 507 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = page_get_page_name (self);
 #line 507 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4622,12 +4622,12 @@ static void page_add_ui (Page* self) {
 	}
 	{
 		GeeList* _ui_filename_list = NULL;
-		GeeList* _tmp7_ = NULL;
-		GeeList* _tmp8_ = NULL;
+		GeeList* _tmp7_;
+		GeeList* _tmp8_;
 		gint _ui_filename_size = 0;
-		GeeList* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
+		GeeList* _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
 		gint _ui_filename_index = 0;
 #line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = ui_filenames;
@@ -4648,14 +4648,14 @@ static void page_add_ui (Page* self) {
 #line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
 #line 4651 "Page.c"
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
-			gint _tmp14_ = 0;
+			gint _tmp12_;
+			gint _tmp13_;
+			gint _tmp14_;
 			gchar* ui_filename = NULL;
-			GeeList* _tmp15_ = NULL;
-			gint _tmp16_ = 0;
-			gpointer _tmp17_ = NULL;
-			const gchar* _tmp18_ = NULL;
+			GeeList* _tmp15_;
+			gint _tmp16_;
+			gpointer _tmp17_;
+			const gchar* _tmp18_;
 #line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _ui_filename_index;
 #line 509 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4697,8 +4697,8 @@ static void page_add_ui (Page* self) {
 
 
 void page_init_toolbar (Page* self, const gchar* path) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 515 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4744,29 +4744,29 @@ static void _page_on_update_actions_data_collection_contents_altered (DataCollec
 
 
 static void page_attach_view_signals (Page* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	gint selected_count = 0;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	gint count = 0;
-	ViewCollection* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	ViewCollection* _tmp13_ = NULL;
-	ViewCollection* _tmp14_ = NULL;
-	ViewCollection* _tmp15_ = NULL;
-	ViewCollection* _tmp16_ = NULL;
-	ViewCollection* _tmp17_ = NULL;
-	ViewCollection* _tmp18_ = NULL;
-	ViewCollection* _tmp19_ = NULL;
-	ViewCollection* _tmp20_ = NULL;
+	ViewCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	ViewCollection* _tmp13_;
+	ViewCollection* _tmp14_;
+	ViewCollection* _tmp15_;
+	ViewCollection* _tmp16_;
+	ViewCollection* _tmp17_;
+	ViewCollection* _tmp18_;
+	ViewCollection* _tmp19_;
+	ViewCollection* _tmp20_;
 #line 520 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 521 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4852,19 +4852,19 @@ static void page_attach_view_signals (Page* self) {
 
 
 static void page_detach_view_signals (Page* self) {
-	gboolean _tmp0_ = FALSE;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	ViewCollection* _tmp7_ = NULL;
-	ViewCollection* _tmp8_ = NULL;
-	guint _tmp9_ = 0U;
-	ViewCollection* _tmp10_ = NULL;
-	ViewCollection* _tmp11_ = NULL;
-	guint _tmp12_ = 0U;
+	gboolean _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	guint _tmp3_;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	guint _tmp6_;
+	ViewCollection* _tmp7_;
+	ViewCollection* _tmp8_;
+	guint _tmp9_;
+	ViewCollection* _tmp10_;
+	ViewCollection* _tmp11_;
+	guint _tmp12_;
 #line 540 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 541 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4929,8 +4929,8 @@ static void _page_on_update_actions_on_idle_one_shot_callback (gpointer self) {
 
 
 static void page_on_update_actions (Page* self) {
-	OneShotScheduler* _tmp0_ = NULL;
-	OneShotScheduler* _tmp6_ = NULL;
+	OneShotScheduler* _tmp0_;
+	OneShotScheduler* _tmp6_;
 #line 552 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 553 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4938,11 +4938,11 @@ static void page_on_update_actions (Page* self) {
 #line 553 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
 #line 4941 "Page.c"
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		OneShotScheduler* _tmp5_ = NULL;
+		gchar* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		OneShotScheduler* _tmp5_;
 #line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = page_get_page_name (self);
 #line 554 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4972,14 +4972,14 @@ static void page_on_update_actions (Page* self) {
 
 
 static void page_on_update_actions_on_idle (Page* self) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	ViewCollection* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
+	gint _tmp4_;
+	ViewCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	gint _tmp7_;
 #line 562 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 563 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5022,8 +5022,8 @@ static void page_on_update_actions_on_idle (Page* self) {
 
 static void page_init_load_ui (Page* self, const gchar* ui_filename) {
 	gchar* ui_resource = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 572 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
@@ -5037,7 +5037,7 @@ static void page_init_load_ui (Page* self, const gchar* ui_filename) {
 	ui_resource = _tmp1_;
 #line 5039 "Page.c"
 	{
-		GtkBuilder* _tmp2_ = NULL;
+		GtkBuilder* _tmp2_;
 #line 575 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->builder;
 #line 575 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5045,22 +5045,22 @@ static void page_init_load_ui (Page* self, const gchar* ui_filename) {
 #line 575 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5048 "Page.c"
-			goto __catch254_g_error;
+			goto __catch255_g_error;
 		}
 #line 576 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->menubar_injected = FALSE;
 #line 5053 "Page.c"
 	}
-	goto __finally254;
-	__catch254_g_error:
+	goto __finally255;
+	__catch255_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		Application* _tmp7_ = NULL;
-		Application* _tmp8_ = NULL;
+		GError* _tmp3_;
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		Application* _tmp7_;
+		Application* _tmp8_;
 #line 574 "/home/jens/Source/shotwell/src/Page.vala"
 		err = _inner_error_;
 #line 574 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5089,7 +5089,7 @@ static void page_init_load_ui (Page* self, const gchar* ui_filename) {
 		_g_error_free0 (err);
 #line 5091 "Page.c"
 	}
-	__finally254:
+	__finally255:
 #line 574 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 574 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5126,9 +5126,9 @@ void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames) {
 
 static InjectionGroup** page_real_init_collect_injection_groups (Page* self, int* result_length1) {
 	InjectionGroup** result = NULL;
-	InjectionGroup** _tmp0_ = NULL;
-	InjectionGroup** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	InjectionGroup** _tmp0_;
+	InjectionGroup** _tmp1_;
+	gint _tmp1__length1;
 #line 593 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = g_new0 (InjectionGroup*, 0 + 1);
 #line 593 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5222,17 +5222,17 @@ static gboolean _page_on_drag_failed_gtk_widget_drag_failed (GtkWidget* _sender,
 
 
 void page_enable_drag_source (Page* self, GdkDragAction actions, GtkTargetEntry* source_target_entries, int source_target_entries_length1) {
-	gboolean _tmp0_ = FALSE;
-	GtkWidget* _tmp1_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
-	GtkTargetEntry* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GdkDragAction _tmp4_ = 0;
-	GtkWidget* _tmp5_ = NULL;
-	GtkWidget* _tmp6_ = NULL;
-	GtkWidget* _tmp7_ = NULL;
-	GtkWidget* _tmp8_ = NULL;
-	GtkWidget* _tmp9_ = NULL;
+	gboolean _tmp0_;
+	GtkWidget* _tmp1_;
+	GtkWidget* _tmp2_;
+	GtkTargetEntry* _tmp3_;
+	gint _tmp3__length1;
+	GdkDragAction _tmp4_;
+	GtkWidget* _tmp5_;
+	GtkWidget* _tmp6_;
+	GtkWidget* _tmp7_;
+	GtkWidget* _tmp8_;
+	GtkWidget* _tmp9_;
 #line 609 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 610 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5284,19 +5284,19 @@ void page_enable_drag_source (Page* self, GdkDragAction actions, GtkTargetEntry*
 
 
 void page_disable_drag_source (Page* self) {
-	gboolean _tmp0_ = FALSE;
-	GtkWidget* _tmp1_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	GtkWidget* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	GtkWidget* _tmp6_ = NULL;
-	guint _tmp7_ = 0U;
-	GtkWidget* _tmp8_ = NULL;
-	guint _tmp9_ = 0U;
-	GtkWidget* _tmp10_ = NULL;
-	guint _tmp11_ = 0U;
-	GtkWidget* _tmp12_ = NULL;
+	gboolean _tmp0_;
+	GtkWidget* _tmp1_;
+	GtkWidget* _tmp2_;
+	guint _tmp3_;
+	GtkWidget* _tmp4_;
+	guint _tmp5_;
+	GtkWidget* _tmp6_;
+	guint _tmp7_;
+	GtkWidget* _tmp8_;
+	guint _tmp9_;
+	GtkWidget* _tmp10_;
+	guint _tmp11_;
+	GtkWidget* _tmp12_;
 #line 628 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 629 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5353,7 +5353,7 @@ void page_disable_drag_source (Page* self) {
 
 gboolean page_is_dnd_enabled (Page* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 644 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
 #line 645 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5367,7 +5367,7 @@ gboolean page_is_dnd_enabled (Page* self) {
 
 
 static void page_on_drag_begin (Page* self, GdkDragContext* context) {
-	GdkDragContext* _tmp0_ = NULL;
+	GdkDragContext* _tmp0_;
 #line 648 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 648 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5381,10 +5381,10 @@ static void page_on_drag_begin (Page* self, GdkDragContext* context) {
 
 
 static void page_on_drag_data_get (Page* self, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time) {
-	GdkDragContext* _tmp0_ = NULL;
-	GtkSelectionData* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
+	GdkDragContext* _tmp0_;
+	GtkSelectionData* _tmp1_;
+	guint _tmp2_;
+	guint _tmp3_;
 #line 652 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 652 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5406,7 +5406,7 @@ static void page_on_drag_data_get (Page* self, GdkDragContext* context, GtkSelec
 
 
 static void page_on_drag_data_delete (Page* self, GdkDragContext* context) {
-	GdkDragContext* _tmp0_ = NULL;
+	GdkDragContext* _tmp0_;
 #line 657 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 657 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5420,7 +5420,7 @@ static void page_on_drag_data_delete (Page* self, GdkDragContext* context) {
 
 
 static void page_on_drag_end (Page* self, GdkDragContext* context) {
-	GdkDragContext* _tmp0_ = NULL;
+	GdkDragContext* _tmp0_;
 #line 661 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
 #line 661 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5456,9 +5456,9 @@ gboolean page_source_drag_failed (Page* self, GdkDragContext* context, GtkDragRe
 
 static gboolean page_on_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result) {
 	gboolean result = FALSE;
-	GdkDragContext* _tmp0_ = NULL;
-	GtkDragResult _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
+	GdkDragContext* _tmp0_;
+	GtkDragResult _tmp1_;
+	gboolean _tmp2_;
 #line 673 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
 #line 673 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5482,26 +5482,26 @@ gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifie
 	gint _vala_y = 0;
 	GdkModifierType _vala_mask = 0;
 	gboolean result = FALSE;
-	GtkWidget* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-	GdkWindow* _tmp2_ = NULL;
-	GdkDisplay* _tmp3_ = NULL;
-	GdkDeviceManager* _tmp4_ = NULL;
-	GdkDevice* _tmp5_ = NULL;
+	GtkWidget* _tmp0_;
+	GtkWidget* _tmp1_;
+	GdkWindow* _tmp2_;
+	GdkDisplay* _tmp3_;
+	GdkDeviceManager* _tmp4_;
+	GdkDevice* _tmp5_;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
 	GdkModifierType _tmp8_ = 0;
 	gboolean _tmp9_ = FALSE;
-	GdkPoint _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	gint _tmp14_ = 0;
-	GdkPoint _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	gint _tmp19_ = 0;
-	GdkPoint _tmp20_ = {0};
-	gint _tmp21_ = 0;
-	gint _tmp22_ = 0;
+	GdkPoint _tmp10_;
+	gint _tmp11_;
+	gint _tmp14_;
+	GdkPoint _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	gint _tmp19_;
+	GdkPoint _tmp20_;
+	gint _tmp21_;
+	gint _tmp22_;
 #line 681 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
 #line 682 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5566,8 +5566,8 @@ gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifie
 		_tmp9_ = TRUE;
 #line 5568 "Page.c"
 	} else {
-		GdkPoint _tmp12_ = {0};
-		gint _tmp13_ = 0;
+		GdkPoint _tmp12_;
+		gint _tmp13_;
 #line 693 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = self->priv->last_down;
 #line 693 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5613,7 +5613,7 @@ gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifie
 #line 700 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp17_ >= 0x7FFF) {
 #line 5616 "Page.c"
-		gint _tmp18_ = 0;
+		gint _tmp18_;
 #line 701 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _vala_x;
 #line 701 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5631,7 +5631,7 @@ gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifie
 #line 703 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp22_ >= 0x7FFF) {
 #line 5634 "Page.c"
-		gint _tmp23_ = 0;
+		gint _tmp23_;
 #line 704 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _vala_y;
 #line 704 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5792,8 +5792,8 @@ gboolean page_on_right_released (Page* self, GdkEventButton* event) {
 
 static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-	GdkEventButton* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	GdkEventButton* _tmp0_;
+	guint _tmp1_;
 #line 733 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
 #line 733 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5808,19 +5808,19 @@ static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* eve
 		case 1:
 #line 5810 "Page.c"
 		{
-			GtkWidget* _tmp2_ = NULL;
-			GdkEventButton* _tmp4_ = NULL;
-			gdouble _tmp5_ = 0.0;
-			GdkEventButton* _tmp6_ = NULL;
-			gdouble _tmp7_ = 0.0;
-			GdkEventButton* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			GtkWidget* _tmp2_;
+			GdkEventButton* _tmp4_;
+			gdouble _tmp5_;
+			GdkEventButton* _tmp6_;
+			gdouble _tmp7_;
+			GdkEventButton* _tmp8_;
+			gboolean _tmp9_;
 #line 736 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = self->priv->event_source;
 #line 736 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp2_ != NULL) {
 #line 5823 "Page.c"
-				GtkWidget* _tmp3_ = NULL;
+				GtkWidget* _tmp3_;
 #line 737 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp3_ = self->priv->event_source;
 #line 737 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5853,8 +5853,8 @@ static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* eve
 		case 2:
 #line 5855 "Page.c"
 		{
-			GdkEventButton* _tmp10_ = NULL;
-			gboolean _tmp11_ = FALSE;
+			GdkEventButton* _tmp10_;
+			gboolean _tmp11_;
 #line 746 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = event;
 #line 746 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5869,8 +5869,8 @@ static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* eve
 		case 3:
 #line 5871 "Page.c"
 		{
-			GdkEventButton* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
+			GdkEventButton* _tmp12_;
+			gboolean _tmp13_;
 #line 749 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = event;
 #line 749 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5895,8 +5895,8 @@ static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* eve
 
 static gboolean page_on_button_released_internal (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-	GdkEventButton* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	GdkEventButton* _tmp0_;
+	guint _tmp1_;
 #line 756 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
 #line 756 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5912,8 +5912,8 @@ static gboolean page_on_button_released_internal (Page* self, GdkEventButton* ev
 #line 5913 "Page.c"
 		{
 			GdkPoint _tmp2_ = {0};
-			GdkEventButton* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+			GdkEventButton* _tmp3_;
+			gboolean _tmp4_;
 #line 760 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_.x = -1;
 #line 760 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5934,8 +5934,8 @@ static gboolean page_on_button_released_internal (Page* self, GdkEventButton* ev
 		case 2:
 #line 5936 "Page.c"
 		{
-			GdkEventButton* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+			GdkEventButton* _tmp5_;
+			gboolean _tmp6_;
 #line 765 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = event;
 #line 765 "/home/jens/Source/shotwell/src/Page.vala"
@@ -5950,8 +5950,8 @@ static gboolean page_on_button_released_internal (Page* self, GdkEventButton* ev
 		case 3:
 #line 5952 "Page.c"
 		{
-			GdkEventButton* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+			GdkEventButton* _tmp7_;
+			gboolean _tmp8_;
 #line 768 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = event;
 #line 768 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6178,10 +6178,10 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) {
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-	GdkEventKey* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	const gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
+	GdkEventKey* _tmp4_;
+	guint _tmp5_;
+	const gchar* _tmp6_;
+	const gchar* _tmp7_;
 	GQuark _tmp9_ = 0U;
 #line 821 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label0 = 0;
@@ -6204,8 +6204,8 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) {
 #line 821 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label9 = 0;
 #line 6207 "Page.c"
-	GdkEventKey* _tmp30_ = NULL;
-	gboolean _tmp31_ = FALSE;
+	GdkEventKey* _tmp30_;
+	gboolean _tmp31_;
 #line 815 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
 #line 815 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6238,9 +6238,9 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) {
 			default:
 			{
 				gboolean _tmp10_ = FALSE;
-				gboolean _tmp11_ = FALSE;
-				GdkEventKey* _tmp13_ = NULL;
-				gboolean _tmp14_ = FALSE;
+				gboolean _tmp11_;
+				GdkEventKey* _tmp13_;
+				gboolean _tmp14_;
 #line 824 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = ctrl_currently_pressed;
 #line 824 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6249,7 +6249,7 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) {
 					_tmp10_ = TRUE;
 #line 6251 "Page.c"
 				} else {
-					gboolean _tmp12_ = FALSE;
+					gboolean _tmp12_;
 #line 824 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = self->priv->ctrl_pressed;
 #line 824 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6284,9 +6284,9 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) {
 			default:
 			{
 				gboolean _tmp15_ = FALSE;
-				gboolean _tmp16_ = FALSE;
-				GdkEventKey* _tmp18_ = NULL;
-				gboolean _tmp19_ = FALSE;
+				gboolean _tmp16_;
+				GdkEventKey* _tmp18_;
+				gboolean _tmp19_;
 #line 835 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = alt_currently_pressed;
 #line 835 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6295,7 +6295,7 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) {
 					_tmp15_ = TRUE;
 #line 6297 "Page.c"
 				} else {
-					gboolean _tmp17_ = FALSE;
+					gboolean _tmp17_;
 #line 835 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = self->priv->alt_pressed;
 #line 835 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6330,9 +6330,9 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) {
 			default:
 			{
 				gboolean _tmp20_ = FALSE;
-				gboolean _tmp21_ = FALSE;
-				GdkEventKey* _tmp23_ = NULL;
-				gboolean _tmp24_ = FALSE;
+				gboolean _tmp21_;
+				GdkEventKey* _tmp23_;
+				gboolean _tmp24_;
 #line 844 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = shift_currently_pressed;
 #line 844 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6341,7 +6341,7 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) {
 					_tmp20_ = TRUE;
 #line 6343 "Page.c"
 				} else {
-					gboolean _tmp22_ = FALSE;
+					gboolean _tmp22_;
 #line 844 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = self->priv->shift_pressed;
 #line 844 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6376,9 +6376,9 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) {
 			default:
 			{
 				gboolean _tmp25_ = FALSE;
-				gboolean _tmp26_ = FALSE;
-				GdkEventKey* _tmp28_ = NULL;
-				gboolean _tmp29_ = FALSE;
+				gboolean _tmp26_;
+				GdkEventKey* _tmp28_;
+				gboolean _tmp29_;
 #line 853 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = super_currently_pressed;
 #line 853 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6387,7 +6387,7 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) {
 					_tmp25_ = TRUE;
 #line 6389 "Page.c"
 				} else {
-					gboolean _tmp27_ = FALSE;
+					gboolean _tmp27_;
 #line 853 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = self->priv->super_pressed;
 #line 853 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6438,10 +6438,10 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) {
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-	GdkEventKey* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	const gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
+	GdkEventKey* _tmp4_;
+	guint _tmp5_;
+	const gchar* _tmp6_;
+	const gchar* _tmp7_;
 	GQuark _tmp9_ = 0U;
 #line 870 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label0 = 0;
@@ -6464,8 +6464,8 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) {
 #line 870 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label9 = 0;
 #line 6467 "Page.c"
-	GdkEventKey* _tmp30_ = NULL;
-	gboolean _tmp31_ = FALSE;
+	GdkEventKey* _tmp30_;
+	gboolean _tmp31_;
 #line 864 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
 #line 864 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6498,9 +6498,9 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) {
 			default:
 			{
 				gboolean _tmp10_ = FALSE;
-				gboolean _tmp11_ = FALSE;
-				GdkEventKey* _tmp13_ = NULL;
-				gboolean _tmp14_ = FALSE;
+				gboolean _tmp11_;
+				GdkEventKey* _tmp13_;
+				gboolean _tmp14_;
 #line 873 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = ctrl_currently_pressed;
 #line 873 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6509,7 +6509,7 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) {
 					_tmp10_ = TRUE;
 #line 6511 "Page.c"
 				} else {
-					gboolean _tmp12_ = FALSE;
+					gboolean _tmp12_;
 #line 873 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = self->priv->ctrl_pressed;
 #line 873 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6544,9 +6544,9 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) {
 			default:
 			{
 				gboolean _tmp15_ = FALSE;
-				gboolean _tmp16_ = FALSE;
-				GdkEventKey* _tmp18_ = NULL;
-				gboolean _tmp19_ = FALSE;
+				gboolean _tmp16_;
+				GdkEventKey* _tmp18_;
+				gboolean _tmp19_;
 #line 884 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = alt_currently_pressed;
 #line 884 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6555,7 +6555,7 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) {
 					_tmp15_ = TRUE;
 #line 6557 "Page.c"
 				} else {
-					gboolean _tmp17_ = FALSE;
+					gboolean _tmp17_;
 #line 884 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = self->priv->alt_pressed;
 #line 884 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6590,9 +6590,9 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) {
 			default:
 			{
 				gboolean _tmp20_ = FALSE;
-				gboolean _tmp21_ = FALSE;
-				GdkEventKey* _tmp23_ = NULL;
-				gboolean _tmp24_ = FALSE;
+				gboolean _tmp21_;
+				GdkEventKey* _tmp23_;
+				gboolean _tmp24_;
 #line 893 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = shift_currently_pressed;
 #line 893 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6601,7 +6601,7 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) {
 					_tmp20_ = TRUE;
 #line 6603 "Page.c"
 				} else {
-					gboolean _tmp22_ = FALSE;
+					gboolean _tmp22_;
 #line 893 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = self->priv->shift_pressed;
 #line 893 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6636,9 +6636,9 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) {
 			default:
 			{
 				gboolean _tmp25_ = FALSE;
-				gboolean _tmp26_ = FALSE;
-				GdkEventKey* _tmp28_ = NULL;
-				gboolean _tmp29_ = FALSE;
+				gboolean _tmp26_;
+				GdkEventKey* _tmp28_;
+				gboolean _tmp29_;
 #line 902 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = super_currently_pressed;
 #line 902 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6647,7 +6647,7 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) {
 					_tmp25_ = TRUE;
 #line 6649 "Page.c"
 				} else {
-					gboolean _tmp27_ = FALSE;
+					gboolean _tmp27_;
 #line 902 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = self->priv->super_pressed;
 #line 902 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6849,30 +6849,30 @@ static gboolean _page_check_configure_halted_gsource_func (gpointer self) {
 gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 	gboolean result = FALSE;
 	GdkRectangle rect = {0};
-	GdkEventConfigure* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	GdkEventConfigure* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	GdkEventConfigure* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	GdkEventConfigure* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gulong _tmp8_ = 0UL;
+	GdkEventConfigure* _tmp0_;
+	gint _tmp1_;
+	GdkEventConfigure* _tmp2_;
+	gint _tmp3_;
+	GdkEventConfigure* _tmp4_;
+	gint _tmp5_;
+	GdkEventConfigure* _tmp6_;
+	gint _tmp7_;
+	gulong _tmp8_;
 	gboolean _tmp29_ = FALSE;
-	GdkRectangle _tmp30_ = {0};
-	gint _tmp31_ = 0;
-	GdkRectangle _tmp32_ = {0};
-	gint _tmp33_ = 0;
+	GdkRectangle _tmp30_;
+	gint _tmp31_;
+	GdkRectangle _tmp32_;
+	gint _tmp33_;
 	gboolean _tmp39_ = FALSE;
-	GdkRectangle _tmp40_ = {0};
-	gint _tmp41_ = 0;
-	GdkRectangle _tmp42_ = {0};
-	gint _tmp43_ = 0;
-	GdkRectangle _tmp49_ = {0};
-	gulong _tmp50_ = 0UL;
-	GdkEventConfigure* _tmp51_ = NULL;
-	GdkRectangle _tmp52_ = {0};
-	gboolean _tmp53_ = FALSE;
+	GdkRectangle _tmp40_;
+	gint _tmp41_;
+	GdkRectangle _tmp42_;
+	gint _tmp43_;
+	GdkRectangle _tmp49_;
+	gulong _tmp50_;
+	GdkEventConfigure* _tmp51_;
+	GdkRectangle _tmp52_;
+	gboolean _tmp53_;
 #line 945 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
 #line 945 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6909,15 +6909,15 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 	if (_tmp8_ == ((gulong) 0)) {
 #line 6911 "Page.c"
 		gboolean _tmp9_ = FALSE;
-		GdkRectangle _tmp10_ = {0};
-		gint _tmp11_ = 0;
-		GdkRectangle _tmp12_ = {0};
-		gint _tmp13_ = 0;
+		GdkRectangle _tmp10_;
+		gint _tmp11_;
+		GdkRectangle _tmp12_;
+		gint _tmp13_;
 		gboolean _tmp19_ = FALSE;
-		GdkRectangle _tmp20_ = {0};
-		gint _tmp21_ = 0;
-		GdkRectangle _tmp22_ = {0};
-		gint _tmp23_ = 0;
+		GdkRectangle _tmp20_;
+		gint _tmp21_;
+		GdkRectangle _tmp22_;
+		gint _tmp23_;
 #line 954 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->last_position;
 #line 954 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6932,10 +6932,10 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 			_tmp9_ = TRUE;
 #line 6934 "Page.c"
 		} else {
-			GdkRectangle _tmp14_ = {0};
-			gint _tmp15_ = 0;
-			GdkRectangle _tmp16_ = {0};
-			gint _tmp17_ = 0;
+			GdkRectangle _tmp14_;
+			gint _tmp15_;
+			GdkRectangle _tmp16_;
+			gint _tmp17_;
 #line 954 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = self->priv->last_position;
 #line 954 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6951,7 +6951,7 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 #line 954 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp9_) {
 #line 6954 "Page.c"
-			GdkRectangle _tmp18_ = {0};
+			GdkRectangle _tmp18_;
 #line 955 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = rect;
 #line 955 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6974,10 +6974,10 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 			_tmp19_ = TRUE;
 #line 6976 "Page.c"
 		} else {
-			GdkRectangle _tmp24_ = {0};
-			gint _tmp25_ = 0;
-			GdkRectangle _tmp26_ = {0};
-			gint _tmp27_ = 0;
+			GdkRectangle _tmp24_;
+			gint _tmp25_;
+			GdkRectangle _tmp26_;
+			gint _tmp27_;
 #line 959 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = self->priv->last_position;
 #line 959 "/home/jens/Source/shotwell/src/Page.vala"
@@ -6993,7 +6993,7 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 #line 959 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp19_) {
 #line 6996 "Page.c"
-			GdkRectangle _tmp28_ = {0};
+			GdkRectangle _tmp28_;
 #line 960 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = rect;
 #line 960 "/home/jens/Source/shotwell/src/Page.vala"
@@ -7020,10 +7020,10 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 		_tmp29_ = TRUE;
 #line 7022 "Page.c"
 	} else {
-		GdkRectangle _tmp34_ = {0};
-		gint _tmp35_ = 0;
-		GdkRectangle _tmp36_ = {0};
-		gint _tmp37_ = 0;
+		GdkRectangle _tmp34_;
+		gint _tmp35_;
+		GdkRectangle _tmp36_;
+		gint _tmp37_;
 #line 969 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp34_ = self->priv->last_position;
 #line 969 "/home/jens/Source/shotwell/src/Page.vala"
@@ -7039,7 +7039,7 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 #line 969 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_) {
 #line 7042 "Page.c"
-		GdkRectangle _tmp38_ = {0};
+		GdkRectangle _tmp38_;
 #line 970 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp38_ = rect;
 #line 970 "/home/jens/Source/shotwell/src/Page.vala"
@@ -7060,10 +7060,10 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 		_tmp39_ = TRUE;
 #line 7062 "Page.c"
 	} else {
-		GdkRectangle _tmp44_ = {0};
-		gint _tmp45_ = 0;
-		GdkRectangle _tmp46_ = {0};
-		gint _tmp47_ = 0;
+		GdkRectangle _tmp44_;
+		gint _tmp45_;
+		GdkRectangle _tmp46_;
+		gint _tmp47_;
 #line 972 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp44_ = self->priv->last_position;
 #line 972 "/home/jens/Source/shotwell/src/Page.vala"
@@ -7079,7 +7079,7 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 #line 972 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp39_) {
 #line 7082 "Page.c"
-		GdkRectangle _tmp48_ = {0};
+		GdkRectangle _tmp48_;
 #line 973 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = rect;
 #line 973 "/home/jens/Source/shotwell/src/Page.vala"
@@ -7110,13 +7110,13 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 
 static gboolean page_check_configure_halted (Page* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gulong _tmp1_ = 0UL;
-	gulong _tmp2_ = 0UL;
+	gboolean _tmp0_;
+	gulong _tmp1_;
+	gulong _tmp2_;
 	GtkAllocation allocation = {0};
 	GtkAllocation _tmp3_ = {0};
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp7_ = FALSE;
+	gboolean _tmp4_;
+	gboolean _tmp7_;
 #line 981 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
 #line 982 "/home/jens/Source/shotwell/src/Page.vala"
@@ -7150,8 +7150,8 @@ static gboolean page_check_configure_halted (Page* self) {
 #line 991 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
 #line 7153 "Page.c"
-		GtkAllocation _tmp5_ = {0};
-		GdkRectangle _tmp6_ = {0};
+		GtkAllocation _tmp5_;
+		GdkRectangle _tmp6_;
 #line 992 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = allocation;
 #line 992 "/home/jens/Source/shotwell/src/Page.vala"
@@ -7165,8 +7165,8 @@ static gboolean page_check_configure_halted (Page* self) {
 #line 994 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_) {
 #line 7168 "Page.c"
-		GtkAllocation _tmp8_ = {0};
-		GdkRectangle _tmp9_ = {0};
+		GtkAllocation _tmp8_;
+		GdkRectangle _tmp9_;
 #line 995 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = allocation;
 #line 995 "/home/jens/Source/shotwell/src/Page.vala"
@@ -7236,13 +7236,13 @@ static gboolean page_on_motion_internal (Page* self, GdkEventMotion* event) {
 	gint x = 0;
 	gint y = 0;
 	GdkModifierType mask = 0;
-	GdkEventMotion* _tmp0_ = NULL;
-	gint16 _tmp1_ = 0;
-	GdkEventMotion* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	GdkModifierType _tmp14_ = 0;
-	gboolean _tmp15_ = FALSE;
+	GdkEventMotion* _tmp0_;
+	gint16 _tmp1_;
+	GdkEventMotion* _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	GdkModifierType _tmp14_;
+	gboolean _tmp15_;
 #line 1014 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
 #line 1014 "/home/jens/Source/shotwell/src/Page.vala"
@@ -7267,12 +7267,12 @@ static gboolean page_on_motion_internal (Page* self, GdkEventMotion* event) {
 		mask = _tmp4_;
 #line 7269 "Page.c"
 	} else {
-		GdkEventMotion* _tmp5_ = NULL;
-		gdouble _tmp6_ = 0.0;
-		GdkEventMotion* _tmp7_ = NULL;
-		gdouble _tmp8_ = 0.0;
-		GdkEventMotion* _tmp9_ = NULL;
-		GdkModifierType _tmp10_ = 0;
+		GdkEventMotion* _tmp5_;
+		gdouble _tmp6_;
+		GdkEventMotion* _tmp7_;
+		gdouble _tmp8_;
+		GdkEventMotion* _tmp9_;
+		GdkModifierType _tmp10_;
 #line 1020 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = event;
 #line 1020 "/home/jens/Source/shotwell/src/Page.vala"
@@ -7313,8 +7313,8 @@ static gboolean page_on_motion_internal (Page* self, GdkEventMotion* event) {
 
 static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-	GdkEventScroll* _tmp0_ = NULL;
-	GdkScrollDirection _tmp1_ = 0;
+	GdkEventScroll* _tmp0_;
+	GdkScrollDirection _tmp1_;
 #line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
 #line 1028 "/home/jens/Source/shotwell/src/Page.vala"
@@ -7329,8 +7329,8 @@ static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event)
 		case GDK_SCROLL_UP:
 #line 7331 "Page.c"
 		{
-			GdkEventScroll* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GdkEventScroll* _tmp2_;
+			gboolean _tmp3_;
 #line 1031 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = event;
 #line 1031 "/home/jens/Source/shotwell/src/Page.vala"
@@ -7345,8 +7345,8 @@ static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event)
 		case GDK_SCROLL_DOWN:
 #line 7347 "Page.c"
 		{
-			GdkEventScroll* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+			GdkEventScroll* _tmp4_;
+			gboolean _tmp5_;
 #line 1034 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = event;
 #line 1034 "/home/jens/Source/shotwell/src/Page.vala"
@@ -7361,8 +7361,8 @@ static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event)
 		case GDK_SCROLL_LEFT:
 #line 7363 "Page.c"
 		{
-			GdkEventScroll* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GdkEventScroll* _tmp6_;
+			gboolean _tmp7_;
 #line 1037 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = event;
 #line 1037 "/home/jens/Source/shotwell/src/Page.vala"
@@ -7377,8 +7377,8 @@ static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event)
 		case GDK_SCROLL_RIGHT:
 #line 7379 "Page.c"
 		{
-			GdkEventScroll* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			GdkEventScroll* _tmp8_;
+			gboolean _tmp9_;
 #line 1040 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = event;
 #line 1040 "/home/jens/Source/shotwell/src/Page.vala"
@@ -7389,13 +7389,114 @@ static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event)
 			return result;
 #line 7391 "Page.c"
 		}
+#line 1029 "/home/jens/Source/shotwell/src/Page.vala"
+		case GDK_SCROLL_SMOOTH:
+#line 7395 "Page.c"
+		{
+			{
+				gdouble dx = 0.0;
+				gdouble dy = 0.0;
+				GdkEventScroll* _tmp10_;
+				gdouble _tmp11_ = 0.0;
+				gdouble _tmp12_ = 0.0;
+				gdouble _tmp13_;
+#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp10_ = event;
+#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
+				gdk_event_get_scroll_deltas ((GdkEvent*) _tmp10_, &_tmp11_, &_tmp12_);
+#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
+				dx = _tmp11_;
+#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
+				dy = _tmp12_;
+#line 1047 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp13_ = dy;
+#line 1047 "/home/jens/Source/shotwell/src/Page.vala"
+				if (_tmp13_ < ((gdouble) 0)) {
+#line 7416 "Page.c"
+					GdkEventScroll* _tmp14_;
+					gboolean _tmp15_;
+#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp14_ = event;
+#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp15_ = page_on_mousewheel_up (self, _tmp14_);
+#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+					result = _tmp15_;
+#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+					return result;
+#line 7427 "Page.c"
+				} else {
+					gdouble _tmp16_;
+#line 1049 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp16_ = dy;
+#line 1049 "/home/jens/Source/shotwell/src/Page.vala"
+					if (_tmp16_ > ((gdouble) 0)) {
+#line 7434 "Page.c"
+						GdkEventScroll* _tmp17_;
+						gboolean _tmp18_;
+#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
+						_tmp17_ = event;
+#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
+						_tmp18_ = page_on_mousewheel_down (self, _tmp17_);
+#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
+						result = _tmp18_;
+#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
+						return result;
+#line 7445 "Page.c"
+					} else {
+						gdouble _tmp19_;
+#line 1051 "/home/jens/Source/shotwell/src/Page.vala"
+						_tmp19_ = dx;
+#line 1051 "/home/jens/Source/shotwell/src/Page.vala"
+						if (_tmp19_ < ((gdouble) 0)) {
+#line 7452 "Page.c"
+							GdkEventScroll* _tmp20_;
+							gboolean _tmp21_;
+#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+							_tmp20_ = event;
+#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+							_tmp21_ = page_on_mousewheel_left (self, _tmp20_);
+#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+							result = _tmp21_;
+#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+							return result;
+#line 7463 "Page.c"
+						} else {
+							gdouble _tmp22_;
+#line 1053 "/home/jens/Source/shotwell/src/Page.vala"
+							_tmp22_ = dx;
+#line 1053 "/home/jens/Source/shotwell/src/Page.vala"
+							if (_tmp22_ > ((gdouble) 0)) {
+#line 7470 "Page.c"
+								GdkEventScroll* _tmp23_;
+								gboolean _tmp24_;
+#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp23_ = event;
+#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp24_ = page_on_mousewheel_right (self, _tmp23_);
+#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
+								result = _tmp24_;
+#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
+								return result;
+#line 7481 "Page.c"
+							} else {
+#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
+								result = FALSE;
+#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
+								return result;
+#line 7487 "Page.c"
+							}
+						}
+					}
+				}
+			}
+		}
 		default:
 		{
-#line 1043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 1043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7399 "Page.c"
+#line 7500 "Page.c"
 		}
 	}
 }
@@ -7403,910 +7504,910 @@ static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event)
 
 static gboolean page_real_on_mousewheel_up (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7413 "Page.c"
+#line 7514 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_up (Page* self, GdkEventScroll* event) {
-#line 1047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_up (self, event);
-#line 7422 "Page.c"
+#line 7523 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_down (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7434 "Page.c"
+#line 7535 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_down (Page* self, GdkEventScroll* event) {
-#line 1051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_down (self, event);
-#line 7443 "Page.c"
+#line 7544 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_left (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7455 "Page.c"
+#line 7556 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_left (Page* self, GdkEventScroll* event) {
-#line 1055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_left (self, event);
-#line 7464 "Page.c"
+#line 7565 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_right (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7476 "Page.c"
+#line 7577 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_right (Page* self, GdkEventScroll* event) {
-#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_right (self, event);
-#line 7485 "Page.c"
+#line 7586 "Page.c"
 }
 
 
 static gboolean page_real_on_context_keypress (Page* self) {
 	gboolean result = FALSE;
-#line 1064 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1064 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7495 "Page.c"
+#line 7596 "Page.c"
 }
 
 
 gboolean page_on_context_keypress (Page* self) {
-#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_keypress (self);
-#line 7504 "Page.c"
+#line 7605 "Page.c"
 }
 
 
 static gboolean page_real_on_context_buttonpress (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 1067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7516 "Page.c"
+#line 7617 "Page.c"
 }
 
 
 gboolean page_on_context_buttonpress (Page* self, GdkEventButton* event) {
-#line 1067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_buttonpress (self, event);
-#line 7525 "Page.c"
+#line 7626 "Page.c"
 }
 
 
 static gboolean page_real_on_context_invoked (Page* self) {
 	gboolean result = FALSE;
-#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7535 "Page.c"
+#line 7636 "Page.c"
 }
 
 
 gboolean page_on_context_invoked (Page* self) {
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_invoked (self);
-#line 7544 "Page.c"
+#line 7645 "Page.c"
 }
 
 
 gboolean page_popup_context_menu (Page* self, GtkMenu* context_menu, GdkEventButton* event) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	GtkMenu* _tmp1_ = NULL;
-	GdkEventButton* _tmp3_ = NULL;
-#line 1075 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkMenu* _tmp1_;
+	GdkEventButton* _tmp3_;
+#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1075 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail ((context_menu == NULL) || GTK_IS_MENU (context_menu), FALSE);
-#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = context_menu;
-#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ == NULL) {
-#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = TRUE;
-#line 7563 "Page.c"
+#line 7664 "Page.c"
 	} else {
-		gboolean _tmp2_ = FALSE;
-#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
+		gboolean _tmp2_;
+#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = page_on_context_invoked (self);
-#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = !_tmp2_;
-#line 7570 "Page.c"
+#line 7671 "Page.c"
 	}
-#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1096 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1096 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 7578 "Page.c"
+#line 7679 "Page.c"
 	}
-#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = event;
-#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == NULL) {
-#line 7584 "Page.c"
-		GtkMenu* _tmp4_ = NULL;
-		guint32 _tmp5_ = 0U;
-#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 7685 "Page.c"
+		GtkMenu* _tmp4_;
+		guint32 _tmp5_;
+#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = context_menu;
-#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = gtk_get_current_event_time ();
-#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_popup (_tmp4_, NULL, NULL, NULL, NULL, (guint) 0, _tmp5_);
-#line 7593 "Page.c"
+#line 7694 "Page.c"
 	} else {
-		GtkMenu* _tmp6_ = NULL;
-		GdkEventButton* _tmp7_ = NULL;
-		guint _tmp8_ = 0U;
-		GdkEventButton* _tmp9_ = NULL;
-		guint32 _tmp10_ = 0U;
-#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
+		GtkMenu* _tmp6_;
+		GdkEventButton* _tmp7_;
+		guint _tmp8_;
+		GdkEventButton* _tmp9_;
+		guint32 _tmp10_;
+#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = context_menu;
-#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = event;
-#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_->button;
-#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = event;
-#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_->time;
-#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_popup (_tmp6_, NULL, NULL, NULL, NULL, _tmp8_, _tmp10_);
-#line 7612 "Page.c"
+#line 7713 "Page.c"
 	}
-#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7618 "Page.c"
+#line 7719 "Page.c"
 }
 
 
 void page_on_event_source_realize (Page* self) {
-	GtkWidget* _tmp0_ = NULL;
-	GdkWindow* _tmp1_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
-	GdkWindow* _tmp3_ = NULL;
-	GdkCursor* _tmp4_ = NULL;
+	GtkWidget* _tmp0_;
+	GdkWindow* _tmp1_;
+	GtkWidget* _tmp2_;
+	GdkWindow* _tmp3_;
+	GdkCursor* _tmp4_;
 	GdkWindow* parent_window = NULL;
-	GtkWidget* _tmp9_ = NULL;
-	GdkWindow* _tmp10_ = NULL;
-	GdkWindow* _tmp11_ = NULL;
-	GdkWindow* _tmp20_ = NULL;
-#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkWidget* _tmp9_;
+	GdkWindow* _tmp10_;
+	GdkWindow* _tmp11_;
+	GdkWindow* _tmp20_;
+#line 1106 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1090 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1107 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 1090 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1107 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (_tmp0_);
-#line 1090 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1107 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_ != NULL, "event_source.get_window() != null");
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gtk_widget_get_window (_tmp2_);
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_window_get_cursor (_tmp3_);
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
-#line 7649 "Page.c"
-		GtkWidget* _tmp5_ = NULL;
-		GdkWindow* _tmp6_ = NULL;
-		GdkCursor* _tmp7_ = NULL;
-		GdkCursorType _tmp8_ = 0;
-#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 7750 "Page.c"
+		GtkWidget* _tmp5_;
+		GdkWindow* _tmp6_;
+		GdkCursor* _tmp7_;
+		GdkCursorType _tmp8_;
+#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gtk_widget_get_window (_tmp5_);
-#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = gdk_window_get_cursor (_tmp6_);
-#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gdk_cursor_get_cursor_type (_tmp7_);
-#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_cursor = _tmp8_;
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1111 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 7666 "Page.c"
+#line 7767 "Page.c"
 	}
-#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->event_source;
-#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = gtk_widget_get_window (_tmp9_);
-#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
 	parent_window = _tmp11_;
-#line 7676 "Page.c"
+#line 7777 "Page.c"
 	{
 		gboolean _tmp12_ = FALSE;
-#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = TRUE;
-#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 7683 "Page.c"
-			GdkWindow* _tmp17_ = NULL;
-			GdkWindow* _tmp18_ = NULL;
-			GdkWindow* _tmp19_ = NULL;
-#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
+#line 7784 "Page.c"
+			GdkWindow* _tmp17_;
+			GdkWindow* _tmp18_;
+			GdkWindow* _tmp19_;
+#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp12_) {
-#line 7689 "Page.c"
+#line 7790 "Page.c"
 				gboolean _tmp13_ = FALSE;
-				GdkWindow* _tmp14_ = NULL;
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+				GdkWindow* _tmp14_;
+#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = parent_window;
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp14_ != NULL) {
-#line 7696 "Page.c"
-					GdkWindow* _tmp15_ = NULL;
-					GdkCursor* _tmp16_ = NULL;
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 7797 "Page.c"
+					GdkWindow* _tmp15_;
+					GdkCursor* _tmp16_;
+#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = parent_window;
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp16_ = gdk_window_get_cursor (_tmp15_);
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = _tmp16_ == NULL;
-#line 7705 "Page.c"
+#line 7806 "Page.c"
 				} else {
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = FALSE;
-#line 7709 "Page.c"
+#line 7810 "Page.c"
 				}
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp13_) {
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 7715 "Page.c"
+#line 7816 "Page.c"
 				}
 			}
-#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = FALSE;
-#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = parent_window;
-#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = gdk_window_get_parent (_tmp17_);
-#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (parent_window);
-#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
 			parent_window = _tmp19_;
-#line 7730 "Page.c"
+#line 7831 "Page.c"
 		}
 	}
-#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = parent_window;
-#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp20_ != NULL) {
-#line 7737 "Page.c"
-		GdkWindow* _tmp21_ = NULL;
-		GdkCursor* _tmp22_ = NULL;
-		GdkCursorType _tmp23_ = 0;
-#line 1104 "/home/jens/Source/shotwell/src/Page.vala"
+#line 7838 "Page.c"
+		GdkWindow* _tmp21_;
+		GdkCursor* _tmp22_;
+		GdkCursorType _tmp23_;
+#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = parent_window;
-#line 1104 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = gdk_window_get_cursor (_tmp21_);
-#line 1104 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = gdk_cursor_get_cursor_type (_tmp22_);
-#line 1104 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_cursor = _tmp23_;
-#line 7749 "Page.c"
+#line 7850 "Page.c"
 	}
-#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1106 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (parent_window);
-#line 7753 "Page.c"
+#line 7854 "Page.c"
 }
 
 
 void page_set_cursor_hide_time (Page* self, gint hide_time) {
-	gint _tmp0_ = 0;
-#line 1107 "/home/jens/Source/shotwell/src/Page.vala"
+	gint _tmp0_;
+#line 1124 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1108 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1125 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = hide_time;
-#line 1108 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1125 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = _tmp0_;
-#line 7765 "Page.c"
+#line 7866 "Page.c"
 }
 
 
 void page_start_cursor_hiding (Page* self) {
-#line 1111 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1128 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1112 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 7774 "Page.c"
+#line 7875 "Page.c"
 }
 
 
 void page_stop_cursor_hiding (Page* self) {
-	guint _tmp0_ = 0U;
-#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
+	guint _tmp0_;
+#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->last_timeout_id;
-#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != ((guint) 0)) {
-#line 7786 "Page.c"
-		guint _tmp1_ = 0U;
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 7887 "Page.c"
+		guint _tmp1_;
+#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->last_timeout_id;
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
 		g_source_remove (_tmp1_);
-#line 7792 "Page.c"
+#line 7893 "Page.c"
 	}
 }
 
 
 void page_suspend_cursor_hiding (Page* self) {
-	gint _tmp0_ = 0;
-	guint _tmp1_ = 0U;
-#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
+	gint _tmp0_;
+	guint _tmp1_;
+#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hide_msec;
-#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_time_cached = _tmp0_;
-#line 1123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->last_timeout_id;
-#line 1123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != ((guint) 0)) {
-#line 7810 "Page.c"
-		guint _tmp2_ = 0U;
-#line 1124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 7911 "Page.c"
+		guint _tmp2_;
+#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->last_timeout_id;
-#line 1124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
 		g_source_remove (_tmp2_);
-#line 7816 "Page.c"
+#line 7917 "Page.c"
 	}
-#line 1126 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = 0;
-#line 7820 "Page.c"
+#line 7921 "Page.c"
 }
 
 
 void page_restore_cursor_hiding (Page* self) {
-	gint _tmp0_ = 0;
-#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
+	gint _tmp0_;
+#line 1146 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hide_time_cached;
-#line 1130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = _tmp0_;
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1148 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 7834 "Page.c"
+#line 7935 "Page.c"
 }
 
 
 static void page_real_set_page_cursor (Page* self, GdkCursorType cursor_type) {
-	GdkCursorType _tmp0_ = 0;
+	GdkCursorType _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 1136 "/home/jens/Source/shotwell/src/Page.vala"
+	gboolean _tmp2_;
+#line 1153 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = cursor_type;
-#line 1136 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1153 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_cursor = _tmp0_;
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->cursor_hidden;
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp2_) {
-#line 7850 "Page.c"
-		GtkWidget* _tmp3_ = NULL;
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 7951 "Page.c"
+		GtkWidget* _tmp3_;
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->event_source;
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 7856 "Page.c"
+#line 7957 "Page.c"
 	} else {
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = FALSE;
-#line 7860 "Page.c"
+#line 7961 "Page.c"
 	}
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 7864 "Page.c"
+#line 7965 "Page.c"
 		GdkDisplay* display = NULL;
-		GtkWidget* _tmp4_ = NULL;
-		GdkWindow* _tmp5_ = NULL;
-		GdkDisplay* _tmp6_ = NULL;
-		GdkDisplay* _tmp7_ = NULL;
-		GtkWidget* _tmp8_ = NULL;
-		GdkWindow* _tmp9_ = NULL;
-		GdkDisplay* _tmp10_ = NULL;
-		GdkCursorType _tmp11_ = 0;
-		GdkCursor* _tmp12_ = NULL;
-		GdkCursor* _tmp13_ = NULL;
-#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
+		GtkWidget* _tmp4_;
+		GdkWindow* _tmp5_;
+		GdkDisplay* _tmp6_;
+		GdkDisplay* _tmp7_;
+		GtkWidget* _tmp8_;
+		GdkWindow* _tmp9_;
+		GdkDisplay* _tmp10_;
+		GdkCursorType _tmp11_;
+		GdkCursor* _tmp12_;
+		GdkCursor* _tmp13_;
+#line 1156 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = self->priv->event_source;
-#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1156 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = gtk_widget_get_window (_tmp4_);
-#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1156 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gdk_window_get_display (_tmp5_);
-#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1156 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1156 "/home/jens/Source/shotwell/src/Page.vala"
 		display = _tmp7_;
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->priv->event_source;
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = gtk_widget_get_window (_tmp8_);
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = display;
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = cursor_type;
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = gdk_cursor_new_for_display (_tmp10_, _tmp11_);
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_;
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_set_cursor (_tmp9_, _tmp13_);
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp13_);
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (display);
-#line 7904 "Page.c"
+#line 8005 "Page.c"
 	}
 }
 
 
 void page_set_page_cursor (Page* self, GdkCursorType cursor_type) {
-#line 1135 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1135 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->set_page_cursor (self, cursor_type);
-#line 7914 "Page.c"
+#line 8015 "Page.c"
 }
 
 
 static gboolean _page_on_hide_cursor_gsource_func (gpointer self) {
 	gboolean result;
 	result = page_on_hide_cursor ((Page*) self);
-#line 1153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7923 "Page.c"
+#line 8024 "Page.c"
 }
 
 
 static void page_check_cursor_hiding (Page* self) {
-	gboolean _tmp0_ = FALSE;
-	gint _tmp2_ = 0;
-#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
+	gboolean _tmp0_;
+	gint _tmp2_;
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hidden;
-#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 7936 "Page.c"
-		GdkCursorType _tmp1_ = 0;
-#line 1146 "/home/jens/Source/shotwell/src/Page.vala"
+#line 8037 "Page.c"
+		GdkCursorType _tmp1_;
+#line 1163 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->cursor_hidden = FALSE;
-#line 1147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->last_cursor;
-#line 1147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
 		page_set_page_cursor (self, _tmp1_);
-#line 7944 "Page.c"
+#line 8045 "Page.c"
 	}
-#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->cursor_hide_msec;
-#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != 0) {
-#line 7950 "Page.c"
-		guint _tmp3_ = 0U;
-		gint _tmp5_ = 0;
-		guint _tmp6_ = 0U;
-#line 1151 "/home/jens/Source/shotwell/src/Page.vala"
+#line 8051 "Page.c"
+		guint _tmp3_;
+		gint _tmp5_;
+		guint _tmp6_;
+#line 1168 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->last_timeout_id;
-#line 1151 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1168 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp3_ != ((guint) 0)) {
-#line 7958 "Page.c"
-			guint _tmp4_ = 0U;
-#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 8059 "Page.c"
+			guint _tmp4_;
+#line 1169 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = self->priv->last_timeout_id;
-#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Page.vala"
 			g_source_remove (_tmp4_);
-#line 7964 "Page.c"
+#line 8065 "Page.c"
 		}
-#line 1153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->cursor_hide_msec;
-#line 1153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp5_, _page_on_hide_cursor_gsource_func, g_object_ref (self), g_object_unref);
-#line 1153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_timeout_id = _tmp6_;
-#line 7972 "Page.c"
+#line 8073 "Page.c"
 	}
 }
 
 
 static gboolean page_on_hide_cursor (Page* self) {
 	gboolean result = FALSE;
-	GtkWidget* _tmp0_ = NULL;
-#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkWidget* _tmp0_;
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hidden = TRUE;
-#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 7988 "Page.c"
+#line 8089 "Page.c"
 		GdkDisplay* display = NULL;
-		GtkWidget* _tmp1_ = NULL;
-		GdkWindow* _tmp2_ = NULL;
-		GdkDisplay* _tmp3_ = NULL;
-		GdkDisplay* _tmp4_ = NULL;
-		GtkWidget* _tmp5_ = NULL;
-		GdkWindow* _tmp6_ = NULL;
-		GdkDisplay* _tmp7_ = NULL;
-		GdkCursor* _tmp8_ = NULL;
-		GdkCursor* _tmp9_ = NULL;
-#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
+		GtkWidget* _tmp1_;
+		GdkWindow* _tmp2_;
+		GdkDisplay* _tmp3_;
+		GdkDisplay* _tmp4_;
+		GtkWidget* _tmp5_;
+		GdkWindow* _tmp6_;
+		GdkDisplay* _tmp7_;
+		GdkCursor* _tmp8_;
+		GdkCursor* _tmp9_;
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->event_source;
-#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = gtk_widget_get_window (_tmp1_);
-#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gdk_window_get_display (_tmp2_);
-#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 		display = _tmp4_;
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gtk_widget_get_window (_tmp5_);
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = display;
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gdk_cursor_new_for_display (_tmp7_, GDK_BLANK_CURSOR);
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_set_cursor (_tmp6_, _tmp9_);
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp9_);
-#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (display);
-#line 8025 "Page.c"
+#line 8126 "Page.c"
 	}
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_timeout_id = (guint) 0;
-#line 1168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8033 "Page.c"
+#line 8134 "Page.c"
 }
 
 
 void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_label) {
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
+	AppWindow* _tmp0_;
+	AppWindow* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (id != NULL);
-#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (new_label != NULL);
-#line 1173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 1173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = id;
-#line 1173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = new_label;
-#line 1173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
 	app_window_update_menu_item_label (_tmp1_, _tmp2_, _tmp3_);
-#line 1173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 8060 "Page.c"
+#line 8161 "Page.c"
 }
 
 
 GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gchar* extension_point) {
 	GMenuModel* result = NULL;
 	gint items = 0;
-	GMenuModel* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	GMenuModel* _tmp0_;
+	gint _tmp1_;
 	GMenuModel* section = NULL;
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (G_IS_MENU_MODEL (model), NULL);
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (extension_point != NULL, NULL);
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = model;
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_menu_model_get_n_items (_tmp0_);
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
 	items = _tmp1_;
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1196 "/home/jens/Source/shotwell/src/Page.vala"
 	section = NULL;
-#line 8084 "Page.c"
+#line 8185 "Page.c"
 	{
 		gint i = 0;
-#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 		i = 0;
-#line 8089 "Page.c"
+#line 8190 "Page.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = TRUE;
-#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 			while (TRUE) {
-#line 8096 "Page.c"
+#line 8197 "Page.c"
 				gboolean _tmp4_ = FALSE;
-				gint _tmp5_ = 0;
-				gint _tmp6_ = 0;
+				gint _tmp5_;
+				gint _tmp6_;
 				gchar* name = NULL;
-				GMenuModel* _tmp8_ = NULL;
-				gint _tmp9_ = 0;
-				const gchar* _tmp10_ = NULL;
-				const gchar* _tmp11_ = NULL;
-#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
+				GMenuModel* _tmp8_;
+				gint _tmp9_;
+				const gchar* _tmp10_;
+				const gchar* _tmp11_;
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp2_) {
-#line 8107 "Page.c"
-					gint _tmp3_ = 0;
-#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 8208 "Page.c"
+					gint _tmp3_;
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp3_ = i;
-#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 					i = _tmp3_ + 1;
-#line 8113 "Page.c"
+#line 8214 "Page.c"
 				}
-#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp2_ = FALSE;
-#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp5_ = i;
-#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp6_ = items;
-#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp5_ < _tmp6_) {
-#line 8123 "Page.c"
-					GMenuModel* _tmp7_ = NULL;
-#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 8224 "Page.c"
+					GMenuModel* _tmp7_;
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp7_ = section;
-#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp4_ = _tmp7_ == NULL;
-#line 8129 "Page.c"
+#line 8230 "Page.c"
 				} else {
-#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp4_ = FALSE;
-#line 8133 "Page.c"
+#line 8234 "Page.c"
 				}
-#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp4_) {
-#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 8139 "Page.c"
+#line 8240 "Page.c"
 				}
-#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 				name = NULL;
-#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp8_ = model;
-#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = i;
-#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
 				g_menu_model_get_item_attribute (_tmp8_, _tmp9_, "id", "s", &name, NULL);
-#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1201 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = name;
-#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1201 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = extension_point;
-#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1201 "/home/jens/Source/shotwell/src/Page.vala"
 				if (g_strcmp0 (_tmp10_, _tmp11_) == 0) {
-#line 8155 "Page.c"
-					GMenuModel* _tmp12_ = NULL;
-					gint _tmp13_ = 0;
-					GMenuModel* _tmp14_ = NULL;
-#line 1185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 8256 "Page.c"
+					GMenuModel* _tmp12_;
+					gint _tmp13_;
+					GMenuModel* _tmp14_;
+#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = model;
-#line 1185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = i;
-#line 1185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp14_ = g_menu_model_get_item_link (_tmp12_, _tmp13_, G_MENU_LINK_SECTION);
-#line 1185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (section);
-#line 1185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
 					section = _tmp14_;
-#line 8169 "Page.c"
+#line 8270 "Page.c"
 				} else {
 					GMenuModel* subsection = NULL;
-					GMenuModel* _tmp15_ = NULL;
-					gint _tmp16_ = 0;
-					GMenuModel* _tmp17_ = NULL;
-					GMenuModel* _tmp18_ = NULL;
+					GMenuModel* _tmp15_;
+					gint _tmp16_;
+					GMenuModel* _tmp17_;
+					GMenuModel* _tmp18_;
 					gint sub_items = 0;
-					GMenuModel* _tmp19_ = NULL;
-					gint _tmp20_ = 0;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+					GMenuModel* _tmp19_;
+					gint _tmp20_;
+#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = model;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp16_ = i;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = g_menu_model_get_item_link (_tmp15_, _tmp16_, G_MENU_LINK_SECTION);
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
 					subsection = _tmp17_;
-#line 1189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1206 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp18_ = subsection;
-#line 1189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1206 "/home/jens/Source/shotwell/src/Page.vala"
 					if (_tmp18_ == NULL) {
-#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1207 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (subsection);
-#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1207 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_free0 (name);
-#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1207 "/home/jens/Source/shotwell/src/Page.vala"
 						continue;
-#line 8197 "Page.c"
+#line 8298 "Page.c"
 					}
-#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp19_ = subsection;
-#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = g_menu_model_get_n_items (_tmp19_);
-#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
 					sub_items = _tmp20_;
-#line 8205 "Page.c"
+#line 8306 "Page.c"
 					{
 						gint j = 0;
-#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 						j = 0;
-#line 8210 "Page.c"
+#line 8311 "Page.c"
 						{
 							gboolean _tmp21_ = FALSE;
-#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 							_tmp21_ = TRUE;
-#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 							while (TRUE) {
-#line 8217 "Page.c"
+#line 8318 "Page.c"
 								gboolean _tmp23_ = FALSE;
-								gint _tmp24_ = 0;
-								gint _tmp25_ = 0;
+								gint _tmp24_;
+								gint _tmp25_;
 								GMenuModel* submenu = NULL;
-								GMenuModel* _tmp27_ = NULL;
-								gint _tmp28_ = 0;
-								GMenuModel* _tmp29_ = NULL;
-								GMenuModel* _tmp30_ = NULL;
-#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
+								GMenuModel* _tmp27_;
+								gint _tmp28_;
+								GMenuModel* _tmp29_;
+								GMenuModel* _tmp30_;
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 								if (!_tmp21_) {
-#line 8228 "Page.c"
-									gint _tmp22_ = 0;
-#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 8329 "Page.c"
+									gint _tmp22_;
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp22_ = j;
-#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 									j = _tmp22_ + 1;
-#line 8234 "Page.c"
+#line 8335 "Page.c"
 								}
-#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp21_ = FALSE;
-#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp24_ = j;
-#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp25_ = sub_items;
-#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 								if (_tmp24_ < _tmp25_) {
-#line 8244 "Page.c"
-									GMenuModel* _tmp26_ = NULL;
-#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 8345 "Page.c"
+									GMenuModel* _tmp26_;
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp26_ = section;
-#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp23_ = _tmp26_ == NULL;
-#line 8250 "Page.c"
+#line 8351 "Page.c"
 								} else {
-#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp23_ = FALSE;
-#line 8254 "Page.c"
+#line 8355 "Page.c"
 								}
-#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 								if (!_tmp23_) {
-#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 									break;
-#line 8260 "Page.c"
+#line 8361 "Page.c"
 								}
-#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp27_ = subsection;
-#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp28_ = j;
-#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp29_ = g_menu_model_get_item_link (_tmp27_, _tmp28_, G_MENU_LINK_SUBMENU);
-#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
 								submenu = _tmp29_;
-#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp30_ = submenu;
-#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
 								if (_tmp30_ != NULL) {
-#line 8274 "Page.c"
-									GMenuModel* _tmp31_ = NULL;
-									const gchar* _tmp32_ = NULL;
-									GMenuModel* _tmp33_ = NULL;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 8375 "Page.c"
+									GMenuModel* _tmp31_;
+									const gchar* _tmp32_;
+									GMenuModel* _tmp33_;
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp31_ = submenu;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp32_ = extension_point;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp33_ = page_find_extension_point (self, _tmp31_, _tmp32_);
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 									_g_object_unref0 (section);
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 									section = _tmp33_;
-#line 8288 "Page.c"
+#line 8389 "Page.c"
 								}
-#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 								_g_object_unref0 (submenu);
-#line 8292 "Page.c"
+#line 8393 "Page.c"
 							}
 						}
 					}
-#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1201 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (subsection);
-#line 8298 "Page.c"
+#line 8399 "Page.c"
 				}
-#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (name);
-#line 8302 "Page.c"
+#line 8403 "Page.c"
 			}
 		}
 	}
-#line 1205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Page.vala"
 	result = section;
-#line 1205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8310 "Page.c"
+#line 8411 "Page.c"
 }
 
 
@@ -8316,115 +8417,115 @@ static void page_class_init (PageClass * klass) {
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (PagePrivate));
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((GtkWidgetClass *) klass)->destroy = (void (*)(GtkWidget*)) page_real_destroy;
+	((GtkWidgetClass *) klass)->destroy = (void (*) (GtkWidget *)) page_real_destroy;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->set_page_name = (void (*)(Page*, const gchar*)) page_real_set_page_name;
+	((PageClass *) klass)->set_page_name = (void (*) (Page *, const gchar*)) page_real_set_page_name;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->set_container = (void (*)(Page*, GtkWindow*)) page_real_set_container;
+	((PageClass *) klass)->set_container = (void (*) (Page *, GtkWindow*)) page_real_set_container;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->clear_container = (void (*)(Page*)) page_real_clear_container;
+	((PageClass *) klass)->clear_container = (void (*) (Page *)) page_real_clear_container;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->get_toolbar = (GtkToolbar* (*)(Page*)) page_real_get_toolbar;
+	((PageClass *) klass)->get_toolbar = (GtkToolbar* (*) (Page *)) page_real_get_toolbar;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->get_page_context_menu = (GtkMenu* (*)(Page*)) page_real_get_page_context_menu;
+	((PageClass *) klass)->get_page_context_menu = (GtkMenu* (*) (Page *)) page_real_get_page_context_menu;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->switching_from = (void (*)(Page*)) page_real_switching_from;
+	((PageClass *) klass)->switching_from = (void (*) (Page *)) page_real_switching_from;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->switched_to = (void (*)(Page*)) page_real_switched_to;
+	((PageClass *) klass)->switched_to = (void (*) (Page *)) page_real_switched_to;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->ready = (void (*)(Page*)) page_real_ready;
+	((PageClass *) klass)->ready = (void (*) (Page *)) page_real_ready;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->switching_to_fullscreen = (void (*)(Page*, FullscreenWindow*)) page_real_switching_to_fullscreen;
+	((PageClass *) klass)->switching_to_fullscreen = (void (*) (Page *, FullscreenWindow*)) page_real_switching_to_fullscreen;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->returning_from_fullscreen = (void (*)(Page*, FullscreenWindow*)) page_real_returning_from_fullscreen;
+	((PageClass *) klass)->returning_from_fullscreen = (void (*) (Page *, FullscreenWindow*)) page_real_returning_from_fullscreen;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) page_real_add_actions;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) page_real_remove_actions;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) page_real_init_collect_ui_filenames;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->init_collect_injection_groups = (InjectionGroup** (*)(Page*, int*)) page_real_init_collect_injection_groups;
+	((PageClass *) klass)->init_collect_injection_groups = (InjectionGroup** (*) (Page *, int*)) page_real_init_collect_injection_groups;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->init_actions = (void (*)(Page*, gint, gint)) page_real_init_actions;
+	((PageClass *) klass)->init_actions = (void (*) (Page *, gint, gint)) page_real_init_actions;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) page_real_update_actions;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->source_drag_failed = (gboolean (*)(Page*, GdkDragContext*, GtkDragResult)) page_real_source_drag_failed;
+	((PageClass *) klass)->source_drag_failed = (gboolean (*) (Page *, GdkDragContext*, GtkDragResult)) page_real_source_drag_failed;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_left_click = (gboolean (*)(Page*, GdkEventButton*)) page_real_on_left_click;
+	((PageClass *) klass)->on_left_click = (gboolean (*) (Page *, GdkEventButton*)) page_real_on_left_click;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_middle_click = (gboolean (*)(Page*, GdkEventButton*)) page_real_on_middle_click;
+	((PageClass *) klass)->on_middle_click = (gboolean (*) (Page *, GdkEventButton*)) page_real_on_middle_click;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_right_click = (gboolean (*)(Page*, GdkEventButton*)) page_real_on_right_click;
+	((PageClass *) klass)->on_right_click = (gboolean (*) (Page *, GdkEventButton*)) page_real_on_right_click;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_left_released = (gboolean (*)(Page*, GdkEventButton*)) page_real_on_left_released;
+	((PageClass *) klass)->on_left_released = (gboolean (*) (Page *, GdkEventButton*)) page_real_on_left_released;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_middle_released = (gboolean (*)(Page*, GdkEventButton*)) page_real_on_middle_released;
+	((PageClass *) klass)->on_middle_released = (gboolean (*) (Page *, GdkEventButton*)) page_real_on_middle_released;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_right_released = (gboolean (*)(Page*, GdkEventButton*)) page_real_on_right_released;
+	((PageClass *) klass)->on_right_released = (gboolean (*) (Page *, GdkEventButton*)) page_real_on_right_released;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_ctrl_pressed = (gboolean (*)(Page*, GdkEventKey*)) page_real_on_ctrl_pressed;
+	((PageClass *) klass)->on_ctrl_pressed = (gboolean (*) (Page *, GdkEventKey*)) page_real_on_ctrl_pressed;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_ctrl_released = (gboolean (*)(Page*, GdkEventKey*)) page_real_on_ctrl_released;
+	((PageClass *) klass)->on_ctrl_released = (gboolean (*) (Page *, GdkEventKey*)) page_real_on_ctrl_released;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_alt_pressed = (gboolean (*)(Page*, GdkEventKey*)) page_real_on_alt_pressed;
+	((PageClass *) klass)->on_alt_pressed = (gboolean (*) (Page *, GdkEventKey*)) page_real_on_alt_pressed;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_alt_released = (gboolean (*)(Page*, GdkEventKey*)) page_real_on_alt_released;
+	((PageClass *) klass)->on_alt_released = (gboolean (*) (Page *, GdkEventKey*)) page_real_on_alt_released;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_shift_pressed = (gboolean (*)(Page*, GdkEventKey*)) page_real_on_shift_pressed;
+	((PageClass *) klass)->on_shift_pressed = (gboolean (*) (Page *, GdkEventKey*)) page_real_on_shift_pressed;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_shift_released = (gboolean (*)(Page*, GdkEventKey*)) page_real_on_shift_released;
+	((PageClass *) klass)->on_shift_released = (gboolean (*) (Page *, GdkEventKey*)) page_real_on_shift_released;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_super_pressed = (gboolean (*)(Page*, GdkEventKey*)) page_real_on_super_pressed;
+	((PageClass *) klass)->on_super_pressed = (gboolean (*) (Page *, GdkEventKey*)) page_real_on_super_pressed;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_super_released = (gboolean (*)(Page*, GdkEventKey*)) page_real_on_super_released;
+	((PageClass *) klass)->on_super_released = (gboolean (*) (Page *, GdkEventKey*)) page_real_on_super_released;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_app_key_pressed = (gboolean (*)(Page*, GdkEventKey*)) page_real_on_app_key_pressed;
+	((PageClass *) klass)->on_app_key_pressed = (gboolean (*) (Page *, GdkEventKey*)) page_real_on_app_key_pressed;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_app_key_released = (gboolean (*)(Page*, GdkEventKey*)) page_real_on_app_key_released;
+	((PageClass *) klass)->on_app_key_released = (gboolean (*) (Page *, GdkEventKey*)) page_real_on_app_key_released;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_move = (void (*)(Page*, GdkRectangle*)) page_real_on_move;
+	((PageClass *) klass)->on_move = (void (*) (Page *, GdkRectangle*)) page_real_on_move;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_move_start = (void (*)(Page*, GdkRectangle*)) page_real_on_move_start;
+	((PageClass *) klass)->on_move_start = (void (*) (Page *, GdkRectangle*)) page_real_on_move_start;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_move_finished = (void (*)(Page*, GdkRectangle*)) page_real_on_move_finished;
+	((PageClass *) klass)->on_move_finished = (void (*) (Page *, GdkRectangle*)) page_real_on_move_finished;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_resize = (void (*)(Page*, GdkRectangle*)) page_real_on_resize;
+	((PageClass *) klass)->on_resize = (void (*) (Page *, GdkRectangle*)) page_real_on_resize;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_resize_start = (void (*)(Page*, GdkRectangle*)) page_real_on_resize_start;
+	((PageClass *) klass)->on_resize_start = (void (*) (Page *, GdkRectangle*)) page_real_on_resize_start;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_resize_finished = (void (*)(Page*, GdkRectangle*)) page_real_on_resize_finished;
+	((PageClass *) klass)->on_resize_finished = (void (*) (Page *, GdkRectangle*)) page_real_on_resize_finished;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_configure = (gboolean (*)(Page*, GdkEventConfigure*, GdkRectangle*)) page_real_on_configure;
+	((PageClass *) klass)->on_configure = (gboolean (*) (Page *, GdkEventConfigure*, GdkRectangle*)) page_real_on_configure;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_motion = (gboolean (*)(Page*, GdkEventMotion*, gint, gint, GdkModifierType)) page_real_on_motion;
+	((PageClass *) klass)->on_motion = (gboolean (*) (Page *, GdkEventMotion*, gint, gint, GdkModifierType)) page_real_on_motion;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_leave_notify_event = (gboolean (*)(Page*)) page_real_on_leave_notify_event;
+	((PageClass *) klass)->on_leave_notify_event = (gboolean (*) (Page *)) page_real_on_leave_notify_event;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_mousewheel_up = (gboolean (*)(Page*, GdkEventScroll*)) page_real_on_mousewheel_up;
+	((PageClass *) klass)->on_mousewheel_up = (gboolean (*) (Page *, GdkEventScroll*)) page_real_on_mousewheel_up;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_mousewheel_down = (gboolean (*)(Page*, GdkEventScroll*)) page_real_on_mousewheel_down;
+	((PageClass *) klass)->on_mousewheel_down = (gboolean (*) (Page *, GdkEventScroll*)) page_real_on_mousewheel_down;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_mousewheel_left = (gboolean (*)(Page*, GdkEventScroll*)) page_real_on_mousewheel_left;
+	((PageClass *) klass)->on_mousewheel_left = (gboolean (*) (Page *, GdkEventScroll*)) page_real_on_mousewheel_left;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_mousewheel_right = (gboolean (*)(Page*, GdkEventScroll*)) page_real_on_mousewheel_right;
+	((PageClass *) klass)->on_mousewheel_right = (gboolean (*) (Page *, GdkEventScroll*)) page_real_on_mousewheel_right;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_context_keypress = (gboolean (*)(Page*)) page_real_on_context_keypress;
+	((PageClass *) klass)->on_context_keypress = (gboolean (*) (Page *)) page_real_on_context_keypress;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_context_buttonpress = (gboolean (*)(Page*, GdkEventButton*)) page_real_on_context_buttonpress;
+	((PageClass *) klass)->on_context_buttonpress = (gboolean (*) (Page *, GdkEventButton*)) page_real_on_context_buttonpress;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_context_invoked = (gboolean (*)(Page*)) page_real_on_context_invoked;
+	((PageClass *) klass)->on_context_invoked = (gboolean (*) (Page *)) page_real_on_context_invoked;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->set_page_cursor = (void (*)(Page*, GdkCursorType)) page_real_set_page_cursor;
+	((PageClass *) klass)->set_page_cursor = (void (*) (Page *, GdkCursorType)) page_real_set_page_cursor;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_finalize;
-#line 8423 "Page.c"
+#line 8524 "Page.c"
 }
 
 
 static void page_instance_init (Page * self) {
-	GtkBuilder* _tmp0_ = NULL;
+	GtkBuilder* _tmp0_;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = PAGE_GET_PRIVATE (self);
 #line 61 "/home/jens/Source/shotwell/src/Page.vala"
@@ -8477,11 +8578,11 @@ static void page_instance_init (Page * self) {
 	self->priv->update_actions_scheduler = NULL;
 #line 205 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->menubar_injected = FALSE;
-#line 8481 "Page.c"
+#line 8582 "Page.c"
 }
 
 
-static void page_finalize (GObject* obj) {
+static void page_finalize (GObject * obj) {
 	Page * self;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE, Page);
@@ -8503,7 +8604,7 @@ static void page_finalize (GObject* obj) {
 	_one_shot_scheduler_unref0 (self->priv->update_actions_scheduler);
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (page_parent_class)->finalize (obj);
-#line 8507 "Page.c"
+#line 8608 "Page.c"
 }
 
 
@@ -8532,1115 +8633,1120 @@ GType checkerboard_page_activator_get_type (void) {
 
 
 static void _checkerboard_page_on_items_hidden_view_collection_items_hidden (ViewCollection* _sender, GeeCollection* hidden, gpointer self) {
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_hidden ((CheckerboardPage*) self, hidden);
-#line 8538 "Page.c"
+#line 8639 "Page.c"
 }
 
 
 static void _checkerboard_page_on_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_contents_altered ((CheckerboardPage*) self, added, removed);
-#line 8545 "Page.c"
+#line 8646 "Page.c"
 }
 
 
 static void _checkerboard_page_on_items_state_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_state_changed ((CheckerboardPage*) self, changed);
-#line 8552 "Page.c"
+#line 8653 "Page.c"
 }
 
 
 static void _checkerboard_page_on_items_visibility_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_visibility_changed ((CheckerboardPage*) self, changed);
-#line 8559 "Page.c"
+#line 8660 "Page.c"
 }
 
 
 CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name) {
 	CheckerboardPage * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	CheckerboardLayout* _tmp3_ = NULL;
-	CheckerboardLayout* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	CheckerboardLayout* _tmp6_ = NULL;
-	GtkViewport* _tmp7_ = NULL;
-	GtkViewport* _tmp8_ = NULL;
-	GtkViewport* _tmp9_ = NULL;
-	CheckerboardLayout* _tmp10_ = NULL;
-	CheckerboardLayout* _tmp11_ = NULL;
-	GtkAdjustment* _tmp12_ = NULL;
-	GtkAdjustment* _tmp13_ = NULL;
-	GtkViewport* _tmp14_ = NULL;
-	ViewCollection* _tmp15_ = NULL;
-	ViewCollection* _tmp16_ = NULL;
-	ViewCollection* _tmp17_ = NULL;
-	ViewCollection* _tmp18_ = NULL;
-	ViewCollection* _tmp19_ = NULL;
-	ViewCollection* _tmp20_ = NULL;
-	ViewCollection* _tmp21_ = NULL;
-	ViewCollection* _tmp22_ = NULL;
-#line 1244 "/home/jens/Source/shotwell/src/Page.vala"
+	const gchar* _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	CheckerboardLayout* _tmp3_;
+	CheckerboardLayout* _tmp4_;
+	const gchar* _tmp5_;
+	CheckerboardLayout* _tmp6_;
+	GtkViewport* _tmp7_;
+	GtkViewport* _tmp8_;
+	GtkViewport* _tmp9_;
+	CheckerboardLayout* _tmp10_;
+	CheckerboardLayout* _tmp11_;
+	GtkAdjustment* _tmp12_;
+	GtkAdjustment* _tmp13_;
+	GtkViewport* _tmp14_;
+	ViewCollection* _tmp15_;
+	ViewCollection* _tmp16_;
+	ViewCollection* _tmp17_;
+	ViewCollection* _tmp18_;
+	ViewCollection* _tmp19_;
+	ViewCollection* _tmp20_;
+	ViewCollection* _tmp21_;
+	ViewCollection* _tmp22_;
+#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
-#line 1245 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 1245 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (CheckerboardPage*) page_construct (object_type, _tmp0_);
-#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_new (_tmp2_);
-#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->layout);
-#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->layout = _tmp3_;
-#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1265 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->layout;
-#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1265 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_name;
-#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1265 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_name (_tmp4_, _tmp5_);
-#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->layout;
-#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	page_set_event_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), (guint) 0);
-#line 1253 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_scrolled_window_set_shadow_type (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_SHADOW_NONE);
-#line 1255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->viewport;
-#line 1255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_container_get_type (), GtkContainer), (guint) 0);
-#line 1256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->viewport;
-#line 1256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_viewport_set_shadow_type (_tmp8_, GTK_SHADOW_NONE);
-#line 1258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->viewport;
-#line 1258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->layout;
-#line 1258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->layout;
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = gtk_scrolled_window_get_hadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_adjustments (_tmp11_, _tmp12_, _tmp13_);
-#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->viewport;
-#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_;
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp16_, "items-hidden", (GCallback) _checkerboard_page_on_items_hidden_view_collection_items_hidden, self, 0);
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp16_);
-#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _checkerboard_page_on_contents_altered_data_collection_contents_altered, self, 0);
-#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp18_);
-#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_;
-#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp20_, "items-state-changed", (GCallback) _checkerboard_page_on_items_state_changed_view_collection_items_state_changed, self, 0);
-#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp20_);
-#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = _tmp21_;
-#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp22_, "items-visibility-changed", (GCallback) _checkerboard_page_on_items_visibility_changed_view_collection_items_visibility_changed, self, 0);
-#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_scrolled_window_set_policy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-#line 1244 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 8684 "Page.c"
+#line 8785 "Page.c"
 }
 
 
 void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1293 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->item_context_menu_path);
-#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->item_context_menu_path = _tmp1_;
-#line 8703 "Page.c"
+#line 8804 "Page.c"
 }
 
 
 void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1297 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_context_menu_path);
-#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_context_menu_path = _tmp1_;
-#line 8722 "Page.c"
+#line 8823 "Page.c"
 }
 
 
 GtkMenu* checkerboard_page_get_context_menu (CheckerboardPage* self) {
 	GtkMenu* result = NULL;
 	GtkMenu* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gboolean _tmp4_ = FALSE;
-#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	gint _tmp3_;
+	gboolean _tmp4_;
+#line 1301 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_ != 0;
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 8747 "Page.c"
-		GtkMenu* _tmp5_ = NULL;
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 8848 "Page.c"
+		GtkMenu* _tmp5_;
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = checkerboard_page_get_item_context_menu (self);
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp5_;
-#line 8755 "Page.c"
+#line 8856 "Page.c"
 	} else {
-		GtkMenu* _tmp6_ = NULL;
-#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
+		GtkMenu* _tmp6_;
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = page_get_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp6_;
-#line 8764 "Page.c"
+#line 8865 "Page.c"
 	}
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8770 "Page.c"
+#line 8871 "Page.c"
 }
 
 
 static GtkMenu* checkerboard_page_real_get_item_context_menu (CheckerboardPage* self) {
 	GtkMenu* result = NULL;
-	GtkMenu* _tmp0_ = NULL;
-	GtkMenu* _tmp8_ = NULL;
-	GtkMenu* _tmp9_ = NULL;
-#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkMenu* _tmp0_;
+	GtkMenu* _tmp8_;
+	GtkMenu* _tmp9_;
+#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->item_context_menu;
-#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 8783 "Page.c"
+#line 8884 "Page.c"
 		GMenuModel* model = NULL;
-		GtkBuilder* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		GObject* _tmp3_ = NULL;
-		GMenuModel* _tmp4_ = NULL;
-		GMenuModel* _tmp5_ = NULL;
-		GtkMenu* _tmp6_ = NULL;
-		GtkMenu* _tmp7_ = NULL;
-#line 1293 "/home/jens/Source/shotwell/src/Page.vala"
+		GtkBuilder* _tmp1_;
+		const gchar* _tmp2_;
+		GObject* _tmp3_;
+		GMenuModel* _tmp4_;
+		GMenuModel* _tmp5_;
+		GtkMenu* _tmp6_;
+		GtkMenu* _tmp7_;
+#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 1293 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->item_context_menu_path;
-#line 1293 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_builder_get_object (_tmp1_, _tmp2_);
-#line 1293 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp3_) : NULL);
-#line 1293 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
 		model = _tmp4_;
-#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = model;
-#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
-#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
 		g_object_ref_sink (_tmp6_);
-#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->item_context_menu);
-#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->item_context_menu = _tmp6_;
-#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1313 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->item_context_menu;
-#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1313 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_attach_to_widget (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
-#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (model);
-#line 8818 "Page.c"
+#line 8919 "Page.c"
 	}
-#line 1299 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->item_context_menu;
-#line 1299 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1299 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp9_;
-#line 1299 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8828 "Page.c"
+#line 8929 "Page.c"
 }
 
 
 GtkMenu* checkerboard_page_get_item_context_menu (CheckerboardPage* self) {
-#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_item_context_menu (self);
-#line 8837 "Page.c"
+#line 8938 "Page.c"
 }
 
 
 static GtkMenu* checkerboard_page_real_get_page_context_menu (Page* base) {
 	CheckerboardPage * self;
 	GtkMenu* result = NULL;
-	GtkMenu* _tmp0_ = NULL;
-	GtkMenu* _tmp8_ = NULL;
-	GtkMenu* _tmp9_ = NULL;
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+	const gchar* _tmp0_;
+	GtkMenu* _tmp1_;
+	GtkMenu* _tmp9_;
+	GtkMenu* _tmp10_;
+#line 1320 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = self->priv->page_context_menu;
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = self->priv->page_context_menu_path;
+#line 1321 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 8853 "Page.c"
+#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
+		result = NULL;
+#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
+		return result;
+#line 8959 "Page.c"
+	}
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp1_ = self->priv->page_context_menu;
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp1_ == NULL) {
+#line 8965 "Page.c"
 		GMenuModel* model = NULL;
-		GtkBuilder* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		GObject* _tmp3_ = NULL;
-		GMenuModel* _tmp4_ = NULL;
-		GMenuModel* _tmp5_ = NULL;
-		GtkMenu* _tmp6_ = NULL;
-		GtkMenu* _tmp7_ = NULL;
-#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp2_ = self->priv->page_context_menu_path;
-#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp3_ = gtk_builder_get_object (_tmp1_, _tmp2_);
-#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp3_) : NULL);
-#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
-		model = _tmp4_;
-#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp5_ = model;
-#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
-#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
-		g_object_ref_sink (_tmp6_);
-#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
+		GtkBuilder* _tmp2_;
+		const gchar* _tmp3_;
+		GObject* _tmp4_;
+		GMenuModel* _tmp5_;
+		GMenuModel* _tmp6_;
+		GtkMenu* _tmp7_;
+		GtkMenu* _tmp8_;
+#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
+#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp3_ = self->priv->page_context_menu_path;
+#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp4_ = gtk_builder_get_object (_tmp2_, _tmp3_);
+#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp4_) : NULL);
+#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
+		model = _tmp5_;
+#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp6_ = model;
+#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp7_ = (GtkMenu*) gtk_menu_new_from_model (_tmp6_);
+#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
+		g_object_ref_sink (_tmp7_);
+#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->page_context_menu);
-#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
-		self->priv->page_context_menu = _tmp6_;
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp7_ = self->priv->page_context_menu;
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
-		gtk_menu_attach_to_widget (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
+		self->priv->page_context_menu = _tmp7_;
+#line 1328 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp8_ = self->priv->page_context_menu;
+#line 1328 "/home/jens/Source/shotwell/src/Page.vala"
+		gtk_menu_attach_to_widget (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (model);
-#line 8888 "Page.c"
+#line 9000 "Page.c"
 	}
-#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp8_ = self->priv->page_context_menu;
-#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
-	result = _tmp9_;
-#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp9_ = self->priv->page_context_menu;
+#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp10_ = _g_object_ref0 (_tmp9_);
+#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
+	result = _tmp10_;
+#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8898 "Page.c"
+#line 9010 "Page.c"
 }
 
 
 static gboolean checkerboard_page_real_on_context_keypress (Page* base) {
 	CheckerboardPage * self;
 	gboolean result = FALSE;
-	GtkMenu* _tmp0_ = NULL;
-	GtkMenu* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkMenu* _tmp0_;
+	GtkMenu* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = checkerboard_page_get_context_menu (self);
-#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8925 "Page.c"
+#line 9037 "Page.c"
 }
 
 
 static gchar* checkerboard_page_real_get_view_empty_message (CheckerboardPage* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = _ ("No photos/videos");
-#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
-	result = _tmp1_;
-#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
+	gchar* _tmp0_;
+#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = g_strdup (_ ("No photos/videos"));
+#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
+	result = _tmp0_;
+#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8941 "Page.c"
+#line 9050 "Page.c"
 }
 
 
 gchar* checkerboard_page_get_view_empty_message (CheckerboardPage* self) {
-#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_view_empty_message (self);
-#line 8950 "Page.c"
+#line 9059 "Page.c"
 }
 
 
 static gchar* checkerboard_page_real_get_filter_no_match_message (CheckerboardPage* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = _ ("No photos/videos found which match the current filter");
-#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
-	result = _tmp1_;
-#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
+	gchar* _tmp0_;
+#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = g_strdup (_ ("No photos/videos found which match the current filter"));
+#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+	result = _tmp0_;
+#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8966 "Page.c"
+#line 9072 "Page.c"
 }
 
 
 gchar* checkerboard_page_get_filter_no_match_message (CheckerboardPage* self) {
-#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_filter_no_match_message (self);
-#line 8975 "Page.c"
+#line 9081 "Page.c"
 }
 
 
 static void checkerboard_page_real_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
-#line 1326 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1326 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (modifiers != NULL);
-#line 8984 "Page.c"
+#line 9090 "Page.c"
 }
 
 
 void checkerboard_page_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
-#line 1326 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1326 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->on_item_activated (self, item, activator, modifiers);
-#line 8993 "Page.c"
+#line 9099 "Page.c"
 }
 
 
 CheckerboardLayout* checkerboard_page_get_checkerboard_layout (CheckerboardPage* self) {
 	CheckerboardLayout* result = NULL;
-	CheckerboardLayout* _tmp0_ = NULL;
-	CheckerboardLayout* _tmp1_ = NULL;
-#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
+	CheckerboardLayout* _tmp0_;
+	CheckerboardLayout* _tmp1_;
+#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9011 "Page.c"
+#line 9117 "Page.c"
 }
 
 
 static SearchViewFilter* checkerboard_page_real_get_search_view_filter (CheckerboardPage* self) {
-#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 	g_critical ("Type `%s' does not implement abstract method `checkerboard_page_get_search_view_filter'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 9020 "Page.c"
+#line 9126 "Page.c"
 }
 
 
 SearchViewFilter* checkerboard_page_get_search_view_filter (CheckerboardPage* self) {
-#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_search_view_filter (self);
-#line 9029 "Page.c"
+#line 9135 "Page.c"
 }
 
 
 static CoreViewTracker* checkerboard_page_real_get_view_tracker (CheckerboardPage* self) {
 	CoreViewTracker* result = NULL;
-#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1358 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1358 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9039 "Page.c"
+#line 9145 "Page.c"
 }
 
 
 CoreViewTracker* checkerboard_page_get_view_tracker (CheckerboardPage* self) {
-#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1357 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1357 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_view_tracker (self);
-#line 9048 "Page.c"
+#line 9154 "Page.c"
 }
 
 
 static void _checkerboard_page_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, gpointer self) {
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_view_filter_refresh ((CheckerboardPage*) self);
-#line 9055 "Page.c"
+#line 9161 "Page.c"
 }
 
 
 static void checkerboard_page_real_switching_from (Page* base) {
 	CheckerboardPage * self;
-	CheckerboardLayout* _tmp0_ = NULL;
-	SearchViewFilter* _tmp1_ = NULL;
-	SearchViewFilter* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-#line 1341 "/home/jens/Source/shotwell/src/Page.vala"
+	CheckerboardLayout* _tmp0_;
+	SearchViewFilter* _tmp1_;
+	SearchViewFilter* _tmp2_;
+	guint _tmp3_;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_in_view (_tmp0_, FALSE);
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_page_get_search_view_filter (self);
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp3_, NULL, FALSE);
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_VIEW_FILTER, ViewFilter), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _checkerboard_page_on_view_filter_refresh_view_filter_refresh, self);
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
 	_view_filter_unref0 (_tmp2_);
-#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_unselect_all (_tmp5_);
-#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 1348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1368 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (checkerboard_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 9093 "Page.c"
+#line 9199 "Page.c"
 }
 
 
 static void checkerboard_page_real_switched_to (Page* base) {
 	CheckerboardPage * self;
-	CheckerboardLayout* _tmp0_ = NULL;
-	SearchViewFilter* _tmp1_ = NULL;
-	SearchViewFilter* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gboolean _tmp6_ = FALSE;
-#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
+	CheckerboardLayout* _tmp0_;
+	SearchViewFilter* _tmp1_;
+	SearchViewFilter* _tmp2_;
+	ViewCollection* _tmp3_;
+	ViewCollection* _tmp4_;
+	gint _tmp5_;
+	gboolean _tmp6_;
+#line 1371 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_in_view (_tmp0_, TRUE);
-#line 1353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_page_get_search_view_filter (self);
-#line 1353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_VIEW_FILTER, ViewFilter), "refresh", (GCallback) _checkerboard_page_on_view_filter_refresh_view_filter_refresh, self, 0);
-#line 1353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
 	_view_filter_unref0 (_tmp2_);
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_view_filter_refresh (self);
-#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_ > 0;
-#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp4_);
-#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_) {
-#line 9134 "Page.c"
+#line 9240 "Page.c"
 		CheckerboardItem* item = NULL;
-		ViewCollection* _tmp7_ = NULL;
-		ViewCollection* _tmp8_ = NULL;
-		DataView* _tmp9_ = NULL;
-		CheckerboardItem* _tmp10_ = NULL;
+		ViewCollection* _tmp7_;
+		ViewCollection* _tmp8_;
+		DataView* _tmp9_;
+		CheckerboardItem* _tmp10_;
 		GtkAdjustment* vadj = NULL;
-		GtkAdjustment* _tmp11_ = NULL;
-		GtkAdjustment* _tmp12_ = NULL;
+		GtkAdjustment* _tmp11_;
+		GtkAdjustment* _tmp12_;
 		gboolean _tmp13_ = FALSE;
-		GtkAdjustment* _tmp14_ = NULL;
-		CheckerboardItem* _tmp15_ = NULL;
-		GdkRectangle _tmp16_ = {0};
-		gint _tmp17_ = 0;
-		AdjustmentRelation _tmp18_ = 0;
-#line 1357 "/home/jens/Source/shotwell/src/Page.vala"
+		GtkAdjustment* _tmp14_;
+		CheckerboardItem* _tmp15_;
+		GdkRectangle _tmp16_;
+		gint _tmp17_;
+		AdjustmentRelation _tmp18_;
+#line 1377 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1357 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1377 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 1357 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1377 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = view_collection_get_selected_at (_tmp8_, 0);
-#line 1357 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1377 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1357 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1377 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 1357 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1377 "/home/jens/Source/shotwell/src/Page.vala"
 		item = _tmp10_;
-#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = _g_object_ref0 (_tmp11_);
-#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
 		vadj = _tmp12_;
-#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = vadj;
-#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = item;
-#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_->allocation;
-#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = _tmp16_.y;
-#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = get_adjustment_relation (_tmp14_, _tmp17_);
-#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp18_ == ADJUSTMENT_RELATION_IN_RANGE) {
-#line 9179 "Page.c"
-			GtkAdjustment* _tmp19_ = NULL;
-			CheckerboardItem* _tmp20_ = NULL;
-			GdkRectangle _tmp21_ = {0};
-			gint _tmp22_ = 0;
-			CheckerboardItem* _tmp23_ = NULL;
-			GdkRectangle _tmp24_ = {0};
-			gint _tmp25_ = 0;
-			AdjustmentRelation _tmp26_ = 0;
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 9285 "Page.c"
+			GtkAdjustment* _tmp19_;
+			CheckerboardItem* _tmp20_;
+			GdkRectangle _tmp21_;
+			gint _tmp22_;
+			CheckerboardItem* _tmp23_;
+			GdkRectangle _tmp24_;
+			gint _tmp25_;
+			AdjustmentRelation _tmp26_;
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = vadj;
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = item;
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = _tmp20_->allocation;
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = _tmp21_.y;
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = item;
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = _tmp23_->allocation;
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = _tmp24_.height;
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = get_adjustment_relation (_tmp19_, _tmp22_ + _tmp25_);
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _tmp26_ == ADJUSTMENT_RELATION_IN_RANGE;
-#line 9206 "Page.c"
+#line 9312 "Page.c"
 		} else {
-#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = FALSE;
-#line 9210 "Page.c"
+#line 9316 "Page.c"
 		}
-#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp13_) {
-#line 9214 "Page.c"
+#line 9320 "Page.c"
 			gint top = 0;
-			CheckerboardItem* _tmp27_ = NULL;
-			GdkRectangle _tmp28_ = {0};
-			gint _tmp29_ = 0;
-			GtkAdjustment* _tmp30_ = NULL;
-			gdouble _tmp31_ = 0.0;
-			GtkAdjustment* _tmp45_ = NULL;
-			gint _tmp46_ = 0;
-#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
+			CheckerboardItem* _tmp27_;
+			GdkRectangle _tmp28_;
+			gint _tmp29_;
+			GtkAdjustment* _tmp30_;
+			gdouble _tmp31_;
+			GtkAdjustment* _tmp45_;
+			gint _tmp46_;
+#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
 			top = 0;
-#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = item;
-#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _tmp27_->allocation;
-#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = _tmp28_.y;
-#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = vadj;
-#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = gtk_adjustment_get_value (_tmp30_);
-#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
 			if (((gdouble) _tmp29_) < _tmp31_) {
-#line 9237 "Page.c"
-				CheckerboardItem* _tmp32_ = NULL;
-				GdkRectangle _tmp33_ = {0};
-				gint _tmp34_ = 0;
-				gint _tmp35_ = 0;
-#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 9343 "Page.c"
+				CheckerboardItem* _tmp32_;
+				GdkRectangle _tmp33_;
+				gint _tmp34_;
+				gint _tmp35_;
+#line 1387 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = item;
-#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1387 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp33_ = _tmp32_->allocation;
-#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1387 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp34_ = _tmp33_.y;
-#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1387 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp34_;
-#line 1368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = top;
-#line 1368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp35_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 9254 "Page.c"
+#line 9360 "Page.c"
 			} else {
-				CheckerboardItem* _tmp36_ = NULL;
-				GdkRectangle _tmp37_ = {0};
-				gint _tmp38_ = 0;
-				CheckerboardItem* _tmp39_ = NULL;
-				GdkRectangle _tmp40_ = {0};
-				gint _tmp41_ = 0;
-				GtkAdjustment* _tmp42_ = NULL;
-				gdouble _tmp43_ = 0.0;
-				gint _tmp44_ = 0;
-#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
+				CheckerboardItem* _tmp36_;
+				GdkRectangle _tmp37_;
+				gint _tmp38_;
+				CheckerboardItem* _tmp39_;
+				GdkRectangle _tmp40_;
+				gint _tmp41_;
+				GtkAdjustment* _tmp42_;
+				gdouble _tmp43_;
+				gint _tmp44_;
+#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = item;
-#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = _tmp36_->allocation;
-#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = _tmp37_.y;
-#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = item;
-#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = _tmp39_->allocation;
-#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp41_ = _tmp40_.height;
-#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = vadj;
-#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = gtk_adjustment_get_page_size (_tmp42_);
-#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
 				top = (_tmp38_ + _tmp41_) - ((gint) _tmp43_);
-#line 1371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = top;
-#line 1371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp44_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 9287 "Page.c"
+#line 9393 "Page.c"
 			}
-#line 1374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = vadj;
-#line 1374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = top;
-#line 1374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_adjustment_set_value (_tmp45_, (gdouble) _tmp46_);
-#line 9295 "Page.c"
+#line 9401 "Page.c"
 		}
-#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (vadj);
-#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 9301 "Page.c"
+#line 9407 "Page.c"
 	}
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (checkerboard_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 9305 "Page.c"
+#line 9411 "Page.c"
 }
 
 
 static void checkerboard_page_on_view_filter_refresh (CheckerboardPage* self) {
-#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9314 "Page.c"
+#line 9420 "Page.c"
 }
 
 
 static void checkerboard_page_on_contents_altered (CheckerboardPage* self, GeeIterable* added, GeeIterable* removed) {
-#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1406 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1406 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1406 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 1388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9327 "Page.c"
+#line 9433 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_state_changed (CheckerboardPage* self, GeeIterable* changed) {
-#line 1391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (changed));
-#line 1392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9338 "Page.c"
+#line 9444 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_visibility_changed (CheckerboardPage* self, GeeCollection* changed) {
-#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (changed));
-#line 1396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9349 "Page.c"
+#line 9455 "Page.c"
 }
 
 
 static void checkerboard_page_update_view_filter_message (CheckerboardPage* self) {
 	gboolean _tmp0_ = FALSE;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_are_items_filtered_out (_tmp2_);
-#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 9373 "Page.c"
-		ViewCollection* _tmp5_ = NULL;
-		ViewCollection* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 9479 "Page.c"
+		ViewCollection* _tmp5_;
+		ViewCollection* _tmp6_;
+		gint _tmp7_;
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp7_ == 0;
-#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 9387 "Page.c"
+#line 9493 "Page.c"
 	} else {
-#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 9391 "Page.c"
+#line 9497 "Page.c"
 	}
-#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 9395 "Page.c"
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
+#line 9501 "Page.c"
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = checkerboard_page_get_filter_no_match_message (self);
-#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_set_page_message (self, _tmp9_);
-#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp9_);
-#line 9406 "Page.c"
+#line 9512 "Page.c"
 	} else {
-		ViewCollection* _tmp10_ = NULL;
-		ViewCollection* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
-		gboolean _tmp13_ = FALSE;
-#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
+		ViewCollection* _tmp10_;
+		ViewCollection* _tmp11_;
+		gint _tmp12_;
+		gboolean _tmp13_;
+#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_;
-#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_ == 0;
-#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp11_);
-#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp13_) {
-#line 9424 "Page.c"
-			gchar* _tmp14_ = NULL;
-			gchar* _tmp15_ = NULL;
-#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 9530 "Page.c"
+			gchar* _tmp14_;
+			gchar* _tmp15_;
+#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = checkerboard_page_get_view_empty_message (self);
-#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _tmp14_;
-#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_page_set_page_message (self, _tmp15_);
-#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp15_);
-#line 9435 "Page.c"
+#line 9541 "Page.c"
 		} else {
-#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_page_unset_page_message (self);
-#line 9439 "Page.c"
+#line 9545 "Page.c"
 		}
 	}
 }
 
 
 void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* message) {
-	CheckerboardLayout* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
+	CheckerboardLayout* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
+#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (message != NULL);
-#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = message;
-#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_message (_tmp0_, _tmp1_);
-#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_) {
-#line 9463 "Page.c"
-		CheckerboardLayout* _tmp3_ = NULL;
-#line 1412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 9569 "Page.c"
+		CheckerboardLayout* _tmp3_;
+#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->layout;
-#line 1412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 9469 "Page.c"
+#line 9575 "Page.c"
 	}
 }
 
 
 void checkerboard_page_unset_page_message (CheckerboardPage* self) {
-	CheckerboardLayout* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
+	CheckerboardLayout* _tmp0_;
+	gboolean _tmp1_;
+#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_unset_message (_tmp0_);
-#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 9487 "Page.c"
-		CheckerboardLayout* _tmp2_ = NULL;
-#line 1418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 9593 "Page.c"
+		CheckerboardLayout* _tmp2_;
+#line 1438 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->layout;
-#line 1418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1438 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 9493 "Page.c"
+#line 9599 "Page.c"
 	}
 }
 
 
 static void checkerboard_page_real_set_page_name (Page* base, const gchar* name) {
 	CheckerboardPage * self;
-	const gchar* _tmp0_ = NULL;
-	CheckerboardLayout* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+	const gchar* _tmp0_;
+	CheckerboardLayout* _tmp1_;
+	const gchar* _tmp2_;
+#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1442 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1442 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (checkerboard_page_parent_class)->set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp0_);
-#line 1424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->layout;
-#line 1424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = name;
-#line 1424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_name (_tmp1_, _tmp2_);
-#line 9517 "Page.c"
+#line 9623 "Page.c"
 }
 
 
 CheckerboardItem* checkerboard_page_get_item_at_pixel (CheckerboardPage* self, gdouble x, gdouble y) {
 	CheckerboardItem* result = NULL;
-	CheckerboardLayout* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
-	CheckerboardItem* _tmp3_ = NULL;
-#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
+	CheckerboardLayout* _tmp0_;
+	gdouble _tmp1_;
+	gdouble _tmp2_;
+	CheckerboardItem* _tmp3_;
+#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1448 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1448 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = x;
-#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1448 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = y;
-#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1448 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_get_item_at_pixel (_tmp0_, _tmp1_, _tmp2_);
-#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1448 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1448 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9541 "Page.c"
+#line 9647 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_hidden (CheckerboardPage* self, GeeIterable* hidden) {
-#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (hidden));
-#line 9550 "Page.c"
+#line 9656 "Page.c"
 	{
 		GeeIterator* _view_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
+#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = hidden;
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = gee_iterable_iterator (_tmp0_);
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
 		_view_it = _tmp1_;
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 9563 "Page.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 9669 "Page.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataView* view = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			CheckerboardItem* item = NULL;
-			DataView* _tmp6_ = NULL;
-			CheckerboardItem* _tmp7_ = NULL;
-			CheckerboardItem* _tmp8_ = NULL;
-			CheckerboardItem* _tmp9_ = NULL;
-			CheckerboardItem* _tmp10_ = NULL;
-			CheckerboardItem* _tmp11_ = NULL;
-			CheckerboardItem* _tmp12_ = NULL;
-			CheckerboardItem* _tmp13_ = NULL;
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+			DataView* _tmp6_;
+			CheckerboardItem* _tmp7_;
+			CheckerboardItem* _tmp8_;
+			CheckerboardItem* _tmp9_;
+			CheckerboardItem* _tmp10_;
+			CheckerboardItem* _tmp11_;
+			CheckerboardItem* _tmp12_;
+			CheckerboardItem* _tmp13_;
+#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = _view_it;
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp3_) {
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9586 "Page.c"
+#line 9692 "Page.c"
 			}
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = _view_it;
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
 			view = (DataView*) _tmp5_;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = view;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Page.vala"
 			item = _tmp7_;
-#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = self->anchor;
-#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = item;
-#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp8_ == _tmp9_) {
-#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->anchor);
-#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Page.vala"
 				self->anchor = NULL;
-#line 9610 "Page.c"
+#line 9716 "Page.c"
 			}
-#line 1438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = self->cursor;
-#line 1438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = item;
-#line 1438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp10_ == _tmp11_) {
-#line 1439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = NULL;
-#line 9622 "Page.c"
+#line 9728 "Page.c"
 			}
-#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = self->priv->highlighted;
-#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = item;
-#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp12_ == _tmp13_) {
-#line 1442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->priv->highlighted);
-#line 1442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->highlighted = NULL;
-#line 9634 "Page.c"
+#line 9740 "Page.c"
 			}
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (view);
-#line 9640 "Page.c"
+#line 9746 "Page.c"
 		}
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_view_it);
-#line 9644 "Page.c"
+#line 9750 "Page.c"
 	}
 }
 
@@ -9650,392 +9756,392 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 	gboolean result = FALSE;
 	gboolean handled = FALSE;
 	guint state = 0U;
-	GdkEventKey* _tmp0_ = NULL;
-	GdkModifierType _tmp1_ = 0;
-	GdkEventKey* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	GdkEventKey* _tmp0_;
+	GdkModifierType _tmp1_;
+	GdkEventKey* _tmp2_;
+	guint _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
 	GQuark _tmp7_ = 0U;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label0 = 0;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label1 = 0;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label2 = 0;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label3 = 0;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label4 = 0;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label5 = 0;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label6 = 0;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label7 = 0;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label8 = 0;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label9 = 0;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label10 = 0;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label11 = 0;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label12 = 0;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label13 = 0;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label14 = 0;
-#line 9691 "Page.c"
-	gboolean _tmp45_ = FALSE;
+#line 9797 "Page.c"
+	gboolean _tmp45_;
 	gboolean _tmp46_ = FALSE;
-#line 1446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
 	handled = TRUE;
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1470 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1470 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->state;
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1470 "/home/jens/Source/shotwell/src/Page.vala"
 	state = (guint) (_tmp1_ & GDK_SHIFT_MASK);
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = (NULL == _tmp5_) ? 0 : g_quark_from_string (_tmp5_);
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp7_ == ((0 != _tmp6_label0) ? _tmp6_label0 : (_tmp6_label0 = g_quark_from_static_string ("Up")))) || (_tmp7_ == ((0 != _tmp6_label1) ? _tmp6_label1 : (_tmp6_label1 = g_quark_from_static_string ("KP_Up"))))) {
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9720 "Page.c"
+#line 9826 "Page.c"
 			default:
 			{
-				guint _tmp8_ = 0U;
-#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
+				guint _tmp8_;
+#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_NORTH);
-#line 1456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp8_ = state;
-#line 1456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp8_);
-#line 1457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9732 "Page.c"
+#line 9838 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label2) ? _tmp6_label2 : (_tmp6_label2 = g_quark_from_static_string ("Down")))) || (_tmp7_ == ((0 != _tmp6_label3) ? _tmp6_label3 : (_tmp6_label3 = g_quark_from_static_string ("KP_Down"))))) {
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9738 "Page.c"
+#line 9844 "Page.c"
 			default:
 			{
-				guint _tmp9_ = 0U;
-#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
+				guint _tmp9_;
+#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_SOUTH);
-#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = state;
-#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp9_);
-#line 1463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9750 "Page.c"
+#line 9856 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label4) ? _tmp6_label4 : (_tmp6_label4 = g_quark_from_static_string ("Left")))) || (_tmp7_ == ((0 != _tmp6_label5) ? _tmp6_label5 : (_tmp6_label5 = g_quark_from_static_string ("KP_Left"))))) {
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9756 "Page.c"
+#line 9862 "Page.c"
 			default:
 			{
-				guint _tmp10_ = 0U;
-#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
+				guint _tmp10_;
+#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_WEST);
-#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = state;
-#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp10_);
-#line 1469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9768 "Page.c"
+#line 9874 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label6) ? _tmp6_label6 : (_tmp6_label6 = g_quark_from_static_string ("Right")))) || (_tmp7_ == ((0 != _tmp6_label7) ? _tmp6_label7 : (_tmp6_label7 = g_quark_from_static_string ("KP_Right"))))) {
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9774 "Page.c"
+#line 9880 "Page.c"
 			default:
 			{
-				guint _tmp11_ = 0U;
-#line 1473 "/home/jens/Source/shotwell/src/Page.vala"
+				guint _tmp11_;
+#line 1493 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_EAST);
-#line 1474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = state;
-#line 1474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp11_);
-#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9786 "Page.c"
+#line 9892 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label8) ? _tmp6_label8 : (_tmp6_label8 = g_quark_from_static_string ("Home")))) || (_tmp7_ == ((0 != _tmp6_label9) ? _tmp6_label9 : (_tmp6_label9 = g_quark_from_static_string ("KP_Home"))))) {
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9792 "Page.c"
+#line 9898 "Page.c"
 			default:
 			{
 				CheckerboardItem* first = NULL;
-				ViewCollection* _tmp12_ = NULL;
-				ViewCollection* _tmp13_ = NULL;
-				DataView* _tmp14_ = NULL;
-				CheckerboardItem* _tmp15_ = NULL;
-				CheckerboardItem* _tmp16_ = NULL;
-				guint _tmp18_ = 0U;
-#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
+				ViewCollection* _tmp12_;
+				ViewCollection* _tmp13_;
+				DataView* _tmp14_;
+				CheckerboardItem* _tmp15_;
+				CheckerboardItem* _tmp16_;
+				guint _tmp18_;
+#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = _tmp12_;
-#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = view_collection_get_first (_tmp13_);
-#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp13_);
-#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
 				first = _tmp15_;
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = first;
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp16_ != NULL) {
-#line 9818 "Page.c"
-					CheckerboardItem* _tmp17_ = NULL;
-#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
+#line 9924 "Page.c"
+					CheckerboardItem* _tmp17_;
+#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = first;
-#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_cursor_to_item (self, _tmp17_);
-#line 9824 "Page.c"
+#line 9930 "Page.c"
 				}
-#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = state;
-#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp18_);
-#line 1483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (first);
-#line 1483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9834 "Page.c"
+#line 9940 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label10) ? _tmp6_label10 : (_tmp6_label10 = g_quark_from_static_string ("End")))) || (_tmp7_ == ((0 != _tmp6_label11) ? _tmp6_label11 : (_tmp6_label11 = g_quark_from_static_string ("KP_End"))))) {
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9840 "Page.c"
+#line 9946 "Page.c"
 			default:
 			{
 				CheckerboardItem* last = NULL;
-				ViewCollection* _tmp19_ = NULL;
-				ViewCollection* _tmp20_ = NULL;
-				DataView* _tmp21_ = NULL;
-				CheckerboardItem* _tmp22_ = NULL;
-				CheckerboardItem* _tmp23_ = NULL;
-				guint _tmp25_ = 0U;
-#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
+				ViewCollection* _tmp19_;
+				ViewCollection* _tmp20_;
+				DataView* _tmp21_;
+				CheckerboardItem* _tmp22_;
+				CheckerboardItem* _tmp23_;
+				guint _tmp25_;
+#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = _tmp19_;
-#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = view_collection_get_last (_tmp20_);
-#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp20_);
-#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
 				last = _tmp22_;
-#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = last;
-#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp23_ != NULL) {
-#line 9866 "Page.c"
-					CheckerboardItem* _tmp24_ = NULL;
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 9972 "Page.c"
+					CheckerboardItem* _tmp24_;
+#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp24_ = last;
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_cursor_to_item (self, _tmp24_);
-#line 9872 "Page.c"
+#line 9978 "Page.c"
 				}
-#line 1490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = state;
-#line 1490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp25_);
-#line 1491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (last);
-#line 1491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9882 "Page.c"
+#line 9988 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label12) ? _tmp6_label12 : (_tmp6_label12 = g_quark_from_static_string ("Return")))) || (_tmp7_ == ((0 != _tmp6_label13) ? _tmp6_label13 : (_tmp6_label13 = g_quark_from_static_string ("KP_Enter"))))) {
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9888 "Page.c"
+#line 9994 "Page.c"
 			default:
 			{
-				ViewCollection* _tmp26_ = NULL;
-				ViewCollection* _tmp27_ = NULL;
-				gint _tmp28_ = 0;
-				gboolean _tmp29_ = FALSE;
-#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
+				ViewCollection* _tmp26_;
+				ViewCollection* _tmp27_;
+				gint _tmp28_;
+				gboolean _tmp29_;
+#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = _tmp26_;
-#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = view_collection_get_selected_count (_tmp27_);
-#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = _tmp28_ == 1;
-#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp27_);
-#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp29_) {
-#line 9907 "Page.c"
-					ViewCollection* _tmp30_ = NULL;
-					ViewCollection* _tmp31_ = NULL;
-					DataView* _tmp32_ = NULL;
-					CheckerboardItem* _tmp33_ = NULL;
+#line 10013 "Page.c"
+					ViewCollection* _tmp30_;
+					ViewCollection* _tmp31_;
+					DataView* _tmp32_;
+					CheckerboardItem* _tmp33_;
 					CheckerboardPageKeyboardModifiers _tmp34_ = {0};
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp30_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp31_ = _tmp30_;
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp32_ = view_collection_get_selected_at (_tmp31_, 0);
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_keyboard_modifiers_init (&_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_on_item_activated (self, _tmp33_, CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD, &_tmp34_);
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp33_);
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp31_);
-#line 9929 "Page.c"
+#line 10035 "Page.c"
 				} else {
-#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 					handled = FALSE;
-#line 9933 "Page.c"
+#line 10039 "Page.c"
 				}
-#line 1500 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9937 "Page.c"
+#line 10043 "Page.c"
 			}
 		}
 	} else if (_tmp7_ == ((0 != _tmp6_label14) ? _tmp6_label14 : (_tmp6_label14 = g_quark_from_static_string ("space")))) {
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9943 "Page.c"
+#line 10049 "Page.c"
 			default:
 			{
 				Marker* marker = NULL;
-				ViewCollection* _tmp35_ = NULL;
-				ViewCollection* _tmp36_ = NULL;
-				CheckerboardLayout* _tmp37_ = NULL;
-				CheckerboardItem* _tmp38_ = NULL;
-				CheckerboardItem* _tmp39_ = NULL;
-				Marker* _tmp40_ = NULL;
-				Marker* _tmp41_ = NULL;
-				ViewCollection* _tmp42_ = NULL;
-				ViewCollection* _tmp43_ = NULL;
-				Marker* _tmp44_ = NULL;
-#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
+				ViewCollection* _tmp35_;
+				ViewCollection* _tmp36_;
+				CheckerboardLayout* _tmp37_;
+				CheckerboardItem* _tmp38_;
+				CheckerboardItem* _tmp39_;
+				Marker* _tmp40_;
+				Marker* _tmp41_;
+				ViewCollection* _tmp42_;
+				ViewCollection* _tmp43_;
+				Marker* _tmp44_;
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = _tmp35_;
-#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = self->priv->layout;
-#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = checkerboard_layout_get_cursor (_tmp37_);
-#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = _tmp38_;
-#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_OBJECT, DataObject));
-#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp41_ = _tmp40_;
-#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (_tmp39_);
-#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp36_);
-#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp41_;
-#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = _tmp42_;
-#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = marker;
-#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp43_, _tmp44_);
-#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp43_);
-#line 1505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9991 "Page.c"
+#line 10097 "Page.c"
 			}
 		}
 	} else {
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9997 "Page.c"
+#line 10103 "Page.c"
 			default:
 			{
-#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 				handled = FALSE;
-#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1529 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10004 "Page.c"
+#line 10110 "Page.c"
 			}
 		}
 	}
-#line 1512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = handled;
-#line 1512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp45_) {
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10016 "Page.c"
+#line 10122 "Page.c"
 	}
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
 	if (GTK_WIDGET_CLASS (checkerboard_page_parent_class)->key_press_event != NULL) {
-#line 10020 "Page.c"
-		GdkEventKey* _tmp47_ = NULL;
-		gboolean _tmp48_ = FALSE;
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 10126 "Page.c"
+		GdkEventKey* _tmp47_;
+		gboolean _tmp48_;
+#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = event;
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = GTK_WIDGET_CLASS (checkerboard_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), gtk_widget_get_type (), GtkWidget), _tmp47_);
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = _tmp48_;
-#line 10029 "Page.c"
+#line 10135 "Page.c"
 	} else {
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = TRUE;
-#line 10033 "Page.c"
+#line 10139 "Page.c"
 	}
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp46_;
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10039 "Page.c"
+#line 10145 "Page.c"
 }
 
 
@@ -10043,1487 +10149,1487 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 	CheckerboardPage * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	GdkEventButton* _tmp1_ = NULL;
-	GdkEventType _tmp2_ = 0;
+	GdkEventButton* _tmp1_;
+	GdkEventType _tmp2_;
 	guint state = 0U;
-	GdkEventButton* _tmp5_ = NULL;
-	GdkModifierType _tmp6_ = 0;
+	GdkEventButton* _tmp5_;
+	GdkModifierType _tmp6_;
 	CheckerboardItem* item = NULL;
-	GdkEventButton* _tmp7_ = NULL;
-	gdouble _tmp8_ = 0.0;
-	GdkEventButton* _tmp9_ = NULL;
-	gdouble _tmp10_ = 0.0;
-	CheckerboardItem* _tmp11_ = NULL;
-	CheckerboardItem* _tmp12_ = NULL;
-	ViewCollection* _tmp106_ = NULL;
-	ViewCollection* _tmp107_ = NULL;
-	gint _tmp108_ = 0;
-	gboolean _tmp109_ = FALSE;
-#line 1518 "/home/jens/Source/shotwell/src/Page.vala"
+	GdkEventButton* _tmp7_;
+	gdouble _tmp8_;
+	GdkEventButton* _tmp9_;
+	gdouble _tmp10_;
+	CheckerboardItem* _tmp11_;
+	CheckerboardItem* _tmp12_;
+	ViewCollection* _tmp106_;
+	ViewCollection* _tmp107_;
+	gint _tmp108_;
+	gboolean _tmp109_;
+#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = event;
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_->type;
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != GDK_BUTTON_PRESS) {
-#line 10073 "Page.c"
-		GdkEventButton* _tmp3_ = NULL;
-		GdkEventType _tmp4_ = 0;
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 10179 "Page.c"
+		GdkEventButton* _tmp3_;
+		GdkEventType _tmp4_;
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = event;
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp3_->type;
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp4_ != GDK_2BUTTON_PRESS;
-#line 10082 "Page.c"
+#line 10188 "Page.c"
 	} else {
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 10086 "Page.c"
+#line 10192 "Page.c"
 	}
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1541 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1541 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10094 "Page.c"
+#line 10200 "Page.c"
 	}
-#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event;
-#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_->state;
-#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
 	state = (guint) (_tmp6_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK));
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = event;
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_->x;
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = event;
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_->y;
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = checkerboard_page_get_item_at_pixel (self, _tmp8_, _tmp10_);
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp11_;
-#line 1529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = item;
-#line 1529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ != NULL) {
-#line 10118 "Page.c"
-		CheckerboardLayout* _tmp13_ = NULL;
-		CheckerboardItem* _tmp14_ = NULL;
-		GdkEventButton* _tmp15_ = NULL;
-		gdouble _tmp16_ = 0.0;
-		GdkEventButton* _tmp17_ = NULL;
-		gdouble _tmp18_ = 0.0;
-		GdkEventButton* _tmp19_ = NULL;
-		GdkModifierType _tmp20_ = 0;
-		gboolean _tmp21_ = FALSE;
-		guint _tmp22_ = 0U;
-		CheckerboardLayout* _tmp80_ = NULL;
-		CheckerboardItem* _tmp81_ = NULL;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 10224 "Page.c"
+		CheckerboardLayout* _tmp13_;
+		CheckerboardItem* _tmp14_;
+		GdkEventButton* _tmp15_;
+		gdouble _tmp16_;
+		GdkEventButton* _tmp17_;
+		gdouble _tmp18_;
+		GdkEventButton* _tmp19_;
+		GdkModifierType _tmp20_;
+		gboolean _tmp21_;
+		guint _tmp22_;
+		CheckerboardLayout* _tmp80_;
+		CheckerboardItem* _tmp81_;
+#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = self->priv->layout;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = item;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = event;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_->x;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = event;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _tmp17_->y;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = event;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _tmp19_->state;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = checkerboard_layout_handle_left_click (_tmp13_, _tmp14_, _tmp16_, _tmp18_, _tmp20_);
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_) {
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Page.vala"
 			result = TRUE;
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 10157 "Page.c"
+#line 10263 "Page.c"
 		}
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = state;
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (_tmp22_) {
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK:
-#line 10165 "Page.c"
+#line 10271 "Page.c"
 			{
 				Marker* marker = NULL;
-				ViewCollection* _tmp23_ = NULL;
-				ViewCollection* _tmp24_ = NULL;
-				CheckerboardItem* _tmp25_ = NULL;
-				Marker* _tmp26_ = NULL;
-				Marker* _tmp27_ = NULL;
-				ViewCollection* _tmp28_ = NULL;
-				ViewCollection* _tmp29_ = NULL;
-				Marker* _tmp30_ = NULL;
-				CheckerboardItem* _tmp31_ = NULL;
-				gboolean _tmp32_ = FALSE;
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+				ViewCollection* _tmp23_;
+				ViewCollection* _tmp24_;
+				CheckerboardItem* _tmp25_;
+				Marker* _tmp26_;
+				Marker* _tmp27_;
+				ViewCollection* _tmp28_;
+				ViewCollection* _tmp29_;
+				Marker* _tmp30_;
+				CheckerboardItem* _tmp31_;
+				gboolean _tmp32_;
+#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = _tmp23_;
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = item;
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject));
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = _tmp26_;
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp24_);
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp27_;
-#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = _tmp28_;
-#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp30_ = marker;
-#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp29_, _tmp30_);
-#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp29_);
-#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp31_ = item;
-#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_VIEW, DataView));
-#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp32_) {
-#line 10208 "Page.c"
-					CheckerboardItem* _tmp33_ = NULL;
-					CheckerboardItem* _tmp34_ = NULL;
-					CheckerboardItem* _tmp35_ = NULL;
-					CheckerboardItem* _tmp36_ = NULL;
-#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 10314 "Page.c"
+					CheckerboardItem* _tmp33_;
+					CheckerboardItem* _tmp34_;
+					CheckerboardItem* _tmp35_;
+					CheckerboardItem* _tmp36_;
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = item;
-#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp34_ = _g_object_ref0 (_tmp33_);
-#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp34_;
-#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp35_ = item;
-#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp36_ = _g_object_ref0 (_tmp35_);
-#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->cursor);
-#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
 					self->cursor = _tmp36_;
-#line 10229 "Page.c"
+#line 10335 "Page.c"
 				}
-#line 1546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10235 "Page.c"
+#line 10341 "Page.c"
 			}
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_SHIFT_MASK:
-#line 10239 "Page.c"
+#line 10345 "Page.c"
 			{
-				ViewCollection* _tmp37_ = NULL;
-				ViewCollection* _tmp38_ = NULL;
-				CheckerboardItem* _tmp39_ = NULL;
-				CheckerboardItem* _tmp42_ = NULL;
-				CheckerboardItem* _tmp43_ = NULL;
-				CheckerboardItem* _tmp44_ = NULL;
-				CheckerboardItem* _tmp45_ = NULL;
-#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
+				ViewCollection* _tmp37_;
+				ViewCollection* _tmp38_;
+				CheckerboardItem* _tmp39_;
+				CheckerboardItem* _tmp42_;
+				CheckerboardItem* _tmp43_;
+				CheckerboardItem* _tmp44_;
+				CheckerboardItem* _tmp45_;
+#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = _tmp37_;
-#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_unselect_all (_tmp38_);
-#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp38_);
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1571 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = self->anchor;
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1571 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp39_ == NULL) {
-#line 10260 "Page.c"
-					CheckerboardItem* _tmp40_ = NULL;
-					CheckerboardItem* _tmp41_ = NULL;
-#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 10366 "Page.c"
+					CheckerboardItem* _tmp40_;
+					CheckerboardItem* _tmp41_;
+#line 1572 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp40_ = item;
-#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp41_ = _g_object_ref0 (_tmp40_);
-#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp41_;
-#line 10271 "Page.c"
+#line 10377 "Page.c"
 				}
-#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = self->anchor;
-#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = item;
-#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_between_items (self, _tmp42_, _tmp43_);
-#line 1556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1576 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = item;
-#line 1556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1576 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp45_ = _g_object_ref0 (_tmp44_);
-#line 1556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1576 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1576 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp45_;
-#line 1557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10289 "Page.c"
+#line 10395 "Page.c"
 			}
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK | GDK_SHIFT_MASK:
-#line 10293 "Page.c"
+#line 10399 "Page.c"
 			{
-				CheckerboardItem* _tmp46_ = NULL;
-				CheckerboardItem* _tmp49_ = NULL;
-				CheckerboardItem* _tmp50_ = NULL;
-				CheckerboardItem* _tmp51_ = NULL;
-				CheckerboardItem* _tmp52_ = NULL;
-#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
+				CheckerboardItem* _tmp46_;
+				CheckerboardItem* _tmp49_;
+				CheckerboardItem* _tmp50_;
+				CheckerboardItem* _tmp51_;
+				CheckerboardItem* _tmp52_;
+#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp46_ = self->anchor;
-#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp46_ == NULL) {
-#line 10304 "Page.c"
-					CheckerboardItem* _tmp47_ = NULL;
-					CheckerboardItem* _tmp48_ = NULL;
-#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 10410 "Page.c"
+					CheckerboardItem* _tmp47_;
+					CheckerboardItem* _tmp48_;
+#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp47_ = item;
-#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp48_ = _g_object_ref0 (_tmp47_);
-#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp48_;
-#line 10315 "Page.c"
+#line 10421 "Page.c"
 				}
-#line 1567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp49_ = self->anchor;
-#line 1567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp50_ = item;
-#line 1567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_between_items (self, _tmp49_, _tmp50_);
-#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp51_ = item;
-#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp52_ = _g_object_ref0 (_tmp51_);
-#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp52_;
-#line 1570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10333 "Page.c"
+#line 10439 "Page.c"
 			}
 			default:
 			{
-				GdkEventButton* _tmp53_ = NULL;
-				GdkEventType _tmp54_ = 0;
-				CheckerboardItem* _tmp76_ = NULL;
-				CheckerboardItem* _tmp77_ = NULL;
-				CheckerboardItem* _tmp78_ = NULL;
-				CheckerboardItem* _tmp79_ = NULL;
-#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
+				GdkEventButton* _tmp53_;
+				GdkEventType _tmp54_;
+				CheckerboardItem* _tmp76_;
+				CheckerboardItem* _tmp77_;
+				CheckerboardItem* _tmp78_;
+				CheckerboardItem* _tmp79_;
+#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp53_ = event;
-#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp54_ = _tmp53_->type;
-#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp54_ == GDK_2BUTTON_PRESS) {
-#line 10349 "Page.c"
-					CheckerboardItem* _tmp55_ = NULL;
-					CheckerboardItem* _tmp56_ = NULL;
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 10455 "Page.c"
+					CheckerboardItem* _tmp55_;
+					CheckerboardItem* _tmp56_;
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp55_ = item;
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp56_ = _g_object_ref0 (_tmp55_);
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->priv->activated_item);
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->activated_item = _tmp56_;
-#line 10360 "Page.c"
+#line 10466 "Page.c"
 				} else {
-					CheckerboardItem* _tmp57_ = NULL;
-					gboolean _tmp58_ = FALSE;
-#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
+					CheckerboardItem* _tmp57_;
+					gboolean _tmp58_;
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp57_ = item;
-#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp58_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_DATA_VIEW, DataView));
-#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 					if (!_tmp58_) {
-#line 10370 "Page.c"
+#line 10476 "Page.c"
 						Marker* all = NULL;
-						ViewCollection* _tmp59_ = NULL;
-						ViewCollection* _tmp60_ = NULL;
-						Marker* _tmp61_ = NULL;
-						Marker* _tmp62_ = NULL;
-						Marker* _tmp63_ = NULL;
-						ViewCollection* _tmp64_ = NULL;
-						ViewCollection* _tmp65_ = NULL;
-						GeeList* _tmp66_ = NULL;
-						GeeList* _tmp67_ = NULL;
-						ViewCollection* _tmp68_ = NULL;
-						ViewCollection* _tmp69_ = NULL;
-						Marker* _tmp70_ = NULL;
-						ViewCollection* _tmp71_ = NULL;
-						ViewCollection* _tmp72_ = NULL;
-						CheckerboardItem* _tmp73_ = NULL;
-						Marker* _tmp74_ = NULL;
-						Marker* _tmp75_ = NULL;
-#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
+						ViewCollection* _tmp59_;
+						ViewCollection* _tmp60_;
+						Marker* _tmp61_;
+						Marker* _tmp62_;
+						Marker* _tmp63_;
+						ViewCollection* _tmp64_;
+						ViewCollection* _tmp65_;
+						GeeList* _tmp66_;
+						GeeList* _tmp67_;
+						ViewCollection* _tmp68_;
+						ViewCollection* _tmp69_;
+						Marker* _tmp70_;
+						ViewCollection* _tmp71_;
+						ViewCollection* _tmp72_;
+						CheckerboardItem* _tmp73_;
+						Marker* _tmp74_;
+						Marker* _tmp75_;
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp59_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp60_ = _tmp59_;
-#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp61_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp62_ = _tmp61_;
-#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp60_);
-#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 						all = _tmp62_;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp63_ = all;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp64_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp65_ = _tmp64_;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp66_ = view_collection_get_selected (_tmp65_);
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp67_ = _tmp66_;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
 						marker_mark_many (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (_tmp67_);
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp65_);
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp68_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp69_ = _tmp68_;
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp70_ = all;
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp71_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp72_ = _tmp71_;
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp73_ = item;
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp74_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_DATA_OBJECT, DataObject));
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp75_ = _tmp74_;
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
 						view_collection_unselect_and_select_marked (_tmp69_, _tmp70_, _tmp75_);
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (_tmp75_);
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp72_);
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp69_);
-#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (all);
-#line 10443 "Page.c"
+#line 10549 "Page.c"
 					}
 				}
-#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp76_ = item;
-#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp77_ = _g_object_ref0 (_tmp76_);
-#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->anchor);
-#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
 				self->anchor = _tmp77_;
-#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp78_ = item;
-#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp79_ = _g_object_ref0 (_tmp78_);
-#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp79_;
-#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1610 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10464 "Page.c"
+#line 10570 "Page.c"
 			}
 		}
-#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp80_ = self->priv->layout;
-#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp81_ = item;
-#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_set_cursor (_tmp80_, _tmp81_);
-#line 10473 "Page.c"
+#line 10579 "Page.c"
 	} else {
-		guint _tmp82_ = 0U;
-		GeeArrayList* _tmp85_ = NULL;
-		CheckerboardLayout* _tmp101_ = NULL;
-		GdkEventButton* _tmp102_ = NULL;
-		gdouble _tmp103_ = 0.0;
-		GdkEventButton* _tmp104_ = NULL;
-		gdouble _tmp105_ = 0.0;
-#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
+		guint _tmp82_;
+		GeeArrayList* _tmp85_;
+		CheckerboardLayout* _tmp101_;
+		GdkEventButton* _tmp102_;
+		gdouble _tmp103_;
+		GdkEventButton* _tmp104_;
+		gdouble _tmp105_;
+#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp82_ = state;
-#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp82_ != ((guint) GDK_CONTROL_MASK)) {
-#line 10486 "Page.c"
-			ViewCollection* _tmp83_ = NULL;
-			ViewCollection* _tmp84_ = NULL;
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 10592 "Page.c"
+			ViewCollection* _tmp83_;
+			ViewCollection* _tmp84_;
+#line 1617 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp83_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1617 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp84_ = _tmp83_;
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1617 "/home/jens/Source/shotwell/src/Page.vala"
 			view_collection_unselect_all (_tmp84_);
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1617 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp84_);
-#line 10497 "Page.c"
+#line 10603 "Page.c"
 		}
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp85_ = gee_array_list_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->previously_selected);
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->previously_selected = _tmp85_;
-#line 10505 "Page.c"
+#line 10611 "Page.c"
 		{
 			GeeList* _view_list = NULL;
-			ViewCollection* _tmp86_ = NULL;
-			ViewCollection* _tmp87_ = NULL;
-			GeeList* _tmp88_ = NULL;
-			GeeList* _tmp89_ = NULL;
+			ViewCollection* _tmp86_;
+			ViewCollection* _tmp87_;
+			GeeList* _tmp88_;
+			GeeList* _tmp89_;
 			gint _view_size = 0;
-			GeeList* _tmp90_ = NULL;
-			gint _tmp91_ = 0;
-			gint _tmp92_ = 0;
+			GeeList* _tmp90_;
+			gint _tmp91_;
+			gint _tmp92_;
 			gint _view_index = 0;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp86_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp87_ = _tmp86_;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp88_ = view_collection_get_selected (_tmp87_);
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp89_ = _tmp88_;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp87_);
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_list = _tmp89_;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp90_ = _view_list;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp91_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp92_ = _tmp91_;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_size = _tmp92_;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_index = -1;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 			while (TRUE) {
-#line 10541 "Page.c"
-				gint _tmp93_ = 0;
-				gint _tmp94_ = 0;
-				gint _tmp95_ = 0;
+#line 10647 "Page.c"
+				gint _tmp93_;
+				gint _tmp94_;
+				gint _tmp95_;
 				DataView* view = NULL;
-				GeeList* _tmp96_ = NULL;
-				gint _tmp97_ = 0;
-				gpointer _tmp98_ = NULL;
-				GeeArrayList* _tmp99_ = NULL;
-				DataView* _tmp100_ = NULL;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+				GeeList* _tmp96_;
+				gint _tmp97_;
+				gpointer _tmp98_;
+				GeeArrayList* _tmp99_;
+				DataView* _tmp100_;
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp93_ = _view_index;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 				_view_index = _tmp93_ + 1;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp94_ = _view_index;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp95_ = _view_size;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!(_tmp94_ < _tmp95_)) {
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 10563 "Page.c"
+#line 10669 "Page.c"
 				}
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp96_ = _view_list;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp97_ = _view_index;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp98_ = gee_list_get (_tmp96_, _tmp97_);
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 				view = (DataView*) _tmp98_;
-#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp99_ = self->priv->previously_selected;
-#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp100_ = view;
-#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Page.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (view);
-#line 10581 "Page.c"
+#line 10687 "Page.c"
 			}
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_view_list);
-#line 10585 "Page.c"
+#line 10691 "Page.c"
 		}
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp101_ = self->priv->layout;
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp102_ = event;
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp103_ = _tmp102_->x;
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp104_ = event;
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp105_ = _tmp104_->y;
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_set_drag_select_origin (_tmp101_, (gint) _tmp103_, (gint) _tmp105_);
-#line 1606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10605 "Page.c"
+#line 10711 "Page.c"
 	}
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp106_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp107_ = _tmp106_;
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp108_ = view_collection_get_selected_count (_tmp107_);
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp109_ = _tmp108_ == 0;
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp107_);
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp109_;
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10623 "Page.c"
+#line 10729 "Page.c"
 }
 
 
 static gboolean checkerboard_page_real_on_left_released (Page* base, GdkEventButton* event) {
 	CheckerboardPage * self;
 	gboolean result = FALSE;
-	CheckerboardLayout* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GdkEventButton* _tmp5_ = NULL;
-	GdkModifierType _tmp6_ = 0;
-	CheckerboardItem* _tmp7_ = NULL;
+	CheckerboardLayout* _tmp0_;
+	gboolean _tmp1_;
+	GdkEventButton* _tmp5_;
+	GdkModifierType _tmp6_;
+	CheckerboardItem* _tmp7_;
 	CheckerboardItem* item = NULL;
-	GdkEventButton* _tmp10_ = NULL;
-	gdouble _tmp11_ = 0.0;
-	GdkEventButton* _tmp12_ = NULL;
-	gdouble _tmp13_ = 0.0;
-	CheckerboardItem* _tmp14_ = NULL;
-	CheckerboardItem* _tmp15_ = NULL;
-	CheckerboardItem* _tmp16_ = NULL;
-	CheckerboardItem* _tmp17_ = NULL;
-#line 1615 "/home/jens/Source/shotwell/src/Page.vala"
+	GdkEventButton* _tmp10_;
+	gdouble _tmp11_;
+	GdkEventButton* _tmp12_;
+	gdouble _tmp13_;
+	CheckerboardItem* _tmp14_;
+	CheckerboardItem* _tmp15_;
+	CheckerboardItem* _tmp16_;
+	CheckerboardItem* _tmp17_;
+#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->previously_selected);
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->previously_selected = NULL;
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1639 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1639 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1639 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 10658 "Page.c"
-		CheckerboardLayout* _tmp2_ = NULL;
-		CheckerboardItem* _tmp3_ = NULL;
-		CheckerboardItem* _tmp4_ = NULL;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 10764 "Page.c"
+		CheckerboardLayout* _tmp2_;
+		CheckerboardItem* _tmp3_;
+		CheckerboardItem* _tmp4_;
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->layout;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_clear_drag_select (_tmp2_);
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1641 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->cursor;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1641 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1641 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1641 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp4_;
-#line 1623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10678 "Page.c"
+#line 10784 "Page.c"
 	}
-#line 1627 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event;
-#line 1627 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_->state;
-#line 1627 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp6_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) != 0) {
-#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1648 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1648 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10690 "Page.c"
+#line 10796 "Page.c"
 	}
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1651 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->activated_item;
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1651 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_ != NULL) {
-#line 10696 "Page.c"
-		CheckerboardItem* _tmp8_ = NULL;
+#line 10802 "Page.c"
+		CheckerboardItem* _tmp8_;
 		CheckerboardPageKeyboardModifiers _tmp9_ = {0};
-#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->priv->activated_item;
-#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_keyboard_modifiers_init (&_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_on_item_activated (self, _tmp8_, CHECKERBOARD_PAGE_ACTIVATOR_MOUSE, &_tmp9_);
-#line 1633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->activated_item);
-#line 1633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->activated_item = NULL;
-#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10713 "Page.c"
+#line 10819 "Page.c"
 	}
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = event;
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_->x;
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = event;
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _tmp12_->y;
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = checkerboard_page_get_item_at_pixel (self, _tmp11_, _tmp13_);
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp14_;
-#line 1639 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = item;
-#line 1639 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp15_ == NULL) {
-#line 1641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10737 "Page.c"
+#line 10843 "Page.c"
 	}
-#line 1644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1664 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->cursor;
-#line 1644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1664 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = item;
-#line 1644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1664 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp16_ != _tmp17_) {
-#line 10745 "Page.c"
-		ViewCollection* _tmp18_ = NULL;
-		ViewCollection* _tmp19_ = NULL;
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 10851 "Page.c"
+		ViewCollection* _tmp18_;
+		ViewCollection* _tmp19_;
+#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = _tmp18_;
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp19_);
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp19_);
-#line 10756 "Page.c"
+#line 10862 "Page.c"
 	} else {
-		CheckerboardItem* _tmp20_ = NULL;
-		gboolean _tmp21_ = FALSE;
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+		CheckerboardItem* _tmp20_;
+		gboolean _tmp21_;
+#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = item;
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_VIEW, DataView));
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_) {
-#line 10766 "Page.c"
-			ViewCollection* _tmp22_ = NULL;
-			ViewCollection* _tmp23_ = NULL;
-			CheckerboardItem* _tmp24_ = NULL;
-#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 10872 "Page.c"
+			ViewCollection* _tmp22_;
+			ViewCollection* _tmp23_;
+			CheckerboardItem* _tmp24_;
+#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = _tmp22_;
-#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = item;
-#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
 			view_collection_unselect_all_but (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_VIEW, DataView));
-#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp23_);
-#line 10780 "Page.c"
+#line 10886 "Page.c"
 		}
 	}
-#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10789 "Page.c"
+#line 10895 "Page.c"
 }
 
 
 static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButton* event) {
 	CheckerboardPage * self;
 	gboolean result = FALSE;
-	GdkEventButton* _tmp0_ = NULL;
-	GdkEventType _tmp1_ = 0;
+	GdkEventButton* _tmp0_;
+	GdkEventType _tmp1_;
 	CheckerboardItem* item = NULL;
-	GdkEventButton* _tmp2_ = NULL;
-	gdouble _tmp3_ = 0.0;
-	GdkEventButton* _tmp4_ = NULL;
-	gdouble _tmp5_ = 0.0;
-	CheckerboardItem* _tmp6_ = NULL;
-	CheckerboardItem* _tmp7_ = NULL;
+	GdkEventButton* _tmp2_;
+	gdouble _tmp3_;
+	GdkEventButton* _tmp4_;
+	gdouble _tmp5_;
+	CheckerboardItem* _tmp6_;
+	CheckerboardItem* _tmp7_;
 	GtkMenu* context_menu = NULL;
-	GtkMenu* _tmp39_ = NULL;
-	GtkMenu* _tmp40_ = NULL;
-	GdkEventButton* _tmp41_ = NULL;
-	gboolean _tmp42_ = FALSE;
-#line 1660 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkMenu* _tmp39_;
+	GtkMenu* _tmp40_;
+	GdkEventButton* _tmp41_;
+	gboolean _tmp42_;
+#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1660 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->type;
-#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != GDK_BUTTON_PRESS) {
-#line 1663 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1683 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1663 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1683 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10824 "Page.c"
+#line 10930 "Page.c"
 	}
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->x;
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->y;
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = checkerboard_page_get_item_at_pixel (self, _tmp3_, _tmp5_);
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp6_;
-#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = item;
-#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_ != NULL) {
-#line 10842 "Page.c"
-		GdkEventButton* _tmp8_ = NULL;
-		GdkModifierType _tmp9_ = 0;
-#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 10948 "Page.c"
+		GdkEventButton* _tmp8_;
+		GdkModifierType _tmp9_;
+#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = event;
-#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_->state;
-#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (_tmp9_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
-#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK:
-#line 10853 "Page.c"
+#line 10959 "Page.c"
 			{
 				Marker* marker = NULL;
-				ViewCollection* _tmp10_ = NULL;
-				ViewCollection* _tmp11_ = NULL;
-				CheckerboardItem* _tmp12_ = NULL;
-				Marker* _tmp13_ = NULL;
-				Marker* _tmp14_ = NULL;
-				ViewCollection* _tmp15_ = NULL;
-				ViewCollection* _tmp16_ = NULL;
-				Marker* _tmp17_ = NULL;
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+				ViewCollection* _tmp10_;
+				ViewCollection* _tmp11_;
+				CheckerboardItem* _tmp12_;
+				Marker* _tmp13_;
+				Marker* _tmp14_;
+				ViewCollection* _tmp15_;
+				ViewCollection* _tmp16_;
+				Marker* _tmp17_;
+#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = _tmp10_;
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = item;
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = _tmp13_;
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp11_);
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp14_;
-#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = _tmp15_;
-#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp17_ = marker;
-#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp16_, _tmp17_);
-#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp16_);
-#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10892 "Page.c"
+#line 10998 "Page.c"
 			}
-#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_SHIFT_MASK:
-#line 10896 "Page.c"
+#line 11002 "Page.c"
 			{
-#line 1678 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10900 "Page.c"
+#line 11006 "Page.c"
 			}
-#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK | GDK_SHIFT_MASK:
-#line 10904 "Page.c"
+#line 11010 "Page.c"
 			{
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1702 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10908 "Page.c"
+#line 11014 "Page.c"
 			}
 			default:
 			{
-				CheckerboardItem* _tmp18_ = NULL;
-				gboolean _tmp19_ = FALSE;
-#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
+				CheckerboardItem* _tmp18_;
+				gboolean _tmp19_;
+#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = item;
-#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_VIEW, DataView));
-#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp19_) {
-#line 10920 "Page.c"
+#line 11026 "Page.c"
 					Marker* all = NULL;
-					ViewCollection* _tmp20_ = NULL;
-					ViewCollection* _tmp21_ = NULL;
-					Marker* _tmp22_ = NULL;
-					Marker* _tmp23_ = NULL;
-					Marker* _tmp24_ = NULL;
-					ViewCollection* _tmp25_ = NULL;
-					ViewCollection* _tmp26_ = NULL;
-					GeeList* _tmp27_ = NULL;
-					GeeList* _tmp28_ = NULL;
-					ViewCollection* _tmp29_ = NULL;
-					ViewCollection* _tmp30_ = NULL;
-					Marker* _tmp31_ = NULL;
-					ViewCollection* _tmp32_ = NULL;
-					ViewCollection* _tmp33_ = NULL;
-					CheckerboardItem* _tmp34_ = NULL;
-					Marker* _tmp35_ = NULL;
-					Marker* _tmp36_ = NULL;
-#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
+					ViewCollection* _tmp20_;
+					ViewCollection* _tmp21_;
+					Marker* _tmp22_;
+					Marker* _tmp23_;
+					Marker* _tmp24_;
+					ViewCollection* _tmp25_;
+					ViewCollection* _tmp26_;
+					GeeList* _tmp27_;
+					GeeList* _tmp28_;
+					ViewCollection* _tmp29_;
+					ViewCollection* _tmp30_;
+					Marker* _tmp31_;
+					ViewCollection* _tmp32_;
+					ViewCollection* _tmp33_;
+					CheckerboardItem* _tmp34_;
+					Marker* _tmp35_;
+					Marker* _tmp36_;
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp21_ = _tmp20_;
-#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp23_ = _tmp22_;
-#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp21_);
-#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 					all = _tmp23_;
-#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp24_ = all;
-#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp26_ = _tmp25_;
-#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = view_collection_get_selected (_tmp26_);
-#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp28_ = _tmp27_;
-#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 					marker_mark_many (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp28_);
-#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp26_);
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp30_ = _tmp29_;
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp31_ = all;
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp32_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = _tmp32_;
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp34_ = item;
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp35_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_DATA_OBJECT, DataObject));
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp36_ = _tmp35_;
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
 					view_collection_unselect_and_select_marked (_tmp30_, _tmp31_, _tmp36_);
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp36_);
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp33_);
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp30_);
-#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (all);
-#line 10993 "Page.c"
+#line 11099 "Page.c"
 				}
-#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10997 "Page.c"
+#line 11103 "Page.c"
 			}
 		}
 	} else {
-		ViewCollection* _tmp37_ = NULL;
-		ViewCollection* _tmp38_ = NULL;
-#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
+		ViewCollection* _tmp37_;
+		ViewCollection* _tmp38_;
+#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp38_ = _tmp37_;
-#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp38_);
-#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp38_);
-#line 11011 "Page.c"
+#line 11117 "Page.c"
 	}
-#line 1700 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = checkerboard_page_get_context_menu (self);
-#line 1700 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
 	context_menu = _tmp39_;
-#line 1701 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = context_menu;
-#line 1701 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = event;
-#line 1701 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp40_, _tmp41_);
-#line 1701 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp42_;
-#line 1701 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (context_menu);
-#line 1701 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1701 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11031 "Page.c"
+#line 11137 "Page.c"
 }
 
 
 static gboolean checkerboard_page_real_on_mouse_over (CheckerboardPage* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask) {
 	gboolean result = FALSE;
-	CheckerboardItem* _tmp0_ = NULL;
-	CheckerboardItem* _tmp6_ = NULL;
-	CheckerboardItem* _tmp7_ = NULL;
-	CheckerboardItem* _tmp8_ = NULL;
-	CheckerboardItem* _tmp10_ = NULL;
-	CheckerboardItem* _tmp11_ = NULL;
-	CheckerboardItem* _tmp12_ = NULL;
-	CheckerboardItem* _tmp13_ = NULL;
-#line 1704 "/home/jens/Source/shotwell/src/Page.vala"
+	CheckerboardItem* _tmp0_;
+	CheckerboardItem* _tmp6_;
+	CheckerboardItem* _tmp7_;
+	CheckerboardItem* _tmp8_;
+	CheckerboardItem* _tmp10_;
+	CheckerboardItem* _tmp11_;
+	CheckerboardItem* _tmp12_;
+	CheckerboardItem* _tmp13_;
+#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail ((item == NULL) || IS_CHECKERBOARD_ITEM (item), FALSE);
-#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = item;
-#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 11051 "Page.c"
-		CheckerboardLayout* _tmp1_ = NULL;
-		CheckerboardItem* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
-		GdkModifierType _tmp5_ = 0;
-#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 11157 "Page.c"
+		CheckerboardLayout* _tmp1_;
+		CheckerboardItem* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
+		GdkModifierType _tmp5_;
+#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->layout;
-#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = item;
-#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = x;
-#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = y;
-#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = mask;
-#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_handle_mouse_motion (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 11069 "Page.c"
+#line 11175 "Page.c"
 	}
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = item;
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->highlighted;
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == _tmp7_) {
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11081 "Page.c"
+#line 11187 "Page.c"
 	}
-#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1734 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->highlighted;
-#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1734 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_ != NULL) {
-#line 11087 "Page.c"
-		CheckerboardItem* _tmp9_ = NULL;
-#line 1715 "/home/jens/Source/shotwell/src/Page.vala"
+#line 11193 "Page.c"
+		CheckerboardItem* _tmp9_;
+#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->highlighted;
-#line 1715 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_item_unbrighten (_tmp9_);
-#line 1716 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->highlighted);
-#line 1716 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->highlighted = NULL;
-#line 11097 "Page.c"
+#line 11203 "Page.c"
 	}
-#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = item;
-#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp10_ == NULL) {
-#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11107 "Page.c"
+#line 11213 "Page.c"
 	}
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = item;
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_item_brighten (_tmp11_);
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = item;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->highlighted);
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->highlighted = _tmp13_;
-#line 1727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1747 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1747 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11125 "Page.c"
+#line 11231 "Page.c"
 }
 
 
 gboolean checkerboard_page_on_mouse_over (CheckerboardPage* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask) {
-#line 1704 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), FALSE);
-#line 1704 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->on_mouse_over (self, item, x, y, mask);
-#line 11134 "Page.c"
+#line 11240 "Page.c"
 }
 
 
 static gboolean _checkerboard_page_selection_autoscroll_gsource_func (gpointer self) {
 	gboolean result;
 	result = checkerboard_page_selection_autoscroll ((CheckerboardPage*) self);
-#line 1747 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11143 "Page.c"
+#line 11249 "Page.c"
 }
 
 
 static gboolean checkerboard_page_real_on_motion (Page* base, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) {
 	CheckerboardPage * self;
 	gboolean result = FALSE;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	CheckerboardItem* _tmp2_ = NULL;
-	CheckerboardItem* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	GdkModifierType _tmp6_ = 0;
-	gboolean _tmp7_ = FALSE;
-	gboolean _tmp8_ = FALSE;
-	CheckerboardLayout* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	CheckerboardLayout* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	CheckerboardItem* _tmp2_;
+	CheckerboardItem* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	GdkModifierType _tmp6_;
+	gboolean _tmp7_;
+	gboolean _tmp8_;
+	CheckerboardLayout* _tmp9_;
+	gboolean _tmp10_;
+	CheckerboardLayout* _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
 	gboolean _tmp14_ = FALSE;
-	gboolean _tmp15_ = FALSE;
-#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
+	gboolean _tmp15_;
+#line 1750 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1732 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = x;
-#line 1732 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = y;
-#line 1732 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = checkerboard_page_get_item_at_pixel (self, (gdouble) _tmp0_, (gdouble) _tmp1_);
-#line 1732 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1732 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = x;
-#line 1732 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = y;
-#line 1732 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = mask;
-#line 1732 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = checkerboard_page_on_mouse_over (self, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
-#line 1732 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = !_tmp7_;
-#line 1732 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1732 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_) {
-#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11196 "Page.c"
+#line 11302 "Page.c"
 	}
-#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->layout;
-#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = checkerboard_layout_is_drag_select_active (_tmp9_);
-#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp10_) {
-#line 1737 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1737 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11208 "Page.c"
+#line 11314 "Page.c"
 	}
-#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->layout;
-#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = x;
-#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = y;
-#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_drag_select_endpoint (_tmp11_, _tmp12_, _tmp13_);
-#line 1742 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_updated_selection_band (self);
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->autoscroll_scheduled;
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp15_) {
-#line 11224 "Page.c"
-		GtkAdjustment* _tmp16_ = NULL;
-		gint _tmp17_ = 0;
-		AdjustmentRelation _tmp18_ = 0;
-#line 1746 "/home/jens/Source/shotwell/src/Page.vala"
+#line 11330 "Page.c"
+		GtkAdjustment* _tmp16_;
+		gint _tmp17_;
+		AdjustmentRelation _tmp18_;
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1746 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = y;
-#line 1746 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = get_adjustment_relation (_tmp16_, _tmp17_);
-#line 1746 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = _tmp18_ != ADJUSTMENT_RELATION_IN_RANGE;
-#line 11236 "Page.c"
+#line 11342 "Page.c"
 	} else {
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = FALSE;
-#line 11240 "Page.c"
+#line 11346 "Page.c"
 	}
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp14_) {
-#line 1747 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
 		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) CHECKERBOARD_PAGE_AUTOSCROLL_TICKS_MSEC, _checkerboard_page_selection_autoscroll_gsource_func, g_object_ref (self), g_object_unref);
-#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->autoscroll_scheduled = TRUE;
-#line 11248 "Page.c"
+#line 11354 "Page.c"
 	}
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11254 "Page.c"
+#line 11360 "Page.c"
 }
 
 
 static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
-	CheckerboardLayout* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	CheckerboardLayout* _tmp0_;
+	gboolean _tmp1_;
 	GeeList* intersection = NULL;
-	CheckerboardLayout* _tmp2_ = NULL;
-	GeeList* _tmp3_ = NULL;
-	GeeList* _tmp4_ = NULL;
+	CheckerboardLayout* _tmp2_;
+	GeeList* _tmp3_;
+	GeeList* _tmp4_;
 	Marker* to_unselect = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	Marker* _tmp7_ = NULL;
-	Marker* _tmp8_ = NULL;
+	ViewCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	Marker* _tmp7_;
+	Marker* _tmp8_;
 	Marker* to_select = NULL;
-	ViewCollection* _tmp9_ = NULL;
-	ViewCollection* _tmp10_ = NULL;
-	Marker* _tmp11_ = NULL;
-	Marker* _tmp12_ = NULL;
-	Marker* _tmp13_ = NULL;
-	ViewCollection* _tmp14_ = NULL;
-	ViewCollection* _tmp15_ = NULL;
-	GeeList* _tmp16_ = NULL;
-	GeeList* _tmp17_ = NULL;
-	GeeArrayList* _tmp18_ = NULL;
-	Marker* _tmp19_ = NULL;
-	GeeArrayList* _tmp20_ = NULL;
-	Marker* _tmp21_ = NULL;
-	GeeArrayList* _tmp22_ = NULL;
-	ViewCollection* _tmp44_ = NULL;
-	ViewCollection* _tmp45_ = NULL;
-	Marker* _tmp46_ = NULL;
-	ViewCollection* _tmp47_ = NULL;
-	ViewCollection* _tmp48_ = NULL;
-	Marker* _tmp49_ = NULL;
-#line 1755 "/home/jens/Source/shotwell/src/Page.vala"
+	ViewCollection* _tmp9_;
+	ViewCollection* _tmp10_;
+	Marker* _tmp11_;
+	Marker* _tmp12_;
+	Marker* _tmp13_;
+	ViewCollection* _tmp14_;
+	ViewCollection* _tmp15_;
+	GeeList* _tmp16_;
+	GeeList* _tmp17_;
+	GeeArrayList* _tmp18_;
+	Marker* _tmp19_;
+	GeeArrayList* _tmp20_;
+	Marker* _tmp21_;
+	GeeArrayList* _tmp22_;
+	ViewCollection* _tmp44_;
+	ViewCollection* _tmp45_;
+	Marker* _tmp46_;
+	ViewCollection* _tmp47_;
+	ViewCollection* _tmp48_;
+	Marker* _tmp49_;
+#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_, "layout.is_drag_select_active()");
-#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->layout;
-#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_items_in_selection_band (_tmp2_);
-#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
 	intersection = _tmp3_;
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = intersection;
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 1761 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (intersection);
-#line 1761 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11313 "Page.c"
+#line 11419 "Page.c"
 	}
-#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 	to_unselect = _tmp8_;
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_;
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = _tmp11_;
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp10_);
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
 	to_select = _tmp12_;
-#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = to_unselect;
-#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = view_collection_get_selected (_tmp15_);
-#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = _tmp16_;
-#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_mark_many (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp17_);
-#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp15_);
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->previously_selected;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp18_ != NULL, "previously_selected != null");
-#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = to_unselect;
-#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = self->priv->previously_selected;
-#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_unmark_many (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = to_select;
-#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = self->priv->previously_selected;
-#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_mark_many (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = NULL;
-#line 11375 "Page.c"
+#line 11481 "Page.c"
 	{
 		GeeList* _item_list = NULL;
-		GeeList* _tmp23_ = NULL;
-		GeeList* _tmp24_ = NULL;
+		GeeList* _tmp23_;
+		GeeList* _tmp24_;
 		gint _item_size = 0;
-		GeeList* _tmp25_ = NULL;
-		gint _tmp26_ = 0;
-		gint _tmp27_ = 0;
+		GeeList* _tmp25_;
+		gint _tmp26_;
+		gint _tmp27_;
 		gint _item_index = 0;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = intersection;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_list = _tmp24_;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = _item_list;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = _tmp26_;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_size = _tmp27_;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_index = -1;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 11403 "Page.c"
-			gint _tmp28_ = 0;
-			gint _tmp29_ = 0;
-			gint _tmp30_ = 0;
+#line 11509 "Page.c"
+			gint _tmp28_;
+			gint _tmp29_;
+			gint _tmp30_;
 			CheckerboardItem* item = NULL;
-			GeeList* _tmp31_ = NULL;
-			gint _tmp32_ = 0;
-			gpointer _tmp33_ = NULL;
-			Marker* _tmp34_ = NULL;
-			CheckerboardItem* _tmp35_ = NULL;
-			gboolean _tmp36_ = FALSE;
-			CheckerboardItem* _tmp41_ = NULL;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+			GeeList* _tmp31_;
+			gint _tmp32_;
+			gpointer _tmp33_;
+			Marker* _tmp34_;
+			CheckerboardItem* _tmp35_;
+			gboolean _tmp36_;
+			CheckerboardItem* _tmp41_;
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _item_index;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			_item_index = _tmp28_ + 1;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = _item_index;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = _item_size;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!(_tmp29_ < _tmp30_)) {
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 11427 "Page.c"
+#line 11533 "Page.c"
 			}
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = _item_list;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp32_ = _item_index;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = gee_list_get (_tmp31_, _tmp32_);
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			item = (CheckerboardItem*) _tmp33_;
-#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = to_select;
-#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = item;
-#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp36_ = marker_toggle (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_DATA_OBJECT, DataObject));
-#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp36_) {
-#line 11445 "Page.c"
-				Marker* _tmp37_ = NULL;
-				CheckerboardItem* _tmp38_ = NULL;
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 11551 "Page.c"
+				Marker* _tmp37_;
+				CheckerboardItem* _tmp38_;
+#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = to_unselect;
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = item;
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
 				marker_unmark (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_OBJECT, DataObject));
-#line 11454 "Page.c"
+#line 11560 "Page.c"
 			} else {
-				Marker* _tmp39_ = NULL;
-				CheckerboardItem* _tmp40_ = NULL;
-#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
+				Marker* _tmp39_;
+				CheckerboardItem* _tmp40_;
+#line 1801 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = to_unselect;
-#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1801 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = item;
-#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1801 "/home/jens/Source/shotwell/src/Page.vala"
 				marker_mark (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_OBJECT, DataObject));
-#line 11464 "Page.c"
+#line 11570 "Page.c"
 			}
-#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->cursor;
-#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp41_ == NULL) {
-#line 11470 "Page.c"
-				CheckerboardItem* _tmp42_ = NULL;
-				CheckerboardItem* _tmp43_ = NULL;
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 11576 "Page.c"
+				CheckerboardItem* _tmp42_;
+				CheckerboardItem* _tmp43_;
+#line 1804 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = item;
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = _g_object_ref0 (_tmp42_);
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp43_;
-#line 11481 "Page.c"
+#line 11587 "Page.c"
 			}
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 11485 "Page.c"
+#line 11591 "Page.c"
 		}
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_item_list);
-#line 11489 "Page.c"
+#line 11595 "Page.c"
 	}
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp44_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = _tmp44_;
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp46_ = to_select;
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp45_, _tmp46_);
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp45_);
-#line 1788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp48_ = _tmp47_;
-#line 1788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = to_unselect;
-#line 1788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_unselect_marked (_tmp48_, _tmp49_);
-#line 1788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp48_);
-#line 1755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (to_select);
-#line 1755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (to_unselect);
-#line 1755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (intersection);
-#line 11517 "Page.c"
+#line 11623 "Page.c"
 }
 
 
 static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self) {
 	gboolean result = FALSE;
-	CheckerboardLayout* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	CheckerboardLayout* _tmp0_;
+	gboolean _tmp1_;
 	GtkAdjustment* vadj = NULL;
-	GtkAdjustment* _tmp2_ = NULL;
-	GtkAdjustment* _tmp3_ = NULL;
+	GtkAdjustment* _tmp2_;
+	GtkAdjustment* _tmp3_;
 	gint x = 0;
 	gint y = 0;
 	GdkModifierType mask = 0;
@@ -11531,1096 +11637,1096 @@ static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self)
 	gint _tmp5_ = 0;
 	GdkModifierType _tmp6_ = 0;
 	gint new_value = 0;
-	GtkAdjustment* _tmp7_ = NULL;
-	gdouble _tmp8_ = 0.0;
-	GtkAdjustment* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	AdjustmentRelation _tmp11_ = 0;
-	GtkAdjustment* _tmp22_ = NULL;
-	gint _tmp23_ = 0;
-	GtkAdjustment* _tmp24_ = NULL;
-	gdouble _tmp25_ = 0.0;
-	GtkAdjustment* _tmp26_ = NULL;
-	gdouble _tmp27_ = 0.0;
-	GtkAdjustment* _tmp28_ = NULL;
-	gdouble _tmp29_ = 0.0;
-	gint _tmp30_ = 0;
-#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkAdjustment* _tmp7_;
+	gdouble _tmp8_;
+	GtkAdjustment* _tmp9_;
+	gint _tmp10_;
+	AdjustmentRelation _tmp11_;
+	GtkAdjustment* _tmp22_;
+	gint _tmp23_;
+	GtkAdjustment* _tmp24_;
+	gdouble _tmp25_;
+	GtkAdjustment* _tmp26_;
+	gdouble _tmp27_;
+	GtkAdjustment* _tmp28_;
+	gdouble _tmp29_;
+	gint _tmp30_;
+#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), FALSE);
-#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1812 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1812 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1812 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp1_) {
-#line 1793 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->autoscroll_scheduled = FALSE;
-#line 1795 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1795 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11563 "Page.c"
+#line 11669 "Page.c"
 	}
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1819 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1819 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1819 "/home/jens/Source/shotwell/src/Page.vala"
 	vadj = _tmp3_;
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Page.vala"
 	page_get_event_source_pointer (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), &_tmp4_, &_tmp5_, &_tmp6_);
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Page.vala"
 	x = _tmp4_;
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Page.vala"
 	y = _tmp5_;
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Page.vala"
 	mask = _tmp6_;
-#line 1805 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = vadj;
-#line 1805 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = gtk_adjustment_get_value (_tmp7_);
-#line 1805 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 	new_value = (gint) _tmp8_;
-#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = vadj;
-#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = y;
-#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = get_adjustment_relation (_tmp9_, _tmp10_);
-#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp11_) {
-#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_BELOW:
-#line 11595 "Page.c"
+#line 11701 "Page.c"
 		{
-			gint _tmp12_ = 0;
-			CheckerboardLayout* _tmp13_ = NULL;
-			gint _tmp14_ = 0;
-			gint _tmp15_ = 0;
-#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
+			gint _tmp12_;
+			CheckerboardLayout* _tmp13_;
+			gint _tmp14_;
+			gint _tmp15_;
+#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = new_value;
-#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
 			new_value = _tmp12_ - CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS;
-#line 1810 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = self->priv->layout;
-#line 1810 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = x;
-#line 1810 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = new_value;
-#line 1810 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_layout_set_drag_select_endpoint (_tmp13_, _tmp14_, _tmp15_);
-#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11615 "Page.c"
+#line 11721 "Page.c"
 		}
-#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_ABOVE:
-#line 11619 "Page.c"
+#line 11725 "Page.c"
 		{
-			gint _tmp16_ = 0;
-			CheckerboardLayout* _tmp17_ = NULL;
-			gint _tmp18_ = 0;
-			gint _tmp19_ = 0;
-			GtkAdjustment* _tmp20_ = NULL;
-			gdouble _tmp21_ = 0.0;
-#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
+			gint _tmp16_;
+			CheckerboardLayout* _tmp17_;
+			gint _tmp18_;
+			gint _tmp19_;
+			GtkAdjustment* _tmp20_;
+			gdouble _tmp21_;
+#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = new_value;
-#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
 			new_value = _tmp16_ + CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS;
-#line 1816 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = self->priv->layout;
-#line 1816 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = x;
-#line 1816 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = new_value;
-#line 1816 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = vadj;
-#line 1816 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = gtk_adjustment_get_page_size (_tmp20_);
-#line 1816 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_layout_set_drag_select_endpoint (_tmp17_, _tmp18_, _tmp19_ + ((gint) _tmp21_));
-#line 1817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1837 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11645 "Page.c"
+#line 11751 "Page.c"
 		}
-#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_IN_RANGE:
-#line 11649 "Page.c"
+#line 11755 "Page.c"
 		{
-#line 1820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->autoscroll_scheduled = FALSE;
-#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (vadj);
-#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 11659 "Page.c"
+#line 11765 "Page.c"
 		}
 		default:
 		{
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 			g_warn_if_reached ();
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11667 "Page.c"
+#line 11773 "Page.c"
 		}
 	}
-#line 1832 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = vadj;
-#line 1832 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp23_ = new_value;
-#line 1832 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = vadj;
-#line 1832 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = gtk_adjustment_get_lower (_tmp24_);
-#line 1832 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = vadj;
-#line 1832 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = gtk_adjustment_get_upper (_tmp26_);
-#line 1832 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = vadj;
-#line 1832 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = gtk_adjustment_get_page_size (_tmp28_);
-#line 1832 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = CLAMP (_tmp23_, (gint) _tmp25_, ((gint) _tmp27_) - ((gint) _tmp29_));
-#line 1832 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_adjustment_set_value (_tmp22_, (gdouble) _tmp30_);
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_updated_selection_band (self);
-#line 1837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (vadj);
-#line 1837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11698 "Page.c"
+#line 11804 "Page.c"
 }
 
 
 void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem* item) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	CheckerboardItem* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	CheckerboardItem* _tmp4_ = NULL;
-	CheckerboardItem* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	CheckerboardLayout* _tmp17_ = NULL;
-	CheckerboardItem* _tmp18_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	CheckerboardItem* _tmp2_;
+	gboolean _tmp3_;
+	CheckerboardItem* _tmp4_;
+	CheckerboardItem* _tmp5_;
+	gboolean _tmp6_;
+	CheckerboardLayout* _tmp17_;
+	CheckerboardItem* _tmp18_;
 	GtkAdjustment* vadj = NULL;
-	GtkAdjustment* _tmp19_ = NULL;
-	GtkAdjustment* _tmp20_ = NULL;
+	GtkAdjustment* _tmp19_;
+	GtkAdjustment* _tmp20_;
 	gboolean _tmp21_ = FALSE;
-	GtkAdjustment* _tmp22_ = NULL;
-	CheckerboardItem* _tmp23_ = NULL;
-	GdkRectangle _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	AdjustmentRelation _tmp26_ = 0;
+	GtkAdjustment* _tmp22_;
+	CheckerboardItem* _tmp23_;
+	GdkRectangle _tmp24_;
+	gint _tmp25_;
+	AdjustmentRelation _tmp26_;
 	gint top = 0;
-	CheckerboardItem* _tmp35_ = NULL;
-	GdkRectangle _tmp36_ = {0};
-	gint _tmp37_ = 0;
-	GtkAdjustment* _tmp38_ = NULL;
-	gdouble _tmp39_ = 0.0;
-	GtkAdjustment* _tmp53_ = NULL;
-	gint _tmp54_ = 0;
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+	CheckerboardItem* _tmp35_;
+	GdkRectangle _tmp36_;
+	gint _tmp37_;
+	GtkAdjustment* _tmp38_;
+	gdouble _tmp39_;
+	GtkAdjustment* _tmp53_;
+	gint _tmp54_;
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = item;
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp3_, "get_view().contains(item)");
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = item;
-#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = _tmp5_;
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp6_) {
-#line 11757 "Page.c"
-		ViewCollection* _tmp7_ = NULL;
-		ViewCollection* _tmp8_ = NULL;
+#line 11863 "Page.c"
+		ViewCollection* _tmp7_;
+		ViewCollection* _tmp8_;
 		Marker* marker = NULL;
-		ViewCollection* _tmp9_ = NULL;
-		ViewCollection* _tmp10_ = NULL;
-		CheckerboardItem* _tmp11_ = NULL;
-		Marker* _tmp12_ = NULL;
-		Marker* _tmp13_ = NULL;
-		ViewCollection* _tmp14_ = NULL;
-		ViewCollection* _tmp15_ = NULL;
-		Marker* _tmp16_ = NULL;
-#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
+		ViewCollection* _tmp9_;
+		ViewCollection* _tmp10_;
+		CheckerboardItem* _tmp11_;
+		Marker* _tmp12_;
+		Marker* _tmp13_;
+		ViewCollection* _tmp14_;
+		ViewCollection* _tmp15_;
+		Marker* _tmp16_;
+#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp8_);
-#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_;
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = item;
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject));
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_;
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 		marker = _tmp13_;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = _tmp14_;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = marker;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_select_marked (_tmp15_, _tmp16_);
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp15_);
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (marker);
-#line 11803 "Page.c"
+#line 11909 "Page.c"
 	}
-#line 1850 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->layout;
-#line 1850 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = item;
-#line 1850 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_cursor (_tmp17_, _tmp18_);
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 	vadj = _tmp20_;
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = vadj;
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp23_ = item;
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = _tmp23_->allocation;
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = _tmp24_.y;
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = get_adjustment_relation (_tmp22_, _tmp25_);
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp26_ == ADJUSTMENT_RELATION_IN_RANGE) {
-#line 11829 "Page.c"
-		GtkAdjustment* _tmp27_ = NULL;
-		CheckerboardItem* _tmp28_ = NULL;
-		GdkRectangle _tmp29_ = {0};
-		gint _tmp30_ = 0;
-		CheckerboardItem* _tmp31_ = NULL;
-		GdkRectangle _tmp32_ = {0};
-		gint _tmp33_ = 0;
-		AdjustmentRelation _tmp34_ = 0;
-#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 11935 "Page.c"
+		GtkAdjustment* _tmp27_;
+		CheckerboardItem* _tmp28_;
+		GdkRectangle _tmp29_;
+		gint _tmp30_;
+		CheckerboardItem* _tmp31_;
+		GdkRectangle _tmp32_;
+		gint _tmp33_;
+		AdjustmentRelation _tmp34_;
+#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = vadj;
-#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = item;
-#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp28_->allocation;
-#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = _tmp29_.y;
-#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = item;
-#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _tmp31_->allocation;
-#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp33_ = _tmp32_.height;
-#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp34_ = get_adjustment_relation (_tmp27_, _tmp30_ + _tmp33_);
-#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = _tmp34_ == ADJUSTMENT_RELATION_IN_RANGE;
-#line 11856 "Page.c"
+#line 11962 "Page.c"
 	} else {
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = FALSE;
-#line 11860 "Page.c"
+#line 11966 "Page.c"
 	}
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp21_) {
-#line 1856 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1876 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (vadj);
-#line 1856 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1876 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11868 "Page.c"
+#line 11974 "Page.c"
 	}
-#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 	top = 0;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp35_ = item;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp36_ = _tmp35_->allocation;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp37_ = _tmp36_.y;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp38_ = vadj;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = gtk_adjustment_get_value (_tmp38_);
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 	if (((gdouble) _tmp37_) < _tmp39_) {
-#line 11884 "Page.c"
-		CheckerboardItem* _tmp40_ = NULL;
-		GdkRectangle _tmp41_ = {0};
-		gint _tmp42_ = 0;
-		gint _tmp43_ = 0;
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 11990 "Page.c"
+		CheckerboardItem* _tmp40_;
+		GdkRectangle _tmp41_;
+		gint _tmp42_;
+		gint _tmp43_;
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp40_ = item;
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp41_ = _tmp40_->allocation;
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp42_ = _tmp41_.y;
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp42_;
-#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp43_ = top;
-#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp43_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 11901 "Page.c"
+#line 12007 "Page.c"
 	} else {
-		CheckerboardItem* _tmp44_ = NULL;
-		GdkRectangle _tmp45_ = {0};
-		gint _tmp46_ = 0;
-		CheckerboardItem* _tmp47_ = NULL;
-		GdkRectangle _tmp48_ = {0};
-		gint _tmp49_ = 0;
-		GtkAdjustment* _tmp50_ = NULL;
-		gdouble _tmp51_ = 0.0;
-		gint _tmp52_ = 0;
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+		CheckerboardItem* _tmp44_;
+		GdkRectangle _tmp45_;
+		gint _tmp46_;
+		CheckerboardItem* _tmp47_;
+		GdkRectangle _tmp48_;
+		gint _tmp49_;
+		GtkAdjustment* _tmp50_;
+		gdouble _tmp51_;
+		gint _tmp52_;
+#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp44_ = item;
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp45_ = _tmp44_->allocation;
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = _tmp45_.y;
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = item;
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = _tmp47_->allocation;
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp49_ = _tmp48_.height;
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp50_ = vadj;
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp51_ = gtk_adjustment_get_page_size (_tmp50_);
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
 		top = (_tmp46_ + _tmp49_) - ((gint) _tmp51_);
-#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp52_ = top;
-#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp52_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 11934 "Page.c"
+#line 12040 "Page.c"
 	}
-#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1888 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp53_ = vadj;
-#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1888 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp54_ = top;
-#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1888 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_adjustment_set_value (_tmp53_, (gdouble) _tmp54_);
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (vadj);
-#line 11944 "Page.c"
+#line 12050 "Page.c"
 }
 
 
 void checkerboard_page_move_cursor (CheckerboardPage* self, CompassPoint point) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-	CheckerboardItem* _tmp6_ = NULL;
-	CheckerboardItem* _tmp21_ = NULL;
+	CheckerboardItem* _tmp6_;
+	CheckerboardItem* _tmp21_;
 	CheckerboardItem* item = NULL;
-	CheckerboardLayout* _tmp25_ = NULL;
-	CheckerboardItem* _tmp26_ = NULL;
-	CompassPoint _tmp27_ = 0;
-	CheckerboardItem* _tmp28_ = NULL;
-	CheckerboardItem* _tmp29_ = NULL;
-#line 1871 "/home/jens/Source/shotwell/src/Page.vala"
+	CheckerboardLayout* _tmp25_;
+	CheckerboardItem* _tmp26_;
+	CompassPoint _tmp27_;
+	CheckerboardItem* _tmp28_;
+	CheckerboardItem* _tmp29_;
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1894 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11979 "Page.c"
+#line 12085 "Page.c"
 	}
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->cursor;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 11985 "Page.c"
-		CheckerboardLayout* _tmp7_ = NULL;
-		CheckerboardItem* _tmp8_ = NULL;
-		CheckerboardItem* _tmp9_ = NULL;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 12091 "Page.c"
+		CheckerboardLayout* _tmp7_;
+		CheckerboardItem* _tmp8_;
+		CheckerboardItem* _tmp9_;
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->layout;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = checkerboard_layout_get_cursor (_tmp7_);
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp9_ == NULL;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp9_);
-#line 11999 "Page.c"
+#line 12105 "Page.c"
 	} else {
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = FALSE;
-#line 12003 "Page.c"
+#line 12109 "Page.c"
 	}
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 12009 "Page.c"
+#line 12115 "Page.c"
 	} else {
 		gboolean _tmp10_ = FALSE;
-		CheckerboardItem* _tmp11_ = NULL;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+		CheckerboardItem* _tmp11_;
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->cursor;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp11_ != NULL) {
-#line 12017 "Page.c"
-			ViewCollection* _tmp12_ = NULL;
-			ViewCollection* _tmp13_ = NULL;
-			CheckerboardItem* _tmp14_ = NULL;
-			gboolean _tmp15_ = FALSE;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 12123 "Page.c"
+			ViewCollection* _tmp12_;
+			ViewCollection* _tmp13_;
+			CheckerboardItem* _tmp14_;
+			gboolean _tmp15_;
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _tmp12_;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = self->cursor;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = !_tmp15_;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp13_);
-#line 12034 "Page.c"
+#line 12140 "Page.c"
 		} else {
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = FALSE;
-#line 12038 "Page.c"
+#line 12144 "Page.c"
 		}
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp10_;
-#line 12042 "Page.c"
+#line 12148 "Page.c"
 	}
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 12046 "Page.c"
+#line 12152 "Page.c"
 		CheckerboardItem* item = NULL;
-		CheckerboardLayout* _tmp16_ = NULL;
-		CheckerboardItem* _tmp17_ = NULL;
-		CheckerboardItem* _tmp18_ = NULL;
-		CheckerboardItem* _tmp19_ = NULL;
-		CheckerboardItem* _tmp20_ = NULL;
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+		CheckerboardLayout* _tmp16_;
+		CheckerboardItem* _tmp17_;
+		CheckerboardItem* _tmp18_;
+		CheckerboardItem* _tmp19_;
+		CheckerboardItem* _tmp20_;
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = self->priv->layout;
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = checkerboard_layout_get_item_at_coordinate (_tmp16_, 0, 0);
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 		item = _tmp17_;
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = item;
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_cursor_to_item (self, _tmp18_);
-#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = item;
-#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp20_;
-#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 12075 "Page.c"
+#line 12181 "Page.c"
 	}
-#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = self->cursor;
-#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp21_ == NULL) {
-#line 12081 "Page.c"
-		CheckerboardLayout* _tmp22_ = NULL;
-		CheckerboardItem* _tmp23_ = NULL;
-		CheckerboardItem* _tmp24_ = NULL;
-#line 1888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 12187 "Page.c"
+		CheckerboardLayout* _tmp22_;
+		CheckerboardItem* _tmp23_;
+		CheckerboardItem* _tmp24_;
+#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = self->priv->layout;
-#line 1888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = checkerboard_layout_get_cursor (_tmp22_);
-#line 1888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_CHECKERBOARD_ITEM) ? ((CheckerboardItem*) _tmp23_) : NULL;
-#line 1888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp24_ == NULL) {
-#line 1888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp23_);
-#line 12095 "Page.c"
+#line 12201 "Page.c"
 		}
-#line 1888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->cursor);
-#line 1888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
 		self->cursor = _tmp24_;
-#line 12101 "Page.c"
+#line 12207 "Page.c"
 	}
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = self->priv->layout;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = self->cursor;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = point;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = checkerboard_layout_get_item_relative_to (_tmp25_, _tmp26_, _tmp27_);
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp28_;
-#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = item;
-#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_ != NULL) {
-#line 12117 "Page.c"
-		CheckerboardItem* _tmp30_ = NULL;
-#line 1894 "/home/jens/Source/shotwell/src/Page.vala"
+#line 12223 "Page.c"
+		CheckerboardItem* _tmp30_;
+#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = item;
-#line 1894 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_cursor_to_item (self, _tmp30_);
-#line 12123 "Page.c"
+#line 12229 "Page.c"
 	}
-#line 1871 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 12127 "Page.c"
+#line 12233 "Page.c"
 }
 
 
 void checkerboard_page_set_cursor (CheckerboardPage* self, CheckerboardItem* item) {
 	Marker* marker = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	CheckerboardItem* _tmp2_ = NULL;
-	Marker* _tmp3_ = NULL;
-	Marker* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	CheckerboardItem* _tmp7_ = NULL;
-	CheckerboardItem* _tmp8_ = NULL;
-	CheckerboardItem* _tmp9_ = NULL;
-	CheckerboardItem* _tmp10_ = NULL;
-#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	CheckerboardItem* _tmp2_;
+	Marker* _tmp3_;
+	Marker* _tmp4_;
+	ViewCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	CheckerboardItem* _tmp7_;
+	CheckerboardItem* _tmp8_;
+	CheckerboardItem* _tmp9_;
+	CheckerboardItem* _tmp10_;
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = item;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
 	marker = _tmp4_;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp6_, marker);
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = item;
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = _tmp8_;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = item;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->anchor);
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 	self->anchor = _tmp10_;
-#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (marker);
-#line 12188 "Page.c"
+#line 12294 "Page.c"
 }
 
 
 void checkerboard_page_select_between_items (CheckerboardPage* self, CheckerboardItem* item_start, CheckerboardItem* item_end) {
 	Marker* marker = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	Marker* _tmp2_ = NULL;
-	Marker* _tmp3_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	Marker* _tmp2_;
+	Marker* _tmp3_;
 	gboolean passed_start = FALSE;
 	gboolean passed_end = FALSE;
-	ViewCollection* _tmp28_ = NULL;
-	ViewCollection* _tmp29_ = NULL;
-	Marker* _tmp30_ = NULL;
-#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
+	ViewCollection* _tmp28_;
+	ViewCollection* _tmp29_;
+	Marker* _tmp30_;
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item_start));
-#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item_end));
-#line 1906 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1906 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1906 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1906 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1906 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1906 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	marker = _tmp3_;
-#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
 	passed_start = FALSE;
-#line 1909 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
 	passed_end = FALSE;
-#line 12225 "Page.c"
+#line 12331 "Page.c"
 	{
 		GeeIterator* _object_it = NULL;
-		ViewCollection* _tmp4_ = NULL;
-		ViewCollection* _tmp5_ = NULL;
-		GeeCollection* _tmp6_ = NULL;
-		GeeCollection* _tmp7_ = NULL;
-		GeeIterator* _tmp8_ = NULL;
-		GeeIterator* _tmp9_ = NULL;
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+		ViewCollection* _tmp4_;
+		ViewCollection* _tmp5_;
+		GeeCollection* _tmp6_;
+		GeeCollection* _tmp7_;
+		GeeIterator* _tmp8_;
+		GeeIterator* _tmp9_;
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _tmp6_;
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 		_object_it = _tmp9_;
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 12254 "Page.c"
-			GeeIterator* _tmp10_ = NULL;
-			gboolean _tmp11_ = FALSE;
+#line 12360 "Page.c"
+			GeeIterator* _tmp10_;
+			gboolean _tmp11_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp12_ = NULL;
-			gpointer _tmp13_ = NULL;
+			GeeIterator* _tmp12_;
+			gpointer _tmp13_;
 			CheckerboardItem* item = NULL;
-			DataObject* _tmp14_ = NULL;
-			CheckerboardItem* _tmp15_ = NULL;
-			CheckerboardItem* _tmp16_ = NULL;
-			CheckerboardItem* _tmp17_ = NULL;
-			CheckerboardItem* _tmp18_ = NULL;
-			CheckerboardItem* _tmp19_ = NULL;
+			DataObject* _tmp14_;
+			CheckerboardItem* _tmp15_;
+			CheckerboardItem* _tmp16_;
+			CheckerboardItem* _tmp17_;
+			CheckerboardItem* _tmp18_;
+			CheckerboardItem* _tmp19_;
 			gboolean _tmp20_ = FALSE;
-			gboolean _tmp21_ = FALSE;
+			gboolean _tmp21_;
 			gboolean _tmp25_ = FALSE;
-			gboolean _tmp26_ = FALSE;
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+			gboolean _tmp26_;
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = _object_it;
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = gee_iterator_next (_tmp10_);
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp11_) {
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 12279 "Page.c"
+#line 12385 "Page.c"
 			}
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _object_it;
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = gee_iterator_get (_tmp12_);
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 			object = (DataObject*) _tmp13_;
-#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = object;
-#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
 			item = _tmp15_;
-#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = item_start;
-#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = item;
-#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp16_ == _tmp17_) {
-#line 1915 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
 				passed_start = TRUE;
-#line 12301 "Page.c"
+#line 12407 "Page.c"
 			}
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = item_end;
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = item;
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp18_ == _tmp19_) {
-#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
 				passed_end = TRUE;
-#line 12311 "Page.c"
+#line 12417 "Page.c"
 			}
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = passed_start;
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp21_) {
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = TRUE;
-#line 12319 "Page.c"
+#line 12425 "Page.c"
 			} else {
-				gboolean _tmp22_ = FALSE;
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+				gboolean _tmp22_;
+#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = passed_end;
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = _tmp22_;
-#line 12326 "Page.c"
+#line 12432 "Page.c"
 			}
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp20_) {
-#line 12330 "Page.c"
-				Marker* _tmp23_ = NULL;
-				DataObject* _tmp24_ = NULL;
-#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
+#line 12436 "Page.c"
+				Marker* _tmp23_;
+				DataObject* _tmp24_;
+#line 1941 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = marker;
-#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = object;
-#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Page.vala"
 				marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_VIEW, DataView), TYPE_DATA_OBJECT, DataObject));
-#line 12339 "Page.c"
+#line 12445 "Page.c"
 			}
-#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = passed_start;
-#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp26_) {
-#line 12345 "Page.c"
-				gboolean _tmp27_ = FALSE;
-#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
+#line 12451 "Page.c"
+				gboolean _tmp27_;
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = passed_end;
-#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = _tmp27_;
-#line 12351 "Page.c"
+#line 12457 "Page.c"
 			} else {
-#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = FALSE;
-#line 12355 "Page.c"
+#line 12461 "Page.c"
 			}
-#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp25_) {
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (item);
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (object);
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 12365 "Page.c"
+#line 12471 "Page.c"
 			}
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (object);
-#line 12371 "Page.c"
+#line 12477 "Page.c"
 		}
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_object_it);
-#line 12375 "Page.c"
+#line 12481 "Page.c"
 	}
-#line 1927 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1927 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = _tmp28_;
-#line 1927 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = marker;
-#line 1927 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp29_, _tmp30_);
-#line 1927 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp29_);
-#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (marker);
-#line 12389 "Page.c"
+#line 12495 "Page.c"
 }
 
 
 void checkerboard_page_select_anchor_to_cursor (CheckerboardPage* self, guint state) {
 	gboolean _tmp0_ = FALSE;
-	CheckerboardItem* _tmp1_ = NULL;
-	guint _tmp3_ = 0U;
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+	CheckerboardItem* _tmp1_;
+	guint _tmp3_;
+#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->cursor;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ == NULL) {
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = TRUE;
-#line 12405 "Page.c"
+#line 12511 "Page.c"
 	} else {
-		CheckerboardItem* _tmp2_ = NULL;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+		CheckerboardItem* _tmp2_;
+#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->anchor;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 12412 "Page.c"
+#line 12518 "Page.c"
 	}
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1952 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 12418 "Page.c"
+#line 12524 "Page.c"
 	}
-#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = state;
-#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == ((guint) GDK_SHIFT_MASK)) {
-#line 12424 "Page.c"
-		ViewCollection* _tmp4_ = NULL;
-		ViewCollection* _tmp5_ = NULL;
-		CheckerboardItem* _tmp6_ = NULL;
-		CheckerboardItem* _tmp7_ = NULL;
-#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 12530 "Page.c"
+		ViewCollection* _tmp4_;
+		ViewCollection* _tmp5_;
+		CheckerboardItem* _tmp6_;
+		CheckerboardItem* _tmp7_;
+#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp5_);
-#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1956 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->anchor;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1956 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->cursor;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1956 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_select_between_items (self, _tmp6_, _tmp7_);
-#line 12443 "Page.c"
+#line 12549 "Page.c"
 	} else {
-		CheckerboardItem* _tmp8_ = NULL;
-		CheckerboardItem* _tmp9_ = NULL;
-#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
+		CheckerboardItem* _tmp8_;
+		CheckerboardItem* _tmp9_;
+#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->cursor;
-#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp9_;
-#line 12455 "Page.c"
+#line 12561 "Page.c"
 	}
 }
 
 
 static void checkerboard_page_real_set_display_titles (CheckerboardPage* self, gboolean display) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
+	gboolean _tmp4_;
 	GValue _tmp5_ = {0};
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = display;
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_TITLES, &_tmp5_, NULL, NULL);
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 1945 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1945 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 1945 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1945 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 12501 "Page.c"
+#line 12607 "Page.c"
 }
 
 
 void checkerboard_page_set_display_titles (CheckerboardPage* self, gboolean display) {
-#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->set_display_titles (self, display);
-#line 12510 "Page.c"
+#line 12616 "Page.c"
 }
 
 
 static void checkerboard_page_real_set_display_comments (CheckerboardPage* self, gboolean display) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
+	gboolean _tmp4_;
 	GValue _tmp5_ = {0};
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = display;
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_COMMENTS, &_tmp5_, NULL, NULL);
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 12555 "Page.c"
+#line 12661 "Page.c"
 }
 
 
 void checkerboard_page_set_display_comments (CheckerboardPage* self, gboolean display) {
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->set_display_comments (self, display);
-#line 12564 "Page.c"
+#line 12670 "Page.c"
 }
 
 
 void checkerboard_page_keyboard_modifiers_init (CheckerboardPageKeyboardModifiers *self, Page* page) {
-	Page* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	Page* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	Page* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	Page* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-#line 1231 "/home/jens/Source/shotwell/src/Page.vala"
+	Page* _tmp0_;
+	gboolean _tmp1_;
+	Page* _tmp2_;
+	gboolean _tmp3_;
+	Page* _tmp4_;
+	gboolean _tmp5_;
+	Page* _tmp6_;
+	gboolean _tmp7_;
+#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (self, 0, sizeof (CheckerboardPageKeyboardModifiers));
-#line 1232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page;
-#line 1232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_ctrl_pressed (_tmp0_);
-#line 1232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).ctrl_pressed = _tmp1_;
-#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page;
-#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = page_get_alt_pressed (_tmp2_);
-#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).alt_pressed = _tmp3_;
-#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page;
-#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_shift_pressed (_tmp4_);
-#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).shift_pressed = _tmp5_;
-#line 1235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page;
-#line 1235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = page_get_super_pressed (_tmp6_);
-#line 1235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).super_pressed = _tmp7_;
-#line 12605 "Page.c"
+#line 12711 "Page.c"
 }
 
 
 CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (const CheckerboardPageKeyboardModifiers* self) {
 	CheckerboardPageKeyboardModifiers* dup;
-#line 1230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
 	dup = g_new0 (CheckerboardPageKeyboardModifiers, 1);
-#line 1230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
 	memcpy (dup, self, sizeof (CheckerboardPageKeyboardModifiers));
-#line 1230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
 	return dup;
-#line 12617 "Page.c"
+#line 12723 "Page.c"
 }
 
 
 void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self) {
-#line 1230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
 	g_free (self);
-#line 12624 "Page.c"
+#line 12730 "Page.c"
 }
 
 
@@ -12636,113 +12742,113 @@ GType checkerboard_page_keyboard_modifiers_get_type (void) {
 
 
 static void checkerboard_page_class_init (CheckerboardPageClass * klass) {
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_parent_class = g_type_class_peek_parent (klass);
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (CheckerboardPagePrivate));
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->get_item_context_menu = (GtkMenu* (*)(CheckerboardPage*)) checkerboard_page_real_get_item_context_menu;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->get_page_context_menu = (GtkMenu* (*)(Page*)) checkerboard_page_real_get_page_context_menu;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_context_keypress = (gboolean (*)(Page*)) checkerboard_page_real_on_context_keypress;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*)(CheckerboardPage*)) checkerboard_page_real_get_view_empty_message;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->get_filter_no_match_message = (gchar* (*)(CheckerboardPage*)) checkerboard_page_real_get_filter_no_match_message;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->on_item_activated = (void (*)(CheckerboardPage*, CheckerboardItem*, CheckerboardPageActivator, CheckerboardPageKeyboardModifiers*)) checkerboard_page_real_on_item_activated;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) checkerboard_page_real_get_search_view_filter;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*)(CheckerboardPage*)) checkerboard_page_real_get_view_tracker;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->switching_from = (void (*)(Page*)) checkerboard_page_real_switching_from;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->switched_to = (void (*)(Page*)) checkerboard_page_real_switched_to;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->set_page_name = (void (*)(Page*, const gchar*)) checkerboard_page_real_set_page_name;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) checkerboard_page_real_key_press_event;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_left_click = (gboolean (*)(Page*, GdkEventButton*)) checkerboard_page_real_on_left_click;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_left_released = (gboolean (*)(Page*, GdkEventButton*)) checkerboard_page_real_on_left_released;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_right_click = (gboolean (*)(Page*, GdkEventButton*)) checkerboard_page_real_on_right_click;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->on_mouse_over = (gboolean (*)(CheckerboardPage*, CheckerboardItem*, gint, gint, GdkModifierType)) checkerboard_page_real_on_mouse_over;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_motion = (gboolean (*)(Page*, GdkEventMotion*, gint, gint, GdkModifierType)) checkerboard_page_real_on_motion;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->set_display_titles = (void (*)(CheckerboardPage*, gboolean)) checkerboard_page_real_set_display_titles;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->set_display_comments = (void (*)(CheckerboardPage*, gboolean)) checkerboard_page_real_set_display_comments;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((CheckerboardPageClass *) klass)->get_item_context_menu = (GtkMenu* (*) (CheckerboardPage *)) checkerboard_page_real_get_item_context_menu;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((PageClass *) klass)->get_page_context_menu = (GtkMenu* (*) (Page *)) checkerboard_page_real_get_page_context_menu;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((PageClass *) klass)->on_context_keypress = (gboolean (*) (Page *)) checkerboard_page_real_on_context_keypress;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*) (CheckerboardPage *)) checkerboard_page_real_get_view_empty_message;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((CheckerboardPageClass *) klass)->get_filter_no_match_message = (gchar* (*) (CheckerboardPage *)) checkerboard_page_real_get_filter_no_match_message;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((CheckerboardPageClass *) klass)->on_item_activated = (void (*) (CheckerboardPage *, CheckerboardItem*, CheckerboardPageActivator, CheckerboardPageKeyboardModifiers*)) checkerboard_page_real_on_item_activated;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) checkerboard_page_real_get_search_view_filter;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*) (CheckerboardPage *)) checkerboard_page_real_get_view_tracker;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((PageClass *) klass)->switching_from = (void (*) (Page *)) checkerboard_page_real_switching_from;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((PageClass *) klass)->switched_to = (void (*) (Page *)) checkerboard_page_real_switched_to;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((PageClass *) klass)->set_page_name = (void (*) (Page *, const gchar*)) checkerboard_page_real_set_page_name;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) checkerboard_page_real_key_press_event;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((PageClass *) klass)->on_left_click = (gboolean (*) (Page *, GdkEventButton*)) checkerboard_page_real_on_left_click;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((PageClass *) klass)->on_left_released = (gboolean (*) (Page *, GdkEventButton*)) checkerboard_page_real_on_left_released;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((PageClass *) klass)->on_right_click = (gboolean (*) (Page *, GdkEventButton*)) checkerboard_page_real_on_right_click;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((CheckerboardPageClass *) klass)->on_mouse_over = (gboolean (*) (CheckerboardPage *, CheckerboardItem*, gint, gint, GdkModifierType)) checkerboard_page_real_on_mouse_over;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((PageClass *) klass)->on_motion = (gboolean (*) (Page *, GdkEventMotion*, gint, gint, GdkModifierType)) checkerboard_page_real_on_motion;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((CheckerboardPageClass *) klass)->set_display_titles = (void (*) (CheckerboardPage *, gboolean)) checkerboard_page_real_set_display_titles;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+	((CheckerboardPageClass *) klass)->set_display_comments = (void (*) (CheckerboardPage *, gboolean)) checkerboard_page_real_set_display_comments;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = checkerboard_page_finalize;
-#line 12684 "Page.c"
+#line 12790 "Page.c"
 }
 
 
 static void checkerboard_page_instance_init (CheckerboardPage * self) {
-	GtkViewport* _tmp0_ = NULL;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkViewport* _tmp0_;
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = CHECKERBOARD_PAGE_GET_PRIVATE (self);
-#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->item_context_menu_path = NULL;
-#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_context_menu_path = NULL;
-#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = (GtkViewport*) gtk_viewport_new (NULL, NULL);
-#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->viewport = _tmp0_;
-#line 1218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1235 "/home/jens/Source/shotwell/src/Page.vala"
 	self->anchor = NULL;
-#line 1219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1236 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = NULL;
-#line 1220 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->highlighted = NULL;
-#line 1221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->autoscroll_scheduled = FALSE;
-#line 1222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->activated_item = NULL;
-#line 1223 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->previously_selected = NULL;
-#line 12714 "Page.c"
+#line 12820 "Page.c"
 }
 
 
-static void checkerboard_page_finalize (GObject* obj) {
+static void checkerboard_page_finalize (GObject * obj) {
 	CheckerboardPage * self;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->layout);
-#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->item_context_menu_path);
-#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_context_menu_path);
-#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->viewport);
-#line 1218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1235 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->anchor);
-#line 1219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1236 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1220 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->highlighted);
-#line 1222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->activated_item);
-#line 1223 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->previously_selected);
-#line 1290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->item_context_menu);
-#line 1302 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->page_context_menu);
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (checkerboard_page_parent_class)->finalize (obj);
-#line 12746 "Page.c"
+#line 12852 "Page.c"
 }
 
 
@@ -12771,2070 +12877,2070 @@ GType single_photo_page_update_reason_get_type (void) {
 
 
 static void _single_photo_page_on_viewport_resize_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) {
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_on_viewport_resize ((SinglePhotoPage*) self);
-#line 12777 "Page.c"
+#line 12883 "Page.c"
 }
 
 
 static gboolean _single_photo_page_on_canvas_exposed_gtk_widget_draw (GtkWidget* _sender, cairo_t* cr, gpointer self) {
 	gboolean result;
 	result = single_photo_page_on_canvas_exposed ((SinglePhotoPage*) self, cr);
-#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 12786 "Page.c"
+#line 12892 "Page.c"
 }
 
 
 SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* page_name, gboolean scale_up_to_viewport) {
 	SinglePhotoPage * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	TransitionEffectsManager* _tmp2_ = NULL;
-	TransitionEffectsManager* _tmp3_ = NULL;
-	TransitionClock* _tmp4_ = NULL;
-	GtkViewport* _tmp5_ = NULL;
-	GtkViewport* _tmp6_ = NULL;
-	GtkViewport* _tmp7_ = NULL;
-	GtkDrawingArea* _tmp8_ = NULL;
-	GtkViewport* _tmp9_ = NULL;
-	GtkDrawingArea* _tmp10_ = NULL;
-	GtkViewport* _tmp11_ = NULL;
-	GtkDrawingArea* _tmp12_ = NULL;
-	GtkDrawingArea* _tmp13_ = NULL;
-#line 1987 "/home/jens/Source/shotwell/src/Page.vala"
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
+	TransitionEffectsManager* _tmp2_;
+	TransitionEffectsManager* _tmp3_;
+	TransitionClock* _tmp4_;
+	GtkViewport* _tmp5_;
+	GtkViewport* _tmp6_;
+	GtkViewport* _tmp7_;
+	GtkDrawingArea* _tmp8_;
+	GtkViewport* _tmp9_;
+	GtkDrawingArea* _tmp10_;
+	GtkViewport* _tmp11_;
+	GtkDrawingArea* _tmp12_;
+	GtkDrawingArea* _tmp13_;
+#line 2007 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
-#line 1988 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2008 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 1988 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2008 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (SinglePhotoPage*) page_construct (object_type, _tmp0_);
-#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = scale_up_to_viewport;
-#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scale_up_to_viewport = _tmp1_;
-#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = transition_effects_manager_get_instance ();
-#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = transition_effects_manager_create_null_transition_clock (_tmp3_);
-#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_clock = _tmp4_;
-#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_effects_manager_unref0 (_tmp3_);
-#line 1996 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_scrolled_window_set_policy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), (guint) 0);
-#line 1999 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2019 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_scrolled_window_set_shadow_type (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_SHADOW_NONE);
-#line 2001 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->viewport;
-#line 2001 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_viewport_set_shadow_type (_tmp5_, GTK_SHADOW_NONE);
-#line 2002 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->viewport;
-#line 2002 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), (guint) 0);
-#line 2003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->viewport;
-#line 2003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->canvas;
-#line 2003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
-#line 2005 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->viewport;
-#line 2005 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 2007 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->canvas;
-#line 2007 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), (gint) ((GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK) | GDK_SUBSTRUCTURE_MASK));
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->viewport;
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), "size-allocate", (GCallback) _single_photo_page_on_viewport_resize_gtk_widget_size_allocate, self, 0);
-#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->canvas;
-#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), "draw", (GCallback) _single_photo_page_on_canvas_exposed_gtk_widget_draw, self, 0);
-#line 2013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2033 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->canvas;
-#line 2013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2033 "/home/jens/Source/shotwell/src/Page.vala"
 	page_set_event_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
-#line 1987 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2007 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 12870 "Page.c"
+#line 12976 "Page.c"
 }
 
 
 gboolean single_photo_page_is_transition_in_progress (SinglePhotoPage* self) {
 	gboolean result = FALSE;
-	TransitionClock* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-#line 2016 "/home/jens/Source/shotwell/src/Page.vala"
+	TransitionClock* _tmp0_;
+	gboolean _tmp1_;
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2017 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->transition_clock;
-#line 2017 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = transition_clock_is_in_progress (_tmp0_);
-#line 2017 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2017 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 12888 "Page.c"
+#line 12994 "Page.c"
 }
 
 
 void single_photo_page_cancel_transition (SinglePhotoPage* self) {
-	TransitionClock* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-#line 2020 "/home/jens/Source/shotwell/src/Page.vala"
+	TransitionClock* _tmp0_;
+	gboolean _tmp1_;
+#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->transition_clock;
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = transition_clock_is_in_progress (_tmp0_);
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 12903 "Page.c"
-		TransitionClock* _tmp2_ = NULL;
-#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 13009 "Page.c"
+		TransitionClock* _tmp2_;
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->transition_clock;
-#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 		transition_clock_cancel (_tmp2_);
-#line 12909 "Page.c"
+#line 13015 "Page.c"
 	}
 }
 
 
 void single_photo_page_set_transition (SinglePhotoPage* self, const gchar* effect_id, gint duration_msec) {
-	TransitionEffectsManager* _tmp0_ = NULL;
-	TransitionEffectsManager* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	TransitionClock* _tmp3_ = NULL;
-	TransitionClock* _tmp4_ = NULL;
-	gint _tmp8_ = 0;
-#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
+	TransitionEffectsManager* _tmp0_;
+	TransitionEffectsManager* _tmp1_;
+	const gchar* _tmp2_;
+	TransitionClock* _tmp3_;
+	TransitionClock* _tmp4_;
+	gint _tmp8_;
+#line 2045 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (effect_id != NULL);
-#line 2026 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2046 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_cancel_transition (self);
-#line 2028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = transition_effects_manager_get_instance ();
-#line 2028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 2028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = effect_id;
-#line 2028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = transition_effects_manager_create_transition_clock (_tmp1_, _tmp2_);
-#line 2028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 2028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_clock = _tmp3_;
-#line 2028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_effects_manager_unref0 (_tmp1_);
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->transition_clock;
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 12945 "Page.c"
-		TransitionEffectsManager* _tmp5_ = NULL;
-		TransitionEffectsManager* _tmp6_ = NULL;
-		TransitionClock* _tmp7_ = NULL;
-#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 13051 "Page.c"
+		TransitionEffectsManager* _tmp5_;
+		TransitionEffectsManager* _tmp6_;
+		TransitionClock* _tmp7_;
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = transition_effects_manager_get_instance ();
-#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = transition_effects_manager_create_null_transition_clock (_tmp6_);
-#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_transition_clock_unref0 (self->priv->transition_clock);
-#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->transition_clock = _tmp7_;
-#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_transition_effects_manager_unref0 (_tmp6_);
-#line 12961 "Page.c"
+#line 13067 "Page.c"
 	}
-#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = duration_msec;
-#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_duration_msec = _tmp8_;
-#line 12967 "Page.c"
+#line 13073 "Page.c"
 }
 
 
 static void single_photo_page_render_zoomed_to_pixmap (SinglePhotoPage* self, ZoomState* zoom_state) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	GdkRectangle view_rect = {0};
 	GdkRectangle _tmp1_ = {0};
 	GdkPixbuf* zoomed = NULL;
-	ZoomBuffer* _tmp2_ = NULL;
-	ZoomBuffer* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	GdkPixbuf* _tmp34_ = NULL;
+	ZoomBuffer* _tmp2_;
+	ZoomBuffer* _tmp3_;
+	gboolean _tmp4_;
+	GdkPixbuf* _tmp34_;
 	gint draw_x = 0;
-	Dimensions _tmp35_ = {0};
-	gint _tmp36_ = 0;
-	GdkRectangle _tmp37_ = {0};
-	gint _tmp38_ = 0;
-	gint _tmp39_ = 0;
-	gint _tmp40_ = 0;
+	Dimensions _tmp35_;
+	gint _tmp36_;
+	GdkRectangle _tmp37_;
+	gint _tmp38_;
+	gint _tmp39_;
+	gint _tmp40_;
 	gint draw_y = 0;
-	Dimensions _tmp41_ = {0};
-	gint _tmp42_ = 0;
-	GdkRectangle _tmp43_ = {0};
-	gint _tmp44_ = 0;
-	gint _tmp45_ = 0;
-	gint _tmp46_ = 0;
-	cairo_t* _tmp47_ = NULL;
-	GdkPixbuf* _tmp48_ = NULL;
-	gint _tmp49_ = 0;
-	gint _tmp50_ = 0;
-	cairo_t* _tmp51_ = NULL;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+	Dimensions _tmp41_;
+	gint _tmp42_;
+	GdkRectangle _tmp43_;
+	gint _tmp44_;
+	gint _tmp45_;
+	gint _tmp46_;
+	cairo_t* _tmp47_;
+	GdkPixbuf* _tmp48_;
+	gint _tmp49_;
+	gint _tmp50_;
+	cairo_t* _tmp51_;
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (zoom_state != NULL);
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2057 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2057 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2039 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp1_);
-#line 2039 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
 	view_rect = _tmp1_;
-#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = single_photo_page_get_zoom_buffer (self);
-#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_ != NULL;
-#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 13021 "Page.c"
+#line 13127 "Page.c"
 		GdkPixbuf* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
-		GdkPixbuf* _tmp15_ = NULL;
-#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
+		gboolean _tmp6_;
+		GdkPixbuf* _tmp15_;
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->zoom_high_quality;
-#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp6_) {
-#line 13029 "Page.c"
-			ZoomBuffer* _tmp7_ = NULL;
-			ZoomBuffer* _tmp8_ = NULL;
-			ZoomState _tmp9_ = {0};
-			GdkPixbuf* _tmp10_ = NULL;
-#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 13135 "Page.c"
+			ZoomBuffer* _tmp7_;
+			ZoomBuffer* _tmp8_;
+			ZoomState _tmp9_;
+			GdkPixbuf* _tmp10_;
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = single_photo_page_get_zoom_buffer (self);
-#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = _tmp7_;
-#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = *zoom_state;
-#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = zoom_buffer_get_zoomed_image (_tmp8_, &_tmp9_);
-#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp5_);
-#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp10_;
-#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp8_);
-#line 13048 "Page.c"
+#line 13154 "Page.c"
 		} else {
-			ZoomBuffer* _tmp11_ = NULL;
-			ZoomBuffer* _tmp12_ = NULL;
-			ZoomState _tmp13_ = {0};
-			GdkPixbuf* _tmp14_ = NULL;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+			ZoomBuffer* _tmp11_;
+			ZoomBuffer* _tmp12_;
+			ZoomState _tmp13_;
+			GdkPixbuf* _tmp14_;
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = single_photo_page_get_zoom_buffer (self);
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _tmp11_;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = *zoom_state;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = zoom_buffer_get_zoom_preview_image (_tmp12_, &_tmp13_);
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp5_);
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp14_;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp12_);
-#line 13068 "Page.c"
+#line 13174 "Page.c"
 		}
-#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = _g_object_ref0 (_tmp5_);
-#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 		zoomed = _tmp15_;
-#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp5_);
-#line 13078 "Page.c"
+#line 13184 "Page.c"
 	} else {
 		GdkRectangle view_rect_proj = {0};
-		GdkPixbuf* _tmp16_ = NULL;
+		GdkPixbuf* _tmp16_;
 		GdkRectangle _tmp17_ = {0};
 		GdkPixbuf* proj_subpixbuf = NULL;
-		GdkPixbuf* _tmp18_ = NULL;
-		GdkRectangle _tmp19_ = {0};
-		gint _tmp20_ = 0;
-		GdkRectangle _tmp21_ = {0};
-		gint _tmp22_ = 0;
-		GdkRectangle _tmp23_ = {0};
-		gint _tmp24_ = 0;
-		GdkRectangle _tmp25_ = {0};
-		gint _tmp26_ = 0;
-		GdkPixbuf* _tmp27_ = NULL;
-		GdkPixbuf* _tmp28_ = NULL;
-		GdkRectangle _tmp29_ = {0};
-		gint _tmp30_ = 0;
-		GdkRectangle _tmp31_ = {0};
-		gint _tmp32_ = 0;
-		GdkPixbuf* _tmp33_ = NULL;
-#line 2046 "/home/jens/Source/shotwell/src/Page.vala"
+		GdkPixbuf* _tmp18_;
+		GdkRectangle _tmp19_;
+		gint _tmp20_;
+		GdkRectangle _tmp21_;
+		gint _tmp22_;
+		GdkRectangle _tmp23_;
+		gint _tmp24_;
+		GdkRectangle _tmp25_;
+		gint _tmp26_;
+		GdkPixbuf* _tmp27_;
+		GdkPixbuf* _tmp28_;
+		GdkRectangle _tmp29_;
+		gint _tmp30_;
+		GdkRectangle _tmp31_;
+		gint _tmp32_;
+		GdkPixbuf* _tmp33_;
+#line 2066 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = self->priv->unscaled;
-#line 2046 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2066 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_get_viewing_rectangle_projection (zoom_state, _tmp16_, &_tmp17_);
-#line 2046 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2066 "/home/jens/Source/shotwell/src/Page.vala"
 		view_rect_proj = _tmp17_;
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = self->priv->unscaled;
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = view_rect_proj;
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _tmp19_.x;
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = view_rect_proj;
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = _tmp21_.y;
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = view_rect_proj;
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _tmp23_.width;
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = view_rect_proj;
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = _tmp25_.height;
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = gdk_pixbuf_new_subpixbuf (_tmp18_, _tmp20_, _tmp22_, _tmp24_, _tmp26_);
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 		proj_subpixbuf = _tmp27_;
-#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = proj_subpixbuf;
-#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = view_rect;
-#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = _tmp29_.width;
-#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = view_rect;
-#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _tmp31_.height;
-#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp33_ = gdk_pixbuf_scale_simple (_tmp28_, _tmp30_, _tmp32_, GDK_INTERP_BILINEAR);
-#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
 		zoomed = _tmp33_;
-#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (proj_subpixbuf);
-#line 13146 "Page.c"
+#line 13252 "Page.c"
 	}
-#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp34_ = zoomed;
-#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp34_ == NULL) {
-#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2076 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2076 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 13156 "Page.c"
+#line 13262 "Page.c"
 	}
-#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp35_ = self->priv->pixmap_dim;
-#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp36_ = _tmp35_.width;
-#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp37_ = view_rect;
-#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp38_ = _tmp37_.width;
-#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_x = (_tmp36_ - _tmp38_) / 2;
-#line 2060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = draw_x;
-#line 2060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = CLAMP (_tmp39_, 0, G_MAXINT);
-#line 2060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_x = _tmp40_;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = self->priv->pixmap_dim;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = _tmp41_.height;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp43_ = view_rect;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp44_ = _tmp43_.height;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_y = (_tmp42_ - _tmp44_) / 2;
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = draw_y;
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp46_ = CLAMP (_tmp45_, 0, G_MAXINT);
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_y = _tmp46_;
-#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp47_ = self->priv->pixmap_ctx;
-#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp48_ = zoomed;
-#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = draw_x;
-#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp50_ = draw_y;
-#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_cairo_set_source_pixbuf (_tmp47_, _tmp48_, (gdouble) _tmp49_, (gdouble) _tmp50_);
-#line 2066 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2086 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp51_ = self->priv->pixmap_ctx;
-#line 2066 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2086 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp51_);
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (zoomed);
-#line 13206 "Page.c"
+#line 13312 "Page.c"
 }
 
 
 void single_photo_page_on_interactive_zoom (SinglePhotoPage* self, ZoomState* interactive_zoom_state) {
-	gboolean _tmp0_ = FALSE;
-	cairo_t* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
+	gboolean _tmp0_;
+	cairo_t* _tmp1_;
+	cairo_t* _tmp2_;
 	gboolean old_quality_setting = FALSE;
-	gboolean _tmp3_ = FALSE;
-	ZoomState _tmp4_ = {0};
-	GtkDrawingArea* _tmp5_ = NULL;
-#line 2069 "/home/jens/Source/shotwell/src/Page.vala"
+	gboolean _tmp3_;
+	ZoomState _tmp4_;
+	GtkDrawingArea* _tmp5_;
+#line 2089 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2069 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (interactive_zoom_state != NULL);
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2072 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2092 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2072 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2092 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp1_, "#000");
-#line 2073 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2093 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_ctx;
-#line 2073 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2093 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp2_);
-#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->zoom_high_quality;
-#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
 	old_quality_setting = _tmp3_;
-#line 2076 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = FALSE;
-#line 2077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = *interactive_zoom_state;
-#line 2077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_render_zoomed_to_pixmap (self, &_tmp4_);
-#line 2078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = old_quality_setting;
-#line 2080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->canvas;
-#line 2080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 13250 "Page.c"
+#line 13356 "Page.c"
 }
 
 
 void single_photo_page_on_interactive_pan (SinglePhotoPage* self, ZoomState* interactive_zoom_state) {
-	gboolean _tmp0_ = FALSE;
-	cairo_t* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
+	gboolean _tmp0_;
+	cairo_t* _tmp1_;
+	cairo_t* _tmp2_;
 	gboolean old_quality_setting = FALSE;
-	gboolean _tmp3_ = FALSE;
-	ZoomState _tmp4_ = {0};
-	GtkDrawingArea* _tmp5_ = NULL;
-#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
+	gboolean _tmp3_;
+	ZoomState _tmp4_;
+	GtkDrawingArea* _tmp5_;
+#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (interactive_zoom_state != NULL);
-#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2104 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2104 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2106 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2106 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp1_, "#000");
-#line 2087 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_ctx;
-#line 2087 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp2_);
-#line 2089 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2109 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->zoom_high_quality;
-#line 2089 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2109 "/home/jens/Source/shotwell/src/Page.vala"
 	old_quality_setting = _tmp3_;
-#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = TRUE;
-#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2111 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = *interactive_zoom_state;
-#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2111 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_render_zoomed_to_pixmap (self, &_tmp4_);
-#line 2092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = old_quality_setting;
-#line 2094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2114 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->canvas;
-#line 2094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2114 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 13294 "Page.c"
+#line 13400 "Page.c"
 }
 
 
 static gboolean single_photo_page_real_is_zoom_supported (SinglePhotoPage* self) {
 	gboolean result = FALSE;
-#line 2098 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2118 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 2098 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2118 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13304 "Page.c"
+#line 13410 "Page.c"
 }
 
 
 gboolean single_photo_page_is_zoom_supported (SinglePhotoPage* self) {
-#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Page.vala"
 	return SINGLE_PHOTO_PAGE_GET_CLASS (self)->is_zoom_supported (self);
-#line 13313 "Page.c"
+#line 13419 "Page.c"
 }
 
 
 static void single_photo_page_real_cancel_zoom (SinglePhotoPage* self) {
-	cairo_surface_t* _tmp0_ = NULL;
-#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
+	cairo_surface_t* _tmp0_;
+#line 2122 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2122 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 13323 "Page.c"
-		cairo_t* _tmp1_ = NULL;
-		cairo_t* _tmp2_ = NULL;
-#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 13429 "Page.c"
+		cairo_t* _tmp1_;
+		cairo_t* _tmp2_;
+#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->pixmap_ctx;
-#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp1_, "#000");
-#line 2104 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->pixmap_ctx;
-#line 2104 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_paint (_tmp2_);
-#line 13334 "Page.c"
+#line 13440 "Page.c"
 	}
 }
 
 
 void single_photo_page_cancel_zoom (SinglePhotoPage* self) {
-#line 2101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2121 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2121 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->cancel_zoom (self);
-#line 13344 "Page.c"
+#line 13450 "Page.c"
 }
 
 
 static void single_photo_page_real_save_zoom_state (SinglePhotoPage* self) {
-	ZoomState _tmp0_ = {0};
-#line 2109 "/home/jens/Source/shotwell/src/Page.vala"
+	ZoomState _tmp0_;
+#line 2129 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->static_zoom_state;
-#line 2109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->saved_zoom_state = _tmp0_;
-#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = TRUE;
-#line 13356 "Page.c"
+#line 13462 "Page.c"
 }
 
 
 void single_photo_page_save_zoom_state (SinglePhotoPage* self) {
-#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->save_zoom_state (self);
-#line 13365 "Page.c"
+#line 13471 "Page.c"
 }
 
 
 static void single_photo_page_real_restore_zoom_state (SinglePhotoPage* self) {
-	gboolean _tmp0_ = FALSE;
-	ZoomState _tmp1_ = {0};
-#line 2114 "/home/jens/Source/shotwell/src/Page.vala"
+	gboolean _tmp0_;
+	ZoomState _tmp1_;
+#line 2134 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->has_saved_zoom_state;
-#line 2114 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2134 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 2115 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 13378 "Page.c"
+#line 13484 "Page.c"
 	}
-#line 2117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->saved_zoom_state;
-#line 2117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->static_zoom_state = _tmp1_;
-#line 2118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, NULL);
-#line 2119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2139 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = FALSE;
-#line 13388 "Page.c"
+#line 13494 "Page.c"
 }
 
 
 void single_photo_page_restore_zoom_state (SinglePhotoPage* self) {
-#line 2113 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2113 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->restore_zoom_state (self);
-#line 13397 "Page.c"
+#line 13503 "Page.c"
 }
 
 
 static ZoomBuffer* single_photo_page_real_get_zoom_buffer (SinglePhotoPage* self) {
 	ZoomBuffer* result = NULL;
-#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13407 "Page.c"
+#line 13513 "Page.c"
 }
 
 
 ZoomBuffer* single_photo_page_get_zoom_buffer (SinglePhotoPage* self) {
-#line 2122 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2142 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2122 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2142 "/home/jens/Source/shotwell/src/Page.vala"
 	return SINGLE_PHOTO_PAGE_GET_CLASS (self)->get_zoom_buffer (self);
-#line 13416 "Page.c"
+#line 13522 "Page.c"
 }
 
 
 void single_photo_page_get_saved_zoom_state (SinglePhotoPage* self, ZoomState* result) {
-	ZoomState _tmp0_ = {0};
-#line 2126 "/home/jens/Source/shotwell/src/Page.vala"
+	ZoomState _tmp0_;
+#line 2146 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2127 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->saved_zoom_state;
-#line 2127 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2127 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13430 "Page.c"
+#line 13536 "Page.c"
 }
 
 
 void single_photo_page_set_zoom_state (SinglePhotoPage* self, ZoomState* zoom_state) {
-	gboolean _tmp0_ = FALSE;
-	ZoomState _tmp1_ = {0};
-#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
+	gboolean _tmp0_;
+	ZoomState _tmp1_;
+#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (zoom_state != NULL);
-#line 2131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2153 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = *zoom_state;
-#line 2133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2153 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->static_zoom_state = _tmp1_;
-#line 13449 "Page.c"
+#line 13555 "Page.c"
 }
 
 
 void single_photo_page_get_zoom_state (SinglePhotoPage* self, ZoomState* result) {
-	gboolean _tmp0_ = FALSE;
-	ZoomState _tmp1_ = {0};
-#line 2136 "/home/jens/Source/shotwell/src/Page.vala"
+	gboolean _tmp0_;
+	ZoomState _tmp1_;
+#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2157 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2157 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->static_zoom_state;
-#line 2139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp1_;
-#line 2139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13468 "Page.c"
+#line 13574 "Page.c"
 }
 
 
 static void single_photo_page_real_switched_to (Page* base) {
 	SinglePhotoPage * self;
-	GdkPixbuf* _tmp0_ = NULL;
-#line 2142 "/home/jens/Source/shotwell/src/Page.vala"
+	GdkPixbuf* _tmp0_;
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (single_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2145 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2165 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2145 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2165 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 2146 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2166 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_repaint (self, NULL);
-#line 13485 "Page.c"
+#line 13591 "Page.c"
 	}
 }
 
 
 static void single_photo_page_real_set_container (Page* base, GtkWindow* container) {
 	SinglePhotoPage * self;
-	GtkWindow* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
-#line 2149 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkWindow* _tmp0_;
+	GtkWindow* _tmp1_;
+#line 2169 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2149 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2169 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GTK_IS_WINDOW (container));
-#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = container;
-#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (single_photo_page_parent_class)->set_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp0_);
-#line 2154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = container;
-#line 2154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) {
-#line 2155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_scrolled_window_set_policy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-#line 13508 "Page.c"
+#line 13614 "Page.c"
 	}
 }
 
 
 void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, Dimensions* max_dim, Direction* direction) {
-	Dimensions _tmp0_ = {0};
-	Dimensions _tmp1_ = {0};
-	gdouble _tmp2_ = 0.0;
+	Dimensions _tmp0_;
+	Dimensions _tmp1_;
+	gdouble _tmp2_;
 	GdkPoint _tmp3_ = {0};
-	GdkPixbuf* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	Dimensions _tmp6_ = {0};
-	GdkPixbuf* _tmp7_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
-	GtkDrawingArea* _tmp9_ = NULL;
-	Direction* _tmp10_ = NULL;
-#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
+	GdkPixbuf* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	Dimensions _tmp6_;
+	GdkPixbuf* _tmp7_;
+	GdkPixbuf* _tmp8_;
+	GtkDrawingArea* _tmp9_;
+	Direction* _tmp10_;
+#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (unscaled));
-#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (max_dim != NULL);
-#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = *max_dim;
-#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_dim;
-#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = zoom_state_get_interpolation_factor (&self->priv->static_zoom_state);
-#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp3_);
-#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_init (&self->priv->static_zoom_state, &_tmp0_, &_tmp1_, _tmp2_, &_tmp3_);
-#line 2167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_cancel_transition (self);
-#line 2169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2189 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = unscaled;
-#line 2169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2189 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 2169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2189 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 2169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2189 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = _tmp5_;
-#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = *max_dim;
-#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->max_dim = _tmp6_;
-#line 2171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->scaled;
-#line 2171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 2171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->old_scaled);
-#line 2171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->old_scaled = _tmp8_;
-#line 2172 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2172 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->canvas;
-#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 2177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = direction;
-#line 2177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, _tmp10_);
-#line 13575 "Page.c"
+#line 13681 "Page.c"
 }
 
 
 void single_photo_page_blank_display (SinglePhotoPage* self) {
-	GtkDrawingArea* _tmp0_ = NULL;
-#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkDrawingArea* _tmp0_;
+#line 2200 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 2181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = NULL;
-#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2202 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->max_dim, 0, 0);
-#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2203 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2203 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2184 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2184 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = NULL;
-#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2207 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2207 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_invalidate_all (self);
-#line 13603 "Page.c"
+#line 13709 "Page.c"
 }
 
 
 static gpointer _cairo_surface_reference0 (gpointer self) {
-#line 2194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? cairo_surface_reference (self) : NULL;
-#line 13610 "Page.c"
+#line 13716 "Page.c"
 }
 
 
 cairo_surface_t* single_photo_page_get_surface (SinglePhotoPage* self) {
 	cairo_surface_t* result = NULL;
-	cairo_surface_t* _tmp0_ = NULL;
-	cairo_surface_t* _tmp1_ = NULL;
-#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
+	cairo_surface_t* _tmp0_;
+	cairo_surface_t* _tmp1_;
+#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _cairo_surface_reference0 (_tmp0_);
-#line 2194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13628 "Page.c"
+#line 13734 "Page.c"
 }
 
 
 void single_photo_page_get_surface_dim (SinglePhotoPage* self, Dimensions* result) {
-	Dimensions _tmp0_ = {0};
-#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
+	Dimensions _tmp0_;
+#line 2217 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_dim;
-#line 2198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13642 "Page.c"
+#line 13748 "Page.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 2202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 13649 "Page.c"
+#line 13755 "Page.c"
 }
 
 
 cairo_t* single_photo_page_get_cairo_context (SinglePhotoPage* self) {
 	cairo_t* result = NULL;
-	cairo_t* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
+	cairo_t* _tmp0_;
+	cairo_t* _tmp1_;
+#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_ctx;
-#line 2202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _cairo_reference0 (_tmp0_);
-#line 2202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13667 "Page.c"
+#line 13773 "Page.c"
 }
 
 
 void single_photo_page_paint_text (SinglePhotoPage* self, PangoLayout* pango_layout, gint x, gint y) {
-	cairo_t* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	cairo_t* _tmp3_ = NULL;
-	PangoLayout* _tmp4_ = NULL;
-#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
+	cairo_t* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	cairo_t* _tmp3_;
+	PangoLayout* _tmp4_;
+#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (PANGO_IS_LAYOUT (pango_layout));
-#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->text_ctx;
-#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = x;
-#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = y;
-#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_move_to (_tmp0_, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 2207 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->text_ctx;
-#line 2207 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = pango_layout;
-#line 2207 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
 	pango_cairo_show_layout (_tmp3_, _tmp4_);
-#line 13695 "Page.c"
+#line 13801 "Page.c"
 }
 
 
 void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* result) {
 	Scaling _tmp0_ = {0};
-	GtkWindow* _tmp1_ = NULL;
-	GtkWindow* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkWindow* _tmp1_;
+	GtkWindow* _tmp2_;
+	gboolean _tmp3_;
+#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_FULLSCREEN_WINDOW);
-#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 13716 "Page.c"
-		GtkWindow* _tmp4_ = NULL;
-		GtkWindow* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+#line 13822 "Page.c"
+		GtkWindow* _tmp4_;
+		GtkWindow* _tmp5_;
+		gboolean _tmp6_;
 		Scaling _tmp7_ = {0};
-#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->scale_up_to_viewport;
-#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_screen (_tmp5_, _tmp6_, &_tmp7_);
-#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp7_;
-#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp5_);
-#line 13733 "Page.c"
+#line 13839 "Page.c"
 	} else {
-		GtkViewport* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
+		GtkViewport* _tmp8_;
+		gboolean _tmp9_;
 		Scaling _tmp10_ = {0};
-#line 2212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->viewport;
-#line 2212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->scale_up_to_viewport;
-#line 2212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_widget (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp9_, &_tmp10_);
-#line 2212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp10_;
-#line 13746 "Page.c"
+#line 13852 "Page.c"
 	}
-#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13752 "Page.c"
+#line 13858 "Page.c"
 }
 
 
 GdkPixbuf* single_photo_page_get_unscaled_pixbuf (SinglePhotoPage* self) {
 	GdkPixbuf* result = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
+#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2236 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2236 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2236 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2236 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13770 "Page.c"
+#line 13876 "Page.c"
 }
 
 
 GdkPixbuf* single_photo_page_get_scaled_pixbuf (SinglePhotoPage* self) {
 	GdkPixbuf* result = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-#line 2219 "/home/jens/Source/shotwell/src/Page.vala"
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
+#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2220 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->scaled;
-#line 2220 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2220 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2220 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13788 "Page.c"
+#line 13894 "Page.c"
 }
 
 
 void single_photo_page_get_scaled_pixbuf_position (SinglePhotoPage* self, GdkRectangle* result) {
-	GdkRectangle _tmp0_ = {0};
-#line 2224 "/home/jens/Source/shotwell/src/Page.vala"
+	GdkRectangle _tmp0_;
+#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->scaled_pos;
-#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13802 "Page.c"
+#line 13908 "Page.c"
 }
 
 
 gboolean single_photo_page_is_inside_pixbuf (SinglePhotoPage* self, gint x, gint y) {
 	gboolean result = FALSE;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	GdkRectangle _tmp2_ = {0};
-	gboolean _tmp3_ = FALSE;
-#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
+	gint _tmp0_;
+	gint _tmp1_;
+	GdkRectangle _tmp2_;
+	gboolean _tmp3_;
+#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = x;
-#line 2229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = y;
-#line 2229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->scaled_pos;
-#line 2229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = coord_in_rectangle (_tmp0_, _tmp1_, &_tmp2_);
-#line 2229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 2229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13826 "Page.c"
+#line 13932 "Page.c"
 }
 
 
 void single_photo_page_invalidate (SinglePhotoPage* self, GdkRectangle* rect) {
-	GtkDrawingArea* _tmp0_ = NULL;
-	GdkWindow* _tmp1_ = NULL;
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkDrawingArea* _tmp0_;
+	GdkWindow* _tmp1_;
+#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 2233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != NULL) {
-#line 13843 "Page.c"
-		GtkDrawingArea* _tmp2_ = NULL;
-		GdkWindow* _tmp3_ = NULL;
-		GdkRectangle _tmp4_ = {0};
-#line 2234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 13949 "Page.c"
+		GtkDrawingArea* _tmp2_;
+		GdkWindow* _tmp3_;
+		GdkRectangle _tmp4_;
+#line 2254 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->canvas;
-#line 2234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2254 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2254 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = *rect;
-#line 2234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2254 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_invalidate_rect (_tmp3_, &_tmp4_, FALSE);
-#line 13855 "Page.c"
+#line 13961 "Page.c"
 	}
 }
 
 
 void single_photo_page_invalidate_all (SinglePhotoPage* self) {
-	GtkDrawingArea* _tmp0_ = NULL;
-	GdkWindow* _tmp1_ = NULL;
-#line 2237 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkDrawingArea* _tmp0_;
+	GdkWindow* _tmp1_;
+#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != NULL) {
-#line 13871 "Page.c"
-		GtkDrawingArea* _tmp2_ = NULL;
-		GdkWindow* _tmp3_ = NULL;
-#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 13977 "Page.c"
+		GtkDrawingArea* _tmp2_;
+		GdkWindow* _tmp3_;
+#line 2259 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->canvas;
-#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_invalidate_rect (_tmp3_, NULL, FALSE);
-#line 13880 "Page.c"
+#line 13986 "Page.c"
 	}
 }
 
 
 static void single_photo_page_on_viewport_resize (SinglePhotoPage* self) {
-#line 2242 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_internal_repaint (self, TRUE, NULL);
-#line 13890 "Page.c"
+#line 13996 "Page.c"
 }
 
 
 static void single_photo_page_real_on_resize_finished (Page* base, GdkRectangle* rect) {
 	SinglePhotoPage * self;
-	GdkRectangle _tmp0_ = {0};
-#line 2247 "/home/jens/Source/shotwell/src/Page.vala"
+	GdkRectangle _tmp0_;
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = *rect;
-#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (single_photo_page_parent_class)->on_resize_finished (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), &_tmp0_);
-#line 2251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, NULL);
-#line 13907 "Page.c"
+#line 14013 "Page.c"
 }
 
 
 static gboolean single_photo_page_on_canvas_exposed (SinglePhotoPage* self, cairo_t* exposed_ctx) {
 	gboolean result = FALSE;
-	cairo_surface_t* _tmp0_ = NULL;
-	cairo_t* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	cairo_t* _tmp7_ = NULL;
-#line 2254 "/home/jens/Source/shotwell/src/Page.vala"
+	cairo_surface_t* _tmp0_;
+	cairo_t* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	cairo_t* _tmp7_;
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2254 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (exposed_ctx != NULL, FALSE);
-#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 13926 "Page.c"
-		cairo_t* _tmp1_ = NULL;
-		cairo_surface_t* _tmp2_ = NULL;
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 14032 "Page.c"
+		cairo_t* _tmp1_;
+		cairo_surface_t* _tmp2_;
+#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = exposed_ctx;
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->pixmap;
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_set_source_surface (_tmp1_, _tmp2_, (gdouble) 0, (gdouble) 0);
-#line 13935 "Page.c"
+#line 14041 "Page.c"
 	} else {
-		cairo_t* _tmp3_ = NULL;
-#line 2260 "/home/jens/Source/shotwell/src/Page.vala"
+		cairo_t* _tmp3_;
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = exposed_ctx;
-#line 2260 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp3_, "#000");
-#line 13942 "Page.c"
+#line 14048 "Page.c"
 	}
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = exposed_ctx;
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gtk_widget_get_allocated_width (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gtk_widget_get_allocated_height (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp5_, (gdouble) _tmp6_);
-#line 2263 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = exposed_ctx;
-#line 2263 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp7_);
-#line 2265 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 2265 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13960 "Page.c"
+#line 14066 "Page.c"
 }
 
 
 static void single_photo_page_real_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 13969 "Page.c"
+#line 14075 "Page.c"
 }
 
 
 void single_photo_page_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->new_surface (self, ctx, ctx_dim);
-#line 13978 "Page.c"
+#line 14084 "Page.c"
 }
 
 
 static void single_photo_page_real_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) {
-#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (old_dim != NULL);
-#line 13987 "Page.c"
+#line 14093 "Page.c"
 }
 
 
 void single_photo_page_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) {
-#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->updated_pixbuf (self, pixbuf, reason, old_dim);
-#line 13996 "Page.c"
+#line 14102 "Page.c"
 }
 
 
 static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+	gboolean _tmp1_;
+#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 2275 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = single_photo_page_is_zoom_supported (self);
-#line 2275 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 14011 "Page.c"
-		gboolean _tmp2_ = FALSE;
-#line 2275 "/home/jens/Source/shotwell/src/Page.vala"
+#line 14117 "Page.c"
+		gboolean _tmp2_;
+#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = zoom_state_is_default (&self->priv->static_zoom_state);
-#line 2275 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = !_tmp2_;
-#line 14017 "Page.c"
+#line 14123 "Page.c"
 	} else {
-#line 2275 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 14021 "Page.c"
+#line 14127 "Page.c"
 	}
-#line 2275 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 14025 "Page.c"
-		cairo_t* _tmp3_ = NULL;
-		cairo_t* _tmp4_ = NULL;
-		Dimensions _tmp5_ = {0};
-		gint _tmp6_ = 0;
-		Dimensions _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		cairo_t* _tmp9_ = NULL;
-		ZoomState _tmp10_ = {0};
-#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 14131 "Page.c"
+		cairo_t* _tmp3_;
+		cairo_t* _tmp4_;
+		Dimensions _tmp5_;
+		gint _tmp6_;
+		Dimensions _tmp7_;
+		gint _tmp8_;
+		cairo_t* _tmp9_;
+		ZoomState _tmp10_;
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = ctx;
-#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp3_, "#000");
-#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = ctx;
-#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->pixmap_dim;
-#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_.width;
-#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->pixmap_dim;
-#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_.height;
-#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp6_, (gdouble) _tmp8_);
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2298 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = ctx;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2298 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_fill (_tmp9_);
-#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->static_zoom_state;
-#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_render_zoomed_to_pixmap (self, &_tmp10_);
-#line 14058 "Page.c"
+#line 14164 "Page.c"
 	} else {
-		TransitionClock* _tmp11_ = NULL;
-		cairo_t* _tmp12_ = NULL;
-		Dimensions _tmp13_ = {0};
-		gint _tmp14_ = 0;
-		Dimensions _tmp15_ = {0};
-		gint _tmp16_ = 0;
-		gboolean _tmp17_ = FALSE;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+		TransitionClock* _tmp11_;
+		cairo_t* _tmp12_;
+		Dimensions _tmp13_;
+		gint _tmp14_;
+		Dimensions _tmp15_;
+		gint _tmp16_;
+		gboolean _tmp17_;
+#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->priv->transition_clock;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = ctx;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = *ctx_dim;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = _tmp13_.width;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = *ctx_dim;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_.height;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = transition_clock_paint (_tmp11_, _tmp12_, _tmp14_, _tmp16_);
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp17_) {
-#line 14083 "Page.c"
-			cairo_t* _tmp18_ = NULL;
-			cairo_t* _tmp19_ = NULL;
-			Dimensions _tmp20_ = {0};
-			gint _tmp21_ = 0;
-			Dimensions _tmp22_ = {0};
-			gint _tmp23_ = 0;
-			cairo_t* _tmp24_ = NULL;
-			cairo_t* _tmp25_ = NULL;
-			GdkPixbuf* _tmp26_ = NULL;
-			GdkRectangle _tmp27_ = {0};
-			gint _tmp28_ = 0;
-			GdkRectangle _tmp29_ = {0};
-			gint _tmp30_ = 0;
-			cairo_t* _tmp31_ = NULL;
-#line 2283 "/home/jens/Source/shotwell/src/Page.vala"
+#line 14189 "Page.c"
+			cairo_t* _tmp18_;
+			cairo_t* _tmp19_;
+			Dimensions _tmp20_;
+			gint _tmp21_;
+			Dimensions _tmp22_;
+			gint _tmp23_;
+			cairo_t* _tmp24_;
+			cairo_t* _tmp25_;
+			GdkPixbuf* _tmp26_;
+			GdkRectangle _tmp27_;
+			gint _tmp28_;
+			GdkRectangle _tmp29_;
+			gint _tmp30_;
+			cairo_t* _tmp31_;
+#line 2303 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = ctx;
-#line 2283 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2303 "/home/jens/Source/shotwell/src/Page.vala"
 			set_source_color_from_string (_tmp18_, "#000");
-#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = ctx;
-#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = self->priv->pixmap_dim;
-#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = _tmp20_.width;
-#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = self->priv->pixmap_dim;
-#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = _tmp22_.height;
-#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_rectangle (_tmp19_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp21_, (gdouble) _tmp23_);
-#line 2286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = ctx;
-#line 2286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_fill (_tmp24_);
-#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = ctx;
-#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = self->priv->scaled;
-#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = self->priv->scaled_pos;
-#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _tmp27_.x;
-#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = self->priv->scaled_pos;
-#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = _tmp29_.y;
-#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 			gdk_cairo_set_source_pixbuf (_tmp25_, _tmp26_, (gdouble) _tmp28_, (gdouble) _tmp30_);
-#line 2289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2309 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = ctx;
-#line 2289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2309 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_paint (_tmp31_);
-#line 14136 "Page.c"
+#line 14242 "Page.c"
 		}
 	}
 }
 
 
 void single_photo_page_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->paint (self, ctx, ctx_dim);
-#line 14147 "Page.c"
+#line 14253 "Page.c"
 }
 
 
 static void single_photo_page_repaint_pixmap (SinglePhotoPage* self) {
-	cairo_t* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	Dimensions _tmp2_ = {0};
-#line 2293 "/home/jens/Source/shotwell/src/Page.vala"
+	cairo_t* _tmp0_;
+	cairo_t* _tmp1_;
+	Dimensions _tmp2_;
+#line 2313 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_ctx;
-#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14163 "Page.c"
+#line 14269 "Page.c"
 	}
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_dim;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_paint (self, _tmp1_, &_tmp2_);
-#line 2298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2318 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_invalidate_all (self);
-#line 14173 "Page.c"
+#line 14279 "Page.c"
 }
 
 
 void single_photo_page_repaint (SinglePhotoPage* self, Direction* direction) {
-	Direction* _tmp0_ = NULL;
-#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
+	Direction* _tmp0_;
+#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = direction;
-#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_internal_repaint (self, FALSE, _tmp0_);
-#line 14185 "Page.c"
+#line 14291 "Page.c"
 }
 
 
 static void _single_photo_page_repaint_pixmap_transition_clock_repaint_callback (gpointer self) {
-#line 2390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint_pixmap ((SinglePhotoPage*) self);
-#line 14192 "Page.c"
+#line 14298 "Page.c"
 }
 
 
 static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean fast, Direction* direction) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	GdkPixbuf* _tmp2_ = NULL;
+	GdkPixbuf* _tmp2_;
 	GtkAllocation allocation = {0};
-	GtkViewport* _tmp5_ = NULL;
+	GtkViewport* _tmp5_;
 	GtkAllocation _tmp6_ = {0};
 	gint width = 0;
-	GtkAllocation _tmp7_ = {0};
-	gint _tmp8_ = 0;
+	GtkAllocation _tmp7_;
+	gint _tmp8_;
 	gint height = 0;
-	GtkAllocation _tmp9_ = {0};
-	gint _tmp10_ = 0;
+	GtkAllocation _tmp9_;
+	gint _tmp10_;
 	gboolean _tmp11_ = FALSE;
-	gint _tmp12_ = 0;
+	gint _tmp12_;
 	gboolean new_pixbuf = FALSE;
-	GdkPixbuf* _tmp14_ = NULL;
+	GdkPixbuf* _tmp14_;
 	Dimensions old_scaled_dim = {0};
-	GdkRectangle _tmp15_ = {0};
+	GdkRectangle _tmp15_;
 	Dimensions _tmp16_ = {0};
 	GdkRectangle old_scaled_pos = {0};
-	GdkRectangle _tmp17_ = {0};
+	GdkRectangle _tmp17_;
 	gboolean _tmp18_ = FALSE;
-	Dimensions _tmp19_ = {0};
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
+	Dimensions _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
 	gboolean new_pixmap = FALSE;
-	cairo_surface_t* _tmp25_ = NULL;
+	cairo_surface_t* _tmp25_;
 	gboolean _tmp28_ = FALSE;
-	gboolean _tmp29_ = FALSE;
+	gboolean _tmp29_;
 	GdkInterpType _tmp63_ = 0;
-	gboolean _tmp64_ = FALSE;
+	gboolean _tmp64_;
 	GdkInterpType interp = 0;
-	GdkPixbuf* _tmp65_ = NULL;
-	gboolean _tmp82_ = FALSE;
+	GdkPixbuf* _tmp65_;
+	gboolean _tmp82_;
 	gboolean _tmp83_ = FALSE;
-	Direction* _tmp84_ = NULL;
-	TransitionClock* _tmp98_ = NULL;
-	gboolean _tmp99_ = FALSE;
-#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
+	Direction* _tmp84_;
+	TransitionClock* _tmp98_;
+	gboolean _tmp99_;
+#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
 		_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->pixmap = NULL;
-#line 2309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->scaled);
-#line 2309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled = NULL;
-#line 2311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14251 "Page.c"
+#line 14357 "Page.c"
 	}
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->unscaled;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = TRUE;
-#line 14259 "Page.c"
+#line 14365 "Page.c"
 	} else {
-		GtkDrawingArea* _tmp3_ = NULL;
-		GdkWindow* _tmp4_ = NULL;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+		GtkDrawingArea* _tmp3_;
+		GdkWindow* _tmp4_;
+#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->canvas;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = _tmp4_ == NULL;
-#line 14269 "Page.c"
+#line 14375 "Page.c"
 	}
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2336 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14275 "Page.c"
+#line 14381 "Page.c"
 	}
-#line 2319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->viewport;
-#line 2319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), &_tmp6_);
-#line 2319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Page.vala"
 	allocation = _tmp6_;
-#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = allocation;
-#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_.width;
-#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
 	width = _tmp8_;
-#line 2322 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = allocation;
-#line 2322 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_.height;
-#line 2322 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Page.vala"
 	height = _tmp10_;
-#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = width;
-#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ <= 0) {
-#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = TRUE;
-#line 14301 "Page.c"
+#line 14407 "Page.c"
 	} else {
-		gint _tmp13_ = 0;
-#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
+		gint _tmp13_;
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = height;
-#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp13_ <= 0;
-#line 14308 "Page.c"
+#line 14414 "Page.c"
 	}
-#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_) {
-#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2345 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14314 "Page.c"
+#line 14420 "Page.c"
 	}
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->scaled;
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Page.vala"
 	new_pixbuf = _tmp14_ == NULL;
-#line 2330 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->scaled_pos;
-#line 2330 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_for_rectangle (&_tmp15_, &_tmp16_);
-#line 2330 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 	old_scaled_dim = _tmp16_;
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2351 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->scaled_pos;
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2351 "/home/jens/Source/shotwell/src/Page.vala"
 	old_scaled_pos = _tmp17_;
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = self->priv->pixmap_dim;
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_.width;
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = width;
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp20_ != _tmp21_) {
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = TRUE;
-#line 14340 "Page.c"
+#line 14446 "Page.c"
 	} else {
-		Dimensions _tmp22_ = {0};
-		gint _tmp23_ = 0;
-		gint _tmp24_ = 0;
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+		Dimensions _tmp22_;
+		gint _tmp23_;
+		gint _tmp24_;
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = self->priv->pixmap_dim;
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _tmp22_.height;
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = height;
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _tmp23_ != _tmp24_;
-#line 14353 "Page.c"
+#line 14459 "Page.c"
 	}
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp18_) {
-#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 		_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->pixmap = NULL;
-#line 14361 "Page.c"
+#line 14467 "Page.c"
 	}
-#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 	new_pixmap = FALSE;
-#line 2339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = self->priv->pixmap;
-#line 2339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp25_ == NULL) {
-#line 14369 "Page.c"
-		gint _tmp26_ = 0;
-		gint _tmp27_ = 0;
-#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
+#line 14475 "Page.c"
+		gint _tmp26_;
+		gint _tmp27_;
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = width;
-#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = height;
-#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_init_pixmap (self, _tmp26_, _tmp27_);
-#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
 		new_pixmap = TRUE;
-#line 14380 "Page.c"
+#line 14486 "Page.c"
 	}
-#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = new_pixbuf;
-#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_) {
-#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = TRUE;
-#line 14388 "Page.c"
+#line 14494 "Page.c"
 	} else {
-		gboolean _tmp30_ = FALSE;
-#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
+		gboolean _tmp30_;
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = new_pixmap;
-#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = _tmp30_;
-#line 14395 "Page.c"
+#line 14501 "Page.c"
 	}
-#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp28_) {
-#line 14399 "Page.c"
+#line 14505 "Page.c"
 		Dimensions unscaled_dim = {0};
-		GdkPixbuf* _tmp31_ = NULL;
+		GdkPixbuf* _tmp31_;
 		Dimensions _tmp32_ = {0};
 		Dimensions scaled_dim = {0};
 		gboolean _tmp33_ = FALSE;
 		gboolean _tmp34_ = FALSE;
 		gboolean _tmp35_ = FALSE;
-		gboolean _tmp36_ = FALSE;
-		gint _tmp47_ = 0;
-		Dimensions _tmp48_ = {0};
-		gint _tmp49_ = 0;
-		gint _tmp50_ = 0;
-		Dimensions _tmp51_ = {0};
-		gint _tmp52_ = 0;
-		gint _tmp53_ = 0;
-		Dimensions _tmp54_ = {0};
-		gint _tmp55_ = 0;
-		gint _tmp56_ = 0;
-		Dimensions _tmp57_ = {0};
-		gint _tmp58_ = 0;
-		Dimensions _tmp59_ = {0};
-		gint _tmp60_ = 0;
-		Dimensions _tmp61_ = {0};
-		gint _tmp62_ = 0;
-#line 2345 "/home/jens/Source/shotwell/src/Page.vala"
+		gboolean _tmp36_;
+		gint _tmp47_;
+		Dimensions _tmp48_;
+		gint _tmp49_;
+		gint _tmp50_;
+		Dimensions _tmp51_;
+		gint _tmp52_;
+		gint _tmp53_;
+		Dimensions _tmp54_;
+		gint _tmp55_;
+		gint _tmp56_;
+		Dimensions _tmp57_;
+		gint _tmp58_;
+		Dimensions _tmp59_;
+		gint _tmp60_;
+		Dimensions _tmp61_;
+		gint _tmp62_;
+#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = self->priv->unscaled;
-#line 2345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_for_pixbuf (_tmp31_, &_tmp32_);
-#line 2345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
 		unscaled_dim = _tmp32_;
-#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_init (&scaled_dim, 0, 0);
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp36_ = self->priv->scale_up_to_viewport;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp36_) {
-#line 14436 "Page.c"
-			gboolean _tmp37_ = FALSE;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 14542 "Page.c"
+			gboolean _tmp37_;
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp37_ = dimensions_has_area (&self->priv->max_dim);
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = _tmp37_;
-#line 14442 "Page.c"
+#line 14548 "Page.c"
 		} else {
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = FALSE;
-#line 14446 "Page.c"
+#line 14552 "Page.c"
 		}
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp35_) {
-#line 14450 "Page.c"
-			Dimensions _tmp38_ = {0};
-			gint _tmp39_ = 0;
-			gint _tmp40_ = 0;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 14556 "Page.c"
+			Dimensions _tmp38_;
+			gint _tmp39_;
+			gint _tmp40_;
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp38_ = self->priv->max_dim;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp39_ = _tmp38_.width;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp40_ = width;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = _tmp39_ < _tmp40_;
-#line 14462 "Page.c"
+#line 14568 "Page.c"
 		} else {
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = FALSE;
-#line 14466 "Page.c"
+#line 14572 "Page.c"
 		}
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp34_) {
-#line 14470 "Page.c"
-			Dimensions _tmp41_ = {0};
-			gint _tmp42_ = 0;
-			gint _tmp43_ = 0;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 14576 "Page.c"
+			Dimensions _tmp41_;
+			gint _tmp42_;
+			gint _tmp43_;
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->priv->max_dim;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp42_ = _tmp41_.height;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp43_ = height;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = _tmp42_ < _tmp43_;
-#line 14482 "Page.c"
+#line 14588 "Page.c"
 		} else {
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = FALSE;
-#line 14486 "Page.c"
+#line 14592 "Page.c"
 		}
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp33_) {
-#line 14490 "Page.c"
-			Dimensions _tmp44_ = {0};
-#line 2351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 14596 "Page.c"
+			Dimensions _tmp44_;
+#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp44_ = self->priv->max_dim;
-#line 2351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
 			scaled_dim = _tmp44_;
-#line 14496 "Page.c"
+#line 14602 "Page.c"
 		} else {
-			Dimensions _tmp45_ = {0};
+			Dimensions _tmp45_;
 			Dimensions _tmp46_ = {0};
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = self->priv->pixmap_dim;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
 			dimensions_get_scaled_proportional (&unscaled_dim, &_tmp45_, &_tmp46_);
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
 			scaled_dim = _tmp46_;
-#line 14506 "Page.c"
+#line 14612 "Page.c"
 		}
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = width;
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = scaled_dim;
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp49_ = _tmp48_.width;
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_assert (_tmp47_ >= _tmp49_, "width >= scaled_dim.width");
-#line 2356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp50_ = height;
-#line 2356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp51_ = scaled_dim;
-#line 2356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp52_ = _tmp51_.height;
-#line 2356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_assert (_tmp50_ >= _tmp52_, "height >= scaled_dim.height");
-#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp53_ = width;
-#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp54_ = scaled_dim;
-#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp55_ = _tmp54_.width;
-#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.x = (_tmp53_ - _tmp55_) / 2;
-#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp56_ = height;
-#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp57_ = scaled_dim;
-#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp58_ = _tmp57_.height;
-#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.y = (_tmp56_ - _tmp58_) / 2;
-#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp59_ = scaled_dim;
-#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp60_ = _tmp59_.width;
-#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.width = _tmp60_;
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp61_ = scaled_dim;
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp62_ = _tmp61_.height;
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.height = _tmp62_;
-#line 14552 "Page.c"
+#line 14658 "Page.c"
 	}
-#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp64_ = fast;
-#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp64_) {
-#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp63_ = SINGLE_PHOTO_PAGE_FAST_INTERP;
-#line 14560 "Page.c"
+#line 14666 "Page.c"
 	} else {
-#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp63_ = SINGLE_PHOTO_PAGE_QUALITY_INTERP;
-#line 14564 "Page.c"
+#line 14670 "Page.c"
 	}
-#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 	interp = _tmp63_;
-#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp65_ = self->priv->scaled;
-#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp65_ == NULL) {
-#line 14572 "Page.c"
-		GdkPixbuf* _tmp66_ = NULL;
-		GdkRectangle _tmp67_ = {0};
+#line 14678 "Page.c"
+		GdkPixbuf* _tmp66_;
+		GdkRectangle _tmp67_;
 		Dimensions _tmp68_ = {0};
-		GdkInterpType _tmp69_ = 0;
-		GdkPixbuf* _tmp70_ = NULL;
+		GdkInterpType _tmp69_;
+		GdkPixbuf* _tmp70_;
 		SinglePhotoPageUpdateReason reason = 0;
-		gboolean _tmp71_ = FALSE;
-		Dimensions _tmp75_ = {0};
-		Dimensions _tmp76_ = {0};
-		gdouble _tmp77_ = 0.0;
+		gboolean _tmp71_;
+		Dimensions _tmp75_;
+		Dimensions _tmp76_;
+		gdouble _tmp77_;
 		GdkPoint _tmp78_ = {0};
-		GdkPixbuf* _tmp79_ = NULL;
-		SinglePhotoPageUpdateReason _tmp80_ = 0;
-		Dimensions _tmp81_ = {0};
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+		GdkPixbuf* _tmp79_;
+		SinglePhotoPageUpdateReason _tmp80_;
+		Dimensions _tmp81_;
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp66_ = self->priv->unscaled;
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp67_ = self->priv->scaled_pos;
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_for_rectangle (&_tmp67_, &_tmp68_);
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp69_ = interp;
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp70_ = resize_pixbuf (_tmp66_, &_tmp68_, _tmp69_);
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->scaled);
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled = _tmp70_;
-#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Page.vala"
 		reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_RESIZED_CANVAS;
-#line 2372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp71_ = new_pixbuf;
-#line 2372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp71_) {
-#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
 			reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_NEW_PIXBUF;
-#line 14609 "Page.c"
+#line 14715 "Page.c"
 		} else {
 			gboolean _tmp72_ = FALSE;
-			gboolean _tmp73_ = FALSE;
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+			gboolean _tmp73_;
+#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp73_ = new_pixmap;
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp73_) {
-#line 14617 "Page.c"
-				GdkInterpType _tmp74_ = 0;
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 14723 "Page.c"
+				GdkInterpType _tmp74_;
+#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp74_ = interp;
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp72_ = _tmp74_ == SINGLE_PHOTO_PAGE_QUALITY_INTERP;
-#line 14623 "Page.c"
+#line 14729 "Page.c"
 			} else {
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp72_ = FALSE;
-#line 14627 "Page.c"
+#line 14733 "Page.c"
 			}
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp72_) {
-#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2395 "/home/jens/Source/shotwell/src/Page.vala"
 				reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT;
-#line 14633 "Page.c"
+#line 14739 "Page.c"
 			}
 		}
-#line 2377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp75_ = self->priv->max_dim;
-#line 2377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp76_ = self->priv->pixmap_dim;
-#line 2377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp77_ = zoom_state_get_interpolation_factor (&self->priv->static_zoom_state);
-#line 2377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp78_);
-#line 2377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_init (&self->priv->static_zoom_state, &_tmp75_, &_tmp76_, _tmp77_, &_tmp78_);
-#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp79_ = self->priv->scaled;
-#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp80_ = reason;
-#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp81_ = old_scaled_dim;
-#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_updated_pixbuf (self, _tmp79_, _tmp80_, &_tmp81_);
-#line 14654 "Page.c"
+#line 14760 "Page.c"
 	}
-#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp82_ = fast;
-#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = !_tmp82_;
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp84_ = direction;
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp84_ != NULL) {
-#line 14664 "Page.c"
-		TransitionClock* _tmp85_ = NULL;
-		gboolean _tmp86_ = FALSE;
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 14770 "Page.c"
+		TransitionClock* _tmp85_;
+		gboolean _tmp86_;
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp85_ = self->priv->transition_clock;
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp86_ = transition_clock_is_in_progress (_tmp85_);
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp83_ = !_tmp86_;
-#line 14673 "Page.c"
+#line 14779 "Page.c"
 	} else {
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp83_ = FALSE;
-#line 14677 "Page.c"
+#line 14783 "Page.c"
 	}
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp83_) {
-#line 14681 "Page.c"
+#line 14787 "Page.c"
 		SpitTransitionsVisuals* visuals = NULL;
-		GdkPixbuf* _tmp87_ = NULL;
-		GdkRectangle _tmp88_ = {0};
-		GdkPixbuf* _tmp89_ = NULL;
-		GdkRectangle _tmp90_ = {0};
+		GdkPixbuf* _tmp87_;
+		GdkRectangle _tmp88_;
+		GdkPixbuf* _tmp89_;
+		GdkRectangle _tmp90_;
 		GdkRGBA _tmp91_ = {0};
-		SpitTransitionsVisuals* _tmp92_ = NULL;
-		TransitionClock* _tmp93_ = NULL;
-		SpitTransitionsVisuals* _tmp94_ = NULL;
-		Direction* _tmp95_ = NULL;
-		SpitTransitionsDirection _tmp96_ = 0;
-		gint _tmp97_ = 0;
-#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
+		SpitTransitionsVisuals* _tmp92_;
+		TransitionClock* _tmp93_;
+		SpitTransitionsVisuals* _tmp94_;
+		Direction* _tmp95_;
+		SpitTransitionsDirection _tmp96_;
+		gint _tmp97_;
+#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp87_ = self->priv->old_scaled;
-#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp88_ = old_scaled_pos;
-#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp89_ = self->priv->scaled;
-#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp90_ = self->priv->scaled_pos;
-#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
 		parse_color ("#000", &_tmp91_);
-#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp92_ = spit_transitions_visuals_new (_tmp87_, &_tmp88_, _tmp89_, &_tmp90_, &_tmp91_);
-#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
 		visuals = _tmp92_;
-#line 2390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp93_ = self->priv->transition_clock;
-#line 2390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp94_ = visuals;
-#line 2390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp95_ = direction;
-#line 2390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp96_ = direction_to_transition_direction (*_tmp95_);
-#line 2390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp97_ = self->priv->transition_duration_msec;
-#line 2390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
 		transition_clock_start (_tmp93_, _tmp94_, _tmp96_, _tmp97_, _single_photo_page_repaint_pixmap_transition_clock_repaint_callback, self);
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (visuals);
-#line 14722 "Page.c"
+#line 14828 "Page.c"
 	}
-#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp98_ = self->priv->transition_clock;
-#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp99_ = transition_clock_is_in_progress (_tmp98_);
-#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp99_) {
-#line 2395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2415 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_repaint_pixmap (self);
-#line 14732 "Page.c"
+#line 14838 "Page.c"
 	}
 }
 
 
 static void single_photo_page_init_pixmap (SinglePhotoPage* self, gint width, gint height) {
-	GdkPixbuf* _tmp0_ = NULL;
-	GtkDrawingArea* _tmp1_ = NULL;
-	GdkWindow* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	cairo_surface_t* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	cairo_surface_t* _tmp8_ = NULL;
-	cairo_t* _tmp9_ = NULL;
-	cairo_surface_t* _tmp10_ = NULL;
-	cairo_t* _tmp11_ = NULL;
-	cairo_t* _tmp12_ = NULL;
-	cairo_t* _tmp13_ = NULL;
-	Dimensions _tmp14_ = {0};
-#line 2398 "/home/jens/Source/shotwell/src/Page.vala"
+	GdkPixbuf* _tmp0_;
+	GtkDrawingArea* _tmp1_;
+	GdkWindow* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	cairo_surface_t* _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	cairo_surface_t* _tmp8_;
+	cairo_t* _tmp9_;
+	cairo_surface_t* _tmp10_;
+	cairo_t* _tmp11_;
+	cairo_t* _tmp12_;
+	cairo_t* _tmp13_;
+	Dimensions _tmp14_;
+#line 2418 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_ != NULL, "unscaled != null");
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->canvas;
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp2_ != NULL, "canvas.get_window() != null");
-#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = width;
-#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = height;
-#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp3_, _tmp4_);
-#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = _tmp5_;
-#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2424 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = width;
-#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2424 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = height;
-#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2424 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->pixmap_dim, _tmp6_, _tmp7_);
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2427 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->pixmap;
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2427 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = cairo_create (_tmp8_);
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2427 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->pixmap_ctx);
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2427 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap_ctx = _tmp9_;
-#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->pixmap;
-#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = cairo_create (_tmp10_);
-#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->text_ctx = _tmp11_;
-#line 2414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->text_ctx;
-#line 2414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp12_, "#fff");
-#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->priv->pixmap_ctx;
-#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->pixmap_dim;
-#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_new_surface (self, _tmp13_, &_tmp14_);
-#line 14811 "Page.c"
+#line 14917 "Page.c"
 }
 
 
 static gboolean single_photo_page_real_on_context_keypress (Page* base) {
 	SinglePhotoPage * self;
 	gboolean result = FALSE;
-	GtkMenu* _tmp0_ = NULL;
-	GtkMenu* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkMenu* _tmp0_;
+	GtkMenu* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 14838 "Page.c"
+#line 14944 "Page.c"
 }
 
 
@@ -14843,11 +14949,11 @@ static void single_photo_page_real_on_previous_photo (SinglePhotoPage* self) {
 
 
 void single_photo_page_on_previous_photo (SinglePhotoPage* self) {
-#line 2426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->on_previous_photo (self);
-#line 14851 "Page.c"
+#line 14957 "Page.c"
 }
 
 
@@ -14856,11 +14962,11 @@ static void single_photo_page_real_on_next_photo (SinglePhotoPage* self) {
 
 
 void single_photo_page_on_next_photo (SinglePhotoPage* self) {
-#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->on_next_photo (self);
-#line 14864 "Page.c"
+#line 14970 "Page.c"
 }
 
 
@@ -14868,275 +14974,275 @@ static gboolean single_photo_page_real_key_press_event (GtkWidget* base, GdkEven
 	SinglePhotoPage * self;
 	gboolean result = FALSE;
 	gboolean nav_ok = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	guint32 _tmp1_ = 0U;
-	guint32 _tmp2_ = 0U;
+	GdkEventKey* _tmp0_;
+	guint32 _tmp1_;
+	guint32 _tmp2_;
 	gboolean handled = FALSE;
-	GdkEventKey* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
+	GdkEventKey* _tmp3_;
+	guint _tmp4_;
+	const gchar* _tmp5_;
+	const gchar* _tmp6_;
 	GQuark _tmp8_ = 0U;
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label0 = 0;
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label1 = 0;
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label2 = 0;
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label3 = 0;
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label4 = 0;
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label5 = 0;
-#line 14893 "Page.c"
-	gboolean _tmp15_ = FALSE;
+#line 14999 "Page.c"
+	gboolean _tmp15_;
 	gboolean _tmp16_ = FALSE;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 2436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->time;
-#line 2436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->last_nav_key;
-#line 2436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	nav_ok = (_tmp1_ - _tmp2_) > ((guint32) SINGLE_PHOTO_PAGE_KEY_REPEAT_INTERVAL_MSEC);
-#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 	handled = TRUE;
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = event;
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_->keyval;
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gdk_keyval_name (_tmp4_);
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_);
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 	if (((_tmp8_ == ((0 != _tmp7_label0) ? _tmp7_label0 : (_tmp7_label0 = g_quark_from_static_string ("Left")))) || (_tmp8_ == ((0 != _tmp7_label1) ? _tmp7_label1 : (_tmp7_label1 = g_quark_from_static_string ("KP_Left"))))) || (_tmp8_ == ((0 != _tmp7_label2) ? _tmp7_label2 : (_tmp7_label2 = g_quark_from_static_string ("BackSpace"))))) {
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 14924 "Page.c"
+#line 15030 "Page.c"
 			default:
 			{
-				gboolean _tmp9_ = FALSE;
-#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
+				gboolean _tmp9_;
+#line 2463 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = nav_ok;
-#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp9_) {
-#line 14932 "Page.c"
-					GdkEventKey* _tmp10_ = NULL;
-					guint32 _tmp11_ = 0U;
-#line 2444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 15038 "Page.c"
+					GdkEventKey* _tmp10_;
+					guint32 _tmp11_;
+#line 2464 "/home/jens/Source/shotwell/src/Page.vala"
 					single_photo_page_on_previous_photo (self);
-#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = event;
-#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp11_ = _tmp10_->time;
-#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->last_nav_key = _tmp11_;
-#line 14943 "Page.c"
+#line 15049 "Page.c"
 				}
-#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2467 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 14947 "Page.c"
+#line 15053 "Page.c"
 			}
 		}
 	} else if (((_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Right")))) || (_tmp8_ == ((0 != _tmp7_label4) ? _tmp7_label4 : (_tmp7_label4 = g_quark_from_static_string ("KP_Right"))))) || (_tmp8_ == ((0 != _tmp7_label5) ? _tmp7_label5 : (_tmp7_label5 = g_quark_from_static_string ("space"))))) {
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 14953 "Page.c"
+#line 15059 "Page.c"
 			default:
 			{
-				gboolean _tmp12_ = FALSE;
-#line 2452 "/home/jens/Source/shotwell/src/Page.vala"
+				gboolean _tmp12_;
+#line 2472 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = nav_ok;
-#line 2452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp12_) {
-#line 14961 "Page.c"
-					GdkEventKey* _tmp13_ = NULL;
-					guint32 _tmp14_ = 0U;
-#line 2453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 15067 "Page.c"
+					GdkEventKey* _tmp13_;
+					guint32 _tmp14_;
+#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
 					single_photo_page_on_next_photo (self);
-#line 2454 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = event;
-#line 2454 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp14_ = _tmp13_->time;
-#line 2454 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->last_nav_key = _tmp14_;
-#line 14972 "Page.c"
+#line 15078 "Page.c"
 				}
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 14976 "Page.c"
+#line 15082 "Page.c"
 			}
 		}
 	} else {
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 14982 "Page.c"
+#line 15088 "Page.c"
 			default:
 			{
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2479 "/home/jens/Source/shotwell/src/Page.vala"
 				handled = FALSE;
-#line 2460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2480 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 14989 "Page.c"
+#line 15095 "Page.c"
 			}
 		}
 	}
-#line 2463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = handled;
-#line 2463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp15_) {
-#line 2464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 2464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 15001 "Page.c"
+#line 15107 "Page.c"
 	}
-#line 2466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
 	if (GTK_WIDGET_CLASS (single_photo_page_parent_class)->key_press_event != NULL) {
-#line 15005 "Page.c"
-		GdkEventKey* _tmp17_ = NULL;
-		gboolean _tmp18_ = FALSE;
-#line 2466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 15111 "Page.c"
+		GdkEventKey* _tmp17_;
+		gboolean _tmp18_;
+#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = event;
-#line 2466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = GTK_WIDGET_CLASS (single_photo_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), gtk_widget_get_type (), GtkWidget), _tmp17_);
-#line 2466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp18_;
-#line 15014 "Page.c"
+#line 15120 "Page.c"
 	} else {
-#line 2466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = TRUE;
-#line 15018 "Page.c"
+#line 15124 "Page.c"
 	}
-#line 2466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp16_;
-#line 2466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 15024 "Page.c"
+#line 15130 "Page.c"
 }
 
 
 static void single_photo_page_class_init (SinglePhotoPageClass * klass) {
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_parent_class = g_type_class_peek_parent (klass);
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (SinglePhotoPagePrivate));
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->is_zoom_supported = (gboolean (*)(SinglePhotoPage*)) single_photo_page_real_is_zoom_supported;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->cancel_zoom = (void (*)(SinglePhotoPage*)) single_photo_page_real_cancel_zoom;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->save_zoom_state = (void (*)(SinglePhotoPage*)) single_photo_page_real_save_zoom_state;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->restore_zoom_state = (void (*)(SinglePhotoPage*)) single_photo_page_real_restore_zoom_state;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->get_zoom_buffer = (ZoomBuffer* (*)(SinglePhotoPage*)) single_photo_page_real_get_zoom_buffer;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->switched_to = (void (*)(Page*)) single_photo_page_real_switched_to;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->set_container = (void (*)(Page*, GtkWindow*)) single_photo_page_real_set_container;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_resize_finished = (void (*)(Page*, GdkRectangle*)) single_photo_page_real_on_resize_finished;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->new_surface = (void (*)(SinglePhotoPage*, cairo_t*, Dimensions*)) single_photo_page_real_new_surface;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->updated_pixbuf = (void (*)(SinglePhotoPage*, GdkPixbuf*, SinglePhotoPageUpdateReason, Dimensions*)) single_photo_page_real_updated_pixbuf;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->paint = (void (*)(SinglePhotoPage*, cairo_t*, Dimensions*)) single_photo_page_real_paint;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_context_keypress = (gboolean (*)(Page*)) single_photo_page_real_on_context_keypress;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->on_previous_photo = (void (*)(SinglePhotoPage*)) single_photo_page_real_on_previous_photo;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->on_next_photo = (void (*)(SinglePhotoPage*)) single_photo_page_real_on_next_photo;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
-	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) single_photo_page_real_key_press_event;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+	((SinglePhotoPageClass *) klass)->is_zoom_supported = (gboolean (*) (SinglePhotoPage *)) single_photo_page_real_is_zoom_supported;
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+	((SinglePhotoPageClass *) klass)->cancel_zoom = (void (*) (SinglePhotoPage *)) single_photo_page_real_cancel_zoom;
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+	((SinglePhotoPageClass *) klass)->save_zoom_state = (void (*) (SinglePhotoPage *)) single_photo_page_real_save_zoom_state;
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+	((SinglePhotoPageClass *) klass)->restore_zoom_state = (void (*) (SinglePhotoPage *)) single_photo_page_real_restore_zoom_state;
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+	((SinglePhotoPageClass *) klass)->get_zoom_buffer = (ZoomBuffer* (*) (SinglePhotoPage *)) single_photo_page_real_get_zoom_buffer;
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+	((PageClass *) klass)->switched_to = (void (*) (Page *)) single_photo_page_real_switched_to;
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+	((PageClass *) klass)->set_container = (void (*) (Page *, GtkWindow*)) single_photo_page_real_set_container;
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+	((PageClass *) klass)->on_resize_finished = (void (*) (Page *, GdkRectangle*)) single_photo_page_real_on_resize_finished;
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+	((SinglePhotoPageClass *) klass)->new_surface = (void (*) (SinglePhotoPage *, cairo_t*, Dimensions*)) single_photo_page_real_new_surface;
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+	((SinglePhotoPageClass *) klass)->updated_pixbuf = (void (*) (SinglePhotoPage *, GdkPixbuf*, SinglePhotoPageUpdateReason, Dimensions*)) single_photo_page_real_updated_pixbuf;
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+	((SinglePhotoPageClass *) klass)->paint = (void (*) (SinglePhotoPage *, cairo_t*, Dimensions*)) single_photo_page_real_paint;
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+	((PageClass *) klass)->on_context_keypress = (gboolean (*) (Page *)) single_photo_page_real_on_context_keypress;
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+	((SinglePhotoPageClass *) klass)->on_previous_photo = (void (*) (SinglePhotoPage *)) single_photo_page_real_on_previous_photo;
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+	((SinglePhotoPageClass *) klass)->on_next_photo = (void (*) (SinglePhotoPage *)) single_photo_page_real_on_next_photo;
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) single_photo_page_real_key_press_event;
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = single_photo_page_finalize;
-#line 15065 "Page.c"
+#line 15171 "Page.c"
 }
 
 
 static void single_photo_page_instance_init (SinglePhotoPage * self) {
-	GtkDrawingArea* _tmp0_ = NULL;
-	GtkViewport* _tmp1_ = NULL;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkDrawingArea* _tmp0_;
+	GtkViewport* _tmp1_;
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = SINGLE_PHOTO_PAGE_GET_PRIVATE (self);
-#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = (GtkDrawingArea*) gtk_drawing_area_new ();
-#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
 	self->canvas = _tmp0_;
-#line 1967 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = (GtkViewport*) gtk_viewport_new (NULL, NULL);
-#line 1967 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1967 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Page.vala"
 	self->viewport = _tmp1_;
-#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_duration_msec = 0;
-#line 1972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = NULL;
-#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1993 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap_ctx = NULL;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->text_ctx = NULL;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->pixmap_dim, 0, 0);
-#line 1976 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1996 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = NULL;
-#line 1977 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1997 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->max_dim, 0, 0);
-#line 1978 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 1979 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1999 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->old_scaled = NULL;
-#line 1980 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (&self->priv->scaled_pos, 0, sizeof (GdkRectangle));
-#line 1982 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = TRUE;
-#line 1984 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2004 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = FALSE;
-#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2005 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_nav_key = (guint32) 0;
-#line 15112 "Page.c"
+#line 15218 "Page.c"
 }
 
 
-static void single_photo_page_finalize (GObject* obj) {
+static void single_photo_page_finalize (GObject * obj) {
 	SinglePhotoPage * self;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->canvas);
-#line 1967 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->viewport);
-#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 1972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1993 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->pixmap_ctx);
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 1976 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1996 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 1978 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 1979 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1999 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->old_scaled);
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (single_photo_page_parent_class)->finalize (obj);
-#line 15140 "Page.c"
+#line 15246 "Page.c"
 }
 
 
@@ -15153,32 +15259,32 @@ GType single_photo_page_get_type (void) {
 
 
 static void _drag_and_drop_handler_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_begin ((DragAndDropHandler*) self, context);
-#line 15159 "Page.c"
+#line 15265 "Page.c"
 }
 
 
 static void _drag_and_drop_handler_on_drag_data_get_gtk_widget_drag_data_get (GtkWidget* _sender, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time_, gpointer self) {
-#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_data_get ((DragAndDropHandler*) self, context, selection_data, info, time_);
-#line 15166 "Page.c"
+#line 15272 "Page.c"
 }
 
 
 static void _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_end ((DragAndDropHandler*) self);
-#line 15173 "Page.c"
+#line 15279 "Page.c"
 }
 
 
 static gboolean _drag_and_drop_handler_on_drag_failed_gtk_widget_drag_failed (GtkWidget* _sender, GdkDragContext* context, GtkDragResult _result_, gpointer self) {
 	gboolean result;
 	result = drag_and_drop_handler_on_drag_failed ((DragAndDropHandler*) self, context, _result_);
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2548 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 15182 "Page.c"
+#line 15288 "Page.c"
 }
 
 
@@ -15196,1204 +15302,1201 @@ static GType drag_and_drop_handler_target_type_get_type (void) {
 
 static GdkAtom* _gdk_atom_dup (GdkAtom* self) {
 	GdkAtom* dup;
-#line 2503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
 	dup = g_new0 (GdkAtom, 1);
-#line 2503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
 	memcpy (dup, self, sizeof (GdkAtom));
-#line 2503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
 	return dup;
-#line 15206 "Page.c"
+#line 15312 "Page.c"
 }
 
 
 static gpointer __gdk_atom_dup0 (gpointer self) {
-#line 2503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? _gdk_atom_dup (self) : NULL;
-#line 15213 "Page.c"
+#line 15319 "Page.c"
 }
 
 
 DragAndDropHandler* drag_and_drop_handler_construct (GType object_type, Page* page) {
 	DragAndDropHandler* self = NULL;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
-	GtkWidget* _tmp3_ = NULL;
-	GtkWidget* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	GdkAtom* _tmp6_ = NULL;
-	GdkAtom* _tmp9_ = NULL;
-	guint8* _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	GtkWidget* _tmp15_ = NULL;
-	GtkWidget* _tmp16_ = NULL;
-	GtkWidget* _tmp17_ = NULL;
-	GtkWidget* _tmp18_ = NULL;
-	GtkWidget* _tmp19_ = NULL;
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+	Page* _tmp0_;
+	Page* _tmp1_;
+	GtkWidget* _tmp2_;
+	GtkWidget* _tmp3_;
+	GtkWidget* _tmp4_;
+	gboolean _tmp5_;
+	GdkAtom* _tmp6_;
+	GdkAtom* _tmp9_;
+	guint8* _tmp12_;
+	gint _tmp12__length1;
+	GtkWidget* _tmp15_;
+	GtkWidget* _tmp16_;
+	GtkWidget* _tmp17_;
+	GtkWidget* _tmp18_;
+	GtkWidget* _tmp19_;
+#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (page), NULL);
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (DragAndDropHandler*) g_type_create_instance (object_type);
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page;
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page = _tmp0_;
-#line 2497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page;
-#line 2497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_event_source (_tmp1_);
-#line 2497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = _tmp2_;
-#line 2498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->event_source;
-#line 2498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp3_ != NULL, "event_source != null");
-#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->event_source;
-#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gtk_widget_get_has_window (_tmp4_);
-#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp5_, "event_source.get_has_window()");
-#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = drag_and_drop_handler_XDS_ATOM;
-#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 15264 "Page.c"
-		GdkAtom _tmp7_ = 0U;
-		GdkAtom* _tmp8_ = NULL;
-#line 2503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 15370 "Page.c"
+		GdkAtom _tmp7_;
+		GdkAtom* _tmp8_;
+#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = gdk_atom_intern_static_string ("XdndDirectSave0");
-#line 2503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = __gdk_atom_dup0 (&_tmp7_);
-#line 2503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (drag_and_drop_handler_XDS_ATOM);
-#line 2503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_ATOM = _tmp8_;
-#line 15275 "Page.c"
+#line 15381 "Page.c"
 	}
-#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp9_ == NULL) {
-#line 15281 "Page.c"
-		GdkAtom _tmp10_ = 0U;
-		GdkAtom* _tmp11_ = NULL;
-#line 2506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 15387 "Page.c"
+		GdkAtom _tmp10_;
+		GdkAtom* _tmp11_;
+#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = gdk_atom_intern_static_string ("text/plain");
-#line 2506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = __gdk_atom_dup0 (&_tmp10_);
-#line 2506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (drag_and_drop_handler_TEXT_ATOM);
-#line 2506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_TEXT_ATOM = _tmp11_;
-#line 15292 "Page.c"
+#line 15398 "Page.c"
 	}
-#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = drag_and_drop_handler_XDS_FAKE_TARGET;
-#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ == NULL) {
-#line 15300 "Page.c"
-		gint _tmp13_ = 0;
-		guchar* _tmp14_ = NULL;
-#line 2509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 15406 "Page.c"
+		gint _tmp13_;
+		guchar* _tmp14_;
+#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = string_to_uchar_array ("shotwell.txt", &_tmp13_);
-#line 2509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_FAKE_TARGET = (g_free (drag_and_drop_handler_XDS_FAKE_TARGET), NULL);
-#line 2509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_FAKE_TARGET = _tmp14_;
-#line 2509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_FAKE_TARGET_length1 = _tmp13_;
-#line 2509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
 		_drag_and_drop_handler_XDS_FAKE_TARGET_size_ = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 15313 "Page.c"
+#line 15419 "Page.c"
 	}
-#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2532 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->event_source;
-#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2532 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_drag_source_set (_tmp15_, GDK_BUTTON1_MASK, DRAG_AND_DROP_HANDLER_SOURCE_TARGET_ENTRIES, G_N_ELEMENTS (DRAG_AND_DROP_HANDLER_SOURCE_TARGET_ENTRIES), GDK_ACTION_COPY);
-#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->priv->event_source;
-#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect (_tmp16_, "drag-begin", (GCallback) _drag_and_drop_handler_on_drag_begin_gtk_widget_drag_begin, self);
-#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->event_source;
-#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect (_tmp17_, "drag-data-get", (GCallback) _drag_and_drop_handler_on_drag_data_get_gtk_widget_drag_data_get, self);
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->event_source;
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect (_tmp18_, "drag-end", (GCallback) _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end, self);
-#line 2520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = self->priv->event_source;
-#line 2520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect (_tmp19_, "drag-failed", (GCallback) _drag_and_drop_handler_on_drag_failed_gtk_widget_drag_failed, self);
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 15337 "Page.c"
+#line 15443 "Page.c"
 }
 
 
 DragAndDropHandler* drag_and_drop_handler_new (Page* page) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
 	return drag_and_drop_handler_construct (TYPE_DRAG_AND_DROP_HANDLER, page);
-#line 15344 "Page.c"
+#line 15450 "Page.c"
 }
 
 
 static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDragContext* context) {
-	Page* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	Page* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-	Page* _tmp5_ = NULL;
+	Page* _tmp5_;
 	ThumbnailSource* thumb = NULL;
-	Page* _tmp11_ = NULL;
-	ViewCollection* _tmp12_ = NULL;
-	ViewCollection* _tmp13_ = NULL;
-	DataView* _tmp14_ = NULL;
-	DataView* _tmp15_ = NULL;
-	DataSource* _tmp16_ = NULL;
-	ThumbnailSource* _tmp17_ = NULL;
-	GdkDragContext* _tmp27_ = NULL;
-	GdkWindow* _tmp28_ = NULL;
-	GdkAtom* _tmp29_ = NULL;
-	GdkAtom* _tmp30_ = NULL;
-	guint8* _tmp31_ = NULL;
-	gint _tmp31__length1 = 0;
+	Page* _tmp11_;
+	ViewCollection* _tmp12_;
+	ViewCollection* _tmp13_;
+	DataView* _tmp14_;
+	DataView* _tmp15_;
+	DataSource* _tmp16_;
+	ThumbnailSource* _tmp17_;
+	GdkDragContext* _tmp27_;
+	GdkWindow* _tmp28_;
+	GdkAtom* _tmp29_;
+	GdkAtom* _tmp30_;
+	guint8* _tmp31_;
+	gint _tmp31__length1;
 	GError * _inner_error_ = NULL;
-#line 2535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 2536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2536 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2536: on_drag_begin (%s)", _tmp2_);
-#line 2536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2556: on_drag_begin (%s)", _tmp2_);
+#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->page;
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_ == NULL) {
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 15390 "Page.c"
+#line 15496 "Page.c"
 	} else {
-		Page* _tmp6_ = NULL;
-		ViewCollection* _tmp7_ = NULL;
-		ViewCollection* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+		Page* _tmp6_;
+		ViewCollection* _tmp7_;
+		ViewCollection* _tmp8_;
+		gint _tmp9_;
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->page;
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (_tmp6_);
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = view_collection_get_selected_count (_tmp8_);
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp9_ == 0;
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 15408 "Page.c"
+#line 15514 "Page.c"
 	}
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15414 "Page.c"
+#line 15520 "Page.c"
 	} else {
-		ExporterUI* _tmp10_ = NULL;
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+		ExporterUI* _tmp10_;
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->exporter;
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp10_ != NULL;
-#line 15421 "Page.c"
+#line 15527 "Page.c"
 	}
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15427 "Page.c"
+#line 15533 "Page.c"
 	}
-#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->page;
-#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = page_get_view (_tmp11_);
-#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _tmp12_;
-#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = view_collection_get_selected_at (_tmp13_, 0);
-#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = data_view_get_source (_tmp15_);
-#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource);
-#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp15_);
-#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp13_);
-#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 	thumb = _tmp17_;
-#line 15453 "Page.c"
+#line 15559 "Page.c"
 	{
 		GdkPixbuf* icon = NULL;
-		ThumbnailSource* _tmp18_ = NULL;
-		GdkPixbuf* _tmp19_ = NULL;
-		GtkWidget* _tmp20_ = NULL;
-		GdkPixbuf* _tmp21_ = NULL;
-#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
+		ThumbnailSource* _tmp18_;
+		GdkPixbuf* _tmp19_;
+		GtkWidget* _tmp20_;
+		GdkPixbuf* _tmp21_;
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = thumb;
-#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = thumbnail_source_get_thumbnail (_tmp18_, APP_WINDOW_DND_ICON_SCALE, &_inner_error_);
-#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		icon = _tmp19_;
-#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15468 "Page.c"
-			goto __catch255_g_error;
+#line 15574 "Page.c"
+			goto __catch256_g_error;
 		}
-#line 2548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->event_source;
-#line 2548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = icon;
-#line 2548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_drag_source_set_icon_pixbuf (_tmp20_, _tmp21_);
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (icon);
-#line 15479 "Page.c"
+#line 15585 "Page.c"
 	}
-	goto __finally255;
-	__catch255_g_error:
+	goto __finally256;
+	__catch256_g_error:
 	{
 		GError* err = NULL;
-		ThumbnailSource* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
-		GError* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+		ThumbnailSource* _tmp22_;
+		gchar* _tmp23_;
+		gchar* _tmp24_;
+		GError* _tmp25_;
+		const gchar* _tmp26_;
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
 		err = _inner_error_;
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
 		_inner_error_ = NULL;
-#line 2550 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = thumb;
-#line 2550 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject));
-#line 2550 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _tmp23_;
-#line 2550 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = err;
-#line 2550 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = _tmp25_->message;
-#line 2550 "/home/jens/Source/shotwell/src/Page.vala"
-		g_warning ("Page.vala:2550: Unable to fetch icon for drag-and-drop from %s: %s", _tmp24_, _tmp26_);
-#line 2550 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+		g_warning ("Page.vala:2570: Unable to fetch icon for drag-and-drop from %s: %s", _tmp24_, _tmp26_);
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp24_);
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_error_free0 (err);
-#line 15510 "Page.c"
+#line 15616 "Page.c"
 	}
-	__finally255:
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+	__finally256:
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (thumb);
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
 		g_clear_error (&_inner_error_);
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15523 "Page.c"
+#line 15629 "Page.c"
 	}
-#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = context;
-#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = gdk_drag_context_get_source_window (_tmp27_);
-#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = drag_and_drop_handler_XDS_ATOM;
-#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = drag_and_drop_handler_XDS_FAKE_TARGET;
-#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_property_change (_tmp28_, *_tmp29_, *_tmp30_, 8, GDK_PROP_MODE_REPLACE, (const guchar*) _tmp31_, 1);
-#line 2535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (thumb);
-#line 15541 "Page.c"
+#line 15647 "Page.c"
 }
 
 
 static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, GdkDragContext* context, GtkSelectionData* selection_data, guint target_type, guint time) {
-	Page* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	Page* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	Page* _tmp4_ = NULL;
-	guint _tmp9_ = 0U;
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+	Page* _tmp4_;
+	guint _tmp9_;
+#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2566: on_drag_data_get (%s)", _tmp2_);
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2586: on_drag_data_get (%s)", _tmp2_);
+#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->page;
-#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15574 "Page.c"
+#line 15680 "Page.c"
 	} else {
-		Page* _tmp5_ = NULL;
-		ViewCollection* _tmp6_ = NULL;
-		ViewCollection* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
+		Page* _tmp5_;
+		ViewCollection* _tmp6_;
+		ViewCollection* _tmp7_;
+		gint _tmp8_;
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->page;
-#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = page_get_view (_tmp5_);
-#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _tmp6_;
-#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = view_collection_get_selected_count (_tmp7_);
-#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp8_ == 0;
-#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 15592 "Page.c"
+#line 15698 "Page.c"
 	}
-#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15598 "Page.c"
+#line 15704 "Page.c"
 	}
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = target_type;
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp9_) {
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Page.vala"
 		case DRAG_AND_DROP_HANDLER_TARGET_TYPE_XDS:
-#line 15606 "Page.c"
+#line 15712 "Page.c"
 		{
 			guchar* data = NULL;
-			guchar* _tmp10_ = NULL;
-			gint data_length1 = 0;
-			gint _data_size_ = 0;
+			guchar* _tmp10_;
+			gint data_length1;
+			gint _data_size_;
 			GdkAtom actual_type = 0U;
 			gint actual_format = 0;
 			gboolean fetched = FALSE;
-			GdkDragContext* _tmp11_ = NULL;
-			GdkWindow* _tmp12_ = NULL;
-			GdkAtom* _tmp13_ = NULL;
-			GdkAtom* _tmp14_ = NULL;
-			guchar* _tmp15_ = NULL;
-			gint _tmp15__length1 = 0;
+			GdkDragContext* _tmp11_;
+			GdkWindow* _tmp12_;
+			GdkAtom* _tmp13_;
+			GdkAtom* _tmp14_;
+			guchar* _tmp15_;
+			gint _tmp15__length1;
 			GdkAtom _tmp16_ = 0U;
 			gint _tmp17_ = 0;
 			guint8* _tmp18_ = NULL;
-			gint _tmp19_ = 0;
-			gboolean _tmp20_ = FALSE;
+			gint _tmp19_;
+			gboolean _tmp20_;
 			gboolean _tmp21_ = FALSE;
 			gboolean _tmp22_ = FALSE;
-			gboolean _tmp23_ = FALSE;
+			gboolean _tmp23_;
 			gchar* _tmp32_ = NULL;
-			GFile* _tmp33_ = NULL;
-			Page* _tmp37_ = NULL;
-			gchar* _tmp38_ = NULL;
-			gchar* _tmp39_ = NULL;
+			GFile* _tmp33_;
+			Page* _tmp37_;
+			gchar* _tmp38_;
+			gchar* _tmp39_;
 			const gchar* _tmp40_ = NULL;
-			GFile* _tmp41_ = NULL;
-			GtkSelectionData* _tmp42_ = NULL;
-			GdkAtom* _tmp43_ = NULL;
-			gint _tmp44_ = 0;
-			guchar* _tmp45_ = NULL;
-			guchar* _tmp46_ = NULL;
-			gint _tmp46__length1 = 0;
-#line 2574 "/home/jens/Source/shotwell/src/Page.vala"
+			GFile* _tmp41_;
+			GtkSelectionData* _tmp42_;
+			GdkAtom* _tmp43_;
+			gint _tmp44_;
+			guchar* _tmp45_;
+			guchar* _tmp46_;
+			gint _tmp46__length1;
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = g_new0 (guchar, 4096);
-#line 2574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 			data = _tmp10_;
-#line 2574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 			data_length1 = 4096;
-#line 2574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_size_ = data_length1;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_format = 0;
-#line 2577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = context;
-#line 2577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = gdk_drag_context_get_source_window (_tmp11_);
-#line 2577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = drag_and_drop_handler_XDS_ATOM;
-#line 2577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = data;
-#line 2577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15__length1 = data_length1;
-#line 2577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = gdk_property_get (_tmp12_, *_tmp13_, *_tmp14_, (gulong) 0, (gulong) _tmp15__length1, 0, &_tmp16_, &_tmp17_, &_tmp19_, &_tmp18_);
-#line 2577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_type = _tmp16_;
-#line 2577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_format = _tmp17_;
-#line 2577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			data = (g_free (data), NULL);
-#line 2577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			data = _tmp18_;
-#line 2577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			data_length1 = _tmp19_;
-#line 2577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_size_ = data_length1;
-#line 2577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			fetched = _tmp20_;
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = fetched;
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp23_) {
-#line 15684 "Page.c"
-				guchar* _tmp24_ = NULL;
-				gint _tmp24__length1 = 0;
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 15790 "Page.c"
+				guchar* _tmp24_;
+				gint _tmp24__length1;
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = data;
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24__length1 = data_length1;
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = _tmp24_ != NULL;
-#line 15693 "Page.c"
+#line 15799 "Page.c"
 			} else {
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = FALSE;
-#line 15697 "Page.c"
+#line 15803 "Page.c"
 			}
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp22_) {
-#line 15701 "Page.c"
-				guchar* _tmp25_ = NULL;
-				gint _tmp25__length1 = 0;
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 15807 "Page.c"
+				guchar* _tmp25_;
+				gint _tmp25__length1;
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = data;
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25__length1 = data_length1;
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = _tmp25__length1 > 0;
-#line 15710 "Page.c"
+#line 15816 "Page.c"
 			} else {
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = FALSE;
-#line 15714 "Page.c"
+#line 15820 "Page.c"
 			}
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp21_) {
-#line 15718 "Page.c"
-				guchar* _tmp26_ = NULL;
-				gint _tmp26__length1 = 0;
-				gchar* _tmp27_ = NULL;
-				gchar* _tmp28_ = NULL;
-				GFile* _tmp29_ = NULL;
-				GFile* _tmp30_ = NULL;
-				GFile* _tmp31_ = NULL;
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 15824 "Page.c"
+				guchar* _tmp26_;
+				gint _tmp26__length1;
+				gchar* _tmp27_;
+				gchar* _tmp28_;
+				GFile* _tmp29_;
+				GFile* _tmp30_;
+				GFile* _tmp31_;
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = data;
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26__length1 = data_length1;
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = uchar_array_to_string (_tmp26_, _tmp26__length1, -1);
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = _tmp27_;
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = g_file_new_for_uri (_tmp28_);
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp30_ = _tmp29_;
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp31_ = g_file_get_parent (_tmp30_);
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->priv->drag_destination);
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->drag_destination = _tmp31_;
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (_tmp30_);
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp28_);
-#line 15748 "Page.c"
+#line 15854 "Page.c"
 			}
-#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = self->priv->drag_destination;
-#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp33_ != NULL) {
-#line 15754 "Page.c"
-				GFile* _tmp34_ = NULL;
-				gchar* _tmp35_ = NULL;
-#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 15860 "Page.c"
+				GFile* _tmp34_;
+				gchar* _tmp35_;
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp34_ = self->priv->drag_destination;
-#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = g_file_get_path (_tmp34_);
-#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp32_);
-#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = _tmp35_;
-#line 15765 "Page.c"
+#line 15871 "Page.c"
 			} else {
-				gchar* _tmp36_ = NULL;
-#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
+				gchar* _tmp36_;
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = g_strdup ("(no path)");
-#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp32_);
-#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = _tmp36_;
-#line 15774 "Page.c"
+#line 15880 "Page.c"
 			}
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp37_ = self->priv->page;
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp38_ = page_get_page_name (_tmp37_);
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp39_ = _tmp38_;
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
-			g_debug ("Page.vala:2585: on_drag_data_get (%s): %s", _tmp39_, _tmp32_);
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+			g_debug ("Page.vala:2605: on_drag_data_get (%s): %s", _tmp39_, _tmp32_);
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp39_);
-#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->priv->drag_destination;
-#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp41_ != NULL) {
-#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = "S";
-#line 15792 "Page.c"
+#line 15898 "Page.c"
 			} else {
-#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = "E";
-#line 15796 "Page.c"
+#line 15902 "Page.c"
 			}
-#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp42_ = selection_data;
-#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp43_ = drag_and_drop_handler_XDS_ATOM;
-#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = string_to_uchar_array (_tmp40_, &_tmp44_);
-#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = _tmp45_;
-#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46__length1 = _tmp44_;
-#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_selection_data_set (_tmp42_, *_tmp43_, 8, _tmp46_, _tmp44_);
-#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = (g_free (_tmp46_), NULL);
-#line 2591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp32_);
-#line 2591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
 			data = (g_free (data), NULL);
-#line 2591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15818 "Page.c"
+#line 15924 "Page.c"
 		}
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Page.vala"
 		case DRAG_AND_DROP_HANDLER_TARGET_TYPE_MEDIA_LIST:
-#line 15822 "Page.c"
+#line 15928 "Page.c"
 		{
 			GeeCollection* sources = NULL;
-			Page* _tmp47_ = NULL;
-			ViewCollection* _tmp48_ = NULL;
-			ViewCollection* _tmp49_ = NULL;
-			GeeList* _tmp50_ = NULL;
-			GeeCollection* _tmp51_ = NULL;
-			GtkSelectionData* _tmp52_ = NULL;
-			GdkAtom _tmp53_ = 0U;
-			GeeCollection* _tmp54_ = NULL;
-			gint _tmp55_ = 0;
-			guchar* _tmp56_ = NULL;
-			guchar* _tmp57_ = NULL;
-			gint _tmp57__length1 = 0;
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+			Page* _tmp47_;
+			ViewCollection* _tmp48_;
+			ViewCollection* _tmp49_;
+			GeeList* _tmp50_;
+			GeeCollection* _tmp51_;
+			GtkSelectionData* _tmp52_;
+			GdkAtom _tmp53_;
+			GeeCollection* _tmp54_;
+			gint _tmp55_;
+			guchar* _tmp56_;
+			guchar* _tmp57_;
+			gint _tmp57__length1;
+#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp47_ = self->priv->page;
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp48_ = page_get_view (_tmp47_);
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp49_ = _tmp48_;
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp50_ = view_collection_get_selected_sources (_tmp49_);
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp51_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp49_);
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
 			sources = _tmp51_;
-#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp52_ = selection_data;
-#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp53_ = gdk_atom_intern_static_string ("SourceIDAtom");
-#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp54_ = sources;
-#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp56_ = serialize_media_sources (_tmp54_, &_tmp55_);
-#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57_ = _tmp56_;
-#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57__length1 = _tmp55_;
-#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_selection_data_set (_tmp52_, _tmp53_, (gint) sizeof (GdkAtom), _tmp57_, _tmp55_);
-#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57_ = (g_free (_tmp57_), NULL);
-#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2621 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (sources);
-#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2621 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15871 "Page.c"
+#line 15977 "Page.c"
 		}
 		default:
 		{
-			Page* _tmp58_ = NULL;
-			gchar* _tmp59_ = NULL;
-			gchar* _tmp60_ = NULL;
-			guint _tmp61_ = 0U;
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+			Page* _tmp58_;
+			gchar* _tmp59_;
+			gchar* _tmp60_;
+			guint _tmp61_;
+#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp58_ = self->priv->page;
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp59_ = page_get_page_name (_tmp58_);
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp60_ = _tmp59_;
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp61_ = target_type;
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
-			g_warning ("Page.vala:2604: on_drag_data_get (%s): unknown target type %u", _tmp60_, _tmp61_);
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+			g_warning ("Page.vala:2624: on_drag_data_get (%s): unknown target type %u", _tmp60_, _tmp61_);
+#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp60_);
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2626 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15893 "Page.c"
+#line 15999 "Page.c"
 		}
 	}
 }
 
 
 static void _drag_and_drop_handler_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
-#line 2627 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2647 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_export_completed ((DragAndDropHandler*) self);
-#line 15902 "Page.c"
+#line 16008 "Page.c"
 }
 
 
 static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) {
-	Page* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	Page* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-	Page* _tmp6_ = NULL;
-	GFile* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	GFile* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gboolean _tmp19_ = FALSE;
-#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
+	Page* _tmp6_;
+	GFile* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	GFile* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	gboolean _tmp19_;
+#line 2630 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2611: on_drag_end (%s)", _tmp2_);
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2631: on_drag_end (%s)", _tmp2_);
+#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->page;
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = TRUE;
-#line 15939 "Page.c"
+#line 16045 "Page.c"
 	} else {
-		Page* _tmp7_ = NULL;
-		ViewCollection* _tmp8_ = NULL;
-		ViewCollection* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+		Page* _tmp7_;
+		ViewCollection* _tmp8_;
+		ViewCollection* _tmp9_;
+		gint _tmp10_;
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->page;
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = view_collection_get_selected_count (_tmp9_);
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp10_ == 0;
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 15957 "Page.c"
+#line 16063 "Page.c"
 	}
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 15963 "Page.c"
+#line 16069 "Page.c"
 	} else {
-		GFile* _tmp11_ = NULL;
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+		GFile* _tmp11_;
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->priv->drag_destination;
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp11_ == NULL;
-#line 15970 "Page.c"
+#line 16076 "Page.c"
 	}
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15976 "Page.c"
+#line 16082 "Page.c"
 	} else {
-		ExporterUI* _tmp12_ = NULL;
-#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
+		ExporterUI* _tmp12_;
+#line 2634 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = self->priv->exporter;
-#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp12_ != NULL;
-#line 15983 "Page.c"
+#line 16089 "Page.c"
 	}
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15989 "Page.c"
+#line 16095 "Page.c"
 	}
-#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->priv->drag_destination;
-#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = g_file_get_path (_tmp13_);
-#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2618: Exporting to %s", _tmp15_);
-#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2638: Exporting to %s", _tmp15_);
+#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp15_);
-#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->priv->drag_destination;
-#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = g_file_get_path (_tmp16_);
-#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = _tmp18_ != NULL;
-#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp18_);
-#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp19_) {
-#line 16013 "Page.c"
-		Page* _tmp20_ = NULL;
-		ViewCollection* _tmp21_ = NULL;
-		ViewCollection* _tmp22_ = NULL;
-		GeeList* _tmp23_ = NULL;
-		GeeCollection* _tmp24_ = NULL;
-		GFile* _tmp25_ = NULL;
+#line 16119 "Page.c"
+		Page* _tmp20_;
+		ViewCollection* _tmp21_;
+		ViewCollection* _tmp22_;
+		GeeList* _tmp23_;
+		GeeCollection* _tmp24_;
+		GFile* _tmp25_;
 		Scaling _tmp26_ = {0};
 		ExportFormatParameters _tmp27_ = {0};
-		Exporter* _tmp28_ = NULL;
-		Exporter* _tmp29_ = NULL;
-		ExporterUI* _tmp30_ = NULL;
-		ExporterUI* _tmp31_ = NULL;
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+		Exporter* _tmp28_;
+		Exporter* _tmp29_;
+		ExporterUI* _tmp30_;
+		ExporterUI* _tmp31_;
+#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->page;
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = page_get_view (_tmp20_);
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = _tmp21_;
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = view_collection_get_selected_sources (_tmp22_);
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = self->priv->drag_destination;
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_original (&_tmp26_);
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
 		export_format_parameters_current (&_tmp27_);
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = exporter_new (_tmp24_, _tmp25_, &_tmp26_, &_tmp27_, FALSE);
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp28_;
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = exporter_ui_new (_tmp29_);
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
 		_exporter_ui_unref0 (self->priv->exporter);
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->exporter = _tmp30_;
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp29_);
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp24_);
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp22_);
-#line 2627 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2647 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = self->priv->exporter;
-#line 2627 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2647 "/home/jens/Source/shotwell/src/Page.vala"
 		exporter_ui_export (_tmp31_, _drag_and_drop_handler_on_export_completed_exporter_completion_callback, self);
-#line 16062 "Page.c"
+#line 16168 "Page.c"
 	} else {
-		const gchar* _tmp32_ = NULL;
-#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp32_ = _ ("Photos cannot be exported to this directory.");
-#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
-		app_window_error_message (_tmp32_, NULL);
-#line 16069 "Page.c"
+#line 2649 "/home/jens/Source/shotwell/src/Page.vala"
+		app_window_error_message (_ ("Photos cannot be exported to this directory."), NULL);
+#line 16172 "Page.c"
 	}
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2652 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2652 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 16075 "Page.c"
+#line 16178 "Page.c"
 }
 
 
 static gboolean drag_and_drop_handler_on_drag_failed (DragAndDropHandler* self, GdkDragContext* context, GtkDragResult drag_result) {
 	gboolean result = FALSE;
-	Page* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	GtkDragResult _tmp3_ = 0;
-	Page* _tmp4_ = NULL;
-#line 2635 "/home/jens/Source/shotwell/src/Page.vala"
+	Page* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	GtkDragResult _tmp3_;
+	Page* _tmp4_;
+#line 2655 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_DRAG_AND_DROP_HANDLER (self), FALSE);
-#line 2635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2655 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 2636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2656 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2656 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2656 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2656 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = drag_result;
-#line 2636 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2636: on_drag_failed (%s): %d", _tmp2_, (gint) _tmp3_);
-#line 2636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2656 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2656: on_drag_failed (%s): %d", _tmp2_, (gint) _tmp3_);
+#line 2656 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2658 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->page;
-#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2658 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2659 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2659 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 16110 "Page.c"
+#line 16213 "Page.c"
 	}
-#line 2641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2661 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2661 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2663 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2663 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 16120 "Page.c"
+#line 16223 "Page.c"
 }
 
 
 static void drag_and_drop_handler_on_export_completed (DragAndDropHandler* self) {
-#line 2646 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Page.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 2647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->exporter = NULL;
-#line 16131 "Page.c"
+#line 16234 "Page.c"
 }
 
 
 static void value_drag_and_drop_handler_init (GValue* value) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	value->data[0].v_pointer = NULL;
-#line 16138 "Page.c"
+#line 16241 "Page.c"
 }
 
 
 static void value_drag_and_drop_handler_free_value (GValue* value) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	if (value->data[0].v_pointer) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (value->data[0].v_pointer);
-#line 16147 "Page.c"
+#line 16250 "Page.c"
 	}
 }
 
 
 static void value_drag_and_drop_handler_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	if (src_value->data[0].v_pointer) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = drag_and_drop_handler_ref (src_value->data[0].v_pointer);
-#line 16157 "Page.c"
+#line 16260 "Page.c"
 	} else {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 16161 "Page.c"
+#line 16264 "Page.c"
 	}
 }
 
 
 static gpointer value_drag_and_drop_handler_peek_pointer (const GValue* value) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 16169 "Page.c"
+#line 16272 "Page.c"
 }
 
 
 static gchar* value_drag_and_drop_handler_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	if (collect_values[0].v_pointer) {
-#line 16176 "Page.c"
-		DragAndDropHandler* object;
+#line 16279 "Page.c"
+		DragAndDropHandler * object;
 		object = collect_values[0].v_pointer;
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 16183 "Page.c"
+#line 16286 "Page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 16187 "Page.c"
+#line 16290 "Page.c"
 		}
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = drag_and_drop_handler_ref (object);
-#line 16191 "Page.c"
+#line 16294 "Page.c"
 	} else {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16195 "Page.c"
+#line 16298 "Page.c"
 	}
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 16199 "Page.c"
+#line 16302 "Page.c"
 }
 
 
 static gchar* value_drag_and_drop_handler_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	DragAndDropHandler** object_p;
+	DragAndDropHandler ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!object_p) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 16210 "Page.c"
+#line 16313 "Page.c"
 	}
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!value->data[0].v_pointer) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = NULL;
-#line 16216 "Page.c"
+#line 16319 "Page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 16220 "Page.c"
+#line 16323 "Page.c"
 	} else {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = drag_and_drop_handler_ref (value->data[0].v_pointer);
-#line 16224 "Page.c"
+#line 16327 "Page.c"
 	}
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 16228 "Page.c"
+#line 16331 "Page.c"
 }
 
 
 GParamSpec* param_spec_drag_and_drop_handler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecDragAndDropHandler* spec;
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_DRAG_AND_DROP_HANDLER), NULL);
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	return G_PARAM_SPEC (spec);
-#line 16242 "Page.c"
+#line 16345 "Page.c"
 }
 
 
 gpointer value_get_drag_and_drop_handler (const GValue* value) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER), NULL);
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 16251 "Page.c"
+#line 16354 "Page.c"
 }
 
 
 void value_set_drag_and_drop_handler (GValue* value, gpointer v_object) {
-	DragAndDropHandler* old;
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+	DragAndDropHandler * old;
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	old = value->data[0].v_pointer;
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	if (v_object) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_ref (value->data[0].v_pointer);
-#line 16271 "Page.c"
+#line 16374 "Page.c"
 	} else {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16275 "Page.c"
+#line 16378 "Page.c"
 	}
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (old);
-#line 16281 "Page.c"
+#line 16384 "Page.c"
 	}
 }
 
 
 void value_take_drag_and_drop_handler (GValue* value, gpointer v_object) {
-	DragAndDropHandler* old;
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+	DragAndDropHandler * old;
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	old = value->data[0].v_pointer;
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	if (v_object) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 16300 "Page.c"
+#line 16403 "Page.c"
 	} else {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16304 "Page.c"
+#line 16407 "Page.c"
 	}
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (old);
-#line 16310 "Page.c"
+#line 16413 "Page.c"
 	}
 }
 
 
 static void drag_and_drop_handler_class_init (DragAndDropHandlerClass * klass) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_parent_class = g_type_class_peek_parent (klass);
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	((DragAndDropHandlerClass *) klass)->finalize = drag_and_drop_handler_finalize;
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (DragAndDropHandlerPrivate));
-#line 16322 "Page.c"
+#line 16425 "Page.c"
 }
 
 
 static void drag_and_drop_handler_instance_init (DragAndDropHandler * self) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = DRAG_AND_DROP_HANDLER_GET_PRIVATE (self);
-#line 2492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->exporter = NULL;
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	self->ref_count = 1;
-#line 16335 "Page.c"
+#line 16438 "Page.c"
 }
 
 
-static void drag_and_drop_handler_finalize (DragAndDropHandler* obj) {
+static void drag_and_drop_handler_finalize (DragAndDropHandler * obj) {
 	DragAndDropHandler * self;
-	GtkWidget* _tmp0_ = NULL;
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkWidget* _tmp0_;
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DRAG_AND_DROP_HANDLER, DragAndDropHandler);
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_destroy (self);
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 16350 "Page.c"
-		GtkWidget* _tmp1_ = NULL;
-		guint _tmp2_ = 0U;
-		GtkWidget* _tmp3_ = NULL;
-		guint _tmp4_ = 0U;
-		GtkWidget* _tmp5_ = NULL;
-		guint _tmp6_ = 0U;
-		GtkWidget* _tmp7_ = NULL;
-		guint _tmp8_ = 0U;
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 16453 "Page.c"
+		GtkWidget* _tmp1_;
+		guint _tmp2_;
+		GtkWidget* _tmp3_;
+		guint _tmp4_;
+		GtkWidget* _tmp5_;
+		guint _tmp6_;
+		GtkWidget* _tmp7_;
+		guint _tmp8_;
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->event_source;
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-begin", gtk_widget_get_type (), &_tmp2_, NULL, FALSE);
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _drag_and_drop_handler_on_drag_begin_gtk_widget_drag_begin, self);
-#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->event_source;
-#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-data-get", gtk_widget_get_type (), &_tmp4_, NULL, FALSE);
-#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _drag_and_drop_handler_on_drag_data_get_gtk_widget_drag_data_get, self);
-#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-end", gtk_widget_get_type (), &_tmp6_, NULL, FALSE);
-#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end, self);
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2548 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->event_source;
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2548 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-failed", gtk_widget_get_type (), &_tmp8_, NULL, FALSE);
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2548 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _drag_and_drop_handler_on_drag_failed_gtk_widget_drag_failed, self);
-#line 16383 "Page.c"
+#line 16486 "Page.c"
 	}
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page = NULL;
-#line 2532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2552 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2552 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = NULL;
-#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 16397 "Page.c"
+#line 16500 "Page.c"
 }
 
 
@@ -16412,26 +16515,26 @@ GType drag_and_drop_handler_get_type (void) {
 
 
 gpointer drag_and_drop_handler_ref (gpointer instance) {
-	DragAndDropHandler* self;
+	DragAndDropHandler * self;
 	self = instance;
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	return instance;
-#line 16422 "Page.c"
+#line 16525 "Page.c"
 }
 
 
 void drag_and_drop_handler_unref (gpointer instance) {
-	DragAndDropHandler* self;
+	DragAndDropHandler * self;
 	self = instance;
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		DRAG_AND_DROP_HANDLER_GET_CLASS (self)->finalize (self);
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 16435 "Page.c"
+#line 16538 "Page.c"
 	}
 }
 
diff --git a/src/Page.vala b/src/Page.vala
index 7504743..88fecc7 100644
--- a/src/Page.vala
+++ b/src/Page.vala
@@ -174,7 +174,7 @@ public abstract class Page : Gtk.ScrolledWindow {
         event_source.add_events(Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.BUTTON_RELEASE_MASK
             | Gdk.EventMask.POINTER_MOTION_MASK | Gdk.EventMask.POINTER_MOTION_HINT_MASK
             | Gdk.EventMask.BUTTON_MOTION_MASK | Gdk.EventMask.LEAVE_NOTIFY_MASK
-            | Gdk.EventMask.SCROLL_MASK);
+            | Gdk.EventMask.SCROLL_MASK | Gdk.EventMask.SMOOTH_SCROLL_MASK);
         event_source.button_press_event.connect(on_button_pressed_internal);
         event_source.button_release_event.connect(on_button_released_internal);
         event_source.motion_notify_event.connect(on_motion_internal);
@@ -1038,6 +1038,23 @@ public abstract class Page : Gtk.ScrolledWindow {
 
             case Gdk.ScrollDirection.RIGHT:
                 return on_mousewheel_right(event);
+
+            case Gdk.ScrollDirection.SMOOTH:
+                {
+                    double dx, dy;
+                    event.get_scroll_deltas(out dx, out dy);
+
+                    if (dy < 0)
+                        return on_mousewheel_up(event);
+                    else if (dy > 0)
+                        return on_mousewheel_down(event);
+                    else if (dx < 0)
+                        return on_mousewheel_left(event);
+                    else if (dx > 0)
+                        return on_mousewheel_right(event);
+                    else
+                        return false;
+                }
            
             default:
                 return false;
@@ -1301,6 +1318,9 @@ public abstract class CheckerboardPage : Page {
     
     private Gtk.Menu page_context_menu;
     public override Gtk.Menu? get_page_context_menu() {
+        if (page_context_menu_path == null)
+            return null;
+
         if (page_context_menu == null) {
             var model = this.builder.get_object (page_context_menu_path)
                 as GLib.MenuModel;
diff --git a/src/Photo.c b/src/Photo.c
index dffc7d4..1704070 100644
--- a/src/Photo.c
+++ b/src/Photo.c
@@ -1,4 +1,4 @@
-/* Photo.c generated by valac 0.34.7, the Vala compiler
+/* Photo.c generated by valac 0.36.6, the Vala compiler
  * generated from Photo.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -84,6 +84,11 @@ typedef struct _ParamSpecPhotoImportParams ParamSpecPhotoImportParams;
 typedef struct _PhotoTransformationState PhotoTransformationState;
 typedef struct _PhotoTransformationStateClass PhotoTransformationStateClass;
 typedef struct _PhotoTransformationStatePrivate PhotoTransformationStatePrivate;
+enum  {
+	PHOTO_TRANSFORMATION_STATE_BROKEN_SIGNAL,
+	PHOTO_TRANSFORMATION_STATE_LAST_SIGNAL
+};
+static guint photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_LAST_SIGNAL] = {0};
 
 #define TYPE_RATING (rating_get_type ())
 
@@ -649,6 +654,17 @@ typedef struct _PhotoParamSpecReimportMasterState PhotoParamSpecReimportMasterSt
 typedef struct _PhotoParamSpecReimportEditableState PhotoParamSpecReimportEditableState;
 typedef struct _PhotoParamSpecReimportRawDevelopmentState PhotoParamSpecReimportRawDevelopmentState;
 typedef struct _PhotoReimportRawDevelopmentStateImplParamSpecDevToReimport PhotoReimportRawDevelopmentStateImplParamSpecDevToReimport;
+enum  {
+	PHOTO_EDITABLE_REPLACED_SIGNAL,
+	PHOTO_RAW_DEVELOPMENT_MODIFIED_SIGNAL,
+	PHOTO_BASELINE_REPLACED_SIGNAL,
+	PHOTO_MASTER_REIMPORTED_SIGNAL,
+	PHOTO_EDITABLE_REIMPORTED_SIGNAL,
+	PHOTO_BASELINE_REIMPORTED_SIGNAL,
+	PHOTO_SOURCE_REIMPORTED_SIGNAL,
+	PHOTO_LAST_SIGNAL
+};
+static guint photo_signals[PHOTO_LAST_SIGNAL] = {0};
 typedef struct _DataCollectionPrivate DataCollectionPrivate;
 
 #define TYPE_MARKER (marker_get_type ())
@@ -807,6 +823,14 @@ typedef struct _HierarchicalTagIndexClass HierarchicalTagIndexClass;
 
 typedef struct _MediaSourceTransactionController MediaSourceTransactionController;
 typedef struct _MediaSourceTransactionControllerClass MediaSourceTransactionControllerClass;
+enum  {
+	LIBRARY_PHOTO_SOURCE_COLLECTION_MASTER_REIMPORTED_SIGNAL,
+	LIBRARY_PHOTO_SOURCE_COLLECTION_EDITABLE_REIMPORTED_SIGNAL,
+	LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL,
+	LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL,
+	LIBRARY_PHOTO_SOURCE_COLLECTION_LAST_SIGNAL
+};
+static guint library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_LAST_SIGNAL] = {0};
 
 #define TYPE_FLAGGABLE (flaggable_get_type ())
 #define FLAGGABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FLAGGABLE, Flaggable))
@@ -1759,14 +1783,14 @@ static gpointer photo_reimport_editable_state_impl_parent_class = NULL;
 static gpointer photo_reimport_raw_development_state_parent_class = NULL;
 static gpointer photo_reimport_raw_development_state_impl_parent_class = NULL;
 static gpointer photo_reimport_raw_development_state_impl_dev_to_reimport_parent_class = NULL;
-static DateableIface* photo_dateable_parent_iface = NULL;
+static DateableIface * photo_dateable_parent_iface = NULL;
 static gpointer library_photo_source_collection_parent_class = NULL;
 static gpointer library_photo_parent_class = NULL;
 extern LibraryPhotoSourceCollection* library_photo_global;
 LibraryPhotoSourceCollection* library_photo_global = NULL;
 extern TagSourceCollection* tag_global;
-static FlaggableIface* library_photo_flaggable_parent_iface = NULL;
-static MonitorableIface* library_photo_monitorable_parent_iface = NULL;
+static FlaggableIface * library_photo_flaggable_parent_iface = NULL;
+static MonitorableIface * library_photo_monitorable_parent_iface = NULL;
 static gpointer library_photo_source_holding_tank_parent_class = NULL;
 
 GType backing_fetch_mode_get_type (void) G_GNUC_CONST;
@@ -1804,7 +1828,7 @@ PhotoImportParams* photo_import_params_new (GFile* file, GFile* final_associated
 PhotoImportParams* photo_import_params_construct (GType object_type, GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails);
 PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, ImportID* import_id);
 PhotoImportParams* photo_import_params_construct_create_placeholder (GType object_type, GFile* file, ImportID* import_id);
-static void photo_import_params_finalize (PhotoImportParams* obj);
+static void photo_import_params_finalize (PhotoImportParams * obj);
 GType photo_transformation_state_get_type (void) G_GNUC_CONST;
 #define PHOTO_TRANSFORMATION_STATE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationStatePrivate))
 enum  {
@@ -1813,7 +1837,7 @@ enum  {
 PhotoTransformationState* photo_transformation_state_construct (GType object_type);
 gboolean photo_transformation_state_is_broken (PhotoTransformationState* self);
 static void photo_transformation_state_real_broken (PhotoTransformationState* self);
-static void photo_transformation_state_finalize (GObject* obj);
+static void photo_transformation_state_finalize (GObject * obj);
 GType rating_get_type (void) G_GNUC_CONST;
 gboolean rating_can_increase (Rating self);
 gboolean rating_can_decrease (Rating self);
@@ -2087,12 +2111,12 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d);
 static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, int* result_length1);
 BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_row, const gchar* md5);
 BackingFileState* backing_file_state_construct_from_photo_row (GType object_type, BackingPhotoRow* photo_row, const gchar* md5);
-static void _vala_array_add85 (BackingFileState*** array, int* length, int* size, BackingFileState* value);
+static void _vala_array_add85 (BackingFileState** * array, int* length, int* size, BackingFileState* value);
 gboolean photo_has_editable (Photo* self);
-static void _vala_array_add86 (BackingFileState*** array, int* length, int* size, BackingFileState* value);
+static void _vala_array_add86 (BackingFileState** * array, int* length, int* size, BackingFileState* value);
 gboolean photo_is_developed (Photo* self);
 GeeCollection* photo_get_raw_development_photo_rows (Photo* self);
-static void _vala_array_add87 (BackingFileState*** array, int* length, int* size, BackingFileState* value);
+static void _vala_array_add87 (BackingFileState** * array, int* length, int* size, BackingFileState* value);
 static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode mode);
 static PhotoFileReader* photo_get_master_reader (Photo* self);
 static PhotoFileReader* photo_get_baseline_reader (Photo* self);
@@ -2151,7 +2175,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
 ImportResult import_result_convert_error (GError* err, ImportResult default_result);
 void photo_create_pre_import (PhotoImportParams* params);
 void dimensions_init (Dimensions *self, gint width, gint height);
-BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoFileSnifferOptions options, DetectedPhotoInformation** detected, GError** error);
+BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoFileSnifferOptions options, DetectedPhotoInformation* * detected, GError** error);
 gpointer photo_reimport_master_state_ref (gpointer instance);
 void photo_reimport_master_state_unref (gpointer instance);
 GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -2159,13 +2183,13 @@ void photo_value_set_reimport_master_state (GValue* value, gpointer v_object);
 void photo_value_take_reimport_master_state (GValue* value, gpointer v_object);
 gpointer photo_value_get_reimport_master_state (const GValue* value);
 GType photo_reimport_master_state_get_type (void) G_GNUC_CONST;
-gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState** reimport_state, GError** error);
-static void _vala_array_add88 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add89 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add90 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add91 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add92 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add93 (gchar*** array, int* length, int* size, gchar* value);
+gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error);
+static void _vala_array_add88 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add89 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add90 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add91 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add92 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add93 (gchar** * array, int* length, int* size, gchar* value);
 static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1);
 static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct (GType object_type, PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1);
 static GType photo_reimport_master_state_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
@@ -2174,11 +2198,11 @@ static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetad
 void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error);
 void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error);
 void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from);
-static void _vala_array_add94 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add95 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add94 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add95 (gchar** * array, int* length, int* size, gchar* value);
 Alteration* alteration_new_from_array (gchar** array, int array_length1);
 Alteration* alteration_construct_from_array (GType object_type, gchar** array, int array_length1);
-static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, BackingPhotoRow** backing, DetectedPhotoInformation** detected, GError** error);
+static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, BackingPhotoRow* * backing, DetectedPhotoInformation* * detected, GError** error);
 gpointer photo_reimport_editable_state_ref (gpointer instance);
 void photo_reimport_editable_state_unref (gpointer instance);
 GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -2186,7 +2210,7 @@ void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object);
 void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object);
 gpointer photo_value_get_reimport_editable_state (const GValue* value);
 GType photo_reimport_editable_state_get_type (void) G_GNUC_CONST;
-gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditableState** state, GError** error);
+gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditableState* * state, GError** error);
 GFile* photo_get_editable_file (Photo* self);
 static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, PhotoMetadata* metadata);
 static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_construct (GType object_type, BackingPhotoRow* backing_state, PhotoMetadata* metadata);
@@ -2207,7 +2231,7 @@ void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_o
 void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_object);
 gpointer photo_value_get_reimport_raw_development_state (const GValue* value);
 GType photo_reimport_raw_development_state_get_type (void) G_GNUC_CONST;
-gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState** state, GError** error);
+gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* * state, GError** error);
 GeeCollection* photo_get_raw_developer_files (Photo* self);
 static GType photo_reimport_raw_development_state_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_new (void);
@@ -2243,7 +2267,7 @@ static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale
 GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error);
 void scaling_for_best_fit (gint pixels, gboolean scale_up, Scaling* result);
 static gboolean photo_is_extension_found (const gchar* basename, gchar** extensions, int extensions_length1);
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
 gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format);
 gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format);
 PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, int* result_length1);
@@ -2254,15 +2278,15 @@ static GFile* photo_real_get_file (MediaSource* base);
 void photo_set_master_file (Photo* self, GFile* file);
 void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* filepath, GError** error);
 void media_source_notify_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file);
-static void _vala_array_add96 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add97 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add98 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add99 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add96 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add97 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add98 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add99 (gchar** * array, int* length, int* size, gchar* value);
 void photo_set_editable_file (Photo* self, GFile* file);
 void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error);
-static void _vala_array_add100 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add101 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add102 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add100 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add101 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add102 (gchar** * array, int* length, int* size, gchar* value);
 void photo_set_many_editable_file (GeeMap* map, GError** error);
 GFile* photo_get_actual_file (Photo* self);
 static GFile* photo_real_get_master_file (MediaSource* base);
@@ -2379,9 +2403,9 @@ PixelTransformationType pixel_transformation_get_transformation_type (PixelTrans
 static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans);
 static PhotoMetadata* photo_real_get_metadata (PhotoSource* base);
 PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error);
-gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportMasterState** state, GError** error);
+gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportMasterState* * state, GError** error);
 void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* state, GError** error);
-gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportEditableState** state, GError** error);
+gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportEditableState* * state, GError** error);
 void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableState* state, GError** error);
 gboolean photo_has_transformations (Photo* self);
 gboolean photo_only_metadata_changed (Photo* self);
@@ -2515,12 +2539,12 @@ static void photo_update_editable_attributes (Photo* self, GError** error);
 void photo_reimport_editable (Photo* self, GError** error);
 void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error);
 void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, gint64 filesize, GError** error);
-static void _vala_array_add103 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add104 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add105 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add106 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add107 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add108 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add103 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add104 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add105 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add106 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add107 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add108 (gchar** * array, int* length, int* size, gchar* value);
 void backing_photo_id_init (BackingPhotoID *self, gint64 id);
 const gchar* g_file_monitor_event_to_string (GFileMonitorEvent self);
 static void photo_on_reimport_editable (Photo* self);
@@ -2561,39 +2585,39 @@ enum  {
 static void photo_photo_transformation_state_impl_on_photo_baseline_replaced (PhotoPhotoTransformationStateImpl* self);
 static void _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced (Photo* _sender, gpointer self);
 static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (GeeHashMap* original);
-static void photo_photo_transformation_state_impl_finalize (GObject* obj);
+static void photo_photo_transformation_state_impl_finalize (GObject * obj);
 enum  {
 	PHOTO_BACKING_READERS_DUMMY_PROPERTY
 };
-static void photo_backing_readers_finalize (PhotoBackingReaders* obj);
+static void photo_backing_readers_finalize (PhotoBackingReaders * obj);
 enum  {
 	PHOTO_CACHED_PIXBUF_DUMMY_PROPERTY
 };
-static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf* obj);
+static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf * obj);
 enum  {
 	PHOTO_REIMPORT_MASTER_STATE_DUMMY_PROPERTY
 };
 PhotoReimportMasterState* photo_reimport_master_state_construct (GType object_type);
-static void photo_reimport_master_state_finalize (PhotoReimportMasterState* obj);
+static void photo_reimport_master_state_finalize (PhotoReimportMasterState * obj);
 enum  {
 	PHOTO_REIMPORT_MASTER_STATE_IMPL_DUMMY_PROPERTY
 };
 static gchar** _vala_array_dup28 (gchar** self, int length);
-static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState* obj);
+static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState * obj);
 enum  {
 	PHOTO_REIMPORT_EDITABLE_STATE_DUMMY_PROPERTY
 };
 PhotoReimportEditableState* photo_reimport_editable_state_construct (GType object_type);
-static void photo_reimport_editable_state_finalize (PhotoReimportEditableState* obj);
+static void photo_reimport_editable_state_finalize (PhotoReimportEditableState * obj);
 enum  {
 	PHOTO_REIMPORT_EDITABLE_STATE_IMPL_DUMMY_PROPERTY
 };
-static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState* obj);
+static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState * obj);
 enum  {
 	PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_DUMMY_PROPERTY
 };
 PhotoReimportRawDevelopmentState* photo_reimport_raw_development_state_construct (GType object_type);
-static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState* obj);
+static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState * obj);
 enum  {
 	PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DUMMY_PROPERTY
 };
@@ -2602,9 +2626,9 @@ static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_dev
 enum  {
 	PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DEV_TO_REIMPORT_DUMMY_PROPERTY
 };
-static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport* obj);
-static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState* obj);
-static void photo_finalize (GObject* obj);
+static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport * obj);
+static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState * obj);
+static void photo_finalize (GObject * obj);
 static void _vala_photo_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_photo_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 GType marker_get_type (void) G_GNUC_CONST;
@@ -2758,7 +2782,7 @@ static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * clos
 static void library_photo_source_collection_real_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata);
 static void library_photo_source_collection_real_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata);
 static void library_photo_source_collection_real_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata);
-static void library_photo_source_collection_finalize (DataCollection* obj);
+static void library_photo_source_collection_finalize (DataCollection * obj);
 GType flaggable_get_type (void) G_GNUC_CONST;
 GType monitorable_get_type (void) G_GNUC_CONST;
 #define LIBRARY_PHOTO_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_PHOTO, LibraryPhotoPrivate))
@@ -2784,7 +2808,7 @@ GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* ob
 void media_source_collection_add_many_to_trash (MediaSourceCollection* self, GeeCollection* sources);
 void media_source_collection_add_many_to_offline (MediaSourceCollection* self, GeeCollection* sources);
 void library_photo_terminate (void);
-ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto** photo);
+ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto* * photo);
 void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result);
 gboolean photo_id_is_invalid (PhotoID *self);
 void library_photo_import_failed (LibraryPhoto* photo);
@@ -2850,7 +2874,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag);
 gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name);
 gboolean tag_source_collection_exists (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root);
-static void library_photo_finalize (GObject* obj);
+static void library_photo_finalize (GObject * obj);
 #define LIBRARY_PHOTO_SOURCE_HOLDING_TANK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTankPrivate))
 enum  {
 	LIBRARY_PHOTO_SOURCE_HOLDING_TANK_DUMMY_PROPERTY
@@ -2863,7 +2887,7 @@ static void _library_photo_source_holding_tank_on_editable_replaced_photo_editab
 static void library_photo_source_holding_tank_on_raw_development_modified (LibraryPhotoSourceHoldingTank* self, Photo* _photo);
 static void _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self);
 void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed);
-static void library_photo_source_holding_tank_finalize (SourceHoldingTank* obj);
+static void library_photo_source_holding_tank_finalize (SourceHoldingTank * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -2884,33 +2908,33 @@ GType backing_fetch_mode_get_type (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 41 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2888 "Photo.c"
+#line 2912 "Photo.c"
 }
 
 
 static gpointer _thumbnails_ref0 (gpointer self) {
 #line 48 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? thumbnails_ref (self) : NULL;
-#line 2895 "Photo.c"
+#line 2919 "Photo.c"
 }
 
 
 PhotoImportParams* photo_import_params_construct (GType object_type, GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails) {
 	PhotoImportParams* self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	ImportID _tmp4_ = {0};
-	PhotoFileSnifferOptions _tmp5_ = 0;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	Thumbnails* _tmp12_ = NULL;
-	Thumbnails* _tmp13_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	ImportID _tmp4_;
+	PhotoFileSnifferOptions _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	const gchar* _tmp8_;
+	gchar* _tmp9_;
+	const gchar* _tmp10_;
+	gchar* _tmp11_;
+	Thumbnails* _tmp12_;
+	Thumbnails* _tmp13_;
 #line 38 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 38 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -2979,22 +3003,22 @@ PhotoImportParams* photo_import_params_construct (GType object_type, GFile* file
 	self->thumbnails = _tmp13_;
 #line 38 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 2983 "Photo.c"
+#line 3007 "Photo.c"
 }
 
 
 PhotoImportParams* photo_import_params_new (GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails) {
 #line 38 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_import_params_construct (TYPE_PHOTO_IMPORT_PARAMS, file, final_associated_file, import_id, sniffer_options, exif_md5, thumbnail_md5, full_md5, thumbnails);
-#line 2990 "Photo.c"
+#line 3014 "Photo.c"
 }
 
 
 PhotoImportParams* photo_import_params_construct_create_placeholder (GType object_type, GFile* file, ImportID* import_id) {
 	PhotoImportParams* self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	ImportID _tmp2_ = {0};
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	ImportID _tmp2_;
 #line 52 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 52 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3033,21 +3057,21 @@ PhotoImportParams* photo_import_params_construct_create_placeholder (GType objec
 	self->thumbnails = NULL;
 #line 52 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 3037 "Photo.c"
+#line 3061 "Photo.c"
 }
 
 
 PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, ImportID* import_id) {
 #line 52 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_import_params_construct_create_placeholder (TYPE_PHOTO_IMPORT_PARAMS, file, import_id);
-#line 3044 "Photo.c"
+#line 3068 "Photo.c"
 }
 
 
 static void value_photo_import_params_init (GValue* value) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 3051 "Photo.c"
+#line 3075 "Photo.c"
 }
 
 
@@ -3056,7 +3080,7 @@ static void value_photo_import_params_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_import_params_unref (value->data[0].v_pointer);
-#line 3060 "Photo.c"
+#line 3084 "Photo.c"
 	}
 }
 
@@ -3066,11 +3090,11 @@ static void value_photo_import_params_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_import_params_ref (src_value->data[0].v_pointer);
-#line 3070 "Photo.c"
+#line 3094 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3074 "Photo.c"
+#line 3098 "Photo.c"
 	}
 }
 
@@ -3078,66 +3102,66 @@ static void value_photo_import_params_copy_value (const GValue* src_value, GValu
 static gpointer value_photo_import_params_peek_pointer (const GValue* value) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 3082 "Photo.c"
+#line 3106 "Photo.c"
 }
 
 
 static gchar* value_photo_import_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 3089 "Photo.c"
-		PhotoImportParams* object;
+#line 3113 "Photo.c"
+		PhotoImportParams * object;
 		object = collect_values[0].v_pointer;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3096 "Photo.c"
+#line 3120 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3100 "Photo.c"
+#line 3124 "Photo.c"
 		}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_import_params_ref (object);
-#line 3104 "Photo.c"
+#line 3128 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 3108 "Photo.c"
+#line 3132 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 3112 "Photo.c"
+#line 3136 "Photo.c"
 }
 
 
 static gchar* value_photo_import_params_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PhotoImportParams** object_p;
+	PhotoImportParams ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3123 "Photo.c"
+#line 3147 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 3129 "Photo.c"
+#line 3153 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3133 "Photo.c"
+#line 3157 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_import_params_ref (value->data[0].v_pointer);
-#line 3137 "Photo.c"
+#line 3161 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 3141 "Photo.c"
+#line 3165 "Photo.c"
 }
 
 
@@ -3151,7 +3175,7 @@ GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 3155 "Photo.c"
+#line 3179 "Photo.c"
 }
 
 
@@ -3160,12 +3184,12 @@ gpointer value_get_photo_import_params (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_IMPORT_PARAMS), NULL);
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 3164 "Photo.c"
+#line 3188 "Photo.c"
 }
 
 
 void value_set_photo_import_params (GValue* value, gpointer v_object) {
-	PhotoImportParams* old;
+	PhotoImportParams * old;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_IMPORT_PARAMS));
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3180,23 +3204,23 @@ void value_set_photo_import_params (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_import_params_ref (value->data[0].v_pointer);
-#line 3184 "Photo.c"
+#line 3208 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 3188 "Photo.c"
+#line 3212 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_import_params_unref (old);
-#line 3194 "Photo.c"
+#line 3218 "Photo.c"
 	}
 }
 
 
 void value_take_photo_import_params (GValue* value, gpointer v_object) {
-	PhotoImportParams* old;
+	PhotoImportParams * old;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_IMPORT_PARAMS));
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3209,17 +3233,17 @@ void value_take_photo_import_params (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 3213 "Photo.c"
+#line 3237 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 3217 "Photo.c"
+#line 3241 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_import_params_unref (old);
-#line 3223 "Photo.c"
+#line 3247 "Photo.c"
 	}
 }
 
@@ -3229,12 +3253,12 @@ static void photo_import_params_class_init (PhotoImportParamsClass * klass) {
 	photo_import_params_parent_class = g_type_class_peek_parent (klass);
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoImportParamsClass *) klass)->finalize = photo_import_params_finalize;
-#line 3233 "Photo.c"
+#line 3257 "Photo.c"
 }
 
 
 static void photo_import_params_instance_init (PhotoImportParams * self) {
-	PhotoRow* _tmp0_ = NULL;
+	PhotoRow* _tmp0_;
 #line 24 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->final_associated_file = NULL;
 #line 35 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3245,11 +3269,11 @@ static void photo_import_params_instance_init (PhotoImportParams * self) {
 	self->keywords = NULL;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 3249 "Photo.c"
+#line 3273 "Photo.c"
 }
 
 
-static void photo_import_params_finalize (PhotoImportParams* obj) {
+static void photo_import_params_finalize (PhotoImportParams * obj) {
 	PhotoImportParams * self;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_IMPORT_PARAMS, PhotoImportParams);
@@ -3271,7 +3295,7 @@ static void photo_import_params_finalize (PhotoImportParams* obj) {
 	_photo_row_unref0 (self->row);
 #line 36 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->keywords);
-#line 3275 "Photo.c"
+#line 3299 "Photo.c"
 }
 
 
@@ -3290,18 +3314,18 @@ GType photo_import_params_get_type (void) {
 
 
 gpointer photo_import_params_ref (gpointer instance) {
-	PhotoImportParams* self;
+	PhotoImportParams * self;
 	self = instance;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 3300 "Photo.c"
+#line 3324 "Photo.c"
 }
 
 
 void photo_import_params_unref (gpointer instance) {
-	PhotoImportParams* self;
+	PhotoImportParams * self;
 	self = instance;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -3309,7 +3333,7 @@ void photo_import_params_unref (gpointer instance) {
 		PHOTO_IMPORT_PARAMS_GET_CLASS (self)->finalize (self);
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3313 "Photo.c"
+#line 3337 "Photo.c"
 	}
 }
 
@@ -3320,13 +3344,13 @@ PhotoTransformationState* photo_transformation_state_construct (GType object_typ
 	self = (PhotoTransformationState*) g_object_new (object_type, NULL);
 #line 72 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 3324 "Photo.c"
+#line 3348 "Photo.c"
 }
 
 
 gboolean photo_transformation_state_is_broken (PhotoTransformationState* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 75 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_TRANSFORMATION_STATE (self), FALSE);
 #line 76 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3335,14 +3359,14 @@ gboolean photo_transformation_state_is_broken (PhotoTransformationState* self) {
 	result = _tmp0_;
 #line 76 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3339 "Photo.c"
+#line 3363 "Photo.c"
 }
 
 
 static void photo_transformation_state_real_broken (PhotoTransformationState* self) {
 #line 69 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->is_broke = TRUE;
-#line 3346 "Photo.c"
+#line 3370 "Photo.c"
 }
 
 
@@ -3356,8 +3380,8 @@ static void photo_transformation_state_class_init (PhotoTransformationStateClass
 #line 63 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (klass)->finalize = photo_transformation_state_finalize;
 #line 63 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_new ("broken", TYPE_PHOTO_TRANSFORMATION_STATE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoTransformationStateClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3361 "Photo.c"
+	photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_BROKEN_SIGNAL] = g_signal_new ("broken", TYPE_PHOTO_TRANSFORMATION_STATE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoTransformationStateClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 3385 "Photo.c"
 }
 
 
@@ -3366,17 +3390,17 @@ static void photo_transformation_state_instance_init (PhotoTransformationState *
 	self->priv = PHOTO_TRANSFORMATION_STATE_GET_PRIVATE (self);
 #line 64 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->is_broke = FALSE;
-#line 3370 "Photo.c"
+#line 3394 "Photo.c"
 }
 
 
-static void photo_transformation_state_finalize (GObject* obj) {
+static void photo_transformation_state_finalize (GObject * obj) {
 	PhotoTransformationState * self;
 #line 63 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState);
 #line 63 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (photo_transformation_state_parent_class)->finalize (obj);
-#line 3380 "Photo.c"
+#line 3404 "Photo.c"
 }
 
 
@@ -3398,7 +3422,7 @@ gboolean rating_can_increase (Rating self) {
 	result = self < RATING_FIVE;
 #line 90 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3402 "Photo.c"
+#line 3426 "Photo.c"
 }
 
 
@@ -3408,7 +3432,7 @@ gboolean rating_can_decrease (Rating self) {
 	result = self > RATING_REJECTED;
 #line 94 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3412 "Photo.c"
+#line 3436 "Photo.c"
 }
 
 
@@ -3419,65 +3443,65 @@ gboolean rating_is_valid (Rating self) {
 	if (self >= RATING_REJECTED) {
 #line 98 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self <= RATING_FIVE;
-#line 3423 "Photo.c"
+#line 3447 "Photo.c"
 	} else {
 #line 98 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = FALSE;
-#line 3427 "Photo.c"
+#line 3451 "Photo.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 98 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3433 "Photo.c"
+#line 3457 "Photo.c"
 }
 
 
 Rating rating_increase (Rating self) {
 	Rating result = 0;
 	Rating _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = rating_can_increase (self);
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self + 1;
-#line 3447 "Photo.c"
+#line 3471 "Photo.c"
 	} else {
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self;
-#line 3451 "Photo.c"
+#line 3475 "Photo.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3457 "Photo.c"
+#line 3481 "Photo.c"
 }
 
 
 Rating rating_decrease (Rating self) {
 	Rating result = 0;
 	Rating _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = rating_can_decrease (self);
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self - 1;
-#line 3471 "Photo.c"
+#line 3495 "Photo.c"
 	} else {
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self;
-#line 3475 "Photo.c"
+#line 3499 "Photo.c"
 	}
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3481 "Photo.c"
+#line 3505 "Photo.c"
 }
 
 
@@ -3487,73 +3511,73 @@ gint rating_serialize (Rating self) {
 	switch (self) {
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_REJECTED:
-#line 3491 "Photo.c"
+#line 3515 "Photo.c"
 		{
 #line 112 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = -1;
 #line 112 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3497 "Photo.c"
+#line 3521 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_UNRATED:
-#line 3501 "Photo.c"
+#line 3525 "Photo.c"
 		{
 #line 114 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 0;
 #line 114 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3507 "Photo.c"
+#line 3531 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_ONE:
-#line 3511 "Photo.c"
+#line 3535 "Photo.c"
 		{
 #line 116 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 1;
 #line 116 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3517 "Photo.c"
+#line 3541 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_TWO:
-#line 3521 "Photo.c"
+#line 3545 "Photo.c"
 		{
 #line 118 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 2;
 #line 118 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3527 "Photo.c"
+#line 3551 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_THREE:
-#line 3531 "Photo.c"
+#line 3555 "Photo.c"
 		{
 #line 120 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 3;
 #line 120 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3537 "Photo.c"
+#line 3561 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_FOUR:
-#line 3541 "Photo.c"
+#line 3565 "Photo.c"
 		{
 #line 122 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 4;
 #line 122 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3547 "Photo.c"
+#line 3571 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_FIVE:
-#line 3551 "Photo.c"
+#line 3575 "Photo.c"
 		{
 #line 124 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 5;
 #line 124 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3557 "Photo.c"
+#line 3581 "Photo.c"
 		}
 		default:
 		{
@@ -3561,7 +3585,7 @@ gint rating_serialize (Rating self) {
 			result = 0;
 #line 126 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3565 "Photo.c"
+#line 3589 "Photo.c"
 		}
 	}
 }
@@ -3569,8 +3593,8 @@ gint rating_serialize (Rating self) {
 
 Rating rating_unserialize (gint value) {
 	Rating result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp2_;
 #line 131 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = value;
 #line 131 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3579,9 +3603,9 @@ Rating rating_unserialize (gint value) {
 		result = RATING_FIVE;
 #line 132 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 3583 "Photo.c"
+#line 3607 "Photo.c"
 	} else {
-		gint _tmp1_ = 0;
+		gint _tmp1_;
 #line 133 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = value;
 #line 133 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3590,7 +3614,7 @@ Rating rating_unserialize (gint value) {
 			result = RATING_REJECTED;
 #line 134 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3594 "Photo.c"
+#line 3618 "Photo.c"
 		}
 	}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3599,73 +3623,73 @@ Rating rating_unserialize (gint value) {
 	switch (_tmp2_) {
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case -1:
-#line 3603 "Photo.c"
+#line 3627 "Photo.c"
 		{
 #line 138 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_REJECTED;
 #line 138 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3609 "Photo.c"
+#line 3633 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 0:
-#line 3613 "Photo.c"
+#line 3637 "Photo.c"
 		{
 #line 140 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_UNRATED;
 #line 140 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3619 "Photo.c"
+#line 3643 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 1:
-#line 3623 "Photo.c"
+#line 3647 "Photo.c"
 		{
 #line 142 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_ONE;
 #line 142 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3629 "Photo.c"
+#line 3653 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 2:
-#line 3633 "Photo.c"
+#line 3657 "Photo.c"
 		{
 #line 144 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_TWO;
 #line 144 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3639 "Photo.c"
+#line 3663 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 3:
-#line 3643 "Photo.c"
+#line 3667 "Photo.c"
 		{
 #line 146 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_THREE;
 #line 146 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3649 "Photo.c"
+#line 3673 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 4:
-#line 3653 "Photo.c"
+#line 3677 "Photo.c"
 		{
 #line 148 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_FOUR;
 #line 148 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3659 "Photo.c"
+#line 3683 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 5:
-#line 3663 "Photo.c"
+#line 3687 "Photo.c"
 		{
 #line 150 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_FIVE;
 #line 150 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3669 "Photo.c"
+#line 3693 "Photo.c"
 		}
 		default:
 		{
@@ -3673,7 +3697,7 @@ Rating rating_unserialize (gint value) {
 			result = RATING_UNRATED;
 #line 152 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3677 "Photo.c"
+#line 3701 "Photo.c"
 		}
 	}
 }
@@ -3693,27 +3717,27 @@ GType rating_get_type (void) {
 
 gboolean photo_exception_prohibits (PhotoException self, PhotoException exception) {
 	gboolean result = FALSE;
-	PhotoException _tmp0_ = 0;
+	PhotoException _tmp0_;
 #line 228 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = exception;
 #line 228 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = (self & _tmp0_) != 0;
 #line 228 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3704 "Photo.c"
+#line 3728 "Photo.c"
 }
 
 
 gboolean photo_exception_allows (PhotoException self, PhotoException exception) {
 	gboolean result = FALSE;
-	PhotoException _tmp0_ = 0;
+	PhotoException _tmp0_;
 #line 232 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = exception;
 #line 232 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = (self & _tmp0_) == 0;
 #line 232 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3717 "Photo.c"
+#line 3741 "Photo.c"
 }
 
 
@@ -3732,59 +3756,59 @@ GType photo_exception_get_type (void) {
 static gpointer _photo_row_ref0 (gpointer self) {
 #line 400 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_row_ref (self) : NULL;
-#line 3736 "Photo.c"
+#line 3760 "Photo.c"
 }
 
 
 static gpointer _backing_photo_row_ref0 (gpointer self) {
 #line 421 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? backing_photo_row_ref (self) : NULL;
-#line 3743 "Photo.c"
+#line 3767 "Photo.c"
 }
 
 
 Photo* photo_construct (GType object_type, PhotoRow* row) {
 	Photo * self = NULL;
-	PhotoRow* _tmp0_ = NULL;
-	PhotoRow* _tmp1_ = NULL;
-	PhotoRow* _tmp2_ = NULL;
-	PhotoRow* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	PhotoRow* _tmp6_ = NULL;
-	PhotoRow* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	PhotoBackingReaders* _tmp10_ = NULL;
-	PhotoRow* _tmp11_ = NULL;
-	BackingPhotoRow* _tmp12_ = NULL;
-	PhotoFileFormat _tmp13_ = 0;
-	PhotoRow* _tmp14_ = NULL;
-	BackingPhotoRow* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	PhotoFileReader* _tmp17_ = NULL;
+	PhotoRow* _tmp0_;
+	PhotoRow* _tmp1_;
+	PhotoRow* _tmp2_;
+	PhotoRow* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	PhotoRow* _tmp6_;
+	PhotoRow* _tmp7_;
+	const gchar* _tmp8_;
+	gchar* _tmp9_;
+	PhotoBackingReaders* _tmp10_;
+	PhotoRow* _tmp11_;
+	BackingPhotoRow* _tmp12_;
+	PhotoFileFormat _tmp13_;
+	PhotoRow* _tmp14_;
+	BackingPhotoRow* _tmp15_;
+	const gchar* _tmp16_;
+	PhotoFileReader* _tmp17_;
 	gchar* basename = NULL;
-	PhotoRow* _tmp18_ = NULL;
-	BackingPhotoRow* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	gboolean _tmp26_ = FALSE;
-	PhotoRow* _tmp31_ = NULL;
-	BackingPhotoID _tmp32_ = {0};
-	gint64 _tmp33_ = 0LL;
-	PhotoRow* _tmp49_ = NULL;
-	BackingPhotoRow* _tmp50_ = NULL;
-	PhotoFileFormat _tmp51_ = 0;
+	PhotoRow* _tmp18_;
+	BackingPhotoRow* _tmp19_;
+	const gchar* _tmp20_;
+	gchar* _tmp21_;
+	const gchar* _tmp22_;
+	const gchar* _tmp25_;
+	gboolean _tmp26_;
+	PhotoRow* _tmp31_;
+	BackingPhotoID _tmp32_;
+	gint64 _tmp33_;
+	PhotoRow* _tmp49_;
+	BackingPhotoRow* _tmp50_;
+	PhotoFileFormat _tmp51_;
 	gboolean _tmp67_ = FALSE;
-	PhotoRow* _tmp68_ = NULL;
-	BackingPhotoRow* _tmp69_ = NULL;
-	PhotoFileFormat _tmp70_ = 0;
-	PhotoBackingReaders* _tmp85_ = NULL;
-	PhotoFileReader* _tmp86_ = NULL;
-	PhotoRow* _tmp106_ = NULL;
-	time_t _tmp107_ = 0;
+	PhotoRow* _tmp68_;
+	BackingPhotoRow* _tmp69_;
+	PhotoFileFormat _tmp70_;
+	PhotoBackingReaders* _tmp85_;
+	PhotoFileReader* _tmp86_;
+	PhotoRow* _tmp106_;
+	time_t _tmp107_;
 	GError * _inner_error_ = NULL;
 #line 399 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_ROW (row), NULL);
@@ -3856,9 +3880,9 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp22_ = basename;
 #line 412 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 3860 "Photo.c"
-		const gchar* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
+#line 3884 "Photo.c"
+		const gchar* _tmp23_;
+		gchar* _tmp24_;
 #line 413 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = basename;
 #line 413 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3867,7 +3891,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_g_free0 (self->priv->file_title);
 #line 413 "/home/jens/Source/shotwell/src/Photo.vala"
 		self->priv->file_title = _tmp24_;
-#line 3871 "Photo.c"
+#line 3895 "Photo.c"
 	}
 #line 415 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = self->priv->file_title;
@@ -3875,11 +3899,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp26_ = is_string_empty (_tmp25_);
 #line 415 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp26_) {
-#line 3879 "Photo.c"
-		PhotoRow* _tmp27_ = NULL;
-		BackingPhotoRow* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
+#line 3903 "Photo.c"
+		PhotoRow* _tmp27_;
+		BackingPhotoRow* _tmp28_;
+		const gchar* _tmp29_;
+		gchar* _tmp30_;
 #line 416 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp27_ = row;
 #line 416 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3892,7 +3916,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_g_free0 (self->priv->file_title);
 #line 416 "/home/jens/Source/shotwell/src/Photo.vala"
 		self->priv->file_title = _tmp30_;
-#line 3896 "Photo.c"
+#line 3920 "Photo.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = row;
@@ -3902,12 +3926,12 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp33_ = _tmp32_.id;
 #line 418 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp33_ != BACKING_PHOTO_ID_INVALID) {
-#line 3906 "Photo.c"
+#line 3930 "Photo.c"
 		BackingPhotoRow* e = NULL;
-		PhotoRow* _tmp34_ = NULL;
-		BackingPhotoID _tmp35_ = {0};
-		BackingPhotoRow* _tmp36_ = NULL;
-		BackingPhotoRow* _tmp37_ = NULL;
+		PhotoRow* _tmp34_;
+		BackingPhotoID _tmp35_;
+		BackingPhotoRow* _tmp36_;
+		BackingPhotoRow* _tmp37_;
 #line 419 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp34_ = row;
 #line 419 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3920,15 +3944,15 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_tmp37_ = e;
 #line 420 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp37_ != NULL) {
-#line 3924 "Photo.c"
-			BackingPhotoRow* _tmp38_ = NULL;
-			BackingPhotoRow* _tmp39_ = NULL;
-			PhotoBackingReaders* _tmp40_ = NULL;
-			BackingPhotoRow* _tmp41_ = NULL;
-			PhotoFileFormat _tmp42_ = 0;
-			BackingPhotoRow* _tmp43_ = NULL;
-			const gchar* _tmp44_ = NULL;
-			PhotoFileReader* _tmp45_ = NULL;
+#line 3948 "Photo.c"
+			BackingPhotoRow* _tmp38_;
+			BackingPhotoRow* _tmp39_;
+			PhotoBackingReaders* _tmp40_;
+			BackingPhotoRow* _tmp41_;
+			PhotoFileFormat _tmp42_;
+			BackingPhotoRow* _tmp43_;
+			const gchar* _tmp44_;
+			PhotoFileReader* _tmp45_;
 #line 421 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = e;
 #line 421 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3953,12 +3977,12 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 			_photo_file_adapter_unref0 (_tmp40_->editable);
 #line 422 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_->editable = _tmp45_;
-#line 3957 "Photo.c"
+#line 3981 "Photo.c"
 		} else {
 			{
-				PhotoTable* _tmp46_ = NULL;
-				PhotoTable* _tmp47_ = NULL;
-				PhotoRow* _tmp48_ = NULL;
+				PhotoTable* _tmp46_;
+				PhotoTable* _tmp47_;
+				PhotoRow* _tmp48_;
 #line 425 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = photo_table_get_instance ();
 #line 425 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3973,8 +3997,8 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 425 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3977 "Photo.c"
-						goto __catch256_database_error;
+#line 4001 "Photo.c"
+						goto __catch257_database_error;
 					}
 #line 425 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (e);
@@ -3986,11 +4010,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 					g_clear_error (&_inner_error_);
 #line 425 "/home/jens/Source/shotwell/src/Photo.vala"
 					return NULL;
-#line 3990 "Photo.c"
+#line 4014 "Photo.c"
 				}
 			}
-			goto __finally256;
-			__catch256_database_error:
+			goto __finally257;
+			__catch257_database_error:
 			{
 				GError* err = NULL;
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3999,9 +4023,9 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 				_inner_error_ = NULL;
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 4003 "Photo.c"
+#line 4027 "Photo.c"
 			}
-			__finally256:
+			__finally257:
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4014,15 +4038,15 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 				g_clear_error (&_inner_error_);
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
 				return NULL;
-#line 4018 "Photo.c"
+#line 4042 "Photo.c"
 			}
 #line 432 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_internal_remove_all_transformations (self, FALSE);
-#line 4022 "Photo.c"
+#line 4046 "Photo.c"
 		}
 #line 418 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (e);
-#line 4026 "Photo.c"
+#line 4050 "Photo.c"
 	}
 #line 436 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = row;
@@ -4032,10 +4056,10 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp51_ = _tmp50_->file_format;
 #line 436 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp51_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4036 "Photo.c"
-		GeeHashMap* _tmp52_ = NULL;
-		gint _tmp53_ = 0;
-		RawDeveloper* _tmp54_ = NULL;
+#line 4060 "Photo.c"
+		GeeHashMap* _tmp52_;
+		gint _tmp53_;
+		RawDeveloper* _tmp54_;
 #line 438 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = gee_hash_map_new (TYPE_RAW_DEVELOPER, NULL, NULL, TYPE_BACKING_PHOTO_ROW, (GBoxedCopyFunc) backing_photo_row_ref, (GDestroyNotify) backing_photo_row_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 438 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4044,7 +4068,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		self->priv->developments = _tmp52_;
 #line 439 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp54_ = raw_developer_as_array (&_tmp53_);
-#line 4048 "Photo.c"
+#line 4072 "Photo.c"
 		{
 			RawDeveloper* d_collection = NULL;
 			gint d_collection_length1 = 0;
@@ -4056,20 +4080,20 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 			d_collection_length1 = _tmp53_;
 #line 439 "/home/jens/Source/shotwell/src/Photo.vala"
 			for (d_it = 0; d_it < _tmp53_; d_it = d_it + 1) {
-#line 4060 "Photo.c"
+#line 4084 "Photo.c"
 				RawDeveloper d = 0;
 #line 439 "/home/jens/Source/shotwell/src/Photo.vala"
 				d = d_collection[d_it];
-#line 4064 "Photo.c"
+#line 4088 "Photo.c"
 				{
 					BackingPhotoID id = {0};
-					PhotoRow* _tmp55_ = NULL;
-					BackingPhotoID* _tmp56_ = NULL;
-					gint _tmp56__length1 = 0;
-					RawDeveloper _tmp57_ = 0;
-					BackingPhotoID _tmp58_ = {0};
-					BackingPhotoID _tmp59_ = {0};
-					gint64 _tmp60_ = 0LL;
+					PhotoRow* _tmp55_;
+					BackingPhotoID* _tmp56_;
+					gint _tmp56__length1;
+					RawDeveloper _tmp57_;
+					BackingPhotoID _tmp58_;
+					BackingPhotoID _tmp59_;
+					gint64 _tmp60_;
 #line 440 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp55_ = row;
 #line 440 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4088,11 +4112,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 					_tmp60_ = _tmp59_.id;
 #line 441 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp60_ != BACKING_PHOTO_ID_INVALID) {
-#line 4092 "Photo.c"
+#line 4116 "Photo.c"
 						BackingPhotoRow* bpr = NULL;
-						BackingPhotoID _tmp61_ = {0};
-						BackingPhotoRow* _tmp62_ = NULL;
-						BackingPhotoRow* _tmp63_ = NULL;
+						BackingPhotoID _tmp61_;
+						BackingPhotoRow* _tmp62_;
+						BackingPhotoRow* _tmp63_;
 #line 442 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp61_ = id;
 #line 442 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4103,10 +4127,10 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 						_tmp63_ = bpr;
 #line 443 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp63_ != NULL) {
-#line 4107 "Photo.c"
-							GeeHashMap* _tmp64_ = NULL;
-							RawDeveloper _tmp65_ = 0;
-							BackingPhotoRow* _tmp66_ = NULL;
+#line 4131 "Photo.c"
+							GeeHashMap* _tmp64_;
+							RawDeveloper _tmp65_;
+							BackingPhotoRow* _tmp66_;
 #line 444 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp64_ = self->priv->developments;
 #line 444 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4115,17 +4139,17 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 							_tmp66_ = bpr;
 #line 444 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp65_), _tmp66_);
-#line 4119 "Photo.c"
+#line 4143 "Photo.c"
 						}
 #line 441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_backing_photo_row_unref0 (bpr);
-#line 4123 "Photo.c"
+#line 4147 "Photo.c"
 					}
 				}
 			}
 #line 439 "/home/jens/Source/shotwell/src/Photo.vala"
 			d_collection = (g_free (d_collection), NULL);
-#line 4129 "Photo.c"
+#line 4153 "Photo.c"
 		}
 	}
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4136,11 +4160,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp70_ = _tmp69_->file_format;
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp70_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4140 "Photo.c"
-		GeeHashMap* _tmp71_ = NULL;
-		PhotoRow* _tmp72_ = NULL;
-		RawDeveloper _tmp73_ = 0;
-		gboolean _tmp74_ = FALSE;
+#line 4164 "Photo.c"
+		GeeHashMap* _tmp71_;
+		PhotoRow* _tmp72_;
+		RawDeveloper _tmp73_;
+		gboolean _tmp74_;
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp71_ = self->priv->developments;
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4151,26 +4175,26 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_tmp74_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp73_));
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp67_ = _tmp74_;
-#line 4155 "Photo.c"
+#line 4179 "Photo.c"
 	} else {
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp67_ = FALSE;
-#line 4159 "Photo.c"
+#line 4183 "Photo.c"
 	}
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp67_) {
-#line 4163 "Photo.c"
+#line 4187 "Photo.c"
 		BackingPhotoRow* r = NULL;
-		GeeHashMap* _tmp75_ = NULL;
-		PhotoRow* _tmp76_ = NULL;
-		RawDeveloper _tmp77_ = 0;
-		gpointer _tmp78_ = NULL;
-		PhotoBackingReaders* _tmp79_ = NULL;
-		BackingPhotoRow* _tmp80_ = NULL;
-		PhotoFileFormat _tmp81_ = 0;
-		BackingPhotoRow* _tmp82_ = NULL;
-		const gchar* _tmp83_ = NULL;
-		PhotoFileReader* _tmp84_ = NULL;
+		GeeHashMap* _tmp75_;
+		PhotoRow* _tmp76_;
+		RawDeveloper _tmp77_;
+		gpointer _tmp78_;
+		PhotoBackingReaders* _tmp79_;
+		BackingPhotoRow* _tmp80_;
+		PhotoFileFormat _tmp81_;
+		BackingPhotoRow* _tmp82_;
+		const gchar* _tmp83_;
+		PhotoFileReader* _tmp84_;
 #line 451 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = self->priv->developments;
 #line 451 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4199,7 +4223,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_tmp79_->developer = _tmp84_;
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (r);
-#line 4203 "Photo.c"
+#line 4227 "Photo.c"
 	}
 #line 456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp85_ = self->priv->readers;
@@ -4207,9 +4231,9 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp86_ = _tmp85_->editable;
 #line 456 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp86_ != NULL) {
-#line 4211 "Photo.c"
-		BackingPhotoRow* _tmp87_ = NULL;
-		BackingPhotoRow* _tmp88_ = NULL;
+#line 4235 "Photo.c"
+		BackingPhotoRow* _tmp87_;
+		BackingPhotoRow* _tmp88_;
 #line 457 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp87_ = self->priv->editable;
 #line 457 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4218,11 +4242,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_backing_photo_row_unref0 (self->backing_photo_row);
 #line 457 "/home/jens/Source/shotwell/src/Photo.vala"
 		self->backing_photo_row = _tmp88_;
-#line 4222 "Photo.c"
+#line 4246 "Photo.c"
 	} else {
-		PhotoRow* _tmp89_ = NULL;
-		BackingPhotoRow* _tmp90_ = NULL;
-		PhotoFileFormat _tmp91_ = 0;
+		PhotoRow* _tmp89_;
+		BackingPhotoRow* _tmp90_;
+		PhotoFileFormat _tmp91_;
 #line 458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp89_ = row;
 #line 458 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4231,10 +4255,10 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_tmp91_ = _tmp90_->file_format;
 #line 458 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp91_ != PHOTO_FILE_FORMAT_RAW) {
-#line 4235 "Photo.c"
-			PhotoRow* _tmp92_ = NULL;
-			BackingPhotoRow* _tmp93_ = NULL;
-			BackingPhotoRow* _tmp94_ = NULL;
+#line 4259 "Photo.c"
+			PhotoRow* _tmp92_;
+			BackingPhotoRow* _tmp93_;
+			BackingPhotoRow* _tmp94_;
 #line 459 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp92_ = self->row;
 #line 459 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4245,12 +4269,12 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 			_backing_photo_row_unref0 (self->backing_photo_row);
 #line 459 "/home/jens/Source/shotwell/src/Photo.vala"
 			self->backing_photo_row = _tmp94_;
-#line 4249 "Photo.c"
+#line 4273 "Photo.c"
 		} else {
-			GeeHashMap* _tmp95_ = NULL;
-			PhotoRow* _tmp96_ = NULL;
-			RawDeveloper _tmp97_ = 0;
-			gboolean _tmp98_ = FALSE;
+			GeeHashMap* _tmp95_;
+			PhotoRow* _tmp96_;
+			RawDeveloper _tmp97_;
+			gboolean _tmp98_;
 #line 463 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp95_ = self->priv->developments;
 #line 463 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4261,11 +4285,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 			_tmp98_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp97_));
 #line 463 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp98_) {
-#line 4265 "Photo.c"
-				GeeHashMap* _tmp99_ = NULL;
-				PhotoRow* _tmp100_ = NULL;
-				RawDeveloper _tmp101_ = 0;
-				gpointer _tmp102_ = NULL;
+#line 4289 "Photo.c"
+				GeeHashMap* _tmp99_;
+				PhotoRow* _tmp100_;
+				RawDeveloper _tmp101_;
+				gpointer _tmp102_;
 #line 464 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp99_ = self->priv->developments;
 #line 464 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4278,11 +4302,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 				_backing_photo_row_unref0 (self->backing_photo_row);
 #line 464 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->backing_photo_row = (BackingPhotoRow*) _tmp102_;
-#line 4282 "Photo.c"
+#line 4306 "Photo.c"
 			} else {
-				PhotoRow* _tmp103_ = NULL;
-				BackingPhotoRow* _tmp104_ = NULL;
-				BackingPhotoRow* _tmp105_ = NULL;
+				PhotoRow* _tmp103_;
+				BackingPhotoRow* _tmp104_;
+				BackingPhotoRow* _tmp105_;
 #line 467 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp103_ = self->row;
 #line 467 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4293,7 +4317,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 				_backing_photo_row_unref0 (self->backing_photo_row);
 #line 467 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->backing_photo_row = _tmp105_;
-#line 4297 "Photo.c"
+#line 4321 "Photo.c"
 			}
 		}
 	}
@@ -4307,24 +4331,24 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_g_free0 (basename);
 #line 399 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 4311 "Photo.c"
+#line 4335 "Photo.c"
 }
 
 
 void photo_init_photo (void) {
-	GeeLinkedList* _tmp0_ = NULL;
+	GeeLinkedList* _tmp0_;
 #line 475 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = gee_linked_list_new (PHOTO_TYPE_CACHED_PIXBUF, (GBoxedCopyFunc) photo_cached_pixbuf_ref, (GDestroyNotify) photo_cached_pixbuf_unref, NULL, NULL, NULL);
 #line 475 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo_source_pixbuf_cache);
 #line 475 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_source_pixbuf_cache = _tmp0_;
-#line 4323 "Photo.c"
+#line 4347 "Photo.c"
 }
 
 
 void photo_terminate_photo (void) {
-	guint _tmp0_ = 0U;
+	guint _tmp0_;
 #line 479 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo_source_pixbuf_cache);
 #line 479 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4333,22 +4357,22 @@ void photo_terminate_photo (void) {
 	_tmp0_ = photo_discard_source_id;
 #line 481 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != ((guint) 0)) {
-#line 4337 "Photo.c"
-		guint _tmp1_ = 0U;
+#line 4361 "Photo.c"
+		guint _tmp1_;
 #line 482 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = photo_discard_source_id;
 #line 482 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_source_remove (_tmp1_);
 #line 483 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_discard_source_id = (guint) 0;
-#line 4345 "Photo.c"
+#line 4369 "Photo.c"
 	}
 }
 
 
 static void photo_real_notify_editable_replaced (Photo* self, GFile* old_file, GFile* new_file) {
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 487 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file));
 #line 487 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4358,8 +4382,8 @@ static void photo_real_notify_editable_replaced (Photo* self, GFile* old_file, G
 #line 488 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = new_file;
 #line 488 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_emit_by_name (self, "editable-replaced", _tmp0_, _tmp1_);
-#line 4363 "Photo.c"
+	g_signal_emit (self, photo_signals[PHOTO_EDITABLE_REPLACED_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 4387 "Photo.c"
 }
 
 
@@ -4368,14 +4392,14 @@ void photo_notify_editable_replaced (Photo* self, GFile* old_file, GFile* new_fi
 	g_return_if_fail (IS_PHOTO (self));
 #line 487 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_editable_replaced (self, old_file, new_file);
-#line 4372 "Photo.c"
+#line 4396 "Photo.c"
 }
 
 
 static void photo_real_notify_raw_development_modified (Photo* self) {
 #line 492 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_emit_by_name (self, "raw-development-modified");
-#line 4379 "Photo.c"
+	g_signal_emit (self, photo_signals[PHOTO_RAW_DEVELOPMENT_MODIFIED_SIGNAL], 0);
+#line 4403 "Photo.c"
 }
 
 
@@ -4384,14 +4408,14 @@ void photo_notify_raw_development_modified (Photo* self) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 491 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_raw_development_modified (self);
-#line 4388 "Photo.c"
+#line 4412 "Photo.c"
 }
 
 
 static void photo_real_notify_baseline_replaced (Photo* self) {
 #line 496 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_emit_by_name (self, "baseline-replaced");
-#line 4395 "Photo.c"
+	g_signal_emit (self, photo_signals[PHOTO_BASELINE_REPLACED_SIGNAL], 0);
+#line 4419 "Photo.c"
 }
 
 
@@ -4400,19 +4424,19 @@ void photo_notify_baseline_replaced (Photo* self) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 495 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_baseline_replaced (self);
-#line 4404 "Photo.c"
+#line 4428 "Photo.c"
 }
 
 
 static void photo_real_notify_master_reimported (Photo* self, PhotoMetadata* metadata) {
-	PhotoMetadata* _tmp0_ = NULL;
+	PhotoMetadata* _tmp0_;
 #line 499 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
 #line 500 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
 #line 500 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_emit_by_name (self, "master-reimported", _tmp0_);
-#line 4416 "Photo.c"
+	g_signal_emit (self, photo_signals[PHOTO_MASTER_REIMPORTED_SIGNAL], 0, _tmp0_);
+#line 4440 "Photo.c"
 }
 
 
@@ -4421,19 +4445,19 @@ void photo_notify_master_reimported (Photo* self, PhotoMetadata* metadata) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 499 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_master_reimported (self, metadata);
-#line 4425 "Photo.c"
+#line 4449 "Photo.c"
 }
 
 
 static void photo_real_notify_editable_reimported (Photo* self, PhotoMetadata* metadata) {
-	PhotoMetadata* _tmp0_ = NULL;
+	PhotoMetadata* _tmp0_;
 #line 503 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
 #line 504 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
 #line 504 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_emit_by_name (self, "editable-reimported", _tmp0_);
-#line 4437 "Photo.c"
+	g_signal_emit (self, photo_signals[PHOTO_EDITABLE_REIMPORTED_SIGNAL], 0, _tmp0_);
+#line 4461 "Photo.c"
 }
 
 
@@ -4442,19 +4466,19 @@ void photo_notify_editable_reimported (Photo* self, PhotoMetadata* metadata) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 503 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_editable_reimported (self, metadata);
-#line 4446 "Photo.c"
+#line 4470 "Photo.c"
 }
 
 
 static void photo_real_notify_source_reimported (Photo* self, PhotoMetadata* metadata) {
-	PhotoMetadata* _tmp0_ = NULL;
+	PhotoMetadata* _tmp0_;
 #line 507 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
 #line 508 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
 #line 508 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_emit_by_name (self, "source-reimported", _tmp0_);
-#line 4458 "Photo.c"
+	g_signal_emit (self, photo_signals[PHOTO_SOURCE_REIMPORTED_SIGNAL], 0, _tmp0_);
+#line 4482 "Photo.c"
 }
 
 
@@ -4463,19 +4487,19 @@ void photo_notify_source_reimported (Photo* self, PhotoMetadata* metadata) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 507 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_source_reimported (self, metadata);
-#line 4467 "Photo.c"
+#line 4491 "Photo.c"
 }
 
 
 static void photo_real_notify_baseline_reimported (Photo* self, PhotoMetadata* metadata) {
-	PhotoMetadata* _tmp0_ = NULL;
+	PhotoMetadata* _tmp0_;
 #line 511 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
 #line 512 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
 #line 512 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_emit_by_name (self, "baseline-reimported", _tmp0_);
-#line 4479 "Photo.c"
+	g_signal_emit (self, photo_signals[PHOTO_BASELINE_REIMPORTED_SIGNAL], 0, _tmp0_);
+#line 4503 "Photo.c"
 }
 
 
@@ -4484,7 +4508,7 @@ void photo_notify_baseline_reimported (Photo* self, PhotoMetadata* metadata) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 511 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_baseline_reimported (self, metadata);
-#line 4488 "Photo.c"
+#line 4512 "Photo.c"
 }
 
 
@@ -4493,11 +4517,11 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 	gboolean result = FALSE;
 	gboolean ret = FALSE;
 	GFile* file = NULL;
-	PhotoFileFormat _tmp8_ = 0;
-	GFile* _tmp12_ = NULL;
+	PhotoFileFormat _tmp8_;
+	GFile* _tmp12_;
 	gboolean _tmp24_ = FALSE;
 	gboolean _tmp25_ = FALSE;
-	gboolean _tmp26_ = FALSE;
+	gboolean _tmp26_;
 	GError * _inner_error_ = NULL;
 #line 515 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
@@ -4505,27 +4529,27 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 	ret = TRUE;
 #line 517 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = NULL;
-#line 4509 "Photo.c"
+#line 4533 "Photo.c"
 	{
-		PhotoBackingReaders* _tmp0_ = NULL;
+		PhotoBackingReaders* _tmp0_;
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 4516 "Photo.c"
+#line 4540 "Photo.c"
 		{
-			PhotoBackingReaders* _tmp1_ = NULL;
-			PhotoFileReader* _tmp2_ = NULL;
+			PhotoBackingReaders* _tmp1_;
+			PhotoFileReader* _tmp2_;
 #line 519 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
 #line 519 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
 #line 519 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 4526 "Photo.c"
-				PhotoBackingReaders* _tmp3_ = NULL;
-				PhotoFileReader* _tmp4_ = NULL;
-				GFile* _tmp5_ = NULL;
+#line 4550 "Photo.c"
+				PhotoBackingReaders* _tmp3_;
+				PhotoFileReader* _tmp4_;
+				GFile* _tmp5_;
 #line 520 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
 #line 520 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4536,21 +4560,21 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 				_g_object_unref0 (file);
 #line 520 "/home/jens/Source/shotwell/src/Photo.vala"
 				file = _tmp5_;
-#line 4540 "Photo.c"
+#line 4564 "Photo.c"
 			}
 		}
-		__finally257:
+		__finally258:
 		{
-			PhotoBackingReaders* _tmp6_ = NULL;
+			PhotoBackingReaders* _tmp6_;
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->priv->readers;
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 4550 "Photo.c"
+#line 4574 "Photo.c"
 		}
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4554 "Photo.c"
+#line 4578 "Photo.c"
 			gboolean _tmp7_ = FALSE;
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
@@ -4558,7 +4582,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			_g_object_unref0 (file);
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp7_;
-#line 4562 "Photo.c"
+#line 4586 "Photo.c"
 		}
 	}
 #line 523 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4567,12 +4591,12 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 	_tmp8_ = photo_get_master_file_format (self);
 #line 525 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4571 "Photo.c"
-		gint _tmp9_ = 0;
-		RawDeveloper* _tmp10_ = NULL;
+#line 4595 "Photo.c"
+		gint _tmp9_;
+		RawDeveloper* _tmp10_;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = raw_developer_as_array (&_tmp9_);
-#line 4576 "Photo.c"
+#line 4600 "Photo.c"
 		{
 			RawDeveloper* d_collection = NULL;
 			gint d_collection_length1 = 0;
@@ -4584,34 +4608,34 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			d_collection_length1 = _tmp9_;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 			for (d_it = 0; d_it < _tmp9_; d_it = d_it + 1) {
-#line 4588 "Photo.c"
+#line 4612 "Photo.c"
 				RawDeveloper d = 0;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 				d = d_collection[d_it];
-#line 4592 "Photo.c"
+#line 4616 "Photo.c"
 				{
-					RawDeveloper _tmp11_ = 0;
+					RawDeveloper _tmp11_;
 #line 527 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = d;
 #line 527 "/home/jens/Source/shotwell/src/Photo.vala"
 					photo_delete_raw_development (self, _tmp11_);
-#line 4599 "Photo.c"
+#line 4623 "Photo.c"
 				}
 			}
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 			d_collection = (g_free (d_collection), NULL);
-#line 4604 "Photo.c"
+#line 4628 "Photo.c"
 		}
 	}
 #line 531 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = file;
 #line 531 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_ != NULL) {
-#line 4611 "Photo.c"
+#line 4635 "Photo.c"
 		{
 			gboolean _tmp13_ = FALSE;
-			GFile* _tmp14_ = NULL;
-			gboolean _tmp15_ = FALSE;
+			GFile* _tmp14_;
+			gboolean _tmp15_;
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = file;
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4620,24 +4644,24 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			_tmp13_ = _tmp15_;
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4624 "Photo.c"
-				goto __catch258_g_error;
+#line 4648 "Photo.c"
+				goto __catch259_g_error;
 			}
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
 			ret = _tmp13_;
-#line 4629 "Photo.c"
+#line 4653 "Photo.c"
 		}
-		goto __finally258;
-		__catch258_g_error:
+		goto __finally259;
+		__catch259_g_error:
 		{
 			GError* err = NULL;
-			GFile* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
-			gchar* _tmp20_ = NULL;
-			GError* _tmp21_ = NULL;
-			const gchar* _tmp22_ = NULL;
+			GFile* _tmp16_;
+			gchar* _tmp17_;
+			gchar* _tmp18_;
+			gchar* _tmp19_;
+			gchar* _tmp20_;
+			GError* _tmp21_;
+			const gchar* _tmp22_;
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4666,12 +4690,12 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			_g_free0 (_tmp18_);
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 4670 "Photo.c"
+#line 4694 "Photo.c"
 		}
-		__finally258:
+		__finally259:
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4675 "Photo.c"
+#line 4699 "Photo.c"
 			gboolean _tmp23_ = FALSE;
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
@@ -4679,7 +4703,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			_g_object_unref0 (file);
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp23_;
-#line 4683 "Photo.c"
+#line 4707 "Photo.c"
 		}
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4688,7 +4712,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 	_tmp25_ = _tmp26_;
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4692 "Photo.c"
+#line 4716 "Photo.c"
 		gboolean _tmp27_ = FALSE;
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
@@ -4696,21 +4720,21 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 		_g_object_unref0 (file);
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp27_;
-#line 4700 "Photo.c"
+#line 4724 "Photo.c"
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp25_) {
-#line 4704 "Photo.c"
-		gboolean _tmp28_ = FALSE;
+#line 4728 "Photo.c"
+		gboolean _tmp28_;
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = ret;
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = _tmp28_;
-#line 4710 "Photo.c"
+#line 4734 "Photo.c"
 	} else {
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = FALSE;
-#line 4714 "Photo.c"
+#line 4738 "Photo.c"
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp24_;
@@ -4718,16 +4742,16 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 	_g_object_unref0 (file);
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 4722 "Photo.c"
+#line 4746 "Photo.c"
 }
 
 
 static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) {
 	BackingPhotoRow* result = NULL;
-	BackingPhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	BackingPhotoID _tmp0_;
+	gint64 _tmp1_;
 	BackingPhotoRow* backing_row = NULL;
-	BackingPhotoRow* _tmp13_ = NULL;
+	BackingPhotoRow* _tmp13_;
 	GError * _inner_error_ = NULL;
 #line 547 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -4743,19 +4767,19 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		result = NULL;
 #line 549 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 4747 "Photo.c"
+#line 4771 "Photo.c"
 	}
 #line 551 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing_row = NULL;
-#line 4751 "Photo.c"
+#line 4775 "Photo.c"
 	{
 		BackingPhotoRow* _tmp2_ = NULL;
-		BackingPhotoTable* _tmp3_ = NULL;
-		BackingPhotoTable* _tmp4_ = NULL;
-		BackingPhotoID _tmp5_ = {0};
-		BackingPhotoRow* _tmp6_ = NULL;
-		BackingPhotoRow* _tmp7_ = NULL;
-		BackingPhotoRow* _tmp8_ = NULL;
+		BackingPhotoTable* _tmp3_;
+		BackingPhotoTable* _tmp4_;
+		BackingPhotoID _tmp5_;
+		BackingPhotoRow* _tmp6_;
+		BackingPhotoRow* _tmp7_;
+		BackingPhotoRow* _tmp8_;
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = backing_photo_table_get_instance ();
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4774,8 +4798,8 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4778 "Photo.c"
-				goto __catch259_database_error;
+#line 4802 "Photo.c"
+				goto __catch260_database_error;
 			}
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing_row);
@@ -4785,7 +4809,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 			g_clear_error (&_inner_error_);
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 4789 "Photo.c"
+#line 4813 "Photo.c"
 		}
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = _tmp2_;
@@ -4797,16 +4821,16 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		backing_row = _tmp8_;
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (_tmp2_);
-#line 4801 "Photo.c"
+#line 4825 "Photo.c"
 	}
-	goto __finally259;
-	__catch259_database_error:
+	goto __finally260;
+	__catch260_database_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		GError* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+		GError* _tmp11_;
+		const gchar* _tmp12_;
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4825,9 +4849,9 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		_g_free0 (_tmp10_);
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 4829 "Photo.c"
+#line 4853 "Photo.c"
 	}
-	__finally259:
+	__finally260:
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4838,17 +4862,17 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		g_clear_error (&_inner_error_);
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 4842 "Photo.c"
+#line 4866 "Photo.c"
 	}
 #line 558 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = backing_row;
 #line 558 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp13_ == NULL) {
-#line 4848 "Photo.c"
+#line 4872 "Photo.c"
 		{
-			BackingPhotoTable* _tmp14_ = NULL;
-			BackingPhotoTable* _tmp15_ = NULL;
-			BackingPhotoID _tmp16_ = {0};
+			BackingPhotoTable* _tmp14_;
+			BackingPhotoTable* _tmp15_;
+			BackingPhotoID _tmp16_;
 #line 560 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = backing_photo_table_get_instance ();
 #line 560 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4863,8 +4887,8 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 560 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4867 "Photo.c"
-					goto __catch260_database_error;
+#line 4891 "Photo.c"
+					goto __catch261_database_error;
 				}
 #line 560 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing_row);
@@ -4874,11 +4898,11 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 				g_clear_error (&_inner_error_);
 #line 560 "/home/jens/Source/shotwell/src/Photo.vala"
 				return NULL;
-#line 4878 "Photo.c"
+#line 4902 "Photo.c"
 			}
 		}
-		goto __finally260;
-		__catch260_database_error:
+		goto __finally261;
+		__catch261_database_error:
 		{
 			GError* err = NULL;
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4887,9 +4911,9 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 			_inner_error_ = NULL;
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 4891 "Photo.c"
+#line 4915 "Photo.c"
 		}
-		__finally260:
+		__finally261:
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4900,7 +4924,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 			g_clear_error (&_inner_error_);
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 4904 "Photo.c"
+#line 4928 "Photo.c"
 		}
 #line 564 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
@@ -4908,13 +4932,13 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		_backing_photo_row_unref0 (backing_row);
 #line 564 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 4912 "Photo.c"
+#line 4936 "Photo.c"
 	}
 #line 567 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = backing_row;
 #line 567 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 4918 "Photo.c"
+#line 4942 "Photo.c"
 }
 
 
@@ -4923,20 +4947,20 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
 	GError * _inner_error_ = NULL;
 #line 572 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 4927 "Photo.c"
+#line 4951 "Photo.c"
 	{
-		GeeHashMap* _tmp0_ = NULL;
+		GeeHashMap* _tmp0_;
 		gboolean _tmp13_ = FALSE;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->developments;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 4935 "Photo.c"
+#line 4959 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
-			GeeHashMap* _tmp2_ = NULL;
-			RawDeveloper _tmp3_ = 0;
-			gboolean _tmp4_ = FALSE;
+			GeeHashMap* _tmp2_;
+			RawDeveloper _tmp3_;
+			gboolean _tmp4_;
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->developments;
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4945,13 +4969,13 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
 			_tmp4_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp3_));
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp4_) {
-#line 4949 "Photo.c"
-				GeeHashMap* _tmp5_ = NULL;
-				RawDeveloper _tmp6_ = 0;
-				gpointer _tmp7_ = NULL;
-				BackingPhotoRow* _tmp8_ = NULL;
-				const gchar* _tmp9_ = NULL;
-				gboolean _tmp10_ = FALSE;
+#line 4973 "Photo.c"
+				GeeHashMap* _tmp5_;
+				RawDeveloper _tmp6_;
+				gpointer _tmp7_;
+				BackingPhotoRow* _tmp8_;
+				const gchar* _tmp9_;
+				gboolean _tmp10_;
 #line 575 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = self->priv->developments;
 #line 575 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4968,35 +4992,35 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
 				_tmp1_ = _tmp10_;
 #line 575 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp8_);
-#line 4972 "Photo.c"
+#line 4996 "Photo.c"
 			} else {
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 4976 "Photo.c"
+#line 5000 "Photo.c"
 			}
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 4980 "Photo.c"
+#line 5004 "Photo.c"
 			{
-				GeeHashMap* _tmp11_ = NULL;
+				GeeHashMap* _tmp11_;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->priv->developments;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 4987 "Photo.c"
+#line 5011 "Photo.c"
 			}
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 4991 "Photo.c"
+#line 5015 "Photo.c"
 		}
-		__finally261:
+		__finally262:
 		{
-			GeeHashMap* _tmp12_ = NULL;
+			GeeHashMap* _tmp12_;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = self->priv->developments;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5000 "Photo.c"
+#line 5024 "Photo.c"
 		}
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5004,29 +5028,29 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
 		g_clear_error (&_inner_error_);
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp13_;
-#line 5008 "Photo.c"
+#line 5032 "Photo.c"
 	}
 }
 
 
 gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 	gboolean result = FALSE;
-	RawDeveloper _tmp7_ = 0;
+	RawDeveloper _tmp7_;
 	GError * _inner_error_ = NULL;
 #line 580 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 5019 "Photo.c"
+#line 5043 "Photo.c"
 	{
-		GeeHashMap* _tmp0_ = NULL;
+		GeeHashMap* _tmp0_;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->developments;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 5026 "Photo.c"
+#line 5050 "Photo.c"
 		{
-			GeeHashMap* _tmp1_ = NULL;
-			RawDeveloper _tmp2_ = 0;
-			gboolean _tmp3_ = FALSE;
+			GeeHashMap* _tmp1_;
+			RawDeveloper _tmp2_;
+			gboolean _tmp3_;
 #line 582 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->developments;
 #line 582 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5037,32 +5061,32 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 			if (_tmp3_) {
 #line 583 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = TRUE;
-#line 5041 "Photo.c"
+#line 5065 "Photo.c"
 				{
-					GeeHashMap* _tmp4_ = NULL;
+					GeeHashMap* _tmp4_;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp4_ = self->priv->developments;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5048 "Photo.c"
+#line 5072 "Photo.c"
 				}
 #line 583 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 5052 "Photo.c"
+#line 5076 "Photo.c"
 			}
 		}
-		__finally262:
+		__finally263:
 		{
-			GeeHashMap* _tmp5_ = NULL;
+			GeeHashMap* _tmp5_;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->developments;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5062 "Photo.c"
+#line 5086 "Photo.c"
 		}
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5066 "Photo.c"
+#line 5090 "Photo.c"
 			gboolean _tmp6_ = FALSE;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5070,7 +5094,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 			g_clear_error (&_inner_error_);
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp6_;
-#line 5074 "Photo.c"
+#line 5098 "Photo.c"
 		}
 	}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5079,43 +5103,43 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 	switch (_tmp7_) {
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 5083 "Photo.c"
+#line 5107 "Photo.c"
 		{
 #line 588 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = TRUE;
 #line 588 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 5089 "Photo.c"
+#line 5113 "Photo.c"
 		}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 5093 "Photo.c"
+#line 5117 "Photo.c"
 		{
 #line 591 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = FALSE;
 #line 591 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 5099 "Photo.c"
+#line 5123 "Photo.c"
 		}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 5103 "Photo.c"
+#line 5127 "Photo.c"
 		{
 			{
 				PhotoMetadata* meta = NULL;
-				PhotoMetadata* _tmp8_ = NULL;
+				PhotoMetadata* _tmp8_;
 				guint num_previews = 0U;
-				PhotoMetadata* _tmp9_ = NULL;
-				guint _tmp10_ = 0U;
-				guint _tmp11_ = 0U;
+				PhotoMetadata* _tmp9_;
+				guint _tmp10_;
+				guint _tmp11_;
 #line 595 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = photo_get_master_metadata (self, &_inner_error_);
 #line 595 "/home/jens/Source/shotwell/src/Photo.vala"
 				meta = _tmp8_;
 #line 595 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5118 "Photo.c"
-					goto __catch263_g_error;
+#line 5142 "Photo.c"
+					goto __catch264_g_error;
 				}
 #line 596 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = meta;
@@ -5127,22 +5151,22 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				_tmp11_ = num_previews;
 #line 598 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_ > ((guint) 0)) {
-#line 5131 "Photo.c"
+#line 5155 "Photo.c"
 					PhotoPreview* prev = NULL;
-					PhotoMetadata* _tmp12_ = NULL;
-					guint _tmp13_ = 0U;
-					PhotoPreview* _tmp14_ = NULL;
-					PhotoPreview* _tmp15_ = NULL;
+					PhotoMetadata* _tmp12_;
+					guint _tmp13_;
+					PhotoPreview* _tmp14_;
+					PhotoPreview* _tmp15_;
 					Dimensions dims = {0};
-					PhotoPreview* _tmp16_ = NULL;
+					PhotoPreview* _tmp16_;
 					Dimensions _tmp17_ = {0};
 					gint _tmp18_ = 0;
-					Dimensions _tmp19_ = {0};
-					gint _tmp20_ = 0;
-					Dimensions _tmp21_ = {0};
-					gint _tmp22_ = 0;
+					Dimensions _tmp19_;
+					gint _tmp20_;
+					Dimensions _tmp21_;
+					gint _tmp22_;
 					gint preview_major_axis = 0;
-					gint _tmp27_ = 0;
+					gint _tmp27_;
 #line 599 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = meta;
 #line 599 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5163,7 +5187,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 						_media_metadata_unref0 (meta);
 #line 603 "/home/jens/Source/shotwell/src/Photo.vala"
 						return result;
-#line 5167 "Photo.c"
+#line 5191 "Photo.c"
 					}
 #line 605 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = prev;
@@ -5181,26 +5205,26 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 					_tmp22_ = _tmp21_.height;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp20_ > _tmp22_) {
-#line 5185 "Photo.c"
-						Dimensions _tmp23_ = {0};
-						gint _tmp24_ = 0;
+#line 5209 "Photo.c"
+						Dimensions _tmp23_;
+						gint _tmp24_;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp23_ = dims;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp24_ = _tmp23_.width;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp18_ = _tmp24_;
-#line 5194 "Photo.c"
+#line 5218 "Photo.c"
 					} else {
-						Dimensions _tmp25_ = {0};
-						gint _tmp26_ = 0;
+						Dimensions _tmp25_;
+						gint _tmp26_;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp25_ = dims;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp26_ = _tmp25_.height;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp18_ = _tmp26_;
-#line 5204 "Photo.c"
+#line 5228 "Photo.c"
 					}
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 					preview_major_axis = _tmp18_;
@@ -5216,7 +5240,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 						_media_metadata_unref0 (meta);
 #line 610 "/home/jens/Source/shotwell/src/Photo.vala"
 						return result;
-#line 5220 "Photo.c"
+#line 5244 "Photo.c"
 					}
 #line 613 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
@@ -5226,7 +5250,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 					_media_metadata_unref0 (meta);
 #line 613 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 5230 "Photo.c"
+#line 5254 "Photo.c"
 				}
 #line 617 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = FALSE;
@@ -5234,14 +5258,14 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				_media_metadata_unref0 (meta);
 #line 617 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 5238 "Photo.c"
+#line 5262 "Photo.c"
 			}
-			goto __finally263;
-			__catch263_g_error:
+			goto __finally264;
+			__catch264_g_error:
 			{
 				GError* e = NULL;
-				GError* _tmp28_ = NULL;
-				const gchar* _tmp29_ = NULL;
+				GError* _tmp28_;
+				const gchar* _tmp29_;
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 				e = _inner_error_;
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5254,12 +5278,12 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				g_debug ("Photo.vala:619: Error accessing embedded preview. Message: %s", _tmp29_);
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 5258 "Photo.c"
+#line 5282 "Photo.c"
 			}
-			__finally263:
+			__finally264:
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5263 "Photo.c"
+#line 5287 "Photo.c"
 				gboolean _tmp30_ = FALSE;
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5267,30 +5291,30 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				g_clear_error (&_inner_error_);
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 				return _tmp30_;
-#line 5271 "Photo.c"
+#line 5295 "Photo.c"
 			}
 #line 621 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = FALSE;
 #line 621 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 5277 "Photo.c"
+#line 5301 "Photo.c"
 		}
 		default:
 		{
 #line 624 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_assert_not_reached ();
-#line 5283 "Photo.c"
+#line 5307 "Photo.c"
 		}
 	}
 }
 
 
 void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, GError** error) {
-	PhotoRow* _tmp0_ = NULL;
-	RawDeveloper _tmp1_ = 0;
-	BackingPhotoRow* _tmp2_ = NULL;
-	Alteration* _tmp8_ = NULL;
-	Alteration* _tmp9_ = NULL;
+	PhotoRow* _tmp0_;
+	RawDeveloper _tmp1_;
+	BackingPhotoRow* _tmp2_;
+	Alteration* _tmp8_;
+	Alteration* _tmp9_;
 	GError * _inner_error_ = NULL;
 #line 631 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -5310,19 +5334,19 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
 		g_propagate_error (error, _inner_error_);
 #line 632 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5314 "Photo.c"
+#line 5338 "Photo.c"
 	}
 	{
-		GeeHashMap* _tmp3_ = NULL;
+		GeeHashMap* _tmp3_;
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = self->priv->developments;
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 5322 "Photo.c"
+#line 5346 "Photo.c"
 		{
-			GeeHashMap* _tmp4_ = NULL;
-			RawDeveloper _tmp5_ = 0;
-			BackingPhotoRow* _tmp6_ = NULL;
+			GeeHashMap* _tmp4_;
+			RawDeveloper _tmp5_;
+			BackingPhotoRow* _tmp6_;
 #line 634 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->developments;
 #line 634 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5331,16 +5355,16 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
 			_tmp6_ = bpr;
 #line 634 "/home/jens/Source/shotwell/src/Photo.vala"
 			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp5_), _tmp6_);
-#line 5335 "Photo.c"
+#line 5359 "Photo.c"
 		}
-		__finally264:
+		__finally265:
 		{
-			GeeHashMap* _tmp7_ = NULL;
+			GeeHashMap* _tmp7_;
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->developments;
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5344 "Photo.c"
+#line 5368 "Photo.c"
 		}
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5348,7 +5372,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
 			g_propagate_error (error, _inner_error_);
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 5352 "Photo.c"
+#line 5376 "Photo.c"
 		}
 	}
 #line 636 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5359,52 +5383,52 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp9_);
 #line 636 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (_tmp9_);
-#line 5363 "Photo.c"
+#line 5387 "Photo.c"
 }
 
 
 void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, BackingPhotoRow* bpr, GError** error) {
 	GFile* file = NULL;
-	BackingPhotoRow* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	BackingPhotoRow* _tmp0_;
+	const gchar* _tmp1_;
+	GFile* _tmp2_;
 	GFileInfo* info = NULL;
-	GFile* _tmp3_ = NULL;
-	GFileInfo* _tmp4_ = NULL;
+	GFile* _tmp3_;
+	GFileInfo* _tmp4_;
 	GTimeVal timestamp = {0};
-	GFileInfo* _tmp5_ = NULL;
+	GFileInfo* _tmp5_;
 	GTimeVal _tmp6_ = {0};
 	PhotoFileInterrogator* interrogator = NULL;
-	GFile* _tmp7_ = NULL;
-	PhotoFileInterrogator* _tmp8_ = NULL;
-	PhotoFileInterrogator* _tmp9_ = NULL;
+	GFile* _tmp7_;
+	PhotoFileInterrogator* _tmp8_;
+	PhotoFileInterrogator* _tmp9_;
 	DetectedPhotoInformation* detected = NULL;
-	PhotoFileInterrogator* _tmp10_ = NULL;
-	DetectedPhotoInformation* _tmp11_ = NULL;
+	PhotoFileInterrogator* _tmp10_;
+	DetectedPhotoInformation* _tmp11_;
 	gboolean _tmp12_ = FALSE;
-	DetectedPhotoInformation* _tmp13_ = NULL;
-	BackingPhotoRow* _tmp16_ = NULL;
-	DetectedPhotoInformation* _tmp17_ = NULL;
-	Dimensions _tmp18_ = {0};
-	BackingPhotoRow* _tmp19_ = NULL;
-	GFileInfo* _tmp20_ = NULL;
-	gint64 _tmp21_ = 0LL;
-	BackingPhotoRow* _tmp22_ = NULL;
-	GTimeVal _tmp23_ = {0};
-	glong _tmp24_ = 0L;
+	DetectedPhotoInformation* _tmp13_;
+	BackingPhotoRow* _tmp16_;
+	DetectedPhotoInformation* _tmp17_;
+	Dimensions _tmp18_;
+	BackingPhotoRow* _tmp19_;
+	GFileInfo* _tmp20_;
+	gint64 _tmp21_;
+	BackingPhotoRow* _tmp22_;
+	GTimeVal _tmp23_;
+	glong _tmp24_;
 	Orientation _tmp25_ = 0;
-	DetectedPhotoInformation* _tmp26_ = NULL;
-	PhotoMetadata* _tmp27_ = NULL;
-	BackingPhotoRow* _tmp31_ = NULL;
-	BackingPhotoTable* _tmp32_ = NULL;
-	BackingPhotoTable* _tmp33_ = NULL;
-	BackingPhotoRow* _tmp34_ = NULL;
-	PhotoTable* _tmp35_ = NULL;
-	PhotoTable* _tmp36_ = NULL;
-	PhotoRow* _tmp37_ = NULL;
-	RawDeveloper _tmp38_ = 0;
-	BackingPhotoRow* _tmp39_ = NULL;
-	BackingPhotoID _tmp40_ = {0};
+	DetectedPhotoInformation* _tmp26_;
+	PhotoMetadata* _tmp27_;
+	BackingPhotoRow* _tmp31_;
+	BackingPhotoTable* _tmp32_;
+	BackingPhotoTable* _tmp33_;
+	BackingPhotoRow* _tmp34_;
+	PhotoTable* _tmp35_;
+	PhotoTable* _tmp36_;
+	PhotoRow* _tmp37_;
+	RawDeveloper _tmp38_;
+	BackingPhotoRow* _tmp39_;
+	BackingPhotoID _tmp40_;
 	GError * _inner_error_ = NULL;
 #line 639 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO_ROW (row));
@@ -5432,7 +5456,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_g_object_unref0 (file);
 #line 642 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5436 "Photo.c"
+#line 5460 "Photo.c"
 	}
 #line 644 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = info;
@@ -5462,7 +5486,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_g_object_unref0 (file);
 #line 648 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5466 "Photo.c"
+#line 5490 "Photo.c"
 	}
 #line 650 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = interrogator;
@@ -5476,17 +5500,17 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 	if (_tmp13_ == NULL) {
 #line 651 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = TRUE;
-#line 5480 "Photo.c"
+#line 5504 "Photo.c"
 	} else {
-		PhotoFileInterrogator* _tmp14_ = NULL;
-		gboolean _tmp15_ = FALSE;
+		PhotoFileInterrogator* _tmp14_;
+		gboolean _tmp15_;
 #line 651 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = interrogator;
 #line 651 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = photo_file_interrogator_get_is_photo_corrupted (_tmp14_);
 #line 651 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp15_;
-#line 5490 "Photo.c"
+#line 5514 "Photo.c"
 	}
 #line 651 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
@@ -5500,7 +5524,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_g_object_unref0 (file);
 #line 654 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5504 "Photo.c"
+#line 5528 "Photo.c"
 	}
 #line 657 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = bpr;
@@ -5532,10 +5556,10 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 	_tmp27_ = _tmp26_->metadata;
 #line 660 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp27_ != NULL) {
-#line 5536 "Photo.c"
-		DetectedPhotoInformation* _tmp28_ = NULL;
-		PhotoMetadata* _tmp29_ = NULL;
-		Orientation _tmp30_ = 0;
+#line 5560 "Photo.c"
+		DetectedPhotoInformation* _tmp28_;
+		PhotoMetadata* _tmp29_;
+		Orientation _tmp30_;
 #line 660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = detected;
 #line 660 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5544,11 +5568,11 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_tmp30_ = photo_metadata_get_orientation (_tmp29_);
 #line 660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp30_;
-#line 5548 "Photo.c"
+#line 5572 "Photo.c"
 	} else {
 #line 661 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = ORIENTATION_TOP_LEFT;
-#line 5552 "Photo.c"
+#line 5576 "Photo.c"
 	}
 #line 660 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = bpr;
@@ -5578,7 +5602,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_g_object_unref0 (file);
 #line 664 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5582 "Photo.c"
+#line 5606 "Photo.c"
 	}
 #line 665 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_table_get_instance ();
@@ -5610,7 +5634,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_g_object_unref0 (file);
 #line 665 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5614 "Photo.c"
+#line 5638 "Photo.c"
 	}
 #line 639 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
@@ -5620,14 +5644,14 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 	_g_object_unref0 (info);
 #line 639 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 5624 "Photo.c"
+#line 5648 "Photo.c"
 }
 
 
 static void photo_develop_photo (Photo* self, RawDeveloper d) {
 	gboolean wrote_img_to_disk = FALSE;
 	BackingPhotoRow* bps = NULL;
-	RawDeveloper _tmp0_ = 0;
+	RawDeveloper _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 670 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -5641,32 +5665,32 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 	switch (_tmp0_) {
 #line 674 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 5645 "Photo.c"
+#line 5669 "Photo.c"
 		{
 			{
 				BackingPhotoRow* _tmp1_ = NULL;
-				RawDeveloper _tmp2_ = 0;
-				PhotoRow* _tmp3_ = NULL;
-				BackingPhotoRow* _tmp4_ = NULL;
-				const gchar* _tmp5_ = NULL;
-				BackingPhotoRow* _tmp6_ = NULL;
-				BackingPhotoRow* _tmp7_ = NULL;
+				RawDeveloper _tmp2_;
+				PhotoRow* _tmp3_;
+				BackingPhotoRow* _tmp4_;
+				const gchar* _tmp5_;
+				BackingPhotoRow* _tmp6_;
+				BackingPhotoRow* _tmp7_;
 				GdkPixbuf* pix = NULL;
-				GdkPixbuf* _tmp14_ = NULL;
+				GdkPixbuf* _tmp14_;
 				PhotoFileWriter* writer = NULL;
-				BackingPhotoRow* _tmp20_ = NULL;
-				const gchar* _tmp21_ = NULL;
-				PhotoFileWriter* _tmp22_ = NULL;
-				PhotoFileWriter* _tmp23_ = NULL;
-				GdkPixbuf* _tmp24_ = NULL;
+				BackingPhotoRow* _tmp20_;
+				const gchar* _tmp21_;
+				PhotoFileWriter* _tmp22_;
+				PhotoFileWriter* _tmp23_;
+				GdkPixbuf* _tmp24_;
 				PhotoMetadata* meta = NULL;
-				PhotoMetadata* _tmp25_ = NULL;
+				PhotoMetadata* _tmp25_;
 				PhotoFileMetadataWriter* mwriter = NULL;
-				BackingPhotoRow* _tmp26_ = NULL;
-				const gchar* _tmp27_ = NULL;
-				PhotoFileMetadataWriter* _tmp28_ = NULL;
-				PhotoFileMetadataWriter* _tmp29_ = NULL;
-				PhotoMetadata* _tmp30_ = NULL;
+				BackingPhotoRow* _tmp26_;
+				const gchar* _tmp27_;
+				PhotoFileMetadataWriter* _tmp28_;
+				PhotoFileMetadataWriter* _tmp29_;
+				PhotoMetadata* _tmp30_;
 #line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp2_ = d;
 #line 678 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5681,8 +5705,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				_tmp1_ = _tmp6_;
 #line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5685 "Photo.c"
-					goto __catch265_g_error;
+#line 5709 "Photo.c"
+					goto __catch266_g_error;
 				}
 #line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp1_;
@@ -5694,19 +5718,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				bps = _tmp7_;
 #line 679 "/home/jens/Source/shotwell/src/Photo.vala"
 				pix = NULL;
-#line 5698 "Photo.c"
+#line 5722 "Photo.c"
 				{
-					PhotoBackingReaders* _tmp8_ = NULL;
+					PhotoBackingReaders* _tmp8_;
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = self->priv->readers;
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 5705 "Photo.c"
+#line 5729 "Photo.c"
 					{
 						GdkPixbuf* _tmp9_ = NULL;
 						Scaling _tmp10_ = {0};
-						GdkPixbuf* _tmp11_ = NULL;
-						GdkPixbuf* _tmp12_ = NULL;
+						GdkPixbuf* _tmp11_;
+						GdkPixbuf* _tmp12_;
 #line 685 "/home/jens/Source/shotwell/src/Photo.vala"
 						scaling_for_original (&_tmp10_);
 #line 685 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5715,8 +5739,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						_tmp9_ = _tmp11_;
 #line 685 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5719 "Photo.c"
-							goto __finally266;
+#line 5743 "Photo.c"
+							goto __finally267;
 						}
 #line 685 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp12_ = _tmp9_;
@@ -5728,16 +5752,16 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						pix = _tmp12_;
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_tmp9_);
-#line 5732 "Photo.c"
+#line 5756 "Photo.c"
 					}
-					__finally266:
+					__finally267:
 					{
-						PhotoBackingReaders* _tmp13_ = NULL;
+						PhotoBackingReaders* _tmp13_;
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = self->priv->readers;
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 5741 "Photo.c"
+#line 5765 "Photo.c"
 					}
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5745,8 +5769,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						_g_object_unref0 (pix);
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 						_backing_photo_row_unref0 (_tmp1_);
-#line 5749 "Photo.c"
-						goto __catch265_g_error;
+#line 5773 "Photo.c"
+						goto __catch266_g_error;
 					}
 				}
 #line 688 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5759,17 +5783,17 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 690 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5763 "Photo.c"
+#line 5787 "Photo.c"
 					{
-						gboolean _tmp15_ = FALSE;
+						gboolean _tmp15_;
 #line 714 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp15_ = wrote_img_to_disk;
 #line 714 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp15_) {
-#line 5770 "Photo.c"
+#line 5794 "Photo.c"
 							{
-								RawDeveloper _tmp16_ = 0;
-								BackingPhotoRow* _tmp17_ = NULL;
+								RawDeveloper _tmp16_;
+								BackingPhotoRow* _tmp17_;
 #line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp16_ = d;
 #line 717 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5778,19 +5802,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								photo_add_backing_photo_for_development (self, _tmp16_, _tmp17_, &_inner_error_);
 #line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5782 "Photo.c"
-									goto __catch267_g_error;
+#line 5806 "Photo.c"
+									goto __catch268_g_error;
 								}
 #line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 5787 "Photo.c"
+#line 5811 "Photo.c"
 							}
-							goto __finally267;
-							__catch267_g_error:
+							goto __finally268;
+							__catch268_g_error:
 							{
 								GError* e = NULL;
-								GError* _tmp18_ = NULL;
-								const gchar* _tmp19_ = NULL;
+								GError* _tmp18_;
+								const gchar* _tmp19_;
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 								e = _inner_error_;
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5803,13 +5827,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								g_debug ("Photo.vala:721: Error adding backing photo as development. Message: %s", _tmp19_);
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_error_free0 (e);
-#line 5807 "Photo.c"
+#line 5831 "Photo.c"
 							}
-							__finally267:
+							__finally268:
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5812 "Photo.c"
-								goto __catch265_g_error;
+#line 5836 "Photo.c"
+								goto __catch266_g_error;
 							}
 						}
 					}
@@ -5817,7 +5841,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_backing_photo_row_unref0 (bps);
 #line 690 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 5821 "Photo.c"
+#line 5845 "Photo.c"
 				}
 #line 694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = bps;
@@ -5833,8 +5857,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 694 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5837 "Photo.c"
-					goto __catch265_g_error;
+#line 5861 "Photo.c"
+					goto __catch266_g_error;
 				}
 #line 695 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = writer;
@@ -5850,8 +5874,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 695 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5854 "Photo.c"
-					goto __catch265_g_error;
+#line 5878 "Photo.c"
+					goto __catch266_g_error;
 				}
 #line 703 "/home/jens/Source/shotwell/src/Photo.vala"
 				wrote_img_to_disk = TRUE;
@@ -5867,8 +5891,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 708 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5871 "Photo.c"
-					goto __catch265_g_error;
+#line 5895 "Photo.c"
+					goto __catch266_g_error;
 				}
 #line 709 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = bps;
@@ -5888,8 +5912,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 709 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5892 "Photo.c"
-					goto __catch265_g_error;
+#line 5916 "Photo.c"
+					goto __catch266_g_error;
 				}
 #line 710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = mwriter;
@@ -5909,8 +5933,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 710 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5913 "Photo.c"
-					goto __catch265_g_error;
+#line 5937 "Photo.c"
+					goto __catch266_g_error;
 				}
 #line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (mwriter);
@@ -5922,14 +5946,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				_g_object_unref0 (pix);
 #line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp1_);
-#line 5926 "Photo.c"
+#line 5950 "Photo.c"
 			}
-			goto __finally265;
-			__catch265_g_error:
+			goto __finally266;
+			__catch266_g_error:
 			{
 				GError* err = NULL;
-				GError* _tmp31_ = NULL;
-				const gchar* _tmp32_ = NULL;
+				GError* _tmp31_;
+				const gchar* _tmp32_;
 #line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 				err = _inner_error_;
 #line 676 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5942,19 +5966,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				g_debug ("Photo.vala:712: Error developing photo: %s", _tmp32_);
 #line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 5946 "Photo.c"
+#line 5970 "Photo.c"
 			}
-			__finally265:
+			__finally266:
 			{
-				gboolean _tmp33_ = FALSE;
+				gboolean _tmp33_;
 #line 714 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = wrote_img_to_disk;
 #line 714 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp33_) {
-#line 5955 "Photo.c"
+#line 5979 "Photo.c"
 					{
-						RawDeveloper _tmp34_ = 0;
-						BackingPhotoRow* _tmp35_ = NULL;
+						RawDeveloper _tmp34_;
+						BackingPhotoRow* _tmp35_;
 #line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp34_ = d;
 #line 717 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5963,19 +5987,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						photo_add_backing_photo_for_development (self, _tmp34_, _tmp35_, &_inner_error_);
 #line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5967 "Photo.c"
-							goto __catch268_g_error;
+#line 5991 "Photo.c"
+							goto __catch269_g_error;
 						}
 #line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_notify_raw_development_modified (self);
-#line 5972 "Photo.c"
+#line 5996 "Photo.c"
 					}
-					goto __finally268;
-					__catch268_g_error:
+					goto __finally269;
+					__catch269_g_error:
 					{
 						GError* e = NULL;
-						GError* _tmp36_ = NULL;
-						const gchar* _tmp37_ = NULL;
+						GError* _tmp36_;
+						const gchar* _tmp37_;
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 						e = _inner_error_;
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5988,9 +6012,9 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						g_debug ("Photo.vala:721: Error adding backing photo as development. Message: %s", _tmp37_);
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_error_free0 (e);
-#line 5992 "Photo.c"
+#line 6016 "Photo.c"
 					}
-					__finally268:
+					__finally269:
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6001,7 +6025,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						g_clear_error (&_inner_error_);
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 6005 "Photo.c"
+#line 6029 "Photo.c"
 					}
 				}
 			}
@@ -6015,67 +6039,67 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				g_clear_error (&_inner_error_);
 #line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6019 "Photo.c"
+#line 6043 "Photo.c"
 			}
 #line 727 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6023 "Photo.c"
+#line 6047 "Photo.c"
 		}
 #line 674 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 6027 "Photo.c"
+#line 6051 "Photo.c"
 		{
 #line 731 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6031 "Photo.c"
+#line 6055 "Photo.c"
 		}
 #line 674 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 6035 "Photo.c"
+#line 6059 "Photo.c"
 		{
 			{
 				PhotoMetadata* meta = NULL;
-				PhotoMetadata* _tmp38_ = NULL;
+				PhotoMetadata* _tmp38_;
 				guint c = 0U;
-				PhotoMetadata* _tmp39_ = NULL;
-				guint _tmp40_ = 0U;
-				guint _tmp41_ = 0U;
+				PhotoMetadata* _tmp39_;
+				guint _tmp40_;
+				guint _tmp41_;
 				PhotoPreview* prev = NULL;
-				PhotoMetadata* _tmp47_ = NULL;
-				guint _tmp48_ = 0U;
-				PhotoPreview* _tmp49_ = NULL;
-				PhotoPreview* _tmp50_ = NULL;
+				PhotoMetadata* _tmp47_;
+				guint _tmp48_;
+				PhotoPreview* _tmp49_;
+				PhotoPreview* _tmp50_;
 				GdkPixbuf* pix = NULL;
-				PhotoPreview* _tmp56_ = NULL;
-				GdkPixbuf* _tmp57_ = NULL;
-				GdkPixbuf* _tmp58_ = NULL;
+				PhotoPreview* _tmp56_;
+				GdkPixbuf* _tmp57_;
+				GdkPixbuf* _tmp58_;
 				BackingPhotoRow* _tmp64_ = NULL;
-				RawDeveloper _tmp65_ = 0;
-				PhotoRow* _tmp66_ = NULL;
-				BackingPhotoRow* _tmp67_ = NULL;
-				const gchar* _tmp68_ = NULL;
-				BackingPhotoRow* _tmp69_ = NULL;
-				BackingPhotoRow* _tmp70_ = NULL;
+				RawDeveloper _tmp65_;
+				PhotoRow* _tmp66_;
+				BackingPhotoRow* _tmp67_;
+				const gchar* _tmp68_;
+				BackingPhotoRow* _tmp69_;
+				BackingPhotoRow* _tmp70_;
 				PhotoFileWriter* writer = NULL;
-				BackingPhotoRow* _tmp71_ = NULL;
-				const gchar* _tmp72_ = NULL;
-				PhotoFileWriter* _tmp73_ = NULL;
-				PhotoFileWriter* _tmp74_ = NULL;
-				GdkPixbuf* _tmp75_ = NULL;
+				BackingPhotoRow* _tmp71_;
+				const gchar* _tmp72_;
+				PhotoFileWriter* _tmp73_;
+				PhotoFileWriter* _tmp74_;
+				GdkPixbuf* _tmp75_;
 				PhotoFileMetadataWriter* mwriter = NULL;
-				BackingPhotoRow* _tmp76_ = NULL;
-				const gchar* _tmp77_ = NULL;
-				PhotoFileMetadataWriter* _tmp78_ = NULL;
-				PhotoFileMetadataWriter* _tmp79_ = NULL;
-				PhotoMetadata* _tmp80_ = NULL;
+				BackingPhotoRow* _tmp76_;
+				const gchar* _tmp77_;
+				PhotoFileMetadataWriter* _tmp78_;
+				PhotoFileMetadataWriter* _tmp79_;
+				PhotoMetadata* _tmp80_;
 #line 736 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = photo_get_master_metadata (self, &_inner_error_);
 #line 736 "/home/jens/Source/shotwell/src/Photo.vala"
 				meta = _tmp38_;
 #line 736 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6078 "Photo.c"
-					goto __catch269_g_error;
+#line 6102 "Photo.c"
+					goto __catch270_g_error;
 				}
 #line 737 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = meta;
@@ -6089,17 +6113,17 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				if (_tmp41_ <= ((guint) 0)) {
 #line 739 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6093 "Photo.c"
+#line 6117 "Photo.c"
 					{
-						gboolean _tmp42_ = FALSE;
+						gboolean _tmp42_;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp42_ = wrote_img_to_disk;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp42_) {
-#line 6100 "Photo.c"
+#line 6124 "Photo.c"
 							{
-								RawDeveloper _tmp43_ = 0;
-								BackingPhotoRow* _tmp44_ = NULL;
+								RawDeveloper _tmp43_;
+								BackingPhotoRow* _tmp44_;
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp43_ = d;
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6108,19 +6132,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								photo_add_backing_photo_for_development (self, _tmp43_, _tmp44_, &_inner_error_);
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6112 "Photo.c"
-									goto __catch270_g_error;
+#line 6136 "Photo.c"
+									goto __catch271_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6117 "Photo.c"
+#line 6141 "Photo.c"
 							}
-							goto __finally270;
-							__catch270_g_error:
+							goto __finally271;
+							__catch271_g_error:
 							{
 								GError* e = NULL;
-								GError* _tmp45_ = NULL;
-								const gchar* _tmp46_ = NULL;
+								GError* _tmp45_;
+								const gchar* _tmp46_;
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 								e = _inner_error_;
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6133,13 +6157,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp46_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_error_free0 (e);
-#line 6137 "Photo.c"
+#line 6161 "Photo.c"
 							}
-							__finally270:
+							__finally271:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6142 "Photo.c"
-								goto __catch269_g_error;
+#line 6166 "Photo.c"
+								goto __catch270_g_error;
 							}
 						}
 					}
@@ -6147,7 +6171,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_backing_photo_row_unref0 (bps);
 #line 739 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 6151 "Photo.c"
+#line 6175 "Photo.c"
 				}
 #line 740 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = meta;
@@ -6167,17 +6191,17 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 743 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6171 "Photo.c"
+#line 6195 "Photo.c"
 					{
-						gboolean _tmp51_ = FALSE;
+						gboolean _tmp51_;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp51_ = wrote_img_to_disk;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp51_) {
-#line 6178 "Photo.c"
+#line 6202 "Photo.c"
 							{
-								RawDeveloper _tmp52_ = 0;
-								BackingPhotoRow* _tmp53_ = NULL;
+								RawDeveloper _tmp52_;
+								BackingPhotoRow* _tmp53_;
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp52_ = d;
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6186,19 +6210,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								photo_add_backing_photo_for_development (self, _tmp52_, _tmp53_, &_inner_error_);
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6190 "Photo.c"
-									goto __catch271_g_error;
+#line 6214 "Photo.c"
+									goto __catch272_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6195 "Photo.c"
+#line 6219 "Photo.c"
 							}
-							goto __finally271;
-							__catch271_g_error:
+							goto __finally272;
+							__catch272_g_error:
 							{
 								GError* e = NULL;
-								GError* _tmp54_ = NULL;
-								const gchar* _tmp55_ = NULL;
+								GError* _tmp54_;
+								const gchar* _tmp55_;
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 								e = _inner_error_;
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6211,13 +6235,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp55_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_error_free0 (e);
-#line 6215 "Photo.c"
+#line 6239 "Photo.c"
 							}
-							__finally271:
+							__finally272:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6220 "Photo.c"
-								goto __catch269_g_error;
+#line 6244 "Photo.c"
+								goto __catch270_g_error;
 							}
 						}
 					}
@@ -6225,7 +6249,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_backing_photo_row_unref0 (bps);
 #line 743 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 6229 "Photo.c"
+#line 6253 "Photo.c"
 				}
 #line 746 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = prev;
@@ -6239,8 +6263,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 746 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6243 "Photo.c"
-					goto __catch269_g_error;
+#line 6267 "Photo.c"
+					goto __catch270_g_error;
 				}
 #line 747 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58_ = pix;
@@ -6254,17 +6278,17 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 749 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6258 "Photo.c"
+#line 6282 "Photo.c"
 					{
-						gboolean _tmp59_ = FALSE;
+						gboolean _tmp59_;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp59_ = wrote_img_to_disk;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp59_) {
-#line 6265 "Photo.c"
+#line 6289 "Photo.c"
 							{
-								RawDeveloper _tmp60_ = 0;
-								BackingPhotoRow* _tmp61_ = NULL;
+								RawDeveloper _tmp60_;
+								BackingPhotoRow* _tmp61_;
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp60_ = d;
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6273,19 +6297,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								photo_add_backing_photo_for_development (self, _tmp60_, _tmp61_, &_inner_error_);
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6277 "Photo.c"
-									goto __catch272_g_error;
+#line 6301 "Photo.c"
+									goto __catch273_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6282 "Photo.c"
+#line 6306 "Photo.c"
 							}
-							goto __finally272;
-							__catch272_g_error:
+							goto __finally273;
+							__catch273_g_error:
 							{
 								GError* e = NULL;
-								GError* _tmp62_ = NULL;
-								const gchar* _tmp63_ = NULL;
+								GError* _tmp62_;
+								const gchar* _tmp63_;
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 								e = _inner_error_;
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6298,13 +6322,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp63_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_error_free0 (e);
-#line 6302 "Photo.c"
+#line 6326 "Photo.c"
 							}
-							__finally272:
+							__finally273:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6307 "Photo.c"
-								goto __catch269_g_error;
+#line 6331 "Photo.c"
+								goto __catch270_g_error;
 							}
 						}
 					}
@@ -6312,7 +6336,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_backing_photo_row_unref0 (bps);
 #line 749 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 6316 "Photo.c"
+#line 6340 "Photo.c"
 				}
 #line 753 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65_ = d;
@@ -6334,8 +6358,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 753 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6338 "Photo.c"
-					goto __catch269_g_error;
+#line 6362 "Photo.c"
+					goto __catch270_g_error;
 				}
 #line 753 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp70_ = _tmp64_;
@@ -6363,8 +6387,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 754 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6367 "Photo.c"
-					goto __catch269_g_error;
+#line 6391 "Photo.c"
+					goto __catch270_g_error;
 				}
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp74_ = writer;
@@ -6384,8 +6408,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6388 "Photo.c"
-					goto __catch269_g_error;
+#line 6412 "Photo.c"
+					goto __catch270_g_error;
 				}
 #line 759 "/home/jens/Source/shotwell/src/Photo.vala"
 				wrote_img_to_disk = TRUE;
@@ -6409,8 +6433,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 762 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6413 "Photo.c"
-					goto __catch269_g_error;
+#line 6437 "Photo.c"
+					goto __catch270_g_error;
 				}
 #line 763 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp79_ = mwriter;
@@ -6432,8 +6456,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 763 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6436 "Photo.c"
-					goto __catch269_g_error;
+#line 6460 "Photo.c"
+					goto __catch270_g_error;
 				}
 #line 734 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (mwriter);
@@ -6447,14 +6471,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				_photo_preview_unref0 (prev);
 #line 734 "/home/jens/Source/shotwell/src/Photo.vala"
 				_media_metadata_unref0 (meta);
-#line 6451 "Photo.c"
+#line 6475 "Photo.c"
 			}
-			goto __finally269;
-			__catch269_g_error:
+			goto __finally270;
+			__catch270_g_error:
 			{
 				GError* e = NULL;
-				GError* _tmp81_ = NULL;
-				const gchar* _tmp82_ = NULL;
+				GError* _tmp81_;
+				const gchar* _tmp82_;
 #line 734 "/home/jens/Source/shotwell/src/Photo.vala"
 				e = _inner_error_;
 #line 734 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6467,17 +6491,17 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				g_debug ("Photo.vala:765: Error accessing embedded preview. Message: %s", _tmp82_);
 #line 766 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 6471 "Photo.c"
+#line 6495 "Photo.c"
 				{
-					gboolean _tmp83_ = FALSE;
+					gboolean _tmp83_;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp83_ = wrote_img_to_disk;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp83_) {
-#line 6478 "Photo.c"
+#line 6502 "Photo.c"
 						{
-							RawDeveloper _tmp84_ = 0;
-							BackingPhotoRow* _tmp85_ = NULL;
+							RawDeveloper _tmp84_;
+							BackingPhotoRow* _tmp85_;
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp84_ = d;
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6486,19 +6510,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 							photo_add_backing_photo_for_development (self, _tmp84_, _tmp85_, &_inner_error_);
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6490 "Photo.c"
-								goto __catch273_g_error;
+#line 6514 "Photo.c"
+								goto __catch274_g_error;
 							}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 							photo_notify_raw_development_modified (self);
-#line 6495 "Photo.c"
+#line 6519 "Photo.c"
 						}
-						goto __finally273;
-						__catch273_g_error:
+						goto __finally274;
+						__catch274_g_error:
 						{
 							GError* e = NULL;
-							GError* _tmp86_ = NULL;
-							const gchar* _tmp87_ = NULL;
+							GError* _tmp86_;
+							const gchar* _tmp87_;
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							e = _inner_error_;
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6511,14 +6535,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 							g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp87_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_error_free0 (e);
-#line 6515 "Photo.c"
+#line 6539 "Photo.c"
 						}
-						__finally273:
+						__finally274:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (bps);
-#line 6522 "Photo.c"
+#line 6546 "Photo.c"
 						}
 					}
 				}
@@ -6526,19 +6550,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				_backing_photo_row_unref0 (bps);
 #line 766 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6530 "Photo.c"
+#line 6554 "Photo.c"
 			}
-			__finally269:
+			__finally270:
 			{
-				gboolean _tmp88_ = FALSE;
+				gboolean _tmp88_;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp88_ = wrote_img_to_disk;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp88_) {
-#line 6539 "Photo.c"
+#line 6563 "Photo.c"
 					{
-						RawDeveloper _tmp89_ = 0;
-						BackingPhotoRow* _tmp90_ = NULL;
+						RawDeveloper _tmp89_;
+						BackingPhotoRow* _tmp90_;
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp89_ = d;
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6547,19 +6571,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						photo_add_backing_photo_for_development (self, _tmp89_, _tmp90_, &_inner_error_);
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6551 "Photo.c"
-							goto __catch274_g_error;
+#line 6575 "Photo.c"
+							goto __catch275_g_error;
 						}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_notify_raw_development_modified (self);
-#line 6556 "Photo.c"
+#line 6580 "Photo.c"
 					}
-					goto __finally274;
-					__catch274_g_error:
+					goto __finally275;
+					__catch275_g_error:
 					{
 						GError* e = NULL;
-						GError* _tmp91_ = NULL;
-						const gchar* _tmp92_ = NULL;
+						GError* _tmp91_;
+						const gchar* _tmp92_;
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 						e = _inner_error_;
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6572,9 +6596,9 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp92_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_error_free0 (e);
-#line 6576 "Photo.c"
+#line 6600 "Photo.c"
 					}
-					__finally274:
+					__finally275:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6585,7 +6609,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						g_clear_error (&_inner_error_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 6589 "Photo.c"
+#line 6613 "Photo.c"
 					}
 				}
 			}
@@ -6599,22 +6623,22 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				g_clear_error (&_inner_error_);
 #line 734 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6603 "Photo.c"
+#line 6627 "Photo.c"
 			}
 #line 780 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6607 "Photo.c"
+#line 6631 "Photo.c"
 		}
 		default:
 		{
 #line 783 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_assert_not_reached ();
-#line 6613 "Photo.c"
+#line 6637 "Photo.c"
 		}
 	}
 #line 670 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (bps);
-#line 6618 "Photo.c"
+#line 6642 "Photo.c"
 }
 
 
@@ -6622,33 +6646,33 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) {
 	GError * _inner_error_ = NULL;
 #line 788 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 6626 "Photo.c"
+#line 6650 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 6633 "Photo.c"
+#line 6657 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			RawDeveloper _tmp2_ = 0;
+			PhotoRow* _tmp1_;
+			RawDeveloper _tmp2_;
 #line 790 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 790 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = d;
 #line 790 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_->developer = _tmp2_;
-#line 6643 "Photo.c"
+#line 6667 "Photo.c"
 		}
-		__finally275:
+		__finally276:
 		{
-			PhotoRow* _tmp3_ = NULL;
+			PhotoRow* _tmp3_;
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 6652 "Photo.c"
+#line 6676 "Photo.c"
 		}
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -6658,19 +6682,19 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) {
 			g_clear_error (&_inner_error_);
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 6662 "Photo.c"
+#line 6686 "Photo.c"
 		}
 	}
 }
 
 
 void photo_set_raw_developer (Photo* self, RawDeveloper d) {
-	PhotoFileFormat _tmp0_ = 0;
+	PhotoFileFormat _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	Alteration* _tmp48_ = NULL;
-	Alteration* _tmp49_ = NULL;
+	gboolean _tmp2_;
+	gboolean _tmp4_;
+	Alteration* _tmp48_;
+	Alteration* _tmp49_;
 	GError * _inner_error_ = NULL;
 #line 795 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -6680,29 +6704,29 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 	if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) {
 #line 797 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 6684 "Photo.c"
+#line 6708 "Photo.c"
 	}
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_CAMERA);
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 6690 "Photo.c"
-		RawDeveloper _tmp3_ = 0;
+#line 6714 "Photo.c"
+		RawDeveloper _tmp3_;
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = d;
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED;
-#line 6696 "Photo.c"
+#line 6720 "Photo.c"
 	} else {
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 6700 "Photo.c"
+#line 6724 "Photo.c"
 	}
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
 #line 803 "/home/jens/Source/shotwell/src/Photo.vala"
 		d = RAW_DEVELOPER_CAMERA;
-#line 6706 "Photo.c"
+#line 6730 "Photo.c"
 	}
 #line 807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_EMBEDDED);
@@ -6710,39 +6734,39 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 	if (!_tmp4_) {
 #line 808 "/home/jens/Source/shotwell/src/Photo.vala"
 		d = RAW_DEVELOPER_SHOTWELL;
-#line 6714 "Photo.c"
+#line 6738 "Photo.c"
 	}
 	{
-		GeeHashMap* _tmp5_ = NULL;
+		GeeHashMap* _tmp5_;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 6722 "Photo.c"
+#line 6746 "Photo.c"
 		{
 			RawDeveloper stale_raw_developer = 0;
-			PhotoRow* _tmp6_ = NULL;
-			RawDeveloper _tmp7_ = 0;
-			RawDeveloper _tmp8_ = 0;
-			gboolean _tmp9_ = FALSE;
-			GeeHashMap* _tmp11_ = NULL;
-			RawDeveloper _tmp12_ = 0;
-			gboolean _tmp13_ = FALSE;
-			PhotoRow* _tmp15_ = NULL;
-			RawDeveloper _tmp16_ = 0;
-			GeeHashMap* _tmp17_ = NULL;
-			RawDeveloper _tmp18_ = 0;
-			gpointer _tmp19_ = NULL;
-			PhotoBackingReaders* _tmp20_ = NULL;
-			BackingPhotoRow* _tmp21_ = NULL;
-			PhotoFileFormat _tmp22_ = 0;
-			BackingPhotoRow* _tmp23_ = NULL;
-			const gchar* _tmp24_ = NULL;
-			PhotoFileReader* _tmp25_ = NULL;
-			BackingPhotoRow* _tmp30_ = NULL;
-			Orientation _tmp31_ = 0;
+			PhotoRow* _tmp6_;
+			RawDeveloper _tmp7_;
+			RawDeveloper _tmp8_;
+			gboolean _tmp9_;
+			GeeHashMap* _tmp11_;
+			RawDeveloper _tmp12_;
+			gboolean _tmp13_;
+			PhotoRow* _tmp15_;
+			RawDeveloper _tmp16_;
+			GeeHashMap* _tmp17_;
+			RawDeveloper _tmp18_;
+			gpointer _tmp19_;
+			PhotoBackingReaders* _tmp20_;
+			BackingPhotoRow* _tmp21_;
+			PhotoFileFormat _tmp22_;
+			BackingPhotoRow* _tmp23_;
+			const gchar* _tmp24_;
+			PhotoFileReader* _tmp25_;
+			BackingPhotoRow* _tmp30_;
+			Orientation _tmp31_;
 			gboolean _tmp41_ = FALSE;
-			RawDeveloper _tmp42_ = 0;
+			RawDeveloper _tmp42_;
 #line 811 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->row;
 #line 811 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6755,13 +6779,13 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 			_tmp9_ = photo_is_raw_developer_complete (self, _tmp8_);
 #line 814 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp9_) {
-#line 6759 "Photo.c"
-				RawDeveloper _tmp10_ = 0;
+#line 6783 "Photo.c"
+				RawDeveloper _tmp10_;
 #line 815 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = d;
 #line 815 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_develop_photo (self, _tmp10_);
-#line 6765 "Photo.c"
+#line 6789 "Photo.c"
 			}
 #line 817 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->priv->developments;
@@ -6771,18 +6795,18 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 			_tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp12_));
 #line 817 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp13_) {
-#line 6775 "Photo.c"
+#line 6799 "Photo.c"
 				{
-					GeeHashMap* _tmp14_ = NULL;
+					GeeHashMap* _tmp14_;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6782 "Photo.c"
+#line 6806 "Photo.c"
 				}
 #line 818 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6786 "Photo.c"
+#line 6810 "Photo.c"
 			}
 #line 821 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_revert_to_master (self, FALSE);
@@ -6818,10 +6842,10 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 			_photo_file_adapter_unref0 (_tmp20_->developer);
 #line 826 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_->developer = _tmp25_;
-#line 6822 "Photo.c"
+#line 6846 "Photo.c"
 			{
-				GdkPixbuf* _tmp26_ = NULL;
-				GdkPixbuf* _tmp27_ = NULL;
+				GdkPixbuf* _tmp26_;
+				GdkPixbuf* _tmp27_;
 #line 829 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = photo_get_prefetched_copy (self, &_inner_error_);
 #line 829 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6830,12 +6854,12 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 				_g_object_unref0 (_tmp27_);
 #line 829 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6834 "Photo.c"
-					goto __catch277_g_error;
+#line 6858 "Photo.c"
+					goto __catch278_g_error;
 				}
 			}
-			goto __finally277;
-			__catch277_g_error:
+			goto __finally278;
+			__catch278_g_error:
 			{
 				GError* e = NULL;
 #line 828 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6844,30 +6868,30 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 				_inner_error_ = NULL;
 #line 832 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 6848 "Photo.c"
+#line 6872 "Photo.c"
 				{
-					GeeHashMap* _tmp28_ = NULL;
+					GeeHashMap* _tmp28_;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp28_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6855 "Photo.c"
+#line 6879 "Photo.c"
 				}
 #line 832 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6859 "Photo.c"
+#line 6883 "Photo.c"
 			}
-			__finally277:
+			__finally278:
 #line 828 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6864 "Photo.c"
+#line 6888 "Photo.c"
 				{
-					GeeHashMap* _tmp29_ = NULL;
+					GeeHashMap* _tmp29_;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp29_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6871 "Photo.c"
+#line 6895 "Photo.c"
 				}
 #line 828 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6875,7 +6899,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 				g_clear_error (&_inner_error_);
 #line 828 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6879 "Photo.c"
+#line 6903 "Photo.c"
 			}
 #line 835 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp30_ = self->backing_photo_row;
@@ -6883,14 +6907,14 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 			_tmp31_ = _tmp30_->original_orientation;
 #line 835 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_orientation (self, _tmp31_);
-#line 6887 "Photo.c"
+#line 6911 "Photo.c"
 			{
-				PhotoTable* _tmp32_ = NULL;
-				PhotoTable* _tmp33_ = NULL;
-				PhotoRow* _tmp34_ = NULL;
-				RawDeveloper _tmp35_ = 0;
-				BackingPhotoRow* _tmp36_ = NULL;
-				BackingPhotoID _tmp37_ = {0};
+				PhotoTable* _tmp32_;
+				PhotoTable* _tmp33_;
+				PhotoRow* _tmp34_;
+				RawDeveloper _tmp35_;
+				BackingPhotoRow* _tmp36_;
+				BackingPhotoID _tmp37_;
 #line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = photo_table_get_instance ();
 #line 838 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6909,16 +6933,16 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 				_database_table_unref0 (_tmp33_);
 #line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6913 "Photo.c"
-					goto __catch278_g_error;
+#line 6937 "Photo.c"
+					goto __catch279_g_error;
 				}
 			}
-			goto __finally278;
-			__catch278_g_error:
+			goto __finally279;
+			__catch279_g_error:
 			{
 				GError* e = NULL;
-				GError* _tmp38_ = NULL;
-				const gchar* _tmp39_ = NULL;
+				GError* _tmp38_;
+				const gchar* _tmp39_;
 #line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 				e = _inner_error_;
 #line 837 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6931,19 +6955,19 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 				g_warning ("Photo.vala:840: Error updating database: %s", _tmp39_);
 #line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 6935 "Photo.c"
+#line 6959 "Photo.c"
 			}
-			__finally278:
+			__finally279:
 #line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6940 "Photo.c"
+#line 6964 "Photo.c"
 				{
-					GeeHashMap* _tmp40_ = NULL;
+					GeeHashMap* _tmp40_;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp40_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6947 "Photo.c"
+#line 6971 "Photo.c"
 				}
 #line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6951,16 +6975,16 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 				g_clear_error (&_inner_error_);
 #line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6955 "Photo.c"
+#line 6979 "Photo.c"
 			}
 #line 847 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = stale_raw_developer;
 #line 847 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp42_ != RAW_DEVELOPER_CAMERA) {
-#line 6961 "Photo.c"
-				RawDeveloper _tmp43_ = 0;
-				PhotoRow* _tmp44_ = NULL;
-				RawDeveloper _tmp45_ = 0;
+#line 6985 "Photo.c"
+				RawDeveloper _tmp43_;
+				PhotoRow* _tmp44_;
+				RawDeveloper _tmp45_;
 #line 848 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = stale_raw_developer;
 #line 848 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6969,31 +6993,31 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 				_tmp45_ = _tmp44_->developer;
 #line 848 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = _tmp43_ != _tmp45_;
-#line 6973 "Photo.c"
+#line 6997 "Photo.c"
 			} else {
 #line 847 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = FALSE;
-#line 6977 "Photo.c"
+#line 7001 "Photo.c"
 			}
 #line 847 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp41_) {
-#line 6981 "Photo.c"
-				RawDeveloper _tmp46_ = 0;
+#line 7005 "Photo.c"
+				RawDeveloper _tmp46_;
 #line 851 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = stale_raw_developer;
 #line 851 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_delete_raw_development (self, _tmp46_);
-#line 6987 "Photo.c"
+#line 7011 "Photo.c"
 			}
 		}
-		__finally276:
+		__finally277:
 		{
-			GeeHashMap* _tmp47_ = NULL;
+			GeeHashMap* _tmp47_;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp47_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6997 "Photo.c"
+#line 7021 "Photo.c"
 		}
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -7003,7 +7027,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 			g_clear_error (&_inner_error_);
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 7007 "Photo.c"
+#line 7031 "Photo.c"
 		}
 	}
 #line 858 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7016,14 +7040,14 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 	_alteration_unref0 (_tmp49_);
 #line 859 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_discard_prefetched (self);
-#line 7020 "Photo.c"
+#line 7044 "Photo.c"
 }
 
 
 RawDeveloper photo_get_raw_developer (Photo* self) {
 	RawDeveloper result = 0;
-	PhotoRow* _tmp0_ = NULL;
-	RawDeveloper _tmp1_ = 0;
+	PhotoRow* _tmp0_;
+	RawDeveloper _tmp1_;
 #line 862 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
 #line 863 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7034,7 +7058,7 @@ RawDeveloper photo_get_raw_developer (Photo* self) {
 	result = _tmp1_;
 #line 863 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 7038 "Photo.c"
+#line 7062 "Photo.c"
 }
 
 
@@ -7046,32 +7070,32 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 869 "/home/jens/Source/shotwell/src/Photo.vala"
 	ret = FALSE;
-#line 7050 "Photo.c"
+#line 7074 "Photo.c"
 	{
-		GeeHashMap* _tmp0_ = NULL;
+		GeeHashMap* _tmp0_;
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->developments;
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 7057 "Photo.c"
-		{
-			GeeHashMap* _tmp1_ = NULL;
-			RawDeveloper _tmp2_ = 0;
-			gboolean _tmp3_ = FALSE;
-			gchar* _tmp5_ = NULL;
-			gchar* _tmp6_ = NULL;
-			RawDeveloper _tmp7_ = 0;
-			gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
+#line 7081 "Photo.c"
+		{
+			GeeHashMap* _tmp1_;
+			RawDeveloper _tmp2_;
+			gboolean _tmp3_;
+			gchar* _tmp5_;
+			gchar* _tmp6_;
+			RawDeveloper _tmp7_;
+			gchar* _tmp8_;
+			gchar* _tmp9_;
 			BackingPhotoRow* bpr = NULL;
-			GeeHashMap* _tmp10_ = NULL;
-			RawDeveloper _tmp11_ = 0;
-			gpointer _tmp12_ = NULL;
-			BackingPhotoRow* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			GeeHashMap* _tmp39_ = NULL;
-			RawDeveloper _tmp40_ = 0;
-			gboolean _tmp41_ = FALSE;
+			GeeHashMap* _tmp10_;
+			RawDeveloper _tmp11_;
+			gpointer _tmp12_;
+			BackingPhotoRow* _tmp13_;
+			const gchar* _tmp14_;
+			GeeHashMap* _tmp39_;
+			RawDeveloper _tmp40_;
+			gboolean _tmp41_;
 #line 872 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->developments;
 #line 872 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7082,18 +7106,18 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 			if (!_tmp3_) {
 #line 873 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = FALSE;
-#line 7086 "Photo.c"
+#line 7110 "Photo.c"
 				{
-					GeeHashMap* _tmp4_ = NULL;
+					GeeHashMap* _tmp4_;
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp4_ = self->priv->developments;
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7093 "Photo.c"
+#line 7117 "Photo.c"
 				}
 #line 873 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7097 "Photo.c"
+#line 7121 "Photo.c"
 			}
 #line 877 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
@@ -7125,11 +7149,11 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 			_tmp14_ = _tmp13_->filepath;
 #line 879 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp14_ != NULL) {
-#line 7129 "Photo.c"
+#line 7153 "Photo.c"
 				GFile* f = NULL;
-				BackingPhotoRow* _tmp15_ = NULL;
-				const gchar* _tmp16_ = NULL;
-				GFile* _tmp17_ = NULL;
+				BackingPhotoRow* _tmp15_;
+				const gchar* _tmp16_;
+				GFile* _tmp17_;
 #line 880 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = bpr;
 #line 880 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7138,45 +7162,45 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 				_tmp17_ = g_file_new_for_path (_tmp16_);
 #line 880 "/home/jens/Source/shotwell/src/Photo.vala"
 				f = _tmp17_;
-#line 7142 "Photo.c"
+#line 7166 "Photo.c"
 				{
-					RawDeveloper _tmp18_ = 0;
+					RawDeveloper _tmp18_;
 #line 882 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = d;
 #line 882 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp18_ == RAW_DEVELOPER_CAMERA) {
-#line 7149 "Photo.c"
-						GFile* _tmp19_ = NULL;
+#line 7173 "Photo.c"
+						GFile* _tmp19_;
 #line 883 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp19_ = f;
 #line 883 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_file_trash (_tmp19_, NULL, &_inner_error_);
 #line 883 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7157 "Photo.c"
-							goto __catch280_g_error;
+#line 7181 "Photo.c"
+							goto __catch281_g_error;
 						}
 					} else {
-						GFile* _tmp20_ = NULL;
+						GFile* _tmp20_;
 #line 885 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp20_ = f;
 #line 885 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_file_delete (_tmp20_, NULL, &_inner_error_);
 #line 885 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7168 "Photo.c"
-							goto __catch280_g_error;
+#line 7192 "Photo.c"
+							goto __catch281_g_error;
 						}
 					}
 				}
-				goto __finally280;
-				__catch280_g_error:
+				goto __finally281;
+				__catch281_g_error:
 				{
 					GError* e = NULL;
-					BackingPhotoRow* _tmp21_ = NULL;
-					const gchar* _tmp22_ = NULL;
-					GError* _tmp23_ = NULL;
-					const gchar* _tmp24_ = NULL;
+					BackingPhotoRow* _tmp21_;
+					const gchar* _tmp22_;
+					GError* _tmp23_;
+					const gchar* _tmp24_;
 #line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					e = _inner_error_;
 #line 881 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7193,12 +7217,12 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 					g_warning ("Photo.vala:887: Unable to delete RAW development: %s error: %s", _tmp22_, _tmp24_);
 #line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_error_free0 (e);
-#line 7197 "Photo.c"
+#line 7221 "Photo.c"
 				}
-				__finally280:
+				__finally281:
 #line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7202 "Photo.c"
+#line 7226 "Photo.c"
 					gboolean _tmp26_ = FALSE;
 #line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (f);
@@ -7208,14 +7232,14 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (f);
 #line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (bpr);
-#line 7212 "Photo.c"
+#line 7236 "Photo.c"
 					{
-						GeeHashMap* _tmp25_ = NULL;
+						GeeHashMap* _tmp25_;
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp25_ = self->priv->developments;
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7219 "Photo.c"
+#line 7243 "Photo.c"
 					}
 #line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7223,21 +7247,21 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 					g_clear_error (&_inner_error_);
 #line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					return _tmp26_;
-#line 7227 "Photo.c"
+#line 7251 "Photo.c"
 				}
 #line 879 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 7231 "Photo.c"
+#line 7255 "Photo.c"
 			}
 			{
-				PhotoTable* _tmp27_ = NULL;
-				PhotoTable* _tmp28_ = NULL;
-				PhotoRow* _tmp29_ = NULL;
-				RawDeveloper _tmp30_ = 0;
-				BackingPhotoTable* _tmp31_ = NULL;
-				BackingPhotoTable* _tmp32_ = NULL;
-				BackingPhotoRow* _tmp33_ = NULL;
-				BackingPhotoID _tmp34_ = {0};
+				PhotoTable* _tmp27_;
+				PhotoTable* _tmp28_;
+				PhotoRow* _tmp29_;
+				RawDeveloper _tmp30_;
+				BackingPhotoTable* _tmp31_;
+				BackingPhotoTable* _tmp32_;
+				BackingPhotoRow* _tmp33_;
+				BackingPhotoID _tmp34_;
 #line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = photo_table_get_instance ();
 #line 893 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7252,8 +7276,8 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 				_database_table_unref0 (_tmp28_);
 #line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7256 "Photo.c"
-					goto __catch281_g_error;
+#line 7280 "Photo.c"
+					goto __catch282_g_error;
 				}
 #line 894 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = backing_photo_table_get_instance ();
@@ -7269,16 +7293,16 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 				_database_table_unref0 (_tmp32_);
 #line 894 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7273 "Photo.c"
-					goto __catch281_g_error;
+#line 7297 "Photo.c"
+					goto __catch282_g_error;
 				}
 			}
-			goto __finally281;
-			__catch281_g_error:
+			goto __finally282;
+			__catch282_g_error:
 			{
 				GError* e = NULL;
-				GError* _tmp35_ = NULL;
-				const gchar* _tmp36_ = NULL;
+				GError* _tmp35_;
+				const gchar* _tmp36_;
 #line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				e = _inner_error_;
 #line 892 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7291,25 +7315,25 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 				g_warning ("Photo.vala:896: Database error while deleting RAW development: %s", _tmp36_);
 #line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 7295 "Photo.c"
+#line 7319 "Photo.c"
 			}
-			__finally281:
+			__finally282:
 #line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7300 "Photo.c"
+#line 7324 "Photo.c"
 				gboolean _tmp38_ = FALSE;
 #line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (bpr);
 #line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (bpr);
-#line 7306 "Photo.c"
+#line 7330 "Photo.c"
 				{
-					GeeHashMap* _tmp37_ = NULL;
+					GeeHashMap* _tmp37_;
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp37_ = self->priv->developments;
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7313 "Photo.c"
+#line 7337 "Photo.c"
 				}
 #line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7317,7 +7341,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 				g_clear_error (&_inner_error_);
 #line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				return _tmp38_;
-#line 7321 "Photo.c"
+#line 7345 "Photo.c"
 			}
 #line 899 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp39_ = self->priv->developments;
@@ -7329,20 +7353,20 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 			ret = _tmp41_;
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (bpr);
-#line 7333 "Photo.c"
+#line 7357 "Photo.c"
 		}
-		__finally279:
+		__finally280:
 		{
-			GeeHashMap* _tmp42_ = NULL;
+			GeeHashMap* _tmp42_;
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = self->priv->developments;
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7342 "Photo.c"
+#line 7366 "Photo.c"
 		}
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7346 "Photo.c"
+#line 7370 "Photo.c"
 			gboolean _tmp43_ = FALSE;
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7350,7 +7374,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 			g_clear_error (&_inner_error_);
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp43_;
-#line 7354 "Photo.c"
+#line 7378 "Photo.c"
 		}
 	}
 #line 902 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7359,7 +7383,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 	result = ret;
 #line 903 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 7363 "Photo.c"
+#line 7387 "Photo.c"
 }
 
 
@@ -7367,20 +7391,20 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) {
 	GError * _inner_error_ = NULL;
 #line 907 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 7371 "Photo.c"
+#line 7395 "Photo.c"
 	{
-		GeeHashMap* _tmp0_ = NULL;
+		GeeHashMap* _tmp0_;
 #line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->developments;
 #line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 7378 "Photo.c"
+#line 7402 "Photo.c"
 		{
-			RawDeveloper _tmp1_ = 0;
+			RawDeveloper _tmp1_;
 			RawDeveloper dev = 0;
-			RawDeveloper _tmp2_ = 0;
-			RawDeveloper _tmp3_ = 0;
-			RawDeveloper _tmp4_ = 0;
+			RawDeveloper _tmp2_;
+			RawDeveloper _tmp3_;
+			RawDeveloper _tmp4_;
 #line 909 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = d;
 #line 909 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7395,22 +7419,22 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) {
 			if (_tmp3_ == RAW_DEVELOPER_CAMERA) {
 #line 912 "/home/jens/Source/shotwell/src/Photo.vala"
 				dev = RAW_DEVELOPER_EMBEDDED;
-#line 7399 "Photo.c"
+#line 7423 "Photo.c"
 			}
 #line 914 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = dev;
 #line 914 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_raw_developer (self, _tmp4_);
-#line 7405 "Photo.c"
+#line 7429 "Photo.c"
 		}
-		__finally282:
+		__finally283:
 		{
-			GeeHashMap* _tmp5_ = NULL;
+			GeeHashMap* _tmp5_;
 #line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->developments;
 #line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7414 "Photo.c"
+#line 7438 "Photo.c"
 		}
 #line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -7420,60 +7444,60 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) {
 			g_clear_error (&_inner_error_);
 #line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 7424 "Photo.c"
+#line 7448 "Photo.c"
 		}
 	}
 }
 
 
-static void _vala_array_add85 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
+static void _vala_array_add85 (BackingFileState** * array, int* length, int* size, BackingFileState* value) {
 #line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7437 "Photo.c"
+#line 7461 "Photo.c"
 	}
 #line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 7443 "Photo.c"
+#line 7467 "Photo.c"
 }
 
 
-static void _vala_array_add86 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
+static void _vala_array_add86 (BackingFileState** * array, int* length, int* size, BackingFileState* value) {
 #line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7454 "Photo.c"
+#line 7478 "Photo.c"
 	}
 #line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 7460 "Photo.c"
+#line 7484 "Photo.c"
 }
 
 
-static void _vala_array_add87 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
+static void _vala_array_add87 (BackingFileState** * array, int* length, int* size, BackingFileState* value) {
 #line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7471 "Photo.c"
+#line 7495 "Photo.c"
 	}
 #line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 7477 "Photo.c"
+#line 7501 "Photo.c"
 }
 
 
@@ -7481,11 +7505,11 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 	Photo * self;
 	BackingFileState** result = NULL;
 	BackingFileState** backing = NULL;
-	BackingFileState** _tmp0_ = NULL;
-	gint backing_length1 = 0;
-	gint _backing_size_ = 0;
-	BackingFileState** _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
+	BackingFileState** _tmp0_;
+	gint backing_length1;
+	gint _backing_size_;
+	BackingFileState** _tmp27_;
+	gint _tmp27__length1;
 	GError * _inner_error_ = NULL;
 #line 918 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
@@ -7497,24 +7521,24 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 	backing_length1 = 0;
 #line 919 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_size_ = backing_length1;
-#line 7501 "Photo.c"
+#line 7525 "Photo.c"
 	{
-		PhotoRow* _tmp1_ = NULL;
+		PhotoRow* _tmp1_;
 #line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = self->row;
 #line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 7508 "Photo.c"
-		{
-			BackingFileState** _tmp2_ = NULL;
-			gint _tmp2__length1 = 0;
-			PhotoRow* _tmp3_ = NULL;
-			BackingPhotoRow* _tmp4_ = NULL;
-			PhotoRow* _tmp5_ = NULL;
-			const gchar* _tmp6_ = NULL;
-			BackingFileState* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
-			gboolean _tmp12_ = FALSE;
+#line 7532 "Photo.c"
+		{
+			BackingFileState** _tmp2_;
+			gint _tmp2__length1;
+			PhotoRow* _tmp3_;
+			BackingPhotoRow* _tmp4_;
+			PhotoRow* _tmp5_;
+			const gchar* _tmp6_;
+			BackingFileState* _tmp7_;
+			gboolean _tmp8_;
+			gboolean _tmp12_;
 #line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = backing;
 #line 921 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7535,11 +7559,11 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 			_tmp8_ = photo_has_editable (self);
 #line 922 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_) {
-#line 7539 "Photo.c"
-				BackingFileState** _tmp9_ = NULL;
-				gint _tmp9__length1 = 0;
-				BackingPhotoRow* _tmp10_ = NULL;
-				BackingFileState* _tmp11_ = NULL;
+#line 7563 "Photo.c"
+				BackingFileState** _tmp9_;
+				gint _tmp9__length1;
+				BackingPhotoRow* _tmp10_;
+				BackingFileState* _tmp11_;
 #line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = backing;
 #line 923 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7550,16 +7574,16 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 				_tmp11_ = backing_file_state_new_from_photo_row (_tmp10_, NULL);
 #line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_array_add86 (&backing, &backing_length1, &_backing_size_, _tmp11_);
-#line 7554 "Photo.c"
+#line 7578 "Photo.c"
 			}
 #line 925 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_is_developed (self);
 #line 925 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp12_) {
-#line 7560 "Photo.c"
+#line 7584 "Photo.c"
 				GeeCollection* dev_rows = NULL;
-				GeeCollection* _tmp13_ = NULL;
-				GeeCollection* _tmp14_ = NULL;
+				GeeCollection* _tmp13_;
+				GeeCollection* _tmp14_;
 #line 926 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = photo_get_raw_development_photo_rows (self);
 #line 926 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7568,11 +7592,11 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 				_tmp14_ = dev_rows;
 #line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp14_ != NULL) {
-#line 7572 "Photo.c"
+#line 7596 "Photo.c"
 					{
 						GeeIterator* _r_it = NULL;
-						GeeCollection* _tmp15_ = NULL;
-						GeeIterator* _tmp16_ = NULL;
+						GeeCollection* _tmp15_;
+						GeeIterator* _tmp16_;
 #line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp15_ = dev_rows;
 #line 928 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7581,18 +7605,18 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 						_r_it = _tmp16_;
 #line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 7585 "Photo.c"
-							GeeIterator* _tmp17_ = NULL;
-							gboolean _tmp18_ = FALSE;
+#line 7609 "Photo.c"
+							GeeIterator* _tmp17_;
+							gboolean _tmp18_;
 							BackingPhotoRow* r = NULL;
-							GeeIterator* _tmp19_ = NULL;
-							gpointer _tmp20_ = NULL;
-							BackingPhotoRow* _tmp21_ = NULL;
-							const gchar* _tmp22_ = NULL;
-							BackingFileState** _tmp23_ = NULL;
-							gint _tmp23__length1 = 0;
-							BackingPhotoRow* _tmp24_ = NULL;
-							BackingFileState* _tmp25_ = NULL;
+							GeeIterator* _tmp19_;
+							gpointer _tmp20_;
+							BackingPhotoRow* _tmp21_;
+							const gchar* _tmp22_;
+							BackingFileState** _tmp23_;
+							gint _tmp23__length1;
+							BackingPhotoRow* _tmp24_;
+							BackingFileState* _tmp25_;
 #line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp17_ = _r_it;
 #line 928 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7601,7 +7625,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 							if (!_tmp18_) {
 #line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 7605 "Photo.c"
+#line 7629 "Photo.c"
 							}
 #line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp19_ = _r_it;
@@ -7627,26 +7651,26 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 							_vala_array_add87 (&backing, &backing_length1, &_backing_size_, _tmp25_);
 #line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (r);
-#line 7631 "Photo.c"
+#line 7655 "Photo.c"
 						}
 #line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_r_it);
-#line 7635 "Photo.c"
+#line 7659 "Photo.c"
 					}
 				}
 #line 925 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (dev_rows);
-#line 7640 "Photo.c"
+#line 7664 "Photo.c"
 			}
 		}
-		__finally283:
+		__finally284:
 		{
-			PhotoRow* _tmp26_ = NULL;
+			PhotoRow* _tmp26_;
 #line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = self->row;
 #line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 7650 "Photo.c"
+#line 7674 "Photo.c"
 		}
 #line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -7658,7 +7682,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 			g_clear_error (&_inner_error_);
 #line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 7662 "Photo.c"
+#line 7686 "Photo.c"
 		}
 	}
 #line 936 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7669,19 +7693,19 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 	if (result_length1) {
 #line 936 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result_length1 = _tmp27__length1;
-#line 7673 "Photo.c"
+#line 7697 "Photo.c"
 	}
 #line 936 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp27_;
 #line 936 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 7679 "Photo.c"
+#line 7703 "Photo.c"
 }
 
 
 static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode mode) {
 	PhotoFileReader* result = NULL;
-	BackingFetchMode _tmp0_ = 0;
+	BackingFetchMode _tmp0_;
 #line 939 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 940 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7690,75 +7714,75 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
 	switch (_tmp0_) {
 #line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_MASTER:
-#line 7694 "Photo.c"
+#line 7718 "Photo.c"
 		{
-			PhotoFileReader* _tmp1_ = NULL;
+			PhotoFileReader* _tmp1_;
 #line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_get_master_reader (self);
 #line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
 #line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7703 "Photo.c"
+#line 7727 "Photo.c"
 		}
 #line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_BASELINE:
-#line 7707 "Photo.c"
+#line 7731 "Photo.c"
 		{
-			PhotoFileReader* _tmp2_ = NULL;
+			PhotoFileReader* _tmp2_;
 #line 945 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = photo_get_baseline_reader (self);
 #line 945 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
 #line 945 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7716 "Photo.c"
+#line 7740 "Photo.c"
 		}
 #line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_SOURCE:
-#line 7720 "Photo.c"
+#line 7744 "Photo.c"
 		{
-			PhotoFileReader* _tmp3_ = NULL;
+			PhotoFileReader* _tmp3_;
 #line 948 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = photo_get_source_reader (self);
 #line 948 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
 #line 948 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7729 "Photo.c"
+#line 7753 "Photo.c"
 		}
 #line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_UNMODIFIED:
-#line 7733 "Photo.c"
+#line 7757 "Photo.c"
 		{
-			PhotoFileFormat _tmp4_ = 0;
+			PhotoFileFormat _tmp4_;
 #line 951 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = photo_get_master_file_format (self);
 #line 951 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp4_ == PHOTO_FILE_FORMAT_RAW) {
-#line 7740 "Photo.c"
-				PhotoFileReader* _tmp5_ = NULL;
+#line 7764 "Photo.c"
+				PhotoFileReader* _tmp5_;
 #line 952 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = photo_get_raw_developer_reader (self);
 #line 952 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp5_;
 #line 952 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7748 "Photo.c"
+#line 7772 "Photo.c"
 			} else {
-				PhotoFileReader* _tmp6_ = NULL;
+				PhotoFileReader* _tmp6_;
 #line 954 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = photo_get_master_reader (self);
 #line 954 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp6_;
 #line 954 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7757 "Photo.c"
+#line 7781 "Photo.c"
 			}
 		}
 		default:
 		{
-			BackingFetchMode _tmp7_ = 0;
+			BackingFetchMode _tmp7_;
 			GEnumValue* _tmp8_;
 #line 957 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = mode;
@@ -7766,7 +7790,7 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
 			_tmp8_ = g_enum_get_value (g_type_class_ref (TYPE_BACKING_FETCH_MODE), _tmp7_);
 #line 957 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_error ("Photo.vala:957: Unknown backing fetch mode %s", (_tmp8_ != NULL) ? _tmp8_->value_name : NULL);
-#line 7770 "Photo.c"
+#line 7794 "Photo.c"
 		}
 	}
 }
@@ -7775,7 +7799,7 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
 static gpointer _photo_file_adapter_ref0 (gpointer self) {
 #line 963 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_file_adapter_ref (self) : NULL;
-#line 7779 "Photo.c"
+#line 7803 "Photo.c"
 }
 
 
@@ -7784,18 +7808,18 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 961 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7788 "Photo.c"
+#line 7812 "Photo.c"
 	{
-		PhotoBackingReaders* _tmp0_ = NULL;
+		PhotoBackingReaders* _tmp0_;
 #line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7795 "Photo.c"
+#line 7819 "Photo.c"
 		{
-			PhotoBackingReaders* _tmp1_ = NULL;
-			PhotoFileReader* _tmp2_ = NULL;
-			PhotoFileReader* _tmp3_ = NULL;
+			PhotoBackingReaders* _tmp1_;
+			PhotoFileReader* _tmp2_;
+			PhotoFileReader* _tmp3_;
 #line 963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
 #line 963 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7804,27 +7828,27 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) {
 			_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
 #line 963 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 7808 "Photo.c"
+#line 7832 "Photo.c"
 			{
-				PhotoBackingReaders* _tmp4_ = NULL;
+				PhotoBackingReaders* _tmp4_;
 #line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
 #line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7815 "Photo.c"
+#line 7839 "Photo.c"
 			}
 #line 963 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7819 "Photo.c"
+#line 7843 "Photo.c"
 		}
-		__finally284:
+		__finally285:
 		{
-			PhotoBackingReaders* _tmp5_ = NULL;
+			PhotoBackingReaders* _tmp5_;
 #line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
 #line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7828 "Photo.c"
+#line 7852 "Photo.c"
 		}
 #line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7832,7 +7856,7 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 7836 "Photo.c"
+#line 7860 "Photo.c"
 	}
 }
 
@@ -7842,18 +7866,18 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 967 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7846 "Photo.c"
+#line 7870 "Photo.c"
 	{
-		PhotoBackingReaders* _tmp0_ = NULL;
+		PhotoBackingReaders* _tmp0_;
 #line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7853 "Photo.c"
+#line 7877 "Photo.c"
 		{
-			PhotoBackingReaders* _tmp1_ = NULL;
-			PhotoFileReader* _tmp2_ = NULL;
-			PhotoFileReader* _tmp3_ = NULL;
+			PhotoBackingReaders* _tmp1_;
+			PhotoFileReader* _tmp2_;
+			PhotoFileReader* _tmp3_;
 #line 969 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
 #line 969 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7862,27 +7886,27 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) {
 			_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
 #line 969 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 7866 "Photo.c"
+#line 7890 "Photo.c"
 			{
-				PhotoBackingReaders* _tmp4_ = NULL;
+				PhotoBackingReaders* _tmp4_;
 #line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
 #line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7873 "Photo.c"
+#line 7897 "Photo.c"
 			}
 #line 969 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7877 "Photo.c"
+#line 7901 "Photo.c"
 		}
-		__finally285:
+		__finally286:
 		{
-			PhotoBackingReaders* _tmp5_ = NULL;
+			PhotoBackingReaders* _tmp5_;
 #line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
 #line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7886 "Photo.c"
+#line 7910 "Photo.c"
 		}
 #line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7890,7 +7914,7 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 7894 "Photo.c"
+#line 7918 "Photo.c"
 	}
 }
 
@@ -7900,32 +7924,32 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 974 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7904 "Photo.c"
+#line 7928 "Photo.c"
 	{
-		PhotoBackingReaders* _tmp0_ = NULL;
+		PhotoBackingReaders* _tmp0_;
 #line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7911 "Photo.c"
-		{
-			PhotoBackingReaders* _tmp1_ = NULL;
-			PhotoFileReader* _tmp2_ = NULL;
-			PhotoBackingReaders* _tmp7_ = NULL;
-			PhotoFileReader* _tmp8_ = NULL;
-			PhotoBackingReaders* _tmp13_ = NULL;
-			PhotoFileReader* _tmp14_ = NULL;
-			PhotoFileReader* _tmp15_ = NULL;
+#line 7935 "Photo.c"
+		{
+			PhotoBackingReaders* _tmp1_;
+			PhotoFileReader* _tmp2_;
+			PhotoBackingReaders* _tmp7_;
+			PhotoFileReader* _tmp8_;
+			PhotoBackingReaders* _tmp13_;
+			PhotoFileReader* _tmp14_;
+			PhotoFileReader* _tmp15_;
 #line 976 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
 #line 976 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
 #line 976 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 7926 "Photo.c"
-				PhotoBackingReaders* _tmp3_ = NULL;
-				PhotoFileReader* _tmp4_ = NULL;
-				PhotoFileReader* _tmp5_ = NULL;
+#line 7950 "Photo.c"
+				PhotoBackingReaders* _tmp3_;
+				PhotoFileReader* _tmp4_;
+				PhotoFileReader* _tmp5_;
 #line 977 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
 #line 977 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7934,18 +7958,18 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 				_tmp5_ = _photo_file_adapter_ref0 (_tmp4_);
 #line 977 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp5_;
-#line 7938 "Photo.c"
+#line 7962 "Photo.c"
 				{
-					PhotoBackingReaders* _tmp6_ = NULL;
+					PhotoBackingReaders* _tmp6_;
 #line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->priv->readers;
 #line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7945 "Photo.c"
+#line 7969 "Photo.c"
 				}
 #line 977 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7949 "Photo.c"
+#line 7973 "Photo.c"
 			}
 #line 979 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->readers;
@@ -7953,10 +7977,10 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 			_tmp8_ = _tmp7_->developer;
 #line 979 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_ != NULL) {
-#line 7957 "Photo.c"
-				PhotoBackingReaders* _tmp9_ = NULL;
-				PhotoFileReader* _tmp10_ = NULL;
-				PhotoFileReader* _tmp11_ = NULL;
+#line 7981 "Photo.c"
+				PhotoBackingReaders* _tmp9_;
+				PhotoFileReader* _tmp10_;
+				PhotoFileReader* _tmp11_;
 #line 980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->priv->readers;
 #line 980 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7965,18 +7989,18 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 				_tmp11_ = _photo_file_adapter_ref0 (_tmp10_);
 #line 980 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp11_;
-#line 7969 "Photo.c"
+#line 7993 "Photo.c"
 				{
-					PhotoBackingReaders* _tmp12_ = NULL;
+					PhotoBackingReaders* _tmp12_;
 #line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = self->priv->readers;
 #line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7976 "Photo.c"
+#line 8000 "Photo.c"
 				}
 #line 980 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7980 "Photo.c"
+#line 8004 "Photo.c"
 			}
 #line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->priv->readers;
@@ -7986,27 +8010,27 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 			_tmp15_ = _photo_file_adapter_ref0 (_tmp14_);
 #line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp15_;
-#line 7990 "Photo.c"
+#line 8014 "Photo.c"
 			{
-				PhotoBackingReaders* _tmp16_ = NULL;
+				PhotoBackingReaders* _tmp16_;
 #line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->readers;
 #line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7997 "Photo.c"
+#line 8021 "Photo.c"
 			}
 #line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8001 "Photo.c"
+#line 8025 "Photo.c"
 		}
-		__finally286:
+		__finally287:
 		{
-			PhotoBackingReaders* _tmp17_ = NULL;
+			PhotoBackingReaders* _tmp17_;
 #line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->priv->readers;
 #line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8010 "Photo.c"
+#line 8034 "Photo.c"
 		}
 #line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8014,7 +8038,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8018 "Photo.c"
+#line 8042 "Photo.c"
 	}
 }
 
@@ -8024,32 +8048,32 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8028 "Photo.c"
+#line 8052 "Photo.c"
 	{
-		PhotoBackingReaders* _tmp0_ = NULL;
+		PhotoBackingReaders* _tmp0_;
 #line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8035 "Photo.c"
-		{
-			PhotoBackingReaders* _tmp1_ = NULL;
-			PhotoFileReader* _tmp2_ = NULL;
-			PhotoBackingReaders* _tmp7_ = NULL;
-			PhotoFileReader* _tmp8_ = NULL;
-			PhotoBackingReaders* _tmp13_ = NULL;
-			PhotoFileReader* _tmp14_ = NULL;
-			PhotoFileReader* _tmp15_ = NULL;
+#line 8059 "Photo.c"
+		{
+			PhotoBackingReaders* _tmp1_;
+			PhotoFileReader* _tmp2_;
+			PhotoBackingReaders* _tmp7_;
+			PhotoFileReader* _tmp8_;
+			PhotoBackingReaders* _tmp13_;
+			PhotoFileReader* _tmp14_;
+			PhotoFileReader* _tmp15_;
 #line 989 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
 #line 989 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
 #line 989 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8050 "Photo.c"
-				PhotoBackingReaders* _tmp3_ = NULL;
-				PhotoFileReader* _tmp4_ = NULL;
-				PhotoFileReader* _tmp5_ = NULL;
+#line 8074 "Photo.c"
+				PhotoBackingReaders* _tmp3_;
+				PhotoFileReader* _tmp4_;
+				PhotoFileReader* _tmp5_;
 #line 990 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
 #line 990 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8058,18 +8082,18 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 				_tmp5_ = _photo_file_adapter_ref0 (_tmp4_);
 #line 990 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp5_;
-#line 8062 "Photo.c"
+#line 8086 "Photo.c"
 				{
-					PhotoBackingReaders* _tmp6_ = NULL;
+					PhotoBackingReaders* _tmp6_;
 #line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->priv->readers;
 #line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8069 "Photo.c"
+#line 8093 "Photo.c"
 				}
 #line 990 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8073 "Photo.c"
+#line 8097 "Photo.c"
 			}
 #line 992 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->readers;
@@ -8077,10 +8101,10 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 			_tmp8_ = _tmp7_->developer;
 #line 992 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_ != NULL) {
-#line 8081 "Photo.c"
-				PhotoBackingReaders* _tmp9_ = NULL;
-				PhotoFileReader* _tmp10_ = NULL;
-				PhotoFileReader* _tmp11_ = NULL;
+#line 8105 "Photo.c"
+				PhotoBackingReaders* _tmp9_;
+				PhotoFileReader* _tmp10_;
+				PhotoFileReader* _tmp11_;
 #line 993 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->priv->readers;
 #line 993 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8089,18 +8113,18 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 				_tmp11_ = _photo_file_adapter_ref0 (_tmp10_);
 #line 993 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp11_;
-#line 8093 "Photo.c"
+#line 8117 "Photo.c"
 				{
-					PhotoBackingReaders* _tmp12_ = NULL;
+					PhotoBackingReaders* _tmp12_;
 #line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = self->priv->readers;
 #line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8100 "Photo.c"
+#line 8124 "Photo.c"
 				}
 #line 993 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8104 "Photo.c"
+#line 8128 "Photo.c"
 			}
 #line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->priv->readers;
@@ -8110,27 +8134,27 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 			_tmp15_ = _photo_file_adapter_ref0 (_tmp14_);
 #line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp15_;
-#line 8114 "Photo.c"
+#line 8138 "Photo.c"
 			{
-				PhotoBackingReaders* _tmp16_ = NULL;
+				PhotoBackingReaders* _tmp16_;
 #line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->readers;
 #line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8121 "Photo.c"
+#line 8145 "Photo.c"
 			}
 #line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8125 "Photo.c"
+#line 8149 "Photo.c"
 		}
-		__finally287:
+		__finally288:
 		{
-			PhotoBackingReaders* _tmp17_ = NULL;
+			PhotoBackingReaders* _tmp17_;
 #line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->priv->readers;
 #line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8134 "Photo.c"
+#line 8158 "Photo.c"
 		}
 #line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8138,7 +8162,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8142 "Photo.c"
+#line 8166 "Photo.c"
 	}
 }
 
@@ -8148,18 +8172,18 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8152 "Photo.c"
+#line 8176 "Photo.c"
 	{
-		PhotoBackingReaders* _tmp0_ = NULL;
+		PhotoBackingReaders* _tmp0_;
 #line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8159 "Photo.c"
+#line 8183 "Photo.c"
 		{
-			PhotoBackingReaders* _tmp1_ = NULL;
-			PhotoFileReader* _tmp2_ = NULL;
-			PhotoFileReader* _tmp3_ = NULL;
+			PhotoBackingReaders* _tmp1_;
+			PhotoFileReader* _tmp2_;
+			PhotoFileReader* _tmp3_;
 #line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
 #line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8168,27 +8192,27 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) {
 			_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
 #line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 8172 "Photo.c"
+#line 8196 "Photo.c"
 			{
-				PhotoBackingReaders* _tmp4_ = NULL;
+				PhotoBackingReaders* _tmp4_;
 #line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
 #line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8179 "Photo.c"
+#line 8203 "Photo.c"
 			}
 #line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8183 "Photo.c"
+#line 8207 "Photo.c"
 		}
-		__finally288:
+		__finally289:
 		{
-			PhotoBackingReaders* _tmp5_ = NULL;
+			PhotoBackingReaders* _tmp5_;
 #line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
 #line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8192 "Photo.c"
+#line 8216 "Photo.c"
 		}
 #line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8196,7 +8220,7 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8200 "Photo.c"
+#line 8224 "Photo.c"
 	}
 }
 
@@ -8206,45 +8230,45 @@ gboolean photo_is_developed (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8210 "Photo.c"
+#line 8234 "Photo.c"
 	{
-		PhotoBackingReaders* _tmp0_ = NULL;
+		PhotoBackingReaders* _tmp0_;
 		gboolean _tmp5_ = FALSE;
 #line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8218 "Photo.c"
+#line 8242 "Photo.c"
 		{
-			PhotoBackingReaders* _tmp1_ = NULL;
-			PhotoFileReader* _tmp2_ = NULL;
+			PhotoBackingReaders* _tmp1_;
+			PhotoFileReader* _tmp2_;
 #line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
 #line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->developer;
 #line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8228 "Photo.c"
+#line 8252 "Photo.c"
 			{
-				PhotoBackingReaders* _tmp3_ = NULL;
+				PhotoBackingReaders* _tmp3_;
 #line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
 #line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8235 "Photo.c"
+#line 8259 "Photo.c"
 			}
 #line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8239 "Photo.c"
+#line 8263 "Photo.c"
 		}
-		__finally289:
+		__finally290:
 		{
-			PhotoBackingReaders* _tmp4_ = NULL;
+			PhotoBackingReaders* _tmp4_;
 #line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
 #line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8248 "Photo.c"
+#line 8272 "Photo.c"
 		}
 #line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8252,7 +8276,7 @@ gboolean photo_is_developed (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 8256 "Photo.c"
+#line 8280 "Photo.c"
 	}
 }
 
@@ -8262,45 +8286,45 @@ gboolean photo_has_editable (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8266 "Photo.c"
+#line 8290 "Photo.c"
 	{
-		PhotoBackingReaders* _tmp0_ = NULL;
+		PhotoBackingReaders* _tmp0_;
 		gboolean _tmp5_ = FALSE;
 #line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8274 "Photo.c"
+#line 8298 "Photo.c"
 		{
-			PhotoBackingReaders* _tmp1_ = NULL;
-			PhotoFileReader* _tmp2_ = NULL;
+			PhotoBackingReaders* _tmp1_;
+			PhotoFileReader* _tmp2_;
 #line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
 #line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
 #line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8284 "Photo.c"
+#line 8308 "Photo.c"
 			{
-				PhotoBackingReaders* _tmp3_ = NULL;
+				PhotoBackingReaders* _tmp3_;
 #line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
 #line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8291 "Photo.c"
+#line 8315 "Photo.c"
 			}
 #line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8295 "Photo.c"
+#line 8319 "Photo.c"
 		}
-		__finally290:
+		__finally291:
 		{
-			PhotoBackingReaders* _tmp4_ = NULL;
+			PhotoBackingReaders* _tmp4_;
 #line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
 #line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8304 "Photo.c"
+#line 8328 "Photo.c"
 		}
 #line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8308,7 +8332,7 @@ gboolean photo_has_editable (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 8312 "Photo.c"
+#line 8336 "Photo.c"
 	}
 }
 
@@ -8318,19 +8342,19 @@ gboolean photo_does_master_exist (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8322 "Photo.c"
+#line 8346 "Photo.c"
 	{
-		PhotoBackingReaders* _tmp0_ = NULL;
+		PhotoBackingReaders* _tmp0_;
 		gboolean _tmp6_ = FALSE;
 #line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8330 "Photo.c"
+#line 8354 "Photo.c"
 		{
-			PhotoBackingReaders* _tmp1_ = NULL;
-			PhotoFileReader* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			PhotoBackingReaders* _tmp1_;
+			PhotoFileReader* _tmp2_;
+			gboolean _tmp3_;
 #line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
 #line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8339,27 +8363,27 @@ gboolean photo_does_master_exist (Photo* self) {
 			_tmp3_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 8343 "Photo.c"
+#line 8367 "Photo.c"
 			{
-				PhotoBackingReaders* _tmp4_ = NULL;
+				PhotoBackingReaders* _tmp4_;
 #line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
 #line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8350 "Photo.c"
+#line 8374 "Photo.c"
 			}
 #line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8354 "Photo.c"
+#line 8378 "Photo.c"
 		}
-		__finally291:
+		__finally292:
 		{
-			PhotoBackingReaders* _tmp5_ = NULL;
+			PhotoBackingReaders* _tmp5_;
 #line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
 #line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8363 "Photo.c"
+#line 8387 "Photo.c"
 		}
 #line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8367,7 +8391,7 @@ gboolean photo_does_master_exist (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp6_;
-#line 8371 "Photo.c"
+#line 8395 "Photo.c"
 	}
 }
 
@@ -8377,29 +8401,29 @@ gboolean photo_does_editable_exist (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8381 "Photo.c"
+#line 8405 "Photo.c"
 	{
-		PhotoBackingReaders* _tmp0_ = NULL;
+		PhotoBackingReaders* _tmp0_;
 		gboolean _tmp9_ = FALSE;
 #line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8389 "Photo.c"
+#line 8413 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
-			PhotoBackingReaders* _tmp2_ = NULL;
-			PhotoFileReader* _tmp3_ = NULL;
+			PhotoBackingReaders* _tmp2_;
+			PhotoFileReader* _tmp3_;
 #line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->readers;
 #line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->editable;
 #line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 8400 "Photo.c"
-				PhotoBackingReaders* _tmp4_ = NULL;
-				PhotoFileReader* _tmp5_ = NULL;
-				gboolean _tmp6_ = FALSE;
+#line 8424 "Photo.c"
+				PhotoBackingReaders* _tmp4_;
+				PhotoFileReader* _tmp5_;
+				gboolean _tmp6_;
 #line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
 #line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8408,35 +8432,35 @@ gboolean photo_does_editable_exist (Photo* self) {
 				_tmp6_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp6_;
-#line 8412 "Photo.c"
+#line 8436 "Photo.c"
 			} else {
 #line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 8416 "Photo.c"
+#line 8440 "Photo.c"
 			}
 #line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8420 "Photo.c"
+#line 8444 "Photo.c"
 			{
-				PhotoBackingReaders* _tmp7_ = NULL;
+				PhotoBackingReaders* _tmp7_;
 #line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->priv->readers;
 #line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8427 "Photo.c"
+#line 8451 "Photo.c"
 			}
 #line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8431 "Photo.c"
+#line 8455 "Photo.c"
 		}
-		__finally292:
+		__finally293:
 		{
-			PhotoBackingReaders* _tmp8_ = NULL;
+			PhotoBackingReaders* _tmp8_;
 #line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = self->priv->readers;
 #line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8440 "Photo.c"
+#line 8464 "Photo.c"
 		}
 #line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8444,7 +8468,7 @@ gboolean photo_does_editable_exist (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp9_;
-#line 8448 "Photo.c"
+#line 8472 "Photo.c"
 	}
 }
 
@@ -8454,45 +8478,45 @@ gboolean photo_is_master_baseline (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8458 "Photo.c"
+#line 8482 "Photo.c"
 	{
-		PhotoBackingReaders* _tmp0_ = NULL;
+		PhotoBackingReaders* _tmp0_;
 		gboolean _tmp5_ = FALSE;
 #line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8466 "Photo.c"
+#line 8490 "Photo.c"
 		{
-			PhotoBackingReaders* _tmp1_ = NULL;
-			PhotoFileReader* _tmp2_ = NULL;
+			PhotoBackingReaders* _tmp1_;
+			PhotoFileReader* _tmp2_;
 #line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
 #line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
 #line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ == NULL;
-#line 8476 "Photo.c"
+#line 8500 "Photo.c"
 			{
-				PhotoBackingReaders* _tmp3_ = NULL;
+				PhotoBackingReaders* _tmp3_;
 #line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
 #line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8483 "Photo.c"
+#line 8507 "Photo.c"
 			}
 #line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8487 "Photo.c"
+#line 8511 "Photo.c"
 		}
-		__finally293:
+		__finally294:
 		{
-			PhotoBackingReaders* _tmp4_ = NULL;
+			PhotoBackingReaders* _tmp4_;
 #line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
 #line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8496 "Photo.c"
+#line 8520 "Photo.c"
 		}
 #line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8500,14 +8524,14 @@ gboolean photo_is_master_baseline (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 8504 "Photo.c"
+#line 8528 "Photo.c"
 	}
 }
 
 
 gboolean photo_is_master_source (Photo* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1037 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8516,7 +8540,7 @@ gboolean photo_is_master_source (Photo* self) {
 	result = !_tmp0_;
 #line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8520 "Photo.c"
+#line 8544 "Photo.c"
 }
 
 
@@ -8525,45 +8549,45 @@ gboolean photo_is_editable_baseline (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8529 "Photo.c"
+#line 8553 "Photo.c"
 	{
-		PhotoBackingReaders* _tmp0_ = NULL;
+		PhotoBackingReaders* _tmp0_;
 		gboolean _tmp5_ = FALSE;
 #line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8537 "Photo.c"
+#line 8561 "Photo.c"
 		{
-			PhotoBackingReaders* _tmp1_ = NULL;
-			PhotoFileReader* _tmp2_ = NULL;
+			PhotoBackingReaders* _tmp1_;
+			PhotoFileReader* _tmp2_;
 #line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
 #line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
 #line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8547 "Photo.c"
+#line 8571 "Photo.c"
 			{
-				PhotoBackingReaders* _tmp3_ = NULL;
+				PhotoBackingReaders* _tmp3_;
 #line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
 #line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8554 "Photo.c"
+#line 8578 "Photo.c"
 			}
 #line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8558 "Photo.c"
+#line 8582 "Photo.c"
 		}
-		__finally294:
+		__finally295:
 		{
-			PhotoBackingReaders* _tmp4_ = NULL;
+			PhotoBackingReaders* _tmp4_;
 #line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
 #line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8567 "Photo.c"
+#line 8591 "Photo.c"
 		}
 #line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8571,14 +8595,14 @@ gboolean photo_is_editable_baseline (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 8575 "Photo.c"
+#line 8599 "Photo.c"
 	}
 }
 
 
 gboolean photo_is_editable_source (Photo* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1047 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 1048 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8587,7 +8611,7 @@ gboolean photo_is_editable_source (Photo* self) {
 	result = _tmp0_;
 #line 1048 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8591 "Photo.c"
+#line 8615 "Photo.c"
 }
 
 
@@ -8596,18 +8620,18 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8600 "Photo.c"
+#line 8624 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8607 "Photo.c"
+#line 8631 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			BackingPhotoRow* _tmp2_ = NULL;
-			BackingPhotoRow* _tmp3_ = NULL;
+			PhotoRow* _tmp1_;
+			BackingPhotoRow* _tmp2_;
+			BackingPhotoRow* _tmp3_;
 #line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8616,27 +8640,27 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) {
 			_tmp3_ = _backing_photo_row_ref0 (_tmp2_);
 #line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 8620 "Photo.c"
+#line 8644 "Photo.c"
 			{
-				PhotoRow* _tmp4_ = NULL;
+				PhotoRow* _tmp4_;
 #line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8627 "Photo.c"
+#line 8651 "Photo.c"
 			}
 #line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8631 "Photo.c"
+#line 8655 "Photo.c"
 		}
-		__finally295:
+		__finally296:
 		{
-			PhotoRow* _tmp5_ = NULL;
+			PhotoRow* _tmp5_;
 #line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8640 "Photo.c"
+#line 8664 "Photo.c"
 		}
 #line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8644,7 +8668,7 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8648 "Photo.c"
+#line 8672 "Photo.c"
 	}
 }
 
@@ -8654,69 +8678,69 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8658 "Photo.c"
+#line 8682 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8665 "Photo.c"
+#line 8689 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			gboolean _tmp2_ = FALSE;
+			PhotoRow* _tmp1_;
+			gboolean _tmp2_;
 #line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = backing_photo_id_is_valid (&_tmp1_->editable_id);
 #line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_) {
-#line 8675 "Photo.c"
-				BackingPhotoRow* _tmp3_ = NULL;
-				BackingPhotoRow* _tmp4_ = NULL;
+#line 8699 "Photo.c"
+				BackingPhotoRow* _tmp3_;
+				BackingPhotoRow* _tmp4_;
 #line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->editable;
 #line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _backing_photo_row_ref0 (_tmp3_);
 #line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp4_;
-#line 8684 "Photo.c"
+#line 8708 "Photo.c"
 				{
-					PhotoRow* _tmp5_ = NULL;
+					PhotoRow* _tmp5_;
 #line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp5_ = self->row;
 #line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8691 "Photo.c"
+#line 8715 "Photo.c"
 				}
 #line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8695 "Photo.c"
+#line 8719 "Photo.c"
 			} else {
 #line 1063 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = NULL;
-#line 8699 "Photo.c"
+#line 8723 "Photo.c"
 				{
-					PhotoRow* _tmp6_ = NULL;
+					PhotoRow* _tmp6_;
 #line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->row;
 #line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8706 "Photo.c"
+#line 8730 "Photo.c"
 				}
 #line 1063 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8710 "Photo.c"
+#line 8734 "Photo.c"
 			}
 		}
-		__finally296:
+		__finally297:
 		{
-			PhotoRow* _tmp7_ = NULL;
+			PhotoRow* _tmp7_;
 #line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
 #line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8720 "Photo.c"
+#line 8744 "Photo.c"
 		}
 #line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8724,7 +8748,7 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8728 "Photo.c"
+#line 8752 "Photo.c"
 	}
 }
 
@@ -8734,25 +8758,25 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8738 "Photo.c"
+#line 8762 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8745 "Photo.c"
+#line 8769 "Photo.c"
 		{
 			GeeCollection* _tmp1_ = NULL;
-			GeeHashMap* _tmp2_ = NULL;
+			GeeHashMap* _tmp2_;
 #line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->developments;
 #line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8753 "Photo.c"
-				GeeHashMap* _tmp3_ = NULL;
-				GeeCollection* _tmp4_ = NULL;
-				GeeCollection* _tmp5_ = NULL;
+#line 8777 "Photo.c"
+				GeeHashMap* _tmp3_;
+				GeeCollection* _tmp4_;
+				GeeCollection* _tmp5_;
 #line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->developments;
 #line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8763,37 +8787,37 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) {
 				_g_object_unref0 (_tmp1_);
 #line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp5_;
-#line 8767 "Photo.c"
+#line 8791 "Photo.c"
 			} else {
 #line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp1_);
 #line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = NULL;
-#line 8773 "Photo.c"
+#line 8797 "Photo.c"
 			}
 #line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8777 "Photo.c"
+#line 8801 "Photo.c"
 			{
-				PhotoRow* _tmp6_ = NULL;
+				PhotoRow* _tmp6_;
 #line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
 #line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8784 "Photo.c"
+#line 8808 "Photo.c"
 			}
 #line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8788 "Photo.c"
+#line 8812 "Photo.c"
 		}
-		__finally297:
+		__finally298:
 		{
-			PhotoRow* _tmp7_ = NULL;
+			PhotoRow* _tmp7_;
 #line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
 #line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8797 "Photo.c"
+#line 8821 "Photo.c"
 		}
 #line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8801,7 +8825,7 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8805 "Photo.c"
+#line 8829 "Photo.c"
 	}
 }
 
@@ -8811,25 +8835,25 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper
 	GError * _inner_error_ = NULL;
 #line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8815 "Photo.c"
+#line 8839 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8822 "Photo.c"
+#line 8846 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
-			GeeHashMap* _tmp2_ = NULL;
+			GeeHashMap* _tmp2_;
 #line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->developments;
 #line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8830 "Photo.c"
-				GeeHashMap* _tmp3_ = NULL;
-				RawDeveloper _tmp4_ = 0;
-				gpointer _tmp5_ = NULL;
+#line 8854 "Photo.c"
+				GeeHashMap* _tmp3_;
+				RawDeveloper _tmp4_;
+				gpointer _tmp5_;
 #line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->developments;
 #line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8840,37 +8864,37 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper
 				_backing_photo_row_unref0 (_tmp1_);
 #line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = (BackingPhotoRow*) _tmp5_;
-#line 8844 "Photo.c"
+#line 8868 "Photo.c"
 			} else {
 #line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp1_);
 #line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = NULL;
-#line 8850 "Photo.c"
+#line 8874 "Photo.c"
 			}
 #line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8854 "Photo.c"
+#line 8878 "Photo.c"
 			{
-				PhotoRow* _tmp6_ = NULL;
+				PhotoRow* _tmp6_;
 #line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
 #line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8861 "Photo.c"
+#line 8885 "Photo.c"
 			}
 #line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8865 "Photo.c"
+#line 8889 "Photo.c"
 		}
-		__finally298:
+		__finally299:
 		{
-			PhotoRow* _tmp7_ = NULL;
+			PhotoRow* _tmp7_;
 #line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
 #line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8874 "Photo.c"
+#line 8898 "Photo.c"
 		}
 #line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8878,7 +8902,7 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper
 		g_clear_error (&_inner_error_);
 #line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8882 "Photo.c"
+#line 8906 "Photo.c"
 	}
 }
 
@@ -8891,25 +8915,25 @@ static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self) {
 	memcpy (dup, self, sizeof (PhotoFileFormat));
 #line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	return dup;
-#line 8895 "Photo.c"
+#line 8919 "Photo.c"
 }
 
 
 static gpointer __photo_file_format_dup0 (gpointer self) {
 #line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? _photo_file_format_dup (self) : NULL;
-#line 8902 "Photo.c"
+#line 8926 "Photo.c"
 }
 
 
 PhotoFileFormat* photo_get_editable_file_format (Photo* self) {
 	PhotoFileFormat* result = NULL;
 	PhotoFileReader* reader = NULL;
-	PhotoFileReader* _tmp0_ = NULL;
-	PhotoFileReader* _tmp1_ = NULL;
-	PhotoFileReader* _tmp2_ = NULL;
-	PhotoFileFormat _tmp3_ = 0;
-	PhotoFileFormat* _tmp4_ = NULL;
+	PhotoFileReader* _tmp0_;
+	PhotoFileReader* _tmp1_;
+	PhotoFileReader* _tmp2_;
+	PhotoFileFormat _tmp3_;
+	PhotoFileFormat* _tmp4_;
 #line 1079 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 1080 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8926,7 +8950,7 @@ PhotoFileFormat* photo_get_editable_file_format (Photo* self) {
 		_photo_file_adapter_unref0 (reader);
 #line 1082 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 8930 "Photo.c"
+#line 8954 "Photo.c"
 	}
 #line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
@@ -8940,16 +8964,16 @@ PhotoFileFormat* photo_get_editable_file_format (Photo* self) {
 	_photo_file_adapter_unref0 (reader);
 #line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8944 "Photo.c"
+#line 8968 "Photo.c"
 }
 
 
 PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportFormatParameters* params) {
 	PhotoFileFormat result = 0;
 	PhotoFileFormat _result_ = 0;
-	PhotoFileFormat _tmp0_ = 0;
-	ExportFormatParameters _tmp1_ = {0};
-	ExportFormatMode _tmp2_ = 0;
+	PhotoFileFormat _tmp0_;
+	ExportFormatParameters _tmp1_;
+	ExportFormatMode _tmp2_;
 #line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
 #line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8966,36 +8990,36 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma
 	switch (_tmp2_) {
 #line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 8970 "Photo.c"
+#line 8994 "Photo.c"
 		{
-			PhotoFileFormat _tmp3_ = 0;
+			PhotoFileFormat _tmp3_;
 #line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = photo_get_master_file_format (self);
 #line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
 			_result_ = _tmp3_;
 #line 1094 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 8979 "Photo.c"
+#line 9003 "Photo.c"
 		}
 #line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_CURRENT:
-#line 8983 "Photo.c"
+#line 9007 "Photo.c"
 		{
-			PhotoFileFormat _tmp4_ = 0;
+			PhotoFileFormat _tmp4_;
 #line 1097 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = photo_get_best_export_file_format (self);
 #line 1097 "/home/jens/Source/shotwell/src/Photo.vala"
 			_result_ = _tmp4_;
 #line 1098 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 8992 "Photo.c"
+#line 9016 "Photo.c"
 		}
 #line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 8996 "Photo.c"
+#line 9020 "Photo.c"
 		{
-			ExportFormatParameters _tmp5_ = {0};
-			PhotoFileFormat _tmp6_ = 0;
+			ExportFormatParameters _tmp5_;
+			PhotoFileFormat _tmp6_;
 #line 1101 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = *params;
 #line 1101 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9004,30 +9028,30 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma
 			_result_ = _tmp6_;
 #line 1102 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 9008 "Photo.c"
+#line 9032 "Photo.c"
 		}
 		default:
 		{
 #line 1105 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_error ("Photo.vala:1105: get_export_format_for_parameters: unsupported export " \
 "format mode");
-#line 9014 "Photo.c"
+#line 9038 "Photo.c"
 		}
 	}
 #line 1108 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _result_;
 #line 1108 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 9021 "Photo.c"
+#line 9045 "Photo.c"
 }
 
 
 gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParameters* params) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	ExportFormatParameters _tmp0_ = {0};
-	ExportFormatMode _tmp1_ = 0;
-	const gchar* _tmp8_ = NULL;
+	ExportFormatParameters _tmp0_;
+	ExportFormatMode _tmp1_;
+	const gchar* _tmp8_;
 #line 1111 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 1111 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9042,11 +9066,11 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
 	switch (_tmp1_) {
 #line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 9045 "Photo.c"
+#line 9069 "Photo.c"
 		{
-			GFile* _tmp2_ = NULL;
-			GFile* _tmp3_ = NULL;
-			gchar* _tmp4_ = NULL;
+			GFile* _tmp2_;
+			GFile* _tmp3_;
+			gchar* _tmp4_;
 #line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9061,17 +9085,17 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
 			_g_object_unref0 (_tmp3_);
 #line 1117 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 9064 "Photo.c"
+#line 9088 "Photo.c"
 		}
 #line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_CURRENT:
 #line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 9070 "Photo.c"
+#line 9094 "Photo.c"
 		{
-			ExportFormatParameters _tmp5_ = {0};
-			PhotoFileFormat _tmp6_ = 0;
-			gchar* _tmp7_ = NULL;
+			ExportFormatParameters _tmp5_;
+			PhotoFileFormat _tmp6_;
+			gchar* _tmp7_;
 #line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = *params;
 #line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9084,14 +9108,14 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
 			_g_free0 (_result_);
 #line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 9087 "Photo.c"
+#line 9111 "Photo.c"
 		}
 		default:
 		{
 #line 1124 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_error ("Photo.vala:1124: get_export_basename_for_parameters: unsupported expor" \
 "t format mode");
-#line 9093 "Photo.c"
+#line 9117 "Photo.c"
 		}
 	}
 #line 1127 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9102,134 +9126,134 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
 	result = _result_;
 #line 1128 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 9104 "Photo.c"
+#line 9128 "Photo.c"
 }
 
 
 ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	ImportResult result = 0;
 	GFile* file = NULL;
-	PhotoImportParams* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	PhotoImportParams* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
 	GFileInfo* info = NULL;
-	GFileInfo* _tmp7_ = NULL;
-	GFileType _tmp8_ = 0;
-	GFile* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	GFile* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
+	GFileInfo* _tmp7_;
+	GFileType _tmp8_;
+	GFile* _tmp9_;
+	gboolean _tmp10_;
+	GFile* _tmp14_;
+	gboolean _tmp15_;
 	GTimeVal timestamp = {0};
-	GFileInfo* _tmp19_ = NULL;
+	GFileInfo* _tmp19_;
 	GTimeVal _tmp20_ = {0};
 	gboolean _tmp21_ = FALSE;
 	gboolean _tmp22_ = FALSE;
-	PhotoImportParams* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
+	PhotoImportParams* _tmp23_;
+	const gchar* _tmp24_;
 	PhotoFileInterrogator* interrogator = NULL;
-	GFile* _tmp32_ = NULL;
-	PhotoImportParams* _tmp33_ = NULL;
-	PhotoFileSnifferOptions _tmp34_ = 0;
-	PhotoFileInterrogator* _tmp35_ = NULL;
-	PhotoFileInterrogator* _tmp42_ = NULL;
-	gboolean _tmp43_ = FALSE;
+	GFile* _tmp32_;
+	PhotoImportParams* _tmp33_;
+	PhotoFileSnifferOptions _tmp34_;
+	PhotoFileInterrogator* _tmp35_;
+	PhotoFileInterrogator* _tmp42_;
+	gboolean _tmp43_;
 	DetectedPhotoInformation* detected = NULL;
-	PhotoFileInterrogator* _tmp44_ = NULL;
-	DetectedPhotoInformation* _tmp45_ = NULL;
+	PhotoFileInterrogator* _tmp44_;
+	DetectedPhotoInformation* _tmp45_;
 	gboolean _tmp46_ = FALSE;
-	DetectedPhotoInformation* _tmp47_ = NULL;
-	PhotoImportParams* _tmp50_ = NULL;
-	PhotoFileSnifferOptions _tmp51_ = 0;
+	DetectedPhotoInformation* _tmp47_;
+	PhotoImportParams* _tmp50_;
+	PhotoFileSnifferOptions _tmp51_;
 	Orientation orientation = 0;
 	time_t exposure_time = 0;
 	gchar* title = NULL;
-	gchar* _tmp64_ = NULL;
+	gchar* _tmp64_;
 	gchar* comment = NULL;
-	gchar* _tmp65_ = NULL;
+	gchar* _tmp65_;
 	Rating rating = 0;
-	DetectedPhotoInformation* _tmp66_ = NULL;
-	PhotoMetadata* _tmp67_ = NULL;
+	DetectedPhotoInformation* _tmp66_;
+	PhotoMetadata* _tmp67_;
 	gboolean _tmp90_ = FALSE;
 	gboolean _tmp91_ = FALSE;
-	DetectedPhotoInformation* _tmp92_ = NULL;
-	GdkColorspace _tmp93_ = 0;
-	PhotoImportParams* _tmp101_ = NULL;
-	PhotoRow* _tmp102_ = NULL;
-	PhotoImportParams* _tmp103_ = NULL;
-	PhotoRow* _tmp104_ = NULL;
-	BackingPhotoRow* _tmp105_ = NULL;
-	GFile* _tmp106_ = NULL;
-	gchar* _tmp107_ = NULL;
-	PhotoImportParams* _tmp108_ = NULL;
-	PhotoRow* _tmp109_ = NULL;
-	BackingPhotoRow* _tmp110_ = NULL;
-	DetectedPhotoInformation* _tmp111_ = NULL;
-	Dimensions _tmp112_ = {0};
-	PhotoImportParams* _tmp113_ = NULL;
-	PhotoRow* _tmp114_ = NULL;
-	BackingPhotoRow* _tmp115_ = NULL;
-	GFileInfo* _tmp116_ = NULL;
-	gint64 _tmp117_ = 0LL;
-	PhotoImportParams* _tmp118_ = NULL;
-	PhotoRow* _tmp119_ = NULL;
-	BackingPhotoRow* _tmp120_ = NULL;
-	GTimeVal _tmp121_ = {0};
-	glong _tmp122_ = 0L;
-	PhotoImportParams* _tmp123_ = NULL;
-	PhotoRow* _tmp124_ = NULL;
-	time_t _tmp125_ = 0;
-	PhotoImportParams* _tmp126_ = NULL;
-	PhotoRow* _tmp127_ = NULL;
-	Orientation _tmp128_ = 0;
-	PhotoImportParams* _tmp129_ = NULL;
-	PhotoRow* _tmp130_ = NULL;
-	BackingPhotoRow* _tmp131_ = NULL;
-	Orientation _tmp132_ = 0;
-	PhotoImportParams* _tmp133_ = NULL;
-	PhotoRow* _tmp134_ = NULL;
-	PhotoImportParams* _tmp135_ = NULL;
-	ImportID _tmp136_ = {0};
-	PhotoImportParams* _tmp137_ = NULL;
-	PhotoRow* _tmp138_ = NULL;
-	PhotoImportParams* _tmp139_ = NULL;
-	PhotoRow* _tmp140_ = NULL;
-	PhotoImportParams* _tmp141_ = NULL;
-	PhotoRow* _tmp142_ = NULL;
-	DetectedPhotoInformation* _tmp143_ = NULL;
-	const gchar* _tmp144_ = NULL;
-	gchar* _tmp145_ = NULL;
-	PhotoImportParams* _tmp146_ = NULL;
-	PhotoRow* _tmp147_ = NULL;
-	DetectedPhotoInformation* _tmp148_ = NULL;
-	const gchar* _tmp149_ = NULL;
-	gchar* _tmp150_ = NULL;
-	PhotoImportParams* _tmp151_ = NULL;
-	PhotoRow* _tmp152_ = NULL;
-	DetectedPhotoInformation* _tmp153_ = NULL;
-	const gchar* _tmp154_ = NULL;
-	gchar* _tmp155_ = NULL;
-	PhotoImportParams* _tmp156_ = NULL;
-	PhotoRow* _tmp157_ = NULL;
-	PhotoImportParams* _tmp158_ = NULL;
-	PhotoRow* _tmp159_ = NULL;
-	PhotoImportParams* _tmp160_ = NULL;
-	PhotoRow* _tmp161_ = NULL;
-	BackingPhotoRow* _tmp162_ = NULL;
-	DetectedPhotoInformation* _tmp163_ = NULL;
-	PhotoFileFormat _tmp164_ = 0;
-	PhotoImportParams* _tmp165_ = NULL;
-	PhotoRow* _tmp166_ = NULL;
-	const gchar* _tmp167_ = NULL;
-	gchar* _tmp168_ = NULL;
-	PhotoImportParams* _tmp169_ = NULL;
-	PhotoRow* _tmp170_ = NULL;
-	const gchar* _tmp171_ = NULL;
-	gchar* _tmp172_ = NULL;
-	PhotoImportParams* _tmp173_ = NULL;
-	PhotoRow* _tmp174_ = NULL;
-	Rating _tmp175_ = 0;
-	PhotoImportParams* _tmp176_ = NULL;
-	Thumbnails* _tmp177_ = NULL;
+	DetectedPhotoInformation* _tmp92_;
+	GdkColorspace _tmp93_;
+	PhotoImportParams* _tmp101_;
+	PhotoRow* _tmp102_;
+	PhotoImportParams* _tmp103_;
+	PhotoRow* _tmp104_;
+	BackingPhotoRow* _tmp105_;
+	GFile* _tmp106_;
+	gchar* _tmp107_;
+	PhotoImportParams* _tmp108_;
+	PhotoRow* _tmp109_;
+	BackingPhotoRow* _tmp110_;
+	DetectedPhotoInformation* _tmp111_;
+	Dimensions _tmp112_;
+	PhotoImportParams* _tmp113_;
+	PhotoRow* _tmp114_;
+	BackingPhotoRow* _tmp115_;
+	GFileInfo* _tmp116_;
+	gint64 _tmp117_;
+	PhotoImportParams* _tmp118_;
+	PhotoRow* _tmp119_;
+	BackingPhotoRow* _tmp120_;
+	GTimeVal _tmp121_;
+	glong _tmp122_;
+	PhotoImportParams* _tmp123_;
+	PhotoRow* _tmp124_;
+	time_t _tmp125_;
+	PhotoImportParams* _tmp126_;
+	PhotoRow* _tmp127_;
+	Orientation _tmp128_;
+	PhotoImportParams* _tmp129_;
+	PhotoRow* _tmp130_;
+	BackingPhotoRow* _tmp131_;
+	Orientation _tmp132_;
+	PhotoImportParams* _tmp133_;
+	PhotoRow* _tmp134_;
+	PhotoImportParams* _tmp135_;
+	ImportID _tmp136_;
+	PhotoImportParams* _tmp137_;
+	PhotoRow* _tmp138_;
+	PhotoImportParams* _tmp139_;
+	PhotoRow* _tmp140_;
+	PhotoImportParams* _tmp141_;
+	PhotoRow* _tmp142_;
+	DetectedPhotoInformation* _tmp143_;
+	const gchar* _tmp144_;
+	gchar* _tmp145_;
+	PhotoImportParams* _tmp146_;
+	PhotoRow* _tmp147_;
+	DetectedPhotoInformation* _tmp148_;
+	const gchar* _tmp149_;
+	gchar* _tmp150_;
+	PhotoImportParams* _tmp151_;
+	PhotoRow* _tmp152_;
+	DetectedPhotoInformation* _tmp153_;
+	const gchar* _tmp154_;
+	gchar* _tmp155_;
+	PhotoImportParams* _tmp156_;
+	PhotoRow* _tmp157_;
+	PhotoImportParams* _tmp158_;
+	PhotoRow* _tmp159_;
+	PhotoImportParams* _tmp160_;
+	PhotoRow* _tmp161_;
+	BackingPhotoRow* _tmp162_;
+	DetectedPhotoInformation* _tmp163_;
+	PhotoFileFormat _tmp164_;
+	PhotoImportParams* _tmp165_;
+	PhotoRow* _tmp166_;
+	const gchar* _tmp167_;
+	gchar* _tmp168_;
+	PhotoImportParams* _tmp169_;
+	PhotoRow* _tmp170_;
+	const gchar* _tmp171_;
+	gchar* _tmp172_;
+	PhotoImportParams* _tmp173_;
+	PhotoRow* _tmp174_;
+	Rating _tmp175_;
+	PhotoImportParams* _tmp176_;
+	Thumbnails* _tmp177_;
 	GError * _inner_error_ = NULL;
 #line 1143 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0);
@@ -9243,12 +9267,12 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	file = _tmp2_;
 #line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = NULL;
-#line 9245 "Photo.c"
+#line 9269 "Photo.c"
 	{
 		GFileInfo* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		GFileInfo* _tmp5_ = NULL;
-		GFileInfo* _tmp6_ = NULL;
+		GFile* _tmp4_;
+		GFileInfo* _tmp5_;
+		GFileInfo* _tmp6_;
 #line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = file;
 #line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9257,8 +9281,8 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp3_ = _tmp5_;
 #line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9259 "Photo.c"
-			goto __catch299_g_error;
+#line 9283 "Photo.c"
+			goto __catch300_g_error;
 		}
 #line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp3_;
@@ -9270,10 +9294,10 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		info = _tmp6_;
 #line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 9272 "Photo.c"
+#line 9296 "Photo.c"
 	}
-	goto __finally299;
-	__catch299_g_error:
+	goto __finally300;
+	__catch300_g_error:
 	{
 		GError* err = NULL;
 #line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9290,9 +9314,9 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9292 "Photo.c"
+#line 9316 "Photo.c"
 	}
-	__finally299:
+	__finally300:
 #line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9305,7 +9329,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 9307 "Photo.c"
+#line 9331 "Photo.c"
 	}
 #line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = info;
@@ -9321,7 +9345,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1158 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9323 "Photo.c"
+#line 9347 "Photo.c"
 	}
 #line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = file;
@@ -9329,10 +9353,10 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_tmp10_ = photo_is_file_image (_tmp9_);
 #line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp10_) {
-#line 9331 "Photo.c"
-		GFile* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
+#line 9355 "Photo.c"
+		GFile* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
 #line 1161 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = file;
 #line 1161 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9351,7 +9375,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1163 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9353 "Photo.c"
+#line 9377 "Photo.c"
 	}
 #line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = file;
@@ -9359,10 +9383,10 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_tmp15_ = photo_file_format_is_file_supported (_tmp14_);
 #line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp15_) {
-#line 9361 "Photo.c"
-		GFile* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
+#line 9385 "Photo.c"
+		GFile* _tmp16_;
+		gchar* _tmp17_;
+		gchar* _tmp18_;
 #line 1167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = file;
 #line 1167 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9381,7 +9405,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9383 "Photo.c"
+#line 9407 "Photo.c"
 	}
 #line 1172 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = info;
@@ -9395,44 +9419,44 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_tmp24_ = _tmp23_->exif_md5;
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp24_ != NULL) {
-#line 9397 "Photo.c"
-		PhotoImportParams* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
+#line 9421 "Photo.c"
+		PhotoImportParams* _tmp25_;
+		const gchar* _tmp26_;
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = params;
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp26_ = _tmp25_->thumbnail_md5;
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = _tmp26_ != NULL;
-#line 9406 "Photo.c"
+#line 9430 "Photo.c"
 	} else {
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = FALSE;
-#line 9410 "Photo.c"
+#line 9434 "Photo.c"
 	}
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_) {
-#line 9414 "Photo.c"
-		PhotoImportParams* _tmp27_ = NULL;
-		const gchar* _tmp28_ = NULL;
+#line 9438 "Photo.c"
+		PhotoImportParams* _tmp27_;
+		const gchar* _tmp28_;
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp27_ = params;
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = _tmp27_->full_md5;
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp28_ != NULL;
-#line 9423 "Photo.c"
+#line 9447 "Photo.c"
 	} else {
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = FALSE;
-#line 9427 "Photo.c"
+#line 9451 "Photo.c"
 	}
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 9431 "Photo.c"
-		PhotoImportParams* _tmp29_ = NULL;
-		PhotoImportParams* _tmp30_ = NULL;
-		PhotoFileSnifferOptions _tmp31_ = 0;
+#line 9455 "Photo.c"
+		PhotoImportParams* _tmp29_;
+		PhotoImportParams* _tmp30_;
+		PhotoFileSnifferOptions _tmp31_;
 #line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_ = params;
 #line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9441,7 +9465,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp31_ = _tmp30_->sniffer_options;
 #line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_->sniffer_options = _tmp31_ | PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5;
-#line 9443 "Photo.c"
+#line 9467 "Photo.c"
 	}
 #line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = file;
@@ -9453,28 +9477,28 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_tmp35_ = photo_file_interrogator_new (_tmp32_, _tmp34_);
 #line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp35_;
-#line 9455 "Photo.c"
+#line 9479 "Photo.c"
 	{
-		PhotoFileInterrogator* _tmp36_ = NULL;
+		PhotoFileInterrogator* _tmp36_;
 #line 1181 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = interrogator;
 #line 1181 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_interrogator_interrogate (_tmp36_, &_inner_error_);
 #line 1181 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9464 "Photo.c"
-			goto __catch300_g_error;
+#line 9488 "Photo.c"
+			goto __catch301_g_error;
 		}
 	}
-	goto __finally300;
-	__catch300_g_error:
+	goto __finally301;
+	__catch301_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp37_ = NULL;
-		gchar* _tmp38_ = NULL;
-		gchar* _tmp39_ = NULL;
-		GError* _tmp40_ = NULL;
-		const gchar* _tmp41_ = NULL;
+		GFile* _tmp37_;
+		gchar* _tmp38_;
+		gchar* _tmp39_;
+		GError* _tmp40_;
+		const gchar* _tmp41_;
 #line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
 #line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9505,9 +9529,9 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9507 "Photo.c"
+#line 9531 "Photo.c"
 	}
-	__finally300:
+	__finally301:
 #line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9522,7 +9546,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 9524 "Photo.c"
+#line 9548 "Photo.c"
 	}
 #line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = interrogator;
@@ -9540,7 +9564,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9542 "Photo.c"
+#line 9566 "Photo.c"
 	}
 #line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = interrogator;
@@ -9554,17 +9578,17 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	if (_tmp47_ == NULL) {
 #line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = TRUE;
-#line 9556 "Photo.c"
+#line 9580 "Photo.c"
 	} else {
-		DetectedPhotoInformation* _tmp48_ = NULL;
-		PhotoFileFormat _tmp49_ = 0;
+		DetectedPhotoInformation* _tmp48_;
+		PhotoFileFormat _tmp49_;
 #line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = detected;
 #line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = _tmp48_->file_format;
 #line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = _tmp49_ == PHOTO_FILE_FORMAT_UNKNOWN;
-#line 9566 "Photo.c"
+#line 9590 "Photo.c"
 	}
 #line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp46_) {
@@ -9580,7 +9604,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9582 "Photo.c"
+#line 9606 "Photo.c"
 	}
 #line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = params;
@@ -9588,19 +9612,19 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_tmp51_ = _tmp50_->sniffer_options;
 #line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp51_ & PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5) != 0) {
-#line 9590 "Photo.c"
-		DetectedPhotoInformation* _tmp52_ = NULL;
-		PhotoImportParams* _tmp53_ = NULL;
-		const gchar* _tmp54_ = NULL;
-		gchar* _tmp55_ = NULL;
-		DetectedPhotoInformation* _tmp56_ = NULL;
-		PhotoImportParams* _tmp57_ = NULL;
-		const gchar* _tmp58_ = NULL;
-		gchar* _tmp59_ = NULL;
-		DetectedPhotoInformation* _tmp60_ = NULL;
-		PhotoImportParams* _tmp61_ = NULL;
-		const gchar* _tmp62_ = NULL;
-		gchar* _tmp63_ = NULL;
+#line 9614 "Photo.c"
+		DetectedPhotoInformation* _tmp52_;
+		PhotoImportParams* _tmp53_;
+		const gchar* _tmp54_;
+		gchar* _tmp55_;
+		DetectedPhotoInformation* _tmp56_;
+		PhotoImportParams* _tmp57_;
+		const gchar* _tmp58_;
+		gchar* _tmp59_;
+		DetectedPhotoInformation* _tmp60_;
+		PhotoImportParams* _tmp61_;
+		const gchar* _tmp62_;
+		gchar* _tmp63_;
 #line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = detected;
 #line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9637,7 +9661,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_free0 (_tmp60_->md5);
 #line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_->md5 = _tmp63_;
-#line 9639 "Photo.c"
+#line 9663 "Photo.c"
 	}
 #line 1203 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation = ORIENTATION_TOP_LEFT;
@@ -9659,28 +9683,28 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_tmp67_ = _tmp66_->metadata;
 #line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp67_ != NULL) {
-#line 9661 "Photo.c"
+#line 9685 "Photo.c"
 		MetadataDateTime* date_time = NULL;
-		DetectedPhotoInformation* _tmp68_ = NULL;
-		PhotoMetadata* _tmp69_ = NULL;
-		MetadataDateTime* _tmp70_ = NULL;
-		MetadataDateTime* _tmp71_ = NULL;
-		DetectedPhotoInformation* _tmp74_ = NULL;
-		PhotoMetadata* _tmp75_ = NULL;
-		Orientation _tmp76_ = 0;
-		DetectedPhotoInformation* _tmp77_ = NULL;
-		PhotoMetadata* _tmp78_ = NULL;
-		gchar* _tmp79_ = NULL;
-		DetectedPhotoInformation* _tmp80_ = NULL;
-		PhotoMetadata* _tmp81_ = NULL;
-		gchar* _tmp82_ = NULL;
-		PhotoImportParams* _tmp83_ = NULL;
-		DetectedPhotoInformation* _tmp84_ = NULL;
-		PhotoMetadata* _tmp85_ = NULL;
-		GeeSet* _tmp86_ = NULL;
-		DetectedPhotoInformation* _tmp87_ = NULL;
-		PhotoMetadata* _tmp88_ = NULL;
-		Rating _tmp89_ = 0;
+		DetectedPhotoInformation* _tmp68_;
+		PhotoMetadata* _tmp69_;
+		MetadataDateTime* _tmp70_;
+		MetadataDateTime* _tmp71_;
+		DetectedPhotoInformation* _tmp74_;
+		PhotoMetadata* _tmp75_;
+		Orientation _tmp76_;
+		DetectedPhotoInformation* _tmp77_;
+		PhotoMetadata* _tmp78_;
+		gchar* _tmp79_;
+		DetectedPhotoInformation* _tmp80_;
+		PhotoMetadata* _tmp81_;
+		gchar* _tmp82_;
+		PhotoImportParams* _tmp83_;
+		DetectedPhotoInformation* _tmp84_;
+		PhotoMetadata* _tmp85_;
+		GeeSet* _tmp86_;
+		DetectedPhotoInformation* _tmp87_;
+		PhotoMetadata* _tmp88_;
+		Rating _tmp89_;
 #line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp68_ = detected;
 #line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9693,16 +9717,16 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp71_ = date_time;
 #line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp71_ != NULL) {
-#line 9695 "Photo.c"
-			MetadataDateTime* _tmp72_ = NULL;
-			time_t _tmp73_ = 0;
+#line 9719 "Photo.c"
+			MetadataDateTime* _tmp72_;
+			time_t _tmp73_;
 #line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp72_ = date_time;
 #line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = metadata_date_time_get_timestamp (_tmp72_);
 #line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
 			exposure_time = _tmp73_;
-#line 9704 "Photo.c"
+#line 9728 "Photo.c"
 		}
 #line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp74_ = detected;
@@ -9754,7 +9778,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		rating = _tmp89_;
 #line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 9756 "Photo.c"
+#line 9780 "Photo.c"
 	}
 #line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp92_ = detected;
@@ -9764,40 +9788,40 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	if (_tmp93_ != GDK_COLORSPACE_RGB) {
 #line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = TRUE;
-#line 9766 "Photo.c"
+#line 9790 "Photo.c"
 	} else {
-		DetectedPhotoInformation* _tmp94_ = NULL;
-		gint _tmp95_ = 0;
+		DetectedPhotoInformation* _tmp94_;
+		gint _tmp95_;
 #line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp94_ = detected;
 #line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp95_ = _tmp94_->channels;
 #line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = _tmp95_ < 3;
-#line 9776 "Photo.c"
+#line 9800 "Photo.c"
 	}
 #line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp91_) {
 #line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = TRUE;
-#line 9782 "Photo.c"
+#line 9806 "Photo.c"
 	} else {
-		DetectedPhotoInformation* _tmp96_ = NULL;
-		gint _tmp97_ = 0;
+		DetectedPhotoInformation* _tmp96_;
+		gint _tmp97_;
 #line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp96_ = detected;
 #line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp97_ = _tmp96_->bits_per_channel;
 #line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = _tmp97_ != 8;
-#line 9792 "Photo.c"
+#line 9816 "Photo.c"
 	}
 #line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp90_) {
-#line 9796 "Photo.c"
-		GFile* _tmp98_ = NULL;
-		gchar* _tmp99_ = NULL;
-		gchar* _tmp100_ = NULL;
+#line 9820 "Photo.c"
+		GFile* _tmp98_;
+		gchar* _tmp99_;
+		gchar* _tmp100_;
 #line 1230 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp98_ = file;
 #line 1230 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9824,7 +9848,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9826 "Photo.c"
+#line 9850 "Photo.c"
 	}
 #line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp101_ = params;
@@ -10036,18 +10060,18 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_tmp177_ = _tmp176_->thumbnails;
 #line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp177_ != NULL) {
-#line 10038 "Photo.c"
+#line 10062 "Photo.c"
 		PhotoFileReader* reader = NULL;
-		PhotoImportParams* _tmp178_ = NULL;
-		PhotoRow* _tmp179_ = NULL;
-		BackingPhotoRow* _tmp180_ = NULL;
-		PhotoFileFormat _tmp181_ = 0;
-		PhotoImportParams* _tmp182_ = NULL;
-		PhotoRow* _tmp183_ = NULL;
-		BackingPhotoRow* _tmp184_ = NULL;
-		const gchar* _tmp185_ = NULL;
-		PhotoFileReader* _tmp186_ = NULL;
-		PhotoFileReader* _tmp187_ = NULL;
+		PhotoImportParams* _tmp178_;
+		PhotoRow* _tmp179_;
+		BackingPhotoRow* _tmp180_;
+		PhotoFileFormat _tmp181_;
+		PhotoImportParams* _tmp182_;
+		PhotoRow* _tmp183_;
+		BackingPhotoRow* _tmp184_;
+		const gchar* _tmp185_;
+		PhotoFileReader* _tmp186_;
+		PhotoFileReader* _tmp187_;
 #line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp178_ = params;
 #line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10072,18 +10096,18 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp187_ = reader;
 #line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_reader_set_role (_tmp187_, PHOTO_FILE_READER_ROLE_THUMBNAIL);
-#line 10074 "Photo.c"
-		{
-			PhotoImportParams* _tmp188_ = NULL;
-			Thumbnails* _tmp189_ = NULL;
-			PhotoFileReader* _tmp190_ = NULL;
-			PhotoImportParams* _tmp191_ = NULL;
-			PhotoRow* _tmp192_ = NULL;
-			Orientation _tmp193_ = 0;
-			PhotoImportParams* _tmp194_ = NULL;
-			PhotoRow* _tmp195_ = NULL;
-			BackingPhotoRow* _tmp196_ = NULL;
-			Dimensions _tmp197_ = {0};
+#line 10098 "Photo.c"
+		{
+			PhotoImportParams* _tmp188_;
+			Thumbnails* _tmp189_;
+			PhotoFileReader* _tmp190_;
+			PhotoImportParams* _tmp191_;
+			PhotoRow* _tmp192_;
+			Orientation _tmp193_;
+			PhotoImportParams* _tmp194_;
+			PhotoRow* _tmp195_;
+			BackingPhotoRow* _tmp196_;
+			Dimensions _tmp197_;
 #line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp188_ = params;
 #line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10108,16 +10132,16 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 			thumbnail_cache_generate_for_photo (_tmp189_, _tmp190_, _tmp193_, &_tmp197_, &_inner_error_);
 #line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10110 "Photo.c"
-				goto __catch301_g_error;
+#line 10134 "Photo.c"
+				goto __catch302_g_error;
 			}
 		}
-		goto __finally301;
-		__catch301_g_error:
+		goto __finally302;
+		__catch302_g_error:
 		{
 			GError* err = NULL;
-			GError* _tmp198_ = NULL;
-			ImportResult _tmp199_ = 0;
+			GError* _tmp198_;
+			ImportResult _tmp199_;
 #line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
 #line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10146,9 +10170,9 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 			_g_object_unref0 (file);
 #line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 10148 "Photo.c"
+#line 10172 "Photo.c"
 		}
-		__finally301:
+		__finally302:
 #line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10171,11 +10195,11 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 			g_clear_error (&_inner_error_);
 #line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0;
-#line 10173 "Photo.c"
+#line 10197 "Photo.c"
 		}
 #line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 10177 "Photo.c"
+#line 10201 "Photo.c"
 	}
 #line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = IMPORT_RESULT_SUCCESS;
@@ -10193,70 +10217,70 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_g_object_unref0 (file);
 #line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 10195 "Photo.c"
+#line 10219 "Photo.c"
 }
 
 
 void photo_create_pre_import (PhotoImportParams* params) {
 	GFile* file = NULL;
-	PhotoImportParams* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	PhotoImportParams* _tmp3_ = NULL;
-	PhotoRow* _tmp4_ = NULL;
-	PhotoImportParams* _tmp5_ = NULL;
-	PhotoRow* _tmp6_ = NULL;
-	BackingPhotoRow* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	PhotoImportParams* _tmp9_ = NULL;
-	PhotoRow* _tmp10_ = NULL;
-	BackingPhotoRow* _tmp11_ = NULL;
-	PhotoImportParams* _tmp12_ = NULL;
-	PhotoRow* _tmp13_ = NULL;
-	BackingPhotoRow* _tmp14_ = NULL;
-	PhotoImportParams* _tmp15_ = NULL;
-	PhotoRow* _tmp16_ = NULL;
-	BackingPhotoRow* _tmp17_ = NULL;
-	PhotoImportParams* _tmp18_ = NULL;
-	PhotoRow* _tmp19_ = NULL;
-	PhotoImportParams* _tmp20_ = NULL;
-	PhotoRow* _tmp21_ = NULL;
-	PhotoImportParams* _tmp22_ = NULL;
-	PhotoRow* _tmp23_ = NULL;
-	BackingPhotoRow* _tmp24_ = NULL;
-	PhotoImportParams* _tmp25_ = NULL;
-	PhotoRow* _tmp26_ = NULL;
-	PhotoImportParams* _tmp27_ = NULL;
-	ImportID _tmp28_ = {0};
-	PhotoImportParams* _tmp29_ = NULL;
-	PhotoRow* _tmp30_ = NULL;
-	PhotoImportParams* _tmp31_ = NULL;
-	PhotoRow* _tmp32_ = NULL;
-	PhotoImportParams* _tmp33_ = NULL;
-	PhotoRow* _tmp34_ = NULL;
-	PhotoImportParams* _tmp35_ = NULL;
-	PhotoRow* _tmp36_ = NULL;
-	PhotoImportParams* _tmp37_ = NULL;
-	PhotoRow* _tmp38_ = NULL;
-	PhotoImportParams* _tmp39_ = NULL;
-	PhotoRow* _tmp40_ = NULL;
-	PhotoImportParams* _tmp41_ = NULL;
-	PhotoRow* _tmp42_ = NULL;
-	PhotoImportParams* _tmp43_ = NULL;
-	PhotoRow* _tmp44_ = NULL;
-	BackingPhotoRow* _tmp45_ = NULL;
-	PhotoImportParams* _tmp46_ = NULL;
-	PhotoRow* _tmp47_ = NULL;
-	PhotoImportParams* _tmp48_ = NULL;
-	PhotoRow* _tmp49_ = NULL;
-	PhotoImportParams* _tmp50_ = NULL;
-	PhotoRow* _tmp51_ = NULL;
+	PhotoImportParams* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	PhotoImportParams* _tmp3_;
+	PhotoRow* _tmp4_;
+	PhotoImportParams* _tmp5_;
+	PhotoRow* _tmp6_;
+	BackingPhotoRow* _tmp7_;
+	gchar* _tmp8_;
+	PhotoImportParams* _tmp9_;
+	PhotoRow* _tmp10_;
+	BackingPhotoRow* _tmp11_;
+	PhotoImportParams* _tmp12_;
+	PhotoRow* _tmp13_;
+	BackingPhotoRow* _tmp14_;
+	PhotoImportParams* _tmp15_;
+	PhotoRow* _tmp16_;
+	BackingPhotoRow* _tmp17_;
+	PhotoImportParams* _tmp18_;
+	PhotoRow* _tmp19_;
+	PhotoImportParams* _tmp20_;
+	PhotoRow* _tmp21_;
+	PhotoImportParams* _tmp22_;
+	PhotoRow* _tmp23_;
+	BackingPhotoRow* _tmp24_;
+	PhotoImportParams* _tmp25_;
+	PhotoRow* _tmp26_;
+	PhotoImportParams* _tmp27_;
+	ImportID _tmp28_;
+	PhotoImportParams* _tmp29_;
+	PhotoRow* _tmp30_;
+	PhotoImportParams* _tmp31_;
+	PhotoRow* _tmp32_;
+	PhotoImportParams* _tmp33_;
+	PhotoRow* _tmp34_;
+	PhotoImportParams* _tmp35_;
+	PhotoRow* _tmp36_;
+	PhotoImportParams* _tmp37_;
+	PhotoRow* _tmp38_;
+	PhotoImportParams* _tmp39_;
+	PhotoRow* _tmp40_;
+	PhotoImportParams* _tmp41_;
+	PhotoRow* _tmp42_;
+	PhotoImportParams* _tmp43_;
+	PhotoRow* _tmp44_;
+	BackingPhotoRow* _tmp45_;
+	PhotoImportParams* _tmp46_;
+	PhotoRow* _tmp47_;
+	PhotoImportParams* _tmp48_;
+	PhotoRow* _tmp49_;
+	PhotoImportParams* _tmp50_;
+	PhotoRow* _tmp51_;
 	PhotoFileInterrogator* interrogator = NULL;
-	PhotoImportParams* _tmp52_ = NULL;
-	GFile* _tmp53_ = NULL;
-	PhotoImportParams* _tmp54_ = NULL;
-	PhotoFileSnifferOptions _tmp55_ = 0;
-	PhotoFileInterrogator* _tmp56_ = NULL;
+	PhotoImportParams* _tmp52_;
+	GFile* _tmp53_;
+	PhotoImportParams* _tmp54_;
+	PhotoFileSnifferOptions _tmp55_;
+	PhotoFileInterrogator* _tmp56_;
 	GError * _inner_error_ = NULL;
 #line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO_IMPORT_PARAMS (params));
@@ -10432,19 +10456,19 @@ void photo_create_pre_import (PhotoImportParams* params) {
 	_tmp56_ = photo_file_interrogator_new (_tmp53_, _tmp55_);
 #line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp56_;
-#line 10434 "Photo.c"
+#line 10458 "Photo.c"
 	{
 		DetectedPhotoInformation* detected = NULL;
-		DetectedPhotoInformation* _tmp57_ = NULL;
+		DetectedPhotoInformation* _tmp57_;
 		gboolean _tmp58_ = FALSE;
 		gboolean _tmp59_ = FALSE;
-		DetectedPhotoInformation* _tmp60_ = NULL;
+		DetectedPhotoInformation* _tmp60_;
 #line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_interrogator_interrogate (interrogator, &_inner_error_);
 #line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10445 "Photo.c"
-			goto __catch302_g_error;
+#line 10469 "Photo.c"
+			goto __catch303_g_error;
 		}
 #line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = photo_file_interrogator_get_detected_photo_information (interrogator);
@@ -10454,43 +10478,43 @@ void photo_create_pre_import (PhotoImportParams* params) {
 		_tmp60_ = detected;
 #line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp60_ != NULL) {
-#line 10456 "Photo.c"
-			gboolean _tmp61_ = FALSE;
+#line 10480 "Photo.c"
+			gboolean _tmp61_;
 #line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp61_ = photo_file_interrogator_get_is_photo_corrupted (interrogator);
 #line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = !_tmp61_;
-#line 10462 "Photo.c"
+#line 10486 "Photo.c"
 		} else {
 #line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = FALSE;
-#line 10466 "Photo.c"
+#line 10490 "Photo.c"
 		}
 #line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp59_) {
-#line 10470 "Photo.c"
-			DetectedPhotoInformation* _tmp62_ = NULL;
-			PhotoFileFormat _tmp63_ = 0;
+#line 10494 "Photo.c"
+			DetectedPhotoInformation* _tmp62_;
+			PhotoFileFormat _tmp63_;
 #line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp62_ = detected;
 #line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp63_ = _tmp62_->file_format;
 #line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = _tmp63_ != PHOTO_FILE_FORMAT_UNKNOWN;
-#line 10479 "Photo.c"
+#line 10503 "Photo.c"
 		} else {
 #line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = FALSE;
-#line 10483 "Photo.c"
+#line 10507 "Photo.c"
 		}
 #line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp58_) {
-#line 10487 "Photo.c"
-			PhotoImportParams* _tmp64_ = NULL;
-			PhotoRow* _tmp65_ = NULL;
-			BackingPhotoRow* _tmp66_ = NULL;
-			DetectedPhotoInformation* _tmp67_ = NULL;
-			PhotoFileFormat _tmp68_ = 0;
+#line 10511 "Photo.c"
+			PhotoImportParams* _tmp64_;
+			PhotoRow* _tmp65_;
+			BackingPhotoRow* _tmp66_;
+			DetectedPhotoInformation* _tmp67_;
+			PhotoFileFormat _tmp68_;
 #line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp64_ = params;
 #line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10503,20 +10527,20 @@ void photo_create_pre_import (PhotoImportParams* params) {
 			_tmp68_ = _tmp67_->file_format;
 #line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp66_->file_format = _tmp68_;
-#line 10505 "Photo.c"
+#line 10529 "Photo.c"
 		}
 #line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 10509 "Photo.c"
+#line 10533 "Photo.c"
 	}
-	goto __finally302;
-	__catch302_g_error:
+	goto __finally303;
+	__catch303_g_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp69_ = NULL;
-		gchar* _tmp70_ = NULL;
-		GError* _tmp71_ = NULL;
-		const gchar* _tmp72_ = NULL;
+		gchar* _tmp69_;
+		gchar* _tmp70_;
+		GError* _tmp71_;
+		const gchar* _tmp72_;
 #line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
 #line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10535,9 +10559,9 @@ void photo_create_pre_import (PhotoImportParams* params) {
 		_g_free0 (_tmp70_);
 #line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 10537 "Photo.c"
+#line 10561 "Photo.c"
 	}
-	__finally302:
+	__finally303:
 #line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10550,53 +10574,53 @@ void photo_create_pre_import (PhotoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 10552 "Photo.c"
+#line 10576 "Photo.c"
 	}
 #line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_interrogator_unref0 (interrogator);
 #line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 10558 "Photo.c"
+#line 10582 "Photo.c"
 }
 
 
-BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoFileSnifferOptions options, DetectedPhotoInformation** detected, GError** error) {
+BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoFileSnifferOptions options, DetectedPhotoInformation* * detected, GError** error) {
 	DetectedPhotoInformation* _vala_detected = NULL;
 	BackingPhotoRow* result = NULL;
 	BackingPhotoRow* backing = NULL;
-	BackingPhotoRow* _tmp0_ = NULL;
+	BackingPhotoRow* _tmp0_;
 	GFileInfo* info = NULL;
 	PhotoFileInterrogator* interrogator = NULL;
-	GFile* _tmp10_ = NULL;
-	PhotoFileSnifferOptions _tmp11_ = 0;
-	PhotoFileInterrogator* _tmp12_ = NULL;
-	PhotoFileInterrogator* _tmp13_ = NULL;
-	PhotoFileInterrogator* _tmp14_ = NULL;
-	DetectedPhotoInformation* _tmp15_ = NULL;
+	GFile* _tmp10_;
+	PhotoFileSnifferOptions _tmp11_;
+	PhotoFileInterrogator* _tmp12_;
+	PhotoFileInterrogator* _tmp13_;
+	PhotoFileInterrogator* _tmp14_;
+	DetectedPhotoInformation* _tmp15_;
 	gboolean _tmp16_ = FALSE;
-	DetectedPhotoInformation* _tmp17_ = NULL;
+	DetectedPhotoInformation* _tmp17_;
 	GTimeVal modification_time = {0};
-	GFileInfo* _tmp22_ = NULL;
+	GFileInfo* _tmp22_;
 	GTimeVal _tmp23_ = {0};
-	BackingPhotoRow* _tmp24_ = NULL;
-	GFile* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	BackingPhotoRow* _tmp27_ = NULL;
-	GTimeVal _tmp28_ = {0};
-	glong _tmp29_ = 0L;
-	BackingPhotoRow* _tmp30_ = NULL;
-	GFileInfo* _tmp31_ = NULL;
-	gint64 _tmp32_ = 0LL;
-	BackingPhotoRow* _tmp33_ = NULL;
-	DetectedPhotoInformation* _tmp34_ = NULL;
-	PhotoFileFormat _tmp35_ = 0;
-	BackingPhotoRow* _tmp36_ = NULL;
-	DetectedPhotoInformation* _tmp37_ = NULL;
-	Dimensions _tmp38_ = {0};
+	BackingPhotoRow* _tmp24_;
+	GFile* _tmp25_;
+	gchar* _tmp26_;
+	BackingPhotoRow* _tmp27_;
+	GTimeVal _tmp28_;
+	glong _tmp29_;
+	BackingPhotoRow* _tmp30_;
+	GFileInfo* _tmp31_;
+	gint64 _tmp32_;
+	BackingPhotoRow* _tmp33_;
+	DetectedPhotoInformation* _tmp34_;
+	PhotoFileFormat _tmp35_;
+	BackingPhotoRow* _tmp36_;
+	DetectedPhotoInformation* _tmp37_;
+	Dimensions _tmp38_;
 	Orientation _tmp39_ = 0;
-	DetectedPhotoInformation* _tmp40_ = NULL;
-	PhotoMetadata* _tmp41_ = NULL;
-	BackingPhotoRow* _tmp45_ = NULL;
+	DetectedPhotoInformation* _tmp40_;
+	PhotoMetadata* _tmp41_;
+	BackingPhotoRow* _tmp45_;
 	GError * _inner_error_ = NULL;
 #line 1311 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -10612,12 +10636,12 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 	backing = _tmp0_;
 #line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = NULL;
-#line 10614 "Photo.c"
+#line 10638 "Photo.c"
 	{
 		GFileInfo* _tmp1_ = NULL;
-		GFile* _tmp2_ = NULL;
-		GFileInfo* _tmp3_ = NULL;
-		GFileInfo* _tmp4_ = NULL;
+		GFile* _tmp2_;
+		GFileInfo* _tmp3_;
+		GFileInfo* _tmp4_;
 #line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = file;
 #line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10626,8 +10650,8 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		_tmp1_ = _tmp3_;
 #line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10628 "Photo.c"
-			goto __catch303_g_error;
+#line 10652 "Photo.c"
+			goto __catch304_g_error;
 		}
 #line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp1_;
@@ -10639,17 +10663,17 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		info = _tmp4_;
 #line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 10641 "Photo.c"
+#line 10665 "Photo.c"
 	}
-	goto __finally303;
-	__catch303_g_error:
+	goto __finally304;
+	__catch304_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
+		GFile* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		GError* _tmp8_;
+		const gchar* _tmp9_;
 #line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
 #line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10680,17 +10704,17 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		if (detected) {
 #line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 10682 "Photo.c"
+#line 10706 "Photo.c"
 		} else {
 #line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 10686 "Photo.c"
+#line 10710 "Photo.c"
 		}
 #line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 10690 "Photo.c"
+#line 10714 "Photo.c"
 	}
-	__finally303:
+	__finally304:
 #line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10701,7 +10725,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		_backing_photo_row_unref0 (backing);
 #line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 10703 "Photo.c"
+#line 10727 "Photo.c"
 	}
 #line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = file;
@@ -10727,7 +10751,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		_backing_photo_row_unref0 (backing);
 #line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 10729 "Photo.c"
+#line 10753 "Photo.c"
 	}
 #line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = interrogator;
@@ -10743,23 +10767,23 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 	if (_tmp17_ == NULL) {
 #line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = TRUE;
-#line 10745 "Photo.c"
+#line 10769 "Photo.c"
 	} else {
-		PhotoFileInterrogator* _tmp18_ = NULL;
-		gboolean _tmp19_ = FALSE;
+		PhotoFileInterrogator* _tmp18_;
+		gboolean _tmp19_;
 #line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = interrogator;
 #line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = photo_file_interrogator_get_is_photo_corrupted (_tmp18_);
 #line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp19_;
-#line 10755 "Photo.c"
+#line 10779 "Photo.c"
 	}
 #line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 10759 "Photo.c"
-		gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
+#line 10783 "Photo.c"
+		gchar* _tmp20_;
+		gchar* _tmp21_;
 #line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
 #line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10780,15 +10804,15 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		if (detected) {
 #line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 10782 "Photo.c"
+#line 10806 "Photo.c"
 		} else {
 #line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 10786 "Photo.c"
+#line 10810 "Photo.c"
 		}
 #line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 10790 "Photo.c"
+#line 10814 "Photo.c"
 	}
 #line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = info;
@@ -10844,10 +10868,10 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 	_tmp41_ = _tmp40_->metadata;
 #line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp41_ != NULL) {
-#line 10846 "Photo.c"
-		DetectedPhotoInformation* _tmp42_ = NULL;
-		PhotoMetadata* _tmp43_ = NULL;
-		Orientation _tmp44_ = 0;
+#line 10870 "Photo.c"
+		DetectedPhotoInformation* _tmp42_;
+		PhotoMetadata* _tmp43_;
+		Orientation _tmp44_;
 #line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = _vala_detected;
 #line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10856,11 +10880,11 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		_tmp44_ = photo_metadata_get_orientation (_tmp43_);
 #line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = _tmp44_;
-#line 10858 "Photo.c"
+#line 10882 "Photo.c"
 	} else {
 #line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = ORIENTATION_TOP_LEFT;
-#line 10862 "Photo.c"
+#line 10886 "Photo.c"
 	}
 #line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = backing;
@@ -10876,185 +10900,185 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 	if (detected) {
 #line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 		*detected = _vala_detected;
-#line 10878 "Photo.c"
+#line 10902 "Photo.c"
 	} else {
 #line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (_vala_detected);
-#line 10882 "Photo.c"
+#line 10906 "Photo.c"
 	}
 #line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 10886 "Photo.c"
+#line 10910 "Photo.c"
 }
 
 
-static void _vala_array_add88 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add88 (gchar** * array, int* length, int* size, gchar* value) {
 #line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10897 "Photo.c"
+#line 10921 "Photo.c"
 	}
 #line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10903 "Photo.c"
+#line 10927 "Photo.c"
 }
 
 
-static void _vala_array_add89 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add89 (gchar** * array, int* length, int* size, gchar* value) {
 #line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10914 "Photo.c"
+#line 10938 "Photo.c"
 	}
 #line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10920 "Photo.c"
+#line 10944 "Photo.c"
 }
 
 
-static void _vala_array_add90 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add90 (gchar** * array, int* length, int* size, gchar* value) {
 #line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10931 "Photo.c"
+#line 10955 "Photo.c"
 	}
 #line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10937 "Photo.c"
+#line 10961 "Photo.c"
 }
 
 
-static void _vala_array_add91 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add91 (gchar** * array, int* length, int* size, gchar* value) {
 #line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10948 "Photo.c"
+#line 10972 "Photo.c"
 	}
 #line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10954 "Photo.c"
+#line 10978 "Photo.c"
 }
 
 
-static void _vala_array_add92 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add92 (gchar** * array, int* length, int* size, gchar* value) {
 #line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10965 "Photo.c"
+#line 10989 "Photo.c"
 	}
 #line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10971 "Photo.c"
+#line 10995 "Photo.c"
 }
 
 
-static void _vala_array_add93 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add93 (gchar** * array, int* length, int* size, gchar* value) {
 #line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10982 "Photo.c"
+#line 11006 "Photo.c"
 	}
 #line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10988 "Photo.c"
+#line 11012 "Photo.c"
 }
 
 
 static gpointer _media_metadata_ref0 (gpointer self) {
 #line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? media_metadata_ref (self) : NULL;
-#line 10995 "Photo.c"
+#line 11019 "Photo.c"
 }
 
 
-gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState** reimport_state, GError** error) {
+gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error) {
 	PhotoReimportMasterState* _vala_reimport_state = NULL;
 	gboolean result = FALSE;
 	GFile* file = NULL;
-	PhotoFileReader* _tmp0_ = NULL;
-	PhotoFileReader* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	PhotoFileReader* _tmp0_;
+	PhotoFileReader* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
 	DetectedPhotoInformation* detected = NULL;
 	BackingPhotoRow* backing = NULL;
-	GFile* _tmp4_ = NULL;
+	GFile* _tmp4_;
 	DetectedPhotoInformation* _tmp5_ = NULL;
-	BackingPhotoRow* _tmp6_ = NULL;
-	BackingPhotoRow* _tmp8_ = NULL;
+	BackingPhotoRow* _tmp6_;
+	BackingPhotoRow* _tmp8_;
 	gboolean _tmp12_ = FALSE;
 	gboolean _tmp13_ = FALSE;
-	DetectedPhotoInformation* _tmp14_ = NULL;
-	GdkColorspace _tmp15_ = 0;
+	DetectedPhotoInformation* _tmp14_;
+	GdkColorspace _tmp15_;
 	PhotoRow* updated_row = NULL;
-	PhotoRow* _tmp23_ = NULL;
+	PhotoRow* _tmp23_;
 	gchar** list = NULL;
-	gchar** _tmp29_ = NULL;
-	gint list_length1 = 0;
-	gint _list_size_ = 0;
-	PhotoRow* _tmp30_ = NULL;
-	const gchar* _tmp31_ = NULL;
-	DetectedPhotoInformation* _tmp32_ = NULL;
-	const gchar* _tmp33_ = NULL;
-	PhotoRow* _tmp36_ = NULL;
-	BackingPhotoRow* _tmp37_ = NULL;
-	Orientation _tmp38_ = 0;
-	BackingPhotoRow* _tmp39_ = NULL;
-	Orientation _tmp40_ = 0;
-	DetectedPhotoInformation* _tmp47_ = NULL;
-	PhotoMetadata* _tmp48_ = NULL;
-	PhotoRow* _tmp85_ = NULL;
-	BackingPhotoRow* _tmp86_ = NULL;
-	BackingPhotoRow* _tmp87_ = NULL;
-	PhotoRow* _tmp88_ = NULL;
-	DetectedPhotoInformation* _tmp89_ = NULL;
-	const gchar* _tmp90_ = NULL;
-	gchar* _tmp91_ = NULL;
-	PhotoRow* _tmp92_ = NULL;
-	DetectedPhotoInformation* _tmp93_ = NULL;
-	const gchar* _tmp94_ = NULL;
-	gchar* _tmp95_ = NULL;
-	PhotoRow* _tmp96_ = NULL;
-	DetectedPhotoInformation* _tmp97_ = NULL;
-	const gchar* _tmp98_ = NULL;
-	gchar* _tmp99_ = NULL;
+	gchar** _tmp29_;
+	gint list_length1;
+	gint _list_size_;
+	PhotoRow* _tmp30_;
+	const gchar* _tmp31_;
+	DetectedPhotoInformation* _tmp32_;
+	const gchar* _tmp33_;
+	PhotoRow* _tmp36_;
+	BackingPhotoRow* _tmp37_;
+	Orientation _tmp38_;
+	BackingPhotoRow* _tmp39_;
+	Orientation _tmp40_;
+	DetectedPhotoInformation* _tmp47_;
+	PhotoMetadata* _tmp48_;
+	PhotoRow* _tmp85_;
+	BackingPhotoRow* _tmp86_;
+	BackingPhotoRow* _tmp87_;
+	PhotoRow* _tmp88_;
+	DetectedPhotoInformation* _tmp89_;
+	const gchar* _tmp90_;
+	gchar* _tmp91_;
+	PhotoRow* _tmp92_;
+	DetectedPhotoInformation* _tmp93_;
+	const gchar* _tmp94_;
+	gchar* _tmp95_;
+	PhotoRow* _tmp96_;
+	DetectedPhotoInformation* _tmp97_;
+	const gchar* _tmp98_;
+	gchar* _tmp99_;
 	PhotoMetadata* metadata = NULL;
-	DetectedPhotoInformation* _tmp100_ = NULL;
-	PhotoMetadata* _tmp101_ = NULL;
-	PhotoRow* _tmp124_ = NULL;
-	PhotoMetadata* _tmp125_ = NULL;
-	gchar** _tmp126_ = NULL;
-	gint _tmp126__length1 = 0;
-	PhotoReimportMasterStateImpl* _tmp127_ = NULL;
+	DetectedPhotoInformation* _tmp100_;
+	PhotoMetadata* _tmp101_;
+	PhotoRow* _tmp124_;
+	PhotoMetadata* _tmp125_;
+	gchar** _tmp126_;
+	gint _tmp126__length1;
+	PhotoReimportMasterStateImpl* _tmp127_;
 	GError * _inner_error_ = NULL;
 #line 1411 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -11086,7 +11110,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 	backing = _tmp6_;
 #line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11088 "Photo.c"
+#line 11112 "Photo.c"
 		gboolean _tmp7_ = FALSE;
 #line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
@@ -11096,16 +11120,16 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_g_object_unref0 (file);
 #line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp7_;
-#line 11098 "Photo.c"
+#line 11122 "Photo.c"
 	}
 #line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = backing;
 #line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ == NULL) {
-#line 11104 "Photo.c"
-		GFile* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
+#line 11128 "Photo.c"
+		GFile* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
 #line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = file;
 #line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11128,15 +11152,15 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		if (reimport_state) {
 #line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 			*reimport_state = _vala_reimport_state;
-#line 11130 "Photo.c"
+#line 11154 "Photo.c"
 		} else {
 #line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11134 "Photo.c"
+#line 11158 "Photo.c"
 		}
 #line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 11138 "Photo.c"
+#line 11162 "Photo.c"
 	}
 #line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = detected;
@@ -11146,40 +11170,40 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 	if (_tmp15_ != GDK_COLORSPACE_RGB) {
 #line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = TRUE;
-#line 11148 "Photo.c"
+#line 11172 "Photo.c"
 	} else {
-		DetectedPhotoInformation* _tmp16_ = NULL;
-		gint _tmp17_ = 0;
+		DetectedPhotoInformation* _tmp16_;
+		gint _tmp17_;
 #line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = detected;
 #line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = _tmp16_->channels;
 #line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _tmp17_ < 3;
-#line 11158 "Photo.c"
+#line 11182 "Photo.c"
 	}
 #line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp13_) {
 #line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = TRUE;
-#line 11164 "Photo.c"
+#line 11188 "Photo.c"
 	} else {
-		DetectedPhotoInformation* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
+		DetectedPhotoInformation* _tmp18_;
+		gint _tmp19_;
 #line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = detected;
 #line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = _tmp18_->bits_per_channel;
 #line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp19_ != 8;
-#line 11174 "Photo.c"
+#line 11198 "Photo.c"
 	}
 #line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
-#line 11178 "Photo.c"
-		GFile* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
+#line 11202 "Photo.c"
+		GFile* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
 #line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = file;
 #line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11202,31 +11226,31 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		if (reimport_state) {
 #line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 			*reimport_state = _vala_reimport_state;
-#line 11204 "Photo.c"
+#line 11228 "Photo.c"
 		} else {
 #line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11208 "Photo.c"
+#line 11232 "Photo.c"
 		}
 #line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 11212 "Photo.c"
+#line 11236 "Photo.c"
 	}
 #line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = photo_row_new ();
 #line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
 	updated_row = _tmp23_;
-#line 11218 "Photo.c"
+#line 11242 "Photo.c"
 	{
-		PhotoRow* _tmp24_ = NULL;
+		PhotoRow* _tmp24_;
 #line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = self->row;
 #line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 11225 "Photo.c"
+#line 11249 "Photo.c"
 		{
-			PhotoRow* _tmp25_ = NULL;
-			PhotoRow* _tmp26_ = NULL;
+			PhotoRow* _tmp25_;
+			PhotoRow* _tmp26_;
 #line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp25_ = self->row;
 #line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11235,20 +11259,20 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 			_photo_row_unref0 (updated_row);
 #line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 			updated_row = _tmp26_;
-#line 11237 "Photo.c"
+#line 11261 "Photo.c"
 		}
-		__finally304:
+		__finally305:
 		{
-			PhotoRow* _tmp27_ = NULL;
+			PhotoRow* _tmp27_;
 #line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = self->row;
 #line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 11246 "Photo.c"
+#line 11270 "Photo.c"
 		}
 #line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11250 "Photo.c"
+#line 11274 "Photo.c"
 			gboolean _tmp28_ = FALSE;
 #line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
@@ -11262,7 +11286,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 			_g_object_unref0 (file);
 #line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp28_;
-#line 11264 "Photo.c"
+#line 11288 "Photo.c"
 		}
 	}
 #line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11283,10 +11307,10 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 	_tmp33_ = _tmp32_->md5;
 #line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_strcmp0 (_tmp31_, _tmp33_) != 0) {
-#line 11285 "Photo.c"
-		gchar** _tmp34_ = NULL;
-		gint _tmp34__length1 = 0;
-		gchar* _tmp35_ = NULL;
+#line 11309 "Photo.c"
+		gchar** _tmp34_;
+		gint _tmp34__length1;
+		gchar* _tmp35_;
 #line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp34_ = list;
 #line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11295,7 +11319,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_tmp35_ = g_strdup ("metadata:md5");
 #line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_array_add88 (&list, &list_length1, &_list_size_, _tmp35_);
-#line 11297 "Photo.c"
+#line 11321 "Photo.c"
 	}
 #line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = updated_row;
@@ -11309,14 +11333,14 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 	_tmp40_ = _tmp39_->original_orientation;
 #line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp38_ != _tmp40_) {
-#line 11311 "Photo.c"
-		gchar** _tmp41_ = NULL;
-		gint _tmp41__length1 = 0;
-		gchar* _tmp42_ = NULL;
-		PhotoRow* _tmp43_ = NULL;
-		BackingPhotoRow* _tmp44_ = NULL;
-		BackingPhotoRow* _tmp45_ = NULL;
-		Orientation _tmp46_ = 0;
+#line 11335 "Photo.c"
+		gchar** _tmp41_;
+		gint _tmp41__length1;
+		gchar* _tmp42_;
+		PhotoRow* _tmp43_;
+		BackingPhotoRow* _tmp44_;
+		BackingPhotoRow* _tmp45_;
+		Orientation _tmp46_;
 #line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = list;
 #line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11335,7 +11359,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_tmp46_ = _tmp45_->original_orientation;
 #line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_->original_orientation = _tmp46_;
-#line 11337 "Photo.c"
+#line 11361 "Photo.c"
 	}
 #line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = detected;
@@ -11343,32 +11367,32 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 	_tmp48_ = _tmp47_->metadata;
 #line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp48_ != NULL) {
-#line 11345 "Photo.c"
+#line 11369 "Photo.c"
 		MetadataDateTime* date_time = NULL;
-		DetectedPhotoInformation* _tmp49_ = NULL;
-		PhotoMetadata* _tmp50_ = NULL;
-		MetadataDateTime* _tmp51_ = NULL;
+		DetectedPhotoInformation* _tmp49_;
+		PhotoMetadata* _tmp50_;
+		MetadataDateTime* _tmp51_;
 		gboolean _tmp52_ = FALSE;
-		MetadataDateTime* _tmp53_ = NULL;
-		PhotoRow* _tmp60_ = NULL;
-		const gchar* _tmp61_ = NULL;
-		DetectedPhotoInformation* _tmp62_ = NULL;
-		PhotoMetadata* _tmp63_ = NULL;
-		gchar* _tmp64_ = NULL;
-		gchar* _tmp65_ = NULL;
-		gboolean _tmp66_ = FALSE;
-		PhotoRow* _tmp69_ = NULL;
-		const gchar* _tmp70_ = NULL;
-		DetectedPhotoInformation* _tmp71_ = NULL;
-		PhotoMetadata* _tmp72_ = NULL;
-		gchar* _tmp73_ = NULL;
-		gchar* _tmp74_ = NULL;
-		gboolean _tmp75_ = FALSE;
-		PhotoRow* _tmp78_ = NULL;
-		Rating _tmp79_ = 0;
-		DetectedPhotoInformation* _tmp80_ = NULL;
-		PhotoMetadata* _tmp81_ = NULL;
-		Rating _tmp82_ = 0;
+		MetadataDateTime* _tmp53_;
+		PhotoRow* _tmp60_;
+		const gchar* _tmp61_;
+		DetectedPhotoInformation* _tmp62_;
+		PhotoMetadata* _tmp63_;
+		gchar* _tmp64_;
+		gchar* _tmp65_;
+		gboolean _tmp66_;
+		PhotoRow* _tmp69_;
+		const gchar* _tmp70_;
+		DetectedPhotoInformation* _tmp71_;
+		PhotoMetadata* _tmp72_;
+		gchar* _tmp73_;
+		gchar* _tmp74_;
+		gboolean _tmp75_;
+		PhotoRow* _tmp78_;
+		Rating _tmp79_;
+		DetectedPhotoInformation* _tmp80_;
+		PhotoMetadata* _tmp81_;
+		Rating _tmp82_;
 #line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = detected;
 #line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11381,11 +11405,11 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_tmp53_ = date_time;
 #line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp53_ != NULL) {
-#line 11383 "Photo.c"
-			PhotoRow* _tmp54_ = NULL;
-			time_t _tmp55_ = 0;
-			MetadataDateTime* _tmp56_ = NULL;
-			time_t _tmp57_ = 0;
+#line 11407 "Photo.c"
+			PhotoRow* _tmp54_;
+			time_t _tmp55_;
+			MetadataDateTime* _tmp56_;
+			time_t _tmp57_;
 #line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp54_ = updated_row;
 #line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11396,18 +11420,18 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 			_tmp57_ = metadata_date_time_get_timestamp (_tmp56_);
 #line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp52_ = _tmp55_ != _tmp57_;
-#line 11398 "Photo.c"
+#line 11422 "Photo.c"
 		} else {
 #line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp52_ = FALSE;
-#line 11402 "Photo.c"
+#line 11426 "Photo.c"
 		}
 #line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp52_) {
-#line 11406 "Photo.c"
-			gchar** _tmp58_ = NULL;
-			gint _tmp58__length1 = 0;
-			gchar* _tmp59_ = NULL;
+#line 11430 "Photo.c"
+			gchar** _tmp58_;
+			gint _tmp58__length1;
+			gchar* _tmp59_;
 #line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = list;
 #line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11416,7 +11440,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 			_tmp59_ = g_strdup ("metadata:exposure-time");
 #line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add90 (&list, &list_length1, &_list_size_, _tmp59_);
-#line 11418 "Photo.c"
+#line 11442 "Photo.c"
 		}
 #line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = updated_row;
@@ -11436,10 +11460,10 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_g_free0 (_tmp65_);
 #line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp66_) {
-#line 11438 "Photo.c"
-			gchar** _tmp67_ = NULL;
-			gint _tmp67__length1 = 0;
-			gchar* _tmp68_ = NULL;
+#line 11462 "Photo.c"
+			gchar** _tmp67_;
+			gint _tmp67__length1;
+			gchar* _tmp68_;
 #line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp67_ = list;
 #line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11448,7 +11472,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 			_tmp68_ = g_strdup ("metadata:name");
 #line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add91 (&list, &list_length1, &_list_size_, _tmp68_);
-#line 11450 "Photo.c"
+#line 11474 "Photo.c"
 		}
 #line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = updated_row;
@@ -11468,10 +11492,10 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_g_free0 (_tmp74_);
 #line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp75_) {
-#line 11470 "Photo.c"
-			gchar** _tmp76_ = NULL;
-			gint _tmp76__length1 = 0;
-			gchar* _tmp77_ = NULL;
+#line 11494 "Photo.c"
+			gchar** _tmp76_;
+			gint _tmp76__length1;
+			gchar* _tmp77_;
 #line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76_ = list;
 #line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11480,7 +11504,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 			_tmp77_ = g_strdup ("metadata:comment");
 #line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add92 (&list, &list_length1, &_list_size_, _tmp77_);
-#line 11482 "Photo.c"
+#line 11506 "Photo.c"
 		}
 #line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp78_ = updated_row;
@@ -11494,10 +11518,10 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_tmp82_ = photo_metadata_get_rating (_tmp81_);
 #line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp79_ != _tmp82_) {
-#line 11496 "Photo.c"
-			gchar** _tmp83_ = NULL;
-			gint _tmp83__length1 = 0;
-			gchar* _tmp84_ = NULL;
+#line 11520 "Photo.c"
+			gchar** _tmp83_;
+			gint _tmp83__length1;
+			gchar* _tmp84_;
 #line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp83_ = list;
 #line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11506,11 +11530,11 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 			_tmp84_ = g_strdup ("metadata:rating");
 #line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add93 (&list, &list_length1, &_list_size_, _tmp84_);
-#line 11508 "Photo.c"
+#line 11532 "Photo.c"
 		}
 #line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 11512 "Photo.c"
+#line 11536 "Photo.c"
 	}
 #line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp85_ = updated_row;
@@ -11566,27 +11590,27 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 	_tmp101_ = _tmp100_->metadata;
 #line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp101_ != NULL) {
-#line 11568 "Photo.c"
-		DetectedPhotoInformation* _tmp102_ = NULL;
-		PhotoMetadata* _tmp103_ = NULL;
-		PhotoMetadata* _tmp104_ = NULL;
+#line 11592 "Photo.c"
+		DetectedPhotoInformation* _tmp102_;
+		PhotoMetadata* _tmp103_;
+		PhotoMetadata* _tmp104_;
 		MetadataDateTime* date_time = NULL;
-		DetectedPhotoInformation* _tmp105_ = NULL;
-		PhotoMetadata* _tmp106_ = NULL;
-		MetadataDateTime* _tmp107_ = NULL;
-		MetadataDateTime* _tmp108_ = NULL;
-		PhotoRow* _tmp112_ = NULL;
-		DetectedPhotoInformation* _tmp113_ = NULL;
-		PhotoMetadata* _tmp114_ = NULL;
-		gchar* _tmp115_ = NULL;
-		PhotoRow* _tmp116_ = NULL;
-		DetectedPhotoInformation* _tmp117_ = NULL;
-		PhotoMetadata* _tmp118_ = NULL;
-		gchar* _tmp119_ = NULL;
-		PhotoRow* _tmp120_ = NULL;
-		DetectedPhotoInformation* _tmp121_ = NULL;
-		PhotoMetadata* _tmp122_ = NULL;
-		Rating _tmp123_ = 0;
+		DetectedPhotoInformation* _tmp105_;
+		PhotoMetadata* _tmp106_;
+		MetadataDateTime* _tmp107_;
+		MetadataDateTime* _tmp108_;
+		PhotoRow* _tmp112_;
+		DetectedPhotoInformation* _tmp113_;
+		PhotoMetadata* _tmp114_;
+		gchar* _tmp115_;
+		PhotoRow* _tmp116_;
+		DetectedPhotoInformation* _tmp117_;
+		PhotoMetadata* _tmp118_;
+		gchar* _tmp119_;
+		PhotoRow* _tmp120_;
+		DetectedPhotoInformation* _tmp121_;
+		PhotoMetadata* _tmp122_;
+		Rating _tmp123_;
 #line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp102_ = detected;
 #line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11609,10 +11633,10 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_tmp108_ = date_time;
 #line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp108_ != NULL) {
-#line 11611 "Photo.c"
-			PhotoRow* _tmp109_ = NULL;
-			MetadataDateTime* _tmp110_ = NULL;
-			time_t _tmp111_ = 0;
+#line 11635 "Photo.c"
+			PhotoRow* _tmp109_;
+			MetadataDateTime* _tmp110_;
+			time_t _tmp111_;
 #line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp109_ = updated_row;
 #line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11621,7 +11645,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 			_tmp111_ = metadata_date_time_get_timestamp (_tmp110_);
 #line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp109_->exposure_time = _tmp111_;
-#line 11623 "Photo.c"
+#line 11647 "Photo.c"
 		}
 #line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp112_ = updated_row;
@@ -11659,7 +11683,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_tmp120_->rating = _tmp123_;
 #line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 11661 "Photo.c"
+#line 11685 "Photo.c"
 	}
 #line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp124_ = updated_row;
@@ -11693,15 +11717,15 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 	if (reimport_state) {
 #line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 		*reimport_state = _vala_reimport_state;
-#line 11695 "Photo.c"
+#line 11719 "Photo.c"
 	} else {
 #line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11699 "Photo.c"
+#line 11723 "Photo.c"
 	}
 #line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 11703 "Photo.c"
+#line 11727 "Photo.c"
 }
 
 
@@ -11710,7 +11734,7 @@ static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetad
 	g_critical ("Type `%s' does not implement abstract method `photo_apply_user_metadata_for_reimport'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 1488 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 11712 "Photo.c"
+#line 11736 "Photo.c"
 }
 
 
@@ -11719,65 +11743,65 @@ void photo_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadat
 	g_return_if_fail (IS_PHOTO (self));
 #line 1488 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->apply_user_metadata_for_reimport (self, metadata);
-#line 11721 "Photo.c"
+#line 11745 "Photo.c"
 }
 
 
 static gpointer _photo_reimport_master_state_ref0 (gpointer self) {
 #line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_reimport_master_state_ref (self) : NULL;
-#line 11728 "Photo.c"
+#line 11752 "Photo.c"
 }
 
 
-static void _vala_array_add94 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add94 (gchar** * array, int* length, int* size, gchar* value) {
 #line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 11739 "Photo.c"
+#line 11763 "Photo.c"
 	}
 #line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 11745 "Photo.c"
+#line 11769 "Photo.c"
 }
 
 
-static void _vala_array_add95 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add95 (gchar** * array, int* length, int* size, gchar* value) {
 #line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 11756 "Photo.c"
+#line 11780 "Photo.c"
 	}
 #line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 11762 "Photo.c"
+#line 11786 "Photo.c"
 }
 
 
 void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error) {
 	PhotoReimportMasterStateImpl* reimport_state = NULL;
-	PhotoReimportMasterState* _tmp0_ = NULL;
-	PhotoReimportMasterStateImpl* _tmp1_ = NULL;
-	PhotoTable* _tmp2_ = NULL;
-	PhotoTable* _tmp3_ = NULL;
-	PhotoRow* _tmp4_ = NULL;
-	PhotoMetadata* _tmp20_ = NULL;
-	gboolean _tmp22_ = FALSE;
-	gchar** _tmp28_ = NULL;
-	gint _tmp28__length1 = 0;
-	PhotoMetadata* _tmp32_ = NULL;
-	gboolean _tmp33_ = FALSE;
-	gboolean _tmp35_ = FALSE;
+	PhotoReimportMasterState* _tmp0_;
+	PhotoReimportMasterStateImpl* _tmp1_;
+	PhotoTable* _tmp2_;
+	PhotoTable* _tmp3_;
+	PhotoRow* _tmp4_;
+	PhotoMetadata* _tmp20_;
+	gboolean _tmp22_;
+	gchar** _tmp28_;
+	gint _tmp28__length1;
+	PhotoMetadata* _tmp32_;
+	gboolean _tmp33_;
+	gboolean _tmp35_;
 	GError * _inner_error_ = NULL;
 #line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -11809,7 +11833,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 			_photo_reimport_master_state_unref0 (reimport_state);
 #line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 11811 "Photo.c"
+#line 11835 "Photo.c"
 		} else {
 #line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (reimport_state);
@@ -11819,31 +11843,31 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 			g_clear_error (&_inner_error_);
 #line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 11821 "Photo.c"
+#line 11845 "Photo.c"
 		}
 	}
 	{
-		PhotoRow* _tmp5_ = NULL;
+		PhotoRow* _tmp5_;
 #line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = self->row;
 #line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 11830 "Photo.c"
+#line 11854 "Photo.c"
 		{
 			BackingPhotoRow* original_master = NULL;
-			PhotoRow* _tmp6_ = NULL;
-			BackingPhotoRow* _tmp7_ = NULL;
-			BackingPhotoRow* _tmp8_ = NULL;
-			PhotoRow* _tmp9_ = NULL;
-			PhotoRow* _tmp10_ = NULL;
-			PhotoRow* _tmp11_ = NULL;
-			BackingPhotoRow* _tmp12_ = NULL;
-			BackingPhotoRow* _tmp13_ = NULL;
-			PhotoRow* _tmp14_ = NULL;
-			BackingPhotoRow* _tmp15_ = NULL;
-			PhotoRow* _tmp16_ = NULL;
-			BackingPhotoRow* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
+			PhotoRow* _tmp6_;
+			BackingPhotoRow* _tmp7_;
+			BackingPhotoRow* _tmp8_;
+			PhotoRow* _tmp9_;
+			PhotoRow* _tmp10_;
+			PhotoRow* _tmp11_;
+			BackingPhotoRow* _tmp12_;
+			BackingPhotoRow* _tmp13_;
+			PhotoRow* _tmp14_;
+			BackingPhotoRow* _tmp15_;
+			PhotoRow* _tmp16_;
+			BackingPhotoRow* _tmp17_;
+			gboolean _tmp18_;
 #line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->row;
 #line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11886,20 +11910,20 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 			if (!_tmp18_) {
 #line 1503 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_internal_remove_all_transformations (self, FALSE);
-#line 11888 "Photo.c"
+#line 11912 "Photo.c"
 			}
 #line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (original_master);
-#line 11892 "Photo.c"
+#line 11916 "Photo.c"
 		}
-		__finally305:
+		__finally306:
 		{
-			PhotoRow* _tmp19_ = NULL;
+			PhotoRow* _tmp19_;
 #line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = self->row;
 #line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 11901 "Photo.c"
+#line 11925 "Photo.c"
 		}
 #line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -11911,7 +11935,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 				_photo_reimport_master_state_unref0 (reimport_state);
 #line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 11913 "Photo.c"
+#line 11937 "Photo.c"
 			} else {
 #line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_master_state_unref0 (reimport_state);
@@ -11921,7 +11945,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 				g_clear_error (&_inner_error_);
 #line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 11923 "Photo.c"
+#line 11947 "Photo.c"
 			}
 		}
 	}
@@ -11929,23 +11953,23 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 	_tmp20_ = reimport_state->metadata;
 #line 1506 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp20_ != NULL) {
-#line 11931 "Photo.c"
-		PhotoMetadata* _tmp21_ = NULL;
+#line 11955 "Photo.c"
+		PhotoMetadata* _tmp21_;
 #line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = reimport_state->metadata;
 #line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_apply_user_metadata_for_reimport (self, _tmp21_);
-#line 11937 "Photo.c"
+#line 11961 "Photo.c"
 	}
 #line 1509 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = reimport_state->metadata_only;
 #line 1509 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp22_) {
-#line 11943 "Photo.c"
-		gchar** _tmp23_ = NULL;
-		gint _tmp23__length1 = 0;
-		gchar* _tmp24_ = NULL;
-		gboolean _tmp25_ = FALSE;
+#line 11967 "Photo.c"
+		gchar** _tmp23_;
+		gint _tmp23__length1;
+		gchar* _tmp24_;
+		gboolean _tmp25_;
 #line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = reimport_state->alterations;
 #line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11958,10 +11982,10 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 		_tmp25_ = photo_is_master_baseline (self);
 #line 1511 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp25_) {
-#line 11960 "Photo.c"
-			gchar** _tmp26_ = NULL;
-			gint _tmp26__length1 = 0;
-			gchar* _tmp27_ = NULL;
+#line 11984 "Photo.c"
+			gchar** _tmp26_;
+			gint _tmp26__length1;
+			gchar* _tmp27_;
 #line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = reimport_state->alterations;
 #line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11970,7 +11994,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 			_tmp27_ = g_strdup ("image:baseline");
 #line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add95 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp27_);
-#line 11972 "Photo.c"
+#line 11996 "Photo.c"
 		}
 	}
 #line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11979,11 +12003,11 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 	_tmp28__length1 = reimport_state->alterations_length1;
 #line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28__length1 > 0) {
-#line 11981 "Photo.c"
-		gchar** _tmp29_ = NULL;
-		gint _tmp29__length1 = 0;
-		Alteration* _tmp30_ = NULL;
-		Alteration* _tmp31_ = NULL;
+#line 12005 "Photo.c"
+		gchar** _tmp29_;
+		gint _tmp29__length1;
+		Alteration* _tmp30_;
+		Alteration* _tmp31_;
 #line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_ = reimport_state->alterations;
 #line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11996,7 +12020,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp31_);
 #line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp31_);
-#line 11998 "Photo.c"
+#line 12022 "Photo.c"
 	}
 #line 1518 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = reimport_state->metadata;
@@ -12006,46 +12030,46 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 	_tmp33_ = photo_is_master_baseline (self);
 #line 1520 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp33_) {
-#line 12008 "Photo.c"
-		PhotoMetadata* _tmp34_ = NULL;
+#line 12032 "Photo.c"
+		PhotoMetadata* _tmp34_;
 #line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp34_ = reimport_state->metadata;
 #line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_reimported (self, _tmp34_);
-#line 12014 "Photo.c"
+#line 12038 "Photo.c"
 	}
 #line 1523 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_is_master_source (self);
 #line 1523 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp35_) {
-#line 12020 "Photo.c"
-		PhotoMetadata* _tmp36_ = NULL;
+#line 12044 "Photo.c"
+		PhotoMetadata* _tmp36_;
 #line 1524 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = reimport_state->metadata;
 #line 1524 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_source_reimported (self, _tmp36_);
-#line 12026 "Photo.c"
+#line 12050 "Photo.c"
 	}
 #line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (reimport_state);
-#line 12030 "Photo.c"
+#line 12054 "Photo.c"
 }
 
 
-static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, BackingPhotoRow** backing, DetectedPhotoInformation** detected, GError** error) {
+static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, BackingPhotoRow* * backing, DetectedPhotoInformation* * detected, GError** error) {
 	BackingPhotoRow* _vala_backing = NULL;
 	DetectedPhotoInformation* _vala_detected = NULL;
 	gboolean result = FALSE;
 	BackingPhotoRow* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp1_;
 	DetectedPhotoInformation* _tmp2_ = NULL;
-	BackingPhotoRow* _tmp3_ = NULL;
-	BackingPhotoRow* _tmp5_ = NULL;
-	BackingPhotoRow* _tmp6_ = NULL;
+	BackingPhotoRow* _tmp3_;
+	BackingPhotoRow* _tmp5_;
+	BackingPhotoRow* _tmp6_;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
-	DetectedPhotoInformation* _tmp9_ = NULL;
-	GdkColorspace _tmp10_ = 0;
+	DetectedPhotoInformation* _tmp9_;
+	GdkColorspace _tmp10_;
 	GError * _inner_error_ = NULL;
 #line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -12063,13 +12087,13 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
 	_tmp0_ = _tmp3_;
 #line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12065 "Photo.c"
+#line 12089 "Photo.c"
 		gboolean _tmp4_ = FALSE;
 #line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
 #line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp4_;
-#line 12071 "Photo.c"
+#line 12095 "Photo.c"
 	}
 #line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp0_;
@@ -12091,25 +12115,25 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
 		if (backing) {
 #line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 			*backing = _vala_backing;
-#line 12093 "Photo.c"
+#line 12117 "Photo.c"
 		} else {
 #line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (_vala_backing);
-#line 12097 "Photo.c"
+#line 12121 "Photo.c"
 		}
 #line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (detected) {
 #line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 12103 "Photo.c"
+#line 12127 "Photo.c"
 		} else {
 #line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 12107 "Photo.c"
+#line 12131 "Photo.c"
 		}
 #line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12111 "Photo.c"
+#line 12135 "Photo.c"
 	}
 #line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _vala_detected;
@@ -12119,40 +12143,40 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
 	if (_tmp10_ != GDK_COLORSPACE_RGB) {
 #line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = TRUE;
-#line 12121 "Photo.c"
+#line 12145 "Photo.c"
 	} else {
-		DetectedPhotoInformation* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
+		DetectedPhotoInformation* _tmp11_;
+		gint _tmp12_;
 #line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _vala_detected;
 #line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp11_->channels;
 #line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = _tmp12_ < 3;
-#line 12131 "Photo.c"
+#line 12155 "Photo.c"
 	}
 #line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
 #line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = TRUE;
-#line 12137 "Photo.c"
+#line 12161 "Photo.c"
 	} else {
-		DetectedPhotoInformation* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
+		DetectedPhotoInformation* _tmp13_;
+		gint _tmp14_;
 #line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _vala_detected;
 #line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp13_->bits_per_channel;
 #line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp14_ != 8;
-#line 12147 "Photo.c"
+#line 12171 "Photo.c"
 	}
 #line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_) {
-#line 12151 "Photo.c"
-		GFile* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
+#line 12175 "Photo.c"
+		GFile* _tmp15_;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
 #line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = file;
 #line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12171,25 +12195,25 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
 		if (backing) {
 #line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 			*backing = _vala_backing;
-#line 12173 "Photo.c"
+#line 12197 "Photo.c"
 		} else {
 #line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (_vala_backing);
-#line 12177 "Photo.c"
+#line 12201 "Photo.c"
 		}
 #line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (detected) {
 #line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 12183 "Photo.c"
+#line 12207 "Photo.c"
 		} else {
 #line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 12187 "Photo.c"
+#line 12211 "Photo.c"
 		}
 #line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12191 "Photo.c"
+#line 12215 "Photo.c"
 	}
 #line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
@@ -12199,45 +12223,45 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
 	if (backing) {
 #line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 		*backing = _vala_backing;
-#line 12201 "Photo.c"
+#line 12225 "Photo.c"
 	} else {
 #line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (_vala_backing);
-#line 12205 "Photo.c"
+#line 12229 "Photo.c"
 	}
 #line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (detected) {
 #line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 		*detected = _vala_detected;
-#line 12211 "Photo.c"
+#line 12235 "Photo.c"
 	} else {
 #line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (_vala_detected);
-#line 12215 "Photo.c"
+#line 12239 "Photo.c"
 	}
 #line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12219 "Photo.c"
+#line 12243 "Photo.c"
 }
 
 
-gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditableState** state, GError** error) {
+gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditableState* * state, GError** error) {
 	PhotoReimportEditableState* _vala_state = NULL;
 	gboolean result = FALSE;
 	GFile* file = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 	DetectedPhotoInformation* detected = NULL;
 	BackingPhotoRow* backing = NULL;
 	gboolean _tmp2_ = FALSE;
-	GFile* _tmp3_ = NULL;
+	GFile* _tmp3_;
 	BackingPhotoRow* _tmp4_ = NULL;
 	DetectedPhotoInformation* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	BackingPhotoRow* _tmp8_ = NULL;
-	DetectedPhotoInformation* _tmp9_ = NULL;
-	PhotoMetadata* _tmp10_ = NULL;
-	PhotoReimportEditableStateImpl* _tmp11_ = NULL;
+	gboolean _tmp6_;
+	BackingPhotoRow* _tmp8_;
+	DetectedPhotoInformation* _tmp9_;
+	PhotoMetadata* _tmp10_;
+	PhotoReimportEditableStateImpl* _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -12261,15 +12285,15 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
 		if (state) {
 #line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 12263 "Photo.c"
+#line 12287 "Photo.c"
 		} else {
 #line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12267 "Photo.c"
+#line 12291 "Photo.c"
 		}
 #line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12271 "Photo.c"
+#line 12295 "Photo.c"
 	}
 #line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file;
@@ -12287,7 +12311,7 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
 	_tmp2_ = _tmp6_;
 #line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12289 "Photo.c"
+#line 12313 "Photo.c"
 		gboolean _tmp7_ = FALSE;
 #line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
@@ -12299,7 +12323,7 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
 		_g_object_unref0 (file);
 #line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp7_;
-#line 12301 "Photo.c"
+#line 12325 "Photo.c"
 	}
 #line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp2_) {
@@ -12315,15 +12339,15 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
 		if (state) {
 #line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 12317 "Photo.c"
+#line 12341 "Photo.c"
 		} else {
 #line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12321 "Photo.c"
+#line 12345 "Photo.c"
 		}
 #line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12325 "Photo.c"
+#line 12349 "Photo.c"
 	}
 #line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = backing;
@@ -12349,47 +12373,47 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
 	if (state) {
 #line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 12351 "Photo.c"
+#line 12375 "Photo.c"
 	} else {
 #line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12355 "Photo.c"
+#line 12379 "Photo.c"
 	}
 #line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12359 "Photo.c"
+#line 12383 "Photo.c"
 }
 
 
 static gpointer _photo_reimport_editable_state_ref0 (gpointer self) {
 #line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_reimport_editable_state_ref (self) : NULL;
-#line 12366 "Photo.c"
+#line 12390 "Photo.c"
 }
 
 
 void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* state, GError** error) {
 	BackingPhotoID editable_id = {0};
 	BackingPhotoID _tmp0_ = {0};
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	PhotoReimportEditableStateImpl* reimport_state = NULL;
-	PhotoReimportEditableState* _tmp2_ = NULL;
-	PhotoReimportEditableStateImpl* _tmp3_ = NULL;
-	PhotoReimportEditableStateImpl* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	PhotoReimportEditableStateImpl* _tmp21_ = NULL;
-	PhotoMetadata* _tmp22_ = NULL;
+	PhotoReimportEditableState* _tmp2_;
+	PhotoReimportEditableStateImpl* _tmp3_;
+	PhotoReimportEditableStateImpl* _tmp4_;
+	gboolean _tmp5_;
+	PhotoReimportEditableStateImpl* _tmp21_;
+	PhotoMetadata* _tmp22_;
 	gchar* list = NULL;
-	gchar* _tmp36_ = NULL;
-	PhotoReimportEditableStateImpl* _tmp37_ = NULL;
-	gboolean _tmp38_ = FALSE;
-	const gchar* _tmp41_ = NULL;
-	Alteration* _tmp42_ = NULL;
-	Alteration* _tmp43_ = NULL;
-	PhotoReimportEditableStateImpl* _tmp44_ = NULL;
-	PhotoMetadata* _tmp45_ = NULL;
-	gboolean _tmp46_ = FALSE;
-	gboolean _tmp49_ = FALSE;
+	gchar* _tmp36_;
+	PhotoReimportEditableStateImpl* _tmp37_;
+	gboolean _tmp38_;
+	const gchar* _tmp41_;
+	Alteration* _tmp42_;
+	Alteration* _tmp43_;
+	PhotoReimportEditableStateImpl* _tmp44_;
+	PhotoMetadata* _tmp45_;
+	gboolean _tmp46_;
+	gboolean _tmp49_;
 	GError * _inner_error_ = NULL;
 #line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -12405,7 +12429,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 	if (_tmp1_) {
 #line 1570 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 12407 "Photo.c"
+#line 12431 "Photo.c"
 	}
 #line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = state;
@@ -12419,11 +12443,11 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 	_tmp5_ = _tmp4_->metadata_only;
 #line 1574 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp5_) {
-#line 12421 "Photo.c"
-		BackingPhotoTable* _tmp6_ = NULL;
-		BackingPhotoTable* _tmp7_ = NULL;
-		PhotoReimportEditableStateImpl* _tmp8_ = NULL;
-		BackingPhotoRow* _tmp9_ = NULL;
+#line 12445 "Photo.c"
+		BackingPhotoTable* _tmp6_;
+		BackingPhotoTable* _tmp7_;
+		PhotoReimportEditableStateImpl* _tmp8_;
+		BackingPhotoRow* _tmp9_;
 #line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = backing_photo_table_get_instance ();
 #line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12446,7 +12470,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 				_photo_reimport_editable_state_unref0 (reimport_state);
 #line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 12448 "Photo.c"
+#line 12472 "Photo.c"
 			} else {
 #line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_editable_state_unref0 (reimport_state);
@@ -12456,23 +12480,23 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 				g_clear_error (&_inner_error_);
 #line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 12458 "Photo.c"
+#line 12482 "Photo.c"
 			}
 		}
 		{
-			PhotoRow* _tmp10_ = NULL;
+			PhotoRow* _tmp10_;
 #line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = self->row;
 #line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 12467 "Photo.c"
+#line 12491 "Photo.c"
 			{
-				PhotoReimportEditableStateImpl* _tmp11_ = NULL;
-				BackingPhotoRow* _tmp12_ = NULL;
-				BackingPhotoRow* _tmp13_ = NULL;
-				PhotoReimportEditableStateImpl* _tmp14_ = NULL;
-				BackingPhotoRow* _tmp15_ = NULL;
-				Orientation _tmp16_ = 0;
+				PhotoReimportEditableStateImpl* _tmp11_;
+				BackingPhotoRow* _tmp12_;
+				BackingPhotoRow* _tmp13_;
+				PhotoReimportEditableStateImpl* _tmp14_;
+				BackingPhotoRow* _tmp15_;
+				Orientation _tmp16_;
 #line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = reimport_state;
 #line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12493,16 +12517,16 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 				photo_set_orientation (self, _tmp16_);
 #line 1580 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_internal_remove_all_transformations (self, FALSE);
-#line 12495 "Photo.c"
+#line 12519 "Photo.c"
 			}
-			__finally306:
+			__finally307:
 			{
-				PhotoRow* _tmp17_ = NULL;
+				PhotoRow* _tmp17_;
 #line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = self->row;
 #line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 12504 "Photo.c"
+#line 12528 "Photo.c"
 			}
 #line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -12514,7 +12538,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 					_photo_reimport_editable_state_unref0 (reimport_state);
 #line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 12516 "Photo.c"
+#line 12540 "Photo.c"
 				} else {
 #line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_reimport_editable_state_unref0 (reimport_state);
@@ -12524,14 +12548,14 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 					g_clear_error (&_inner_error_);
 #line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 12526 "Photo.c"
+#line 12550 "Photo.c"
 				}
 			}
 		}
 	} else {
-		PhotoReimportEditableStateImpl* _tmp18_ = NULL;
-		BackingPhotoRow* _tmp19_ = NULL;
-		Orientation _tmp20_ = 0;
+		PhotoReimportEditableStateImpl* _tmp18_;
+		BackingPhotoRow* _tmp19_;
+		Orientation _tmp20_;
 #line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = reimport_state;
 #line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12540,7 +12564,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 		_tmp20_ = _tmp19_->original_orientation;
 #line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_set_orientation (self, _tmp20_);
-#line 12542 "Photo.c"
+#line 12566 "Photo.c"
 	}
 #line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = reimport_state;
@@ -12548,20 +12572,20 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 	_tmp22_ = _tmp21_->metadata;
 #line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 12550 "Photo.c"
-		PhotoReimportEditableStateImpl* _tmp23_ = NULL;
-		PhotoMetadata* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
-		PhotoReimportEditableStateImpl* _tmp27_ = NULL;
-		PhotoMetadata* _tmp28_ = NULL;
-		gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		PhotoReimportEditableStateImpl* _tmp31_ = NULL;
-		PhotoMetadata* _tmp32_ = NULL;
-		Rating _tmp33_ = 0;
-		PhotoReimportEditableStateImpl* _tmp34_ = NULL;
-		PhotoMetadata* _tmp35_ = NULL;
+#line 12574 "Photo.c"
+		PhotoReimportEditableStateImpl* _tmp23_;
+		PhotoMetadata* _tmp24_;
+		gchar* _tmp25_;
+		gchar* _tmp26_;
+		PhotoReimportEditableStateImpl* _tmp27_;
+		PhotoMetadata* _tmp28_;
+		gchar* _tmp29_;
+		gchar* _tmp30_;
+		PhotoReimportEditableStateImpl* _tmp31_;
+		PhotoMetadata* _tmp32_;
+		Rating _tmp33_;
+		PhotoReimportEditableStateImpl* _tmp34_;
+		PhotoMetadata* _tmp35_;
 #line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = reimport_state;
 #line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12600,7 +12624,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 		_tmp35_ = _tmp34_->metadata;
 #line 1590 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_apply_user_metadata_for_reimport (self, _tmp35_);
-#line 12602 "Photo.c"
+#line 12626 "Photo.c"
 	}
 #line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time");
@@ -12612,9 +12636,9 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 	_tmp38_ = _tmp37_->metadata_only;
 #line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp38_) {
-#line 12614 "Photo.c"
-		const gchar* _tmp39_ = NULL;
-		gchar* _tmp40_ = NULL;
+#line 12638 "Photo.c"
+		const gchar* _tmp39_;
+		gchar* _tmp40_;
 #line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = list;
 #line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12623,7 +12647,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 		_g_free0 (list);
 #line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
 		list = _tmp40_;
-#line 12625 "Photo.c"
+#line 12649 "Photo.c"
 	}
 #line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = list;
@@ -12645,59 +12669,59 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 	_tmp46_ = photo_is_editable_baseline (self);
 #line 1601 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp46_) {
-#line 12647 "Photo.c"
-		PhotoReimportEditableStateImpl* _tmp47_ = NULL;
-		PhotoMetadata* _tmp48_ = NULL;
+#line 12671 "Photo.c"
+		PhotoReimportEditableStateImpl* _tmp47_;
+		PhotoMetadata* _tmp48_;
 #line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = reimport_state;
 #line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp47_->metadata;
 #line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_reimported (self, _tmp48_);
-#line 12656 "Photo.c"
+#line 12680 "Photo.c"
 	}
 #line 1604 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = photo_is_editable_source (self);
 #line 1604 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp49_) {
-#line 12662 "Photo.c"
-		PhotoReimportEditableStateImpl* _tmp50_ = NULL;
-		PhotoMetadata* _tmp51_ = NULL;
+#line 12686 "Photo.c"
+		PhotoReimportEditableStateImpl* _tmp50_;
+		PhotoMetadata* _tmp51_;
 #line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp50_ = reimport_state;
 #line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = _tmp50_->metadata;
 #line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_source_reimported (self, _tmp51_);
-#line 12671 "Photo.c"
+#line 12695 "Photo.c"
 	}
 #line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (list);
 #line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (reimport_state);
-#line 12677 "Photo.c"
+#line 12701 "Photo.c"
 }
 
 
 static gpointer _photo_reimport_raw_development_state_ref0 (gpointer self) {
 #line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_reimport_raw_development_state_ref (self) : NULL;
-#line 12684 "Photo.c"
+#line 12708 "Photo.c"
 }
 
 
-gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState** state, GError** error) {
+gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* * state, GError** error) {
 	PhotoReimportRawDevelopmentState* _vala_state = NULL;
 	gboolean result = FALSE;
 	GeeCollection* files = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp1_;
 	PhotoReimportRawDevelopmentStateImpl* reimport_state = NULL;
-	PhotoReimportRawDevelopmentStateImpl* _tmp2_ = NULL;
-	PhotoReimportRawDevelopmentStateImpl* _tmp19_ = NULL;
-	PhotoReimportRawDevelopmentState* _tmp20_ = NULL;
-	PhotoReimportRawDevelopmentStateImpl* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
+	PhotoReimportRawDevelopmentStateImpl* _tmp2_;
+	PhotoReimportRawDevelopmentStateImpl* _tmp19_;
+	PhotoReimportRawDevelopmentState* _tmp20_;
+	PhotoReimportRawDevelopmentStateImpl* _tmp21_;
+	gint _tmp22_;
 	GError * _inner_error_ = NULL;
 #line 1609 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -12721,25 +12745,25 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 		if (state) {
 #line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 12723 "Photo.c"
+#line 12747 "Photo.c"
 		} else {
 #line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 12727 "Photo.c"
+#line 12751 "Photo.c"
 		}
 #line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12731 "Photo.c"
+#line 12755 "Photo.c"
 	}
 #line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_reimport_raw_development_state_impl_new ();
 #line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
 	reimport_state = _tmp2_;
-#line 12737 "Photo.c"
+#line 12761 "Photo.c"
 	{
 		GeeIterator* _file_it = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
 #line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = files;
 #line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12748,23 +12772,23 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 		_file_it = _tmp4_;
 #line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 12750 "Photo.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+#line 12774 "Photo.c"
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			GFile* file = NULL;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
 			DetectedPhotoInformation* detected = NULL;
 			BackingPhotoRow* backing = NULL;
 			gboolean _tmp9_ = FALSE;
-			GFile* _tmp10_ = NULL;
+			GFile* _tmp10_;
 			BackingPhotoRow* _tmp11_ = NULL;
 			DetectedPhotoInformation* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
-			PhotoReimportRawDevelopmentStateImpl* _tmp15_ = NULL;
-			BackingPhotoRow* _tmp16_ = NULL;
-			DetectedPhotoInformation* _tmp17_ = NULL;
-			PhotoMetadata* _tmp18_ = NULL;
+			gboolean _tmp13_;
+			PhotoReimportRawDevelopmentStateImpl* _tmp15_;
+			BackingPhotoRow* _tmp16_;
+			DetectedPhotoInformation* _tmp17_;
+			PhotoMetadata* _tmp18_;
 #line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _file_it;
 #line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12773,7 +12797,7 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 			if (!_tmp6_) {
 #line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 12775 "Photo.c"
+#line 12799 "Photo.c"
 			}
 #line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _file_it;
@@ -12797,7 +12821,7 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 			_tmp9_ = _tmp13_;
 #line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12799 "Photo.c"
+#line 12823 "Photo.c"
 				gboolean _tmp14_ = FALSE;
 #line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
@@ -12815,7 +12839,7 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 				_g_object_unref0 (files);
 #line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				return _tmp14_;
-#line 12817 "Photo.c"
+#line 12841 "Photo.c"
 			}
 #line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp9_) {
@@ -12827,7 +12851,7 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 				_g_object_unref0 (file);
 #line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
 				continue;
-#line 12829 "Photo.c"
+#line 12853 "Photo.c"
 			}
 #line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = reimport_state;
@@ -12845,11 +12869,11 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 			_detected_photo_information_unref0 (detected);
 #line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 12847 "Photo.c"
+#line 12871 "Photo.c"
 		}
 #line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_file_it);
-#line 12851 "Photo.c"
+#line 12875 "Photo.c"
 	}
 #line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = reimport_state;
@@ -12873,30 +12897,30 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 	if (state) {
 #line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 12875 "Photo.c"
+#line 12899 "Photo.c"
 	} else {
 #line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 12879 "Photo.c"
+#line 12903 "Photo.c"
 	}
 #line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12883 "Photo.c"
+#line 12907 "Photo.c"
 }
 
 
 void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* state, GError** error) {
-	PhotoFileFormat _tmp0_ = 0;
+	PhotoFileFormat _tmp0_;
 	PhotoReimportRawDevelopmentStateImpl* reimport_state = NULL;
-	PhotoReimportRawDevelopmentState* _tmp1_ = NULL;
-	PhotoReimportRawDevelopmentStateImpl* _tmp2_ = NULL;
+	PhotoReimportRawDevelopmentState* _tmp1_;
+	PhotoReimportRawDevelopmentStateImpl* _tmp2_;
 	gchar* list = NULL;
-	gchar* _tmp32_ = NULL;
-	PhotoReimportRawDevelopmentStateImpl* _tmp33_ = NULL;
-	gboolean _tmp34_ = FALSE;
-	const gchar* _tmp37_ = NULL;
-	Alteration* _tmp38_ = NULL;
-	Alteration* _tmp39_ = NULL;
+	gchar* _tmp32_;
+	PhotoReimportRawDevelopmentStateImpl* _tmp33_;
+	gboolean _tmp34_;
+	const gchar* _tmp37_;
+	Alteration* _tmp38_;
+	Alteration* _tmp39_;
 	GError * _inner_error_ = NULL;
 #line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -12908,7 +12932,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 	if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) {
 #line 1634 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 12910 "Photo.c"
+#line 12934 "Photo.c"
 	}
 #line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = state;
@@ -12916,12 +12940,12 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 	_tmp2_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl));
 #line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
 	reimport_state = _tmp2_;
-#line 12918 "Photo.c"
+#line 12942 "Photo.c"
 	{
 		GeeIterator* _dev_it = NULL;
-		PhotoReimportRawDevelopmentStateImpl* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		PhotoReimportRawDevelopmentStateImpl* _tmp3_;
+		GeeCollection* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = reimport_state;
 #line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12932,14 +12956,14 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 		_dev_it = _tmp5_;
 #line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 12934 "Photo.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 12958 "Photo.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			PhotoReimportRawDevelopmentStateImplDevToReimport* dev = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			PhotoReimportRawDevelopmentStateImpl* _tmp10_ = NULL;
-			gboolean _tmp11_ = FALSE;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			PhotoReimportRawDevelopmentStateImpl* _tmp10_;
+			gboolean _tmp11_;
 #line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _dev_it;
 #line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12948,7 +12972,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 			if (!_tmp7_) {
 #line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 12950 "Photo.c"
+#line 12974 "Photo.c"
 			}
 #line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _dev_it;
@@ -12962,11 +12986,11 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 			_tmp11_ = _tmp10_->metadata_only;
 #line 1639 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp11_) {
-#line 12964 "Photo.c"
-				BackingPhotoTable* _tmp12_ = NULL;
-				BackingPhotoTable* _tmp13_ = NULL;
-				PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp14_ = NULL;
-				BackingPhotoRow* _tmp15_ = NULL;
+#line 12988 "Photo.c"
+				BackingPhotoTable* _tmp12_;
+				BackingPhotoTable* _tmp13_;
+				PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp14_;
+				BackingPhotoRow* _tmp15_;
 #line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = backing_photo_table_get_instance ();
 #line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12993,7 +13017,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 						_photo_reimport_raw_development_state_unref0 (reimport_state);
 #line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 12995 "Photo.c"
+#line 13019 "Photo.c"
 					} else {
 #line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
@@ -13007,22 +13031,22 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 						g_clear_error (&_inner_error_);
 #line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 13009 "Photo.c"
+#line 13033 "Photo.c"
 					}
 				}
 				{
-					PhotoRow* _tmp16_ = NULL;
+					PhotoRow* _tmp16_;
 #line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = self->row;
 #line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_row);
-#line 13018 "Photo.c"
+#line 13042 "Photo.c"
 					{
-						gint _tmp17_ = 0;
-						RawDeveloper* _tmp18_ = NULL;
+						gint _tmp17_;
+						RawDeveloper* _tmp18_;
 #line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp18_ = raw_developer_as_array (&_tmp17_);
-#line 13024 "Photo.c"
+#line 13048 "Photo.c"
 						{
 							RawDeveloper* d_collection = NULL;
 							gint d_collection_length1 = 0;
@@ -13034,20 +13058,20 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 							d_collection_length1 = _tmp17_;
 #line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 							for (d_it = 0; d_it < _tmp17_; d_it = d_it + 1) {
-#line 13036 "Photo.c"
+#line 13060 "Photo.c"
 								RawDeveloper d = 0;
 #line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 								d = d_collection[d_it];
-#line 13040 "Photo.c"
+#line 13064 "Photo.c"
 								{
 									BackingPhotoID id = {0};
-									PhotoRow* _tmp19_ = NULL;
-									BackingPhotoID* _tmp20_ = NULL;
-									gint _tmp20__length1 = 0;
-									RawDeveloper _tmp21_ = 0;
-									BackingPhotoID _tmp22_ = {0};
-									BackingPhotoID _tmp23_ = {0};
-									gint64 _tmp24_ = 0LL;
+									PhotoRow* _tmp19_;
+									BackingPhotoID* _tmp20_;
+									gint _tmp20__length1;
+									RawDeveloper _tmp21_;
+									BackingPhotoID _tmp22_;
+									BackingPhotoID _tmp23_;
+									gint64 _tmp24_;
 #line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp19_ = self->row;
 #line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13066,11 +13090,11 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 									_tmp24_ = _tmp23_.id;
 #line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
 									if (_tmp24_ != BACKING_PHOTO_ID_INVALID) {
-#line 13068 "Photo.c"
+#line 13092 "Photo.c"
 										BackingPhotoRow* bpr = NULL;
-										BackingPhotoID _tmp25_ = {0};
-										BackingPhotoRow* _tmp26_ = NULL;
-										BackingPhotoRow* _tmp27_ = NULL;
+										BackingPhotoID _tmp25_;
+										BackingPhotoRow* _tmp26_;
+										BackingPhotoRow* _tmp27_;
 #line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
 										_tmp25_ = id;
 #line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13081,10 +13105,10 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 										_tmp27_ = bpr;
 #line 1648 "/home/jens/Source/shotwell/src/Photo.vala"
 										if (_tmp27_ != NULL) {
-#line 13083 "Photo.c"
-											GeeHashMap* _tmp28_ = NULL;
-											RawDeveloper _tmp29_ = 0;
-											BackingPhotoRow* _tmp30_ = NULL;
+#line 13107 "Photo.c"
+											GeeHashMap* _tmp28_;
+											RawDeveloper _tmp29_;
+											BackingPhotoRow* _tmp30_;
 #line 1649 "/home/jens/Source/shotwell/src/Photo.vala"
 											_tmp28_ = self->priv->developments;
 #line 1649 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13093,27 +13117,27 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 											_tmp30_ = bpr;
 #line 1649 "/home/jens/Source/shotwell/src/Photo.vala"
 											gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp29_), _tmp30_);
-#line 13095 "Photo.c"
+#line 13119 "Photo.c"
 										}
 #line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
 										_backing_photo_row_unref0 (bpr);
-#line 13099 "Photo.c"
+#line 13123 "Photo.c"
 									}
 								}
 							}
 #line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 							d_collection = (g_free (d_collection), NULL);
-#line 13105 "Photo.c"
+#line 13129 "Photo.c"
 						}
 					}
-					__finally307:
+					__finally308:
 					{
-						PhotoRow* _tmp31_ = NULL;
+						PhotoRow* _tmp31_;
 #line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp31_ = self->row;
 #line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13115 "Photo.c"
+#line 13139 "Photo.c"
 					}
 #line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -13129,7 +13153,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 							_photo_reimport_raw_development_state_unref0 (reimport_state);
 #line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							return;
-#line 13131 "Photo.c"
+#line 13155 "Photo.c"
 						} else {
 #line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
@@ -13143,18 +13167,18 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 							g_clear_error (&_inner_error_);
 #line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							return;
-#line 13145 "Photo.c"
+#line 13169 "Photo.c"
 						}
 					}
 				}
 			}
 #line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
-#line 13152 "Photo.c"
+#line 13176 "Photo.c"
 		}
 #line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_dev_it);
-#line 13156 "Photo.c"
+#line 13180 "Photo.c"
 	}
 #line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time");
@@ -13166,9 +13190,9 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 	_tmp34_ = _tmp33_->metadata_only;
 #line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp34_) {
-#line 13168 "Photo.c"
-		const gchar* _tmp35_ = NULL;
-		gchar* _tmp36_ = NULL;
+#line 13192 "Photo.c"
+		const gchar* _tmp35_;
+		gchar* _tmp36_;
 #line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp35_ = list;
 #line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13177,7 +13201,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 		_g_free0 (list);
 #line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
 		list = _tmp36_;
-#line 13179 "Photo.c"
+#line 13203 "Photo.c"
 	}
 #line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = list;
@@ -13195,14 +13219,14 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 	_g_free0 (list);
 #line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 13197 "Photo.c"
+#line 13221 "Photo.c"
 }
 
 
 static gchar* photo_real_get_typename (DataSource* base) {
 	Photo * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 1665 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 1666 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13211,7 +13235,7 @@ static gchar* photo_real_get_typename (DataSource* base) {
 	result = _tmp0_;
 #line 1666 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13213 "Photo.c"
+#line 13237 "Photo.c"
 }
 
 
@@ -13219,7 +13243,7 @@ static gint64 photo_real_get_instance_id (DataSource* base) {
 	Photo * self;
 	gint64 result = 0LL;
 	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	gint64 _tmp1_;
 #line 1669 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 1670 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13230,18 +13254,18 @@ static gint64 photo_real_get_instance_id (DataSource* base) {
 	result = _tmp1_;
 #line 1670 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13232 "Photo.c"
+#line 13256 "Photo.c"
 }
 
 
 static gchar* photo_real_get_source_id (DataSource* base) {
 	Photo * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gint64 _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 1673 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13260,15 +13284,15 @@ static gchar* photo_real_get_source_id (DataSource* base) {
 	result = _tmp4_;
 #line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13262 "Photo.c"
+#line 13286 "Photo.c"
 }
 
 
 void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 	GTimeVal modification = {0};
-	GFileInfo* _tmp0_ = NULL;
+	GFileInfo* _tmp0_;
 	GTimeVal _tmp1_ = {0};
-	gboolean _tmp21_ = FALSE;
+	gboolean _tmp21_;
 	GError * _inner_error_ = NULL;
 #line 1681 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -13280,31 +13304,31 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 	g_file_info_get_modification_time (_tmp0_, &_tmp1_);
 #line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
 	modification = _tmp1_;
-#line 13282 "Photo.c"
+#line 13306 "Photo.c"
 	{
 		{
-			PhotoRow* _tmp2_ = NULL;
+			PhotoRow* _tmp2_;
 #line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
 #line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 13290 "Photo.c"
+#line 13314 "Photo.c"
 			{
-				PhotoRow* _tmp3_ = NULL;
-				BackingPhotoRow* _tmp4_ = NULL;
-				time_t _tmp5_ = 0;
-				GTimeVal _tmp6_ = {0};
-				glong _tmp7_ = 0L;
-				PhotoTable* _tmp9_ = NULL;
-				PhotoTable* _tmp10_ = NULL;
-				PhotoRow* _tmp11_ = NULL;
-				PhotoID _tmp12_ = {0};
-				GTimeVal _tmp13_ = {0};
-				glong _tmp14_ = 0L;
-				PhotoRow* _tmp15_ = NULL;
-				BackingPhotoRow* _tmp16_ = NULL;
-				GTimeVal _tmp17_ = {0};
-				glong _tmp18_ = 0L;
+				PhotoRow* _tmp3_;
+				BackingPhotoRow* _tmp4_;
+				time_t _tmp5_;
+				GTimeVal _tmp6_;
+				glong _tmp7_;
+				PhotoTable* _tmp9_;
+				PhotoTable* _tmp10_;
+				PhotoRow* _tmp11_;
+				PhotoID _tmp12_;
+				GTimeVal _tmp13_;
+				glong _tmp14_;
+				PhotoRow* _tmp15_;
+				BackingPhotoRow* _tmp16_;
+				GTimeVal _tmp17_;
+				glong _tmp18_;
 #line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13317,18 +13341,18 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 				_tmp7_ = _tmp6_.tv_sec;
 #line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp5_ == ((time_t) _tmp7_)) {
-#line 13319 "Photo.c"
+#line 13343 "Photo.c"
 					{
-						PhotoRow* _tmp8_ = NULL;
+						PhotoRow* _tmp8_;
 #line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp8_ = self->row;
 #line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13326 "Photo.c"
+#line 13350 "Photo.c"
 					}
 #line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 13330 "Photo.c"
+#line 13354 "Photo.c"
 				}
 #line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo_table_get_instance ();
@@ -13348,8 +13372,8 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 				_database_table_unref0 (_tmp10_);
 #line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13350 "Photo.c"
-					goto __finally309;
+#line 13374 "Photo.c"
+					goto __finally310;
 				}
 #line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = self->row;
@@ -13361,23 +13385,23 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 				_tmp18_ = _tmp17_.tv_sec;
 #line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_->timestamp = (time_t) _tmp18_;
-#line 13363 "Photo.c"
+#line 13387 "Photo.c"
 			}
-			__finally309:
+			__finally310:
 			{
-				PhotoRow* _tmp19_ = NULL;
+				PhotoRow* _tmp19_;
 #line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = self->row;
 #line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13372 "Photo.c"
+#line 13396 "Photo.c"
 			}
 #line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 13378 "Photo.c"
-					goto __catch308_database_error;
+#line 13402 "Photo.c"
+					goto __catch309_database_error;
 				}
 #line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -13385,15 +13409,15 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 				g_clear_error (&_inner_error_);
 #line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 13387 "Photo.c"
+#line 13411 "Photo.c"
 			}
 		}
 	}
-	goto __finally308;
-	__catch308_database_error:
+	goto __finally309;
+	__catch309_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp20_ = NULL;
+		GError* _tmp20_;
 #line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
 #line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13406,9 +13430,9 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 		_g_error_free0 (err);
 #line 1695 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 13408 "Photo.c"
+#line 13432 "Photo.c"
 	}
-	__finally308:
+	__finally309:
 #line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13417,15 +13441,15 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 		g_clear_error (&_inner_error_);
 #line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 13419 "Photo.c"
+#line 13443 "Photo.c"
 	}
 #line 1698 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = photo_is_master_baseline (self);
 #line 1698 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 13425 "Photo.c"
-		Alteration* _tmp22_ = NULL;
-		Alteration* _tmp23_ = NULL;
+#line 13449 "Photo.c"
+		Alteration* _tmp22_;
+		Alteration* _tmp23_;
 #line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = alteration_new_from_list ("metadata:master-timestamp,metadata:baseline-timestamp");
 #line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13434,10 +13458,10 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_);
 #line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp23_);
-#line 13436 "Photo.c"
+#line 13460 "Photo.c"
 	} else {
-		Alteration* _tmp24_ = NULL;
-		Alteration* _tmp25_ = NULL;
+		Alteration* _tmp24_;
+		Alteration* _tmp25_;
 #line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = alteration_new ("metadata", "master-timestamp");
 #line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13446,17 +13470,17 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
 #line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp25_);
-#line 13448 "Photo.c"
+#line 13472 "Photo.c"
 	}
 }
 
 
 void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GError** error) {
 	GTimeVal modification = {0};
-	GFileInfo* _tmp0_ = NULL;
+	GFileInfo* _tmp0_;
 	GTimeVal _tmp1_ = {0};
 	gboolean altered = FALSE;
-	gboolean _tmp20_ = FALSE;
+	gboolean _tmp20_;
 	GError * _inner_error_ = NULL;
 #line 1705 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -13470,29 +13494,29 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 	modification = _tmp1_;
 #line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
 	altered = FALSE;
-#line 13472 "Photo.c"
+#line 13496 "Photo.c"
 	{
-		PhotoRow* _tmp2_ = NULL;
+		PhotoRow* _tmp2_;
 #line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
 #line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 13479 "Photo.c"
+#line 13503 "Photo.c"
 		{
 			gboolean _tmp3_ = FALSE;
-			PhotoRow* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+			PhotoRow* _tmp4_;
+			gboolean _tmp5_;
 #line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = backing_photo_id_is_valid (&_tmp4_->editable_id);
 #line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp5_) {
-#line 13490 "Photo.c"
-				BackingPhotoRow* _tmp6_ = NULL;
-				time_t _tmp7_ = 0;
-				GTimeVal _tmp8_ = {0};
-				glong _tmp9_ = 0L;
+#line 13514 "Photo.c"
+				BackingPhotoRow* _tmp6_;
+				time_t _tmp7_;
+				GTimeVal _tmp8_;
+				glong _tmp9_;
 #line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->priv->editable;
 #line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13503,24 +13527,24 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 				_tmp9_ = _tmp8_.tv_sec;
 #line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = _tmp7_ != ((time_t) _tmp9_);
-#line 13505 "Photo.c"
+#line 13529 "Photo.c"
 			} else {
 #line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = FALSE;
-#line 13509 "Photo.c"
+#line 13533 "Photo.c"
 			}
 #line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_) {
-#line 13513 "Photo.c"
-				BackingPhotoTable* _tmp10_ = NULL;
-				BackingPhotoTable* _tmp11_ = NULL;
-				PhotoRow* _tmp12_ = NULL;
-				BackingPhotoID _tmp13_ = {0};
-				GTimeVal _tmp14_ = {0};
-				glong _tmp15_ = 0L;
-				BackingPhotoRow* _tmp16_ = NULL;
-				GTimeVal _tmp17_ = {0};
-				glong _tmp18_ = 0L;
+#line 13537 "Photo.c"
+				BackingPhotoTable* _tmp10_;
+				BackingPhotoTable* _tmp11_;
+				PhotoRow* _tmp12_;
+				BackingPhotoID _tmp13_;
+				GTimeVal _tmp14_;
+				glong _tmp15_;
+				BackingPhotoRow* _tmp16_;
+				GTimeVal _tmp17_;
+				glong _tmp18_;
 #line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = backing_photo_table_get_instance ();
 #line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13539,8 +13563,8 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 				_database_table_unref0 (_tmp11_);
 #line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13541 "Photo.c"
-					goto __finally310;
+#line 13565 "Photo.c"
+					goto __finally311;
 				}
 #line 1713 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->editable;
@@ -13552,17 +13576,17 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 				_tmp16_->timestamp = (time_t) _tmp18_;
 #line 1714 "/home/jens/Source/shotwell/src/Photo.vala"
 				altered = TRUE;
-#line 13554 "Photo.c"
+#line 13578 "Photo.c"
 			}
 		}
-		__finally310:
+		__finally311:
 		{
-			PhotoRow* _tmp19_ = NULL;
+			PhotoRow* _tmp19_;
 #line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = self->row;
 #line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13564 "Photo.c"
+#line 13588 "Photo.c"
 		}
 #line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -13572,7 +13596,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 				g_propagate_error (error, _inner_error_);
 #line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 13574 "Photo.c"
+#line 13598 "Photo.c"
 			} else {
 #line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -13580,7 +13604,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 				g_clear_error (&_inner_error_);
 #line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 13582 "Photo.c"
+#line 13606 "Photo.c"
 			}
 		}
 	}
@@ -13588,9 +13612,9 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 	_tmp20_ = altered;
 #line 1718 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp20_) {
-#line 13590 "Photo.c"
-		Alteration* _tmp21_ = NULL;
-		Alteration* _tmp22_ = NULL;
+#line 13614 "Photo.c"
+		Alteration* _tmp21_;
+		Alteration* _tmp22_;
 #line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = alteration_new_from_list ("metadata:editable-timestamp,metadata:baseline-timestamp");
 #line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13599,7 +13623,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp22_);
 #line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp22_);
-#line 13601 "Photo.c"
+#line 13625 "Photo.c"
 	}
 }
 
@@ -13610,15 +13634,15 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 	g_return_if_fail (GEE_IS_MAP (map));
 #line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_begin_transaction ();
-#line 13612 "Photo.c"
+#line 13636 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
-		GeeMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = map;
 #line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13637,17 +13661,17 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 		_photo_it = _tmp5_;
 #line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 13639 "Photo.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 13663 "Photo.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			Photo* photo = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			Photo* _tmp10_ = NULL;
-			GeeMap* _tmp11_ = NULL;
-			Photo* _tmp12_ = NULL;
-			gpointer _tmp13_ = NULL;
-			GFileInfo* _tmp14_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			Photo* _tmp10_;
+			GeeMap* _tmp11_;
+			Photo* _tmp12_;
+			gpointer _tmp13_;
+			GFileInfo* _tmp14_;
 #line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _photo_it;
 #line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13656,7 +13680,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 			if (!_tmp7_) {
 #line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 13658 "Photo.c"
+#line 13682 "Photo.c"
 			}
 #line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _photo_it;
@@ -13690,7 +13714,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 					_g_object_unref0 (_photo_it);
 #line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 13692 "Photo.c"
+#line 13716 "Photo.c"
 				} else {
 #line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (photo);
@@ -13702,16 +13726,16 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 					g_clear_error (&_inner_error_);
 #line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 13704 "Photo.c"
+#line 13728 "Photo.c"
 				}
 			}
 #line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 13709 "Photo.c"
+#line 13733 "Photo.c"
 		}
 #line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 13713 "Photo.c"
+#line 13737 "Photo.c"
 	}
 #line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_commit_transaction (&_inner_error_);
@@ -13723,7 +13747,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 13725 "Photo.c"
+#line 13749 "Photo.c"
 		} else {
 #line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -13731,7 +13755,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 13733 "Photo.c"
+#line 13757 "Photo.c"
 		}
 	}
 }
@@ -13741,8 +13765,8 @@ static PhotoFileFormat photo_real_get_preferred_thumbnail_format (ThumbnailSourc
 	Photo * self;
 	PhotoFileFormat result = 0;
 	PhotoFileFormat _tmp0_ = 0;
-	PhotoFileFormat _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
+	PhotoFileFormat _tmp1_;
+	gboolean _tmp2_;
 #line 1731 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13751,26 +13775,26 @@ static PhotoFileFormat photo_real_get_preferred_thumbnail_format (ThumbnailSourc
 	_tmp2_ = photo_file_format_can_write_image (_tmp1_);
 #line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 13753 "Photo.c"
-		PhotoFileFormat _tmp3_ = 0;
+#line 13777 "Photo.c"
+		PhotoFileFormat _tmp3_;
 #line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_get_file_format (self);
 #line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_;
-#line 13759 "Photo.c"
+#line 13783 "Photo.c"
 	} else {
-		PhotoFileFormat _tmp4_ = 0;
+		PhotoFileFormat _tmp4_;
 #line 1733 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo_file_format_get_system_default_format ();
 #line 1733 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp4_;
-#line 13766 "Photo.c"
+#line 13790 "Photo.c"
 	}
 #line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13772 "Photo.c"
+#line 13796 "Photo.c"
 }
 
 
@@ -13778,10 +13802,10 @@ static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale
 	Photo * self;
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 	Scaling _tmp2_ = {0};
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 1736 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
@@ -13799,7 +13823,7 @@ static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale
 		g_propagate_error (error, _inner_error_);
 #line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 13801 "Photo.c"
+#line 13825 "Photo.c"
 	}
 #line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
@@ -13811,15 +13835,15 @@ static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale
 	_g_object_unref0 (_tmp0_);
 #line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13813 "Photo.c"
+#line 13837 "Photo.c"
 }
 
 
 gboolean photo_is_file_image (GFile* file) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 #line 1740 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13830,12 +13854,12 @@ gboolean photo_is_file_image (GFile* file) {
 	if (_tmp2_) {
 #line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 13832 "Photo.c"
+#line 13856 "Photo.c"
 	} else {
-		GFile* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		GFile* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gboolean _tmp6_;
 #line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = file;
 #line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13848,13 +13872,13 @@ gboolean photo_is_file_image (GFile* file) {
 		_tmp0_ = _tmp6_;
 #line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp5_);
-#line 13850 "Photo.c"
+#line 13874 "Photo.c"
 	}
 #line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13856 "Photo.c"
+#line 13880 "Photo.c"
 }
 
 
@@ -13862,14 +13886,14 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
 	gboolean result = FALSE;
 	gchar* name = NULL;
 	gchar* ext = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar** _tmp6_;
+	gint _tmp6__length1;
 #line 1748 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (basename != NULL, FALSE);
 #line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13896,7 +13920,7 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
 		_g_free0 (name);
 #line 1752 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 13898 "Photo.c"
+#line 13922 "Photo.c"
 	}
 #line 1755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = ext;
@@ -13910,7 +13934,7 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
 	_tmp6_ = extensions;
 #line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6__length1 = extensions_length1;
-#line 13912 "Photo.c"
+#line 13936 "Photo.c"
 	{
 		gchar** extension_collection = NULL;
 		gint extension_collection_length1 = 0;
@@ -13922,17 +13946,17 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
 		extension_collection_length1 = _tmp6__length1;
 #line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 		for (extension_it = 0; extension_it < _tmp6__length1; extension_it = extension_it + 1) {
-#line 13924 "Photo.c"
-			gchar* _tmp7_ = NULL;
+#line 13948 "Photo.c"
+			gchar* _tmp7_;
 			gchar* extension = NULL;
 #line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = g_strdup (extension_collection[extension_it]);
 #line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 			extension = _tmp7_;
-#line 13931 "Photo.c"
+#line 13955 "Photo.c"
 			{
-				const gchar* _tmp8_ = NULL;
-				const gchar* _tmp9_ = NULL;
+				const gchar* _tmp8_;
+				const gchar* _tmp9_;
 #line 1759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = ext;
 #line 1759 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13949,11 +13973,11 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
 					_g_free0 (name);
 #line 1760 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 13951 "Photo.c"
+#line 13975 "Photo.c"
 				}
 #line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (extension);
-#line 13955 "Photo.c"
+#line 13979 "Photo.c"
 			}
 		}
 	}
@@ -13965,20 +13989,20 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
 	_g_free0 (name);
 #line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13967 "Photo.c"
+#line 13991 "Photo.c"
 }
 
 
 gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format) {
 	gboolean result = FALSE;
-	PhotoTable* _tmp0_ = NULL;
-	PhotoTable* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	PhotoFileFormat _tmp5_ = 0;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
+	PhotoTable* _tmp0_;
+	PhotoTable* _tmp1_;
+	GFile* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	PhotoFileFormat _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp7_;
 #line 1769 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
 #line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14003,24 +14027,24 @@ gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gcha
 	result = _tmp7_;
 #line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14005 "Photo.c"
+#line 14029 "Photo.c"
 }
 
 
 PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, int* result_length1) {
 	PhotoID* result = NULL;
-	PhotoTable* _tmp0_ = NULL;
-	PhotoTable* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	PhotoFileFormat _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	PhotoID* _tmp7_ = NULL;
-	PhotoID* _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	PhotoID* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
+	PhotoTable* _tmp0_;
+	PhotoTable* _tmp1_;
+	GFile* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	PhotoFileFormat _tmp5_;
+	gint _tmp6_;
+	PhotoID* _tmp7_;
+	PhotoID* _tmp8_;
+	gint _tmp8__length1;
+	PhotoID* _tmp9_;
+	gint _tmp9__length1;
 #line 1778 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL);
 #line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14051,21 +14075,21 @@ PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const
 	if (result_length1) {
 #line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result_length1 = _tmp9__length1;
-#line 14053 "Photo.c"
+#line 14077 "Photo.c"
 	}
 #line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp9_;
 #line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14059 "Photo.c"
+#line 14083 "Photo.c"
 }
 
 
 gint64 photo_get_photo_key (DataSource* source) {
 	gint64 result = 0LL;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 	PhotoID _tmp1_ = {0};
-	gint64 _tmp2_ = 0LL;
+	gint64 _tmp2_;
 #line 1788 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
 #line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14078,17 +14102,17 @@ gint64 photo_get_photo_key (DataSource* source) {
 	result = _tmp2_;
 #line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14080 "Photo.c"
+#line 14104 "Photo.c"
 }
 
 
 static GFile* photo_real_get_file (MediaSource* base) {
 	Photo * self;
 	GFile* result = NULL;
-	PhotoFileReader* _tmp0_ = NULL;
-	PhotoFileReader* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	PhotoFileReader* _tmp0_;
+	PhotoFileReader* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
 #line 1807 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14105,88 +14129,88 @@ static GFile* photo_real_get_file (MediaSource* base) {
 	result = _tmp3_;
 #line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14107 "Photo.c"
+#line 14131 "Photo.c"
 }
 
 
-static void _vala_array_add96 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add96 (gchar** * array, int* length, int* size, gchar* value) {
 #line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14118 "Photo.c"
+#line 14142 "Photo.c"
 	}
 #line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14124 "Photo.c"
+#line 14148 "Photo.c"
 }
 
 
-static void _vala_array_add97 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add97 (gchar** * array, int* length, int* size, gchar* value) {
 #line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14135 "Photo.c"
+#line 14159 "Photo.c"
 	}
 #line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14141 "Photo.c"
+#line 14165 "Photo.c"
 }
 
 
-static void _vala_array_add98 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add98 (gchar** * array, int* length, int* size, gchar* value) {
 #line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14152 "Photo.c"
+#line 14176 "Photo.c"
 	}
 #line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14158 "Photo.c"
+#line 14182 "Photo.c"
 }
 
 
-static void _vala_array_add99 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add99 (gchar** * array, int* length, int* size, gchar* value) {
 #line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14169 "Photo.c"
+#line 14193 "Photo.c"
 	}
 #line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14175 "Photo.c"
+#line 14199 "Photo.c"
 }
 
 
 void photo_set_master_file (Photo* self, GFile* file) {
 	gchar* filepath = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
 	gboolean altered = FALSE;
 	gboolean is_baseline = FALSE;
 	gboolean is_source = FALSE;
 	gboolean name_changed = FALSE;
 	GFile* old_file = NULL;
-	gboolean _tmp41_ = FALSE;
+	gboolean _tmp41_;
 	GError * _inner_error_ = NULL;
 #line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -14208,30 +14232,30 @@ void photo_set_master_file (Photo* self, GFile* file) {
 	name_changed = FALSE;
 #line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
 	old_file = NULL;
-#line 14210 "Photo.c"
+#line 14234 "Photo.c"
 	{
 		{
-			PhotoRow* _tmp2_ = NULL;
+			PhotoRow* _tmp2_;
 #line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
 #line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 14218 "Photo.c"
+#line 14242 "Photo.c"
 			{
 				{
-					PhotoBackingReaders* _tmp3_ = NULL;
+					PhotoBackingReaders* _tmp3_;
 #line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp3_ = self->priv->readers;
 #line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 14226 "Photo.c"
+#line 14250 "Photo.c"
 					{
-						PhotoBackingReaders* _tmp4_ = NULL;
-						PhotoFileReader* _tmp5_ = NULL;
-						GFile* _tmp6_ = NULL;
-						GFile* _tmp7_ = NULL;
-						GFile* _tmp8_ = NULL;
-						gboolean _tmp9_ = FALSE;
+						PhotoBackingReaders* _tmp4_;
+						PhotoFileReader* _tmp5_;
+						GFile* _tmp6_;
+						GFile* _tmp7_;
+						GFile* _tmp8_;
+						gboolean _tmp9_;
 #line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp4_ = self->priv->readers;
 #line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14250,29 +14274,29 @@ void photo_set_master_file (Photo* self, GFile* file) {
 						_tmp9_ = g_file_equal (_tmp7_, _tmp8_);
 #line 1825 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp9_) {
-#line 14252 "Photo.c"
-							PhotoTable* _tmp10_ = NULL;
-							PhotoTable* _tmp11_ = NULL;
+#line 14276 "Photo.c"
+							PhotoTable* _tmp10_;
+							PhotoTable* _tmp11_;
 							PhotoID _tmp12_ = {0};
-							const gchar* _tmp13_ = NULL;
-							PhotoRow* _tmp14_ = NULL;
-							BackingPhotoRow* _tmp15_ = NULL;
-							const gchar* _tmp16_ = NULL;
-							gchar* _tmp17_ = NULL;
-							GFile* _tmp18_ = NULL;
-							gchar* _tmp19_ = NULL;
-							PhotoBackingReaders* _tmp20_ = NULL;
-							PhotoRow* _tmp21_ = NULL;
-							BackingPhotoRow* _tmp22_ = NULL;
-							PhotoFileFormat _tmp23_ = 0;
-							const gchar* _tmp24_ = NULL;
-							PhotoFileReader* _tmp25_ = NULL;
-							gboolean _tmp26_ = FALSE;
-							gboolean _tmp27_ = FALSE;
+							const gchar* _tmp13_;
+							PhotoRow* _tmp14_;
+							BackingPhotoRow* _tmp15_;
+							const gchar* _tmp16_;
+							gchar* _tmp17_;
+							GFile* _tmp18_;
+							gchar* _tmp19_;
+							PhotoBackingReaders* _tmp20_;
+							PhotoRow* _tmp21_;
+							BackingPhotoRow* _tmp22_;
+							PhotoFileFormat _tmp23_;
+							const gchar* _tmp24_;
+							PhotoFileReader* _tmp25_;
+							gboolean _tmp26_;
+							gboolean _tmp27_;
 							gboolean _tmp28_ = FALSE;
-							PhotoRow* _tmp29_ = NULL;
-							const gchar* _tmp30_ = NULL;
-							gboolean _tmp31_ = FALSE;
+							PhotoRow* _tmp29_;
+							const gchar* _tmp30_;
+							gboolean _tmp31_;
 #line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp10_ = photo_table_get_instance ();
 #line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14287,8 +14311,8 @@ void photo_set_master_file (Photo* self, GFile* file) {
 							_database_table_unref0 (_tmp11_);
 #line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14289 "Photo.c"
-								goto __finally313;
+#line 14313 "Photo.c"
+								goto __finally314;
 							}
 #line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp14_ = self->row;
@@ -14344,13 +14368,13 @@ void photo_set_master_file (Photo* self, GFile* file) {
 							_tmp31_ = is_string_empty (_tmp30_);
 #line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (_tmp31_) {
-#line 14346 "Photo.c"
-								GFile* _tmp32_ = NULL;
-								gchar* _tmp33_ = NULL;
-								gchar* _tmp34_ = NULL;
-								GFile* _tmp35_ = NULL;
-								gchar* _tmp36_ = NULL;
-								gchar* _tmp37_ = NULL;
+#line 14370 "Photo.c"
+								GFile* _tmp32_;
+								gchar* _tmp33_;
+								gchar* _tmp34_;
+								GFile* _tmp35_;
+								gchar* _tmp36_;
+								gchar* _tmp37_;
 #line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp32_ = old_file;
 #line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14369,48 +14393,48 @@ void photo_set_master_file (Photo* self, GFile* file) {
 								_g_free0 (_tmp37_);
 #line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_free0 (_tmp34_);
-#line 14371 "Photo.c"
+#line 14395 "Photo.c"
 							} else {
 #line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp28_ = FALSE;
-#line 14375 "Photo.c"
+#line 14399 "Photo.c"
 							}
 #line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 							name_changed = _tmp28_;
-#line 14379 "Photo.c"
+#line 14403 "Photo.c"
 						}
 					}
-					__finally313:
+					__finally314:
 					{
-						PhotoBackingReaders* _tmp38_ = NULL;
+						PhotoBackingReaders* _tmp38_;
 #line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp38_ = self->priv->readers;
 #line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 14389 "Photo.c"
+#line 14413 "Photo.c"
 					}
 #line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14393 "Photo.c"
-						goto __finally312;
+#line 14417 "Photo.c"
+						goto __finally313;
 					}
 				}
 			}
-			__finally312:
+			__finally313:
 			{
-				PhotoRow* _tmp39_ = NULL;
+				PhotoRow* _tmp39_;
 #line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = self->row;
 #line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 14405 "Photo.c"
+#line 14429 "Photo.c"
 			}
 #line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 14411 "Photo.c"
-					goto __catch311_database_error;
+#line 14435 "Photo.c"
+					goto __catch312_database_error;
 				}
 #line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (old_file);
@@ -14422,15 +14446,15 @@ void photo_set_master_file (Photo* self, GFile* file) {
 				g_clear_error (&_inner_error_);
 #line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 14424 "Photo.c"
+#line 14448 "Photo.c"
 			}
 		}
 	}
-	goto __finally311;
-	__catch311_database_error:
+	goto __finally312;
+	__catch312_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp40_ = NULL;
+		GError* _tmp40_;
 #line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
 #line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14441,9 +14465,9 @@ void photo_set_master_file (Photo* self, GFile* file) {
 		app_window_database_error (_tmp40_);
 #line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 14443 "Photo.c"
+#line 14467 "Photo.c"
 	}
-	__finally311:
+	__finally312:
 #line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14456,30 +14480,30 @@ void photo_set_master_file (Photo* self, GFile* file) {
 		g_clear_error (&_inner_error_);
 #line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 14458 "Photo.c"
+#line 14482 "Photo.c"
 	}
 #line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = altered;
 #line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp41_) {
-#line 14464 "Photo.c"
-		GFile* _tmp42_ = NULL;
-		GFile* _tmp43_ = NULL;
-		gboolean _tmp44_ = FALSE;
+#line 14488 "Photo.c"
+		GFile* _tmp42_;
+		GFile* _tmp43_;
+		gboolean _tmp44_;
 		gchar** alteration_list = NULL;
-		gchar** _tmp45_ = NULL;
-		gint alteration_list_length1 = 0;
-		gint _alteration_list_size_ = 0;
-		gchar** _tmp46_ = NULL;
-		gint _tmp46__length1 = 0;
-		gchar* _tmp47_ = NULL;
-		gboolean _tmp48_ = FALSE;
-		gboolean _tmp51_ = FALSE;
-		gboolean _tmp54_ = FALSE;
-		gchar** _tmp57_ = NULL;
-		gint _tmp57__length1 = 0;
-		Alteration* _tmp58_ = NULL;
-		Alteration* _tmp59_ = NULL;
+		gchar** _tmp45_;
+		gint alteration_list_length1;
+		gint _alteration_list_size_;
+		gchar** _tmp46_;
+		gint _tmp46__length1;
+		gchar* _tmp47_;
+		gboolean _tmp48_;
+		gboolean _tmp51_;
+		gboolean _tmp54_;
+		gchar** _tmp57_;
+		gint _tmp57__length1;
+		Alteration* _tmp58_;
+		Alteration* _tmp59_;
 #line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = old_file;
 #line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14492,7 +14516,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 		if (_tmp44_) {
 #line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_notify_baseline_replaced (self);
-#line 14494 "Photo.c"
+#line 14518 "Photo.c"
 		}
 #line 1850 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = g_new0 (gchar*, 0 + 1);
@@ -14514,10 +14538,10 @@ void photo_set_master_file (Photo* self, GFile* file) {
 		_tmp48_ = name_changed;
 #line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp48_) {
-#line 14516 "Photo.c"
-			gchar** _tmp49_ = NULL;
-			gint _tmp49__length1 = 0;
-			gchar* _tmp50_ = NULL;
+#line 14540 "Photo.c"
+			gchar** _tmp49_;
+			gint _tmp49__length1;
+			gchar* _tmp50_;
 #line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp49_ = alteration_list;
 #line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14526,16 +14550,16 @@ void photo_set_master_file (Photo* self, GFile* file) {
 			_tmp50_ = g_strdup ("metadata:name");
 #line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add97 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp50_);
-#line 14528 "Photo.c"
+#line 14552 "Photo.c"
 		}
 #line 1858 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = is_source;
 #line 1858 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp51_) {
-#line 14534 "Photo.c"
-			gchar** _tmp52_ = NULL;
-			gint _tmp52__length1 = 0;
-			gchar* _tmp53_ = NULL;
+#line 14558 "Photo.c"
+			gchar** _tmp52_;
+			gint _tmp52__length1;
+			gchar* _tmp53_;
 #line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp52_ = alteration_list;
 #line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14544,16 +14568,16 @@ void photo_set_master_file (Photo* self, GFile* file) {
 			_tmp53_ = g_strdup ("backing:source");
 #line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add98 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp53_);
-#line 14546 "Photo.c"
+#line 14570 "Photo.c"
 		}
 #line 1861 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp54_ = is_baseline;
 #line 1861 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp54_) {
-#line 14552 "Photo.c"
-			gchar** _tmp55_ = NULL;
-			gint _tmp55__length1 = 0;
-			gchar* _tmp56_ = NULL;
+#line 14576 "Photo.c"
+			gchar** _tmp55_;
+			gint _tmp55__length1;
+			gchar* _tmp56_;
 #line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp55_ = alteration_list;
 #line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14562,7 +14586,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 			_tmp56_ = g_strdup ("backing:baseline");
 #line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add99 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp56_);
-#line 14564 "Photo.c"
+#line 14588 "Photo.c"
 		}
 #line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = alteration_list;
@@ -14578,76 +14602,76 @@ void photo_set_master_file (Photo* self, GFile* file) {
 		_alteration_unref0 (_tmp59_);
 #line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
-#line 14580 "Photo.c"
+#line 14604 "Photo.c"
 	}
 #line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (old_file);
 #line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (filepath);
-#line 14586 "Photo.c"
+#line 14610 "Photo.c"
 }
 
 
-static void _vala_array_add100 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add100 (gchar** * array, int* length, int* size, gchar* value) {
 #line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14597 "Photo.c"
+#line 14621 "Photo.c"
 	}
 #line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14603 "Photo.c"
+#line 14627 "Photo.c"
 }
 
 
-static void _vala_array_add101 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add101 (gchar** * array, int* length, int* size, gchar* value) {
 #line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14614 "Photo.c"
+#line 14638 "Photo.c"
 	}
 #line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14620 "Photo.c"
+#line 14644 "Photo.c"
 }
 
 
-static void _vala_array_add102 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add102 (gchar** * array, int* length, int* size, gchar* value) {
 #line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14631 "Photo.c"
+#line 14655 "Photo.c"
 	}
 #line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14637 "Photo.c"
+#line 14661 "Photo.c"
 }
 
 
 void photo_set_editable_file (Photo* self, GFile* file) {
 	gchar* filepath = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
 	gboolean altered = FALSE;
 	gboolean is_baseline = FALSE;
 	gboolean is_source = FALSE;
 	GFile* old_file = NULL;
-	gboolean _tmp34_ = FALSE;
+	gboolean _tmp34_;
 	GError * _inner_error_ = NULL;
 #line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -14667,40 +14691,40 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 	is_source = FALSE;
 #line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
 	old_file = NULL;
-#line 14669 "Photo.c"
+#line 14693 "Photo.c"
 	{
 		{
-			PhotoRow* _tmp2_ = NULL;
+			PhotoRow* _tmp2_;
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 14677 "Photo.c"
+#line 14701 "Photo.c"
 			{
 				{
-					PhotoBackingReaders* _tmp3_ = NULL;
+					PhotoBackingReaders* _tmp3_;
 #line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp3_ = self->priv->readers;
 #line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 14685 "Photo.c"
+#line 14709 "Photo.c"
 					{
 						GFile* _tmp4_ = NULL;
-						PhotoBackingReaders* _tmp5_ = NULL;
-						PhotoFileReader* _tmp6_ = NULL;
-						GFile* _tmp10_ = NULL;
+						PhotoBackingReaders* _tmp5_;
+						PhotoFileReader* _tmp6_;
+						GFile* _tmp10_;
 						gboolean _tmp11_ = FALSE;
-						GFile* _tmp12_ = NULL;
+						GFile* _tmp12_;
 #line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp5_ = self->priv->readers;
 #line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp6_ = _tmp5_->editable;
 #line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp6_ != NULL) {
-#line 14699 "Photo.c"
-							PhotoBackingReaders* _tmp7_ = NULL;
-							PhotoFileReader* _tmp8_ = NULL;
-							GFile* _tmp9_ = NULL;
+#line 14723 "Photo.c"
+							PhotoBackingReaders* _tmp7_;
+							PhotoFileReader* _tmp8_;
+							GFile* _tmp9_;
 #line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp7_ = self->priv->readers;
 #line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14711,13 +14735,13 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 							_g_object_unref0 (_tmp4_);
 #line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp4_ = _tmp9_;
-#line 14713 "Photo.c"
+#line 14737 "Photo.c"
 						} else {
 #line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp4_);
 #line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp4_ = NULL;
-#line 14719 "Photo.c"
+#line 14743 "Photo.c"
 						}
 #line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp10_ = _g_object_ref0 (_tmp4_);
@@ -14729,10 +14753,10 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 						_tmp12_ = old_file;
 #line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp12_ != NULL) {
-#line 14731 "Photo.c"
-							GFile* _tmp13_ = NULL;
-							GFile* _tmp14_ = NULL;
-							gboolean _tmp15_ = FALSE;
+#line 14755 "Photo.c"
+							GFile* _tmp13_;
+							GFile* _tmp14_;
+							gboolean _tmp15_;
 #line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp13_ = old_file;
 #line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14741,30 +14765,30 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 							_tmp15_ = g_file_equal (_tmp13_, _tmp14_);
 #line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp11_ = !_tmp15_;
-#line 14743 "Photo.c"
+#line 14767 "Photo.c"
 						} else {
 #line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp11_ = FALSE;
-#line 14747 "Photo.c"
+#line 14771 "Photo.c"
 						}
 #line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp11_) {
-#line 14751 "Photo.c"
-							BackingPhotoTable* _tmp16_ = NULL;
-							BackingPhotoTable* _tmp17_ = NULL;
-							PhotoRow* _tmp18_ = NULL;
-							BackingPhotoID _tmp19_ = {0};
-							const gchar* _tmp20_ = NULL;
-							BackingPhotoRow* _tmp21_ = NULL;
-							const gchar* _tmp22_ = NULL;
-							gchar* _tmp23_ = NULL;
-							PhotoBackingReaders* _tmp24_ = NULL;
-							BackingPhotoRow* _tmp25_ = NULL;
-							PhotoFileFormat _tmp26_ = 0;
-							const gchar* _tmp27_ = NULL;
-							PhotoFileReader* _tmp28_ = NULL;
-							gboolean _tmp29_ = FALSE;
-							gboolean _tmp30_ = FALSE;
+#line 14775 "Photo.c"
+							BackingPhotoTable* _tmp16_;
+							BackingPhotoTable* _tmp17_;
+							PhotoRow* _tmp18_;
+							BackingPhotoID _tmp19_;
+							const gchar* _tmp20_;
+							BackingPhotoRow* _tmp21_;
+							const gchar* _tmp22_;
+							gchar* _tmp23_;
+							PhotoBackingReaders* _tmp24_;
+							BackingPhotoRow* _tmp25_;
+							PhotoFileFormat _tmp26_;
+							const gchar* _tmp27_;
+							PhotoFileReader* _tmp28_;
+							gboolean _tmp29_;
+							gboolean _tmp30_;
 #line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp16_ = backing_photo_table_get_instance ();
 #line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14783,8 +14807,8 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_object_unref0 (_tmp4_);
-#line 14785 "Photo.c"
-								goto __finally316;
+#line 14809 "Photo.c"
+								goto __finally317;
 							}
 #line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_ = self->priv->editable;
@@ -14820,43 +14844,43 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 							_tmp30_ = photo_is_editable_source (self);
 #line 1889 "/home/jens/Source/shotwell/src/Photo.vala"
 							is_source = _tmp30_;
-#line 14822 "Photo.c"
+#line 14846 "Photo.c"
 						}
 #line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_tmp4_);
-#line 14826 "Photo.c"
+#line 14850 "Photo.c"
 					}
-					__finally316:
+					__finally317:
 					{
-						PhotoBackingReaders* _tmp31_ = NULL;
+						PhotoBackingReaders* _tmp31_;
 #line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp31_ = self->priv->readers;
 #line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 14835 "Photo.c"
+#line 14859 "Photo.c"
 					}
 #line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14839 "Photo.c"
-						goto __finally315;
+#line 14863 "Photo.c"
+						goto __finally316;
 					}
 				}
 			}
-			__finally315:
+			__finally316:
 			{
-				PhotoRow* _tmp32_ = NULL;
+				PhotoRow* _tmp32_;
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = self->row;
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 14851 "Photo.c"
+#line 14875 "Photo.c"
 			}
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 14857 "Photo.c"
-					goto __catch314_database_error;
+#line 14881 "Photo.c"
+					goto __catch315_database_error;
 				}
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (old_file);
@@ -14868,15 +14892,15 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 				g_clear_error (&_inner_error_);
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 14870 "Photo.c"
+#line 14894 "Photo.c"
 			}
 		}
 	}
-	goto __finally314;
-	__catch314_database_error:
+	goto __finally315;
+	__catch315_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp33_ = NULL;
+		GError* _tmp33_;
 #line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
 #line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14887,9 +14911,9 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 		app_window_database_error (_tmp33_);
 #line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 14889 "Photo.c"
+#line 14913 "Photo.c"
 	}
-	__finally314:
+	__finally315:
 #line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14902,29 +14926,29 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 		g_clear_error (&_inner_error_);
 #line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 14904 "Photo.c"
+#line 14928 "Photo.c"
 	}
 #line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = altered;
 #line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp34_) {
-#line 14910 "Photo.c"
-		GFile* _tmp35_ = NULL;
-		GFile* _tmp36_ = NULL;
-		gboolean _tmp37_ = FALSE;
+#line 14934 "Photo.c"
+		GFile* _tmp35_;
+		GFile* _tmp36_;
+		gboolean _tmp37_;
 		gchar** alteration_list = NULL;
-		gchar** _tmp38_ = NULL;
-		gint alteration_list_length1 = 0;
-		gint _alteration_list_size_ = 0;
-		gchar** _tmp39_ = NULL;
-		gint _tmp39__length1 = 0;
-		gchar* _tmp40_ = NULL;
-		gboolean _tmp41_ = FALSE;
-		gboolean _tmp44_ = FALSE;
-		gchar** _tmp47_ = NULL;
-		gint _tmp47__length1 = 0;
-		Alteration* _tmp48_ = NULL;
-		Alteration* _tmp49_ = NULL;
+		gchar** _tmp38_;
+		gint alteration_list_length1;
+		gint _alteration_list_size_;
+		gchar** _tmp39_;
+		gint _tmp39__length1;
+		gchar* _tmp40_;
+		gboolean _tmp41_;
+		gboolean _tmp44_;
+		gchar** _tmp47_;
+		gint _tmp47__length1;
+		Alteration* _tmp48_;
+		Alteration* _tmp49_;
 #line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp35_ = old_file;
 #line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14937,7 +14961,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 		if (_tmp37_) {
 #line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_notify_baseline_replaced (self);
-#line 14939 "Photo.c"
+#line 14963 "Photo.c"
 		}
 #line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = g_new0 (gchar*, 0 + 1);
@@ -14959,10 +14983,10 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 		_tmp41_ = is_baseline;
 #line 1906 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp41_) {
-#line 14961 "Photo.c"
-			gchar** _tmp42_ = NULL;
-			gint _tmp42__length1 = 0;
-			gchar* _tmp43_ = NULL;
+#line 14985 "Photo.c"
+			gchar** _tmp42_;
+			gint _tmp42__length1;
+			gchar* _tmp43_;
 #line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = alteration_list;
 #line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14971,16 +14995,16 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 			_tmp43_ = g_strdup ("backing:baseline");
 #line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp43_);
-#line 14973 "Photo.c"
+#line 14997 "Photo.c"
 		}
 #line 1909 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = is_source;
 #line 1909 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp44_) {
-#line 14979 "Photo.c"
-			gchar** _tmp45_ = NULL;
-			gint _tmp45__length1 = 0;
-			gchar* _tmp46_ = NULL;
+#line 15003 "Photo.c"
+			gchar** _tmp45_;
+			gint _tmp45__length1;
+			gchar* _tmp46_;
 #line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp45_ = alteration_list;
 #line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14989,7 +15013,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 			_tmp46_ = g_strdup ("backing:source");
 #line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp46_);
-#line 14991 "Photo.c"
+#line 15015 "Photo.c"
 		}
 #line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = alteration_list;
@@ -15005,20 +15029,20 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 		_alteration_unref0 (_tmp49_);
 #line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
-#line 15007 "Photo.c"
+#line 15031 "Photo.c"
 	}
 #line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (old_file);
 #line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (filepath);
-#line 15013 "Photo.c"
+#line 15037 "Photo.c"
 }
 
 
 void photo_set_many_editable_file (GeeMap* map, GError** error) {
 	GeeMapIterator* map_iter = NULL;
-	GeeMap* _tmp0_ = NULL;
-	GeeMapIterator* _tmp1_ = NULL;
+	GeeMap* _tmp0_;
+	GeeMapIterator* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 1917 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
@@ -15032,15 +15056,15 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
 	map_iter = _tmp1_;
 #line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
 	while (TRUE) {
-#line 15034 "Photo.c"
-		GeeMapIterator* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		GeeMapIterator* _tmp4_ = NULL;
-		gpointer _tmp5_ = NULL;
-		Photo* _tmp6_ = NULL;
-		GeeMapIterator* _tmp7_ = NULL;
-		gpointer _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
+#line 15058 "Photo.c"
+		GeeMapIterator* _tmp2_;
+		gboolean _tmp3_;
+		GeeMapIterator* _tmp4_;
+		gpointer _tmp5_;
+		Photo* _tmp6_;
+		GeeMapIterator* _tmp7_;
+		gpointer _tmp8_;
+		GFile* _tmp9_;
 #line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = map_iter;
 #line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15049,7 +15073,7 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
 		if (!_tmp3_) {
 #line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 15051 "Photo.c"
+#line 15075 "Photo.c"
 		}
 #line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = map_iter;
@@ -15069,7 +15093,7 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
 		_g_object_unref0 (_tmp9_);
 #line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp6_);
-#line 15071 "Photo.c"
+#line 15095 "Photo.c"
 	}
 #line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_commit_transaction (&_inner_error_);
@@ -15083,7 +15107,7 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
 			_g_object_unref0 (map_iter);
 #line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15085 "Photo.c"
+#line 15109 "Photo.c"
 		} else {
 #line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (map_iter);
@@ -15093,21 +15117,21 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15095 "Photo.c"
+#line 15119 "Photo.c"
 		}
 	}
 #line 1917 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (map_iter);
-#line 15100 "Photo.c"
+#line 15124 "Photo.c"
 }
 
 
 GFile* photo_get_actual_file (Photo* self) {
 	GFile* result = NULL;
-	PhotoFileReader* _tmp0_ = NULL;
-	PhotoFileReader* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	PhotoFileReader* _tmp0_;
+	PhotoFileReader* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
 #line 1929 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15124,17 +15148,17 @@ GFile* photo_get_actual_file (Photo* self) {
 	result = _tmp3_;
 #line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15126 "Photo.c"
+#line 15150 "Photo.c"
 }
 
 
 static GFile* photo_real_get_master_file (MediaSource* base) {
 	Photo * self;
 	GFile* result = NULL;
-	PhotoFileReader* _tmp0_ = NULL;
-	PhotoFileReader* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	PhotoFileReader* _tmp0_;
+	PhotoFileReader* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
 #line 1933 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15151,16 +15175,16 @@ static GFile* photo_real_get_master_file (MediaSource* base) {
 	result = _tmp3_;
 #line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15153 "Photo.c"
+#line 15177 "Photo.c"
 }
 
 
 GFile* photo_get_editable_file (Photo* self) {
 	GFile* result = NULL;
 	PhotoFileReader* reader = NULL;
-	PhotoFileReader* _tmp0_ = NULL;
+	PhotoFileReader* _tmp0_;
 	GFile* _tmp1_ = NULL;
-	PhotoFileReader* _tmp2_ = NULL;
+	PhotoFileReader* _tmp2_;
 #line 1937 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15171,9 +15195,9 @@ GFile* photo_get_editable_file (Photo* self) {
 	_tmp2_ = reader;
 #line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 15173 "Photo.c"
-		PhotoFileReader* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
+#line 15197 "Photo.c"
+		PhotoFileReader* _tmp3_;
+		GFile* _tmp4_;
 #line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = reader;
 #line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15182,13 +15206,13 @@ GFile* photo_get_editable_file (Photo* self) {
 		_g_object_unref0 (_tmp1_);
 #line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp4_;
-#line 15184 "Photo.c"
+#line 15208 "Photo.c"
 	} else {
 #line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
 #line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = NULL;
-#line 15190 "Photo.c"
+#line 15214 "Photo.c"
 	}
 #line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
@@ -15196,15 +15220,15 @@ GFile* photo_get_editable_file (Photo* self) {
 	_photo_file_adapter_unref0 (reader);
 #line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15198 "Photo.c"
+#line 15222 "Photo.c"
 }
 
 
 GeeCollection* photo_get_raw_developer_files (Photo* self) {
 	GeeCollection* result = NULL;
-	PhotoFileFormat _tmp0_ = 0;
+	PhotoFileFormat _tmp0_;
 	GeeArrayList* ret = NULL;
-	GeeArrayList* _tmp1_ = NULL;
+	GeeArrayList* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -15216,29 +15240,29 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 		result = NULL;
 #line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 15218 "Photo.c"
+#line 15242 "Photo.c"
 	}
 #line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
 	ret = _tmp1_;
-#line 15224 "Photo.c"
+#line 15248 "Photo.c"
 	{
-		PhotoRow* _tmp2_ = NULL;
+		PhotoRow* _tmp2_;
 #line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
 #line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15231 "Photo.c"
+#line 15255 "Photo.c"
 		{
 			{
 				GeeIterator* _row_it = NULL;
-				GeeHashMap* _tmp3_ = NULL;
-				GeeCollection* _tmp4_ = NULL;
-				GeeCollection* _tmp5_ = NULL;
-				GeeCollection* _tmp6_ = NULL;
-				GeeIterator* _tmp7_ = NULL;
-				GeeIterator* _tmp8_ = NULL;
+				GeeHashMap* _tmp3_;
+				GeeCollection* _tmp4_;
+				GeeCollection* _tmp5_;
+				GeeCollection* _tmp6_;
+				GeeIterator* _tmp7_;
+				GeeIterator* _tmp8_;
 #line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->developments;
 #line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15257,17 +15281,17 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 				_row_it = _tmp8_;
 #line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				while (TRUE) {
-#line 15259 "Photo.c"
-					GeeIterator* _tmp9_ = NULL;
-					gboolean _tmp10_ = FALSE;
+#line 15283 "Photo.c"
+					GeeIterator* _tmp9_;
+					gboolean _tmp10_;
 					BackingPhotoRow* row = NULL;
-					GeeIterator* _tmp11_ = NULL;
-					gpointer _tmp12_ = NULL;
-					GeeArrayList* _tmp13_ = NULL;
-					BackingPhotoRow* _tmp14_ = NULL;
-					const gchar* _tmp15_ = NULL;
-					GFile* _tmp16_ = NULL;
-					GFile* _tmp17_ = NULL;
+					GeeIterator* _tmp11_;
+					gpointer _tmp12_;
+					GeeArrayList* _tmp13_;
+					BackingPhotoRow* _tmp14_;
+					const gchar* _tmp15_;
+					GFile* _tmp16_;
+					GFile* _tmp17_;
 #line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp9_ = _row_it;
 #line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15276,7 +15300,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 					if (!_tmp10_) {
 #line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 						break;
-#line 15278 "Photo.c"
+#line 15302 "Photo.c"
 					}
 #line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _row_it;
@@ -15300,21 +15324,21 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 					_g_object_unref0 (_tmp17_);
 #line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (row);
-#line 15302 "Photo.c"
+#line 15326 "Photo.c"
 				}
 #line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_row_it);
-#line 15306 "Photo.c"
+#line 15330 "Photo.c"
 			}
 		}
-		__finally317:
+		__finally318:
 		{
-			PhotoRow* _tmp18_ = NULL;
+			PhotoRow* _tmp18_;
 #line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = self->row;
 #line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15316 "Photo.c"
+#line 15340 "Photo.c"
 		}
 #line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -15326,23 +15350,23 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 			g_clear_error (&_inner_error_);
 #line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 15328 "Photo.c"
+#line 15352 "Photo.c"
 		}
 	}
 #line 1953 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (ret, GEE_TYPE_COLLECTION, GeeCollection);
 #line 1953 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15335 "Photo.c"
+#line 15359 "Photo.c"
 }
 
 
 GFile* photo_get_source_file (Photo* self) {
 	GFile* result = NULL;
-	PhotoFileReader* _tmp0_ = NULL;
-	PhotoFileReader* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	PhotoFileReader* _tmp0_;
+	PhotoFileReader* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
 #line 1956 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15359,7 +15383,7 @@ GFile* photo_get_source_file (Photo* self) {
 	result = _tmp3_;
 #line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15361 "Photo.c"
+#line 15385 "Photo.c"
 }
 
 
@@ -15368,44 +15392,44 @@ PhotoFileFormat photo_get_file_format (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1960 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 15370 "Photo.c"
+#line 15394 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15377 "Photo.c"
+#line 15401 "Photo.c"
 		{
-			BackingPhotoRow* _tmp1_ = NULL;
-			PhotoFileFormat _tmp2_ = 0;
+			BackingPhotoRow* _tmp1_;
+			PhotoFileFormat _tmp2_;
 #line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
 #line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->file_format;
 #line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15387 "Photo.c"
+#line 15411 "Photo.c"
 			{
-				PhotoRow* _tmp3_ = NULL;
+				PhotoRow* _tmp3_;
 #line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15394 "Photo.c"
+#line 15418 "Photo.c"
 			}
 #line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15398 "Photo.c"
+#line 15422 "Photo.c"
 		}
-		__finally318:
+		__finally319:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15407 "Photo.c"
+#line 15431 "Photo.c"
 		}
 #line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -15413,7 +15437,7 @@ PhotoFileFormat photo_get_file_format (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 15415 "Photo.c"
+#line 15439 "Photo.c"
 	}
 }
 
@@ -15421,9 +15445,9 @@ PhotoFileFormat photo_get_file_format (Photo* self) {
 PhotoFileFormat photo_get_best_export_file_format (Photo* self) {
 	PhotoFileFormat result = 0;
 	PhotoFileFormat file_format = 0;
-	PhotoFileFormat _tmp0_ = 0;
-	PhotoFileFormat _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
+	PhotoFileFormat _tmp0_;
+	PhotoFileFormat _tmp1_;
+	gboolean _tmp2_;
 #line 1966 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
 #line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15436,19 +15460,19 @@ PhotoFileFormat photo_get_best_export_file_format (Photo* self) {
 	_tmp2_ = photo_file_format_can_write (_tmp1_);
 #line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp2_) {
-#line 15438 "Photo.c"
-		PhotoFileFormat _tmp3_ = 0;
+#line 15462 "Photo.c"
+		PhotoFileFormat _tmp3_;
 #line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_file_format_get_system_default_format ();
 #line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
 		file_format = _tmp3_;
-#line 15444 "Photo.c"
+#line 15468 "Photo.c"
 	}
 #line 1971 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = file_format;
 #line 1971 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15450 "Photo.c"
+#line 15474 "Photo.c"
 }
 
 
@@ -15457,18 +15481,18 @@ PhotoFileFormat photo_get_master_file_format (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1974 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 15459 "Photo.c"
+#line 15483 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15466 "Photo.c"
+#line 15490 "Photo.c"
 		{
-			PhotoBackingReaders* _tmp1_ = NULL;
-			PhotoFileReader* _tmp2_ = NULL;
-			PhotoFileFormat _tmp3_ = 0;
+			PhotoBackingReaders* _tmp1_;
+			PhotoFileReader* _tmp2_;
+			PhotoFileFormat _tmp3_;
 #line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
 #line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15477,27 +15501,27 @@ PhotoFileFormat photo_get_master_file_format (Photo* self) {
 			_tmp3_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 15479 "Photo.c"
+#line 15503 "Photo.c"
 			{
-				PhotoRow* _tmp4_ = NULL;
+				PhotoRow* _tmp4_;
 #line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15486 "Photo.c"
+#line 15510 "Photo.c"
 			}
 #line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15490 "Photo.c"
+#line 15514 "Photo.c"
 		}
-		__finally319:
+		__finally320:
 		{
-			PhotoRow* _tmp5_ = NULL;
+			PhotoRow* _tmp5_;
 #line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15499 "Photo.c"
+#line 15523 "Photo.c"
 		}
 #line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -15505,7 +15529,7 @@ PhotoFileFormat photo_get_master_file_format (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 15507 "Photo.c"
+#line 15531 "Photo.c"
 	}
 }
 
@@ -15516,45 +15540,45 @@ static time_t photo_real_get_timestamp (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15518 "Photo.c"
+#line 15542 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 		time_t _tmp5_ = 0;
 #line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15526 "Photo.c"
+#line 15550 "Photo.c"
 		{
-			BackingPhotoRow* _tmp1_ = NULL;
-			time_t _tmp2_ = 0;
+			BackingPhotoRow* _tmp1_;
+			time_t _tmp2_;
 #line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
 #line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->timestamp;
 #line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15536 "Photo.c"
+#line 15560 "Photo.c"
 			{
-				PhotoRow* _tmp3_ = NULL;
+				PhotoRow* _tmp3_;
 #line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15543 "Photo.c"
+#line 15567 "Photo.c"
 			}
 #line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15547 "Photo.c"
+#line 15571 "Photo.c"
 		}
-		__finally320:
+		__finally321:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15556 "Photo.c"
+#line 15580 "Photo.c"
 		}
 #line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -15562,7 +15586,7 @@ static time_t photo_real_get_timestamp (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 15564 "Photo.c"
+#line 15588 "Photo.c"
 	}
 }
 
@@ -15571,44 +15595,44 @@ void photo_get_photo_id (Photo* self, PhotoID* result) {
 	GError * _inner_error_ = NULL;
 #line 1986 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 15573 "Photo.c"
+#line 15597 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15580 "Photo.c"
+#line 15604 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			PhotoID _tmp2_ = {0};
+			PhotoRow* _tmp1_;
+			PhotoID _tmp2_;
 #line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->photo_id;
 #line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15590 "Photo.c"
+#line 15614 "Photo.c"
 			{
-				PhotoRow* _tmp3_ = NULL;
+				PhotoRow* _tmp3_;
 #line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15597 "Photo.c"
+#line 15621 "Photo.c"
 			}
 #line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15601 "Photo.c"
+#line 15625 "Photo.c"
 		}
-		__finally321:
+		__finally322:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15610 "Photo.c"
+#line 15634 "Photo.c"
 		}
 #line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -15616,15 +15640,15 @@ void photo_get_photo_id (Photo* self, PhotoID* result) {
 		g_clear_error (&_inner_error_);
 #line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 15618 "Photo.c"
+#line 15642 "Photo.c"
 	}
 }
 
 
 static inline void photo_real_get_event_id (MediaSource* base, EventID* result) {
 	Photo * self;
-	PhotoRow* _tmp0_ = NULL;
-	EventID _tmp1_ = {0};
+	PhotoRow* _tmp0_;
+	EventID _tmp1_;
 #line 1993 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15635,15 +15659,15 @@ static inline void photo_real_get_event_id (MediaSource* base, EventID* result)
 	*result = _tmp1_;
 #line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 15637 "Photo.c"
+#line 15661 "Photo.c"
 }
 
 
 inline gint64 photo_get_raw_event_id (Photo* self) {
 	gint64 result = 0LL;
-	PhotoRow* _tmp0_ = NULL;
-	EventID _tmp1_ = {0};
-	gint64 _tmp2_ = 0LL;
+	PhotoRow* _tmp0_;
+	EventID _tmp1_;
+	gint64 _tmp2_;
 #line 1998 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0LL);
 #line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15656,7 +15680,7 @@ inline gint64 photo_get_raw_event_id (Photo* self) {
 	result = _tmp2_;
 #line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15658 "Photo.c"
+#line 15682 "Photo.c"
 }
 
 
@@ -15665,44 +15689,44 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) {
 	GError * _inner_error_ = NULL;
 #line 2002 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15667 "Photo.c"
+#line 15691 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15674 "Photo.c"
+#line 15698 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			ImportID _tmp2_ = {0};
+			PhotoRow* _tmp1_;
+			ImportID _tmp2_;
 #line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->import_id;
 #line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15684 "Photo.c"
+#line 15708 "Photo.c"
 			{
-				PhotoRow* _tmp3_ = NULL;
+				PhotoRow* _tmp3_;
 #line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15691 "Photo.c"
+#line 15715 "Photo.c"
 			}
 #line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15695 "Photo.c"
+#line 15719 "Photo.c"
 		}
-		__finally322:
+		__finally323:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15704 "Photo.c"
+#line 15728 "Photo.c"
 		}
 #line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -15710,7 +15734,7 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) {
 		g_clear_error (&_inner_error_);
 #line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 15712 "Photo.c"
+#line 15736 "Photo.c"
 	}
 }
 
@@ -15719,44 +15743,44 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) {
 	GError * _inner_error_ = NULL;
 #line 2008 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 15721 "Photo.c"
+#line 15745 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15728 "Photo.c"
+#line 15752 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			BackingPhotoID _tmp2_ = {0};
+			PhotoRow* _tmp1_;
+			BackingPhotoID _tmp2_;
 #line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable_id;
 #line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15738 "Photo.c"
+#line 15762 "Photo.c"
 			{
-				PhotoRow* _tmp3_ = NULL;
+				PhotoRow* _tmp3_;
 #line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15745 "Photo.c"
+#line 15769 "Photo.c"
 			}
 #line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15749 "Photo.c"
+#line 15773 "Photo.c"
 		}
-		__finally323:
+		__finally324:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15758 "Photo.c"
+#line 15782 "Photo.c"
 		}
 #line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -15764,7 +15788,7 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) {
 		g_clear_error (&_inner_error_);
 #line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 15766 "Photo.c"
+#line 15790 "Photo.c"
 	}
 }
 
@@ -15775,18 +15799,18 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2014 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15777 "Photo.c"
+#line 15801 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15784 "Photo.c"
+#line 15808 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			const gchar* _tmp2_ = NULL;
-			gchar* _tmp3_ = NULL;
+			PhotoRow* _tmp1_;
+			const gchar* _tmp2_;
+			gchar* _tmp3_;
 #line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15795,27 +15819,27 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) {
 			_tmp3_ = g_strdup (_tmp2_);
 #line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 15797 "Photo.c"
+#line 15821 "Photo.c"
 			{
-				PhotoRow* _tmp4_ = NULL;
+				PhotoRow* _tmp4_;
 #line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15804 "Photo.c"
+#line 15828 "Photo.c"
 			}
 #line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15808 "Photo.c"
+#line 15832 "Photo.c"
 		}
-		__finally324:
+		__finally325:
 		{
-			PhotoRow* _tmp5_ = NULL;
+			PhotoRow* _tmp5_;
 #line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15817 "Photo.c"
+#line 15841 "Photo.c"
 		}
 #line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -15823,7 +15847,7 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 15825 "Photo.c"
+#line 15849 "Photo.c"
 	}
 }
 
@@ -15833,45 +15857,45 @@ guint64 photo_get_flags (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 15835 "Photo.c"
+#line 15859 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 		guint64 _tmp5_ = 0ULL;
 #line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15843 "Photo.c"
+#line 15867 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			guint64 _tmp2_ = 0ULL;
+			PhotoRow* _tmp1_;
+			guint64 _tmp2_;
 #line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
 #line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15853 "Photo.c"
+#line 15877 "Photo.c"
 			{
-				PhotoRow* _tmp3_ = NULL;
+				PhotoRow* _tmp3_;
 #line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15860 "Photo.c"
+#line 15884 "Photo.c"
 			}
 #line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15864 "Photo.c"
+#line 15888 "Photo.c"
 		}
-		__finally325:
+		__finally326:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15873 "Photo.c"
+#line 15897 "Photo.c"
 		}
 #line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -15879,16 +15903,16 @@ guint64 photo_get_flags (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 15881 "Photo.c"
+#line 15905 "Photo.c"
 	}
 }
 
 
 static void photo_notify_flags_altered (Photo* self, Alteration* additional_alteration) {
 	Alteration* alteration = NULL;
-	Alteration* _tmp0_ = NULL;
-	Alteration* _tmp1_ = NULL;
-	Alteration* _tmp5_ = NULL;
+	Alteration* _tmp0_;
+	Alteration* _tmp1_;
+	Alteration* _tmp5_;
 #line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
 #line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15901,10 +15925,10 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte
 	_tmp1_ = additional_alteration;
 #line 2030 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 15903 "Photo.c"
-		Alteration* _tmp2_ = NULL;
-		Alteration* _tmp3_ = NULL;
-		Alteration* _tmp4_ = NULL;
+#line 15927 "Photo.c"
+		Alteration* _tmp2_;
+		Alteration* _tmp3_;
+		Alteration* _tmp4_;
 #line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = alteration;
 #line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15915,7 +15939,7 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte
 		_alteration_unref0 (alteration);
 #line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration = _tmp4_;
-#line 15917 "Photo.c"
+#line 15941 "Photo.c"
 	}
 #line 2033 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = alteration;
@@ -15923,35 +15947,35 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_);
 #line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (alteration);
-#line 15925 "Photo.c"
+#line 15949 "Photo.c"
 }
 
 
 guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_alteration) {
 	guint64 result = 0ULL;
 	gboolean committed = FALSE;
-	gboolean _tmp11_ = FALSE;
-	guint64 _tmp13_ = 0ULL;
+	gboolean _tmp11_;
+	guint64 _tmp13_;
 	GError * _inner_error_ = NULL;
 #line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
 #line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 15939 "Photo.c"
+#line 15963 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15946 "Photo.c"
+#line 15970 "Photo.c"
 		{
-			PhotoTable* _tmp1_ = NULL;
-			PhotoTable* _tmp2_ = NULL;
+			PhotoTable* _tmp1_;
+			PhotoTable* _tmp2_;
 			PhotoID _tmp3_ = {0};
-			guint64 _tmp4_ = 0ULL;
-			gboolean _tmp5_ = FALSE;
-			gboolean _tmp6_ = FALSE;
+			guint64 _tmp4_;
+			gboolean _tmp5_;
+			gboolean _tmp6_;
 #line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_table_get_instance ();
 #line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15970,30 +15994,30 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 			_tmp6_ = committed;
 #line 2040 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_) {
-#line 15972 "Photo.c"
-				PhotoRow* _tmp7_ = NULL;
-				guint64 _tmp8_ = 0ULL;
+#line 15996 "Photo.c"
+				PhotoRow* _tmp7_;
+				guint64 _tmp8_;
 #line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->row;
 #line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = flags;
 #line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_->flags = _tmp8_;
-#line 15981 "Photo.c"
+#line 16005 "Photo.c"
 			}
 		}
-		__finally326:
+		__finally327:
 		{
-			PhotoRow* _tmp9_ = NULL;
+			PhotoRow* _tmp9_;
 #line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
 #line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15991 "Photo.c"
+#line 16015 "Photo.c"
 		}
 #line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15995 "Photo.c"
+#line 16019 "Photo.c"
 			guint64 _tmp10_ = 0ULL;
 #line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -16001,20 +16025,20 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 			g_clear_error (&_inner_error_);
 #line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp10_;
-#line 16003 "Photo.c"
+#line 16027 "Photo.c"
 		}
 	}
 #line 2044 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = committed;
 #line 2044 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 16010 "Photo.c"
-		Alteration* _tmp12_ = NULL;
+#line 16034 "Photo.c"
+		Alteration* _tmp12_;
 #line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = additional_alteration;
 #line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp12_);
-#line 16016 "Photo.c"
+#line 16040 "Photo.c"
 	}
 #line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = flags;
@@ -16022,7 +16046,7 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 	result = _tmp13_;
 #line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16024 "Photo.c"
+#line 16048 "Photo.c"
 }
 
 
@@ -16031,20 +16055,20 @@ gboolean photo_is_flag_set (Photo* self, guint64 mask) {
 	GError * _inner_error_ = NULL;
 #line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 16033 "Photo.c"
+#line 16057 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 		gboolean _tmp7_ = FALSE;
 #line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16041 "Photo.c"
+#line 16065 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			guint64 _tmp2_ = 0ULL;
-			guint64 _tmp3_ = 0ULL;
-			gboolean _tmp4_ = FALSE;
+			PhotoRow* _tmp1_;
+			guint64 _tmp2_;
+			guint64 _tmp3_;
+			gboolean _tmp4_;
 #line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16055,27 +16079,27 @@ gboolean photo_is_flag_set (Photo* self, guint64 mask) {
 			_tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_);
 #line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp4_;
-#line 16057 "Photo.c"
+#line 16081 "Photo.c"
 			{
-				PhotoRow* _tmp5_ = NULL;
+				PhotoRow* _tmp5_;
 #line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = self->row;
 #line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16064 "Photo.c"
+#line 16088 "Photo.c"
 			}
 #line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16068 "Photo.c"
+#line 16092 "Photo.c"
 		}
-		__finally327:
+		__finally328:
 		{
-			PhotoRow* _tmp6_ = NULL;
+			PhotoRow* _tmp6_;
 #line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->row;
 #line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16077 "Photo.c"
+#line 16101 "Photo.c"
 		}
 #line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -16083,7 +16107,7 @@ gboolean photo_is_flag_set (Photo* self, guint64 mask) {
 		g_clear_error (&_inner_error_);
 #line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp7_;
-#line 16085 "Photo.c"
+#line 16109 "Photo.c"
 	}
 }
 
@@ -16092,7 +16116,7 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 	guint64 result = 0ULL;
 	guint64 flags = 0ULL;
 	gboolean committed = FALSE;
-	gboolean _tmp18_ = FALSE;
+	gboolean _tmp18_;
 	GError * _inner_error_ = NULL;
 #line 2056 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
@@ -16102,22 +16126,22 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 	flags = (guint64) 0;
 #line 2059 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16104 "Photo.c"
+#line 16128 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16111 "Photo.c"
-		{
-			PhotoRow* _tmp1_ = NULL;
-			guint64 _tmp2_ = 0ULL;
-			guint64 _tmp3_ = 0ULL;
-			guint64 _tmp4_ = 0ULL;
-			PhotoRow* _tmp5_ = NULL;
-			guint64 _tmp6_ = 0ULL;
-			guint64 _tmp7_ = 0ULL;
+#line 16135 "Photo.c"
+		{
+			PhotoRow* _tmp1_;
+			guint64 _tmp2_;
+			guint64 _tmp3_;
+			guint64 _tmp4_;
+			PhotoRow* _tmp5_;
+			guint64 _tmp6_;
+			guint64 _tmp7_;
 #line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16136,13 +16160,13 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 			_tmp7_ = flags;
 #line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != _tmp7_) {
-#line 16138 "Photo.c"
-				PhotoTable* _tmp8_ = NULL;
-				PhotoTable* _tmp9_ = NULL;
+#line 16162 "Photo.c"
+				PhotoTable* _tmp8_;
+				PhotoTable* _tmp9_;
 				PhotoID _tmp10_ = {0};
-				guint64 _tmp11_ = 0ULL;
-				gboolean _tmp12_ = FALSE;
-				gboolean _tmp13_ = FALSE;
+				guint64 _tmp11_;
+				gboolean _tmp12_;
+				gboolean _tmp13_;
 #line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = photo_table_get_instance ();
 #line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16161,31 +16185,31 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 				_tmp13_ = committed;
 #line 2064 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_) {
-#line 16163 "Photo.c"
-					PhotoRow* _tmp14_ = NULL;
-					guint64 _tmp15_ = 0ULL;
+#line 16187 "Photo.c"
+					PhotoRow* _tmp14_;
+					guint64 _tmp15_;
 #line 2065 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = self->row;
 #line 2065 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = flags;
 #line 2065 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16172 "Photo.c"
+#line 16196 "Photo.c"
 				}
 			}
 		}
-		__finally328:
+		__finally329:
 		{
-			PhotoRow* _tmp16_ = NULL;
+			PhotoRow* _tmp16_;
 #line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = self->row;
 #line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16183 "Photo.c"
+#line 16207 "Photo.c"
 		}
 #line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16187 "Photo.c"
+#line 16211 "Photo.c"
 			guint64 _tmp17_ = 0ULL;
 #line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -16193,26 +16217,26 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 			g_clear_error (&_inner_error_);
 #line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp17_;
-#line 16195 "Photo.c"
+#line 16219 "Photo.c"
 		}
 	}
 #line 2069 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = committed;
 #line 2069 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp18_) {
-#line 16202 "Photo.c"
-		Alteration* _tmp19_ = NULL;
+#line 16226 "Photo.c"
+		Alteration* _tmp19_;
 #line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = additional_alteration;
 #line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp19_);
-#line 16208 "Photo.c"
+#line 16232 "Photo.c"
 	}
 #line 2072 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
 #line 2072 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16214 "Photo.c"
+#line 16238 "Photo.c"
 }
 
 
@@ -16220,7 +16244,7 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 	guint64 result = 0ULL;
 	guint64 flags = 0ULL;
 	gboolean committed = FALSE;
-	gboolean _tmp18_ = FALSE;
+	gboolean _tmp18_;
 	GError * _inner_error_ = NULL;
 #line 2075 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
@@ -16230,22 +16254,22 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 	flags = (guint64) 0;
 #line 2078 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16232 "Photo.c"
+#line 16256 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16239 "Photo.c"
-		{
-			PhotoRow* _tmp1_ = NULL;
-			guint64 _tmp2_ = 0ULL;
-			guint64 _tmp3_ = 0ULL;
-			guint64 _tmp4_ = 0ULL;
-			PhotoRow* _tmp5_ = NULL;
-			guint64 _tmp6_ = 0ULL;
-			guint64 _tmp7_ = 0ULL;
+#line 16263 "Photo.c"
+		{
+			PhotoRow* _tmp1_;
+			guint64 _tmp2_;
+			guint64 _tmp3_;
+			guint64 _tmp4_;
+			PhotoRow* _tmp5_;
+			guint64 _tmp6_;
+			guint64 _tmp7_;
 #line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16264,13 +16288,13 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 			_tmp7_ = flags;
 #line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != _tmp7_) {
-#line 16266 "Photo.c"
-				PhotoTable* _tmp8_ = NULL;
-				PhotoTable* _tmp9_ = NULL;
+#line 16290 "Photo.c"
+				PhotoTable* _tmp8_;
+				PhotoTable* _tmp9_;
 				PhotoID _tmp10_ = {0};
-				guint64 _tmp11_ = 0ULL;
-				gboolean _tmp12_ = FALSE;
-				gboolean _tmp13_ = FALSE;
+				guint64 _tmp11_;
+				gboolean _tmp12_;
+				gboolean _tmp13_;
 #line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = photo_table_get_instance ();
 #line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16289,31 +16313,31 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 				_tmp13_ = committed;
 #line 2083 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_) {
-#line 16291 "Photo.c"
-					PhotoRow* _tmp14_ = NULL;
-					guint64 _tmp15_ = 0ULL;
+#line 16315 "Photo.c"
+					PhotoRow* _tmp14_;
+					guint64 _tmp15_;
 #line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = self->row;
 #line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = flags;
 #line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16300 "Photo.c"
+#line 16324 "Photo.c"
 				}
 			}
 		}
-		__finally329:
+		__finally330:
 		{
-			PhotoRow* _tmp16_ = NULL;
+			PhotoRow* _tmp16_;
 #line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = self->row;
 #line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16311 "Photo.c"
+#line 16335 "Photo.c"
 		}
 #line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16315 "Photo.c"
+#line 16339 "Photo.c"
 			guint64 _tmp17_ = 0ULL;
 #line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -16321,26 +16345,26 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 			g_clear_error (&_inner_error_);
 #line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp17_;
-#line 16323 "Photo.c"
+#line 16347 "Photo.c"
 		}
 	}
 #line 2088 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = committed;
 #line 2088 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp18_) {
-#line 16330 "Photo.c"
-		Alteration* _tmp19_ = NULL;
+#line 16354 "Photo.c"
+		Alteration* _tmp19_;
 #line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = additional_alteration;
 #line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp19_);
-#line 16336 "Photo.c"
+#line 16360 "Photo.c"
 	}
 #line 2091 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
 #line 2091 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16342 "Photo.c"
+#line 16366 "Photo.c"
 }
 
 
@@ -16348,7 +16372,7 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 	guint64 result = 0ULL;
 	guint64 flags = 0ULL;
 	gboolean committed = FALSE;
-	gboolean _tmp18_ = FALSE;
+	gboolean _tmp18_;
 	GError * _inner_error_ = NULL;
 #line 2094 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
@@ -16358,22 +16382,22 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 	flags = (guint64) 0;
 #line 2097 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16360 "Photo.c"
+#line 16384 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16367 "Photo.c"
-		{
-			PhotoRow* _tmp1_ = NULL;
-			guint64 _tmp2_ = 0ULL;
-			guint64 _tmp3_ = 0ULL;
-			guint64 _tmp4_ = 0ULL;
-			PhotoRow* _tmp5_ = NULL;
-			guint64 _tmp6_ = 0ULL;
-			guint64 _tmp7_ = 0ULL;
+#line 16391 "Photo.c"
+		{
+			PhotoRow* _tmp1_;
+			guint64 _tmp2_;
+			guint64 _tmp3_;
+			guint64 _tmp4_;
+			PhotoRow* _tmp5_;
+			guint64 _tmp6_;
+			guint64 _tmp7_;
 #line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16392,13 +16416,13 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 			_tmp7_ = flags;
 #line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != _tmp7_) {
-#line 16394 "Photo.c"
-				PhotoTable* _tmp8_ = NULL;
-				PhotoTable* _tmp9_ = NULL;
+#line 16418 "Photo.c"
+				PhotoTable* _tmp8_;
+				PhotoTable* _tmp9_;
 				PhotoID _tmp10_ = {0};
-				guint64 _tmp11_ = 0ULL;
-				gboolean _tmp12_ = FALSE;
-				gboolean _tmp13_ = FALSE;
+				guint64 _tmp11_;
+				gboolean _tmp12_;
+				gboolean _tmp13_;
 #line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = photo_table_get_instance ();
 #line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16417,31 +16441,31 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 				_tmp13_ = committed;
 #line 2102 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_) {
-#line 16419 "Photo.c"
-					PhotoRow* _tmp14_ = NULL;
-					guint64 _tmp15_ = 0ULL;
+#line 16443 "Photo.c"
+					PhotoRow* _tmp14_;
+					guint64 _tmp15_;
 #line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = self->row;
 #line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = flags;
 #line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16428 "Photo.c"
+#line 16452 "Photo.c"
 				}
 			}
 		}
-		__finally330:
+		__finally331:
 		{
-			PhotoRow* _tmp16_ = NULL;
+			PhotoRow* _tmp16_;
 #line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = self->row;
 #line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16439 "Photo.c"
+#line 16463 "Photo.c"
 		}
 #line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16443 "Photo.c"
+#line 16467 "Photo.c"
 			guint64 _tmp17_ = 0ULL;
 #line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -16449,32 +16473,32 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 			g_clear_error (&_inner_error_);
 #line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp17_;
-#line 16451 "Photo.c"
+#line 16475 "Photo.c"
 		}
 	}
 #line 2107 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = committed;
 #line 2107 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp18_) {
-#line 16458 "Photo.c"
-		Alteration* _tmp19_ = NULL;
+#line 16482 "Photo.c"
+		Alteration* _tmp19_;
 #line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = additional_alteration;
 #line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp19_);
-#line 16464 "Photo.c"
+#line 16488 "Photo.c"
 	}
 #line 2110 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
 #line 2110 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16470 "Photo.c"
+#line 16494 "Photo.c"
 }
 
 
 void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alteration* additional_add_alteration, GeeCollection* remove, guint64 remove_mask, Alteration* additional_remove_alteration, GError** error) {
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp10_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp10_;
 	GError * _inner_error_ = NULL;
 #line 2113 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((add == NULL) || GEE_IS_COLLECTION (add));
@@ -16490,11 +16514,11 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 	_tmp0_ = add;
 #line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 16492 "Photo.c"
+#line 16516 "Photo.c"
 		{
 			GeeIterator* _photo_it = NULL;
-			GeeCollection* _tmp1_ = NULL;
-			GeeIterator* _tmp2_ = NULL;
+			GeeCollection* _tmp1_;
+			GeeIterator* _tmp2_;
 #line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = add;
 #line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16503,15 +16527,15 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 			_photo_it = _tmp2_;
 #line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 16505 "Photo.c"
-				GeeIterator* _tmp3_ = NULL;
-				gboolean _tmp4_ = FALSE;
+#line 16529 "Photo.c"
+				GeeIterator* _tmp3_;
+				gboolean _tmp4_;
 				Photo* photo = NULL;
-				GeeIterator* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
-				Photo* _tmp7_ = NULL;
-				guint64 _tmp8_ = 0ULL;
-				Alteration* _tmp9_ = NULL;
+				GeeIterator* _tmp5_;
+				gpointer _tmp6_;
+				Photo* _tmp7_;
+				guint64 _tmp8_;
+				Alteration* _tmp9_;
 #line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = _photo_it;
 #line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16520,7 +16544,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 				if (!_tmp4_) {
 #line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 16522 "Photo.c"
+#line 16546 "Photo.c"
 				}
 #line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _photo_it;
@@ -16538,22 +16562,22 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 				photo_add_flags (_tmp7_, _tmp8_, _tmp9_);
 #line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 16540 "Photo.c"
+#line 16564 "Photo.c"
 			}
 #line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_photo_it);
-#line 16544 "Photo.c"
+#line 16568 "Photo.c"
 		}
 	}
 #line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = remove;
 #line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_ != NULL) {
-#line 16551 "Photo.c"
+#line 16575 "Photo.c"
 		{
 			GeeIterator* _photo_it = NULL;
-			GeeCollection* _tmp11_ = NULL;
-			GeeIterator* _tmp12_ = NULL;
+			GeeCollection* _tmp11_;
+			GeeIterator* _tmp12_;
 #line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = remove;
 #line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16562,15 +16586,15 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 			_photo_it = _tmp12_;
 #line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 16564 "Photo.c"
-				GeeIterator* _tmp13_ = NULL;
-				gboolean _tmp14_ = FALSE;
+#line 16588 "Photo.c"
+				GeeIterator* _tmp13_;
+				gboolean _tmp14_;
 				Photo* photo = NULL;
-				GeeIterator* _tmp15_ = NULL;
-				gpointer _tmp16_ = NULL;
-				Photo* _tmp17_ = NULL;
-				guint64 _tmp18_ = 0ULL;
-				Alteration* _tmp19_ = NULL;
+				GeeIterator* _tmp15_;
+				gpointer _tmp16_;
+				Photo* _tmp17_;
+				guint64 _tmp18_;
+				Alteration* _tmp19_;
 #line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _photo_it;
 #line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16579,7 +16603,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 				if (!_tmp14_) {
 #line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 16581 "Photo.c"
+#line 16605 "Photo.c"
 				}
 #line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _photo_it;
@@ -16597,11 +16621,11 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 				photo_remove_flags (_tmp17_, _tmp18_, _tmp19_);
 #line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 16599 "Photo.c"
+#line 16623 "Photo.c"
 			}
 #line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_photo_it);
-#line 16603 "Photo.c"
+#line 16627 "Photo.c"
 		}
 	}
 #line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16614,7 +16638,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 			g_propagate_error (error, _inner_error_);
 #line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 16616 "Photo.c"
+#line 16640 "Photo.c"
 		} else {
 #line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -16622,7 +16646,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 			g_clear_error (&_inner_error_);
 #line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 16624 "Photo.c"
+#line 16648 "Photo.c"
 		}
 	}
 }
@@ -16632,7 +16656,7 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 	guint64 result = 0ULL;
 	guint64 flags = 0ULL;
 	gboolean committed = FALSE;
-	gboolean _tmp17_ = FALSE;
+	gboolean _tmp17_;
 	GError * _inner_error_ = NULL;
 #line 2131 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
@@ -16642,21 +16666,21 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 	flags = (guint64) 0;
 #line 2134 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16644 "Photo.c"
+#line 16668 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16651 "Photo.c"
-		{
-			PhotoRow* _tmp1_ = NULL;
-			guint64 _tmp2_ = 0ULL;
-			guint64 _tmp3_ = 0ULL;
-			PhotoRow* _tmp4_ = NULL;
-			guint64 _tmp5_ = 0ULL;
-			guint64 _tmp6_ = 0ULL;
+#line 16675 "Photo.c"
+		{
+			PhotoRow* _tmp1_;
+			guint64 _tmp2_;
+			guint64 _tmp3_;
+			PhotoRow* _tmp4_;
+			guint64 _tmp5_;
+			guint64 _tmp6_;
 #line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16673,13 +16697,13 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 			_tmp6_ = flags;
 #line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp5_ != _tmp6_) {
-#line 16675 "Photo.c"
-				PhotoTable* _tmp7_ = NULL;
-				PhotoTable* _tmp8_ = NULL;
+#line 16699 "Photo.c"
+				PhotoTable* _tmp7_;
+				PhotoTable* _tmp8_;
 				PhotoID _tmp9_ = {0};
-				guint64 _tmp10_ = 0ULL;
-				gboolean _tmp11_ = FALSE;
-				gboolean _tmp12_ = FALSE;
+				guint64 _tmp10_;
+				gboolean _tmp11_;
+				gboolean _tmp12_;
 #line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = photo_table_get_instance ();
 #line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16698,31 +16722,31 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 				_tmp12_ = committed;
 #line 2139 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_) {
-#line 16700 "Photo.c"
-					PhotoRow* _tmp13_ = NULL;
-					guint64 _tmp14_ = 0ULL;
+#line 16724 "Photo.c"
+					PhotoRow* _tmp13_;
+					guint64 _tmp14_;
 #line 2140 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = self->row;
 #line 2140 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = flags;
 #line 2140 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_->flags = _tmp14_;
-#line 16709 "Photo.c"
+#line 16733 "Photo.c"
 				}
 			}
 		}
-		__finally331:
+		__finally332:
 		{
-			PhotoRow* _tmp15_ = NULL;
+			PhotoRow* _tmp15_;
 #line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = self->row;
 #line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16720 "Photo.c"
+#line 16744 "Photo.c"
 		}
 #line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16724 "Photo.c"
+#line 16748 "Photo.c"
 			guint64 _tmp16_ = 0ULL;
 #line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -16730,26 +16754,26 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 			g_clear_error (&_inner_error_);
 #line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp16_;
-#line 16732 "Photo.c"
+#line 16756 "Photo.c"
 		}
 	}
 #line 2144 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = committed;
 #line 2144 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_) {
-#line 16739 "Photo.c"
-		Alteration* _tmp18_ = NULL;
+#line 16763 "Photo.c"
+		Alteration* _tmp18_;
 #line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = additional_alteration;
 #line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp18_);
-#line 16745 "Photo.c"
+#line 16769 "Photo.c"
 	}
 #line 2147 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
 #line 2147 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16751 "Photo.c"
+#line 16775 "Photo.c"
 }
 
 
@@ -16758,45 +16782,45 @@ gboolean photo_is_master_metadata_dirty (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2150 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 16760 "Photo.c"
+#line 16784 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 		gboolean _tmp5_ = FALSE;
 #line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16768 "Photo.c"
+#line 16792 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			gboolean _tmp2_ = FALSE;
+			PhotoRow* _tmp1_;
+			gboolean _tmp2_;
 #line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->metadata_dirty;
 #line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 16778 "Photo.c"
+#line 16802 "Photo.c"
 			{
-				PhotoRow* _tmp3_ = NULL;
+				PhotoRow* _tmp3_;
 #line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16785 "Photo.c"
+#line 16809 "Photo.c"
 			}
 #line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16789 "Photo.c"
+#line 16813 "Photo.c"
 		}
-		__finally332:
+		__finally333:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16798 "Photo.c"
+#line 16822 "Photo.c"
 		}
 #line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -16804,31 +16828,31 @@ gboolean photo_is_master_metadata_dirty (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 16806 "Photo.c"
+#line 16830 "Photo.c"
 	}
 }
 
 
 void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** error) {
 	gboolean committed = FALSE;
-	gboolean _tmp11_ = FALSE;
+	gboolean _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
 #line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16819 "Photo.c"
+#line 16843 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16826 "Photo.c"
+#line 16850 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			gboolean _tmp2_ = FALSE;
-			gboolean _tmp3_ = FALSE;
+			PhotoRow* _tmp1_;
+			gboolean _tmp2_;
+			gboolean _tmp3_;
 #line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16837,13 +16861,13 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 			_tmp3_ = dirty;
 #line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != _tmp3_) {
-#line 16839 "Photo.c"
-				PhotoTable* _tmp4_ = NULL;
-				PhotoTable* _tmp5_ = NULL;
+#line 16863 "Photo.c"
+				PhotoTable* _tmp4_;
+				PhotoTable* _tmp5_;
 				PhotoID _tmp6_ = {0};
-				gboolean _tmp7_ = FALSE;
-				PhotoRow* _tmp8_ = NULL;
-				gboolean _tmp9_ = FALSE;
+				gboolean _tmp7_;
+				PhotoRow* _tmp8_;
+				gboolean _tmp9_;
 #line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = photo_table_get_instance ();
 #line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16858,8 +16882,8 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 				_database_table_unref0 (_tmp5_);
 #line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16860 "Photo.c"
-					goto __finally333;
+#line 16884 "Photo.c"
+					goto __finally334;
 				}
 #line 2161 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
@@ -16869,17 +16893,17 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 				_tmp8_->metadata_dirty = _tmp9_;
 #line 2162 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = TRUE;
-#line 16871 "Photo.c"
+#line 16895 "Photo.c"
 			}
 		}
-		__finally333:
+		__finally334:
 		{
-			PhotoRow* _tmp10_ = NULL;
+			PhotoRow* _tmp10_;
 #line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = self->row;
 #line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16881 "Photo.c"
+#line 16905 "Photo.c"
 		}
 #line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -16889,7 +16913,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 				g_propagate_error (error, _inner_error_);
 #line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 16891 "Photo.c"
+#line 16915 "Photo.c"
 			} else {
 #line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -16897,7 +16921,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 				g_clear_error (&_inner_error_);
 #line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 16899 "Photo.c"
+#line 16923 "Photo.c"
 			}
 		}
 	}
@@ -16905,9 +16929,9 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 	_tmp11_ = committed;
 #line 2166 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 16907 "Photo.c"
-		Alteration* _tmp12_ = NULL;
-		Alteration* _tmp13_ = NULL;
+#line 16931 "Photo.c"
+		Alteration* _tmp12_;
+		Alteration* _tmp13_;
 #line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = alteration_new ("metadata", "master-dirty");
 #line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16916,7 +16940,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_);
 #line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp13_);
-#line 16918 "Photo.c"
+#line 16942 "Photo.c"
 	}
 }
 
@@ -16927,44 +16951,44 @@ static Rating photo_real_get_rating (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 16929 "Photo.c"
+#line 16953 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16936 "Photo.c"
+#line 16960 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			Rating _tmp2_ = 0;
+			PhotoRow* _tmp1_;
+			Rating _tmp2_;
 #line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->rating;
 #line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 16946 "Photo.c"
+#line 16970 "Photo.c"
 			{
-				PhotoRow* _tmp3_ = NULL;
+				PhotoRow* _tmp3_;
 #line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16953 "Photo.c"
+#line 16977 "Photo.c"
 			}
 #line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16957 "Photo.c"
+#line 16981 "Photo.c"
 		}
-		__finally334:
+		__finally335:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16966 "Photo.c"
+#line 16990 "Photo.c"
 		}
 #line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -16972,7 +16996,7 @@ static Rating photo_real_get_rating (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 16974 "Photo.c"
+#line 16998 "Photo.c"
 	}
 }
 
@@ -16980,25 +17004,25 @@ static Rating photo_real_get_rating (MediaSource* base) {
 static void photo_real_set_rating (MediaSource* base, Rating rating) {
 	Photo * self;
 	gboolean committed = FALSE;
-	gboolean _tmp16_ = FALSE;
+	gboolean _tmp16_;
 	GError * _inner_error_ = NULL;
 #line 2176 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16988 "Photo.c"
+#line 17012 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16995 "Photo.c"
+#line 17019 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
-			Rating _tmp2_ = 0;
-			PhotoRow* _tmp3_ = NULL;
-			Rating _tmp4_ = 0;
+			Rating _tmp2_;
+			PhotoRow* _tmp3_;
+			Rating _tmp4_;
 #line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = rating;
 #line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17007,30 +17031,30 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 			_tmp4_ = _tmp3_->rating;
 #line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != _tmp4_) {
-#line 17009 "Photo.c"
-				Rating _tmp5_ = 0;
-				gboolean _tmp6_ = FALSE;
+#line 17033 "Photo.c"
+				Rating _tmp5_;
+				gboolean _tmp6_;
 #line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = rating;
 #line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = rating_is_valid (_tmp5_);
 #line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp6_;
-#line 17018 "Photo.c"
+#line 17042 "Photo.c"
 			} else {
 #line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 17022 "Photo.c"
+#line 17046 "Photo.c"
 			}
 #line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_) {
-#line 17026 "Photo.c"
-				PhotoTable* _tmp7_ = NULL;
-				PhotoTable* _tmp8_ = NULL;
+#line 17050 "Photo.c"
+				PhotoTable* _tmp7_;
+				PhotoTable* _tmp8_;
 				PhotoID _tmp9_ = {0};
-				Rating _tmp10_ = 0;
-				gboolean _tmp11_ = FALSE;
-				gboolean _tmp12_ = FALSE;
+				Rating _tmp10_;
+				gboolean _tmp11_;
+				gboolean _tmp12_;
 #line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = photo_table_get_instance ();
 #line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17049,27 +17073,27 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 				_tmp12_ = committed;
 #line 2182 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_) {
-#line 17051 "Photo.c"
-					PhotoRow* _tmp13_ = NULL;
-					Rating _tmp14_ = 0;
+#line 17075 "Photo.c"
+					PhotoRow* _tmp13_;
+					Rating _tmp14_;
 #line 2183 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = self->row;
 #line 2183 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = rating;
 #line 2183 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_->rating = _tmp14_;
-#line 17060 "Photo.c"
+#line 17084 "Photo.c"
 				}
 			}
 		}
-		__finally335:
+		__finally336:
 		{
-			PhotoRow* _tmp15_ = NULL;
+			PhotoRow* _tmp15_;
 #line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = self->row;
 #line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17071 "Photo.c"
+#line 17095 "Photo.c"
 		}
 #line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -17079,16 +17103,16 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 			g_clear_error (&_inner_error_);
 #line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17081 "Photo.c"
+#line 17105 "Photo.c"
 		}
 	}
 #line 2187 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = committed;
 #line 2187 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 17088 "Photo.c"
-		Alteration* _tmp17_ = NULL;
-		Alteration* _tmp18_ = NULL;
+#line 17112 "Photo.c"
+		Alteration* _tmp17_;
+		Alteration* _tmp18_;
 #line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = alteration_new ("metadata", "rating");
 #line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17097,7 +17121,7 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_);
 #line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp18_);
-#line 17099 "Photo.c"
+#line 17123 "Photo.c"
 	}
 }
 
@@ -17107,18 +17131,18 @@ static void photo_real_increase_rating (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17109 "Photo.c"
+#line 17133 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17116 "Photo.c"
+#line 17140 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			Rating _tmp2_ = 0;
-			Rating _tmp3_ = 0;
+			PhotoRow* _tmp1_;
+			Rating _tmp2_;
+			Rating _tmp3_;
 #line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17127,16 +17151,16 @@ static void photo_real_increase_rating (MediaSource* base) {
 			_tmp3_ = rating_increase (_tmp2_);
 #line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 17129 "Photo.c"
+#line 17153 "Photo.c"
 		}
-		__finally336:
+		__finally337:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17138 "Photo.c"
+#line 17162 "Photo.c"
 		}
 #line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -17146,7 +17170,7 @@ static void photo_real_increase_rating (MediaSource* base) {
 			g_clear_error (&_inner_error_);
 #line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17148 "Photo.c"
+#line 17172 "Photo.c"
 		}
 	}
 }
@@ -17157,18 +17181,18 @@ static void photo_real_decrease_rating (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2197 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17159 "Photo.c"
+#line 17183 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17166 "Photo.c"
+#line 17190 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			Rating _tmp2_ = 0;
-			Rating _tmp3_ = 0;
+			PhotoRow* _tmp1_;
+			Rating _tmp2_;
+			Rating _tmp3_;
 #line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17177,16 +17201,16 @@ static void photo_real_decrease_rating (MediaSource* base) {
 			_tmp3_ = rating_decrease (_tmp2_);
 #line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 17179 "Photo.c"
+#line 17203 "Photo.c"
 		}
-		__finally337:
+		__finally338:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17188 "Photo.c"
+#line 17212 "Photo.c"
 		}
 #line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -17196,7 +17220,7 @@ static void photo_real_decrease_rating (MediaSource* base) {
 			g_clear_error (&_inner_error_);
 #line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17198 "Photo.c"
+#line 17222 "Photo.c"
 		}
 	}
 }
@@ -17209,12 +17233,12 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 2203 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources));
-#line 17211 "Photo.c"
+#line 17235 "Photo.c"
 	{
-		PhotoTable* _tmp0_ = NULL;
-		PhotoTable* _tmp1_ = NULL;
+		PhotoTable* _tmp0_;
+		PhotoTable* _tmp1_;
 		PhotoID _tmp2_ = {0};
-		const gchar* _tmp3_ = NULL;
+		const gchar* _tmp3_;
 #line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_table_get_instance ();
 #line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17231,8 +17255,8 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 17233 "Photo.c"
-				goto __catch338_database_error;
+#line 17257 "Photo.c"
+				goto __catch339_database_error;
 			}
 #line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -17240,19 +17264,19 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 			g_clear_error (&_inner_error_);
 #line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17242 "Photo.c"
+#line 17266 "Photo.c"
 		}
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17250 "Photo.c"
+#line 17274 "Photo.c"
 			{
-				PhotoRow* _tmp5_ = NULL;
-				const gchar* _tmp6_ = NULL;
-				gchar* _tmp7_ = NULL;
+				PhotoRow* _tmp5_;
+				const gchar* _tmp6_;
+				gchar* _tmp7_;
 #line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = self->row;
 #line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17263,23 +17287,23 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 				_g_free0 (_tmp5_->backlinks);
 #line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_->backlinks = _tmp7_;
-#line 17265 "Photo.c"
+#line 17289 "Photo.c"
 			}
-			__finally339:
+			__finally340:
 			{
-				PhotoRow* _tmp8_ = NULL;
+				PhotoRow* _tmp8_;
 #line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
 #line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17274 "Photo.c"
+#line 17298 "Photo.c"
 			}
 #line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 17280 "Photo.c"
-					goto __catch338_database_error;
+#line 17304 "Photo.c"
+					goto __catch339_database_error;
 				}
 #line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -17287,18 +17311,18 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 				g_clear_error (&_inner_error_);
 #line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 17289 "Photo.c"
+#line 17313 "Photo.c"
 			}
 		}
 	}
-	goto __finally338;
-	__catch338_database_error:
+	goto __finally339;
+	__catch339_database_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		GError* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+		GError* _tmp11_;
+		const gchar* _tmp12_;
 #line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
 #line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17317,9 +17341,9 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 		_g_free0 (_tmp10_);
 #line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 17319 "Photo.c"
+#line 17343 "Photo.c"
 	}
-	__finally338:
+	__finally339:
 #line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17328,7 +17352,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 		g_clear_error (&_inner_error_);
 #line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17330 "Photo.c"
+#line 17354 "Photo.c"
 	}
 }
 
@@ -17341,25 +17365,25 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 17343 "Photo.c"
+#line 17367 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 		gboolean _tmp13_ = FALSE;
 #line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17351 "Photo.c"
+#line 17375 "Photo.c"
 		{
 			gboolean committed = FALSE;
-			PhotoTable* _tmp1_ = NULL;
-			PhotoTable* _tmp2_ = NULL;
-			PhotoRow* _tmp3_ = NULL;
-			PhotoID _tmp4_ = {0};
-			EventID _tmp5_ = {0};
-			gboolean _tmp6_ = FALSE;
-			gboolean _tmp7_ = FALSE;
-			gboolean _tmp8_ = FALSE;
+			PhotoTable* _tmp1_;
+			PhotoTable* _tmp2_;
+			PhotoRow* _tmp3_;
+			PhotoID _tmp4_;
+			EventID _tmp5_;
+			gboolean _tmp6_;
+			gboolean _tmp7_;
+			gboolean _tmp8_;
 #line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_table_get_instance ();
 #line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17382,40 +17406,40 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
 			_tmp8_ = committed;
 #line 2225 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_) {
-#line 17384 "Photo.c"
-				PhotoRow* _tmp9_ = NULL;
-				EventID _tmp10_ = {0};
+#line 17408 "Photo.c"
+				PhotoRow* _tmp9_;
+				EventID _tmp10_;
 #line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->row;
 #line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = *event_id;
 #line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_->event_id = _tmp10_;
-#line 17393 "Photo.c"
+#line 17417 "Photo.c"
 			}
 #line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = committed;
-#line 17397 "Photo.c"
+#line 17421 "Photo.c"
 			{
-				PhotoRow* _tmp11_ = NULL;
+				PhotoRow* _tmp11_;
 #line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->row;
 #line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17404 "Photo.c"
+#line 17428 "Photo.c"
 			}
 #line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 17408 "Photo.c"
+#line 17432 "Photo.c"
 		}
-		__finally340:
+		__finally341:
 		{
-			PhotoRow* _tmp12_ = NULL;
+			PhotoRow* _tmp12_;
 #line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = self->row;
 #line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17417 "Photo.c"
+#line 17441 "Photo.c"
 		}
 #line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -17423,7 +17447,7 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
 		g_clear_error (&_inner_error_);
 #line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp13_;
-#line 17425 "Photo.c"
+#line 17449 "Photo.c"
 	}
 }
 
@@ -17432,31 +17456,31 @@ static gchar* photo_real_to_string (DataObject* base) {
 	Photo * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	PhotoID _tmp10_ = {0};
-	gint64 _tmp11_ = 0LL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	PhotoFileReader* _tmp14_ = NULL;
-	PhotoFileReader* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
+	gint64 _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	PhotoFileReader* _tmp14_;
+	PhotoFileReader* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
 #line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_is_master_baseline (self);
 #line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp1_) {
-#line 17451 "Photo.c"
-		GFile* _tmp2_ = NULL;
-		GFile* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
+#line 17475 "Photo.c"
+		GFile* _tmp2_;
+		GFile* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
 #line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = photo_get_actual_file (self);
 #line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17481,16 +17505,16 @@ static gchar* photo_real_to_string (DataObject* base) {
 		_g_free0 (_tmp5_);
 #line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 17483 "Photo.c"
+#line 17507 "Photo.c"
 	} else {
-		gchar* _tmp9_ = NULL;
+		gchar* _tmp9_;
 #line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = g_strdup ("");
 #line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
 #line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp9_;
-#line 17492 "Photo.c"
+#line 17516 "Photo.c"
 	}
 #line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_photo_id (self, &_tmp10_);
@@ -17524,7 +17548,7 @@ static gchar* photo_real_to_string (DataObject* base) {
 	_g_free0 (_tmp0_);
 #line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 17526 "Photo.c"
+#line 17550 "Photo.c"
 }
 
 
@@ -17532,11 +17556,11 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 	Photo * self;
 	gboolean result = FALSE;
 	Photo* photo = NULL;
-	DataSource* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	DataSource* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
+	DataSource* _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	DataSource* _tmp14_;
+	gboolean _tmp15_;
 #line 2237 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 2237 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17551,14 +17575,14 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 	_tmp2_ = photo;
 #line 2240 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 17553 "Photo.c"
+#line 17577 "Photo.c"
 		PhotoID photo_id = {0};
 		PhotoID _tmp3_ = {0};
 		PhotoID other_photo_id = {0};
-		Photo* _tmp4_ = NULL;
+		Photo* _tmp4_;
 		PhotoID _tmp5_ = {0};
 		gboolean _tmp6_ = FALSE;
-		Photo* _tmp7_ = NULL;
+		Photo* _tmp7_;
 #line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_get_photo_id (self, &_tmp3_);
 #line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17573,28 +17597,28 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 		_tmp7_ = photo;
 #line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (self != _tmp7_) {
-#line 17575 "Photo.c"
-			PhotoID _tmp8_ = {0};
-			gint64 _tmp9_ = 0LL;
+#line 17599 "Photo.c"
+			PhotoID _tmp8_;
+			gint64 _tmp9_;
 #line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = photo_id;
 #line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_.id;
 #line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp9_ != PHOTO_ID_INVALID;
-#line 17584 "Photo.c"
+#line 17608 "Photo.c"
 		} else {
 #line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = FALSE;
-#line 17588 "Photo.c"
+#line 17612 "Photo.c"
 		}
 #line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp6_) {
-#line 17592 "Photo.c"
-			PhotoID _tmp10_ = {0};
-			gint64 _tmp11_ = 0LL;
-			PhotoID _tmp12_ = {0};
-			gint64 _tmp13_ = 0LL;
+#line 17616 "Photo.c"
+			PhotoID _tmp10_;
+			gint64 _tmp11_;
+			PhotoID _tmp12_;
+			gint64 _tmp13_;
 #line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo_id;
 #line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17605,7 +17629,7 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 			_tmp13_ = _tmp12_.id;
 #line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_assert (_tmp11_ != _tmp13_, "photo_id.id != other_photo_id.id");
-#line 17607 "Photo.c"
+#line 17631 "Photo.c"
 		}
 	}
 #line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17618,25 +17642,25 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 	_g_object_unref0 (photo);
 #line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 17620 "Photo.c"
+#line 17644 "Photo.c"
 }
 
 
 static void photo_file_exif_updated (Photo* self) {
 	GFile* file = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	GFileInfo* info = NULL;
 	GTimeVal timestamp = {0};
-	GFileInfo* _tmp7_ = NULL;
+	GFileInfo* _tmp7_;
 	GTimeVal _tmp8_ = {0};
 	PhotoFileInterrogator* interrogator = NULL;
-	PhotoFileInterrogator* _tmp9_ = NULL;
+	PhotoFileInterrogator* _tmp9_;
 	DetectedPhotoInformation* detected = NULL;
-	DetectedPhotoInformation* _tmp14_ = NULL;
+	DetectedPhotoInformation* _tmp14_;
 	gboolean _tmp15_ = FALSE;
-	DetectedPhotoInformation* _tmp16_ = NULL;
+	DetectedPhotoInformation* _tmp16_;
 	gboolean success = FALSE;
-	gboolean _tmp37_ = FALSE;
+	gboolean _tmp37_;
 	GError * _inner_error_ = NULL;
 #line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -17646,19 +17670,19 @@ static void photo_file_exif_updated (Photo* self) {
 	file = _tmp0_;
 #line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = NULL;
-#line 17648 "Photo.c"
+#line 17672 "Photo.c"
 	{
 		GFileInfo* _tmp1_ = NULL;
-		GFileInfo* _tmp2_ = NULL;
-		GFileInfo* _tmp3_ = NULL;
+		GFileInfo* _tmp2_;
+		GFileInfo* _tmp3_;
 #line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = g_file_query_info (file, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
 #line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp2_;
 #line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17659 "Photo.c"
-			goto __catch341_g_error;
+#line 17683 "Photo.c"
+			goto __catch342_g_error;
 		}
 #line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp1_;
@@ -17670,15 +17694,15 @@ static void photo_file_exif_updated (Photo* self) {
 		info = _tmp3_;
 #line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 17672 "Photo.c"
+#line 17696 "Photo.c"
 	}
-	goto __finally341;
-	__catch341_g_error:
+	goto __finally342;
+	__catch342_g_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		const gchar* _tmp6_;
 #line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
 #line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17695,9 +17719,9 @@ static void photo_file_exif_updated (Photo* self) {
 		_g_free0 (_tmp5_);
 #line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 17697 "Photo.c"
+#line 17721 "Photo.c"
 	}
-	__finally341:
+	__finally342:
 #line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17710,7 +17734,7 @@ static void photo_file_exif_updated (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17712 "Photo.c"
+#line 17736 "Photo.c"
 	}
 #line 2264 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = info;
@@ -17722,24 +17746,24 @@ static void photo_file_exif_updated (Photo* self) {
 	_tmp9_ = photo_file_interrogator_new (file, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL);
 #line 2267 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp9_;
-#line 17724 "Photo.c"
+#line 17748 "Photo.c"
 	{
 #line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_interrogator_interrogate (interrogator, &_inner_error_);
 #line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17730 "Photo.c"
-			goto __catch342_g_error;
+#line 17754 "Photo.c"
+			goto __catch343_g_error;
 		}
 	}
-	goto __finally342;
-	__catch342_g_error:
+	goto __finally343;
+	__catch343_g_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		GError* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+		GError* _tmp12_;
+		const gchar* _tmp13_;
 #line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
 #line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17758,9 +17782,9 @@ static void photo_file_exif_updated (Photo* self) {
 		_g_free0 (_tmp11_);
 #line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 17760 "Photo.c"
+#line 17784 "Photo.c"
 	}
-	__finally342:
+	__finally343:
 #line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17775,7 +17799,7 @@ static void photo_file_exif_updated (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17777 "Photo.c"
+#line 17801 "Photo.c"
 	}
 #line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = photo_file_interrogator_get_detected_photo_information (interrogator);
@@ -17787,20 +17811,20 @@ static void photo_file_exif_updated (Photo* self) {
 	if (_tmp16_ == NULL) {
 #line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = TRUE;
-#line 17789 "Photo.c"
+#line 17813 "Photo.c"
 	} else {
-		gboolean _tmp17_ = FALSE;
+		gboolean _tmp17_;
 #line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = photo_file_interrogator_get_is_photo_corrupted (interrogator);
 #line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = _tmp17_;
-#line 17796 "Photo.c"
+#line 17820 "Photo.c"
 	}
 #line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_) {
-#line 17800 "Photo.c"
-		gchar* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
+#line 17824 "Photo.c"
+		gchar* _tmp18_;
+		gchar* _tmp19_;
 #line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
 #line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17819,31 +17843,31 @@ static void photo_file_exif_updated (Photo* self) {
 		_g_object_unref0 (file);
 #line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17821 "Photo.c"
+#line 17845 "Photo.c"
 	}
 	{
-		PhotoRow* _tmp20_ = NULL;
+		PhotoRow* _tmp20_;
 #line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = self->row;
 #line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17829 "Photo.c"
+#line 17853 "Photo.c"
 		{
-			PhotoTable* _tmp21_ = NULL;
-			PhotoTable* _tmp22_ = NULL;
+			PhotoTable* _tmp21_;
+			PhotoTable* _tmp22_;
 			PhotoID _tmp23_ = {0};
-			GFileInfo* _tmp24_ = NULL;
-			gint64 _tmp25_ = 0LL;
-			GTimeVal _tmp26_ = {0};
-			glong _tmp27_ = 0L;
-			DetectedPhotoInformation* _tmp28_ = NULL;
-			const gchar* _tmp29_ = NULL;
-			DetectedPhotoInformation* _tmp30_ = NULL;
-			const gchar* _tmp31_ = NULL;
-			DetectedPhotoInformation* _tmp32_ = NULL;
-			const gchar* _tmp33_ = NULL;
-			PhotoRow* _tmp34_ = NULL;
-			gboolean _tmp35_ = FALSE;
+			GFileInfo* _tmp24_;
+			gint64 _tmp25_;
+			GTimeVal _tmp26_;
+			glong _tmp27_;
+			DetectedPhotoInformation* _tmp28_;
+			const gchar* _tmp29_;
+			DetectedPhotoInformation* _tmp30_;
+			const gchar* _tmp31_;
+			DetectedPhotoInformation* _tmp32_;
+			const gchar* _tmp33_;
+			PhotoRow* _tmp34_;
+			gboolean _tmp35_;
 #line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = photo_table_get_instance ();
 #line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17878,16 +17902,16 @@ static void photo_file_exif_updated (Photo* self) {
 			success = _tmp35_;
 #line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp22_);
-#line 17880 "Photo.c"
+#line 17904 "Photo.c"
 		}
-		__finally343:
+		__finally344:
 		{
-			PhotoRow* _tmp36_ = NULL;
+			PhotoRow* _tmp36_;
 #line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp36_ = self->row;
 #line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17889 "Photo.c"
+#line 17913 "Photo.c"
 		}
 #line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -17905,16 +17929,16 @@ static void photo_file_exif_updated (Photo* self) {
 			g_clear_error (&_inner_error_);
 #line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17907 "Photo.c"
+#line 17931 "Photo.c"
 		}
 	}
 #line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = success;
 #line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp37_) {
-#line 17914 "Photo.c"
-		Alteration* _tmp38_ = NULL;
-		Alteration* _tmp39_ = NULL;
+#line 17938 "Photo.c"
+		Alteration* _tmp38_;
+		Alteration* _tmp39_;
 #line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = alteration_new_from_list ("metadata:exif,metadata:md5");
 #line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17923,7 +17947,7 @@ static void photo_file_exif_updated (Photo* self) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_);
 #line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp39_);
-#line 17925 "Photo.c"
+#line 17949 "Photo.c"
 	}
 #line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
@@ -17933,7 +17957,7 @@ static void photo_file_exif_updated (Photo* self) {
 	_g_object_unref0 (info);
 #line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 17935 "Photo.c"
+#line 17959 "Photo.c"
 }
 
 
@@ -17943,45 +17967,45 @@ static guint64 photo_real_get_filesize (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2293 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17945 "Photo.c"
+#line 17969 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 		guint64 _tmp5_ = 0ULL;
 #line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17953 "Photo.c"
+#line 17977 "Photo.c"
 		{
-			BackingPhotoRow* _tmp1_ = NULL;
-			gint64 _tmp2_ = 0LL;
+			BackingPhotoRow* _tmp1_;
+			gint64 _tmp2_;
 #line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
 #line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->filesize;
 #line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = (guint64) _tmp2_;
-#line 17963 "Photo.c"
+#line 17987 "Photo.c"
 			{
-				PhotoRow* _tmp3_ = NULL;
+				PhotoRow* _tmp3_;
 #line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17970 "Photo.c"
+#line 17994 "Photo.c"
 			}
 #line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 17974 "Photo.c"
+#line 17998 "Photo.c"
 		}
-		__finally344:
+		__finally345:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17983 "Photo.c"
+#line 18007 "Photo.c"
 		}
 #line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -17989,7 +18013,7 @@ static guint64 photo_real_get_filesize (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 17991 "Photo.c"
+#line 18015 "Photo.c"
 	}
 }
 
@@ -18000,19 +18024,19 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2299 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18002 "Photo.c"
+#line 18026 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 		guint64 _tmp6_ = 0ULL;
 #line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18010 "Photo.c"
+#line 18034 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			BackingPhotoRow* _tmp2_ = NULL;
-			gint64 _tmp3_ = 0LL;
+			PhotoRow* _tmp1_;
+			BackingPhotoRow* _tmp2_;
+			gint64 _tmp3_;
 #line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18021,27 +18045,27 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) {
 			_tmp3_ = _tmp2_->filesize;
 #line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = (guint64) _tmp3_;
-#line 18023 "Photo.c"
+#line 18047 "Photo.c"
 			{
-				PhotoRow* _tmp4_ = NULL;
+				PhotoRow* _tmp4_;
 #line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18030 "Photo.c"
+#line 18054 "Photo.c"
 			}
 #line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18034 "Photo.c"
+#line 18058 "Photo.c"
 		}
-		__finally345:
+		__finally346:
 		{
-			PhotoRow* _tmp5_ = NULL;
+			PhotoRow* _tmp5_;
 #line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18043 "Photo.c"
+#line 18067 "Photo.c"
 		}
 #line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -18049,7 +18073,7 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp6_;
-#line 18051 "Photo.c"
+#line 18075 "Photo.c"
 	}
 }
 
@@ -18059,45 +18083,45 @@ guint64 photo_get_editable_filesize (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2305 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 18061 "Photo.c"
+#line 18085 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 		guint64 _tmp5_ = 0ULL;
 #line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18069 "Photo.c"
+#line 18093 "Photo.c"
 		{
-			BackingPhotoRow* _tmp1_ = NULL;
-			gint64 _tmp2_ = 0LL;
+			BackingPhotoRow* _tmp1_;
+			gint64 _tmp2_;
 #line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->editable;
 #line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->filesize;
 #line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = (guint64) _tmp2_;
-#line 18079 "Photo.c"
+#line 18103 "Photo.c"
 			{
-				PhotoRow* _tmp3_ = NULL;
+				PhotoRow* _tmp3_;
 #line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18086 "Photo.c"
+#line 18110 "Photo.c"
 			}
 #line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18090 "Photo.c"
+#line 18114 "Photo.c"
 		}
-		__finally346:
+		__finally347:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18099 "Photo.c"
+#line 18123 "Photo.c"
 		}
 #line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -18105,7 +18129,7 @@ guint64 photo_get_editable_filesize (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 18107 "Photo.c"
+#line 18131 "Photo.c"
 	}
 }
 
@@ -18113,7 +18137,7 @@ guint64 photo_get_editable_filesize (Photo* self) {
 static time_t photo_real_get_exposure_time (Dateable* base) {
 	Photo * self;
 	time_t result = 0;
-	time_t _tmp0_ = 0;
+	time_t _tmp0_;
 #line 2311 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 2312 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18122,7 +18146,7 @@ static time_t photo_real_get_exposure_time (Dateable* base) {
 	result = _tmp0_;
 #line 2312 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 18124 "Photo.c"
+#line 18148 "Photo.c"
 }
 
 
@@ -18132,44 +18156,44 @@ static gchar* photo_real_get_basename (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2315 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18134 "Photo.c"
+#line 18158 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18141 "Photo.c"
+#line 18165 "Photo.c"
 		{
-			const gchar* _tmp1_ = NULL;
-			gchar* _tmp2_ = NULL;
+			const gchar* _tmp1_;
+			gchar* _tmp2_;
 #line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->file_title;
 #line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = g_strdup (_tmp1_);
 #line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 18151 "Photo.c"
+#line 18175 "Photo.c"
 			{
-				PhotoRow* _tmp3_ = NULL;
+				PhotoRow* _tmp3_;
 #line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18158 "Photo.c"
+#line 18182 "Photo.c"
 			}
 #line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18162 "Photo.c"
+#line 18186 "Photo.c"
 		}
-		__finally347:
+		__finally348:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18171 "Photo.c"
+#line 18195 "Photo.c"
 		}
 #line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -18177,7 +18201,7 @@ static gchar* photo_real_get_basename (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 18179 "Photo.c"
+#line 18203 "Photo.c"
 	}
 }
 
@@ -18188,18 +18212,18 @@ static gchar* photo_real_get_title (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2321 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18190 "Photo.c"
+#line 18214 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18197 "Photo.c"
+#line 18221 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			const gchar* _tmp2_ = NULL;
-			gchar* _tmp3_ = NULL;
+			PhotoRow* _tmp1_;
+			const gchar* _tmp2_;
+			gchar* _tmp3_;
 #line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18208,27 +18232,27 @@ static gchar* photo_real_get_title (MediaSource* base) {
 			_tmp3_ = g_strdup (_tmp2_);
 #line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 18210 "Photo.c"
+#line 18234 "Photo.c"
 			{
-				PhotoRow* _tmp4_ = NULL;
+				PhotoRow* _tmp4_;
 #line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18217 "Photo.c"
+#line 18241 "Photo.c"
 			}
 #line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18221 "Photo.c"
+#line 18245 "Photo.c"
 		}
-		__finally348:
+		__finally349:
 		{
-			PhotoRow* _tmp5_ = NULL;
+			PhotoRow* _tmp5_;
 #line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18230 "Photo.c"
+#line 18254 "Photo.c"
 		}
 #line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -18236,7 +18260,7 @@ static gchar* photo_real_get_title (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 18238 "Photo.c"
+#line 18262 "Photo.c"
 	}
 }
 
@@ -18247,18 +18271,18 @@ static gchar* photo_real_get_comment (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2327 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18249 "Photo.c"
+#line 18273 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18256 "Photo.c"
+#line 18280 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			const gchar* _tmp2_ = NULL;
-			gchar* _tmp3_ = NULL;
+			PhotoRow* _tmp1_;
+			const gchar* _tmp2_;
+			gchar* _tmp3_;
 #line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18267,27 +18291,27 @@ static gchar* photo_real_get_comment (MediaSource* base) {
 			_tmp3_ = g_strdup (_tmp2_);
 #line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 18269 "Photo.c"
+#line 18293 "Photo.c"
 			{
-				PhotoRow* _tmp4_ = NULL;
+				PhotoRow* _tmp4_;
 #line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18276 "Photo.c"
+#line 18300 "Photo.c"
 			}
 #line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18280 "Photo.c"
+#line 18304 "Photo.c"
 		}
-		__finally349:
+		__finally350:
 		{
-			PhotoRow* _tmp5_ = NULL;
+			PhotoRow* _tmp5_;
 #line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18289 "Photo.c"
+#line 18313 "Photo.c"
 		}
 #line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -18295,7 +18319,7 @@ static gchar* photo_real_get_comment (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 18297 "Photo.c"
+#line 18321 "Photo.c"
 	}
 }
 
@@ -18303,10 +18327,10 @@ static gchar* photo_real_get_comment (MediaSource* base) {
 static void photo_real_set_title (MediaSource* base, const gchar* title) {
 	Photo * self;
 	gchar* new_title = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	gboolean committed = FALSE;
-	gboolean _tmp18_ = FALSE;
+	gboolean _tmp18_;
 	GError * _inner_error_ = NULL;
 #line 2333 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
@@ -18318,25 +18342,25 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 	new_title = _tmp1_;
 #line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 18320 "Photo.c"
+#line 18344 "Photo.c"
 	{
-		PhotoRow* _tmp2_ = NULL;
+		PhotoRow* _tmp2_;
 #line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
 #line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18327 "Photo.c"
-		{
-			const gchar* _tmp3_ = NULL;
-			PhotoRow* _tmp4_ = NULL;
-			const gchar* _tmp5_ = NULL;
-			PhotoTable* _tmp7_ = NULL;
-			PhotoTable* _tmp8_ = NULL;
-			PhotoRow* _tmp9_ = NULL;
-			PhotoID _tmp10_ = {0};
-			const gchar* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
-			gboolean _tmp13_ = FALSE;
+#line 18351 "Photo.c"
+		{
+			const gchar* _tmp3_;
+			PhotoRow* _tmp4_;
+			const gchar* _tmp5_;
+			PhotoTable* _tmp7_;
+			PhotoTable* _tmp8_;
+			PhotoRow* _tmp9_;
+			PhotoID _tmp10_;
+			const gchar* _tmp11_;
+			gboolean _tmp12_;
+			gboolean _tmp13_;
 #line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = new_title;
 #line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18345,20 +18369,20 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 			_tmp5_ = _tmp4_->title;
 #line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (g_strcmp0 (_tmp3_, _tmp5_) == 0) {
-#line 18347 "Photo.c"
+#line 18371 "Photo.c"
 				{
-					PhotoRow* _tmp6_ = NULL;
+					PhotoRow* _tmp6_;
 #line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->row;
 #line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18354 "Photo.c"
+#line 18378 "Photo.c"
 				}
 #line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (new_title);
 #line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 18360 "Photo.c"
+#line 18384 "Photo.c"
 			}
 #line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo_table_get_instance ();
@@ -18380,10 +18404,10 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 			_tmp13_ = committed;
 #line 2342 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp13_) {
-#line 18382 "Photo.c"
-				PhotoRow* _tmp14_ = NULL;
-				const gchar* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
+#line 18406 "Photo.c"
+				PhotoRow* _tmp14_;
+				const gchar* _tmp15_;
+				gchar* _tmp16_;
 #line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = self->row;
 #line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18394,17 +18418,17 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 				_g_free0 (_tmp14_->title);
 #line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_->title = _tmp16_;
-#line 18396 "Photo.c"
+#line 18420 "Photo.c"
 			}
 		}
-		__finally350:
+		__finally351:
 		{
-			PhotoRow* _tmp17_ = NULL;
+			PhotoRow* _tmp17_;
 #line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->row;
 #line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18406 "Photo.c"
+#line 18430 "Photo.c"
 		}
 #line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -18416,16 +18440,16 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 			g_clear_error (&_inner_error_);
 #line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 18418 "Photo.c"
+#line 18442 "Photo.c"
 		}
 	}
 #line 2346 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = committed;
 #line 2346 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp18_) {
-#line 18425 "Photo.c"
-		Alteration* _tmp19_ = NULL;
-		Alteration* _tmp20_ = NULL;
+#line 18449 "Photo.c"
+		Alteration* _tmp19_;
+		Alteration* _tmp20_;
 #line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = alteration_new ("metadata", "name");
 #line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18434,11 +18458,11 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
 #line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp20_);
-#line 18436 "Photo.c"
+#line 18460 "Photo.c"
 	}
 #line 2333 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (new_title);
-#line 18440 "Photo.c"
+#line 18464 "Photo.c"
 }
 
 
@@ -18446,10 +18470,10 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 	Photo * self;
 	gboolean result = FALSE;
 	gchar* new_comment = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	gboolean committed = FALSE;
-	gboolean _tmp19_ = FALSE;
+	gboolean _tmp19_;
 	GError * _inner_error_ = NULL;
 #line 2350 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
@@ -18461,25 +18485,25 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 	new_comment = _tmp1_;
 #line 2353 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 18463 "Photo.c"
+#line 18487 "Photo.c"
 	{
-		PhotoRow* _tmp2_ = NULL;
+		PhotoRow* _tmp2_;
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18470 "Photo.c"
-		{
-			const gchar* _tmp3_ = NULL;
-			PhotoRow* _tmp4_ = NULL;
-			const gchar* _tmp5_ = NULL;
-			PhotoTable* _tmp7_ = NULL;
-			PhotoTable* _tmp8_ = NULL;
-			PhotoRow* _tmp9_ = NULL;
-			PhotoID _tmp10_ = {0};
-			const gchar* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
-			gboolean _tmp13_ = FALSE;
+#line 18494 "Photo.c"
+		{
+			const gchar* _tmp3_;
+			PhotoRow* _tmp4_;
+			const gchar* _tmp5_;
+			PhotoTable* _tmp7_;
+			PhotoTable* _tmp8_;
+			PhotoRow* _tmp9_;
+			PhotoID _tmp10_;
+			const gchar* _tmp11_;
+			gboolean _tmp12_;
+			gboolean _tmp13_;
 #line 2355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = new_comment;
 #line 2355 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18490,20 +18514,20 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 			if (g_strcmp0 (_tmp3_, _tmp5_) == 0) {
 #line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = TRUE;
-#line 18492 "Photo.c"
+#line 18516 "Photo.c"
 				{
-					PhotoRow* _tmp6_ = NULL;
+					PhotoRow* _tmp6_;
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->row;
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18499 "Photo.c"
+#line 18523 "Photo.c"
 				}
 #line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (new_comment);
 #line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 18505 "Photo.c"
+#line 18529 "Photo.c"
 			}
 #line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo_table_get_instance ();
@@ -18525,10 +18549,10 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 			_tmp13_ = committed;
 #line 2359 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp13_) {
-#line 18527 "Photo.c"
-				PhotoRow* _tmp14_ = NULL;
-				const gchar* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
+#line 18551 "Photo.c"
+				PhotoRow* _tmp14_;
+				const gchar* _tmp15_;
+				gchar* _tmp16_;
 #line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = self->row;
 #line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18539,21 +18563,21 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 				_g_free0 (_tmp14_->comment);
 #line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_->comment = _tmp16_;
-#line 18541 "Photo.c"
+#line 18565 "Photo.c"
 			}
 		}
-		__finally351:
+		__finally352:
 		{
-			PhotoRow* _tmp17_ = NULL;
+			PhotoRow* _tmp17_;
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->row;
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18551 "Photo.c"
+#line 18575 "Photo.c"
 		}
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18555 "Photo.c"
+#line 18579 "Photo.c"
 			gboolean _tmp18_ = FALSE;
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (new_comment);
@@ -18563,16 +18587,16 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 			g_clear_error (&_inner_error_);
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp18_;
-#line 18565 "Photo.c"
+#line 18589 "Photo.c"
 		}
 	}
 #line 2363 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = committed;
 #line 2363 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_) {
-#line 18572 "Photo.c"
-		Alteration* _tmp20_ = NULL;
-		Alteration* _tmp21_ = NULL;
+#line 18596 "Photo.c"
+		Alteration* _tmp20_;
+		Alteration* _tmp21_;
 #line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = alteration_new ("metadata", "comment");
 #line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18581,7 +18605,7 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_);
 #line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp21_);
-#line 18583 "Photo.c"
+#line 18607 "Photo.c"
 	}
 #line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = committed;
@@ -18589,20 +18613,20 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 	_g_free0 (new_comment);
 #line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 18591 "Photo.c"
+#line 18615 "Photo.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
 #line 2376 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 18598 "Photo.c"
+#line 18622 "Photo.c"
 }
 
 
 void photo_set_import_id (Photo* self, ImportID* import_id) {
 	GError* dberr = NULL;
-	GError* _tmp13_ = NULL;
+	GError* _tmp13_;
 	GError * _inner_error_ = NULL;
 #line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -18610,23 +18634,23 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 	g_return_if_fail (import_id != NULL);
 #line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
 	dberr = NULL;
-#line 18612 "Photo.c"
+#line 18636 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18619 "Photo.c"
+#line 18643 "Photo.c"
 		{
 			{
-				PhotoTable* _tmp1_ = NULL;
-				PhotoTable* _tmp2_ = NULL;
-				PhotoRow* _tmp3_ = NULL;
-				PhotoID _tmp4_ = {0};
-				ImportID _tmp5_ = {0};
-				PhotoRow* _tmp7_ = NULL;
-				ImportID _tmp8_ = {0};
+				PhotoTable* _tmp1_;
+				PhotoTable* _tmp2_;
+				PhotoRow* _tmp3_;
+				PhotoID _tmp4_;
+				ImportID _tmp5_;
+				PhotoRow* _tmp7_;
+				ImportID _tmp8_;
 #line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = photo_table_get_instance ();
 #line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18645,16 +18669,16 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 18647 "Photo.c"
-						goto __catch353_database_error;
+#line 18671 "Photo.c"
+						goto __catch354_database_error;
 					}
 					{
-						PhotoRow* _tmp6_ = NULL;
+						PhotoRow* _tmp6_;
 #line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp6_ = self->row;
 #line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18656 "Photo.c"
+#line 18680 "Photo.c"
 					}
 #line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_error_free0 (dberr);
@@ -18664,7 +18688,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 					g_clear_error (&_inner_error_);
 #line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 18666 "Photo.c"
+#line 18690 "Photo.c"
 				}
 #line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->row;
@@ -18672,14 +18696,14 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 				_tmp8_ = *import_id;
 #line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_->import_id = _tmp8_;
-#line 18674 "Photo.c"
+#line 18698 "Photo.c"
 			}
-			goto __finally353;
-			__catch353_database_error:
+			goto __finally354;
+			__catch354_database_error:
 			{
 				GError* err = NULL;
-				GError* _tmp9_ = NULL;
-				GError* _tmp10_ = NULL;
+				GError* _tmp9_;
+				GError* _tmp10_;
 #line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				err = _inner_error_;
 #line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18694,19 +18718,19 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 				dberr = _tmp10_;
 #line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 18696 "Photo.c"
+#line 18720 "Photo.c"
 			}
-			__finally353:
+			__finally354:
 #line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18701 "Photo.c"
+#line 18725 "Photo.c"
 				{
-					PhotoRow* _tmp11_ = NULL;
+					PhotoRow* _tmp11_;
 #line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = self->row;
 #line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18708 "Photo.c"
+#line 18732 "Photo.c"
 				}
 #line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (dberr);
@@ -18716,17 +18740,17 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 				g_clear_error (&_inner_error_);
 #line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 18718 "Photo.c"
+#line 18742 "Photo.c"
 			}
 		}
-		__finally352:
+		__finally353:
 		{
-			PhotoRow* _tmp12_ = NULL;
+			PhotoRow* _tmp12_;
 #line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = self->row;
 #line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18728 "Photo.c"
+#line 18752 "Photo.c"
 		}
 #line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -18738,16 +18762,16 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 			g_clear_error (&_inner_error_);
 #line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 18740 "Photo.c"
+#line 18764 "Photo.c"
 		}
 	}
 #line 2380 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = dberr;
 #line 2380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp13_ == NULL) {
-#line 18747 "Photo.c"
-		Alteration* _tmp14_ = NULL;
-		Alteration* _tmp15_ = NULL;
+#line 18771 "Photo.c"
+		Alteration* _tmp14_;
+		Alteration* _tmp15_;
 #line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = alteration_new ("metadata", "import-id");
 #line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18756,12 +18780,12 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_);
 #line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp15_);
-#line 18758 "Photo.c"
+#line 18782 "Photo.c"
 	} else {
-		gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		GError* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
+		GError* _tmp18_;
+		const gchar* _tmp19_;
 #line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
 #line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18774,32 +18798,32 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 		g_warning ("Photo.vala:2383: Unable to write import ID for %s: %s", _tmp17_, _tmp19_);
 #line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp17_);
-#line 18776 "Photo.c"
+#line 18800 "Photo.c"
 	}
 #line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_error_free0 (dberr);
-#line 18780 "Photo.c"
+#line 18804 "Photo.c"
 }
 
 
 void photo_set_title_persistent (Photo* self, const gchar* title, GError** error) {
 	PhotoFileReader* source = NULL;
-	PhotoFileReader* _tmp0_ = NULL;
-	PhotoFileReader* _tmp1_ = NULL;
-	PhotoFileFormat _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	PhotoFileReader* _tmp0_;
+	PhotoFileReader* _tmp1_;
+	PhotoFileFormat _tmp2_;
+	gboolean _tmp3_;
 	PhotoMetadata* metadata = NULL;
-	PhotoFileReader* _tmp8_ = NULL;
-	PhotoMetadata* _tmp9_ = NULL;
-	PhotoMetadata* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
+	PhotoFileReader* _tmp8_;
+	PhotoMetadata* _tmp9_;
+	PhotoMetadata* _tmp10_;
+	const gchar* _tmp11_;
 	PhotoFileMetadataWriter* writer = NULL;
-	PhotoFileReader* _tmp12_ = NULL;
-	PhotoFileMetadataWriter* _tmp13_ = NULL;
-	PhotoFileReader* _tmp14_ = NULL;
-	GFile* _tmp15_ = NULL;
-	GFile* _tmp16_ = NULL;
-	const gchar* _tmp22_ = NULL;
+	PhotoFileReader* _tmp12_;
+	PhotoFileMetadataWriter* _tmp13_;
+	PhotoFileReader* _tmp14_;
+	GFile* _tmp15_;
+	GFile* _tmp16_;
+	const gchar* _tmp22_;
 	GError * _inner_error_ = NULL;
 #line 2386 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -18815,11 +18839,11 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
 #line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 18817 "Photo.c"
-		PhotoFileReader* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+#line 18841 "Photo.c"
+		PhotoFileReader* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		const gchar* _tmp7_;
 #line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = source;
 #line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18838,7 +18862,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 		_photo_file_adapter_unref0 (source);
 #line 2395 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18840 "Photo.c"
+#line 18864 "Photo.c"
 	}
 #line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
@@ -18854,7 +18878,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 		_photo_file_adapter_unref0 (source);
 #line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18856 "Photo.c"
+#line 18880 "Photo.c"
 	}
 #line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
@@ -18878,7 +18902,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 		_photo_file_adapter_unref0 (source);
 #line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18880 "Photo.c"
+#line 18904 "Photo.c"
 	}
 #line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
@@ -18890,10 +18914,10 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 	library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_title");
 #line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp16_);
-#line 18892 "Photo.c"
+#line 18916 "Photo.c"
 	{
-		PhotoFileMetadataWriter* _tmp17_ = NULL;
-		PhotoMetadata* _tmp18_ = NULL;
+		PhotoFileMetadataWriter* _tmp17_;
+		PhotoMetadata* _tmp18_;
 #line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = writer;
 #line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18902,15 +18926,15 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 		photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_);
 #line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18904 "Photo.c"
-			goto __finally354;
+#line 18928 "Photo.c"
+			goto __finally355;
 		}
 	}
-	__finally354:
+	__finally355:
 	{
-		PhotoFileReader* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		GFile* _tmp21_ = NULL;
+		PhotoFileReader* _tmp19_;
+		GFile* _tmp20_;
+		GFile* _tmp21_;
 #line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = source;
 #line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18921,7 +18945,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 		library_monitor_unblacklist_file (_tmp21_);
 #line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp21_);
-#line 18923 "Photo.c"
+#line 18947 "Photo.c"
 	}
 #line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -18935,7 +18959,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 		_photo_file_adapter_unref0 (source);
 #line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18937 "Photo.c"
+#line 18961 "Photo.c"
 	}
 #line 2409 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = title;
@@ -18949,28 +18973,28 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 	_media_metadata_unref0 (metadata);
 #line 2386 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (source);
-#line 18951 "Photo.c"
+#line 18975 "Photo.c"
 }
 
 
 void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** error) {
 	PhotoFileReader* source = NULL;
-	PhotoFileReader* _tmp0_ = NULL;
-	PhotoFileReader* _tmp1_ = NULL;
-	PhotoFileFormat _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	PhotoFileReader* _tmp0_;
+	PhotoFileReader* _tmp1_;
+	PhotoFileFormat _tmp2_;
+	gboolean _tmp3_;
 	PhotoMetadata* metadata = NULL;
-	PhotoFileReader* _tmp8_ = NULL;
-	PhotoMetadata* _tmp9_ = NULL;
-	PhotoMetadata* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
+	PhotoFileReader* _tmp8_;
+	PhotoMetadata* _tmp9_;
+	PhotoMetadata* _tmp10_;
+	const gchar* _tmp11_;
 	PhotoFileMetadataWriter* writer = NULL;
-	PhotoFileReader* _tmp12_ = NULL;
-	PhotoFileMetadataWriter* _tmp13_ = NULL;
-	PhotoFileReader* _tmp14_ = NULL;
-	GFile* _tmp15_ = NULL;
-	GFile* _tmp16_ = NULL;
-	const gchar* _tmp22_ = NULL;
+	PhotoFileReader* _tmp12_;
+	PhotoFileMetadataWriter* _tmp13_;
+	PhotoFileReader* _tmp14_;
+	GFile* _tmp15_;
+	GFile* _tmp16_;
+	const gchar* _tmp22_;
 	GError * _inner_error_ = NULL;
 #line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -18986,11 +19010,11 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
 #line 2418 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 18988 "Photo.c"
-		PhotoFileReader* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+#line 19012 "Photo.c"
+		PhotoFileReader* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		const gchar* _tmp7_;
 #line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = source;
 #line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19009,7 +19033,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 		_photo_file_adapter_unref0 (source);
 #line 2423 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19011 "Photo.c"
+#line 19035 "Photo.c"
 	}
 #line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
@@ -19025,7 +19049,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 		_photo_file_adapter_unref0 (source);
 #line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19027 "Photo.c"
+#line 19051 "Photo.c"
 	}
 #line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
@@ -19049,7 +19073,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 		_photo_file_adapter_unref0 (source);
 #line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19051 "Photo.c"
+#line 19075 "Photo.c"
 	}
 #line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
@@ -19061,10 +19085,10 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 	library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_comment");
 #line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp16_);
-#line 19063 "Photo.c"
+#line 19087 "Photo.c"
 	{
-		PhotoFileMetadataWriter* _tmp17_ = NULL;
-		PhotoMetadata* _tmp18_ = NULL;
+		PhotoFileMetadataWriter* _tmp17_;
+		PhotoMetadata* _tmp18_;
 #line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = writer;
 #line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19073,15 +19097,15 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 		photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_);
 #line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19075 "Photo.c"
-			goto __finally355;
+#line 19099 "Photo.c"
+			goto __finally356;
 		}
 	}
-	__finally355:
+	__finally356:
 	{
-		PhotoFileReader* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		GFile* _tmp21_ = NULL;
+		PhotoFileReader* _tmp19_;
+		GFile* _tmp20_;
+		GFile* _tmp21_;
 #line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = source;
 #line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19092,7 +19116,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 		library_monitor_unblacklist_file (_tmp21_);
 #line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp21_);
-#line 19094 "Photo.c"
+#line 19118 "Photo.c"
 	}
 #line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -19106,7 +19130,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 		_photo_file_adapter_unref0 (source);
 #line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19108 "Photo.c"
+#line 19132 "Photo.c"
 	}
 #line 2437 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = comment;
@@ -19120,33 +19144,33 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 	_media_metadata_unref0 (metadata);
 #line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (source);
-#line 19122 "Photo.c"
+#line 19146 "Photo.c"
 }
 
 
 static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 	Photo * self;
 	gboolean committed = FALSE;
-	gboolean _tmp12_ = FALSE;
+	gboolean _tmp12_;
 	GError * _inner_error_ = NULL;
 #line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 19133 "Photo.c"
+#line 19157 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19140 "Photo.c"
-		{
-			PhotoTable* _tmp1_ = NULL;
-			PhotoTable* _tmp2_ = NULL;
-			PhotoRow* _tmp3_ = NULL;
-			PhotoID _tmp4_ = {0};
-			time_t _tmp5_ = 0;
-			gboolean _tmp6_ = FALSE;
-			gboolean _tmp7_ = FALSE;
+#line 19164 "Photo.c"
+		{
+			PhotoTable* _tmp1_;
+			PhotoTable* _tmp2_;
+			PhotoRow* _tmp3_;
+			PhotoID _tmp4_;
+			time_t _tmp5_;
+			gboolean _tmp6_;
+			gboolean _tmp7_;
 #line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_table_get_instance ();
 #line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19167,10 +19191,10 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 			_tmp7_ = committed;
 #line 2446 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp7_) {
-#line 19169 "Photo.c"
-				PhotoRow* _tmp8_ = NULL;
-				time_t _tmp9_ = 0;
-				time_t _tmp10_ = 0;
+#line 19193 "Photo.c"
+				PhotoRow* _tmp8_;
+				time_t _tmp9_;
+				time_t _tmp10_;
 #line 2447 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
 #line 2447 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19181,17 +19205,17 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 				_tmp10_ = time;
 #line 2448 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->cached_exposure_time = _tmp10_;
-#line 19183 "Photo.c"
+#line 19207 "Photo.c"
 			}
 		}
-		__finally356:
+		__finally357:
 		{
-			PhotoRow* _tmp11_ = NULL;
+			PhotoRow* _tmp11_;
 #line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->row;
 #line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19193 "Photo.c"
+#line 19217 "Photo.c"
 		}
 #line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -19201,16 +19225,16 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 			g_clear_error (&_inner_error_);
 #line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 19203 "Photo.c"
+#line 19227 "Photo.c"
 		}
 	}
 #line 2452 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = committed;
 #line 2452 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
-#line 19210 "Photo.c"
-		Alteration* _tmp13_ = NULL;
-		Alteration* _tmp14_ = NULL;
+#line 19234 "Photo.c"
+		Alteration* _tmp13_;
+		Alteration* _tmp14_;
 #line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = alteration_new ("metadata", "exposure-time");
 #line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19219,31 +19243,31 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp14_);
 #line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp14_);
-#line 19221 "Photo.c"
+#line 19245 "Photo.c"
 	}
 }
 
 
 void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** error) {
 	PhotoFileReader* source = NULL;
-	PhotoFileReader* _tmp0_ = NULL;
-	PhotoFileReader* _tmp1_ = NULL;
-	PhotoFileFormat _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	PhotoFileReader* _tmp0_;
+	PhotoFileReader* _tmp1_;
+	PhotoFileFormat _tmp2_;
+	gboolean _tmp3_;
 	PhotoMetadata* metadata = NULL;
-	PhotoFileReader* _tmp8_ = NULL;
-	PhotoMetadata* _tmp9_ = NULL;
-	PhotoMetadata* _tmp10_ = NULL;
-	time_t _tmp11_ = 0;
-	MetadataDateTime* _tmp12_ = NULL;
-	MetadataDateTime* _tmp13_ = NULL;
+	PhotoFileReader* _tmp8_;
+	PhotoMetadata* _tmp9_;
+	PhotoMetadata* _tmp10_;
+	time_t _tmp11_;
+	MetadataDateTime* _tmp12_;
+	MetadataDateTime* _tmp13_;
 	PhotoFileMetadataWriter* writer = NULL;
-	PhotoFileReader* _tmp14_ = NULL;
-	PhotoFileMetadataWriter* _tmp15_ = NULL;
-	PhotoFileReader* _tmp16_ = NULL;
-	GFile* _tmp17_ = NULL;
-	GFile* _tmp18_ = NULL;
-	time_t _tmp24_ = 0;
+	PhotoFileReader* _tmp14_;
+	PhotoFileMetadataWriter* _tmp15_;
+	PhotoFileReader* _tmp16_;
+	GFile* _tmp17_;
+	GFile* _tmp18_;
+	time_t _tmp24_;
 	GError * _inner_error_ = NULL;
 #line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -19259,11 +19283,11 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
 #line 2460 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 19261 "Photo.c"
-		PhotoFileReader* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		time_t _tmp7_ = 0;
+#line 19285 "Photo.c"
+		PhotoFileReader* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		time_t _tmp7_;
 #line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = source;
 #line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19282,7 +19306,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 		_photo_file_adapter_unref0 (source);
 #line 2465 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19284 "Photo.c"
+#line 19308 "Photo.c"
 	}
 #line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
@@ -19298,7 +19322,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 		_photo_file_adapter_unref0 (source);
 #line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19300 "Photo.c"
+#line 19324 "Photo.c"
 	}
 #line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
@@ -19328,7 +19352,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 		_photo_file_adapter_unref0 (source);
 #line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19330 "Photo.c"
+#line 19354 "Photo.c"
 	}
 #line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = source;
@@ -19340,10 +19364,10 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 	library_monitor_blacklist_file (_tmp18_, "Photo.set_exposure_time_persistent");
 #line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp18_);
-#line 19342 "Photo.c"
+#line 19366 "Photo.c"
 	{
-		PhotoFileMetadataWriter* _tmp19_ = NULL;
-		PhotoMetadata* _tmp20_ = NULL;
+		PhotoFileMetadataWriter* _tmp19_;
+		PhotoMetadata* _tmp20_;
 #line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = writer;
 #line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19352,15 +19376,15 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 		photo_file_metadata_writer_write_metadata (_tmp19_, _tmp20_, &_inner_error_);
 #line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19354 "Photo.c"
-			goto __finally357;
+#line 19378 "Photo.c"
+			goto __finally358;
 		}
 	}
-	__finally357:
+	__finally358:
 	{
-		PhotoFileReader* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
-		GFile* _tmp23_ = NULL;
+		PhotoFileReader* _tmp21_;
+		GFile* _tmp22_;
+		GFile* _tmp23_;
 #line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = source;
 #line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19371,7 +19395,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 		library_monitor_unblacklist_file (_tmp23_);
 #line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp23_);
-#line 19373 "Photo.c"
+#line 19397 "Photo.c"
 	}
 #line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -19385,7 +19409,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 		_photo_file_adapter_unref0 (source);
 #line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19387 "Photo.c"
+#line 19411 "Photo.c"
 	}
 #line 2479 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = time;
@@ -19399,7 +19423,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 	_media_metadata_unref0 (metadata);
 #line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (source);
-#line 19401 "Photo.c"
+#line 19425 "Photo.c"
 }
 
 
@@ -19420,12 +19444,12 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 	Photo * self;
 	Dimensions returned_dims = {0};
 	Dimensions _tmp0_ = {0};
-	PhotoException _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
-	PhotoException _tmp10_ = 0;
-	gboolean _tmp11_ = FALSE;
-	PhotoException _tmp22_ = 0;
-	gboolean _tmp23_ = FALSE;
+	PhotoException _tmp1_;
+	gboolean _tmp2_;
+	PhotoException _tmp10_;
+	gboolean _tmp11_;
+	PhotoException _tmp22_;
+	gboolean _tmp23_;
 #line 2497 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 2499 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19438,10 +19462,10 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 	_tmp2_ = photo_exception_allows (_tmp1_, PHOTO_EXCEPTION_ORIENTATION);
 #line 2502 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 19440 "Photo.c"
+#line 19464 "Photo.c"
 		Orientation ori_tmp = 0;
-		Orientation _tmp3_ = 0;
-		Orientation _tmp4_ = 0;
+		Orientation _tmp3_;
+		Orientation _tmp4_;
 #line 2503 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_get_orientation (self);
 #line 2503 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19458,14 +19482,14 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 			case ORIENTATION_LEFT_BOTTOM:
 #line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
 			case ORIENTATION_RIGHT_BOTTOM:
-#line 19460 "Photo.c"
+#line 19484 "Photo.c"
 			{
 				gint width_tmp = 0;
-				Dimensions _tmp5_ = {0};
-				gint _tmp6_ = 0;
-				Dimensions _tmp7_ = {0};
-				gint _tmp8_ = 0;
-				gint _tmp9_ = 0;
+				Dimensions _tmp5_;
+				gint _tmp6_;
+				Dimensions _tmp7_;
+				gint _tmp8_;
+				gint _tmp9_;
 #line 2512 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = returned_dims;
 #line 2512 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19484,13 +19508,13 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 				returned_dims.height = _tmp9_;
 #line 2516 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 19486 "Photo.c"
+#line 19510 "Photo.c"
 			}
 			default:
 			{
 #line 2520 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 19492 "Photo.c"
+#line 19516 "Photo.c"
 			}
 		}
 	}
@@ -19500,20 +19524,20 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 	_tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_STRAIGHTEN);
 #line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 19502 "Photo.c"
+#line 19526 "Photo.c"
 		gdouble x_size = 0.0;
 		gdouble y_size = 0.0;
 		gdouble angle = 0.0;
 		gdouble _tmp12_ = 0.0;
-		Dimensions _tmp13_ = {0};
-		gint _tmp14_ = 0;
-		Dimensions _tmp15_ = {0};
-		gint _tmp16_ = 0;
-		gdouble _tmp17_ = 0.0;
+		Dimensions _tmp13_;
+		gint _tmp14_;
+		Dimensions _tmp15_;
+		gint _tmp16_;
+		gdouble _tmp17_;
 		gdouble _tmp18_ = 0.0;
 		gdouble _tmp19_ = 0.0;
-		gdouble _tmp20_ = 0.0;
-		gdouble _tmp21_ = 0.0;
+		gdouble _tmp20_;
+		gdouble _tmp21_;
 #line 2527 "/home/jens/Source/shotwell/src/Photo.vala"
 		angle = 0.0;
 #line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19544,7 +19568,7 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 		_tmp21_ = y_size;
 #line 2534 "/home/jens/Source/shotwell/src/Photo.vala"
 		returned_dims.height = (gint) _tmp21_;
-#line 19546 "Photo.c"
+#line 19570 "Photo.c"
 	}
 #line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = disallowed_steps;
@@ -19552,11 +19576,11 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 	_tmp23_ = photo_exception_allows (_tmp22_, PHOTO_EXCEPTION_CROP);
 #line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp23_) {
-#line 19554 "Photo.c"
+#line 19578 "Photo.c"
 		Box crop = {0};
-		PhotoException _tmp24_ = 0;
+		PhotoException _tmp24_;
 		Box _tmp25_ = {0};
-		gboolean _tmp26_ = FALSE;
+		gboolean _tmp26_;
 #line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = disallowed_steps;
 #line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19565,30 +19589,30 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 		crop = _tmp25_;
 #line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp26_) {
-#line 19567 "Photo.c"
+#line 19591 "Photo.c"
 			Dimensions _tmp27_ = {0};
 #line 2541 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&crop, &_tmp27_);
 #line 2541 "/home/jens/Source/shotwell/src/Photo.vala"
 			returned_dims = _tmp27_;
-#line 19573 "Photo.c"
+#line 19597 "Photo.c"
 		}
 	}
 #line 2544 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = returned_dims;
 #line 2544 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 19580 "Photo.c"
+#line 19604 "Photo.c"
 }
 
 
 static void photo_locked_create_adjustments_from_data (Photo* self) {
-	PixelTransformationBundle* _tmp0_ = NULL;
+	PixelTransformationBundle* _tmp0_;
 	KeyValueMap* map = NULL;
-	KeyValueMap* _tmp1_ = NULL;
-	KeyValueMap* _tmp2_ = NULL;
-	PixelTransformationBundle* _tmp6_ = NULL;
-	PixelTransformer* _tmp7_ = NULL;
+	KeyValueMap* _tmp1_;
+	KeyValueMap* _tmp2_;
+	PixelTransformationBundle* _tmp6_;
+	PixelTransformer* _tmp7_;
 #line 2548 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
 #line 2549 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19605,23 +19629,23 @@ static void photo_locked_create_adjustments_from_data (Photo* self) {
 	_tmp2_ = map;
 #line 2552 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ == NULL) {
-#line 19607 "Photo.c"
-		PixelTransformationBundle* _tmp3_ = NULL;
+#line 19631 "Photo.c"
+		PixelTransformationBundle* _tmp3_;
 #line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = self->priv->adjustments;
 #line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixel_transformation_bundle_set_to_identity (_tmp3_);
-#line 19613 "Photo.c"
+#line 19637 "Photo.c"
 	} else {
-		PixelTransformationBundle* _tmp4_ = NULL;
-		KeyValueMap* _tmp5_ = NULL;
+		PixelTransformationBundle* _tmp4_;
+		KeyValueMap* _tmp5_;
 #line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = self->priv->adjustments;
 #line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = map;
 #line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixel_transformation_bundle_load (_tmp4_, _tmp5_);
-#line 19623 "Photo.c"
+#line 19647 "Photo.c"
 	}
 #line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = self->priv->adjustments;
@@ -19633,7 +19657,7 @@ static void photo_locked_create_adjustments_from_data (Photo* self) {
 	self->priv->transformer = _tmp7_;
 #line 2548 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 19635 "Photo.c"
+#line 19659 "Photo.c"
 }
 
 
@@ -19642,25 +19666,25 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2561 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 19644 "Photo.c"
+#line 19668 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19651 "Photo.c"
+#line 19675 "Photo.c"
 		{
-			PixelTransformationBundle* _tmp1_ = NULL;
-			PixelTransformationBundle* _tmp2_ = NULL;
-			PixelTransformationBundle* _tmp3_ = NULL;
+			PixelTransformationBundle* _tmp1_;
+			PixelTransformationBundle* _tmp2_;
+			PixelTransformationBundle* _tmp3_;
 #line 2563 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->adjustments;
 #line 2563 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_ == NULL) {
 #line 2564 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_locked_create_adjustments_from_data (self);
-#line 19662 "Photo.c"
+#line 19686 "Photo.c"
 			}
 #line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->adjustments;
@@ -19668,27 +19692,27 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
 			_tmp3_ = pixel_transformation_bundle_copy (_tmp2_);
 #line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 19670 "Photo.c"
+#line 19694 "Photo.c"
 			{
-				PhotoRow* _tmp4_ = NULL;
+				PhotoRow* _tmp4_;
 #line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19677 "Photo.c"
+#line 19701 "Photo.c"
 			}
 #line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 19681 "Photo.c"
+#line 19705 "Photo.c"
 		}
-		__finally358:
+		__finally359:
 		{
-			PhotoRow* _tmp5_ = NULL;
+			PhotoRow* _tmp5_;
 #line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19690 "Photo.c"
+#line 19714 "Photo.c"
 		}
 #line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -19696,7 +19720,7 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 19698 "Photo.c"
+#line 19722 "Photo.c"
 	}
 }
 
@@ -19706,25 +19730,25 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2570 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 19708 "Photo.c"
+#line 19732 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19715 "Photo.c"
+#line 19739 "Photo.c"
 		{
-			PixelTransformer* _tmp1_ = NULL;
-			PixelTransformer* _tmp2_ = NULL;
-			PixelTransformer* _tmp3_ = NULL;
+			PixelTransformer* _tmp1_;
+			PixelTransformer* _tmp2_;
+			PixelTransformer* _tmp3_;
 #line 2572 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->transformer;
 #line 2572 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_ == NULL) {
 #line 2573 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_locked_create_adjustments_from_data (self);
-#line 19726 "Photo.c"
+#line 19750 "Photo.c"
 			}
 #line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->transformer;
@@ -19732,27 +19756,27 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 			_tmp3_ = pixel_transformer_copy (_tmp2_);
 #line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 19734 "Photo.c"
+#line 19758 "Photo.c"
 			{
-				PhotoRow* _tmp4_ = NULL;
+				PhotoRow* _tmp4_;
 #line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19741 "Photo.c"
+#line 19765 "Photo.c"
 			}
 #line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 19745 "Photo.c"
+#line 19769 "Photo.c"
 		}
-		__finally359:
+		__finally360:
 		{
-			PhotoRow* _tmp5_ = NULL;
+			PhotoRow* _tmp5_;
 #line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19754 "Photo.c"
+#line 19778 "Photo.c"
 		}
 #line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -19760,14 +19784,14 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 19762 "Photo.c"
+#line 19786 "Photo.c"
 	}
 }
 
 
 gboolean photo_has_color_adjustments (Photo* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 2579 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 2580 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19776,17 +19800,17 @@ gboolean photo_has_color_adjustments (Photo* self) {
 	result = _tmp0_;
 #line 2580 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 19778 "Photo.c"
+#line 19802 "Photo.c"
 }
 
 
 PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformationType type) {
 	PixelTransformation* result = NULL;
-	PixelTransformationBundle* _tmp0_ = NULL;
-	PixelTransformationBundle* _tmp1_ = NULL;
-	PixelTransformationType _tmp2_ = 0;
-	PixelTransformation* _tmp3_ = NULL;
-	PixelTransformation* _tmp4_ = NULL;
+	PixelTransformationBundle* _tmp0_;
+	PixelTransformationBundle* _tmp1_;
+	PixelTransformationType _tmp2_;
+	PixelTransformation* _tmp3_;
+	PixelTransformation* _tmp4_;
 #line 2583 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19805,18 +19829,18 @@ PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformatio
 	result = _tmp4_;
 #line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 19807 "Photo.c"
+#line 19831 "Photo.c"
 }
 
 
 void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_adjustments) {
-	PixelTransformationBundle* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	PixelTransformationBundle* _tmp0_;
+	gboolean _tmp1_;
 	KeyValueMap* map = NULL;
-	PixelTransformationBundle* _tmp8_ = NULL;
-	KeyValueMap* _tmp9_ = NULL;
+	PixelTransformationBundle* _tmp8_;
+	KeyValueMap* _tmp9_;
 	gboolean committed = FALSE;
-	gboolean _tmp39_ = FALSE;
+	gboolean _tmp39_;
 	GError * _inner_error_ = NULL;
 #line 2587 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -19828,18 +19852,18 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 	_tmp1_ = pixel_transformation_bundle_is_identity (_tmp0_);
 #line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 19830 "Photo.c"
+#line 19854 "Photo.c"
 		gboolean _result_ = FALSE;
-		gboolean _tmp5_ = FALSE;
+		gboolean _tmp5_;
 		{
-			PhotoRow* _tmp2_ = NULL;
+			PhotoRow* _tmp2_;
 #line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
 #line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19839 "Photo.c"
+#line 19863 "Photo.c"
 			{
-				gboolean _tmp3_ = FALSE;
+				gboolean _tmp3_;
 #line 2593 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = photo_remove_transformation (self, "adjustments");
 #line 2593 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19852,16 +19876,16 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 				_pixel_transformer_unref0 (self->priv->transformer);
 #line 2595 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->transformer = NULL;
-#line 19854 "Photo.c"
+#line 19878 "Photo.c"
 			}
-			__finally360:
+			__finally361:
 			{
-				PhotoRow* _tmp4_ = NULL;
+				PhotoRow* _tmp4_;
 #line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19863 "Photo.c"
+#line 19887 "Photo.c"
 			}
 #line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -19871,16 +19895,16 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 				g_clear_error (&_inner_error_);
 #line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 19873 "Photo.c"
+#line 19897 "Photo.c"
 			}
 		}
 #line 2598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _result_;
 #line 2598 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp5_) {
-#line 19880 "Photo.c"
-			Alteration* _tmp6_ = NULL;
-			Alteration* _tmp7_ = NULL;
+#line 19904 "Photo.c"
+			Alteration* _tmp6_;
+			Alteration* _tmp7_;
 #line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = alteration_new ("image", "color-adjustments");
 #line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19889,11 +19913,11 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 			data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp7_);
 #line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
 			_alteration_unref0 (_tmp7_);
-#line 19891 "Photo.c"
+#line 19915 "Photo.c"
 		}
 #line 2601 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19895 "Photo.c"
+#line 19919 "Photo.c"
 	}
 #line 2605 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = new_adjustments;
@@ -19901,41 +19925,41 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 	_tmp9_ = pixel_transformation_bundle_save (_tmp8_, "adjustments");
 #line 2605 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp9_;
-#line 19903 "Photo.c"
+#line 19927 "Photo.c"
 	{
-		PhotoRow* _tmp10_ = NULL;
+		PhotoRow* _tmp10_;
 #line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = self->row;
 #line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19910 "Photo.c"
+#line 19934 "Photo.c"
 		{
 			gboolean _tmp11_ = FALSE;
-			PixelTransformer* _tmp12_ = NULL;
-			KeyValueMap* _tmp36_ = NULL;
-			gboolean _tmp37_ = FALSE;
+			PixelTransformer* _tmp12_;
+			KeyValueMap* _tmp36_;
+			gboolean _tmp37_;
 #line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = self->priv->transformer;
 #line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp12_ == NULL) {
 #line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = TRUE;
-#line 19922 "Photo.c"
+#line 19946 "Photo.c"
 			} else {
-				PixelTransformationBundle* _tmp13_ = NULL;
+				PixelTransformationBundle* _tmp13_;
 #line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = self->priv->adjustments;
 #line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _tmp13_ == NULL;
-#line 19929 "Photo.c"
+#line 19953 "Photo.c"
 			}
 #line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp11_) {
-#line 19933 "Photo.c"
-				PixelTransformationBundle* _tmp14_ = NULL;
-				PixelTransformationBundle* _tmp15_ = NULL;
-				PixelTransformationBundle* _tmp16_ = NULL;
-				PixelTransformer* _tmp17_ = NULL;
+#line 19957 "Photo.c"
+				PixelTransformationBundle* _tmp14_;
+				PixelTransformationBundle* _tmp15_;
+				PixelTransformationBundle* _tmp16_;
+				PixelTransformer* _tmp17_;
 #line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = new_adjustments;
 #line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19952,17 +19976,17 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 				_pixel_transformer_unref0 (self->priv->transformer);
 #line 2612 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->transformer = _tmp17_;
-#line 19954 "Photo.c"
+#line 19978 "Photo.c"
 			} else {
-				PixelTransformationBundle* _tmp34_ = NULL;
-				PixelTransformationBundle* _tmp35_ = NULL;
+				PixelTransformationBundle* _tmp34_;
+				PixelTransformationBundle* _tmp35_;
 				{
 					GeeIterator* _transformation_it = NULL;
-					PixelTransformationBundle* _tmp18_ = NULL;
-					GeeIterable* _tmp19_ = NULL;
-					GeeIterable* _tmp20_ = NULL;
-					GeeIterator* _tmp21_ = NULL;
-					GeeIterator* _tmp22_ = NULL;
+					PixelTransformationBundle* _tmp18_;
+					GeeIterable* _tmp19_;
+					GeeIterable* _tmp20_;
+					GeeIterator* _tmp21_;
+					GeeIterator* _tmp22_;
 #line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = new_adjustments;
 #line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19979,19 +20003,19 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 					_transformation_it = _tmp22_;
 #line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 19981 "Photo.c"
-						GeeIterator* _tmp23_ = NULL;
-						gboolean _tmp24_ = FALSE;
+#line 20005 "Photo.c"
+						GeeIterator* _tmp23_;
+						gboolean _tmp24_;
 						PixelTransformation* transformation = NULL;
-						GeeIterator* _tmp25_ = NULL;
-						gpointer _tmp26_ = NULL;
-						PixelTransformer* _tmp27_ = NULL;
-						PixelTransformationBundle* _tmp28_ = NULL;
-						PixelTransformation* _tmp29_ = NULL;
-						PixelTransformationType _tmp30_ = 0;
-						PixelTransformation* _tmp31_ = NULL;
-						PixelTransformation* _tmp32_ = NULL;
-						PixelTransformation* _tmp33_ = NULL;
+						GeeIterator* _tmp25_;
+						gpointer _tmp26_;
+						PixelTransformer* _tmp27_;
+						PixelTransformationBundle* _tmp28_;
+						PixelTransformation* _tmp29_;
+						PixelTransformationType _tmp30_;
+						PixelTransformation* _tmp31_;
+						PixelTransformation* _tmp32_;
+						PixelTransformation* _tmp33_;
 #line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp23_ = _transformation_it;
 #line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20000,7 +20024,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 						if (!_tmp24_) {
 #line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 20002 "Photo.c"
+#line 20026 "Photo.c"
 						}
 #line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp25_ = _transformation_it;
@@ -20028,11 +20052,11 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 						_pixel_transformation_unref0 (_tmp32_);
 #line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						_pixel_transformation_unref0 (transformation);
-#line 20030 "Photo.c"
+#line 20054 "Photo.c"
 					}
 #line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_transformation_it);
-#line 20034 "Photo.c"
+#line 20058 "Photo.c"
 				}
 #line 2621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = new_adjustments;
@@ -20042,7 +20066,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 				_pixel_transformation_bundle_unref0 (self->priv->adjustments);
 #line 2621 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->adjustments = _tmp35_;
-#line 20044 "Photo.c"
+#line 20068 "Photo.c"
 			}
 #line 2624 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp36_ = map;
@@ -20050,16 +20074,16 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 			_tmp37_ = photo_set_transformation (self, _tmp36_);
 #line 2624 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp37_;
-#line 20052 "Photo.c"
+#line 20076 "Photo.c"
 		}
-		__finally361:
+		__finally362:
 		{
-			PhotoRow* _tmp38_ = NULL;
+			PhotoRow* _tmp38_;
 #line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = self->row;
 #line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20061 "Photo.c"
+#line 20085 "Photo.c"
 		}
 #line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -20071,16 +20095,16 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 			g_clear_error (&_inner_error_);
 #line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20073 "Photo.c"
+#line 20097 "Photo.c"
 		}
 	}
 #line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = committed;
 #line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp39_) {
-#line 20080 "Photo.c"
-		Alteration* _tmp40_ = NULL;
-		Alteration* _tmp41_ = NULL;
+#line 20104 "Photo.c"
+		Alteration* _tmp40_;
+		Alteration* _tmp41_;
 #line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = alteration_new ("image", "color-adjustments");
 #line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20089,11 +20113,11 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp41_);
 #line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp41_);
-#line 20091 "Photo.c"
+#line 20115 "Photo.c"
 	}
 #line 2587 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 20095 "Photo.c"
+#line 20119 "Photo.c"
 }
 
 
@@ -20103,14 +20127,14 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 20105 "Photo.c"
+#line 20129 "Photo.c"
 	{
 		PhotoMetadata* _tmp0_ = NULL;
-		PhotoFileReader* _tmp1_ = NULL;
-		PhotoFileReader* _tmp2_ = NULL;
-		PhotoMetadata* _tmp3_ = NULL;
-		PhotoMetadata* _tmp4_ = NULL;
-		PhotoMetadata* _tmp5_ = NULL;
+		PhotoFileReader* _tmp1_;
+		PhotoFileReader* _tmp2_;
+		PhotoMetadata* _tmp3_;
+		PhotoMetadata* _tmp4_;
+		PhotoMetadata* _tmp5_;
 #line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = photo_get_source_reader (self);
 #line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20125,8 +20149,8 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 		_tmp0_ = _tmp4_;
 #line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20127 "Photo.c"
-			goto __catch362_g_error;
+#line 20151 "Photo.c"
+			goto __catch363_g_error;
 		}
 #line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp0_;
@@ -20138,14 +20162,14 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 		_media_metadata_unref0 (_tmp0_);
 #line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20140 "Photo.c"
+#line 20164 "Photo.c"
 	}
-	goto __finally362;
-	__catch362_g_error:
+	goto __finally363;
+	__catch363_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+		GError* _tmp6_;
+		const gchar* _tmp7_;
 #line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
 #line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20162,27 +20186,27 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 		_g_error_free0 (err);
 #line 2638 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20164 "Photo.c"
+#line 20188 "Photo.c"
 	}
-	__finally362:
+	__finally363:
 #line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_clear_error (&_inner_error_);
 #line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 20173 "Photo.c"
+#line 20197 "Photo.c"
 }
 
 
 PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) {
 	PhotoMetadata* result = NULL;
 	PhotoMetadata* _tmp0_ = NULL;
-	PhotoFileReader* _tmp1_ = NULL;
-	PhotoFileReader* _tmp2_ = NULL;
-	PhotoMetadata* _tmp3_ = NULL;
-	PhotoMetadata* _tmp4_ = NULL;
-	PhotoMetadata* _tmp5_ = NULL;
+	PhotoFileReader* _tmp1_;
+	PhotoFileReader* _tmp2_;
+	PhotoMetadata* _tmp3_;
+	PhotoMetadata* _tmp4_;
+	PhotoMetadata* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 2642 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -20204,7 +20228,7 @@ PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 20206 "Photo.c"
+#line 20230 "Photo.c"
 	}
 #line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp0_;
@@ -20216,16 +20240,16 @@ PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) {
 	_media_metadata_unref0 (_tmp0_);
 #line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20218 "Photo.c"
+#line 20242 "Photo.c"
 }
 
 
 PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) {
 	PhotoMetadata* result = NULL;
 	PhotoFileReader* reader = NULL;
-	PhotoFileReader* _tmp0_ = NULL;
+	PhotoFileReader* _tmp0_;
 	PhotoMetadata* _tmp1_ = NULL;
-	PhotoFileReader* _tmp2_ = NULL;
+	PhotoFileReader* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 2646 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -20237,9 +20261,9 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) {
 	_tmp2_ = reader;
 #line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 20239 "Photo.c"
-		PhotoFileReader* _tmp3_ = NULL;
-		PhotoMetadata* _tmp4_ = NULL;
+#line 20263 "Photo.c"
+		PhotoFileReader* _tmp3_;
+		PhotoMetadata* _tmp4_;
 #line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = reader;
 #line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20258,14 +20282,14 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) {
 			_photo_file_adapter_unref0 (reader);
 #line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 20260 "Photo.c"
+#line 20284 "Photo.c"
 		}
 	} else {
 #line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (_tmp1_);
 #line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = NULL;
-#line 20267 "Photo.c"
+#line 20291 "Photo.c"
 	}
 #line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
@@ -20273,28 +20297,26 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) {
 	_photo_file_adapter_unref0 (reader);
 #line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20275 "Photo.c"
+#line 20299 "Photo.c"
 }
 
 
-gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportMasterState** state, GError** error) {
+gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportMasterState* * state, GError** error) {
 	PhotoReimportMasterState* _vala_state = NULL;
 	gboolean result = FALSE;
 	PhotoFileReader* master_reader = NULL;
-	PhotoFileReader* _tmp0_ = NULL;
-	PhotoFileReader* _tmp1_ = NULL;
-	PhotoFileFormat _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	PhotoFileReader* _tmp0_;
+	PhotoFileReader* _tmp1_;
+	PhotoFileFormat _tmp2_;
+	gboolean _tmp3_;
 	PhotoFileMetadataWriter* _tmp4_ = NULL;
-	PhotoFileReader* _tmp5_ = NULL;
-	PhotoFileMetadataWriter* _tmp6_ = NULL;
-	PhotoFileMetadataWriter* _tmp8_ = NULL;
-	PhotoFileMetadataWriter* _tmp9_ = NULL;
-	PhotoMetadata* _tmp10_ = NULL;
-	gboolean _tmp12_ = FALSE;
-	PhotoReimportMasterState* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
-	PhotoReimportMasterState* _tmp16_ = NULL;
+	PhotoFileReader* _tmp5_;
+	PhotoFileMetadataWriter* _tmp6_;
+	PhotoMetadata* _tmp8_;
+	gboolean _tmp10_ = FALSE;
+	PhotoReimportMasterState* _tmp11_ = NULL;
+	gboolean _tmp12_;
+	PhotoReimportMasterState* _tmp14_;
 	GError * _inner_error_ = NULL;
 #line 2655 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -20324,15 +20346,15 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
 		if (state) {
 #line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20326 "Photo.c"
+#line 20348 "Photo.c"
 		} else {
 #line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_state);
-#line 20330 "Photo.c"
+#line 20352 "Photo.c"
 		}
 #line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20334 "Photo.c"
+#line 20356 "Photo.c"
 	}
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = master_reader;
@@ -20342,7 +20364,7 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
 	_tmp4_ = _tmp6_;
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20344 "Photo.c"
+#line 20366 "Photo.c"
 		gboolean _tmp7_ = FALSE;
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
@@ -20350,24 +20372,16 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
 		_photo_file_adapter_unref0 (master_reader);
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp7_;
-#line 20352 "Photo.c"
+#line 20374 "Photo.c"
 	}
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp8_ = _tmp4_;
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp4_ = NULL;
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp9_ = _tmp8_;
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp10_ = metadata;
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_file_metadata_writer_write_metadata (_tmp9_, _tmp10_, &_inner_error_);
+	_tmp8_ = metadata;
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
-	_photo_file_adapter_unref0 (_tmp9_);
+	photo_file_metadata_writer_write_metadata (_tmp4_, _tmp8_, &_inner_error_);
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20368 "Photo.c"
-		gboolean _tmp11_ = FALSE;
+#line 20382 "Photo.c"
+		gboolean _tmp9_ = FALSE;
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20375,21 +20389,21 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (master_reader);
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
-		return _tmp11_;
-#line 20378 "Photo.c"
+		return _tmp9_;
+#line 20392 "Photo.c"
 	}
 #line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp14_ = photo_prepare_for_reimport_master (self, &_tmp13_, &_inner_error_);
+	_tmp12_ = photo_prepare_for_reimport_master (self, &_tmp11_, &_inner_error_);
 #line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (_vala_state);
 #line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_state = _tmp13_;
+	_vala_state = _tmp11_;
 #line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp12_ = _tmp14_;
+	_tmp10_ = _tmp12_;
 #line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20390 "Photo.c"
-		gboolean _tmp15_ = FALSE;
+#line 20404 "Photo.c"
+		gboolean _tmp13_ = FALSE;
 #line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
 #line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20397,11 +20411,11 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
 #line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (master_reader);
 #line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
-		return _tmp15_;
-#line 20400 "Photo.c"
+		return _tmp13_;
+#line 20414 "Photo.c"
 	}
 #line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (!_tmp12_) {
+	if (!_tmp10_) {
 #line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
 #line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20412,20 +20426,20 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
 		if (state) {
 #line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20414 "Photo.c"
+#line 20428 "Photo.c"
 		} else {
 #line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_state);
-#line 20418 "Photo.c"
+#line 20432 "Photo.c"
 		}
 #line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20422 "Photo.c"
+#line 20436 "Photo.c"
 	}
 #line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp16_ = _vala_state;
+	_tmp14_ = _vala_state;
 #line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
-	G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE;
+	G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE;
 #line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
 #line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20436,20 +20450,20 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
 	if (state) {
 #line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 20438 "Photo.c"
+#line 20452 "Photo.c"
 	} else {
 #line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_master_state_unref0 (_vala_state);
-#line 20442 "Photo.c"
+#line 20456 "Photo.c"
 	}
 #line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20446 "Photo.c"
+#line 20460 "Photo.c"
 }
 
 
 void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* state, GError** error) {
-	PhotoReimportMasterState* _tmp0_ = NULL;
+	PhotoReimportMasterState* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 2674 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -20467,7 +20481,7 @@ void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState*
 			g_propagate_error (error, _inner_error_);
 #line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20469 "Photo.c"
+#line 20483 "Photo.c"
 		} else {
 #line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -20475,31 +20489,29 @@ void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState*
 			g_clear_error (&_inner_error_);
 #line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20477 "Photo.c"
+#line 20491 "Photo.c"
 		}
 	}
 }
 
 
-gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportEditableState** state, GError** error) {
+gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportEditableState* * state, GError** error) {
 	PhotoReimportEditableState* _vala_state = NULL;
 	gboolean result = FALSE;
 	PhotoFileReader* editable_reader = NULL;
-	PhotoFileReader* _tmp0_ = NULL;
-	PhotoFileReader* _tmp1_ = NULL;
-	PhotoFileReader* _tmp2_ = NULL;
-	PhotoFileFormat _tmp3_ = 0;
-	gboolean _tmp4_ = FALSE;
+	PhotoFileReader* _tmp0_;
+	PhotoFileReader* _tmp1_;
+	PhotoFileReader* _tmp2_;
+	PhotoFileFormat _tmp3_;
+	gboolean _tmp4_;
 	PhotoFileMetadataWriter* _tmp5_ = NULL;
-	PhotoFileReader* _tmp6_ = NULL;
-	PhotoFileMetadataWriter* _tmp7_ = NULL;
-	PhotoFileMetadataWriter* _tmp9_ = NULL;
-	PhotoFileMetadataWriter* _tmp10_ = NULL;
-	PhotoMetadata* _tmp11_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	PhotoReimportEditableState* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	PhotoReimportEditableState* _tmp17_ = NULL;
+	PhotoFileReader* _tmp6_;
+	PhotoFileMetadataWriter* _tmp7_;
+	PhotoMetadata* _tmp9_;
+	gboolean _tmp11_ = FALSE;
+	PhotoReimportEditableState* _tmp12_ = NULL;
+	gboolean _tmp13_;
+	PhotoReimportEditableState* _tmp15_;
 	GError * _inner_error_ = NULL;
 #line 2678 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -20525,15 +20537,15 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 		if (state) {
 #line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20527 "Photo.c"
+#line 20539 "Photo.c"
 		} else {
 #line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20531 "Photo.c"
+#line 20543 "Photo.c"
 		}
 #line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20535 "Photo.c"
+#line 20547 "Photo.c"
 	}
 #line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = editable_reader;
@@ -20551,15 +20563,15 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 		if (state) {
 #line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20553 "Photo.c"
+#line 20565 "Photo.c"
 		} else {
 #line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20557 "Photo.c"
+#line 20569 "Photo.c"
 		}
 #line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20561 "Photo.c"
+#line 20573 "Photo.c"
 	}
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = editable_reader;
@@ -20569,7 +20581,7 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 	_tmp5_ = _tmp7_;
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20571 "Photo.c"
+#line 20583 "Photo.c"
 		gboolean _tmp8_ = FALSE;
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
@@ -20577,24 +20589,16 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 		_photo_file_adapter_unref0 (editable_reader);
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp8_;
-#line 20579 "Photo.c"
+#line 20591 "Photo.c"
 	}
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp9_ = _tmp5_;
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp5_ = NULL;
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp10_ = _tmp9_;
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp11_ = metadata;
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_file_metadata_writer_write_metadata (_tmp10_, _tmp11_, &_inner_error_);
+	_tmp9_ = metadata;
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
-	_photo_file_adapter_unref0 (_tmp10_);
+	photo_file_metadata_writer_write_metadata (_tmp5_, _tmp9_, &_inner_error_);
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20595 "Photo.c"
-		gboolean _tmp12_ = FALSE;
+#line 20599 "Photo.c"
+		gboolean _tmp10_ = FALSE;
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20602,21 +20606,21 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
-		return _tmp12_;
-#line 20605 "Photo.c"
+		return _tmp10_;
+#line 20609 "Photo.c"
 	}
 #line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp15_ = photo_prepare_for_reimport_editable (self, &_tmp14_, &_inner_error_);
+	_tmp13_ = photo_prepare_for_reimport_editable (self, &_tmp12_, &_inner_error_);
 #line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (_vala_state);
 #line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_state = _tmp14_;
+	_vala_state = _tmp12_;
 #line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp13_ = _tmp15_;
+	_tmp11_ = _tmp13_;
 #line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20617 "Photo.c"
-		gboolean _tmp16_ = FALSE;
+#line 20621 "Photo.c"
+		gboolean _tmp14_ = FALSE;
 #line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
 #line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20624,11 +20628,11 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 #line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
 #line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
-		return _tmp16_;
-#line 20627 "Photo.c"
+		return _tmp14_;
+#line 20631 "Photo.c"
 	}
 #line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (!_tmp13_) {
+	if (!_tmp11_) {
 #line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
 #line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20639,20 +20643,20 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 		if (state) {
 #line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20641 "Photo.c"
+#line 20645 "Photo.c"
 		} else {
 #line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20645 "Photo.c"
+#line 20649 "Photo.c"
 		}
 #line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20649 "Photo.c"
+#line 20653 "Photo.c"
 	}
 #line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp17_ = _vala_state;
+	_tmp15_ = _vala_state;
 #line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
-	G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE;
+	G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE;
 #line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
 #line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20663,20 +20667,20 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 	if (state) {
 #line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 20665 "Photo.c"
+#line 20669 "Photo.c"
 	} else {
 #line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20669 "Photo.c"
+#line 20673 "Photo.c"
 	}
 #line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20673 "Photo.c"
+#line 20677 "Photo.c"
 }
 
 
 void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableState* state, GError** error) {
-	PhotoReimportEditableState* _tmp0_ = NULL;
+	PhotoReimportEditableState* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 2699 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -20694,7 +20698,7 @@ void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableSt
 			g_propagate_error (error, _inner_error_);
 #line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20696 "Photo.c"
+#line 20700 "Photo.c"
 		} else {
 #line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -20702,7 +20706,7 @@ void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableSt
 			g_clear_error (&_inner_error_);
 #line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20704 "Photo.c"
+#line 20708 "Photo.c"
 		}
 	}
 }
@@ -20712,44 +20716,44 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) {
 	GError * _inner_error_ = NULL;
 #line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 20714 "Photo.c"
+#line 20718 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20721 "Photo.c"
+#line 20725 "Photo.c"
 		{
-			BackingPhotoRow* _tmp1_ = NULL;
-			Dimensions _tmp2_ = {0};
+			BackingPhotoRow* _tmp1_;
+			Dimensions _tmp2_;
 #line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
 #line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->dim;
 #line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 20731 "Photo.c"
+#line 20735 "Photo.c"
 			{
-				PhotoRow* _tmp3_ = NULL;
+				PhotoRow* _tmp3_;
 #line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20738 "Photo.c"
+#line 20742 "Photo.c"
 			}
 #line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20742 "Photo.c"
+#line 20746 "Photo.c"
 		}
-		__finally363:
+		__finally364:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20751 "Photo.c"
+#line 20755 "Photo.c"
 		}
 #line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -20757,7 +20761,7 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) {
 		g_clear_error (&_inner_error_);
 #line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 20759 "Photo.c"
+#line 20763 "Photo.c"
 	}
 }
 
@@ -20767,21 +20771,21 @@ gboolean photo_has_transformations (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 20769 "Photo.c"
+#line 20773 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 		gboolean _tmp10_ = FALSE;
 #line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20777 "Photo.c"
+#line 20781 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
-			PhotoRow* _tmp2_ = NULL;
-			Orientation _tmp3_ = 0;
-			BackingPhotoRow* _tmp4_ = NULL;
-			Orientation _tmp5_ = 0;
+			PhotoRow* _tmp2_;
+			Orientation _tmp3_;
+			BackingPhotoRow* _tmp4_;
+			Orientation _tmp5_;
 #line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
 #line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20794,41 +20798,41 @@ gboolean photo_has_transformations (Photo* self) {
 			if (_tmp3_ != _tmp5_) {
 #line 2714 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = TRUE;
-#line 20796 "Photo.c"
+#line 20800 "Photo.c"
 			} else {
-				PhotoRow* _tmp6_ = NULL;
-				GeeHashMap* _tmp7_ = NULL;
+				PhotoRow* _tmp6_;
+				GeeHashMap* _tmp7_;
 #line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
 #line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp6_->transformations;
 #line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp7_ != NULL;
-#line 20806 "Photo.c"
+#line 20810 "Photo.c"
 			}
 #line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 20810 "Photo.c"
+#line 20814 "Photo.c"
 			{
-				PhotoRow* _tmp8_ = NULL;
+				PhotoRow* _tmp8_;
 #line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
 #line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20817 "Photo.c"
+#line 20821 "Photo.c"
 			}
 #line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 20821 "Photo.c"
+#line 20825 "Photo.c"
 		}
-		__finally364:
+		__finally365:
 		{
-			PhotoRow* _tmp9_ = NULL;
+			PhotoRow* _tmp9_;
 #line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
 #line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20830 "Photo.c"
+#line 20834 "Photo.c"
 		}
 #line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -20836,7 +20840,7 @@ gboolean photo_has_transformations (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp10_;
-#line 20838 "Photo.c"
+#line 20842 "Photo.c"
 	}
 }
 
@@ -20845,8 +20849,8 @@ gboolean photo_only_metadata_changed (Photo* self) {
 	gboolean result = FALSE;
 	MetadataDateTime* date_time = NULL;
 	PhotoMetadata* metadata = NULL;
-	PhotoMetadata* _tmp0_ = NULL;
-	PhotoMetadata* _tmp1_ = NULL;
+	PhotoMetadata* _tmp0_;
+	PhotoMetadata* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -20860,9 +20864,9 @@ gboolean photo_only_metadata_changed (Photo* self) {
 	_tmp1_ = metadata;
 #line 2723 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 20862 "Photo.c"
-		PhotoMetadata* _tmp2_ = NULL;
-		MetadataDateTime* _tmp3_ = NULL;
+#line 20866 "Photo.c"
+		PhotoMetadata* _tmp2_;
+		MetadataDateTime* _tmp3_;
 #line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = metadata;
 #line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20871,32 +20875,32 @@ gboolean photo_only_metadata_changed (Photo* self) {
 		_metadata_date_time_unref0 (date_time);
 #line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 		date_time = _tmp3_;
-#line 20873 "Photo.c"
+#line 20877 "Photo.c"
 	}
 	{
-		PhotoRow* _tmp4_ = NULL;
+		PhotoRow* _tmp4_;
 		gboolean _tmp21_ = FALSE;
 #line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = self->row;
 #line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20882 "Photo.c"
+#line 20886 "Photo.c"
 		{
 			gboolean _tmp5_ = FALSE;
-			PhotoRow* _tmp6_ = NULL;
-			GeeHashMap* _tmp7_ = NULL;
+			PhotoRow* _tmp6_;
+			GeeHashMap* _tmp7_;
 #line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->row;
 #line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp6_->transformations;
 #line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp7_ == NULL) {
-#line 20893 "Photo.c"
+#line 20897 "Photo.c"
 				gboolean _tmp8_ = FALSE;
-				PhotoRow* _tmp9_ = NULL;
-				Orientation _tmp10_ = 0;
-				BackingPhotoRow* _tmp11_ = NULL;
-				Orientation _tmp12_ = 0;
+				PhotoRow* _tmp9_;
+				Orientation _tmp10_;
+				BackingPhotoRow* _tmp11_;
+				Orientation _tmp12_;
 #line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->row;
 #line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20909,19 +20913,19 @@ gboolean photo_only_metadata_changed (Photo* self) {
 				if (_tmp10_ != _tmp12_) {
 #line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = TRUE;
-#line 20911 "Photo.c"
+#line 20915 "Photo.c"
 				} else {
 					gboolean _tmp13_ = FALSE;
-					MetadataDateTime* _tmp14_ = NULL;
+					MetadataDateTime* _tmp14_;
 #line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = date_time;
 #line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp14_ != NULL) {
-#line 20919 "Photo.c"
-						PhotoRow* _tmp15_ = NULL;
-						time_t _tmp16_ = 0;
-						MetadataDateTime* _tmp17_ = NULL;
-						time_t _tmp18_ = 0;
+#line 20923 "Photo.c"
+						PhotoRow* _tmp15_;
+						time_t _tmp16_;
+						MetadataDateTime* _tmp17_;
+						time_t _tmp18_;
 #line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp15_ = self->row;
 #line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20932,34 +20936,34 @@ gboolean photo_only_metadata_changed (Photo* self) {
 						_tmp18_ = metadata_date_time_get_timestamp (_tmp17_);
 #line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = _tmp16_ != _tmp18_;
-#line 20934 "Photo.c"
+#line 20938 "Photo.c"
 					} else {
 #line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = FALSE;
-#line 20938 "Photo.c"
+#line 20942 "Photo.c"
 					}
 #line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = _tmp13_;
-#line 20942 "Photo.c"
+#line 20946 "Photo.c"
 				}
 #line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp8_;
-#line 20946 "Photo.c"
+#line 20950 "Photo.c"
 			} else {
 #line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = FALSE;
-#line 20950 "Photo.c"
+#line 20954 "Photo.c"
 			}
 #line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp5_;
-#line 20954 "Photo.c"
+#line 20958 "Photo.c"
 			{
-				PhotoRow* _tmp19_ = NULL;
+				PhotoRow* _tmp19_;
 #line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = self->row;
 #line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20961 "Photo.c"
+#line 20965 "Photo.c"
 			}
 #line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
@@ -20967,16 +20971,16 @@ gboolean photo_only_metadata_changed (Photo* self) {
 			_metadata_date_time_unref0 (date_time);
 #line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 20969 "Photo.c"
+#line 20973 "Photo.c"
 		}
-		__finally365:
+		__finally366:
 		{
-			PhotoRow* _tmp20_ = NULL;
+			PhotoRow* _tmp20_;
 #line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = self->row;
 #line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20978 "Photo.c"
+#line 20982 "Photo.c"
 		}
 #line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
@@ -20988,13 +20992,13 @@ gboolean photo_only_metadata_changed (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp21_;
-#line 20990 "Photo.c"
+#line 20994 "Photo.c"
 	}
 #line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
 #line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
 	_metadata_date_time_unref0 (date_time);
-#line 20996 "Photo.c"
+#line 21000 "Photo.c"
 }
 
 
@@ -21004,9 +21008,9 @@ gboolean photo_has_alterations (Photo* self) {
 	gchar* title = NULL;
 	gchar* comment = NULL;
 	PhotoMetadata* metadata = NULL;
-	PhotoMetadata* _tmp0_ = NULL;
-	PhotoMetadata* _tmp1_ = NULL;
-	MetadataDateTime* _tmp8_ = NULL;
+	PhotoMetadata* _tmp0_;
+	PhotoMetadata* _tmp1_;
+	MetadataDateTime* _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -21024,13 +21028,13 @@ gboolean photo_has_alterations (Photo* self) {
 	_tmp1_ = metadata;
 #line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 21026 "Photo.c"
-		PhotoMetadata* _tmp2_ = NULL;
-		MetadataDateTime* _tmp3_ = NULL;
-		PhotoMetadata* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		PhotoMetadata* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 21030 "Photo.c"
+		PhotoMetadata* _tmp2_;
+		MetadataDateTime* _tmp3_;
+		PhotoMetadata* _tmp4_;
+		gchar* _tmp5_;
+		PhotoMetadata* _tmp6_;
+		gchar* _tmp7_;
 #line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = metadata;
 #line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21055,25 +21059,25 @@ gboolean photo_has_alterations (Photo* self) {
 		_g_free0 (comment);
 #line 2742 "/home/jens/Source/shotwell/src/Photo.vala"
 		comment = _tmp7_;
-#line 21057 "Photo.c"
+#line 21061 "Photo.c"
 	}
 #line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = date_time;
 #line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ == NULL) {
-#line 21063 "Photo.c"
+#line 21067 "Photo.c"
 		{
-			PhotoRow* _tmp9_ = NULL;
+			PhotoRow* _tmp9_;
 #line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
 #line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21070 "Photo.c"
+#line 21074 "Photo.c"
 			{
-				BackingPhotoRow* _tmp10_ = NULL;
-				time_t _tmp11_ = 0;
-				PhotoRow* _tmp12_ = NULL;
-				time_t _tmp13_ = 0;
+				BackingPhotoRow* _tmp10_;
+				time_t _tmp11_;
+				PhotoRow* _tmp12_;
+				time_t _tmp13_;
 #line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = self->backing_photo_row;
 #line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21086,14 +21090,14 @@ gboolean photo_has_alterations (Photo* self) {
 				if (_tmp11_ != _tmp13_) {
 #line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
-#line 21088 "Photo.c"
+#line 21092 "Photo.c"
 					{
-						PhotoRow* _tmp14_ = NULL;
+						PhotoRow* _tmp14_;
 #line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp14_ = self->row;
 #line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21095 "Photo.c"
+#line 21099 "Photo.c"
 					}
 #line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (metadata);
@@ -21105,21 +21109,21 @@ gboolean photo_has_alterations (Photo* self) {
 					_metadata_date_time_unref0 (date_time);
 #line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 21107 "Photo.c"
+#line 21111 "Photo.c"
 				}
 			}
-			__finally366:
+			__finally367:
 			{
-				PhotoRow* _tmp15_ = NULL;
+				PhotoRow* _tmp15_;
 #line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = self->row;
 #line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21117 "Photo.c"
+#line 21121 "Photo.c"
 			}
 #line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 21121 "Photo.c"
+#line 21125 "Photo.c"
 				gboolean _tmp16_ = FALSE;
 #line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				_media_metadata_unref0 (metadata);
@@ -21135,25 +21139,25 @@ gboolean photo_has_alterations (Photo* self) {
 				g_clear_error (&_inner_error_);
 #line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				return _tmp16_;
-#line 21137 "Photo.c"
+#line 21141 "Photo.c"
 			}
 		}
 	}
 	{
-		PhotoRow* _tmp17_ = NULL;
+		PhotoRow* _tmp17_;
 		gboolean _tmp42_ = FALSE;
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = self->row;
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21148 "Photo.c"
+#line 21152 "Photo.c"
 		{
 			gboolean _tmp18_ = FALSE;
 			gboolean _tmp19_ = FALSE;
 			gboolean _tmp20_ = FALSE;
 			gboolean _tmp21_ = FALSE;
-			PhotoRow* _tmp22_ = NULL;
-			GeeHashMap* _tmp23_ = NULL;
+			PhotoRow* _tmp22_;
+			GeeHashMap* _tmp23_;
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = self->row;
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21162,12 +21166,12 @@ gboolean photo_has_alterations (Photo* self) {
 			if (_tmp23_ != NULL) {
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = TRUE;
-#line 21164 "Photo.c"
+#line 21168 "Photo.c"
 			} else {
-				PhotoRow* _tmp24_ = NULL;
-				Orientation _tmp25_ = 0;
-				BackingPhotoRow* _tmp26_ = NULL;
-				Orientation _tmp27_ = 0;
+				PhotoRow* _tmp24_;
+				Orientation _tmp25_;
+				BackingPhotoRow* _tmp26_;
+				Orientation _tmp27_;
 #line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = self->row;
 #line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21178,25 +21182,25 @@ gboolean photo_has_alterations (Photo* self) {
 				_tmp27_ = _tmp26_->original_orientation;
 #line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = _tmp25_ != _tmp27_;
-#line 21180 "Photo.c"
+#line 21184 "Photo.c"
 			}
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp21_) {
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = TRUE;
-#line 21186 "Photo.c"
+#line 21190 "Photo.c"
 			} else {
 				gboolean _tmp28_ = FALSE;
-				MetadataDateTime* _tmp29_ = NULL;
+				MetadataDateTime* _tmp29_;
 #line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = date_time;
 #line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp29_ != NULL) {
-#line 21194 "Photo.c"
-					PhotoRow* _tmp30_ = NULL;
-					time_t _tmp31_ = 0;
-					MetadataDateTime* _tmp32_ = NULL;
-					time_t _tmp33_ = 0;
+#line 21198 "Photo.c"
+					PhotoRow* _tmp30_;
+					time_t _tmp31_;
+					MetadataDateTime* _tmp32_;
+					time_t _tmp33_;
 #line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp30_ = self->row;
 #line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21207,25 +21211,25 @@ gboolean photo_has_alterations (Photo* self) {
 					_tmp33_ = metadata_date_time_get_timestamp (_tmp32_);
 #line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp28_ = _tmp31_ != _tmp33_;
-#line 21209 "Photo.c"
+#line 21213 "Photo.c"
 				} else {
 #line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp28_ = FALSE;
-#line 21213 "Photo.c"
+#line 21217 "Photo.c"
 				}
 #line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = _tmp28_;
-#line 21217 "Photo.c"
+#line 21221 "Photo.c"
 			}
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp20_) {
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = TRUE;
-#line 21223 "Photo.c"
+#line 21227 "Photo.c"
 			} else {
-				gchar* _tmp34_ = NULL;
-				gchar* _tmp35_ = NULL;
-				const gchar* _tmp36_ = NULL;
+				gchar* _tmp34_;
+				gchar* _tmp35_;
+				const gchar* _tmp36_;
 #line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21236,17 +21240,17 @@ gboolean photo_has_alterations (Photo* self) {
 				_tmp19_ = g_strcmp0 (_tmp35_, _tmp36_) != 0;
 #line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp35_);
-#line 21238 "Photo.c"
+#line 21242 "Photo.c"
 			}
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp19_) {
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = TRUE;
-#line 21244 "Photo.c"
+#line 21248 "Photo.c"
 			} else {
-				gchar* _tmp37_ = NULL;
-				gchar* _tmp38_ = NULL;
-				const gchar* _tmp39_ = NULL;
+				gchar* _tmp37_;
+				gchar* _tmp38_;
+				const gchar* _tmp39_;
 #line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21257,18 +21261,18 @@ gboolean photo_has_alterations (Photo* self) {
 				_tmp18_ = g_strcmp0 (_tmp38_, _tmp39_) != 0;
 #line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp38_);
-#line 21259 "Photo.c"
+#line 21263 "Photo.c"
 			}
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp18_;
-#line 21263 "Photo.c"
+#line 21267 "Photo.c"
 			{
-				PhotoRow* _tmp40_ = NULL;
+				PhotoRow* _tmp40_;
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = self->row;
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21270 "Photo.c"
+#line 21274 "Photo.c"
 			}
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
@@ -21280,16 +21284,16 @@ gboolean photo_has_alterations (Photo* self) {
 			_metadata_date_time_unref0 (date_time);
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21282 "Photo.c"
+#line 21286 "Photo.c"
 		}
-		__finally367:
+		__finally368:
 		{
-			PhotoRow* _tmp41_ = NULL;
+			PhotoRow* _tmp41_;
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp41_ = self->row;
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21291 "Photo.c"
+#line 21295 "Photo.c"
 		}
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
@@ -21305,7 +21309,7 @@ gboolean photo_has_alterations (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp42_;
-#line 21307 "Photo.c"
+#line 21311 "Photo.c"
 	}
 #line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
@@ -21315,7 +21319,7 @@ gboolean photo_has_alterations (Photo* self) {
 	_g_free0 (title);
 #line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
 	_metadata_date_time_unref0 (date_time);
-#line 21317 "Photo.c"
+#line 21321 "Photo.c"
 }
 
 
@@ -21324,31 +21328,31 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 21326 "Photo.c"
+#line 21330 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21333 "Photo.c"
+#line 21337 "Photo.c"
 		{
 			PixelTransformer* _tmp1_ = NULL;
-			PixelTransformer* _tmp2_ = NULL;
+			PixelTransformer* _tmp2_;
 			PixelTransformationBundle* _tmp5_ = NULL;
-			PixelTransformationBundle* _tmp6_ = NULL;
-			PhotoRow* _tmp9_ = NULL;
-			Orientation _tmp10_ = 0;
-			PhotoRow* _tmp11_ = NULL;
-			GeeHashMap* _tmp12_ = NULL;
-			PhotoPhotoTransformationStateImpl* _tmp13_ = NULL;
+			PixelTransformationBundle* _tmp6_;
+			PhotoRow* _tmp9_;
+			Orientation _tmp10_;
+			PhotoRow* _tmp11_;
+			GeeHashMap* _tmp12_;
+			PhotoPhotoTransformationStateImpl* _tmp13_;
 #line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->transformer;
 #line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 21348 "Photo.c"
-				PixelTransformer* _tmp3_ = NULL;
-				PixelTransformer* _tmp4_ = NULL;
+#line 21352 "Photo.c"
+				PixelTransformer* _tmp3_;
+				PixelTransformer* _tmp4_;
 #line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->transformer;
 #line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21357,21 +21361,21 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 				_pixel_transformer_unref0 (_tmp1_);
 #line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp4_;
-#line 21359 "Photo.c"
+#line 21363 "Photo.c"
 			} else {
 #line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (_tmp1_);
 #line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = NULL;
-#line 21365 "Photo.c"
+#line 21369 "Photo.c"
 			}
 #line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->priv->adjustments;
 #line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != NULL) {
-#line 21371 "Photo.c"
-				PixelTransformationBundle* _tmp7_ = NULL;
-				PixelTransformationBundle* _tmp8_ = NULL;
+#line 21375 "Photo.c"
+				PixelTransformationBundle* _tmp7_;
+				PixelTransformationBundle* _tmp8_;
 #line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->priv->adjustments;
 #line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21380,13 +21384,13 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 				_pixel_transformation_bundle_unref0 (_tmp5_);
 #line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp8_;
-#line 21382 "Photo.c"
+#line 21386 "Photo.c"
 			} else {
 #line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (_tmp5_);
 #line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = NULL;
-#line 21388 "Photo.c"
+#line 21392 "Photo.c"
 			}
 #line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
@@ -21404,27 +21408,27 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 			_pixel_transformation_bundle_unref0 (_tmp5_);
 #line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformer_unref0 (_tmp1_);
-#line 21406 "Photo.c"
+#line 21410 "Photo.c"
 			{
-				PhotoRow* _tmp14_ = NULL;
+				PhotoRow* _tmp14_;
 #line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = self->row;
 #line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21413 "Photo.c"
+#line 21417 "Photo.c"
 			}
 #line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21417 "Photo.c"
+#line 21421 "Photo.c"
 		}
-		__finally368:
+		__finally369:
 		{
-			PhotoRow* _tmp15_ = NULL;
+			PhotoRow* _tmp15_;
 #line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = self->row;
 #line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21426 "Photo.c"
+#line 21430 "Photo.c"
 		}
 #line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -21432,7 +21436,7 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 21434 "Photo.c"
+#line 21438 "Photo.c"
 	}
 }
 
@@ -21440,37 +21444,37 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 static gpointer _pixel_transformer_ref0 (gpointer self) {
 #line 2793 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? pixel_transformer_ref (self) : NULL;
-#line 21442 "Photo.c"
+#line 21446 "Photo.c"
 }
 
 
 static gpointer _pixel_transformation_bundle_ref0 (gpointer self) {
 #line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? pixel_transformation_bundle_ref (self) : NULL;
-#line 21449 "Photo.c"
+#line 21453 "Photo.c"
 }
 
 
 gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* state) {
 	gboolean result = FALSE;
 	PhotoPhotoTransformationStateImpl* state_impl = NULL;
-	PhotoTransformationState* _tmp0_ = NULL;
-	PhotoPhotoTransformationStateImpl* _tmp1_ = NULL;
-	PhotoPhotoTransformationStateImpl* _tmp2_ = NULL;
+	PhotoTransformationState* _tmp0_;
+	PhotoPhotoTransformationStateImpl* _tmp1_;
+	PhotoPhotoTransformationStateImpl* _tmp2_;
 	Orientation saved_orientation = 0;
-	PhotoPhotoTransformationStateImpl* _tmp3_ = NULL;
-	Orientation _tmp4_ = 0;
+	PhotoPhotoTransformationStateImpl* _tmp3_;
+	Orientation _tmp4_;
 	GeeHashMap* saved_transformations = NULL;
-	PhotoPhotoTransformationStateImpl* _tmp5_ = NULL;
-	GeeHashMap* _tmp6_ = NULL;
+	PhotoPhotoTransformationStateImpl* _tmp5_;
+	GeeHashMap* _tmp6_;
 	PixelTransformer* saved_transformer = NULL;
-	PhotoPhotoTransformationStateImpl* _tmp7_ = NULL;
-	PixelTransformer* _tmp8_ = NULL;
+	PhotoPhotoTransformationStateImpl* _tmp7_;
+	PixelTransformer* _tmp8_;
 	PixelTransformationBundle* saved_adjustments = NULL;
-	PhotoPhotoTransformationStateImpl* _tmp9_ = NULL;
-	PixelTransformationBundle* _tmp10_ = NULL;
+	PhotoPhotoTransformationStateImpl* _tmp9_;
+	PixelTransformationBundle* _tmp10_;
 	gboolean committed = FALSE;
-	gboolean _tmp31_ = FALSE;
+	gboolean _tmp31_;
 	GError * _inner_error_ = NULL;
 #line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -21492,7 +21496,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 		_g_object_unref0 (state_impl);
 #line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 21494 "Photo.c"
+#line 21498 "Photo.c"
 	}
 #line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = state_impl;
@@ -21518,23 +21522,23 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 	_tmp10_ = photo_photo_transformation_state_impl_get_color_adjustments (_tmp9_);
 #line 2784 "/home/jens/Source/shotwell/src/Photo.vala"
 	saved_adjustments = _tmp10_;
-#line 21520 "Photo.c"
+#line 21524 "Photo.c"
 	{
-		PhotoRow* _tmp11_ = NULL;
+		PhotoRow* _tmp11_;
 #line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = self->row;
 #line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21527 "Photo.c"
-		{
-			PhotoTable* _tmp12_ = NULL;
-			PhotoTable* _tmp13_ = NULL;
-			PhotoRow* _tmp14_ = NULL;
-			PhotoID _tmp15_ = {0};
-			Orientation _tmp16_ = 0;
-			GeeHashMap* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
-			gboolean _tmp19_ = FALSE;
+#line 21531 "Photo.c"
+		{
+			PhotoTable* _tmp12_;
+			PhotoTable* _tmp13_;
+			PhotoRow* _tmp14_;
+			PhotoID _tmp15_;
+			Orientation _tmp16_;
+			GeeHashMap* _tmp17_;
+			gboolean _tmp18_;
+			gboolean _tmp19_;
 #line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_table_get_instance ();
 #line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21557,16 +21561,16 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 			_tmp19_ = committed;
 #line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp19_) {
-#line 21559 "Photo.c"
-				PhotoRow* _tmp20_ = NULL;
-				Orientation _tmp21_ = 0;
-				PhotoRow* _tmp22_ = NULL;
-				GeeHashMap* _tmp23_ = NULL;
-				GeeHashMap* _tmp24_ = NULL;
-				PixelTransformer* _tmp25_ = NULL;
-				PixelTransformer* _tmp26_ = NULL;
-				PixelTransformationBundle* _tmp27_ = NULL;
-				PixelTransformationBundle* _tmp28_ = NULL;
+#line 21563 "Photo.c"
+				PhotoRow* _tmp20_;
+				Orientation _tmp21_;
+				PhotoRow* _tmp22_;
+				GeeHashMap* _tmp23_;
+				GeeHashMap* _tmp24_;
+				PixelTransformer* _tmp25_;
+				PixelTransformer* _tmp26_;
+				PixelTransformationBundle* _tmp27_;
+				PixelTransformationBundle* _tmp28_;
 #line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = self->row;
 #line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21599,21 +21603,21 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 				_pixel_transformation_bundle_unref0 (self->priv->adjustments);
 #line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->adjustments = _tmp28_;
-#line 21601 "Photo.c"
+#line 21605 "Photo.c"
 			}
 		}
-		__finally369:
+		__finally370:
 		{
-			PhotoRow* _tmp29_ = NULL;
+			PhotoRow* _tmp29_;
 #line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = self->row;
 #line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21611 "Photo.c"
+#line 21615 "Photo.c"
 		}
 #line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 21615 "Photo.c"
+#line 21619 "Photo.c"
 			gboolean _tmp30_ = FALSE;
 #line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformation_bundle_unref0 (saved_adjustments);
@@ -21629,16 +21633,16 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 			g_clear_error (&_inner_error_);
 #line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp30_;
-#line 21631 "Photo.c"
+#line 21635 "Photo.c"
 		}
 	}
 #line 2798 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = committed;
 #line 2798 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp31_) {
-#line 21638 "Photo.c"
-		Alteration* _tmp32_ = NULL;
-		Alteration* _tmp33_ = NULL;
+#line 21642 "Photo.c"
+		Alteration* _tmp32_;
+		Alteration* _tmp33_;
 #line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32_ = alteration_new ("image", "transformation-state");
 #line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21647,7 +21651,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp33_);
 #line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp33_);
-#line 21649 "Photo.c"
+#line 21653 "Photo.c"
 	}
 #line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = committed;
@@ -21661,7 +21665,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 	_g_object_unref0 (state_impl);
 #line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 21663 "Photo.c"
+#line 21667 "Photo.c"
 }
 
 
@@ -21670,38 +21674,38 @@ void photo_remove_all_transformations (Photo* self) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 2805 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_internal_remove_all_transformations (self, TRUE);
-#line 21672 "Photo.c"
+#line 21676 "Photo.c"
 }
 
 
 static void photo_internal_remove_all_transformations (Photo* self, gboolean notify) {
 	gboolean is_altered = FALSE;
 	gboolean _tmp21_ = FALSE;
-	gboolean _tmp22_ = FALSE;
+	gboolean _tmp22_;
 	GError * _inner_error_ = NULL;
 #line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
 #line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_altered = FALSE;
-#line 21685 "Photo.c"
+#line 21689 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21692 "Photo.c"
-		{
-			PhotoTable* _tmp1_ = NULL;
-			PhotoTable* _tmp2_ = NULL;
-			PhotoRow* _tmp3_ = NULL;
-			PhotoID _tmp4_ = {0};
-			gboolean _tmp5_ = FALSE;
-			PhotoRow* _tmp6_ = NULL;
-			PhotoRow* _tmp7_ = NULL;
-			Orientation _tmp8_ = 0;
-			BackingPhotoRow* _tmp9_ = NULL;
-			Orientation _tmp10_ = 0;
+#line 21696 "Photo.c"
+		{
+			PhotoTable* _tmp1_;
+			PhotoTable* _tmp2_;
+			PhotoRow* _tmp3_;
+			PhotoID _tmp4_;
+			gboolean _tmp5_;
+			PhotoRow* _tmp6_;
+			PhotoRow* _tmp7_;
+			Orientation _tmp8_;
+			BackingPhotoRow* _tmp9_;
+			Orientation _tmp10_;
 #line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_table_get_instance ();
 #line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21740,16 +21744,16 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 			_tmp10_ = _tmp9_->original_orientation;
 #line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_ != _tmp10_) {
-#line 21742 "Photo.c"
-				PhotoTable* _tmp11_ = NULL;
-				PhotoTable* _tmp12_ = NULL;
-				PhotoRow* _tmp13_ = NULL;
-				PhotoID _tmp14_ = {0};
-				BackingPhotoRow* _tmp15_ = NULL;
-				Orientation _tmp16_ = 0;
-				PhotoRow* _tmp17_ = NULL;
-				BackingPhotoRow* _tmp18_ = NULL;
-				Orientation _tmp19_ = 0;
+#line 21746 "Photo.c"
+				PhotoTable* _tmp11_;
+				PhotoTable* _tmp12_;
+				PhotoRow* _tmp13_;
+				PhotoID _tmp14_;
+				BackingPhotoRow* _tmp15_;
+				Orientation _tmp16_;
+				PhotoRow* _tmp17_;
+				BackingPhotoRow* _tmp18_;
+				Orientation _tmp19_;
 #line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = photo_table_get_instance ();
 #line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21776,17 +21780,17 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 				_tmp17_->orientation = _tmp19_;
 #line 2821 "/home/jens/Source/shotwell/src/Photo.vala"
 				is_altered = TRUE;
-#line 21778 "Photo.c"
+#line 21782 "Photo.c"
 			}
 		}
-		__finally370:
+		__finally371:
 		{
-			PhotoRow* _tmp20_ = NULL;
+			PhotoRow* _tmp20_;
 #line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = self->row;
 #line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21788 "Photo.c"
+#line 21792 "Photo.c"
 		}
 #line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -21796,30 +21800,30 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 			g_clear_error (&_inner_error_);
 #line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 21798 "Photo.c"
+#line 21802 "Photo.c"
 		}
 	}
 #line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = is_altered;
 #line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_) {
-#line 21805 "Photo.c"
-		gboolean _tmp23_ = FALSE;
+#line 21809 "Photo.c"
+		gboolean _tmp23_;
 #line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = notify;
 #line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp23_;
-#line 21811 "Photo.c"
+#line 21815 "Photo.c"
 	} else {
 #line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = FALSE;
-#line 21815 "Photo.c"
+#line 21819 "Photo.c"
 	}
 #line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 21819 "Photo.c"
-		Alteration* _tmp24_ = NULL;
-		Alteration* _tmp25_ = NULL;
+#line 21823 "Photo.c"
+		Alteration* _tmp24_;
+		Alteration* _tmp25_;
 #line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = alteration_new ("image", "revert");
 #line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21828,7 +21832,7 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
 #line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp25_);
-#line 21830 "Photo.c"
+#line 21834 "Photo.c"
 	}
 }
 
@@ -21838,44 +21842,44 @@ Orientation photo_get_original_orientation (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 21840 "Photo.c"
+#line 21844 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21847 "Photo.c"
+#line 21851 "Photo.c"
 		{
-			BackingPhotoRow* _tmp1_ = NULL;
-			Orientation _tmp2_ = 0;
+			BackingPhotoRow* _tmp1_;
+			Orientation _tmp2_;
 #line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
 #line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->original_orientation;
 #line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 21857 "Photo.c"
+#line 21861 "Photo.c"
 			{
-				PhotoRow* _tmp3_ = NULL;
+				PhotoRow* _tmp3_;
 #line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21864 "Photo.c"
+#line 21868 "Photo.c"
 			}
 #line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21868 "Photo.c"
+#line 21872 "Photo.c"
 		}
-		__finally371:
+		__finally372:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21877 "Photo.c"
+#line 21881 "Photo.c"
 		}
 #line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -21883,7 +21887,7 @@ Orientation photo_get_original_orientation (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 21885 "Photo.c"
+#line 21889 "Photo.c"
 	}
 }
 
@@ -21893,44 +21897,44 @@ Orientation photo_get_orientation (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2835 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 21895 "Photo.c"
+#line 21899 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21902 "Photo.c"
+#line 21906 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			Orientation _tmp2_ = 0;
+			PhotoRow* _tmp1_;
+			Orientation _tmp2_;
 #line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->orientation;
 #line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 21912 "Photo.c"
+#line 21916 "Photo.c"
 			{
-				PhotoRow* _tmp3_ = NULL;
+				PhotoRow* _tmp3_;
 #line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21919 "Photo.c"
+#line 21923 "Photo.c"
 			}
 #line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21923 "Photo.c"
+#line 21927 "Photo.c"
 		}
-		__finally372:
+		__finally373:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21932 "Photo.c"
+#line 21936 "Photo.c"
 		}
 #line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -21938,7 +21942,7 @@ Orientation photo_get_orientation (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 21940 "Photo.c"
+#line 21944 "Photo.c"
 	}
 }
 
@@ -21946,24 +21950,24 @@ Orientation photo_get_orientation (Photo* self) {
 gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 	gboolean result = FALSE;
 	gboolean committed = FALSE;
-	gboolean _tmp15_ = FALSE;
+	gboolean _tmp15_;
 	GError * _inner_error_ = NULL;
 #line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 2842 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 21954 "Photo.c"
+#line 21958 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21961 "Photo.c"
+#line 21965 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			Orientation _tmp2_ = 0;
-			Orientation _tmp3_ = 0;
+			PhotoRow* _tmp1_;
+			Orientation _tmp2_;
+			Orientation _tmp3_;
 #line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21972,14 +21976,14 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 			_tmp3_ = orientation;
 #line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != _tmp3_) {
-#line 21974 "Photo.c"
-				PhotoTable* _tmp4_ = NULL;
-				PhotoTable* _tmp5_ = NULL;
-				PhotoRow* _tmp6_ = NULL;
-				PhotoID _tmp7_ = {0};
-				Orientation _tmp8_ = 0;
-				gboolean _tmp9_ = FALSE;
-				gboolean _tmp10_ = FALSE;
+#line 21978 "Photo.c"
+				PhotoTable* _tmp4_;
+				PhotoTable* _tmp5_;
+				PhotoRow* _tmp6_;
+				PhotoID _tmp7_;
+				Orientation _tmp8_;
+				gboolean _tmp9_;
+				gboolean _tmp10_;
 #line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = photo_table_get_instance ();
 #line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22000,31 +22004,31 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 				_tmp10_ = committed;
 #line 2846 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp10_) {
-#line 22002 "Photo.c"
-					PhotoRow* _tmp11_ = NULL;
-					Orientation _tmp12_ = 0;
+#line 22006 "Photo.c"
+					PhotoRow* _tmp11_;
+					Orientation _tmp12_;
 #line 2847 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = self->row;
 #line 2847 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = orientation;
 #line 2847 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_->orientation = _tmp12_;
-#line 22011 "Photo.c"
+#line 22015 "Photo.c"
 				}
 			}
 		}
-		__finally373:
+		__finally374:
 		{
-			PhotoRow* _tmp13_ = NULL;
+			PhotoRow* _tmp13_;
 #line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->row;
 #line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22022 "Photo.c"
+#line 22026 "Photo.c"
 		}
 #line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 22026 "Photo.c"
+#line 22030 "Photo.c"
 			gboolean _tmp14_ = FALSE;
 #line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -22032,16 +22036,16 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 			g_clear_error (&_inner_error_);
 #line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp14_;
-#line 22034 "Photo.c"
+#line 22038 "Photo.c"
 		}
 	}
 #line 2851 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = committed;
 #line 2851 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_) {
-#line 22041 "Photo.c"
-		Alteration* _tmp16_ = NULL;
-		Alteration* _tmp17_ = NULL;
+#line 22045 "Photo.c"
+		Alteration* _tmp16_;
+		Alteration* _tmp17_;
 #line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = alteration_new ("image", "orientation");
 #line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22050,19 +22054,19 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp17_);
 #line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp17_);
-#line 22052 "Photo.c"
+#line 22056 "Photo.c"
 	}
 #line 2854 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = committed;
 #line 2854 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22058 "Photo.c"
+#line 22062 "Photo.c"
 }
 
 
 gboolean photo_check_can_rotate (Photo* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 2857 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 2858 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22071,23 +22075,23 @@ gboolean photo_check_can_rotate (Photo* self) {
 	result = _tmp0_;
 #line 2858 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22073 "Photo.c"
+#line 22077 "Photo.c"
 }
 
 
 static void photo_real_rotate (Photo* self, Rotation rotation) {
 	GError * _inner_error_ = NULL;
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22085 "Photo.c"
+#line 22089 "Photo.c"
 		{
-			Orientation _tmp1_ = 0;
-			Rotation _tmp2_ = 0;
-			Orientation _tmp3_ = 0;
+			Orientation _tmp1_;
+			Rotation _tmp2_;
+			Orientation _tmp3_;
 #line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_get_orientation (self);
 #line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22096,16 +22100,16 @@ static void photo_real_rotate (Photo* self, Rotation rotation) {
 			_tmp3_ = orientation_perform (_tmp1_, _tmp2_);
 #line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_orientation (self, _tmp3_);
-#line 22098 "Photo.c"
+#line 22102 "Photo.c"
 		}
-		__finally374:
+		__finally375:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22107 "Photo.c"
+#line 22111 "Photo.c"
 		}
 #line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -22115,7 +22119,7 @@ static void photo_real_rotate (Photo* self, Rotation rotation) {
 			g_clear_error (&_inner_error_);
 #line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 22117 "Photo.c"
+#line 22121 "Photo.c"
 		}
 	}
 }
@@ -22126,7 +22130,7 @@ void photo_rotate (Photo* self, Rotation rotation) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->rotate (self, rotation);
-#line 22128 "Photo.c"
+#line 22132 "Photo.c"
 }
 
 
@@ -22137,30 +22141,30 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) {
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (name != NULL, FALSE);
-#line 22139 "Photo.c"
+#line 22143 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 		gboolean _tmp10_ = FALSE;
 #line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22147 "Photo.c"
+#line 22151 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
-			PhotoRow* _tmp2_ = NULL;
-			GeeHashMap* _tmp3_ = NULL;
+			PhotoRow* _tmp2_;
+			GeeHashMap* _tmp3_;
 #line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
 #line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->transformations;
 #line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 22158 "Photo.c"
-				PhotoRow* _tmp4_ = NULL;
-				GeeHashMap* _tmp5_ = NULL;
-				const gchar* _tmp6_ = NULL;
-				gboolean _tmp7_ = FALSE;
+#line 22162 "Photo.c"
+				PhotoRow* _tmp4_;
+				GeeHashMap* _tmp5_;
+				const gchar* _tmp6_;
+				gboolean _tmp7_;
 #line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22171,35 +22175,35 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) {
 				_tmp7_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_);
 #line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp7_;
-#line 22173 "Photo.c"
+#line 22177 "Photo.c"
 			} else {
 #line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 22177 "Photo.c"
+#line 22181 "Photo.c"
 			}
 #line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 22181 "Photo.c"
+#line 22185 "Photo.c"
 			{
-				PhotoRow* _tmp8_ = NULL;
+				PhotoRow* _tmp8_;
 #line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
 #line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22188 "Photo.c"
+#line 22192 "Photo.c"
 			}
 #line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 22192 "Photo.c"
+#line 22196 "Photo.c"
 		}
-		__finally375:
+		__finally376:
 		{
-			PhotoRow* _tmp9_ = NULL;
+			PhotoRow* _tmp9_;
 #line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
 #line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22201 "Photo.c"
+#line 22205 "Photo.c"
 		}
 #line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -22207,7 +22211,7 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) {
 		g_clear_error (&_inner_error_);
 #line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp10_;
-#line 22209 "Photo.c"
+#line 22213 "Photo.c"
 	}
 }
 
@@ -22222,29 +22226,29 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
 	g_return_val_if_fail (name != NULL, NULL);
 #line 2877 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = NULL;
-#line 22224 "Photo.c"
+#line 22228 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22231 "Photo.c"
+#line 22235 "Photo.c"
 		{
-			PhotoRow* _tmp1_ = NULL;
-			GeeHashMap* _tmp2_ = NULL;
+			PhotoRow* _tmp1_;
+			GeeHashMap* _tmp2_;
 #line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->transformations;
 #line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 22241 "Photo.c"
-				PhotoRow* _tmp3_ = NULL;
-				GeeHashMap* _tmp4_ = NULL;
-				const gchar* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
-				KeyValueMap* _tmp7_ = NULL;
+#line 22245 "Photo.c"
+				PhotoRow* _tmp3_;
+				GeeHashMap* _tmp4_;
+				const gchar* _tmp5_;
+				gpointer _tmp6_;
+				KeyValueMap* _tmp7_;
 #line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22261,9 +22265,9 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
 				_tmp7_ = map;
 #line 2881 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp7_ != NULL) {
-#line 22263 "Photo.c"
-					KeyValueMap* _tmp8_ = NULL;
-					KeyValueMap* _tmp9_ = NULL;
+#line 22267 "Photo.c"
+					KeyValueMap* _tmp8_;
+					KeyValueMap* _tmp9_;
 #line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = map;
 #line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22272,18 +22276,18 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
 					_key_value_map_unref0 (map);
 #line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
 					map = _tmp9_;
-#line 22274 "Photo.c"
+#line 22278 "Photo.c"
 				}
 			}
 		}
-		__finally376:
+		__finally377:
 		{
-			PhotoRow* _tmp10_ = NULL;
+			PhotoRow* _tmp10_;
 #line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = self->row;
 #line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22285 "Photo.c"
+#line 22289 "Photo.c"
 		}
 #line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -22295,14 +22299,14 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
 			g_clear_error (&_inner_error_);
 #line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 22297 "Photo.c"
+#line 22301 "Photo.c"
 		}
 	}
 #line 2886 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = map;
 #line 2886 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22304 "Photo.c"
+#line 22308 "Photo.c"
 }
 
 
@@ -22313,40 +22317,40 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 2889 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_KEY_VALUE_MAP (trans), FALSE);
-#line 22315 "Photo.c"
+#line 22319 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 		gboolean _tmp20_ = FALSE;
 #line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22323 "Photo.c"
-		{
-			PhotoRow* _tmp1_ = NULL;
-			GeeHashMap* _tmp2_ = NULL;
-			PhotoRow* _tmp5_ = NULL;
-			GeeHashMap* _tmp6_ = NULL;
-			KeyValueMap* _tmp7_ = NULL;
-			gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
-			KeyValueMap* _tmp10_ = NULL;
-			PhotoTable* _tmp11_ = NULL;
-			PhotoTable* _tmp12_ = NULL;
-			PhotoRow* _tmp13_ = NULL;
-			PhotoID _tmp14_ = {0};
-			KeyValueMap* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
-			gboolean _tmp17_ = FALSE;
+#line 22327 "Photo.c"
+		{
+			PhotoRow* _tmp1_;
+			GeeHashMap* _tmp2_;
+			PhotoRow* _tmp5_;
+			GeeHashMap* _tmp6_;
+			KeyValueMap* _tmp7_;
+			gchar* _tmp8_;
+			gchar* _tmp9_;
+			KeyValueMap* _tmp10_;
+			PhotoTable* _tmp11_;
+			PhotoTable* _tmp12_;
+			PhotoRow* _tmp13_;
+			PhotoID _tmp14_;
+			KeyValueMap* _tmp15_;
+			gboolean _tmp16_;
+			gboolean _tmp17_;
 #line 2891 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2891 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->transformations;
 #line 2891 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ == NULL) {
-#line 22346 "Photo.c"
-				PhotoRow* _tmp3_ = NULL;
-				GeeHashMap* _tmp4_ = NULL;
+#line 22350 "Photo.c"
+				PhotoRow* _tmp3_;
+				GeeHashMap* _tmp4_;
 #line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22355,7 +22359,7 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 				_g_object_unref0 (_tmp3_->transformations);
 #line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_->transformations = _tmp4_;
-#line 22357 "Photo.c"
+#line 22361 "Photo.c"
 			}
 #line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
@@ -22391,27 +22395,27 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 			_database_table_unref0 (_tmp12_);
 #line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp17_;
-#line 22393 "Photo.c"
+#line 22397 "Photo.c"
 			{
-				PhotoRow* _tmp18_ = NULL;
+				PhotoRow* _tmp18_;
 #line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = self->row;
 #line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22400 "Photo.c"
+#line 22404 "Photo.c"
 			}
 #line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 22404 "Photo.c"
+#line 22408 "Photo.c"
 		}
-		__finally377:
+		__finally378:
 		{
-			PhotoRow* _tmp19_ = NULL;
+			PhotoRow* _tmp19_;
 #line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = self->row;
 #line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22413 "Photo.c"
+#line 22417 "Photo.c"
 		}
 #line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -22419,7 +22423,7 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 		g_clear_error (&_inner_error_);
 #line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp20_;
-#line 22421 "Photo.c"
+#line 22425 "Photo.c"
 	}
 }
 
@@ -22429,44 +22433,44 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 	gboolean altered_cache = FALSE;
 	gboolean altered_persistent = FALSE;
 	gboolean _tmp20_ = FALSE;
-	gboolean _tmp21_ = FALSE;
+	gboolean _tmp21_;
 	GError * _inner_error_ = NULL;
 #line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (name != NULL, FALSE);
-#line 22437 "Photo.c"
+#line 22441 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22444 "Photo.c"
-		{
-			PhotoRow* _tmp1_ = NULL;
-			GeeHashMap* _tmp2_ = NULL;
-			PhotoTable* _tmp12_ = NULL;
-			PhotoTable* _tmp13_ = NULL;
-			PhotoRow* _tmp14_ = NULL;
-			PhotoID _tmp15_ = {0};
-			const gchar* _tmp16_ = NULL;
-			gboolean _tmp17_ = FALSE;
+#line 22448 "Photo.c"
+		{
+			PhotoRow* _tmp1_;
+			GeeHashMap* _tmp2_;
+			PhotoTable* _tmp12_;
+			PhotoTable* _tmp13_;
+			PhotoRow* _tmp14_;
+			PhotoID _tmp15_;
+			const gchar* _tmp16_;
+			gboolean _tmp17_;
 #line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
 #line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->transformations;
 #line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 22460 "Photo.c"
-				PhotoRow* _tmp3_ = NULL;
-				GeeHashMap* _tmp4_ = NULL;
-				const gchar* _tmp5_ = NULL;
-				gboolean _tmp6_ = FALSE;
-				PhotoRow* _tmp7_ = NULL;
-				GeeHashMap* _tmp8_ = NULL;
-				gint _tmp9_ = 0;
-				gint _tmp10_ = 0;
+#line 22464 "Photo.c"
+				PhotoRow* _tmp3_;
+				GeeHashMap* _tmp4_;
+				const gchar* _tmp5_;
+				gboolean _tmp6_;
+				PhotoRow* _tmp7_;
+				GeeHashMap* _tmp8_;
+				gint _tmp9_;
+				gint _tmp10_;
 #line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22487,20 +22491,20 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 				_tmp10_ = _tmp9_;
 #line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp10_ == 0) {
-#line 22489 "Photo.c"
-					PhotoRow* _tmp11_ = NULL;
+#line 22493 "Photo.c"
+					PhotoRow* _tmp11_;
 #line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = self->row;
 #line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp11_->transformations);
 #line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_->transformations = NULL;
-#line 22497 "Photo.c"
+#line 22501 "Photo.c"
 				}
 			} else {
 #line 2908 "/home/jens/Source/shotwell/src/Photo.vala"
 				altered_cache = FALSE;
-#line 22502 "Photo.c"
+#line 22506 "Photo.c"
 			}
 #line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_table_get_instance ();
@@ -22518,20 +22522,20 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 			altered_persistent = _tmp17_;
 #line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp13_);
-#line 22520 "Photo.c"
+#line 22524 "Photo.c"
 		}
-		__finally378:
+		__finally379:
 		{
-			PhotoRow* _tmp18_ = NULL;
+			PhotoRow* _tmp18_;
 #line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = self->row;
 #line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22529 "Photo.c"
+#line 22533 "Photo.c"
 		}
 #line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 22533 "Photo.c"
+#line 22537 "Photo.c"
 			gboolean _tmp19_ = FALSE;
 #line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -22539,7 +22543,7 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 			g_clear_error (&_inner_error_);
 #line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp19_;
-#line 22541 "Photo.c"
+#line 22545 "Photo.c"
 		}
 	}
 #line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22548,23 +22552,23 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 	if (_tmp21_) {
 #line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = TRUE;
-#line 22550 "Photo.c"
+#line 22554 "Photo.c"
 	} else {
 #line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = altered_persistent;
-#line 22554 "Photo.c"
+#line 22558 "Photo.c"
 	}
 #line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp20_;
 #line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22560 "Photo.c"
+#line 22564 "Photo.c"
 }
 
 
 gboolean photo_has_crop (Photo* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 2918 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 2919 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22573,7 +22577,7 @@ gboolean photo_has_crop (Photo* self) {
 	result = _tmp0_;
 #line 2919 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22575 "Photo.c"
+#line 22579 "Photo.c"
 }
 
 
@@ -22581,28 +22585,28 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
 	Box _vala_crop = {0};
 	gboolean result = FALSE;
 	KeyValueMap* map = NULL;
-	KeyValueMap* _tmp0_ = NULL;
-	KeyValueMap* _tmp1_ = NULL;
+	KeyValueMap* _tmp0_;
+	KeyValueMap* _tmp1_;
 	gint left = 0;
-	KeyValueMap* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	KeyValueMap* _tmp2_;
+	gint _tmp3_;
 	gint top = 0;
-	KeyValueMap* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	KeyValueMap* _tmp4_;
+	gint _tmp5_;
 	gint right = 0;
-	KeyValueMap* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
+	KeyValueMap* _tmp6_;
+	gint _tmp7_;
 	gint bottom = 0;
-	KeyValueMap* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
+	KeyValueMap* _tmp8_;
+	gint _tmp9_;
 	gboolean _tmp10_ = FALSE;
 	gboolean _tmp11_ = FALSE;
 	gboolean _tmp12_ = FALSE;
-	gint _tmp13_ = 0;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
+	gint _tmp13_;
+	gint _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
 #line 2923 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 2924 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22623,11 +22627,11 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
 		if (crop) {
 #line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
 			*crop = _vala_crop;
-#line 22625 "Photo.c"
+#line 22629 "Photo.c"
 		}
 #line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22629 "Photo.c"
+#line 22633 "Photo.c"
 	}
 #line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = map;
@@ -22659,40 +22663,40 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
 	if (_tmp13_ == -1) {
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = TRUE;
-#line 22661 "Photo.c"
+#line 22665 "Photo.c"
 	} else {
-		gint _tmp14_ = 0;
+		gint _tmp14_;
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = top;
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp14_ == -1;
-#line 22668 "Photo.c"
+#line 22672 "Photo.c"
 	}
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = TRUE;
-#line 22674 "Photo.c"
+#line 22678 "Photo.c"
 	} else {
-		gint _tmp15_ = 0;
+		gint _tmp15_;
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = right;
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp15_ == -1;
-#line 22681 "Photo.c"
+#line 22685 "Photo.c"
 	}
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = TRUE;
-#line 22687 "Photo.c"
+#line 22691 "Photo.c"
 	} else {
-		gint _tmp16_ = 0;
+		gint _tmp16_;
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = bottom;
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp16_ == -1;
-#line 22694 "Photo.c"
+#line 22698 "Photo.c"
 	}
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
@@ -22704,11 +22708,11 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
 		if (crop) {
 #line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
 			*crop = _vala_crop;
-#line 22706 "Photo.c"
+#line 22710 "Photo.c"
 		}
 #line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22710 "Photo.c"
+#line 22714 "Photo.c"
 	}
 #line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = left;
@@ -22728,31 +22732,31 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
 	if (crop) {
 #line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
 		*crop = _vala_crop;
-#line 22730 "Photo.c"
+#line 22734 "Photo.c"
 	}
 #line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22734 "Photo.c"
+#line 22738 "Photo.c"
 }
 
 
 static void photo_set_raw_crop (Photo* self, Box* crop) {
 	KeyValueMap* map = NULL;
-	KeyValueMap* _tmp0_ = NULL;
-	KeyValueMap* _tmp1_ = NULL;
-	Box _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	KeyValueMap* _tmp4_ = NULL;
-	Box _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	KeyValueMap* _tmp7_ = NULL;
-	Box _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	KeyValueMap* _tmp10_ = NULL;
-	Box _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	KeyValueMap* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
+	KeyValueMap* _tmp0_;
+	KeyValueMap* _tmp1_;
+	Box _tmp2_;
+	gint _tmp3_;
+	KeyValueMap* _tmp4_;
+	Box _tmp5_;
+	gint _tmp6_;
+	KeyValueMap* _tmp7_;
+	Box _tmp8_;
+	gint _tmp9_;
+	KeyValueMap* _tmp10_;
+	Box _tmp11_;
+	gint _tmp12_;
+	KeyValueMap* _tmp13_;
+	gboolean _tmp14_;
 #line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
 #line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22799,9 +22803,9 @@ static void photo_set_raw_crop (Photo* self, Box* crop) {
 	_tmp14_ = photo_set_transformation (self, _tmp13_);
 #line 2951 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp14_) {
-#line 22801 "Photo.c"
-		Alteration* _tmp15_ = NULL;
-		Alteration* _tmp16_ = NULL;
+#line 22805 "Photo.c"
+		Alteration* _tmp15_;
+		Alteration* _tmp16_;
 #line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = alteration_new ("image", "crop");
 #line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22810,11 +22814,11 @@ static void photo_set_raw_crop (Photo* self, Box* crop) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp16_);
 #line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp16_);
-#line 22812 "Photo.c"
+#line 22816 "Photo.c"
 	}
 #line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 22816 "Photo.c"
+#line 22820 "Photo.c"
 }
 
 
@@ -22822,10 +22826,10 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) {
 	gdouble _vala_angle = 0.0;
 	gboolean result = FALSE;
 	KeyValueMap* map = NULL;
-	KeyValueMap* _tmp0_ = NULL;
-	KeyValueMap* _tmp1_ = NULL;
-	KeyValueMap* _tmp2_ = NULL;
-	gdouble _tmp3_ = 0.0;
+	KeyValueMap* _tmp0_;
+	KeyValueMap* _tmp1_;
+	KeyValueMap* _tmp2_;
+	gdouble _tmp3_;
 #line 2955 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 2956 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22846,11 +22850,11 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) {
 		if (angle) {
 #line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
 			*angle = _vala_angle;
-#line 22848 "Photo.c"
+#line 22852 "Photo.c"
 		}
 #line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22852 "Photo.c"
+#line 22856 "Photo.c"
 	}
 #line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = map;
@@ -22866,21 +22870,21 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) {
 	if (angle) {
 #line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
 		*angle = _vala_angle;
-#line 22868 "Photo.c"
+#line 22872 "Photo.c"
 	}
 #line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22872 "Photo.c"
+#line 22876 "Photo.c"
 }
 
 
 static void photo_set_raw_straighten (Photo* self, gdouble theta) {
 	KeyValueMap* map = NULL;
-	KeyValueMap* _tmp0_ = NULL;
-	KeyValueMap* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	KeyValueMap* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	KeyValueMap* _tmp0_;
+	KeyValueMap* _tmp1_;
+	gdouble _tmp2_;
+	KeyValueMap* _tmp3_;
+	gboolean _tmp4_;
 #line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
 #line 2969 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22899,9 +22903,9 @@ static void photo_set_raw_straighten (Photo* self, gdouble theta) {
 	_tmp4_ = photo_set_transformation (self, _tmp3_);
 #line 2972 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp4_) {
-#line 22901 "Photo.c"
-		Alteration* _tmp5_ = NULL;
-		Alteration* _tmp6_ = NULL;
+#line 22905 "Photo.c"
+		Alteration* _tmp5_;
+		Alteration* _tmp6_;
 #line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = alteration_new ("image", "straighten");
 #line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22910,32 +22914,32 @@ static void photo_set_raw_straighten (Photo* self, gdouble theta) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp6_);
 #line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp6_);
-#line 22912 "Photo.c"
+#line 22916 "Photo.c"
 	}
 #line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 22916 "Photo.c"
+#line 22920 "Photo.c"
 }
 
 
 static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, int* result_length1) {
 	EditingToolsRedeyeInstance* result = NULL;
 	KeyValueMap* map = NULL;
-	KeyValueMap* _tmp0_ = NULL;
-	KeyValueMap* _tmp1_ = NULL;
+	KeyValueMap* _tmp0_;
+	KeyValueMap* _tmp1_;
 	gint num_points = 0;
-	KeyValueMap* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	KeyValueMap* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 	EditingToolsRedeyeInstance* res = NULL;
-	gint _tmp7_ = 0;
-	EditingToolsRedeyeInstance* _tmp8_ = NULL;
-	gint res_length1 = 0;
-	gint _res_size_ = 0;
+	gint _tmp7_;
+	EditingToolsRedeyeInstance* _tmp8_;
+	gint res_length1;
+	gint _res_size_;
 	GdkPoint default_point = {0};
 	GdkPoint _tmp9_ = {0};
-	EditingToolsRedeyeInstance* _tmp47_ = NULL;
-	gint _tmp47__length1 = 0;
+	EditingToolsRedeyeInstance* _tmp47_;
+	gint _tmp47__length1;
 #line 2978 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22946,10 +22950,10 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 	_tmp1_ = map;
 #line 2980 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 22948 "Photo.c"
-		EditingToolsRedeyeInstance* _tmp2_ = NULL;
-		EditingToolsRedeyeInstance* _tmp3_ = NULL;
-		gint _tmp3__length1 = 0;
+#line 22952 "Photo.c"
+		EditingToolsRedeyeInstance* _tmp2_;
+		EditingToolsRedeyeInstance* _tmp3_;
+		gint _tmp3__length1;
 #line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = g_new0 (EditingToolsRedeyeInstance, 0);
 #line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22960,7 +22964,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 		if (result_length1) {
 #line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result_length1 = _tmp3__length1;
-#line 22962 "Photo.c"
+#line 22966 "Photo.c"
 		}
 #line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp3_;
@@ -22968,7 +22972,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 		_key_value_map_unref0 (map);
 #line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22970 "Photo.c"
+#line 22974 "Photo.c"
 	}
 #line 2983 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
@@ -22998,70 +23002,70 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 	default_point.x = -1;
 #line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
 	default_point.y = -1;
-#line 23000 "Photo.c"
+#line 23004 "Photo.c"
 	{
 		gint i = 0;
 #line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 		i = 0;
-#line 23005 "Photo.c"
+#line 23009 "Photo.c"
 		{
 			gboolean _tmp10_ = FALSE;
 #line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = TRUE;
 #line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 23012 "Photo.c"
-				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
+#line 23016 "Photo.c"
+				gint _tmp12_;
+				gint _tmp13_;
 				gchar* center_key = NULL;
-				gint _tmp14_ = 0;
-				gchar* _tmp15_ = NULL;
+				gint _tmp14_;
+				gchar* _tmp15_;
 				gchar* radius_key = NULL;
-				gint _tmp16_ = 0;
-				gchar* _tmp17_ = NULL;
-				EditingToolsRedeyeInstance* _tmp18_ = NULL;
-				gint _tmp18__length1 = 0;
-				gint _tmp19_ = 0;
-				KeyValueMap* _tmp20_ = NULL;
-				const gchar* _tmp21_ = NULL;
-				GdkPoint _tmp22_ = {0};
+				gint _tmp16_;
+				gchar* _tmp17_;
+				EditingToolsRedeyeInstance* _tmp18_;
+				gint _tmp18__length1;
+				gint _tmp19_;
+				KeyValueMap* _tmp20_;
+				const gchar* _tmp21_;
+				GdkPoint _tmp22_;
 				GdkPoint _tmp23_ = {0};
-				EditingToolsRedeyeInstance* _tmp24_ = NULL;
-				gint _tmp24__length1 = 0;
-				gint _tmp25_ = 0;
-				EditingToolsRedeyeInstance _tmp26_ = {0};
-				GdkPoint _tmp27_ = {0};
-				gint _tmp28_ = 0;
-				GdkPoint _tmp29_ = {0};
-				gint _tmp30_ = 0;
-				EditingToolsRedeyeInstance* _tmp31_ = NULL;
-				gint _tmp31__length1 = 0;
-				gint _tmp32_ = 0;
-				EditingToolsRedeyeInstance _tmp33_ = {0};
-				GdkPoint _tmp34_ = {0};
-				gint _tmp35_ = 0;
-				GdkPoint _tmp36_ = {0};
-				gint _tmp37_ = 0;
-				EditingToolsRedeyeInstance* _tmp38_ = NULL;
-				gint _tmp38__length1 = 0;
-				gint _tmp39_ = 0;
-				KeyValueMap* _tmp40_ = NULL;
-				const gchar* _tmp41_ = NULL;
-				gint _tmp42_ = 0;
-				EditingToolsRedeyeInstance* _tmp43_ = NULL;
-				gint _tmp43__length1 = 0;
-				gint _tmp44_ = 0;
-				EditingToolsRedeyeInstance _tmp45_ = {0};
-				gint _tmp46_ = 0;
+				EditingToolsRedeyeInstance* _tmp24_;
+				gint _tmp24__length1;
+				gint _tmp25_;
+				EditingToolsRedeyeInstance _tmp26_;
+				GdkPoint _tmp27_;
+				gint _tmp28_;
+				GdkPoint _tmp29_;
+				gint _tmp30_;
+				EditingToolsRedeyeInstance* _tmp31_;
+				gint _tmp31__length1;
+				gint _tmp32_;
+				EditingToolsRedeyeInstance _tmp33_;
+				GdkPoint _tmp34_;
+				gint _tmp35_;
+				GdkPoint _tmp36_;
+				gint _tmp37_;
+				EditingToolsRedeyeInstance* _tmp38_;
+				gint _tmp38__length1;
+				gint _tmp39_;
+				KeyValueMap* _tmp40_;
+				const gchar* _tmp41_;
+				gint _tmp42_;
+				EditingToolsRedeyeInstance* _tmp43_;
+				gint _tmp43__length1;
+				gint _tmp44_;
+				EditingToolsRedeyeInstance _tmp45_;
+				gint _tmp46_;
 #line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp10_) {
-#line 23057 "Photo.c"
-					gint _tmp11_ = 0;
+#line 23061 "Photo.c"
+					gint _tmp11_;
 #line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = i;
 #line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 					i = _tmp11_ + 1;
-#line 23063 "Photo.c"
+#line 23067 "Photo.c"
 				}
 #line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = FALSE;
@@ -23073,7 +23077,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 				if (!(_tmp12_ < _tmp13_)) {
 #line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 23075 "Photo.c"
+#line 23079 "Photo.c"
 				}
 #line 2993 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = i;
@@ -23169,7 +23173,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 				_g_free0 (radius_key);
 #line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (center_key);
-#line 23171 "Photo.c"
+#line 23175 "Photo.c"
 			}
 		}
 	}
@@ -23181,7 +23185,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 	if (result_length1) {
 #line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result_length1 = _tmp47__length1;
-#line 23183 "Photo.c"
+#line 23187 "Photo.c"
 	}
 #line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp47_;
@@ -23189,13 +23193,13 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 	_key_value_map_unref0 (map);
 #line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23191 "Photo.c"
+#line 23195 "Photo.c"
 }
 
 
 gboolean photo_has_redeye_transformations (Photo* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 3007 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 3008 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23204,37 +23208,37 @@ gboolean photo_has_redeye_transformations (Photo* self) {
 	result = _tmp0_;
 #line 3008 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23206 "Photo.c"
+#line 23210 "Photo.c"
 }
 
 
 void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) {
 	KeyValueMap* map = NULL;
-	KeyValueMap* _tmp0_ = NULL;
-	KeyValueMap* _tmp1_ = NULL;
+	KeyValueMap* _tmp0_;
+	KeyValueMap* _tmp1_;
 	gint num_points = 0;
-	KeyValueMap* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	KeyValueMap* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	gchar* radius_key = NULL;
-	gint _tmp8_ = 0;
-	gchar* _tmp9_ = NULL;
+	gint _tmp8_;
+	gchar* _tmp9_;
 	gchar* center_key = NULL;
-	gint _tmp10_ = 0;
-	gchar* _tmp11_ = NULL;
-	KeyValueMap* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	EditingToolsRedeyeInstance _tmp14_ = {0};
-	gint _tmp15_ = 0;
-	KeyValueMap* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-	EditingToolsRedeyeInstance _tmp18_ = {0};
-	GdkPoint _tmp19_ = {0};
-	KeyValueMap* _tmp20_ = NULL;
-	gint _tmp21_ = 0;
-	KeyValueMap* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
+	gint _tmp10_;
+	gchar* _tmp11_;
+	KeyValueMap* _tmp12_;
+	const gchar* _tmp13_;
+	EditingToolsRedeyeInstance _tmp14_;
+	gint _tmp15_;
+	KeyValueMap* _tmp16_;
+	const gchar* _tmp17_;
+	EditingToolsRedeyeInstance _tmp18_;
+	GdkPoint _tmp19_;
+	KeyValueMap* _tmp20_;
+	gint _tmp21_;
+	KeyValueMap* _tmp22_;
+	gboolean _tmp23_;
 #line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
 #line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23247,9 +23251,9 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
 	_tmp1_ = map;
 #line 3014 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 23249 "Photo.c"
-		KeyValueMap* _tmp2_ = NULL;
-		KeyValueMap* _tmp3_ = NULL;
+#line 23253 "Photo.c"
+		KeyValueMap* _tmp2_;
+		KeyValueMap* _tmp3_;
 #line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = key_value_map_new ("redeye");
 #line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23260,7 +23264,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
 		_tmp3_ = map;
 #line 3016 "/home/jens/Source/shotwell/src/Photo.vala"
 		key_value_map_set_int (_tmp3_, "num_points", 0);
-#line 23262 "Photo.c"
+#line 23266 "Photo.c"
 	}
 #line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
@@ -23320,9 +23324,9 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
 	_tmp23_ = photo_set_transformation (self, _tmp22_);
 #line 3032 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp23_) {
-#line 23322 "Photo.c"
-		Alteration* _tmp24_ = NULL;
-		Alteration* _tmp25_ = NULL;
+#line 23326 "Photo.c"
+		Alteration* _tmp24_;
+		Alteration* _tmp25_;
 #line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = alteration_new ("image", "redeye");
 #line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23331,7 +23335,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
 #line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp25_);
-#line 23333 "Photo.c"
+#line 23337 "Photo.c"
 	}
 #line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (center_key);
@@ -23339,7 +23343,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
 	_g_free0 (radius_key);
 #line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 23341 "Photo.c"
+#line 23345 "Photo.c"
 }
 
 
@@ -23352,21 +23356,21 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 23354 "Photo.c"
+#line 23358 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 		gboolean _tmp8_ = FALSE;
 #line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 23362 "Photo.c"
+#line 23366 "Photo.c"
 		{
-			Scaling _tmp1_ = {0};
-			PhotoException _tmp2_ = 0;
+			Scaling _tmp1_;
+			PhotoException _tmp2_;
 			Dimensions _tmp3_ = {0};
 			Dimensions _tmp4_ = {0};
-			gboolean _tmp5_ = FALSE;
+			gboolean _tmp5_;
 #line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = *scaling;
 #line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23379,39 +23383,39 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling
 			_vala_scaled_to_viewport = _tmp4_;
 #line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp5_;
-#line 23381 "Photo.c"
+#line 23385 "Photo.c"
 			{
-				PhotoRow* _tmp6_ = NULL;
+				PhotoRow* _tmp6_;
 #line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
 #line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 23388 "Photo.c"
+#line 23392 "Photo.c"
 			}
 #line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (scaled_image) {
 #line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 				*scaled_image = _vala_scaled_image;
-#line 23394 "Photo.c"
+#line 23398 "Photo.c"
 			}
 #line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (scaled_to_viewport) {
 #line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 				*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23400 "Photo.c"
+#line 23404 "Photo.c"
 			}
 #line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 23404 "Photo.c"
+#line 23408 "Photo.c"
 		}
-		__finally379:
+		__finally380:
 		{
-			PhotoRow* _tmp7_ = NULL;
+			PhotoRow* _tmp7_;
 #line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
 #line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 23413 "Photo.c"
+#line 23417 "Photo.c"
 		}
 #line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -23419,19 +23423,19 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling
 		g_clear_error (&_inner_error_);
 #line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp8_;
-#line 23421 "Photo.c"
+#line 23425 "Photo.c"
 	}
 #line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_image) {
 #line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_image = _vala_scaled_image;
-#line 23427 "Photo.c"
+#line 23431 "Photo.c"
 	}
 #line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_to_viewport) {
 #line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23433 "Photo.c"
+#line 23437 "Photo.c"
 	}
 }
 
@@ -23442,19 +23446,19 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 	gboolean result = FALSE;
 	Dimensions raw = {0};
 	Dimensions _tmp0_ = {0};
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	Orientation orientation = 0;
-	Orientation _tmp4_ = 0;
-	PhotoException _tmp5_ = 0;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp38_ = FALSE;
+	Orientation _tmp4_;
+	PhotoException _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp38_;
 	gboolean _tmp53_ = FALSE;
-	Dimensions _tmp54_ = {0};
-	gint _tmp55_ = 0;
-	Dimensions _tmp56_ = {0};
-	gint _tmp57_ = 0;
-	gboolean _tmp63_ = FALSE;
-	gboolean _tmp64_ = FALSE;
+	Dimensions _tmp54_;
+	gint _tmp55_;
+	Dimensions _tmp56_;
+	gint _tmp57_;
+	gboolean _tmp63_;
+	gboolean _tmp64_;
 #line 3057 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 3057 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23467,9 +23471,9 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 	_tmp1_ = scaling_is_unscaled (scaling);
 #line 3061 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 23469 "Photo.c"
-		Dimensions _tmp2_ = {0};
-		Dimensions _tmp3_ = {0};
+#line 23473 "Photo.c"
+		Dimensions _tmp2_;
+		Dimensions _tmp3_;
 #line 3062 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = raw;
 #line 3062 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23484,17 +23488,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 		if (scaled_image) {
 #line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_image = _vala_scaled_image;
-#line 23486 "Photo.c"
+#line 23490 "Photo.c"
 		}
 #line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (scaled_to_viewport) {
 #line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23492 "Photo.c"
+#line 23496 "Photo.c"
 		}
 #line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23496 "Photo.c"
+#line 23500 "Photo.c"
 	}
 #line 3068 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_get_orientation (self);
@@ -23510,34 +23514,34 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 	_tmp6_ = photo_exception_allows (_tmp5_, PHOTO_EXCEPTION_CROP);
 #line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 23512 "Photo.c"
+#line 23516 "Photo.c"
 		Box crop = {0};
 		Box _tmp7_ = {0};
-		gboolean _tmp8_ = FALSE;
+		gboolean _tmp8_;
 #line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = photo_get_raw_crop (self, &_tmp7_);
 #line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
 		crop = _tmp7_;
 #line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp8_) {
-#line 23522 "Photo.c"
+#line 23526 "Photo.c"
 			Dimensions rotated_raw = {0};
-			Dimensions _tmp9_ = {0};
-			PhotoException _tmp10_ = 0;
-			gboolean _tmp11_ = FALSE;
+			Dimensions _tmp9_;
+			PhotoException _tmp10_;
+			gboolean _tmp11_;
 			Box scaled_crop = {0};
 			Dimensions _tmp19_ = {0};
 			Dimensions _tmp20_ = {0};
 			Box _tmp21_ = {0};
 			Dimensions _tmp22_ = {0};
 			gboolean _tmp23_ = FALSE;
-			gint _tmp24_ = 0;
-			gint _tmp25_ = 0;
+			gint _tmp24_;
+			gint _tmp25_;
 			Dimensions _tmp30_ = {0};
 			Dimensions _tmp31_ = {0};
 			Dimensions _tmp32_ = {0};
-			PhotoException _tmp33_ = 0;
-			gboolean _tmp34_ = FALSE;
+			PhotoException _tmp33_;
+			gboolean _tmp34_;
 #line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = raw;
 #line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23548,13 +23552,13 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 			_tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_ORIENTATION);
 #line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp11_) {
-#line 23550 "Photo.c"
-				Orientation _tmp12_ = 0;
-				Dimensions _tmp13_ = {0};
-				Box _tmp14_ = {0};
+#line 23554 "Photo.c"
+				Orientation _tmp12_;
+				Dimensions _tmp13_;
+				Box _tmp14_;
 				Box _tmp15_ = {0};
-				Orientation _tmp16_ = 0;
-				Dimensions _tmp17_ = {0};
+				Orientation _tmp16_;
+				Dimensions _tmp17_;
 				Dimensions _tmp18_ = {0};
 #line 3083 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = orientation;
@@ -23574,7 +23578,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 				orientation_rotate_dimensions (_tmp16_, &_tmp17_, &_tmp18_);
 #line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
 				rotated_raw = _tmp18_;
-#line 23576 "Photo.c"
+#line 23580 "Photo.c"
 			}
 #line 3088 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&crop, &_tmp19_);
@@ -23594,25 +23598,25 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 			_tmp25_ = box_get_width (&scaled_crop);
 #line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp24_ <= _tmp25_) {
-#line 23596 "Photo.c"
-				gint _tmp26_ = 0;
-				gint _tmp27_ = 0;
+#line 23600 "Photo.c"
+				gint _tmp26_;
+				gint _tmp27_;
 #line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = box_get_height (&crop);
 #line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = box_get_height (&scaled_crop);
 #line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = _tmp26_ <= _tmp27_;
-#line 23605 "Photo.c"
+#line 23609 "Photo.c"
 			} else {
 #line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = FALSE;
-#line 23609 "Photo.c"
+#line 23613 "Photo.c"
 			}
 #line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp23_) {
-#line 23613 "Photo.c"
-				Dimensions _tmp28_ = {0};
+#line 23617 "Photo.c"
+				Dimensions _tmp28_;
 				Dimensions _tmp29_ = {0};
 #line 3096 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = raw;
@@ -23628,17 +23632,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 				if (scaled_image) {
 #line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
 					*scaled_image = _vala_scaled_image;
-#line 23630 "Photo.c"
+#line 23634 "Photo.c"
 				}
 #line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (scaled_to_viewport) {
 #line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
 					*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23636 "Photo.c"
+#line 23640 "Photo.c"
 				}
 #line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 23640 "Photo.c"
+#line 23644 "Photo.c"
 			}
 #line 3104 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&crop, &_tmp30_);
@@ -23654,9 +23658,9 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 			_tmp34_ = photo_exception_allows (_tmp33_, PHOTO_EXCEPTION_ORIENTATION);
 #line 3108 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp34_) {
-#line 23656 "Photo.c"
-				Orientation _tmp35_ = 0;
-				Dimensions _tmp36_ = {0};
+#line 23660 "Photo.c"
+				Orientation _tmp35_;
+				Dimensions _tmp36_;
 				Dimensions _tmp37_ = {0};
 #line 3109 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = orientation;
@@ -23666,7 +23670,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 				orientation_derotate_dimensions (_tmp35_, &_tmp36_, &_tmp37_);
 #line 3109 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_scaled_image = _tmp37_;
-#line 23668 "Photo.c"
+#line 23672 "Photo.c"
 			}
 		}
 	}
@@ -23674,16 +23678,16 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 	_tmp38_ = dimensions_has_area (&_vala_scaled_image);
 #line 3114 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp38_) {
-#line 23676 "Photo.c"
+#line 23680 "Photo.c"
 		Dimensions rotated_raw = {0};
-		Dimensions _tmp39_ = {0};
-		PhotoException _tmp40_ = 0;
-		gboolean _tmp41_ = FALSE;
-		Dimensions _tmp45_ = {0};
+		Dimensions _tmp39_;
+		PhotoException _tmp40_;
+		gboolean _tmp41_;
+		Dimensions _tmp45_;
 		Dimensions _tmp46_ = {0};
-		Dimensions _tmp47_ = {0};
-		PhotoException _tmp48_ = 0;
-		gboolean _tmp49_ = FALSE;
+		Dimensions _tmp47_;
+		PhotoException _tmp48_;
+		gboolean _tmp49_;
 #line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = raw;
 #line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23694,9 +23698,9 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 		_tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_ORIENTATION);
 #line 3117 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp41_) {
-#line 23696 "Photo.c"
-			Orientation _tmp42_ = 0;
-			Dimensions _tmp43_ = {0};
+#line 23700 "Photo.c"
+			Orientation _tmp42_;
+			Dimensions _tmp43_;
 			Dimensions _tmp44_ = {0};
 #line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = orientation;
@@ -23706,7 +23710,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 			orientation_rotate_dimensions (_tmp42_, &_tmp43_, &_tmp44_);
 #line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
 			rotated_raw = _tmp44_;
-#line 23708 "Photo.c"
+#line 23712 "Photo.c"
 		}
 #line 3120 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = rotated_raw;
@@ -23724,9 +23728,9 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 		_tmp49_ = photo_exception_allows (_tmp48_, PHOTO_EXCEPTION_ORIENTATION);
 #line 3124 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp49_) {
-#line 23726 "Photo.c"
-			Orientation _tmp50_ = 0;
-			Dimensions _tmp51_ = {0};
+#line 23730 "Photo.c"
+			Orientation _tmp50_;
+			Dimensions _tmp51_;
 			Dimensions _tmp52_ = {0};
 #line 3125 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp50_ = orientation;
@@ -23736,7 +23740,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 			orientation_derotate_dimensions (_tmp50_, &_tmp51_, &_tmp52_);
 #line 3125 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_scaled_image = _tmp52_;
-#line 23738 "Photo.c"
+#line 23742 "Photo.c"
 		}
 	}
 #line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23749,11 +23753,11 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 	_tmp57_ = _tmp56_.width;
 #line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp55_ >= _tmp57_) {
-#line 23751 "Photo.c"
-		Dimensions _tmp58_ = {0};
-		gint _tmp59_ = 0;
-		Dimensions _tmp60_ = {0};
-		gint _tmp61_ = 0;
+#line 23755 "Photo.c"
+		Dimensions _tmp58_;
+		gint _tmp59_;
+		Dimensions _tmp60_;
+		gint _tmp61_;
 #line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = _vala_scaled_image;
 #line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23764,16 +23768,16 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 		_tmp61_ = _tmp60_.height;
 #line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = _tmp59_ >= _tmp61_;
-#line 23766 "Photo.c"
+#line 23770 "Photo.c"
 	} else {
 #line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = FALSE;
-#line 23770 "Photo.c"
+#line 23774 "Photo.c"
 	}
 #line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp53_) {
-#line 23774 "Photo.c"
-		Dimensions _tmp62_ = {0};
+#line 23778 "Photo.c"
+		Dimensions _tmp62_;
 #line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = raw;
 #line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23784,17 +23788,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 		if (scaled_image) {
 #line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_image = _vala_scaled_image;
-#line 23786 "Photo.c"
+#line 23790 "Photo.c"
 		}
 #line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (scaled_to_viewport) {
 #line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23792 "Photo.c"
+#line 23796 "Photo.c"
 		}
 #line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23796 "Photo.c"
+#line 23800 "Photo.c"
 	}
 #line 3135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp63_ = dimensions_has_area (&_vala_scaled_image);
@@ -23810,43 +23814,43 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 	if (scaled_image) {
 #line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_image = _vala_scaled_image;
-#line 23812 "Photo.c"
+#line 23816 "Photo.c"
 	}
 #line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_to_viewport) {
 #line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23818 "Photo.c"
+#line 23822 "Photo.c"
 	}
 #line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23822 "Photo.c"
+#line 23826 "Photo.c"
 }
 
 
 static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error) {
 	GdkPixbuf* result = NULL;
 	PhotoFileReader* loader = NULL;
-	BackingFetchMode _tmp0_ = 0;
-	PhotoFileReader* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	BackingFetchMode _tmp0_;
+	PhotoFileReader* _tmp1_;
+	gboolean _tmp2_;
 	Dimensions scaled_image = {0};
 	Dimensions scaled_to_viewport = {0};
 	gboolean is_scaled = FALSE;
-	Scaling _tmp7_ = {0};
-	PhotoException _tmp8_ = 0;
+	Scaling _tmp7_;
+	PhotoException _tmp8_;
 	Dimensions _tmp9_ = {0};
 	Dimensions _tmp10_ = {0};
-	gboolean _tmp11_ = FALSE;
-	gboolean _tmp12_ = FALSE;
+	gboolean _tmp11_;
+	gboolean _tmp12_;
 	GdkPixbuf* pixbuf = NULL;
-	PhotoFileReader* _tmp17_ = NULL;
+	PhotoFileReader* _tmp17_;
 	Dimensions _tmp18_ = {0};
-	Dimensions _tmp19_ = {0};
-	GdkPixbuf* _tmp20_ = NULL;
-	GdkPixbuf* _tmp21_ = NULL;
+	Dimensions _tmp19_;
+	GdkPixbuf* _tmp20_;
+	GdkPixbuf* _tmp21_;
 	Dimensions _tmp22_ = {0};
-	gboolean _tmp23_ = FALSE;
+	gboolean _tmp23_;
 	GError * _inner_error_ = NULL;
 #line 3144 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -23862,11 +23866,11 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 	_tmp2_ = scaling_is_unscaled (scaling);
 #line 3150 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 23864 "Photo.c"
+#line 23868 "Photo.c"
 		GdkPixbuf* _tmp3_ = NULL;
-		PhotoFileReader* _tmp4_ = NULL;
-		GdkPixbuf* _tmp5_ = NULL;
-		GdkPixbuf* _tmp6_ = NULL;
+		PhotoFileReader* _tmp4_;
+		GdkPixbuf* _tmp5_;
+		GdkPixbuf* _tmp6_;
 #line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = loader;
 #line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23881,7 +23885,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 			_photo_file_adapter_unref0 (loader);
 #line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 23883 "Photo.c"
+#line 23887 "Photo.c"
 		}
 #line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp3_;
@@ -23895,7 +23899,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 		_photo_file_adapter_unref0 (loader);
 #line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23897 "Photo.c"
+#line 23901 "Photo.c"
 	}
 #line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = *scaling;
@@ -23913,11 +23917,11 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 	_tmp12_ = is_scaled;
 #line 3162 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp12_) {
-#line 23915 "Photo.c"
+#line 23919 "Photo.c"
 		GdkPixbuf* _tmp13_ = NULL;
-		PhotoFileReader* _tmp14_ = NULL;
-		GdkPixbuf* _tmp15_ = NULL;
-		GdkPixbuf* _tmp16_ = NULL;
+		PhotoFileReader* _tmp14_;
+		GdkPixbuf* _tmp15_;
+		GdkPixbuf* _tmp16_;
 #line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = loader;
 #line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23932,7 +23936,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 			_photo_file_adapter_unref0 (loader);
 #line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 23934 "Photo.c"
+#line 23938 "Photo.c"
 		}
 #line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp13_;
@@ -23946,7 +23950,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 		_photo_file_adapter_unref0 (loader);
 #line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23948 "Photo.c"
+#line 23952 "Photo.c"
 	}
 #line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = loader;
@@ -23966,7 +23970,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 		_photo_file_adapter_unref0 (loader);
 #line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 23968 "Photo.c"
+#line 23972 "Photo.c"
 	}
 #line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = pixbuf;
@@ -23982,17 +23986,17 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 	_photo_file_adapter_unref0 (loader);
 #line 3180 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23984 "Photo.c"
+#line 23988 "Photo.c"
 }
 
 
 GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	Scaling _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
+	Scaling _tmp1_;
+	gboolean _tmp2_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 3185 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -24012,7 +24016,7 @@ GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rota
 		g_propagate_error (error, _inner_error_);
 #line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24014 "Photo.c"
+#line 24018 "Photo.c"
 	}
 #line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
@@ -24024,17 +24028,17 @@ GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rota
 	_g_object_unref0 (_tmp0_);
 #line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24026 "Photo.c"
+#line 24030 "Photo.c"
 }
 
 
 GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	Scaling _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
+	Scaling _tmp1_;
+	gboolean _tmp2_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 3190 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -24054,7 +24058,7 @@ GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean
 		g_propagate_error (error, _inner_error_);
 #line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24056 "Photo.c"
+#line 24060 "Photo.c"
 	}
 #line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
@@ -24066,7 +24070,7 @@ GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean
 	_g_object_unref0 (_tmp0_);
 #line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24068 "Photo.c"
+#line 24072 "Photo.c"
 }
 
 
@@ -24076,28 +24080,28 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
 	Dimensions scaled_to_viewport = {0};
 	Orientation original_orientation = 0;
 	GdkPixbuf* pixbuf = NULL;
-	Scaling _tmp6_ = {0};
-	BackingFetchMode _tmp7_ = 0;
-	GdkPixbuf* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	Scaling _tmp6_;
+	BackingFetchMode _tmp7_;
+	GdkPixbuf* _tmp8_;
+	gboolean _tmp9_;
 	GError * _inner_error_ = NULL;
 #line 3195 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 3195 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 24087 "Photo.c"
+#line 24091 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 24094 "Photo.c"
+#line 24098 "Photo.c"
 		{
-			Scaling _tmp1_ = {0};
+			Scaling _tmp1_;
 			Dimensions _tmp2_ = {0};
 			Dimensions _tmp3_ = {0};
-			Orientation _tmp4_ = 0;
+			Orientation _tmp4_;
 #line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = *scaling;
 #line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24110,16 +24114,16 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
 			_tmp4_ = photo_get_original_orientation (self);
 #line 3212 "/home/jens/Source/shotwell/src/Photo.vala"
 			original_orientation = _tmp4_;
-#line 24112 "Photo.c"
+#line 24116 "Photo.c"
 		}
-		__finally380:
+		__finally381:
 		{
-			PhotoRow* _tmp5_ = NULL;
+			PhotoRow* _tmp5_;
 #line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 24121 "Photo.c"
+#line 24125 "Photo.c"
 		}
 #line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -24127,7 +24131,7 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
 			g_propagate_error (error, _inner_error_);
 #line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 24129 "Photo.c"
+#line 24133 "Photo.c"
 		}
 	}
 #line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24144,15 +24148,15 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
 		g_propagate_error (error, _inner_error_);
 #line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24146 "Photo.c"
+#line 24150 "Photo.c"
 	}
 #line 3222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = rotate;
 #line 3222 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp9_) {
-#line 24152 "Photo.c"
-		GdkPixbuf* _tmp10_ = NULL;
-		GdkPixbuf* _tmp11_ = NULL;
+#line 24156 "Photo.c"
+		GdkPixbuf* _tmp10_;
+		GdkPixbuf* _tmp11_;
 #line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = pixbuf;
 #line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24161,13 +24165,13 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
 		_g_object_unref0 (pixbuf);
 #line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp11_;
-#line 24163 "Photo.c"
+#line 24167 "Photo.c"
 	}
 #line 3232 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = pixbuf;
 #line 3232 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24169 "Photo.c"
+#line 24173 "Photo.c"
 }
 
 
@@ -24175,9 +24179,9 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE
 	Photo * self;
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	Scaling _tmp1_ = {0};
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
+	Scaling _tmp1_;
+	GdkPixbuf* _tmp2_;
+	GdkPixbuf* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 3235 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
@@ -24195,7 +24199,7 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE
 		g_propagate_error (error, _inner_error_);
 #line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24197 "Photo.c"
+#line 24201 "Photo.c"
 	}
 #line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp0_;
@@ -24207,7 +24211,7 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE
 	_g_object_unref0 (_tmp0_);
 #line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24209 "Photo.c"
+#line 24213 "Photo.c"
 }
 
 
@@ -24229,7 +24233,7 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE
 static gpointer _photo_cached_pixbuf_ref0 (gpointer self) {
 #line 3271 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_cached_pixbuf_ref (self) : NULL;
-#line 24231 "Photo.c"
+#line 24235 "Photo.c"
 }
 
 
@@ -24238,7 +24242,7 @@ static gboolean _photo_trim_source_pixbuf_cache_gsource_func (gpointer self) {
 	result = photo_trim_source_pixbuf_cache ();
 #line 3323 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24240 "Photo.c"
+#line 24244 "Photo.c"
 }
 
 
@@ -24247,33 +24251,33 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 	GError * _inner_error_ = NULL;
 #line 3254 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((locate == NULL) || IS_PHOTO (locate), NULL);
-#line 24249 "Photo.c"
+#line 24253 "Photo.c"
 	{
-		GeeLinkedList* _tmp0_ = NULL;
+		GeeLinkedList* _tmp0_;
 #line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_source_pixbuf_cache;
 #line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&__lock_photo_source_pixbuf_cache);
-#line 24256 "Photo.c"
+#line 24260 "Photo.c"
 		{
 			PhotoCachedPixbuf* found = NULL;
 			gdouble min_elapsed = 0.0;
 			gint count = 0;
 			GeeIterator* iter = NULL;
-			GeeLinkedList* _tmp1_ = NULL;
-			GeeIterator* _tmp2_ = NULL;
+			GeeLinkedList* _tmp1_;
+			GeeIterator* _tmp2_;
 			gboolean _tmp29_ = FALSE;
 			gboolean _tmp30_ = FALSE;
-			PhotoCachedPixbuf* _tmp31_ = NULL;
+			PhotoCachedPixbuf* _tmp31_;
 			gboolean _tmp43_ = FALSE;
-			PhotoCachedPixbuf* _tmp44_ = NULL;
-			guint _tmp59_ = 0U;
-			GeeLinkedList* _tmp61_ = NULL;
-			gint _tmp62_ = 0;
-			gint _tmp63_ = 0;
+			PhotoCachedPixbuf* _tmp44_;
+			guint _tmp59_;
+			GeeLinkedList* _tmp61_;
+			gint _tmp62_;
+			gint _tmp63_;
 			GdkPixbuf* _tmp69_ = NULL;
-			PhotoCachedPixbuf* _tmp70_ = NULL;
-			GdkPixbuf* _tmp73_ = NULL;
+			PhotoCachedPixbuf* _tmp70_;
+			GdkPixbuf* _tmp73_;
 #line 3256 "/home/jens/Source/shotwell/src/Photo.vala"
 			found = NULL;
 #line 3260 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24288,19 +24292,19 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 			iter = _tmp2_;
 #line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 24290 "Photo.c"
-				GeeIterator* _tmp3_ = NULL;
-				gboolean _tmp4_ = FALSE;
+#line 24294 "Photo.c"
+				GeeIterator* _tmp3_;
+				gboolean _tmp4_;
 				PhotoCachedPixbuf* cached_pixbuf = NULL;
-				GeeIterator* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
+				GeeIterator* _tmp5_;
+				gpointer _tmp6_;
 				gdouble elapsed = 0.0;
-				PhotoCachedPixbuf* _tmp7_ = NULL;
-				GTimer* _tmp8_ = NULL;
-				gdouble _tmp9_ = 0.0;
-				gdouble _tmp10_ = 0.0;
+				PhotoCachedPixbuf* _tmp7_;
+				GTimer* _tmp8_;
+				gdouble _tmp9_;
+				gdouble _tmp10_;
 				gboolean _tmp11_ = FALSE;
-				Photo* _tmp12_ = NULL;
+				Photo* _tmp12_;
 #line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = iter;
 #line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24309,7 +24313,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				if (!_tmp4_) {
 #line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 24311 "Photo.c"
+#line 24315 "Photo.c"
 				}
 #line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = iter;
@@ -24331,11 +24335,11 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				_tmp12_ = locate;
 #line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_ != NULL) {
-#line 24333 "Photo.c"
-					PhotoCachedPixbuf* _tmp13_ = NULL;
-					Photo* _tmp14_ = NULL;
-					Photo* _tmp15_ = NULL;
-					gboolean _tmp16_ = FALSE;
+#line 24337 "Photo.c"
+					PhotoCachedPixbuf* _tmp13_;
+					Photo* _tmp14_;
+					Photo* _tmp15_;
+					gboolean _tmp16_;
 #line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = cached_pixbuf;
 #line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24346,19 +24350,19 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 					_tmp16_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource));
 #line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _tmp16_;
-#line 24348 "Photo.c"
+#line 24352 "Photo.c"
 				} else {
 #line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = FALSE;
-#line 24352 "Photo.c"
+#line 24356 "Photo.c"
 				}
 #line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_) {
-#line 24356 "Photo.c"
-					GeeIterator* _tmp17_ = NULL;
-					PhotoCachedPixbuf* _tmp18_ = NULL;
-					PhotoCachedPixbuf* _tmp19_ = NULL;
-					gint _tmp20_ = 0;
+#line 24360 "Photo.c"
+					GeeIterator* _tmp17_;
+					PhotoCachedPixbuf* _tmp18_;
+					PhotoCachedPixbuf* _tmp19_;
+					gint _tmp20_;
 #line 3270 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = iter;
 #line 3270 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24375,38 +24379,38 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 					_tmp20_ = count;
 #line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
 					count = _tmp20_ + 1;
-#line 24377 "Photo.c"
+#line 24381 "Photo.c"
 				} else {
-					gdouble _tmp21_ = 0.0;
+					gdouble _tmp21_;
 #line 3275 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = elapsed;
 #line 3275 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp21_ >= ((gdouble) PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC)) {
-#line 24384 "Photo.c"
-						GeeIterator* _tmp22_ = NULL;
+#line 24388 "Photo.c"
+						GeeIterator* _tmp22_;
 #line 3276 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp22_ = iter;
 #line 3276 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_iterator_remove (_tmp22_);
-#line 24390 "Photo.c"
+#line 24394 "Photo.c"
 					} else {
-						gint _tmp23_ = 0;
+						gint _tmp23_;
 #line 3277 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp23_ = count;
 #line 3277 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp23_ >= PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT) {
-#line 24397 "Photo.c"
-							GeeIterator* _tmp24_ = NULL;
+#line 24401 "Photo.c"
+							GeeIterator* _tmp24_;
 #line 3278 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_ = iter;
 #line 3278 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_iterator_remove (_tmp24_);
-#line 24403 "Photo.c"
+#line 24407 "Photo.c"
 						} else {
-							gdouble _tmp25_ = 0.0;
-							gdouble _tmp26_ = 0.0;
-							gdouble _tmp27_ = 0.0;
-							gint _tmp28_ = 0;
+							gdouble _tmp25_;
+							gdouble _tmp26_;
+							gdouble _tmp27_;
+							gint _tmp28_;
 #line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp25_ = elapsed;
 #line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24419,53 +24423,53 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 							_tmp28_ = count;
 #line 3283 "/home/jens/Source/shotwell/src/Photo.vala"
 							count = _tmp28_ + 1;
-#line 24421 "Photo.c"
+#line 24425 "Photo.c"
 						}
 					}
 				}
 #line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_cached_pixbuf_unref0 (cached_pixbuf);
-#line 24427 "Photo.c"
+#line 24431 "Photo.c"
 			}
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = found;
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp31_ == NULL) {
-#line 24433 "Photo.c"
-				Photo* _tmp32_ = NULL;
+#line 24437 "Photo.c"
+				Photo* _tmp32_;
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = locate;
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = _tmp32_ != NULL;
-#line 24439 "Photo.c"
+#line 24443 "Photo.c"
 			} else {
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = FALSE;
-#line 24443 "Photo.c"
+#line 24447 "Photo.c"
 			}
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp30_) {
-#line 24447 "Photo.c"
-				gboolean _tmp33_ = FALSE;
+#line 24451 "Photo.c"
+				gboolean _tmp33_;
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = keep;
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = _tmp33_;
-#line 24453 "Photo.c"
+#line 24457 "Photo.c"
 			} else {
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = FALSE;
-#line 24457 "Photo.c"
+#line 24461 "Photo.c"
 			}
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp29_) {
-#line 24461 "Photo.c"
+#line 24465 "Photo.c"
 				GdkPixbuf* _tmp34_ = NULL;
-				Photo* _tmp35_ = NULL;
+				Photo* _tmp35_;
 				Scaling _tmp36_ = {0};
-				GdkPixbuf* _tmp37_ = NULL;
-				Photo* _tmp38_ = NULL;
-				PhotoCachedPixbuf* _tmp39_ = NULL;
+				GdkPixbuf* _tmp37_;
+				Photo* _tmp38_;
+				PhotoCachedPixbuf* _tmp39_;
 #line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = locate;
 #line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24480,8 +24484,8 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 					_g_object_unref0 (iter);
 #line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_cached_pixbuf_unref0 (found);
-#line 24482 "Photo.c"
-					goto __finally381;
+#line 24486 "Photo.c"
+					goto __finally382;
 				}
 #line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = locate;
@@ -24493,51 +24497,51 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				found = _tmp39_;
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp34_);
-#line 24495 "Photo.c"
+#line 24499 "Photo.c"
 			} else {
-				PhotoCachedPixbuf* _tmp40_ = NULL;
+				PhotoCachedPixbuf* _tmp40_;
 #line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = found;
 #line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp40_ != NULL) {
-#line 24502 "Photo.c"
-					PhotoCachedPixbuf* _tmp41_ = NULL;
-					GTimer* _tmp42_ = NULL;
+#line 24506 "Photo.c"
+					PhotoCachedPixbuf* _tmp41_;
+					GTimer* _tmp42_;
 #line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp41_ = found;
 #line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp42_ = _tmp41_->last_touched;
 #line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_timer_start (_tmp42_);
-#line 24511 "Photo.c"
+#line 24515 "Photo.c"
 				}
 			}
 #line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp44_ = found;
 #line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp44_ != NULL) {
-#line 24518 "Photo.c"
-				gboolean _tmp45_ = FALSE;
+#line 24522 "Photo.c"
+				gboolean _tmp45_;
 #line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = keep;
 #line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = _tmp45_;
-#line 24524 "Photo.c"
+#line 24528 "Photo.c"
 			} else {
 #line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = FALSE;
-#line 24528 "Photo.c"
+#line 24532 "Photo.c"
 			}
 #line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp43_) {
-#line 24532 "Photo.c"
-				GeeLinkedList* _tmp46_ = NULL;
-				PhotoCachedPixbuf* _tmp47_ = NULL;
-				PhotoCachedPixbuf* _tmp48_ = NULL;
-				GTimer* _tmp49_ = NULL;
-				gdouble _tmp50_ = 0.0;
-				gdouble _tmp51_ = 0.0;
-				gdouble _tmp52_ = 0.0;
+#line 24536 "Photo.c"
+				GeeLinkedList* _tmp46_;
+				PhotoCachedPixbuf* _tmp47_;
+				PhotoCachedPixbuf* _tmp48_;
+				GTimer* _tmp49_;
+				gdouble _tmp50_;
+				gdouble _tmp51_;
+				gdouble _tmp52_;
 #line 3298 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = photo_source_pixbuf_cache;
 #line 3298 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24558,13 +24562,13 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				min_elapsed = _tmp52_;
 #line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 				while (TRUE) {
-#line 24560 "Photo.c"
-					GeeLinkedList* _tmp53_ = NULL;
-					gint _tmp54_ = 0;
-					gint _tmp55_ = 0;
-					GeeLinkedList* _tmp56_ = NULL;
-					gpointer _tmp57_ = NULL;
-					PhotoCachedPixbuf* _tmp58_ = NULL;
+#line 24564 "Photo.c"
+					GeeLinkedList* _tmp53_;
+					gint _tmp54_;
+					gint _tmp55_;
+					GeeLinkedList* _tmp56_;
+					gpointer _tmp57_;
+					PhotoCachedPixbuf* _tmp58_;
 #line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp53_ = photo_source_pixbuf_cache;
 #line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24575,7 +24579,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 					if (!(_tmp55_ > PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT)) {
 #line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 						break;
-#line 24577 "Photo.c"
+#line 24581 "Photo.c"
 					}
 #line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp56_ = photo_source_pixbuf_cache;
@@ -24585,22 +24589,22 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 					_tmp58_ = (PhotoCachedPixbuf*) _tmp57_;
 #line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_cached_pixbuf_unref0 (_tmp58_);
-#line 24587 "Photo.c"
+#line 24591 "Photo.c"
 				}
 			}
 #line 3312 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = photo_discard_source_id;
 #line 3312 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp59_ != ((guint) 0)) {
-#line 24594 "Photo.c"
-				guint _tmp60_ = 0U;
+#line 24598 "Photo.c"
+				guint _tmp60_;
 #line 3313 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = photo_discard_source_id;
 #line 3313 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_source_remove (_tmp60_);
 #line 3314 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_discard_source_id = (guint) 0;
-#line 24602 "Photo.c"
+#line 24606 "Photo.c"
 			}
 #line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp61_ = photo_source_pixbuf_cache;
@@ -24610,13 +24614,13 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 			_tmp63_ = _tmp62_;
 #line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp63_ > PHOTO_SOURCE_PIXBUF_MIN_LRU_COUNT) {
-#line 24612 "Photo.c"
-				gdouble _tmp64_ = 0.0;
+#line 24616 "Photo.c"
+				gdouble _tmp64_;
 				guint retry_sec = 0U;
-				gdouble _tmp65_ = 0.0;
-				gdouble _tmp66_ = 0.0;
-				guint _tmp67_ = 0U;
-				guint _tmp68_ = 0U;
+				gdouble _tmp65_;
+				gdouble _tmp66_;
+				guint _tmp67_;
+				guint _tmp68_;
 #line 3319 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp64_ = min_elapsed;
 #line 3319 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24633,26 +24637,26 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				_tmp68_ = g_timeout_add_seconds_full (G_PRIORITY_LOW, _tmp67_, _photo_trim_source_pixbuf_cache_gsource_func, NULL, NULL);
 #line 3323 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_discard_source_id = _tmp68_;
-#line 24635 "Photo.c"
+#line 24639 "Photo.c"
 			}
 #line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = found;
 #line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp70_ != NULL) {
-#line 24641 "Photo.c"
-				PhotoCachedPixbuf* _tmp71_ = NULL;
-				GdkPixbuf* _tmp72_ = NULL;
+#line 24645 "Photo.c"
+				PhotoCachedPixbuf* _tmp71_;
+				GdkPixbuf* _tmp72_;
 #line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp71_ = found;
 #line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp72_ = _tmp71_->pixbuf;
 #line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = _tmp72_;
-#line 24650 "Photo.c"
+#line 24654 "Photo.c"
 			} else {
 #line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = NULL;
-#line 24654 "Photo.c"
+#line 24658 "Photo.c"
 			}
 #line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = _g_object_ref0 (_tmp69_);
@@ -24662,33 +24666,33 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 			_g_object_unref0 (iter);
 #line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_cached_pixbuf_unref0 (found);
-#line 24664 "Photo.c"
+#line 24668 "Photo.c"
 			{
-				GeeLinkedList* _tmp74_ = NULL;
+				GeeLinkedList* _tmp74_;
 #line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp74_ = photo_source_pixbuf_cache;
 #line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache);
-#line 24671 "Photo.c"
+#line 24675 "Photo.c"
 			}
 #line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 24675 "Photo.c"
+#line 24679 "Photo.c"
 		}
-		__finally381:
+		__finally382:
 		{
-			GeeLinkedList* _tmp75_ = NULL;
+			GeeLinkedList* _tmp75_;
 #line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp75_ = photo_source_pixbuf_cache;
 #line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache);
-#line 24684 "Photo.c"
+#line 24688 "Photo.c"
 		}
 #line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
 #line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24690 "Photo.c"
+#line 24694 "Photo.c"
 	}
 }
 
@@ -24697,8 +24701,8 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
 	{
-		GdkPixbuf* _tmp0_ = NULL;
-		GdkPixbuf* _tmp1_ = NULL;
+		GdkPixbuf* _tmp0_;
+		GdkPixbuf* _tmp1_;
 #line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_run_source_pixbuf_cache (NULL, FALSE, &_inner_error_);
 #line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24707,12 +24711,12 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
 		_g_object_unref0 (_tmp1_);
 #line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 24709 "Photo.c"
-			goto __catch382_g_error;
+#line 24713 "Photo.c"
+			goto __catch383_g_error;
 		}
 	}
-	goto __finally382;
-	__catch382_g_error:
+	goto __finally383;
+	__catch383_g_error:
 	{
 		GError* err = NULL;
 #line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24721,12 +24725,12 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
 		_inner_error_ = NULL;
 #line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 24723 "Photo.c"
+#line 24727 "Photo.c"
 	}
-	__finally382:
+	__finally383:
 #line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 24728 "Photo.c"
+#line 24732 "Photo.c"
 		gboolean _tmp2_ = FALSE;
 #line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -24734,13 +24738,13 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
 		g_clear_error (&_inner_error_);
 #line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp2_;
-#line 24736 "Photo.c"
+#line 24740 "Photo.c"
 	}
 #line 3336 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = FALSE;
 #line 3336 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24742 "Photo.c"
+#line 24746 "Photo.c"
 }
 
 
@@ -24752,11 +24756,8 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
 GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
+	GdkPixbuf* _tmp1_;
+	GdkPixbuf* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 3344 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -24770,27 +24771,17 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24772 "Photo.c"
+#line 24773 "Photo.c"
 	}
 #line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp2_ = _tmp0_;
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp0_ = NULL;
+	_tmp2_ = gdk_pixbuf_copy (_tmp0_);
 #line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp3_ = _tmp2_;
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp4_ = gdk_pixbuf_copy (_tmp3_);
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp5_ = _tmp4_;
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (_tmp3_);
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
-	result = _tmp5_;
+	result = _tmp2_;
 #line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
 #line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24792 "Photo.c"
+#line 24783 "Photo.c"
 }
 
 
@@ -24801,10 +24792,10 @@ void photo_discard_prefetched (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 24803 "Photo.c"
+#line 24794 "Photo.c"
 	{
-		GdkPixbuf* _tmp0_ = NULL;
-		GdkPixbuf* _tmp1_ = NULL;
+		GdkPixbuf* _tmp0_;
+		GdkPixbuf* _tmp1_;
 #line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_run_source_pixbuf_cache (self, FALSE, &_inner_error_);
 #line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24813,12 +24804,12 @@ void photo_discard_prefetched (Photo* self) {
 		_g_object_unref0 (_tmp1_);
 #line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 24815 "Photo.c"
-			goto __catch383_g_error;
+#line 24806 "Photo.c"
+			goto __catch384_g_error;
 		}
 	}
-	goto __finally383;
-	__catch383_g_error:
+	goto __finally384;
+	__catch384_g_error:
 	{
 		GError* err = NULL;
 #line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24827,9 +24818,9 @@ void photo_discard_prefetched (Photo* self) {
 		_inner_error_ = NULL;
 #line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 24829 "Photo.c"
+#line 24820 "Photo.c"
 	}
-	__finally383:
+	__finally384:
 #line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24838,7 +24829,7 @@ void photo_discard_prefetched (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 24840 "Photo.c"
+#line 24831 "Photo.c"
 	}
 }
 
@@ -24859,8 +24850,8 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 	gboolean is_scaled = FALSE;
 	gboolean is_cropped = FALSE;
 	gboolean is_straightened = FALSE;
@@ -24868,27 +24859,27 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	Dimensions original = {0};
 	Dimensions scaled = {0};
 	EditingToolsRedeyeInstance* redeye_instances = NULL;
-	gint redeye_instances_length1 = 0;
-	gint _redeye_instances_size_ = 0;
+	gint redeye_instances_length1;
+	gint _redeye_instances_size_;
 	Box crop = {0};
 	gdouble straightening_angle = 0.0;
 	PixelTransformer* transformer = NULL;
 	Orientation orientation = 0;
 	GdkPixbuf* pixbuf = NULL;
-	GdkPixbuf* _tmp33_ = NULL;
-	PhotoException _tmp34_ = 0;
-	gboolean _tmp35_ = FALSE;
-	PhotoException _tmp40_ = 0;
-	gboolean _tmp41_ = FALSE;
-	PhotoException _tmp46_ = 0;
-	gboolean _tmp47_ = FALSE;
-	PhotoException _tmp85_ = 0;
-	gboolean _tmp86_ = FALSE;
-	gboolean _tmp89_ = FALSE;
-	PhotoException _tmp96_ = 0;
-	gboolean _tmp97_ = FALSE;
+	GdkPixbuf* _tmp33_;
+	PhotoException _tmp34_;
+	gboolean _tmp35_;
+	PhotoException _tmp40_;
+	gboolean _tmp41_;
+	PhotoException _tmp46_;
+	gboolean _tmp47_;
+	PhotoException _tmp85_;
+	gboolean _tmp86_;
+	gboolean _tmp89_;
+	PhotoException _tmp96_;
+	gboolean _tmp97_;
 	gboolean _tmp101_ = FALSE;
-	gboolean _tmp102_ = FALSE;
+	gboolean _tmp102_;
 	GError * _inner_error_ = NULL;
 #line 3369 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -24900,86 +24891,86 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	_tmp4_ = _tmp3_;
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp4_) {
-#line 24902 "Photo.c"
-		PhotoFileFormat _tmp5_ = 0;
+#line 24893 "Photo.c"
+		PhotoFileFormat _tmp5_;
 #line 3383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_get_master_file_format (self);
 #line 3383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp5_ == PHOTO_FILE_FORMAT_RAW;
-#line 24908 "Photo.c"
+#line 24899 "Photo.c"
 	} else {
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = FALSE;
-#line 24912 "Photo.c"
+#line 24903 "Photo.c"
 	}
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 24916 "Photo.c"
+#line 24907 "Photo.c"
 		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
-		BackingFetchMode _tmp8_ = 0;
+		BackingFetchMode _tmp8_;
 #line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = fetch_mode;
 #line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp8_ == BACKING_FETCH_MODE_BASELINE) {
 #line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = TRUE;
-#line 24926 "Photo.c"
+#line 24917 "Photo.c"
 		} else {
-			BackingFetchMode _tmp9_ = 0;
+			BackingFetchMode _tmp9_;
 #line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = fetch_mode;
 #line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp9_ == BACKING_FETCH_MODE_UNMODIFIED;
-#line 24933 "Photo.c"
+#line 24924 "Photo.c"
 		}
 #line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp7_) {
 #line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = TRUE;
-#line 24939 "Photo.c"
+#line 24930 "Photo.c"
 		} else {
-			BackingFetchMode _tmp10_ = 0;
+			BackingFetchMode _tmp10_;
 #line 3385 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = fetch_mode;
 #line 3385 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp10_ == BACKING_FETCH_MODE_SOURCE;
-#line 24946 "Photo.c"
+#line 24937 "Photo.c"
 		}
 #line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp6_;
-#line 24950 "Photo.c"
+#line 24941 "Photo.c"
 	} else {
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 24954 "Photo.c"
+#line 24945 "Photo.c"
 	}
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 24958 "Photo.c"
-		RawDeveloper _tmp11_ = 0;
-		gboolean _tmp12_ = FALSE;
+#line 24949 "Photo.c"
+		RawDeveloper _tmp11_;
+		gboolean _tmp12_;
 #line 3386 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = photo_get_raw_developer (self);
 #line 3386 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = photo_is_raw_developer_complete (self, _tmp11_);
 #line 3386 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = !_tmp12_;
-#line 24967 "Photo.c"
+#line 24958 "Photo.c"
 	} else {
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = FALSE;
-#line 24971 "Photo.c"
+#line 24962 "Photo.c"
 	}
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 24975 "Photo.c"
-		RawDeveloper _tmp13_ = 0;
+#line 24966 "Photo.c"
+		RawDeveloper _tmp13_;
 #line 3387 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = photo_get_raw_developer (self);
 #line 3387 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_set_raw_developer (self, _tmp13_);
-#line 24981 "Photo.c"
+#line 24972 "Photo.c"
 	}
 #line 3392 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_init (&original, 0, 0);
@@ -24993,31 +24984,31 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	_redeye_instances_size_ = redeye_instances_length1;
 #line 3397 "/home/jens/Source/shotwell/src/Photo.vala"
 	transformer = NULL;
-#line 24995 "Photo.c"
+#line 24986 "Photo.c"
 	{
-		PhotoRow* _tmp14_ = NULL;
+		PhotoRow* _tmp14_;
 #line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = self->row;
 #line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 25002 "Photo.c"
+#line 24993 "Photo.c"
 		{
 			Dimensions _tmp15_ = {0};
-			PhotoException _tmp16_ = 0;
+			PhotoException _tmp16_;
 			Dimensions _tmp17_ = {0};
 			Dimensions _tmp18_ = {0};
-			Dimensions _tmp19_ = {0};
+			Dimensions _tmp19_;
 			Dimensions _tmp20_ = {0};
-			Dimensions _tmp21_ = {0};
-			gboolean _tmp22_ = FALSE;
-			gint _tmp23_ = 0;
-			EditingToolsRedeyeInstance* _tmp24_ = NULL;
+			Dimensions _tmp21_;
+			gboolean _tmp22_;
+			gint _tmp23_;
+			EditingToolsRedeyeInstance* _tmp24_;
 			Box _tmp25_ = {0};
-			gboolean _tmp26_ = FALSE;
+			gboolean _tmp26_;
 			gdouble _tmp27_ = 0.0;
-			gboolean _tmp28_ = FALSE;
-			gboolean _tmp29_ = FALSE;
-			Orientation _tmp31_ = 0;
+			gboolean _tmp28_;
+			gboolean _tmp29_;
+			Orientation _tmp31_;
 #line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_ALL, &_tmp15_);
 #line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25068,30 +25059,30 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			_tmp29_ = photo_has_color_adjustments (self);
 #line 3413 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp29_) {
-#line 25070 "Photo.c"
-				PixelTransformer* _tmp30_ = NULL;
+#line 25061 "Photo.c"
+				PixelTransformer* _tmp30_;
 #line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = photo_get_pixel_transformer (self);
 #line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (transformer);
 #line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
 				transformer = _tmp30_;
-#line 25078 "Photo.c"
+#line 25069 "Photo.c"
 			}
 #line 3416 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = photo_get_orientation (self);
 #line 3416 "/home/jens/Source/shotwell/src/Photo.vala"
 			orientation = _tmp31_;
-#line 25084 "Photo.c"
+#line 25075 "Photo.c"
 		}
-		__finally384:
+		__finally385:
 		{
-			PhotoRow* _tmp32_ = NULL;
+			PhotoRow* _tmp32_;
 #line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp32_ = self->row;
 #line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 25093 "Photo.c"
+#line 25084 "Photo.c"
 		}
 #line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -25103,7 +25094,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			redeye_instances = (g_free (redeye_instances), NULL);
 #line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 25105 "Photo.c"
+#line 25096 "Photo.c"
 		}
 	}
 #line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25120,7 +25111,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 		redeye_instances = (g_free (redeye_instances), NULL);
 #line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 25122 "Photo.c"
+#line 25113 "Photo.c"
 	}
 #line 3430 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = exceptions;
@@ -25128,14 +25119,14 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	_tmp35_ = photo_exception_allows (_tmp34_, PHOTO_EXCEPTION_REDEYE);
 #line 3430 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp35_) {
-#line 25130 "Photo.c"
-		EditingToolsRedeyeInstance* _tmp36_ = NULL;
-		gint _tmp36__length1 = 0;
+#line 25121 "Photo.c"
+		EditingToolsRedeyeInstance* _tmp36_;
+		gint _tmp36__length1;
 #line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = redeye_instances;
 #line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36__length1 = redeye_instances_length1;
-#line 25137 "Photo.c"
+#line 25128 "Photo.c"
 		{
 			EditingToolsRedeyeInstance* instance_collection = NULL;
 			gint instance_collection_length1 = 0;
@@ -25147,15 +25138,15 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			instance_collection_length1 = _tmp36__length1;
 #line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 			for (instance_it = 0; instance_it < _tmp36__length1; instance_it = instance_it + 1) {
-#line 25149 "Photo.c"
+#line 25140 "Photo.c"
 				EditingToolsRedeyeInstance instance = {0};
 #line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 				instance = instance_collection[instance_it];
-#line 25153 "Photo.c"
+#line 25144 "Photo.c"
 				{
-					GdkPixbuf* _tmp37_ = NULL;
-					EditingToolsRedeyeInstance _tmp38_ = {0};
-					GdkPixbuf* _tmp39_ = NULL;
+					GdkPixbuf* _tmp37_;
+					EditingToolsRedeyeInstance _tmp38_;
+					GdkPixbuf* _tmp39_;
 #line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp37_ = pixbuf;
 #line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25166,7 +25157,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 					_g_object_unref0 (pixbuf);
 #line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
 					pixbuf = _tmp39_;
-#line 25168 "Photo.c"
+#line 25159 "Photo.c"
 				}
 			}
 		}
@@ -25177,16 +25168,16 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	_tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_STRAIGHTEN);
 #line 3444 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp41_) {
-#line 25179 "Photo.c"
-		gboolean _tmp42_ = FALSE;
+#line 25170 "Photo.c"
+		gboolean _tmp42_;
 #line 3448 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = is_straightened;
 #line 3448 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp42_) {
-#line 25185 "Photo.c"
-			GdkPixbuf* _tmp43_ = NULL;
-			gdouble _tmp44_ = 0.0;
-			GdkPixbuf* _tmp45_ = NULL;
+#line 25176 "Photo.c"
+			GdkPixbuf* _tmp43_;
+			gdouble _tmp44_;
+			GdkPixbuf* _tmp45_;
 #line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp43_ = pixbuf;
 #line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25197,7 +25188,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			_g_object_unref0 (pixbuf);
 #line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
 			pixbuf = _tmp45_;
-#line 25199 "Photo.c"
+#line 25190 "Photo.c"
 		}
 	}
 #line 3458 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25206,49 +25197,49 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	_tmp47_ = photo_exception_allows (_tmp46_, PHOTO_EXCEPTION_CROP);
 #line 3458 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp47_) {
-#line 25208 "Photo.c"
-		gboolean _tmp48_ = FALSE;
+#line 25199 "Photo.c"
+		gboolean _tmp48_;
 #line 3462 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = is_cropped;
 #line 3462 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp48_) {
-#line 25214 "Photo.c"
-			Box _tmp49_ = {0};
-			gint _tmp50_ = 0;
-			GdkPixbuf* _tmp51_ = NULL;
-			gint _tmp52_ = 0;
-			gint _tmp53_ = 0;
-			gint _tmp54_ = 0;
-			Box _tmp55_ = {0};
-			gint _tmp56_ = 0;
-			GdkPixbuf* _tmp57_ = NULL;
-			gint _tmp58_ = 0;
-			gint _tmp59_ = 0;
-			gint _tmp60_ = 0;
-			Box _tmp61_ = {0};
-			gint _tmp62_ = 0;
-			Box _tmp63_ = {0};
-			gint _tmp64_ = 0;
-			GdkPixbuf* _tmp65_ = NULL;
-			gint _tmp66_ = 0;
-			gint _tmp67_ = 0;
-			gint _tmp68_ = 0;
-			Box _tmp69_ = {0};
-			gint _tmp70_ = 0;
-			Box _tmp71_ = {0};
-			gint _tmp72_ = 0;
-			GdkPixbuf* _tmp73_ = NULL;
-			gint _tmp74_ = 0;
-			gint _tmp75_ = 0;
-			gint _tmp76_ = 0;
-			GdkPixbuf* _tmp77_ = NULL;
-			Box _tmp78_ = {0};
-			gint _tmp79_ = 0;
-			Box _tmp80_ = {0};
-			gint _tmp81_ = 0;
-			gint _tmp82_ = 0;
-			gint _tmp83_ = 0;
-			GdkPixbuf* _tmp84_ = NULL;
+#line 25205 "Photo.c"
+			Box _tmp49_;
+			gint _tmp50_;
+			GdkPixbuf* _tmp51_;
+			gint _tmp52_;
+			gint _tmp53_;
+			gint _tmp54_;
+			Box _tmp55_;
+			gint _tmp56_;
+			GdkPixbuf* _tmp57_;
+			gint _tmp58_;
+			gint _tmp59_;
+			gint _tmp60_;
+			Box _tmp61_;
+			gint _tmp62_;
+			Box _tmp63_;
+			gint _tmp64_;
+			GdkPixbuf* _tmp65_;
+			gint _tmp66_;
+			gint _tmp67_;
+			gint _tmp68_;
+			Box _tmp69_;
+			gint _tmp70_;
+			Box _tmp71_;
+			gint _tmp72_;
+			GdkPixbuf* _tmp73_;
+			gint _tmp74_;
+			gint _tmp75_;
+			gint _tmp76_;
+			GdkPixbuf* _tmp77_;
+			Box _tmp78_;
+			gint _tmp79_;
+			Box _tmp80_;
+			gint _tmp81_;
+			gint _tmp82_;
+			gint _tmp83_;
+			GdkPixbuf* _tmp84_;
 #line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp49_ = crop;
 #line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25333,7 +25324,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			_g_object_unref0 (pixbuf);
 #line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			pixbuf = _tmp84_;
-#line 25335 "Photo.c"
+#line 25326 "Photo.c"
 		}
 	}
 #line 3483 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25342,9 +25333,9 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	_tmp86_ = photo_exception_allows (_tmp85_, PHOTO_EXCEPTION_ORIENTATION);
 #line 3483 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp86_) {
-#line 25344 "Photo.c"
-		GdkPixbuf* _tmp87_ = NULL;
-		GdkPixbuf* _tmp88_ = NULL;
+#line 25335 "Photo.c"
+		GdkPixbuf* _tmp87_;
+		GdkPixbuf* _tmp88_;
 #line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp87_ = pixbuf;
 #line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25353,19 +25344,19 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 		_g_object_unref0 (pixbuf);
 #line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp88_;
-#line 25355 "Photo.c"
+#line 25346 "Photo.c"
 	}
 #line 3494 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp89_ = is_scaled;
 #line 3494 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp89_) {
-#line 25361 "Photo.c"
-		GdkPixbuf* _tmp90_ = NULL;
-		Dimensions _tmp91_ = {0};
-		gint _tmp92_ = 0;
-		Dimensions _tmp93_ = {0};
-		gint _tmp94_ = 0;
-		GdkPixbuf* _tmp95_ = NULL;
+#line 25352 "Photo.c"
+		GdkPixbuf* _tmp90_;
+		Dimensions _tmp91_;
+		gint _tmp92_;
+		Dimensions _tmp93_;
+		gint _tmp94_;
+		GdkPixbuf* _tmp95_;
 #line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = pixbuf;
 #line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25382,7 +25373,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 		_g_object_unref0 (pixbuf);
 #line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp95_;
-#line 25384 "Photo.c"
+#line 25375 "Photo.c"
 	}
 #line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp96_ = exceptions;
@@ -25390,46 +25381,46 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	_tmp97_ = photo_exception_allows (_tmp96_, PHOTO_EXCEPTION_ADJUST);
 #line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp97_) {
-#line 25392 "Photo.c"
-		PixelTransformer* _tmp98_ = NULL;
+#line 25383 "Photo.c"
+		PixelTransformer* _tmp98_;
 #line 3510 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp98_ = transformer;
 #line 3510 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp98_ != NULL) {
-#line 25398 "Photo.c"
-			PixelTransformer* _tmp99_ = NULL;
-			GdkPixbuf* _tmp100_ = NULL;
+#line 25389 "Photo.c"
+			PixelTransformer* _tmp99_;
+			GdkPixbuf* _tmp100_;
 #line 3511 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp99_ = transformer;
 #line 3511 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp100_ = pixbuf;
 #line 3511 "/home/jens/Source/shotwell/src/Photo.vala"
 			pixel_transformer_transform_pixbuf (_tmp99_, _tmp100_, NULL);
-#line 25407 "Photo.c"
+#line 25398 "Photo.c"
 		}
 	}
 #line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp102_ = is_scaled;
 #line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp102_) {
-#line 25414 "Photo.c"
-		gboolean _tmp103_ = FALSE;
+#line 25405 "Photo.c"
+		gboolean _tmp103_;
 #line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp103_ = is_straightened;
 #line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp101_ = !_tmp103_;
-#line 25420 "Photo.c"
+#line 25411 "Photo.c"
 	} else {
 #line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp101_ = FALSE;
-#line 25424 "Photo.c"
+#line 25415 "Photo.c"
 	}
 #line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp101_) {
-#line 25428 "Photo.c"
-		GdkPixbuf* _tmp104_ = NULL;
+#line 25419 "Photo.c"
+		GdkPixbuf* _tmp104_;
 		Dimensions _tmp105_ = {0};
-		gboolean _tmp106_ = FALSE;
+		gboolean _tmp106_;
 #line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp104_ = pixbuf;
 #line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25438,7 +25429,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 		_tmp106_ = dimensions_approx_equals (&scaled_to_viewport, &_tmp105_, PHOTO_SCALING_FUDGE);
 #line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_assert (_tmp106_, "scaled_to_viewport.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)");
-#line 25440 "Photo.c"
+#line 25431 "Photo.c"
 	}
 #line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = pixbuf;
@@ -25448,7 +25439,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	redeye_instances = (g_free (redeye_instances), NULL);
 #line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 25450 "Photo.c"
+#line 25441 "Photo.c"
 }
 
 
@@ -25458,7 +25449,7 @@ static gboolean photo_real_has_user_generated_metadata (Photo* self) {
 	g_critical ("Type `%s' does not implement abstract method `photo_has_user_generated_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 3537 "/home/jens/Source/shotwell/src/Photo.vala"
 	return _tmp0_;
-#line 25460 "Photo.c"
+#line 25451 "Photo.c"
 }
 
 
@@ -25467,7 +25458,7 @@ gboolean photo_has_user_generated_metadata (Photo* self) {
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 3537 "/home/jens/Source/shotwell/src/Photo.vala"
 	return PHOTO_GET_CLASS (self)->has_user_generated_metadata (self);
-#line 25469 "Photo.c"
+#line 25460 "Photo.c"
 }
 
 
@@ -25476,7 +25467,7 @@ static void photo_real_set_user_metadata_for_export (Photo* self, PhotoMetadata*
 	g_critical ("Type `%s' does not implement abstract method `photo_set_user_metadata_for_export'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 3541 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 25478 "Photo.c"
+#line 25469 "Photo.c"
 }
 
 
@@ -25485,29 +25476,29 @@ void photo_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 3541 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->set_user_metadata_for_export (self, metadata);
-#line 25487 "Photo.c"
+#line 25478 "Photo.c"
 }
 
 
 gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 	gchar* result = NULL;
-	PhotoFileFormat* _tmp0_ = NULL;
+	PhotoFileFormat* _tmp0_;
 #line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 3549 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file_format;
 #line 3549 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 25500 "Photo.c"
-		PhotoFileFormat* _tmp1_ = NULL;
-		PhotoFileFormatProperties* _tmp2_ = NULL;
-		PhotoFileFormatProperties* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+#line 25491 "Photo.c"
+		PhotoFileFormat* _tmp1_;
+		PhotoFileFormatProperties* _tmp2_;
+		PhotoFileFormatProperties* _tmp3_;
+		GFile* _tmp4_;
+		GFile* _tmp5_;
+		GFile* _tmp6_;
+		GFile* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = file_format;
 #line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25536,26 +25527,26 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 		result = _tmp9_;
 #line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 25538 "Photo.c"
+#line 25529 "Photo.c"
 	} else {
-		PhotoFileFormat _tmp10_ = 0;
-		gboolean _tmp11_ = FALSE;
+		PhotoFileFormat _tmp10_;
+		gboolean _tmp11_;
 #line 3552 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = photo_get_file_format (self);
 #line 3552 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = photo_file_format_can_write (_tmp10_);
 #line 3552 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp11_) {
-#line 25548 "Photo.c"
-			PhotoFileFormat _tmp12_ = 0;
-			PhotoFileFormatProperties* _tmp13_ = NULL;
-			PhotoFileFormatProperties* _tmp14_ = NULL;
-			GFile* _tmp15_ = NULL;
-			GFile* _tmp16_ = NULL;
-			GFile* _tmp17_ = NULL;
-			GFile* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
-			gchar* _tmp20_ = NULL;
+#line 25539 "Photo.c"
+			PhotoFileFormat _tmp12_;
+			PhotoFileFormatProperties* _tmp13_;
+			PhotoFileFormatProperties* _tmp14_;
+			GFile* _tmp15_;
+			GFile* _tmp16_;
+			GFile* _tmp17_;
+			GFile* _tmp18_;
+			gchar* _tmp19_;
+			gchar* _tmp20_;
 #line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_get_file_format (self);
 #line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25584,17 +25575,17 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 			result = _tmp20_;
 #line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 25586 "Photo.c"
+#line 25577 "Photo.c"
 		} else {
-			PhotoFileFormat _tmp21_ = 0;
-			PhotoFileFormatProperties* _tmp22_ = NULL;
-			PhotoFileFormatProperties* _tmp23_ = NULL;
-			GFile* _tmp24_ = NULL;
-			GFile* _tmp25_ = NULL;
-			GFile* _tmp26_ = NULL;
-			GFile* _tmp27_ = NULL;
-			gchar* _tmp28_ = NULL;
-			gchar* _tmp29_ = NULL;
+			PhotoFileFormat _tmp21_;
+			PhotoFileFormatProperties* _tmp22_;
+			PhotoFileFormatProperties* _tmp23_;
+			GFile* _tmp24_;
+			GFile* _tmp25_;
+			GFile* _tmp26_;
+			GFile* _tmp27_;
+			gchar* _tmp28_;
+			gchar* _tmp29_;
 #line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = photo_file_format_get_system_default_format ();
 #line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25623,7 +25614,7 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 			result = _tmp29_;
 #line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 25625 "Photo.c"
+#line 25616 "Photo.c"
 		}
 	}
 }
@@ -25633,49 +25624,49 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 	gboolean result = FALSE;
 	PhotoFileReader* export_reader = NULL;
 	gboolean is_master = FALSE;
-	PhotoFileReader* _tmp30_ = NULL;
+	PhotoFileReader* _tmp30_;
 	PhotoFileFormatProperties* format_properties = NULL;
-	PhotoFileReader* _tmp31_ = NULL;
-	PhotoFileFormat _tmp32_ = 0;
-	PhotoFileFormatProperties* _tmp33_ = NULL;
+	PhotoFileReader* _tmp31_;
+	PhotoFileFormat _tmp32_;
+	PhotoFileFormatProperties* _tmp33_;
 	GFile* dest_file = NULL;
-	PhotoFileFormatProperties* _tmp34_ = NULL;
-	GFile* _tmp35_ = NULL;
-	GFile* _tmp36_ = NULL;
+	PhotoFileFormatProperties* _tmp34_;
+	GFile* _tmp35_;
+	GFile* _tmp36_;
 	PhotoFileMetadataWriter* writer = NULL;
-	PhotoFileReader* _tmp37_ = NULL;
-	PhotoFileFormat _tmp38_ = 0;
-	GFile* _tmp39_ = NULL;
-	gchar* _tmp40_ = NULL;
-	gchar* _tmp41_ = NULL;
-	PhotoFileMetadataWriter* _tmp42_ = NULL;
-	PhotoFileMetadataWriter* _tmp43_ = NULL;
-	gchar* _tmp45_ = NULL;
-	gchar* _tmp46_ = NULL;
-	PhotoFileMetadataWriter* _tmp47_ = NULL;
-	gchar* _tmp48_ = NULL;
-	gchar* _tmp49_ = NULL;
-	PhotoFileReader* _tmp50_ = NULL;
-	GFile* _tmp51_ = NULL;
-	GFile* _tmp52_ = NULL;
-	GFile* _tmp53_ = NULL;
+	PhotoFileReader* _tmp37_;
+	PhotoFileFormat _tmp38_;
+	GFile* _tmp39_;
+	gchar* _tmp40_;
+	gchar* _tmp41_;
+	PhotoFileMetadataWriter* _tmp42_;
+	PhotoFileMetadataWriter* _tmp43_;
+	gchar* _tmp45_;
+	gchar* _tmp46_;
+	PhotoFileMetadataWriter* _tmp47_;
+	gchar* _tmp48_;
+	gchar* _tmp49_;
+	PhotoFileReader* _tmp50_;
+	GFile* _tmp51_;
+	GFile* _tmp52_;
+	GFile* _tmp53_;
 	gboolean _tmp55_ = FALSE;
 	gboolean _tmp56_ = FALSE;
 	gboolean _tmp57_ = FALSE;
 	gboolean _tmp58_ = FALSE;
 	gboolean _tmp59_ = FALSE;
-	gboolean _tmp60_ = FALSE;
+	gboolean _tmp60_;
 	PhotoMetadata* metadata = NULL;
-	PhotoFileReader* _tmp68_ = NULL;
-	PhotoMetadata* _tmp69_ = NULL;
-	PhotoMetadata* _tmp71_ = NULL;
-	PhotoFileMetadataWriter* _tmp75_ = NULL;
-	gchar* _tmp76_ = NULL;
-	gchar* _tmp77_ = NULL;
-	time_t _tmp78_ = 0;
-	gboolean _tmp84_ = FALSE;
-	PhotoFileMetadataWriter* _tmp101_ = NULL;
-	PhotoMetadata* _tmp102_ = NULL;
+	PhotoFileReader* _tmp68_;
+	PhotoMetadata* _tmp69_;
+	PhotoMetadata* _tmp71_;
+	PhotoFileMetadataWriter* _tmp75_;
+	gchar* _tmp76_;
+	gchar* _tmp77_;
+	time_t _tmp78_;
+	gboolean _tmp84_;
+	PhotoFileMetadataWriter* _tmp101_;
+	PhotoMetadata* _tmp102_;
 	GError * _inner_error_ = NULL;
 #line 3562 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -25685,29 +25676,29 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 	export_reader = NULL;
 #line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_master = TRUE;
-#line 25687 "Photo.c"
+#line 25678 "Photo.c"
 	{
-		PhotoBackingReaders* _tmp0_ = NULL;
+		PhotoBackingReaders* _tmp0_;
 #line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 25694 "Photo.c"
+#line 25685 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
-			PhotoBackingReaders* _tmp2_ = NULL;
-			PhotoFileReader* _tmp3_ = NULL;
+			PhotoBackingReaders* _tmp2_;
+			PhotoFileReader* _tmp3_;
 #line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->readers;
 #line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->editable;
 #line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 25705 "Photo.c"
-				PhotoBackingReaders* _tmp4_ = NULL;
-				PhotoFileReader* _tmp5_ = NULL;
-				PhotoFileFormat _tmp6_ = 0;
-				gboolean _tmp7_ = FALSE;
+#line 25696 "Photo.c"
+				PhotoBackingReaders* _tmp4_;
+				PhotoFileReader* _tmp5_;
+				PhotoFileFormat _tmp6_;
+				gboolean _tmp7_;
 #line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
 #line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25718,18 +25709,18 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 				_tmp7_ = photo_file_format_can_write_metadata (_tmp6_);
 #line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp7_;
-#line 25720 "Photo.c"
+#line 25711 "Photo.c"
 			} else {
 #line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 25724 "Photo.c"
+#line 25715 "Photo.c"
 			}
 #line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_) {
-#line 25728 "Photo.c"
-				PhotoBackingReaders* _tmp8_ = NULL;
-				PhotoFileReader* _tmp9_ = NULL;
-				PhotoFileReader* _tmp10_ = NULL;
+#line 25719 "Photo.c"
+				PhotoBackingReaders* _tmp8_;
+				PhotoFileReader* _tmp9_;
+				PhotoFileReader* _tmp10_;
 #line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->priv->readers;
 #line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25742,22 +25733,22 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 				export_reader = _tmp10_;
 #line 3570 "/home/jens/Source/shotwell/src/Photo.vala"
 				is_master = FALSE;
-#line 25744 "Photo.c"
+#line 25735 "Photo.c"
 			} else {
 				gboolean _tmp11_ = FALSE;
-				PhotoBackingReaders* _tmp12_ = NULL;
-				PhotoFileReader* _tmp13_ = NULL;
+				PhotoBackingReaders* _tmp12_;
+				PhotoFileReader* _tmp13_;
 #line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = self->priv->readers;
 #line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _tmp12_->developer;
 #line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_ != NULL) {
-#line 25755 "Photo.c"
-					PhotoBackingReaders* _tmp14_ = NULL;
-					PhotoFileReader* _tmp15_ = NULL;
-					PhotoFileFormat _tmp16_ = 0;
-					gboolean _tmp17_ = FALSE;
+#line 25746 "Photo.c"
+					PhotoBackingReaders* _tmp14_;
+					PhotoFileReader* _tmp15_;
+					PhotoFileFormat _tmp16_;
+					gboolean _tmp17_;
 #line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = self->priv->readers;
 #line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25768,18 +25759,18 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 					_tmp17_ = photo_file_format_can_write_metadata (_tmp16_);
 #line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _tmp17_;
-#line 25770 "Photo.c"
+#line 25761 "Photo.c"
 				} else {
 #line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = FALSE;
-#line 25774 "Photo.c"
+#line 25765 "Photo.c"
 				}
 #line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_) {
-#line 25778 "Photo.c"
-					PhotoBackingReaders* _tmp18_ = NULL;
-					PhotoFileReader* _tmp19_ = NULL;
-					PhotoFileReader* _tmp20_ = NULL;
+#line 25769 "Photo.c"
+					PhotoBackingReaders* _tmp18_;
+					PhotoFileReader* _tmp19_;
+					PhotoFileReader* _tmp20_;
 #line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = self->priv->readers;
 #line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25792,12 +25783,12 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 					export_reader = _tmp20_;
 #line 3573 "/home/jens/Source/shotwell/src/Photo.vala"
 					is_master = FALSE;
-#line 25794 "Photo.c"
+#line 25785 "Photo.c"
 				} else {
-					PhotoBackingReaders* _tmp21_ = NULL;
-					PhotoFileReader* _tmp22_ = NULL;
-					PhotoFileFormat _tmp23_ = 0;
-					gboolean _tmp24_ = FALSE;
+					PhotoBackingReaders* _tmp21_;
+					PhotoFileReader* _tmp22_;
+					PhotoFileFormat _tmp23_;
+					gboolean _tmp24_;
 #line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = self->priv->readers;
 #line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25808,10 +25799,10 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 					_tmp24_ = photo_file_format_can_write_metadata (_tmp23_);
 #line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp24_) {
-#line 25810 "Photo.c"
-						PhotoBackingReaders* _tmp25_ = NULL;
-						PhotoFileReader* _tmp26_ = NULL;
-						PhotoFileReader* _tmp27_ = NULL;
+#line 25801 "Photo.c"
+						PhotoBackingReaders* _tmp25_;
+						PhotoFileReader* _tmp26_;
+						PhotoFileReader* _tmp27_;
 #line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp25_ = self->priv->readers;
 #line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25822,23 +25813,23 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 						_photo_file_adapter_unref0 (export_reader);
 #line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 						export_reader = _tmp27_;
-#line 25824 "Photo.c"
+#line 25815 "Photo.c"
 					}
 				}
 			}
 		}
-		__finally385:
+		__finally386:
 		{
-			PhotoBackingReaders* _tmp28_ = NULL;
+			PhotoBackingReaders* _tmp28_;
 #line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp28_ = self->priv->readers;
 #line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 25836 "Photo.c"
+#line 25827 "Photo.c"
 		}
 #line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 25840 "Photo.c"
+#line 25831 "Photo.c"
 			gboolean _tmp29_ = FALSE;
 #line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
@@ -25846,7 +25837,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 			_photo_file_adapter_unref0 (export_reader);
 #line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp29_;
-#line 25848 "Photo.c"
+#line 25839 "Photo.c"
 		}
 	}
 #line 3579 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25859,7 +25850,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_photo_file_adapter_unref0 (export_reader);
 #line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 25861 "Photo.c"
+#line 25852 "Photo.c"
 	}
 #line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = export_reader;
@@ -25897,7 +25888,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 	writer = _tmp43_;
 #line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 25899 "Photo.c"
+#line 25890 "Photo.c"
 		gboolean _tmp44_ = FALSE;
 #line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
@@ -25909,7 +25900,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_photo_file_adapter_unref0 (export_reader);
 #line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp44_;
-#line 25911 "Photo.c"
+#line 25902 "Photo.c"
 	}
 #line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
@@ -25941,7 +25932,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 	_g_object_unref0 (_tmp52_);
 #line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 25943 "Photo.c"
+#line 25934 "Photo.c"
 		gboolean _tmp54_ = FALSE;
 #line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
@@ -25955,43 +25946,43 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_photo_file_adapter_unref0 (export_reader);
 #line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp54_;
-#line 25957 "Photo.c"
+#line 25948 "Photo.c"
 	}
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp60_ = photo_has_alterations (self);
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp60_) {
-#line 25963 "Photo.c"
-		gboolean _tmp61_ = FALSE;
+#line 25954 "Photo.c"
+		gboolean _tmp61_;
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp61_ = is_master;
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = _tmp61_;
-#line 25969 "Photo.c"
+#line 25960 "Photo.c"
 	} else {
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = FALSE;
-#line 25973 "Photo.c"
+#line 25964 "Photo.c"
 	}
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp59_) {
-#line 25977 "Photo.c"
-		gboolean _tmp62_ = FALSE;
+#line 25968 "Photo.c"
+		gboolean _tmp62_;
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = photo_has_user_generated_metadata (self);
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = !_tmp62_;
-#line 25983 "Photo.c"
+#line 25974 "Photo.c"
 	} else {
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = FALSE;
-#line 25987 "Photo.c"
+#line 25978 "Photo.c"
 	}
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp58_) {
-#line 25991 "Photo.c"
-		gchar* _tmp63_ = NULL;
-		gchar* _tmp64_ = NULL;
+#line 25982 "Photo.c"
+		gchar* _tmp63_;
+		gchar* _tmp64_;
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp63_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26000,17 +25991,17 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_tmp57_ = _tmp64_ == NULL;
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp64_);
-#line 26002 "Photo.c"
+#line 25993 "Photo.c"
 	} else {
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = FALSE;
-#line 26006 "Photo.c"
+#line 25997 "Photo.c"
 	}
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp57_) {
-#line 26010 "Photo.c"
-		gchar* _tmp65_ = NULL;
-		gchar* _tmp66_ = NULL;
+#line 26001 "Photo.c"
+		gchar* _tmp65_;
+		gchar* _tmp66_;
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp65_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26019,25 +26010,25 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_tmp56_ = _tmp66_ == NULL;
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp66_);
-#line 26021 "Photo.c"
+#line 26012 "Photo.c"
 	} else {
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp56_ = FALSE;
-#line 26025 "Photo.c"
+#line 26016 "Photo.c"
 	}
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp56_) {
-#line 26029 "Photo.c"
-		gboolean _tmp67_ = FALSE;
+#line 26020 "Photo.c"
+		gboolean _tmp67_;
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp67_ = export_metadata;
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp55_ = _tmp67_;
-#line 26035 "Photo.c"
+#line 26026 "Photo.c"
 	} else {
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp55_ = FALSE;
-#line 26039 "Photo.c"
+#line 26030 "Photo.c"
 	}
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp55_) {
@@ -26053,7 +26044,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_photo_file_adapter_unref0 (export_reader);
 #line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 26055 "Photo.c"
+#line 26046 "Photo.c"
 	}
 #line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp68_ = export_reader;
@@ -26063,7 +26054,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 	metadata = _tmp69_;
 #line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 26065 "Photo.c"
+#line 26056 "Photo.c"
 		gboolean _tmp70_ = FALSE;
 #line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
@@ -26077,16 +26068,16 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_photo_file_adapter_unref0 (export_reader);
 #line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp70_;
-#line 26079 "Photo.c"
+#line 26070 "Photo.c"
 	}
 #line 3604 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp71_ = metadata;
 #line 3604 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp71_ == NULL) {
-#line 26085 "Photo.c"
-		PhotoFileReader* _tmp72_ = NULL;
-		PhotoFileFormat _tmp73_ = 0;
-		PhotoMetadata* _tmp74_ = NULL;
+#line 26076 "Photo.c"
+		PhotoFileReader* _tmp72_;
+		PhotoFileFormat _tmp73_;
+		PhotoMetadata* _tmp74_;
 #line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp72_ = export_reader;
 #line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26097,7 +26088,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_media_metadata_unref0 (metadata);
 #line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
 		metadata = _tmp74_;
-#line 26099 "Photo.c"
+#line 26090 "Photo.c"
 	}
 #line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp75_ = writer;
@@ -26113,11 +26104,11 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 	_tmp78_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 3609 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp78_ != ((time_t) 0)) {
-#line 26115 "Photo.c"
-		PhotoMetadata* _tmp79_ = NULL;
-		time_t _tmp80_ = 0;
-		MetadataDateTime* _tmp81_ = NULL;
-		MetadataDateTime* _tmp82_ = NULL;
+#line 26106 "Photo.c"
+		PhotoMetadata* _tmp79_;
+		time_t _tmp80_;
+		MetadataDateTime* _tmp81_;
+		MetadataDateTime* _tmp82_;
 #line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp79_ = metadata;
 #line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26130,34 +26121,34 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		photo_metadata_set_exposure_date_time (_tmp79_, _tmp82_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (_tmp82_);
-#line 26132 "Photo.c"
+#line 26123 "Photo.c"
 	} else {
-		PhotoMetadata* _tmp83_ = NULL;
+		PhotoMetadata* _tmp83_;
 #line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp83_ = metadata;
 #line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_exposure_date_time (_tmp83_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 26139 "Photo.c"
+#line 26130 "Photo.c"
 	}
 #line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp84_ = export_metadata;
 #line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp84_) {
-#line 26145 "Photo.c"
-		PhotoMetadata* _tmp85_ = NULL;
-		gchar* _tmp86_ = NULL;
-		gchar* _tmp87_ = NULL;
-		PhotoMetadata* _tmp88_ = NULL;
-		gchar* _tmp89_ = NULL;
-		gchar* _tmp90_ = NULL;
-		PhotoMetadata* _tmp91_ = NULL;
+#line 26136 "Photo.c"
+		PhotoMetadata* _tmp85_;
+		gchar* _tmp86_;
+		gchar* _tmp87_;
+		PhotoMetadata* _tmp88_;
+		gchar* _tmp89_;
+		gchar* _tmp90_;
+		PhotoMetadata* _tmp91_;
 		Dimensions _tmp92_ = {0};
-		PhotoMetadata* _tmp93_ = NULL;
-		Orientation _tmp94_ = 0;
-		PhotoMetadata* _tmp95_ = NULL;
-		Orientation _tmp96_ = 0;
-		Orientation _tmp97_ = 0;
-		PhotoMetadata* _tmp99_ = NULL;
+		PhotoMetadata* _tmp93_;
+		Orientation _tmp94_;
+		PhotoMetadata* _tmp95_;
+		Orientation _tmp96_;
+		Orientation _tmp97_;
+		PhotoMetadata* _tmp99_;
 #line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp85_ = metadata;
 #line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26200,26 +26191,26 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_tmp97_ = photo_get_original_orientation (self);
 #line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp96_ != _tmp97_) {
-#line 26202 "Photo.c"
-			PhotoMetadata* _tmp98_ = NULL;
+#line 26193 "Photo.c"
+			PhotoMetadata* _tmp98_;
 #line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp98_ = metadata;
 #line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_metadata_remove_exif_thumbnail (_tmp98_);
-#line 26208 "Photo.c"
+#line 26199 "Photo.c"
 		}
 #line 3625 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp99_ = metadata;
 #line 3625 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_set_user_metadata_for_export (self, _tmp99_);
-#line 26214 "Photo.c"
+#line 26205 "Photo.c"
 	} else {
-		PhotoMetadata* _tmp100_ = NULL;
+		PhotoMetadata* _tmp100_;
 #line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = metadata;
 #line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_clear (_tmp100_);
-#line 26221 "Photo.c"
+#line 26212 "Photo.c"
 	}
 #line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp101_ = writer;
@@ -26229,7 +26220,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 	photo_file_metadata_writer_write_metadata (_tmp101_, _tmp102_, &_inner_error_);
 #line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 26231 "Photo.c"
+#line 26222 "Photo.c"
 		gboolean _tmp103_ = FALSE;
 #line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
@@ -26245,7 +26236,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_photo_file_adapter_unref0 (export_reader);
 #line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp103_;
-#line 26247 "Photo.c"
+#line 26238 "Photo.c"
 	}
 #line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
@@ -26261,7 +26252,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 	_photo_file_adapter_unref0 (export_reader);
 #line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 26263 "Photo.c"
+#line 26254 "Photo.c"
 }
 
 
@@ -26270,7 +26261,7 @@ gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileForma
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp3_;
 #line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26281,99 +26272,97 @@ gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileForma
 	if (!_tmp3_) {
 #line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = TRUE;
-#line 26283 "Photo.c"
+#line 26274 "Photo.c"
 	} else {
-		gboolean _tmp4_ = FALSE;
+		gboolean _tmp4_;
 #line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo_has_alterations (self);
 #line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp4_;
-#line 26290 "Photo.c"
+#line 26281 "Photo.c"
 	}
 #line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
 #line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = TRUE;
-#line 26296 "Photo.c"
+#line 26287 "Photo.c"
 	} else {
-		gboolean _tmp5_ = FALSE;
+		gboolean _tmp5_;
 #line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_has_user_generated_metadata (self);
 #line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp5_;
-#line 26303 "Photo.c"
+#line 26294 "Photo.c"
 	}
 #line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
 #line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 26309 "Photo.c"
+#line 26300 "Photo.c"
 	} else {
-		PhotoFileFormat _tmp6_ = 0;
-		PhotoFileFormat _tmp7_ = 0;
+		PhotoFileFormat _tmp6_;
+		PhotoFileFormat _tmp7_;
 #line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = export_format;
 #line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = photo_get_file_format (self);
 #line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp6_ != _tmp7_;
-#line 26319 "Photo.c"
+#line 26310 "Photo.c"
 	}
 #line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 26325 "Photo.c"
+#line 26316 "Photo.c"
 }
 
 
 void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
 	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
+	gboolean _tmp7_;
 	PhotoMetadata* metadata = NULL;
-	PhotoMetadata* _tmp18_ = NULL;
-	PhotoMetadata* _tmp19_ = NULL;
-	PhotoFileFormat _tmp22_ = 0;
-	gboolean _tmp23_ = FALSE;
+	PhotoMetadata* _tmp18_;
+	PhotoMetadata* _tmp19_;
+	PhotoFileFormat _tmp22_;
+	gboolean _tmp23_;
 	PhotoFileWriter* writer = NULL;
-	PhotoFileFormat _tmp25_ = 0;
-	GFile* _tmp26_ = NULL;
-	gchar* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	PhotoFileWriter* _tmp29_ = NULL;
-	PhotoFileWriter* _tmp30_ = NULL;
-	gchar* _tmp31_ = NULL;
-	gchar* _tmp32_ = NULL;
-	PhotoFileWriter* _tmp33_ = NULL;
-	gchar* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
-	PhotoFileFormat _tmp36_ = 0;
+	PhotoFileFormat _tmp25_;
+	GFile* _tmp26_;
+	gchar* _tmp27_;
+	gchar* _tmp28_;
+	PhotoFileWriter* _tmp29_;
+	PhotoFileWriter* _tmp30_;
+	gchar* _tmp31_;
+	gchar* _tmp32_;
+	PhotoFileWriter* _tmp33_;
+	gchar* _tmp34_;
+	gchar* _tmp35_;
+	PhotoFileFormat _tmp36_;
 	GEnumValue* _tmp37_;
 	GdkPixbuf* pixbuf = NULL;
 	gboolean _tmp38_ = FALSE;
-	PhotoFileFormat _tmp39_ = 0;
-	PhotoFileWriter* _tmp49_ = NULL;
-	GdkPixbuf* _tmp50_ = NULL;
-	JpegQuality _tmp51_ = 0;
-	PhotoFileWriter* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
-	gchar* _tmp54_ = NULL;
-	gboolean _tmp55_ = FALSE;
+	PhotoFileFormat _tmp39_;
+	PhotoFileWriter* _tmp49_;
+	GdkPixbuf* _tmp50_;
+	JpegQuality _tmp51_;
+	PhotoFileWriter* _tmp52_;
+	gchar* _tmp53_;
+	gchar* _tmp54_;
+	gboolean _tmp55_;
 	gboolean _tmp75_ = FALSE;
-	PhotoFileFormat _tmp76_ = 0;
+	PhotoFileFormat _tmp76_;
 	PhotoFileMetadataWriter* _tmp86_ = NULL;
-	PhotoFileFormat _tmp87_ = 0;
-	GFile* _tmp88_ = NULL;
-	gchar* _tmp89_ = NULL;
-	gchar* _tmp90_ = NULL;
-	PhotoFileMetadataWriter* _tmp91_ = NULL;
-	PhotoFileMetadataWriter* _tmp92_ = NULL;
-	PhotoFileMetadataWriter* _tmp93_ = NULL;
-	PhotoFileMetadataWriter* _tmp94_ = NULL;
-	PhotoMetadata* _tmp95_ = NULL;
+	PhotoFileFormat _tmp87_;
+	GFile* _tmp88_;
+	gchar* _tmp89_;
+	gchar* _tmp90_;
+	PhotoFileMetadataWriter* _tmp91_;
+	PhotoFileMetadataWriter* _tmp92_;
+	PhotoMetadata* _tmp93_;
 	GError * _inner_error_ = NULL;
 #line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -26385,10 +26374,10 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 	_tmp0_ = direct_copy_unmodified;
 #line 3649 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 26387 "Photo.c"
-		GFile* _tmp1_ = NULL;
-		GFile* _tmp2_ = NULL;
-		GFile* _tmp3_ = NULL;
+#line 26376 "Photo.c"
+		GFile* _tmp1_;
+		GFile* _tmp2_;
+		GFile* _tmp3_;
 #line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26405,80 +26394,80 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 			g_propagate_error (error, _inner_error_);
 #line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26407 "Photo.c"
+#line 26396 "Photo.c"
 		}
 #line 3652 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26411 "Photo.c"
+#line 26400 "Photo.c"
 	}
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = scaling_is_unscaled (scaling);
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_) {
-#line 26417 "Photo.c"
+#line 26406 "Photo.c"
 		gboolean _tmp8_ = FALSE;
-		gboolean _tmp9_ = FALSE;
+		gboolean _tmp9_;
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = photo_has_alterations (self);
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (!_tmp9_) {
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = TRUE;
-#line 26426 "Photo.c"
+#line 26415 "Photo.c"
 		} else {
-			gboolean _tmp10_ = FALSE;
+			gboolean _tmp10_;
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo_only_metadata_changed (self);
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp10_;
-#line 26433 "Photo.c"
+#line 26422 "Photo.c"
 		}
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8_;
-#line 26437 "Photo.c"
+#line 26426 "Photo.c"
 	} else {
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = FALSE;
-#line 26441 "Photo.c"
+#line 26430 "Photo.c"
 	}
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 26445 "Photo.c"
-		PhotoFileFormat _tmp11_ = 0;
-		PhotoFileFormat _tmp12_ = 0;
+#line 26434 "Photo.c"
+		PhotoFileFormat _tmp11_;
+		PhotoFileFormat _tmp12_;
 #line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = export_format;
 #line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = photo_get_file_format (self);
 #line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp11_ == _tmp12_;
-#line 26454 "Photo.c"
+#line 26443 "Photo.c"
 	} else {
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = FALSE;
-#line 26458 "Photo.c"
+#line 26447 "Photo.c"
 	}
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 26462 "Photo.c"
-		PhotoFileFormat _tmp13_ = 0;
+#line 26451 "Photo.c"
+		PhotoFileFormat _tmp13_;
 #line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = photo_get_file_format (self);
 #line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp13_ == PHOTO_FILE_FORMAT_JFIF;
-#line 26468 "Photo.c"
+#line 26457 "Photo.c"
 	} else {
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = FALSE;
-#line 26472 "Photo.c"
+#line 26461 "Photo.c"
 	}
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp4_) {
-#line 26476 "Photo.c"
+#line 26465 "Photo.c"
 		gboolean _tmp14_ = FALSE;
-		GFile* _tmp15_ = NULL;
-		gboolean _tmp16_ = FALSE;
-		gboolean _tmp17_ = FALSE;
+		GFile* _tmp15_;
+		gboolean _tmp16_;
+		gboolean _tmp17_;
 #line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = dest_file;
 #line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26493,13 +26482,13 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 			g_propagate_error (error, _inner_error_);
 #line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26495 "Photo.c"
+#line 26484 "Photo.c"
 		}
 #line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp14_) {
 #line 3662 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26501 "Photo.c"
+#line 26490 "Photo.c"
 		}
 	}
 #line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26510,9 +26499,9 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 	_tmp19_ = metadata;
 #line 3669 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_ == NULL) {
-#line 26512 "Photo.c"
-		PhotoFileFormat _tmp20_ = 0;
-		PhotoMetadata* _tmp21_ = NULL;
+#line 26501 "Photo.c"
+		PhotoFileFormat _tmp20_;
+		PhotoMetadata* _tmp21_;
 #line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = export_format;
 #line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26521,7 +26510,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_media_metadata_unref0 (metadata);
 #line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
 		metadata = _tmp21_;
-#line 26523 "Photo.c"
+#line 26512 "Photo.c"
 	}
 #line 3672 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = export_format;
@@ -26529,13 +26518,13 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 	_tmp23_ = photo_file_format_can_write (_tmp22_);
 #line 3672 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp23_) {
-#line 26531 "Photo.c"
-		PhotoFileFormat _tmp24_ = 0;
+#line 26520 "Photo.c"
+		PhotoFileFormat _tmp24_;
 #line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = photo_file_format_get_system_default_format ();
 #line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
 		export_format = _tmp24_;
-#line 26537 "Photo.c"
+#line 26526 "Photo.c"
 	}
 #line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = export_format;
@@ -26561,7 +26550,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_media_metadata_unref0 (metadata);
 #line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26563 "Photo.c"
+#line 26552 "Photo.c"
 	}
 #line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
@@ -26590,22 +26579,22 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 	if (_tmp39_ == PHOTO_FILE_FORMAT_JFIF) {
 #line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = TRUE;
-#line 26591 "Photo.c"
+#line 26580 "Photo.c"
 	} else {
-		PhotoFileFormat _tmp40_ = 0;
+		PhotoFileFormat _tmp40_;
 #line 3685 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = photo_get_file_format (self);
 #line 3685 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = _tmp40_ == PHOTO_FILE_FORMAT_RAW;
-#line 26598 "Photo.c"
+#line 26587 "Photo.c"
 	}
 #line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp38_) {
-#line 26602 "Photo.c"
+#line 26591 "Photo.c"
 		GdkPixbuf* _tmp41_ = NULL;
-		Scaling _tmp42_ = {0};
-		GdkPixbuf* _tmp43_ = NULL;
-		GdkPixbuf* _tmp44_ = NULL;
+		Scaling _tmp42_;
+		GdkPixbuf* _tmp43_;
+		GdkPixbuf* _tmp44_;
 #line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = *scaling;
 #line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26624,7 +26613,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 			_media_metadata_unref0 (metadata);
 #line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26625 "Photo.c"
+#line 26614 "Photo.c"
 		}
 #line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = _tmp41_;
@@ -26636,12 +26625,12 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		pixbuf = _tmp44_;
 #line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp41_);
-#line 26637 "Photo.c"
+#line 26626 "Photo.c"
 	} else {
 		GdkPixbuf* _tmp45_ = NULL;
-		Scaling _tmp46_ = {0};
-		GdkPixbuf* _tmp47_ = NULL;
-		GdkPixbuf* _tmp48_ = NULL;
+		Scaling _tmp46_;
+		GdkPixbuf* _tmp47_;
+		GdkPixbuf* _tmp48_;
 #line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = *scaling;
 #line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26660,7 +26649,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 			_media_metadata_unref0 (metadata);
 #line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26661 "Photo.c"
+#line 26650 "Photo.c"
 		}
 #line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp45_;
@@ -26672,7 +26661,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		pixbuf = _tmp48_;
 #line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp45_);
-#line 26673 "Photo.c"
+#line 26662 "Photo.c"
 	}
 #line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = writer;
@@ -26694,7 +26683,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_media_metadata_unref0 (metadata);
 #line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26695 "Photo.c"
+#line 26684 "Photo.c"
 	}
 #line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp52_ = writer;
@@ -26710,19 +26699,19 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 	_tmp55_ = export_metadata;
 #line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp55_) {
-#line 26711 "Photo.c"
-		PhotoMetadata* _tmp56_ = NULL;
-		gchar* _tmp57_ = NULL;
-		gchar* _tmp58_ = NULL;
-		PhotoMetadata* _tmp59_ = NULL;
-		gchar* _tmp60_ = NULL;
-		gchar* _tmp61_ = NULL;
-		PhotoMetadata* _tmp62_ = NULL;
-		time_t _tmp63_ = 0;
-		PhotoMetadata* _tmp69_ = NULL;
-		PhotoMetadata* _tmp70_ = NULL;
-		PhotoMetadata* _tmp71_ = NULL;
-		gboolean _tmp72_ = FALSE;
+#line 26700 "Photo.c"
+		PhotoMetadata* _tmp56_;
+		gchar* _tmp57_;
+		gchar* _tmp58_;
+		PhotoMetadata* _tmp59_;
+		gchar* _tmp60_;
+		gchar* _tmp61_;
+		PhotoMetadata* _tmp62_;
+		time_t _tmp63_;
+		PhotoMetadata* _tmp69_;
+		PhotoMetadata* _tmp70_;
+		PhotoMetadata* _tmp71_;
+		gboolean _tmp72_;
 #line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp56_ = metadata;
 #line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26751,11 +26740,11 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_tmp63_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp63_ != ((time_t) 0)) {
-#line 26752 "Photo.c"
-			PhotoMetadata* _tmp64_ = NULL;
-			time_t _tmp65_ = 0;
-			MetadataDateTime* _tmp66_ = NULL;
-			MetadataDateTime* _tmp67_ = NULL;
+#line 26741 "Photo.c"
+			PhotoMetadata* _tmp64_;
+			time_t _tmp65_;
+			MetadataDateTime* _tmp66_;
+			MetadataDateTime* _tmp67_;
 #line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp64_ = metadata;
 #line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26768,14 +26757,14 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 			photo_metadata_set_exposure_date_time (_tmp64_, _tmp67_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
 			_metadata_date_time_unref0 (_tmp67_);
-#line 26769 "Photo.c"
+#line 26758 "Photo.c"
 		} else {
-			PhotoMetadata* _tmp68_ = NULL;
+			PhotoMetadata* _tmp68_;
 #line 3708 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp68_ = metadata;
 #line 3708 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_metadata_set_exposure_date_time (_tmp68_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 26776 "Photo.c"
+#line 26765 "Photo.c"
 		}
 #line 3710 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = metadata;
@@ -26793,21 +26782,21 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_tmp72_ = photo_has_user_generated_metadata (self);
 #line 3714 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp72_) {
-#line 26794 "Photo.c"
-			PhotoMetadata* _tmp73_ = NULL;
+#line 26783 "Photo.c"
+			PhotoMetadata* _tmp73_;
 #line 3715 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = metadata;
 #line 3715 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_user_metadata_for_export (self, _tmp73_);
-#line 26800 "Photo.c"
+#line 26789 "Photo.c"
 		}
 	} else {
-		PhotoMetadata* _tmp74_ = NULL;
+		PhotoMetadata* _tmp74_;
 #line 3719 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp74_ = metadata;
 #line 3719 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_clear (_tmp74_);
-#line 26808 "Photo.c"
+#line 26797 "Photo.c"
 	}
 #line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp76_ = photo_get_file_format (self);
@@ -26815,22 +26804,22 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 	if (_tmp76_ == PHOTO_FILE_FORMAT_JFIF) {
 #line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = TRUE;
-#line 26816 "Photo.c"
+#line 26805 "Photo.c"
 	} else {
-		PhotoFileFormat _tmp77_ = 0;
+		PhotoFileFormat _tmp77_;
 #line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp77_ = photo_get_file_format (self);
 #line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = _tmp77_ == PHOTO_FILE_FORMAT_RAW;
-#line 26823 "Photo.c"
+#line 26812 "Photo.c"
 	}
 #line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp75_) {
-#line 26827 "Photo.c"
-		PhotoMetadata* _tmp78_ = NULL;
+#line 26816 "Photo.c"
+		PhotoMetadata* _tmp78_;
 		Dimensions _tmp79_ = {0};
-		PhotoMetadata* _tmp80_ = NULL;
-		Orientation _tmp81_ = 0;
+		PhotoMetadata* _tmp80_;
+		Orientation _tmp81_;
 #line 3728 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp78_ = metadata;
 #line 3728 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26843,12 +26832,12 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_tmp81_ = photo_get_orientation (self);
 #line 3729 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_orientation (_tmp80_, _tmp81_);
-#line 26844 "Photo.c"
+#line 26833 "Photo.c"
 	} else {
-		PhotoMetadata* _tmp82_ = NULL;
-		GdkPixbuf* _tmp83_ = NULL;
+		PhotoMetadata* _tmp82_;
+		GdkPixbuf* _tmp83_;
 		Dimensions _tmp84_ = {0};
-		PhotoMetadata* _tmp85_ = NULL;
+		PhotoMetadata* _tmp85_;
 #line 3732 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp82_ = metadata;
 #line 3732 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26861,7 +26850,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_tmp85_ = metadata;
 #line 3733 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_orientation (_tmp85_, ORIENTATION_TOP_LEFT);
-#line 26862 "Photo.c"
+#line 26851 "Photo.c"
 	}
 #line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp87_ = export_format;
@@ -26891,20 +26880,12 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_media_metadata_unref0 (metadata);
 #line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26892 "Photo.c"
+#line 26881 "Photo.c"
 	}
 #line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp93_ = _tmp86_;
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp86_ = NULL;
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp94_ = _tmp93_;
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp95_ = metadata;
+	_tmp93_ = metadata;
 #line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_file_metadata_writer_write_metadata (_tmp94_, _tmp95_, &_inner_error_);
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
-	_photo_file_adapter_unref0 (_tmp94_);
+	photo_file_metadata_writer_write_metadata (_tmp86_, _tmp93_, &_inner_error_);
 #line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26919,7 +26900,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_media_metadata_unref0 (metadata);
 #line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26920 "Photo.c"
+#line 26901 "Photo.c"
 	}
 #line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp86_);
@@ -26929,7 +26910,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 	_photo_file_adapter_unref0 (writer);
 #line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 26930 "Photo.c"
+#line 26911 "Photo.c"
 }
 
 
@@ -26937,43 +26918,42 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 	PhotoFileFormat _vala_file_format = 0;
 	GFile* result = NULL;
 	GFile* backing = NULL;
-	PhotoFileFormat _tmp4_ = 0;
-	gboolean _tmp5_ = FALSE;
+	PhotoFileFormat _tmp4_;
+	gboolean _tmp5_;
 	gchar* name = NULL;
 	gchar* ext = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
 	gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
 	gboolean _tmp11_ = FALSE;
-	const gchar* _tmp12_ = NULL;
+	const gchar* _tmp12_;
 	gchar* editable_basename = NULL;
-	const gchar* _tmp22_ = NULL;
-	const gchar* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
+	const gchar* _tmp22_;
+	const gchar* _tmp23_;
+	gchar* _tmp24_;
 	gboolean collision = FALSE;
-	GFile* _tmp26_ = NULL;
-	GFile* _tmp27_ = NULL;
-	GFile* _tmp28_ = NULL;
-	gboolean _tmp29_ = FALSE;
-	GFile* _tmp30_ = NULL;
-	GFile* _tmp31_ = NULL;
-	GFile* _tmp32_ = NULL;
+	GFile* _tmp25_ = NULL;
+	GFile* _tmp26_;
+	GFile* _tmp27_;
+	gboolean _tmp28_ = FALSE;
+	GFile* _tmp29_;
+	GFile* _tmp30_;
+	GFile* _tmp31_;
 	GError * _inner_error_ = NULL;
 #line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 26964 "Photo.c"
+#line 26944 "Photo.c"
 	{
-		PhotoRow* _tmp0_ = NULL;
+		PhotoRow* _tmp0_;
 #line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 26971 "Photo.c"
+#line 26951 "Photo.c"
 		{
-			PhotoFileFormat _tmp1_ = 0;
-			GFile* _tmp2_ = NULL;
+			PhotoFileFormat _tmp1_;
+			GFile* _tmp2_;
 #line 3742 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_get_file_format (self);
 #line 3742 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26984,16 +26964,16 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 			_g_object_unref0 (backing);
 #line 3743 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing = _tmp2_;
-#line 26985 "Photo.c"
+#line 26965 "Photo.c"
 		}
-		__finally386:
+		__finally387:
 		{
-			PhotoRow* _tmp3_ = NULL;
+			PhotoRow* _tmp3_;
 #line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
 #line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 26994 "Photo.c"
+#line 26974 "Photo.c"
 		}
 #line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -27003,7 +26983,7 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 			_g_object_unref0 (backing);
 #line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 27004 "Photo.c"
+#line 26984 "Photo.c"
 		}
 	}
 #line 3746 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27012,13 +26992,13 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 	_tmp5_ = photo_file_format_can_write (_tmp4_);
 #line 3746 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp5_) {
-#line 27013 "Photo.c"
-		PhotoFileFormat _tmp6_ = 0;
+#line 26993 "Photo.c"
+		PhotoFileFormat _tmp6_;
 #line 3747 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = photo_file_format_get_system_default_format ();
 #line 3747 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_file_format = _tmp6_;
-#line 27019 "Photo.c"
+#line 26999 "Photo.c"
 	}
 #line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = g_file_get_basename (backing);
@@ -27042,13 +27022,13 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 	if (_tmp12_ == NULL) {
 #line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = TRUE;
-#line 27043 "Photo.c"
+#line 27023 "Photo.c"
 	} else {
-		PhotoFileFormat _tmp13_ = 0;
-		PhotoFileFormatProperties* _tmp14_ = NULL;
-		PhotoFileFormatProperties* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
-		gboolean _tmp17_ = FALSE;
+		PhotoFileFormat _tmp13_;
+		PhotoFileFormatProperties* _tmp14_;
+		PhotoFileFormatProperties* _tmp15_;
+		const gchar* _tmp16_;
+		gboolean _tmp17_;
 #line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _vala_file_format;
 #line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27063,15 +27043,15 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 		_tmp11_ = !_tmp17_;
 #line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (_tmp15_);
-#line 27064 "Photo.c"
+#line 27044 "Photo.c"
 	}
 #line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 27068 "Photo.c"
-		PhotoFileFormat _tmp18_ = 0;
-		PhotoFileFormatProperties* _tmp19_ = NULL;
-		PhotoFileFormatProperties* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
+#line 27048 "Photo.c"
+		PhotoFileFormat _tmp18_;
+		PhotoFileFormatProperties* _tmp19_;
+		PhotoFileFormatProperties* _tmp20_;
+		gchar* _tmp21_;
 #line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _vala_file_format;
 #line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27086,32 +27066,30 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 		ext = _tmp21_;
 #line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (_tmp20_);
-#line 27087 "Photo.c"
+#line 27067 "Photo.c"
 	}
 #line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = name;
 #line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp23_ = _ ("modified");
+	_tmp23_ = ext;
 #line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp24_ = ext;
+	_tmp24_ = g_strdup_printf ("%s_%s.%s", _tmp22_, _ ("modified"), _tmp23_);
 #line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp25_ = g_strdup_printf ("%s_%s.%s", _tmp22_, _tmp23_, _tmp24_);
-#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
-	editable_basename = _tmp25_;
+	editable_basename = _tmp24_;
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp27_ = g_file_get_parent (backing);
+	_tmp26_ = g_file_get_parent (backing);
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp28_ = _tmp27_;
+	_tmp27_ = _tmp26_;
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp30_ = generate_unique_file (_tmp28_, editable_basename, &_tmp29_, &_inner_error_);
+	_tmp29_ = generate_unique_file (_tmp27_, editable_basename, &_tmp28_, &_inner_error_);
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
-	collision = _tmp29_;
+	collision = _tmp28_;
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp31_ = _tmp30_;
+	_tmp30_ = _tmp29_;
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (_tmp28_);
+	_g_object_unref0 (_tmp27_);
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp26_ = _tmp31_;
+	_tmp25_ = _tmp30_;
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27126,16 +27104,16 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 		_g_object_unref0 (backing);
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 27127 "Photo.c"
+#line 27105 "Photo.c"
 	}
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp32_ = _tmp26_;
+	_tmp31_ = _tmp25_;
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp26_ = NULL;
+	_tmp25_ = NULL;
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
-	result = _tmp32_;
+	result = _tmp31_;
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (_tmp26_);
+	_g_object_unref0 (_tmp25_);
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (editable_basename);
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27148,18 +27126,18 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 	if (file_format) {
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 		*file_format = _vala_file_format;
-#line 27149 "Photo.c"
+#line 27127 "Photo.c"
 	}
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 27153 "Photo.c"
+#line 27131 "Photo.c"
 }
 
 
 static void _g_object_unref0_ (gpointer var) {
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 	(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
-#line 27160 "Photo.c"
+#line 27138 "Photo.c"
 }
 
 
@@ -27168,43 +27146,43 @@ static void _g_list_free__g_object_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_list_free (self);
-#line 27169 "Photo.c"
+#line 27147 "Photo.c"
 }
 
 
 static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, GError** error) {
 	gboolean result = FALSE;
 	gchar* _tmp0_ = NULL;
-	PhotoFileFormat _tmp1_ = 0;
+	PhotoFileFormat _tmp1_;
 	gchar* commandline = NULL;
-	gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
+	gchar* _tmp8_;
+	const gchar* _tmp9_;
+	gboolean _tmp10_;
 	GAppInfo* app = NULL;
 	GList* files = NULL;
-	GFile* _tmp16_ = NULL;
-	GFile* _tmp17_ = NULL;
-	GAppInfo* _tmp18_ = NULL;
+	GFile* _tmp16_;
+	GFile* _tmp17_;
+	GAppInfo* _tmp18_;
 	gchar** argv = NULL;
-	gchar** _tmp24_ = NULL;
-	gint argv_length1 = 0;
-	gint _argv_size_ = 0;
-	gchar** _tmp25_ = NULL;
-	gint _tmp25__length1 = 0;
-	const gchar* _tmp26_ = NULL;
-	gchar* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	gchar** _tmp29_ = NULL;
-	gint _tmp29__length1 = 0;
-	GFile* _tmp30_ = NULL;
-	gchar* _tmp31_ = NULL;
-	gchar* _tmp32_ = NULL;
+	gchar** _tmp24_;
+	gint argv_length1;
+	gint _argv_size_;
+	gchar** _tmp25_;
+	gint _tmp25__length1;
+	const gchar* _tmp26_;
+	gchar* _tmp27_;
+	gchar* _tmp28_;
+	gchar** _tmp29_;
+	gint _tmp29__length1;
+	GFile* _tmp30_;
+	gchar* _tmp31_;
+	gchar* _tmp32_;
 	GPid child_pid = 0;
 	gboolean _tmp33_ = FALSE;
-	gchar** _tmp34_ = NULL;
-	gint _tmp34__length1 = 0;
+	gchar** _tmp34_;
+	gint _tmp34__length1;
 	GPid _tmp35_ = 0;
-	gboolean _tmp36_ = FALSE;
+	gboolean _tmp36_;
 	GError * _inner_error_ = NULL;
 #line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
@@ -27212,10 +27190,10 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 	_tmp1_ = file_format;
 #line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) {
-#line 27213 "Photo.c"
-		ConfigFacade* _tmp2_ = NULL;
-		ConfigFacade* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
+#line 27191 "Photo.c"
+		ConfigFacade* _tmp2_;
+		ConfigFacade* _tmp3_;
+		gchar* _tmp4_;
 #line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = config_facade_get_instance ();
 #line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27228,11 +27206,11 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		_tmp0_ = _tmp4_;
 #line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 27229 "Photo.c"
+#line 27207 "Photo.c"
 	} else {
-		ConfigFacade* _tmp5_ = NULL;
-		ConfigFacade* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		ConfigFacade* _tmp5_;
+		ConfigFacade* _tmp6_;
+		gchar* _tmp7_;
 #line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = config_facade_get_instance ();
 #line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27245,7 +27223,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		_tmp0_ = _tmp7_;
 #line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp6_);
-#line 27246 "Photo.c"
+#line 27224 "Photo.c"
 	}
 #line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_strdup (_tmp0_);
@@ -27265,13 +27243,13 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		_g_free0 (_tmp0_);
 #line 3766 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 27266 "Photo.c"
+#line 27244 "Photo.c"
 	}
 	{
 		GAppInfo* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-		GAppInfo* _tmp13_ = NULL;
-		GAppInfo* _tmp14_ = NULL;
+		const gchar* _tmp12_;
+		GAppInfo* _tmp13_;
+		GAppInfo* _tmp14_;
 #line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = commandline;
 #line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27280,8 +27258,8 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		_tmp11_ = _tmp13_;
 #line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27281 "Photo.c"
-			goto __catch387_g_error;
+#line 27259 "Photo.c"
+			goto __catch388_g_error;
 		}
 #line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp11_;
@@ -27293,10 +27271,10 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		app = _tmp14_;
 #line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp11_);
-#line 27294 "Photo.c"
+#line 27272 "Photo.c"
 	}
-	goto __finally387;
-	__catch387_g_error:
+	goto __finally388;
+	__catch388_g_error:
 	{
 		GError* er = NULL;
 #line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27309,12 +27287,12 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		app = NULL;
 #line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (er);
-#line 27310 "Photo.c"
+#line 27288 "Photo.c"
 	}
-	__finally387:
+	__finally388:
 #line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27315 "Photo.c"
+#line 27293 "Photo.c"
 		gboolean _tmp15_ = FALSE;
 #line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
@@ -27326,7 +27304,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		_g_free0 (_tmp0_);
 #line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp15_;
-#line 27327 "Photo.c"
+#line 27305 "Photo.c"
 	}
 #line 3776 "/home/jens/Source/shotwell/src/Photo.vala"
 	files = NULL;
@@ -27340,11 +27318,11 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 	_tmp18_ = app;
 #line 3779 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp18_ != NULL) {
-#line 27341 "Photo.c"
+#line 27319 "Photo.c"
 		gboolean _tmp19_ = FALSE;
-		GAppInfo* _tmp20_ = NULL;
-		GList* _tmp21_ = NULL;
-		gboolean _tmp22_ = FALSE;
+		GAppInfo* _tmp20_;
+		GList* _tmp21_;
+		gboolean _tmp22_;
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = app;
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27355,7 +27333,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		_tmp19_ = _tmp22_;
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27356 "Photo.c"
+#line 27334 "Photo.c"
 			gboolean _tmp23_ = FALSE;
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
@@ -27369,7 +27347,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 			_g_free0 (_tmp0_);
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp23_;
-#line 27370 "Photo.c"
+#line 27348 "Photo.c"
 		}
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp19_;
@@ -27383,7 +27361,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		_g_free0 (_tmp0_);
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 27384 "Photo.c"
+#line 27362 "Photo.c"
 	}
 #line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = g_new0 (gchar*, 2 + 1);
@@ -27433,7 +27411,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 	_tmp33_ = _tmp36_;
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27434 "Photo.c"
+#line 27412 "Photo.c"
 		gboolean _tmp37_ = FALSE;
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
@@ -27449,7 +27427,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		_g_free0 (_tmp0_);
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp37_;
-#line 27450 "Photo.c"
+#line 27428 "Photo.c"
 	}
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp33_;
@@ -27465,14 +27443,14 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 	_g_free0 (_tmp0_);
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 27466 "Photo.c"
+#line 27444 "Photo.c"
 }
 
 
 void photo_open_with_raw_external_editor (Photo* self, GError** error) {
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	PhotoFileFormat _tmp2_ = 0;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	PhotoFileFormat _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 3798 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -27492,7 +27470,7 @@ void photo_open_with_raw_external_editor (Photo* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27493 "Photo.c"
+#line 27471 "Photo.c"
 	}
 }
 
@@ -27503,13 +27481,13 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 	PhotoFileFormat editable_file_format = 0;
 	gboolean _tmp15_ = FALSE;
 	gboolean _tmp16_ = FALSE;
-	GFile* _tmp17_ = NULL;
+	GFile* _tmp17_;
 	gboolean _tmp25_ = FALSE;
-	GFile* _tmp26_ = NULL;
-	GFile* _tmp44_ = NULL;
-	GFileMonitor* _tmp45_ = NULL;
-	GFile* _tmp47_ = NULL;
-	PhotoFileFormat _tmp48_ = 0;
+	GFile* _tmp26_;
+	GFile* _tmp44_;
+	GFileMonitor* _tmp45_;
+	GFile* _tmp47_;
+	PhotoFileFormat _tmp48_;
 	GError * _inner_error_ = NULL;
 #line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -27517,28 +27495,28 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 	current_editable_file = NULL;
 #line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
 	create_editable_file = NULL;
-#line 27518 "Photo.c"
+#line 27496 "Photo.c"
 	{
-		PhotoBackingReaders* _tmp0_ = NULL;
+		PhotoBackingReaders* _tmp0_;
 #line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 27525 "Photo.c"
+#line 27503 "Photo.c"
 		{
-			PhotoBackingReaders* _tmp1_ = NULL;
-			PhotoFileReader* _tmp2_ = NULL;
-			GFile* _tmp6_ = NULL;
+			PhotoBackingReaders* _tmp1_;
+			PhotoFileReader* _tmp2_;
+			GFile* _tmp6_;
 #line 3808 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
 #line 3808 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
 #line 3808 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 27536 "Photo.c"
-				PhotoBackingReaders* _tmp3_ = NULL;
-				PhotoFileReader* _tmp4_ = NULL;
-				GFile* _tmp5_ = NULL;
+#line 27514 "Photo.c"
+				PhotoBackingReaders* _tmp3_;
+				PhotoFileReader* _tmp4_;
+				GFile* _tmp5_;
 #line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
 #line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27549,17 +27527,17 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				_g_object_unref0 (current_editable_file);
 #line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
 				current_editable_file = _tmp5_;
-#line 27550 "Photo.c"
+#line 27528 "Photo.c"
 			}
 #line 3811 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = current_editable_file;
 #line 3811 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ == NULL) {
-#line 27556 "Photo.c"
+#line 27534 "Photo.c"
 				GFile* _tmp7_ = NULL;
 				PhotoFileFormat _tmp8_ = 0;
-				GFile* _tmp9_ = NULL;
-				GFile* _tmp10_ = NULL;
+				GFile* _tmp9_;
+				GFile* _tmp10_;
 #line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo_generate_new_editable_file (self, &_tmp8_, &_inner_error_);
 #line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27568,8 +27546,8 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				_tmp7_ = _tmp9_;
 #line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27569 "Photo.c"
-					goto __finally388;
+#line 27547 "Photo.c"
+					goto __finally389;
 				}
 #line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp7_;
@@ -27581,11 +27559,11 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				create_editable_file = _tmp10_;
 #line 3811 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp7_);
-#line 27582 "Photo.c"
+#line 27560 "Photo.c"
 			} else {
-				PhotoBackingReaders* _tmp11_ = NULL;
-				PhotoFileReader* _tmp12_ = NULL;
-				PhotoFileFormat _tmp13_ = 0;
+				PhotoBackingReaders* _tmp11_;
+				PhotoFileReader* _tmp12_;
+				PhotoFileFormat _tmp13_;
 #line 3814 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->priv->readers;
 #line 3814 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27594,17 +27572,17 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				_tmp13_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 3814 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_file_format = _tmp13_;
-#line 27595 "Photo.c"
+#line 27573 "Photo.c"
 			}
 		}
-		__finally388:
+		__finally389:
 		{
-			PhotoBackingReaders* _tmp14_ = NULL;
+			PhotoBackingReaders* _tmp14_;
 #line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = self->priv->readers;
 #line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 27605 "Photo.c"
+#line 27583 "Photo.c"
 		}
 #line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -27616,31 +27594,31 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 			_g_object_unref0 (current_editable_file);
 #line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27617 "Photo.c"
+#line 27595 "Photo.c"
 		}
 	}
 #line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = create_editable_file;
 #line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_ == NULL) {
-#line 27624 "Photo.c"
-		GFile* _tmp18_ = NULL;
+#line 27602 "Photo.c"
+		GFile* _tmp18_;
 #line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = current_editable_file;
 #line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp18_ != NULL;
-#line 27630 "Photo.c"
+#line 27608 "Photo.c"
 	} else {
 #line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = FALSE;
-#line 27634 "Photo.c"
+#line 27612 "Photo.c"
 	}
 #line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 27638 "Photo.c"
+#line 27616 "Photo.c"
 		gboolean _tmp19_ = FALSE;
-		GFile* _tmp20_ = NULL;
-		gboolean _tmp21_ = FALSE;
+		GFile* _tmp20_;
+		gboolean _tmp21_;
 #line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = current_editable_file;
 #line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27649,28 +27627,28 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 		if (!_tmp21_) {
 #line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = TRUE;
-#line 27650 "Photo.c"
+#line 27628 "Photo.c"
 		} else {
-			gboolean _tmp22_ = FALSE;
+			gboolean _tmp22_;
 #line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = photo_has_transformations (self);
 #line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = _tmp22_;
-#line 27657 "Photo.c"
+#line 27635 "Photo.c"
 		}
 #line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = _tmp19_;
-#line 27661 "Photo.c"
+#line 27639 "Photo.c"
 	} else {
 #line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = FALSE;
-#line 27665 "Photo.c"
+#line 27643 "Photo.c"
 	}
 #line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_) {
-#line 27669 "Photo.c"
-		GFile* _tmp23_ = NULL;
-		GFile* _tmp24_ = NULL;
+#line 27647 "Photo.c"
+		GFile* _tmp23_;
+		GFile* _tmp24_;
 #line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = current_editable_file;
 #line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27679,41 +27657,41 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 		_g_object_unref0 (create_editable_file);
 #line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
 		create_editable_file = _tmp24_;
-#line 27680 "Photo.c"
+#line 27658 "Photo.c"
 	}
 #line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = create_editable_file;
 #line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp26_ != NULL) {
-#line 27686 "Photo.c"
-		PhotoFileFormat _tmp27_ = 0;
-		gboolean _tmp28_ = FALSE;
+#line 27664 "Photo.c"
+		PhotoFileFormat _tmp27_;
+		gboolean _tmp28_;
 #line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp27_ = editable_file_format;
 #line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = photo_file_format_can_write (_tmp27_);
 #line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp28_;
-#line 27695 "Photo.c"
+#line 27673 "Photo.c"
 	} else {
 #line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = FALSE;
-#line 27699 "Photo.c"
+#line 27677 "Photo.c"
 	}
 #line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp25_) {
-#line 27703 "Photo.c"
-		PhotoFileFormat _tmp40_ = 0;
-		GFile* _tmp41_ = NULL;
-		GFile* _tmp42_ = NULL;
-		GFile* _tmp43_ = NULL;
+#line 27681 "Photo.c"
+		PhotoFileFormat _tmp40_;
+		GFile* _tmp41_;
+		GFile* _tmp42_;
+		GFile* _tmp43_;
 #line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_halt_monitoring_editable (self);
-#line 27710 "Photo.c"
+#line 27688 "Photo.c"
 		{
-			GFile* _tmp29_ = NULL;
+			GFile* _tmp29_;
 			Scaling _tmp30_ = {0};
-			PhotoFileFormat _tmp31_ = 0;
+			PhotoFileFormat _tmp31_;
 #line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = create_editable_file;
 #line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27724,42 +27702,42 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 			photo_export (self, _tmp29_, &_tmp30_, JPEG_QUALITY_MAXIMUM, _tmp31_, FALSE, TRUE, &_inner_error_);
 #line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27725 "Photo.c"
-				goto __catch389_g_error;
+#line 27703 "Photo.c"
+				goto __catch390_g_error;
 			}
 		}
-		goto __finally389;
-		__catch389_g_error:
+		goto __finally390;
+		__catch390_g_error:
 		{
 			GError* err = NULL;
-			GError* _tmp38_ = NULL;
-			GError* _tmp39_ = NULL;
+			GError* _tmp38_;
+			GError* _tmp39_;
 #line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
 #line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 27739 "Photo.c"
+#line 27717 "Photo.c"
 			{
-				GFile* _tmp32_ = NULL;
+				GFile* _tmp32_;
 #line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = create_editable_file;
 #line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_file_delete (_tmp32_, NULL, &_inner_error_);
 #line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27748 "Photo.c"
-					goto __catch390_g_error;
+#line 27726 "Photo.c"
+					goto __catch391_g_error;
 				}
 			}
-			goto __finally390;
-			__catch390_g_error:
+			goto __finally391;
+			__catch391_g_error:
 			{
 				GError* delete_err = NULL;
-				GFile* _tmp33_ = NULL;
-				gchar* _tmp34_ = NULL;
-				gchar* _tmp35_ = NULL;
-				GError* _tmp36_ = NULL;
-				const gchar* _tmp37_ = NULL;
+				GFile* _tmp33_;
+				gchar* _tmp34_;
+				gchar* _tmp35_;
+				GError* _tmp36_;
+				const gchar* _tmp37_;
 #line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				delete_err = _inner_error_;
 #line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27781,9 +27759,9 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				_g_free0 (_tmp35_);
 #line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (delete_err);
-#line 27781 "Photo.c"
+#line 27759 "Photo.c"
 			}
-			__finally390:
+			__finally391:
 #line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27800,7 +27778,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				g_clear_error (&_inner_error_);
 #line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 27800 "Photo.c"
+#line 27778 "Photo.c"
 			}
 #line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = err;
@@ -27810,10 +27788,10 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 			_inner_error_ = _tmp39_;
 #line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 27810 "Photo.c"
-			goto __finally389;
+#line 27788 "Photo.c"
+			goto __finally390;
 		}
-		__finally389:
+		__finally390:
 #line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27824,7 +27802,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 			_g_object_unref0 (current_editable_file);
 #line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27824 "Photo.c"
+#line 27802 "Photo.c"
 		}
 #line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = editable_file_format;
@@ -27842,7 +27820,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 			_g_object_unref0 (current_editable_file);
 #line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27842 "Photo.c"
+#line 27820 "Photo.c"
 		}
 #line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = create_editable_file;
@@ -27852,7 +27830,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 		_g_object_unref0 (current_editable_file);
 #line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 		current_editable_file = _tmp43_;
-#line 27852 "Photo.c"
+#line 27830 "Photo.c"
 	}
 #line 3849 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = current_editable_file;
@@ -27862,8 +27840,8 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 	_tmp45_ = self->priv->editable_monitor;
 #line 3852 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp45_ == NULL) {
-#line 27862 "Photo.c"
-		GFile* _tmp46_ = NULL;
+#line 27840 "Photo.c"
+		GFile* _tmp46_;
 #line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = current_editable_file;
 #line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27878,7 +27856,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 			_g_object_unref0 (current_editable_file);
 #line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27878 "Photo.c"
+#line 27856 "Photo.c"
 		}
 	}
 #line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27897,42 +27875,42 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 		_g_object_unref0 (current_editable_file);
 #line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27897 "Photo.c"
+#line 27875 "Photo.c"
 	}
 #line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (create_editable_file);
 #line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (current_editable_file);
-#line 27903 "Photo.c"
+#line 27881 "Photo.c"
 }
 
 
 void photo_revert_to_master (Photo* self, gboolean notify) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 3858 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
 #line 3859 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = notify;
 #line 3859 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_detach_editable (self, TRUE, TRUE, _tmp0_);
-#line 27915 "Photo.c"
+#line 27893 "Photo.c"
 }
 
 
 static void _photo_on_editable_file_changed_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) {
 #line 3869 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_editable_file_changed ((Photo*) self, file, other_file, event_type);
-#line 27922 "Photo.c"
+#line 27900 "Photo.c"
 }
 
 
 static void photo_start_monitoring_editable (Photo* self, GFile* file, GError** error) {
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	GFileMonitor* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFileMonitor* _tmp3_ = NULL;
-	GFileMonitor* _tmp4_ = NULL;
-	GFileMonitor* _tmp5_ = NULL;
+	GFile* _tmp2_;
+	GFileMonitor* _tmp3_;
+	GFileMonitor* _tmp4_;
+	GFileMonitor* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 3862 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -27956,7 +27934,7 @@ static void photo_start_monitoring_editable (Photo* self, GFile* file, GError**
 		g_propagate_error (error, _inner_error_);
 #line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27956 "Photo.c"
+#line 27934 "Photo.c"
 	}
 #line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp1_;
@@ -27972,18 +27950,18 @@ static void photo_start_monitoring_editable (Photo* self, GFile* file, GError**
 	g_signal_connect_object (_tmp5_, "changed", (GCallback) _photo_on_editable_file_changed_g_file_monitor_changed, self, 0);
 #line 3862 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp1_);
-#line 27972 "Photo.c"
+#line 27950 "Photo.c"
 }
 
 
 static void photo_halt_monitoring_editable (Photo* self) {
-	GFileMonitor* _tmp0_ = NULL;
+	GFileMonitor* _tmp0_;
 	GFile* file = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFileMonitor* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	GFileMonitor* _tmp6_ = NULL;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	GFileMonitor* _tmp4_;
+	guint _tmp5_;
+	GFileMonitor* _tmp6_;
 #line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
 #line 3873 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27992,7 +27970,7 @@ static void photo_halt_monitoring_editable (Photo* self) {
 	if (_tmp0_ == NULL) {
 #line 3874 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27992 "Photo.c"
+#line 27970 "Photo.c"
 	}
 #line 3877 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_editable_file (self);
@@ -28002,13 +27980,13 @@ static void photo_halt_monitoring_editable (Photo* self) {
 	_tmp2_ = file;
 #line 3878 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 28002 "Photo.c"
-		GFile* _tmp3_ = NULL;
+#line 27980 "Photo.c"
+		GFile* _tmp3_;
 #line 3879 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = file;
 #line 3879 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_monitor_unblacklist_file (_tmp3_);
-#line 28008 "Photo.c"
+#line 27986 "Photo.c"
 	}
 #line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = self->priv->editable_monitor;
@@ -28026,17 +28004,17 @@ static void photo_halt_monitoring_editable (Photo* self) {
 	self->priv->editable_monitor = NULL;
 #line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 28026 "Photo.c"
+#line 28004 "Photo.c"
 }
 
 
 static void photo_attach_editable (Photo* self, PhotoFileFormat file_format, GFile* file, GError** error) {
-	PhotoFileFormat _tmp0_ = 0;
-	GFile* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PhotoFileReader* _tmp4_ = NULL;
-	PhotoFileReader* _tmp5_ = NULL;
+	PhotoFileFormat _tmp0_;
+	GFile* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	PhotoFileReader* _tmp4_;
+	PhotoFileReader* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 3886 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -28068,7 +28046,7 @@ static void photo_attach_editable (Photo* self, PhotoFileFormat file_format, GFi
 		g_propagate_error (error, _inner_error_);
 #line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 28068 "Photo.c"
+#line 28046 "Photo.c"
 	}
 }
 
@@ -28085,7 +28063,7 @@ static void photo_update_editable_attributes (Photo* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 3896 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 28085 "Photo.c"
+#line 28063 "Photo.c"
 	}
 }
 
@@ -28102,151 +28080,151 @@ void photo_reimport_editable (Photo* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 3900 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 28102 "Photo.c"
+#line 28080 "Photo.c"
 	}
 }
 
 
-static void _vala_array_add103 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add103 (gchar** * array, int* length, int* size, gchar* value) {
 #line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28114 "Photo.c"
+#line 28092 "Photo.c"
 	}
 #line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28120 "Photo.c"
+#line 28098 "Photo.c"
 }
 
 
-static void _vala_array_add104 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add104 (gchar** * array, int* length, int* size, gchar* value) {
 #line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28131 "Photo.c"
+#line 28109 "Photo.c"
 	}
 #line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28137 "Photo.c"
+#line 28115 "Photo.c"
 }
 
 
-static void _vala_array_add105 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add105 (gchar** * array, int* length, int* size, gchar* value) {
 #line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28148 "Photo.c"
+#line 28126 "Photo.c"
 	}
 #line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28154 "Photo.c"
+#line 28132 "Photo.c"
 }
 
 
-static void _vala_array_add106 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add106 (gchar** * array, int* length, int* size, gchar* value) {
 #line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28165 "Photo.c"
+#line 28143 "Photo.c"
 	}
 #line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28171 "Photo.c"
+#line 28149 "Photo.c"
 }
 
 
-static void _vala_array_add107 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add107 (gchar** * array, int* length, int* size, gchar* value) {
 #line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28182 "Photo.c"
+#line 28160 "Photo.c"
 	}
 #line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28188 "Photo.c"
+#line 28166 "Photo.c"
 }
 
 
-static void _vala_array_add108 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add108 (gchar** * array, int* length, int* size, gchar* value) {
 #line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28199 "Photo.c"
+#line 28177 "Photo.c"
 	}
 #line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28205 "Photo.c"
+#line 28183 "Photo.c"
 }
 
 
 static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoFileReader* new_reader, GError** error) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp2_;
 	PhotoFileReader* old_reader = NULL;
-	PhotoFileReader* _tmp5_ = NULL;
+	PhotoFileReader* _tmp5_;
 	PhotoFileReader* _tmp6_ = NULL;
-	PhotoFileReader* _tmp7_ = NULL;
+	PhotoFileReader* _tmp7_;
 	PhotoFileReader* reader = NULL;
-	PhotoFileReader* _tmp9_ = NULL;
-	PhotoFileReader* _tmp10_ = NULL;
+	PhotoFileReader* _tmp9_;
+	PhotoFileReader* _tmp10_;
 	gboolean timestamp_changed = FALSE;
 	gboolean filesize_changed = FALSE;
 	gboolean is_new_editable = FALSE;
 	BackingPhotoID editable_id = {0};
 	BackingPhotoID _tmp11_ = {0};
 	GFile* file = NULL;
-	PhotoFileReader* _tmp12_ = NULL;
-	GFile* _tmp13_ = NULL;
+	PhotoFileReader* _tmp12_;
+	GFile* _tmp13_;
 	DetectedPhotoInformation* detected = NULL;
 	BackingPhotoRow* backing = NULL;
-	GFile* _tmp14_ = NULL;
+	GFile* _tmp14_;
 	DetectedPhotoInformation* _tmp15_ = NULL;
-	BackingPhotoRow* _tmp16_ = NULL;
-	gboolean _tmp17_ = FALSE;
-	gboolean _tmp35_ = FALSE;
-	PhotoFileReader* _tmp94_ = NULL;
+	BackingPhotoRow* _tmp16_;
+	gboolean _tmp17_;
+	gboolean _tmp35_;
+	PhotoFileReader* _tmp94_;
 	gboolean _tmp100_ = FALSE;
-	gboolean _tmp101_ = FALSE;
+	gboolean _tmp101_;
 	gchar** alteration_list = NULL;
-	gchar** _tmp112_ = NULL;
-	gint alteration_list_length1 = 0;
-	gint _alteration_list_size_ = 0;
-	gboolean _tmp113_ = FALSE;
+	gchar** _tmp112_;
+	gint alteration_list_length1;
+	gint _alteration_list_size_;
+	gboolean _tmp113_;
 	gboolean _tmp121_ = FALSE;
-	gboolean _tmp122_ = FALSE;
-	gchar** _tmp131_ = NULL;
-	gint _tmp131__length1 = 0;
+	gboolean _tmp122_;
+	gchar** _tmp131_;
+	gint _tmp131__length1;
 	GError * _inner_error_ = NULL;
 #line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -28256,30 +28234,30 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	_tmp2_ = only_attributes;
 #line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 28256 "Photo.c"
-		PhotoFileReader* _tmp3_ = NULL;
+#line 28234 "Photo.c"
+		PhotoFileReader* _tmp3_;
 #line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = new_reader;
 #line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 28262 "Photo.c"
+#line 28240 "Photo.c"
 	} else {
 #line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 28266 "Photo.c"
+#line 28244 "Photo.c"
 	}
 #line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
 #line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 28272 "Photo.c"
+#line 28250 "Photo.c"
 	} else {
-		gboolean _tmp4_ = FALSE;
+		gboolean _tmp4_;
 #line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = only_attributes;
 #line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = !_tmp4_;
-#line 28279 "Photo.c"
+#line 28257 "Photo.c"
 	}
 #line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp0_, "(only_attributes && new_reader == null) || (!only_attributes)");
@@ -28293,13 +28271,13 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	_tmp6_ = _tmp7_;
 #line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_ == NULL) {
-#line 28293 "Photo.c"
-		PhotoFileReader* _tmp8_ = NULL;
+#line 28271 "Photo.c"
+		PhotoFileReader* _tmp8_;
 #line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = old_reader;
 #line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8_;
-#line 28299 "Photo.c"
+#line 28277 "Photo.c"
 	}
 #line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _photo_file_adapter_ref0 (_tmp6_);
@@ -28317,7 +28295,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_photo_file_adapter_unref0 (old_reader);
 #line 3915 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 28317 "Photo.c"
+#line 28295 "Photo.c"
 	}
 #line 3918 "/home/jens/Source/shotwell/src/Photo.vala"
 	timestamp_changed = FALSE;
@@ -28359,22 +28337,22 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_photo_file_adapter_unref0 (old_reader);
 #line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 28359 "Photo.c"
+#line 28337 "Photo.c"
 	}
 #line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = backing_photo_id_is_invalid (&editable_id);
 #line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_) {
-#line 28365 "Photo.c"
-		BackingPhotoRow* _tmp18_ = NULL;
+#line 28343 "Photo.c"
+		BackingPhotoRow* _tmp18_;
 #line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = backing;
 #line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp18_ != NULL) {
-#line 28371 "Photo.c"
-			BackingPhotoTable* _tmp19_ = NULL;
-			BackingPhotoTable* _tmp20_ = NULL;
-			BackingPhotoRow* _tmp21_ = NULL;
+#line 28349 "Photo.c"
+			BackingPhotoTable* _tmp19_;
+			BackingPhotoTable* _tmp20_;
+			BackingPhotoRow* _tmp21_;
 #line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = backing_photo_table_get_instance ();
 #line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28401,27 +28379,27 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_photo_file_adapter_unref0 (old_reader);
 #line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28401 "Photo.c"
+#line 28379 "Photo.c"
 			}
 			{
-				PhotoRow* _tmp22_ = NULL;
+				PhotoRow* _tmp22_;
 #line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = self->row;
 #line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28409 "Photo.c"
+#line 28387 "Photo.c"
 				{
-					PhotoTable* _tmp23_ = NULL;
-					PhotoTable* _tmp24_ = NULL;
-					PhotoRow* _tmp25_ = NULL;
-					BackingPhotoRow* _tmp26_ = NULL;
-					BackingPhotoID _tmp27_ = {0};
-					BackingPhotoRow* _tmp28_ = NULL;
-					BackingPhotoRow* _tmp29_ = NULL;
-					BackingPhotoRow* _tmp30_ = NULL;
-					BackingPhotoRow* _tmp31_ = NULL;
-					BackingPhotoRow* _tmp32_ = NULL;
-					Orientation _tmp33_ = 0;
+					PhotoTable* _tmp23_;
+					PhotoTable* _tmp24_;
+					PhotoRow* _tmp25_;
+					BackingPhotoRow* _tmp26_;
+					BackingPhotoID _tmp27_;
+					BackingPhotoRow* _tmp28_;
+					BackingPhotoRow* _tmp29_;
+					BackingPhotoRow* _tmp30_;
+					BackingPhotoRow* _tmp31_;
+					BackingPhotoRow* _tmp32_;
+					Orientation _tmp33_;
 #line 3935 "/home/jens/Source/shotwell/src/Photo.vala"
 					timestamp_changed = TRUE;
 #line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28442,8 +28420,8 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					_database_table_unref0 (_tmp24_);
 #line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 28442 "Photo.c"
-						goto __finally391;
+#line 28420 "Photo.c"
+						goto __finally392;
 					}
 #line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp28_ = backing;
@@ -28467,16 +28445,16 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					_tmp33_ = _tmp32_->original_orientation;
 #line 3941 "/home/jens/Source/shotwell/src/Photo.vala"
 					photo_set_orientation (self, _tmp33_);
-#line 28467 "Photo.c"
+#line 28445 "Photo.c"
 				}
-				__finally391:
+				__finally392:
 				{
-					PhotoRow* _tmp34_ = NULL;
+					PhotoRow* _tmp34_;
 #line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp34_ = self->row;
 #line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28476 "Photo.c"
+#line 28454 "Photo.c"
 				}
 #line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -28494,41 +28472,41 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					_photo_file_adapter_unref0 (old_reader);
 #line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 28494 "Photo.c"
+#line 28472 "Photo.c"
 				}
 			}
 		}
 #line 3944 "/home/jens/Source/shotwell/src/Photo.vala"
 		is_new_editable = TRUE;
-#line 28500 "Photo.c"
+#line 28478 "Photo.c"
 	}
 #line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = only_attributes;
 #line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp35_) {
-#line 28506 "Photo.c"
-		gboolean _tmp36_ = FALSE;
+#line 28484 "Photo.c"
+		gboolean _tmp36_;
 		GFileInfo* info = NULL;
 		GTimeVal timestamp = {0};
-		GFileInfo* _tmp45_ = NULL;
+		GFileInfo* _tmp45_;
 		GTimeVal _tmp46_ = {0};
-		BackingPhotoTable* _tmp47_ = NULL;
-		BackingPhotoTable* _tmp48_ = NULL;
-		BackingPhotoID _tmp49_ = {0};
-		GTimeVal _tmp50_ = {0};
-		glong _tmp51_ = 0L;
-		GFileInfo* _tmp52_ = NULL;
-		gint64 _tmp53_ = 0LL;
+		BackingPhotoTable* _tmp47_;
+		BackingPhotoTable* _tmp48_;
+		BackingPhotoID _tmp49_;
+		GTimeVal _tmp50_;
+		glong _tmp51_;
+		GFileInfo* _tmp52_;
+		gint64 _tmp53_;
 #line 3949 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = backing_photo_id_is_valid (&editable_id);
 #line 3949 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_assert (_tmp36_, "editable_id.is_valid()");
-#line 28523 "Photo.c"
+#line 28501 "Photo.c"
 		{
 			GFileInfo* _tmp37_ = NULL;
-			GFile* _tmp38_ = NULL;
-			GFileInfo* _tmp39_ = NULL;
-			GFileInfo* _tmp40_ = NULL;
+			GFile* _tmp38_;
+			GFileInfo* _tmp39_;
+			GFileInfo* _tmp40_;
 #line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = file;
 #line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28537,8 +28515,8 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_tmp37_ = _tmp39_;
 #line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 28537 "Photo.c"
-				goto __catch392_g_error;
+#line 28515 "Photo.c"
+				goto __catch393_g_error;
 			}
 #line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = _tmp37_;
@@ -28550,16 +28528,16 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			info = _tmp40_;
 #line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp37_);
-#line 28550 "Photo.c"
+#line 28528 "Photo.c"
 		}
-		goto __finally392;
-		__catch392_g_error:
+		goto __finally393;
+		__catch393_g_error:
 		{
 			GError* err = NULL;
-			gchar* _tmp41_ = NULL;
-			gchar* _tmp42_ = NULL;
-			GError* _tmp43_ = NULL;
-			const gchar* _tmp44_ = NULL;
+			gchar* _tmp41_;
+			gchar* _tmp42_;
+			GError* _tmp43_;
+			const gchar* _tmp44_;
 #line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
 #line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28594,9 +28572,9 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_photo_file_adapter_unref0 (old_reader);
 #line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 28594 "Photo.c"
+#line 28572 "Photo.c"
 		}
-		__finally392:
+		__finally393:
 #line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28615,7 +28593,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_photo_file_adapter_unref0 (old_reader);
 #line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 28615 "Photo.c"
+#line 28593 "Photo.c"
 		}
 #line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = info;
@@ -28659,30 +28637,30 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_photo_file_adapter_unref0 (old_reader);
 #line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 28659 "Photo.c"
+#line 28637 "Photo.c"
 		}
 		{
-			PhotoRow* _tmp54_ = NULL;
+			PhotoRow* _tmp54_;
 #line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp54_ = self->row;
 #line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28667 "Photo.c"
+#line 28645 "Photo.c"
 			{
-				BackingPhotoRow* _tmp55_ = NULL;
-				time_t _tmp56_ = 0;
-				GTimeVal _tmp57_ = {0};
-				glong _tmp58_ = 0L;
-				BackingPhotoRow* _tmp59_ = NULL;
-				gint64 _tmp60_ = 0LL;
-				GFileInfo* _tmp61_ = NULL;
-				gint64 _tmp62_ = 0LL;
-				BackingPhotoRow* _tmp63_ = NULL;
-				GTimeVal _tmp64_ = {0};
-				glong _tmp65_ = 0L;
-				BackingPhotoRow* _tmp66_ = NULL;
-				GFileInfo* _tmp67_ = NULL;
-				gint64 _tmp68_ = 0LL;
+				BackingPhotoRow* _tmp55_;
+				time_t _tmp56_;
+				GTimeVal _tmp57_;
+				glong _tmp58_;
+				BackingPhotoRow* _tmp59_;
+				gint64 _tmp60_;
+				GFileInfo* _tmp61_;
+				gint64 _tmp62_;
+				BackingPhotoRow* _tmp63_;
+				GTimeVal _tmp64_;
+				glong _tmp65_;
+				BackingPhotoRow* _tmp66_;
+				GFileInfo* _tmp67_;
+				gint64 _tmp68_;
 #line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp55_ = self->priv->editable;
 #line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28719,16 +28697,16 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_tmp68_ = g_file_info_get_size (_tmp67_);
 #line 3970 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp66_->filesize = _tmp68_;
-#line 28719 "Photo.c"
+#line 28697 "Photo.c"
 			}
-			__finally393:
+			__finally394:
 			{
-				PhotoRow* _tmp69_ = NULL;
+				PhotoRow* _tmp69_;
 #line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = self->row;
 #line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28728 "Photo.c"
+#line 28706 "Photo.c"
 			}
 #line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -28748,39 +28726,39 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_photo_file_adapter_unref0 (old_reader);
 #line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28748 "Photo.c"
+#line 28726 "Photo.c"
 			}
 		}
 #line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 28753 "Photo.c"
+#line 28731 "Photo.c"
 	} else {
 		gboolean _tmp70_ = FALSE;
-		gboolean _tmp71_ = FALSE;
+		gboolean _tmp71_;
 #line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp71_ = backing_photo_id_is_valid (&editable_id);
 #line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp71_) {
-#line 28761 "Photo.c"
-			gboolean _tmp72_ = FALSE;
+#line 28739 "Photo.c"
+			gboolean _tmp72_;
 #line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp72_ = is_new_editable;
 #line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = !_tmp72_;
-#line 28767 "Photo.c"
+#line 28745 "Photo.c"
 		} else {
 #line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = FALSE;
-#line 28771 "Photo.c"
+#line 28749 "Photo.c"
 		}
 #line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp70_) {
-#line 28775 "Photo.c"
-			BackingPhotoRow* _tmp73_ = NULL;
-			BackingPhotoID _tmp74_ = {0};
-			BackingPhotoTable* _tmp75_ = NULL;
-			BackingPhotoTable* _tmp76_ = NULL;
-			BackingPhotoRow* _tmp77_ = NULL;
+#line 28753 "Photo.c"
+			BackingPhotoRow* _tmp73_;
+			BackingPhotoID _tmp74_;
+			BackingPhotoTable* _tmp75_;
+			BackingPhotoTable* _tmp76_;
+			BackingPhotoRow* _tmp77_;
 #line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = backing;
 #line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28813,30 +28791,30 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_photo_file_adapter_unref0 (old_reader);
 #line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28813 "Photo.c"
+#line 28791 "Photo.c"
 			}
 			{
-				PhotoRow* _tmp78_ = NULL;
+				PhotoRow* _tmp78_;
 #line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp78_ = self->row;
 #line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28821 "Photo.c"
+#line 28799 "Photo.c"
 				{
-					BackingPhotoRow* _tmp79_ = NULL;
-					time_t _tmp80_ = 0;
-					BackingPhotoRow* _tmp81_ = NULL;
-					time_t _tmp82_ = 0;
-					BackingPhotoRow* _tmp83_ = NULL;
-					gint64 _tmp84_ = 0LL;
-					BackingPhotoRow* _tmp85_ = NULL;
-					gint64 _tmp86_ = 0LL;
-					BackingPhotoRow* _tmp87_ = NULL;
-					BackingPhotoRow* _tmp88_ = NULL;
-					BackingPhotoRow* _tmp89_ = NULL;
-					BackingPhotoRow* _tmp90_ = NULL;
-					BackingPhotoRow* _tmp91_ = NULL;
-					Orientation _tmp92_ = 0;
+					BackingPhotoRow* _tmp79_;
+					time_t _tmp80_;
+					BackingPhotoRow* _tmp81_;
+					time_t _tmp82_;
+					BackingPhotoRow* _tmp83_;
+					gint64 _tmp84_;
+					BackingPhotoRow* _tmp85_;
+					gint64 _tmp86_;
+					BackingPhotoRow* _tmp87_;
+					BackingPhotoRow* _tmp88_;
+					BackingPhotoRow* _tmp89_;
+					BackingPhotoRow* _tmp90_;
+					BackingPhotoRow* _tmp91_;
+					Orientation _tmp92_;
 #line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp79_ = self->priv->editable;
 #line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28879,16 +28857,16 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					_tmp92_ = _tmp91_->original_orientation;
 #line 3987 "/home/jens/Source/shotwell/src/Photo.vala"
 					photo_set_orientation (self, _tmp92_);
-#line 28879 "Photo.c"
+#line 28857 "Photo.c"
 				}
-				__finally394:
+				__finally395:
 				{
-					PhotoRow* _tmp93_ = NULL;
+					PhotoRow* _tmp93_;
 #line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp93_ = self->row;
 #line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28888 "Photo.c"
+#line 28866 "Photo.c"
 				}
 #line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -28906,7 +28884,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					_photo_file_adapter_unref0 (old_reader);
 #line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 28906 "Photo.c"
+#line 28884 "Photo.c"
 				}
 			}
 		}
@@ -28915,18 +28893,18 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	_tmp94_ = new_reader;
 #line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp94_ != NULL) {
-#line 28915 "Photo.c"
+#line 28893 "Photo.c"
 		{
-			PhotoBackingReaders* _tmp95_ = NULL;
+			PhotoBackingReaders* _tmp95_;
 #line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp95_ = self->priv->readers;
 #line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 28922 "Photo.c"
+#line 28900 "Photo.c"
 			{
-				PhotoBackingReaders* _tmp96_ = NULL;
-				PhotoFileReader* _tmp97_ = NULL;
-				PhotoFileReader* _tmp98_ = NULL;
+				PhotoBackingReaders* _tmp96_;
+				PhotoFileReader* _tmp97_;
+				PhotoFileReader* _tmp98_;
 #line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp96_ = self->priv->readers;
 #line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28937,16 +28915,16 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_photo_file_adapter_unref0 (_tmp96_->editable);
 #line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp96_->editable = _tmp98_;
-#line 28937 "Photo.c"
+#line 28915 "Photo.c"
 			}
-			__finally395:
+			__finally396:
 			{
-				PhotoBackingReaders* _tmp99_ = NULL;
+				PhotoBackingReaders* _tmp99_;
 #line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp99_ = self->priv->readers;
 #line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 28946 "Photo.c"
+#line 28924 "Photo.c"
 			}
 #line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -28964,7 +28942,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_photo_file_adapter_unref0 (old_reader);
 #line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28964 "Photo.c"
+#line 28942 "Photo.c"
 			}
 		}
 	}
@@ -28972,37 +28950,37 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	_tmp101_ = only_attributes;
 #line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp101_) {
-#line 28972 "Photo.c"
-		PhotoFileReader* _tmp102_ = NULL;
-		PhotoFileReader* _tmp103_ = NULL;
+#line 28950 "Photo.c"
+		PhotoFileReader* _tmp102_;
+		PhotoFileReader* _tmp103_;
 #line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp102_ = reader;
 #line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp103_ = old_reader;
 #line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = _tmp102_ != _tmp103_;
-#line 28981 "Photo.c"
+#line 28959 "Photo.c"
 	} else {
 #line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = FALSE;
-#line 28985 "Photo.c"
+#line 28963 "Photo.c"
 	}
 #line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp100_) {
-#line 28989 "Photo.c"
+#line 28967 "Photo.c"
 		GFile* _tmp104_ = NULL;
-		PhotoFileReader* _tmp105_ = NULL;
+		PhotoFileReader* _tmp105_;
 		GFile* _tmp108_ = NULL;
-		PhotoFileReader* _tmp109_ = NULL;
+		PhotoFileReader* _tmp109_;
 #line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_replaced (self);
 #line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp105_ = old_reader;
 #line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp105_ != NULL) {
-#line 29000 "Photo.c"
-			PhotoFileReader* _tmp106_ = NULL;
-			GFile* _tmp107_ = NULL;
+#line 28978 "Photo.c"
+			PhotoFileReader* _tmp106_;
+			GFile* _tmp107_;
 #line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp106_ = old_reader;
 #line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29011,21 +28989,21 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_g_object_unref0 (_tmp104_);
 #line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp104_ = _tmp107_;
-#line 29011 "Photo.c"
+#line 28989 "Photo.c"
 		} else {
 #line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp104_);
 #line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp104_ = NULL;
-#line 29017 "Photo.c"
+#line 28995 "Photo.c"
 		}
 #line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp109_ = new_reader;
 #line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp109_ != NULL) {
-#line 29023 "Photo.c"
-			PhotoFileReader* _tmp110_ = NULL;
-			GFile* _tmp111_ = NULL;
+#line 29001 "Photo.c"
+			PhotoFileReader* _tmp110_;
+			GFile* _tmp111_;
 #line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp110_ = new_reader;
 #line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29034,13 +29012,13 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_g_object_unref0 (_tmp108_);
 #line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp108_ = _tmp111_;
-#line 29034 "Photo.c"
+#line 29012 "Photo.c"
 		} else {
 #line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp108_);
 #line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp108_ = NULL;
-#line 29040 "Photo.c"
+#line 29018 "Photo.c"
 		}
 #line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_editable_replaced (self, _tmp104_, _tmp108_);
@@ -29048,7 +29026,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_g_object_unref0 (_tmp108_);
 #line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp104_);
-#line 29048 "Photo.c"
+#line 29026 "Photo.c"
 	}
 #line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp112_ = g_new0 (gchar*, 0 + 1);
@@ -29062,14 +29040,14 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	_tmp113_ = timestamp_changed;
 #line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp113_) {
-#line 29062 "Photo.c"
-		gchar** _tmp114_ = NULL;
-		gint _tmp114__length1 = 0;
-		gchar* _tmp115_ = NULL;
-		gchar** _tmp116_ = NULL;
-		gint _tmp116__length1 = 0;
-		gchar* _tmp117_ = NULL;
-		gboolean _tmp118_ = FALSE;
+#line 29040 "Photo.c"
+		gchar** _tmp114_;
+		gint _tmp114__length1;
+		gchar* _tmp115_;
+		gchar** _tmp116_;
+		gint _tmp116__length1;
+		gchar* _tmp117_;
+		gboolean _tmp118_;
 #line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp114_ = alteration_list;
 #line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29090,10 +29068,10 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_tmp118_ = photo_is_editable_source (self);
 #line 4010 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp118_) {
-#line 29090 "Photo.c"
-			gchar** _tmp119_ = NULL;
-			gint _tmp119__length1 = 0;
-			gchar* _tmp120_ = NULL;
+#line 29068 "Photo.c"
+			gchar** _tmp119_;
+			gint _tmp119__length1;
+			gchar* _tmp120_;
 #line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp119_ = alteration_list;
 #line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29102,7 +29080,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_tmp120_ = g_strdup ("metadata:source-timestamp");
 #line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp120_);
-#line 29102 "Photo.c"
+#line 29080 "Photo.c"
 		}
 	}
 #line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29111,25 +29089,25 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	if (_tmp122_) {
 #line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp121_ = TRUE;
-#line 29111 "Photo.c"
+#line 29089 "Photo.c"
 	} else {
-		PhotoFileReader* _tmp123_ = NULL;
+		PhotoFileReader* _tmp123_;
 #line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp123_ = new_reader;
 #line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp121_ = _tmp123_ != NULL;
-#line 29118 "Photo.c"
+#line 29096 "Photo.c"
 	}
 #line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp121_) {
-#line 29122 "Photo.c"
-		gchar** _tmp124_ = NULL;
-		gint _tmp124__length1 = 0;
-		gchar* _tmp125_ = NULL;
-		gchar** _tmp126_ = NULL;
-		gint _tmp126__length1 = 0;
-		gchar* _tmp127_ = NULL;
-		gboolean _tmp128_ = FALSE;
+#line 29100 "Photo.c"
+		gchar** _tmp124_;
+		gint _tmp124__length1;
+		gchar* _tmp125_;
+		gchar** _tmp126_;
+		gint _tmp126__length1;
+		gchar* _tmp127_;
+		gboolean _tmp128_;
 #line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp124_ = alteration_list;
 #line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29150,10 +29128,10 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_tmp128_ = photo_is_editable_source (self);
 #line 4018 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp128_) {
-#line 29150 "Photo.c"
-			gchar** _tmp129_ = NULL;
-			gint _tmp129__length1 = 0;
-			gchar* _tmp130_ = NULL;
+#line 29128 "Photo.c"
+			gchar** _tmp129_;
+			gint _tmp129__length1;
+			gchar* _tmp130_;
 #line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp129_ = alteration_list;
 #line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29162,7 +29140,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_tmp130_ = g_strdup ("image:source");
 #line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp130_);
-#line 29162 "Photo.c"
+#line 29140 "Photo.c"
 		}
 	}
 #line 4022 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29171,11 +29149,11 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	_tmp131__length1 = alteration_list_length1;
 #line 4022 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp131__length1 > 0) {
-#line 29171 "Photo.c"
-		gchar** _tmp132_ = NULL;
-		gint _tmp132__length1 = 0;
-		Alteration* _tmp133_ = NULL;
-		Alteration* _tmp134_ = NULL;
+#line 29149 "Photo.c"
+		gchar** _tmp132_;
+		gint _tmp132__length1;
+		Alteration* _tmp133_;
+		Alteration* _tmp134_;
 #line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp132_ = alteration_list;
 #line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29188,7 +29166,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp134_);
 #line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp134_);
-#line 29188 "Photo.c"
+#line 29166 "Photo.c"
 	}
 #line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
@@ -29202,21 +29180,21 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	_photo_file_adapter_unref0 (reader);
 #line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (old_reader);
-#line 29202 "Photo.c"
+#line 29180 "Photo.c"
 }
 
 
 static void photo_detach_editable (Photo* self, gboolean delete_editable, gboolean remove_transformations, gboolean notify) {
 	gboolean has_editable = FALSE;
 	GFile* editable_file = NULL;
-	gboolean _tmp8_ = FALSE;
-	gboolean _tmp28_ = FALSE;
-	gboolean _tmp29_ = FALSE;
+	gboolean _tmp8_;
+	gboolean _tmp28_;
+	gboolean _tmp29_;
 	gboolean _tmp31_ = FALSE;
-	gboolean _tmp32_ = FALSE;
+	gboolean _tmp32_;
 	gboolean _tmp42_ = FALSE;
 	gboolean _tmp43_ = FALSE;
-	gboolean _tmp44_ = FALSE;
+	gboolean _tmp44_;
 	GError * _inner_error_ = NULL;
 #line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -29226,28 +29204,28 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 	has_editable = FALSE;
 #line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable_file = NULL;
-#line 29226 "Photo.c"
+#line 29204 "Photo.c"
 	{
-		PhotoBackingReaders* _tmp0_ = NULL;
+		PhotoBackingReaders* _tmp0_;
 #line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 29233 "Photo.c"
+#line 29211 "Photo.c"
 		{
-			PhotoBackingReaders* _tmp1_ = NULL;
-			PhotoFileReader* _tmp2_ = NULL;
+			PhotoBackingReaders* _tmp1_;
+			PhotoFileReader* _tmp2_;
 #line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
 #line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
 #line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 29243 "Photo.c"
-				PhotoBackingReaders* _tmp3_ = NULL;
-				PhotoFileReader* _tmp4_ = NULL;
-				GFile* _tmp5_ = NULL;
-				PhotoBackingReaders* _tmp6_ = NULL;
+#line 29221 "Photo.c"
+				PhotoBackingReaders* _tmp3_;
+				PhotoFileReader* _tmp4_;
+				GFile* _tmp5_;
+				PhotoBackingReaders* _tmp6_;
 #line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
 #line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29266,17 +29244,17 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 				_tmp6_->editable = NULL;
 #line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
 				has_editable = TRUE;
-#line 29266 "Photo.c"
+#line 29244 "Photo.c"
 			}
 		}
-		__finally396:
+		__finally397:
 		{
-			PhotoBackingReaders* _tmp7_ = NULL;
+			PhotoBackingReaders* _tmp7_;
 #line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->readers;
 #line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29276 "Photo.c"
+#line 29254 "Photo.c"
 		}
 #line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -29288,33 +29266,33 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			g_clear_error (&_inner_error_);
 #line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29288 "Photo.c"
+#line 29266 "Photo.c"
 		}
 	}
 #line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = has_editable;
 #line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
-#line 29295 "Photo.c"
+#line 29273 "Photo.c"
 		BackingPhotoID editable_id = {0};
 #line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
 		backing_photo_id_init (&editable_id, BACKING_PHOTO_ID_INVALID);
-#line 29299 "Photo.c"
+#line 29277 "Photo.c"
 		{
 			{
-				PhotoRow* _tmp9_ = NULL;
+				PhotoRow* _tmp9_;
 #line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->row;
 #line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 29307 "Photo.c"
+#line 29285 "Photo.c"
 				{
-					PhotoRow* _tmp10_ = NULL;
-					BackingPhotoID _tmp11_ = {0};
-					gboolean _tmp12_ = FALSE;
-					PhotoRow* _tmp16_ = NULL;
-					BackingPhotoRow* _tmp17_ = NULL;
-					BackingPhotoRow* _tmp18_ = NULL;
+					PhotoRow* _tmp10_;
+					BackingPhotoID _tmp11_;
+					gboolean _tmp12_;
+					PhotoRow* _tmp16_;
+					BackingPhotoRow* _tmp17_;
+					BackingPhotoRow* _tmp18_;
 #line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp10_ = self->row;
 #line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29325,10 +29303,10 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 					_tmp12_ = backing_photo_id_is_valid (&editable_id);
 #line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp12_) {
-#line 29325 "Photo.c"
-						PhotoTable* _tmp13_ = NULL;
-						PhotoTable* _tmp14_ = NULL;
-						PhotoRow* _tmp15_ = NULL;
+#line 29303 "Photo.c"
+						PhotoTable* _tmp13_;
+						PhotoTable* _tmp14_;
+						PhotoRow* _tmp15_;
 #line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = photo_table_get_instance ();
 #line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29341,8 +29319,8 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 						_database_table_unref0 (_tmp14_);
 #line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29341 "Photo.c"
-							goto __finally398;
+#line 29319 "Photo.c"
+							goto __finally399;
 						}
 					}
 #line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29355,23 +29333,23 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 					_backing_photo_row_unref0 (self->backing_photo_row);
 #line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
 					self->backing_photo_row = _tmp18_;
-#line 29355 "Photo.c"
+#line 29333 "Photo.c"
 				}
-				__finally398:
+				__finally399:
 				{
-					PhotoRow* _tmp19_ = NULL;
+					PhotoRow* _tmp19_;
 #line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = self->row;
 #line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 29364 "Photo.c"
+#line 29342 "Photo.c"
 				}
 #line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 29370 "Photo.c"
-						goto __catch397_database_error;
+#line 29348 "Photo.c"
+						goto __catch398_database_error;
 					}
 #line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (editable_file);
@@ -29381,16 +29359,16 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 					g_clear_error (&_inner_error_);
 #line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 29381 "Photo.c"
+#line 29359 "Photo.c"
 				}
 			}
 		}
-		goto __finally397;
-		__catch397_database_error:
+		goto __finally398;
+		__catch398_database_error:
 		{
 			GError* err = NULL;
-			GError* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
+			GError* _tmp20_;
+			const gchar* _tmp21_;
 #line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
 #line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29403,9 +29381,9 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			g_warning ("Photo.vala:4049: Unable to remove editable from PhotoTable: %s", _tmp21_);
 #line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 29403 "Photo.c"
+#line 29381 "Photo.c"
 		}
-		__finally397:
+		__finally398:
 #line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29416,18 +29394,18 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			g_clear_error (&_inner_error_);
 #line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29416 "Photo.c"
+#line 29394 "Photo.c"
 		}
 		{
-			gboolean _tmp22_ = FALSE;
+			gboolean _tmp22_;
 #line 4053 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = backing_photo_id_is_valid (&editable_id);
 #line 4053 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp22_) {
-#line 29424 "Photo.c"
-				BackingPhotoTable* _tmp23_ = NULL;
-				BackingPhotoTable* _tmp24_ = NULL;
-				BackingPhotoID _tmp25_ = {0};
+#line 29402 "Photo.c"
+				BackingPhotoTable* _tmp23_;
+				BackingPhotoTable* _tmp24_;
+				BackingPhotoID _tmp25_;
 #line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = backing_photo_table_get_instance ();
 #line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29442,8 +29420,8 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 29442 "Photo.c"
-						goto __catch399_database_error;
+#line 29420 "Photo.c"
+						goto __catch400_database_error;
 					}
 #line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (editable_file);
@@ -29453,16 +29431,16 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 					g_clear_error (&_inner_error_);
 #line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 29453 "Photo.c"
+#line 29431 "Photo.c"
 				}
 			}
 		}
-		goto __finally399;
-		__catch399_database_error:
+		goto __finally400;
+		__catch400_database_error:
 		{
 			GError* err = NULL;
-			GError* _tmp26_ = NULL;
-			const gchar* _tmp27_ = NULL;
+			GError* _tmp26_;
+			const gchar* _tmp27_;
 #line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
 #line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29475,9 +29453,9 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			g_warning ("Photo.vala:4056: Unable to remove editable from BackingPhotoTable: %s", _tmp27_);
 #line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 29475 "Photo.c"
+#line 29453 "Photo.c"
 		}
-		__finally399:
+		__finally400:
 #line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29488,7 +29466,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			g_clear_error (&_inner_error_);
 #line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29488 "Photo.c"
+#line 29466 "Photo.c"
 		}
 	}
 #line 4060 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29497,64 +29475,64 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 	if (_tmp28_) {
 #line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_internal_remove_all_transformations (self, FALSE);
-#line 29497 "Photo.c"
+#line 29475 "Photo.c"
 	}
 #line 4063 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = has_editable;
 #line 4063 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp29_) {
-#line 29503 "Photo.c"
-		GFile* _tmp30_ = NULL;
+#line 29481 "Photo.c"
+		GFile* _tmp30_;
 #line 4064 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_replaced (self);
 #line 4065 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = editable_file;
 #line 4065 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_editable_replaced (self, _tmp30_, NULL);
-#line 29511 "Photo.c"
+#line 29489 "Photo.c"
 	}
 #line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = delete_editable;
 #line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp32_) {
-#line 29517 "Photo.c"
-		GFile* _tmp33_ = NULL;
+#line 29495 "Photo.c"
+		GFile* _tmp33_;
 #line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = editable_file;
 #line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = _tmp33_ != NULL;
-#line 29523 "Photo.c"
+#line 29501 "Photo.c"
 	} else {
 #line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = FALSE;
-#line 29527 "Photo.c"
+#line 29505 "Photo.c"
 	}
 #line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp31_) {
-#line 29531 "Photo.c"
+#line 29509 "Photo.c"
 		{
-			GFile* _tmp34_ = NULL;
+			GFile* _tmp34_;
 #line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp34_ = editable_file;
 #line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_file_trash (_tmp34_, NULL, &_inner_error_);
 #line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29540 "Photo.c"
-				goto __catch400_g_error;
+#line 29518 "Photo.c"
+				goto __catch401_g_error;
 			}
 		}
-		goto __finally400;
-		__catch400_g_error:
+		goto __finally401;
+		__catch401_g_error:
 		{
 			GError* err = NULL;
-			GFile* _tmp35_ = NULL;
-			gchar* _tmp36_ = NULL;
-			gchar* _tmp37_ = NULL;
-			gchar* _tmp38_ = NULL;
-			gchar* _tmp39_ = NULL;
-			GError* _tmp40_ = NULL;
-			const gchar* _tmp41_ = NULL;
+			GFile* _tmp35_;
+			gchar* _tmp36_;
+			gchar* _tmp37_;
+			gchar* _tmp38_;
+			gchar* _tmp39_;
+			GError* _tmp40_;
+			const gchar* _tmp41_;
 #line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
 #line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29581,9 +29559,9 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			_g_free0 (_tmp37_);
 #line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 29581 "Photo.c"
+#line 29559 "Photo.c"
 		}
-		__finally400:
+		__finally401:
 #line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29594,7 +29572,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			g_clear_error (&_inner_error_);
 #line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29594 "Photo.c"
+#line 29572 "Photo.c"
 		}
 	}
 #line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29603,34 +29581,34 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 	if (_tmp44_) {
 #line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = TRUE;
-#line 29603 "Photo.c"
+#line 29581 "Photo.c"
 	} else {
-		gboolean _tmp45_ = FALSE;
+		gboolean _tmp45_;
 #line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = remove_transformations;
 #line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp45_;
-#line 29610 "Photo.c"
+#line 29588 "Photo.c"
 	}
 #line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp43_) {
-#line 29614 "Photo.c"
-		gboolean _tmp46_ = FALSE;
+#line 29592 "Photo.c"
+		gboolean _tmp46_;
 #line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = notify;
 #line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = _tmp46_;
-#line 29620 "Photo.c"
+#line 29598 "Photo.c"
 	} else {
 #line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = FALSE;
-#line 29624 "Photo.c"
+#line 29602 "Photo.c"
 	}
 #line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp42_) {
-#line 29628 "Photo.c"
-		Alteration* _tmp47_ = NULL;
-		Alteration* _tmp48_ = NULL;
+#line 29606 "Photo.c"
+		Alteration* _tmp47_;
+		Alteration* _tmp48_;
 #line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = alteration_new ("image", "revert");
 #line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29639,42 +29617,42 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp48_);
 #line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp48_);
-#line 29639 "Photo.c"
+#line 29617 "Photo.c"
 	}
 #line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (editable_file);
-#line 29643 "Photo.c"
+#line 29621 "Photo.c"
 }
 
 
 static void _photo_on_reimport_editable_one_shot_callback (gpointer self) {
 #line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_reimport_editable ((Photo*) self);
-#line 29650 "Photo.c"
+#line 29628 "Photo.c"
 }
 
 
 static void _photo_on_update_editable_attributes_one_shot_callback (gpointer self) {
 #line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_update_editable_attributes ((Photo*) self);
-#line 29657 "Photo.c"
+#line 29635 "Photo.c"
 }
 
 
 static void _photo_on_remove_editable_one_shot_callback (gpointer self) {
 #line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_remove_editable ((Photo*) self);
-#line 29664 "Photo.c"
+#line 29642 "Photo.c"
 }
 
 
 static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* other_file, GFileMonitorEvent event) {
-	GFileMonitorEvent _tmp12_ = 0;
+	GFileMonitorEvent _tmp12_;
 	GEnumValue* _tmp13_;
-	GFile* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	GFileMonitorEvent _tmp17_ = 0;
+	GFile* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	GFileMonitorEvent _tmp17_;
 	GError * _inner_error_ = NULL;
 #line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -29682,24 +29660,24 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 	g_return_if_fail (G_IS_FILE (file));
 #line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((other_file == NULL) || G_IS_FILE (other_file));
-#line 29682 "Photo.c"
+#line 29660 "Photo.c"
 	{
-		PhotoBackingReaders* _tmp0_ = NULL;
+		PhotoBackingReaders* _tmp0_;
 #line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 29689 "Photo.c"
-		{
-			PhotoBackingReaders* _tmp1_ = NULL;
-			PhotoFileReader* _tmp2_ = NULL;
-			GFile* _tmp3_ = NULL;
-			PhotoBackingReaders* _tmp4_ = NULL;
-			PhotoFileReader* _tmp5_ = NULL;
-			GFile* _tmp6_ = NULL;
-			GFile* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
-			gboolean _tmp9_ = FALSE;
+#line 29667 "Photo.c"
+		{
+			PhotoBackingReaders* _tmp1_;
+			PhotoFileReader* _tmp2_;
+			GFile* _tmp3_;
+			PhotoBackingReaders* _tmp4_;
+			PhotoFileReader* _tmp5_;
+			GFile* _tmp6_;
+			GFile* _tmp7_;
+			gboolean _tmp8_;
+			gboolean _tmp9_;
 #line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
 #line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29724,28 +29702,28 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			_g_object_unref0 (_tmp7_);
 #line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp9_) {
-#line 29724 "Photo.c"
+#line 29702 "Photo.c"
 				{
-					PhotoBackingReaders* _tmp10_ = NULL;
+					PhotoBackingReaders* _tmp10_;
 #line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp10_ = self->priv->readers;
 #line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29731 "Photo.c"
+#line 29709 "Photo.c"
 				}
 #line 4090 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 29735 "Photo.c"
+#line 29713 "Photo.c"
 			}
 		}
-		__finally401:
+		__finally402:
 		{
-			PhotoBackingReaders* _tmp11_ = NULL;
+			PhotoBackingReaders* _tmp11_;
 #line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->priv->readers;
 #line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29745 "Photo.c"
+#line 29723 "Photo.c"
 		}
 #line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -29755,7 +29733,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			g_clear_error (&_inner_error_);
 #line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29755 "Photo.c"
+#line 29733 "Photo.c"
 		}
 	}
 #line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29780,23 +29758,23 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 		case G_FILE_MONITOR_EVENT_CHANGED:
 #line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_CREATED:
-#line 29780 "Photo.c"
+#line 29758 "Photo.c"
 		{
-			OneShotScheduler* _tmp18_ = NULL;
-			OneShotScheduler* _tmp20_ = NULL;
+			OneShotScheduler* _tmp18_;
+			OneShotScheduler* _tmp20_;
 #line 4099 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = self->priv->reimport_editable_scheduler;
 #line 4099 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp18_ == NULL) {
-#line 29788 "Photo.c"
-				OneShotScheduler* _tmp19_ = NULL;
+#line 29766 "Photo.c"
+				OneShotScheduler* _tmp19_;
 #line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = one_shot_scheduler_new ("Photo.reimport_editable", _photo_on_reimport_editable_one_shot_callback, self);
 #line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
 				_one_shot_scheduler_unref0 (self->priv->reimport_editable_scheduler);
 #line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->reimport_editable_scheduler = _tmp19_;
-#line 29796 "Photo.c"
+#line 29774 "Photo.c"
 			}
 #line 4104 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = self->priv->reimport_editable_scheduler;
@@ -29804,27 +29782,27 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			one_shot_scheduler_after_timeout (_tmp20_, (guint) 1000, TRUE);
 #line 4105 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29804 "Photo.c"
+#line 29782 "Photo.c"
 		}
 #line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
-#line 29808 "Photo.c"
+#line 29786 "Photo.c"
 		{
-			OneShotScheduler* _tmp21_ = NULL;
-			OneShotScheduler* _tmp23_ = NULL;
+			OneShotScheduler* _tmp21_;
+			OneShotScheduler* _tmp23_;
 #line 4108 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = self->priv->update_editable_attributes_scheduler;
 #line 4108 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp21_ == NULL) {
-#line 29816 "Photo.c"
-				OneShotScheduler* _tmp22_ = NULL;
+#line 29794 "Photo.c"
+				OneShotScheduler* _tmp22_;
 #line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = one_shot_scheduler_new ("Photo.update_editable_attributes", _photo_on_update_editable_attributes_one_shot_callback, self);
 #line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
 				_one_shot_scheduler_unref0 (self->priv->update_editable_attributes_scheduler);
 #line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->update_editable_attributes_scheduler = _tmp22_;
-#line 29824 "Photo.c"
+#line 29802 "Photo.c"
 			}
 #line 4113 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp23_ = self->priv->update_editable_attributes_scheduler;
@@ -29832,27 +29810,27 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			one_shot_scheduler_after_timeout (_tmp23_, (guint) 1000, TRUE);
 #line 4114 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29832 "Photo.c"
+#line 29810 "Photo.c"
 		}
 #line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_DELETED:
-#line 29836 "Photo.c"
+#line 29814 "Photo.c"
 		{
-			OneShotScheduler* _tmp24_ = NULL;
-			OneShotScheduler* _tmp26_ = NULL;
+			OneShotScheduler* _tmp24_;
+			OneShotScheduler* _tmp26_;
 #line 4117 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = self->priv->remove_editable_scheduler;
 #line 4117 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp24_ == NULL) {
-#line 29844 "Photo.c"
-				OneShotScheduler* _tmp25_ = NULL;
+#line 29822 "Photo.c"
+				OneShotScheduler* _tmp25_;
 #line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = one_shot_scheduler_new ("Photo.remove_editable", _photo_on_remove_editable_one_shot_callback, self);
 #line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
 				_one_shot_scheduler_unref0 (self->priv->remove_editable_scheduler);
 #line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->remove_editable_scheduler = _tmp25_;
-#line 29852 "Photo.c"
+#line 29830 "Photo.c"
 			}
 #line 4122 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = self->priv->remove_editable_scheduler;
@@ -29860,27 +29838,27 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			one_shot_scheduler_after_timeout (_tmp26_, (guint) 3000, TRUE);
 #line 4123 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29860 "Photo.c"
+#line 29838 "Photo.c"
 		}
 		default:
 #line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-#line 29865 "Photo.c"
+#line 29843 "Photo.c"
 		{
 #line 4128 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29869 "Photo.c"
+#line 29847 "Photo.c"
 		}
 	}
 #line 4133 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_discard_prefetched (self);
-#line 29874 "Photo.c"
+#line 29852 "Photo.c"
 }
 
 
 static void photo_on_reimport_editable (Photo* self) {
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 4136 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -29894,24 +29872,24 @@ static void photo_on_reimport_editable (Photo* self) {
 	g_debug ("Photo.vala:4140: Reimporting editable for %s", _tmp1_);
 #line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp1_);
-#line 29894 "Photo.c"
+#line 29872 "Photo.c"
 	{
 #line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable (self, &_inner_error_);
 #line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29900 "Photo.c"
-			goto __catch402_g_error;
+#line 29878 "Photo.c"
+			goto __catch403_g_error;
 		}
 	}
-	goto __finally402;
-	__catch402_g_error:
+	goto __finally403;
+	__catch403_g_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		GError* _tmp4_;
+		const gchar* _tmp5_;
 #line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
 #line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29931,9 +29909,9 @@ static void photo_on_reimport_editable (Photo* self) {
 		_g_free0 (_tmp3_);
 #line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 29930 "Photo.c"
+#line 29908 "Photo.c"
 	}
-	__finally402:
+	__finally403:
 #line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29942,14 +29920,14 @@ static void photo_on_reimport_editable (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 29941 "Photo.c"
+#line 29919 "Photo.c"
 	}
 }
 
 
 static void photo_on_update_editable_attributes (Photo* self) {
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -29961,22 +29939,22 @@ static void photo_on_update_editable_attributes (Photo* self) {
 	g_debug ("Photo.vala:4150: Updating editable attributes for %s", _tmp1_);
 #line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp1_);
-#line 29960 "Photo.c"
+#line 29938 "Photo.c"
 	{
 #line 4152 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_update_editable_attributes (self, &_inner_error_);
 #line 4152 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29966 "Photo.c"
-			goto __catch403_g_error;
+#line 29944 "Photo.c"
+			goto __catch404_g_error;
 		}
 	}
-	goto __finally403;
-	__catch403_g_error:
+	goto __finally404;
+	__catch404_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
+		GError* _tmp2_;
+		const gchar* _tmp3_;
 #line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
 #line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29989,9 +29967,9 @@ static void photo_on_update_editable_attributes (Photo* self) {
 		g_warning ("Photo.vala:4154: Unable to update editable attributes: %s", _tmp3_);
 #line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 29988 "Photo.c"
+#line 29966 "Photo.c"
 	}
-	__finally403:
+	__finally404:
 #line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30000,22 +29978,22 @@ static void photo_on_update_editable_attributes (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 29999 "Photo.c"
+#line 29977 "Photo.c"
 	}
 }
 
 
 static void photo_on_remove_editable (Photo* self) {
 	PhotoFileReader* reader = NULL;
-	PhotoFileReader* _tmp0_ = NULL;
-	PhotoFileReader* _tmp1_ = NULL;
+	PhotoFileReader* _tmp0_;
+	PhotoFileReader* _tmp1_;
 	GFile* file = NULL;
-	PhotoFileReader* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
+	PhotoFileReader* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
+	gboolean _tmp5_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
 #line 4158 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
 #line 4159 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30030,7 +30008,7 @@ static void photo_on_remove_editable (Photo* self) {
 		_photo_file_adapter_unref0 (reader);
 #line 4161 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 30029 "Photo.c"
+#line 30007 "Photo.c"
 	}
 #line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
@@ -30044,9 +30022,9 @@ static void photo_on_remove_editable (Photo* self) {
 	_tmp5_ = g_file_query_exists (_tmp4_, NULL);
 #line 4164 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 30043 "Photo.c"
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 30021 "Photo.c"
+		gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
 #line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30061,7 +30039,7 @@ static void photo_on_remove_editable (Photo* self) {
 		_photo_file_adapter_unref0 (reader);
 #line 4167 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 30060 "Photo.c"
+#line 30038 "Photo.c"
 	}
 #line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
@@ -30077,7 +30055,7 @@ static void photo_on_remove_editable (Photo* self) {
 	_g_object_unref0 (file);
 #line 4158 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 30076 "Photo.c"
+#line 30054 "Photo.c"
 }
 
 
@@ -30085,8 +30063,8 @@ void photo_get_original_dimensions (Photo* self, Dimensions* result) {
 	Dimensions dim = {0};
 	Dimensions _tmp0_ = {0};
 	Orientation orientation = 0;
-	Orientation _tmp1_ = 0;
-	Dimensions _tmp2_ = {0};
+	Orientation _tmp1_;
+	Dimensions _tmp2_;
 	Dimensions _tmp3_ = {0};
 #line 4179 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -30106,12 +30084,12 @@ void photo_get_original_dimensions (Photo* self, Dimensions* result) {
 	*result = _tmp3_;
 #line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 30105 "Photo.c"
+#line 30083 "Photo.c"
 }
 
 
 void photo_get_master_dimensions (Photo* self, Dimensions* result) {
-	Orientation _tmp0_ = 0;
+	Orientation _tmp0_;
 	Dimensions _tmp1_ = {0};
 	Dimensions _tmp2_ = {0};
 #line 4187 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30126,7 +30104,7 @@ void photo_get_master_dimensions (Photo* self, Dimensions* result) {
 	*result = _tmp2_;
 #line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 30125 "Photo.c"
+#line 30103 "Photo.c"
 }
 
 
@@ -30135,13 +30113,13 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) {
 	gboolean result = FALSE;
 	Box raw = {0};
 	Box _tmp0_ = {0};
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	Dimensions dim = {0};
 	Dimensions _tmp2_ = {0};
 	Orientation orientation = 0;
-	Orientation _tmp3_ = 0;
-	PhotoException _tmp4_ = 0;
-	gboolean _tmp5_ = FALSE;
+	Orientation _tmp3_;
+	PhotoException _tmp4_;
+	gboolean _tmp5_;
 #line 4192 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 4194 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30158,11 +30136,11 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) {
 		if (crop) {
 #line 4197 "/home/jens/Source/shotwell/src/Photo.vala"
 			*crop = _vala_crop;
-#line 30157 "Photo.c"
+#line 30135 "Photo.c"
 		}
 #line 4197 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 30161 "Photo.c"
+#line 30139 "Photo.c"
 	}
 #line 4200 "/home/jens/Source/shotwell/src/Photo.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_ORIENTATION, &_tmp2_);
@@ -30178,10 +30156,10 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) {
 	_tmp5_ = photo_exception_allows (_tmp4_, PHOTO_EXCEPTION_ORIENTATION);
 #line 4203 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 30177 "Photo.c"
-		Orientation _tmp6_ = 0;
-		Dimensions _tmp7_ = {0};
-		Box _tmp8_ = {0};
+#line 30155 "Photo.c"
+		Orientation _tmp6_;
+		Dimensions _tmp7_;
+		Box _tmp8_;
 		Box _tmp9_ = {0};
 #line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = orientation;
@@ -30193,14 +30171,14 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) {
 		orientation_rotate_box (_tmp6_, &_tmp7_, &_tmp8_, &_tmp9_);
 #line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_crop = _tmp9_;
-#line 30192 "Photo.c"
+#line 30170 "Photo.c"
 	} else {
-		Box _tmp10_ = {0};
+		Box _tmp10_;
 #line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = raw;
 #line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_crop = _tmp10_;
-#line 30199 "Photo.c"
+#line 30177 "Photo.c"
 	}
 #line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
@@ -30208,11 +30186,11 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) {
 	if (crop) {
 #line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
 		*crop = _vala_crop;
-#line 30207 "Photo.c"
+#line 30185 "Photo.c"
 	}
 #line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 30211 "Photo.c"
+#line 30189 "Photo.c"
 }
 
 
@@ -30220,36 +30198,36 @@ void photo_set_crop (Photo* self, Box* crop) {
 	Dimensions dim = {0};
 	Dimensions _tmp0_ = {0};
 	Orientation orientation = 0;
-	Orientation _tmp1_ = 0;
+	Orientation _tmp1_;
 	Box derotated = {0};
-	Dimensions _tmp2_ = {0};
-	Box _tmp3_ = {0};
+	Dimensions _tmp2_;
+	Box _tmp3_;
 	Box _tmp4_ = {0};
-	Box _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	Dimensions _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	Box _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	Box _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	Dimensions _tmp14_ = {0};
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	Box _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	Dimensions _tmp19_ = {0};
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	Box _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	Box _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	Dimensions _tmp26_ = {0};
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
-	Box _tmp29_ = {0};
+	Box _tmp5_;
+	gint _tmp6_;
+	Dimensions _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	Box _tmp10_;
+	gint _tmp11_;
+	Box _tmp12_;
+	gint _tmp13_;
+	Dimensions _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	Box _tmp17_;
+	gint _tmp18_;
+	Dimensions _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
+	Box _tmp22_;
+	gint _tmp23_;
+	Box _tmp24_;
+	gint _tmp25_;
+	Dimensions _tmp26_;
+	gint _tmp27_;
+	gint _tmp28_;
+	Box _tmp29_;
 #line 4212 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
 #line 4212 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30330,7 +30308,7 @@ void photo_set_crop (Photo* self, Box* crop) {
 	_tmp29_ = derotated;
 #line 4224 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_set_raw_crop (self, &_tmp29_);
-#line 30329 "Photo.c"
+#line 30307 "Photo.c"
 }
 
 
@@ -30338,7 +30316,7 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) {
 	gdouble _vala_theta = 0.0;
 	gboolean result = FALSE;
 	gdouble _tmp0_ = 0.0;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 4228 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30353,11 +30331,11 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) {
 		if (theta) {
 #line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
 			*theta = _vala_theta;
-#line 30352 "Photo.c"
+#line 30330 "Photo.c"
 		}
 #line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 30356 "Photo.c"
+#line 30334 "Photo.c"
 	}
 #line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
@@ -30365,80 +30343,80 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) {
 	if (theta) {
 #line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
 		*theta = _vala_theta;
-#line 30364 "Photo.c"
+#line 30342 "Photo.c"
 	}
 #line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 30368 "Photo.c"
+#line 30346 "Photo.c"
 }
 
 
 void photo_set_straighten (Photo* self, gdouble theta) {
-	gdouble _tmp0_ = 0.0;
+	gdouble _tmp0_;
 #line 4234 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
 #line 4235 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = theta;
 #line 4235 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_set_raw_straighten (self, _tmp0_);
-#line 30380 "Photo.c"
+#line 30358 "Photo.c"
 }
 
 
 static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsRedeyeInstance* inst) {
 	GdkPixbuf* result = NULL;
 	gdouble r = 0.0;
-	EditingToolsRedeyeInstance _tmp0_ = {0};
-	gint _tmp1_ = 0;
+	EditingToolsRedeyeInstance _tmp0_;
+	gint _tmp1_;
 	gint* x_insets_first_quadrant = NULL;
-	EditingToolsRedeyeInstance _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint* _tmp4_ = NULL;
-	gint x_insets_first_quadrant_length1 = 0;
-	gint _x_insets_first_quadrant_size_ = 0;
+	EditingToolsRedeyeInstance _tmp2_;
+	gint _tmp3_;
+	gint* _tmp4_;
+	gint x_insets_first_quadrant_length1;
+	gint _x_insets_first_quadrant_size_;
 	gint i = 0;
 	gint x_bounds_min = 0;
-	EditingToolsRedeyeInstance _tmp22_ = {0};
-	GdkPoint _tmp23_ = {0};
-	gint _tmp24_ = 0;
-	EditingToolsRedeyeInstance _tmp25_ = {0};
-	gint _tmp26_ = 0;
+	EditingToolsRedeyeInstance _tmp22_;
+	GdkPoint _tmp23_;
+	gint _tmp24_;
+	EditingToolsRedeyeInstance _tmp25_;
+	gint _tmp26_;
 	gint x_bounds_max = 0;
-	EditingToolsRedeyeInstance _tmp27_ = {0};
-	GdkPoint _tmp28_ = {0};
-	gint _tmp29_ = 0;
-	EditingToolsRedeyeInstance _tmp30_ = {0};
-	gint _tmp31_ = 0;
+	EditingToolsRedeyeInstance _tmp27_;
+	GdkPoint _tmp28_;
+	gint _tmp29_;
+	EditingToolsRedeyeInstance _tmp30_;
+	gint _tmp31_;
 	gint ymin = 0;
-	EditingToolsRedeyeInstance _tmp32_ = {0};
-	GdkPoint _tmp33_ = {0};
-	gint _tmp34_ = 0;
-	EditingToolsRedeyeInstance _tmp35_ = {0};
-	gint _tmp36_ = 0;
+	EditingToolsRedeyeInstance _tmp32_;
+	GdkPoint _tmp33_;
+	gint _tmp34_;
+	EditingToolsRedeyeInstance _tmp35_;
+	gint _tmp36_;
 	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
+	gint _tmp38_;
 	gint ymax = 0;
-	EditingToolsRedeyeInstance _tmp40_ = {0};
-	GdkPoint _tmp41_ = {0};
-	gint _tmp42_ = 0;
+	EditingToolsRedeyeInstance _tmp40_;
+	GdkPoint _tmp41_;
+	gint _tmp42_;
 	gint _tmp43_ = 0;
-	gint _tmp44_ = 0;
-	GdkPixbuf* _tmp45_ = NULL;
-	gint _tmp46_ = 0;
-	gint _tmp47_ = 0;
+	gint _tmp44_;
+	GdkPixbuf* _tmp45_;
+	gint _tmp46_;
+	gint _tmp47_;
 	gint inset_index = 0;
-	EditingToolsRedeyeInstance _tmp88_ = {0};
-	GdkPoint _tmp89_ = {0};
-	gint _tmp90_ = 0;
-	EditingToolsRedeyeInstance _tmp91_ = {0};
-	GdkPoint _tmp92_ = {0};
-	gint _tmp93_ = 0;
-	EditingToolsRedeyeInstance _tmp94_ = {0};
-	gint _tmp95_ = 0;
-	gint* _tmp96_ = NULL;
-	gint _tmp96__length1 = 0;
-	GdkPixbuf* _tmp133_ = NULL;
-	GdkPixbuf* _tmp134_ = NULL;
+	EditingToolsRedeyeInstance _tmp88_;
+	GdkPoint _tmp89_;
+	gint _tmp90_;
+	EditingToolsRedeyeInstance _tmp91_;
+	GdkPoint _tmp92_;
+	gint _tmp93_;
+	EditingToolsRedeyeInstance _tmp94_;
+	gint _tmp95_;
+	gint* _tmp96_;
+	gint _tmp96__length1;
+	GdkPixbuf* _tmp133_;
+	GdkPixbuf* _tmp134_;
 #line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30465,48 +30443,48 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 	_x_insets_first_quadrant_size_ = x_insets_first_quadrant_length1;
 #line 4251 "/home/jens/Source/shotwell/src/Photo.vala"
 	i = 0;
-#line 30464 "Photo.c"
+#line 30442 "Photo.c"
 	{
 		gdouble y = 0.0;
-		gdouble _tmp5_ = 0.0;
+		gdouble _tmp5_;
 #line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = r;
 #line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 		y = _tmp5_;
-#line 30472 "Photo.c"
+#line 30450 "Photo.c"
 		{
 			gboolean _tmp6_ = FALSE;
 #line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = TRUE;
 #line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 30479 "Photo.c"
-				gdouble _tmp8_ = 0.0;
+#line 30457 "Photo.c"
+				gdouble _tmp8_;
 				gdouble theta = 0.0;
-				gdouble _tmp9_ = 0.0;
-				gdouble _tmp10_ = 0.0;
-				gdouble _tmp11_ = 0.0;
+				gdouble _tmp9_;
+				gdouble _tmp10_;
+				gdouble _tmp11_;
 				gint x = 0;
-				gdouble _tmp12_ = 0.0;
-				gdouble _tmp13_ = 0.0;
-				gdouble _tmp14_ = 0.0;
-				gint* _tmp15_ = NULL;
-				gint _tmp15__length1 = 0;
-				gint _tmp16_ = 0;
-				EditingToolsRedeyeInstance _tmp17_ = {0};
-				gint _tmp18_ = 0;
-				gint _tmp19_ = 0;
-				gint _tmp20_ = 0;
-				gint _tmp21_ = 0;
+				gdouble _tmp12_;
+				gdouble _tmp13_;
+				gdouble _tmp14_;
+				gint* _tmp15_;
+				gint _tmp15__length1;
+				gint _tmp16_;
+				EditingToolsRedeyeInstance _tmp17_;
+				gint _tmp18_;
+				gint _tmp19_;
+				gint _tmp20_;
+				gint _tmp21_;
 #line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp6_) {
-#line 30499 "Photo.c"
-					gdouble _tmp7_ = 0.0;
+#line 30477 "Photo.c"
+					gdouble _tmp7_;
 #line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp7_ = y;
 #line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 					y = _tmp7_ - 1.0;
-#line 30505 "Photo.c"
+#line 30483 "Photo.c"
 				}
 #line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = FALSE;
@@ -30516,7 +30494,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				if (!(_tmp8_ >= 0.0)) {
 #line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 30515 "Photo.c"
+#line 30493 "Photo.c"
 				}
 #line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = y;
@@ -30554,7 +30532,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				_tmp21_ = i;
 #line 4257 "/home/jens/Source/shotwell/src/Photo.vala"
 				i = _tmp21_ + 1;
-#line 30553 "Photo.c"
+#line 30531 "Photo.c"
 			}
 		}
 	}
@@ -30600,14 +30578,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 	if (_tmp38_ < 0) {
 #line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp37_ = 0;
-#line 30599 "Photo.c"
+#line 30577 "Photo.c"
 	} else {
-		gint _tmp39_ = 0;
+		gint _tmp39_;
 #line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = ymin;
 #line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp37_ = _tmp39_;
-#line 30606 "Photo.c"
+#line 30584 "Photo.c"
 	}
 #line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymin = _tmp37_;
@@ -30629,10 +30607,10 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 	_tmp47_ = _tmp46_;
 #line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp44_ > (_tmp47_ - 1)) {
-#line 30628 "Photo.c"
-		GdkPixbuf* _tmp48_ = NULL;
-		gint _tmp49_ = 0;
-		gint _tmp50_ = 0;
+#line 30606 "Photo.c"
+		GdkPixbuf* _tmp48_;
+		gint _tmp49_;
+		gint _tmp50_;
 #line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = pixbuf;
 #line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30641,66 +30619,66 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 		_tmp50_ = _tmp49_;
 #line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp50_ - 1;
-#line 30640 "Photo.c"
+#line 30618 "Photo.c"
 	} else {
-		gint _tmp51_ = 0;
+		gint _tmp51_;
 #line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = ymax;
 #line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp51_;
-#line 30647 "Photo.c"
+#line 30625 "Photo.c"
 	}
 #line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymax = _tmp43_;
 #line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
 	inset_index = 0;
-#line 30653 "Photo.c"
+#line 30631 "Photo.c"
 	{
 		gint y_it = 0;
-		gint _tmp52_ = 0;
+		gint _tmp52_;
 #line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = ymin;
 #line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 		y_it = _tmp52_;
-#line 30661 "Photo.c"
+#line 30639 "Photo.c"
 		{
 			gboolean _tmp53_ = FALSE;
 #line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = TRUE;
 #line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 30668 "Photo.c"
-				gint _tmp55_ = 0;
-				gint _tmp56_ = 0;
+#line 30646 "Photo.c"
+				gint _tmp55_;
+				gint _tmp56_;
 				gint xmin = 0;
-				gint _tmp57_ = 0;
-				gint* _tmp58_ = NULL;
-				gint _tmp58__length1 = 0;
-				gint _tmp59_ = 0;
-				gint _tmp60_ = 0;
+				gint _tmp57_;
+				gint* _tmp58_;
+				gint _tmp58__length1;
+				gint _tmp59_;
+				gint _tmp60_;
 				gint _tmp61_ = 0;
-				gint _tmp62_ = 0;
+				gint _tmp62_;
 				gint xmax = 0;
-				gint _tmp64_ = 0;
-				gint* _tmp65_ = NULL;
-				gint _tmp65__length1 = 0;
-				gint _tmp66_ = 0;
-				gint _tmp67_ = 0;
+				gint _tmp64_;
+				gint* _tmp65_;
+				gint _tmp65__length1;
+				gint _tmp66_;
+				gint _tmp67_;
 				gint _tmp68_ = 0;
-				gint _tmp69_ = 0;
-				GdkPixbuf* _tmp70_ = NULL;
-				gint _tmp71_ = 0;
-				gint _tmp72_ = 0;
-				gint _tmp87_ = 0;
+				gint _tmp69_;
+				GdkPixbuf* _tmp70_;
+				gint _tmp71_;
+				gint _tmp72_;
+				gint _tmp87_;
 #line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp53_) {
-#line 30693 "Photo.c"
-					gint _tmp54_ = 0;
+#line 30671 "Photo.c"
+					gint _tmp54_;
 #line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp54_ = y_it;
 #line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 					y_it = _tmp54_ + 1;
-#line 30699 "Photo.c"
+#line 30677 "Photo.c"
 				}
 #line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp53_ = FALSE;
@@ -30712,7 +30690,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				if (!(_tmp55_ <= _tmp56_)) {
 #line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 30711 "Photo.c"
+#line 30689 "Photo.c"
 				}
 #line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = x_bounds_min;
@@ -30732,14 +30710,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				if (_tmp62_ < 0) {
 #line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = 0;
-#line 30731 "Photo.c"
+#line 30709 "Photo.c"
 				} else {
-					gint _tmp63_ = 0;
+					gint _tmp63_;
 #line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp63_ = xmin;
 #line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = _tmp63_;
-#line 30738 "Photo.c"
+#line 30716 "Photo.c"
 				}
 #line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp61_;
@@ -30765,10 +30743,10 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				_tmp72_ = _tmp71_;
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp69_ > (_tmp72_ - 1)) {
-#line 30764 "Photo.c"
-					GdkPixbuf* _tmp73_ = NULL;
-					gint _tmp74_ = 0;
-					gint _tmp75_ = 0;
+#line 30742 "Photo.c"
+					GdkPixbuf* _tmp73_;
+					gint _tmp74_;
+					gint _tmp75_;
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp73_ = pixbuf;
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30777,49 +30755,49 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 					_tmp75_ = _tmp74_;
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp68_ = _tmp75_ - 1;
-#line 30776 "Photo.c"
+#line 30754 "Photo.c"
 				} else {
-					gint _tmp76_ = 0;
+					gint _tmp76_;
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp76_ = xmax;
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp68_ = _tmp76_;
-#line 30783 "Photo.c"
+#line 30761 "Photo.c"
 				}
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp68_;
-#line 30787 "Photo.c"
+#line 30765 "Photo.c"
 				{
 					gint x_it = 0;
-					gint _tmp77_ = 0;
+					gint _tmp77_;
 #line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp77_ = xmin;
 #line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 					x_it = _tmp77_;
-#line 30795 "Photo.c"
+#line 30773 "Photo.c"
 					{
 						gboolean _tmp78_ = FALSE;
 #line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp78_ = TRUE;
 #line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 30802 "Photo.c"
-							gint _tmp80_ = 0;
-							gint _tmp81_ = 0;
-							GdkPixbuf* _tmp82_ = NULL;
-							gint _tmp83_ = 0;
-							gint _tmp84_ = 0;
-							GdkPixbuf* _tmp85_ = NULL;
-							GdkPixbuf* _tmp86_ = NULL;
+#line 30780 "Photo.c"
+							gint _tmp80_;
+							gint _tmp81_;
+							GdkPixbuf* _tmp82_;
+							gint _tmp83_;
+							gint _tmp84_;
+							GdkPixbuf* _tmp85_;
+							GdkPixbuf* _tmp86_;
 #line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp78_) {
-#line 30812 "Photo.c"
-								gint _tmp79_ = 0;
+#line 30790 "Photo.c"
+								gint _tmp79_;
 #line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp79_ = x_it;
 #line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 								x_it = _tmp79_ + 1;
-#line 30818 "Photo.c"
+#line 30796 "Photo.c"
 							}
 #line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp78_ = FALSE;
@@ -30831,7 +30809,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							if (!(_tmp80_ <= _tmp81_)) {
 #line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 30830 "Photo.c"
+#line 30808 "Photo.c"
 							}
 #line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp82_ = pixbuf;
@@ -30845,7 +30823,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							_tmp86_ = _tmp85_;
 #line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp86_);
-#line 30844 "Photo.c"
+#line 30822 "Photo.c"
 						}
 					}
 				}
@@ -30853,7 +30831,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				_tmp87_ = inset_index;
 #line 4279 "/home/jens/Source/shotwell/src/Photo.vala"
 				inset_index = _tmp87_ + 1;
-#line 30852 "Photo.c"
+#line 30830 "Photo.c"
 			}
 		}
 	}
@@ -30883,53 +30861,53 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 	_tmp96__length1 = x_insets_first_quadrant_length1;
 #line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
 	inset_index = _tmp96__length1 - 1;
-#line 30882 "Photo.c"
+#line 30860 "Photo.c"
 	{
 		gint y_it = 0;
-		gint _tmp97_ = 0;
+		gint _tmp97_;
 #line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp97_ = ymin;
 #line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 		y_it = _tmp97_;
-#line 30890 "Photo.c"
+#line 30868 "Photo.c"
 		{
 			gboolean _tmp98_ = FALSE;
 #line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp98_ = TRUE;
 #line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 30897 "Photo.c"
-				gint _tmp100_ = 0;
-				gint _tmp101_ = 0;
+#line 30875 "Photo.c"
+				gint _tmp100_;
+				gint _tmp101_;
 				gint xmin = 0;
-				gint _tmp102_ = 0;
-				gint* _tmp103_ = NULL;
-				gint _tmp103__length1 = 0;
-				gint _tmp104_ = 0;
-				gint _tmp105_ = 0;
+				gint _tmp102_;
+				gint* _tmp103_;
+				gint _tmp103__length1;
+				gint _tmp104_;
+				gint _tmp105_;
 				gint _tmp106_ = 0;
-				gint _tmp107_ = 0;
+				gint _tmp107_;
 				gint xmax = 0;
-				gint _tmp109_ = 0;
-				gint* _tmp110_ = NULL;
-				gint _tmp110__length1 = 0;
-				gint _tmp111_ = 0;
-				gint _tmp112_ = 0;
+				gint _tmp109_;
+				gint* _tmp110_;
+				gint _tmp110__length1;
+				gint _tmp111_;
+				gint _tmp112_;
 				gint _tmp113_ = 0;
-				gint _tmp114_ = 0;
-				GdkPixbuf* _tmp115_ = NULL;
-				gint _tmp116_ = 0;
-				gint _tmp117_ = 0;
-				gint _tmp132_ = 0;
+				gint _tmp114_;
+				GdkPixbuf* _tmp115_;
+				gint _tmp116_;
+				gint _tmp117_;
+				gint _tmp132_;
 #line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp98_) {
-#line 30922 "Photo.c"
-					gint _tmp99_ = 0;
+#line 30900 "Photo.c"
+					gint _tmp99_;
 #line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp99_ = y_it;
 #line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 					y_it = _tmp99_ + 1;
-#line 30928 "Photo.c"
+#line 30906 "Photo.c"
 				}
 #line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp98_ = FALSE;
@@ -30941,7 +30919,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				if (!(_tmp100_ <= _tmp101_)) {
 #line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 30940 "Photo.c"
+#line 30918 "Photo.c"
 				}
 #line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp102_ = x_bounds_min;
@@ -30961,14 +30939,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				if (_tmp107_ < 0) {
 #line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp106_ = 0;
-#line 30960 "Photo.c"
+#line 30938 "Photo.c"
 				} else {
-					gint _tmp108_ = 0;
+					gint _tmp108_;
 #line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp108_ = xmin;
 #line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp106_ = _tmp108_;
-#line 30967 "Photo.c"
+#line 30945 "Photo.c"
 				}
 #line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp106_;
@@ -30994,10 +30972,10 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				_tmp117_ = _tmp116_;
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp114_ > (_tmp117_ - 1)) {
-#line 30993 "Photo.c"
-					GdkPixbuf* _tmp118_ = NULL;
-					gint _tmp119_ = 0;
-					gint _tmp120_ = 0;
+#line 30971 "Photo.c"
+					GdkPixbuf* _tmp118_;
+					gint _tmp119_;
+					gint _tmp120_;
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp118_ = pixbuf;
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31006,49 +30984,49 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 					_tmp120_ = _tmp119_;
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp113_ = _tmp120_ - 1;
-#line 31005 "Photo.c"
+#line 30983 "Photo.c"
 				} else {
-					gint _tmp121_ = 0;
+					gint _tmp121_;
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp121_ = xmax;
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp113_ = _tmp121_;
-#line 31012 "Photo.c"
+#line 30990 "Photo.c"
 				}
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp113_;
-#line 31016 "Photo.c"
+#line 30994 "Photo.c"
 				{
 					gint x_it = 0;
-					gint _tmp122_ = 0;
+					gint _tmp122_;
 #line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp122_ = xmin;
 #line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 					x_it = _tmp122_;
-#line 31024 "Photo.c"
+#line 31002 "Photo.c"
 					{
 						gboolean _tmp123_ = FALSE;
 #line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp123_ = TRUE;
 #line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 31031 "Photo.c"
-							gint _tmp125_ = 0;
-							gint _tmp126_ = 0;
-							GdkPixbuf* _tmp127_ = NULL;
-							gint _tmp128_ = 0;
-							gint _tmp129_ = 0;
-							GdkPixbuf* _tmp130_ = NULL;
-							GdkPixbuf* _tmp131_ = NULL;
+#line 31009 "Photo.c"
+							gint _tmp125_;
+							gint _tmp126_;
+							GdkPixbuf* _tmp127_;
+							gint _tmp128_;
+							gint _tmp129_;
+							GdkPixbuf* _tmp130_;
+							GdkPixbuf* _tmp131_;
 #line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp123_) {
-#line 31041 "Photo.c"
-								gint _tmp124_ = 0;
+#line 31019 "Photo.c"
+								gint _tmp124_;
 #line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp124_ = x_it;
 #line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 								x_it = _tmp124_ + 1;
-#line 31047 "Photo.c"
+#line 31025 "Photo.c"
 							}
 #line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp123_ = FALSE;
@@ -31060,7 +31038,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							if (!(_tmp125_ <= _tmp126_)) {
 #line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 31059 "Photo.c"
+#line 31037 "Photo.c"
 							}
 #line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp127_ = pixbuf;
@@ -31074,7 +31052,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							_tmp131_ = _tmp130_;
 #line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp131_);
-#line 31073 "Photo.c"
+#line 31051 "Photo.c"
 						}
 					}
 				}
@@ -31082,7 +31060,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				_tmp132_ = inset_index;
 #line 4296 "/home/jens/Source/shotwell/src/Photo.vala"
 				inset_index = _tmp132_ - 1;
-#line 31081 "Photo.c"
+#line 31059 "Photo.c"
 			}
 		}
 	}
@@ -31096,25 +31074,25 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 	x_insets_first_quadrant = (g_free (x_insets_first_quadrant), NULL);
 #line 4299 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31095 "Photo.c"
+#line 31073 "Photo.c"
 }
 
 
 static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x, gint y) {
 	GdkPixbuf* result = NULL;
 	gint px_start_byte_offset = 0;
-	gint _tmp0_ = 0;
-	GdkPixbuf* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	GdkPixbuf* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	gint _tmp0_;
+	GdkPixbuf* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	GdkPixbuf* _tmp4_;
+	gint _tmp5_;
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
-	gint _tmp9_ = 0;
-	GdkPixbuf* _tmp33_ = NULL;
-	GdkPixbuf* _tmp34_ = NULL;
+	gint _tmp9_;
+	GdkPixbuf* _tmp33_;
+	GdkPixbuf* _tmp34_;
 #line 4302 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 4302 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31137,25 +31115,25 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
 	_tmp9_ = x;
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp9_ >= 0) {
-#line 31136 "Photo.c"
-		gint _tmp10_ = 0;
+#line 31114 "Photo.c"
+		gint _tmp10_;
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = y;
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = _tmp10_ >= 0;
-#line 31142 "Photo.c"
+#line 31120 "Photo.c"
 	} else {
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = FALSE;
-#line 31146 "Photo.c"
+#line 31124 "Photo.c"
 	}
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
-#line 31150 "Photo.c"
-		gint _tmp11_ = 0;
-		GdkPixbuf* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
+#line 31128 "Photo.c"
+		gint _tmp11_;
+		GdkPixbuf* _tmp12_;
+		gint _tmp13_;
+		gint _tmp14_;
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = x;
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31166,19 +31144,19 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
 		_tmp14_ = _tmp13_;
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp11_ < _tmp14_;
-#line 31165 "Photo.c"
+#line 31143 "Photo.c"
 	} else {
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = FALSE;
-#line 31169 "Photo.c"
+#line 31147 "Photo.c"
 	}
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_) {
-#line 31173 "Photo.c"
-		gint _tmp15_ = 0;
-		GdkPixbuf* _tmp16_ = NULL;
-		gint _tmp17_ = 0;
-		gint _tmp18_ = 0;
+#line 31151 "Photo.c"
+		gint _tmp15_;
+		GdkPixbuf* _tmp16_;
+		gint _tmp17_;
+		gint _tmp18_;
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = y;
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31189,38 +31167,38 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
 		_tmp18_ = _tmp17_;
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp15_ < _tmp18_;
-#line 31188 "Photo.c"
+#line 31166 "Photo.c"
 	} else {
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = FALSE;
-#line 31192 "Photo.c"
+#line 31170 "Photo.c"
 	}
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 31196 "Photo.c"
+#line 31174 "Photo.c"
 		guchar* pixel_data = NULL;
-		GdkPixbuf* _tmp19_ = NULL;
-		guint8* _tmp20_ = NULL;
-		gint pixel_data_length1 = 0;
-		gint _pixel_data_size_ = 0;
+		GdkPixbuf* _tmp19_;
+		guint8* _tmp20_;
+		gint pixel_data_length1;
+		gint _pixel_data_size_;
 		guchar g = '\0';
-		guchar* _tmp21_ = NULL;
-		gint _tmp21__length1 = 0;
-		gint _tmp22_ = 0;
-		guchar _tmp23_ = '\0';
+		guchar* _tmp21_;
+		gint _tmp21__length1;
+		gint _tmp22_;
+		guchar _tmp23_;
 		guchar b = '\0';
-		guchar* _tmp24_ = NULL;
-		gint _tmp24__length1 = 0;
-		gint _tmp25_ = 0;
-		guchar _tmp26_ = '\0';
+		guchar* _tmp24_;
+		gint _tmp24__length1;
+		gint _tmp25_;
+		guchar _tmp26_;
 		guchar r = '\0';
-		guchar _tmp27_ = '\0';
-		guchar _tmp28_ = '\0';
-		guchar* _tmp29_ = NULL;
-		gint _tmp29__length1 = 0;
-		gint _tmp30_ = 0;
-		guchar _tmp31_ = '\0';
-		guchar _tmp32_ = '\0';
+		guchar _tmp27_;
+		guchar _tmp28_;
+		guchar* _tmp29_;
+		gint _tmp29__length1;
+		gint _tmp30_;
+		guchar _tmp31_;
+		guchar _tmp32_;
 #line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = pixbuf;
 #line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31269,7 +31247,7 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
 		_tmp29_[_tmp30_] = _tmp31_;
 #line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32_ = _tmp29_[_tmp30_];
-#line 31268 "Photo.c"
+#line 31246 "Photo.c"
 	}
 #line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = pixbuf;
@@ -31279,31 +31257,31 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
 	result = _tmp34_;
 #line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31278 "Photo.c"
+#line 31256 "Photo.c"
 }
 
 
 void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoint* result) {
 	Orientation unscaled_orientation = 0;
-	Orientation _tmp0_ = 0;
+	Orientation _tmp0_;
 	Dimensions unscaled_dims = {0};
-	Orientation _tmp1_ = 0;
+	Orientation _tmp1_;
 	Dimensions _tmp2_ = {0};
 	Dimensions _tmp3_ = {0};
 	gint unscaled_x_offset_raw = 0;
 	gint unscaled_y_offset_raw = 0;
 	Box crop_box = {0};
 	Box _tmp4_ = {0};
-	gboolean _tmp5_ = FALSE;
+	gboolean _tmp5_;
 	GdkPoint derotated_point = {0};
-	Orientation _tmp10_ = 0;
-	Dimensions _tmp11_ = {0};
-	GdkPoint _tmp12_ = {0};
+	Orientation _tmp10_;
+	Dimensions _tmp11_;
+	GdkPoint _tmp12_;
 	GdkPoint _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
+	gint _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
 #line 4332 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
 #line 4332 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31330,11 +31308,11 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin
 	crop_box = _tmp4_;
 #line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 31329 "Photo.c"
-		Box _tmp6_ = {0};
-		gint _tmp7_ = 0;
-		Box _tmp8_ = {0};
-		gint _tmp9_ = 0;
+#line 31307 "Photo.c"
+		Box _tmp6_;
+		gint _tmp7_;
+		Box _tmp8_;
+		gint _tmp9_;
 #line 4343 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = crop_box;
 #line 4343 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31347,7 +31325,7 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin
 		_tmp9_ = _tmp8_.top;
 #line 4344 "/home/jens/Source/shotwell/src/Photo.vala"
 		unscaled_y_offset_raw = _tmp9_;
-#line 31346 "Photo.c"
+#line 31324 "Photo.c"
 	}
 #line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = unscaled_orientation;
@@ -31375,7 +31353,7 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin
 	*result = derotated_point;
 #line 4354 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 31374 "Photo.c"
+#line 31352 "Photo.c"
 }
 
 
@@ -31384,43 +31362,43 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
 	GdkPoint _tmp0_ = {0};
 	GdkPoint lower_right = {0};
 	GdkPoint _tmp1_ = {0};
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	GdkPoint _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	GdkPoint _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	GdkPoint _tmp14_ = {0};
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkPoint _tmp6_;
+	gint _tmp7_;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
+	GdkPoint _tmp10_;
+	gint _tmp11_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
+	GdkPoint _tmp14_;
 	GdkPoint _tmp15_ = {0};
-	GdkPoint _tmp16_ = {0};
+	GdkPoint _tmp16_;
 	GdkPoint _tmp17_ = {0};
-	GdkPoint _tmp18_ = {0};
-	gint _tmp19_ = 0;
-	GdkPoint _tmp20_ = {0};
-	gint _tmp21_ = 0;
-	GdkPoint _tmp27_ = {0};
-	gint _tmp28_ = 0;
-	GdkPoint _tmp29_ = {0};
-	gint _tmp30_ = 0;
+	GdkPoint _tmp18_;
+	gint _tmp19_;
+	GdkPoint _tmp20_;
+	gint _tmp21_;
+	GdkPoint _tmp27_;
+	gint _tmp28_;
+	GdkPoint _tmp29_;
+	gint _tmp30_;
 	GdkRectangle raw_rect = {0};
-	GdkPoint _tmp36_ = {0};
-	gint _tmp37_ = 0;
-	GdkPoint _tmp38_ = {0};
-	gint _tmp39_ = 0;
-	GdkPoint _tmp40_ = {0};
-	gint _tmp41_ = 0;
-	GdkPoint _tmp42_ = {0};
-	gint _tmp43_ = 0;
-	GdkPoint _tmp44_ = {0};
-	gint _tmp45_ = 0;
-	GdkPoint _tmp46_ = {0};
-	gint _tmp47_ = 0;
+	GdkPoint _tmp36_;
+	gint _tmp37_;
+	GdkPoint _tmp38_;
+	gint _tmp39_;
+	GdkPoint _tmp40_;
+	gint _tmp41_;
+	GdkPoint _tmp42_;
+	gint _tmp43_;
+	GdkPoint _tmp44_;
+	gint _tmp45_;
+	GdkPoint _tmp46_;
+	gint _tmp47_;
 #line 4357 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
 #line 4357 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31487,13 +31465,13 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
 	_tmp21_ = _tmp20_.x;
 #line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_ > _tmp21_) {
-#line 31486 "Photo.c"
+#line 31464 "Photo.c"
 		gint temp = 0;
-		GdkPoint _tmp22_ = {0};
-		gint _tmp23_ = 0;
-		GdkPoint _tmp24_ = {0};
-		gint _tmp25_ = 0;
-		gint _tmp26_ = 0;
+		GdkPoint _tmp22_;
+		gint _tmp23_;
+		GdkPoint _tmp24_;
+		gint _tmp25_;
+		gint _tmp26_;
 #line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = upper_left;
 #line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31510,7 +31488,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
 		_tmp26_ = temp;
 #line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
 		lower_right.x = _tmp26_;
-#line 31509 "Photo.c"
+#line 31487 "Photo.c"
 	}
 #line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = upper_left;
@@ -31522,13 +31500,13 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
 	_tmp30_ = _tmp29_.y;
 #line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28_ > _tmp30_) {
-#line 31521 "Photo.c"
+#line 31499 "Photo.c"
 		gint temp = 0;
-		GdkPoint _tmp31_ = {0};
-		gint _tmp32_ = 0;
-		GdkPoint _tmp33_ = {0};
-		gint _tmp34_ = 0;
-		gint _tmp35_ = 0;
+		GdkPoint _tmp31_;
+		gint _tmp32_;
+		GdkPoint _tmp33_;
+		gint _tmp34_;
+		gint _tmp35_;
 #line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = upper_left;
 #line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31545,7 +31523,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
 		_tmp35_ = temp;
 #line 4376 "/home/jens/Source/shotwell/src/Photo.vala"
 		lower_right.y = _tmp35_;
-#line 31544 "Photo.c"
+#line 31522 "Photo.c"
 	}
 #line 4379 "/home/jens/Source/shotwell/src/Photo.vala"
 	memset (&raw_rect, 0, sizeof (GdkRectangle));
@@ -31585,7 +31563,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
 	*result = raw_rect;
 #line 4385 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 31584 "Photo.c"
+#line 31562 "Photo.c"
 }
 
 
@@ -31593,19 +31571,19 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 	PixelTransformationBundle* result = NULL;
 	GdkPixbuf* pixbuf = NULL;
 	PixelTransformationBundle* transformations = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
-	PixelTransformationBundle* _tmp5_ = NULL;
+	GdkPixbuf* _tmp4_;
+	PixelTransformationBundle* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 4388 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 4389 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = NULL;
-#line 31599 "Photo.c"
+#line 31577 "Photo.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Scaling _tmp1_ = {0};
-		GdkPixbuf* _tmp2_ = NULL;
-		GdkPixbuf* _tmp3_ = NULL;
+		GdkPixbuf* _tmp2_;
+		GdkPixbuf* _tmp3_;
 #line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		scaling_for_best_fit (360, FALSE, &_tmp1_);
 #line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31614,8 +31592,8 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 		_tmp0_ = _tmp2_;
 #line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 31613 "Photo.c"
-			goto __catch404_g_error;
+#line 31591 "Photo.c"
+			goto __catch405_g_error;
 		}
 #line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp0_;
@@ -31627,10 +31605,10 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 		pixbuf = _tmp3_;
 #line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp0_);
-#line 31626 "Photo.c"
+#line 31604 "Photo.c"
 	}
-	goto __finally404;
-	__catch404_g_error:
+	goto __finally405;
+	__catch405_g_error:
 	{
 		GError* e = NULL;
 #line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31647,9 +31625,9 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 		_g_object_unref0 (pixbuf);
 #line 4405 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 31646 "Photo.c"
+#line 31624 "Photo.c"
 	}
-	__finally404:
+	__finally405:
 #line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31660,7 +31638,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 31659 "Photo.c"
+#line 31637 "Photo.c"
 	}
 #line 4412 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = pixbuf;
@@ -31674,15 +31652,15 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 	_g_object_unref0 (pixbuf);
 #line 4420 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31673 "Photo.c"
+#line 31651 "Photo.c"
 }
 
 
 gboolean photo_enhance (Photo* self) {
 	gboolean result = FALSE;
 	PixelTransformationBundle* transformations = NULL;
-	PixelTransformationBundle* _tmp0_ = NULL;
-	PixelTransformationBundle* _tmp1_ = NULL;
+	PixelTransformationBundle* _tmp0_;
+	PixelTransformationBundle* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 4423 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -31700,35 +31678,35 @@ gboolean photo_enhance (Photo* self) {
 		_pixel_transformation_bundle_unref0 (transformations);
 #line 4427 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 31699 "Photo.c"
+#line 31677 "Photo.c"
 	}
 	{
-		PhotoRow* _tmp2_ = NULL;
+		PhotoRow* _tmp2_;
 #line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
 #line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 31707 "Photo.c"
+#line 31685 "Photo.c"
 		{
-			PixelTransformationBundle* _tmp3_ = NULL;
+			PixelTransformationBundle* _tmp3_;
 #line 4433 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = transformations;
 #line 4433 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_color_adjustments (self, _tmp3_);
-#line 31714 "Photo.c"
+#line 31692 "Photo.c"
 		}
-		__finally405:
+		__finally406:
 		{
-			PhotoRow* _tmp4_ = NULL;
+			PhotoRow* _tmp4_;
 #line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 31723 "Photo.c"
+#line 31701 "Photo.c"
 		}
 #line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 31727 "Photo.c"
+#line 31705 "Photo.c"
 			gboolean _tmp5_ = FALSE;
 #line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformation_bundle_unref0 (transformations);
@@ -31738,7 +31716,7 @@ gboolean photo_enhance (Photo* self) {
 			g_clear_error (&_inner_error_);
 #line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp5_;
-#line 31737 "Photo.c"
+#line 31715 "Photo.c"
 		}
 	}
 #line 4440 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31747,30 +31725,30 @@ gboolean photo_enhance (Photo* self) {
 	_pixel_transformation_bundle_unref0 (transformations);
 #line 4440 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31746 "Photo.c"
+#line 31724 "Photo.c"
 }
 
 
 gboolean photo_get_develop_raw_photos_to_files (void) {
 	gboolean result;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 349 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo__develop_raw_photos_to_files;
 #line 349 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 349 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31759 "Photo.c"
+#line 31737 "Photo.c"
 }
 
 
 void photo_set_develop_raw_photos_to_files (gboolean value) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 349 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = value;
 #line 349 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo__develop_raw_photos_to_files = _tmp0_;
-#line 31769 "Photo.c"
+#line 31747 "Photo.c"
 }
 
 
@@ -31779,7 +31757,7 @@ static void photo_real_editable_replaced (Photo* self, GFile* old_file, GFile* n
 	g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file));
 #line 358 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file));
-#line 31778 "Photo.c"
+#line 31756 "Photo.c"
 }
 
 
@@ -31798,19 +31776,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 		data1 = closure->data;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 31797 "Photo.c"
+#line 31775 "Photo.c"
 	} else {
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = closure->data;
-#line 31803 "Photo.c"
+#line 31781 "Photo.c"
 	}
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 31809 "Photo.c"
+#line 31787 "Photo.c"
 }
 
 
@@ -31825,7 +31803,7 @@ static void photo_real_baseline_replaced (Photo* self) {
 static void photo_real_master_reimported (Photo* self, PhotoMetadata* metadata) {
 #line 376 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 31824 "Photo.c"
+#line 31802 "Photo.c"
 }
 
 
@@ -31844,62 +31822,62 @@ static void g_cclosure_user_marshal_VOID__MEDIA_METADATA (GClosure * closure, GV
 		data1 = closure->data;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 31843 "Photo.c"
+#line 31821 "Photo.c"
 	} else {
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = closure->data;
-#line 31849 "Photo.c"
+#line 31827 "Photo.c"
 	}
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback = (GMarshalFunc_VOID__MEDIA_METADATA) (marshal_data ? marshal_data : cc->callback);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback (data1, value_get_media_metadata (param_values + 1), data2);
-#line 31855 "Photo.c"
+#line 31833 "Photo.c"
 }
 
 
 static void photo_real_editable_reimported (Photo* self, PhotoMetadata* metadata) {
 #line 380 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 31862 "Photo.c"
+#line 31840 "Photo.c"
 }
 
 
 static void photo_real_baseline_reimported (Photo* self, PhotoMetadata* metadata) {
 #line 387 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 31869 "Photo.c"
+#line 31847 "Photo.c"
 }
 
 
 static void photo_real_source_reimported (Photo* self, PhotoMetadata* metadata) {
 #line 394 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 31876 "Photo.c"
+#line 31854 "Photo.c"
 }
 
 
 static void _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced (Photo* _sender, gpointer self) {
 #line 257 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_photo_transformation_state_impl_on_photo_baseline_replaced ((PhotoPhotoTransformationStateImpl*) self);
-#line 31883 "Photo.c"
+#line 31861 "Photo.c"
 }
 
 
 static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_construct (GType object_type, Photo* photo, Orientation orientation, GeeHashMap* transformations, PixelTransformer* transformer, PixelTransformationBundle* adjustments) {
 	PhotoPhotoTransformationStateImpl * self = NULL;
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Orientation _tmp2_ = 0;
-	GeeHashMap* _tmp3_ = NULL;
-	GeeHashMap* _tmp4_ = NULL;
-	PixelTransformer* _tmp5_ = NULL;
-	PixelTransformer* _tmp6_ = NULL;
-	PixelTransformationBundle* _tmp7_ = NULL;
-	PixelTransformationBundle* _tmp8_ = NULL;
-	Photo* _tmp9_ = NULL;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
+	Orientation _tmp2_;
+	GeeHashMap* _tmp3_;
+	GeeHashMap* _tmp4_;
+	PixelTransformer* _tmp5_;
+	PixelTransformer* _tmp6_;
+	PixelTransformationBundle* _tmp7_;
+	PixelTransformationBundle* _tmp8_;
+	Photo* _tmp9_;
 #line 244 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
 #line 244 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31952,20 +31930,20 @@ static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_
 	g_signal_connect_object (_tmp9_, "baseline-replaced", (GCallback) _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced, self, 0);
 #line 244 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 31951 "Photo.c"
+#line 31929 "Photo.c"
 }
 
 
 static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_new (Photo* photo, Orientation orientation, GeeHashMap* transformations, PixelTransformer* transformer, PixelTransformationBundle* adjustments) {
 #line 244 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_photo_transformation_state_impl_construct (PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL, photo, orientation, transformations, transformer, adjustments);
-#line 31958 "Photo.c"
+#line 31936 "Photo.c"
 }
 
 
 static Orientation photo_photo_transformation_state_impl_get_orientation (PhotoPhotoTransformationStateImpl* self) {
 	Orientation result = 0;
-	Orientation _tmp0_ = 0;
+	Orientation _tmp0_;
 #line 260 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (PHOTO_IS_PHOTO_TRANSFORMATION_STATE_IMPL (self), 0);
 #line 261 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31974,14 +31952,14 @@ static Orientation photo_photo_transformation_state_impl_get_orientation (PhotoP
 	result = _tmp0_;
 #line 261 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31973 "Photo.c"
+#line 31951 "Photo.c"
 }
 
 
 static GeeHashMap* photo_photo_transformation_state_impl_get_transformations (PhotoPhotoTransformationStateImpl* self) {
 	GeeHashMap* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeHashMap* _tmp1_;
 #line 264 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (PHOTO_IS_PHOTO_TRANSFORMATION_STATE_IMPL (self), NULL);
 #line 265 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31992,23 +31970,23 @@ static GeeHashMap* photo_photo_transformation_state_impl_get_transformations (Ph
 	result = _tmp1_;
 #line 265 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31991 "Photo.c"
+#line 31969 "Photo.c"
 }
 
 
 static PixelTransformer* photo_photo_transformation_state_impl_get_transformer (PhotoPhotoTransformationStateImpl* self) {
 	PixelTransformer* result = NULL;
 	PixelTransformer* _tmp0_ = NULL;
-	PixelTransformer* _tmp1_ = NULL;
+	PixelTransformer* _tmp1_;
 #line 268 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (PHOTO_IS_PHOTO_TRANSFORMATION_STATE_IMPL (self), NULL);
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = self->priv->transformer;
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 32005 "Photo.c"
-		PixelTransformer* _tmp2_ = NULL;
-		PixelTransformer* _tmp3_ = NULL;
+#line 31983 "Photo.c"
+		PixelTransformer* _tmp2_;
+		PixelTransformer* _tmp3_;
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->priv->transformer;
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32017,35 +31995,35 @@ static PixelTransformer* photo_photo_transformation_state_impl_get_transformer (
 		_pixel_transformer_unref0 (_tmp0_);
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_;
-#line 32016 "Photo.c"
+#line 31994 "Photo.c"
 	} else {
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 		_pixel_transformer_unref0 (_tmp0_);
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = NULL;
-#line 32022 "Photo.c"
+#line 32000 "Photo.c"
 	}
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 32028 "Photo.c"
+#line 32006 "Photo.c"
 }
 
 
 static PixelTransformationBundle* photo_photo_transformation_state_impl_get_color_adjustments (PhotoPhotoTransformationStateImpl* self) {
 	PixelTransformationBundle* result = NULL;
 	PixelTransformationBundle* _tmp0_ = NULL;
-	PixelTransformationBundle* _tmp1_ = NULL;
+	PixelTransformationBundle* _tmp1_;
 #line 272 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (PHOTO_IS_PHOTO_TRANSFORMATION_STATE_IMPL (self), NULL);
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = self->priv->adjustments;
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 32042 "Photo.c"
-		PixelTransformationBundle* _tmp2_ = NULL;
-		PixelTransformationBundle* _tmp3_ = NULL;
+#line 32020 "Photo.c"
+		PixelTransformationBundle* _tmp2_;
+		PixelTransformationBundle* _tmp3_;
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->priv->adjustments;
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32054,27 +32032,27 @@ static PixelTransformationBundle* photo_photo_transformation_state_impl_get_colo
 		_pixel_transformation_bundle_unref0 (_tmp0_);
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_;
-#line 32053 "Photo.c"
+#line 32031 "Photo.c"
 	} else {
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 		_pixel_transformation_bundle_unref0 (_tmp0_);
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = NULL;
-#line 32059 "Photo.c"
+#line 32037 "Photo.c"
 	}
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 32065 "Photo.c"
+#line 32043 "Photo.c"
 }
 
 
 static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (GeeHashMap* original) {
 	GeeHashMap* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 	GeeHashMap* clone = NULL;
-	GeeHashMap* _tmp1_ = NULL;
+	GeeHashMap* _tmp1_;
 #line 276 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((original == NULL) || GEE_IS_HASH_MAP (original), NULL);
 #line 278 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32085,21 +32063,21 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
 		result = NULL;
 #line 279 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 32084 "Photo.c"
+#line 32062 "Photo.c"
 	}
 #line 281 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 281 "/home/jens/Source/shotwell/src/Photo.vala"
 	clone = _tmp1_;
-#line 32090 "Photo.c"
+#line 32068 "Photo.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeHashMap* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeSet* _tmp4_ = NULL;
-		GeeSet* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
-		GeeIterator* _tmp7_ = NULL;
+		GeeHashMap* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeSet* _tmp4_;
+		GeeSet* _tmp5_;
+		GeeIterator* _tmp6_;
+		GeeIterator* _tmp7_;
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = original;
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32118,20 +32096,20 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
 		_object_it = _tmp7_;
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 32117 "Photo.c"
-			GeeIterator* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+#line 32095 "Photo.c"
+			GeeIterator* _tmp8_;
+			gboolean _tmp9_;
 			gchar* object = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			gpointer _tmp11_ = NULL;
-			GeeHashMap* _tmp12_ = NULL;
-			const gchar* _tmp13_ = NULL;
-			GeeHashMap* _tmp14_ = NULL;
-			const gchar* _tmp15_ = NULL;
-			gpointer _tmp16_ = NULL;
-			KeyValueMap* _tmp17_ = NULL;
-			KeyValueMap* _tmp18_ = NULL;
-			KeyValueMap* _tmp19_ = NULL;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			GeeHashMap* _tmp12_;
+			const gchar* _tmp13_;
+			GeeHashMap* _tmp14_;
+			const gchar* _tmp15_;
+			gpointer _tmp16_;
+			KeyValueMap* _tmp17_;
+			KeyValueMap* _tmp18_;
+			KeyValueMap* _tmp19_;
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _object_it;
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32140,7 +32118,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
 			if (!_tmp9_) {
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 32139 "Photo.c"
+#line 32117 "Photo.c"
 			}
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _object_it;
@@ -32172,22 +32150,22 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
 			_key_value_map_unref0 (_tmp17_);
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (object);
-#line 32171 "Photo.c"
+#line 32149 "Photo.c"
 		}
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_object_it);
-#line 32175 "Photo.c"
+#line 32153 "Photo.c"
 	}
 #line 285 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = clone;
 #line 285 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 32181 "Photo.c"
+#line 32159 "Photo.c"
 }
 
 
 static void photo_photo_transformation_state_impl_on_photo_baseline_replaced (PhotoPhotoTransformationStateImpl* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 288 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_PHOTO_TRANSFORMATION_STATE_IMPL (self));
 #line 289 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32195,8 +32173,8 @@ static void photo_photo_transformation_state_impl_on_photo_baseline_replaced (Ph
 #line 289 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp0_) {
 #line 290 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState), "broken");
-#line 32195 "Photo.c"
+		g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState), photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_BROKEN_SIGNAL], 0);
+#line 32173 "Photo.c"
 	}
 }
 
@@ -32208,21 +32186,21 @@ static void photo_photo_transformation_state_impl_class_init (PhotoPhotoTransfor
 	g_type_class_add_private (klass, sizeof (PhotoPhotoTransformationStateImplPrivate));
 #line 237 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (klass)->finalize = photo_photo_transformation_state_impl_finalize;
-#line 32207 "Photo.c"
+#line 32185 "Photo.c"
 }
 
 
 static void photo_photo_transformation_state_impl_instance_init (PhotoPhotoTransformationStateImpl * self) {
 #line 237 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv = PHOTO_PHOTO_TRANSFORMATION_STATE_IMPL_GET_PRIVATE (self);
-#line 32214 "Photo.c"
+#line 32192 "Photo.c"
 }
 
 
-static void photo_photo_transformation_state_impl_finalize (GObject* obj) {
+static void photo_photo_transformation_state_impl_finalize (GObject * obj) {
 	PhotoPhotoTransformationStateImpl * self;
-	Photo* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	Photo* _tmp0_;
+	guint _tmp1_;
 #line 237 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL, PhotoPhotoTransformationStateImpl);
 #line 257 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32241,7 +32219,7 @@ static void photo_photo_transformation_state_impl_finalize (GObject* obj) {
 	_pixel_transformation_bundle_unref0 (self->priv->adjustments);
 #line 237 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (photo_photo_transformation_state_impl_parent_class)->finalize (obj);
-#line 32240 "Photo.c"
+#line 32218 "Photo.c"
 }
 
 
@@ -32263,21 +32241,21 @@ static PhotoBackingReaders* photo_backing_readers_construct (GType object_type)
 	self = (PhotoBackingReaders*) g_type_create_instance (object_type);
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 32262 "Photo.c"
+#line 32240 "Photo.c"
 }
 
 
 static PhotoBackingReaders* photo_backing_readers_new (void) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_backing_readers_construct (PHOTO_TYPE_BACKING_READERS);
-#line 32269 "Photo.c"
+#line 32247 "Photo.c"
 }
 
 
 static void photo_value_backing_readers_init (GValue* value) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 32276 "Photo.c"
+#line 32254 "Photo.c"
 }
 
 
@@ -32286,7 +32264,7 @@ static void photo_value_backing_readers_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_backing_readers_unref (value->data[0].v_pointer);
-#line 32285 "Photo.c"
+#line 32263 "Photo.c"
 	}
 }
 
@@ -32296,11 +32274,11 @@ static void photo_value_backing_readers_copy_value (const GValue* src_value, GVa
 	if (src_value->data[0].v_pointer) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_backing_readers_ref (src_value->data[0].v_pointer);
-#line 32295 "Photo.c"
+#line 32273 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32299 "Photo.c"
+#line 32277 "Photo.c"
 	}
 }
 
@@ -32308,66 +32286,66 @@ static void photo_value_backing_readers_copy_value (const GValue* src_value, GVa
 static gpointer photo_value_backing_readers_peek_pointer (const GValue* value) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32307 "Photo.c"
+#line 32285 "Photo.c"
 }
 
 
 static gchar* photo_value_backing_readers_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 32314 "Photo.c"
-		PhotoBackingReaders* object;
+#line 32292 "Photo.c"
+		PhotoBackingReaders * object;
 		object = collect_values[0].v_pointer;
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32321 "Photo.c"
+#line 32299 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32325 "Photo.c"
+#line 32303 "Photo.c"
 		}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_backing_readers_ref (object);
-#line 32329 "Photo.c"
+#line 32307 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32333 "Photo.c"
+#line 32311 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32337 "Photo.c"
+#line 32315 "Photo.c"
 }
 
 
 static gchar* photo_value_backing_readers_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PhotoBackingReaders** object_p;
+	PhotoBackingReaders ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 32348 "Photo.c"
+#line 32326 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 32354 "Photo.c"
+#line 32332 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 32358 "Photo.c"
+#line 32336 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_backing_readers_ref (value->data[0].v_pointer);
-#line 32362 "Photo.c"
+#line 32340 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32366 "Photo.c"
+#line 32344 "Photo.c"
 }
 
 
@@ -32381,7 +32359,7 @@ static GParamSpec* photo_param_spec_backing_readers (const gchar* name, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 32380 "Photo.c"
+#line 32358 "Photo.c"
 }
 
 
@@ -32390,12 +32368,12 @@ static gpointer photo_value_get_backing_readers (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_BACKING_READERS), NULL);
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32389 "Photo.c"
+#line 32367 "Photo.c"
 }
 
 
 static void photo_value_set_backing_readers (GValue* value, gpointer v_object) {
-	PhotoBackingReaders* old;
+	PhotoBackingReaders * old;
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_BACKING_READERS));
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32410,23 +32388,23 @@ static void photo_value_set_backing_readers (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_backing_readers_ref (value->data[0].v_pointer);
-#line 32409 "Photo.c"
+#line 32387 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32413 "Photo.c"
+#line 32391 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_backing_readers_unref (old);
-#line 32419 "Photo.c"
+#line 32397 "Photo.c"
 	}
 }
 
 
 static void photo_value_take_backing_readers (GValue* value, gpointer v_object) {
-	PhotoBackingReaders* old;
+	PhotoBackingReaders * old;
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_BACKING_READERS));
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32439,17 +32417,17 @@ static void photo_value_take_backing_readers (GValue* value, gpointer v_object)
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 32438 "Photo.c"
+#line 32416 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32442 "Photo.c"
+#line 32420 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_backing_readers_unref (old);
-#line 32448 "Photo.c"
+#line 32426 "Photo.c"
 	}
 }
 
@@ -32459,18 +32437,18 @@ static void photo_backing_readers_class_init (PhotoBackingReadersClass * klass)
 	photo_backing_readers_parent_class = g_type_class_peek_parent (klass);
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoBackingReadersClass *) klass)->finalize = photo_backing_readers_finalize;
-#line 32458 "Photo.c"
+#line 32436 "Photo.c"
 }
 
 
 static void photo_backing_readers_instance_init (PhotoBackingReaders * self) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 32465 "Photo.c"
+#line 32443 "Photo.c"
 }
 
 
-static void photo_backing_readers_finalize (PhotoBackingReaders* obj) {
+static void photo_backing_readers_finalize (PhotoBackingReaders * obj) {
 	PhotoBackingReaders * self;
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_BACKING_READERS, PhotoBackingReaders);
@@ -32482,7 +32460,7 @@ static void photo_backing_readers_finalize (PhotoBackingReaders* obj) {
 	_photo_file_adapter_unref0 (self->developer);
 #line 297 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (self->editable);
-#line 32481 "Photo.c"
+#line 32459 "Photo.c"
 }
 
 
@@ -32501,18 +32479,18 @@ static GType photo_backing_readers_get_type (void) {
 
 
 static gpointer photo_backing_readers_ref (gpointer instance) {
-	PhotoBackingReaders* self;
+	PhotoBackingReaders * self;
 	self = instance;
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 32506 "Photo.c"
+#line 32484 "Photo.c"
 }
 
 
 static void photo_backing_readers_unref (gpointer instance) {
-	PhotoBackingReaders* self;
+	PhotoBackingReaders * self;
 	self = instance;
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -32520,17 +32498,17 @@ static void photo_backing_readers_unref (gpointer instance) {
 		PHOTO_BACKING_READERS_GET_CLASS (self)->finalize (self);
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 32519 "Photo.c"
+#line 32497 "Photo.c"
 	}
 }
 
 
 static PhotoCachedPixbuf* photo_cached_pixbuf_construct (GType object_type, Photo* photo, GdkPixbuf* pixbuf) {
 	PhotoCachedPixbuf* self = NULL;
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
+	GdkPixbuf* _tmp2_;
+	GdkPixbuf* _tmp3_;
 #line 305 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
 #line 305 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32555,21 +32533,21 @@ static PhotoCachedPixbuf* photo_cached_pixbuf_construct (GType object_type, Phot
 	self->pixbuf = _tmp3_;
 #line 305 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 32554 "Photo.c"
+#line 32532 "Photo.c"
 }
 
 
 static PhotoCachedPixbuf* photo_cached_pixbuf_new (Photo* photo, GdkPixbuf* pixbuf) {
 #line 305 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_cached_pixbuf_construct (PHOTO_TYPE_CACHED_PIXBUF, photo, pixbuf);
-#line 32561 "Photo.c"
+#line 32539 "Photo.c"
 }
 
 
 static void photo_value_cached_pixbuf_init (GValue* value) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 32568 "Photo.c"
+#line 32546 "Photo.c"
 }
 
 
@@ -32578,7 +32556,7 @@ static void photo_value_cached_pixbuf_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_cached_pixbuf_unref (value->data[0].v_pointer);
-#line 32577 "Photo.c"
+#line 32555 "Photo.c"
 	}
 }
 
@@ -32588,11 +32566,11 @@ static void photo_value_cached_pixbuf_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_cached_pixbuf_ref (src_value->data[0].v_pointer);
-#line 32587 "Photo.c"
+#line 32565 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32591 "Photo.c"
+#line 32569 "Photo.c"
 	}
 }
 
@@ -32600,66 +32578,66 @@ static void photo_value_cached_pixbuf_copy_value (const GValue* src_value, GValu
 static gpointer photo_value_cached_pixbuf_peek_pointer (const GValue* value) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32599 "Photo.c"
+#line 32577 "Photo.c"
 }
 
 
 static gchar* photo_value_cached_pixbuf_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 32606 "Photo.c"
-		PhotoCachedPixbuf* object;
+#line 32584 "Photo.c"
+		PhotoCachedPixbuf * object;
 		object = collect_values[0].v_pointer;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32613 "Photo.c"
+#line 32591 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32617 "Photo.c"
+#line 32595 "Photo.c"
 		}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_cached_pixbuf_ref (object);
-#line 32621 "Photo.c"
+#line 32599 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32625 "Photo.c"
+#line 32603 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32629 "Photo.c"
+#line 32607 "Photo.c"
 }
 
 
 static gchar* photo_value_cached_pixbuf_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PhotoCachedPixbuf** object_p;
+	PhotoCachedPixbuf ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 32640 "Photo.c"
+#line 32618 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 32646 "Photo.c"
+#line 32624 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 32650 "Photo.c"
+#line 32628 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_cached_pixbuf_ref (value->data[0].v_pointer);
-#line 32654 "Photo.c"
+#line 32632 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32658 "Photo.c"
+#line 32636 "Photo.c"
 }
 
 
@@ -32673,7 +32651,7 @@ static GParamSpec* photo_param_spec_cached_pixbuf (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 32672 "Photo.c"
+#line 32650 "Photo.c"
 }
 
 
@@ -32682,12 +32660,12 @@ static gpointer photo_value_get_cached_pixbuf (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_CACHED_PIXBUF), NULL);
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32681 "Photo.c"
+#line 32659 "Photo.c"
 }
 
 
 static void photo_value_set_cached_pixbuf (GValue* value, gpointer v_object) {
-	PhotoCachedPixbuf* old;
+	PhotoCachedPixbuf * old;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_CACHED_PIXBUF));
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32702,23 +32680,23 @@ static void photo_value_set_cached_pixbuf (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_cached_pixbuf_ref (value->data[0].v_pointer);
-#line 32701 "Photo.c"
+#line 32679 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32705 "Photo.c"
+#line 32683 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_cached_pixbuf_unref (old);
-#line 32711 "Photo.c"
+#line 32689 "Photo.c"
 	}
 }
 
 
 static void photo_value_take_cached_pixbuf (GValue* value, gpointer v_object) {
-	PhotoCachedPixbuf* old;
+	PhotoCachedPixbuf * old;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_CACHED_PIXBUF));
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32731,17 +32709,17 @@ static void photo_value_take_cached_pixbuf (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 32730 "Photo.c"
+#line 32708 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32734 "Photo.c"
+#line 32712 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_cached_pixbuf_unref (old);
-#line 32740 "Photo.c"
+#line 32718 "Photo.c"
 	}
 }
 
@@ -32751,23 +32729,23 @@ static void photo_cached_pixbuf_class_init (PhotoCachedPixbufClass * klass) {
 	photo_cached_pixbuf_parent_class = g_type_class_peek_parent (klass);
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoCachedPixbufClass *) klass)->finalize = photo_cached_pixbuf_finalize;
-#line 32750 "Photo.c"
+#line 32728 "Photo.c"
 }
 
 
 static void photo_cached_pixbuf_instance_init (PhotoCachedPixbuf * self) {
-	GTimer* _tmp0_ = NULL;
+	GTimer* _tmp0_;
 #line 303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = g_timer_new ();
 #line 303 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->last_touched = _tmp0_;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 32762 "Photo.c"
+#line 32740 "Photo.c"
 }
 
 
-static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf* obj) {
+static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf * obj) {
 	PhotoCachedPixbuf * self;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_CACHED_PIXBUF, PhotoCachedPixbuf);
@@ -32779,7 +32757,7 @@ static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf* obj) {
 	_g_object_unref0 (self->pixbuf);
 #line 303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_timer_destroy0 (self->last_touched);
-#line 32778 "Photo.c"
+#line 32756 "Photo.c"
 }
 
 
@@ -32798,18 +32776,18 @@ static GType photo_cached_pixbuf_get_type (void) {
 
 
 static gpointer photo_cached_pixbuf_ref (gpointer instance) {
-	PhotoCachedPixbuf* self;
+	PhotoCachedPixbuf * self;
 	self = instance;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 32803 "Photo.c"
+#line 32781 "Photo.c"
 }
 
 
 static void photo_cached_pixbuf_unref (gpointer instance) {
-	PhotoCachedPixbuf* self;
+	PhotoCachedPixbuf * self;
 	self = instance;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -32817,7 +32795,7 @@ static void photo_cached_pixbuf_unref (gpointer instance) {
 		PHOTO_CACHED_PIXBUF_GET_CLASS (self)->finalize (self);
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 32816 "Photo.c"
+#line 32794 "Photo.c"
 	}
 }
 
@@ -32828,14 +32806,14 @@ PhotoReimportMasterState* photo_reimport_master_state_construct (GType object_ty
 	self = (PhotoReimportMasterState*) g_type_create_instance (object_type);
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 32827 "Photo.c"
+#line 32805 "Photo.c"
 }
 
 
 static void photo_value_reimport_master_state_init (GValue* value) {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 32834 "Photo.c"
+#line 32812 "Photo.c"
 }
 
 
@@ -32844,7 +32822,7 @@ static void photo_value_reimport_master_state_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_unref (value->data[0].v_pointer);
-#line 32843 "Photo.c"
+#line 32821 "Photo.c"
 	}
 }
 
@@ -32854,11 +32832,11 @@ static void photo_value_reimport_master_state_copy_value (const GValue* src_valu
 	if (src_value->data[0].v_pointer) {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_reimport_master_state_ref (src_value->data[0].v_pointer);
-#line 32853 "Photo.c"
+#line 32831 "Photo.c"
 	} else {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32857 "Photo.c"
+#line 32835 "Photo.c"
 	}
 }
 
@@ -32866,66 +32844,66 @@ static void photo_value_reimport_master_state_copy_value (const GValue* src_valu
 static gpointer photo_value_reimport_master_state_peek_pointer (const GValue* value) {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32865 "Photo.c"
+#line 32843 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_master_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 32872 "Photo.c"
-		PhotoReimportMasterState* object;
+#line 32850 "Photo.c"
+		PhotoReimportMasterState * object;
 		object = collect_values[0].v_pointer;
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32879 "Photo.c"
+#line 32857 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32883 "Photo.c"
+#line 32861 "Photo.c"
 		}
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_master_state_ref (object);
-#line 32887 "Photo.c"
+#line 32865 "Photo.c"
 	} else {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32891 "Photo.c"
+#line 32869 "Photo.c"
 	}
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32895 "Photo.c"
+#line 32873 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_master_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PhotoReimportMasterState** object_p;
+	PhotoReimportMasterState ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 32906 "Photo.c"
+#line 32884 "Photo.c"
 	}
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 32912 "Photo.c"
+#line 32890 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 32916 "Photo.c"
+#line 32894 "Photo.c"
 	} else {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_master_state_ref (value->data[0].v_pointer);
-#line 32920 "Photo.c"
+#line 32898 "Photo.c"
 	}
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32924 "Photo.c"
+#line 32902 "Photo.c"
 }
 
 
@@ -32939,7 +32917,7 @@ GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gch
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 32938 "Photo.c"
+#line 32916 "Photo.c"
 }
 
 
@@ -32948,12 +32926,12 @@ gpointer photo_value_get_reimport_master_state (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE), NULL);
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32947 "Photo.c"
+#line 32925 "Photo.c"
 }
 
 
 void photo_value_set_reimport_master_state (GValue* value, gpointer v_object) {
-	PhotoReimportMasterState* old;
+	PhotoReimportMasterState * old;
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE));
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32968,23 +32946,23 @@ void photo_value_set_reimport_master_state (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_ref (value->data[0].v_pointer);
-#line 32967 "Photo.c"
+#line 32945 "Photo.c"
 	} else {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32971 "Photo.c"
+#line 32949 "Photo.c"
 	}
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_unref (old);
-#line 32977 "Photo.c"
+#line 32955 "Photo.c"
 	}
 }
 
 
 void photo_value_take_reimport_master_state (GValue* value, gpointer v_object) {
-	PhotoReimportMasterState* old;
+	PhotoReimportMasterState * old;
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE));
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32997,17 +32975,17 @@ void photo_value_take_reimport_master_state (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 32996 "Photo.c"
+#line 32974 "Photo.c"
 	} else {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33000 "Photo.c"
+#line 32978 "Photo.c"
 	}
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_unref (old);
-#line 33006 "Photo.c"
+#line 32984 "Photo.c"
 	}
 }
 
@@ -33017,24 +32995,24 @@ static void photo_reimport_master_state_class_init (PhotoReimportMasterStateClas
 	photo_reimport_master_state_parent_class = g_type_class_peek_parent (klass);
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_finalize;
-#line 33016 "Photo.c"
+#line 32994 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_instance_init (PhotoReimportMasterState * self) {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 33023 "Photo.c"
+#line 33001 "Photo.c"
 }
 
 
-static void photo_reimport_master_state_finalize (PhotoReimportMasterState* obj) {
+static void photo_reimport_master_state_finalize (PhotoReimportMasterState * obj) {
 	PhotoReimportMasterState * self;
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState);
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 33033 "Photo.c"
+#line 33011 "Photo.c"
 }
 
 
@@ -33053,18 +33031,18 @@ GType photo_reimport_master_state_get_type (void) {
 
 
 gpointer photo_reimport_master_state_ref (gpointer instance) {
-	PhotoReimportMasterState* self;
+	PhotoReimportMasterState * self;
 	self = instance;
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 33058 "Photo.c"
+#line 33036 "Photo.c"
 }
 
 
 void photo_reimport_master_state_unref (gpointer instance) {
-	PhotoReimportMasterState* self;
+	PhotoReimportMasterState * self;
 	self = instance;
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -33072,7 +33050,7 @@ void photo_reimport_master_state_unref (gpointer instance) {
 		PHOTO_REIMPORT_MASTER_STATE_GET_CLASS (self)->finalize (self);
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 33071 "Photo.c"
+#line 33049 "Photo.c"
 	}
 }
 
@@ -33084,30 +33062,30 @@ static gchar** _vala_array_dup28 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	for (i = 0; i < length; i++) {
-#line 33083 "Photo.c"
-		gchar* _tmp0_ = NULL;
+#line 33061 "Photo.c"
+		gchar* _tmp0_;
 #line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 		result[i] = _tmp0_;
-#line 33089 "Photo.c"
+#line 33067 "Photo.c"
 	}
 #line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 33093 "Photo.c"
+#line 33071 "Photo.c"
 }
 
 
 static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct (GType object_type, PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1) {
 	PhotoReimportMasterStateImpl* self = NULL;
-	PhotoRow* _tmp0_ = NULL;
-	PhotoRow* _tmp1_ = NULL;
-	PhotoMetadata* _tmp2_ = NULL;
-	PhotoMetadata* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	gchar** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
+	PhotoRow* _tmp0_;
+	PhotoRow* _tmp1_;
+	PhotoMetadata* _tmp2_;
+	PhotoMetadata* _tmp3_;
+	gchar** _tmp4_;
+	gint _tmp4__length1;
+	gchar** _tmp5_;
+	gint _tmp5__length1;
 #line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_ROW (row), NULL);
 #line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33148,14 +33126,14 @@ static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct
 	self->_alterations_size_ = self->alterations_length1;
 #line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33147 "Photo.c"
+#line 33125 "Photo.c"
 }
 
 
 static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1) {
 #line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_reimport_master_state_impl_construct (PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, row, metadata, alterations, alterations_length1);
-#line 33154 "Photo.c"
+#line 33132 "Photo.c"
 }
 
 
@@ -33164,23 +33142,23 @@ static void photo_reimport_master_state_impl_class_init (PhotoReimportMasterStat
 	photo_reimport_master_state_impl_parent_class = g_type_class_peek_parent (klass);
 #line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_impl_finalize;
-#line 33163 "Photo.c"
+#line 33141 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_impl_instance_init (PhotoReimportMasterStateImpl * self) {
-	PhotoRow* _tmp0_ = NULL;
+	PhotoRow* _tmp0_;
 #line 1354 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_row_new ();
 #line 1354 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->row = _tmp0_;
 #line 1357 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata_only = FALSE;
-#line 33175 "Photo.c"
+#line 33153 "Photo.c"
 }
 
 
-static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState* obj) {
+static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState * obj) {
 	PhotoReimportMasterStateImpl * self;
 #line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl);
@@ -33192,7 +33170,7 @@ static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState*
 	self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL);
 #line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_REIMPORT_MASTER_STATE_CLASS (photo_reimport_master_state_impl_parent_class)->finalize (obj);
-#line 33191 "Photo.c"
+#line 33169 "Photo.c"
 }
 
 
@@ -33214,14 +33192,14 @@ PhotoReimportEditableState* photo_reimport_editable_state_construct (GType objec
 	self = (PhotoReimportEditableState*) g_type_create_instance (object_type);
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33213 "Photo.c"
+#line 33191 "Photo.c"
 }
 
 
 static void photo_value_reimport_editable_state_init (GValue* value) {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 33220 "Photo.c"
+#line 33198 "Photo.c"
 }
 
 
@@ -33230,7 +33208,7 @@ static void photo_value_reimport_editable_state_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_unref (value->data[0].v_pointer);
-#line 33229 "Photo.c"
+#line 33207 "Photo.c"
 	}
 }
 
@@ -33240,11 +33218,11 @@ static void photo_value_reimport_editable_state_copy_value (const GValue* src_va
 	if (src_value->data[0].v_pointer) {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_reimport_editable_state_ref (src_value->data[0].v_pointer);
-#line 33239 "Photo.c"
+#line 33217 "Photo.c"
 	} else {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33243 "Photo.c"
+#line 33221 "Photo.c"
 	}
 }
 
@@ -33252,66 +33230,66 @@ static void photo_value_reimport_editable_state_copy_value (const GValue* src_va
 static gpointer photo_value_reimport_editable_state_peek_pointer (const GValue* value) {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33251 "Photo.c"
+#line 33229 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_editable_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 33258 "Photo.c"
-		PhotoReimportEditableState* object;
+#line 33236 "Photo.c"
+		PhotoReimportEditableState * object;
 		object = collect_values[0].v_pointer;
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33265 "Photo.c"
+#line 33243 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33269 "Photo.c"
+#line 33247 "Photo.c"
 		}
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_editable_state_ref (object);
-#line 33273 "Photo.c"
+#line 33251 "Photo.c"
 	} else {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33277 "Photo.c"
+#line 33255 "Photo.c"
 	}
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33281 "Photo.c"
+#line 33259 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_editable_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PhotoReimportEditableState** object_p;
+	PhotoReimportEditableState ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33292 "Photo.c"
+#line 33270 "Photo.c"
 	}
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 33298 "Photo.c"
+#line 33276 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 33302 "Photo.c"
+#line 33280 "Photo.c"
 	} else {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_editable_state_ref (value->data[0].v_pointer);
-#line 33306 "Photo.c"
+#line 33284 "Photo.c"
 	}
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33310 "Photo.c"
+#line 33288 "Photo.c"
 }
 
 
@@ -33325,7 +33303,7 @@ GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, const g
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 33324 "Photo.c"
+#line 33302 "Photo.c"
 }
 
 
@@ -33334,12 +33312,12 @@ gpointer photo_value_get_reimport_editable_state (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE), NULL);
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33333 "Photo.c"
+#line 33311 "Photo.c"
 }
 
 
 void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object) {
-	PhotoReimportEditableState* old;
+	PhotoReimportEditableState * old;
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE));
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33354,23 +33332,23 @@ void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object)
 		value->data[0].v_pointer = v_object;
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_ref (value->data[0].v_pointer);
-#line 33353 "Photo.c"
+#line 33331 "Photo.c"
 	} else {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33357 "Photo.c"
+#line 33335 "Photo.c"
 	}
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_unref (old);
-#line 33363 "Photo.c"
+#line 33341 "Photo.c"
 	}
 }
 
 
 void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object) {
-	PhotoReimportEditableState* old;
+	PhotoReimportEditableState * old;
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE));
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33383,17 +33361,17 @@ void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object)
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 33382 "Photo.c"
+#line 33360 "Photo.c"
 	} else {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33386 "Photo.c"
+#line 33364 "Photo.c"
 	}
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_unref (old);
-#line 33392 "Photo.c"
+#line 33370 "Photo.c"
 	}
 }
 
@@ -33403,24 +33381,24 @@ static void photo_reimport_editable_state_class_init (PhotoReimportEditableState
 	photo_reimport_editable_state_parent_class = g_type_class_peek_parent (klass);
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_finalize;
-#line 33402 "Photo.c"
+#line 33380 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_instance_init (PhotoReimportEditableState * self) {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 33409 "Photo.c"
+#line 33387 "Photo.c"
 }
 
 
-static void photo_reimport_editable_state_finalize (PhotoReimportEditableState* obj) {
+static void photo_reimport_editable_state_finalize (PhotoReimportEditableState * obj) {
 	PhotoReimportEditableState * self;
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState);
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 33419 "Photo.c"
+#line 33397 "Photo.c"
 }
 
 
@@ -33439,18 +33417,18 @@ GType photo_reimport_editable_state_get_type (void) {
 
 
 gpointer photo_reimport_editable_state_ref (gpointer instance) {
-	PhotoReimportEditableState* self;
+	PhotoReimportEditableState * self;
 	self = instance;
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 33444 "Photo.c"
+#line 33422 "Photo.c"
 }
 
 
 void photo_reimport_editable_state_unref (gpointer instance) {
-	PhotoReimportEditableState* self;
+	PhotoReimportEditableState * self;
 	self = instance;
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -33458,17 +33436,17 @@ void photo_reimport_editable_state_unref (gpointer instance) {
 		PHOTO_REIMPORT_EDITABLE_STATE_GET_CLASS (self)->finalize (self);
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 33457 "Photo.c"
+#line 33435 "Photo.c"
 	}
 }
 
 
 static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_construct (GType object_type, BackingPhotoRow* backing_state, PhotoMetadata* metadata) {
 	PhotoReimportEditableStateImpl* self = NULL;
-	BackingPhotoRow* _tmp0_ = NULL;
-	BackingPhotoRow* _tmp1_ = NULL;
-	PhotoMetadata* _tmp2_ = NULL;
-	PhotoMetadata* _tmp3_ = NULL;
+	BackingPhotoRow* _tmp0_;
+	BackingPhotoRow* _tmp1_;
+	PhotoMetadata* _tmp2_;
+	PhotoMetadata* _tmp3_;
 #line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing_state), NULL);
 #line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33493,14 +33471,14 @@ static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_constr
 	self->metadata = _tmp3_;
 #line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33492 "Photo.c"
+#line 33470 "Photo.c"
 }
 
 
 static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, PhotoMetadata* metadata) {
 #line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_reimport_editable_state_impl_construct (PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, backing_state, metadata);
-#line 33499 "Photo.c"
+#line 33477 "Photo.c"
 }
 
 
@@ -33509,23 +33487,23 @@ static void photo_reimport_editable_state_impl_class_init (PhotoReimportEditable
 	photo_reimport_editable_state_impl_parent_class = g_type_class_peek_parent (klass);
 #line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_impl_finalize;
-#line 33508 "Photo.c"
+#line 33486 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_impl_instance_init (PhotoReimportEditableStateImpl * self) {
-	BackingPhotoRow* _tmp0_ = NULL;
+	BackingPhotoRow* _tmp0_;
 #line 1370 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backing_photo_row_new ();
 #line 1370 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->backing_state = _tmp0_;
 #line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata_only = FALSE;
-#line 33520 "Photo.c"
+#line 33498 "Photo.c"
 }
 
 
-static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState* obj) {
+static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState * obj) {
 	PhotoReimportEditableStateImpl * self;
 #line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl);
@@ -33535,7 +33513,7 @@ static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableSt
 	_media_metadata_unref0 (self->metadata);
 #line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_REIMPORT_EDITABLE_STATE_CLASS (photo_reimport_editable_state_impl_parent_class)->finalize (obj);
-#line 33534 "Photo.c"
+#line 33512 "Photo.c"
 }
 
 
@@ -33557,14 +33535,14 @@ PhotoReimportRawDevelopmentState* photo_reimport_raw_development_state_construct
 	self = (PhotoReimportRawDevelopmentState*) g_type_create_instance (object_type);
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33556 "Photo.c"
+#line 33534 "Photo.c"
 }
 
 
 static void photo_value_reimport_raw_development_state_init (GValue* value) {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 33563 "Photo.c"
+#line 33541 "Photo.c"
 }
 
 
@@ -33573,7 +33551,7 @@ static void photo_value_reimport_raw_development_state_free_value (GValue* value
 	if (value->data[0].v_pointer) {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_unref (value->data[0].v_pointer);
-#line 33572 "Photo.c"
+#line 33550 "Photo.c"
 	}
 }
 
@@ -33583,11 +33561,11 @@ static void photo_value_reimport_raw_development_state_copy_value (const GValue*
 	if (src_value->data[0].v_pointer) {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_reimport_raw_development_state_ref (src_value->data[0].v_pointer);
-#line 33582 "Photo.c"
+#line 33560 "Photo.c"
 	} else {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33586 "Photo.c"
+#line 33564 "Photo.c"
 	}
 }
 
@@ -33595,66 +33573,66 @@ static void photo_value_reimport_raw_development_state_copy_value (const GValue*
 static gpointer photo_value_reimport_raw_development_state_peek_pointer (const GValue* value) {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33594 "Photo.c"
+#line 33572 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_raw_development_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 33601 "Photo.c"
-		PhotoReimportRawDevelopmentState* object;
+#line 33579 "Photo.c"
+		PhotoReimportRawDevelopmentState * object;
 		object = collect_values[0].v_pointer;
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33608 "Photo.c"
+#line 33586 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33612 "Photo.c"
+#line 33590 "Photo.c"
 		}
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_raw_development_state_ref (object);
-#line 33616 "Photo.c"
+#line 33594 "Photo.c"
 	} else {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33620 "Photo.c"
+#line 33598 "Photo.c"
 	}
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33624 "Photo.c"
+#line 33602 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_raw_development_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PhotoReimportRawDevelopmentState** object_p;
+	PhotoReimportRawDevelopmentState ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33635 "Photo.c"
+#line 33613 "Photo.c"
 	}
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 33641 "Photo.c"
+#line 33619 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 33645 "Photo.c"
+#line 33623 "Photo.c"
 	} else {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_raw_development_state_ref (value->data[0].v_pointer);
-#line 33649 "Photo.c"
+#line 33627 "Photo.c"
 	}
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33653 "Photo.c"
+#line 33631 "Photo.c"
 }
 
 
@@ -33668,7 +33646,7 @@ GParamSpec* photo_param_spec_reimport_raw_development_state (const gchar* name,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 33667 "Photo.c"
+#line 33645 "Photo.c"
 }
 
 
@@ -33677,12 +33655,12 @@ gpointer photo_value_get_reimport_raw_development_state (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE), NULL);
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33676 "Photo.c"
+#line 33654 "Photo.c"
 }
 
 
 void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_object) {
-	PhotoReimportRawDevelopmentState* old;
+	PhotoReimportRawDevelopmentState * old;
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE));
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33697,23 +33675,23 @@ void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_o
 		value->data[0].v_pointer = v_object;
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_ref (value->data[0].v_pointer);
-#line 33696 "Photo.c"
+#line 33674 "Photo.c"
 	} else {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33700 "Photo.c"
+#line 33678 "Photo.c"
 	}
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_unref (old);
-#line 33706 "Photo.c"
+#line 33684 "Photo.c"
 	}
 }
 
 
 void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_object) {
-	PhotoReimportRawDevelopmentState* old;
+	PhotoReimportRawDevelopmentState * old;
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE));
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33726,17 +33704,17 @@ void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 33725 "Photo.c"
+#line 33703 "Photo.c"
 	} else {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33729 "Photo.c"
+#line 33707 "Photo.c"
 	}
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_unref (old);
-#line 33735 "Photo.c"
+#line 33713 "Photo.c"
 	}
 }
 
@@ -33746,24 +33724,24 @@ static void photo_reimport_raw_development_state_class_init (PhotoReimportRawDev
 	photo_reimport_raw_development_state_parent_class = g_type_class_peek_parent (klass);
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_finalize;
-#line 33745 "Photo.c"
+#line 33723 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_instance_init (PhotoReimportRawDevelopmentState * self) {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 33752 "Photo.c"
+#line 33730 "Photo.c"
 }
 
 
-static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState* obj) {
+static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState * obj) {
 	PhotoReimportRawDevelopmentState * self;
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState);
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 33762 "Photo.c"
+#line 33740 "Photo.c"
 }
 
 
@@ -33782,18 +33760,18 @@ GType photo_reimport_raw_development_state_get_type (void) {
 
 
 gpointer photo_reimport_raw_development_state_ref (gpointer instance) {
-	PhotoReimportRawDevelopmentState* self;
+	PhotoReimportRawDevelopmentState * self;
 	self = instance;
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 33787 "Photo.c"
+#line 33765 "Photo.c"
 }
 
 
 void photo_reimport_raw_development_state_unref (gpointer instance) {
-	PhotoReimportRawDevelopmentState* self;
+	PhotoReimportRawDevelopmentState * self;
 	self = instance;
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -33801,7 +33779,7 @@ void photo_reimport_raw_development_state_unref (gpointer instance) {
 		PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_GET_CLASS (self)->finalize (self);
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 33800 "Photo.c"
+#line 33778 "Photo.c"
 	}
 }
 
@@ -33812,23 +33790,23 @@ static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_stat
 	self = (PhotoReimportRawDevelopmentStateImpl*) photo_reimport_raw_development_state_construct (object_type);
 #line 1397 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33811 "Photo.c"
+#line 33789 "Photo.c"
 }
 
 
 static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_new (void) {
 #line 1397 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_reimport_raw_development_state_impl_construct (PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL);
-#line 33818 "Photo.c"
+#line 33796 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevelopmentStateImpl* self, BackingPhotoRow* backing, PhotoMetadata* metadata) {
-	GeeCollection* _tmp0_ = NULL;
-	BackingPhotoRow* _tmp1_ = NULL;
-	PhotoMetadata* _tmp2_ = NULL;
-	PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp3_ = NULL;
-	PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp4_ = NULL;
+	GeeCollection* _tmp0_;
+	BackingPhotoRow* _tmp1_;
+	PhotoMetadata* _tmp2_;
+	PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp3_;
+	PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp4_;
 #line 1400 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL (self));
 #line 1400 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33849,15 +33827,15 @@ static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevel
 	gee_collection_add (_tmp0_, _tmp4_);
 #line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (_tmp4_);
-#line 33848 "Photo.c"
+#line 33826 "Photo.c"
 }
 
 
 static gint photo_reimport_raw_development_state_impl_get_size (PhotoReimportRawDevelopmentStateImpl* self) {
 	gint result = 0;
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 1404 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL (self), 0);
 #line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33870,16 +33848,16 @@ static gint photo_reimport_raw_development_state_impl_get_size (PhotoReimportRaw
 	result = _tmp2_;
 #line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 33869 "Photo.c"
+#line 33847 "Photo.c"
 }
 
 
 static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_construct (GType object_type, BackingPhotoRow* backing, PhotoMetadata* metadata) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport* self = NULL;
-	BackingPhotoRow* _tmp0_ = NULL;
-	BackingPhotoRow* _tmp1_ = NULL;
-	PhotoMetadata* _tmp2_ = NULL;
-	PhotoMetadata* _tmp3_ = NULL;
+	BackingPhotoRow* _tmp0_;
+	BackingPhotoRow* _tmp1_;
+	PhotoMetadata* _tmp2_;
+	PhotoMetadata* _tmp3_;
 #line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing), NULL);
 #line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33904,21 +33882,21 @@ static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_dev
 	self->metadata = _tmp3_;
 #line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33903 "Photo.c"
+#line 33881 "Photo.c"
 }
 
 
 static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_new (BackingPhotoRow* backing, PhotoMetadata* metadata) {
 #line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_reimport_raw_development_state_impl_dev_to_reimport_construct (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, backing, metadata);
-#line 33910 "Photo.c"
+#line 33888 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_init (GValue* value) {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 33917 "Photo.c"
+#line 33895 "Photo.c"
 }
 
 
@@ -33927,7 +33905,7 @@ static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_free
 	if (value->data[0].v_pointer) {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_unref (value->data[0].v_pointer);
-#line 33926 "Photo.c"
+#line 33904 "Photo.c"
 	}
 }
 
@@ -33937,11 +33915,11 @@ static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy
 	if (src_value->data[0].v_pointer) {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (src_value->data[0].v_pointer);
-#line 33936 "Photo.c"
+#line 33914 "Photo.c"
 	} else {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33940 "Photo.c"
+#line 33918 "Photo.c"
 	}
 }
 
@@ -33949,66 +33927,66 @@ static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy
 static gpointer photo_reimport_raw_development_state_impl_value_dev_to_reimport_peek_pointer (const GValue* value) {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33948 "Photo.c"
+#line 33926 "Photo.c"
 }
 
 
 static gchar* photo_reimport_raw_development_state_impl_value_dev_to_reimport_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 33955 "Photo.c"
-		PhotoReimportRawDevelopmentStateImplDevToReimport* object;
+#line 33933 "Photo.c"
+		PhotoReimportRawDevelopmentStateImplDevToReimport * object;
 		object = collect_values[0].v_pointer;
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33962 "Photo.c"
+#line 33940 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33966 "Photo.c"
+#line 33944 "Photo.c"
 		}
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (object);
-#line 33970 "Photo.c"
+#line 33948 "Photo.c"
 	} else {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33974 "Photo.c"
+#line 33952 "Photo.c"
 	}
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33978 "Photo.c"
+#line 33956 "Photo.c"
 }
 
 
 static gchar* photo_reimport_raw_development_state_impl_value_dev_to_reimport_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PhotoReimportRawDevelopmentStateImplDevToReimport** object_p;
+	PhotoReimportRawDevelopmentStateImplDevToReimport ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33989 "Photo.c"
+#line 33967 "Photo.c"
 	}
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 33995 "Photo.c"
+#line 33973 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 33999 "Photo.c"
+#line 33977 "Photo.c"
 	} else {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer);
-#line 34003 "Photo.c"
+#line 33981 "Photo.c"
 	}
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 34007 "Photo.c"
+#line 33985 "Photo.c"
 }
 
 
@@ -34022,7 +34000,7 @@ static GParamSpec* photo_reimport_raw_development_state_impl_param_spec_dev_to_r
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 34021 "Photo.c"
+#line 33999 "Photo.c"
 }
 
 
@@ -34031,12 +34009,12 @@ static gpointer photo_reimport_raw_development_state_impl_value_get_dev_to_reimp
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT), NULL);
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 34030 "Photo.c"
+#line 34008 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport (GValue* value, gpointer v_object) {
-	PhotoReimportRawDevelopmentStateImplDevToReimport* old;
+	PhotoReimportRawDevelopmentStateImplDevToReimport * old;
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT));
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34051,23 +34029,23 @@ static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport
 		value->data[0].v_pointer = v_object;
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer);
-#line 34050 "Photo.c"
+#line 34028 "Photo.c"
 	} else {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 34054 "Photo.c"
+#line 34032 "Photo.c"
 	}
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old);
-#line 34060 "Photo.c"
+#line 34038 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport (GValue* value, gpointer v_object) {
-	PhotoReimportRawDevelopmentStateImplDevToReimport* old;
+	PhotoReimportRawDevelopmentStateImplDevToReimport * old;
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT));
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34080,17 +34058,17 @@ static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 34079 "Photo.c"
+#line 34057 "Photo.c"
 	} else {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 34083 "Photo.c"
+#line 34061 "Photo.c"
 	}
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old);
-#line 34089 "Photo.c"
+#line 34067 "Photo.c"
 	}
 }
 
@@ -34100,23 +34078,23 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_class_init
 	photo_reimport_raw_development_state_impl_dev_to_reimport_parent_class = g_type_class_peek_parent (klass);
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportRawDevelopmentStateImplDevToReimportClass *) klass)->finalize = photo_reimport_raw_development_state_impl_dev_to_reimport_finalize;
-#line 34099 "Photo.c"
+#line 34077 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_dev_to_reimport_instance_init (PhotoReimportRawDevelopmentStateImplDevToReimport * self) {
-	BackingPhotoRow* _tmp0_ = NULL;
+	BackingPhotoRow* _tmp0_;
 #line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backing_photo_row_new ();
 #line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->backing = _tmp0_;
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 34111 "Photo.c"
+#line 34089 "Photo.c"
 }
 
 
-static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport* obj) {
+static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport * obj) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport * self;
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, PhotoReimportRawDevelopmentStateImplDevToReimport);
@@ -34126,7 +34104,7 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (
 	_backing_photo_row_unref0 (self->backing);
 #line 1386 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 34125 "Photo.c"
+#line 34103 "Photo.c"
 }
 
 
@@ -34145,18 +34123,18 @@ GType photo_reimport_raw_development_state_impl_dev_to_reimport_get_type (void)
 
 
 static gpointer photo_reimport_raw_development_state_impl_dev_to_reimport_ref (gpointer instance) {
-	PhotoReimportRawDevelopmentStateImplDevToReimport* self;
+	PhotoReimportRawDevelopmentStateImplDevToReimport * self;
 	self = instance;
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 34150 "Photo.c"
+#line 34128 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpointer instance) {
-	PhotoReimportRawDevelopmentStateImplDevToReimport* self;
+	PhotoReimportRawDevelopmentStateImplDevToReimport * self;
 	self = instance;
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -34164,7 +34142,7 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpo
 		PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DEV_TO_REIMPORT_GET_CLASS (self)->finalize (self);
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 34163 "Photo.c"
+#line 34141 "Photo.c"
 	}
 }
 
@@ -34174,23 +34152,23 @@ static void photo_reimport_raw_development_state_impl_class_init (PhotoReimportR
 	photo_reimport_raw_development_state_impl_parent_class = g_type_class_peek_parent (klass);
 #line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_impl_finalize;
-#line 34173 "Photo.c"
+#line 34151 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_instance_init (PhotoReimportRawDevelopmentStateImpl * self) {
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 #line 1394 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = gee_array_list_new (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, (GBoxedCopyFunc) photo_reimport_raw_development_state_impl_dev_to_reimport_ref, (GDestroyNotify) photo_reimport_raw_development_state_impl_dev_to_reimport_unref, NULL, NULL, NULL);
 #line 1394 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->list = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 1395 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata_only = FALSE;
-#line 34185 "Photo.c"
+#line 34163 "Photo.c"
 }
 
 
-static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState* obj) {
+static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState * obj) {
 	PhotoReimportRawDevelopmentStateImpl * self;
 #line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl);
@@ -34198,7 +34176,7 @@ static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRaw
 	_g_object_unref0 (self->list);
 #line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_CLASS (photo_reimport_raw_development_state_impl_parent_class)->finalize (obj);
-#line 34197 "Photo.c"
+#line 34175 "Photo.c"
 }
 
 
@@ -34220,91 +34198,91 @@ static void photo_class_init (PhotoClass * klass) {
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_type_class_add_private (klass, sizeof (PhotoPrivate));
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->notify_editable_replaced = (void (*)(Photo*, GFile*, GFile*)) photo_real_notify_editable_replaced;
+	((PhotoClass *) klass)->notify_editable_replaced = (void (*) (Photo *, GFile*, GFile*)) photo_real_notify_editable_replaced;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->notify_raw_development_modified = (void (*)(Photo*)) photo_real_notify_raw_development_modified;
+	((PhotoClass *) klass)->notify_raw_development_modified = (void (*) (Photo *)) photo_real_notify_raw_development_modified;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->notify_baseline_replaced = (void (*)(Photo*)) photo_real_notify_baseline_replaced;
+	((PhotoClass *) klass)->notify_baseline_replaced = (void (*) (Photo *)) photo_real_notify_baseline_replaced;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->notify_master_reimported = (void (*)(Photo*, PhotoMetadata*)) photo_real_notify_master_reimported;
+	((PhotoClass *) klass)->notify_master_reimported = (void (*) (Photo *, PhotoMetadata*)) photo_real_notify_master_reimported;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->notify_editable_reimported = (void (*)(Photo*, PhotoMetadata*)) photo_real_notify_editable_reimported;
+	((PhotoClass *) klass)->notify_editable_reimported = (void (*) (Photo *, PhotoMetadata*)) photo_real_notify_editable_reimported;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->notify_source_reimported = (void (*)(Photo*, PhotoMetadata*)) photo_real_notify_source_reimported;
+	((PhotoClass *) klass)->notify_source_reimported = (void (*) (Photo *, PhotoMetadata*)) photo_real_notify_source_reimported;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->notify_baseline_reimported = (void (*)(Photo*, PhotoMetadata*)) photo_real_notify_baseline_reimported;
+	((PhotoClass *) klass)->notify_baseline_reimported = (void (*) (Photo *, PhotoMetadata*)) photo_real_notify_baseline_reimported;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*)(DataSource*, GError**)) photo_real_internal_delete_backing;
+	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) photo_real_internal_delete_backing;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->get_backing_files_state = (BackingFileState** (*)(MediaSource*, int*)) photo_real_get_backing_files_state;
+	((MediaSourceClass *) klass)->get_backing_files_state = (BackingFileState** (*) (MediaSource *, int*)) photo_real_get_backing_files_state;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*)(Photo*, PhotoMetadata*)) photo_real_apply_user_metadata_for_reimport;
+	((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*) (Photo *, PhotoMetadata*)) photo_real_apply_user_metadata_for_reimport;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) photo_real_get_typename;
+	((DataSourceClass *) klass)->get_typename = (gchar* (*) (DataSource *)) photo_real_get_typename;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) photo_real_get_instance_id;
+	((DataSourceClass *) klass)->get_instance_id = (gint64 (*) (DataSource *)) photo_real_get_instance_id;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((DataSourceClass *) klass)->get_source_id = (gchar* (*)(DataSource*)) photo_real_get_source_id;
+	((DataSourceClass *) klass)->get_source_id = (gchar* (*) (DataSource *)) photo_real_get_source_id;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*)(ThumbnailSource*)) photo_real_get_preferred_thumbnail_format;
+	((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*) (ThumbnailSource *)) photo_real_get_preferred_thumbnail_format;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) photo_real_create_thumbnail;
+	((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) photo_real_create_thumbnail;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->get_file = (GFile* (*)(MediaSource*)) photo_real_get_file;
+	((MediaSourceClass *) klass)->get_file = (GFile* (*) (MediaSource *)) photo_real_get_file;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->get_master_file = (GFile* (*)(MediaSource*)) photo_real_get_master_file;
+	((MediaSourceClass *) klass)->get_master_file = (GFile* (*) (MediaSource *)) photo_real_get_master_file;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->get_timestamp = (time_t (*)(MediaSource*)) photo_real_get_timestamp;
+	((MediaSourceClass *) klass)->get_timestamp = (time_t (*) (MediaSource *)) photo_real_get_timestamp;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->get_event_id = (void (*)(MediaSource*, EventID*)) photo_real_get_event_id;
+	((MediaSourceClass *) klass)->get_event_id = (void (*) (MediaSource *, EventID*)) photo_real_get_event_id;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->get_import_id = (void (*)(MediaSource*, ImportID*)) photo_real_get_import_id;
+	((MediaSourceClass *) klass)->get_import_id = (void (*) (MediaSource *, ImportID*)) photo_real_get_import_id;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->get_master_md5 = (gchar* (*)(MediaSource*)) photo_real_get_master_md5;
+	((MediaSourceClass *) klass)->get_master_md5 = (gchar* (*) (MediaSource *)) photo_real_get_master_md5;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->get_rating = (Rating (*)(MediaSource*)) photo_real_get_rating;
+	((MediaSourceClass *) klass)->get_rating = (Rating (*) (MediaSource *)) photo_real_get_rating;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->set_rating = (void (*)(MediaSource*, Rating)) photo_real_set_rating;
+	((MediaSourceClass *) klass)->set_rating = (void (*) (MediaSource *, Rating)) photo_real_set_rating;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->increase_rating = (void (*)(MediaSource*)) photo_real_increase_rating;
+	((MediaSourceClass *) klass)->increase_rating = (void (*) (MediaSource *)) photo_real_increase_rating;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->decrease_rating = (void (*)(MediaSource*)) photo_real_decrease_rating;
+	((MediaSourceClass *) klass)->decrease_rating = (void (*) (MediaSource *)) photo_real_decrease_rating;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((DataSourceClass *) klass)->commit_backlinks = (void (*)(DataSource*, SourceCollection*, const gchar*)) photo_real_commit_backlinks;
+	((DataSourceClass *) klass)->commit_backlinks = (void (*) (DataSource *, SourceCollection*, const gchar*)) photo_real_commit_backlinks;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->set_event_id = (gboolean (*)(MediaSource*, EventID*)) photo_real_set_event_id;
+	((MediaSourceClass *) klass)->set_event_id = (gboolean (*) (MediaSource *, EventID*)) photo_real_set_event_id;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) photo_real_to_string;
+	((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) photo_real_to_string;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((DataSourceClass *) klass)->equals = (gboolean (*)(DataSource*, DataSource*)) photo_real_equals;
+	((DataSourceClass *) klass)->equals = (gboolean (*) (DataSource *, DataSource*)) photo_real_equals;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->get_filesize = (guint64 (*)(MediaSource*)) photo_real_get_filesize;
+	((MediaSourceClass *) klass)->get_filesize = (guint64 (*) (MediaSource *)) photo_real_get_filesize;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->get_master_filesize = (guint64 (*)(MediaSource*)) photo_real_get_master_filesize;
+	((MediaSourceClass *) klass)->get_master_filesize = (guint64 (*) (MediaSource *)) photo_real_get_master_filesize;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->get_exposure_time = (time_t (*)(MediaSource*)) photo_real_get_exposure_time;
+	((MediaSourceClass *) klass)->get_exposure_time = (time_t (*) (MediaSource *)) photo_real_get_exposure_time;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->get_basename = (gchar* (*)(MediaSource*)) photo_real_get_basename;
+	((MediaSourceClass *) klass)->get_basename = (gchar* (*) (MediaSource *)) photo_real_get_basename;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->get_title = (gchar* (*)(MediaSource*)) photo_real_get_title;
+	((MediaSourceClass *) klass)->get_title = (gchar* (*) (MediaSource *)) photo_real_get_title;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->get_comment = (gchar* (*)(MediaSource*)) photo_real_get_comment;
+	((MediaSourceClass *) klass)->get_comment = (gchar* (*) (MediaSource *)) photo_real_get_comment;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->set_title = (void (*)(MediaSource*, const gchar*)) photo_real_set_title;
+	((MediaSourceClass *) klass)->set_title = (void (*) (MediaSource *, const gchar*)) photo_real_set_title;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->set_comment = (gboolean (*)(MediaSource*, const gchar*)) photo_real_set_comment;
+	((MediaSourceClass *) klass)->set_comment = (gboolean (*) (MediaSource *, const gchar*)) photo_real_set_comment;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->get_dimensions = (void (*)(MediaSource*, PhotoException, Dimensions*)) photo_real_get_dimensions;
+	((MediaSourceClass *) klass)->get_dimensions = (void (*) (MediaSource *, PhotoException, Dimensions*)) photo_real_get_dimensions;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoSourceClass *) klass)->get_metadata = (PhotoMetadata* (*)(PhotoSource*)) photo_real_get_metadata;
+	((PhotoSourceClass *) klass)->get_metadata = (PhotoMetadata* (*) (PhotoSource *)) photo_real_get_metadata;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->rotate = (void (*)(Photo*, Rotation)) photo_real_rotate;
+	((PhotoClass *) klass)->rotate = (void (*) (Photo *, Rotation)) photo_real_rotate;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoSource*, Scaling*, GError**)) photo_real_get_pixbuf;
+	((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*) (PhotoSource *, Scaling*, GError**)) photo_real_get_pixbuf;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*)(Photo*)) photo_real_has_user_generated_metadata;
+	((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*) (Photo *)) photo_real_has_user_generated_metadata;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->set_user_metadata_for_export = (void (*)(Photo*, PhotoMetadata*)) photo_real_set_user_metadata_for_export;
+	((PhotoClass *) klass)->set_user_metadata_for_export = (void (*) (Photo *, PhotoMetadata*)) photo_real_set_user_metadata_for_export;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->editable_replaced = photo_real_editable_replaced;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34326,22 +34304,22 @@ static void photo_class_init (PhotoClass * klass) {
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (klass)->finalize = photo_finalize;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_new ("editable_replaced", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, editable_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_get_type ());
+	photo_signals[PHOTO_EDITABLE_REPLACED_SIGNAL] = g_signal_new ("editable-replaced", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, editable_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_get_type ());
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_new ("raw_development_modified", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, raw_development_modified), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	photo_signals[PHOTO_RAW_DEVELOPMENT_MODIFIED_SIGNAL] = g_signal_new ("raw-development-modified", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, raw_development_modified), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_new ("baseline_replaced", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, baseline_replaced), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	photo_signals[PHOTO_BASELINE_REPLACED_SIGNAL] = g_signal_new ("baseline-replaced", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, baseline_replaced), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_new ("master_reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, master_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
+	photo_signals[PHOTO_MASTER_REIMPORTED_SIGNAL] = g_signal_new ("master-reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, master_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_new ("editable_reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, editable_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
+	photo_signals[PHOTO_EDITABLE_REIMPORTED_SIGNAL] = g_signal_new ("editable-reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, editable_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_new ("baseline_reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, baseline_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
+	photo_signals[PHOTO_BASELINE_REIMPORTED_SIGNAL] = g_signal_new ("baseline-reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, baseline_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_new ("source_reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
+	photo_signals[PHOTO_SOURCE_REIMPORTED_SIGNAL] = g_signal_new ("source-reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
 #line 326 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_rec_mutex_init (&__lock_photo_source_pixbuf_cache);
-#line 34340 "Photo.c"
+#line 34318 "Photo.c"
 }
 
 
@@ -34349,16 +34327,16 @@ static void photo_dateable_interface_init (DateableIface * iface) {
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_dateable_parent_iface = g_type_interface_peek_parent (iface);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	iface->get_exposure_time = (time_t (*)(Dateable*)) photo_real_get_exposure_time;
+	iface->get_exposure_time = (time_t (*) (Dateable *)) photo_real_get_exposure_time;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	iface->set_exposure_time = (void (*)(Dateable*, time_t)) photo_real_set_exposure_time;
-#line 34351 "Photo.c"
+	iface->set_exposure_time = (void (*) (Dateable *, time_t)) photo_real_set_exposure_time;
+#line 34329 "Photo.c"
 }
 
 
 static void photo_instance_init (Photo * self) {
-	BackingPhotoRow* _tmp0_ = NULL;
-	PhotoBackingReaders* _tmp1_ = NULL;
+	BackingPhotoRow* _tmp0_;
+	PhotoBackingReaders* _tmp1_;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv = PHOTO_GET_PRIVATE (self);
 #line 331 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34395,11 +34373,11 @@ static void photo_instance_init (Photo * self) {
 	self->priv->developments = NULL;
 #line 353 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->backing_photo_row = NULL;
-#line 34394 "Photo.c"
+#line 34372 "Photo.c"
 }
 
 
-static void photo_finalize (GObject* obj) {
+static void photo_finalize (GObject * obj) {
 	Photo * self;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO, Photo);
@@ -34435,7 +34413,7 @@ static void photo_finalize (GObject* obj) {
 	_backing_photo_row_unref0 (self->backing_photo_row);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (photo_parent_class)->finalize (obj);
-#line 34434 "Photo.c"
+#line 34412 "Photo.c"
 }
 
 
@@ -34458,13 +34436,13 @@ static void _vala_photo_get_property (GObject * object, guint property_id, GValu
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PHOTO, Photo);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (property_id) {
-#line 34457 "Photo.c"
+#line 34435 "Photo.c"
 		default:
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		break;
-#line 34463 "Photo.c"
+#line 34441 "Photo.c"
 	}
 }
 
@@ -34474,13 +34452,13 @@ static void _vala_photo_set_property (GObject * object, guint property_id, const
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PHOTO, Photo);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (property_id) {
-#line 34473 "Photo.c"
+#line 34451 "Photo.c"
 		default:
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		break;
-#line 34479 "Photo.c"
+#line 34457 "Photo.c"
 	}
 }
 
@@ -34502,7 +34480,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
 	result = file_hash ((GFile*) v);
 #line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34501 "Photo.c"
+#line 34479 "Photo.c"
 }
 
 
@@ -34511,7 +34489,7 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer
 	result = file_equal ((GFile*) a, (GFile*) b);
 #line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34510 "Photo.c"
+#line 34488 "Photo.c"
 }
 
 
@@ -34520,7 +34498,7 @@ static gint _int64_compare_gcompare_data_func (gconstpointer a, gconstpointer b,
 	result = int64_compare ((gint64*) a, (gint64*) b);
 #line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34519 "Photo.c"
+#line 34497 "Photo.c"
 }
 
 
@@ -34532,7 +34510,7 @@ static gint64* _int64_dup (gint64* self) {
 	memcpy (dup, self, sizeof (gint64));
 #line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
 	return dup;
-#line 34531 "Photo.c"
+#line 34509 "Photo.c"
 }
 
 
@@ -34541,7 +34519,7 @@ static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, gconstpointer
 	result = int64_equal ((gint64*) a, (gint64*) b);
 #line 4470 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34540 "Photo.c"
+#line 34518 "Photo.c"
 }
 
 
@@ -34550,30 +34528,30 @@ static gint64 _photo_get_photo_key_get_source_database_key (DataSource* source,
 	result = photo_get_photo_key (source);
 #line 4490 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34549 "Photo.c"
+#line 34527 "Photo.c"
 }
 
 
 static void _library_photo_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
 #line 4492 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_on_trashcan_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed);
-#line 34556 "Photo.c"
+#line 34534 "Photo.c"
 }
 
 
 static void _library_photo_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
 #line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_on_offline_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed);
-#line 34563 "Photo.c"
+#line 34541 "Photo.c"
 }
 
 
 LibraryPhotoSourceCollection* library_photo_source_collection_construct (GType object_type) {
 	LibraryPhotoSourceCollection* self = NULL;
-	MediaSourceHoldingTank* _tmp0_ = NULL;
-	MediaSourceHoldingTank* _tmp1_ = NULL;
-	MediaSourceHoldingTank* _tmp2_ = NULL;
-	MediaSourceHoldingTank* _tmp3_ = NULL;
+	MediaSourceHoldingTank* _tmp0_;
+	MediaSourceHoldingTank* _tmp1_;
+	MediaSourceHoldingTank* _tmp2_;
+	MediaSourceHoldingTank* _tmp3_;
 #line 4490 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (LibraryPhotoSourceCollection*) media_source_collection_construct (object_type, "LibraryPhotoSourceCollection", _photo_get_photo_key_get_source_database_key, NULL);
 #line 4492 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34594,14 +34572,14 @@ LibraryPhotoSourceCollection* library_photo_source_collection_construct (GType o
 	_source_holding_tank_unref0 (_tmp3_);
 #line 4489 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 34593 "Photo.c"
+#line 34571 "Photo.c"
 }
 
 
 LibraryPhotoSourceCollection* library_photo_source_collection_new (void) {
 #line 4489 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_source_collection_construct (TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION);
-#line 34600 "Photo.c"
+#line 34578 "Photo.c"
 }
 
 
@@ -34610,14 +34588,14 @@ static gboolean _library_photo_source_collection_check_if_trashed_photo_source_h
 	result = library_photo_source_collection_check_if_trashed_photo ((LibraryPhotoSourceCollection*) self, source, alteration);
 #line 4497 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34609 "Photo.c"
+#line 34587 "Photo.c"
 }
 
 
 static MediaSourceHoldingTank* library_photo_source_collection_real_create_trashcan (MediaSourceCollection* base) {
 	LibraryPhotoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
-	LibraryPhotoSourceHoldingTank* _tmp0_ = NULL;
+	LibraryPhotoSourceHoldingTank* _tmp0_;
 #line 4496 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
 #line 4497 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34626,7 +34604,7 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_trash
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank);
 #line 4497 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34625 "Photo.c"
+#line 34603 "Photo.c"
 }
 
 
@@ -34635,14 +34613,14 @@ static gboolean _library_photo_source_collection_check_if_offline_photo_source_h
 	result = library_photo_source_collection_check_if_offline_photo ((LibraryPhotoSourceCollection*) self, source, alteration);
 #line 4501 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34634 "Photo.c"
+#line 34612 "Photo.c"
 }
 
 
 static MediaSourceHoldingTank* library_photo_source_collection_real_create_offline_bin (MediaSourceCollection* base) {
 	LibraryPhotoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
-	LibraryPhotoSourceHoldingTank* _tmp0_ = NULL;
+	LibraryPhotoSourceHoldingTank* _tmp0_;
 #line 4500 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
 #line 4501 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34651,16 +34629,16 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_offli
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank);
 #line 4501 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34650 "Photo.c"
+#line 34628 "Photo.c"
 }
 
 
 static MediaMonitor* library_photo_source_collection_real_create_media_monitor (MediaSourceCollection* base, Workers* workers, GCancellable* cancellable) {
 	LibraryPhotoSourceCollection * self;
 	MediaMonitor* result = NULL;
-	Workers* _tmp0_ = NULL;
-	GCancellable* _tmp1_ = NULL;
-	PhotoMonitor* _tmp2_ = NULL;
+	Workers* _tmp0_;
+	GCancellable* _tmp1_;
+	PhotoMonitor* _tmp2_;
 #line 4504 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
 #line 4504 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34677,14 +34655,14 @@ static MediaMonitor* library_photo_source_collection_real_create_media_monitor (
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_MONITOR, MediaMonitor);
 #line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34676 "Photo.c"
+#line 34654 "Photo.c"
 }
 
 
 static gboolean library_photo_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) {
 	LibraryPhotoSourceCollection * self;
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 4508 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
 #line 4508 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34695,14 +34673,14 @@ static gboolean library_photo_source_collection_real_holds_type_of_source (Sourc
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO);
 #line 4509 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34694 "Photo.c"
+#line 34672 "Photo.c"
 }
 
 
 static gchar* library_photo_source_collection_real_get_typename (MediaSourceCollection* base) {
 	LibraryPhotoSourceCollection * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 4512 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
 #line 4513 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34711,15 +34689,15 @@ static gchar* library_photo_source_collection_real_get_typename (MediaSourceColl
 	result = _tmp0_;
 #line 4513 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34710 "Photo.c"
+#line 34688 "Photo.c"
 }
 
 
 static gboolean library_photo_source_collection_real_is_file_recognized (MediaSourceCollection* base, GFile* file) {
 	LibraryPhotoSourceCollection * self;
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GFile* _tmp0_;
+	gboolean _tmp1_;
 #line 4516 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
 #line 4516 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34732,30 +34710,30 @@ static gboolean library_photo_source_collection_real_is_file_recognized (MediaSo
 	result = _tmp1_;
 #line 4517 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34731 "Photo.c"
+#line 34709 "Photo.c"
 }
 
 
 static void _library_photo_source_collection_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self) {
 #line 4529 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_on_editable_replaced ((LibraryPhotoSourceCollection*) self, _sender, old_file, new_file);
-#line 34738 "Photo.c"
+#line 34716 "Photo.c"
 }
 
 
 static void _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) {
 #line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_on_raw_development_modified ((LibraryPhotoSourceCollection*) self, _sender);
-#line 34745 "Photo.c"
+#line 34723 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed) {
 	LibraryPhotoSourceCollection * self;
-	GeeIterable* _tmp0_ = NULL;
-	GeeIterable* _tmp75_ = NULL;
-	GeeIterable* _tmp153_ = NULL;
-	GeeIterable* _tmp154_ = NULL;
+	GeeIterable* _tmp0_;
+	GeeIterable* _tmp75_;
+	GeeIterable* _tmp153_;
+	GeeIterable* _tmp154_;
 #line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
 #line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34766,11 +34744,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 	_tmp0_ = added;
 #line 4522 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 34765 "Photo.c"
+#line 34743 "Photo.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp1_ = NULL;
-			GeeIterator* _tmp2_ = NULL;
+			GeeIterable* _tmp1_;
+			GeeIterator* _tmp2_;
 #line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = added;
 #line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34779,48 +34757,48 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 			_object_it = _tmp2_;
 #line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 34778 "Photo.c"
-				GeeIterator* _tmp3_ = NULL;
-				gboolean _tmp4_ = FALSE;
+#line 34756 "Photo.c"
+				GeeIterator* _tmp3_;
+				gboolean _tmp4_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
+				GeeIterator* _tmp5_;
+				gpointer _tmp6_;
 				LibraryPhoto* photo = NULL;
-				DataObject* _tmp7_ = NULL;
-				LibraryPhoto* _tmp8_ = NULL;
+				DataObject* _tmp7_;
+				LibraryPhoto* _tmp8_;
 				GFile* editable = NULL;
-				LibraryPhoto* _tmp9_ = NULL;
-				GFile* _tmp10_ = NULL;
-				GFile* _tmp11_ = NULL;
-				LibraryPhoto* _tmp15_ = NULL;
+				LibraryPhoto* _tmp9_;
+				GFile* _tmp10_;
+				GFile* _tmp11_;
+				LibraryPhoto* _tmp15_;
 				GeeCollection* raw_list = NULL;
-				LibraryPhoto* _tmp16_ = NULL;
-				GeeCollection* _tmp17_ = NULL;
-				GeeCollection* _tmp18_ = NULL;
-				LibraryPhoto* _tmp28_ = NULL;
+				LibraryPhoto* _tmp16_;
+				GeeCollection* _tmp17_;
+				GeeCollection* _tmp18_;
+				LibraryPhoto* _tmp28_;
 				gint64 master_filesize = 0LL;
-				LibraryPhoto* _tmp29_ = NULL;
-				BackingPhotoRow* _tmp30_ = NULL;
-				BackingPhotoRow* _tmp31_ = NULL;
-				gint64 _tmp32_ = 0LL;
-				gint64 _tmp33_ = 0LL;
+				LibraryPhoto* _tmp29_;
+				BackingPhotoRow* _tmp30_;
+				BackingPhotoRow* _tmp31_;
+				gint64 _tmp32_;
+				gint64 _tmp33_;
 				gint64 _tmp34_ = 0LL;
-				LibraryPhoto* _tmp35_ = NULL;
-				BackingPhotoRow* _tmp36_ = NULL;
-				BackingPhotoRow* _tmp37_ = NULL;
-				gboolean _tmp38_ = FALSE;
+				LibraryPhoto* _tmp35_;
+				BackingPhotoRow* _tmp36_;
+				BackingPhotoRow* _tmp37_;
+				gboolean _tmp38_;
 				gint64 editable_filesize = 0LL;
-				GeeMultiMap* _tmp43_ = NULL;
-				gint64 _tmp44_ = 0LL;
-				LibraryPhoto* _tmp45_ = NULL;
-				GeeHashMap* _tmp46_ = NULL;
-				LibraryPhoto* _tmp47_ = NULL;
-				gint64 _tmp48_ = 0LL;
-				gint64 _tmp49_ = 0LL;
+				GeeMultiMap* _tmp43_;
+				gint64 _tmp44_;
+				LibraryPhoto* _tmp45_;
+				GeeHashMap* _tmp46_;
+				LibraryPhoto* _tmp47_;
+				gint64 _tmp48_;
+				gint64 _tmp49_;
 				GeeCollection* raw_rows = NULL;
-				LibraryPhoto* _tmp56_ = NULL;
-				GeeCollection* _tmp57_ = NULL;
-				GeeCollection* _tmp58_ = NULL;
+				LibraryPhoto* _tmp56_;
+				GeeCollection* _tmp57_;
+				GeeCollection* _tmp58_;
 #line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = _object_it;
 #line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34829,7 +34807,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				if (!_tmp4_) {
 #line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 34828 "Photo.c"
+#line 34806 "Photo.c"
 				}
 #line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _object_it;
@@ -34853,10 +34831,10 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_tmp11_ = editable;
 #line 4527 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_ != NULL) {
-#line 34852 "Photo.c"
-					GeeHashMap* _tmp12_ = NULL;
-					GFile* _tmp13_ = NULL;
-					LibraryPhoto* _tmp14_ = NULL;
+#line 34830 "Photo.c"
+					GeeHashMap* _tmp12_;
+					GFile* _tmp13_;
+					LibraryPhoto* _tmp14_;
 #line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = self->priv->by_editable_file;
 #line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34865,7 +34843,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 					_tmp14_ = photo;
 #line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp14_);
-#line 34864 "Photo.c"
+#line 34842 "Photo.c"
 				}
 #line 4529 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = photo;
@@ -34881,11 +34859,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_tmp18_ = raw_list;
 #line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp18_ != NULL) {
-#line 34880 "Photo.c"
+#line 34858 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
-						GeeCollection* _tmp19_ = NULL;
-						GeeIterator* _tmp20_ = NULL;
+						GeeCollection* _tmp19_;
+						GeeIterator* _tmp20_;
 #line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp19_ = raw_list;
 #line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34894,15 +34872,15 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 						_f_it = _tmp20_;
 #line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 34893 "Photo.c"
-							GeeIterator* _tmp21_ = NULL;
-							gboolean _tmp22_ = FALSE;
+#line 34871 "Photo.c"
+							GeeIterator* _tmp21_;
+							gboolean _tmp22_;
 							GFile* f = NULL;
-							GeeIterator* _tmp23_ = NULL;
-							gpointer _tmp24_ = NULL;
-							GeeHashMap* _tmp25_ = NULL;
-							GFile* _tmp26_ = NULL;
-							LibraryPhoto* _tmp27_ = NULL;
+							GeeIterator* _tmp23_;
+							gpointer _tmp24_;
+							GeeHashMap* _tmp25_;
+							GFile* _tmp26_;
+							LibraryPhoto* _tmp27_;
 #line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_ = _f_it;
 #line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34911,7 +34889,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							if (!_tmp22_) {
 #line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 34910 "Photo.c"
+#line 34888 "Photo.c"
 							}
 #line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp23_ = _f_it;
@@ -34929,11 +34907,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_, _tmp27_);
 #line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (f);
-#line 34928 "Photo.c"
+#line 34906 "Photo.c"
 						}
 #line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 34932 "Photo.c"
+#line 34910 "Photo.c"
 					}
 				}
 #line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34966,11 +34944,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_backing_photo_row_unref0 (_tmp37_);
 #line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp38_) {
-#line 34965 "Photo.c"
-					LibraryPhoto* _tmp39_ = NULL;
-					BackingPhotoRow* _tmp40_ = NULL;
-					BackingPhotoRow* _tmp41_ = NULL;
-					gint64 _tmp42_ = 0LL;
+#line 34943 "Photo.c"
+					LibraryPhoto* _tmp39_;
+					BackingPhotoRow* _tmp40_;
+					BackingPhotoRow* _tmp41_;
+					gint64 _tmp42_;
 #line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp39_ = photo;
 #line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34983,11 +34961,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 					_tmp34_ = _tmp42_;
 #line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp41_);
-#line 34982 "Photo.c"
+#line 34960 "Photo.c"
 				} else {
 #line 4540 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp34_ = (gint64) -1;
-#line 34986 "Photo.c"
+#line 34964 "Photo.c"
 				}
 #line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp34_;
@@ -35011,13 +34989,13 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_tmp49_ = editable_filesize;
 #line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp49_ >= ((gint64) 0)) {
-#line 35010 "Photo.c"
-					GeeMultiMap* _tmp50_ = NULL;
-					gint64 _tmp51_ = 0LL;
-					LibraryPhoto* _tmp52_ = NULL;
-					GeeHashMap* _tmp53_ = NULL;
-					LibraryPhoto* _tmp54_ = NULL;
-					gint64 _tmp55_ = 0LL;
+#line 34988 "Photo.c"
+					GeeMultiMap* _tmp50_;
+					gint64 _tmp51_;
+					LibraryPhoto* _tmp52_;
+					GeeHashMap* _tmp53_;
+					LibraryPhoto* _tmp54_;
+					gint64 _tmp55_;
 #line 4544 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = self->priv->filesize_to_photo;
 #line 4544 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35034,7 +35012,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 					_tmp55_ = editable_filesize;
 #line 4545 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp54_, &_tmp55_);
-#line 35033 "Photo.c"
+#line 35011 "Photo.c"
 				}
 #line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = photo;
@@ -35046,11 +35024,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_tmp58_ = raw_rows;
 #line 4549 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp58_ != NULL) {
-#line 35045 "Photo.c"
+#line 35023 "Photo.c"
 					{
 						GeeIterator* _row_it = NULL;
-						GeeCollection* _tmp59_ = NULL;
-						GeeIterator* _tmp60_ = NULL;
+						GeeCollection* _tmp59_;
+						GeeIterator* _tmp60_;
 #line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp59_ = raw_rows;
 #line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35059,14 +35037,14 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 						_row_it = _tmp60_;
 #line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 35058 "Photo.c"
-							GeeIterator* _tmp61_ = NULL;
-							gboolean _tmp62_ = FALSE;
+#line 35036 "Photo.c"
+							GeeIterator* _tmp61_;
+							gboolean _tmp62_;
 							BackingPhotoRow* row = NULL;
-							GeeIterator* _tmp63_ = NULL;
-							gpointer _tmp64_ = NULL;
-							BackingPhotoRow* _tmp65_ = NULL;
-							gint64 _tmp66_ = 0LL;
+							GeeIterator* _tmp63_;
+							gpointer _tmp64_;
+							BackingPhotoRow* _tmp65_;
+							gint64 _tmp66_;
 #line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp61_ = _row_it;
 #line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35075,7 +35053,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							if (!_tmp62_) {
 #line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 35074 "Photo.c"
+#line 35052 "Photo.c"
 							}
 #line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp63_ = _row_it;
@@ -35089,15 +35067,15 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							_tmp66_ = _tmp65_->filesize;
 #line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (_tmp66_ >= ((gint64) 0)) {
-#line 35088 "Photo.c"
-								GeeMultiMap* _tmp67_ = NULL;
-								BackingPhotoRow* _tmp68_ = NULL;
-								gint64 _tmp69_ = 0LL;
-								LibraryPhoto* _tmp70_ = NULL;
-								GeeMultiMap* _tmp71_ = NULL;
-								LibraryPhoto* _tmp72_ = NULL;
-								BackingPhotoRow* _tmp73_ = NULL;
-								gint64 _tmp74_ = 0LL;
+#line 35066 "Photo.c"
+								GeeMultiMap* _tmp67_;
+								BackingPhotoRow* _tmp68_;
+								gint64 _tmp69_;
+								LibraryPhoto* _tmp70_;
+								GeeMultiMap* _tmp71_;
+								LibraryPhoto* _tmp72_;
+								BackingPhotoRow* _tmp73_;
+								gint64 _tmp74_;
 #line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp67_ = self->priv->filesize_to_photo;
 #line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35118,15 +35096,15 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 								_tmp74_ = _tmp73_->filesize;
 #line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
 								gee_multi_map_set (_tmp71_, _tmp72_, &_tmp74_);
-#line 35117 "Photo.c"
+#line 35095 "Photo.c"
 							}
 #line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (row);
-#line 35121 "Photo.c"
+#line 35099 "Photo.c"
 						}
 #line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_row_it);
-#line 35125 "Photo.c"
+#line 35103 "Photo.c"
 					}
 				}
 #line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35139,22 +35117,22 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_g_object_unref0 (photo);
 #line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (object);
-#line 35138 "Photo.c"
+#line 35116 "Photo.c"
 			}
 #line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_object_it);
-#line 35142 "Photo.c"
+#line 35120 "Photo.c"
 		}
 	}
 #line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp75_ = removed;
 #line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp75_ != NULL) {
-#line 35149 "Photo.c"
+#line 35127 "Photo.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp76_ = NULL;
-			GeeIterator* _tmp77_ = NULL;
+			GeeIterable* _tmp76_;
+			GeeIterator* _tmp77_;
 #line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76_ = removed;
 #line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35163,49 +35141,49 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 			_object_it = _tmp77_;
 #line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35162 "Photo.c"
-				GeeIterator* _tmp78_ = NULL;
-				gboolean _tmp79_ = FALSE;
+#line 35140 "Photo.c"
+				GeeIterator* _tmp78_;
+				gboolean _tmp79_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp80_ = NULL;
-				gpointer _tmp81_ = NULL;
+				GeeIterator* _tmp80_;
+				gpointer _tmp81_;
 				LibraryPhoto* photo = NULL;
-				DataObject* _tmp82_ = NULL;
-				LibraryPhoto* _tmp83_ = NULL;
+				DataObject* _tmp82_;
+				LibraryPhoto* _tmp83_;
 				GFile* editable = NULL;
-				LibraryPhoto* _tmp84_ = NULL;
-				GFile* _tmp85_ = NULL;
-				GFile* _tmp86_ = NULL;
-				LibraryPhoto* _tmp94_ = NULL;
-				guint _tmp95_ = 0U;
+				LibraryPhoto* _tmp84_;
+				GFile* _tmp85_;
+				GFile* _tmp86_;
+				LibraryPhoto* _tmp94_;
+				guint _tmp95_;
 				GeeCollection* raw_list = NULL;
-				LibraryPhoto* _tmp96_ = NULL;
-				GeeCollection* _tmp97_ = NULL;
-				GeeCollection* _tmp98_ = NULL;
-				LibraryPhoto* _tmp107_ = NULL;
-				guint _tmp108_ = 0U;
+				LibraryPhoto* _tmp96_;
+				GeeCollection* _tmp97_;
+				GeeCollection* _tmp98_;
+				LibraryPhoto* _tmp107_;
+				guint _tmp108_;
 				gint64 master_filesize = 0LL;
-				LibraryPhoto* _tmp109_ = NULL;
-				BackingPhotoRow* _tmp110_ = NULL;
-				BackingPhotoRow* _tmp111_ = NULL;
-				gint64 _tmp112_ = 0LL;
-				gint64 _tmp113_ = 0LL;
+				LibraryPhoto* _tmp109_;
+				BackingPhotoRow* _tmp110_;
+				BackingPhotoRow* _tmp111_;
+				gint64 _tmp112_;
+				gint64 _tmp113_;
 				gint64 _tmp114_ = 0LL;
-				LibraryPhoto* _tmp115_ = NULL;
-				BackingPhotoRow* _tmp116_ = NULL;
-				BackingPhotoRow* _tmp117_ = NULL;
-				gboolean _tmp118_ = FALSE;
+				LibraryPhoto* _tmp115_;
+				BackingPhotoRow* _tmp116_;
+				BackingPhotoRow* _tmp117_;
+				gboolean _tmp118_;
 				gint64 editable_filesize = 0LL;
-				GeeMultiMap* _tmp123_ = NULL;
-				gint64 _tmp124_ = 0LL;
-				LibraryPhoto* _tmp125_ = NULL;
-				GeeHashMap* _tmp126_ = NULL;
-				LibraryPhoto* _tmp127_ = NULL;
-				gint64 _tmp128_ = 0LL;
+				GeeMultiMap* _tmp123_;
+				gint64 _tmp124_;
+				LibraryPhoto* _tmp125_;
+				GeeHashMap* _tmp126_;
+				LibraryPhoto* _tmp127_;
+				gint64 _tmp128_;
 				GeeCollection* raw_rows = NULL;
-				LibraryPhoto* _tmp134_ = NULL;
-				GeeCollection* _tmp135_ = NULL;
-				GeeCollection* _tmp136_ = NULL;
+				LibraryPhoto* _tmp134_;
+				GeeCollection* _tmp135_;
+				GeeCollection* _tmp136_;
 #line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp78_ = _object_it;
 #line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35214,7 +35192,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				if (!_tmp79_) {
 #line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35213 "Photo.c"
+#line 35191 "Photo.c"
 				}
 #line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp80_ = _object_it;
@@ -35238,15 +35216,15 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_tmp86_ = editable;
 #line 4565 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp86_ != NULL) {
-#line 35237 "Photo.c"
+#line 35215 "Photo.c"
 					gboolean is_removed = FALSE;
-					GeeHashMap* _tmp87_ = NULL;
-					LibraryPhoto* _tmp88_ = NULL;
-					GFile* _tmp89_ = NULL;
-					GFile* _tmp90_ = NULL;
-					gboolean _tmp91_ = FALSE;
-					gboolean _tmp92_ = FALSE;
-					gboolean _tmp93_ = FALSE;
+					GeeHashMap* _tmp87_;
+					LibraryPhoto* _tmp88_;
+					GFile* _tmp89_;
+					GFile* _tmp90_;
+					gboolean _tmp91_;
+					gboolean _tmp92_;
+					gboolean _tmp93_;
 #line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp87_ = self->priv->by_editable_file;
 #line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35267,7 +35245,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 					_tmp93_ = is_removed;
 #line 4567 "/home/jens/Source/shotwell/src/Photo.vala"
 					_vala_assert (_tmp93_, "is_removed");
-#line 35266 "Photo.c"
+#line 35244 "Photo.c"
 				}
 #line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp94_ = photo;
@@ -35285,11 +35263,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_tmp98_ = raw_list;
 #line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp98_ != NULL) {
-#line 35284 "Photo.c"
+#line 35262 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
-						GeeCollection* _tmp99_ = NULL;
-						GeeIterator* _tmp100_ = NULL;
+						GeeCollection* _tmp99_;
+						GeeIterator* _tmp100_;
 #line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp99_ = raw_list;
 #line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35298,14 +35276,14 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 						_f_it = _tmp100_;
 #line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 35297 "Photo.c"
-							GeeIterator* _tmp101_ = NULL;
-							gboolean _tmp102_ = FALSE;
+#line 35275 "Photo.c"
+							GeeIterator* _tmp101_;
+							gboolean _tmp102_;
 							GFile* f = NULL;
-							GeeIterator* _tmp103_ = NULL;
-							gpointer _tmp104_ = NULL;
-							GeeHashMap* _tmp105_ = NULL;
-							GFile* _tmp106_ = NULL;
+							GeeIterator* _tmp103_;
+							gpointer _tmp104_;
+							GeeHashMap* _tmp105_;
+							GFile* _tmp106_;
 #line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp101_ = _f_it;
 #line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35314,7 +35292,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							if (!_tmp102_) {
 #line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 35313 "Photo.c"
+#line 35291 "Photo.c"
 							}
 #line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp103_ = _f_it;
@@ -35330,11 +35308,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp106_, NULL);
 #line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (f);
-#line 35329 "Photo.c"
+#line 35307 "Photo.c"
 						}
 #line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 35333 "Photo.c"
+#line 35311 "Photo.c"
 					}
 				}
 #line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35369,11 +35347,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_backing_photo_row_unref0 (_tmp117_);
 #line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp118_) {
-#line 35368 "Photo.c"
-					LibraryPhoto* _tmp119_ = NULL;
-					BackingPhotoRow* _tmp120_ = NULL;
-					BackingPhotoRow* _tmp121_ = NULL;
-					gint64 _tmp122_ = 0LL;
+#line 35346 "Photo.c"
+					LibraryPhoto* _tmp119_;
+					BackingPhotoRow* _tmp120_;
+					BackingPhotoRow* _tmp121_;
+					gint64 _tmp122_;
 #line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp119_ = photo;
 #line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35386,11 +35364,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 					_tmp114_ = _tmp122_;
 #line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp121_);
-#line 35385 "Photo.c"
+#line 35363 "Photo.c"
 				} else {
 #line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp114_ = (gint64) -1;
-#line 35389 "Photo.c"
+#line 35367 "Photo.c"
 				}
 #line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp114_;
@@ -35412,12 +35390,12 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_tmp128_ = editable_filesize;
 #line 4583 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp128_ >= ((gint64) 0)) {
-#line 35411 "Photo.c"
-					GeeMultiMap* _tmp129_ = NULL;
-					gint64 _tmp130_ = 0LL;
-					LibraryPhoto* _tmp131_ = NULL;
-					GeeHashMap* _tmp132_ = NULL;
-					LibraryPhoto* _tmp133_ = NULL;
+#line 35389 "Photo.c"
+					GeeMultiMap* _tmp129_;
+					gint64 _tmp130_;
+					LibraryPhoto* _tmp131_;
+					GeeHashMap* _tmp132_;
+					LibraryPhoto* _tmp133_;
 #line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp129_ = self->priv->filesize_to_photo;
 #line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35432,7 +35410,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 					_tmp133_ = photo;
 #line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp133_, NULL);
-#line 35431 "Photo.c"
+#line 35409 "Photo.c"
 				}
 #line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp134_ = photo;
@@ -35444,11 +35422,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_tmp136_ = raw_rows;
 #line 4589 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp136_ != NULL) {
-#line 35443 "Photo.c"
+#line 35421 "Photo.c"
 					{
 						GeeIterator* _row_it = NULL;
-						GeeCollection* _tmp137_ = NULL;
-						GeeIterator* _tmp138_ = NULL;
+						GeeCollection* _tmp137_;
+						GeeIterator* _tmp138_;
 #line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp137_ = raw_rows;
 #line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35457,14 +35435,14 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 						_row_it = _tmp138_;
 #line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 35456 "Photo.c"
-							GeeIterator* _tmp139_ = NULL;
-							gboolean _tmp140_ = FALSE;
+#line 35434 "Photo.c"
+							GeeIterator* _tmp139_;
+							gboolean _tmp140_;
 							BackingPhotoRow* row = NULL;
-							GeeIterator* _tmp141_ = NULL;
-							gpointer _tmp142_ = NULL;
-							BackingPhotoRow* _tmp143_ = NULL;
-							gint64 _tmp144_ = 0LL;
+							GeeIterator* _tmp141_;
+							gpointer _tmp142_;
+							BackingPhotoRow* _tmp143_;
+							gint64 _tmp144_;
 #line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp139_ = _row_it;
 #line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35473,7 +35451,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							if (!_tmp140_) {
 #line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 35472 "Photo.c"
+#line 35450 "Photo.c"
 							}
 #line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp141_ = _row_it;
@@ -35487,15 +35465,15 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							_tmp144_ = _tmp143_->filesize;
 #line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (_tmp144_ >= ((gint64) 0)) {
-#line 35486 "Photo.c"
-								GeeMultiMap* _tmp145_ = NULL;
-								BackingPhotoRow* _tmp146_ = NULL;
-								gint64 _tmp147_ = 0LL;
-								LibraryPhoto* _tmp148_ = NULL;
-								GeeMultiMap* _tmp149_ = NULL;
-								LibraryPhoto* _tmp150_ = NULL;
-								BackingPhotoRow* _tmp151_ = NULL;
-								gint64 _tmp152_ = 0LL;
+#line 35464 "Photo.c"
+								GeeMultiMap* _tmp145_;
+								BackingPhotoRow* _tmp146_;
+								gint64 _tmp147_;
+								LibraryPhoto* _tmp148_;
+								GeeMultiMap* _tmp149_;
+								LibraryPhoto* _tmp150_;
+								BackingPhotoRow* _tmp151_;
+								gint64 _tmp152_;
 #line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp145_ = self->priv->filesize_to_photo;
 #line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35516,15 +35494,15 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 								_tmp152_ = _tmp151_->filesize;
 #line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
 								gee_multi_map_remove (_tmp149_, _tmp150_, &_tmp152_);
-#line 35515 "Photo.c"
+#line 35493 "Photo.c"
 							}
 #line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (row);
-#line 35519 "Photo.c"
+#line 35497 "Photo.c"
 						}
 #line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_row_it);
-#line 35523 "Photo.c"
+#line 35501 "Photo.c"
 					}
 				}
 #line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35537,11 +35515,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_g_object_unref0 (photo);
 #line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (object);
-#line 35536 "Photo.c"
+#line 35514 "Photo.c"
 			}
 #line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_object_it);
-#line 35540 "Photo.c"
+#line 35518 "Photo.c"
 		}
 	}
 #line 4600 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35550,13 +35528,13 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 	_tmp154_ = removed;
 #line 4600 "/home/jens/Source/shotwell/src/Photo.vala"
 	DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp153_, _tmp154_);
-#line 35549 "Photo.c"
+#line 35527 "Photo.c"
 }
 
 
 static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSourceCollection* self, Photo* photo, GFile* old_file, GFile* new_file) {
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp5_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp5_;
 #line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
 #line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35569,12 +35547,12 @@ static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSo
 	_tmp0_ = old_file;
 #line 4604 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 35568 "Photo.c"
+#line 35546 "Photo.c"
 		gboolean is_removed = FALSE;
-		GeeHashMap* _tmp1_ = NULL;
-		GFile* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		GeeHashMap* _tmp1_;
+		GFile* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 4605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = self->priv->by_editable_file;
 #line 4605 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35587,16 +35565,16 @@ static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSo
 		_tmp4_ = is_removed;
 #line 4606 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_assert (_tmp4_, "is_removed");
-#line 35586 "Photo.c"
+#line 35564 "Photo.c"
 	}
 #line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = new_file;
 #line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ != NULL) {
-#line 35592 "Photo.c"
-		GeeHashMap* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
+#line 35570 "Photo.c"
+		GeeHashMap* _tmp6_;
+		GFile* _tmp7_;
+		Photo* _tmp8_;
 #line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = self->priv->by_editable_file;
 #line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35605,27 +35583,27 @@ static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSo
 		_tmp8_ = photo;
 #line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 35604 "Photo.c"
+#line 35582 "Photo.c"
 	}
 }
 
 
 static void library_photo_source_collection_on_raw_development_modified (LibraryPhotoSourceCollection* self, Photo* _photo) {
 	LibraryPhoto* photo = NULL;
-	Photo* _tmp0_ = NULL;
-	LibraryPhoto* _tmp1_ = NULL;
-	LibraryPhoto* _tmp2_ = NULL;
-	GeeMultiMap* _tmp3_ = NULL;
-	LibraryPhoto* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	Photo* _tmp0_;
+	LibraryPhoto* _tmp1_;
+	LibraryPhoto* _tmp2_;
+	GeeMultiMap* _tmp3_;
+	LibraryPhoto* _tmp4_;
+	gboolean _tmp5_;
 	GeeCollection* raw_list = NULL;
-	LibraryPhoto* _tmp23_ = NULL;
-	GeeCollection* _tmp24_ = NULL;
-	GeeCollection* _tmp25_ = NULL;
+	LibraryPhoto* _tmp23_;
+	GeeCollection* _tmp24_;
+	GeeCollection* _tmp25_;
 	GeeCollection* raw_rows = NULL;
-	LibraryPhoto* _tmp35_ = NULL;
-	GeeCollection* _tmp36_ = NULL;
-	GeeCollection* _tmp37_ = NULL;
+	LibraryPhoto* _tmp35_;
+	GeeCollection* _tmp36_;
+	GeeCollection* _tmp37_;
 #line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
 #line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35644,7 +35622,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 		_g_object_unref0 (photo);
 #line 4616 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 35643 "Photo.c"
+#line 35621 "Photo.c"
 	}
 #line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = self->priv->photo_to_raw_development_filesize;
@@ -35654,17 +35632,17 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 	_tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_);
 #line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 35653 "Photo.c"
-		GeeMultiMap* _tmp21_ = NULL;
-		LibraryPhoto* _tmp22_ = NULL;
+#line 35631 "Photo.c"
+		GeeMultiMap* _tmp21_;
+		LibraryPhoto* _tmp22_;
 		{
 			GeeIterator* _s_it = NULL;
-			GeeMultiMap* _tmp6_ = NULL;
-			LibraryPhoto* _tmp7_ = NULL;
-			GeeCollection* _tmp8_ = NULL;
-			GeeCollection* _tmp9_ = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			GeeIterator* _tmp11_ = NULL;
+			GeeMultiMap* _tmp6_;
+			LibraryPhoto* _tmp7_;
+			GeeCollection* _tmp8_;
+			GeeCollection* _tmp9_;
+			GeeIterator* _tmp10_;
+			GeeIterator* _tmp11_;
 #line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->priv->photo_to_raw_development_filesize;
 #line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35683,17 +35661,17 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 			_s_it = _tmp11_;
 #line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35682 "Photo.c"
-				GeeIterator* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
+#line 35660 "Photo.c"
+				GeeIterator* _tmp12_;
+				gboolean _tmp13_;
 				gint64 s = 0LL;
-				GeeIterator* _tmp14_ = NULL;
-				gpointer _tmp15_ = NULL;
-				gint64* _tmp16_ = NULL;
-				gint64 _tmp17_ = 0LL;
-				GeeMultiMap* _tmp18_ = NULL;
-				gint64 _tmp19_ = 0LL;
-				LibraryPhoto* _tmp20_ = NULL;
+				GeeIterator* _tmp14_;
+				gpointer _tmp15_;
+				gint64* _tmp16_;
+				gint64 _tmp17_;
+				GeeMultiMap* _tmp18_;
+				gint64 _tmp19_;
+				LibraryPhoto* _tmp20_;
 #line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _s_it;
 #line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35702,7 +35680,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				if (!_tmp13_) {
 #line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35701 "Photo.c"
+#line 35679 "Photo.c"
 				}
 #line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _s_it;
@@ -35724,11 +35702,11 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				_tmp20_ = photo;
 #line 4621 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_remove (_tmp18_, &_tmp19_, _tmp20_);
-#line 35723 "Photo.c"
+#line 35701 "Photo.c"
 			}
 #line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_s_it);
-#line 35727 "Photo.c"
+#line 35705 "Photo.c"
 		}
 #line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = self->priv->photo_to_raw_development_filesize;
@@ -35736,7 +35714,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 		_tmp22_ = photo;
 #line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_multi_map_remove_all (_tmp21_, _tmp22_);
-#line 35735 "Photo.c"
+#line 35713 "Photo.c"
 	}
 #line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = photo;
@@ -35748,11 +35726,11 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 	_tmp25_ = raw_list;
 #line 4627 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp25_ != NULL) {
-#line 35747 "Photo.c"
+#line 35725 "Photo.c"
 		{
 			GeeIterator* _f_it = NULL;
-			GeeCollection* _tmp26_ = NULL;
-			GeeIterator* _tmp27_ = NULL;
+			GeeCollection* _tmp26_;
+			GeeIterator* _tmp27_;
 #line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = raw_list;
 #line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35761,15 +35739,15 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 			_f_it = _tmp27_;
 #line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35760 "Photo.c"
-				GeeIterator* _tmp28_ = NULL;
-				gboolean _tmp29_ = FALSE;
+#line 35738 "Photo.c"
+				GeeIterator* _tmp28_;
+				gboolean _tmp29_;
 				GFile* f = NULL;
-				GeeIterator* _tmp30_ = NULL;
-				gpointer _tmp31_ = NULL;
-				GeeHashMap* _tmp32_ = NULL;
-				GFile* _tmp33_ = NULL;
-				LibraryPhoto* _tmp34_ = NULL;
+				GeeIterator* _tmp30_;
+				gpointer _tmp31_;
+				GeeHashMap* _tmp32_;
+				GFile* _tmp33_;
+				LibraryPhoto* _tmp34_;
 #line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = _f_it;
 #line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35778,7 +35756,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				if (!_tmp29_) {
 #line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35777 "Photo.c"
+#line 35755 "Photo.c"
 				}
 #line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = _f_it;
@@ -35796,11 +35774,11 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp33_, _tmp34_);
 #line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 35795 "Photo.c"
+#line 35773 "Photo.c"
 			}
 #line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 35799 "Photo.c"
+#line 35777 "Photo.c"
 		}
 	}
 #line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35813,11 +35791,11 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 	_tmp37_ = raw_rows;
 #line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp37_ != NULL) {
-#line 35812 "Photo.c"
+#line 35790 "Photo.c"
 		{
 			GeeIterator* _row_it = NULL;
-			GeeCollection* _tmp38_ = NULL;
-			GeeIterator* _tmp39_ = NULL;
+			GeeCollection* _tmp38_;
+			GeeIterator* _tmp39_;
 #line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = raw_rows;
 #line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35826,14 +35804,14 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 			_row_it = _tmp39_;
 #line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35825 "Photo.c"
-				GeeIterator* _tmp40_ = NULL;
-				gboolean _tmp41_ = FALSE;
+#line 35803 "Photo.c"
+				GeeIterator* _tmp40_;
+				gboolean _tmp41_;
 				BackingPhotoRow* row = NULL;
-				GeeIterator* _tmp42_ = NULL;
-				gpointer _tmp43_ = NULL;
-				BackingPhotoRow* _tmp44_ = NULL;
-				gint64 _tmp45_ = 0LL;
+				GeeIterator* _tmp42_;
+				gpointer _tmp43_;
+				BackingPhotoRow* _tmp44_;
+				gint64 _tmp45_;
 #line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = _row_it;
 #line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35842,7 +35820,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				if (!_tmp41_) {
 #line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35841 "Photo.c"
+#line 35819 "Photo.c"
 				}
 #line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp42_ = _row_it;
@@ -35856,15 +35834,15 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				_tmp45_ = _tmp44_->filesize;
 #line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp45_ > ((gint64) 0)) {
-#line 35855 "Photo.c"
-					GeeMultiMap* _tmp46_ = NULL;
-					BackingPhotoRow* _tmp47_ = NULL;
-					gint64 _tmp48_ = 0LL;
-					LibraryPhoto* _tmp49_ = NULL;
-					GeeMultiMap* _tmp50_ = NULL;
-					LibraryPhoto* _tmp51_ = NULL;
-					BackingPhotoRow* _tmp52_ = NULL;
-					gint64 _tmp53_ = 0LL;
+#line 35833 "Photo.c"
+					GeeMultiMap* _tmp46_;
+					BackingPhotoRow* _tmp47_;
+					gint64 _tmp48_;
+					LibraryPhoto* _tmp49_;
+					GeeMultiMap* _tmp50_;
+					LibraryPhoto* _tmp51_;
+					BackingPhotoRow* _tmp52_;
+					gint64 _tmp53_;
 #line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp46_ = self->priv->filesize_to_photo;
 #line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35885,15 +35863,15 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 					_tmp53_ = _tmp52_->filesize;
 #line 4636 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp50_, _tmp51_, &_tmp53_);
-#line 35884 "Photo.c"
+#line 35862 "Photo.c"
 				}
 #line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (row);
-#line 35888 "Photo.c"
+#line 35866 "Photo.c"
 			}
 #line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_row_it);
-#line 35892 "Photo.c"
+#line 35870 "Photo.c"
 		}
 	}
 #line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35902,33 +35880,33 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 	_g_object_unref0 (raw_list);
 #line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 35901 "Photo.c"
+#line 35879 "Photo.c"
 }
 
 
 static gpointer __int64_dup0 (gpointer self) {
 #line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? _int64_dup (self) : NULL;
-#line 35908 "Photo.c"
+#line 35886 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_items_altered (DataCollection* base, GeeMap* items) {
 	LibraryPhotoSourceCollection * self;
-	GeeMap* _tmp72_ = NULL;
+	GeeMap* _tmp72_;
 #line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
 #line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_MAP (items));
-#line 35919 "Photo.c"
+#line 35897 "Photo.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = items;
 #line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35947,22 +35925,22 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 		_object_it = _tmp5_;
 #line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 35946 "Photo.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 35924 "Photo.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			Alteration* alteration = NULL;
-			GeeMap* _tmp10_ = NULL;
-			DataObject* _tmp11_ = NULL;
-			gpointer _tmp12_ = NULL;
+			GeeMap* _tmp10_;
+			DataObject* _tmp11_;
+			gpointer _tmp12_;
 			LibraryPhoto* photo = NULL;
-			DataObject* _tmp13_ = NULL;
-			LibraryPhoto* _tmp14_ = NULL;
+			DataObject* _tmp13_;
+			LibraryPhoto* _tmp14_;
 			gboolean _tmp15_ = FALSE;
-			Alteration* _tmp16_ = NULL;
-			gboolean _tmp17_ = FALSE;
+			Alteration* _tmp16_;
+			gboolean _tmp17_;
 #line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _object_it;
 #line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35971,7 +35949,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 			if (!_tmp7_) {
 #line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 35970 "Photo.c"
+#line 35948 "Photo.c"
 			}
 #line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _object_it;
@@ -36001,57 +35979,57 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 			if (_tmp17_) {
 #line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = TRUE;
-#line 36000 "Photo.c"
+#line 35978 "Photo.c"
 			} else {
-				Alteration* _tmp18_ = NULL;
-				gboolean _tmp19_ = FALSE;
+				Alteration* _tmp18_;
+				gboolean _tmp19_;
 #line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = alteration;
 #line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = alteration_has_detail (_tmp18_, "image", "editable");
 #line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _tmp19_;
-#line 36010 "Photo.c"
+#line 35988 "Photo.c"
 			}
 #line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp15_) {
-#line 36014 "Photo.c"
+#line 35992 "Photo.c"
 				gint64 old_master_filesize = 0LL;
-				GeeHashMap* _tmp20_ = NULL;
-				LibraryPhoto* _tmp21_ = NULL;
-				gpointer _tmp22_ = NULL;
-				gint64* _tmp23_ = NULL;
-				gint64 _tmp24_ = 0LL;
+				GeeHashMap* _tmp20_;
+				LibraryPhoto* _tmp21_;
+				gpointer _tmp22_;
+				gint64* _tmp23_;
+				gint64 _tmp24_;
 				gint64* _tmp25_ = NULL;
-				GeeHashMap* _tmp26_ = NULL;
-				LibraryPhoto* _tmp27_ = NULL;
-				gboolean _tmp28_ = FALSE;
+				GeeHashMap* _tmp26_;
+				LibraryPhoto* _tmp27_;
+				gboolean _tmp28_;
 				gint64 old_editable_filesize = 0LL;
-				GeeHashMap* _tmp34_ = NULL;
-				LibraryPhoto* _tmp35_ = NULL;
-				GeeMultiMap* _tmp36_ = NULL;
-				gint64 _tmp37_ = 0LL;
-				LibraryPhoto* _tmp38_ = NULL;
-				gint64 _tmp39_ = 0LL;
+				GeeHashMap* _tmp34_;
+				LibraryPhoto* _tmp35_;
+				GeeMultiMap* _tmp36_;
+				gint64 _tmp37_;
+				LibraryPhoto* _tmp38_;
+				gint64 _tmp39_;
 				gint64 master_filesize = 0LL;
-				LibraryPhoto* _tmp45_ = NULL;
-				BackingPhotoRow* _tmp46_ = NULL;
-				BackingPhotoRow* _tmp47_ = NULL;
-				gint64 _tmp48_ = 0LL;
-				gint64 _tmp49_ = 0LL;
+				LibraryPhoto* _tmp45_;
+				BackingPhotoRow* _tmp46_;
+				BackingPhotoRow* _tmp47_;
+				gint64 _tmp48_;
+				gint64 _tmp49_;
 				gint64 _tmp50_ = 0LL;
-				LibraryPhoto* _tmp51_ = NULL;
-				BackingPhotoRow* _tmp52_ = NULL;
-				BackingPhotoRow* _tmp53_ = NULL;
-				gboolean _tmp54_ = FALSE;
+				LibraryPhoto* _tmp51_;
+				BackingPhotoRow* _tmp52_;
+				BackingPhotoRow* _tmp53_;
+				gboolean _tmp54_;
 				gint64 editable_filesize = 0LL;
-				GeeHashMap* _tmp59_ = NULL;
-				LibraryPhoto* _tmp60_ = NULL;
-				gint64 _tmp61_ = 0LL;
-				GeeMultiMap* _tmp62_ = NULL;
-				gint64 _tmp63_ = 0LL;
-				LibraryPhoto* _tmp64_ = NULL;
-				gint64 _tmp65_ = 0LL;
+				GeeHashMap* _tmp59_;
+				LibraryPhoto* _tmp60_;
+				gint64 _tmp61_;
+				GeeMultiMap* _tmp62_;
+				gint64 _tmp63_;
+				LibraryPhoto* _tmp64_;
+				gint64 _tmp65_;
 #line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = self->priv->photo_to_master_filesize;
 #line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36074,10 +36052,10 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 				_tmp28_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_);
 #line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp28_) {
-#line 36073 "Photo.c"
-					GeeHashMap* _tmp29_ = NULL;
-					LibraryPhoto* _tmp30_ = NULL;
-					gpointer _tmp31_ = NULL;
+#line 36051 "Photo.c"
+					GeeHashMap* _tmp29_;
+					LibraryPhoto* _tmp30_;
+					gpointer _tmp31_;
 #line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp29_ = self->priv->photo_to_editable_filesize;
 #line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36088,10 +36066,10 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 					_g_free0 (_tmp25_);
 #line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = (gint64*) _tmp31_;
-#line 36087 "Photo.c"
+#line 36065 "Photo.c"
 				} else {
-					gint64 _tmp32_ = 0LL;
-					gint64* _tmp33_ = NULL;
+					gint64 _tmp32_;
+					gint64* _tmp33_;
 #line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp32_ = (gint64) -1;
 #line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36100,7 +36078,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 					_g_free0 (_tmp25_);
 #line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = _tmp33_;
-#line 36099 "Photo.c"
+#line 36077 "Photo.c"
 				}
 #line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
 				old_editable_filesize = *_tmp25_;
@@ -36122,12 +36100,12 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 				_tmp39_ = old_editable_filesize;
 #line 4656 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp39_ >= ((gint64) 0)) {
-#line 36121 "Photo.c"
-					GeeHashMap* _tmp40_ = NULL;
-					LibraryPhoto* _tmp41_ = NULL;
-					GeeMultiMap* _tmp42_ = NULL;
-					gint64 _tmp43_ = 0LL;
-					LibraryPhoto* _tmp44_ = NULL;
+#line 36099 "Photo.c"
+					GeeHashMap* _tmp40_;
+					LibraryPhoto* _tmp41_;
+					GeeMultiMap* _tmp42_;
+					gint64 _tmp43_;
+					LibraryPhoto* _tmp44_;
 #line 4657 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp40_ = self->priv->photo_to_editable_filesize;
 #line 4657 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36142,7 +36120,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 					_tmp44_ = photo;
 #line 4658 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_remove (_tmp42_, &_tmp43_, _tmp44_);
-#line 36141 "Photo.c"
+#line 36119 "Photo.c"
 				}
 #line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = photo;
@@ -36170,11 +36148,11 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 				_backing_photo_row_unref0 (_tmp53_);
 #line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp54_) {
-#line 36169 "Photo.c"
-					LibraryPhoto* _tmp55_ = NULL;
-					BackingPhotoRow* _tmp56_ = NULL;
-					BackingPhotoRow* _tmp57_ = NULL;
-					gint64 _tmp58_ = 0LL;
+#line 36147 "Photo.c"
+					LibraryPhoto* _tmp55_;
+					BackingPhotoRow* _tmp56_;
+					BackingPhotoRow* _tmp57_;
+					gint64 _tmp58_;
 #line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp55_ = photo;
 #line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36187,11 +36165,11 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 					_tmp50_ = _tmp58_;
 #line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp57_);
-#line 36186 "Photo.c"
+#line 36164 "Photo.c"
 				} else {
 #line 4664 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = (gint64) -1;
-#line 36190 "Photo.c"
+#line 36168 "Photo.c"
 				}
 #line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp50_;
@@ -36215,13 +36193,13 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 				_tmp65_ = editable_filesize;
 #line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp65_ >= ((gint64) 0)) {
-#line 36214 "Photo.c"
-					GeeHashMap* _tmp66_ = NULL;
-					LibraryPhoto* _tmp67_ = NULL;
-					gint64 _tmp68_ = 0LL;
-					GeeMultiMap* _tmp69_ = NULL;
-					gint64 _tmp70_ = 0LL;
-					LibraryPhoto* _tmp71_ = NULL;
+#line 36192 "Photo.c"
+					GeeHashMap* _tmp66_;
+					LibraryPhoto* _tmp67_;
+					gint64 _tmp68_;
+					GeeMultiMap* _tmp69_;
+					gint64 _tmp70_;
+					LibraryPhoto* _tmp71_;
 #line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp66_ = self->priv->photo_to_editable_filesize;
 #line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36238,11 +36216,11 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 					_tmp71_ = photo;
 #line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp69_, &_tmp70_, _tmp71_);
-#line 36237 "Photo.c"
+#line 36215 "Photo.c"
 				}
 #line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp25_);
-#line 36241 "Photo.c"
+#line 36219 "Photo.c"
 			}
 #line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
@@ -36250,25 +36228,25 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 			_alteration_unref0 (alteration);
 #line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (object);
-#line 36249 "Photo.c"
+#line 36227 "Photo.c"
 		}
 #line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_object_it);
-#line 36253 "Photo.c"
+#line 36231 "Photo.c"
 	}
 #line 4674 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp72_ = items;
 #line 4674 "/home/jens/Source/shotwell/src/Photo.vala"
 	DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp72_);
-#line 36259 "Photo.c"
+#line 36237 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_postprocess_imported_media (MediaSourceCollection* base, GeeCollection* media_sources) {
 	LibraryPhotoSourceCollection * self;
 	GeeHashMultiMap* map = NULL;
-	GeeHashMultiMap* _tmp0_ = NULL;
-	GeeCollection* _tmp97_ = NULL;
+	GeeHashMultiMap* _tmp0_;
+	GeeCollection* _tmp97_;
 #line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
 #line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36277,11 +36255,11 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 	_tmp0_ = gee_hash_multi_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 4679 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 36276 "Photo.c"
+#line 36254 "Photo.c"
 	{
 		GeeIterator* _media_it = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = media_sources;
 #line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36290,29 +36268,29 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 		_media_it = _tmp2_;
 #line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 36289 "Photo.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 36267 "Photo.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			MediaSource* media = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
 			LibraryPhoto* photo = NULL;
-			MediaSource* _tmp7_ = NULL;
-			LibraryPhoto* _tmp8_ = NULL;
+			MediaSource* _tmp7_;
+			LibraryPhoto* _tmp8_;
 			PhotoMetadata* metadata = NULL;
-			LibraryPhoto* _tmp9_ = NULL;
-			PhotoMetadata* _tmp10_ = NULL;
+			LibraryPhoto* _tmp9_;
+			PhotoMetadata* _tmp10_;
 			HierarchicalTagIndex* global_index = NULL;
-			HierarchicalTagIndex* _tmp11_ = NULL;
+			HierarchicalTagIndex* _tmp11_;
 			HierarchicalTagIndex* htag_index = NULL;
-			PhotoMetadata* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
-			LibraryPhoto* _tmp18_ = NULL;
-			GeeCollection* _tmp19_ = NULL;
-			GeeCollection* _tmp20_ = NULL;
-			gboolean _tmp21_ = FALSE;
-			PhotoMetadata* _tmp55_ = NULL;
-			gboolean _tmp56_ = FALSE;
+			PhotoMetadata* _tmp12_;
+			gboolean _tmp13_;
+			LibraryPhoto* _tmp18_;
+			GeeCollection* _tmp19_;
+			GeeCollection* _tmp20_;
+			gboolean _tmp21_;
+			PhotoMetadata* _tmp55_;
+			gboolean _tmp56_;
 #line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _media_it;
 #line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36321,7 +36299,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			if (!_tmp4_) {
 #line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 36320 "Photo.c"
+#line 36298 "Photo.c"
 			}
 #line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _media_it;
@@ -36353,11 +36331,11 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			_tmp13_ = photo_metadata_has_hierarchical_keywords (_tmp12_);
 #line 4693 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp13_) {
-#line 36352 "Photo.c"
-				PhotoMetadata* _tmp14_ = NULL;
-				GeeSet* _tmp15_ = NULL;
-				GeeSet* _tmp16_ = NULL;
-				HierarchicalTagIndex* _tmp17_ = NULL;
+#line 36330 "Photo.c"
+				PhotoMetadata* _tmp14_;
+				GeeSet* _tmp15_;
+				GeeSet* _tmp16_;
+				HierarchicalTagIndex* _tmp17_;
 #line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = metadata;
 #line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36372,7 +36350,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 				htag_index = _tmp17_;
 #line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp16_);
-#line 36371 "Photo.c"
+#line 36349 "Photo.c"
 			}
 #line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = photo;
@@ -36386,14 +36364,14 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			_g_object_unref0 (_tmp20_);
 #line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp21_) {
-#line 36385 "Photo.c"
+#line 36363 "Photo.c"
 				{
 					GeeIterator* _keyword_it = NULL;
-					LibraryPhoto* _tmp22_ = NULL;
-					GeeCollection* _tmp23_ = NULL;
-					GeeCollection* _tmp24_ = NULL;
-					GeeIterator* _tmp25_ = NULL;
-					GeeIterator* _tmp26_ = NULL;
+					LibraryPhoto* _tmp22_;
+					GeeCollection* _tmp23_;
+					GeeCollection* _tmp24_;
+					GeeIterator* _tmp25_;
+					GeeIterator* _tmp26_;
 #line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp22_ = photo;
 #line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36410,21 +36388,21 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 					_keyword_it = _tmp26_;
 #line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 36409 "Photo.c"
-						GeeIterator* _tmp27_ = NULL;
-						gboolean _tmp28_ = FALSE;
+#line 36387 "Photo.c"
+						GeeIterator* _tmp27_;
+						gboolean _tmp28_;
 						gchar* keyword = NULL;
-						GeeIterator* _tmp29_ = NULL;
-						gpointer _tmp30_ = NULL;
+						GeeIterator* _tmp29_;
+						gpointer _tmp30_;
 						gboolean _tmp31_ = FALSE;
-						HierarchicalTagIndex* _tmp32_ = NULL;
+						HierarchicalTagIndex* _tmp32_;
 						gchar* name = NULL;
-						const gchar* _tmp36_ = NULL;
-						gchar* _tmp37_ = NULL;
-						HierarchicalTagIndex* _tmp38_ = NULL;
-						const gchar* _tmp39_ = NULL;
-						gboolean _tmp40_ = FALSE;
-						const gchar* _tmp49_ = NULL;
+						const gchar* _tmp36_;
+						gchar* _tmp37_;
+						HierarchicalTagIndex* _tmp38_;
+						const gchar* _tmp39_;
+						gboolean _tmp40_;
+						const gchar* _tmp49_;
 #line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp27_ = _keyword_it;
 #line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36433,7 +36411,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 						if (!_tmp28_) {
 #line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 36432 "Photo.c"
+#line 36410 "Photo.c"
 						}
 #line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp29_ = _keyword_it;
@@ -36445,10 +36423,10 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 						_tmp32_ = htag_index;
 #line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp32_ != NULL) {
-#line 36444 "Photo.c"
-							HierarchicalTagIndex* _tmp33_ = NULL;
-							const gchar* _tmp34_ = NULL;
-							gboolean _tmp35_ = FALSE;
+#line 36422 "Photo.c"
+							HierarchicalTagIndex* _tmp33_;
+							const gchar* _tmp34_;
+							gboolean _tmp35_;
 #line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp33_ = htag_index;
 #line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36457,11 +36435,11 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 							_tmp35_ = hierarchical_tag_index_is_tag_in_index (_tmp33_, _tmp34_);
 #line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp31_ = _tmp35_;
-#line 36456 "Photo.c"
+#line 36434 "Photo.c"
 						} else {
 #line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp31_ = FALSE;
-#line 36460 "Photo.c"
+#line 36438 "Photo.c"
 						}
 #line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp31_) {
@@ -36469,7 +36447,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 							_g_free0 (keyword);
 #line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
 							continue;
-#line 36468 "Photo.c"
+#line 36446 "Photo.c"
 						}
 #line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp36_ = keyword;
@@ -36485,16 +36463,16 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 						_tmp40_ = hierarchical_tag_index_is_tag_in_index (_tmp38_, _tmp39_);
 #line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp40_) {
-#line 36484 "Photo.c"
+#line 36462 "Photo.c"
 							gchar* most_derived_path = NULL;
-							HierarchicalTagIndex* _tmp41_ = NULL;
-							const gchar* _tmp42_ = NULL;
-							gchar* _tmp43_ = NULL;
-							GeeHashMultiMap* _tmp44_ = NULL;
-							const gchar* _tmp45_ = NULL;
-							Tag* _tmp46_ = NULL;
-							Tag* _tmp47_ = NULL;
-							LibraryPhoto* _tmp48_ = NULL;
+							HierarchicalTagIndex* _tmp41_;
+							const gchar* _tmp42_;
+							gchar* _tmp43_;
+							GeeHashMultiMap* _tmp44_;
+							const gchar* _tmp45_;
+							Tag* _tmp46_;
+							Tag* _tmp47_;
+							LibraryPhoto* _tmp48_;
 #line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp41_ = global_index;
 #line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36525,18 +36503,18 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 							_g_free0 (keyword);
 #line 4708 "/home/jens/Source/shotwell/src/Photo.vala"
 							continue;
-#line 36524 "Photo.c"
+#line 36502 "Photo.c"
 						}
 #line 4711 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp49_ = name;
 #line 4711 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp49_ != NULL) {
-#line 36530 "Photo.c"
-							GeeHashMultiMap* _tmp50_ = NULL;
-							const gchar* _tmp51_ = NULL;
-							Tag* _tmp52_ = NULL;
-							Tag* _tmp53_ = NULL;
-							LibraryPhoto* _tmp54_ = NULL;
+#line 36508 "Photo.c"
+							GeeHashMultiMap* _tmp50_;
+							const gchar* _tmp51_;
+							Tag* _tmp52_;
+							Tag* _tmp53_;
+							LibraryPhoto* _tmp54_;
 #line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp50_ = map;
 #line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36551,17 +36529,17 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 							gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp53_, _tmp54_);
 #line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp53_);
-#line 36550 "Photo.c"
+#line 36528 "Photo.c"
 						}
 #line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (name);
 #line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (keyword);
-#line 36556 "Photo.c"
+#line 36534 "Photo.c"
 					}
 #line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_keyword_it);
-#line 36560 "Photo.c"
+#line 36538 "Photo.c"
 				}
 			}
 #line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36570,14 +36548,14 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			_tmp56_ = photo_metadata_has_hierarchical_keywords (_tmp55_);
 #line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp56_) {
-#line 36569 "Photo.c"
+#line 36547 "Photo.c"
 				{
 					GeeIterator* _path_it = NULL;
-					HierarchicalTagIndex* _tmp57_ = NULL;
-					GeeCollection* _tmp58_ = NULL;
-					GeeCollection* _tmp59_ = NULL;
-					GeeIterator* _tmp60_ = NULL;
-					GeeIterator* _tmp61_ = NULL;
+					HierarchicalTagIndex* _tmp57_;
+					GeeCollection* _tmp58_;
+					GeeCollection* _tmp59_;
+					GeeIterator* _tmp60_;
+					GeeIterator* _tmp61_;
 #line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp57_ = htag_index;
 #line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36594,16 +36572,16 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 					_path_it = _tmp61_;
 #line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 36593 "Photo.c"
-						GeeIterator* _tmp62_ = NULL;
-						gboolean _tmp63_ = FALSE;
+#line 36571 "Photo.c"
+						GeeIterator* _tmp62_;
+						gboolean _tmp63_;
 						gchar* path = NULL;
-						GeeIterator* _tmp64_ = NULL;
-						gpointer _tmp65_ = NULL;
+						GeeIterator* _tmp64_;
+						gpointer _tmp65_;
 						gchar* name = NULL;
-						const gchar* _tmp66_ = NULL;
-						gchar* _tmp67_ = NULL;
-						const gchar* _tmp68_ = NULL;
+						const gchar* _tmp66_;
+						gchar* _tmp67_;
+						const gchar* _tmp68_;
 #line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp62_ = _path_it;
 #line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36612,7 +36590,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 						if (!_tmp63_) {
 #line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 36611 "Photo.c"
+#line 36589 "Photo.c"
 						}
 #line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp64_ = _path_it;
@@ -36630,12 +36608,12 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 						_tmp68_ = name;
 #line 4719 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp68_ != NULL) {
-#line 36629 "Photo.c"
-							GeeHashMultiMap* _tmp69_ = NULL;
-							const gchar* _tmp70_ = NULL;
-							Tag* _tmp71_ = NULL;
-							Tag* _tmp72_ = NULL;
-							LibraryPhoto* _tmp73_ = NULL;
+#line 36607 "Photo.c"
+							GeeHashMultiMap* _tmp69_;
+							const gchar* _tmp70_;
+							Tag* _tmp71_;
+							Tag* _tmp72_;
+							LibraryPhoto* _tmp73_;
 #line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp69_ = map;
 #line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36650,17 +36628,17 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 							gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp72_, _tmp73_);
 #line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp72_);
-#line 36649 "Photo.c"
+#line 36627 "Photo.c"
 						}
 #line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (name);
 #line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (path);
-#line 36655 "Photo.c"
+#line 36633 "Photo.c"
 					}
 #line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_path_it);
-#line 36659 "Photo.c"
+#line 36637 "Photo.c"
 				}
 			}
 #line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36673,16 +36651,16 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			_g_object_unref0 (photo);
 #line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (media);
-#line 36672 "Photo.c"
+#line 36650 "Photo.c"
 		}
 #line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 36676 "Photo.c"
+#line 36654 "Photo.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
-		GeeCollection* _tmp74_ = NULL;
-		GeeIterator* _tmp75_ = NULL;
+		GeeCollection* _tmp74_;
+		GeeIterator* _tmp75_;
 #line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp74_ = media_sources;
 #line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36691,16 +36669,16 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 		_media_it = _tmp75_;
 #line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 36690 "Photo.c"
-			GeeIterator* _tmp76_ = NULL;
-			gboolean _tmp77_ = FALSE;
+#line 36668 "Photo.c"
+			GeeIterator* _tmp76_;
+			gboolean _tmp77_;
 			MediaSource* media = NULL;
-			GeeIterator* _tmp78_ = NULL;
-			gpointer _tmp79_ = NULL;
+			GeeIterator* _tmp78_;
+			gpointer _tmp79_;
 			LibraryPhoto* photo = NULL;
-			MediaSource* _tmp80_ = NULL;
-			LibraryPhoto* _tmp81_ = NULL;
-			LibraryPhoto* _tmp82_ = NULL;
+			MediaSource* _tmp80_;
+			LibraryPhoto* _tmp81_;
+			LibraryPhoto* _tmp82_;
 #line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76_ = _media_it;
 #line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36709,7 +36687,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			if (!_tmp77_) {
 #line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 36708 "Photo.c"
+#line 36686 "Photo.c"
 			}
 #line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp78_ = _media_it;
@@ -36731,19 +36709,19 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			_g_object_unref0 (photo);
 #line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (media);
-#line 36730 "Photo.c"
+#line 36708 "Photo.c"
 		}
 #line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 36734 "Photo.c"
+#line 36712 "Photo.c"
 	}
 	{
 		GeeIterator* _tag_it = NULL;
-		GeeHashMultiMap* _tmp83_ = NULL;
-		GeeSet* _tmp84_ = NULL;
-		GeeSet* _tmp85_ = NULL;
-		GeeIterator* _tmp86_ = NULL;
-		GeeIterator* _tmp87_ = NULL;
+		GeeHashMultiMap* _tmp83_;
+		GeeSet* _tmp84_;
+		GeeSet* _tmp85_;
+		GeeIterator* _tmp86_;
+		GeeIterator* _tmp87_;
 #line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp83_ = map;
 #line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36760,17 +36738,17 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 		_tag_it = _tmp87_;
 #line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 36759 "Photo.c"
-			GeeIterator* _tmp88_ = NULL;
-			gboolean _tmp89_ = FALSE;
+#line 36737 "Photo.c"
+			GeeIterator* _tmp88_;
+			gboolean _tmp89_;
 			Tag* tag = NULL;
-			GeeIterator* _tmp90_ = NULL;
-			gpointer _tmp91_ = NULL;
-			Tag* _tmp92_ = NULL;
-			GeeHashMultiMap* _tmp93_ = NULL;
-			Tag* _tmp94_ = NULL;
-			GeeCollection* _tmp95_ = NULL;
-			GeeCollection* _tmp96_ = NULL;
+			GeeIterator* _tmp90_;
+			gpointer _tmp91_;
+			Tag* _tmp92_;
+			GeeHashMultiMap* _tmp93_;
+			Tag* _tmp94_;
+			GeeCollection* _tmp95_;
+			GeeCollection* _tmp96_;
 #line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp88_ = _tag_it;
 #line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36779,7 +36757,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			if (!_tmp89_) {
 #line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 36778 "Photo.c"
+#line 36756 "Photo.c"
 			}
 #line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp90_ = _tag_it;
@@ -36803,11 +36781,11 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			_g_object_unref0 (_tmp96_);
 #line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (tag);
-#line 36802 "Photo.c"
+#line 36780 "Photo.c"
 		}
 #line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tag_it);
-#line 36806 "Photo.c"
+#line 36784 "Photo.c"
 	}
 #line 4733 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp97_ = media_sources;
@@ -36815,13 +36793,13 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 	MEDIA_SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->postprocess_imported_media (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp97_);
 #line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (map);
-#line 36814 "Photo.c"
+#line 36792 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoMetadata* _tmp1_ = NULL;
+	LibraryPhoto* _tmp0_;
+	PhotoMetadata* _tmp1_;
 #line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
 #line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36831,8 +36809,8 @@ static void library_photo_source_collection_real_notify_master_reimported (Libra
 #line 4738 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
 #line 4738 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_emit_by_name (self, "master-reimported", _tmp0_, _tmp1_);
-#line 36831 "Photo.c"
+	g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_MASTER_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 36809 "Photo.c"
 }
 
 
@@ -36841,13 +36819,13 @@ void library_photo_source_collection_notify_master_reimported (LibraryPhotoSourc
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
 #line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_master_reimported (self, photo, metadata);
-#line 36840 "Photo.c"
+#line 36818 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoMetadata* _tmp1_ = NULL;
+	LibraryPhoto* _tmp0_;
+	PhotoMetadata* _tmp1_;
 #line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
 #line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36857,8 +36835,8 @@ static void library_photo_source_collection_real_notify_editable_reimported (Lib
 #line 4743 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
 #line 4743 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_emit_by_name (self, "editable-reimported", _tmp0_, _tmp1_);
-#line 36857 "Photo.c"
+	g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_EDITABLE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 36835 "Photo.c"
 }
 
 
@@ -36867,13 +36845,13 @@ void library_photo_source_collection_notify_editable_reimported (LibraryPhotoSou
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
 #line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_editable_reimported (self, photo, metadata);
-#line 36866 "Photo.c"
+#line 36844 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoMetadata* _tmp1_ = NULL;
+	LibraryPhoto* _tmp0_;
+	PhotoMetadata* _tmp1_;
 #line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
 #line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36883,8 +36861,8 @@ static void library_photo_source_collection_real_notify_source_reimported (Libra
 #line 4748 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
 #line 4748 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_emit_by_name (self, "source-reimported", _tmp0_, _tmp1_);
-#line 36883 "Photo.c"
+	g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 36861 "Photo.c"
 }
 
 
@@ -36893,13 +36871,13 @@ void library_photo_source_collection_notify_source_reimported (LibraryPhotoSourc
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
 #line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_source_reimported (self, photo, metadata);
-#line 36892 "Photo.c"
+#line 36870 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoMetadata* _tmp1_ = NULL;
+	LibraryPhoto* _tmp0_;
+	PhotoMetadata* _tmp1_;
 #line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
 #line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36909,8 +36887,8 @@ static void library_photo_source_collection_real_notify_baseline_reimported (Lib
 #line 4753 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
 #line 4753 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_emit_by_name (self, "baseline-reimported", _tmp0_, _tmp1_);
-#line 36909 "Photo.c"
+	g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 36887 "Photo.c"
 }
 
 
@@ -36919,16 +36897,16 @@ void library_photo_source_collection_notify_baseline_reimported (LibraryPhotoSou
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
 #line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_baseline_reimported (self, photo, metadata);
-#line 36918 "Photo.c"
+#line 36896 "Photo.c"
 }
 
 
 static MediaSource* library_photo_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base, gint64 numeric_id) {
 	LibraryPhotoSourceCollection * self;
 	MediaSource* result = NULL;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 	PhotoID _tmp1_ = {0};
-	LibraryPhoto* _tmp2_ = NULL;
+	LibraryPhoto* _tmp2_;
 #line 4756 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
 #line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36941,13 +36919,13 @@ static MediaSource* library_photo_source_collection_real_fetch_by_numeric_id (Me
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource);
 #line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 36940 "Photo.c"
+#line 36918 "Photo.c"
 }
 
 
 static void library_photo_source_collection_on_trashcan_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp1_;
 #line 4760 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
 #line 4760 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36960,14 +36938,14 @@ static void library_photo_source_collection_on_trashcan_contents_altered (Librar
 	_tmp1_ = removed;
 #line 4762 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 36959 "Photo.c"
+#line 36937 "Photo.c"
 }
 
 
 static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryPhotoSourceCollection* self, DataSource* source, Alteration* alteration) {
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	DataSource* _tmp0_;
+	gboolean _tmp1_;
 #line 4766 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE);
 #line 4766 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36982,13 +36960,13 @@ static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryP
 	result = _tmp1_;
 #line 4767 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 36981 "Photo.c"
+#line 36959 "Photo.c"
 }
 
 
 static void library_photo_source_collection_on_offline_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp1_;
 #line 4770 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
 #line 4770 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37001,14 +36979,14 @@ static void library_photo_source_collection_on_offline_contents_altered (Library
 	_tmp1_ = removed;
 #line 4772 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 37000 "Photo.c"
+#line 36978 "Photo.c"
 }
 
 
 static gboolean library_photo_source_collection_check_if_offline_photo (LibraryPhotoSourceCollection* self, DataSource* source, Alteration* alteration) {
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	DataSource* _tmp0_;
+	gboolean _tmp1_;
 #line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE);
 #line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37023,50 +37001,50 @@ static gboolean library_photo_source_collection_check_if_offline_photo (LibraryP
 	result = _tmp1_;
 #line 4777 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37022 "Photo.c"
+#line 37000 "Photo.c"
 }
 
 
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 37045 "Photo.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 37023 "Photo.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 37053 "Photo.c"
+#line 37031 "Photo.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 37065 "Photo.c"
+#line 37043 "Photo.c"
 	}
 }
 
@@ -37075,138 +37053,138 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 37089 "Photo.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 37067 "Photo.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 37095 "Photo.c"
+#line 37073 "Photo.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 37099 "Photo.c"
+#line 37077 "Photo.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 37103 "Photo.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 37081 "Photo.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 37115 "Photo.c"
+#line 37093 "Photo.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 37125 "Photo.c"
+#line 37103 "Photo.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 37131 "Photo.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 37109 "Photo.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 37145 "Photo.c"
+#line 37123 "Photo.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 37155 "Photo.c"
+#line 37133 "Photo.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 37161 "Photo.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 37139 "Photo.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 37170 "Photo.c"
+#line 37148 "Photo.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 37190 "Photo.c"
+#line 37168 "Photo.c"
 }
 
 
 static MediaSource* library_photo_source_collection_real_fetch_by_source_id (MediaSourceCollection* base, const gchar* source_id) {
 	LibraryPhotoSourceCollection * self;
 	MediaSource* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 	gchar* numeric_only = NULL;
-	const gchar* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gchar* _tmp5_ = NULL;
-	gint64 _tmp6_ = 0LL;
-	MediaSource* _tmp7_ = NULL;
+	const gchar* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gchar* _tmp5_;
+	gint64 _tmp6_;
+	MediaSource* _tmp7_;
 #line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
 #line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37237,18 +37215,18 @@ static MediaSource* library_photo_source_collection_real_fetch_by_source_id (Med
 	_g_free0 (numeric_only);
 #line 4784 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37236 "Photo.c"
+#line 37214 "Photo.c"
 }
 
 
 static GeeCollection* library_photo_source_collection_real_get_event_source_ids (MediaSourceCollection* base, EventID* event_id) {
 	LibraryPhotoSourceCollection * self;
 	GeeCollection* result = NULL;
-	PhotoTable* _tmp0_ = NULL;
-	PhotoTable* _tmp1_ = NULL;
-	EventID _tmp2_ = {0};
-	GeeArrayList* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
+	PhotoTable* _tmp0_;
+	PhotoTable* _tmp1_;
+	EventID _tmp2_;
+	GeeArrayList* _tmp3_;
+	GeeCollection* _tmp4_;
 #line 4787 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
 #line 4787 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37269,15 +37247,15 @@ static GeeCollection* library_photo_source_collection_real_get_event_source_ids
 	result = _tmp4_;
 #line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37268 "Photo.c"
+#line 37246 "Photo.c"
 }
 
 
 LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, PhotoID* photo_id) {
 	LibraryPhoto* result = NULL;
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	DataSource* _tmp2_ = NULL;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	DataSource* _tmp2_;
 #line 4791 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
 #line 4791 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37292,15 +37270,15 @@ LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollectio
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 4792 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37291 "Photo.c"
+#line 37269 "Photo.c"
 }
 
 
 LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPhotoSourceCollection* self, GFile* file) {
 	LibraryPhoto* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gpointer _tmp2_;
 #line 4795 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
 #line 4795 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37315,15 +37293,15 @@ LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPho
 	result = (LibraryPhoto*) _tmp2_;
 #line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37314 "Photo.c"
+#line 37292 "Photo.c"
 }
 
 
 LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (LibraryPhotoSourceCollection* self, GFile* file) {
 	LibraryPhoto* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gpointer _tmp2_;
 #line 4799 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
 #line 4799 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37338,26 +37316,26 @@ LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (Lib
 	result = (LibraryPhoto*) _tmp2_;
 #line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37337 "Photo.c"
+#line 37315 "Photo.c"
 }
 
 
 static void library_photo_source_collection_compare_backing (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, GFileInfo* info, GeeCollection* matches_master, GeeCollection* matches_editable, GeeCollection* matches_development) {
-	LibraryPhoto* _tmp0_ = NULL;
-	BackingPhotoRow* _tmp1_ = NULL;
-	BackingPhotoRow* _tmp2_ = NULL;
-	GFileInfo* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	LibraryPhoto* _tmp0_;
+	BackingPhotoRow* _tmp1_;
+	BackingPhotoRow* _tmp2_;
+	GFileInfo* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
 	BackingPhotoRow* editable = NULL;
-	LibraryPhoto* _tmp8_ = NULL;
-	BackingPhotoRow* _tmp9_ = NULL;
+	LibraryPhoto* _tmp8_;
+	BackingPhotoRow* _tmp9_;
 	gboolean _tmp10_ = FALSE;
-	BackingPhotoRow* _tmp11_ = NULL;
+	BackingPhotoRow* _tmp11_;
 	GeeCollection* development = NULL;
-	LibraryPhoto* _tmp17_ = NULL;
-	GeeCollection* _tmp18_ = NULL;
-	GeeCollection* _tmp19_ = NULL;
+	LibraryPhoto* _tmp17_;
+	GeeCollection* _tmp18_;
+	GeeCollection* _tmp19_;
 #line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
 #line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37386,16 +37364,16 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 	_backing_photo_row_unref0 (_tmp2_);
 #line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 37385 "Photo.c"
-		GeeCollection* _tmp6_ = NULL;
-		LibraryPhoto* _tmp7_ = NULL;
+#line 37363 "Photo.c"
+		GeeCollection* _tmp6_;
+		LibraryPhoto* _tmp7_;
 #line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = matches_master;
 #line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = photo;
 #line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_collection_add (_tmp6_, _tmp7_);
-#line 37394 "Photo.c"
+#line 37372 "Photo.c"
 	}
 #line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo;
@@ -37407,10 +37385,10 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 	_tmp11_ = editable;
 #line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_ != NULL) {
-#line 37406 "Photo.c"
-		BackingPhotoRow* _tmp12_ = NULL;
-		GFileInfo* _tmp13_ = NULL;
-		gboolean _tmp14_ = FALSE;
+#line 37384 "Photo.c"
+		BackingPhotoRow* _tmp12_;
+		GFileInfo* _tmp13_;
+		gboolean _tmp14_;
 #line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = editable;
 #line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37419,24 +37397,24 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 		_tmp14_ = backing_photo_row_matches_file_info (_tmp12_, _tmp13_);
 #line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp14_;
-#line 37418 "Photo.c"
+#line 37396 "Photo.c"
 	} else {
 #line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = FALSE;
-#line 37422 "Photo.c"
+#line 37400 "Photo.c"
 	}
 #line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
-#line 37426 "Photo.c"
-		GeeCollection* _tmp15_ = NULL;
-		LibraryPhoto* _tmp16_ = NULL;
+#line 37404 "Photo.c"
+		GeeCollection* _tmp15_;
+		LibraryPhoto* _tmp16_;
 #line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = matches_editable;
 #line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = photo;
 #line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_collection_add (_tmp15_, _tmp16_);
-#line 37435 "Photo.c"
+#line 37413 "Photo.c"
 	}
 #line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = photo;
@@ -37448,11 +37426,11 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 	_tmp19_ = development;
 #line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_ != NULL) {
-#line 37447 "Photo.c"
+#line 37425 "Photo.c"
 		{
 			GeeIterator* _row_it = NULL;
-			GeeCollection* _tmp20_ = NULL;
-			GeeIterator* _tmp21_ = NULL;
+			GeeCollection* _tmp20_;
+			GeeIterator* _tmp21_;
 #line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = development;
 #line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37461,15 +37439,15 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 			_row_it = _tmp21_;
 #line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 37460 "Photo.c"
-				GeeIterator* _tmp22_ = NULL;
-				gboolean _tmp23_ = FALSE;
+#line 37438 "Photo.c"
+				GeeIterator* _tmp22_;
+				gboolean _tmp23_;
 				BackingPhotoRow* row = NULL;
-				GeeIterator* _tmp24_ = NULL;
-				gpointer _tmp25_ = NULL;
-				BackingPhotoRow* _tmp26_ = NULL;
-				GFileInfo* _tmp27_ = NULL;
-				gboolean _tmp28_ = FALSE;
+				GeeIterator* _tmp24_;
+				gpointer _tmp25_;
+				BackingPhotoRow* _tmp26_;
+				GFileInfo* _tmp27_;
+				gboolean _tmp28_;
 #line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = _row_it;
 #line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37478,7 +37456,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 				if (!_tmp23_) {
 #line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 37477 "Photo.c"
+#line 37455 "Photo.c"
 				}
 #line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = _row_it;
@@ -37494,9 +37472,9 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 				_tmp28_ = backing_photo_row_matches_file_info (_tmp26_, _tmp27_);
 #line 4816 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp28_) {
-#line 37493 "Photo.c"
-					GeeCollection* _tmp29_ = NULL;
-					LibraryPhoto* _tmp30_ = NULL;
+#line 37471 "Photo.c"
+					GeeCollection* _tmp29_;
+					LibraryPhoto* _tmp30_;
 #line 4817 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp29_ = matches_development;
 #line 4817 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37507,22 +37485,22 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 					_backing_photo_row_unref0 (row);
 #line 4819 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 37506 "Photo.c"
+#line 37484 "Photo.c"
 				}
 #line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (row);
-#line 37510 "Photo.c"
+#line 37488 "Photo.c"
 			}
 #line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_row_it);
-#line 37514 "Photo.c"
+#line 37492 "Photo.c"
 		}
 	}
 #line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (development);
 #line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (editable);
-#line 37521 "Photo.c"
+#line 37499 "Photo.c"
 }
 
 
@@ -37537,16 +37515,16 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 	g_return_if_fail (GEE_IS_COLLECTION (matches_editable));
 #line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matched_development));
-#line 37536 "Photo.c"
+#line 37514 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
-		GeeMultiMap* _tmp0_ = NULL;
-		GFileInfo* _tmp1_ = NULL;
-		gint64 _tmp2_ = 0LL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
+		GeeMultiMap* _tmp0_;
+		GFileInfo* _tmp1_;
+		gint64 _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeCollection* _tmp4_;
+		GeeIterator* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->filesize_to_photo;
 #line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37567,17 +37545,17 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 		_photo_it = _tmp6_;
 #line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 37566 "Photo.c"
-			GeeIterator* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+#line 37544 "Photo.c"
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			LibraryPhoto* photo = NULL;
-			GeeIterator* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
-			LibraryPhoto* _tmp11_ = NULL;
-			GFileInfo* _tmp12_ = NULL;
-			GeeCollection* _tmp13_ = NULL;
-			GeeCollection* _tmp14_ = NULL;
-			GeeCollection* _tmp15_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
+			LibraryPhoto* _tmp11_;
+			GFileInfo* _tmp12_;
+			GeeCollection* _tmp13_;
+			GeeCollection* _tmp14_;
+			GeeCollection* _tmp15_;
 #line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _photo_it;
 #line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37586,7 +37564,7 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 			if (!_tmp8_) {
 #line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37585 "Photo.c"
+#line 37563 "Photo.c"
 			}
 #line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _photo_it;
@@ -37608,18 +37586,18 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 			library_photo_source_collection_compare_backing (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_, _tmp15_);
 #line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 37607 "Photo.c"
+#line 37585 "Photo.c"
 		}
 #line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 37611 "Photo.c"
+#line 37589 "Photo.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
-		GeeCollection* _tmp16_ = NULL;
-		GeeCollection* _tmp17_ = NULL;
-		GeeIterator* _tmp18_ = NULL;
-		GeeIterator* _tmp19_ = NULL;
+		GeeCollection* _tmp16_;
+		GeeCollection* _tmp17_;
+		GeeIterator* _tmp18_;
+		GeeIterator* _tmp19_;
 #line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = media_source_collection_get_offline_bin_contents (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37634,17 +37612,17 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 		_media_it = _tmp19_;
 #line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 37633 "Photo.c"
-			GeeIterator* _tmp20_ = NULL;
-			gboolean _tmp21_ = FALSE;
+#line 37611 "Photo.c"
+			GeeIterator* _tmp20_;
+			gboolean _tmp21_;
 			MediaSource* media = NULL;
-			GeeIterator* _tmp22_ = NULL;
-			gpointer _tmp23_ = NULL;
-			MediaSource* _tmp24_ = NULL;
-			GFileInfo* _tmp25_ = NULL;
-			GeeCollection* _tmp26_ = NULL;
-			GeeCollection* _tmp27_ = NULL;
-			GeeCollection* _tmp28_ = NULL;
+			GeeIterator* _tmp22_;
+			gpointer _tmp23_;
+			MediaSource* _tmp24_;
+			GFileInfo* _tmp25_;
+			GeeCollection* _tmp26_;
+			GeeCollection* _tmp27_;
+			GeeCollection* _tmp28_;
 #line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = _media_it;
 #line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37653,7 +37631,7 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 			if (!_tmp21_) {
 #line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37652 "Photo.c"
+#line 37630 "Photo.c"
 			}
 #line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = _media_it;
@@ -37675,11 +37653,11 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 			library_photo_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_LIBRARY_PHOTO, LibraryPhoto), _tmp25_, _tmp26_, _tmp27_, _tmp28_);
 #line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (media);
-#line 37674 "Photo.c"
+#line 37652 "Photo.c"
 		}
 #line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 37678 "Photo.c"
+#line 37656 "Photo.c"
 	}
 }
 
@@ -37690,15 +37668,15 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
 #line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (basename != NULL);
-#line 37689 "Photo.c"
+#line 37667 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
-		GeeMultiMap* _tmp0_ = NULL;
-		gint64 _tmp1_ = 0LL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMultiMap* _tmp0_;
+		gint64 _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->filesize_to_photo;
 #line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37717,19 +37695,19 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 		_photo_it = _tmp5_;
 #line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 37716 "Photo.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 37694 "Photo.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			LibraryPhoto* photo = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			LibraryPhoto* _tmp10_ = NULL;
-			GFile* _tmp11_ = NULL;
-			GFile* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			gint _tmp15_ = 0;
-			gboolean _tmp16_ = FALSE;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			LibraryPhoto* _tmp10_;
+			GFile* _tmp11_;
+			GFile* _tmp12_;
+			gchar* _tmp13_;
+			const gchar* _tmp14_;
+			gint _tmp15_;
+			gboolean _tmp16_;
 #line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _photo_it;
 #line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37738,7 +37716,7 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 			if (!_tmp7_) {
 #line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37737 "Photo.c"
+#line 37715 "Photo.c"
 			}
 #line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _photo_it;
@@ -37764,8 +37742,8 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 			_g_object_unref0 (_tmp12_);
 #line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp16_) {
-#line 37763 "Photo.c"
-				LibraryPhoto* _tmp17_ = NULL;
+#line 37741 "Photo.c"
+				LibraryPhoto* _tmp17_;
 				PhotoID _tmp18_ = {0};
 #line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = photo;
@@ -37779,15 +37757,15 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 				_g_object_unref0 (_photo_it);
 #line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 37778 "Photo.c"
+#line 37756 "Photo.c"
 			}
 #line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 37782 "Photo.c"
+#line 37760 "Photo.c"
 		}
 #line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 37786 "Photo.c"
+#line 37764 "Photo.c"
 	}
 #line 4842 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id_init (&_tmp19_, PHOTO_ID_INVALID);
@@ -37795,16 +37773,16 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 	*result = _tmp19_;
 #line 4842 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 37794 "Photo.c"
+#line 37772 "Photo.c"
 }
 
 
 gboolean library_photo_source_collection_has_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
+	const gchar* _tmp0_;
+	gint64 _tmp1_;
 	PhotoID _tmp2_ = {0};
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp3_;
 #line 4846 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE);
 #line 4846 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37821,19 +37799,19 @@ gboolean library_photo_source_collection_has_basename_filesize_duplicate (Librar
 	result = _tmp3_;
 #line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37820 "Photo.c"
+#line 37798 "Photo.c"
 }
 
 
 LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoSourceCollection* self, GFile* file) {
 	LibraryPhoto* result = NULL;
 	LibraryPhoto* photo = NULL;
-	MediaSourceHoldingTank* _tmp0_ = NULL;
-	MediaSourceHoldingTank* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	MediaSource* _tmp3_ = NULL;
-	LibraryPhoto* _tmp4_ = NULL;
-	LibraryPhoto* _tmp5_ = NULL;
+	MediaSourceHoldingTank* _tmp0_;
+	MediaSourceHoldingTank* _tmp1_;
+	GFile* _tmp2_;
+	MediaSource* _tmp3_;
+	LibraryPhoto* _tmp4_;
+	LibraryPhoto* _tmp5_;
 #line 4850 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
 #line 4850 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37856,11 +37834,11 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoS
 	_tmp5_ = photo;
 #line 4852 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ == NULL) {
-#line 37855 "Photo.c"
-		MediaSourceHoldingTank* _tmp6_ = NULL;
-		LibraryPhotoSourceHoldingTank* _tmp7_ = NULL;
-		GFile* _tmp8_ = NULL;
-		LibraryPhoto* _tmp9_ = NULL;
+#line 37833 "Photo.c"
+		MediaSourceHoldingTank* _tmp6_;
+		LibraryPhotoSourceHoldingTank* _tmp7_;
+		GFile* _tmp8_;
+		LibraryPhoto* _tmp9_;
 #line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37875,23 +37853,23 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoS
 		photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_source_holding_tank_unref0 (_tmp7_);
-#line 37874 "Photo.c"
+#line 37852 "Photo.c"
 	}
 #line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = photo;
 #line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37880 "Photo.c"
+#line 37858 "Photo.c"
 }
 
 
 LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSourceCollection* self, const gchar* md5) {
 	LibraryPhoto* result = NULL;
-	MediaSourceHoldingTank* _tmp0_ = NULL;
-	MediaSourceHoldingTank* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	MediaSource* _tmp3_ = NULL;
-	LibraryPhoto* _tmp4_ = NULL;
+	MediaSourceHoldingTank* _tmp0_;
+	MediaSourceHoldingTank* _tmp1_;
+	const gchar* _tmp2_;
+	MediaSource* _tmp3_;
+	LibraryPhoto* _tmp4_;
 #line 4859 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
 #line 4859 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37912,19 +37890,19 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSo
 	result = _tmp4_;
 #line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37911 "Photo.c"
+#line 37889 "Photo.c"
 }
 
 
 LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoSourceCollection* self, GFile* file) {
 	LibraryPhoto* result = NULL;
 	LibraryPhoto* photo = NULL;
-	MediaSourceHoldingTank* _tmp0_ = NULL;
-	MediaSourceHoldingTank* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	MediaSource* _tmp3_ = NULL;
-	LibraryPhoto* _tmp4_ = NULL;
-	LibraryPhoto* _tmp5_ = NULL;
+	MediaSourceHoldingTank* _tmp0_;
+	MediaSourceHoldingTank* _tmp1_;
+	GFile* _tmp2_;
+	MediaSource* _tmp3_;
+	LibraryPhoto* _tmp4_;
+	LibraryPhoto* _tmp5_;
 #line 4863 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
 #line 4863 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37947,11 +37925,11 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoS
 	_tmp5_ = photo;
 #line 4865 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ == NULL) {
-#line 37946 "Photo.c"
-		MediaSourceHoldingTank* _tmp6_ = NULL;
-		LibraryPhotoSourceHoldingTank* _tmp7_ = NULL;
-		GFile* _tmp8_ = NULL;
-		LibraryPhoto* _tmp9_ = NULL;
+#line 37924 "Photo.c"
+		MediaSourceHoldingTank* _tmp6_;
+		LibraryPhotoSourceHoldingTank* _tmp7_;
+		GFile* _tmp8_;
+		LibraryPhoto* _tmp9_;
 #line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37966,23 +37944,23 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoS
 		photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 		_source_holding_tank_unref0 (_tmp7_);
-#line 37965 "Photo.c"
+#line 37943 "Photo.c"
 	}
 #line 4869 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = photo;
 #line 4869 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37971 "Photo.c"
+#line 37949 "Photo.c"
 }
 
 
 LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSourceCollection* self, const gchar* md5) {
 	LibraryPhoto* result = NULL;
-	MediaSourceHoldingTank* _tmp0_ = NULL;
-	MediaSourceHoldingTank* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	MediaSource* _tmp3_ = NULL;
-	LibraryPhoto* _tmp4_ = NULL;
+	MediaSourceHoldingTank* _tmp0_;
+	MediaSourceHoldingTank* _tmp1_;
+	const gchar* _tmp2_;
+	MediaSource* _tmp3_;
+	LibraryPhoto* _tmp4_;
 #line 4872 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
 #line 4872 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38003,16 +37981,16 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSo
 	result = _tmp4_;
 #line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38002 "Photo.c"
+#line 37980 "Photo.c"
 }
 
 
 gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollection* self) {
 	gint result = 0;
-	MediaSourceHoldingTank* _tmp0_ = NULL;
-	MediaSourceHoldingTank* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	MediaSourceHoldingTank* _tmp0_;
+	MediaSourceHoldingTank* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 4876 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), 0);
 #line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38029,7 +38007,7 @@ gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollec
 	result = _tmp3_;
 #line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38028 "Photo.c"
+#line 38006 "Photo.c"
 }
 
 
@@ -38037,23 +38015,23 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 	LibraryPhotoSourceCollectionState _vala_state = 0;
 	LibraryPhoto* result = NULL;
 	LibraryPhoto* photo = NULL;
-	GFile* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	LibraryPhoto* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	LibraryPhoto* _tmp4_ = NULL;
-	LibraryPhoto* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	LibraryPhoto* _tmp7_ = NULL;
-	LibraryPhoto* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	LibraryPhoto* _tmp10_ = NULL;
-	LibraryPhoto* _tmp11_ = NULL;
-	LibraryPhoto* _tmp12_ = NULL;
-	GFile* _tmp13_ = NULL;
-	LibraryPhoto* _tmp14_ = NULL;
-	LibraryPhoto* _tmp15_ = NULL;
-	LibraryPhoto* _tmp16_ = NULL;
+	GFile* _tmp0_;
+	MediaSource* _tmp1_;
+	LibraryPhoto* _tmp2_;
+	GFile* _tmp3_;
+	LibraryPhoto* _tmp4_;
+	LibraryPhoto* _tmp5_;
+	GFile* _tmp6_;
+	LibraryPhoto* _tmp7_;
+	LibraryPhoto* _tmp8_;
+	GFile* _tmp9_;
+	LibraryPhoto* _tmp10_;
+	LibraryPhoto* _tmp11_;
+	LibraryPhoto* _tmp12_;
+	GFile* _tmp13_;
+	LibraryPhoto* _tmp14_;
+	LibraryPhoto* _tmp15_;
+	LibraryPhoto* _tmp16_;
 #line 4880 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
 #line 4880 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38076,11 +38054,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 		if (state) {
 #line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38075 "Photo.c"
+#line 38053 "Photo.c"
 		}
 #line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38079 "Photo.c"
+#line 38057 "Photo.c"
 	}
 #line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file;
@@ -38102,11 +38080,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 		if (state) {
 #line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38101 "Photo.c"
+#line 38079 "Photo.c"
 		}
 #line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38105 "Photo.c"
+#line 38083 "Photo.c"
 	}
 #line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = file;
@@ -38128,11 +38106,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 		if (state) {
 #line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38127 "Photo.c"
+#line 38105 "Photo.c"
 		}
 #line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38131 "Photo.c"
+#line 38109 "Photo.c"
 	}
 #line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = file;
@@ -38144,7 +38122,7 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 	if (_tmp11_ == NULL) {
 #line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp10_);
-#line 38143 "Photo.c"
+#line 38121 "Photo.c"
 	}
 #line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
@@ -38162,11 +38140,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 		if (state) {
 #line 4906 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38161 "Photo.c"
+#line 38139 "Photo.c"
 		}
 #line 4906 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38165 "Photo.c"
+#line 38143 "Photo.c"
 	}
 #line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = file;
@@ -38178,7 +38156,7 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 	if (_tmp15_ == NULL) {
 #line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp14_);
-#line 38177 "Photo.c"
+#line 38155 "Photo.c"
 	}
 #line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
@@ -38196,11 +38174,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 		if (state) {
 #line 4913 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38195 "Photo.c"
+#line 38173 "Photo.c"
 		}
 #line 4913 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38199 "Photo.c"
+#line 38177 "Photo.c"
 	}
 #line 4916 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN;
@@ -38212,29 +38190,29 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 	if (state) {
 #line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 38211 "Photo.c"
+#line 38189 "Photo.c"
 	}
 #line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38215 "Photo.c"
+#line 38193 "Photo.c"
 }
 
 
 static gboolean library_photo_source_collection_real_has_backlink (SourceCollection* base, SourceBacklink* backlink) {
 	LibraryPhotoSourceCollection * self;
 	gboolean result = FALSE;
-	SourceBacklink* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	MediaSourceHoldingTank* _tmp2_ = NULL;
-	MediaSourceHoldingTank* _tmp3_ = NULL;
-	SourceBacklink* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	MediaSourceHoldingTank* _tmp7_ = NULL;
-	MediaSourceHoldingTank* _tmp8_ = NULL;
-	SourceBacklink* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	gboolean _tmp11_ = FALSE;
+	SourceBacklink* _tmp0_;
+	gboolean _tmp1_;
+	MediaSourceHoldingTank* _tmp2_;
+	MediaSourceHoldingTank* _tmp3_;
+	SourceBacklink* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	MediaSourceHoldingTank* _tmp7_;
+	MediaSourceHoldingTank* _tmp8_;
+	SourceBacklink* _tmp9_;
+	gboolean _tmp10_;
+	gboolean _tmp11_;
 #line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
 #line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38249,7 +38227,7 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect
 		result = TRUE;
 #line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38248 "Photo.c"
+#line 38226 "Photo.c"
 	}
 #line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
@@ -38269,7 +38247,7 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect
 		result = TRUE;
 #line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38268 "Photo.c"
+#line 38246 "Photo.c"
 	}
 #line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
@@ -38289,25 +38267,25 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect
 		result = TRUE;
 #line 4929 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38288 "Photo.c"
+#line 38266 "Photo.c"
 	}
 #line 4931 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = FALSE;
 #line 4931 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38294 "Photo.c"
+#line 38272 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_remove_backlink (SourceCollection* base, SourceBacklink* backlink) {
 	LibraryPhotoSourceCollection * self;
-	MediaSourceHoldingTank* _tmp0_ = NULL;
-	MediaSourceHoldingTank* _tmp1_ = NULL;
-	SourceBacklink* _tmp2_ = NULL;
-	MediaSourceHoldingTank* _tmp3_ = NULL;
-	MediaSourceHoldingTank* _tmp4_ = NULL;
-	SourceBacklink* _tmp5_ = NULL;
-	SourceBacklink* _tmp6_ = NULL;
+	MediaSourceHoldingTank* _tmp0_;
+	MediaSourceHoldingTank* _tmp1_;
+	SourceBacklink* _tmp2_;
+	MediaSourceHoldingTank* _tmp3_;
+	MediaSourceHoldingTank* _tmp4_;
+	SourceBacklink* _tmp5_;
+	SourceBacklink* _tmp6_;
 #line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
 #line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38336,30 +38314,30 @@ static void library_photo_source_collection_real_remove_backlink (SourceCollecti
 	_tmp6_ = backlink;
 #line 4938 "/home/jens/Source/shotwell/src/Photo.vala"
 	SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_);
-#line 38335 "Photo.c"
+#line 38313 "Photo.c"
 }
 
 
 static TransactionController* library_photo_source_collection_real_get_transaction_controller (MediaSourceCollection* base) {
 	TransactionController* result;
 	LibraryPhotoSourceCollection* self;
-	TransactionController* _tmp0_ = NULL;
-	TransactionController* _tmp2_ = NULL;
+	TransactionController* _tmp0_;
+	TransactionController* _tmp2_;
 #line 4455 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
 #line 4456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->_transaction_controller;
 #line 4456 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ == NULL) {
-#line 38350 "Photo.c"
-		MediaSourceTransactionController* _tmp1_ = NULL;
+#line 38328 "Photo.c"
+		MediaSourceTransactionController* _tmp1_;
 #line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = media_source_transaction_controller_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
 		_transaction_controller_unref0 (self->priv->_transaction_controller);
 #line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
 		self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController);
-#line 38358 "Photo.c"
+#line 38336 "Photo.c"
 	}
 #line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = self->priv->_transaction_controller;
@@ -38367,7 +38345,7 @@ static TransactionController* library_photo_source_collection_real_get_transacti
 	result = _tmp2_;
 #line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38366 "Photo.c"
+#line 38344 "Photo.c"
 }
 
 
@@ -38376,7 +38354,7 @@ static void library_photo_source_collection_real_master_reimported (LibraryPhoto
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
 #line 4477 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38375 "Photo.c"
+#line 38353 "Photo.c"
 }
 
 
@@ -38395,19 +38373,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * clos
 		data1 = closure->data;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 38394 "Photo.c"
+#line 38372 "Photo.c"
 	} else {
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = closure->data;
-#line 38400 "Photo.c"
+#line 38378 "Photo.c"
 	}
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_MEDIA_METADATA) (marshal_data ? marshal_data : cc->callback);
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback (data1, g_value_get_object (param_values + 1), value_get_media_metadata (param_values + 2), data2);
-#line 38406 "Photo.c"
+#line 38384 "Photo.c"
 }
 
 
@@ -38416,7 +38394,7 @@ static void library_photo_source_collection_real_editable_reimported (LibraryPho
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
 #line 4480 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38415 "Photo.c"
+#line 38393 "Photo.c"
 }
 
 
@@ -38425,7 +38403,7 @@ static void library_photo_source_collection_real_baseline_reimported (LibraryPho
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
 #line 4483 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38424 "Photo.c"
+#line 38402 "Photo.c"
 }
 
 
@@ -38434,7 +38412,7 @@ static void library_photo_source_collection_real_source_reimported (LibraryPhoto
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
 #line 4486 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38433 "Photo.c"
+#line 38411 "Photo.c"
 }
 
 
@@ -38446,41 +38424,41 @@ static void library_photo_source_collection_class_init (LibraryPhotoSourceCollec
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_type_class_add_private (klass, sizeof (LibraryPhotoSourceCollectionPrivate));
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceCollectionClass *) klass)->create_trashcan = (MediaSourceHoldingTank* (*)(MediaSourceCollection*)) library_photo_source_collection_real_create_trashcan;
+	((MediaSourceCollectionClass *) klass)->create_trashcan = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) library_photo_source_collection_real_create_trashcan;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceCollectionClass *) klass)->create_offline_bin = (MediaSourceHoldingTank* (*)(MediaSourceCollection*)) library_photo_source_collection_real_create_offline_bin;
+	((MediaSourceCollectionClass *) klass)->create_offline_bin = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) library_photo_source_collection_real_create_offline_bin;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceCollectionClass *) klass)->create_media_monitor = (MediaMonitor* (*)(MediaSourceCollection*, Workers*, GCancellable*)) library_photo_source_collection_real_create_media_monitor;
+	((MediaSourceCollectionClass *) klass)->create_media_monitor = (MediaMonitor* (*) (MediaSourceCollection *, Workers*, GCancellable*)) library_photo_source_collection_real_create_media_monitor;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) library_photo_source_collection_real_holds_type_of_source;
+	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) library_photo_source_collection_real_holds_type_of_source;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceCollectionClass *) klass)->get_typename = (gchar* (*)(MediaSourceCollection*)) library_photo_source_collection_real_get_typename;
+	((MediaSourceCollectionClass *) klass)->get_typename = (gchar* (*) (MediaSourceCollection *)) library_photo_source_collection_real_get_typename;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceCollectionClass *) klass)->is_file_recognized = (gboolean (*)(MediaSourceCollection*, GFile*)) library_photo_source_collection_real_is_file_recognized;
+	((MediaSourceCollectionClass *) klass)->is_file_recognized = (gboolean (*) (MediaSourceCollection *, GFile*)) library_photo_source_collection_real_is_file_recognized;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((DataCollectionClass *) klass)->notify_contents_altered = (void (*)(DataCollection*, GeeIterable*, GeeIterable*)) library_photo_source_collection_real_notify_contents_altered;
+	((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) library_photo_source_collection_real_notify_contents_altered;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((DataCollectionClass *) klass)->items_altered = (void (*)(DataCollection*, GeeMap*)) library_photo_source_collection_real_items_altered;
+	((DataCollectionClass *) klass)->items_altered = (void (*) (DataCollection *, GeeMap*)) library_photo_source_collection_real_items_altered;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceCollectionClass *) klass)->postprocess_imported_media = (void (*)(MediaSourceCollection*, GeeCollection*)) library_photo_source_collection_real_postprocess_imported_media;
+	((MediaSourceCollectionClass *) klass)->postprocess_imported_media = (void (*) (MediaSourceCollection *, GeeCollection*)) library_photo_source_collection_real_postprocess_imported_media;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((LibraryPhotoSourceCollectionClass *) klass)->notify_master_reimported = (void (*)(LibraryPhotoSourceCollection*, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_master_reimported;
+	((LibraryPhotoSourceCollectionClass *) klass)->notify_master_reimported = (void (*) (LibraryPhotoSourceCollection *, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_master_reimported;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((LibraryPhotoSourceCollectionClass *) klass)->notify_editable_reimported = (void (*)(LibraryPhotoSourceCollection*, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_editable_reimported;
+	((LibraryPhotoSourceCollectionClass *) klass)->notify_editable_reimported = (void (*) (LibraryPhotoSourceCollection *, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_editable_reimported;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((LibraryPhotoSourceCollectionClass *) klass)->notify_source_reimported = (void (*)(LibraryPhotoSourceCollection*, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_source_reimported;
+	((LibraryPhotoSourceCollectionClass *) klass)->notify_source_reimported = (void (*) (LibraryPhotoSourceCollection *, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_source_reimported;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((LibraryPhotoSourceCollectionClass *) klass)->notify_baseline_reimported = (void (*)(LibraryPhotoSourceCollection*, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_baseline_reimported;
+	((LibraryPhotoSourceCollectionClass *) klass)->notify_baseline_reimported = (void (*) (LibraryPhotoSourceCollection *, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_baseline_reimported;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = (MediaSource* (*)(MediaSourceCollection*, gint64)) library_photo_source_collection_real_fetch_by_numeric_id;
+	((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = (MediaSource* (*) (MediaSourceCollection *, gint64)) library_photo_source_collection_real_fetch_by_numeric_id;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceCollectionClass *) klass)->fetch_by_source_id = (MediaSource* (*)(MediaSourceCollection*, const gchar*)) library_photo_source_collection_real_fetch_by_source_id;
+	((MediaSourceCollectionClass *) klass)->fetch_by_source_id = (MediaSource* (*) (MediaSourceCollection *, const gchar*)) library_photo_source_collection_real_fetch_by_source_id;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceCollectionClass *) klass)->get_event_source_ids = (GeeCollection* (*)(MediaSourceCollection*, EventID*)) library_photo_source_collection_real_get_event_source_ids;
+	((MediaSourceCollectionClass *) klass)->get_event_source_ids = (GeeCollection* (*) (MediaSourceCollection *, EventID*)) library_photo_source_collection_real_get_event_source_ids;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((SourceCollectionClass *) klass)->has_backlink = (gboolean (*)(SourceCollection*, SourceBacklink*)) library_photo_source_collection_real_has_backlink;
+	((SourceCollectionClass *) klass)->has_backlink = (gboolean (*) (SourceCollection *, SourceBacklink*)) library_photo_source_collection_real_has_backlink;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	((SourceCollectionClass *) klass)->remove_backlink = (void (*)(SourceCollection*, SourceBacklink*)) library_photo_source_collection_real_remove_backlink;
+	((SourceCollectionClass *) klass)->remove_backlink = (void (*) (SourceCollection *, SourceBacklink*)) library_photo_source_collection_real_remove_backlink;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->master_reimported = library_photo_source_collection_real_master_reimported;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38492,24 +38470,24 @@ static void library_photo_source_collection_class_init (LibraryPhotoSourceCollec
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	MEDIA_SOURCE_COLLECTION_CLASS (klass)->get_transaction_controller = library_photo_source_collection_real_get_transaction_controller;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_new ("master_reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, master_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
+	library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_MASTER_REIMPORTED_SIGNAL] = g_signal_new ("master-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, master_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_new ("editable_reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, editable_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
+	library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_EDITABLE_REIMPORTED_SIGNAL] = g_signal_new ("editable-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, editable_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_new ("baseline_reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, baseline_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
+	library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL] = g_signal_new ("baseline-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, baseline_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_new ("source_reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
-#line 38498 "Photo.c"
+	library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL] = g_signal_new ("source-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
+#line 38476 "Photo.c"
 }
 
 
 static void library_photo_source_collection_instance_init (LibraryPhotoSourceCollection * self) {
-	GeeHashMap* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	GeeTreeMultiMap* _tmp2_ = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	GeeHashMap* _tmp4_ = NULL;
-	GeeTreeMultiMap* _tmp5_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeHashMap* _tmp1_;
+	GeeTreeMultiMap* _tmp2_;
+	GeeHashMap* _tmp3_;
+	GeeHashMap* _tmp4_;
+	GeeTreeMultiMap* _tmp5_;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv = LIBRARY_PHOTO_SOURCE_COLLECTION_GET_PRIVATE (self);
 #line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38538,11 +38516,11 @@ static void library_photo_source_collection_instance_init (LibraryPhotoSourceCol
 	_tmp5_ = gee_tree_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 4474 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->photo_to_raw_development_filesize = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 38537 "Photo.c"
+#line 38515 "Photo.c"
 }
 
 
-static void library_photo_source_collection_finalize (DataCollection* obj) {
+static void library_photo_source_collection_finalize (DataCollection * obj) {
 	LibraryPhotoSourceCollection * self;
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
@@ -38562,7 +38540,7 @@ static void library_photo_source_collection_finalize (DataCollection* obj) {
 	_g_object_unref0 (self->priv->photo_to_raw_development_filesize);
 #line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->finalize (obj);
-#line 38561 "Photo.c"
+#line 38539 "Photo.c"
 }
 
 
@@ -38581,18 +38559,18 @@ GType library_photo_source_collection_get_type (void) {
 static void _library_photo_generate_thumbnails_one_shot_callback (gpointer self) {
 #line 4966 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_generate_thumbnails ((LibraryPhoto*) self);
-#line 38580 "Photo.c"
+#line 38558 "Photo.c"
 }
 
 
 static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row) {
 	LibraryPhoto * self = NULL;
-	PhotoRow* _tmp0_ = NULL;
-	OneShotScheduler* _tmp1_ = NULL;
-	PhotoRow* _tmp2_ = NULL;
-	guint64 _tmp3_ = 0ULL;
-	PhotoRow* _tmp7_ = NULL;
-	guint64 _tmp8_ = 0ULL;
+	PhotoRow* _tmp0_;
+	OneShotScheduler* _tmp1_;
+	PhotoRow* _tmp2_;
+	guint64 _tmp3_;
+	PhotoRow* _tmp7_;
+	guint64 _tmp8_;
 #line 4961 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_ROW (row), NULL);
 #line 4962 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38615,10 +38593,10 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row)
 	_tmp3_ = _tmp2_->flags;
 #line 4969 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp3_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) {
-#line 38614 "Photo.c"
-		LibraryPhotoSourceCollection* _tmp4_ = NULL;
-		PhotoRow* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+#line 38592 "Photo.c"
+		LibraryPhotoSourceCollection* _tmp4_;
+		PhotoRow* _tmp5_;
+		const gchar* _tmp6_;
 #line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = library_photo_global;
 #line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38627,7 +38605,7 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row)
 		_tmp6_ = _tmp5_->backlinks;
 #line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_);
-#line 38626 "Photo.c"
+#line 38604 "Photo.c"
 	}
 #line 4972 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = row;
@@ -38635,44 +38613,44 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row)
 	_tmp8_ = _tmp7_->flags;
 #line 4972 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) {
-#line 38634 "Photo.c"
-		PhotoRow* _tmp9_ = NULL;
-		guint64 _tmp10_ = 0ULL;
+#line 38612 "Photo.c"
+		PhotoRow* _tmp9_;
+		guint64 _tmp10_;
 #line 4973 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = row;
 #line 4973 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp9_->flags;
 #line 4973 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_photo_upgrade_rating_flags (self, _tmp10_);
-#line 38643 "Photo.c"
+#line 38621 "Photo.c"
 	}
 #line 4961 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 38647 "Photo.c"
+#line 38625 "Photo.c"
 }
 
 
 static LibraryPhoto* library_photo_new (PhotoRow* row) {
 #line 4961 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_construct (TYPE_LIBRARY_PHOTO, row);
-#line 38654 "Photo.c"
+#line 38632 "Photo.c"
 }
 
 
 static LibraryPhoto* library_photo_construct_from_import_params (GType object_type, PhotoImportParams* import_params) {
 	LibraryPhoto * self = NULL;
-	PhotoImportParams* _tmp0_ = NULL;
-	PhotoRow* _tmp1_ = NULL;
-	PhotoImportParams* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
-	OneShotScheduler* _tmp5_ = NULL;
-	PhotoImportParams* _tmp6_ = NULL;
-	PhotoRow* _tmp7_ = NULL;
-	guint64 _tmp8_ = 0ULL;
-	PhotoImportParams* _tmp13_ = NULL;
-	PhotoRow* _tmp14_ = NULL;
-	guint64 _tmp15_ = 0ULL;
+	PhotoImportParams* _tmp0_;
+	PhotoRow* _tmp1_;
+	PhotoImportParams* _tmp2_;
+	GeeCollection* _tmp3_;
+	GeeCollection* _tmp4_;
+	OneShotScheduler* _tmp5_;
+	PhotoImportParams* _tmp6_;
+	PhotoRow* _tmp7_;
+	guint64 _tmp8_;
+	PhotoImportParams* _tmp13_;
+	PhotoRow* _tmp14_;
+	guint64 _tmp15_;
 #line 4976 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (import_params), NULL);
 #line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38705,11 +38683,11 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty
 	_tmp8_ = _tmp7_->flags;
 #line 4983 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) {
-#line 38704 "Photo.c"
-		LibraryPhotoSourceCollection* _tmp9_ = NULL;
-		PhotoImportParams* _tmp10_ = NULL;
-		PhotoRow* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
+#line 38682 "Photo.c"
+		LibraryPhotoSourceCollection* _tmp9_;
+		PhotoImportParams* _tmp10_;
+		PhotoRow* _tmp11_;
+		const gchar* _tmp12_;
 #line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = library_photo_global;
 #line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38720,7 +38698,7 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty
 		_tmp12_ = _tmp11_->backlinks;
 #line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp12_);
-#line 38719 "Photo.c"
+#line 38697 "Photo.c"
 	}
 #line 4986 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = import_params;
@@ -38730,10 +38708,10 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty
 	_tmp15_ = _tmp14_->flags;
 #line 4986 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp15_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) {
-#line 38729 "Photo.c"
-		PhotoImportParams* _tmp16_ = NULL;
-		PhotoRow* _tmp17_ = NULL;
-		guint64 _tmp18_ = 0ULL;
+#line 38707 "Photo.c"
+		PhotoImportParams* _tmp16_;
+		PhotoRow* _tmp17_;
+		guint64 _tmp18_;
 #line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = import_params;
 #line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38742,46 +38720,46 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty
 		_tmp18_ = _tmp17_->flags;
 #line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_photo_upgrade_rating_flags (self, _tmp18_);
-#line 38741 "Photo.c"
+#line 38719 "Photo.c"
 	}
 #line 4976 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 38745 "Photo.c"
+#line 38723 "Photo.c"
 }
 
 
 static LibraryPhoto* library_photo_new_from_import_params (PhotoImportParams* import_params) {
 #line 4976 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_construct_from_import_params (TYPE_LIBRARY_PHOTO, import_params);
-#line 38752 "Photo.c"
+#line 38730 "Photo.c"
 }
 
 
 void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
+	LibraryPhotoSourceCollection* _tmp0_;
 	GeeArrayList* all = NULL;
-	PhotoTable* _tmp1_ = NULL;
-	PhotoTable* _tmp2_ = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	GeeArrayList* _tmp4_ = NULL;
+	PhotoTable* _tmp1_;
+	PhotoTable* _tmp2_;
+	GeeArrayList* _tmp3_;
+	GeeArrayList* _tmp4_;
 	GeeArrayList* all_photos = NULL;
-	GeeArrayList* _tmp5_ = NULL;
+	GeeArrayList* _tmp5_;
 	GeeArrayList* trashed_photos = NULL;
-	GeeArrayList* _tmp6_ = NULL;
+	GeeArrayList* _tmp6_;
 	GeeArrayList* offline_photos = NULL;
-	GeeArrayList* _tmp7_ = NULL;
+	GeeArrayList* _tmp7_;
 	gint count = 0;
-	GeeArrayList* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	LibraryPhotoSourceCollection* _tmp34_ = NULL;
-	GeeArrayList* _tmp35_ = NULL;
-	GeeCollection* _tmp36_ = NULL;
-	GeeCollection* _tmp37_ = NULL;
-	LibraryPhotoSourceCollection* _tmp38_ = NULL;
-	GeeArrayList* _tmp39_ = NULL;
-	LibraryPhotoSourceCollection* _tmp40_ = NULL;
-	GeeArrayList* _tmp41_ = NULL;
+	GeeArrayList* _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	LibraryPhotoSourceCollection* _tmp34_;
+	GeeArrayList* _tmp35_;
+	GeeCollection* _tmp36_;
+	GeeCollection* _tmp37_;
+	LibraryPhotoSourceCollection* _tmp38_;
+	GeeArrayList* _tmp39_;
+	LibraryPhotoSourceCollection* _tmp40_;
+	GeeArrayList* _tmp41_;
 #line 4991 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_init_photo ();
 #line 4993 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38822,43 +38800,43 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 	_tmp10_ = _tmp9_;
 #line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
 	count = _tmp10_;
-#line 38821 "Photo.c"
+#line 38799 "Photo.c"
 	{
 		gint ctr = 0;
 #line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 		ctr = 0;
-#line 38826 "Photo.c"
+#line 38804 "Photo.c"
 		{
 			gboolean _tmp11_ = FALSE;
 #line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = TRUE;
 #line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 38833 "Photo.c"
-				gint _tmp13_ = 0;
-				gint _tmp14_ = 0;
+#line 38811 "Photo.c"
+				gint _tmp13_;
+				gint _tmp14_;
 				PhotoRow* row = NULL;
-				GeeArrayList* _tmp15_ = NULL;
-				gint _tmp16_ = 0;
-				gpointer _tmp17_ = NULL;
+				GeeArrayList* _tmp15_;
+				gint _tmp16_;
+				gpointer _tmp17_;
 				LibraryPhoto* photo = NULL;
-				PhotoRow* _tmp18_ = NULL;
-				LibraryPhoto* _tmp19_ = NULL;
+				PhotoRow* _tmp18_;
+				LibraryPhoto* _tmp19_;
 				guint64 flags = 0ULL;
-				PhotoRow* _tmp20_ = NULL;
-				guint64 _tmp21_ = 0ULL;
-				guint64 _tmp22_ = 0ULL;
-				ProgressMonitor _tmp30_ = NULL;
-				void* _tmp30__target = NULL;
+				PhotoRow* _tmp20_;
+				guint64 _tmp21_;
+				guint64 _tmp22_;
+				ProgressMonitor _tmp30_;
+				void* _tmp30__target;
 #line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp11_) {
-#line 38851 "Photo.c"
-					gint _tmp12_ = 0;
+#line 38829 "Photo.c"
+					gint _tmp12_;
 #line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = ctr;
 #line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 					ctr = _tmp12_ + 1;
-#line 38857 "Photo.c"
+#line 38835 "Photo.c"
 				}
 #line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = FALSE;
@@ -38870,7 +38848,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 				if (!(_tmp13_ < _tmp14_)) {
 #line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 38869 "Photo.c"
+#line 38847 "Photo.c"
 				}
 #line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = all;
@@ -38896,42 +38874,42 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 				_tmp22_ = flags;
 #line 5007 "/home/jens/Source/shotwell/src/Photo.vala"
 				if ((_tmp22_ & LIBRARY_PHOTO_FLAG_TRASH) != ((guint64) 0)) {
-#line 38895 "Photo.c"
-					GeeArrayList* _tmp23_ = NULL;
-					LibraryPhoto* _tmp24_ = NULL;
+#line 38873 "Photo.c"
+					GeeArrayList* _tmp23_;
+					LibraryPhoto* _tmp24_;
 #line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp23_ = trashed_photos;
 #line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp24_ = photo;
 #line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_);
-#line 38904 "Photo.c"
+#line 38882 "Photo.c"
 				} else {
-					guint64 _tmp25_ = 0ULL;
+					guint64 _tmp25_;
 #line 5009 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = flags;
 #line 5009 "/home/jens/Source/shotwell/src/Photo.vala"
 					if ((_tmp25_ & LIBRARY_PHOTO_FLAG_OFFLINE) != ((guint64) 0)) {
-#line 38911 "Photo.c"
-						GeeArrayList* _tmp26_ = NULL;
-						LibraryPhoto* _tmp27_ = NULL;
+#line 38889 "Photo.c"
+						GeeArrayList* _tmp26_;
+						LibraryPhoto* _tmp27_;
 #line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp26_ = offline_photos;
 #line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp27_ = photo;
 #line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_);
-#line 38920 "Photo.c"
+#line 38898 "Photo.c"
 					} else {
-						GeeArrayList* _tmp28_ = NULL;
-						LibraryPhoto* _tmp29_ = NULL;
+						GeeArrayList* _tmp28_;
+						LibraryPhoto* _tmp29_;
 #line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp28_ = all_photos;
 #line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp29_ = photo;
 #line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_);
-#line 38930 "Photo.c"
+#line 38908 "Photo.c"
 					}
 				}
 #line 5014 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38940,11 +38918,11 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 				_tmp30__target = monitor_target;
 #line 5014 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp30_ != NULL) {
-#line 38939 "Photo.c"
-					ProgressMonitor _tmp31_ = NULL;
-					void* _tmp31__target = NULL;
-					gint _tmp32_ = 0;
-					gint _tmp33_ = 0;
+#line 38917 "Photo.c"
+					ProgressMonitor _tmp31_;
+					void* _tmp31__target;
+					gint _tmp32_;
+					gint _tmp33_;
 #line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31_ = monitor;
 #line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38955,13 +38933,13 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 					_tmp33_ = count;
 #line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31_ ((guint64) _tmp32_, (guint64) _tmp33_, TRUE, _tmp31__target);
-#line 38954 "Photo.c"
+#line 38932 "Photo.c"
 				}
 #line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
 #line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_row_unref0 (row);
-#line 38960 "Photo.c"
+#line 38938 "Photo.c"
 			}
 		}
 	}
@@ -38995,30 +38973,30 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 	_g_object_unref0 (all_photos);
 #line 4990 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (all);
-#line 38994 "Photo.c"
+#line 38972 "Photo.c"
 }
 
 
 void library_photo_terminate (void) {
 #line 5024 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_terminate_photo ();
-#line 39001 "Photo.c"
+#line 38979 "Photo.c"
 }
 
 
-ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto** photo) {
+ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto* * photo) {
 	LibraryPhoto* _vala_photo = NULL;
 	ImportResult result = 0;
 	PhotoID photo_id = {0};
-	PhotoTable* _tmp0_ = NULL;
-	PhotoTable* _tmp1_ = NULL;
-	PhotoImportParams* _tmp2_ = NULL;
-	PhotoRow* _tmp3_ = NULL;
+	PhotoTable* _tmp0_;
+	PhotoTable* _tmp1_;
+	PhotoImportParams* _tmp2_;
+	PhotoRow* _tmp3_;
 	PhotoID _tmp4_ = {0};
-	PhotoID _tmp5_ = {0};
-	gboolean _tmp6_ = FALSE;
-	PhotoImportParams* _tmp7_ = NULL;
-	LibraryPhoto* _tmp8_ = NULL;
+	PhotoID _tmp5_;
+	gboolean _tmp6_;
+	PhotoImportParams* _tmp7_;
+	LibraryPhoto* _tmp8_;
 #line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0);
 #line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39051,15 +39029,15 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot
 		if (photo) {
 #line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 			*photo = _vala_photo;
-#line 39050 "Photo.c"
+#line 39028 "Photo.c"
 		} else {
 #line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_vala_photo);
-#line 39054 "Photo.c"
+#line 39032 "Photo.c"
 		}
 #line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 39058 "Photo.c"
+#line 39036 "Photo.c"
 	}
 #line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = params;
@@ -39075,15 +39053,15 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot
 	if (photo) {
 #line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
 		*photo = _vala_photo;
-#line 39074 "Photo.c"
+#line 39052 "Photo.c"
 	} else {
 #line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_vala_photo);
-#line 39078 "Photo.c"
+#line 39056 "Photo.c"
 	}
 #line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39082 "Photo.c"
+#line 39060 "Photo.c"
 }
 
 
@@ -39091,11 +39069,11 @@ void library_photo_import_failed (LibraryPhoto* photo) {
 	GError * _inner_error_ = NULL;
 #line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 39090 "Photo.c"
+#line 39068 "Photo.c"
 	{
-		PhotoTable* _tmp0_ = NULL;
-		PhotoTable* _tmp1_ = NULL;
-		LibraryPhoto* _tmp2_ = NULL;
+		PhotoTable* _tmp0_;
+		PhotoTable* _tmp1_;
+		LibraryPhoto* _tmp2_;
 		PhotoID _tmp3_ = {0};
 #line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_table_get_instance ();
@@ -39113,8 +39091,8 @@ void library_photo_import_failed (LibraryPhoto* photo) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 39112 "Photo.c"
-				goto __catch406_database_error;
+#line 39090 "Photo.c"
+				goto __catch407_database_error;
 			}
 #line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -39122,14 +39100,14 @@ void library_photo_import_failed (LibraryPhoto* photo) {
 			g_clear_error (&_inner_error_);
 #line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 39121 "Photo.c"
+#line 39099 "Photo.c"
 		}
 	}
-	goto __finally406;
-	__catch406_database_error:
+	goto __finally407;
+	__catch407_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp4_ = NULL;
+		GError* _tmp4_;
 #line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
 #line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39140,9 +39118,9 @@ void library_photo_import_failed (LibraryPhoto* photo) {
 		app_window_database_error (_tmp4_);
 #line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 39139 "Photo.c"
+#line 39117 "Photo.c"
 	}
-	__finally406:
+	__finally407:
 #line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39151,16 +39129,16 @@ void library_photo_import_failed (LibraryPhoto* photo) {
 		g_clear_error (&_inner_error_);
 #line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39150 "Photo.c"
+#line 39128 "Photo.c"
 	}
 }
 
 
 static void library_photo_real_notify_master_reimported (Photo* base, PhotoMetadata* metadata) {
 	LibraryPhoto * self;
-	PhotoMetadata* _tmp0_ = NULL;
-	LibraryPhotoSourceCollection* _tmp1_ = NULL;
-	PhotoMetadata* _tmp2_ = NULL;
+	PhotoMetadata* _tmp0_;
+	LibraryPhotoSourceCollection* _tmp1_;
+	PhotoMetadata* _tmp2_;
 #line 5054 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5054 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39175,15 +39153,15 @@ static void library_photo_real_notify_master_reimported (Photo* base, PhotoMetad
 	_tmp2_ = metadata;
 #line 5057 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_master_reimported (_tmp1_, self, _tmp2_);
-#line 39174 "Photo.c"
+#line 39152 "Photo.c"
 }
 
 
 static void library_photo_real_notify_editable_reimported (Photo* base, PhotoMetadata* metadata) {
 	LibraryPhoto * self;
-	PhotoMetadata* _tmp0_ = NULL;
-	LibraryPhotoSourceCollection* _tmp1_ = NULL;
-	PhotoMetadata* _tmp2_ = NULL;
+	PhotoMetadata* _tmp0_;
+	LibraryPhotoSourceCollection* _tmp1_;
+	PhotoMetadata* _tmp2_;
 #line 5060 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5060 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39198,15 +39176,15 @@ static void library_photo_real_notify_editable_reimported (Photo* base, PhotoMet
 	_tmp2_ = metadata;
 #line 5063 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_editable_reimported (_tmp1_, self, _tmp2_);
-#line 39197 "Photo.c"
+#line 39175 "Photo.c"
 }
 
 
 static void library_photo_real_notify_source_reimported (Photo* base, PhotoMetadata* metadata) {
 	LibraryPhoto * self;
-	PhotoMetadata* _tmp0_ = NULL;
-	LibraryPhotoSourceCollection* _tmp1_ = NULL;
-	PhotoMetadata* _tmp2_ = NULL;
+	PhotoMetadata* _tmp0_;
+	LibraryPhotoSourceCollection* _tmp1_;
+	PhotoMetadata* _tmp2_;
 #line 5066 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5066 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39221,15 +39199,15 @@ static void library_photo_real_notify_source_reimported (Photo* base, PhotoMetad
 	_tmp2_ = metadata;
 #line 5069 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_source_reimported (_tmp1_, self, _tmp2_);
-#line 39220 "Photo.c"
+#line 39198 "Photo.c"
 }
 
 
 static void library_photo_real_notify_baseline_reimported (Photo* base, PhotoMetadata* metadata) {
 	LibraryPhoto * self;
-	PhotoMetadata* _tmp0_ = NULL;
-	LibraryPhotoSourceCollection* _tmp1_ = NULL;
-	PhotoMetadata* _tmp2_ = NULL;
+	PhotoMetadata* _tmp0_;
+	LibraryPhotoSourceCollection* _tmp1_;
+	PhotoMetadata* _tmp2_;
 #line 5072 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5072 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39244,7 +39222,7 @@ static void library_photo_real_notify_baseline_reimported (Photo* base, PhotoMet
 	_tmp2_ = metadata;
 #line 5075 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_baseline_reimported (_tmp1_, self, _tmp2_);
-#line 39243 "Photo.c"
+#line 39221 "Photo.c"
 }
 
 
@@ -39252,24 +39230,24 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) {
 	GError * _inner_error_ = NULL;
 #line 5078 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 39251 "Photo.c"
+#line 39229 "Photo.c"
 	{
 #line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
 		thumbnail_cache_import_from_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TRUE, &_inner_error_);
 #line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 39257 "Photo.c"
-			goto __catch407_g_error;
+#line 39235 "Photo.c"
+			goto __catch408_g_error;
 		}
 	}
-	goto __finally407;
-	__catch407_g_error:
+	goto __finally408;
+	__catch408_g_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		GError* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
+		gchar* _tmp0_;
+		gchar* _tmp1_;
+		GError* _tmp2_;
+		const gchar* _tmp3_;
 #line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
 #line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39288,9 +39266,9 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) {
 		_g_free0 (_tmp1_);
 #line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 39287 "Photo.c"
+#line 39265 "Photo.c"
 	}
-	__finally407:
+	__finally408:
 #line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39299,18 +39277,18 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) {
 		g_clear_error (&_inner_error_);
 #line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39298 "Photo.c"
+#line 39276 "Photo.c"
 	}
 #line 5086 "/home/jens/Source/shotwell/src/Photo.vala"
 	thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 39302 "Photo.c"
+#line 39280 "Photo.c"
 }
 
 
 GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self) {
 	GeeCollection* result = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp1_;
 #line 5090 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO (self), NULL);
 #line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39321,7 +39299,7 @@ GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self) {
 	result = _tmp1_;
 #line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39320 "Photo.c"
+#line 39298 "Photo.c"
 }
 
 
@@ -39332,15 +39310,15 @@ void library_photo_clear_import_keywords (LibraryPhoto* self) {
 	_g_object_unref0 (self->priv->import_keywords);
 #line 5095 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->import_keywords = NULL;
-#line 39331 "Photo.c"
+#line 39309 "Photo.c"
 }
 
 
 static void library_photo_real_notify_altered (DataObject* base, Alteration* alteration) {
 	LibraryPhoto * self;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	Alteration* _tmp5_ = NULL;
+	gboolean _tmp1_;
+	Alteration* _tmp5_;
 #line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39349,36 +39327,36 @@ static void library_photo_real_notify_altered (DataObject* base, Alteration* alt
 	_tmp1_ = self->priv->block_thumbnail_generation;
 #line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp1_) {
-#line 39348 "Photo.c"
-		Alteration* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+#line 39326 "Photo.c"
+		Alteration* _tmp2_;
+		gboolean _tmp3_;
 #line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = alteration;
 #line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = alteration_has_subject (_tmp2_, "image");
 #line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_;
-#line 39357 "Photo.c"
+#line 39335 "Photo.c"
 	} else {
 #line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = FALSE;
-#line 39361 "Photo.c"
+#line 39339 "Photo.c"
 	}
 #line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 39365 "Photo.c"
-		OneShotScheduler* _tmp4_ = NULL;
+#line 39343 "Photo.c"
+		OneShotScheduler* _tmp4_;
 #line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = self->priv->thumbnail_scheduler;
 #line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
 		one_shot_scheduler_at_priority_idle (_tmp4_, G_PRIORITY_LOW);
-#line 39371 "Photo.c"
+#line 39349 "Photo.c"
 	}
 #line 5103 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = alteration;
 #line 5103 "/home/jens/Source/shotwell/src/Photo.vala"
 	DATA_OBJECT_CLASS (library_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), _tmp5_);
-#line 39377 "Photo.c"
+#line 39355 "Photo.c"
 }
 
 
@@ -39386,8 +39364,8 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal
 	LibraryPhoto * self;
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* pixbuf = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 5106 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
@@ -39403,7 +39381,7 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal
 		g_propagate_error (error, _inner_error_);
 #line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39402 "Photo.c"
+#line 39380 "Photo.c"
 	}
 #line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_BILINEAR, TRUE);
@@ -39413,13 +39391,13 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal
 	_g_object_unref0 (pixbuf);
 #line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39412 "Photo.c"
+#line 39390 "Photo.c"
 }
 
 
 static void library_photo_real_rotate (Photo* base, Rotation rotation) {
 	LibraryPhoto * self;
-	Rotation _tmp0_ = 0;
+	Rotation _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 5112 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
@@ -39431,27 +39409,27 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) {
 	PHOTO_CLASS (library_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
 #line 5116 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->block_thumbnail_generation = FALSE;
-#line 39430 "Photo.c"
+#line 39408 "Photo.c"
 	{
-		Rotation _tmp1_ = 0;
+		Rotation _tmp1_;
 #line 5124 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = rotation;
 #line 5124 "/home/jens/Source/shotwell/src/Photo.vala"
 		thumbnail_cache_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_);
 #line 5124 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 39439 "Photo.c"
-			goto __catch408_g_error;
+#line 39417 "Photo.c"
+			goto __catch409_g_error;
 		}
 	}
-	goto __finally408;
-	__catch408_g_error:
+	goto __finally409;
+	__catch409_g_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		GError* _tmp4_;
+		const gchar* _tmp5_;
 #line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
 #line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39470,9 +39448,9 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) {
 		_g_free0 (_tmp3_);
 #line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 39469 "Photo.c"
+#line 39447 "Photo.c"
 	}
-	__finally408:
+	__finally409:
 #line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39481,11 +39459,11 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) {
 		g_clear_error (&_inner_error_);
 #line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39480 "Photo.c"
+#line 39458 "Photo.c"
 	}
 #line 5130 "/home/jens/Source/shotwell/src/Photo.vala"
 	thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 39484 "Photo.c"
+#line 39462 "Photo.c"
 }
 
 
@@ -39493,9 +39471,9 @@ static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint
 	LibraryPhoto * self;
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
+	gint _tmp1_;
+	GdkPixbuf* _tmp2_;
+	GdkPixbuf* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 5134 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
@@ -39511,7 +39489,7 @@ static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint
 		g_propagate_error (error, _inner_error_);
 #line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39510 "Photo.c"
+#line 39488 "Photo.c"
 	}
 #line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp0_;
@@ -39523,27 +39501,27 @@ static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint
 	_g_object_unref0 (_tmp0_);
 #line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39522 "Photo.c"
+#line 39500 "Photo.c"
 }
 
 
 static void _library_photo_on_duplicate_progress_gfile_progress_callback (gint64 current_num_bytes, gint64 total_num_bytes, gpointer self) {
 #line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_on_duplicate_progress ((LibraryPhoto*) self, current_num_bytes, total_num_bytes);
-#line 39529 "Photo.c"
+#line 39507 "Photo.c"
 }
 
 
 static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPhotoRow* backing, BackingPhotoID* result, GError** error) {
 	BackingPhotoID backing_id = {0};
 	gboolean _tmp0_ = FALSE;
-	BackingPhotoRow* _tmp1_ = NULL;
+	BackingPhotoRow* _tmp1_;
 	GFile* file = NULL;
-	BackingPhotoRow* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	GFile* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	BackingPhotoRow* _tmp4_;
+	const gchar* _tmp5_;
+	GFile* _tmp6_;
+	GFile* _tmp7_;
+	gboolean _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
@@ -39557,17 +39535,17 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 	if (_tmp1_ == NULL) {
 #line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 39556 "Photo.c"
+#line 39534 "Photo.c"
 	} else {
-		BackingPhotoRow* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
+		BackingPhotoRow* _tmp2_;
+		const gchar* _tmp3_;
 #line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = backing;
 #line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_->filepath;
 #line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_ == NULL;
-#line 39566 "Photo.c"
+#line 39544 "Photo.c"
 	}
 #line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
@@ -39575,7 +39553,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 		*result = backing_id;
 #line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39574 "Photo.c"
+#line 39552 "Photo.c"
 	}
 #line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = backing;
@@ -39591,16 +39569,16 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 	_tmp8_ = g_file_query_exists (_tmp7_, NULL);
 #line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
-#line 39590 "Photo.c"
+#line 39568 "Photo.c"
 		GFile* dupe_file = NULL;
-		GFile* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
+		GFile* _tmp9_;
+		GFile* _tmp10_;
 		DetectedPhotoInformation* detected = NULL;
 		BackingPhotoRow* state = NULL;
-		GFile* _tmp11_ = NULL;
+		GFile* _tmp11_;
 		DetectedPhotoInformation* _tmp12_ = NULL;
-		BackingPhotoRow* _tmp13_ = NULL;
-		BackingPhotoRow* _tmp14_ = NULL;
+		BackingPhotoRow* _tmp13_;
+		BackingPhotoRow* _tmp14_;
 #line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = file;
 #line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39615,7 +39593,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 			_g_object_unref0 (file);
 #line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 39614 "Photo.c"
+#line 39592 "Photo.c"
 		}
 #line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = dupe_file;
@@ -39639,18 +39617,18 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 			_g_object_unref0 (file);
 #line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 39638 "Photo.c"
+#line 39616 "Photo.c"
 		}
 #line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = state;
 #line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp14_ != NULL) {
-#line 39644 "Photo.c"
-			BackingPhotoTable* _tmp15_ = NULL;
-			BackingPhotoTable* _tmp16_ = NULL;
-			BackingPhotoRow* _tmp17_ = NULL;
-			BackingPhotoRow* _tmp18_ = NULL;
-			BackingPhotoID _tmp19_ = {0};
+#line 39622 "Photo.c"
+			BackingPhotoTable* _tmp15_;
+			BackingPhotoTable* _tmp16_;
+			BackingPhotoRow* _tmp17_;
+			BackingPhotoRow* _tmp18_;
+			BackingPhotoID _tmp19_;
 #line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = backing_photo_table_get_instance ();
 #line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39675,7 +39653,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 				_g_object_unref0 (file);
 #line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 39674 "Photo.c"
+#line 39652 "Photo.c"
 			}
 #line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = state;
@@ -39683,7 +39661,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 			_tmp19_ = _tmp18_->id;
 #line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing_id = _tmp19_;
-#line 39682 "Photo.c"
+#line 39660 "Photo.c"
 		}
 #line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (state);
@@ -39691,7 +39669,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 		_detected_photo_information_unref0 (detected);
 #line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dupe_file);
-#line 39690 "Photo.c"
+#line 39668 "Photo.c"
 	}
 #line 5158 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = backing_id;
@@ -39699,70 +39677,70 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 	_g_object_unref0 (file);
 #line 5158 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 39698 "Photo.c"
+#line 39676 "Photo.c"
 }
 
 
 LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 	LibraryPhoto* result = NULL;
 	GFile* dupe_file = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
 	BackingPhotoID dupe_editable_id = {0};
-	BackingPhotoRow* _tmp4_ = NULL;
-	BackingPhotoRow* _tmp5_ = NULL;
+	BackingPhotoRow* _tmp4_;
+	BackingPhotoRow* _tmp5_;
 	BackingPhotoID _tmp6_ = {0};
-	BackingPhotoID _tmp7_ = {0};
+	BackingPhotoID _tmp7_;
 	BackingPhotoID dupe_raw_shotwell_id = {0};
-	BackingPhotoRow* _tmp8_ = NULL;
-	BackingPhotoRow* _tmp9_ = NULL;
+	BackingPhotoRow* _tmp8_;
+	BackingPhotoRow* _tmp9_;
 	BackingPhotoID _tmp10_ = {0};
-	BackingPhotoID _tmp11_ = {0};
+	BackingPhotoID _tmp11_;
 	BackingPhotoID dupe_raw_camera_id = {0};
-	BackingPhotoRow* _tmp12_ = NULL;
-	BackingPhotoRow* _tmp13_ = NULL;
+	BackingPhotoRow* _tmp12_;
+	BackingPhotoRow* _tmp13_;
 	BackingPhotoID _tmp14_ = {0};
-	BackingPhotoID _tmp15_ = {0};
+	BackingPhotoID _tmp15_;
 	BackingPhotoID dupe_raw_embedded_id = {0};
-	BackingPhotoRow* _tmp16_ = NULL;
-	BackingPhotoRow* _tmp17_ = NULL;
+	BackingPhotoRow* _tmp16_;
+	BackingPhotoRow* _tmp17_;
 	BackingPhotoID _tmp18_ = {0};
-	BackingPhotoID _tmp19_ = {0};
+	BackingPhotoID _tmp19_;
 	PhotoID dupe_id = {0};
-	PhotoTable* _tmp20_ = NULL;
-	PhotoTable* _tmp21_ = NULL;
+	PhotoTable* _tmp20_;
+	PhotoTable* _tmp21_;
 	PhotoID _tmp22_ = {0};
-	GFile* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	BackingPhotoID _tmp26_ = {0};
-	BackingPhotoID _tmp27_ = {0};
-	BackingPhotoID _tmp28_ = {0};
-	BackingPhotoID _tmp29_ = {0};
+	GFile* _tmp23_;
+	gchar* _tmp24_;
+	gchar* _tmp25_;
+	BackingPhotoID _tmp26_;
+	BackingPhotoID _tmp27_;
+	BackingPhotoID _tmp28_;
+	BackingPhotoID _tmp29_;
 	PhotoID _tmp30_ = {0};
-	PhotoID _tmp31_ = {0};
+	PhotoID _tmp31_;
 	PhotoRow* dupe_row = NULL;
-	PhotoTable* _tmp32_ = NULL;
-	PhotoTable* _tmp33_ = NULL;
-	PhotoID _tmp34_ = {0};
-	PhotoRow* _tmp35_ = NULL;
-	PhotoRow* _tmp36_ = NULL;
+	PhotoTable* _tmp32_;
+	PhotoTable* _tmp33_;
+	PhotoID _tmp34_;
+	PhotoRow* _tmp35_;
+	PhotoRow* _tmp36_;
 	LibraryPhoto* dupe = NULL;
-	PhotoRow* _tmp37_ = NULL;
-	LibraryPhoto* _tmp38_ = NULL;
-	LibraryPhoto* _tmp39_ = NULL;
-	LibraryPhotoSourceCollection* _tmp40_ = NULL;
-	LibraryPhoto* _tmp41_ = NULL;
-	LibraryPhoto* _tmp42_ = NULL;
-	Event* _tmp43_ = NULL;
-	Event* _tmp44_ = NULL;
-	gboolean _tmp45_ = FALSE;
+	PhotoRow* _tmp37_;
+	LibraryPhoto* _tmp38_;
+	LibraryPhoto* _tmp39_;
+	LibraryPhotoSourceCollection* _tmp40_;
+	LibraryPhoto* _tmp41_;
+	LibraryPhoto* _tmp42_;
+	Event* _tmp43_;
+	Event* _tmp44_;
+	gboolean _tmp45_;
 	GeeCollection* tags = NULL;
-	TagSourceCollection* _tmp50_ = NULL;
-	GeeList* _tmp51_ = NULL;
-	GeeCollection* _tmp52_ = NULL;
+	TagSourceCollection* _tmp50_;
+	GeeList* _tmp51_;
+	GeeCollection* _tmp52_;
 	GError * _inner_error_ = NULL;
 #line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO (self), NULL);
@@ -39784,7 +39762,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39783 "Photo.c"
+#line 39761 "Photo.c"
 	}
 #line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo));
@@ -39806,7 +39784,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 		_g_object_unref0 (dupe_file);
 #line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39805 "Photo.c"
+#line 39783 "Photo.c"
 	}
 #line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_SHOTWELL);
@@ -39828,7 +39806,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 		_g_object_unref0 (dupe_file);
 #line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39827 "Photo.c"
+#line 39805 "Photo.c"
 	}
 #line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_CAMERA);
@@ -39850,7 +39828,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 		_g_object_unref0 (dupe_file);
 #line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39849 "Photo.c"
+#line 39827 "Photo.c"
 	}
 #line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_EMBEDDED);
@@ -39872,7 +39850,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 		_g_object_unref0 (dupe_file);
 #line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39871 "Photo.c"
+#line 39849 "Photo.c"
 	}
 #line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = photo_table_get_instance ();
@@ -39946,11 +39924,11 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 	_g_object_unref0 (_tmp44_);
 #line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp45_) {
-#line 39945 "Photo.c"
-		LibraryPhoto* _tmp46_ = NULL;
-		Event* _tmp47_ = NULL;
-		Event* _tmp48_ = NULL;
-		LibraryPhoto* _tmp49_ = NULL;
+#line 39923 "Photo.c"
+		LibraryPhoto* _tmp46_;
+		Event* _tmp47_;
+		Event* _tmp48_;
+		LibraryPhoto* _tmp49_;
 #line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = dupe;
 #line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39963,7 +39941,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 		event_attach (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp48_);
-#line 39962 "Photo.c"
+#line 39940 "Photo.c"
 	}
 #line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = tag_global;
@@ -39975,11 +39953,11 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 	_tmp52_ = tags;
 #line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp52_ != NULL) {
-#line 39974 "Photo.c"
+#line 39952 "Photo.c"
 		{
 			GeeIterator* _tag_it = NULL;
-			GeeCollection* _tmp53_ = NULL;
-			GeeIterator* _tmp54_ = NULL;
+			GeeCollection* _tmp53_;
+			GeeIterator* _tmp54_;
 #line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = tags;
 #line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39988,14 +39966,14 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 			_tag_it = _tmp54_;
 #line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 39987 "Photo.c"
-				GeeIterator* _tmp55_ = NULL;
-				gboolean _tmp56_ = FALSE;
+#line 39965 "Photo.c"
+				GeeIterator* _tmp55_;
+				gboolean _tmp56_;
 				Tag* tag = NULL;
-				GeeIterator* _tmp57_ = NULL;
-				gpointer _tmp58_ = NULL;
-				Tag* _tmp59_ = NULL;
-				LibraryPhoto* _tmp60_ = NULL;
+				GeeIterator* _tmp57_;
+				gpointer _tmp58_;
+				Tag* _tmp59_;
+				LibraryPhoto* _tmp60_;
 #line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp55_ = _tag_it;
 #line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40004,7 +39982,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 				if (!_tmp56_) {
 #line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 40003 "Photo.c"
+#line 39981 "Photo.c"
 				}
 #line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = _tag_it;
@@ -40020,11 +39998,11 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 				tag_attach (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (tag);
-#line 40019 "Photo.c"
+#line 39997 "Photo.c"
 			}
 #line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_it);
-#line 40023 "Photo.c"
+#line 40001 "Photo.c"
 		}
 	}
 #line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40037,7 +40015,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 	_g_object_unref0 (dupe_file);
 #line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40036 "Photo.c"
+#line 40014 "Photo.c"
 }
 
 
@@ -40046,13 +40024,13 @@ static void library_photo_on_duplicate_progress (LibraryPhoto* self, gint64 curr
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
 #line 5204 "/home/jens/Source/shotwell/src/Photo.vala"
 	spin_event_loop ();
-#line 40045 "Photo.c"
+#line 40023 "Photo.c"
 }
 
 
 static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flags) {
-	guint64 _tmp0_ = 0ULL;
-	guint64 _tmp1_ = 0ULL;
+	guint64 _tmp0_;
+	guint64 _tmp1_;
 #line 5207 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
 #line 5208 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40063,7 +40041,7 @@ static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flag
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_REJECTED);
 #line 5210 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_HIDDEN, NULL);
-#line 40062 "Photo.c"
+#line 40040 "Photo.c"
 	}
 #line 5213 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = flags;
@@ -40073,7 +40051,7 @@ static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flag
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_FIVE);
 #line 5215 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FAVORITE, NULL);
-#line 40072 "Photo.c"
+#line 40050 "Photo.c"
 	}
 }
 
@@ -40081,7 +40059,7 @@ static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flag
 static gboolean library_photo_real_is_trashed (MediaSource* base) {
 	LibraryPhoto * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 5220 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5221 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40090,7 +40068,7 @@ static gboolean library_photo_real_is_trashed (MediaSource* base) {
 	result = _tmp0_;
 #line 5221 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40089 "Photo.c"
+#line 40067 "Photo.c"
 }
 
 
@@ -40100,7 +40078,7 @@ static void library_photo_real_trash (MediaSource* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5225 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH, NULL);
-#line 40099 "Photo.c"
+#line 40077 "Photo.c"
 }
 
 
@@ -40110,14 +40088,14 @@ static void library_photo_real_untrash (MediaSource* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5229 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH, NULL);
-#line 40109 "Photo.c"
+#line 40087 "Photo.c"
 }
 
 
 static gboolean library_photo_real_is_offline (Monitorable* base) {
 	LibraryPhoto * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 5232 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5233 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40126,7 +40104,7 @@ static gboolean library_photo_real_is_offline (Monitorable* base) {
 	result = _tmp0_;
 #line 5233 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40125 "Photo.c"
+#line 40103 "Photo.c"
 }
 
 
@@ -40136,7 +40114,7 @@ static void library_photo_real_mark_offline (Monitorable* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5237 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE, NULL);
-#line 40135 "Photo.c"
+#line 40113 "Photo.c"
 }
 
 
@@ -40146,14 +40124,14 @@ static void library_photo_real_mark_online (Monitorable* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5241 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE, NULL);
-#line 40145 "Photo.c"
+#line 40123 "Photo.c"
 }
 
 
 static gboolean library_photo_real_is_flagged (Flaggable* base) {
 	LibraryPhoto * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 5244 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5245 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40162,14 +40140,14 @@ static gboolean library_photo_real_is_flagged (Flaggable* base) {
 	result = _tmp0_;
 #line 5245 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40161 "Photo.c"
+#line 40139 "Photo.c"
 }
 
 
 static void library_photo_real_mark_flagged (Flaggable* base) {
 	LibraryPhoto * self;
-	Alteration* _tmp0_ = NULL;
-	Alteration* _tmp1_ = NULL;
+	Alteration* _tmp0_;
+	Alteration* _tmp1_;
 #line 5248 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5249 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40180,14 +40158,14 @@ static void library_photo_real_mark_flagged (Flaggable* base) {
 	photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_);
 #line 5249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (_tmp1_);
-#line 40179 "Photo.c"
+#line 40157 "Photo.c"
 }
 
 
 static void library_photo_real_mark_unflagged (Flaggable* base) {
 	LibraryPhoto * self;
-	Alteration* _tmp0_ = NULL;
-	Alteration* _tmp1_ = NULL;
+	Alteration* _tmp0_;
+	Alteration* _tmp1_;
 #line 5252 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5253 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40198,7 +40176,7 @@ static void library_photo_real_mark_unflagged (Flaggable* base) {
 	photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_);
 #line 5253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (_tmp1_);
-#line 40197 "Photo.c"
+#line 40175 "Photo.c"
 }
 
 
@@ -40206,8 +40184,8 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE
 	LibraryPhoto * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp1_;
+	gboolean _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 5256 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
@@ -40217,13 +40195,13 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE
 	_tmp0_ = _tmp1_;
 #line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 40216 "Photo.c"
+#line 40194 "Photo.c"
 		gboolean _tmp2_ = FALSE;
 #line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
 #line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp2_;
-#line 40222 "Photo.c"
+#line 40200 "Photo.c"
 	}
 #line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp0_) {
@@ -40231,7 +40209,7 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE
 		result = FALSE;
 #line 5260 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40230 "Photo.c"
+#line 40208 "Photo.c"
 	}
 #line 5262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
@@ -40239,7 +40217,7 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE
 	result = _tmp3_;
 #line 5262 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40238 "Photo.c"
+#line 40216 "Photo.c"
 }
 
 
@@ -40256,11 +40234,11 @@ static void library_photo_real_destroy (DataSource* base) {
 	photo_id = _tmp0_;
 #line 5269 "/home/jens/Source/shotwell/src/Photo.vala"
 	thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 40255 "Photo.c"
+#line 40233 "Photo.c"
 	{
-		PhotoTable* _tmp1_ = NULL;
-		PhotoTable* _tmp2_ = NULL;
-		PhotoID _tmp3_ = {0};
+		PhotoTable* _tmp1_;
+		PhotoTable* _tmp2_;
+		PhotoID _tmp3_;
 #line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = photo_table_get_instance ();
 #line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40275,8 +40253,8 @@ static void library_photo_real_destroy (DataSource* base) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 40274 "Photo.c"
-				goto __catch409_database_error;
+#line 40252 "Photo.c"
+				goto __catch410_database_error;
 			}
 #line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -40284,14 +40262,14 @@ static void library_photo_real_destroy (DataSource* base) {
 			g_clear_error (&_inner_error_);
 #line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 40283 "Photo.c"
+#line 40261 "Photo.c"
 		}
 	}
-	goto __finally409;
-	__catch409_database_error:
+	goto __finally410;
+	__catch410_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp4_ = NULL;
+		GError* _tmp4_;
 #line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
 #line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40302,9 +40280,9 @@ static void library_photo_real_destroy (DataSource* base) {
 		app_window_database_error (_tmp4_);
 #line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 40301 "Photo.c"
+#line 40279 "Photo.c"
 	}
-	__finally409:
+	__finally410:
 #line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40313,22 +40291,22 @@ static void library_photo_real_destroy (DataSource* base) {
 		g_clear_error (&_inner_error_);
 #line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 40312 "Photo.c"
+#line 40290 "Photo.c"
 	}
 #line 5280 "/home/jens/Source/shotwell/src/Photo.vala"
 	DATA_SOURCE_CLASS (library_photo_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_SOURCE, DataSource));
-#line 40316 "Photo.c"
+#line 40294 "Photo.c"
 }
 
 
 gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format) {
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PhotoFileFormat _tmp3_ = 0;
+	GFile* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PhotoFileFormat _tmp3_;
 	PhotoID _tmp4_ = {0};
-	gboolean _tmp5_ = FALSE;
+	gboolean _tmp5_;
 #line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
 #line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40347,25 +40325,25 @@ gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbna
 	result = _tmp5_;
 #line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40346 "Photo.c"
+#line 40324 "Photo.c"
 }
 
 
 void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, PhotoID* result) {
 	PhotoID* ids = NULL;
-	GFile* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PhotoFileFormat _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	PhotoID* _tmp5_ = NULL;
-	gint ids_length1 = 0;
-	gint _ids_size_ = 0;
+	GFile* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PhotoFileFormat _tmp3_;
+	gint _tmp4_;
+	PhotoID* _tmp5_;
+	gint ids_length1;
+	gint _ids_size_;
 	gboolean _tmp6_ = FALSE;
-	PhotoID* _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	PhotoID* _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	PhotoID* _tmp7_;
+	gint _tmp7__length1;
+	PhotoID* _tmp10_;
+	gint _tmp10__length1;
 	PhotoID _tmp18_ = {0};
 #line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((file == NULL) || G_IS_FILE (file));
@@ -40393,21 +40371,21 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 	if (_tmp7_ == NULL) {
 #line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = TRUE;
-#line 40392 "Photo.c"
+#line 40370 "Photo.c"
 	} else {
-		PhotoID* _tmp8_ = NULL;
-		gint _tmp8__length1 = 0;
+		PhotoID* _tmp8_;
+		gint _tmp8__length1;
 #line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = ids;
 #line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8__length1 = ids_length1;
 #line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8__length1 == 0;
-#line 40402 "Photo.c"
+#line 40380 "Photo.c"
 	}
 #line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 40406 "Photo.c"
+#line 40384 "Photo.c"
 		PhotoID _tmp9_ = {0};
 #line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_id_init (&_tmp9_, PHOTO_ID_INVALID);
@@ -40417,13 +40395,13 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 		ids = (g_free (ids), NULL);
 #line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 40416 "Photo.c"
+#line 40394 "Photo.c"
 	}
 #line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = ids;
 #line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10__length1 = ids_length1;
-#line 40422 "Photo.c"
+#line 40400 "Photo.c"
 	{
 		PhotoID* id_collection = NULL;
 		gint id_collection_length1 = 0;
@@ -40435,18 +40413,18 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 		id_collection_length1 = _tmp10__length1;
 #line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 		for (id_it = 0; id_it < _tmp10__length1; id_it = id_it + 1) {
-#line 40434 "Photo.c"
+#line 40412 "Photo.c"
 			PhotoID id = {0};
 #line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 			id = id_collection[id_it];
-#line 40438 "Photo.c"
+#line 40416 "Photo.c"
 			{
 				LibraryPhoto* photo = NULL;
-				LibraryPhotoSourceCollection* _tmp11_ = NULL;
-				PhotoID _tmp12_ = {0};
-				LibraryPhoto* _tmp13_ = NULL;
+				LibraryPhotoSourceCollection* _tmp11_;
+				PhotoID _tmp12_;
+				LibraryPhoto* _tmp13_;
 				gboolean _tmp14_ = FALSE;
-				LibraryPhoto* _tmp15_ = NULL;
+				LibraryPhoto* _tmp15_;
 #line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = library_photo_global;
 #line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40459,20 +40437,20 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 				_tmp15_ = photo;
 #line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp15_ != NULL) {
-#line 40458 "Photo.c"
-					LibraryPhoto* _tmp16_ = NULL;
-					gboolean _tmp17_ = FALSE;
+#line 40436 "Photo.c"
+					LibraryPhoto* _tmp16_;
+					gboolean _tmp17_;
 #line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = photo;
 #line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = !_tmp17_;
-#line 40467 "Photo.c"
+#line 40445 "Photo.c"
 				} else {
 #line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = FALSE;
-#line 40471 "Photo.c"
+#line 40449 "Photo.c"
 				}
 #line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp14_) {
@@ -40484,11 +40462,11 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 					ids = (g_free (ids), NULL);
 #line 5298 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 40483 "Photo.c"
+#line 40461 "Photo.c"
 				}
 #line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 40487 "Photo.c"
+#line 40465 "Photo.c"
 			}
 		}
 	}
@@ -40500,7 +40478,7 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 	ids = (g_free (ids), NULL);
 #line 5301 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 40499 "Photo.c"
+#line 40477 "Photo.c"
 }
 
 
@@ -40508,27 +40486,27 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 	LibraryPhoto * self;
 	gboolean result = FALSE;
 	GeeList* tags = NULL;
-	TagSourceCollection* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	TagSourceCollection* _tmp0_;
+	GeeList* _tmp1_;
 	PhotoMetadata* metadata = NULL;
-	PhotoMetadata* _tmp2_ = NULL;
-	PhotoMetadata* _tmp3_ = NULL;
-	Rating _tmp11_ = 0;
-	PhotoMetadata* _tmp12_ = NULL;
-	Rating _tmp13_ = 0;
+	PhotoMetadata* _tmp2_;
+	PhotoMetadata* _tmp3_;
+	Rating _tmp11_;
+	PhotoMetadata* _tmp12_;
+	Rating _tmp13_;
 	GeeSet* keywords = NULL;
-	PhotoMetadata* _tmp14_ = NULL;
-	GeeSet* _tmp15_ = NULL;
+	PhotoMetadata* _tmp14_;
+	GeeSet* _tmp15_;
 	gint _tmp16_ = 0;
-	GeeList* _tmp17_ = NULL;
+	GeeList* _tmp17_;
 	gint tags_count = 0;
 	gint _tmp21_ = 0;
-	GeeSet* _tmp22_ = NULL;
+	GeeSet* _tmp22_;
 	gint keywords_count = 0;
-	gint _tmp26_ = 0;
-	gint _tmp27_ = 0;
+	gint _tmp26_;
+	gint _tmp27_;
 	gboolean _tmp28_ = FALSE;
-	GeeList* _tmp29_ = NULL;
+	GeeList* _tmp29_;
 #line 5304 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5305 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40545,21 +40523,21 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 	_tmp3_ = metadata;
 #line 5308 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp3_ == NULL) {
-#line 40544 "Photo.c"
+#line 40522 "Photo.c"
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
-		GeeList* _tmp6_ = NULL;
+		GeeList* _tmp6_;
 #line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = tags;
 #line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp6_ != NULL) {
 #line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = TRUE;
-#line 40554 "Photo.c"
+#line 40532 "Photo.c"
 		} else {
-			GeeList* _tmp7_ = NULL;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
+			GeeList* _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
 #line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = tags;
 #line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40568,20 +40546,20 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 			_tmp9_ = _tmp8_;
 #line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp9_ > 0;
-#line 40567 "Photo.c"
+#line 40545 "Photo.c"
 		}
 #line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp5_) {
 #line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = TRUE;
-#line 40573 "Photo.c"
+#line 40551 "Photo.c"
 		} else {
-			Rating _tmp10_ = 0;
+			Rating _tmp10_;
 #line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp10_ != RATING_UNRATED;
-#line 40580 "Photo.c"
+#line 40558 "Photo.c"
 		}
 #line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp4_;
@@ -40591,7 +40569,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 		_g_object_unref0 (tags);
 #line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40590 "Photo.c"
+#line 40568 "Photo.c"
 	}
 #line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
@@ -40609,7 +40587,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 		_g_object_unref0 (tags);
 #line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40608 "Photo.c"
+#line 40586 "Photo.c"
 	}
 #line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = metadata;
@@ -40621,10 +40599,10 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 	_tmp17_ = tags;
 #line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_ != NULL) {
-#line 40620 "Photo.c"
-		GeeList* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
-		gint _tmp20_ = 0;
+#line 40598 "Photo.c"
+		GeeList* _tmp18_;
+		gint _tmp19_;
+		gint _tmp20_;
 #line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = tags;
 #line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40633,11 +40611,11 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 		_tmp20_ = _tmp19_;
 #line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp20_;
-#line 40632 "Photo.c"
+#line 40610 "Photo.c"
 	} else {
 #line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = 0;
-#line 40636 "Photo.c"
+#line 40614 "Photo.c"
 	}
 #line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 	tags_count = _tmp16_;
@@ -40645,10 +40623,10 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 	_tmp22_ = keywords;
 #line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 40644 "Photo.c"
-		GeeSet* _tmp23_ = NULL;
-		gint _tmp24_ = 0;
-		gint _tmp25_ = 0;
+#line 40622 "Photo.c"
+		GeeSet* _tmp23_;
+		gint _tmp24_;
+		gint _tmp25_;
 #line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = keywords;
 #line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40657,11 +40635,11 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 		_tmp25_ = _tmp24_;
 #line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp25_;
-#line 40656 "Photo.c"
+#line 40634 "Photo.c"
 	} else {
 #line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = 0;
-#line 40660 "Photo.c"
+#line 40638 "Photo.c"
 	}
 #line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 	keywords_count = _tmp21_;
@@ -40681,35 +40659,35 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 		_g_object_unref0 (tags);
 #line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40680 "Photo.c"
+#line 40658 "Photo.c"
 	}
 #line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = tags;
 #line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp29_ != NULL) {
-#line 40686 "Photo.c"
-		GeeSet* _tmp30_ = NULL;
+#line 40664 "Photo.c"
+		GeeSet* _tmp30_;
 #line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = keywords;
 #line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = _tmp30_ != NULL;
-#line 40692 "Photo.c"
+#line 40670 "Photo.c"
 	} else {
 #line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = FALSE;
-#line 40696 "Photo.c"
+#line 40674 "Photo.c"
 	}
 #line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28_) {
-#line 40700 "Photo.c"
+#line 40678 "Photo.c"
 		{
 			GeeList* _tag_list = NULL;
-			GeeList* _tmp31_ = NULL;
-			GeeList* _tmp32_ = NULL;
+			GeeList* _tmp31_;
+			GeeList* _tmp32_;
 			gint _tag_size = 0;
-			GeeList* _tmp33_ = NULL;
-			gint _tmp34_ = 0;
-			gint _tmp35_ = 0;
+			GeeList* _tmp33_;
+			gint _tmp34_;
+			gint _tmp35_;
 			gint _tag_index = 0;
 #line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = tags;
@@ -40729,22 +40707,22 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 			_tag_index = -1;
 #line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 40728 "Photo.c"
-				gint _tmp36_ = 0;
-				gint _tmp37_ = 0;
-				gint _tmp38_ = 0;
+#line 40706 "Photo.c"
+				gint _tmp36_;
+				gint _tmp37_;
+				gint _tmp38_;
 				Tag* tag = NULL;
-				GeeList* _tmp39_ = NULL;
-				gint _tmp40_ = 0;
-				gpointer _tmp41_ = NULL;
-				GeeSet* _tmp42_ = NULL;
-				Tag* _tmp43_ = NULL;
-				gchar* _tmp44_ = NULL;
-				gchar* _tmp45_ = NULL;
-				gchar* _tmp46_ = NULL;
-				gchar* _tmp47_ = NULL;
-				gboolean _tmp48_ = FALSE;
-				gboolean _tmp49_ = FALSE;
+				GeeList* _tmp39_;
+				gint _tmp40_;
+				gpointer _tmp41_;
+				GeeSet* _tmp42_;
+				Tag* _tmp43_;
+				gchar* _tmp44_;
+				gchar* _tmp45_;
+				gchar* _tmp46_;
+				gchar* _tmp47_;
+				gboolean _tmp48_;
+				gboolean _tmp49_;
 #line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = _tag_index;
 #line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40757,7 +40735,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 				if (!(_tmp37_ < _tmp38_)) {
 #line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 40756 "Photo.c"
+#line 40734 "Photo.c"
 				}
 #line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = _tag_list;
@@ -40803,15 +40781,15 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 					_g_object_unref0 (tags);
 #line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 40802 "Photo.c"
+#line 40780 "Photo.c"
 				}
 #line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (tag);
-#line 40806 "Photo.c"
+#line 40784 "Photo.c"
 			}
 #line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_list);
-#line 40810 "Photo.c"
+#line 40788 "Photo.c"
 		}
 	}
 #line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40824,18 +40802,18 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 	_g_object_unref0 (tags);
 #line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40823 "Photo.c"
+#line 40801 "Photo.c"
 }
 
 
 static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoMetadata* metadata) {
 	LibraryPhoto * self;
 	GeeList* photo_tags = NULL;
-	TagSourceCollection* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	PhotoMetadata* _tmp22_ = NULL;
-	Rating _tmp23_ = 0;
+	TagSourceCollection* _tmp0_;
+	GeeList* _tmp1_;
+	GeeList* _tmp2_;
+	PhotoMetadata* _tmp22_;
+	Rating _tmp23_;
 #line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40850,24 +40828,24 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 	_tmp2_ = photo_tags;
 #line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 40849 "Photo.c"
+#line 40827 "Photo.c"
 		GeeCollection* string_tags = NULL;
-		GeeArrayList* _tmp3_ = NULL;
-		PhotoMetadata* _tmp19_ = NULL;
-		GeeCollection* _tmp20_ = NULL;
+		GeeArrayList* _tmp3_;
+		PhotoMetadata* _tmp19_;
+		GeeCollection* _tmp20_;
 #line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
 		string_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 40858 "Photo.c"
+#line 40836 "Photo.c"
 		{
 			GeeList* _tag_list = NULL;
-			GeeList* _tmp4_ = NULL;
-			GeeList* _tmp5_ = NULL;
+			GeeList* _tmp4_;
+			GeeList* _tmp5_;
 			gint _tag_size = 0;
-			GeeList* _tmp6_ = NULL;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
+			GeeList* _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 			gint _tag_index = 0;
 #line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = photo_tags;
@@ -40887,18 +40865,18 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 			_tag_index = -1;
 #line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 40886 "Photo.c"
-				gint _tmp9_ = 0;
-				gint _tmp10_ = 0;
-				gint _tmp11_ = 0;
+#line 40864 "Photo.c"
+				gint _tmp9_;
+				gint _tmp10_;
+				gint _tmp11_;
 				Tag* tag = NULL;
-				GeeList* _tmp12_ = NULL;
-				gint _tmp13_ = 0;
-				gpointer _tmp14_ = NULL;
-				GeeCollection* _tmp15_ = NULL;
-				Tag* _tmp16_ = NULL;
-				gchar* _tmp17_ = NULL;
-				gchar* _tmp18_ = NULL;
+				GeeList* _tmp12_;
+				gint _tmp13_;
+				gpointer _tmp14_;
+				GeeCollection* _tmp15_;
+				Tag* _tmp16_;
+				gchar* _tmp17_;
+				gchar* _tmp18_;
 #line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tag_index;
 #line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40911,7 +40889,7 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 				if (!(_tmp10_ < _tmp11_)) {
 #line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 40910 "Photo.c"
+#line 40888 "Photo.c"
 				}
 #line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tag_list;
@@ -40935,11 +40913,11 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 				_g_free0 (_tmp18_);
 #line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (tag);
-#line 40934 "Photo.c"
+#line 40912 "Photo.c"
 			}
 #line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_list);
-#line 40938 "Photo.c"
+#line 40916 "Photo.c"
 		}
 #line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = metadata;
@@ -40949,14 +40927,14 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 		photo_metadata_set_keywords (_tmp19_, _tmp20_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (string_tags);
-#line 40948 "Photo.c"
+#line 40926 "Photo.c"
 	} else {
-		PhotoMetadata* _tmp21_ = NULL;
+		PhotoMetadata* _tmp21_;
 #line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = metadata;
 #line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_keywords (_tmp21_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 40955 "Photo.c"
+#line 40933 "Photo.c"
 	}
 #line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = metadata;
@@ -40966,20 +40944,20 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 	photo_metadata_set_rating (_tmp22_, _tmp23_);
 #line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo_tags);
-#line 40965 "Photo.c"
+#line 40943 "Photo.c"
 }
 
 
 static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, PhotoMetadata* metadata) {
 	LibraryPhoto * self;
 	HierarchicalTagIndex* new_htag_index = NULL;
-	PhotoMetadata* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	PhotoMetadata* _tmp0_;
+	gboolean _tmp1_;
 	GeeCollection* keywords = NULL;
-	PhotoMetadata* _tmp6_ = NULL;
-	GeeSet* _tmp7_ = NULL;
-	GeeCollection* _tmp8_ = NULL;
-	HierarchicalTagIndex* _tmp39_ = NULL;
+	PhotoMetadata* _tmp6_;
+	GeeSet* _tmp7_;
+	GeeCollection* _tmp8_;
+	HierarchicalTagIndex* _tmp39_;
 #line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40992,11 +40970,11 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 	_tmp1_ = photo_metadata_has_hierarchical_keywords (_tmp0_);
 #line 5348 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 40991 "Photo.c"
-		PhotoMetadata* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeSet* _tmp4_ = NULL;
-		HierarchicalTagIndex* _tmp5_ = NULL;
+#line 40969 "Photo.c"
+		PhotoMetadata* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeSet* _tmp4_;
+		HierarchicalTagIndex* _tmp5_;
 #line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = metadata;
 #line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41011,7 +40989,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 		new_htag_index = _tmp5_;
 #line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp4_);
-#line 41010 "Photo.c"
+#line 40988 "Photo.c"
 	}
 #line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = metadata;
@@ -41023,11 +41001,11 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 	_tmp8_ = keywords;
 #line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ != NULL) {
-#line 41022 "Photo.c"
+#line 41000 "Photo.c"
 		{
 			GeeIterator* _keyword_it = NULL;
-			GeeCollection* _tmp9_ = NULL;
-			GeeIterator* _tmp10_ = NULL;
+			GeeCollection* _tmp9_;
+			GeeIterator* _tmp10_;
 #line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = keywords;
 #line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41036,29 +41014,29 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 			_keyword_it = _tmp10_;
 #line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41035 "Photo.c"
-				GeeIterator* _tmp11_ = NULL;
-				gboolean _tmp12_ = FALSE;
+#line 41013 "Photo.c"
+				GeeIterator* _tmp11_;
+				gboolean _tmp12_;
 				gchar* keyword = NULL;
-				GeeIterator* _tmp13_ = NULL;
-				gpointer _tmp14_ = NULL;
+				GeeIterator* _tmp13_;
+				gpointer _tmp14_;
 				gboolean _tmp15_ = FALSE;
-				HierarchicalTagIndex* _tmp16_ = NULL;
+				HierarchicalTagIndex* _tmp16_;
 				gchar* safe_keyword = NULL;
-				const gchar* _tmp20_ = NULL;
-				gchar* _tmp21_ = NULL;
+				const gchar* _tmp20_;
+				gchar* _tmp21_;
 				gchar* promoted_keyword = NULL;
-				const gchar* _tmp22_ = NULL;
-				gchar* _tmp23_ = NULL;
-				TagSourceCollection* _tmp24_ = NULL;
-				const gchar* _tmp25_ = NULL;
-				gboolean _tmp26_ = FALSE;
-				TagSourceCollection* _tmp30_ = NULL;
-				const gchar* _tmp31_ = NULL;
-				gboolean _tmp32_ = FALSE;
-				const gchar* _tmp36_ = NULL;
-				Tag* _tmp37_ = NULL;
-				Tag* _tmp38_ = NULL;
+				const gchar* _tmp22_;
+				gchar* _tmp23_;
+				TagSourceCollection* _tmp24_;
+				const gchar* _tmp25_;
+				gboolean _tmp26_;
+				TagSourceCollection* _tmp30_;
+				const gchar* _tmp31_;
+				gboolean _tmp32_;
+				const gchar* _tmp36_;
+				Tag* _tmp37_;
+				Tag* _tmp38_;
 #line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _keyword_it;
 #line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41067,7 +41045,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				if (!_tmp12_) {
 #line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 41066 "Photo.c"
+#line 41044 "Photo.c"
 				}
 #line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _keyword_it;
@@ -41079,10 +41057,10 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				_tmp16_ = new_htag_index;
 #line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp16_ != NULL) {
-#line 41078 "Photo.c"
-					HierarchicalTagIndex* _tmp17_ = NULL;
-					const gchar* _tmp18_ = NULL;
-					gboolean _tmp19_ = FALSE;
+#line 41056 "Photo.c"
+					HierarchicalTagIndex* _tmp17_;
+					const gchar* _tmp18_;
+					gboolean _tmp19_;
 #line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = new_htag_index;
 #line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41091,11 +41069,11 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 					_tmp19_ = hierarchical_tag_index_is_tag_in_index (_tmp17_, _tmp18_);
 #line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = _tmp19_;
-#line 41090 "Photo.c"
+#line 41068 "Photo.c"
 				} else {
 #line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = FALSE;
-#line 41094 "Photo.c"
+#line 41072 "Photo.c"
 				}
 #line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp15_) {
@@ -41103,7 +41081,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 					_g_free0 (keyword);
 #line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
 					continue;
-#line 41102 "Photo.c"
+#line 41080 "Photo.c"
 				}
 #line 5359 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = keyword;
@@ -41125,10 +41103,10 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				_tmp26_ = tag_source_collection_exists (_tmp24_, _tmp25_, FALSE);
 #line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp26_) {
-#line 41124 "Photo.c"
-					const gchar* _tmp27_ = NULL;
-					Tag* _tmp28_ = NULL;
-					Tag* _tmp29_ = NULL;
+#line 41102 "Photo.c"
+					const gchar* _tmp27_;
+					Tag* _tmp28_;
+					Tag* _tmp29_;
 #line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp27_ = safe_keyword;
 #line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41147,7 +41125,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 					_g_free0 (keyword);
 #line 5365 "/home/jens/Source/shotwell/src/Photo.vala"
 					continue;
-#line 41146 "Photo.c"
+#line 41124 "Photo.c"
 				}
 #line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = tag_global;
@@ -41157,10 +41135,10 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				_tmp32_ = tag_source_collection_exists (_tmp30_, _tmp31_, FALSE);
 #line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp32_) {
-#line 41156 "Photo.c"
-					const gchar* _tmp33_ = NULL;
-					Tag* _tmp34_ = NULL;
-					Tag* _tmp35_ = NULL;
+#line 41134 "Photo.c"
+					const gchar* _tmp33_;
+					Tag* _tmp34_;
+					Tag* _tmp35_;
 #line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp33_ = promoted_keyword;
 #line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41179,7 +41157,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 					_g_free0 (keyword);
 #line 5370 "/home/jens/Source/shotwell/src/Photo.vala"
 					continue;
-#line 41178 "Photo.c"
+#line 41156 "Photo.c"
 				}
 #line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = keyword;
@@ -41197,25 +41175,25 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				_g_free0 (safe_keyword);
 #line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (keyword);
-#line 41196 "Photo.c"
+#line 41174 "Photo.c"
 			}
 #line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_keyword_it);
-#line 41200 "Photo.c"
+#line 41178 "Photo.c"
 		}
 	}
 #line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = new_htag_index;
 #line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp39_ != NULL) {
-#line 41207 "Photo.c"
+#line 41185 "Photo.c"
 		{
 			GeeIterator* _path_it = NULL;
-			HierarchicalTagIndex* _tmp40_ = NULL;
-			GeeCollection* _tmp41_ = NULL;
-			GeeCollection* _tmp42_ = NULL;
-			GeeIterator* _tmp43_ = NULL;
-			GeeIterator* _tmp44_ = NULL;
+			HierarchicalTagIndex* _tmp40_;
+			GeeCollection* _tmp41_;
+			GeeCollection* _tmp42_;
+			GeeIterator* _tmp43_;
+			GeeIterator* _tmp44_;
 #line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = new_htag_index;
 #line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41232,15 +41210,15 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 			_path_it = _tmp44_;
 #line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41231 "Photo.c"
-				GeeIterator* _tmp45_ = NULL;
-				gboolean _tmp46_ = FALSE;
+#line 41209 "Photo.c"
+				GeeIterator* _tmp45_;
+				gboolean _tmp46_;
 				gchar* path = NULL;
-				GeeIterator* _tmp47_ = NULL;
-				gpointer _tmp48_ = NULL;
-				const gchar* _tmp49_ = NULL;
-				Tag* _tmp50_ = NULL;
-				Tag* _tmp51_ = NULL;
+				GeeIterator* _tmp47_;
+				gpointer _tmp48_;
+				const gchar* _tmp49_;
+				Tag* _tmp50_;
+				Tag* _tmp51_;
 #line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _path_it;
 #line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41249,7 +41227,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				if (!_tmp46_) {
 #line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 41248 "Photo.c"
+#line 41226 "Photo.c"
 				}
 #line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = _path_it;
@@ -41269,18 +41247,18 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				_g_object_unref0 (_tmp51_);
 #line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (path);
-#line 41268 "Photo.c"
+#line 41246 "Photo.c"
 			}
 #line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_path_it);
-#line 41272 "Photo.c"
+#line 41250 "Photo.c"
 		}
 	}
 #line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (keywords);
 #line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_hierarchical_tag_index_unref0 (new_htag_index);
-#line 41279 "Photo.c"
+#line 41257 "Photo.c"
 }
 
 
@@ -41290,46 +41268,46 @@ static void library_photo_class_init (LibraryPhotoClass * klass) {
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_type_class_add_private (klass, sizeof (LibraryPhotoPrivate));
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->notify_master_reimported = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_notify_master_reimported;
+	((PhotoClass *) klass)->notify_master_reimported = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_notify_master_reimported;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->notify_editable_reimported = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_notify_editable_reimported;
+	((PhotoClass *) klass)->notify_editable_reimported = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_notify_editable_reimported;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->notify_source_reimported = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_notify_source_reimported;
+	((PhotoClass *) klass)->notify_source_reimported = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_notify_source_reimported;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->notify_baseline_reimported = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_notify_baseline_reimported;
+	((PhotoClass *) klass)->notify_baseline_reimported = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_notify_baseline_reimported;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) library_photo_real_notify_altered;
+	((DataObjectClass *) klass)->notify_altered = (void (*) (DataObject *, Alteration*)) library_photo_real_notify_altered;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*)(MediaSource*, Scaling*, GError**)) library_photo_real_get_preview_pixbuf;
+	((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*) (MediaSource *, Scaling*, GError**)) library_photo_real_get_preview_pixbuf;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->rotate = (void (*)(Photo*, Rotation)) library_photo_real_rotate;
+	((PhotoClass *) klass)->rotate = (void (*) (Photo *, Rotation)) library_photo_real_rotate;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) library_photo_real_get_thumbnail;
+	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) library_photo_real_get_thumbnail;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->is_trashed = (gboolean (*)(MediaSource*)) library_photo_real_is_trashed;
+	((MediaSourceClass *) klass)->is_trashed = (gboolean (*) (MediaSource *)) library_photo_real_is_trashed;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->trash = (void (*)(MediaSource*)) library_photo_real_trash;
+	((MediaSourceClass *) klass)->trash = (void (*) (MediaSource *)) library_photo_real_trash;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->untrash = (void (*)(MediaSource*)) library_photo_real_untrash;
+	((MediaSourceClass *) klass)->untrash = (void (*) (MediaSource *)) library_photo_real_untrash;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->is_offline = (gboolean (*)(MediaSource*)) library_photo_real_is_offline;
+	((MediaSourceClass *) klass)->is_offline = (gboolean (*) (MediaSource *)) library_photo_real_is_offline;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->mark_offline = (void (*)(MediaSource*)) library_photo_real_mark_offline;
+	((MediaSourceClass *) klass)->mark_offline = (void (*) (MediaSource *)) library_photo_real_mark_offline;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((MediaSourceClass *) klass)->mark_online = (void (*)(MediaSource*)) library_photo_real_mark_online;
+	((MediaSourceClass *) klass)->mark_online = (void (*) (MediaSource *)) library_photo_real_mark_online;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*)(DataSource*, GError**)) library_photo_real_internal_delete_backing;
+	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) library_photo_real_internal_delete_backing;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((DataSourceClass *) klass)->destroy = (void (*)(DataSource*)) library_photo_real_destroy;
+	((DataSourceClass *) klass)->destroy = (void (*) (DataSource *)) library_photo_real_destroy;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*)(Photo*)) library_photo_real_has_user_generated_metadata;
+	((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*) (Photo *)) library_photo_real_has_user_generated_metadata;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->set_user_metadata_for_export = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_set_user_metadata_for_export;
+	((PhotoClass *) klass)->set_user_metadata_for_export = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_set_user_metadata_for_export;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_apply_user_metadata_for_reimport;
+	((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_apply_user_metadata_for_reimport;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_photo_finalize;
-#line 41328 "Photo.c"
+#line 41306 "Photo.c"
 }
 
 
@@ -41337,12 +41315,12 @@ static void library_photo_flaggable_interface_init (FlaggableIface * iface) {
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_flaggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	iface->is_flagged = (gboolean (*)(Flaggable*)) library_photo_real_is_flagged;
+	iface->is_flagged = (gboolean (*) (Flaggable *)) library_photo_real_is_flagged;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	iface->mark_flagged = (void (*)(Flaggable*)) library_photo_real_mark_flagged;
+	iface->mark_flagged = (void (*) (Flaggable *)) library_photo_real_mark_flagged;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	iface->mark_unflagged = (void (*)(Flaggable*)) library_photo_real_mark_unflagged;
-#line 41341 "Photo.c"
+	iface->mark_unflagged = (void (*) (Flaggable *)) library_photo_real_mark_unflagged;
+#line 41319 "Photo.c"
 }
 
 
@@ -41350,16 +41328,16 @@ static void library_photo_monitorable_interface_init (MonitorableIface * iface)
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_monitorable_parent_iface = g_type_interface_peek_parent (iface);
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	iface->is_offline = (gboolean (*)(Monitorable*)) library_photo_real_is_offline;
+	iface->is_offline = (gboolean (*) (Monitorable *)) library_photo_real_is_offline;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	iface->mark_offline = (void (*)(Monitorable*)) library_photo_real_mark_offline;
+	iface->mark_offline = (void (*) (Monitorable *)) library_photo_real_mark_offline;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	iface->mark_online = (void (*)(Monitorable*)) library_photo_real_mark_online;
+	iface->mark_online = (void (*) (Monitorable *)) library_photo_real_mark_online;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	iface->set_master_file = (void (*)(Monitorable*, GFile*)) photo_set_master_file;
+	iface->set_master_file = (void (*) (Monitorable *, GFile*)) photo_set_master_file;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
-	iface->set_master_timestamp = (void (*)(Monitorable*, GFileInfo*)) photo_set_master_timestamp;
-#line 41358 "Photo.c"
+	iface->set_master_timestamp = (void (*) (Monitorable *, GFileInfo*)) photo_set_master_timestamp;
+#line 41336 "Photo.c"
 }
 
 
@@ -41370,11 +41348,11 @@ static void library_photo_instance_init (LibraryPhoto * self) {
 	self->priv->block_thumbnail_generation = FALSE;
 #line 4958 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->thumbnail_scheduler = NULL;
-#line 41369 "Photo.c"
+#line 41347 "Photo.c"
 }
 
 
-static void library_photo_finalize (GObject* obj) {
+static void library_photo_finalize (GObject * obj) {
 	LibraryPhoto * self;
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO, LibraryPhoto);
@@ -41384,7 +41362,7 @@ static void library_photo_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->import_keywords);
 #line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (library_photo_parent_class)->finalize (obj);
-#line 41383 "Photo.c"
+#line 41361 "Photo.c"
 }
 
 
@@ -41406,11 +41384,11 @@ GType library_photo_get_type (void) {
 
 LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_construct (GType object_type, LibraryPhotoSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) {
 	LibraryPhotoSourceHoldingTank* self = NULL;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	SourceHoldingTankCheckToKeep _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	GetSourceDatabaseKey _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
+	LibraryPhotoSourceCollection* _tmp0_;
+	SourceHoldingTankCheckToKeep _tmp1_;
+	void* _tmp1__target;
+	GetSourceDatabaseKey _tmp2_;
+	void* _tmp2__target;
 #line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (sources), NULL);
 #line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41427,27 +41405,27 @@ LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_construct (GTyp
 	self = (LibraryPhotoSourceHoldingTank*) media_source_holding_tank_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp1_, _tmp1__target, _tmp2_, _tmp2__target);
 #line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 41426 "Photo.c"
+#line 41404 "Photo.c"
 }
 
 
 LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_new (LibraryPhotoSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) {
 #line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_source_holding_tank_construct (TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target, get_key, get_key_target);
-#line 41433 "Photo.c"
+#line 41411 "Photo.c"
 }
 
 
 LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPhotoSourceHoldingTank* self, GFile* file) {
 	LibraryPhoto* result = NULL;
 	LibraryPhoto* ret = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	LibraryPhoto* _tmp3_ = NULL;
-	GeeHashMap* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	gpointer _tmp6_ = NULL;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gpointer _tmp2_;
+	LibraryPhoto* _tmp3_;
+	GeeHashMap* _tmp4_;
+	GFile* _tmp5_;
+	gpointer _tmp6_;
 #line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self), NULL);
 #line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41472,7 +41450,7 @@ LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPh
 		result = ret;
 #line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 41471 "Photo.c"
+#line 41449 "Photo.c"
 	}
 #line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = self->priv->development_file_map;
@@ -41486,30 +41464,30 @@ LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPh
 	_g_object_unref0 (ret);
 #line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 41485 "Photo.c"
+#line 41463 "Photo.c"
 }
 
 
 static void _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self) {
 #line 5430 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_holding_tank_on_editable_replaced ((LibraryPhotoSourceHoldingTank*) self, _sender, old_file, new_file);
-#line 41492 "Photo.c"
+#line 41470 "Photo.c"
 }
 
 
 static void _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) {
 #line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_holding_tank_on_raw_development_modified ((LibraryPhotoSourceHoldingTank*) self, _sender);
-#line 41499 "Photo.c"
+#line 41477 "Photo.c"
 }
 
 
 static void library_photo_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed) {
 	LibraryPhotoSourceHoldingTank * self;
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp40_ = NULL;
-	GeeCollection* _tmp81_ = NULL;
-	GeeCollection* _tmp82_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp40_;
+	GeeCollection* _tmp81_;
+	GeeCollection* _tmp82_;
 #line 5409 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank);
 #line 5409 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41520,11 +41498,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 	_tmp0_ = added;
 #line 5411 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 41519 "Photo.c"
+#line 41497 "Photo.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp1_ = NULL;
-			GeeIterator* _tmp2_ = NULL;
+			GeeCollection* _tmp1_;
+			GeeIterator* _tmp2_;
 #line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = added;
 #line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41533,25 +41511,25 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 			_source_it = _tmp2_;
 #line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41532 "Photo.c"
-				GeeIterator* _tmp3_ = NULL;
-				gboolean _tmp4_ = FALSE;
+#line 41510 "Photo.c"
+				GeeIterator* _tmp3_;
+				gboolean _tmp4_;
 				DataSource* source = NULL;
-				GeeIterator* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
+				GeeIterator* _tmp5_;
+				gpointer _tmp6_;
 				LibraryPhoto* photo = NULL;
-				DataSource* _tmp7_ = NULL;
-				LibraryPhoto* _tmp8_ = NULL;
-				LibraryPhoto* _tmp9_ = NULL;
-				GFile* _tmp10_ = NULL;
-				GFile* _tmp11_ = NULL;
-				gboolean _tmp12_ = FALSE;
+				DataSource* _tmp7_;
+				LibraryPhoto* _tmp8_;
+				LibraryPhoto* _tmp9_;
+				GFile* _tmp10_;
+				GFile* _tmp11_;
+				gboolean _tmp12_;
 				GeeCollection* raw_files = NULL;
-				LibraryPhoto* _tmp23_ = NULL;
-				GeeCollection* _tmp24_ = NULL;
-				GeeCollection* _tmp25_ = NULL;
-				LibraryPhoto* _tmp38_ = NULL;
-				LibraryPhoto* _tmp39_ = NULL;
+				LibraryPhoto* _tmp23_;
+				GeeCollection* _tmp24_;
+				GeeCollection* _tmp25_;
+				LibraryPhoto* _tmp38_;
+				LibraryPhoto* _tmp39_;
 #line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = _source_it;
 #line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41560,7 +41538,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				if (!_tmp4_) {
 #line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 41559 "Photo.c"
+#line 41537 "Photo.c"
 				}
 #line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _source_it;
@@ -41586,17 +41564,17 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				_g_object_unref0 (_tmp11_);
 #line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_) {
-#line 41585 "Photo.c"
-					GeeHashMap* _tmp13_ = NULL;
-					LibraryPhoto* _tmp14_ = NULL;
-					GFile* _tmp15_ = NULL;
-					GFile* _tmp16_ = NULL;
-					LibraryPhoto* _tmp17_ = NULL;
-					GeeMultiMap* _tmp18_ = NULL;
-					LibraryPhoto* _tmp19_ = NULL;
-					LibraryPhoto* _tmp20_ = NULL;
-					GFile* _tmp21_ = NULL;
-					GFile* _tmp22_ = NULL;
+#line 41563 "Photo.c"
+					GeeHashMap* _tmp13_;
+					LibraryPhoto* _tmp14_;
+					GFile* _tmp15_;
+					GFile* _tmp16_;
+					LibraryPhoto* _tmp17_;
+					GeeMultiMap* _tmp18_;
+					LibraryPhoto* _tmp19_;
+					LibraryPhoto* _tmp20_;
+					GFile* _tmp21_;
+					GFile* _tmp22_;
 #line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = self->priv->editable_file_map;
 #line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41625,7 +41603,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 					gee_multi_map_set (_tmp18_, _tmp19_, _tmp22_);
 #line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp22_);
-#line 41624 "Photo.c"
+#line 41602 "Photo.c"
 				}
 #line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = photo;
@@ -41637,11 +41615,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				_tmp25_ = raw_files;
 #line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp25_ != NULL) {
-#line 41636 "Photo.c"
+#line 41614 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
-						GeeCollection* _tmp26_ = NULL;
-						GeeIterator* _tmp27_ = NULL;
+						GeeCollection* _tmp26_;
+						GeeIterator* _tmp27_;
 #line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp26_ = raw_files;
 #line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41650,18 +41628,18 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 						_f_it = _tmp27_;
 #line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 41649 "Photo.c"
-							GeeIterator* _tmp28_ = NULL;
-							gboolean _tmp29_ = FALSE;
+#line 41627 "Photo.c"
+							GeeIterator* _tmp28_;
+							gboolean _tmp29_;
 							GFile* f = NULL;
-							GeeIterator* _tmp30_ = NULL;
-							gpointer _tmp31_ = NULL;
-							GeeHashMap* _tmp32_ = NULL;
-							GFile* _tmp33_ = NULL;
-							LibraryPhoto* _tmp34_ = NULL;
-							GeeMultiMap* _tmp35_ = NULL;
-							LibraryPhoto* _tmp36_ = NULL;
-							GFile* _tmp37_ = NULL;
+							GeeIterator* _tmp30_;
+							gpointer _tmp31_;
+							GeeHashMap* _tmp32_;
+							GFile* _tmp33_;
+							LibraryPhoto* _tmp34_;
+							GeeMultiMap* _tmp35_;
+							LibraryPhoto* _tmp36_;
+							GFile* _tmp37_;
 #line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp28_ = _f_it;
 #line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41670,7 +41648,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 							if (!_tmp29_) {
 #line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 41669 "Photo.c"
+#line 41647 "Photo.c"
 							}
 #line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp30_ = _f_it;
@@ -41696,11 +41674,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 							gee_multi_map_set (_tmp35_, _tmp36_, _tmp37_);
 #line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (f);
-#line 41695 "Photo.c"
+#line 41673 "Photo.c"
 						}
 #line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 41699 "Photo.c"
+#line 41677 "Photo.c"
 					}
 				}
 #line 5430 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41717,22 +41695,22 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				_g_object_unref0 (photo);
 #line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (source);
-#line 41716 "Photo.c"
+#line 41694 "Photo.c"
 			}
 #line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_source_it);
-#line 41720 "Photo.c"
+#line 41698 "Photo.c"
 		}
 	}
 #line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = removed;
 #line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp40_ != NULL) {
-#line 41727 "Photo.c"
+#line 41705 "Photo.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp41_ = NULL;
-			GeeIterator* _tmp42_ = NULL;
+			GeeCollection* _tmp41_;
+			GeeIterator* _tmp42_;
 #line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp41_ = removed;
 #line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41741,23 +41719,23 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 			_source_it = _tmp42_;
 #line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41740 "Photo.c"
-				GeeIterator* _tmp43_ = NULL;
-				gboolean _tmp44_ = FALSE;
+#line 41718 "Photo.c"
+				GeeIterator* _tmp43_;
+				gboolean _tmp44_;
 				DataSource* source = NULL;
-				GeeIterator* _tmp45_ = NULL;
-				gpointer _tmp46_ = NULL;
+				GeeIterator* _tmp45_;
+				gpointer _tmp46_;
 				LibraryPhoto* photo = NULL;
-				DataSource* _tmp47_ = NULL;
-				LibraryPhoto* _tmp48_ = NULL;
-				GeeMultiMap* _tmp73_ = NULL;
-				LibraryPhoto* _tmp74_ = NULL;
-				GeeMultiMap* _tmp75_ = NULL;
-				LibraryPhoto* _tmp76_ = NULL;
-				LibraryPhoto* _tmp77_ = NULL;
-				guint _tmp78_ = 0U;
-				LibraryPhoto* _tmp79_ = NULL;
-				guint _tmp80_ = 0U;
+				DataSource* _tmp47_;
+				LibraryPhoto* _tmp48_;
+				GeeMultiMap* _tmp73_;
+				LibraryPhoto* _tmp74_;
+				GeeMultiMap* _tmp75_;
+				LibraryPhoto* _tmp76_;
+				LibraryPhoto* _tmp77_;
+				guint _tmp78_;
+				LibraryPhoto* _tmp79_;
+				guint _tmp80_;
 #line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = _source_it;
 #line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41766,7 +41744,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				if (!_tmp44_) {
 #line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 41765 "Photo.c"
+#line 41743 "Photo.c"
 				}
 #line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _source_it;
@@ -41780,15 +41758,15 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				_tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
 #line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = _tmp48_;
-#line 41779 "Photo.c"
+#line 41757 "Photo.c"
 				{
 					GeeIterator* _f_it = NULL;
-					GeeMultiMap* _tmp49_ = NULL;
-					LibraryPhoto* _tmp50_ = NULL;
-					GeeCollection* _tmp51_ = NULL;
-					GeeCollection* _tmp52_ = NULL;
-					GeeIterator* _tmp53_ = NULL;
-					GeeIterator* _tmp54_ = NULL;
+					GeeMultiMap* _tmp49_;
+					LibraryPhoto* _tmp50_;
+					GeeCollection* _tmp51_;
+					GeeCollection* _tmp52_;
+					GeeIterator* _tmp53_;
+					GeeIterator* _tmp54_;
 #line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp49_ = self->priv->reverse_editable_file_map;
 #line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41807,14 +41785,14 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 					_f_it = _tmp54_;
 #line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 41806 "Photo.c"
-						GeeIterator* _tmp55_ = NULL;
-						gboolean _tmp56_ = FALSE;
+#line 41784 "Photo.c"
+						GeeIterator* _tmp55_;
+						gboolean _tmp56_;
 						GFile* f = NULL;
-						GeeIterator* _tmp57_ = NULL;
-						gpointer _tmp58_ = NULL;
-						GeeHashMap* _tmp59_ = NULL;
-						GFile* _tmp60_ = NULL;
+						GeeIterator* _tmp57_;
+						gpointer _tmp58_;
+						GeeHashMap* _tmp59_;
+						GFile* _tmp60_;
 #line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp55_ = _f_it;
 #line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41823,7 +41801,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 						if (!_tmp56_) {
 #line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 41822 "Photo.c"
+#line 41800 "Photo.c"
 						}
 #line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp57_ = _f_it;
@@ -41839,20 +41817,20 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 						gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp60_, NULL);
 #line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (f);
-#line 41838 "Photo.c"
+#line 41816 "Photo.c"
 					}
 #line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_f_it);
-#line 41842 "Photo.c"
+#line 41820 "Photo.c"
 				}
 				{
 					GeeIterator* _f_it = NULL;
-					GeeMultiMap* _tmp61_ = NULL;
-					LibraryPhoto* _tmp62_ = NULL;
-					GeeCollection* _tmp63_ = NULL;
-					GeeCollection* _tmp64_ = NULL;
-					GeeIterator* _tmp65_ = NULL;
-					GeeIterator* _tmp66_ = NULL;
+					GeeMultiMap* _tmp61_;
+					LibraryPhoto* _tmp62_;
+					GeeCollection* _tmp63_;
+					GeeCollection* _tmp64_;
+					GeeIterator* _tmp65_;
+					GeeIterator* _tmp66_;
 #line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = self->priv->reverse_development_file_map;
 #line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41871,14 +41849,14 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 					_f_it = _tmp66_;
 #line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 41870 "Photo.c"
-						GeeIterator* _tmp67_ = NULL;
-						gboolean _tmp68_ = FALSE;
+#line 41848 "Photo.c"
+						GeeIterator* _tmp67_;
+						gboolean _tmp68_;
 						GFile* f = NULL;
-						GeeIterator* _tmp69_ = NULL;
-						gpointer _tmp70_ = NULL;
-						GeeHashMap* _tmp71_ = NULL;
-						GFile* _tmp72_ = NULL;
+						GeeIterator* _tmp69_;
+						gpointer _tmp70_;
+						GeeHashMap* _tmp71_;
+						GFile* _tmp72_;
 #line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp67_ = _f_it;
 #line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41887,7 +41865,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 						if (!_tmp68_) {
 #line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 41886 "Photo.c"
+#line 41864 "Photo.c"
 						}
 #line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp69_ = _f_it;
@@ -41903,11 +41881,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 						gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp72_, NULL);
 #line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (f);
-#line 41902 "Photo.c"
+#line 41880 "Photo.c"
 					}
 #line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_f_it);
-#line 41906 "Photo.c"
+#line 41884 "Photo.c"
 				}
 #line 5444 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp73_ = self->priv->reverse_editable_file_map;
@@ -41937,11 +41915,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				_g_object_unref0 (photo);
 #line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (source);
-#line 41936 "Photo.c"
+#line 41914 "Photo.c"
 			}
 #line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_source_it);
-#line 41940 "Photo.c"
+#line 41918 "Photo.c"
 		}
 	}
 #line 5452 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41950,20 +41928,20 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 	_tmp82_ = removed;
 #line 5452 "/home/jens/Source/shotwell/src/Photo.vala"
 	SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp81_, _tmp82_);
-#line 41949 "Photo.c"
+#line 41927 "Photo.c"
 }
 
 
 static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhotoSourceHoldingTank* self, Photo* _photo, GFile* old_file, GFile* new_file) {
 	LibraryPhoto* photo = NULL;
-	Photo* _tmp0_ = NULL;
-	LibraryPhoto* _tmp1_ = NULL;
-	LibraryPhoto* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp9_ = NULL;
-	GeeMultiMap* _tmp13_ = NULL;
-	LibraryPhoto* _tmp14_ = NULL;
-	GFile* _tmp15_ = NULL;
+	Photo* _tmp0_;
+	LibraryPhoto* _tmp1_;
+	LibraryPhoto* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp9_;
+	GeeMultiMap* _tmp13_;
+	LibraryPhoto* _tmp14_;
+	GFile* _tmp15_;
 #line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self));
 #line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41986,12 +41964,12 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto
 	_tmp3_ = old_file;
 #line 5459 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp3_ != NULL) {
-#line 41985 "Photo.c"
-		GeeHashMap* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		GeeMultiMap* _tmp6_ = NULL;
-		LibraryPhoto* _tmp7_ = NULL;
-		GFile* _tmp8_ = NULL;
+#line 41963 "Photo.c"
+		GeeHashMap* _tmp4_;
+		GFile* _tmp5_;
+		GeeMultiMap* _tmp6_;
+		LibraryPhoto* _tmp7_;
+		GFile* _tmp8_;
 #line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = self->priv->editable_file_map;
 #line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42006,16 +41984,16 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto
 		_tmp8_ = old_file;
 #line 5461 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_multi_map_remove (_tmp6_, _tmp7_, _tmp8_);
-#line 42005 "Photo.c"
+#line 41983 "Photo.c"
 	}
 #line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = new_file;
 #line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp9_ != NULL) {
-#line 42011 "Photo.c"
-		GeeHashMap* _tmp10_ = NULL;
-		GFile* _tmp11_ = NULL;
-		LibraryPhoto* _tmp12_ = NULL;
+#line 41989 "Photo.c"
+		GeeHashMap* _tmp10_;
+		GFile* _tmp11_;
+		LibraryPhoto* _tmp12_;
 #line 5465 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = self->priv->editable_file_map;
 #line 5465 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42024,7 +42002,7 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto
 		_tmp12_ = photo;
 #line 5465 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_);
-#line 42023 "Photo.c"
+#line 42001 "Photo.c"
 	}
 #line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = self->priv->reverse_editable_file_map;
@@ -42036,22 +42014,22 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto
 	gee_multi_map_set (_tmp13_, _tmp14_, _tmp15_);
 #line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 42035 "Photo.c"
+#line 42013 "Photo.c"
 }
 
 
 static void library_photo_source_holding_tank_on_raw_development_modified (LibraryPhotoSourceHoldingTank* self, Photo* _photo) {
 	LibraryPhoto* photo = NULL;
-	Photo* _tmp0_ = NULL;
-	LibraryPhoto* _tmp1_ = NULL;
-	LibraryPhoto* _tmp2_ = NULL;
-	GeeMultiMap* _tmp3_ = NULL;
-	LibraryPhoto* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	Photo* _tmp0_;
+	LibraryPhoto* _tmp1_;
+	LibraryPhoto* _tmp2_;
+	GeeMultiMap* _tmp3_;
+	LibraryPhoto* _tmp4_;
+	gboolean _tmp5_;
 	GeeCollection* raw_list = NULL;
-	LibraryPhoto* _tmp20_ = NULL;
-	GeeCollection* _tmp21_ = NULL;
-	GeeCollection* _tmp22_ = NULL;
+	LibraryPhoto* _tmp20_;
+	GeeCollection* _tmp21_;
+	GeeCollection* _tmp22_;
 #line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self));
 #line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42074,17 +42052,17 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 	_tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_);
 #line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 42073 "Photo.c"
-		GeeMultiMap* _tmp18_ = NULL;
-		LibraryPhoto* _tmp19_ = NULL;
+#line 42051 "Photo.c"
+		GeeMultiMap* _tmp18_;
+		LibraryPhoto* _tmp19_;
 		{
 			GeeIterator* _f_it = NULL;
-			GeeMultiMap* _tmp6_ = NULL;
-			LibraryPhoto* _tmp7_ = NULL;
-			GeeCollection* _tmp8_ = NULL;
-			GeeCollection* _tmp9_ = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			GeeIterator* _tmp11_ = NULL;
+			GeeMultiMap* _tmp6_;
+			LibraryPhoto* _tmp7_;
+			GeeCollection* _tmp8_;
+			GeeCollection* _tmp9_;
+			GeeIterator* _tmp10_;
+			GeeIterator* _tmp11_;
 #line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->priv->reverse_development_file_map;
 #line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42103,14 +42081,14 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 			_f_it = _tmp11_;
 #line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 42102 "Photo.c"
-				GeeIterator* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
+#line 42080 "Photo.c"
+				GeeIterator* _tmp12_;
+				gboolean _tmp13_;
 				GFile* f = NULL;
-				GeeIterator* _tmp14_ = NULL;
-				gpointer _tmp15_ = NULL;
-				GeeHashMap* _tmp16_ = NULL;
-				GFile* _tmp17_ = NULL;
+				GeeIterator* _tmp14_;
+				gpointer _tmp15_;
+				GeeHashMap* _tmp16_;
+				GFile* _tmp17_;
 #line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _f_it;
 #line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42119,7 +42097,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 				if (!_tmp13_) {
 #line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 42118 "Photo.c"
+#line 42096 "Photo.c"
 				}
 #line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _f_it;
@@ -42135,11 +42113,11 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 				gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_, NULL);
 #line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 42134 "Photo.c"
+#line 42112 "Photo.c"
 			}
 #line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 42138 "Photo.c"
+#line 42116 "Photo.c"
 		}
 #line 5477 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = self->priv->reverse_development_file_map;
@@ -42147,7 +42125,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 		_tmp19_ = photo;
 #line 5477 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_multi_map_remove_all (_tmp18_, _tmp19_);
-#line 42146 "Photo.c"
+#line 42124 "Photo.c"
 	}
 #line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = photo;
@@ -42159,11 +42137,11 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 	_tmp22_ = raw_list;
 #line 5482 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 42158 "Photo.c"
+#line 42136 "Photo.c"
 		{
 			GeeIterator* _f_it = NULL;
-			GeeCollection* _tmp23_ = NULL;
-			GeeIterator* _tmp24_ = NULL;
+			GeeCollection* _tmp23_;
+			GeeIterator* _tmp24_;
 #line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp23_ = raw_list;
 #line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42172,18 +42150,18 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 			_f_it = _tmp24_;
 #line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 42171 "Photo.c"
-				GeeIterator* _tmp25_ = NULL;
-				gboolean _tmp26_ = FALSE;
+#line 42149 "Photo.c"
+				GeeIterator* _tmp25_;
+				gboolean _tmp26_;
 				GFile* f = NULL;
-				GeeIterator* _tmp27_ = NULL;
-				gpointer _tmp28_ = NULL;
-				GeeHashMap* _tmp29_ = NULL;
-				GFile* _tmp30_ = NULL;
-				LibraryPhoto* _tmp31_ = NULL;
-				GeeMultiMap* _tmp32_ = NULL;
-				LibraryPhoto* _tmp33_ = NULL;
-				GFile* _tmp34_ = NULL;
+				GeeIterator* _tmp27_;
+				gpointer _tmp28_;
+				GeeHashMap* _tmp29_;
+				GFile* _tmp30_;
+				LibraryPhoto* _tmp31_;
+				GeeMultiMap* _tmp32_;
+				LibraryPhoto* _tmp33_;
+				GFile* _tmp34_;
 #line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = _f_it;
 #line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42192,7 +42170,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 				if (!_tmp26_) {
 #line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 42191 "Photo.c"
+#line 42169 "Photo.c"
 				}
 #line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = _f_it;
@@ -42218,18 +42196,18 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 				gee_multi_map_set (_tmp32_, _tmp33_, _tmp34_);
 #line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 42217 "Photo.c"
+#line 42195 "Photo.c"
 			}
 #line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 42221 "Photo.c"
+#line 42199 "Photo.c"
 		}
 	}
 #line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (raw_list);
 #line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 42228 "Photo.c"
+#line 42206 "Photo.c"
 }
 
 
@@ -42241,16 +42219,16 @@ static void library_photo_source_holding_tank_class_init (LibraryPhotoSourceHold
 #line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_type_class_add_private (klass, sizeof (LibraryPhotoSourceHoldingTankPrivate));
 #line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
-	((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*)(SourceHoldingTank*, GeeCollection*, GeeCollection*)) library_photo_source_holding_tank_real_notify_contents_altered;
-#line 42241 "Photo.c"
+	((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) library_photo_source_holding_tank_real_notify_contents_altered;
+#line 42219 "Photo.c"
 }
 
 
 static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceHoldingTank * self) {
-	GeeHashMap* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	GeeHashMultiMap* _tmp2_ = NULL;
-	GeeHashMultiMap* _tmp3_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeHashMap* _tmp1_;
+	GeeHashMultiMap* _tmp2_;
+	GeeHashMultiMap* _tmp3_;
 #line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv = LIBRARY_PHOTO_SOURCE_HOLDING_TANK_GET_PRIVATE (self);
 #line 5386 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42269,11 +42247,11 @@ static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceH
 	_tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 5392 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->reverse_development_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 42268 "Photo.c"
+#line 42246 "Photo.c"
 }
 
 
-static void library_photo_source_holding_tank_finalize (SourceHoldingTank* obj) {
+static void library_photo_source_holding_tank_finalize (SourceHoldingTank * obj) {
 	LibraryPhotoSourceHoldingTank * self;
 #line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank);
@@ -42287,7 +42265,7 @@ static void library_photo_source_holding_tank_finalize (SourceHoldingTank* obj)
 	_g_object_unref0 (self->priv->reverse_development_file_map);
 #line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
 	SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->finalize (obj);
-#line 42286 "Photo.c"
+#line 42264 "Photo.c"
 }
 
 
diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c
index a23c52f..f9c7e9f 100644
--- a/src/PhotoMonitor.c
+++ b/src/PhotoMonitor.c
@@ -1,4 +1,4 @@
-/* PhotoMonitor.c generated by valac 0.34.7, the Vala compiler
+/* PhotoMonitor.c generated by valac 0.36.6, the Vala compiler
  * generated from PhotoMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -418,7 +418,7 @@ struct _MediaMonitorClass {
 	MonitorableUpdates* (*create_updates) (MediaMonitor* self, Monitorable* monitorable);
 	void (*on_media_source_destroyed) (MediaMonitor* self, DataSource* source);
 	void (*notify_discovery_started) (MediaMonitor* self);
-	MediaMonitorDiscoveredFile (*notify_file_discovered) (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable** monitorable);
+	MediaMonitorDiscoveredFile (*notify_file_discovered) (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable);
 	GeeCollection* (*candidates_for_unknown_file) (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_);
 	GFile** (*get_auxilliary_backing_files) (MediaMonitor* self, Monitorable* monitorable, int* result_length1);
 	void (*update_backing_file_info) (MediaMonitor* self, Monitorable* monitorable, GFile* file, GFileInfo* info);
@@ -656,7 +656,7 @@ void photo_updates_set_reimport_raw_developments (PhotoUpdates* self, gboolean r
 static void photo_updates_real_set_reimport_raw_developments (PhotoUpdates* self, gboolean reimport);
 static gboolean photo_updates_real_is_all_updated (MonitorableUpdates* base);
 gboolean monitorable_updates_is_all_updated (MonitorableUpdates* self);
-static void photo_updates_finalize (MonitorableUpdates* obj);
+static void photo_updates_finalize (MonitorableUpdates * obj);
 GType media_monitor_get_type (void) G_GNUC_CONST;
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
@@ -713,7 +713,7 @@ static void photo_monitor_real_close (MediaMonitor* base);
 void background_job_cancel (BackgroundJob* self);
 void media_monitor_close (MediaMonitor* self);
 static void photo_monitor_cancel_reimports (PhotoMonitor* self, LibraryPhoto* photo);
-static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable** monitorable);
+static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable* * monitorable);
 static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonitor* base, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_);
 void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSourceCollection* self, GFileInfo* info, GeeCollection* matches_master, GeeCollection* matches_editable, GeeCollection* matched_development);
 gchar* data_object_to_string (DataObject* self);
@@ -724,9 +724,9 @@ void photo_monitor_update_raw_development_file (PhotoMonitor* self, LibraryPhoto
 static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* base, Monitorable* monitorable, int* result_length1);
 gboolean photo_has_editable (Photo* self);
 GFile* photo_get_editable_file (Photo* self);
-static void _vala_array_add131 (GFile*** array, int* length, int* size, GFile* value);
+static void _vala_array_add131 (GFile** * array, int* length, int* size, GFile* value);
 GeeCollection* photo_get_raw_developer_files (Photo* self);
-static void _vala_array_add132 (GFile*** array, int* length, int* size, GFile* value);
+static void _vala_array_add132 (GFile** * array, int* length, int* size, GFile* value);
 static GFile** _vala_array_dup31 (GFile** self, int length);
 static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Monitorable* monitorable, GFile* file, GFileInfo* info);
 GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorable);
@@ -853,25 +853,25 @@ gpointer value_get_abstract_semaphore (const GValue* value);
 GType abstract_semaphore_get_type (void) G_GNUC_CONST;
 BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore);
 static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base);
-gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState** reimport_state, GError** error);
-static void photo_monitor_reimport_master_job_finalize (BackgroundJob* obj);
+gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error);
+static void photo_monitor_reimport_master_job_finalize (BackgroundJob * obj);
 enum  {
 	PHOTO_MONITOR_REIMPORT_EDITABLE_JOB_DUMMY_PROPERTY
 };
 static void _photo_monitor_on_editable_reimported_completion_callback (BackgroundJob* job, gpointer self);
 static void _photo_monitor_on_editable_reimport_cancelled_cancellation_callback (BackgroundJob* job, gpointer self);
 static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* base);
-gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditableState** state, GError** error);
-static void photo_monitor_reimport_editable_job_finalize (BackgroundJob* obj);
+gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditableState* * state, GError** error);
+static void photo_monitor_reimport_editable_job_finalize (BackgroundJob * obj);
 enum  {
 	PHOTO_MONITOR_REIMPORT_RAW_DEVELOPMENT_JOB_DUMMY_PROPERTY
 };
 static void _photo_monitor_on_raw_development_reimported_completion_callback (BackgroundJob* job, gpointer self);
 static void _photo_monitor_on_raw_development_reimport_cancelled_cancellation_callback (BackgroundJob* job, gpointer self);
 static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJob* base);
-gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState** state, GError** error);
-static void photo_monitor_reimport_raw_development_job_finalize (BackgroundJob* obj);
-static void photo_monitor_finalize (GObject* obj);
+gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* * state, GError** error);
+static void photo_monitor_reimport_raw_development_job_finalize (BackgroundJob * obj);
+static void photo_monitor_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -885,9 +885,9 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 PhotoUpdates* photo_updates_construct (GType object_type, LibraryPhoto* photo) {
 	PhotoUpdates* self = NULL;
-	LibraryPhoto* _tmp0_ = NULL;
-	LibraryPhoto* _tmp1_ = NULL;
-	LibraryPhoto* _tmp2_ = NULL;
+	LibraryPhoto* _tmp0_;
+	LibraryPhoto* _tmp1_;
+	LibraryPhoto* _tmp2_;
 #line 22 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO (photo), NULL);
 #line 23 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -933,7 +933,7 @@ static void photo_updates_real_mark_offline (MonitorableUpdates* base) {
 
 gboolean photo_updates_is_reimport_master (PhotoUpdates* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 36 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_val_if_fail (IS_PHOTO_UPDATES (self), FALSE);
 #line 37 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -948,7 +948,7 @@ gboolean photo_updates_is_reimport_master (PhotoUpdates* self) {
 
 gboolean photo_updates_is_reimport_editable (PhotoUpdates* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 40 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_val_if_fail (IS_PHOTO_UPDATES (self), FALSE);
 #line 41 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -963,8 +963,8 @@ gboolean photo_updates_is_reimport_editable (PhotoUpdates* self) {
 
 GFile* photo_updates_get_editable_file (PhotoUpdates* self) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 44 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_val_if_fail (IS_PHOTO_UPDATES (self), NULL);
 #line 45 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -981,8 +981,8 @@ GFile* photo_updates_get_editable_file (PhotoUpdates* self) {
 
 GFileInfo* photo_updates_get_editable_file_info (PhotoUpdates* self) {
 	GFileInfo* result = NULL;
-	GFileInfo* _tmp0_ = NULL;
-	GFileInfo* _tmp1_ = NULL;
+	GFileInfo* _tmp0_;
+	GFileInfo* _tmp1_;
 #line 48 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_val_if_fail (IS_PHOTO_UPDATES (self), NULL);
 #line 49 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -999,8 +999,8 @@ GFileInfo* photo_updates_get_editable_file_info (PhotoUpdates* self) {
 
 GeeCollection* photo_updates_get_raw_developer_files (PhotoUpdates* self) {
 	GeeCollection* result = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp1_;
 #line 52 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_val_if_fail (IS_PHOTO_UPDATES (self), NULL);
 #line 53 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1019,7 +1019,7 @@ static gboolean photo_updates_real_is_in_alteration (MonitorableUpdates* base) {
 	PhotoUpdates * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_UPDATES, PhotoUpdates);
 #line 57 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1030,7 +1030,7 @@ static gboolean photo_updates_real_is_in_alteration (MonitorableUpdates* base) {
 		_tmp0_ = TRUE;
 #line 1032 "PhotoMonitor.c"
 	} else {
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 57 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp2_ = self->editable_in_alteration;
 #line 57 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1047,7 +1047,7 @@ static gboolean photo_updates_real_is_in_alteration (MonitorableUpdates* base) {
 
 gboolean photo_updates_is_revert_to_master (PhotoUpdates* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 60 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_val_if_fail (IS_PHOTO_UPDATES (self), FALSE);
 #line 61 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1062,9 +1062,9 @@ gboolean photo_updates_is_revert_to_master (PhotoUpdates* self) {
 
 static void photo_updates_real_set_editable_file (PhotoUpdates* self, GFile* file) {
 	gboolean _tmp0_ = FALSE;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
+	GFile* _tmp1_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
 #line 64 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail ((file == NULL) || G_IS_FILE (file));
 #line 66 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1072,7 +1072,7 @@ static void photo_updates_real_set_editable_file (PhotoUpdates* self, GFile* fil
 #line 66 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp1_ != NULL) {
 #line 1075 "PhotoMonitor.c"
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 66 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp2_ = self->revert_to_master;
 #line 66 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1112,10 +1112,10 @@ void photo_updates_set_editable_file (PhotoUpdates* self, GFile* file) {
 
 static void photo_updates_real_set_editable_file_info (PhotoUpdates* self, GFileInfo* info) {
 	gboolean _tmp0_ = FALSE;
-	GFileInfo* _tmp1_ = NULL;
-	GFileInfo* _tmp3_ = NULL;
-	GFileInfo* _tmp4_ = NULL;
-	GFileInfo* _tmp5_ = NULL;
+	GFileInfo* _tmp1_;
+	GFileInfo* _tmp3_;
+	GFileInfo* _tmp4_;
+	GFileInfo* _tmp5_;
 #line 72 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info));
 #line 74 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1123,7 +1123,7 @@ static void photo_updates_real_set_editable_file_info (PhotoUpdates* self, GFile
 #line 74 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp1_ != NULL) {
 #line 1126 "PhotoMonitor.c"
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 74 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp2_ = self->revert_to_master;
 #line 74 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1170,14 +1170,14 @@ void photo_updates_set_editable_file_info (PhotoUpdates* self, GFileInfo* info)
 
 static void photo_updates_real_set_editable_file_info_altered (PhotoUpdates* self, gboolean altered) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp1_;
+	gboolean _tmp3_;
 #line 84 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp1_ = altered;
 #line 84 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp1_) {
 #line 1180 "PhotoMonitor.c"
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 84 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp2_ = self->revert_to_master;
 #line 84 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1212,7 +1212,7 @@ void photo_updates_set_editable_file_info_altered (PhotoUpdates* self, gboolean
 
 
 static void photo_updates_real_set_editable_in_alteration (PhotoUpdates* self, gboolean in_alteration) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 91 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp0_ = in_alteration;
 #line 91 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1231,7 +1231,7 @@ void photo_updates_set_editable_in_alteration (PhotoUpdates* self, gboolean in_a
 
 
 static void photo_updates_real_set_raw_development_in_alteration (PhotoUpdates* self, gboolean in_alteration) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 95 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp0_ = in_alteration;
 #line 95 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1250,7 +1250,7 @@ void photo_updates_set_raw_development_in_alteration (PhotoUpdates* self, gboole
 
 
 static void photo_updates_real_set_raw_developer_file_info_altered (PhotoUpdates* self, gboolean altered) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 99 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp0_ = altered;
 #line 99 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1269,8 +1269,8 @@ void photo_updates_set_raw_developer_file_info_altered (PhotoUpdates* self, gboo
 
 
 static void photo_updates_real_set_revert_to_master (PhotoUpdates* self, gboolean revert) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
 #line 103 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp0_ = revert;
 #line 103 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1305,8 +1305,8 @@ void photo_updates_set_revert_to_master (PhotoUpdates* self, gboolean revert) {
 
 
 static void photo_updates_real_add_raw_developer_file (PhotoUpdates* self, GFile* file) {
-	GeeCollection* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GeeCollection* _tmp0_;
+	GFile* _tmp1_;
 #line 113 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
 #line 114 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1329,7 +1329,7 @@ void photo_updates_add_raw_developer_file (PhotoUpdates* self, GFile* file) {
 
 
 static void photo_updates_real_clear_raw_developer_files (PhotoUpdates* self) {
-	GeeCollection* _tmp0_ = NULL;
+	GeeCollection* _tmp0_;
 #line 118 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp0_ = self->developer_files;
 #line 118 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1348,8 +1348,8 @@ void photo_updates_clear_raw_developer_files (PhotoUpdates* self) {
 
 
 static void photo_updates_real_set_reimport_master (PhotoUpdates* self, gboolean reimport) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
 #line 122 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp0_ = reimport;
 #line 122 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1376,15 +1376,15 @@ void photo_updates_set_reimport_master (PhotoUpdates* self, gboolean reimport) {
 
 static void photo_updates_real_set_reimport_editable (PhotoUpdates* self, gboolean reimport) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	gboolean _tmp1_;
+	gboolean _tmp5_;
 #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp1_ = reimport;
 #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp1_) {
 #line 1386 "PhotoMonitor.c"
 		gboolean _tmp2_ = FALSE;
-		gboolean _tmp3_ = FALSE;
+		gboolean _tmp3_;
 #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp3_ = self->revert_to_master;
 #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1393,7 +1393,7 @@ static void photo_updates_real_set_reimport_editable (PhotoUpdates* self, gboole
 			_tmp2_ = TRUE;
 #line 1395 "PhotoMonitor.c"
 		} else {
-			gboolean _tmp4_ = FALSE;
+			gboolean _tmp4_;
 #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp4_ = monitorable_updates_is_set_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates));
 #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1432,8 +1432,8 @@ void photo_updates_set_reimport_editable (PhotoUpdates* self, gboolean reimport)
 
 
 static void photo_updates_real_set_reimport_raw_developments (PhotoUpdates* self, gboolean reimport) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
 #line 137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp0_ = reimport;
 #line 137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1470,7 +1470,7 @@ static gboolean photo_updates_real_is_all_updated (MonitorableUpdates* base) {
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_ = FALSE;
+	gboolean _tmp9_;
 #line 143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_UPDATES, PhotoUpdates);
 #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1478,7 +1478,7 @@ static gboolean photo_updates_real_is_all_updated (MonitorableUpdates* base) {
 #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp9_) {
 #line 1481 "PhotoMonitor.c"
-		gboolean _tmp10_ = FALSE;
+		gboolean _tmp10_;
 #line 145 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp10_ = self->reimport_master;
 #line 145 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1492,7 +1492,7 @@ static gboolean photo_updates_real_is_all_updated (MonitorableUpdates* base) {
 #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp8_) {
 #line 1495 "PhotoMonitor.c"
-		gboolean _tmp11_ = FALSE;
+		gboolean _tmp11_;
 #line 146 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp11_ = self->reimport_editable;
 #line 146 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1506,7 +1506,7 @@ static gboolean photo_updates_real_is_all_updated (MonitorableUpdates* base) {
 #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp7_) {
 #line 1509 "PhotoMonitor.c"
-		GFile* _tmp12_ = NULL;
+		GFile* _tmp12_;
 #line 147 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp12_ = self->editable_file;
 #line 147 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1520,7 +1520,7 @@ static gboolean photo_updates_real_is_all_updated (MonitorableUpdates* base) {
 #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp6_) {
 #line 1523 "PhotoMonitor.c"
-		gboolean _tmp13_ = FALSE;
+		gboolean _tmp13_;
 #line 148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp13_ = self->editable_file_info_altered;
 #line 148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1534,7 +1534,7 @@ static gboolean photo_updates_real_is_all_updated (MonitorableUpdates* base) {
 #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp5_) {
 #line 1537 "PhotoMonitor.c"
-		GFileInfo* _tmp14_ = NULL;
+		GFileInfo* _tmp14_;
 #line 149 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp14_ = self->editable_file_info;
 #line 149 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1548,7 +1548,7 @@ static gboolean photo_updates_real_is_all_updated (MonitorableUpdates* base) {
 #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp4_) {
 #line 1551 "PhotoMonitor.c"
-		gboolean _tmp15_ = FALSE;
+		gboolean _tmp15_;
 #line 150 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp15_ = self->editable_in_alteration;
 #line 150 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1562,9 +1562,9 @@ static gboolean photo_updates_real_is_all_updated (MonitorableUpdates* base) {
 #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp3_) {
 #line 1565 "PhotoMonitor.c"
-		GeeCollection* _tmp16_ = NULL;
-		gint _tmp17_ = 0;
-		gint _tmp18_ = 0;
+		GeeCollection* _tmp16_;
+		gint _tmp17_;
+		gint _tmp18_;
 #line 151 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp16_ = self->developer_files;
 #line 151 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1582,7 +1582,7 @@ static gboolean photo_updates_real_is_all_updated (MonitorableUpdates* base) {
 #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp2_) {
 #line 1585 "PhotoMonitor.c"
-		gboolean _tmp19_ = FALSE;
+		gboolean _tmp19_;
 #line 152 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp19_ = self->raw_developer_file_info_altered;
 #line 152 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1596,7 +1596,7 @@ static gboolean photo_updates_real_is_all_updated (MonitorableUpdates* base) {
 #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp1_) {
 #line 1599 "PhotoMonitor.c"
-		gboolean _tmp20_ = FALSE;
+		gboolean _tmp20_;
 #line 153 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp20_ = self->revert_to_master;
 #line 153 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1621,41 +1621,41 @@ static void photo_updates_class_init (PhotoUpdatesClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	((MonitorableUpdatesClass *) klass)->finalize = photo_updates_finalize;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->mark_offline = (void (*)(MonitorableUpdates*)) photo_updates_real_mark_offline;
+	((MonitorableUpdatesClass *) klass)->mark_offline = (void (*) (MonitorableUpdates *)) photo_updates_real_mark_offline;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->is_in_alteration = (gboolean (*)(MonitorableUpdates*)) photo_updates_real_is_in_alteration;
+	((MonitorableUpdatesClass *) klass)->is_in_alteration = (gboolean (*) (MonitorableUpdates *)) photo_updates_real_is_in_alteration;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_editable_file = (void (*)(PhotoUpdates*, GFile*)) photo_updates_real_set_editable_file;
+	((PhotoUpdatesClass *) klass)->set_editable_file = (void (*) (PhotoUpdates *, GFile*)) photo_updates_real_set_editable_file;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_editable_file_info = (void (*)(PhotoUpdates*, GFileInfo*)) photo_updates_real_set_editable_file_info;
+	((PhotoUpdatesClass *) klass)->set_editable_file_info = (void (*) (PhotoUpdates *, GFileInfo*)) photo_updates_real_set_editable_file_info;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_editable_file_info_altered = (void (*)(PhotoUpdates*, gboolean)) photo_updates_real_set_editable_file_info_altered;
+	((PhotoUpdatesClass *) klass)->set_editable_file_info_altered = (void (*) (PhotoUpdates *, gboolean)) photo_updates_real_set_editable_file_info_altered;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_editable_in_alteration = (void (*)(PhotoUpdates*, gboolean)) photo_updates_real_set_editable_in_alteration;
+	((PhotoUpdatesClass *) klass)->set_editable_in_alteration = (void (*) (PhotoUpdates *, gboolean)) photo_updates_real_set_editable_in_alteration;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_raw_development_in_alteration = (void (*)(PhotoUpdates*, gboolean)) photo_updates_real_set_raw_development_in_alteration;
+	((PhotoUpdatesClass *) klass)->set_raw_development_in_alteration = (void (*) (PhotoUpdates *, gboolean)) photo_updates_real_set_raw_development_in_alteration;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_raw_developer_file_info_altered = (void (*)(PhotoUpdates*, gboolean)) photo_updates_real_set_raw_developer_file_info_altered;
+	((PhotoUpdatesClass *) klass)->set_raw_developer_file_info_altered = (void (*) (PhotoUpdates *, gboolean)) photo_updates_real_set_raw_developer_file_info_altered;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_revert_to_master = (void (*)(PhotoUpdates*, gboolean)) photo_updates_real_set_revert_to_master;
+	((PhotoUpdatesClass *) klass)->set_revert_to_master = (void (*) (PhotoUpdates *, gboolean)) photo_updates_real_set_revert_to_master;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->add_raw_developer_file = (void (*)(PhotoUpdates*, GFile*)) photo_updates_real_add_raw_developer_file;
+	((PhotoUpdatesClass *) klass)->add_raw_developer_file = (void (*) (PhotoUpdates *, GFile*)) photo_updates_real_add_raw_developer_file;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->clear_raw_developer_files = (void (*)(PhotoUpdates*)) photo_updates_real_clear_raw_developer_files;
+	((PhotoUpdatesClass *) klass)->clear_raw_developer_files = (void (*) (PhotoUpdates *)) photo_updates_real_clear_raw_developer_files;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_reimport_master = (void (*)(PhotoUpdates*, gboolean)) photo_updates_real_set_reimport_master;
+	((PhotoUpdatesClass *) klass)->set_reimport_master = (void (*) (PhotoUpdates *, gboolean)) photo_updates_real_set_reimport_master;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_reimport_editable = (void (*)(PhotoUpdates*, gboolean)) photo_updates_real_set_reimport_editable;
+	((PhotoUpdatesClass *) klass)->set_reimport_editable = (void (*) (PhotoUpdates *, gboolean)) photo_updates_real_set_reimport_editable;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_reimport_raw_developments = (void (*)(PhotoUpdates*, gboolean)) photo_updates_real_set_reimport_raw_developments;
+	((PhotoUpdatesClass *) klass)->set_reimport_raw_developments = (void (*) (PhotoUpdates *, gboolean)) photo_updates_real_set_reimport_raw_developments;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*)(MonitorableUpdates*)) photo_updates_real_is_all_updated;
+	((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*) (MonitorableUpdates *)) photo_updates_real_is_all_updated;
 #line 1654 "PhotoMonitor.c"
 }
 
 
 static void photo_updates_instance_init (PhotoUpdates * self) {
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->reimport_master = FALSE;
 #line 11 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1684,7 +1684,7 @@ static void photo_updates_instance_init (PhotoUpdates * self) {
 }
 
 
-static void photo_updates_finalize (MonitorableUpdates* obj) {
+static void photo_updates_finalize (MonitorableUpdates * obj) {
 	PhotoUpdates * self;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_UPDATES, PhotoUpdates);
@@ -1723,10 +1723,10 @@ static gpointer _workers_ref0 (gpointer self) {
 
 PhotoMonitor* photo_monitor_construct (GType object_type, Workers* workers, GCancellable* cancellable) {
 	PhotoMonitor * self = NULL;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	GCancellable* _tmp1_ = NULL;
-	Workers* _tmp2_ = NULL;
-	Workers* _tmp3_ = NULL;
+	LibraryPhotoSourceCollection* _tmp0_;
+	GCancellable* _tmp1_;
+	Workers* _tmp2_;
+	Workers* _tmp3_;
 #line 237 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_val_if_fail (IS_WORKERS (workers), NULL);
 #line 237 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1761,9 +1761,9 @@ PhotoMonitor* photo_monitor_new (Workers* workers, GCancellable* cancellable) {
 static MonitorableUpdates* photo_monitor_real_create_updates (MediaMonitor* base, Monitorable* monitorable) {
 	PhotoMonitor * self;
 	MonitorableUpdates* result = NULL;
-	Monitorable* _tmp0_ = NULL;
-	Monitorable* _tmp1_ = NULL;
-	PhotoUpdates* _tmp2_ = NULL;
+	Monitorable* _tmp0_;
+	Monitorable* _tmp1_;
+	PhotoUpdates* _tmp2_;
 #line 243 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor);
 #line 243 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1794,8 +1794,8 @@ static gpointer _data_collection_ref0 (gpointer self) {
 static MediaSourceCollection* photo_monitor_real_get_media_source_collection (MediaMonitor* base) {
 	PhotoMonitor * self;
 	MediaSourceCollection* result = NULL;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	MediaSourceCollection* _tmp1_ = NULL;
+	LibraryPhotoSourceCollection* _tmp0_;
+	MediaSourceCollection* _tmp1_;
 #line 249 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor);
 #line 250 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1814,11 +1814,11 @@ static gboolean photo_monitor_real_is_file_represented (MediaMonitor* base, GFil
 	PhotoMonitor * self;
 	gboolean result = FALSE;
 	LibraryPhotoSourceCollectionState state = 0;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	LibraryPhotoSourceCollectionState _tmp1_ = 0;
-	LibraryPhoto* _tmp2_ = NULL;
-	LibraryPhoto* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	LibraryPhoto* _tmp2_;
+	LibraryPhoto* _tmp3_;
+	gboolean _tmp4_;
 #line 253 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor);
 #line 253 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1850,12 +1850,12 @@ static void photo_monitor_real_close (MediaMonitor* base) {
 #line 1851 "PhotoMonitor.c"
 	{
 		GeeIterator* _job_it = NULL;
-		GeeHashMap* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeHashMap* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp0_ = self->priv->master_reimport_pending;
 #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1875,12 +1875,12 @@ static void photo_monitor_real_close (MediaMonitor* base) {
 #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		while (TRUE) {
 #line 1878 "PhotoMonitor.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			PhotoMonitorReimportMasterJob* job = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			PhotoMonitorReimportMasterJob* _tmp10_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			PhotoMonitorReimportMasterJob* _tmp10_;
 #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp6_ = _job_it;
 #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1911,12 +1911,12 @@ static void photo_monitor_real_close (MediaMonitor* base) {
 	}
 	{
 		GeeIterator* _job_it = NULL;
-		GeeHashMap* _tmp11_ = NULL;
-		GeeCollection* _tmp12_ = NULL;
-		GeeCollection* _tmp13_ = NULL;
-		GeeCollection* _tmp14_ = NULL;
-		GeeIterator* _tmp15_ = NULL;
-		GeeIterator* _tmp16_ = NULL;
+		GeeHashMap* _tmp11_;
+		GeeCollection* _tmp12_;
+		GeeCollection* _tmp13_;
+		GeeCollection* _tmp14_;
+		GeeIterator* _tmp15_;
+		GeeIterator* _tmp16_;
 #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp11_ = self->priv->editable_reimport_pending;
 #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1936,12 +1936,12 @@ static void photo_monitor_real_close (MediaMonitor* base) {
 #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		while (TRUE) {
 #line 1939 "PhotoMonitor.c"
-			GeeIterator* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
+			GeeIterator* _tmp17_;
+			gboolean _tmp18_;
 			PhotoMonitorReimportEditableJob* job = NULL;
-			GeeIterator* _tmp19_ = NULL;
-			gpointer _tmp20_ = NULL;
-			PhotoMonitorReimportEditableJob* _tmp21_ = NULL;
+			GeeIterator* _tmp19_;
+			gpointer _tmp20_;
+			PhotoMonitorReimportEditableJob* _tmp21_;
 #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp17_ = _job_it;
 #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1972,12 +1972,12 @@ static void photo_monitor_real_close (MediaMonitor* base) {
 	}
 	{
 		GeeIterator* _job_it = NULL;
-		GeeHashMap* _tmp22_ = NULL;
-		GeeCollection* _tmp23_ = NULL;
-		GeeCollection* _tmp24_ = NULL;
-		GeeCollection* _tmp25_ = NULL;
-		GeeIterator* _tmp26_ = NULL;
-		GeeIterator* _tmp27_ = NULL;
+		GeeHashMap* _tmp22_;
+		GeeCollection* _tmp23_;
+		GeeCollection* _tmp24_;
+		GeeCollection* _tmp25_;
+		GeeIterator* _tmp26_;
+		GeeIterator* _tmp27_;
 #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp22_ = self->priv->raw_developments_reimport_pending;
 #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1997,12 +1997,12 @@ static void photo_monitor_real_close (MediaMonitor* base) {
 #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		while (TRUE) {
 #line 2000 "PhotoMonitor.c"
-			GeeIterator* _tmp28_ = NULL;
-			gboolean _tmp29_ = FALSE;
+			GeeIterator* _tmp28_;
+			gboolean _tmp29_;
 			PhotoMonitorReimportRawDevelopmentJob* job = NULL;
-			GeeIterator* _tmp30_ = NULL;
-			gpointer _tmp31_ = NULL;
-			PhotoMonitorReimportRawDevelopmentJob* _tmp32_ = NULL;
+			GeeIterator* _tmp30_;
+			gpointer _tmp31_;
+			PhotoMonitorReimportRawDevelopmentJob* _tmp32_;
 #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp28_ = _job_it;
 #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2039,15 +2039,15 @@ static void photo_monitor_real_close (MediaMonitor* base) {
 
 static void photo_monitor_cancel_reimports (PhotoMonitor* self, LibraryPhoto* photo) {
 	PhotoMonitorReimportMasterJob* master_job = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	LibraryPhoto* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	PhotoMonitorReimportMasterJob* _tmp3_ = NULL;
+	GeeHashMap* _tmp0_;
+	LibraryPhoto* _tmp1_;
+	gpointer _tmp2_;
+	PhotoMonitorReimportMasterJob* _tmp3_;
 	PhotoMonitorReimportEditableJob* editable_job = NULL;
-	GeeHashMap* _tmp5_ = NULL;
-	LibraryPhoto* _tmp6_ = NULL;
-	gpointer _tmp7_ = NULL;
-	PhotoMonitorReimportEditableJob* _tmp8_ = NULL;
+	GeeHashMap* _tmp5_;
+	LibraryPhoto* _tmp6_;
+	gpointer _tmp7_;
+	PhotoMonitorReimportEditableJob* _tmp8_;
 #line 271 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 271 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2065,7 +2065,7 @@ static void photo_monitor_cancel_reimports (PhotoMonitor* self, LibraryPhoto* ph
 #line 273 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp3_ != NULL) {
 #line 2068 "PhotoMonitor.c"
-		PhotoMonitorReimportMasterJob* _tmp4_ = NULL;
+		PhotoMonitorReimportMasterJob* _tmp4_;
 #line 274 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp4_ = master_job;
 #line 274 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2085,7 +2085,7 @@ static void photo_monitor_cancel_reimports (PhotoMonitor* self, LibraryPhoto* ph
 #line 277 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp8_ != NULL) {
 #line 2088 "PhotoMonitor.c"
-		PhotoMonitorReimportEditableJob* _tmp9_ = NULL;
+		PhotoMonitorReimportEditableJob* _tmp9_;
 #line 278 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp9_ = editable_job;
 #line 278 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2100,17 +2100,17 @@ static void photo_monitor_cancel_reimports (PhotoMonitor* self, LibraryPhoto* ph
 }
 
 
-static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable** monitorable) {
+static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable* * monitorable) {
 	PhotoMonitor * self;
 	Monitorable* _vala_monitorable = NULL;
 	MediaMonitorDiscoveredFile result = 0;
 	LibraryPhotoSourceCollectionState state = 0;
 	LibraryPhoto* photo = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	LibraryPhotoSourceCollectionState _tmp1_ = 0;
-	LibraryPhoto* _tmp2_ = NULL;
-	LibraryPhoto* _tmp3_ = NULL;
-	LibraryPhotoSourceCollectionState _tmp4_ = 0;
+	LibraryPhoto* _tmp2_;
+	LibraryPhoto* _tmp3_;
+	LibraryPhotoSourceCollectionState _tmp4_;
 #line 281 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor);
 #line 281 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2161,8 +2161,8 @@ static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (Med
 		case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE:
 #line 2163 "PhotoMonitor.c"
 		{
-			LibraryPhoto* _tmp5_ = NULL;
-			Monitorable* _tmp6_ = NULL;
+			LibraryPhoto* _tmp5_;
+			Monitorable* _tmp6_;
 #line 294 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp5_ = photo;
 #line 294 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2240,28 +2240,28 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 	PhotoMonitor * self;
 	MediaMonitorDiscoveredFile _vala_result = 0;
 	GeeCollection* result = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp1_;
 	GeeCollection* matched_masters = NULL;
-	GeeArrayList* _tmp2_ = NULL;
-	LibraryPhotoSourceCollection* _tmp3_ = NULL;
-	GFileInfo* _tmp4_ = NULL;
-	GeeCollection* _tmp5_ = NULL;
-	GeeArrayList* _tmp6_ = NULL;
-	GeeArrayList* _tmp7_ = NULL;
-	GeeCollection* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
+	GeeArrayList* _tmp2_;
+	LibraryPhotoSourceCollection* _tmp3_;
+	GFileInfo* _tmp4_;
+	GeeCollection* _tmp5_;
+	GeeArrayList* _tmp6_;
+	GeeArrayList* _tmp7_;
+	GeeCollection* _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
 	gboolean _tmp11_ = FALSE;
-	GeeArrayList* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	GeeArrayList* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	GeeArrayList* _tmp53_ = NULL;
-	gint _tmp54_ = 0;
-	gint _tmp55_ = 0;
+	GeeArrayList* _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	GeeArrayList* _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
+	GeeArrayList* _tmp53_;
+	gint _tmp54_;
+	gint _tmp55_;
 #line 310 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor);
 #line 310 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2323,9 +2323,9 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp14_ == 0) {
 #line 2326 "PhotoMonitor.c"
-		GeeArrayList* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
-		gint _tmp17_ = 0;
+		GeeArrayList* _tmp15_;
+		gint _tmp16_;
+		gint _tmp17_;
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp15_ = self->priv->matched_developments;
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2368,13 +2368,13 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 	if (_tmp20_ > 0) {
 #line 2370 "PhotoMonitor.c"
 		LibraryPhoto* match = NULL;
-		GeeArrayList* _tmp21_ = NULL;
-		gpointer _tmp22_ = NULL;
-		GeeArrayList* _tmp23_ = NULL;
-		gint _tmp24_ = 0;
-		gint _tmp25_ = 0;
-		LibraryPhoto* _tmp51_ = NULL;
-		GFile* _tmp52_ = NULL;
+		GeeArrayList* _tmp21_;
+		gpointer _tmp22_;
+		GeeArrayList* _tmp23_;
+		gint _tmp24_;
+		gint _tmp25_;
+		LibraryPhoto* _tmp51_;
+		GFile* _tmp52_;
 #line 333 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp21_ = self->priv->matched_editables;
 #line 333 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2390,15 +2390,15 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 334 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (_tmp25_ > 1) {
 #line 2393 "PhotoMonitor.c"
-			GFile* _tmp26_ = NULL;
-			gchar* _tmp27_ = NULL;
-			gchar* _tmp28_ = NULL;
-			GeeArrayList* _tmp29_ = NULL;
-			gint _tmp30_ = 0;
-			gint _tmp31_ = 0;
-			LibraryPhoto* _tmp32_ = NULL;
-			gchar* _tmp33_ = NULL;
-			gchar* _tmp34_ = NULL;
+			GFile* _tmp26_;
+			gchar* _tmp27_;
+			gchar* _tmp28_;
+			GeeArrayList* _tmp29_;
+			gint _tmp30_;
+			gint _tmp31_;
+			LibraryPhoto* _tmp32_;
+			gchar* _tmp33_;
+			gchar* _tmp34_;
 #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp26_ = file;
 #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2437,20 +2437,20 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					while (TRUE) {
 #line 2439 "PhotoMonitor.c"
-						gint _tmp37_ = 0;
-						GeeArrayList* _tmp38_ = NULL;
-						gint _tmp39_ = 0;
-						gint _tmp40_ = 0;
-						GeeArrayList* _tmp41_ = NULL;
-						gint _tmp42_ = 0;
-						gpointer _tmp43_ = NULL;
-						LibraryPhoto* _tmp44_ = NULL;
-						gboolean _tmp45_ = FALSE;
-						gboolean _tmp46_ = FALSE;
+						gint _tmp37_;
+						GeeArrayList* _tmp38_;
+						gint _tmp39_;
+						gint _tmp40_;
+						GeeArrayList* _tmp41_;
+						gint _tmp42_;
+						gpointer _tmp43_;
+						LibraryPhoto* _tmp44_;
+						gboolean _tmp45_;
+						gboolean _tmp46_;
 #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						if (!_tmp35_) {
 #line 2452 "PhotoMonitor.c"
-							gint _tmp36_ = 0;
+							gint _tmp36_;
 #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 							_tmp36_ = ctr;
 #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2490,10 +2490,10 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 338 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						if (_tmp46_) {
 #line 2492 "PhotoMonitor.c"
-							GeeArrayList* _tmp47_ = NULL;
-							gint _tmp48_ = 0;
-							gpointer _tmp49_ = NULL;
-							LibraryPhoto* _tmp50_ = NULL;
+							GeeArrayList* _tmp47_;
+							gint _tmp48_;
+							gpointer _tmp49_;
+							LibraryPhoto* _tmp50_;
 #line 339 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 							_tmp47_ = self->priv->matched_editables;
 #line 339 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2532,13 +2532,13 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 	if (_tmp55_ > 0) {
 #line 2533 "PhotoMonitor.c"
 		LibraryPhoto* match_raw = NULL;
-		GeeArrayList* _tmp56_ = NULL;
-		gpointer _tmp57_ = NULL;
-		GeeArrayList* _tmp58_ = NULL;
-		gint _tmp59_ = 0;
-		gint _tmp60_ = 0;
-		LibraryPhoto* _tmp70_ = NULL;
-		GFile* _tmp71_ = NULL;
+		GeeArrayList* _tmp56_;
+		gpointer _tmp57_;
+		GeeArrayList* _tmp58_;
+		gint _tmp59_;
+		gint _tmp60_;
+		LibraryPhoto* _tmp70_;
+		GFile* _tmp71_;
 #line 347 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp56_ = self->priv->matched_developments;
 #line 347 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2554,15 +2554,15 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 348 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (_tmp60_ > 1) {
 #line 2556 "PhotoMonitor.c"
-			GFile* _tmp61_ = NULL;
-			gchar* _tmp62_ = NULL;
-			gchar* _tmp63_ = NULL;
-			GeeArrayList* _tmp64_ = NULL;
-			gint _tmp65_ = 0;
-			gint _tmp66_ = 0;
-			LibraryPhoto* _tmp67_ = NULL;
-			gchar* _tmp68_ = NULL;
-			gchar* _tmp69_ = NULL;
+			GFile* _tmp61_;
+			gchar* _tmp62_;
+			gchar* _tmp63_;
+			GeeArrayList* _tmp64_;
+			gint _tmp65_;
+			gint _tmp66_;
+			LibraryPhoto* _tmp67_;
+			gchar* _tmp68_;
+			gchar* _tmp69_;
 #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp61_ = file;
 #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2618,7 +2618,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 }
 
 
-static void _vala_array_add131 (GFile*** array, int* length, int* size, GFile* value) {
+static void _vala_array_add131 (GFile** * array, int* length, int* size, GFile* value) {
 #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if ((*length) == (*size)) {
 #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2635,7 +2635,7 @@ static void _vala_array_add131 (GFile*** array, int* length, int* size, GFile* v
 }
 
 
-static void _vala_array_add132 (GFile*** array, int* length, int* size, GFile* value) {
+static void _vala_array_add132 (GFile** * array, int* length, int* size, GFile* value) {
 #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if ((*length) == (*size)) {
 #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2660,7 +2660,7 @@ static GFile** _vala_array_dup31 (GFile** self, int length) {
 #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	for (i = 0; i < length; i++) {
 #line 2661 "PhotoMonitor.c"
-		GFile* _tmp0_ = NULL;
+		GFile* _tmp0_;
 #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2677,27 +2677,27 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba
 	PhotoMonitor * self;
 	GFile** result = NULL;
 	LibraryPhoto* photo = NULL;
-	Monitorable* _tmp0_ = NULL;
-	LibraryPhoto* _tmp1_ = NULL;
+	Monitorable* _tmp0_;
+	LibraryPhoto* _tmp1_;
 	GFile** files = NULL;
-	GFile** _tmp2_ = NULL;
-	gint files_length1 = 0;
-	gint _files_size_ = 0;
-	LibraryPhoto* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GFile** _tmp2_;
+	gint files_length1;
+	gint _files_size_;
+	LibraryPhoto* _tmp3_;
+	gboolean _tmp4_;
 	GeeCollection* raw_files = NULL;
-	LibraryPhoto* _tmp8_ = NULL;
-	GeeCollection* _tmp9_ = NULL;
-	GeeCollection* _tmp10_ = NULL;
+	LibraryPhoto* _tmp8_;
+	GeeCollection* _tmp9_;
+	GeeCollection* _tmp10_;
 	GFile** _tmp20_ = NULL;
 	gint _tmp20__length1 = 0;
 	gint __tmp20__size_ = 0;
-	GFile** _tmp21_ = NULL;
-	gint _tmp21__length1 = 0;
-	GFile** _tmp23_ = NULL;
-	gint _tmp23__length1 = 0;
-	GFile** _tmp24_ = NULL;
-	gint _tmp24__length1 = 0;
+	GFile** _tmp21_;
+	gint _tmp21__length1;
+	GFile** _tmp23_;
+	gint _tmp23__length1;
+	GFile** _tmp24_;
+	gint _tmp24__length1;
 #line 361 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor);
 #line 361 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2723,10 +2723,10 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba
 #line 366 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp4_) {
 #line 2724 "PhotoMonitor.c"
-		GFile** _tmp5_ = NULL;
-		gint _tmp5__length1 = 0;
-		LibraryPhoto* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
+		GFile** _tmp5_;
+		gint _tmp5__length1;
+		LibraryPhoto* _tmp6_;
+		GFile* _tmp7_;
 #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp5_ = files;
 #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2752,8 +2752,8 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba
 #line 2751 "PhotoMonitor.c"
 		{
 			GeeIterator* _f_it = NULL;
-			GeeCollection* _tmp11_ = NULL;
-			GeeIterator* _tmp12_ = NULL;
+			GeeCollection* _tmp11_;
+			GeeIterator* _tmp12_;
 #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp11_ = raw_files;
 #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2763,15 +2763,15 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba
 #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			while (TRUE) {
 #line 2764 "PhotoMonitor.c"
-				GeeIterator* _tmp13_ = NULL;
-				gboolean _tmp14_ = FALSE;
+				GeeIterator* _tmp13_;
+				gboolean _tmp14_;
 				GFile* f = NULL;
-				GeeIterator* _tmp15_ = NULL;
-				gpointer _tmp16_ = NULL;
-				GFile** _tmp17_ = NULL;
-				gint _tmp17__length1 = 0;
-				GFile* _tmp18_ = NULL;
-				GFile* _tmp19_ = NULL;
+				GeeIterator* _tmp15_;
+				gpointer _tmp16_;
+				GFile** _tmp17_;
+				gint _tmp17__length1;
+				GFile* _tmp18_;
+				GFile* _tmp19_;
 #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp13_ = _f_it;
 #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2814,8 +2814,8 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba
 #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp21__length1 > 0) {
 #line 2815 "PhotoMonitor.c"
-		GFile** _tmp22_ = NULL;
-		gint _tmp22__length1 = 0;
+		GFile** _tmp22_;
+		gint _tmp22__length1;
 #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp22_ = files;
 #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2867,14 +2867,14 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba
 static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Monitorable* monitorable, GFile* file, GFileInfo* info) {
 	PhotoMonitor * self;
 	LibraryPhoto* photo = NULL;
-	Monitorable* _tmp0_ = NULL;
-	LibraryPhoto* _tmp1_ = NULL;
-	LibraryPhoto* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
+	Monitorable* _tmp0_;
+	LibraryPhoto* _tmp1_;
+	LibraryPhoto* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp7_;
 #line 379 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor);
 #line 379 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2906,8 +2906,8 @@ static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Mon
 #line 382 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp7_) {
 #line 2907 "PhotoMonitor.c"
-		LibraryPhoto* _tmp8_ = NULL;
-		GFileInfo* _tmp9_ = NULL;
+		LibraryPhoto* _tmp8_;
+		GFileInfo* _tmp9_;
 #line 383 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp8_ = photo;
 #line 383 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2917,10 +2917,10 @@ static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Mon
 #line 2916 "PhotoMonitor.c"
 	} else {
 		gboolean _tmp10_ = FALSE;
-		LibraryPhoto* _tmp11_ = NULL;
-		GFile* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		gboolean _tmp14_ = FALSE;
+		LibraryPhoto* _tmp11_;
+		GFile* _tmp12_;
+		GFile* _tmp13_;
+		gboolean _tmp14_;
 #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp11_ = photo;
 #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2934,11 +2934,11 @@ static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Mon
 #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (_tmp14_) {
 #line 2935 "PhotoMonitor.c"
-			LibraryPhoto* _tmp15_ = NULL;
-			GFile* _tmp16_ = NULL;
-			GFile* _tmp17_ = NULL;
-			GFile* _tmp18_ = NULL;
-			gboolean _tmp19_ = FALSE;
+			LibraryPhoto* _tmp15_;
+			GFile* _tmp16_;
+			GFile* _tmp17_;
+			GFile* _tmp18_;
+			gboolean _tmp19_;
 #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp15_ = photo;
 #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2962,8 +2962,8 @@ static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Mon
 #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (_tmp10_) {
 #line 2963 "PhotoMonitor.c"
-			LibraryPhoto* _tmp20_ = NULL;
-			GFileInfo* _tmp21_ = NULL;
+			LibraryPhoto* _tmp20_;
+			GFileInfo* _tmp21_;
 #line 385 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp20_ = photo;
 #line 385 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2972,10 +2972,10 @@ static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Mon
 			photo_monitor_check_for_editable_changes (self, _tmp20_, _tmp21_);
 #line 2972 "PhotoMonitor.c"
 		} else {
-			LibraryPhoto* _tmp22_ = NULL;
-			GeeCollection* _tmp23_ = NULL;
-			GeeCollection* _tmp24_ = NULL;
-			gboolean _tmp25_ = FALSE;
+			LibraryPhoto* _tmp22_;
+			GeeCollection* _tmp23_;
+			GeeCollection* _tmp24_;
+			gboolean _tmp25_;
 #line 386 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp22_ = photo;
 #line 386 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2991,11 +2991,11 @@ static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Mon
 #line 2990 "PhotoMonitor.c"
 				{
 					GeeIterator* _f_it = NULL;
-					LibraryPhoto* _tmp26_ = NULL;
-					GeeCollection* _tmp27_ = NULL;
-					GeeCollection* _tmp28_ = NULL;
-					GeeIterator* _tmp29_ = NULL;
-					GeeIterator* _tmp30_ = NULL;
+					LibraryPhoto* _tmp26_;
+					GeeCollection* _tmp27_;
+					GeeCollection* _tmp28_;
+					GeeIterator* _tmp29_;
+					GeeIterator* _tmp30_;
 #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp26_ = photo;
 #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3013,14 +3013,14 @@ static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Mon
 #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					while (TRUE) {
 #line 3014 "PhotoMonitor.c"
-						GeeIterator* _tmp31_ = NULL;
-						gboolean _tmp32_ = FALSE;
+						GeeIterator* _tmp31_;
+						gboolean _tmp32_;
 						GFile* f = NULL;
-						GeeIterator* _tmp33_ = NULL;
-						gpointer _tmp34_ = NULL;
-						GFile* _tmp35_ = NULL;
-						GFile* _tmp36_ = NULL;
-						gboolean _tmp37_ = FALSE;
+						GeeIterator* _tmp33_;
+						gpointer _tmp34_;
+						GFile* _tmp35_;
+						GFile* _tmp36_;
+						gboolean _tmp37_;
 #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						_tmp31_ = _f_it;
 #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3046,8 +3046,8 @@ static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Mon
 #line 388 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						if (_tmp37_) {
 #line 3047 "PhotoMonitor.c"
-							LibraryPhoto* _tmp38_ = NULL;
-							GFileInfo* _tmp39_ = NULL;
+							LibraryPhoto* _tmp38_;
+							GFileInfo* _tmp39_;
 #line 389 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 							_tmp38_ = photo;
 #line 389 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3075,7 +3075,7 @@ static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Mon
 
 static void photo_monitor_real_notify_discovery_completing (MediaMonitor* base) {
 	PhotoMonitor * self;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 #line 394 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor);
 #line 395 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3087,16 +3087,16 @@ static void photo_monitor_real_notify_discovery_completing (MediaMonitor* base)
 
 
 static void photo_monitor_check_for_master_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info) {
-	GFileInfo* _tmp0_ = NULL;
+	GFileInfo* _tmp0_;
 	BackingPhotoRow* state = NULL;
-	LibraryPhoto* _tmp1_ = NULL;
-	BackingPhotoRow* _tmp2_ = NULL;
-	BackingPhotoRow* _tmp3_ = NULL;
-	GFileInfo* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	BackingPhotoRow* _tmp6_ = NULL;
-	GFileInfo* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	LibraryPhoto* _tmp1_;
+	BackingPhotoRow* _tmp2_;
+	BackingPhotoRow* _tmp3_;
+	GFileInfo* _tmp4_;
+	gboolean _tmp5_;
+	BackingPhotoRow* _tmp6_;
+	GFileInfo* _tmp7_;
+	gboolean _tmp8_;
 #line 402 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 402 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3140,9 +3140,9 @@ static void photo_monitor_check_for_master_changes (PhotoMonitor* self, LibraryP
 #line 411 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp8_) {
 #line 3141 "PhotoMonitor.c"
-		LibraryPhoto* _tmp9_ = NULL;
-		LibraryPhoto* _tmp10_ = NULL;
-		GFileInfo* _tmp11_ = NULL;
+		LibraryPhoto* _tmp9_;
+		LibraryPhoto* _tmp10_;
+		GFileInfo* _tmp11_;
 #line 412 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp9_ = photo;
 #line 412 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3155,7 +3155,7 @@ static void photo_monitor_check_for_master_changes (PhotoMonitor* self, LibraryP
 		media_monitor_update_master_file_alterations_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MONITORABLE, Monitorable), _tmp11_);
 #line 3155 "PhotoMonitor.c"
 	} else {
-		LibraryPhoto* _tmp12_ = NULL;
+		LibraryPhoto* _tmp12_;
 #line 415 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp12_ = photo;
 #line 415 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3169,15 +3169,15 @@ static void photo_monitor_check_for_master_changes (PhotoMonitor* self, LibraryP
 
 
 static void photo_monitor_check_for_editable_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info) {
-	GFileInfo* _tmp0_ = NULL;
+	GFileInfo* _tmp0_;
 	BackingPhotoRow* state = NULL;
-	LibraryPhoto* _tmp2_ = NULL;
-	BackingPhotoRow* _tmp3_ = NULL;
+	LibraryPhoto* _tmp2_;
+	BackingPhotoRow* _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	BackingPhotoRow* _tmp5_ = NULL;
-	BackingPhotoRow* _tmp9_ = NULL;
-	GFileInfo* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
+	BackingPhotoRow* _tmp5_;
+	BackingPhotoRow* _tmp9_;
+	GFileInfo* _tmp10_;
+	gboolean _tmp11_;
 #line 419 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 419 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3189,7 +3189,7 @@ static void photo_monitor_check_for_editable_changes (PhotoMonitor* self, Librar
 #line 420 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp0_ == NULL) {
 #line 3190 "PhotoMonitor.c"
-		LibraryPhoto* _tmp1_ = NULL;
+		LibraryPhoto* _tmp1_;
 #line 421 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp1_ = photo;
 #line 421 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3212,9 +3212,9 @@ static void photo_monitor_check_for_editable_changes (PhotoMonitor* self, Librar
 		_tmp4_ = TRUE;
 #line 3212 "PhotoMonitor.c"
 	} else {
-		BackingPhotoRow* _tmp6_ = NULL;
-		GFileInfo* _tmp7_ = NULL;
-		gboolean _tmp8_ = FALSE;
+		BackingPhotoRow* _tmp6_;
+		GFileInfo* _tmp7_;
+		gboolean _tmp8_;
 #line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp6_ = state;
 #line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3242,9 +3242,9 @@ static void photo_monitor_check_for_editable_changes (PhotoMonitor* self, Librar
 #line 431 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp11_) {
 #line 3243 "PhotoMonitor.c"
-		LibraryPhoto* _tmp12_ = NULL;
-		LibraryPhoto* _tmp13_ = NULL;
-		GFileInfo* _tmp14_ = NULL;
+		LibraryPhoto* _tmp12_;
+		LibraryPhoto* _tmp13_;
+		GFileInfo* _tmp14_;
 #line 432 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp12_ = photo;
 #line 432 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3257,7 +3257,7 @@ static void photo_monitor_check_for_editable_changes (PhotoMonitor* self, Librar
 		photo_monitor_update_editable_file_alterations_completed (self, _tmp13_, _tmp14_);
 #line 3257 "PhotoMonitor.c"
 	} else {
-		LibraryPhoto* _tmp15_ = NULL;
+		LibraryPhoto* _tmp15_;
 #line 435 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp15_ = photo;
 #line 435 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3271,11 +3271,11 @@ static void photo_monitor_check_for_editable_changes (PhotoMonitor* self, Librar
 
 
 static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info) {
-	GFileInfo* _tmp0_ = NULL;
+	GFileInfo* _tmp0_;
 	GeeCollection* rows = NULL;
-	LibraryPhoto* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
+	LibraryPhoto* _tmp2_;
+	GeeCollection* _tmp3_;
+	GeeCollection* _tmp4_;
 #line 439 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 439 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3287,7 +3287,7 @@ static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self,
 #line 440 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp0_ == NULL) {
 #line 3288 "PhotoMonitor.c"
-		LibraryPhoto* _tmp1_ = NULL;
+		LibraryPhoto* _tmp1_;
 #line 442 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp1_ = photo;
 #line 442 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3314,8 +3314,8 @@ static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self,
 	}
 	{
 		GeeIterator* _row_it = NULL;
-		GeeCollection* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
+		GeeCollection* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp5_ = rows;
 #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3325,18 +3325,18 @@ static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self,
 #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		while (TRUE) {
 #line 3326 "PhotoMonitor.c"
-			GeeIterator* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			BackingPhotoRow* row = NULL;
-			GeeIterator* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
-			BackingPhotoRow* _tmp11_ = NULL;
-			GFileInfo* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
-			GFileInfo* _tmp14_ = NULL;
-			const gchar* _tmp15_ = NULL;
-			BackingPhotoRow* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
+			BackingPhotoRow* _tmp11_;
+			GFileInfo* _tmp12_;
+			gboolean _tmp13_;
+			GFileInfo* _tmp14_;
+			const gchar* _tmp15_;
+			BackingPhotoRow* _tmp16_;
+			const gchar* _tmp17_;
 #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp7_ = _row_it;
 #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3382,9 +3382,9 @@ static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self,
 #line 456 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (g_strcmp0 (_tmp15_, _tmp17_) == 0) {
 #line 3383 "PhotoMonitor.c"
-				BackingPhotoRow* _tmp18_ = NULL;
-				GFileInfo* _tmp19_ = NULL;
-				gboolean _tmp20_ = FALSE;
+				BackingPhotoRow* _tmp18_;
+				GFileInfo* _tmp19_;
+				gboolean _tmp20_;
 #line 457 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp18_ = row;
 #line 457 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3394,8 +3394,8 @@ static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self,
 #line 457 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_tmp20_) {
 #line 3395 "PhotoMonitor.c"
-					LibraryPhoto* _tmp21_ = NULL;
-					LibraryPhoto* _tmp22_ = NULL;
+					LibraryPhoto* _tmp21_;
+					LibraryPhoto* _tmp22_;
 #line 458 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp21_ = photo;
 #line 458 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3406,7 +3406,7 @@ static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self,
 					photo_monitor_update_raw_development_file_alterations_completed (self, _tmp22_);
 #line 3406 "PhotoMonitor.c"
 				} else {
-					LibraryPhoto* _tmp23_ = NULL;
+					LibraryPhoto* _tmp23_;
 #line 461 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp23_ = photo;
 #line 461 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3438,11 +3438,11 @@ static gboolean photo_monitor_real_notify_file_created (MediaMonitor* base, GFil
 	gboolean result = FALSE;
 	LibraryPhotoSourceCollectionState state = 0;
 	LibraryPhoto* photo = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	LibraryPhotoSourceCollectionState _tmp1_ = 0;
-	LibraryPhoto* _tmp2_ = NULL;
-	LibraryPhoto* _tmp3_ = NULL;
-	LibraryPhotoSourceCollectionState _tmp4_ = 0;
+	LibraryPhoto* _tmp2_;
+	LibraryPhoto* _tmp3_;
+	LibraryPhotoSourceCollectionState _tmp4_;
 #line 469 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor);
 #line 469 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3483,10 +3483,10 @@ static gboolean photo_monitor_real_notify_file_created (MediaMonitor* base, GFil
 		case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER:
 #line 3483 "PhotoMonitor.c"
 		{
-			GFile* _tmp5_ = NULL;
-			gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
-			LibraryPhotoSourceCollectionState _tmp8_ = 0;
+			GFile* _tmp5_;
+			gchar* _tmp6_;
+			gchar* _tmp7_;
+			LibraryPhotoSourceCollectionState _tmp8_;
 			GEnumValue* _tmp9_;
 #line 481 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp5_ = file;
@@ -3510,12 +3510,12 @@ static gboolean photo_monitor_real_notify_file_created (MediaMonitor* base, GFil
 		case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE:
 #line 3510 "PhotoMonitor.c"
 		{
-			LibraryPhoto* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-			gchar* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			gchar* _tmp14_ = NULL;
-			LibraryPhoto* _tmp15_ = NULL;
+			LibraryPhoto* _tmp10_;
+			gchar* _tmp11_;
+			gchar* _tmp12_;
+			gchar* _tmp13_;
+			gchar* _tmp14_;
+			LibraryPhoto* _tmp15_;
 #line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp10_ = photo;
 #line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3542,7 +3542,7 @@ static gboolean photo_monitor_real_notify_file_created (MediaMonitor* base, GFil
 		}
 		default:
 		{
-			LibraryPhotoSourceCollectionState _tmp16_ = 0;
+			LibraryPhotoSourceCollectionState _tmp16_;
 			GEnumValue* _tmp17_;
 #line 490 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp16_ = state;
@@ -3568,16 +3568,16 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 	gboolean result = FALSE;
 	LibraryPhotoSourceCollectionState old_state = 0;
 	LibraryPhoto* old_photo = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	LibraryPhotoSourceCollectionState _tmp1_ = 0;
-	LibraryPhoto* _tmp2_ = NULL;
+	LibraryPhoto* _tmp2_;
 	LibraryPhotoSourceCollectionState new_state = 0;
 	LibraryPhoto* new_photo = NULL;
-	GFile* _tmp3_ = NULL;
+	GFile* _tmp3_;
 	LibraryPhotoSourceCollectionState _tmp4_ = 0;
-	LibraryPhoto* _tmp5_ = NULL;
+	LibraryPhoto* _tmp5_;
 	gboolean _tmp6_ = FALSE;
-	LibraryPhoto* _tmp7_ = NULL;
+	LibraryPhoto* _tmp7_;
 #line 496 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor);
 #line 496 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3607,7 +3607,7 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 #line 515 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp7_ != NULL) {
 #line 3608 "PhotoMonitor.c"
-		LibraryPhoto* _tmp8_ = NULL;
+		LibraryPhoto* _tmp8_;
 #line 515 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp8_ = new_photo;
 #line 515 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3621,7 +3621,7 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 #line 515 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp6_) {
 #line 3622 "PhotoMonitor.c"
-		LibraryPhotoSourceCollectionState _tmp9_ = 0;
+		LibraryPhotoSourceCollectionState _tmp9_;
 #line 517 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp9_ = old_state;
 #line 517 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3634,16 +3634,16 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 			case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE:
 #line 3634 "PhotoMonitor.c"
 			{
-				LibraryPhoto* _tmp10_ = NULL;
-				gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
-				GFile* _tmp13_ = NULL;
-				gchar* _tmp14_ = NULL;
-				gchar* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
-				gchar* _tmp17_ = NULL;
-				LibraryPhoto* _tmp18_ = NULL;
-				GFile* _tmp19_ = NULL;
+				LibraryPhoto* _tmp10_;
+				gchar* _tmp11_;
+				gchar* _tmp12_;
+				GFile* _tmp13_;
+				gchar* _tmp14_;
+				gchar* _tmp15_;
+				gchar* _tmp16_;
+				gchar* _tmp17_;
+				LibraryPhoto* _tmp18_;
+				GFile* _tmp19_;
 #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp10_ = old_photo;
 #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3682,16 +3682,16 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 			case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE:
 #line 3682 "PhotoMonitor.c"
 			{
-				LibraryPhoto* _tmp20_ = NULL;
-				gchar* _tmp21_ = NULL;
-				gchar* _tmp22_ = NULL;
-				GFile* _tmp23_ = NULL;
-				gchar* _tmp24_ = NULL;
-				gchar* _tmp25_ = NULL;
-				gchar* _tmp26_ = NULL;
-				gchar* _tmp27_ = NULL;
-				LibraryPhoto* _tmp28_ = NULL;
-				GFile* _tmp29_ = NULL;
+				LibraryPhoto* _tmp20_;
+				gchar* _tmp21_;
+				gchar* _tmp22_;
+				GFile* _tmp23_;
+				gchar* _tmp24_;
+				gchar* _tmp25_;
+				gchar* _tmp26_;
+				gchar* _tmp27_;
+				LibraryPhoto* _tmp28_;
+				GFile* _tmp29_;
 #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp20_ = old_photo;
 #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3730,16 +3730,16 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 			case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER:
 #line 3730 "PhotoMonitor.c"
 			{
-				LibraryPhoto* _tmp30_ = NULL;
-				gchar* _tmp31_ = NULL;
-				gchar* _tmp32_ = NULL;
-				GFile* _tmp33_ = NULL;
-				gchar* _tmp34_ = NULL;
-				gchar* _tmp35_ = NULL;
-				gchar* _tmp36_ = NULL;
-				gchar* _tmp37_ = NULL;
-				LibraryPhoto* _tmp38_ = NULL;
-				GFile* _tmp39_ = NULL;
+				LibraryPhoto* _tmp30_;
+				gchar* _tmp31_;
+				gchar* _tmp32_;
+				GFile* _tmp33_;
+				gchar* _tmp34_;
+				gchar* _tmp35_;
+				gchar* _tmp36_;
+				gchar* _tmp37_;
+				LibraryPhoto* _tmp38_;
+				GFile* _tmp39_;
 #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp30_ = old_photo;
 #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3776,7 +3776,7 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 			}
 			default:
 			{
-				LibraryPhotoSourceCollectionState _tmp40_ = 0;
+				LibraryPhotoSourceCollectionState _tmp40_;
 				GEnumValue* _tmp41_;
 #line 539 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp40_ = old_state;
@@ -3789,13 +3789,13 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 		}
 	} else {
 		gboolean _tmp42_ = FALSE;
-		LibraryPhoto* _tmp43_ = NULL;
+		LibraryPhoto* _tmp43_;
 #line 541 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp43_ = old_photo;
 #line 541 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (_tmp43_ == NULL) {
 #line 3796 "PhotoMonitor.c"
-			LibraryPhoto* _tmp44_ = NULL;
+			LibraryPhoto* _tmp44_;
 #line 541 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp44_ = new_photo;
 #line 541 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3809,7 +3809,7 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 #line 541 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (_tmp42_) {
 #line 3810 "PhotoMonitor.c"
-			LibraryPhotoSourceCollectionState _tmp45_ = 0;
+			LibraryPhotoSourceCollectionState _tmp45_;
 #line 543 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp45_ = new_state;
 #line 543 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3822,12 +3822,12 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 				case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE:
 #line 3822 "PhotoMonitor.c"
 				{
-					LibraryPhoto* _tmp46_ = NULL;
-					gchar* _tmp47_ = NULL;
-					gchar* _tmp48_ = NULL;
-					gchar* _tmp49_ = NULL;
-					gchar* _tmp50_ = NULL;
-					LibraryPhoto* _tmp51_ = NULL;
+					LibraryPhoto* _tmp46_;
+					gchar* _tmp47_;
+					gchar* _tmp48_;
+					gchar* _tmp49_;
+					gchar* _tmp50_;
+					LibraryPhoto* _tmp51_;
 #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp46_ = new_photo;
 #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3856,12 +3856,12 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 				case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE:
 #line 3856 "PhotoMonitor.c"
 				{
-					LibraryPhoto* _tmp52_ = NULL;
-					gchar* _tmp53_ = NULL;
-					gchar* _tmp54_ = NULL;
-					gchar* _tmp55_ = NULL;
-					gchar* _tmp56_ = NULL;
-					LibraryPhoto* _tmp57_ = NULL;
+					LibraryPhoto* _tmp52_;
+					gchar* _tmp53_;
+					gchar* _tmp54_;
+					gchar* _tmp55_;
+					gchar* _tmp56_;
+					LibraryPhoto* _tmp57_;
 #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp52_ = new_photo;
 #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3890,12 +3890,12 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 				case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER:
 #line 3890 "PhotoMonitor.c"
 				{
-					LibraryPhoto* _tmp58_ = NULL;
-					gchar* _tmp59_ = NULL;
-					gchar* _tmp60_ = NULL;
-					gchar* _tmp61_ = NULL;
-					gchar* _tmp62_ = NULL;
-					LibraryPhoto* _tmp63_ = NULL;
+					LibraryPhoto* _tmp58_;
+					gchar* _tmp59_;
+					gchar* _tmp60_;
+					gchar* _tmp61_;
+					gchar* _tmp62_;
+					LibraryPhoto* _tmp63_;
 #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp58_ = new_photo;
 #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3922,7 +3922,7 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 				}
 				default:
 				{
-					LibraryPhotoSourceCollectionState _tmp64_ = 0;
+					LibraryPhotoSourceCollectionState _tmp64_;
 					GEnumValue* _tmp65_;
 #line 562 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp64_ = new_state;
@@ -3935,13 +3935,13 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 			}
 		} else {
 			gboolean _tmp66_ = FALSE;
-			LibraryPhoto* _tmp67_ = NULL;
+			LibraryPhoto* _tmp67_;
 #line 564 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp67_ = old_photo;
 #line 564 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_tmp67_ == NULL) {
 #line 3942 "PhotoMonitor.c"
-				LibraryPhoto* _tmp68_ = NULL;
+				LibraryPhoto* _tmp68_;
 #line 564 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp68_ = new_photo;
 #line 564 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3965,15 +3965,15 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 #line 3964 "PhotoMonitor.c"
 			} else {
 				gboolean _tmp69_ = FALSE;
-				LibraryPhoto* _tmp70_ = NULL;
-				LibraryPhotoSourceCollectionState _tmp72_ = 0;
-				LibraryPhotoSourceCollectionState _tmp87_ = 0;
+				LibraryPhoto* _tmp70_;
+				LibraryPhotoSourceCollectionState _tmp72_;
+				LibraryPhotoSourceCollectionState _tmp87_;
 #line 568 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp70_ = old_photo;
 #line 568 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_tmp70_ != NULL) {
 #line 3974 "PhotoMonitor.c"
-					LibraryPhoto* _tmp71_ = NULL;
+					LibraryPhoto* _tmp71_;
 #line 568 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp71_ = new_photo;
 #line 568 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3994,12 +3994,12 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE:
 #line 3994 "PhotoMonitor.c"
 					{
-						LibraryPhoto* _tmp73_ = NULL;
-						gchar* _tmp74_ = NULL;
-						gchar* _tmp75_ = NULL;
-						gchar* _tmp76_ = NULL;
-						gchar* _tmp77_ = NULL;
-						LibraryPhoto* _tmp78_ = NULL;
+						LibraryPhoto* _tmp73_;
+						gchar* _tmp74_;
+						gchar* _tmp75_;
+						gchar* _tmp76_;
+						gchar* _tmp77_;
+						LibraryPhoto* _tmp78_;
 #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						_tmp73_ = old_photo;
 #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4038,12 +4038,12 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE:
 #line 4038 "PhotoMonitor.c"
 					{
-						LibraryPhoto* _tmp79_ = NULL;
-						gchar* _tmp80_ = NULL;
-						gchar* _tmp81_ = NULL;
-						gchar* _tmp82_ = NULL;
-						gchar* _tmp83_ = NULL;
-						LibraryPhoto* _tmp84_ = NULL;
+						LibraryPhoto* _tmp79_;
+						gchar* _tmp80_;
+						gchar* _tmp81_;
+						gchar* _tmp82_;
+						gchar* _tmp83_;
+						LibraryPhoto* _tmp84_;
 #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						_tmp79_ = old_photo;
 #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4078,7 +4078,7 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 					}
 					default:
 					{
-						LibraryPhotoSourceCollectionState _tmp85_ = 0;
+						LibraryPhotoSourceCollectionState _tmp85_;
 						GEnumValue* _tmp86_;
 #line 591 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						_tmp85_ = old_state;
@@ -4101,12 +4101,12 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE:
 #line 4101 "PhotoMonitor.c"
 					{
-						LibraryPhoto* _tmp88_ = NULL;
-						gchar* _tmp89_ = NULL;
-						gchar* _tmp90_ = NULL;
-						gchar* _tmp91_ = NULL;
-						gchar* _tmp92_ = NULL;
-						LibraryPhoto* _tmp93_ = NULL;
+						LibraryPhoto* _tmp88_;
+						gchar* _tmp89_;
+						gchar* _tmp90_;
+						gchar* _tmp91_;
+						gchar* _tmp92_;
+						LibraryPhoto* _tmp93_;
 #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						_tmp88_ = new_photo;
 #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4135,12 +4135,12 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE:
 #line 4135 "PhotoMonitor.c"
 					{
-						LibraryPhoto* _tmp94_ = NULL;
-						gchar* _tmp95_ = NULL;
-						gchar* _tmp96_ = NULL;
-						gchar* _tmp97_ = NULL;
-						gchar* _tmp98_ = NULL;
-						LibraryPhoto* _tmp99_ = NULL;
+						LibraryPhoto* _tmp94_;
+						gchar* _tmp95_;
+						gchar* _tmp96_;
+						gchar* _tmp97_;
+						gchar* _tmp98_;
+						LibraryPhoto* _tmp99_;
 #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						_tmp94_ = new_photo;
 #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4169,12 +4169,12 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER:
 #line 4169 "PhotoMonitor.c"
 					{
-						LibraryPhoto* _tmp100_ = NULL;
-						gchar* _tmp101_ = NULL;
-						gchar* _tmp102_ = NULL;
-						gchar* _tmp103_ = NULL;
-						gchar* _tmp104_ = NULL;
-						LibraryPhoto* _tmp105_ = NULL;
+						LibraryPhoto* _tmp100_;
+						gchar* _tmp101_;
+						gchar* _tmp102_;
+						gchar* _tmp103_;
+						gchar* _tmp104_;
+						LibraryPhoto* _tmp105_;
 #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						_tmp100_ = new_photo;
 #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4201,7 +4201,7 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 					}
 					default:
 					{
-						LibraryPhotoSourceCollectionState _tmp106_ = 0;
+						LibraryPhotoSourceCollectionState _tmp106_;
 						GEnumValue* _tmp107_;
 #line 613 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						_tmp106_ = new_state;
@@ -4232,11 +4232,11 @@ static gboolean photo_monitor_real_notify_file_altered (MediaMonitor* base, GFil
 	gboolean result = FALSE;
 	LibraryPhotoSourceCollectionState state = 0;
 	LibraryPhoto* photo = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	LibraryPhotoSourceCollectionState _tmp1_ = 0;
-	LibraryPhoto* _tmp2_ = NULL;
-	LibraryPhoto* _tmp3_ = NULL;
-	LibraryPhotoSourceCollectionState _tmp4_ = 0;
+	LibraryPhoto* _tmp2_;
+	LibraryPhoto* _tmp3_;
+	LibraryPhotoSourceCollectionState _tmp4_;
 #line 620 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor);
 #line 620 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4273,13 +4273,13 @@ static gboolean photo_monitor_real_notify_file_altered (MediaMonitor* base, GFil
 		case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH:
 #line 4273 "PhotoMonitor.c"
 		{
-			LibraryPhoto* _tmp5_ = NULL;
-			gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
-			gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
-			LibraryPhoto* _tmp10_ = NULL;
-			LibraryPhoto* _tmp11_ = NULL;
+			LibraryPhoto* _tmp5_;
+			gchar* _tmp6_;
+			gchar* _tmp7_;
+			gchar* _tmp8_;
+			gchar* _tmp9_;
+			LibraryPhoto* _tmp10_;
+			LibraryPhoto* _tmp11_;
 #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp5_ = photo;
 #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4312,13 +4312,13 @@ static gboolean photo_monitor_real_notify_file_altered (MediaMonitor* base, GFil
 		case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE:
 #line 4312 "PhotoMonitor.c"
 		{
-			LibraryPhoto* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			gchar* _tmp14_ = NULL;
-			gchar* _tmp15_ = NULL;
-			gchar* _tmp16_ = NULL;
-			LibraryPhoto* _tmp17_ = NULL;
-			LibraryPhoto* _tmp18_ = NULL;
+			LibraryPhoto* _tmp12_;
+			gchar* _tmp13_;
+			gchar* _tmp14_;
+			gchar* _tmp15_;
+			gchar* _tmp16_;
+			LibraryPhoto* _tmp17_;
+			LibraryPhoto* _tmp18_;
 #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp12_ = photo;
 #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4351,13 +4351,13 @@ static gboolean photo_monitor_real_notify_file_altered (MediaMonitor* base, GFil
 		case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER:
 #line 4351 "PhotoMonitor.c"
 		{
-			LibraryPhoto* _tmp19_ = NULL;
-			gchar* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
-			gchar* _tmp22_ = NULL;
-			gchar* _tmp23_ = NULL;
-			LibraryPhoto* _tmp24_ = NULL;
-			LibraryPhoto* _tmp25_ = NULL;
+			LibraryPhoto* _tmp19_;
+			gchar* _tmp20_;
+			gchar* _tmp21_;
+			gchar* _tmp22_;
+			gchar* _tmp23_;
+			LibraryPhoto* _tmp24_;
+			LibraryPhoto* _tmp25_;
 #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp19_ = photo;
 #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4388,7 +4388,7 @@ static gboolean photo_monitor_real_notify_file_altered (MediaMonitor* base, GFil
 		}
 		default:
 		{
-			LibraryPhotoSourceCollectionState _tmp26_ = 0;
+			LibraryPhotoSourceCollectionState _tmp26_;
 			GEnumValue* _tmp27_;
 #line 648 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp26_ = state;
@@ -4414,11 +4414,11 @@ static gboolean photo_monitor_real_notify_file_attributes_altered (MediaMonitor*
 	gboolean result = FALSE;
 	LibraryPhotoSourceCollectionState state = 0;
 	LibraryPhoto* photo = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	LibraryPhotoSourceCollectionState _tmp1_ = 0;
-	LibraryPhoto* _tmp2_ = NULL;
-	LibraryPhoto* _tmp3_ = NULL;
-	LibraryPhotoSourceCollectionState _tmp4_ = 0;
+	LibraryPhoto* _tmp2_;
+	LibraryPhoto* _tmp3_;
+	LibraryPhotoSourceCollectionState _tmp4_;
 #line 654 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor);
 #line 654 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4453,13 +4453,13 @@ static gboolean photo_monitor_real_notify_file_attributes_altered (MediaMonitor*
 		case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH:
 #line 4453 "PhotoMonitor.c"
 		{
-			LibraryPhoto* _tmp5_ = NULL;
-			gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
-			gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
-			LibraryPhoto* _tmp10_ = NULL;
-			LibraryPhoto* _tmp11_ = NULL;
+			LibraryPhoto* _tmp5_;
+			gchar* _tmp6_;
+			gchar* _tmp7_;
+			gchar* _tmp8_;
+			gchar* _tmp9_;
+			LibraryPhoto* _tmp10_;
+			LibraryPhoto* _tmp11_;
 #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp5_ = photo;
 #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4492,12 +4492,12 @@ static gboolean photo_monitor_real_notify_file_attributes_altered (MediaMonitor*
 		case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE:
 #line 4492 "PhotoMonitor.c"
 		{
-			GFile* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			gchar* _tmp14_ = NULL;
-			LibraryPhotoSourceCollectionState _tmp15_ = 0;
+			GFile* _tmp12_;
+			gchar* _tmp13_;
+			gchar* _tmp14_;
+			LibraryPhotoSourceCollectionState _tmp15_;
 			GEnumValue* _tmp16_;
-			LibraryPhoto* _tmp17_ = NULL;
+			LibraryPhoto* _tmp17_;
 #line 670 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp12_ = file;
 #line 670 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4524,13 +4524,13 @@ static gboolean photo_monitor_real_notify_file_attributes_altered (MediaMonitor*
 		case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE:
 #line 4524 "PhotoMonitor.c"
 		{
-			LibraryPhoto* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
-			gchar* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
-			gchar* _tmp22_ = NULL;
-			LibraryPhoto* _tmp23_ = NULL;
-			LibraryPhoto* _tmp24_ = NULL;
+			LibraryPhoto* _tmp18_;
+			gchar* _tmp19_;
+			gchar* _tmp20_;
+			gchar* _tmp21_;
+			gchar* _tmp22_;
+			LibraryPhoto* _tmp23_;
+			LibraryPhoto* _tmp24_;
 #line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp18_ = photo;
 #line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4563,13 +4563,13 @@ static gboolean photo_monitor_real_notify_file_attributes_altered (MediaMonitor*
 		case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER:
 #line 4563 "PhotoMonitor.c"
 		{
-			LibraryPhoto* _tmp25_ = NULL;
-			gchar* _tmp26_ = NULL;
-			gchar* _tmp27_ = NULL;
-			gchar* _tmp28_ = NULL;
-			gchar* _tmp29_ = NULL;
-			LibraryPhoto* _tmp30_ = NULL;
-			LibraryPhoto* _tmp31_ = NULL;
+			LibraryPhoto* _tmp25_;
+			gchar* _tmp26_;
+			gchar* _tmp27_;
+			gchar* _tmp28_;
+			gchar* _tmp29_;
+			LibraryPhoto* _tmp30_;
+			LibraryPhoto* _tmp31_;
 #line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp25_ = photo;
 #line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4600,7 +4600,7 @@ static gboolean photo_monitor_real_notify_file_attributes_altered (MediaMonitor*
 		}
 		default:
 		{
-			LibraryPhotoSourceCollectionState _tmp32_ = 0;
+			LibraryPhotoSourceCollectionState _tmp32_;
 			GEnumValue* _tmp33_;
 #line 688 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp32_ = state;
@@ -4626,11 +4626,11 @@ static gboolean photo_monitor_real_notify_file_alteration_completed (MediaMonito
 	gboolean result = FALSE;
 	LibraryPhotoSourceCollectionState state = 0;
 	LibraryPhoto* photo = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	LibraryPhotoSourceCollectionState _tmp1_ = 0;
-	LibraryPhoto* _tmp2_ = NULL;
-	LibraryPhoto* _tmp3_ = NULL;
-	LibraryPhotoSourceCollectionState _tmp4_ = 0;
+	LibraryPhoto* _tmp2_;
+	LibraryPhoto* _tmp3_;
+	LibraryPhotoSourceCollectionState _tmp4_;
 #line 694 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor);
 #line 694 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4669,8 +4669,8 @@ static gboolean photo_monitor_real_notify_file_alteration_completed (MediaMonito
 		case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE:
 #line 4669 "PhotoMonitor.c"
 		{
-			LibraryPhoto* _tmp5_ = NULL;
-			GFileInfo* _tmp6_ = NULL;
+			LibraryPhoto* _tmp5_;
+			GFileInfo* _tmp6_;
 #line 704 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp5_ = photo;
 #line 704 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4685,8 +4685,8 @@ static gboolean photo_monitor_real_notify_file_alteration_completed (MediaMonito
 		case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE:
 #line 4685 "PhotoMonitor.c"
 		{
-			LibraryPhoto* _tmp7_ = NULL;
-			GFileInfo* _tmp8_ = NULL;
+			LibraryPhoto* _tmp7_;
+			GFileInfo* _tmp8_;
 #line 708 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp7_ = photo;
 #line 708 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4701,7 +4701,7 @@ static gboolean photo_monitor_real_notify_file_alteration_completed (MediaMonito
 		case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER:
 #line 4701 "PhotoMonitor.c"
 		{
-			LibraryPhoto* _tmp9_ = NULL;
+			LibraryPhoto* _tmp9_;
 #line 712 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp9_ = photo;
 #line 712 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4712,7 +4712,7 @@ static gboolean photo_monitor_real_notify_file_alteration_completed (MediaMonito
 		}
 		default:
 		{
-			LibraryPhotoSourceCollectionState _tmp10_ = 0;
+			LibraryPhotoSourceCollectionState _tmp10_;
 			GEnumValue* _tmp11_;
 #line 716 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp10_ = state;
@@ -4738,11 +4738,11 @@ static gboolean photo_monitor_real_notify_file_deleted (MediaMonitor* base, GFil
 	gboolean result = FALSE;
 	LibraryPhotoSourceCollectionState state = 0;
 	LibraryPhoto* photo = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	LibraryPhotoSourceCollectionState _tmp1_ = 0;
-	LibraryPhoto* _tmp2_ = NULL;
-	LibraryPhoto* _tmp3_ = NULL;
-	LibraryPhotoSourceCollectionState _tmp4_ = 0;
+	LibraryPhoto* _tmp2_;
+	LibraryPhoto* _tmp3_;
+	LibraryPhotoSourceCollectionState _tmp4_;
 #line 722 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor);
 #line 722 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4775,13 +4775,13 @@ static gboolean photo_monitor_real_notify_file_deleted (MediaMonitor* base, GFil
 		case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE:
 #line 4775 "PhotoMonitor.c"
 		{
-			LibraryPhoto* _tmp5_ = NULL;
-			gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
-			gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
-			LibraryPhoto* _tmp10_ = NULL;
-			LibraryPhoto* _tmp11_ = NULL;
+			LibraryPhoto* _tmp5_;
+			gchar* _tmp6_;
+			gchar* _tmp7_;
+			gchar* _tmp8_;
+			gchar* _tmp9_;
+			LibraryPhoto* _tmp10_;
+			LibraryPhoto* _tmp11_;
 #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp5_ = photo;
 #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4816,7 +4816,7 @@ static gboolean photo_monitor_real_notify_file_deleted (MediaMonitor* base, GFil
 		case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE:
 #line 4816 "PhotoMonitor.c"
 		{
-			LibraryPhoto* _tmp12_ = NULL;
+			LibraryPhoto* _tmp12_;
 #line 738 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp12_ = photo;
 #line 738 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4829,13 +4829,13 @@ static gboolean photo_monitor_real_notify_file_deleted (MediaMonitor* base, GFil
 		case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE:
 #line 4829 "PhotoMonitor.c"
 		{
-			LibraryPhoto* _tmp13_ = NULL;
-			gchar* _tmp14_ = NULL;
-			gchar* _tmp15_ = NULL;
-			gchar* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
-			LibraryPhoto* _tmp18_ = NULL;
-			LibraryPhoto* _tmp19_ = NULL;
+			LibraryPhoto* _tmp13_;
+			gchar* _tmp14_;
+			gchar* _tmp15_;
+			gchar* _tmp16_;
+			gchar* _tmp17_;
+			LibraryPhoto* _tmp18_;
+			LibraryPhoto* _tmp19_;
 #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp13_ = photo;
 #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4868,14 +4868,14 @@ static gboolean photo_monitor_real_notify_file_deleted (MediaMonitor* base, GFil
 		case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER:
 #line 4868 "PhotoMonitor.c"
 		{
-			LibraryPhoto* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
-			gchar* _tmp22_ = NULL;
-			gchar* _tmp23_ = NULL;
-			gchar* _tmp24_ = NULL;
-			LibraryPhoto* _tmp25_ = NULL;
-			LibraryPhoto* _tmp26_ = NULL;
-			LibraryPhoto* _tmp27_ = NULL;
+			LibraryPhoto* _tmp20_;
+			gchar* _tmp21_;
+			gchar* _tmp22_;
+			gchar* _tmp23_;
+			gchar* _tmp24_;
+			LibraryPhoto* _tmp25_;
+			LibraryPhoto* _tmp26_;
+			LibraryPhoto* _tmp27_;
 #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp20_ = photo;
 #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4910,7 +4910,7 @@ static gboolean photo_monitor_real_notify_file_deleted (MediaMonitor* base, GFil
 		}
 		default:
 		{
-			LibraryPhotoSourceCollectionState _tmp28_ = 0;
+			LibraryPhotoSourceCollectionState _tmp28_;
 			GEnumValue* _tmp29_;
 #line 755 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp28_ = state;
@@ -4933,8 +4933,8 @@ static gboolean photo_monitor_real_notify_file_deleted (MediaMonitor* base, GFil
 
 static void photo_monitor_real_on_media_source_destroyed (MediaMonitor* base, DataSource* source) {
 	PhotoMonitor * self;
-	DataSource* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	DataSource* _tmp1_;
 #line 761 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor);
 #line 761 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4955,12 +4955,12 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self,
 	LibraryPhotoSourceCollectionState _vala_state = 0;
 	LibraryPhoto* result = NULL;
 	GFile* real_file = NULL;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	GFile* _tmp70_ = NULL;
-	GFile* _tmp71_ = NULL;
-	LibraryPhotoSourceCollection* _tmp73_ = NULL;
+	GFile* _tmp71_;
+	LibraryPhotoSourceCollection* _tmp73_;
 	LibraryPhotoSourceCollectionState _tmp74_ = 0;
-	LibraryPhoto* _tmp75_ = NULL;
+	LibraryPhoto* _tmp75_;
 #line 767 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_val_if_fail (IS_PHOTO_MONITOR (self), NULL);
 #line 767 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4974,10 +4974,10 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self,
 #line 4973 "PhotoMonitor.c"
 		{
 			GeeIterator* _monitorable_it = NULL;
-			GeeCollection* _tmp1_ = NULL;
-			GeeCollection* _tmp2_ = NULL;
-			GeeIterator* _tmp3_ = NULL;
-			GeeIterator* _tmp4_ = NULL;
+			GeeCollection* _tmp1_;
+			GeeCollection* _tmp2_;
+			GeeIterator* _tmp3_;
+			GeeIterator* _tmp4_;
 #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp1_ = media_monitor_get_monitorables (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor));
 #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -4993,32 +4993,32 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self,
 #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			while (TRUE) {
 #line 4994 "PhotoMonitor.c"
-				GeeIterator* _tmp5_ = NULL;
-				gboolean _tmp6_ = FALSE;
+				GeeIterator* _tmp5_;
+				gboolean _tmp6_;
 				Monitorable* monitorable = NULL;
-				GeeIterator* _tmp7_ = NULL;
-				gpointer _tmp8_ = NULL;
+				GeeIterator* _tmp7_;
+				gpointer _tmp8_;
 				LibraryPhoto* photo = NULL;
-				Monitorable* _tmp9_ = NULL;
-				LibraryPhoto* _tmp10_ = NULL;
+				Monitorable* _tmp9_;
+				LibraryPhoto* _tmp10_;
 				PhotoUpdates* updates = NULL;
-				LibraryPhoto* _tmp11_ = NULL;
-				PhotoUpdates* _tmp12_ = NULL;
-				PhotoUpdates* _tmp13_ = NULL;
+				LibraryPhoto* _tmp11_;
+				PhotoUpdates* _tmp12_;
+				PhotoUpdates* _tmp13_;
 				gboolean _tmp14_ = FALSE;
-				PhotoUpdates* _tmp15_ = NULL;
-				GFile* _tmp16_ = NULL;
-				GFile* _tmp17_ = NULL;
-				gboolean _tmp18_ = FALSE;
+				PhotoUpdates* _tmp15_;
+				GFile* _tmp16_;
+				GFile* _tmp17_;
+				gboolean _tmp18_;
 				gboolean _tmp26_ = FALSE;
-				PhotoUpdates* _tmp27_ = NULL;
-				GFile* _tmp28_ = NULL;
-				GFile* _tmp29_ = NULL;
-				gboolean _tmp30_ = FALSE;
-				PhotoUpdates* _tmp39_ = NULL;
-				GeeCollection* _tmp40_ = NULL;
-				GeeCollection* _tmp41_ = NULL;
-				gboolean _tmp42_ = FALSE;
+				PhotoUpdates* _tmp27_;
+				GFile* _tmp28_;
+				GFile* _tmp29_;
+				gboolean _tmp30_;
+				PhotoUpdates* _tmp39_;
+				GeeCollection* _tmp40_;
+				GeeCollection* _tmp41_;
+				gboolean _tmp42_;
 #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp5_ = _monitorable_it;
 #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5074,11 +5074,11 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self,
 #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_tmp18_) {
 #line 5075 "PhotoMonitor.c"
-					PhotoUpdates* _tmp19_ = NULL;
-					GFile* _tmp20_ = NULL;
-					GFile* _tmp21_ = NULL;
-					GFile* _tmp22_ = NULL;
-					gboolean _tmp23_ = FALSE;
+					PhotoUpdates* _tmp19_;
+					GFile* _tmp20_;
+					GFile* _tmp21_;
+					GFile* _tmp22_;
+					gboolean _tmp23_;
 #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp19_ = updates;
 #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5102,8 +5102,8 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self,
 #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_tmp14_) {
 #line 5103 "PhotoMonitor.c"
-					LibraryPhoto* _tmp24_ = NULL;
-					GFile* _tmp25_ = NULL;
+					LibraryPhoto* _tmp24_;
+					GFile* _tmp25_;
 #line 778 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp24_ = photo;
 #line 778 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5135,11 +5135,11 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self,
 #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_tmp30_) {
 #line 5136 "PhotoMonitor.c"
-					PhotoUpdates* _tmp31_ = NULL;
-					GFile* _tmp32_ = NULL;
-					GFile* _tmp33_ = NULL;
-					GFile* _tmp34_ = NULL;
-					gboolean _tmp35_ = FALSE;
+					PhotoUpdates* _tmp31_;
+					GFile* _tmp32_;
+					GFile* _tmp33_;
+					GFile* _tmp34_;
+					gboolean _tmp35_;
 #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp31_ = updates;
 #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5163,9 +5163,9 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self,
 #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_tmp26_) {
 #line 5164 "PhotoMonitor.c"
-					LibraryPhoto* _tmp36_ = NULL;
-					GFile* _tmp37_ = NULL;
-					GFile* _tmp38_ = NULL;
+					LibraryPhoto* _tmp36_;
+					GFile* _tmp37_;
+					GFile* _tmp38_;
 #line 784 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp36_ = photo;
 #line 784 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5224,17 +5224,17 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self,
 				if (_tmp42_) {
 #line 5224 "PhotoMonitor.c"
 					gboolean found = FALSE;
-					gboolean _tmp55_ = FALSE;
+					gboolean _tmp55_;
 #line 798 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					found = FALSE;
 #line 5229 "PhotoMonitor.c"
 					{
 						GeeIterator* _raw_it = NULL;
-						PhotoUpdates* _tmp43_ = NULL;
-						GeeCollection* _tmp44_ = NULL;
-						GeeCollection* _tmp45_ = NULL;
-						GeeIterator* _tmp46_ = NULL;
-						GeeIterator* _tmp47_ = NULL;
+						PhotoUpdates* _tmp43_;
+						GeeCollection* _tmp44_;
+						GeeCollection* _tmp45_;
+						GeeIterator* _tmp46_;
+						GeeIterator* _tmp47_;
 #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						_tmp43_ = updates;
 #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5252,14 +5252,14 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self,
 #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						while (TRUE) {
 #line 5253 "PhotoMonitor.c"
-							GeeIterator* _tmp48_ = NULL;
-							gboolean _tmp49_ = FALSE;
+							GeeIterator* _tmp48_;
+							gboolean _tmp49_;
 							GFile* raw = NULL;
-							GeeIterator* _tmp50_ = NULL;
-							gpointer _tmp51_ = NULL;
-							GFile* _tmp52_ = NULL;
-							GFile* _tmp53_ = NULL;
-							gboolean _tmp54_ = FALSE;
+							GeeIterator* _tmp50_;
+							gpointer _tmp51_;
+							GFile* _tmp52_;
+							GFile* _tmp53_;
+							gboolean _tmp54_;
 #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 							_tmp48_ = _raw_it;
 #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5306,9 +5306,9 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self,
 					if (_tmp55_) {
 #line 5306 "PhotoMonitor.c"
 						GeeCollection* developed = NULL;
-						LibraryPhoto* _tmp56_ = NULL;
-						GeeCollection* _tmp57_ = NULL;
-						GeeCollection* _tmp58_ = NULL;
+						LibraryPhoto* _tmp56_;
+						GeeCollection* _tmp57_;
+						GeeCollection* _tmp58_;
 #line 808 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						_tmp56_ = photo;
 #line 808 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5322,8 +5322,8 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self,
 #line 5321 "PhotoMonitor.c"
 							{
 								GeeIterator* _f_it = NULL;
-								GeeCollection* _tmp59_ = NULL;
-								GeeIterator* _tmp60_ = NULL;
+								GeeCollection* _tmp59_;
+								GeeIterator* _tmp60_;
 #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 								_tmp59_ = developed;
 #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5333,14 +5333,14 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self,
 #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 								while (TRUE) {
 #line 5334 "PhotoMonitor.c"
-									GeeIterator* _tmp61_ = NULL;
-									gboolean _tmp62_ = FALSE;
+									GeeIterator* _tmp61_;
+									gboolean _tmp62_;
 									GFile* f = NULL;
-									GeeIterator* _tmp63_ = NULL;
-									gpointer _tmp64_ = NULL;
-									GFile* _tmp65_ = NULL;
-									GFile* _tmp66_ = NULL;
-									gboolean _tmp67_ = FALSE;
+									GeeIterator* _tmp63_;
+									gpointer _tmp64_;
+									GFile* _tmp65_;
+									GFile* _tmp66_;
+									gboolean _tmp67_;
 #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 									_tmp61_ = _f_it;
 #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5366,8 +5366,8 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self,
 #line 811 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 									if (_tmp67_) {
 #line 5367 "PhotoMonitor.c"
-										GFile* _tmp68_ = NULL;
-										GFile* _tmp69_ = NULL;
+										GFile* _tmp68_;
+										GFile* _tmp69_;
 #line 812 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 										_tmp68_ = f;
 #line 812 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5426,7 +5426,7 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self,
 #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp70_ == NULL) {
 #line 5427 "PhotoMonitor.c"
-		GFile* _tmp72_ = NULL;
+		GFile* _tmp72_;
 #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp72_ = file;
 #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5457,8 +5457,8 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self,
 
 PhotoUpdates* photo_monitor_fetch_photo_updates (PhotoMonitor* self, LibraryPhoto* photo) {
 	PhotoUpdates* result = NULL;
-	LibraryPhoto* _tmp0_ = NULL;
-	MonitorableUpdates* _tmp1_ = NULL;
+	LibraryPhoto* _tmp0_;
+	MonitorableUpdates* _tmp1_;
 #line 830 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_val_if_fail (IS_PHOTO_MONITOR (self), NULL);
 #line 830 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5477,9 +5477,9 @@ PhotoUpdates* photo_monitor_fetch_photo_updates (PhotoMonitor* self, LibraryPhot
 
 PhotoUpdates* photo_monitor_get_existing_photo_updates (PhotoMonitor* self, LibraryPhoto* photo) {
 	PhotoUpdates* result = NULL;
-	LibraryPhoto* _tmp0_ = NULL;
-	MonitorableUpdates* _tmp1_ = NULL;
-	PhotoUpdates* _tmp2_ = NULL;
+	LibraryPhoto* _tmp0_;
+	MonitorableUpdates* _tmp1_;
+	PhotoUpdates* _tmp2_;
 #line 834 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_val_if_fail (IS_PHOTO_MONITOR (self), NULL);
 #line 834 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5505,12 +5505,12 @@ PhotoUpdates* photo_monitor_get_existing_photo_updates (PhotoMonitor* self, Libr
 
 
 void photo_monitor_update_reimport_master (PhotoMonitor* self, LibraryPhoto* photo) {
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoUpdates* _tmp1_ = NULL;
-	PhotoUpdates* _tmp2_ = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	LibraryPhoto* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	LibraryPhoto* _tmp0_;
+	PhotoUpdates* _tmp1_;
+	PhotoUpdates* _tmp2_;
+	GeeHashMap* _tmp3_;
+	LibraryPhoto* _tmp4_;
+	gboolean _tmp5_;
 #line 838 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 838 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5534,10 +5534,10 @@ void photo_monitor_update_reimport_master (PhotoMonitor* self, LibraryPhoto* pho
 #line 842 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp5_) {
 #line 5535 "PhotoMonitor.c"
-		GeeHashMap* _tmp6_ = NULL;
-		LibraryPhoto* _tmp7_ = NULL;
-		gpointer _tmp8_ = NULL;
-		PhotoMonitorReimportMasterJob* _tmp9_ = NULL;
+		GeeHashMap* _tmp6_;
+		LibraryPhoto* _tmp7_;
+		gpointer _tmp8_;
+		PhotoMonitorReimportMasterJob* _tmp9_;
 #line 843 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp6_ = self->priv->master_reimport_pending;
 #line 843 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5556,12 +5556,12 @@ void photo_monitor_update_reimport_master (PhotoMonitor* self, LibraryPhoto* pho
 
 
 void photo_monitor_update_reimport_editable (PhotoMonitor* self, LibraryPhoto* photo) {
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoUpdates* _tmp1_ = NULL;
-	PhotoUpdates* _tmp2_ = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	LibraryPhoto* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	LibraryPhoto* _tmp0_;
+	PhotoUpdates* _tmp1_;
+	PhotoUpdates* _tmp2_;
+	GeeHashMap* _tmp3_;
+	LibraryPhoto* _tmp4_;
+	gboolean _tmp5_;
 #line 846 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 846 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5585,10 +5585,10 @@ void photo_monitor_update_reimport_editable (PhotoMonitor* self, LibraryPhoto* p
 #line 850 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp5_) {
 #line 5586 "PhotoMonitor.c"
-		GeeHashMap* _tmp6_ = NULL;
-		LibraryPhoto* _tmp7_ = NULL;
-		gpointer _tmp8_ = NULL;
-		PhotoMonitorReimportEditableJob* _tmp9_ = NULL;
+		GeeHashMap* _tmp6_;
+		LibraryPhoto* _tmp7_;
+		gpointer _tmp8_;
+		PhotoMonitorReimportEditableJob* _tmp9_;
 #line 851 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp6_ = self->priv->editable_reimport_pending;
 #line 851 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5607,12 +5607,12 @@ void photo_monitor_update_reimport_editable (PhotoMonitor* self, LibraryPhoto* p
 
 
 void photo_monitor_update_reimport_raw_developments (PhotoMonitor* self, LibraryPhoto* photo) {
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoUpdates* _tmp1_ = NULL;
-	PhotoUpdates* _tmp2_ = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	LibraryPhoto* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	LibraryPhoto* _tmp0_;
+	PhotoUpdates* _tmp1_;
+	PhotoUpdates* _tmp2_;
+	GeeHashMap* _tmp3_;
+	LibraryPhoto* _tmp4_;
+	gboolean _tmp5_;
 #line 854 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 854 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5636,10 +5636,10 @@ void photo_monitor_update_reimport_raw_developments (PhotoMonitor* self, Library
 #line 858 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp5_) {
 #line 5637 "PhotoMonitor.c"
-		GeeHashMap* _tmp6_ = NULL;
-		LibraryPhoto* _tmp7_ = NULL;
-		gpointer _tmp8_ = NULL;
-		PhotoMonitorReimportRawDevelopmentJob* _tmp9_ = NULL;
+		GeeHashMap* _tmp6_;
+		LibraryPhoto* _tmp7_;
+		gpointer _tmp8_;
+		PhotoMonitorReimportRawDevelopmentJob* _tmp9_;
 #line 859 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp6_ = self->priv->raw_developments_reimport_pending;
 #line 859 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5660,11 +5660,11 @@ void photo_monitor_update_reimport_raw_developments (PhotoMonitor* self, Library
 GFile* photo_monitor_get_editable_file (PhotoMonitor* self, LibraryPhoto* photo) {
 	GFile* result = NULL;
 	PhotoUpdates* updates = NULL;
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoUpdates* _tmp1_ = NULL;
+	LibraryPhoto* _tmp0_;
+	PhotoUpdates* _tmp1_;
 	GFile* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-	PhotoUpdates* _tmp4_ = NULL;
+	PhotoUpdates* _tmp4_;
 #line 862 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_val_if_fail (IS_PHOTO_MONITOR (self), NULL);
 #line 862 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5680,9 +5680,9 @@ GFile* photo_monitor_get_editable_file (PhotoMonitor* self, LibraryPhoto* photo)
 #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp4_ != NULL) {
 #line 5681 "PhotoMonitor.c"
-		PhotoUpdates* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
+		PhotoUpdates* _tmp5_;
+		GFile* _tmp6_;
+		GFile* _tmp7_;
 #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp5_ = updates;
 #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5702,8 +5702,8 @@ GFile* photo_monitor_get_editable_file (PhotoMonitor* self, LibraryPhoto* photo)
 #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp3_) {
 #line 5703 "PhotoMonitor.c"
-		PhotoUpdates* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
+		PhotoUpdates* _tmp8_;
+		GFile* _tmp9_;
 #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp8_ = updates;
 #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5714,8 +5714,8 @@ GFile* photo_monitor_get_editable_file (PhotoMonitor* self, LibraryPhoto* photo)
 		_tmp2_ = _tmp9_;
 #line 5714 "PhotoMonitor.c"
 	} else {
-		LibraryPhoto* _tmp10_ = NULL;
-		GFile* _tmp11_ = NULL;
+		LibraryPhoto* _tmp10_;
+		GFile* _tmp11_;
 #line 866 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp10_ = photo;
 #line 866 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5739,11 +5739,11 @@ GFile* photo_monitor_get_editable_file (PhotoMonitor* self, LibraryPhoto* photo)
 GeeCollection* photo_monitor_get_raw_development_files (PhotoMonitor* self, LibraryPhoto* photo) {
 	GeeCollection* result = NULL;
 	PhotoUpdates* updates = NULL;
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoUpdates* _tmp1_ = NULL;
+	LibraryPhoto* _tmp0_;
+	PhotoUpdates* _tmp1_;
 	GeeCollection* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-	PhotoUpdates* _tmp4_ = NULL;
+	PhotoUpdates* _tmp4_;
 #line 869 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_val_if_fail (IS_PHOTO_MONITOR (self), NULL);
 #line 869 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5759,9 +5759,9 @@ GeeCollection* photo_monitor_get_raw_development_files (PhotoMonitor* self, Libr
 #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp4_ != NULL) {
 #line 5760 "PhotoMonitor.c"
-		PhotoUpdates* _tmp5_ = NULL;
-		GeeCollection* _tmp6_ = NULL;
-		GeeCollection* _tmp7_ = NULL;
+		PhotoUpdates* _tmp5_;
+		GeeCollection* _tmp6_;
+		GeeCollection* _tmp7_;
 #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp5_ = updates;
 #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5781,8 +5781,8 @@ GeeCollection* photo_monitor_get_raw_development_files (PhotoMonitor* self, Libr
 #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp3_) {
 #line 5782 "PhotoMonitor.c"
-		PhotoUpdates* _tmp8_ = NULL;
-		GeeCollection* _tmp9_ = NULL;
+		PhotoUpdates* _tmp8_;
+		GeeCollection* _tmp9_;
 #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp8_ = updates;
 #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5793,8 +5793,8 @@ GeeCollection* photo_monitor_get_raw_development_files (PhotoMonitor* self, Libr
 		_tmp2_ = _tmp9_;
 #line 5793 "PhotoMonitor.c"
 	} else {
-		LibraryPhoto* _tmp10_ = NULL;
-		GeeCollection* _tmp11_ = NULL;
+		LibraryPhoto* _tmp10_;
+		GeeCollection* _tmp11_;
 #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp10_ = photo;
 #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5816,10 +5816,10 @@ GeeCollection* photo_monitor_get_raw_development_files (PhotoMonitor* self, Libr
 
 
 void photo_monitor_update_editable_file (PhotoMonitor* self, LibraryPhoto* photo, GFile* file) {
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoUpdates* _tmp1_ = NULL;
-	PhotoUpdates* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	LibraryPhoto* _tmp0_;
+	PhotoUpdates* _tmp1_;
+	PhotoUpdates* _tmp2_;
+	GFile* _tmp3_;
 #line 876 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 876 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5843,9 +5843,9 @@ void photo_monitor_update_editable_file (PhotoMonitor* self, LibraryPhoto* photo
 
 
 void photo_monitor_update_editable_file_info_altered (PhotoMonitor* self, LibraryPhoto* photo) {
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoUpdates* _tmp1_ = NULL;
-	PhotoUpdates* _tmp2_ = NULL;
+	LibraryPhoto* _tmp0_;
+	PhotoUpdates* _tmp1_;
+	PhotoUpdates* _tmp2_;
 #line 880 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 880 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5865,10 +5865,10 @@ void photo_monitor_update_editable_file_info_altered (PhotoMonitor* self, Librar
 
 
 void photo_monitor_update_raw_development_file (PhotoMonitor* self, LibraryPhoto* photo, GFile* file) {
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoUpdates* _tmp1_ = NULL;
-	PhotoUpdates* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	LibraryPhoto* _tmp0_;
+	PhotoUpdates* _tmp1_;
+	PhotoUpdates* _tmp2_;
+	GFile* _tmp3_;
 #line 884 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 884 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5892,9 +5892,9 @@ void photo_monitor_update_raw_development_file (PhotoMonitor* self, LibraryPhoto
 
 
 void photo_monitor_update_raw_development_file_info_altered (PhotoMonitor* self, LibraryPhoto* photo) {
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoUpdates* _tmp1_ = NULL;
-	PhotoUpdates* _tmp2_ = NULL;
+	LibraryPhoto* _tmp0_;
+	PhotoUpdates* _tmp1_;
+	PhotoUpdates* _tmp2_;
 #line 888 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 888 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5914,10 +5914,10 @@ void photo_monitor_update_raw_development_file_info_altered (PhotoMonitor* self,
 
 
 void photo_monitor_update_editable_file_in_alteration (PhotoMonitor* self, LibraryPhoto* photo, gboolean in_alteration) {
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoUpdates* _tmp1_ = NULL;
-	PhotoUpdates* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	LibraryPhoto* _tmp0_;
+	PhotoUpdates* _tmp1_;
+	PhotoUpdates* _tmp2_;
+	gboolean _tmp3_;
 #line 892 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 892 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5939,13 +5939,13 @@ void photo_monitor_update_editable_file_in_alteration (PhotoMonitor* self, Libra
 
 
 void photo_monitor_update_editable_file_alterations_completed (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info) {
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoUpdates* _tmp1_ = NULL;
-	PhotoUpdates* _tmp2_ = NULL;
-	GFileInfo* _tmp3_ = NULL;
-	LibraryPhoto* _tmp4_ = NULL;
-	PhotoUpdates* _tmp5_ = NULL;
-	PhotoUpdates* _tmp6_ = NULL;
+	LibraryPhoto* _tmp0_;
+	PhotoUpdates* _tmp1_;
+	PhotoUpdates* _tmp2_;
+	GFileInfo* _tmp3_;
+	LibraryPhoto* _tmp4_;
+	PhotoUpdates* _tmp5_;
+	PhotoUpdates* _tmp6_;
 #line 896 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 896 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -5979,10 +5979,10 @@ void photo_monitor_update_editable_file_alterations_completed (PhotoMonitor* sel
 
 
 void photo_monitor_update_raw_development_file_in_alteration (PhotoMonitor* self, LibraryPhoto* photo, gboolean in_alteration) {
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoUpdates* _tmp1_ = NULL;
-	PhotoUpdates* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	LibraryPhoto* _tmp0_;
+	PhotoUpdates* _tmp1_;
+	PhotoUpdates* _tmp2_;
+	gboolean _tmp3_;
 #line 901 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 901 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6004,9 +6004,9 @@ void photo_monitor_update_raw_development_file_in_alteration (PhotoMonitor* self
 
 
 void photo_monitor_update_raw_development_file_alterations_completed (PhotoMonitor* self, LibraryPhoto* photo) {
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoUpdates* _tmp1_ = NULL;
-	PhotoUpdates* _tmp2_ = NULL;
+	LibraryPhoto* _tmp0_;
+	PhotoUpdates* _tmp1_;
+	PhotoUpdates* _tmp2_;
 #line 905 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 905 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6026,9 +6026,9 @@ void photo_monitor_update_raw_development_file_alterations_completed (PhotoMonit
 
 
 void photo_monitor_update_revert_to_master (PhotoMonitor* self, LibraryPhoto* photo) {
-	LibraryPhoto* _tmp0_ = NULL;
-	PhotoUpdates* _tmp1_ = NULL;
-	PhotoUpdates* _tmp2_ = NULL;
+	LibraryPhoto* _tmp0_;
+	PhotoUpdates* _tmp1_;
+	PhotoUpdates* _tmp2_;
 #line 909 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 909 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6056,8 +6056,8 @@ static gpointer _monitorable_updates_ref0 (gpointer self) {
 
 static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error) {
 	PhotoMonitor * self;
-	GeeCollection* _tmp0_ = NULL;
-	TransactionController* _tmp1_ = NULL;
+	GeeCollection* _tmp0_;
+	TransactionController* _tmp1_;
 	GeeMap* set_editable_file = NULL;
 	GeeMap* set_editable_file_info = NULL;
 	GeeMap* set_raw_developer_files = NULL;
@@ -6066,12 +6066,12 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 	GeeArrayList* reimport_editable = NULL;
 	GeeArrayList* reimport_raw_developments = NULL;
 	gint reimport_job_count = 0;
-	GeeMap* _tmp90_ = NULL;
-	GeeMap* _tmp98_ = NULL;
-	GeeArrayList* _tmp106_ = NULL;
-	GeeArrayList* _tmp124_ = NULL;
-	GeeArrayList* _tmp151_ = NULL;
-	GeeArrayList* _tmp178_ = NULL;
+	GeeMap* _tmp90_;
+	GeeMap* _tmp98_;
+	GeeArrayList* _tmp106_;
+	GeeArrayList* _tmp124_;
+	GeeArrayList* _tmp151_;
+	GeeArrayList* _tmp178_;
 	GError * _inner_error_ = NULL;
 #line 913 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor);
@@ -6112,8 +6112,8 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6111 "PhotoMonitor.c"
 	{
 		GeeIterator* _monitorable_updates_it = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeCollection* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp2_ = all_updates;
 #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6123,36 +6123,36 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		while (TRUE) {
 #line 6124 "PhotoMonitor.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			MonitorableUpdates* monitorable_updates = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
-			gint _tmp8_ = 0;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			gint _tmp8_;
 			PhotoUpdates* updates = NULL;
-			MonitorableUpdates* _tmp9_ = NULL;
-			PhotoUpdates* _tmp10_ = NULL;
-			PhotoUpdates* _tmp11_ = NULL;
-			PhotoUpdates* _tmp12_ = NULL;
-			GFile* _tmp13_ = NULL;
-			GFile* _tmp14_ = NULL;
-			gboolean _tmp15_ = FALSE;
-			PhotoUpdates* _tmp26_ = NULL;
-			GFileInfo* _tmp27_ = NULL;
-			GFileInfo* _tmp28_ = NULL;
-			gboolean _tmp29_ = FALSE;
-			PhotoUpdates* _tmp40_ = NULL;
-			GeeCollection* _tmp41_ = NULL;
-			GeeCollection* _tmp42_ = NULL;
-			gboolean _tmp43_ = FALSE;
-			PhotoUpdates* _tmp54_ = NULL;
-			gboolean _tmp55_ = FALSE;
+			MonitorableUpdates* _tmp9_;
+			PhotoUpdates* _tmp10_;
+			PhotoUpdates* _tmp11_;
+			PhotoUpdates* _tmp12_;
+			GFile* _tmp13_;
+			GFile* _tmp14_;
+			gboolean _tmp15_;
+			PhotoUpdates* _tmp26_;
+			GFileInfo* _tmp27_;
+			GFileInfo* _tmp28_;
+			gboolean _tmp29_;
+			PhotoUpdates* _tmp40_;
+			GeeCollection* _tmp41_;
+			GeeCollection* _tmp42_;
+			gboolean _tmp43_;
+			PhotoUpdates* _tmp54_;
+			gboolean _tmp55_;
 			gboolean _tmp66_ = FALSE;
-			PhotoUpdates* _tmp67_ = NULL;
-			gboolean _tmp68_ = FALSE;
+			PhotoUpdates* _tmp67_;
+			gboolean _tmp68_;
 			gboolean _tmp78_ = FALSE;
-			PhotoUpdates* _tmp79_ = NULL;
-			gboolean _tmp80_ = FALSE;
+			PhotoUpdates* _tmp79_;
+			gboolean _tmp80_;
 #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp4_ = _monitorable_updates_it;
 #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6210,21 +6210,21 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 934 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_tmp15_) {
 #line 6211 "PhotoMonitor.c"
-				GeeMap* _tmp16_ = NULL;
-				GeeMap* _tmp18_ = NULL;
-				PhotoUpdates* _tmp19_ = NULL;
-				LibraryPhoto* _tmp20_ = NULL;
-				PhotoUpdates* _tmp21_ = NULL;
-				GFile* _tmp22_ = NULL;
-				GFile* _tmp23_ = NULL;
-				PhotoUpdates* _tmp24_ = NULL;
-				gint _tmp25_ = 0;
+				GeeMap* _tmp16_;
+				GeeMap* _tmp18_;
+				PhotoUpdates* _tmp19_;
+				LibraryPhoto* _tmp20_;
+				PhotoUpdates* _tmp21_;
+				GFile* _tmp22_;
+				GFile* _tmp23_;
+				PhotoUpdates* _tmp24_;
+				gint _tmp25_;
 #line 935 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp16_ = set_editable_file;
 #line 935 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_tmp16_ == NULL) {
 #line 6225 "PhotoMonitor.c"
-					GeeHashMap* _tmp17_ = NULL;
+					GeeHashMap* _tmp17_;
 #line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp17_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6272,21 +6272,21 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 943 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_tmp29_) {
 #line 6273 "PhotoMonitor.c"
-				GeeMap* _tmp30_ = NULL;
-				GeeMap* _tmp32_ = NULL;
-				PhotoUpdates* _tmp33_ = NULL;
-				LibraryPhoto* _tmp34_ = NULL;
-				PhotoUpdates* _tmp35_ = NULL;
-				GFileInfo* _tmp36_ = NULL;
-				GFileInfo* _tmp37_ = NULL;
-				PhotoUpdates* _tmp38_ = NULL;
-				gint _tmp39_ = 0;
+				GeeMap* _tmp30_;
+				GeeMap* _tmp32_;
+				PhotoUpdates* _tmp33_;
+				LibraryPhoto* _tmp34_;
+				PhotoUpdates* _tmp35_;
+				GFileInfo* _tmp36_;
+				GFileInfo* _tmp37_;
+				PhotoUpdates* _tmp38_;
+				gint _tmp39_;
 #line 944 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp30_ = set_editable_file_info;
 #line 944 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_tmp30_ == NULL) {
 #line 6287 "PhotoMonitor.c"
-					GeeHashMap* _tmp31_ = NULL;
+					GeeHashMap* _tmp31_;
 #line 945 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp31_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 945 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6334,21 +6334,21 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 952 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_tmp43_) {
 #line 6335 "PhotoMonitor.c"
-				GeeMap* _tmp44_ = NULL;
-				GeeMap* _tmp46_ = NULL;
-				PhotoUpdates* _tmp47_ = NULL;
-				LibraryPhoto* _tmp48_ = NULL;
-				PhotoUpdates* _tmp49_ = NULL;
-				GeeCollection* _tmp50_ = NULL;
-				GeeCollection* _tmp51_ = NULL;
-				PhotoUpdates* _tmp52_ = NULL;
-				gint _tmp53_ = 0;
+				GeeMap* _tmp44_;
+				GeeMap* _tmp46_;
+				PhotoUpdates* _tmp47_;
+				LibraryPhoto* _tmp48_;
+				PhotoUpdates* _tmp49_;
+				GeeCollection* _tmp50_;
+				GeeCollection* _tmp51_;
+				PhotoUpdates* _tmp52_;
+				gint _tmp53_;
 #line 953 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp44_ = set_raw_developer_files;
 #line 953 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_tmp44_ == NULL) {
 #line 6349 "PhotoMonitor.c"
-					GeeHashMap* _tmp45_ = NULL;
+					GeeHashMap* _tmp45_;
 #line 954 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp45_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GEE_TYPE_COLLECTION, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 954 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6390,17 +6390,17 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 961 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_tmp55_) {
 #line 6391 "PhotoMonitor.c"
-				GeeArrayList* _tmp56_ = NULL;
-				GeeArrayList* _tmp58_ = NULL;
-				gint _tmp59_ = 0;
-				gint _tmp60_ = 0;
-				gint _tmp65_ = 0;
+				GeeArrayList* _tmp56_;
+				GeeArrayList* _tmp58_;
+				gint _tmp59_;
+				gint _tmp60_;
+				gint _tmp65_;
 #line 962 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp56_ = revert_to_master;
 #line 962 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_tmp56_ == NULL) {
 #line 6401 "PhotoMonitor.c"
-					GeeArrayList* _tmp57_ = NULL;
+					GeeArrayList* _tmp57_;
 #line 963 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp57_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 963 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6418,10 +6418,10 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 965 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_tmp60_ < PHOTO_MONITOR_MAX_REVERTS_PER_CYCLE) {
 #line 6419 "PhotoMonitor.c"
-					GeeArrayList* _tmp61_ = NULL;
-					PhotoUpdates* _tmp62_ = NULL;
-					LibraryPhoto* _tmp63_ = NULL;
-					PhotoUpdates* _tmp64_ = NULL;
+					GeeArrayList* _tmp61_;
+					PhotoUpdates* _tmp62_;
+					LibraryPhoto* _tmp63_;
+					PhotoUpdates* _tmp64_;
 #line 966 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp61_ = revert_to_master;
 #line 966 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6449,7 +6449,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_tmp68_) {
 #line 6450 "PhotoMonitor.c"
-				gint _tmp69_ = 0;
+				gint _tmp69_;
 #line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp69_ = reimport_job_count;
 #line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6463,19 +6463,19 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_tmp66_) {
 #line 6464 "PhotoMonitor.c"
-				GeeArrayList* _tmp70_ = NULL;
-				GeeArrayList* _tmp72_ = NULL;
-				PhotoUpdates* _tmp73_ = NULL;
-				LibraryPhoto* _tmp74_ = NULL;
-				PhotoUpdates* _tmp75_ = NULL;
-				gint _tmp76_ = 0;
-				gint _tmp77_ = 0;
+				GeeArrayList* _tmp70_;
+				GeeArrayList* _tmp72_;
+				PhotoUpdates* _tmp73_;
+				LibraryPhoto* _tmp74_;
+				PhotoUpdates* _tmp75_;
+				gint _tmp76_;
+				gint _tmp77_;
 #line 973 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp70_ = reimport_master;
 #line 973 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_tmp70_ == NULL) {
 #line 6476 "PhotoMonitor.c"
-					GeeArrayList* _tmp71_ = NULL;
+					GeeArrayList* _tmp71_;
 #line 974 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp71_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 974 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6513,7 +6513,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_tmp80_) {
 #line 6514 "PhotoMonitor.c"
-				gint _tmp81_ = 0;
+				gint _tmp81_;
 #line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp81_ = reimport_job_count;
 #line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6527,19 +6527,19 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_tmp78_) {
 #line 6528 "PhotoMonitor.c"
-				GeeArrayList* _tmp82_ = NULL;
-				GeeArrayList* _tmp84_ = NULL;
-				PhotoUpdates* _tmp85_ = NULL;
-				LibraryPhoto* _tmp86_ = NULL;
-				PhotoUpdates* _tmp87_ = NULL;
-				gint _tmp88_ = 0;
-				gint _tmp89_ = 0;
+				GeeArrayList* _tmp82_;
+				GeeArrayList* _tmp84_;
+				PhotoUpdates* _tmp85_;
+				LibraryPhoto* _tmp86_;
+				PhotoUpdates* _tmp87_;
+				gint _tmp88_;
+				gint _tmp89_;
 #line 983 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp82_ = reimport_editable;
 #line 983 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_tmp82_ == NULL) {
 #line 6540 "PhotoMonitor.c"
-					GeeArrayList* _tmp83_ = NULL;
+					GeeArrayList* _tmp83_;
 #line 984 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_tmp83_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 984 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6585,11 +6585,11 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 993 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp90_ != NULL) {
 #line 6586 "PhotoMonitor.c"
-		GeeMap* _tmp91_ = NULL;
-		gint _tmp92_ = 0;
-		gint _tmp93_ = 0;
-		gchar* _tmp94_ = NULL;
-		gchar* _tmp95_ = NULL;
+		GeeMap* _tmp91_;
+		gint _tmp92_;
+		gint _tmp93_;
+		gchar* _tmp94_;
+		gchar* _tmp95_;
 #line 994 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp91_ = set_editable_file;
 #line 994 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6606,7 +6606,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 		_g_free0 (_tmp95_);
 #line 6606 "PhotoMonitor.c"
 		{
-			GeeMap* _tmp96_ = NULL;
+			GeeMap* _tmp96_;
 #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp96_ = set_editable_file;
 #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6616,7 +6616,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6617 "PhotoMonitor.c"
-					goto __catch584_database_error;
+					goto __catch586_database_error;
 				}
 #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_g_object_unref0 (reimport_raw_developments);
@@ -6641,11 +6641,11 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6640 "PhotoMonitor.c"
 			}
 		}
-		goto __finally584;
-		__catch584_database_error:
+		goto __finally586;
+		__catch586_database_error:
 		{
 			GError* err = NULL;
-			GError* _tmp97_ = NULL;
+			GError* _tmp97_;
 #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			err = _inner_error_;
 #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6658,7 +6658,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 			_g_error_free0 (err);
 #line 6658 "PhotoMonitor.c"
 		}
-		__finally584:
+		__finally586:
 #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6687,11 +6687,11 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1003 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp98_ != NULL) {
 #line 6688 "PhotoMonitor.c"
-		GeeMap* _tmp99_ = NULL;
-		gint _tmp100_ = 0;
-		gint _tmp101_ = 0;
-		gchar* _tmp102_ = NULL;
-		gchar* _tmp103_ = NULL;
+		GeeMap* _tmp99_;
+		gint _tmp100_;
+		gint _tmp101_;
+		gchar* _tmp102_;
+		gchar* _tmp103_;
 #line 1004 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp99_ = set_editable_file_info;
 #line 1004 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6708,7 +6708,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 		_g_free0 (_tmp103_);
 #line 6708 "PhotoMonitor.c"
 		{
-			GeeMap* _tmp104_ = NULL;
+			GeeMap* _tmp104_;
 #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp104_ = set_editable_file_info;
 #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6718,7 +6718,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6719 "PhotoMonitor.c"
-					goto __catch585_database_error;
+					goto __catch587_database_error;
 				}
 #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_g_object_unref0 (reimport_raw_developments);
@@ -6743,11 +6743,11 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6742 "PhotoMonitor.c"
 			}
 		}
-		goto __finally585;
-		__catch585_database_error:
+		goto __finally587;
+		__catch587_database_error:
 		{
 			GError* err = NULL;
-			GError* _tmp105_ = NULL;
+			GError* _tmp105_;
 #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			err = _inner_error_;
 #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6760,7 +6760,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 			_g_error_free0 (err);
 #line 6760 "PhotoMonitor.c"
 		}
-		__finally585:
+		__finally587:
 #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6789,11 +6789,11 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1013 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp106_ != NULL) {
 #line 6790 "PhotoMonitor.c"
-		GeeArrayList* _tmp107_ = NULL;
-		gint _tmp108_ = 0;
-		gint _tmp109_ = 0;
-		gchar* _tmp110_ = NULL;
-		gchar* _tmp111_ = NULL;
+		GeeArrayList* _tmp107_;
+		gint _tmp108_;
+		gint _tmp109_;
+		gchar* _tmp110_;
+		gchar* _tmp111_;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp107_ = revert_to_master;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6811,12 +6811,12 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6810 "PhotoMonitor.c"
 		{
 			GeeArrayList* _photo_list = NULL;
-			GeeArrayList* _tmp112_ = NULL;
-			GeeArrayList* _tmp113_ = NULL;
+			GeeArrayList* _tmp112_;
+			GeeArrayList* _tmp113_;
 			gint _photo_size = 0;
-			GeeArrayList* _tmp114_ = NULL;
-			gint _tmp115_ = 0;
-			gint _tmp116_ = 0;
+			GeeArrayList* _tmp114_;
+			gint _tmp115_;
+			gint _tmp116_;
 			gint _photo_index = 0;
 #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp112_ = revert_to_master;
@@ -6837,14 +6837,14 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			while (TRUE) {
 #line 6838 "PhotoMonitor.c"
-				gint _tmp117_ = 0;
-				gint _tmp118_ = 0;
-				gint _tmp119_ = 0;
+				gint _tmp117_;
+				gint _tmp118_;
+				gint _tmp119_;
 				LibraryPhoto* photo = NULL;
-				GeeArrayList* _tmp120_ = NULL;
-				gint _tmp121_ = 0;
-				gpointer _tmp122_ = NULL;
-				LibraryPhoto* _tmp123_ = NULL;
+				GeeArrayList* _tmp120_;
+				gint _tmp121_;
+				gpointer _tmp122_;
+				LibraryPhoto* _tmp123_;
 #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp117_ = _photo_index;
 #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6885,11 +6885,11 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1024 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp124_ != NULL) {
 #line 6886 "PhotoMonitor.c"
-		GeeArrayList* _tmp125_ = NULL;
-		gint _tmp126_ = 0;
-		gint _tmp127_ = 0;
-		gchar* _tmp128_ = NULL;
-		gchar* _tmp129_ = NULL;
+		GeeArrayList* _tmp125_;
+		gint _tmp126_;
+		gint _tmp127_;
+		gchar* _tmp128_;
+		gchar* _tmp129_;
 #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp125_ = reimport_master;
 #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6907,12 +6907,12 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6906 "PhotoMonitor.c"
 		{
 			GeeArrayList* _photo_list = NULL;
-			GeeArrayList* _tmp130_ = NULL;
-			GeeArrayList* _tmp131_ = NULL;
+			GeeArrayList* _tmp130_;
+			GeeArrayList* _tmp131_;
 			gint _photo_size = 0;
-			GeeArrayList* _tmp132_ = NULL;
-			gint _tmp133_ = 0;
-			gint _tmp134_ = 0;
+			GeeArrayList* _tmp132_;
+			gint _tmp133_;
+			gint _tmp134_;
 			gint _photo_index = 0;
 #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp130_ = reimport_master;
@@ -6933,24 +6933,24 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			while (TRUE) {
 #line 6934 "PhotoMonitor.c"
-				gint _tmp135_ = 0;
-				gint _tmp136_ = 0;
-				gint _tmp137_ = 0;
+				gint _tmp135_;
+				gint _tmp136_;
+				gint _tmp137_;
 				LibraryPhoto* photo = NULL;
-				GeeArrayList* _tmp138_ = NULL;
-				gint _tmp139_ = 0;
-				gpointer _tmp140_ = NULL;
-				GeeHashMap* _tmp141_ = NULL;
-				LibraryPhoto* _tmp142_ = NULL;
-				gboolean _tmp143_ = FALSE;
+				GeeArrayList* _tmp138_;
+				gint _tmp139_;
+				gpointer _tmp140_;
+				GeeHashMap* _tmp141_;
+				LibraryPhoto* _tmp142_;
+				gboolean _tmp143_;
 				PhotoMonitorReimportMasterJob* job = NULL;
-				LibraryPhoto* _tmp144_ = NULL;
-				PhotoMonitorReimportMasterJob* _tmp145_ = NULL;
-				GeeHashMap* _tmp146_ = NULL;
-				LibraryPhoto* _tmp147_ = NULL;
-				PhotoMonitorReimportMasterJob* _tmp148_ = NULL;
-				Workers* _tmp149_ = NULL;
-				PhotoMonitorReimportMasterJob* _tmp150_ = NULL;
+				LibraryPhoto* _tmp144_;
+				PhotoMonitorReimportMasterJob* _tmp145_;
+				GeeHashMap* _tmp146_;
+				LibraryPhoto* _tmp147_;
+				PhotoMonitorReimportMasterJob* _tmp148_;
+				Workers* _tmp149_;
+				PhotoMonitorReimportMasterJob* _tmp150_;
 #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp135_ = _photo_index;
 #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7017,11 +7017,11 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1036 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp151_ != NULL) {
 #line 7018 "PhotoMonitor.c"
-		GeeArrayList* _tmp152_ = NULL;
-		gint _tmp153_ = 0;
-		gint _tmp154_ = 0;
-		gchar* _tmp155_ = NULL;
-		gchar* _tmp156_ = NULL;
+		GeeArrayList* _tmp152_;
+		gint _tmp153_;
+		gint _tmp154_;
+		gchar* _tmp155_;
+		gchar* _tmp156_;
 #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp152_ = reimport_editable;
 #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7039,12 +7039,12 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 7038 "PhotoMonitor.c"
 		{
 			GeeArrayList* _photo_list = NULL;
-			GeeArrayList* _tmp157_ = NULL;
-			GeeArrayList* _tmp158_ = NULL;
+			GeeArrayList* _tmp157_;
+			GeeArrayList* _tmp158_;
 			gint _photo_size = 0;
-			GeeArrayList* _tmp159_ = NULL;
-			gint _tmp160_ = 0;
-			gint _tmp161_ = 0;
+			GeeArrayList* _tmp159_;
+			gint _tmp160_;
+			gint _tmp161_;
 			gint _photo_index = 0;
 #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp157_ = reimport_editable;
@@ -7065,24 +7065,24 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			while (TRUE) {
 #line 7066 "PhotoMonitor.c"
-				gint _tmp162_ = 0;
-				gint _tmp163_ = 0;
-				gint _tmp164_ = 0;
+				gint _tmp162_;
+				gint _tmp163_;
+				gint _tmp164_;
 				LibraryPhoto* photo = NULL;
-				GeeArrayList* _tmp165_ = NULL;
-				gint _tmp166_ = 0;
-				gpointer _tmp167_ = NULL;
-				GeeHashMap* _tmp168_ = NULL;
-				LibraryPhoto* _tmp169_ = NULL;
-				gboolean _tmp170_ = FALSE;
+				GeeArrayList* _tmp165_;
+				gint _tmp166_;
+				gpointer _tmp167_;
+				GeeHashMap* _tmp168_;
+				LibraryPhoto* _tmp169_;
+				gboolean _tmp170_;
 				PhotoMonitorReimportEditableJob* job = NULL;
-				LibraryPhoto* _tmp171_ = NULL;
-				PhotoMonitorReimportEditableJob* _tmp172_ = NULL;
-				GeeHashMap* _tmp173_ = NULL;
-				LibraryPhoto* _tmp174_ = NULL;
-				PhotoMonitorReimportEditableJob* _tmp175_ = NULL;
-				Workers* _tmp176_ = NULL;
-				PhotoMonitorReimportEditableJob* _tmp177_ = NULL;
+				LibraryPhoto* _tmp171_;
+				PhotoMonitorReimportEditableJob* _tmp172_;
+				GeeHashMap* _tmp173_;
+				LibraryPhoto* _tmp174_;
+				PhotoMonitorReimportEditableJob* _tmp175_;
+				Workers* _tmp176_;
+				PhotoMonitorReimportEditableJob* _tmp177_;
 #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp162_ = _photo_index;
 #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7149,11 +7149,11 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1048 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp178_ != NULL) {
 #line 7150 "PhotoMonitor.c"
-		GeeArrayList* _tmp179_ = NULL;
-		gint _tmp180_ = 0;
-		gint _tmp181_ = 0;
-		gchar* _tmp182_ = NULL;
-		gchar* _tmp183_ = NULL;
+		GeeArrayList* _tmp179_;
+		gint _tmp180_;
+		gint _tmp181_;
+		gchar* _tmp182_;
+		gchar* _tmp183_;
 #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp179_ = reimport_raw_developments;
 #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7171,12 +7171,12 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 7170 "PhotoMonitor.c"
 		{
 			GeeArrayList* _photo_list = NULL;
-			GeeArrayList* _tmp184_ = NULL;
-			GeeArrayList* _tmp185_ = NULL;
+			GeeArrayList* _tmp184_;
+			GeeArrayList* _tmp185_;
 			gint _photo_size = 0;
-			GeeArrayList* _tmp186_ = NULL;
-			gint _tmp187_ = 0;
-			gint _tmp188_ = 0;
+			GeeArrayList* _tmp186_;
+			gint _tmp187_;
+			gint _tmp188_;
 			gint _photo_index = 0;
 #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp184_ = reimport_raw_developments;
@@ -7197,24 +7197,24 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			while (TRUE) {
 #line 7198 "PhotoMonitor.c"
-				gint _tmp189_ = 0;
-				gint _tmp190_ = 0;
-				gint _tmp191_ = 0;
+				gint _tmp189_;
+				gint _tmp190_;
+				gint _tmp191_;
 				LibraryPhoto* photo = NULL;
-				GeeArrayList* _tmp192_ = NULL;
-				gint _tmp193_ = 0;
-				gpointer _tmp194_ = NULL;
-				GeeHashMap* _tmp195_ = NULL;
-				LibraryPhoto* _tmp196_ = NULL;
-				gboolean _tmp197_ = FALSE;
+				GeeArrayList* _tmp192_;
+				gint _tmp193_;
+				gpointer _tmp194_;
+				GeeHashMap* _tmp195_;
+				LibraryPhoto* _tmp196_;
+				gboolean _tmp197_;
 				PhotoMonitorReimportRawDevelopmentJob* job = NULL;
-				LibraryPhoto* _tmp198_ = NULL;
-				PhotoMonitorReimportRawDevelopmentJob* _tmp199_ = NULL;
-				GeeHashMap* _tmp200_ = NULL;
-				LibraryPhoto* _tmp201_ = NULL;
-				PhotoMonitorReimportRawDevelopmentJob* _tmp202_ = NULL;
-				Workers* _tmp203_ = NULL;
-				PhotoMonitorReimportRawDevelopmentJob* _tmp204_ = NULL;
+				LibraryPhoto* _tmp198_;
+				PhotoMonitorReimportRawDevelopmentJob* _tmp199_;
+				GeeHashMap* _tmp200_;
+				LibraryPhoto* _tmp201_;
+				PhotoMonitorReimportRawDevelopmentJob* _tmp202_;
+				Workers* _tmp203_;
+				PhotoMonitorReimportRawDevelopmentJob* _tmp204_;
 #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp189_ = _photo_index;
 #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7303,27 +7303,27 @@ static gpointer _background_job_ref0 (gpointer self) {
 
 static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJob* j) {
 	PhotoMonitorReimportMasterJob* job = NULL;
-	BackgroundJob* _tmp0_ = NULL;
-	PhotoMonitorReimportMasterJob* _tmp1_ = NULL;
+	BackgroundJob* _tmp0_;
+	PhotoMonitorReimportMasterJob* _tmp1_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp2_ = NULL;
-	PhotoMonitorReimportMasterJob* _tmp3_ = NULL;
-	LibraryPhoto* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	PhotoMonitorReimportMasterJob* _tmp7_ = NULL;
-	GError* _tmp8_ = NULL;
-	PhotoMonitorReimportMasterJob* _tmp18_ = NULL;
-	gboolean _tmp19_ = FALSE;
-	PhotoMonitorReimportMasterJob* _tmp27_ = NULL;
-	LibraryPhoto* _tmp28_ = NULL;
-	gboolean _tmp29_ = FALSE;
-	PhotoMonitorReimportMasterJob* _tmp32_ = NULL;
-	LibraryPhoto* _tmp33_ = NULL;
-	gchar* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
-	gchar* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
+	GeeHashMap* _tmp2_;
+	PhotoMonitorReimportMasterJob* _tmp3_;
+	LibraryPhoto* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	PhotoMonitorReimportMasterJob* _tmp7_;
+	GError* _tmp8_;
+	PhotoMonitorReimportMasterJob* _tmp18_;
+	gboolean _tmp19_;
+	PhotoMonitorReimportMasterJob* _tmp27_;
+	LibraryPhoto* _tmp28_;
+	gboolean _tmp29_;
+	PhotoMonitorReimportMasterJob* _tmp32_;
+	LibraryPhoto* _tmp33_;
+	gchar* _tmp34_;
+	gchar* _tmp35_;
+	gchar* _tmp36_;
+	gchar* _tmp37_;
 	GError * _inner_error_ = NULL;
 #line 1061 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
@@ -7356,15 +7356,15 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
 #line 1068 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp8_ != NULL) {
 #line 7357 "PhotoMonitor.c"
-		PhotoMonitorReimportMasterJob* _tmp9_ = NULL;
-		LibraryPhoto* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		PhotoMonitorReimportMasterJob* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-		PhotoMonitorReimportMasterJob* _tmp16_ = NULL;
-		LibraryPhoto* _tmp17_ = NULL;
+		PhotoMonitorReimportMasterJob* _tmp9_;
+		LibraryPhoto* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		PhotoMonitorReimportMasterJob* _tmp13_;
+		GError* _tmp14_;
+		const gchar* _tmp15_;
+		PhotoMonitorReimportMasterJob* _tmp16_;
+		LibraryPhoto* _tmp17_;
 #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp9_ = job;
 #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7403,8 +7403,8 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
 #line 1077 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (!_tmp19_) {
 #line 7403 "PhotoMonitor.c"
-		PhotoMonitorReimportMasterJob* _tmp20_ = NULL;
-		LibraryPhoto* _tmp21_ = NULL;
+		PhotoMonitorReimportMasterJob* _tmp20_;
+		LibraryPhoto* _tmp21_;
 #line 1079 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp20_ = job;
 #line 1079 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7418,10 +7418,10 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
 #line 7416 "PhotoMonitor.c"
 	}
 	{
-		PhotoMonitorReimportMasterJob* _tmp22_ = NULL;
-		LibraryPhoto* _tmp23_ = NULL;
-		PhotoMonitorReimportMasterJob* _tmp24_ = NULL;
-		PhotoReimportMasterState* _tmp25_ = NULL;
+		PhotoMonitorReimportMasterJob* _tmp22_;
+		LibraryPhoto* _tmp23_;
+		PhotoMonitorReimportMasterJob* _tmp24_;
+		PhotoReimportMasterState* _tmp25_;
 #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp22_ = job;
 #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7437,7 +7437,7 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
 #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 7437 "PhotoMonitor.c"
-				goto __catch586_database_error;
+				goto __catch588_database_error;
 			}
 #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_background_job_unref0 (job);
@@ -7450,11 +7450,11 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
 #line 7448 "PhotoMonitor.c"
 		}
 	}
-	goto __finally586;
-	__catch586_database_error:
+	goto __finally588;
+	__catch588_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp26_ = NULL;
+		GError* _tmp26_;
 #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		err = _inner_error_;
 #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7467,7 +7467,7 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
 		_g_error_free0 (err);
 #line 7466 "PhotoMonitor.c"
 	}
-	__finally586:
+	__finally588:
 #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7489,8 +7489,8 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
 #line 1091 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp29_) {
 #line 7489 "PhotoMonitor.c"
-		PhotoMonitorReimportMasterJob* _tmp30_ = NULL;
-		LibraryPhoto* _tmp31_ = NULL;
+		PhotoMonitorReimportMasterJob* _tmp30_;
+		LibraryPhoto* _tmp31_;
 #line 1092 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp30_ = job;
 #line 1092 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7525,10 +7525,10 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
 
 static void photo_monitor_on_master_reimport_cancelled (PhotoMonitor* self, BackgroundJob* j) {
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	BackgroundJob* _tmp1_ = NULL;
-	LibraryPhoto* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	GeeHashMap* _tmp0_;
+	BackgroundJob* _tmp1_;
+	LibraryPhoto* _tmp2_;
+	gboolean _tmp3_;
 #line 1097 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 1097 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7551,22 +7551,22 @@ static void photo_monitor_on_master_reimport_cancelled (PhotoMonitor* self, Back
 
 static void photo_monitor_on_editable_reimported (PhotoMonitor* self, BackgroundJob* j) {
 	PhotoMonitorReimportEditableJob* job = NULL;
-	BackgroundJob* _tmp0_ = NULL;
-	PhotoMonitorReimportEditableJob* _tmp1_ = NULL;
+	BackgroundJob* _tmp0_;
+	PhotoMonitorReimportEditableJob* _tmp1_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp2_ = NULL;
-	PhotoMonitorReimportEditableJob* _tmp3_ = NULL;
-	LibraryPhoto* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	PhotoMonitorReimportEditableJob* _tmp7_ = NULL;
-	GError* _tmp8_ = NULL;
-	PhotoMonitorReimportEditableJob* _tmp21_ = NULL;
-	LibraryPhoto* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
+	GeeHashMap* _tmp2_;
+	PhotoMonitorReimportEditableJob* _tmp3_;
+	LibraryPhoto* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	PhotoMonitorReimportEditableJob* _tmp7_;
+	GError* _tmp8_;
+	PhotoMonitorReimportEditableJob* _tmp21_;
+	LibraryPhoto* _tmp22_;
+	gchar* _tmp23_;
+	gchar* _tmp24_;
+	gchar* _tmp25_;
+	gchar* _tmp26_;
 	GError * _inner_error_ = NULL;
 #line 1102 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
@@ -7599,13 +7599,13 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background
 #line 1109 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp8_ != NULL) {
 #line 7599 "PhotoMonitor.c"
-		PhotoMonitorReimportEditableJob* _tmp9_ = NULL;
-		LibraryPhoto* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		PhotoMonitorReimportEditableJob* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
+		PhotoMonitorReimportEditableJob* _tmp9_;
+		LibraryPhoto* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		PhotoMonitorReimportEditableJob* _tmp13_;
+		GError* _tmp14_;
+		const gchar* _tmp15_;
 #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp9_ = job;
 #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7631,10 +7631,10 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background
 #line 7629 "PhotoMonitor.c"
 	}
 	{
-		PhotoMonitorReimportEditableJob* _tmp16_ = NULL;
-		LibraryPhoto* _tmp17_ = NULL;
-		PhotoMonitorReimportEditableJob* _tmp18_ = NULL;
-		PhotoReimportEditableState* _tmp19_ = NULL;
+		PhotoMonitorReimportEditableJob* _tmp16_;
+		LibraryPhoto* _tmp17_;
+		PhotoMonitorReimportEditableJob* _tmp18_;
+		PhotoReimportEditableState* _tmp19_;
 #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp16_ = job;
 #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7650,7 +7650,7 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background
 #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 7650 "PhotoMonitor.c"
-				goto __catch587_database_error;
+				goto __catch589_database_error;
 			}
 #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_background_job_unref0 (job);
@@ -7663,11 +7663,11 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background
 #line 7661 "PhotoMonitor.c"
 		}
 	}
-	goto __finally587;
-	__catch587_database_error:
+	goto __finally589;
+	__catch589_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp20_ = NULL;
+		GError* _tmp20_;
 #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		err = _inner_error_;
 #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7680,7 +7680,7 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background
 		_g_error_free0 (err);
 #line 7679 "PhotoMonitor.c"
 	}
-	__finally587:
+	__finally589:
 #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7719,10 +7719,10 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background
 
 static void photo_monitor_on_editable_reimport_cancelled (PhotoMonitor* self, BackgroundJob* j) {
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	BackgroundJob* _tmp1_ = NULL;
-	LibraryPhoto* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	GeeHashMap* _tmp0_;
+	BackgroundJob* _tmp1_;
+	LibraryPhoto* _tmp2_;
+	gboolean _tmp3_;
 #line 1124 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 1124 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7745,22 +7745,22 @@ static void photo_monitor_on_editable_reimport_cancelled (PhotoMonitor* self, Ba
 
 static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, BackgroundJob* j) {
 	PhotoMonitorReimportRawDevelopmentJob* job = NULL;
-	BackgroundJob* _tmp0_ = NULL;
-	PhotoMonitorReimportRawDevelopmentJob* _tmp1_ = NULL;
+	BackgroundJob* _tmp0_;
+	PhotoMonitorReimportRawDevelopmentJob* _tmp1_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp2_ = NULL;
-	PhotoMonitorReimportRawDevelopmentJob* _tmp3_ = NULL;
-	LibraryPhoto* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	PhotoMonitorReimportRawDevelopmentJob* _tmp7_ = NULL;
-	GError* _tmp8_ = NULL;
-	PhotoMonitorReimportRawDevelopmentJob* _tmp21_ = NULL;
-	LibraryPhoto* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
+	GeeHashMap* _tmp2_;
+	PhotoMonitorReimportRawDevelopmentJob* _tmp3_;
+	LibraryPhoto* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	PhotoMonitorReimportRawDevelopmentJob* _tmp7_;
+	GError* _tmp8_;
+	PhotoMonitorReimportRawDevelopmentJob* _tmp21_;
+	LibraryPhoto* _tmp22_;
+	gchar* _tmp23_;
+	gchar* _tmp24_;
+	gchar* _tmp25_;
+	gchar* _tmp26_;
 	GError * _inner_error_ = NULL;
 #line 1129 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
@@ -7793,13 +7793,13 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac
 #line 1136 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (_tmp8_ != NULL) {
 #line 7793 "PhotoMonitor.c"
-		PhotoMonitorReimportRawDevelopmentJob* _tmp9_ = NULL;
-		LibraryPhoto* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		PhotoMonitorReimportRawDevelopmentJob* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
+		PhotoMonitorReimportRawDevelopmentJob* _tmp9_;
+		LibraryPhoto* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		PhotoMonitorReimportRawDevelopmentJob* _tmp13_;
+		GError* _tmp14_;
+		const gchar* _tmp15_;
 #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp9_ = job;
 #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7825,10 +7825,10 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac
 #line 7823 "PhotoMonitor.c"
 	}
 	{
-		PhotoMonitorReimportRawDevelopmentJob* _tmp16_ = NULL;
-		LibraryPhoto* _tmp17_ = NULL;
-		PhotoMonitorReimportRawDevelopmentJob* _tmp18_ = NULL;
-		PhotoReimportRawDevelopmentState* _tmp19_ = NULL;
+		PhotoMonitorReimportRawDevelopmentJob* _tmp16_;
+		LibraryPhoto* _tmp17_;
+		PhotoMonitorReimportRawDevelopmentJob* _tmp18_;
+		PhotoReimportRawDevelopmentState* _tmp19_;
 #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp16_ = job;
 #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7844,7 +7844,7 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac
 #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 7844 "PhotoMonitor.c"
-				goto __catch588_database_error;
+				goto __catch590_database_error;
 			}
 #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_background_job_unref0 (job);
@@ -7857,11 +7857,11 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac
 #line 7855 "PhotoMonitor.c"
 		}
 	}
-	goto __finally588;
-	__catch588_database_error:
+	goto __finally590;
+	__catch590_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp20_ = NULL;
+		GError* _tmp20_;
 #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		err = _inner_error_;
 #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7874,7 +7874,7 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac
 		_g_error_free0 (err);
 #line 7873 "PhotoMonitor.c"
 	}
-	__finally588:
+	__finally590:
 #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7913,10 +7913,10 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac
 
 static void photo_monitor_on_raw_development_reimport_cancelled (PhotoMonitor* self, BackgroundJob* j) {
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	BackgroundJob* _tmp1_ = NULL;
-	LibraryPhoto* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	GeeHashMap* _tmp0_;
+	BackgroundJob* _tmp1_;
+	LibraryPhoto* _tmp2_;
+	gboolean _tmp3_;
 #line 1151 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_if_fail (IS_PHOTO_MONITOR (self));
 #line 1151 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7953,13 +7953,13 @@ static void _photo_monitor_on_master_reimport_cancelled_cancellation_callback (B
 
 static PhotoMonitorReimportMasterJob* photo_monitor_reimport_master_job_construct (GType object_type, PhotoMonitor* owner, LibraryPhoto* photo) {
 	PhotoMonitorReimportMasterJob* self = NULL;
-	PhotoMonitor* _tmp0_ = NULL;
-	PhotoMonitor* _tmp1_ = NULL;
-	GCancellable* _tmp2_ = NULL;
-	GCancellable* _tmp3_ = NULL;
-	PhotoMonitor* _tmp4_ = NULL;
-	LibraryPhoto* _tmp5_ = NULL;
-	LibraryPhoto* _tmp6_ = NULL;
+	PhotoMonitor* _tmp0_;
+	PhotoMonitor* _tmp1_;
+	GCancellable* _tmp2_;
+	GCancellable* _tmp3_;
+	PhotoMonitor* _tmp4_;
+	LibraryPhoto* _tmp5_;
+	LibraryPhoto* _tmp6_;
 #line 167 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_val_if_fail (IS_PHOTO_MONITOR (owner), NULL);
 #line 167 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8014,9 +8014,9 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base)
 #line 8012 "PhotoMonitor.c"
 	{
 		gboolean _tmp0_ = FALSE;
-		LibraryPhoto* _tmp1_ = NULL;
+		LibraryPhoto* _tmp1_;
 		PhotoReimportMasterState* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+		gboolean _tmp3_;
 #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp1_ = self->photo;
 #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8030,18 +8030,18 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base)
 #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8030 "PhotoMonitor.c"
-			goto __catch589_g_error;
+			goto __catch591_g_error;
 		}
 #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->mark_online = _tmp0_;
 #line 8035 "PhotoMonitor.c"
 	}
-	goto __finally589;
-	__catch589_g_error:
+	goto __finally591;
+	__catch591_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp4_ = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp4_;
+		GError* _tmp5_;
 #line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		err = _inner_error_;
 #line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8058,7 +8058,7 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base)
 		_g_error_free0 (err);
 #line 8057 "PhotoMonitor.c"
 	}
-	__finally589:
+	__finally591:
 #line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8078,7 +8078,7 @@ static void photo_monitor_reimport_master_job_class_init (PhotoMonitorReimportMa
 #line 161 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	((BackgroundJobClass *) klass)->finalize = photo_monitor_reimport_master_job_finalize;
 #line 161 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) photo_monitor_reimport_master_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) photo_monitor_reimport_master_job_real_execute;
 #line 8080 "PhotoMonitor.c"
 }
 
@@ -8094,7 +8094,7 @@ static void photo_monitor_reimport_master_job_instance_init (PhotoMonitorReimpor
 }
 
 
-static void photo_monitor_reimport_master_job_finalize (BackgroundJob* obj) {
+static void photo_monitor_reimport_master_job_finalize (BackgroundJob * obj) {
 	PhotoMonitorReimportMasterJob * self;
 #line 161 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, PhotoMonitorReimportMasterJob);
@@ -8138,13 +8138,13 @@ static void _photo_monitor_on_editable_reimport_cancelled_cancellation_callback
 
 static PhotoMonitorReimportEditableJob* photo_monitor_reimport_editable_job_construct (GType object_type, PhotoMonitor* owner, LibraryPhoto* photo) {
 	PhotoMonitorReimportEditableJob* self = NULL;
-	PhotoMonitor* _tmp0_ = NULL;
-	PhotoMonitor* _tmp1_ = NULL;
-	GCancellable* _tmp2_ = NULL;
-	GCancellable* _tmp3_ = NULL;
-	PhotoMonitor* _tmp4_ = NULL;
-	LibraryPhoto* _tmp5_ = NULL;
-	LibraryPhoto* _tmp6_ = NULL;
+	PhotoMonitor* _tmp0_;
+	PhotoMonitor* _tmp1_;
+	GCancellable* _tmp2_;
+	GCancellable* _tmp3_;
+	PhotoMonitor* _tmp4_;
+	LibraryPhoto* _tmp5_;
+	LibraryPhoto* _tmp6_;
 #line 189 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_val_if_fail (IS_PHOTO_MONITOR (owner), NULL);
 #line 189 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8192,9 +8192,9 @@ static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* bas
 #line 8190 "PhotoMonitor.c"
 	{
 		gboolean _tmp0_ = FALSE;
-		LibraryPhoto* _tmp1_ = NULL;
+		LibraryPhoto* _tmp1_;
 		PhotoReimportEditableState* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+		gboolean _tmp3_;
 #line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp1_ = self->photo;
 #line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8208,18 +8208,18 @@ static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* bas
 #line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8208 "PhotoMonitor.c"
-			goto __catch590_g_error;
+			goto __catch592_g_error;
 		}
 #line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->success = _tmp0_;
 #line 8213 "PhotoMonitor.c"
 	}
-	goto __finally590;
-	__catch590_g_error:
+	goto __finally592;
+	__catch592_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp4_ = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp4_;
+		GError* _tmp5_;
 #line 197 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		err = _inner_error_;
 #line 197 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8236,7 +8236,7 @@ static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* bas
 		_g_error_free0 (err);
 #line 8235 "PhotoMonitor.c"
 	}
-	__finally590:
+	__finally592:
 #line 197 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 197 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8256,7 +8256,7 @@ static void photo_monitor_reimport_editable_job_class_init (PhotoMonitorReimport
 #line 183 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	((BackgroundJobClass *) klass)->finalize = photo_monitor_reimport_editable_job_finalize;
 #line 183 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) photo_monitor_reimport_editable_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) photo_monitor_reimport_editable_job_real_execute;
 #line 8258 "PhotoMonitor.c"
 }
 
@@ -8272,7 +8272,7 @@ static void photo_monitor_reimport_editable_job_instance_init (PhotoMonitorReimp
 }
 
 
-static void photo_monitor_reimport_editable_job_finalize (BackgroundJob* obj) {
+static void photo_monitor_reimport_editable_job_finalize (BackgroundJob * obj) {
 	PhotoMonitorReimportEditableJob * self;
 #line 183 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_MONITOR_TYPE_REIMPORT_EDITABLE_JOB, PhotoMonitorReimportEditableJob);
@@ -8316,13 +8316,13 @@ static void _photo_monitor_on_raw_development_reimport_cancelled_cancellation_ca
 
 static PhotoMonitorReimportRawDevelopmentJob* photo_monitor_reimport_raw_development_job_construct (GType object_type, PhotoMonitor* owner, LibraryPhoto* photo) {
 	PhotoMonitorReimportRawDevelopmentJob* self = NULL;
-	PhotoMonitor* _tmp0_ = NULL;
-	PhotoMonitor* _tmp1_ = NULL;
-	GCancellable* _tmp2_ = NULL;
-	GCancellable* _tmp3_ = NULL;
-	PhotoMonitor* _tmp4_ = NULL;
-	LibraryPhoto* _tmp5_ = NULL;
-	LibraryPhoto* _tmp6_ = NULL;
+	PhotoMonitor* _tmp0_;
+	PhotoMonitor* _tmp1_;
+	GCancellable* _tmp2_;
+	GCancellable* _tmp3_;
+	PhotoMonitor* _tmp4_;
+	LibraryPhoto* _tmp5_;
+	LibraryPhoto* _tmp6_;
 #line 211 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_return_val_if_fail (IS_PHOTO_MONITOR (owner), NULL);
 #line 211 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8370,9 +8370,9 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ
 #line 8368 "PhotoMonitor.c"
 	{
 		gboolean _tmp0_ = FALSE;
-		LibraryPhoto* _tmp1_ = NULL;
+		LibraryPhoto* _tmp1_;
 		PhotoReimportRawDevelopmentState* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+		gboolean _tmp3_;
 #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp1_ = self->photo;
 #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8386,18 +8386,18 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ
 #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8386 "PhotoMonitor.c"
-			goto __catch591_g_error;
+			goto __catch593_g_error;
 		}
 #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->success = _tmp0_;
 #line 8391 "PhotoMonitor.c"
 	}
-	goto __finally591;
-	__catch591_g_error:
+	goto __finally593;
+	__catch593_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp4_ = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp4_;
+		GError* _tmp5_;
 #line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		err = _inner_error_;
 #line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8414,7 +8414,7 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ
 		_g_error_free0 (err);
 #line 8413 "PhotoMonitor.c"
 	}
-	__finally591:
+	__finally593:
 #line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8434,7 +8434,7 @@ static void photo_monitor_reimport_raw_development_job_class_init (PhotoMonitorR
 #line 205 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	((BackgroundJobClass *) klass)->finalize = photo_monitor_reimport_raw_development_job_finalize;
 #line 205 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) photo_monitor_reimport_raw_development_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) photo_monitor_reimport_raw_development_job_real_execute;
 #line 8436 "PhotoMonitor.c"
 }
 
@@ -8450,7 +8450,7 @@ static void photo_monitor_reimport_raw_development_job_instance_init (PhotoMonit
 }
 
 
-static void photo_monitor_reimport_raw_development_job_finalize (BackgroundJob* obj) {
+static void photo_monitor_reimport_raw_development_job_finalize (BackgroundJob * obj) {
 	PhotoMonitorReimportRawDevelopmentJob * self;
 #line 205 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, PhotoMonitorReimportRawDevelopmentJob);
@@ -8484,39 +8484,39 @@ static void photo_monitor_class_init (PhotoMonitorClass * klass) {
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_type_class_add_private (klass, sizeof (PhotoMonitorPrivate));
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->create_updates = (MonitorableUpdates* (*)(MediaMonitor*, Monitorable*)) photo_monitor_real_create_updates;
+	((MediaMonitorClass *) klass)->create_updates = (MonitorableUpdates* (*) (MediaMonitor *, Monitorable*)) photo_monitor_real_create_updates;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->get_media_source_collection = (MediaSourceCollection* (*)(MediaMonitor*)) photo_monitor_real_get_media_source_collection;
+	((MediaMonitorClass *) klass)->get_media_source_collection = (MediaSourceCollection* (*) (MediaMonitor *)) photo_monitor_real_get_media_source_collection;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->is_file_represented = (gboolean (*)(MediaMonitor*, GFile*)) photo_monitor_real_is_file_represented;
+	((MediaMonitorClass *) klass)->is_file_represented = (gboolean (*) (MediaMonitor *, GFile*)) photo_monitor_real_is_file_represented;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->close = (void (*)(MediaMonitor*)) photo_monitor_real_close;
+	((MediaMonitorClass *) klass)->close = (void (*) (MediaMonitor *)) photo_monitor_real_close;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_discovered = (MediaMonitorDiscoveredFile (*)(MediaMonitor*, GFile*, GFileInfo*, Monitorable**)) photo_monitor_real_notify_file_discovered;
+	((MediaMonitorClass *) klass)->notify_file_discovered = (MediaMonitorDiscoveredFile (*) (MediaMonitor *, GFile*, GFileInfo*, Monitorable* *)) photo_monitor_real_notify_file_discovered;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->candidates_for_unknown_file = (GeeCollection* (*)(MediaMonitor*, GFile*, GFileInfo*, MediaMonitorDiscoveredFile*)) photo_monitor_real_candidates_for_unknown_file;
+	((MediaMonitorClass *) klass)->candidates_for_unknown_file = (GeeCollection* (*) (MediaMonitor *, GFile*, GFileInfo*, MediaMonitorDiscoveredFile*)) photo_monitor_real_candidates_for_unknown_file;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->get_auxilliary_backing_files = (GFile** (*)(MediaMonitor*, Monitorable*, int*)) photo_monitor_real_get_auxilliary_backing_files;
+	((MediaMonitorClass *) klass)->get_auxilliary_backing_files = (GFile** (*) (MediaMonitor *, Monitorable*, int*)) photo_monitor_real_get_auxilliary_backing_files;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->update_backing_file_info = (void (*)(MediaMonitor*, Monitorable*, GFile*, GFileInfo*)) photo_monitor_real_update_backing_file_info;
+	((MediaMonitorClass *) klass)->update_backing_file_info = (void (*) (MediaMonitor *, Monitorable*, GFile*, GFileInfo*)) photo_monitor_real_update_backing_file_info;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_discovery_completing = (void (*)(MediaMonitor*)) photo_monitor_real_notify_discovery_completing;
+	((MediaMonitorClass *) klass)->notify_discovery_completing = (void (*) (MediaMonitor *)) photo_monitor_real_notify_discovery_completing;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_created = (gboolean (*)(MediaMonitor*, GFile*, GFileInfo*)) photo_monitor_real_notify_file_created;
+	((MediaMonitorClass *) klass)->notify_file_created = (gboolean (*) (MediaMonitor *, GFile*, GFileInfo*)) photo_monitor_real_notify_file_created;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_moved = (gboolean (*)(MediaMonitor*, GFile*, GFile*, GFileInfo*)) photo_monitor_real_notify_file_moved;
+	((MediaMonitorClass *) klass)->notify_file_moved = (gboolean (*) (MediaMonitor *, GFile*, GFile*, GFileInfo*)) photo_monitor_real_notify_file_moved;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_altered = (gboolean (*)(MediaMonitor*, GFile*)) photo_monitor_real_notify_file_altered;
+	((MediaMonitorClass *) klass)->notify_file_altered = (gboolean (*) (MediaMonitor *, GFile*)) photo_monitor_real_notify_file_altered;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_attributes_altered = (gboolean (*)(MediaMonitor*, GFile*)) photo_monitor_real_notify_file_attributes_altered;
+	((MediaMonitorClass *) klass)->notify_file_attributes_altered = (gboolean (*) (MediaMonitor *, GFile*)) photo_monitor_real_notify_file_attributes_altered;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_alteration_completed = (gboolean (*)(MediaMonitor*, GFile*, GFileInfo*)) photo_monitor_real_notify_file_alteration_completed;
+	((MediaMonitorClass *) klass)->notify_file_alteration_completed = (gboolean (*) (MediaMonitor *, GFile*, GFileInfo*)) photo_monitor_real_notify_file_alteration_completed;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_deleted = (gboolean (*)(MediaMonitor*, GFile*)) photo_monitor_real_notify_file_deleted;
+	((MediaMonitorClass *) klass)->notify_file_deleted = (gboolean (*) (MediaMonitor *, GFile*)) photo_monitor_real_notify_file_deleted;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->on_media_source_destroyed = (void (*)(MediaMonitor*, DataSource*)) photo_monitor_real_on_media_source_destroyed;
+	((MediaMonitorClass *) klass)->on_media_source_destroyed = (void (*) (MediaMonitor *, DataSource*)) photo_monitor_real_on_media_source_destroyed;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->process_updates = (void (*)(MediaMonitor*, GeeCollection*, TransactionController*, gint*, GError**)) photo_monitor_real_process_updates;
+	((MediaMonitorClass *) klass)->process_updates = (void (*) (MediaMonitor *, GeeCollection*, TransactionController*, gint*, GError**)) photo_monitor_real_process_updates;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	G_OBJECT_CLASS (klass)->finalize = photo_monitor_finalize;
 #line 8520 "PhotoMonitor.c"
@@ -8524,11 +8524,11 @@ static void photo_monitor_class_init (PhotoMonitorClass * klass) {
 
 
 static void photo_monitor_instance_init (PhotoMonitor * self) {
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	GeeHashMap* _tmp4_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp1_;
+	GeeHashMap* _tmp2_;
+	GeeHashMap* _tmp3_;
+	GeeHashMap* _tmp4_;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->priv = PHOTO_MONITOR_GET_PRIVATE (self);
 #line 228 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8555,7 +8555,7 @@ static void photo_monitor_instance_init (PhotoMonitor * self) {
 }
 
 
-static void photo_monitor_finalize (GObject* obj) {
+static void photo_monitor_finalize (GObject * obj) {
 	PhotoMonitor * self;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_MONITOR, PhotoMonitor);
diff --git a/src/PhotoPage.c b/src/PhotoPage.c
index 63363e0..65c465c 100644
--- a/src/PhotoPage.c
+++ b/src/PhotoPage.c
@@ -1,4 +1,4 @@
-/* PhotoPage.c generated by valac 0.34.7, the Vala compiler
+/* PhotoPage.c generated by valac 0.36.6, the Vala compiler
  * generated from PhotoPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1582,15 +1582,15 @@ GType photo_exception_get_type (void) G_GNUC_CONST;
 GType backing_fetch_mode_get_type (void) G_GNUC_CONST;
 GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error);
 void scaling_for_original (Scaling* result);
-static void zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob* obj);
+static void zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob * obj);
 #define ZOOM_BUFFER_TRANSFORMATION_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJobPrivate))
 enum  {
 	ZOOM_BUFFER_TRANSFORMATION_JOB_DUMMY_PROPERTY
 };
 static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base);
 void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPixbuf* source, GdkPixbuf* dest, GCancellable* cancellable);
-static void zoom_buffer_transformation_job_finalize (BackgroundJob* obj);
-static void zoom_buffer_finalize (GObject* obj);
+static void zoom_buffer_transformation_job_finalize (BackgroundJob * obj);
+static void zoom_buffer_finalize (GObject * obj);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType fullscreen_window_get_type (void) G_GNUC_CONST;
 gpointer injection_group_ref (gpointer instance);
@@ -1815,7 +1815,7 @@ void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, Phot
 GType pixbuf_cache_pixbuf_cache_batch_get_type (void) G_GNUC_CONST;
 PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_new (void);
 PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_construct (GType object_type);
-gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource** next, DataSource** prev, const gchar* type_selector);
+gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource* * next, DataSource* * prev, const gchar* type_selector);
 #define PHOTO_TYPENAME "thumb"
 GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource* home, const gchar* typename);
 void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch* batch, gboolean force);
@@ -2112,8 +2112,8 @@ cairo_t* single_photo_page_get_cairo_context (SinglePhotoPage* self);
 GdkPixbuf* single_photo_page_get_scaled_pixbuf (SinglePhotoPage* self);
 EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type, GtkWindow* container, GdkWindow* drawing_window, Photo* photo, cairo_t* default_ctx, Dimensions* surface_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position);
 static void editing_host_page_editing_host_canvas_real_repaint (EditingToolsPhotoCanvas* base);
-static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCanvas* obj);
-static void editing_host_page_finalize (GObject* obj);
+static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCanvas * obj);
+static void editing_host_page_finalize (GObject * obj);
 GType library_photo_page_get_type (void) G_GNUC_CONST;
 GType raw_developer_get_type (void) G_GNUC_CONST;
 GType checkerboard_page_get_type (void) G_GNUC_CONST;
@@ -2243,9 +2243,9 @@ InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_len
 InjectionGroup* injection_group_new (const gchar* path);
 InjectionGroup* injection_group_construct (GType object_type, const gchar* path);
 void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator);
-static void _vala_array_add82 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add83 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add84 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add82 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add83 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add84 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
 static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboolean display);
 void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, gboolean display);
 static void library_photo_page_real_update_actions (Page* base, gint selected_count, gint count);
@@ -2395,7 +2395,7 @@ enum  {
 };
 static gboolean library_photo_page_library_photo_page_view_filter_real_predicate (ViewFilter* base, DataView* view);
 ViewFilter* view_filter_construct (GType object_type);
-static void library_photo_page_finalize (GObject* obj);
+static void library_photo_page_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -2422,13 +2422,13 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 ZoomBuffer* zoom_buffer_construct (GType object_type, SinglePhotoPage* parent_page, Photo* backing_photo, GdkPixbuf* preview_image) {
 	ZoomBuffer * self = NULL;
-	SinglePhotoPage* _tmp0_ = NULL;
-	SinglePhotoPage* _tmp1_ = NULL;
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	Photo* _tmp5_ = NULL;
-	Workers* _tmp6_ = NULL;
+	SinglePhotoPage* _tmp0_;
+	SinglePhotoPage* _tmp1_;
+	GdkPixbuf* _tmp2_;
+	GdkPixbuf* _tmp3_;
+	Photo* _tmp4_;
+	Photo* _tmp5_;
+	Workers* _tmp6_;
 #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (parent_page), NULL);
 #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2496,31 +2496,31 @@ static void _zoom_buffer_on_iso_transformation_complete_completion_callback (Bac
 
 static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, BackgroundJob* job) {
 	ZoomBufferIsoSourceFetchJob* fetch_job = NULL;
-	BackgroundJob* _tmp0_ = NULL;
-	ZoomBufferIsoSourceFetchJob* _tmp1_ = NULL;
-	ZoomBufferIsoSourceFetchJob* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	ZoomBufferIsoSourceFetchJob* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
-	GdkPixbuf* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	GdkPixbuf* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	gboolean _tmp21_ = FALSE;
+	BackgroundJob* _tmp0_;
+	ZoomBufferIsoSourceFetchJob* _tmp1_;
+	ZoomBufferIsoSourceFetchJob* _tmp2_;
+	GdkPixbuf* _tmp3_;
+	ZoomBufferIsoSourceFetchJob* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	GdkPixbuf* _tmp6_;
+	GdkPixbuf* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	GdkPixbuf* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	gboolean _tmp21_;
 	BackgroundJob* transformation_job = NULL;
-	GdkPixbuf* _tmp23_ = NULL;
-	Photo* _tmp24_ = NULL;
-	PixelTransformer* _tmp25_ = NULL;
-	PixelTransformer* _tmp26_ = NULL;
-	GCancellable* _tmp27_ = NULL;
-	GCancellable* _tmp28_ = NULL;
-	ZoomBufferTransformationJob* _tmp29_ = NULL;
-	BackgroundJob* _tmp30_ = NULL;
-	Workers* _tmp31_ = NULL;
-	BackgroundJob* _tmp32_ = NULL;
+	GdkPixbuf* _tmp23_;
+	Photo* _tmp24_;
+	PixelTransformer* _tmp25_;
+	PixelTransformer* _tmp26_;
+	GCancellable* _tmp27_;
+	GCancellable* _tmp28_;
+	ZoomBufferTransformationJob* _tmp29_;
+	BackgroundJob* _tmp30_;
+	Workers* _tmp31_;
+	BackgroundJob* _tmp32_;
 #line 92 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_ZOOM_BUFFER (self));
 #line 92 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2571,14 +2571,14 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou
 #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((_tmp9_ * _tmp12_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) {
 #line 2573 "PhotoPage.c"
-		GdkPixbuf* _tmp13_ = NULL;
-		GdkPixbuf* _tmp14_ = NULL;
-		gint _tmp15_ = 0;
-		gint _tmp16_ = 0;
-		GdkPixbuf* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
-		GdkPixbuf* _tmp20_ = NULL;
+		GdkPixbuf* _tmp13_;
+		GdkPixbuf* _tmp14_;
+		gint _tmp15_;
+		gint _tmp16_;
+		GdkPixbuf* _tmp17_;
+		gint _tmp18_;
+		gint _tmp19_;
+		GdkPixbuf* _tmp20_;
 #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = self->priv->iso_source_image;
 #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2608,7 +2608,7 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou
 #line 106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp21_) {
 #line 2610 "PhotoPage.c"
-		SinglePhotoPage* _tmp22_ = NULL;
+		SinglePhotoPage* _tmp22_;
 #line 107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = self->priv->parent_page;
 #line 107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2653,19 +2653,19 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou
 
 static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, BackgroundJob* job) {
 	ZoomBufferTransformationJob* transform_job = NULL;
-	BackgroundJob* _tmp0_ = NULL;
-	ZoomBufferTransformationJob* _tmp1_ = NULL;
-	ZoomBufferTransformationJob* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	ZoomBufferTransformationJob* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
-	GdkPixbuf* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	GdkPixbuf* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
+	BackgroundJob* _tmp0_;
+	ZoomBufferTransformationJob* _tmp1_;
+	ZoomBufferTransformationJob* _tmp2_;
+	GdkPixbuf* _tmp3_;
+	ZoomBufferTransformationJob* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	GdkPixbuf* _tmp6_;
+	GdkPixbuf* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	GdkPixbuf* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
 #line 115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_ZOOM_BUFFER (self));
 #line 115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2715,14 +2715,14 @@ static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, Backgr
 #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((_tmp9_ * _tmp12_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) {
 #line 2717 "PhotoPage.c"
-		GdkPixbuf* _tmp13_ = NULL;
-		GdkPixbuf* _tmp14_ = NULL;
-		gint _tmp15_ = 0;
-		gint _tmp16_ = 0;
-		GdkPixbuf* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
-		GdkPixbuf* _tmp20_ = NULL;
+		GdkPixbuf* _tmp13_;
+		GdkPixbuf* _tmp14_;
+		gint _tmp15_;
+		gint _tmp16_;
+		GdkPixbuf* _tmp17_;
+		gint _tmp18_;
+		gint _tmp19_;
+		GdkPixbuf* _tmp20_;
 #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = self->priv->iso_transformed_image;
 #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2755,14 +2755,14 @@ static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, Backgr
 
 static void zoom_buffer_on_demand_transform_complete (ZoomBuffer* self, BackgroundJob* job) {
 	ZoomBufferTransformationJob* transform_job = NULL;
-	BackgroundJob* _tmp0_ = NULL;
-	ZoomBufferTransformationJob* _tmp1_ = NULL;
-	ZoomBufferTransformationJob* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	ZoomBufferTransformationJob* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
-	SinglePhotoPage* _tmp7_ = NULL;
+	BackgroundJob* _tmp0_;
+	ZoomBufferTransformationJob* _tmp1_;
+	ZoomBufferTransformationJob* _tmp2_;
+	GdkPixbuf* _tmp3_;
+	ZoomBufferTransformationJob* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	GdkPixbuf* _tmp6_;
+	SinglePhotoPage* _tmp7_;
 #line 132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_ZOOM_BUFFER (self));
 #line 132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2816,42 +2816,42 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom
 	GdkRectangle view_rect = {0};
 	GdkRectangle _tmp0_ = {0};
 	GdkRectangle view_rect_proj = {0};
-	GdkPixbuf* _tmp1_ = NULL;
+	GdkPixbuf* _tmp1_;
 	GdkRectangle _tmp2_ = {0};
 	GdkPixbuf* sample_source_pixbuf = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
 	gboolean _tmp5_ = FALSE;
-	GdkPixbuf* _tmp6_ = NULL;
-	GdkRectangle _tmp14_ = {0};
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	GdkRectangle _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	GdkRectangle _tmp20_ = {0};
-	gint _tmp21_ = 0;
-	gint _tmp22_ = 0;
-	GdkRectangle _tmp23_ = {0};
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
+	GdkPixbuf* _tmp6_;
+	GdkRectangle _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	GdkRectangle _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	GdkRectangle _tmp20_;
+	gint _tmp21_;
+	gint _tmp22_;
+	GdkRectangle _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
 	GdkPixbuf* proj_subpixbuf = NULL;
-	GdkPixbuf* _tmp26_ = NULL;
-	GdkRectangle _tmp27_ = {0};
-	gint _tmp28_ = 0;
-	GdkRectangle _tmp29_ = {0};
-	gint _tmp30_ = 0;
-	GdkRectangle _tmp31_ = {0};
-	gint _tmp32_ = 0;
-	GdkRectangle _tmp33_ = {0};
-	gint _tmp34_ = 0;
-	GdkPixbuf* _tmp35_ = NULL;
+	GdkPixbuf* _tmp26_;
+	GdkRectangle _tmp27_;
+	gint _tmp28_;
+	GdkRectangle _tmp29_;
+	gint _tmp30_;
+	GdkRectangle _tmp31_;
+	gint _tmp32_;
+	GdkRectangle _tmp33_;
+	gint _tmp34_;
+	GdkPixbuf* _tmp35_;
 	GdkPixbuf* zoomed = NULL;
-	GdkRectangle _tmp36_ = {0};
-	gint _tmp37_ = 0;
-	GdkRectangle _tmp38_ = {0};
-	gint _tmp39_ = 0;
-	GdkPixbuf* _tmp40_ = NULL;
+	GdkRectangle _tmp36_;
+	gint _tmp37_;
+	GdkRectangle _tmp38_;
+	gint _tmp39_;
+	GdkPixbuf* _tmp40_;
 #line 149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL);
 #line 149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2881,7 +2881,7 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_ != NULL) {
 #line 2883 "PhotoPage.c"
-		gdouble _tmp7_ = 0.0;
+		gdouble _tmp7_;
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = zoom_state_get_zoom_factor (zoom_state);
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2895,12 +2895,12 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
 #line 2897 "PhotoPage.c"
-		GdkPixbuf* _tmp8_ = NULL;
-		GdkPixbuf* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
+		GdkPixbuf* _tmp8_;
+		GdkPixbuf* _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
 #line 157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = reduced_pixbuf;
 #line 157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3016,11 +3016,11 @@ static void _zoom_buffer_on_demand_transform_complete_completion_callback (Backg
 
 static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffer* self, ZoomState* zoom_state) {
 	GdkPixbuf* result = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	ZoomBufferTransformationJob* _tmp97_ = NULL;
-	ZoomBufferTransformationJob* _tmp119_ = NULL;
-	ZoomState _tmp136_ = {0};
-	GdkPixbuf* _tmp137_ = NULL;
+	GdkPixbuf* _tmp0_;
+	ZoomBufferTransformationJob* _tmp97_;
+	ZoomBufferTransformationJob* _tmp119_;
+	ZoomState _tmp136_;
+	GdkPixbuf* _tmp137_;
 #line 184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL);
 #line 184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3030,8 +3030,8 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 #line 185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
 #line 3032 "PhotoPage.c"
-		ZoomState _tmp1_ = {0};
-		gboolean _tmp2_ = FALSE;
+		ZoomState _tmp1_;
+		gboolean _tmp2_;
 #line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->demand_transform_zoom_state;
 #line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3039,8 +3039,8 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 #line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp2_) {
 #line 3041 "PhotoPage.c"
-			GdkPixbuf* _tmp3_ = NULL;
-			GdkPixbuf* _tmp4_ = NULL;
+			GdkPixbuf* _tmp3_;
+			GdkPixbuf* _tmp4_;
 #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = self->priv->demand_transform_cached_pixbuf;
 #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3051,8 +3051,8 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 			return result;
 #line 3052 "PhotoPage.c"
 		} else {
-			gdouble _tmp5_ = 0.0;
-			gdouble _tmp6_ = 0.0;
+			gdouble _tmp5_;
+			gdouble _tmp6_;
 #line 191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp5_ = zoom_state_get_zoom_factor (zoom_state);
 #line 191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3066,99 +3066,99 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 				GdkRectangle _tmp8_ = {0};
 				GdkRectangle transfer_src_rect = {0};
 				GdkRectangle transfer_dest_rect = {0};
-				GdkRectangle _tmp9_ = {0};
-				gint _tmp10_ = 0;
-				GdkRectangle _tmp11_ = {0};
-				gint _tmp12_ = 0;
-				GdkRectangle _tmp13_ = {0};
-				gint _tmp14_ = 0;
-				gint _tmp15_ = 0;
-				GdkRectangle _tmp16_ = {0};
-				gint _tmp17_ = 0;
-				GdkRectangle _tmp18_ = {0};
-				gint _tmp19_ = 0;
-				GdkRectangle _tmp20_ = {0};
-				gint _tmp21_ = 0;
-				gint _tmp22_ = 0;
+				GdkRectangle _tmp9_;
+				gint _tmp10_;
+				GdkRectangle _tmp11_;
+				gint _tmp12_;
+				GdkRectangle _tmp13_;
+				gint _tmp14_;
+				gint _tmp15_;
+				GdkRectangle _tmp16_;
+				gint _tmp17_;
+				GdkRectangle _tmp18_;
+				gint _tmp19_;
+				GdkRectangle _tmp20_;
+				gint _tmp21_;
+				gint _tmp22_;
 				gint transfer_src_right = 0;
-				GdkRectangle _tmp23_ = {0};
-				gint _tmp24_ = 0;
-				GdkRectangle _tmp25_ = {0};
-				gint _tmp26_ = 0;
-				GdkRectangle _tmp27_ = {0};
-				gint _tmp28_ = 0;
-				GdkRectangle _tmp29_ = {0};
-				gint _tmp30_ = 0;
-				gint _tmp31_ = 0;
-				gint _tmp32_ = 0;
-				GdkRectangle _tmp33_ = {0};
-				gint _tmp34_ = 0;
+				GdkRectangle _tmp23_;
+				gint _tmp24_;
+				GdkRectangle _tmp25_;
+				gint _tmp26_;
+				GdkRectangle _tmp27_;
+				gint _tmp28_;
+				GdkRectangle _tmp29_;
+				gint _tmp30_;
+				gint _tmp31_;
+				gint _tmp32_;
+				GdkRectangle _tmp33_;
+				gint _tmp34_;
 				gint transfer_src_bottom = 0;
-				GdkRectangle _tmp35_ = {0};
-				gint _tmp36_ = 0;
-				GdkRectangle _tmp37_ = {0};
-				gint _tmp38_ = 0;
-				GdkRectangle _tmp39_ = {0};
-				gint _tmp40_ = 0;
-				GdkRectangle _tmp41_ = {0};
-				gint _tmp42_ = 0;
-				gint _tmp43_ = 0;
-				gint _tmp44_ = 0;
-				GdkRectangle _tmp45_ = {0};
-				gint _tmp46_ = 0;
-				GdkRectangle _tmp47_ = {0};
-				gint _tmp48_ = 0;
-				GdkRectangle _tmp49_ = {0};
-				gint _tmp50_ = 0;
-				GdkRectangle _tmp51_ = {0};
-				gint _tmp52_ = 0;
-				gint _tmp53_ = 0;
-				GdkRectangle _tmp54_ = {0};
-				gint _tmp55_ = 0;
-				GdkRectangle _tmp56_ = {0};
-				gint _tmp57_ = 0;
-				GdkRectangle _tmp58_ = {0};
-				gint _tmp59_ = 0;
-				gint _tmp60_ = 0;
+				GdkRectangle _tmp35_;
+				gint _tmp36_;
+				GdkRectangle _tmp37_;
+				gint _tmp38_;
+				GdkRectangle _tmp39_;
+				gint _tmp40_;
+				GdkRectangle _tmp41_;
+				gint _tmp42_;
+				gint _tmp43_;
+				gint _tmp44_;
+				GdkRectangle _tmp45_;
+				gint _tmp46_;
+				GdkRectangle _tmp47_;
+				gint _tmp48_;
+				GdkRectangle _tmp49_;
+				gint _tmp50_;
+				GdkRectangle _tmp51_;
+				gint _tmp52_;
+				gint _tmp53_;
+				GdkRectangle _tmp54_;
+				gint _tmp55_;
+				GdkRectangle _tmp56_;
+				gint _tmp57_;
+				GdkRectangle _tmp58_;
+				gint _tmp59_;
+				gint _tmp60_;
 				gint transfer_dest_right = 0;
-				GdkRectangle _tmp61_ = {0};
-				gint _tmp62_ = 0;
-				GdkRectangle _tmp63_ = {0};
-				gint _tmp64_ = 0;
-				GdkRectangle _tmp65_ = {0};
-				gint _tmp66_ = 0;
-				gint _tmp67_ = 0;
-				gint _tmp68_ = 0;
-				GdkRectangle _tmp69_ = {0};
-				gint _tmp70_ = 0;
+				GdkRectangle _tmp61_;
+				gint _tmp62_;
+				GdkRectangle _tmp63_;
+				gint _tmp64_;
+				GdkRectangle _tmp65_;
+				gint _tmp66_;
+				gint _tmp67_;
+				gint _tmp68_;
+				GdkRectangle _tmp69_;
+				gint _tmp70_;
 				gint transfer_dest_bottom = 0;
-				GdkRectangle _tmp71_ = {0};
-				gint _tmp72_ = 0;
-				GdkRectangle _tmp73_ = {0};
-				gint _tmp74_ = 0;
-				GdkRectangle _tmp75_ = {0};
-				gint _tmp76_ = 0;
-				gint _tmp77_ = 0;
-				gint _tmp78_ = 0;
-				GdkRectangle _tmp79_ = {0};
-				gint _tmp80_ = 0;
+				GdkRectangle _tmp71_;
+				gint _tmp72_;
+				GdkRectangle _tmp73_;
+				gint _tmp74_;
+				GdkRectangle _tmp75_;
+				gint _tmp76_;
+				gint _tmp77_;
+				gint _tmp78_;
+				GdkRectangle _tmp79_;
+				gint _tmp80_;
 				GdkPixbuf* composited_result = NULL;
-				ZoomState _tmp81_ = {0};
-				GdkPixbuf* _tmp82_ = NULL;
-				GdkPixbuf* _tmp83_ = NULL;
-				GdkRectangle _tmp84_ = {0};
-				gint _tmp85_ = 0;
-				GdkRectangle _tmp86_ = {0};
-				gint _tmp87_ = 0;
-				GdkRectangle _tmp88_ = {0};
-				gint _tmp89_ = 0;
-				GdkRectangle _tmp90_ = {0};
-				gint _tmp91_ = 0;
-				GdkPixbuf* _tmp92_ = NULL;
-				GdkRectangle _tmp93_ = {0};
-				gint _tmp94_ = 0;
-				GdkRectangle _tmp95_ = {0};
-				gint _tmp96_ = 0;
+				ZoomState _tmp81_;
+				GdkPixbuf* _tmp82_;
+				GdkPixbuf* _tmp83_;
+				GdkRectangle _tmp84_;
+				gint _tmp85_;
+				GdkRectangle _tmp86_;
+				gint _tmp87_;
+				GdkRectangle _tmp88_;
+				gint _tmp89_;
+				GdkRectangle _tmp90_;
+				gint _tmp91_;
+				GdkPixbuf* _tmp92_;
+				GdkRectangle _tmp93_;
+				gint _tmp94_;
+				GdkRectangle _tmp95_;
+				gint _tmp96_;
 #line 202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp7_);
 #line 202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3388,8 +3388,8 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 #line 242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp97_ != NULL) {
 #line 3390 "PhotoPage.c"
-		ZoomState _tmp98_ = {0};
-		gboolean _tmp99_ = FALSE;
+		ZoomState _tmp98_;
+		gboolean _tmp99_;
 #line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp98_ = self->priv->demand_transform_zoom_state;
 #line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3397,8 +3397,8 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 #line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp99_) {
 #line 3399 "PhotoPage.c"
-			ZoomState _tmp100_ = {0};
-			GdkPixbuf* _tmp101_ = NULL;
+			ZoomState _tmp100_;
+			GdkPixbuf* _tmp101_;
 #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp100_ = *zoom_state;
 #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3409,24 +3409,24 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 			return result;
 #line 3410 "PhotoPage.c"
 		} else {
-			ZoomBufferTransformationJob* _tmp102_ = NULL;
+			ZoomBufferTransformationJob* _tmp102_;
 			GdkPixbuf* zoomed = NULL;
-			ZoomState _tmp103_ = {0};
-			GdkPixbuf* _tmp104_ = NULL;
-			GdkPixbuf* _tmp105_ = NULL;
-			GdkPixbuf* _tmp106_ = NULL;
-			GdkPixbuf* _tmp107_ = NULL;
-			Photo* _tmp108_ = NULL;
-			PixelTransformer* _tmp109_ = NULL;
-			PixelTransformer* _tmp110_ = NULL;
-			GCancellable* _tmp111_ = NULL;
-			GCancellable* _tmp112_ = NULL;
-			ZoomBufferTransformationJob* _tmp113_ = NULL;
-			ZoomState _tmp114_ = {0};
-			Workers* _tmp115_ = NULL;
-			ZoomBufferTransformationJob* _tmp116_ = NULL;
-			ZoomState _tmp117_ = {0};
-			GdkPixbuf* _tmp118_ = NULL;
+			ZoomState _tmp103_;
+			GdkPixbuf* _tmp104_;
+			GdkPixbuf* _tmp105_;
+			GdkPixbuf* _tmp106_;
+			GdkPixbuf* _tmp107_;
+			Photo* _tmp108_;
+			PixelTransformer* _tmp109_;
+			PixelTransformer* _tmp110_;
+			GCancellable* _tmp111_;
+			GCancellable* _tmp112_;
+			ZoomBufferTransformationJob* _tmp113_;
+			ZoomState _tmp114_;
+			Workers* _tmp115_;
+			ZoomBufferTransformationJob* _tmp116_;
+			ZoomState _tmp117_;
+			GdkPixbuf* _tmp118_;
 #line 246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp102_ = self->priv->demand_transform_job;
 #line 246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3496,22 +3496,22 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 	if (_tmp119_ == NULL) {
 #line 3497 "PhotoPage.c"
 		GdkPixbuf* zoomed = NULL;
-		ZoomState _tmp120_ = {0};
-		GdkPixbuf* _tmp121_ = NULL;
-		GdkPixbuf* _tmp122_ = NULL;
-		GdkPixbuf* _tmp123_ = NULL;
-		GdkPixbuf* _tmp124_ = NULL;
-		Photo* _tmp125_ = NULL;
-		PixelTransformer* _tmp126_ = NULL;
-		PixelTransformer* _tmp127_ = NULL;
-		GCancellable* _tmp128_ = NULL;
-		GCancellable* _tmp129_ = NULL;
-		ZoomBufferTransformationJob* _tmp130_ = NULL;
-		ZoomState _tmp131_ = {0};
-		Workers* _tmp132_ = NULL;
-		ZoomBufferTransformationJob* _tmp133_ = NULL;
-		ZoomState _tmp134_ = {0};
-		GdkPixbuf* _tmp135_ = NULL;
+		ZoomState _tmp120_;
+		GdkPixbuf* _tmp121_;
+		GdkPixbuf* _tmp122_;
+		GdkPixbuf* _tmp123_;
+		GdkPixbuf* _tmp124_;
+		Photo* _tmp125_;
+		PixelTransformer* _tmp126_;
+		PixelTransformer* _tmp127_;
+		GCancellable* _tmp128_;
+		GCancellable* _tmp129_;
+		ZoomBufferTransformationJob* _tmp130_;
+		ZoomState _tmp131_;
+		Workers* _tmp132_;
+		ZoomBufferTransformationJob* _tmp133_;
+		ZoomState _tmp134_;
+		GdkPixbuf* _tmp135_;
 #line 264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp120_ = *zoom_state;
 #line 264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3590,35 +3590,35 @@ static void _zoom_buffer_on_iso_source_fetch_complete_completion_callback (Backg
 
 GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomState* zoom_state) {
 	GdkPixbuf* result = NULL;
-	ZoomBufferObjectState _tmp0_ = 0;
+	ZoomBufferObjectState _tmp0_;
 	GdkRectangle view_rect = {0};
 	GdkRectangle _tmp5_ = {0};
 	GdkRectangle view_rect_proj = {0};
-	GdkPixbuf* _tmp6_ = NULL;
+	GdkPixbuf* _tmp6_;
 	GdkRectangle _tmp7_ = {0};
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	GdkRectangle _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	GdkRectangle _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
 	GdkPixbuf* proj_subpixbuf = NULL;
-	GdkPixbuf* _tmp14_ = NULL;
-	GdkRectangle _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	GdkRectangle _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	GdkRectangle _tmp19_ = {0};
-	gint _tmp20_ = 0;
-	GdkRectangle _tmp21_ = {0};
-	gint _tmp22_ = 0;
-	GdkPixbuf* _tmp23_ = NULL;
+	GdkPixbuf* _tmp14_;
+	GdkRectangle _tmp15_;
+	gint _tmp16_;
+	GdkRectangle _tmp17_;
+	gint _tmp18_;
+	GdkRectangle _tmp19_;
+	gint _tmp20_;
+	GdkRectangle _tmp21_;
+	gint _tmp22_;
+	GdkPixbuf* _tmp23_;
 	GdkPixbuf* zoomed = NULL;
-	GdkRectangle _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	GdkRectangle _tmp26_ = {0};
-	gint _tmp27_ = 0;
-	GdkPixbuf* _tmp28_ = NULL;
+	GdkRectangle _tmp24_;
+	gint _tmp25_;
+	GdkRectangle _tmp26_;
+	gint _tmp27_;
+	GdkPixbuf* _tmp28_;
 #line 288 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL);
 #line 288 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3629,10 +3629,10 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt
 	if (_tmp0_ == ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_LOADED) {
 #line 3629 "PhotoPage.c"
 		BackgroundJob* iso_source_fetch_job = NULL;
-		Photo* _tmp1_ = NULL;
-		ZoomBufferIsoSourceFetchJob* _tmp2_ = NULL;
-		Workers* _tmp3_ = NULL;
-		BackgroundJob* _tmp4_ = NULL;
+		Photo* _tmp1_;
+		ZoomBufferIsoSourceFetchJob* _tmp2_;
+		Workers* _tmp3_;
+		BackgroundJob* _tmp4_;
 #line 290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->backing_photo;
 #line 290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3723,8 +3723,8 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt
 
 Photo* zoom_buffer_get_backing_photo (ZoomBuffer* self) {
 	Photo* result = NULL;
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
 #line 312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL);
 #line 313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3740,8 +3740,8 @@ Photo* zoom_buffer_get_backing_photo (ZoomBuffer* self) {
 
 
 void zoom_buffer_update_preview_image (ZoomBuffer* self, GdkPixbuf* preview_image) {
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
 #line 316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_ZOOM_BUFFER (self));
 #line 316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3759,7 +3759,7 @@ void zoom_buffer_update_preview_image (ZoomBuffer* self, GdkPixbuf* preview_imag
 
 
 void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_state) {
-	ZoomState* _tmp0_ = NULL;
+	ZoomState* _tmp0_;
 #line 322 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_ZOOM_BUFFER (self));
 #line 323 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3771,10 +3771,10 @@ void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_s
 #line 324 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
 #line 3772 "PhotoPage.c"
-		ZoomState* _tmp1_ = NULL;
-		ZoomState _tmp2_ = {0};
-		GdkPixbuf* _tmp3_ = NULL;
-		GdkPixbuf* _tmp4_ = NULL;
+		ZoomState* _tmp1_;
+		ZoomState _tmp2_;
+		GdkPixbuf* _tmp3_;
+		GdkPixbuf* _tmp4_;
 #line 325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = initial_zoom_state;
 #line 325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3792,8 +3792,8 @@ void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_s
 
 GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state) {
 	GdkPixbuf* result = NULL;
-	gdouble _tmp0_ = 0.0;
-	ZoomBufferObjectState _tmp3_ = 0;
+	gdouble _tmp0_;
+	ZoomBufferObjectState _tmp3_;
 #line 328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL);
 #line 328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3805,8 +3805,8 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 #line 333 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == 0.0) {
 #line 3806 "PhotoPage.c"
-		ZoomState _tmp1_ = {0};
-		GdkPixbuf* _tmp2_ = NULL;
+		ZoomState _tmp1_;
+		GdkPixbuf* _tmp2_;
 #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = *zoom_state;
 #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3827,8 +3827,8 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 		case ZOOM_BUFFER_OBJECT_STATE_SOURCE_LOAD_IN_PROGRESS:
 #line 3827 "PhotoPage.c"
 		{
-			ZoomState _tmp4_ = {0};
-			GdkPixbuf* _tmp5_ = NULL;
+			ZoomState _tmp4_;
+			GdkPixbuf* _tmp5_;
 #line 340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp4_ = *zoom_state;
 #line 340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3843,8 +3843,8 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 		case ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED:
 #line 3843 "PhotoPage.c"
 		{
-			ZoomState _tmp6_ = {0};
-			GdkPixbuf* _tmp7_ = NULL;
+			ZoomState _tmp6_;
+			GdkPixbuf* _tmp7_;
 #line 343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = *zoom_state;
 #line 343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3859,10 +3859,10 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 		case ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY:
 #line 3859 "PhotoPage.c"
 		{
-			ZoomState _tmp8_ = {0};
-			GdkPixbuf* _tmp9_ = NULL;
-			GdkPixbuf* _tmp10_ = NULL;
-			GdkPixbuf* _tmp11_ = NULL;
+			ZoomState _tmp8_;
+			GdkPixbuf* _tmp9_;
+			GdkPixbuf* _tmp10_;
+			GdkPixbuf* _tmp11_;
 #line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = *zoom_state;
 #line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3879,8 +3879,8 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 		}
 		default:
 		{
-			ZoomState _tmp12_ = {0};
-			GdkPixbuf* _tmp13_ = NULL;
+			ZoomState _tmp12_;
+			GdkPixbuf* _tmp13_;
 #line 352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			g_critical ("PhotoPage.vala:352: ZoomBuffer: get_zoomed_image( ): object is an inco" \
 "nsistent state");
@@ -3900,8 +3900,8 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 
 GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, ZoomState* zoom_state) {
 	GdkPixbuf* result = NULL;
-	ZoomState _tmp0_ = {0};
-	GdkPixbuf* _tmp1_ = NULL;
+	ZoomState _tmp0_;
+	GdkPixbuf* _tmp1_;
 #line 357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL);
 #line 357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3922,11 +3922,11 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, ZoomState* zoom
 
 static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_construct (GType object_type, ZoomBuffer* owner, Photo* to_fetch, CompletionCallback completion_callback, void* completion_callback_target) {
 	ZoomBufferIsoSourceFetchJob* self = NULL;
-	ZoomBuffer* _tmp0_ = NULL;
-	CompletionCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	Photo* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
+	ZoomBuffer* _tmp0_;
+	CompletionCallback _tmp1_;
+	void* _tmp1__target;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
 #line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_ZOOM_BUFFER (owner), NULL);
 #line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3968,10 +3968,10 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 #line 3966 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
-		Photo* _tmp1_ = NULL;
+		Photo* _tmp1_;
 		Scaling _tmp2_ = {0};
-		GdkPixbuf* _tmp3_ = NULL;
-		GdkPixbuf* _tmp4_ = NULL;
+		GdkPixbuf* _tmp3_;
+		GdkPixbuf* _tmp4_;
 #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->to_fetch;
 #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3983,7 +3983,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3983 "PhotoPage.c"
-			goto __catch243_g_error;
+			goto __catch244_g_error;
 		}
 #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp0_;
@@ -3997,8 +3997,8 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 		_g_object_unref0 (_tmp0_);
 #line 3996 "PhotoPage.c"
 	}
-	goto __finally243;
-	__catch243_g_error:
+	goto __finally244;
+	__catch244_g_error:
 	{
 		GError* fetch_error = NULL;
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4012,7 +4012,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 		_g_error_free0 (fetch_error);
 #line 4010 "PhotoPage.c"
 	}
-	__finally243:
+	__finally244:
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4034,7 +4034,7 @@ static void zoom_buffer_iso_source_fetch_job_class_init (ZoomBufferIsoSourceFetc
 #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_type_class_add_private (klass, sizeof (ZoomBufferIsoSourceFetchJobPrivate));
 #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) zoom_buffer_iso_source_fetch_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) zoom_buffer_iso_source_fetch_job_real_execute;
 #line 4035 "PhotoPage.c"
 }
 
@@ -4048,7 +4048,7 @@ static void zoom_buffer_iso_source_fetch_job_instance_init (ZoomBufferIsoSourceF
 }
 
 
-static void zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob* obj) {
+static void zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob * obj) {
 	ZoomBufferIsoSourceFetchJob * self;
 #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, ZoomBufferIsoSourceFetchJob);
@@ -4083,18 +4083,18 @@ static gpointer _pixel_transformer_ref0 (gpointer self) {
 
 static ZoomBufferTransformationJob* zoom_buffer_transformation_job_construct (GType object_type, ZoomBuffer* owner, GdkPixbuf* to_transform, PixelTransformer* transformer, CompletionCallback completion_callback, void* completion_callback_target, GCancellable* cancellable) {
 	ZoomBufferTransformationJob* self = NULL;
-	ZoomBuffer* _tmp0_ = NULL;
-	CompletionCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	GCancellable* _tmp2_ = NULL;
-	GCancellable* _tmp3_ = NULL;
-	GCancellable* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
-	PixelTransformer* _tmp7_ = NULL;
-	PixelTransformer* _tmp8_ = NULL;
-	GdkPixbuf* _tmp9_ = NULL;
-	GdkPixbuf* _tmp10_ = NULL;
+	ZoomBuffer* _tmp0_;
+	CompletionCallback _tmp1_;
+	void* _tmp1__target;
+	GCancellable* _tmp2_;
+	GCancellable* _tmp3_;
+	GCancellable* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	GdkPixbuf* _tmp6_;
+	PixelTransformer* _tmp7_;
+	PixelTransformer* _tmp8_;
+	GdkPixbuf* _tmp9_;
+	GdkPixbuf* _tmp10_;
 #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_ZOOM_BUFFER (owner), NULL);
 #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4160,7 +4160,7 @@ static ZoomBufferTransformationJob* zoom_buffer_transformation_job_new (ZoomBuff
 
 static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) {
 	ZoomBufferTransformationJob * self;
-	PixelTransformer* _tmp0_ = NULL;
+	PixelTransformer* _tmp0_;
 #line 59 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJob);
 #line 60 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4168,10 +4168,10 @@ static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) {
 #line 60 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
 #line 4167 "PhotoPage.c"
-		PixelTransformer* _tmp1_ = NULL;
-		GdkPixbuf* _tmp2_ = NULL;
-		GdkPixbuf* _tmp3_ = NULL;
-		GCancellable* _tmp4_ = NULL;
+		PixelTransformer* _tmp1_;
+		GdkPixbuf* _tmp2_;
+		GdkPixbuf* _tmp3_;
+		GCancellable* _tmp4_;
 #line 61 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->transformer;
 #line 61 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4195,7 +4195,7 @@ static void zoom_buffer_transformation_job_class_init (ZoomBufferTransformationJ
 #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_type_class_add_private (klass, sizeof (ZoomBufferTransformationJobPrivate));
 #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) zoom_buffer_transformation_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) zoom_buffer_transformation_job_real_execute;
 #line 4196 "PhotoPage.c"
 }
 
@@ -4209,7 +4209,7 @@ static void zoom_buffer_transformation_job_instance_init (ZoomBufferTransformati
 }
 
 
-static void zoom_buffer_transformation_job_finalize (BackgroundJob* obj) {
+static void zoom_buffer_transformation_job_finalize (BackgroundJob * obj) {
 	ZoomBufferTransformationJob * self;
 #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJob);
@@ -4279,7 +4279,7 @@ static void zoom_buffer_instance_init (ZoomBuffer * self) {
 }
 
 
-static void zoom_buffer_finalize (GObject* obj) {
+static void zoom_buffer_finalize (GObject * obj) {
 	ZoomBuffer * self;
 #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ZOOM_BUFFER, ZoomBuffer);
@@ -4466,101 +4466,99 @@ static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolBut
 
 EditingHostPage* editing_host_page_construct (GType object_type, SourceCollection* sources, const gchar* name) {
 	EditingHostPage * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	SourceCollection* _tmp1_ = NULL;
-	SourceCollection* _tmp2_ = NULL;
-	SourceCollection* _tmp3_ = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	GtkViewport* _tmp8_ = NULL;
+	const gchar* _tmp0_;
+	SourceCollection* _tmp1_;
+	SourceCollection* _tmp2_;
+	SourceCollection* _tmp3_;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
+	GtkViewport* _tmp8_;
 	GtkToolbar* toolbar = NULL;
-	GtkToolbar* _tmp9_ = NULL;
-	GtkToolButton* _tmp10_ = NULL;
-	GtkToolButton* _tmp11_ = NULL;
-	GtkToolButton* _tmp12_ = NULL;
-	GtkToolButton* _tmp13_ = NULL;
-	GtkToolButton* _tmp14_ = NULL;
-	GtkToolButton* _tmp15_ = NULL;
+	GtkToolbar* _tmp9_;
+	GtkToolButton* _tmp10_;
+	GtkToolButton* _tmp11_;
+	GtkToolButton* _tmp12_;
+	GtkToolButton* _tmp13_;
+	GtkToolButton* _tmp14_;
+	GtkToolButton* _tmp15_;
 	GtkBindingSet* binding_set = NULL;
-	GtkToolButton* _tmp16_ = NULL;
-	GObjectClass* _tmp17_ = NULL;
-	GtkBindingSet* _tmp18_ = NULL;
-	GtkToggleToolButton* _tmp19_ = NULL;
-	GtkToggleToolButton* _tmp20_ = NULL;
-	GtkToggleToolButton* _tmp21_ = NULL;
-	GtkToggleToolButton* _tmp22_ = NULL;
-	GtkToggleToolButton* _tmp23_ = NULL;
-	GtkToggleToolButton* _tmp24_ = NULL;
-	GtkToggleToolButton* _tmp25_ = NULL;
-	GtkToggleToolButton* _tmp26_ = NULL;
-	GtkToggleToolButton* _tmp27_ = NULL;
-	GtkToggleToolButton* _tmp28_ = NULL;
-	GtkToggleToolButton* _tmp29_ = NULL;
-	GtkToggleToolButton* _tmp30_ = NULL;
-	GtkToggleToolButton* _tmp31_ = NULL;
-	GtkToggleToolButton* _tmp32_ = NULL;
-	GtkToggleToolButton* _tmp33_ = NULL;
-	GtkToggleToolButton* _tmp34_ = NULL;
-	GtkToggleToolButton* _tmp35_ = NULL;
-	GtkToggleToolButton* _tmp36_ = NULL;
-	GtkToggleToolButton* _tmp37_ = NULL;
-	GtkToggleToolButton* _tmp38_ = NULL;
-	GtkToggleToolButton* _tmp39_ = NULL;
-	GtkToggleToolButton* _tmp40_ = NULL;
-	GtkToggleToolButton* _tmp41_ = NULL;
-	GtkToggleToolButton* _tmp42_ = NULL;
-	GtkToggleToolButton* _tmp43_ = NULL;
-	GtkToggleToolButton* _tmp44_ = NULL;
-	GtkToggleToolButton* _tmp45_ = NULL;
-	GtkToggleToolButton* _tmp46_ = NULL;
-	GtkToolButton* _tmp47_ = NULL;
-	GtkToolButton* _tmp48_ = NULL;
-	GtkToolButton* _tmp49_ = NULL;
-	GtkToolButton* _tmp50_ = NULL;
-	GtkToolButton* _tmp51_ = NULL;
-	GtkToolButton* _tmp52_ = NULL;
+	GtkToolButton* _tmp16_;
+	GObjectClass* _tmp17_;
+	GtkBindingSet* _tmp18_;
+	GtkToggleToolButton* _tmp19_;
+	GtkToggleToolButton* _tmp20_;
+	GtkToggleToolButton* _tmp21_;
+	GtkToggleToolButton* _tmp22_;
+	GtkToggleToolButton* _tmp23_;
+	GtkToggleToolButton* _tmp24_;
+	GtkToggleToolButton* _tmp25_;
+	GtkToggleToolButton* _tmp26_;
+	GtkToggleToolButton* _tmp27_;
+	GtkToggleToolButton* _tmp28_;
+	GtkToggleToolButton* _tmp29_;
+	GtkToggleToolButton* _tmp30_;
+	GtkToggleToolButton* _tmp31_;
+	GtkToggleToolButton* _tmp32_;
+	GtkToggleToolButton* _tmp33_;
+	GtkToggleToolButton* _tmp34_;
+	GtkToggleToolButton* _tmp35_;
+	GtkToggleToolButton* _tmp36_;
+	GtkToggleToolButton* _tmp37_;
+	GtkToggleToolButton* _tmp38_;
+	GtkToggleToolButton* _tmp39_;
+	GtkToggleToolButton* _tmp40_;
+	GtkToggleToolButton* _tmp41_;
+	GtkToggleToolButton* _tmp42_;
+	GtkToggleToolButton* _tmp43_;
+	GtkToggleToolButton* _tmp44_;
+	GtkToggleToolButton* _tmp45_;
+	GtkToggleToolButton* _tmp46_;
+	GtkToolButton* _tmp47_;
+	GtkToolButton* _tmp48_;
+	GtkToolButton* _tmp49_;
+	GtkToolButton* _tmp50_;
+	GtkToolButton* _tmp51_;
+	GtkToolButton* _tmp52_;
 	GtkSeparatorToolItem* separator = NULL;
-	GtkSeparatorToolItem* _tmp53_ = NULL;
+	GtkSeparatorToolItem* _tmp53_;
 	GtkBox* zoom_group = NULL;
-	GtkBox* _tmp54_ = NULL;
+	GtkBox* _tmp54_;
 	GtkImage* zoom_out = NULL;
-	GdkPixbuf* _tmp55_ = NULL;
-	GdkPixbuf* _tmp56_ = NULL;
-	GtkImage* _tmp57_ = NULL;
-	GtkImage* _tmp58_ = NULL;
+	GdkPixbuf* _tmp55_;
+	GdkPixbuf* _tmp56_;
+	GtkImage* _tmp57_;
+	GtkImage* _tmp58_;
 	GtkEventBox* zoom_out_box = NULL;
-	GtkEventBox* _tmp59_ = NULL;
-	GtkAdjustment* _tmp60_ = NULL;
-	GtkAdjustment* _tmp61_ = NULL;
-	GtkScale* _tmp62_ = NULL;
-	GtkScale* _tmp63_ = NULL;
-	GtkScale* _tmp64_ = NULL;
-	GtkScale* _tmp65_ = NULL;
-	GtkScale* _tmp66_ = NULL;
-	GtkScale* _tmp67_ = NULL;
-	GtkScale* _tmp68_ = NULL;
-	GtkScale* _tmp69_ = NULL;
+	GtkEventBox* _tmp59_;
+	GtkAdjustment* _tmp60_;
+	GtkAdjustment* _tmp61_;
+	GtkScale* _tmp62_;
+	GtkScale* _tmp63_;
+	GtkScale* _tmp64_;
+	GtkScale* _tmp65_;
+	GtkScale* _tmp66_;
+	GtkScale* _tmp67_;
+	GtkScale* _tmp68_;
+	GtkScale* _tmp69_;
 	GtkImage* zoom_in = NULL;
-	GdkPixbuf* _tmp70_ = NULL;
-	GdkPixbuf* _tmp71_ = NULL;
-	GtkImage* _tmp72_ = NULL;
-	GtkImage* _tmp73_ = NULL;
+	GdkPixbuf* _tmp70_;
+	GdkPixbuf* _tmp71_;
+	GtkImage* _tmp72_;
+	GtkImage* _tmp73_;
 	GtkEventBox* zoom_in_box = NULL;
-	GtkEventBox* _tmp74_ = NULL;
+	GtkEventBox* _tmp74_;
 	GtkToolItem* group_wrapper = NULL;
-	GtkToolItem* _tmp75_ = NULL;
-	GtkToolButton* _tmp76_ = NULL;
-	const gchar* _tmp77_ = NULL;
-	GtkToolButton* _tmp78_ = NULL;
-	GtkToolButton* _tmp79_ = NULL;
-	GtkToolButton* _tmp80_ = NULL;
-	GtkToolButton* _tmp81_ = NULL;
-	const gchar* _tmp82_ = NULL;
-	GtkToolButton* _tmp83_ = NULL;
-	GtkToolButton* _tmp84_ = NULL;
-	GtkToolButton* _tmp85_ = NULL;
+	GtkToolItem* _tmp75_;
+	GtkToolButton* _tmp76_;
+	GtkToolButton* _tmp77_;
+	GtkToolButton* _tmp78_;
+	GtkToolButton* _tmp79_;
+	GtkToolButton* _tmp80_;
+	GtkToolButton* _tmp81_;
+	GtkToolButton* _tmp82_;
+	GtkToolButton* _tmp83_;
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4936,39 +4934,35 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 #line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp76_ = self->priv->prev_button;
 #line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp77_ = _ ("Previous photo");
-#line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_tool_item_get_type (), GtkToolItem), _tmp77_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_tool_item_get_type (), GtkToolItem), _ ("Previous photo"));
 #line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp78_ = self->priv->prev_button;
+	_tmp77_ = self->priv->prev_button;
 #line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (_tmp78_, "go-previous");
+	gtk_tool_button_set_icon_name (_tmp77_, "go-previous");
 #line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp79_ = self->priv->prev_button;
+	_tmp78_ = self->priv->prev_button;
 #line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp79_, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
+	g_signal_connect_object (_tmp78_, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
 #line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp80_ = self->priv->prev_button;
+	_tmp79_ = self->priv->prev_button;
 #line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp81_ = self->priv->next_button;
-#line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp82_ = _ ("Next photo");
+	_tmp80_ = self->priv->next_button;
 #line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_tool_item_get_type (), GtkToolItem), _tmp82_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_tool_item_get_type (), GtkToolItem), _ ("Next photo"));
 #line 545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp83_ = self->priv->next_button;
+	_tmp81_ = self->priv->next_button;
 #line 545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (_tmp83_, "go-next");
+	gtk_tool_button_set_icon_name (_tmp81_, "go-next");
 #line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp84_ = self->priv->next_button;
+	_tmp82_ = self->priv->next_button;
 #line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp84_, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
+	g_signal_connect_object (_tmp82_, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
 #line 547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp85_ = self->priv->next_button;
+	_tmp83_ = self->priv->next_button;
 #line 547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (group_wrapper);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4987,16 +4981,16 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 	_g_object_unref0 (toolbar);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 4987 "PhotoPage.c"
+#line 4981 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* self) {
 	ZoomState new_zoom_state = {0};
 	ZoomState _tmp0_ = {0};
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	gboolean _tmp3_ = FALSE;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
+	gboolean _tmp3_;
 #line 557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5011,9 +5005,9 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel
 	_tmp3_ = self->priv->enable_interactive_zoom_refresh;
 #line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 5011 "PhotoPage.c"
-		ZoomState _tmp4_ = {0};
-		gboolean _tmp5_ = FALSE;
+#line 5005 "PhotoPage.c"
+		ZoomState _tmp4_;
+		gboolean _tmp5_;
 #line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = new_zoom_state;
 #line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5022,46 +5016,46 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel
 		_tmp5_ = zoom_state_is_default (&new_zoom_state);
 #line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_) {
-#line 5022 "PhotoPage.c"
-			ZoomState _tmp6_ = {0};
+#line 5016 "PhotoPage.c"
+			ZoomState _tmp6_;
 #line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = new_zoom_state;
 #line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp6_);
-#line 5028 "PhotoPage.c"
+#line 5022 "PhotoPage.c"
 		}
 	} else {
-		gboolean _tmp7_ = FALSE;
+		gboolean _tmp7_;
 #line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = zoom_state_is_default (&new_zoom_state);
 #line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp7_) {
 #line 567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 5038 "PhotoPage.c"
+#line 5032 "PhotoPage.c"
 		} else {
-			ZoomState _tmp8_ = {0};
+			ZoomState _tmp8_;
 #line 569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = new_zoom_state;
 #line 569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
-#line 5045 "PhotoPage.c"
+#line 5039 "PhotoPage.c"
 		}
 #line 571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 5049 "PhotoPage.c"
+#line 5043 "PhotoPage.c"
 	}
 #line 574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
-#line 5053 "PhotoPage.c"
+#line 5047 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-	GtkWindow* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GtkWindow* _tmp0_;
+	GtkWindow* _tmp1_;
+	gboolean _tmp2_;
 #line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5078,9 +5072,9 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se
 	_g_object_unref0 (_tmp1_);
 #line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 5078 "PhotoPage.c"
-		GtkWindow* _tmp3_ = NULL;
-		FullscreenWindow* _tmp4_ = NULL;
+#line 5072 "PhotoPage.c"
+		GtkWindow* _tmp3_;
+		FullscreenWindow* _tmp4_;
 #line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5089,26 +5083,26 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se
 		fullscreen_window_disable_toolbar_dismissal (_tmp4_);
 #line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 5089 "PhotoPage.c"
+#line 5083 "PhotoPage.c"
 	}
 #line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5095 "PhotoPage.c"
+#line 5089 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-	GtkWindow* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GtkWindow* _tmp0_;
+	GtkWindow* _tmp1_;
+	gboolean _tmp2_;
 	ZoomState zoom_state = {0};
 	ZoomState _tmp5_ = {0};
-	GtkScale* _tmp6_ = NULL;
-	gdouble _tmp7_ = 0.0;
-	ZoomState _tmp8_ = {0};
+	GtkScale* _tmp6_;
+	gdouble _tmp7_;
+	ZoomState _tmp8_;
 #line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5125,9 +5119,9 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 	_g_object_unref0 (_tmp1_);
 #line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 5125 "PhotoPage.c"
-		GtkWindow* _tmp3_ = NULL;
-		FullscreenWindow* _tmp4_ = NULL;
+#line 5119 "PhotoPage.c"
+		GtkWindow* _tmp3_;
+		FullscreenWindow* _tmp4_;
 #line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5136,7 +5130,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 		fullscreen_window_update_toolbar_dismissal (_tmp4_);
 #line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 5136 "PhotoPage.c"
+#line 5130 "PhotoPage.c"
 	}
 #line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
@@ -5156,7 +5150,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 	result = FALSE;
 #line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5156 "PhotoPage.c"
+#line 5150 "PhotoPage.c"
 }
 
 
@@ -5172,7 +5166,7 @@ static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, Gd
 	result = TRUE;
 #line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5172 "PhotoPage.c"
+#line 5166 "PhotoPage.c"
 }
 
 
@@ -5188,40 +5182,40 @@ static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, Gdk
 	result = TRUE;
 #line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5188 "PhotoPage.c"
+#line 5182 "PhotoPage.c"
 }
 
 
 static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, GdkEventScroll* event, GdkPoint* result) {
 	GdkPoint cursor_wrt_canvas = {0};
 	GdkPoint _tmp0_ = {0};
-	GdkEventScroll* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	GdkEventScroll* _tmp3_ = NULL;
-	gdouble _tmp4_ = 0.0;
+	GdkEventScroll* _tmp1_;
+	gdouble _tmp2_;
+	GdkEventScroll* _tmp3_;
+	gdouble _tmp4_;
 	GdkRectangle viewport_wrt_canvas = {0};
 	ZoomState _tmp5_ = {0};
 	GdkRectangle _tmp6_ = {0};
 	GdkPoint _result_ = {0};
 	GdkPoint _tmp7_ = {0};
-	GdkPoint _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	GdkRectangle _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	GdkPoint _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	GdkRectangle _tmp14_ = {0};
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	GdkPoint _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	GdkRectangle _tmp19_ = {0};
-	gint _tmp20_ = 0;
-	GdkPoint _tmp21_ = {0};
-	gint _tmp22_ = 0;
-	GdkRectangle _tmp23_ = {0};
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
+	GdkPoint _tmp8_;
+	gint _tmp9_;
+	GdkRectangle _tmp10_;
+	gint _tmp11_;
+	GdkPoint _tmp12_;
+	gint _tmp13_;
+	GdkRectangle _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	GdkPoint _tmp17_;
+	gint _tmp18_;
+	GdkRectangle _tmp19_;
+	gint _tmp20_;
+	GdkPoint _tmp21_;
+	gint _tmp22_;
+	GdkRectangle _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
 #line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5300,25 +5294,25 @@ static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, Gd
 	*result = _result_;
 #line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5300 "PhotoPage.c"
+#line 5294 "PhotoPage.c"
 }
 
 
 static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* self, GdkEventScroll* event, GdkPoint* result) {
 	GdkPoint cursor_wrt_viewport = {0};
-	GdkEventScroll* _tmp0_ = NULL;
+	GdkEventScroll* _tmp0_;
 	GdkPoint _tmp1_ = {0};
 	GdkRectangle viewport_wrt_canvas = {0};
 	ZoomState _tmp2_ = {0};
 	GdkRectangle _tmp3_ = {0};
 	GdkPoint viewport_center = {0};
 	GdkPoint _tmp4_ = {0};
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	GdkRectangle _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	GdkPoint _tmp9_ = {0};
-	GdkPoint _tmp10_ = {0};
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	GdkRectangle _tmp7_;
+	gint _tmp8_;
+	GdkPoint _tmp9_;
+	GdkPoint _tmp10_;
 	GdkPoint _tmp11_ = {0};
 #line 625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -5362,7 +5356,7 @@ static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* s
 	*result = _tmp11_;
 #line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5362 "PhotoPage.c"
+#line 5356 "PhotoPage.c"
 }
 
 
@@ -5371,16 +5365,16 @@ static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self,
 	ZoomState _tmp0_ = {0};
 	GdkPoint _tmp1_ = {0};
 	ZoomState _tmp2_ = {0};
-	gdouble _tmp3_ = 0.0;
+	gdouble _tmp3_;
 	GdkPoint _tmp4_ = {0};
 	GdkPoint cursor_wrt_center_iso = {0};
-	GdkEventScroll* _tmp5_ = NULL;
+	GdkEventScroll* _tmp5_;
 	GdkPoint _tmp6_ = {0};
 	ZoomState _tmp7_ = {0};
-	gdouble _tmp8_ = 0.0;
+	gdouble _tmp8_;
 	GdkPoint _tmp9_ = {0};
-	GdkPoint _tmp10_ = {0};
-	GdkPoint _tmp11_ = {0};
+	GdkPoint _tmp10_;
+	GdkPoint _tmp11_;
 	GdkPoint _tmp12_ = {0};
 #line 636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -5420,14 +5414,14 @@ static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self,
 	*result = _tmp12_;
 #line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5420 "PhotoPage.c"
+#line 5414 "PhotoPage.c"
 }
 
 
 static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* self, gdouble interp) {
 	gdouble result = 0.0;
-	gdouble _tmp0_ = 0.0;
-	gdouble _tmp2_ = 0.0;
+	gdouble _tmp0_;
+	gdouble _tmp2_;
 #line 646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), 0.0);
 #line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5436,16 +5430,16 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel
 	if (_tmp0_ < 0.03) {
 #line 648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		interp = 0.0;
-#line 5436 "PhotoPage.c"
+#line 5430 "PhotoPage.c"
 	} else {
-		gdouble _tmp1_ = 0.0;
+		gdouble _tmp1_;
 #line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = interp;
 #line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp1_ > 0.97) {
 #line 650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			interp = 1.0;
-#line 5445 "PhotoPage.c"
+#line 5439 "PhotoPage.c"
 		}
 	}
 #line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5454,16 +5448,16 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel
 	result = _tmp2_;
 #line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5454 "PhotoPage.c"
+#line 5448 "PhotoPage.c"
 }
 
 
 static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* self, gdouble adjustment) {
 	gdouble result = 0.0;
 	ZoomState _tmp0_ = {0};
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
+	gdouble _tmp1_;
+	gdouble _tmp2_;
+	gdouble _tmp3_;
 #line 655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), 0.0);
 #line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5478,41 +5472,41 @@ static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* s
 	result = _tmp3_;
 #line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5478 "PhotoPage.c"
+#line 5472 "PhotoPage.c"
 }
 
 
 static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* self, GdkEventScroll* event, gdouble zoom_increment) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	GdkPoint cursor_wrt_viewport_center = {0};
-	GdkEventScroll* _tmp1_ = NULL;
+	GdkEventScroll* _tmp1_;
 	GdkPoint _tmp2_ = {0};
 	GdkPoint iso_pixel_under_cursor = {0};
-	GdkEventScroll* _tmp3_ = NULL;
+	GdkEventScroll* _tmp3_;
 	GdkPoint _tmp4_ = {0};
 	gdouble interp = 0.0;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
-	GtkScale* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
-	GtkScale* _tmp9_ = NULL;
-	gdouble _tmp10_ = 0.0;
-	GtkScale* _tmp11_ = NULL;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
+	GtkScale* _tmp7_;
+	guint _tmp8_;
+	GtkScale* _tmp9_;
+	gdouble _tmp10_;
+	GtkScale* _tmp11_;
 	ZoomState new_zoom_state = {0};
 	ZoomState _tmp12_ = {0};
-	gdouble _tmp13_ = 0.0;
-	gboolean _tmp14_ = FALSE;
+	gdouble _tmp13_;
+	gboolean _tmp14_;
 	GdkPoint new_zoomed_old_cursor = {0};
-	GdkPoint _tmp15_ = {0};
-	gdouble _tmp16_ = 0.0;
+	GdkPoint _tmp15_;
+	gdouble _tmp16_;
 	GdkPoint _tmp17_ = {0};
 	GdkPoint desired_new_viewport_center = {0};
-	GdkPoint _tmp18_ = {0};
-	GdkPoint _tmp19_ = {0};
+	GdkPoint _tmp18_;
+	GdkPoint _tmp19_;
 	GdkPoint _tmp20_ = {0};
-	ZoomState _tmp21_ = {0};
-	GdkPoint _tmp22_ = {0};
-	ZoomState _tmp23_ = {0};
+	ZoomState _tmp21_;
+	GdkPoint _tmp22_;
+	ZoomState _tmp23_;
 #line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5523,7 +5517,7 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
 	if (_tmp0_) {
 #line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 5523 "PhotoPage.c"
+#line 5517 "PhotoPage.c"
 	}
 #line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
@@ -5577,7 +5571,7 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
 #line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 5577 "PhotoPage.c"
+#line 5571 "PhotoPage.c"
 	}
 #line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = iso_pixel_under_cursor;
@@ -5609,39 +5603,39 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
 #line 690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
-#line 5609 "PhotoPage.c"
+#line 5603 "PhotoPage.c"
 }
 
 
 void editing_host_page_snap_zoom_to_min (EditingHostPage* self) {
-	GtkScale* _tmp0_ = NULL;
+	GtkScale* _tmp0_;
 #line 693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
 #line 694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 0.0);
-#line 5621 "PhotoPage.c"
+#line 5615 "PhotoPage.c"
 }
 
 
 void editing_host_page_snap_zoom_to_max (EditingHostPage* self) {
-	GtkScale* _tmp0_ = NULL;
+	GtkScale* _tmp0_;
 #line 697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
 #line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 1.0);
-#line 5633 "PhotoPage.c"
+#line 5627 "PhotoPage.c"
 }
 
 
 void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) {
 	ZoomState iso_state = {0};
 	ZoomState _tmp0_ = {0};
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
 #line 701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5654,16 +5648,16 @@ void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) {
 	_tmp2_ = zoom_state_get_interpolation_factor (&iso_state);
 #line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), _tmp2_);
-#line 5654 "PhotoPage.c"
+#line 5648 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	GdkEventKey* _tmp0_;
+	guint _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
 	GQuark _tmp5_ = 0U;
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label0 = 0;
@@ -5697,7 +5691,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 	if (((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("equal")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("plus"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("KP_Add"))))) {
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5697 "PhotoPage.c"
+#line 5691 "PhotoPage.c"
 			default:
 			{
 #line 711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5706,13 +5700,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5706 "PhotoPage.c"
+#line 5700 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("minus")))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Subtract"))))) {
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5712 "PhotoPage.c"
+#line 5706 "PhotoPage.c"
 			default:
 			{
 #line 717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5721,13 +5715,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5721 "PhotoPage.c"
+#line 5715 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("KP_Divide")))) {
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5727 "PhotoPage.c"
+#line 5721 "PhotoPage.c"
 			default:
 			{
 #line 721 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5736,13 +5730,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5736 "PhotoPage.c"
+#line 5730 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_Multiply")))) {
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5742 "PhotoPage.c"
+#line 5736 "PhotoPage.c"
 			default:
 			{
 #line 725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5751,7 +5745,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5751 "PhotoPage.c"
+#line 5745 "PhotoPage.c"
 			}
 		}
 	}
@@ -5759,7 +5753,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 	result = FALSE;
 #line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5759 "PhotoPage.c"
+#line 5753 "PhotoPage.c"
 }
 
 
@@ -5768,20 +5762,20 @@ gboolean editing_host_page_on_zoom_slider_key_press (EditingHostPage* self, GdkE
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->on_zoom_slider_key_press (self, event);
-#line 5768 "PhotoPage.c"
+#line 5762 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_increase_size (EditingHostPage* self) {
-	GtkScale* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
+	GtkScale* _tmp0_;
+	gdouble _tmp1_;
 #line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
 #line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_adjust_interpolation_factor (self, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
 #line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_);
-#line 5781 "PhotoPage.c"
+#line 5775 "PhotoPage.c"
 }
 
 
@@ -5790,20 +5784,20 @@ void editing_host_page_on_increase_size (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->on_increase_size (self);
-#line 5790 "PhotoPage.c"
+#line 5784 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_decrease_size (EditingHostPage* self) {
-	GtkScale* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
+	GtkScale* _tmp0_;
+	gdouble _tmp1_;
 #line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
 #line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_adjust_interpolation_factor (self, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
 #line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_);
-#line 5803 "PhotoPage.c"
+#line 5797 "PhotoPage.c"
 }
 
 
@@ -5812,14 +5806,14 @@ void editing_host_page_on_decrease_size (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->on_decrease_size (self);
-#line 5812 "PhotoPage.c"
+#line 5806 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_save_zoom_state (SinglePhotoPage* base) {
 	EditingHostPage * self;
-	GtkScale* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
+	GtkScale* _tmp0_;
+	gdouble _tmp1_;
 #line 740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5830,15 +5824,15 @@ static void editing_host_page_real_save_zoom_state (SinglePhotoPage* base) {
 	_tmp1_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange));
 #line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->saved_slider_val = _tmp1_;
-#line 5830 "PhotoPage.c"
+#line 5824 "PhotoPage.c"
 }
 
 
 static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base) {
 	EditingHostPage * self;
 	ZoomBuffer* result = NULL;
-	ZoomBuffer* _tmp0_ = NULL;
-	ZoomBuffer* _tmp1_ = NULL;
+	ZoomBuffer* _tmp0_;
+	ZoomBuffer* _tmp1_;
 #line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5849,7 +5843,7 @@ static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base
 	result = _tmp1_;
 #line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5849 "PhotoPage.c"
+#line 5843 "PhotoPage.c"
 }
 
 
@@ -5858,8 +5852,8 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-	GdkEventScroll* _tmp5_ = NULL;
+	gboolean _tmp2_;
+	GdkEventScroll* _tmp5_;
 #line 749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5872,17 +5866,17 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 	if (_tmp2_) {
 #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 5872 "PhotoPage.c"
+#line 5866 "PhotoPage.c"
 	} else {
-		GtkScale* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+		GtkScale* _tmp3_;
+		gboolean _tmp4_;
 #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->zoom_slider;
 #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
 #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 5882 "PhotoPage.c"
+#line 5876 "PhotoPage.c"
 	}
 #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -5890,7 +5884,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 		result = FALSE;
 #line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 5890 "PhotoPage.c"
+#line 5884 "PhotoPage.c"
 	}
 #line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
@@ -5900,7 +5894,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 	result = FALSE;
 #line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5900 "PhotoPage.c"
+#line 5894 "PhotoPage.c"
 }
 
 
@@ -5909,8 +5903,8 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-	GdkEventScroll* _tmp5_ = NULL;
+	gboolean _tmp2_;
+	GdkEventScroll* _tmp5_;
 #line 757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5923,17 +5917,17 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 	if (_tmp2_) {
 #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 5923 "PhotoPage.c"
+#line 5917 "PhotoPage.c"
 	} else {
-		GtkScale* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+		GtkScale* _tmp3_;
+		gboolean _tmp4_;
 #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->zoom_slider;
 #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
 #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 5933 "PhotoPage.c"
+#line 5927 "PhotoPage.c"
 	}
 #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -5941,7 +5935,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 		result = FALSE;
 #line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 5941 "PhotoPage.c"
+#line 5935 "PhotoPage.c"
 	}
 #line 761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
@@ -5951,17 +5945,17 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 	result = FALSE;
 #line 762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5951 "PhotoPage.c"
+#line 5945 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) {
 	EditingHostPage * self;
-	GtkScale* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	GtkScale* _tmp2_ = NULL;
-	gdouble _tmp3_ = 0.0;
-	GtkScale* _tmp4_ = NULL;
+	GtkScale* _tmp0_;
+	guint _tmp1_;
+	GtkScale* _tmp2_;
+	gdouble _tmp3_;
+	GtkScale* _tmp4_;
 #line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5982,7 +5976,7 @@ static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) {
 	_tmp4_ = self->priv->zoom_slider;
 #line 770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
-#line 5982 "PhotoPage.c"
+#line 5976 "PhotoPage.c"
 }
 
 
@@ -5995,14 +5989,14 @@ static gboolean editing_host_page_real_is_zoom_supported (SinglePhotoPage* base)
 	result = TRUE;
 #line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5995 "PhotoPage.c"
+#line 5989 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_set_container (Page* base, GtkWindow* container) {
 	EditingHostPage * self;
-	GtkWindow* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
+	GtkWindow* _tmp0_;
+	GtkWindow* _tmp1_;
 #line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6015,23 +6009,23 @@ static void editing_host_page_real_set_container (Page* base, GtkWindow* contain
 	_tmp1_ = container;
 #line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) {
-#line 6015 "PhotoPage.c"
-		DragAndDropHandler* _tmp2_ = NULL;
+#line 6009 "PhotoPage.c"
+		DragAndDropHandler* _tmp2_;
 #line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_drag_and_drop_handler_unref0 (self->priv->dnd_handler);
 #line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->dnd_handler = _tmp2_;
-#line 6023 "PhotoPage.c"
+#line 6017 "PhotoPage.c"
 	}
 }
 
 
 ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self) {
 	ViewCollection* result = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
 #line 785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6042,15 +6036,15 @@ ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self) {
 	result = _tmp1_;
 #line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6042 "PhotoPage.c"
+#line 6036 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_has_photo (EditingHostPage* self) {
 	gboolean result = FALSE;
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
+	gboolean _tmp2_;
 #line 789 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6065,25 +6059,25 @@ gboolean editing_host_page_has_photo (EditingHostPage* self) {
 	result = _tmp2_;
 #line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6065 "PhotoPage.c"
+#line 6059 "PhotoPage.c"
 }
 
 
 Photo* editing_host_page_get_photo (EditingHostPage* self) {
 	Photo* result = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	ViewCollection* _tmp7_ = NULL;
-	ViewCollection* _tmp8_ = NULL;
-	DataView* _tmp9_ = NULL;
-	DataView* _tmp10_ = NULL;
-	DataSource* _tmp11_ = NULL;
-	Photo* _tmp12_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	gint _tmp6_;
+	ViewCollection* _tmp7_;
+	ViewCollection* _tmp8_;
+	DataView* _tmp9_;
+	DataView* _tmp10_;
+	DataSource* _tmp11_;
+	Photo* _tmp12_;
 #line 793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6102,7 +6096,7 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) {
 		result = NULL;
 #line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 6102 "PhotoPage.c"
+#line 6096 "PhotoPage.c"
 	}
 #line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -6134,14 +6128,14 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) {
 	result = _tmp12_;
 #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6134 "PhotoPage.c"
+#line 6128 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo* new_photo) {
-	Photo* _tmp0_ = NULL;
-	PhotoFileFormat _tmp1_ = 0;
-	gboolean _tmp6_ = FALSE;
+	Photo* _tmp0_;
+	PhotoFileFormat _tmp1_;
+	gboolean _tmp6_;
 #line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (new_photo));
 #line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6152,12 +6146,12 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo*
 	if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) {
 #line 809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_set_photo_missing (self, FALSE);
-#line 6152 "PhotoPage.c"
+#line 6146 "PhotoPage.c"
 	} else {
-		Photo* _tmp2_ = NULL;
-		GFile* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+		Photo* _tmp2_;
+		GFile* _tmp3_;
+		GFile* _tmp4_;
+		gboolean _tmp5_;
 #line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = new_photo;
 #line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6170,13 +6164,13 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo*
 		editing_host_page_set_photo_missing (self, !_tmp5_);
 #line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 6170 "PhotoPage.c"
+#line 6164 "PhotoPage.c"
 	}
 #line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->photo_missing;
 #line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_ui (self, _tmp6_);
-#line 6176 "PhotoPage.c"
+#line 6170 "PhotoPage.c"
 }
 
 
@@ -6185,35 +6179,35 @@ void editing_host_page_photo_changing (EditingHostPage* self, Photo* new_photo)
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->photo_changing (self, new_photo);
-#line 6185 "PhotoPage.c"
+#line 6179 "PhotoPage.c"
 }
 
 
 static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
-	GtkScale* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	GtkScale* _tmp2_ = NULL;
-	GtkScale* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
+	GtkScale* _tmp0_;
+	guint _tmp1_;
+	GtkScale* _tmp2_;
+	GtkScale* _tmp3_;
+	Photo* _tmp4_;
 	DataView* view = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	Photo* _tmp7_ = NULL;
-	DataView* _tmp8_ = NULL;
-	DataView* _tmp9_ = NULL;
-	DataView* _tmp10_ = NULL;
-	ViewCollection* _tmp11_ = NULL;
-	ViewCollection* _tmp12_ = NULL;
+	ViewCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	Photo* _tmp7_;
+	DataView* _tmp8_;
+	DataView* _tmp9_;
+	DataView* _tmp10_;
+	ViewCollection* _tmp11_;
+	ViewCollection* _tmp12_;
 	Marker* marker = NULL;
-	ViewCollection* _tmp13_ = NULL;
-	ViewCollection* _tmp14_ = NULL;
-	DataView* _tmp15_ = NULL;
-	Marker* _tmp16_ = NULL;
-	Marker* _tmp17_ = NULL;
-	ViewCollection* _tmp18_ = NULL;
-	ViewCollection* _tmp19_ = NULL;
-	Marker* _tmp20_ = NULL;
-	ViewCollection* _tmp21_ = NULL;
+	ViewCollection* _tmp13_;
+	ViewCollection* _tmp14_;
+	DataView* _tmp15_;
+	Marker* _tmp16_;
+	Marker* _tmp17_;
+	ViewCollection* _tmp18_;
+	ViewCollection* _tmp19_;
+	Marker* _tmp20_;
+	ViewCollection* _tmp21_;
 #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6290,13 +6284,13 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
 	_tmp21_ = self->priv->parent_view;
 #line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_ != NULL) {
-#line 6290 "PhotoPage.c"
-		ViewCollection* _tmp22_ = NULL;
+#line 6284 "PhotoPage.c"
+		ViewCollection* _tmp22_;
 		DataView* view_in_parent = NULL;
-		ViewCollection* _tmp23_ = NULL;
-		Photo* _tmp24_ = NULL;
-		DataView* _tmp25_ = NULL;
-		DataView* _tmp26_ = NULL;
+		ViewCollection* _tmp23_;
+		Photo* _tmp24_;
+		DataView* _tmp25_;
+		DataView* _tmp26_;
 #line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = self->priv->parent_view;
 #line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6313,12 +6307,12 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
 		_tmp26_ = view_in_parent;
 #line 835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (NULL != _tmp26_) {
-#line 6313 "PhotoPage.c"
-			ViewCollection* _tmp27_ = NULL;
-			ViewCollection* _tmp28_ = NULL;
-			DataView* _tmp29_ = NULL;
-			Marker* _tmp30_ = NULL;
-			Marker* _tmp31_ = NULL;
+#line 6307 "PhotoPage.c"
+			ViewCollection* _tmp27_;
+			ViewCollection* _tmp28_;
+			DataView* _tmp29_;
+			Marker* _tmp30_;
+			Marker* _tmp31_;
 #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp27_ = self->priv->parent_view;
 #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6333,17 +6327,17 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
 			view_collection_select_marked (_tmp27_, _tmp31_);
 #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp31_);
-#line 6333 "PhotoPage.c"
+#line 6327 "PhotoPage.c"
 		}
 #line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (view_in_parent);
-#line 6337 "PhotoPage.c"
+#line 6331 "PhotoPage.c"
 	}
 #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (marker);
 #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (view);
-#line 6343 "PhotoPage.c"
+#line 6337 "PhotoPage.c"
 }
 
 
@@ -6355,14 +6349,14 @@ static void editing_host_page_real_realize (GtkWidget* base) {
 	GTK_WIDGET_CLASS (editing_host_page_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget));
 #line 843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "realize");
-#line 6355 "PhotoPage.c"
+#line 6349 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_switched_to (Page* base) {
 	EditingHostPage * self;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6373,23 +6367,23 @@ static void editing_host_page_real_switched_to (Page* base) {
 	_tmp1_ = editing_host_page_has_photo (self);
 #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 6373 "PhotoPage.c"
-		gboolean _tmp2_ = FALSE;
+#line 6367 "PhotoPage.c"
+		gboolean _tmp2_;
 #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = self->priv->pixbuf_dirty;
 #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 6379 "PhotoPage.c"
+#line 6373 "PhotoPage.c"
 	} else {
 #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 6383 "PhotoPage.c"
+#line 6377 "PhotoPage.c"
 	}
 #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 6387 "PhotoPage.c"
-		Photo* _tmp3_ = NULL;
-		Photo* _tmp4_ = NULL;
+#line 6381 "PhotoPage.c"
+		Photo* _tmp3_;
+		Photo* _tmp4_;
 #line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (self);
 #line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6398,7 +6392,7 @@ static void editing_host_page_real_switched_to (Page* base) {
 		editing_host_page_replace_photo (self, _tmp4_);
 #line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 6398 "PhotoPage.c"
+#line 6392 "PhotoPage.c"
 	}
 }
 
@@ -6407,9 +6401,9 @@ static void editing_host_page_real_switching_from (Page* base) {
 	EditingHostPage * self;
 	Dimensions _tmp0_ = {0};
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	ViewCollection* _tmp13_ = NULL;
-	ViewCollection* _tmp14_ = NULL;
+	gboolean _tmp2_;
+	ViewCollection* _tmp13_;
+	ViewCollection* _tmp14_;
 #line 856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6426,30 +6420,30 @@ static void editing_host_page_real_switching_from (Page* base) {
 	_tmp2_ = editing_host_page_has_photo (self);
 #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 6426 "PhotoPage.c"
-		ViewCollection* _tmp3_ = NULL;
+#line 6420 "PhotoPage.c"
+		ViewCollection* _tmp3_;
 #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->parent_view;
 #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 6432 "PhotoPage.c"
+#line 6426 "PhotoPage.c"
 	} else {
 #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 6436 "PhotoPage.c"
+#line 6430 "PhotoPage.c"
 	}
 #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 6440 "PhotoPage.c"
-		ViewCollection* _tmp4_ = NULL;
-		ViewCollection* _tmp5_ = NULL;
-		ViewCollection* _tmp6_ = NULL;
-		Photo* _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
-		DataView* _tmp9_ = NULL;
-		DataView* _tmp10_ = NULL;
-		Marker* _tmp11_ = NULL;
-		Marker* _tmp12_ = NULL;
+#line 6434 "PhotoPage.c"
+		ViewCollection* _tmp4_;
+		ViewCollection* _tmp5_;
+		ViewCollection* _tmp6_;
+		Photo* _tmp7_;
+		Photo* _tmp8_;
+		DataView* _tmp9_;
+		DataView* _tmp10_;
+		Marker* _tmp11_;
+		Marker* _tmp12_;
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = self->priv->parent_view;
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6476,7 +6470,7 @@ static void editing_host_page_real_switching_from (Page* base) {
 		_g_object_unref0 (_tmp10_);
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 6476 "PhotoPage.c"
+#line 6470 "PhotoPage.c"
 	}
 #line 873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (self->priv->parent_view);
@@ -6490,25 +6484,25 @@ static void editing_host_page_real_switching_from (Page* base) {
 	data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
 #line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 6490 "PhotoPage.c"
+#line 6484 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) {
 #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_selection_changed ((EditingHostPage*) self, selected);
-#line 6497 "PhotoPage.c"
+#line 6491 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_switching_to_fullscreen (Page* base, FullscreenWindow* fsw) {
 	EditingHostPage * self;
-	FullscreenWindow* _tmp0_ = NULL;
+	FullscreenWindow* _tmp0_;
 	Dimensions _tmp1_ = {0};
 	Page* page = NULL;
-	FullscreenWindow* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
+	FullscreenWindow* _tmp2_;
+	Page* _tmp3_;
+	Page* _tmp4_;
 #line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6535,10 +6529,10 @@ static void editing_host_page_real_switching_to_fullscreen (Page* base, Fullscre
 	_tmp4_ = page;
 #line 886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 6535 "PhotoPage.c"
-		Page* _tmp5_ = NULL;
-		ViewCollection* _tmp6_ = NULL;
-		ViewCollection* _tmp7_ = NULL;
+#line 6529 "PhotoPage.c"
+		Page* _tmp5_;
+		ViewCollection* _tmp6_;
+		ViewCollection* _tmp7_;
 #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page;
 #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6549,21 +6543,21 @@ static void editing_host_page_real_switching_to_fullscreen (Page* base, Fullscre
 		g_signal_connect_object (_tmp7_, "items-selected", (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self, 0);
 #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 6549 "PhotoPage.c"
+#line 6543 "PhotoPage.c"
 	}
 #line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (page);
-#line 6553 "PhotoPage.c"
+#line 6547 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_returning_from_fullscreen (Page* base, FullscreenWindow* fsw) {
 	EditingHostPage * self;
-	FullscreenWindow* _tmp0_ = NULL;
+	FullscreenWindow* _tmp0_;
 	Page* page = NULL;
-	FullscreenWindow* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
+	FullscreenWindow* _tmp1_;
+	Page* _tmp2_;
+	Page* _tmp3_;
 #line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6584,11 +6578,11 @@ static void editing_host_page_real_returning_from_fullscreen (Page* base, Fullsc
 	_tmp3_ = page;
 #line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6584 "PhotoPage.c"
-		Page* _tmp4_ = NULL;
-		ViewCollection* _tmp5_ = NULL;
-		ViewCollection* _tmp6_ = NULL;
-		guint _tmp7_ = 0U;
+#line 6578 "PhotoPage.c"
+		Page* _tmp4_;
+		ViewCollection* _tmp5_;
+		ViewCollection* _tmp6_;
+		guint _tmp7_;
 #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page;
 #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6601,11 +6595,11 @@ static void editing_host_page_real_returning_from_fullscreen (Page* base, Fullsc
 		g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self);
 #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 6601 "PhotoPage.c"
+#line 6595 "PhotoPage.c"
 	}
 #line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (page);
-#line 6605 "PhotoPage.c"
+#line 6599 "PhotoPage.c"
 }
 
 
@@ -6614,11 +6608,11 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (selected));
-#line 6614 "PhotoPage.c"
+#line 6608 "PhotoPage.c"
 	{
 		GeeIterator* _view_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = selected;
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6627,20 +6621,20 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 		_view_it = _tmp1_;
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 6627 "PhotoPage.c"
-			gboolean _tmp2_ = FALSE;
+#line 6621 "PhotoPage.c"
+			gboolean _tmp2_;
 			DataView* view = NULL;
-			gpointer _tmp3_ = NULL;
-			DataView* _tmp4_ = NULL;
-			DataSource* _tmp5_ = NULL;
-			Photo* _tmp6_ = NULL;
+			gpointer _tmp3_;
+			DataView* _tmp4_;
+			DataSource* _tmp5_;
+			Photo* _tmp6_;
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = gee_iterator_next (_view_it);
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp2_) {
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 6640 "PhotoPage.c"
+#line 6634 "PhotoPage.c"
 			}
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = gee_iterator_get (_view_it);
@@ -6660,18 +6654,18 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 			_g_object_unref0 (view);
 #line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 6660 "PhotoPage.c"
+#line 6654 "PhotoPage.c"
 		}
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_view_it);
-#line 6664 "PhotoPage.c"
+#line 6658 "PhotoPage.c"
 	}
 }
 
 
 void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable) {
-	GtkToolButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GtkToolButton* _tmp0_;
+	gboolean _tmp1_;
 #line 907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6680,14 +6674,14 @@ void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_ena
 	_tmp1_ = should_enable;
 #line 908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 6680 "PhotoPage.c"
+#line 6674 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender, Photo* photo, GdkPixbuf* pixbuf, GError* err, gpointer self) {
 #line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_pixbuf_fetched ((EditingHostPage*) self, photo, pixbuf, err);
-#line 6687 "PhotoPage.c"
+#line 6681 "PhotoPage.c"
 }
 
 
@@ -6696,7 +6690,7 @@ static gboolean _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter
 	result = editing_host_page_master_cache_filter ((EditingHostPage*) self, photo);
 #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6696 "PhotoPage.c"
+#line 6690 "PhotoPage.c"
 }
 
 
@@ -6704,19 +6698,19 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 	Scaling scaling = {0};
 	Scaling _tmp0_ = {0};
 	gboolean _tmp1_ = FALSE;
-	PixbufCache* _tmp2_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	PixbufCache* _tmp10_ = NULL;
-	SourceCollection* _tmp14_ = NULL;
-	Scaling _tmp15_ = {0};
-	PixbufCache* _tmp16_ = NULL;
-	PixbufCache* _tmp17_ = NULL;
-	SourceCollection* _tmp18_ = NULL;
-	Scaling _tmp19_ = {0};
-	PixbufCache* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
+	PixbufCache* _tmp2_;
+	const gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	PixbufCache* _tmp10_;
+	SourceCollection* _tmp14_;
+	Scaling _tmp15_;
+	PixbufCache* _tmp16_;
+	PixbufCache* _tmp17_;
+	SourceCollection* _tmp18_;
+	Scaling _tmp19_;
+	PixbufCache* _tmp20_;
+	const gchar* _tmp21_;
 #line 914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6729,11 +6723,11 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 	_tmp2_ = self->priv->cache;
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 6729 "PhotoPage.c"
-		PixbufCache* _tmp3_ = NULL;
+#line 6723 "PhotoPage.c"
+		PixbufCache* _tmp3_;
 		Scaling _tmp4_ = {0};
-		Scaling _tmp5_ = {0};
-		gboolean _tmp6_ = FALSE;
+		Scaling _tmp5_;
+		gboolean _tmp6_;
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->cache;
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6744,17 +6738,17 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 		_tmp6_ = scaling_equals (&_tmp4_, &_tmp5_);
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp6_;
-#line 6744 "PhotoPage.c"
+#line 6738 "PhotoPage.c"
 	} else {
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 6748 "PhotoPage.c"
+#line 6742 "PhotoPage.c"
 	}
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
 #line 919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 6754 "PhotoPage.c"
+#line 6748 "PhotoPage.c"
 	}
 #line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = caller;
@@ -6770,10 +6764,10 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 	_tmp10_ = self->priv->cache;
 #line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ != NULL) {
-#line 6770 "PhotoPage.c"
-		PixbufCache* _tmp11_ = NULL;
-		guint _tmp12_ = 0U;
-		PixbufCache* _tmp13_ = NULL;
+#line 6764 "PhotoPage.c"
+		PixbufCache* _tmp11_;
+		guint _tmp12_;
+		PixbufCache* _tmp13_;
 #line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = self->priv->cache;
 #line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6784,7 +6778,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 		_tmp13_ = self->priv->cache;
 #line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_cancel_all (_tmp13_);
-#line 6784 "PhotoPage.c"
+#line 6778 "PhotoPage.c"
 	}
 #line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = self->priv->sources;
@@ -6814,12 +6808,12 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 	_tmp21_ = caller;
 #line 936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, _tmp21_);
-#line 6814 "PhotoPage.c"
+#line 6808 "PhotoPage.c"
 }
 
 
 static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar* caller) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6828,16 +6822,16 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar
 	_tmp0_ = editing_host_page_has_photo (self);
 #line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 6828 "PhotoPage.c"
-		const gchar* _tmp1_ = NULL;
-		Photo* _tmp2_ = NULL;
-		Photo* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		ViewCollection* _tmp6_ = NULL;
-		ViewCollection* _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
-		Photo* _tmp9_ = NULL;
+#line 6822 "PhotoPage.c"
+		const gchar* _tmp1_;
+		Photo* _tmp2_;
+		Photo* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		ViewCollection* _tmp6_;
+		ViewCollection* _tmp7_;
+		Photo* _tmp8_;
+		Photo* _tmp9_;
 #line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = caller;
 #line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6869,14 +6863,14 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar
 		_g_object_unref0 (_tmp9_);
 #line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 6868 "PhotoPage.c"
+#line 6862 "PhotoPage.c"
 	} else {
-		const gchar* _tmp10_ = NULL;
+		const gchar* _tmp10_;
 #line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = caller;
 #line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_debug ("PhotoPage.vala:946: Refresh pixbuf caches (%s): (no photo)", _tmp10_);
-#line 6875 "PhotoPage.c"
+#line 6869 "PhotoPage.c"
 	}
 }
 
@@ -6884,8 +6878,8 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar
 static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Photo* photo) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	Photo* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	Photo* _tmp1_;
+	gboolean _tmp2_;
 #line 950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6898,33 +6892,33 @@ static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Ph
 	if (_tmp2_) {
 #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 6897 "PhotoPage.c"
+#line 6891 "PhotoPage.c"
 	} else {
-		Photo* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+		Photo* _tmp3_;
+		gboolean _tmp4_;
 #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = photo;
 #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = photo_has_editable (_tmp3_);
 #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_;
-#line 6907 "PhotoPage.c"
+#line 6901 "PhotoPage.c"
 	}
 #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp0_;
 #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6913 "PhotoPage.c"
+#line 6907 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* photo, GdkPixbuf* pixbuf, GError* err) {
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	GdkPixbuf* _tmp5_ = NULL;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	GdkPixbuf* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -6948,31 +6942,31 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 	if (_tmp4_) {
 #line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 6947 "PhotoPage.c"
+#line 6941 "PhotoPage.c"
 	}
 #line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = pixbuf;
 #line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 6953 "PhotoPage.c"
+#line 6947 "PhotoPage.c"
 		gboolean _tmp6_ = FALSE;
-		ZoomBuffer* _tmp7_ = NULL;
+		ZoomBuffer* _tmp7_;
 		Dimensions max_dim = {0};
-		Photo* _tmp15_ = NULL;
+		Photo* _tmp15_;
 		Dimensions _tmp16_ = {0};
-		EditingToolsEditingTool* _tmp17_ = NULL;
-		GdkPixbuf* _tmp31_ = NULL;
-		Dimensions _tmp32_ = {0};
-		Photo* _tmp33_ = NULL;
+		EditingToolsEditingTool* _tmp17_;
+		GdkPixbuf* _tmp31_;
+		Dimensions _tmp32_;
+		Photo* _tmp33_;
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = self->priv->zoom_buffer;
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp7_ != NULL) {
-#line 6967 "PhotoPage.c"
-			ZoomBuffer* _tmp8_ = NULL;
-			Photo* _tmp9_ = NULL;
-			Photo* _tmp10_ = NULL;
-			Photo* _tmp11_ = NULL;
+#line 6961 "PhotoPage.c"
+			ZoomBuffer* _tmp8_;
+			Photo* _tmp9_;
+			Photo* _tmp10_;
+			Photo* _tmp11_;
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = self->priv->zoom_buffer;
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6985,18 +6979,18 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 			_tmp6_ = _tmp10_ == _tmp11_;
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp10_);
-#line 6984 "PhotoPage.c"
+#line 6978 "PhotoPage.c"
 		} else {
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = FALSE;
-#line 6988 "PhotoPage.c"
+#line 6982 "PhotoPage.c"
 		}
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp6_) {
-#line 6992 "PhotoPage.c"
-			Photo* _tmp12_ = NULL;
-			GdkPixbuf* _tmp13_ = NULL;
-			ZoomBuffer* _tmp14_ = NULL;
+#line 6986 "PhotoPage.c"
+			Photo* _tmp12_;
+			GdkPixbuf* _tmp13_;
+			ZoomBuffer* _tmp14_;
 #line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp12_ = photo;
 #line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7007,7 +7001,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 			_g_object_unref0 (self->priv->zoom_buffer);
 #line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			self->priv->zoom_buffer = _tmp14_;
-#line 7006 "PhotoPage.c"
+#line 7000 "PhotoPage.c"
 		}
 #line 966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = photo;
@@ -7019,16 +7013,16 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 		_tmp17_ = self->priv->current_tool;
 #line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp17_ != NULL) {
-#line 7018 "PhotoPage.c"
+#line 7012 "PhotoPage.c"
 			{
 				Dimensions tool_pixbuf_dim = {0};
 				GdkPixbuf* tool_pixbuf = NULL;
-				EditingToolsEditingTool* _tmp18_ = NULL;
+				EditingToolsEditingTool* _tmp18_;
 				Scaling _tmp19_ = {0};
-				Photo* _tmp20_ = NULL;
+				Photo* _tmp20_;
 				Dimensions _tmp21_ = {0};
-				GdkPixbuf* _tmp22_ = NULL;
-				GdkPixbuf* _tmp23_ = NULL;
+				GdkPixbuf* _tmp22_;
+				GdkPixbuf* _tmp23_;
 #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp18_ = self->priv->current_tool;
 #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7043,16 +7037,16 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				tool_pixbuf = _tmp22_;
 #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7042 "PhotoPage.c"
-					goto __catch244_g_error;
+#line 7036 "PhotoPage.c"
+					goto __catch245_g_error;
 				}
 #line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp23_ = tool_pixbuf;
 #line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (_tmp23_ != NULL) {
-#line 7049 "PhotoPage.c"
-					GdkPixbuf* _tmp24_ = NULL;
-					Dimensions _tmp25_ = {0};
+#line 7043 "PhotoPage.c"
+					GdkPixbuf* _tmp24_;
+					Dimensions _tmp25_;
 #line 974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					_tmp24_ = tool_pixbuf;
 #line 974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7061,21 +7055,21 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 					_tmp25_ = tool_pixbuf_dim;
 #line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					max_dim = _tmp25_;
-#line 7060 "PhotoPage.c"
+#line 7054 "PhotoPage.c"
 				}
 #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (tool_pixbuf);
-#line 7064 "PhotoPage.c"
+#line 7058 "PhotoPage.c"
 			}
-			goto __finally244;
-			__catch244_g_error:
+			goto __finally245;
+			__catch245_g_error:
 			{
 				GError* err = NULL;
-				Photo* _tmp26_ = NULL;
-				gchar* _tmp27_ = NULL;
-				gchar* _tmp28_ = NULL;
-				GError* _tmp29_ = NULL;
-				const gchar* _tmp30_ = NULL;
+				Photo* _tmp26_;
+				gchar* _tmp27_;
+				gchar* _tmp28_;
+				GError* _tmp29_;
+				const gchar* _tmp30_;
 #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				err = _inner_error_;
 #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7100,9 +7094,9 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				_g_error_free0 (err);
 #line 981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return;
-#line 7099 "PhotoPage.c"
+#line 7093 "PhotoPage.c"
 			}
-			__finally244:
+			__finally245:
 #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7111,7 +7105,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				g_clear_error (&_inner_error_);
 #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return;
-#line 7110 "PhotoPage.c"
+#line 7104 "PhotoPage.c"
 			}
 		}
 #line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7126,22 +7120,22 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 		_tmp33_ = photo;
 #line 988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PHOTO, Photo), FALSE);
-#line 7125 "PhotoPage.c"
+#line 7119 "PhotoPage.c"
 	} else {
-		GError* _tmp34_ = NULL;
+		GError* _tmp34_;
 #line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = err;
 #line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp34_ != NULL) {
-#line 7132 "PhotoPage.c"
-			Photo* _tmp35_ = NULL;
+#line 7126 "PhotoPage.c"
+			Photo* _tmp35_;
 #line 992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_set_photo_missing (self, TRUE);
 #line 995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp35_ = photo;
 #line 995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo), TRUE);
-#line 7140 "PhotoPage.c"
+#line 7134 "PhotoPage.c"
 		}
 	}
 }
@@ -7149,30 +7143,30 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 
 static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCollection* controller, Photo* photo) {
 	PixbufCachePixbufCacheBatch* normal_batch = NULL;
-	PixbufCachePixbufCacheBatch* _tmp0_ = NULL;
+	PixbufCachePixbufCacheBatch* _tmp0_;
 	PixbufCachePixbufCacheBatch* master_batch = NULL;
-	PixbufCachePixbufCacheBatch* _tmp1_ = NULL;
-	PixbufCachePixbufCacheBatch* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	PixbufCachePixbufCacheBatch* _tmp4_ = NULL;
-	Photo* _tmp5_ = NULL;
+	PixbufCachePixbufCacheBatch* _tmp1_;
+	PixbufCachePixbufCacheBatch* _tmp2_;
+	Photo* _tmp3_;
+	PixbufCachePixbufCacheBatch* _tmp4_;
+	Photo* _tmp5_;
 	DataSource* next_source = NULL;
 	DataSource* prev_source = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	Photo* _tmp7_ = NULL;
+	ViewCollection* _tmp6_;
+	Photo* _tmp7_;
 	DataSource* _tmp8_ = NULL;
 	DataSource* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
+	gboolean _tmp10_;
 	Photo* next = NULL;
-	DataSource* _tmp11_ = NULL;
-	Photo* _tmp12_ = NULL;
+	DataSource* _tmp11_;
+	Photo* _tmp12_;
 	Photo* prev = NULL;
-	DataSource* _tmp13_ = NULL;
-	Photo* _tmp14_ = NULL;
-	PixbufCache* _tmp39_ = NULL;
-	PixbufCachePixbufCacheBatch* _tmp40_ = NULL;
-	PixbufCache* _tmp41_ = NULL;
-	PixbufCachePixbufCacheBatch* _tmp42_ = NULL;
+	DataSource* _tmp13_;
+	Photo* _tmp14_;
+	PixbufCache* _tmp39_;
+	PixbufCachePixbufCacheBatch* _tmp40_;
+	PixbufCache* _tmp41_;
+	PixbufCachePixbufCacheBatch* _tmp42_;
 #line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7225,7 +7219,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 		_g_object_unref0 (normal_batch);
 #line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 7224 "PhotoPage.c"
+#line 7218 "PhotoPage.c"
 	}
 #line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = next_source;
@@ -7239,15 +7233,15 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo));
 #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	prev = _tmp14_;
-#line 7238 "PhotoPage.c"
+#line 7232 "PhotoPage.c"
 	{
 		GeeIterator* _neighbor_source_it = NULL;
-		ViewCollection* _tmp15_ = NULL;
-		Photo* _tmp16_ = NULL;
-		GeeSet* _tmp17_ = NULL;
-		GeeSet* _tmp18_ = NULL;
-		GeeIterator* _tmp19_ = NULL;
-		GeeIterator* _tmp20_ = NULL;
+		ViewCollection* _tmp15_;
+		Photo* _tmp16_;
+		GeeSet* _tmp17_;
+		GeeSet* _tmp18_;
+		GeeIterator* _tmp19_;
+		GeeIterator* _tmp20_;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = controller;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7266,25 +7260,25 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 		_neighbor_source_it = _tmp20_;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 7265 "PhotoPage.c"
-			GeeIterator* _tmp21_ = NULL;
-			gboolean _tmp22_ = FALSE;
+#line 7259 "PhotoPage.c"
+			GeeIterator* _tmp21_;
+			gboolean _tmp22_;
 			DataSource* neighbor_source = NULL;
-			GeeIterator* _tmp23_ = NULL;
-			gpointer _tmp24_ = NULL;
+			GeeIterator* _tmp23_;
+			gpointer _tmp24_;
 			Photo* neighbor = NULL;
-			DataSource* _tmp25_ = NULL;
-			Photo* _tmp26_ = NULL;
+			DataSource* _tmp25_;
+			Photo* _tmp26_;
 			BackgroundJobJobPriority priority = 0;
 			gboolean _tmp27_ = FALSE;
-			Photo* _tmp28_ = NULL;
-			Photo* _tmp29_ = NULL;
-			gboolean _tmp30_ = FALSE;
-			PixbufCachePixbufCacheBatch* _tmp34_ = NULL;
-			BackgroundJobJobPriority _tmp35_ = 0;
-			Photo* _tmp36_ = NULL;
-			PixbufCachePixbufCacheBatch* _tmp37_ = NULL;
-			Photo* _tmp38_ = NULL;
+			Photo* _tmp28_;
+			Photo* _tmp29_;
+			gboolean _tmp30_;
+			PixbufCachePixbufCacheBatch* _tmp34_;
+			BackgroundJobJobPriority _tmp35_;
+			Photo* _tmp36_;
+			PixbufCachePixbufCacheBatch* _tmp37_;
+			Photo* _tmp38_;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp21_ = _neighbor_source_it;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7293,7 +7287,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 			if (!_tmp22_) {
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 7292 "PhotoPage.c"
+#line 7286 "PhotoPage.c"
 			}
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = _neighbor_source_it;
@@ -7319,11 +7313,11 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 			if (_tmp30_) {
 #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp27_ = TRUE;
-#line 7318 "PhotoPage.c"
+#line 7312 "PhotoPage.c"
 			} else {
-				Photo* _tmp31_ = NULL;
-				Photo* _tmp32_ = NULL;
-				gboolean _tmp33_ = FALSE;
+				Photo* _tmp31_;
+				Photo* _tmp32_;
+				gboolean _tmp33_;
 #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp31_ = neighbor;
 #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7332,13 +7326,13 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 				_tmp33_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_SOURCE, DataSource));
 #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp27_ = _tmp33_;
-#line 7331 "PhotoPage.c"
+#line 7325 "PhotoPage.c"
 			}
 #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp27_) {
 #line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				priority = BACKGROUND_JOB_JOB_PRIORITY_HIGH;
-#line 7337 "PhotoPage.c"
+#line 7331 "PhotoPage.c"
 			}
 #line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp34_ = normal_batch;
@@ -7358,11 +7352,11 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 			_g_object_unref0 (neighbor);
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (neighbor_source);
-#line 7357 "PhotoPage.c"
+#line 7351 "PhotoPage.c"
 		}
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_neighbor_source_it);
-#line 7361 "PhotoPage.c"
+#line 7355 "PhotoPage.c"
 	}
 #line 1025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp39_ = self->priv->cache;
@@ -7388,23 +7382,23 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 	_g_object_unref0 (master_batch);
 #line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (normal_batch);
-#line 7387 "PhotoPage.c"
+#line 7381 "PhotoPage.c"
 }
 
 
 static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, ViewCollection* old_controller, Photo* old_photo, ViewCollection* new_controller, Photo* new_photo) {
 	GeeSet* old_neighbors = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	GeeSet* _tmp2_ = NULL;
+	ViewCollection* _tmp0_;
+	Photo* _tmp1_;
+	GeeSet* _tmp2_;
 	GeeSet* new_neighbors = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	GeeSet* _tmp5_ = NULL;
+	ViewCollection* _tmp3_;
+	Photo* _tmp4_;
+	GeeSet* _tmp5_;
 	gboolean _tmp23_ = FALSE;
-	GeeSet* _tmp24_ = NULL;
-	Photo* _tmp25_ = NULL;
-	gboolean _tmp26_ = FALSE;
+	GeeSet* _tmp24_;
+	Photo* _tmp25_;
+	gboolean _tmp26_;
 #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7431,11 +7425,11 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 	_tmp5_ = view_collection_get_extended_neighbors (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
 #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_SET, GeeSet);
-#line 7430 "PhotoPage.c"
+#line 7424 "PhotoPage.c"
 	{
 		GeeIterator* _old_neighbor_it = NULL;
-		GeeSet* _tmp6_ = NULL;
-		GeeIterator* _tmp7_ = NULL;
+		GeeSet* _tmp6_;
+		GeeIterator* _tmp7_;
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = old_neighbors;
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7444,16 +7438,16 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 		_old_neighbor_it = _tmp7_;
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 7443 "PhotoPage.c"
-			GeeIterator* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+#line 7437 "PhotoPage.c"
+			GeeIterator* _tmp8_;
+			gboolean _tmp9_;
 			Photo* old_neighbor = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			gpointer _tmp11_ = NULL;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
 			gboolean _tmp12_ = FALSE;
-			GeeSet* _tmp13_ = NULL;
-			Photo* _tmp14_ = NULL;
-			gboolean _tmp15_ = FALSE;
+			GeeSet* _tmp13_;
+			Photo* _tmp14_;
+			gboolean _tmp15_;
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = _old_neighbor_it;
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7462,7 +7456,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 			if (!_tmp9_) {
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 7461 "PhotoPage.c"
+#line 7455 "PhotoPage.c"
 			}
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = _old_neighbor_it;
@@ -7478,10 +7472,10 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 			_tmp15_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_);
 #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp15_) {
-#line 7477 "PhotoPage.c"
-				Photo* _tmp16_ = NULL;
-				Photo* _tmp17_ = NULL;
-				gboolean _tmp18_ = FALSE;
+#line 7471 "PhotoPage.c"
+				Photo* _tmp16_;
+				Photo* _tmp17_;
+				gboolean _tmp18_;
 #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp16_ = new_photo;
 #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7490,19 +7484,19 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 				_tmp18_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource));
 #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp12_ = !_tmp18_;
-#line 7489 "PhotoPage.c"
+#line 7483 "PhotoPage.c"
 			} else {
 #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp12_ = FALSE;
-#line 7493 "PhotoPage.c"
+#line 7487 "PhotoPage.c"
 			}
 #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp12_) {
-#line 7497 "PhotoPage.c"
-				PixbufCache* _tmp19_ = NULL;
-				Photo* _tmp20_ = NULL;
-				PixbufCache* _tmp21_ = NULL;
-				Photo* _tmp22_ = NULL;
+#line 7491 "PhotoPage.c"
+				PixbufCache* _tmp19_;
+				Photo* _tmp20_;
+				PixbufCache* _tmp21_;
+				Photo* _tmp22_;
 #line 1042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp19_ = self->priv->cache;
 #line 1042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7515,15 +7509,15 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 				_tmp22_ = old_neighbor;
 #line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				pixbuf_cache_drop (_tmp21_, _tmp22_);
-#line 7514 "PhotoPage.c"
+#line 7508 "PhotoPage.c"
 			}
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (old_neighbor);
-#line 7518 "PhotoPage.c"
+#line 7512 "PhotoPage.c"
 		}
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_old_neighbor_it);
-#line 7522 "PhotoPage.c"
+#line 7516 "PhotoPage.c"
 	}
 #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = new_neighbors;
@@ -7533,10 +7527,10 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 	_tmp26_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
 #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp26_) {
-#line 7532 "PhotoPage.c"
-		Photo* _tmp27_ = NULL;
-		Photo* _tmp28_ = NULL;
-		gboolean _tmp29_ = FALSE;
+#line 7526 "PhotoPage.c"
+		Photo* _tmp27_;
+		Photo* _tmp28_;
+		gboolean _tmp29_;
 #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = new_photo;
 #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7545,19 +7539,19 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 		_tmp29_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_SOURCE, DataSource));
 #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = !_tmp29_;
-#line 7544 "PhotoPage.c"
+#line 7538 "PhotoPage.c"
 	} else {
 #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = FALSE;
-#line 7548 "PhotoPage.c"
+#line 7542 "PhotoPage.c"
 	}
 #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp23_) {
-#line 7552 "PhotoPage.c"
-		PixbufCache* _tmp30_ = NULL;
-		Photo* _tmp31_ = NULL;
-		PixbufCache* _tmp32_ = NULL;
-		Photo* _tmp33_ = NULL;
+#line 7546 "PhotoPage.c"
+		PixbufCache* _tmp30_;
+		Photo* _tmp31_;
+		PixbufCache* _tmp32_;
+		Photo* _tmp33_;
 #line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = self->priv->cache;
 #line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7570,20 +7564,20 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 		_tmp33_ = old_photo;
 #line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_drop (_tmp32_, _tmp33_);
-#line 7569 "PhotoPage.c"
+#line 7563 "PhotoPage.c"
 	}
 #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (new_neighbors);
 #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (old_neighbors);
-#line 7575 "PhotoPage.c"
+#line 7569 "PhotoPage.c"
 }
 
 
 static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self, DataSource* source) {
 	DataView* result = NULL;
-	DataSource* _tmp0_ = NULL;
-	PhotoView* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	PhotoView* _tmp1_;
 #line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
 #line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7594,7 +7588,7 @@ static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
 #line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7593 "PhotoPage.c"
+#line 7587 "PhotoPage.c"
 }
 
 
@@ -7603,13 +7597,13 @@ DataView* editing_host_page_create_photo_view (EditingHostPage* self, DataSource
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->create_photo_view (self, source);
-#line 7602 "PhotoPage.c"
+#line 7596 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_is_photo (EditingHostPage* self, DataSource* source) {
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7620,7 +7614,7 @@ static gboolean editing_host_page_is_photo (EditingHostPage* self, DataSource* s
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO_SOURCE);
 #line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7619 "PhotoPage.c"
+#line 7613 "PhotoPage.c"
 }
 
 
@@ -7629,7 +7623,7 @@ static DataView* _editing_host_page_create_photo_view_create_view (DataSource* s
 	result = editing_host_page_create_photo_view ((EditingHostPage*) self, source);
 #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7628 "PhotoPage.c"
+#line 7622 "PhotoPage.c"
 }
 
 
@@ -7638,21 +7632,21 @@ static gboolean _editing_host_page_is_photo_create_view_predicate (DataSource* s
 	result = editing_host_page_is_photo ((EditingHostPage*) self, source);
 #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7637 "PhotoPage.c"
+#line 7631 "PhotoPage.c"
 }
 
 
 void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* controller, Photo* starting_photo) {
-	ViewCollection* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	DataView* _tmp2_ = NULL;
-	DataView* _tmp3_ = NULL;
+	ViewCollection* _tmp0_;
+	Photo* _tmp1_;
+	DataView* _tmp2_;
+	DataView* _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	ViewCollection* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
-	Photo* _tmp18_ = NULL;
+	ViewCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
+	gboolean _tmp8_;
+	Photo* _tmp18_;
 #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7683,31 +7677,31 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 	_data_collection_unref0 (_tmp7_);
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 7682 "PhotoPage.c"
-		ViewCollection* _tmp9_ = NULL;
-		ViewCollection* _tmp10_ = NULL;
+#line 7676 "PhotoPage.c"
+		ViewCollection* _tmp9_;
+		ViewCollection* _tmp10_;
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = controller;
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = self->priv->parent_view;
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp9_ != _tmp10_;
-#line 7691 "PhotoPage.c"
+#line 7685 "PhotoPage.c"
 	} else {
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 7695 "PhotoPage.c"
+#line 7689 "PhotoPage.c"
 	}
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 7699 "PhotoPage.c"
-		ViewCollection* _tmp11_ = NULL;
-		ViewCollection* _tmp12_ = NULL;
-		ViewCollection* _tmp13_ = NULL;
-		ViewCollection* _tmp14_ = NULL;
-		ViewCollection* _tmp15_ = NULL;
-		ViewCollection* _tmp16_ = NULL;
-		ViewCollection* _tmp17_ = NULL;
+#line 7693 "PhotoPage.c"
+		ViewCollection* _tmp11_;
+		ViewCollection* _tmp12_;
+		ViewCollection* _tmp13_;
+		ViewCollection* _tmp14_;
+		ViewCollection* _tmp15_;
+		ViewCollection* _tmp16_;
+		ViewCollection* _tmp17_;
 #line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7734,27 +7728,27 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 		_data_collection_unref0 (self->priv->parent_view);
 #line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->parent_view = _tmp17_;
-#line 7733 "PhotoPage.c"
+#line 7727 "PhotoPage.c"
 	}
 #line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = starting_photo;
 #line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_replace_photo (self, _tmp18_);
-#line 7739 "PhotoPage.c"
+#line 7733 "PhotoPage.c"
 }
 
 
 void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection* controller, Photo* starting_photo) {
-	ViewCollection* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	DataView* _tmp2_ = NULL;
-	DataView* _tmp3_ = NULL;
+	ViewCollection* _tmp0_;
+	Photo* _tmp1_;
+	DataView* _tmp2_;
+	DataView* _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	ViewCollection* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
-	Photo* _tmp18_ = NULL;
+	ViewCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
+	gboolean _tmp8_;
+	Photo* _tmp18_;
 #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7785,31 +7779,31 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 	_data_collection_unref0 (_tmp7_);
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 7784 "PhotoPage.c"
-		ViewCollection* _tmp9_ = NULL;
-		ViewCollection* _tmp10_ = NULL;
+#line 7778 "PhotoPage.c"
+		ViewCollection* _tmp9_;
+		ViewCollection* _tmp10_;
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = controller;
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = self->priv->parent_view;
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp9_ != _tmp10_;
-#line 7793 "PhotoPage.c"
+#line 7787 "PhotoPage.c"
 	} else {
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 7797 "PhotoPage.c"
+#line 7791 "PhotoPage.c"
 	}
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 7801 "PhotoPage.c"
-		ViewCollection* _tmp11_ = NULL;
-		ViewCollection* _tmp12_ = NULL;
-		ViewCollection* _tmp13_ = NULL;
-		ViewCollection* _tmp14_ = NULL;
-		ViewCollection* _tmp15_ = NULL;
-		ViewCollection* _tmp16_ = NULL;
-		ViewCollection* _tmp17_ = NULL;
+#line 7795 "PhotoPage.c"
+		ViewCollection* _tmp11_;
+		ViewCollection* _tmp12_;
+		ViewCollection* _tmp13_;
+		ViewCollection* _tmp14_;
+		ViewCollection* _tmp15_;
+		ViewCollection* _tmp16_;
+		ViewCollection* _tmp17_;
 #line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7836,26 +7830,26 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 		_data_collection_unref0 (self->priv->parent_view);
 #line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->parent_view = _tmp17_;
-#line 7835 "PhotoPage.c"
+#line 7829 "PhotoPage.c"
 	}
 #line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = starting_photo;
 #line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_replace_photo (self, _tmp18_);
-#line 7841 "PhotoPage.c"
+#line 7835 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_update_ui (EditingHostPage* self, gboolean missing) {
 	gboolean sensitivity = FALSE;
-	gboolean _tmp0_ = FALSE;
-	GtkToolButton* _tmp1_ = NULL;
-	GtkToggleToolButton* _tmp2_ = NULL;
-	GtkToggleToolButton* _tmp3_ = NULL;
-	GtkToggleToolButton* _tmp4_ = NULL;
-	GtkToggleToolButton* _tmp5_ = NULL;
-	GtkToolButton* _tmp6_ = NULL;
-	GtkScale* _tmp7_ = NULL;
+	gboolean _tmp0_;
+	GtkToolButton* _tmp1_;
+	GtkToggleToolButton* _tmp2_;
+	GtkToggleToolButton* _tmp3_;
+	GtkToggleToolButton* _tmp4_;
+	GtkToggleToolButton* _tmp5_;
+	GtkToolButton* _tmp6_;
+	GtkScale* _tmp7_;
 	Dimensions _tmp8_ = {0};
 #line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = missing;
@@ -7893,7 +7887,7 @@ static void editing_host_page_real_update_ui (EditingHostPage* self, gboolean mi
 	dimensions_init (&_tmp8_, 0, 0);
 #line 1097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp8_, FALSE);
-#line 7892 "PhotoPage.c"
+#line 7886 "PhotoPage.c"
 }
 
 
@@ -7902,14 +7896,14 @@ void editing_host_page_update_ui (EditingHostPage* self, gboolean missing) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->update_ui (self, missing);
-#line 7901 "PhotoPage.c"
+#line 7895 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) {
 #line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 7908 "PhotoPage.c"
+#line 7902 "PhotoPage.c"
 }
 
 
@@ -7918,36 +7912,36 @@ void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, Phot
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->notify_photo_backing_missing (self, photo, missing);
-#line 7917 "PhotoPage.c"
+#line 7911 "PhotoPage.c"
 }
 
 
 static void editing_host_page_draw_message (EditingHostPage* self, const gchar* message) {
 	PangoLayout* pango_layout = NULL;
-	const gchar* _tmp0_ = NULL;
-	PangoLayout* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	PangoLayout* _tmp1_;
 	gint text_width = 0;
 	gint text_height = 0;
-	PangoLayout* _tmp2_ = NULL;
+	PangoLayout* _tmp2_;
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
 	GtkAllocation allocation = {0};
 	GtkAllocation _tmp5_ = {0};
 	gint x = 0;
-	GtkAllocation _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	GtkAllocation _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
+	gint _tmp10_;
 	gint y = 0;
-	GtkAllocation _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
+	GtkAllocation _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
 	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	PangoLayout* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
+	gint _tmp16_;
+	PangoLayout* _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
 #line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7982,17 +7976,17 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar*
 	_tmp10_ = x;
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ > 0) {
-#line 7981 "PhotoPage.c"
-		gint _tmp11_ = 0;
+#line 7975 "PhotoPage.c"
+		gint _tmp11_;
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = x;
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp11_ / 2;
-#line 7987 "PhotoPage.c"
+#line 7981 "PhotoPage.c"
 	} else {
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = 0;
-#line 7991 "PhotoPage.c"
+#line 7985 "PhotoPage.c"
 	}
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	x = _tmp9_;
@@ -8008,17 +8002,17 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar*
 	_tmp16_ = y;
 #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp16_ > 0) {
-#line 8007 "PhotoPage.c"
-		gint _tmp17_ = 0;
+#line 8001 "PhotoPage.c"
+		gint _tmp17_;
 #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = y;
 #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp17_ / 2;
-#line 8013 "PhotoPage.c"
+#line 8007 "PhotoPage.c"
 	} else {
 #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = 0;
-#line 8017 "PhotoPage.c"
+#line 8011 "PhotoPage.c"
 	}
 #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	y = _tmp15_;
@@ -8032,19 +8026,19 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar*
 	single_photo_page_paint_text (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp18_, _tmp19_, _tmp20_);
 #line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pango_layout);
-#line 8031 "PhotoPage.c"
+#line 8025 "PhotoPage.c"
 }
 
 
 void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missing) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 	Photo* photo = NULL;
-	Photo* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
+	Photo* _tmp3_;
+	Photo* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 1123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -8056,7 +8050,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 	if (_tmp0_ == _tmp1_) {
 #line 1125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8055 "PhotoPage.c"
+#line 8049 "PhotoPage.c"
 	}
 #line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = missing;
@@ -8074,7 +8068,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 		_g_object_unref0 (photo);
 #line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8073 "PhotoPage.c"
+#line 8067 "PhotoPage.c"
 	}
 #line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = missing;
@@ -8084,20 +8078,20 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 	_tmp6_ = self->priv->photo_missing;
 #line 1135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8083 "PhotoPage.c"
+#line 8077 "PhotoPage.c"
 		{
 			GdkPixbuf* pixbuf = NULL;
-			Photo* _tmp7_ = NULL;
+			Photo* _tmp7_;
 			Scaling _tmp8_ = {0};
-			GdkPixbuf* _tmp9_ = NULL;
-			GdkPixbuf* _tmp10_ = NULL;
-			GdkPixbuf* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			GdkPixbuf* _tmp13_ = NULL;
-			gint _tmp14_ = 0;
-			GdkPixbuf* _tmp15_ = NULL;
-			GdkPixbuf* _tmp16_ = NULL;
-			Photo* _tmp17_ = NULL;
+			GdkPixbuf* _tmp9_;
+			GdkPixbuf* _tmp10_;
+			GdkPixbuf* _tmp11_;
+			gint _tmp12_;
+			GdkPixbuf* _tmp13_;
+			gint _tmp14_;
+			GdkPixbuf* _tmp15_;
+			GdkPixbuf* _tmp16_;
+			Photo* _tmp17_;
 			Dimensions _tmp18_ = {0};
 #line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = photo;
@@ -8109,8 +8103,8 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			pixbuf = _tmp9_;
 #line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8108 "PhotoPage.c"
-				goto __catch245_g_error;
+#line 8102 "PhotoPage.c"
+				goto __catch246_g_error;
 			}
 #line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = pixbuf;
@@ -8138,18 +8132,18 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp16_, &_tmp18_, NULL);
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 8137 "PhotoPage.c"
+#line 8131 "PhotoPage.c"
 		}
-		goto __finally245;
-		__catch245_g_error:
+		goto __finally246;
+		__catch246_g_error:
 		{
 			GError* err = NULL;
-			GdkPixbuf* _tmp19_ = NULL;
-			GdkPixbuf* _tmp20_ = NULL;
-			Photo* _tmp21_ = NULL;
+			GdkPixbuf* _tmp19_;
+			GdkPixbuf* _tmp20_;
+			Photo* _tmp21_;
 			Dimensions _tmp22_ = {0};
-			GError* _tmp23_ = NULL;
-			const gchar* _tmp24_ = NULL;
+			GError* _tmp23_;
+			const gchar* _tmp24_;
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			err = _inner_error_;
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8174,9 +8168,9 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			g_warning ("PhotoPage.vala:1145: %s", _tmp24_);
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_error_free0 (err);
-#line 8173 "PhotoPage.c"
+#line 8167 "PhotoPage.c"
 		}
-		__finally245:
+		__finally246:
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8187,18 +8181,18 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			g_clear_error (&_inner_error_);
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 8186 "PhotoPage.c"
+#line 8180 "PhotoPage.c"
 		}
 	}
 #line 1123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 8191 "PhotoPage.c"
+#line 8185 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_get_photo_missing (EditingHostPage* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8207,7 +8201,7 @@ gboolean editing_host_page_get_photo_missing (EditingHostPage* self) {
 	result = _tmp0_;
 #line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8206 "PhotoPage.c"
+#line 8200 "PhotoPage.c"
 }
 
 
@@ -8221,7 +8215,7 @@ static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* s
 	result = TRUE;
 #line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8220 "PhotoPage.c"
+#line 8214 "PhotoPage.c"
 }
 
 
@@ -8230,18 +8224,18 @@ gboolean editing_host_page_confirm_replace_photo (EditingHostPage* self, Photo*
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->confirm_replace_photo (self, old_photo, new_photo);
-#line 8229 "PhotoPage.c"
+#line 8223 "PhotoPage.c"
 }
 
 
 static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Photo* new_photo) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* pixbuf = NULL;
-	PixbufCache* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp11_ = NULL;
+	PixbufCache* _tmp0_;
+	Photo* _tmp1_;
+	GdkPixbuf* _tmp2_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
@@ -8259,13 +8253,13 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 	_tmp3_ = pixbuf;
 #line 1160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 8258 "PhotoPage.c"
+#line 8252 "PhotoPage.c"
 		{
 			GdkPixbuf* _tmp4_ = NULL;
-			Photo* _tmp5_ = NULL;
+			Photo* _tmp5_;
 			Scaling _tmp6_ = {0};
-			GdkPixbuf* _tmp7_ = NULL;
-			GdkPixbuf* _tmp8_ = NULL;
+			GdkPixbuf* _tmp7_;
+			GdkPixbuf* _tmp8_;
 #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp5_ = new_photo;
 #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8276,8 +8270,8 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			_tmp4_ = _tmp7_;
 #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8275 "PhotoPage.c"
-				goto __catch246_g_error;
+#line 8269 "PhotoPage.c"
+				goto __catch247_g_error;
 			}
 #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = _tmp4_;
@@ -8289,14 +8283,14 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			pixbuf = _tmp8_;
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp4_);
-#line 8288 "PhotoPage.c"
+#line 8282 "PhotoPage.c"
 		}
-		goto __finally246;
-		__catch246_g_error:
+		goto __finally247;
+		__catch247_g_error:
 		{
 			GError* err = NULL;
-			GError* _tmp9_ = NULL;
-			const gchar* _tmp10_ = NULL;
+			GError* _tmp9_;
+			const gchar* _tmp10_;
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			err = _inner_error_;
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8309,9 +8303,9 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			g_warning ("PhotoPage.vala:1164: %s", _tmp10_);
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_error_free0 (err);
-#line 8308 "PhotoPage.c"
+#line 8302 "PhotoPage.c"
 		}
-		__finally246:
+		__finally247:
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8322,19 +8316,19 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			g_clear_error (&_inner_error_);
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return NULL;
-#line 8321 "PhotoPage.c"
+#line 8315 "PhotoPage.c"
 		}
 	}
 #line 1167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = pixbuf;
 #line 1167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 8328 "PhotoPage.c"
-		GdkPixbuf* _tmp12_ = NULL;
+#line 8322 "PhotoPage.c"
+		GdkPixbuf* _tmp12_;
 		Scaling _tmp13_ = {0};
-		GdkPixbuf* _tmp14_ = NULL;
-		GdkPixbuf* _tmp15_ = NULL;
-		GdkPixbuf* _tmp16_ = NULL;
+		GdkPixbuf* _tmp14_;
+		GdkPixbuf* _tmp15_;
+		GdkPixbuf* _tmp16_;
 #line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = get_placeholder_pixbuf ();
 #line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8351,44 +8345,44 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 		_tmp16_ = _tmp15_;
 #line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 8350 "PhotoPage.c"
+#line 8344 "PhotoPage.c"
 	}
 #line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = pixbuf;
 #line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8356 "PhotoPage.c"
+#line 8350 "PhotoPage.c"
 }
 
 
 static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_photo) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	Photo* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
+	Photo* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
 	gboolean _tmp14_ = FALSE;
 	gboolean _tmp15_ = FALSE;
-	gboolean _tmp16_ = FALSE;
+	gboolean _tmp16_;
 	Dimensions _tmp26_ = {0};
 	Photo* old_photo = NULL;
-	Photo* _tmp27_ = NULL;
-	Photo* _tmp28_ = NULL;
-	Photo* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	gchar* _tmp31_ = NULL;
-	Photo* _tmp32_ = NULL;
-	GFile* _tmp33_ = NULL;
-	GFile* _tmp34_ = NULL;
-	gboolean _tmp35_ = FALSE;
-	Photo* _tmp36_ = NULL;
-	Photo* _tmp43_ = NULL;
-	Photo* _tmp44_ = NULL;
-	GdkPixbuf* _tmp45_ = NULL;
-	GdkPixbuf* _tmp46_ = NULL;
-	ZoomBuffer* _tmp47_ = NULL;
+	Photo* _tmp27_;
+	Photo* _tmp28_;
+	Photo* _tmp29_;
+	gchar* _tmp30_;
+	gchar* _tmp31_;
+	Photo* _tmp32_;
+	GFile* _tmp33_;
+	GFile* _tmp34_;
+	gboolean _tmp35_;
+	Photo* _tmp36_;
+	Photo* _tmp43_;
+	Photo* _tmp44_;
+	GdkPixbuf* _tmp45_;
+	GdkPixbuf* _tmp46_;
+	ZoomBuffer* _tmp47_;
 #line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8407,40 +8401,40 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 	_g_object_unref0 (_tmp4_);
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8406 "PhotoPage.c"
-		gboolean _tmp7_ = FALSE;
+#line 8400 "PhotoPage.c"
+		gboolean _tmp7_;
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = self->priv->pixbuf_dirty;
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = !_tmp7_;
-#line 8412 "PhotoPage.c"
+#line 8406 "PhotoPage.c"
 	} else {
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 8416 "PhotoPage.c"
+#line 8410 "PhotoPage.c"
 	}
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 8420 "PhotoPage.c"
-		gboolean _tmp8_ = FALSE;
+#line 8414 "PhotoPage.c"
+		gboolean _tmp8_;
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = self->priv->photo_missing;
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp8_;
-#line 8426 "PhotoPage.c"
+#line 8420 "PhotoPage.c"
 	} else {
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 8430 "PhotoPage.c"
+#line 8424 "PhotoPage.c"
 	}
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 8434 "PhotoPage.c"
-		Photo* _tmp9_ = NULL;
-		Photo* _tmp10_ = NULL;
-		GdkPixbuf* _tmp11_ = NULL;
-		GdkPixbuf* _tmp12_ = NULL;
-		ZoomBuffer* _tmp13_ = NULL;
+#line 8428 "PhotoPage.c"
+		Photo* _tmp9_;
+		Photo* _tmp10_;
+		GdkPixbuf* _tmp11_;
+		GdkPixbuf* _tmp12_;
+		ZoomBuffer* _tmp13_;
 #line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = new_photo;
 #line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8459,17 +8453,17 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 		_g_object_unref0 (_tmp12_);
 #line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8458 "PhotoPage.c"
+#line 8452 "PhotoPage.c"
 	}
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = editing_host_page_has_photo (self);
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp16_) {
-#line 8464 "PhotoPage.c"
-		Photo* _tmp17_ = NULL;
-		Photo* _tmp18_ = NULL;
-		Photo* _tmp19_ = NULL;
-		gboolean _tmp20_ = FALSE;
+#line 8458 "PhotoPage.c"
+		Photo* _tmp17_;
+		Photo* _tmp18_;
+		Photo* _tmp19_;
+		gboolean _tmp20_;
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = new_photo;
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8482,30 +8476,30 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 		_tmp15_ = !_tmp20_;
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp19_);
-#line 8481 "PhotoPage.c"
+#line 8475 "PhotoPage.c"
 	} else {
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = FALSE;
-#line 8485 "PhotoPage.c"
+#line 8479 "PhotoPage.c"
 	}
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_) {
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = editing_host_page_confirm_replace_photo != NULL;
-#line 8491 "PhotoPage.c"
+#line 8485 "PhotoPage.c"
 	} else {
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 8495 "PhotoPage.c"
+#line 8489 "PhotoPage.c"
 	}
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_) {
-#line 8499 "PhotoPage.c"
-		Photo* _tmp21_ = NULL;
-		Photo* _tmp22_ = NULL;
-		Photo* _tmp23_ = NULL;
-		gboolean _tmp24_ = FALSE;
-		gboolean _tmp25_ = FALSE;
+#line 8493 "PhotoPage.c"
+		Photo* _tmp21_;
+		Photo* _tmp22_;
+		Photo* _tmp23_;
+		gboolean _tmp24_;
+		gboolean _tmp25_;
 #line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = editing_host_page_get_photo (self);
 #line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8522,7 +8516,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 		if (_tmp25_) {
 #line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 8521 "PhotoPage.c"
+#line 8515 "PhotoPage.c"
 		}
 	}
 #line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8571,13 +8565,13 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 	_tmp36_ = old_photo;
 #line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp36_ != NULL) {
-#line 8570 "PhotoPage.c"
-		ViewCollection* _tmp37_ = NULL;
-		ViewCollection* _tmp38_ = NULL;
-		Photo* _tmp39_ = NULL;
-		ViewCollection* _tmp40_ = NULL;
-		ViewCollection* _tmp41_ = NULL;
-		Photo* _tmp42_ = NULL;
+#line 8564 "PhotoPage.c"
+		ViewCollection* _tmp37_;
+		ViewCollection* _tmp38_;
+		Photo* _tmp39_;
+		ViewCollection* _tmp40_;
+		ViewCollection* _tmp41_;
+		Photo* _tmp42_;
 #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8596,7 +8590,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 		_data_collection_unref0 (_tmp41_);
 #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp38_);
-#line 8595 "PhotoPage.c"
+#line 8589 "PhotoPage.c"
 	}
 #line 1211 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
@@ -8622,21 +8616,21 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 	editing_host_page_refresh_caches (self, "replace_photo");
 #line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (old_photo);
-#line 8621 "PhotoPage.c"
+#line 8615 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
 	EditingHostPage * self;
-	GtkScale* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	GtkScale* _tmp2_ = NULL;
-	GtkScale* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	Photo* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	GtkScale* _tmp0_;
+	guint _tmp1_;
+	GtkScale* _tmp2_;
+	GtkScale* _tmp3_;
+	Photo* _tmp4_;
+	Photo* _tmp5_;
+	gboolean _tmp6_;
 	gboolean _tmp12_ = FALSE;
-	GtkDrawingArea* _tmp13_ = NULL;
+	GtkDrawingArea* _tmp13_;
 #line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8665,9 +8659,9 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
 	_g_object_unref0 (_tmp5_);
 #line 1228 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8664 "PhotoPage.c"
-		Photo* _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
+#line 8658 "PhotoPage.c"
+		Photo* _tmp7_;
+		Photo* _tmp8_;
 		Dimensions _tmp9_ = {0};
 		Dimensions _tmp10_ = {0};
 		ZoomState _tmp11_ = {0};
@@ -8685,58 +8679,58 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
 		single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp11_);
 #line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 8684 "PhotoPage.c"
+#line 8678 "PhotoPage.c"
 	}
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas;
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_ != NULL) {
-#line 8690 "PhotoPage.c"
-		GtkDrawingArea* _tmp14_ = NULL;
-		GdkWindow* _tmp15_ = NULL;
+#line 8684 "PhotoPage.c"
+		GtkDrawingArea* _tmp14_;
+		GdkWindow* _tmp15_;
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas;
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp15_ != NULL;
-#line 8699 "PhotoPage.c"
+#line 8693 "PhotoPage.c"
 	} else {
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 8703 "PhotoPage.c"
+#line 8697 "PhotoPage.c"
 	}
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
 #line 1236 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR);
-#line 8709 "PhotoPage.c"
+#line 8703 "PhotoPage.c"
 	}
 #line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 8713 "PhotoPage.c"
+#line 8707 "PhotoPage.c"
 }
 
 
 static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	GdkPixbuf* pixbuf = NULL;
-	PixbufCache* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
+	PixbufCache* _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
+	GdkPixbuf* _tmp5_;
 	Scaling scaling = {0};
 	Scaling _tmp10_ = {0};
-	Photo* _tmp11_ = NULL;
-	Photo* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	PixbufCache* _tmp28_ = NULL;
-	Photo* _tmp29_ = NULL;
-	Photo* _tmp30_ = NULL;
+	Photo* _tmp11_;
+	Photo* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	PixbufCache* _tmp28_;
+	Photo* _tmp29_;
+	Photo* _tmp30_;
 	GError * _inner_error_ = NULL;
 #line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -8758,10 +8752,10 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	_tmp5_ = pixbuf;
 #line 1243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 8757 "PhotoPage.c"
-		GdkPixbuf* _tmp6_ = NULL;
-		Photo* _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
+#line 8751 "PhotoPage.c"
+		GdkPixbuf* _tmp6_;
+		Photo* _tmp7_;
+		Photo* _tmp8_;
 		Dimensions _tmp9_ = {0};
 #line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = pixbuf;
@@ -8781,7 +8775,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		_g_object_unref0 (pixbuf);
 #line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8780 "PhotoPage.c"
+#line 8774 "PhotoPage.c"
 	}
 #line 1250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_);
@@ -8807,16 +8801,16 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	_g_free0 (_tmp14_);
 #line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 8806 "PhotoPage.c"
+#line 8800 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp17_ = NULL;
-		Photo* _tmp18_ = NULL;
-		Photo* _tmp19_ = NULL;
-		Scaling _tmp20_ = {0};
-		GdkPixbuf* _tmp21_ = NULL;
-		GdkPixbuf* _tmp22_ = NULL;
-		Photo* _tmp23_ = NULL;
-		Photo* _tmp24_ = NULL;
+		Photo* _tmp18_;
+		Photo* _tmp19_;
+		Scaling _tmp20_;
+		GdkPixbuf* _tmp21_;
+		GdkPixbuf* _tmp22_;
+		Photo* _tmp23_;
+		Photo* _tmp24_;
 		Dimensions _tmp25_ = {0};
 #line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = editing_host_page_get_photo (self);
@@ -8834,8 +8828,8 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		_tmp17_ = _tmp22_;
 #line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8833 "PhotoPage.c"
-			goto __catch247_g_error;
+#line 8827 "PhotoPage.c"
+			goto __catch248_g_error;
 		}
 #line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = editing_host_page_get_photo (self);
@@ -8849,14 +8843,14 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		_g_object_unref0 (_tmp24_);
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp17_);
-#line 8848 "PhotoPage.c"
+#line 8842 "PhotoPage.c"
 	}
-	goto __finally247;
-	__catch247_g_error:
+	goto __finally248;
+	__catch248_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp26_ = NULL;
-		const gchar* _tmp27_ = NULL;
+		GError* _tmp26_;
+		const gchar* _tmp27_;
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8869,9 +8863,9 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		g_warning ("PhotoPage.vala:1259: %s", _tmp27_);
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 8868 "PhotoPage.c"
+#line 8862 "PhotoPage.c"
 	}
-	__finally247:
+	__finally248:
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8882,7 +8876,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		g_clear_error (&_inner_error_);
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8881 "PhotoPage.c"
+#line 8875 "PhotoPage.c"
 	}
 #line 1262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = self->priv->cache;
@@ -8898,22 +8892,22 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	self->priv->pixbuf_dirty = FALSE;
 #line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pixbuf);
-#line 8897 "PhotoPage.c"
+#line 8891 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 	gboolean result = FALSE;
 	Photo* photo = NULL;
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
 	GdkPixbuf* pixbuf = NULL;
 	Dimensions max_dim = {0};
-	Photo* _tmp2_ = NULL;
+	Photo* _tmp2_;
 	Dimensions _tmp3_ = {0};
-	gboolean _tmp18_ = FALSE;
+	gboolean _tmp18_;
 	gboolean _tmp26_ = FALSE;
-	gboolean _tmp27_ = FALSE;
+	gboolean _tmp27_;
 	GError * _inner_error_ = NULL;
 #line 1269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
@@ -8931,7 +8925,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		_g_object_unref0 (photo);
 #line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 8930 "PhotoPage.c"
+#line 8924 "PhotoPage.c"
 	}
 #line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf = NULL;
@@ -8941,12 +8935,12 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_);
 #line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	max_dim = _tmp3_;
-#line 8940 "PhotoPage.c"
+#line 8934 "PhotoPage.c"
 	{
 		Dimensions tool_pixbuf_dim = {0};
 		Dimensions _tmp4_ = {0};
-		EditingToolsEditingTool* _tmp5_ = NULL;
-		GdkPixbuf* _tmp13_ = NULL;
+		EditingToolsEditingTool* _tmp5_;
+		GdkPixbuf* _tmp13_;
 #line 1282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_.width = 0;
 #line 1282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8955,14 +8949,14 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		_tmp5_ = self->priv->current_tool;
 #line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_ != NULL) {
-#line 8954 "PhotoPage.c"
+#line 8948 "PhotoPage.c"
 			GdkPixbuf* _tmp6_ = NULL;
-			EditingToolsEditingTool* _tmp7_ = NULL;
+			EditingToolsEditingTool* _tmp7_;
 			Scaling _tmp8_ = {0};
-			Photo* _tmp9_ = NULL;
+			Photo* _tmp9_;
 			Dimensions _tmp10_ = {0};
-			GdkPixbuf* _tmp11_ = NULL;
-			GdkPixbuf* _tmp12_ = NULL;
+			GdkPixbuf* _tmp11_;
+			GdkPixbuf* _tmp12_;
 #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = self->priv->current_tool;
 #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8977,8 +8971,8 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			_tmp6_ = _tmp11_;
 #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8976 "PhotoPage.c"
-				goto __catch248_g_error;
+#line 8970 "PhotoPage.c"
+				goto __catch249_g_error;
 			}
 #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp12_ = _tmp6_;
@@ -8990,27 +8984,27 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			pixbuf = _tmp12_;
 #line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp6_);
-#line 8989 "PhotoPage.c"
+#line 8983 "PhotoPage.c"
 		}
 #line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = pixbuf;
 #line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp13_ != NULL) {
-#line 8995 "PhotoPage.c"
-			Dimensions _tmp14_ = {0};
+#line 8989 "PhotoPage.c"
+			Dimensions _tmp14_;
 #line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = tool_pixbuf_dim;
 #line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			max_dim = _tmp14_;
-#line 9001 "PhotoPage.c"
+#line 8995 "PhotoPage.c"
 		}
 	}
-	goto __finally248;
-	__catch248_g_error:
+	goto __finally249;
+	__catch249_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
+		GError* _tmp15_;
+		const gchar* _tmp16_;
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9025,12 +9019,12 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		editing_host_page_set_photo_missing (self, TRUE);
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 9024 "PhotoPage.c"
+#line 9018 "PhotoPage.c"
 	}
-	__finally248:
+	__finally249:
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9029 "PhotoPage.c"
+#line 9023 "PhotoPage.c"
 		gboolean _tmp17_ = FALSE;
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (pixbuf);
@@ -9042,23 +9036,23 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		g_clear_error (&_inner_error_);
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return _tmp17_;
-#line 9041 "PhotoPage.c"
+#line 9035 "PhotoPage.c"
 	}
 #line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = self->priv->photo_missing;
 #line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp18_) {
-#line 9047 "PhotoPage.c"
-		GdkPixbuf* _tmp19_ = NULL;
-		GdkPixbuf* _tmp23_ = NULL;
+#line 9041 "PhotoPage.c"
+		GdkPixbuf* _tmp19_;
+		GdkPixbuf* _tmp23_;
 #line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = pixbuf;
 #line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp19_ == NULL) {
-#line 9054 "PhotoPage.c"
-			PixbufCache* _tmp20_ = NULL;
-			Photo* _tmp21_ = NULL;
-			GdkPixbuf* _tmp22_ = NULL;
+#line 9048 "PhotoPage.c"
+			PixbufCache* _tmp20_;
+			Photo* _tmp21_;
+			GdkPixbuf* _tmp22_;
 #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp20_ = self->priv->cache;
 #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9069,45 +9063,45 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			_g_object_unref0 (pixbuf);
 #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp22_;
-#line 9068 "PhotoPage.c"
+#line 9062 "PhotoPage.c"
 		}
 #line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = pixbuf;
 #line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp23_ == NULL) {
-#line 9074 "PhotoPage.c"
-			PixbufCache* _tmp24_ = NULL;
-			Photo* _tmp25_ = NULL;
+#line 9068 "PhotoPage.c"
+			PixbufCache* _tmp24_;
+			Photo* _tmp25_;
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp24_ = self->priv->cache;
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = photo;
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf_cache_prefetch (_tmp24_, _tmp25_, BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
-#line 9083 "PhotoPage.c"
+#line 9077 "PhotoPage.c"
 		}
 	}
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = self->priv->photo_missing;
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp27_) {
-#line 9090 "PhotoPage.c"
-		GdkPixbuf* _tmp28_ = NULL;
+#line 9084 "PhotoPage.c"
+		GdkPixbuf* _tmp28_;
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = pixbuf;
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = _tmp28_ != NULL;
-#line 9096 "PhotoPage.c"
+#line 9090 "PhotoPage.c"
 	} else {
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = FALSE;
-#line 9100 "PhotoPage.c"
+#line 9094 "PhotoPage.c"
 	}
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp26_) {
-#line 9104 "PhotoPage.c"
-		GdkPixbuf* _tmp29_ = NULL;
-		Dimensions _tmp30_ = {0};
+#line 9098 "PhotoPage.c"
+		GdkPixbuf* _tmp29_;
+		Dimensions _tmp30_;
 #line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = pixbuf;
 #line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9116,7 +9110,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp29_, &_tmp30_, NULL);
 #line 1305 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->pixbuf_dirty = FALSE;
-#line 9115 "PhotoPage.c"
+#line 9109 "PhotoPage.c"
 	}
 #line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
@@ -9126,13 +9120,13 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 	_g_object_unref0 (photo);
 #line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9125 "PhotoPage.c"
+#line 9119 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_resize (Page* base, GdkRectangle* rect) {
 	EditingHostPage * self;
-	GdkRectangle _tmp0_ = {0};
+	GdkRectangle _tmp0_;
 #line 1315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9143,7 +9137,7 @@ static void editing_host_page_real_on_resize (Page* base, GdkRectangle* rect) {
 	PAGE_CLASS (editing_host_page_parent_class)->on_resize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_);
 #line 1318 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_track_tool_window (self);
-#line 9142 "PhotoPage.c"
+#line 9136 "PhotoPage.c"
 }
 
 
@@ -9159,7 +9153,7 @@ static void editing_host_page_real_on_resize_finished (Page* base, GdkRectangle*
 	self->priv->pixbuf_dirty = TRUE;
 #line 1328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_pixbuf (self);
-#line 9158 "PhotoPage.c"
+#line 9152 "PhotoPage.c"
 }
 
 
@@ -9172,52 +9166,52 @@ static void editing_host_page_on_viewport_resized (EditingHostPage* self) {
 	self->priv->pixbuf_dirty = TRUE;
 #line 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_pixbuf (self);
-#line 9171 "PhotoPage.c"
+#line 9165 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_update_actions (Page* base, gint selected_count, gint count) {
 	EditingHostPage * self;
 	gboolean multiple_photos = FALSE;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
-	GtkToolButton* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	GtkToolButton* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
+	GtkToolButton* _tmp4_;
+	gboolean _tmp5_;
+	GtkToolButton* _tmp6_;
+	gboolean _tmp7_;
 	Photo* photo = NULL;
-	Photo* _tmp8_ = NULL;
+	Photo* _tmp8_;
 	Scaling scaling = {0};
 	Scaling _tmp9_ = {0};
 	gboolean _tmp10_ = FALSE;
 	gboolean _tmp11_ = FALSE;
 	gboolean _tmp12_ = FALSE;
-	Photo* _tmp13_ = NULL;
-	GtkToolButton* _tmp19_ = NULL;
+	Photo* _tmp13_;
+	GtkToolButton* _tmp19_;
 	gboolean _tmp20_ = FALSE;
 	gboolean _tmp21_ = FALSE;
-	Photo* _tmp22_ = NULL;
-	GtkToggleToolButton* _tmp27_ = NULL;
+	Photo* _tmp22_;
+	GtkToggleToolButton* _tmp27_;
 	gboolean _tmp28_ = FALSE;
 	gboolean _tmp29_ = FALSE;
-	Photo* _tmp30_ = NULL;
-	GtkToggleToolButton* _tmp35_ = NULL;
+	Photo* _tmp30_;
+	GtkToggleToolButton* _tmp35_;
 	gboolean _tmp36_ = FALSE;
 	gboolean _tmp37_ = FALSE;
-	Photo* _tmp38_ = NULL;
-	GtkToggleToolButton* _tmp43_ = NULL;
+	Photo* _tmp38_;
+	GtkToggleToolButton* _tmp43_;
 	gboolean _tmp44_ = FALSE;
 	gboolean _tmp45_ = FALSE;
-	Photo* _tmp46_ = NULL;
-	GtkToolButton* _tmp50_ = NULL;
+	Photo* _tmp46_;
+	GtkToolButton* _tmp50_;
 	gboolean _tmp51_ = FALSE;
 	gboolean _tmp52_ = FALSE;
-	Photo* _tmp53_ = NULL;
-	GtkToggleToolButton* _tmp58_ = NULL;
-	gint _tmp59_ = 0;
-	gint _tmp60_ = 0;
+	Photo* _tmp53_;
+	GtkToggleToolButton* _tmp58_;
+	gint _tmp59_;
+	gint _tmp60_;
 #line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9256,51 +9250,51 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp13_ = photo;
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_ != NULL) {
-#line 9255 "PhotoPage.c"
-		gboolean _tmp14_ = FALSE;
+#line 9249 "PhotoPage.c"
+		gboolean _tmp14_;
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = self->priv->photo_missing;
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = !_tmp14_;
-#line 9261 "PhotoPage.c"
+#line 9255 "PhotoPage.c"
 	} else {
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 9265 "PhotoPage.c"
+#line 9259 "PhotoPage.c"
 	}
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 9269 "PhotoPage.c"
-		Photo* _tmp15_ = NULL;
-		gboolean _tmp16_ = FALSE;
+#line 9263 "PhotoPage.c"
+		Photo* _tmp15_;
+		gboolean _tmp16_;
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = photo;
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = photo_check_can_rotate (_tmp15_);
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp16_;
-#line 9278 "PhotoPage.c"
+#line 9272 "PhotoPage.c"
 	} else {
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = FALSE;
-#line 9282 "PhotoPage.c"
+#line 9276 "PhotoPage.c"
 	}
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_) {
-#line 9286 "PhotoPage.c"
-		Photo* _tmp17_ = NULL;
-		gboolean _tmp18_ = FALSE;
+#line 9280 "PhotoPage.c"
+		Photo* _tmp17_;
+		gboolean _tmp18_;
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = photo;
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = editing_host_page_is_rotate_available (self, _tmp17_);
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp18_;
-#line 9295 "PhotoPage.c"
+#line 9289 "PhotoPage.c"
 	} else {
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = FALSE;
-#line 9299 "PhotoPage.c"
+#line 9293 "PhotoPage.c"
 	}
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = self->priv->rotate_button;
@@ -9310,24 +9304,24 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp22_ = photo;
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp22_ != NULL) {
-#line 9309 "PhotoPage.c"
-		gboolean _tmp23_ = FALSE;
+#line 9303 "PhotoPage.c"
+		gboolean _tmp23_;
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = self->priv->photo_missing;
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = !_tmp23_;
-#line 9315 "PhotoPage.c"
+#line 9309 "PhotoPage.c"
 	} else {
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = FALSE;
-#line 9319 "PhotoPage.c"
+#line 9313 "PhotoPage.c"
 	}
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_) {
-#line 9323 "PhotoPage.c"
-		Photo* _tmp24_ = NULL;
-		Scaling _tmp25_ = {0};
-		gboolean _tmp26_ = FALSE;
+#line 9317 "PhotoPage.c"
+		Photo* _tmp24_;
+		Scaling _tmp25_;
+		gboolean _tmp26_;
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = photo;
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9336,11 +9330,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp26_ = editing_tools_crop_tool_is_available (_tmp24_, &_tmp25_);
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp26_;
-#line 9335 "PhotoPage.c"
+#line 9329 "PhotoPage.c"
 	} else {
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = FALSE;
-#line 9339 "PhotoPage.c"
+#line 9333 "PhotoPage.c"
 	}
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = self->priv->crop_button;
@@ -9350,24 +9344,24 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp30_ = photo;
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_ != NULL) {
-#line 9349 "PhotoPage.c"
-		gboolean _tmp31_ = FALSE;
+#line 9343 "PhotoPage.c"
+		gboolean _tmp31_;
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = self->priv->photo_missing;
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = !_tmp31_;
-#line 9355 "PhotoPage.c"
+#line 9349 "PhotoPage.c"
 	} else {
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = FALSE;
-#line 9359 "PhotoPage.c"
+#line 9353 "PhotoPage.c"
 	}
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp29_) {
-#line 9363 "PhotoPage.c"
-		Photo* _tmp32_ = NULL;
-		Scaling _tmp33_ = {0};
-		gboolean _tmp34_ = FALSE;
+#line 9357 "PhotoPage.c"
+		Photo* _tmp32_;
+		Scaling _tmp33_;
+		gboolean _tmp34_;
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = photo;
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9376,11 +9370,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp34_ = editing_tools_redeye_tool_is_available (_tmp32_, &_tmp33_);
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = _tmp34_;
-#line 9375 "PhotoPage.c"
+#line 9369 "PhotoPage.c"
 	} else {
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = FALSE;
-#line 9379 "PhotoPage.c"
+#line 9373 "PhotoPage.c"
 	}
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = self->priv->redeye_button;
@@ -9390,24 +9384,24 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp38_ = photo;
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp38_ != NULL) {
-#line 9389 "PhotoPage.c"
-		gboolean _tmp39_ = FALSE;
+#line 9383 "PhotoPage.c"
+		gboolean _tmp39_;
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = self->priv->photo_missing;
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = !_tmp39_;
-#line 9395 "PhotoPage.c"
+#line 9389 "PhotoPage.c"
 	} else {
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = FALSE;
-#line 9399 "PhotoPage.c"
+#line 9393 "PhotoPage.c"
 	}
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp37_) {
-#line 9403 "PhotoPage.c"
-		Photo* _tmp40_ = NULL;
-		Scaling _tmp41_ = {0};
-		gboolean _tmp42_ = FALSE;
+#line 9397 "PhotoPage.c"
+		Photo* _tmp40_;
+		Scaling _tmp41_;
+		gboolean _tmp42_;
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp40_ = photo;
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9416,11 +9410,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp42_ = editing_tools_adjust_tool_is_available (_tmp40_, &_tmp41_);
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = _tmp42_;
-#line 9415 "PhotoPage.c"
+#line 9409 "PhotoPage.c"
 	} else {
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = FALSE;
-#line 9419 "PhotoPage.c"
+#line 9413 "PhotoPage.c"
 	}
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = self->priv->adjust_button;
@@ -9430,34 +9424,34 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp46_ = photo;
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp46_ != NULL) {
-#line 9429 "PhotoPage.c"
-		gboolean _tmp47_ = FALSE;
+#line 9423 "PhotoPage.c"
+		gboolean _tmp47_;
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp47_ = self->priv->photo_missing;
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = !_tmp47_;
-#line 9435 "PhotoPage.c"
+#line 9429 "PhotoPage.c"
 	} else {
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = FALSE;
-#line 9439 "PhotoPage.c"
+#line 9433 "PhotoPage.c"
 	}
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp45_) {
-#line 9443 "PhotoPage.c"
-		Photo* _tmp48_ = NULL;
-		gboolean _tmp49_ = FALSE;
+#line 9437 "PhotoPage.c"
+		Photo* _tmp48_;
+		gboolean _tmp49_;
 #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp48_ = photo;
 #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp49_ = editing_host_page_is_enhance_available (self, _tmp48_);
 #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = _tmp49_;
-#line 9452 "PhotoPage.c"
+#line 9446 "PhotoPage.c"
 	} else {
 #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = FALSE;
-#line 9456 "PhotoPage.c"
+#line 9450 "PhotoPage.c"
 	}
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp50_ = self->priv->enhance_button;
@@ -9467,24 +9461,24 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp53_ = photo;
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp53_ != NULL) {
-#line 9466 "PhotoPage.c"
-		gboolean _tmp54_ = FALSE;
+#line 9460 "PhotoPage.c"
+		gboolean _tmp54_;
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp54_ = self->priv->photo_missing;
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = !_tmp54_;
-#line 9472 "PhotoPage.c"
+#line 9466 "PhotoPage.c"
 	} else {
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = FALSE;
-#line 9476 "PhotoPage.c"
+#line 9470 "PhotoPage.c"
 	}
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp52_) {
-#line 9480 "PhotoPage.c"
-		Photo* _tmp55_ = NULL;
-		Scaling _tmp56_ = {0};
-		gboolean _tmp57_ = FALSE;
+#line 9474 "PhotoPage.c"
+		Photo* _tmp55_;
+		Scaling _tmp56_;
+		gboolean _tmp57_;
 #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = photo;
 #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9493,11 +9487,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp57_ = editing_tools_straighten_tool_is_available (_tmp55_, &_tmp56_);
 #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = _tmp57_;
-#line 9492 "PhotoPage.c"
+#line 9486 "PhotoPage.c"
 	} else {
 #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = FALSE;
-#line 9496 "PhotoPage.c"
+#line 9490 "PhotoPage.c"
 	}
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp58_ = self->priv->straighten_button;
@@ -9511,7 +9505,7 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	PAGE_CLASS (editing_host_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp59_, _tmp60_);
 #line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 9510 "PhotoPage.c"
+#line 9504 "PhotoPage.c"
 }
 
 
@@ -9521,60 +9515,60 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	EditingToolsEditingTool* _tmp3_ = NULL;
-	GdkEventKey* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	EditingToolsEditingTool* _tmp3_;
+	GdkEventKey* _tmp7_;
+	gboolean _tmp8_;
 #line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->current_tool;
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 9529 "PhotoPage.c"
-		gboolean _tmp4_ = FALSE;
+#line 9523 "PhotoPage.c"
+		gboolean _tmp4_;
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = !_tmp4_;
-#line 9535 "PhotoPage.c"
+#line 9529 "PhotoPage.c"
 	} else {
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = FALSE;
-#line 9539 "PhotoPage.c"
+#line 9533 "PhotoPage.c"
 	}
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 9543 "PhotoPage.c"
-		gboolean _tmp5_ = FALSE;
+#line 9537 "PhotoPage.c"
+		gboolean _tmp5_;
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = !_tmp5_;
-#line 9549 "PhotoPage.c"
+#line 9543 "PhotoPage.c"
 	} else {
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9553 "PhotoPage.c"
+#line 9547 "PhotoPage.c"
 	}
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9557 "PhotoPage.c"
-		gboolean _tmp6_ = FALSE;
+#line 9551 "PhotoPage.c"
+		gboolean _tmp6_;
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_has_photo (self);
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp6_;
-#line 9563 "PhotoPage.c"
+#line 9557 "PhotoPage.c"
 	} else {
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9567 "PhotoPage.c"
+#line 9561 "PhotoPage.c"
 	}
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 1368 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 9573 "PhotoPage.c"
+#line 9567 "PhotoPage.c"
 	}
 #line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
@@ -9584,16 +9578,16 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey
 	result = _tmp8_;
 #line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9583 "PhotoPage.c"
+#line 9577 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKey* event) {
 	EditingHostPage * self;
 	gboolean result = FALSE;
-	EditingToolsEditingTool* _tmp0_ = NULL;
-	GdkEventKey* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	EditingToolsEditingTool* _tmp0_;
+	GdkEventKey* _tmp1_;
+	gboolean _tmp2_;
 #line 1373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9602,7 +9596,7 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe
 	if (_tmp0_ == NULL) {
 #line 1375 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 9601 "PhotoPage.c"
+#line 9595 "PhotoPage.c"
 	}
 #line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
@@ -9612,16 +9606,16 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe
 	result = _tmp2_;
 #line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9611 "PhotoPage.c"
+#line 9605 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey* event) {
 	EditingHostPage * self;
 	gboolean result = FALSE;
-	EditingToolsEditingTool* _tmp0_ = NULL;
-	GdkEventKey* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	EditingToolsEditingTool* _tmp0_;
+	GdkEventKey* _tmp1_;
+	gboolean _tmp2_;
 #line 1380 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9630,7 +9624,7 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey*
 	if (_tmp0_ == NULL) {
 #line 1382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 9629 "PhotoPage.c"
+#line 9623 "PhotoPage.c"
 	}
 #line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
@@ -9640,7 +9634,7 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey*
 	result = _tmp2_;
 #line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9639 "PhotoPage.c"
+#line 9633 "PhotoPage.c"
 }
 
 
@@ -9649,46 +9643,46 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey*
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	EditingToolsEditingTool* _tmp2_ = NULL;
-	GdkEventKey* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	EditingToolsEditingTool* _tmp2_;
+	GdkEventKey* _tmp5_;
+	gboolean _tmp6_;
 #line 1387 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->current_tool;
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ == NULL) {
-#line 9657 "PhotoPage.c"
-		gboolean _tmp3_ = FALSE;
+#line 9651 "PhotoPage.c"
+		gboolean _tmp3_;
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_;
-#line 9663 "PhotoPage.c"
+#line 9657 "PhotoPage.c"
 	} else {
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9667 "PhotoPage.c"
+#line 9661 "PhotoPage.c"
 	}
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9671 "PhotoPage.c"
-		gboolean _tmp4_ = FALSE;
+#line 9665 "PhotoPage.c"
+		gboolean _tmp4_;
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 9677 "PhotoPage.c"
+#line 9671 "PhotoPage.c"
 	} else {
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9681 "PhotoPage.c"
+#line 9675 "PhotoPage.c"
 	}
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 1389 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 9687 "PhotoPage.c"
+#line 9681 "PhotoPage.c"
 	}
 #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
@@ -9698,33 +9692,33 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey*
 	result = _tmp6_;
 #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9697 "PhotoPage.c"
+#line 9691 "PhotoPage.c"
 }
 
 
 static void editing_host_page_swap_in_original (EditingHostPage* self) {
 	GdkPixbuf* original = NULL;
-	GdkPixbuf* _tmp9_ = NULL;
-	GtkScale* _tmp10_ = NULL;
-	gdouble _tmp11_ = 0.0;
-	GdkPixbuf* _tmp12_ = NULL;
-	Photo* _tmp13_ = NULL;
-	Photo* _tmp14_ = NULL;
+	GdkPixbuf* _tmp9_;
+	GtkScale* _tmp10_;
+	gdouble _tmp11_;
+	GdkPixbuf* _tmp12_;
+	Photo* _tmp13_;
+	Photo* _tmp14_;
 	Dimensions _tmp15_ = {0};
 	GError * _inner_error_ = NULL;
 #line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 9713 "PhotoPage.c"
+#line 9707 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
-		Photo* _tmp1_ = NULL;
-		Photo* _tmp2_ = NULL;
-		GdkPixbuf* _tmp3_ = NULL;
-		GdkPixbuf* _tmp4_ = NULL;
-		Photo* _tmp5_ = NULL;
-		Photo* _tmp6_ = NULL;
-		Orientation _tmp7_ = 0;
-		GdkPixbuf* _tmp8_ = NULL;
+		Photo* _tmp1_;
+		Photo* _tmp2_;
+		GdkPixbuf* _tmp3_;
+		GdkPixbuf* _tmp4_;
+		Photo* _tmp5_;
+		Photo* _tmp6_;
+		Orientation _tmp7_;
+		GdkPixbuf* _tmp8_;
 #line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = editing_host_page_get_photo (self);
 #line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9739,8 +9733,8 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		_tmp0_ = _tmp4_;
 #line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9738 "PhotoPage.c"
-			goto __catch249_g_error;
+#line 9732 "PhotoPage.c"
+			goto __catch250_g_error;
 		}
 #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = editing_host_page_get_photo (self);
@@ -9758,10 +9752,10 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		_g_object_unref0 (_tmp6_);
 #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 9757 "PhotoPage.c"
+#line 9751 "PhotoPage.c"
 	}
-	goto __finally249;
-	__catch249_g_error:
+	goto __finally250;
+	__catch250_g_error:
 	{
 		GError* err = NULL;
 #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9774,9 +9768,9 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		_g_object_unref0 (original);
 #line 1400 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9773 "PhotoPage.c"
+#line 9767 "PhotoPage.c"
 	}
-	__finally249:
+	__finally250:
 #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9787,7 +9781,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		g_clear_error (&_inner_error_);
 #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9786 "PhotoPage.c"
+#line 9780 "PhotoPage.c"
 	}
 #line 1404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = single_photo_page_get_unscaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
@@ -9805,7 +9799,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		single_photo_page_save_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 9804 "PhotoPage.c"
+#line 9798 "PhotoPage.c"
 	}
 #line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = original;
@@ -9821,22 +9815,22 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 	_g_object_unref0 (_tmp14_);
 #line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (original);
-#line 9820 "PhotoPage.c"
+#line 9814 "PhotoPage.c"
 }
 
 
 static void editing_host_page_swap_out_original (EditingHostPage* self) {
-	GdkPixbuf* _tmp0_ = NULL;
+	GdkPixbuf* _tmp0_;
 #line 1416 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->swapped;
 #line 1417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 9832 "PhotoPage.c"
-		GdkPixbuf* _tmp1_ = NULL;
-		Photo* _tmp2_ = NULL;
-		Photo* _tmp3_ = NULL;
+#line 9826 "PhotoPage.c"
+		GdkPixbuf* _tmp1_;
+		Photo* _tmp2_;
+		Photo* _tmp3_;
 		Dimensions _tmp4_ = {0};
 #line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->swapped;
@@ -9858,7 +9852,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) {
 		_g_object_unref0 (self->priv->swapped);
 #line 1424 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->swapped = NULL;
-#line 9857 "PhotoPage.c"
+#line 9851 "PhotoPage.c"
 	}
 }
 
@@ -9866,26 +9860,26 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) {
 static gpointer _editing_tools_editing_tool_ref0 (gpointer self) {
 #line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? editing_tools_editing_tool_ref (self) : NULL;
-#line 9865 "PhotoPage.c"
+#line 9859 "PhotoPage.c"
 }
 
 
 static void editing_host_page_activate_tool (EditingHostPage* self, EditingToolsEditingTool* tool) {
 	Dimensions _tmp0_ = {0};
-	GdkPixbuf* _tmp1_ = NULL;
+	GdkPixbuf* _tmp1_;
 	GdkPixbuf* unscaled = NULL;
 	Dimensions max_dim = {0};
-	Photo* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
 	Dimensions _tmp4_ = {0};
-	Dimensions _tmp5_ = {0};
-	GdkPixbuf* _tmp22_ = NULL;
+	Dimensions _tmp5_;
+	GdkPixbuf* _tmp22_;
 	EditingToolsPhotoCanvas* photo_canvas = NULL;
-	EditingHostPageEditingHostCanvas* _tmp25_ = NULL;
-	EditingToolsEditingTool* _tmp26_ = NULL;
-	EditingToolsEditingTool* _tmp27_ = NULL;
-	EditingToolsEditingTool* _tmp28_ = NULL;
-	EditingToolsPhotoCanvas* _tmp29_ = NULL;
+	EditingHostPageEditingHostCanvas* _tmp25_;
+	EditingToolsEditingTool* _tmp26_;
+	EditingToolsEditingTool* _tmp27_;
+	EditingToolsEditingTool* _tmp28_;
+	EditingToolsPhotoCanvas* _tmp29_;
 	GError * _inner_error_ = NULL;
 #line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -9917,20 +9911,20 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 	_g_object_unref0 (_tmp3_);
 #line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	max_dim = _tmp5_;
-#line 9916 "PhotoPage.c"
+#line 9910 "PhotoPage.c"
 	{
 		Dimensions tool_pixbuf_dim = {0};
 		Dimensions _tmp6_ = {0};
 		GdkPixbuf* _tmp7_ = NULL;
-		EditingToolsEditingTool* _tmp8_ = NULL;
+		EditingToolsEditingTool* _tmp8_;
 		Scaling _tmp9_ = {0};
-		Photo* _tmp10_ = NULL;
-		Photo* _tmp11_ = NULL;
+		Photo* _tmp10_;
+		Photo* _tmp11_;
 		Dimensions _tmp12_ = {0};
-		GdkPixbuf* _tmp13_ = NULL;
-		GdkPixbuf* _tmp14_ = NULL;
-		GdkPixbuf* _tmp15_ = NULL;
-		GdkPixbuf* _tmp16_ = NULL;
+		GdkPixbuf* _tmp13_;
+		GdkPixbuf* _tmp14_;
+		GdkPixbuf* _tmp15_;
+		GdkPixbuf* _tmp16_;
 #line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_.width = 0;
 #line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9955,8 +9949,8 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		_tmp7_ = _tmp14_;
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9954 "PhotoPage.c"
-			goto __catch250_g_error;
+#line 9948 "PhotoPage.c"
+			goto __catch251_g_error;
 		}
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp7_;
@@ -9970,26 +9964,26 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		_tmp16_ = unscaled;
 #line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp16_ != NULL) {
-#line 9969 "PhotoPage.c"
-			Dimensions _tmp17_ = {0};
+#line 9963 "PhotoPage.c"
+			Dimensions _tmp17_;
 #line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp17_ = tool_pixbuf_dim;
 #line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			max_dim = _tmp17_;
-#line 9975 "PhotoPage.c"
+#line 9969 "PhotoPage.c"
 		}
 #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 9979 "PhotoPage.c"
+#line 9973 "PhotoPage.c"
 	}
-	goto __finally250;
-	__catch250_g_error:
+	goto __finally251;
+	__catch251_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		GtkToggleToolButton* _tmp20_ = NULL;
-		GtkToggleToolButton* _tmp21_ = NULL;
+		GError* _tmp18_;
+		const gchar* _tmp19_;
+		GtkToggleToolButton* _tmp20_;
+		GtkToggleToolButton* _tmp21_;
 #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
 #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10016,9 +10010,9 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		_g_object_unref0 (unscaled);
 #line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10015 "PhotoPage.c"
+#line 10009 "PhotoPage.c"
 	}
-	__finally250:
+	__finally251:
 #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10029,22 +10023,22 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		g_clear_error (&_inner_error_);
 #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10028 "PhotoPage.c"
+#line 10022 "PhotoPage.c"
 	}
 #line 1461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = unscaled;
 #line 1461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp22_ != NULL) {
-#line 10034 "PhotoPage.c"
-		GdkPixbuf* _tmp23_ = NULL;
-		Dimensions _tmp24_ = {0};
+#line 10028 "PhotoPage.c"
+		GdkPixbuf* _tmp23_;
+		Dimensions _tmp24_;
 #line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = unscaled;
 #line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = max_dim;
 #line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp23_, &_tmp24_, NULL);
-#line 10043 "PhotoPage.c"
+#line 10037 "PhotoPage.c"
 	}
 #line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = editing_host_page_editing_host_canvas_new (self);
@@ -10072,42 +10066,42 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 	_editing_tools_photo_canvas_unref0 (photo_canvas);
 #line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (unscaled);
-#line 10071 "PhotoPage.c"
+#line 10065 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender, gpointer self) {
 #line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_activated ((EditingHostPage*) self);
-#line 10078 "PhotoPage.c"
+#line 10072 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) {
 #line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_deactivated ((EditingHostPage*) self);
-#line 10085 "PhotoPage.c"
+#line 10079 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied (EditingToolsEditingTool* _sender, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement, gpointer self) {
 #line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_applied ((EditingHostPage*) self, command, new_pixbuf, new_max_dim, needs_improvement);
-#line 10092 "PhotoPage.c"
+#line 10086 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender, gpointer self) {
 #line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_cancelled ((EditingHostPage*) self);
-#line 10099 "PhotoPage.c"
+#line 10093 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender, gpointer self) {
 #line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_aborted ((EditingHostPage*) self);
-#line 10106 "PhotoPage.c"
+#line 10100 "PhotoPage.c"
 }
 
 
@@ -10116,36 +10110,36 @@ static gboolean _editing_host_page_update_pixbuf_gsource_func (gpointer self) {
 	result = editing_host_page_update_pixbuf ((EditingHostPage*) self);
 #line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10115 "PhotoPage.c"
+#line 10109 "PhotoPage.c"
 }
 
 
 static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement) {
-	EditingToolsEditingTool* _tmp0_ = NULL;
+	EditingToolsEditingTool* _tmp0_;
 	EditingToolsEditingTool* tool = NULL;
-	EditingToolsEditingTool* _tmp1_ = NULL;
-	EditingToolsEditingTool* _tmp2_ = NULL;
+	EditingToolsEditingTool* _tmp1_;
+	EditingToolsEditingTool* _tmp2_;
 	EditingToolsEditingToolWindow* tool_window = NULL;
-	EditingToolsEditingTool* _tmp3_ = NULL;
-	EditingToolsEditingToolWindow* _tmp4_ = NULL;
+	EditingToolsEditingTool* _tmp3_;
+	EditingToolsEditingToolWindow* _tmp4_;
 	gboolean _tmp5_ = FALSE;
-	EditingToolsEditingToolWindow* _tmp6_ = NULL;
-	EditingToolsEditingTool* _tmp24_ = NULL;
-	EditingToolsEditingTool* _tmp25_ = NULL;
-	guint _tmp26_ = 0U;
-	EditingToolsEditingTool* _tmp27_ = NULL;
-	guint _tmp28_ = 0U;
-	EditingToolsEditingTool* _tmp29_ = NULL;
-	guint _tmp30_ = 0U;
-	EditingToolsEditingTool* _tmp31_ = NULL;
-	guint _tmp32_ = 0U;
-	EditingToolsEditingTool* _tmp33_ = NULL;
-	guint _tmp34_ = 0U;
+	EditingToolsEditingToolWindow* _tmp6_;
+	EditingToolsEditingTool* _tmp24_;
+	EditingToolsEditingTool* _tmp25_;
+	guint _tmp26_;
+	EditingToolsEditingTool* _tmp27_;
+	guint _tmp28_;
+	EditingToolsEditingTool* _tmp29_;
+	guint _tmp30_;
+	EditingToolsEditingTool* _tmp31_;
+	guint _tmp32_;
+	EditingToolsEditingTool* _tmp33_;
+	guint _tmp34_;
 	GdkPixbuf* replacement = NULL;
-	GdkPixbuf* _tmp35_ = NULL;
-	GdkPixbuf* _tmp43_ = NULL;
-	gboolean _tmp46_ = FALSE;
-	Command* _tmp47_ = NULL;
+	GdkPixbuf* _tmp35_;
+	GdkPixbuf* _tmp43_;
+	gboolean _tmp46_;
+	Command* _tmp47_;
 #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10160,7 +10154,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	if (_tmp0_ == NULL) {
 #line 1481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10159 "PhotoPage.c"
+#line 10153 "PhotoPage.c"
 	}
 #line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
@@ -10182,41 +10176,41 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	_tmp6_ = tool_window;
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_ != NULL) {
-#line 10181 "PhotoPage.c"
-		EditingToolsEditingToolWindow* _tmp7_ = NULL;
-		gboolean _tmp8_ = FALSE;
+#line 10175 "PhotoPage.c"
+		EditingToolsEditingToolWindow* _tmp7_;
+		gboolean _tmp8_;
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = tool_window;
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = editing_tools_editing_tool_window_has_user_moved (_tmp7_);
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp8_;
-#line 10190 "PhotoPage.c"
+#line 10184 "PhotoPage.c"
 	} else {
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = FALSE;
-#line 10194 "PhotoPage.c"
+#line 10188 "PhotoPage.c"
 	}
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 10198 "PhotoPage.c"
+#line 10192 "PhotoPage.c"
 		gint last_location_x = 0;
 		gint last_location_y = 0;
-		EditingToolsEditingToolWindow* _tmp9_ = NULL;
+		EditingToolsEditingToolWindow* _tmp9_;
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
-		GeeHashMap* _tmp12_ = NULL;
-		EditingToolsEditingTool* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		gint _tmp17_ = 0;
-		GeeHashMap* _tmp18_ = NULL;
-		EditingToolsEditingTool* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		gint _tmp23_ = 0;
+		GeeHashMap* _tmp12_;
+		EditingToolsEditingTool* _tmp13_;
+		const gchar* _tmp14_;
+		gchar* _tmp15_;
+		gchar* _tmp16_;
+		gint _tmp17_;
+		GeeHashMap* _tmp18_;
+		EditingToolsEditingTool* _tmp19_;
+		const gchar* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
+		gint _tmp23_;
 #line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = tool_window;
 #line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10257,7 +10251,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, (gpointer) ((gintptr) _tmp23_));
 #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp22_);
-#line 10256 "PhotoPage.c"
+#line 10250 "PhotoPage.c"
 	}
 #line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = tool;
@@ -10307,9 +10301,9 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	_tmp35_ = new_pixbuf;
 #line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp35_ != NULL) {
-#line 10306 "PhotoPage.c"
-		GdkPixbuf* _tmp36_ = NULL;
-		GdkPixbuf* _tmp37_ = NULL;
+#line 10300 "PhotoPage.c"
+		GdkPixbuf* _tmp36_;
+		GdkPixbuf* _tmp37_;
 #line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = new_pixbuf;
 #line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10318,17 +10312,17 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		_g_object_unref0 (replacement);
 #line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		replacement = _tmp37_;
-#line 10317 "PhotoPage.c"
+#line 10311 "PhotoPage.c"
 	} else {
-		GdkPixbuf* _tmp38_ = NULL;
+		GdkPixbuf* _tmp38_;
 #line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = self->priv->cancel_editing_pixbuf;
 #line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp38_ != NULL) {
-#line 10324 "PhotoPage.c"
-			GdkPixbuf* _tmp39_ = NULL;
-			GdkPixbuf* _tmp40_ = NULL;
-			GdkPixbuf* _tmp41_ = NULL;
+#line 10318 "PhotoPage.c"
+			GdkPixbuf* _tmp39_;
+			GdkPixbuf* _tmp40_;
+			GdkPixbuf* _tmp41_;
 			Dimensions _tmp42_ = {0};
 #line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp39_ = self->priv->cancel_editing_pixbuf;
@@ -10346,27 +10340,27 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 			*new_max_dim = _tmp42_;
 #line 1518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			needs_improvement = FALSE;
-#line 10345 "PhotoPage.c"
+#line 10339 "PhotoPage.c"
 		} else {
 #line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			needs_improvement = TRUE;
-#line 10349 "PhotoPage.c"
+#line 10343 "PhotoPage.c"
 		}
 	}
 #line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = replacement;
 #line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp43_ != NULL) {
-#line 10356 "PhotoPage.c"
-		GdkPixbuf* _tmp44_ = NULL;
-		Dimensions _tmp45_ = {0};
+#line 10350 "PhotoPage.c"
+		GdkPixbuf* _tmp44_;
+		Dimensions _tmp45_;
 #line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = replacement;
 #line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = *new_max_dim;
 #line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp44_, &_tmp45_, NULL);
-#line 10365 "PhotoPage.c"
+#line 10359 "PhotoPage.c"
 	}
 #line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->cancel_editing_pixbuf);
@@ -10380,16 +10374,16 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		self->priv->pixbuf_dirty = TRUE;
 #line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _editing_host_page_update_pixbuf_gsource_func, g_object_ref (self), g_object_unref);
-#line 10379 "PhotoPage.c"
+#line 10373 "PhotoPage.c"
 	}
 #line 1534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp47_ = command;
 #line 1534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp47_ != NULL) {
-#line 10385 "PhotoPage.c"
-		CommandManager* _tmp48_ = NULL;
-		CommandManager* _tmp49_ = NULL;
-		Command* _tmp50_ = NULL;
+#line 10379 "PhotoPage.c"
+		CommandManager* _tmp48_;
+		CommandManager* _tmp49_;
+		Command* _tmp50_;
 #line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp48_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10400,7 +10394,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		command_manager_execute (_tmp49_, _tmp50_);
 #line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp49_);
-#line 10399 "PhotoPage.c"
+#line 10393 "PhotoPage.c"
 	}
 #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (replacement);
@@ -10408,7 +10402,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	_g_object_unref0 (tool_window);
 #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 10407 "PhotoPage.c"
+#line 10401 "PhotoPage.c"
 }
 
 
@@ -10420,7 +10414,7 @@ static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, G
 	result = FALSE;
 #line 1541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10419 "PhotoPage.c"
+#line 10413 "PhotoPage.c"
 }
 
 
@@ -10429,30 +10423,30 @@ gboolean editing_host_page_on_double_click (EditingHostPage* self, GdkEventButto
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->on_double_click (self, event);
-#line 10428 "PhotoPage.c"
+#line 10422 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton* event) {
 	EditingHostPage * self;
 	gboolean result = FALSE;
-	GdkEventButton* _tmp0_ = NULL;
-	GdkEventType _tmp1_ = 0;
+	GdkEventButton* _tmp0_;
+	GdkEventType _tmp1_;
 	gint x = 0;
-	GdkEventButton* _tmp6_ = NULL;
-	gdouble _tmp7_ = 0.0;
+	GdkEventButton* _tmp6_;
+	gdouble _tmp7_;
 	gint y = 0;
-	GdkEventButton* _tmp8_ = NULL;
-	gdouble _tmp9_ = 0.0;
+	GdkEventButton* _tmp8_;
+	gdouble _tmp9_;
 	gboolean _tmp10_ = FALSE;
-	EditingToolsEditingTool* _tmp11_ = NULL;
-	EditingToolsEditingTool* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	gboolean _tmp21_ = FALSE;
-	EditingToolsEditingTool* _tmp22_ = NULL;
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
+	EditingToolsEditingTool* _tmp11_;
+	EditingToolsEditingTool* _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
+	gboolean _tmp21_;
+	EditingToolsEditingTool* _tmp22_;
+	gint _tmp23_;
+	gint _tmp24_;
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10463,33 +10457,33 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 	_tmp1_ = _tmp0_->type;
 #line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == GDK_2BUTTON_PRESS) {
-#line 10462 "PhotoPage.c"
+#line 10456 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
-		EditingToolsEditingTool* _tmp3_ = NULL;
+		EditingToolsEditingTool* _tmp3_;
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->current_tool;
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_ == NULL) {
-#line 10469 "PhotoPage.c"
-			GdkEventButton* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 10463 "PhotoPage.c"
+			GdkEventButton* _tmp4_;
+			gboolean _tmp5_;
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp4_ = event;
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp5_ = editing_host_page_on_double_click (self, _tmp4_);
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = _tmp5_;
-#line 10478 "PhotoPage.c"
+#line 10472 "PhotoPage.c"
 		} else {
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = FALSE;
-#line 10482 "PhotoPage.c"
+#line 10476 "PhotoPage.c"
 		}
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = _tmp2_;
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10488 "PhotoPage.c"
+#line 10482 "PhotoPage.c"
 	}
 #line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = event;
@@ -10507,28 +10501,28 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 	_tmp11_ = self->priv->current_tool;
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 10506 "PhotoPage.c"
-		GtkScale* _tmp12_ = NULL;
-		gdouble _tmp13_ = 0.0;
+#line 10500 "PhotoPage.c"
+		GtkScale* _tmp12_;
+		gdouble _tmp13_;
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = self->priv->zoom_slider;
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_range_get_type (), GtkRange));
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp13_ != 0.0;
-#line 10515 "PhotoPage.c"
+#line 10509 "PhotoPage.c"
 	} else {
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = FALSE;
-#line 10519 "PhotoPage.c"
+#line 10513 "PhotoPage.c"
 	}
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_) {
-#line 10523 "PhotoPage.c"
-		GdkEventButton* _tmp14_ = NULL;
-		gdouble _tmp15_ = 0.0;
-		GdkEventButton* _tmp16_ = NULL;
-		gdouble _tmp17_ = 0.0;
+#line 10517 "PhotoPage.c"
+		GdkEventButton* _tmp14_;
+		gdouble _tmp15_;
+		GdkEventButton* _tmp16_;
+		gdouble _tmp17_;
 #line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = event;
 #line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10549,7 +10543,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 		result = TRUE;
 #line 1561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10548 "PhotoPage.c"
+#line 10542 "PhotoPage.c"
 	}
 #line 1565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = self->priv->current_tool;
@@ -10559,7 +10553,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 		result = FALSE;
 #line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10558 "PhotoPage.c"
+#line 10552 "PhotoPage.c"
 	}
 #line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = x;
@@ -10573,7 +10567,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 		result = TRUE;
 #line 1572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10572 "PhotoPage.c"
+#line 10566 "PhotoPage.c"
 	}
 #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->current_tool;
@@ -10587,24 +10581,24 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 	result = TRUE;
 #line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10586 "PhotoPage.c"
+#line 10580 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventButton* event) {
 	EditingHostPage * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	EditingToolsEditingTool* _tmp21_ = NULL;
-	EditingToolsEditingTool* _tmp22_ = NULL;
-	GdkEventButton* _tmp23_ = NULL;
-	gdouble _tmp24_ = 0.0;
-	GdkEventButton* _tmp25_ = NULL;
-	gdouble _tmp26_ = 0.0;
-	EditingToolsEditingTool* _tmp27_ = NULL;
-	EditingToolsEditingToolWindow* _tmp28_ = NULL;
-	EditingToolsEditingToolWindow* _tmp29_ = NULL;
-	gboolean _tmp30_ = FALSE;
+	gboolean _tmp0_;
+	EditingToolsEditingTool* _tmp21_;
+	EditingToolsEditingTool* _tmp22_;
+	GdkEventButton* _tmp23_;
+	gdouble _tmp24_;
+	GdkEventButton* _tmp25_;
+	gdouble _tmp26_;
+	EditingToolsEditingTool* _tmp27_;
+	EditingToolsEditingToolWindow* _tmp28_;
+	EditingToolsEditingToolWindow* _tmp29_;
+	gboolean _tmp30_;
 #line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10613,31 +10607,31 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 	_tmp0_ = self->priv->is_pan_in_progress;
 #line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 10612 "PhotoPage.c"
+#line 10606 "PhotoPage.c"
 		GdkPoint viewport_center = {0};
 		ZoomState _tmp1_ = {0};
 		GdkPoint _tmp2_ = {0};
 		gint delta_x = 0;
-		GdkEventButton* _tmp3_ = NULL;
-		gdouble _tmp4_ = 0.0;
-		GdkPoint _tmp5_ = {0};
-		gint _tmp6_ = 0;
+		GdkEventButton* _tmp3_;
+		gdouble _tmp4_;
+		GdkPoint _tmp5_;
+		gint _tmp6_;
 		gint delta_y = 0;
-		GdkEventButton* _tmp7_ = NULL;
-		gdouble _tmp8_ = 0.0;
-		GdkPoint _tmp9_ = {0};
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
+		GdkEventButton* _tmp7_;
+		gdouble _tmp8_;
+		GdkPoint _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
+		gint _tmp14_;
 		ZoomState zoom_state = {0};
 		ZoomState _tmp15_ = {0};
-		GdkPoint _tmp16_ = {0};
-		ZoomState _tmp17_ = {0};
-		ZoomBuffer* _tmp18_ = NULL;
-		ZoomBuffer* _tmp19_ = NULL;
-		ZoomState _tmp20_ = {0};
+		GdkPoint _tmp16_;
+		ZoomState _tmp17_;
+		ZoomBuffer* _tmp18_;
+		ZoomBuffer* _tmp19_;
+		ZoomState _tmp20_;
 #line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
 #line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10700,7 +10694,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 		self->priv->is_pan_in_progress = FALSE;
 #line 1593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 10699 "PhotoPage.c"
+#line 10693 "PhotoPage.c"
 	}
 #line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = self->priv->current_tool;
@@ -10710,7 +10704,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 		result = FALSE;
 #line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10709 "PhotoPage.c"
+#line 10703 "PhotoPage.c"
 	}
 #line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->current_tool;
@@ -10736,10 +10730,10 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 	_g_object_unref0 (_tmp29_);
 #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_) {
-#line 10735 "PhotoPage.c"
-		EditingToolsEditingTool* _tmp31_ = NULL;
-		EditingToolsEditingToolWindow* _tmp32_ = NULL;
-		EditingToolsEditingToolWindow* _tmp33_ = NULL;
+#line 10729 "PhotoPage.c"
+		EditingToolsEditingTool* _tmp31_;
+		EditingToolsEditingToolWindow* _tmp32_;
+		EditingToolsEditingToolWindow* _tmp33_;
 #line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = self->priv->current_tool;
 #line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10750,21 +10744,21 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow));
 #line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp33_);
-#line 10749 "PhotoPage.c"
+#line 10743 "PhotoPage.c"
 	}
 #line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10755 "PhotoPage.c"
+#line 10749 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_on_right_click (Page* base, GdkEventButton* event) {
 	EditingHostPage * self;
 	gboolean result = FALSE;
-	GdkEventButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GdkEventButton* _tmp0_;
+	gboolean _tmp1_;
 #line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10777,7 +10771,7 @@ static gboolean editing_host_page_real_on_right_click (Page* base, GdkEventButto
 	result = _tmp1_;
 #line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10776 "PhotoPage.c"
+#line 10770 "PhotoPage.c"
 }
 
 
@@ -10786,26 +10780,26 @@ static gboolean _editing_host_page_on_fetch_original_gsource_func (gpointer self
 	result = editing_host_page_on_fetch_original ((EditingHostPage*) self);
 #line 1622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10785 "PhotoPage.c"
+#line 10779 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap* map) {
-	GeeMap* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	Photo* _tmp5_ = NULL;
-	Photo* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	gboolean _tmp8_ = FALSE;
-	ViewCollection* _tmp9_ = NULL;
-	ViewCollection* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	ViewCollection* _tmp12_ = NULL;
-	ViewCollection* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
+	GeeMap* _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	Photo* _tmp5_;
+	Photo* _tmp6_;
+	gboolean _tmp7_;
+	gboolean _tmp8_;
+	ViewCollection* _tmp9_;
+	ViewCollection* _tmp10_;
+	gint _tmp11_;
+	ViewCollection* _tmp12_;
+	ViewCollection* _tmp13_;
+	gint _tmp14_;
 #line 1613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10826,7 +10820,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
 	if (_tmp4_) {
 #line 1615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10825 "PhotoPage.c"
+#line 10819 "PhotoPage.c"
 	}
 #line 1617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = TRUE;
@@ -10844,7 +10838,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
 	if (_tmp8_) {
 #line 1622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _editing_host_page_on_fetch_original_gsource_func, g_object_ref (self), g_object_unref);
-#line 10843 "PhotoPage.c"
+#line 10837 "PhotoPage.c"
 	}
 #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -10864,7 +10858,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
 	_data_collection_unref0 (_tmp13_);
 #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp10_);
-#line 10863 "PhotoPage.c"
+#line 10857 "PhotoPage.c"
 }
 
 
@@ -10873,23 +10867,23 @@ static void editing_host_page_on_view_contents_ordering_altered (EditingHostPage
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, "on_view_contents_ordering_altered");
-#line 10872 "PhotoPage.c"
+#line 10866 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (self);
 #line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 10885 "PhotoPage.c"
-		PixbufCache* _tmp1_ = NULL;
-		Photo* _tmp2_ = NULL;
-		Photo* _tmp3_ = NULL;
+#line 10879 "PhotoPage.c"
+		PixbufCache* _tmp1_;
+		Photo* _tmp2_;
+		Photo* _tmp3_;
 #line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->master_cache;
 #line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10900,13 +10894,13 @@ static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) {
 		pixbuf_cache_prefetch (_tmp1_, _tmp3_, BACKGROUND_JOB_JOB_PRIORITY_LOW, FALSE);
 #line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 10899 "PhotoPage.c"
+#line 10893 "PhotoPage.c"
 	}
 #line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10905 "PhotoPage.c"
+#line 10899 "PhotoPage.c"
 }
 
 
@@ -10915,16 +10909,16 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) {
 	Dimensions content_dim = {0};
 	Dimensions _tmp0_ = {0};
 	ZoomState _tmp1_ = {0};
-	gint _tmp2_ = 0;
+	gint _tmp2_;
 	ZoomState _tmp3_ = {0};
-	gint _tmp4_ = 0;
+	gint _tmp4_;
 	Dimensions canvas_dim = {0};
 	Dimensions _tmp5_ = {0};
 	gboolean _tmp6_ = FALSE;
-	Dimensions _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	Dimensions _tmp9_ = {0};
-	gint _tmp10_ = 0;
+	Dimensions _tmp7_;
+	gint _tmp8_;
+	Dimensions _tmp9_;
+	gint _tmp10_;
 #line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10957,11 +10951,11 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) {
 	_tmp10_ = _tmp9_.width;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_ >= _tmp10_) {
-#line 10956 "PhotoPage.c"
-		Dimensions _tmp11_ = {0};
-		gint _tmp12_ = 0;
-		Dimensions _tmp13_ = {0};
-		gint _tmp14_ = 0;
+#line 10950 "PhotoPage.c"
+		Dimensions _tmp11_;
+		gint _tmp12_;
+		Dimensions _tmp13_;
+		gint _tmp14_;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = canvas_dim;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10972,22 +10966,22 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) {
 		_tmp14_ = _tmp13_.height;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp12_ >= _tmp14_;
-#line 10971 "PhotoPage.c"
+#line 10965 "PhotoPage.c"
 	} else {
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = FALSE;
-#line 10975 "PhotoPage.c"
+#line 10969 "PhotoPage.c"
 	}
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = !_tmp6_;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10981 "PhotoPage.c"
+#line 10975 "PhotoPage.c"
 }
 
 
 static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10996,11 +10990,11 @@ static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* s
 	if (_tmp0_) {
 #line 1651 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_FLEUR);
-#line 10995 "PhotoPage.c"
+#line 10989 "PhotoPage.c"
 	} else {
 #line 1653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR);
-#line 10999 "PhotoPage.c"
+#line 10993 "PhotoPage.c"
 	}
 }
 
@@ -11008,13 +11002,13 @@ static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* s
 static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) {
 	EditingHostPage * self;
 	gboolean result = FALSE;
-	EditingToolsEditingTool* _tmp0_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	GdkEventMotion* _tmp24_ = NULL;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	GdkModifierType _tmp27_ = 0;
-	gboolean _tmp28_ = FALSE;
+	EditingToolsEditingTool* _tmp0_;
+	gboolean _tmp6_;
+	GdkEventMotion* _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
+	GdkModifierType _tmp27_;
+	gboolean _tmp28_;
 #line 1657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11023,12 +11017,12 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 	_tmp0_ = self->priv->current_tool;
 #line 1658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11022 "PhotoPage.c"
-		EditingToolsEditingTool* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
-		GdkModifierType _tmp4_ = 0;
-		GdkEventMotion* _tmp5_ = NULL;
+#line 11016 "PhotoPage.c"
+		EditingToolsEditingTool* _tmp1_;
+		gint _tmp2_;
+		gint _tmp3_;
+		GdkModifierType _tmp4_;
+		GdkEventMotion* _tmp5_;
 #line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
 #line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11047,7 +11041,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 		result = TRUE;
 #line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11046 "PhotoPage.c"
+#line 11040 "PhotoPage.c"
 	}
 #line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
@@ -11055,28 +11049,28 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 	_tmp6_ = self->priv->is_pan_in_progress;
 #line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 11054 "PhotoPage.c"
+#line 11048 "PhotoPage.c"
 		gint delta_x = 0;
-		GdkEventMotion* _tmp7_ = NULL;
-		gdouble _tmp8_ = 0.0;
-		GdkPoint _tmp9_ = {0};
-		gint _tmp10_ = 0;
+		GdkEventMotion* _tmp7_;
+		gdouble _tmp8_;
+		GdkPoint _tmp9_;
+		gint _tmp10_;
 		gint delta_y = 0;
-		GdkEventMotion* _tmp11_ = NULL;
-		gdouble _tmp12_ = 0.0;
-		GdkPoint _tmp13_ = {0};
-		gint _tmp14_ = 0;
+		GdkEventMotion* _tmp11_;
+		gdouble _tmp12_;
+		GdkPoint _tmp13_;
+		gint _tmp14_;
 		GdkPoint viewport_center = {0};
 		ZoomState _tmp15_ = {0};
 		GdkPoint _tmp16_ = {0};
-		gint _tmp17_ = 0;
-		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
-		gint _tmp20_ = 0;
+		gint _tmp17_;
+		gint _tmp18_;
+		gint _tmp19_;
+		gint _tmp20_;
 		ZoomState zoom_state = {0};
 		ZoomState _tmp21_ = {0};
-		GdkPoint _tmp22_ = {0};
-		ZoomState _tmp23_ = {0};
+		GdkPoint _tmp22_;
+		ZoomState _tmp23_;
 #line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = event;
 #line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11129,7 +11123,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 		result = TRUE;
 #line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11128 "PhotoPage.c"
+#line 11122 "PhotoPage.c"
 	}
 #line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = event;
@@ -11145,24 +11139,24 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 	result = _tmp28_;
 #line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11144 "PhotoPage.c"
+#line 11138 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
 	EditingHostPage * self;
 	gboolean result = FALSE;
-	EditingToolsEditingTool* _tmp0_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	EditingToolsEditingTool* _tmp0_;
+	gboolean _tmp3_;
 #line 1686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
 #line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11159 "PhotoPage.c"
-		EditingToolsEditingTool* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+#line 11153 "PhotoPage.c"
+		EditingToolsEditingTool* _tmp1_;
+		gboolean _tmp2_;
 #line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
 #line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11171,7 +11165,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
 		result = _tmp2_;
 #line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11170 "PhotoPage.c"
+#line 11164 "PhotoPage.c"
 	}
 #line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = PAGE_CLASS (editing_host_page_parent_class)->on_leave_notify_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page));
@@ -11179,24 +11173,24 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
 	result = _tmp3_;
 #line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11178 "PhotoPage.c"
+#line 11172 "PhotoPage.c"
 }
 
 
 static void editing_host_page_track_tool_window (EditingHostPage* self) {
-	EditingToolsEditingTool* _tmp0_ = NULL;
+	EditingToolsEditingTool* _tmp0_;
 #line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
 #line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11190 "PhotoPage.c"
+#line 11184 "PhotoPage.c"
 		EditingToolsEditingToolWindow* tool_window = NULL;
-		EditingToolsEditingTool* _tmp1_ = NULL;
-		EditingToolsEditingToolWindow* _tmp2_ = NULL;
+		EditingToolsEditingTool* _tmp1_;
+		EditingToolsEditingToolWindow* _tmp2_;
 		gboolean _tmp3_ = FALSE;
-		EditingToolsEditingToolWindow* _tmp4_ = NULL;
+		EditingToolsEditingToolWindow* _tmp4_;
 #line 1696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
 #line 1696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11207,37 +11201,37 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
 		_tmp4_ = tool_window;
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp4_ != NULL) {
-#line 11206 "PhotoPage.c"
-			EditingToolsEditingToolWindow* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+#line 11200 "PhotoPage.c"
+			EditingToolsEditingToolWindow* _tmp5_;
+			gboolean _tmp6_;
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp5_ = tool_window;
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = editing_tools_editing_tool_window_has_user_moved (_tmp5_);
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = !_tmp6_;
-#line 11215 "PhotoPage.c"
+#line 11209 "PhotoPage.c"
 		} else {
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = FALSE;
-#line 11219 "PhotoPage.c"
+#line 11213 "PhotoPage.c"
 		}
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_) {
 #line 1698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_place_tool_window (self);
-#line 11225 "PhotoPage.c"
+#line 11219 "PhotoPage.c"
 		}
 #line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (tool_window);
-#line 11229 "PhotoPage.c"
+#line 11223 "PhotoPage.c"
 	}
 }
 
 
 static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect) {
 	EditingHostPage * self;
-	GdkRectangle _tmp0_ = {0};
+	GdkRectangle _tmp0_;
 #line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11248,14 +11242,14 @@ static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect) {
 	_tmp0_ = *rect;
 #line 1705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->on_move (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_);
-#line 11247 "PhotoPage.c"
+#line 11241 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* rect) {
 	EditingHostPage * self;
-	GeeHashMap* _tmp0_ = NULL;
-	GdkRectangle _tmp1_ = {0};
+	GeeHashMap* _tmp0_;
+	GdkRectangle _tmp1_;
 #line 1708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11268,7 +11262,7 @@ static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* r
 	_tmp1_ = *rect;
 #line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->on_move_finished (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp1_);
-#line 11267 "PhotoPage.c"
+#line 11261 "PhotoPage.c"
 }
 
 
@@ -11278,10 +11272,10 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 	ZoomState _tmp0_ = {0};
 	GdkPoint viewport_center = {0};
 	GdkPoint _tmp1_ = {0};
-	GdkEventKey* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	GdkEventKey* _tmp2_;
+	guint _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
 	GQuark _tmp7_ = 0U;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label0 = 0;
@@ -11307,11 +11301,11 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 	static GQuark _tmp6_label10 = 0;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label11 = 0;
-#line 11306 "PhotoPage.c"
+#line 11300 "PhotoPage.c"
 	ZoomState new_zoom_state = {0};
-	ZoomState _tmp12_ = {0};
-	GdkPoint _tmp13_ = {0};
-	ZoomState _tmp14_ = {0};
+	ZoomState _tmp12_;
+	GdkPoint _tmp13_;
+	ZoomState _tmp14_;
 #line 1714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11338,78 +11332,78 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 	if (((_tmp7_ == ((0 != _tmp6_label0) ? _tmp6_label0 : (_tmp6_label0 = g_quark_from_static_string ("Left")))) || (_tmp7_ == ((0 != _tmp6_label1) ? _tmp6_label1 : (_tmp6_label1 = g_quark_from_static_string ("KP_Left"))))) || (_tmp7_ == ((0 != _tmp6_label2) ? _tmp6_label2 : (_tmp6_label2 = g_quark_from_static_string ("KP_4"))))) {
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11337 "PhotoPage.c"
+#line 11331 "PhotoPage.c"
 			default:
 			{
-				gint _tmp8_ = 0;
+				gint _tmp8_;
 #line 1722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp8_ = viewport_center.x;
 #line 1722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				viewport_center.x = _tmp8_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11347 "PhotoPage.c"
+#line 11341 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp7_ == ((0 != _tmp6_label3) ? _tmp6_label3 : (_tmp6_label3 = g_quark_from_static_string ("Right")))) || (_tmp7_ == ((0 != _tmp6_label4) ? _tmp6_label4 : (_tmp6_label4 = g_quark_from_static_string ("KP_Right"))))) || (_tmp7_ == ((0 != _tmp6_label5) ? _tmp6_label5 : (_tmp6_label5 = g_quark_from_static_string ("KP_6"))))) {
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11353 "PhotoPage.c"
+#line 11347 "PhotoPage.c"
 			default:
 			{
-				gint _tmp9_ = 0;
+				gint _tmp9_;
 #line 1728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp9_ = viewport_center.x;
 #line 1728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				viewport_center.x = _tmp9_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11363 "PhotoPage.c"
+#line 11357 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp7_ == ((0 != _tmp6_label6) ? _tmp6_label6 : (_tmp6_label6 = g_quark_from_static_string ("Down")))) || (_tmp7_ == ((0 != _tmp6_label7) ? _tmp6_label7 : (_tmp6_label7 = g_quark_from_static_string ("KP_Down"))))) || (_tmp7_ == ((0 != _tmp6_label8) ? _tmp6_label8 : (_tmp6_label8 = g_quark_from_static_string ("KP_2"))))) {
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11369 "PhotoPage.c"
+#line 11363 "PhotoPage.c"
 			default:
 			{
-				gint _tmp10_ = 0;
+				gint _tmp10_;
 #line 1734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp10_ = viewport_center.y;
 #line 1734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				viewport_center.y = _tmp10_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11379 "PhotoPage.c"
+#line 11373 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp7_ == ((0 != _tmp6_label9) ? _tmp6_label9 : (_tmp6_label9 = g_quark_from_static_string ("Up")))) || (_tmp7_ == ((0 != _tmp6_label10) ? _tmp6_label10 : (_tmp6_label10 = g_quark_from_static_string ("KP_Up"))))) || (_tmp7_ == ((0 != _tmp6_label11) ? _tmp6_label11 : (_tmp6_label11 = g_quark_from_static_string ("KP_8"))))) {
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11385 "PhotoPage.c"
+#line 11379 "PhotoPage.c"
 			default:
 			{
-				gint _tmp11_ = 0;
+				gint _tmp11_;
 #line 1740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp11_ = viewport_center.y;
 #line 1740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				viewport_center.y = _tmp11_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11395 "PhotoPage.c"
+#line 11389 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11401 "PhotoPage.c"
+#line 11395 "PhotoPage.c"
 			default:
 			{
 #line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = FALSE;
 #line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 11408 "PhotoPage.c"
+#line 11402 "PhotoPage.c"
 			}
 		}
 	}
@@ -11429,22 +11423,22 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 	result = TRUE;
 #line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11428 "PhotoPage.c"
+#line 11422 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
 	EditingHostPage * self;
 	gboolean result = FALSE;
-	EditingToolsEditingTool* _tmp0_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	GdkEventKey* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	EditingToolsEditingTool* _tmp0_;
+	gboolean _tmp4_;
+	GdkEventKey* _tmp7_;
+	gboolean _tmp8_;
 	gboolean handled = FALSE;
-	GdkEventKey* _tmp9_ = NULL;
-	guint _tmp10_ = 0U;
-	const gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
+	GdkEventKey* _tmp9_;
+	guint _tmp10_;
+	const gchar* _tmp11_;
+	const gchar* _tmp12_;
 	GQuark _tmp14_ = 0U;
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label0 = 0;
@@ -11462,8 +11456,8 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 	static GQuark _tmp13_label6 = 0;
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label7 = 0;
-#line 11461 "PhotoPage.c"
-	gboolean _tmp15_ = FALSE;
+#line 11455 "PhotoPage.c"
+	gboolean _tmp15_;
 	gboolean _tmp16_ = FALSE;
 #line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
@@ -11473,10 +11467,10 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 	_tmp0_ = self->priv->current_tool;
 #line 1756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11472 "PhotoPage.c"
-		EditingToolsEditingTool* _tmp1_ = NULL;
-		GdkEventKey* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+#line 11466 "PhotoPage.c"
+		EditingToolsEditingTool* _tmp1_;
+		GdkEventKey* _tmp2_;
+		gboolean _tmp3_;
 #line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
 #line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11489,16 +11483,16 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 			result = TRUE;
 #line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 11488 "PhotoPage.c"
+#line 11482 "PhotoPage.c"
 		}
 	}
 #line 1762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_is_panning_possible (self);
 #line 1762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 11495 "PhotoPage.c"
-		GdkEventKey* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+#line 11489 "PhotoPage.c"
+		GdkEventKey* _tmp5_;
+		gboolean _tmp6_;
 #line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = event;
 #line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11509,7 +11503,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 			result = TRUE;
 #line 1764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 11508 "PhotoPage.c"
+#line 11502 "PhotoPage.c"
 		}
 	}
 #line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11522,7 +11516,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 		result = TRUE;
 #line 1771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11521 "PhotoPage.c"
+#line 11515 "PhotoPage.c"
 	}
 #line 1773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	handled = TRUE;
@@ -11540,51 +11534,51 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 	if ((_tmp14_ == ((0 != _tmp13_label0) ? _tmp13_label0 : (_tmp13_label0 = g_quark_from_static_string ("Down")))) || (_tmp14_ == ((0 != _tmp13_label1) ? _tmp13_label1 : (_tmp13_label1 = g_quark_from_static_string ("KP_Down"))))) {
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11539 "PhotoPage.c"
+#line 11533 "PhotoPage.c"
 			default:
 			{
 #line 1780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11544 "PhotoPage.c"
+#line 11538 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp14_ == ((0 != _tmp13_label2) ? _tmp13_label2 : (_tmp13_label2 = g_quark_from_static_string ("equal")))) || (_tmp14_ == ((0 != _tmp13_label3) ? _tmp13_label3 : (_tmp13_label3 = g_quark_from_static_string ("plus"))))) || (_tmp14_ == ((0 != _tmp13_label4) ? _tmp13_label4 : (_tmp13_label4 = g_quark_from_static_string ("KP_Add"))))) {
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11550 "PhotoPage.c"
+#line 11544 "PhotoPage.c"
 			default:
 			{
 #line 1785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize");
 #line 1786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11557 "PhotoPage.c"
+#line 11551 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp14_ == ((0 != _tmp13_label5) ? _tmp13_label5 : (_tmp13_label5 = g_quark_from_static_string ("minus")))) || (_tmp14_ == ((0 != _tmp13_label6) ? _tmp13_label6 : (_tmp13_label6 = g_quark_from_static_string ("underscore"))))) || (_tmp14_ == ((0 != _tmp13_label7) ? _tmp13_label7 : (_tmp13_label7 = g_quark_from_static_string ("KP_Subtract"))))) {
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11563 "PhotoPage.c"
+#line 11557 "PhotoPage.c"
 			default:
 			{
 #line 1792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize");
 #line 1793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11570 "PhotoPage.c"
+#line 11564 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11576 "PhotoPage.c"
+#line 11570 "PhotoPage.c"
 			default:
 			{
 #line 1796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				handled = FALSE;
 #line 1797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11583 "PhotoPage.c"
+#line 11577 "PhotoPage.c"
 			}
 		}
 	}
@@ -11596,36 +11590,36 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 		result = TRUE;
 #line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11595 "PhotoPage.c"
+#line 11589 "PhotoPage.c"
 	}
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event != NULL) {
-#line 11599 "PhotoPage.c"
-		GdkEventKey* _tmp17_ = NULL;
-		gboolean _tmp18_ = FALSE;
+#line 11593 "PhotoPage.c"
+		GdkEventKey* _tmp17_;
+		gboolean _tmp18_;
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = event;
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget), _tmp17_);
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp18_;
-#line 11608 "PhotoPage.c"
+#line 11602 "PhotoPage.c"
 	} else {
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = TRUE;
-#line 11612 "PhotoPage.c"
+#line 11606 "PhotoPage.c"
 	}
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp16_;
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11618 "PhotoPage.c"
+#line 11612 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t* default_ctx, Dimensions* dim) {
 	EditingHostPage * self;
-	EditingToolsEditingTool* _tmp0_ = NULL;
+	EditingToolsEditingTool* _tmp0_;
 #line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11636,11 +11630,11 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t*
 	_tmp0_ = self->priv->current_tool;
 #line 1808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11635 "PhotoPage.c"
-		EditingToolsEditingTool* _tmp1_ = NULL;
-		EditingToolsPhotoCanvas* _tmp2_ = NULL;
-		cairo_t* _tmp3_ = NULL;
-		Dimensions _tmp4_ = {0};
+#line 11629 "PhotoPage.c"
+		EditingToolsEditingTool* _tmp1_;
+		EditingToolsPhotoCanvas* _tmp2_;
+		cairo_t* _tmp3_;
+		Dimensions _tmp4_;
 #line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
 #line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11651,7 +11645,7 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t*
 		_tmp4_ = *dim;
 #line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_tools_photo_canvas_set_surface (_tmp2_, _tmp3_, &_tmp4_);
-#line 11650 "PhotoPage.c"
+#line 11644 "PhotoPage.c"
 	}
 }
 
@@ -11659,7 +11653,7 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t*
 static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) {
 	EditingHostPage * self;
 	gboolean _tmp0_ = FALSE;
-	EditingToolsEditingTool* _tmp1_ = NULL;
+	EditingToolsEditingTool* _tmp1_;
 #line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11670,25 +11664,25 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix
 	_tmp1_ = self->priv->current_tool;
 #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ != NULL) {
-#line 11669 "PhotoPage.c"
-		SinglePhotoPageUpdateReason _tmp2_ = 0;
+#line 11663 "PhotoPage.c"
+		SinglePhotoPageUpdateReason _tmp2_;
 #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = reason;
 #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_ != SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT;
-#line 11675 "PhotoPage.c"
+#line 11669 "PhotoPage.c"
 	} else {
 #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 11679 "PhotoPage.c"
+#line 11673 "PhotoPage.c"
 	}
 #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 11683 "PhotoPage.c"
-		EditingToolsEditingTool* _tmp3_ = NULL;
-		EditingToolsPhotoCanvas* _tmp4_ = NULL;
-		Dimensions _tmp5_ = {0};
-		GdkPixbuf* _tmp6_ = NULL;
+#line 11677 "PhotoPage.c"
+		EditingToolsEditingTool* _tmp3_;
+		EditingToolsPhotoCanvas* _tmp4_;
+		Dimensions _tmp5_;
+		GdkPixbuf* _tmp6_;
 		GdkRectangle _tmp7_ = {0};
 #line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->current_tool;
@@ -11706,7 +11700,7 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix
 		_g_object_unref0 (self->priv->cancel_editing_pixbuf);
 #line 1818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->cancel_editing_pixbuf = NULL;
-#line 11705 "PhotoPage.c"
+#line 11699 "PhotoPage.c"
 	}
 }
 
@@ -11717,7 +11711,7 @@ static GdkPixbuf* editing_host_page_real_get_bottom_left_trinket (EditingHostPag
 	result = NULL;
 #line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11716 "PhotoPage.c"
+#line 11710 "PhotoPage.c"
 }
 
 
@@ -11726,7 +11720,7 @@ GdkPixbuf* editing_host_page_get_bottom_left_trinket (EditingHostPage* self, gin
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_left_trinket (self, scale);
-#line 11725 "PhotoPage.c"
+#line 11719 "PhotoPage.c"
 }
 
 
@@ -11736,7 +11730,7 @@ static GdkPixbuf* editing_host_page_real_get_top_left_trinket (EditingHostPage*
 	result = NULL;
 #line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11735 "PhotoPage.c"
+#line 11729 "PhotoPage.c"
 }
 
 
@@ -11745,7 +11739,7 @@ GdkPixbuf* editing_host_page_get_top_left_trinket (EditingHostPage* self, gint s
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_left_trinket (self, scale);
-#line 11744 "PhotoPage.c"
+#line 11738 "PhotoPage.c"
 }
 
 
@@ -11755,7 +11749,7 @@ static GdkPixbuf* editing_host_page_real_get_top_right_trinket (EditingHostPage*
 	result = NULL;
 #line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11754 "PhotoPage.c"
+#line 11748 "PhotoPage.c"
 }
 
 
@@ -11764,7 +11758,7 @@ GdkPixbuf* editing_host_page_get_top_right_trinket (EditingHostPage* self, gint
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_right_trinket (self, scale);
-#line 11763 "PhotoPage.c"
+#line 11757 "PhotoPage.c"
 }
 
 
@@ -11774,7 +11768,7 @@ static GdkPixbuf* editing_host_page_real_get_bottom_right_trinket (EditingHostPa
 	result = NULL;
 #line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11773 "PhotoPage.c"
+#line 11767 "PhotoPage.c"
 }
 
 
@@ -11783,30 +11777,30 @@ GdkPixbuf* editing_host_page_get_bottom_right_trinket (EditingHostPage* self, gi
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_right_trinket (self, scale);
-#line 11782 "PhotoPage.c"
+#line 11776 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dimensions* ctx_dim) {
 	EditingHostPage * self;
-	EditingToolsEditingTool* _tmp0_ = NULL;
+	EditingToolsEditingTool* _tmp0_;
 	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	cairo_t* _tmp23_ = NULL;
-	Dimensions _tmp24_ = {0};
-	ZoomState _tmp25_ = {0};
-	gboolean _tmp26_ = FALSE;
+	gboolean _tmp4_;
+	cairo_t* _tmp22_;
+	Dimensions _tmp23_;
+	ZoomState _tmp24_ = {0};
+	gboolean _tmp25_;
 	GdkRectangle scaled_rect = {0};
-	GdkRectangle _tmp27_ = {0};
+	GdkRectangle _tmp26_ = {0};
 	GdkPixbuf* trinket = NULL;
-	GdkPixbuf* _tmp28_ = NULL;
-	GdkPixbuf* _tmp29_ = NULL;
-	GdkPixbuf* _tmp53_ = NULL;
-	GdkPixbuf* _tmp54_ = NULL;
-	GdkPixbuf* _tmp73_ = NULL;
-	GdkPixbuf* _tmp74_ = NULL;
-	GdkPixbuf* _tmp98_ = NULL;
-	GdkPixbuf* _tmp99_ = NULL;
+	GdkPixbuf* _tmp27_;
+	GdkPixbuf* _tmp28_;
+	GdkPixbuf* _tmp52_;
+	GdkPixbuf* _tmp53_;
+	GdkPixbuf* _tmp72_;
+	GdkPixbuf* _tmp73_;
+	GdkPixbuf* _tmp97_;
+	GdkPixbuf* _tmp98_;
 #line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11817,9 +11811,9 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp0_ = self->priv->current_tool;
 #line 1839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11816 "PhotoPage.c"
-		EditingToolsEditingTool* _tmp1_ = NULL;
-		cairo_t* _tmp2_ = NULL;
+#line 11810 "PhotoPage.c"
+		EditingToolsEditingTool* _tmp1_;
+		cairo_t* _tmp2_;
 #line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
 #line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11828,44 +11822,43 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		editing_tools_editing_tool_paint (_tmp1_, _tmp2_);
 #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11827 "PhotoPage.c"
+#line 11821 "PhotoPage.c"
 	}
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = self->priv->photo_missing;
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 11833 "PhotoPage.c"
-		gboolean _tmp5_ = FALSE;
+#line 11827 "PhotoPage.c"
+		gboolean _tmp5_;
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = editing_host_page_has_photo (self);
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp5_;
-#line 11839 "PhotoPage.c"
+#line 11833 "PhotoPage.c"
 	} else {
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = FALSE;
-#line 11843 "PhotoPage.c"
+#line 11837 "PhotoPage.c"
 	}
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 11847 "PhotoPage.c"
-		cairo_t* _tmp6_ = NULL;
-		cairo_t* _tmp7_ = NULL;
+#line 11841 "PhotoPage.c"
+		cairo_t* _tmp6_;
+		cairo_t* _tmp7_;
 		Dimensions _tmp8_ = {0};
-		gint _tmp9_ = 0;
+		gint _tmp9_;
 		Dimensions _tmp10_ = {0};
-		gint _tmp11_ = 0;
-		cairo_t* _tmp12_ = NULL;
-		cairo_t* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		Photo* _tmp15_ = NULL;
-		Photo* _tmp16_ = NULL;
-		GFile* _tmp17_ = NULL;
-		GFile* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
+		gint _tmp11_;
+		cairo_t* _tmp12_;
+		cairo_t* _tmp13_;
+		Photo* _tmp14_;
+		Photo* _tmp15_;
+		GFile* _tmp16_;
+		GFile* _tmp17_;
+		gchar* _tmp18_;
+		gchar* _tmp19_;
+		gchar* _tmp20_;
+		gchar* _tmp21_;
 #line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = ctx;
 #line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11891,440 +11884,438 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 #line 1849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_paint (_tmp13_);
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = _ ("Photo source file missing: %s");
-#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = editing_host_page_get_photo (self);
+		_tmp14_ = editing_host_page_get_photo (self);
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = _tmp15_;
+		_tmp15_ = _tmp14_;
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
+		_tmp16_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = _tmp17_;
+		_tmp17_ = _tmp16_;
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = g_file_get_path (_tmp18_);
+		_tmp18_ = g_file_get_path (_tmp17_);
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = _tmp19_;
+		_tmp19_ = _tmp18_;
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp21_ = g_strdup_printf (_tmp14_, _tmp20_);
+		_tmp20_ = g_strdup_printf (_ ("Photo source file missing: %s"), _tmp19_);
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp22_ = _tmp21_;
+		_tmp21_ = _tmp20_;
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_host_page_draw_message (self, _tmp22_);
+		editing_host_page_draw_message (self, _tmp21_);
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp22_);
+		_g_free0 (_tmp21_);
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp20_);
+		_g_free0 (_tmp19_);
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp18_);
+		_g_object_unref0 (_tmp17_);
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp16_);
+		_g_object_unref0 (_tmp15_);
 #line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11919 "PhotoPage.c"
+#line 11910 "PhotoPage.c"
 	}
 #line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23_ = ctx;
+	_tmp22_ = ctx;
 #line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp24_ = *ctx_dim;
+	_tmp23_ = *ctx_dim;
 #line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp23_, &_tmp24_);
+	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp22_, &_tmp23_);
 #line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp25_);
+	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp24_);
 #line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp26_ = zoom_state_is_default (&_tmp25_);
+	_tmp25_ = zoom_state_is_default (&_tmp24_);
 #line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp26_) {
+	if (!_tmp25_) {
 #line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11935 "PhotoPage.c"
+#line 11926 "PhotoPage.c"
 	}
 #line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp27_);
+	single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp26_);
 #line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	scaled_rect = _tmp27_;
+	scaled_rect = _tmp26_;
 #line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp28_ = editing_host_page_get_bottom_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
+	_tmp27_ = editing_host_page_get_bottom_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
 #line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	trinket = _tmp28_;
+	trinket = _tmp27_;
 #line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp29_ = trinket;
+	_tmp28_ = trinket;
 #line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp29_ != NULL) {
-#line 11949 "PhotoPage.c"
+	if (_tmp28_ != NULL) {
+#line 11940 "PhotoPage.c"
 		gint x = 0;
-		GdkRectangle _tmp30_ = {0};
-		gint _tmp31_ = 0;
+		GdkRectangle _tmp29_;
+		gint _tmp30_;
 		gint y = 0;
-		GdkRectangle _tmp32_ = {0};
-		gint _tmp33_ = 0;
-		GdkRectangle _tmp34_ = {0};
-		gint _tmp35_ = 0;
-		GdkPixbuf* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
-		cairo_t* _tmp39_ = NULL;
-		GdkPixbuf* _tmp40_ = NULL;
-		gint _tmp41_ = 0;
-		gint _tmp42_ = 0;
-		cairo_t* _tmp43_ = NULL;
-		gint _tmp44_ = 0;
-		gint _tmp45_ = 0;
-		GdkPixbuf* _tmp46_ = NULL;
-		gint _tmp47_ = 0;
-		gint _tmp48_ = 0;
-		GdkPixbuf* _tmp49_ = NULL;
-		gint _tmp50_ = 0;
-		gint _tmp51_ = 0;
-		cairo_t* _tmp52_ = NULL;
+		GdkRectangle _tmp31_;
+		gint _tmp32_;
+		GdkRectangle _tmp33_;
+		gint _tmp34_;
+		GdkPixbuf* _tmp35_;
+		gint _tmp36_;
+		gint _tmp37_;
+		cairo_t* _tmp38_;
+		GdkPixbuf* _tmp39_;
+		gint _tmp40_;
+		gint _tmp41_;
+		cairo_t* _tmp42_;
+		gint _tmp43_;
+		gint _tmp44_;
+		GdkPixbuf* _tmp45_;
+		gint _tmp46_;
+		gint _tmp47_;
+		GdkPixbuf* _tmp48_;
+		gint _tmp49_;
+		gint _tmp50_;
+		cairo_t* _tmp51_;
 #line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp30_ = scaled_rect;
+		_tmp29_ = scaled_rect;
 #line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp31_ = _tmp30_.x;
+		_tmp30_ = _tmp29_.x;
 #line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		x = _tmp31_ + EDITING_HOST_PAGE_TRINKET_PADDING;
+		x = _tmp30_ + EDITING_HOST_PAGE_TRINKET_PADDING;
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp32_ = scaled_rect;
+		_tmp31_ = scaled_rect;
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp33_ = _tmp32_.y;
+		_tmp32_ = _tmp31_.y;
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp34_ = scaled_rect;
+		_tmp33_ = scaled_rect;
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp35_ = _tmp34_.height;
+		_tmp34_ = _tmp33_.height;
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp36_ = trinket;
+		_tmp35_ = trinket;
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp37_ = gdk_pixbuf_get_height (_tmp36_);
+		_tmp36_ = gdk_pixbuf_get_height (_tmp35_);
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp38_ = _tmp37_;
+		_tmp37_ = _tmp36_;
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		y = ((_tmp33_ + _tmp35_) - _tmp38_) - EDITING_HOST_PAGE_TRINKET_PADDING;
+		y = ((_tmp32_ + _tmp34_) - _tmp37_) - EDITING_HOST_PAGE_TRINKET_PADDING;
 #line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp39_ = ctx;
+		_tmp38_ = ctx;
 #line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp40_ = trinket;
+		_tmp39_ = trinket;
 #line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp41_ = x;
+		_tmp40_ = x;
 #line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp42_ = y;
+		_tmp41_ = y;
 #line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gdk_cairo_set_source_pixbuf (_tmp39_, _tmp40_, (gdouble) _tmp41_, (gdouble) _tmp42_);
+		gdk_cairo_set_source_pixbuf (_tmp38_, _tmp39_, (gdouble) _tmp40_, (gdouble) _tmp41_);
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp43_ = ctx;
+		_tmp42_ = ctx;
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp44_ = x;
+		_tmp43_ = x;
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp45_ = y;
+		_tmp44_ = y;
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp46_ = trinket;
+		_tmp45_ = trinket;
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp47_ = gdk_pixbuf_get_width (_tmp46_);
+		_tmp46_ = gdk_pixbuf_get_width (_tmp45_);
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp48_ = _tmp47_;
+		_tmp47_ = _tmp46_;
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp49_ = trinket;
+		_tmp48_ = trinket;
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp50_ = gdk_pixbuf_get_height (_tmp49_);
+		_tmp49_ = gdk_pixbuf_get_height (_tmp48_);
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp51_ = _tmp50_;
+		_tmp50_ = _tmp49_;
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_rectangle (_tmp43_, (gdouble) _tmp44_, (gdouble) _tmp45_, (gdouble) _tmp48_, (gdouble) _tmp51_);
+		cairo_rectangle (_tmp42_, (gdouble) _tmp43_, (gdouble) _tmp44_, (gdouble) _tmp47_, (gdouble) _tmp50_);
 #line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp52_ = ctx;
+		_tmp51_ = ctx;
 #line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_fill (_tmp52_);
-#line 12031 "PhotoPage.c"
+		cairo_fill (_tmp51_);
+#line 12022 "PhotoPage.c"
 	}
 #line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp53_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
+	_tmp52_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
 #line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
 #line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	trinket = _tmp53_;
+	trinket = _tmp52_;
 #line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp54_ = trinket;
+	_tmp53_ = trinket;
 #line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp54_ != NULL) {
-#line 12043 "PhotoPage.c"
+	if (_tmp53_ != NULL) {
+#line 12034 "PhotoPage.c"
 		gint x = 0;
-		GdkRectangle _tmp55_ = {0};
-		gint _tmp56_ = 0;
+		GdkRectangle _tmp54_;
+		gint _tmp55_;
 		gint y = 0;
-		GdkRectangle _tmp57_ = {0};
-		gint _tmp58_ = 0;
-		cairo_t* _tmp59_ = NULL;
-		GdkPixbuf* _tmp60_ = NULL;
-		gint _tmp61_ = 0;
-		gint _tmp62_ = 0;
-		cairo_t* _tmp63_ = NULL;
-		gint _tmp64_ = 0;
-		gint _tmp65_ = 0;
-		GdkPixbuf* _tmp66_ = NULL;
-		gint _tmp67_ = 0;
-		gint _tmp68_ = 0;
-		GdkPixbuf* _tmp69_ = NULL;
-		gint _tmp70_ = 0;
-		gint _tmp71_ = 0;
-		cairo_t* _tmp72_ = NULL;
+		GdkRectangle _tmp56_;
+		gint _tmp57_;
+		cairo_t* _tmp58_;
+		GdkPixbuf* _tmp59_;
+		gint _tmp60_;
+		gint _tmp61_;
+		cairo_t* _tmp62_;
+		gint _tmp63_;
+		gint _tmp64_;
+		GdkPixbuf* _tmp65_;
+		gint _tmp66_;
+		gint _tmp67_;
+		GdkPixbuf* _tmp68_;
+		gint _tmp69_;
+		gint _tmp70_;
+		cairo_t* _tmp71_;
 #line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp55_ = scaled_rect;
+		_tmp54_ = scaled_rect;
 #line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp56_ = _tmp55_.x;
+		_tmp55_ = _tmp54_.x;
 #line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		x = _tmp56_ + EDITING_HOST_PAGE_TRINKET_PADDING;
+		x = _tmp55_ + EDITING_HOST_PAGE_TRINKET_PADDING;
 #line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp57_ = scaled_rect;
+		_tmp56_ = scaled_rect;
 #line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp58_ = _tmp57_.y;
+		_tmp57_ = _tmp56_.y;
 #line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		y = _tmp58_ + EDITING_HOST_PAGE_TRINKET_PADDING;
+		y = _tmp57_ + EDITING_HOST_PAGE_TRINKET_PADDING;
 #line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp59_ = ctx;
+		_tmp58_ = ctx;
 #line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp60_ = trinket;
+		_tmp59_ = trinket;
 #line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp61_ = x;
+		_tmp60_ = x;
 #line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp62_ = y;
+		_tmp61_ = y;
 #line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gdk_cairo_set_source_pixbuf (_tmp59_, _tmp60_, (gdouble) _tmp61_, (gdouble) _tmp62_);
+		gdk_cairo_set_source_pixbuf (_tmp58_, _tmp59_, (gdouble) _tmp60_, (gdouble) _tmp61_);
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp63_ = ctx;
+		_tmp62_ = ctx;
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp64_ = x;
+		_tmp63_ = x;
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp65_ = y;
+		_tmp64_ = y;
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp66_ = trinket;
+		_tmp65_ = trinket;
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp67_ = gdk_pixbuf_get_width (_tmp66_);
+		_tmp66_ = gdk_pixbuf_get_width (_tmp65_);
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp68_ = _tmp67_;
+		_tmp67_ = _tmp66_;
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp69_ = trinket;
+		_tmp68_ = trinket;
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp70_ = gdk_pixbuf_get_height (_tmp69_);
+		_tmp69_ = gdk_pixbuf_get_height (_tmp68_);
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp71_ = _tmp70_;
+		_tmp70_ = _tmp69_;
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_rectangle (_tmp63_, (gdouble) _tmp64_, (gdouble) _tmp65_, (gdouble) _tmp68_, (gdouble) _tmp71_);
+		cairo_rectangle (_tmp62_, (gdouble) _tmp63_, (gdouble) _tmp64_, (gdouble) _tmp67_, (gdouble) _tmp70_);
 #line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp72_ = ctx;
+		_tmp71_ = ctx;
 #line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_fill (_tmp72_);
-#line 12110 "PhotoPage.c"
+		cairo_fill (_tmp71_);
+#line 12101 "PhotoPage.c"
 	}
 #line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp73_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
+	_tmp72_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
 #line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
 #line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	trinket = _tmp73_;
+	trinket = _tmp72_;
 #line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp74_ = trinket;
+	_tmp73_ = trinket;
 #line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp74_ != NULL) {
-#line 12122 "PhotoPage.c"
+	if (_tmp73_ != NULL) {
+#line 12113 "PhotoPage.c"
 		gint x = 0;
-		GdkRectangle _tmp75_ = {0};
-		gint _tmp76_ = 0;
-		GdkRectangle _tmp77_ = {0};
-		gint _tmp78_ = 0;
-		GdkPixbuf* _tmp79_ = NULL;
-		gint _tmp80_ = 0;
-		gint _tmp81_ = 0;
+		GdkRectangle _tmp74_;
+		gint _tmp75_;
+		GdkRectangle _tmp76_;
+		gint _tmp77_;
+		GdkPixbuf* _tmp78_;
+		gint _tmp79_;
+		gint _tmp80_;
 		gint y = 0;
-		GdkRectangle _tmp82_ = {0};
-		gint _tmp83_ = 0;
-		cairo_t* _tmp84_ = NULL;
-		GdkPixbuf* _tmp85_ = NULL;
-		gint _tmp86_ = 0;
-		gint _tmp87_ = 0;
-		cairo_t* _tmp88_ = NULL;
-		gint _tmp89_ = 0;
-		gint _tmp90_ = 0;
-		GdkPixbuf* _tmp91_ = NULL;
-		gint _tmp92_ = 0;
-		gint _tmp93_ = 0;
-		GdkPixbuf* _tmp94_ = NULL;
-		gint _tmp95_ = 0;
-		gint _tmp96_ = 0;
-		cairo_t* _tmp97_ = NULL;
+		GdkRectangle _tmp81_;
+		gint _tmp82_;
+		cairo_t* _tmp83_;
+		GdkPixbuf* _tmp84_;
+		gint _tmp85_;
+		gint _tmp86_;
+		cairo_t* _tmp87_;
+		gint _tmp88_;
+		gint _tmp89_;
+		GdkPixbuf* _tmp90_;
+		gint _tmp91_;
+		gint _tmp92_;
+		GdkPixbuf* _tmp93_;
+		gint _tmp94_;
+		gint _tmp95_;
+		cairo_t* _tmp96_;
 #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp75_ = scaled_rect;
+		_tmp74_ = scaled_rect;
 #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp76_ = _tmp75_.x;
+		_tmp75_ = _tmp74_.x;
 #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp77_ = scaled_rect;
+		_tmp76_ = scaled_rect;
 #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp78_ = _tmp77_.width;
+		_tmp77_ = _tmp76_.width;
 #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp79_ = trinket;
+		_tmp78_ = trinket;
 #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp80_ = gdk_pixbuf_get_width (_tmp79_);
+		_tmp79_ = gdk_pixbuf_get_width (_tmp78_);
 #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp81_ = _tmp80_;
+		_tmp80_ = _tmp79_;
 #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		x = ((_tmp76_ + _tmp78_) - _tmp81_) - EDITING_HOST_PAGE_TRINKET_PADDING;
+		x = ((_tmp75_ + _tmp77_) - _tmp80_) - EDITING_HOST_PAGE_TRINKET_PADDING;
 #line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp82_ = scaled_rect;
+		_tmp81_ = scaled_rect;
 #line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp83_ = _tmp82_.y;
+		_tmp82_ = _tmp81_.y;
 #line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		y = _tmp83_ + EDITING_HOST_PAGE_TRINKET_PADDING;
+		y = _tmp82_ + EDITING_HOST_PAGE_TRINKET_PADDING;
 #line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp84_ = ctx;
+		_tmp83_ = ctx;
 #line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp85_ = trinket;
+		_tmp84_ = trinket;
 #line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp86_ = x;
+		_tmp85_ = x;
 #line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp87_ = y;
+		_tmp86_ = y;
 #line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gdk_cairo_set_source_pixbuf (_tmp84_, _tmp85_, (gdouble) _tmp86_, (gdouble) _tmp87_);
+		gdk_cairo_set_source_pixbuf (_tmp83_, _tmp84_, (gdouble) _tmp85_, (gdouble) _tmp86_);
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp88_ = ctx;
+		_tmp87_ = ctx;
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp89_ = x;
+		_tmp88_ = x;
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp90_ = y;
+		_tmp89_ = y;
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp91_ = trinket;
+		_tmp90_ = trinket;
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp92_ = gdk_pixbuf_get_width (_tmp91_);
+		_tmp91_ = gdk_pixbuf_get_width (_tmp90_);
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp93_ = _tmp92_;
+		_tmp92_ = _tmp91_;
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp94_ = trinket;
+		_tmp93_ = trinket;
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp95_ = gdk_pixbuf_get_height (_tmp94_);
+		_tmp94_ = gdk_pixbuf_get_height (_tmp93_);
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp96_ = _tmp95_;
+		_tmp95_ = _tmp94_;
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_rectangle (_tmp88_, (gdouble) _tmp89_, (gdouble) _tmp90_, (gdouble) _tmp93_, (gdouble) _tmp96_);
+		cairo_rectangle (_tmp87_, (gdouble) _tmp88_, (gdouble) _tmp89_, (gdouble) _tmp92_, (gdouble) _tmp95_);
 #line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp97_ = ctx;
+		_tmp96_ = ctx;
 #line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_fill (_tmp97_);
-#line 12204 "PhotoPage.c"
+		cairo_fill (_tmp96_);
+#line 12195 "PhotoPage.c"
 	}
 #line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp98_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
+	_tmp97_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
 #line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
 #line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	trinket = _tmp98_;
+	trinket = _tmp97_;
 #line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp99_ = trinket;
+	_tmp98_ = trinket;
 #line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp99_ != NULL) {
-#line 12216 "PhotoPage.c"
+	if (_tmp98_ != NULL) {
+#line 12207 "PhotoPage.c"
 		gint x = 0;
-		GdkRectangle _tmp100_ = {0};
-		gint _tmp101_ = 0;
-		GdkRectangle _tmp102_ = {0};
-		gint _tmp103_ = 0;
-		GdkPixbuf* _tmp104_ = NULL;
-		gint _tmp105_ = 0;
-		gint _tmp106_ = 0;
+		GdkRectangle _tmp99_;
+		gint _tmp100_;
+		GdkRectangle _tmp101_;
+		gint _tmp102_;
+		GdkPixbuf* _tmp103_;
+		gint _tmp104_;
+		gint _tmp105_;
 		gint y = 0;
-		GdkRectangle _tmp107_ = {0};
-		gint _tmp108_ = 0;
-		GdkRectangle _tmp109_ = {0};
-		gint _tmp110_ = 0;
-		GdkPixbuf* _tmp111_ = NULL;
-		gint _tmp112_ = 0;
-		gint _tmp113_ = 0;
-		cairo_t* _tmp114_ = NULL;
-		GdkPixbuf* _tmp115_ = NULL;
-		gint _tmp116_ = 0;
-		gint _tmp117_ = 0;
-		cairo_t* _tmp118_ = NULL;
-		gint _tmp119_ = 0;
-		gint _tmp120_ = 0;
-		GdkPixbuf* _tmp121_ = NULL;
-		gint _tmp122_ = 0;
-		gint _tmp123_ = 0;
-		GdkPixbuf* _tmp124_ = NULL;
-		gint _tmp125_ = 0;
-		gint _tmp126_ = 0;
-		cairo_t* _tmp127_ = NULL;
+		GdkRectangle _tmp106_;
+		gint _tmp107_;
+		GdkRectangle _tmp108_;
+		gint _tmp109_;
+		GdkPixbuf* _tmp110_;
+		gint _tmp111_;
+		gint _tmp112_;
+		cairo_t* _tmp113_;
+		GdkPixbuf* _tmp114_;
+		gint _tmp115_;
+		gint _tmp116_;
+		cairo_t* _tmp117_;
+		gint _tmp118_;
+		gint _tmp119_;
+		GdkPixbuf* _tmp120_;
+		gint _tmp121_;
+		gint _tmp122_;
+		GdkPixbuf* _tmp123_;
+		gint _tmp124_;
+		gint _tmp125_;
+		cairo_t* _tmp126_;
 #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp100_ = scaled_rect;
+		_tmp99_ = scaled_rect;
 #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp101_ = _tmp100_.x;
+		_tmp100_ = _tmp99_.x;
 #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp102_ = scaled_rect;
+		_tmp101_ = scaled_rect;
 #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp103_ = _tmp102_.width;
+		_tmp102_ = _tmp101_.width;
 #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp104_ = trinket;
+		_tmp103_ = trinket;
 #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp105_ = gdk_pixbuf_get_width (_tmp104_);
+		_tmp104_ = gdk_pixbuf_get_width (_tmp103_);
 #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp106_ = _tmp105_;
+		_tmp105_ = _tmp104_;
 #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		x = ((_tmp101_ + _tmp103_) - _tmp106_) - EDITING_HOST_PAGE_TRINKET_PADDING;
+		x = ((_tmp100_ + _tmp102_) - _tmp105_) - EDITING_HOST_PAGE_TRINKET_PADDING;
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp107_ = scaled_rect;
+		_tmp106_ = scaled_rect;
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp108_ = _tmp107_.y;
+		_tmp107_ = _tmp106_.y;
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp109_ = scaled_rect;
+		_tmp108_ = scaled_rect;
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp110_ = _tmp109_.height;
+		_tmp109_ = _tmp108_.height;
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp111_ = trinket;
+		_tmp110_ = trinket;
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp112_ = gdk_pixbuf_get_height (_tmp111_);
+		_tmp111_ = gdk_pixbuf_get_height (_tmp110_);
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp113_ = _tmp112_;
+		_tmp112_ = _tmp111_;
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		y = ((_tmp108_ + _tmp110_) - _tmp113_) - EDITING_HOST_PAGE_TRINKET_PADDING;
+		y = ((_tmp107_ + _tmp109_) - _tmp112_) - EDITING_HOST_PAGE_TRINKET_PADDING;
 #line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp114_ = ctx;
+		_tmp113_ = ctx;
 #line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp115_ = trinket;
+		_tmp114_ = trinket;
 #line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp116_ = x;
+		_tmp115_ = x;
 #line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp117_ = y;
+		_tmp116_ = y;
 #line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gdk_cairo_set_source_pixbuf (_tmp114_, _tmp115_, (gdouble) _tmp116_, (gdouble) _tmp117_);
+		gdk_cairo_set_source_pixbuf (_tmp113_, _tmp114_, (gdouble) _tmp115_, (gdouble) _tmp116_);
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp118_ = ctx;
+		_tmp117_ = ctx;
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp119_ = x;
+		_tmp118_ = x;
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp120_ = y;
+		_tmp119_ = y;
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp121_ = trinket;
+		_tmp120_ = trinket;
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp122_ = gdk_pixbuf_get_width (_tmp121_);
+		_tmp121_ = gdk_pixbuf_get_width (_tmp120_);
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp123_ = _tmp122_;
+		_tmp122_ = _tmp121_;
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp124_ = trinket;
+		_tmp123_ = trinket;
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp125_ = gdk_pixbuf_get_height (_tmp124_);
+		_tmp124_ = gdk_pixbuf_get_height (_tmp123_);
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp126_ = _tmp125_;
+		_tmp125_ = _tmp124_;
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_rectangle (_tmp118_, (gdouble) _tmp119_, (gdouble) _tmp120_, (gdouble) _tmp123_, (gdouble) _tmp126_);
+		cairo_rectangle (_tmp117_, (gdouble) _tmp118_, (gdouble) _tmp119_, (gdouble) _tmp122_, (gdouble) _tmp125_);
 #line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp127_ = ctx;
+		_tmp126_ = ctx;
 #line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_fill (_tmp127_);
-#line 12313 "PhotoPage.c"
+		cairo_fill (_tmp126_);
+#line 12304 "PhotoPage.c"
 	}
 #line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 12317 "PhotoPage.c"
+#line 12308 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* photo) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12335,24 +12326,24 @@ gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* ph
 	result = !_tmp0_;
 #line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 12334 "PhotoPage.c"
+#line 12325 "PhotoPage.c"
 }
 
 
 static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation, const gchar* name, const gchar* description) {
 	Dimensions _tmp0_ = {0};
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	RotateSingleCommand* command = NULL;
-	Photo* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	Rotation _tmp4_ = 0;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	RotateSingleCommand* _tmp7_ = NULL;
-	RotateSingleCommand* _tmp8_ = NULL;
-	CommandManager* _tmp9_ = NULL;
-	CommandManager* _tmp10_ = NULL;
-	RotateSingleCommand* _tmp11_ = NULL;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
+	Rotation _tmp4_;
+	const gchar* _tmp5_;
+	const gchar* _tmp6_;
+	RotateSingleCommand* _tmp7_;
+	RotateSingleCommand* _tmp8_;
+	CommandManager* _tmp9_;
+	CommandManager* _tmp10_;
+	RotateSingleCommand* _tmp11_;
 #line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12371,7 +12362,7 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation,
 	if (!_tmp1_) {
 #line 1909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12370 "PhotoPage.c"
+#line 12361 "PhotoPage.c"
 	}
 #line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
@@ -12403,7 +12394,7 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation,
 	_command_manager_unref0 (_tmp10_);
 #line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 12402 "PhotoPage.c"
+#line 12393 "PhotoPage.c"
 }
 
 
@@ -12412,7 +12403,7 @@ void editing_host_page_on_rotate_clockwise (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP);
-#line 12411 "PhotoPage.c"
+#line 12402 "PhotoPage.c"
 }
 
 
@@ -12421,7 +12412,7 @@ void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP);
-#line 12420 "PhotoPage.c"
+#line 12411 "PhotoPage.c"
 }
 
 
@@ -12430,7 +12421,7 @@ void editing_host_page_on_flip_horizontally (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "");
-#line 12429 "PhotoPage.c"
+#line 12420 "PhotoPage.c"
 }
 
 
@@ -12439,26 +12430,26 @@ void editing_host_page_on_flip_vertically (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "");
-#line 12438 "PhotoPage.c"
+#line 12429 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_revert (EditingHostPage* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	Dimensions _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-	Photo* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
+	gboolean _tmp2_;
+	Photo* _tmp3_;
+	Photo* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
 	RevertSingleCommand* command = NULL;
-	Photo* _tmp17_ = NULL;
-	Photo* _tmp18_ = NULL;
-	RevertSingleCommand* _tmp19_ = NULL;
-	RevertSingleCommand* _tmp20_ = NULL;
-	CommandManager* _tmp21_ = NULL;
-	CommandManager* _tmp22_ = NULL;
-	RevertSingleCommand* _tmp23_ = NULL;
+	Photo* _tmp17_;
+	Photo* _tmp18_;
+	RevertSingleCommand* _tmp19_;
+	RevertSingleCommand* _tmp20_;
+	CommandManager* _tmp21_;
+	CommandManager* _tmp22_;
+	RevertSingleCommand* _tmp23_;
 #line 1932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12467,7 +12458,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	if (_tmp0_) {
 #line 1934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12466 "PhotoPage.c"
+#line 12457 "PhotoPage.c"
 	}
 #line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp1_, 0, 0);
@@ -12479,7 +12470,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	if (!_tmp2_) {
 #line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12478 "PhotoPage.c"
+#line 12469 "PhotoPage.c"
 	}
 #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (self);
@@ -12493,17 +12484,17 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	_g_object_unref0 (_tmp4_);
 #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 12492 "PhotoPage.c"
-		AppWindow* _tmp7_ = NULL;
-		AppWindow* _tmp8_ = NULL;
-		ViewCollection* _tmp9_ = NULL;
-		ViewCollection* _tmp10_ = NULL;
-		GeeCollection* _tmp11_ = NULL;
-		GeeCollection* _tmp12_ = NULL;
-		gboolean _tmp13_ = FALSE;
-		gboolean _tmp14_ = FALSE;
-		Photo* _tmp15_ = NULL;
-		Photo* _tmp16_ = NULL;
+#line 12483 "PhotoPage.c"
+		AppWindow* _tmp7_;
+		AppWindow* _tmp8_;
+		ViewCollection* _tmp9_;
+		ViewCollection* _tmp10_;
+		GeeCollection* _tmp11_;
+		GeeCollection* _tmp12_;
+		gboolean _tmp13_;
+		gboolean _tmp14_;
+		Photo* _tmp15_;
+		Photo* _tmp16_;
 #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = app_window_get_instance ();
 #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12530,7 +12521,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 		if (_tmp14_) {
 #line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 12529 "PhotoPage.c"
+#line 12520 "PhotoPage.c"
 		}
 #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = editing_host_page_get_photo (self);
@@ -12540,7 +12531,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 		photo_revert_to_master (_tmp16_, TRUE);
 #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 12539 "PhotoPage.c"
+#line 12530 "PhotoPage.c"
 	}
 #line 1950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
@@ -12570,32 +12561,32 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	_command_manager_unref0 (_tmp22_);
 #line 1932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 12569 "PhotoPage.c"
+#line 12560 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_edit_title (EditingHostPage* self) {
 	LibraryPhoto* item = NULL;
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
+	gboolean _tmp2_;
 	EditTitleDialog* edit_title_dialog = NULL;
-	LibraryPhoto* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	EditTitleDialog* _tmp8_ = NULL;
-	EditTitleDialog* _tmp9_ = NULL;
+	LibraryPhoto* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	EditTitleDialog* _tmp8_;
+	EditTitleDialog* _tmp9_;
 	gchar* new_title = NULL;
-	EditTitleDialog* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
+	EditTitleDialog* _tmp10_;
+	gchar* _tmp11_;
+	const gchar* _tmp12_;
 	EditTitleCommand* command = NULL;
-	LibraryPhoto* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	EditTitleCommand* _tmp15_ = NULL;
-	CommandManager* _tmp16_ = NULL;
-	CommandManager* _tmp17_ = NULL;
-	EditTitleCommand* _tmp18_ = NULL;
+	LibraryPhoto* _tmp13_;
+	const gchar* _tmp14_;
+	EditTitleCommand* _tmp15_;
+	CommandManager* _tmp16_;
+	CommandManager* _tmp17_;
+	EditTitleCommand* _tmp18_;
 #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12608,9 +12599,9 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 	_g_object_unref0 (_tmp1_);
 #line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 12607 "PhotoPage.c"
-		Photo* _tmp3_ = NULL;
-		LibraryPhoto* _tmp4_ = NULL;
+#line 12598 "PhotoPage.c"
+		Photo* _tmp3_;
+		LibraryPhoto* _tmp4_;
 #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (self);
 #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12619,19 +12610,19 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 		if (_tmp4_ == NULL) {
 #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 12618 "PhotoPage.c"
+#line 12609 "PhotoPage.c"
 		}
 #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		item = _tmp4_;
-#line 12624 "PhotoPage.c"
+#line 12615 "PhotoPage.c"
 	} else {
 #line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12630 "PhotoPage.c"
+#line 12621 "PhotoPage.c"
 	}
 #line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
@@ -12665,7 +12656,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 		_g_object_unref0 (item);
 #line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12664 "PhotoPage.c"
+#line 12655 "PhotoPage.c"
 	}
 #line 1970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
@@ -12693,32 +12684,32 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 	_text_entry_dialog_mediator_unref0 (edit_title_dialog);
 #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (item);
-#line 12692 "PhotoPage.c"
+#line 12683 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_edit_comment (EditingHostPage* self) {
 	LibraryPhoto* item = NULL;
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
+	gboolean _tmp2_;
 	EditCommentDialog* edit_comment_dialog = NULL;
-	LibraryPhoto* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	EditCommentDialog* _tmp8_ = NULL;
-	EditCommentDialog* _tmp9_ = NULL;
+	LibraryPhoto* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	EditCommentDialog* _tmp8_;
+	EditCommentDialog* _tmp9_;
 	gchar* new_comment = NULL;
-	EditCommentDialog* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
+	EditCommentDialog* _tmp10_;
+	gchar* _tmp11_;
+	const gchar* _tmp12_;
 	EditCommentCommand* command = NULL;
-	LibraryPhoto* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	EditCommentCommand* _tmp15_ = NULL;
-	CommandManager* _tmp16_ = NULL;
-	CommandManager* _tmp17_ = NULL;
-	EditCommentCommand* _tmp18_ = NULL;
+	LibraryPhoto* _tmp13_;
+	const gchar* _tmp14_;
+	EditCommentCommand* _tmp15_;
+	CommandManager* _tmp16_;
+	CommandManager* _tmp17_;
+	EditCommentCommand* _tmp18_;
 #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12731,9 +12722,9 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 	_g_object_unref0 (_tmp1_);
 #line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 12730 "PhotoPage.c"
-		Photo* _tmp3_ = NULL;
-		LibraryPhoto* _tmp4_ = NULL;
+#line 12721 "PhotoPage.c"
+		Photo* _tmp3_;
+		LibraryPhoto* _tmp4_;
 #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (self);
 #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12742,19 +12733,19 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 		if (_tmp4_ == NULL) {
 #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 12741 "PhotoPage.c"
+#line 12732 "PhotoPage.c"
 		}
 #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		item = _tmp4_;
-#line 12747 "PhotoPage.c"
+#line 12738 "PhotoPage.c"
 	} else {
 #line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12753 "PhotoPage.c"
+#line 12744 "PhotoPage.c"
 	}
 #line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
@@ -12788,7 +12779,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 		_g_object_unref0 (item);
 #line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12787 "PhotoPage.c"
+#line 12778 "PhotoPage.c"
 	}
 #line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
@@ -12816,25 +12807,25 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
 #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (item);
-#line 12815 "PhotoPage.c"
+#line 12806 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	AdjustDateTimeDialog* dialog = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	AdjustDateTimeDialog* _tmp3_ = NULL;
-	AdjustDateTimeDialog* _tmp4_ = NULL;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	AdjustDateTimeDialog* _tmp3_;
+	AdjustDateTimeDialog* _tmp4_;
 	gint64 time_shift = 0LL;
 	gboolean keep_relativity = FALSE;
 	gboolean modify_originals = FALSE;
-	AdjustDateTimeDialog* _tmp5_ = NULL;
+	AdjustDateTimeDialog* _tmp5_;
 	gint64 _tmp6_ = 0LL;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_ = FALSE;
+	gboolean _tmp9_;
 #line 1990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12843,7 +12834,7 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 	if (!_tmp0_) {
 #line 1992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12842 "PhotoPage.c"
+#line 12833 "PhotoPage.c"
 	}
 #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
@@ -12871,21 +12862,21 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 	modify_originals = _tmp8_;
 #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp9_) {
-#line 12870 "PhotoPage.c"
-		ViewCollection* _tmp10_ = NULL;
-		ViewCollection* _tmp11_ = NULL;
-		GeeList* _tmp12_ = NULL;
-		GeeList* _tmp13_ = NULL;
+#line 12861 "PhotoPage.c"
+		ViewCollection* _tmp10_;
+		ViewCollection* _tmp11_;
+		GeeList* _tmp12_;
+		GeeList* _tmp13_;
 		AdjustDateTimePhotoCommand* command = NULL;
-		Photo* _tmp14_ = NULL;
-		Photo* _tmp15_ = NULL;
-		gint64 _tmp16_ = 0LL;
-		gboolean _tmp17_ = FALSE;
-		AdjustDateTimePhotoCommand* _tmp18_ = NULL;
-		AdjustDateTimePhotoCommand* _tmp19_ = NULL;
-		CommandManager* _tmp20_ = NULL;
-		CommandManager* _tmp21_ = NULL;
-		AdjustDateTimePhotoCommand* _tmp22_ = NULL;
+		Photo* _tmp14_;
+		Photo* _tmp15_;
+		gint64 _tmp16_;
+		gboolean _tmp17_;
+		AdjustDateTimePhotoCommand* _tmp18_;
+		AdjustDateTimePhotoCommand* _tmp19_;
+		CommandManager* _tmp20_;
+		CommandManager* _tmp21_;
+		AdjustDateTimePhotoCommand* _tmp22_;
 #line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12926,31 +12917,31 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 		_command_manager_unref0 (_tmp21_);
 #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (command);
-#line 12925 "PhotoPage.c"
+#line 12916 "PhotoPage.c"
 	}
 #line 1990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (dialog);
-#line 12929 "PhotoPage.c"
+#line 12920 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_set_background (EditingHostPage* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 2007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (self);
 #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 12941 "PhotoPage.c"
+#line 12932 "PhotoPage.c"
 		SetBackgroundPhotoDialog* dialog = NULL;
-		SetBackgroundPhotoDialog* _tmp1_ = NULL;
+		SetBackgroundPhotoDialog* _tmp1_;
 		gboolean desktop = FALSE;
 		gboolean screensaver = FALSE;
-		SetBackgroundPhotoDialog* _tmp2_ = NULL;
+		SetBackgroundPhotoDialog* _tmp2_;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-		gboolean _tmp5_ = FALSE;
+		gboolean _tmp5_;
 #line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = set_background_photo_dialog_new ();
 #line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12967,15 +12958,15 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 		screensaver = _tmp4_;
 #line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_) {
-#line 12966 "PhotoPage.c"
-			AppWindow* _tmp6_ = NULL;
-			AppWindow* _tmp7_ = NULL;
-			Photo* _tmp8_ = NULL;
-			Photo* _tmp9_ = NULL;
-			gboolean _tmp10_ = FALSE;
-			gboolean _tmp11_ = FALSE;
-			AppWindow* _tmp12_ = NULL;
-			AppWindow* _tmp13_ = NULL;
+#line 12957 "PhotoPage.c"
+			AppWindow* _tmp6_;
+			AppWindow* _tmp7_;
+			Photo* _tmp8_;
+			Photo* _tmp9_;
+			gboolean _tmp10_;
+			gboolean _tmp11_;
+			AppWindow* _tmp12_;
+			AppWindow* _tmp13_;
 #line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = app_window_get_instance ();
 #line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13004,11 +12995,11 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow));
 #line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp13_);
-#line 13003 "PhotoPage.c"
+#line 12994 "PhotoPage.c"
 		}
 #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (dialog);
-#line 13007 "PhotoPage.c"
+#line 12998 "PhotoPage.c"
 	}
 }
 
@@ -13016,22 +13007,22 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 static void _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 13015 "PhotoPage.c"
+#line 13006 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey* event) {
 	EditingHostPage * self;
 	gboolean result = FALSE;
-	GtkToolButton* _tmp0_ = NULL;
-	GtkToolButton* _tmp1_ = NULL;
-	GtkToolButton* _tmp2_ = NULL;
-	GtkToolButton* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
-	GtkToolButton* _tmp5_ = NULL;
-	EditingToolsEditingTool* _tmp6_ = NULL;
-	GdkEventKey* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	GtkToolButton* _tmp0_;
+	GtkToolButton* _tmp1_;
+	GtkToolButton* _tmp2_;
+	GtkToolButton* _tmp3_;
+	guint _tmp4_;
+	GtkToolButton* _tmp5_;
+	EditingToolsEditingTool* _tmp6_;
+	GdkEventKey* _tmp7_;
+	gboolean _tmp8_;
 #line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13062,7 +13053,7 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey*
 	if (_tmp6_ == NULL) {
 #line 2027 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 13061 "PhotoPage.c"
+#line 13052 "PhotoPage.c"
 	}
 #line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
@@ -13072,24 +13063,24 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey*
 	result = _tmp8_;
 #line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13071 "PhotoPage.c"
+#line 13062 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey* event) {
 	EditingHostPage * self;
 	gboolean result = FALSE;
-	GtkToolButton* _tmp0_ = NULL;
-	GtkToolButton* _tmp1_ = NULL;
-	GtkToolButton* _tmp2_ = NULL;
-	GtkToolButton* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
-	GtkToolButton* _tmp5_ = NULL;
+	GtkToolButton* _tmp0_;
+	GtkToolButton* _tmp1_;
+	GtkToolButton* _tmp2_;
+	GtkToolButton* _tmp3_;
+	guint _tmp4_;
+	GtkToolButton* _tmp5_;
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-	EditingToolsEditingTool* _tmp8_ = NULL;
-	GdkEventKey* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	EditingToolsEditingTool* _tmp8_;
+	GdkEventKey* _tmp11_;
+	gboolean _tmp12_;
 #line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13118,37 +13109,37 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey
 	_tmp8_ = self->priv->current_tool;
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_ == NULL) {
-#line 13117 "PhotoPage.c"
-		gboolean _tmp9_ = FALSE;
+#line 13108 "PhotoPage.c"
+		gboolean _tmp9_;
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp9_;
-#line 13123 "PhotoPage.c"
+#line 13114 "PhotoPage.c"
 	} else {
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = FALSE;
-#line 13127 "PhotoPage.c"
+#line 13118 "PhotoPage.c"
 	}
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp7_) {
-#line 13131 "PhotoPage.c"
-		gboolean _tmp10_ = FALSE;
+#line 13122 "PhotoPage.c"
+		gboolean _tmp10_;
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = !_tmp10_;
-#line 13137 "PhotoPage.c"
+#line 13128 "PhotoPage.c"
 	} else {
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = FALSE;
-#line 13141 "PhotoPage.c"
+#line 13132 "PhotoPage.c"
 	}
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
 #line 2040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 13147 "PhotoPage.c"
+#line 13138 "PhotoPage.c"
 	}
 #line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = event;
@@ -13158,29 +13149,29 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey
 	result = _tmp12_;
 #line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13157 "PhotoPage.c"
+#line 13148 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleToolButton* toggle, EditingToolsEditingToolFactory factory) {
 	gboolean _tmp0_ = FALSE;
-	GtkToggleToolButton* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	GtkToggleToolButton* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 	gboolean deactivating_only = FALSE;
 	Dimensions _tmp6_ = {0};
-	gboolean _tmp7_ = FALSE;
-	GtkToggleToolButton* _tmp8_ = NULL;
-	GtkToggleToolButton* _tmp9_ = NULL;
+	gboolean _tmp7_;
+	GtkToggleToolButton* _tmp8_;
+	GtkToggleToolButton* _tmp9_;
 	EditingToolsEditingTool* tool = NULL;
-	EditingToolsEditingToolFactory _tmp10_ = NULL;
-	EditingToolsEditingTool* _tmp11_ = NULL;
-	EditingToolsEditingTool* _tmp12_ = NULL;
-	EditingToolsEditingTool* _tmp13_ = NULL;
-	EditingToolsEditingTool* _tmp14_ = NULL;
-	EditingToolsEditingTool* _tmp15_ = NULL;
-	EditingToolsEditingTool* _tmp16_ = NULL;
-	EditingToolsEditingTool* _tmp17_ = NULL;
+	EditingToolsEditingToolFactory _tmp10_;
+	EditingToolsEditingTool* _tmp11_;
+	EditingToolsEditingTool* _tmp12_;
+	EditingToolsEditingTool* _tmp13_;
+	EditingToolsEditingTool* _tmp14_;
+	EditingToolsEditingTool* _tmp15_;
+	EditingToolsEditingTool* _tmp16_;
+	EditingToolsEditingTool* _tmp17_;
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13193,20 +13184,20 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
 	_tmp3_ = _tmp2_;
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp3_) {
-#line 13192 "PhotoPage.c"
-		GtkToggleToolButton* _tmp4_ = NULL;
-		GtkToggleToolButton* _tmp5_ = NULL;
+#line 13183 "PhotoPage.c"
+		GtkToggleToolButton* _tmp4_;
+		GtkToggleToolButton* _tmp5_;
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = self->priv->current_editing_toggle;
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = toggle;
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_ == _tmp5_;
-#line 13201 "PhotoPage.c"
+#line 13192 "PhotoPage.c"
 	} else {
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 13205 "PhotoPage.c"
+#line 13196 "PhotoPage.c"
 	}
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	deactivating_only = _tmp0_;
@@ -13222,7 +13213,7 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
 		page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13221 "PhotoPage.c"
+#line 13212 "PhotoPage.c"
 	}
 #line 2056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -13266,14 +13257,14 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
 	editing_host_page_activate_tool (self, _tmp17_);
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 13265 "PhotoPage.c"
+#line 13256 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_tool_activated (EditingHostPage* self) {
-	GtkToggleToolButton* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	GtkToggleToolButton* _tmp2_ = NULL;
+	GtkToggleToolButton* _tmp0_;
+	GtkScale* _tmp1_;
+	GtkToggleToolButton* _tmp2_;
 #line 2071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13288,14 +13279,14 @@ static void editing_host_page_on_tool_activated (EditingHostPage* self) {
 	_tmp2_ = self->priv->current_editing_toggle;
 #line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp2_, TRUE);
-#line 13287 "PhotoPage.c"
+#line 13278 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_tool_deactivated (EditingHostPage* self) {
-	GtkToggleToolButton* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	GtkToggleToolButton* _tmp2_ = NULL;
+	GtkToggleToolButton* _tmp0_;
+	GtkScale* _tmp1_;
+	GtkToggleToolButton* _tmp2_;
 #line 2077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13310,15 +13301,15 @@ static void editing_host_page_on_tool_deactivated (EditingHostPage* self) {
 	_tmp2_ = self->priv->current_editing_toggle;
 #line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp2_, FALSE);
-#line 13309 "PhotoPage.c"
+#line 13300 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement) {
-	Command* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	Dimensions _tmp2_ = {0};
-	gboolean _tmp3_ = FALSE;
+	Command* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	Dimensions _tmp2_;
+	gboolean _tmp3_;
 #line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13337,7 +13328,7 @@ static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* c
 	_tmp3_ = needs_improvement;
 #line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, _tmp0_, _tmp1_, &_tmp2_, _tmp3_);
-#line 13336 "PhotoPage.c"
+#line 13327 "PhotoPage.c"
 }
 
 
@@ -13353,7 +13344,7 @@ static void editing_host_page_on_tool_cancelled (EditingHostPage* self) {
 	single_photo_page_restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 2092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 13352 "PhotoPage.c"
+#line 13343 "PhotoPage.c"
 }
 
 
@@ -13367,14 +13358,14 @@ static void editing_host_page_on_tool_aborted (EditingHostPage* self) {
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
 #line 2097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_set_photo_missing (self, TRUE);
-#line 13366 "PhotoPage.c"
+#line 13357 "PhotoPage.c"
 }
 
 
 void editing_host_page_toggle_crop (EditingHostPage* self) {
-	GtkToggleToolButton* _tmp0_ = NULL;
-	GtkToggleToolButton* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GtkToggleToolButton* _tmp0_;
+	GtkToggleToolButton* _tmp1_;
+	gboolean _tmp2_;
 #line 2100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13385,14 +13376,14 @@ void editing_host_page_toggle_crop (EditingHostPage* self) {
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
 #line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13384 "PhotoPage.c"
+#line 13375 "PhotoPage.c"
 }
 
 
 void editing_host_page_toggle_straighten (EditingHostPage* self) {
-	GtkToggleToolButton* _tmp0_ = NULL;
-	GtkToggleToolButton* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GtkToggleToolButton* _tmp0_;
+	GtkToggleToolButton* _tmp1_;
+	gboolean _tmp2_;
 #line 2104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13403,14 +13394,14 @@ void editing_host_page_toggle_straighten (EditingHostPage* self) {
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
 #line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13402 "PhotoPage.c"
+#line 13393 "PhotoPage.c"
 }
 
 
 void editing_host_page_toggle_redeye (EditingHostPage* self) {
-	GtkToggleToolButton* _tmp0_ = NULL;
-	GtkToggleToolButton* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GtkToggleToolButton* _tmp0_;
+	GtkToggleToolButton* _tmp1_;
+	gboolean _tmp2_;
 #line 2108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13421,14 +13412,14 @@ void editing_host_page_toggle_redeye (EditingHostPage* self) {
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
 #line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13420 "PhotoPage.c"
+#line 13411 "PhotoPage.c"
 }
 
 
 void editing_host_page_toggle_adjust (EditingHostPage* self) {
-	GtkToggleToolButton* _tmp0_ = NULL;
-	GtkToggleToolButton* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GtkToggleToolButton* _tmp0_;
+	GtkToggleToolButton* _tmp1_;
+	gboolean _tmp2_;
 #line 2112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13439,7 +13430,7 @@ void editing_host_page_toggle_adjust (EditingHostPage* self) {
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
 #line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13438 "PhotoPage.c"
+#line 13429 "PhotoPage.c"
 }
 
 
@@ -13448,19 +13439,19 @@ static EditingToolsEditingTool* _editing_tools_straighten_tool_factory_editing_t
 	result = editing_tools_straighten_tool_factory ();
 #line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13447 "PhotoPage.c"
+#line 13438 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_straighten_toggled (EditingHostPage* self) {
-	GtkToggleToolButton* _tmp0_ = NULL;
+	GtkToggleToolButton* _tmp0_;
 #line 2116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->straighten_button;
 #line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_straighten_tool_factory_editing_tools_editing_tool_factory);
-#line 13459 "PhotoPage.c"
+#line 13450 "PhotoPage.c"
 }
 
 
@@ -13469,19 +13460,19 @@ static EditingToolsEditingTool* _editing_tools_crop_tool_factory_editing_tools_e
 	result = editing_tools_crop_tool_factory ();
 #line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13468 "PhotoPage.c"
+#line 13459 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_crop_toggled (EditingHostPage* self) {
-	GtkToggleToolButton* _tmp0_ = NULL;
+	GtkToggleToolButton* _tmp0_;
 #line 2120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->crop_button;
 #line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_crop_tool_factory_editing_tools_editing_tool_factory);
-#line 13480 "PhotoPage.c"
+#line 13471 "PhotoPage.c"
 }
 
 
@@ -13490,19 +13481,19 @@ static EditingToolsEditingTool* _editing_tools_redeye_tool_factory_editing_tools
 	result = editing_tools_redeye_tool_factory ();
 #line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13489 "PhotoPage.c"
+#line 13480 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_redeye_toggled (EditingHostPage* self) {
-	GtkToggleToolButton* _tmp0_ = NULL;
+	GtkToggleToolButton* _tmp0_;
 #line 2124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->redeye_button;
 #line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_redeye_tool_factory_editing_tools_editing_tool_factory);
-#line 13501 "PhotoPage.c"
+#line 13492 "PhotoPage.c"
 }
 
 
@@ -13511,25 +13502,25 @@ static EditingToolsEditingTool* _editing_tools_adjust_tool_factory_editing_tools
 	result = editing_tools_adjust_tool_factory ();
 #line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13510 "PhotoPage.c"
+#line 13501 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_adjust_toggled (EditingHostPage* self) {
-	GtkToggleToolButton* _tmp0_ = NULL;
+	GtkToggleToolButton* _tmp0_;
 #line 2128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->adjust_button;
 #line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_adjust_tool_factory_editing_tools_editing_tool_factory);
-#line 13522 "PhotoPage.c"
+#line 13513 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* photo) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 2132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 2132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13540,32 +13531,32 @@ gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* p
 	result = !_tmp0_;
 #line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13539 "PhotoPage.c"
+#line 13530 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_enhance (EditingHostPage* self) {
-	EditingToolsEditingTool* _tmp0_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	EditingToolsEditingTool* _tmp0_;
+	gboolean _tmp2_;
 	EditingToolsAdjustTool* adjust_tool = NULL;
-	EditingToolsEditingTool* _tmp3_ = NULL;
-	EditingToolsAdjustTool* _tmp4_ = NULL;
-	EditingToolsAdjustTool* _tmp5_ = NULL;
+	EditingToolsEditingTool* _tmp3_;
+	EditingToolsAdjustTool* _tmp4_;
+	EditingToolsAdjustTool* _tmp5_;
 	EnhanceSingleCommand* command = NULL;
-	Photo* _tmp7_ = NULL;
-	Photo* _tmp8_ = NULL;
-	EnhanceSingleCommand* _tmp9_ = NULL;
-	EnhanceSingleCommand* _tmp10_ = NULL;
-	CommandManager* _tmp11_ = NULL;
-	CommandManager* _tmp12_ = NULL;
-	EnhanceSingleCommand* _tmp13_ = NULL;
+	Photo* _tmp7_;
+	Photo* _tmp8_;
+	EnhanceSingleCommand* _tmp9_;
+	EnhanceSingleCommand* _tmp10_;
+	CommandManager* _tmp11_;
+	CommandManager* _tmp12_;
+	EnhanceSingleCommand* _tmp13_;
 #line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
 #line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 13564 "PhotoPage.c"
+#line 13555 "PhotoPage.c"
 		Dimensions _tmp1_ = {0};
 #line 2141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		dimensions_init (&_tmp1_, 0, 0);
@@ -13573,7 +13564,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 		editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
 #line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 13572 "PhotoPage.c"
+#line 13563 "PhotoPage.c"
 	}
 #line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_has_photo (self);
@@ -13581,7 +13572,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	if (!_tmp2_) {
 #line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13580 "PhotoPage.c"
+#line 13571 "PhotoPage.c"
 	}
 #line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->current_tool;
@@ -13593,8 +13584,8 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	_tmp5_ = adjust_tool;
 #line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 13592 "PhotoPage.c"
-		EditingToolsAdjustTool* _tmp6_ = NULL;
+#line 13583 "PhotoPage.c"
+		EditingToolsAdjustTool* _tmp6_;
 #line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = adjust_tool;
 #line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13603,7 +13594,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 		_editing_tools_editing_tool_unref0 (adjust_tool);
 #line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13602 "PhotoPage.c"
+#line 13593 "PhotoPage.c"
 	}
 #line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = editing_host_page_get_photo (self);
@@ -13631,16 +13622,16 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	_g_object_unref0 (command);
 #line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (adjust_tool);
-#line 13630 "PhotoPage.c"
+#line 13621 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_copy_adjustments (EditingHostPage* self) {
-	gboolean _tmp0_ = FALSE;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	PixelTransformationBundle* _tmp3_ = NULL;
-	PixelTransformationBundle* _tmp4_ = NULL;
+	gboolean _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	PixelTransformationBundle* _tmp3_;
+	PixelTransformationBundle* _tmp4_;
 #line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13649,7 +13640,7 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) {
 	if (!_tmp0_) {
 #line 2162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13648 "PhotoPage.c"
+#line 13639 "PhotoPage.c"
 	}
 #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
@@ -13667,24 +13658,24 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) {
 	_g_object_unref0 (_tmp2_);
 #line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE);
-#line 13666 "PhotoPage.c"
+#line 13657 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 	PixelTransformationBundle* copied_adjustments = NULL;
-	PixelTransformationBundle* _tmp0_ = NULL;
+	PixelTransformationBundle* _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp2_;
 	AdjustColorsSingleCommand* command = NULL;
-	Photo* _tmp4_ = NULL;
-	Photo* _tmp5_ = NULL;
-	PixelTransformationBundle* _tmp6_ = NULL;
-	AdjustColorsSingleCommand* _tmp7_ = NULL;
-	AdjustColorsSingleCommand* _tmp8_ = NULL;
-	CommandManager* _tmp9_ = NULL;
-	CommandManager* _tmp10_ = NULL;
-	AdjustColorsSingleCommand* _tmp11_ = NULL;
+	Photo* _tmp4_;
+	Photo* _tmp5_;
+	PixelTransformationBundle* _tmp6_;
+	AdjustColorsSingleCommand* _tmp7_;
+	AdjustColorsSingleCommand* _tmp8_;
+	CommandManager* _tmp9_;
+	CommandManager* _tmp10_;
+	AdjustColorsSingleCommand* _tmp11_;
 #line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13697,14 +13688,14 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 	if (!_tmp2_) {
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = TRUE;
-#line 13696 "PhotoPage.c"
+#line 13687 "PhotoPage.c"
 	} else {
-		PixelTransformationBundle* _tmp3_ = NULL;
+		PixelTransformationBundle* _tmp3_;
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = copied_adjustments;
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 13703 "PhotoPage.c"
+#line 13694 "PhotoPage.c"
 	}
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
@@ -13712,7 +13703,7 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 		_pixel_transformation_bundle_unref0 (copied_adjustments);
 #line 2170 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13711 "PhotoPage.c"
+#line 13702 "PhotoPage.c"
 	}
 #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_get_photo (self);
@@ -13742,56 +13733,56 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 	_g_object_unref0 (command);
 #line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 13741 "PhotoPage.c"
+#line 13732 "PhotoPage.c"
 }
 
 
 static void editing_host_page_place_tool_window (EditingHostPage* self) {
-	EditingToolsEditingTool* _tmp0_ = NULL;
+	EditingToolsEditingTool* _tmp0_;
 	EditingToolsEditingToolWindow* tool_window = NULL;
-	EditingToolsEditingTool* _tmp1_ = NULL;
-	EditingToolsEditingToolWindow* _tmp2_ = NULL;
-	EditingToolsEditingToolWindow* _tmp3_ = NULL;
-	EditingToolsEditingToolWindow* _tmp4_ = NULL;
-	AppWindow* _tmp5_ = NULL;
-	AppWindow* _tmp6_ = NULL;
-	EditingToolsEditingToolWindow* _tmp7_ = NULL;
-	EditingToolsEditingToolWindow* _tmp8_ = NULL;
+	EditingToolsEditingTool* _tmp1_;
+	EditingToolsEditingToolWindow* _tmp2_;
+	EditingToolsEditingToolWindow* _tmp3_;
+	EditingToolsEditingToolWindow* _tmp4_;
+	AppWindow* _tmp5_;
+	AppWindow* _tmp6_;
+	EditingToolsEditingToolWindow* _tmp7_;
+	EditingToolsEditingToolWindow* _tmp8_;
 	GtkAllocation tool_alloc = {0};
-	EditingToolsEditingToolWindow* _tmp9_ = NULL;
+	EditingToolsEditingToolWindow* _tmp9_;
 	GtkAllocation _tmp10_ = {0};
 	gint x = 0;
 	gint y = 0;
-	GeeHashMap* _tmp11_ = NULL;
-	EditingToolsEditingTool* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gboolean _tmp16_ = FALSE;
-	gboolean _tmp17_ = FALSE;
+	GeeHashMap* _tmp11_;
+	EditingToolsEditingTool* _tmp12_;
+	const gchar* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	gboolean _tmp16_;
+	gboolean _tmp17_;
 	GdkScreen* screen = NULL;
-	GtkWindow* _tmp87_ = NULL;
-	GtkWindow* _tmp88_ = NULL;
-	GdkScreen* _tmp89_ = NULL;
-	GdkScreen* _tmp90_ = NULL;
-	GdkScreen* _tmp91_ = NULL;
-	gint _tmp92_ = 0;
-	GdkScreen* _tmp93_ = NULL;
-	gint _tmp94_ = 0;
-	GtkAllocation _tmp95_ = {0};
-	gint _tmp96_ = 0;
-	gint _tmp97_ = 0;
-	gint _tmp98_ = 0;
-	GdkScreen* _tmp99_ = NULL;
-	gint _tmp100_ = 0;
-	GtkAllocation _tmp101_ = {0};
-	gint _tmp102_ = 0;
-	gint _tmp103_ = 0;
-	EditingToolsEditingToolWindow* _tmp104_ = NULL;
-	gint _tmp105_ = 0;
-	gint _tmp106_ = 0;
-	EditingToolsEditingToolWindow* _tmp107_ = NULL;
-	EditingToolsEditingToolWindow* _tmp108_ = NULL;
+	GtkWindow* _tmp87_;
+	GtkWindow* _tmp88_;
+	GdkScreen* _tmp89_;
+	GdkScreen* _tmp90_;
+	GdkScreen* _tmp91_;
+	gint _tmp92_;
+	GdkScreen* _tmp93_;
+	gint _tmp94_;
+	GtkAllocation _tmp95_;
+	gint _tmp96_;
+	gint _tmp97_;
+	gint _tmp98_;
+	GdkScreen* _tmp99_;
+	gint _tmp100_;
+	GtkAllocation _tmp101_;
+	gint _tmp102_;
+	gint _tmp103_;
+	EditingToolsEditingToolWindow* _tmp104_;
+	gint _tmp105_;
+	gint _tmp106_;
+	EditingToolsEditingToolWindow* _tmp107_;
+	EditingToolsEditingToolWindow* _tmp108_;
 #line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13800,7 +13791,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 	if (_tmp0_ == NULL) {
 #line 2179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13799 "PhotoPage.c"
+#line 13790 "PhotoPage.c"
 	}
 #line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
@@ -13816,7 +13807,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 		_g_object_unref0 (tool_window);
 #line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13815 "PhotoPage.c"
+#line 13806 "PhotoPage.c"
 	}
 #line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = tool_window;
@@ -13860,19 +13851,19 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 	_g_free0 (_tmp15_);
 #line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp17_) {
-#line 13859 "PhotoPage.c"
-		GeeHashMap* _tmp18_ = NULL;
-		EditingToolsEditingTool* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		gpointer _tmp23_ = NULL;
-		GeeHashMap* _tmp24_ = NULL;
-		EditingToolsEditingTool* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
-		gchar* _tmp28_ = NULL;
-		gpointer _tmp29_ = NULL;
+#line 13850 "PhotoPage.c"
+		GeeHashMap* _tmp18_;
+		EditingToolsEditingTool* _tmp19_;
+		const gchar* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
+		gpointer _tmp23_;
+		GeeHashMap* _tmp24_;
+		EditingToolsEditingTool* _tmp25_;
+		const gchar* _tmp26_;
+		gchar* _tmp27_;
+		gchar* _tmp28_;
+		gpointer _tmp29_;
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = self->priv->last_locations;
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13905,13 +13896,13 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 		y = (gint) ((gintptr) _tmp29_);
 #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp28_);
-#line 13904 "PhotoPage.c"
+#line 13895 "PhotoPage.c"
 	} else {
-		GtkWindow* _tmp30_ = NULL;
-		GtkWindow* _tmp31_ = NULL;
-		AppWindow* _tmp32_ = NULL;
-		AppWindow* _tmp33_ = NULL;
-		gboolean _tmp34_ = FALSE;
+		GtkWindow* _tmp30_;
+		GtkWindow* _tmp31_;
+		AppWindow* _tmp32_;
+		AppWindow* _tmp33_;
+		gboolean _tmp34_;
 #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13928,35 +13919,35 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 		_g_object_unref0 (_tmp31_);
 #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp34_) {
-#line 13927 "PhotoPage.c"
+#line 13918 "PhotoPage.c"
 			gint rx = 0;
 			gint ry = 0;
-			GtkWindow* _tmp35_ = NULL;
-			GtkWindow* _tmp36_ = NULL;
-			GdkWindow* _tmp37_ = NULL;
+			GtkWindow* _tmp35_;
+			GtkWindow* _tmp36_;
+			GdkWindow* _tmp37_;
 			gint _tmp38_ = 0;
 			gint _tmp39_ = 0;
 			GtkAllocation viewport_allocation = {0};
-			GtkViewport* _tmp40_ = NULL;
+			GtkViewport* _tmp40_;
 			GtkAllocation _tmp41_ = {0};
 			gint cx = 0;
 			gint cy = 0;
 			gint cwidth = 0;
 			gint cheight = 0;
-			GtkAllocation _tmp42_ = {0};
-			gint _tmp43_ = 0;
-			GtkAllocation _tmp44_ = {0};
-			gint _tmp45_ = 0;
-			GtkAllocation _tmp46_ = {0};
-			gint _tmp47_ = 0;
-			GtkAllocation _tmp48_ = {0};
-			gint _tmp49_ = 0;
+			GtkAllocation _tmp42_;
+			gint _tmp43_;
+			GtkAllocation _tmp44_;
+			gint _tmp45_;
+			GtkAllocation _tmp46_;
+			gint _tmp47_;
+			GtkAllocation _tmp48_;
+			gint _tmp49_;
 			gint _tmp50_ = 0;
-			gint _tmp59_ = 0;
-			gint _tmp60_ = 0;
-			gint _tmp61_ = 0;
-			GtkAllocation _tmp62_ = {0};
-			gint _tmp63_ = 0;
+			gint _tmp59_;
+			gint _tmp60_;
+			gint _tmp61_;
+			GtkAllocation _tmp62_;
+			gint _tmp63_;
 #line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp35_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14003,12 +13994,12 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 			cheight = _tmp49_;
 #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE)) {
-#line 14002 "PhotoPage.c"
-				gint _tmp51_ = 0;
-				gint _tmp52_ = 0;
-				gint _tmp53_ = 0;
-				GtkAllocation _tmp54_ = {0};
-				gint _tmp55_ = 0;
+#line 13993 "PhotoPage.c"
+				gint _tmp51_;
+				gint _tmp52_;
+				gint _tmp53_;
+				GtkAllocation _tmp54_;
+				gint _tmp55_;
 #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp51_ = rx;
 #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14021,11 +14012,11 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 				_tmp55_ = _tmp54_.width;
 #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp50_ = ((_tmp51_ + _tmp52_) + (_tmp53_ / 2)) - (_tmp55_ / 2);
-#line 14020 "PhotoPage.c"
+#line 14011 "PhotoPage.c"
 			} else {
-				gint _tmp56_ = 0;
-				gint _tmp57_ = 0;
-				gint _tmp58_ = 0;
+				gint _tmp56_;
+				gint _tmp57_;
+				gint _tmp58_;
 #line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp56_ = rx;
 #line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14034,7 +14025,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 				_tmp58_ = cwidth;
 #line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp50_ = (_tmp56_ + _tmp57_) + (_tmp58_ / 2);
-#line 14033 "PhotoPage.c"
+#line 14024 "PhotoPage.c"
 			}
 #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			x = _tmp50_;
@@ -14050,29 +14041,29 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 			_tmp63_ = _tmp62_.height;
 #line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			y = ((_tmp59_ + _tmp60_) + _tmp61_) - ((_tmp63_ / 4) * 3);
-#line 14049 "PhotoPage.c"
+#line 14040 "PhotoPage.c"
 		} else {
-			GtkWindow* _tmp64_ = NULL;
-			GtkWindow* _tmp65_ = NULL;
+			GtkWindow* _tmp64_;
+			GtkWindow* _tmp65_;
 			GtkAllocation toolbar_alloc = {0};
-			GtkToolbar* _tmp66_ = NULL;
-			GtkToolbar* _tmp67_ = NULL;
+			GtkToolbar* _tmp66_;
+			GtkToolbar* _tmp67_;
 			GtkAllocation _tmp68_ = {0};
 			GdkScreen* screen = NULL;
-			GtkWindow* _tmp69_ = NULL;
-			GtkWindow* _tmp70_ = NULL;
-			GdkScreen* _tmp71_ = NULL;
-			GdkScreen* _tmp72_ = NULL;
-			GdkScreen* _tmp73_ = NULL;
-			GdkScreen* _tmp74_ = NULL;
-			gint _tmp75_ = 0;
-			GdkScreen* _tmp76_ = NULL;
-			gint _tmp77_ = 0;
-			GtkAllocation _tmp78_ = {0};
-			gint _tmp79_ = 0;
-			GtkAllocation _tmp80_ = {0};
-			gint _tmp81_ = 0;
-			EditingToolsEditingTool* _tmp82_ = NULL;
+			GtkWindow* _tmp69_;
+			GtkWindow* _tmp70_;
+			GdkScreen* _tmp71_;
+			GdkScreen* _tmp72_;
+			GdkScreen* _tmp73_;
+			GdkScreen* _tmp74_;
+			gint _tmp75_;
+			GdkScreen* _tmp76_;
+			gint _tmp77_;
+			GtkAllocation _tmp78_;
+			gint _tmp79_;
+			GtkAllocation _tmp80_;
+			gint _tmp81_;
+			EditingToolsEditingTool* _tmp82_;
 #line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp64_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14129,17 +14120,17 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 			_tmp82_ = self->priv->current_tool;
 #line 2235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 14128 "PhotoPage.c"
-				gint _tmp83_ = 0;
+#line 14119 "PhotoPage.c"
+				gint _tmp83_;
 #line 2236 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp83_ = x;
 #line 2236 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				x = (_tmp83_ * 3) / 4;
-#line 14134 "PhotoPage.c"
+#line 14125 "PhotoPage.c"
 			} else {
-				gint _tmp84_ = 0;
-				GtkAllocation _tmp85_ = {0};
-				gint _tmp86_ = 0;
+				gint _tmp84_;
+				GtkAllocation _tmp85_;
+				gint _tmp86_;
 #line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp84_ = x;
 #line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14148,11 +14139,11 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 				_tmp86_ = _tmp85_.width;
 #line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				x = (_tmp84_ - _tmp86_) / 2;
-#line 14147 "PhotoPage.c"
+#line 14138 "PhotoPage.c"
 			}
 #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (screen);
-#line 14151 "PhotoPage.c"
+#line 14142 "PhotoPage.c"
 		}
 	}
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14217,28 +14208,28 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 	_g_object_unref0 (screen);
 #line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (tool_window);
-#line 14216 "PhotoPage.c"
+#line 14207 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 	EditingHostPage * self;
 	Dimensions _tmp0_ = {0};
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	Photo* current_photo = NULL;
-	Photo* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
 	DataView* current = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	Photo* _tmp6_ = NULL;
-	Photo* _tmp7_ = NULL;
-	DataView* _tmp8_ = NULL;
-	DataView* _tmp9_ = NULL;
-	DataView* _tmp10_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	Photo* _tmp6_;
+	Photo* _tmp7_;
+	DataView* _tmp8_;
+	DataView* _tmp9_;
+	DataView* _tmp10_;
 	DataView* next = NULL;
-	DataView* _tmp11_ = NULL;
-	DataView* _tmp12_ = NULL;
+	DataView* _tmp11_;
+	DataView* _tmp12_;
 #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 2254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14251,7 +14242,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 	if (!_tmp1_) {
 #line 2257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14250 "PhotoPage.c"
+#line 14241 "PhotoPage.c"
 	}
 #line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
@@ -14289,7 +14280,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 		_g_object_unref0 (current_photo);
 #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14288 "PhotoPage.c"
+#line 14279 "PhotoPage.c"
 	}
 #line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = current;
@@ -14297,30 +14288,30 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 	_tmp12_ = _g_object_ref0 (_tmp11_);
 #line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	next = _tmp12_;
-#line 14296 "PhotoPage.c"
+#line 14287 "PhotoPage.c"
 	{
 		gboolean _tmp13_ = FALSE;
 #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
 #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 14303 "PhotoPage.c"
-			ViewCollection* _tmp14_ = NULL;
-			ViewCollection* _tmp15_ = NULL;
-			DataView* _tmp16_ = NULL;
-			DataView* _tmp17_ = NULL;
-			DataView* _tmp18_ = NULL;
+#line 14294 "PhotoPage.c"
+			ViewCollection* _tmp14_;
+			ViewCollection* _tmp15_;
+			DataView* _tmp16_;
+			DataView* _tmp17_;
+			DataView* _tmp18_;
 			Photo* next_photo = NULL;
-			DataView* _tmp19_ = NULL;
-			DataSource* _tmp20_ = NULL;
-			Photo* _tmp21_ = NULL;
-			Photo* _tmp22_ = NULL;
-			Photo* _tmp23_ = NULL;
-			Photo* _tmp24_ = NULL;
-			Photo* _tmp25_ = NULL;
+			DataView* _tmp19_;
+			DataSource* _tmp20_;
+			Photo* _tmp21_;
+			Photo* _tmp22_;
+			Photo* _tmp23_;
+			Photo* _tmp24_;
+			Photo* _tmp25_;
 #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp13_) {
-#line 14319 "PhotoPage.c"
+#line 14310 "PhotoPage.c"
 			}
 #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = FALSE;
@@ -14344,7 +14335,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			if (_tmp18_ == NULL) {
 #line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14343 "PhotoPage.c"
+#line 14334 "PhotoPage.c"
 			}
 #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = next;
@@ -14356,7 +14347,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			if (_tmp21_ == NULL) {
 #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp20_);
-#line 14355 "PhotoPage.c"
+#line 14346 "PhotoPage.c"
 			}
 #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			next_photo = _tmp21_;
@@ -14368,7 +14359,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 				_g_object_unref0 (next_photo);
 #line 2275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				continue;
-#line 14367 "PhotoPage.c"
+#line 14358 "PhotoPage.c"
 			}
 #line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = next_photo;
@@ -14380,7 +14371,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 				_g_object_unref0 (next_photo);
 #line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14379 "PhotoPage.c"
+#line 14370 "PhotoPage.c"
 			}
 #line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = next_photo;
@@ -14390,7 +14381,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			_g_object_unref0 (next_photo);
 #line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 14389 "PhotoPage.c"
+#line 14380 "PhotoPage.c"
 		}
 	}
 #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14399,28 +14390,28 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 	_g_object_unref0 (current);
 #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current_photo);
-#line 14398 "PhotoPage.c"
+#line 14389 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 	EditingHostPage * self;
 	Dimensions _tmp0_ = {0};
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	Photo* current_photo = NULL;
-	Photo* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
 	DataView* current = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	Photo* _tmp6_ = NULL;
-	Photo* _tmp7_ = NULL;
-	DataView* _tmp8_ = NULL;
-	DataView* _tmp9_ = NULL;
-	DataView* _tmp10_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	Photo* _tmp6_;
+	Photo* _tmp7_;
+	DataView* _tmp8_;
+	DataView* _tmp9_;
+	DataView* _tmp10_;
 	DataView* previous = NULL;
-	DataView* _tmp11_ = NULL;
-	DataView* _tmp12_ = NULL;
+	DataView* _tmp11_;
+	DataView* _tmp12_;
 #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 2287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14433,7 +14424,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 	if (!_tmp1_) {
 #line 2290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14432 "PhotoPage.c"
+#line 14423 "PhotoPage.c"
 	}
 #line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
@@ -14471,7 +14462,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 		_g_object_unref0 (current_photo);
 #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14470 "PhotoPage.c"
+#line 14461 "PhotoPage.c"
 	}
 #line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = current;
@@ -14479,30 +14470,30 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 	_tmp12_ = _g_object_ref0 (_tmp11_);
 #line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	previous = _tmp12_;
-#line 14478 "PhotoPage.c"
+#line 14469 "PhotoPage.c"
 	{
 		gboolean _tmp13_ = FALSE;
 #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
 #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 14485 "PhotoPage.c"
-			ViewCollection* _tmp14_ = NULL;
-			ViewCollection* _tmp15_ = NULL;
-			DataView* _tmp16_ = NULL;
-			DataView* _tmp17_ = NULL;
-			DataView* _tmp18_ = NULL;
+#line 14476 "PhotoPage.c"
+			ViewCollection* _tmp14_;
+			ViewCollection* _tmp15_;
+			DataView* _tmp16_;
+			DataView* _tmp17_;
+			DataView* _tmp18_;
 			Photo* previous_photo = NULL;
-			DataView* _tmp19_ = NULL;
-			DataSource* _tmp20_ = NULL;
-			Photo* _tmp21_ = NULL;
-			Photo* _tmp22_ = NULL;
-			Photo* _tmp23_ = NULL;
-			Photo* _tmp24_ = NULL;
-			Photo* _tmp25_ = NULL;
+			DataView* _tmp19_;
+			DataSource* _tmp20_;
+			Photo* _tmp21_;
+			Photo* _tmp22_;
+			Photo* _tmp23_;
+			Photo* _tmp24_;
+			Photo* _tmp25_;
 #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp13_) {
-#line 14501 "PhotoPage.c"
+#line 14492 "PhotoPage.c"
 			}
 #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = FALSE;
@@ -14526,7 +14517,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			if (_tmp18_ == NULL) {
 #line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14525 "PhotoPage.c"
+#line 14516 "PhotoPage.c"
 			}
 #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = previous;
@@ -14538,7 +14529,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			if (_tmp21_ == NULL) {
 #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp20_);
-#line 14537 "PhotoPage.c"
+#line 14528 "PhotoPage.c"
 			}
 #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			previous_photo = _tmp21_;
@@ -14550,7 +14541,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 				_g_object_unref0 (previous_photo);
 #line 2308 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				continue;
-#line 14549 "PhotoPage.c"
+#line 14540 "PhotoPage.c"
 			}
 #line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = previous_photo;
@@ -14562,7 +14553,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 				_g_object_unref0 (previous_photo);
 #line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14561 "PhotoPage.c"
+#line 14552 "PhotoPage.c"
 			}
 #line 2313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = previous_photo;
@@ -14572,7 +14563,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			_g_object_unref0 (previous_photo);
 #line 2315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 14571 "PhotoPage.c"
+#line 14562 "PhotoPage.c"
 		}
 	}
 #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14581,13 +14572,13 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 	_g_object_unref0 (current);
 #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current_photo);
-#line 14580 "PhotoPage.c"
+#line 14571 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_has_current_tool (EditingHostPage* self) {
 	gboolean result = FALSE;
-	EditingToolsEditingTool* _tmp0_ = NULL;
+	EditingToolsEditingTool* _tmp0_;
 #line 2319 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14596,7 +14587,7 @@ gboolean editing_host_page_has_current_tool (EditingHostPage* self) {
 	result = _tmp0_ != NULL;
 #line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 14595 "PhotoPage.c"
+#line 14586 "PhotoPage.c"
 }
 
 
@@ -14607,33 +14598,33 @@ void editing_host_page_unset_view_collection (EditingHostPage* self) {
 	_data_collection_unref0 (self->priv->parent_view);
 #line 2324 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->parent_view = NULL;
-#line 14606 "PhotoPage.c"
+#line 14597 "PhotoPage.c"
 }
 
 
 static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_construct (GType object_type, EditingHostPage* host_page) {
 	EditingHostPageEditingHostCanvas* self = NULL;
-	EditingHostPage* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
-	GtkWindow* _tmp2_ = NULL;
-	EditingHostPage* _tmp3_ = NULL;
-	GtkDrawingArea* _tmp4_ = NULL;
-	GdkWindow* _tmp5_ = NULL;
-	EditingHostPage* _tmp6_ = NULL;
-	Photo* _tmp7_ = NULL;
-	Photo* _tmp8_ = NULL;
-	EditingHostPage* _tmp9_ = NULL;
-	cairo_t* _tmp10_ = NULL;
-	cairo_t* _tmp11_ = NULL;
-	EditingHostPage* _tmp12_ = NULL;
+	EditingHostPage* _tmp0_;
+	GtkWindow* _tmp1_;
+	GtkWindow* _tmp2_;
+	EditingHostPage* _tmp3_;
+	GtkDrawingArea* _tmp4_;
+	GdkWindow* _tmp5_;
+	EditingHostPage* _tmp6_;
+	Photo* _tmp7_;
+	Photo* _tmp8_;
+	EditingHostPage* _tmp9_;
+	cairo_t* _tmp10_;
+	cairo_t* _tmp11_;
+	EditingHostPage* _tmp12_;
 	Dimensions _tmp13_ = {0};
-	EditingHostPage* _tmp14_ = NULL;
-	GdkPixbuf* _tmp15_ = NULL;
-	GdkPixbuf* _tmp16_ = NULL;
-	EditingHostPage* _tmp17_ = NULL;
+	EditingHostPage* _tmp14_;
+	GdkPixbuf* _tmp15_;
+	GdkPixbuf* _tmp16_;
+	EditingHostPage* _tmp17_;
 	GdkRectangle _tmp18_ = {0};
-	EditingHostPage* _tmp19_ = NULL;
-	EditingHostPage* _tmp20_ = NULL;
+	EditingHostPage* _tmp19_;
+	EditingHostPage* _tmp20_;
 #line 377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (host_page), NULL);
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14694,27 +14685,27 @@ static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_c
 	self->priv->host_page = _tmp20_;
 #line 377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 14693 "PhotoPage.c"
+#line 14684 "PhotoPage.c"
 }
 
 
 static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_new (EditingHostPage* host_page) {
 #line 377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return editing_host_page_editing_host_canvas_construct (EDITING_HOST_PAGE_TYPE_EDITING_HOST_CANVAS, host_page);
-#line 14700 "PhotoPage.c"
+#line 14691 "PhotoPage.c"
 }
 
 
 static void editing_host_page_editing_host_canvas_real_repaint (EditingToolsPhotoCanvas* base) {
 	EditingHostPageEditingHostCanvas * self;
-	EditingHostPage* _tmp0_ = NULL;
+	EditingHostPage* _tmp0_;
 #line 385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_HOST_PAGE_TYPE_EDITING_HOST_CANVAS, EditingHostPageEditingHostCanvas);
 #line 386 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->host_page;
 #line 386 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 14713 "PhotoPage.c"
+#line 14704 "PhotoPage.c"
 }
 
 
@@ -14726,19 +14717,19 @@ static void editing_host_page_editing_host_canvas_class_init (EditingHostPageEdi
 #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_type_class_add_private (klass, sizeof (EditingHostPageEditingHostCanvasPrivate));
 #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingToolsPhotoCanvasClass *) klass)->repaint = (void (*)(EditingToolsPhotoCanvas*)) editing_host_page_editing_host_canvas_real_repaint;
-#line 14726 "PhotoPage.c"
+	((EditingToolsPhotoCanvasClass *) klass)->repaint = (void (*) (EditingToolsPhotoCanvas *)) editing_host_page_editing_host_canvas_real_repaint;
+#line 14717 "PhotoPage.c"
 }
 
 
 static void editing_host_page_editing_host_canvas_instance_init (EditingHostPageEditingHostCanvas * self) {
 #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv = EDITING_HOST_PAGE_EDITING_HOST_CANVAS_GET_PRIVATE (self);
-#line 14733 "PhotoPage.c"
+#line 14724 "PhotoPage.c"
 }
 
 
-static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCanvas* obj) {
+static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCanvas * obj) {
 	EditingHostPageEditingHostCanvas * self;
 #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_HOST_PAGE_TYPE_EDITING_HOST_CANVAS, EditingHostPageEditingHostCanvas);
@@ -14746,7 +14737,7 @@ static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCan
 	_g_object_unref0 (self->priv->host_page);
 #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_TOOLS_PHOTO_CANVAS_CLASS (editing_host_page_editing_host_canvas_parent_class)->finalize (obj);
-#line 14745 "PhotoPage.c"
+#line 14736 "PhotoPage.c"
 }
 
 
@@ -14768,111 +14759,111 @@ static void editing_host_page_class_init (EditingHostPageClass * klass) {
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_type_class_add_private (klass, sizeof (EditingHostPagePrivate));
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->on_zoom_slider_key_press = (gboolean (*)(EditingHostPage*, GdkEventKey*)) editing_host_page_real_on_zoom_slider_key_press;
+	((EditingHostPageClass *) klass)->on_zoom_slider_key_press = (gboolean (*) (EditingHostPage *, GdkEventKey*)) editing_host_page_real_on_zoom_slider_key_press;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->on_increase_size = (void (*)(EditingHostPage*)) editing_host_page_real_on_increase_size;
+	((EditingHostPageClass *) klass)->on_increase_size = (void (*) (EditingHostPage *)) editing_host_page_real_on_increase_size;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->on_decrease_size = (void (*)(EditingHostPage*)) editing_host_page_real_on_decrease_size;
+	((EditingHostPageClass *) klass)->on_decrease_size = (void (*) (EditingHostPage *)) editing_host_page_real_on_decrease_size;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((SinglePhotoPageClass *) klass)->save_zoom_state = (void (*)(SinglePhotoPage*)) editing_host_page_real_save_zoom_state;
+	((SinglePhotoPageClass *) klass)->save_zoom_state = (void (*) (SinglePhotoPage *)) editing_host_page_real_save_zoom_state;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((SinglePhotoPageClass *) klass)->get_zoom_buffer = (ZoomBuffer* (*)(SinglePhotoPage*)) editing_host_page_real_get_zoom_buffer;
+	((SinglePhotoPageClass *) klass)->get_zoom_buffer = (ZoomBuffer* (*) (SinglePhotoPage *)) editing_host_page_real_get_zoom_buffer;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_mousewheel_up = (gboolean (*)(Page*, GdkEventScroll*)) editing_host_page_real_on_mousewheel_up;
+	((PageClass *) klass)->on_mousewheel_up = (gboolean (*) (Page *, GdkEventScroll*)) editing_host_page_real_on_mousewheel_up;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_mousewheel_down = (gboolean (*)(Page*, GdkEventScroll*)) editing_host_page_real_on_mousewheel_down;
+	((PageClass *) klass)->on_mousewheel_down = (gboolean (*) (Page *, GdkEventScroll*)) editing_host_page_real_on_mousewheel_down;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((SinglePhotoPageClass *) klass)->restore_zoom_state = (void (*)(SinglePhotoPage*)) editing_host_page_real_restore_zoom_state;
+	((SinglePhotoPageClass *) klass)->restore_zoom_state = (void (*) (SinglePhotoPage *)) editing_host_page_real_restore_zoom_state;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((SinglePhotoPageClass *) klass)->is_zoom_supported = (gboolean (*)(SinglePhotoPage*)) editing_host_page_real_is_zoom_supported;
+	((SinglePhotoPageClass *) klass)->is_zoom_supported = (gboolean (*) (SinglePhotoPage *)) editing_host_page_real_is_zoom_supported;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->set_container = (void (*)(Page*, GtkWindow*)) editing_host_page_real_set_container;
+	((PageClass *) klass)->set_container = (void (*) (Page *, GtkWindow*)) editing_host_page_real_set_container;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->photo_changing = (void (*)(EditingHostPage*, Photo*)) editing_host_page_real_photo_changing;
+	((EditingHostPageClass *) klass)->photo_changing = (void (*) (EditingHostPage *, Photo*)) editing_host_page_real_photo_changing;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((GtkWidgetClass *) klass)->realize = (void (*)(GtkWidget*)) editing_host_page_real_realize;
+	((GtkWidgetClass *) klass)->realize = (void (*) (GtkWidget *)) editing_host_page_real_realize;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->switched_to = (void (*)(Page*)) editing_host_page_real_switched_to;
+	((PageClass *) klass)->switched_to = (void (*) (Page *)) editing_host_page_real_switched_to;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->switching_from = (void (*)(Page*)) editing_host_page_real_switching_from;
+	((PageClass *) klass)->switching_from = (void (*) (Page *)) editing_host_page_real_switching_from;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->switching_to_fullscreen = (void (*)(Page*, FullscreenWindow*)) editing_host_page_real_switching_to_fullscreen;
+	((PageClass *) klass)->switching_to_fullscreen = (void (*) (Page *, FullscreenWindow*)) editing_host_page_real_switching_to_fullscreen;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->returning_from_fullscreen = (void (*)(Page*, FullscreenWindow*)) editing_host_page_real_returning_from_fullscreen;
+	((PageClass *) klass)->returning_from_fullscreen = (void (*) (Page *, FullscreenWindow*)) editing_host_page_real_returning_from_fullscreen;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->create_photo_view = (DataView* (*)(EditingHostPage*, DataSource*)) editing_host_page_real_create_photo_view;
+	((EditingHostPageClass *) klass)->create_photo_view = (DataView* (*) (EditingHostPage *, DataSource*)) editing_host_page_real_create_photo_view;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->update_ui = (void (*)(EditingHostPage*, gboolean)) editing_host_page_real_update_ui;
+	((EditingHostPageClass *) klass)->update_ui = (void (*) (EditingHostPage *, gboolean)) editing_host_page_real_update_ui;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->notify_photo_backing_missing = (void (*)(EditingHostPage*, Photo*, gboolean)) editing_host_page_real_notify_photo_backing_missing;
+	((EditingHostPageClass *) klass)->notify_photo_backing_missing = (void (*) (EditingHostPage *, Photo*, gboolean)) editing_host_page_real_notify_photo_backing_missing;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->confirm_replace_photo = (gboolean (*)(EditingHostPage*, Photo*, Photo*)) editing_host_page_real_confirm_replace_photo;
+	((EditingHostPageClass *) klass)->confirm_replace_photo = (gboolean (*) (EditingHostPage *, Photo*, Photo*)) editing_host_page_real_confirm_replace_photo;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((SinglePhotoPageClass *) klass)->cancel_zoom = (void (*)(SinglePhotoPage*)) editing_host_page_real_cancel_zoom;
+	((SinglePhotoPageClass *) klass)->cancel_zoom = (void (*) (SinglePhotoPage *)) editing_host_page_real_cancel_zoom;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_resize = (void (*)(Page*, GdkRectangle*)) editing_host_page_real_on_resize;
+	((PageClass *) klass)->on_resize = (void (*) (Page *, GdkRectangle*)) editing_host_page_real_on_resize;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_resize_finished = (void (*)(Page*, GdkRectangle*)) editing_host_page_real_on_resize_finished;
+	((PageClass *) klass)->on_resize_finished = (void (*) (Page *, GdkRectangle*)) editing_host_page_real_on_resize_finished;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) editing_host_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) editing_host_page_real_update_actions;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_shift_pressed = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_shift_pressed;
+	((PageClass *) klass)->on_shift_pressed = (gboolean (*) (Page *, GdkEventKey*)) editing_host_page_real_on_shift_pressed;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_shift_released = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_shift_released;
+	((PageClass *) klass)->on_shift_released = (gboolean (*) (Page *, GdkEventKey*)) editing_host_page_real_on_shift_released;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_alt_pressed = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_alt_pressed;
+	((PageClass *) klass)->on_alt_pressed = (gboolean (*) (Page *, GdkEventKey*)) editing_host_page_real_on_alt_pressed;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_alt_released = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_alt_released;
+	((PageClass *) klass)->on_alt_released = (gboolean (*) (Page *, GdkEventKey*)) editing_host_page_real_on_alt_released;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->on_double_click = (gboolean (*)(EditingHostPage*, GdkEventButton*)) editing_host_page_real_on_double_click;
+	((EditingHostPageClass *) klass)->on_double_click = (gboolean (*) (EditingHostPage *, GdkEventButton*)) editing_host_page_real_on_double_click;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_left_click = (gboolean (*)(Page*, GdkEventButton*)) editing_host_page_real_on_left_click;
+	((PageClass *) klass)->on_left_click = (gboolean (*) (Page *, GdkEventButton*)) editing_host_page_real_on_left_click;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_left_released = (gboolean (*)(Page*, GdkEventButton*)) editing_host_page_real_on_left_released;
+	((PageClass *) klass)->on_left_released = (gboolean (*) (Page *, GdkEventButton*)) editing_host_page_real_on_left_released;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_right_click = (gboolean (*)(Page*, GdkEventButton*)) editing_host_page_real_on_right_click;
+	((PageClass *) klass)->on_right_click = (gboolean (*) (Page *, GdkEventButton*)) editing_host_page_real_on_right_click;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_motion = (gboolean (*)(Page*, GdkEventMotion*, gint, gint, GdkModifierType)) editing_host_page_real_on_motion;
+	((PageClass *) klass)->on_motion = (gboolean (*) (Page *, GdkEventMotion*, gint, gint, GdkModifierType)) editing_host_page_real_on_motion;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_leave_notify_event = (gboolean (*)(Page*)) editing_host_page_real_on_leave_notify_event;
+	((PageClass *) klass)->on_leave_notify_event = (gboolean (*) (Page *)) editing_host_page_real_on_leave_notify_event;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_move = (void (*)(Page*, GdkRectangle*)) editing_host_page_real_on_move;
+	((PageClass *) klass)->on_move = (void (*) (Page *, GdkRectangle*)) editing_host_page_real_on_move;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_move_finished = (void (*)(Page*, GdkRectangle*)) editing_host_page_real_on_move_finished;
+	((PageClass *) klass)->on_move_finished = (void (*) (Page *, GdkRectangle*)) editing_host_page_real_on_move_finished;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) editing_host_page_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) editing_host_page_real_key_press_event;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((SinglePhotoPageClass *) klass)->new_surface = (void (*)(SinglePhotoPage*, cairo_t*, Dimensions*)) editing_host_page_real_new_surface;
+	((SinglePhotoPageClass *) klass)->new_surface = (void (*) (SinglePhotoPage *, cairo_t*, Dimensions*)) editing_host_page_real_new_surface;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((SinglePhotoPageClass *) klass)->updated_pixbuf = (void (*)(SinglePhotoPage*, GdkPixbuf*, SinglePhotoPageUpdateReason, Dimensions*)) editing_host_page_real_updated_pixbuf;
+	((SinglePhotoPageClass *) klass)->updated_pixbuf = (void (*) (SinglePhotoPage *, GdkPixbuf*, SinglePhotoPageUpdateReason, Dimensions*)) editing_host_page_real_updated_pixbuf;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->get_bottom_left_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) editing_host_page_real_get_bottom_left_trinket;
+	((EditingHostPageClass *) klass)->get_bottom_left_trinket = (GdkPixbuf* (*) (EditingHostPage *, gint)) editing_host_page_real_get_bottom_left_trinket;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->get_top_left_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) editing_host_page_real_get_top_left_trinket;
+	((EditingHostPageClass *) klass)->get_top_left_trinket = (GdkPixbuf* (*) (EditingHostPage *, gint)) editing_host_page_real_get_top_left_trinket;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->get_top_right_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) editing_host_page_real_get_top_right_trinket;
+	((EditingHostPageClass *) klass)->get_top_right_trinket = (GdkPixbuf* (*) (EditingHostPage *, gint)) editing_host_page_real_get_top_right_trinket;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->get_bottom_right_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) editing_host_page_real_get_bottom_right_trinket;
+	((EditingHostPageClass *) klass)->get_bottom_right_trinket = (GdkPixbuf* (*) (EditingHostPage *, gint)) editing_host_page_real_get_bottom_right_trinket;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((SinglePhotoPageClass *) klass)->paint = (void (*)(SinglePhotoPage*, cairo_t*, Dimensions*)) editing_host_page_real_paint;
+	((SinglePhotoPageClass *) klass)->paint = (void (*) (SinglePhotoPage *, cairo_t*, Dimensions*)) editing_host_page_real_paint;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_ctrl_pressed = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_ctrl_pressed;
+	((PageClass *) klass)->on_ctrl_pressed = (gboolean (*) (Page *, GdkEventKey*)) editing_host_page_real_on_ctrl_pressed;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_ctrl_released = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_ctrl_released;
+	((PageClass *) klass)->on_ctrl_released = (gboolean (*) (Page *, GdkEventKey*)) editing_host_page_real_on_ctrl_released;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((SinglePhotoPageClass *) klass)->on_next_photo = (void (*)(SinglePhotoPage*)) editing_host_page_real_on_next_photo;
+	((SinglePhotoPageClass *) klass)->on_next_photo = (void (*) (SinglePhotoPage *)) editing_host_page_real_on_next_photo;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((SinglePhotoPageClass *) klass)->on_previous_photo = (void (*)(SinglePhotoPage*)) editing_host_page_real_on_previous_photo;
+	((SinglePhotoPageClass *) klass)->on_previous_photo = (void (*) (SinglePhotoPage *)) editing_host_page_real_on_previous_photo;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_host_page_finalize;
-#line 14864 "PhotoPage.c"
+#line 14855 "PhotoPage.c"
 }
 
 
 static void editing_host_page_instance_init (EditingHostPage * self) {
-	GtkToolButton* _tmp0_ = NULL;
-	GtkToolButton* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
+	GtkToolButton* _tmp0_;
+	GtkToolButton* _tmp1_;
+	GeeHashMap* _tmp2_;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv = EDITING_HOST_PAGE_GET_PRIVATE (self);
 #line 391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14933,20 +14924,20 @@ static void editing_host_page_instance_init (EditingHostPage * self) {
 	_tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->last_locations = _tmp2_;
-#line 14932 "PhotoPage.c"
+#line 14923 "PhotoPage.c"
 }
 
 
-static void editing_host_page_finalize (GObject* obj) {
+static void editing_host_page_finalize (GObject * obj) {
 	EditingHostPage * self;
-	SourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
-	ViewCollection* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	guint _tmp7_ = 0U;
+	SourceCollection* _tmp0_;
+	guint _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
+	guint _tmp4_;
+	ViewCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	guint _tmp7_;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15017,7 +15008,7 @@ static void editing_host_page_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->last_locations);
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (editing_host_page_parent_class)->finalize (obj);
-#line 15016 "PhotoPage.c"
+#line 15007 "PhotoPage.c"
 }
 
 
@@ -15036,381 +15027,381 @@ GType editing_host_page_get_type (void) {
 static void _library_photo_page_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_destroyed ((LibraryPhotoPage*) self, source);
-#line 15035 "PhotoPage.c"
+#line 15026 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_metadata_altered ((LibraryPhotoPage*) self, items);
-#line 15042 "PhotoPage.c"
+#line 15033 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self) {
 #line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_app_changed ((LibraryPhotoPage*) self);
-#line 15049 "PhotoPage.c"
+#line 15040 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_export ((LibraryPhotoPage*) self);
-#line 15056 "PhotoPage.c"
+#line 15047 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_print ((LibraryPhotoPage*) self);
-#line 15063 "PhotoPage.c"
+#line 15054 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_publish ((LibraryPhotoPage*) self);
-#line 15070 "PhotoPage.c"
+#line 15061 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_remove_from_library ((LibraryPhotoPage*) self);
-#line 15077 "PhotoPage.c"
+#line 15068 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_move_to_trash ((LibraryPhotoPage*) self);
-#line 15084 "PhotoPage.c"
+#line 15075 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 15091 "PhotoPage.c"
+#line 15082 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 15098 "PhotoPage.c"
+#line 15089 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_clockwise ((EditingHostPage*) self);
-#line 15105 "PhotoPage.c"
+#line 15096 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 15112 "PhotoPage.c"
+#line 15103 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_flip_horizontally ((EditingHostPage*) self);
-#line 15119 "PhotoPage.c"
+#line 15110 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_flip_vertically ((EditingHostPage*) self);
-#line 15126 "PhotoPage.c"
+#line 15117 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_enhance ((EditingHostPage*) self);
-#line 15133 "PhotoPage.c"
+#line 15124 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_copy_adjustments ((EditingHostPage*) self);
-#line 15140 "PhotoPage.c"
+#line 15131 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_paste_adjustments ((EditingHostPage*) self);
-#line 15147 "PhotoPage.c"
+#line 15138 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_crop ((EditingHostPage*) self);
-#line 15154 "PhotoPage.c"
+#line 15145 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_straighten ((EditingHostPage*) self);
-#line 15161 "PhotoPage.c"
+#line 15152 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_redeye ((EditingHostPage*) self);
-#line 15168 "PhotoPage.c"
+#line 15159 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_adjust ((EditingHostPage*) self);
-#line 15175 "PhotoPage.c"
+#line 15166 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_revert ((EditingHostPage*) self);
-#line 15182 "PhotoPage.c"
+#line 15173 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_edit_title ((EditingHostPage*) self);
-#line 15189 "PhotoPage.c"
+#line 15180 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_edit_comment ((EditingHostPage*) self);
-#line 15196 "PhotoPage.c"
+#line 15187 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_adjust_date_time ((EditingHostPage*) self);
-#line 15203 "PhotoPage.c"
+#line 15194 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_edit ((LibraryPhotoPage*) self);
-#line 15210 "PhotoPage.c"
+#line 15201 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_edit_raw ((LibraryPhotoPage*) self);
-#line 15217 "PhotoPage.c"
+#line 15208 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_send_to ((LibraryPhotoPage*) self);
-#line 15224 "PhotoPage.c"
+#line 15215 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_set_background ((EditingHostPage*) self);
-#line 15231 "PhotoPage.c"
+#line 15222 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_flag_unflag ((LibraryPhotoPage*) self);
-#line 15238 "PhotoPage.c"
+#line 15229 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_increase_rating ((LibraryPhotoPage*) self);
-#line 15245 "PhotoPage.c"
+#line 15236 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_decrease_rating ((LibraryPhotoPage*) self);
-#line 15252 "PhotoPage.c"
+#line 15243 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_rejected ((LibraryPhotoPage*) self);
-#line 15259 "PhotoPage.c"
+#line 15250 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_unrated ((LibraryPhotoPage*) self);
-#line 15266 "PhotoPage.c"
+#line 15257 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_one ((LibraryPhotoPage*) self);
-#line 15273 "PhotoPage.c"
+#line 15264 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_two ((LibraryPhotoPage*) self);
-#line 15280 "PhotoPage.c"
+#line 15271 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_three ((LibraryPhotoPage*) self);
-#line 15287 "PhotoPage.c"
+#line 15278 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_four ((LibraryPhotoPage*) self);
-#line 15294 "PhotoPage.c"
+#line 15285 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_five ((LibraryPhotoPage*) self);
-#line 15301 "PhotoPage.c"
+#line 15292 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_increase_size ((EditingHostPage*) self);
-#line 15308 "PhotoPage.c"
+#line 15299 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_decrease_size ((EditingHostPage*) self);
-#line 15315 "PhotoPage.c"
+#line 15306 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_min ((EditingHostPage*) self);
-#line 15322 "PhotoPage.c"
+#line 15313 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self);
-#line 15329 "PhotoPage.c"
+#line 15320 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_max ((EditingHostPage*) self);
-#line 15336 "PhotoPage.c"
+#line 15327 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_add_tags ((LibraryPhotoPage*) self);
-#line 15343 "PhotoPage.c"
+#line 15334 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_modify_tags ((LibraryPhotoPage*) self);
-#line 15350 "PhotoPage.c"
+#line 15341 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_slideshow ((LibraryPhotoPage*) self);
-#line 15357 "PhotoPage.c"
+#line 15348 "PhotoPage.c"
 }
 
 
 static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_on_action_toggle ((Page*) self, action, parameter);
-#line 15364 "PhotoPage.c"
+#line 15355 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_display_ratings ((LibraryPhotoPage*) self, action, value);
-#line 15371 "PhotoPage.c"
+#line 15362 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photos_altered ((LibraryPhotoPage*) self);
-#line 15378 "PhotoPage.c"
+#line 15369 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) {
 #line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_unlinking ((LibraryPhotoPage*) self, unlinking);
-#line 15385 "PhotoPage.c"
+#line 15376 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) {
 #line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_relinked ((LibraryPhotoPage*) self, relinked);
-#line 15392 "PhotoPage.c"
+#line 15383 "PhotoPage.c"
 }
 
 
 LibraryPhotoPage* library_photo_page_construct (GType object_type) {
 	LibraryPhotoPage * self = NULL;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	LibraryPhotoSourceCollection* _tmp3_ = NULL;
-	LibraryPhotoSourceCollection* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	ConfigFacade* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	ViewCollection* _tmp8_ = NULL;
-	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp9_ = NULL;
-	LibraryPhotoSourceCollection* _tmp10_ = NULL;
-	LibraryPhotoSourceCollection* _tmp11_ = NULL;
+	LibraryPhotoSourceCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	LibraryPhotoSourceCollection* _tmp3_;
+	LibraryPhotoSourceCollection* _tmp4_;
+	ConfigFacade* _tmp5_;
+	ConfigFacade* _tmp6_;
+	ViewCollection* _tmp7_;
+	ViewCollection* _tmp8_;
+	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp9_;
+	LibraryPhotoSourceCollection* _tmp10_;
+	LibraryPhotoSourceCollection* _tmp11_;
 #line 2345 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = library_photo_global;
 #line 2345 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15459,24 +15450,24 @@ LibraryPhotoPage* library_photo_page_construct (GType object_type) {
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-relinked", (GCallback) _library_photo_page_on_photo_relinked_source_collection_items_relinked, self, 0);
 #line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 15458 "PhotoPage.c"
+#line 15449 "PhotoPage.c"
 }
 
 
 LibraryPhotoPage* library_photo_page_new (void) {
 #line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return library_photo_page_construct (TYPE_LIBRARY_PHOTO_PAGE);
-#line 15465 "PhotoPage.c"
+#line 15456 "PhotoPage.c"
 }
 
 
 gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, DataView* view) {
 	gboolean result = FALSE;
-	DataView* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	MediaSource* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	DataView* _tmp0_;
+	DataSource* _tmp1_;
+	MediaSource* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 #line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), FALSE);
 #line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15497,12 +15488,12 @@ gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, Dat
 	result = _tmp4_;
 #line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 15496 "PhotoPage.c"
+#line 15487 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCollection* unlinking) {
-	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL;
+	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_;
 #line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15511,12 +15502,12 @@ static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCo
 	_tmp0_ = self->priv->filter;
 #line 2374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 15510 "PhotoPage.c"
+#line 15501 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCollection* relinked) {
-	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL;
+	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_;
 #line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15525,15 +15516,15 @@ static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCol
 	_tmp0_ = self->priv->filter;
 #line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 15524 "PhotoPage.c"
+#line 15515 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	LibraryPhotoPage * self;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
+	GeeList* _tmp2_;
 #line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15550,55 +15541,55 @@ static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeLi
 	_tmp2_ = ui_filenames;
 #line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), "photo.ui");
-#line 15549 "PhotoPage.c"
+#line 15540 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new16 (gboolean value) {
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 15556 "PhotoPage.c"
+#line 15547 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new17 (const gchar* value) {
 #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 15563 "PhotoPage.c"
+#line 15554 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) {
 #line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_raw_developer_changed ((LibraryPhotoPage*) self, _sender, value);
-#line 15570 "PhotoPage.c"
+#line 15561 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_add_actions (Page* base, GActionMap* map) {
 	LibraryPhotoPage * self;
-	GActionMap* _tmp0_ = NULL;
-	GActionMap* _tmp1_ = NULL;
-	GAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	ConfigFacade* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	GVariant* _tmp8_ = NULL;
+	GActionMap* _tmp0_;
+	GActionMap* _tmp1_;
+	GAction* _tmp2_;
+	GSimpleAction* _tmp3_;
+	GSimpleAction* _tmp4_;
+	ConfigFacade* _tmp5_;
+	ConfigFacade* _tmp6_;
+	gboolean _tmp7_;
+	GVariant* _tmp8_;
 	RawDeveloper d = 0;
-	ConfigFacade* _tmp9_ = NULL;
-	ConfigFacade* _tmp10_ = NULL;
-	RawDeveloper _tmp11_ = 0;
-	RawDeveloper _tmp12_ = 0;
+	ConfigFacade* _tmp9_;
+	ConfigFacade* _tmp10_;
+	RawDeveloper _tmp11_;
+	RawDeveloper _tmp12_;
 	const gchar* _tmp13_ = NULL;
-	RawDeveloper _tmp14_ = 0;
+	RawDeveloper _tmp14_;
 	GSimpleAction* action = NULL;
-	const GVariantType* _tmp15_ = NULL;
-	GVariant* _tmp16_ = NULL;
-	GSimpleAction* _tmp17_ = NULL;
-	GSimpleAction* _tmp18_ = NULL;
-	GActionMap* _tmp19_ = NULL;
+	const GVariantType* _tmp15_;
+	GVariant* _tmp16_;
+	GSimpleAction* _tmp17_;
+	GSimpleAction* _tmp18_;
+	GActionMap* _tmp19_;
 #line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15619,7 +15610,7 @@ static void library_photo_page_real_add_actions (Page* base, GActionMap* map) {
 	if (_tmp3_ == NULL) {
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 15618 "PhotoPage.c"
+#line 15609 "PhotoPage.c"
 	}
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
@@ -15657,11 +15648,11 @@ static void library_photo_page_real_add_actions (Page* base, GActionMap* map) {
 	if (_tmp14_ == RAW_DEVELOPER_SHOTWELL) {
 #line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = "Shotwell";
-#line 15656 "PhotoPage.c"
+#line 15647 "PhotoPage.c"
 	} else {
 #line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = "Camera";
-#line 15660 "PhotoPage.c"
+#line 15651 "PhotoPage.c"
 	}
 #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = G_VARIANT_TYPE_STRING;
@@ -15685,13 +15676,13 @@ static void library_photo_page_real_add_actions (Page* base, GActionMap* map) {
 	g_action_map_add_action (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction));
 #line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (action);
-#line 15684 "PhotoPage.c"
+#line 15675 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_remove_actions (Page* base, GActionMap* map) {
 	LibraryPhotoPage * self;
-	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp0_;
 #line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15700,7 +15691,7 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map)
 	_tmp0_ = map;
 #line 2454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (library_photo_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
-#line 15699 "PhotoPage.c"
+#line 15690 "PhotoPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -15712,15 +15703,15 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map)
 		entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries);
 #line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); entry_it = entry_it + 1) {
-#line 15711 "PhotoPage.c"
+#line 15702 "PhotoPage.c"
 			GActionEntry entry = {0};
 #line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			entry = entry_collection[entry_it];
-#line 15715 "PhotoPage.c"
+#line 15706 "PhotoPage.c"
 			{
-				GActionMap* _tmp1_ = NULL;
-				GActionEntry _tmp2_ = {0};
-				const gchar* _tmp3_ = NULL;
+				GActionMap* _tmp1_;
+				GActionEntry _tmp2_;
+				const gchar* _tmp3_;
 #line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp1_ = map;
 #line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15729,7 +15720,7 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map)
 				_tmp3_ = _tmp2_.name;
 #line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 15728 "PhotoPage.c"
+#line 15719 "PhotoPage.c"
 			}
 		}
 	}
@@ -15739,58 +15730,58 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map)
 static gpointer _injection_group_ref0 (gpointer self) {
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? injection_group_ref (self) : NULL;
-#line 15738 "PhotoPage.c"
+#line 15729 "PhotoPage.c"
 }
 
 
-static void _vala_array_add82 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add82 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15749 "PhotoPage.c"
+#line 15740 "PhotoPage.c"
 	}
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15755 "PhotoPage.c"
+#line 15746 "PhotoPage.c"
 }
 
 
-static void _vala_array_add83 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add83 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15766 "PhotoPage.c"
+#line 15757 "PhotoPage.c"
 	}
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15772 "PhotoPage.c"
+#line 15763 "PhotoPage.c"
 }
 
 
-static void _vala_array_add84 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add84 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15783 "PhotoPage.c"
+#line 15774 "PhotoPage.c"
 	}
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15789 "PhotoPage.c"
+#line 15780 "PhotoPage.c"
 }
 
 
@@ -15798,30 +15789,27 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 	LibraryPhotoPage * self;
 	InjectionGroup** result = NULL;
 	InjectionGroup** groups = NULL;
-	gint _tmp0_ = 0;
-	InjectionGroup** _tmp1_ = NULL;
-	gint groups_length1 = 0;
-	gint _groups_size_ = 0;
+	gint _tmp0_;
+	InjectionGroup** _tmp1_;
+	gint groups_length1;
+	gint _groups_size_;
 	InjectionGroup* print_group = NULL;
-	InjectionGroup* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	InjectionGroup** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	InjectionGroup* _tmp5_ = NULL;
+	InjectionGroup* _tmp2_;
+	InjectionGroup** _tmp3_;
+	gint _tmp3__length1;
+	InjectionGroup* _tmp4_;
 	InjectionGroup* publish_group = NULL;
-	InjectionGroup* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	InjectionGroup** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	InjectionGroup* _tmp9_ = NULL;
+	InjectionGroup* _tmp5_;
+	InjectionGroup** _tmp6_;
+	gint _tmp6__length1;
+	InjectionGroup* _tmp7_;
 	InjectionGroup* bg_group = NULL;
-	InjectionGroup* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	InjectionGroup** _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	InjectionGroup* _tmp13_ = NULL;
-	InjectionGroup** _tmp14_ = NULL;
-	gint _tmp14__length1 = 0;
+	InjectionGroup* _tmp8_;
+	InjectionGroup** _tmp9_;
+	gint _tmp9__length1;
+	InjectionGroup* _tmp10_;
+	InjectionGroup** _tmp11_;
+	gint _tmp11__length1;
 #line 2460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15837,61 +15825,55 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 #line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	print_group = _tmp2_;
 #line 2464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _ ("_Print");
-#line 2464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	injection_group_add_menu_item (print_group, _tmp3_, "Print", "<Primary>p");
+	injection_group_add_menu_item (print_group, _ ("_Print"), "Print", "<Primary>p");
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = groups;
+	_tmp3_ = groups;
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4__length1 = groups_length1;
+	_tmp3__length1 = groups_length1;
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = _injection_group_ref0 (print_group);
+	_tmp4_ = _injection_group_ref0 (print_group);
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add82 (&groups, &groups_length1, &_groups_size_, _tmp5_);
+	_vala_array_add82 (&groups, &groups_length1, &_groups_size_, _tmp4_);
 #line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = injection_group_new ("PublishPlaceholder");
+	_tmp5_ = injection_group_new ("PublishPlaceholder");
 #line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	publish_group = _tmp6_;
-#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = _ ("_Publish");
+	publish_group = _tmp5_;
 #line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	injection_group_add_menu_item (publish_group, _tmp7_, "Publish", "<Primary><Shift>p");
+	injection_group_add_menu_item (publish_group, _ ("_Publish"), "Publish", "<Primary><Shift>p");
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = groups;
+	_tmp6_ = groups;
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8__length1 = groups_length1;
+	_tmp6__length1 = groups_length1;
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = _injection_group_ref0 (publish_group);
+	_tmp7_ = _injection_group_ref0 (publish_group);
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add83 (&groups, &groups_length1, &_groups_size_, _tmp9_);
+	_vala_array_add83 (&groups, &groups_length1, &_groups_size_, _tmp7_);
 #line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = injection_group_new ("SetBackgroundPlaceholder");
+	_tmp8_ = injection_group_new ("SetBackgroundPlaceholder");
 #line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	bg_group = _tmp10_;
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = _ ("Set as _Desktop Background");
+	bg_group = _tmp8_;
 #line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	injection_group_add_menu_item (bg_group, _tmp11_, "SetBackground", "<Primary>b");
+	injection_group_add_menu_item (bg_group, _ ("Set as _Desktop Background"), "SetBackground", "<Primary>b");
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = groups;
+	_tmp9_ = groups;
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12__length1 = groups_length1;
+	_tmp9__length1 = groups_length1;
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = _injection_group_ref0 (bg_group);
+	_tmp10_ = _injection_group_ref0 (bg_group);
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add84 (&groups, &groups_length1, &_groups_size_, _tmp13_);
+	_vala_array_add84 (&groups, &groups_length1, &_groups_size_, _tmp10_);
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = groups;
+	_tmp11_ = groups;
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14__length1 = groups_length1;
+	_tmp11__length1 = groups_length1;
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (result_length1) {
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*result_length1 = _tmp14__length1;
-#line 15887 "PhotoPage.c"
+		*result_length1 = _tmp11__length1;
+#line 15869 "PhotoPage.c"
 	}
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp14_;
+	result = _tmp11_;
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_injection_group_unref0 (bg_group);
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15900,18 +15882,18 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 	_injection_group_unref0 (print_group);
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 15899 "PhotoPage.c"
+#line 15881 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GVariant* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
+	GVariant* _tmp0_;
+	gboolean _tmp1_;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	GSimpleAction* _tmp4_;
+	GVariant* _tmp5_;
 #line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15938,15 +15920,15 @@ static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimp
 	_tmp5_ = value;
 #line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 15937 "PhotoPage.c"
+#line 15919 "PhotoPage.c"
 }
 
 
 static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboolean display) {
 	GSimpleAction* action = NULL;
-	GAction* _tmp0_ = NULL;
-	GSimpleAction* _tmp1_ = NULL;
-	GSimpleAction* _tmp2_ = NULL;
+	GAction* _tmp0_;
+	GSimpleAction* _tmp1_;
+	GSimpleAction* _tmp2_;
 #line 2491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15957,7 +15939,7 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo
 	if (_tmp1_ == NULL) {
 #line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 15956 "PhotoPage.c"
+#line 15938 "PhotoPage.c"
 	}
 #line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	action = _tmp1_;
@@ -15965,57 +15947,57 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo
 	_tmp2_ = action;
 #line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 15964 "PhotoPage.c"
-		GSimpleAction* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+#line 15946 "PhotoPage.c"
+		GSimpleAction* _tmp3_;
+		gboolean _tmp4_;
 #line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = action;
 #line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = display;
 #line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_simple_action_set_enabled (_tmp3_, _tmp4_);
-#line 15973 "PhotoPage.c"
+#line 15955 "PhotoPage.c"
 	}
 #line 2491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (action);
-#line 15977 "PhotoPage.c"
+#line 15959 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_update_actions (Page* base, gint selected_count, gint count) {
 	LibraryPhotoPage * self;
 	gboolean multiple = FALSE;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	gboolean _tmp5_;
 	gboolean rotate_possible = FALSE;
 	gboolean _tmp9_ = FALSE;
-	gboolean _tmp10_ = FALSE;
+	gboolean _tmp10_;
 	gboolean is_raw = FALSE;
 	gboolean _tmp14_ = FALSE;
-	gboolean _tmp15_ = FALSE;
+	gboolean _tmp15_;
 	gboolean _tmp20_ = FALSE;
-	gboolean _tmp21_ = FALSE;
+	gboolean _tmp21_;
 	gboolean _tmp30_ = FALSE;
-	gboolean _tmp31_ = FALSE;
-	gboolean _tmp33_ = FALSE;
+	gboolean _tmp31_;
+	gboolean _tmp33_;
 	gboolean _tmp34_ = FALSE;
-	gboolean _tmp35_ = FALSE;
-	gboolean _tmp39_ = FALSE;
-	gboolean _tmp40_ = FALSE;
-	gboolean _tmp41_ = FALSE;
-	gboolean _tmp42_ = FALSE;
-	gboolean _tmp43_ = FALSE;
-	gboolean _tmp44_ = FALSE;
-	gboolean _tmp45_ = FALSE;
-	gboolean _tmp46_ = FALSE;
+	gboolean _tmp35_;
+	gboolean _tmp39_;
+	gboolean _tmp40_;
+	gboolean _tmp41_;
+	gboolean _tmp42_;
+	gboolean _tmp43_;
+	gboolean _tmp44_;
+	gboolean _tmp45_;
+	gboolean _tmp46_;
 	gboolean _tmp55_ = FALSE;
-	gboolean _tmp56_ = FALSE;
-	gint _tmp61_ = 0;
-	gint _tmp62_ = 0;
+	gboolean _tmp56_;
+	gint _tmp61_;
+	gint _tmp62_;
 #line 2497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16034,10 +16016,10 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp5_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 16033 "PhotoPage.c"
-		Photo* _tmp6_ = NULL;
-		Photo* _tmp7_ = NULL;
-		gboolean _tmp8_ = FALSE;
+#line 16015 "PhotoPage.c"
+		Photo* _tmp6_;
+		Photo* _tmp7_;
+		gboolean _tmp8_;
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16048,11 +16030,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		_tmp4_ = _tmp8_;
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 16047 "PhotoPage.c"
+#line 16029 "PhotoPage.c"
 	} else {
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 16051 "PhotoPage.c"
+#line 16033 "PhotoPage.c"
 	}
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	rotate_possible = _tmp4_;
@@ -16060,10 +16042,10 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp10_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_) {
-#line 16059 "PhotoPage.c"
-		Photo* _tmp11_ = NULL;
-		Photo* _tmp12_ = NULL;
-		PhotoFileFormat _tmp13_ = 0;
+#line 16041 "PhotoPage.c"
+		Photo* _tmp11_;
+		Photo* _tmp12_;
+		PhotoFileFormat _tmp13_;
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16074,11 +16056,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		_tmp9_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW;
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 16073 "PhotoPage.c"
+#line 16055 "PhotoPage.c"
 	} else {
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = FALSE;
-#line 16077 "PhotoPage.c"
+#line 16059 "PhotoPage.c"
 	}
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	is_raw = _tmp9_;
@@ -16086,11 +16068,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp15_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_) {
-#line 16085 "PhotoPage.c"
-		ConfigFacade* _tmp16_ = NULL;
-		ConfigFacade* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
+#line 16067 "PhotoPage.c"
+		ConfigFacade* _tmp16_;
+		ConfigFacade* _tmp17_;
+		gchar* _tmp18_;
+		gchar* _tmp19_;
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = config_facade_get_instance ();
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16105,11 +16087,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		_g_free0 (_tmp19_);
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp17_);
-#line 16104 "PhotoPage.c"
+#line 16086 "PhotoPage.c"
 	} else {
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 16108 "PhotoPage.c"
+#line 16090 "PhotoPage.c"
 	}
 #line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp14_);
@@ -16117,12 +16099,12 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp21_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_) {
-#line 16116 "PhotoPage.c"
+#line 16098 "PhotoPage.c"
 		gboolean _tmp22_ = FALSE;
-		Photo* _tmp23_ = NULL;
-		Photo* _tmp24_ = NULL;
-		gboolean _tmp25_ = FALSE;
-		gboolean _tmp26_ = FALSE;
+		Photo* _tmp23_;
+		Photo* _tmp24_;
+		gboolean _tmp25_;
+		gboolean _tmp26_;
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16137,11 +16119,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		if (_tmp26_) {
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = TRUE;
-#line 16136 "PhotoPage.c"
+#line 16118 "PhotoPage.c"
 		} else {
-			Photo* _tmp27_ = NULL;
-			Photo* _tmp28_ = NULL;
-			gboolean _tmp29_ = FALSE;
+			Photo* _tmp27_;
+			Photo* _tmp28_;
+			gboolean _tmp29_;
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp27_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16152,15 +16134,15 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 			_tmp22_ = _tmp29_;
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp28_);
-#line 16151 "PhotoPage.c"
+#line 16133 "PhotoPage.c"
 		}
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp22_;
-#line 16155 "PhotoPage.c"
+#line 16137 "PhotoPage.c"
 	} else {
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = FALSE;
-#line 16159 "PhotoPage.c"
+#line 16141 "PhotoPage.c"
 	}
 #line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp20_);
@@ -16168,17 +16150,17 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp31_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp31_) {
-#line 16167 "PhotoPage.c"
-		gboolean _tmp32_ = FALSE;
+#line 16149 "PhotoPage.c"
+		gboolean _tmp32_;
 #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = !_tmp32_;
-#line 16173 "PhotoPage.c"
+#line 16155 "PhotoPage.c"
 	} else {
 #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = FALSE;
-#line 16177 "PhotoPage.c"
+#line 16159 "PhotoPage.c"
 	}
 #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_) {
@@ -16186,7 +16168,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		library_photo_page_update_rating_menu_item_sensitivity (self);
 #line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_development_menu_item_sensitivity (self);
-#line 16185 "PhotoPage.c"
+#line 16167 "PhotoPage.c"
 	}
 #line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp33_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -16196,10 +16178,10 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp35_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp35_) {
-#line 16195 "PhotoPage.c"
-		Photo* _tmp36_ = NULL;
-		Photo* _tmp37_ = NULL;
-		gboolean _tmp38_ = FALSE;
+#line 16177 "PhotoPage.c"
+		Photo* _tmp36_;
+		Photo* _tmp37_;
+		gboolean _tmp38_;
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16210,11 +16192,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		_tmp34_ = _tmp38_;
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp37_);
-#line 16209 "PhotoPage.c"
+#line 16191 "PhotoPage.c"
 	} else {
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = FALSE;
-#line 16213 "PhotoPage.c"
+#line 16195 "PhotoPage.c"
 	}
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp34_);
@@ -16250,15 +16232,15 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp46_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp46_) {
-#line 16249 "PhotoPage.c"
-		Photo* _tmp47_ = NULL;
-		Photo* _tmp48_ = NULL;
+#line 16231 "PhotoPage.c"
+		Photo* _tmp47_;
+		Photo* _tmp48_;
 		Scaling _tmp49_ = {0};
-		gboolean _tmp50_ = FALSE;
-		Photo* _tmp51_ = NULL;
-		Photo* _tmp52_ = NULL;
+		gboolean _tmp50_;
+		Photo* _tmp51_;
+		Photo* _tmp52_;
 		Scaling _tmp53_ = {0};
-		gboolean _tmp54_ = FALSE;
+		gboolean _tmp54_;
 #line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp47_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16283,7 +16265,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp54_);
 #line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp52_);
-#line 16282 "PhotoPage.c"
+#line 16264 "PhotoPage.c"
 	}
 #line 2531 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_flag_action (self);
@@ -16291,11 +16273,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp56_ = is_raw;
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp56_) {
-#line 16290 "PhotoPage.c"
-		ConfigFacade* _tmp57_ = NULL;
-		ConfigFacade* _tmp58_ = NULL;
-		gchar* _tmp59_ = NULL;
-		gchar* _tmp60_ = NULL;
+#line 16272 "PhotoPage.c"
+		ConfigFacade* _tmp57_;
+		ConfigFacade* _tmp58_;
+		gchar* _tmp59_;
+		gchar* _tmp60_;
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp57_ = config_facade_get_instance ();
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16310,11 +16292,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		_g_free0 (_tmp60_);
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp58_);
-#line 16309 "PhotoPage.c"
+#line 16291 "PhotoPage.c"
 	} else {
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = FALSE;
-#line 16313 "PhotoPage.c"
+#line 16295 "PhotoPage.c"
 	}
 #line 2533 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp55_);
@@ -16324,25 +16306,25 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp62_ = count;
 #line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (library_photo_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp61_, _tmp62_);
-#line 16323 "PhotoPage.c"
+#line 16305 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 2539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 16336 "PhotoPage.c"
+#line 16318 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
-		Photo* _tmp3_ = NULL;
-		Photo* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		gboolean _tmp6_ = FALSE;
+		Photo* _tmp3_;
+		Photo* _tmp4_;
+		gboolean _tmp5_;
+		gboolean _tmp6_;
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16357,11 +16339,11 @@ static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
 		if (_tmp6_) {
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = TRUE;
-#line 16356 "PhotoPage.c"
+#line 16338 "PhotoPage.c"
 		} else {
-			Photo* _tmp7_ = NULL;
-			Photo* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			Photo* _tmp7_;
+			Photo* _tmp8_;
+			gboolean _tmp9_;
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16372,38 +16354,38 @@ static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
 			_tmp2_ = _tmp9_;
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp8_);
-#line 16371 "PhotoPage.c"
+#line 16353 "PhotoPage.c"
 		}
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 16375 "PhotoPage.c"
+#line 16357 "PhotoPage.c"
 	} else {
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 16379 "PhotoPage.c"
+#line 16361 "PhotoPage.c"
 	}
 #line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp0_);
 #line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_flag_action (self);
-#line 16385 "PhotoPage.c"
+#line 16367 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value) {
 	RawDeveloper developer = 0;
-	GVariant* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	GVariant* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
 	GQuark _tmp4_ = 0U;
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp3_label0 = 0;
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp3_label1 = 0;
-#line 16399 "PhotoPage.c"
-	RawDeveloper _tmp5_ = 0;
-	GSimpleAction* _tmp6_ = NULL;
-	GVariant* _tmp7_ = NULL;
+#line 16381 "PhotoPage.c"
+	RawDeveloper _tmp5_;
+	GSimpleAction* _tmp6_;
+	GVariant* _tmp7_;
 #line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16422,38 +16404,38 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self,
 	if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Shotwell")))) {
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16421 "PhotoPage.c"
+#line 16403 "PhotoPage.c"
 			default:
 			{
 #line 2551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				developer = RAW_DEVELOPER_SHOTWELL;
 #line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16428 "PhotoPage.c"
+#line 16410 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) {
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16434 "PhotoPage.c"
+#line 16416 "PhotoPage.c"
 			default:
 			{
 #line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				developer = RAW_DEVELOPER_CAMERA;
 #line 2555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16441 "PhotoPage.c"
+#line 16423 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16447 "PhotoPage.c"
+#line 16429 "PhotoPage.c"
 			default:
 			{
 #line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16452 "PhotoPage.c"
+#line 16434 "PhotoPage.c"
 			}
 		}
 	}
@@ -16467,30 +16449,30 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self,
 	_tmp7_ = value;
 #line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_simple_action_set_state (_tmp6_, _tmp7_);
-#line 16466 "PhotoPage.c"
+#line 16448 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, RawDeveloper rd) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	Photo* photo = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
-	GeeList* _tmp7_ = NULL;
-	gpointer _tmp8_ = NULL;
-	DataView* _tmp9_ = NULL;
-	DataSource* _tmp10_ = NULL;
-	Photo* _tmp11_ = NULL;
-	Photo* _tmp12_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	GeeList* _tmp6_;
+	GeeList* _tmp7_;
+	gpointer _tmp8_;
+	DataView* _tmp9_;
+	DataSource* _tmp10_;
+	Photo* _tmp11_;
+	Photo* _tmp12_;
 	gboolean _tmp13_ = FALSE;
-	Photo* _tmp14_ = NULL;
+	Photo* _tmp14_;
 	gboolean _tmp19_ = FALSE;
-	Photo* _tmp20_ = NULL;
-	gboolean _tmp21_ = FALSE;
+	Photo* _tmp20_;
+	gboolean _tmp21_;
 #line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16505,7 +16487,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 	if (_tmp3_) {
 #line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16504 "PhotoPage.c"
+#line 16486 "PhotoPage.c"
 	}
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -16527,7 +16509,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 	if (_tmp11_ == NULL) {
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 16526 "PhotoPage.c"
+#line 16508 "PhotoPage.c"
 	}
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
@@ -16545,12 +16527,12 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 	if (_tmp14_ == NULL) {
 #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
-#line 16544 "PhotoPage.c"
+#line 16526 "PhotoPage.c"
 	} else {
-		RawDeveloper _tmp15_ = 0;
-		Photo* _tmp16_ = NULL;
-		RawDeveloper _tmp17_ = 0;
-		gboolean _tmp18_ = FALSE;
+		RawDeveloper _tmp15_;
+		Photo* _tmp16_;
+		RawDeveloper _tmp17_;
+		gboolean _tmp18_;
 #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = rd;
 #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16561,7 +16543,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 		_tmp18_ = raw_developer_is_equivalent (_tmp15_, _tmp17_);
 #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = _tmp18_;
-#line 16560 "PhotoPage.c"
+#line 16542 "PhotoPage.c"
 	}
 #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_) {
@@ -16569,7 +16551,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 		_g_object_unref0 (photo);
 #line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16568 "PhotoPage.c"
+#line 16550 "PhotoPage.c"
 	}
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = photo;
@@ -16579,29 +16561,29 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 	if (!_tmp21_) {
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = TRUE;
-#line 16578 "PhotoPage.c"
+#line 16560 "PhotoPage.c"
 	} else {
-		gboolean _tmp22_ = FALSE;
+		gboolean _tmp22_;
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = dialogs_confirm_warn_developer_changed (1);
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp22_;
-#line 16585 "PhotoPage.c"
+#line 16567 "PhotoPage.c"
 	}
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp19_) {
-#line 16589 "PhotoPage.c"
+#line 16571 "PhotoPage.c"
 		SetRawDeveloperCommand* command = NULL;
-		ViewCollection* _tmp23_ = NULL;
-		ViewCollection* _tmp24_ = NULL;
-		GeeList* _tmp25_ = NULL;
-		GeeList* _tmp26_ = NULL;
-		RawDeveloper _tmp27_ = 0;
-		SetRawDeveloperCommand* _tmp28_ = NULL;
-		SetRawDeveloperCommand* _tmp29_ = NULL;
-		CommandManager* _tmp30_ = NULL;
-		CommandManager* _tmp31_ = NULL;
-		SetRawDeveloperCommand* _tmp32_ = NULL;
+		ViewCollection* _tmp23_;
+		ViewCollection* _tmp24_;
+		GeeList* _tmp25_;
+		GeeList* _tmp26_;
+		RawDeveloper _tmp27_;
+		SetRawDeveloperCommand* _tmp28_;
+		SetRawDeveloperCommand* _tmp29_;
+		CommandManager* _tmp30_;
+		CommandManager* _tmp31_;
+		SetRawDeveloperCommand* _tmp32_;
 #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16636,11 +16618,11 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 		library_photo_page_update_development_menu_item_sensitivity (self);
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (command);
-#line 16635 "PhotoPage.c"
+#line 16617 "PhotoPage.c"
 	}
 #line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 16639 "PhotoPage.c"
+#line 16621 "PhotoPage.c"
 }
 
 
@@ -16649,36 +16631,36 @@ void library_photo_page_developer_changed (LibraryPhotoPage* self, RawDeveloper
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	LIBRARY_PHOTO_PAGE_GET_CLASS (self)->developer_changed (self, rd);
-#line 16648 "PhotoPage.c"
+#line 16630 "PhotoPage.c"
 }
 
 
 static void library_photo_page_update_flag_action (LibraryPhotoPage* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_);
-#line 16660 "PhotoPage.c"
+#line 16642 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) {
 #line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_page_destroyed ((LibraryPhotoPage*) self);
-#line 16667 "PhotoPage.c"
+#line 16649 "PhotoPage.c"
 }
 
 
 void library_photo_page_display_for_collection (LibraryPhotoPage* self, CollectionPage* return_page, Photo* photo, ViewCollection* view) {
-	CollectionPage* _tmp0_ = NULL;
-	CollectionPage* _tmp1_ = NULL;
-	CollectionPage* _tmp2_ = NULL;
+	CollectionPage* _tmp0_;
+	CollectionPage* _tmp1_;
+	CollectionPage* _tmp2_;
 	ViewCollection* _tmp3_ = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	Photo* _tmp9_ = NULL;
+	ViewCollection* _tmp4_;
+	Photo* _tmp9_;
 #line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16703,9 +16685,9 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
 	_tmp4_ = view;
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 16702 "PhotoPage.c"
-		ViewCollection* _tmp5_ = NULL;
-		ViewCollection* _tmp6_ = NULL;
+#line 16684 "PhotoPage.c"
+		ViewCollection* _tmp5_;
+		ViewCollection* _tmp6_;
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = view;
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16714,10 +16696,10 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
 		_data_collection_unref0 (_tmp3_);
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp6_;
-#line 16713 "PhotoPage.c"
+#line 16695 "PhotoPage.c"
 	} else {
-		CollectionPage* _tmp7_ = NULL;
-		ViewCollection* _tmp8_ = NULL;
+		CollectionPage* _tmp7_;
+		ViewCollection* _tmp8_;
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = return_page;
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16726,7 +16708,7 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
 		_data_collection_unref0 (_tmp3_);
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp8_;
-#line 16725 "PhotoPage.c"
+#line 16707 "PhotoPage.c"
 	}
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = photo;
@@ -16734,7 +16716,7 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
 	editing_host_page_display_copy_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp3_, _tmp9_);
 #line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 16733 "PhotoPage.c"
+#line 16715 "PhotoPage.c"
 }
 
 
@@ -16747,14 +16729,14 @@ void library_photo_page_on_page_destroyed (LibraryPhotoPage* self) {
 	self->priv->return_page = NULL;
 #line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_unset_view_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 16746 "PhotoPage.c"
+#line 16728 "PhotoPage.c"
 }
 
 
 CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self) {
 	CollectionPage* result = NULL;
-	CollectionPage* _tmp0_ = NULL;
-	CollectionPage* _tmp1_ = NULL;
+	CollectionPage* _tmp0_;
+	CollectionPage* _tmp1_;
 #line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL);
 #line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16765,17 +16747,17 @@ CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self)
 	result = _tmp1_;
 #line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16764 "PhotoPage.c"
+#line 16746 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_switched_to (Page* base) {
 	LibraryPhotoPage * self;
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	gboolean _tmp4_;
 #line 2611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16802,7 +16784,7 @@ static void library_photo_page_real_switched_to (Page* base) {
 	library_photo_page_set_display_ratings (self, _tmp4_);
 #line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 16801 "PhotoPage.c"
+#line 16783 "PhotoPage.c"
 }
 
 
@@ -16812,7 +16794,7 @@ static void library_photo_page_real_switching_from (Page* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (library_photo_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page));
-#line 16811 "PhotoPage.c"
+#line 16793 "PhotoPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -16824,16 +16806,16 @@ static void library_photo_page_real_switching_from (Page* base) {
 		entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries);
 #line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); entry_it = entry_it + 1) {
-#line 16823 "PhotoPage.c"
+#line 16805 "PhotoPage.c"
 			GActionEntry entry = {0};
 #line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			entry = entry_collection[entry_it];
-#line 16827 "PhotoPage.c"
+#line 16809 "PhotoPage.c"
 			{
-				AppWindow* _tmp0_ = NULL;
-				AppWindow* _tmp1_ = NULL;
-				GActionEntry _tmp2_ = {0};
-				const gchar* _tmp3_ = NULL;
+				AppWindow* _tmp0_;
+				AppWindow* _tmp1_;
+				GActionEntry _tmp2_;
+				const gchar* _tmp3_;
 #line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp0_ = app_window_get_instance ();
 #line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16846,7 +16828,7 @@ static void library_photo_page_real_switching_from (Page* base) {
 				g_action_map_remove_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), _tmp3_);
 #line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp1_);
-#line 16845 "PhotoPage.c"
+#line 16827 "PhotoPage.c"
 			}
 		}
 	}
@@ -16857,13 +16839,13 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
 	LibraryPhotoPage * self;
 	GdkPixbuf* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	Photo* _tmp5_ = NULL;
-	LibraryPhoto* _tmp6_ = NULL;
-	Rating _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	GdkPixbuf* _tmp9_ = NULL;
-	GdkPixbuf* _tmp10_ = NULL;
+	gboolean _tmp1_;
+	Photo* _tmp5_;
+	LibraryPhoto* _tmp6_;
+	Rating _tmp7_;
+	gint _tmp8_;
+	GdkPixbuf* _tmp9_;
+	GdkPixbuf* _tmp10_;
 #line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16872,11 +16854,11 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
 	if (!_tmp1_) {
 #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 16871 "PhotoPage.c"
+#line 16853 "PhotoPage.c"
 	} else {
-		ConfigFacade* _tmp2_ = NULL;
-		ConfigFacade* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+		ConfigFacade* _tmp2_;
+		ConfigFacade* _tmp3_;
+		gboolean _tmp4_;
 #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = config_facade_get_instance ();
 #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16887,7 +16869,7 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
 		_tmp0_ = !_tmp4_;
 #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 16886 "PhotoPage.c"
+#line 16868 "PhotoPage.c"
 	}
 #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -16895,7 +16877,7 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
 		result = NULL;
 #line 2635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 16894 "PhotoPage.c"
+#line 16876 "PhotoPage.c"
 	}
 #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -16915,7 +16897,7 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
 	result = _tmp10_;
 #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16914 "PhotoPage.c"
+#line 16896 "PhotoPage.c"
 }
 
 
@@ -16923,8 +16905,8 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
 	LibraryPhotoPage * self;
 	GdkPixbuf* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	GdkPixbuf* _tmp5_ = NULL;
+	gboolean _tmp1_;
+	GdkPixbuf* _tmp5_;
 #line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16933,11 +16915,11 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
 	if (!_tmp1_) {
 #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 16932 "PhotoPage.c"
+#line 16914 "PhotoPage.c"
 	} else {
-		Photo* _tmp2_ = NULL;
-		LibraryPhoto* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+		Photo* _tmp2_;
+		LibraryPhoto* _tmp3_;
+		gboolean _tmp4_;
 #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16948,7 +16930,7 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
 		_tmp0_ = !_tmp4_;
 #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 16947 "PhotoPage.c"
+#line 16929 "PhotoPage.c"
 	}
 #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -16956,7 +16938,7 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
 		result = NULL;
 #line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 16955 "PhotoPage.c"
+#line 16937 "PhotoPage.c"
 	}
 #line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE);
@@ -16964,22 +16946,22 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
 	result = _tmp5_;
 #line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16963 "PhotoPage.c"
+#line 16945 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_slideshow (LibraryPhotoPage* self) {
 	LibraryPhoto* photo = NULL;
-	Photo* _tmp0_ = NULL;
-	LibraryPhoto* _tmp1_ = NULL;
-	AppWindow* _tmp2_ = NULL;
-	AppWindow* _tmp3_ = NULL;
-	LibraryPhotoSourceCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	LibraryPhoto* _tmp7_ = NULL;
-	SlideshowPage* _tmp8_ = NULL;
-	SlideshowPage* _tmp9_ = NULL;
+	Photo* _tmp0_;
+	LibraryPhoto* _tmp1_;
+	AppWindow* _tmp2_;
+	AppWindow* _tmp3_;
+	LibraryPhotoSourceCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	LibraryPhoto* _tmp7_;
+	SlideshowPage* _tmp8_;
+	SlideshowPage* _tmp9_;
 #line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16994,7 +16976,7 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) {
 		_g_object_unref0 (photo);
 #line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16993 "PhotoPage.c"
+#line 16975 "PhotoPage.c"
 	}
 #line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = app_window_get_instance ();
@@ -17024,17 +17006,17 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) {
 	_g_object_unref0 (_tmp3_);
 #line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 17023 "PhotoPage.c"
+#line 17005 "PhotoPage.c"
 }
 
 
 static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp2_;
 	gboolean _tmp4_ = FALSE;
 	ZoomState _tmp5_ = {0};
-	gboolean _tmp6_ = FALSE;
+	gboolean _tmp6_;
 #line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17043,17 +17025,17 @@ static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPa
 	_tmp2_ = zoom_state_is_max (&_tmp1_);
 #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp2_) {
-#line 17042 "PhotoPage.c"
-		gboolean _tmp3_ = FALSE;
+#line 17024 "PhotoPage.c"
+		gboolean _tmp3_;
 #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp3_;
-#line 17048 "PhotoPage.c"
+#line 17030 "PhotoPage.c"
 	} else {
 #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 17052 "PhotoPage.c"
+#line 17034 "PhotoPage.c"
 	}
 #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_);
@@ -17063,21 +17045,21 @@ static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPa
 	_tmp6_ = zoom_state_is_default (&_tmp5_);
 #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp6_) {
-#line 17062 "PhotoPage.c"
-		gboolean _tmp7_ = FALSE;
+#line 17044 "PhotoPage.c"
+		gboolean _tmp7_;
 #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = !_tmp7_;
-#line 17068 "PhotoPage.c"
+#line 17050 "PhotoPage.c"
 	} else {
 #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 17072 "PhotoPage.c"
+#line 17054 "PhotoPage.c"
 	}
 #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_);
-#line 17076 "PhotoPage.c"
+#line 17058 "PhotoPage.c"
 }
 
 
@@ -17089,7 +17071,7 @@ static void library_photo_page_real_on_increase_size (EditingHostPage* base) {
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 17088 "PhotoPage.c"
+#line 17070 "PhotoPage.c"
 }
 
 
@@ -17101,18 +17083,18 @@ static void library_photo_page_real_on_decrease_size (EditingHostPage* base) {
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 17100 "PhotoPage.c"
+#line 17082 "PhotoPage.c"
 }
 
 
 static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPage* base, GdkEventKey* event) {
 	LibraryPhotoPage * self;
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GdkEventKey* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	const gchar* _tmp4_ = NULL;
+	GdkEventKey* _tmp0_;
+	gboolean _tmp1_;
+	GdkEventKey* _tmp2_;
+	guint _tmp3_;
+	const gchar* _tmp4_;
 #line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17127,7 +17109,7 @@ static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPag
 		result = TRUE;
 #line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17126 "PhotoPage.c"
+#line 17108 "PhotoPage.c"
 	}
 #line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = event;
@@ -17143,13 +17125,13 @@ static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPag
 		result = TRUE;
 #line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17142 "PhotoPage.c"
+#line 17124 "PhotoPage.c"
 	} else {
 #line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
 #line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17148 "PhotoPage.c"
+#line 17130 "PhotoPage.c"
 	}
 }
 
@@ -17157,8 +17139,8 @@ static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPag
 static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean missing) {
 	LibraryPhotoPage * self;
 	gboolean sensitivity = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
 #line 2685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17229,15 +17211,15 @@ static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean m
 	_tmp1_ = missing;
 #line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp1_);
-#line 17228 "PhotoPage.c"
+#line 17210 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_notify_photo_backing_missing (EditingHostPage* base, Photo* photo, gboolean missing) {
 	LibraryPhotoPage * self;
-	gboolean _tmp0_ = FALSE;
-	Photo* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp0_;
+	Photo* _tmp3_;
+	gboolean _tmp4_;
 #line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17246,20 +17228,20 @@ static void library_photo_page_real_notify_photo_backing_missing (EditingHostPag
 	_tmp0_ = missing;
 #line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 17245 "PhotoPage.c"
-		Photo* _tmp1_ = NULL;
+#line 17227 "PhotoPage.c"
+		Photo* _tmp1_;
 #line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = photo;
 #line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_mark_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource));
-#line 17251 "PhotoPage.c"
+#line 17233 "PhotoPage.c"
 	} else {
-		Photo* _tmp2_ = NULL;
+		Photo* _tmp2_;
 #line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo;
 #line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource));
-#line 17258 "PhotoPage.c"
+#line 17240 "PhotoPage.c"
 	}
 #line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo;
@@ -17267,7 +17249,7 @@ static void library_photo_page_real_notify_photo_backing_missing (EditingHostPag
 	_tmp4_ = missing;
 #line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->notify_photo_backing_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp3_, _tmp4_);
-#line 17266 "PhotoPage.c"
+#line 17248 "PhotoPage.c"
 }
 
 
@@ -17276,10 +17258,10 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean handled = FALSE;
-	GdkEventKey* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
+	GdkEventKey* _tmp3_;
+	guint _tmp4_;
+	const gchar* _tmp5_;
+	const gchar* _tmp6_;
 	GQuark _tmp8_ = 0U;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label0 = 0;
@@ -17323,20 +17305,20 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event != NULL) {
-#line 17322 "PhotoPage.c"
-		GdkEventKey* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+#line 17304 "PhotoPage.c"
+		GdkEventKey* _tmp1_;
+		gboolean _tmp2_;
 #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = event;
 #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget), _tmp1_);
 #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_ == TRUE;
-#line 17331 "PhotoPage.c"
+#line 17313 "PhotoPage.c"
 	} else {
 #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 17335 "PhotoPage.c"
+#line 17317 "PhotoPage.c"
 	}
 #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -17344,7 +17326,7 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 		result = TRUE;
 #line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17343 "PhotoPage.c"
+#line 17325 "PhotoPage.c"
 	}
 #line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	handled = TRUE;
@@ -17362,12 +17344,12 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 	if (((_tmp8_ == ((0 != _tmp7_label0) ? _tmp7_label0 : (_tmp7_label0 = g_quark_from_static_string ("Escape")))) || (_tmp8_ == ((0 != _tmp7_label1) ? _tmp7_label1 : (_tmp7_label1 = g_quark_from_static_string ("Return"))))) || (_tmp8_ == ((0 != _tmp7_label2) ? _tmp7_label2 : (_tmp7_label2 = g_quark_from_static_string ("KP_Enter"))))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17361 "PhotoPage.c"
+#line 17343 "PhotoPage.c"
 			default:
 			{
-				GtkWindow* _tmp9_ = NULL;
-				GtkWindow* _tmp10_ = NULL;
-				gboolean _tmp11_ = FALSE;
+				GtkWindow* _tmp9_;
+				GtkWindow* _tmp10_;
+				gboolean _tmp11_;
 #line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp9_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17380,193 +17362,193 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 				if (_tmp11_) {
 #line 2746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					library_photo_page_return_to_collection (self);
-#line 17379 "PhotoPage.c"
+#line 17361 "PhotoPage.c"
 				}
 #line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17383 "PhotoPage.c"
+#line 17365 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Delete")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17389 "PhotoPage.c"
+#line 17371 "PhotoPage.c"
 			default:
 			{
 #line 2753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash");
 #line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17396 "PhotoPage.c"
+#line 17378 "PhotoPage.c"
 			}
 		}
 	} else if ((_tmp8_ == ((0 != _tmp7_label4) ? _tmp7_label4 : (_tmp7_label4 = g_quark_from_static_string ("period")))) || (_tmp8_ == ((0 != _tmp7_label5) ? _tmp7_label5 : (_tmp7_label5 = g_quark_from_static_string ("greater"))))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17402 "PhotoPage.c"
+#line 17384 "PhotoPage.c"
 			default:
 			{
 #line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating");
 #line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17409 "PhotoPage.c"
+#line 17391 "PhotoPage.c"
 			}
 		}
 	} else if ((_tmp8_ == ((0 != _tmp7_label6) ? _tmp7_label6 : (_tmp7_label6 = g_quark_from_static_string ("comma")))) || (_tmp8_ == ((0 != _tmp7_label7) ? _tmp7_label7 : (_tmp7_label7 = g_quark_from_static_string ("less"))))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17415 "PhotoPage.c"
+#line 17397 "PhotoPage.c"
 			default:
 			{
 #line 2763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating");
 #line 2764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17422 "PhotoPage.c"
+#line 17404 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label8) ? _tmp7_label8 : (_tmp7_label8 = g_quark_from_static_string ("KP_1")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17428 "PhotoPage.c"
+#line 17410 "PhotoPage.c"
 			default:
 			{
 #line 2767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne");
 #line 2768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17435 "PhotoPage.c"
+#line 17417 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label9) ? _tmp7_label9 : (_tmp7_label9 = g_quark_from_static_string ("KP_2")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17441 "PhotoPage.c"
+#line 17423 "PhotoPage.c"
 			default:
 			{
 #line 2771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo");
 #line 2772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17448 "PhotoPage.c"
+#line 17430 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label10) ? _tmp7_label10 : (_tmp7_label10 = g_quark_from_static_string ("KP_3")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17454 "PhotoPage.c"
+#line 17436 "PhotoPage.c"
 			default:
 			{
 #line 2775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree");
 #line 2776 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17461 "PhotoPage.c"
+#line 17443 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label11) ? _tmp7_label11 : (_tmp7_label11 = g_quark_from_static_string ("KP_4")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17467 "PhotoPage.c"
+#line 17449 "PhotoPage.c"
 			default:
 			{
 #line 2779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour");
 #line 2780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17474 "PhotoPage.c"
+#line 17456 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label12) ? _tmp7_label12 : (_tmp7_label12 = g_quark_from_static_string ("KP_5")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17480 "PhotoPage.c"
+#line 17462 "PhotoPage.c"
 			default:
 			{
 #line 2783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive");
 #line 2784 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17487 "PhotoPage.c"
+#line 17469 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label13) ? _tmp7_label13 : (_tmp7_label13 = g_quark_from_static_string ("KP_0")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17493 "PhotoPage.c"
+#line 17475 "PhotoPage.c"
 			default:
 			{
 #line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated");
 #line 2788 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17500 "PhotoPage.c"
+#line 17482 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label14) ? _tmp7_label14 : (_tmp7_label14 = g_quark_from_static_string ("KP_9")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17506 "PhotoPage.c"
+#line 17488 "PhotoPage.c"
 			default:
 			{
 #line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected");
 #line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17513 "PhotoPage.c"
+#line 17495 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label15) ? _tmp7_label15 : (_tmp7_label15 = g_quark_from_static_string ("bracketright")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17519 "PhotoPage.c"
+#line 17501 "PhotoPage.c"
 			default:
 			{
 #line 2795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
 #line 2796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17526 "PhotoPage.c"
+#line 17508 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label16) ? _tmp7_label16 : (_tmp7_label16 = g_quark_from_static_string ("bracketleft")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17532 "PhotoPage.c"
+#line 17514 "PhotoPage.c"
 			default:
 			{
 #line 2799 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
 #line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17539 "PhotoPage.c"
+#line 17521 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label17) ? _tmp7_label17 : (_tmp7_label17 = g_quark_from_static_string ("slash")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17545 "PhotoPage.c"
+#line 17527 "PhotoPage.c"
 			default:
 			{
 #line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
 #line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17552 "PhotoPage.c"
+#line 17534 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17558 "PhotoPage.c"
+#line 17540 "PhotoPage.c"
 			default:
 			{
 #line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				handled = FALSE;
 #line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17565 "PhotoPage.c"
+#line 17547 "PhotoPage.c"
 			}
 		}
 	}
@@ -17574,7 +17556,7 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 	result = handled;
 #line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17573 "PhotoPage.c"
+#line 17555 "PhotoPage.c"
 }
 
 
@@ -17582,9 +17564,9 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
 	LibraryPhotoPage * self;
 	gboolean result = FALSE;
 	FullscreenWindow* fs = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	FullscreenWindow* _tmp1_ = NULL;
-	FullscreenWindow* _tmp2_ = NULL;
+	GtkWindow* _tmp0_;
+	FullscreenWindow* _tmp1_;
+	FullscreenWindow* _tmp2_;
 #line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17597,7 +17579,7 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
 	if (_tmp1_ == NULL) {
 #line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 17596 "PhotoPage.c"
+#line 17578 "PhotoPage.c"
 	}
 #line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	fs = _tmp1_;
@@ -17607,14 +17589,14 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
 	if (_tmp2_ == NULL) {
 #line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->return_to_collection_on_release = TRUE;
-#line 17606 "PhotoPage.c"
+#line 17588 "PhotoPage.c"
 	} else {
-		FullscreenWindow* _tmp3_ = NULL;
+		FullscreenWindow* _tmp3_;
 #line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = fs;
 #line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		fullscreen_window_close (_tmp3_);
-#line 17613 "PhotoPage.c"
+#line 17595 "PhotoPage.c"
 	}
 #line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
@@ -17622,16 +17604,16 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
 	_g_object_unref0 (fs);
 #line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17621 "PhotoPage.c"
+#line 17603 "PhotoPage.c"
 }
 
 
 static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventButton* event) {
 	LibraryPhotoPage * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	GdkEventButton* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp0_;
+	GdkEventButton* _tmp1_;
+	gboolean _tmp2_;
 #line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17648,7 +17630,7 @@ static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventBu
 		result = TRUE;
 #line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17647 "PhotoPage.c"
+#line 17629 "PhotoPage.c"
 	}
 #line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
@@ -17658,29 +17640,29 @@ static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventBu
 	result = _tmp2_;
 #line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17657 "PhotoPage.c"
+#line 17639 "PhotoPage.c"
 }
 
 
 static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 	GtkMenu* result = NULL;
-	GtkMenu* _tmp0_ = NULL;
-	GtkMenu* _tmp7_ = NULL;
-	GtkMenu* _tmp8_ = NULL;
+	GtkMenu* _tmp0_;
+	GtkMenu* _tmp7_;
+	GtkMenu* _tmp8_;
 #line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL);
 #line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->context_menu;
 #line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 17672 "PhotoPage.c"
+#line 17654 "PhotoPage.c"
 		GMenuModel* model = NULL;
-		GtkBuilder* _tmp1_ = NULL;
-		GObject* _tmp2_ = NULL;
-		GMenuModel* _tmp3_ = NULL;
-		GMenuModel* _tmp4_ = NULL;
-		GtkMenu* _tmp5_ = NULL;
-		GtkMenu* _tmp6_ = NULL;
+		GtkBuilder* _tmp1_;
+		GObject* _tmp2_;
+		GMenuModel* _tmp3_;
+		GMenuModel* _tmp4_;
+		GtkMenu* _tmp5_;
+		GtkMenu* _tmp6_;
 #line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
 #line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17705,7 +17687,7 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 		gtk_menu_attach_to_widget (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
 #line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (model);
-#line 17704 "PhotoPage.c"
+#line 17686 "PhotoPage.c"
 	}
 #line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = self->priv->context_menu;
@@ -17715,16 +17697,16 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 	result = _tmp8_;
 #line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17714 "PhotoPage.c"
+#line 17696 "PhotoPage.c"
 }
 
 
 static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event) {
 	LibraryPhotoPage * self;
 	gboolean result = FALSE;
-	GtkMenu* _tmp0_ = NULL;
-	GtkMenu* _tmp1_ = NULL;
-	GdkEventButton* _tmp2_ = NULL;
+	GtkMenu* _tmp0_;
+	GtkMenu* _tmp1_;
+	GdkEventButton* _tmp2_;
 #line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17743,15 +17725,15 @@ static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkE
 	result = TRUE;
 #line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17742 "PhotoPage.c"
+#line 17724 "PhotoPage.c"
 }
 
 
 static gboolean library_photo_page_real_on_context_keypress (Page* base) {
 	LibraryPhotoPage * self;
 	gboolean result = FALSE;
-	GtkMenu* _tmp0_ = NULL;
-	GtkMenu* _tmp1_ = NULL;
+	GtkMenu* _tmp0_;
+	GtkMenu* _tmp1_;
 #line 2854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17766,22 +17748,22 @@ static gboolean library_photo_page_real_on_context_keypress (Page* base) {
 	result = TRUE;
 #line 2857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17765 "PhotoPage.c"
+#line 17747 "PhotoPage.c"
 }
 
 
 static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
-	CollectionPage* _tmp0_ = NULL;
+	CollectionPage* _tmp0_;
 #line 2860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->return_page;
 #line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (NULL != _tmp0_) {
-#line 17777 "PhotoPage.c"
-		LibraryWindow* _tmp1_ = NULL;
-		LibraryWindow* _tmp2_ = NULL;
-		CollectionPage* _tmp3_ = NULL;
+#line 17759 "PhotoPage.c"
+		LibraryWindow* _tmp1_;
+		LibraryWindow* _tmp2_;
+		CollectionPage* _tmp3_;
 #line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = library_window_get_app ();
 #line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17792,10 +17774,10 @@ static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
 		library_window_switch_to_page (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PAGE, Page));
 #line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 17791 "PhotoPage.c"
+#line 17773 "PhotoPage.c"
 	} else {
-		LibraryWindow* _tmp4_ = NULL;
-		LibraryWindow* _tmp5_ = NULL;
+		LibraryWindow* _tmp4_;
+		LibraryWindow* _tmp5_;
 #line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = library_window_get_app ();
 #line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17804,18 +17786,16 @@ static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
 		library_window_switch_to_library_page (_tmp5_);
 #line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp5_);
-#line 17803 "PhotoPage.c"
+#line 17785 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) {
 	LibraryPhoto* photo = NULL;
-	Photo* _tmp0_ = NULL;
+	Photo* _tmp0_;
 	GeeCollection* photos = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	GeeArrayList* _tmp1_;
 #line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17829,40 +17809,36 @@ static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) {
 #line 2872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_collection_add (photos, photo);
 #line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = _ ("Remove From Library");
-#line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _ ("Removing Photo From Library");
-#line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	remove_from_app (photos, _tmp2_, _tmp3_);
+	remove_from_app (photos, _ ("Remove From Library"), _ ("Removing Photo From Library"));
 #line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photos);
 #line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 17837 "PhotoPage.c"
+#line 17813 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
-	gboolean _tmp0_ = FALSE;
-	CollectionPage* _tmp1_ = NULL;
+	gboolean _tmp0_;
+	CollectionPage* _tmp1_;
 	LibraryPhoto* photo = NULL;
-	Photo* _tmp4_ = NULL;
+	Photo* _tmp4_;
 	GeeCollection* photos = NULL;
-	GeeArrayList* _tmp5_ = NULL;
-	GeeCollection* _tmp6_ = NULL;
-	LibraryPhoto* _tmp7_ = NULL;
-	LibraryPhoto* _tmp8_ = NULL;
-	Photo* _tmp9_ = NULL;
-	Photo* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
-	gboolean _tmp12_ = FALSE;
-	CommandManager* _tmp22_ = NULL;
-	CommandManager* _tmp23_ = NULL;
-	GeeCollection* _tmp24_ = NULL;
-	TrashUntrashPhotosCommand* _tmp25_ = NULL;
-	TrashUntrashPhotosCommand* _tmp26_ = NULL;
-	LibraryWindow* _tmp27_ = NULL;
-	LibraryWindow* _tmp28_ = NULL;
+	GeeArrayList* _tmp5_;
+	GeeCollection* _tmp6_;
+	LibraryPhoto* _tmp7_;
+	LibraryPhoto* _tmp8_;
+	Photo* _tmp9_;
+	Photo* _tmp10_;
+	gboolean _tmp11_;
+	gboolean _tmp12_;
+	CommandManager* _tmp22_;
+	CommandManager* _tmp23_;
+	GeeCollection* _tmp24_;
+	TrashUntrashPhotosCommand* _tmp25_;
+	TrashUntrashPhotosCommand* _tmp26_;
+	LibraryWindow* _tmp27_;
+	LibraryWindow* _tmp28_;
 #line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17871,15 +17847,15 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 	if (!_tmp0_) {
 #line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 17870 "PhotoPage.c"
+#line 17846 "PhotoPage.c"
 	}
 #line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->return_page;
 #line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENT_PAGE)) {
-#line 17876 "PhotoPage.c"
-		LibraryWindow* _tmp2_ = NULL;
-		LibraryWindow* _tmp3_ = NULL;
+#line 17852 "PhotoPage.c"
+		LibraryWindow* _tmp2_;
+		LibraryWindow* _tmp3_;
 #line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = library_window_get_app ();
 #line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17888,7 +17864,7 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 		library_window_set_page_switching_enabled (_tmp3_, FALSE);
 #line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 17887 "PhotoPage.c"
+#line 17863 "PhotoPage.c"
 	}
 #line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -17920,14 +17896,14 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 	_g_object_unref0 (_tmp10_);
 #line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 17919 "PhotoPage.c"
-		LibraryWindow* _tmp13_ = NULL;
-		LibraryWindow* _tmp14_ = NULL;
-		GtkWindow* _tmp15_ = NULL;
-		GtkWindow* _tmp16_ = NULL;
-		gboolean _tmp17_ = FALSE;
-		LibraryWindow* _tmp20_ = NULL;
-		LibraryWindow* _tmp21_ = NULL;
+#line 17895 "PhotoPage.c"
+		LibraryWindow* _tmp13_;
+		LibraryWindow* _tmp14_;
+		GtkWindow* _tmp15_;
+		GtkWindow* _tmp16_;
+		gboolean _tmp17_;
+		LibraryWindow* _tmp20_;
+		LibraryWindow* _tmp21_;
 #line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = library_window_get_app ();
 #line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17946,9 +17922,9 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 		_g_object_unref0 (_tmp16_);
 #line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp17_) {
-#line 17945 "PhotoPage.c"
-			GtkWindow* _tmp18_ = NULL;
-			FullscreenWindow* _tmp19_ = NULL;
+#line 17921 "PhotoPage.c"
+			GtkWindow* _tmp18_;
+			FullscreenWindow* _tmp19_;
 #line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp18_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17957,7 +17933,7 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 			fullscreen_window_close (_tmp19_);
 #line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp19_);
-#line 17956 "PhotoPage.c"
+#line 17932 "PhotoPage.c"
 		}
 #line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = library_window_get_app ();
@@ -17967,7 +17943,7 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 		library_window_switch_to_library_page (_tmp21_);
 #line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp21_);
-#line 17966 "PhotoPage.c"
+#line 17942 "PhotoPage.c"
 	}
 #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -17997,32 +17973,32 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 	_g_object_unref0 (photos);
 #line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 17996 "PhotoPage.c"
+#line 17972 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 18008 "PhotoPage.c"
+#line 17984 "PhotoPage.c"
 		GeeArrayList* photo_list = NULL;
-		GeeArrayList* _tmp1_ = NULL;
-		GeeArrayList* _tmp2_ = NULL;
-		Photo* _tmp3_ = NULL;
-		Photo* _tmp4_ = NULL;
-		CommandManager* _tmp5_ = NULL;
-		CommandManager* _tmp6_ = NULL;
-		GeeArrayList* _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
-		LibraryPhoto* _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
-		FlagUnflagCommand* _tmp11_ = NULL;
-		FlagUnflagCommand* _tmp12_ = NULL;
+		GeeArrayList* _tmp1_;
+		GeeArrayList* _tmp2_;
+		Photo* _tmp3_;
+		Photo* _tmp4_;
+		CommandManager* _tmp5_;
+		CommandManager* _tmp6_;
+		GeeArrayList* _tmp7_;
+		Photo* _tmp8_;
+		LibraryPhoto* _tmp9_;
+		gboolean _tmp10_;
+		FlagUnflagCommand* _tmp11_;
+		FlagUnflagCommand* _tmp12_;
 #line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18063,13 +18039,13 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
 		_command_manager_unref0 (_tmp6_);
 #line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo_list);
-#line 18062 "PhotoPage.c"
+#line 18038 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, DataSource* source) {
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18078,28 +18054,28 @@ static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, DataS
 	_tmp0_ = source;
 #line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_removed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 18077 "PhotoPage.c"
+#line 18053 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, LibraryPhoto* photo) {
 	gboolean _tmp0_ = FALSE;
-	LibraryPhoto* _tmp1_ = NULL;
+	LibraryPhoto* _tmp1_;
 	ViewCollection* view = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	ViewCollection* _tmp8_ = NULL;
-	ViewCollection* _tmp9_ = NULL;
-	LibraryPhoto* _tmp10_ = NULL;
-	DataView* _tmp11_ = NULL;
-	DataView* _tmp12_ = NULL;
-	Marker* _tmp13_ = NULL;
-	Marker* _tmp14_ = NULL;
-	LibraryPhoto* _tmp15_ = NULL;
-	Photo* _tmp16_ = NULL;
-	Photo* _tmp17_ = NULL;
-	gboolean _tmp18_ = FALSE;
-	gboolean _tmp19_ = FALSE;
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
+	ViewCollection* _tmp8_;
+	ViewCollection* _tmp9_;
+	LibraryPhoto* _tmp10_;
+	DataView* _tmp11_;
+	DataView* _tmp12_;
+	Marker* _tmp13_;
+	Marker* _tmp14_;
+	LibraryPhoto* _tmp15_;
+	Photo* _tmp16_;
+	Photo* _tmp17_;
+	gboolean _tmp18_;
+	gboolean _tmp19_;
 #line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18110,12 +18086,12 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library
 	if (_tmp1_ == NULL) {
 #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18109 "PhotoPage.c"
+#line 18085 "PhotoPage.c"
 	} else {
-		LibraryPhoto* _tmp2_ = NULL;
-		Photo* _tmp3_ = NULL;
-		Photo* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+		LibraryPhoto* _tmp2_;
+		Photo* _tmp3_;
+		Photo* _tmp4_;
+		gboolean _tmp5_;
 #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo;
 #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18128,13 +18104,13 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library
 		_tmp0_ = !_tmp5_;
 #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 18127 "PhotoPage.c"
+#line 18103 "PhotoPage.c"
 	}
 #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18133 "PhotoPage.c"
+#line 18109 "PhotoPage.c"
 	}
 #line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
@@ -18178,9 +18154,9 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library
 	_g_object_unref0 (_tmp17_);
 #line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp19_) {
-#line 18177 "PhotoPage.c"
-		LibraryWindow* _tmp20_ = NULL;
-		LibraryWindow* _tmp21_ = NULL;
+#line 18153 "PhotoPage.c"
+		LibraryWindow* _tmp20_;
+		LibraryWindow* _tmp21_;
 #line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = library_window_get_app ();
 #line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18189,19 +18165,19 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library
 		library_window_switch_to_library_page (_tmp21_);
 #line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp21_);
-#line 18188 "PhotoPage.c"
+#line 18164 "PhotoPage.c"
 	}
 #line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (view);
-#line 18192 "PhotoPage.c"
+#line 18168 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_print (LibraryPhotoPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 #line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18216,13 +18192,13 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) {
 	_data_collection_unref0 (_tmp1_);
 #line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 18215 "PhotoPage.c"
-		PrintManager* _tmp4_ = NULL;
-		PrintManager* _tmp5_ = NULL;
-		ViewCollection* _tmp6_ = NULL;
-		ViewCollection* _tmp7_ = NULL;
-		GeeList* _tmp8_ = NULL;
-		GeeCollection* _tmp9_ = NULL;
+#line 18191 "PhotoPage.c"
+		PrintManager* _tmp4_;
+		PrintManager* _tmp5_;
+		ViewCollection* _tmp6_;
+		ViewCollection* _tmp7_;
+		GeeList* _tmp8_;
+		GeeCollection* _tmp9_;
 #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = print_manager_get_instance ();
 #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18243,25 +18219,25 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) {
 		_data_collection_unref0 (_tmp7_);
 #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 18242 "PhotoPage.c"
+#line 18218 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 18256 "PhotoPage.c"
-		ConfigFacade* _tmp2_ = NULL;
-		ConfigFacade* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+#line 18232 "PhotoPage.c"
+		ConfigFacade* _tmp2_;
+		ConfigFacade* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = config_facade_get_instance ();
 #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18276,20 +18252,20 @@ static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self)
 		_g_free0 (_tmp5_);
 #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 18275 "PhotoPage.c"
+#line 18251 "PhotoPage.c"
 	} else {
 #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 18279 "PhotoPage.c"
+#line 18255 "PhotoPage.c"
 	}
 #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp0_);
-#line 18283 "PhotoPage.c"
+#line 18259 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
@@ -18299,15 +18275,15 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 	if (!_tmp0_) {
 #line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18298 "PhotoPage.c"
+#line 18274 "PhotoPage.c"
 	}
 	{
-		AppWindow* _tmp1_ = NULL;
-		AppWindow* _tmp2_ = NULL;
-		Photo* _tmp3_ = NULL;
-		Photo* _tmp4_ = NULL;
-		AppWindow* _tmp5_ = NULL;
-		AppWindow* _tmp6_ = NULL;
+		AppWindow* _tmp1_;
+		AppWindow* _tmp2_;
+		Photo* _tmp3_;
+		Photo* _tmp4_;
+		AppWindow* _tmp5_;
+		AppWindow* _tmp6_;
 #line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = app_window_get_instance ();
 #line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18326,8 +18302,8 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		_g_object_unref0 (_tmp4_);
 #line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18325 "PhotoPage.c"
-			goto __catch251_g_error;
+#line 18301 "PhotoPage.c"
+			goto __catch252_g_error;
 		}
 #line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = app_window_get_instance ();
@@ -18337,17 +18313,17 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
 #line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 18336 "PhotoPage.c"
+#line 18312 "PhotoPage.c"
 	}
-	goto __finally251;
-	__catch251_g_error:
+	goto __finally252;
+	__catch252_g_error:
 	{
 		GError* err = NULL;
-		AppWindow* _tmp7_ = NULL;
-		AppWindow* _tmp8_ = NULL;
-		GError* _tmp9_ = NULL;
-		Photo* _tmp10_ = NULL;
-		Photo* _tmp11_ = NULL;
+		AppWindow* _tmp7_;
+		AppWindow* _tmp8_;
+		GError* _tmp9_;
+		Photo* _tmp10_;
+		Photo* _tmp11_;
 #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
 #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18372,9 +18348,9 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		_g_object_unref0 (_tmp11_);
 #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18371 "PhotoPage.c"
+#line 18347 "PhotoPage.c"
 	}
-	__finally251:
+	__finally252:
 #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18383,17 +18359,17 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		g_clear_error (&_inner_error_);
 #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18382 "PhotoPage.c"
+#line 18358 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
-	gboolean _tmp0_ = FALSE;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	PhotoFileFormat _tmp3_ = 0;
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	PhotoFileFormat _tmp3_;
+	gboolean _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
@@ -18403,7 +18379,7 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 	if (!_tmp0_) {
 #line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18402 "PhotoPage.c"
+#line 18378 "PhotoPage.c"
 	}
 #line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -18419,15 +18395,15 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 	if (_tmp4_) {
 #line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18418 "PhotoPage.c"
+#line 18394 "PhotoPage.c"
 	}
 	{
-		AppWindow* _tmp5_ = NULL;
-		AppWindow* _tmp6_ = NULL;
-		Photo* _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
-		AppWindow* _tmp9_ = NULL;
-		AppWindow* _tmp10_ = NULL;
+		AppWindow* _tmp5_;
+		AppWindow* _tmp6_;
+		Photo* _tmp7_;
+		Photo* _tmp8_;
+		AppWindow* _tmp9_;
+		AppWindow* _tmp10_;
 #line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = app_window_get_instance ();
 #line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18446,8 +18422,8 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		_g_object_unref0 (_tmp8_);
 #line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18445 "PhotoPage.c"
-			goto __catch252_g_error;
+#line 18421 "PhotoPage.c"
+			goto __catch253_g_error;
 		}
 #line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = app_window_get_instance ();
@@ -18457,17 +18433,17 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE_WINDOW, PageWindow));
 #line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 18456 "PhotoPage.c"
+#line 18432 "PhotoPage.c"
 	}
-	goto __finally252;
-	__catch252_g_error:
+	goto __finally253;
+	__catch253_g_error:
 	{
 		GError* err = NULL;
-		AppWindow* _tmp11_ = NULL;
-		AppWindow* _tmp12_ = NULL;
-		GError* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
+		AppWindow* _tmp11_;
+		AppWindow* _tmp12_;
+		GError* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
 #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
 #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18492,9 +18468,9 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		_g_free0 (_tmp15_);
 #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18491 "PhotoPage.c"
+#line 18467 "PhotoPage.c"
 	}
-	__finally252:
+	__finally253:
 #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18503,24 +18479,24 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		g_clear_error (&_inner_error_);
 #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18502 "PhotoPage.c"
+#line 18478 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_send_to (LibraryPhotoPage* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 2989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 18515 "PhotoPage.c"
-		ViewCollection* _tmp1_ = NULL;
-		ViewCollection* _tmp2_ = NULL;
-		GeeList* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
+#line 18491 "PhotoPage.c"
+		ViewCollection* _tmp1_;
+		ViewCollection* _tmp2_;
+		GeeList* _tmp3_;
+		GeeCollection* _tmp4_;
 #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18535,37 +18511,36 @@ static void library_photo_page_on_send_to (LibraryPhotoPage* self) {
 		_g_object_unref0 (_tmp4_);
 #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 18534 "PhotoPage.c"
+#line 18510 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_export (LibraryPhotoPage* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	ExportDialog* export_dialog = NULL;
-	const gchar* _tmp1_ = NULL;
-	ExportDialog* _tmp2_ = NULL;
+	ExportDialog* _tmp1_;
 	gint scale = 0;
 	ScaleConstraint constraint = 0;
 	ExportFormatParameters export_params = {0};
-	ExportFormatParameters _tmp3_ = {0};
-	ExportDialog* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	ScaleConstraint _tmp6_ = 0;
-	gboolean _tmp7_ = FALSE;
+	ExportFormatParameters _tmp2_ = {0};
+	ExportDialog* _tmp3_;
+	gint _tmp4_ = 0;
+	ScaleConstraint _tmp5_ = 0;
+	gboolean _tmp6_;
 	GFile* save_as = NULL;
-	Photo* _tmp8_ = NULL;
-	Photo* _tmp9_ = NULL;
-	ExportFormatParameters _tmp10_ = {0};
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	GFile* _tmp13_ = NULL;
-	GFile* _tmp14_ = NULL;
-	GFile* _tmp15_ = NULL;
+	Photo* _tmp7_;
+	Photo* _tmp8_;
+	ExportFormatParameters _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	GFile* _tmp12_;
+	GFile* _tmp13_;
+	GFile* _tmp14_;
 	Scaling scaling = {0};
-	ScaleConstraint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	Scaling _tmp18_ = {0};
+	ScaleConstraint _tmp15_;
+	gint _tmp16_;
+	Scaling _tmp17_ = {0};
 	GError * _inner_error_ = NULL;
 #line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
@@ -18575,175 +18550,170 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 	if (!_tmp0_) {
 #line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18574 "PhotoPage.c"
+#line 18549 "PhotoPage.c"
 	}
 #line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = _ ("Export Photo");
-#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = export_dialog_new (_tmp1_);
+	_tmp1_ = export_dialog_new (_ ("Export Photo"));
 #line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp2_);
+	g_object_ref_sink (_tmp1_);
 #line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	export_dialog = _tmp2_;
+	export_dialog = _tmp1_;
 #line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	export_format_parameters_last (&_tmp3_);
+	export_format_parameters_last (&_tmp2_);
 #line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	export_params = _tmp3_;
+	export_params = _tmp2_;
 #line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = export_dialog;
+	_tmp3_ = export_dialog;
 #line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = export_dialog_execute (_tmp4_, &_tmp5_, &_tmp6_, &export_params);
+	_tmp6_ = export_dialog_execute (_tmp3_, &_tmp4_, &_tmp5_, &export_params);
 #line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	scale = _tmp5_;
+	scale = _tmp4_;
 #line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	constraint = _tmp6_;
+	constraint = _tmp5_;
 #line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp7_) {
+	if (!_tmp6_) {
 #line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
 #line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18602 "PhotoPage.c"
+#line 18575 "PhotoPage.c"
 	}
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = export_params;
+	_tmp9_ = export_params;
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = photo_get_export_basename_for_parameters (_tmp9_, &_tmp10_);
+	_tmp10_ = photo_get_export_basename_for_parameters (_tmp8_, &_tmp9_);
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = _tmp11_;
+	_tmp11_ = _tmp10_;
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = export_ui_choose_file (_tmp12_);
+	_tmp12_ = export_ui_choose_file (_tmp11_);
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = _tmp13_;
+	_tmp13_ = _tmp12_;
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_free0 (_tmp12_);
+	_g_free0 (_tmp11_);
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp9_);
+	_g_object_unref0 (_tmp8_);
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	save_as = _tmp14_;
+	save_as = _tmp13_;
 #line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp15_ = save_as;
+	_tmp14_ = save_as;
 #line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp15_ == NULL) {
+	if (_tmp14_ == NULL) {
 #line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (save_as);
 #line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
 #line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18634 "PhotoPage.c"
+#line 18607 "PhotoPage.c"
 	}
 #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = constraint;
+	_tmp15_ = constraint;
 #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = scale;
+	_tmp16_ = scale;
 #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	scaling_for_constraint (_tmp16_, _tmp17_, FALSE, &_tmp18_);
+	scaling_for_constraint (_tmp15_, _tmp16_, FALSE, &_tmp17_);
 #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	scaling = _tmp18_;
-#line 18644 "PhotoPage.c"
+	scaling = _tmp17_;
+#line 18617 "PhotoPage.c"
 	{
-		Photo* _tmp19_ = NULL;
-		Photo* _tmp20_ = NULL;
-		GFile* _tmp21_ = NULL;
-		Scaling _tmp22_ = {0};
-		ExportFormatParameters _tmp23_ = {0};
-		JpegQuality _tmp24_ = 0;
-		Photo* _tmp25_ = NULL;
-		Photo* _tmp26_ = NULL;
-		ExportFormatParameters _tmp27_ = {0};
-		PhotoFileFormat _tmp28_ = 0;
-		ExportFormatParameters _tmp29_ = {0};
-		ExportFormatMode _tmp30_ = 0;
-		ExportFormatParameters _tmp31_ = {0};
-		gboolean _tmp32_ = FALSE;
+		Photo* _tmp18_;
+		Photo* _tmp19_;
+		GFile* _tmp20_;
+		Scaling _tmp21_;
+		ExportFormatParameters _tmp22_;
+		JpegQuality _tmp23_;
+		Photo* _tmp24_;
+		Photo* _tmp25_;
+		ExportFormatParameters _tmp26_;
+		PhotoFileFormat _tmp27_;
+		ExportFormatParameters _tmp28_;
+		ExportFormatMode _tmp29_;
+		ExportFormatParameters _tmp30_;
+		gboolean _tmp31_;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+		_tmp18_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = _tmp19_;
+		_tmp19_ = _tmp18_;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp21_ = save_as;
+		_tmp20_ = save_as;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp22_ = scaling;
+		_tmp21_ = scaling;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp23_ = export_params;
+		_tmp22_ = export_params;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp24_ = _tmp23_.quality;
+		_tmp23_ = _tmp22_.quality;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp25_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+		_tmp24_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp26_ = _tmp25_;
+		_tmp25_ = _tmp24_;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp27_ = export_params;
+		_tmp26_ = export_params;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp28_ = photo_get_export_format_for_parameters (_tmp26_, &_tmp27_);
+		_tmp27_ = photo_get_export_format_for_parameters (_tmp25_, &_tmp26_);
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp29_ = export_params;
+		_tmp28_ = export_params;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp30_ = _tmp29_.mode;
+		_tmp29_ = _tmp28_.mode;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp31_ = export_params;
+		_tmp30_ = export_params;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp32_ = _tmp31_.export_metadata;
+		_tmp31_ = _tmp30_.export_metadata;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		photo_export (_tmp20_, _tmp21_, &_tmp22_, _tmp24_, _tmp28_, _tmp30_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp32_, &_inner_error_);
+		photo_export (_tmp19_, _tmp20_, &_tmp21_, _tmp23_, _tmp27_, _tmp29_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp31_, &_inner_error_);
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp26_);
+		_g_object_unref0 (_tmp25_);
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp20_);
+		_g_object_unref0 (_tmp19_);
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18696 "PhotoPage.c"
-			goto __catch253_g_error;
+#line 18669 "PhotoPage.c"
+			goto __catch254_g_error;
 		}
 	}
-	goto __finally253;
-	__catch253_g_error:
+	goto __finally254;
+	__catch254_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp33_ = NULL;
-		GFile* _tmp34_ = NULL;
-		gchar* _tmp35_ = NULL;
-		gchar* _tmp36_ = NULL;
-		GError* _tmp37_ = NULL;
-		const gchar* _tmp38_ = NULL;
-		gchar* _tmp39_ = NULL;
-		gchar* _tmp40_ = NULL;
+		GFile* _tmp32_;
+		gchar* _tmp33_;
+		gchar* _tmp34_;
+		GError* _tmp35_;
+		const gchar* _tmp36_;
+		gchar* _tmp37_;
+		gchar* _tmp38_;
 #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
 #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp33_ = _ ("Unable to export %s: %s");
+		_tmp32_ = save_as;
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp34_ = save_as;
+		_tmp33_ = g_file_get_path (_tmp32_);
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp35_ = g_file_get_path (_tmp34_);
+		_tmp34_ = _tmp33_;
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp36_ = _tmp35_;
+		_tmp35_ = err;
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp37_ = err;
+		_tmp36_ = _tmp35_->message;
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp38_ = _tmp37_->message;
+		_tmp37_ = g_strdup_printf (_ ("Unable to export %s: %s"), _tmp34_, _tmp36_);
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp39_ = g_strdup_printf (_tmp33_, _tmp36_, _tmp38_);
-#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp40_ = _tmp39_;
+		_tmp38_ = _tmp37_;
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		app_window_error_message (_tmp40_, NULL);
+		app_window_error_message (_tmp38_, NULL);
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp40_);
+		_g_free0 (_tmp38_);
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp36_);
+		_g_free0 (_tmp34_);
 #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18740 "PhotoPage.c"
+#line 18710 "PhotoPage.c"
 	}
-	__finally253:
+	__finally254:
 #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18756,21 +18726,21 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		g_clear_error (&_inner_error_);
 #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18755 "PhotoPage.c"
+#line 18725 "PhotoPage.c"
 	}
 #line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (save_as);
 #line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 18761 "PhotoPage.c"
+#line 18731 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_publish (LibraryPhotoPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 #line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18785,11 +18755,11 @@ static void library_photo_page_on_publish (LibraryPhotoPage* self) {
 	_data_collection_unref0 (_tmp1_);
 #line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 18784 "PhotoPage.c"
-		ViewCollection* _tmp4_ = NULL;
-		ViewCollection* _tmp5_ = NULL;
-		GeeList* _tmp6_ = NULL;
-		GeeCollection* _tmp7_ = NULL;
+#line 18754 "PhotoPage.c"
+		ViewCollection* _tmp4_;
+		ViewCollection* _tmp5_;
+		GeeList* _tmp6_;
+		GeeCollection* _tmp7_;
 #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18804,22 +18774,22 @@ static void library_photo_page_on_publish (LibraryPhotoPage* self) {
 		_g_object_unref0 (_tmp7_);
 #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 18803 "PhotoPage.c"
+#line 18773 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	SetRatingSingleCommand* command = NULL;
-	Photo* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	SetRatingSingleCommand* _tmp5_ = NULL;
-	SetRatingSingleCommand* _tmp6_ = NULL;
-	CommandManager* _tmp7_ = NULL;
-	CommandManager* _tmp8_ = NULL;
-	SetRatingSingleCommand* _tmp9_ = NULL;
+	Photo* _tmp3_;
+	Photo* _tmp4_;
+	SetRatingSingleCommand* _tmp5_;
+	SetRatingSingleCommand* _tmp6_;
+	CommandManager* _tmp7_;
+	CommandManager* _tmp8_;
+	SetRatingSingleCommand* _tmp9_;
 #line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18828,20 +18798,20 @@ static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) {
 	if (!_tmp1_) {
 #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18827 "PhotoPage.c"
+#line 18797 "PhotoPage.c"
 	} else {
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18834 "PhotoPage.c"
+#line 18804 "PhotoPage.c"
 	}
 #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 3030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18840 "PhotoPage.c"
+#line 18810 "PhotoPage.c"
 	}
 #line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -18869,21 +18839,21 @@ static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) {
 	library_photo_page_update_rating_menu_item_sensitivity (self);
 #line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18868 "PhotoPage.c"
+#line 18838 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	SetRatingSingleCommand* command = NULL;
-	Photo* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	SetRatingSingleCommand* _tmp5_ = NULL;
-	SetRatingSingleCommand* _tmp6_ = NULL;
-	CommandManager* _tmp7_ = NULL;
-	CommandManager* _tmp8_ = NULL;
-	SetRatingSingleCommand* _tmp9_ = NULL;
+	Photo* _tmp3_;
+	Photo* _tmp4_;
+	SetRatingSingleCommand* _tmp5_;
+	SetRatingSingleCommand* _tmp6_;
+	CommandManager* _tmp7_;
+	CommandManager* _tmp8_;
+	SetRatingSingleCommand* _tmp9_;
 #line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18892,20 +18862,20 @@ static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) {
 	if (!_tmp1_) {
 #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18891 "PhotoPage.c"
+#line 18861 "PhotoPage.c"
 	} else {
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18898 "PhotoPage.c"
+#line 18868 "PhotoPage.c"
 	}
 #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 3040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18904 "PhotoPage.c"
+#line 18874 "PhotoPage.c"
 	}
 #line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -18933,22 +18903,22 @@ static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) {
 	library_photo_page_update_rating_menu_item_sensitivity (self);
 #line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18932 "PhotoPage.c"
+#line 18902 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rating) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	SetRatingSingleCommand* command = NULL;
-	Photo* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	Rating _tmp5_ = 0;
-	SetRatingSingleCommand* _tmp6_ = NULL;
-	SetRatingSingleCommand* _tmp7_ = NULL;
-	CommandManager* _tmp8_ = NULL;
-	CommandManager* _tmp9_ = NULL;
-	SetRatingSingleCommand* _tmp10_ = NULL;
+	Photo* _tmp3_;
+	Photo* _tmp4_;
+	Rating _tmp5_;
+	SetRatingSingleCommand* _tmp6_;
+	SetRatingSingleCommand* _tmp7_;
+	CommandManager* _tmp8_;
+	CommandManager* _tmp9_;
+	SetRatingSingleCommand* _tmp10_;
 #line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18957,20 +18927,20 @@ static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rat
 	if (!_tmp1_) {
 #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18956 "PhotoPage.c"
+#line 18926 "PhotoPage.c"
 	} else {
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18963 "PhotoPage.c"
+#line 18933 "PhotoPage.c"
 	}
 #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18969 "PhotoPage.c"
+#line 18939 "PhotoPage.c"
 	}
 #line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -19000,7 +18970,7 @@ static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rat
 	library_photo_page_update_rating_menu_item_sensitivity (self);
 #line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18999 "PhotoPage.c"
+#line 18969 "PhotoPage.c"
 }
 
 
@@ -19009,7 +18979,7 @@ static void library_photo_page_on_rate_rejected (LibraryPhotoPage* self) {
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_REJECTED);
-#line 19008 "PhotoPage.c"
+#line 18978 "PhotoPage.c"
 }
 
 
@@ -19018,7 +18988,7 @@ static void library_photo_page_on_rate_unrated (LibraryPhotoPage* self) {
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_UNRATED);
-#line 19017 "PhotoPage.c"
+#line 18987 "PhotoPage.c"
 }
 
 
@@ -19027,7 +18997,7 @@ static void library_photo_page_on_rate_one (LibraryPhotoPage* self) {
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_ONE);
-#line 19026 "PhotoPage.c"
+#line 18996 "PhotoPage.c"
 }
 
 
@@ -19036,7 +19006,7 @@ static void library_photo_page_on_rate_two (LibraryPhotoPage* self) {
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_TWO);
-#line 19035 "PhotoPage.c"
+#line 19005 "PhotoPage.c"
 }
 
 
@@ -19045,7 +19015,7 @@ static void library_photo_page_on_rate_three (LibraryPhotoPage* self) {
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_THREE);
-#line 19044 "PhotoPage.c"
+#line 19014 "PhotoPage.c"
 }
 
 
@@ -19054,7 +19024,7 @@ static void library_photo_page_on_rate_four (LibraryPhotoPage* self) {
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_FOUR);
-#line 19053 "PhotoPage.c"
+#line 19023 "PhotoPage.c"
 }
 
 
@@ -19063,40 +19033,40 @@ static void library_photo_page_on_rate_five (LibraryPhotoPage* self) {
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_FIVE);
-#line 19062 "PhotoPage.c"
+#line 19032 "PhotoPage.c"
 }
 
 
 static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhotoPage* self) {
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Rating _tmp2_ = 0;
-	Photo* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	Rating _tmp5_ = 0;
-	Photo* _tmp6_ = NULL;
-	Photo* _tmp7_ = NULL;
-	Rating _tmp8_ = 0;
-	Photo* _tmp9_ = NULL;
-	Photo* _tmp10_ = NULL;
-	Rating _tmp11_ = 0;
-	Photo* _tmp12_ = NULL;
-	Photo* _tmp13_ = NULL;
-	Rating _tmp14_ = 0;
-	Photo* _tmp15_ = NULL;
-	Photo* _tmp16_ = NULL;
-	Rating _tmp17_ = 0;
-	Photo* _tmp18_ = NULL;
-	Photo* _tmp19_ = NULL;
-	Rating _tmp20_ = 0;
-	Photo* _tmp21_ = NULL;
-	Photo* _tmp22_ = NULL;
-	Rating _tmp23_ = 0;
-	gboolean _tmp24_ = FALSE;
-	Photo* _tmp25_ = NULL;
-	Photo* _tmp26_ = NULL;
-	Rating _tmp27_ = 0;
-	gboolean _tmp28_ = FALSE;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
+	Rating _tmp2_;
+	Photo* _tmp3_;
+	Photo* _tmp4_;
+	Rating _tmp5_;
+	Photo* _tmp6_;
+	Photo* _tmp7_;
+	Rating _tmp8_;
+	Photo* _tmp9_;
+	Photo* _tmp10_;
+	Rating _tmp11_;
+	Photo* _tmp12_;
+	Photo* _tmp13_;
+	Rating _tmp14_;
+	Photo* _tmp15_;
+	Photo* _tmp16_;
+	Rating _tmp17_;
+	Photo* _tmp18_;
+	Photo* _tmp19_;
+	Rating _tmp20_;
+	Photo* _tmp21_;
+	Photo* _tmp22_;
+	Rating _tmp23_;
+	gboolean _tmp24_;
+	Photo* _tmp25_;
+	Photo* _tmp26_;
+	Rating _tmp27_;
+	gboolean _tmp28_;
 #line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19193,32 +19163,32 @@ static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhoto
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp28_);
 #line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp26_);
-#line 19192 "PhotoPage.c"
+#line 19162 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new18 (const gchar* value) {
 #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 19199 "PhotoPage.c"
+#line 19169 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new19 (const gchar* value) {
 #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 19206 "PhotoPage.c"
+#line 19176 "PhotoPage.c"
 }
 
 
 static void library_photo_page_update_development_menu_item_sensitivity (LibraryPhotoPage* self) {
 	PhotoFileFormat format = 0;
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	PhotoFileFormat _tmp2_ = 0;
-	PhotoFileFormat _tmp3_ = 0;
-	PhotoFileFormat _tmp4_ = 0;
-	PhotoFileFormat _tmp5_ = 0;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
+	PhotoFileFormat _tmp2_;
+	PhotoFileFormat _tmp3_;
+	PhotoFileFormat _tmp4_;
+	PhotoFileFormat _tmp5_;
 #line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19241,11 +19211,11 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
 	_tmp5_ = format;
 #line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ == PHOTO_FILE_FORMAT_RAW) {
-#line 19240 "PhotoPage.c"
-		Photo* _tmp6_ = NULL;
-		Photo* _tmp7_ = NULL;
-		RawDeveloper _tmp8_ = 0;
-		RawDeveloper _tmp9_ = 0;
+#line 19210 "PhotoPage.c"
+		Photo* _tmp6_;
+		Photo* _tmp7_;
+		RawDeveloper _tmp8_;
+		RawDeveloper _tmp9_;
 #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19260,11 +19230,11 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
 		switch (_tmp9_) {
 #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_SHOTWELL:
-#line 19259 "PhotoPage.c"
+#line 19229 "PhotoPage.c"
 			{
-				GAction* _tmp10_ = NULL;
-				GAction* _tmp11_ = NULL;
-				GVariant* _tmp12_ = NULL;
+				GAction* _tmp10_;
+				GAction* _tmp11_;
+				GVariant* _tmp12_;
 #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp10_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
 #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19279,17 +19249,17 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
 				_g_object_unref0 (_tmp11_);
 #line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19278 "PhotoPage.c"
+#line 19248 "PhotoPage.c"
 			}
 #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_CAMERA:
 #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_EMBEDDED:
-#line 19284 "PhotoPage.c"
+#line 19254 "PhotoPage.c"
 			{
-				GAction* _tmp13_ = NULL;
-				GAction* _tmp14_ = NULL;
-				GVariant* _tmp15_ = NULL;
+				GAction* _tmp13_;
+				GAction* _tmp14_;
+				GVariant* _tmp15_;
 #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp13_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
 #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19304,13 +19274,13 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
 				_g_object_unref0 (_tmp14_);
 #line 3113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19303 "PhotoPage.c"
+#line 19273 "PhotoPage.c"
 			}
 			default:
 			{
 #line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_assert_not_reached ();
-#line 19309 "PhotoPage.c"
+#line 19279 "PhotoPage.c"
 			}
 		}
 	}
@@ -19319,11 +19289,11 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
 
 static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeMap* map) {
 	gboolean _tmp0_ = FALSE;
-	GeeMap* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	GeeMap* _tmp1_;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
 #line 3121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19342,13 +19312,13 @@ static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeM
 	_g_object_unref0 (_tmp3_);
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 19341 "PhotoPage.c"
-		GeeMap* _tmp6_ = NULL;
-		Photo* _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
-		gpointer _tmp9_ = NULL;
-		Alteration* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
+#line 19311 "PhotoPage.c"
+		GeeMap* _tmp6_;
+		Photo* _tmp7_;
+		Photo* _tmp8_;
+		gpointer _tmp9_;
+		Alteration* _tmp10_;
+		gboolean _tmp11_;
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = map;
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19367,32 +19337,32 @@ static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeM
 		_alteration_unref0 (_tmp10_);
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 19366 "PhotoPage.c"
+#line 19336 "PhotoPage.c"
 	} else {
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 19370 "PhotoPage.c"
+#line 19340 "PhotoPage.c"
 	}
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 19376 "PhotoPage.c"
+#line 19346 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
 	AddTagsDialog* dialog = NULL;
-	AddTagsDialog* _tmp0_ = NULL;
+	AddTagsDialog* _tmp0_;
 	gchar** names = NULL;
-	AddTagsDialog* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gchar** _tmp3_ = NULL;
-	gint names_length1 = 0;
-	gint _names_size_ = 0;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
+	AddTagsDialog* _tmp1_;
+	gint _tmp2_;
+	gchar** _tmp3_;
+	gint names_length1;
+	gint _names_size_;
+	gchar** _tmp4_;
+	gint _tmp4__length1;
 #line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19415,23 +19385,23 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
 	_tmp4__length1 = names_length1;
 #line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 19414 "PhotoPage.c"
-		CommandManager* _tmp5_ = NULL;
-		CommandManager* _tmp6_ = NULL;
-		HierarchicalTagIndex* _tmp7_ = NULL;
-		HierarchicalTagIndex* _tmp8_ = NULL;
-		gchar** _tmp9_ = NULL;
-		gint _tmp9__length1 = 0;
-		gint _tmp10_ = 0;
-		gchar** _tmp11_ = NULL;
-		gchar** _tmp12_ = NULL;
-		gint _tmp12__length1 = 0;
-		ViewCollection* _tmp13_ = NULL;
-		ViewCollection* _tmp14_ = NULL;
-		GeeList* _tmp15_ = NULL;
-		GeeCollection* _tmp16_ = NULL;
-		AddTagsCommand* _tmp17_ = NULL;
-		AddTagsCommand* _tmp18_ = NULL;
+#line 19384 "PhotoPage.c"
+		CommandManager* _tmp5_;
+		CommandManager* _tmp6_;
+		HierarchicalTagIndex* _tmp7_;
+		HierarchicalTagIndex* _tmp8_;
+		gchar** _tmp9_;
+		gint _tmp9__length1;
+		gint _tmp10_;
+		gchar** _tmp11_;
+		gchar** _tmp12_;
+		gint _tmp12__length1;
+		ViewCollection* _tmp13_;
+		ViewCollection* _tmp14_;
+		GeeList* _tmp15_;
+		GeeCollection* _tmp16_;
+		AddTagsCommand* _tmp17_;
+		AddTagsCommand* _tmp18_;
 #line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19476,37 +19446,37 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
 		_hierarchical_tag_index_unref0 (_tmp8_);
 #line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 19475 "PhotoPage.c"
+#line 19445 "PhotoPage.c"
 	}
 #line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
 #line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 19481 "PhotoPage.c"
+#line 19451 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) {
 	LibraryPhoto* photo = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	DataView* _tmp2_ = NULL;
-	DataView* _tmp3_ = NULL;
-	DataSource* _tmp4_ = NULL;
-	LibraryPhoto* _tmp5_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	DataView* _tmp2_;
+	DataView* _tmp3_;
+	DataSource* _tmp4_;
+	LibraryPhoto* _tmp5_;
 	ModifyTagsDialog* dialog = NULL;
-	LibraryPhoto* _tmp6_ = NULL;
-	ModifyTagsDialog* _tmp7_ = NULL;
+	LibraryPhoto* _tmp6_;
+	ModifyTagsDialog* _tmp7_;
 	GeeArrayList* new_tags = NULL;
-	ModifyTagsDialog* _tmp8_ = NULL;
-	GeeArrayList* _tmp9_ = NULL;
-	GeeArrayList* _tmp10_ = NULL;
-	CommandManager* _tmp11_ = NULL;
-	CommandManager* _tmp12_ = NULL;
-	LibraryPhoto* _tmp13_ = NULL;
-	GeeArrayList* _tmp14_ = NULL;
-	ModifyTagsCommand* _tmp15_ = NULL;
-	ModifyTagsCommand* _tmp16_ = NULL;
+	ModifyTagsDialog* _tmp8_;
+	GeeArrayList* _tmp9_;
+	GeeArrayList* _tmp10_;
+	CommandManager* _tmp11_;
+	CommandManager* _tmp12_;
+	LibraryPhoto* _tmp13_;
+	GeeArrayList* _tmp14_;
+	ModifyTagsCommand* _tmp15_;
+	ModifyTagsCommand* _tmp16_;
 #line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19551,7 +19521,7 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) {
 		_g_object_unref0 (photo);
 #line 3143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 19550 "PhotoPage.c"
+#line 19520 "PhotoPage.c"
 	}
 #line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -19577,18 +19547,18 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) {
 	_text_entry_dialog_mediator_unref0 (dialog);
 #line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 19576 "PhotoPage.c"
+#line 19546 "PhotoPage.c"
 }
 
 
 static gboolean library_photo_page_library_photo_page_view_filter_real_predicate (ViewFilter* base, DataView* view) {
 	LibraryPhotoPageLibraryPhotoPageViewFilter * self;
 	gboolean result = FALSE;
-	DataView* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	MediaSource* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	DataView* _tmp0_;
+	DataSource* _tmp1_;
+	MediaSource* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 #line 2335 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_PHOTO_PAGE_TYPE_LIBRARY_PHOTO_PAGE_VIEW_FILTER, LibraryPhotoPageLibraryPhotoPageViewFilter);
 #line 2335 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19609,7 +19579,7 @@ static gboolean library_photo_page_library_photo_page_view_filter_real_predicate
 	result = _tmp4_;
 #line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 19608 "PhotoPage.c"
+#line 19578 "PhotoPage.c"
 }
 
 
@@ -19619,14 +19589,14 @@ static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_ph
 	self = (LibraryPhotoPageLibraryPhotoPageViewFilter*) view_filter_construct (object_type);
 #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 19618 "PhotoPage.c"
+#line 19588 "PhotoPage.c"
 }
 
 
 static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_new (void) {
 #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return library_photo_page_library_photo_page_view_filter_construct (LIBRARY_PHOTO_PAGE_TYPE_LIBRARY_PHOTO_PAGE_VIEW_FILTER);
-#line 19625 "PhotoPage.c"
+#line 19595 "PhotoPage.c"
 }
 
 
@@ -19634,8 +19604,8 @@ static void library_photo_page_library_photo_page_view_filter_class_init (Librar
 #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_library_photo_page_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) library_photo_page_library_photo_page_view_filter_real_predicate;
-#line 19634 "PhotoPage.c"
+	((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) library_photo_page_library_photo_page_view_filter_real_predicate;
+#line 19604 "PhotoPage.c"
 }
 
 
@@ -19661,53 +19631,53 @@ static void library_photo_page_class_init (LibraryPhotoPageClass * klass) {
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_type_class_add_private (klass, sizeof (LibraryPhotoPagePrivate));
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) library_photo_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) library_photo_page_real_init_collect_ui_filenames;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) library_photo_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) library_photo_page_real_add_actions;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) library_photo_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) library_photo_page_real_remove_actions;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->init_collect_injection_groups = (InjectionGroup** (*)(Page*, int*)) library_photo_page_real_init_collect_injection_groups;
+	((PageClass *) klass)->init_collect_injection_groups = (InjectionGroup** (*) (Page *, int*)) library_photo_page_real_init_collect_injection_groups;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) library_photo_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) library_photo_page_real_update_actions;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((LibraryPhotoPageClass *) klass)->developer_changed = (void (*)(LibraryPhotoPage*, RawDeveloper)) library_photo_page_real_developer_changed;
+	((LibraryPhotoPageClass *) klass)->developer_changed = (void (*) (LibraryPhotoPage *, RawDeveloper)) library_photo_page_real_developer_changed;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->switched_to = (void (*)(Page*)) library_photo_page_real_switched_to;
+	((PageClass *) klass)->switched_to = (void (*) (Page *)) library_photo_page_real_switched_to;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->switching_from = (void (*)(Page*)) library_photo_page_real_switching_from;
+	((PageClass *) klass)->switching_from = (void (*) (Page *)) library_photo_page_real_switching_from;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->get_bottom_left_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) library_photo_page_real_get_bottom_left_trinket;
+	((EditingHostPageClass *) klass)->get_bottom_left_trinket = (GdkPixbuf* (*) (EditingHostPage *, gint)) library_photo_page_real_get_bottom_left_trinket;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->get_top_right_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) library_photo_page_real_get_top_right_trinket;
+	((EditingHostPageClass *) klass)->get_top_right_trinket = (GdkPixbuf* (*) (EditingHostPage *, gint)) library_photo_page_real_get_top_right_trinket;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->on_increase_size = (void (*)(EditingHostPage*)) library_photo_page_real_on_increase_size;
+	((EditingHostPageClass *) klass)->on_increase_size = (void (*) (EditingHostPage *)) library_photo_page_real_on_increase_size;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->on_decrease_size = (void (*)(EditingHostPage*)) library_photo_page_real_on_decrease_size;
+	((EditingHostPageClass *) klass)->on_decrease_size = (void (*) (EditingHostPage *)) library_photo_page_real_on_decrease_size;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->on_zoom_slider_key_press = (gboolean (*)(EditingHostPage*, GdkEventKey*)) library_photo_page_real_on_zoom_slider_key_press;
+	((EditingHostPageClass *) klass)->on_zoom_slider_key_press = (gboolean (*) (EditingHostPage *, GdkEventKey*)) library_photo_page_real_on_zoom_slider_key_press;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->update_ui = (void (*)(EditingHostPage*, gboolean)) library_photo_page_real_update_ui;
+	((EditingHostPageClass *) klass)->update_ui = (void (*) (EditingHostPage *, gboolean)) library_photo_page_real_update_ui;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->notify_photo_backing_missing = (void (*)(EditingHostPage*, Photo*, gboolean)) library_photo_page_real_notify_photo_backing_missing;
+	((EditingHostPageClass *) klass)->notify_photo_backing_missing = (void (*) (EditingHostPage *, Photo*, gboolean)) library_photo_page_real_notify_photo_backing_missing;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) library_photo_page_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) library_photo_page_real_key_press_event;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((EditingHostPageClass *) klass)->on_double_click = (gboolean (*)(EditingHostPage*, GdkEventButton*)) library_photo_page_real_on_double_click;
+	((EditingHostPageClass *) klass)->on_double_click = (gboolean (*) (EditingHostPage *, GdkEventButton*)) library_photo_page_real_on_double_click;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_left_released = (gboolean (*)(Page*, GdkEventButton*)) library_photo_page_real_on_left_released;
+	((PageClass *) klass)->on_left_released = (gboolean (*) (Page *, GdkEventButton*)) library_photo_page_real_on_left_released;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_context_buttonpress = (gboolean (*)(Page*, GdkEventButton*)) library_photo_page_real_on_context_buttonpress;
+	((PageClass *) klass)->on_context_buttonpress = (gboolean (*) (Page *, GdkEventButton*)) library_photo_page_real_on_context_buttonpress;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->on_context_keypress = (gboolean (*)(Page*)) library_photo_page_real_on_context_keypress;
+	((PageClass *) klass)->on_context_keypress = (gboolean (*) (Page *)) library_photo_page_real_on_context_keypress;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_photo_page_finalize;
-#line 19701 "PhotoPage.c"
+#line 19671 "PhotoPage.c"
 }
 
 
 static void library_photo_page_instance_init (LibraryPhotoPage * self) {
-	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL;
+	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv = LIBRARY_PHOTO_PAGE_GET_PRIVATE (self);
 #line 2340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19718,19 +19688,19 @@ static void library_photo_page_instance_init (LibraryPhotoPage * self) {
 	_tmp0_ = library_photo_page_library_photo_page_view_filter_new ();
 #line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->filter = _tmp0_;
-#line 19717 "PhotoPage.c"
+#line 19687 "PhotoPage.c"
 }
 
 
-static void library_photo_page_finalize (GObject* obj) {
+static void library_photo_page_finalize (GObject * obj) {
 	LibraryPhotoPage * self;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	LibraryPhotoSourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	ConfigFacade* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
+	LibraryPhotoSourceCollection* _tmp0_;
+	guint _tmp1_;
+	LibraryPhotoSourceCollection* _tmp2_;
+	guint _tmp3_;
+	ConfigFacade* _tmp4_;
+	ConfigFacade* _tmp5_;
+	guint _tmp6_;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19763,7 +19733,7 @@ static void library_photo_page_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->context_menu);
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (library_photo_page_parent_class)->finalize (obj);
-#line 19762 "PhotoPage.c"
+#line 19732 "PhotoPage.c"
 }
 
 
diff --git a/src/PixbufCache.c b/src/PixbufCache.c
index 56575f3..f50ca76 100644
--- a/src/PixbufCache.c
+++ b/src/PixbufCache.c
@@ -1,4 +1,4 @@
-/* PixbufCache.c generated by valac 0.34.7, the Vala compiler
+/* PixbufCache.c generated by valac 0.36.6, the Vala compiler
  * generated from PixbufCache.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -221,6 +221,11 @@ typedef struct _SemaphoreClass SemaphoreClass;
 #define _abstract_semaphore_unref0(var) ((var == NULL) ? NULL : (var = (abstract_semaphore_unref (var), NULL)))
 typedef struct _PixbufCacheBaselineFetchJobPrivate PixbufCacheBaselineFetchJobPrivate;
 typedef struct _PixbufCacheMasterFetchJobPrivate PixbufCacheMasterFetchJobPrivate;
+enum  {
+	PIXBUF_CACHE_FETCHED_SIGNAL,
+	PIXBUF_CACHE_LAST_SIGNAL
+};
+static guint pixbuf_cache_signals[PIXBUF_CACHE_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -457,7 +462,7 @@ GType abstract_semaphore_get_type (void) G_GNUC_CONST;
 GType semaphore_get_type (void) G_GNUC_CONST;
 BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore);
 static BackgroundJobJobPriority pixbuf_cache_fetch_job_real_get_priority (BackgroundJob* base);
-static void pixbuf_cache_fetch_job_finalize (BackgroundJob* obj);
+static void pixbuf_cache_fetch_job_finalize (BackgroundJob * obj);
 enum  {
 	PIXBUF_CACHE_BASELINE_FETCH_JOB_DUMMY_PROPERTY
 };
@@ -467,20 +472,20 @@ enum  {
 };
 static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base);
 GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error);
-static void pixbuf_cache_finalize (GObject* obj);
+static void pixbuf_cache_finalize (GObject * obj);
 
 
 static void _pixbuf_cache_on_sources_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 111 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	pixbuf_cache_on_sources_altered ((PixbufCache*) self, items);
-#line 477 "PixbufCache.c"
+#line 482 "PixbufCache.c"
 }
 
 
 static void _pixbuf_cache_on_sources_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) {
 #line 112 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	pixbuf_cache_on_sources_removed ((PixbufCache*) self, removed);
-#line 484 "PixbufCache.c"
+#line 489 "PixbufCache.c"
 }
 
 
@@ -499,23 +504,23 @@ GType pixbuf_cache_photo_type_get_type (void) {
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 87 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 503 "PixbufCache.c"
+#line 508 "PixbufCache.c"
 }
 
 
 PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target) {
 	PixbufCache * self = NULL;
-	SourceCollection* _tmp0_ = NULL;
-	SourceCollection* _tmp1_ = NULL;
-	PixbufCachePhotoType _tmp2_ = 0;
-	Scaling _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	PixbufCacheCacheFilter _tmp5_ = NULL;
-	void* _tmp5__target = NULL;
-	gint _tmp6_ = 0;
-	Workers* _tmp7_ = NULL;
-	PixbufCachePhotoType _tmp10_ = 0;
-	SourceCollection* _tmp12_ = NULL;
+	SourceCollection* _tmp0_;
+	SourceCollection* _tmp1_;
+	PixbufCachePhotoType _tmp2_;
+	Scaling _tmp3_;
+	gint _tmp4_;
+	PixbufCacheCacheFilter _tmp5_;
+	void* _tmp5__target;
+	gint _tmp6_;
+	Workers* _tmp7_;
+	PixbufCachePhotoType _tmp10_;
+	SourceCollection* _tmp12_;
 #line 85 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL);
 #line 85 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -558,9 +563,9 @@ PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* source
 	_tmp7_ = pixbuf_cache_background_workers;
 #line 95 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp7_ == NULL) {
-#line 562 "PixbufCache.c"
-		guint _tmp8_ = 0U;
-		Workers* _tmp9_ = NULL;
+#line 567 "PixbufCache.c"
+		guint _tmp8_;
+		Workers* _tmp9_;
 #line 96 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp8_ = workers_thread_per_cpu_minus_one ();
 #line 96 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -569,19 +574,19 @@ PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* source
 		_workers_unref0 (pixbuf_cache_background_workers);
 #line 96 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		pixbuf_cache_background_workers = _tmp9_;
-#line 573 "PixbufCache.c"
+#line 578 "PixbufCache.c"
 	}
 #line 100 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp10_ = type;
 #line 100 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp10_ != PIXBUF_CACHE_PHOTO_TYPE_MASTER) {
-#line 579 "PixbufCache.c"
-		SourceCollection* _tmp11_ = NULL;
+#line 584 "PixbufCache.c"
+		SourceCollection* _tmp11_;
 #line 101 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp11_ = sources;
 #line 101 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _pixbuf_cache_on_sources_altered_data_collection_items_altered, self, 0);
-#line 585 "PixbufCache.c"
+#line 590 "PixbufCache.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp12_ = sources;
@@ -589,19 +594,19 @@ PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* source
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _pixbuf_cache_on_sources_removed_data_collection_items_removed, self, 0);
 #line 85 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self;
-#line 593 "PixbufCache.c"
+#line 598 "PixbufCache.c"
 }
 
 
 PixbufCache* pixbuf_cache_new (SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target) {
 #line 85 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return pixbuf_cache_construct (TYPE_PIXBUF_CACHE, sources, type, scaling, max_count, filter, filter_target);
-#line 600 "PixbufCache.c"
+#line 605 "PixbufCache.c"
 }
 
 
 void pixbuf_cache_get_scaling (PixbufCache* self, Scaling* result) {
-	Scaling _tmp0_ = {0};
+	Scaling _tmp0_;
 #line 118 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
 #line 119 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -610,14 +615,14 @@ void pixbuf_cache_get_scaling (PixbufCache* self, Scaling* result) {
 	*result = _tmp0_;
 #line 119 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return;
-#line 614 "PixbufCache.c"
+#line 619 "PixbufCache.c"
 }
 
 
 GdkPixbuf* pixbuf_cache_get_ready_pixbuf (PixbufCache* self, Photo* photo) {
 	GdkPixbuf* result = NULL;
-	Photo* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
+	Photo* _tmp0_;
+	GdkPixbuf* _tmp1_;
 #line 123 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_val_if_fail (IS_PIXBUF_CACHE (self), NULL);
 #line 123 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -630,47 +635,47 @@ GdkPixbuf* pixbuf_cache_get_ready_pixbuf (PixbufCache* self, Photo* photo) {
 	result = _tmp1_;
 #line 124 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return result;
-#line 634 "PixbufCache.c"
+#line 639 "PixbufCache.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
 #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 641 "PixbufCache.c"
+#line 646 "PixbufCache.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 648 "PixbufCache.c"
+#line 653 "PixbufCache.c"
 }
 
 
 GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error) {
 	GdkPixbuf* result = NULL;
-	Photo* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	Photo* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 	GdkPixbuf* pixbuf = NULL;
-	Photo* _tmp6_ = NULL;
-	GdkPixbuf* _tmp7_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
+	Photo* _tmp6_;
+	GdkPixbuf* _tmp7_;
+	GdkPixbuf* _tmp8_;
 	PixbufCacheFetchJob* job = NULL;
-	GeeHashMap* _tmp9_ = NULL;
-	Photo* _tmp10_ = NULL;
-	gpointer _tmp11_ = NULL;
-	PixbufCacheFetchJob* _tmp12_ = NULL;
+	GeeHashMap* _tmp9_;
+	Photo* _tmp10_;
+	gpointer _tmp11_;
+	PixbufCacheFetchJob* _tmp12_;
 	GdkPixbuf* _tmp22_ = NULL;
-	Photo* _tmp23_ = NULL;
-	Scaling _tmp24_ = {0};
-	GdkPixbuf* _tmp25_ = NULL;
-	GdkPixbuf* _tmp26_ = NULL;
-	Photo* _tmp27_ = NULL;
-	GdkPixbuf* _tmp28_ = NULL;
+	Photo* _tmp23_;
+	Scaling _tmp24_;
+	GdkPixbuf* _tmp25_;
+	GdkPixbuf* _tmp26_;
+	Photo* _tmp27_;
+	GdkPixbuf* _tmp28_;
 	GError * _inner_error_ = NULL;
 #line 129 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_val_if_fail (IS_PIXBUF_CACHE (self), NULL);
@@ -690,13 +695,13 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error)
 	_g_object_unref0 (_tmp2_);
 #line 130 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp4_) {
-#line 694 "PixbufCache.c"
-		Photo* _tmp5_ = NULL;
+#line 699 "PixbufCache.c"
+		Photo* _tmp5_;
 #line 131 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp5_ = photo;
 #line 131 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		pixbuf_cache_decache (self, _tmp5_);
-#line 700 "PixbufCache.c"
+#line 705 "PixbufCache.c"
 	}
 #line 133 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp6_ = photo;
@@ -712,7 +717,7 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error)
 		result = pixbuf;
 #line 139 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return result;
-#line 716 "PixbufCache.c"
+#line 721 "PixbufCache.c"
 	}
 #line 142 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp9_ = self->priv->in_progress;
@@ -726,13 +731,13 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error)
 	_tmp12_ = job;
 #line 143 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp12_ != NULL) {
-#line 730 "PixbufCache.c"
-		PixbufCacheFetchJob* _tmp13_ = NULL;
-		PixbufCacheFetchJob* _tmp14_ = NULL;
-		GError* _tmp15_ = NULL;
-		PixbufCacheFetchJob* _tmp19_ = NULL;
-		GdkPixbuf* _tmp20_ = NULL;
-		GdkPixbuf* _tmp21_ = NULL;
+#line 735 "PixbufCache.c"
+		PixbufCacheFetchJob* _tmp13_;
+		PixbufCacheFetchJob* _tmp14_;
+		GError* _tmp15_;
+		PixbufCacheFetchJob* _tmp19_;
+		GdkPixbuf* _tmp20_;
+		GdkPixbuf* _tmp21_;
 #line 144 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp13_ = job;
 #line 144 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -743,10 +748,10 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error)
 		_tmp15_ = _tmp14_->err;
 #line 145 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		if (_tmp15_ != NULL) {
-#line 747 "PixbufCache.c"
-			PixbufCacheFetchJob* _tmp16_ = NULL;
-			GError* _tmp17_ = NULL;
-			GError* _tmp18_ = NULL;
+#line 752 "PixbufCache.c"
+			PixbufCacheFetchJob* _tmp16_;
+			GError* _tmp17_;
+			GError* _tmp18_;
 #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp16_ = job;
 #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -763,7 +768,7 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error)
 			_g_object_unref0 (pixbuf);
 #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			return NULL;
-#line 767 "PixbufCache.c"
+#line 772 "PixbufCache.c"
 		}
 #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp19_ = job;
@@ -779,7 +784,7 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error)
 		_g_object_unref0 (pixbuf);
 #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return result;
-#line 783 "PixbufCache.c"
+#line 788 "PixbufCache.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp23_ = photo;
@@ -799,7 +804,7 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error)
 		_g_object_unref0 (pixbuf);
 #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return NULL;
-#line 803 "PixbufCache.c"
+#line 808 "PixbufCache.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp26_ = _tmp22_;
@@ -823,13 +828,13 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error)
 	_background_job_unref0 (job);
 #line 159 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return result;
-#line 827 "PixbufCache.c"
+#line 832 "PixbufCache.c"
 }
 
 
 void pixbuf_cache_drop (PixbufCache* self, Photo* photo) {
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
 #line 165 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
 #line 165 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -842,38 +847,38 @@ void pixbuf_cache_drop (PixbufCache* self, Photo* photo) {
 	_tmp1_ = photo;
 #line 167 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	pixbuf_cache_decache (self, _tmp1_);
-#line 846 "PixbufCache.c"
+#line 851 "PixbufCache.c"
 }
 
 
 static void _pixbuf_cache_on_fetched_completion_callback (BackgroundJob* job, gpointer self) {
 #line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	pixbuf_cache_on_fetched ((PixbufCache*) self, job);
-#line 853 "PixbufCache.c"
+#line 858 "PixbufCache.c"
 }
 
 
 void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPriority priority, gboolean force) {
-	Photo* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	Photo* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-	GeeHashMap* _tmp12_ = NULL;
-	Photo* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
+	gboolean _tmp7_;
+	GeeHashMap* _tmp12_;
+	Photo* _tmp13_;
+	gboolean _tmp14_;
 	gboolean _tmp15_ = FALSE;
-	PixbufCacheCacheFilter _tmp16_ = NULL;
-	void* _tmp16__target = NULL;
+	PixbufCacheCacheFilter _tmp16_;
+	void* _tmp16__target;
 	PixbufCacheFetchJob* job = NULL;
-	PixbufCachePhotoType _tmp20_ = 0;
-	GeeHashMap* _tmp30_ = NULL;
-	Photo* _tmp31_ = NULL;
-	PixbufCacheFetchJob* _tmp32_ = NULL;
-	Workers* _tmp33_ = NULL;
-	PixbufCacheFetchJob* _tmp34_ = NULL;
+	PixbufCachePhotoType _tmp20_;
+	GeeHashMap* _tmp30_;
+	Photo* _tmp31_;
+	PixbufCacheFetchJob* _tmp32_;
+	Workers* _tmp33_;
+	PixbufCacheFetchJob* _tmp34_;
 #line 172 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
 #line 172 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -892,22 +897,22 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 	_g_object_unref0 (_tmp2_);
 #line 174 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp4_) {
-#line 896 "PixbufCache.c"
-		Photo* _tmp5_ = NULL;
+#line 901 "PixbufCache.c"
+		Photo* _tmp5_;
 #line 175 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp5_ = photo;
 #line 175 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		pixbuf_cache_decache (self, _tmp5_);
-#line 902 "PixbufCache.c"
+#line 907 "PixbufCache.c"
 	}
 #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp7_ = force;
 #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (!_tmp7_) {
-#line 908 "PixbufCache.c"
-		GeeHashMap* _tmp8_ = NULL;
-		Photo* _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
+#line 913 "PixbufCache.c"
+		GeeHashMap* _tmp8_;
+		Photo* _tmp9_;
+		gboolean _tmp10_;
 #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp8_ = self->priv->cache;
 #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -916,23 +921,23 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 		_tmp10_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_);
 #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp6_ = _tmp10_;
-#line 920 "PixbufCache.c"
+#line 925 "PixbufCache.c"
 	} else {
 #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp6_ = FALSE;
-#line 924 "PixbufCache.c"
+#line 929 "PixbufCache.c"
 	}
 #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp6_) {
-#line 928 "PixbufCache.c"
-		Photo* _tmp11_ = NULL;
+#line 933 "PixbufCache.c"
+		Photo* _tmp11_;
 #line 178 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp11_ = photo;
 #line 178 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		pixbuf_cache_prioritize (self, _tmp11_);
 #line 180 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 936 "PixbufCache.c"
+#line 941 "PixbufCache.c"
 	}
 #line 183 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp12_ = self->priv->in_progress;
@@ -944,7 +949,7 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 	if (_tmp14_) {
 #line 184 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 948 "PixbufCache.c"
+#line 953 "PixbufCache.c"
 	}
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp16_ = self->priv->filter;
@@ -952,11 +957,11 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 	_tmp16__target = self->priv->filter_target;
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp16_ != NULL) {
-#line 956 "PixbufCache.c"
-		PixbufCacheCacheFilter _tmp17_ = NULL;
-		void* _tmp17__target = NULL;
-		Photo* _tmp18_ = NULL;
-		gboolean _tmp19_ = FALSE;
+#line 961 "PixbufCache.c"
+		PixbufCacheCacheFilter _tmp17_;
+		void* _tmp17__target;
+		Photo* _tmp18_;
+		gboolean _tmp19_;
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp17_ = self->priv->filter;
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -967,17 +972,17 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 		_tmp19_ = _tmp17_ (_tmp18_, _tmp17__target);
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp15_ = !_tmp19_;
-#line 971 "PixbufCache.c"
+#line 976 "PixbufCache.c"
 	} else {
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp15_ = FALSE;
-#line 975 "PixbufCache.c"
+#line 980 "PixbufCache.c"
 	}
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp15_) {
 #line 187 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 981 "PixbufCache.c"
+#line 986 "PixbufCache.c"
 	}
 #line 189 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	job = NULL;
@@ -987,12 +992,12 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 	switch (_tmp20_) {
 #line 190 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		case PIXBUF_CACHE_PHOTO_TYPE_BASELINE:
-#line 991 "PixbufCache.c"
+#line 996 "PixbufCache.c"
 		{
-			BackgroundJobJobPriority _tmp21_ = 0;
-			Photo* _tmp22_ = NULL;
-			Scaling _tmp23_ = {0};
-			PixbufCacheBaselineFetchJob* _tmp24_ = NULL;
+			BackgroundJobJobPriority _tmp21_;
+			Photo* _tmp22_;
+			Scaling _tmp23_;
+			PixbufCacheBaselineFetchJob* _tmp24_;
 #line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp21_ = priority;
 #line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1007,16 +1012,16 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 			job = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob);
 #line 193 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			break;
-#line 1011 "PixbufCache.c"
+#line 1016 "PixbufCache.c"
 		}
 #line 190 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		case PIXBUF_CACHE_PHOTO_TYPE_MASTER:
-#line 1015 "PixbufCache.c"
+#line 1020 "PixbufCache.c"
 		{
-			BackgroundJobJobPriority _tmp25_ = 0;
-			Photo* _tmp26_ = NULL;
-			Scaling _tmp27_ = {0};
-			PixbufCacheMasterFetchJob* _tmp28_ = NULL;
+			BackgroundJobJobPriority _tmp25_;
+			Photo* _tmp26_;
+			Scaling _tmp27_;
+			PixbufCacheMasterFetchJob* _tmp28_;
 #line 196 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp25_ = priority;
 #line 196 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1031,16 +1036,16 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 			job = G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob);
 #line 197 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			break;
-#line 1035 "PixbufCache.c"
+#line 1040 "PixbufCache.c"
 		}
 		default:
 		{
-			PixbufCachePhotoType _tmp29_ = 0;
+			PixbufCachePhotoType _tmp29_;
 #line 200 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp29_ = self->priv->type;
 #line 200 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			g_error ("PixbufCache.vala:200: Unknown photo type: %d", (gint) _tmp29_);
-#line 1044 "PixbufCache.c"
+#line 1049 "PixbufCache.c"
 		}
 	}
 #line 203 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1059,7 +1064,7 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 	workers_enqueue (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 172 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_background_job_unref0 (job);
-#line 1063 "PixbufCache.c"
+#line 1068 "PixbufCache.c"
 }
 
 
@@ -1068,11 +1073,11 @@ void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, Backg
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
 #line 210 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (photos));
-#line 1072 "PixbufCache.c"
+#line 1077 "PixbufCache.c"
 	{
 		GeeIterator* _photo_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp0_ = photos;
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1081,15 +1086,15 @@ void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, Backg
 		_photo_it = _tmp1_;
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 1085 "PixbufCache.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 1090 "PixbufCache.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			Photo* photo = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			Photo* _tmp6_ = NULL;
-			BackgroundJobJobPriority _tmp7_ = 0;
-			gboolean _tmp8_ = FALSE;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			Photo* _tmp6_;
+			BackgroundJobJobPriority _tmp7_;
+			gboolean _tmp8_;
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp2_ = _photo_it;
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1098,7 +1103,7 @@ void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, Backg
 			if (!_tmp3_) {
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 1102 "PixbufCache.c"
+#line 1107 "PixbufCache.c"
 			}
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp4_ = _photo_it;
@@ -1116,11 +1121,11 @@ void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, Backg
 			pixbuf_cache_prefetch (self, _tmp6_, _tmp7_, _tmp8_);
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_g_object_unref0 (photo);
-#line 1120 "PixbufCache.c"
+#line 1125 "PixbufCache.c"
 		}
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_photo_it);
-#line 1124 "PixbufCache.c"
+#line 1129 "PixbufCache.c"
 	}
 }
 
@@ -1130,14 +1135,14 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
 #line 217 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (PIXBUF_CACHE_IS_PIXBUF_CACHE_BATCH (batch));
-#line 1134 "PixbufCache.c"
+#line 1139 "PixbufCache.c"
 	{
 		GeeIterator* _priority_it = NULL;
-		PixbufCachePixbufCacheBatch* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
+		PixbufCachePixbufCacheBatch* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeIterator* _tmp3_;
+		GeeIterator* _tmp4_;
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp0_ = batch;
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1154,12 +1159,12 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch
 		_priority_it = _tmp4_;
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 1158 "PixbufCache.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+#line 1163 "PixbufCache.c"
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			BackgroundJobJobPriority priority = 0;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp5_ = _priority_it;
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1168,7 +1173,7 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch
 			if (!_tmp6_) {
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 1172 "PixbufCache.c"
+#line 1177 "PixbufCache.c"
 			}
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp7_ = _priority_it;
@@ -1176,15 +1181,15 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch
 			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			priority = (BackgroundJobJobPriority) ((gintptr) _tmp8_);
-#line 1180 "PixbufCache.c"
+#line 1185 "PixbufCache.c"
 			{
 				GeeIterator* _photo_it = NULL;
-				PixbufCachePixbufCacheBatch* _tmp9_ = NULL;
-				BackgroundJobJobPriority _tmp10_ = 0;
-				GeeCollection* _tmp11_ = NULL;
-				GeeCollection* _tmp12_ = NULL;
-				GeeIterator* _tmp13_ = NULL;
-				GeeIterator* _tmp14_ = NULL;
+				PixbufCachePixbufCacheBatch* _tmp9_;
+				BackgroundJobJobPriority _tmp10_;
+				GeeCollection* _tmp11_;
+				GeeCollection* _tmp12_;
+				GeeIterator* _tmp13_;
+				GeeIterator* _tmp14_;
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				_tmp9_ = batch;
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1203,15 +1208,15 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch
 				_photo_it = _tmp14_;
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				while (TRUE) {
-#line 1207 "PixbufCache.c"
-					GeeIterator* _tmp15_ = NULL;
-					gboolean _tmp16_ = FALSE;
+#line 1212 "PixbufCache.c"
+					GeeIterator* _tmp15_;
+					gboolean _tmp16_;
 					Photo* photo = NULL;
-					GeeIterator* _tmp17_ = NULL;
-					gpointer _tmp18_ = NULL;
-					Photo* _tmp19_ = NULL;
-					BackgroundJobJobPriority _tmp20_ = 0;
-					gboolean _tmp21_ = FALSE;
+					GeeIterator* _tmp17_;
+					gpointer _tmp18_;
+					Photo* _tmp19_;
+					BackgroundJobJobPriority _tmp20_;
+					gboolean _tmp21_;
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 					_tmp15_ = _photo_it;
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1220,7 +1225,7 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch
 					if (!_tmp16_) {
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 						break;
-#line 1224 "PixbufCache.c"
+#line 1229 "PixbufCache.c"
 					}
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 					_tmp17_ = _photo_it;
@@ -1238,16 +1243,16 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch
 					pixbuf_cache_prefetch (self, _tmp19_, _tmp20_, _tmp21_);
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 					_g_object_unref0 (photo);
-#line 1242 "PixbufCache.c"
+#line 1247 "PixbufCache.c"
 				}
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				_g_object_unref0 (_photo_it);
-#line 1246 "PixbufCache.c"
+#line 1251 "PixbufCache.c"
 			}
 		}
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_priority_it);
-#line 1251 "PixbufCache.c"
+#line 1256 "PixbufCache.c"
 	}
 }
 
@@ -1255,16 +1260,16 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch
 gboolean pixbuf_cache_cancel_prefetch (PixbufCache* self, Photo* photo) {
 	gboolean result = FALSE;
 	PixbufCacheFetchJob* job = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	PixbufCacheFetchJob* _tmp3_ = NULL;
+	GeeHashMap* _tmp0_;
+	Photo* _tmp1_;
+	gpointer _tmp2_;
+	PixbufCacheFetchJob* _tmp3_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp4_ = NULL;
-	Photo* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-	PixbufCacheFetchJob* _tmp8_ = NULL;
+	GeeHashMap* _tmp4_;
+	Photo* _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp7_;
+	PixbufCacheFetchJob* _tmp8_;
 #line 224 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_val_if_fail (IS_PIXBUF_CACHE (self), FALSE);
 #line 224 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1287,7 +1292,7 @@ gboolean pixbuf_cache_cancel_prefetch (PixbufCache* self, Photo* photo) {
 		_background_job_unref0 (job);
 #line 227 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return result;
-#line 1291 "PixbufCache.c"
+#line 1296 "PixbufCache.c"
 	}
 #line 230 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp4_ = self->priv->in_progress;
@@ -1311,23 +1316,23 @@ gboolean pixbuf_cache_cancel_prefetch (PixbufCache* self, Photo* photo) {
 	_background_job_unref0 (job);
 #line 239 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return result;
-#line 1315 "PixbufCache.c"
+#line 1320 "PixbufCache.c"
 }
 
 
 void pixbuf_cache_cancel_all (PixbufCache* self) {
-	GeeHashMap* _tmp11_ = NULL;
+	GeeHashMap* _tmp11_;
 #line 242 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
-#line 1323 "PixbufCache.c"
+#line 1328 "PixbufCache.c"
 	{
 		GeeIterator* _job_it = NULL;
-		GeeHashMap* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeHashMap* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp0_ = self->priv->in_progress;
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1346,13 +1351,13 @@ void pixbuf_cache_cancel_all (PixbufCache* self) {
 		_job_it = _tmp5_;
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 1350 "PixbufCache.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 1355 "PixbufCache.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			PixbufCacheFetchJob* job = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			PixbufCacheFetchJob* _tmp10_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			PixbufCacheFetchJob* _tmp10_;
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp6_ = _job_it;
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1361,7 +1366,7 @@ void pixbuf_cache_cancel_all (PixbufCache* self) {
 			if (!_tmp7_) {
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 1365 "PixbufCache.c"
+#line 1370 "PixbufCache.c"
 			}
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp8_ = _job_it;
@@ -1375,44 +1380,44 @@ void pixbuf_cache_cancel_all (PixbufCache* self) {
 			background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_background_job_unref0 (job);
-#line 1379 "PixbufCache.c"
+#line 1384 "PixbufCache.c"
 		}
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_job_it);
-#line 1383 "PixbufCache.c"
+#line 1388 "PixbufCache.c"
 	}
 #line 249 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp11_ = self->priv->in_progress;
 #line 249 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 1389 "PixbufCache.c"
+#line 1394 "PixbufCache.c"
 }
 
 
 static gpointer _background_job_ref0 (gpointer self) {
 #line 253 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self ? background_job_ref (self) : NULL;
-#line 1396 "PixbufCache.c"
+#line 1401 "PixbufCache.c"
 }
 
 
 static void pixbuf_cache_on_fetched (PixbufCache* self, BackgroundJob* j) {
 	PixbufCacheFetchJob* job = NULL;
-	BackgroundJob* _tmp0_ = NULL;
-	PixbufCacheFetchJob* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
-	PixbufCacheFetchJob* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	PixbufCacheFetchJob* _tmp5_ = NULL;
-	GError* _tmp6_ = NULL;
-	PixbufCacheFetchJob* _tmp20_ = NULL;
-	Photo* _tmp21_ = NULL;
-	PixbufCacheFetchJob* _tmp22_ = NULL;
-	GdkPixbuf* _tmp23_ = NULL;
-	PixbufCacheFetchJob* _tmp24_ = NULL;
-	Photo* _tmp25_ = NULL;
-	PixbufCacheFetchJob* _tmp26_ = NULL;
-	GdkPixbuf* _tmp27_ = NULL;
+	BackgroundJob* _tmp0_;
+	PixbufCacheFetchJob* _tmp1_;
+	GeeHashMap* _tmp2_;
+	PixbufCacheFetchJob* _tmp3_;
+	Photo* _tmp4_;
+	PixbufCacheFetchJob* _tmp5_;
+	GError* _tmp6_;
+	PixbufCacheFetchJob* _tmp20_;
+	Photo* _tmp21_;
+	PixbufCacheFetchJob* _tmp22_;
+	GdkPixbuf* _tmp23_;
+	PixbufCacheFetchJob* _tmp24_;
+	Photo* _tmp25_;
+	PixbufCacheFetchJob* _tmp26_;
+	GdkPixbuf* _tmp27_;
 #line 252 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
 #line 252 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1437,20 +1442,20 @@ static void pixbuf_cache_on_fetched (PixbufCache* self, BackgroundJob* j) {
 	_tmp6_ = _tmp5_->err;
 #line 259 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp6_ != NULL) {
-#line 1441 "PixbufCache.c"
-		PixbufCacheFetchJob* _tmp7_ = NULL;
-		GdkPixbuf* _tmp8_ = NULL;
-		PixbufCacheFetchJob* _tmp9_ = NULL;
-		Photo* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		PixbufCacheFetchJob* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-		PixbufCacheFetchJob* _tmp16_ = NULL;
-		Photo* _tmp17_ = NULL;
-		PixbufCacheFetchJob* _tmp18_ = NULL;
-		GError* _tmp19_ = NULL;
+#line 1446 "PixbufCache.c"
+		PixbufCacheFetchJob* _tmp7_;
+		GdkPixbuf* _tmp8_;
+		PixbufCacheFetchJob* _tmp9_;
+		Photo* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		PixbufCacheFetchJob* _tmp13_;
+		GError* _tmp14_;
+		const gchar* _tmp15_;
+		PixbufCacheFetchJob* _tmp16_;
+		Photo* _tmp17_;
+		PixbufCacheFetchJob* _tmp18_;
+		GError* _tmp19_;
 #line 260 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp7_ = job;
 #line 260 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1484,12 +1489,12 @@ static void pixbuf_cache_on_fetched (PixbufCache* self, BackgroundJob* j) {
 #line 263 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp19_ = _tmp18_->err;
 #line 263 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		g_signal_emit_by_name (self, "fetched", _tmp17_, NULL, _tmp19_);
+		g_signal_emit (self, pixbuf_cache_signals[PIXBUF_CACHE_FETCHED_SIGNAL], 0, _tmp17_, NULL, _tmp19_);
 #line 265 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_background_job_unref0 (job);
 #line 265 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 1493 "PixbufCache.c"
+#line 1498 "PixbufCache.c"
 	}
 #line 272 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp20_ = job;
@@ -1510,10 +1515,10 @@ static void pixbuf_cache_on_fetched (PixbufCache* self, BackgroundJob* j) {
 #line 275 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp27_ = _tmp26_->pixbuf;
 #line 275 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	g_signal_emit_by_name (self, "fetched", _tmp25_, _tmp27_, NULL);
+	g_signal_emit (self, pixbuf_cache_signals[PIXBUF_CACHE_FETCHED_SIGNAL], 0, _tmp25_, _tmp27_, NULL);
 #line 252 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_background_job_unref0 (job);
-#line 1517 "PixbufCache.c"
+#line 1522 "PixbufCache.c"
 }
 
 
@@ -1522,15 +1527,15 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) {
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
 #line 278 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 1526 "PixbufCache.c"
+#line 1531 "PixbufCache.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp0_ = map;
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1549,26 +1554,26 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) {
 		_object_it = _tmp5_;
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 1553 "PixbufCache.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 1558 "PixbufCache.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			GeeMap* _tmp10_ = NULL;
-			DataObject* _tmp11_ = NULL;
-			gpointer _tmp12_ = NULL;
-			Alteration* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
-			gboolean _tmp15_ = FALSE;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			GeeMap* _tmp10_;
+			DataObject* _tmp11_;
+			gpointer _tmp12_;
+			Alteration* _tmp13_;
+			gboolean _tmp14_;
+			gboolean _tmp15_;
 			Photo* photo = NULL;
-			DataObject* _tmp16_ = NULL;
-			Photo* _tmp17_ = NULL;
-			GeeHashMap* _tmp18_ = NULL;
-			Photo* _tmp19_ = NULL;
-			gboolean _tmp20_ = FALSE;
-			Photo* _tmp30_ = NULL;
-			Photo* _tmp31_ = NULL;
+			DataObject* _tmp16_;
+			Photo* _tmp17_;
+			GeeHashMap* _tmp18_;
+			Photo* _tmp19_;
+			gboolean _tmp20_;
+			Photo* _tmp30_;
+			Photo* _tmp31_;
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp6_ = _object_it;
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1577,7 +1582,7 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) {
 			if (!_tmp7_) {
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 1581 "PixbufCache.c"
+#line 1586 "PixbufCache.c"
 			}
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp8_ = _object_it;
@@ -1605,7 +1610,7 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) {
 				_g_object_unref0 (object);
 #line 281 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				continue;
-#line 1609 "PixbufCache.c"
+#line 1614 "PixbufCache.c"
 			}
 #line 283 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp16_ = object;
@@ -1621,13 +1626,13 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) {
 			_tmp20_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_);
 #line 285 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			if (_tmp20_) {
-#line 1625 "PixbufCache.c"
-				GeeHashMap* _tmp21_ = NULL;
-				Photo* _tmp22_ = NULL;
-				gpointer _tmp23_ = NULL;
-				PixbufCacheFetchJob* _tmp24_ = NULL;
-				GeeHashMap* _tmp25_ = NULL;
-				Photo* _tmp26_ = NULL;
+#line 1630 "PixbufCache.c"
+				GeeHashMap* _tmp21_;
+				Photo* _tmp22_;
+				gpointer _tmp23_;
+				PixbufCacheFetchJob* _tmp24_;
+				GeeHashMap* _tmp25_;
+				Photo* _tmp26_;
 #line 288 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				_tmp21_ = self->priv->in_progress;
 #line 288 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1646,11 +1651,11 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) {
 				_tmp26_ = photo;
 #line 289 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_, NULL);
-#line 1650 "PixbufCache.c"
+#line 1655 "PixbufCache.c"
 			} else {
-				GeeHashMap* _tmp27_ = NULL;
-				Photo* _tmp28_ = NULL;
-				gboolean _tmp29_ = FALSE;
+				GeeHashMap* _tmp27_;
+				Photo* _tmp28_;
+				gboolean _tmp29_;
 #line 290 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				_tmp27_ = self->priv->cache;
 #line 290 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1665,7 +1670,7 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) {
 					_g_object_unref0 (object);
 #line 291 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 					continue;
-#line 1669 "PixbufCache.c"
+#line 1674 "PixbufCache.c"
 				}
 			}
 #line 294 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1680,11 +1685,11 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) {
 			_g_object_unref0 (photo);
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_g_object_unref0 (object);
-#line 1684 "PixbufCache.c"
+#line 1689 "PixbufCache.c"
 		}
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_object_it);
-#line 1688 "PixbufCache.c"
+#line 1693 "PixbufCache.c"
 	}
 }
 
@@ -1694,11 +1699,11 @@ static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* rem
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
 #line 305 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (removed));
-#line 1698 "PixbufCache.c"
+#line 1703 "PixbufCache.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp0_ = removed;
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1707,17 +1712,17 @@ static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* rem
 		_object_it = _tmp1_;
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 1711 "PixbufCache.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 1716 "PixbufCache.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			Photo* photo = NULL;
-			DataObject* _tmp6_ = NULL;
-			Photo* _tmp7_ = NULL;
-			Photo* _tmp8_ = NULL;
-			Photo* _tmp9_ = NULL;
+			DataObject* _tmp6_;
+			Photo* _tmp7_;
+			Photo* _tmp8_;
+			Photo* _tmp9_;
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp2_ = _object_it;
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1726,7 +1731,7 @@ static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* rem
 			if (!_tmp3_) {
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 1730 "PixbufCache.c"
+#line 1735 "PixbufCache.c"
 			}
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp4_ = _object_it;
@@ -1752,11 +1757,11 @@ static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* rem
 			_g_object_unref0 (photo);
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_g_object_unref0 (object);
-#line 1756 "PixbufCache.c"
+#line 1761 "PixbufCache.c"
 		}
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_object_it);
-#line 1760 "PixbufCache.c"
+#line 1765 "PixbufCache.c"
 	}
 }
 
@@ -1764,10 +1769,10 @@ static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* rem
 static GdkPixbuf* pixbuf_cache_get_cached (PixbufCache* self, Photo* photo) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* pixbuf = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
+	GeeHashMap* _tmp0_;
+	Photo* _tmp1_;
+	gpointer _tmp2_;
+	GdkPixbuf* _tmp3_;
 #line 314 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_val_if_fail (IS_PIXBUF_CACHE (self), NULL);
 #line 314 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1784,29 +1789,29 @@ static GdkPixbuf* pixbuf_cache_get_cached (PixbufCache* self, Photo* photo) {
 	_tmp3_ = pixbuf;
 #line 316 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp3_ != NULL) {
-#line 1788 "PixbufCache.c"
-		Photo* _tmp4_ = NULL;
+#line 1793 "PixbufCache.c"
+		Photo* _tmp4_;
 #line 317 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp4_ = photo;
 #line 317 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		pixbuf_cache_prioritize (self, _tmp4_);
-#line 1794 "PixbufCache.c"
+#line 1799 "PixbufCache.c"
 	}
 #line 319 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	result = pixbuf;
 #line 319 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return result;
-#line 1800 "PixbufCache.c"
+#line 1805 "PixbufCache.c"
 }
 
 
 static void pixbuf_cache_prioritize (PixbufCache* self, Photo* photo) {
 	gint index = 0;
-	GeeArrayList* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	GeeArrayList* _tmp0_;
+	Photo* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 #line 323 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
 #line 323 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1827,13 +1832,13 @@ static void pixbuf_cache_prioritize (PixbufCache* self, Photo* photo) {
 	_tmp4_ = index;
 #line 327 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp4_ > 0) {
-#line 1831 "PixbufCache.c"
-		GeeArrayList* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gpointer _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
-		GeeArrayList* _tmp9_ = NULL;
-		Photo* _tmp10_ = NULL;
+#line 1836 "PixbufCache.c"
+		GeeArrayList* _tmp5_;
+		gint _tmp6_;
+		gpointer _tmp7_;
+		Photo* _tmp8_;
+		GeeArrayList* _tmp9_;
+		Photo* _tmp10_;
 #line 328 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp5_ = self->priv->lru;
 #line 328 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1850,24 +1855,24 @@ static void pixbuf_cache_prioritize (PixbufCache* self, Photo* photo) {
 		_tmp10_ = photo;
 #line 329 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp10_);
-#line 1854 "PixbufCache.c"
+#line 1859 "PixbufCache.c"
 	}
 }
 
 
 static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pixbuf) {
-	Photo* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	GeeArrayList* _tmp4_ = NULL;
-	Photo* _tmp5_ = NULL;
-	GeeArrayList* _tmp20_ = NULL;
-	gint _tmp21_ = 0;
-	gint _tmp22_ = 0;
-	GeeHashMap* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
+	Photo* _tmp0_;
+	GeeHashMap* _tmp1_;
+	Photo* _tmp2_;
+	GdkPixbuf* _tmp3_;
+	GeeArrayList* _tmp4_;
+	Photo* _tmp5_;
+	GeeArrayList* _tmp20_;
+	gint _tmp21_;
+	gint _tmp22_;
+	GeeHashMap* _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
 #line 333 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
 #line 333 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1894,23 +1899,23 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi
 	gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp5_);
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	while (TRUE) {
-#line 1898 "PixbufCache.c"
-		GeeArrayList* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
+#line 1903 "PixbufCache.c"
+		GeeArrayList* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
 		Photo* cached_photo = NULL;
-		GeeArrayList* _tmp10_ = NULL;
-		GeeArrayList* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
-		gpointer _tmp14_ = NULL;
-		Photo* _tmp15_ = NULL;
+		GeeArrayList* _tmp10_;
+		GeeArrayList* _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
+		gpointer _tmp14_;
+		Photo* _tmp15_;
 		gboolean removed = FALSE;
-		GeeHashMap* _tmp16_ = NULL;
-		Photo* _tmp17_ = NULL;
-		gboolean _tmp18_ = FALSE;
-		gboolean _tmp19_ = FALSE;
+		GeeHashMap* _tmp16_;
+		Photo* _tmp17_;
+		gboolean _tmp18_;
+		gboolean _tmp19_;
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp6_ = self->priv->lru;
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1923,7 +1928,7 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi
 		if (!(_tmp8_ > _tmp9_)) {
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			break;
-#line 1927 "PixbufCache.c"
+#line 1932 "PixbufCache.c"
 		}
 #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp10_ = self->priv->lru;
@@ -1955,7 +1960,7 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi
 		_vala_assert (_tmp19_, "removed");
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (cached_photo);
-#line 1959 "PixbufCache.c"
+#line 1964 "PixbufCache.c"
 	}
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp20_ = self->priv->lru;
@@ -1971,19 +1976,19 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi
 	_tmp25_ = _tmp24_;
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_vala_assert (_tmp22_ == _tmp25_, "lru.size == cache.size");
-#line 1975 "PixbufCache.c"
+#line 1980 "PixbufCache.c"
 }
 
 
 static void pixbuf_cache_decache (PixbufCache* self, Photo* photo) {
-	GeeHashMap* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	Photo* _tmp1_;
+	gboolean _tmp2_;
 	gboolean removed = FALSE;
-	GeeArrayList* _tmp6_ = NULL;
-	Photo* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_ = FALSE;
+	GeeArrayList* _tmp6_;
+	Photo* _tmp7_;
+	gboolean _tmp8_;
+	gboolean _tmp9_;
 #line 351 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
 #line 351 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1996,10 +2001,10 @@ static void pixbuf_cache_decache (PixbufCache* self, Photo* photo) {
 	_tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL);
 #line 352 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (!_tmp2_) {
-#line 2000 "PixbufCache.c"
-		GeeArrayList* _tmp3_ = NULL;
-		Photo* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+#line 2005 "PixbufCache.c"
+		GeeArrayList* _tmp3_;
+		Photo* _tmp4_;
+		gboolean _tmp5_;
 #line 353 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp3_ = self->priv->lru;
 #line 353 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2010,7 +2015,7 @@ static void pixbuf_cache_decache (PixbufCache* self, Photo* photo) {
 		_vala_assert (!_tmp5_, "!lru.contains(photo)");
 #line 355 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 2014 "PixbufCache.c"
+#line 2019 "PixbufCache.c"
 	}
 #line 358 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp6_ = self->priv->lru;
@@ -2024,7 +2029,7 @@ static void pixbuf_cache_decache (PixbufCache* self, Photo* photo) {
 	_tmp9_ = removed;
 #line 359 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_vala_assert (_tmp9_, "removed");
-#line 2028 "PixbufCache.c"
+#line 2033 "PixbufCache.c"
 }
 
 
@@ -2043,19 +2048,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER (GClosure * clos
 		data1 = closure->data;
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 2047 "PixbufCache.c"
+#line 2052 "PixbufCache.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		data2 = closure->data;
-#line 2053 "PixbufCache.c"
+#line 2058 "PixbufCache.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT_POINTER) (marshal_data ? marshal_data : cc->callback);
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_pointer (param_values + 3), data2);
-#line 2059 "PixbufCache.c"
+#line 2064 "PixbufCache.c"
 }
 
 
@@ -2065,21 +2070,21 @@ PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_construct (GType ob
 	self = (PixbufCachePixbufCacheBatch*) gee_tree_multi_map_construct (object_type, BACKGROUND_JOB_TYPE_JOB_PRIORITY, NULL, NULL, TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, (GCompareDataFunc) background_job_job_priority_compare_func, NULL, NULL, NULL, NULL, NULL);
 #line 16 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self;
-#line 2069 "PixbufCache.c"
+#line 2074 "PixbufCache.c"
 }
 
 
 PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_new (void) {
 #line 16 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return pixbuf_cache_pixbuf_cache_batch_construct (PIXBUF_CACHE_TYPE_PIXBUF_CACHE_BATCH);
-#line 2076 "PixbufCache.c"
+#line 2081 "PixbufCache.c"
 }
 
 
 static void pixbuf_cache_pixbuf_cache_batch_class_init (PixbufCachePixbufCacheBatchClass * klass) {
 #line 15 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	pixbuf_cache_pixbuf_cache_batch_parent_class = g_type_class_peek_parent (klass);
-#line 2083 "PixbufCache.c"
+#line 2088 "PixbufCache.c"
 }
 
 
@@ -2101,17 +2106,17 @@ GType pixbuf_cache_pixbuf_cache_batch_get_type (void) {
 
 static PixbufCacheFetchJob* pixbuf_cache_fetch_job_construct (GType object_type, PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) {
 	PixbufCacheFetchJob* self = NULL;
-	PixbufCache* _tmp0_ = NULL;
-	CompletionCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	GCancellable* _tmp2_ = NULL;
-	GCancellable* _tmp3_ = NULL;
-	Semaphore* _tmp4_ = NULL;
-	Semaphore* _tmp5_ = NULL;
-	BackgroundJobJobPriority _tmp6_ = 0;
-	Photo* _tmp7_ = NULL;
-	Photo* _tmp8_ = NULL;
-	Scaling _tmp9_ = {0};
+	PixbufCache* _tmp0_;
+	CompletionCallback _tmp1_;
+	void* _tmp1__target;
+	GCancellable* _tmp2_;
+	GCancellable* _tmp3_;
+	Semaphore* _tmp4_;
+	Semaphore* _tmp5_;
+	BackgroundJobJobPriority _tmp6_;
+	Photo* _tmp7_;
+	Photo* _tmp8_;
+	Scaling _tmp9_;
 #line 28 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_val_if_fail (IS_PIXBUF_CACHE (owner), NULL);
 #line 28 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2156,14 +2161,14 @@ static PixbufCacheFetchJob* pixbuf_cache_fetch_job_construct (GType object_type,
 	self->scaling = _tmp9_;
 #line 28 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self;
-#line 2160 "PixbufCache.c"
+#line 2165 "PixbufCache.c"
 }
 
 
 static BackgroundJobJobPriority pixbuf_cache_fetch_job_real_get_priority (BackgroundJob* base) {
 	PixbufCacheFetchJob * self;
 	BackgroundJobJobPriority result = 0;
-	BackgroundJobJobPriority _tmp0_ = 0;
+	BackgroundJobJobPriority _tmp0_;
 #line 37 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob);
 #line 38 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2172,7 +2177,7 @@ static BackgroundJobJobPriority pixbuf_cache_fetch_job_real_get_priority (Backgr
 	result = _tmp0_;
 #line 38 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return result;
-#line 2176 "PixbufCache.c"
+#line 2181 "PixbufCache.c"
 }
 
 
@@ -2182,8 +2187,8 @@ static void pixbuf_cache_fetch_job_class_init (PixbufCacheFetchJobClass * klass)
 #line 21 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	((BackgroundJobClass *) klass)->finalize = pixbuf_cache_fetch_job_finalize;
 #line 21 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	((BackgroundJobClass *) klass)->get_priority = (BackgroundJobJobPriority (*)(BackgroundJob*)) pixbuf_cache_fetch_job_real_get_priority;
-#line 2187 "PixbufCache.c"
+	((BackgroundJobClass *) klass)->get_priority = (BackgroundJobJobPriority (*) (BackgroundJob *)) pixbuf_cache_fetch_job_real_get_priority;
+#line 2192 "PixbufCache.c"
 }
 
 
@@ -2192,11 +2197,11 @@ static void pixbuf_cache_fetch_job_instance_init (PixbufCacheFetchJob * self) {
 	self->pixbuf = NULL;
 #line 26 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self->err = NULL;
-#line 2196 "PixbufCache.c"
+#line 2201 "PixbufCache.c"
 }
 
 
-static void pixbuf_cache_fetch_job_finalize (BackgroundJob* obj) {
+static void pixbuf_cache_fetch_job_finalize (BackgroundJob * obj) {
 	PixbufCacheFetchJob * self;
 #line 21 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob);
@@ -2208,7 +2213,7 @@ static void pixbuf_cache_fetch_job_finalize (BackgroundJob* obj) {
 	_g_error_free0 (self->err);
 #line 21 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	BACKGROUND_JOB_CLASS (pixbuf_cache_fetch_job_parent_class)->finalize (obj);
-#line 2212 "PixbufCache.c"
+#line 2217 "PixbufCache.c"
 }
 
 
@@ -2226,12 +2231,12 @@ static GType pixbuf_cache_fetch_job_get_type (void) {
 
 static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_construct (GType object_type, PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) {
 	PixbufCacheBaselineFetchJob* self = NULL;
-	PixbufCache* _tmp0_ = NULL;
-	BackgroundJobJobPriority _tmp1_ = 0;
-	Photo* _tmp2_ = NULL;
-	Scaling _tmp3_ = {0};
-	CompletionCallback _tmp4_ = NULL;
-	void* _tmp4__target = NULL;
+	PixbufCache* _tmp0_;
+	BackgroundJobJobPriority _tmp1_;
+	Photo* _tmp2_;
+	Scaling _tmp3_;
+	CompletionCallback _tmp4_;
+	void* _tmp4__target;
 #line 43 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_val_if_fail (IS_PIXBUF_CACHE (owner), NULL);
 #line 43 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2254,14 +2259,14 @@ static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_construct (G
 	self = (PixbufCacheBaselineFetchJob*) pixbuf_cache_fetch_job_construct (object_type, _tmp0_, _tmp1_, _tmp2_, &_tmp3_, _tmp4_, _tmp4__target);
 #line 43 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self;
-#line 2258 "PixbufCache.c"
+#line 2263 "PixbufCache.c"
 }
 
 
 static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_new (PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) {
 #line 43 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return pixbuf_cache_baseline_fetch_job_construct (PIXBUF_CACHE_TYPE_BASELINE_FETCH_JOB, owner, priority, photo, scaling, callback, callback_target);
-#line 2265 "PixbufCache.c"
+#line 2270 "PixbufCache.c"
 }
 
 
@@ -2270,13 +2275,13 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 	GError * _inner_error_ = NULL;
 #line 48 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PIXBUF_CACHE_TYPE_BASELINE_FETCH_JOB, PixbufCacheBaselineFetchJob);
-#line 2274 "PixbufCache.c"
+#line 2279 "PixbufCache.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
-		Photo* _tmp1_ = NULL;
-		Scaling _tmp2_ = {0};
-		GdkPixbuf* _tmp3_ = NULL;
-		GdkPixbuf* _tmp4_ = NULL;
+		Photo* _tmp1_;
+		Scaling _tmp2_;
+		GdkPixbuf* _tmp3_;
+		GdkPixbuf* _tmp4_;
 #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->photo;
 #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2287,8 +2292,8 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		_tmp0_ = _tmp3_;
 #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2291 "PixbufCache.c"
-			goto __catch453_g_error;
+#line 2296 "PixbufCache.c"
+			goto __catch454_g_error;
 		}
 #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp4_ = _tmp0_;
@@ -2300,14 +2305,14 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->pixbuf = _tmp4_;
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2304 "PixbufCache.c"
+#line 2309 "PixbufCache.c"
 	}
-	goto __finally453;
-	__catch453_g_error:
+	goto __finally454;
+	__catch454_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp5_;
+		GError* _tmp6_;
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		err = _inner_error_;
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2322,9 +2327,9 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->err = _tmp6_;
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_error_free0 (err);
-#line 2326 "PixbufCache.c"
+#line 2331 "PixbufCache.c"
 	}
-	__finally453:
+	__finally454:
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2333,7 +2338,7 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		g_clear_error (&_inner_error_);
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 2337 "PixbufCache.c"
+#line 2342 "PixbufCache.c"
 	}
 }
 
@@ -2342,8 +2347,8 @@ static void pixbuf_cache_baseline_fetch_job_class_init (PixbufCacheBaselineFetch
 #line 42 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	pixbuf_cache_baseline_fetch_job_parent_class = g_type_class_peek_parent (klass);
 #line 42 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) pixbuf_cache_baseline_fetch_job_real_execute;
-#line 2347 "PixbufCache.c"
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) pixbuf_cache_baseline_fetch_job_real_execute;
+#line 2352 "PixbufCache.c"
 }
 
 
@@ -2365,12 +2370,12 @@ static GType pixbuf_cache_baseline_fetch_job_get_type (void) {
 
 static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_construct (GType object_type, PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) {
 	PixbufCacheMasterFetchJob* self = NULL;
-	PixbufCache* _tmp0_ = NULL;
-	BackgroundJobJobPriority _tmp1_ = 0;
-	Photo* _tmp2_ = NULL;
-	Scaling _tmp3_ = {0};
-	CompletionCallback _tmp4_ = NULL;
-	void* _tmp4__target = NULL;
+	PixbufCache* _tmp0_;
+	BackgroundJobJobPriority _tmp1_;
+	Photo* _tmp2_;
+	Scaling _tmp3_;
+	CompletionCallback _tmp4_;
+	void* _tmp4__target;
 #line 58 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_val_if_fail (IS_PIXBUF_CACHE (owner), NULL);
 #line 58 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2393,14 +2398,14 @@ static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_construct (GType
 	self = (PixbufCacheMasterFetchJob*) pixbuf_cache_fetch_job_construct (object_type, _tmp0_, _tmp1_, _tmp2_, &_tmp3_, _tmp4_, _tmp4__target);
 #line 58 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self;
-#line 2397 "PixbufCache.c"
+#line 2402 "PixbufCache.c"
 }
 
 
 static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_new (PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) {
 #line 58 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return pixbuf_cache_master_fetch_job_construct (PIXBUF_CACHE_TYPE_MASTER_FETCH_JOB, owner, priority, photo, scaling, callback, callback_target);
-#line 2404 "PixbufCache.c"
+#line 2409 "PixbufCache.c"
 }
 
 
@@ -2409,13 +2414,13 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 	GError * _inner_error_ = NULL;
 #line 63 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PIXBUF_CACHE_TYPE_MASTER_FETCH_JOB, PixbufCacheMasterFetchJob);
-#line 2413 "PixbufCache.c"
+#line 2418 "PixbufCache.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
-		Photo* _tmp1_ = NULL;
-		Scaling _tmp2_ = {0};
-		GdkPixbuf* _tmp3_ = NULL;
-		GdkPixbuf* _tmp4_ = NULL;
+		Photo* _tmp1_;
+		Scaling _tmp2_;
+		GdkPixbuf* _tmp3_;
+		GdkPixbuf* _tmp4_;
 #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->photo;
 #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2426,8 +2431,8 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		_tmp0_ = _tmp3_;
 #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2430 "PixbufCache.c"
-			goto __catch454_g_error;
+#line 2435 "PixbufCache.c"
+			goto __catch455_g_error;
 		}
 #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp4_ = _tmp0_;
@@ -2439,14 +2444,14 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->pixbuf = _tmp4_;
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2443 "PixbufCache.c"
+#line 2448 "PixbufCache.c"
 	}
-	goto __finally454;
-	__catch454_g_error:
+	goto __finally455;
+	__catch455_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp5_;
+		GError* _tmp6_;
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		err = _inner_error_;
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2461,9 +2466,9 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->err = _tmp6_;
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_error_free0 (err);
-#line 2465 "PixbufCache.c"
+#line 2470 "PixbufCache.c"
 	}
-	__finally454:
+	__finally455:
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2472,7 +2477,7 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		g_clear_error (&_inner_error_);
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 2476 "PixbufCache.c"
+#line 2481 "PixbufCache.c"
 	}
 }
 
@@ -2481,8 +2486,8 @@ static void pixbuf_cache_master_fetch_job_class_init (PixbufCacheMasterFetchJobC
 #line 57 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	pixbuf_cache_master_fetch_job_parent_class = g_type_class_peek_parent (klass);
 #line 57 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) pixbuf_cache_master_fetch_job_real_execute;
-#line 2486 "PixbufCache.c"
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) pixbuf_cache_master_fetch_job_real_execute;
+#line 2491 "PixbufCache.c"
 }
 
 
@@ -2510,15 +2515,15 @@ static void pixbuf_cache_class_init (PixbufCacheClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	G_OBJECT_CLASS (klass)->finalize = pixbuf_cache_finalize;
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	g_signal_new ("fetched", TYPE_PIXBUF_CACHE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER, G_TYPE_NONE, 3, TYPE_PHOTO, gdk_pixbuf_get_type (), G_TYPE_POINTER);
-#line 2515 "PixbufCache.c"
+	pixbuf_cache_signals[PIXBUF_CACHE_FETCHED_SIGNAL] = g_signal_new ("fetched", TYPE_PIXBUF_CACHE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER, G_TYPE_NONE, 3, TYPE_PHOTO, gdk_pixbuf_get_type (), G_TYPE_POINTER);
+#line 2520 "PixbufCache.c"
 }
 
 
 static void pixbuf_cache_instance_init (PixbufCache * self) {
-	GeeHashMap* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeArrayList* _tmp1_;
+	GeeHashMap* _tmp2_;
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self->priv = PIXBUF_CACHE_GET_PRIVATE (self);
 #line 79 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2533,31 +2538,31 @@ static void pixbuf_cache_instance_init (PixbufCache * self) {
 	_tmp2_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, PIXBUF_CACHE_TYPE_FETCH_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 81 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self->priv->in_progress = _tmp2_;
-#line 2537 "PixbufCache.c"
+#line 2542 "PixbufCache.c"
 }
 
 
-static void pixbuf_cache_finalize (GObject* obj) {
+static void pixbuf_cache_finalize (GObject * obj) {
 	PixbufCache * self;
-	PixbufCachePhotoType _tmp0_ = 0;
-	SourceCollection* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
+	PixbufCachePhotoType _tmp0_;
+	SourceCollection* _tmp3_;
+	guint _tmp4_;
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXBUF_CACHE, PixbufCache);
 #line 110 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp0_ = self->priv->type;
 #line 110 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp0_ != PIXBUF_CACHE_PHOTO_TYPE_MASTER) {
-#line 2552 "PixbufCache.c"
-		SourceCollection* _tmp1_ = NULL;
-		guint _tmp2_ = 0U;
+#line 2557 "PixbufCache.c"
+		SourceCollection* _tmp1_;
+		guint _tmp2_;
 #line 111 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp1_ = self->priv->sources;
 #line 111 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp2_, NULL, FALSE);
 #line 111 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _pixbuf_cache_on_sources_altered_data_collection_items_altered, self);
-#line 2561 "PixbufCache.c"
+#line 2566 "PixbufCache.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp3_ = self->priv->sources;
@@ -2565,15 +2570,15 @@ static void pixbuf_cache_finalize (GObject* obj) {
 	g_signal_parse_name ("items-removed", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE);
 #line 112 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _pixbuf_cache_on_sources_removed_data_collection_items_removed, self);
-#line 2569 "PixbufCache.c"
+#line 2574 "PixbufCache.c"
 	{
 		GeeIterator* _job_it = NULL;
-		GeeHashMap* _tmp5_ = NULL;
-		GeeCollection* _tmp6_ = NULL;
-		GeeCollection* _tmp7_ = NULL;
-		GeeCollection* _tmp8_ = NULL;
-		GeeIterator* _tmp9_ = NULL;
-		GeeIterator* _tmp10_ = NULL;
+		GeeHashMap* _tmp5_;
+		GeeCollection* _tmp6_;
+		GeeCollection* _tmp7_;
+		GeeCollection* _tmp8_;
+		GeeIterator* _tmp9_;
+		GeeIterator* _tmp10_;
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp5_ = self->priv->in_progress;
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2592,13 +2597,13 @@ static void pixbuf_cache_finalize (GObject* obj) {
 		_job_it = _tmp10_;
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 2596 "PixbufCache.c"
-			GeeIterator* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
+#line 2601 "PixbufCache.c"
+			GeeIterator* _tmp11_;
+			gboolean _tmp12_;
 			PixbufCacheFetchJob* job = NULL;
-			GeeIterator* _tmp13_ = NULL;
-			gpointer _tmp14_ = NULL;
-			PixbufCacheFetchJob* _tmp15_ = NULL;
+			GeeIterator* _tmp13_;
+			gpointer _tmp14_;
+			PixbufCacheFetchJob* _tmp15_;
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp11_ = _job_it;
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2607,7 +2612,7 @@ static void pixbuf_cache_finalize (GObject* obj) {
 			if (!_tmp12_) {
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 2611 "PixbufCache.c"
+#line 2616 "PixbufCache.c"
 			}
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp13_ = _job_it;
@@ -2621,11 +2626,11 @@ static void pixbuf_cache_finalize (GObject* obj) {
 			background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_background_job_unref0 (job);
-#line 2625 "PixbufCache.c"
+#line 2630 "PixbufCache.c"
 		}
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_job_it);
-#line 2629 "PixbufCache.c"
+#line 2634 "PixbufCache.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_data_collection_unref0 (self->priv->sources);
@@ -2637,7 +2642,7 @@ static void pixbuf_cache_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->in_progress);
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	G_OBJECT_CLASS (pixbuf_cache_parent_class)->finalize (obj);
-#line 2641 "PixbufCache.c"
+#line 2646 "PixbufCache.c"
 }
 
 
diff --git a/src/Printing.c b/src/Printing.c
index a9d2d3e..42a3024 100644
--- a/src/Printing.c
+++ b/src/Printing.c
@@ -1,4 +1,4 @@
-/* Printing.c generated by valac 0.34.7, the Vala compiler
+/* Printing.c generated by valac 0.36.6, the Vala compiler
  * generated from Printing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -493,7 +493,7 @@ void print_settings_set_match_aspect_ratio_enabled (PrintSettings* self, gboolea
 void print_settings_set_print_titles_enabled (PrintSettings* self, gboolean print_titles);
 void print_settings_set_print_titles_font (PrintSettings* self, const gchar* fontname);
 gchar* print_settings_get_print_titles_font (PrintSettings* self);
-static void print_settings_finalize (PrintSettings* obj);
+static void print_settings_finalize (PrintSettings * obj);
 #define MEASUREMENT_CENTIMETERS_PER_INCH 2.54
 #define MEASUREMENT_INCHES_PER_CENTIMETER (1.0 / 2.54)
 void measurement_convert_to (Measurement *self, MeasurementUnit to_unit, Measurement* result);
@@ -565,7 +565,7 @@ static gboolean custom_print_tab_is_print_titles_enabled (CustomPrintTab* self);
 static gchar* custom_print_tab_get_print_titles_font (CustomPrintTab* self);
 PrintJob* custom_print_tab_get_source_job (CustomPrintTab* self);
 PrintSettings* custom_print_tab_get_local_settings (CustomPrintTab* self);
-static void custom_print_tab_finalize (GObject* obj);
+static void custom_print_tab_finalize (GObject * obj);
 GType data_object_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
@@ -588,13 +588,13 @@ gdouble dimensions_get_aspect_ratio (Dimensions *self);
 GeeList* print_job_get_photos (PrintJob* self);
 Photo* print_job_get_source_photo (PrintJob* self);
 void print_job_set_local_settings (PrintJob* self, PrintSettings* settings);
-static void print_job_finalize (GObject* obj);
+static void print_job_finalize (GObject * obj);
 enum  {
 	STANDARD_PRINT_SIZE_DUMMY_PROPERTY
 };
 StandardPrintSize* standard_print_size_new (const gchar* name, Measurement* width, Measurement* height);
 StandardPrintSize* standard_print_size_construct (GType object_type, const gchar* name, Measurement* width, Measurement* height);
-static void standard_print_size_finalize (StandardPrintSize* obj);
+static void standard_print_size_finalize (StandardPrintSize * obj);
 GType progress_dialog_get_type (void) G_GNUC_CONST;
 #define PRINT_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PRINT_MANAGER, PrintManagerPrivate))
 enum  {
@@ -603,21 +603,21 @@ enum  {
 #define PRINT_MANAGER_IMAGE_DISTANCE 0.24
 static PrintManager* print_manager_new (void);
 static PrintManager* print_manager_construct (GType object_type);
-static void _vala_array_add112 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add113 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add114 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add115 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add116 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add117 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add118 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add119 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add120 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add121 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add122 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add123 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add124 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add125 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add126 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add112 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add113 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add114 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add115 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add116 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add117 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add118 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add119 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add120 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add121 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add122 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add123 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add124 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add125 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add126 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
 void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print);
 gchar* data_object_get_name (DataObject* self);
 static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation* emitting_object, GtkPrintContext* job_context);
@@ -657,7 +657,7 @@ void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result);
 GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInterpType interp, gboolean scale_up);
 void scaling_for_viewport (Dimensions* viewport, gboolean scale_up, Scaling* result);
 static void _vala_PangoFontDescription_free (PangoFontDescription* self);
-static void print_manager_finalize (PrintManager* obj);
+static void print_manager_finalize (PrintManager * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -677,18 +677,18 @@ GType content_layout_get_type (void) {
 PrintSettings* print_settings_construct (GType object_type) {
 	PrintSettings* self = NULL;
 	ConfigFacade* config = NULL;
-	ConfigFacade* _tmp0_ = NULL;
+	ConfigFacade* _tmp0_;
 	MeasurementUnit units = 0;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-	gchar* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
+	gint _tmp1_;
+	gdouble _tmp2_;
+	gdouble _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp7_;
+	gchar* _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
 #line 30 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = (PrintSettings*) g_type_create_instance (object_type);
 #line 31 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -754,20 +754,20 @@ PrintSettings* print_settings_new (void) {
 
 void print_settings_save (PrintSettings* self) {
 	ConfigFacade* config = NULL;
-	ConfigFacade* _tmp0_ = NULL;
-	Measurement _tmp1_ = {0};
-	MeasurementUnit _tmp2_ = 0;
-	Measurement _tmp3_ = {0};
-	gdouble _tmp4_ = 0.0;
-	Measurement _tmp5_ = {0};
-	gdouble _tmp6_ = 0.0;
-	gint _tmp7_ = 0;
-	ContentLayout _tmp8_ = 0;
-	gboolean _tmp9_ = FALSE;
-	gboolean _tmp10_ = FALSE;
-	const gchar* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
+	ConfigFacade* _tmp0_;
+	Measurement _tmp1_;
+	MeasurementUnit _tmp2_;
+	Measurement _tmp3_;
+	gdouble _tmp4_;
+	Measurement _tmp5_;
+	gdouble _tmp6_;
+	gint _tmp7_;
+	ContentLayout _tmp8_;
+	gboolean _tmp9_;
+	gboolean _tmp10_;
+	const gchar* _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
 #line 46 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_SETTINGS (self));
 #line 47 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -827,7 +827,7 @@ void print_settings_save (PrintSettings* self) {
 
 
 void print_settings_get_content_width (PrintSettings* self, Measurement* result) {
-	ContentLayout _tmp0_ = 0;
+	ContentLayout _tmp0_;
 #line 62 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_SETTINGS (self));
 #line 63 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -840,14 +840,14 @@ void print_settings_get_content_width (PrintSettings* self, Measurement* result)
 		case CONTENT_LAYOUT_IMAGE_PER_PAGE:
 #line 842 "Printing.c"
 		{
-			PrintManager* _tmp1_ = NULL;
-			PrintManager* _tmp2_ = NULL;
-			gint _tmp3_ = 0;
-			StandardPrintSize** _tmp4_ = NULL;
-			gint _tmp5_ = 0;
-			StandardPrintSize* _tmp6_ = NULL;
-			Measurement _tmp7_ = {0};
-			Measurement _tmp8_ = {0};
+			PrintManager* _tmp1_;
+			PrintManager* _tmp2_;
+			gint _tmp3_;
+			StandardPrintSize** _tmp4_;
+			gint _tmp5_;
+			StandardPrintSize* _tmp6_;
+			Measurement _tmp7_;
+			Measurement _tmp8_;
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp1_ = print_manager_get_instance ();
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -874,7 +874,7 @@ void print_settings_get_content_width (PrintSettings* self, Measurement* result)
 		case CONTENT_LAYOUT_CUSTOM_SIZE:
 #line 876 "Printing.c"
 		{
-			Measurement _tmp9_ = {0};
+			Measurement _tmp9_;
 #line 70 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp9_ = self->priv->content_width;
 #line 70 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -894,7 +894,7 @@ void print_settings_get_content_width (PrintSettings* self, Measurement* result)
 
 
 void print_settings_get_content_height (PrintSettings* self, Measurement* result) {
-	ContentLayout _tmp0_ = 0;
+	ContentLayout _tmp0_;
 #line 77 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_SETTINGS (self));
 #line 78 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -907,14 +907,14 @@ void print_settings_get_content_height (PrintSettings* self, Measurement* result
 		case CONTENT_LAYOUT_IMAGE_PER_PAGE:
 #line 909 "Printing.c"
 		{
-			PrintManager* _tmp1_ = NULL;
-			PrintManager* _tmp2_ = NULL;
-			gint _tmp3_ = 0;
-			StandardPrintSize** _tmp4_ = NULL;
-			gint _tmp5_ = 0;
-			StandardPrintSize* _tmp6_ = NULL;
-			Measurement _tmp7_ = {0};
-			Measurement _tmp8_ = {0};
+			PrintManager* _tmp1_;
+			PrintManager* _tmp2_;
+			gint _tmp3_;
+			StandardPrintSize** _tmp4_;
+			gint _tmp5_;
+			StandardPrintSize* _tmp6_;
+			Measurement _tmp7_;
+			Measurement _tmp8_;
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp1_ = print_manager_get_instance ();
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -941,7 +941,7 @@ void print_settings_get_content_height (PrintSettings* self, Measurement* result
 		case CONTENT_LAYOUT_CUSTOM_SIZE:
 #line 943 "Printing.c"
 		{
-			Measurement _tmp9_ = {0};
+			Measurement _tmp9_;
 #line 85 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp9_ = self->priv->content_height;
 #line 85 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -990,7 +990,7 @@ void print_settings_get_maximum_content_dimension (PrintSettings* self, Measurem
 
 gboolean print_settings_is_match_aspect_ratio_enabled (PrintSettings* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 100 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_SETTINGS (self), FALSE);
 #line 101 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1005,7 +1005,7 @@ gboolean print_settings_is_match_aspect_ratio_enabled (PrintSettings* self) {
 
 gboolean print_settings_is_print_titles_enabled (PrintSettings* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 104 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_SETTINGS (self), FALSE);
 #line 105 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1020,7 +1020,7 @@ gboolean print_settings_is_print_titles_enabled (PrintSettings* self) {
 
 gint print_settings_get_content_ppi (PrintSettings* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 108 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_SETTINGS (self), 0);
 #line 109 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1035,7 +1035,7 @@ gint print_settings_get_content_ppi (PrintSettings* self) {
 
 gint print_settings_get_image_per_page_selection (PrintSettings* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 112 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_SETTINGS (self), 0);
 #line 113 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1050,7 +1050,7 @@ gint print_settings_get_image_per_page_selection (PrintSettings* self) {
 
 gint print_settings_get_size_selection (PrintSettings* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 116 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_SETTINGS (self), 0);
 #line 117 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1065,7 +1065,7 @@ gint print_settings_get_size_selection (PrintSettings* self) {
 
 ContentLayout print_settings_get_content_layout (PrintSettings* self) {
 	ContentLayout result = 0;
-	ContentLayout _tmp0_ = 0;
+	ContentLayout _tmp0_;
 #line 120 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_SETTINGS (self), 0);
 #line 121 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1079,7 +1079,7 @@ ContentLayout print_settings_get_content_layout (PrintSettings* self) {
 
 
 void print_settings_set_content_layout (PrintSettings* self, ContentLayout content_layout) {
-	ContentLayout _tmp0_ = 0;
+	ContentLayout _tmp0_;
 #line 124 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_SETTINGS (self));
 #line 125 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1091,7 +1091,7 @@ void print_settings_set_content_layout (PrintSettings* self, ContentLayout conte
 
 
 void print_settings_set_content_width (PrintSettings* self, Measurement* content_width) {
-	Measurement _tmp0_ = {0};
+	Measurement _tmp0_;
 #line 128 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_SETTINGS (self));
 #line 128 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1105,7 +1105,7 @@ void print_settings_set_content_width (PrintSettings* self, Measurement* content
 
 
 void print_settings_set_content_height (PrintSettings* self, Measurement* content_height) {
-	Measurement _tmp0_ = {0};
+	Measurement _tmp0_;
 #line 132 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_SETTINGS (self));
 #line 132 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1119,7 +1119,7 @@ void print_settings_set_content_height (PrintSettings* self, Measurement* conten
 
 
 void print_settings_set_content_ppi (PrintSettings* self, gint content_ppi) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 136 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_SETTINGS (self));
 #line 137 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1131,7 +1131,7 @@ void print_settings_set_content_ppi (PrintSettings* self, gint content_ppi) {
 
 
 void print_settings_set_image_per_page_selection (PrintSettings* self, gint image_per_page_selection) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 140 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_SETTINGS (self));
 #line 141 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1143,7 +1143,7 @@ void print_settings_set_image_per_page_selection (PrintSettings* self, gint imag
 
 
 void print_settings_set_size_selection (PrintSettings* self, gint size_selection) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 144 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_SETTINGS (self));
 #line 145 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1155,7 +1155,7 @@ void print_settings_set_size_selection (PrintSettings* self, gint size_selection
 
 
 void print_settings_set_match_aspect_ratio_enabled (PrintSettings* self, gboolean enable_state) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 148 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_SETTINGS (self));
 #line 149 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1167,7 +1167,7 @@ void print_settings_set_match_aspect_ratio_enabled (PrintSettings* self, gboolea
 
 
 void print_settings_set_print_titles_enabled (PrintSettings* self, gboolean print_titles) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 152 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_SETTINGS (self));
 #line 153 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1179,8 +1179,8 @@ void print_settings_set_print_titles_enabled (PrintSettings* self, gboolean prin
 
 
 void print_settings_set_print_titles_font (PrintSettings* self, const gchar* fontname) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 156 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_SETTINGS (self));
 #line 156 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1199,8 +1199,8 @@ void print_settings_set_print_titles_font (PrintSettings* self, const gchar* fon
 
 gchar* print_settings_get_print_titles_font (PrintSettings* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 160 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_SETTINGS (self), NULL);
 #line 161 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1257,7 +1257,7 @@ static gchar* value_print_settings_collect_value (GValue* value, guint n_collect
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (collect_values[0].v_pointer) {
 #line 1260 "Printing.c"
-		PrintSettings* object;
+		PrintSettings * object;
 		object = collect_values[0].v_pointer;
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1284,7 +1284,7 @@ static gchar* value_print_settings_collect_value (GValue* value, guint n_collect
 
 
 static gchar* value_print_settings_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PrintSettings** object_p;
+	PrintSettings ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!object_p) {
@@ -1336,7 +1336,7 @@ gpointer value_get_print_settings (const GValue* value) {
 
 
 void value_set_print_settings (GValue* value, gpointer v_object) {
-	PrintSettings* old;
+	PrintSettings * old;
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_SETTINGS));
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1367,7 +1367,7 @@ void value_set_print_settings (GValue* value, gpointer v_object) {
 
 
 void value_take_print_settings (GValue* value, gpointer v_object) {
-	PrintSettings* old;
+	PrintSettings * old;
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_SETTINGS));
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1415,7 +1415,7 @@ static void print_settings_instance_init (PrintSettings * self) {
 }
 
 
-static void print_settings_finalize (PrintSettings* obj) {
+static void print_settings_finalize (PrintSettings * obj) {
 	PrintSettings * self;
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PRINT_SETTINGS, PrintSettings);
@@ -1442,7 +1442,7 @@ GType print_settings_get_type (void) {
 
 
 gpointer print_settings_ref (gpointer instance) {
-	PrintSettings* self;
+	PrintSettings * self;
 	self = instance;
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1453,7 +1453,7 @@ gpointer print_settings_ref (gpointer instance) {
 
 
 void print_settings_unref (gpointer instance) {
-	PrintSettings* self;
+	PrintSettings * self;
 	self = instance;
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1479,8 +1479,8 @@ GType measurement_unit_get_type (void) {
 
 
 void measurement_init (Measurement *self, gdouble value, MeasurementUnit unit) {
-	gdouble _tmp0_ = 0.0;
-	MeasurementUnit _tmp1_ = 0;
+	gdouble _tmp0_;
+	MeasurementUnit _tmp1_;
 #line 185 "/home/jens/Source/shotwell/src/Printing.vala"
 	memset (self, 0, sizeof (Measurement));
 #line 186 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1496,9 +1496,9 @@ void measurement_init (Measurement *self, gdouble value, MeasurementUnit unit) {
 
 
 void measurement_convert_to (Measurement *self, MeasurementUnit to_unit, Measurement* result) {
-	MeasurementUnit _tmp0_ = 0;
-	MeasurementUnit _tmp1_ = 0;
-	MeasurementUnit _tmp2_ = 0;
+	MeasurementUnit _tmp0_;
+	MeasurementUnit _tmp1_;
+	MeasurementUnit _tmp2_;
 #line 191 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = (*self).unit;
 #line 191 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1516,7 +1516,7 @@ void measurement_convert_to (Measurement *self, MeasurementUnit to_unit, Measure
 #line 194 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_ == MEASUREMENT_UNIT_INCHES) {
 #line 1519 "Printing.c"
-		gdouble _tmp3_ = 0.0;
+		gdouble _tmp3_;
 		Measurement _tmp4_ = {0};
 #line 195 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp3_ = (*self).value;
@@ -1528,13 +1528,13 @@ void measurement_convert_to (Measurement *self, MeasurementUnit to_unit, Measure
 		return;
 #line 1530 "Printing.c"
 	} else {
-		MeasurementUnit _tmp5_ = 0;
+		MeasurementUnit _tmp5_;
 #line 196 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = to_unit;
 #line 196 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp5_ == MEASUREMENT_UNIT_CENTIMETERS) {
 #line 1537 "Printing.c"
-			gdouble _tmp6_ = 0.0;
+			gdouble _tmp6_;
 			Measurement _tmp7_ = {0};
 #line 197 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp6_ = (*self).value;
@@ -1557,13 +1557,13 @@ void measurement_convert_to (Measurement *self, MeasurementUnit to_unit, Measure
 gboolean measurement_is_less_than (Measurement *self, Measurement* rhs) {
 	gboolean result = FALSE;
 	Measurement _tmp0_ = {0};
-	MeasurementUnit _tmp1_ = 0;
-	Measurement _tmp2_ = {0};
-	MeasurementUnit _tmp3_ = 0;
+	MeasurementUnit _tmp1_;
+	Measurement _tmp2_;
+	MeasurementUnit _tmp3_;
 	Measurement converted_rhs = {0};
-	gdouble _tmp7_ = 0.0;
-	Measurement _tmp8_ = {0};
-	gdouble _tmp9_ = 0.0;
+	gdouble _tmp7_;
+	Measurement _tmp8_;
+	gdouble _tmp9_;
 #line 203 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (rhs != NULL, FALSE);
 #line 204 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1575,14 +1575,14 @@ gboolean measurement_is_less_than (Measurement *self, Measurement* rhs) {
 #line 204 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_ == _tmp3_) {
 #line 1578 "Printing.c"
-		Measurement _tmp4_ = {0};
+		Measurement _tmp4_;
 #line 204 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = *rhs;
 #line 204 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp0_ = _tmp4_;
 #line 1584 "Printing.c"
 	} else {
-		MeasurementUnit _tmp5_ = 0;
+		MeasurementUnit _tmp5_;
 		Measurement _tmp6_ = {0};
 #line 204 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = (*self).unit;
@@ -1611,13 +1611,13 @@ gboolean measurement_is_less_than (Measurement *self, Measurement* rhs) {
 gboolean measurement_is_greater_than (Measurement *self, Measurement* rhs) {
 	gboolean result = FALSE;
 	Measurement _tmp0_ = {0};
-	MeasurementUnit _tmp1_ = 0;
-	Measurement _tmp2_ = {0};
-	MeasurementUnit _tmp3_ = 0;
+	MeasurementUnit _tmp1_;
+	Measurement _tmp2_;
+	MeasurementUnit _tmp3_;
 	Measurement converted_rhs = {0};
-	gdouble _tmp7_ = 0.0;
-	Measurement _tmp8_ = {0};
-	gdouble _tmp9_ = 0.0;
+	gdouble _tmp7_;
+	Measurement _tmp8_;
+	gdouble _tmp9_;
 #line 208 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (rhs != NULL, FALSE);
 #line 209 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1629,14 +1629,14 @@ gboolean measurement_is_greater_than (Measurement *self, Measurement* rhs) {
 #line 209 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_ == _tmp3_) {
 #line 1632 "Printing.c"
-		Measurement _tmp4_ = {0};
+		Measurement _tmp4_;
 #line 209 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = *rhs;
 #line 209 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp0_ = _tmp4_;
 #line 1638 "Printing.c"
 	} else {
-		MeasurementUnit _tmp5_ = 0;
+		MeasurementUnit _tmp5_;
 		Measurement _tmp6_ = {0};
 #line 209 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = (*self).unit;
@@ -1694,9 +1694,9 @@ GType measurement_get_type (void) {
 
 PrintLayout* print_layout_get_all (int* result_length1) {
 	PrintLayout* result = NULL;
-	PrintLayout* _tmp0_ = NULL;
-	PrintLayout* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	PrintLayout* _tmp0_;
+	PrintLayout* _tmp1_;
+	gint _tmp1__length1;
 #line 224 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = g_new0 (PrintLayout, 7);
 #line 224 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1734,10 +1734,10 @@ PrintLayout* print_layout_get_all (int* result_length1) {
 gint print_layout_get_per_page (PrintLayout self) {
 	gint result = 0;
 	gint* per_page = NULL;
-	gint* _tmp0_ = NULL;
-	gint per_page_length1 = 0;
-	gint _per_page_size_ = 0;
-	gint _tmp1_ = 0;
+	gint* _tmp0_;
+	gint per_page_length1;
+	gint _per_page_size_;
+	gint _tmp1_;
 #line 236 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = g_new0 (gint, 7);
 #line 236 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1775,10 +1775,10 @@ gint print_layout_get_per_page (PrintLayout self) {
 gint print_layout_get_x (PrintLayout self) {
 	gint result = 0;
 	gint* x = NULL;
-	gint* _tmp0_ = NULL;
-	gint x_length1 = 0;
-	gint _x_size_ = 0;
-	gint _tmp1_ = 0;
+	gint* _tmp0_;
+	gint x_length1;
+	gint _x_size_;
+	gint _tmp1_;
 #line 242 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = g_new0 (gint, 7);
 #line 242 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1816,10 +1816,10 @@ gint print_layout_get_x (PrintLayout self) {
 gint print_layout_get_y (PrintLayout self) {
 	gint result = 0;
 	gint* y = NULL;
-	gint* _tmp0_ = NULL;
-	gint y_length1 = 0;
-	gint _y_size_ = 0;
-	gint _tmp1_ = 0;
+	gint* _tmp0_;
+	gint y_length1;
+	gint _y_size_;
+	gint _tmp1_;
 #line 248 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = g_new0 (gint, 7);
 #line 248 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1857,86 +1857,65 @@ gint print_layout_get_y (PrintLayout self) {
 gchar* print_layout_to_string (PrintLayout self) {
 	gchar* result = NULL;
 	gchar** labels = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar** _tmp14_ = NULL;
-	gint labels_length1 = 0;
-	gint _labels_size_ = 0;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-#line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp0_ = _ ("Fill the entire page");
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar** _tmp7_;
+	gint labels_length1;
+	gint _labels_size_;
+	const gchar* _tmp8_;
+	gchar* _tmp9_;
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (_ ("Fill the entire page"));
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp2_ = _ ("2 images per page");
+	_tmp1_ = g_strdup (_ ("2 images per page"));
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
+	_tmp2_ = g_strdup (_ ("4 images per page"));
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp4_ = _ ("4 images per page");
+	_tmp3_ = g_strdup (_ ("6 images per page"));
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp5_ = g_strdup (_tmp4_);
+	_tmp4_ = g_strdup (_ ("8 images per page"));
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp6_ = _ ("6 images per page");
+	_tmp5_ = g_strdup (_ ("16 images per page"));
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp7_ = g_strdup (_tmp6_);
+	_tmp6_ = g_strdup (_ ("32 images per page"));
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp8_ = _ ("8 images per page");
+	_tmp7_ = g_new0 (gchar*, 7 + 1);
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp9_ = g_strdup (_tmp8_);
+	_tmp7_[0] = _tmp0_;
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp10_ = _ ("16 images per page");
+	_tmp7_[1] = _tmp1_;
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp11_ = g_strdup (_tmp10_);
+	_tmp7_[2] = _tmp2_;
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp12_ = _ ("32 images per page");
+	_tmp7_[3] = _tmp3_;
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp13_ = g_strdup (_tmp12_);
+	_tmp7_[4] = _tmp4_;
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp14_ = g_new0 (gchar*, 7 + 1);
+	_tmp7_[5] = _tmp5_;
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp14_[0] = _tmp1_;
+	_tmp7_[6] = _tmp6_;
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp14_[1] = _tmp3_;
-#line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp14_[2] = _tmp5_;
-#line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp14_[3] = _tmp7_;
-#line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp14_[4] = _tmp9_;
-#line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp14_[5] = _tmp11_;
-#line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp14_[6] = _tmp13_;
-#line 254 "/home/jens/Source/shotwell/src/Printing.vala"
-	labels = _tmp14_;
+	labels = _tmp7_;
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
 	labels_length1 = 7;
 #line 254 "/home/jens/Source/shotwell/src/Printing.vala"
 	_labels_size_ = labels_length1;
 #line 264 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp15_ = labels[self];
+	_tmp8_ = labels[self];
 #line 264 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp16_ = g_strdup (_tmp15_);
+	_tmp9_ = g_strdup (_tmp8_);
 #line 264 "/home/jens/Source/shotwell/src/Printing.vala"
-	result = _tmp16_;
+	result = _tmp9_;
 #line 264 "/home/jens/Source/shotwell/src/Printing.vala"
 	labels = (_vala_array_free (labels, labels_length1, (GDestroyNotify) g_free), NULL);
 #line 264 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1940 "Printing.c"
+#line 1919 "Printing.c"
 }
 
 
@@ -1955,14 +1934,14 @@ GType print_layout_get_type (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 305 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1959 "Printing.c"
+#line 1938 "Printing.c"
 }
 
 
 static void _custom_print_tab_on_radio_group_click_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 307 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_on_radio_group_click ((CustomPrintTab*) self, _sender);
-#line 1966 "Printing.c"
+#line 1945 "Printing.c"
 }
 
 
@@ -1971,21 +1950,21 @@ static gboolean _custom_print_tab_standard_sizes_combo_separator_func_gtk_tree_v
 	result = custom_print_tab_standard_sizes_combo_separator_func (model, iter);
 #line 316 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1975 "Printing.c"
+#line 1954 "Printing.c"
 }
 
 
 static gpointer _standard_print_size_ref0 (gpointer self) {
 #line 317 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self ? standard_print_size_ref (self) : NULL;
-#line 1982 "Printing.c"
+#line 1961 "Printing.c"
 }
 
 
 static void _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
 #line 323 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_on_entry_insert_text ((CustomPrintTab*) self, _sender, new_text, new_text_length, position);
-#line 1989 "Printing.c"
+#line 1968 "Printing.c"
 }
 
 
@@ -1994,7 +1973,7 @@ static gboolean _custom_print_tab_on_width_entry_focus_out_gtk_widget_focus_out_
 	result = custom_print_tab_on_width_entry_focus_out ((CustomPrintTab*) self, event);
 #line 324 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1998 "Printing.c"
+#line 1977 "Printing.c"
 }
 
 
@@ -2003,21 +1982,21 @@ static gboolean _custom_print_tab_on_height_entry_focus_out_gtk_widget_focus_out
 	result = custom_print_tab_on_height_entry_focus_out ((CustomPrintTab*) self, event);
 #line 327 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2007 "Printing.c"
+#line 1986 "Printing.c"
 }
 
 
 static void _custom_print_tab_on_units_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 329 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_on_units_combo_changed ((CustomPrintTab*) self);
-#line 2014 "Printing.c"
+#line 1993 "Printing.c"
 }
 
 
 static void _custom_print_tab_on_ppi_entry_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
 #line 332 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_on_ppi_entry_insert_text ((CustomPrintTab*) self, _sender, new_text, new_text_length, position);
-#line 2021 "Printing.c"
+#line 2000 "Printing.c"
 }
 
 
@@ -2026,51 +2005,51 @@ static gboolean _custom_print_tab_on_ppi_entry_focus_out_gtk_widget_focus_out_ev
 	result = custom_print_tab_on_ppi_entry_focus_out ((CustomPrintTab*) self, event);
 #line 333 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2030 "Printing.c"
+#line 2009 "Printing.c"
 }
 
 
 static void _custom_print_tab_on_aspect_ratio_check_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 340 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_on_aspect_ratio_check_clicked ((CustomPrintTab*) self);
-#line 2037 "Printing.c"
+#line 2016 "Printing.c"
 }
 
 
 CustomPrintTab* custom_print_tab_construct (GType object_type, PrintJob* source_job) {
 	CustomPrintTab * self = NULL;
-	PrintJob* _tmp0_ = NULL;
-	PrintJob* _tmp1_ = NULL;
-	GtkRadioButton* _tmp2_ = NULL;
-	GtkRadioButton* _tmp3_ = NULL;
-	GtkRadioButton* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	PrintLayout* _tmp6_ = NULL;
+	PrintJob* _tmp0_;
+	PrintJob* _tmp1_;
+	GtkRadioButton* _tmp2_;
+	GtkRadioButton* _tmp3_;
+	GtkRadioButton* _tmp4_;
+	gint _tmp5_;
+	PrintLayout* _tmp6_;
 	StandardPrintSize** standard_sizes = NULL;
-	PrintManager* _tmp11_ = NULL;
-	PrintManager* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	StandardPrintSize** _tmp14_ = NULL;
-	StandardPrintSize** _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	gint standard_sizes_length1 = 0;
-	gint _standard_sizes_size_ = 0;
-	GtkComboBoxText* _tmp16_ = NULL;
-	StandardPrintSize** _tmp17_ = NULL;
-	gint _tmp17__length1 = 0;
-	GtkComboBoxText* _tmp22_ = NULL;
-	ResourcesUnitSystem _tmp23_ = 0;
-	GtkEntry* _tmp24_ = NULL;
-	GtkEntry* _tmp25_ = NULL;
-	GtkEntry* _tmp26_ = NULL;
-	GtkEntry* _tmp27_ = NULL;
-	GtkComboBoxText* _tmp28_ = NULL;
-	GtkComboBoxText* _tmp29_ = NULL;
-	ResourcesUnitSystem _tmp30_ = 0;
-	GtkEntry* _tmp31_ = NULL;
-	GtkEntry* _tmp32_ = NULL;
-	PrintJob* _tmp33_ = NULL;
-	GtkCheckButton* _tmp34_ = NULL;
+	PrintManager* _tmp11_;
+	PrintManager* _tmp12_;
+	gint _tmp13_;
+	StandardPrintSize** _tmp14_;
+	StandardPrintSize** _tmp15_;
+	gint _tmp15__length1;
+	gint standard_sizes_length1;
+	gint _standard_sizes_size_;
+	GtkComboBoxText* _tmp16_;
+	StandardPrintSize** _tmp17_;
+	gint _tmp17__length1;
+	GtkComboBoxText* _tmp22_;
+	ResourcesUnitSystem _tmp23_;
+	GtkEntry* _tmp24_;
+	GtkEntry* _tmp25_;
+	GtkEntry* _tmp26_;
+	GtkEntry* _tmp27_;
+	GtkComboBoxText* _tmp28_;
+	GtkComboBoxText* _tmp29_;
+	ResourcesUnitSystem _tmp30_;
+	GtkEntry* _tmp31_;
+	GtkEntry* _tmp32_;
+	PrintJob* _tmp33_;
+	GtkCheckButton* _tmp34_;
 #line 304 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_JOB (source_job), NULL);
 #line 304 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -2097,7 +2076,7 @@ CustomPrintTab* custom_print_tab_construct (GType object_type, PrintJob* source_
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0);
 #line 311 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = print_layout_get_all (&_tmp5_);
-#line 2101 "Printing.c"
+#line 2080 "Printing.c"
 	{
 		PrintLayout* layout_collection = NULL;
 		gint layout_collection_length1 = 0;
@@ -2109,16 +2088,16 @@ CustomPrintTab* custom_print_tab_construct (GType object_type, PrintJob* source_
 		layout_collection_length1 = _tmp5_;
 #line 311 "/home/jens/Source/shotwell/src/Printing.vala"
 		for (layout_it = 0; layout_it < _tmp5_; layout_it = layout_it + 1) {
-#line 2113 "Printing.c"
+#line 2092 "Printing.c"
 			PrintLayout layout = 0;
 #line 311 "/home/jens/Source/shotwell/src/Printing.vala"
 			layout = layout_collection[layout_it];
-#line 2117 "Printing.c"
+#line 2096 "Printing.c"
 			{
-				GtkComboBoxText* _tmp7_ = NULL;
-				PrintLayout _tmp8_ = 0;
-				gchar* _tmp9_ = NULL;
-				gchar* _tmp10_ = NULL;
+				GtkComboBoxText* _tmp7_;
+				PrintLayout _tmp8_;
+				gchar* _tmp9_;
+				gchar* _tmp10_;
 #line 312 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp7_ = self->priv->image_per_page_combo;
 #line 312 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -2131,12 +2110,12 @@ CustomPrintTab* custom_print_tab_construct (GType object_type, PrintJob* source_
 				gtk_combo_box_text_append_text (_tmp7_, _tmp10_);
 #line 312 "/home/jens/Source/shotwell/src/Printing.vala"
 				_g_free0 (_tmp10_);
-#line 2135 "Printing.c"
+#line 2114 "Printing.c"
 			}
 		}
 #line 311 "/home/jens/Source/shotwell/src/Printing.vala"
 		layout_collection = (g_free (layout_collection), NULL);
-#line 2140 "Printing.c"
+#line 2119 "Printing.c"
 	}
 #line 315 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = print_manager_get_instance ();
@@ -2164,7 +2143,7 @@ CustomPrintTab* custom_print_tab_construct (GType object_type, PrintJob* source_
 	_tmp17_ = standard_sizes;
 #line 317 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp17__length1 = standard_sizes_length1;
-#line 2168 "Printing.c"
+#line 2147 "Printing.c"
 	{
 		StandardPrintSize** size_collection = NULL;
 		gint size_collection_length1 = 0;
@@ -2176,18 +2155,18 @@ CustomPrintTab* custom_print_tab_construct (GType object_type, PrintJob* source_
 		size_collection_length1 = _tmp17__length1;
 #line 317 "/home/jens/Source/shotwell/src/Printing.vala"
 		for (size_it = 0; size_it < _tmp17__length1; size_it = size_it + 1) {
-#line 2180 "Printing.c"
-			StandardPrintSize* _tmp18_ = NULL;
+#line 2159 "Printing.c"
+			StandardPrintSize* _tmp18_;
 			StandardPrintSize* size = NULL;
 #line 317 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp18_ = _standard_print_size_ref0 (size_collection[size_it]);
 #line 317 "/home/jens/Source/shotwell/src/Printing.vala"
 			size = _tmp18_;
-#line 2187 "Printing.c"
+#line 2166 "Printing.c"
 			{
-				GtkComboBoxText* _tmp19_ = NULL;
-				StandardPrintSize* _tmp20_ = NULL;
-				const gchar* _tmp21_ = NULL;
+				GtkComboBoxText* _tmp19_;
+				StandardPrintSize* _tmp20_;
+				const gchar* _tmp21_;
 #line 318 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp19_ = self->priv->standard_sizes_combo;
 #line 318 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -2198,7 +2177,7 @@ CustomPrintTab* custom_print_tab_construct (GType object_type, PrintJob* source_
 				gtk_combo_box_text_append_text (_tmp19_, _tmp21_);
 #line 317 "/home/jens/Source/shotwell/src/Printing.vala"
 				_standard_print_size_unref0 (size);
-#line 2202 "Printing.c"
+#line 2181 "Printing.c"
 			}
 		}
 	}
@@ -2254,20 +2233,20 @@ CustomPrintTab* custom_print_tab_construct (GType object_type, PrintJob* source_
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_aspect_ratio_check_clicked_gtk_button_clicked, self, 0);
 #line 304 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self;
-#line 2258 "Printing.c"
+#line 2237 "Printing.c"
 }
 
 
 CustomPrintTab* custom_print_tab_new (PrintJob* source_job) {
 #line 304 "/home/jens/Source/shotwell/src/Printing.vala"
 	return custom_print_tab_construct (TYPE_CUSTOM_PRINT_TAB, source_job);
-#line 2265 "Printing.c"
+#line 2244 "Printing.c"
 }
 
 
 static void custom_print_tab_on_aspect_ratio_check_clicked (CustomPrintTab* self) {
-	GtkCheckButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GtkCheckButton* _tmp0_;
+	gboolean _tmp1_;
 #line 343 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 344 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -2276,17 +2255,17 @@ static void custom_print_tab_on_aspect_ratio_check_clicked (CustomPrintTab* self
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 344 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_) {
-#line 2280 "Printing.c"
-		Measurement _tmp2_ = {0};
-		gdouble _tmp3_ = 0.0;
-		PrintJob* _tmp4_ = NULL;
-		gdouble _tmp5_ = 0.0;
-		Measurement _tmp6_ = {0};
-		MeasurementUnit _tmp7_ = 0;
-		GtkEntry* _tmp8_ = NULL;
-		Measurement _tmp9_ = {0};
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
+#line 2259 "Printing.c"
+		Measurement _tmp2_;
+		gdouble _tmp3_;
+		PrintJob* _tmp4_;
+		gdouble _tmp5_;
+		Measurement _tmp6_;
+		MeasurementUnit _tmp7_;
+		GtkEntry* _tmp8_;
+		Measurement _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
 #line 345 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = self->priv->local_content_height;
 #line 345 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -2313,43 +2292,43 @@ static void custom_print_tab_on_aspect_ratio_check_clicked (CustomPrintTab* self
 		gtk_entry_set_text (_tmp8_, _tmp11_);
 #line 348 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp11_);
-#line 2317 "Printing.c"
+#line 2296 "Printing.c"
 	}
 }
 
 
 static gboolean custom_print_tab_on_width_entry_focus_out (CustomPrintTab* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	Measurement _tmp2_ = {0};
-	MeasurementUnit _tmp3_ = 0;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	GtkEntry* _tmp0_;
+	const gchar* _tmp1_;
+	Measurement _tmp2_;
+	MeasurementUnit _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gboolean _tmp6_;
 	Measurement new_width = {0};
 	Measurement _tmp7_ = {0};
 	Measurement min_width = {0};
-	PrintJob* _tmp8_ = NULL;
-	PrintSettings* _tmp9_ = NULL;
-	PrintSettings* _tmp10_ = NULL;
+	PrintJob* _tmp8_;
+	PrintSettings* _tmp9_;
+	PrintSettings* _tmp10_;
 	Measurement _tmp11_ = {0};
-	Measurement _tmp12_ = {0};
+	Measurement _tmp12_;
 	Measurement max_width = {0};
-	PrintJob* _tmp13_ = NULL;
-	PrintSettings* _tmp14_ = NULL;
-	PrintSettings* _tmp15_ = NULL;
+	PrintJob* _tmp13_;
+	PrintSettings* _tmp14_;
+	PrintSettings* _tmp15_;
 	Measurement _tmp16_ = {0};
-	Measurement _tmp17_ = {0};
+	Measurement _tmp17_;
 	gboolean _tmp18_ = FALSE;
-	Measurement _tmp19_ = {0};
-	gboolean _tmp20_ = FALSE;
-	gboolean _tmp27_ = FALSE;
-	Measurement _tmp39_ = {0};
-	GtkEntry* _tmp40_ = NULL;
-	Measurement _tmp41_ = {0};
-	gchar* _tmp42_ = NULL;
-	gchar* _tmp43_ = NULL;
+	Measurement _tmp19_;
+	gboolean _tmp20_;
+	gboolean _tmp27_;
+	Measurement _tmp39_;
+	GtkEntry* _tmp40_;
+	Measurement _tmp41_;
+	gchar* _tmp42_;
+	gchar* _tmp43_;
 #line 352 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE);
 #line 352 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -2376,7 +2355,7 @@ static gboolean custom_print_tab_on_width_entry_focus_out (CustomPrintTab* self,
 		result = FALSE;
 #line 355 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 2380 "Printing.c"
+#line 2359 "Printing.c"
 	}
 #line 357 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_get_width_entry_value (self, &_tmp7_);
@@ -2418,25 +2397,25 @@ static gboolean custom_print_tab_on_width_entry_focus_out (CustomPrintTab* self,
 	if (_tmp20_) {
 #line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = TRUE;
-#line 2422 "Printing.c"
+#line 2401 "Printing.c"
 	} else {
-		Measurement _tmp21_ = {0};
-		gboolean _tmp22_ = FALSE;
+		Measurement _tmp21_;
+		gboolean _tmp22_;
 #line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp21_ = max_width;
 #line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = measurement_is_greater_than (&new_width, &_tmp21_);
 #line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = _tmp22_;
-#line 2432 "Printing.c"
+#line 2411 "Printing.c"
 	}
 #line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp18_) {
-#line 2436 "Printing.c"
-		GtkEntry* _tmp23_ = NULL;
-		Measurement _tmp24_ = {0};
-		gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
+#line 2415 "Printing.c"
+		GtkEntry* _tmp23_;
+		Measurement _tmp24_;
+		gchar* _tmp25_;
+		gchar* _tmp26_;
 #line 362 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp23_ = self->priv->custom_width_entry;
 #line 362 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -2453,25 +2432,25 @@ static gboolean custom_print_tab_on_width_entry_focus_out (CustomPrintTab* self,
 		result = FALSE;
 #line 363 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 2457 "Printing.c"
+#line 2436 "Printing.c"
 	}
 #line 366 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp27_ = custom_print_tab_is_match_aspect_ratio_enabled (self);
 #line 366 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp27_) {
-#line 2463 "Printing.c"
+#line 2442 "Printing.c"
 		Measurement new_height = {0};
-		Measurement _tmp28_ = {0};
-		gdouble _tmp29_ = 0.0;
-		PrintJob* _tmp30_ = NULL;
-		gdouble _tmp31_ = 0.0;
-		Measurement _tmp32_ = {0};
-		MeasurementUnit _tmp33_ = 0;
-		Measurement _tmp34_ = {0};
-		GtkEntry* _tmp35_ = NULL;
-		Measurement _tmp36_ = {0};
-		gchar* _tmp37_ = NULL;
-		gchar* _tmp38_ = NULL;
+		Measurement _tmp28_;
+		gdouble _tmp29_;
+		PrintJob* _tmp30_;
+		gdouble _tmp31_;
+		Measurement _tmp32_;
+		MeasurementUnit _tmp33_;
+		Measurement _tmp34_;
+		GtkEntry* _tmp35_;
+		Measurement _tmp36_;
+		gchar* _tmp37_;
+		gchar* _tmp38_;
 #line 367 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp28_ = new_width;
 #line 367 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -2502,7 +2481,7 @@ static gboolean custom_print_tab_on_width_entry_focus_out (CustomPrintTab* self,
 		gtk_entry_set_text (_tmp35_, _tmp38_);
 #line 371 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp38_);
-#line 2506 "Printing.c"
+#line 2485 "Printing.c"
 	}
 #line 374 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp39_ = new_width;
@@ -2524,15 +2503,15 @@ static gboolean custom_print_tab_on_width_entry_focus_out (CustomPrintTab* self,
 	result = FALSE;
 #line 376 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2528 "Printing.c"
+#line 2507 "Printing.c"
 }
 
 
 static gchar* custom_print_tab_format_measurement (CustomPrintTab* self, Measurement* measurement) {
 	gchar* result = NULL;
-	Measurement _tmp0_ = {0};
-	gdouble _tmp1_ = 0.0;
-	gchar* _tmp2_ = NULL;
+	Measurement _tmp0_;
+	gdouble _tmp1_;
+	gchar* _tmp2_;
 #line 379 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), NULL);
 #line 379 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -2547,19 +2526,19 @@ static gchar* custom_print_tab_format_measurement (CustomPrintTab* self, Measure
 	result = _tmp2_;
 #line 380 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2551 "Printing.c"
+#line 2530 "Printing.c"
 }
 
 
 static gchar* custom_print_tab_format_measurement_as (CustomPrintTab* self, Measurement* measurement, MeasurementUnit to_unit) {
 	gchar* result = NULL;
 	Measurement _tmp0_ = {0};
-	Measurement _tmp1_ = {0};
-	MeasurementUnit _tmp2_ = 0;
-	MeasurementUnit _tmp3_ = 0;
+	Measurement _tmp1_;
+	MeasurementUnit _tmp2_;
+	MeasurementUnit _tmp3_;
 	Measurement converted_measurement = {0};
-	Measurement _tmp7_ = {0};
-	gchar* _tmp8_ = NULL;
+	Measurement _tmp7_;
+	gchar* _tmp8_;
 #line 383 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), NULL);
 #line 383 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -2572,15 +2551,15 @@ static gchar* custom_print_tab_format_measurement_as (CustomPrintTab* self, Meas
 	_tmp3_ = to_unit;
 #line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_ == _tmp3_) {
-#line 2576 "Printing.c"
-		Measurement _tmp4_ = {0};
+#line 2555 "Printing.c"
+		Measurement _tmp4_;
 #line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = *measurement;
 #line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp0_ = _tmp4_;
-#line 2582 "Printing.c"
+#line 2561 "Printing.c"
 	} else {
-		MeasurementUnit _tmp5_ = 0;
+		MeasurementUnit _tmp5_;
 		Measurement _tmp6_ = {0};
 #line 385 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = to_unit;
@@ -2588,7 +2567,7 @@ static gchar* custom_print_tab_format_measurement_as (CustomPrintTab* self, Meas
 		measurement_convert_to (measurement, _tmp5_, &_tmp6_);
 #line 385 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp0_ = _tmp6_;
-#line 2592 "Printing.c"
+#line 2571 "Printing.c"
 	}
 #line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 	converted_measurement = _tmp0_;
@@ -2600,15 +2579,15 @@ static gchar* custom_print_tab_format_measurement_as (CustomPrintTab* self, Meas
 	result = _tmp8_;
 #line 386 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2604 "Printing.c"
+#line 2583 "Printing.c"
 }
 
 
 static gboolean custom_print_tab_on_ppi_entry_focus_out (CustomPrintTab* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	GtkEntry* _tmp0_;
+	const gchar* _tmp1_;
+	gint _tmp2_;
 #line 389 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE);
 #line 389 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -2625,40 +2604,40 @@ static gboolean custom_print_tab_on_ppi_entry_focus_out (CustomPrintTab* self, G
 	result = FALSE;
 #line 391 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2629 "Printing.c"
+#line 2608 "Printing.c"
 }
 
 
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_ = 0L;
-	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2647 "Printing.c"
+#line 2626 "Printing.c"
 }
 
 
 static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, GtkEditable* editable, const gchar* text, gint length, gint* position) {
 	GtkEntry* sender = NULL;
-	GtkEditable* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
+	GtkEditable* _tmp0_;
+	GtkEntry* _tmp1_;
+	gboolean _tmp2_;
+	gint _tmp3_;
 	gchar* new_text = NULL;
-	gchar* _tmp7_ = NULL;
-	const gchar* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	GtkEntry* _tmp31_ = NULL;
+	gchar* _tmp7_;
+	const gchar* _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	GtkEntry* _tmp31_;
 #line 394 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 394 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -2679,7 +2658,7 @@ static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, Gtk
 		_g_object_unref0 (sender);
 #line 399 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 2683 "Printing.c"
+#line 2662 "Printing.c"
 	}
 #line 401 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->is_text_insertion_in_progress = TRUE;
@@ -2687,10 +2666,10 @@ static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, Gtk
 	_tmp3_ = length;
 #line 403 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp3_ == -1) {
-#line 2691 "Printing.c"
-		const gchar* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+#line 2670 "Printing.c"
+		const gchar* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 #line 404 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = text;
 #line 404 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -2699,40 +2678,40 @@ static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, Gtk
 		_tmp6_ = _tmp5_;
 #line 404 "/home/jens/Source/shotwell/src/Printing.vala"
 		length = (gint) _tmp6_;
-#line 2703 "Printing.c"
+#line 2682 "Printing.c"
 	}
 #line 406 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = g_strdup ("");
 #line 406 "/home/jens/Source/shotwell/src/Printing.vala"
 	new_text = _tmp7_;
-#line 2709 "Printing.c"
+#line 2688 "Printing.c"
 	{
 		gint ctr = 0;
 #line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 		ctr = 0;
-#line 2714 "Printing.c"
+#line 2693 "Printing.c"
 		{
 			gboolean _tmp8_ = FALSE;
 #line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp8_ = TRUE;
 #line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 			while (TRUE) {
-#line 2721 "Printing.c"
-				gint _tmp10_ = 0;
-				gint _tmp11_ = 0;
-				const gchar* _tmp12_ = NULL;
-				gint _tmp13_ = 0;
-				gchar _tmp14_ = '\0';
-				gboolean _tmp15_ = FALSE;
+#line 2700 "Printing.c"
+				gint _tmp10_;
+				gint _tmp11_;
+				const gchar* _tmp12_;
+				gint _tmp13_;
+				gchar _tmp14_;
+				gboolean _tmp15_;
 #line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (!_tmp8_) {
-#line 2730 "Printing.c"
-					gint _tmp9_ = 0;
+#line 2709 "Printing.c"
+					gint _tmp9_;
 #line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp9_ = ctr;
 #line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 					ctr = _tmp9_ + 1;
-#line 2736 "Printing.c"
+#line 2715 "Printing.c"
 				}
 #line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp8_ = FALSE;
@@ -2744,7 +2723,7 @@ static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, Gtk
 				if (!(_tmp10_ < _tmp11_)) {
 #line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 					break;
-#line 2748 "Printing.c"
+#line 2727 "Printing.c"
 				}
 #line 408 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp12_ = text;
@@ -2756,14 +2735,14 @@ static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, Gtk
 				_tmp15_ = g_ascii_isdigit (_tmp14_);
 #line 408 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (_tmp15_) {
-#line 2760 "Printing.c"
-					const gchar* _tmp16_ = NULL;
-					const gchar* _tmp17_ = NULL;
-					gint _tmp18_ = 0;
-					gchar _tmp19_ = '\0';
-					gchar* _tmp20_ = NULL;
-					gchar* _tmp21_ = NULL;
-					gchar* _tmp22_ = NULL;
+#line 2739 "Printing.c"
+					const gchar* _tmp16_;
+					const gchar* _tmp17_;
+					gint _tmp18_;
+					gchar _tmp19_;
+					gchar* _tmp20_;
+					gchar* _tmp21_;
+					gchar* _tmp22_;
 #line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp16_ = new_text;
 #line 409 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -2784,7 +2763,7 @@ static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, Gtk
 					new_text = _tmp22_;
 #line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_g_free0 (_tmp21_);
-#line 2788 "Printing.c"
+#line 2767 "Printing.c"
 				}
 			}
 		}
@@ -2797,12 +2776,12 @@ static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, Gtk
 	_tmp25_ = _tmp24_;
 #line 412 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp25_ > 0) {
-#line 2801 "Printing.c"
-		GtkEntry* _tmp26_ = NULL;
-		const gchar* _tmp27_ = NULL;
-		const gchar* _tmp28_ = NULL;
-		gint _tmp29_ = 0;
-		gint _tmp30_ = 0;
+#line 2780 "Printing.c"
+		GtkEntry* _tmp26_;
+		const gchar* _tmp27_;
+		const gchar* _tmp28_;
+		gint _tmp29_;
+		gint _tmp30_;
 #line 413 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp26_ = sender;
 #line 413 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -2815,7 +2794,7 @@ static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, Gtk
 		_tmp30_ = _tmp29_;
 #line 413 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_EDITABLE, GtkEditable), _tmp27_, (gint) _tmp30_, position);
-#line 2819 "Printing.c"
+#line 2798 "Printing.c"
 	}
 #line 415 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp31_ = sender;
@@ -2827,42 +2806,42 @@ static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, Gtk
 	_g_free0 (new_text);
 #line 394 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (sender);
-#line 2831 "Printing.c"
+#line 2810 "Printing.c"
 }
 
 
 static gboolean custom_print_tab_on_height_entry_focus_out (CustomPrintTab* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	Measurement _tmp2_ = {0};
-	MeasurementUnit _tmp3_ = 0;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	GtkEntry* _tmp0_;
+	const gchar* _tmp1_;
+	Measurement _tmp2_;
+	MeasurementUnit _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gboolean _tmp6_;
 	Measurement new_height = {0};
 	Measurement _tmp7_ = {0};
 	Measurement min_height = {0};
-	PrintJob* _tmp8_ = NULL;
-	PrintSettings* _tmp9_ = NULL;
-	PrintSettings* _tmp10_ = NULL;
+	PrintJob* _tmp8_;
+	PrintSettings* _tmp9_;
+	PrintSettings* _tmp10_;
 	Measurement _tmp11_ = {0};
-	Measurement _tmp12_ = {0};
+	Measurement _tmp12_;
 	Measurement max_height = {0};
-	PrintJob* _tmp13_ = NULL;
-	PrintSettings* _tmp14_ = NULL;
-	PrintSettings* _tmp15_ = NULL;
+	PrintJob* _tmp13_;
+	PrintSettings* _tmp14_;
+	PrintSettings* _tmp15_;
 	Measurement _tmp16_ = {0};
-	Measurement _tmp17_ = {0};
+	Measurement _tmp17_;
 	gboolean _tmp18_ = FALSE;
-	Measurement _tmp19_ = {0};
-	gboolean _tmp20_ = FALSE;
-	gboolean _tmp27_ = FALSE;
-	Measurement _tmp39_ = {0};
-	GtkEntry* _tmp40_ = NULL;
-	Measurement _tmp41_ = {0};
-	gchar* _tmp42_ = NULL;
-	gchar* _tmp43_ = NULL;
+	Measurement _tmp19_;
+	gboolean _tmp20_;
+	gboolean _tmp27_;
+	Measurement _tmp39_;
+	GtkEntry* _tmp40_;
+	Measurement _tmp41_;
+	gchar* _tmp42_;
+	gchar* _tmp43_;
 #line 420 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE);
 #line 420 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -2889,7 +2868,7 @@ static gboolean custom_print_tab_on_height_entry_focus_out (CustomPrintTab* self
 		result = FALSE;
 #line 423 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 2893 "Printing.c"
+#line 2872 "Printing.c"
 	}
 #line 425 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_get_height_entry_value (self, &_tmp7_);
@@ -2931,25 +2910,25 @@ static gboolean custom_print_tab_on_height_entry_focus_out (CustomPrintTab* self
 	if (_tmp20_) {
 #line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = TRUE;
-#line 2935 "Printing.c"
+#line 2914 "Printing.c"
 	} else {
-		Measurement _tmp21_ = {0};
-		gboolean _tmp22_ = FALSE;
+		Measurement _tmp21_;
+		gboolean _tmp22_;
 #line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp21_ = max_height;
 #line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = measurement_is_greater_than (&new_height, &_tmp21_);
 #line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = _tmp22_;
-#line 2945 "Printing.c"
+#line 2924 "Printing.c"
 	}
 #line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp18_) {
-#line 2949 "Printing.c"
-		GtkEntry* _tmp23_ = NULL;
-		Measurement _tmp24_ = {0};
-		gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
+#line 2928 "Printing.c"
+		GtkEntry* _tmp23_;
+		Measurement _tmp24_;
+		gchar* _tmp25_;
+		gchar* _tmp26_;
 #line 430 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp23_ = self->priv->custom_height_entry;
 #line 430 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -2966,25 +2945,25 @@ static gboolean custom_print_tab_on_height_entry_focus_out (CustomPrintTab* self
 		result = FALSE;
 #line 431 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 2970 "Printing.c"
+#line 2949 "Printing.c"
 	}
 #line 434 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp27_ = custom_print_tab_is_match_aspect_ratio_enabled (self);
 #line 434 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp27_) {
-#line 2976 "Printing.c"
+#line 2955 "Printing.c"
 		Measurement new_width = {0};
-		Measurement _tmp28_ = {0};
-		gdouble _tmp29_ = 0.0;
-		PrintJob* _tmp30_ = NULL;
-		gdouble _tmp31_ = 0.0;
-		Measurement _tmp32_ = {0};
-		MeasurementUnit _tmp33_ = 0;
-		Measurement _tmp34_ = {0};
-		GtkEntry* _tmp35_ = NULL;
-		Measurement _tmp36_ = {0};
-		gchar* _tmp37_ = NULL;
-		gchar* _tmp38_ = NULL;
+		Measurement _tmp28_;
+		gdouble _tmp29_;
+		PrintJob* _tmp30_;
+		gdouble _tmp31_;
+		Measurement _tmp32_;
+		MeasurementUnit _tmp33_;
+		Measurement _tmp34_;
+		GtkEntry* _tmp35_;
+		Measurement _tmp36_;
+		gchar* _tmp37_;
+		gchar* _tmp38_;
 #line 435 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp28_ = new_height;
 #line 435 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3015,7 +2994,7 @@ static gboolean custom_print_tab_on_height_entry_focus_out (CustomPrintTab* self
 		gtk_entry_set_text (_tmp35_, _tmp38_);
 #line 439 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp38_);
-#line 3019 "Printing.c"
+#line 2998 "Printing.c"
 	}
 #line 442 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp39_ = new_height;
@@ -3037,14 +3016,14 @@ static gboolean custom_print_tab_on_height_entry_focus_out (CustomPrintTab* self
 	result = FALSE;
 #line 444 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 3041 "Printing.c"
+#line 3020 "Printing.c"
 }
 
 
 static MeasurementUnit custom_print_tab_get_user_unit_choice (CustomPrintTab* self) {
 	MeasurementUnit result = 0;
-	GtkComboBoxText* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	GtkComboBoxText* _tmp0_;
+	gint _tmp1_;
 #line 447 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0);
 #line 448 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3057,10 +3036,10 @@ static MeasurementUnit custom_print_tab_get_user_unit_choice (CustomPrintTab* se
 		result = MEASUREMENT_UNIT_INCHES;
 #line 449 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 3061 "Printing.c"
+#line 3040 "Printing.c"
 	} else {
-		GtkComboBoxText* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
+		GtkComboBoxText* _tmp2_;
+		gint _tmp3_;
 #line 450 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = self->priv->units_combo;
 #line 450 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3071,48 +3050,48 @@ static MeasurementUnit custom_print_tab_get_user_unit_choice (CustomPrintTab* se
 			result = MEASUREMENT_UNIT_CENTIMETERS;
 #line 451 "/home/jens/Source/shotwell/src/Printing.vala"
 			return result;
-#line 3075 "Printing.c"
+#line 3054 "Printing.c"
 		} else {
 #line 453 "/home/jens/Source/shotwell/src/Printing.vala"
 			g_error ("Printing.vala:453: unknown unit combo box choice");
-#line 3079 "Printing.c"
+#line 3058 "Printing.c"
 		}
 	}
 }
 
 
 static void custom_print_tab_set_user_unit_choice (CustomPrintTab* self, MeasurementUnit unit) {
-	MeasurementUnit _tmp0_ = 0;
+	MeasurementUnit _tmp0_;
 #line 457 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 458 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = unit;
 #line 458 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp0_ == MEASUREMENT_UNIT_INCHES) {
-#line 3093 "Printing.c"
-		GtkComboBoxText* _tmp1_ = NULL;
+#line 3072 "Printing.c"
+		GtkComboBoxText* _tmp1_;
 #line 459 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp1_ = self->priv->units_combo;
 #line 459 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), CUSTOM_PRINT_TAB_INCHES_COMBO_CHOICE);
-#line 3099 "Printing.c"
+#line 3078 "Printing.c"
 	} else {
-		MeasurementUnit _tmp2_ = 0;
+		MeasurementUnit _tmp2_;
 #line 460 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = unit;
 #line 460 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp2_ == MEASUREMENT_UNIT_CENTIMETERS) {
-#line 3106 "Printing.c"
-			GtkComboBoxText* _tmp3_ = NULL;
+#line 3085 "Printing.c"
+			GtkComboBoxText* _tmp3_;
 #line 461 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp3_ = self->priv->units_combo;
 #line 461 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), CUSTOM_PRINT_TAB_CENTIMETERS_COMBO_CHOICE);
-#line 3112 "Printing.c"
+#line 3091 "Printing.c"
 		} else {
 #line 463 "/home/jens/Source/shotwell/src/Printing.vala"
 			g_error ("Printing.vala:463: unknown MeasurementUnit enumeration");
-#line 3116 "Printing.c"
+#line 3095 "Printing.c"
 		}
 	}
 }
@@ -3120,27 +3099,27 @@ static void custom_print_tab_set_user_unit_choice (CustomPrintTab* self, Measure
 
 static gdouble double_parse (const gchar* str) {
 	gdouble result = 0.0;
-	const gchar* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-#line 869 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gdouble _tmp1_;
+#line 877 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, 0.0);
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = g_ascii_strtod (_tmp0_, NULL);
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 3136 "Printing.c"
+#line 3115 "Printing.c"
 }
 
 
 static void custom_print_tab_get_width_entry_value (CustomPrintTab* self, Measurement* result) {
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	MeasurementUnit _tmp3_ = 0;
+	GtkEntry* _tmp0_;
+	const gchar* _tmp1_;
+	gdouble _tmp2_;
+	MeasurementUnit _tmp3_;
 	Measurement _tmp4_ = {0};
 #line 467 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
@@ -3158,15 +3137,15 @@ static void custom_print_tab_get_width_entry_value (CustomPrintTab* self, Measur
 	*result = _tmp4_;
 #line 468 "/home/jens/Source/shotwell/src/Printing.vala"
 	return;
-#line 3162 "Printing.c"
+#line 3141 "Printing.c"
 }
 
 
 static void custom_print_tab_get_height_entry_value (CustomPrintTab* self, Measurement* result) {
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	MeasurementUnit _tmp3_ = 0;
+	GtkEntry* _tmp0_;
+	const gchar* _tmp1_;
+	gdouble _tmp2_;
+	MeasurementUnit _tmp3_;
 	Measurement _tmp4_ = {0};
 #line 471 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
@@ -3184,49 +3163,49 @@ static void custom_print_tab_get_height_entry_value (CustomPrintTab* self, Measu
 	*result = _tmp4_;
 #line 472 "/home/jens/Source/shotwell/src/Printing.vala"
 	return;
-#line 3188 "Printing.c"
+#line 3167 "Printing.c"
 }
 
 
 static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 3208 "Printing.c"
+#line 3187 "Printing.c"
 }
 
 
 static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEditable* editable, const gchar* text, gint length, gint* position) {
 	GtkEntry* sender = NULL;
-	GtkEditable* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
+	GtkEditable* _tmp0_;
+	GtkEntry* _tmp1_;
+	gboolean _tmp2_;
+	gint _tmp3_;
 	const gchar* decimal_point = NULL;
-	const gchar* _tmp7_ = NULL;
+	const gchar* _tmp7_;
 	gboolean contains_decimal_point = FALSE;
-	GtkEntry* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
+	GtkEntry* _tmp8_;
+	const gchar* _tmp9_;
+	const gchar* _tmp10_;
+	gboolean _tmp11_;
 	gchar* new_text = NULL;
-	gchar* _tmp12_ = NULL;
-	const gchar* _tmp42_ = NULL;
-	gint _tmp43_ = 0;
-	gint _tmp44_ = 0;
-	GtkEntry* _tmp50_ = NULL;
+	gchar* _tmp12_;
+	const gchar* _tmp42_;
+	gint _tmp43_;
+	gint _tmp44_;
+	GtkEntry* _tmp50_;
 #line 475 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 475 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3247,7 +3226,7 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 		_g_object_unref0 (sender);
 #line 481 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 3251 "Printing.c"
+#line 3230 "Printing.c"
 	}
 #line 483 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->is_text_insertion_in_progress = TRUE;
@@ -3255,10 +3234,10 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 	_tmp3_ = length;
 #line 485 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp3_ == -1) {
-#line 3259 "Printing.c"
-		const gchar* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+#line 3238 "Printing.c"
+		const gchar* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 #line 486 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = text;
 #line 486 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3267,7 +3246,7 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 		_tmp6_ = _tmp5_;
 #line 486 "/home/jens/Source/shotwell/src/Printing.vala"
 		length = (gint) _tmp6_;
-#line 3271 "Printing.c"
+#line 3250 "Printing.c"
 	}
 #line 488 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = nl_langinfo (RADIXCHAR);
@@ -3287,34 +3266,34 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 	_tmp12_ = g_strdup ("");
 #line 492 "/home/jens/Source/shotwell/src/Printing.vala"
 	new_text = _tmp12_;
-#line 3291 "Printing.c"
+#line 3270 "Printing.c"
 	{
 		gint ctr = 0;
 #line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 		ctr = 0;
-#line 3296 "Printing.c"
+#line 3275 "Printing.c"
 		{
 			gboolean _tmp13_ = FALSE;
 #line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp13_ = TRUE;
 #line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 			while (TRUE) {
-#line 3303 "Printing.c"
-				gint _tmp15_ = 0;
-				gint _tmp16_ = 0;
-				const gchar* _tmp17_ = NULL;
-				gint _tmp18_ = 0;
-				gchar _tmp19_ = '\0';
-				gboolean _tmp20_ = FALSE;
+#line 3282 "Printing.c"
+				gint _tmp15_;
+				gint _tmp16_;
+				const gchar* _tmp17_;
+				gint _tmp18_;
+				gchar _tmp19_;
+				gboolean _tmp20_;
 #line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (!_tmp13_) {
-#line 3312 "Printing.c"
-					gint _tmp14_ = 0;
+#line 3291 "Printing.c"
+					gint _tmp14_;
 #line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp14_ = ctr;
 #line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 					ctr = _tmp14_ + 1;
-#line 3318 "Printing.c"
+#line 3297 "Printing.c"
 				}
 #line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp13_ = FALSE;
@@ -3326,7 +3305,7 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 				if (!(_tmp15_ < _tmp16_)) {
 #line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 					break;
-#line 3330 "Printing.c"
+#line 3309 "Printing.c"
 				}
 #line 494 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp17_ = text;
@@ -3338,14 +3317,14 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 				_tmp20_ = g_ascii_isdigit (_tmp19_);
 #line 494 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (_tmp20_) {
-#line 3342 "Printing.c"
-					const gchar* _tmp21_ = NULL;
-					const gchar* _tmp22_ = NULL;
-					gint _tmp23_ = 0;
-					gchar _tmp24_ = '\0';
-					gchar* _tmp25_ = NULL;
-					gchar* _tmp26_ = NULL;
-					gchar* _tmp27_ = NULL;
+#line 3321 "Printing.c"
+					const gchar* _tmp21_;
+					const gchar* _tmp22_;
+					gint _tmp23_;
+					gchar _tmp24_;
+					gchar* _tmp25_;
+					gchar* _tmp26_;
+					gchar* _tmp27_;
 #line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp21_ = new_text;
 #line 495 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3366,20 +3345,20 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 					new_text = _tmp27_;
 #line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_g_free0 (_tmp26_);
-#line 3370 "Printing.c"
+#line 3349 "Printing.c"
 				} else {
 					gboolean _tmp28_ = FALSE;
-					gboolean _tmp29_ = FALSE;
+					gboolean _tmp29_;
 #line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp29_ = contains_decimal_point;
 #line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 					if (!_tmp29_) {
-#line 3378 "Printing.c"
-						const gchar* _tmp30_ = NULL;
-						gint _tmp31_ = 0;
-						gchar _tmp32_ = '\0';
-						const gchar* _tmp33_ = NULL;
-						gchar _tmp34_ = '\0';
+#line 3357 "Printing.c"
+						const gchar* _tmp30_;
+						gint _tmp31_;
+						gchar _tmp32_;
+						const gchar* _tmp33_;
+						gchar _tmp34_;
 #line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp30_ = text;
 #line 496 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3392,22 +3371,22 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 						_tmp34_ = string_get (_tmp33_, (glong) 0);
 #line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp28_ = _tmp32_ == _tmp34_;
-#line 3396 "Printing.c"
+#line 3375 "Printing.c"
 					} else {
 #line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp28_ = FALSE;
-#line 3400 "Printing.c"
+#line 3379 "Printing.c"
 					}
 #line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 					if (_tmp28_) {
-#line 3404 "Printing.c"
-						const gchar* _tmp35_ = NULL;
-						const gchar* _tmp36_ = NULL;
-						gint _tmp37_ = 0;
-						gchar _tmp38_ = '\0';
-						gchar* _tmp39_ = NULL;
-						gchar* _tmp40_ = NULL;
-						gchar* _tmp41_ = NULL;
+#line 3383 "Printing.c"
+						const gchar* _tmp35_;
+						const gchar* _tmp36_;
+						gint _tmp37_;
+						gchar _tmp38_;
+						gchar* _tmp39_;
+						gchar* _tmp40_;
+						gchar* _tmp41_;
 #line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp35_ = new_text;
 #line 497 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3428,7 +3407,7 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 						new_text = _tmp41_;
 #line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_g_free0 (_tmp40_);
-#line 3432 "Printing.c"
+#line 3411 "Printing.c"
 					}
 				}
 			}
@@ -3442,12 +3421,12 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 	_tmp44_ = _tmp43_;
 #line 501 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp44_ > 0) {
-#line 3446 "Printing.c"
-		GtkEntry* _tmp45_ = NULL;
-		const gchar* _tmp46_ = NULL;
-		const gchar* _tmp47_ = NULL;
-		gint _tmp48_ = 0;
-		gint _tmp49_ = 0;
+#line 3425 "Printing.c"
+		GtkEntry* _tmp45_;
+		const gchar* _tmp46_;
+		const gchar* _tmp47_;
+		gint _tmp48_;
+		gint _tmp49_;
 #line 502 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp45_ = sender;
 #line 502 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3460,7 +3439,7 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 		_tmp49_ = _tmp48_;
 #line 502 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GTK_TYPE_EDITABLE, GtkEditable), _tmp46_, (gint) _tmp49_, position);
-#line 3464 "Printing.c"
+#line 3443 "Printing.c"
 	}
 #line 504 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp50_ = sender;
@@ -3472,66 +3451,66 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 	_g_free0 (new_text);
 #line 475 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (sender);
-#line 3476 "Printing.c"
+#line 3455 "Printing.c"
 }
 
 
 static void custom_print_tab_sync_state_from_job (CustomPrintTab* self, PrintJob* job) {
-	PrintJob* _tmp0_ = NULL;
-	PrintSettings* _tmp1_ = NULL;
-	PrintSettings* _tmp2_ = NULL;
+	PrintJob* _tmp0_;
+	PrintSettings* _tmp1_;
+	PrintSettings* _tmp2_;
 	Measurement _tmp3_ = {0};
-	MeasurementUnit _tmp4_ = 0;
-	PrintJob* _tmp5_ = NULL;
-	PrintSettings* _tmp6_ = NULL;
-	PrintSettings* _tmp7_ = NULL;
+	MeasurementUnit _tmp4_;
+	PrintJob* _tmp5_;
+	PrintSettings* _tmp6_;
+	PrintSettings* _tmp7_;
 	Measurement _tmp8_ = {0};
-	MeasurementUnit _tmp9_ = 0;
+	MeasurementUnit _tmp9_;
 	Measurement constrained_width = {0};
-	PrintJob* _tmp10_ = NULL;
-	PrintSettings* _tmp11_ = NULL;
-	PrintSettings* _tmp12_ = NULL;
+	PrintJob* _tmp10_;
+	PrintSettings* _tmp11_;
+	PrintSettings* _tmp12_;
 	Measurement _tmp13_ = {0};
-	Measurement _tmp14_ = {0};
-	PrintJob* _tmp15_ = NULL;
-	PrintSettings* _tmp16_ = NULL;
-	PrintSettings* _tmp17_ = NULL;
-	gboolean _tmp18_ = FALSE;
-	gboolean _tmp19_ = FALSE;
-	Measurement _tmp32_ = {0};
-	PrintJob* _tmp33_ = NULL;
-	PrintSettings* _tmp34_ = NULL;
-	PrintSettings* _tmp35_ = NULL;
+	Measurement _tmp14_;
+	PrintJob* _tmp15_;
+	PrintSettings* _tmp16_;
+	PrintSettings* _tmp17_;
+	gboolean _tmp18_;
+	gboolean _tmp19_;
+	Measurement _tmp32_;
+	PrintJob* _tmp33_;
+	PrintSettings* _tmp34_;
+	PrintSettings* _tmp35_;
 	Measurement _tmp36_ = {0};
-	PrintJob* _tmp37_ = NULL;
-	PrintSettings* _tmp38_ = NULL;
-	PrintSettings* _tmp39_ = NULL;
-	ContentLayout _tmp40_ = 0;
-	PrintJob* _tmp41_ = NULL;
-	PrintSettings* _tmp42_ = NULL;
-	PrintSettings* _tmp43_ = NULL;
-	gint _tmp44_ = 0;
-	PrintJob* _tmp45_ = NULL;
-	PrintSettings* _tmp46_ = NULL;
-	PrintSettings* _tmp47_ = NULL;
-	gint _tmp48_ = 0;
-	PrintJob* _tmp49_ = NULL;
-	PrintSettings* _tmp50_ = NULL;
-	PrintSettings* _tmp51_ = NULL;
-	gint _tmp52_ = 0;
-	PrintJob* _tmp53_ = NULL;
-	PrintSettings* _tmp54_ = NULL;
-	PrintSettings* _tmp55_ = NULL;
-	gboolean _tmp56_ = FALSE;
-	PrintJob* _tmp57_ = NULL;
-	PrintSettings* _tmp58_ = NULL;
-	PrintSettings* _tmp59_ = NULL;
-	gboolean _tmp60_ = FALSE;
-	PrintJob* _tmp61_ = NULL;
-	PrintSettings* _tmp62_ = NULL;
-	PrintSettings* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
-	gchar* _tmp65_ = NULL;
+	PrintJob* _tmp37_;
+	PrintSettings* _tmp38_;
+	PrintSettings* _tmp39_;
+	ContentLayout _tmp40_;
+	PrintJob* _tmp41_;
+	PrintSettings* _tmp42_;
+	PrintSettings* _tmp43_;
+	gint _tmp44_;
+	PrintJob* _tmp45_;
+	PrintSettings* _tmp46_;
+	PrintSettings* _tmp47_;
+	gint _tmp48_;
+	PrintJob* _tmp49_;
+	PrintSettings* _tmp50_;
+	PrintSettings* _tmp51_;
+	gint _tmp52_;
+	PrintJob* _tmp53_;
+	PrintSettings* _tmp54_;
+	PrintSettings* _tmp55_;
+	gboolean _tmp56_;
+	PrintJob* _tmp57_;
+	PrintSettings* _tmp58_;
+	PrintSettings* _tmp59_;
+	gboolean _tmp60_;
+	PrintJob* _tmp61_;
+	PrintSettings* _tmp62_;
+	PrintSettings* _tmp63_;
+	gchar* _tmp64_;
+	gchar* _tmp65_;
 #line 509 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 509 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3590,19 +3569,19 @@ static void custom_print_tab_sync_state_from_job (CustomPrintTab* self, PrintJob
 	_print_settings_unref0 (_tmp17_);
 #line 514 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp19_) {
-#line 3594 "Printing.c"
-		PrintJob* _tmp20_ = NULL;
-		PrintSettings* _tmp21_ = NULL;
-		PrintSettings* _tmp22_ = NULL;
+#line 3573 "Printing.c"
+		PrintJob* _tmp20_;
+		PrintSettings* _tmp21_;
+		PrintSettings* _tmp22_;
 		Measurement _tmp23_ = {0};
-		gdouble _tmp24_ = 0.0;
-		PrintJob* _tmp25_ = NULL;
-		gdouble _tmp26_ = 0.0;
-		PrintJob* _tmp27_ = NULL;
-		PrintSettings* _tmp28_ = NULL;
-		PrintSettings* _tmp29_ = NULL;
+		gdouble _tmp24_;
+		PrintJob* _tmp25_;
+		gdouble _tmp26_;
+		PrintJob* _tmp27_;
+		PrintSettings* _tmp28_;
+		PrintSettings* _tmp29_;
 		Measurement _tmp30_ = {0};
-		MeasurementUnit _tmp31_ = 0;
+		MeasurementUnit _tmp31_;
 #line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp20_ = job;
 #line 515 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3633,7 +3612,7 @@ static void custom_print_tab_sync_state_from_job (CustomPrintTab* self, PrintJob
 		_print_settings_unref0 (_tmp29_);
 #line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_print_settings_unref0 (_tmp22_);
-#line 3637 "Printing.c"
+#line 3616 "Printing.c"
 	}
 #line 517 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp32_ = constrained_width;
@@ -3739,16 +3718,16 @@ static void custom_print_tab_sync_state_from_job (CustomPrintTab* self, PrintJob
 	_g_free0 (_tmp65_);
 #line 525 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp63_);
-#line 3743 "Printing.c"
+#line 3722 "Printing.c"
 }
 
 
 static void custom_print_tab_on_radio_group_click (CustomPrintTab* self, GtkButton* b) {
 	GtkRadioButton* sender = NULL;
-	GtkButton* _tmp0_ = NULL;
-	GtkRadioButton* _tmp1_ = NULL;
-	GtkRadioButton* _tmp2_ = NULL;
-	GtkRadioButton* _tmp3_ = NULL;
+	GtkButton* _tmp0_;
+	GtkRadioButton* _tmp1_;
+	GtkRadioButton* _tmp2_;
+	GtkRadioButton* _tmp3_;
 #line 528 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 528 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3765,36 +3744,36 @@ static void custom_print_tab_on_radio_group_click (CustomPrintTab* self, GtkButt
 	_tmp3_ = self->priv->standard_size_radio;
 #line 531 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_ == _tmp3_) {
-#line 3769 "Printing.c"
-		GtkComboBoxText* _tmp4_ = NULL;
+#line 3748 "Printing.c"
+		GtkComboBoxText* _tmp4_;
 #line 532 "/home/jens/Source/shotwell/src/Printing.vala"
 		custom_print_tab_set_content_layout_control_state (self, CONTENT_LAYOUT_STANDARD_SIZE);
 #line 533 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = self->priv->standard_sizes_combo;
 #line 533 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 3777 "Printing.c"
+#line 3756 "Printing.c"
 	} else {
-		GtkRadioButton* _tmp5_ = NULL;
-		GtkRadioButton* _tmp6_ = NULL;
+		GtkRadioButton* _tmp5_;
+		GtkRadioButton* _tmp6_;
 #line 534 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = sender;
 #line 534 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = self->priv->custom_size_radio;
 #line 534 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp5_ == _tmp6_) {
-#line 3787 "Printing.c"
-			GtkEntry* _tmp7_ = NULL;
+#line 3766 "Printing.c"
+			GtkEntry* _tmp7_;
 #line 535 "/home/jens/Source/shotwell/src/Printing.vala"
 			custom_print_tab_set_content_layout_control_state (self, CONTENT_LAYOUT_CUSTOM_SIZE);
 #line 536 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp7_ = self->priv->custom_height_entry;
 #line 536 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 3795 "Printing.c"
+#line 3774 "Printing.c"
 		} else {
-			GtkRadioButton* _tmp8_ = NULL;
-			GtkRadioButton* _tmp9_ = NULL;
+			GtkRadioButton* _tmp8_;
+			GtkRadioButton* _tmp9_;
 #line 537 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp8_ = sender;
 #line 537 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3803,27 +3782,27 @@ static void custom_print_tab_on_radio_group_click (CustomPrintTab* self, GtkButt
 			if (_tmp8_ == _tmp9_) {
 #line 538 "/home/jens/Source/shotwell/src/Printing.vala"
 				custom_print_tab_set_content_layout_control_state (self, CONTENT_LAYOUT_IMAGE_PER_PAGE);
-#line 3807 "Printing.c"
+#line 3786 "Printing.c"
 			}
 		}
 	}
 #line 528 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (sender);
-#line 3813 "Printing.c"
+#line 3792 "Printing.c"
 }
 
 
 static void custom_print_tab_on_units_combo_changed (CustomPrintTab* self) {
-	GtkEntry* _tmp0_ = NULL;
-	Measurement _tmp1_ = {0};
-	MeasurementUnit _tmp2_ = 0;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GtkEntry* _tmp5_ = NULL;
-	Measurement _tmp6_ = {0};
-	MeasurementUnit _tmp7_ = 0;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
+	GtkEntry* _tmp0_;
+	Measurement _tmp1_;
+	MeasurementUnit _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GtkEntry* _tmp5_;
+	Measurement _tmp6_;
+	MeasurementUnit _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
 #line 542 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 543 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3854,12 +3833,12 @@ static void custom_print_tab_on_units_combo_changed (CustomPrintTab* self) {
 	gtk_entry_set_text (_tmp5_, _tmp9_);
 #line 545 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp9_);
-#line 3858 "Printing.c"
+#line 3837 "Printing.c"
 }
 
 
 static void custom_print_tab_set_content_layout_control_state (CustomPrintTab* self, ContentLayout layout) {
-	ContentLayout _tmp0_ = 0;
+	ContentLayout _tmp0_;
 #line 549 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 550 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3868,14 +3847,14 @@ static void custom_print_tab_set_content_layout_control_state (CustomPrintTab* s
 	switch (_tmp0_) {
 #line 550 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_STANDARD_SIZE:
-#line 3872 "Printing.c"
+#line 3851 "Printing.c"
 		{
-			GtkComboBoxText* _tmp1_ = NULL;
-			GtkComboBoxText* _tmp2_ = NULL;
-			GtkEntry* _tmp3_ = NULL;
-			GtkEntry* _tmp4_ = NULL;
-			GtkCheckButton* _tmp5_ = NULL;
-			GtkComboBoxText* _tmp6_ = NULL;
+			GtkComboBoxText* _tmp1_;
+			GtkComboBoxText* _tmp2_;
+			GtkEntry* _tmp3_;
+			GtkEntry* _tmp4_;
+			GtkCheckButton* _tmp5_;
+			GtkComboBoxText* _tmp6_;
 #line 552 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp1_ = self->priv->standard_sizes_combo;
 #line 552 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3902,18 +3881,18 @@ static void custom_print_tab_set_content_layout_control_state (CustomPrintTab* s
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 558 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 3906 "Printing.c"
+#line 3885 "Printing.c"
 		}
 #line 550 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_CUSTOM_SIZE:
-#line 3910 "Printing.c"
+#line 3889 "Printing.c"
 		{
-			GtkComboBoxText* _tmp7_ = NULL;
-			GtkComboBoxText* _tmp8_ = NULL;
-			GtkEntry* _tmp9_ = NULL;
-			GtkEntry* _tmp10_ = NULL;
-			GtkCheckButton* _tmp11_ = NULL;
-			GtkComboBoxText* _tmp12_ = NULL;
+			GtkComboBoxText* _tmp7_;
+			GtkComboBoxText* _tmp8_;
+			GtkEntry* _tmp9_;
+			GtkEntry* _tmp10_;
+			GtkCheckButton* _tmp11_;
+			GtkComboBoxText* _tmp12_;
 #line 561 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp7_ = self->priv->standard_sizes_combo;
 #line 561 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3940,18 +3919,18 @@ static void custom_print_tab_set_content_layout_control_state (CustomPrintTab* s
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 567 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 3944 "Printing.c"
+#line 3923 "Printing.c"
 		}
 #line 550 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_IMAGE_PER_PAGE:
-#line 3948 "Printing.c"
+#line 3927 "Printing.c"
 		{
-			GtkComboBoxText* _tmp13_ = NULL;
-			GtkComboBoxText* _tmp14_ = NULL;
-			GtkEntry* _tmp15_ = NULL;
-			GtkEntry* _tmp16_ = NULL;
-			GtkCheckButton* _tmp17_ = NULL;
-			GtkComboBoxText* _tmp18_ = NULL;
+			GtkComboBoxText* _tmp13_;
+			GtkComboBoxText* _tmp14_;
+			GtkEntry* _tmp15_;
+			GtkEntry* _tmp16_;
+			GtkCheckButton* _tmp17_;
+			GtkComboBoxText* _tmp18_;
 #line 570 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp13_ = self->priv->standard_sizes_combo;
 #line 570 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -3978,13 +3957,13 @@ static void custom_print_tab_set_content_layout_control_state (CustomPrintTab* s
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 576 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 3982 "Printing.c"
+#line 3961 "Printing.c"
 		}
 		default:
 		{
 #line 579 "/home/jens/Source/shotwell/src/Printing.vala"
 			g_error ("Printing.vala:579: unknown ContentLayout enumeration value");
-#line 3988 "Printing.c"
+#line 3967 "Printing.c"
 		}
 	}
 }
@@ -3993,10 +3972,10 @@ static void custom_print_tab_set_content_layout_control_state (CustomPrintTab* s
 static gboolean custom_print_tab_standard_sizes_combo_separator_func (GtkTreeModel* model, GtkTreeIter* iter) {
 	gboolean result = FALSE;
 	GValue val = {0};
-	GtkTreeModel* _tmp0_ = NULL;
-	GtkTreeIter _tmp1_ = {0};
+	GtkTreeModel* _tmp0_;
+	GtkTreeIter _tmp1_;
 	GValue _tmp2_ = {0};
-	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp3_;
 #line 583 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
 #line 583 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4019,13 +3998,13 @@ static gboolean custom_print_tab_standard_sizes_combo_separator_func (GtkTreeMod
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
 #line 588 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4023 "Printing.c"
+#line 4002 "Printing.c"
 }
 
 
 static void custom_print_tab_set_content_layout (CustomPrintTab* self, ContentLayout content_layout) {
-	ContentLayout _tmp0_ = 0;
-	ContentLayout _tmp1_ = 0;
+	ContentLayout _tmp0_;
+	ContentLayout _tmp1_;
 #line 591 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 592 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4038,48 +4017,48 @@ static void custom_print_tab_set_content_layout (CustomPrintTab* self, ContentLa
 	switch (_tmp1_) {
 #line 593 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_STANDARD_SIZE:
-#line 4042 "Printing.c"
+#line 4021 "Printing.c"
 		{
-			GtkRadioButton* _tmp2_ = NULL;
+			GtkRadioButton* _tmp2_;
 #line 595 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp2_ = self->priv->standard_size_radio;
 #line 595 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
 #line 596 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 4051 "Printing.c"
+#line 4030 "Printing.c"
 		}
 #line 593 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_CUSTOM_SIZE:
-#line 4055 "Printing.c"
+#line 4034 "Printing.c"
 		{
-			GtkRadioButton* _tmp3_ = NULL;
+			GtkRadioButton* _tmp3_;
 #line 599 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp3_ = self->priv->custom_size_radio;
 #line 599 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
 #line 600 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 4064 "Printing.c"
+#line 4043 "Printing.c"
 		}
 #line 593 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_IMAGE_PER_PAGE:
-#line 4068 "Printing.c"
+#line 4047 "Printing.c"
 		{
-			GtkRadioButton* _tmp4_ = NULL;
+			GtkRadioButton* _tmp4_;
 #line 603 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp4_ = self->priv->image_per_page_radio;
 #line 603 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
 #line 604 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 4077 "Printing.c"
+#line 4056 "Printing.c"
 		}
 		default:
 		{
 #line 607 "/home/jens/Source/shotwell/src/Printing.vala"
 			g_error ("Printing.vala:607: unknown ContentLayout enumeration value");
-#line 4083 "Printing.c"
+#line 4062 "Printing.c"
 		}
 	}
 }
@@ -4087,12 +4066,12 @@ static void custom_print_tab_set_content_layout (CustomPrintTab* self, ContentLa
 
 static ContentLayout custom_print_tab_get_content_layout (CustomPrintTab* self) {
 	ContentLayout result = 0;
-	GtkRadioButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GtkRadioButton* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	GtkRadioButton* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	GtkRadioButton* _tmp0_;
+	gboolean _tmp1_;
+	GtkRadioButton* _tmp2_;
+	gboolean _tmp3_;
+	GtkRadioButton* _tmp4_;
+	gboolean _tmp5_;
 #line 611 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0);
 #line 612 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4105,7 +4084,7 @@ static ContentLayout custom_print_tab_get_content_layout (CustomPrintTab* self)
 		result = CONTENT_LAYOUT_STANDARD_SIZE;
 #line 613 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 4109 "Printing.c"
+#line 4088 "Printing.c"
 	}
 #line 614 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->custom_size_radio;
@@ -4117,7 +4096,7 @@ static ContentLayout custom_print_tab_get_content_layout (CustomPrintTab* self)
 		result = CONTENT_LAYOUT_CUSTOM_SIZE;
 #line 615 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 4121 "Printing.c"
+#line 4100 "Printing.c"
 	}
 #line 616 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = self->priv->image_per_page_radio;
@@ -4129,25 +4108,25 @@ static ContentLayout custom_print_tab_get_content_layout (CustomPrintTab* self)
 		result = CONTENT_LAYOUT_IMAGE_PER_PAGE;
 #line 617 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 4133 "Printing.c"
+#line 4112 "Printing.c"
 	}
 #line 619 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_error ("Printing.vala:619: inconsistent content layout radio button group stat" \
 "e");
-#line 4137 "Printing.c"
+#line 4116 "Printing.c"
 }
 
 
 static void custom_print_tab_set_content_width (CustomPrintTab* self, Measurement* content_width) {
-	Measurement _tmp0_ = {0};
-	MeasurementUnit _tmp1_ = 0;
-	Measurement _tmp2_ = {0};
-	MeasurementUnit _tmp3_ = 0;
-	Measurement _tmp13_ = {0};
-	GtkEntry* _tmp14_ = NULL;
-	Measurement _tmp15_ = {0};
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
+	Measurement _tmp0_;
+	MeasurementUnit _tmp1_;
+	Measurement _tmp2_;
+	MeasurementUnit _tmp3_;
+	Measurement _tmp13_;
+	GtkEntry* _tmp14_;
+	Measurement _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
 #line 622 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 622 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4162,16 +4141,16 @@ static void custom_print_tab_set_content_width (CustomPrintTab* self, Measuremen
 	_tmp3_ = _tmp2_.unit;
 #line 623 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_ != _tmp3_) {
-#line 4165 "Printing.c"
-		Measurement _tmp4_ = {0};
-		MeasurementUnit _tmp5_ = 0;
-		Measurement _tmp6_ = {0};
-		MeasurementUnit _tmp7_ = 0;
+#line 4144 "Printing.c"
+		Measurement _tmp4_;
+		MeasurementUnit _tmp5_;
+		Measurement _tmp6_;
+		MeasurementUnit _tmp7_;
 		Measurement _tmp8_ = {0};
-		GtkEntry* _tmp9_ = NULL;
-		Measurement _tmp10_ = {0};
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
+		GtkEntry* _tmp9_;
+		Measurement _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
 #line 624 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = *content_width;
 #line 624 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4198,7 +4177,7 @@ static void custom_print_tab_set_content_width (CustomPrintTab* self, Measuremen
 		gtk_entry_set_text (_tmp9_, _tmp12_);
 #line 626 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp12_);
-#line 4201 "Printing.c"
+#line 4180 "Printing.c"
 	}
 #line 628 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = *content_width;
@@ -4216,12 +4195,12 @@ static void custom_print_tab_set_content_width (CustomPrintTab* self, Measuremen
 	gtk_entry_set_text (_tmp14_, _tmp17_);
 #line 629 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp17_);
-#line 4219 "Printing.c"
+#line 4198 "Printing.c"
 }
 
 
 static void custom_print_tab_get_content_width (CustomPrintTab* self, Measurement* result) {
-	Measurement _tmp0_ = {0};
+	Measurement _tmp0_;
 #line 632 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 633 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4230,20 +4209,20 @@ static void custom_print_tab_get_content_width (CustomPrintTab* self, Measuremen
 	*result = _tmp0_;
 #line 633 "/home/jens/Source/shotwell/src/Printing.vala"
 	return;
-#line 4233 "Printing.c"
+#line 4212 "Printing.c"
 }
 
 
 static void custom_print_tab_set_content_height (CustomPrintTab* self, Measurement* content_height) {
-	Measurement _tmp0_ = {0};
-	MeasurementUnit _tmp1_ = 0;
-	Measurement _tmp2_ = {0};
-	MeasurementUnit _tmp3_ = 0;
-	Measurement _tmp13_ = {0};
-	GtkEntry* _tmp14_ = NULL;
-	Measurement _tmp15_ = {0};
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
+	Measurement _tmp0_;
+	MeasurementUnit _tmp1_;
+	Measurement _tmp2_;
+	MeasurementUnit _tmp3_;
+	Measurement _tmp13_;
+	GtkEntry* _tmp14_;
+	Measurement _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
 #line 636 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 636 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4258,16 +4237,16 @@ static void custom_print_tab_set_content_height (CustomPrintTab* self, Measureme
 	_tmp3_ = _tmp2_.unit;
 #line 637 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_ != _tmp3_) {
-#line 4261 "Printing.c"
-		Measurement _tmp4_ = {0};
-		MeasurementUnit _tmp5_ = 0;
-		Measurement _tmp6_ = {0};
-		MeasurementUnit _tmp7_ = 0;
+#line 4240 "Printing.c"
+		Measurement _tmp4_;
+		MeasurementUnit _tmp5_;
+		Measurement _tmp6_;
+		MeasurementUnit _tmp7_;
 		Measurement _tmp8_ = {0};
-		GtkEntry* _tmp9_ = NULL;
-		Measurement _tmp10_ = {0};
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
+		GtkEntry* _tmp9_;
+		Measurement _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
 #line 638 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = *content_height;
 #line 638 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4294,7 +4273,7 @@ static void custom_print_tab_set_content_height (CustomPrintTab* self, Measureme
 		gtk_entry_set_text (_tmp9_, _tmp12_);
 #line 640 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp12_);
-#line 4297 "Printing.c"
+#line 4276 "Printing.c"
 	}
 #line 642 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = *content_height;
@@ -4312,12 +4291,12 @@ static void custom_print_tab_set_content_height (CustomPrintTab* self, Measureme
 	gtk_entry_set_text (_tmp14_, _tmp17_);
 #line 643 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp17_);
-#line 4315 "Printing.c"
+#line 4294 "Printing.c"
 }
 
 
 static void custom_print_tab_get_content_height (CustomPrintTab* self, Measurement* result) {
-	Measurement _tmp0_ = {0};
+	Measurement _tmp0_;
 #line 646 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 647 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4326,17 +4305,17 @@ static void custom_print_tab_get_content_height (CustomPrintTab* self, Measureme
 	*result = _tmp0_;
 #line 647 "/home/jens/Source/shotwell/src/Printing.vala"
 	return;
-#line 4329 "Printing.c"
+#line 4308 "Printing.c"
 }
 
 
 static void custom_print_tab_set_content_ppi (CustomPrintTab* self, gint content_ppi) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	GtkEntry* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	gint _tmp0_;
+	gint _tmp1_;
+	GtkEntry* _tmp2_;
+	gint _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 650 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 651 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4357,13 +4336,13 @@ static void custom_print_tab_set_content_ppi (CustomPrintTab* self, gint content
 	gtk_entry_set_text (_tmp2_, _tmp5_);
 #line 654 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp5_);
-#line 4360 "Printing.c"
+#line 4339 "Printing.c"
 }
 
 
 static gint custom_print_tab_get_content_ppi (CustomPrintTab* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 657 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0);
 #line 658 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4372,13 +4351,13 @@ static gint custom_print_tab_get_content_ppi (CustomPrintTab* self) {
 	result = _tmp0_;
 #line 658 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4375 "Printing.c"
+#line 4354 "Printing.c"
 }
 
 
 static void custom_print_tab_set_image_per_page_selection (CustomPrintTab* self, gint image_per_page) {
-	GtkComboBoxText* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	GtkComboBoxText* _tmp0_;
+	gint _tmp1_;
 #line 661 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 662 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4387,14 +4366,14 @@ static void custom_print_tab_set_image_per_page_selection (CustomPrintTab* self,
 	_tmp1_ = image_per_page;
 #line 662 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), _tmp1_);
-#line 4390 "Printing.c"
+#line 4369 "Printing.c"
 }
 
 
 static gint custom_print_tab_get_image_per_page_selection (CustomPrintTab* self) {
 	gint result = 0;
-	GtkComboBoxText* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	GtkComboBoxText* _tmp0_;
+	gint _tmp1_;
 #line 665 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0);
 #line 666 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4405,13 +4384,13 @@ static gint custom_print_tab_get_image_per_page_selection (CustomPrintTab* self)
 	result = _tmp1_;
 #line 666 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4408 "Printing.c"
+#line 4387 "Printing.c"
 }
 
 
 static void custom_print_tab_set_size_selection (CustomPrintTab* self, gint size_selection) {
-	GtkComboBoxText* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	GtkComboBoxText* _tmp0_;
+	gint _tmp1_;
 #line 669 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 670 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4420,14 +4399,14 @@ static void custom_print_tab_set_size_selection (CustomPrintTab* self, gint size
 	_tmp1_ = size_selection;
 #line 670 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), _tmp1_);
-#line 4423 "Printing.c"
+#line 4402 "Printing.c"
 }
 
 
 static gint custom_print_tab_get_size_selection (CustomPrintTab* self) {
 	gint result = 0;
-	GtkComboBoxText* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	GtkComboBoxText* _tmp0_;
+	gint _tmp1_;
 #line 673 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0);
 #line 674 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4438,13 +4417,13 @@ static gint custom_print_tab_get_size_selection (CustomPrintTab* self) {
 	result = _tmp1_;
 #line 674 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4441 "Printing.c"
+#line 4420 "Printing.c"
 }
 
 
 static void custom_print_tab_set_match_aspect_ratio_enabled (CustomPrintTab* self, gboolean enable_state) {
-	GtkCheckButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GtkCheckButton* _tmp0_;
+	gboolean _tmp1_;
 #line 677 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 678 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4453,13 +4432,13 @@ static void custom_print_tab_set_match_aspect_ratio_enabled (CustomPrintTab* sel
 	_tmp1_ = enable_state;
 #line 678 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp1_);
-#line 4456 "Printing.c"
+#line 4435 "Printing.c"
 }
 
 
 static void custom_print_tab_set_print_titles_enabled (CustomPrintTab* self, gboolean print_titles) {
-	GtkCheckButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GtkCheckButton* _tmp0_;
+	gboolean _tmp1_;
 #line 681 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 682 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4468,13 +4447,13 @@ static void custom_print_tab_set_print_titles_enabled (CustomPrintTab* self, gbo
 	_tmp1_ = print_titles;
 #line 682 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp1_);
-#line 4471 "Printing.c"
+#line 4450 "Printing.c"
 }
 
 
 static void custom_print_tab_set_print_titles_font (CustomPrintTab* self, const gchar* fontname) {
-	GtkFontButton* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	GtkFontButton* _tmp0_;
+	const gchar* _tmp1_;
 #line 685 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
 #line 685 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4485,14 +4464,14 @@ static void custom_print_tab_set_print_titles_font (CustomPrintTab* self, const
 	_tmp1_ = fontname;
 #line 686 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_font_button_set_font_name (_tmp0_, _tmp1_);
-#line 4488 "Printing.c"
+#line 4467 "Printing.c"
 }
 
 
 static gboolean custom_print_tab_is_match_aspect_ratio_enabled (CustomPrintTab* self) {
 	gboolean result = FALSE;
-	GtkCheckButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GtkCheckButton* _tmp0_;
+	gboolean _tmp1_;
 #line 690 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE);
 #line 691 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4503,14 +4482,14 @@ static gboolean custom_print_tab_is_match_aspect_ratio_enabled (CustomPrintTab*
 	result = _tmp1_;
 #line 691 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4506 "Printing.c"
+#line 4485 "Printing.c"
 }
 
 
 static gboolean custom_print_tab_is_print_titles_enabled (CustomPrintTab* self) {
 	gboolean result = FALSE;
-	GtkCheckButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GtkCheckButton* _tmp0_;
+	gboolean _tmp1_;
 #line 694 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE);
 #line 695 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4521,15 +4500,15 @@ static gboolean custom_print_tab_is_print_titles_enabled (CustomPrintTab* self)
 	result = _tmp1_;
 #line 695 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4524 "Printing.c"
+#line 4503 "Printing.c"
 }
 
 
 static gchar* custom_print_tab_get_print_titles_font (CustomPrintTab* self) {
 	gchar* result = NULL;
-	GtkFontButton* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	GtkFontButton* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 698 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), NULL);
 #line 699 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4542,14 +4521,14 @@ static gchar* custom_print_tab_get_print_titles_font (CustomPrintTab* self) {
 	result = _tmp2_;
 #line 699 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4545 "Printing.c"
+#line 4524 "Printing.c"
 }
 
 
 PrintJob* custom_print_tab_get_source_job (CustomPrintTab* self) {
 	PrintJob* result = NULL;
-	PrintJob* _tmp0_ = NULL;
-	PrintJob* _tmp1_ = NULL;
+	PrintJob* _tmp0_;
+	PrintJob* _tmp1_;
 #line 702 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), NULL);
 #line 703 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4560,24 +4539,24 @@ PrintJob* custom_print_tab_get_source_job (CustomPrintTab* self) {
 	result = _tmp1_;
 #line 703 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4563 "Printing.c"
+#line 4542 "Printing.c"
 }
 
 
 PrintSettings* custom_print_tab_get_local_settings (CustomPrintTab* self) {
 	PrintSettings* result = NULL;
 	PrintSettings* _result_ = NULL;
-	PrintSettings* _tmp0_ = NULL;
+	PrintSettings* _tmp0_;
 	Measurement _tmp1_ = {0};
 	Measurement _tmp2_ = {0};
-	ContentLayout _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gboolean _tmp7_ = FALSE;
-	gboolean _tmp8_ = FALSE;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
+	ContentLayout _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gboolean _tmp7_;
+	gboolean _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
 #line 706 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), NULL);
 #line 707 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4628,7 +4607,7 @@ PrintSettings* custom_print_tab_get_local_settings (CustomPrintTab* self) {
 	result = _result_;
 #line 719 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4631 "Printing.c"
+#line 4610 "Printing.c"
 }
 
 
@@ -4668,7 +4647,7 @@ static void custom_print_tab_class_init (CustomPrintTabClass * klass) {
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "title_print_check", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, title_print_check));
 #line 269 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "title_print_font", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, title_print_font));
-#line 4671 "Printing.c"
+#line 4650 "Printing.c"
 }
 
 
@@ -4683,11 +4662,11 @@ static void custom_print_tab_instance_init (CustomPrintTab * self) {
 	self->priv->is_text_insertion_in_progress = FALSE;
 #line 269 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_widget_init_template (GTK_WIDGET (self));
-#line 4686 "Printing.c"
+#line 4665 "Printing.c"
 }
 
 
-static void custom_print_tab_finalize (GObject* obj) {
+static void custom_print_tab_finalize (GObject * obj) {
 	CustomPrintTab * self;
 #line 269 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CUSTOM_PRINT_TAB, CustomPrintTab);
@@ -4719,7 +4698,7 @@ static void custom_print_tab_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->source_job);
 #line 269 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_OBJECT_CLASS (custom_print_tab_parent_class)->finalize (obj);
-#line 4722 "Printing.c"
+#line 4701 "Printing.c"
 }
 
 
@@ -4737,19 +4716,19 @@ GType custom_print_tab_get_type (void) {
 
 PrintJob* print_job_construct (GType object_type, GeeCollection* to_print) {
 	PrintJob * self = NULL;
-	PrintManager* _tmp0_ = NULL;
-	PrintManager* _tmp1_ = NULL;
-	PrintSettings* _tmp2_ = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
+	PrintManager* _tmp0_;
+	PrintManager* _tmp1_;
+	PrintSettings* _tmp2_;
+	GeeArrayList* _tmp3_;
+	GeeCollection* _tmp4_;
 	gdouble photo_aspect_ratio = 0.0;
-	GeeArrayList* _tmp5_ = NULL;
-	gpointer _tmp6_ = NULL;
-	Photo* _tmp7_ = NULL;
+	GeeArrayList* _tmp5_;
+	gpointer _tmp6_;
+	Photo* _tmp7_;
 	Dimensions _tmp8_ = {0};
-	gdouble _tmp9_ = 0.0;
-	gdouble _tmp10_ = 0.0;
-	gdouble _tmp11_ = 0.0;
+	gdouble _tmp9_;
+	gdouble _tmp10_;
+	gdouble _tmp11_;
 #line 727 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (to_print), NULL);
 #line 727 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4794,31 +4773,31 @@ PrintJob* print_job_construct (GType object_type, GeeCollection* to_print) {
 	_tmp11_ = photo_aspect_ratio;
 #line 733 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp11_ < 1.0) {
-#line 4797 "Printing.c"
-		gdouble _tmp12_ = 0.0;
+#line 4776 "Printing.c"
+		gdouble _tmp12_;
 #line 734 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp12_ = photo_aspect_ratio;
 #line 734 "/home/jens/Source/shotwell/src/Printing.vala"
 		photo_aspect_ratio = 1.0 / _tmp12_;
-#line 4803 "Printing.c"
+#line 4782 "Printing.c"
 	}
 #line 727 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self;
-#line 4807 "Printing.c"
+#line 4786 "Printing.c"
 }
 
 
 PrintJob* print_job_new (GeeCollection* to_print) {
 #line 727 "/home/jens/Source/shotwell/src/Printing.vala"
 	return print_job_construct (TYPE_PRINT_JOB, to_print);
-#line 4814 "Printing.c"
+#line 4793 "Printing.c"
 }
 
 
 GeeList* print_job_get_photos (PrintJob* self) {
 	GeeList* result = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeList* _tmp1_;
 #line 737 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_JOB (self), NULL);
 #line 738 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4829,14 +4808,14 @@ GeeList* print_job_get_photos (PrintJob* self) {
 	result = _tmp1_;
 #line 738 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4832 "Printing.c"
+#line 4811 "Printing.c"
 }
 
 
 Photo* print_job_get_source_photo (PrintJob* self) {
 	Photo* result = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	gpointer _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	gpointer _tmp1_;
 #line 741 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_JOB (self), NULL);
 #line 742 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4847,21 +4826,21 @@ Photo* print_job_get_source_photo (PrintJob* self) {
 	result = (Photo*) _tmp1_;
 #line 742 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4850 "Printing.c"
+#line 4829 "Printing.c"
 }
 
 
 gdouble print_job_get_source_aspect_ratio (PrintJob* self) {
 	gdouble result = 0.0;
 	gdouble aspect_ratio = 0.0;
-	GeeArrayList* _tmp0_ = NULL;
-	gpointer _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
+	GeeArrayList* _tmp0_;
+	gpointer _tmp1_;
+	Photo* _tmp2_;
 	Dimensions _tmp3_ = {0};
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
 	gdouble _tmp6_ = 0.0;
-	gdouble _tmp7_ = 0.0;
+	gdouble _tmp7_;
 #line 745 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_JOB (self), 0.0);
 #line 746 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4884,40 +4863,40 @@ gdouble print_job_get_source_aspect_ratio (PrintJob* self) {
 	_tmp7_ = aspect_ratio;
 #line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp7_ < 1.0) {
-#line 4887 "Printing.c"
-		gdouble _tmp8_ = 0.0;
+#line 4866 "Printing.c"
+		gdouble _tmp8_;
 #line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp8_ = aspect_ratio;
 #line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = 1.0 / _tmp8_;
-#line 4893 "Printing.c"
+#line 4872 "Printing.c"
 	} else {
-		gdouble _tmp9_ = 0.0;
+		gdouble _tmp9_;
 #line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp9_ = aspect_ratio;
 #line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = _tmp9_;
-#line 4900 "Printing.c"
+#line 4879 "Printing.c"
 	}
 #line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp6_;
 #line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4906 "Printing.c"
+#line 4885 "Printing.c"
 }
 
 
 static gpointer _print_settings_ref0 (gpointer self) {
 #line 751 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self ? print_settings_ref (self) : NULL;
-#line 4913 "Printing.c"
+#line 4892 "Printing.c"
 }
 
 
 PrintSettings* print_job_get_local_settings (PrintJob* self) {
 	PrintSettings* result = NULL;
-	PrintSettings* _tmp0_ = NULL;
-	PrintSettings* _tmp1_ = NULL;
+	PrintSettings* _tmp0_;
+	PrintSettings* _tmp1_;
 #line 750 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_JOB (self), NULL);
 #line 751 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4928,13 +4907,13 @@ PrintSettings* print_job_get_local_settings (PrintJob* self) {
 	result = _tmp1_;
 #line 751 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4931 "Printing.c"
+#line 4910 "Printing.c"
 }
 
 
 void print_job_set_local_settings (PrintJob* self, PrintSettings* settings) {
-	PrintSettings* _tmp0_ = NULL;
-	PrintSettings* _tmp1_ = NULL;
+	PrintSettings* _tmp0_;
+	PrintSettings* _tmp1_;
 #line 754 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_JOB (self));
 #line 754 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -4947,7 +4926,7 @@ void print_job_set_local_settings (PrintJob* self, PrintSettings* settings) {
 	_print_settings_unref0 (self->priv->settings);
 #line 755 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->settings = _tmp1_;
-#line 4950 "Printing.c"
+#line 4929 "Printing.c"
 }
 
 
@@ -4958,23 +4937,23 @@ static void print_job_class_init (PrintJobClass * klass) {
 	g_type_class_add_private (klass, sizeof (PrintJobPrivate));
 #line 723 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_OBJECT_CLASS (klass)->finalize = print_job_finalize;
-#line 4961 "Printing.c"
+#line 4940 "Printing.c"
 }
 
 
 static void print_job_instance_init (PrintJob * self) {
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 #line 723 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv = PRINT_JOB_GET_PRIVATE (self);
 #line 725 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = gee_array_list_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 725 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->photos = _tmp0_;
-#line 4973 "Printing.c"
+#line 4952 "Printing.c"
 }
 
 
-static void print_job_finalize (GObject* obj) {
+static void print_job_finalize (GObject * obj) {
 	PrintJob * self;
 #line 723 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PRINT_JOB, PrintJob);
@@ -4984,7 +4963,7 @@ static void print_job_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->photos);
 #line 723 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_OBJECT_CLASS (print_job_parent_class)->finalize (obj);
-#line 4987 "Printing.c"
+#line 4966 "Printing.c"
 }
 
 
@@ -5002,10 +4981,10 @@ GType print_job_get_type (void) {
 
 StandardPrintSize* standard_print_size_construct (GType object_type, const gchar* name, Measurement* width, Measurement* height) {
 	StandardPrintSize* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	Measurement _tmp2_ = {0};
-	Measurement _tmp3_ = {0};
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	Measurement _tmp2_;
+	Measurement _tmp3_;
 #line 760 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 760 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5032,21 +5011,21 @@ StandardPrintSize* standard_print_size_construct (GType object_type, const gchar
 	self->height = _tmp3_;
 #line 760 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self;
-#line 5035 "Printing.c"
+#line 5014 "Printing.c"
 }
 
 
 StandardPrintSize* standard_print_size_new (const gchar* name, Measurement* width, Measurement* height) {
 #line 760 "/home/jens/Source/shotwell/src/Printing.vala"
 	return standard_print_size_construct (TYPE_STANDARD_PRINT_SIZE, name, width, height);
-#line 5042 "Printing.c"
+#line 5021 "Printing.c"
 }
 
 
 static void value_standard_print_size_init (GValue* value) {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	value->data[0].v_pointer = NULL;
-#line 5049 "Printing.c"
+#line 5028 "Printing.c"
 }
 
 
@@ -5055,7 +5034,7 @@ static void value_standard_print_size_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		standard_print_size_unref (value->data[0].v_pointer);
-#line 5058 "Printing.c"
+#line 5037 "Printing.c"
 	}
 }
 
@@ -5065,11 +5044,11 @@ static void value_standard_print_size_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		dest_value->data[0].v_pointer = standard_print_size_ref (src_value->data[0].v_pointer);
-#line 5068 "Printing.c"
+#line 5047 "Printing.c"
 	} else {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5072 "Printing.c"
+#line 5051 "Printing.c"
 	}
 }
 
@@ -5077,66 +5056,66 @@ static void value_standard_print_size_copy_value (const GValue* src_value, GValu
 static gpointer value_standard_print_size_peek_pointer (const GValue* value) {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return value->data[0].v_pointer;
-#line 5080 "Printing.c"
+#line 5059 "Printing.c"
 }
 
 
 static gchar* value_standard_print_size_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (collect_values[0].v_pointer) {
-#line 5087 "Printing.c"
-		StandardPrintSize* object;
+#line 5066 "Printing.c"
+		StandardPrintSize * object;
 		object = collect_values[0].v_pointer;
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5094 "Printing.c"
+#line 5073 "Printing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5098 "Printing.c"
+#line 5077 "Printing.c"
 		}
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = standard_print_size_ref (object);
-#line 5102 "Printing.c"
+#line 5081 "Printing.c"
 	} else {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5106 "Printing.c"
+#line 5085 "Printing.c"
 	}
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return NULL;
-#line 5110 "Printing.c"
+#line 5089 "Printing.c"
 }
 
 
 static gchar* value_standard_print_size_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	StandardPrintSize** object_p;
+	StandardPrintSize ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!object_p) {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5121 "Printing.c"
+#line 5100 "Printing.c"
 	}
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!value->data[0].v_pointer) {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = NULL;
-#line 5127 "Printing.c"
+#line 5106 "Printing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5131 "Printing.c"
+#line 5110 "Printing.c"
 	} else {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = standard_print_size_ref (value->data[0].v_pointer);
-#line 5135 "Printing.c"
+#line 5114 "Printing.c"
 	}
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return NULL;
-#line 5139 "Printing.c"
+#line 5118 "Printing.c"
 }
 
 
@@ -5150,7 +5129,7 @@ GParamSpec* param_spec_standard_print_size (const gchar* name, const gchar* nick
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return G_PARAM_SPEC (spec);
-#line 5153 "Printing.c"
+#line 5132 "Printing.c"
 }
 
 
@@ -5159,12 +5138,12 @@ gpointer value_get_standard_print_size (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_STANDARD_PRINT_SIZE), NULL);
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return value->data[0].v_pointer;
-#line 5162 "Printing.c"
+#line 5141 "Printing.c"
 }
 
 
 void value_set_standard_print_size (GValue* value, gpointer v_object) {
-	StandardPrintSize* old;
+	StandardPrintSize * old;
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_STANDARD_PRINT_SIZE));
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5179,23 +5158,23 @@ void value_set_standard_print_size (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		standard_print_size_ref (value->data[0].v_pointer);
-#line 5182 "Printing.c"
+#line 5161 "Printing.c"
 	} else {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5186 "Printing.c"
+#line 5165 "Printing.c"
 	}
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (old) {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		standard_print_size_unref (old);
-#line 5192 "Printing.c"
+#line 5171 "Printing.c"
 	}
 }
 
 
 void value_take_standard_print_size (GValue* value, gpointer v_object) {
-	StandardPrintSize* old;
+	StandardPrintSize * old;
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_STANDARD_PRINT_SIZE));
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5208,17 +5187,17 @@ void value_take_standard_print_size (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = v_object;
-#line 5211 "Printing.c"
+#line 5190 "Printing.c"
 	} else {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5215 "Printing.c"
+#line 5194 "Printing.c"
 	}
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (old) {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		standard_print_size_unref (old);
-#line 5221 "Printing.c"
+#line 5200 "Printing.c"
 	}
 }
 
@@ -5228,18 +5207,18 @@ static void standard_print_size_class_init (StandardPrintSizeClass * klass) {
 	standard_print_size_parent_class = g_type_class_peek_parent (klass);
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	((StandardPrintSizeClass *) klass)->finalize = standard_print_size_finalize;
-#line 5231 "Printing.c"
+#line 5210 "Printing.c"
 }
 
 
 static void standard_print_size_instance_init (StandardPrintSize * self) {
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->ref_count = 1;
-#line 5238 "Printing.c"
+#line 5217 "Printing.c"
 }
 
 
-static void standard_print_size_finalize (StandardPrintSize* obj) {
+static void standard_print_size_finalize (StandardPrintSize * obj) {
 	StandardPrintSize * self;
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_STANDARD_PRINT_SIZE, StandardPrintSize);
@@ -5247,7 +5226,7 @@ static void standard_print_size_finalize (StandardPrintSize* obj) {
 	g_signal_handlers_destroy (self);
 #line 766 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (self->name);
-#line 5250 "Printing.c"
+#line 5229 "Printing.c"
 }
 
 
@@ -5266,18 +5245,18 @@ GType standard_print_size_get_type (void) {
 
 
 gpointer standard_print_size_ref (gpointer instance) {
-	StandardPrintSize* self;
+	StandardPrintSize * self;
 	self = instance;
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return instance;
-#line 5275 "Printing.c"
+#line 5254 "Printing.c"
 }
 
 
 void standard_print_size_unref (gpointer instance) {
-	StandardPrintSize* self;
+	StandardPrintSize * self;
 	self = instance;
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -5285,15 +5264,15 @@ void standard_print_size_unref (gpointer instance) {
 		STANDARD_PRINT_SIZE_GET_CLASS (self)->finalize (self);
 #line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5288 "Printing.c"
+#line 5267 "Printing.c"
 	}
 }
 
 
 static PrintManager* print_manager_construct (GType object_type) {
 	PrintManager* self = NULL;
-	GtkPageSetup* _tmp0_ = NULL;
-	PrintSettings* _tmp1_ = NULL;
+	GtkPageSetup* _tmp0_;
+	PrintSettings* _tmp1_;
 #line 783 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = (PrintManager*) g_type_create_instance (object_type);
 #line 784 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5310,280 +5289,280 @@ static PrintManager* print_manager_construct (GType object_type) {
 	self->priv->settings = _tmp1_;
 #line 783 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self;
-#line 5313 "Printing.c"
+#line 5292 "Printing.c"
 }
 
 
 static PrintManager* print_manager_new (void) {
 #line 783 "/home/jens/Source/shotwell/src/Printing.vala"
 	return print_manager_construct (TYPE_PRINT_MANAGER);
-#line 5320 "Printing.c"
+#line 5299 "Printing.c"
 }
 
 
-static void _vala_array_add112 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add112 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5331 "Printing.c"
+#line 5310 "Printing.c"
 	}
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5337 "Printing.c"
+#line 5316 "Printing.c"
 }
 
 
-static void _vala_array_add113 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add113 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5348 "Printing.c"
+#line 5327 "Printing.c"
 	}
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5354 "Printing.c"
+#line 5333 "Printing.c"
 }
 
 
-static void _vala_array_add114 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add114 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5365 "Printing.c"
+#line 5344 "Printing.c"
 	}
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5371 "Printing.c"
+#line 5350 "Printing.c"
 }
 
 
-static void _vala_array_add115 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add115 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5382 "Printing.c"
+#line 5361 "Printing.c"
 	}
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5388 "Printing.c"
+#line 5367 "Printing.c"
 }
 
 
-static void _vala_array_add116 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add116 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5399 "Printing.c"
+#line 5378 "Printing.c"
 	}
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5405 "Printing.c"
+#line 5384 "Printing.c"
 }
 
 
-static void _vala_array_add117 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add117 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5416 "Printing.c"
+#line 5395 "Printing.c"
 	}
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5422 "Printing.c"
+#line 5401 "Printing.c"
 }
 
 
-static void _vala_array_add118 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add118 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5433 "Printing.c"
+#line 5412 "Printing.c"
 	}
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5439 "Printing.c"
+#line 5418 "Printing.c"
 }
 
 
-static void _vala_array_add119 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add119 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5450 "Printing.c"
+#line 5429 "Printing.c"
 	}
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5456 "Printing.c"
+#line 5435 "Printing.c"
 }
 
 
-static void _vala_array_add120 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add120 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5467 "Printing.c"
+#line 5446 "Printing.c"
 	}
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5473 "Printing.c"
+#line 5452 "Printing.c"
 }
 
 
-static void _vala_array_add121 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add121 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5484 "Printing.c"
+#line 5463 "Printing.c"
 	}
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5490 "Printing.c"
+#line 5469 "Printing.c"
 }
 
 
-static void _vala_array_add122 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add122 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5501 "Printing.c"
+#line 5480 "Printing.c"
 	}
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5507 "Printing.c"
+#line 5486 "Printing.c"
 }
 
 
-static void _vala_array_add123 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add123 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5518 "Printing.c"
+#line 5497 "Printing.c"
 	}
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5524 "Printing.c"
+#line 5503 "Printing.c"
 }
 
 
-static void _vala_array_add124 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add124 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5535 "Printing.c"
+#line 5514 "Printing.c"
 	}
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5541 "Printing.c"
+#line 5520 "Printing.c"
 }
 
 
-static void _vala_array_add125 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add125 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5552 "Printing.c"
+#line 5531 "Printing.c"
 	}
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5558 "Printing.c"
+#line 5537 "Printing.c"
 }
 
 
-static void _vala_array_add126 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add126 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5569 "Printing.c"
+#line 5548 "Printing.c"
 	}
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5575 "Printing.c"
+#line 5554 "Printing.c"
 }
 
 
 StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* result_length1) {
 	StandardPrintSize** result = NULL;
-	StandardPrintSize** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	StandardPrintSize** _tmp76_ = NULL;
-	gint _tmp76__length1 = 0;
-	StandardPrintSize** _tmp77_ = NULL;
-	gint _tmp77__length1 = 0;
+	StandardPrintSize** _tmp0_;
+	gint _tmp0__length1;
+	StandardPrintSize** _tmp62_;
+	gint _tmp62__length1;
+	StandardPrintSize** _tmp63_;
+	gint _tmp63__length1;
 #line 788 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_MANAGER (self), NULL);
 #line 789 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5592,97 +5571,83 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 	_tmp0__length1 = self->priv->standard_sizes_length1;
 #line 789 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp0_ == NULL) {
-#line 5595 "Printing.c"
-		StandardPrintSize** _tmp1_ = NULL;
-		StandardPrintSize** _tmp2_ = NULL;
-		gint _tmp2__length1 = 0;
-		const gchar* _tmp3_ = NULL;
+#line 5574 "Printing.c"
+		StandardPrintSize** _tmp1_;
+		StandardPrintSize** _tmp2_;
+		gint _tmp2__length1;
+		Measurement _tmp3_ = {0};
 		Measurement _tmp4_ = {0};
-		Measurement _tmp5_ = {0};
-		StandardPrintSize* _tmp6_ = NULL;
-		StandardPrintSize** _tmp7_ = NULL;
-		gint _tmp7__length1 = 0;
-		const gchar* _tmp8_ = NULL;
-		Measurement _tmp9_ = {0};
-		Measurement _tmp10_ = {0};
-		StandardPrintSize* _tmp11_ = NULL;
-		StandardPrintSize** _tmp12_ = NULL;
-		gint _tmp12__length1 = 0;
-		const gchar* _tmp13_ = NULL;
-		Measurement _tmp14_ = {0};
+		StandardPrintSize* _tmp5_;
+		StandardPrintSize** _tmp6_;
+		gint _tmp6__length1;
+		Measurement _tmp7_ = {0};
+		Measurement _tmp8_ = {0};
+		StandardPrintSize* _tmp9_;
+		StandardPrintSize** _tmp10_;
+		gint _tmp10__length1;
+		Measurement _tmp11_ = {0};
+		Measurement _tmp12_ = {0};
+		StandardPrintSize* _tmp13_;
+		StandardPrintSize** _tmp14_;
+		gint _tmp14__length1;
 		Measurement _tmp15_ = {0};
-		StandardPrintSize* _tmp16_ = NULL;
-		StandardPrintSize** _tmp17_ = NULL;
-		gint _tmp17__length1 = 0;
-		const gchar* _tmp18_ = NULL;
+		Measurement _tmp16_ = {0};
+		StandardPrintSize* _tmp17_;
+		StandardPrintSize** _tmp18_;
+		gint _tmp18__length1;
 		Measurement _tmp19_ = {0};
 		Measurement _tmp20_ = {0};
-		StandardPrintSize* _tmp21_ = NULL;
-		StandardPrintSize** _tmp22_ = NULL;
-		gint _tmp22__length1 = 0;
-		const gchar* _tmp23_ = NULL;
+		StandardPrintSize* _tmp21_;
+		StandardPrintSize** _tmp22_;
+		gint _tmp22__length1;
+		Measurement _tmp23_ = {0};
 		Measurement _tmp24_ = {0};
-		Measurement _tmp25_ = {0};
-		StandardPrintSize* _tmp26_ = NULL;
-		StandardPrintSize** _tmp27_ = NULL;
-		gint _tmp27__length1 = 0;
-		const gchar* _tmp28_ = NULL;
-		Measurement _tmp29_ = {0};
-		Measurement _tmp30_ = {0};
-		StandardPrintSize* _tmp31_ = NULL;
-		StandardPrintSize** _tmp32_ = NULL;
-		gint _tmp32__length1 = 0;
-		const gchar* _tmp33_ = NULL;
-		Measurement _tmp34_ = {0};
+		StandardPrintSize* _tmp25_;
+		StandardPrintSize** _tmp26_;
+		gint _tmp26__length1;
+		Measurement _tmp27_ = {0};
+		Measurement _tmp28_ = {0};
+		StandardPrintSize* _tmp29_;
+		StandardPrintSize** _tmp30_;
+		gint _tmp30__length1;
+		Measurement _tmp31_ = {0};
+		Measurement _tmp32_ = {0};
+		StandardPrintSize* _tmp33_;
+		StandardPrintSize** _tmp34_;
+		gint _tmp34__length1;
 		Measurement _tmp35_ = {0};
-		StandardPrintSize* _tmp36_ = NULL;
-		StandardPrintSize** _tmp37_ = NULL;
-		gint _tmp37__length1 = 0;
-		Measurement _tmp38_ = {0};
+		Measurement _tmp36_ = {0};
+		StandardPrintSize* _tmp37_;
+		StandardPrintSize** _tmp38_;
+		gint _tmp38__length1;
 		Measurement _tmp39_ = {0};
-		StandardPrintSize* _tmp40_ = NULL;
-		StandardPrintSize** _tmp41_ = NULL;
-		gint _tmp41__length1 = 0;
-		const gchar* _tmp42_ = NULL;
+		Measurement _tmp40_ = {0};
+		StandardPrintSize* _tmp41_;
+		StandardPrintSize** _tmp42_;
+		gint _tmp42__length1;
 		Measurement _tmp43_ = {0};
 		Measurement _tmp44_ = {0};
-		StandardPrintSize* _tmp45_ = NULL;
-		StandardPrintSize** _tmp46_ = NULL;
-		gint _tmp46__length1 = 0;
-		const gchar* _tmp47_ = NULL;
+		StandardPrintSize* _tmp45_;
+		StandardPrintSize** _tmp46_;
+		gint _tmp46__length1;
+		Measurement _tmp47_ = {0};
 		Measurement _tmp48_ = {0};
-		Measurement _tmp49_ = {0};
-		StandardPrintSize* _tmp50_ = NULL;
-		StandardPrintSize** _tmp51_ = NULL;
-		gint _tmp51__length1 = 0;
-		const gchar* _tmp52_ = NULL;
-		Measurement _tmp53_ = {0};
-		Measurement _tmp54_ = {0};
-		StandardPrintSize* _tmp55_ = NULL;
-		StandardPrintSize** _tmp56_ = NULL;
-		gint _tmp56__length1 = 0;
-		const gchar* _tmp57_ = NULL;
-		Measurement _tmp58_ = {0};
+		StandardPrintSize* _tmp49_;
+		StandardPrintSize** _tmp50_;
+		gint _tmp50__length1;
+		Measurement _tmp51_ = {0};
+		Measurement _tmp52_ = {0};
+		StandardPrintSize* _tmp53_;
+		StandardPrintSize** _tmp54_;
+		gint _tmp54__length1;
+		Measurement _tmp55_ = {0};
+		Measurement _tmp56_ = {0};
+		StandardPrintSize* _tmp57_;
+		StandardPrintSize** _tmp58_;
+		gint _tmp58__length1;
 		Measurement _tmp59_ = {0};
-		StandardPrintSize* _tmp60_ = NULL;
-		StandardPrintSize** _tmp61_ = NULL;
-		gint _tmp61__length1 = 0;
-		const gchar* _tmp62_ = NULL;
-		Measurement _tmp63_ = {0};
-		Measurement _tmp64_ = {0};
-		StandardPrintSize* _tmp65_ = NULL;
-		StandardPrintSize** _tmp66_ = NULL;
-		gint _tmp66__length1 = 0;
-		const gchar* _tmp67_ = NULL;
-		Measurement _tmp68_ = {0};
-		Measurement _tmp69_ = {0};
-		StandardPrintSize* _tmp70_ = NULL;
-		StandardPrintSize** _tmp71_ = NULL;
-		gint _tmp71__length1 = 0;
-		const gchar* _tmp72_ = NULL;
-		Measurement _tmp73_ = {0};
-		Measurement _tmp74_ = {0};
-		StandardPrintSize* _tmp75_ = NULL;
+		Measurement _tmp60_ = {0};
+		StandardPrintSize* _tmp61_;
 #line 790 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp1_ = g_new0 (StandardPrintSize*, 0 + 1);
 #line 790 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5698,258 +5663,230 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2__length1 = self->priv->standard_sizes_length1;
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp3_ = _ ("Wallet (2 × 3 in.)");
-#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp4_, (gdouble) 3, MEASUREMENT_UNIT_INCHES);
+		measurement_init (&_tmp3_, (gdouble) 3, MEASUREMENT_UNIT_INCHES);
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp5_, (gdouble) 2, MEASUREMENT_UNIT_INCHES);
+		measurement_init (&_tmp4_, (gdouble) 2, MEASUREMENT_UNIT_INCHES);
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp6_ = standard_print_size_new (_tmp3_, &_tmp4_, &_tmp5_);
+		_tmp5_ = standard_print_size_new (_ ("Wallet (2 × 3 in.)"), &_tmp3_, &_tmp4_);
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add112 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp6_);
+		_vala_array_add112 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp5_);
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp7_ = self->priv->standard_sizes;
+		_tmp6_ = self->priv->standard_sizes;
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp7__length1 = self->priv->standard_sizes_length1;
+		_tmp6__length1 = self->priv->standard_sizes_length1;
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp8_ = _ ("Notecard (3 × 5 in.)");
+		measurement_init (&_tmp7_, (gdouble) 5, MEASUREMENT_UNIT_INCHES);
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp9_, (gdouble) 5, MEASUREMENT_UNIT_INCHES);
+		measurement_init (&_tmp8_, (gdouble) 3, MEASUREMENT_UNIT_INCHES);
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp10_, (gdouble) 3, MEASUREMENT_UNIT_INCHES);
+		_tmp9_ = standard_print_size_new (_ ("Notecard (3 × 5 in.)"), &_tmp7_, &_tmp8_);
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp11_ = standard_print_size_new (_tmp8_, &_tmp9_, &_tmp10_);
-#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add113 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp11_);
-#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp12_ = self->priv->standard_sizes;
+		_vala_array_add113 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp9_);
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp12__length1 = self->priv->standard_sizes_length1;
+		_tmp10_ = self->priv->standard_sizes;
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp13_ = _ ("4 × 6 in.");
+		_tmp10__length1 = self->priv->standard_sizes_length1;
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp14_, (gdouble) 6, MEASUREMENT_UNIT_INCHES);
+		measurement_init (&_tmp11_, (gdouble) 6, MEASUREMENT_UNIT_INCHES);
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp15_, (gdouble) 4, MEASUREMENT_UNIT_INCHES);
+		measurement_init (&_tmp12_, (gdouble) 4, MEASUREMENT_UNIT_INCHES);
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp16_ = standard_print_size_new (_tmp13_, &_tmp14_, &_tmp15_);
+		_tmp13_ = standard_print_size_new (_ ("4 × 6 in."), &_tmp11_, &_tmp12_);
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add114 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp16_);
+		_vala_array_add114 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp13_);
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp17_ = self->priv->standard_sizes;
+		_tmp14_ = self->priv->standard_sizes;
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp17__length1 = self->priv->standard_sizes_length1;
+		_tmp14__length1 = self->priv->standard_sizes_length1;
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp18_ = _ ("5 × 7 in.");
+		measurement_init (&_tmp15_, (gdouble) 7, MEASUREMENT_UNIT_INCHES);
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp19_, (gdouble) 7, MEASUREMENT_UNIT_INCHES);
+		measurement_init (&_tmp16_, (gdouble) 5, MEASUREMENT_UNIT_INCHES);
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp20_, (gdouble) 5, MEASUREMENT_UNIT_INCHES);
+		_tmp17_ = standard_print_size_new (_ ("5 × 7 in."), &_tmp15_, &_tmp16_);
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp21_ = standard_print_size_new (_tmp18_, &_tmp19_, &_tmp20_);
-#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add115 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp21_);
+		_vala_array_add115 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp17_);
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp22_ = self->priv->standard_sizes;
+		_tmp18_ = self->priv->standard_sizes;
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp22__length1 = self->priv->standard_sizes_length1;
-#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp23_ = _ ("8 × 10 in.");
+		_tmp18__length1 = self->priv->standard_sizes_length1;
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp24_, (gdouble) 10, MEASUREMENT_UNIT_INCHES);
+		measurement_init (&_tmp19_, (gdouble) 10, MEASUREMENT_UNIT_INCHES);
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp25_, (gdouble) 8, MEASUREMENT_UNIT_INCHES);
+		measurement_init (&_tmp20_, (gdouble) 8, MEASUREMENT_UNIT_INCHES);
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp26_ = standard_print_size_new (_tmp23_, &_tmp24_, &_tmp25_);
+		_tmp21_ = standard_print_size_new (_ ("8 × 10 in."), &_tmp19_, &_tmp20_);
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add116 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp26_);
-#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp27_ = self->priv->standard_sizes;
+		_vala_array_add116 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp21_);
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp27__length1 = self->priv->standard_sizes_length1;
+		_tmp22_ = self->priv->standard_sizes;
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp28_ = _ ("11 × 14 in.");
+		_tmp22__length1 = self->priv->standard_sizes_length1;
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp29_, (gdouble) 14, MEASUREMENT_UNIT_INCHES);
+		measurement_init (&_tmp23_, (gdouble) 14, MEASUREMENT_UNIT_INCHES);
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp30_, (gdouble) 11, MEASUREMENT_UNIT_INCHES);
+		measurement_init (&_tmp24_, (gdouble) 11, MEASUREMENT_UNIT_INCHES);
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp31_ = standard_print_size_new (_tmp28_, &_tmp29_, &_tmp30_);
+		_tmp25_ = standard_print_size_new (_ ("11 × 14 in."), &_tmp23_, &_tmp24_);
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add117 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp31_);
+		_vala_array_add117 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp25_);
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp32_ = self->priv->standard_sizes;
+		_tmp26_ = self->priv->standard_sizes;
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp32__length1 = self->priv->standard_sizes_length1;
+		_tmp26__length1 = self->priv->standard_sizes_length1;
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp33_ = _ ("16 × 20 in.");
+		measurement_init (&_tmp27_, (gdouble) 20, MEASUREMENT_UNIT_INCHES);
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp34_, (gdouble) 20, MEASUREMENT_UNIT_INCHES);
+		measurement_init (&_tmp28_, (gdouble) 16, MEASUREMENT_UNIT_INCHES);
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp35_, (gdouble) 16, MEASUREMENT_UNIT_INCHES);
+		_tmp29_ = standard_print_size_new (_ ("16 × 20 in."), &_tmp27_, &_tmp28_);
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp36_ = standard_print_size_new (_tmp33_, &_tmp34_, &_tmp35_);
-#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add118 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp36_);
+		_vala_array_add118 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp29_);
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp37_ = self->priv->standard_sizes;
+		_tmp30_ = self->priv->standard_sizes;
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp37__length1 = self->priv->standard_sizes_length1;
+		_tmp30__length1 = self->priv->standard_sizes_length1;
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp38_, (gdouble) 0, MEASUREMENT_UNIT_INCHES);
+		measurement_init (&_tmp31_, (gdouble) 0, MEASUREMENT_UNIT_INCHES);
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp39_, (gdouble) 0, MEASUREMENT_UNIT_INCHES);
+		measurement_init (&_tmp32_, (gdouble) 0, MEASUREMENT_UNIT_INCHES);
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp40_ = standard_print_size_new ("-", &_tmp38_, &_tmp39_);
+		_tmp33_ = standard_print_size_new ("-", &_tmp31_, &_tmp32_);
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add119 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp40_);
-#line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp41_ = self->priv->standard_sizes;
+		_vala_array_add119 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp33_);
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp41__length1 = self->priv->standard_sizes_length1;
+		_tmp34_ = self->priv->standard_sizes;
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp42_ = _ ("Metric Wallet (9 × 13 cm)");
+		_tmp34__length1 = self->priv->standard_sizes_length1;
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp43_, (gdouble) 13, MEASUREMENT_UNIT_CENTIMETERS);
+		measurement_init (&_tmp35_, (gdouble) 13, MEASUREMENT_UNIT_CENTIMETERS);
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp44_, (gdouble) 9, MEASUREMENT_UNIT_CENTIMETERS);
+		measurement_init (&_tmp36_, (gdouble) 9, MEASUREMENT_UNIT_CENTIMETERS);
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp45_ = standard_print_size_new (_tmp42_, &_tmp43_, &_tmp44_);
+		_tmp37_ = standard_print_size_new (_ ("Metric Wallet (9 × 13 cm)"), &_tmp35_, &_tmp36_);
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add120 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp45_);
+		_vala_array_add120 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp37_);
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp46_ = self->priv->standard_sizes;
+		_tmp38_ = self->priv->standard_sizes;
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp46__length1 = self->priv->standard_sizes_length1;
+		_tmp38__length1 = self->priv->standard_sizes_length1;
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp47_ = _ ("Postcard (10 × 15 cm)");
+		measurement_init (&_tmp39_, (gdouble) 15, MEASUREMENT_UNIT_CENTIMETERS);
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp48_, (gdouble) 15, MEASUREMENT_UNIT_CENTIMETERS);
+		measurement_init (&_tmp40_, (gdouble) 10, MEASUREMENT_UNIT_CENTIMETERS);
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp49_, (gdouble) 10, MEASUREMENT_UNIT_CENTIMETERS);
+		_tmp41_ = standard_print_size_new (_ ("Postcard (10 × 15 cm)"), &_tmp39_, &_tmp40_);
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp50_ = standard_print_size_new (_tmp47_, &_tmp48_, &_tmp49_);
-#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add121 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp50_);
-#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp51_ = self->priv->standard_sizes;
+		_vala_array_add121 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp41_);
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp51__length1 = self->priv->standard_sizes_length1;
+		_tmp42_ = self->priv->standard_sizes;
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp52_ = _ ("13 × 18 cm");
+		_tmp42__length1 = self->priv->standard_sizes_length1;
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp53_, (gdouble) 18, MEASUREMENT_UNIT_CENTIMETERS);
+		measurement_init (&_tmp43_, (gdouble) 18, MEASUREMENT_UNIT_CENTIMETERS);
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp54_, (gdouble) 13, MEASUREMENT_UNIT_CENTIMETERS);
+		measurement_init (&_tmp44_, (gdouble) 13, MEASUREMENT_UNIT_CENTIMETERS);
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp55_ = standard_print_size_new (_tmp52_, &_tmp53_, &_tmp54_);
+		_tmp45_ = standard_print_size_new (_ ("13 × 18 cm"), &_tmp43_, &_tmp44_);
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add122 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp55_);
+		_vala_array_add122 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp45_);
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp56_ = self->priv->standard_sizes;
-#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp56__length1 = self->priv->standard_sizes_length1;
+		_tmp46_ = self->priv->standard_sizes;
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp57_ = _ ("18 × 24 cm");
+		_tmp46__length1 = self->priv->standard_sizes_length1;
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp58_, (gdouble) 24, MEASUREMENT_UNIT_CENTIMETERS);
+		measurement_init (&_tmp47_, (gdouble) 24, MEASUREMENT_UNIT_CENTIMETERS);
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp59_, (gdouble) 18, MEASUREMENT_UNIT_CENTIMETERS);
+		measurement_init (&_tmp48_, (gdouble) 18, MEASUREMENT_UNIT_CENTIMETERS);
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp60_ = standard_print_size_new (_tmp57_, &_tmp58_, &_tmp59_);
+		_tmp49_ = standard_print_size_new (_ ("18 × 24 cm"), &_tmp47_, &_tmp48_);
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add123 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp60_);
-#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp61_ = self->priv->standard_sizes;
+		_vala_array_add123 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp49_);
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp61__length1 = self->priv->standard_sizes_length1;
+		_tmp50_ = self->priv->standard_sizes;
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp62_ = _ ("20 × 30 cm");
+		_tmp50__length1 = self->priv->standard_sizes_length1;
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp63_, (gdouble) 30, MEASUREMENT_UNIT_CENTIMETERS);
+		measurement_init (&_tmp51_, (gdouble) 30, MEASUREMENT_UNIT_CENTIMETERS);
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp64_, (gdouble) 20, MEASUREMENT_UNIT_CENTIMETERS);
+		measurement_init (&_tmp52_, (gdouble) 20, MEASUREMENT_UNIT_CENTIMETERS);
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp65_ = standard_print_size_new (_tmp62_, &_tmp63_, &_tmp64_);
+		_tmp53_ = standard_print_size_new (_ ("20 × 30 cm"), &_tmp51_, &_tmp52_);
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add124 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp65_);
+		_vala_array_add124 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp53_);
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp66_ = self->priv->standard_sizes;
+		_tmp54_ = self->priv->standard_sizes;
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp66__length1 = self->priv->standard_sizes_length1;
+		_tmp54__length1 = self->priv->standard_sizes_length1;
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp67_ = _ ("24 × 40 cm");
+		measurement_init (&_tmp55_, (gdouble) 40, MEASUREMENT_UNIT_CENTIMETERS);
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp68_, (gdouble) 40, MEASUREMENT_UNIT_CENTIMETERS);
+		measurement_init (&_tmp56_, (gdouble) 24, MEASUREMENT_UNIT_CENTIMETERS);
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp69_, (gdouble) 24, MEASUREMENT_UNIT_CENTIMETERS);
+		_tmp57_ = standard_print_size_new (_ ("24 × 40 cm"), &_tmp55_, &_tmp56_);
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp70_ = standard_print_size_new (_tmp67_, &_tmp68_, &_tmp69_);
-#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add125 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp70_);
-#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp71_ = self->priv->standard_sizes;
+		_vala_array_add125 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp57_);
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp71__length1 = self->priv->standard_sizes_length1;
+		_tmp58_ = self->priv->standard_sizes;
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp72_ = _ ("30 × 40 cm");
+		_tmp58__length1 = self->priv->standard_sizes_length1;
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp73_, (gdouble) 40, MEASUREMENT_UNIT_CENTIMETERS);
+		measurement_init (&_tmp59_, (gdouble) 40, MEASUREMENT_UNIT_CENTIMETERS);
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
-		measurement_init (&_tmp74_, (gdouble) 30, MEASUREMENT_UNIT_CENTIMETERS);
+		measurement_init (&_tmp60_, (gdouble) 30, MEASUREMENT_UNIT_CENTIMETERS);
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp75_ = standard_print_size_new (_tmp72_, &_tmp73_, &_tmp74_);
+		_tmp61_ = standard_print_size_new (_ ("30 × 40 cm"), &_tmp59_, &_tmp60_);
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add126 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp75_);
-#line 5904 "Printing.c"
+		_vala_array_add126 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp61_);
+#line 5841 "Printing.c"
 	}
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp76_ = self->priv->standard_sizes;
+	_tmp62_ = self->priv->standard_sizes;
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp76__length1 = self->priv->standard_sizes_length1;
+	_tmp62__length1 = self->priv->standard_sizes_length1;
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp77_ = _tmp76_;
+	_tmp63_ = _tmp62_;
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp77__length1 = _tmp76__length1;
+	_tmp63__length1 = _tmp62__length1;
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (result_length1) {
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-		*result_length1 = _tmp77__length1;
-#line 5918 "Printing.c"
+		*result_length1 = _tmp63__length1;
+#line 5855 "Printing.c"
 	}
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	result = _tmp77_;
+	result = _tmp63_;
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 5924 "Printing.c"
+#line 5861 "Printing.c"
 }
 
 
 static gpointer _print_manager_ref0 (gpointer self) {
 #line 846 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self ? print_manager_ref (self) : NULL;
-#line 5931 "Printing.c"
+#line 5868 "Printing.c"
 }
 
 
 PrintManager* print_manager_get_instance (void) {
 	PrintManager* result = NULL;
-	PrintManager* _tmp0_ = NULL;
-	PrintManager* _tmp2_ = NULL;
-	PrintManager* _tmp3_ = NULL;
+	PrintManager* _tmp0_;
+	PrintManager* _tmp2_;
+	PrintManager* _tmp3_;
 #line 843 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = print_manager_instance;
 #line 843 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp0_ == NULL) {
-#line 5944 "Printing.c"
-		PrintManager* _tmp1_ = NULL;
+#line 5881 "Printing.c"
+		PrintManager* _tmp1_;
 #line 844 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp1_ = print_manager_new ();
 #line 844 "/home/jens/Source/shotwell/src/Printing.vala"
 		_print_manager_unref0 (print_manager_instance);
 #line 844 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_manager_instance = _tmp1_;
-#line 5952 "Printing.c"
+#line 5889 "Printing.c"
 	}
 #line 846 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = print_manager_instance;
@@ -5959,21 +5896,21 @@ PrintManager* print_manager_get_instance (void) {
 	result = _tmp3_;
 #line 846 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 5962 "Printing.c"
+#line 5899 "Printing.c"
 }
 
 
 static void _print_manager_on_begin_print_gtk_print_operation_begin_print (GtkPrintOperation* _sender, GtkPrintContext* context, gpointer self) {
 #line 856 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_manager_on_begin_print ((PrintManager*) self, _sender, context);
-#line 5969 "Printing.c"
+#line 5906 "Printing.c"
 }
 
 
 static void _print_manager_on_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self) {
 #line 857 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_manager_on_draw_page ((PrintManager*) self, _sender, context, page_nr);
-#line 5976 "Printing.c"
+#line 5913 "Printing.c"
 }
 
 
@@ -5982,40 +5919,38 @@ static GObject* _print_manager_on_create_custom_widget_gtk_print_operation_creat
 	result = print_manager_on_create_custom_widget ((PrintManager*) self, _sender);
 #line 858 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 5985 "Printing.c"
+#line 5922 "Printing.c"
 }
 
 
 static void _print_manager_on_status_changed_gtk_print_operation_status_changed (GtkPrintOperation* _sender, gpointer self) {
 #line 859 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_manager_on_status_changed ((PrintManager*) self, _sender);
-#line 5992 "Printing.c"
+#line 5929 "Printing.c"
 }
 
 
 void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 	PrintJob* job = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	PrintJob* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GtkPageSetup* _tmp7_ = NULL;
-	AppWindow* _tmp8_ = NULL;
-	AppWindow* _tmp9_ = NULL;
-	GCancellable* _tmp10_ = NULL;
-	AppWindow* _tmp11_ = NULL;
-	AppWindow* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	GCancellable* _tmp14_ = NULL;
-	ProgressDialog* _tmp15_ = NULL;
+	GeeCollection* _tmp0_;
+	PrintJob* _tmp1_;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	GtkPageSetup* _tmp6_;
+	AppWindow* _tmp7_;
+	AppWindow* _tmp8_;
+	GCancellable* _tmp9_;
+	AppWindow* _tmp10_;
+	AppWindow* _tmp11_;
+	GCancellable* _tmp12_;
+	ProgressDialog* _tmp13_;
 	gchar* err_msg = NULL;
-	ProgressDialog* _tmp25_ = NULL;
-	AppWindow* _tmp26_ = NULL;
-	AppWindow* _tmp27_ = NULL;
-	const gchar* _tmp28_ = NULL;
+	ProgressDialog* _tmp23_;
+	AppWindow* _tmp24_;
+	AppWindow* _tmp25_;
+	const gchar* _tmp26_;
 	GError * _inner_error_ = NULL;
 #line 849 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
@@ -6028,31 +5963,29 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 #line 850 "/home/jens/Source/shotwell/src/Printing.vala"
 	job = _tmp1_;
 #line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp2_ = _ ("Image Settings");
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_print_operation_set_custom_tab_label (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), _tmp2_);
+	gtk_print_operation_set_custom_tab_label (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), _ ("Image Settings"));
 #line 852 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_print_operation_set_unit (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), GTK_UNIT_INCH);
 #line 853 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_print_operation_set_n_pages (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), 1);
 #line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp3_ = print_job_get_source_photo (job);
+	_tmp2_ = print_job_get_source_photo (job);
 #line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp5_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject));
+	_tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
 #line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_print_operation_set_job_name (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), _tmp6_);
+	gtk_print_operation_set_job_name (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), _tmp5_);
 #line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_free0 (_tmp6_);
+	_g_free0 (_tmp5_);
 #line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp3_);
 #line 855 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp7_ = self->priv->user_page_setup;
+	_tmp6_ = self->priv->user_page_setup;
 #line 855 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_print_operation_set_default_page_setup (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), _tmp7_);
+	gtk_print_operation_set_default_page_setup (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), _tmp6_);
 #line 856 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), "begin-print", (GCallback) _print_manager_on_begin_print_gtk_print_operation_begin_print, self);
 #line 857 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6062,86 +5995,84 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 #line 859 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), "status-changed", (GCallback) _print_manager_on_status_changed_gtk_print_operation_status_changed, self);
 #line 861 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp8_ = app_window_get_instance ();
+	_tmp7_ = app_window_get_instance ();
 #line 861 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 861 "/home/jens/Source/shotwell/src/Printing.vala"
-	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PAGE_WINDOW, PageWindow));
+	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow));
 #line 861 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (_tmp9_);
+	_g_object_unref0 (_tmp8_);
 #line 863 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp10_ = g_cancellable_new ();
+	_tmp9_ = g_cancellable_new ();
 #line 863 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->cancellable);
 #line 863 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->cancellable = _tmp10_;
+	self->priv->cancellable = _tmp9_;
 #line 864 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp11_ = app_window_get_instance ();
+	_tmp10_ = app_window_get_instance ();
 #line 864 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp12_ = _tmp11_;
-#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp13_ = _ ("Printing…");
+	_tmp11_ = _tmp10_;
 #line 864 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp14_ = self->priv->cancellable;
+	_tmp12_ = self->priv->cancellable;
 #line 864 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp15_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow), _tmp13_, _tmp14_);
+	_tmp13_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow), _ ("Printing…"), _tmp12_);
 #line 864 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_object_ref_sink (_tmp15_);
+	g_object_ref_sink (_tmp13_);
 #line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
 #line 864 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->progress_dialog = _tmp15_;
+	self->priv->progress_dialog = _tmp13_;
 #line 864 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (_tmp12_);
+	_g_object_unref0 (_tmp11_);
 #line 866 "/home/jens/Source/shotwell/src/Printing.vala"
 	err_msg = NULL;
-#line 6098 "Printing.c"
+#line 6029 "Printing.c"
 	{
 		GtkPrintOperationResult _result_ = 0;
-		AppWindow* _tmp16_ = NULL;
-		AppWindow* _tmp17_ = NULL;
-		GtkPrintOperationResult _tmp18_ = 0;
-		GtkPrintOperationResult _tmp19_ = 0;
+		AppWindow* _tmp14_;
+		AppWindow* _tmp15_;
+		GtkPrintOperationResult _tmp16_;
+		GtkPrintOperationResult _tmp17_;
 #line 868 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp16_ = app_window_get_instance ();
+		_tmp14_ = app_window_get_instance ();
 #line 868 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp17_ = _tmp16_;
+		_tmp15_ = _tmp14_;
 #line 868 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp18_ = gtk_print_operation_run (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_window_get_type (), GtkWindow), &_inner_error_);
+		_tmp16_ = gtk_print_operation_run (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_window_get_type (), GtkWindow), &_inner_error_);
 #line 868 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp19_ = _tmp18_;
+		_tmp17_ = _tmp16_;
 #line 868 "/home/jens/Source/shotwell/src/Printing.vala"
-		_g_object_unref0 (_tmp17_);
+		_g_object_unref0 (_tmp15_);
 #line 868 "/home/jens/Source/shotwell/src/Printing.vala"
-		_result_ = _tmp19_;
+		_result_ = _tmp17_;
 #line 868 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6119 "Printing.c"
-			goto __catch468_g_error;
+#line 6050 "Printing.c"
+			goto __catch469_g_error;
 		}
 #line 870 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_result_ == GTK_PRINT_OPERATION_RESULT_APPLY) {
-#line 6124 "Printing.c"
-			GtkPageSetup* _tmp20_ = NULL;
-			GtkPageSetup* _tmp21_ = NULL;
+#line 6055 "Printing.c"
+			GtkPageSetup* _tmp18_;
+			GtkPageSetup* _tmp19_;
 #line 871 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp20_ = gtk_print_operation_get_default_page_setup (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation));
+			_tmp18_ = gtk_print_operation_get_default_page_setup (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation));
 #line 871 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp21_ = _g_object_ref0 (_tmp20_);
+			_tmp19_ = _g_object_ref0 (_tmp18_);
 #line 871 "/home/jens/Source/shotwell/src/Printing.vala"
 			_g_object_unref0 (self->priv->user_page_setup);
 #line 871 "/home/jens/Source/shotwell/src/Printing.vala"
-			self->priv->user_page_setup = _tmp21_;
-#line 6135 "Printing.c"
+			self->priv->user_page_setup = _tmp19_;
+#line 6066 "Printing.c"
 		}
 	}
-	goto __finally468;
-	__catch468_g_error:
+	goto __finally469;
+	__catch469_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp22_ = NULL;
-		const gchar* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
+		GError* _tmp20_;
+		const gchar* _tmp21_;
+		gchar* _tmp22_;
 #line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		e = _inner_error_;
 #line 867 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6149,20 +6080,20 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 #line 873 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_print_operation_cancel (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation));
 #line 874 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp22_ = e;
+		_tmp20_ = e;
 #line 874 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp23_ = _tmp22_->message;
+		_tmp21_ = _tmp20_->message;
 #line 874 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp24_ = g_strdup (_tmp23_);
+		_tmp22_ = g_strdup (_tmp21_);
 #line 874 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (err_msg);
 #line 874 "/home/jens/Source/shotwell/src/Printing.vala"
-		err_msg = _tmp24_;
+		err_msg = _tmp22_;
 #line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_error_free0 (e);
-#line 6163 "Printing.c"
+#line 6094 "Printing.c"
 	}
-	__finally468:
+	__finally469:
 #line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 867 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6175,12 +6106,12 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 		g_clear_error (&_inner_error_);
 #line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 6178 "Printing.c"
+#line 6109 "Printing.c"
 	}
 #line 877 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp25_ = self->priv->progress_dialog;
+	_tmp23_ = self->priv->progress_dialog;
 #line 877 "/home/jens/Source/shotwell/src/Printing.vala"
-	progress_dialog_close (_tmp25_);
+	progress_dialog_close (_tmp23_);
 #line 878 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
 #line 878 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6190,58 +6121,55 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 #line 879 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->cancellable = NULL;
 #line 881 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp26_ = app_window_get_instance ();
+	_tmp24_ = app_window_get_instance ();
 #line 881 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp27_ = _tmp26_;
+	_tmp25_ = _tmp24_;
 #line 881 "/home/jens/Source/shotwell/src/Printing.vala"
-	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_PAGE_WINDOW, PageWindow));
+	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PAGE_WINDOW, PageWindow));
 #line 881 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (_tmp27_);
+	_g_object_unref0 (_tmp25_);
 #line 883 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp28_ = err_msg;
+	_tmp26_ = err_msg;
 #line 883 "/home/jens/Source/shotwell/src/Printing.vala"
-	if (_tmp28_ != NULL) {
-#line 6204 "Printing.c"
-		const gchar* _tmp29_ = NULL;
-		const gchar* _tmp30_ = NULL;
-		gchar* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp29_ = _ ("Unable to print photo:\n\n%s");
+	if (_tmp26_ != NULL) {
+#line 6135 "Printing.c"
+		const gchar* _tmp27_;
+		gchar* _tmp28_;
+		gchar* _tmp29_;
 #line 884 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp30_ = err_msg;
+		_tmp27_ = err_msg;
 #line 884 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp31_ = g_strdup_printf (_tmp29_, _tmp30_);
+		_tmp28_ = g_strdup_printf (_ ("Unable to print photo:\n\n%s"), _tmp27_);
 #line 884 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp32_ = _tmp31_;
+		_tmp29_ = _tmp28_;
 #line 884 "/home/jens/Source/shotwell/src/Printing.vala"
-		app_window_error_message (_tmp32_, NULL);
+		app_window_error_message (_tmp29_, NULL);
 #line 884 "/home/jens/Source/shotwell/src/Printing.vala"
-		_g_free0 (_tmp32_);
-#line 6221 "Printing.c"
+		_g_free0 (_tmp29_);
+#line 6149 "Printing.c"
 	}
 #line 849 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (err_msg);
 #line 849 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (job);
-#line 6227 "Printing.c"
+#line 6155 "Printing.c"
 }
 
 
 static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation* emitting_object, GtkPrintContext* job_context) {
 	PrintJob* job = NULL;
-	GtkPrintOperation* _tmp0_ = NULL;
-	PrintJob* _tmp1_ = NULL;
+	GtkPrintOperation* _tmp0_;
+	PrintJob* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	GCancellable* _tmp3_ = NULL;
+	GCancellable* _tmp3_;
 	GeeList* photos = NULL;
-	PrintJob* _tmp7_ = NULL;
-	GeeList* _tmp8_ = NULL;
-	PrintJob* _tmp9_ = NULL;
-	PrintSettings* _tmp10_ = NULL;
-	PrintSettings* _tmp11_ = NULL;
-	ContentLayout _tmp12_ = 0;
-	gboolean _tmp13_ = FALSE;
+	PrintJob* _tmp7_;
+	GeeList* _tmp8_;
+	PrintJob* _tmp9_;
+	PrintSettings* _tmp10_;
+	PrintSettings* _tmp11_;
+	ContentLayout _tmp12_;
+	gboolean _tmp13_;
 #line 887 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
 #line 887 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6260,25 +6188,25 @@ static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation*
 	_tmp3_ = self->priv->cancellable;
 #line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp3_ != NULL) {
-#line 6263 "Printing.c"
-		GCancellable* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+#line 6191 "Printing.c"
+		GCancellable* _tmp4_;
+		gboolean _tmp5_;
 #line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = self->priv->cancellable;
 #line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = g_cancellable_is_cancelled (_tmp4_);
 #line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = _tmp5_;
-#line 6272 "Printing.c"
+#line 6200 "Printing.c"
 	} else {
 #line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = FALSE;
-#line 6276 "Printing.c"
+#line 6204 "Printing.c"
 	}
 #line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_) {
-#line 6280 "Printing.c"
-		PrintJob* _tmp6_ = NULL;
+#line 6208 "Printing.c"
+		PrintJob* _tmp6_;
 #line 894 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = job;
 #line 894 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6287,7 +6215,7 @@ static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation*
 		_g_object_unref0 (job);
 #line 896 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 6290 "Printing.c"
+#line 6218 "Printing.c"
 	}
 #line 899 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = job;
@@ -6309,20 +6237,20 @@ static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation*
 	_print_settings_unref0 (_tmp11_);
 #line 900 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp13_) {
-#line 6312 "Printing.c"
+#line 6240 "Printing.c"
 		PrintLayout layout = 0;
-		PrintJob* _tmp14_ = NULL;
-		PrintSettings* _tmp15_ = NULL;
-		PrintSettings* _tmp16_ = NULL;
-		gint _tmp17_ = 0;
-		PrintLayout _tmp18_ = 0;
-		PrintJob* _tmp19_ = NULL;
-		GeeList* _tmp20_ = NULL;
-		gint _tmp21_ = 0;
-		gint _tmp22_ = 0;
-		PrintLayout _tmp23_ = 0;
-		gint _tmp24_ = 0;
-		gdouble _tmp25_ = 0.0;
+		PrintJob* _tmp14_;
+		PrintSettings* _tmp15_;
+		PrintSettings* _tmp16_;
+		gint _tmp17_;
+		PrintLayout _tmp18_;
+		PrintJob* _tmp19_;
+		GeeList* _tmp20_;
+		gint _tmp21_;
+		gint _tmp22_;
+		PrintLayout _tmp23_;
+		gint _tmp24_;
+		gdouble _tmp25_;
 #line 901 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp14_ = job;
 #line 901 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6353,12 +6281,12 @@ static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation*
 		_tmp25_ = ceil (((gdouble) _tmp22_) / ((gdouble) _tmp24_));
 #line 902 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_print_operation_set_n_pages (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_print_operation_get_type (), GtkPrintOperation), (gint) _tmp25_);
-#line 6356 "Printing.c"
+#line 6284 "Printing.c"
 	} else {
-		PrintJob* _tmp26_ = NULL;
-		GeeList* _tmp27_ = NULL;
-		gint _tmp28_ = 0;
-		gint _tmp29_ = 0;
+		PrintJob* _tmp26_;
+		GeeList* _tmp27_;
+		gint _tmp28_;
+		gint _tmp29_;
 #line 904 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp26_ = job;
 #line 904 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6369,7 +6297,7 @@ static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation*
 		_tmp29_ = _tmp28_;
 #line 904 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_print_operation_set_n_pages (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_print_operation_get_type (), GtkPrintOperation), _tmp29_);
-#line 6372 "Printing.c"
+#line 6300 "Printing.c"
 	}
 #line 907 "/home/jens/Source/shotwell/src/Printing.vala"
 	spin_event_loop ();
@@ -6377,14 +6305,14 @@ static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation*
 	_g_object_unref0 (photos);
 #line 887 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (job);
-#line 6380 "Printing.c"
+#line 6308 "Printing.c"
 }
 
 
 static void print_manager_on_status_changed (PrintManager* self, GtkPrintOperation* job) {
-	GtkPrintOperation* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	ProgressDialog* _tmp2_ = NULL;
+	GtkPrintOperation* _tmp0_;
+	const gchar* _tmp1_;
+	ProgressDialog* _tmp2_;
 #line 910 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
 #line 910 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6399,10 +6327,10 @@ static void print_manager_on_status_changed (PrintManager* self, GtkPrintOperati
 	_tmp2_ = self->priv->progress_dialog;
 #line 913 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_ != NULL) {
-#line 6402 "Printing.c"
-		ProgressDialog* _tmp3_ = NULL;
-		GtkPrintOperation* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+#line 6330 "Printing.c"
+		ProgressDialog* _tmp3_;
+		GtkPrintOperation* _tmp4_;
+		const gchar* _tmp5_;
 #line 914 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp3_ = self->priv->progress_dialog;
 #line 914 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6413,7 +6341,7 @@ static void print_manager_on_status_changed (PrintManager* self, GtkPrintOperati
 		progress_dialog_set_status (_tmp3_, _tmp5_);
 #line 915 "/home/jens/Source/shotwell/src/Printing.vala"
 		spin_event_loop ();
-#line 6416 "Printing.c"
+#line 6344 "Printing.c"
 	}
 }
 
@@ -6421,51 +6349,51 @@ static void print_manager_on_status_changed (PrintManager* self, GtkPrintOperati
 static gpointer _cairo_reference0 (gpointer self) {
 #line 940 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 6424 "Printing.c"
+#line 6352 "Printing.c"
 }
 
 
 static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* emitting_object, GtkPrintContext* job_context, gint page_num) {
 	PrintJob* job = NULL;
-	GtkPrintOperation* _tmp0_ = NULL;
-	PrintJob* _tmp1_ = NULL;
+	GtkPrintOperation* _tmp0_;
+	PrintJob* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	GCancellable* _tmp3_ = NULL;
+	GCancellable* _tmp3_;
 	GtkPageSetup* page_setup = NULL;
-	GtkPrintContext* _tmp7_ = NULL;
-	GtkPageSetup* _tmp8_ = NULL;
-	GtkPageSetup* _tmp9_ = NULL;
+	GtkPrintContext* _tmp7_;
+	GtkPageSetup* _tmp8_;
+	GtkPageSetup* _tmp9_;
 	gdouble page_width = 0.0;
-	GtkPageSetup* _tmp10_ = NULL;
-	gdouble _tmp11_ = 0.0;
+	GtkPageSetup* _tmp10_;
+	gdouble _tmp11_;
 	gdouble page_height = 0.0;
-	GtkPageSetup* _tmp12_ = NULL;
-	gdouble _tmp13_ = 0.0;
+	GtkPageSetup* _tmp12_;
+	gdouble _tmp13_;
 	gdouble dpi = 0.0;
-	PrintJob* _tmp14_ = NULL;
-	PrintSettings* _tmp15_ = NULL;
-	PrintSettings* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	gdouble _tmp18_ = 0.0;
+	PrintJob* _tmp14_;
+	PrintSettings* _tmp15_;
+	PrintSettings* _tmp16_;
+	gint _tmp17_;
+	gdouble _tmp18_;
 	gdouble inv_dpi = 0.0;
-	gdouble _tmp19_ = 0.0;
+	gdouble _tmp19_;
 	cairo_t* dc = NULL;
-	GtkPrintContext* _tmp20_ = NULL;
-	cairo_t* _tmp21_ = NULL;
-	cairo_t* _tmp22_ = NULL;
-	cairo_t* _tmp23_ = NULL;
-	gdouble _tmp24_ = 0.0;
-	gdouble _tmp25_ = 0.0;
+	GtkPrintContext* _tmp20_;
+	cairo_t* _tmp21_;
+	cairo_t* _tmp22_;
+	cairo_t* _tmp23_;
+	gdouble _tmp24_;
+	gdouble _tmp25_;
 	GeeList* photos = NULL;
-	PrintJob* _tmp26_ = NULL;
-	GeeList* _tmp27_ = NULL;
+	PrintJob* _tmp26_;
+	GeeList* _tmp27_;
 	ContentLayout content_layout = 0;
-	PrintJob* _tmp28_ = NULL;
-	PrintSettings* _tmp29_ = NULL;
-	PrintSettings* _tmp30_ = NULL;
-	ContentLayout _tmp31_ = 0;
-	ContentLayout _tmp32_ = 0;
-	ContentLayout _tmp33_ = 0;
+	PrintJob* _tmp28_;
+	PrintSettings* _tmp29_;
+	PrintSettings* _tmp30_;
+	ContentLayout _tmp31_;
+	ContentLayout _tmp32_;
+	ContentLayout _tmp33_;
 #line 919 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
 #line 919 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6484,25 +6412,25 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 	_tmp3_ = self->priv->cancellable;
 #line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp3_ != NULL) {
-#line 6487 "Printing.c"
-		GCancellable* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+#line 6415 "Printing.c"
+		GCancellable* _tmp4_;
+		gboolean _tmp5_;
 #line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = self->priv->cancellable;
 #line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = g_cancellable_is_cancelled (_tmp4_);
 #line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = _tmp5_;
-#line 6496 "Printing.c"
+#line 6424 "Printing.c"
 	} else {
 #line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = FALSE;
-#line 6500 "Printing.c"
+#line 6428 "Printing.c"
 	}
 #line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_) {
-#line 6504 "Printing.c"
-		PrintJob* _tmp6_ = NULL;
+#line 6432 "Printing.c"
+		PrintJob* _tmp6_;
 #line 927 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = job;
 #line 927 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6511,7 +6439,7 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 		_g_object_unref0 (job);
 #line 929 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 6514 "Printing.c"
+#line 6442 "Printing.c"
 	}
 #line 932 "/home/jens/Source/shotwell/src/Printing.vala"
 	spin_event_loop ();
@@ -6597,39 +6525,39 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 		case CONTENT_LAYOUT_STANDARD_SIZE:
 #line 945 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_CUSTOM_SIZE:
-#line 6600 "Printing.c"
+#line 6528 "Printing.c"
 		{
 			gdouble canvas_width = 0.0;
 			gdouble canvas_height = 0.0;
-			ContentLayout _tmp34_ = 0;
-			gint _tmp66_ = 0;
-			GeeList* _tmp67_ = NULL;
-			gint _tmp68_ = 0;
-			gint _tmp69_ = 0;
-			ProgressDialog* _tmp115_ = NULL;
+			ContentLayout _tmp34_;
+			gint _tmp66_;
+			GeeList* _tmp67_;
+			gint _tmp68_;
+			gint _tmp69_;
+			ProgressDialog* _tmp115_;
 #line 949 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp34_ = content_layout;
 #line 949 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (_tmp34_ == CONTENT_LAYOUT_STANDARD_SIZE) {
-#line 6614 "Printing.c"
-				gint _tmp35_ = 0;
-				StandardPrintSize** _tmp36_ = NULL;
-				PrintJob* _tmp37_ = NULL;
-				PrintSettings* _tmp38_ = NULL;
-				PrintSettings* _tmp39_ = NULL;
-				gint _tmp40_ = 0;
-				StandardPrintSize* _tmp41_ = NULL;
+#line 6542 "Printing.c"
+				gint _tmp35_;
+				StandardPrintSize** _tmp36_;
+				PrintJob* _tmp37_;
+				PrintSettings* _tmp38_;
+				PrintSettings* _tmp39_;
+				gint _tmp40_;
+				StandardPrintSize* _tmp41_;
 				Measurement _tmp42_ = {0};
-				gdouble _tmp43_ = 0.0;
-				gint _tmp44_ = 0;
-				StandardPrintSize** _tmp45_ = NULL;
-				PrintJob* _tmp46_ = NULL;
-				PrintSettings* _tmp47_ = NULL;
-				PrintSettings* _tmp48_ = NULL;
-				gint _tmp49_ = 0;
-				StandardPrintSize* _tmp50_ = NULL;
+				gdouble _tmp43_;
+				gint _tmp44_;
+				StandardPrintSize** _tmp45_;
+				PrintJob* _tmp46_;
+				PrintSettings* _tmp47_;
+				PrintSettings* _tmp48_;
+				gint _tmp49_;
+				StandardPrintSize* _tmp50_;
 				Measurement _tmp51_ = {0};
-				gdouble _tmp52_ = 0.0;
+				gdouble _tmp52_;
 #line 950 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp36_ = print_manager_get_standard_sizes (self, &_tmp35_);
 #line 950 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6670,21 +6598,21 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 				canvas_height = _tmp52_;
 #line 952 "/home/jens/Source/shotwell/src/Printing.vala"
 				_print_settings_unref0 (_tmp48_);
-#line 6673 "Printing.c"
+#line 6601 "Printing.c"
 			} else {
-				ContentLayout _tmp53_ = 0;
-				PrintJob* _tmp54_ = NULL;
-				PrintSettings* _tmp55_ = NULL;
-				PrintSettings* _tmp56_ = NULL;
+				ContentLayout _tmp53_;
+				PrintJob* _tmp54_;
+				PrintSettings* _tmp55_;
+				PrintSettings* _tmp56_;
 				Measurement _tmp57_ = {0};
 				Measurement _tmp58_ = {0};
-				gdouble _tmp59_ = 0.0;
-				PrintJob* _tmp60_ = NULL;
-				PrintSettings* _tmp61_ = NULL;
-				PrintSettings* _tmp62_ = NULL;
+				gdouble _tmp59_;
+				PrintJob* _tmp60_;
+				PrintSettings* _tmp61_;
+				PrintSettings* _tmp62_;
 				Measurement _tmp63_ = {0};
 				Measurement _tmp64_ = {0};
-				gdouble _tmp65_ = 0.0;
+				gdouble _tmp65_;
 #line 955 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp53_ = content_layout;
 #line 955 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6721,7 +6649,7 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 				canvas_height = _tmp65_;
 #line 958 "/home/jens/Source/shotwell/src/Printing.vala"
 				_print_settings_unref0 (_tmp62_);
-#line 6724 "Printing.c"
+#line 6652 "Printing.c"
 			}
 #line 962 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp66_ = page_num;
@@ -6733,44 +6661,44 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 			_tmp69_ = _tmp68_;
 #line 962 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (_tmp66_ < _tmp69_) {
-#line 6736 "Printing.c"
+#line 6664 "Printing.c"
 				Dimensions photo_dimensions = {0};
-				GeeList* _tmp70_ = NULL;
-				gint _tmp71_ = 0;
-				gpointer _tmp72_ = NULL;
-				Photo* _tmp73_ = NULL;
+				GeeList* _tmp70_;
+				gint _tmp71_;
+				gpointer _tmp72_;
+				Photo* _tmp73_;
 				Dimensions _tmp74_ = {0};
-				Dimensions _tmp75_ = {0};
+				Dimensions _tmp75_;
 				gdouble photo_aspect_ratio = 0.0;
-				gdouble _tmp76_ = 0.0;
+				gdouble _tmp76_;
 				gdouble canvas_aspect_ratio = 0.0;
-				gdouble _tmp77_ = 0.0;
-				gdouble _tmp78_ = 0.0;
-				gdouble _tmp79_ = 0.0;
-				gdouble _tmp80_ = 0.0;
-				gdouble _tmp81_ = 0.0;
-				gdouble _tmp82_ = 0.0;
+				gdouble _tmp77_;
+				gdouble _tmp78_;
+				gdouble _tmp79_;
+				gdouble _tmp80_;
+				gdouble _tmp81_;
+				gdouble _tmp82_;
 				gdouble dx = 0.0;
-				gdouble _tmp86_ = 0.0;
-				gdouble _tmp87_ = 0.0;
+				gdouble _tmp86_;
+				gdouble _tmp87_;
 				gdouble dy = 0.0;
-				gdouble _tmp88_ = 0.0;
-				gdouble _tmp89_ = 0.0;
-				GeeList* _tmp90_ = NULL;
-				gint _tmp91_ = 0;
-				gpointer _tmp92_ = NULL;
-				Photo* _tmp93_ = NULL;
-				gdouble _tmp94_ = 0.0;
-				gdouble _tmp95_ = 0.0;
-				gdouble _tmp96_ = 0.0;
-				gdouble _tmp97_ = 0.0;
-				PrintJob* _tmp98_ = NULL;
-				GtkPrintContext* _tmp99_ = NULL;
-				PrintJob* _tmp100_ = NULL;
-				PrintSettings* _tmp101_ = NULL;
-				PrintSettings* _tmp102_ = NULL;
-				gboolean _tmp103_ = FALSE;
-				gboolean _tmp104_ = FALSE;
+				gdouble _tmp88_;
+				gdouble _tmp89_;
+				GeeList* _tmp90_;
+				gint _tmp91_;
+				gpointer _tmp92_;
+				Photo* _tmp93_;
+				gdouble _tmp94_;
+				gdouble _tmp95_;
+				gdouble _tmp96_;
+				gdouble _tmp97_;
+				PrintJob* _tmp98_;
+				GtkPrintContext* _tmp99_;
+				PrintJob* _tmp100_;
+				PrintSettings* _tmp101_;
+				PrintSettings* _tmp102_;
+				gboolean _tmp103_;
+				gboolean _tmp104_;
 #line 963 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp70_ = photos;
 #line 963 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6807,11 +6735,11 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 				_tmp82_ = floor (_tmp81_);
 #line 966 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (_tmp80_ != _tmp82_) {
-#line 6810 "Printing.c"
+#line 6738 "Printing.c"
 					gdouble canvas_tmp = 0.0;
-					gdouble _tmp83_ = 0.0;
-					gdouble _tmp84_ = 0.0;
-					gdouble _tmp85_ = 0.0;
+					gdouble _tmp83_;
+					gdouble _tmp84_;
+					gdouble _tmp85_;
 #line 967 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp83_ = canvas_width;
 #line 967 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6824,7 +6752,7 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 					_tmp85_ = canvas_tmp;
 #line 969 "/home/jens/Source/shotwell/src/Printing.vala"
 					canvas_height = _tmp85_;
-#line 6827 "Printing.c"
+#line 6755 "Printing.c"
 				}
 #line 972 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp86_ = page_width;
@@ -6876,17 +6804,17 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 				_print_settings_unref0 (_tmp102_);
 #line 976 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (_tmp104_) {
-#line 6879 "Printing.c"
-					gdouble _tmp105_ = 0.0;
-					gdouble _tmp106_ = 0.0;
-					GeeList* _tmp107_ = NULL;
-					gint _tmp108_ = 0;
-					gpointer _tmp109_ = NULL;
-					Photo* _tmp110_ = NULL;
-					gchar* _tmp111_ = NULL;
-					gchar* _tmp112_ = NULL;
-					PrintJob* _tmp113_ = NULL;
-					GtkPrintContext* _tmp114_ = NULL;
+#line 6807 "Printing.c"
+					gdouble _tmp105_;
+					gdouble _tmp106_;
+					GeeList* _tmp107_;
+					gint _tmp108_;
+					gpointer _tmp109_;
+					Photo* _tmp110_;
+					gchar* _tmp111_;
+					gchar* _tmp112_;
+					PrintJob* _tmp113_;
+					GtkPrintContext* _tmp114_;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp105_ = page_width;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6913,19 +6841,19 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 					_g_free0 (_tmp112_);
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
 					_g_object_unref0 (_tmp110_);
-#line 6916 "Printing.c"
+#line 6844 "Printing.c"
 				}
 			}
 #line 982 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp115_ = self->priv->progress_dialog;
 #line 982 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (_tmp115_ != NULL) {
-#line 6923 "Printing.c"
-				ProgressDialog* _tmp116_ = NULL;
-				gint _tmp117_ = 0;
-				GeeList* _tmp118_ = NULL;
-				gint _tmp119_ = 0;
-				gint _tmp120_ = 0;
+#line 6851 "Printing.c"
+				ProgressDialog* _tmp116_;
+				gint _tmp117_;
+				GeeList* _tmp118_;
+				gint _tmp119_;
+				gint _tmp120_;
 #line 983 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp116_ = self->priv->progress_dialog;
 #line 983 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6938,40 +6866,40 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 				_tmp120_ = _tmp119_;
 #line 983 "/home/jens/Source/shotwell/src/Printing.vala"
 				progress_dialog_monitor (_tmp116_, (guint64) _tmp117_, (guint64) _tmp120_, TRUE);
-#line 6941 "Printing.c"
+#line 6869 "Printing.c"
 			}
 #line 984 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 6945 "Printing.c"
+#line 6873 "Printing.c"
 		}
 #line 945 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_IMAGE_PER_PAGE:
-#line 6949 "Printing.c"
+#line 6877 "Printing.c"
 		{
 			PrintLayout layout = 0;
-			PrintJob* _tmp121_ = NULL;
-			PrintSettings* _tmp122_ = NULL;
-			PrintSettings* _tmp123_ = NULL;
-			gint _tmp124_ = 0;
-			PrintLayout _tmp125_ = 0;
+			PrintJob* _tmp121_;
+			PrintSettings* _tmp122_;
+			PrintSettings* _tmp123_;
+			gint _tmp124_;
+			PrintLayout _tmp125_;
 			gint nx = 0;
-			PrintLayout _tmp126_ = 0;
-			gint _tmp127_ = 0;
+			PrintLayout _tmp126_;
+			gint _tmp127_;
 			gint ny = 0;
-			PrintLayout _tmp128_ = 0;
-			gint _tmp129_ = 0;
+			PrintLayout _tmp128_;
+			gint _tmp129_;
 			gint start = 0;
-			gint _tmp130_ = 0;
-			PrintLayout _tmp131_ = 0;
-			gint _tmp132_ = 0;
+			gint _tmp130_;
+			PrintLayout _tmp131_;
+			gint _tmp132_;
 			gdouble canvas_width = 0.0;
-			gdouble _tmp133_ = 0.0;
-			gint _tmp134_ = 0;
-			gint _tmp135_ = 0;
+			gdouble _tmp133_;
+			gint _tmp134_;
+			gint _tmp135_;
 			gdouble canvas_height = 0.0;
-			gdouble _tmp136_ = 0.0;
-			gint _tmp137_ = 0;
-			gint _tmp138_ = 0;
+			gdouble _tmp136_;
+			gint _tmp137_;
+			gint _tmp138_;
 #line 987 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp121_ = job;
 #line 987 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7022,30 +6950,30 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 			_tmp138_ = ny;
 #line 992 "/home/jens/Source/shotwell/src/Printing.vala"
 			canvas_height = ((gdouble) (_tmp136_ - (PRINT_MANAGER_IMAGE_DISTANCE * (_tmp137_ - 1)))) / _tmp138_;
-#line 7025 "Printing.c"
+#line 6953 "Printing.c"
 			{
 				gint y = 0;
 #line 993 "/home/jens/Source/shotwell/src/Printing.vala"
 				y = 0;
-#line 7030 "Printing.c"
+#line 6958 "Printing.c"
 				{
 					gboolean _tmp139_ = FALSE;
 #line 993 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp139_ = TRUE;
 #line 993 "/home/jens/Source/shotwell/src/Printing.vala"
 					while (TRUE) {
-#line 7037 "Printing.c"
-						gint _tmp141_ = 0;
-						gint _tmp142_ = 0;
+#line 6965 "Printing.c"
+						gint _tmp141_;
+						gint _tmp142_;
 #line 993 "/home/jens/Source/shotwell/src/Printing.vala"
 						if (!_tmp139_) {
-#line 7042 "Printing.c"
-							gint _tmp140_ = 0;
+#line 6970 "Printing.c"
+							gint _tmp140_;
 #line 993 "/home/jens/Source/shotwell/src/Printing.vala"
 							_tmp140_ = y;
 #line 993 "/home/jens/Source/shotwell/src/Printing.vala"
 							y = _tmp140_ + 1;
-#line 7048 "Printing.c"
+#line 6976 "Printing.c"
 						}
 #line 993 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp139_ = FALSE;
@@ -7057,41 +6985,41 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 						if (!(_tmp141_ < _tmp142_)) {
 #line 993 "/home/jens/Source/shotwell/src/Printing.vala"
 							break;
-#line 7060 "Printing.c"
+#line 6988 "Printing.c"
 						}
 						{
 							gint x = 0;
 #line 994 "/home/jens/Source/shotwell/src/Printing.vala"
 							x = 0;
-#line 7066 "Printing.c"
+#line 6994 "Printing.c"
 							{
 								gboolean _tmp143_ = FALSE;
 #line 994 "/home/jens/Source/shotwell/src/Printing.vala"
 								_tmp143_ = TRUE;
 #line 994 "/home/jens/Source/shotwell/src/Printing.vala"
 								while (TRUE) {
-#line 7073 "Printing.c"
-									gint _tmp145_ = 0;
-									gint _tmp146_ = 0;
+#line 7001 "Printing.c"
+									gint _tmp145_;
+									gint _tmp146_;
 									gint i = 0;
-									gint _tmp147_ = 0;
-									gint _tmp148_ = 0;
-									gint _tmp149_ = 0;
-									gint _tmp150_ = 0;
-									gint _tmp151_ = 0;
-									GeeList* _tmp152_ = NULL;
-									gint _tmp153_ = 0;
-									gint _tmp154_ = 0;
-									ProgressDialog* _tmp188_ = NULL;
+									gint _tmp147_;
+									gint _tmp148_;
+									gint _tmp149_;
+									gint _tmp150_;
+									gint _tmp151_;
+									GeeList* _tmp152_;
+									gint _tmp153_;
+									gint _tmp154_;
+									ProgressDialog* _tmp188_;
 #line 994 "/home/jens/Source/shotwell/src/Printing.vala"
 									if (!_tmp143_) {
-#line 7088 "Printing.c"
-										gint _tmp144_ = 0;
+#line 7016 "Printing.c"
+										gint _tmp144_;
 #line 994 "/home/jens/Source/shotwell/src/Printing.vala"
 										_tmp144_ = x;
 #line 994 "/home/jens/Source/shotwell/src/Printing.vala"
 										x = _tmp144_ + 1;
-#line 7094 "Printing.c"
+#line 7022 "Printing.c"
 									}
 #line 994 "/home/jens/Source/shotwell/src/Printing.vala"
 									_tmp143_ = FALSE;
@@ -7103,7 +7031,7 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 									if (!(_tmp145_ < _tmp146_)) {
 #line 994 "/home/jens/Source/shotwell/src/Printing.vala"
 										break;
-#line 7106 "Printing.c"
+#line 7034 "Printing.c"
 									}
 #line 995 "/home/jens/Source/shotwell/src/Printing.vala"
 									_tmp147_ = start;
@@ -7125,30 +7053,30 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 									_tmp154_ = _tmp153_;
 #line 996 "/home/jens/Source/shotwell/src/Printing.vala"
 									if (_tmp151_ < _tmp154_) {
-#line 7128 "Printing.c"
+#line 7056 "Printing.c"
 										gdouble dx = 0.0;
-										gint _tmp155_ = 0;
-										gdouble _tmp156_ = 0.0;
-										gint _tmp157_ = 0;
+										gint _tmp155_;
+										gdouble _tmp156_;
+										gint _tmp157_;
 										gdouble dy = 0.0;
-										gint _tmp158_ = 0;
-										gdouble _tmp159_ = 0.0;
-										gint _tmp160_ = 0;
-										GeeList* _tmp161_ = NULL;
-										gint _tmp162_ = 0;
-										gpointer _tmp163_ = NULL;
-										Photo* _tmp164_ = NULL;
-										gdouble _tmp165_ = 0.0;
-										gdouble _tmp166_ = 0.0;
-										gdouble _tmp167_ = 0.0;
-										gdouble _tmp168_ = 0.0;
-										PrintJob* _tmp169_ = NULL;
-										GtkPrintContext* _tmp170_ = NULL;
-										PrintJob* _tmp171_ = NULL;
-										PrintSettings* _tmp172_ = NULL;
-										PrintSettings* _tmp173_ = NULL;
-										gboolean _tmp174_ = FALSE;
-										gboolean _tmp175_ = FALSE;
+										gint _tmp158_;
+										gdouble _tmp159_;
+										gint _tmp160_;
+										GeeList* _tmp161_;
+										gint _tmp162_;
+										gpointer _tmp163_;
+										Photo* _tmp164_;
+										gdouble _tmp165_;
+										gdouble _tmp166_;
+										gdouble _tmp167_;
+										gdouble _tmp168_;
+										PrintJob* _tmp169_;
+										GtkPrintContext* _tmp170_;
+										PrintJob* _tmp171_;
+										PrintSettings* _tmp172_;
+										PrintSettings* _tmp173_;
+										gboolean _tmp174_;
+										gboolean _tmp175_;
 #line 997 "/home/jens/Source/shotwell/src/Printing.vala"
 										_tmp155_ = x;
 #line 997 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7203,19 +7131,19 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 										_print_settings_unref0 (_tmp173_);
 #line 1001 "/home/jens/Source/shotwell/src/Printing.vala"
 										if (_tmp175_) {
-#line 7206 "Printing.c"
-											gdouble _tmp176_ = 0.0;
-											gdouble _tmp177_ = 0.0;
-											gdouble _tmp178_ = 0.0;
-											gdouble _tmp179_ = 0.0;
-											GeeList* _tmp180_ = NULL;
-											gint _tmp181_ = 0;
-											gpointer _tmp182_ = NULL;
-											Photo* _tmp183_ = NULL;
-											gchar* _tmp184_ = NULL;
-											gchar* _tmp185_ = NULL;
-											PrintJob* _tmp186_ = NULL;
-											GtkPrintContext* _tmp187_ = NULL;
+#line 7134 "Printing.c"
+											gdouble _tmp176_;
+											gdouble _tmp177_;
+											gdouble _tmp178_;
+											gdouble _tmp179_;
+											GeeList* _tmp180_;
+											gint _tmp181_;
+											gpointer _tmp182_;
+											Photo* _tmp183_;
+											gchar* _tmp184_;
+											gchar* _tmp185_;
+											PrintJob* _tmp186_;
+											GtkPrintContext* _tmp187_;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
 											_tmp176_ = dx;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7246,19 +7174,19 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 											_g_free0 (_tmp185_);
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
 											_g_object_unref0 (_tmp183_);
-#line 7249 "Printing.c"
+#line 7177 "Printing.c"
 										}
 									}
 #line 1007 "/home/jens/Source/shotwell/src/Printing.vala"
 									_tmp188_ = self->priv->progress_dialog;
 #line 1007 "/home/jens/Source/shotwell/src/Printing.vala"
 									if (_tmp188_ != NULL) {
-#line 7256 "Printing.c"
-										ProgressDialog* _tmp189_ = NULL;
-										gint _tmp190_ = 0;
-										GeeList* _tmp191_ = NULL;
-										gint _tmp192_ = 0;
-										gint _tmp193_ = 0;
+#line 7184 "Printing.c"
+										ProgressDialog* _tmp189_;
+										gint _tmp190_;
+										GeeList* _tmp191_;
+										gint _tmp192_;
+										gint _tmp193_;
 #line 1008 "/home/jens/Source/shotwell/src/Printing.vala"
 										_tmp189_ = self->priv->progress_dialog;
 #line 1008 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7271,7 +7199,7 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 										_tmp193_ = _tmp192_;
 #line 1008 "/home/jens/Source/shotwell/src/Printing.vala"
 										progress_dialog_monitor (_tmp189_, (guint64) _tmp190_, (guint64) _tmp193_, TRUE);
-#line 7274 "Printing.c"
+#line 7202 "Printing.c"
 									}
 								}
 							}
@@ -7281,13 +7209,13 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 			}
 #line 1011 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 7284 "Printing.c"
+#line 7212 "Printing.c"
 		}
 		default:
 		{
 #line 1014 "/home/jens/Source/shotwell/src/Printing.vala"
 			g_error ("Printing.vala:1014: unknown or unsupported layout mode");
-#line 7290 "Printing.c"
+#line 7218 "Printing.c"
 		}
 	}
 #line 919 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7298,23 +7226,23 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 	_g_object_unref0 (page_setup);
 #line 919 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (job);
-#line 7301 "Printing.c"
+#line 7229 "Printing.c"
 }
 
 
 static void _print_manager_on_custom_widget_apply_gtk_print_operation_custom_widget_apply (GtkPrintOperation* _sender, GtkWidget* widget, gpointer self) {
 #line 1020 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_manager_on_custom_widget_apply ((PrintManager*) self, widget);
-#line 7308 "Printing.c"
+#line 7236 "Printing.c"
 }
 
 
 static GObject* print_manager_on_create_custom_widget (PrintManager* self, GtkPrintOperation* emitting_object) {
 	GObject* result = NULL;
-	GtkPrintOperation* _tmp0_ = NULL;
-	CustomPrintTab* _tmp1_ = NULL;
-	GtkPrintOperation* _tmp2_ = NULL;
-	CustomPrintTab* _tmp3_ = NULL;
+	GtkPrintOperation* _tmp0_;
+	CustomPrintTab* _tmp1_;
+	GtkPrintOperation* _tmp2_;
+	CustomPrintTab* _tmp3_;
 #line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_MANAGER (self), NULL);
 #line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7339,20 +7267,20 @@ static GObject* print_manager_on_create_custom_widget (PrintManager* self, GtkPr
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject);
 #line 1021 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 7342 "Printing.c"
+#line 7270 "Printing.c"
 }
 
 
 static void print_manager_on_custom_widget_apply (PrintManager* self, GtkWidget* custom_widget) {
 	CustomPrintTab* tab = NULL;
-	GtkWidget* _tmp0_ = NULL;
-	CustomPrintTab* _tmp1_ = NULL;
-	PrintJob* _tmp2_ = NULL;
-	PrintJob* _tmp3_ = NULL;
-	PrintSettings* _tmp4_ = NULL;
-	PrintSettings* _tmp5_ = NULL;
-	PrintSettings* _tmp6_ = NULL;
-	PrintSettings* _tmp7_ = NULL;
+	GtkWidget* _tmp0_;
+	CustomPrintTab* _tmp1_;
+	PrintJob* _tmp2_;
+	PrintJob* _tmp3_;
+	PrintSettings* _tmp4_;
+	PrintSettings* _tmp5_;
+	PrintSettings* _tmp6_;
+	PrintSettings* _tmp7_;
 #line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
 #line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7387,52 +7315,52 @@ static void print_manager_on_custom_widget_apply (PrintManager* self, GtkWidget*
 	_print_settings_unref0 (_tmp7_);
 #line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (tab);
-#line 7390 "Printing.c"
+#line 7318 "Printing.c"
 }
 
 
 static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo, gdouble x, gdouble y, gdouble canvas_width, gdouble canvas_height, gboolean crop, PrintJob* job, GtkPrintContext* job_context) {
 	cairo_t* dc = NULL;
-	GtkPrintContext* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
+	GtkPrintContext* _tmp0_;
+	cairo_t* _tmp1_;
+	cairo_t* _tmp2_;
 	Dimensions photo_dimensions = {0};
-	Photo* _tmp3_ = NULL;
+	Photo* _tmp3_;
 	Dimensions _tmp4_ = {0};
 	gdouble photo_aspect_ratio = 0.0;
-	gdouble _tmp5_ = 0.0;
+	gdouble _tmp5_;
 	gdouble canvas_aspect_ratio = 0.0;
-	gdouble _tmp6_ = 0.0;
-	gdouble _tmp7_ = 0.0;
+	gdouble _tmp6_;
+	gdouble _tmp7_;
 	gdouble target_width = 0.0;
 	gdouble target_height = 0.0;
 	gdouble dpi = 0.0;
-	PrintJob* _tmp8_ = NULL;
-	PrintSettings* _tmp9_ = NULL;
-	PrintSettings* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gdouble _tmp12_ = 0.0;
-	gboolean _tmp13_ = FALSE;
+	PrintJob* _tmp8_;
+	PrintSettings* _tmp9_;
+	PrintSettings* _tmp10_;
+	gint _tmp11_;
+	gdouble _tmp12_;
+	gboolean _tmp13_;
 	gdouble x_offset = 0.0;
-	gdouble _tmp28_ = 0.0;
-	gdouble _tmp29_ = 0.0;
+	gdouble _tmp28_;
+	gdouble _tmp29_;
 	gdouble y_offset = 0.0;
-	gdouble _tmp30_ = 0.0;
-	gdouble _tmp31_ = 0.0;
-	cairo_t* _tmp32_ = NULL;
-	cairo_t* _tmp33_ = NULL;
-	gdouble _tmp34_ = 0.0;
-	gdouble _tmp35_ = 0.0;
+	gdouble _tmp30_;
+	gdouble _tmp31_;
+	cairo_t* _tmp32_;
+	cairo_t* _tmp33_;
+	gdouble _tmp34_;
+	gdouble _tmp35_;
 	gint w = 0;
-	gdouble _tmp36_ = 0.0;
-	gdouble _tmp37_ = 0.0;
+	gdouble _tmp36_;
+	gdouble _tmp37_;
 	gint h = 0;
-	gdouble _tmp38_ = 0.0;
-	gdouble _tmp39_ = 0.0;
+	gdouble _tmp38_;
+	gdouble _tmp39_;
 	Dimensions viewport = {0};
-	gint _tmp40_ = 0;
-	gint _tmp41_ = 0;
-	cairo_t* _tmp96_ = NULL;
+	gint _tmp40_;
+	gint _tmp41_;
+	cairo_t* _tmp95_;
 	GError * _inner_error_ = NULL;
 #line 1030 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
@@ -7488,25 +7416,25 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 	_tmp13_ = crop;
 #line 1040 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!_tmp13_) {
-#line 7491 "Printing.c"
-		gdouble _tmp14_ = 0.0;
-		gdouble _tmp15_ = 0.0;
-		gdouble _tmp22_ = 0.0;
-		gdouble _tmp23_ = 0.0;
-		gdouble _tmp24_ = 0.0;
-		gdouble _tmp25_ = 0.0;
-		gdouble _tmp26_ = 0.0;
-		gdouble _tmp27_ = 0.0;
+#line 7419 "Printing.c"
+		gdouble _tmp14_;
+		gdouble _tmp15_;
+		gdouble _tmp22_;
+		gdouble _tmp23_;
+		gdouble _tmp24_;
+		gdouble _tmp25_;
+		gdouble _tmp26_;
+		gdouble _tmp27_;
 #line 1041 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp14_ = canvas_aspect_ratio;
 #line 1041 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp15_ = photo_aspect_ratio;
 #line 1041 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp14_ < _tmp15_) {
-#line 7506 "Printing.c"
-			gdouble _tmp16_ = 0.0;
-			gdouble _tmp17_ = 0.0;
-			gdouble _tmp18_ = 0.0;
+#line 7434 "Printing.c"
+			gdouble _tmp16_;
+			gdouble _tmp17_;
+			gdouble _tmp18_;
 #line 1042 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp16_ = canvas_width;
 #line 1042 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7517,11 +7445,11 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 			_tmp18_ = photo_aspect_ratio;
 #line 1043 "/home/jens/Source/shotwell/src/Printing.vala"
 			target_height = _tmp17_ * (1.0 / _tmp18_);
-#line 7520 "Printing.c"
+#line 7448 "Printing.c"
 		} else {
-			gdouble _tmp19_ = 0.0;
-			gdouble _tmp20_ = 0.0;
-			gdouble _tmp21_ = 0.0;
+			gdouble _tmp19_;
+			gdouble _tmp20_;
+			gdouble _tmp21_;
 #line 1045 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp19_ = canvas_height;
 #line 1045 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7532,7 +7460,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 			_tmp21_ = photo_aspect_ratio;
 #line 1046 "/home/jens/Source/shotwell/src/Printing.vala"
 			target_width = _tmp20_ * _tmp21_;
-#line 7535 "Printing.c"
+#line 7463 "Printing.c"
 		}
 #line 1048 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = x;
@@ -7550,7 +7478,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 		_tmp27_ = target_height;
 #line 1049 "/home/jens/Source/shotwell/src/Printing.vala"
 		y = _tmp25_ + ((_tmp26_ - _tmp27_) / 2.0);
-#line 7553 "Printing.c"
+#line 7481 "Printing.c"
 	}
 #line 1052 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp28_ = dpi;
@@ -7594,19 +7522,19 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 	_tmp41_ = h;
 #line 1059 "/home/jens/Source/shotwell/src/Printing.vala"
 	dimensions_init (&viewport, _tmp40_, _tmp41_);
-#line 7597 "Printing.c"
+#line 7525 "Printing.c"
 	{
 		gboolean _tmp42_ = FALSE;
-		gboolean _tmp43_ = FALSE;
-		cairo_t* _tmp89_ = NULL;
+		gboolean _tmp43_;
+		cairo_t* _tmp89_;
 #line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp43_ = crop;
 #line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp43_) {
-#line 7606 "Printing.c"
-			gdouble _tmp44_ = 0.0;
-			gdouble _tmp45_ = 0.0;
-			gboolean _tmp46_ = FALSE;
+#line 7534 "Printing.c"
+			gdouble _tmp44_;
+			gdouble _tmp45_;
+			gboolean _tmp46_;
 #line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp44_ = canvas_aspect_ratio;
 #line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7615,44 +7543,44 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 			_tmp46_ = print_manager_are_approximately_equal (self, _tmp44_, _tmp45_);
 #line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp42_ = !_tmp46_;
-#line 7618 "Printing.c"
+#line 7546 "Printing.c"
 		} else {
 #line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp42_ = FALSE;
-#line 7622 "Printing.c"
+#line 7550 "Printing.c"
 		}
 #line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp42_) {
-#line 7626 "Printing.c"
+#line 7554 "Printing.c"
 			Scaling pixbuf_scaling = {0};
-			Dimensions _tmp47_ = {0};
+			Dimensions _tmp47_;
 			Scaling _tmp48_ = {0};
 			GdkPixbuf* photo_pixbuf = NULL;
-			Photo* _tmp49_ = NULL;
-			Scaling _tmp50_ = {0};
-			GdkPixbuf* _tmp51_ = NULL;
+			Photo* _tmp49_;
+			Scaling _tmp50_;
+			GdkPixbuf* _tmp51_;
 			Dimensions scaled_photo_dimensions = {0};
-			GdkPixbuf* _tmp52_ = NULL;
+			GdkPixbuf* _tmp52_;
 			Dimensions _tmp53_ = {0};
 			gint shave_vertical = 0;
 			gint shave_horizontal = 0;
-			gdouble _tmp54_ = 0.0;
-			gdouble _tmp55_ = 0.0;
+			gdouble _tmp54_;
+			gdouble _tmp55_;
 			GdkPixbuf* shaved_pixbuf = NULL;
-			GdkPixbuf* _tmp66_ = NULL;
-			gint _tmp67_ = 0;
-			gint _tmp68_ = 0;
-			Dimensions _tmp69_ = {0};
-			gint _tmp70_ = 0;
-			gint _tmp71_ = 0;
-			Dimensions _tmp72_ = {0};
-			gint _tmp73_ = 0;
-			gint _tmp74_ = 0;
-			GdkPixbuf* _tmp75_ = NULL;
-			GdkPixbuf* _tmp76_ = NULL;
-			GdkPixbuf* _tmp77_ = NULL;
-			cairo_t* _tmp78_ = NULL;
-			GdkPixbuf* _tmp79_ = NULL;
+			GdkPixbuf* _tmp66_;
+			gint _tmp67_;
+			gint _tmp68_;
+			Dimensions _tmp69_;
+			gint _tmp70_;
+			gint _tmp71_;
+			Dimensions _tmp72_;
+			gint _tmp73_;
+			gint _tmp74_;
+			GdkPixbuf* _tmp75_;
+			GdkPixbuf* _tmp76_;
+			GdkPixbuf* _tmp77_;
+			cairo_t* _tmp78_;
+			GdkPixbuf* _tmp79_;
 #line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp47_ = viewport;
 #line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7669,8 +7597,8 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 			photo_pixbuf = _tmp51_;
 #line 1064 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7672 "Printing.c"
-				goto __catch469_g_error;
+#line 7600 "Printing.c"
+				goto __catch470_g_error;
 			}
 #line 1065 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp52_ = photo_pixbuf;
@@ -7688,12 +7616,12 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 			_tmp55_ = photo_aspect_ratio;
 #line 1068 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (_tmp54_ < _tmp55_) {
-#line 7691 "Printing.c"
-				Dimensions _tmp56_ = {0};
-				gint _tmp57_ = 0;
-				Dimensions _tmp58_ = {0};
-				gint _tmp59_ = 0;
-				gdouble _tmp60_ = 0.0;
+#line 7619 "Printing.c"
+				Dimensions _tmp56_;
+				gint _tmp57_;
+				Dimensions _tmp58_;
+				gint _tmp59_;
+				gdouble _tmp60_;
 #line 1069 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp56_ = scaled_photo_dimensions;
 #line 1069 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7706,13 +7634,13 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 				_tmp60_ = canvas_aspect_ratio;
 #line 1069 "/home/jens/Source/shotwell/src/Printing.vala"
 				shave_vertical = (gint) ((_tmp57_ - (_tmp59_ * _tmp60_)) / 2.0);
-#line 7709 "Printing.c"
+#line 7637 "Printing.c"
 			} else {
-				Dimensions _tmp61_ = {0};
-				gint _tmp62_ = 0;
-				Dimensions _tmp63_ = {0};
-				gint _tmp64_ = 0;
-				gdouble _tmp65_ = 0.0;
+				Dimensions _tmp61_;
+				gint _tmp62_;
+				Dimensions _tmp63_;
+				gint _tmp64_;
+				gdouble _tmp65_;
 #line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp61_ = scaled_photo_dimensions;
 #line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7725,7 +7653,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 				_tmp65_ = canvas_aspect_ratio;
 #line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
 				shave_horizontal = (gint) ((_tmp62_ - (_tmp64_ * (1.0 / _tmp65_))) / 2.0);
-#line 7728 "Printing.c"
+#line 7656 "Printing.c"
 			}
 #line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp66_ = photo_pixbuf;
@@ -7767,19 +7695,19 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 			_g_object_unref0 (shaved_pixbuf);
 #line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_g_object_unref0 (photo_pixbuf);
-#line 7770 "Printing.c"
+#line 7698 "Printing.c"
 		} else {
 			Scaling pixbuf_scaling = {0};
-			Dimensions _tmp80_ = {0};
+			Dimensions _tmp80_;
 			Scaling _tmp81_ = {0};
 			GdkPixbuf* photo_pixbuf = NULL;
-			Photo* _tmp82_ = NULL;
-			Scaling _tmp83_ = {0};
-			GdkPixbuf* _tmp84_ = NULL;
-			GdkPixbuf* _tmp85_ = NULL;
-			GdkPixbuf* _tmp86_ = NULL;
-			cairo_t* _tmp87_ = NULL;
-			GdkPixbuf* _tmp88_ = NULL;
+			Photo* _tmp82_;
+			Scaling _tmp83_;
+			GdkPixbuf* _tmp84_;
+			GdkPixbuf* _tmp85_;
+			GdkPixbuf* _tmp86_;
+			cairo_t* _tmp87_;
+			GdkPixbuf* _tmp88_;
 #line 1078 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp80_ = viewport;
 #line 1078 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7796,8 +7724,8 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 			photo_pixbuf = _tmp84_;
 #line 1079 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7799 "Printing.c"
-				goto __catch469_g_error;
+#line 7727 "Printing.c"
+				goto __catch470_g_error;
 			}
 #line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp85_ = photo_pixbuf;
@@ -7815,24 +7743,23 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 			gdk_cairo_set_source_pixbuf (_tmp87_, _tmp88_, 0.0, 0.0);
 #line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_g_object_unref0 (photo_pixbuf);
-#line 7818 "Printing.c"
+#line 7746 "Printing.c"
 		}
 #line 1083 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp89_ = dc;
 #line 1083 "/home/jens/Source/shotwell/src/Printing.vala"
 		cairo_paint (_tmp89_);
-#line 7824 "Printing.c"
+#line 7752 "Printing.c"
 	}
-	goto __finally469;
-	__catch469_g_error:
+	goto __finally470;
+	__catch470_g_error:
 	{
 		GError* e = NULL;
-		PrintJob* _tmp90_ = NULL;
-		const gchar* _tmp91_ = NULL;
-		GError* _tmp92_ = NULL;
-		const gchar* _tmp93_ = NULL;
-		gchar* _tmp94_ = NULL;
-		gchar* _tmp95_ = NULL;
+		PrintJob* _tmp90_;
+		GError* _tmp91_;
+		const gchar* _tmp92_;
+		gchar* _tmp93_;
+		gchar* _tmp94_;
 #line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 		e = _inner_error_;
 #line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7842,24 +7769,22 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 #line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_print_operation_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, gtk_print_operation_get_type (), GtkPrintOperation));
 #line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp91_ = _ ("Unable to print photo:\n\n%s");
+		_tmp91_ = e;
 #line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp92_ = e;
+		_tmp92_ = _tmp91_->message;
 #line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp93_ = _tmp92_->message;
+		_tmp93_ = g_strdup_printf (_ ("Unable to print photo:\n\n%s"), _tmp92_);
 #line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp94_ = g_strdup_printf (_tmp91_, _tmp93_);
+		_tmp94_ = _tmp93_;
 #line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
-		_tmp95_ = _tmp94_;
+		app_window_error_message (_tmp94_, NULL);
 #line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
-		app_window_error_message (_tmp95_, NULL);
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
-		_g_free0 (_tmp95_);
+		_g_free0 (_tmp94_);
 #line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_error_free0 (e);
-#line 7860 "Printing.c"
+#line 7785 "Printing.c"
 	}
-	__finally469:
+	__finally470:
 #line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7870,58 +7795,58 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 		g_clear_error (&_inner_error_);
 #line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 7873 "Printing.c"
+#line 7798 "Printing.c"
 	}
 #line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp96_ = dc;
+	_tmp95_ = dc;
 #line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
-	cairo_restore (_tmp96_);
+	cairo_restore (_tmp95_);
 #line 1030 "/home/jens/Source/shotwell/src/Printing.vala"
 	_cairo_destroy0 (dc);
-#line 7881 "Printing.c"
+#line 7806 "Printing.c"
 }
 
 
 static void _vala_PangoFontDescription_free (PangoFontDescription* self) {
 #line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_boxed_free (pango_font_description_get_type (), self);
-#line 7888 "Printing.c"
+#line 7813 "Printing.c"
 }
 
 
 static void print_manager_add_title_to_canvas (PrintManager* self, gdouble x, gdouble y, const gchar* title, PrintJob* job, GtkPrintContext* job_context) {
 	cairo_t* dc = NULL;
-	GtkPrintContext* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
+	GtkPrintContext* _tmp0_;
+	cairo_t* _tmp1_;
+	cairo_t* _tmp2_;
 	gdouble dpi = 0.0;
-	PrintJob* _tmp3_ = NULL;
-	PrintSettings* _tmp4_ = NULL;
-	PrintSettings* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gdouble _tmp7_ = 0.0;
+	PrintJob* _tmp3_;
+	PrintSettings* _tmp4_;
+	PrintSettings* _tmp5_;
+	gint _tmp6_;
+	gdouble _tmp7_;
 	PangoFontDescription* title_font_description = NULL;
-	PrintJob* _tmp8_ = NULL;
-	PrintSettings* _tmp9_ = NULL;
-	PrintSettings* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	PangoFontDescription* _tmp13_ = NULL;
-	PangoFontDescription* _tmp14_ = NULL;
+	PrintJob* _tmp8_;
+	PrintSettings* _tmp9_;
+	PrintSettings* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	PangoFontDescription* _tmp13_;
+	PangoFontDescription* _tmp14_;
 	PangoLayout* title_layout = NULL;
-	PangoLayout* _tmp15_ = NULL;
+	PangoLayout* _tmp15_;
 	PangoContext* context = NULL;
-	PangoContext* _tmp16_ = NULL;
-	PangoContext* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
+	PangoContext* _tmp16_;
+	PangoContext* _tmp17_;
+	const gchar* _tmp18_;
 	gint title_width = 0;
 	gint title_height = 0;
 	gint _tmp19_ = 0;
 	gint _tmp20_ = 0;
 	gdouble tx = 0.0;
-	gdouble _tmp21_ = 0.0;
+	gdouble _tmp21_;
 	gdouble ty = 0.0;
-	gdouble _tmp22_ = 0.0;
+	gdouble _tmp22_;
 #line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
 #line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -8030,16 +7955,16 @@ static void print_manager_add_title_to_canvas (PrintManager* self, gdouble x, gd
 	__vala_PangoFontDescription_free0 (title_font_description);
 #line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	_cairo_destroy0 (dc);
-#line 8033 "Printing.c"
+#line 7958 "Printing.c"
 }
 
 
 static gboolean print_manager_are_approximately_equal (PrintManager* self, gdouble val1, gdouble val2) {
 	gboolean result = FALSE;
 	gdouble accept_err = 0.0;
-	gdouble _tmp0_ = 0.0;
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
+	gdouble _tmp0_;
+	gdouble _tmp1_;
+	gdouble _tmp2_;
 #line 1119 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_MANAGER (self), FALSE);
 #line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -8054,14 +7979,14 @@ static gboolean print_manager_are_approximately_equal (PrintManager* self, gdoub
 	result = _tmp2_ <= accept_err;
 #line 1121 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 8057 "Printing.c"
+#line 7982 "Printing.c"
 }
 
 
 PrintSettings* print_manager_get_global_settings (PrintManager* self) {
 	PrintSettings* result = NULL;
-	PrintSettings* _tmp0_ = NULL;
-	PrintSettings* _tmp1_ = NULL;
+	PrintSettings* _tmp0_;
+	PrintSettings* _tmp1_;
 #line 1124 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_MANAGER (self), NULL);
 #line 1125 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -8072,14 +7997,14 @@ PrintSettings* print_manager_get_global_settings (PrintManager* self) {
 	result = _tmp1_;
 #line 1125 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 8075 "Printing.c"
+#line 8000 "Printing.c"
 }
 
 
 void print_manager_set_global_settings (PrintManager* self, PrintSettings* settings) {
-	PrintSettings* _tmp0_ = NULL;
-	PrintSettings* _tmp1_ = NULL;
-	PrintSettings* _tmp2_ = NULL;
+	PrintSettings* _tmp0_;
+	PrintSettings* _tmp1_;
+	PrintSettings* _tmp2_;
 #line 1128 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
 #line 1128 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -8096,14 +8021,14 @@ void print_manager_set_global_settings (PrintManager* self, PrintSettings* setti
 	_tmp2_ = settings;
 #line 1130 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_save (_tmp2_);
-#line 8099 "Printing.c"
+#line 8024 "Printing.c"
 }
 
 
 static void value_print_manager_init (GValue* value) {
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	value->data[0].v_pointer = NULL;
-#line 8106 "Printing.c"
+#line 8031 "Printing.c"
 }
 
 
@@ -8112,7 +8037,7 @@ static void value_print_manager_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_manager_unref (value->data[0].v_pointer);
-#line 8115 "Printing.c"
+#line 8040 "Printing.c"
 	}
 }
 
@@ -8122,11 +8047,11 @@ static void value_print_manager_copy_value (const GValue* src_value, GValue* des
 	if (src_value->data[0].v_pointer) {
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		dest_value->data[0].v_pointer = print_manager_ref (src_value->data[0].v_pointer);
-#line 8125 "Printing.c"
+#line 8050 "Printing.c"
 	} else {
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8129 "Printing.c"
+#line 8054 "Printing.c"
 	}
 }
 
@@ -8134,66 +8059,66 @@ static void value_print_manager_copy_value (const GValue* src_value, GValue* des
 static gpointer value_print_manager_peek_pointer (const GValue* value) {
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return value->data[0].v_pointer;
-#line 8137 "Printing.c"
+#line 8062 "Printing.c"
 }
 
 
 static gchar* value_print_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (collect_values[0].v_pointer) {
-#line 8144 "Printing.c"
-		PrintManager* object;
+#line 8069 "Printing.c"
+		PrintManager * object;
 		object = collect_values[0].v_pointer;
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8151 "Printing.c"
+#line 8076 "Printing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8155 "Printing.c"
+#line 8080 "Printing.c"
 		}
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = print_manager_ref (object);
-#line 8159 "Printing.c"
+#line 8084 "Printing.c"
 	} else {
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8163 "Printing.c"
+#line 8088 "Printing.c"
 	}
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return NULL;
-#line 8167 "Printing.c"
+#line 8092 "Printing.c"
 }
 
 
 static gchar* value_print_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PrintManager** object_p;
+	PrintManager ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!object_p) {
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8178 "Printing.c"
+#line 8103 "Printing.c"
 	}
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!value->data[0].v_pointer) {
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = NULL;
-#line 8184 "Printing.c"
+#line 8109 "Printing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8188 "Printing.c"
+#line 8113 "Printing.c"
 	} else {
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = print_manager_ref (value->data[0].v_pointer);
-#line 8192 "Printing.c"
+#line 8117 "Printing.c"
 	}
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return NULL;
-#line 8196 "Printing.c"
+#line 8121 "Printing.c"
 }
 
 
@@ -8207,7 +8132,7 @@ GParamSpec* param_spec_print_manager (const gchar* name, const gchar* nick, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return G_PARAM_SPEC (spec);
-#line 8210 "Printing.c"
+#line 8135 "Printing.c"
 }
 
 
@@ -8216,12 +8141,12 @@ gpointer value_get_print_manager (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_MANAGER), NULL);
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return value->data[0].v_pointer;
-#line 8219 "Printing.c"
+#line 8144 "Printing.c"
 }
 
 
 void value_set_print_manager (GValue* value, gpointer v_object) {
-	PrintManager* old;
+	PrintManager * old;
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_MANAGER));
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -8236,23 +8161,23 @@ void value_set_print_manager (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_manager_ref (value->data[0].v_pointer);
-#line 8239 "Printing.c"
+#line 8164 "Printing.c"
 	} else {
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8243 "Printing.c"
+#line 8168 "Printing.c"
 	}
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (old) {
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_manager_unref (old);
-#line 8249 "Printing.c"
+#line 8174 "Printing.c"
 	}
 }
 
 
 void value_take_print_manager (GValue* value, gpointer v_object) {
-	PrintManager* old;
+	PrintManager * old;
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_MANAGER));
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -8265,17 +8190,17 @@ void value_take_print_manager (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = v_object;
-#line 8268 "Printing.c"
+#line 8193 "Printing.c"
 	} else {
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8272 "Printing.c"
+#line 8197 "Printing.c"
 	}
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (old) {
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_manager_unref (old);
-#line 8278 "Printing.c"
+#line 8203 "Printing.c"
 	}
 }
 
@@ -8287,7 +8212,7 @@ static void print_manager_class_init (PrintManagerClass * klass) {
 	((PrintManagerClass *) klass)->finalize = print_manager_finalize;
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_type_class_add_private (klass, sizeof (PrintManagerPrivate));
-#line 8290 "Printing.c"
+#line 8215 "Printing.c"
 }
 
 
@@ -8306,11 +8231,11 @@ static void print_manager_instance_init (PrintManager * self) {
 	self->priv->_standard_sizes_size_ = self->priv->standard_sizes_length1;
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->ref_count = 1;
-#line 8309 "Printing.c"
+#line 8234 "Printing.c"
 }
 
 
-static void print_manager_finalize (PrintManager* obj) {
+static void print_manager_finalize (PrintManager * obj) {
 	PrintManager * self;
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PRINT_MANAGER, PrintManager);
@@ -8328,7 +8253,7 @@ static void print_manager_finalize (PrintManager* obj) {
 	_g_object_unref0 (self->priv->cancellable);
 #line 781 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->standard_sizes = (_vala_array_free (self->priv->standard_sizes, self->priv->standard_sizes_length1, (GDestroyNotify) standard_print_size_unref), NULL);
-#line 8331 "Printing.c"
+#line 8256 "Printing.c"
 }
 
 
@@ -8347,18 +8272,18 @@ GType print_manager_get_type (void) {
 
 
 gpointer print_manager_ref (gpointer instance) {
-	PrintManager* self;
+	PrintManager * self;
 	self = instance;
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return instance;
-#line 8356 "Printing.c"
+#line 8281 "Printing.c"
 }
 
 
 void print_manager_unref (gpointer instance) {
-	PrintManager* self;
+	PrintManager * self;
 	self = instance;
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -8366,7 +8291,7 @@ void print_manager_unref (gpointer instance) {
 		PRINT_MANAGER_GET_CLASS (self)->finalize (self);
 #line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8369 "Printing.c"
+#line 8294 "Printing.c"
 	}
 }
 
diff --git a/src/Properties.c b/src/Properties.c
index 58b0cd2..d14faa7 100644
--- a/src/Properties.c
+++ b/src/Properties.c
@@ -1,4 +1,4 @@
-/* Properties.c generated by valac 0.34.7, the Vala compiler
+/* Properties.c generated by valac 0.36.6, the Vala compiler
  * generated from Properties.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -554,7 +554,7 @@ void properties_update_properties (Properties* self, Page* page);
 void properties_internal_update_properties (Properties* self, Page* page);
 static void properties_real_internal_update_properties (Properties* self, Page* page);
 void properties_unselect_text (Properties* self);
-static void properties_finalize (GObject* obj);
+static void properties_finalize (GObject * obj);
 GType basic_properties_get_type (void) G_GNUC_CONST;
 GType dimensions_get_type (void) G_GNUC_CONST;
 Dimensions* dimensions_dup (const Dimensions* self);
@@ -627,7 +627,7 @@ Tag* tag_page_get_tag (TagPage* self);
 gchar* tag_get_user_visible_name (Tag* self);
 gchar* guarded_markup_escape_text (const gchar* plain);
 gboolean dimensions_has_area (Dimensions *self);
-static void basic_properties_finalize (GObject* obj);
+static void basic_properties_finalize (GObject * obj);
 GType extended_properties_window_get_type (void) G_GNUC_CONST;
 static GType extended_properties_window_extended_properties_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define EXTENDED_PROPERTIES_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EXTENDED_PROPERTIES_WINDOW, ExtendedPropertiesWindowPrivate))
@@ -674,7 +674,7 @@ gchar* photo_metadata_get_camera_make (PhotoMetadata* self);
 gchar* photo_metadata_get_camera_model (PhotoMetadata* self);
 gchar* photo_metadata_get_flash_string (PhotoMetadata* self);
 gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self);
-gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar** long_ref, gdouble* latitude, gchar** lat_ref, gdouble* altitude);
+gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* * long_ref, gdouble* latitude, gchar* * lat_ref, gdouble* altitude);
 gchar* photo_metadata_get_artist (PhotoMetadata* self);
 gchar* photo_metadata_get_copyright (PhotoMetadata* self);
 gchar* photo_metadata_get_software (PhotoMetadata* self);
@@ -685,8 +685,8 @@ GType event_get_type (void) G_GNUC_CONST;
 gchar* event_source_get_comment (EventSource* self);
 static void extended_properties_window_extended_properties_real_internal_update_properties (Properties* base, Page* page);
 GType events_directory_page_get_type (void) G_GNUC_CONST;
-static void extended_properties_window_extended_properties_finalize (GObject* obj);
-static void extended_properties_window_finalize (GObject* obj);
+static void extended_properties_window_extended_properties_finalize (GObject * obj);
+static void extended_properties_window_finalize (GObject * obj);
 
 
 Properties* properties_construct (GType object_type) {
@@ -712,18 +712,18 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 void properties_add_line (Properties* self, const gchar* label_text, const gchar* info_text, gboolean multi_line) {
 	GtkLabel* label = NULL;
-	GtkLabel* _tmp0_ = NULL;
+	GtkLabel* _tmp0_;
 	GtkWidget* info = NULL;
-	GtkLabel* _tmp1_ = NULL;
-	GtkLabel* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	GtkLabel* _tmp46_ = NULL;
-	guint _tmp47_ = 0U;
-	gboolean _tmp48_ = FALSE;
-	guint _tmp53_ = 0U;
+	GtkLabel* _tmp1_;
+	GtkLabel* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gboolean _tmp6_;
+	GtkLabel* _tmp46_;
+	guint _tmp47_;
+	gboolean _tmp48_;
+	guint _tmp53_;
 #line 15 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PROPERTIES (self));
 #line 15 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -758,32 +758,32 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 	if (_tmp6_) {
 #line 760 "Properties.c"
 		GtkScrolledWindow* info_scroll = NULL;
-		GtkScrolledWindow* _tmp7_ = NULL;
-		GtkScrolledWindow* _tmp8_ = NULL;
+		GtkScrolledWindow* _tmp7_;
+		GtkScrolledWindow* _tmp8_;
 		GtkTextView* view = NULL;
-		GtkTextView* _tmp9_ = NULL;
+		GtkTextView* _tmp9_;
 		GtkStyleContext* context = NULL;
-		GtkScrolledWindow* _tmp10_ = NULL;
-		GtkStyleContext* _tmp11_ = NULL;
-		GtkStyleContext* _tmp12_ = NULL;
-		GtkTextView* _tmp13_ = NULL;
-		GtkStyleContext* _tmp14_ = NULL;
+		GtkScrolledWindow* _tmp10_;
+		GtkStyleContext* _tmp11_;
+		GtkStyleContext* _tmp12_;
+		GtkTextView* _tmp13_;
+		GtkStyleContext* _tmp14_;
 		GdkRGBA _tmp15_ = {0};
-		GtkTextView* _tmp16_ = NULL;
-		GtkTextView* _tmp17_ = NULL;
-		GtkTextView* _tmp18_ = NULL;
+		GtkTextView* _tmp16_;
+		GtkTextView* _tmp17_;
+		GtkTextView* _tmp18_;
 		const gchar* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		gboolean _tmp21_ = FALSE;
-		GtkTextView* _tmp23_ = NULL;
-		GtkTextBuffer* _tmp24_ = NULL;
-		GtkTextBuffer* _tmp25_ = NULL;
-		GtkScrolledWindow* _tmp26_ = NULL;
-		GtkTextView* _tmp27_ = NULL;
-		GtkLabel* _tmp28_ = NULL;
-		GtkLabel* _tmp29_ = NULL;
-		GtkScrolledWindow* _tmp30_ = NULL;
-		GtkWidget* _tmp31_ = NULL;
+		const gchar* _tmp20_;
+		gboolean _tmp21_;
+		GtkTextView* _tmp23_;
+		GtkTextBuffer* _tmp24_;
+		GtkTextBuffer* _tmp25_;
+		GtkScrolledWindow* _tmp26_;
+		GtkTextView* _tmp27_;
+		GtkLabel* _tmp28_;
+		GtkLabel* _tmp29_;
+		GtkScrolledWindow* _tmp30_;
+		GtkWidget* _tmp31_;
 #line 24 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp7_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL);
 #line 24 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -838,7 +838,7 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 			_tmp19_ = "";
 #line 840 "Properties.c"
 		} else {
-			const gchar* _tmp22_ = NULL;
+			const gchar* _tmp22_;
 #line 37 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp22_ = info_text;
 #line 37 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -884,19 +884,19 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 #line 885 "Properties.c"
 	} else {
 		GtkLabel* info_label = NULL;
-		GtkLabel* _tmp32_ = NULL;
+		GtkLabel* _tmp32_;
 		const gchar* _tmp33_ = NULL;
-		const gchar* _tmp34_ = NULL;
-		gboolean _tmp35_ = FALSE;
-		GtkLabel* _tmp37_ = NULL;
-		GtkLabel* _tmp38_ = NULL;
-		GtkLabel* _tmp39_ = NULL;
-		GtkLabel* _tmp40_ = NULL;
-		GtkLabel* _tmp41_ = NULL;
-		GtkLabel* _tmp42_ = NULL;
-		GtkLabel* _tmp43_ = NULL;
-		GtkLabel* _tmp44_ = NULL;
-		GtkWidget* _tmp45_ = NULL;
+		const gchar* _tmp34_;
+		gboolean _tmp35_;
+		GtkLabel* _tmp37_;
+		GtkLabel* _tmp38_;
+		GtkLabel* _tmp39_;
+		GtkLabel* _tmp40_;
+		GtkLabel* _tmp41_;
+		GtkLabel* _tmp42_;
+		GtkLabel* _tmp43_;
+		GtkLabel* _tmp44_;
+		GtkWidget* _tmp45_;
 #line 43 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp32_ = (GtkLabel*) gtk_label_new ("");
 #line 43 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -913,7 +913,7 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 			_tmp33_ = "";
 #line 915 "Properties.c"
 		} else {
-			const gchar* _tmp36_ = NULL;
+			const gchar* _tmp36_;
 #line 44 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp36_ = info_text;
 #line 44 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -971,8 +971,8 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 #line 56 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp48_) {
 #line 974 "Properties.c"
-		GtkWidget* _tmp49_ = NULL;
-		guint _tmp50_ = 0U;
+		GtkWidget* _tmp49_;
+		guint _tmp50_;
 #line 57 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp49_ = info;
 #line 57 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -981,8 +981,8 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 		gtk_grid_attach (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid), _tmp49_, 1, (gint) _tmp50_, 1, 2);
 #line 983 "Properties.c"
 	} else {
-		GtkWidget* _tmp51_ = NULL;
-		guint _tmp52_ = 0U;
+		GtkWidget* _tmp51_;
+		guint _tmp52_;
 #line 59 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp51_ = info;
 #line 59 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1006,44 +1006,44 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* result = NULL;
 	gchar* buffer = NULL;
-	gchar* _tmp0_ = NULL;
-	gint buffer_length1 = 0;
-	gint _buffer_size_ = 0;
-	gchar* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	gint buffer_length1;
+	gint _buffer_size_;
+	gchar* _tmp1_;
+	gint _tmp1__length1;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
+#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 1049 "Properties.c"
 }
@@ -1051,17 +1051,17 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_ = 0L;
-	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 1067 "Properties.c"
 }
@@ -1070,41 +1070,41 @@ static gchar string_get (const gchar* self, glong index) {
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 1090 "Properties.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 1098 "Properties.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 1110 "Properties.c"
 	}
@@ -1115,121 +1115,121 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 1134 "Properties.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 1140 "Properties.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 1144 "Properties.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 1148 "Properties.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 1160 "Properties.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 1170 "Properties.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 1176 "Properties.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 1190 "Properties.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 1200 "Properties.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 1206 "Properties.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 1215 "Properties.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 1235 "Properties.c"
 }
@@ -1238,12 +1238,12 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 gchar* properties_get_prettyprint_time (Properties* self, struct tm* time) {
 	gchar* result = NULL;
 	gchar* timestring = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar _tmp5_ = '\0';
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar _tmp5_;
 #line 65 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_val_if_fail (IS_PROPERTIES (self), NULL);
 #line 65 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1267,8 +1267,8 @@ gchar* properties_get_prettyprint_time (Properties* self, struct tm* time) {
 #line 68 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp5_ == '0') {
 #line 1270 "Properties.c"
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 69 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp6_ = timestring;
 #line 69 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1290,12 +1290,12 @@ gchar* properties_get_prettyprint_time (Properties* self, struct tm* time) {
 gchar* properties_get_prettyprint_time_with_seconds (Properties* self, struct tm* time) {
 	gchar* result = NULL;
 	gchar* timestring = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar _tmp5_ = '\0';
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar _tmp5_;
 #line 74 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_val_if_fail (IS_PROPERTIES (self), NULL);
 #line 74 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1319,8 +1319,8 @@ gchar* properties_get_prettyprint_time_with_seconds (Properties* self, struct tm
 #line 77 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp5_ == '0') {
 #line 1322 "Properties.c"
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 78 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp6_ = timestring;
 #line 78 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1342,13 +1342,13 @@ gchar* properties_get_prettyprint_time_with_seconds (Properties* self, struct tm
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return;
 #line 1354 "Properties.c"
 }
@@ -1358,13 +1358,13 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) {
 	gchar* result = NULL;
 	gchar* date_string = NULL;
 	struct tm today = {0};
-	time_t _tmp0_ = 0;
+	time_t _tmp0_;
 	struct tm _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-	struct tm _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	struct tm _tmp5_ = {0};
-	gint _tmp6_ = 0;
+	struct tm _tmp3_;
+	gint _tmp4_;
+	struct tm _tmp5_;
+	gint _tmp6_;
 #line 83 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_val_if_fail (IS_PROPERTIES (self), NULL);
 #line 83 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1388,10 +1388,10 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) {
 #line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp4_ == _tmp6_) {
 #line 1391 "Properties.c"
-		struct tm _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		struct tm _tmp9_ = {0};
-		gint _tmp10_ = 0;
+		struct tm _tmp7_;
+		gint _tmp8_;
+		struct tm _tmp9_;
+		gint _tmp10_;
 #line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp7_ = *date;
 #line 86 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1411,94 +1411,88 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) {
 #line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp2_) {
 #line 1414 "Properties.c"
-		const gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-#line 87 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp11_ = _ ("Today");
+		gchar* _tmp11_;
 #line 87 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp12_ = g_strdup (_tmp11_);
+		_tmp11_ = g_strdup (_ ("Today"));
 #line 87 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (date_string);
 #line 87 "/home/jens/Source/shotwell/src/Properties.vala"
-		date_string = _tmp12_;
-#line 1425 "Properties.c"
+		date_string = _tmp11_;
+#line 1422 "Properties.c"
 	} else {
-		gboolean _tmp13_ = FALSE;
-		struct tm _tmp14_ = {0};
-		gint _tmp15_ = 0;
-		struct tm _tmp16_ = {0};
-		gint _tmp17_ = 0;
+		gboolean _tmp12_ = FALSE;
+		struct tm _tmp13_;
+		gint _tmp14_;
+		struct tm _tmp15_;
+		gint _tmp16_;
 #line 88 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp14_ = *date;
+		_tmp13_ = *date;
 #line 88 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp15_ = _tmp14_.tm_yday;
+		_tmp14_ = _tmp13_.tm_yday;
 #line 88 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp16_ = today;
+		_tmp15_ = today;
 #line 88 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp17_ = _tmp16_.tm_yday;
+		_tmp16_ = _tmp15_.tm_yday;
 #line 88 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp15_ == (_tmp17_ - 1)) {
-#line 1442 "Properties.c"
-			struct tm _tmp18_ = {0};
-			gint _tmp19_ = 0;
-			struct tm _tmp20_ = {0};
-			gint _tmp21_ = 0;
+		if (_tmp14_ == (_tmp16_ - 1)) {
+#line 1439 "Properties.c"
+			struct tm _tmp17_;
+			gint _tmp18_;
+			struct tm _tmp19_;
+			gint _tmp20_;
 #line 88 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp18_ = *date;
+			_tmp17_ = *date;
 #line 88 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp19_ = _tmp18_.tm_year;
+			_tmp18_ = _tmp17_.tm_year;
 #line 88 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp20_ = today;
+			_tmp19_ = today;
 #line 88 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp21_ = _tmp20_.tm_year;
+			_tmp20_ = _tmp19_.tm_year;
 #line 88 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp13_ = _tmp19_ == _tmp21_;
-#line 1457 "Properties.c"
+			_tmp12_ = _tmp18_ == _tmp20_;
+#line 1454 "Properties.c"
 		} else {
 #line 88 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp13_ = FALSE;
-#line 1461 "Properties.c"
+			_tmp12_ = FALSE;
+#line 1458 "Properties.c"
 		}
 #line 88 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp13_) {
-#line 1465 "Properties.c"
-			const gchar* _tmp22_ = NULL;
-			gchar* _tmp23_ = NULL;
+		if (_tmp12_) {
+#line 1462 "Properties.c"
+			gchar* _tmp21_;
 #line 89 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp22_ = _ ("Yesterday");
-#line 89 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp23_ = g_strdup (_tmp22_);
+			_tmp21_ = g_strdup (_ ("Yesterday"));
 #line 89 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (date_string);
 #line 89 "/home/jens/Source/shotwell/src/Properties.vala"
-			date_string = _tmp23_;
-#line 1476 "Properties.c"
+			date_string = _tmp21_;
+#line 1470 "Properties.c"
 		} else {
-			struct tm _tmp24_ = {0};
-			gchar* _tmp25_ = NULL;
+			struct tm _tmp22_;
+			gchar* _tmp23_;
 #line 91 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp24_ = *date;
+			_tmp22_ = *date;
 #line 91 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp25_ = format_local_date (&_tmp24_);
+			_tmp23_ = format_local_date (&_tmp22_);
 #line 91 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (date_string);
 #line 91 "/home/jens/Source/shotwell/src/Properties.vala"
-			date_string = _tmp25_;
-#line 1488 "Properties.c"
+			date_string = _tmp23_;
+#line 1482 "Properties.c"
 		}
 	}
 #line 94 "/home/jens/Source/shotwell/src/Properties.vala"
 	result = date_string;
 #line 94 "/home/jens/Source/shotwell/src/Properties.vala"
 	return result;
-#line 1495 "Properties.c"
+#line 1489 "Properties.c"
 }
 
 
 static void properties_real_get_single_properties (Properties* self, DataView* view) {
 #line 97 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_DATA_VIEW (view));
-#line 1502 "Properties.c"
+#line 1496 "Properties.c"
 }
 
 
@@ -1507,14 +1501,14 @@ void properties_get_single_properties (Properties* self, DataView* view) {
 	g_return_if_fail (IS_PROPERTIES (self));
 #line 97 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_GET_CLASS (self)->get_single_properties (self, view);
-#line 1511 "Properties.c"
+#line 1505 "Properties.c"
 }
 
 
 static void properties_real_get_multiple_properties (Properties* self, GeeIterable* iter) {
 #line 100 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail ((iter == NULL) || GEE_IS_ITERABLE (iter));
-#line 1518 "Properties.c"
+#line 1512 "Properties.c"
 }
 
 
@@ -1523,23 +1517,23 @@ void properties_get_multiple_properties (Properties* self, GeeIterable* iter) {
 	g_return_if_fail (IS_PROPERTIES (self));
 #line 100 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_GET_CLASS (self)->get_multiple_properties (self, iter);
-#line 1527 "Properties.c"
+#line 1521 "Properties.c"
 }
 
 
 static void properties_real_get_properties (Properties* self, Page* current_page) {
 	ViewCollection* view = NULL;
-	Page* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
+	Page* _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
 	gint count = 0;
-	ViewCollection* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	ViewCollection* _tmp3_;
+	gint _tmp4_;
 	GeeIterable* iter = NULL;
-	gint _tmp5_ = 0;
+	gint _tmp5_;
 	gboolean _tmp12_ = FALSE;
-	GeeIterable* _tmp13_ = NULL;
-	gint _tmp15_ = 0;
+	GeeIterable* _tmp13_;
+	gint _tmp15_;
 #line 103 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PAGE (current_page));
 #line 104 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1556,7 +1550,7 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 		_data_collection_unref0 (view);
 #line 106 "/home/jens/Source/shotwell/src/Properties.vala"
 		return;
-#line 1560 "Properties.c"
+#line 1554 "Properties.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp3_ = view;
@@ -1570,9 +1564,9 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 	_tmp5_ = count;
 #line 111 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp5_ != 0) {
-#line 1574 "Properties.c"
-		ViewCollection* _tmp6_ = NULL;
-		GeeList* _tmp7_ = NULL;
+#line 1568 "Properties.c"
+		ViewCollection* _tmp6_;
+		GeeList* _tmp7_;
 #line 112 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp6_ = view;
 #line 112 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1581,12 +1575,12 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 		_g_object_unref0 (iter);
 #line 112 "/home/jens/Source/shotwell/src/Properties.vala"
 		iter = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable);
-#line 1585 "Properties.c"
+#line 1579 "Properties.c"
 	} else {
-		ViewCollection* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		ViewCollection* _tmp10_ = NULL;
-		GeeCollection* _tmp11_ = NULL;
+		ViewCollection* _tmp8_;
+		gint _tmp9_;
+		ViewCollection* _tmp10_;
+		GeeCollection* _tmp11_;
 #line 114 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp8_ = view;
 #line 114 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1601,7 +1595,7 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 		_g_object_unref0 (iter);
 #line 115 "/home/jens/Source/shotwell/src/Properties.vala"
 		iter = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable);
-#line 1605 "Properties.c"
+#line 1599 "Properties.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp13_ = iter;
@@ -1609,14 +1603,14 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 	if (_tmp13_ == NULL) {
 #line 118 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp12_ = TRUE;
-#line 1613 "Properties.c"
+#line 1607 "Properties.c"
 	} else {
-		gint _tmp14_ = 0;
+		gint _tmp14_;
 #line 118 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp14_ = count;
 #line 118 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp12_ = _tmp14_ == 0;
-#line 1620 "Properties.c"
+#line 1614 "Properties.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp12_) {
@@ -1626,17 +1620,17 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 		_data_collection_unref0 (view);
 #line 119 "/home/jens/Source/shotwell/src/Properties.vala"
 		return;
-#line 1630 "Properties.c"
+#line 1624 "Properties.c"
 	}
 #line 121 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp15_ = count;
 #line 121 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp15_ == 1) {
-#line 1636 "Properties.c"
+#line 1630 "Properties.c"
 		{
 			GeeIterator* _item_it = NULL;
-			GeeIterable* _tmp16_ = NULL;
-			GeeIterator* _tmp17_ = NULL;
+			GeeIterable* _tmp16_;
+			GeeIterator* _tmp17_;
 #line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp16_ = iter;
 #line 122 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1645,13 +1639,13 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 			_item_it = _tmp17_;
 #line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 			while (TRUE) {
-#line 1649 "Properties.c"
-				GeeIterator* _tmp18_ = NULL;
-				gboolean _tmp19_ = FALSE;
+#line 1643 "Properties.c"
+				GeeIterator* _tmp18_;
+				gboolean _tmp19_;
 				DataView* item = NULL;
-				GeeIterator* _tmp20_ = NULL;
-				gpointer _tmp21_ = NULL;
-				DataView* _tmp22_ = NULL;
+				GeeIterator* _tmp20_;
+				gpointer _tmp21_;
+				DataView* _tmp22_;
 #line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp18_ = _item_it;
 #line 122 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1660,7 +1654,7 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 				if (!_tmp19_) {
 #line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 					break;
-#line 1664 "Properties.c"
+#line 1658 "Properties.c"
 				}
 #line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp20_ = _item_it;
@@ -1676,25 +1670,25 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 				_g_object_unref0 (item);
 #line 124 "/home/jens/Source/shotwell/src/Properties.vala"
 				break;
-#line 1680 "Properties.c"
+#line 1674 "Properties.c"
 			}
 #line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (_item_it);
-#line 1684 "Properties.c"
+#line 1678 "Properties.c"
 		}
 	} else {
-		GeeIterable* _tmp23_ = NULL;
+		GeeIterable* _tmp23_;
 #line 127 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp23_ = iter;
 #line 127 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_get_multiple_properties (self, _tmp23_);
-#line 1692 "Properties.c"
+#line 1686 "Properties.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (iter);
 #line 103 "/home/jens/Source/shotwell/src/Properties.vala"
 	_data_collection_unref0 (view);
-#line 1698 "Properties.c"
+#line 1692 "Properties.c"
 }
 
 
@@ -1703,15 +1697,15 @@ void properties_get_properties (Properties* self, Page* current_page) {
 	g_return_if_fail (IS_PROPERTIES (self));
 #line 103 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_GET_CLASS (self)->get_properties (self, current_page);
-#line 1707 "Properties.c"
+#line 1701 "Properties.c"
 }
 
 
 static void properties_real_clear_properties (Properties* self) {
-	GList* _tmp0_ = NULL;
+	GList* _tmp0_;
 #line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer));
-#line 1715 "Properties.c"
+#line 1709 "Properties.c"
 	{
 		GList* child_collection = NULL;
 		GList* child_it = NULL;
@@ -1719,32 +1713,32 @@ static void properties_real_clear_properties (Properties* self) {
 		child_collection = _tmp0_;
 #line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 		for (child_it = child_collection; child_it != NULL; child_it = child_it->next) {
-#line 1723 "Properties.c"
-			GtkWidget* _tmp1_ = NULL;
+#line 1717 "Properties.c"
+			GtkWidget* _tmp1_;
 			GtkWidget* child = NULL;
 #line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp1_ = _g_object_ref0 ((GtkWidget*) child_it->data);
 #line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 			child = _tmp1_;
-#line 1730 "Properties.c"
+#line 1724 "Properties.c"
 			{
-				GtkWidget* _tmp2_ = NULL;
+				GtkWidget* _tmp2_;
 #line 133 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp2_ = child;
 #line 133 "/home/jens/Source/shotwell/src/Properties.vala"
 				gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), _tmp2_);
 #line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_object_unref0 (child);
-#line 1739 "Properties.c"
+#line 1733 "Properties.c"
 			}
 		}
 #line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_list_free0 (child_collection);
-#line 1744 "Properties.c"
+#line 1738 "Properties.c"
 	}
 #line 135 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->line_count = (guint) 0;
-#line 1748 "Properties.c"
+#line 1742 "Properties.c"
 }
 
 
@@ -1753,12 +1747,12 @@ void properties_clear_properties (Properties* self) {
 	g_return_if_fail (IS_PROPERTIES (self));
 #line 131 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_GET_CLASS (self)->clear_properties (self);
-#line 1757 "Properties.c"
+#line 1751 "Properties.c"
 }
 
 
 void properties_update_properties (Properties* self, Page* page) {
-	Page* _tmp0_ = NULL;
+	Page* _tmp0_;
 #line 138 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PROPERTIES (self));
 #line 138 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1771,19 +1765,19 @@ void properties_update_properties (Properties* self, Page* page) {
 	properties_internal_update_properties (self, _tmp0_);
 #line 141 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1775 "Properties.c"
+#line 1769 "Properties.c"
 }
 
 
 static void properties_real_internal_update_properties (Properties* self, Page* page) {
-	Page* _tmp0_ = NULL;
+	Page* _tmp0_;
 #line 144 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PAGE (page));
 #line 145 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = page;
 #line 145 "/home/jens/Source/shotwell/src/Properties.vala"
 	properties_get_properties (self, _tmp0_);
-#line 1787 "Properties.c"
+#line 1781 "Properties.c"
 }
 
 
@@ -1792,17 +1786,17 @@ void properties_internal_update_properties (Properties* self, Page* page) {
 	g_return_if_fail (IS_PROPERTIES (self));
 #line 144 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_GET_CLASS (self)->internal_update_properties (self, page);
-#line 1796 "Properties.c"
+#line 1790 "Properties.c"
 }
 
 
 void properties_unselect_text (Properties* self) {
-	GList* _tmp0_ = NULL;
+	GList* _tmp0_;
 #line 148 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PROPERTIES (self));
 #line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer));
-#line 1806 "Properties.c"
+#line 1800 "Properties.c"
 	{
 		GList* child_collection = NULL;
 		GList* child_it = NULL;
@@ -1810,36 +1804,36 @@ void properties_unselect_text (Properties* self) {
 		child_collection = _tmp0_;
 #line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 		for (child_it = child_collection; child_it != NULL; child_it = child_it->next) {
-#line 1814 "Properties.c"
-			GtkWidget* _tmp1_ = NULL;
+#line 1808 "Properties.c"
+			GtkWidget* _tmp1_;
 			GtkWidget* child = NULL;
 #line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp1_ = _g_object_ref0 ((GtkWidget*) child_it->data);
 #line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 			child = _tmp1_;
-#line 1821 "Properties.c"
+#line 1815 "Properties.c"
 			{
-				GtkWidget* _tmp2_ = NULL;
+				GtkWidget* _tmp2_;
 #line 150 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp2_ = child;
 #line 150 "/home/jens/Source/shotwell/src/Properties.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_label_get_type ())) {
-#line 1828 "Properties.c"
-					GtkWidget* _tmp3_ = NULL;
+#line 1822 "Properties.c"
+					GtkWidget* _tmp3_;
 #line 151 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp3_ = child;
 #line 151 "/home/jens/Source/shotwell/src/Properties.vala"
 					gtk_label_select_region (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_label_get_type (), GtkLabel), 0, 0);
-#line 1834 "Properties.c"
+#line 1828 "Properties.c"
 				}
 #line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_object_unref0 (child);
-#line 1838 "Properties.c"
+#line 1832 "Properties.c"
 			}
 		}
 #line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_list_free0 (child_collection);
-#line 1843 "Properties.c"
+#line 1837 "Properties.c"
 	}
 }
 
@@ -1850,18 +1844,18 @@ static void properties_class_init (PropertiesClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_type_class_add_private (klass, sizeof (PropertiesPrivate));
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->get_single_properties = (void (*)(Properties*, DataView*)) properties_real_get_single_properties;
+	((PropertiesClass *) klass)->get_single_properties = (void (*) (Properties *, DataView*)) properties_real_get_single_properties;
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->get_multiple_properties = (void (*)(Properties*, GeeIterable*)) properties_real_get_multiple_properties;
+	((PropertiesClass *) klass)->get_multiple_properties = (void (*) (Properties *, GeeIterable*)) properties_real_get_multiple_properties;
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->get_properties = (void (*)(Properties*, Page*)) properties_real_get_properties;
+	((PropertiesClass *) klass)->get_properties = (void (*) (Properties *, Page*)) properties_real_get_properties;
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->clear_properties = (void (*)(Properties*)) properties_real_clear_properties;
+	((PropertiesClass *) klass)->clear_properties = (void (*) (Properties *)) properties_real_clear_properties;
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->internal_update_properties = (void (*)(Properties*, Page*)) properties_real_internal_update_properties;
+	((PropertiesClass *) klass)->internal_update_properties = (void (*) (Properties *, Page*)) properties_real_internal_update_properties;
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (klass)->finalize = properties_finalize;
-#line 1865 "Properties.c"
+#line 1859 "Properties.c"
 }
 
 
@@ -1870,17 +1864,17 @@ static void properties_instance_init (Properties * self) {
 	self->priv = PROPERTIES_GET_PRIVATE (self);
 #line 8 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->line_count = (guint) 0;
-#line 1874 "Properties.c"
+#line 1868 "Properties.c"
 }
 
 
-static void properties_finalize (GObject* obj) {
+static void properties_finalize (GObject * obj) {
 	Properties * self;
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROPERTIES, Properties);
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (properties_parent_class)->finalize (obj);
-#line 1884 "Properties.c"
+#line 1878 "Properties.c"
 }
 
 
@@ -1902,25 +1896,25 @@ BasicProperties* basic_properties_construct (GType object_type) {
 	self = (BasicProperties*) properties_construct (object_type);
 #line 171 "/home/jens/Source/shotwell/src/Properties.vala"
 	return self;
-#line 1906 "Properties.c"
+#line 1900 "Properties.c"
 }
 
 
 BasicProperties* basic_properties_new (void) {
 #line 171 "/home/jens/Source/shotwell/src/Properties.vala"
 	return basic_properties_construct (TYPE_BASIC_PROPERTIES);
-#line 1913 "Properties.c"
+#line 1907 "Properties.c"
 }
 
 
 static void basic_properties_real_clear_properties (Properties* base) {
 	BasicProperties * self;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 174 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BASIC_PROPERTIES, BasicProperties);
 #line 175 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1975,27 +1969,27 @@ static void basic_properties_real_clear_properties (Properties* base) {
 	_g_free0 (self->priv->raw_assoc);
 #line 188 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->raw_assoc = _tmp5_;
-#line 1979 "Properties.c"
+#line 1973 "Properties.c"
 }
 
 
 static gpointer _media_metadata_ref0 (gpointer self) {
 #line 203 "/home/jens/Source/shotwell/src/Properties.vala"
 	return self ? media_metadata_ref (self) : NULL;
-#line 1986 "Properties.c"
+#line 1980 "Properties.c"
 }
 
 
 static void basic_properties_real_get_single_properties (Properties* base, DataView* view) {
 	BasicProperties * self;
-	DataView* _tmp0_ = NULL;
+	DataView* _tmp0_;
 	DataSource* source = NULL;
-	DataView* _tmp1_ = NULL;
-	DataSource* _tmp2_ = NULL;
-	DataSource* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	DataView* _tmp1_;
+	DataSource* _tmp2_;
+	DataSource* _tmp3_;
+	gchar* _tmp4_;
 	gboolean _tmp5_ = FALSE;
-	DataSource* _tmp6_ = NULL;
+	DataSource* _tmp6_;
 #line 191 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BASIC_PROPERTIES, BasicProperties);
 #line 191 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2024,53 +2018,53 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_PHOTO_SOURCE)) {
 #line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp5_ = TRUE;
-#line 2028 "Properties.c"
+#line 2022 "Properties.c"
 	} else {
-		DataSource* _tmp7_ = NULL;
+		DataSource* _tmp7_;
 #line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp7_ = source;
 #line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_PHOTO_IMPORT_SOURCE);
-#line 2035 "Properties.c"
+#line 2029 "Properties.c"
 	}
 #line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp5_) {
-#line 2039 "Properties.c"
+#line 2033 "Properties.c"
 		time_t _tmp8_ = 0;
-		DataSource* _tmp9_ = NULL;
-		time_t _tmp14_ = 0;
+		DataSource* _tmp9_;
+		time_t _tmp14_;
 		PhotoMetadata* _tmp15_ = NULL;
-		DataSource* _tmp16_ = NULL;
+		DataSource* _tmp16_;
 		PhotoMetadata* metadata = NULL;
-		PhotoMetadata* _tmp21_ = NULL;
-		PhotoMetadata* _tmp22_ = NULL;
-		DataSource* _tmp47_ = NULL;
+		PhotoMetadata* _tmp21_;
+		PhotoMetadata* _tmp22_;
+		DataSource* _tmp47_;
 		gboolean _tmp50_ = FALSE;
-		DataSource* _tmp51_ = NULL;
+		DataSource* _tmp51_;
 #line 199 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp9_ = source;
 #line 199 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_SOURCE)) {
-#line 2055 "Properties.c"
-			DataSource* _tmp10_ = NULL;
-			time_t _tmp11_ = 0;
+#line 2049 "Properties.c"
+			DataSource* _tmp10_;
+			time_t _tmp11_;
 #line 199 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp10_ = source;
 #line 199 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp11_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_MEDIA_SOURCE, MediaSource));
 #line 199 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp8_ = _tmp11_;
-#line 2064 "Properties.c"
+#line 2058 "Properties.c"
 		} else {
-			DataSource* _tmp12_ = NULL;
-			time_t _tmp13_ = 0;
+			DataSource* _tmp12_;
+			time_t _tmp13_;
 #line 200 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp12_ = source;
 #line 200 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp13_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource), TYPE_IMPORT_SOURCE, ImportSource));
 #line 200 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp8_ = _tmp13_;
-#line 2074 "Properties.c"
+#line 2068 "Properties.c"
 		}
 #line 199 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->start_time = _tmp8_;
@@ -2082,9 +2076,9 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 		_tmp16_ = source;
 #line 203 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_PHOTO_SOURCE)) {
-#line 2086 "Properties.c"
-			DataSource* _tmp17_ = NULL;
-			PhotoMetadata* _tmp18_ = NULL;
+#line 2080 "Properties.c"
+			DataSource* _tmp17_;
+			PhotoMetadata* _tmp18_;
 #line 203 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp17_ = source;
 #line 203 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2093,10 +2087,10 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			_media_metadata_unref0 (_tmp15_);
 #line 203 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp15_ = _tmp18_;
-#line 2097 "Properties.c"
+#line 2091 "Properties.c"
 		} else {
-			DataSource* _tmp19_ = NULL;
-			PhotoMetadata* _tmp20_ = NULL;
+			DataSource* _tmp19_;
+			PhotoMetadata* _tmp20_;
 #line 204 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp19_ = source;
 #line 204 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2105,7 +2099,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			_media_metadata_unref0 (_tmp15_);
 #line 204 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp15_ = _tmp20_;
-#line 2109 "Properties.c"
+#line 2103 "Properties.c"
 		}
 #line 203 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp21_ = _media_metadata_ref0 (_tmp15_);
@@ -2115,21 +2109,21 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 		_tmp22_ = metadata;
 #line 206 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp22_ != NULL) {
-#line 2119 "Properties.c"
-			PhotoMetadata* _tmp23_ = NULL;
-			gchar* _tmp24_ = NULL;
-			const gchar* _tmp25_ = NULL;
-			PhotoMetadata* _tmp27_ = NULL;
-			gchar* _tmp28_ = NULL;
-			const gchar* _tmp29_ = NULL;
-			PhotoMetadata* _tmp31_ = NULL;
-			gchar* _tmp32_ = NULL;
-			const gchar* _tmp33_ = NULL;
+#line 2113 "Properties.c"
+			PhotoMetadata* _tmp23_;
+			gchar* _tmp24_;
+			const gchar* _tmp25_;
+			PhotoMetadata* _tmp27_;
+			gchar* _tmp28_;
+			const gchar* _tmp29_;
+			PhotoMetadata* _tmp31_;
+			gchar* _tmp32_;
+			const gchar* _tmp33_;
 			Dimensions _tmp35_ = {0};
-			PhotoMetadata* _tmp36_ = NULL;
-			Dimensions* _tmp37_ = NULL;
-			Dimensions* _tmp38_ = NULL;
-			gboolean _tmp39_ = FALSE;
+			PhotoMetadata* _tmp36_;
+			Dimensions* _tmp37_;
+			Dimensions* _tmp38_;
+			gboolean _tmp39_;
 #line 207 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp23_ = metadata;
 #line 207 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2142,15 +2136,15 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			_tmp25_ = self->priv->exposure;
 #line 208 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp25_ == NULL) {
-#line 2146 "Properties.c"
-				gchar* _tmp26_ = NULL;
+#line 2140 "Properties.c"
+				gchar* _tmp26_;
 #line 209 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp26_ = g_strdup ("");
 #line 209 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (self->priv->exposure);
 #line 209 "/home/jens/Source/shotwell/src/Properties.vala"
 				self->priv->exposure = _tmp26_;
-#line 2154 "Properties.c"
+#line 2148 "Properties.c"
 			}
 #line 211 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp27_ = metadata;
@@ -2164,15 +2158,15 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			_tmp29_ = self->priv->aperture;
 #line 212 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp29_ == NULL) {
-#line 2168 "Properties.c"
-				gchar* _tmp30_ = NULL;
+#line 2162 "Properties.c"
+				gchar* _tmp30_;
 #line 213 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp30_ = g_strdup ("");
 #line 213 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (self->priv->aperture);
 #line 213 "/home/jens/Source/shotwell/src/Properties.vala"
 				self->priv->aperture = _tmp30_;
-#line 2176 "Properties.c"
+#line 2170 "Properties.c"
 			}
 #line 215 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp31_ = metadata;
@@ -2186,15 +2180,15 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			_tmp33_ = self->priv->iso;
 #line 216 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp33_ == NULL) {
-#line 2190 "Properties.c"
-				gchar* _tmp34_ = NULL;
+#line 2184 "Properties.c"
+				gchar* _tmp34_;
 #line 217 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp34_ = g_strdup ("");
 #line 217 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (self->priv->iso);
 #line 217 "/home/jens/Source/shotwell/src/Properties.vala"
 				self->priv->iso = _tmp34_;
-#line 2198 "Properties.c"
+#line 2192 "Properties.c"
 			}
 #line 219 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp36_ = metadata;
@@ -2208,13 +2202,13 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			_dimensions_free0 (_tmp38_);
 #line 219 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp39_) {
-#line 2212 "Properties.c"
-				PhotoMetadata* _tmp40_ = NULL;
-				Orientation _tmp41_ = 0;
-				PhotoMetadata* _tmp42_ = NULL;
-				Dimensions* _tmp43_ = NULL;
-				Dimensions* _tmp44_ = NULL;
-				Dimensions _tmp45_ = {0};
+#line 2206 "Properties.c"
+				PhotoMetadata* _tmp40_;
+				Orientation _tmp41_;
+				PhotoMetadata* _tmp42_;
+				Dimensions* _tmp43_;
+				Dimensions* _tmp44_;
+				Dimensions _tmp45_;
 				Dimensions _tmp46_ = {0};
 #line 220 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp40_ = metadata;
@@ -2234,22 +2228,22 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 				_tmp35_ = _tmp46_;
 #line 220 "/home/jens/Source/shotwell/src/Properties.vala"
 				_dimensions_free0 (_tmp44_);
-#line 2238 "Properties.c"
+#line 2232 "Properties.c"
 			} else {
 #line 221 "/home/jens/Source/shotwell/src/Properties.vala"
 				dimensions_init (&_tmp35_, 0, 0);
-#line 2242 "Properties.c"
+#line 2236 "Properties.c"
 			}
 #line 219 "/home/jens/Source/shotwell/src/Properties.vala"
 			self->priv->dimensions = _tmp35_;
-#line 2246 "Properties.c"
+#line 2240 "Properties.c"
 		}
 #line 224 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp47_ = source;
 #line 224 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, TYPE_PHOTO_SOURCE)) {
-#line 2252 "Properties.c"
-			DataSource* _tmp48_ = NULL;
+#line 2246 "Properties.c"
+			DataSource* _tmp48_;
 			Dimensions _tmp49_ = {0};
 #line 225 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp48_ = source;
@@ -2257,40 +2251,40 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp49_);
 #line 225 "/home/jens/Source/shotwell/src/Properties.vala"
 			self->priv->dimensions = _tmp49_;
-#line 2261 "Properties.c"
+#line 2255 "Properties.c"
 		}
 #line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp51_ = source;
 #line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp51_, TYPE_PHOTO)) {
-#line 2267 "Properties.c"
-			DataSource* _tmp52_ = NULL;
-			PhotoFileFormat _tmp53_ = 0;
+#line 2261 "Properties.c"
+			DataSource* _tmp52_;
+			PhotoFileFormat _tmp53_;
 #line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp52_ = source;
 #line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp53_ = photo_get_master_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_PHOTO, Photo));
 #line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp50_ = _tmp53_ == PHOTO_FILE_FORMAT_RAW;
-#line 2276 "Properties.c"
+#line 2270 "Properties.c"
 		} else {
 #line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp50_ = FALSE;
-#line 2280 "Properties.c"
+#line 2274 "Properties.c"
 		}
 #line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp50_) {
-#line 2284 "Properties.c"
+#line 2278 "Properties.c"
 			Photo* photo = NULL;
-			DataSource* _tmp54_ = NULL;
-			Photo* _tmp55_ = NULL;
-			Photo* _tmp56_ = NULL;
-			RawDeveloper _tmp57_ = 0;
-			gchar* _tmp58_ = NULL;
+			DataSource* _tmp54_;
+			Photo* _tmp55_;
+			Photo* _tmp56_;
+			RawDeveloper _tmp57_;
+			gchar* _tmp58_;
 			const gchar* _tmp59_ = NULL;
-			Photo* _tmp60_ = NULL;
-			gboolean _tmp61_ = FALSE;
-			gchar* _tmp63_ = NULL;
+			Photo* _tmp60_;
+			gboolean _tmp61_;
+			gchar* _tmp62_;
 #line 228 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp54_ = source;
 #line 228 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2313,202 +2307,198 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			_tmp61_ = photo_is_raw_developer_available (_tmp60_, RAW_DEVELOPER_CAMERA);
 #line 230 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp61_) {
-#line 2317 "Properties.c"
-				const gchar* _tmp62_ = NULL;
 #line 230 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp62_ = _ ("RAW+JPEG");
-#line 230 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp59_ = _tmp62_;
-#line 2323 "Properties.c"
+				_tmp59_ = _ ("RAW+JPEG");
+#line 2313 "Properties.c"
 			} else {
 #line 230 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp59_ = "";
-#line 2327 "Properties.c"
+#line 2317 "Properties.c"
 			}
 #line 230 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp63_ = g_strdup (_tmp59_);
+			_tmp62_ = g_strdup (_tmp59_);
 #line 230 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (self->priv->raw_assoc);
 #line 230 "/home/jens/Source/shotwell/src/Properties.vala"
-			self->priv->raw_assoc = _tmp63_;
+			self->priv->raw_assoc = _tmp62_;
 #line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (photo);
-#line 2337 "Properties.c"
+#line 2327 "Properties.c"
 		}
 #line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 		_media_metadata_unref0 (metadata);
 #line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 		_media_metadata_unref0 (_tmp15_);
-#line 2343 "Properties.c"
+#line 2333 "Properties.c"
 	} else {
-		DataSource* _tmp64_ = NULL;
+		DataSource* _tmp63_;
 #line 232 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp64_ = source;
+		_tmp63_ = source;
 #line 232 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp64_, TYPE_EVENT_SOURCE)) {
-#line 2350 "Properties.c"
+		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp63_, TYPE_EVENT_SOURCE)) {
+#line 2340 "Properties.c"
 			EventSource* event_source = NULL;
-			DataSource* _tmp65_ = NULL;
-			EventSource* _tmp66_ = NULL;
-			EventSource* _tmp67_ = NULL;
-			time_t _tmp68_ = 0;
-			EventSource* _tmp69_ = NULL;
-			time_t _tmp70_ = 0;
+			DataSource* _tmp64_;
+			EventSource* _tmp65_;
+			EventSource* _tmp66_;
+			time_t _tmp67_;
+			EventSource* _tmp68_;
+			time_t _tmp69_;
 			gint event_photo_count = 0;
 			gint event_video_count = 0;
-			EventSource* _tmp71_ = NULL;
-			GeeCollection* _tmp72_ = NULL;
-			GeeCollection* _tmp73_ = NULL;
+			EventSource* _tmp70_;
+			GeeCollection* _tmp71_;
+			GeeCollection* _tmp72_;
+			gint _tmp73_ = 0;
 			gint _tmp74_ = 0;
-			gint _tmp75_ = 0;
-			gint _tmp76_ = 0;
-			gint _tmp77_ = 0;
+			gint _tmp75_;
+			gint _tmp76_;
 #line 233 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp65_ = source;
+			_tmp64_ = source;
 #line 233 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp66_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_EVENT_SOURCE, EventSource));
+			_tmp65_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_EVENT_SOURCE, EventSource));
 #line 233 "/home/jens/Source/shotwell/src/Properties.vala"
-			event_source = _tmp66_;
+			event_source = _tmp65_;
 #line 235 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp67_ = event_source;
+			_tmp66_ = event_source;
 #line 235 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp68_ = event_source_get_start_time (_tmp67_);
+			_tmp67_ = event_source_get_start_time (_tmp66_);
 #line 235 "/home/jens/Source/shotwell/src/Properties.vala"
-			self->priv->start_time = _tmp68_;
+			self->priv->start_time = _tmp67_;
 #line 236 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp69_ = event_source;
+			_tmp68_ = event_source;
 #line 236 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp70_ = event_source_get_end_time (_tmp69_);
+			_tmp69_ = event_source_get_end_time (_tmp68_);
 #line 236 "/home/jens/Source/shotwell/src/Properties.vala"
-			self->priv->end_time = _tmp70_;
+			self->priv->end_time = _tmp69_;
 #line 240 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp71_ = event_source;
+			_tmp70_ = event_source;
 #line 240 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp72_ = event_source_get_media (_tmp71_);
+			_tmp71_ = event_source_get_media (_tmp70_);
 #line 240 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp73_ = _tmp72_;
+			_tmp72_ = _tmp71_;
 #line 240 "/home/jens/Source/shotwell/src/Properties.vala"
-			media_source_collection_count_media (_tmp73_, &_tmp74_, &_tmp75_);
+			media_source_collection_count_media (_tmp72_, &_tmp73_, &_tmp74_);
 #line 240 "/home/jens/Source/shotwell/src/Properties.vala"
-			event_photo_count = _tmp74_;
+			event_photo_count = _tmp73_;
 #line 240 "/home/jens/Source/shotwell/src/Properties.vala"
-			event_video_count = _tmp75_;
+			event_video_count = _tmp74_;
 #line 240 "/home/jens/Source/shotwell/src/Properties.vala"
-			_g_object_unref0 (_tmp73_);
+			_g_object_unref0 (_tmp72_);
 #line 243 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp76_ = event_photo_count;
+			_tmp75_ = event_photo_count;
 #line 243 "/home/jens/Source/shotwell/src/Properties.vala"
-			self->priv->photo_count = _tmp76_;
+			self->priv->photo_count = _tmp75_;
 #line 244 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp77_ = event_video_count;
+			_tmp76_ = event_video_count;
 #line 244 "/home/jens/Source/shotwell/src/Properties.vala"
-			self->priv->video_count = _tmp77_;
+			self->priv->video_count = _tmp76_;
 #line 232 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (event_source);
-#line 2409 "Properties.c"
+#line 2399 "Properties.c"
 		} else {
-			gboolean _tmp78_ = FALSE;
-			DataSource* _tmp79_ = NULL;
+			gboolean _tmp77_ = FALSE;
+			DataSource* _tmp78_;
 #line 245 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp79_ = source;
+			_tmp78_ = source;
 #line 245 "/home/jens/Source/shotwell/src/Properties.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, TYPE_VIDEO_SOURCE)) {
+			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp78_, TYPE_VIDEO_SOURCE)) {
 #line 245 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp78_ = TRUE;
-#line 2419 "Properties.c"
+				_tmp77_ = TRUE;
+#line 2409 "Properties.c"
 			} else {
-				DataSource* _tmp80_ = NULL;
+				DataSource* _tmp79_;
 #line 245 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp80_ = source;
+				_tmp79_ = source;
 #line 245 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp78_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp80_, TYPE_VIDEO_IMPORT_SOURCE);
-#line 2426 "Properties.c"
+				_tmp77_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, TYPE_VIDEO_IMPORT_SOURCE);
+#line 2416 "Properties.c"
 			}
 #line 245 "/home/jens/Source/shotwell/src/Properties.vala"
-			if (_tmp78_) {
-#line 2430 "Properties.c"
-				DataSource* _tmp81_ = NULL;
-				time_t _tmp94_ = 0;
+			if (_tmp77_) {
+#line 2420 "Properties.c"
+				DataSource* _tmp80_;
+				time_t _tmp93_;
 #line 246 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp81_ = source;
+				_tmp80_ = source;
 #line 246 "/home/jens/Source/shotwell/src/Properties.vala"
-				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp81_, TYPE_VIDEO_SOURCE)) {
-#line 2437 "Properties.c"
+				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp80_, TYPE_VIDEO_SOURCE)) {
+#line 2427 "Properties.c"
 					Video* video = NULL;
-					DataSource* _tmp82_ = NULL;
-					Video* _tmp83_ = NULL;
-					Video* _tmp84_ = NULL;
-					gdouble _tmp85_ = 0.0;
-					Video* _tmp86_ = NULL;
-					gboolean _tmp87_ = FALSE;
-					Video* _tmp90_ = NULL;
-					time_t _tmp91_ = 0;
+					DataSource* _tmp81_;
+					Video* _tmp82_;
+					Video* _tmp83_;
+					gdouble _tmp84_;
+					Video* _tmp85_;
+					gboolean _tmp86_;
+					Video* _tmp89_;
+					time_t _tmp90_;
 #line 247 "/home/jens/Source/shotwell/src/Properties.vala"
-					_tmp82_ = source;
+					_tmp81_ = source;
 #line 247 "/home/jens/Source/shotwell/src/Properties.vala"
-					_tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_VIDEO, Video));
+					_tmp82_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, TYPE_VIDEO, Video));
 #line 247 "/home/jens/Source/shotwell/src/Properties.vala"
-					video = _tmp83_;
+					video = _tmp82_;
 #line 248 "/home/jens/Source/shotwell/src/Properties.vala"
-					_tmp84_ = video;
+					_tmp83_ = video;
 #line 248 "/home/jens/Source/shotwell/src/Properties.vala"
-					_tmp85_ = video_get_clip_duration (_tmp84_);
+					_tmp84_ = video_get_clip_duration (_tmp83_);
 #line 248 "/home/jens/Source/shotwell/src/Properties.vala"
-					self->priv->clip_duration = _tmp85_;
+					self->priv->clip_duration = _tmp84_;
 #line 250 "/home/jens/Source/shotwell/src/Properties.vala"
-					_tmp86_ = video;
+					_tmp85_ = video;
 #line 250 "/home/jens/Source/shotwell/src/Properties.vala"
-					_tmp87_ = video_get_is_interpretable (_tmp86_);
+					_tmp86_ = video_get_is_interpretable (_tmp85_);
 #line 250 "/home/jens/Source/shotwell/src/Properties.vala"
-					if (_tmp87_) {
-#line 2465 "Properties.c"
-						Video* _tmp88_ = NULL;
-						Dimensions _tmp89_ = {0};
+					if (_tmp86_) {
+#line 2455 "Properties.c"
+						Video* _tmp87_;
+						Dimensions _tmp88_ = {0};
 #line 251 "/home/jens/Source/shotwell/src/Properties.vala"
-						_tmp88_ = video;
+						_tmp87_ = video;
 #line 251 "/home/jens/Source/shotwell/src/Properties.vala"
-						video_get_frame_dimensions (_tmp88_, &_tmp89_);
+						video_get_frame_dimensions (_tmp87_, &_tmp88_);
 #line 251 "/home/jens/Source/shotwell/src/Properties.vala"
-						self->priv->dimensions = _tmp89_;
-#line 2474 "Properties.c"
+						self->priv->dimensions = _tmp88_;
+#line 2464 "Properties.c"
 					}
 #line 253 "/home/jens/Source/shotwell/src/Properties.vala"
-					_tmp90_ = video;
+					_tmp89_ = video;
 #line 253 "/home/jens/Source/shotwell/src/Properties.vala"
-					_tmp91_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_MEDIA_SOURCE, MediaSource));
+					_tmp90_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp89_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 253 "/home/jens/Source/shotwell/src/Properties.vala"
-					self->priv->start_time = _tmp91_;
+					self->priv->start_time = _tmp90_;
 #line 246 "/home/jens/Source/shotwell/src/Properties.vala"
 					_g_object_unref0 (video);
-#line 2484 "Properties.c"
+#line 2474 "Properties.c"
 				} else {
-					DataSource* _tmp92_ = NULL;
-					time_t _tmp93_ = 0;
+					DataSource* _tmp91_;
+					time_t _tmp92_;
 #line 255 "/home/jens/Source/shotwell/src/Properties.vala"
-					_tmp92_ = source;
+					_tmp91_ = source;
 #line 255 "/home/jens/Source/shotwell/src/Properties.vala"
-					_tmp93_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource), TYPE_IMPORT_SOURCE, ImportSource));
+					_tmp92_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource), TYPE_IMPORT_SOURCE, ImportSource));
 #line 255 "/home/jens/Source/shotwell/src/Properties.vala"
-					self->priv->start_time = _tmp93_;
-#line 2494 "Properties.c"
+					self->priv->start_time = _tmp92_;
+#line 2484 "Properties.c"
 				}
 #line 257 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp94_ = self->priv->start_time;
+				_tmp93_ = self->priv->start_time;
 #line 257 "/home/jens/Source/shotwell/src/Properties.vala"
-				self->priv->end_time = _tmp94_;
-#line 2500 "Properties.c"
+				self->priv->end_time = _tmp93_;
+#line 2490 "Properties.c"
 			}
 		}
 	}
 #line 191 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (source);
-#line 2506 "Properties.c"
+#line 2496 "Properties.c"
 }
 
 
 static void basic_properties_real_get_multiple_properties (Properties* base, GeeIterable* iter) {
 	BasicProperties * self;
-	GeeIterable* _tmp0_ = NULL;
+	GeeIterable* _tmp0_;
 #line 261 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BASIC_PROPERTIES, BasicProperties);
 #line 261 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2521,11 +2511,11 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 	self->priv->photo_count = 0;
 #line 265 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->video_count = 0;
-#line 2525 "Properties.c"
+#line 2515 "Properties.c"
 	{
 		GeeIterator* _view_it = NULL;
-		GeeIterable* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeIterable* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp1_ = iter;
 #line 266 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2534,17 +2524,17 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 		_view_it = _tmp2_;
 #line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 		while (TRUE) {
-#line 2538 "Properties.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 2528 "Properties.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			DataView* view = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
 			DataSource* source = NULL;
-			DataView* _tmp7_ = NULL;
-			DataSource* _tmp8_ = NULL;
+			DataView* _tmp7_;
+			DataSource* _tmp8_;
 			gboolean _tmp9_ = FALSE;
-			DataSource* _tmp10_ = NULL;
+			DataSource* _tmp10_;
 #line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp3_ = _view_it;
 #line 266 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2553,7 +2543,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 			if (!_tmp4_) {
 #line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 				break;
-#line 2557 "Properties.c"
+#line 2547 "Properties.c"
 			}
 #line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp5_ = _view_it;
@@ -2573,47 +2563,47 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_PHOTO_SOURCE)) {
 #line 269 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp9_ = TRUE;
-#line 2577 "Properties.c"
+#line 2567 "Properties.c"
 			} else {
-				DataSource* _tmp11_ = NULL;
+				DataSource* _tmp11_;
 #line 269 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp11_ = source;
 #line 269 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_PHOTO_IMPORT_SOURCE);
-#line 2584 "Properties.c"
+#line 2574 "Properties.c"
 			}
 #line 269 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp9_) {
-#line 2588 "Properties.c"
+#line 2578 "Properties.c"
 				time_t _tmp12_ = 0;
-				DataSource* _tmp13_ = NULL;
+				DataSource* _tmp13_;
 				time_t exposure_time = 0;
-				time_t _tmp18_ = 0;
-				gint _tmp29_ = 0;
+				time_t _tmp18_;
+				gint _tmp29_;
 #line 270 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp13_ = source;
 #line 270 "/home/jens/Source/shotwell/src/Properties.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_PHOTO_SOURCE)) {
-#line 2598 "Properties.c"
-					DataSource* _tmp14_ = NULL;
-					time_t _tmp15_ = 0;
+#line 2588 "Properties.c"
+					DataSource* _tmp14_;
+					time_t _tmp15_;
 #line 271 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp14_ = source;
 #line 271 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp15_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_MEDIA_SOURCE, MediaSource));
 #line 271 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp12_ = _tmp15_;
-#line 2607 "Properties.c"
+#line 2597 "Properties.c"
 				} else {
-					DataSource* _tmp16_ = NULL;
-					time_t _tmp17_ = 0;
+					DataSource* _tmp16_;
+					time_t _tmp17_;
 #line 272 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp16_ = source;
 #line 272 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp17_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource), TYPE_IMPORT_SOURCE, ImportSource));
 #line 272 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp12_ = _tmp17_;
-#line 2617 "Properties.c"
+#line 2607 "Properties.c"
 				}
 #line 270 "/home/jens/Source/shotwell/src/Properties.vala"
 				exposure_time = _tmp12_;
@@ -2621,38 +2611,38 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 				_tmp18_ = exposure_time;
 #line 274 "/home/jens/Source/shotwell/src/Properties.vala"
 				if (_tmp18_ != ((time_t) 0)) {
-#line 2625 "Properties.c"
+#line 2615 "Properties.c"
 					gboolean _tmp19_ = FALSE;
-					time_t _tmp20_ = 0;
+					time_t _tmp20_;
 					gboolean _tmp24_ = FALSE;
-					time_t _tmp25_ = 0;
+					time_t _tmp25_;
 #line 275 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp20_ = self->priv->start_time;
 #line 275 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp20_ == ((time_t) 0)) {
 #line 275 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp19_ = TRUE;
-#line 2636 "Properties.c"
+#line 2626 "Properties.c"
 					} else {
-						time_t _tmp21_ = 0;
-						time_t _tmp22_ = 0;
+						time_t _tmp21_;
+						time_t _tmp22_;
 #line 275 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp21_ = exposure_time;
 #line 275 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp22_ = self->priv->start_time;
 #line 275 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp19_ = _tmp21_ < _tmp22_;
-#line 2646 "Properties.c"
+#line 2636 "Properties.c"
 					}
 #line 275 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp19_) {
-#line 2650 "Properties.c"
-						time_t _tmp23_ = 0;
+#line 2640 "Properties.c"
+						time_t _tmp23_;
 #line 276 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp23_ = exposure_time;
 #line 276 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->start_time = _tmp23_;
-#line 2656 "Properties.c"
+#line 2646 "Properties.c"
 					}
 #line 278 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp25_ = self->priv->end_time;
@@ -2660,63 +2650,63 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 					if (_tmp25_ == ((time_t) 0)) {
 #line 278 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp24_ = TRUE;
-#line 2664 "Properties.c"
+#line 2654 "Properties.c"
 					} else {
-						time_t _tmp26_ = 0;
-						time_t _tmp27_ = 0;
+						time_t _tmp26_;
+						time_t _tmp27_;
 #line 278 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp26_ = exposure_time;
 #line 278 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp27_ = self->priv->end_time;
 #line 278 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp24_ = _tmp26_ > _tmp27_;
-#line 2674 "Properties.c"
+#line 2664 "Properties.c"
 					}
 #line 278 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp24_) {
-#line 2678 "Properties.c"
-						time_t _tmp28_ = 0;
+#line 2668 "Properties.c"
+						time_t _tmp28_;
 #line 279 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp28_ = exposure_time;
 #line 279 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->end_time = _tmp28_;
-#line 2684 "Properties.c"
+#line 2674 "Properties.c"
 					}
 				}
 #line 282 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp29_ = self->priv->photo_count;
 #line 282 "/home/jens/Source/shotwell/src/Properties.vala"
 				self->priv->photo_count = _tmp29_ + 1;
-#line 2691 "Properties.c"
+#line 2681 "Properties.c"
 			} else {
-				DataSource* _tmp30_ = NULL;
+				DataSource* _tmp30_;
 #line 283 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp30_ = source;
 #line 283 "/home/jens/Source/shotwell/src/Properties.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_EVENT_SOURCE)) {
-#line 2698 "Properties.c"
+#line 2688 "Properties.c"
 					EventSource* event_source = NULL;
-					DataSource* _tmp31_ = NULL;
-					EventSource* _tmp32_ = NULL;
-					gint _tmp33_ = 0;
+					DataSource* _tmp31_;
+					EventSource* _tmp32_;
+					gint _tmp33_;
 					gboolean _tmp34_ = FALSE;
 					gboolean _tmp35_ = FALSE;
-					time_t _tmp36_ = 0;
+					time_t _tmp36_;
 					gboolean _tmp44_ = FALSE;
 					gboolean _tmp45_ = FALSE;
-					time_t _tmp46_ = 0;
+					time_t _tmp46_;
 					gint event_photo_count = 0;
 					gint event_video_count = 0;
-					EventSource* _tmp61_ = NULL;
-					GeeCollection* _tmp62_ = NULL;
-					GeeCollection* _tmp63_ = NULL;
+					EventSource* _tmp61_;
+					GeeCollection* _tmp62_;
+					GeeCollection* _tmp63_;
 					gint _tmp64_ = 0;
 					gint _tmp65_ = 0;
-					gint _tmp66_ = 0;
-					gint _tmp67_ = 0;
-					gint _tmp68_ = 0;
-					gint _tmp69_ = 0;
-					gint _tmp70_ = 0;
+					gint _tmp66_;
+					gint _tmp67_;
+					gint _tmp68_;
+					gint _tmp69_;
+					gint _tmp70_;
 #line 284 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp31_ = source;
 #line 284 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2729,7 +2719,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 					if (_tmp33_ == -1) {
 #line 287 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->event_count = 0;
-#line 2733 "Properties.c"
+#line 2723 "Properties.c"
 					}
 #line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp36_ = self->priv->start_time;
@@ -2737,11 +2727,11 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 					if (_tmp36_ == ((time_t) 0)) {
 #line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp35_ = TRUE;
-#line 2741 "Properties.c"
+#line 2731 "Properties.c"
 					} else {
-						EventSource* _tmp37_ = NULL;
-						time_t _tmp38_ = 0;
-						time_t _tmp39_ = 0;
+						EventSource* _tmp37_;
+						time_t _tmp38_;
+						time_t _tmp39_;
 #line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp37_ = event_source;
 #line 289 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2750,37 +2740,37 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 						_tmp39_ = self->priv->start_time;
 #line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp35_ = _tmp38_ < _tmp39_;
-#line 2754 "Properties.c"
+#line 2744 "Properties.c"
 					}
 #line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp35_) {
-#line 2758 "Properties.c"
-						EventSource* _tmp40_ = NULL;
-						time_t _tmp41_ = 0;
+#line 2748 "Properties.c"
+						EventSource* _tmp40_;
+						time_t _tmp41_;
 #line 290 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp40_ = event_source;
 #line 290 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp41_ = event_source_get_start_time (_tmp40_);
 #line 290 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp34_ = _tmp41_ != ((time_t) 0);
-#line 2767 "Properties.c"
+#line 2757 "Properties.c"
 					} else {
 #line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp34_ = FALSE;
-#line 2771 "Properties.c"
+#line 2761 "Properties.c"
 					}
 #line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp34_) {
-#line 2775 "Properties.c"
-						EventSource* _tmp42_ = NULL;
-						time_t _tmp43_ = 0;
+#line 2765 "Properties.c"
+						EventSource* _tmp42_;
+						time_t _tmp43_;
 #line 291 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp42_ = event_source;
 #line 291 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp43_ = event_source_get_start_time (_tmp42_);
 #line 291 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->start_time = _tmp43_;
-#line 2784 "Properties.c"
+#line 2774 "Properties.c"
 					}
 #line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp46_ = self->priv->end_time;
@@ -2788,11 +2778,11 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 					if (_tmp46_ == ((time_t) 0)) {
 #line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp45_ = TRUE;
-#line 2792 "Properties.c"
+#line 2782 "Properties.c"
 					} else {
-						EventSource* _tmp47_ = NULL;
-						time_t _tmp48_ = 0;
-						time_t _tmp49_ = 0;
+						EventSource* _tmp47_;
+						time_t _tmp48_;
+						time_t _tmp49_;
 #line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp47_ = event_source;
 #line 293 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2801,51 +2791,51 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 						_tmp49_ = self->priv->end_time;
 #line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp45_ = _tmp48_ > _tmp49_;
-#line 2805 "Properties.c"
+#line 2795 "Properties.c"
 					}
 #line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp45_) {
-#line 2809 "Properties.c"
-						EventSource* _tmp50_ = NULL;
-						time_t _tmp51_ = 0;
+#line 2799 "Properties.c"
+						EventSource* _tmp50_;
+						time_t _tmp51_;
 #line 294 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp50_ = event_source;
 #line 294 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp51_ = event_source_get_end_time (_tmp50_);
 #line 294 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp44_ = _tmp51_ != ((time_t) 0);
-#line 2818 "Properties.c"
+#line 2808 "Properties.c"
 					} else {
 #line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp44_ = FALSE;
-#line 2822 "Properties.c"
+#line 2812 "Properties.c"
 					}
 #line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp44_) {
-#line 2826 "Properties.c"
-						EventSource* _tmp52_ = NULL;
-						time_t _tmp53_ = 0;
+#line 2816 "Properties.c"
+						EventSource* _tmp52_;
+						time_t _tmp53_;
 #line 295 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp52_ = event_source;
 #line 295 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp53_ = event_source_get_end_time (_tmp52_);
 #line 295 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->end_time = _tmp53_;
-#line 2835 "Properties.c"
+#line 2825 "Properties.c"
 					} else {
 						gboolean _tmp54_ = FALSE;
-						time_t _tmp55_ = 0;
+						time_t _tmp55_;
 #line 296 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp55_ = self->priv->end_time;
 #line 296 "/home/jens/Source/shotwell/src/Properties.vala"
 						if (_tmp55_ == ((time_t) 0)) {
 #line 296 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp54_ = TRUE;
-#line 2845 "Properties.c"
+#line 2835 "Properties.c"
 						} else {
-							EventSource* _tmp56_ = NULL;
-							time_t _tmp57_ = 0;
-							time_t _tmp58_ = 0;
+							EventSource* _tmp56_;
+							time_t _tmp57_;
+							time_t _tmp58_;
 #line 296 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp56_ = event_source;
 #line 296 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2854,20 +2844,20 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 							_tmp58_ = self->priv->end_time;
 #line 296 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp54_ = _tmp57_ > _tmp58_;
-#line 2858 "Properties.c"
+#line 2848 "Properties.c"
 						}
 #line 296 "/home/jens/Source/shotwell/src/Properties.vala"
 						if (_tmp54_) {
-#line 2862 "Properties.c"
-							EventSource* _tmp59_ = NULL;
-							time_t _tmp60_ = 0;
+#line 2852 "Properties.c"
+							EventSource* _tmp59_;
+							time_t _tmp60_;
 #line 297 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp59_ = event_source;
 #line 297 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp60_ = event_source_get_start_time (_tmp59_);
 #line 297 "/home/jens/Source/shotwell/src/Properties.vala"
 							self->priv->end_time = _tmp60_;
-#line 2871 "Properties.c"
+#line 2861 "Properties.c"
 						}
 					}
 #line 302 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2902,57 +2892,57 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 					self->priv->event_count = _tmp70_ + 1;
 #line 283 "/home/jens/Source/shotwell/src/Properties.vala"
 					_g_object_unref0 (event_source);
-#line 2906 "Properties.c"
+#line 2896 "Properties.c"
 				} else {
 					gboolean _tmp71_ = FALSE;
-					DataSource* _tmp72_ = NULL;
+					DataSource* _tmp72_;
 #line 308 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp72_ = source;
 #line 308 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp72_, TYPE_VIDEO_SOURCE)) {
 #line 308 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp71_ = TRUE;
-#line 2916 "Properties.c"
+#line 2906 "Properties.c"
 					} else {
-						DataSource* _tmp73_ = NULL;
+						DataSource* _tmp73_;
 #line 308 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp73_ = source;
 #line 308 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp71_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp73_, TYPE_VIDEO_IMPORT_SOURCE);
-#line 2923 "Properties.c"
+#line 2913 "Properties.c"
 					}
 #line 308 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp71_) {
-#line 2927 "Properties.c"
+#line 2917 "Properties.c"
 						time_t _tmp74_ = 0;
-						DataSource* _tmp75_ = NULL;
+						DataSource* _tmp75_;
 						time_t exposure_time = 0;
-						time_t _tmp80_ = 0;
-						gint _tmp91_ = 0;
+						time_t _tmp80_;
+						gint _tmp91_;
 #line 309 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp75_ = source;
 #line 309 "/home/jens/Source/shotwell/src/Properties.vala"
 						if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, TYPE_VIDEO_SOURCE)) {
-#line 2937 "Properties.c"
-							DataSource* _tmp76_ = NULL;
-							time_t _tmp77_ = 0;
+#line 2927 "Properties.c"
+							DataSource* _tmp76_;
+							time_t _tmp77_;
 #line 310 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp76_ = source;
 #line 310 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp77_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, TYPE_VIDEO_SOURCE, VideoSource), TYPE_MEDIA_SOURCE, MediaSource));
 #line 310 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp74_ = _tmp77_;
-#line 2946 "Properties.c"
+#line 2936 "Properties.c"
 						} else {
-							DataSource* _tmp78_ = NULL;
-							time_t _tmp79_ = 0;
+							DataSource* _tmp78_;
+							time_t _tmp79_;
 #line 311 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp78_ = source;
 #line 311 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp79_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource), TYPE_IMPORT_SOURCE, ImportSource));
 #line 311 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp74_ = _tmp79_;
-#line 2956 "Properties.c"
+#line 2946 "Properties.c"
 						}
 #line 309 "/home/jens/Source/shotwell/src/Properties.vala"
 						exposure_time = _tmp74_;
@@ -2960,38 +2950,38 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 						_tmp80_ = exposure_time;
 #line 313 "/home/jens/Source/shotwell/src/Properties.vala"
 						if (_tmp80_ != ((time_t) 0)) {
-#line 2964 "Properties.c"
+#line 2954 "Properties.c"
 							gboolean _tmp81_ = FALSE;
-							time_t _tmp82_ = 0;
+							time_t _tmp82_;
 							gboolean _tmp86_ = FALSE;
-							time_t _tmp87_ = 0;
+							time_t _tmp87_;
 #line 314 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp82_ = self->priv->start_time;
 #line 314 "/home/jens/Source/shotwell/src/Properties.vala"
 							if (_tmp82_ == ((time_t) 0)) {
 #line 314 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp81_ = TRUE;
-#line 2975 "Properties.c"
+#line 2965 "Properties.c"
 							} else {
-								time_t _tmp83_ = 0;
-								time_t _tmp84_ = 0;
+								time_t _tmp83_;
+								time_t _tmp84_;
 #line 314 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp83_ = exposure_time;
 #line 314 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp84_ = self->priv->start_time;
 #line 314 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp81_ = _tmp83_ < _tmp84_;
-#line 2985 "Properties.c"
+#line 2975 "Properties.c"
 							}
 #line 314 "/home/jens/Source/shotwell/src/Properties.vala"
 							if (_tmp81_) {
-#line 2989 "Properties.c"
-								time_t _tmp85_ = 0;
+#line 2979 "Properties.c"
+								time_t _tmp85_;
 #line 315 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp85_ = exposure_time;
 #line 315 "/home/jens/Source/shotwell/src/Properties.vala"
 								self->priv->start_time = _tmp85_;
-#line 2995 "Properties.c"
+#line 2985 "Properties.c"
 							}
 #line 317 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp87_ = self->priv->end_time;
@@ -2999,34 +2989,34 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 							if (_tmp87_ == ((time_t) 0)) {
 #line 317 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp86_ = TRUE;
-#line 3003 "Properties.c"
+#line 2993 "Properties.c"
 							} else {
-								time_t _tmp88_ = 0;
-								time_t _tmp89_ = 0;
+								time_t _tmp88_;
+								time_t _tmp89_;
 #line 317 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp88_ = exposure_time;
 #line 317 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp89_ = self->priv->end_time;
 #line 317 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp86_ = _tmp88_ > _tmp89_;
-#line 3013 "Properties.c"
+#line 3003 "Properties.c"
 							}
 #line 317 "/home/jens/Source/shotwell/src/Properties.vala"
 							if (_tmp86_) {
-#line 3017 "Properties.c"
-								time_t _tmp90_ = 0;
+#line 3007 "Properties.c"
+								time_t _tmp90_;
 #line 318 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp90_ = exposure_time;
 #line 318 "/home/jens/Source/shotwell/src/Properties.vala"
 								self->priv->end_time = _tmp90_;
-#line 3023 "Properties.c"
+#line 3013 "Properties.c"
 							}
 						}
 #line 321 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp91_ = self->priv->video_count;
 #line 321 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->video_count = _tmp91_ + 1;
-#line 3030 "Properties.c"
+#line 3020 "Properties.c"
 					}
 				}
 			}
@@ -3034,20 +3024,20 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 			_g_object_unref0 (source);
 #line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (view);
-#line 3038 "Properties.c"
+#line 3028 "Properties.c"
 		}
 #line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (_view_it);
-#line 3042 "Properties.c"
+#line 3032 "Properties.c"
 	}
 }
 
 
 static void basic_properties_real_get_properties (Properties* base, Page* current_page) {
 	BasicProperties * self;
-	Page* _tmp0_ = NULL;
-	time_t _tmp1_ = 0;
-	time_t _tmp3_ = 0;
+	Page* _tmp0_;
+	time_t _tmp1_;
+	time_t _tmp3_;
 #line 326 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BASIC_PROPERTIES, BasicProperties);
 #line 326 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -3060,45 +3050,45 @@ static void basic_properties_real_get_properties (Properties* base, Page* curren
 	_tmp1_ = self->priv->end_time;
 #line 329 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp1_ == ((time_t) 0)) {
-#line 3064 "Properties.c"
-		time_t _tmp2_ = 0;
+#line 3054 "Properties.c"
+		time_t _tmp2_;
 #line 330 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp2_ = self->priv->start_time;
 #line 330 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->end_time = _tmp2_;
-#line 3070 "Properties.c"
+#line 3060 "Properties.c"
 	}
 #line 331 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp3_ = self->priv->start_time;
 #line 331 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp3_ == ((time_t) 0)) {
-#line 3076 "Properties.c"
-		time_t _tmp4_ = 0;
+#line 3066 "Properties.c"
+		time_t _tmp4_;
 #line 332 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp4_ = self->priv->end_time;
 #line 332 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->start_time = _tmp4_;
-#line 3082 "Properties.c"
+#line 3072 "Properties.c"
 	}
 }
 
 
 static void basic_properties_real_internal_update_properties (Properties* base, Page* page) {
 	BasicProperties * self;
-	Page* _tmp0_ = NULL;
+	Page* _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	gint _tmp14_ = 0;
-	time_t _tmp43_ = 0;
-	gboolean _tmp72_ = FALSE;
-	gdouble _tmp84_ = 0.0;
-	const gchar* _tmp90_ = NULL;
-	const gchar* _tmp93_ = NULL;
-	gboolean _tmp95_ = FALSE;
-	gboolean _tmp96_ = FALSE;
-	const gchar* _tmp97_ = NULL;
+	const gchar* _tmp2_;
+	const gchar* _tmp8_;
+	gboolean _tmp12_ = FALSE;
+	gint _tmp13_;
+	time_t _tmp38_;
+	gboolean _tmp61_;
+	gdouble _tmp72_;
+	const gchar* _tmp76_;
+	const gchar* _tmp78_;
+	gboolean _tmp80_ = FALSE;
+	gboolean _tmp81_ = FALSE;
+	const gchar* _tmp82_;
 #line 335 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BASIC_PROPERTIES, BasicProperties);
 #line 335 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -3111,25 +3101,25 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 	_tmp2_ = self->priv->title;
 #line 339 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (g_strcmp0 (_tmp2_, "") == 0) {
-#line 3115 "Properties.c"
-		Page* _tmp3_ = NULL;
+#line 3105 "Properties.c"
+		Page* _tmp3_;
 #line 339 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp3_ = page;
 #line 339 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_TAG_PAGE);
-#line 3121 "Properties.c"
+#line 3111 "Properties.c"
 	} else {
 #line 339 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp1_ = FALSE;
-#line 3125 "Properties.c"
+#line 3115 "Properties.c"
 	}
 #line 339 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp1_) {
-#line 3129 "Properties.c"
-		Page* _tmp4_ = NULL;
-		Tag* _tmp5_ = NULL;
-		Tag* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 3119 "Properties.c"
+		Page* _tmp4_;
+		Tag* _tmp5_;
+		Tag* _tmp6_;
+		gchar* _tmp7_;
 #line 340 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp4_ = page;
 #line 340 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -3144,160 +3134,145 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 		self->priv->title = _tmp7_;
 #line 340 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (_tmp6_);
-#line 3148 "Properties.c"
+#line 3138 "Properties.c"
 	}
 #line 342 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp8_ = self->priv->title;
 #line 342 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (g_strcmp0 (_tmp8_, "") != 0) {
-#line 3154 "Properties.c"
-		const gchar* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
+#line 3144 "Properties.c"
+		const gchar* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
 #line 343 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp9_ = _ ("Title:");
+		_tmp9_ = self->priv->title;
 #line 343 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp10_ = self->priv->title;
+		_tmp10_ = guarded_markup_escape_text (_tmp9_);
 #line 343 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp11_ = guarded_markup_escape_text (_tmp10_);
+		_tmp11_ = _tmp10_;
 #line 343 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp12_ = _tmp11_;
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Title:"), _tmp11_, FALSE);
 #line 343 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp9_, _tmp12_, FALSE);
-#line 343 "/home/jens/Source/shotwell/src/Properties.vala"
-		_g_free0 (_tmp12_);
-#line 3171 "Properties.c"
+		_g_free0 (_tmp11_);
+#line 3158 "Properties.c"
 	}
 #line 345 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp14_ = self->priv->photo_count;
+	_tmp13_ = self->priv->photo_count;
 #line 345 "/home/jens/Source/shotwell/src/Properties.vala"
-	if (_tmp14_ >= 0) {
+	if (_tmp13_ >= 0) {
 #line 345 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp13_ = TRUE;
-#line 3179 "Properties.c"
+		_tmp12_ = TRUE;
+#line 3166 "Properties.c"
 	} else {
-		gint _tmp15_ = 0;
+		gint _tmp14_;
 #line 345 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp15_ = self->priv->video_count;
+		_tmp14_ = self->priv->video_count;
 #line 345 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp13_ = _tmp15_ >= 0;
-#line 3186 "Properties.c"
+		_tmp12_ = _tmp14_ >= 0;
+#line 3173 "Properties.c"
 	}
 #line 345 "/home/jens/Source/shotwell/src/Properties.vala"
-	if (_tmp13_) {
-#line 3190 "Properties.c"
+	if (_tmp12_) {
+#line 3177 "Properties.c"
 		gchar* label = NULL;
-		const gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
+		gchar* _tmp15_;
+		gint _tmp16_;
 		gchar* photo_num_string = NULL;
-		gint _tmp26_ = 0;
-		const gchar* _tmp27_ = NULL;
-		gint _tmp28_ = 0;
-		gchar* _tmp29_ = NULL;
+		gint _tmp23_;
+		gint _tmp24_;
+		gchar* _tmp25_;
 		gchar* video_num_string = NULL;
-		gint _tmp30_ = 0;
-		const gchar* _tmp31_ = NULL;
-		gint _tmp32_ = 0;
-		gchar* _tmp33_ = NULL;
-		gboolean _tmp34_ = FALSE;
-		gint _tmp35_ = 0;
-		const gchar* _tmp39_ = NULL;
-		const gchar* _tmp40_ = NULL;
-		gint _tmp41_ = 0;
+		gint _tmp26_;
+		gint _tmp27_;
+		gchar* _tmp28_;
+		gboolean _tmp29_ = FALSE;
+		gint _tmp30_;
+		const gchar* _tmp34_;
+		const gchar* _tmp35_;
+		gint _tmp36_;
 #line 346 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp16_ = _ ("Items:");
+		_tmp15_ = g_strdup (_ ("Items:"));
 #line 346 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp17_ = g_strdup (_tmp16_);
-#line 346 "/home/jens/Source/shotwell/src/Properties.vala"
-		label = _tmp17_;
+		label = _tmp15_;
 #line 348 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp18_ = self->priv->event_count;
+		_tmp16_ = self->priv->event_count;
 #line 348 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp18_ >= 0) {
-#line 3220 "Properties.c"
+		if (_tmp16_ >= 0) {
+#line 3202 "Properties.c"
 			gchar* event_num_string = NULL;
-			gint _tmp19_ = 0;
-			const gchar* _tmp20_ = NULL;
-			gint _tmp21_ = 0;
-			gchar* _tmp22_ = NULL;
-			const gchar* _tmp23_ = NULL;
-			const gchar* _tmp24_ = NULL;
-			gchar* _tmp25_ = NULL;
-#line 349 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp19_ = self->priv->event_count;
+			gint _tmp17_;
+			gint _tmp18_;
+			gchar* _tmp19_;
+			const gchar* _tmp20_;
+			const gchar* _tmp21_;
+			gchar* _tmp22_;
 #line 349 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp20_ = ngettext ("%d Event", "%d Events", (gulong) _tmp19_);
+			_tmp17_ = self->priv->event_count;
 #line 349 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp21_ = self->priv->event_count;
+			_tmp18_ = self->priv->event_count;
 #line 349 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp22_ = g_strdup_printf (_tmp20_, _tmp21_);
+			_tmp19_ = g_strdup_printf (ngettext ("%d Event", "%d Events", (gulong) _tmp17_), _tmp18_);
 #line 349 "/home/jens/Source/shotwell/src/Properties.vala"
-			event_num_string = _tmp22_;
+			event_num_string = _tmp19_;
 #line 352 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp23_ = label;
+			_tmp20_ = label;
 #line 352 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp24_ = event_num_string;
+			_tmp21_ = event_num_string;
 #line 352 "/home/jens/Source/shotwell/src/Properties.vala"
-			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp23_, _tmp24_, FALSE);
+			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp20_, _tmp21_, FALSE);
 #line 353 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp25_ = g_strdup ("");
+			_tmp22_ = g_strdup ("");
 #line 353 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (label);
 #line 353 "/home/jens/Source/shotwell/src/Properties.vala"
-			label = _tmp25_;
+			label = _tmp22_;
 #line 348 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (event_num_string);
-#line 3253 "Properties.c"
+#line 3232 "Properties.c"
 		}
 #line 356 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp26_ = self->priv->photo_count;
+		_tmp23_ = self->priv->photo_count;
 #line 356 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp27_ = ngettext ("%d Photo", "%d Photos", (gulong) _tmp26_);
+		_tmp24_ = self->priv->photo_count;
 #line 356 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp28_ = self->priv->photo_count;
+		_tmp25_ = g_strdup_printf (ngettext ("%d Photo", "%d Photos", (gulong) _tmp23_), _tmp24_);
 #line 356 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp29_ = g_strdup_printf (_tmp27_, _tmp28_);
-#line 356 "/home/jens/Source/shotwell/src/Properties.vala"
-		photo_num_string = _tmp29_;
-#line 358 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp30_ = self->priv->video_count;
+		photo_num_string = _tmp25_;
 #line 358 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp31_ = ngettext ("%d Video", "%d Videos", (gulong) _tmp30_);
+		_tmp26_ = self->priv->video_count;
 #line 358 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp32_ = self->priv->video_count;
+		_tmp27_ = self->priv->video_count;
 #line 358 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp33_ = g_strdup_printf (_tmp31_, _tmp32_);
+		_tmp28_ = g_strdup_printf (ngettext ("%d Video", "%d Videos", (gulong) _tmp26_), _tmp27_);
 #line 358 "/home/jens/Source/shotwell/src/Properties.vala"
-		video_num_string = _tmp33_;
+		video_num_string = _tmp28_;
 #line 361 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp35_ = self->priv->photo_count;
+		_tmp30_ = self->priv->photo_count;
 #line 361 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp35_ == 0) {
-#line 3279 "Properties.c"
-			gint _tmp36_ = 0;
+		if (_tmp30_ == 0) {
+#line 3254 "Properties.c"
+			gint _tmp31_;
 #line 361 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp36_ = self->priv->video_count;
+			_tmp31_ = self->priv->video_count;
 #line 361 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp34_ = _tmp36_ > 0;
-#line 3285 "Properties.c"
+			_tmp29_ = _tmp31_ > 0;
+#line 3260 "Properties.c"
 		} else {
 #line 361 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp34_ = FALSE;
-#line 3289 "Properties.c"
+			_tmp29_ = FALSE;
+#line 3264 "Properties.c"
 		}
 #line 361 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp34_) {
-#line 3293 "Properties.c"
-			const gchar* _tmp37_ = NULL;
-			const gchar* _tmp38_ = NULL;
+		if (_tmp29_) {
+#line 3268 "Properties.c"
+			const gchar* _tmp32_;
+			const gchar* _tmp33_;
 #line 362 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp37_ = label;
+			_tmp32_ = label;
 #line 362 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp38_ = video_num_string;
+			_tmp33_ = video_num_string;
 #line 362 "/home/jens/Source/shotwell/src/Properties.vala"
-			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp37_, _tmp38_, FALSE);
+			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp32_, _tmp33_, FALSE);
 #line 363 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (video_num_string);
 #line 363 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -3306,25 +3281,25 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 			_g_free0 (label);
 #line 363 "/home/jens/Source/shotwell/src/Properties.vala"
 			return;
-#line 3310 "Properties.c"
+#line 3285 "Properties.c"
 		}
 #line 366 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp39_ = label;
+		_tmp34_ = label;
 #line 366 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp40_ = photo_num_string;
+		_tmp35_ = photo_num_string;
 #line 366 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp39_, _tmp40_, FALSE);
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp34_, _tmp35_, FALSE);
 #line 368 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp41_ = self->priv->video_count;
+		_tmp36_ = self->priv->video_count;
 #line 368 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp41_ > 0) {
-#line 3322 "Properties.c"
-			const gchar* _tmp42_ = NULL;
+		if (_tmp36_ > 0) {
+#line 3297 "Properties.c"
+			const gchar* _tmp37_;
 #line 369 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp42_ = video_num_string;
+			_tmp37_ = video_num_string;
 #line 369 "/home/jens/Source/shotwell/src/Properties.vala"
-			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp42_, FALSE);
-#line 3328 "Properties.c"
+			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp37_, FALSE);
+#line 3303 "Properties.c"
 		}
 #line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (video_num_string);
@@ -3332,133 +3307,115 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 		_g_free0 (photo_num_string);
 #line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (label);
-#line 3336 "Properties.c"
+#line 3311 "Properties.c"
 	}
 #line 372 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp43_ = self->priv->start_time;
+	_tmp38_ = self->priv->start_time;
 #line 372 "/home/jens/Source/shotwell/src/Properties.vala"
-	if (_tmp43_ != ((time_t) 0)) {
-#line 3342 "Properties.c"
+	if (_tmp38_ != ((time_t) 0)) {
+#line 3317 "Properties.c"
 		gchar* start_date = NULL;
-		time_t _tmp44_ = 0;
-		struct tm _tmp45_ = {0};
-		gchar* _tmp46_ = NULL;
+		time_t _tmp39_;
+		struct tm _tmp40_ = {0};
+		gchar* _tmp41_;
 		gchar* start_time = NULL;
-		time_t _tmp47_ = 0;
-		struct tm _tmp48_ = {0};
-		gchar* _tmp49_ = NULL;
+		time_t _tmp42_;
+		struct tm _tmp43_ = {0};
+		gchar* _tmp44_;
 		gchar* end_date = NULL;
-		time_t _tmp50_ = 0;
-		struct tm _tmp51_ = {0};
-		gchar* _tmp52_ = NULL;
+		time_t _tmp45_;
+		struct tm _tmp46_ = {0};
+		gchar* _tmp47_;
 		gchar* end_time = NULL;
-		time_t _tmp53_ = 0;
-		struct tm _tmp54_ = {0};
-		gchar* _tmp55_ = NULL;
-		const gchar* _tmp56_ = NULL;
-		const gchar* _tmp57_ = NULL;
+		time_t _tmp48_;
+		struct tm _tmp49_ = {0};
+		gchar* _tmp50_;
+		const gchar* _tmp51_;
+		const gchar* _tmp52_;
 #line 373 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp44_ = self->priv->start_time;
+		_tmp39_ = self->priv->start_time;
 #line 373 "/home/jens/Source/shotwell/src/Properties.vala"
-		g_time_local (_tmp44_, &_tmp45_);
+		g_time_local (_tmp39_, &_tmp40_);
 #line 373 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp46_ = properties_get_prettyprint_date (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp45_);
+		_tmp41_ = properties_get_prettyprint_date (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp40_);
 #line 373 "/home/jens/Source/shotwell/src/Properties.vala"
-		start_date = _tmp46_;
+		start_date = _tmp41_;
 #line 374 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp47_ = self->priv->start_time;
+		_tmp42_ = self->priv->start_time;
 #line 374 "/home/jens/Source/shotwell/src/Properties.vala"
-		g_time_local (_tmp47_, &_tmp48_);
+		g_time_local (_tmp42_, &_tmp43_);
 #line 374 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp49_ = properties_get_prettyprint_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp48_);
+		_tmp44_ = properties_get_prettyprint_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp43_);
 #line 374 "/home/jens/Source/shotwell/src/Properties.vala"
-		start_time = _tmp49_;
+		start_time = _tmp44_;
 #line 375 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp50_ = self->priv->end_time;
+		_tmp45_ = self->priv->end_time;
 #line 375 "/home/jens/Source/shotwell/src/Properties.vala"
-		g_time_local (_tmp50_, &_tmp51_);
+		g_time_local (_tmp45_, &_tmp46_);
 #line 375 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp52_ = properties_get_prettyprint_date (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp51_);
+		_tmp47_ = properties_get_prettyprint_date (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp46_);
 #line 375 "/home/jens/Source/shotwell/src/Properties.vala"
-		end_date = _tmp52_;
+		end_date = _tmp47_;
 #line 376 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp53_ = self->priv->end_time;
+		_tmp48_ = self->priv->end_time;
 #line 376 "/home/jens/Source/shotwell/src/Properties.vala"
-		g_time_local (_tmp53_, &_tmp54_);
+		g_time_local (_tmp48_, &_tmp49_);
 #line 376 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp55_ = properties_get_prettyprint_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp54_);
+		_tmp50_ = properties_get_prettyprint_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp49_);
 #line 376 "/home/jens/Source/shotwell/src/Properties.vala"
-		end_time = _tmp55_;
+		end_time = _tmp50_;
 #line 378 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp56_ = start_date;
+		_tmp51_ = start_date;
 #line 378 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp57_ = end_date;
+		_tmp52_ = end_date;
 #line 378 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (g_strcmp0 (_tmp56_, _tmp57_) == 0) {
-#line 3399 "Properties.c"
-			const gchar* _tmp58_ = NULL;
-			const gchar* _tmp59_ = NULL;
-			const gchar* _tmp60_ = NULL;
-			const gchar* _tmp61_ = NULL;
+		if (g_strcmp0 (_tmp51_, _tmp52_) == 0) {
+#line 3374 "Properties.c"
+			const gchar* _tmp53_;
+			const gchar* _tmp54_;
+			const gchar* _tmp55_;
 #line 380 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp58_ = _ ("Date:");
+			_tmp53_ = start_date;
 #line 380 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp59_ = start_date;
-#line 380 "/home/jens/Source/shotwell/src/Properties.vala"
-			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp58_, _tmp59_, FALSE);
+			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Date:"), _tmp53_, FALSE);
 #line 382 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp60_ = start_time;
+			_tmp54_ = start_time;
 #line 382 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp61_ = end_time;
+			_tmp55_ = end_time;
 #line 382 "/home/jens/Source/shotwell/src/Properties.vala"
-			if (g_strcmp0 (_tmp60_, _tmp61_) == 0) {
-#line 3416 "Properties.c"
-				const gchar* _tmp62_ = NULL;
-				const gchar* _tmp63_ = NULL;
+			if (g_strcmp0 (_tmp54_, _tmp55_) == 0) {
+#line 3388 "Properties.c"
+				const gchar* _tmp56_;
 #line 384 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp62_ = _ ("Time:");
+				_tmp56_ = start_time;
 #line 384 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp63_ = start_time;
-#line 384 "/home/jens/Source/shotwell/src/Properties.vala"
-				properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp62_, _tmp63_, FALSE);
-#line 3425 "Properties.c"
+				properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Time:"), _tmp56_, FALSE);
+#line 3394 "Properties.c"
 			} else {
-				const gchar* _tmp64_ = NULL;
-				const gchar* _tmp65_ = NULL;
-				const gchar* _tmp66_ = NULL;
-				const gchar* _tmp67_ = NULL;
-#line 387 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp64_ = _ ("From:");
+				const gchar* _tmp57_;
+				const gchar* _tmp58_;
 #line 387 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp65_ = start_time;
+				_tmp57_ = start_time;
 #line 387 "/home/jens/Source/shotwell/src/Properties.vala"
-				properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp64_, _tmp65_, FALSE);
+				properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("From:"), _tmp57_, FALSE);
 #line 388 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp66_ = _ ("To:");
+				_tmp58_ = end_time;
 #line 388 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp67_ = end_time;
-#line 388 "/home/jens/Source/shotwell/src/Properties.vala"
-				properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp66_, _tmp67_, FALSE);
-#line 3443 "Properties.c"
+				properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("To:"), _tmp58_, FALSE);
+#line 3406 "Properties.c"
 			}
 		} else {
-			const gchar* _tmp68_ = NULL;
-			const gchar* _tmp69_ = NULL;
-			const gchar* _tmp70_ = NULL;
-			const gchar* _tmp71_ = NULL;
-#line 392 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp68_ = _ ("From:");
+			const gchar* _tmp59_;
+			const gchar* _tmp60_;
 #line 392 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp69_ = start_date;
+			_tmp59_ = start_date;
 #line 392 "/home/jens/Source/shotwell/src/Properties.vala"
-			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp68_, _tmp69_, FALSE);
+			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("From:"), _tmp59_, FALSE);
 #line 393 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp70_ = _ ("To:");
+			_tmp60_ = end_date;
 #line 393 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp71_ = end_date;
-#line 393 "/home/jens/Source/shotwell/src/Properties.vala"
-			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp70_, _tmp71_, FALSE);
-#line 3462 "Properties.c"
+			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("To:"), _tmp60_, FALSE);
+#line 3419 "Properties.c"
 		}
 #line 372 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (end_time);
@@ -3468,371 +3425,350 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 		_g_free0 (start_time);
 #line 372 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (start_date);
-#line 3472 "Properties.c"
+#line 3429 "Properties.c"
 	}
 #line 397 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp72_ = dimensions_has_area (&self->priv->dimensions);
+	_tmp61_ = dimensions_has_area (&self->priv->dimensions);
 #line 397 "/home/jens/Source/shotwell/src/Properties.vala"
-	if (_tmp72_) {
-#line 3478 "Properties.c"
+	if (_tmp61_) {
+#line 3435 "Properties.c"
 		gchar* label = NULL;
-		const gchar* _tmp73_ = NULL;
-		gchar* _tmp74_ = NULL;
-		gboolean _tmp75_ = FALSE;
-#line 398 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp73_ = _ ("Size:");
+		gchar* _tmp62_;
+		gboolean _tmp63_;
 #line 398 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp74_ = g_strdup (_tmp73_);
+		_tmp62_ = g_strdup (_ ("Size:"));
 #line 398 "/home/jens/Source/shotwell/src/Properties.vala"
-		label = _tmp74_;
+		label = _tmp62_;
 #line 400 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp75_ = dimensions_has_area (&self->priv->dimensions);
+		_tmp63_ = dimensions_has_area (&self->priv->dimensions);
 #line 400 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp75_) {
-#line 3493 "Properties.c"
-			const gchar* _tmp76_ = NULL;
-			Dimensions _tmp77_ = {0};
-			gint _tmp78_ = 0;
-			Dimensions _tmp79_ = {0};
-			gint _tmp80_ = 0;
-			gchar* _tmp81_ = NULL;
-			gchar* _tmp82_ = NULL;
-			gchar* _tmp83_ = NULL;
+		if (_tmp63_) {
+#line 3447 "Properties.c"
+			const gchar* _tmp64_;
+			Dimensions _tmp65_;
+			gint _tmp66_;
+			Dimensions _tmp67_;
+			gint _tmp68_;
+			gchar* _tmp69_;
+			gchar* _tmp70_;
+			gchar* _tmp71_;
 #line 401 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp76_ = label;
+			_tmp64_ = label;
 #line 401 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp77_ = self->priv->dimensions;
+			_tmp65_ = self->priv->dimensions;
 #line 401 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp78_ = _tmp77_.width;
+			_tmp66_ = _tmp65_.width;
 #line 401 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp79_ = self->priv->dimensions;
+			_tmp67_ = self->priv->dimensions;
 #line 401 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp80_ = _tmp79_.height;
+			_tmp68_ = _tmp67_.height;
 #line 401 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp81_ = g_strdup_printf ("%d &#215; %d", _tmp78_, _tmp80_);
+			_tmp69_ = g_strdup_printf ("%d &#215; %d", _tmp66_, _tmp68_);
 #line 401 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp82_ = _tmp81_;
+			_tmp70_ = _tmp69_;
 #line 401 "/home/jens/Source/shotwell/src/Properties.vala"
-			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp76_, _tmp82_, FALSE);
+			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp64_, _tmp70_, FALSE);
 #line 401 "/home/jens/Source/shotwell/src/Properties.vala"
-			_g_free0 (_tmp82_);
+			_g_free0 (_tmp70_);
 #line 402 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp83_ = g_strdup ("");
+			_tmp71_ = g_strdup ("");
 #line 402 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (label);
 #line 402 "/home/jens/Source/shotwell/src/Properties.vala"
-			label = _tmp83_;
-#line 3526 "Properties.c"
+			label = _tmp71_;
+#line 3480 "Properties.c"
 		}
 #line 397 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (label);
-#line 3530 "Properties.c"
+#line 3484 "Properties.c"
 	}
 #line 406 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp84_ = self->priv->clip_duration;
+	_tmp72_ = self->priv->clip_duration;
 #line 406 "/home/jens/Source/shotwell/src/Properties.vala"
-	if (_tmp84_ > 0.0) {
-#line 3536 "Properties.c"
-		const gchar* _tmp85_ = NULL;
-		const gchar* _tmp86_ = NULL;
-		gdouble _tmp87_ = 0.0;
-		gchar* _tmp88_ = NULL;
-		gchar* _tmp89_ = NULL;
-#line 407 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp85_ = _ ("Duration:");
+	if (_tmp72_ > 0.0) {
+#line 3490 "Properties.c"
+		gdouble _tmp73_;
+		gchar* _tmp74_;
+		gchar* _tmp75_;
 #line 407 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp86_ = _ ("%.1f seconds");
+		_tmp73_ = self->priv->clip_duration;
 #line 407 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp87_ = self->priv->clip_duration;
+		_tmp74_ = g_strdup_printf (_ ("%.1f seconds"), _tmp73_);
 #line 407 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp88_ = g_strdup_printf (_tmp86_, _tmp87_);
+		_tmp75_ = _tmp74_;
 #line 407 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp89_ = _tmp88_;
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Duration:"), _tmp75_, FALSE);
 #line 407 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp85_, _tmp89_, FALSE);
-#line 407 "/home/jens/Source/shotwell/src/Properties.vala"
-		_g_free0 (_tmp89_);
-#line 3556 "Properties.c"
+		_g_free0 (_tmp75_);
+#line 3504 "Properties.c"
 	}
 #line 410 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp90_ = self->priv->raw_developer;
+	_tmp76_ = self->priv->raw_developer;
 #line 410 "/home/jens/Source/shotwell/src/Properties.vala"
-	if (g_strcmp0 (_tmp90_, "") != 0) {
-#line 3562 "Properties.c"
-		const gchar* _tmp91_ = NULL;
-		const gchar* _tmp92_ = NULL;
+	if (g_strcmp0 (_tmp76_, "") != 0) {
+#line 3510 "Properties.c"
+		const gchar* _tmp77_;
 #line 411 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp91_ = _ ("Developer:");
+		_tmp77_ = self->priv->raw_developer;
 #line 411 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp92_ = self->priv->raw_developer;
-#line 411 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp91_, _tmp92_, FALSE);
-#line 3571 "Properties.c"
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Developer:"), _tmp77_, FALSE);
+#line 3516 "Properties.c"
 	}
 #line 415 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp93_ = self->priv->raw_assoc;
+	_tmp78_ = self->priv->raw_assoc;
 #line 415 "/home/jens/Source/shotwell/src/Properties.vala"
-	if (g_strcmp0 (_tmp93_, "") != 0) {
-#line 3577 "Properties.c"
-		const gchar* _tmp94_ = NULL;
+	if (g_strcmp0 (_tmp78_, "") != 0) {
+#line 3522 "Properties.c"
+		const gchar* _tmp79_;
 #line 416 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp94_ = self->priv->raw_assoc;
+		_tmp79_ = self->priv->raw_assoc;
 #line 416 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp94_, FALSE);
-#line 3583 "Properties.c"
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp79_, FALSE);
+#line 3528 "Properties.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp97_ = self->priv->exposure;
+	_tmp82_ = self->priv->exposure;
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
-	if (g_strcmp0 (_tmp97_, "") != 0) {
+	if (g_strcmp0 (_tmp82_, "") != 0) {
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp96_ = TRUE;
-#line 3591 "Properties.c"
+		_tmp81_ = TRUE;
+#line 3536 "Properties.c"
 	} else {
-		const gchar* _tmp98_ = NULL;
+		const gchar* _tmp83_;
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp98_ = self->priv->aperture;
+		_tmp83_ = self->priv->aperture;
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp96_ = g_strcmp0 (_tmp98_, "") != 0;
-#line 3598 "Properties.c"
+		_tmp81_ = g_strcmp0 (_tmp83_, "") != 0;
+#line 3543 "Properties.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
-	if (_tmp96_) {
+	if (_tmp81_) {
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp95_ = TRUE;
-#line 3604 "Properties.c"
+		_tmp80_ = TRUE;
+#line 3549 "Properties.c"
 	} else {
-		const gchar* _tmp99_ = NULL;
+		const gchar* _tmp84_;
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp99_ = self->priv->iso;
+		_tmp84_ = self->priv->iso;
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp95_ = g_strcmp0 (_tmp99_, "") != 0;
-#line 3611 "Properties.c"
+		_tmp80_ = g_strcmp0 (_tmp84_, "") != 0;
+#line 3556 "Properties.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
-	if (_tmp95_) {
-#line 3615 "Properties.c"
+	if (_tmp80_) {
+#line 3560 "Properties.c"
 		gchar* line = NULL;
-		const gchar* _tmp100_ = NULL;
-		const gchar* _tmp103_ = NULL;
-		gboolean _tmp112_ = FALSE;
-		gboolean _tmp113_ = FALSE;
-		const gchar* _tmp114_ = NULL;
+		const gchar* _tmp85_;
+		const gchar* _tmp88_;
+		gboolean _tmp97_ = FALSE;
+		gboolean _tmp98_ = FALSE;
+		const gchar* _tmp99_;
 #line 419 "/home/jens/Source/shotwell/src/Properties.vala"
 		line = NULL;
 #line 422 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp100_ = self->priv->exposure;
+		_tmp85_ = self->priv->exposure;
 #line 422 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (g_strcmp0 (_tmp100_, "") != 0) {
-#line 3628 "Properties.c"
-			const gchar* _tmp101_ = NULL;
-			gchar* _tmp102_ = NULL;
+		if (g_strcmp0 (_tmp85_, "") != 0) {
+#line 3573 "Properties.c"
+			const gchar* _tmp86_;
+			gchar* _tmp87_;
 #line 423 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp101_ = self->priv->exposure;
+			_tmp86_ = self->priv->exposure;
 #line 423 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp102_ = g_strdup (_tmp101_);
+			_tmp87_ = g_strdup (_tmp86_);
 #line 423 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (line);
 #line 423 "/home/jens/Source/shotwell/src/Properties.vala"
-			line = _tmp102_;
-#line 3639 "Properties.c"
+			line = _tmp87_;
+#line 3584 "Properties.c"
 		}
 #line 425 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp103_ = self->priv->aperture;
+		_tmp88_ = self->priv->aperture;
 #line 425 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (g_strcmp0 (_tmp103_, "") != 0) {
-#line 3645 "Properties.c"
-			const gchar* _tmp104_ = NULL;
+		if (g_strcmp0 (_tmp88_, "") != 0) {
+#line 3590 "Properties.c"
+			const gchar* _tmp89_;
 #line 426 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp104_ = line;
+			_tmp89_ = line;
 #line 426 "/home/jens/Source/shotwell/src/Properties.vala"
-			if (_tmp104_ != NULL) {
-#line 3651 "Properties.c"
-				const gchar* _tmp105_ = NULL;
-				const gchar* _tmp106_ = NULL;
-				gchar* _tmp107_ = NULL;
-				gchar* _tmp108_ = NULL;
-				gchar* _tmp109_ = NULL;
+			if (_tmp89_ != NULL) {
+#line 3596 "Properties.c"
+				const gchar* _tmp90_;
+				const gchar* _tmp91_;
+				gchar* _tmp92_;
+				gchar* _tmp93_;
+				gchar* _tmp94_;
 #line 427 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp105_ = line;
+				_tmp90_ = line;
 #line 427 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp106_ = self->priv->aperture;
+				_tmp91_ = self->priv->aperture;
 #line 427 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp107_ = g_strconcat (", ", _tmp106_, NULL);
+				_tmp92_ = g_strconcat (", ", _tmp91_, NULL);
 #line 427 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp108_ = _tmp107_;
+				_tmp93_ = _tmp92_;
 #line 427 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp109_ = g_strconcat (_tmp105_, _tmp108_, NULL);
+				_tmp94_ = g_strconcat (_tmp90_, _tmp93_, NULL);
 #line 427 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (line);
 #line 427 "/home/jens/Source/shotwell/src/Properties.vala"
-				line = _tmp109_;
+				line = _tmp94_;
 #line 427 "/home/jens/Source/shotwell/src/Properties.vala"
-				_g_free0 (_tmp108_);
-#line 3673 "Properties.c"
+				_g_free0 (_tmp93_);
+#line 3618 "Properties.c"
 			} else {
-				const gchar* _tmp110_ = NULL;
-				gchar* _tmp111_ = NULL;
+				const gchar* _tmp95_;
+				gchar* _tmp96_;
 #line 429 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp110_ = self->priv->aperture;
+				_tmp95_ = self->priv->aperture;
 #line 429 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp111_ = g_strdup (_tmp110_);
+				_tmp96_ = g_strdup (_tmp95_);
 #line 429 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (line);
 #line 429 "/home/jens/Source/shotwell/src/Properties.vala"
-				line = _tmp111_;
-#line 3685 "Properties.c"
+				line = _tmp96_;
+#line 3630 "Properties.c"
 			}
 		}
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp114_ = self->priv->exposure;
+		_tmp99_ = self->priv->exposure;
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (g_strcmp0 (_tmp114_, "") == 0) {
+		if (g_strcmp0 (_tmp99_, "") == 0) {
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp113_ = TRUE;
-#line 3694 "Properties.c"
+			_tmp98_ = TRUE;
+#line 3639 "Properties.c"
 		} else {
-			const gchar* _tmp115_ = NULL;
+			const gchar* _tmp100_;
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp115_ = self->priv->aperture;
+			_tmp100_ = self->priv->aperture;
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp113_ = g_strcmp0 (_tmp115_, "") == 0;
-#line 3701 "Properties.c"
+			_tmp98_ = g_strcmp0 (_tmp100_, "") == 0;
+#line 3646 "Properties.c"
 		}
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp113_) {
-#line 3705 "Properties.c"
-			const gchar* _tmp116_ = NULL;
+		if (_tmp98_) {
+#line 3650 "Properties.c"
+			const gchar* _tmp101_;
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp116_ = self->priv->iso;
+			_tmp101_ = self->priv->iso;
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp112_ = g_strcmp0 (_tmp116_, "") != 0;
-#line 3711 "Properties.c"
+			_tmp97_ = g_strcmp0 (_tmp101_, "") != 0;
+#line 3656 "Properties.c"
 		} else {
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp112_ = FALSE;
-#line 3715 "Properties.c"
+			_tmp97_ = FALSE;
+#line 3660 "Properties.c"
 		}
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp112_) {
-#line 3719 "Properties.c"
-			const gchar* _tmp117_ = NULL;
-			const gchar* _tmp125_ = NULL;
-			const gchar* _tmp126_ = NULL;
+		if (_tmp97_) {
+#line 3664 "Properties.c"
+			const gchar* _tmp102_;
+			const gchar* _tmp110_;
 #line 434 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp117_ = line;
+			_tmp102_ = line;
 #line 434 "/home/jens/Source/shotwell/src/Properties.vala"
-			if (_tmp117_ != NULL) {
-#line 3727 "Properties.c"
-				const gchar* _tmp118_ = NULL;
-				const gchar* _tmp119_ = NULL;
-				gchar* _tmp120_ = NULL;
-				gchar* _tmp121_ = NULL;
-				gchar* _tmp122_ = NULL;
+			if (_tmp102_ != NULL) {
+#line 3671 "Properties.c"
+				const gchar* _tmp103_;
+				const gchar* _tmp104_;
+				gchar* _tmp105_;
+				gchar* _tmp106_;
+				gchar* _tmp107_;
 #line 435 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp118_ = line;
+				_tmp103_ = line;
 #line 435 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp119_ = self->priv->iso;
+				_tmp104_ = self->priv->iso;
 #line 435 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp120_ = g_strconcat (", " "ISO ", _tmp119_, NULL);
+				_tmp105_ = g_strconcat (", " "ISO ", _tmp104_, NULL);
 #line 435 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp121_ = _tmp120_;
+				_tmp106_ = _tmp105_;
 #line 435 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp122_ = g_strconcat (_tmp118_, _tmp121_, NULL);
+				_tmp107_ = g_strconcat (_tmp103_, _tmp106_, NULL);
 #line 435 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (line);
 #line 435 "/home/jens/Source/shotwell/src/Properties.vala"
-				line = _tmp122_;
+				line = _tmp107_;
 #line 435 "/home/jens/Source/shotwell/src/Properties.vala"
-				_g_free0 (_tmp121_);
-#line 3749 "Properties.c"
+				_g_free0 (_tmp106_);
+#line 3693 "Properties.c"
 			} else {
-				const gchar* _tmp123_ = NULL;
-				gchar* _tmp124_ = NULL;
+				const gchar* _tmp108_;
+				gchar* _tmp109_;
 #line 437 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp123_ = self->priv->iso;
+				_tmp108_ = self->priv->iso;
 #line 437 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp124_ = g_strconcat ("ISO ", _tmp123_, NULL);
+				_tmp109_ = g_strconcat ("ISO ", _tmp108_, NULL);
 #line 437 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (line);
 #line 437 "/home/jens/Source/shotwell/src/Properties.vala"
-				line = _tmp124_;
-#line 3761 "Properties.c"
+				line = _tmp109_;
+#line 3705 "Properties.c"
 			}
 #line 439 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp125_ = _ ("Exposure:");
-#line 439 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp126_ = line;
+			_tmp110_ = line;
 #line 439 "/home/jens/Source/shotwell/src/Properties.vala"
-			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp125_, _tmp126_, FALSE);
-#line 3769 "Properties.c"
+			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure:"), _tmp110_, FALSE);
+#line 3711 "Properties.c"
 		} else {
-			const gchar* _tmp127_ = NULL;
-			const gchar* _tmp130_ = NULL;
+			const gchar* _tmp111_;
+			const gchar* _tmp113_;
 #line 442 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp127_ = line;
+			_tmp111_ = line;
 #line 442 "/home/jens/Source/shotwell/src/Properties.vala"
-			if (_tmp127_ != NULL) {
-#line 3777 "Properties.c"
-				const gchar* _tmp128_ = NULL;
-				const gchar* _tmp129_ = NULL;
-#line 443 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp128_ = _ ("Exposure:");
+			if (_tmp111_ != NULL) {
+#line 3719 "Properties.c"
+				const gchar* _tmp112_;
 #line 443 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp129_ = line;
+				_tmp112_ = line;
 #line 443 "/home/jens/Source/shotwell/src/Properties.vala"
-				properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp128_, _tmp129_, FALSE);
-#line 3786 "Properties.c"
+				properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure:"), _tmp112_, FALSE);
+#line 3725 "Properties.c"
 			}
 #line 446 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp130_ = self->priv->iso;
+			_tmp113_ = self->priv->iso;
 #line 446 "/home/jens/Source/shotwell/src/Properties.vala"
-			if (g_strcmp0 (_tmp130_, "") != 0) {
-#line 3792 "Properties.c"
-				const gchar* _tmp131_ = NULL;
+			if (g_strcmp0 (_tmp113_, "") != 0) {
+#line 3731 "Properties.c"
+				const gchar* _tmp114_;
 #line 447 "/home/jens/Source/shotwell/src/Properties.vala"
-				_tmp131_ = line;
+				_tmp114_ = line;
 #line 447 "/home/jens/Source/shotwell/src/Properties.vala"
-				if (_tmp131_ != NULL) {
-#line 3798 "Properties.c"
-					const gchar* _tmp132_ = NULL;
-					gchar* _tmp133_ = NULL;
-					gchar* _tmp134_ = NULL;
+				if (_tmp114_ != NULL) {
+#line 3737 "Properties.c"
+					const gchar* _tmp115_;
+					gchar* _tmp116_;
+					gchar* _tmp117_;
 #line 448 "/home/jens/Source/shotwell/src/Properties.vala"
-					_tmp132_ = self->priv->iso;
+					_tmp115_ = self->priv->iso;
 #line 448 "/home/jens/Source/shotwell/src/Properties.vala"
-					_tmp133_ = g_strconcat ("ISO ", _tmp132_, NULL);
+					_tmp116_ = g_strconcat ("ISO ", _tmp115_, NULL);
 #line 448 "/home/jens/Source/shotwell/src/Properties.vala"
-					_tmp134_ = _tmp133_;
+					_tmp117_ = _tmp116_;
 #line 448 "/home/jens/Source/shotwell/src/Properties.vala"
-					properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp134_, FALSE);
+					properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp117_, FALSE);
 #line 448 "/home/jens/Source/shotwell/src/Properties.vala"
-					_g_free0 (_tmp134_);
-#line 3812 "Properties.c"
+					_g_free0 (_tmp117_);
+#line 3751 "Properties.c"
 				} else {
-					const gchar* _tmp135_ = NULL;
-					const gchar* _tmp136_ = NULL;
-					gchar* _tmp137_ = NULL;
-					gchar* _tmp138_ = NULL;
+					const gchar* _tmp118_;
+					gchar* _tmp119_;
+					gchar* _tmp120_;
 #line 450 "/home/jens/Source/shotwell/src/Properties.vala"
-					_tmp135_ = _ ("Exposure:");
+					_tmp118_ = self->priv->iso;
 #line 450 "/home/jens/Source/shotwell/src/Properties.vala"
-					_tmp136_ = self->priv->iso;
+					_tmp119_ = g_strconcat ("ISO ", _tmp118_, NULL);
 #line 450 "/home/jens/Source/shotwell/src/Properties.vala"
-					_tmp137_ = g_strconcat ("ISO ", _tmp136_, NULL);
+					_tmp120_ = _tmp119_;
 #line 450 "/home/jens/Source/shotwell/src/Properties.vala"
-					_tmp138_ = _tmp137_;
+					properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure:"), _tmp120_, FALSE);
 #line 450 "/home/jens/Source/shotwell/src/Properties.vala"
-					properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp135_, _tmp138_, FALSE);
-#line 450 "/home/jens/Source/shotwell/src/Properties.vala"
-					_g_free0 (_tmp138_);
-#line 3830 "Properties.c"
+					_g_free0 (_tmp120_);
+#line 3766 "Properties.c"
 				}
 			}
 		}
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (line);
-#line 3836 "Properties.c"
+#line 3772 "Properties.c"
 	}
 }
 
@@ -3843,24 +3779,24 @@ static void basic_properties_class_init (BasicPropertiesClass * klass) {
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_type_class_add_private (klass, sizeof (BasicPropertiesPrivate));
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->clear_properties = (void (*)(Properties*)) basic_properties_real_clear_properties;
+	((PropertiesClass *) klass)->clear_properties = (void (*) (Properties *)) basic_properties_real_clear_properties;
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->get_single_properties = (void (*)(Properties*, DataView*)) basic_properties_real_get_single_properties;
+	((PropertiesClass *) klass)->get_single_properties = (void (*) (Properties *, DataView*)) basic_properties_real_get_single_properties;
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->get_multiple_properties = (void (*)(Properties*, GeeIterable*)) basic_properties_real_get_multiple_properties;
+	((PropertiesClass *) klass)->get_multiple_properties = (void (*) (Properties *, GeeIterable*)) basic_properties_real_get_multiple_properties;
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->get_properties = (void (*)(Properties*, Page*)) basic_properties_real_get_properties;
+	((PropertiesClass *) klass)->get_properties = (void (*) (Properties *, Page*)) basic_properties_real_get_properties;
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->internal_update_properties = (void (*)(Properties*, Page*)) basic_properties_real_internal_update_properties;
+	((PropertiesClass *) klass)->internal_update_properties = (void (*) (Properties *, Page*)) basic_properties_real_internal_update_properties;
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (klass)->finalize = basic_properties_finalize;
-#line 3858 "Properties.c"
+#line 3794 "Properties.c"
 }
 
 
 static void basic_properties_instance_init (BasicProperties * self) {
-	time_t _tmp0_ = 0;
-	time_t _tmp1_ = 0;
+	time_t _tmp0_;
+	time_t _tmp1_;
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv = BASIC_PROPERTIES_GET_PRIVATE (self);
 #line 158 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -3871,11 +3807,11 @@ static void basic_properties_instance_init (BasicProperties * self) {
 	_tmp1_ = time (NULL);
 #line 159 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->end_time = _tmp1_;
-#line 3875 "Properties.c"
+#line 3811 "Properties.c"
 }
 
 
-static void basic_properties_finalize (GObject* obj) {
+static void basic_properties_finalize (GObject * obj) {
 	BasicProperties * self;
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BASIC_PROPERTIES, BasicProperties);
@@ -3893,7 +3829,7 @@ static void basic_properties_finalize (GObject* obj) {
 	_g_free0 (self->priv->raw_assoc);
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (basic_properties_parent_class)->finalize (obj);
-#line 3897 "Properties.c"
+#line 3833 "Properties.c"
 }
 
 
@@ -3914,29 +3850,28 @@ static gboolean _gtk_widget_hide_on_delete_gtk_widget_delete_event (GtkWidget* _
 	result = gtk_widget_hide_on_delete ((GtkWidget*) self);
 #line 649 "/home/jens/Source/shotwell/src/Properties.vala"
 	return result;
-#line 3918 "Properties.c"
+#line 3854 "Properties.c"
 }
 
 
 ExtendedPropertiesWindow* extended_properties_window_construct (GType object_type, GtkWindow* owner) {
 	ExtendedPropertiesWindow * self = NULL;
 	gboolean use_header = FALSE;
-	GtkSettings* _tmp0_ = NULL;
+	GtkSettings* _tmp0_;
 	gint _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_ = NULL;
-	GtkWindow* _tmp4_ = NULL;
-	ExtendedPropertiesWindowExtendedProperties* _tmp5_ = NULL;
-	ExtendedPropertiesWindowExtendedProperties* _tmp6_ = NULL;
-	ExtendedPropertiesWindowExtendedProperties* _tmp7_ = NULL;
-	ExtendedPropertiesWindowExtendedProperties* _tmp8_ = NULL;
-	ExtendedPropertiesWindowExtendedProperties* _tmp9_ = NULL;
-	ExtendedPropertiesWindowExtendedProperties* _tmp10_ = NULL;
-	ExtendedPropertiesWindowExtendedProperties* _tmp11_ = NULL;
-	ExtendedPropertiesWindowExtendedProperties* _tmp12_ = NULL;
-	ExtendedPropertiesWindowExtendedProperties* _tmp13_ = NULL;
-	GtkBox* _tmp14_ = NULL;
-	ExtendedPropertiesWindowExtendedProperties* _tmp15_ = NULL;
+	gboolean _tmp2_;
+	GtkWindow* _tmp3_;
+	ExtendedPropertiesWindowExtendedProperties* _tmp4_;
+	ExtendedPropertiesWindowExtendedProperties* _tmp5_;
+	ExtendedPropertiesWindowExtendedProperties* _tmp6_;
+	ExtendedPropertiesWindowExtendedProperties* _tmp7_;
+	ExtendedPropertiesWindowExtendedProperties* _tmp8_;
+	ExtendedPropertiesWindowExtendedProperties* _tmp9_;
+	ExtendedPropertiesWindowExtendedProperties* _tmp10_;
+	ExtendedPropertiesWindowExtendedProperties* _tmp11_;
+	ExtendedPropertiesWindowExtendedProperties* _tmp12_;
+	GtkBox* _tmp13_;
+	ExtendedPropertiesWindowExtendedProperties* _tmp14_;
 #line 635 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), NULL);
 #line 637 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -3949,11 +3884,11 @@ ExtendedPropertiesWindow* extended_properties_window_construct (GType object_typ
 	if (_tmp2_) {
 #line 638 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp1_ = 1;
-#line 3953 "Properties.c"
+#line 3888 "Properties.c"
 	} else {
 #line 638 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp1_ = 0;
-#line 3957 "Properties.c"
+#line 3892 "Properties.c"
 	}
 #line 638 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = (ExtendedPropertiesWindow*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
@@ -3966,91 +3901,89 @@ ExtendedPropertiesWindow* extended_properties_window_construct (GType object_typ
 #line 643 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 644 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp3_ = _ ("Extended Information");
-#line 644 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp3_);
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _ ("Extended Information"));
 #line 645 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_window_set_position (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GTK_WIN_POS_CENTER);
 #line 646 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp4_ = owner;
+	_tmp3_ = owner;
 #line 646 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp3_);
 #line 647 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
 #line 649 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _gtk_widget_hide_on_delete_gtk_widget_delete_event, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), 0);
 #line 651 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp5_ = extended_properties_window_extended_properties_new ();
+	_tmp4_ = extended_properties_window_extended_properties_new ();
 #line 651 "/home/jens/Source/shotwell/src/Properties.vala"
-	g_object_ref_sink (_tmp5_);
+	g_object_ref_sink (_tmp4_);
 #line 651 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (self->priv->properties);
 #line 651 "/home/jens/Source/shotwell/src/Properties.vala"
-	self->priv->properties = _tmp5_;
+	self->priv->properties = _tmp4_;
 #line 652 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp6_ = self->priv->properties;
+	_tmp5_ = self->priv->properties;
 #line 652 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
 #line 653 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp7_ = self->priv->properties;
+	_tmp6_ = self->priv->properties;
 #line 653 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
 #line 654 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp8_ = self->priv->properties;
+	_tmp7_ = self->priv->properties;
 #line 654 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), TRUE);
+	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 655 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp9_ = self->priv->properties;
+	_tmp8_ = self->priv->properties;
 #line 655 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE);
+	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 656 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp10_ = self->priv->properties;
+	_tmp9_ = self->priv->properties;
 #line 656 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 3);
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), 3);
 #line 657 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp11_ = self->priv->properties;
+	_tmp10_ = self->priv->properties;
 #line 657 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 3);
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 3);
 #line 658 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp12_ = self->priv->properties;
+	_tmp11_ = self->priv->properties;
 #line 658 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 3);
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 3);
 #line 659 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp13_ = self->priv->properties;
+	_tmp12_ = self->priv->properties;
 #line 659 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 3);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 3);
 #line 660 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp14_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+	_tmp13_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 660 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp15_ = self->priv->properties;
+	_tmp14_ = self->priv->properties;
 #line 660 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
 #line 635 "/home/jens/Source/shotwell/src/Properties.vala"
 	return self;
-#line 4031 "Properties.c"
+#line 3964 "Properties.c"
 }
 
 
 ExtendedPropertiesWindow* extended_properties_window_new (GtkWindow* owner) {
 #line 635 "/home/jens/Source/shotwell/src/Properties.vala"
 	return extended_properties_window_construct (TYPE_EXTENDED_PROPERTIES_WINDOW, owner);
-#line 4038 "Properties.c"
+#line 3971 "Properties.c"
 }
 
 
 static gboolean extended_properties_window_real_button_press_event (GtkWidget* base, GdkEventButton* event) {
 	ExtendedPropertiesWindow * self;
 	gboolean result = FALSE;
-	GdkEventButton* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	GdkEventButton* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	GdkEventButton* _tmp7_ = NULL;
-	gdouble _tmp8_ = 0.0;
-	GdkEventButton* _tmp9_ = NULL;
-	gdouble _tmp10_ = 0.0;
-	GdkEventButton* _tmp11_ = NULL;
-	guint32 _tmp12_ = 0U;
+	GdkEventButton* _tmp0_;
+	guint _tmp1_;
+	GdkEventButton* _tmp5_;
+	guint _tmp6_;
+	GdkEventButton* _tmp7_;
+	gdouble _tmp8_;
+	GdkEventButton* _tmp9_;
+	gdouble _tmp10_;
+	GdkEventButton* _tmp11_;
+	guint32 _tmp12_;
 #line 663 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXTENDED_PROPERTIES_WINDOW, ExtendedPropertiesWindow);
 #line 663 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4061,30 +3994,30 @@ static gboolean extended_properties_window_real_button_press_event (GtkWidget* b
 	_tmp1_ = _tmp0_->button;
 #line 665 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp1_ != ((guint) 1)) {
-#line 4065 "Properties.c"
+#line 3998 "Properties.c"
 		gboolean _tmp2_ = FALSE;
 #line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (GTK_WIDGET_CLASS (extended_properties_window_parent_class)->button_press_event != NULL) {
-#line 4069 "Properties.c"
-			GdkEventButton* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 4002 "Properties.c"
+			GdkEventButton* _tmp3_;
+			gboolean _tmp4_;
 #line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp3_ = event;
 #line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp4_ = GTK_WIDGET_CLASS (extended_properties_window_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), gtk_widget_get_type (), GtkWidget), _tmp3_);
 #line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp2_ = _tmp4_;
-#line 4078 "Properties.c"
+#line 4011 "Properties.c"
 		} else {
 #line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp2_ = TRUE;
-#line 4082 "Properties.c"
+#line 4015 "Properties.c"
 		}
 #line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 		result = _tmp2_;
 #line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 		return result;
-#line 4088 "Properties.c"
+#line 4021 "Properties.c"
 	}
 #line 668 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp5_ = event;
@@ -4108,21 +4041,21 @@ static gboolean extended_properties_window_real_button_press_event (GtkWidget* b
 	result = TRUE;
 #line 670 "/home/jens/Source/shotwell/src/Properties.vala"
 	return result;
-#line 4112 "Properties.c"
+#line 4045 "Properties.c"
 }
 
 
 static gboolean extended_properties_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
 	ExtendedPropertiesWindow * self;
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
-	AppWindow* _tmp3_ = NULL;
-	AppWindow* _tmp4_ = NULL;
-	GdkEventKey* _tmp5_ = NULL;
+	GdkEventKey* _tmp0_;
+	guint _tmp1_;
+	const gchar* _tmp2_;
+	AppWindow* _tmp3_;
+	AppWindow* _tmp4_;
+	GdkEventKey* _tmp5_;
 	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
+	gboolean _tmp7_;
 #line 673 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXTENDED_PROPERTIES_WINDOW, ExtendedPropertiesWindow);
 #line 673 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4141,7 +4074,7 @@ static gboolean extended_properties_window_real_key_press_event (GtkWidget* base
 		result = TRUE;
 #line 677 "/home/jens/Source/shotwell/src/Properties.vala"
 		return result;
-#line 4145 "Properties.c"
+#line 4078 "Properties.c"
 	}
 #line 680 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp3_ = app_window_get_instance ();
@@ -4159,13 +4092,13 @@ static gboolean extended_properties_window_real_key_press_event (GtkWidget* base
 	result = _tmp7_;
 #line 680 "/home/jens/Source/shotwell/src/Properties.vala"
 	return result;
-#line 4163 "Properties.c"
+#line 4096 "Properties.c"
 }
 
 
 void extended_properties_window_update_properties (ExtendedPropertiesWindow* self, Page* page) {
-	ExtendedPropertiesWindowExtendedProperties* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
+	ExtendedPropertiesWindowExtendedProperties* _tmp0_;
+	Page* _tmp1_;
 #line 683 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_EXTENDED_PROPERTIES_WINDOW (self));
 #line 683 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4176,13 +4109,13 @@ void extended_properties_window_update_properties (ExtendedPropertiesWindow* sel
 	_tmp1_ = page;
 #line 684 "/home/jens/Source/shotwell/src/Properties.vala"
 	properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROPERTIES, Properties), _tmp1_);
-#line 4180 "Properties.c"
+#line 4113 "Properties.c"
 }
 
 
 static void extended_properties_window_real_show_all (GtkWidget* base) {
 	ExtendedPropertiesWindow * self;
-	ExtendedPropertiesWindowExtendedProperties* _tmp0_ = NULL;
+	ExtendedPropertiesWindowExtendedProperties* _tmp0_;
 #line 687 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXTENDED_PROPERTIES_WINDOW, ExtendedPropertiesWindow);
 #line 688 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4193,36 +4126,36 @@ static void extended_properties_window_real_show_all (GtkWidget* base) {
 	properties_unselect_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROPERTIES, Properties));
 #line 690 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 4197 "Properties.c"
+#line 4130 "Properties.c"
 }
 
 
 static gpointer _dimensions_dup0 (gpointer self) {
 #line 498 "/home/jens/Source/shotwell/src/Properties.vala"
 	return self ? dimensions_dup (self) : NULL;
-#line 4204 "Properties.c"
+#line 4137 "Properties.c"
 }
 
 
 static void extended_properties_window_extended_properties_real_clear_properties (Properties* base) {
 	ExtendedPropertiesWindowExtendedProperties * self;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 	Dimensions _tmp2_ = {0};
-	Dimensions* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
+	Dimensions* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
 #line 491 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EXTENDED_PROPERTIES_WINDOW_TYPE_EXTENDED_PROPERTIES, ExtendedPropertiesWindowExtendedProperties);
 #line 492 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4333,18 +4266,18 @@ static void extended_properties_window_extended_properties_real_clear_properties
 	_g_free0 (self->priv->comment);
 #line 513 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->comment = _tmp16_;
-#line 4337 "Properties.c"
+#line 4270 "Properties.c"
 }
 
 
 static void extended_properties_window_extended_properties_real_get_single_properties (Properties* base, DataView* view) {
 	ExtendedPropertiesWindowExtendedProperties * self;
-	DataView* _tmp0_ = NULL;
+	DataView* _tmp0_;
 	DataSource* source = NULL;
-	DataView* _tmp1_ = NULL;
-	DataSource* _tmp2_ = NULL;
-	DataSource* _tmp3_ = NULL;
-	DataSource* _tmp4_ = NULL;
+	DataView* _tmp1_;
+	DataSource* _tmp2_;
+	DataSource* _tmp3_;
+	DataSource* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 516 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EXTENDED_PROPERTIES_WINDOW_TYPE_EXTENDED_PROPERTIES, ExtendedPropertiesWindowExtendedProperties);
@@ -4368,76 +4301,76 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 		_g_object_unref0 (source);
 #line 521 "/home/jens/Source/shotwell/src/Properties.vala"
 		return;
-#line 4372 "Properties.c"
+#line 4305 "Properties.c"
 	}
 #line 523 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp4_ = source;
 #line 523 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_MEDIA_SOURCE)) {
-#line 4378 "Properties.c"
+#line 4311 "Properties.c"
 		MediaSource* media = NULL;
-		DataSource* _tmp5_ = NULL;
-		MediaSource* _tmp6_ = NULL;
-		MediaSource* _tmp7_ = NULL;
-		GFile* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		MediaSource* _tmp11_ = NULL;
-		GFile* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		MediaSource* _tmp15_ = NULL;
-		guint64 _tmp16_ = 0ULL;
+		DataSource* _tmp5_;
+		MediaSource* _tmp6_;
+		MediaSource* _tmp7_;
+		GFile* _tmp8_;
+		GFile* _tmp9_;
+		gchar* _tmp10_;
+		MediaSource* _tmp11_;
+		GFile* _tmp12_;
+		GFile* _tmp13_;
+		gchar* _tmp14_;
+		MediaSource* _tmp15_;
+		guint64 _tmp16_;
 		Photo* photo = NULL;
-		MediaSource* _tmp17_ = NULL;
-		Photo* _tmp18_ = NULL;
-		Photo* _tmp19_ = NULL;
+		MediaSource* _tmp17_;
+		Photo* _tmp18_;
+		Photo* _tmp19_;
 		PhotoMetadata* metadata = NULL;
-		PhotoMetadata* _tmp26_ = NULL;
-		PhotoMetadata* _tmp27_ = NULL;
-		MetadataDateTime* _tmp28_ = NULL;
-		MetadataDateTime* _tmp29_ = NULL;
-		gboolean _tmp30_ = FALSE;
-		Photo* _tmp36_ = NULL;
-		PhotoFileFormat _tmp37_ = 0;
-		PhotoMetadata* _tmp38_ = NULL;
-		Dimensions* _tmp39_ = NULL;
-		PhotoMetadata* _tmp40_ = NULL;
-		gchar* _tmp41_ = NULL;
-		PhotoMetadata* _tmp42_ = NULL;
-		gchar* _tmp43_ = NULL;
-		PhotoMetadata* _tmp44_ = NULL;
-		gchar* _tmp45_ = NULL;
-		PhotoMetadata* _tmp46_ = NULL;
-		gchar* _tmp47_ = NULL;
-		PhotoMetadata* _tmp48_ = NULL;
+		PhotoMetadata* _tmp26_;
+		PhotoMetadata* _tmp27_;
+		MetadataDateTime* _tmp28_;
+		MetadataDateTime* _tmp29_;
+		gboolean _tmp30_;
+		Photo* _tmp36_;
+		PhotoFileFormat _tmp37_;
+		PhotoMetadata* _tmp38_;
+		Dimensions* _tmp39_;
+		PhotoMetadata* _tmp40_;
+		gchar* _tmp41_;
+		PhotoMetadata* _tmp42_;
+		gchar* _tmp43_;
+		PhotoMetadata* _tmp44_;
+		gchar* _tmp45_;
+		PhotoMetadata* _tmp46_;
+		gchar* _tmp47_;
+		PhotoMetadata* _tmp48_;
 		gdouble _tmp49_ = 0.0;
 		gchar* _tmp50_ = NULL;
 		gdouble _tmp51_ = 0.0;
 		gchar* _tmp52_ = NULL;
 		gdouble _tmp53_ = 0.0;
-		PhotoMetadata* _tmp54_ = NULL;
-		gchar* _tmp55_ = NULL;
-		PhotoMetadata* _tmp56_ = NULL;
-		gchar* _tmp57_ = NULL;
-		PhotoMetadata* _tmp58_ = NULL;
-		gchar* _tmp59_ = NULL;
-		PhotoMetadata* _tmp60_ = NULL;
-		gchar* _tmp61_ = NULL;
+		PhotoMetadata* _tmp54_;
+		gchar* _tmp55_;
+		PhotoMetadata* _tmp56_;
+		gchar* _tmp57_;
+		PhotoMetadata* _tmp58_;
+		gchar* _tmp59_;
+		PhotoMetadata* _tmp60_;
+		gchar* _tmp61_;
 		time_t exposure_time_obj = 0;
-		PhotoMetadata* _tmp62_ = NULL;
-		MetadataDateTime* _tmp63_ = NULL;
-		MetadataDateTime* _tmp64_ = NULL;
-		time_t _tmp65_ = 0;
-		time_t _tmp66_ = 0;
-		time_t _tmp67_ = 0;
+		PhotoMetadata* _tmp62_;
+		MetadataDateTime* _tmp63_;
+		MetadataDateTime* _tmp64_;
+		time_t _tmp65_;
+		time_t _tmp66_;
+		time_t _tmp67_;
 		struct tm _tmp68_ = {0};
-		gchar* _tmp69_ = NULL;
-		time_t _tmp70_ = 0;
+		gchar* _tmp69_;
+		time_t _tmp70_;
 		struct tm _tmp71_ = {0};
-		gchar* _tmp72_ = NULL;
-		MediaSource* _tmp73_ = NULL;
-		gchar* _tmp74_ = NULL;
+		gchar* _tmp72_;
+		MediaSource* _tmp73_;
+		gchar* _tmp74_;
 #line 524 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp5_ = source;
 #line 524 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4496,13 +4429,13 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			_g_object_unref0 (source);
 #line 534 "/home/jens/Source/shotwell/src/Properties.vala"
 			return;
-#line 4500 "Properties.c"
+#line 4433 "Properties.c"
 		}
 		{
 			PhotoMetadata* _tmp20_ = NULL;
-			Photo* _tmp21_ = NULL;
-			PhotoMetadata* _tmp22_ = NULL;
-			PhotoMetadata* _tmp23_ = NULL;
+			Photo* _tmp21_;
+			PhotoMetadata* _tmp22_;
+			PhotoMetadata* _tmp23_;
 #line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp21_ = photo;
 #line 543 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4511,8 +4444,8 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			_tmp20_ = _tmp22_;
 #line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4515 "Properties.c"
-				goto __catch433_g_error;
+#line 4448 "Properties.c"
+				goto __catch434_g_error;
 			}
 #line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp23_ = _tmp20_;
@@ -4524,14 +4457,14 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			metadata = _tmp23_;
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			_media_metadata_unref0 (_tmp20_);
-#line 4528 "Properties.c"
+#line 4461 "Properties.c"
 		}
-		goto __finally433;
-		__catch433_g_error:
+		goto __finally434;
+		__catch434_g_error:
 		{
 			GError* e = NULL;
-			Photo* _tmp24_ = NULL;
-			PhotoMetadata* _tmp25_ = NULL;
+			Photo* _tmp24_;
+			PhotoMetadata* _tmp25_;
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			e = _inner_error_;
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4546,9 +4479,9 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			metadata = _tmp25_;
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_error_free0 (e);
-#line 4550 "Properties.c"
+#line 4483 "Properties.c"
 		}
-		__finally433:
+		__finally434:
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4565,7 +4498,7 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			g_clear_error (&_inner_error_);
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			return;
-#line 4569 "Properties.c"
+#line 4502 "Properties.c"
 		}
 #line 548 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp26_ = metadata;
@@ -4581,7 +4514,7 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			_g_object_unref0 (source);
 #line 549 "/home/jens/Source/shotwell/src/Properties.vala"
 			return;
-#line 4585 "Properties.c"
+#line 4518 "Properties.c"
 		}
 #line 556 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp27_ = metadata;
@@ -4595,12 +4528,12 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 		_metadata_date_time_unref0 (_tmp29_);
 #line 556 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp30_) {
-#line 4599 "Properties.c"
-			PhotoMetadata* _tmp31_ = NULL;
-			Photo* _tmp32_ = NULL;
-			time_t _tmp33_ = 0;
-			MetadataDateTime* _tmp34_ = NULL;
-			MetadataDateTime* _tmp35_ = NULL;
+#line 4532 "Properties.c"
+			PhotoMetadata* _tmp31_;
+			Photo* _tmp32_;
+			time_t _tmp33_;
+			MetadataDateTime* _tmp34_;
+			MetadataDateTime* _tmp35_;
 #line 557 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp31_ = metadata;
 #line 557 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4615,7 +4548,7 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			photo_metadata_set_exposure_date_time (_tmp31_, _tmp35_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 557 "/home/jens/Source/shotwell/src/Properties.vala"
 			_metadata_date_time_unref0 (_tmp35_);
-#line 4619 "Properties.c"
+#line 4552 "Properties.c"
 		}
 #line 559 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp36_ = photo;
@@ -4761,19 +4694,19 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 		_g_object_unref0 (photo);
 #line 523 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (media);
-#line 4765 "Properties.c"
+#line 4698 "Properties.c"
 	} else {
-		DataSource* _tmp75_ = NULL;
+		DataSource* _tmp75_;
 #line 574 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp75_ = source;
 #line 574 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, TYPE_EVENT_SOURCE)) {
-#line 4772 "Properties.c"
+#line 4705 "Properties.c"
 			Event* event = NULL;
-			DataSource* _tmp76_ = NULL;
-			Event* _tmp77_ = NULL;
-			Event* _tmp78_ = NULL;
-			gchar* _tmp79_ = NULL;
+			DataSource* _tmp76_;
+			Event* _tmp77_;
+			Event* _tmp78_;
+			gchar* _tmp79_;
 #line 575 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp76_ = source;
 #line 575 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4790,146 +4723,187 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			self->priv->comment = _tmp79_;
 #line 574 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (event);
-#line 4794 "Properties.c"
+#line 4727 "Properties.c"
 		}
 	}
 #line 516 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (source);
-#line 4799 "Properties.c"
+#line 4732 "Properties.c"
 }
 
 
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 4812 "Properties.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 4751 "Properties.c"
+	} else {
+		const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 4758 "Properties.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = TRUE;
+#line 4764 "Properties.c"
+	} else {
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 4774 "Properties.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 4778 "Properties.c"
+		gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 4786 "Properties.c"
+	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GRegex* _tmp9_;
+		GRegex* _tmp10_;
+		gchar* _tmp11_ = NULL;
+		GRegex* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4843 "Properties.c"
-				goto __catch434_g_regex_error;
+#line 4818 "Properties.c"
+				goto __catch435_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4852 "Properties.c"
+#line 4827 "Properties.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4868 "Properties.c"
-				goto __catch434_g_regex_error;
+#line 4843 "Properties.c"
+				goto __catch435_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4879 "Properties.c"
+#line 4854 "Properties.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 4893 "Properties.c"
+#line 4868 "Properties.c"
 	}
-	goto __finally434;
-	__catch434_g_regex_error:
+	goto __finally435;
+	__catch435_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 4907 "Properties.c"
+#line 4882 "Properties.c"
 	}
-	__finally434:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	__finally435:
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 4918 "Properties.c"
+#line 4893 "Properties.c"
 	}
 }
 
 
 static void extended_properties_window_extended_properties_real_internal_update_properties (Properties* base, Page* page) {
 	ExtendedPropertiesWindowExtendedProperties * self;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	gboolean _tmp113_ = FALSE;
-	const gchar* _tmp114_ = NULL;
+	Page* _tmp0_;
+	Page* _tmp1_;
+	gboolean _tmp97_ = FALSE;
+	const gchar* _tmp98_;
 	gboolean has_comment = FALSE;
-	const gchar* _tmp116_ = NULL;
-	gboolean _tmp117_ = FALSE;
-	const gchar* _tmp119_ = NULL;
-	gboolean _tmp120_ = FALSE;
+	const gchar* _tmp100_ = NULL;
+	gboolean _tmp101_;
+	gboolean _tmp103_;
 #line 580 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EXTENDED_PROPERTIES_WINDOW_TYPE_EXTENDED_PROPERTIES, ExtendedPropertiesWindowExtendedProperties);
 #line 580 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4942,91 +4916,76 @@ static void extended_properties_window_extended_properties_real_internal_update_
 	_tmp1_ = page;
 #line 583 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENTS_DIRECTORY_PAGE)) {
-#line 4946 "Properties.c"
+#line 4920 "Properties.c"
 	} else {
 		gchar* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-		const gchar* _tmp4_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		guint64 _tmp11_ = 0ULL;
-		const gchar* _tmp15_ = NULL;
-		gboolean _tmp16_ = FALSE;
-		gchar* _tmp19_ = NULL;
-		gboolean _tmp20_ = FALSE;
-		Dimensions* _tmp21_ = NULL;
-		const gchar* _tmp30_ = NULL;
-		const gchar* _tmp31_ = NULL;
-		gboolean _tmp32_ = FALSE;
-		const gchar* _tmp33_ = NULL;
-		const gchar* _tmp36_ = NULL;
+		const gchar* _tmp4_;
+		gchar* _tmp9_ = NULL;
+		guint64 _tmp10_;
+		gboolean _tmp14_;
+		gchar* _tmp16_ = NULL;
+		gboolean _tmp17_ = FALSE;
+		Dimensions* _tmp18_;
+		const gchar* _tmp27_ = NULL;
+		gboolean _tmp28_ = FALSE;
+		const gchar* _tmp29_;
+		const gchar* _tmp32_ = NULL;
+		gboolean _tmp33_ = FALSE;
+		const gchar* _tmp34_;
 		const gchar* _tmp37_ = NULL;
 		gboolean _tmp38_ = FALSE;
-		const gchar* _tmp39_ = NULL;
+		const gchar* _tmp39_;
 		const gchar* _tmp42_ = NULL;
-		const gchar* _tmp43_ = NULL;
-		gboolean _tmp44_ = FALSE;
-		const gchar* _tmp45_ = NULL;
-		const gchar* _tmp48_ = NULL;
-		const gchar* _tmp49_ = NULL;
-		gboolean _tmp50_ = FALSE;
-		const gchar* _tmp51_ = NULL;
-		const gchar* _tmp54_ = NULL;
-		const gchar* _tmp55_ = NULL;
-		gboolean _tmp56_ = FALSE;
+		gboolean _tmp43_ = FALSE;
+		const gchar* _tmp44_;
+		const gchar* _tmp47_ = NULL;
+		gboolean _tmp48_ = FALSE;
+		const gchar* _tmp49_;
+		const gchar* _tmp52_ = NULL;
+		gboolean _tmp53_ = FALSE;
+		const gchar* _tmp54_;
 		const gchar* _tmp57_ = NULL;
-		const gchar* _tmp60_ = NULL;
-		const gchar* _tmp61_ = NULL;
-		gboolean _tmp62_ = FALSE;
-		const gchar* _tmp63_ = NULL;
-		const gchar* _tmp66_ = NULL;
-		const gchar* _tmp67_ = NULL;
-		gboolean _tmp68_ = FALSE;
-		const gchar* _tmp69_ = NULL;
-		const gchar* _tmp72_ = NULL;
-		gchar* _tmp73_ = NULL;
+		gboolean _tmp58_ = FALSE;
+		const gchar* _tmp59_;
+		gchar* _tmp62_ = NULL;
+		gboolean _tmp63_ = FALSE;
+		gboolean _tmp64_ = FALSE;
+		gdouble _tmp65_;
+		gchar* _tmp72_ = NULL;
+		gboolean _tmp73_ = FALSE;
 		gboolean _tmp74_ = FALSE;
-		gboolean _tmp75_ = FALSE;
-		gdouble _tmp76_ = 0.0;
-		const gchar* _tmp83_ = NULL;
-		gchar* _tmp84_ = NULL;
-		gboolean _tmp85_ = FALSE;
-		gboolean _tmp86_ = FALSE;
-		gdouble _tmp87_ = 0.0;
-		const gchar* _tmp94_ = NULL;
-		const gchar* _tmp95_ = NULL;
-		gboolean _tmp96_ = FALSE;
-		const gchar* _tmp97_ = NULL;
-		const gchar* _tmp100_ = NULL;
-		const gchar* _tmp101_ = NULL;
-		gboolean _tmp102_ = FALSE;
-		const gchar* _tmp103_ = NULL;
-		const gchar* _tmp106_ = NULL;
-		const gchar* _tmp107_ = NULL;
-		gboolean _tmp108_ = FALSE;
-		const gchar* _tmp109_ = NULL;
-		const gchar* _tmp112_ = NULL;
+		gdouble _tmp75_;
+		const gchar* _tmp82_ = NULL;
+		gboolean _tmp83_ = FALSE;
+		const gchar* _tmp84_;
+		const gchar* _tmp87_ = NULL;
+		gboolean _tmp88_ = FALSE;
+		const gchar* _tmp89_;
+		const gchar* _tmp92_ = NULL;
+		gboolean _tmp93_ = FALSE;
+		const gchar* _tmp94_;
 #line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp4_ = self->priv->file_path;
 #line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp4_, "") != 0) {
-#line 5014 "Properties.c"
-			const gchar* _tmp5_ = NULL;
+#line 4973 "Properties.c"
+			const gchar* _tmp5_;
 #line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp5_ = self->priv->file_path;
 #line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp3_ = _tmp5_ != NULL;
-#line 5020 "Properties.c"
+#line 4979 "Properties.c"
 		} else {
 #line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp3_ = FALSE;
-#line 5024 "Properties.c"
+#line 4983 "Properties.c"
 		}
 #line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp3_) {
-#line 5028 "Properties.c"
-			const gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
+#line 4987 "Properties.c"
+			const gchar* _tmp6_;
+			gchar* _tmp7_;
 #line 587 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp6_ = self->priv->file_path;
 #line 587 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -5035,637 +4994,602 @@ static void extended_properties_window_extended_properties_real_internal_update_
 			_g_free0 (_tmp2_);
 #line 587 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp2_ = _tmp7_;
-#line 5039 "Properties.c"
+#line 4998 "Properties.c"
 		} else {
-			gchar* _tmp8_ = NULL;
+			gchar* _tmp8_;
 #line 587 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp8_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE);
 #line 587 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (_tmp2_);
 #line 587 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp2_ = _tmp8_;
-#line 5048 "Properties.c"
+#line 5007 "Properties.c"
 		}
 #line 586 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp9_ = _ ("Location:");
-#line 586 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp9_, _tmp2_, FALSE);
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Location:"), _tmp2_, FALSE);
 #line 589 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp11_ = self->priv->filesize;
+		_tmp10_ = self->priv->filesize;
 #line 589 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp11_ > ((guint64) 0)) {
-#line 5058 "Properties.c"
-			guint64 _tmp12_ = 0ULL;
-			gchar* _tmp13_ = NULL;
+		if (_tmp10_ > ((guint64) 0)) {
+#line 5015 "Properties.c"
+			guint64 _tmp11_;
+			gchar* _tmp12_;
 #line 590 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp12_ = self->priv->filesize;
+			_tmp11_ = self->priv->filesize;
 #line 590 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp13_ = g_format_size_full ((guint64) ((gint64) _tmp12_), G_FORMAT_SIZE_DEFAULT);
+			_tmp12_ = g_format_size_full ((guint64) ((gint64) _tmp11_), G_FORMAT_SIZE_DEFAULT);
 #line 590 "/home/jens/Source/shotwell/src/Properties.vala"
-			_g_free0 (_tmp10_);
+			_g_free0 (_tmp9_);
 #line 590 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp10_ = _tmp13_;
-#line 5069 "Properties.c"
+			_tmp9_ = _tmp12_;
+#line 5026 "Properties.c"
 		} else {
-			gchar* _tmp14_ = NULL;
+			gchar* _tmp13_;
 #line 590 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp14_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE);
+			_tmp13_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE);
 #line 590 "/home/jens/Source/shotwell/src/Properties.vala"
-			_g_free0 (_tmp10_);
+			_g_free0 (_tmp9_);
 #line 590 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp10_ = _tmp14_;
-#line 5078 "Properties.c"
+			_tmp9_ = _tmp13_;
+#line 5035 "Properties.c"
 		}
 #line 589 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp15_ = _ ("File size:");
-#line 589 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp15_, _tmp10_, FALSE);
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("File size:"), _tmp9_, FALSE);
 #line 592 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp16_ = self->priv->is_raw;
+		_tmp14_ = self->priv->is_raw;
 #line 592 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp16_) {
-#line 5088 "Properties.c"
-			const gchar* _tmp17_ = NULL;
-			const gchar* _tmp18_ = NULL;
-#line 593 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp17_ = _ ("Current Development:");
+		if (_tmp14_) {
+#line 5043 "Properties.c"
+			const gchar* _tmp15_;
 #line 593 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp18_ = self->priv->development_path;
+			_tmp15_ = self->priv->development_path;
 #line 593 "/home/jens/Source/shotwell/src/Properties.vala"
-			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp17_, _tmp18_, FALSE);
-#line 5097 "Properties.c"
+			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Current Development:"), _tmp15_, FALSE);
+#line 5049 "Properties.c"
 		}
 #line 595 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp21_ = self->priv->original_dim;
+		_tmp18_ = self->priv->original_dim;
 #line 595 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp21_ != NULL) {
-#line 5103 "Properties.c"
-			Dimensions* _tmp22_ = NULL;
-			gboolean _tmp23_ = FALSE;
+		if (_tmp18_ != NULL) {
+#line 5055 "Properties.c"
+			Dimensions* _tmp19_;
+			gboolean _tmp20_;
 #line 595 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp22_ = self->priv->original_dim;
+			_tmp19_ = self->priv->original_dim;
 #line 595 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp23_ = dimensions_has_area (_tmp22_);
+			_tmp20_ = dimensions_has_area (_tmp19_);
 #line 595 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp20_ = _tmp23_;
-#line 5112 "Properties.c"
+			_tmp17_ = _tmp20_;
+#line 5064 "Properties.c"
 		} else {
 #line 595 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp20_ = FALSE;
-#line 5116 "Properties.c"
+			_tmp17_ = FALSE;
+#line 5068 "Properties.c"
 		}
 #line 595 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp20_) {
-#line 5120 "Properties.c"
-			Dimensions* _tmp24_ = NULL;
-			gint _tmp25_ = 0;
-			Dimensions* _tmp26_ = NULL;
-			gint _tmp27_ = 0;
-			gchar* _tmp28_ = NULL;
+		if (_tmp17_) {
+#line 5072 "Properties.c"
+			Dimensions* _tmp21_;
+			gint _tmp22_;
+			Dimensions* _tmp23_;
+			gint _tmp24_;
+			gchar* _tmp25_;
 #line 596 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp24_ = self->priv->original_dim;
+			_tmp21_ = self->priv->original_dim;
 #line 596 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp25_ = (*_tmp24_).width;
+			_tmp22_ = (*_tmp21_).width;
 #line 596 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp26_ = self->priv->original_dim;
+			_tmp23_ = self->priv->original_dim;
 #line 596 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp27_ = (*_tmp26_).height;
+			_tmp24_ = (*_tmp23_).height;
 #line 596 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp28_ = g_strdup_printf ("%d &#215; %d", _tmp25_, _tmp27_);
+			_tmp25_ = g_strdup_printf ("%d &#215; %d", _tmp22_, _tmp24_);
 #line 596 "/home/jens/Source/shotwell/src/Properties.vala"
-			_g_free0 (_tmp19_);
+			_g_free0 (_tmp16_);
 #line 596 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp19_ = _tmp28_;
-#line 5140 "Properties.c"
+			_tmp16_ = _tmp25_;
+#line 5092 "Properties.c"
 		} else {
-			gchar* _tmp29_ = NULL;
+			gchar* _tmp26_;
 #line 596 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp29_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE);
+			_tmp26_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE);
 #line 596 "/home/jens/Source/shotwell/src/Properties.vala"
-			_g_free0 (_tmp19_);
+			_g_free0 (_tmp16_);
 #line 596 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp19_ = _tmp29_;
-#line 5149 "Properties.c"
+			_tmp16_ = _tmp26_;
+#line 5101 "Properties.c"
 		}
 #line 595 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp30_ = _ ("Original dimensions:");
-#line 595 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp30_, _tmp19_, FALSE);
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Original dimensions:"), _tmp16_, FALSE);
 #line 598 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp33_ = self->priv->camera_make;
+		_tmp29_ = self->priv->camera_make;
 #line 598 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (g_strcmp0 (_tmp33_, "") != 0) {
-#line 5159 "Properties.c"
-			const gchar* _tmp34_ = NULL;
+		if (g_strcmp0 (_tmp29_, "") != 0) {
+#line 5109 "Properties.c"
+			const gchar* _tmp30_;
 #line 598 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp34_ = self->priv->camera_make;
+			_tmp30_ = self->priv->camera_make;
 #line 598 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp32_ = _tmp34_ != NULL;
-#line 5165 "Properties.c"
+			_tmp28_ = _tmp30_ != NULL;
+#line 5115 "Properties.c"
 		} else {
 #line 598 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp32_ = FALSE;
-#line 5169 "Properties.c"
+			_tmp28_ = FALSE;
+#line 5119 "Properties.c"
 		}
 #line 598 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp32_) {
-#line 5173 "Properties.c"
-			const gchar* _tmp35_ = NULL;
+		if (_tmp28_) {
+#line 5123 "Properties.c"
+			const gchar* _tmp31_;
 #line 599 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp35_ = self->priv->camera_make;
+			_tmp31_ = self->priv->camera_make;
 #line 599 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp31_ = _tmp35_;
-#line 5179 "Properties.c"
+			_tmp27_ = _tmp31_;
+#line 5129 "Properties.c"
 		} else {
 #line 599 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp31_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5183 "Properties.c"
+			_tmp27_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
+#line 5133 "Properties.c"
 		}
 #line 598 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp36_ = _ ("Camera make:");
-#line 598 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp36_, _tmp31_, FALSE);
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Camera make:"), _tmp27_, FALSE);
 #line 601 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp39_ = self->priv->camera_model;
+		_tmp34_ = self->priv->camera_model;
 #line 601 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (g_strcmp0 (_tmp39_, "") != 0) {
-#line 5193 "Properties.c"
-			const gchar* _tmp40_ = NULL;
+		if (g_strcmp0 (_tmp34_, "") != 0) {
+#line 5141 "Properties.c"
+			const gchar* _tmp35_;
 #line 601 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp40_ = self->priv->camera_model;
+			_tmp35_ = self->priv->camera_model;
 #line 601 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp38_ = _tmp40_ != NULL;
-#line 5199 "Properties.c"
+			_tmp33_ = _tmp35_ != NULL;
+#line 5147 "Properties.c"
 		} else {
 #line 601 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp38_ = FALSE;
-#line 5203 "Properties.c"
+			_tmp33_ = FALSE;
+#line 5151 "Properties.c"
 		}
 #line 601 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp38_) {
-#line 5207 "Properties.c"
-			const gchar* _tmp41_ = NULL;
+		if (_tmp33_) {
+#line 5155 "Properties.c"
+			const gchar* _tmp36_;
 #line 602 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp41_ = self->priv->camera_model;
+			_tmp36_ = self->priv->camera_model;
 #line 602 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp37_ = _tmp41_;
-#line 5213 "Properties.c"
+			_tmp32_ = _tmp36_;
+#line 5161 "Properties.c"
 		} else {
 #line 602 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp37_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5217 "Properties.c"
+			_tmp32_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
+#line 5165 "Properties.c"
 		}
 #line 601 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp42_ = _ ("Camera model:");
-#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp42_, _tmp37_, FALSE);
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Camera model:"), _tmp32_, FALSE);
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp45_ = self->priv->flash;
+		_tmp39_ = self->priv->flash;
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (g_strcmp0 (_tmp45_, "") != 0) {
-#line 5227 "Properties.c"
-			const gchar* _tmp46_ = NULL;
+		if (g_strcmp0 (_tmp39_, "") != 0) {
+#line 5173 "Properties.c"
+			const gchar* _tmp40_;
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp46_ = self->priv->flash;
+			_tmp40_ = self->priv->flash;
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp44_ = _tmp46_ != NULL;
-#line 5233 "Properties.c"
+			_tmp38_ = _tmp40_ != NULL;
+#line 5179 "Properties.c"
 		} else {
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp44_ = FALSE;
-#line 5237 "Properties.c"
+			_tmp38_ = FALSE;
+#line 5183 "Properties.c"
 		}
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp44_) {
-#line 5241 "Properties.c"
-			const gchar* _tmp47_ = NULL;
+		if (_tmp38_) {
+#line 5187 "Properties.c"
+			const gchar* _tmp41_;
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp47_ = self->priv->flash;
+			_tmp41_ = self->priv->flash;
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp43_ = _tmp47_;
-#line 5247 "Properties.c"
+			_tmp37_ = _tmp41_;
+#line 5193 "Properties.c"
 		} else {
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp43_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5251 "Properties.c"
+			_tmp37_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
+#line 5197 "Properties.c"
 		}
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp48_ = _ ("Flash:");
-#line 604 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp48_, _tmp43_, FALSE);
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Flash:"), _tmp37_, FALSE);
 #line 606 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp51_ = self->priv->focal_length;
+		_tmp44_ = self->priv->focal_length;
 #line 606 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (g_strcmp0 (_tmp51_, "") != 0) {
-#line 5261 "Properties.c"
-			const gchar* _tmp52_ = NULL;
+		if (g_strcmp0 (_tmp44_, "") != 0) {
+#line 5205 "Properties.c"
+			const gchar* _tmp45_;
 #line 606 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp52_ = self->priv->focal_length;
+			_tmp45_ = self->priv->focal_length;
 #line 606 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp50_ = _tmp52_ != NULL;
-#line 5267 "Properties.c"
+			_tmp43_ = _tmp45_ != NULL;
+#line 5211 "Properties.c"
 		} else {
 #line 606 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp50_ = FALSE;
-#line 5271 "Properties.c"
+			_tmp43_ = FALSE;
+#line 5215 "Properties.c"
 		}
 #line 606 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp50_) {
-#line 5275 "Properties.c"
-			const gchar* _tmp53_ = NULL;
+		if (_tmp43_) {
+#line 5219 "Properties.c"
+			const gchar* _tmp46_;
 #line 607 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp53_ = self->priv->focal_length;
+			_tmp46_ = self->priv->focal_length;
 #line 607 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp49_ = _tmp53_;
-#line 5281 "Properties.c"
+			_tmp42_ = _tmp46_;
+#line 5225 "Properties.c"
 		} else {
 #line 607 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp49_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5285 "Properties.c"
+			_tmp42_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
+#line 5229 "Properties.c"
 		}
 #line 606 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp54_ = _ ("Focal length:");
-#line 606 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp54_, _tmp49_, FALSE);
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Focal length:"), _tmp42_, FALSE);
 #line 609 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp57_ = self->priv->exposure_date;
+		_tmp49_ = self->priv->exposure_date;
 #line 609 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (g_strcmp0 (_tmp57_, "") != 0) {
-#line 5295 "Properties.c"
-			const gchar* _tmp58_ = NULL;
+		if (g_strcmp0 (_tmp49_, "") != 0) {
+#line 5237 "Properties.c"
+			const gchar* _tmp50_;
 #line 609 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp58_ = self->priv->exposure_date;
+			_tmp50_ = self->priv->exposure_date;
 #line 609 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp56_ = _tmp58_ != NULL;
-#line 5301 "Properties.c"
+			_tmp48_ = _tmp50_ != NULL;
+#line 5243 "Properties.c"
 		} else {
 #line 609 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp56_ = FALSE;
-#line 5305 "Properties.c"
+			_tmp48_ = FALSE;
+#line 5247 "Properties.c"
 		}
 #line 609 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp56_) {
-#line 5309 "Properties.c"
-			const gchar* _tmp59_ = NULL;
+		if (_tmp48_) {
+#line 5251 "Properties.c"
+			const gchar* _tmp51_;
 #line 610 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp59_ = self->priv->exposure_date;
+			_tmp51_ = self->priv->exposure_date;
 #line 610 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp55_ = _tmp59_;
-#line 5315 "Properties.c"
+			_tmp47_ = _tmp51_;
+#line 5257 "Properties.c"
 		} else {
 #line 610 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp55_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5319 "Properties.c"
+			_tmp47_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
+#line 5261 "Properties.c"
 		}
 #line 609 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp60_ = _ ("Exposure date:");
-#line 609 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp60_, _tmp55_, FALSE);
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure date:"), _tmp47_, FALSE);
 #line 612 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp63_ = self->priv->exposure_time;
+		_tmp54_ = self->priv->exposure_time;
 #line 612 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (g_strcmp0 (_tmp63_, "") != 0) {
-#line 5329 "Properties.c"
-			const gchar* _tmp64_ = NULL;
+		if (g_strcmp0 (_tmp54_, "") != 0) {
+#line 5269 "Properties.c"
+			const gchar* _tmp55_;
 #line 612 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp64_ = self->priv->exposure_time;
+			_tmp55_ = self->priv->exposure_time;
 #line 612 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp62_ = _tmp64_ != NULL;
-#line 5335 "Properties.c"
+			_tmp53_ = _tmp55_ != NULL;
+#line 5275 "Properties.c"
 		} else {
 #line 612 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp62_ = FALSE;
-#line 5339 "Properties.c"
+			_tmp53_ = FALSE;
+#line 5279 "Properties.c"
 		}
 #line 612 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp62_) {
-#line 5343 "Properties.c"
-			const gchar* _tmp65_ = NULL;
+		if (_tmp53_) {
+#line 5283 "Properties.c"
+			const gchar* _tmp56_;
 #line 613 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp65_ = self->priv->exposure_time;
+			_tmp56_ = self->priv->exposure_time;
 #line 613 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp61_ = _tmp65_;
-#line 5349 "Properties.c"
+			_tmp52_ = _tmp56_;
+#line 5289 "Properties.c"
 		} else {
 #line 613 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp61_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5353 "Properties.c"
+			_tmp52_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
+#line 5293 "Properties.c"
 		}
 #line 612 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp66_ = _ ("Exposure time:");
-#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp66_, _tmp61_, FALSE);
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure time:"), _tmp52_, FALSE);
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp69_ = self->priv->exposure_bias;
+		_tmp59_ = self->priv->exposure_bias;
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (g_strcmp0 (_tmp69_, "") != 0) {
-#line 5363 "Properties.c"
-			const gchar* _tmp70_ = NULL;
+		if (g_strcmp0 (_tmp59_, "") != 0) {
+#line 5301 "Properties.c"
+			const gchar* _tmp60_;
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp70_ = self->priv->exposure_bias;
+			_tmp60_ = self->priv->exposure_bias;
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp68_ = _tmp70_ != NULL;
-#line 5369 "Properties.c"
+			_tmp58_ = _tmp60_ != NULL;
+#line 5307 "Properties.c"
 		} else {
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp68_ = FALSE;
-#line 5373 "Properties.c"
+			_tmp58_ = FALSE;
+#line 5311 "Properties.c"
 		}
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp68_) {
-#line 5377 "Properties.c"
-			const gchar* _tmp71_ = NULL;
+		if (_tmp58_) {
+#line 5315 "Properties.c"
+			const gchar* _tmp61_;
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp71_ = self->priv->exposure_bias;
+			_tmp61_ = self->priv->exposure_bias;
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp67_ = _tmp71_;
-#line 5383 "Properties.c"
+			_tmp57_ = _tmp61_;
+#line 5321 "Properties.c"
 		} else {
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp67_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5387 "Properties.c"
+			_tmp57_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
+#line 5325 "Properties.c"
 		}
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp72_ = _ ("Exposure bias:");
-#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp72_, _tmp67_, FALSE);
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure bias:"), _tmp57_, FALSE);
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp76_ = self->priv->gps_lat;
+		_tmp65_ = self->priv->gps_lat;
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp76_ != ((gdouble) -1)) {
-#line 5397 "Properties.c"
-			const gchar* _tmp77_ = NULL;
+		if (_tmp65_ != ((gdouble) -1)) {
+#line 5333 "Properties.c"
+			const gchar* _tmp66_;
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp77_ = self->priv->gps_lat_ref;
+			_tmp66_ = self->priv->gps_lat_ref;
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp75_ = g_strcmp0 (_tmp77_, "") != 0;
-#line 5403 "Properties.c"
+			_tmp64_ = g_strcmp0 (_tmp66_, "") != 0;
+#line 5339 "Properties.c"
 		} else {
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp75_ = FALSE;
-#line 5407 "Properties.c"
+			_tmp64_ = FALSE;
+#line 5343 "Properties.c"
 		}
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp75_) {
-#line 5411 "Properties.c"
-			const gchar* _tmp78_ = NULL;
+		if (_tmp64_) {
+#line 5347 "Properties.c"
+			const gchar* _tmp67_;
 #line 618 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp78_ = self->priv->gps_lat_ref;
+			_tmp67_ = self->priv->gps_lat_ref;
 #line 618 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp74_ = _tmp78_ != NULL;
-#line 5417 "Properties.c"
+			_tmp63_ = _tmp67_ != NULL;
+#line 5353 "Properties.c"
 		} else {
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp74_ = FALSE;
-#line 5421 "Properties.c"
+			_tmp63_ = FALSE;
+#line 5357 "Properties.c"
 		}
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp74_) {
-#line 5425 "Properties.c"
-			gdouble _tmp79_ = 0.0;
-			const gchar* _tmp80_ = NULL;
-			gchar* _tmp81_ = NULL;
+		if (_tmp63_) {
+#line 5361 "Properties.c"
+			gdouble _tmp68_;
+			const gchar* _tmp69_;
+			gchar* _tmp70_;
 #line 618 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp79_ = self->priv->gps_lat;
+			_tmp68_ = self->priv->gps_lat;
 #line 618 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp80_ = self->priv->gps_lat_ref;
+			_tmp69_ = self->priv->gps_lat_ref;
 #line 618 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp81_ = g_strdup_printf ("%f °%s", _tmp79_, _tmp80_);
+			_tmp70_ = g_strdup_printf ("%f °%s", _tmp68_, _tmp69_);
 #line 618 "/home/jens/Source/shotwell/src/Properties.vala"
-			_g_free0 (_tmp73_);
+			_g_free0 (_tmp62_);
 #line 618 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp73_ = _tmp81_;
-#line 5439 "Properties.c"
+			_tmp62_ = _tmp70_;
+#line 5375 "Properties.c"
 		} else {
-			gchar* _tmp82_ = NULL;
+			gchar* _tmp71_;
 #line 618 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp82_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE);
+			_tmp71_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE);
 #line 618 "/home/jens/Source/shotwell/src/Properties.vala"
-			_g_free0 (_tmp73_);
+			_g_free0 (_tmp62_);
 #line 618 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp73_ = _tmp82_;
-#line 5448 "Properties.c"
+			_tmp62_ = _tmp71_;
+#line 5384 "Properties.c"
 		}
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp83_ = _ ("GPS latitude:");
-#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp83_, _tmp73_, FALSE);
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("GPS latitude:"), _tmp62_, FALSE);
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp87_ = self->priv->gps_long;
+		_tmp75_ = self->priv->gps_long;
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp87_ != ((gdouble) -1)) {
-#line 5458 "Properties.c"
-			const gchar* _tmp88_ = NULL;
+		if (_tmp75_ != ((gdouble) -1)) {
+#line 5392 "Properties.c"
+			const gchar* _tmp76_;
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp88_ = self->priv->gps_long_ref;
+			_tmp76_ = self->priv->gps_long_ref;
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp86_ = g_strcmp0 (_tmp88_, "") != 0;
-#line 5464 "Properties.c"
+			_tmp74_ = g_strcmp0 (_tmp76_, "") != 0;
+#line 5398 "Properties.c"
 		} else {
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp86_ = FALSE;
-#line 5468 "Properties.c"
+			_tmp74_ = FALSE;
+#line 5402 "Properties.c"
 		}
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp86_) {
-#line 5472 "Properties.c"
-			const gchar* _tmp89_ = NULL;
+		if (_tmp74_) {
+#line 5406 "Properties.c"
+			const gchar* _tmp77_;
 #line 621 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp89_ = self->priv->gps_long_ref;
+			_tmp77_ = self->priv->gps_long_ref;
 #line 621 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp85_ = _tmp89_ != NULL;
-#line 5478 "Properties.c"
+			_tmp73_ = _tmp77_ != NULL;
+#line 5412 "Properties.c"
 		} else {
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp85_ = FALSE;
-#line 5482 "Properties.c"
+			_tmp73_ = FALSE;
+#line 5416 "Properties.c"
 		}
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp85_) {
-#line 5486 "Properties.c"
-			gdouble _tmp90_ = 0.0;
-			const gchar* _tmp91_ = NULL;
-			gchar* _tmp92_ = NULL;
+		if (_tmp73_) {
+#line 5420 "Properties.c"
+			gdouble _tmp78_;
+			const gchar* _tmp79_;
+			gchar* _tmp80_;
 #line 621 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp90_ = self->priv->gps_long;
+			_tmp78_ = self->priv->gps_long;
 #line 621 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp91_ = self->priv->gps_long_ref;
+			_tmp79_ = self->priv->gps_long_ref;
 #line 621 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp92_ = g_strdup_printf ("%f °%s", _tmp90_, _tmp91_);
+			_tmp80_ = g_strdup_printf ("%f °%s", _tmp78_, _tmp79_);
 #line 621 "/home/jens/Source/shotwell/src/Properties.vala"
-			_g_free0 (_tmp84_);
+			_g_free0 (_tmp72_);
 #line 621 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp84_ = _tmp92_;
-#line 5500 "Properties.c"
+			_tmp72_ = _tmp80_;
+#line 5434 "Properties.c"
 		} else {
-			gchar* _tmp93_ = NULL;
+			gchar* _tmp81_;
 #line 621 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp93_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE);
+			_tmp81_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE);
 #line 621 "/home/jens/Source/shotwell/src/Properties.vala"
-			_g_free0 (_tmp84_);
+			_g_free0 (_tmp72_);
 #line 621 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp84_ = _tmp93_;
-#line 5509 "Properties.c"
+			_tmp72_ = _tmp81_;
+#line 5443 "Properties.c"
 		}
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp94_ = _ ("GPS longitude:");
-#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp94_, _tmp84_, FALSE);
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("GPS longitude:"), _tmp72_, FALSE);
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp97_ = self->priv->artist;
+		_tmp84_ = self->priv->artist;
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (g_strcmp0 (_tmp97_, "") != 0) {
-#line 5519 "Properties.c"
-			const gchar* _tmp98_ = NULL;
+		if (g_strcmp0 (_tmp84_, "") != 0) {
+#line 5451 "Properties.c"
+			const gchar* _tmp85_;
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp98_ = self->priv->artist;
+			_tmp85_ = self->priv->artist;
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp96_ = _tmp98_ != NULL;
-#line 5525 "Properties.c"
+			_tmp83_ = _tmp85_ != NULL;
+#line 5457 "Properties.c"
 		} else {
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp96_ = FALSE;
-#line 5529 "Properties.c"
+			_tmp83_ = FALSE;
+#line 5461 "Properties.c"
 		}
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp96_) {
-#line 5533 "Properties.c"
-			const gchar* _tmp99_ = NULL;
+		if (_tmp83_) {
+#line 5465 "Properties.c"
+			const gchar* _tmp86_;
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp99_ = self->priv->artist;
+			_tmp86_ = self->priv->artist;
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp95_ = _tmp99_;
-#line 5539 "Properties.c"
+			_tmp82_ = _tmp86_;
+#line 5471 "Properties.c"
 		} else {
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp95_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5543 "Properties.c"
+			_tmp82_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
+#line 5475 "Properties.c"
 		}
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp100_ = _ ("Artist:");
-#line 623 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp100_, _tmp95_, FALSE);
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Artist:"), _tmp82_, FALSE);
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp103_ = self->priv->copyright;
+		_tmp89_ = self->priv->copyright;
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (g_strcmp0 (_tmp103_, "") != 0) {
-#line 5553 "Properties.c"
-			const gchar* _tmp104_ = NULL;
+		if (g_strcmp0 (_tmp89_, "") != 0) {
+#line 5483 "Properties.c"
+			const gchar* _tmp90_;
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp104_ = self->priv->copyright;
+			_tmp90_ = self->priv->copyright;
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp102_ = _tmp104_ != NULL;
-#line 5559 "Properties.c"
+			_tmp88_ = _tmp90_ != NULL;
+#line 5489 "Properties.c"
 		} else {
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp102_ = FALSE;
-#line 5563 "Properties.c"
+			_tmp88_ = FALSE;
+#line 5493 "Properties.c"
 		}
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp102_) {
-#line 5567 "Properties.c"
-			const gchar* _tmp105_ = NULL;
+		if (_tmp88_) {
+#line 5497 "Properties.c"
+			const gchar* _tmp91_;
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp105_ = self->priv->copyright;
+			_tmp91_ = self->priv->copyright;
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp101_ = _tmp105_;
-#line 5573 "Properties.c"
+			_tmp87_ = _tmp91_;
+#line 5503 "Properties.c"
 		} else {
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp101_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5577 "Properties.c"
+			_tmp87_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
+#line 5507 "Properties.c"
 		}
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp106_ = _ ("Copyright:");
-#line 625 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp106_, _tmp101_, FALSE);
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Copyright:"), _tmp87_, FALSE);
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp109_ = self->priv->software;
+		_tmp94_ = self->priv->software;
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (g_strcmp0 (_tmp109_, "") != 0) {
-#line 5587 "Properties.c"
-			const gchar* _tmp110_ = NULL;
+		if (g_strcmp0 (_tmp94_, "") != 0) {
+#line 5515 "Properties.c"
+			const gchar* _tmp95_;
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp110_ = self->priv->software;
+			_tmp95_ = self->priv->software;
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp108_ = _tmp110_ != NULL;
-#line 5593 "Properties.c"
+			_tmp93_ = _tmp95_ != NULL;
+#line 5521 "Properties.c"
 		} else {
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp108_ = FALSE;
-#line 5597 "Properties.c"
+			_tmp93_ = FALSE;
+#line 5525 "Properties.c"
 		}
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp108_) {
-#line 5601 "Properties.c"
-			const gchar* _tmp111_ = NULL;
+		if (_tmp93_) {
+#line 5529 "Properties.c"
+			const gchar* _tmp96_;
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp111_ = self->priv->software;
+			_tmp96_ = self->priv->software;
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp107_ = _tmp111_;
-#line 5607 "Properties.c"
+			_tmp92_ = _tmp96_;
+#line 5535 "Properties.c"
 		} else {
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp107_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5611 "Properties.c"
+			_tmp92_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
+#line 5539 "Properties.c"
 		}
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp112_ = _ ("Software:");
-#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp112_, _tmp107_, FALSE);
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Software:"), _tmp92_, FALSE);
 #line 583 "/home/jens/Source/shotwell/src/Properties.vala"
-		_g_free0 (_tmp84_);
+		_g_free0 (_tmp72_);
 #line 583 "/home/jens/Source/shotwell/src/Properties.vala"
-		_g_free0 (_tmp73_);
+		_g_free0 (_tmp62_);
 #line 583 "/home/jens/Source/shotwell/src/Properties.vala"
-		_g_free0 (_tmp19_);
+		_g_free0 (_tmp16_);
 #line 583 "/home/jens/Source/shotwell/src/Properties.vala"
-		_g_free0 (_tmp10_);
+		_g_free0 (_tmp9_);
 #line 583 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (_tmp2_);
-#line 5627 "Properties.c"
+#line 5553 "Properties.c"
 	}
 #line 630 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp114_ = self->priv->comment;
+	_tmp98_ = self->priv->comment;
 #line 630 "/home/jens/Source/shotwell/src/Properties.vala"
-	if (g_strcmp0 (_tmp114_, "") != 0) {
-#line 5633 "Properties.c"
-		const gchar* _tmp115_ = NULL;
+	if (g_strcmp0 (_tmp98_, "") != 0) {
+#line 5559 "Properties.c"
+		const gchar* _tmp99_;
 #line 630 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp115_ = self->priv->comment;
+		_tmp99_ = self->priv->comment;
 #line 630 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp113_ = _tmp115_ != NULL;
-#line 5639 "Properties.c"
+		_tmp97_ = _tmp99_ != NULL;
+#line 5565 "Properties.c"
 	} else {
 #line 630 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp113_ = FALSE;
-#line 5643 "Properties.c"
+		_tmp97_ = FALSE;
+#line 5569 "Properties.c"
 	}
 #line 630 "/home/jens/Source/shotwell/src/Properties.vala"
-	has_comment = _tmp113_;
+	has_comment = _tmp97_;
 #line 631 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp117_ = has_comment;
+	_tmp101_ = has_comment;
 #line 631 "/home/jens/Source/shotwell/src/Properties.vala"
-	if (_tmp117_) {
-#line 5651 "Properties.c"
-		const gchar* _tmp118_ = NULL;
+	if (_tmp101_) {
+#line 5577 "Properties.c"
+		const gchar* _tmp102_;
 #line 631 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp118_ = self->priv->comment;
+		_tmp102_ = self->priv->comment;
 #line 631 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp116_ = _tmp118_;
-#line 5657 "Properties.c"
+		_tmp100_ = _tmp102_;
+#line 5583 "Properties.c"
 	} else {
 #line 631 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp116_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5661 "Properties.c"
+		_tmp100_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
+#line 5587 "Properties.c"
 	}
 #line 631 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp119_ = _ ("Comment:");
+	_tmp103_ = has_comment;
 #line 631 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp120_ = has_comment;
-#line 631 "/home/jens/Source/shotwell/src/Properties.vala"
-	properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp119_, _tmp116_, _tmp120_);
-#line 5669 "Properties.c"
+	properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Comment:"), _tmp100_, _tmp103_);
+#line 5593 "Properties.c"
 }
 
 
@@ -5675,14 +5599,14 @@ static ExtendedPropertiesWindowExtendedProperties* extended_properties_window_ex
 	self = (ExtendedPropertiesWindowExtendedProperties*) properties_construct (object_type);
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	return self;
-#line 5679 "Properties.c"
+#line 5603 "Properties.c"
 }
 
 
 static ExtendedPropertiesWindowExtendedProperties* extended_properties_window_extended_properties_new (void) {
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	return extended_properties_window_extended_properties_construct (EXTENDED_PROPERTIES_WINDOW_TYPE_EXTENDED_PROPERTIES);
-#line 5686 "Properties.c"
+#line 5610 "Properties.c"
 }
 
 
@@ -5692,25 +5616,25 @@ static void extended_properties_window_extended_properties_class_init (ExtendedP
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_type_class_add_private (klass, sizeof (ExtendedPropertiesWindowExtendedPropertiesPrivate));
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->clear_properties = (void (*)(Properties*)) extended_properties_window_extended_properties_real_clear_properties;
+	((PropertiesClass *) klass)->clear_properties = (void (*) (Properties *)) extended_properties_window_extended_properties_real_clear_properties;
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->get_single_properties = (void (*)(Properties*, DataView*)) extended_properties_window_extended_properties_real_get_single_properties;
+	((PropertiesClass *) klass)->get_single_properties = (void (*) (Properties *, DataView*)) extended_properties_window_extended_properties_real_get_single_properties;
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->internal_update_properties = (void (*)(Properties*, Page*)) extended_properties_window_extended_properties_real_internal_update_properties;
+	((PropertiesClass *) klass)->internal_update_properties = (void (*) (Properties *, Page*)) extended_properties_window_extended_properties_real_internal_update_properties;
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (klass)->finalize = extended_properties_window_extended_properties_finalize;
-#line 5703 "Properties.c"
+#line 5627 "Properties.c"
 }
 
 
 static void extended_properties_window_extended_properties_instance_init (ExtendedPropertiesWindowExtendedProperties * self) {
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_GET_PRIVATE (self);
-#line 5710 "Properties.c"
+#line 5634 "Properties.c"
 }
 
 
-static void extended_properties_window_extended_properties_finalize (GObject* obj) {
+static void extended_properties_window_extended_properties_finalize (GObject * obj) {
 	ExtendedPropertiesWindowExtendedProperties * self;
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EXTENDED_PROPERTIES_WINDOW_TYPE_EXTENDED_PROPERTIES, ExtendedPropertiesWindowExtendedProperties);
@@ -5748,7 +5672,7 @@ static void extended_properties_window_extended_properties_finalize (GObject* ob
 	_g_free0 (self->priv->comment);
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (extended_properties_window_extended_properties_parent_class)->finalize (obj);
-#line 5752 "Properties.c"
+#line 5676 "Properties.c"
 }
 
 
@@ -5770,14 +5694,14 @@ static void extended_properties_window_class_init (ExtendedPropertiesWindowClass
 #line 457 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_type_class_add_private (klass, sizeof (ExtendedPropertiesWindowPrivate));
 #line 457 "/home/jens/Source/shotwell/src/Properties.vala"
-	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*)(GtkWidget*, GdkEventButton*)) extended_properties_window_real_button_press_event;
+	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*) (GtkWidget *, GdkEventButton*)) extended_properties_window_real_button_press_event;
 #line 457 "/home/jens/Source/shotwell/src/Properties.vala"
-	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) extended_properties_window_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) extended_properties_window_real_key_press_event;
 #line 457 "/home/jens/Source/shotwell/src/Properties.vala"
-	((GtkWidgetClass *) klass)->show_all = (void (*)(GtkWidget*)) extended_properties_window_real_show_all;
+	((GtkWidgetClass *) klass)->show_all = (void (*) (GtkWidget *)) extended_properties_window_real_show_all;
 #line 457 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (klass)->finalize = extended_properties_window_finalize;
-#line 5781 "Properties.c"
+#line 5705 "Properties.c"
 }
 
 
@@ -5786,11 +5710,11 @@ static void extended_properties_window_instance_init (ExtendedPropertiesWindow *
 	self->priv = EXTENDED_PROPERTIES_WINDOW_GET_PRIVATE (self);
 #line 458 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->properties = NULL;
-#line 5790 "Properties.c"
+#line 5714 "Properties.c"
 }
 
 
-static void extended_properties_window_finalize (GObject* obj) {
+static void extended_properties_window_finalize (GObject * obj) {
 	ExtendedPropertiesWindow * self;
 #line 457 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXTENDED_PROPERTIES_WINDOW, ExtendedPropertiesWindow);
@@ -5798,7 +5722,7 @@ static void extended_properties_window_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->properties);
 #line 457 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (extended_properties_window_parent_class)->finalize (obj);
-#line 5802 "Properties.c"
+#line 5726 "Properties.c"
 }
 
 
diff --git a/src/Resources.c b/src/Resources.c
index b2e861e..0c894c6 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -1,4 +1,4 @@
-/* Resources.c generated by valac 0.34.7, the Vala compiler
+/* Resources.c generated by valac 0.36.6, the Vala compiler
  * generated from Resources.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -374,7 +374,7 @@ GeeMap* resources_providers = NULL;
 #define RESOURCES_DISPLAY_REJECTED_ONLY_LABEL _ ("Rejected Only")
 #define RESOURCES_DISPLAY_REJECTED_ONLY_TOOLTIP _ ("Show only rejected photos")
 #define RESOURCES_DISPLAY_REJECTED_OR_HIGHER_MENU _ ("All + _Rejected")
-#define RESOURCES_DISPLAY_REJECTED_OR_HIGHER_TOOLTIP "Show all photos, including rejected"
+#define RESOURCES_DISPLAY_REJECTED_OR_HIGHER_TOOLTIP NC_ ("Tooltip", "Show all photos, including rejected")
 #define RESOURCES_DISPLAY_UNRATED_OR_HIGHER_MENU _ ("_All Photos")
 #define RESOURCES_DISPLAY_UNRATED_OR_HIGHER_TOOLTIP _ ("Show all photos")
 #define RESOURCES_VIEW_RATINGS_MENU _ ("_Ratings")
@@ -391,7 +391,7 @@ GeeMap* resources_providers = NULL;
 #define RESOURCES_PUBLISH_LABEL _ ("Publish")
 #define RESOURCES_PUBLISH_TOOLTIP _ ("Publish to various websites")
 #define RESOURCES_EDIT_TITLE_MENU _ ("Edit _Title…")
-#define RESOURCES_EDIT_TITLE_LABEL "Edit Title"
+#define RESOURCES_EDIT_TITLE_LABEL NC_ ("Button Label", "Edit Title")
 #define RESOURCES_EDIT_COMMENT_MENU _ ("Edit _Comment…")
 #define RESOURCES_EDIT_COMMENT_LABEL _ ("Edit Comment")
 #define RESOURCES_EDIT_EVENT_COMMENT_MENU _ ("Edit Event _Comment…")
@@ -400,7 +400,7 @@ GeeMap* resources_providers = NULL;
 #define RESOURCES_ADJUST_DATE_TIME_LABEL _ ("Adjust Date and Time")
 #define RESOURCES_ADD_TAGS_MENU _ ("Add _Tags…")
 #define RESOURCES_ADD_TAGS_CONTEXT_MENU _ ("_Add Tags…")
-#define RESOURCES_ADD_TAGS_TITLE "Add Tags"
+#define RESOURCES_ADD_TAGS_TITLE NC_ ("Dialog Title", "Add Tags")
 #define RESOURCES_PREFERENCES_MENU _ ("_Preferences")
 #define RESOURCES_EXTERNAL_EDIT_MENU _ ("Open With E_xternal Editor")
 #define RESOURCES_EXTERNAL_EDIT_RAW_MENU _ ("Open With RA_W Editor")
@@ -465,7 +465,7 @@ void resources_terminate (void);
 void resources_fetch_lc_time_format (void);
 GType resources_unit_system_get_type (void) G_GNUC_CONST;
 ResourcesUnitSystem resources_get_default_measurement_unit (void);
-static gboolean _vala_string_array_contains (const gchar** stack, int stack_length, const gchar* needle);
+static gboolean _vala_string_array_contains (const gchar* * stack, int stack_length, const gchar* needle);
 gchar* resources_get_hh_mm_format_string (void);
 gchar* resources_get_hh_mm_ss_format_string (void);
 gchar* resources_get_long_date_format_string (void);
@@ -505,138 +505,126 @@ const gchar* RESOURCES_IMPERIAL_COUNTRIES[4] = {"unm_US", "es_US", "en_US", "yi_
 
 gchar* resources_launch_editor_failed (GError* err) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	GError* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	GError* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 336 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = _ ("Unable to launch editor: %s");
+	_tmp0_ = err;
 #line 336 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = err;
+	_tmp1_ = _tmp0_->message;
 #line 336 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = _tmp1_->message;
+	_tmp2_ = g_strdup_printf (_ ("Unable to launch editor: %s"), _tmp1_);
 #line 336 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 336 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 497 "Resources.c"
+#line 494 "Resources.c"
 }
 
 
 gchar* resources_add_tags_label (gchar** names, int names_length1) {
 	gchar* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
 #line 340 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = names;
 #line 340 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0__length1 = names_length1;
 #line 340 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0__length1 == 1) {
-#line 511 "Resources.c"
-		const gchar* _tmp1_ = NULL;
-		gchar** _tmp2_ = NULL;
-		gint _tmp2__length1 = 0;
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 508 "Resources.c"
+		gchar** _tmp1_;
+		gint _tmp1__length1;
+		const gchar* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 341 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp1_ = _ ("Add Tag “%s”");
+		_tmp1_ = names;
 #line 341 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp2_ = names;
+		_tmp1__length1 = names_length1;
 #line 341 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp2__length1 = names_length1;
+		_tmp2_ = _tmp1_[0];
 #line 341 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp3_ = _tmp2_[0];
+		_tmp3_ = hierarchical_tag_utilities_get_basename (_tmp2_);
 #line 341 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp4_ = hierarchical_tag_utilities_get_basename (_tmp3_);
+		_tmp4_ = _tmp3_;
 #line 341 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp5_ = _tmp4_;
+		_tmp5_ = g_strdup_printf (_ ("Add Tag “%s”"), _tmp4_);
 #line 341 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp6_ = g_strdup_printf (_tmp1_, _tmp5_);
+		_tmp6_ = _tmp5_;
 #line 341 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp7_ = _tmp6_;
+		_g_free0 (_tmp4_);
 #line 341 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_free0 (_tmp5_);
-#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
-		result = _tmp7_;
+		result = _tmp6_;
 #line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 542 "Resources.c"
+#line 536 "Resources.c"
 	} else {
-		gchar** _tmp8_ = NULL;
-		gint _tmp8__length1 = 0;
+		gchar** _tmp7_;
+		gint _tmp7__length1;
 #line 342 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp8_ = names;
+		_tmp7_ = names;
 #line 342 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp8__length1 = names_length1;
+		_tmp7__length1 = names_length1;
 #line 342 "/home/jens/Source/shotwell/src/Resources.vala"
-		if (_tmp8__length1 == 2) {
-#line 552 "Resources.c"
-			const gchar* _tmp9_ = NULL;
-			gchar** _tmp10_ = NULL;
-			gint _tmp10__length1 = 0;
-			const gchar* _tmp11_ = NULL;
-			gchar* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			gchar** _tmp14_ = NULL;
-			gint _tmp14__length1 = 0;
-			const gchar* _tmp15_ = NULL;
-			gchar* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
-#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp9_ = _ ("Add Tags “%s” and “%s”");
+		if (_tmp7__length1 == 2) {
+#line 546 "Resources.c"
+			gchar** _tmp8_;
+			gint _tmp8__length1;
+			const gchar* _tmp9_;
+			gchar* _tmp10_;
+			gchar* _tmp11_;
+			gchar** _tmp12_;
+			gint _tmp12__length1;
+			const gchar* _tmp13_;
+			gchar* _tmp14_;
+			gchar* _tmp15_;
+			gchar* _tmp16_;
+			gchar* _tmp17_;
 #line 344 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp10_ = names;
+			_tmp8_ = names;
 #line 344 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp10__length1 = names_length1;
+			_tmp8__length1 = names_length1;
 #line 344 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp11_ = _tmp10_[0];
+			_tmp9_ = _tmp8_[0];
 #line 344 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp12_ = hierarchical_tag_utilities_get_basename (_tmp11_);
+			_tmp10_ = hierarchical_tag_utilities_get_basename (_tmp9_);
 #line 344 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp13_ = _tmp12_;
+			_tmp11_ = _tmp10_;
 #line 344 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp14_ = names;
+			_tmp12_ = names;
 #line 344 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp14__length1 = names_length1;
+			_tmp12__length1 = names_length1;
 #line 344 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp15_ = _tmp14_[1];
+			_tmp13_ = _tmp12_[1];
 #line 344 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp16_ = hierarchical_tag_utilities_get_basename (_tmp15_);
+			_tmp14_ = hierarchical_tag_utilities_get_basename (_tmp13_);
 #line 344 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp17_ = _tmp16_;
+			_tmp15_ = _tmp14_;
 #line 344 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp18_ = g_strdup_printf (_tmp9_, _tmp13_, _tmp17_);
+			_tmp16_ = g_strdup_printf (_ ("Add Tags “%s” and “%s”"), _tmp11_, _tmp15_);
 #line 344 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp19_ = _tmp18_;
+			_tmp17_ = _tmp16_;
 #line 344 "/home/jens/Source/shotwell/src/Resources.vala"
-			_g_free0 (_tmp17_);
+			_g_free0 (_tmp15_);
 #line 344 "/home/jens/Source/shotwell/src/Resources.vala"
-			_g_free0 (_tmp13_);
+			_g_free0 (_tmp11_);
 #line 344 "/home/jens/Source/shotwell/src/Resources.vala"
-			result = _tmp19_;
+			result = _tmp17_;
 #line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 600 "Resources.c"
+#line 591 "Resources.c"
 		} else {
-			const gchar* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
+			gchar* _tmp18_;
 #line 349 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp20_ = C_ ("UndoRedo menu entry", "Add Tags");
+			_tmp18_ = g_strdup (C_ ("UndoRedo menu entry", "Add Tags"));
 #line 349 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp21_ = g_strdup (_tmp20_);
-#line 349 "/home/jens/Source/shotwell/src/Resources.vala"
-			result = _tmp21_;
+			result = _tmp18_;
 #line 349 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 612 "Resources.c"
+#line 600 "Resources.c"
 		}
 	}
 }
@@ -644,369 +632,333 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 
 gchar* resources_delete_tag_menu (const gchar* name) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 353 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 354 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = _ ("_Delete Tag “%s”");
+	_tmp0_ = name;
 #line 354 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = name;
-#line 354 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
+	_tmp1_ = g_strdup_printf (_ ("_Delete Tag “%s”"), _tmp0_);
 #line 354 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp2_;
+	result = _tmp1_;
 #line 354 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 635 "Resources.c"
+#line 620 "Resources.c"
 }
 
 
 gchar* resources_delete_tag_label (const gchar* name) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 357 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 358 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = _ ("Delete Tag “%s”");
-#line 358 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = name;
+	_tmp0_ = name;
 #line 358 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
+	_tmp1_ = g_strdup_printf (_ ("Delete Tag “%s”"), _tmp0_);
 #line 358 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp2_;
+	result = _tmp1_;
 #line 358 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 656 "Resources.c"
+#line 638 "Resources.c"
 }
 
 
 gchar* resources_rename_tag_menu (const gchar* name) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 366 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 367 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = _ ("Re_name Tag “%s”…");
+	_tmp0_ = name;
 #line 367 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = name;
+	_tmp1_ = g_strdup_printf (_ ("Re_name Tag “%s”…"), _tmp0_);
 #line 367 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 367 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp2_;
+	result = _tmp1_;
 #line 367 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 677 "Resources.c"
+#line 656 "Resources.c"
 }
 
 
 gchar* resources_rename_tag_label (const gchar* old_name, const gchar* new_name) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 370 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (old_name != NULL, NULL);
 #line 370 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (new_name != NULL, NULL);
 #line 371 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = _ ("Rename Tag “%s” to “%s”");
-#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = old_name;
+	_tmp0_ = old_name;
 #line 371 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = new_name;
+	_tmp1_ = new_name;
 #line 371 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = g_strdup_printf (_tmp0_, _tmp1_, _tmp2_);
+	_tmp2_ = g_strdup_printf (_ ("Rename Tag “%s” to “%s”"), _tmp0_, _tmp1_);
 #line 371 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 371 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 703 "Resources.c"
+#line 679 "Resources.c"
 }
 
 
 gchar* resources_tag_photos_label (const gchar* name, gint count) {
 	gchar* result = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	gint _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 379 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 380 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = count;
 #line 380 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = ngettext ("Tag Photo as “%s”", "Tag Photos as “%s”", (gulong) _tmp0_);
-#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = name;
+	_tmp1_ = name;
 #line 380 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = g_strdup_printf (_tmp1_, _tmp2_);
+	_tmp2_ = g_strdup_printf (ngettext ("Tag Photo as “%s”", "Tag Photos as “%s”", (gulong) _tmp0_), _tmp1_);
 #line 380 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 380 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 727 "Resources.c"
+#line 700 "Resources.c"
 }
 
 
 gchar* resources_tag_photos_tooltip (const gchar* name, gint count) {
 	gchar* result = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	gint _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 385 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 386 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = count;
 #line 386 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = ngettext ("Tag the selected photo as “%s”", "Tag the selected photos as “%s”", (gulong) _tmp0_);
-#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = name;
+	_tmp1_ = name;
 #line 386 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = g_strdup_printf (_tmp1_, _tmp2_);
+	_tmp2_ = g_strdup_printf (ngettext ("Tag the selected photo as “%s”", "Tag the selected photos as “%s”", (gulong) _tmp0_), _tmp1_);
 #line 386 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 386 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 751 "Resources.c"
+#line 721 "Resources.c"
 }
 
 
 gchar* resources_untag_photos_menu (const gchar* name, gint count) {
 	gchar* result = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	gint _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 391 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 392 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = count;
 #line 392 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = ngettext ("Remove Tag “%s” From _Photo", "Remove Tag “%s” From _Photos", (gulong) _tmp0_);
-#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = name;
+	_tmp1_ = name;
 #line 392 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = g_strdup_printf (_tmp1_, _tmp2_);
+	_tmp2_ = g_strdup_printf (ngettext ("Remove Tag “%s” From _Photo", "Remove Tag “%s” From _Photos", (gulong) _tmp0_), _tmp1_);
 #line 392 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 392 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 775 "Resources.c"
+#line 742 "Resources.c"
 }
 
 
 gchar* resources_untag_photos_label (const gchar* name, gint count) {
 	gchar* result = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	gint _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 397 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 398 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = count;
 #line 398 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = ngettext ("Remove Tag “%s” From Photo", "Remove Tag “%s” From Photos", (gulong) _tmp0_);
-#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = name;
+	_tmp1_ = name;
 #line 398 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = g_strdup_printf (_tmp1_, _tmp2_);
+	_tmp2_ = g_strdup_printf (ngettext ("Remove Tag “%s” From Photo", "Remove Tag “%s” From Photos", (gulong) _tmp0_), _tmp1_);
 #line 398 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 398 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 799 "Resources.c"
+#line 763 "Resources.c"
 }
 
 
 gchar* resources_rename_tag_exists_message (const gchar* name) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 403 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 404 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = _ ("Unable to rename tag to “%s” because the tag already exists.");
+	_tmp0_ = name;
 #line 404 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = name;
-#line 404 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
+	_tmp1_ = g_strdup_printf (_ ("Unable to rename tag to “%s” because the tag already exists."), _tmp0_);
 #line 404 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp2_;
+	result = _tmp1_;
 #line 404 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 820 "Resources.c"
+#line 781 "Resources.c"
 }
 
 
 gchar* resources_rename_search_exists_message (const gchar* name) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 407 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 408 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = _ ("Unable to rename search to “%s” because the search already exists.");
-#line 408 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = name;
+	_tmp0_ = name;
 #line 408 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
+	_tmp1_ = g_strdup_printf (_ ("Unable to rename search to “%s” because the search already exists."), _tmp0_);
 #line 408 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp2_;
+	result = _tmp1_;
 #line 408 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 841 "Resources.c"
+#line 799 "Resources.c"
 }
 
 
 gchar* resources_rename_search_label (const gchar* old_name, const gchar* new_name) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 419 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (old_name != NULL, NULL);
 #line 419 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (new_name != NULL, NULL);
 #line 420 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = _ ("Rename Search “%s” to “%s”");
-#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = old_name;
+	_tmp0_ = old_name;
 #line 420 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = new_name;
+	_tmp1_ = new_name;
 #line 420 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = g_strdup_printf (_tmp0_, _tmp1_, _tmp2_);
+	_tmp2_ = g_strdup_printf (_ ("Rename Search “%s” to “%s”"), _tmp0_, _tmp1_);
 #line 420 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 420 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 867 "Resources.c"
+#line 822 "Resources.c"
 }
 
 
 gchar* resources_delete_search_label (const gchar* name) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 423 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 424 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = _ ("Delete Search “%s”");
-#line 424 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = name;
+	_tmp0_ = name;
 #line 424 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
+	_tmp1_ = g_strdup_printf (_ ("Delete Search “%s”"), _tmp0_);
 #line 424 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp2_;
+	result = _tmp1_;
 #line 424 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 888 "Resources.c"
+#line 840 "Resources.c"
 }
 
 
 const gchar* resources_rating_label (Rating rating) {
 	const gchar* result = NULL;
-	Rating _tmp0_ = 0;
+	Rating _tmp0_;
 #line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
 #line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
 #line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 901 "Resources.c"
+#line 853 "Resources.c"
 		{
 #line 430 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_REJECTED_LABEL;
 #line 430 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 907 "Resources.c"
+#line 859 "Resources.c"
 		}
 #line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 911 "Resources.c"
+#line 863 "Resources.c"
 		{
 #line 432 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_LABEL;
 #line 432 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 917 "Resources.c"
+#line 869 "Resources.c"
 		}
 #line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 921 "Resources.c"
+#line 873 "Resources.c"
 		{
-			const gchar* _tmp1_ = NULL;
+			const gchar* _tmp1_;
 #line 434 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = resources_RATE_ONE_LABEL;
 #line 434 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
 #line 434 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 930 "Resources.c"
+#line 882 "Resources.c"
 		}
 #line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 934 "Resources.c"
+#line 886 "Resources.c"
 		{
-			const gchar* _tmp2_ = NULL;
+			const gchar* _tmp2_;
 #line 436 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = resources_RATE_TWO_LABEL;
 #line 436 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
 #line 436 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 943 "Resources.c"
+#line 895 "Resources.c"
 		}
 #line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 947 "Resources.c"
+#line 899 "Resources.c"
 		{
-			const gchar* _tmp3_ = NULL;
+			const gchar* _tmp3_;
 #line 438 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = resources_RATE_THREE_LABEL;
 #line 438 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp3_;
 #line 438 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 956 "Resources.c"
+#line 908 "Resources.c"
 		}
 #line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 960 "Resources.c"
+#line 912 "Resources.c"
 		{
-			const gchar* _tmp4_ = NULL;
+			const gchar* _tmp4_;
 #line 440 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = resources_RATE_FOUR_LABEL;
 #line 440 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
 #line 440 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 969 "Resources.c"
+#line 921 "Resources.c"
 		}
 #line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 973 "Resources.c"
+#line 925 "Resources.c"
 		{
-			const gchar* _tmp5_ = NULL;
+			const gchar* _tmp5_;
 #line 442 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = resources_RATE_FIVE_LABEL;
 #line 442 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp5_;
 #line 442 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 982 "Resources.c"
+#line 934 "Resources.c"
 		}
 		default:
 		{
@@ -1014,7 +966,7 @@ const gchar* resources_rating_label (Rating rating) {
 			result = RESOURCES_RATE_UNRATED_LABEL;
 #line 444 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 990 "Resources.c"
+#line 942 "Resources.c"
 		}
 	}
 }
@@ -1022,95 +974,95 @@ const gchar* resources_rating_label (Rating rating) {
 
 const gchar* resources_rating_combo_box (Rating rating) {
 	const gchar* result = NULL;
-	Rating _tmp0_ = 0;
+	Rating _tmp0_;
 #line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
 #line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
 #line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 1005 "Resources.c"
+#line 957 "Resources.c"
 		{
 #line 451 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_REJECTED_COMBO_BOX;
 #line 451 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1011 "Resources.c"
+#line 963 "Resources.c"
 		}
 #line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 1015 "Resources.c"
+#line 967 "Resources.c"
 		{
 #line 453 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_COMBO_BOX;
 #line 453 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1021 "Resources.c"
+#line 973 "Resources.c"
 		}
 #line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1025 "Resources.c"
+#line 977 "Resources.c"
 		{
-			const gchar* _tmp1_ = NULL;
+			const gchar* _tmp1_;
 #line 455 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = resources_RATE_ONE_MENU;
 #line 455 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
 #line 455 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1034 "Resources.c"
+#line 986 "Resources.c"
 		}
 #line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1038 "Resources.c"
+#line 990 "Resources.c"
 		{
-			const gchar* _tmp2_ = NULL;
+			const gchar* _tmp2_;
 #line 457 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = resources_RATE_TWO_MENU;
 #line 457 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
 #line 457 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1047 "Resources.c"
+#line 999 "Resources.c"
 		}
 #line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1051 "Resources.c"
+#line 1003 "Resources.c"
 		{
-			const gchar* _tmp3_ = NULL;
+			const gchar* _tmp3_;
 #line 459 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = resources_RATE_THREE_MENU;
 #line 459 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp3_;
 #line 459 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1060 "Resources.c"
+#line 1012 "Resources.c"
 		}
 #line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1064 "Resources.c"
+#line 1016 "Resources.c"
 		{
-			const gchar* _tmp4_ = NULL;
+			const gchar* _tmp4_;
 #line 461 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = resources_RATE_FOUR_MENU;
 #line 461 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
 #line 461 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1073 "Resources.c"
+#line 1025 "Resources.c"
 		}
 #line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1077 "Resources.c"
+#line 1029 "Resources.c"
 		{
-			const gchar* _tmp5_ = NULL;
+			const gchar* _tmp5_;
 #line 463 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = resources_RATE_FIVE_MENU;
 #line 463 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp5_;
 #line 463 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1086 "Resources.c"
+#line 1038 "Resources.c"
 		}
 		default:
 		{
@@ -1118,7 +1070,7 @@ const gchar* resources_rating_combo_box (Rating rating) {
 			result = RESOURCES_RATE_UNRATED_MENU;
 #line 465 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1094 "Resources.c"
+#line 1046 "Resources.c"
 		}
 	}
 }
@@ -1126,30 +1078,30 @@ const gchar* resources_rating_combo_box (Rating rating) {
 
 gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 	gchar* result = NULL;
-	RatingFilter _tmp0_ = 0;
+	RatingFilter _tmp0_;
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = filter;
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 1109 "Resources.c"
+#line 1061 "Resources.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 472 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = g_strdup (RESOURCES_DISPLAY_REJECTED_OR_HIGHER_TOOLTIP);
 #line 472 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
 #line 472 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1118 "Resources.c"
+#line 1070 "Resources.c"
 		}
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 1122 "Resources.c"
+#line 1074 "Resources.c"
 		{
-			const gchar* _tmp2_ = NULL;
-			gchar* _tmp3_ = NULL;
+			const gchar* _tmp2_;
+			gchar* _tmp3_;
 #line 475 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP;
 #line 475 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1158,14 +1110,14 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp3_;
 #line 475 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1134 "Resources.c"
+#line 1086 "Resources.c"
 		}
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 1138 "Resources.c"
+#line 1090 "Resources.c"
 		{
-			const gchar* _tmp4_ = NULL;
-			gchar* _tmp5_ = NULL;
+			const gchar* _tmp4_;
+			gchar* _tmp5_;
 #line 478 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP;
 #line 478 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1174,14 +1126,14 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp5_;
 #line 478 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1150 "Resources.c"
+#line 1102 "Resources.c"
 		}
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 1154 "Resources.c"
+#line 1106 "Resources.c"
 		{
-			const gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
+			const gchar* _tmp6_;
+			gchar* _tmp7_;
 #line 481 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp6_ = resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP;
 #line 481 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1190,14 +1142,14 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp7_;
 #line 481 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1166 "Resources.c"
+#line 1118 "Resources.c"
 		}
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 1170 "Resources.c"
+#line 1122 "Resources.c"
 		{
-			const gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
+			const gchar* _tmp8_;
+			gchar* _tmp9_;
 #line 484 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp8_ = resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP;
 #line 484 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1206,16 +1158,16 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp9_;
 #line 484 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1182 "Resources.c"
+#line 1134 "Resources.c"
 		}
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FIVE_ONLY:
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 1188 "Resources.c"
+#line 1140 "Resources.c"
 		{
-			const gchar* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
+			const gchar* _tmp10_;
+			gchar* _tmp11_;
 #line 488 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp10_ = resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP;
 #line 488 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1224,34 +1176,34 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp11_;
 #line 488 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1200 "Resources.c"
+#line 1152 "Resources.c"
 		}
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 1204 "Resources.c"
+#line 1156 "Resources.c"
 		{
-			gchar* _tmp12_ = NULL;
+			gchar* _tmp12_;
 #line 491 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp12_ = g_strdup (RESOURCES_DISPLAY_REJECTED_ONLY_TOOLTIP);
 #line 491 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp12_;
 #line 491 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1213 "Resources.c"
+#line 1165 "Resources.c"
 		}
 		default:
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 1218 "Resources.c"
+#line 1170 "Resources.c"
 		{
-			gchar* _tmp13_ = NULL;
+			gchar* _tmp13_;
 #line 495 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp13_ = g_strdup (RESOURCES_DISPLAY_UNRATED_OR_HIGHER_TOOLTIP);
 #line 495 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp13_;
 #line 495 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1227 "Resources.c"
+#line 1179 "Resources.c"
 		}
 	}
 }
@@ -1259,43 +1211,43 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 
 gchar* resources_rating_progress (Rating rating) {
 	gchar* result = NULL;
-	Rating _tmp0_ = 0;
+	Rating _tmp0_;
 #line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
 #line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
 #line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 1242 "Resources.c"
+#line 1194 "Resources.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 502 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = g_strdup (RESOURCES_RATE_REJECTED_PROGRESS);
 #line 502 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
 #line 502 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1251 "Resources.c"
+#line 1203 "Resources.c"
 		}
 #line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 1255 "Resources.c"
+#line 1207 "Resources.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 504 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = g_strdup (RESOURCES_RATE_UNRATED_PROGRESS);
 #line 504 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
 #line 504 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1264 "Resources.c"
+#line 1216 "Resources.c"
 		}
 #line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1268 "Resources.c"
+#line 1220 "Resources.c"
 		{
-			const gchar* _tmp3_ = NULL;
-			gchar* _tmp4_ = NULL;
+			const gchar* _tmp3_;
+			gchar* _tmp4_;
 #line 506 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = resources_RATE_ONE_PROGRESS;
 #line 506 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1304,14 +1256,14 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp4_;
 #line 506 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1280 "Resources.c"
+#line 1232 "Resources.c"
 		}
 #line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1284 "Resources.c"
+#line 1236 "Resources.c"
 		{
-			const gchar* _tmp5_ = NULL;
-			gchar* _tmp6_ = NULL;
+			const gchar* _tmp5_;
+			gchar* _tmp6_;
 #line 508 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = resources_RATE_TWO_PROGRESS;
 #line 508 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1320,14 +1272,14 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp6_;
 #line 508 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1296 "Resources.c"
+#line 1248 "Resources.c"
 		}
 #line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1300 "Resources.c"
+#line 1252 "Resources.c"
 		{
-			const gchar* _tmp7_ = NULL;
-			gchar* _tmp8_ = NULL;
+			const gchar* _tmp7_;
+			gchar* _tmp8_;
 #line 510 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = resources_RATE_THREE_PROGRESS;
 #line 510 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1336,14 +1288,14 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp8_;
 #line 510 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1312 "Resources.c"
+#line 1264 "Resources.c"
 		}
 #line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1316 "Resources.c"
+#line 1268 "Resources.c"
 		{
-			const gchar* _tmp9_ = NULL;
-			gchar* _tmp10_ = NULL;
+			const gchar* _tmp9_;
+			gchar* _tmp10_;
 #line 512 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = resources_RATE_FOUR_PROGRESS;
 #line 512 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1352,14 +1304,14 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp10_;
 #line 512 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1328 "Resources.c"
+#line 1280 "Resources.c"
 		}
 #line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1332 "Resources.c"
+#line 1284 "Resources.c"
 		{
-			const gchar* _tmp11_ = NULL;
-			gchar* _tmp12_ = NULL;
+			const gchar* _tmp11_;
+			gchar* _tmp12_;
 #line 514 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp11_ = resources_RATE_FIVE_PROGRESS;
 #line 514 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1368,18 +1320,18 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp12_;
 #line 514 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1344 "Resources.c"
+#line 1296 "Resources.c"
 		}
 		default:
 		{
-			gchar* _tmp13_ = NULL;
+			gchar* _tmp13_;
 #line 516 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp13_ = g_strdup (RESOURCES_RATE_UNRATED_PROGRESS);
 #line 516 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp13_;
 #line 516 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1355 "Resources.c"
+#line 1307 "Resources.c"
 		}
 	}
 }
@@ -1387,86 +1339,86 @@ gchar* resources_rating_progress (Rating rating) {
 
 gchar* resources_get_stars (Rating rating) {
 	gchar* result = NULL;
-	Rating _tmp0_ = 0;
+	Rating _tmp0_;
 #line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
 #line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
 #line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1370 "Resources.c"
+#line 1322 "Resources.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 525 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = g_strdup ("\xE2\x98\x85");
 #line 525 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
 #line 525 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1379 "Resources.c"
+#line 1331 "Resources.c"
 		}
 #line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1383 "Resources.c"
+#line 1335 "Resources.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 527 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85");
 #line 527 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
 #line 527 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1392 "Resources.c"
+#line 1344 "Resources.c"
 		}
 #line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1396 "Resources.c"
+#line 1348 "Resources.c"
 		{
-			gchar* _tmp3_ = NULL;
+			gchar* _tmp3_;
 #line 529 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
 #line 529 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp3_;
 #line 529 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1405 "Resources.c"
+#line 1357 "Resources.c"
 		}
 #line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1409 "Resources.c"
+#line 1361 "Resources.c"
 		{
-			gchar* _tmp4_ = NULL;
+			gchar* _tmp4_;
 #line 531 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
 #line 531 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
 #line 531 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1418 "Resources.c"
+#line 1370 "Resources.c"
 		}
 #line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1422 "Resources.c"
+#line 1374 "Resources.c"
 		{
-			gchar* _tmp5_ = NULL;
+			gchar* _tmp5_;
 #line 533 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
 #line 533 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp5_;
 #line 533 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1431 "Resources.c"
+#line 1383 "Resources.c"
 		}
 		default:
 		{
-			gchar* _tmp6_ = NULL;
+			gchar* _tmp6_;
 #line 535 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp6_ = g_strdup ("");
 #line 535 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp6_;
 #line 535 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1442 "Resources.c"
+#line 1394 "Resources.c"
 		}
 	}
 }
@@ -1474,17 +1426,17 @@ gchar* resources_get_stars (Rating rating) {
 
 GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 	GdkPixbuf* result = NULL;
-	Rating _tmp0_ = 0;
+	Rating _tmp0_;
 #line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
 #line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
 #line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 1457 "Resources.c"
+#line 1409 "Resources.c"
 		{
-			gint _tmp1_ = 0;
-			GdkPixbuf* _tmp2_ = NULL;
+			gint _tmp1_;
+			GdkPixbuf* _tmp2_;
 #line 542 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = scale;
 #line 542 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1493,14 +1445,14 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp2_;
 #line 542 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1469 "Resources.c"
+#line 1421 "Resources.c"
 		}
 #line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1473 "Resources.c"
+#line 1425 "Resources.c"
 		{
-			gint _tmp3_ = 0;
-			GdkPixbuf* _tmp4_ = NULL;
+			gint _tmp3_;
+			GdkPixbuf* _tmp4_;
 #line 545 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = scale;
 #line 545 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1509,14 +1461,14 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp4_;
 #line 545 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1485 "Resources.c"
+#line 1437 "Resources.c"
 		}
 #line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1489 "Resources.c"
+#line 1441 "Resources.c"
 		{
-			gint _tmp5_ = 0;
-			GdkPixbuf* _tmp6_ = NULL;
+			gint _tmp5_;
+			GdkPixbuf* _tmp6_;
 #line 547 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = scale;
 #line 547 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1525,14 +1477,14 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp6_;
 #line 547 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1501 "Resources.c"
+#line 1453 "Resources.c"
 		}
 #line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1505 "Resources.c"
+#line 1457 "Resources.c"
 		{
-			gint _tmp7_ = 0;
-			GdkPixbuf* _tmp8_ = NULL;
+			gint _tmp7_;
+			GdkPixbuf* _tmp8_;
 #line 549 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = scale;
 #line 549 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1541,14 +1493,14 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp8_;
 #line 549 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1517 "Resources.c"
+#line 1469 "Resources.c"
 		}
 #line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1521 "Resources.c"
+#line 1473 "Resources.c"
 		{
-			gint _tmp9_ = 0;
-			GdkPixbuf* _tmp10_ = NULL;
+			gint _tmp9_;
+			GdkPixbuf* _tmp10_;
 #line 551 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = scale;
 #line 551 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1557,14 +1509,14 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp10_;
 #line 551 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1533 "Resources.c"
+#line 1485 "Resources.c"
 		}
 #line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1537 "Resources.c"
+#line 1489 "Resources.c"
 		{
-			gint _tmp11_ = 0;
-			GdkPixbuf* _tmp12_ = NULL;
+			gint _tmp11_;
+			GdkPixbuf* _tmp12_;
 #line 553 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp11_ = scale;
 #line 553 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1573,7 +1525,7 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp12_;
 #line 553 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1549 "Resources.c"
+#line 1501 "Resources.c"
 		}
 		default:
 		{
@@ -1581,7 +1533,7 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = NULL;
 #line 555 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1557 "Resources.c"
+#line 1509 "Resources.c"
 		}
 	}
 }
@@ -1589,614 +1541,590 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 
 void resources_generate_rating_strings (void) {
 	gchar* menu_base = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 	gchar* label_base = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar* _tmp1_;
 	gchar* tooltip_base = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	gchar* _tmp2_;
 	gchar* progress_base = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar* _tmp3_;
 	gchar* display_rating_menu_base = NULL;
-	gchar* _tmp7_ = NULL;
+	gchar* _tmp4_;
 	gchar* display_rating_label_base = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
+	gchar* _tmp5_;
 	gchar* display_rating_tooltip_base = NULL;
-	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
+	gchar* _tmp6_;
 	gchar* display_rating_or_higher_menu_base = NULL;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	gchar* _tmp7_;
 	gchar* display_rating_or_higher_label_base = NULL;
-	const gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
+	gchar* _tmp8_;
 	gchar* display_rating_or_higher_tooltip_base = NULL;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	gchar* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	gchar* _tmp31_ = NULL;
-	gchar* _tmp32_ = NULL;
-	gchar* _tmp33_ = NULL;
-	gchar* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
-	gchar* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
-	gchar* _tmp39_ = NULL;
-	gchar* _tmp40_ = NULL;
-	gchar* _tmp41_ = NULL;
-	gchar* _tmp42_ = NULL;
-	gchar* _tmp43_ = NULL;
-	gchar* _tmp44_ = NULL;
-	gchar* _tmp45_ = NULL;
-	gchar* _tmp46_ = NULL;
-	gchar* _tmp47_ = NULL;
-	gchar* _tmp48_ = NULL;
-	gchar* _tmp49_ = NULL;
-	gchar* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
-	gchar* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
-	gchar* _tmp54_ = NULL;
-	gchar* _tmp55_ = NULL;
-	gchar* _tmp56_ = NULL;
-	gchar* _tmp57_ = NULL;
-	gchar* _tmp58_ = NULL;
-	gchar* _tmp59_ = NULL;
-	gchar* _tmp60_ = NULL;
-	gchar* _tmp61_ = NULL;
-	gchar* _tmp62_ = NULL;
-	gchar* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
-	gchar* _tmp65_ = NULL;
-	gchar* _tmp66_ = NULL;
-	gchar* _tmp67_ = NULL;
-	gchar* _tmp68_ = NULL;
-	gchar* _tmp69_ = NULL;
-	gchar* _tmp70_ = NULL;
-	gchar* _tmp71_ = NULL;
-	gchar* _tmp72_ = NULL;
-	gchar* _tmp73_ = NULL;
-	gchar* _tmp74_ = NULL;
-	gchar* _tmp75_ = NULL;
-	gchar* _tmp76_ = NULL;
-	gchar* _tmp77_ = NULL;
-	gchar* _tmp78_ = NULL;
-	gchar* _tmp79_ = NULL;
-	gchar* _tmp80_ = NULL;
-	gchar* _tmp81_ = NULL;
-	gchar* _tmp82_ = NULL;
-	gchar* _tmp83_ = NULL;
-	gchar* _tmp84_ = NULL;
-	gchar* _tmp85_ = NULL;
-	gchar* _tmp86_ = NULL;
-	gchar* _tmp87_ = NULL;
-	gchar* _tmp88_ = NULL;
-	gchar* _tmp89_ = NULL;
-	gchar* _tmp90_ = NULL;
-	gchar* _tmp91_ = NULL;
-	gchar* _tmp92_ = NULL;
-	gchar* _tmp93_ = NULL;
-	gchar* _tmp94_ = NULL;
-	gchar* _tmp95_ = NULL;
-	gchar* _tmp96_ = NULL;
-	gchar* _tmp97_ = NULL;
-	gchar* _tmp98_ = NULL;
-	gchar* _tmp99_ = NULL;
-	gchar* _tmp100_ = NULL;
-	gchar* _tmp101_ = NULL;
-	gchar* _tmp102_ = NULL;
-	gchar* _tmp103_ = NULL;
-	gchar* _tmp104_ = NULL;
-	gchar* _tmp105_ = NULL;
-	gchar* _tmp106_ = NULL;
-	gchar* _tmp107_ = NULL;
-	gchar* _tmp108_ = NULL;
-	gchar* _tmp109_ = NULL;
-	gchar* _tmp110_ = NULL;
-	gchar* _tmp111_ = NULL;
-	gchar* _tmp112_ = NULL;
-	gchar* _tmp113_ = NULL;
-	gchar* _tmp114_ = NULL;
-	gchar* _tmp115_ = NULL;
-	gchar* _tmp116_ = NULL;
-	gchar* _tmp117_ = NULL;
-	gchar* _tmp118_ = NULL;
-	gchar* _tmp119_ = NULL;
-	gchar* _tmp120_ = NULL;
-	gchar* _tmp121_ = NULL;
-	gchar* _tmp122_ = NULL;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
+	gchar* _tmp20_;
+	gchar* _tmp21_;
+	gchar* _tmp22_;
+	gchar* _tmp23_;
+	gchar* _tmp24_;
+	gchar* _tmp25_;
+	gchar* _tmp26_;
+	gchar* _tmp27_;
+	gchar* _tmp28_;
+	gchar* _tmp29_;
+	gchar* _tmp30_;
+	gchar* _tmp31_;
+	gchar* _tmp32_;
+	gchar* _tmp33_;
+	gchar* _tmp34_;
+	gchar* _tmp35_;
+	gchar* _tmp36_;
+	gchar* _tmp37_;
+	gchar* _tmp38_;
+	gchar* _tmp39_;
+	gchar* _tmp40_;
+	gchar* _tmp41_;
+	gchar* _tmp42_;
+	gchar* _tmp43_;
+	gchar* _tmp44_;
+	gchar* _tmp45_;
+	gchar* _tmp46_;
+	gchar* _tmp47_;
+	gchar* _tmp48_;
+	gchar* _tmp49_;
+	gchar* _tmp50_;
+	gchar* _tmp51_;
+	gchar* _tmp52_;
+	gchar* _tmp53_;
+	gchar* _tmp54_;
+	gchar* _tmp55_;
+	gchar* _tmp56_;
+	gchar* _tmp57_;
+	gchar* _tmp58_;
+	gchar* _tmp59_;
+	gchar* _tmp60_;
+	gchar* _tmp61_;
+	gchar* _tmp62_;
+	gchar* _tmp63_;
+	gchar* _tmp64_;
+	gchar* _tmp65_;
+	gchar* _tmp66_;
+	gchar* _tmp67_;
+	gchar* _tmp68_;
+	gchar* _tmp69_;
+	gchar* _tmp70_;
+	gchar* _tmp71_;
+	gchar* _tmp72_;
+	gchar* _tmp73_;
+	gchar* _tmp74_;
+	gchar* _tmp75_;
+	gchar* _tmp76_;
+	gchar* _tmp77_;
+	gchar* _tmp78_;
+	gchar* _tmp79_;
+	gchar* _tmp80_;
+	gchar* _tmp81_;
+	gchar* _tmp82_;
+	gchar* _tmp83_;
+	gchar* _tmp84_;
+	gchar* _tmp85_;
+	gchar* _tmp86_;
+	gchar* _tmp87_;
+	gchar* _tmp88_;
+	gchar* _tmp89_;
+	gchar* _tmp90_;
+	gchar* _tmp91_;
+	gchar* _tmp92_;
+	gchar* _tmp93_;
+	gchar* _tmp94_;
+	gchar* _tmp95_;
+	gchar* _tmp96_;
+	gchar* _tmp97_;
+	gchar* _tmp98_;
+	gchar* _tmp99_;
+	gchar* _tmp100_;
+	gchar* _tmp101_;
+	gchar* _tmp102_;
+	gchar* _tmp103_;
+	gchar* _tmp104_;
+	gchar* _tmp105_;
+	gchar* _tmp106_;
+	gchar* _tmp107_;
+	gchar* _tmp108_;
+	gchar* _tmp109_;
+	gchar* _tmp110_;
+	gchar* _tmp111_;
+	gchar* _tmp112_;
+	gchar* _tmp113_;
+	gchar* _tmp114_;
 #line 560 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = g_strdup ("%s");
 #line 560 "/home/jens/Source/shotwell/src/Resources.vala"
 	menu_base = _tmp0_;
 #line 561 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = _ ("Rate %s");
+	_tmp1_ = g_strdup (_ ("Rate %s"));
 #line 561 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 561 "/home/jens/Source/shotwell/src/Resources.vala"
-	label_base = _tmp2_;
+	label_base = _tmp1_;
 #line 562 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = _ ("Set rating to %s");
+	_tmp2_ = g_strdup (_ ("Set rating to %s"));
 #line 562 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp4_ = g_strdup (_tmp3_);
-#line 562 "/home/jens/Source/shotwell/src/Resources.vala"
-	tooltip_base = _tmp4_;
+	tooltip_base = _tmp2_;
 #line 563 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp5_ = _ ("Setting rating to %s");
+	_tmp3_ = g_strdup (_ ("Setting rating to %s"));
 #line 563 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp6_ = g_strdup (_tmp5_);
-#line 563 "/home/jens/Source/shotwell/src/Resources.vala"
-	progress_base = _tmp6_;
+	progress_base = _tmp3_;
 #line 564 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp7_ = g_strdup ("%s");
+	_tmp4_ = g_strdup ("%s");
 #line 564 "/home/jens/Source/shotwell/src/Resources.vala"
-	display_rating_menu_base = _tmp7_;
-#line 565 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp8_ = _ ("Display %s");
+	display_rating_menu_base = _tmp4_;
 #line 565 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp9_ = g_strdup (_tmp8_);
+	_tmp5_ = g_strdup (_ ("Display %s"));
 #line 565 "/home/jens/Source/shotwell/src/Resources.vala"
-	display_rating_label_base = _tmp9_;
+	display_rating_label_base = _tmp5_;
 #line 566 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp10_ = _ ("Only show photos with a rating of %s");
-#line 566 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp11_ = g_strdup (_tmp10_);
+	_tmp6_ = g_strdup (_ ("Only show photos with a rating of %s"));
 #line 566 "/home/jens/Source/shotwell/src/Resources.vala"
-	display_rating_tooltip_base = _tmp11_;
+	display_rating_tooltip_base = _tmp6_;
 #line 567 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp12_ = _ ("%s or Better");
+	_tmp7_ = g_strdup (_ ("%s or Better"));
 #line 567 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp13_ = g_strdup (_tmp12_);
-#line 567 "/home/jens/Source/shotwell/src/Resources.vala"
-	display_rating_or_higher_menu_base = _tmp13_;
-#line 568 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp14_ = _ ("Display %s or Better");
+	display_rating_or_higher_menu_base = _tmp7_;
 #line 568 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp15_ = g_strdup (_tmp14_);
+	_tmp8_ = g_strdup (_ ("Display %s or Better"));
 #line 568 "/home/jens/Source/shotwell/src/Resources.vala"
-	display_rating_or_higher_label_base = _tmp15_;
-#line 569 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp16_ = _ ("Only show photos with a rating of %s or better");
+	display_rating_or_higher_label_base = _tmp8_;
 #line 569 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp17_ = g_strdup (_tmp16_);
+	_tmp9_ = g_strdup (_ ("Only show photos with a rating of %s or better"));
 #line 569 "/home/jens/Source/shotwell/src/Resources.vala"
-	display_rating_or_higher_tooltip_base = _tmp17_;
+	display_rating_or_higher_tooltip_base = _tmp9_;
 #line 571 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp18_ = resources_get_stars (RATING_ONE);
+	_tmp10_ = resources_get_stars (RATING_ONE);
 #line 571 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp19_ = _tmp18_;
+	_tmp11_ = _tmp10_;
 #line 571 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp20_ = g_strdup_printf (menu_base, _tmp19_);
+	_tmp12_ = g_strdup_printf (menu_base, _tmp11_);
 #line 571 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_ONE_MENU);
 #line 571 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_ONE_MENU = _tmp20_;
+	resources_RATE_ONE_MENU = _tmp12_;
 #line 571 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp19_);
+	_g_free0 (_tmp11_);
 #line 572 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp21_ = resources_get_stars (RATING_TWO);
+	_tmp13_ = resources_get_stars (RATING_TWO);
 #line 572 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp22_ = _tmp21_;
+	_tmp14_ = _tmp13_;
 #line 572 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp23_ = g_strdup_printf (menu_base, _tmp22_);
+	_tmp15_ = g_strdup_printf (menu_base, _tmp14_);
 #line 572 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_TWO_MENU);
 #line 572 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_TWO_MENU = _tmp23_;
+	resources_RATE_TWO_MENU = _tmp15_;
 #line 572 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp22_);
+	_g_free0 (_tmp14_);
 #line 573 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp24_ = resources_get_stars (RATING_THREE);
+	_tmp16_ = resources_get_stars (RATING_THREE);
 #line 573 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp25_ = _tmp24_;
+	_tmp17_ = _tmp16_;
 #line 573 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp26_ = g_strdup_printf (menu_base, _tmp25_);
+	_tmp18_ = g_strdup_printf (menu_base, _tmp17_);
 #line 573 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_THREE_MENU);
 #line 573 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_THREE_MENU = _tmp26_;
+	resources_RATE_THREE_MENU = _tmp18_;
 #line 573 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp25_);
+	_g_free0 (_tmp17_);
 #line 574 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp27_ = resources_get_stars (RATING_FOUR);
+	_tmp19_ = resources_get_stars (RATING_FOUR);
 #line 574 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp28_ = _tmp27_;
+	_tmp20_ = _tmp19_;
 #line 574 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp29_ = g_strdup_printf (menu_base, _tmp28_);
+	_tmp21_ = g_strdup_printf (menu_base, _tmp20_);
 #line 574 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FOUR_MENU);
 #line 574 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_FOUR_MENU = _tmp29_;
+	resources_RATE_FOUR_MENU = _tmp21_;
 #line 574 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp28_);
+	_g_free0 (_tmp20_);
 #line 575 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp30_ = resources_get_stars (RATING_FIVE);
+	_tmp22_ = resources_get_stars (RATING_FIVE);
 #line 575 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp31_ = _tmp30_;
+	_tmp23_ = _tmp22_;
 #line 575 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp32_ = g_strdup_printf (menu_base, _tmp31_);
+	_tmp24_ = g_strdup_printf (menu_base, _tmp23_);
 #line 575 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FIVE_MENU);
 #line 575 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_FIVE_MENU = _tmp32_;
+	resources_RATE_FIVE_MENU = _tmp24_;
 #line 575 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp31_);
+	_g_free0 (_tmp23_);
 #line 577 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp33_ = resources_get_stars (RATING_ONE);
+	_tmp25_ = resources_get_stars (RATING_ONE);
 #line 577 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp34_ = _tmp33_;
+	_tmp26_ = _tmp25_;
 #line 577 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp35_ = g_strdup_printf (label_base, _tmp34_);
+	_tmp27_ = g_strdup_printf (label_base, _tmp26_);
 #line 577 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_ONE_LABEL);
 #line 577 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_ONE_LABEL = _tmp35_;
+	resources_RATE_ONE_LABEL = _tmp27_;
 #line 577 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp34_);
+	_g_free0 (_tmp26_);
 #line 578 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp36_ = resources_get_stars (RATING_TWO);
+	_tmp28_ = resources_get_stars (RATING_TWO);
 #line 578 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp37_ = _tmp36_;
+	_tmp29_ = _tmp28_;
 #line 578 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp38_ = g_strdup_printf (label_base, _tmp37_);
+	_tmp30_ = g_strdup_printf (label_base, _tmp29_);
 #line 578 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_TWO_LABEL);
 #line 578 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_TWO_LABEL = _tmp38_;
+	resources_RATE_TWO_LABEL = _tmp30_;
 #line 578 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp37_);
+	_g_free0 (_tmp29_);
 #line 579 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp39_ = resources_get_stars (RATING_THREE);
+	_tmp31_ = resources_get_stars (RATING_THREE);
 #line 579 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp40_ = _tmp39_;
+	_tmp32_ = _tmp31_;
 #line 579 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp41_ = g_strdup_printf (label_base, _tmp40_);
+	_tmp33_ = g_strdup_printf (label_base, _tmp32_);
 #line 579 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_THREE_LABEL);
 #line 579 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_THREE_LABEL = _tmp41_;
+	resources_RATE_THREE_LABEL = _tmp33_;
 #line 579 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp40_);
+	_g_free0 (_tmp32_);
 #line 580 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp42_ = resources_get_stars (RATING_FOUR);
+	_tmp34_ = resources_get_stars (RATING_FOUR);
 #line 580 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp43_ = _tmp42_;
+	_tmp35_ = _tmp34_;
 #line 580 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp44_ = g_strdup_printf (label_base, _tmp43_);
+	_tmp36_ = g_strdup_printf (label_base, _tmp35_);
 #line 580 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FOUR_LABEL);
 #line 580 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_FOUR_LABEL = _tmp44_;
+	resources_RATE_FOUR_LABEL = _tmp36_;
 #line 580 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp43_);
+	_g_free0 (_tmp35_);
 #line 581 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp45_ = resources_get_stars (RATING_FIVE);
+	_tmp37_ = resources_get_stars (RATING_FIVE);
 #line 581 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp46_ = _tmp45_;
+	_tmp38_ = _tmp37_;
 #line 581 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp47_ = g_strdup_printf (label_base, _tmp46_);
+	_tmp39_ = g_strdup_printf (label_base, _tmp38_);
 #line 581 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FIVE_LABEL);
 #line 581 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_FIVE_LABEL = _tmp47_;
+	resources_RATE_FIVE_LABEL = _tmp39_;
 #line 581 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp46_);
+	_g_free0 (_tmp38_);
 #line 583 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp48_ = resources_get_stars (RATING_ONE);
+	_tmp40_ = resources_get_stars (RATING_ONE);
 #line 583 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp49_ = _tmp48_;
+	_tmp41_ = _tmp40_;
 #line 583 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp50_ = g_strdup_printf (tooltip_base, _tmp49_);
+	_tmp42_ = g_strdup_printf (tooltip_base, _tmp41_);
 #line 583 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_ONE_TOOLTIP);
 #line 583 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_ONE_TOOLTIP = _tmp50_;
+	resources_RATE_ONE_TOOLTIP = _tmp42_;
 #line 583 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp49_);
+	_g_free0 (_tmp41_);
 #line 584 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp51_ = resources_get_stars (RATING_TWO);
+	_tmp43_ = resources_get_stars (RATING_TWO);
 #line 584 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp52_ = _tmp51_;
+	_tmp44_ = _tmp43_;
 #line 584 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp53_ = g_strdup_printf (tooltip_base, _tmp52_);
+	_tmp45_ = g_strdup_printf (tooltip_base, _tmp44_);
 #line 584 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_TWO_TOOLTIP);
 #line 584 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_TWO_TOOLTIP = _tmp53_;
+	resources_RATE_TWO_TOOLTIP = _tmp45_;
 #line 584 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp52_);
+	_g_free0 (_tmp44_);
 #line 585 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp54_ = resources_get_stars (RATING_THREE);
+	_tmp46_ = resources_get_stars (RATING_THREE);
 #line 585 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp55_ = _tmp54_;
+	_tmp47_ = _tmp46_;
 #line 585 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp56_ = g_strdup_printf (tooltip_base, _tmp55_);
+	_tmp48_ = g_strdup_printf (tooltip_base, _tmp47_);
 #line 585 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_THREE_TOOLTIP);
 #line 585 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_THREE_TOOLTIP = _tmp56_;
+	resources_RATE_THREE_TOOLTIP = _tmp48_;
 #line 585 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp55_);
+	_g_free0 (_tmp47_);
 #line 586 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp57_ = resources_get_stars (RATING_FOUR);
+	_tmp49_ = resources_get_stars (RATING_FOUR);
 #line 586 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp58_ = _tmp57_;
+	_tmp50_ = _tmp49_;
 #line 586 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp59_ = g_strdup_printf (tooltip_base, _tmp58_);
+	_tmp51_ = g_strdup_printf (tooltip_base, _tmp50_);
 #line 586 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FOUR_TOOLTIP);
 #line 586 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_FOUR_TOOLTIP = _tmp59_;
+	resources_RATE_FOUR_TOOLTIP = _tmp51_;
 #line 586 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp58_);
+	_g_free0 (_tmp50_);
 #line 587 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp60_ = resources_get_stars (RATING_FIVE);
+	_tmp52_ = resources_get_stars (RATING_FIVE);
 #line 587 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp61_ = _tmp60_;
+	_tmp53_ = _tmp52_;
 #line 587 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp62_ = g_strdup_printf (tooltip_base, _tmp61_);
+	_tmp54_ = g_strdup_printf (tooltip_base, _tmp53_);
 #line 587 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FIVE_TOOLTIP);
 #line 587 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_FIVE_TOOLTIP = _tmp62_;
+	resources_RATE_FIVE_TOOLTIP = _tmp54_;
 #line 587 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp61_);
+	_g_free0 (_tmp53_);
 #line 589 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp63_ = resources_get_stars (RATING_ONE);
+	_tmp55_ = resources_get_stars (RATING_ONE);
 #line 589 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp64_ = _tmp63_;
+	_tmp56_ = _tmp55_;
 #line 589 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp65_ = g_strdup_printf (progress_base, _tmp64_);
+	_tmp57_ = g_strdup_printf (progress_base, _tmp56_);
 #line 589 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_ONE_PROGRESS);
 #line 589 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_ONE_PROGRESS = _tmp65_;
+	resources_RATE_ONE_PROGRESS = _tmp57_;
 #line 589 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp64_);
+	_g_free0 (_tmp56_);
 #line 590 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp66_ = resources_get_stars (RATING_TWO);
+	_tmp58_ = resources_get_stars (RATING_TWO);
 #line 590 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp67_ = _tmp66_;
+	_tmp59_ = _tmp58_;
 #line 590 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp68_ = g_strdup_printf (progress_base, _tmp67_);
+	_tmp60_ = g_strdup_printf (progress_base, _tmp59_);
 #line 590 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_TWO_PROGRESS);
 #line 590 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_TWO_PROGRESS = _tmp68_;
+	resources_RATE_TWO_PROGRESS = _tmp60_;
 #line 590 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp67_);
+	_g_free0 (_tmp59_);
 #line 591 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp69_ = resources_get_stars (RATING_THREE);
+	_tmp61_ = resources_get_stars (RATING_THREE);
 #line 591 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp70_ = _tmp69_;
+	_tmp62_ = _tmp61_;
 #line 591 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp71_ = g_strdup_printf (progress_base, _tmp70_);
+	_tmp63_ = g_strdup_printf (progress_base, _tmp62_);
 #line 591 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_THREE_PROGRESS);
 #line 591 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_THREE_PROGRESS = _tmp71_;
+	resources_RATE_THREE_PROGRESS = _tmp63_;
 #line 591 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp70_);
+	_g_free0 (_tmp62_);
 #line 592 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp72_ = resources_get_stars (RATING_FOUR);
+	_tmp64_ = resources_get_stars (RATING_FOUR);
 #line 592 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp73_ = _tmp72_;
+	_tmp65_ = _tmp64_;
 #line 592 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp74_ = g_strdup_printf (progress_base, _tmp73_);
+	_tmp66_ = g_strdup_printf (progress_base, _tmp65_);
 #line 592 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FOUR_PROGRESS);
 #line 592 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_FOUR_PROGRESS = _tmp74_;
+	resources_RATE_FOUR_PROGRESS = _tmp66_;
 #line 592 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp73_);
+	_g_free0 (_tmp65_);
 #line 593 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp75_ = resources_get_stars (RATING_FIVE);
+	_tmp67_ = resources_get_stars (RATING_FIVE);
 #line 593 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp76_ = _tmp75_;
+	_tmp68_ = _tmp67_;
 #line 593 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp77_ = g_strdup_printf (progress_base, _tmp76_);
+	_tmp69_ = g_strdup_printf (progress_base, _tmp68_);
 #line 593 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FIVE_PROGRESS);
 #line 593 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_RATE_FIVE_PROGRESS = _tmp77_;
+	resources_RATE_FIVE_PROGRESS = _tmp69_;
 #line 593 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp76_);
+	_g_free0 (_tmp68_);
 #line 595 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp78_ = resources_get_stars (RATING_ONE);
+	_tmp70_ = resources_get_stars (RATING_ONE);
 #line 595 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp79_ = _tmp78_;
+	_tmp71_ = _tmp70_;
 #line 595 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp80_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp79_);
+	_tmp72_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp71_);
 #line 595 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_ONE_OR_HIGHER_MENU);
 #line 595 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_DISPLAY_ONE_OR_HIGHER_MENU = _tmp80_;
+	resources_DISPLAY_ONE_OR_HIGHER_MENU = _tmp72_;
 #line 595 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp79_);
+	_g_free0 (_tmp71_);
 #line 596 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp81_ = resources_get_stars (RATING_TWO);
+	_tmp73_ = resources_get_stars (RATING_TWO);
 #line 596 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp82_ = _tmp81_;
+	_tmp74_ = _tmp73_;
 #line 596 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp83_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp82_);
+	_tmp75_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp74_);
 #line 596 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_TWO_OR_HIGHER_MENU);
 #line 596 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_DISPLAY_TWO_OR_HIGHER_MENU = _tmp83_;
+	resources_DISPLAY_TWO_OR_HIGHER_MENU = _tmp75_;
 #line 596 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp82_);
+	_g_free0 (_tmp74_);
 #line 597 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp84_ = resources_get_stars (RATING_THREE);
+	_tmp76_ = resources_get_stars (RATING_THREE);
 #line 597 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp85_ = _tmp84_;
+	_tmp77_ = _tmp76_;
 #line 597 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp86_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp85_);
+	_tmp78_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp77_);
 #line 597 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_THREE_OR_HIGHER_MENU);
 #line 597 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_DISPLAY_THREE_OR_HIGHER_MENU = _tmp86_;
+	resources_DISPLAY_THREE_OR_HIGHER_MENU = _tmp78_;
 #line 597 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp85_);
+	_g_free0 (_tmp77_);
 #line 598 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp87_ = resources_get_stars (RATING_FOUR);
+	_tmp79_ = resources_get_stars (RATING_FOUR);
 #line 598 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp88_ = _tmp87_;
+	_tmp80_ = _tmp79_;
 #line 598 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp89_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp88_);
+	_tmp81_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp80_);
 #line 598 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FOUR_OR_HIGHER_MENU);
 #line 598 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_DISPLAY_FOUR_OR_HIGHER_MENU = _tmp89_;
+	resources_DISPLAY_FOUR_OR_HIGHER_MENU = _tmp81_;
 #line 598 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp88_);
+	_g_free0 (_tmp80_);
 #line 599 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp90_ = resources_get_stars (RATING_FIVE);
+	_tmp82_ = resources_get_stars (RATING_FIVE);
 #line 599 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp91_ = _tmp90_;
+	_tmp83_ = _tmp82_;
 #line 599 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp92_ = g_strdup_printf (display_rating_menu_base, _tmp91_);
+	_tmp84_ = g_strdup_printf (display_rating_menu_base, _tmp83_);
 #line 599 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FIVE_OR_HIGHER_MENU);
 #line 599 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_DISPLAY_FIVE_OR_HIGHER_MENU = _tmp92_;
+	resources_DISPLAY_FIVE_OR_HIGHER_MENU = _tmp84_;
 #line 599 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp91_);
+	_g_free0 (_tmp83_);
 #line 601 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp93_ = resources_get_stars (RATING_ONE);
+	_tmp85_ = resources_get_stars (RATING_ONE);
 #line 601 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp94_ = _tmp93_;
+	_tmp86_ = _tmp85_;
 #line 601 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp95_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp94_);
+	_tmp87_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp86_);
 #line 601 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_ONE_OR_HIGHER_LABEL);
 #line 601 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_DISPLAY_ONE_OR_HIGHER_LABEL = _tmp95_;
+	resources_DISPLAY_ONE_OR_HIGHER_LABEL = _tmp87_;
 #line 601 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp94_);
+	_g_free0 (_tmp86_);
 #line 602 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp96_ = resources_get_stars (RATING_TWO);
+	_tmp88_ = resources_get_stars (RATING_TWO);
 #line 602 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp97_ = _tmp96_;
+	_tmp89_ = _tmp88_;
 #line 602 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp98_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp97_);
+	_tmp90_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp89_);
 #line 602 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_TWO_OR_HIGHER_LABEL);
 #line 602 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_DISPLAY_TWO_OR_HIGHER_LABEL = _tmp98_;
+	resources_DISPLAY_TWO_OR_HIGHER_LABEL = _tmp90_;
 #line 602 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp97_);
+	_g_free0 (_tmp89_);
 #line 603 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp99_ = resources_get_stars (RATING_THREE);
+	_tmp91_ = resources_get_stars (RATING_THREE);
 #line 603 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp100_ = _tmp99_;
+	_tmp92_ = _tmp91_;
 #line 603 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp101_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp100_);
+	_tmp93_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp92_);
 #line 603 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_THREE_OR_HIGHER_LABEL);
 #line 603 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_DISPLAY_THREE_OR_HIGHER_LABEL = _tmp101_;
+	resources_DISPLAY_THREE_OR_HIGHER_LABEL = _tmp93_;
 #line 603 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp100_);
+	_g_free0 (_tmp92_);
 #line 604 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp102_ = resources_get_stars (RATING_FOUR);
+	_tmp94_ = resources_get_stars (RATING_FOUR);
 #line 604 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp103_ = _tmp102_;
+	_tmp95_ = _tmp94_;
 #line 604 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp104_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp103_);
+	_tmp96_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp95_);
 #line 604 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FOUR_OR_HIGHER_LABEL);
 #line 604 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_DISPLAY_FOUR_OR_HIGHER_LABEL = _tmp104_;
+	resources_DISPLAY_FOUR_OR_HIGHER_LABEL = _tmp96_;
 #line 604 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp103_);
+	_g_free0 (_tmp95_);
 #line 605 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp105_ = resources_get_stars (RATING_FIVE);
+	_tmp97_ = resources_get_stars (RATING_FIVE);
 #line 605 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp106_ = _tmp105_;
+	_tmp98_ = _tmp97_;
 #line 605 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp107_ = g_strdup_printf (display_rating_label_base, _tmp106_);
+	_tmp99_ = g_strdup_printf (display_rating_label_base, _tmp98_);
 #line 605 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FIVE_OR_HIGHER_LABEL);
 #line 605 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_DISPLAY_FIVE_OR_HIGHER_LABEL = _tmp107_;
+	resources_DISPLAY_FIVE_OR_HIGHER_LABEL = _tmp99_;
 #line 605 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp106_);
+	_g_free0 (_tmp98_);
 #line 607 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp108_ = resources_get_stars (RATING_ONE);
+	_tmp100_ = resources_get_stars (RATING_ONE);
 #line 607 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp109_ = _tmp108_;
+	_tmp101_ = _tmp100_;
 #line 607 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp110_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp109_);
+	_tmp102_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp101_);
 #line 607 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP);
 #line 607 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP = _tmp110_;
+	resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP = _tmp102_;
 #line 607 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp109_);
+	_g_free0 (_tmp101_);
 #line 608 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp111_ = resources_get_stars (RATING_TWO);
+	_tmp103_ = resources_get_stars (RATING_TWO);
 #line 608 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp112_ = _tmp111_;
+	_tmp104_ = _tmp103_;
 #line 608 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp113_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp112_);
+	_tmp105_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp104_);
 #line 608 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP);
 #line 608 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP = _tmp113_;
+	resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP = _tmp105_;
 #line 608 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp112_);
+	_g_free0 (_tmp104_);
 #line 609 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp114_ = resources_get_stars (RATING_THREE);
+	_tmp106_ = resources_get_stars (RATING_THREE);
 #line 609 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp115_ = _tmp114_;
+	_tmp107_ = _tmp106_;
 #line 609 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp116_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp115_);
+	_tmp108_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp107_);
 #line 609 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP);
 #line 609 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP = _tmp116_;
+	resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP = _tmp108_;
 #line 609 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp115_);
+	_g_free0 (_tmp107_);
 #line 610 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp117_ = resources_get_stars (RATING_FOUR);
+	_tmp109_ = resources_get_stars (RATING_FOUR);
 #line 610 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp118_ = _tmp117_;
+	_tmp110_ = _tmp109_;
 #line 610 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp119_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp118_);
+	_tmp111_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp110_);
 #line 610 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP);
 #line 610 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP = _tmp119_;
+	resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP = _tmp111_;
 #line 610 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp118_);
+	_g_free0 (_tmp110_);
 #line 611 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp120_ = resources_get_stars (RATING_FIVE);
+	_tmp112_ = resources_get_stars (RATING_FIVE);
 #line 611 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp121_ = _tmp120_;
+	_tmp113_ = _tmp112_;
 #line 611 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp122_ = g_strdup_printf (display_rating_tooltip_base, _tmp121_);
+	_tmp114_ = g_strdup_printf (display_rating_tooltip_base, _tmp113_);
 #line 611 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP);
 #line 611 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP = _tmp122_;
+	resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP = _tmp114_;
 #line 611 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp121_);
+	_g_free0 (_tmp113_);
 #line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_or_higher_tooltip_base);
 #line 559 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -2217,35 +2145,32 @@ void resources_generate_rating_strings (void) {
 	_g_free0 (label_base);
 #line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (menu_base);
-#line 2193 "Resources.c"
+#line 2121 "Resources.c"
 }
 
 
 gchar* resources_jump_to_file_failed (GError* err) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	GError* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	GError* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 670 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = _ ("Unable to open in file manager: %s");
+	_tmp0_ = err;
 #line 670 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = err;
+	_tmp1_ = _tmp0_->message;
 #line 670 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = _tmp1_->message;
+	_tmp2_ = g_strdup_printf (_ ("Unable to open in file manager: %s"), _tmp1_);
 #line 670 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 670 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2215 "Resources.c"
+#line 2140 "Resources.c"
 }
 
 
 void resources_init (void) {
-	GtkIconTheme* _tmp0_ = NULL;
-	GtkIconTheme* _tmp1_ = NULL;
+	GtkIconTheme* _tmp0_;
+	GtkIconTheme* _tmp1_;
 #line 692 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_get_icon_theme_engine ();
 #line 692 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -2254,7 +2179,7 @@ void resources_init (void) {
 	_g_object_unref0 (_tmp1_);
 #line 694 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_generate_rating_strings ();
-#line 2230 "Resources.c"
+#line 2155 "Resources.c"
 }
 
 
@@ -2274,31 +2199,26 @@ void resources_terminate (void) {
      */
 void resources_fetch_lc_time_format (void) {
 	gchar* old_language = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
 	gchar* old_messages = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
 	gchar* lc_time = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	const gchar* _tmp24_ = NULL;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	const gchar* _tmp7_;
+	gchar* _tmp9_;
+	const gchar* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	const gchar* _tmp17_;
+	const gchar* _tmp19_;
 #line 713 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = g_getenv ("LANGUAGE");
 #line 713 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -2311,7 +2231,7 @@ void resources_fetch_lc_time_format (void) {
 	if (_tmp2_ != NULL) {
 #line 715 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_unsetenv ("LANGUAGE");
-#line 2287 "Resources.c"
+#line 2207 "Resources.c"
 	}
 #line 719 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = setlocale (LC_MESSAGES, NULL);
@@ -2329,13 +2249,13 @@ void resources_fetch_lc_time_format (void) {
 	_tmp7_ = lc_time;
 #line 722 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp7_ != NULL) {
-#line 2305 "Resources.c"
-		const gchar* _tmp8_ = NULL;
+#line 2225 "Resources.c"
+		const gchar* _tmp8_;
 #line 723 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = lc_time;
 #line 723 "/home/jens/Source/shotwell/src/Resources.vala"
 		setlocale (LC_MESSAGES, _tmp8_);
-#line 2311 "Resources.c"
+#line 2231 "Resources.c"
 	}
 #line 730 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp9_ = g_strdup ("%X");
@@ -2352,68 +2272,58 @@ void resources_fetch_lc_time_format (void) {
 #line 735 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_HH_MM_SS_FORMAT_STRING = _tmp11_;
 #line 739 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp12_ = _ ("%a %b %d, %Y");
-#line 739 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp13_ = g_strdup (_tmp12_);
+	_tmp12_ = g_strdup (_ ("%a %b %d, %Y"));
 #line 739 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_LONG_DATE_FORMAT_STRING);
 #line 739 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_LONG_DATE_FORMAT_STRING = _tmp13_;
-#line 744 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp14_ = C_ ("MultidayFormat", "%a %b %d");
+	resources_LONG_DATE_FORMAT_STRING = _tmp12_;
 #line 744 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp15_ = g_strdup (_tmp14_);
+	_tmp13_ = g_strdup (C_ ("MultidayFormat", "%a %b %d"));
 #line 744 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_START_MULTIDAY_DATE_FORMAT_STRING);
 #line 744 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_START_MULTIDAY_DATE_FORMAT_STRING = _tmp15_;
+	resources_START_MULTIDAY_DATE_FORMAT_STRING = _tmp13_;
 #line 749 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp16_ = C_ ("MultidayFormat", "%d, %Y");
-#line 749 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp17_ = g_strdup (_tmp16_);
+	_tmp14_ = g_strdup (C_ ("MultidayFormat", "%d, %Y"));
 #line 749 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_END_MULTIDAY_DATE_FORMAT_STRING);
 #line 749 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_END_MULTIDAY_DATE_FORMAT_STRING = _tmp17_;
-#line 754 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp18_ = C_ ("MultimonthFormat", "%a %b %d");
+	resources_END_MULTIDAY_DATE_FORMAT_STRING = _tmp14_;
 #line 754 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp19_ = g_strdup (_tmp18_);
+	_tmp15_ = g_strdup (C_ ("MultimonthFormat", "%a %b %d"));
 #line 754 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_START_MULTIMONTH_DATE_FORMAT_STRING);
 #line 754 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_START_MULTIMONTH_DATE_FORMAT_STRING = _tmp19_;
-#line 759 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp20_ = C_ ("MultimonthFormat", "%a %b %d, %Y");
+	resources_START_MULTIMONTH_DATE_FORMAT_STRING = _tmp15_;
 #line 759 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp21_ = g_strdup (_tmp20_);
+	_tmp16_ = g_strdup (C_ ("MultimonthFormat", "%a %b %d, %Y"));
 #line 759 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_END_MULTIMONTH_DATE_FORMAT_STRING);
 #line 759 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_END_MULTIMONTH_DATE_FORMAT_STRING = _tmp21_;
+	resources_END_MULTIMONTH_DATE_FORMAT_STRING = _tmp16_;
 #line 762 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp22_ = old_messages;
+	_tmp17_ = old_messages;
 #line 762 "/home/jens/Source/shotwell/src/Resources.vala"
-	if (_tmp22_ != NULL) {
-#line 2371 "Resources.c"
-		const gchar* _tmp23_ = NULL;
+	if (_tmp17_ != NULL) {
+#line 2281 "Resources.c"
+		const gchar* _tmp18_;
 #line 763 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp23_ = old_messages;
+		_tmp18_ = old_messages;
 #line 763 "/home/jens/Source/shotwell/src/Resources.vala"
-		setlocale (LC_MESSAGES, _tmp23_);
-#line 2377 "Resources.c"
+		setlocale (LC_MESSAGES, _tmp18_);
+#line 2287 "Resources.c"
 	}
 #line 766 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp24_ = old_language;
+	_tmp19_ = old_language;
 #line 766 "/home/jens/Source/shotwell/src/Resources.vala"
-	if (_tmp24_ != NULL) {
-#line 2383 "Resources.c"
-		const gchar* _tmp25_ = NULL;
+	if (_tmp19_ != NULL) {
+#line 2293 "Resources.c"
+		const gchar* _tmp20_;
 #line 767 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp25_ = old_language;
+		_tmp20_ = old_language;
 #line 767 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_setenv ("LANGUAGE", _tmp25_, TRUE);
-#line 2389 "Resources.c"
+		g_setenv ("LANGUAGE", _tmp20_, TRUE);
+#line 2299 "Resources.c"
 	}
 #line 710 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (lc_time);
@@ -2421,7 +2331,7 @@ void resources_fetch_lc_time_format (void) {
 	_g_free0 (old_messages);
 #line 710 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (old_language);
-#line 2397 "Resources.c"
+#line 2307 "Resources.c"
 }
 
 
@@ -2440,39 +2350,39 @@ GType resources_unit_system_get_type (void) {
 static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) {
 	gint result = 0;
 	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	gunichar _tmp1_ = 0U;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint _tmp0_;
+	gunichar _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1041 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 2434 "Resources.c"
-		gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2344 "Resources.c"
+		gchar* _tmp4_;
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2442 "Resources.c"
+#line 2352 "Resources.c"
 	} else {
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2448 "Resources.c"
+#line 2358 "Resources.c"
 	}
 }
 
@@ -2480,43 +2390,43 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 2472 "Resources.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2382 "Resources.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2480 "Resources.c"
+#line 2390 "Resources.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2492 "Resources.c"
+#line 2402 "Resources.c"
 	}
 }
 
@@ -2525,127 +2435,127 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 2516 "Resources.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2426 "Resources.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 2522 "Resources.c"
+#line 2432 "Resources.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 2526 "Resources.c"
+#line 2436 "Resources.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 2530 "Resources.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2440 "Resources.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 2542 "Resources.c"
+#line 2452 "Resources.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 2552 "Resources.c"
+#line 2462 "Resources.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 2558 "Resources.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2468 "Resources.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 2572 "Resources.c"
+#line 2482 "Resources.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 2582 "Resources.c"
+#line 2492 "Resources.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 2588 "Resources.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2498 "Resources.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 2597 "Resources.c"
+#line 2507 "Resources.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2617 "Resources.c"
+#line 2527 "Resources.c"
 }
 
 
-static gboolean _vala_string_array_contains (const gchar** stack, int stack_length, const gchar* needle) {
+static gboolean _vala_string_array_contains (const gchar* * stack, int stack_length, const gchar* needle) {
 	int i;
 #line 798 "/home/jens/Source/shotwell/src/Resources.vala"
 	for (i = 0; i < stack_length; i++) {
@@ -2653,40 +2563,40 @@ static gboolean _vala_string_array_contains (const gchar** stack, int stack_leng
 		if (g_strcmp0 (stack[i], needle) == 0) {
 #line 798 "/home/jens/Source/shotwell/src/Resources.vala"
 			return TRUE;
-#line 2629 "Resources.c"
+#line 2539 "Resources.c"
 		}
 	}
 #line 798 "/home/jens/Source/shotwell/src/Resources.vala"
 	return FALSE;
-#line 2634 "Resources.c"
+#line 2544 "Resources.c"
 }
 
 
 ResourcesUnitSystem resources_get_default_measurement_unit (void) {
 	ResourcesUnitSystem result = 0;
-	ResourcesUnitSystem _tmp0_ = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	ResourcesUnitSystem _tmp0_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
 	gint index = 0;
-	const gchar* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	const gchar* _tmp15_ = NULL;
-	ResourcesUnitSystem _tmp16_ = 0;
+	const gchar* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	const gchar* _tmp15_;
+	ResourcesUnitSystem _tmp16_;
 #line 783 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_unit_system;
 #line 783 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ != RESOURCES_UNIT_SYSTEM_UNKNOWN) {
-#line 2654 "Resources.c"
-		ResourcesUnitSystem _tmp1_ = 0;
+#line 2564 "Resources.c"
+		ResourcesUnitSystem _tmp1_;
 #line 784 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp1_ = resources_unit_system;
 #line 784 "/home/jens/Source/shotwell/src/Resources.vala"
 		result = _tmp1_;
 #line 784 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 2662 "Resources.c"
+#line 2572 "Resources.c"
 	}
 #line 787 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_getenv ("LC_MEASUREMENT");
@@ -2700,11 +2610,11 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
 	_tmp4_ = resources_lc_measurement;
 #line 788 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp4_ == NULL) {
-#line 2676 "Resources.c"
-		gchar** _tmp5_ = NULL;
-		gchar** _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
+#line 2586 "Resources.c"
+		gchar** _tmp5_;
+		gchar** _tmp6_;
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
 #line 789 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = _tmp5_ = g_get_language_names ();
 #line 789 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -2715,7 +2625,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
 		_g_free0 (resources_lc_measurement);
 #line 789 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_lc_measurement = _tmp8_;
-#line 2691 "Resources.c"
+#line 2601 "Resources.c"
 	}
 #line 792 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp9_ = resources_lc_measurement;
@@ -2727,10 +2637,10 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
 	_tmp11_ = index;
 #line 793 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp11_ > 0) {
-#line 2703 "Resources.c"
-		const gchar* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
-		gchar* _tmp14_ = NULL;
+#line 2613 "Resources.c"
+		const gchar* _tmp12_;
+		gint _tmp13_;
+		gchar* _tmp14_;
 #line 794 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = resources_lc_measurement;
 #line 794 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -2741,7 +2651,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
 		_g_free0 (resources_lc_measurement);
 #line 794 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_lc_measurement = _tmp14_;
-#line 2717 "Resources.c"
+#line 2627 "Resources.c"
 	}
 #line 797 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_unit_system = RESOURCES_UNIT_SYSTEM_METRIC;
@@ -2751,7 +2661,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
 	if (_vala_string_array_contains (RESOURCES_IMPERIAL_COUNTRIES, G_N_ELEMENTS (RESOURCES_IMPERIAL_COUNTRIES), _tmp15_)) {
 #line 799 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_unit_system = RESOURCES_UNIT_SYSTEM_IMPERIAL;
-#line 2727 "Resources.c"
+#line 2637 "Resources.c"
 	}
 #line 802 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp16_ = resources_unit_system;
@@ -2759,7 +2669,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
 	result = _tmp16_;
 #line 802 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2735 "Resources.c"
+#line 2645 "Resources.c"
 }
 
 
@@ -2769,16 +2679,16 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
      */
 gchar* resources_get_hh_mm_format_string (void) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 810 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_HH_MM_FORMAT_STRING;
 #line 810 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
 #line 811 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2754 "Resources.c"
+#line 2664 "Resources.c"
 	}
 #line 814 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_HH_MM_FORMAT_STRING;
@@ -2788,22 +2698,22 @@ gchar* resources_get_hh_mm_format_string (void) {
 	result = _tmp2_;
 #line 814 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2764 "Resources.c"
+#line 2674 "Resources.c"
 }
 
 
 gchar* resources_get_hh_mm_ss_format_string (void) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 818 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_HH_MM_SS_FORMAT_STRING;
 #line 818 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
 #line 819 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2779 "Resources.c"
+#line 2689 "Resources.c"
 	}
 #line 822 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_HH_MM_SS_FORMAT_STRING;
@@ -2813,22 +2723,22 @@ gchar* resources_get_hh_mm_ss_format_string (void) {
 	result = _tmp2_;
 #line 822 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2789 "Resources.c"
+#line 2699 "Resources.c"
 }
 
 
 gchar* resources_get_long_date_format_string (void) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 826 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_LONG_DATE_FORMAT_STRING;
 #line 826 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
 #line 827 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2804 "Resources.c"
+#line 2714 "Resources.c"
 	}
 #line 830 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_LONG_DATE_FORMAT_STRING;
@@ -2838,22 +2748,22 @@ gchar* resources_get_long_date_format_string (void) {
 	result = _tmp2_;
 #line 830 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2814 "Resources.c"
+#line 2724 "Resources.c"
 }
 
 
 gchar* resources_get_start_multiday_span_format_string (void) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 834 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_START_MULTIDAY_DATE_FORMAT_STRING;
 #line 834 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
 #line 835 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2829 "Resources.c"
+#line 2739 "Resources.c"
 	}
 #line 838 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_START_MULTIDAY_DATE_FORMAT_STRING;
@@ -2863,22 +2773,22 @@ gchar* resources_get_start_multiday_span_format_string (void) {
 	result = _tmp2_;
 #line 838 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2839 "Resources.c"
+#line 2749 "Resources.c"
 }
 
 
 gchar* resources_get_end_multiday_span_format_string (void) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 842 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_END_MULTIDAY_DATE_FORMAT_STRING;
 #line 842 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
 #line 843 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2854 "Resources.c"
+#line 2764 "Resources.c"
 	}
 #line 846 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_END_MULTIDAY_DATE_FORMAT_STRING;
@@ -2888,22 +2798,22 @@ gchar* resources_get_end_multiday_span_format_string (void) {
 	result = _tmp2_;
 #line 846 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2864 "Resources.c"
+#line 2774 "Resources.c"
 }
 
 
 gchar* resources_get_start_multimonth_span_format_string (void) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 850 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_START_MULTIMONTH_DATE_FORMAT_STRING;
 #line 850 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
 #line 851 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2879 "Resources.c"
+#line 2789 "Resources.c"
 	}
 #line 854 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_START_MULTIMONTH_DATE_FORMAT_STRING;
@@ -2913,22 +2823,22 @@ gchar* resources_get_start_multimonth_span_format_string (void) {
 	result = _tmp2_;
 #line 854 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2889 "Resources.c"
+#line 2799 "Resources.c"
 }
 
 
 gchar* resources_get_end_multimonth_span_format_string (void) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 858 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_END_MULTIMONTH_DATE_FORMAT_STRING;
 #line 858 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
 #line 859 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2904 "Resources.c"
+#line 2814 "Resources.c"
 	}
 #line 862 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_END_MULTIMONTH_DATE_FORMAT_STRING;
@@ -2938,14 +2848,14 @@ gchar* resources_get_end_multimonth_span_format_string (void) {
 	result = _tmp2_;
 #line 862 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2914 "Resources.c"
+#line 2824 "Resources.c"
 }
 
 
 gchar* resources_get_ui (const gchar* filename) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 865 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
 #line 866 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -2956,35 +2866,35 @@ gchar* resources_get_ui (const gchar* filename) {
 	result = _tmp1_;
 #line 866 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2932 "Resources.c"
+#line 2842 "Resources.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 882 "/home/jens/Source/shotwell/src/Resources.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2939 "Resources.c"
+#line 2849 "Resources.c"
 }
 
 
 GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 	GdkPixbuf* result = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp7_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp7_;
+	GdkPixbuf* _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 873 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_noninterpretable_badge_pixbuf;
 #line 873 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 2953 "Resources.c"
+#line 2863 "Resources.c"
 		{
 			gchar* path = NULL;
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 			GdkPixbuf* _tmp2_ = NULL;
-			const gchar* _tmp3_ = NULL;
-			GdkPixbuf* _tmp4_ = NULL;
-			GdkPixbuf* _tmp5_ = NULL;
+			const gchar* _tmp3_;
+			GdkPixbuf* _tmp4_;
+			GdkPixbuf* _tmp5_;
 #line 875 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = g_strdup ("/org/gnome/Shotwell/icons/" RESOURCES_NONINTERPRETABLE_BADGE_FILE);
 #line 875 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -2999,8 +2909,8 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 876 "/home/jens/Source/shotwell/src/Resources.vala"
 				_g_free0 (path);
-#line 2975 "Resources.c"
-				goto __catch429_g_error;
+#line 2885 "Resources.c"
+				goto __catch430_g_error;
 			}
 #line 876 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = _tmp2_;
@@ -3014,13 +2924,13 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 			_g_object_unref0 (_tmp2_);
 #line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (path);
-#line 2990 "Resources.c"
+#line 2900 "Resources.c"
 		}
-		goto __finally429;
-		__catch429_g_error:
+		goto __finally430;
+		__catch430_g_error:
 		{
 			GError* err = NULL;
-			const gchar* _tmp6_ = NULL;
+			const gchar* _tmp6_;
 #line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 			err = _inner_error_;
 #line 874 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3032,9 +2942,9 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 "e: %s", _tmp6_);
 #line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_error_free0 (err);
-#line 3007 "Resources.c"
+#line 2917 "Resources.c"
 		}
-		__finally429:
+		__finally430:
 #line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 874 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3043,7 +2953,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 			g_clear_error (&_inner_error_);
 #line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 			return NULL;
-#line 3018 "Resources.c"
+#line 2928 "Resources.c"
 		}
 	}
 #line 882 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3054,15 +2964,15 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 	result = _tmp8_;
 #line 882 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3029 "Resources.c"
+#line 2939 "Resources.c"
 }
 
 
 GtkIconTheme* resources_get_icon_theme_engine (void) {
 	GtkIconTheme* result = NULL;
 	GtkIconTheme* icon_theme = NULL;
-	GtkIconTheme* _tmp0_ = NULL;
-	GtkIconTheme* _tmp1_ = NULL;
+	GtkIconTheme* _tmp0_;
+	GtkIconTheme* _tmp1_;
 #line 886 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = gtk_icon_theme_get_default ();
 #line 886 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3075,45 +2985,45 @@ GtkIconTheme* resources_get_icon_theme_engine (void) {
 	result = icon_theme;
 #line 889 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3050 "Resources.c"
+#line 2960 "Resources.c"
 }
 
 
 GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 	GdkPixbuf* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GeeHashMap* _tmp10_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeHashMap* _tmp10_;
 	GdkPixbuf* pixbuf = NULL;
-	GeeHashMap* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	gpointer _tmp14_ = NULL;
-	GdkPixbuf* _tmp15_ = NULL;
-	gint _tmp22_ = 0;
+	GeeHashMap* _tmp12_;
+	const gchar* _tmp13_;
+	gpointer _tmp14_;
+	GdkPixbuf* _tmp15_;
+	gint _tmp22_;
 	GdkPixbuf* scaled_pixbuf = NULL;
-	GdkPixbuf* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	GdkPixbuf* _tmp25_ = NULL;
-	GeeHashMap* _tmp26_ = NULL;
-	GeeHashMap* _tmp28_ = NULL;
-	const gchar* _tmp29_ = NULL;
-	gint _tmp30_ = 0;
-	gchar* _tmp31_ = NULL;
-	gchar* _tmp32_ = NULL;
-	GdkPixbuf* _tmp33_ = NULL;
+	GdkPixbuf* _tmp23_;
+	gint _tmp24_;
+	GdkPixbuf* _tmp25_;
+	GeeHashMap* _tmp26_;
+	GeeHashMap* _tmp28_;
+	const gchar* _tmp29_;
+	gint _tmp30_;
+	gchar* _tmp31_;
+	gchar* _tmp32_;
+	GdkPixbuf* _tmp33_;
 #line 894 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 895 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_scaled_icon_cache;
 #line 895 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ != NULL) {
-#line 3081 "Resources.c"
+#line 2991 "Resources.c"
 		gchar* scaled_name = NULL;
-		const gchar* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
-		gchar* _tmp3_ = NULL;
-		GeeHashMap* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		const gchar* _tmp1_;
+		gint _tmp2_;
+		gchar* _tmp3_;
+		GeeHashMap* _tmp4_;
+		const gchar* _tmp5_;
+		gboolean _tmp6_;
 #line 896 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp1_ = name;
 #line 896 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3130,10 +3040,10 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 		_tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
 #line 897 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp6_) {
-#line 3105 "Resources.c"
-			GeeHashMap* _tmp7_ = NULL;
-			const gchar* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+#line 3015 "Resources.c"
+			GeeHashMap* _tmp7_;
+			const gchar* _tmp8_;
+			gpointer _tmp9_;
 #line 898 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = resources_scaled_icon_cache;
 #line 898 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3146,25 +3056,25 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 			_g_free0 (scaled_name);
 #line 898 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 3121 "Resources.c"
+#line 3031 "Resources.c"
 		}
 #line 895 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (scaled_name);
-#line 3125 "Resources.c"
+#line 3035 "Resources.c"
 	}
 #line 903 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp10_ = resources_icon_cache;
 #line 903 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp10_ == NULL) {
-#line 3131 "Resources.c"
-		GeeHashMap* _tmp11_ = NULL;
+#line 3041 "Resources.c"
+		GeeHashMap* _tmp11_;
 #line 904 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 904 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_icon_cache);
 #line 904 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_icon_cache = _tmp11_;
-#line 3139 "Resources.c"
+#line 3049 "Resources.c"
 	}
 #line 907 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp12_ = resources_icon_cache;
@@ -3178,13 +3088,13 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 	_tmp15_ = pixbuf;
 #line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp15_ == NULL) {
-#line 3153 "Resources.c"
-		const gchar* _tmp16_ = NULL;
-		GdkPixbuf* _tmp17_ = NULL;
-		GdkPixbuf* _tmp18_ = NULL;
-		GeeHashMap* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		GdkPixbuf* _tmp21_ = NULL;
+#line 3063 "Resources.c"
+		const gchar* _tmp16_;
+		GdkPixbuf* _tmp17_;
+		GdkPixbuf* _tmp18_;
+		GeeHashMap* _tmp19_;
+		const gchar* _tmp20_;
+		GdkPixbuf* _tmp21_;
 #line 909 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16_ = name;
 #line 909 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3203,7 +3113,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 			_g_object_unref0 (pixbuf);
 #line 911 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 3178 "Resources.c"
+#line 3088 "Resources.c"
 		}
 #line 913 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp19_ = resources_icon_cache;
@@ -3213,7 +3123,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 		_tmp21_ = pixbuf;
 #line 913 "/home/jens/Source/shotwell/src/Resources.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_, _tmp21_);
-#line 3188 "Resources.c"
+#line 3098 "Resources.c"
 	}
 #line 916 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp22_ = scale;
@@ -3223,7 +3133,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 		result = pixbuf;
 #line 917 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 3198 "Resources.c"
+#line 3108 "Resources.c"
 	}
 #line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp23_ = pixbuf;
@@ -3237,15 +3147,15 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 	_tmp26_ = resources_scaled_icon_cache;
 #line 921 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp26_ == NULL) {
-#line 3212 "Resources.c"
-		GeeHashMap* _tmp27_ = NULL;
+#line 3122 "Resources.c"
+		GeeHashMap* _tmp27_;
 #line 922 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 922 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_scaled_icon_cache);
 #line 922 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_scaled_icon_cache = _tmp27_;
-#line 3220 "Resources.c"
+#line 3130 "Resources.c"
 	}
 #line 924 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp28_ = resources_scaled_icon_cache;
@@ -3269,29 +3179,29 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 	_g_object_unref0 (pixbuf);
 #line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3244 "Resources.c"
+#line 3154 "Resources.c"
 }
 
 
 GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* pixbuf = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
+	GdkPixbuf* _tmp8_;
 	GdkPixbuf* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
+	gint _tmp10_;
 	GError * _inner_error_ = NULL;
 #line 929 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 930 "/home/jens/Source/shotwell/src/Resources.vala"
 	pixbuf = NULL;
-#line 3259 "Resources.c"
+#line 3169 "Resources.c"
 	{
 		gchar* path = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
+		const gchar* _tmp0_;
+		gchar* _tmp1_;
 		GdkPixbuf* _tmp2_ = NULL;
-		GdkPixbuf* _tmp3_ = NULL;
-		GdkPixbuf* _tmp4_ = NULL;
+		GdkPixbuf* _tmp3_;
+		GdkPixbuf* _tmp4_;
 #line 932 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp0_ = name;
 #line 932 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3306,8 +3216,8 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 933 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (path);
-#line 3281 "Resources.c"
-			goto __catch430_g_error;
+#line 3191 "Resources.c"
+			goto __catch431_g_error;
 		}
 #line 933 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp4_ = _tmp2_;
@@ -3321,15 +3231,15 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		_g_object_unref0 (_tmp2_);
 #line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (path);
-#line 3296 "Resources.c"
+#line 3206 "Resources.c"
 	}
-	goto __finally430;
-	__catch430_g_error:
+	goto __finally431;
+	__catch431_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+		const gchar* _tmp5_;
+		GError* _tmp6_;
+		const gchar* _tmp7_;
 #line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		err = _inner_error_;
 #line 931 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3344,9 +3254,9 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		g_critical ("Resources.vala:935: Unable to load icon %s: %s", _tmp5_, _tmp7_);
 #line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_error_free0 (err);
-#line 3319 "Resources.c"
+#line 3229 "Resources.c"
 	}
-	__finally430:
+	__finally431:
 #line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 931 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3357,7 +3267,7 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		g_clear_error (&_inner_error_);
 #line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		return NULL;
-#line 3332 "Resources.c"
+#line 3242 "Resources.c"
 	}
 #line 938 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp8_ = pixbuf;
@@ -3369,16 +3279,16 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		_g_object_unref0 (pixbuf);
 #line 939 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 3344 "Resources.c"
+#line 3254 "Resources.c"
 	}
 #line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp10_ = scale;
 #line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp10_ > 0) {
-#line 3350 "Resources.c"
-		GdkPixbuf* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
-		GdkPixbuf* _tmp13_ = NULL;
+#line 3260 "Resources.c"
+		GdkPixbuf* _tmp11_;
+		gint _tmp12_;
+		GdkPixbuf* _tmp13_;
 #line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp11_ = pixbuf;
 #line 941 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3389,10 +3299,10 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		_g_object_unref0 (_tmp9_);
 #line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp9_ = _tmp13_;
-#line 3364 "Resources.c"
+#line 3274 "Resources.c"
 	} else {
-		GdkPixbuf* _tmp14_ = NULL;
-		GdkPixbuf* _tmp15_ = NULL;
+		GdkPixbuf* _tmp14_;
+		GdkPixbuf* _tmp15_;
 #line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_ = pixbuf;
 #line 941 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3401,7 +3311,7 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		_g_object_unref0 (_tmp9_);
 #line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp9_ = _tmp15_;
-#line 3376 "Resources.c"
+#line 3286 "Resources.c"
 	}
 #line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp9_;
@@ -3409,24 +3319,24 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 	_g_object_unref0 (pixbuf);
 #line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3384 "Resources.c"
+#line 3294 "Resources.c"
 }
 
 
 gchar* resources_get_help_path (void) {
 	gchar* result = NULL;
 	GFile* help_dir = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
 	GFile* help_index = NULL;
-	GFile* _tmp6_ = NULL;
-	GFile* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	GFile* _tmp6_;
+	GFile* _tmp7_;
+	GFile* _tmp8_;
+	gboolean _tmp9_;
 #line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = app_dirs_get_exec_dir ();
 #line 952 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3457,12 +3367,12 @@ gchar* resources_get_help_path (void) {
 	_tmp9_ = g_file_query_exists (_tmp8_, NULL);
 #line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp9_) {
-#line 3432 "Resources.c"
+#line 3342 "Resources.c"
 		gchar* help_path = NULL;
-		GFile* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-		gboolean _tmp13_ = FALSE;
+		GFile* _tmp10_;
+		gchar* _tmp11_;
+		const gchar* _tmp12_;
+		gboolean _tmp13_;
 #line 958 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_ = help_dir;
 #line 958 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3477,9 +3387,9 @@ gchar* resources_get_help_path (void) {
 		_tmp13_ = g_str_has_suffix (_tmp12_, "/");
 #line 960 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (!_tmp13_) {
-#line 3452 "Resources.c"
-			const gchar* _tmp14_ = NULL;
-			gchar* _tmp15_ = NULL;
+#line 3362 "Resources.c"
+			const gchar* _tmp14_;
+			gchar* _tmp15_;
 #line 961 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp14_ = help_path;
 #line 961 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3488,7 +3398,7 @@ gchar* resources_get_help_path (void) {
 			_g_free0 (help_path);
 #line 961 "/home/jens/Source/shotwell/src/Resources.vala"
 			help_path = _tmp15_;
-#line 3463 "Resources.c"
+#line 3373 "Resources.c"
 		}
 #line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		result = help_path;
@@ -3498,7 +3408,7 @@ gchar* resources_get_help_path (void) {
 		_g_object_unref0 (help_dir);
 #line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 3473 "Resources.c"
+#line 3383 "Resources.c"
 	}
 #line 970 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = NULL;
@@ -3508,15 +3418,15 @@ gchar* resources_get_help_path (void) {
 	_g_object_unref0 (help_dir);
 #line 970 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3483 "Resources.c"
+#line 3393 "Resources.c"
 }
 
 
 void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** error) {
 	gchar* help_path = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp27_ = NULL;
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp27_;
 	GError * _inner_error_ = NULL;
 #line 973 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (GDK_IS_SCREEN (screen));
@@ -3528,46 +3438,46 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
 	_tmp1_ = help_path;
 #line 976 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp1_ != NULL) {
-#line 3503 "Resources.c"
-		const gchar* _tmp2_ = NULL;
+#line 3413 "Resources.c"
+		const gchar* _tmp2_;
 		gchar** argv = NULL;
-		gchar** _tmp6_ = NULL;
-		gint argv_length1 = 0;
-		gint _argv_size_ = 0;
-		gchar** _tmp7_ = NULL;
-		gint _tmp7__length1 = 0;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar** _tmp10_ = NULL;
-		gint _tmp10__length1 = 0;
-		const gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		gchar** _tmp14_ = NULL;
-		gint _tmp14__length1 = 0;
-		gchar* _tmp15_ = NULL;
+		gchar** _tmp6_;
+		gint argv_length1;
+		gint _argv_size_;
+		gchar** _tmp7_;
+		gint _tmp7__length1;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		gchar** _tmp10_;
+		gint _tmp10__length1;
+		const gchar* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
+		gchar** _tmp14_;
+		gint _tmp14__length1;
+		gchar* _tmp15_;
 		GPid pid = 0;
 		gboolean _tmp16_ = FALSE;
-		GFile* _tmp17_ = NULL;
-		GFile* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		gchar** _tmp21_ = NULL;
-		gint _tmp21__length1 = 0;
+		GFile* _tmp17_;
+		GFile* _tmp18_;
+		gchar* _tmp19_;
+		gchar* _tmp20_;
+		gchar** _tmp21_;
+		gint _tmp21__length1;
 		GPid _tmp22_ = 0;
-		gboolean _tmp23_ = FALSE;
-		gboolean _tmp24_ = FALSE;
-		gchar** _tmp25_ = NULL;
-		gint _tmp25__length1 = 0;
-		const gchar* _tmp26_ = NULL;
+		gboolean _tmp23_;
+		gboolean _tmp24_;
+		gchar** _tmp25_;
+		gint _tmp25__length1;
+		const gchar* _tmp26_;
 #line 980 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp2_ = anchor;
 #line 980 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp2_ != NULL) {
-#line 3539 "Resources.c"
-			const gchar* _tmp3_ = NULL;
-			const gchar* _tmp4_ = NULL;
-			gchar* _tmp5_ = NULL;
+#line 3449 "Resources.c"
+			const gchar* _tmp3_;
+			const gchar* _tmp4_;
+			gchar* _tmp5_;
 #line 981 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = help_path;
 #line 981 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3578,7 +3488,7 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
 			_g_free0 (help_path);
 #line 981 "/home/jens/Source/shotwell/src/Resources.vala"
 			help_path = _tmp5_;
-#line 3553 "Resources.c"
+#line 3463 "Resources.c"
 		}
 #line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = g_new0 (gchar*, 3 + 1);
@@ -3658,7 +3568,7 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
 			_g_free0 (help_path);
 #line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3633 "Resources.c"
+#line 3543 "Resources.c"
 		}
 #line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp16_) {
@@ -3668,7 +3578,7 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
 			_g_free0 (help_path);
 #line 992 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3643 "Resources.c"
+#line 3553 "Resources.c"
 		}
 #line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp25_ = argv;
@@ -3680,17 +3590,17 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
 		g_warning ("Resources.vala:995: Unable to launch %s", _tmp26_);
 #line 976 "/home/jens/Source/shotwell/src/Resources.vala"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 3655 "Resources.c"
+#line 3565 "Resources.c"
 	}
 #line 999 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp27_ = anchor;
 #line 999 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp27_ != NULL) {
-#line 3661 "Resources.c"
-		GdkScreen* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		gchar* _tmp31_ = NULL;
+#line 3571 "Resources.c"
+		GdkScreen* _tmp28_;
+		const gchar* _tmp29_;
+		gchar* _tmp30_;
+		gchar* _tmp31_;
 #line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp28_ = screen;
 #line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3711,10 +3621,10 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
 			_g_free0 (help_path);
 #line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3686 "Resources.c"
+#line 3596 "Resources.c"
 		}
 	} else {
-		GdkScreen* _tmp32_ = NULL;
+		GdkScreen* _tmp32_;
 #line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp32_ = screen;
 #line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3727,27 +3637,27 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
 			_g_free0 (help_path);
 #line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3702 "Resources.c"
+#line 3612 "Resources.c"
 		}
 	}
 #line 973 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (help_path);
-#line 3707 "Resources.c"
+#line 3617 "Resources.c"
 }
 
 
 gchar* resources_to_css_color (GdkRGBA* color) {
 	gchar* result = NULL;
 	gint r = 0;
-	GdkRGBA _tmp0_ = {0};
-	gdouble _tmp1_ = 0.0;
+	GdkRGBA _tmp0_;
+	gdouble _tmp1_;
 	gint g = 0;
-	GdkRGBA _tmp2_ = {0};
-	gdouble _tmp3_ = 0.0;
+	GdkRGBA _tmp2_;
+	gdouble _tmp3_;
 	gint b = 0;
-	GdkRGBA _tmp4_ = {0};
-	gdouble _tmp5_ = 0.0;
-	gchar* _tmp6_ = NULL;
+	GdkRGBA _tmp4_;
+	gdouble _tmp5_;
+	gchar* _tmp6_;
 #line 1006 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (color != NULL, NULL);
 #line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3774,23 +3684,23 @@ gchar* resources_to_css_color (GdkRGBA* color) {
 	result = _tmp6_;
 #line 1011 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3749 "Resources.c"
+#line 3659 "Resources.c"
 }
 
 
 void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
-	GeeMap* _tmp0_ = NULL;
-	GeeMap* _tmp2_ = NULL;
-	GtkWidget* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GeeMap* _tmp0_;
+	GeeMap* _tmp2_;
+	GtkWidget* _tmp3_;
+	gboolean _tmp4_;
 	GtkCssProvider* styler = NULL;
-	GtkCssProvider* _tmp11_ = NULL;
-	GtkWidget* _tmp17_ = NULL;
-	GtkStyleContext* _tmp18_ = NULL;
-	GtkCssProvider* _tmp19_ = NULL;
-	GeeMap* _tmp20_ = NULL;
-	GtkWidget* _tmp21_ = NULL;
-	GtkCssProvider* _tmp22_ = NULL;
+	GtkCssProvider* _tmp11_;
+	GtkWidget* _tmp17_;
+	GtkStyleContext* _tmp18_;
+	GtkCssProvider* _tmp19_;
+	GeeMap* _tmp20_;
+	GtkWidget* _tmp21_;
+	GtkCssProvider* _tmp22_;
 	GError * _inner_error_ = NULL;
 #line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -3800,15 +3710,15 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 	_tmp0_ = resources_providers;
 #line 1019 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 3775 "Resources.c"
-		GeeHashMap* _tmp1_ = NULL;
+#line 3685 "Resources.c"
+		GeeHashMap* _tmp1_;
 #line 1020 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp1_ = gee_hash_map_new (gtk_widget_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GTK_TYPE_CSS_PROVIDER, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1020 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_providers);
 #line 1020 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_providers = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MAP, GeeMap);
-#line 3783 "Resources.c"
+#line 3693 "Resources.c"
 	}
 #line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = resources_providers;
@@ -3818,13 +3728,13 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 	_tmp4_ = gee_map_has_key (_tmp2_, _tmp3_);
 #line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp4_) {
-#line 3793 "Resources.c"
-		GtkWidget* _tmp5_ = NULL;
-		GtkStyleContext* _tmp6_ = NULL;
-		GeeMap* _tmp7_ = NULL;
-		GtkWidget* _tmp8_ = NULL;
-		gpointer _tmp9_ = NULL;
-		GtkCssProvider* _tmp10_ = NULL;
+#line 3703 "Resources.c"
+		GtkWidget* _tmp5_;
+		GtkStyleContext* _tmp6_;
+		GeeMap* _tmp7_;
+		GtkWidget* _tmp8_;
+		gpointer _tmp9_;
+		GtkCssProvider* _tmp10_;
 #line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp5_ = widget;
 #line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3841,16 +3751,16 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 		gtk_style_context_remove_provider (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider));
 #line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp10_);
-#line 3816 "Resources.c"
+#line 3726 "Resources.c"
 	}
 #line 1025 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp11_ = gtk_css_provider_new ();
 #line 1025 "/home/jens/Source/shotwell/src/Resources.vala"
 	styler = _tmp11_;
-#line 3822 "Resources.c"
+#line 3732 "Resources.c"
 	{
-		GtkCssProvider* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
+		GtkCssProvider* _tmp12_;
+		const gchar* _tmp13_;
 #line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = styler;
 #line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3859,17 +3769,17 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 		gtk_css_provider_load_from_data (_tmp12_, _tmp13_, (gssize) RESOURCES_ALL_DATA, &_inner_error_);
 #line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3834 "Resources.c"
-			goto __catch431_g_error;
+#line 3744 "Resources.c"
+			goto __catch432_g_error;
 		}
 	}
-	goto __finally431;
-	__catch431_g_error:
+	goto __finally432;
+	__catch432_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp14_ = NULL;
-		GError* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
+		const gchar* _tmp14_;
+		GError* _tmp15_;
+		const gchar* _tmp16_;
 #line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 		e = _inner_error_;
 #line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3888,9 +3798,9 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 		_g_object_unref0 (styler);
 #line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
 		return;
-#line 3863 "Resources.c"
+#line 3773 "Resources.c"
 	}
-	__finally431:
+	__finally432:
 #line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3901,7 +3811,7 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 		g_clear_error (&_inner_error_);
 #line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 		return;
-#line 3876 "Resources.c"
+#line 3786 "Resources.c"
 	}
 #line 1037 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp17_ = widget;
@@ -3921,7 +3831,7 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 	gee_map_set (_tmp20_, _tmp21_, _tmp22_);
 #line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (styler);
-#line 3896 "Resources.c"
+#line 3806 "Resources.c"
 }
 
 
diff --git a/src/Screensaver.c b/src/Screensaver.c
index 3912c48..da25d5f 100644
--- a/src/Screensaver.c
+++ b/src/Screensaver.c
@@ -1,4 +1,4 @@
-/* Screensaver.c generated by valac 0.34.7, the Vala compiler
+/* Screensaver.c generated by valac 0.36.6, the Vala compiler
  * generated from Screensaver.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -86,7 +86,7 @@ Application* application_get_instance (void);
 guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, const gchar* reason);
 void screensaver_uninhibit (Screensaver* self);
 void application_uninhibit (Application* self, guint cookie);
-static void screensaver_finalize (Screensaver* obj);
+static void screensaver_finalize (Screensaver * obj);
 
 
 Screensaver* screensaver_construct (GType object_type) {
@@ -107,11 +107,10 @@ Screensaver* screensaver_new (void) {
 
 
 void screensaver_inhibit (Screensaver* self, const gchar* reason) {
-	guint32 _tmp0_ = 0U;
-	Application* _tmp1_ = NULL;
-	Application* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
+	guint32 _tmp0_;
+	Application* _tmp1_;
+	Application* _tmp2_;
+	guint _tmp3_;
 #line 13 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_return_if_fail (IS_SCREENSAVER (self));
 #line 13 "/home/jens/Source/shotwell/src/Screensaver.vala"
@@ -122,29 +121,27 @@ void screensaver_inhibit (Screensaver* self, const gchar* reason) {
 	if (_tmp0_ != ((guint32) 0)) {
 #line 15 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		return;
-#line 126 "Screensaver.c"
+#line 125 "Screensaver.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	_tmp1_ = application_get_instance ();
 #line 17 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	_tmp2_ = _tmp1_;
 #line 17 "/home/jens/Source/shotwell/src/Screensaver.vala"
-	_tmp3_ = _ ("Slideshow");
+	_tmp3_ = application_inhibit (_tmp2_, GTK_APPLICATION_INHIBIT_IDLE | GTK_APPLICATION_INHIBIT_SUSPEND, _ ("Slideshow"));
 #line 17 "/home/jens/Source/shotwell/src/Screensaver.vala"
-	_tmp4_ = application_inhibit (_tmp2_, GTK_APPLICATION_INHIBIT_IDLE | GTK_APPLICATION_INHIBIT_SUSPEND, _tmp3_);
-#line 17 "/home/jens/Source/shotwell/src/Screensaver.vala"
-	self->priv->cookie = (guint32) _tmp4_;
+	self->priv->cookie = (guint32) _tmp3_;
 #line 17 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	_application_unref0 (_tmp2_);
-#line 140 "Screensaver.c"
+#line 137 "Screensaver.c"
 }
 
 
 void screensaver_uninhibit (Screensaver* self) {
-	guint32 _tmp0_ = 0U;
-	Application* _tmp1_ = NULL;
-	Application* _tmp2_ = NULL;
-	guint32 _tmp3_ = 0U;
+	guint32 _tmp0_;
+	Application* _tmp1_;
+	Application* _tmp2_;
+	guint32 _tmp3_;
 #line 21 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_return_if_fail (IS_SCREENSAVER (self));
 #line 22 "/home/jens/Source/shotwell/src/Screensaver.vala"
@@ -153,7 +150,7 @@ void screensaver_uninhibit (Screensaver* self) {
 	if (_tmp0_ == ((guint32) 0)) {
 #line 23 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		return;
-#line 157 "Screensaver.c"
+#line 154 "Screensaver.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	_tmp1_ = application_get_instance ();
@@ -167,14 +164,14 @@ void screensaver_uninhibit (Screensaver* self) {
 	_application_unref0 (_tmp2_);
 #line 26 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	self->priv->cookie = (guint32) 0;
-#line 171 "Screensaver.c"
+#line 168 "Screensaver.c"
 }
 
 
 static void value_screensaver_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	value->data[0].v_pointer = NULL;
-#line 178 "Screensaver.c"
+#line 175 "Screensaver.c"
 }
 
 
@@ -183,7 +180,7 @@ static void value_screensaver_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		screensaver_unref (value->data[0].v_pointer);
-#line 187 "Screensaver.c"
+#line 184 "Screensaver.c"
 	}
 }
 
@@ -193,11 +190,11 @@ static void value_screensaver_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		dest_value->data[0].v_pointer = screensaver_ref (src_value->data[0].v_pointer);
-#line 197 "Screensaver.c"
+#line 194 "Screensaver.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 201 "Screensaver.c"
+#line 198 "Screensaver.c"
 	}
 }
 
@@ -205,66 +202,66 @@ static void value_screensaver_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_screensaver_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	return value->data[0].v_pointer;
-#line 209 "Screensaver.c"
+#line 206 "Screensaver.c"
 }
 
 
 static gchar* value_screensaver_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	if (collect_values[0].v_pointer) {
-#line 216 "Screensaver.c"
-		Screensaver* object;
+#line 213 "Screensaver.c"
+		Screensaver * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 223 "Screensaver.c"
+#line 220 "Screensaver.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 227 "Screensaver.c"
+#line 224 "Screensaver.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		value->data[0].v_pointer = screensaver_ref (object);
-#line 231 "Screensaver.c"
+#line 228 "Screensaver.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		value->data[0].v_pointer = NULL;
-#line 235 "Screensaver.c"
+#line 232 "Screensaver.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	return NULL;
-#line 239 "Screensaver.c"
+#line 236 "Screensaver.c"
 }
 
 
 static gchar* value_screensaver_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	Screensaver** object_p;
+	Screensaver ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 250 "Screensaver.c"
+#line 247 "Screensaver.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		*object_p = NULL;
-#line 256 "Screensaver.c"
+#line 253 "Screensaver.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		*object_p = value->data[0].v_pointer;
-#line 260 "Screensaver.c"
+#line 257 "Screensaver.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		*object_p = screensaver_ref (value->data[0].v_pointer);
-#line 264 "Screensaver.c"
+#line 261 "Screensaver.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	return NULL;
-#line 268 "Screensaver.c"
+#line 265 "Screensaver.c"
 }
 
 
@@ -278,7 +275,7 @@ GParamSpec* param_spec_screensaver (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	return G_PARAM_SPEC (spec);
-#line 282 "Screensaver.c"
+#line 279 "Screensaver.c"
 }
 
 
@@ -287,12 +284,12 @@ gpointer value_get_screensaver (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCREENSAVER), NULL);
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	return value->data[0].v_pointer;
-#line 291 "Screensaver.c"
+#line 288 "Screensaver.c"
 }
 
 
 void value_set_screensaver (GValue* value, gpointer v_object) {
-	Screensaver* old;
+	Screensaver * old;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCREENSAVER));
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
@@ -307,23 +304,23 @@ void value_set_screensaver (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		screensaver_ref (value->data[0].v_pointer);
-#line 311 "Screensaver.c"
+#line 308 "Screensaver.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		value->data[0].v_pointer = NULL;
-#line 315 "Screensaver.c"
+#line 312 "Screensaver.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		screensaver_unref (old);
-#line 321 "Screensaver.c"
+#line 318 "Screensaver.c"
 	}
 }
 
 
 void value_take_screensaver (GValue* value, gpointer v_object) {
-	Screensaver* old;
+	Screensaver * old;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCREENSAVER));
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
@@ -336,17 +333,17 @@ void value_take_screensaver (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		value->data[0].v_pointer = v_object;
-#line 340 "Screensaver.c"
+#line 337 "Screensaver.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		value->data[0].v_pointer = NULL;
-#line 344 "Screensaver.c"
+#line 341 "Screensaver.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		screensaver_unref (old);
-#line 350 "Screensaver.c"
+#line 347 "Screensaver.c"
 	}
 }
 
@@ -358,7 +355,7 @@ static void screensaver_class_init (ScreensaverClass * klass) {
 	((ScreensaverClass *) klass)->finalize = screensaver_finalize;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_type_class_add_private (klass, sizeof (ScreensaverPrivate));
-#line 362 "Screensaver.c"
+#line 359 "Screensaver.c"
 }
 
 
@@ -369,17 +366,17 @@ static void screensaver_instance_init (Screensaver * self) {
 	self->priv->cookie = (guint32) 0;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	self->ref_count = 1;
-#line 373 "Screensaver.c"
+#line 370 "Screensaver.c"
 }
 
 
-static void screensaver_finalize (Screensaver* obj) {
+static void screensaver_finalize (Screensaver * obj) {
 	Screensaver * self;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCREENSAVER, Screensaver);
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_signal_handlers_destroy (self);
-#line 383 "Screensaver.c"
+#line 380 "Screensaver.c"
 }
 
 
@@ -398,18 +395,18 @@ GType screensaver_get_type (void) {
 
 
 gpointer screensaver_ref (gpointer instance) {
-	Screensaver* self;
+	Screensaver * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	return instance;
-#line 408 "Screensaver.c"
+#line 405 "Screensaver.c"
 }
 
 
 void screensaver_unref (gpointer instance) {
-	Screensaver* self;
+	Screensaver * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -417,7 +414,7 @@ void screensaver_unref (gpointer instance) {
 		SCREENSAVER_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 421 "Screensaver.c"
+#line 418 "Screensaver.c"
 	}
 }
 
diff --git a/src/SearchFilter.c b/src/SearchFilter.c
index a505b2c..c40b19f 100644
--- a/src/SearchFilter.c
+++ b/src/SearchFilter.c
@@ -1,4 +1,4 @@
-/* SearchFilter.c generated by valac 0.34.7, the Vala compiler
+/* SearchFilter.c generated by valac 0.36.6, the Vala compiler
  * generated from SearchFilter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -204,8 +204,6 @@ typedef struct _PhotoClass PhotoClass;
 
 #define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ())
 
-#define TYPE_RAW_DEVELOPER (raw_developer_get_type ())
-
 #define TYPE_INDEXABLE (indexable_get_type ())
 #define INDEXABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_INDEXABLE, Indexable))
 #define IS_INDEXABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_INDEXABLE))
@@ -316,6 +314,13 @@ typedef struct _TextAction TextAction;
 typedef struct _TextActionClass TextActionClass;
 typedef struct _TextActionPrivate TextActionPrivate;
 typedef struct _ParamSpecTextAction ParamSpecTextAction;
+enum  {
+	TEXT_ACTION_TEXT_CHANGED_SIGNAL,
+	TEXT_ACTION_SENSITIVITY_CHANGED_SIGNAL,
+	TEXT_ACTION_VISIBILITY_CHANGED_SIGNAL,
+	TEXT_ACTION_LAST_SIGNAL
+};
+static guint text_action_signals[TEXT_ACTION_LAST_SIGNAL] = {0};
 
 #define TYPE_SEARCH_FILTER_ACTIONS (search_filter_actions_get_type ())
 #define SEARCH_FILTER_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SEARCH_FILTER_ACTIONS, SearchFilterActions))
@@ -464,6 +469,18 @@ typedef struct _CameraViewTrackerPrivate CameraViewTrackerPrivate;
 typedef struct _CameraAccumulator CameraAccumulator;
 typedef struct _CameraAccumulatorClass CameraAccumulatorClass;
 typedef struct _ParamSpecSearchFilterActions ParamSpecSearchFilterActions;
+enum  {
+	SEARCH_FILTER_ACTIONS_FLAGGED_TOGGLED_SIGNAL,
+	SEARCH_FILTER_ACTIONS_PHOTOS_TOGGLED_SIGNAL,
+	SEARCH_FILTER_ACTIONS_VIDEOS_TOGGLED_SIGNAL,
+	SEARCH_FILTER_ACTIONS_RAW_TOGGLED_SIGNAL,
+	SEARCH_FILTER_ACTIONS_RATING_CHANGED_SIGNAL,
+	SEARCH_FILTER_ACTIONS_TEXT_CHANGED_SIGNAL,
+	SEARCH_FILTER_ACTIONS_MEDIA_CONTEXT_CHANGED_SIGNAL,
+	SEARCH_FILTER_ACTIONS_CRITERIA_CHANGED_SIGNAL,
+	SEARCH_FILTER_ACTIONS_LAST_SIGNAL
+};
+static guint search_filter_actions_signals[SEARCH_FILTER_ACTIONS_LAST_SIGNAL] = {0};
 
 #define TYPE_SEARCH_FILTER_TOOLBAR (search_filter_toolbar_get_type ())
 #define SEARCH_FILTER_TOOLBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SEARCH_FILTER_TOOLBAR, SearchFilterToolbar))
@@ -606,6 +623,11 @@ typedef struct _SearchFilterToolbarLabelToolItemPrivate SearchFilterToolbarLabel
 typedef struct _SearchFilterToolbarToggleActionToolButtonPrivate SearchFilterToolbarToggleActionToolButtonPrivate;
 typedef struct _SearchFilterToolbarSearchBoxPrivate SearchFilterToolbarSearchBoxPrivate;
 typedef struct _SearchFilterToolbarRatingFilterButtonPrivate SearchFilterToolbarRatingFilterButtonPrivate;
+enum  {
+	SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_CLICKED_SIGNAL,
+	SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_LAST_SIGNAL
+};
+static guint search_filter_toolbar_saved_search_filter_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_LAST_SIGNAL] = {0};
 typedef struct _SearchFilterToolbarSavedSearchPopoverPrivate SearchFilterToolbarSavedSearchPopoverPrivate;
 
 #define SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON (search_filter_toolbar_saved_search_popover_data_button_get_type ())
@@ -630,7 +652,21 @@ typedef struct _SavedSearchTableClass SavedSearchTableClass;
 #define _saved_search_table_unref0(var) ((var == NULL) ? NULL : (var = (saved_search_table_unref (var), NULL)))
 #define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL)))
 typedef struct _SearchFilterToolbarSavedSearchPopoverDataButtonPrivate SearchFilterToolbarSavedSearchPopoverDataButtonPrivate;
+enum  {
+	SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_CLICKED_SIGNAL,
+	SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_LAST_SIGNAL
+};
+static guint search_filter_toolbar_saved_search_popover_data_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_LAST_SIGNAL] = {0};
 typedef struct _SearchFilterToolbarParamSpecSavedSearchPopover SearchFilterToolbarParamSpecSavedSearchPopover;
+enum  {
+	SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_SEARCH_ACTIVATED_SIGNAL,
+	SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_EDIT_CLICKED_SIGNAL,
+	SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DELETE_CLICKED_SIGNAL,
+	SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_ADD_CLICKED_SIGNAL,
+	SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_CLOSED_SIGNAL,
+	SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_LAST_SIGNAL
+};
+static guint search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -738,12 +774,6 @@ typedef enum  {
 	PHOTO_FILE_FORMAT_UNKNOWN
 } PhotoFileFormat;
 
-typedef enum  {
-	RAW_DEVELOPER_SHOTWELL = 0,
-	RAW_DEVELOPER_CAMERA,
-	RAW_DEVELOPER_EMBEDDED
-} RawDeveloper;
-
 struct _IndexableIface {
 	GTypeInterface parent_iface;
 	const gchar* (*get_indexable_keywords) (Indexable* self);
@@ -1064,7 +1094,7 @@ void search_view_filter_set_show_media_video (SearchViewFilter* self, gboolean v
 void search_view_filter_set_show_media_photos (SearchViewFilter* self, gboolean value);
 void search_view_filter_set_show_media_raw (SearchViewFilter* self, gboolean value);
 void search_view_filter_set_saved_search (SearchViewFilter* self, SavedSearch* value);
-static void search_view_filter_finalize (ViewFilter* obj);
+static void search_view_filter_finalize (ViewFilter * obj);
 GType default_search_view_filter_get_type (void) G_GNUC_CONST;
 enum  {
 	DEFAULT_SEARCH_VIEW_FILTER_DUMMY_PROPERTY
@@ -1085,8 +1115,6 @@ GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 PhotoFileFormat photo_get_master_file_format (Photo* self);
-GType raw_developer_get_type (void) G_GNUC_CONST;
-gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d);
 GType indexable_get_type (void) G_GNUC_CONST;
 const gchar* indexable_get_indexable_keywords (Indexable* self);
 GType event_source_get_type (void) G_GNUC_CONST;
@@ -1135,7 +1163,7 @@ void text_action_set_sensitive (TextAction* self, gboolean sensitive);
 gboolean text_action_is_visible (TextAction* self);
 void text_action_set_visible (TextAction* self, gboolean visible);
 const gchar* text_action_get_value (TextAction* self);
-static void text_action_finalize (TextAction* obj);
+static void text_action_finalize (TextAction * obj);
 gpointer search_filter_actions_ref (gpointer instance);
 void search_filter_actions_unref (gpointer instance);
 GParamSpec* param_spec_search_filter_actions (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1226,7 +1254,7 @@ gboolean search_filter_actions_get_has_videos (SearchFilterActions* self);
 gboolean search_filter_actions_get_has_raw (SearchFilterActions* self);
 gboolean search_filter_actions_get_has_flagged (SearchFilterActions* self);
 static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void search_filter_actions_finalize (SearchFilterActions* obj);
+static void search_filter_actions_finalize (SearchFilterActions * obj);
 GType search_filter_toolbar_get_type (void) G_GNUC_CONST;
 GType search_filter_toolbar_search_box_get_type (void) G_GNUC_CONST;
 GType search_filter_toolbar_rating_filter_button_get_type (void) G_GNUC_CONST;
@@ -1355,12 +1383,12 @@ void search_filter_toolbar_search_box_get_focus (SearchFilterToolbarSearchBox* s
 enum  {
 	SEARCH_FILTER_TOOLBAR_LABEL_TOOL_ITEM_DUMMY_PROPERTY
 };
-static void search_filter_toolbar_label_tool_item_finalize (GObject* obj);
+static void search_filter_toolbar_label_tool_item_finalize (GObject * obj);
 #define SEARCH_FILTER_TOOLBAR_TOGGLE_ACTION_TOOL_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCH_FILTER_TOOLBAR_TYPE_TOGGLE_ACTION_TOOL_BUTTON, SearchFilterToolbarToggleActionToolButtonPrivate))
 enum  {
 	SEARCH_FILTER_TOOLBAR_TOGGLE_ACTION_TOOL_BUTTON_DUMMY_PROPERTY
 };
-static void search_filter_toolbar_toggle_action_tool_button_finalize (GObject* obj);
+static void search_filter_toolbar_toggle_action_tool_button_finalize (GObject * obj);
 #define SEARCH_FILTER_TOOLBAR_SEARCH_BOX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCH_FILTER_TOOLBAR_TYPE_SEARCH_BOX, SearchFilterToolbarSearchBoxPrivate))
 enum  {
 	SEARCH_FILTER_TOOLBAR_SEARCH_BOX_DUMMY_PROPERTY
@@ -1377,7 +1405,7 @@ static void _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_
 static gboolean search_filter_toolbar_search_box_on_escape_key (SearchFilterToolbarSearchBox* self, GdkEventKey* e);
 static gboolean _search_filter_toolbar_search_box_on_escape_key_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self);
 static void search_filter_toolbar_search_box_set_nullable_text (SearchFilterToolbarSearchBox* self, const gchar* text);
-static void search_filter_toolbar_search_box_finalize (GObject* obj);
+static void search_filter_toolbar_search_box_finalize (GObject * obj);
 enum  {
 	SEARCH_FILTER_TOOLBAR_RATING_FILTER_BUTTON_DUMMY_PROPERTY
 };
@@ -1391,14 +1419,14 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 #define RESOURCES_ICON_FILTER_UNRATED_OR_BETTER_FIXED_SIZE 16
 static gint search_filter_toolbar_rating_filter_button_get_filter_button_size (SearchFilterToolbarRatingFilterButton* self, RatingFilter filter);
 gchar* resources_get_rating_filter_tooltip (RatingFilter filter);
-static void search_filter_toolbar_rating_filter_button_finalize (GObject* obj);
+static void search_filter_toolbar_rating_filter_button_finalize (GObject * obj);
 enum  {
 	SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_DUMMY_PROPERTY
 };
 static void search_filter_toolbar_saved_search_filter_button_on_clicked (SearchFilterToolbarSavedSearchFilterButton* self);
 static void _search_filter_toolbar_saved_search_filter_button_on_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
 void search_filter_toolbar_saved_search_filter_button_restyle (SearchFilterToolbarSavedSearchFilterButton* self);
-static void search_filter_toolbar_saved_search_filter_button_finalize (GObject* obj);
+static void search_filter_toolbar_saved_search_filter_button_finalize (GObject * obj);
 static GType search_filter_toolbar_saved_search_popover_data_button_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, SearchFilterToolbarSavedSearchPopoverPrivate))
 enum  {
@@ -1426,8 +1454,8 @@ GeeCollection* saved_search_table_get_all (SavedSearchTable* self);
 gchar* data_object_get_name (DataObject* self);
 static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_new (SavedSearch* search, const gchar* name);
 static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_construct (GType object_type, SavedSearch* search, const gchar* name);
-static void _vala_array_add133 (SearchFilterToolbarSavedSearchPopoverDataButton*** array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value);
-static void _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton*** array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value);
+static void _vala_array_add133 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value);
+static void _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value);
 void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSavedSearchPopover* self);
 static void search_filter_toolbar_saved_search_popover_data_button_restyle (SearchFilterToolbarSavedSearchPopoverDataButton* self);
 static gboolean search_filter_toolbar_saved_search_popover_is_search_row (SearchFilterToolbarSavedSearchPopover* self, GtkListBoxRow* row);
@@ -1436,16 +1464,16 @@ static SavedSearch* search_filter_toolbar_saved_search_popover_data_button_get_s
 #define SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, SearchFilterToolbarSavedSearchPopoverDataButtonPrivate))
 enum  {
 	SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_DUMMY_PROPERTY,
-	SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH
+	SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH_PROPERTY
 };
 static void search_filter_toolbar_saved_search_popover_data_button_on_click (SearchFilterToolbarSavedSearchPopoverDataButton* self);
 static void _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void search_filter_toolbar_saved_search_popover_data_button_set_search (SearchFilterToolbarSavedSearchPopoverDataButton* self, SavedSearch* value);
-static void search_filter_toolbar_saved_search_popover_data_button_finalize (GObject* obj);
+static void search_filter_toolbar_saved_search_popover_data_button_finalize (GObject * obj);
 static void _vala_search_filter_toolbar_saved_search_popover_data_button_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_search_filter_toolbar_saved_search_popover_data_button_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
-static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToolbarSavedSearchPopover* obj);
-static void search_filter_toolbar_finalize (GObject* obj);
+static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToolbarSavedSearchPopover * obj);
+static void search_filter_toolbar_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
@@ -1482,7 +1510,7 @@ static guint search_view_filter_real_get_criteria (SearchViewFilter* self) {
 	g_critical ("Type `%s' does not implement abstract method `search_view_filter_get_criteria'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 65 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return _tmp0_;
-#line 1486 "SearchFilter.c"
+#line 1514 "SearchFilter.c"
 }
 
 
@@ -1491,13 +1519,13 @@ guint search_view_filter_get_criteria (SearchViewFilter* self) {
 	g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), 0U);
 #line 65 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return SEARCH_VIEW_FILTER_GET_CLASS (self)->get_criteria (self);
-#line 1495 "SearchFilter.c"
+#line 1523 "SearchFilter.c"
 }
 
 
 void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter rf) {
-	RatingFilter _tmp0_ = 0;
-	RatingFilter _tmp1_ = 0;
+	RatingFilter _tmp0_;
+	RatingFilter _tmp1_;
 #line 67 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_VIEW_FILTER (self));
 #line 68 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1510,7 +1538,7 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 	switch (_tmp1_) {
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 1514 "SearchFilter.c"
+#line 1542 "SearchFilter.c"
 		{
 #line 71 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_REJECTED;
@@ -1518,11 +1546,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 73 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1522 "SearchFilter.c"
+#line 1550 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 1526 "SearchFilter.c"
+#line 1554 "SearchFilter.c"
 		{
 #line 76 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_REJECTED;
@@ -1530,11 +1558,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 78 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1534 "SearchFilter.c"
+#line 1562 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 1538 "SearchFilter.c"
+#line 1566 "SearchFilter.c"
 		{
 #line 81 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_ONE;
@@ -1542,11 +1570,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 83 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1546 "SearchFilter.c"
+#line 1574 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_ONLY:
-#line 1550 "SearchFilter.c"
+#line 1578 "SearchFilter.c"
 		{
 #line 86 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_ONE;
@@ -1554,11 +1582,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 88 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1558 "SearchFilter.c"
+#line 1586 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 1562 "SearchFilter.c"
+#line 1590 "SearchFilter.c"
 		{
 #line 91 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_TWO;
@@ -1566,11 +1594,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 93 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1570 "SearchFilter.c"
+#line 1598 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_ONLY:
-#line 1574 "SearchFilter.c"
+#line 1602 "SearchFilter.c"
 		{
 #line 96 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_TWO;
@@ -1578,11 +1606,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 98 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1582 "SearchFilter.c"
+#line 1610 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 1586 "SearchFilter.c"
+#line 1614 "SearchFilter.c"
 		{
 #line 101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_THREE;
@@ -1590,11 +1618,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1594 "SearchFilter.c"
+#line 1622 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_ONLY:
-#line 1598 "SearchFilter.c"
+#line 1626 "SearchFilter.c"
 		{
 #line 106 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_THREE;
@@ -1602,11 +1630,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1606 "SearchFilter.c"
+#line 1634 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 1610 "SearchFilter.c"
+#line 1638 "SearchFilter.c"
 		{
 #line 111 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FOUR;
@@ -1614,11 +1642,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1618 "SearchFilter.c"
+#line 1646 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_ONLY:
-#line 1622 "SearchFilter.c"
+#line 1650 "SearchFilter.c"
 		{
 #line 116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FOUR;
@@ -1626,11 +1654,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 118 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1630 "SearchFilter.c"
+#line 1658 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 1634 "SearchFilter.c"
+#line 1662 "SearchFilter.c"
 		{
 #line 121 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FIVE;
@@ -1638,11 +1666,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 123 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1642 "SearchFilter.c"
+#line 1670 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_ONLY:
-#line 1646 "SearchFilter.c"
+#line 1674 "SearchFilter.c"
 		{
 #line 126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FIVE;
@@ -1650,12 +1678,12 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 128 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1654 "SearchFilter.c"
+#line 1682 "SearchFilter.c"
 		}
 		default:
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 1659 "SearchFilter.c"
+#line 1687 "SearchFilter.c"
 		{
 #line 132 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_UNRATED;
@@ -1663,7 +1691,7 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 134 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1667 "SearchFilter.c"
+#line 1695 "SearchFilter.c"
 		}
 	}
 }
@@ -1671,8 +1699,8 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 
 gboolean search_view_filter_has_search_filter (SearchViewFilter* self) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 #line 138 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), FALSE);
 #line 139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1683,13 +1711,13 @@ gboolean search_view_filter_has_search_filter (SearchViewFilter* self) {
 	result = !_tmp1_;
 #line 139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1687 "SearchFilter.c"
+#line 1715 "SearchFilter.c"
 }
 
 
 const gchar* search_view_filter_get_search_filter (SearchViewFilter* self) {
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 142 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), NULL);
 #line 143 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1698,16 +1726,16 @@ const gchar* search_view_filter_get_search_filter (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 143 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1702 "SearchFilter.c"
+#line 1730 "SearchFilter.c"
 }
 
 
 gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, int* result_length1) {
 	gchar** result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
 #line 146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), NULL);
 #line 147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1722,13 +1750,13 @@ gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, int*
 	if (result_length1) {
 #line 147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*result_length1 = _tmp1__length1;
-#line 1726 "SearchFilter.c"
+#line 1754 "SearchFilter.c"
 	}
 #line 147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp1_;
 #line 147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1732 "SearchFilter.c"
+#line 1760 "SearchFilter.c"
 }
 
 
@@ -1739,31 +1767,31 @@ static gchar** _vala_array_dup32 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	for (i = 0; i < length; i++) {
-#line 1743 "SearchFilter.c"
-		gchar* _tmp0_ = NULL;
+#line 1771 "SearchFilter.c"
+		gchar* _tmp0_;
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		result[i] = _tmp0_;
-#line 1749 "SearchFilter.c"
+#line 1777 "SearchFilter.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1753 "SearchFilter.c"
+#line 1781 "SearchFilter.c"
 }
 
 
 void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar* text) {
 	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
+	gchar* _tmp5_;
 	gchar** _tmp6_ = NULL;
 	gint _tmp6__length1 = 0;
 	gint __tmp6__size_ = 0;
-	const gchar* _tmp7_ = NULL;
-	gchar** _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
+	const gchar* _tmp7_;
+	gchar** _tmp11_;
+	gint _tmp11__length1;
 #line 150 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_VIEW_FILTER (self));
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1772,9 +1800,9 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 	_tmp2_ = is_string_empty (_tmp1_);
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!_tmp2_) {
-#line 1776 "SearchFilter.c"
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
+#line 1804 "SearchFilter.c"
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = text;
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1783,13 +1811,13 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 		_g_free0 (_tmp0_);
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = _tmp4_;
-#line 1787 "SearchFilter.c"
+#line 1815 "SearchFilter.c"
 	} else {
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_free0 (_tmp0_);
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = NULL;
-#line 1793 "SearchFilter.c"
+#line 1821 "SearchFilter.c"
 	}
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = g_strdup (_tmp0_);
@@ -1801,10 +1829,10 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 	_tmp7_ = self->priv->search_filter;
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp7_ != NULL) {
-#line 1805 "SearchFilter.c"
-		const gchar* _tmp8_ = NULL;
-		gchar** _tmp9_ = NULL;
-		gchar** _tmp10_ = NULL;
+#line 1833 "SearchFilter.c"
+		const gchar* _tmp8_;
+		gchar** _tmp9_;
+		gchar** _tmp10_;
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp8_ = self->priv->search_filter;
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1817,7 +1845,7 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 		_tmp6__length1 = _vala_array_length (_tmp9_);
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		__tmp6__size_ = _tmp6__length1;
-#line 1821 "SearchFilter.c"
+#line 1849 "SearchFilter.c"
 	} else {
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL);
@@ -1827,7 +1855,7 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 		_tmp6__length1 = 0;
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		__tmp6__size_ = _tmp6__length1;
-#line 1831 "SearchFilter.c"
+#line 1859 "SearchFilter.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = (_tmp6_ != NULL) ? _vala_array_dup32 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
@@ -1845,7 +1873,7 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 	_tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL);
 #line 150 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_free0 (_tmp0_);
-#line 1849 "SearchFilter.c"
+#line 1877 "SearchFilter.c"
 }
 
 
@@ -1864,13 +1892,13 @@ void search_view_filter_clear_search_filter (SearchViewFilter* self) {
 	self->priv->search_filter_words_length1 = 0;
 #line 157 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_search_filter_words_size_ = self->priv->search_filter_words_length1;
-#line 1868 "SearchFilter.c"
+#line 1896 "SearchFilter.c"
 }
 
 
 gboolean search_view_filter_has_saved_search (SearchViewFilter* self) {
 	gboolean result = FALSE;
-	SavedSearch* _tmp0_ = NULL;
+	SavedSearch* _tmp0_;
 #line 160 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), FALSE);
 #line 161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1879,13 +1907,13 @@ gboolean search_view_filter_has_saved_search (SearchViewFilter* self) {
 	result = _tmp0_ != NULL;
 #line 161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1883 "SearchFilter.c"
+#line 1911 "SearchFilter.c"
 }
 
 
 gboolean search_view_filter_get_rating_allow_higher (SearchViewFilter* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), FALSE);
 #line 165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1894,13 +1922,13 @@ gboolean search_view_filter_get_rating_allow_higher (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1898 "SearchFilter.c"
+#line 1926 "SearchFilter.c"
 }
 
 
 Rating search_view_filter_get_rating (SearchViewFilter* self) {
 	Rating result = 0;
-	Rating _tmp0_ = 0;
+	Rating _tmp0_;
 #line 168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), 0);
 #line 169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1909,7 +1937,7 @@ Rating search_view_filter_get_rating (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1913 "SearchFilter.c"
+#line 1941 "SearchFilter.c"
 }
 
 
@@ -1918,7 +1946,7 @@ gboolean search_view_filter_filter_by_media_type (SearchViewFilter* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp3_;
 #line 172 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), FALSE);
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1927,77 +1955,77 @@ gboolean search_view_filter_filter_by_media_type (SearchViewFilter* self) {
 	if (_tmp3_) {
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = TRUE;
-#line 1931 "SearchFilter.c"
+#line 1959 "SearchFilter.c"
 	} else {
-		gboolean _tmp4_ = FALSE;
+		gboolean _tmp4_;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = self->priv->_show_media_photos;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = _tmp4_;
-#line 1938 "SearchFilter.c"
+#line 1966 "SearchFilter.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_) {
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp1_ = TRUE;
-#line 1944 "SearchFilter.c"
+#line 1972 "SearchFilter.c"
 	} else {
-		gboolean _tmp5_ = FALSE;
+		gboolean _tmp5_;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = self->priv->_show_media_raw;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp1_ = _tmp5_;
-#line 1951 "SearchFilter.c"
+#line 1979 "SearchFilter.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 1955 "SearchFilter.c"
+#line 1983 "SearchFilter.c"
 		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
-		gboolean _tmp8_ = FALSE;
+		gboolean _tmp8_;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp8_ = self->priv->_show_media_video;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp8_) {
-#line 1963 "SearchFilter.c"
-			gboolean _tmp9_ = FALSE;
+#line 1991 "SearchFilter.c"
+			gboolean _tmp9_;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp9_ = self->priv->_show_media_photos;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp7_ = _tmp9_;
-#line 1969 "SearchFilter.c"
+#line 1997 "SearchFilter.c"
 		} else {
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp7_ = FALSE;
-#line 1973 "SearchFilter.c"
+#line 2001 "SearchFilter.c"
 		}
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp7_) {
-#line 1977 "SearchFilter.c"
-			gboolean _tmp10_ = FALSE;
+#line 2005 "SearchFilter.c"
+			gboolean _tmp10_;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp10_ = self->priv->_show_media_raw;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = _tmp10_;
-#line 1983 "SearchFilter.c"
+#line 2011 "SearchFilter.c"
 		} else {
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = FALSE;
-#line 1987 "SearchFilter.c"
+#line 2015 "SearchFilter.c"
 		}
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = !_tmp6_;
-#line 1991 "SearchFilter.c"
+#line 2019 "SearchFilter.c"
 	} else {
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = FALSE;
-#line 1995 "SearchFilter.c"
+#line 2023 "SearchFilter.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2001 "SearchFilter.c"
+#line 2029 "SearchFilter.c"
 }
 
 
@@ -2007,13 +2035,13 @@ SearchViewFilter* search_view_filter_construct (GType object_type) {
 	self = (SearchViewFilter*) view_filter_construct (object_type);
 #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 2011 "SearchFilter.c"
+#line 2039 "SearchFilter.c"
 }
 
 
 gboolean search_view_filter_get_flagged (SearchViewFilter* self) {
 	gboolean result;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), FALSE);
 #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2022,25 +2050,25 @@ gboolean search_view_filter_get_flagged (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2026 "SearchFilter.c"
+#line 2054 "SearchFilter.c"
 }
 
 
 void search_view_filter_set_flagged (SearchViewFilter* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_VIEW_FILTER (self));
 #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = value;
 #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_flagged = _tmp0_;
-#line 2038 "SearchFilter.c"
+#line 2066 "SearchFilter.c"
 }
 
 
 gboolean search_view_filter_get_show_media_video (SearchViewFilter* self) {
 	gboolean result;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), FALSE);
 #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2049,25 +2077,25 @@ gboolean search_view_filter_get_show_media_video (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2053 "SearchFilter.c"
+#line 2081 "SearchFilter.c"
 }
 
 
 void search_view_filter_set_show_media_video (SearchViewFilter* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_VIEW_FILTER (self));
 #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = value;
 #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_show_media_video = _tmp0_;
-#line 2065 "SearchFilter.c"
+#line 2093 "SearchFilter.c"
 }
 
 
 gboolean search_view_filter_get_show_media_photos (SearchViewFilter* self) {
 	gboolean result;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), FALSE);
 #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2076,25 +2104,25 @@ gboolean search_view_filter_get_show_media_photos (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2080 "SearchFilter.c"
+#line 2108 "SearchFilter.c"
 }
 
 
 void search_view_filter_set_show_media_photos (SearchViewFilter* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_VIEW_FILTER (self));
 #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = value;
 #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_show_media_photos = _tmp0_;
-#line 2092 "SearchFilter.c"
+#line 2120 "SearchFilter.c"
 }
 
 
 gboolean search_view_filter_get_show_media_raw (SearchViewFilter* self) {
 	gboolean result;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), FALSE);
 #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2103,25 +2131,25 @@ gboolean search_view_filter_get_show_media_raw (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2107 "SearchFilter.c"
+#line 2135 "SearchFilter.c"
 }
 
 
 void search_view_filter_set_show_media_raw (SearchViewFilter* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_VIEW_FILTER (self));
 #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = value;
 #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_show_media_raw = _tmp0_;
-#line 2119 "SearchFilter.c"
+#line 2147 "SearchFilter.c"
 }
 
 
 SavedSearch* search_view_filter_get_saved_search (SearchViewFilter* self) {
 	SavedSearch* result;
-	SavedSearch* _tmp0_ = NULL;
+	SavedSearch* _tmp0_;
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), NULL);
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2130,20 +2158,20 @@ SavedSearch* search_view_filter_get_saved_search (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2134 "SearchFilter.c"
+#line 2162 "SearchFilter.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2141 "SearchFilter.c"
+#line 2169 "SearchFilter.c"
 }
 
 
 void search_view_filter_set_saved_search (SearchViewFilter* self, SavedSearch* value) {
-	SavedSearch* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
+	SavedSearch* _tmp0_;
+	SavedSearch* _tmp1_;
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_VIEW_FILTER (self));
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2154,7 +2182,7 @@ void search_view_filter_set_saved_search (SearchViewFilter* self, SavedSearch* v
 	_g_object_unref0 (self->priv->_saved_search);
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_saved_search = _tmp1_;
-#line 2158 "SearchFilter.c"
+#line 2186 "SearchFilter.c"
 }
 
 
@@ -2166,8 +2194,8 @@ static void search_view_filter_class_init (SearchViewFilterClass * klass) {
 #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (SearchViewFilterPrivate));
 #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) search_view_filter_real_get_criteria;
-#line 2171 "SearchFilter.c"
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) search_view_filter_real_get_criteria;
+#line 2199 "SearchFilter.c"
 }
 
 
@@ -2198,11 +2226,11 @@ static void search_view_filter_instance_init (SearchViewFilter * self) {
 	self->priv->_search_filter_words_size_ = self->priv->search_filter_words_length1;
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_saved_search = NULL;
-#line 2202 "SearchFilter.c"
+#line 2230 "SearchFilter.c"
 }
 
 
-static void search_view_filter_finalize (ViewFilter* obj) {
+static void search_view_filter_finalize (ViewFilter * obj) {
 	SearchViewFilter * self;
 #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter);
@@ -2214,7 +2242,7 @@ static void search_view_filter_finalize (ViewFilter* obj) {
 	_g_object_unref0 (self->priv->_saved_search);
 #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	VIEW_FILTER_CLASS (search_view_filter_parent_class)->finalize (obj);
-#line 2218 "SearchFilter.c"
+#line 2246 "SearchFilter.c"
 }
 
 
@@ -2232,21 +2260,21 @@ GType search_view_filter_get_type (void) {
 
 static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2250 "SearchFilter.c"
+#line 2278 "SearchFilter.c"
 }
 
 
@@ -2254,18 +2282,18 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 	DefaultSearchViewFilter * self;
 	gboolean result = FALSE;
 	MediaSource* source = NULL;
-	DataView* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
+	DataView* _tmp0_;
+	MediaSource* _tmp1_;
 	guint criteria = 0U;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
-	guint _tmp14_ = 0U;
+	guint _tmp2_;
+	guint _tmp3_;
+	guint _tmp14_;
 	gboolean _tmp22_ = FALSE;
-	guint _tmp23_ = 0U;
-	gboolean _tmp44_ = FALSE;
-	guint _tmp45_ = 0U;
-	gboolean _tmp91_ = FALSE;
-	guint _tmp92_ = 0U;
+	guint _tmp23_;
+	gboolean _tmp40_ = FALSE;
+	guint _tmp41_;
+	gboolean _tmp87_ = FALSE;
+	guint _tmp88_;
 #line 181 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DEFAULT_SEARCH_VIEW_FILTER, DefaultSearchViewFilter);
 #line 181 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2284,17 +2312,17 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 	_tmp3_ = criteria;
 #line 186 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((SEARCH_FILTER_CRITERIA_RATING & _tmp3_) != 0) {
-#line 2288 "SearchFilter.c"
+#line 2316 "SearchFilter.c"
 		gboolean _tmp4_ = FALSE;
-		gboolean _tmp5_ = FALSE;
+		gboolean _tmp5_;
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = search_view_filter_get_rating_allow_higher (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp5_) {
-#line 2295 "SearchFilter.c"
-			MediaSource* _tmp6_ = NULL;
-			Rating _tmp7_ = 0;
-			Rating _tmp8_ = 0;
+#line 2323 "SearchFilter.c"
+			MediaSource* _tmp6_;
+			Rating _tmp7_;
+			Rating _tmp8_;
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = source;
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2303,11 +2331,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_tmp8_ = search_view_filter_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp4_ = _tmp7_ < _tmp8_;
-#line 2307 "SearchFilter.c"
+#line 2335 "SearchFilter.c"
 		} else {
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp4_ = FALSE;
-#line 2311 "SearchFilter.c"
+#line 2339 "SearchFilter.c"
 		}
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp4_) {
@@ -2317,18 +2345,18 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_g_object_unref0 (source);
 #line 188 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 2321 "SearchFilter.c"
+#line 2349 "SearchFilter.c"
 		} else {
 			gboolean _tmp9_ = FALSE;
-			gboolean _tmp10_ = FALSE;
+			gboolean _tmp10_;
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp10_ = search_view_filter_get_rating_allow_higher (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (!_tmp10_) {
-#line 2329 "SearchFilter.c"
-				MediaSource* _tmp11_ = NULL;
-				Rating _tmp12_ = 0;
-				Rating _tmp13_ = 0;
+#line 2357 "SearchFilter.c"
+				MediaSource* _tmp11_;
+				Rating _tmp12_;
+				Rating _tmp13_;
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp11_ = source;
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2337,11 +2365,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 				_tmp13_ = search_view_filter_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp9_ = _tmp12_ != _tmp13_;
-#line 2341 "SearchFilter.c"
+#line 2369 "SearchFilter.c"
 			} else {
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp9_ = FALSE;
-#line 2345 "SearchFilter.c"
+#line 2373 "SearchFilter.c"
 			}
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (_tmp9_) {
@@ -2351,7 +2379,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 				_g_object_unref0 (source);
 #line 190 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				return result;
-#line 2355 "SearchFilter.c"
+#line 2383 "SearchFilter.c"
 			}
 		}
 	}
@@ -2359,45 +2387,45 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 	_tmp14_ = criteria;
 #line 194 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((SEARCH_FILTER_CRITERIA_FLAG & _tmp14_) != 0) {
-#line 2363 "SearchFilter.c"
+#line 2391 "SearchFilter.c"
 		gboolean _tmp15_ = FALSE;
 		gboolean _tmp16_ = FALSE;
-		gboolean _tmp17_ = FALSE;
-		gboolean _tmp18_ = FALSE;
+		gboolean _tmp17_;
+		gboolean _tmp18_;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp17_ = search_view_filter_get_flagged (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp18_ = _tmp17_;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp18_) {
-#line 2374 "SearchFilter.c"
-			MediaSource* _tmp19_ = NULL;
+#line 2402 "SearchFilter.c"
+			MediaSource* _tmp19_;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp19_ = source;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_FLAGGABLE);
-#line 2380 "SearchFilter.c"
+#line 2408 "SearchFilter.c"
 		} else {
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp16_ = FALSE;
-#line 2384 "SearchFilter.c"
+#line 2412 "SearchFilter.c"
 		}
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp16_) {
-#line 2388 "SearchFilter.c"
-			MediaSource* _tmp20_ = NULL;
-			gboolean _tmp21_ = FALSE;
+#line 2416 "SearchFilter.c"
+			MediaSource* _tmp20_;
+			gboolean _tmp21_;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp20_ = source;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp21_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_FLAGGABLE, Flaggable));
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp15_ = !_tmp21_;
-#line 2397 "SearchFilter.c"
+#line 2425 "SearchFilter.c"
 		} else {
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp15_ = FALSE;
-#line 2401 "SearchFilter.c"
+#line 2429 "SearchFilter.c"
 		}
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp15_) {
@@ -2407,36 +2435,36 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_g_object_unref0 (source);
 #line 196 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 2411 "SearchFilter.c"
+#line 2439 "SearchFilter.c"
 		}
 	}
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp23_ = criteria;
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((SEARCH_FILTER_CRITERIA_MEDIA & _tmp23_) != 0) {
-#line 2418 "SearchFilter.c"
-		gboolean _tmp24_ = FALSE;
+#line 2446 "SearchFilter.c"
+		gboolean _tmp24_;
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp24_ = search_view_filter_filter_by_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp22_ = _tmp24_;
-#line 2424 "SearchFilter.c"
+#line 2452 "SearchFilter.c"
 	} else {
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp22_ = FALSE;
-#line 2428 "SearchFilter.c"
+#line 2456 "SearchFilter.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp22_) {
-#line 2432 "SearchFilter.c"
-		MediaSource* _tmp25_ = NULL;
+#line 2460 "SearchFilter.c"
+		MediaSource* _tmp25_;
 #line 201 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp25_ = source;
 #line 201 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, TYPE_VIDEO_SOURCE)) {
-#line 2438 "SearchFilter.c"
-			gboolean _tmp26_ = FALSE;
-			gboolean _tmp27_ = FALSE;
+#line 2466 "SearchFilter.c"
+			gboolean _tmp26_;
+			gboolean _tmp27_;
 #line 202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp26_ = search_view_filter_get_show_media_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2449,20 +2477,20 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 				_g_object_unref0 (source);
 #line 203 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				return result;
-#line 2453 "SearchFilter.c"
+#line 2481 "SearchFilter.c"
 			}
 		} else {
-			MediaSource* _tmp28_ = NULL;
+			MediaSource* _tmp28_;
 #line 204 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp28_ = source;
 #line 204 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, TYPE_PHOTO)) {
-#line 2461 "SearchFilter.c"
+#line 2489 "SearchFilter.c"
 				Photo* photo = NULL;
-				MediaSource* _tmp29_ = NULL;
-				Photo* _tmp30_ = NULL;
-				Photo* _tmp31_ = NULL;
-				PhotoFileFormat _tmp32_ = 0;
+				MediaSource* _tmp29_;
+				Photo* _tmp30_;
+				Photo* _tmp31_;
+				PhotoFileFormat _tmp32_;
 #line 205 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp29_ = source;
 #line 205 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2475,455 +2503,426 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 				_tmp32_ = photo_get_master_file_format (_tmp31_);
 #line 206 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				if (_tmp32_ == PHOTO_FILE_FORMAT_RAW) {
-#line 2479 "SearchFilter.c"
-					Photo* _tmp33_ = NULL;
-					gboolean _tmp34_ = FALSE;
+#line 2507 "SearchFilter.c"
+					gboolean _tmp33_ = FALSE;
+					gboolean _tmp34_;
+					gboolean _tmp35_;
 #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-					_tmp33_ = photo;
+					_tmp34_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-					_tmp34_ = photo_is_raw_developer_available (_tmp33_, RAW_DEVELOPER_CAMERA);
+					_tmp35_ = _tmp34_;
+#line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+					if (!_tmp35_) {
+#line 2517 "SearchFilter.c"
+						gboolean _tmp36_;
+						gboolean _tmp37_;
+#line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+						_tmp36_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-					if (_tmp34_) {
-#line 2488 "SearchFilter.c"
-						gboolean _tmp35_ = FALSE;
-						gboolean _tmp36_ = FALSE;
-						gboolean _tmp37_ = FALSE;
-#line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						_tmp36_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp37_ = _tmp36_;
+#line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+						_tmp33_ = !_tmp37_;
+#line 2526 "SearchFilter.c"
+					} else {
+#line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+						_tmp33_ = FALSE;
+#line 2530 "SearchFilter.c"
+					}
+#line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+					if (_tmp33_) {
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						if (!_tmp37_) {
-#line 2498 "SearchFilter.c"
-							gboolean _tmp38_ = FALSE;
-							gboolean _tmp39_ = FALSE;
-#line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-							_tmp38_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-							_tmp39_ = _tmp38_;
+						result = FALSE;
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-							_tmp35_ = !_tmp39_;
-#line 2507 "SearchFilter.c"
-						} else {
+						_g_object_unref0 (photo);
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-							_tmp35_ = FALSE;
-#line 2511 "SearchFilter.c"
-						}
+						_g_object_unref0 (source);
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						if (_tmp35_) {
-#line 209 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-							result = FALSE;
+						return result;
+#line 2542 "SearchFilter.c"
+					}
+				} else {
+					gboolean _tmp38_;
+					gboolean _tmp39_;
 #line 209 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-							_g_object_unref0 (photo);
+					_tmp38_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 209 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-							_g_object_unref0 (source);
+					_tmp39_ = _tmp38_;
 #line 209 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-							return result;
-#line 2523 "SearchFilter.c"
-						}
-					} else {
-						gboolean _tmp40_ = FALSE;
-						gboolean _tmp41_ = FALSE;
+					if (!_tmp39_) {
 #line 210 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						_tmp40_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 210 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						_tmp41_ = _tmp40_;
-#line 210 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						if (!_tmp41_) {
-#line 211 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-							result = FALSE;
-#line 211 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-							_g_object_unref0 (photo);
-#line 211 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-							_g_object_unref0 (source);
-#line 211 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-							return result;
-#line 2542 "SearchFilter.c"
-						}
-					}
-				} else {
-					gboolean _tmp42_ = FALSE;
-					gboolean _tmp43_ = FALSE;
-#line 213 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-					_tmp42_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 213 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-					_tmp43_ = _tmp42_;
-#line 213 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-					if (!_tmp43_) {
-#line 214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						result = FALSE;
-#line 214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 210 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_g_object_unref0 (photo);
-#line 214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 210 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_g_object_unref0 (source);
-#line 214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 210 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						return result;
-#line 2562 "SearchFilter.c"
+#line 2561 "SearchFilter.c"
 					}
 				}
 #line 204 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (photo);
-#line 2567 "SearchFilter.c"
+#line 2566 "SearchFilter.c"
 			}
 		}
 	}
-#line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp45_ = criteria;
-#line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if ((SEARCH_FILTER_CRITERIA_TEXT & _tmp45_) != 0) {
-#line 2575 "SearchFilter.c"
-		gboolean _tmp46_ = FALSE;
-#line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp46_ = search_view_filter_has_search_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp44_ = _tmp46_;
-#line 2581 "SearchFilter.c"
+#line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp41_ = criteria;
+#line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	if ((SEARCH_FILTER_CRITERIA_TEXT & _tmp41_) != 0) {
+#line 2574 "SearchFilter.c"
+		gboolean _tmp42_;
+#line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp42_ = search_view_filter_has_search_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
+#line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp40_ = _tmp42_;
+#line 2580 "SearchFilter.c"
 	} else {
-#line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp44_ = FALSE;
-#line 2585 "SearchFilter.c"
+#line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp40_ = FALSE;
+#line 2584 "SearchFilter.c"
 	}
-#line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp44_) {
-#line 2589 "SearchFilter.c"
+#line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	if (_tmp40_) {
+#line 2588 "SearchFilter.c"
 		const gchar* media_keywords = NULL;
-		MediaSource* _tmp47_ = NULL;
-		const gchar* _tmp48_ = NULL;
+		MediaSource* _tmp43_;
+		const gchar* _tmp44_;
 		const gchar* event_keywords = NULL;
 		Event* event = NULL;
-		MediaSource* _tmp49_ = NULL;
-		Event* _tmp50_ = NULL;
-		Event* _tmp51_ = NULL;
+		MediaSource* _tmp45_;
+		Event* _tmp46_;
+		Event* _tmp47_;
 		GeeList* tags = NULL;
-		TagSourceCollection* _tmp54_ = NULL;
-		MediaSource* _tmp55_ = NULL;
-		GeeList* _tmp56_ = NULL;
-		gint _tmp57_ = 0;
-		GeeList* _tmp58_ = NULL;
+		TagSourceCollection* _tmp50_;
+		MediaSource* _tmp51_;
+		GeeList* _tmp52_;
+		gint _tmp53_ = 0;
+		GeeList* _tmp54_;
 		gint tags_size = 0;
-		gint _tmp62_ = 0;
-		gchar** _tmp63_ = NULL;
-#line 220 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp47_ = source;
+		gint _tmp58_;
+		gchar** _tmp59_;
+#line 216 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp43_ = source;
+#line 216 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp44_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_INDEXABLE, Indexable));
+#line 216 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		media_keywords = _tmp44_;
+#line 218 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		event_keywords = NULL;
+#line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp45_ = source;
+#line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp46_ = media_source_get_event (_tmp45_);
+#line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		event = _tmp46_;
 #line 220 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp48_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_INDEXABLE, Indexable));
+		_tmp47_ = event;
 #line 220 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		media_keywords = _tmp48_;
-#line 222 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		event_keywords = NULL;
+		if (_tmp47_ != NULL) {
+#line 2624 "SearchFilter.c"
+			Event* _tmp48_;
+			const gchar* _tmp49_;
+#line 221 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp48_ = event;
+#line 221 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp49_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_INDEXABLE, Indexable));
+#line 221 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			event_keywords = _tmp49_;
+#line 2633 "SearchFilter.c"
+		}
+#line 223 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp50_ = tag_global;
 #line 223 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp49_ = source;
+		_tmp51_ = source;
 #line 223 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp50_ = media_source_get_event (_tmp49_);
+		_tmp52_ = tag_source_collection_fetch_for_source (_tmp50_, _tmp51_);
 #line 223 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		event = _tmp50_;
+		tags = _tmp52_;
 #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp51_ = event;
+		_tmp54_ = tags;
 #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		if (_tmp51_ != NULL) {
-#line 2625 "SearchFilter.c"
-			Event* _tmp52_ = NULL;
-			const gchar* _tmp53_ = NULL;
-#line 225 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp52_ = event;
-#line 225 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp53_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_INDEXABLE, Indexable));
-#line 225 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			event_keywords = _tmp53_;
-#line 2634 "SearchFilter.c"
-		}
-#line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp54_ = tag_global;
-#line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp55_ = source;
-#line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp56_ = tag_source_collection_fetch_for_source (_tmp54_, _tmp55_);
-#line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		tags = _tmp56_;
-#line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp58_ = tags;
-#line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		if (_tmp58_ != NULL) {
-#line 2648 "SearchFilter.c"
-			GeeList* _tmp59_ = NULL;
-			gint _tmp60_ = 0;
-			gint _tmp61_ = 0;
-#line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp59_ = tags;
-#line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp60_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp61_ = _tmp60_;
-#line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp57_ = _tmp61_;
-#line 2660 "SearchFilter.c"
+		if (_tmp54_ != NULL) {
+#line 2647 "SearchFilter.c"
+			GeeList* _tmp55_;
+			gint _tmp56_;
+			gint _tmp57_;
+#line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp55_ = tags;
+#line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp56_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp57_ = _tmp56_;
+#line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp53_ = _tmp57_;
+#line 2659 "SearchFilter.c"
 		} else {
-#line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp57_ = 0;
-#line 2664 "SearchFilter.c"
+#line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp53_ = 0;
+#line 2663 "SearchFilter.c"
 		}
-#line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		tags_size = _tmp57_;
-#line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp63_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp62_);
-#line 2670 "SearchFilter.c"
+#line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		tags_size = _tmp53_;
+#line 226 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp59_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp58_);
+#line 2669 "SearchFilter.c"
 		{
 			gchar** word_collection = NULL;
 			gint word_collection_length1 = 0;
 			gint _word_collection_size_ = 0;
 			gint word_it = 0;
-#line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			word_collection = _tmp63_;
-#line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			word_collection_length1 = _tmp62_;
-#line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			for (word_it = 0; word_it < _tmp62_; word_it = word_it + 1) {
-#line 2682 "SearchFilter.c"
+#line 226 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			word_collection = _tmp59_;
+#line 226 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			word_collection_length1 = _tmp58_;
+#line 226 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			for (word_it = 0; word_it < _tmp58_; word_it = word_it + 1) {
+#line 2681 "SearchFilter.c"
 				const gchar* word = NULL;
-#line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 226 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				word = word_collection[word_it];
-#line 2686 "SearchFilter.c"
+#line 2685 "SearchFilter.c"
 				{
-					gboolean _tmp64_ = FALSE;
-					const gchar* _tmp65_ = NULL;
-					gboolean _tmp69_ = FALSE;
-					const gchar* _tmp70_ = NULL;
-					gint _tmp74_ = 0;
-#line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-					_tmp65_ = media_keywords;
-#line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-					if (_tmp65_ != NULL) {
-#line 2697 "SearchFilter.c"
-						const gchar* _tmp66_ = NULL;
-						const gchar* _tmp67_ = NULL;
-						gboolean _tmp68_ = FALSE;
-#line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						_tmp66_ = media_keywords;
-#line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						_tmp67_ = word;
-#line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						_tmp68_ = string_contains (_tmp66_, _tmp67_);
-#line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						_tmp64_ = _tmp68_;
-#line 2709 "SearchFilter.c"
+					gboolean _tmp60_ = FALSE;
+					const gchar* _tmp61_;
+					gboolean _tmp65_ = FALSE;
+					const gchar* _tmp66_;
+					gint _tmp70_;
+#line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+					_tmp61_ = media_keywords;
+#line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+					if (_tmp61_ != NULL) {
+#line 2696 "SearchFilter.c"
+						const gchar* _tmp62_;
+						const gchar* _tmp63_;
+						gboolean _tmp64_;
+#line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+						_tmp62_ = media_keywords;
+#line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+						_tmp63_ = word;
+#line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+						_tmp64_ = string_contains (_tmp62_, _tmp63_);
+#line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+						_tmp60_ = _tmp64_;
+#line 2708 "SearchFilter.c"
 					} else {
-#line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						_tmp64_ = FALSE;
-#line 2713 "SearchFilter.c"
+#line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+						_tmp60_ = FALSE;
+#line 2712 "SearchFilter.c"
 					}
-#line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-					if (_tmp64_) {
-#line 232 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+					if (_tmp60_) {
+#line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						continue;
-#line 2719 "SearchFilter.c"
+#line 2718 "SearchFilter.c"
 					}
-#line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-					_tmp70_ = event_keywords;
-#line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-					if (_tmp70_ != NULL) {
-#line 2725 "SearchFilter.c"
-						const gchar* _tmp71_ = NULL;
-						const gchar* _tmp72_ = NULL;
-						gboolean _tmp73_ = FALSE;
-#line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						_tmp71_ = event_keywords;
-#line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						_tmp72_ = word;
-#line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						_tmp73_ = string_contains (_tmp71_, _tmp72_);
-#line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						_tmp69_ = _tmp73_;
-#line 2737 "SearchFilter.c"
+#line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+					_tmp66_ = event_keywords;
+#line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+					if (_tmp66_ != NULL) {
+#line 2724 "SearchFilter.c"
+						const gchar* _tmp67_;
+						const gchar* _tmp68_;
+						gboolean _tmp69_;
+#line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+						_tmp67_ = event_keywords;
+#line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+						_tmp68_ = word;
+#line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+						_tmp69_ = string_contains (_tmp67_, _tmp68_);
+#line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+						_tmp65_ = _tmp69_;
+#line 2736 "SearchFilter.c"
 					} else {
-#line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						_tmp69_ = FALSE;
-#line 2741 "SearchFilter.c"
+#line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+						_tmp65_ = FALSE;
+#line 2740 "SearchFilter.c"
 					}
-#line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-					if (_tmp69_) {
-#line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+					if (_tmp65_) {
+#line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						continue;
-#line 2747 "SearchFilter.c"
+#line 2746 "SearchFilter.c"
 					}
-#line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-					_tmp74_ = tags_size;
-#line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-					if (_tmp74_ > 0) {
-#line 2753 "SearchFilter.c"
+#line 233 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+					_tmp70_ = tags_size;
+#line 233 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+					if (_tmp70_ > 0) {
+#line 2752 "SearchFilter.c"
 						gboolean found = FALSE;
-						gboolean _tmp90_ = FALSE;
-#line 238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+						gboolean _tmp86_;
+#line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						found = FALSE;
-#line 2758 "SearchFilter.c"
+#line 2757 "SearchFilter.c"
 						{
 							gint ctr = 0;
-#line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							ctr = 0;
-#line 2763 "SearchFilter.c"
+#line 2762 "SearchFilter.c"
 							{
-								gboolean _tmp75_ = FALSE;
-#line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-								_tmp75_ = TRUE;
-#line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+								gboolean _tmp71_ = FALSE;
+#line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+								_tmp71_ = TRUE;
+#line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 								while (TRUE) {
-#line 2770 "SearchFilter.c"
-									gint _tmp77_ = 0;
-									gint _tmp78_ = 0;
+#line 2769 "SearchFilter.c"
+									gint _tmp73_;
+									gint _tmp74_;
 									const gchar* tag_keywords = NULL;
-									GeeList* _tmp79_ = NULL;
-									gint _tmp80_ = 0;
-									gpointer _tmp81_ = NULL;
-									Tag* _tmp82_ = NULL;
-									const gchar* _tmp83_ = NULL;
-									const gchar* _tmp84_ = NULL;
-									gboolean _tmp85_ = FALSE;
-									const gchar* _tmp86_ = NULL;
-#line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-									if (!_tmp75_) {
-#line 2784 "SearchFilter.c"
-										gint _tmp76_ = 0;
-#line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-										_tmp76_ = ctr;
-#line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-										ctr = _tmp76_ + 1;
-#line 2790 "SearchFilter.c"
+									GeeList* _tmp75_;
+									gint _tmp76_;
+									gpointer _tmp77_;
+									Tag* _tmp78_;
+									const gchar* _tmp79_;
+									const gchar* _tmp80_;
+									gboolean _tmp81_ = FALSE;
+									const gchar* _tmp82_;
+#line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+									if (!_tmp71_) {
+#line 2783 "SearchFilter.c"
+										gint _tmp72_;
+#line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+										_tmp72_ = ctr;
+#line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+										ctr = _tmp72_ + 1;
+#line 2789 "SearchFilter.c"
 									}
-#line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-									_tmp75_ = FALSE;
-#line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-									_tmp77_ = ctr;
-#line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-									_tmp78_ = tags_size;
-#line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-									if (!(_tmp77_ < _tmp78_)) {
-#line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+									_tmp71_ = FALSE;
+#line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+									_tmp73_ = ctr;
+#line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+									_tmp74_ = tags_size;
+#line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+									if (!(_tmp73_ < _tmp74_)) {
+#line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										break;
-#line 2802 "SearchFilter.c"
+#line 2801 "SearchFilter.c"
 									}
-#line 240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-									_tmp79_ = tags;
-#line 240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-									_tmp80_ = ctr;
-#line 240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-									_tmp81_ = gee_list_get (_tmp79_, _tmp80_);
-#line 240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-									_tmp82_ = (Tag*) _tmp81_;
-#line 240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-									_tmp83_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_INDEXABLE, Indexable));
-#line 240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-									_tmp84_ = _tmp83_;
-#line 240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-									_g_object_unref0 (_tmp82_);
-#line 240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-									tag_keywords = _tmp84_;
-#line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-									_tmp86_ = tag_keywords;
-#line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-									if (_tmp86_ != NULL) {
-#line 2824 "SearchFilter.c"
-										const gchar* _tmp87_ = NULL;
-										const gchar* _tmp88_ = NULL;
-										gboolean _tmp89_ = FALSE;
-#line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-										_tmp87_ = tag_keywords;
-#line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-										_tmp88_ = word;
-#line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-										_tmp89_ = string_contains (_tmp87_, _tmp88_);
-#line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-										_tmp85_ = _tmp89_;
-#line 2836 "SearchFilter.c"
+#line 236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+									_tmp75_ = tags;
+#line 236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+									_tmp76_ = ctr;
+#line 236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+									_tmp77_ = gee_list_get (_tmp75_, _tmp76_);
+#line 236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+									_tmp78_ = (Tag*) _tmp77_;
+#line 236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+									_tmp79_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_INDEXABLE, Indexable));
+#line 236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+									_tmp80_ = _tmp79_;
+#line 236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+									_g_object_unref0 (_tmp78_);
+#line 236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+									tag_keywords = _tmp80_;
+#line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+									_tmp82_ = tag_keywords;
+#line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+									if (_tmp82_ != NULL) {
+#line 2823 "SearchFilter.c"
+										const gchar* _tmp83_;
+										const gchar* _tmp84_;
+										gboolean _tmp85_;
+#line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+										_tmp83_ = tag_keywords;
+#line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+										_tmp84_ = word;
+#line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+										_tmp85_ = string_contains (_tmp83_, _tmp84_);
+#line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+										_tmp81_ = _tmp85_;
+#line 2835 "SearchFilter.c"
 									} else {
-#line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-										_tmp85_ = FALSE;
-#line 2840 "SearchFilter.c"
+#line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+										_tmp81_ = FALSE;
+#line 2839 "SearchFilter.c"
 									}
-#line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-									if (_tmp85_) {
-#line 242 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+									if (_tmp81_) {
+#line 238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										found = TRUE;
-#line 244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										break;
-#line 2848 "SearchFilter.c"
+#line 2847 "SearchFilter.c"
 									}
 								}
 							}
 						}
-#line 248 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						_tmp90_ = found;
-#line 248 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-						if (_tmp90_) {
-#line 249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+						_tmp86_ = found;
+#line 244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+						if (_tmp86_) {
+#line 245 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							continue;
-#line 2859 "SearchFilter.c"
+#line 2858 "SearchFilter.c"
 						}
 					}
-#line 254 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					result = FALSE;
-#line 254 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					_g_object_unref0 (tags);
-#line 254 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					_g_object_unref0 (event);
-#line 254 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					_g_object_unref0 (source);
-#line 254 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					return result;
-#line 2872 "SearchFilter.c"
+#line 2871 "SearchFilter.c"
 				}
 			}
 		}
-#line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (tags);
-#line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (event);
-#line 2880 "SearchFilter.c"
+#line 2879 "SearchFilter.c"
 	}
-#line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp92_ = criteria;
-#line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if ((SEARCH_FILTER_CRITERIA_SAVEDSEARCH & _tmp92_) != 0) {
-#line 2886 "SearchFilter.c"
-		gboolean _tmp93_ = FALSE;
-#line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp93_ = search_view_filter_has_saved_search (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp91_ = _tmp93_;
-#line 2892 "SearchFilter.c"
+#line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp88_ = criteria;
+#line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	if ((SEARCH_FILTER_CRITERIA_SAVEDSEARCH & _tmp88_) != 0) {
+#line 2885 "SearchFilter.c"
+		gboolean _tmp89_;
+#line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp89_ = search_view_filter_has_saved_search (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
+#line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp87_ = _tmp89_;
+#line 2891 "SearchFilter.c"
 	} else {
-#line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp91_ = FALSE;
-#line 2896 "SearchFilter.c"
+#line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp87_ = FALSE;
+#line 2895 "SearchFilter.c"
 	}
-#line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp91_) {
-#line 2900 "SearchFilter.c"
-		SavedSearch* _tmp94_ = NULL;
-		SavedSearch* _tmp95_ = NULL;
-		MediaSource* _tmp96_ = NULL;
-		gboolean _tmp97_ = FALSE;
-#line 260 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp94_ = search_view_filter_get_saved_search (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 260 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp95_ = _tmp94_;
-#line 260 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp96_ = source;
-#line 260 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp97_ = saved_search_predicate (_tmp95_, _tmp96_);
-#line 260 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		result = _tmp97_;
-#line 260 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	if (_tmp87_) {
+#line 2899 "SearchFilter.c"
+		SavedSearch* _tmp90_;
+		SavedSearch* _tmp91_;
+		MediaSource* _tmp92_;
+		gboolean _tmp93_;
+#line 256 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp90_ = search_view_filter_get_saved_search (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
+#line 256 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp91_ = _tmp90_;
+#line 256 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp92_ = source;
+#line 256 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp93_ = saved_search_predicate (_tmp91_, _tmp92_);
+#line 256 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		result = _tmp93_;
+#line 256 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (source);
-#line 260 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 256 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 2919 "SearchFilter.c"
+#line 2918 "SearchFilter.c"
 	}
-#line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = TRUE;
-#line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (source);
-#line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2927 "SearchFilter.c"
+#line 2926 "SearchFilter.c"
 }
 
 
@@ -2933,7 +2932,7 @@ DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type
 	self = (DefaultSearchViewFilter*) search_view_filter_construct (object_type);
 #line 180 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 2937 "SearchFilter.c"
+#line 2936 "SearchFilter.c"
 }
 
 
@@ -2941,8 +2940,8 @@ static void default_search_view_filter_class_init (DefaultSearchViewFilterClass
 #line 180 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	default_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 180 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) default_search_view_filter_real_predicate;
-#line 2946 "SearchFilter.c"
+	((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) default_search_view_filter_real_predicate;
+#line 2945 "SearchFilter.c"
 }
 
 
@@ -2965,56 +2964,56 @@ GType default_search_view_filter_get_type (void) {
 static gboolean disabled_view_filter_real_predicate (ViewFilter* base, DataView* view) {
 	DisabledViewFilter * self;
 	gboolean result = FALSE;
-#line 268 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DISABLED_VIEW_FILTER, DisabledViewFilter);
-#line 268 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
-#line 269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 265 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = TRUE;
-#line 269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 265 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2977 "SearchFilter.c"
+#line 2976 "SearchFilter.c"
 }
 
 
 static guint disabled_view_filter_real_get_criteria (SearchViewFilter* base) {
 	DisabledViewFilter * self;
 	guint result = 0U;
-#line 272 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 268 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DISABLED_VIEW_FILTER, DisabledViewFilter);
-#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = (guint) SEARCH_FILTER_CRITERIA_RATING;
-#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2990 "SearchFilter.c"
+#line 2989 "SearchFilter.c"
 }
 
 
 DisabledViewFilter* disabled_view_filter_construct (GType object_type) {
 	DisabledViewFilter* self = NULL;
-#line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (DisabledViewFilter*) search_view_filter_construct (object_type);
-#line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 3000 "SearchFilter.c"
+#line 2999 "SearchFilter.c"
 }
 
 
 DisabledViewFilter* disabled_view_filter_new (void) {
-#line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return disabled_view_filter_construct (TYPE_DISABLED_VIEW_FILTER);
-#line 3007 "SearchFilter.c"
+#line 3006 "SearchFilter.c"
 }
 
 
 static void disabled_view_filter_class_init (DisabledViewFilterClass * klass) {
-#line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	disabled_view_filter_parent_class = g_type_class_peek_parent (klass);
-#line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) disabled_view_filter_real_predicate;
-#line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) disabled_view_filter_real_get_criteria;
-#line 3018 "SearchFilter.c"
+#line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) disabled_view_filter_real_predicate;
+#line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) disabled_view_filter_real_get_criteria;
+#line 3017 "SearchFilter.c"
 }
 
 
@@ -3036,392 +3035,392 @@ GType disabled_view_filter_get_type (void) {
 
 TextAction* text_action_construct (GType object_type, const gchar* init) {
 	TextAction* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (TextAction*) g_type_create_instance (object_type);
-#line 295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = init;
-#line 295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_free0 (self->priv->text);
-#line 295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->text = _tmp1_;
-#line 294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 3054 "SearchFilter.c"
+#line 3053 "SearchFilter.c"
 }
 
 
 TextAction* text_action_new (const gchar* init) {
-#line 294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return text_action_construct (TYPE_TEXT_ACTION, init);
-#line 3061 "SearchFilter.c"
+#line 3060 "SearchFilter.c"
 }
 
 
 void text_action_set_text (TextAction* self, const gchar* text) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 298 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_TEXT_ACTION (self));
-#line 299 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->text;
-#line 299 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = text;
-#line 299 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (g_strcmp0 (_tmp0_, _tmp1_) != 0) {
-#line 3076 "SearchFilter.c"
-		const gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-#line 300 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 3075 "SearchFilter.c"
+		const gchar* _tmp2_;
+		gchar* _tmp3_;
+		const gchar* _tmp4_;
+#line 296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = text;
-#line 300 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = g_strdup (_tmp2_);
-#line 300 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_free0 (self->priv->text);
-#line 300 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		self->priv->text = _tmp3_;
-#line 301 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = text;
-#line 301 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		g_signal_emit_by_name (self, "text-changed", _tmp4_);
-#line 3092 "SearchFilter.c"
+#line 297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		g_signal_emit (self, text_action_signals[TEXT_ACTION_TEXT_CHANGED_SIGNAL], 0, _tmp4_);
+#line 3091 "SearchFilter.c"
 	}
 }
 
 
 void text_action_clear (TextAction* self) {
-#line 305 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 301 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_TEXT_ACTION (self));
-#line 306 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 302 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	text_action_set_text (self, NULL);
-#line 3102 "SearchFilter.c"
+#line 3101 "SearchFilter.c"
 }
 
 
 gboolean text_action_is_sensitive (TextAction* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 309 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gboolean _tmp0_;
+#line 305 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_TEXT_ACTION (self), FALSE);
-#line 310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 306 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->sensitive;
-#line 310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 306 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 306 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3117 "SearchFilter.c"
+#line 3116 "SearchFilter.c"
 }
 
 
 void text_action_set_sensitive (TextAction* self, gboolean sensitive) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-#line 313 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+#line 309 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_TEXT_ACTION (self));
-#line 314 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->sensitive;
-#line 314 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = sensitive;
-#line 314 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_ != _tmp1_) {
-#line 3132 "SearchFilter.c"
-		gboolean _tmp2_ = FALSE;
-		gboolean _tmp3_ = FALSE;
-#line 315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 3131 "SearchFilter.c"
+		gboolean _tmp2_;
+		gboolean _tmp3_;
+#line 311 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = sensitive;
-#line 315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 311 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		self->priv->sensitive = _tmp2_;
-#line 316 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 312 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = sensitive;
-#line 316 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		g_signal_emit_by_name (self, "sensitivity-changed", _tmp3_);
-#line 3143 "SearchFilter.c"
+#line 312 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		g_signal_emit (self, text_action_signals[TEXT_ACTION_SENSITIVITY_CHANGED_SIGNAL], 0, _tmp3_);
+#line 3142 "SearchFilter.c"
 	}
 }
 
 
 gboolean text_action_is_visible (TextAction* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 320 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gboolean _tmp0_;
+#line 316 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_TEXT_ACTION (self), FALSE);
-#line 321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 317 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->visible;
-#line 321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 317 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 317 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3159 "SearchFilter.c"
+#line 3158 "SearchFilter.c"
 }
 
 
 void text_action_set_visible (TextAction* self, gboolean visible) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-#line 324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+#line 320 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_TEXT_ACTION (self));
-#line 325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->visible;
-#line 325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = visible;
-#line 325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_ != _tmp1_) {
-#line 3174 "SearchFilter.c"
-		gboolean _tmp2_ = FALSE;
-		gboolean _tmp3_ = FALSE;
-#line 326 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 3173 "SearchFilter.c"
+		gboolean _tmp2_;
+		gboolean _tmp3_;
+#line 322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = visible;
-#line 326 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		self->priv->visible = _tmp2_;
-#line 327 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = visible;
-#line 327 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		g_signal_emit_by_name (self, "visibility-changed", _tmp3_);
-#line 3185 "SearchFilter.c"
+#line 323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		g_signal_emit (self, text_action_signals[TEXT_ACTION_VISIBILITY_CHANGED_SIGNAL], 0, _tmp3_);
+#line 3184 "SearchFilter.c"
 	}
 }
 
 
 const gchar* text_action_get_value (TextAction* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
-#line 279 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	const gchar* _tmp0_;
+#line 275 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_TEXT_ACTION (self), NULL);
-#line 280 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 276 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->text;
-#line 280 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 276 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 280 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 276 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3201 "SearchFilter.c"
+#line 3200 "SearchFilter.c"
 }
 
 
 static void value_text_action_init (GValue* value) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	value->data[0].v_pointer = NULL;
-#line 3208 "SearchFilter.c"
+#line 3207 "SearchFilter.c"
 }
 
 
 static void value_text_action_free_value (GValue* value) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (value->data[0].v_pointer) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_unref (value->data[0].v_pointer);
-#line 3217 "SearchFilter.c"
+#line 3216 "SearchFilter.c"
 	}
 }
 
 
 static void value_text_action_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (src_value->data[0].v_pointer) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = text_action_ref (src_value->data[0].v_pointer);
-#line 3227 "SearchFilter.c"
+#line 3226 "SearchFilter.c"
 	} else {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3231 "SearchFilter.c"
+#line 3230 "SearchFilter.c"
 	}
 }
 
 
 static gpointer value_text_action_peek_pointer (const GValue* value) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 3239 "SearchFilter.c"
+#line 3238 "SearchFilter.c"
 }
 
 
 static gchar* value_text_action_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (collect_values[0].v_pointer) {
-#line 3246 "SearchFilter.c"
-		TextAction* object;
+#line 3245 "SearchFilter.c"
+		TextAction * object;
 		object = collect_values[0].v_pointer;
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3253 "SearchFilter.c"
+#line 3252 "SearchFilter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3257 "SearchFilter.c"
+#line 3256 "SearchFilter.c"
 		}
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = text_action_ref (object);
-#line 3261 "SearchFilter.c"
+#line 3260 "SearchFilter.c"
 	} else {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3265 "SearchFilter.c"
+#line 3264 "SearchFilter.c"
 	}
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 3269 "SearchFilter.c"
+#line 3268 "SearchFilter.c"
 }
 
 
 static gchar* value_text_action_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	TextAction** object_p;
+	TextAction ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!object_p) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3280 "SearchFilter.c"
+#line 3279 "SearchFilter.c"
 	}
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!value->data[0].v_pointer) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = NULL;
-#line 3286 "SearchFilter.c"
+#line 3285 "SearchFilter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3290 "SearchFilter.c"
+#line 3289 "SearchFilter.c"
 	} else {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = text_action_ref (value->data[0].v_pointer);
-#line 3294 "SearchFilter.c"
+#line 3293 "SearchFilter.c"
 	}
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 3298 "SearchFilter.c"
+#line 3297 "SearchFilter.c"
 }
 
 
 GParamSpec* param_spec_text_action (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecTextAction* spec;
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_TEXT_ACTION), NULL);
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return G_PARAM_SPEC (spec);
-#line 3312 "SearchFilter.c"
+#line 3311 "SearchFilter.c"
 }
 
 
 gpointer value_get_text_action (const GValue* value) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ACTION), NULL);
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 3321 "SearchFilter.c"
+#line 3320 "SearchFilter.c"
 }
 
 
 void value_set_text_action (GValue* value, gpointer v_object) {
-	TextAction* old;
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	TextAction * old;
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ACTION));
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	old = value->data[0].v_pointer;
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (v_object) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_TEXT_ACTION));
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = v_object;
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_ref (value->data[0].v_pointer);
-#line 3341 "SearchFilter.c"
+#line 3340 "SearchFilter.c"
 	} else {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3345 "SearchFilter.c"
+#line 3344 "SearchFilter.c"
 	}
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_unref (old);
-#line 3351 "SearchFilter.c"
+#line 3350 "SearchFilter.c"
 	}
 }
 
 
 void value_take_text_action (GValue* value, gpointer v_object) {
-	TextAction* old;
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	TextAction * old;
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ACTION));
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	old = value->data[0].v_pointer;
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (v_object) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_TEXT_ACTION));
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = v_object;
-#line 3370 "SearchFilter.c"
+#line 3369 "SearchFilter.c"
 	} else {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3374 "SearchFilter.c"
+#line 3373 "SearchFilter.c"
 	}
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_unref (old);
-#line 3380 "SearchFilter.c"
+#line 3379 "SearchFilter.c"
 	}
 }
 
 
 static void text_action_class_init (TextActionClass * klass) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	text_action_parent_class = g_type_class_peek_parent (klass);
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	((TextActionClass *) klass)->finalize = text_action_finalize;
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (TextActionPrivate));
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("text_changed", TYPE_TEXT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("sensitivity_changed", TYPE_TEXT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("visibility_changed", TYPE_TEXT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 3398 "SearchFilter.c"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	text_action_signals[TEXT_ACTION_TEXT_CHANGED_SIGNAL] = g_signal_new ("text-changed", TYPE_TEXT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	text_action_signals[TEXT_ACTION_SENSITIVITY_CHANGED_SIGNAL] = g_signal_new ("sensitivity-changed", TYPE_TEXT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	text_action_signals[TEXT_ACTION_VISIBILITY_CHANGED_SIGNAL] = g_signal_new ("visibility-changed", TYPE_TEXT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+#line 3397 "SearchFilter.c"
 }
 
 
 static void text_action_instance_init (TextAction * self) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = TEXT_ACTION_GET_PRIVATE (self);
-#line 284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 280 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->text = NULL;
-#line 285 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 281 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->sensitive = TRUE;
-#line 286 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 282 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->visible = TRUE;
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->ref_count = 1;
-#line 3413 "SearchFilter.c"
+#line 3412 "SearchFilter.c"
 }
 
 
-static void text_action_finalize (TextAction* obj) {
+static void text_action_finalize (TextAction * obj) {
 	TextAction * self;
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEXT_ACTION, TextAction);
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_destroy (self);
-#line 284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 280 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_free0 (self->priv->text);
-#line 3425 "SearchFilter.c"
+#line 3424 "SearchFilter.c"
 }
 
 
@@ -3440,1156 +3439,1156 @@ GType text_action_get_type (void) {
 
 
 gpointer text_action_ref (gpointer instance) {
-	TextAction* self;
+	TextAction * self;
 	self = instance;
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return instance;
-#line 3450 "SearchFilter.c"
+#line 3449 "SearchFilter.c"
 }
 
 
 void text_action_unref (gpointer instance) {
-	TextAction* self;
+	TextAction * self;
 	self = instance;
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		TEXT_ACTION_GET_CLASS (self)->finalize (self);
-#line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3463 "SearchFilter.c"
+#line 3462 "SearchFilter.c"
 	}
 }
 
 
 static void _search_filter_actions_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_action_radio ((SearchFilterActions*) self, action, parameter);
-#line 3471 "SearchFilter.c"
+#line 3470 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_rating_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_rating_changed ((SearchFilterActions*) self, action, value);
-#line 3478 "SearchFilter.c"
+#line 3477 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_action_toggle ((SearchFilterActions*) self, action, parameter);
-#line 3485 "SearchFilter.c"
+#line 3484 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_flagged_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_flagged_toggled ((SearchFilterActions*) self, action, value);
-#line 3492 "SearchFilter.c"
+#line 3491 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_photos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_photos_toggled ((SearchFilterActions*) self, action, value);
-#line 3499 "SearchFilter.c"
+#line 3498 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_videos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_videos_toggled ((SearchFilterActions*) self, action, value);
-#line 3506 "SearchFilter.c"
+#line 3505 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_raw_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_raw_toggled ((SearchFilterActions*) self, action, value);
-#line 3513 "SearchFilter.c"
+#line 3512 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_text_changed_text_action_text_changed (TextAction* _sender, const gchar* text, gpointer self) {
-#line 410 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 406 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_text_changed ((SearchFilterActions*) self, _sender, text);
-#line 3520 "SearchFilter.c"
+#line 3519 "SearchFilter.c"
 }
 
 
 SearchFilterActions* search_filter_actions_construct (GType object_type) {
 	SearchFilterActions* self = NULL;
-	TextAction* _tmp0_ = NULL;
-	TextAction* _tmp1_ = NULL;
-#line 406 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	TextAction* _tmp0_;
+	TextAction* _tmp1_;
+#line 402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterActions*) g_type_create_instance (object_type);
-#line 408 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 404 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_register (self);
-#line 410 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 406 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = search_filter_actions_get_text (self);
-#line 410 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 406 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_;
-#line 410 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect (_tmp1_, "text-changed", (GCallback) _search_filter_actions_on_text_changed_text_action_text_changed, self);
 #line 406 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_connect (_tmp1_, "text-changed", (GCallback) _search_filter_actions_on_text_changed_text_action_text_changed, self);
+#line 402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 3540 "SearchFilter.c"
+#line 3539 "SearchFilter.c"
 }
 
 
 SearchFilterActions* search_filter_actions_new (void) {
-#line 406 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_actions_construct (TYPE_SEARCH_FILTER_ACTIONS);
-#line 3547 "SearchFilter.c"
+#line 3546 "SearchFilter.c"
 }
 
 
 SearchFilterCriteria search_filter_actions_get_criteria (SearchFilterActions* self) {
 	SearchFilterCriteria result = 0;
-	SearchFilterCriteria _tmp0_ = 0;
-#line 413 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SearchFilterCriteria _tmp0_;
+#line 409 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), 0);
-#line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 410 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->criteria;
-#line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 410 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 410 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3562 "SearchFilter.c"
+#line 3561 "SearchFilter.c"
 }
 
 
 GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, int* result_length1) {
 	GActionEntry* result = NULL;
-	GActionEntry* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-#line 417 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GActionEntry* _tmp0_;
+	gint _tmp0__length1;
+#line 413 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), NULL);
-#line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = SEARCH_FILTER_ACTIONS_entries;
-#line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0__length1 = G_N_ELEMENTS (SEARCH_FILTER_ACTIONS_entries);
-#line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (result_length1) {
-#line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*result_length1 = _tmp0__length1;
-#line 3580 "SearchFilter.c"
+#line 3579 "SearchFilter.c"
 	}
-#line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3586 "SearchFilter.c"
+#line 3585 "SearchFilter.c"
 }
 
 
 GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, const gchar* name) {
 	GSimpleAction* result = NULL;
 	LibraryWindow* lw = NULL;
-	AppWindow* _tmp0_ = NULL;
-	LibraryWindow* _tmp1_ = NULL;
-	LibraryWindow* _tmp2_ = NULL;
-#line 421 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	AppWindow* _tmp0_;
+	LibraryWindow* _tmp1_;
+	LibraryWindow* _tmp2_;
+#line 417 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), NULL);
-#line 421 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 417 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_WINDOW) ? ((LibraryWindow*) _tmp0_) : NULL;
-#line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_ == NULL) {
-#line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp0_);
-#line 3608 "SearchFilter.c"
+#line 3607 "SearchFilter.c"
 	}
-#line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	lw = _tmp1_;
-#line 423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 419 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = lw;
-#line 423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 419 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_ != NULL) {
-#line 3616 "SearchFilter.c"
-		LibraryWindow* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		GAction* _tmp5_ = NULL;
-#line 424 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 3615 "SearchFilter.c"
+		LibraryWindow* _tmp3_;
+		const gchar* _tmp4_;
+		GAction* _tmp5_;
+#line 420 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = lw;
-#line 424 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 420 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = name;
-#line 424 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 420 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_action_map_get_type (), GActionMap), _tmp4_);
-#line 424 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 420 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp5_) : NULL;
-#line 424 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 420 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (lw);
-#line 424 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 420 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 3632 "SearchFilter.c"
+#line 3631 "SearchFilter.c"
 	}
-#line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = NULL;
-#line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (lw);
-#line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3640 "SearchFilter.c"
+#line 3639 "SearchFilter.c"
 }
 
 
 void search_filter_actions_set_action_sensitive (SearchFilterActions* self, const gchar* name, gboolean sensitive) {
 	GSimpleAction* action = NULL;
-	const gchar* _tmp0_ = NULL;
-	GSimpleAction* _tmp1_ = NULL;
-	GSimpleAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
-#line 431 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	const gchar* _tmp0_;
+	GSimpleAction* _tmp1_;
+	GSimpleAction* _tmp2_;
+	GSimpleAction* _tmp3_;
+#line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 431 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (name != NULL);
-#line 432 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 428 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = name;
-#line 432 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 428 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = search_filter_actions_get_action (self, _tmp0_);
-#line 432 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 428 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 432 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 428 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	action = _tmp2_;
-#line 433 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 429 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = action;
-#line 433 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 429 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_ != NULL) {
-#line 3666 "SearchFilter.c"
-		GSimpleAction* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-#line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 3665 "SearchFilter.c"
+		GSimpleAction* _tmp4_;
+		gboolean _tmp5_;
+#line 430 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = action;
-#line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 430 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = sensitive;
-#line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 430 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 3675 "SearchFilter.c"
+#line 3674 "SearchFilter.c"
 	}
-#line 431 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (action);
-#line 3679 "SearchFilter.c"
+#line 3678 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new32 (gboolean value) {
-#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 435 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3686 "SearchFilter.c"
+#line 3685 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new33 (gboolean value) {
-#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 436 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3693 "SearchFilter.c"
+#line 3692 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new34 (gboolean value) {
-#line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 437 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3700 "SearchFilter.c"
+#line 3699 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new35 (gboolean value) {
-#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3707 "SearchFilter.c"
+#line 3706 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new36 (gchar* value) {
-#line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 3714 "SearchFilter.c"
+#line 3713 "SearchFilter.c"
 }
 
 
 void search_filter_actions_reset (SearchFilterActions* self) {
-	GSimpleAction* _tmp0_ = NULL;
-	GSimpleAction* _tmp1_ = NULL;
-	GVariant* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
-	GSimpleAction* _tmp6_ = NULL;
-	GSimpleAction* _tmp7_ = NULL;
-	GVariant* _tmp8_ = NULL;
-	GSimpleAction* _tmp9_ = NULL;
-	GSimpleAction* _tmp10_ = NULL;
-	GVariant* _tmp11_ = NULL;
+	GSimpleAction* _tmp0_;
+	GSimpleAction* _tmp1_;
+	GVariant* _tmp2_;
+	GSimpleAction* _tmp3_;
+	GSimpleAction* _tmp4_;
+	GVariant* _tmp5_;
+	GSimpleAction* _tmp6_;
+	GSimpleAction* _tmp7_;
+	GVariant* _tmp8_;
+	GSimpleAction* _tmp9_;
+	GSimpleAction* _tmp10_;
+	GVariant* _tmp11_;
 	GVariant* v = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	GVariant* _tmp14_ = NULL;
-	GVariant* _tmp15_ = NULL;
-	GSimpleAction* _tmp16_ = NULL;
-	GSimpleAction* _tmp17_ = NULL;
-	TextAction* _tmp18_ = NULL;
-	TextAction* _tmp19_ = NULL;
-#line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	GVariant* _tmp14_;
+	GVariant* _tmp15_;
+	GSimpleAction* _tmp16_;
+	GSimpleAction* _tmp17_;
+	TextAction* _tmp18_;
+	TextAction* _tmp19_;
+#line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 435 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = search_filter_actions_get_flagged (self);
-#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 435 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_;
-#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 435 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = _variant_new32 (FALSE);
-#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 435 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (_tmp1_, "change-state", _tmp2_);
-#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 435 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp2_);
-#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 436 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = search_filter_actions_get_photos (self);
-#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 436 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = _tmp3_;
-#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 436 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = _variant_new33 (FALSE);
-#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 436 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (_tmp4_, "change-state", _tmp5_);
-#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 436 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp5_);
-#line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 437 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = search_filter_actions_get_raw (self);
-#line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 437 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = _tmp6_;
-#line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 437 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = _variant_new34 (FALSE);
-#line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 437 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (_tmp7_, "change-state", _tmp8_);
-#line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 437 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp8_);
-#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = search_filter_actions_get_videos (self);
-#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = _tmp9_;
-#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = _variant_new35 (FALSE);
-#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (_tmp10_, "change-state", _tmp11_);
-#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp11_);
-#line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = g_strdup_printf ("%d", (gint) RATING_FILTER_UNRATED_OR_HIGHER);
-#line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp13_ = _tmp12_;
-#line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp14_ = _variant_new36 (_tmp13_);
-#line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp15_ = _tmp14_;
-#line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_free0 (_tmp13_);
-#line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	v = _tmp15_;
-#line 444 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp16_ = search_filter_actions_get_rating (self);
-#line 444 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp17_ = _tmp16_;
-#line 444 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (_tmp17_, "change-state", v);
-#line 446 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp18_ = search_filter_actions_get_text (self);
-#line 446 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp19_ = _tmp18_;
-#line 446 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	text_action_set_text (_tmp19_, NULL);
-#line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (v);
-#line 3808 "SearchFilter.c"
+#line 3807 "SearchFilter.c"
 }
 
 
 void search_filter_actions_set_sensitive_for_search_criteria (SearchFilterActions* self, SearchFilterCriteria criteria) {
-	SearchFilterCriteria _tmp0_ = 0;
-#line 449 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SearchFilterCriteria _tmp0_;
+#line 445 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 450 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 446 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = criteria;
-#line 450 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 446 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->criteria = _tmp0_;
-#line 451 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 447 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_update_sensitivities (self);
-#line 454 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "criteria-changed");
-#line 3824 "SearchFilter.c"
+#line 450 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_CRITERIA_CHANGED_SIGNAL], 0);
+#line 3823 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_media_tracker_updated_core_tracker_updated (CoreTracker* _sender, gpointer self) {
-#line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_media_tracker_updated ((SearchFilterActions*) self, _sender);
-#line 3831 "SearchFilter.c"
+#line 3830 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_camera_tracker_updated_core_tracker_updated (CoreTracker* _sender, gpointer self) {
-#line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_camera_tracker_updated ((SearchFilterActions*) self, _sender);
-#line 3838 "SearchFilter.c"
+#line 3837 "SearchFilter.c"
 }
 
 
 void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Page* old_page, Page* new_page) {
 	CheckerboardPage* old_tracked_page = NULL;
-	Page* _tmp0_ = NULL;
-	CheckerboardPage* _tmp1_ = NULL;
-	CheckerboardPage* _tmp2_ = NULL;
+	Page* _tmp0_;
+	CheckerboardPage* _tmp1_;
+	CheckerboardPage* _tmp2_;
 	CheckerboardPage* new_tracked_page = NULL;
-	Page* _tmp11_ = NULL;
-	CheckerboardPage* _tmp12_ = NULL;
-	CheckerboardPage* _tmp13_ = NULL;
-#line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	Page* _tmp11_;
+	CheckerboardPage* _tmp12_;
+	CheckerboardPage* _tmp13_;
+#line 453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 454 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = old_page;
-#line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 454 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp0_) : NULL);
-#line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 454 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	old_tracked_page = _tmp1_;
-#line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 455 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = old_tracked_page;
-#line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 455 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_ != NULL) {
-#line 3867 "SearchFilter.c"
+#line 3866 "SearchFilter.c"
 		CoreViewTracker* tracker = NULL;
-		CheckerboardPage* _tmp3_ = NULL;
-		CoreViewTracker* _tmp4_ = NULL;
-		CoreViewTracker* _tmp5_ = NULL;
-#line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		CheckerboardPage* _tmp3_;
+		CoreViewTracker* _tmp4_;
+		CoreViewTracker* _tmp5_;
+#line 456 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = old_tracked_page;
-#line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 456 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = checkerboard_page_get_view_tracker (_tmp3_);
-#line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 456 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		tracker = _tmp4_;
-#line 461 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = tracker;
-#line 461 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_MEDIA_VIEW_TRACKER)) {
-#line 3882 "SearchFilter.c"
-			CoreViewTracker* _tmp6_ = NULL;
-			guint _tmp7_ = 0U;
-#line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 3881 "SearchFilter.c"
+			CoreViewTracker* _tmp6_;
+			guint _tmp7_;
+#line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = tracker;
-#line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_parse_name ("updated", CORE_TYPE_TRACKER, &_tmp7_, NULL, FALSE);
-#line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, CORE_TYPE_TRACKER, CoreTracker), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_actions_on_media_tracker_updated_core_tracker_updated, self);
-#line 3891 "SearchFilter.c"
+#line 3890 "SearchFilter.c"
 		} else {
-			CoreViewTracker* _tmp8_ = NULL;
-#line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			CoreViewTracker* _tmp8_;
+#line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp8_ = tracker;
-#line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_CAMERA_VIEW_TRACKER)) {
-#line 3898 "SearchFilter.c"
-				CoreViewTracker* _tmp9_ = NULL;
-				guint _tmp10_ = 0U;
-#line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 3897 "SearchFilter.c"
+				CoreViewTracker* _tmp9_;
+				guint _tmp10_;
+#line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp9_ = tracker;
-#line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("updated", CORE_TYPE_TRACKER, &_tmp10_, NULL, FALSE);
-#line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, CORE_TYPE_TRACKER, CoreTracker), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _search_filter_actions_on_camera_tracker_updated_core_tracker_updated, self);
-#line 3907 "SearchFilter.c"
+#line 3906 "SearchFilter.c"
 			}
 		}
-#line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 455 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_core_tracker_unref0 (tracker);
-#line 3912 "SearchFilter.c"
+#line 3911 "SearchFilter.c"
 	}
-#line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = new_page;
-#line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp11_) : NULL);
-#line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	new_tracked_page = _tmp12_;
-#line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp13_ = new_tracked_page;
-#line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp13_ != NULL) {
-#line 3924 "SearchFilter.c"
+#line 3923 "SearchFilter.c"
 		CoreViewTracker* tracker = NULL;
-		CheckerboardPage* _tmp14_ = NULL;
-		CoreViewTracker* _tmp15_ = NULL;
-		CoreViewTracker* _tmp16_ = NULL;
-#line 469 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		CheckerboardPage* _tmp14_;
+		CoreViewTracker* _tmp15_;
+		CoreViewTracker* _tmp16_;
+#line 465 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		self->priv->can_filter_by_stars = TRUE;
-#line 471 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp14_ = new_tracked_page;
-#line 471 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp15_ = checkerboard_page_get_view_tracker (_tmp14_);
-#line 471 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		tracker = _tmp15_;
-#line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp16_ = tracker;
-#line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_MEDIA_VIEW_TRACKER)) {
-#line 3941 "SearchFilter.c"
-			CoreViewTracker* _tmp17_ = NULL;
-			CoreViewTracker* _tmp18_ = NULL;
-#line 473 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 3940 "SearchFilter.c"
+			CoreViewTracker* _tmp17_;
+			CoreViewTracker* _tmp18_;
+#line 469 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp17_ = tracker;
-#line 473 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 469 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, CORE_TYPE_TRACKER, CoreTracker), "updated", (GCallback) _search_filter_actions_on_media_tracker_updated_core_tracker_updated, self);
-#line 474 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 470 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp18_ = tracker;
-#line 474 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 470 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_actions_on_media_tracker_updated (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, CORE_TYPE_TRACKER, CoreTracker));
-#line 476 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_core_tracker_unref0 (tracker);
-#line 476 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (new_tracked_page);
-#line 476 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (old_tracked_page);
-#line 476 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return;
-#line 3960 "SearchFilter.c"
+#line 3959 "SearchFilter.c"
 		} else {
-			CoreViewTracker* _tmp19_ = NULL;
-#line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			CoreViewTracker* _tmp19_;
+#line 473 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp19_ = tracker;
-#line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 473 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_CAMERA_VIEW_TRACKER)) {
-#line 3967 "SearchFilter.c"
-				CoreViewTracker* _tmp20_ = NULL;
-				CoreViewTracker* _tmp21_ = NULL;
-#line 478 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 3966 "SearchFilter.c"
+				CoreViewTracker* _tmp20_;
+				CoreViewTracker* _tmp21_;
+#line 474 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp20_ = tracker;
-#line 478 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 474 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, CORE_TYPE_TRACKER, CoreTracker), "updated", (GCallback) _search_filter_actions_on_camera_tracker_updated_core_tracker_updated, self);
-#line 479 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 475 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp21_ = tracker;
-#line 479 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 475 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				search_filter_actions_on_camera_tracker_updated (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, CORE_TYPE_TRACKER, CoreTracker));
-#line 481 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_core_tracker_unref0 (tracker);
-#line 481 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (new_tracked_page);
-#line 481 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (old_tracked_page);
-#line 481 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				return;
-#line 3986 "SearchFilter.c"
+#line 3985 "SearchFilter.c"
 			}
 		}
-#line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_core_tracker_unref0 (tracker);
-#line 3991 "SearchFilter.c"
+#line 3990 "SearchFilter.c"
 	}
-#line 486 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 482 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_flagged = FALSE;
-#line 487 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 483 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_photos = FALSE;
-#line 488 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 484 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_videos = FALSE;
-#line 489 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 485 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_raw = FALSE;
-#line 490 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 486 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->can_filter_by_stars = FALSE;
-#line 492 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 488 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_update_sensitivities (self);
-#line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (new_tracked_page);
-#line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (old_tracked_page);
-#line 4009 "SearchFilter.c"
+#line 4008 "SearchFilter.c"
 }
 
 
 static gpointer _core_tracker_ref0 (gpointer self) {
-#line 496 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 492 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 4016 "SearchFilter.c"
+#line 4015 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_on_media_tracker_updated (SearchFilterActions* self, CoreTracker* t) {
 	MediaViewTracker* tracker = NULL;
-	CoreTracker* _tmp0_ = NULL;
-	MediaViewTracker* _tmp1_ = NULL;
-	MediaAccumulator* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	MediaAccumulator* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	MediaAccumulator* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	MediaAccumulator* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-#line 495 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	CoreTracker* _tmp0_;
+	MediaViewTracker* _tmp1_;
+	MediaAccumulator* _tmp2_;
+	gint _tmp3_;
+	MediaAccumulator* _tmp4_;
+	gint _tmp5_;
+	MediaAccumulator* _tmp6_;
+	gint _tmp7_;
+	MediaAccumulator* _tmp8_;
+	gint _tmp9_;
+#line 491 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 495 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 491 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (CORE_IS_TRACKER (t));
-#line 496 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 492 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = t;
-#line 496 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 492 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_VIEW_TRACKER, MediaViewTracker));
-#line 496 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 492 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	tracker = _tmp1_;
-#line 498 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 494 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = tracker->all;
-#line 498 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 494 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _tmp2_->flagged;
-#line 498 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 494 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_flagged = _tmp3_ > 0;
-#line 499 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 495 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = tracker->all;
-#line 499 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 495 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = _tmp4_->photos;
-#line 499 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 495 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_photos = _tmp5_ > 0;
-#line 500 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 496 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = tracker->all;
-#line 500 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 496 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = _tmp6_->videos;
-#line 500 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 496 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_videos = _tmp7_ > 0;
-#line 501 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 497 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = tracker->all;
-#line 501 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 497 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = _tmp8_->raw;
-#line 501 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 497 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_raw = _tmp9_ > 0;
-#line 503 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 499 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_update_sensitivities (self);
-#line 495 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 491 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_core_tracker_unref0 (tracker);
-#line 4070 "SearchFilter.c"
+#line 4069 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_on_camera_tracker_updated (SearchFilterActions* self, CoreTracker* t) {
 	CameraViewTracker* tracker = NULL;
-	CoreTracker* _tmp0_ = NULL;
-	CameraViewTracker* _tmp1_ = NULL;
-	CameraAccumulator* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	CameraAccumulator* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	CameraAccumulator* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-#line 506 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	CoreTracker* _tmp0_;
+	CameraViewTracker* _tmp1_;
+	CameraAccumulator* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	CameraAccumulator* _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	CameraAccumulator* _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+#line 502 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 506 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 502 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (CORE_IS_TRACKER (t));
-#line 507 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 503 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = t;
-#line 507 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 503 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_CAMERA_VIEW_TRACKER, CameraViewTracker));
-#line 507 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 503 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	tracker = _tmp1_;
-#line 509 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 505 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_flagged = FALSE;
-#line 510 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 506 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = tracker->all;
-#line 510 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 506 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = camera_accumulator_get_photos (_tmp2_);
-#line 510 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 506 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = _tmp3_;
-#line 510 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 506 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_photos = _tmp4_ > 0;
-#line 511 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 507 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = tracker->all;
-#line 511 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 507 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = camera_accumulator_get_videos (_tmp5_);
-#line 511 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 507 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = _tmp6_;
-#line 511 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 507 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_videos = _tmp7_ > 0;
-#line 512 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 508 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = tracker->all;
-#line 512 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 508 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = camera_accumulator_get_raw (_tmp8_);
-#line 512 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 508 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = _tmp9_;
-#line 512 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 508 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_raw = _tmp10_ > 0;
-#line 514 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 510 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_update_sensitivities (self);
-#line 506 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 502 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_core_tracker_unref0 (tracker);
-#line 4127 "SearchFilter.c"
+#line 4126 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_update_sensitivities (SearchFilterActions* self) {
 	gboolean allow_ratings = FALSE;
-	SearchFilterCriteria _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
-	TextAction* _tmp2_ = NULL;
-	TextAction* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-#line 517 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SearchFilterCriteria _tmp0_;
+	gboolean _tmp1_;
+	TextAction* _tmp2_;
+	TextAction* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp7_;
+#line 513 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 518 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 514 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->criteria;
-#line 518 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 514 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	allow_ratings = (SEARCH_FILTER_CRITERIA_RATING & _tmp0_) != 0;
-#line 519 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 515 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->priv->can_filter_by_stars;
-#line 519 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 515 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_set_action_sensitive (self, "display.rating", allow_ratings & _tmp1_);
-#line 523 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 519 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search_filter_actions_get_text (self);
-#line 523 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 519 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _tmp2_;
-#line 523 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 519 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	text_action_set_sensitive (_tmp3_, TRUE);
-#line 525 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 521 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->has_photos;
-#line 525 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 521 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->priv->has_videos;
-#line 525 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 521 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = self->priv->has_raw;
-#line 525 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 521 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = self->priv->has_flagged;
-#line 525 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "media-context-changed", _tmp4_, _tmp5_, _tmp6_, _tmp7_);
-#line 4167 "SearchFilter.c"
+#line 521 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_MEDIA_CONTEXT_CHANGED_SIGNAL], 0, _tmp4_, _tmp5_, _tmp6_, _tmp7_);
+#line 4166 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_on_text_changed (SearchFilterActions* self, TextAction* action, const gchar* text) {
-	const gchar* _tmp0_ = NULL;
-#line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	const gchar* _tmp0_;
+#line 524 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 524 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_TEXT_ACTION (action));
-#line 529 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 525 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = text;
-#line 529 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "text-changed", _tmp0_);
-#line 4181 "SearchFilter.c"
+#line 525 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_TEXT_CHANGED_SIGNAL], 0, _tmp0_);
+#line 4180 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_on_action_radio (SearchFilterActions* self, GSimpleAction* action, GVariant* parameter) {
-	GSimpleAction* _tmp0_ = NULL;
-	GVariant* _tmp1_ = NULL;
-#line 540 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GSimpleAction* _tmp0_;
+	GVariant* _tmp1_;
+#line 536 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 540 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 536 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 542 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 538 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = action;
-#line 542 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 538 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = parameter;
-#line 542 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 538 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (_tmp0_, "change-state", _tmp1_);
-#line 4198 "SearchFilter.c"
+#line 4197 "SearchFilter.c"
 }
 
 
 static gboolean _variant_get37 (GVariant* value) {
-#line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 543 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_get_boolean (value);
-#line 4205 "SearchFilter.c"
+#line 4204 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new38 (gboolean value) {
-#line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 544 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4212 "SearchFilter.c"
+#line 4211 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_on_action_toggle (SearchFilterActions* self, GSimpleAction* action, GVariant* parameter) {
 	gboolean state = FALSE;
-	GSimpleAction* _tmp0_ = NULL;
-	GVariant* _tmp1_ = NULL;
-	GVariant* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	GSimpleAction* _tmp5_ = NULL;
-	GVariant* _tmp6_ = NULL;
-#line 545 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GSimpleAction* _tmp0_;
+	GVariant* _tmp1_;
+	GVariant* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	GSimpleAction* _tmp5_;
+	GVariant* _tmp6_;
+#line 541 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 545 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 541 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 543 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = action;
-#line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 543 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_action_get_type (), GAction));
-#line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 543 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = _tmp1_;
-#line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 543 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _variant_get37 (_tmp2_);
-#line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 543 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = _tmp3_;
-#line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 543 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp2_);
-#line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 543 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	state = _tmp4_;
-#line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 544 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = action;
-#line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 544 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = _variant_new38 (!state);
-#line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 544 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_);
-#line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 544 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp6_);
-#line 4251 "SearchFilter.c"
+#line 4250 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_register (SearchFilterActions* self) {
-	TextAction* _tmp0_ = NULL;
-#line 551 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	TextAction* _tmp0_;
+#line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 552 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = text_action_new (NULL);
-#line 552 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_text_action_unref0 (self->priv->_text);
-#line 552 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_text = _tmp0_;
-#line 4265 "SearchFilter.c"
+#line 4264 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_on_rating_changed (SearchFilterActions* self, GSimpleAction* action, GVariant* value) {
-	GVariant* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GSimpleAction* _tmp2_ = NULL;
-	GVariant* _tmp3_ = NULL;
-	GVariant* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	GVariant* _tmp0_;
+	const gchar* _tmp1_;
+	GSimpleAction* _tmp2_;
+	GVariant* _tmp3_;
+	GVariant* _tmp4_;
+	const gchar* _tmp5_;
+	gboolean _tmp6_;
 	RatingFilter filter = 0;
-	GVariant* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	GSimpleAction* _tmp10_ = NULL;
-	GVariant* _tmp11_ = NULL;
-	RatingFilter _tmp12_ = 0;
-#line 555 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GVariant* _tmp7_;
+	const gchar* _tmp8_;
+	gint _tmp9_;
+	GSimpleAction* _tmp10_;
+	GVariant* _tmp11_;
+	RatingFilter _tmp12_;
+#line 551 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 555 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 551 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 555 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 551 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (value != NULL);
-#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = value;
-#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = g_variant_get_string (_tmp0_, NULL);
-#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = action;
-#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_action_get_type (), GAction));
-#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = _tmp3_;
-#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = g_variant_get_string (_tmp4_, NULL);
-#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = g_strcmp0 (_tmp1_, _tmp5_) == 0;
-#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp4_);
-#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp6_) {
-#line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 554 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 4310 "SearchFilter.c"
+#line 4309 "SearchFilter.c"
 	}
-#line 560 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 556 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = value;
-#line 560 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 556 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = g_variant_get_string (_tmp7_, NULL);
-#line 560 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 556 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = atoi (_tmp8_);
-#line 560 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 556 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	filter = (RatingFilter) _tmp9_;
-#line 561 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = action;
-#line 561 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = value;
-#line 561 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_simple_action_set_state (_tmp10_, _tmp11_);
-#line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = filter;
-#line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "rating-changed", _tmp12_);
-#line 4330 "SearchFilter.c"
+#line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_RATING_CHANGED_SIGNAL], 0, _tmp12_);
+#line 4329 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_on_flagged_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value) {
-	GSimpleAction* _tmp0_ = NULL;
-	GVariant* _tmp1_ = NULL;
-	GVariant* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GSimpleAction* _tmp0_;
+	GVariant* _tmp1_;
+	GVariant* _tmp2_;
+	gboolean _tmp3_;
+#line 561 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 561 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 561 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (value != NULL);
-#line 567 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 563 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = action;
-#line 567 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 563 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = value;
-#line 567 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 563 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_simple_action_set_state (_tmp0_, _tmp1_);
-#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 564 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = value;
-#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 564 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
-#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "flagged-toggled", _tmp3_);
-#line 4357 "SearchFilter.c"
+#line 564 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_FLAGGED_TOGGLED_SIGNAL], 0, _tmp3_);
+#line 4356 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_on_photos_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value) {
-	GSimpleAction* _tmp0_ = NULL;
-	GVariant* _tmp1_ = NULL;
-	GVariant* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GSimpleAction* _tmp0_;
+	GVariant* _tmp1_;
+	GVariant* _tmp2_;
+	gboolean _tmp3_;
+#line 567 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 567 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 567 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (value != NULL);
-#line 573 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 569 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = action;
-#line 573 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 569 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = value;
-#line 573 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 569 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_simple_action_set_state (_tmp0_, _tmp1_);
-#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 570 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = value;
-#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 570 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
-#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "photos-toggled", _tmp3_);
-#line 4384 "SearchFilter.c"
+#line 570 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_PHOTOS_TOGGLED_SIGNAL], 0, _tmp3_);
+#line 4383 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_on_videos_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value) {
-	GSimpleAction* _tmp0_ = NULL;
-	GVariant* _tmp1_ = NULL;
-	GVariant* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GSimpleAction* _tmp0_;
+	GVariant* _tmp1_;
+	GVariant* _tmp2_;
+	gboolean _tmp3_;
+#line 573 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 573 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 573 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (value != NULL);
-#line 579 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 575 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = action;
-#line 579 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 575 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = value;
-#line 579 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 575 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_simple_action_set_state (_tmp0_, _tmp1_);
-#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 576 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = value;
-#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 576 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
-#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "videos-toggled", _tmp3_);
-#line 4411 "SearchFilter.c"
+#line 576 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_VIDEOS_TOGGLED_SIGNAL], 0, _tmp3_);
+#line 4410 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_on_raw_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value) {
-	GSimpleAction* _tmp0_ = NULL;
-	GVariant* _tmp1_ = NULL;
-	GVariant* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GSimpleAction* _tmp0_;
+	GVariant* _tmp1_;
+	GVariant* _tmp2_;
+	gboolean _tmp3_;
+#line 579 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 579 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 579 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (value != NULL);
-#line 585 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 581 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = action;
-#line 585 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 581 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = value;
-#line 585 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 581 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_simple_action_set_state (_tmp0_, _tmp1_);
-#line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 582 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = value;
-#line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 582 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
-#line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "raw-toggled", _tmp3_);
-#line 4438 "SearchFilter.c"
+#line 582 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_RAW_TOGGLED_SIGNAL], 0, _tmp3_);
+#line 4437 "SearchFilter.c"
 }
 
 
 gboolean search_filter_actions_get_has_photos (SearchFilterActions* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 589 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gboolean _tmp0_;
+#line 585 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), FALSE);
-#line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->has_photos;
-#line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4453 "SearchFilter.c"
+#line 4452 "SearchFilter.c"
 }
 
 
 gboolean search_filter_actions_get_has_videos (SearchFilterActions* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 593 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gboolean _tmp0_;
+#line 589 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), FALSE);
-#line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->has_videos;
-#line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4468 "SearchFilter.c"
+#line 4467 "SearchFilter.c"
 }
 
 
 gboolean search_filter_actions_get_has_raw (SearchFilterActions* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 597 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gboolean _tmp0_;
+#line 593 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), FALSE);
-#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->has_raw;
-#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4483 "SearchFilter.c"
+#line 4482 "SearchFilter.c"
 }
 
 
 gboolean search_filter_actions_get_has_flagged (SearchFilterActions* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 601 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gboolean _tmp0_;
+#line 597 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), FALSE);
-#line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->has_flagged;
-#line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4498 "SearchFilter.c"
+#line 4497 "SearchFilter.c"
 }
 
 
 GSimpleAction* search_filter_actions_get_flagged (SearchFilterActions* self) {
 	GSimpleAction* result;
-	GSimpleAction* _tmp0_ = NULL;
-#line 335 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GSimpleAction* _tmp0_;
+#line 331 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), NULL);
-#line 336 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 332 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = search_filter_actions_get_action (self, "display.flagged");
-#line 336 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 332 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 336 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 332 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4513 "SearchFilter.c"
+#line 4512 "SearchFilter.c"
 }
 
 
 GSimpleAction* search_filter_actions_get_photos (SearchFilterActions* self) {
 	GSimpleAction* result;
-	GSimpleAction* _tmp0_ = NULL;
-#line 341 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GSimpleAction* _tmp0_;
+#line 337 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), NULL);
-#line 342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 338 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = search_filter_actions_get_action (self, "display.photos");
-#line 342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 338 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 338 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4528 "SearchFilter.c"
+#line 4527 "SearchFilter.c"
 }
 
 
 GSimpleAction* search_filter_actions_get_videos (SearchFilterActions* self) {
 	GSimpleAction* result;
-	GSimpleAction* _tmp0_ = NULL;
-#line 347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GSimpleAction* _tmp0_;
+#line 343 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), NULL);
-#line 348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 344 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = search_filter_actions_get_action (self, "display.videos");
-#line 348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 344 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 344 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4543 "SearchFilter.c"
+#line 4542 "SearchFilter.c"
 }
 
 
 GSimpleAction* search_filter_actions_get_raw (SearchFilterActions* self) {
 	GSimpleAction* result;
-	GSimpleAction* _tmp0_ = NULL;
-#line 353 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GSimpleAction* _tmp0_;
+#line 349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), NULL);
-#line 354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = search_filter_actions_get_action (self, "display.raw");
-#line 354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4558 "SearchFilter.c"
+#line 4557 "SearchFilter.c"
 }
 
 
 GSimpleAction* search_filter_actions_get_rating (SearchFilterActions* self) {
 	GSimpleAction* result;
-	GSimpleAction* _tmp0_ = NULL;
-#line 359 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GSimpleAction* _tmp0_;
+#line 355 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), NULL);
-#line 360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 356 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = search_filter_actions_get_action (self, "display.rating");
-#line 360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 356 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 356 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4573 "SearchFilter.c"
+#line 4572 "SearchFilter.c"
 }
 
 
 TextAction* search_filter_actions_get_text (SearchFilterActions* self) {
 	TextAction* result;
-	TextAction* _tmp0_ = NULL;
-	TextAction* _tmp1_ = NULL;
-#line 365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	TextAction* _tmp0_;
+	TextAction* _tmp1_;
+#line 361 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), NULL);
-#line 366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 362 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->_text;
-#line 366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 362 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_vala_assert (_tmp0_ != NULL, "_text != null");
-#line 367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 363 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->priv->_text;
-#line 367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 363 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp1_;
-#line 367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 363 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4593 "SearchFilter.c"
+#line 4592 "SearchFilter.c"
 }
 
 
@@ -4600,275 +4599,275 @@ static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClos
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (n_param_values == 5);
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		data1 = closure->data;
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4612 "SearchFilter.c"
+#line 4611 "SearchFilter.c"
 	} else {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		data2 = closure->data;
-#line 4618 "SearchFilter.c"
+#line 4617 "SearchFilter.c"
 	}
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	callback = (GMarshalFunc_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	callback (data1, g_value_get_boolean (param_values + 1), g_value_get_boolean (param_values + 2), g_value_get_boolean (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 4624 "SearchFilter.c"
+#line 4623 "SearchFilter.c"
 }
 
 
 static void value_search_filter_actions_init (GValue* value) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	value->data[0].v_pointer = NULL;
-#line 4631 "SearchFilter.c"
+#line 4630 "SearchFilter.c"
 }
 
 
 static void value_search_filter_actions_free_value (GValue* value) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (value->data[0].v_pointer) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_unref (value->data[0].v_pointer);
-#line 4640 "SearchFilter.c"
+#line 4639 "SearchFilter.c"
 	}
 }
 
 
 static void value_search_filter_actions_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (src_value->data[0].v_pointer) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = search_filter_actions_ref (src_value->data[0].v_pointer);
-#line 4650 "SearchFilter.c"
+#line 4649 "SearchFilter.c"
 	} else {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4654 "SearchFilter.c"
+#line 4653 "SearchFilter.c"
 	}
 }
 
 
 static gpointer value_search_filter_actions_peek_pointer (const GValue* value) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 4662 "SearchFilter.c"
+#line 4661 "SearchFilter.c"
 }
 
 
 static gchar* value_search_filter_actions_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (collect_values[0].v_pointer) {
-#line 4669 "SearchFilter.c"
-		SearchFilterActions* object;
+#line 4668 "SearchFilter.c"
+		SearchFilterActions * object;
 		object = collect_values[0].v_pointer;
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4676 "SearchFilter.c"
+#line 4675 "SearchFilter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4680 "SearchFilter.c"
+#line 4679 "SearchFilter.c"
 		}
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = search_filter_actions_ref (object);
-#line 4684 "SearchFilter.c"
+#line 4683 "SearchFilter.c"
 	} else {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4688 "SearchFilter.c"
+#line 4687 "SearchFilter.c"
 	}
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 4692 "SearchFilter.c"
+#line 4691 "SearchFilter.c"
 }
 
 
 static gchar* value_search_filter_actions_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SearchFilterActions** object_p;
+	SearchFilterActions ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!object_p) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4703 "SearchFilter.c"
+#line 4702 "SearchFilter.c"
 	}
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!value->data[0].v_pointer) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = NULL;
-#line 4709 "SearchFilter.c"
+#line 4708 "SearchFilter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4713 "SearchFilter.c"
+#line 4712 "SearchFilter.c"
 	} else {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = search_filter_actions_ref (value->data[0].v_pointer);
-#line 4717 "SearchFilter.c"
+#line 4716 "SearchFilter.c"
 	}
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 4721 "SearchFilter.c"
+#line 4720 "SearchFilter.c"
 }
 
 
 GParamSpec* param_spec_search_filter_actions (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecSearchFilterActions* spec;
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SEARCH_FILTER_ACTIONS), NULL);
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return G_PARAM_SPEC (spec);
-#line 4735 "SearchFilter.c"
+#line 4734 "SearchFilter.c"
 }
 
 
 gpointer value_get_search_filter_actions (const GValue* value) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_FILTER_ACTIONS), NULL);
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 4744 "SearchFilter.c"
+#line 4743 "SearchFilter.c"
 }
 
 
 void value_set_search_filter_actions (GValue* value, gpointer v_object) {
-	SearchFilterActions* old;
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SearchFilterActions * old;
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_FILTER_ACTIONS));
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	old = value->data[0].v_pointer;
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (v_object) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SEARCH_FILTER_ACTIONS));
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = v_object;
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_ref (value->data[0].v_pointer);
-#line 4764 "SearchFilter.c"
+#line 4763 "SearchFilter.c"
 	} else {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4768 "SearchFilter.c"
+#line 4767 "SearchFilter.c"
 	}
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_unref (old);
-#line 4774 "SearchFilter.c"
+#line 4773 "SearchFilter.c"
 	}
 }
 
 
 void value_take_search_filter_actions (GValue* value, gpointer v_object) {
-	SearchFilterActions* old;
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SearchFilterActions * old;
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_FILTER_ACTIONS));
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	old = value->data[0].v_pointer;
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (v_object) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SEARCH_FILTER_ACTIONS));
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = v_object;
-#line 4793 "SearchFilter.c"
+#line 4792 "SearchFilter.c"
 	} else {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4797 "SearchFilter.c"
+#line 4796 "SearchFilter.c"
 	}
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_unref (old);
-#line 4803 "SearchFilter.c"
+#line 4802 "SearchFilter.c"
 	}
 }
 
 
 static void search_filter_actions_class_init (SearchFilterActionsClass * klass) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_parent_class = g_type_class_peek_parent (klass);
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	((SearchFilterActionsClass *) klass)->finalize = search_filter_actions_finalize;
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (SearchFilterActionsPrivate));
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("flagged_toggled", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("photos_toggled", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("videos_toggled", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("raw_toggled", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("rating_changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__ENUM, G_TYPE_NONE, 1, TYPE_RATING_FILTER);
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("text_changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 4827 "SearchFilter.c"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_actions_signals[SEARCH_FILTER_ACTIONS_FLAGGED_TOGGLED_SIGNAL] = g_signal_new ("flagged-toggled", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_actions_signals[SEARCH_FILTER_ACTIONS_PHOTOS_TOGGLED_SIGNAL] = g_signal_new ("photos-toggled", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_actions_signals[SEARCH_FILTER_ACTIONS_VIDEOS_TOGGLED_SIGNAL] = g_signal_new ("videos-toggled", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_actions_signals[SEARCH_FILTER_ACTIONS_RAW_TOGGLED_SIGNAL] = g_signal_new ("raw-toggled", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_actions_signals[SEARCH_FILTER_ACTIONS_RATING_CHANGED_SIGNAL] = g_signal_new ("rating-changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__ENUM, G_TYPE_NONE, 1, TYPE_RATING_FILTER);
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_actions_signals[SEARCH_FILTER_ACTIONS_TEXT_CHANGED_SIGNAL] = g_signal_new ("text-changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+#line 4826 "SearchFilter.c"
 	/**
 	     * fired when the kinds of media present in the current view change (e.g., a video becomes
 	     * available in the view through a new import operation or no raw photos are available in
 	     * the view anymore because the last one was moved to the trash)
 	     */
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("media_context_changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("criteria_changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 4837 "SearchFilter.c"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_actions_signals[SEARCH_FILTER_ACTIONS_MEDIA_CONTEXT_CHANGED_SIGNAL] = g_signal_new ("media-context-changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_actions_signals[SEARCH_FILTER_ACTIONS_CRITERIA_CHANGED_SIGNAL] = g_signal_new ("criteria-changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 4836 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_instance_init (SearchFilterActions * self) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_ACTIONS_GET_PRIVATE (self);
-#line 371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->criteria = SEARCH_FILTER_CRITERIA_ALL;
-#line 372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 368 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_text = NULL;
-#line 373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_flagged = TRUE;
-#line 374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 370 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_photos = TRUE;
-#line 375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_videos = TRUE;
-#line 376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_raw = TRUE;
-#line 377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->can_filter_by_stars = TRUE;
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->ref_count = 1;
-#line 4860 "SearchFilter.c"
+#line 4859 "SearchFilter.c"
 }
 
 
-static void search_filter_actions_finalize (SearchFilterActions* obj) {
+static void search_filter_actions_finalize (SearchFilterActions * obj) {
 	SearchFilterActions * self;
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_FILTER_ACTIONS, SearchFilterActions);
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_destroy (self);
-#line 372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 368 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_text_action_unref0 (self->priv->_text);
-#line 4872 "SearchFilter.c"
+#line 4871 "SearchFilter.c"
 }
 
 
@@ -4887,1887 +4886,1868 @@ GType search_filter_actions_get_type (void) {
 
 
 gpointer search_filter_actions_ref (gpointer instance) {
-	SearchFilterActions* self;
+	SearchFilterActions * self;
 	self = instance;
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return instance;
-#line 4897 "SearchFilter.c"
+#line 4896 "SearchFilter.c"
 }
 
 
 void search_filter_actions_unref (gpointer instance) {
-	SearchFilterActions* self;
+	SearchFilterActions * self;
 	self = instance;
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		SEARCH_FILTER_ACTIONS_GET_CLASS (self)->finalize (self);
-#line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4910 "SearchFilter.c"
+#line 4909 "SearchFilter.c"
 	}
 }
 
 
 static void _search_filter_toolbar_on_media_context_changed_search_filter_actions_media_context_changed (SearchFilterActions* _sender, gboolean has_photos, gboolean has_videos, gboolean has_raw, gboolean has_flagged, gpointer self) {
-#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1154 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_media_context_changed ((SearchFilterToolbar*) self, has_photos, has_videos, has_raw, has_flagged);
-#line 4918 "SearchFilter.c"
+#line 4917 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
-#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1156 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_flagged_toggled ((SearchFilterToolbar*) self);
-#line 4925 "SearchFilter.c"
+#line 4924 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
-#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1157 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_photos_toggled ((SearchFilterToolbar*) self);
-#line 4932 "SearchFilter.c"
+#line 4931 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
-#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_videos_toggled ((SearchFilterToolbar*) self);
-#line 4939 "SearchFilter.c"
+#line 4938 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
-#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_raw_toggled ((SearchFilterToolbar*) self);
-#line 4946 "SearchFilter.c"
+#line 4945 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed (SearchFilterActions* _sender, RatingFilter filter, gpointer self) {
-#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_rating_changed ((SearchFilterToolbar*) self);
-#line 4953 "SearchFilter.c"
+#line 4952 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed (SearchFilterActions* _sender, const gchar* text, gpointer self) {
-#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_search_text_changed ((SearchFilterToolbar*) self);
-#line 4960 "SearchFilter.c"
+#line 4959 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed (SearchFilterActions* _sender, gpointer self) {
-#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_criteria_changed ((SearchFilterToolbar*) self);
-#line 4967 "SearchFilter.c"
+#line 4966 "SearchFilter.c"
 }
 
 
 static gboolean _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu (GtkToolbar* _sender, gint x, gint y, gint button_number, gpointer self) {
 	gboolean result;
 	result = search_filter_toolbar_on_context_menu_requested ((SearchFilterToolbar*) self, x, y, button_number);
-#line 1168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4976 "SearchFilter.c"
+#line 4975 "SearchFilter.c"
 }
 
 
 static gpointer _search_filter_actions_ref0 (gpointer self) {
-#line 1053 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1049 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? search_filter_actions_ref (self) : NULL;
-#line 4983 "SearchFilter.c"
+#line 4982 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1071 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_context_menu_close_chosen ((SearchFilterToolbar*) self);
-#line 4990 "SearchFilter.c"
+#line 4989 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked (SearchFilterToolbarSavedSearchFilterButton* _sender, gpointer self) {
-#line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1122 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_saved_search_button_clicked ((SearchFilterToolbar*) self);
-#line 4997 "SearchFilter.c"
+#line 4996 "SearchFilter.c"
 }
 
 
 SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchFilterActions* actions) {
 	SearchFilterToolbar * self = NULL;
-	SearchFilterActions* _tmp0_ = NULL;
-	SearchFilterActions* _tmp1_ = NULL;
-	GtkToolbar* _tmp2_ = NULL;
-	SearchFilterActions* _tmp3_ = NULL;
-	SearchFilterActions* _tmp4_ = NULL;
-	TextAction* _tmp5_ = NULL;
-	TextAction* _tmp6_ = NULL;
-	SearchFilterToolbarSearchBox* _tmp7_ = NULL;
-	GtkToolbar* _tmp8_ = NULL;
-	GtkToolbar* _tmp9_ = NULL;
-	GtkMenuItem* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	GtkMenuItem* _tmp20_ = NULL;
-	GtkMenuItem* _tmp21_ = NULL;
-	GtkMenu* _tmp22_ = NULL;
-	GtkMenuItem* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	SearchFilterToolbarLabelToolItem* _tmp25_ = NULL;
-	GtkToolbar* _tmp26_ = NULL;
-	SearchFilterToolbarLabelToolItem* _tmp27_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp28_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp29_ = NULL;
-	const gchar* _tmp30_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp31_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp32_ = NULL;
-	const gchar* _tmp33_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp34_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp35_ = NULL;
-	const gchar* _tmp36_ = NULL;
-	GtkToolbar* _tmp37_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp38_ = NULL;
-	GtkToolbar* _tmp39_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp40_ = NULL;
-	GtkToolbar* _tmp41_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp42_ = NULL;
-	GtkSeparatorToolItem* _tmp43_ = NULL;
-	GtkToolbar* _tmp44_ = NULL;
-	GtkSeparatorToolItem* _tmp45_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp46_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp47_ = NULL;
-	const gchar* _tmp48_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp49_ = NULL;
-	const gchar* _tmp50_ = NULL;
-	GtkToolbar* _tmp51_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp52_ = NULL;
-	GtkSeparatorToolItem* _tmp53_ = NULL;
-	GtkToolbar* _tmp54_ = NULL;
-	GtkSeparatorToolItem* _tmp55_ = NULL;
+	SearchFilterActions* _tmp0_;
+	SearchFilterActions* _tmp1_;
+	GtkToolbar* _tmp2_;
+	SearchFilterActions* _tmp3_;
+	SearchFilterActions* _tmp4_;
+	TextAction* _tmp5_;
+	TextAction* _tmp6_;
+	SearchFilterToolbarSearchBox* _tmp7_;
+	GtkToolbar* _tmp8_;
+	GtkToolbar* _tmp9_;
+	GtkMenuItem* _tmp17_;
+	GtkMenuItem* _tmp18_;
+	GtkMenuItem* _tmp19_;
+	GtkMenu* _tmp20_;
+	GtkMenuItem* _tmp21_;
+	SearchFilterToolbarLabelToolItem* _tmp22_;
+	GtkToolbar* _tmp23_;
+	SearchFilterToolbarLabelToolItem* _tmp24_;
+	SearchFilterToolbarToggleActionToolButton* _tmp25_;
+	SearchFilterToolbarToggleActionToolButton* _tmp26_;
+	SearchFilterToolbarToggleActionToolButton* _tmp27_;
+	SearchFilterToolbarToggleActionToolButton* _tmp28_;
+	SearchFilterToolbarToggleActionToolButton* _tmp29_;
+	SearchFilterToolbarToggleActionToolButton* _tmp30_;
+	GtkToolbar* _tmp31_;
+	SearchFilterToolbarToggleActionToolButton* _tmp32_;
+	GtkToolbar* _tmp33_;
+	SearchFilterToolbarToggleActionToolButton* _tmp34_;
+	GtkToolbar* _tmp35_;
+	SearchFilterToolbarToggleActionToolButton* _tmp36_;
+	GtkSeparatorToolItem* _tmp37_;
+	GtkToolbar* _tmp38_;
+	GtkSeparatorToolItem* _tmp39_;
+	SearchFilterToolbarToggleActionToolButton* _tmp40_;
+	SearchFilterToolbarToggleActionToolButton* _tmp41_;
+	SearchFilterToolbarToggleActionToolButton* _tmp42_;
+	GtkToolbar* _tmp43_;
+	SearchFilterToolbarToggleActionToolButton* _tmp44_;
+	GtkSeparatorToolItem* _tmp45_;
+	GtkToolbar* _tmp46_;
+	GtkSeparatorToolItem* _tmp47_;
 	GMenuModel* model = NULL;
-	GtkBuilder* _tmp56_ = NULL;
-	GObject* _tmp57_ = NULL;
-	GMenuModel* _tmp58_ = NULL;
-	SearchFilterToolbarRatingFilterButton* _tmp59_ = NULL;
-	SearchFilterToolbarRatingFilterButton* _tmp60_ = NULL;
-	const gchar* _tmp61_ = NULL;
-	SearchFilterToolbarRatingFilterButton* _tmp62_ = NULL;
-	GtkToolbar* _tmp63_ = NULL;
-	SearchFilterToolbarRatingFilterButton* _tmp64_ = NULL;
-	GtkSeparatorToolItem* _tmp65_ = NULL;
-	GtkToolbar* _tmp66_ = NULL;
-	GtkSeparatorToolItem* _tmp67_ = NULL;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp68_ = NULL;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp69_ = NULL;
-	const gchar* _tmp70_ = NULL;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp71_ = NULL;
-	const gchar* _tmp72_ = NULL;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp73_ = NULL;
-	GtkToolbar* _tmp74_ = NULL;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp75_ = NULL;
+	GtkBuilder* _tmp48_;
+	GObject* _tmp49_;
+	GMenuModel* _tmp50_;
+	SearchFilterToolbarRatingFilterButton* _tmp51_;
+	SearchFilterToolbarRatingFilterButton* _tmp52_;
+	SearchFilterToolbarRatingFilterButton* _tmp53_;
+	GtkToolbar* _tmp54_;
+	SearchFilterToolbarRatingFilterButton* _tmp55_;
+	GtkSeparatorToolItem* _tmp56_;
+	GtkToolbar* _tmp57_;
+	GtkSeparatorToolItem* _tmp58_;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp59_;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp60_;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp61_;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp62_;
+	GtkToolbar* _tmp63_;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp64_;
 	GtkSeparatorToolItem* separator_align = NULL;
-	GtkSeparatorToolItem* _tmp76_ = NULL;
-	GtkToolbar* _tmp77_ = NULL;
-	GtkToolbar* _tmp78_ = NULL;
-	SearchFilterToolbarSearchBox* _tmp79_ = NULL;
-	GtkToolbar* _tmp80_ = NULL;
-	SearchFilterActions* _tmp81_ = NULL;
-	SearchFilterActions* _tmp82_ = NULL;
-	SearchFilterActions* _tmp83_ = NULL;
-	SearchFilterActions* _tmp84_ = NULL;
-	SearchFilterActions* _tmp85_ = NULL;
-	SearchFilterActions* _tmp86_ = NULL;
-	SearchFilterActions* _tmp87_ = NULL;
-	GtkToolbar* _tmp88_ = NULL;
-	SearchFilterActions* _tmp89_ = NULL;
-	gboolean _tmp90_ = FALSE;
-	SearchFilterActions* _tmp91_ = NULL;
-	gboolean _tmp92_ = FALSE;
-	SearchFilterActions* _tmp93_ = NULL;
-	gboolean _tmp94_ = FALSE;
-	SearchFilterActions* _tmp95_ = NULL;
-	gboolean _tmp96_ = FALSE;
+	GtkSeparatorToolItem* _tmp65_;
+	GtkToolbar* _tmp66_;
+	GtkToolbar* _tmp67_;
+	SearchFilterToolbarSearchBox* _tmp68_;
+	GtkToolbar* _tmp69_;
+	SearchFilterActions* _tmp70_;
+	SearchFilterActions* _tmp71_;
+	SearchFilterActions* _tmp72_;
+	SearchFilterActions* _tmp73_;
+	SearchFilterActions* _tmp74_;
+	SearchFilterActions* _tmp75_;
+	SearchFilterActions* _tmp76_;
+	GtkToolbar* _tmp77_;
+	SearchFilterActions* _tmp78_;
+	gboolean _tmp79_;
+	SearchFilterActions* _tmp80_;
+	gboolean _tmp81_;
+	SearchFilterActions* _tmp82_;
+	gboolean _tmp83_;
+	SearchFilterActions* _tmp84_;
+	gboolean _tmp85_;
 	GError * _inner_error_ = NULL;
-#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1048 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (actions), NULL);
-#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1048 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbar*) g_object_new (object_type, NULL);
-#line 1053 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1049 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = actions;
-#line 1053 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1049 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _search_filter_actions_ref0 (_tmp0_);
-#line 1053 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1049 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_search_filter_actions_unref0 (self->priv->actions);
-#line 1053 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1049 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->actions = _tmp1_;
-#line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1050 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = (GtkToolbar*) gtk_toolbar_new ();
-#line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1050 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp2_);
-#line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1050 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbar);
-#line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1050 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->toolbar = _tmp2_;
-#line 1055 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1051 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = actions;
-#line 1055 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1051 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp3_, "media-context-changed", (GCallback) _search_filter_toolbar_on_media_context_changed_search_filter_actions_media_context_changed, self, 0);
-#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = actions;
-#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = search_filter_actions_get_text (_tmp4_);
-#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = _tmp5_;
-#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = search_filter_toolbar_search_box_new (_tmp6_);
-#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp7_);
-#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->search_box);
-#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->search_box = _tmp7_;
-#line 1058 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = self->priv->toolbar;
-#line 1058 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_buildable_set_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_BUILDABLE, GtkBuildable), "search-filter-toolbar");
-#line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1055 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = self->priv->toolbar;
-#line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1055 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_toolbar_set_icon_size (_tmp9_, GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 5141 "SearchFilter.c"
+#line 5130 "SearchFilter.c"
 	{
-		GtkBuilder* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		GtkBuilder* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+#line 1058 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp10_ = self->builder;
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1058 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp11_ = resources_get_ui ("search_bar.ui");
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1058 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp12_ = _tmp11_;
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1058 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		gtk_builder_add_from_resource (_tmp10_, _tmp12_, &_inner_error_);
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1058 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_free0 (_tmp12_);
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1058 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5158 "SearchFilter.c"
-			goto __catch592_g_error;
+#line 5147 "SearchFilter.c"
+			goto __catch594_g_error;
 		}
 	}
-	goto __finally592;
-	__catch592_g_error:
+	goto __finally594;
+	__catch594_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-#line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		GError* _tmp13_;
+		const gchar* _tmp14_;
+		gchar* _tmp15_;
+		gchar* _tmp16_;
+#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		err = _inner_error_;
-#line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_inner_error_ = NULL;
-#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp13_ = _ ("Error loading search bar UI: %s");
-#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp14_ = err;
-#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp15_ = _tmp14_->message;
-#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp16_ = g_strdup_printf (_tmp13_, _tmp15_);
-#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp17_ = _tmp16_;
-#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		app_window_panic (_tmp17_);
-#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_g_free0 (_tmp17_);
-#line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp13_ = err;
+#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp14_ = _tmp13_->message;
+#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp15_ = g_strdup_printf (_ ("Error loading search bar UI: %s"), _tmp14_);
+#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp16_ = _tmp15_;
+#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		app_window_panic (_tmp16_);
+#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_g_free0 (_tmp16_);
+#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_error_free0 (err);
-#line 5191 "SearchFilter.c"
+#line 5177 "SearchFilter.c"
 	}
-	__finally592:
-#line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	__finally594:
+#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_clear_error (&_inner_error_);
-#line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return NULL;
-#line 5202 "SearchFilter.c"
+#line 5188 "SearchFilter.c"
 	}
-#line 1073 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1069 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp17_ = self->priv->close_item;
+#line 1069 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_menu_item_set_label (_tmp17_, _ ("Close"));
+#line 1070 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp18_ = self->priv->close_item;
-#line 1073 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp19_ = _ ("Close");
-#line 1073 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_menu_item_set_label (_tmp18_, _tmp19_);
-#line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp20_ = self->priv->close_item;
-#line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
-#line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1070 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
+#line 1071 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp19_ = self->priv->close_item;
+#line 1071 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_connect_object (_tmp19_, "activate", (GCallback) _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate, self, 0);
+#line 1072 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp20_ = self->priv->close_menu;
+#line 1072 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp21_ = self->priv->close_item;
+#line 1072 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_menu_shell_get_type (), GtkMenuShell), (GtkWidget*) _tmp21_);
+#line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp22_ = search_filter_toolbar_label_tool_item_new (_ ("Type"), 10, 5);
+#line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp22_);
+#line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_object_unref0 (self->priv->label_type);
 #line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp21_, "activate", (GCallback) _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate, self, 0);
+	self->priv->label_type = _tmp22_;
 #line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp22_ = self->priv->close_menu;
+	_tmp23_ = self->priv->toolbar;
 #line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp23_ = self->priv->close_item;
+	_tmp24_ = self->priv->label_type;
 #line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_menu_shell_get_type (), GtkMenuShell), (GtkWidget*) _tmp23_);
-#line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp24_ = _ ("Type");
-#line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp25_ = search_filter_toolbar_label_tool_item_new (_tmp24_, 10, 5);
-#line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_toolbar_insert (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1078 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp25_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.photos");
+#line 1078 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp25_);
+#line 1078 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_object_unref0 (self->priv->toolbtn_photos);
+#line 1078 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->toolbtn_photos = _tmp25_;
 #line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (self->priv->label_type);
+	_tmp26_ = self->priv->toolbtn_photos;
 #line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->label_type = _tmp25_;
-#line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp26_ = self->priv->toolbar;
-#line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp27_ = self->priv->label_type;
-#line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp28_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.photos");
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp28_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_tool_item_get_type (), GtkToolItem), _ ("Photos"));
+#line 1081 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp27_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.videos");
+#line 1081 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp27_);
+#line 1081 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_object_unref0 (self->priv->toolbtn_videos);
+#line 1081 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->toolbtn_videos = _tmp27_;
 #line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (self->priv->toolbtn_photos);
+	_tmp28_ = self->priv->toolbtn_videos;
 #line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->toolbtn_photos = _tmp28_;
-#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp29_ = self->priv->toolbtn_photos;
-#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp30_ = _ ("Photos");
-#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_tool_item_get_type (), GtkToolItem), _tmp30_);
-#line 1085 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp31_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.videos");
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_tool_item_get_type (), GtkToolItem), _ ("Videos"));
+#line 1084 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp29_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.raw");
+#line 1084 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp29_);
+#line 1084 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_object_unref0 (self->priv->toolbtn_raw);
+#line 1084 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->toolbtn_raw = _tmp29_;
 #line 1085 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp31_);
+	_tmp30_ = self->priv->toolbtn_raw;
 #line 1085 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (self->priv->toolbtn_videos);
-#line 1085 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->toolbtn_videos = _tmp31_;
-#line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp32_ = self->priv->toolbtn_videos;
-#line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp33_ = _ ("Videos");
-#line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_item_get_type (), GtkToolItem), _tmp33_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_tool_item_get_type (), GtkToolItem), _ ("RAW Photos"));
+#line 1087 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp31_ = self->priv->toolbar;
+#line 1087 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp32_ = self->priv->toolbtn_photos;
+#line 1087 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_toolbar_insert (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp34_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.raw");
+	_tmp33_ = self->priv->toolbar;
 #line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp34_);
+	_tmp34_ = self->priv->toolbtn_videos;
 #line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (self->priv->toolbtn_raw);
-#line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->toolbtn_raw = _tmp34_;
+	gtk_toolbar_insert (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp35_ = self->priv->toolbtn_raw;
+	_tmp35_ = self->priv->toolbar;
 #line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp36_ = _ ("RAW Photos");
+	_tmp36_ = self->priv->toolbtn_raw;
 #line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_item_get_type (), GtkToolItem), _tmp36_);
-#line 1091 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp37_ = self->priv->toolbar;
-#line 1091 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp38_ = self->priv->toolbtn_photos;
-#line 1091 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp37_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
 #line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp39_ = self->priv->toolbar;
+	g_object_ref_sink (_tmp37_);
 #line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp40_ = self->priv->toolbtn_videos;
+	_g_object_unref0 (self->priv->sepr_mediatype_flagged);
 #line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	self->priv->sepr_mediatype_flagged = _tmp37_;
 #line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp41_ = self->priv->toolbar;
+	_tmp38_ = self->priv->toolbar;
 #line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp42_ = self->priv->toolbtn_raw;
+	_tmp39_ = self->priv->sepr_mediatype_flagged;
 #line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp43_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
-#line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp43_);
-#line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (self->priv->sepr_mediatype_flagged);
-#line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->sepr_mediatype_flagged = _tmp43_;
+	gtk_toolbar_insert (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp44_ = self->priv->toolbar;
+	_tmp40_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.flagged");
 #line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp45_ = self->priv->sepr_mediatype_flagged;
+	g_object_ref_sink (_tmp40_);
 #line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp46_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.flagged");
+	_g_object_unref0 (self->priv->toolbtn_flag);
+#line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->toolbtn_flag = _tmp40_;
+#line 1098 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp41_ = self->priv->toolbtn_flag;
+#line 1098 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_toolbar_toggle_action_tool_button_set_label (_tmp41_, _ ("Flagged"));
+#line 1099 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp42_ = self->priv->toolbtn_flag;
+#line 1099 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_tool_item_get_type (), GtkToolItem), _ ("Flagged"));
 #line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp46_);
+	_tmp43_ = self->priv->toolbar;
 #line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (self->priv->toolbtn_flag);
+	_tmp44_ = self->priv->toolbtn_flag;
 #line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->toolbtn_flag = _tmp46_;
-#line 1102 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp47_ = self->priv->toolbtn_flag;
-#line 1102 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp48_ = _ ("Flagged");
-#line 1102 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_toggle_action_tool_button_set_label (_tmp47_, _tmp48_);
-#line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp49_ = self->priv->toolbtn_flag;
-#line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp50_ = _ ("Flagged");
-#line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), _tmp50_);
+	gtk_toolbar_insert (_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1104 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp45_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+#line 1104 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp45_);
+#line 1104 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_object_unref0 (self->priv->sepr_flagged_rating);
+#line 1104 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->sepr_flagged_rating = _tmp45_;
 #line 1105 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp51_ = self->priv->toolbar;
+	_tmp46_ = self->priv->toolbar;
 #line 1105 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp52_ = self->priv->toolbtn_flag;
+	_tmp47_ = self->priv->sepr_flagged_rating;
 #line 1105 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp53_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+	_tmp48_ = self->builder;
 #line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp53_);
+	_tmp49_ = gtk_builder_get_object (_tmp48_, "popup-menu");
 #line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (self->priv->sepr_flagged_rating);
+	_tmp50_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp49_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp49_) : NULL);
 #line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->sepr_flagged_rating = _tmp53_;
+	model = _tmp50_;
 #line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp54_ = self->priv->toolbar;
+	_tmp51_ = search_filter_toolbar_rating_filter_button_new (model);
 #line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp55_ = self->priv->sepr_flagged_rating;
+	g_object_ref_sink (_tmp51_);
 #line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp56_ = self->builder;
+	_g_object_unref0 (self->priv->rating_button);
+#line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->rating_button = _tmp51_;
+#line 1110 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp52_ = self->priv->rating_button;
+#line 1110 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_toolbar_rating_filter_button_set_label (_tmp52_, _ ("Rating"));
+#line 1111 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp53_ = self->priv->rating_button;
+#line 1111 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_tool_item_get_type (), GtkToolItem), FALSE);
 #line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp57_ = gtk_builder_get_object (_tmp56_, "popup-menu");
+	_tmp54_ = self->priv->toolbar;
 #line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp58_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp57_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp57_) : NULL);
+	_tmp55_ = self->priv->rating_button;
 #line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	model = _tmp58_;
-#line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp59_ = search_filter_toolbar_rating_filter_button_new (model);
-#line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp59_);
-#line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (self->priv->rating_button);
-#line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->rating_button = _tmp59_;
-#line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp60_ = self->priv->rating_button;
-#line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp61_ = _ ("Rating");
-#line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_rating_filter_button_set_label (_tmp60_, _tmp61_);
+	gtk_toolbar_insert (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp56_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
 #line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp62_ = self->priv->rating_button;
+	g_object_ref_sink (_tmp56_);
 #line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_tool_item_get_type (), GtkToolItem), FALSE);
+	_g_object_unref0 (self->priv->sepr_rating_saved);
+#line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->sepr_rating_saved = _tmp56_;
 #line 1116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp63_ = self->priv->toolbar;
+	_tmp57_ = self->priv->toolbar;
 #line 1116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp64_ = self->priv->rating_button;
+	_tmp58_ = self->priv->sepr_rating_saved;
 #line 1116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp65_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+	gtk_toolbar_insert (_tmp57_, G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp65_);
+	_tmp59_ = self->priv->saved_search_button;
 #line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (self->priv->sepr_rating_saved);
-#line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->sepr_rating_saved = _tmp65_;
+	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_tool_item_get_type (), GtkToolItem), FALSE);
 #line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp66_ = self->priv->toolbar;
+	_tmp60_ = self->priv->saved_search_button;
 #line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp67_ = self->priv->sepr_rating_saved;
-#line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp66_, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	search_filter_toolbar_saved_search_filter_button_set_label (_tmp60_, _ ("Saved Search"));
+#line 1121 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp61_ = self->priv->saved_search_button;
+#line 1121 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_tool_item_get_type (), GtkToolItem), _ ("Use a saved search to filter items in the current view"));
+#line 1122 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp62_ = self->priv->saved_search_button;
+#line 1122 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_connect_object (_tmp62_, "clicked", (GCallback) _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked, self, 0);
 #line 1123 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp68_ = self->priv->saved_search_button;
+	_tmp63_ = self->priv->toolbar;
 #line 1123 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_tool_item_get_type (), GtkToolItem), FALSE);
-#line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp69_ = self->priv->saved_search_button;
-#line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp70_ = _ ("Saved Search");
-#line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_saved_search_filter_button_set_label (_tmp69_, _tmp70_);
-#line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp71_ = self->priv->saved_search_button;
-#line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp72_ = _ ("Use a saved search to filter items in the current view");
-#line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_tool_item_get_type (), GtkToolItem), _tmp72_);
+	_tmp64_ = self->priv->saved_search_button;
+#line 1123 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_toolbar_insert (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp73_ = self->priv->saved_search_button;
+	_tmp65_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
 #line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp73_, "clicked", (GCallback) _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked, self, 0);
-#line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp74_ = self->priv->toolbar;
-#line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp75_ = self->priv->saved_search_button;
+	g_object_ref_sink (_tmp65_);
+#line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	separator_align = _tmp65_;
 #line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp74_, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1130 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp76_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
-#line 1130 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp76_);
-#line 1130 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	separator_align = _tmp76_;
-#line 1131 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (separator_align, gtk_tool_item_get_type (), GtkToolItem), TRUE);
-#line 1132 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1128 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_separator_tool_item_set_draw (separator_align, FALSE);
-#line 1133 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp77_ = self->priv->toolbar;
-#line 1133 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp77_, G_TYPE_CHECK_INSTANCE_CAST (separator_align, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp78_ = self->priv->toolbar;
-#line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp79_ = self->priv->search_box;
-#line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp78_, G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1129 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp66_ = self->priv->toolbar;
+#line 1129 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_toolbar_insert (_tmp66_, G_TYPE_CHECK_INSTANCE_CAST (separator_align, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1132 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp67_ = self->priv->toolbar;
+#line 1132 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp68_ = self->priv->search_box;
+#line 1132 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_toolbar_insert (_tmp67_, G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1134 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp69_ = self->priv->toolbar;
+#line 1134 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget));
+#line 1137 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp70_ = actions;
+#line 1137 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_connect_object (_tmp70_, "flagged-toggled", (GCallback) _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled, self, 0);
 #line 1138 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp80_ = self->priv->toolbar;
+	_tmp71_ = actions;
 #line 1138 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget));
+	g_signal_connect_object (_tmp71_, "photos-toggled", (GCallback) _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled, self, 0);
+#line 1139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp72_ = actions;
+#line 1139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_connect_object (_tmp72_, "videos-toggled", (GCallback) _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled, self, 0);
+#line 1140 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp73_ = actions;
+#line 1140 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_connect_object (_tmp73_, "raw-toggled", (GCallback) _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled, self, 0);
 #line 1141 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp81_ = actions;
+	_tmp74_ = actions;
 #line 1141 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp81_, "flagged-toggled", (GCallback) _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled, self, 0);
+	g_signal_connect_object (_tmp74_, "rating-changed", (GCallback) _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed, self, 0);
 #line 1142 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp82_ = actions;
+	_tmp75_ = actions;
 #line 1142 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp82_, "photos-toggled", (GCallback) _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled, self, 0);
+	g_signal_connect_object (_tmp75_, "text-changed", (GCallback) _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed, self, 0);
 #line 1143 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp83_ = actions;
+	_tmp76_ = actions;
 #line 1143 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp83_, "videos-toggled", (GCallback) _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled, self, 0);
-#line 1144 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp84_ = actions;
-#line 1144 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp84_, "raw-toggled", (GCallback) _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled, self, 0);
-#line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp85_ = actions;
-#line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp85_, "rating-changed", (GCallback) _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed, self, 0);
+	g_signal_connect_object (_tmp76_, "criteria-changed", (GCallback) _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed, self, 0);
 #line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp86_ = actions;
+	_tmp77_ = self->priv->toolbar;
 #line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp86_, "text-changed", (GCallback) _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed, self, 0);
-#line 1147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp87_ = actions;
-#line 1147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp87_, "criteria-changed", (GCallback) _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed, self, 0);
-#line 1150 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp88_ = self->priv->toolbar;
-#line 1150 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp88_, "popup-context-menu", (GCallback) _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu, self, 0);
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp89_ = actions;
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp90_ = search_filter_actions_get_has_photos (_tmp89_);
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp91_ = actions;
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp92_ = search_filter_actions_get_has_videos (_tmp91_);
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp93_ = actions;
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp94_ = search_filter_actions_get_has_raw (_tmp93_);
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp95_ = actions;
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp96_ = search_filter_actions_get_has_flagged (_tmp95_);
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_on_media_context_changed (self, _tmp90_, _tmp92_, _tmp94_, _tmp96_);
-#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_connect_object (_tmp77_, "popup-context-menu", (GCallback) _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu, self, 0);
+#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp78_ = actions;
+#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp79_ = search_filter_actions_get_has_photos (_tmp78_);
+#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp80_ = actions;
+#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp81_ = search_filter_actions_get_has_videos (_tmp80_);
+#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp82_ = actions;
+#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp83_ = search_filter_actions_get_has_raw (_tmp82_);
+#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp84_ = actions;
+#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp85_ = search_filter_actions_get_has_flagged (_tmp84_);
+#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_toolbar_on_media_context_changed (self, _tmp79_, _tmp81_, _tmp83_, _tmp85_);
+#line 1048 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (separator_align);
-#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1048 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (model);
-#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1048 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 5506 "SearchFilter.c"
+#line 5472 "SearchFilter.c"
 }
 
 
 SearchFilterToolbar* search_filter_toolbar_new (SearchFilterActions* actions) {
-#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1048 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_construct (TYPE_SEARCH_FILTER_TOOLBAR, actions);
-#line 5513 "SearchFilter.c"
+#line 5479 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_media_context_changed (SearchFilterToolbar* self, gboolean has_photos, gboolean has_videos, gboolean has_raw, gboolean has_flagged) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp9_ = FALSE;
-#line 1171 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gboolean _tmp1_;
+	gboolean _tmp5_;
+	gboolean _tmp8_;
+	gboolean _tmp11_;
+#line 1167 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = has_photos;
-#line 1173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp1_ = has_photos;
+#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	if (_tmp1_) {
+#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp0_ = TRUE;
+#line 5497 "SearchFilter.c"
+	} else {
+		gboolean _tmp2_;
+#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp2_ = has_raw;
+#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp0_ = _tmp2_;
+#line 5504 "SearchFilter.c"
+	}
+#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_) {
-#line 5528 "SearchFilter.c"
-		SearchFilterToolbarToggleActionToolButton* _tmp1_ = NULL;
+#line 5508 "SearchFilter.c"
+		SearchFilterToolbarToggleActionToolButton* _tmp3_;
+#line 1172 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp3_ = self->priv->toolbtn_photos;
+#line 1172 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp3_, RESOURCES_ICON_FILTER_PHOTOS);
+#line 5514 "SearchFilter.c"
+	} else {
+		SearchFilterToolbarToggleActionToolButton* _tmp4_;
 #line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp1_ = self->priv->toolbtn_photos;
+		_tmp4_ = self->priv->toolbtn_photos;
 #line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp1_, RESOURCES_ICON_FILTER_PHOTOS);
-#line 5534 "SearchFilter.c"
-	} else {
-		SearchFilterToolbarToggleActionToolButton* _tmp2_ = NULL;
+		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp4_, RESOURCES_ICON_FILTER_PHOTOS_DISABLED);
+#line 5521 "SearchFilter.c"
+	}
 #line 1176 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp2_ = self->priv->toolbtn_photos;
+	_tmp5_ = has_videos;
 #line 1176 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp2_, RESOURCES_ICON_FILTER_PHOTOS_DISABLED);
-#line 5541 "SearchFilter.c"
-	}
-#line 1178 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp3_ = has_videos;
-#line 1178 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp3_) {
-#line 5547 "SearchFilter.c"
-		SearchFilterToolbarToggleActionToolButton* _tmp4_ = NULL;
+	if (_tmp5_) {
+#line 5527 "SearchFilter.c"
+		SearchFilterToolbarToggleActionToolButton* _tmp6_;
+#line 1177 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp6_ = self->priv->toolbtn_videos;
+#line 1177 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp6_, RESOURCES_ICON_FILTER_VIDEOS);
+#line 5533 "SearchFilter.c"
+	} else {
+		SearchFilterToolbarToggleActionToolButton* _tmp7_;
 #line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp4_ = self->priv->toolbtn_videos;
+		_tmp7_ = self->priv->toolbtn_videos;
 #line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp4_, RESOURCES_ICON_FILTER_VIDEOS);
-#line 5553 "SearchFilter.c"
-	} else {
-		SearchFilterToolbarToggleActionToolButton* _tmp5_ = NULL;
+		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp7_, RESOURCES_ICON_FILTER_VIDEOS_DISABLED);
+#line 5540 "SearchFilter.c"
+	}
 #line 1181 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp5_ = self->priv->toolbtn_videos;
+	_tmp8_ = has_raw;
 #line 1181 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp5_, RESOURCES_ICON_FILTER_VIDEOS_DISABLED);
-#line 5560 "SearchFilter.c"
-	}
-#line 1183 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp6_ = has_raw;
-#line 1183 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp6_) {
-#line 5566 "SearchFilter.c"
-		SearchFilterToolbarToggleActionToolButton* _tmp7_ = NULL;
+	if (_tmp8_) {
+#line 5546 "SearchFilter.c"
+		SearchFilterToolbarToggleActionToolButton* _tmp9_;
+#line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp9_ = self->priv->toolbtn_raw;
+#line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp9_, RESOURCES_ICON_FILTER_RAW);
+#line 5552 "SearchFilter.c"
+	} else {
+		SearchFilterToolbarToggleActionToolButton* _tmp10_;
 #line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp7_ = self->priv->toolbtn_raw;
+		_tmp10_ = self->priv->toolbtn_raw;
 #line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp7_, RESOURCES_ICON_FILTER_RAW);
-#line 5572 "SearchFilter.c"
-	} else {
-		SearchFilterToolbarToggleActionToolButton* _tmp8_ = NULL;
+		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp10_, RESOURCES_ICON_FILTER_RAW_DISABLED);
+#line 5559 "SearchFilter.c"
+	}
 #line 1186 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp8_ = self->priv->toolbtn_raw;
+	_tmp11_ = has_flagged;
 #line 1186 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp8_, RESOURCES_ICON_FILTER_RAW_DISABLED);
-#line 5579 "SearchFilter.c"
-	}
-#line 1188 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp9_ = has_flagged;
-#line 1188 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp9_) {
-#line 5585 "SearchFilter.c"
-		SearchFilterToolbarToggleActionToolButton* _tmp10_ = NULL;
+	if (_tmp11_) {
+#line 5565 "SearchFilter.c"
+		SearchFilterToolbarToggleActionToolButton* _tmp12_;
+#line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp12_ = self->priv->toolbtn_flag;
+#line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp12_, RESOURCES_ICON_FILTER_FLAGGED);
+#line 5571 "SearchFilter.c"
+	} else {
+		SearchFilterToolbarToggleActionToolButton* _tmp13_;
 #line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp10_ = self->priv->toolbtn_flag;
+		_tmp13_ = self->priv->toolbtn_flag;
 #line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp10_, RESOURCES_ICON_FILTER_FLAGGED);
-#line 5591 "SearchFilter.c"
-	} else {
-		SearchFilterToolbarToggleActionToolButton* _tmp11_ = NULL;
-#line 1191 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp11_ = self->priv->toolbtn_flag;
-#line 1191 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp11_, RESOURCES_ICON_FILTER_FLAGGED_DISABLED);
-#line 5598 "SearchFilter.c"
+		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp13_, RESOURCES_ICON_FILTER_FLAGGED_DISABLED);
+#line 5578 "SearchFilter.c"
 	}
 }
 
 
 static gboolean search_filter_toolbar_on_context_menu_requested (SearchFilterToolbar* self, gint x, gint y, gint button) {
 	gboolean result = FALSE;
-	GtkMenu* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	guint32 _tmp2_ = 0U;
-#line 1195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkMenu* _tmp0_;
+	gint _tmp1_;
+	guint32 _tmp2_;
+#line 1193 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_TOOLBAR (self), FALSE);
-#line 1196 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1194 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->close_menu;
-#line 1196 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1194 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = button;
-#line 1196 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1194 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = gtk_get_current_event_time ();
-#line 1196 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1194 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, (guint) _tmp1_, _tmp2_);
-#line 1197 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = FALSE;
-#line 1197 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 5622 "SearchFilter.c"
+#line 5602 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new39 (gboolean value) {
-#line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5629 "SearchFilter.c"
+#line 5609 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterToolbar* self) {
 	AppWindow* aw = NULL;
-	LibraryWindow* _tmp0_ = NULL;
+	LibraryWindow* _tmp0_;
 	GSimpleAction* action = NULL;
-	AppWindow* _tmp1_ = NULL;
-	GAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-#line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	AppWindow* _tmp1_;
+	GAction* _tmp2_;
+	GSimpleAction* _tmp3_;
+	GSimpleAction* _tmp4_;
+#line 1200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1203 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1201 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = library_window_get_app ();
-#line 1203 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1201 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	aw = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_APP_WINDOW, AppWindow);
-#line 1208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1206 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = aw;
-#line 1208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1206 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
-#line 1208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1206 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL);
-#line 1208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1206 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	action = _tmp3_;
-#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1210 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = action;
-#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1210 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp4_ != NULL) {
-#line 5659 "SearchFilter.c"
-		GSimpleAction* _tmp5_ = NULL;
-		GVariant* _tmp6_ = NULL;
-#line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 5639 "SearchFilter.c"
+		GSimpleAction* _tmp5_;
+		GVariant* _tmp6_;
+#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = action;
-#line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = _variant_new39 (FALSE);
-#line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_);
-#line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_variant_unref0 (_tmp6_);
-#line 5670 "SearchFilter.c"
+#line 5650 "SearchFilter.c"
 	}
-#line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (action);
-#line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (aw);
-#line 5676 "SearchFilter.c"
+#line 5656 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_flagged_toggled (SearchFilterToolbar* self) {
-#line 1218 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1216 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1217 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5685 "SearchFilter.c"
+#line 5665 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_videos_toggled (SearchFilterToolbar* self) {
-#line 1222 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1220 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1223 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1221 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5694 "SearchFilter.c"
+#line 5674 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_photos_toggled (SearchFilterToolbar* self) {
-#line 1226 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1225 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5703 "SearchFilter.c"
+#line 5683 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_raw_toggled (SearchFilterToolbar* self) {
-#line 1230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1229 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5712 "SearchFilter.c"
+#line 5692 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_search_text_changed (SearchFilterToolbar* self) {
-#line 1234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1232 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1233 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5721 "SearchFilter.c"
+#line 5701 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new40 (gboolean value) {
-#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1247 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5728 "SearchFilter.c"
+#line 5708 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self) {
 	AppWindow* aw = NULL;
-	LibraryWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	LibraryWindow* _tmp0_;
+	AppWindow* _tmp1_;
 	GSimpleAction* action = NULL;
-	AppWindow* _tmp2_ = NULL;
-	GAction* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-	GSimpleAction* _tmp5_ = NULL;
-#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	AppWindow* _tmp2_;
+	GAction* _tmp3_;
+	GSimpleAction* _tmp4_;
+	GSimpleAction* _tmp5_;
+#line 1236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = library_window_get_app ();
-#line 1239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	aw = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_APP_WINDOW, AppWindow);
-#line 1241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = aw;
-#line 1241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_ == NULL) {
-#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (aw);
-#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 5755 "SearchFilter.c"
+#line 5735 "SearchFilter.c"
 	}
-#line 1244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = aw;
-#line 1244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
-#line 1244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp3_) : NULL);
-#line 1244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	action = _tmp4_;
-#line 1248 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1246 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = action;
-#line 1248 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1246 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp5_ != NULL) {
-#line 5769 "SearchFilter.c"
-		GSimpleAction* _tmp6_ = NULL;
-		GVariant* _tmp7_ = NULL;
-#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 5749 "SearchFilter.c"
+		GSimpleAction* _tmp6_;
+		GVariant* _tmp7_;
+#line 1247 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = action;
-#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1247 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp7_ = _variant_new40 (TRUE);
-#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1247 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_signal_emit_by_name (_tmp6_, "change-state", _tmp7_);
-#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1247 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_variant_unref0 (_tmp7_);
-#line 5780 "SearchFilter.c"
+#line 5760 "SearchFilter.c"
 	}
-#line 1252 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (action);
-#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (aw);
-#line 5788 "SearchFilter.c"
+#line 5768 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_criteria_changed (SearchFilterToolbar* self) {
-#line 1258 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1256 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1257 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5797 "SearchFilter.c"
+#line 5777 "SearchFilter.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 5804 "SearchFilter.c"
+#line 5784 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchViewFilter* search_filter) {
-	SearchViewFilter* _tmp0_ = NULL;
-	SearchViewFilter* _tmp1_ = NULL;
-	SearchViewFilter* _tmp2_ = NULL;
-	SearchViewFilter* _tmp3_ = NULL;
-	SearchFilterActions* _tmp4_ = NULL;
-	SearchViewFilter* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	SearchFilterToolbarRatingFilterButton* _tmp7_ = NULL;
-	SearchViewFilter* _tmp8_ = NULL;
-	guint _tmp9_ = 0U;
-#line 1262 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SearchViewFilter* _tmp0_;
+	SearchViewFilter* _tmp1_;
+	SearchViewFilter* _tmp2_;
+	SearchViewFilter* _tmp3_;
+	SearchFilterActions* _tmp4_;
+	SearchViewFilter* _tmp5_;
+	guint _tmp6_;
+	SearchFilterToolbarRatingFilterButton* _tmp7_;
+	SearchViewFilter* _tmp8_;
+	guint _tmp9_;
+#line 1260 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1262 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1260 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_VIEW_FILTER (search_filter));
-#line 1263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1261 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = search_filter;
-#line 1263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1261 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->priv->search_filter;
-#line 1263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1261 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1262 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 5831 "SearchFilter.c"
+#line 5811 "SearchFilter.c"
 	}
-#line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search_filter;
-#line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _view_filter_ref0 (_tmp2_);
-#line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_view_filter_unref0 (self->priv->search_filter);
-#line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->search_filter = _tmp3_;
-#line 1269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->actions;
-#line 1269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = search_filter;
-#line 1269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = search_view_filter_get_criteria (_tmp5_);
-#line 1269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_set_sensitive_for_search_criteria (_tmp4_, (SearchFilterCriteria) _tmp6_);
-#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1268 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = self->priv->rating_button;
-#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1268 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = search_filter;
-#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1268 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = search_view_filter_get_criteria (_tmp8_);
-#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1268 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), (SEARCH_FILTER_CRITERIA_RATING & _tmp9_) != 0);
-#line 1272 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5859 "SearchFilter.c"
+#line 5839 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_unset_view_filter (SearchFilterToolbar* self) {
-	DisabledViewFilter* _tmp0_ = NULL;
-	DisabledViewFilter* _tmp1_ = NULL;
-#line 1275 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	DisabledViewFilter* _tmp0_;
+	DisabledViewFilter* _tmp1_;
+#line 1273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1276 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1274 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = disabled_view_filter_new ();
-#line 1276 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1274 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_;
-#line 1276 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1274 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_set_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 1276 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1274 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_view_filter_unref0 (_tmp1_);
-#line 5876 "SearchFilter.c"
+#line 5856 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_update (SearchFilterToolbar* self) {
-	SearchViewFilter* _tmp0_ = NULL;
-	SearchViewFilter* _tmp3_ = NULL;
-	SearchViewFilter* _tmp4_ = NULL;
-	SearchFilterActions* _tmp5_ = NULL;
-	TextAction* _tmp6_ = NULL;
-	TextAction* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	SearchViewFilter* _tmp10_ = NULL;
-	SearchFilterActions* _tmp11_ = NULL;
-	GSimpleAction* _tmp12_ = NULL;
-	GSimpleAction* _tmp13_ = NULL;
-	GVariant* _tmp14_ = NULL;
-	GVariant* _tmp15_ = NULL;
-	gboolean _tmp16_ = FALSE;
-	SearchViewFilter* _tmp17_ = NULL;
-	SearchFilterActions* _tmp18_ = NULL;
-	GSimpleAction* _tmp19_ = NULL;
-	GSimpleAction* _tmp20_ = NULL;
-	GVariant* _tmp21_ = NULL;
-	GVariant* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
-	SearchViewFilter* _tmp24_ = NULL;
-	SearchFilterActions* _tmp25_ = NULL;
-	GSimpleAction* _tmp26_ = NULL;
-	GSimpleAction* _tmp27_ = NULL;
-	GVariant* _tmp28_ = NULL;
-	GVariant* _tmp29_ = NULL;
-	gboolean _tmp30_ = FALSE;
-	SearchViewFilter* _tmp31_ = NULL;
-	SearchFilterActions* _tmp32_ = NULL;
-	GSimpleAction* _tmp33_ = NULL;
-	GSimpleAction* _tmp34_ = NULL;
-	GVariant* _tmp35_ = NULL;
-	GVariant* _tmp36_ = NULL;
-	gboolean _tmp37_ = FALSE;
+	SearchViewFilter* _tmp0_;
+	SearchViewFilter* _tmp3_;
+	SearchViewFilter* _tmp4_;
+	SearchFilterActions* _tmp5_;
+	TextAction* _tmp6_;
+	TextAction* _tmp7_;
+	const gchar* _tmp8_;
+	const gchar* _tmp9_;
+	SearchViewFilter* _tmp10_;
+	SearchFilterActions* _tmp11_;
+	GSimpleAction* _tmp12_;
+	GSimpleAction* _tmp13_;
+	GVariant* _tmp14_;
+	GVariant* _tmp15_;
+	gboolean _tmp16_;
+	SearchViewFilter* _tmp17_;
+	SearchFilterActions* _tmp18_;
+	GSimpleAction* _tmp19_;
+	GSimpleAction* _tmp20_;
+	GVariant* _tmp21_;
+	GVariant* _tmp22_;
+	gboolean _tmp23_;
+	SearchViewFilter* _tmp24_;
+	SearchFilterActions* _tmp25_;
+	GSimpleAction* _tmp26_;
+	GSimpleAction* _tmp27_;
+	GVariant* _tmp28_;
+	GVariant* _tmp29_;
+	gboolean _tmp30_;
+	SearchViewFilter* _tmp31_;
+	SearchFilterActions* _tmp32_;
+	GSimpleAction* _tmp33_;
+	GSimpleAction* _tmp34_;
+	GVariant* _tmp35_;
+	GVariant* _tmp36_;
+	gboolean _tmp37_;
 	RatingFilter filter = 0;
-	SearchFilterActions* _tmp38_ = NULL;
-	GSimpleAction* _tmp39_ = NULL;
-	GSimpleAction* _tmp40_ = NULL;
-	GVariant* _tmp41_ = NULL;
-	GVariant* _tmp42_ = NULL;
-	const gchar* _tmp43_ = NULL;
-	gint _tmp44_ = 0;
-	RatingFilter _tmp45_ = 0;
-	SearchViewFilter* _tmp46_ = NULL;
-	RatingFilter _tmp47_ = 0;
-	SearchFilterToolbarRatingFilterButton* _tmp48_ = NULL;
-	RatingFilter _tmp49_ = 0;
-	SearchViewFilter* _tmp50_ = NULL;
-	SavedSearch* _tmp51_ = NULL;
+	SearchFilterActions* _tmp38_;
+	GSimpleAction* _tmp39_;
+	GSimpleAction* _tmp40_;
+	GVariant* _tmp41_;
+	GVariant* _tmp42_;
+	const gchar* _tmp43_;
+	gint _tmp44_;
+	RatingFilter _tmp45_;
+	SearchViewFilter* _tmp46_;
+	RatingFilter _tmp47_;
+	SearchFilterToolbarRatingFilterButton* _tmp48_;
+	RatingFilter _tmp49_;
+	SearchViewFilter* _tmp50_;
+	SavedSearch* _tmp51_;
 	SearchFilterCriteria criteria = 0;
-	SearchFilterActions* _tmp52_ = NULL;
-	SearchFilterCriteria _tmp53_ = 0;
-	SearchFilterToolbarSearchBox* _tmp54_ = NULL;
-	SearchFilterCriteria _tmp55_ = 0;
-	SearchFilterToolbarRatingFilterButton* _tmp56_ = NULL;
-	SearchFilterCriteria _tmp57_ = 0;
-	SearchFilterToolbarToggleActionToolButton* _tmp58_ = NULL;
-	SearchFilterCriteria _tmp59_ = 0;
-	SearchFilterToolbarLabelToolItem* _tmp60_ = NULL;
-	SearchFilterCriteria _tmp61_ = 0;
-	SearchFilterToolbarToggleActionToolButton* _tmp62_ = NULL;
-	SearchFilterCriteria _tmp63_ = 0;
-	SearchFilterToolbarToggleActionToolButton* _tmp64_ = NULL;
-	SearchFilterCriteria _tmp65_ = 0;
-	SearchFilterToolbarToggleActionToolButton* _tmp66_ = NULL;
-	SearchFilterCriteria _tmp67_ = 0;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp68_ = NULL;
-	SearchFilterCriteria _tmp69_ = 0;
+	SearchFilterActions* _tmp52_;
+	SearchFilterCriteria _tmp53_;
+	SearchFilterToolbarSearchBox* _tmp54_;
+	SearchFilterCriteria _tmp55_;
+	SearchFilterToolbarRatingFilterButton* _tmp56_;
+	SearchFilterCriteria _tmp57_;
+	SearchFilterToolbarToggleActionToolButton* _tmp58_;
+	SearchFilterCriteria _tmp59_;
+	SearchFilterToolbarLabelToolItem* _tmp60_;
+	SearchFilterCriteria _tmp61_;
+	SearchFilterToolbarToggleActionToolButton* _tmp62_;
+	SearchFilterCriteria _tmp63_;
+	SearchFilterToolbarToggleActionToolButton* _tmp64_;
+	SearchFilterCriteria _tmp65_;
+	SearchFilterToolbarToggleActionToolButton* _tmp66_;
+	SearchFilterCriteria _tmp67_;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp68_;
+	SearchFilterCriteria _tmp69_;
 	gboolean _tmp70_ = FALSE;
-	SearchFilterToolbarLabelToolItem* _tmp71_ = NULL;
-	gboolean _tmp72_ = FALSE;
-	gboolean _tmp73_ = FALSE;
-	GtkSeparatorToolItem* _tmp77_ = NULL;
+	SearchFilterToolbarLabelToolItem* _tmp71_;
+	gboolean _tmp72_;
+	gboolean _tmp73_;
+	GtkSeparatorToolItem* _tmp77_;
 	gboolean _tmp78_ = FALSE;
 	gboolean _tmp79_ = FALSE;
-	SearchFilterToolbarLabelToolItem* _tmp80_ = NULL;
-	gboolean _tmp81_ = FALSE;
-	gboolean _tmp82_ = FALSE;
-	GtkSeparatorToolItem* _tmp93_ = NULL;
-	SearchViewFilter* _tmp94_ = NULL;
-#line 1280 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SearchFilterToolbarLabelToolItem* _tmp80_;
+	gboolean _tmp81_;
+	gboolean _tmp82_;
+	GtkSeparatorToolItem* _tmp93_;
+	SearchViewFilter* _tmp94_;
+#line 1278 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1279 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1279 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (NULL == _tmp0_) {
-#line 5969 "SearchFilter.c"
-		LibraryWindow* _tmp1_ = NULL;
-		LibraryWindow* _tmp2_ = NULL;
-#line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 5949 "SearchFilter.c"
+		LibraryWindow* _tmp1_;
+		LibraryWindow* _tmp2_;
+#line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp1_ = library_window_get_app ();
-#line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = _tmp1_;
-#line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		library_window_show_search_bar (_tmp2_, TRUE);
-#line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp2_);
-#line 5980 "SearchFilter.c"
+#line 5960 "SearchFilter.c"
 	}
-#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->search_filter;
-#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_vala_assert (NULL != _tmp3_, "null != search_filter");
-#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->search_filter;
-#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->priv->actions;
-#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = search_filter_actions_get_text (_tmp5_);
-#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = _tmp6_;
-#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = text_action_get_value (_tmp7_);
-#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = _tmp8_;
-#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_view_filter_set_search_filter (_tmp4_, _tmp9_);
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = self->priv->search_filter;
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = self->priv->actions;
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = search_filter_actions_get_flagged (_tmp11_);
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp13_ = _tmp12_;
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp14_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, g_action_get_type (), GAction));
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp15_ = _tmp14_;
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp16_ = g_variant_get_boolean (_tmp15_);
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_view_filter_set_flagged (_tmp10_, _tmp16_);
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp15_);
-#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp17_ = self->priv->search_filter;
-#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp18_ = self->priv->actions;
-#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp19_ = search_filter_actions_get_videos (_tmp18_);
-#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp20_ = _tmp19_;
-#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp21_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, g_action_get_type (), GAction));
-#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp22_ = _tmp21_;
-#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp23_ = g_variant_get_boolean (_tmp22_);
-#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_view_filter_set_show_media_video (_tmp17_, _tmp23_);
-#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp22_);
-#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp24_ = self->priv->search_filter;
-#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp25_ = self->priv->actions;
-#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp26_ = search_filter_actions_get_photos (_tmp25_);
-#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp27_ = _tmp26_;
-#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp28_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, g_action_get_type (), GAction));
-#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp29_ = _tmp28_;
-#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp30_ = g_variant_get_boolean (_tmp29_);
-#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_view_filter_set_show_media_photos (_tmp24_, _tmp30_);
-#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp29_);
-#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp31_ = self->priv->search_filter;
-#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp32_ = self->priv->actions;
-#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp33_ = search_filter_actions_get_raw (_tmp32_);
-#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp34_ = _tmp33_;
-#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp35_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, g_action_get_type (), GAction));
-#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp36_ = _tmp35_;
-#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp37_ = g_variant_get_boolean (_tmp36_);
-#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_view_filter_set_show_media_raw (_tmp31_, _tmp37_);
-#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp36_);
-#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp38_ = self->priv->actions;
-#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp39_ = search_filter_actions_get_rating (_tmp38_);
-#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp40_ = _tmp39_;
-#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp41_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, g_action_get_type (), GAction));
-#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp42_ = _tmp41_;
-#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp43_ = g_variant_get_string (_tmp42_, NULL);
-#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp44_ = atoi (_tmp43_);
-#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp45_ = (RatingFilter) _tmp44_;
-#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp42_);
-#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	filter = _tmp45_;
-#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp46_ = self->priv->search_filter;
-#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp47_ = filter;
-#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_view_filter_set_rating_filter (_tmp46_, _tmp47_);
-#line 1298 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp48_ = self->priv->rating_button;
-#line 1298 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp49_ = filter;
-#line 1298 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_rating_filter_button_set_filter_icon (_tmp48_, _tmp49_);
-#line 1300 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1298 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp50_ = self->priv->search_filter;
-#line 1300 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1298 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp51_ = self->priv->saved_search;
-#line 1300 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1298 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_view_filter_set_saved_search (_tmp50_, _tmp51_);
-#line 1304 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1302 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp52_ = self->priv->actions;
-#line 1304 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1302 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp53_ = search_filter_actions_get_criteria (_tmp52_);
-#line 1304 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1302 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	criteria = _tmp53_;
-#line 1306 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1304 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp54_ = self->priv->search_box;
-#line 1306 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1304 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp55_ = criteria;
-#line 1306 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1304 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), (_tmp55_ & SEARCH_FILTER_CRITERIA_TEXT) != 0);
-#line 1308 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1306 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp56_ = self->priv->rating_button;
-#line 1308 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1306 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp57_ = criteria;
-#line 1308 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1306 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget), (_tmp57_ & SEARCH_FILTER_CRITERIA_RATING) != 0);
-#line 1310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1308 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp58_ = self->priv->toolbtn_flag;
-#line 1310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1308 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp59_ = criteria;
-#line 1310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1308 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), (_tmp59_ & SEARCH_FILTER_CRITERIA_FLAG) != 0);
-#line 1312 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp60_ = self->priv->label_type;
-#line 1312 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp61_ = criteria;
-#line 1312 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), (_tmp61_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0);
-#line 1313 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1311 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp62_ = self->priv->toolbtn_photos;
-#line 1313 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1311 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp63_ = criteria;
-#line 1313 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1311 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), (_tmp63_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0);
-#line 1314 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1312 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp64_ = self->priv->toolbtn_videos;
-#line 1314 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1312 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp65_ = criteria;
-#line 1314 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1312 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), (_tmp65_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0);
-#line 1315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1313 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp66_ = self->priv->toolbtn_raw;
-#line 1315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1313 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp67_ = criteria;
-#line 1315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1313 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), (_tmp67_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0);
-#line 1317 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp68_ = self->priv->saved_search_button;
-#line 1317 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp69_ = criteria;
-#line 1317 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget), (_tmp69_ & SEARCH_FILTER_CRITERIA_SAVEDSEARCH) != 0);
-#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp71_ = self->priv->label_type;
-#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp72_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget));
-#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp73_ = _tmp72_;
-#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp73_) {
-#line 6172 "SearchFilter.c"
-		SearchFilterToolbarToggleActionToolButton* _tmp74_ = NULL;
-		gboolean _tmp75_ = FALSE;
-		gboolean _tmp76_ = FALSE;
-#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 6152 "SearchFilter.c"
+		SearchFilterToolbarToggleActionToolButton* _tmp74_;
+		gboolean _tmp75_;
+		gboolean _tmp76_;
+#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp74_ = self->priv->toolbtn_flag;
-#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp75_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
-#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp76_ = _tmp75_;
-#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp70_ = _tmp76_;
-#line 6184 "SearchFilter.c"
+#line 6164 "SearchFilter.c"
 	} else {
-#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp70_ = FALSE;
-#line 6188 "SearchFilter.c"
+#line 6168 "SearchFilter.c"
 	}
-#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp77_ = self->priv->sepr_mediatype_flagged;
-#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget), _tmp70_);
-#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp80_ = self->priv->label_type;
-#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp81_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget));
-#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp82_ = _tmp81_;
-#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp82_) {
-#line 6202 "SearchFilter.c"
-		SearchFilterToolbarRatingFilterButton* _tmp83_ = NULL;
-		gboolean _tmp84_ = FALSE;
-		gboolean _tmp85_ = FALSE;
-#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 6182 "SearchFilter.c"
+		SearchFilterToolbarRatingFilterButton* _tmp83_;
+		gboolean _tmp84_;
+		gboolean _tmp85_;
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp83_ = self->priv->rating_button;
-#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp84_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_widget_get_type (), GtkWidget));
-#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp85_ = _tmp84_;
-#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp79_ = _tmp85_;
-#line 6214 "SearchFilter.c"
+#line 6194 "SearchFilter.c"
 	} else {
-#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp79_ = FALSE;
-#line 6218 "SearchFilter.c"
+#line 6198 "SearchFilter.c"
 	}
-#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp79_) {
-#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp78_ = TRUE;
-#line 6224 "SearchFilter.c"
+#line 6204 "SearchFilter.c"
 	} else {
 		gboolean _tmp86_ = FALSE;
-		SearchFilterToolbarToggleActionToolButton* _tmp87_ = NULL;
-		gboolean _tmp88_ = FALSE;
-		gboolean _tmp89_ = FALSE;
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		SearchFilterToolbarToggleActionToolButton* _tmp87_;
+		gboolean _tmp88_;
+		gboolean _tmp89_;
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp87_ = self->priv->toolbtn_flag;
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp88_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_widget_get_type (), GtkWidget));
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp89_ = _tmp88_;
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp89_) {
-#line 6238 "SearchFilter.c"
-			SearchFilterToolbarRatingFilterButton* _tmp90_ = NULL;
-			gboolean _tmp91_ = FALSE;
-			gboolean _tmp92_ = FALSE;
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 6218 "SearchFilter.c"
+			SearchFilterToolbarRatingFilterButton* _tmp90_;
+			gboolean _tmp91_;
+			gboolean _tmp92_;
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp90_ = self->priv->rating_button;
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp91_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, gtk_widget_get_type (), GtkWidget));
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp92_ = _tmp91_;
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp86_ = _tmp92_;
-#line 6250 "SearchFilter.c"
+#line 6230 "SearchFilter.c"
 		} else {
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp86_ = FALSE;
-#line 6254 "SearchFilter.c"
+#line 6234 "SearchFilter.c"
 		}
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp78_ = _tmp86_;
-#line 6258 "SearchFilter.c"
+#line 6238 "SearchFilter.c"
 	}
-#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp93_ = self->priv->sepr_flagged_rating;
-#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, gtk_widget_get_type (), GtkWidget), _tmp78_);
-#line 1327 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp94_ = self->priv->search_filter;
-#line 1327 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 6268 "SearchFilter.c"
+#line 6248 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_savedsearch_selected (SearchFilterToolbar* self, SavedSearch* saved_search) {
-	SavedSearch* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
-#line 1330 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SavedSearch* _tmp0_;
+	SavedSearch* _tmp1_;
+#line 1328 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1330 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1328 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (saved_search));
-#line 1331 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = saved_search;
-#line 1331 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1331 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->saved_search);
-#line 1331 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->saved_search = _tmp1_;
-#line 1332 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1330 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6289 "SearchFilter.c"
+#line 6269 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_disable_savedsearch (SearchFilterToolbar* self) {
-#line 1335 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1336 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1334 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->saved_search);
-#line 1336 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1334 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->saved_search = NULL;
-#line 1337 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1335 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6302 "SearchFilter.c"
+#line 6282 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_edit_dialog (SearchFilterToolbar* self, SavedSearch* search) {
-	SearchFilterToolbarSavedSearchFilterButton* _tmp0_ = NULL;
-	SearchFilterToolbarSavedSearchPopover* _tmp1_ = NULL;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp0_;
+	SearchFilterToolbarSavedSearchPopover* _tmp1_;
 	SavedSearchDialog* ssd = NULL;
-	SavedSearch* _tmp2_ = NULL;
-	SavedSearchDialog* _tmp3_ = NULL;
-#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SavedSearch* _tmp2_;
+	SavedSearchDialog* _tmp3_;
+#line 1338 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1338 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1339 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->saved_search_button;
-#line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1339 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_->filter_popup;
-#line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1339 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_hide (_tmp1_);
-#line 1342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search;
-#line 1342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = saved_search_dialog_new_edit_existing (_tmp2_);
-#line 1342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	ssd = _tmp3_;
-#line 1343 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	saved_search_dialog_show (ssd);
-#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1338 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_saved_search_dialog_unref0 (ssd);
-#line 6332 "SearchFilter.c"
+#line 6312 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, SavedSearch* search) {
-	SearchFilterToolbarSavedSearchFilterButton* _tmp0_ = NULL;
-	SearchFilterToolbarSavedSearchPopover* _tmp1_ = NULL;
-	SavedSearch* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-#line 1346 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SearchFilterToolbarSavedSearchFilterButton* _tmp0_;
+	SearchFilterToolbarSavedSearchPopover* _tmp1_;
+	SavedSearch* _tmp2_;
+	gboolean _tmp3_;
+#line 1344 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1346 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1344 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1345 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->saved_search_button;
-#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1345 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_->filter_popup;
-#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1345 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_hide (_tmp1_);
-#line 1348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1346 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search;
-#line 1348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1346 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = dialogs_confirm_delete_saved_search (_tmp2_);
-#line 1348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1346 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_) {
-#line 6357 "SearchFilter.c"
-		CommandManager* _tmp4_ = NULL;
-		CommandManager* _tmp5_ = NULL;
-		SavedSearch* _tmp6_ = NULL;
-		DeleteSavedSearchCommand* _tmp7_ = NULL;
-		DeleteSavedSearchCommand* _tmp8_ = NULL;
-#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 6337 "SearchFilter.c"
+		CommandManager* _tmp4_;
+		CommandManager* _tmp5_;
+		SavedSearch* _tmp6_;
+		DeleteSavedSearchCommand* _tmp7_;
+		DeleteSavedSearchCommand* _tmp8_;
+#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = app_window_get_command_manager ();
-#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = _tmp4_;
-#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = search;
-#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp7_ = delete_saved_search_command_new (_tmp6_);
-#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp8_ = _tmp7_;
-#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command));
-#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp8_);
-#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_command_manager_unref0 (_tmp5_);
-#line 6379 "SearchFilter.c"
+#line 6359 "SearchFilter.c"
 	}
 }
 
 
 static void search_filter_toolbar_add_dialog (SearchFilterToolbar* self) {
-	SearchFilterToolbarSavedSearchFilterButton* _tmp0_ = NULL;
-	SearchFilterToolbarSavedSearchPopover* _tmp1_ = NULL;
-	SavedSearchDialog* _tmp2_ = NULL;
-	SavedSearchDialog* _tmp3_ = NULL;
-#line 1352 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SearchFilterToolbarSavedSearchFilterButton* _tmp0_;
+	SearchFilterToolbarSavedSearchPopover* _tmp1_;
+	SavedSearchDialog* _tmp2_;
+	SavedSearchDialog* _tmp3_;
+#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1353 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1351 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->saved_search_button;
-#line 1353 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1351 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_->filter_popup;
-#line 1353 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1351 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_hide (_tmp1_);
-#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1352 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = saved_search_dialog_new ();
-#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1352 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _tmp2_;
-#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1352 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	saved_search_dialog_show (_tmp3_);
-#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1352 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_saved_search_dialog_unref0 (_tmp3_);
-#line 6405 "SearchFilter.c"
+#line 6385 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_popover_closed (SearchFilterToolbar* self) {
-	SearchFilterToolbarSavedSearchFilterButton* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp2_ = NULL;
-	SearchFilterToolbarSavedSearchPopover* _tmp3_ = NULL;
-#line 1357 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SearchFilterToolbarSavedSearchFilterButton* _tmp0_;
+	SavedSearch* _tmp1_;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp2_;
+	SearchFilterToolbarSavedSearchPopover* _tmp3_;
+#line 1355 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1359 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1357 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->elide_showing_again = TRUE;
-#line 1360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1358 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->saved_search_button;
-#line 1360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1358 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->priv->saved_search;
-#line 1360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1358 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_filter_button_set_active (_tmp0_, _tmp1_ != NULL);
-#line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1359 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = self->priv->saved_search_button;
-#line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1359 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _tmp2_->filter_popup;
-#line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1359 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_hide (_tmp3_);
-#line 6430 "SearchFilter.c"
+#line 6410 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) {
-#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_edit_dialog ((SearchFilterToolbar*) self, search);
-#line 6437 "SearchFilter.c"
+#line 6417 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_savedsearch_selected_search_filter_toolbar_saved_search_popover_search_activated (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) {
-#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_savedsearch_selected ((SearchFilterToolbar*) self, search);
-#line 6444 "SearchFilter.c"
+#line 6424 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) {
-#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_delete_dialog ((SearchFilterToolbar*) self, search);
-#line 6451 "SearchFilter.c"
+#line 6431 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) {
-#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_add_dialog ((SearchFilterToolbar*) self);
-#line 6458 "SearchFilter.c"
+#line 6438 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) {
-#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_popover_closed ((SearchFilterToolbar*) self);
-#line 6465 "SearchFilter.c"
+#line 6445 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterToolbar* self) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-#line 1364 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gboolean _tmp1_;
+#line 1362 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1363 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->priv->elide_showing_again;
-#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1363 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 6478 "SearchFilter.c"
-		SavedSearch* _tmp2_ = NULL;
-#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 6458 "SearchFilter.c"
+		SavedSearch* _tmp2_;
+#line 1363 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = self->priv->saved_search;
-#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1363 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 6484 "SearchFilter.c"
+#line 6464 "SearchFilter.c"
 	} else {
-#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1363 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = FALSE;
-#line 6488 "SearchFilter.c"
+#line 6468 "SearchFilter.c"
 	}
-#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1363 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_) {
-#line 6492 "SearchFilter.c"
+#line 6472 "SearchFilter.c"
 	} else {
-		SavedSearch* _tmp3_ = NULL;
-#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		SavedSearch* _tmp3_;
+#line 1364 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = self->priv->saved_search;
-#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1364 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp3_ != NULL) {
-#line 6499 "SearchFilter.c"
-			SearchFilterToolbarSavedSearchFilterButton* _tmp4_ = NULL;
-#line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 6479 "SearchFilter.c"
+			SearchFilterToolbarSavedSearchFilterButton* _tmp4_;
+#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (self->priv->saved_search);
-#line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->saved_search = NULL;
-#line 1368 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp4_ = self->priv->saved_search_button;
-#line 1368 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_saved_search_filter_button_set_active (_tmp4_, FALSE);
-#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_disable_savedsearch (self);
-#line 6511 "SearchFilter.c"
+#line 6491 "SearchFilter.c"
 		} else {
-			SearchFilterToolbarSavedSearchFilterButton* _tmp5_ = NULL;
-			SearchFilterToolbarSavedSearchPopover* _tmp6_ = NULL;
-			SearchFilterToolbarSavedSearchFilterButton* _tmp22_ = NULL;
-			SearchFilterToolbarSavedSearchFilterButton* _tmp23_ = NULL;
-			SearchFilterToolbarSavedSearchPopover* _tmp24_ = NULL;
-			SearchFilterToolbarSavedSearchFilterButton* _tmp25_ = NULL;
-			SearchFilterToolbarSavedSearchPopover* _tmp26_ = NULL;
-			SearchFilterToolbarSavedSearchFilterButton* _tmp27_ = NULL;
-			SearchFilterToolbarSavedSearchPopover* _tmp28_ = NULL;
-			SearchFilterToolbarSavedSearchFilterButton* _tmp29_ = NULL;
-			SearchFilterToolbarSavedSearchPopover* _tmp30_ = NULL;
-			SearchFilterToolbarSavedSearchFilterButton* _tmp31_ = NULL;
-			SearchFilterToolbarSavedSearchPopover* _tmp32_ = NULL;
-			SearchFilterToolbarSavedSearchFilterButton* _tmp33_ = NULL;
-			SearchFilterToolbarSavedSearchPopover* _tmp34_ = NULL;
-			SearchFilterToolbarSavedSearchFilterButton* _tmp35_ = NULL;
-			SearchFilterToolbarSavedSearchPopover* _tmp36_ = NULL;
-#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			SearchFilterToolbarSavedSearchFilterButton* _tmp5_;
+			SearchFilterToolbarSavedSearchPopover* _tmp6_;
+			SearchFilterToolbarSavedSearchFilterButton* _tmp22_;
+			SearchFilterToolbarSavedSearchFilterButton* _tmp23_;
+			SearchFilterToolbarSavedSearchPopover* _tmp24_;
+			SearchFilterToolbarSavedSearchFilterButton* _tmp25_;
+			SearchFilterToolbarSavedSearchPopover* _tmp26_;
+			SearchFilterToolbarSavedSearchFilterButton* _tmp27_;
+			SearchFilterToolbarSavedSearchPopover* _tmp28_;
+			SearchFilterToolbarSavedSearchFilterButton* _tmp29_;
+			SearchFilterToolbarSavedSearchPopover* _tmp30_;
+			SearchFilterToolbarSavedSearchFilterButton* _tmp31_;
+			SearchFilterToolbarSavedSearchPopover* _tmp32_;
+			SearchFilterToolbarSavedSearchFilterButton* _tmp33_;
+			SearchFilterToolbarSavedSearchPopover* _tmp34_;
+			SearchFilterToolbarSavedSearchFilterButton* _tmp35_;
+			SearchFilterToolbarSavedSearchPopover* _tmp36_;
+#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp5_ = self->priv->saved_search_button;
-#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = _tmp5_->filter_popup;
-#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (_tmp6_ != NULL) {
-#line 6536 "SearchFilter.c"
-				SearchFilterToolbarSavedSearchFilterButton* _tmp7_ = NULL;
-				SearchFilterToolbarSavedSearchPopover* _tmp8_ = NULL;
-				guint _tmp9_ = 0U;
-				SearchFilterToolbarSavedSearchFilterButton* _tmp10_ = NULL;
-				SearchFilterToolbarSavedSearchPopover* _tmp11_ = NULL;
-				guint _tmp12_ = 0U;
-				SearchFilterToolbarSavedSearchFilterButton* _tmp13_ = NULL;
-				SearchFilterToolbarSavedSearchPopover* _tmp14_ = NULL;
-				guint _tmp15_ = 0U;
-				SearchFilterToolbarSavedSearchFilterButton* _tmp16_ = NULL;
-				SearchFilterToolbarSavedSearchPopover* _tmp17_ = NULL;
-				guint _tmp18_ = 0U;
-				SearchFilterToolbarSavedSearchFilterButton* _tmp19_ = NULL;
-				SearchFilterToolbarSavedSearchPopover* _tmp20_ = NULL;
-				guint _tmp21_ = 0U;
-#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 6516 "SearchFilter.c"
+				SearchFilterToolbarSavedSearchFilterButton* _tmp7_;
+				SearchFilterToolbarSavedSearchPopover* _tmp8_;
+				guint _tmp9_;
+				SearchFilterToolbarSavedSearchFilterButton* _tmp10_;
+				SearchFilterToolbarSavedSearchPopover* _tmp11_;
+				guint _tmp12_;
+				SearchFilterToolbarSavedSearchFilterButton* _tmp13_;
+				SearchFilterToolbarSavedSearchPopover* _tmp14_;
+				guint _tmp15_;
+				SearchFilterToolbarSavedSearchFilterButton* _tmp16_;
+				SearchFilterToolbarSavedSearchPopover* _tmp17_;
+				guint _tmp18_;
+				SearchFilterToolbarSavedSearchFilterButton* _tmp19_;
+				SearchFilterToolbarSavedSearchPopover* _tmp20_;
+				guint _tmp21_;
+#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp7_ = self->priv->saved_search_button;
-#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp8_ = _tmp7_->filter_popup;
-#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("edit-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp9_, NULL, FALSE);
-#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked, self);
-#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp10_ = self->priv->saved_search_button;
-#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp11_ = _tmp10_->filter_popup;
-#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("search-activated", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp12_, NULL, FALSE);
-#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _search_filter_toolbar_on_savedsearch_selected_search_filter_toolbar_saved_search_popover_search_activated, self);
-#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp13_ = self->priv->saved_search_button;
-#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp14_ = _tmp13_->filter_popup;
-#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("delete-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp15_, NULL, FALSE);
-#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked, self);
-#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp16_ = self->priv->saved_search_button;
-#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp17_ = _tmp16_->filter_popup;
-#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("add-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp18_, NULL, FALSE);
-#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked, self);
-#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp19_ = self->priv->saved_search_button;
-#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp20_ = _tmp19_->filter_popup;
-#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("closed", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp21_, NULL, FALSE);
-#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (_tmp20_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp21_, 0, NULL, (GCallback) _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed, self);
-#line 6592 "SearchFilter.c"
+#line 6572 "SearchFilter.c"
 			}
-#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp22_ = self->priv->saved_search_button;
-#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp23_ = self->priv->saved_search_button;
-#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp24_ = search_filter_toolbar_saved_search_popover_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
-#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_search_filter_toolbar_saved_search_popover_unref0 (_tmp22_->filter_popup);
-#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp22_->filter_popup = _tmp24_;
-#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp25_ = self->priv->saved_search_button;
-#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp26_ = _tmp25_->filter_popup;
-#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_connect_object (_tmp26_, "edit-clicked", (GCallback) _search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked, self, 0);
-#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp27_ = self->priv->saved_search_button;
-#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp28_ = _tmp27_->filter_popup;
-#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_connect_object (_tmp28_, "search-activated", (GCallback) _search_filter_toolbar_on_savedsearch_selected_search_filter_toolbar_saved_search_popover_search_activated, self, 0);
-#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp29_ = self->priv->saved_search_button;
-#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp30_ = _tmp29_->filter_popup;
-#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_connect_object (_tmp30_, "delete-clicked", (GCallback) _search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked, self, 0);
-#line 1382 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp31_ = self->priv->saved_search_button;
-#line 1382 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp32_ = _tmp31_->filter_popup;
-#line 1382 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_connect_object (_tmp32_, "add-clicked", (GCallback) _search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked, self, 0);
-#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp33_ = self->priv->saved_search_button;
-#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp34_ = _tmp33_->filter_popup;
-#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_connect_object (_tmp34_, "closed", (GCallback) _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed, self, 0);
-#line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp35_ = self->priv->saved_search_button;
-#line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp36_ = _tmp35_->filter_popup;
-#line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_saved_search_popover_show_all (_tmp36_);
-#line 6640 "SearchFilter.c"
+#line 6620 "SearchFilter.c"
 		}
 	}
-#line 1387 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->elide_showing_again = FALSE;
-#line 6645 "SearchFilter.c"
+#line 6625 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_take_focus (SearchFilterToolbar* self) {
-	SearchFilterToolbarSearchBox* _tmp0_ = NULL;
-#line 1390 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SearchFilterToolbarSearchBox* _tmp0_;
+#line 1388 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1391 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1389 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->search_box;
-#line 1391 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1389 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_get_focus (_tmp0_);
-#line 6657 "SearchFilter.c"
+#line 6637 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_construct (GType object_type, const gchar* s, gint left_padding, gint right_padding) {
 	SearchFilterToolbarLabelToolItem * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	GtkLabel* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	GtkLabel* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
-	GtkLabel* _tmp11_ = NULL;
-#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gint _tmp3_;
+	GtkLabel* _tmp11_;
+#line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (s != NULL, NULL);
-#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbarLabelToolItem*) g_object_new (object_type, NULL);
-#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = s;
-#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = (GtkLabel*) gtk_label_new (_tmp0_);
-#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp1_);
-#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->label);
-#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->label = _tmp1_;
-#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = left_padding;
-#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_ != 0) {
-#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = TRUE;
-#line 6688 "SearchFilter.c"
+#line 6668 "SearchFilter.c"
 	} else {
-		gint _tmp4_ = 0;
-#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		gint _tmp4_;
+#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = right_padding;
-#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = _tmp4_ != 0;
-#line 6695 "SearchFilter.c"
+#line 6675 "SearchFilter.c"
 	}
-#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_) {
-#line 6699 "SearchFilter.c"
-		GtkLabel* _tmp5_ = NULL;
-		GtkLabel* _tmp6_ = NULL;
-		GtkLabel* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		GtkLabel* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-#line 623 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 6679 "SearchFilter.c"
+		GtkLabel* _tmp5_;
+		GtkLabel* _tmp6_;
+		GtkLabel* _tmp7_;
+		gint _tmp8_;
+		GtkLabel* _tmp9_;
+		gint _tmp10_;
+#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = self->priv->label;
-#line 623 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 624 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = self->priv->label;
-#line 624 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 625 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp7_ = self->priv->label;
-#line 625 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp8_ = left_padding;
-#line 625 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp8_);
-#line 626 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp9_ = self->priv->label;
-#line 626 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp10_ = right_padding;
-#line 626 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), _tmp10_);
-#line 6726 "SearchFilter.c"
+#line 6706 "SearchFilter.c"
 	}
-#line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 624 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = self->priv->label;
-#line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 624 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 6734 "SearchFilter.c"
+#line 6714 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_new (const gchar* s, gint left_padding, gint right_padding) {
-#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_label_tool_item_construct (SEARCH_FILTER_TOOLBAR_TYPE_LABEL_TOOL_ITEM, s, left_padding, right_padding);
-#line 6741 "SearchFilter.c"
+#line 6721 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_label_tool_item_class_init (SearchFilterToolbarLabelToolItemClass * klass) {
-#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 613 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_label_tool_item_parent_class = g_type_class_peek_parent (klass);
-#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 613 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarLabelToolItemPrivate));
-#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 613 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_label_tool_item_finalize;
-#line 6752 "SearchFilter.c"
+#line 6732 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_label_tool_item_instance_init (SearchFilterToolbarLabelToolItem * self) {
-#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 613 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_LABEL_TOOL_ITEM_GET_PRIVATE (self);
-#line 6759 "SearchFilter.c"
+#line 6739 "SearchFilter.c"
 }
 
 
-static void search_filter_toolbar_label_tool_item_finalize (GObject* obj) {
+static void search_filter_toolbar_label_tool_item_finalize (GObject * obj) {
 	SearchFilterToolbarLabelToolItem * self;
-#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 613 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_LABEL_TOOL_ITEM, SearchFilterToolbarLabelToolItem);
-#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->label);
-#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 613 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_label_tool_item_parent_class)->finalize (obj);
-#line 6771 "SearchFilter.c"
+#line 6751 "SearchFilter.c"
 }
 
 
@@ -6785,153 +6765,153 @@ static GType search_filter_toolbar_label_tool_item_get_type (void) {
 
 static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_construct (GType object_type, const gchar* action) {
 	SearchFilterToolbarToggleActionToolButton * self = NULL;
-	GtkToggleButton* _tmp0_ = NULL;
-	GtkToggleButton* _tmp1_ = NULL;
-	GtkToggleButton* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	GtkToggleButton* _tmp4_ = NULL;
-	GtkToggleButton* _tmp5_ = NULL;
-	GtkToggleButton* _tmp6_ = NULL;
-	GtkToggleButton* _tmp7_ = NULL;
-#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkToggleButton* _tmp0_;
+	GtkToggleButton* _tmp1_;
+	GtkToggleButton* _tmp2_;
+	const gchar* _tmp3_;
+	GtkToggleButton* _tmp4_;
+	GtkToggleButton* _tmp5_;
+	GtkToggleButton* _tmp6_;
+	GtkToggleButton* _tmp7_;
+#line 631 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (action != NULL, NULL);
-#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 631 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbarToggleActionToolButton*) g_object_new (object_type, NULL);
-#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = (GtkToggleButton*) gtk_toggle_button_new ();
-#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp0_);
-#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->button);
-#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->button = _tmp0_;
-#line 637 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 633 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->priv->button;
-#line 637 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 633 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 638 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 634 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = self->priv->button;
-#line 638 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 634 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = action;
-#line 638 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 634 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_ACTIONABLE, GtkActionable), _tmp3_);
-#line 639 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->button;
-#line 639 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_has_tooltip (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 640 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->priv->button;
-#line 640 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_relief (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), GTK_RELIEF_NONE);
-#line 641 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 637 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = self->priv->button;
-#line 641 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 637 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 2);
-#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 639 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = self->priv->button;
-#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 639 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 631 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 6837 "SearchFilter.c"
+#line 6817 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_new (const gchar* action) {
-#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 631 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_toggle_action_tool_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_TOGGLE_ACTION_TOOL_BUTTON, action);
-#line 6844 "SearchFilter.c"
+#line 6824 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_toggle_action_tool_button_set_icon_name (SearchFilterToolbarToggleActionToolButton* self, const gchar* icon_name) {
 	GtkImage* image = NULL;
-	GtkToggleButton* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkImage* _tmp2_ = NULL;
-	GtkImage* _tmp3_ = NULL;
-	GtkToggleButton* _tmp4_ = NULL;
-	GtkImage* _tmp5_ = NULL;
-#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkToggleButton* _tmp0_;
+	const gchar* _tmp1_;
+	GtkImage* _tmp2_;
+	GtkImage* _tmp3_;
+	GtkToggleButton* _tmp4_;
+	GtkImage* _tmp5_;
+#line 642 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_TOGGLE_ACTION_TOOL_BUTTON (self));
-#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 642 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (icon_name != NULL);
-#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	image = NULL;
-#line 648 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 644 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->button;
-#line 648 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 644 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_always_show_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), TRUE);
-#line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 645 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = icon_name;
-#line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 645 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = (GtkImage*) gtk_image_new_from_icon_name (_tmp1_, GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 645 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp2_);
-#line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 645 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (image);
-#line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 645 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	image = _tmp2_;
-#line 650 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = image;
-#line 650 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), 6);
-#line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->button;
-#line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = image;
-#line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 642 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (image);
-#line 6888 "SearchFilter.c"
+#line 6868 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_toggle_action_tool_button_set_label (SearchFilterToolbarToggleActionToolButton* self, const gchar* label) {
-	GtkToggleButton* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkToggleButton* _tmp0_;
+	const gchar* _tmp1_;
+#line 650 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_TOGGLE_ACTION_TOOL_BUTTON (self));
-#line 654 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 650 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (label != NULL);
-#line 655 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->button;
-#line 655 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = label;
-#line 655 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_);
-#line 6905 "SearchFilter.c"
+#line 6885 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_toggle_action_tool_button_class_init (SearchFilterToolbarToggleActionToolButtonClass * klass) {
-#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_toggle_action_tool_button_parent_class = g_type_class_peek_parent (klass);
-#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarToggleActionToolButtonPrivate));
-#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_toggle_action_tool_button_finalize;
-#line 6916 "SearchFilter.c"
+#line 6896 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_toggle_action_tool_button_instance_init (SearchFilterToolbarToggleActionToolButton * self) {
-#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_TOGGLE_ACTION_TOOL_BUTTON_GET_PRIVATE (self);
-#line 6923 "SearchFilter.c"
+#line 6903 "SearchFilter.c"
 }
 
 
-static void search_filter_toolbar_toggle_action_tool_button_finalize (GObject* obj) {
+static void search_filter_toolbar_toggle_action_tool_button_finalize (GObject * obj) {
 	SearchFilterToolbarToggleActionToolButton * self;
-#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_TOGGLE_ACTION_TOOL_BUTTON, SearchFilterToolbarToggleActionToolButton);
-#line 633 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->button);
-#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_toggle_action_tool_button_parent_class)->finalize (obj);
-#line 6935 "SearchFilter.c"
+#line 6915 "SearchFilter.c"
 }
 
 
@@ -6948,430 +6928,430 @@ static GType search_filter_toolbar_toggle_action_tool_button_get_type (void) {
 
 
 static void _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed (TextAction* _sender, const gchar* text, gpointer self) {
-#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 686 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_action_text_changed ((SearchFilterToolbarSearchBox*) self, text);
-#line 6954 "SearchFilter.c"
+#line 6934 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_search_box_on_sensitivity_changed_text_action_sensitivity_changed (TextAction* _sender, gboolean sensitive, gpointer self) {
-#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 687 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_sensitivity_changed ((SearchFilterToolbarSearchBox*) self, sensitive);
-#line 6961 "SearchFilter.c"
+#line 6941 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_search_box_on_visibility_changed_text_action_visibility_changed (TextAction* _sender, gboolean visible, gpointer self) {
-#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 688 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_visibility_changed ((SearchFilterToolbarSearchBox*) self, visible);
-#line 6968 "SearchFilter.c"
+#line 6948 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text (GtkEntryBuffer* _sender, guint position, guint n_chars, gpointer self) {
-#line 694 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_entry_changed ((SearchFilterToolbarSearchBox*) self);
-#line 6975 "SearchFilter.c"
+#line 6955 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text (GtkEntryBuffer* _sender, guint position, const gchar* chars, guint n_chars, gpointer self) {
-#line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_entry_changed ((SearchFilterToolbarSearchBox*) self);
-#line 6982 "SearchFilter.c"
+#line 6962 "SearchFilter.c"
 }
 
 
 static gpointer _text_action_ref0 (gpointer self) {
-#line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 668 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? text_action_ref (self) : NULL;
-#line 6989 "SearchFilter.c"
+#line 6969 "SearchFilter.c"
 }
 
 
 static gboolean _search_filter_toolbar_search_box_on_escape_key_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
 	result = search_filter_toolbar_search_box_on_escape_key ((SearchFilterToolbarSearchBox*) self, event);
-#line 676 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 6998 "SearchFilter.c"
+#line 6978 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_construct (GType object_type, TextAction* action) {
 	SearchFilterToolbarSearchBox * self = NULL;
-	TextAction* _tmp0_ = NULL;
-	TextAction* _tmp1_ = NULL;
-	GtkSearchEntry* _tmp2_ = NULL;
-	GtkSearchEntry* _tmp3_ = NULL;
-	GtkSearchEntry* _tmp4_ = NULL;
-	GtkSearchEntry* _tmp5_ = NULL;
-	TextAction* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	TextAction* _tmp9_ = NULL;
-	TextAction* _tmp10_ = NULL;
-	TextAction* _tmp11_ = NULL;
-	GtkSearchEntry* _tmp12_ = NULL;
-	GtkEntryBuffer* _tmp13_ = NULL;
-	GtkEntryBuffer* _tmp14_ = NULL;
-	GtkSearchEntry* _tmp15_ = NULL;
-	GtkEntryBuffer* _tmp16_ = NULL;
-	GtkEntryBuffer* _tmp17_ = NULL;
-#line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	TextAction* _tmp0_;
+	TextAction* _tmp1_;
+	GtkSearchEntry* _tmp2_;
+	GtkSearchEntry* _tmp3_;
+	GtkSearchEntry* _tmp4_;
+	GtkSearchEntry* _tmp5_;
+	TextAction* _tmp6_;
+	const gchar* _tmp7_;
+	const gchar* _tmp8_;
+	TextAction* _tmp9_;
+	TextAction* _tmp10_;
+	TextAction* _tmp11_;
+	GtkSearchEntry* _tmp12_;
+	GtkEntryBuffer* _tmp13_;
+	GtkEntryBuffer* _tmp14_;
+	GtkSearchEntry* _tmp15_;
+	GtkEntryBuffer* _tmp16_;
+	GtkEntryBuffer* _tmp17_;
+#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_TEXT_ACTION (action), NULL);
-#line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbarSearchBox*) g_object_new (object_type, NULL);
-#line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 668 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = action;
-#line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 668 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _text_action_ref0 (_tmp0_);
-#line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 668 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_text_action_unref0 (self->priv->action);
-#line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 668 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->action = _tmp1_;
-#line 673 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 669 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = (GtkSearchEntry*) gtk_search_entry_new ();
-#line 673 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 669 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp2_);
-#line 673 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 669 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->search_entry);
-#line 673 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 669 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->search_entry = _tmp2_;
-#line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->search_entry;
-#line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_entry_get_type (), GtkEntry), 23);
-#line 676 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->search_entry;
-#line 676 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _search_filter_toolbar_search_box_on_escape_key_gtk_widget_key_press_event, self, 0);
-#line 677 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 673 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->priv->search_entry;
-#line 677 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 673 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 679 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = action;
-#line 679 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = text_action_get_value (_tmp6_);
-#line 679 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = _tmp7_;
-#line 679 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_set_nullable_text (self, _tmp8_);
-#line 681 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 677 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = action;
-#line 681 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 677 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp9_, "text-changed", (GCallback) _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed, self, 0);
-#line 682 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 678 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = action;
-#line 682 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 678 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp10_, "sensitivity-changed", (GCallback) _search_filter_toolbar_search_box_on_sensitivity_changed_text_action_sensitivity_changed, self, 0);
-#line 683 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 679 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = action;
-#line 683 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 679 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp11_, "visibility-changed", (GCallback) _search_filter_toolbar_search_box_on_visibility_changed_text_action_visibility_changed, self, 0);
-#line 685 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 681 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = self->priv->search_entry;
-#line 685 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 681 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp13_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_entry_get_type (), GtkEntry));
-#line 685 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 681 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp14_ = _tmp13_;
-#line 685 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 681 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp14_, "deleted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text, self, 0);
-#line 686 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 682 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp15_ = self->priv->search_entry;
-#line 686 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 682 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp16_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_entry_get_type (), GtkEntry));
-#line 686 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 682 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp17_ = _tmp16_;
-#line 686 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 682 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp17_, "inserted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self, 0);
-#line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 7092 "SearchFilter.c"
+#line 7072 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_new (TextAction* action) {
-#line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_search_box_construct (SEARCH_FILTER_TOOLBAR_TYPE_SEARCH_BOX, action);
-#line 7099 "SearchFilter.c"
+#line 7079 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_search_box_get_focus (SearchFilterToolbarSearchBox* self) {
-	GtkSearchEntry* _tmp0_ = NULL;
-#line 698 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkSearchEntry* _tmp0_;
+#line 694 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self));
-#line 699 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->search_entry;
-#line 699 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), "has-focus", TRUE, NULL);
-#line 7111 "SearchFilter.c"
+#line 7091 "SearchFilter.c"
 }
 
 
 static gboolean search_filter_toolbar_search_box_on_escape_key (SearchFilterToolbarSearchBox* self, GdkEventKey* e) {
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
-#line 704 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GdkEventKey* _tmp0_;
+	guint _tmp1_;
+	const gchar* _tmp2_;
+#line 700 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self), FALSE);
-#line 704 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 700 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (e != NULL, FALSE);
-#line 705 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 701 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = e;
-#line 705 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 701 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 705 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 701 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 705 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 701 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
-#line 7132 "SearchFilter.c"
-		TextAction* _tmp3_ = NULL;
-#line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 7112 "SearchFilter.c"
+		TextAction* _tmp3_;
+#line 702 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = self->priv->action;
-#line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 702 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_clear (_tmp3_);
-#line 7138 "SearchFilter.c"
+#line 7118 "SearchFilter.c"
 	}
-#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = FALSE;
-#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 7144 "SearchFilter.c"
+#line 7124 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_search_box_on_action_text_changed (SearchFilterToolbarSearchBox* self, const gchar* text) {
-	GtkSearchEntry* _tmp0_ = NULL;
-	GtkEntryBuffer* _tmp1_ = NULL;
-	GtkEntryBuffer* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	GtkSearchEntry* _tmp4_ = NULL;
-	GtkEntryBuffer* _tmp5_ = NULL;
-	GtkEntryBuffer* _tmp6_ = NULL;
-	guint _tmp7_ = 0U;
-	const gchar* _tmp8_ = NULL;
-	GtkSearchEntry* _tmp9_ = NULL;
-	GtkEntryBuffer* _tmp10_ = NULL;
-	GtkEntryBuffer* _tmp11_ = NULL;
-	GtkSearchEntry* _tmp12_ = NULL;
-	GtkEntryBuffer* _tmp13_ = NULL;
-	GtkEntryBuffer* _tmp14_ = NULL;
-#line 713 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkSearchEntry* _tmp0_;
+	GtkEntryBuffer* _tmp1_;
+	GtkEntryBuffer* _tmp2_;
+	guint _tmp3_;
+	GtkSearchEntry* _tmp4_;
+	GtkEntryBuffer* _tmp5_;
+	GtkEntryBuffer* _tmp6_;
+	guint _tmp7_;
+	const gchar* _tmp8_;
+	GtkSearchEntry* _tmp9_;
+	GtkEntryBuffer* _tmp10_;
+	GtkEntryBuffer* _tmp11_;
+	GtkSearchEntry* _tmp12_;
+	GtkEntryBuffer* _tmp13_;
+	GtkEntryBuffer* _tmp14_;
+#line 709 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self));
-#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->search_entry;
-#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_entry_get_type (), GtkEntry));
-#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = _tmp1_;
-#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("deleted-text", gtk_entry_buffer_get_type (), &_tmp3_, NULL, FALSE);
-#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text, self);
-#line 715 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 711 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->search_entry;
-#line 715 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 711 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_entry_get_type (), GtkEntry));
-#line 715 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 711 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = _tmp5_;
-#line 715 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 711 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("inserted-text", gtk_entry_buffer_get_type (), &_tmp7_, NULL, FALSE);
-#line 715 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 711 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self);
-#line 716 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 712 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = text;
-#line 716 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 712 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_set_nullable_text (self, _tmp8_);
-#line 717 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 713 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = self->priv->search_entry;
-#line 717 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 713 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_entry_get_type (), GtkEntry));
-#line 717 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 713 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = _tmp10_;
-#line 717 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 713 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp11_, "deleted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text, self, 0);
-#line 718 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = self->priv->search_entry;
-#line 718 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp13_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_entry_get_type (), GtkEntry));
-#line 718 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp14_ = _tmp13_;
-#line 718 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp14_, "inserted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self, 0);
-#line 7206 "SearchFilter.c"
+#line 7186 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_search_box_on_entry_changed (SearchFilterToolbarSearchBox* self) {
-	TextAction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	TextAction* _tmp2_ = NULL;
-	GtkSearchEntry* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	TextAction* _tmp5_ = NULL;
-#line 721 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	TextAction* _tmp0_;
+	guint _tmp1_;
+	TextAction* _tmp2_;
+	GtkSearchEntry* _tmp3_;
+	const gchar* _tmp4_;
+	TextAction* _tmp5_;
+#line 717 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self));
-#line 722 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 718 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->action;
-#line 722 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 718 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("text-changed", TYPE_TEXT_ACTION, &_tmp1_, NULL, FALSE);
-#line 722 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 718 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed, self);
-#line 723 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 719 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = self->priv->action;
-#line 723 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 719 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->search_entry;
-#line 723 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 719 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = gtk_entry_get_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_entry_get_type (), GtkEntry));
-#line 723 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 719 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	text_action_set_text (_tmp2_, _tmp4_);
-#line 724 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 720 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->priv->action;
-#line 724 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 720 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp5_, "text-changed", (GCallback) _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed, self, 0);
-#line 7237 "SearchFilter.c"
+#line 7217 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_search_box_on_sensitivity_changed (SearchFilterToolbarSearchBox* self, gboolean sensitive) {
-	gboolean _tmp0_ = FALSE;
-#line 727 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gboolean _tmp0_;
+#line 723 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self));
-#line 728 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 724 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = sensitive;
-#line 728 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 724 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 7249 "SearchFilter.c"
+#line 7229 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_search_box_on_visibility_changed (SearchFilterToolbarSearchBox* self, gboolean visible) {
-	gboolean _tmp0_ = FALSE;
-#line 731 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gboolean _tmp0_;
+#line 727 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self));
-#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 728 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = visible;
-#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 728 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 7261 "SearchFilter.c"
+#line 7241 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_search_box_set_nullable_text (SearchFilterToolbarSearchBox* self, const gchar* text) {
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkSearchEntry* _tmp3_ = NULL;
-#line 735 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	const gchar* _tmp1_;
+	GtkSearchEntry* _tmp3_;
+#line 731 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self));
-#line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = text;
-#line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_ != NULL) {
-#line 7275 "SearchFilter.c"
-		const gchar* _tmp2_ = NULL;
-#line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 7255 "SearchFilter.c"
+		const gchar* _tmp2_;
+#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = text;
-#line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = _tmp2_;
-#line 7281 "SearchFilter.c"
+#line 7261 "SearchFilter.c"
 	} else {
-#line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = "";
-#line 7285 "SearchFilter.c"
+#line 7265 "SearchFilter.c"
 	}
-#line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->search_entry;
-#line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_entry_get_type (), GtkEntry), _tmp0_);
-#line 7291 "SearchFilter.c"
+#line 7271 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_search_box_class_init (SearchFilterToolbarSearchBoxClass * klass) {
-#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_parent_class = g_type_class_peek_parent (klass);
-#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarSearchBoxPrivate));
-#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_search_box_finalize;
-#line 7302 "SearchFilter.c"
+#line 7282 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_search_box_instance_init (SearchFilterToolbarSearchBox * self) {
-#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_SEARCH_BOX_GET_PRIVATE (self);
-#line 7309 "SearchFilter.c"
+#line 7289 "SearchFilter.c"
 }
 
 
-static void search_filter_toolbar_search_box_finalize (GObject* obj) {
+static void search_filter_toolbar_search_box_finalize (GObject * obj) {
 	SearchFilterToolbarSearchBox * self;
-	TextAction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	TextAction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	TextAction* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	GtkSearchEntry* _tmp6_ = NULL;
-	GtkEntryBuffer* _tmp7_ = NULL;
-	GtkEntryBuffer* _tmp8_ = NULL;
-	guint _tmp9_ = 0U;
-	GtkSearchEntry* _tmp10_ = NULL;
-	GtkEntryBuffer* _tmp11_ = NULL;
-	GtkEntryBuffer* _tmp12_ = NULL;
-	guint _tmp13_ = 0U;
-#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	TextAction* _tmp0_;
+	guint _tmp1_;
+	TextAction* _tmp2_;
+	guint _tmp3_;
+	TextAction* _tmp4_;
+	guint _tmp5_;
+	GtkSearchEntry* _tmp6_;
+	GtkEntryBuffer* _tmp7_;
+	GtkEntryBuffer* _tmp8_;
+	guint _tmp9_;
+	GtkSearchEntry* _tmp10_;
+	GtkEntryBuffer* _tmp11_;
+	GtkEntryBuffer* _tmp12_;
+	guint _tmp13_;
+#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_SEARCH_BOX, SearchFilterToolbarSearchBox);
-#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 686 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->action;
-#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 686 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("text-changed", TYPE_TEXT_ACTION, &_tmp1_, NULL, FALSE);
-#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 686 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed, self);
-#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 687 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = self->priv->action;
-#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 687 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("sensitivity-changed", TYPE_TEXT_ACTION, &_tmp3_, NULL, FALSE);
-#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 687 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_sensitivity_changed_text_action_sensitivity_changed, self);
-#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 688 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->action;
-#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 688 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("visibility-changed", TYPE_TEXT_ACTION, &_tmp5_, NULL, FALSE);
-#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 688 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_visibility_changed_text_action_visibility_changed, self);
-#line 694 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = self->priv->search_entry;
-#line 694 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_entry_get_type (), GtkEntry));
-#line 694 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = _tmp7_;
-#line 694 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("deleted-text", gtk_entry_buffer_get_type (), &_tmp9_, NULL, FALSE);
-#line 694 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text, self);
-#line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = self->priv->search_entry;
-#line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_entry_get_type (), GtkEntry));
-#line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = _tmp11_;
-#line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("inserted-text", gtk_entry_buffer_get_type (), &_tmp13_, NULL, FALSE);
-#line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self);
-#line 668 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 664 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->search_entry);
-#line 669 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 665 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_text_action_unref0 (self->priv->action);
-#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_search_box_parent_class)->finalize (obj);
-#line 7375 "SearchFilter.c"
+#line 7355 "SearchFilter.c"
 }
 
 
@@ -7389,171 +7369,171 @@ GType search_filter_toolbar_search_box_get_type (void) {
 
 SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_construct (GType object_type, GMenuModel* model) {
 	SearchFilterToolbarRatingFilterButton * self = NULL;
-	GtkMenuButton* _tmp0_ = NULL;
-	GtkMenuButton* _tmp1_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
-	GtkWidget* _tmp3_ = NULL;
-	GtkMenuButton* _tmp4_ = NULL;
-	GtkMenuButton* _tmp5_ = NULL;
-	GtkMenuButton* _tmp6_ = NULL;
-	GtkMenuButton* _tmp7_ = NULL;
-	GMenuModel* _tmp8_ = NULL;
-	GtkMenuButton* _tmp9_ = NULL;
-#line 744 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkMenuButton* _tmp0_;
+	GtkMenuButton* _tmp1_;
+	GtkWidget* _tmp2_;
+	GtkWidget* _tmp3_;
+	GtkMenuButton* _tmp4_;
+	GtkMenuButton* _tmp5_;
+	GtkMenuButton* _tmp6_;
+	GtkMenuButton* _tmp7_;
+	GMenuModel* _tmp8_;
+	GtkMenuButton* _tmp9_;
+#line 740 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (G_IS_MENU_MODEL (model), NULL);
-#line 744 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 740 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbarRatingFilterButton*) g_object_new (object_type, NULL);
-#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = (GtkMenuButton*) gtk_menu_button_new ();
-#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp0_);
-#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->button);
-#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->button = _tmp0_;
-#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 743 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->button;
-#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 743 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search_filter_toolbar_rating_filter_button_get_filter_icon (self, RATING_FILTER_UNRATED_OR_HIGHER);
-#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 743 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _tmp2_;
-#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 743 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_button_get_type (), GtkButton), _tmp3_);
-#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 743 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (_tmp3_);
-#line 748 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 744 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->button;
-#line 748 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 744 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 749 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->button;
-#line 749 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_relief (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), GTK_RELIEF_NONE);
-#line 750 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 746 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = self->button;
-#line 750 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 746 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 2);
-#line 751 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = self->button;
-#line 751 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = model;
-#line 751 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_menu_button_set_menu_model (_tmp7_, _tmp8_);
-#line 753 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 749 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_tool_item_set_homogeneous (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tool_item_get_type (), GtkToolItem), FALSE);
-#line 755 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 751 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = self->button;
-#line 755 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 751 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 744 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 740 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 7451 "SearchFilter.c"
+#line 7431 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_new (GMenuModel* model) {
-#line 744 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 740 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_rating_filter_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_RATING_FILTER_BUTTON, model);
-#line 7458 "SearchFilter.c"
+#line 7438 "SearchFilter.c"
 }
 
 
 static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (SearchFilterToolbarRatingFilterButton* self, RatingFilter filter) {
 	GtkWidget* result = NULL;
 	gchar* filename = NULL;
-	RatingFilter _tmp0_ = 0;
+	RatingFilter _tmp0_;
 	GtkImage* image = NULL;
-	const gchar* _tmp4_ = NULL;
-	RatingFilter _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	GdkPixbuf* _tmp7_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
-	GtkImage* _tmp9_ = NULL;
-	GtkImage* _tmp10_ = NULL;
-#line 758 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	const gchar* _tmp4_;
+	RatingFilter _tmp5_;
+	gint _tmp6_;
+	GdkPixbuf* _tmp7_;
+	GdkPixbuf* _tmp8_;
+	GtkImage* _tmp9_;
+	GtkImage* _tmp10_;
+#line 754 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_RATING_FILTER_BUTTON (self), NULL);
-#line 759 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 755 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	filename = NULL;
-#line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 757 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = filter;
-#line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 757 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	switch (_tmp0_) {
-#line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 757 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 7484 "SearchFilter.c"
+#line 7464 "SearchFilter.c"
 		{
-			gchar* _tmp1_ = NULL;
-#line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gchar* _tmp1_;
+#line 759 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp1_ = g_strdup (RESOURCES_ICON_FILTER_REJECTED_OR_BETTER);
-#line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 759 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_free0 (filename);
-#line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 759 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			filename = _tmp1_;
-#line 764 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 760 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7495 "SearchFilter.c"
+#line 7475 "SearchFilter.c"
 		}
-#line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 757 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 7499 "SearchFilter.c"
+#line 7479 "SearchFilter.c"
 		{
-			gchar* _tmp2_ = NULL;
-#line 767 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gchar* _tmp2_;
+#line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp2_ = g_strdup (RESOURCES_ICON_RATING_REJECTED);
-#line 767 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_free0 (filename);
-#line 767 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			filename = _tmp2_;
-#line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 764 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7510 "SearchFilter.c"
+#line 7490 "SearchFilter.c"
 		}
 		default:
-#line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 757 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 7515 "SearchFilter.c"
+#line 7495 "SearchFilter.c"
 		{
-			gchar* _tmp3_ = NULL;
-#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gchar* _tmp3_;
+#line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp3_ = g_strdup (RESOURCES_ICON_FILTER_UNRATED_OR_BETTER);
-#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_free0 (filename);
-#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			filename = _tmp3_;
-#line 773 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 769 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7526 "SearchFilter.c"
+#line 7506 "SearchFilter.c"
 		}
 	}
-#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = filename;
-#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = filter;
-#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = search_filter_toolbar_rating_filter_button_get_filter_icon_size (self, _tmp5_);
-#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = resources_load_icon (_tmp4_, _tmp6_);
-#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = _tmp7_;
-#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp8_);
-#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp9_);
-#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = _tmp9_;
-#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (_tmp8_);
-#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	image = _tmp10_;
-#line 778 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 774 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget), 6);
-#line 780 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget);
-#line 780 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_free0 (filename);
-#line 780 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 7557 "SearchFilter.c"
+#line 7537 "SearchFilter.c"
 }
 
 
@@ -7562,336 +7542,318 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 	gint icon_base = 0;
 	gint icon_star_base = 0;
 	gint icon_plus = 0;
-	RatingFilter _tmp0_ = 0;
-#line 783 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	RatingFilter _tmp0_;
+#line 779 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_RATING_FILTER_BUTTON (self), 0);
-#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 780 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	icon_base = (gint) (SEARCH_FILTER_TOOLBAR_FILTER_ICON_BASE_WIDTH * SEARCH_FILTER_TOOLBAR_FILTER_ICON_SCALE);
-#line 785 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 781 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	icon_star_base = (gint) (SEARCH_FILTER_TOOLBAR_FILTER_ICON_BASE_WIDTH * SEARCH_FILTER_TOOLBAR_FILTER_ICON_STAR_SCALE);
-#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 782 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	icon_plus = (gint) (SEARCH_FILTER_TOOLBAR_FILTER_ICON_PLUS_WIDTH * SEARCH_FILTER_TOOLBAR_FILTER_ICON_STAR_SCALE);
-#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = filter;
-#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	switch (_tmp0_) {
-#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 7581 "SearchFilter.c"
+#line 7561 "SearchFilter.c"
 		{
-			gint _tmp1_ = 0;
-			gint _tmp2_ = 0;
-#line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gint _tmp1_;
+			gint _tmp2_;
+#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp1_ = icon_star_base;
-#line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp2_ = icon_plus;
-#line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = _tmp1_ + _tmp2_;
-#line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7593 "SearchFilter.c"
+#line 7573 "SearchFilter.c"
 		}
-#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 7597 "SearchFilter.c"
+#line 7577 "SearchFilter.c"
 		{
-			gint _tmp3_ = 0;
-			gint _tmp4_ = 0;
-#line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gint _tmp3_;
+			gint _tmp4_;
+#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp3_ = icon_star_base;
-#line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp4_ = icon_plus;
-#line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = (_tmp3_ * 2) + _tmp4_;
-#line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7609 "SearchFilter.c"
+#line 7589 "SearchFilter.c"
 		}
-#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 7613 "SearchFilter.c"
+#line 7593 "SearchFilter.c"
 		{
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
-#line 794 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gint _tmp5_;
+			gint _tmp6_;
+#line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp5_ = icon_star_base;
-#line 794 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = icon_plus;
-#line 794 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = (_tmp5_ * 3) + _tmp6_;
-#line 794 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7625 "SearchFilter.c"
+#line 7605 "SearchFilter.c"
 		}
-#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 7629 "SearchFilter.c"
+#line 7609 "SearchFilter.c"
 		{
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
-#line 796 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gint _tmp7_;
+			gint _tmp8_;
+#line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp7_ = icon_star_base;
-#line 796 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp8_ = icon_plus;
-#line 796 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = (_tmp7_ * 4) + _tmp8_;
-#line 796 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7641 "SearchFilter.c"
+#line 7621 "SearchFilter.c"
 		}
-#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_ONLY:
-#line 7647 "SearchFilter.c"
+#line 7627 "SearchFilter.c"
 		{
-			gint _tmp9_ = 0;
-#line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gint _tmp9_;
+#line 795 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp9_ = icon_star_base;
-#line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 795 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = _tmp9_ * 5;
-#line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 795 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7656 "SearchFilter.c"
+#line 7636 "SearchFilter.c"
 		}
-#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 7660 "SearchFilter.c"
+#line 7640 "SearchFilter.c"
 		{
-#line 801 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 797 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = RESOURCES_ICON_FILTER_REJECTED_OR_BETTER_FIXED_SIZE;
-#line 801 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 797 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7666 "SearchFilter.c"
+#line 7646 "SearchFilter.c"
 		}
-#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 7670 "SearchFilter.c"
+#line 7650 "SearchFilter.c"
 		{
-#line 803 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = RESOURCES_ICON_FILTER_UNRATED_OR_BETTER_FIXED_SIZE;
-#line 803 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7676 "SearchFilter.c"
+#line 7656 "SearchFilter.c"
 		}
-#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 7680 "SearchFilter.c"
+#line 7660 "SearchFilter.c"
 		{
-#line 805 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 801 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = icon_plus;
-#line 805 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 801 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7686 "SearchFilter.c"
+#line 7666 "SearchFilter.c"
 		}
 		default:
 		{
-#line 807 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 803 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = icon_base;
-#line 807 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 803 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7694 "SearchFilter.c"
+#line 7674 "SearchFilter.c"
 		}
 	}
 }
 
 
 void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToolbarRatingFilterButton* self, RatingFilter filter) {
-	GtkMenuButton* _tmp0_ = NULL;
-	RatingFilter _tmp1_ = 0;
-	RatingFilter _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	RatingFilter _tmp20_ = 0;
-	gchar* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-#line 811 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkMenuButton* _tmp0_;
+	RatingFilter _tmp1_;
+	RatingFilter _tmp12_;
+	gint _tmp13_;
+	RatingFilter _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+#line 807 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_RATING_FILTER_BUTTON (self));
-#line 812 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 808 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->button;
-#line 812 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 808 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_always_show_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), TRUE);
-#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = filter;
-#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	switch (_tmp1_) {
-#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 7720 "SearchFilter.c"
+#line 7700 "SearchFilter.c"
 		{
-			GtkMenuButton* _tmp2_ = NULL;
-			const gchar* _tmp3_ = NULL;
-#line 815 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			GtkMenuButton* _tmp2_;
+#line 811 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp2_ = self->button;
-#line 815 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp3_ = _ ("★+ Rating");
-#line 815 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_button_get_type (), GtkButton), _tmp3_);
-#line 816 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 811 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_button_get_type (), GtkButton), _ ("★+ Rating"));
+#line 812 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7732 "SearchFilter.c"
+#line 7709 "SearchFilter.c"
 		}
-#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 7736 "SearchFilter.c"
+#line 7713 "SearchFilter.c"
 		{
-			GtkMenuButton* _tmp4_ = NULL;
-			const gchar* _tmp5_ = NULL;
-#line 818 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			GtkMenuButton* _tmp3_;
+#line 814 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp3_ = self->button;
+#line 814 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_button_get_type (), GtkButton), _ ("★★+ Rating"));
+#line 815 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			break;
+#line 7722 "SearchFilter.c"
+		}
+#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		case RATING_FILTER_THREE_OR_HIGHER:
+#line 7726 "SearchFilter.c"
+		{
+			GtkMenuButton* _tmp4_;
+#line 817 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp4_ = self->button;
+#line 817 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), _ ("★★★+ Rating"));
 #line 818 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp5_ = _ ("★★+ Rating");
-#line 818 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), _tmp5_);
-#line 819 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7748 "SearchFilter.c"
+#line 7735 "SearchFilter.c"
 		}
-#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		case RATING_FILTER_THREE_OR_HIGHER:
-#line 7752 "SearchFilter.c"
+#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		case RATING_FILTER_FOUR_OR_HIGHER:
+#line 7739 "SearchFilter.c"
 		{
-			GtkMenuButton* _tmp6_ = NULL;
-			const gchar* _tmp7_ = NULL;
+			GtkMenuButton* _tmp5_;
+#line 820 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp5_ = self->button;
+#line 820 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), _ ("★★★★+ Rating"));
 #line 821 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp6_ = self->button;
-#line 821 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp7_ = _ ("★★★+ Rating");
-#line 821 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_button_get_type (), GtkButton), _tmp7_);
-#line 822 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7764 "SearchFilter.c"
+#line 7748 "SearchFilter.c"
 		}
-#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 7768 "SearchFilter.c"
+#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		case RATING_FILTER_FIVE_ONLY:
+#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		case RATING_FILTER_FIVE_OR_HIGHER:
+#line 7754 "SearchFilter.c"
 		{
-			GtkMenuButton* _tmp8_ = NULL;
-			const gchar* _tmp9_ = NULL;
+			GtkMenuButton* _tmp6_;
 #line 824 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp8_ = self->button;
-#line 824 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp9_ = _ ("★★★★+ Rating");
+			_tmp6_ = self->button;
 #line 824 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_button_get_type (), GtkButton), _tmp9_);
+			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_button_get_type (), GtkButton), _ ("★★★★★+ Rating"));
 #line 825 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7780 "SearchFilter.c"
+#line 7763 "SearchFilter.c"
 		}
-#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		case RATING_FILTER_FIVE_ONLY:
-#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 7786 "SearchFilter.c"
+		default:
 		{
-			GtkMenuButton* _tmp10_ = NULL;
-			const gchar* _tmp11_ = NULL;
+			GtkMenuButton* _tmp7_;
+			GtkMenuButton* _tmp8_;
+			RatingFilter _tmp9_;
+			GtkWidget* _tmp10_;
+			GtkWidget* _tmp11_;
+#line 827 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp7_ = self->button;
+#line 827 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_button_get_type (), GtkButton), _ ("Rating"));
+#line 828 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp8_ = self->button;
 #line 828 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp10_ = self->button;
+			_tmp9_ = filter;
 #line 828 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp11_ = _ ("★★★★★+ Rating");
+			_tmp10_ = search_filter_toolbar_rating_filter_button_get_filter_icon (self, _tmp9_);
 #line 828 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_button_get_type (), GtkButton), _tmp11_);
+			_tmp11_ = _tmp10_;
+#line 828 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_button_get_type (), GtkButton), _tmp11_);
+#line 828 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_g_object_unref0 (_tmp11_);
 #line 829 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7798 "SearchFilter.c"
+#line 7790 "SearchFilter.c"
 		}
-		default:
-		{
-			GtkMenuButton* _tmp12_ = NULL;
-			const gchar* _tmp13_ = NULL;
-			GtkMenuButton* _tmp14_ = NULL;
-			RatingFilter _tmp15_ = 0;
-			GtkWidget* _tmp16_ = NULL;
-			GtkWidget* _tmp17_ = NULL;
-#line 831 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp12_ = self->button;
-#line 831 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp13_ = _ ("Rating");
-#line 831 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_button_get_type (), GtkButton), _tmp13_);
-#line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp14_ = self->button;
-#line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp15_ = filter;
-#line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp16_ = search_filter_toolbar_rating_filter_button_get_filter_icon (self, _tmp15_);
+	}
 #line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp17_ = _tmp16_;
+	_tmp12_ = filter;
 #line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_button_get_type (), GtkButton), _tmp17_);
+	_tmp13_ = search_filter_toolbar_rating_filter_button_get_filter_button_size (self, _tmp12_);
 #line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_g_object_unref0 (_tmp17_);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp13_, -1);
 #line 833 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			break;
-#line 7828 "SearchFilter.c"
-		}
-	}
-#line 836 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp18_ = filter;
-#line 836 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp19_ = search_filter_toolbar_rating_filter_button_get_filter_button_size (self, _tmp18_);
-#line 836 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp19_, -1);
-#line 837 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp20_ = filter;
-#line 837 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp21_ = resources_get_rating_filter_tooltip (_tmp20_);
-#line 837 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp22_ = _tmp21_;
-#line 837 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tool_item_get_type (), GtkToolItem), _tmp22_);
-#line 837 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_free0 (_tmp22_);
-#line 838 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp14_ = filter;
+#line 833 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp15_ = resources_get_rating_filter_tooltip (_tmp14_);
+#line 833 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp16_ = _tmp15_;
+#line 833 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tool_item_get_type (), GtkToolItem), _tmp16_);
+#line 833 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_free0 (_tmp16_);
+#line 834 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_has_tooltip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 839 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 835 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 7851 "SearchFilter.c"
+#line 7813 "SearchFilter.c"
 }
 
 
 static gint search_filter_toolbar_rating_filter_button_get_filter_button_size (SearchFilterToolbarRatingFilterButton* self, RatingFilter filter) {
 	gint result = 0;
-	RatingFilter _tmp0_ = 0;
-	gint _tmp1_ = 0;
-#line 842 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	RatingFilter _tmp0_;
+	gint _tmp1_;
+#line 838 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_RATING_FILTER_BUTTON (self), 0);
-#line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 839 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = filter;
-#line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 839 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = search_filter_toolbar_rating_filter_button_get_filter_icon_size (self, _tmp0_);
-#line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 839 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp1_ + (2 * SEARCH_FILTER_TOOLBAR_FILTER_BUTTON_MARGIN);
-#line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 839 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 7869 "SearchFilter.c"
+#line 7831 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_rating_filter_button_set_label (SearchFilterToolbarRatingFilterButton* self, const gchar* label) {
-	GtkMenuButton* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 846 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkMenuButton* _tmp0_;
+	const gchar* _tmp1_;
+#line 842 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_RATING_FILTER_BUTTON (self));
-#line 846 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 842 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (label != NULL);
-#line 847 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->button;
-#line 847 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = label;
-#line 847 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_);
-#line 7886 "SearchFilter.c"
+#line 7848 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_rating_filter_button_class_init (SearchFilterToolbarRatingFilterButtonClass * klass) {
-#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 737 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_rating_filter_button_parent_class = g_type_class_peek_parent (klass);
-#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 737 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_rating_filter_button_finalize;
-#line 7895 "SearchFilter.c"
+#line 7857 "SearchFilter.c"
 }
 
 
@@ -7899,15 +7861,15 @@ static void search_filter_toolbar_rating_filter_button_instance_init (SearchFilt
 }
 
 
-static void search_filter_toolbar_rating_filter_button_finalize (GObject* obj) {
+static void search_filter_toolbar_rating_filter_button_finalize (GObject * obj) {
 	SearchFilterToolbarRatingFilterButton * self;
-#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 737 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_RATING_FILTER_BUTTON, SearchFilterToolbarRatingFilterButton);
-#line 742 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 738 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->button);
-#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 737 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_rating_filter_button_parent_class)->finalize (obj);
-#line 7911 "SearchFilter.c"
+#line 7873 "SearchFilter.c"
 }
 
 
@@ -7924,174 +7886,174 @@ GType search_filter_toolbar_rating_filter_button_get_type (void) {
 
 
 static void _search_filter_toolbar_saved_search_filter_button_on_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 877 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 873 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_filter_button_on_clicked ((SearchFilterToolbarSavedSearchFilterButton*) self);
-#line 7930 "SearchFilter.c"
+#line 7892 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_filter_button_construct (GType object_type) {
 	SearchFilterToolbarSavedSearchFilterButton * self = NULL;
-	GtkToggleButton* _tmp0_ = NULL;
-	GtkToggleButton* _tmp1_ = NULL;
+	GtkToggleButton* _tmp0_;
+	GtkToggleButton* _tmp1_;
 	GtkImage* image = NULL;
-	GtkImage* _tmp2_ = NULL;
-	GtkToggleButton* _tmp3_ = NULL;
-	GtkToggleButton* _tmp4_ = NULL;
-	GtkToggleButton* _tmp5_ = NULL;
-	GtkToggleButton* _tmp6_ = NULL;
-#line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkImage* _tmp2_;
+	GtkToggleButton* _tmp3_;
+	GtkToggleButton* _tmp4_;
+	GtkToggleButton* _tmp5_;
+	GtkToggleButton* _tmp6_;
+#line 854 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbarSavedSearchFilterButton*) g_object_new (object_type, NULL);
-#line 859 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 855 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = (GtkToggleButton*) gtk_toggle_button_new ();
-#line 859 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 855 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp0_);
-#line 859 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 855 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->button);
-#line 859 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 855 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->button = _tmp0_;
-#line 860 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 856 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->button;
-#line 860 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 856 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_always_show_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_button_get_type (), GtkButton), TRUE);
-#line 862 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = (GtkImage*) gtk_image_new_from_icon_name ("edit-find", GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 862 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp2_);
-#line 862 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	image = _tmp2_;
-#line 863 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 859 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget), 6);
-#line 864 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 860 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->button;
-#line 864 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 860 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_button_get_type (), GtkButton), G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget));
-#line 865 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 861 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->button;
-#line 865 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 861 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 867 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 863 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->button;
-#line 867 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 863 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _search_filter_toolbar_saved_search_filter_button_on_clicked_gtk_button_clicked, self, 0);
-#line 869 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 865 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_filter_button_restyle (self);
-#line 871 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 867 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_tool_item_set_homogeneous (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tool_item_get_type (), GtkToolItem), FALSE);
-#line 873 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 869 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = self->button;
-#line 873 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 869 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 854 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (image);
-#line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 854 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 7990 "SearchFilter.c"
+#line 7952 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_filter_button_new (void) {
-#line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 854 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_saved_search_filter_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_FILTER_BUTTON);
-#line 7997 "SearchFilter.c"
+#line 7959 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_filter_button_on_clicked (SearchFilterToolbarSavedSearchFilterButton* self) {
-#line 880 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 876 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_FILTER_BUTTON (self));
-#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "clicked");
-#line 8006 "SearchFilter.c"
+#line 877 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit (self, search_filter_toolbar_saved_search_filter_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_CLICKED_SIGNAL], 0);
+#line 7968 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_saved_search_filter_button_set_active (SearchFilterToolbarSavedSearchFilterButton* self, gboolean active) {
-	GtkToggleButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-#line 884 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkToggleButton* _tmp0_;
+	gboolean _tmp1_;
+#line 880 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_FILTER_BUTTON (self));
-#line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->button;
-#line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = active;
-#line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_toggle_button_set_active (_tmp0_, _tmp1_);
-#line 8021 "SearchFilter.c"
+#line 7983 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_saved_search_filter_button_set_label (SearchFilterToolbarSavedSearchFilterButton* self, const gchar* label) {
-	GtkToggleButton* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 888 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkToggleButton* _tmp0_;
+	const gchar* _tmp1_;
+#line 884 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_FILTER_BUTTON (self));
-#line 888 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 884 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (label != NULL);
-#line 889 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->button;
-#line 889 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = label;
-#line 889 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_);
-#line 8038 "SearchFilter.c"
+#line 8000 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_saved_search_filter_button_restyle (SearchFilterToolbarSavedSearchFilterButton* self) {
-	GtkToggleButton* _tmp0_ = NULL;
-	GtkToggleButton* _tmp1_ = NULL;
-#line 892 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkToggleButton* _tmp0_;
+	GtkToggleButton* _tmp1_;
+#line 888 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_FILTER_BUTTON (self));
-#line 893 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 889 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->button;
-#line 893 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 889 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), 24, 24);
-#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 890 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->button;
-#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 890 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_relief (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_button_get_type (), GtkButton), GTK_RELIEF_NONE);
-#line 8055 "SearchFilter.c"
+#line 8017 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_filter_button_class_init (SearchFilterToolbarSavedSearchFilterButtonClass * klass) {
-#line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 848 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_filter_button_parent_class = g_type_class_peek_parent (klass);
-#line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 848 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_saved_search_filter_button_finalize;
-#line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_FILTER_BUTTON, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 8066 "SearchFilter.c"
+#line 848 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_toolbar_saved_search_filter_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_CLICKED_SIGNAL] = g_signal_new ("clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_FILTER_BUTTON, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 8028 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_filter_button_instance_init (SearchFilterToolbarSavedSearchFilterButton * self) {
-#line 853 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 849 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->filter_popup = NULL;
-#line 8073 "SearchFilter.c"
+#line 8035 "SearchFilter.c"
 }
 
 
-static void search_filter_toolbar_saved_search_filter_button_finalize (GObject* obj) {
+static void search_filter_toolbar_saved_search_filter_button_finalize (GObject * obj) {
 	SearchFilterToolbarSavedSearchFilterButton * self;
-	GtkToggleButton* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-#line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkToggleButton* _tmp0_;
+	guint _tmp1_;
+#line 848 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_FILTER_BUTTON, SearchFilterToolbarSavedSearchFilterButton);
-#line 877 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 873 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->button;
-#line 877 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 873 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp1_, NULL, FALSE);
-#line 877 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 873 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_filter_button_on_clicked_gtk_button_clicked, self);
-#line 853 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 849 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_search_filter_toolbar_saved_search_popover_unref0 (self->filter_popup);
-#line 854 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 850 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->button);
-#line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 848 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_saved_search_filter_button_parent_class)->finalize (obj);
-#line 8095 "SearchFilter.c"
+#line 8057 "SearchFilter.c"
 }
 
 
@@ -8108,463 +8070,463 @@ GType search_filter_toolbar_saved_search_filter_button_get_type (void) {
 
 
 static void _search_filter_toolbar_saved_search_popover_on_edit_click_search_filter_toolbar_saved_search_popover_data_button_clicked (SearchFilterToolbarSavedSearchPopoverDataButton* _sender, SavedSearch* search, gpointer self) {
-#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_edit_click ((SearchFilterToolbarSavedSearchPopover*) self, search);
-#line 8114 "SearchFilter.c"
+#line 8076 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_on_delete_click_search_filter_toolbar_saved_search_popover_data_button_clicked (SearchFilterToolbarSavedSearchPopoverDataButton* _sender, SavedSearch* search, gpointer self) {
-#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_delete_click ((SearchFilterToolbarSavedSearchPopover*) self, search);
-#line 8121 "SearchFilter.c"
+#line 8083 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_on_add_click_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_add_click ((SearchFilterToolbarSavedSearchPopover*) self);
-#line 8128 "SearchFilter.c"
+#line 8090 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_on_activate_row_gtk_list_box_row_activated (GtkListBox* _sender, GtkListBoxRow* row, gpointer self) {
-#line 982 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_activate_row ((SearchFilterToolbarSavedSearchPopover*) self, row);
-#line 8135 "SearchFilter.c"
+#line 8097 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_on_popover_closed_gtk_popover_closed (GtkPopover* _sender, gpointer self) {
-#line 983 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_popover_closed ((SearchFilterToolbarSavedSearchPopover*) self);
-#line 8142 "SearchFilter.c"
+#line 8104 "SearchFilter.c"
 }
 
 
-static void _vala_array_add133 (SearchFilterToolbarSavedSearchPopoverDataButton*** array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value) {
-#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+static void _vala_array_add133 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value) {
+#line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((*length) == (*size)) {
-#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*array = g_renew (SearchFilterToolbarSavedSearchPopoverDataButton*, *array, (*size) + 1);
-#line 8153 "SearchFilter.c"
+#line 8115 "SearchFilter.c"
 	}
-#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[(*length)++] = value;
-#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[*length] = NULL;
-#line 8159 "SearchFilter.c"
+#line 8121 "SearchFilter.c"
 }
 
 
-static void _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton*** array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value) {
-#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+static void _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value) {
+#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((*length) == (*size)) {
-#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*array = g_renew (SearchFilterToolbarSavedSearchPopoverDataButton*, *array, (*size) + 1);
-#line 8170 "SearchFilter.c"
+#line 8132 "SearchFilter.c"
 	}
-#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[(*length)++] = value;
-#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[*length] = NULL;
-#line 8176 "SearchFilter.c"
+#line 8138 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popover_construct (GType object_type, GtkWidget* relative_to) {
 	SearchFilterToolbarSavedSearchPopover* self = NULL;
-	GtkWidget* _tmp0_ = NULL;
-	GtkPopover* _tmp1_ = NULL;
-	GtkPopover* _tmp2_ = NULL;
-	GtkListBox* _tmp3_ = NULL;
-	SearchFilterToolbarSavedSearchPopoverDataButton** _tmp4_ = NULL;
-	SearchFilterToolbarSavedSearchPopoverDataButton** _tmp5_ = NULL;
-	GtkButton* _tmp44_ = NULL;
-	GtkButton* _tmp45_ = NULL;
-	GtkListBox* _tmp46_ = NULL;
-	GtkButton* _tmp47_ = NULL;
-	GtkListBox* _tmp48_ = NULL;
-	GtkListBox* _tmp49_ = NULL;
-	GtkPopover* _tmp50_ = NULL;
-	GtkListBox* _tmp51_ = NULL;
-#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkWidget* _tmp0_;
+	GtkPopover* _tmp1_;
+	GtkPopover* _tmp2_;
+	GtkListBox* _tmp3_;
+	SearchFilterToolbarSavedSearchPopoverDataButton** _tmp4_;
+	SearchFilterToolbarSavedSearchPopoverDataButton** _tmp5_;
+	GtkButton* _tmp44_;
+	GtkButton* _tmp45_;
+	GtkListBox* _tmp46_;
+	GtkButton* _tmp47_;
+	GtkListBox* _tmp48_;
+	GtkListBox* _tmp49_;
+	GtkPopover* _tmp50_;
+	GtkListBox* _tmp51_;
+#line 938 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (GTK_IS_WIDGET (relative_to), NULL);
-#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 938 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbarSavedSearchPopover*) g_type_create_instance (object_type);
-#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 939 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = relative_to;
-#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 939 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = (GtkPopover*) gtk_popover_new (_tmp0_);
-#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 939 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp1_);
-#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 939 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->popover);
-#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 939 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->popover = _tmp1_;
-#line 944 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 940 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = self->priv->popover;
-#line 944 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 940 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect (_tmp2_, "closed", (GCallback) _search_filter_toolbar_saved_search_popover_on_popover_closed_gtk_popover_closed, self);
-#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 941 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = (GtkListBox*) gtk_list_box_new ();
-#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 941 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp3_);
-#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 941 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->list_box);
-#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 941 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->list_box = _tmp3_;
-#line 946 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = g_new0 (SearchFilterToolbarSavedSearchPopoverDataButton*, 0 + 1);
-#line 946 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->edit_buttons = (_vala_array_free (self->priv->edit_buttons, self->priv->edit_buttons_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 946 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->edit_buttons = _tmp4_;
-#line 946 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->edit_buttons_length1 = 0;
-#line 946 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_edit_buttons_size_ = self->priv->edit_buttons_length1;
-#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = g_new0 (SearchFilterToolbarSavedSearchPopoverDataButton*, 0 + 1);
-#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->delete_buttons = (_vala_array_free (self->priv->delete_buttons, self->priv->delete_buttons_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->delete_buttons = _tmp5_;
-#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->delete_buttons_length1 = 0;
-#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_delete_buttons_size_ = self->priv->delete_buttons_length1;
-#line 8242 "SearchFilter.c"
+#line 8204 "SearchFilter.c"
 	{
 		GeeIterator* _search_it = NULL;
-		SavedSearchTable* _tmp6_ = NULL;
-		SavedSearchTable* _tmp7_ = NULL;
-		GeeCollection* _tmp8_ = NULL;
-		GeeCollection* _tmp9_ = NULL;
-		GeeIterator* _tmp10_ = NULL;
-		GeeIterator* _tmp11_ = NULL;
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		SavedSearchTable* _tmp6_;
+		SavedSearchTable* _tmp7_;
+		GeeCollection* _tmp8_;
+		GeeCollection* _tmp9_;
+		GeeIterator* _tmp10_;
+		GeeIterator* _tmp11_;
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = saved_search_table_get_instance ();
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp7_ = _tmp6_;
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp8_ = saved_search_table_get_all (_tmp7_);
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp9_ = _tmp8_;
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp11_ = _tmp10_;
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp9_);
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_saved_search_table_unref0 (_tmp7_);
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_search_it = _tmp11_;
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		while (TRUE) {
-#line 8271 "SearchFilter.c"
-			GeeIterator* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
+#line 8233 "SearchFilter.c"
+			GeeIterator* _tmp12_;
+			gboolean _tmp13_;
 			SavedSearch* search = NULL;
-			GeeIterator* _tmp14_ = NULL;
-			gpointer _tmp15_ = NULL;
+			GeeIterator* _tmp14_;
+			gpointer _tmp15_;
 			GtkBox* row = NULL;
-			GtkBox* _tmp16_ = NULL;
-			GtkBox* _tmp17_ = NULL;
+			GtkBox* _tmp16_;
+			GtkBox* _tmp17_;
 			GtkLabel* label = NULL;
-			SavedSearch* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
-			gchar* _tmp20_ = NULL;
-			GtkLabel* _tmp21_ = NULL;
-			GtkLabel* _tmp22_ = NULL;
-			GtkLabel* _tmp23_ = NULL;
-			GtkBox* _tmp24_ = NULL;
-			GtkLabel* _tmp25_ = NULL;
+			SavedSearch* _tmp18_;
+			gchar* _tmp19_;
+			gchar* _tmp20_;
+			GtkLabel* _tmp21_;
+			GtkLabel* _tmp22_;
+			GtkLabel* _tmp23_;
+			GtkBox* _tmp24_;
+			GtkLabel* _tmp25_;
 			SearchFilterToolbarSavedSearchPopoverDataButton* delete_button = NULL;
-			SavedSearch* _tmp26_ = NULL;
-			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp27_ = NULL;
-			GtkBox* _tmp28_ = NULL;
-			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp29_ = NULL;
-			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp30_ = NULL;
-			SearchFilterToolbarSavedSearchPopoverDataButton** _tmp31_ = NULL;
-			gint _tmp31__length1 = 0;
-			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp32_ = NULL;
-			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp33_ = NULL;
+			SavedSearch* _tmp26_;
+			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp27_;
+			GtkBox* _tmp28_;
+			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp29_;
+			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp30_;
+			SearchFilterToolbarSavedSearchPopoverDataButton** _tmp31_;
+			gint _tmp31__length1;
+			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp32_;
+			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp33_;
 			SearchFilterToolbarSavedSearchPopoverDataButton* edit_button = NULL;
-			SavedSearch* _tmp34_ = NULL;
-			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp35_ = NULL;
-			GtkBox* _tmp36_ = NULL;
-			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp37_ = NULL;
-			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp38_ = NULL;
-			SearchFilterToolbarSavedSearchPopoverDataButton** _tmp39_ = NULL;
-			gint _tmp39__length1 = 0;
-			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp40_ = NULL;
-			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp41_ = NULL;
-			GtkListBox* _tmp42_ = NULL;
-			GtkBox* _tmp43_ = NULL;
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			SavedSearch* _tmp34_;
+			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp35_;
+			GtkBox* _tmp36_;
+			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp37_;
+			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp38_;
+			SearchFilterToolbarSavedSearchPopoverDataButton** _tmp39_;
+			gint _tmp39__length1;
+			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp40_;
+			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp41_;
+			GtkListBox* _tmp42_;
+			GtkBox* _tmp43_;
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp12_ = _search_it;
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp13_ = gee_iterator_next (_tmp12_);
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (!_tmp13_) {
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				break;
-#line 8319 "SearchFilter.c"
+#line 8281 "SearchFilter.c"
 			}
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp14_ = _search_it;
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp15_ = gee_iterator_get (_tmp14_);
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search = (SavedSearch*) _tmp15_;
-#line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 946 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
-#line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 946 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_object_ref_sink (_tmp16_);
-#line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 946 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			row = _tmp16_;
-#line 951 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp17_ = row;
-#line 951 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			gtk_box_set_homogeneous (_tmp17_, FALSE);
-#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp18_ = search;
-#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp19_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject));
-#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp20_ = _tmp19_;
-#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp21_ = (GtkLabel*) gtk_label_new (_tmp20_);
-#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_object_ref_sink (_tmp21_);
-#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp22_ = _tmp21_;
-#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_free0 (_tmp20_);
-#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			label = _tmp22_;
-#line 953 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp23_ = label;
-#line 953 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 954 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp24_ = row;
-#line 954 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp25_ = label;
-#line 954 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 3);
-#line 956 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp26_ = search;
-#line 956 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp27_ = search_filter_toolbar_saved_search_popover_data_button_new (_tmp26_, "edit-delete-symbolic");
-#line 956 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_object_ref_sink (_tmp27_);
-#line 956 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			delete_button = _tmp27_;
-#line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 953 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp28_ = row;
-#line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 953 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp29_ = delete_button;
-#line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 953 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			gtk_box_pack_end (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 958 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 954 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp30_ = delete_button;
-#line 958 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 954 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_connect (_tmp30_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_on_delete_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self);
-#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp31_ = self->priv->delete_buttons;
-#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp31__length1 = self->priv->delete_buttons_length1;
-#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp32_ = delete_button;
-#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp33_ = _g_object_ref0 (_tmp32_);
-#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_vala_array_add133 (&self->priv->delete_buttons, &self->priv->delete_buttons_length1, &self->priv->_delete_buttons_size_, _tmp33_);
-#line 961 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp34_ = search;
-#line 961 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp35_ = search_filter_toolbar_saved_search_popover_data_button_new (_tmp34_, "text-editor-symbolic");
-#line 961 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_object_ref_sink (_tmp35_);
-#line 961 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			edit_button = _tmp35_;
-#line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 958 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp36_ = row;
-#line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 958 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp37_ = edit_button;
-#line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 958 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			gtk_box_pack_end (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 963 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp38_ = edit_button;
-#line 963 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_connect (_tmp38_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_on_edit_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self);
-#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp39_ = self->priv->edit_buttons;
-#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp39__length1 = self->priv->edit_buttons_length1;
-#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp40_ = edit_button;
-#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp41_ = _g_object_ref0 (_tmp40_);
-#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_vala_array_add134 (&self->priv->edit_buttons, &self->priv->edit_buttons_length1, &self->priv->_edit_buttons_size_, _tmp41_);
-#line 966 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp42_ = self->priv->list_box;
-#line 966 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp43_ = row;
-#line 966 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			gtk_list_box_insert (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), -1);
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (edit_button);
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (delete_button);
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (label);
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (row);
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (search);
-#line 8435 "SearchFilter.c"
+#line 8397 "SearchFilter.c"
 		}
-#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_search_it);
-#line 8439 "SearchFilter.c"
+#line 8401 "SearchFilter.c"
 	}
-#line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp44_ = (GtkButton*) gtk_button_new_from_icon_name ("list-add-symbolic", GTK_ICON_SIZE_BUTTON);
-#line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp44_);
-#line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->add);
-#line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->add = _tmp44_;
-#line 969 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 965 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp45_ = self->priv->add;
-#line 969 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 965 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect (_tmp45_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_on_add_click_gtk_button_clicked, self);
-#line 970 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 966 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp46_ = self->priv->list_box;
-#line 970 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 966 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp47_ = self->priv->add;
-#line 970 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 966 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_list_box_insert (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), -1);
-#line 971 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 967 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp48_ = self->priv->list_box;
-#line 971 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 967 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect (_tmp48_, "row-activated", (GCallback) _search_filter_toolbar_saved_search_popover_on_activate_row_gtk_list_box_row_activated, self);
-#line 972 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp49_ = self->priv->list_box;
-#line 972 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_list_box_set_selection_mode (_tmp49_, GTK_SELECTION_NONE);
-#line 973 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 969 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp50_ = self->priv->popover;
-#line 973 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 969 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp51_ = self->priv->list_box;
-#line 973 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 969 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget));
-#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 971 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_restyle (self);
-#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 938 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 8477 "SearchFilter.c"
+#line 8439 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popover_new (GtkWidget* relative_to) {
-#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 938 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_saved_search_popover_construct (SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, relative_to);
-#line 8484 "SearchFilter.c"
+#line 8446 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSavedSearchPopover* self) {
-	GtkButton* _tmp0_ = NULL;
-	SearchFilterToolbarSavedSearchPopoverDataButton** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	SearchFilterToolbarSavedSearchPopoverDataButton** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-#line 986 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkButton* _tmp0_;
+	SearchFilterToolbarSavedSearchPopoverDataButton** _tmp1_;
+	gint _tmp1__length1;
+	SearchFilterToolbarSavedSearchPopoverDataButton** _tmp4_;
+	gint _tmp4__length1;
+#line 982 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
-#line 987 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 983 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->add;
-#line 987 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 983 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_relief (_tmp0_, GTK_RELIEF_NONE);
-#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->priv->edit_buttons;
-#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1__length1 = self->priv->edit_buttons_length1;
-#line 8504 "SearchFilter.c"
+#line 8466 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
 		gint _button_collection_size_ = 0;
 		gint button_it = 0;
-#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		button_collection = _tmp1_;
-#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		button_collection_length1 = _tmp1__length1;
-#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp1__length1; button_it = button_it + 1) {
-#line 8516 "SearchFilter.c"
-			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_ = NULL;
+#line 8478 "SearchFilter.c"
+			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
-#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp2_ = _g_object_ref0 (button_collection[button_it]);
-#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp2_;
-#line 8523 "SearchFilter.c"
+#line 8485 "SearchFilter.c"
 			{
-				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp3_ = NULL;
-#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp3_;
+#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp3_ = button;
-#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				search_filter_toolbar_saved_search_popover_data_button_restyle (_tmp3_);
-#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 8532 "SearchFilter.c"
+#line 8494 "SearchFilter.c"
 			}
 		}
 	}
-#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->delete_buttons;
-#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4__length1 = self->priv->delete_buttons_length1;
-#line 8540 "SearchFilter.c"
+#line 8502 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
 		gint _button_collection_size_ = 0;
 		gint button_it = 0;
-#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		button_collection = _tmp4_;
-#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		button_collection_length1 = _tmp4__length1;
-#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp4__length1; button_it = button_it + 1) {
-#line 8552 "SearchFilter.c"
-			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp5_ = NULL;
+#line 8514 "SearchFilter.c"
+			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp5_;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
-#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp5_ = _g_object_ref0 (button_collection[button_it]);
-#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp5_;
-#line 8559 "SearchFilter.c"
+#line 8521 "SearchFilter.c"
 			{
-				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_ = NULL;
-#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_;
+#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp6_ = button;
-#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				search_filter_toolbar_saved_search_popover_data_button_restyle (_tmp6_);
-#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 8568 "SearchFilter.c"
+#line 8530 "SearchFilter.c"
 			}
 		}
 	}
@@ -8573,403 +8535,407 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 
 static gboolean search_filter_toolbar_saved_search_popover_is_search_row (SearchFilterToolbarSavedSearchPopover* self, GtkListBoxRow* row) {
 	gboolean result = FALSE;
-	GtkListBoxRow* _tmp0_ = NULL;
-	GtkListBoxRow* _tmp1_ = NULL;
-	GList* _tmp2_ = NULL;
-	GList* _tmp3_ = NULL;
-	GList* _tmp4_ = NULL;
-	gconstpointer _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-#line 992 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkListBoxRow* _tmp0_;
+	GtkListBoxRow* _tmp1_;
+	GList* _tmp2_;
+	GList* _tmp3_;
+	GList* _tmp4_;
+	gconstpointer _tmp5_;
+	gboolean _tmp6_;
+#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self), FALSE);
-#line 992 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail ((row == NULL) || GTK_IS_LIST_BOX_ROW (row), FALSE);
-#line 993 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = row;
-#line 993 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_ == NULL) {
-#line 993 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		result = FALSE;
-#line 993 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 8596 "SearchFilter.c"
+#line 8558 "SearchFilter.c"
 	}
-#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = row;
-#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer));
-#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _tmp2_;
-#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = g_list_last (_tmp3_);
-#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = _tmp4_->data;
-#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE ((GtkWidget*) _tmp5_, gtk_button_get_type ());
-#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_list_free0 (_tmp3_);
-#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp6_) {
-#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		result = FALSE;
-#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 8618 "SearchFilter.c"
+#line 8580 "SearchFilter.c"
 	}
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 991 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = TRUE;
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 991 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 8624 "SearchFilter.c"
+#line 8586 "SearchFilter.c"
 }
 
 
 static SavedSearch* search_filter_toolbar_saved_search_popover_get_search (SearchFilterToolbarSavedSearchPopover* self, GtkListBoxRow* row) {
 	SavedSearch* result = NULL;
 	SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
-	GtkListBoxRow* _tmp0_ = NULL;
-	GList* _tmp1_ = NULL;
-	GList* _tmp2_ = NULL;
-	GList* _tmp3_ = NULL;
-	gconstpointer _tmp4_ = NULL;
-	GtkWidget* _tmp5_ = NULL;
-	GList* _tmp6_ = NULL;
-	GList* _tmp7_ = NULL;
-	GList* _tmp8_ = NULL;
-	gconstpointer _tmp9_ = NULL;
-	GtkWidget* _tmp10_ = NULL;
-	SearchFilterToolbarSavedSearchPopoverDataButton* _tmp11_ = NULL;
-	SearchFilterToolbarSavedSearchPopoverDataButton* _tmp12_ = NULL;
-	SavedSearch* _tmp13_ = NULL;
-	SavedSearch* _tmp14_ = NULL;
-	SavedSearch* _tmp15_ = NULL;
-#line 998 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkListBoxRow* _tmp0_;
+	GList* _tmp1_;
+	GList* _tmp2_;
+	GList* _tmp3_;
+	gconstpointer _tmp4_;
+	GtkWidget* _tmp5_;
+	GList* _tmp6_;
+	GList* _tmp7_;
+	GList* _tmp8_;
+	gconstpointer _tmp9_;
+	GtkWidget* _tmp10_;
+	SearchFilterToolbarSavedSearchPopoverDataButton* _tmp11_;
+	SearchFilterToolbarSavedSearchPopoverDataButton* _tmp12_;
+	SavedSearch* _tmp13_;
+	SavedSearch* _tmp14_;
+	SavedSearch* _tmp15_;
+#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self), NULL);
-#line 998 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (GTK_IS_LIST_BOX_ROW (row), NULL);
-#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = row;
-#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer));
-#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = _tmp1_;
-#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = g_list_first (_tmp2_);
-#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = _tmp3_->data;
-#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = (GtkWidget*) _tmp4_;
-#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_box_get_type ()) ? ((GtkBox*) _tmp5_) : NULL, gtk_container_get_type (), GtkContainer));
-#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = _tmp6_;
-#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = g_list_last (_tmp7_);
-#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = _tmp8_->data;
-#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = (GtkWidget*) _tmp9_;
-#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON) ? ((SearchFilterToolbarSavedSearchPopoverDataButton*) _tmp10_) : NULL);
-#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = _tmp11_;
-#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_list_free0 (_tmp7_);
-#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_list_free0 (_tmp2_);
-#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	button = _tmp12_;
-#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 996 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp13_ = search_filter_toolbar_saved_search_popover_data_button_get_search (button);
-#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 996 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp14_ = _tmp13_;
-#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 996 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp15_ = _g_object_ref0 (_tmp14_);
-#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 996 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp15_;
-#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 996 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (button);
-#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 996 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 8695 "SearchFilter.c"
+#line 8657 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_on_activate_row (SearchFilterToolbarSavedSearchPopover* self, GtkListBoxRow* row) {
-	GtkListBoxRow* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GtkPopover* _tmp5_ = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkListBoxRow* _tmp0_;
+	gboolean _tmp1_;
+	GtkPopover* _tmp5_;
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
-#line 1003 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail ((row == NULL) || GTK_IS_LIST_BOX_ROW (row));
-#line 1004 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = row;
-#line 1004 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = search_filter_toolbar_saved_search_popover_is_search_row (self, _tmp0_);
-#line 1004 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 8713 "SearchFilter.c"
-		GtkListBoxRow* _tmp2_ = NULL;
-		SavedSearch* _tmp3_ = NULL;
-		SavedSearch* _tmp4_ = NULL;
-#line 1005 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 8675 "SearchFilter.c"
+		GtkListBoxRow* _tmp2_;
+		SavedSearch* _tmp3_;
+		SavedSearch* _tmp4_;
+#line 1001 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = row;
-#line 1005 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1001 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = search_filter_toolbar_saved_search_popover_get_search (self, _tmp2_);
-#line 1005 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1001 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = _tmp3_;
-#line 1005 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		g_signal_emit_by_name (self, "search-activated", _tmp4_);
-#line 1005 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1001 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_SEARCH_ACTIVATED_SIGNAL], 0, _tmp4_);
+#line 1001 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp4_);
-#line 8727 "SearchFilter.c"
+#line 8689 "SearchFilter.c"
 	}
-#line 1006 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1002 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->priv->popover;
-#line 1006 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1002 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 8733 "SearchFilter.c"
+#line 8695 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_on_edit_click (SearchFilterToolbarSavedSearchPopover* self, SavedSearch* search) {
-	SavedSearch* _tmp0_ = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SavedSearch* _tmp0_;
+#line 1005 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
-#line 1009 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1005 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 1010 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1006 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = search;
-#line 1010 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "edit-clicked", _tmp0_);
-#line 8747 "SearchFilter.c"
+#line 1006 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_EDIT_CLICKED_SIGNAL], 0, _tmp0_);
+#line 8709 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_on_delete_click (SearchFilterToolbarSavedSearchPopover* self, SavedSearch* search) {
-	SavedSearch* _tmp0_ = NULL;
-#line 1013 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SavedSearch* _tmp0_;
+#line 1009 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
-#line 1013 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1009 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 1014 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1010 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = search;
-#line 1014 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "delete-clicked", _tmp0_);
-#line 8761 "SearchFilter.c"
+#line 1010 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DELETE_CLICKED_SIGNAL], 0, _tmp0_);
+#line 8723 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_on_add_click (SearchFilterToolbarSavedSearchPopover* self) {
-#line 1017 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1013 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
-#line 1018 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "add-clicked");
-#line 8770 "SearchFilter.c"
+#line 1014 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_ADD_CLICKED_SIGNAL], 0);
+#line 8732 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_on_popover_closed (SearchFilterToolbarSavedSearchPopover* self) {
-#line 1021 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1017 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
-#line 1022 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "closed");
-#line 8779 "SearchFilter.c"
+#line 1018 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_CLOSED_SIGNAL], 0);
+#line 8741 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_saved_search_popover_show_all (SearchFilterToolbarSavedSearchPopover* self) {
-	GtkPopover* _tmp0_ = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkPopover* _tmp0_;
+#line 1021 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
-#line 1026 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1022 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->popover;
-#line 1026 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1022 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 8791 "SearchFilter.c"
+#line 8753 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_saved_search_popover_hide (SearchFilterToolbarSavedSearchPopover* self) {
-	GtkPopover* _tmp0_ = NULL;
-#line 1029 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkPopover* _tmp0_;
+#line 1025 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
-#line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1026 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->popover;
-#line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1026 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 8803 "SearchFilter.c"
+#line 8765 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 929 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 925 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_data_button_on_click ((SearchFilterToolbarSavedSearchPopoverDataButton*) self);
-#line 8810 "SearchFilter.c"
+#line 8772 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_construct (GType object_type, SavedSearch* search, const gchar* name) {
 	SearchFilterToolbarSavedSearchPopoverDataButton * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	SavedSearch* _tmp2_ = NULL;
-	GtkButton* _tmp3_ = NULL;
-	GtkButton* _tmp4_ = NULL;
-#line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	const gchar* _tmp0_;
+	GtkButton* _tmp1_;
+	SavedSearch* _tmp2_;
+	GtkButton* _tmp3_;
+	GtkButton* _tmp4_;
+#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
-#line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbarSavedSearchPopoverDataButton*) g_object_new (object_type, NULL);
-#line 919 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 915 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = name;
-#line 919 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 915 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = (GtkButton*) gtk_button_new_from_icon_name (_tmp0_, GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 919 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 915 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp1_);
-#line 919 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 915 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->button);
-#line 919 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 915 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->button = _tmp1_;
-#line 920 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 916 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search;
-#line 920 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 916 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_data_button_set_search (self, _tmp2_);
-#line 921 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 917 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->button;
-#line 921 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 917 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 923 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 919 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_data_button_restyle (self);
-#line 925 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 921 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->button;
-#line 925 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 921 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp4_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked, self, 0);
-#line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 8853 "SearchFilter.c"
+#line 8815 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_new (SavedSearch* search, const gchar* name) {
-#line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_saved_search_popover_data_button_construct (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, search, name);
-#line 8860 "SearchFilter.c"
+#line 8822 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_data_button_restyle (SearchFilterToolbarSavedSearchPopoverDataButton* self) {
-	GtkButton* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-#line 932 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkButton* _tmp0_;
+	GtkButton* _tmp1_;
+#line 928 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_IS_DATA_BUTTON (self));
-#line 933 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 929 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->button;
-#line 933 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 929 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), 24, 24);
-#line 934 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 930 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->priv->button;
-#line 934 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 930 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_relief (_tmp1_, GTK_RELIEF_NONE);
-#line 8877 "SearchFilter.c"
+#line 8839 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_data_button_on_click (SearchFilterToolbarSavedSearchPopoverDataButton* self) {
-	SavedSearch* _tmp0_ = NULL;
-#line 937 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SavedSearch* _tmp0_;
+#line 933 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_IS_DATA_BUTTON (self));
-#line 938 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 934 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->_search;
-#line 938 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "clicked", _tmp0_);
-#line 8889 "SearchFilter.c"
+#line 934 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit (self, search_filter_toolbar_saved_search_popover_data_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_CLICKED_SIGNAL], 0, _tmp0_);
+#line 8851 "SearchFilter.c"
 }
 
 
 static SavedSearch* search_filter_toolbar_saved_search_popover_data_button_get_search (SearchFilterToolbarSavedSearchPopoverDataButton* self) {
 	SavedSearch* result;
-	SavedSearch* _tmp0_ = NULL;
-#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SavedSearch* _tmp0_;
+#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_IS_DATA_BUTTON (self), NULL);
-#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->_search;
-#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 8904 "SearchFilter.c"
+#line 8866 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_data_button_set_search (SearchFilterToolbarSavedSearchPopoverDataButton* self, SavedSearch* value) {
-	SavedSearch* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
-#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_IS_DATA_BUTTON (self));
-#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = value;
-#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (self->priv->_search);
-#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->_search = _tmp1_;
-#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_notify ((GObject *) self, "search");
-#line 8923 "SearchFilter.c"
+#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	if (search_filter_toolbar_saved_search_popover_data_button_get_search (self) != value) {
+#line 8875 "SearchFilter.c"
+		SavedSearch* _tmp0_;
+		SavedSearch* _tmp1_;
+#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp0_ = value;
+#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_g_object_unref0 (self->priv->_search);
+#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		self->priv->_search = _tmp1_;
+#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		g_object_notify ((GObject *) self, "search");
+#line 8888 "SearchFilter.c"
+	}
 }
 
 
 static void search_filter_toolbar_saved_search_popover_data_button_class_init (SearchFilterToolbarSavedSearchPopoverDataButtonClass * klass) {
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_data_button_parent_class = g_type_class_peek_parent (klass);
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarSavedSearchPopoverDataButtonPrivate));
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_search_filter_toolbar_saved_search_popover_data_button_get_property;
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_search_filter_toolbar_saved_search_popover_data_button_set_property;
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_saved_search_popover_data_button_finalize;
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH, g_param_spec_object ("search", "search", "search", TYPE_SAVED_SEARCH, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("clicked", SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
-#line 8942 "SearchFilter.c"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH_PROPERTY, g_param_spec_object ("search", "search", "search", TYPE_SAVED_SEARCH, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_toolbar_saved_search_popover_data_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_CLICKED_SIGNAL] = g_signal_new ("clicked", SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
+#line 8908 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_data_button_instance_init (SearchFilterToolbarSavedSearchPopoverDataButton * self) {
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_GET_PRIVATE (self);
-#line 913 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 909 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->button = NULL;
-#line 8951 "SearchFilter.c"
+#line 8917 "SearchFilter.c"
 }
 
 
-static void search_filter_toolbar_saved_search_popover_data_button_finalize (GObject* obj) {
+static void search_filter_toolbar_saved_search_popover_data_button_finalize (GObject * obj) {
 	SearchFilterToolbarSavedSearchPopoverDataButton * self;
-	GtkButton* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkButton* _tmp0_;
+	guint _tmp1_;
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, SearchFilterToolbarSavedSearchPopoverDataButton);
-#line 929 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 925 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->button;
-#line 929 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 925 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp1_, NULL, FALSE);
-#line 929 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 925 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked, self);
-#line 913 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 909 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->button);
-#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->_search);
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_saved_search_popover_data_button_parent_class)->finalize (obj);
-#line 8973 "SearchFilter.c"
+#line 8939 "SearchFilter.c"
 }
 
 
@@ -8988,21 +8954,21 @@ static GType search_filter_toolbar_saved_search_popover_data_button_get_type (vo
 static void _vala_search_filter_toolbar_saved_search_popover_data_button_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
 	SearchFilterToolbarSavedSearchPopoverDataButton * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, SearchFilterToolbarSavedSearchPopoverDataButton);
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	switch (property_id) {
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		case SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH:
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		case SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH_PROPERTY:
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_value_set_object (value, search_filter_toolbar_saved_search_popover_data_button_get_search (self));
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		break;
-#line 9000 "SearchFilter.c"
+#line 8966 "SearchFilter.c"
 		default:
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		break;
-#line 9006 "SearchFilter.c"
+#line 8972 "SearchFilter.c"
 	}
 }
 
@@ -9010,376 +8976,376 @@ static void _vala_search_filter_toolbar_saved_search_popover_data_button_get_pro
 static void _vala_search_filter_toolbar_saved_search_popover_data_button_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
 	SearchFilterToolbarSavedSearchPopoverDataButton * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, SearchFilterToolbarSavedSearchPopoverDataButton);
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	switch (property_id) {
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		case SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH:
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		case SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH_PROPERTY:
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_data_button_set_search (self, g_value_get_object (value));
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		break;
-#line 9022 "SearchFilter.c"
+#line 8988 "SearchFilter.c"
 		default:
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		break;
-#line 9028 "SearchFilter.c"
+#line 8994 "SearchFilter.c"
 	}
 }
 
 
 static void search_filter_toolbar_value_saved_search_popover_init (GValue* value) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	value->data[0].v_pointer = NULL;
-#line 9036 "SearchFilter.c"
+#line 9002 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_value_saved_search_popover_free_value (GValue* value) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (value->data[0].v_pointer) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_unref (value->data[0].v_pointer);
-#line 9045 "SearchFilter.c"
+#line 9011 "SearchFilter.c"
 	}
 }
 
 
 static void search_filter_toolbar_value_saved_search_popover_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (src_value->data[0].v_pointer) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = search_filter_toolbar_saved_search_popover_ref (src_value->data[0].v_pointer);
-#line 9055 "SearchFilter.c"
+#line 9021 "SearchFilter.c"
 	} else {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9059 "SearchFilter.c"
+#line 9025 "SearchFilter.c"
 	}
 }
 
 
 static gpointer search_filter_toolbar_value_saved_search_popover_peek_pointer (const GValue* value) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 9067 "SearchFilter.c"
+#line 9033 "SearchFilter.c"
 }
 
 
 static gchar* search_filter_toolbar_value_saved_search_popover_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (collect_values[0].v_pointer) {
-#line 9074 "SearchFilter.c"
-		SearchFilterToolbarSavedSearchPopover* object;
+#line 9040 "SearchFilter.c"
+		SearchFilterToolbarSavedSearchPopover * object;
 		object = collect_values[0].v_pointer;
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9081 "SearchFilter.c"
+#line 9047 "SearchFilter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9085 "SearchFilter.c"
+#line 9051 "SearchFilter.c"
 		}
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = search_filter_toolbar_saved_search_popover_ref (object);
-#line 9089 "SearchFilter.c"
+#line 9055 "SearchFilter.c"
 	} else {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9093 "SearchFilter.c"
+#line 9059 "SearchFilter.c"
 	}
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 9097 "SearchFilter.c"
+#line 9063 "SearchFilter.c"
 }
 
 
 static gchar* search_filter_toolbar_value_saved_search_popover_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SearchFilterToolbarSavedSearchPopover** object_p;
+	SearchFilterToolbarSavedSearchPopover ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!object_p) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9108 "SearchFilter.c"
+#line 9074 "SearchFilter.c"
 	}
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!value->data[0].v_pointer) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = NULL;
-#line 9114 "SearchFilter.c"
+#line 9080 "SearchFilter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9118 "SearchFilter.c"
+#line 9084 "SearchFilter.c"
 	} else {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = search_filter_toolbar_saved_search_popover_ref (value->data[0].v_pointer);
-#line 9122 "SearchFilter.c"
+#line 9088 "SearchFilter.c"
 	}
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 9126 "SearchFilter.c"
+#line 9092 "SearchFilter.c"
 }
 
 
 GParamSpec* search_filter_toolbar_param_spec_saved_search_popover (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	SearchFilterToolbarParamSpecSavedSearchPopover* spec;
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER), NULL);
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return G_PARAM_SPEC (spec);
-#line 9140 "SearchFilter.c"
+#line 9106 "SearchFilter.c"
 }
 
 
 gpointer search_filter_toolbar_value_get_saved_search_popover (const GValue* value) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER), NULL);
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 9149 "SearchFilter.c"
+#line 9115 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_value_set_saved_search_popover (GValue* value, gpointer v_object) {
-	SearchFilterToolbarSavedSearchPopover* old;
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SearchFilterToolbarSavedSearchPopover * old;
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER));
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	old = value->data[0].v_pointer;
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (v_object) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER));
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = v_object;
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_ref (value->data[0].v_pointer);
-#line 9169 "SearchFilter.c"
+#line 9135 "SearchFilter.c"
 	} else {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9173 "SearchFilter.c"
+#line 9139 "SearchFilter.c"
 	}
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_unref (old);
-#line 9179 "SearchFilter.c"
+#line 9145 "SearchFilter.c"
 	}
 }
 
 
 void search_filter_toolbar_value_take_saved_search_popover (GValue* value, gpointer v_object) {
-	SearchFilterToolbarSavedSearchPopover* old;
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SearchFilterToolbarSavedSearchPopover * old;
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER));
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	old = value->data[0].v_pointer;
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (v_object) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER));
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = v_object;
-#line 9198 "SearchFilter.c"
+#line 9164 "SearchFilter.c"
 	} else {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9202 "SearchFilter.c"
+#line 9168 "SearchFilter.c"
 	}
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_unref (old);
-#line 9208 "SearchFilter.c"
+#line 9174 "SearchFilter.c"
 	}
 }
 
 
 static void search_filter_toolbar_saved_search_popover_class_init (SearchFilterToolbarSavedSearchPopoverClass * klass) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_parent_class = g_type_class_peek_parent (klass);
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	((SearchFilterToolbarSavedSearchPopoverClass *) klass)->finalize = search_filter_toolbar_saved_search_popover_finalize;
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarSavedSearchPopoverPrivate));
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("search_activated", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("edit_clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("delete_clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("add_clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("closed", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 9230 "SearchFilter.c"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_SEARCH_ACTIVATED_SIGNAL] = g_signal_new ("search-activated", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_EDIT_CLICKED_SIGNAL] = g_signal_new ("edit-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DELETE_CLICKED_SIGNAL] = g_signal_new ("delete-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_ADD_CLICKED_SIGNAL] = g_signal_new ("add-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_CLOSED_SIGNAL] = g_signal_new ("closed", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 9196 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_instance_init (SearchFilterToolbarSavedSearchPopover * self) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_GET_PRIVATE (self);
-#line 899 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 895 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->popover = NULL;
-#line 900 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->list_box = NULL;
-#line 901 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 897 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->edit_buttons = NULL;
-#line 901 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 897 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->edit_buttons_length1 = 0;
-#line 901 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 897 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_edit_buttons_size_ = self->priv->edit_buttons_length1;
-#line 902 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->delete_buttons = NULL;
-#line 902 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->delete_buttons_length1 = 0;
-#line 902 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_delete_buttons_size_ = self->priv->delete_buttons_length1;
-#line 903 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 899 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->add = NULL;
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->ref_count = 1;
-#line 9257 "SearchFilter.c"
+#line 9223 "SearchFilter.c"
 }
 
 
-static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToolbarSavedSearchPopover* obj) {
+static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToolbarSavedSearchPopover * obj) {
 	SearchFilterToolbarSavedSearchPopover * self;
-	SearchFilterToolbarSavedSearchPopoverDataButton** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	SearchFilterToolbarSavedSearchPopoverDataButton** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	GtkButton* _tmp8_ = NULL;
-	guint _tmp9_ = 0U;
-	GtkListBox* _tmp10_ = NULL;
-	guint _tmp11_ = 0U;
-	GtkPopover* _tmp12_ = NULL;
-	guint _tmp13_ = 0U;
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SearchFilterToolbarSavedSearchPopoverDataButton** _tmp0_;
+	gint _tmp0__length1;
+	SearchFilterToolbarSavedSearchPopoverDataButton** _tmp4_;
+	gint _tmp4__length1;
+	GtkButton* _tmp8_;
+	guint _tmp9_;
+	GtkListBox* _tmp10_;
+	guint _tmp11_;
+	GtkPopover* _tmp12_;
+	guint _tmp13_;
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, SearchFilterToolbarSavedSearchPopover);
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_destroy (self);
-#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->edit_buttons;
-#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0__length1 = self->priv->edit_buttons_length1;
-#line 9281 "SearchFilter.c"
+#line 9247 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
 		gint _button_collection_size_ = 0;
 		gint button_it = 0;
-#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		button_collection = _tmp0_;
-#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		button_collection_length1 = _tmp0__length1;
-#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp0__length1; button_it = button_it + 1) {
-#line 9293 "SearchFilter.c"
-			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp1_ = NULL;
+#line 9259 "SearchFilter.c"
+			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp1_;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
-#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp1_ = _g_object_ref0 (button_collection[button_it]);
-#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp1_;
-#line 9300 "SearchFilter.c"
+#line 9266 "SearchFilter.c"
 			{
-				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_ = NULL;
-				guint _tmp3_ = 0U;
-#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_;
+				guint _tmp3_;
+#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp2_ = button;
-#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("clicked", SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, &_tmp3_, NULL, FALSE);
-#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_edit_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self);
-#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 9312 "SearchFilter.c"
+#line 9278 "SearchFilter.c"
 			}
 		}
 	}
-#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->delete_buttons;
-#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4__length1 = self->priv->delete_buttons_length1;
-#line 9320 "SearchFilter.c"
+#line 9286 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
 		gint _button_collection_size_ = 0;
 		gint button_it = 0;
-#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		button_collection = _tmp4_;
-#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		button_collection_length1 = _tmp4__length1;
-#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp4__length1; button_it = button_it + 1) {
-#line 9332 "SearchFilter.c"
-			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp5_ = NULL;
+#line 9298 "SearchFilter.c"
+			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp5_;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
-#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp5_ = _g_object_ref0 (button_collection[button_it]);
-#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp5_;
-#line 9339 "SearchFilter.c"
+#line 9305 "SearchFilter.c"
 			{
-				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_ = NULL;
-				guint _tmp7_ = 0U;
-#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_;
+				guint _tmp7_;
+#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp6_ = button;
-#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("clicked", SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, &_tmp7_, NULL, FALSE);
-#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_delete_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self);
-#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 9351 "SearchFilter.c"
+#line 9317 "SearchFilter.c"
 			}
 		}
 	}
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = self->priv->add;
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp9_, NULL, FALSE);
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_add_click_gtk_button_clicked, self);
-#line 982 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = self->priv->list_box;
-#line 982 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("row-activated", gtk_list_box_get_type (), &_tmp11_, NULL, FALSE);
-#line 982 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_activate_row_gtk_list_box_row_activated, self);
-#line 983 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = self->priv->popover;
-#line 983 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("closed", gtk_popover_get_type (), &_tmp13_, NULL, FALSE);
-#line 983 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_popover_closed_gtk_popover_closed, self);
-#line 899 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 895 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->popover);
-#line 900 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->list_box);
-#line 901 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 897 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->edit_buttons = (_vala_array_free (self->priv->edit_buttons, self->priv->edit_buttons_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 902 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->delete_buttons = (_vala_array_free (self->priv->delete_buttons, self->priv->delete_buttons_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 903 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 899 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->add);
-#line 9383 "SearchFilter.c"
+#line 9349 "SearchFilter.c"
 }
 
 
@@ -9398,195 +9364,195 @@ GType search_filter_toolbar_saved_search_popover_get_type (void) {
 
 
 gpointer search_filter_toolbar_saved_search_popover_ref (gpointer instance) {
-	SearchFilterToolbarSavedSearchPopover* self;
+	SearchFilterToolbarSavedSearchPopover * self;
 	self = instance;
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return instance;
-#line 9408 "SearchFilter.c"
+#line 9374 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_saved_search_popover_unref (gpointer instance) {
-	SearchFilterToolbarSavedSearchPopover* self;
+	SearchFilterToolbarSavedSearchPopover * self;
 	self = instance;
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_GET_CLASS (self)->finalize (self);
-#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9421 "SearchFilter.c"
+#line 9387 "SearchFilter.c"
 	}
 }
 
 
 static void search_filter_toolbar_class_init (SearchFilterToolbarClass * klass) {
-#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_parent_class = g_type_class_peek_parent (klass);
-#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarPrivate));
-#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_finalize;
-#line 9433 "SearchFilter.c"
+#line 9399 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_instance_init (SearchFilterToolbar * self) {
-	GtkMenu* _tmp0_ = NULL;
-	GtkMenuItem* _tmp1_ = NULL;
-	GtkBuilder* _tmp2_ = NULL;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp3_ = NULL;
-#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkMenu* _tmp0_;
+	GtkMenuItem* _tmp1_;
+	GtkBuilder* _tmp2_;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp3_;
+#line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_GET_PRIVATE (self);
-#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 659 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = (GtkMenu*) gtk_menu_new ();
-#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 659 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp0_);
-#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 659 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->close_menu = _tmp0_;
-#line 664 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 660 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = (GtkMenuItem*) gtk_menu_item_new ();
-#line 664 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 660 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp1_);
-#line 664 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 660 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->close_item = _tmp1_;
-#line 1034 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = gtk_builder_new ();
-#line 1034 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->builder = _tmp2_;
-#line 1037 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1033 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->saved_search = NULL;
-#line 1040 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1036 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = search_filter_toolbar_saved_search_filter_button_new ();
-#line 1040 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1036 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1040 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1036 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->saved_search_button = _tmp3_;
-#line 1041 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1037 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->elide_showing_again = FALSE;
-#line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1038 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->search_filter = NULL;
-#line 9472 "SearchFilter.c"
+#line 9438 "SearchFilter.c"
 }
 
 
-static void search_filter_toolbar_finalize (GObject* obj) {
+static void search_filter_toolbar_finalize (GObject * obj) {
 	SearchFilterToolbar * self;
-	SearchFilterActions* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	SearchFilterActions* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	SearchFilterActions* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	SearchFilterActions* _tmp6_ = NULL;
-	guint _tmp7_ = 0U;
-	SearchFilterActions* _tmp8_ = NULL;
-	guint _tmp9_ = 0U;
-	SearchFilterActions* _tmp10_ = NULL;
-	guint _tmp11_ = 0U;
-	SearchFilterActions* _tmp12_ = NULL;
-	guint _tmp13_ = 0U;
-	SearchFilterActions* _tmp14_ = NULL;
-	guint _tmp15_ = 0U;
-	GtkToolbar* _tmp16_ = NULL;
-	guint _tmp17_ = 0U;
-#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	SearchFilterActions* _tmp0_;
+	guint _tmp1_;
+	SearchFilterActions* _tmp2_;
+	guint _tmp3_;
+	SearchFilterActions* _tmp4_;
+	guint _tmp5_;
+	SearchFilterActions* _tmp6_;
+	guint _tmp7_;
+	SearchFilterActions* _tmp8_;
+	guint _tmp9_;
+	SearchFilterActions* _tmp10_;
+	guint _tmp11_;
+	SearchFilterActions* _tmp12_;
+	guint _tmp13_;
+	SearchFilterActions* _tmp14_;
+	guint _tmp15_;
+	GtkToolbar* _tmp16_;
+	guint _tmp17_;
+#line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_FILTER_TOOLBAR, SearchFilterToolbar);
-#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1154 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->actions;
-#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1154 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("media-context-changed", TYPE_SEARCH_FILTER_ACTIONS, &_tmp1_, NULL, FALSE);
-#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1154 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_on_media_context_changed_search_filter_actions_media_context_changed, self);
-#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1156 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = self->priv->actions;
-#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1156 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("flagged-toggled", TYPE_SEARCH_FILTER_ACTIONS, &_tmp3_, NULL, FALSE);
-#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1156 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled, self);
-#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1157 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->actions;
-#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1157 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("photos-toggled", TYPE_SEARCH_FILTER_ACTIONS, &_tmp5_, NULL, FALSE);
-#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1157 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled, self);
-#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = self->priv->actions;
-#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("videos-toggled", TYPE_SEARCH_FILTER_ACTIONS, &_tmp7_, NULL, FALSE);
-#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled, self);
-#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = self->priv->actions;
-#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("raw-toggled", TYPE_SEARCH_FILTER_ACTIONS, &_tmp9_, NULL, FALSE);
-#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled, self);
-#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = self->priv->actions;
-#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("rating-changed", TYPE_SEARCH_FILTER_ACTIONS, &_tmp11_, NULL, FALSE);
-#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed, self);
-#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = self->priv->actions;
-#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("text-changed", TYPE_SEARCH_FILTER_ACTIONS, &_tmp13_, NULL, FALSE);
-#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed, self);
-#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp14_ = self->priv->actions;
-#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("criteria-changed", TYPE_SEARCH_FILTER_ACTIONS, &_tmp15_, NULL, FALSE);
-#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed, self);
-#line 1168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp16_ = self->priv->toolbar;
-#line 1168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("popup-context-menu", gtk_toolbar_get_type (), &_tmp17_, NULL, FALSE);
-#line 1168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp16_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu, self);
-#line 607 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbar);
-#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 659 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->close_menu);
-#line 664 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 660 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->close_item);
-#line 1034 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->builder);
-#line 1036 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_search_filter_actions_unref0 (self->priv->actions);
-#line 1037 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1033 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->saved_search);
-#line 1038 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1034 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->search_box);
-#line 1039 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1035 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->rating_button);
-#line 1040 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1036 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->saved_search_button);
-#line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1038 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_view_filter_unref0 (self->priv->search_filter);
-#line 1043 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1039 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->label_type);
-#line 1044 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1040 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_photos);
-#line 1045 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1041 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_videos);
-#line 1046 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_raw);
-#line 1047 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1043 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_flag);
-#line 1048 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1044 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_mediatype_flagged);
-#line 1049 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1045 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_flagged_rating);
-#line 1050 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1046 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_rating_saved);
-#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_parent_class)->finalize (obj);
-#line 9590 "SearchFilter.c"
+#line 9556 "SearchFilter.c"
 }
 
 
diff --git a/src/SearchFilter.vala b/src/SearchFilter.vala
index 04e5593..fba5488 100644
--- a/src/SearchFilter.vala
+++ b/src/SearchFilter.vala
@@ -204,12 +204,8 @@ public abstract class DefaultSearchViewFilter : SearchViewFilter {
             } else if (source is Photo) {
                 Photo photo = source as Photo;
                 if (photo.get_master_file_format() == PhotoFileFormat.RAW) {
-                    if (photo.is_raw_developer_available(RawDeveloper.CAMERA)) {
-                        if (!show_media_photos && !show_media_raw)
-                            return false;
-                    } else if (!show_media_raw) {
+                    if (!show_media_photos && !show_media_raw)
                         return false;
-                    }
                 } else if (!show_media_photos)
                     return false;
             }
@@ -1170,7 +1166,9 @@ public class SearchFilterToolbar : Gtk.Revealer {
     
     private void on_media_context_changed(bool has_photos, bool has_videos, bool has_raw,
         bool has_flagged) {
-        if (has_photos)
+        if (has_photos || has_raw)
+            // As a user, I would expect, that a raw photo is still a photo.
+            // Let's enable the photo button even if there ar only raw photos.
             toolbtn_photos.set_icon_name(Resources.ICON_FILTER_PHOTOS);
         else
             toolbtn_photos.set_icon_name(Resources.ICON_FILTER_PHOTOS_DISABLED);
@@ -1391,4 +1389,3 @@ public class SearchFilterToolbar : Gtk.Revealer {
         search_box.get_focus();
     }
 }
-
diff --git a/src/SlideshowPage.c b/src/SlideshowPage.c
index c188275..642fce7 100644
--- a/src/SlideshowPage.c
+++ b/src/SlideshowPage.c
@@ -1,4 +1,4 @@
-/* SlideshowPage.c generated by valac 0.34.7, the Vala compiler
+/* SlideshowPage.c generated by valac 0.36.6, the Vala compiler
  * generated from SlideshowPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -294,6 +294,11 @@ typedef struct _SlideshowPageSettingsDialogClass SlideshowPageSettingsDialogClas
 #define _pango_attribute_destroy0(var) ((var == NULL) ? NULL : (var = (pango_attribute_destroy (var), NULL)))
 #define _pango_attr_list_unref0(var) ((var == NULL) ? NULL : (var = (pango_attr_list_unref (var), NULL)))
 typedef struct _SlideshowPageSettingsDialogPrivate SlideshowPageSettingsDialogPrivate;
+enum  {
+	SLIDESHOW_PAGE_HIDE_TOOLBAR_SIGNAL,
+	SLIDESHOW_PAGE_LAST_SIGNAL
+};
+static guint slideshow_page_signals[SLIDESHOW_PAGE_LAST_SIGNAL] = {0};
 
 struct _Page {
 	GtkScrolledWindow parent_instance;
@@ -566,7 +571,7 @@ void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* resul
 PixbufCache* pixbuf_cache_new (SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target);
 PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target);
 GType direction_get_type (void) G_GNUC_CONST;
-static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start, Direction direction, Photo** next, GdkPixbuf** next_pixbuf);
+static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start, Direction direction, Photo* * next, GdkPixbuf* * next_pixbuf);
 void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, Dimensions* max_dim, Direction* direction);
 GType photo_exception_get_type (void) G_GNUC_CONST;
 void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result);
@@ -588,7 +593,7 @@ GtkWindow* page_get_container (Page* self);
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
 void app_window_end_fullscreen (AppWindow* self);
-gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource** next, DataSource** prev, const gchar* type_selector);
+gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource* * next, DataSource* * prev, const gchar* type_selector);
 #define PHOTO_TYPENAME "thumb"
 GType background_job_job_priority_get_type (void) G_GNUC_CONST;
 void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPriority priority, gboolean force);
@@ -644,8 +649,8 @@ static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageS
 static void _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
 #define CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MIN 0.1
 #define CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MAX 1.0
-static void slideshow_page_settings_dialog_finalize (GObject* obj);
-static void slideshow_page_finalize (GObject* obj);
+static void slideshow_page_settings_dialog_finalize (GObject * obj);
+static void slideshow_page_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -653,90 +658,81 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 657 "SlideshowPage.c"
+#line 662 "SlideshowPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 664 "SlideshowPage.c"
+#line 669 "SlideshowPage.c"
 }
 
 
 static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 163 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 671 "SlideshowPage.c"
+#line 676 "SlideshowPage.c"
 }
 
 
 static void _slideshow_page_on_play_pause_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 170 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	slideshow_page_on_play_pause ((SlideshowPage*) self);
-#line 678 "SlideshowPage.c"
+#line 683 "SlideshowPage.c"
 }
 
 
 static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 177 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 685 "SlideshowPage.c"
+#line 690 "SlideshowPage.c"
 }
 
 
 static void _slideshow_page_on_change_settings_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 185 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	slideshow_page_on_change_settings ((SlideshowPage*) self);
-#line 692 "SlideshowPage.c"
+#line 697 "SlideshowPage.c"
 }
 
 
 SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* sources, ViewCollection* controller, Photo* start) {
 	SlideshowPage * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	SourceCollection* _tmp1_ = NULL;
-	SourceCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	ViewCollection* _tmp4_ = NULL;
+	SourceCollection* _tmp0_;
+	SourceCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
 	GeeCollection* pluggables = NULL;
-	TransitionEffectsManager* _tmp5_ = NULL;
-	TransitionEffectsManager* _tmp6_ = NULL;
-	GeeCollection* _tmp7_ = NULL;
-	GeeCollection* _tmp8_ = NULL;
+	TransitionEffectsManager* _tmp4_;
+	TransitionEffectsManager* _tmp5_;
+	GeeCollection* _tmp6_;
+	GeeCollection* _tmp7_;
 	GeeArrayList* a = NULL;
-	GeeArrayList* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gpointer* _tmp11_ = NULL;
-	Photo* _tmp12_ = NULL;
-	Photo* _tmp13_ = NULL;
+	GeeArrayList* _tmp8_;
+	gint _tmp9_;
+	gpointer* _tmp10_;
+	Photo* _tmp11_;
+	Photo* _tmp12_;
 	GtkToolbar* toolbar = NULL;
-	GtkToolbar* _tmp14_ = NULL;
+	GtkToolbar* _tmp13_;
 	GtkToolButton* previous_button = NULL;
-	const gchar* _tmp15_ = NULL;
-	GtkToolButton* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	GtkToolButton* _tmp19_ = NULL;
-	GtkToolButton* _tmp20_ = NULL;
-	GtkToolButton* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	GtkToolButton* _tmp23_ = NULL;
-	GtkToolButton* _tmp24_ = NULL;
+	GtkToolButton* _tmp14_;
+	GtkToolButton* _tmp15_;
+	GtkToolButton* _tmp16_;
+	GtkToolButton* _tmp17_;
+	GtkToolButton* _tmp18_;
+	GtkToolButton* _tmp19_;
 	GtkToolButton* next_button = NULL;
-	const gchar* _tmp25_ = NULL;
-	GtkToolButton* _tmp26_ = NULL;
-	const gchar* _tmp27_ = NULL;
-	GtkToolButton* _tmp28_ = NULL;
-	GtkToolButton* _tmp29_ = NULL;
-	GtkToolButton* _tmp30_ = NULL;
-	const gchar* _tmp31_ = NULL;
-	GtkToolButton* _tmp32_ = NULL;
-	const gchar* _tmp33_ = NULL;
-	GtkToolButton* _tmp34_ = NULL;
-	GtkToolButton* _tmp35_ = NULL;
-	GtkToolButton* _tmp36_ = NULL;
-	Screensaver* _tmp37_ = NULL;
+	GtkToolButton* _tmp20_;
+	GtkToolButton* _tmp21_;
+	GtkToolButton* _tmp22_;
+	GtkToolButton* _tmp23_;
+	GtkToolButton* _tmp24_;
+	GtkToolButton* _tmp25_;
+	GtkToolButton* _tmp26_;
+	GtkToolButton* _tmp27_;
+	Screensaver* _tmp28_;
 #line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL);
 #line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -744,41 +740,39 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so
 #line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (IS_PHOTO (start), NULL);
 #line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp0_ = _ ("Slideshow");
-#line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self = (SlideshowPage*) single_photo_page_construct (object_type, _tmp0_, TRUE);
+	self = (SlideshowPage*) single_photo_page_construct (object_type, _ ("Slideshow"), TRUE);
 #line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp1_ = sources;
+	_tmp0_ = sources;
 #line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp2_ = _data_collection_ref0 (_tmp1_);
+	_tmp1_ = _data_collection_ref0 (_tmp0_);
 #line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_data_collection_unref0 (self->priv->sources);
 #line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->sources = _tmp2_;
+	self->priv->sources = _tmp1_;
 #line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp3_ = controller;
+	_tmp2_ = controller;
 #line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp4_ = _data_collection_ref0 (_tmp3_);
+	_tmp3_ = _data_collection_ref0 (_tmp2_);
 #line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_data_collection_unref0 (self->priv->controller);
 #line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->controller = _tmp4_;
+	self->priv->controller = _tmp3_;
 #line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp5_ = transition_effects_manager_get_instance ();
+	_tmp4_ = transition_effects_manager_get_instance ();
 #line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp7_ = transition_effects_manager_get_effect_ids (_tmp6_);
+	_tmp6_ = transition_effects_manager_get_effect_ids (_tmp5_);
 #line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp8_ = _tmp7_;
+	_tmp7_ = _tmp6_;
 #line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_transition_effects_manager_unref0 (_tmp6_);
+	_transition_effects_manager_unref0 (_tmp5_);
 #line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	pluggables = _tmp8_;
+	pluggables = _tmp7_;
 #line 147 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
+	_tmp8_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 147 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	a = _tmp9_;
+	a = _tmp8_;
 #line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gee_array_list_add_all (a, pluggables);
 #line 149 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -786,135 +780,119 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so
 #line 150 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), RANDOM_EFFECT_DESCRIPTOR_EFFECT_ID);
 #line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp11_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_COLLECTION, GeeCollection), &_tmp10_);
+	_tmp10_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_COLLECTION, GeeCollection), &_tmp9_);
 #line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->transitions = (_vala_array_free (self->priv->transitions, self->priv->transitions_length1, (GDestroyNotify) g_free), NULL);
 #line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->transitions = _tmp11_;
+	self->priv->transitions = _tmp10_;
 #line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->transitions_length1 = _tmp10_;
+	self->priv->transitions_length1 = _tmp9_;
 #line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->_transitions_size_ = self->priv->transitions_length1;
 #line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp12_ = start;
+	_tmp11_ = start;
 #line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp13_ = _g_object_ref0 (_tmp12_);
+	_tmp12_ = _g_object_ref0 (_tmp11_);
 #line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->current);
 #line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->current = _tmp13_;
+	self->priv->current = _tmp12_;
 #line 154 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	slideshow_page_update_transition_effect (self);
 #line 157 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp14_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp13_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 157 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	toolbar = _tmp14_;
+	toolbar = _tmp13_;
 #line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp15_ = _ ("Back");
+	_tmp14_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Back"));
 #line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp16_ = (GtkToolButton*) gtk_tool_button_new (NULL, _tmp15_);
-#line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	g_object_ref_sink (_tmp16_);
+	g_object_ref_sink (_tmp14_);
 #line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	previous_button = _tmp16_;
+	previous_button = _tmp14_;
 #line 161 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_tool_button_set_icon_name (previous_button, "go-previous");
 #line 162 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp17_ = _ ("Go to the previous photo");
-#line 162 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (previous_button, gtk_tool_item_get_type (), GtkToolItem), _tmp17_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (previous_button, gtk_tool_item_get_type (), GtkToolItem), _ ("Go to the previous photo"));
 #line 163 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_signal_connect_object (previous_button, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
 #line 165 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (previous_button, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp18_ = _ ("Pause");
-#line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp19_ = (GtkToolButton*) gtk_tool_button_new (NULL, _tmp18_);
+	_tmp15_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Pause"));
 #line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	g_object_ref_sink (_tmp19_);
+	g_object_ref_sink (_tmp15_);
 #line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->play_pause_button);
 #line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->play_pause_button = _tmp19_;
+	self->priv->play_pause_button = _tmp15_;
 #line 168 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp20_ = self->priv->play_pause_button;
+	_tmp16_ = self->priv->play_pause_button;
 #line 168 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_tool_button_set_icon_name (_tmp20_, "media-playback-pause");
-#line 169 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp21_ = self->priv->play_pause_button;
+	gtk_tool_button_set_icon_name (_tmp16_, "media-playback-pause");
 #line 169 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp22_ = _ ("Pause the slideshow");
+	_tmp17_ = self->priv->play_pause_button;
 #line 169 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_item_get_type (), GtkToolItem), _tmp22_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_tool_item_get_type (), GtkToolItem), _ ("Pause the slideshow"));
 #line 170 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp23_ = self->priv->play_pause_button;
+	_tmp18_ = self->priv->play_pause_button;
 #line 170 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	g_signal_connect_object (_tmp23_, "clicked", (GCallback) _slideshow_page_on_play_pause_gtk_tool_button_clicked, self, 0);
+	g_signal_connect_object (_tmp18_, "clicked", (GCallback) _slideshow_page_on_play_pause_gtk_tool_button_clicked, self, 0);
 #line 172 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp24_ = self->priv->play_pause_button;
+	_tmp19_ = self->priv->play_pause_button;
 #line 172 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 174 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp25_ = _ ("Next");
+	_tmp20_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Next"));
 #line 174 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp26_ = (GtkToolButton*) gtk_tool_button_new (NULL, _tmp25_);
+	g_object_ref_sink (_tmp20_);
 #line 174 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	g_object_ref_sink (_tmp26_);
-#line 174 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	next_button = _tmp26_;
+	next_button = _tmp20_;
 #line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_tool_button_set_icon_name (next_button, "go-next");
 #line 176 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp27_ = _ ("Go to the next photo");
-#line 176 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (next_button, gtk_tool_item_get_type (), GtkToolItem), _tmp27_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (next_button, gtk_tool_item_get_type (), GtkToolItem), _ ("Go to the next photo"));
 #line 177 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_signal_connect_object (next_button, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
 #line 179 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (next_button, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 181 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp28_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
+	_tmp21_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
 #line 181 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	g_object_ref_sink (_tmp28_);
+	g_object_ref_sink (_tmp21_);
 #line 181 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->settings_button);
 #line 181 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->settings_button = _tmp28_;
+	self->priv->settings_button = _tmp21_;
 #line 182 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp29_ = self->priv->settings_button;
+	_tmp22_ = self->priv->settings_button;
 #line 182 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_tool_button_set_icon_name (_tmp29_, "preferences-system");
+	gtk_tool_button_set_icon_name (_tmp22_, "preferences-system");
 #line 183 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp30_ = self->priv->settings_button;
+	_tmp23_ = self->priv->settings_button;
 #line 183 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp31_ = _ ("Settings");
-#line 183 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_tool_button_set_label (_tmp30_, _tmp31_);
-#line 184 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp32_ = self->priv->settings_button;
+	gtk_tool_button_set_label (_tmp23_, _ ("Settings"));
 #line 184 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp33_ = _ ("Change slideshow settings");
+	_tmp24_ = self->priv->settings_button;
 #line 184 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_item_get_type (), GtkToolItem), _tmp33_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_item_get_type (), GtkToolItem), _ ("Change slideshow settings"));
 #line 185 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp34_ = self->priv->settings_button;
+	_tmp25_ = self->priv->settings_button;
 #line 185 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	g_signal_connect_object (_tmp34_, "clicked", (GCallback) _slideshow_page_on_change_settings_gtk_tool_button_clicked, self, 0);
+	g_signal_connect_object (_tmp25_, "clicked", (GCallback) _slideshow_page_on_change_settings_gtk_tool_button_clicked, self, 0);
 #line 186 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp35_ = self->priv->settings_button;
+	_tmp26_ = self->priv->settings_button;
 #line 186 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 188 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp36_ = self->priv->settings_button;
+	_tmp27_ = self->priv->settings_button;
 #line 188 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 190 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp37_ = screensaver_new ();
+	_tmp28_ = screensaver_new ();
 #line 190 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_screensaver_unref0 (self->priv->screensaver);
 #line 190 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->screensaver = _tmp37_;
+	self->priv->screensaver = _tmp28_;
 #line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (next_button);
 #line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -927,14 +905,14 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so
 	_g_object_unref0 (pluggables);
 #line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return self;
-#line 931 "SlideshowPage.c"
+#line 909 "SlideshowPage.c"
 }
 
 
 SlideshowPage* slideshow_page_new (SourceCollection* sources, ViewCollection* controller, Photo* start) {
 #line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return slideshow_page_construct (TYPE_SLIDESHOW_PAGE, sources, controller, start);
-#line 938 "SlideshowPage.c"
+#line 916 "SlideshowPage.c"
 }
 
 
@@ -943,22 +921,22 @@ static gboolean _slideshow_page_auto_advance_gsource_func (gpointer self) {
 	result = slideshow_page_auto_advance ((SlideshowPage*) self);
 #line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 947 "SlideshowPage.c"
+#line 925 "SlideshowPage.c"
 }
 
 
 static void slideshow_page_real_switched_to (Page* base) {
 	SlideshowPage * self;
-	SourceCollection* _tmp0_ = NULL;
+	SourceCollection* _tmp0_;
 	Scaling _tmp1_ = {0};
-	PixbufCache* _tmp2_ = NULL;
+	PixbufCache* _tmp2_;
 	GdkPixbuf* pixbuf = NULL;
-	Photo* _tmp3_ = NULL;
+	Photo* _tmp3_;
 	Photo* _tmp4_ = NULL;
 	GdkPixbuf* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	GTimer* _tmp11_ = NULL;
-	Screensaver* _tmp12_ = NULL;
+	gboolean _tmp6_;
+	GTimer* _tmp11_;
+	Screensaver* _tmp12_;
 #line 193 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
 #line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -987,11 +965,11 @@ static void slideshow_page_real_switched_to (Page* base) {
 	pixbuf = _tmp5_;
 #line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp6_) {
-#line 991 "SlideshowPage.c"
-		GdkPixbuf* _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
+#line 969 "SlideshowPage.c"
+		GdkPixbuf* _tmp7_;
+		Photo* _tmp8_;
 		Dimensions _tmp9_ = {0};
-		Direction _tmp10_ = 0;
+		Direction _tmp10_;
 #line 202 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp7_ = pixbuf;
 #line 202 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1002,7 +980,7 @@ static void slideshow_page_real_switched_to (Page* base) {
 		_tmp10_ = DIRECTION_FORWARD;
 #line 202 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp7_, &_tmp9_, &_tmp10_);
-#line 1006 "SlideshowPage.c"
+#line 984 "SlideshowPage.c"
 	}
 #line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) SLIDESHOW_PAGE_CHECK_ADVANCE_MSEC, _slideshow_page_auto_advance_gsource_func, g_object_ref (self), g_object_unref);
@@ -1016,13 +994,13 @@ static void slideshow_page_real_switched_to (Page* base) {
 	screensaver_inhibit (_tmp12_, "Playing slideshow");
 #line 193 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (pixbuf);
-#line 1020 "SlideshowPage.c"
+#line 998 "SlideshowPage.c"
 }
 
 
 static void slideshow_page_real_switching_from (Page* base) {
 	SlideshowPage * self;
-	Screensaver* _tmp0_ = NULL;
+	Screensaver* _tmp0_;
 #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
 #line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1033,16 +1011,16 @@ static void slideshow_page_real_switching_from (Page* base) {
 	screensaver_uninhibit (_tmp0_);
 #line 215 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->exiting = TRUE;
-#line 1037 "SlideshowPage.c"
+#line 1015 "SlideshowPage.c"
 }
 
 
-static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start, Direction direction, Photo** next, GdkPixbuf** next_pixbuf) {
+static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start, Direction direction, Photo* * next, GdkPixbuf* * next_pixbuf) {
 	Photo* _vala_next = NULL;
 	GdkPixbuf* _vala_next_pixbuf = NULL;
 	gboolean result = FALSE;
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (IS_SLIDESHOW_PAGE (self), FALSE);
@@ -1056,47 +1034,47 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 	_g_object_unref0 (_vala_next);
 #line 220 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_vala_next = _tmp1_;
-#line 1060 "SlideshowPage.c"
+#line 1038 "SlideshowPage.c"
 	{
 		gboolean _tmp2_ = FALSE;
 #line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = TRUE;
 #line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		while (TRUE) {
-#line 1067 "SlideshowPage.c"
+#line 1045 "SlideshowPage.c"
 			DataSource* forward = NULL;
 			DataSource* back = NULL;
-			ViewCollection* _tmp41_ = NULL;
-			Photo* _tmp42_ = NULL;
+			ViewCollection* _tmp40_;
+			Photo* _tmp41_;
+			DataSource* _tmp42_ = NULL;
 			DataSource* _tmp43_ = NULL;
-			DataSource* _tmp44_ = NULL;
-			PixbufCache* _tmp45_ = NULL;
-			DataSource* _tmp46_ = NULL;
-			PixbufCache* _tmp47_ = NULL;
-			DataSource* _tmp48_ = NULL;
+			PixbufCache* _tmp44_;
+			DataSource* _tmp45_;
+			PixbufCache* _tmp46_;
+			DataSource* _tmp47_;
 			GeeSet* neighbors = NULL;
-			ViewCollection* _tmp49_ = NULL;
-			Photo* _tmp50_ = NULL;
-			GeeSet* _tmp51_ = NULL;
-			GeeSet* _tmp52_ = NULL;
-			DataSource* _tmp53_ = NULL;
-			GeeSet* _tmp54_ = NULL;
-			DataSource* _tmp55_ = NULL;
-			PixbufCache* _tmp56_ = NULL;
-			GeeSet* _tmp57_ = NULL;
+			ViewCollection* _tmp48_;
+			Photo* _tmp49_;
+			GeeSet* _tmp50_;
+			GeeSet* _tmp51_;
+			DataSource* _tmp52_;
+			GeeSet* _tmp53_;
+			DataSource* _tmp54_;
+			PixbufCache* _tmp55_;
+			GeeSet* _tmp56_;
 #line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			if (!_tmp2_) {
-#line 1090 "SlideshowPage.c"
+#line 1068 "SlideshowPage.c"
 			}
 #line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp2_ = FALSE;
-#line 1094 "SlideshowPage.c"
+#line 1072 "SlideshowPage.c"
 			{
 				GdkPixbuf* _tmp3_ = NULL;
-				PixbufCache* _tmp4_ = NULL;
-				Photo* _tmp5_ = NULL;
-				GdkPixbuf* _tmp6_ = NULL;
-				GdkPixbuf* _tmp7_ = NULL;
+				PixbufCache* _tmp4_;
+				Photo* _tmp5_;
+				GdkPixbuf* _tmp6_;
+				GdkPixbuf* _tmp7_;
 #line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp4_ = self->priv->cache;
 #line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1107,8 +1085,8 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				_tmp3_ = _tmp6_;
 #line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1111 "SlideshowPage.c"
-					goto __catch461_g_error;
+#line 1089 "SlideshowPage.c"
+					goto __catch462_g_error;
 				}
 #line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp7_ = _tmp3_;
@@ -1120,30 +1098,30 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				_vala_next_pixbuf = _tmp7_;
 #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_tmp3_);
-#line 1124 "SlideshowPage.c"
+#line 1102 "SlideshowPage.c"
 			}
-			goto __finally461;
-			__catch461_g_error:
+			goto __finally462;
+			__catch462_g_error:
 			{
 				GError* err = NULL;
-				Photo* _tmp8_ = NULL;
-				gchar* _tmp9_ = NULL;
-				gchar* _tmp10_ = NULL;
-				GError* _tmp11_ = NULL;
-				const gchar* _tmp12_ = NULL;
+				Photo* _tmp8_;
+				gchar* _tmp9_;
+				gchar* _tmp10_;
+				GError* _tmp11_;
+				const gchar* _tmp12_;
 				DataView* view = NULL;
-				ViewCollection* _tmp13_ = NULL;
-				Photo* _tmp14_ = NULL;
-				DataView* _tmp15_ = NULL;
+				ViewCollection* _tmp13_;
+				Photo* _tmp14_;
+				DataView* _tmp15_;
 				DataView* _tmp16_ = NULL;
-				Direction _tmp17_ = 0;
-				DataView* _tmp24_ = NULL;
-				DataView* _tmp25_ = NULL;
-				DataSource* _tmp26_ = NULL;
+				Direction _tmp17_;
+				DataView* _tmp24_;
+				DataView* _tmp25_;
+				DataSource* _tmp26_;
 				gboolean _tmp27_ = FALSE;
 				gboolean _tmp28_ = FALSE;
-				Photo* _tmp29_ = NULL;
-				Photo* _tmp30_ = NULL;
+				Photo* _tmp29_;
+				Photo* _tmp30_;
 #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				err = _inner_error_;
 #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1174,10 +1152,10 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				_tmp17_ = direction;
 #line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (_tmp17_ == DIRECTION_FORWARD) {
-#line 1178 "SlideshowPage.c"
-					ViewCollection* _tmp18_ = NULL;
-					DataView* _tmp19_ = NULL;
-					DataView* _tmp20_ = NULL;
+#line 1156 "SlideshowPage.c"
+					ViewCollection* _tmp18_;
+					DataView* _tmp19_;
+					DataView* _tmp20_;
 #line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp18_ = self->priv->controller;
 #line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1188,11 +1166,11 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 					_g_object_unref0 (_tmp16_);
 #line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp16_ = _tmp20_;
-#line 1192 "SlideshowPage.c"
+#line 1170 "SlideshowPage.c"
 				} else {
-					ViewCollection* _tmp21_ = NULL;
-					DataView* _tmp22_ = NULL;
-					DataView* _tmp23_ = NULL;
+					ViewCollection* _tmp21_;
+					DataView* _tmp22_;
+					DataView* _tmp23_;
 #line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp21_ = self->priv->controller;
 #line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1203,7 +1181,7 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 					_g_object_unref0 (_tmp16_);
 #line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp16_ = _tmp23_;
-#line 1207 "SlideshowPage.c"
+#line 1185 "SlideshowPage.c"
 				}
 #line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp24_ = _g_object_ref0 (_tmp16_);
@@ -1225,63 +1203,60 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				_tmp30_ = start;
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (_tmp29_ == _tmp30_) {
-#line 1229 "SlideshowPage.c"
-					Photo* _tmp31_ = NULL;
-					Photo* _tmp32_ = NULL;
+#line 1207 "SlideshowPage.c"
+					Photo* _tmp31_;
+					Photo* _tmp32_;
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp31_ = _vala_next;
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp32_ = self->priv->current;
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp28_ = _tmp31_ != _tmp32_;
-#line 1238 "SlideshowPage.c"
+#line 1216 "SlideshowPage.c"
 				} else {
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp28_ = FALSE;
-#line 1242 "SlideshowPage.c"
+#line 1220 "SlideshowPage.c"
 				}
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (_tmp28_) {
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp27_ = TRUE;
-#line 1248 "SlideshowPage.c"
+#line 1226 "SlideshowPage.c"
 				} else {
-					Photo* _tmp33_ = NULL;
-					Photo* _tmp34_ = NULL;
+					Photo* _tmp33_;
+					Photo* _tmp34_;
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp33_ = _vala_next;
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp34_ = self->priv->current;
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp27_ = _tmp33_ == _tmp34_;
-#line 1258 "SlideshowPage.c"
+#line 1236 "SlideshowPage.c"
 				}
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (_tmp27_) {
-#line 1262 "SlideshowPage.c"
-					const gchar* _tmp35_ = NULL;
-					GtkWindow* _tmp36_ = NULL;
-					GtkWindow* _tmp37_ = NULL;
-					AppWindow* _tmp38_ = NULL;
-					AppWindow* _tmp39_ = NULL;
-#line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-					_tmp35_ = _ ("All photo source files are missing.");
+#line 1240 "SlideshowPage.c"
+					GtkWindow* _tmp35_;
+					GtkWindow* _tmp36_;
+					AppWindow* _tmp37_;
+					AppWindow* _tmp38_;
 #line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-					_tmp36_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+					_tmp35_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-					_tmp37_ = _tmp36_;
+					_tmp36_ = _tmp35_;
 #line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-					app_window_error_message (_tmp35_, _tmp37_);
+					app_window_error_message (_ ("All photo source files are missing."), _tmp36_);
 #line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-					_g_object_unref0 (_tmp37_);
+					_g_object_unref0 (_tmp36_);
 #line 239 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-					_tmp38_ = app_window_get_instance ();
+					_tmp37_ = app_window_get_instance ();
 #line 239 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-					_tmp39_ = _tmp38_;
+					_tmp38_ = _tmp37_;
 #line 239 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-					app_window_end_fullscreen (_tmp39_);
+					app_window_end_fullscreen (_tmp38_);
 #line 239 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-					_g_object_unref0 (_tmp39_);
+					_g_object_unref0 (_tmp38_);
 #line 241 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_g_object_unref0 (_vala_next);
 #line 241 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1302,25 +1277,25 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 					if (next) {
 #line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 						*next = _vala_next;
-#line 1306 "SlideshowPage.c"
+#line 1281 "SlideshowPage.c"
 					} else {
 #line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 						_g_object_unref0 (_vala_next);
-#line 1310 "SlideshowPage.c"
+#line 1285 "SlideshowPage.c"
 					}
 #line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					if (next_pixbuf) {
 #line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 						*next_pixbuf = _vala_next_pixbuf;
-#line 1316 "SlideshowPage.c"
+#line 1291 "SlideshowPage.c"
 					} else {
 #line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 						_g_object_unref0 (_vala_next_pixbuf);
-#line 1320 "SlideshowPage.c"
+#line 1295 "SlideshowPage.c"
 					}
 #line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					return result;
-#line 1324 "SlideshowPage.c"
+#line 1299 "SlideshowPage.c"
 				}
 #line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_tmp16_);
@@ -1330,73 +1305,73 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				_g_error_free0 (err);
 #line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				continue;
-#line 1334 "SlideshowPage.c"
+#line 1309 "SlideshowPage.c"
 			}
-			__finally461:
+			__finally462:
 #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1339 "SlideshowPage.c"
-				gboolean _tmp40_ = FALSE;
+#line 1314 "SlideshowPage.c"
+				gboolean _tmp39_ = FALSE;
 #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				g_clear_error (&_inner_error_);
 #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-				return _tmp40_;
-#line 1347 "SlideshowPage.c"
+				return _tmp39_;
+#line 1322 "SlideshowPage.c"
 			}
 #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp41_ = self->priv->controller;
+			_tmp40_ = self->priv->controller;
 #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp42_ = _vala_next;
+			_tmp41_ = _vala_next;
 #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			view_collection_get_immediate_neighbors (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_DATA_SOURCE, DataSource), &_tmp43_, &_tmp44_, PHOTO_TYPENAME);
+			view_collection_get_immediate_neighbors (_tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATA_SOURCE, DataSource), &_tmp42_, &_tmp43_, PHOTO_TYPENAME);
 #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (forward);
 #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			forward = _tmp43_;
+			forward = _tmp42_;
 #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (back);
 #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			back = _tmp44_;
+			back = _tmp43_;
 #line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp45_ = self->priv->cache;
+			_tmp44_ = self->priv->cache;
 #line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp46_ = forward;
+			_tmp45_ = forward;
 #line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			pixbuf_cache_prefetch (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_HIGHEST, FALSE);
+			pixbuf_cache_prefetch (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_HIGHEST, FALSE);
 #line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp47_ = self->priv->cache;
+			_tmp46_ = self->priv->cache;
 #line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp48_ = back;
+			_tmp47_ = back;
 #line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			pixbuf_cache_prefetch (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
+			pixbuf_cache_prefetch (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
 #line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp49_ = self->priv->controller;
+			_tmp48_ = self->priv->controller;
 #line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp50_ = _vala_next;
+			_tmp49_ = _vala_next;
 #line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp51_ = view_collection_get_extended_neighbors (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
+			_tmp50_ = view_collection_get_extended_neighbors (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
 #line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			neighbors = _tmp51_;
+			neighbors = _tmp50_;
 #line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp52_ = neighbors;
+			_tmp51_ = neighbors;
 #line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp53_ = forward;
+			_tmp52_ = forward;
 #line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), _tmp53_);
+			gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), _tmp52_);
 #line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp54_ = neighbors;
+			_tmp53_ = neighbors;
 #line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp55_ = back;
+			_tmp54_ = back;
 #line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection), _tmp55_);
+			gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), _tmp54_);
 #line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp56_ = self->priv->cache;
+			_tmp55_ = self->priv->cache;
 #line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp57_ = neighbors;
+			_tmp56_ = neighbors;
 #line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			pixbuf_cache_prefetch_many (_tmp56_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_COLLECTION, GeeCollection), BACKGROUND_JOB_JOB_PRIORITY_LOWEST, FALSE);
+			pixbuf_cache_prefetch_many (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_COLLECTION, GeeCollection), BACKGROUND_JOB_JOB_PRIORITY_LOWEST, FALSE);
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			result = TRUE;
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1409,66 +1384,64 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 			if (next) {
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				*next = _vala_next;
-#line 1413 "SlideshowPage.c"
+#line 1388 "SlideshowPage.c"
 			} else {
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_vala_next);
-#line 1417 "SlideshowPage.c"
+#line 1392 "SlideshowPage.c"
 			}
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			if (next_pixbuf) {
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				*next_pixbuf = _vala_next_pixbuf;
-#line 1423 "SlideshowPage.c"
+#line 1398 "SlideshowPage.c"
 			} else {
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_vala_next_pixbuf);
-#line 1427 "SlideshowPage.c"
+#line 1402 "SlideshowPage.c"
 			}
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			return result;
-#line 1431 "SlideshowPage.c"
+#line 1406 "SlideshowPage.c"
 		}
 	}
 #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (next) {
 #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		*next = _vala_next;
-#line 1438 "SlideshowPage.c"
+#line 1413 "SlideshowPage.c"
 	} else {
 #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_vala_next);
-#line 1442 "SlideshowPage.c"
+#line 1417 "SlideshowPage.c"
 	}
 #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (next_pixbuf) {
 #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		*next_pixbuf = _vala_next_pixbuf;
-#line 1448 "SlideshowPage.c"
+#line 1423 "SlideshowPage.c"
 	} else {
 #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_vala_next_pixbuf);
-#line 1452 "SlideshowPage.c"
+#line 1427 "SlideshowPage.c"
 	}
 }
 
 
 static void slideshow_page_on_play_pause (SlideshowPage* self) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp11_ = FALSE;
-	GTimer* _tmp12_ = NULL;
+	gboolean _tmp0_;
+	gboolean _tmp7_;
+	GTimer* _tmp8_;
 #line 267 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (IS_SLIDESHOW_PAGE (self));
 #line 268 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = self->priv->playing;
 #line 268 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp0_) {
-#line 1467 "SlideshowPage.c"
-		GtkToolButton* _tmp1_ = NULL;
-		GtkToolButton* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		GtkToolButton* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+#line 1442 "SlideshowPage.c"
+		GtkToolButton* _tmp1_;
+		GtkToolButton* _tmp2_;
+		GtkToolButton* _tmp3_;
 #line 269 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp1_ = self->priv->play_pause_button;
 #line 269 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1476,67 +1449,57 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) {
 #line 270 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = self->priv->play_pause_button;
 #line 270 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp3_ = _ ("Play");
-#line 270 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		gtk_tool_button_set_label (_tmp2_, _tmp3_);
+		gtk_tool_button_set_label (_tmp2_, _ ("Play"));
 #line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp4_ = self->priv->play_pause_button;
-#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp5_ = _ ("Continue the slideshow");
+		_tmp3_ = self->priv->play_pause_button;
 #line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_tool_item_get_type (), GtkToolItem), _tmp5_);
-#line 1489 "SlideshowPage.c"
+		gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_tool_item_get_type (), GtkToolItem), _ ("Continue the slideshow"));
+#line 1458 "SlideshowPage.c"
 	} else {
-		GtkToolButton* _tmp6_ = NULL;
-		GtkToolButton* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		GtkToolButton* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
+		GtkToolButton* _tmp4_;
+		GtkToolButton* _tmp5_;
+		GtkToolButton* _tmp6_;
 #line 273 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp6_ = self->priv->play_pause_button;
+		_tmp4_ = self->priv->play_pause_button;
 #line 273 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		gtk_tool_button_set_icon_name (_tmp6_, "media-playback-pause");
-#line 274 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp7_ = self->priv->play_pause_button;
+		gtk_tool_button_set_icon_name (_tmp4_, "media-playback-pause");
 #line 274 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp8_ = _ ("Pause");
+		_tmp5_ = self->priv->play_pause_button;
 #line 274 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		gtk_tool_button_set_label (_tmp7_, _tmp8_);
+		gtk_tool_button_set_label (_tmp5_, _ ("Pause"));
 #line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp9_ = self->priv->play_pause_button;
-#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp10_ = _ ("Pause the slideshow");
+		_tmp6_ = self->priv->play_pause_button;
 #line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_tool_item_get_type (), GtkToolItem), _tmp10_);
-#line 1512 "SlideshowPage.c"
+		gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), _ ("Pause the slideshow"));
+#line 1475 "SlideshowPage.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp11_ = self->priv->playing;
+	_tmp7_ = self->priv->playing;
 #line 278 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->playing = !_tmp11_;
+	self->priv->playing = !_tmp7_;
 #line 281 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp12_ = self->priv->timer;
+	_tmp8_ = self->priv->timer;
 #line 281 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	g_timer_start (_tmp12_);
-#line 1522 "SlideshowPage.c"
+	g_timer_start (_tmp8_);
+#line 1485 "SlideshowPage.c"
 }
 
 
 static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
 	SlideshowPage * self;
 	DataView* view = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	DataView* _tmp2_ = NULL;
+	ViewCollection* _tmp0_;
+	Photo* _tmp1_;
+	DataView* _tmp2_;
 	Photo* prev_photo = NULL;
 	DataView* start_view = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	DataView* _tmp4_ = NULL;
-	DataView* _tmp5_ = NULL;
+	ViewCollection* _tmp3_;
+	DataView* _tmp4_;
+	DataView* _tmp5_;
 	DataView* prev_view = NULL;
-	DataView* _tmp6_ = NULL;
-	DataView* _tmp7_ = NULL;
-	Photo* _tmp20_ = NULL;
+	DataView* _tmp6_;
+	DataView* _tmp7_;
+	Photo* _tmp20_;
 #line 284 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
 #line 285 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1565,24 +1528,24 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
 	prev_view = _tmp7_;
 #line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	while (TRUE) {
-#line 1569 "SlideshowPage.c"
-		DataView* _tmp8_ = NULL;
-		DataView* _tmp9_ = NULL;
-		DataSource* _tmp10_ = NULL;
-		DataSource* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
-		ViewCollection* _tmp15_ = NULL;
-		DataView* _tmp16_ = NULL;
-		DataView* _tmp17_ = NULL;
-		DataView* _tmp18_ = NULL;
-		DataView* _tmp19_ = NULL;
+#line 1532 "SlideshowPage.c"
+		DataView* _tmp8_;
+		DataView* _tmp9_;
+		DataSource* _tmp10_;
+		DataSource* _tmp11_;
+		gboolean _tmp12_;
+		ViewCollection* _tmp15_;
+		DataView* _tmp16_;
+		DataView* _tmp17_;
+		DataView* _tmp18_;
+		DataView* _tmp19_;
 #line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp8_ = prev_view;
 #line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		if (!(_tmp8_ != NULL)) {
 #line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			break;
-#line 1586 "SlideshowPage.c"
+#line 1549 "SlideshowPage.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = prev_view;
@@ -1596,9 +1559,9 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
 		_g_object_unref0 (_tmp11_);
 #line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		if (_tmp12_) {
-#line 1600 "SlideshowPage.c"
-			DataView* _tmp13_ = NULL;
-			DataSource* _tmp14_ = NULL;
+#line 1563 "SlideshowPage.c"
+			DataView* _tmp13_;
+			DataSource* _tmp14_;
 #line 293 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp13_ = prev_view;
 #line 293 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1609,7 +1572,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
 			prev_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo);
 #line 294 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			break;
-#line 1613 "SlideshowPage.c"
+#line 1576 "SlideshowPage.c"
 		}
 #line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp15_ = self->priv->controller;
@@ -1640,7 +1603,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
 			_g_object_unref0 (view);
 #line 301 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			return;
-#line 1643 "SlideshowPage.c"
+#line 1606 "SlideshowPage.c"
 		}
 	}
 #line 305 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1655,30 +1618,30 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
 	_g_object_unref0 (prev_photo);
 #line 284 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (view);
-#line 1658 "SlideshowPage.c"
+#line 1621 "SlideshowPage.c"
 }
 
 
 static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
 	SlideshowPage * self;
 	DataView* view = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	DataView* _tmp2_ = NULL;
+	ViewCollection* _tmp0_;
+	Photo* _tmp1_;
+	DataView* _tmp2_;
 	Photo* next_photo = NULL;
 	DataView* start_view = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	DataView* _tmp4_ = NULL;
-	DataView* _tmp5_ = NULL;
+	ViewCollection* _tmp3_;
+	DataView* _tmp4_;
+	DataView* _tmp5_;
 	DataView* next_view = NULL;
-	DataView* _tmp6_ = NULL;
-	DataView* _tmp7_ = NULL;
-	ConfigFacade* _tmp20_ = NULL;
-	ConfigFacade* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	gboolean _tmp24_ = FALSE;
-	Photo* _tmp25_ = NULL;
+	DataView* _tmp6_;
+	DataView* _tmp7_;
+	ConfigFacade* _tmp20_;
+	ConfigFacade* _tmp21_;
+	gchar* _tmp22_;
+	gchar* _tmp23_;
+	gboolean _tmp24_;
+	Photo* _tmp25_;
 #line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
 #line 309 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1707,24 +1670,24 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
 	next_view = _tmp7_;
 #line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	while (TRUE) {
-#line 1710 "SlideshowPage.c"
-		DataView* _tmp8_ = NULL;
-		DataView* _tmp9_ = NULL;
-		DataSource* _tmp10_ = NULL;
-		DataSource* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
-		ViewCollection* _tmp15_ = NULL;
-		DataView* _tmp16_ = NULL;
-		DataView* _tmp17_ = NULL;
-		DataView* _tmp18_ = NULL;
-		DataView* _tmp19_ = NULL;
+#line 1673 "SlideshowPage.c"
+		DataView* _tmp8_;
+		DataView* _tmp9_;
+		DataSource* _tmp10_;
+		DataSource* _tmp11_;
+		gboolean _tmp12_;
+		ViewCollection* _tmp15_;
+		DataView* _tmp16_;
+		DataView* _tmp17_;
+		DataView* _tmp18_;
+		DataView* _tmp19_;
 #line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp8_ = next_view;
 #line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		if (!(_tmp8_ != NULL)) {
 #line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			break;
-#line 1727 "SlideshowPage.c"
+#line 1690 "SlideshowPage.c"
 		}
 #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = next_view;
@@ -1738,9 +1701,9 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
 		_g_object_unref0 (_tmp11_);
 #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		if (_tmp12_) {
-#line 1741 "SlideshowPage.c"
-			DataView* _tmp13_ = NULL;
-			DataSource* _tmp14_ = NULL;
+#line 1704 "SlideshowPage.c"
+			DataView* _tmp13_;
+			DataSource* _tmp14_;
 #line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp13_ = next_view;
 #line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1751,7 +1714,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
 			next_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo);
 #line 318 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			break;
-#line 1754 "SlideshowPage.c"
+#line 1717 "SlideshowPage.c"
 		}
 #line 321 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp15_ = self->priv->controller;
@@ -1782,7 +1745,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
 			_g_object_unref0 (view);
 #line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			return;
-#line 1784 "SlideshowPage.c"
+#line 1747 "SlideshowPage.c"
 		}
 	}
 #line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1803,7 +1766,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
 	if (_tmp24_) {
 #line 331 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		slideshow_page_random_transition_effect (self);
-#line 1805 "SlideshowPage.c"
+#line 1768 "SlideshowPage.c"
 	}
 #line 334 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp25_ = next_photo;
@@ -1817,20 +1780,20 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
 	_g_object_unref0 (next_photo);
 #line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (view);
-#line 1819 "SlideshowPage.c"
+#line 1782 "SlideshowPage.c"
 }
 
 
 static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction direction) {
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
 	GdkPixbuf* next_pixbuf = NULL;
-	Photo* _tmp2_ = NULL;
-	Direction _tmp3_ = 0;
+	Photo* _tmp2_;
+	Direction _tmp3_;
 	Photo* _tmp4_ = NULL;
 	GdkPixbuf* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	GTimer* _tmp11_ = NULL;
+	gboolean _tmp6_;
+	GTimer* _tmp11_;
 #line 337 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (IS_SLIDESHOW_PAGE (self));
 #line 337 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1859,11 +1822,11 @@ static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction
 	next_pixbuf = _tmp5_;
 #line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp6_) {
-#line 1861 "SlideshowPage.c"
-		GdkPixbuf* _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
+#line 1824 "SlideshowPage.c"
+		GdkPixbuf* _tmp7_;
+		Photo* _tmp8_;
 		Dimensions _tmp9_ = {0};
-		Direction _tmp10_ = 0;
+		Direction _tmp10_;
 #line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp7_ = next_pixbuf;
 #line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1874,7 +1837,7 @@ static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction
 		_tmp10_ = direction;
 #line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp7_, &_tmp9_, &_tmp10_);
-#line 1876 "SlideshowPage.c"
+#line 1839 "SlideshowPage.c"
 	}
 #line 346 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp11_ = self->priv->timer;
@@ -1882,20 +1845,20 @@ static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction
 	g_timer_start (_tmp11_);
 #line 337 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (next_pixbuf);
-#line 1884 "SlideshowPage.c"
+#line 1847 "SlideshowPage.c"
 }
 
 
 static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	GTimer* _tmp2_ = NULL;
-	gdouble _tmp3_ = 0.0;
-	ConfigFacade* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	gdouble _tmp6_ = 0.0;
-	gboolean _tmp7_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	GTimer* _tmp2_;
+	gdouble _tmp3_;
+	ConfigFacade* _tmp4_;
+	ConfigFacade* _tmp5_;
+	gdouble _tmp6_;
+	gboolean _tmp7_;
 #line 349 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (IS_SLIDESHOW_PAGE (self), FALSE);
 #line 350 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1906,7 +1869,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 		result = FALSE;
 #line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 1908 "SlideshowPage.c"
+#line 1871 "SlideshowPage.c"
 	}
 #line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = self->priv->playing;
@@ -1916,7 +1879,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 		result = TRUE;
 #line 354 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 1918 "SlideshowPage.c"
+#line 1881 "SlideshowPage.c"
 	}
 #line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp2_ = self->priv->timer;
@@ -1938,7 +1901,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 		result = TRUE;
 #line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 1940 "SlideshowPage.c"
+#line 1903 "SlideshowPage.c"
 	}
 #line 359 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
@@ -1946,7 +1909,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 	result = TRUE;
 #line 361 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 1948 "SlideshowPage.c"
+#line 1911 "SlideshowPage.c"
 }
 
 
@@ -1954,15 +1917,15 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe
 	SlideshowPage * self;
 	gboolean result = FALSE;
 	gboolean handled = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	GdkEventKey* _tmp0_;
+	guint _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
 	GQuark _tmp5_ = 0U;
 #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 1963 "SlideshowPage.c"
-	gboolean _tmp6_ = FALSE;
+#line 1926 "SlideshowPage.c"
+	gboolean _tmp6_;
 	gboolean _tmp7_ = FALSE;
 #line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
@@ -1984,27 +1947,27 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe
 	if (_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("space")))) {
 #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		switch (0) {
-#line 1986 "SlideshowPage.c"
+#line 1949 "SlideshowPage.c"
 			default:
 			{
 #line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				slideshow_page_on_play_pause (self);
 #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				break;
-#line 1993 "SlideshowPage.c"
+#line 1956 "SlideshowPage.c"
 			}
 		}
 	} else {
 #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		switch (0) {
-#line 1999 "SlideshowPage.c"
+#line 1962 "SlideshowPage.c"
 			default:
 			{
 #line 372 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				handled = FALSE;
 #line 373 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				break;
-#line 2006 "SlideshowPage.c"
+#line 1969 "SlideshowPage.c"
 			}
 		}
 	}
@@ -2016,44 +1979,44 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe
 		result = TRUE;
 #line 377 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 2018 "SlideshowPage.c"
+#line 1981 "SlideshowPage.c"
 	}
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (GTK_WIDGET_CLASS (slideshow_page_parent_class)->key_press_event != NULL) {
-#line 2022 "SlideshowPage.c"
-		GdkEventKey* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
+#line 1985 "SlideshowPage.c"
+		GdkEventKey* _tmp8_;
+		gboolean _tmp9_;
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp8_ = event;
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = GTK_WIDGET_CLASS (slideshow_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget), _tmp8_);
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp7_ = _tmp9_;
-#line 2031 "SlideshowPage.c"
+#line 1994 "SlideshowPage.c"
 	} else {
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp7_ = TRUE;
-#line 2035 "SlideshowPage.c"
+#line 1998 "SlideshowPage.c"
 	}
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	result = _tmp7_;
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 2041 "SlideshowPage.c"
+#line 2004 "SlideshowPage.c"
 }
 
 
 static void slideshow_page_on_change_settings (SlideshowPage* self) {
 	SlideshowPageSettingsDialog* settings_dialog = NULL;
-	SlideshowPageSettingsDialog* _tmp0_ = NULL;
-	SlideshowPageSettingsDialog* _tmp1_ = NULL;
+	SlideshowPageSettingsDialog* _tmp0_;
+	SlideshowPageSettingsDialog* _tmp1_;
 	gboolean slideshow_playing = FALSE;
-	gboolean _tmp2_ = FALSE;
-	SlideshowPageSettingsDialog* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	SlideshowPageSettingsDialog* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
-	GTimer* _tmp24_ = NULL;
+	gboolean _tmp2_;
+	SlideshowPageSettingsDialog* _tmp3_;
+	gint _tmp4_;
+	SlideshowPageSettingsDialog* _tmp22_;
+	gboolean _tmp23_;
+	GTimer* _tmp24_;
 #line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (IS_SLIDESHOW_PAGE (self));
 #line 383 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2073,31 +2036,31 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) {
 #line 387 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->playing = FALSE;
 #line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	g_signal_emit_by_name (self, "hide-toolbar");
+	g_signal_emit (self, slideshow_page_signals[SLIDESHOW_PAGE_HIDE_TOOLBAR_SIGNAL], 0);
 #line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp3_ = settings_dialog;
 #line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp4_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_dialog_get_type (), GtkDialog));
 #line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp4_ == ((gint) GTK_RESPONSE_OK)) {
-#line 2082 "SlideshowPage.c"
-		ConfigFacade* _tmp5_ = NULL;
-		ConfigFacade* _tmp6_ = NULL;
-		SlideshowPageSettingsDialog* _tmp7_ = NULL;
-		gdouble _tmp8_ = 0.0;
-		ConfigFacade* _tmp9_ = NULL;
-		ConfigFacade* _tmp10_ = NULL;
-		SlideshowPageSettingsDialog* _tmp11_ = NULL;
-		gdouble _tmp12_ = 0.0;
-		ConfigFacade* _tmp13_ = NULL;
-		ConfigFacade* _tmp14_ = NULL;
-		SlideshowPageSettingsDialog* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		ConfigFacade* _tmp18_ = NULL;
-		ConfigFacade* _tmp19_ = NULL;
-		SlideshowPageSettingsDialog* _tmp20_ = NULL;
-		gboolean _tmp21_ = FALSE;
+#line 2045 "SlideshowPage.c"
+		ConfigFacade* _tmp5_;
+		ConfigFacade* _tmp6_;
+		SlideshowPageSettingsDialog* _tmp7_;
+		gdouble _tmp8_;
+		ConfigFacade* _tmp9_;
+		ConfigFacade* _tmp10_;
+		SlideshowPageSettingsDialog* _tmp11_;
+		gdouble _tmp12_;
+		ConfigFacade* _tmp13_;
+		ConfigFacade* _tmp14_;
+		SlideshowPageSettingsDialog* _tmp15_;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
+		ConfigFacade* _tmp18_;
+		ConfigFacade* _tmp19_;
+		SlideshowPageSettingsDialog* _tmp20_;
+		gboolean _tmp21_;
 #line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp5_ = config_facade_get_instance ();
 #line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2152,7 +2115,7 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) {
 		_g_object_unref0 (_tmp19_);
 #line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		slideshow_page_update_transition_effect (self);
-#line 2154 "SlideshowPage.c"
+#line 2117 "SlideshowPage.c"
 	}
 #line 401 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp22_ = settings_dialog;
@@ -2168,21 +2131,21 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) {
 	g_timer_start (_tmp24_);
 #line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (settings_dialog);
-#line 2170 "SlideshowPage.c"
+#line 2133 "SlideshowPage.c"
 }
 
 
 static void slideshow_page_update_transition_effect (SlideshowPage* self) {
 	gchar* effect_id = NULL;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	gdouble effect_delay = 0.0;
-	ConfigFacade* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	gdouble _tmp6_ = 0.0;
-	gdouble _tmp7_ = 0.0;
+	ConfigFacade* _tmp4_;
+	ConfigFacade* _tmp5_;
+	gdouble _tmp6_;
+	gdouble _tmp7_;
 #line 406 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (IS_SLIDESHOW_PAGE (self));
 #line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2213,22 +2176,22 @@ static void slideshow_page_update_transition_effect (SlideshowPage* self) {
 	single_photo_page_set_transition (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), effect_id, (gint) (effect_delay * 1000.0));
 #line 406 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_free0 (effect_id);
-#line 2215 "SlideshowPage.c"
+#line 2178 "SlideshowPage.c"
 }
 
 
 static void slideshow_page_random_transition_effect (SlideshowPage* self) {
 	gdouble effect_delay = 0.0;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gdouble _tmp2_;
+	gdouble _tmp3_;
 	gchar* effect_id = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	const gchar* _tmp12_ = NULL;
-	gdouble _tmp13_ = 0.0;
+	gchar* _tmp4_;
+	gchar** _tmp5_;
+	gint _tmp5__length1;
+	const gchar* _tmp12_;
+	gdouble _tmp13_;
 #line 413 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (IS_SLIDESHOW_PAGE (self));
 #line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2253,16 +2216,16 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) {
 	_tmp5__length1 = self->priv->transitions_length1;
 #line 416 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (0 < _tmp5__length1) {
-#line 2255 "SlideshowPage.c"
+#line 2218 "SlideshowPage.c"
 		gint random = 0;
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-		gint32 _tmp7_ = 0;
-		gchar** _tmp8_ = NULL;
-		gint _tmp8__length1 = 0;
-		gint _tmp9_ = 0;
-		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+		gint32 _tmp7_;
+		gchar** _tmp8_;
+		gint _tmp8__length1;
+		gint _tmp9_;
+		const gchar* _tmp10_;
+		gchar* _tmp11_;
 #line 417 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp6_ = self->priv->transitions;
 #line 417 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2285,7 +2248,7 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) {
 		_g_free0 (effect_id);
 #line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		effect_id = _tmp11_;
-#line 2287 "SlideshowPage.c"
+#line 2250 "SlideshowPage.c"
 	}
 #line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp12_ = effect_id;
@@ -2295,61 +2258,61 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) {
 	single_photo_page_set_transition (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp12_, (gint) (_tmp13_ * 1000.0));
 #line 413 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_free0 (effect_id);
-#line 2297 "SlideshowPage.c"
+#line 2260 "SlideshowPage.c"
 }
 
 
 static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
 	gchar* title = NULL;
-	Photo* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	Photo* _tmp0_;
+	gchar* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp3_;
 	PangoLayout* layout = NULL;
-	const gchar* _tmp5_ = NULL;
-	PangoLayout* _tmp6_ = NULL;
+	const gchar* _tmp5_;
+	PangoLayout* _tmp6_;
 	PangoAttrList* list = NULL;
-	PangoAttrList* _tmp7_ = NULL;
+	PangoAttrList* _tmp7_;
 	PangoAttribute* size = NULL;
-	PangoAttribute* _tmp8_ = NULL;
-	PangoAttrList* _tmp9_ = NULL;
-	PangoAttribute* _tmp10_ = NULL;
-	PangoAttribute* _tmp11_ = NULL;
-	PangoLayout* _tmp12_ = NULL;
-	PangoAttrList* _tmp13_ = NULL;
-	PangoLayout* _tmp14_ = NULL;
-	Dimensions _tmp15_ = {0};
-	gint _tmp16_ = 0;
+	PangoAttribute* _tmp8_;
+	PangoAttrList* _tmp9_;
+	PangoAttribute* _tmp10_;
+	PangoAttribute* _tmp11_;
+	PangoLayout* _tmp12_;
+	PangoAttrList* _tmp13_;
+	PangoLayout* _tmp14_;
+	Dimensions _tmp15_;
+	gint _tmp16_;
 	gint title_width = 0;
 	gint title_height = 0;
-	PangoLayout* _tmp17_ = NULL;
+	PangoLayout* _tmp17_;
 	gint _tmp18_ = 0;
 	gint _tmp19_ = 0;
 	gdouble x = 0.0;
-	Dimensions _tmp20_ = {0};
-	gint _tmp21_ = 0;
+	Dimensions _tmp20_;
+	gint _tmp21_;
 	gdouble y = 0.0;
-	Dimensions _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	gdouble _tmp24_ = 0.0;
-	gint _tmp25_ = 0;
-	Dimensions _tmp26_ = {0};
-	gint _tmp27_ = 0;
-	gdouble _tmp31_ = 0.0;
-	gint _tmp32_ = 0;
-	Dimensions _tmp33_ = {0};
-	gint _tmp34_ = 0;
-	cairo_t* _tmp38_ = NULL;
-	cairo_t* _tmp39_ = NULL;
-	gdouble _tmp40_ = 0.0;
-	gdouble _tmp41_ = 0.0;
-	cairo_t* _tmp42_ = NULL;
-	PangoLayout* _tmp43_ = NULL;
-	cairo_t* _tmp44_ = NULL;
-	PangoLayout* _tmp45_ = NULL;
-	cairo_t* _tmp46_ = NULL;
-	cairo_t* _tmp47_ = NULL;
-	cairo_t* _tmp48_ = NULL;
+	Dimensions _tmp22_;
+	gint _tmp23_;
+	gdouble _tmp24_;
+	gint _tmp25_;
+	Dimensions _tmp26_;
+	gint _tmp27_;
+	gdouble _tmp31_;
+	gint _tmp32_;
+	Dimensions _tmp33_;
+	gint _tmp34_;
+	cairo_t* _tmp38_;
+	cairo_t* _tmp39_;
+	gdouble _tmp40_;
+	gdouble _tmp41_;
+	cairo_t* _tmp42_;
+	PangoLayout* _tmp43_;
+	cairo_t* _tmp44_;
+	PangoLayout* _tmp45_;
+	cairo_t* _tmp46_;
+	cairo_t* _tmp47_;
+	cairo_t* _tmp48_;
 #line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (IS_SLIDESHOW_PAGE (self));
 #line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2368,14 +2331,14 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
 	if (_tmp3_ == NULL) {
 #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = TRUE;
-#line 2370 "SlideshowPage.c"
+#line 2333 "SlideshowPage.c"
 	} else {
-		const gchar* _tmp4_ = NULL;
+		const gchar* _tmp4_;
 #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp4_ = title;
 #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") == 0;
-#line 2377 "SlideshowPage.c"
+#line 2340 "SlideshowPage.c"
 	}
 #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp2_) {
@@ -2383,7 +2346,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
 		_g_free0 (title);
 #line 429 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return;
-#line 2385 "SlideshowPage.c"
+#line 2348 "SlideshowPage.c"
 	}
 #line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp5_ = title;
@@ -2451,10 +2414,10 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
 	_tmp27_ = _tmp26_.height;
 #line 445 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if ((_tmp24_ + _tmp25_) >= (_tmp27_ * 0.95)) {
-#line 2453 "SlideshowPage.c"
-		Dimensions _tmp28_ = {0};
-		gint _tmp29_ = 0;
-		gint _tmp30_ = 0;
+#line 2416 "SlideshowPage.c"
+		Dimensions _tmp28_;
+		gint _tmp29_;
+		gint _tmp30_;
 #line 446 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp28_ = *ctx_dim;
 #line 446 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2463,7 +2426,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
 		_tmp30_ = title_height;
 #line 446 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		y = (_tmp29_ * 0.95) - _tmp30_;
-#line 2465 "SlideshowPage.c"
+#line 2428 "SlideshowPage.c"
 	}
 #line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp31_ = x;
@@ -2475,10 +2438,10 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
 	_tmp34_ = _tmp33_.width;
 #line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if ((_tmp31_ + _tmp32_) >= (_tmp34_ * 0.95)) {
-#line 2477 "SlideshowPage.c"
-		Dimensions _tmp35_ = {0};
-		gint _tmp36_ = 0;
-		gint _tmp37_ = 0;
+#line 2440 "SlideshowPage.c"
+		Dimensions _tmp35_;
+		gint _tmp36_;
+		gint _tmp37_;
 #line 449 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp35_ = *ctx_dim;
 #line 449 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2487,7 +2450,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
 		_tmp37_ = title_width;
 #line 449 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		x = (gdouble) ((_tmp36_ / 2) - (_tmp37_ / 2));
-#line 2489 "SlideshowPage.c"
+#line 2452 "SlideshowPage.c"
 	}
 #line 451 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp38_ = ctx;
@@ -2533,19 +2496,19 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
 	_g_object_unref0 (layout);
 #line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_free0 (title);
-#line 2535 "SlideshowPage.c"
+#line 2498 "SlideshowPage.c"
 }
 
 
 static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dimensions* ctx_dim) {
 	SlideshowPage * self;
-	cairo_t* _tmp0_ = NULL;
-	Dimensions _tmp1_ = {0};
+	cairo_t* _tmp0_;
+	Dimensions _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	ConfigFacade* _tmp3_ = NULL;
-	ConfigFacade* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
+	ConfigFacade* _tmp3_;
+	ConfigFacade* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
 #line 460 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
 #line 460 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2570,30 +2533,30 @@ static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dime
 	_g_object_unref0 (_tmp4_);
 #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp6_) {
-#line 2572 "SlideshowPage.c"
-		gboolean _tmp7_ = FALSE;
+#line 2535 "SlideshowPage.c"
+		gboolean _tmp7_;
 #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp7_ = single_photo_page_is_transition_in_progress (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = !_tmp7_;
-#line 2578 "SlideshowPage.c"
+#line 2541 "SlideshowPage.c"
 	} else {
 #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = FALSE;
-#line 2582 "SlideshowPage.c"
+#line 2545 "SlideshowPage.c"
 	}
 #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp2_) {
-#line 2586 "SlideshowPage.c"
-		cairo_t* _tmp8_ = NULL;
-		Dimensions _tmp9_ = {0};
+#line 2549 "SlideshowPage.c"
+		cairo_t* _tmp8_;
+		Dimensions _tmp9_;
 #line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp8_ = ctx;
 #line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = *ctx_dim;
 #line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		slideshow_page_paint_title (self, _tmp8_, &_tmp9_);
-#line 2595 "SlideshowPage.c"
+#line 2558 "SlideshowPage.c"
 	}
 }
 
@@ -2603,96 +2566,95 @@ static gint _utf8_ci_compare_gcompare_data_func (gconstpointer a, gconstpointer
 	result = utf8_ci_compare (a, b);
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 2605 "SlideshowPage.c"
+#line 2568 "SlideshowPage.c"
 }
 
 
 static void _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	slideshow_page_settings_dialog_on_transition_changed ((SlideshowPageSettingsDialog*) self);
-#line 2612 "SlideshowPage.c"
+#line 2575 "SlideshowPage.c"
 }
 
 
 static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GType object_type) {
 	SlideshowPageSettingsDialog * self = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GtkBuilder* _tmp1_ = NULL;
-	GObject* _tmp2_ = NULL;
-	GtkBox* _tmp3_ = NULL;
-	GtkBox* _tmp4_ = NULL;
-	GtkBox* _tmp5_ = NULL;
+	GtkBuilder* _tmp0_;
+	GtkBuilder* _tmp1_;
+	GObject* _tmp2_;
+	GtkBox* _tmp3_;
+	GtkBox* _tmp4_;
+	GtkBox* _tmp5_;
 	gdouble delay = 0.0;
-	ConfigFacade* _tmp6_ = NULL;
-	ConfigFacade* _tmp7_ = NULL;
-	gdouble _tmp8_ = 0.0;
-	gdouble _tmp9_ = 0.0;
-	FullscreenWindow* _tmp10_ = NULL;
-	FullscreenWindow* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
+	ConfigFacade* _tmp6_;
+	ConfigFacade* _tmp7_;
+	gdouble _tmp8_;
+	gdouble _tmp9_;
+	FullscreenWindow* _tmp10_;
+	FullscreenWindow* _tmp11_;
 	GtkAdjustment* adjustment = NULL;
-	gdouble _tmp13_ = 0.0;
-	GtkAdjustment* _tmp14_ = NULL;
-	GtkBuilder* _tmp15_ = NULL;
-	GObject* _tmp16_ = NULL;
-	GtkScale* _tmp17_ = NULL;
-	GtkScale* _tmp18_ = NULL;
-	GtkAdjustment* _tmp19_ = NULL;
-	GtkBuilder* _tmp20_ = NULL;
-	GObject* _tmp21_ = NULL;
-	GtkSpinButton* _tmp22_ = NULL;
-	GtkSpinButton* _tmp23_ = NULL;
-	GtkAdjustment* _tmp24_ = NULL;
-	GtkSpinButton* _tmp25_ = NULL;
-	gdouble _tmp26_ = 0.0;
-	GtkSpinButton* _tmp27_ = NULL;
-	GtkSpinButton* _tmp28_ = NULL;
-	GtkBuilder* _tmp29_ = NULL;
-	GObject* _tmp30_ = NULL;
-	GtkComboBoxText* _tmp31_ = NULL;
+	gdouble _tmp12_;
+	GtkAdjustment* _tmp13_;
+	GtkBuilder* _tmp14_;
+	GObject* _tmp15_;
+	GtkScale* _tmp16_;
+	GtkScale* _tmp17_;
+	GtkAdjustment* _tmp18_;
+	GtkBuilder* _tmp19_;
+	GObject* _tmp20_;
+	GtkSpinButton* _tmp21_;
+	GtkSpinButton* _tmp22_;
+	GtkAdjustment* _tmp23_;
+	GtkSpinButton* _tmp24_;
+	gdouble _tmp25_;
+	GtkSpinButton* _tmp26_;
+	GtkSpinButton* _tmp27_;
+	GtkBuilder* _tmp28_;
+	GObject* _tmp29_;
+	GtkComboBoxText* _tmp30_;
 	gchar* effect_id = NULL;
-	ConfigFacade* _tmp32_ = NULL;
-	ConfigFacade* _tmp33_ = NULL;
-	gchar* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
+	ConfigFacade* _tmp31_;
+	ConfigFacade* _tmp32_;
+	gchar* _tmp33_;
+	gchar* _tmp34_;
 	gchar* null_display_name = NULL;
-	TransitionEffectsManager* _tmp36_ = NULL;
-	TransitionEffectsManager* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
-	gchar* _tmp39_ = NULL;
-	GtkComboBoxText* _tmp40_ = NULL;
-	const gchar* _tmp41_ = NULL;
-	GtkComboBoxText* _tmp42_ = NULL;
+	TransitionEffectsManager* _tmp35_;
+	TransitionEffectsManager* _tmp36_;
+	gchar* _tmp37_;
+	gchar* _tmp38_;
+	GtkComboBoxText* _tmp39_;
+	const gchar* _tmp40_;
+	GtkComboBoxText* _tmp41_;
 	gint i = 0;
-	GtkComboBoxText* _tmp67_ = NULL;
+	GtkComboBoxText* _tmp66_;
 	gdouble transition_delay = 0.0;
-	ConfigFacade* _tmp68_ = NULL;
-	ConfigFacade* _tmp69_ = NULL;
-	gdouble _tmp70_ = 0.0;
-	gdouble _tmp71_ = 0.0;
-	GtkAdjustment* _tmp72_ = NULL;
-	GtkBuilder* _tmp73_ = NULL;
-	GObject* _tmp74_ = NULL;
-	GtkScale* _tmp75_ = NULL;
-	GtkScale* _tmp76_ = NULL;
-	GtkAdjustment* _tmp77_ = NULL;
-	GtkBuilder* _tmp78_ = NULL;
-	GObject* _tmp79_ = NULL;
-	GtkSpinButton* _tmp80_ = NULL;
-	GtkSpinButton* _tmp81_ = NULL;
-	GtkAdjustment* _tmp82_ = NULL;
-	GtkSpinButton* _tmp83_ = NULL;
-	GtkSpinButton* _tmp84_ = NULL;
-	GtkSpinButton* _tmp85_ = NULL;
+	ConfigFacade* _tmp67_;
+	ConfigFacade* _tmp68_;
+	gdouble _tmp69_;
+	gdouble _tmp70_;
+	GtkAdjustment* _tmp71_;
+	GtkBuilder* _tmp72_;
+	GObject* _tmp73_;
+	GtkScale* _tmp74_;
+	GtkScale* _tmp75_;
+	GtkAdjustment* _tmp76_;
+	GtkBuilder* _tmp77_;
+	GObject* _tmp78_;
+	GtkSpinButton* _tmp79_;
+	GtkSpinButton* _tmp80_;
+	GtkAdjustment* _tmp81_;
+	GtkSpinButton* _tmp82_;
+	GtkSpinButton* _tmp83_;
+	GtkSpinButton* _tmp84_;
 	gboolean show_title = FALSE;
-	ConfigFacade* _tmp86_ = NULL;
-	ConfigFacade* _tmp87_ = NULL;
-	gboolean _tmp88_ = FALSE;
-	gboolean _tmp89_ = FALSE;
-	GtkBuilder* _tmp90_ = NULL;
-	GObject* _tmp91_ = NULL;
-	GtkCheckButton* _tmp92_ = NULL;
-	GtkCheckButton* _tmp93_ = NULL;
+	ConfigFacade* _tmp85_;
+	ConfigFacade* _tmp86_;
+	gboolean _tmp87_;
+	gboolean _tmp88_;
+	GtkBuilder* _tmp89_;
+	GObject* _tmp90_;
+	GtkCheckButton* _tmp91_;
+	GtkCheckButton* _tmp92_;
 #line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self = (SlideshowPageSettingsDialog*) g_object_new (object_type, NULL);
 #line 38 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2742,327 +2704,325 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 #line 47 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
 #line 49 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp12_ = _ ("Settings");
-#line 49 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp12_);
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _ ("Settings"));
 #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp13_ = delay;
+	_tmp12_ = delay;
 #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp14_ = gtk_adjustment_new (_tmp13_, CONFIG_FACADE_SLIDESHOW_DELAY_MIN, CONFIG_FACADE_SLIDESHOW_DELAY_MAX, 0.1, (gdouble) 1, (gdouble) 0);
+	_tmp13_ = gtk_adjustment_new (_tmp12_, CONFIG_FACADE_SLIDESHOW_DELAY_MIN, CONFIG_FACADE_SLIDESHOW_DELAY_MAX, 0.1, (gdouble) 1, (gdouble) 0);
 #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	g_object_ref_sink (_tmp14_);
+	g_object_ref_sink (_tmp13_);
 #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	adjustment = _tmp14_;
+	adjustment = _tmp13_;
 #line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp15_ = self->priv->builder;
+	_tmp14_ = self->priv->builder;
 #line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp16_ = gtk_builder_get_object (_tmp15_, "delay_hscale");
+	_tmp15_ = gtk_builder_get_object (_tmp14_, "delay_hscale");
 #line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp16_) : NULL);
+	_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp15_) : NULL);
 #line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->delay_hscale);
 #line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->delay_hscale = _tmp17_;
+	self->priv->delay_hscale = _tmp16_;
 #line 53 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp18_ = self->priv->delay_hscale;
+	_tmp17_ = self->priv->delay_hscale;
 #line 53 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp19_ = adjustment;
+	_tmp18_ = adjustment;
 #line 53 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_range_set_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_range_get_type (), GtkRange), _tmp19_);
+	gtk_range_set_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), _tmp18_);
 #line 55 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp20_ = self->priv->builder;
+	_tmp19_ = self->priv->builder;
 #line 55 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp21_ = gtk_builder_get_object (_tmp20_, "delay_entry");
+	_tmp20_ = gtk_builder_get_object (_tmp19_, "delay_entry");
 #line 55 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_spin_button_get_type ()) ? ((GtkSpinButton*) _tmp21_) : NULL);
+	_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_spin_button_get_type ()) ? ((GtkSpinButton*) _tmp20_) : NULL);
 #line 55 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->delay_entry);
 #line 55 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->delay_entry = _tmp22_;
+	self->priv->delay_entry = _tmp21_;
 #line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp23_ = self->priv->delay_entry;
+	_tmp22_ = self->priv->delay_entry;
 #line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp24_ = adjustment;
+	_tmp23_ = adjustment;
 #line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_spin_button_set_adjustment (_tmp23_, _tmp24_);
+	gtk_spin_button_set_adjustment (_tmp22_, _tmp23_);
 #line 57 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp25_ = self->priv->delay_entry;
+	_tmp24_ = self->priv->delay_entry;
 #line 57 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp26_ = delay;
+	_tmp25_ = delay;
 #line 57 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_spin_button_set_value (_tmp25_, _tmp26_);
+	gtk_spin_button_set_value (_tmp24_, _tmp25_);
 #line 58 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp27_ = self->priv->delay_entry;
+	_tmp26_ = self->priv->delay_entry;
 #line 58 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_spin_button_set_numeric (_tmp27_, TRUE);
+	gtk_spin_button_set_numeric (_tmp26_, TRUE);
 #line 59 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp28_ = self->priv->delay_entry;
+	_tmp27_ = self->priv->delay_entry;
 #line 59 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_entry_set_activates_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_entry_get_type (), GtkEntry), TRUE);
+	gtk_entry_set_activates_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_entry_get_type (), GtkEntry), TRUE);
 #line 61 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp29_ = self->priv->builder;
+	_tmp28_ = self->priv->builder;
 #line 61 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp30_ = gtk_builder_get_object (_tmp29_, "transition_effect_selector");
+	_tmp29_ = gtk_builder_get_object (_tmp28_, "transition_effect_selector");
 #line 61 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp30_) : NULL);
+	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp29_) : NULL);
 #line 61 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->transition_effect_selector);
 #line 61 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->transition_effect_selector = _tmp31_;
+	self->priv->transition_effect_selector = _tmp30_;
 #line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp32_ = config_facade_get_instance ();
+	_tmp31_ = config_facade_get_instance ();
 #line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp33_ = _tmp32_;
+	_tmp32_ = _tmp31_;
 #line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp34_ = configuration_facade_get_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp33_ = configuration_facade_get_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp35_ = _tmp34_;
+	_tmp34_ = _tmp33_;
 #line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (_tmp33_);
+	_g_object_unref0 (_tmp32_);
 #line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	effect_id = _tmp35_;
+	effect_id = _tmp34_;
 #line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp36_ = transition_effects_manager_get_instance ();
+	_tmp35_ = transition_effects_manager_get_instance ();
 #line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp37_ = _tmp36_;
+	_tmp36_ = _tmp35_;
 #line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp38_ = transition_effects_manager_get_effect_name (_tmp37_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);
+	_tmp37_ = transition_effects_manager_get_effect_name (_tmp36_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);
 #line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp39_ = _tmp38_;
+	_tmp38_ = _tmp37_;
 #line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_transition_effects_manager_unref0 (_tmp37_);
+	_transition_effects_manager_unref0 (_tmp36_);
 #line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	null_display_name = _tmp39_;
+	null_display_name = _tmp38_;
 #line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp40_ = self->priv->transition_effect_selector;
+	_tmp39_ = self->priv->transition_effect_selector;
 #line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp41_ = null_display_name;
+	_tmp40_ = null_display_name;
 #line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_combo_box_text_append_text (_tmp40_, _tmp41_);
+	gtk_combo_box_text_append_text (_tmp39_, _tmp40_);
 #line 70 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp42_ = self->priv->transition_effect_selector;
+	_tmp41_ = self->priv->transition_effect_selector;
 #line 70 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 72 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	i = 1;
-#line 2847 "SlideshowPage.c"
+#line 2807 "SlideshowPage.c"
 	{
 		GeeIterator* _display_name_it = NULL;
-		TransitionEffectsManager* _tmp43_ = NULL;
-		TransitionEffectsManager* _tmp44_ = NULL;
-		GeeCollection* _tmp45_ = NULL;
-		GeeCollection* _tmp46_ = NULL;
-		GeeIterator* _tmp47_ = NULL;
-		GeeIterator* _tmp48_ = NULL;
+		TransitionEffectsManager* _tmp42_;
+		TransitionEffectsManager* _tmp43_;
+		GeeCollection* _tmp44_;
+		GeeCollection* _tmp45_;
+		GeeIterator* _tmp46_;
+		GeeIterator* _tmp47_;
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp43_ = transition_effects_manager_get_instance ();
+		_tmp42_ = transition_effects_manager_get_instance ();
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp44_ = _tmp43_;
+		_tmp43_ = _tmp42_;
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp45_ = transition_effects_manager_get_effect_names (_tmp44_, _utf8_ci_compare_gcompare_data_func, NULL, NULL);
+		_tmp44_ = transition_effects_manager_get_effect_names (_tmp43_, _utf8_ci_compare_gcompare_data_func, NULL, NULL);
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp46_ = _tmp45_;
+		_tmp45_ = _tmp44_;
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp47_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp46_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp48_ = _tmp47_;
+		_tmp47_ = _tmp46_;
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_g_object_unref0 (_tmp46_);
+		_g_object_unref0 (_tmp45_);
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_transition_effects_manager_unref0 (_tmp44_);
+		_transition_effects_manager_unref0 (_tmp43_);
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_display_name_it = _tmp48_;
+		_display_name_it = _tmp47_;
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		while (TRUE) {
-#line 2876 "SlideshowPage.c"
-			GeeIterator* _tmp49_ = NULL;
-			gboolean _tmp50_ = FALSE;
+#line 2836 "SlideshowPage.c"
+			GeeIterator* _tmp48_;
+			gboolean _tmp49_;
 			gchar* display_name = NULL;
-			GeeIterator* _tmp51_ = NULL;
-			gpointer _tmp52_ = NULL;
-			const gchar* _tmp53_ = NULL;
-			const gchar* _tmp54_ = NULL;
-			GtkComboBoxText* _tmp55_ = NULL;
-			const gchar* _tmp56_ = NULL;
-			const gchar* _tmp57_ = NULL;
-			TransitionEffectsManager* _tmp58_ = NULL;
-			TransitionEffectsManager* _tmp59_ = NULL;
-			const gchar* _tmp60_ = NULL;
-			gchar* _tmp61_ = NULL;
-			gchar* _tmp62_ = NULL;
-			gboolean _tmp63_ = FALSE;
-			gint _tmp66_ = 0;
+			GeeIterator* _tmp50_;
+			gpointer _tmp51_;
+			const gchar* _tmp52_;
+			const gchar* _tmp53_;
+			GtkComboBoxText* _tmp54_;
+			const gchar* _tmp55_;
+			const gchar* _tmp56_;
+			TransitionEffectsManager* _tmp57_;
+			TransitionEffectsManager* _tmp58_;
+			const gchar* _tmp59_;
+			gchar* _tmp60_;
+			gchar* _tmp61_;
+			gboolean _tmp62_;
+			gint _tmp65_;
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp49_ = _display_name_it;
+			_tmp48_ = _display_name_it;
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp50_ = gee_iterator_next (_tmp49_);
+			_tmp49_ = gee_iterator_next (_tmp48_);
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			if (!_tmp50_) {
+			if (!_tmp49_) {
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				break;
-#line 2902 "SlideshowPage.c"
+#line 2862 "SlideshowPage.c"
 			}
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp51_ = _display_name_it;
+			_tmp50_ = _display_name_it;
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp52_ = gee_iterator_get (_tmp51_);
+			_tmp51_ = gee_iterator_get (_tmp50_);
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			display_name = (gchar*) _tmp52_;
+			display_name = (gchar*) _tmp51_;
 #line 75 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp53_ = display_name;
+			_tmp52_ = display_name;
 #line 75 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp54_ = null_display_name;
+			_tmp53_ = null_display_name;
 #line 75 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			if (g_strcmp0 (_tmp53_, _tmp54_) == 0) {
+			if (g_strcmp0 (_tmp52_, _tmp53_) == 0) {
 #line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_free0 (display_name);
 #line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				continue;
-#line 2920 "SlideshowPage.c"
+#line 2880 "SlideshowPage.c"
 			}
 #line 78 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp55_ = self->priv->transition_effect_selector;
+			_tmp54_ = self->priv->transition_effect_selector;
 #line 78 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp56_ = display_name;
+			_tmp55_ = display_name;
 #line 78 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			gtk_combo_box_text_append_text (_tmp55_, _tmp56_);
+			gtk_combo_box_text_append_text (_tmp54_, _tmp55_);
 #line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp57_ = effect_id;
+			_tmp56_ = effect_id;
 #line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp58_ = transition_effects_manager_get_instance ();
+			_tmp57_ = transition_effects_manager_get_instance ();
 #line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp59_ = _tmp58_;
+			_tmp58_ = _tmp57_;
 #line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp60_ = display_name;
+			_tmp59_ = display_name;
 #line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp61_ = transition_effects_manager_get_id_for_effect_name (_tmp59_, _tmp60_);
+			_tmp60_ = transition_effects_manager_get_id_for_effect_name (_tmp58_, _tmp59_);
 #line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp62_ = _tmp61_;
+			_tmp61_ = _tmp60_;
 #line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp63_ = g_strcmp0 (_tmp57_, _tmp62_) == 0;
+			_tmp62_ = g_strcmp0 (_tmp56_, _tmp61_) == 0;
 #line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_g_free0 (_tmp62_);
+			_g_free0 (_tmp61_);
 #line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_transition_effects_manager_unref0 (_tmp59_);
+			_transition_effects_manager_unref0 (_tmp58_);
 #line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			if (_tmp63_) {
-#line 2948 "SlideshowPage.c"
-				GtkComboBoxText* _tmp64_ = NULL;
-				gint _tmp65_ = 0;
+			if (_tmp62_) {
+#line 2908 "SlideshowPage.c"
+				GtkComboBoxText* _tmp63_;
+				gint _tmp64_;
 #line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-				_tmp64_ = self->priv->transition_effect_selector;
+				_tmp63_ = self->priv->transition_effect_selector;
 #line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-				_tmp65_ = i;
+				_tmp64_ = i;
 #line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-				gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_combo_box_get_type (), GtkComboBox), _tmp65_);
-#line 2957 "SlideshowPage.c"
+				gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_combo_box_get_type (), GtkComboBox), _tmp64_);
+#line 2917 "SlideshowPage.c"
 			}
 #line 82 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp66_ = i;
+			_tmp65_ = i;
 #line 82 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			i = _tmp66_ + 1;
+			i = _tmp65_ + 1;
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_free0 (display_name);
-#line 2965 "SlideshowPage.c"
+#line 2925 "SlideshowPage.c"
 		}
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_display_name_it);
-#line 2969 "SlideshowPage.c"
+#line 2929 "SlideshowPage.c"
 	}
 #line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp67_ = self->priv->transition_effect_selector;
+	_tmp66_ = self->priv->transition_effect_selector;
 #line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed, self, 0);
 #line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp68_ = config_facade_get_instance ();
+	_tmp67_ = config_facade_get_instance ();
 #line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp69_ = _tmp68_;
+	_tmp68_ = _tmp67_;
 #line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp70_ = configuration_facade_get_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp69_ = configuration_facade_get_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp71_ = _tmp70_;
+	_tmp70_ = _tmp69_;
 #line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (_tmp69_);
+	_g_object_unref0 (_tmp68_);
 #line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	transition_delay = _tmp71_;
+	transition_delay = _tmp70_;
 #line 87 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp72_ = gtk_adjustment_new (transition_delay, CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MIN, CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MAX, 0.1, (gdouble) 1, (gdouble) 0);
+	_tmp71_ = gtk_adjustment_new (transition_delay, CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MIN, CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MAX, 0.1, (gdouble) 1, (gdouble) 0);
 #line 87 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	g_object_ref_sink (_tmp72_);
+	g_object_ref_sink (_tmp71_);
 #line 87 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->transition_effect_adjustment);
 #line 87 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->transition_effect_adjustment = _tmp72_;
+	self->priv->transition_effect_adjustment = _tmp71_;
 #line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp73_ = self->priv->builder;
+	_tmp72_ = self->priv->builder;
 #line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp74_ = gtk_builder_get_object (_tmp73_, "transition_effect_hscale");
+	_tmp73_ = gtk_builder_get_object (_tmp72_, "transition_effect_hscale");
 #line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp75_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp74_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp74_) : NULL);
+	_tmp74_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp73_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp73_) : NULL);
 #line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->transition_effect_hscale);
 #line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->transition_effect_hscale = _tmp75_;
+	self->priv->transition_effect_hscale = _tmp74_;
 #line 91 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp76_ = self->priv->transition_effect_hscale;
+	_tmp75_ = self->priv->transition_effect_hscale;
 #line 91 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp77_ = self->priv->transition_effect_adjustment;
+	_tmp76_ = self->priv->transition_effect_adjustment;
 #line 91 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_range_set_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_range_get_type (), GtkRange), _tmp77_);
+	gtk_range_set_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_range_get_type (), GtkRange), _tmp76_);
 #line 93 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp78_ = self->priv->builder;
+	_tmp77_ = self->priv->builder;
 #line 93 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp79_ = gtk_builder_get_object (_tmp78_, "transition_effect_entry");
+	_tmp78_ = gtk_builder_get_object (_tmp77_, "transition_effect_entry");
 #line 93 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp80_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, gtk_spin_button_get_type ()) ? ((GtkSpinButton*) _tmp79_) : NULL);
+	_tmp79_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp78_, gtk_spin_button_get_type ()) ? ((GtkSpinButton*) _tmp78_) : NULL);
 #line 93 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->transition_effect_entry);
 #line 93 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->transition_effect_entry = _tmp80_;
+	self->priv->transition_effect_entry = _tmp79_;
 #line 94 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp81_ = self->priv->transition_effect_entry;
+	_tmp80_ = self->priv->transition_effect_entry;
 #line 94 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp82_ = self->priv->transition_effect_adjustment;
+	_tmp81_ = self->priv->transition_effect_adjustment;
 #line 94 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_spin_button_set_adjustment (_tmp81_, _tmp82_);
+	gtk_spin_button_set_adjustment (_tmp80_, _tmp81_);
 #line 95 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp83_ = self->priv->transition_effect_entry;
+	_tmp82_ = self->priv->transition_effect_entry;
 #line 95 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_spin_button_set_value (_tmp83_, transition_delay);
+	gtk_spin_button_set_value (_tmp82_, transition_delay);
 #line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp84_ = self->priv->transition_effect_entry;
+	_tmp83_ = self->priv->transition_effect_entry;
 #line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_spin_button_set_numeric (_tmp84_, TRUE);
+	gtk_spin_button_set_numeric (_tmp83_, TRUE);
 #line 97 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp85_ = self->priv->transition_effect_entry;
+	_tmp84_ = self->priv->transition_effect_entry;
 #line 97 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_entry_set_activates_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_entry_get_type (), GtkEntry), TRUE);
+	gtk_entry_set_activates_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_entry_get_type (), GtkEntry), TRUE);
 #line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp86_ = config_facade_get_instance ();
+	_tmp85_ = config_facade_get_instance ();
 #line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp87_ = _tmp86_;
+	_tmp86_ = _tmp85_;
 #line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp88_ = configuration_facade_get_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp87_ = configuration_facade_get_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp89_ = _tmp88_;
+	_tmp88_ = _tmp87_;
 #line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (_tmp87_);
+	_g_object_unref0 (_tmp86_);
 #line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	show_title = _tmp89_;
+	show_title = _tmp88_;
 #line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp90_ = self->priv->builder;
+	_tmp89_ = self->priv->builder;
 #line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp91_ = gtk_builder_get_object (_tmp90_, "show_title_button");
+	_tmp90_ = gtk_builder_get_object (_tmp89_, "show_title_button");
 #line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp92_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp91_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp91_) : NULL);
+	_tmp91_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp90_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp90_) : NULL);
 #line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->show_title_button);
 #line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->show_title_button = _tmp92_;
+	self->priv->show_title_button = _tmp91_;
 #line 101 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp93_ = self->priv->show_title_button;
+	_tmp92_ = self->priv->show_title_button;
 #line 101 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, gtk_toggle_button_get_type (), GtkToggleButton), show_title);
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, gtk_toggle_button_get_type (), GtkToggleButton), show_title);
 #line 103 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
 #line 105 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -3075,26 +3035,26 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 	_g_object_unref0 (adjustment);
 #line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return self;
-#line 3077 "SlideshowPage.c"
+#line 3037 "SlideshowPage.c"
 }
 
 
 static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_new (void) {
 #line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return slideshow_page_settings_dialog_construct (SLIDESHOW_PAGE_TYPE_SETTINGS_DIALOG);
-#line 3084 "SlideshowPage.c"
+#line 3044 "SlideshowPage.c"
 }
 
 
 static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageSettingsDialog* self) {
 	gchar* selected = NULL;
-	GtkComboBoxText* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	GtkComboBoxText* _tmp0_;
+	gchar* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp3_;
 	gboolean sensitive = FALSE;
-	GtkScale* _tmp5_ = NULL;
-	GtkSpinButton* _tmp6_ = NULL;
+	GtkScale* _tmp5_;
+	GtkSpinButton* _tmp6_;
 #line 108 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self));
 #line 109 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -3107,17 +3067,17 @@ static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageS
 	_tmp3_ = selected;
 #line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp3_ != NULL) {
-#line 3109 "SlideshowPage.c"
-		const gchar* _tmp4_ = NULL;
+#line 3069 "SlideshowPage.c"
+		const gchar* _tmp4_;
 #line 111 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp4_ = selected;
 #line 111 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID) != 0;
-#line 3115 "SlideshowPage.c"
+#line 3075 "SlideshowPage.c"
 	} else {
 #line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = FALSE;
-#line 3119 "SlideshowPage.c"
+#line 3079 "SlideshowPage.c"
 	}
 #line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	sensitive = _tmp2_;
@@ -3131,14 +3091,14 @@ static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageS
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), sensitive);
 #line 108 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_free0 (selected);
-#line 3133 "SlideshowPage.c"
+#line 3093 "SlideshowPage.c"
 }
 
 
 static gdouble slideshow_page_settings_dialog_get_delay (SlideshowPageSettingsDialog* self) {
 	gdouble result = 0.0;
-	GtkSpinButton* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
+	GtkSpinButton* _tmp0_;
+	gdouble _tmp1_;
 #line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self), 0.0);
 #line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -3149,14 +3109,14 @@ static gdouble slideshow_page_settings_dialog_get_delay (SlideshowPageSettingsDi
 	result = _tmp1_;
 #line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 3151 "SlideshowPage.c"
+#line 3111 "SlideshowPage.c"
 }
 
 
 static gdouble slideshow_page_settings_dialog_get_transition_delay (SlideshowPageSettingsDialog* self) {
 	gdouble result = 0.0;
-	GtkSpinButton* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
+	GtkSpinButton* _tmp0_;
+	gdouble _tmp1_;
 #line 121 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self), 0.0);
 #line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -3167,25 +3127,25 @@ static gdouble slideshow_page_settings_dialog_get_transition_delay (SlideshowPag
 	result = _tmp1_;
 #line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 3169 "SlideshowPage.c"
+#line 3129 "SlideshowPage.c"
 }
 
 
 static gchar* slideshow_page_settings_dialog_get_transition_effect_id (SlideshowPageSettingsDialog* self) {
 	gchar* result = NULL;
 	gchar* active = NULL;
-	GtkComboBoxText* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	GtkComboBoxText* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
 	gchar* id = NULL;
-	TransitionEffectsManager* _tmp4_ = NULL;
-	TransitionEffectsManager* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	TransitionEffectsManager* _tmp4_;
+	TransitionEffectsManager* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
 	const gchar* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	gchar* _tmp12_ = NULL;
+	const gchar* _tmp10_;
+	gchar* _tmp12_;
 #line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self), NULL);
 #line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -3198,8 +3158,8 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow
 	_tmp2_ = active;
 #line 127 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp2_ == NULL) {
-#line 3200 "SlideshowPage.c"
-		gchar* _tmp3_ = NULL;
+#line 3160 "SlideshowPage.c"
+		gchar* _tmp3_;
 #line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp3_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);
 #line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -3208,7 +3168,7 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow
 		_g_free0 (active);
 #line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 3210 "SlideshowPage.c"
+#line 3170 "SlideshowPage.c"
 	}
 #line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp4_ = transition_effects_manager_get_instance ();
@@ -3228,17 +3188,17 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow
 	_tmp10_ = id;
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp10_ != NULL) {
-#line 3230 "SlideshowPage.c"
-		const gchar* _tmp11_ = NULL;
+#line 3190 "SlideshowPage.c"
+		const gchar* _tmp11_;
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp11_ = id;
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = _tmp11_;
-#line 3236 "SlideshowPage.c"
+#line 3196 "SlideshowPage.c"
 	} else {
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID;
-#line 3240 "SlideshowPage.c"
+#line 3200 "SlideshowPage.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp12_ = g_strdup (_tmp9_);
@@ -3250,15 +3210,15 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow
 	_g_free0 (active);
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 3252 "SlideshowPage.c"
+#line 3212 "SlideshowPage.c"
 }
 
 
 static gboolean slideshow_page_settings_dialog_get_show_title (SlideshowPageSettingsDialog* self) {
 	gboolean result = FALSE;
-	GtkCheckButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	GtkCheckButton* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 #line 135 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self), FALSE);
 #line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -3271,7 +3231,7 @@ static gboolean slideshow_page_settings_dialog_get_show_title (SlideshowPageSett
 	result = _tmp2_;
 #line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 3273 "SlideshowPage.c"
+#line 3233 "SlideshowPage.c"
 }
 
 
@@ -3282,7 +3242,7 @@ static void slideshow_page_settings_dialog_class_init (SlideshowPageSettingsDial
 	g_type_class_add_private (klass, sizeof (SlideshowPageSettingsDialogPrivate));
 #line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = slideshow_page_settings_dialog_finalize;
-#line 3284 "SlideshowPage.c"
+#line 3244 "SlideshowPage.c"
 }
 
 
@@ -3291,11 +3251,11 @@ static void slideshow_page_settings_dialog_instance_init (SlideshowPageSettingsD
 	self->priv = SLIDESHOW_PAGE_SETTINGS_DIALOG_GET_PRIVATE (self);
 #line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->builder = NULL;
-#line 3293 "SlideshowPage.c"
+#line 3253 "SlideshowPage.c"
 }
 
 
-static void slideshow_page_settings_dialog_finalize (GObject* obj) {
+static void slideshow_page_settings_dialog_finalize (GObject * obj) {
 	SlideshowPageSettingsDialog * self;
 #line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SLIDESHOW_PAGE_TYPE_SETTINGS_DIALOG, SlideshowPageSettingsDialog);
@@ -3319,7 +3279,7 @@ static void slideshow_page_settings_dialog_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->pane);
 #line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	G_OBJECT_CLASS (slideshow_page_settings_dialog_parent_class)->finalize (obj);
-#line 3321 "SlideshowPage.c"
+#line 3281 "SlideshowPage.c"
 }
 
 
@@ -3341,27 +3301,27 @@ static void slideshow_page_class_init (SlideshowPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_type_class_add_private (klass, sizeof (SlideshowPagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	((PageClass *) klass)->switched_to = (void (*)(Page*)) slideshow_page_real_switched_to;
+	((PageClass *) klass)->switched_to = (void (*) (Page *)) slideshow_page_real_switched_to;
 #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	((PageClass *) klass)->switching_from = (void (*)(Page*)) slideshow_page_real_switching_from;
+	((PageClass *) klass)->switching_from = (void (*) (Page *)) slideshow_page_real_switching_from;
 #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	((SinglePhotoPageClass *) klass)->on_previous_photo = (void (*)(SinglePhotoPage*)) slideshow_page_real_on_previous_photo;
+	((SinglePhotoPageClass *) klass)->on_previous_photo = (void (*) (SinglePhotoPage *)) slideshow_page_real_on_previous_photo;
 #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	((SinglePhotoPageClass *) klass)->on_next_photo = (void (*)(SinglePhotoPage*)) slideshow_page_real_on_next_photo;
+	((SinglePhotoPageClass *) klass)->on_next_photo = (void (*) (SinglePhotoPage *)) slideshow_page_real_on_next_photo;
 #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) slideshow_page_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) slideshow_page_real_key_press_event;
 #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	((SinglePhotoPageClass *) klass)->paint = (void (*)(SinglePhotoPage*, cairo_t*, Dimensions*)) slideshow_page_real_paint;
+	((SinglePhotoPageClass *) klass)->paint = (void (*) (SinglePhotoPage *, cairo_t*, Dimensions*)) slideshow_page_real_paint;
 #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = slideshow_page_finalize;
 #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	g_signal_new ("hide_toolbar", TYPE_SLIDESHOW_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3358 "SlideshowPage.c"
+	slideshow_page_signals[SLIDESHOW_PAGE_HIDE_TOOLBAR_SIGNAL] = g_signal_new ("hide-toolbar", TYPE_SLIDESHOW_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 3318 "SlideshowPage.c"
 }
 
 
 static void slideshow_page_instance_init (SlideshowPage * self) {
-	GTimer* _tmp0_ = NULL;
+	GTimer* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv = SLIDESHOW_PAGE_GET_PRIVATE (self);
 #line 16 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -3374,11 +3334,11 @@ static void slideshow_page_instance_init (SlideshowPage * self) {
 	self->priv->playing = TRUE;
 #line 19 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->exiting = FALSE;
-#line 3376 "SlideshowPage.c"
+#line 3336 "SlideshowPage.c"
 }
 
 
-static void slideshow_page_finalize (GObject* obj) {
+static void slideshow_page_finalize (GObject * obj) {
 	SlideshowPage * self;
 #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SLIDESHOW_PAGE, SlideshowPage);
@@ -3402,7 +3362,7 @@ static void slideshow_page_finalize (GObject* obj) {
 	_screensaver_unref0 (self->priv->screensaver);
 #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	G_OBJECT_CLASS (slideshow_page_parent_class)->finalize (obj);
-#line 3404 "SlideshowPage.c"
+#line 3364 "SlideshowPage.c"
 }
 
 
diff --git a/src/SortedList.c b/src/SortedList.c
index dbb0525..e616365 100644
--- a/src/SortedList.c
+++ b/src/SortedList.c
@@ -1,4 +1,4 @@
-/* SortedList.c generated by valac 0.34.7, the Vala compiler
+/* SortedList.c generated by valac 0.36.6, the Vala compiler
  * generated from SortedList.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -53,9 +53,9 @@ struct _SortedListPrivate {
 
 
 static gpointer sorted_list_parent_class = NULL;
-static GeeTraversableIface* sorted_list_gee_traversable_parent_iface = NULL;
-static GeeIterableIface* sorted_list_gee_iterable_parent_iface = NULL;
-static GeeCollectionIface* sorted_list_gee_collection_parent_iface = NULL;
+static GeeTraversableIface * sorted_list_gee_traversable_parent_iface = NULL;
+static GeeIterableIface * sorted_list_gee_iterable_parent_iface = NULL;
+static GeeCollectionIface * sorted_list_gee_collection_parent_iface = NULL;
 
 gchar* g_utf8_collate_key_for_filename (const gchar* str, gssize len);
 gint64 file_comparator (void* a, void* b);
@@ -66,12 +66,12 @@ enum  {
 	SORTED_LIST_G_TYPE,
 	SORTED_LIST_G_DUP_FUNC,
 	SORTED_LIST_G_DESTROY_FUNC,
-	SORTED_LIST_ELEMENT_TYPE,
-	SORTED_LIST_READ_ONLY,
-	SORTED_LIST_IS_EMPTY,
-	SORTED_LIST_SIZE,
-	SORTED_LIST_READ_ONLY_VIEW,
-	SORTED_LIST_READ_ONLY_VIEW_AS_LIST
+	SORTED_LIST_ELEMENT_TYPE_PROPERTY,
+	SORTED_LIST_READ_ONLY_PROPERTY,
+	SORTED_LIST_IS_EMPTY_PROPERTY,
+	SORTED_LIST_SIZE_PROPERTY,
+	SORTED_LIST_READ_ONLY_VIEW_PROPERTY,
+	SORTED_LIST_READ_ONLY_VIEW_AS_LIST_PROPERTY
 };
 SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target);
 SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target);
@@ -101,7 +101,7 @@ SortedList* sorted_list_copy (SortedList* self);
 static void _sorted_list_merge_sort (SortedList* self, gpointer* array, int array_length1, gpointer* scratch, int scratch_length1, gint start_index, gint end_index);
 static void sorted_list_merge (SortedList* self, gpointer* array, int array_length1, gpointer* scratch, int scratch_length1, gint start_index, gint middle_index, gint end_index);
 GeeList* sorted_list_get_read_only_view_as_list (SortedList* self);
-static void sorted_list_finalize (GObject* obj);
+static void sorted_list_finalize (GObject * obj);
 static void _vala_sorted_list_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_sorted_list_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
@@ -111,22 +111,22 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 gint64 file_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	gchar* path_a = NULL;
-	void* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	void* _tmp0_;
+	gchar* _tmp1_;
 	gchar* path_b = NULL;
-	void* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	GCompareFunc _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	gint64 _tmp16_ = 0LL;
+	void* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp7_;
+	GCompareFunc _tmp8_;
+	const gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	gint _tmp15_;
+	gint64 _tmp16_;
 #line 12 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = a;
 #line 12 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -145,7 +145,7 @@ gint64 file_comparator (void* a, void* b) {
 	if (_tmp4_ == NULL) {
 #line 147 "SortedList.c"
 		gint _tmp5_ = 0;
-		const gchar* _tmp6_ = NULL;
+		const gchar* _tmp6_;
 #line 17 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp6_ = path_b;
 #line 17 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -218,9 +218,9 @@ gint64 file_comparator (void* a, void* b) {
 
 SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target) {
 	SortedList * self = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	Comparator _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
+	GeeArrayList* _tmp0_;
+	Comparator _tmp1_;
+	void* _tmp1__target;
 #line 29 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = (SortedList*) g_object_new (object_type, NULL);
 #line 29 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -259,8 +259,8 @@ SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNo
 static GeeIterator* sorted_list_real_iterator (GeeIterable* base) {
 	SortedList * self;
 	GeeIterator* result = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeIterator* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeIterator* _tmp1_;
 #line 42 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
 #line 43 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -278,10 +278,10 @@ static GeeIterator* sorted_list_real_iterator (GeeIterable* base) {
 static gboolean sorted_list_real_foreach (GeeTraversable* base, GeeForallFunc f, void* f_target) {
 	SortedList * self;
 	gboolean result = FALSE;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeForallFunc _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeArrayList* _tmp0_;
+	GeeForallFunc _tmp1_;
+	void* _tmp1__target;
+	gboolean _tmp2_;
 #line 46 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
 #line 47 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -303,8 +303,8 @@ static gboolean sorted_list_real_foreach (GeeTraversable* base, GeeForallFunc f,
 static gboolean sorted_list_real_add (GeeCollection* base, gconstpointer item) {
 	SortedList * self;
 	gboolean result = FALSE;
-	Comparator _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
+	Comparator _tmp0_;
+	void* _tmp0__target;
 #line 50 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
 #line 51 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -314,8 +314,8 @@ static gboolean sorted_list_real_add (GeeCollection* base, gconstpointer item) {
 #line 51 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp0_ == NULL) {
 #line 317 "SortedList.c"
-		GeeArrayList* _tmp1_ = NULL;
-		gconstpointer _tmp2_ = NULL;
+		GeeArrayList* _tmp1_;
+		gconstpointer _tmp2_;
 #line 52 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp1_ = self->priv->list;
 #line 52 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -324,10 +324,10 @@ static gboolean sorted_list_real_add (GeeCollection* base, gconstpointer item) {
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_);
 #line 326 "SortedList.c"
 	} else {
-		GeeArrayList* _tmp3_ = NULL;
-		gconstpointer _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gconstpointer _tmp6_ = NULL;
+		GeeArrayList* _tmp3_;
+		gconstpointer _tmp4_;
+		gint _tmp5_;
+		gconstpointer _tmp6_;
 #line 54 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp3_ = self->priv->list;
 #line 54 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -358,19 +358,19 @@ static gpointer _g_object_ref0 (gpointer self) {
 static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* collection) {
 	SortedList * self;
 	gboolean result = FALSE;
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	GeeList* as_list = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	GeeList* _tmp4_ = NULL;
-	GeeList* _tmp5_ = NULL;
-	Comparator _tmp8_ = NULL;
-	void* _tmp8__target = NULL;
+	GeeCollection* _tmp3_;
+	GeeList* _tmp4_;
+	GeeList* _tmp5_;
+	Comparator _tmp8_;
+	void* _tmp8__target;
 	gboolean changed = FALSE;
-	GeeCollection* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
+	GeeCollection* _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
 #line 63 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
 #line 63 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -400,8 +400,8 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co
 #line 68 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp5_ != NULL) {
 #line 403 "SortedList.c"
-		GeeList* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+		GeeList* _tmp6_;
+		gboolean _tmp7_;
 #line 69 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp6_ = as_list;
 #line 69 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -421,9 +421,9 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co
 #line 71 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp8_ == NULL) {
 #line 424 "SortedList.c"
-		GeeArrayList* _tmp9_ = NULL;
-		GeeCollection* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
+		GeeArrayList* _tmp9_;
+		GeeCollection* _tmp10_;
+		gboolean _tmp11_;
 #line 72 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp9_ = self->priv->list;
 #line 72 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -450,16 +450,16 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co
 	if (_tmp14_ == 1) {
 #line 452 "SortedList.c"
 		GeeIterator* iter = NULL;
-		GeeCollection* _tmp15_ = NULL;
-		GeeIterator* _tmp16_ = NULL;
-		GeeIterator* _tmp17_ = NULL;
+		GeeCollection* _tmp15_;
+		GeeIterator* _tmp16_;
+		GeeIterator* _tmp17_;
 		gpointer item = NULL;
-		GeeIterator* _tmp18_ = NULL;
-		gpointer _tmp19_ = NULL;
-		GeeArrayList* _tmp20_ = NULL;
-		gconstpointer _tmp21_ = NULL;
-		gint _tmp22_ = 0;
-		gconstpointer _tmp23_ = NULL;
+		GeeIterator* _tmp18_;
+		gpointer _tmp19_;
+		GeeArrayList* _tmp20_;
+		gconstpointer _tmp21_;
+		gint _tmp22_;
+		gconstpointer _tmp23_;
 #line 76 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp15_ = collection;
 #line 76 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -495,11 +495,11 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co
 #line 496 "SortedList.c"
 	} else {
 		GeeList* items = NULL;
-		GeeArrayList* _tmp24_ = NULL;
-		GeeList* _tmp25_ = NULL;
-		GeeCollection* _tmp26_ = NULL;
-		GeeList* _tmp27_ = NULL;
-		gboolean _tmp28_ = FALSE;
+		GeeArrayList* _tmp24_;
+		GeeList* _tmp25_;
+		GeeCollection* _tmp26_;
+		GeeList* _tmp27_;
+		gboolean _tmp28_;
 #line 83 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp24_ = gee_array_list_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, NULL, NULL, NULL);
 #line 83 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -533,9 +533,9 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co
 gboolean sorted_list_add_list (SortedList* self, GeeList* items) {
 	gboolean result = FALSE;
 	gboolean added = FALSE;
-	GeeList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 95 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), FALSE);
 #line 95 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -552,8 +552,8 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) {
 	if (_tmp2_ == 0) {
 #line 554 "SortedList.c"
 	} else {
-		Comparator _tmp3_ = NULL;
-		void* _tmp3__target = NULL;
+		Comparator _tmp3_;
+		void* _tmp3__target;
 #line 99 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp3_ = self->priv->cmp;
 #line 99 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -561,9 +561,9 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) {
 #line 99 "/home/jens/Source/shotwell/src/SortedList.vala"
 		if (_tmp3_ != NULL) {
 #line 564 "SortedList.c"
-			GeeList* _tmp4_ = NULL;
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
+			GeeList* _tmp4_;
+			gint _tmp5_;
+			gint _tmp6_;
 #line 102 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp4_ = items;
 #line 102 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -573,14 +573,14 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) {
 #line 102 "/home/jens/Source/shotwell/src/SortedList.vala"
 			if (_tmp6_ == 1) {
 #line 576 "SortedList.c"
-				GeeArrayList* _tmp7_ = NULL;
-				GeeList* _tmp8_ = NULL;
-				gpointer _tmp9_ = NULL;
-				gpointer _tmp10_ = NULL;
-				gint _tmp11_ = 0;
-				GeeList* _tmp12_ = NULL;
-				gpointer _tmp13_ = NULL;
-				gpointer _tmp14_ = NULL;
+				GeeArrayList* _tmp7_;
+				GeeList* _tmp8_;
+				gpointer _tmp9_;
+				gpointer _tmp10_;
+				gint _tmp11_;
+				GeeList* _tmp12_;
+				gpointer _tmp13_;
+				gpointer _tmp14_;
 #line 103 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp7_ = self->priv->list;
 #line 103 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -607,8 +607,8 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) {
 				added = TRUE;
 #line 609 "SortedList.c"
 			} else {
-				GeeList* _tmp15_ = NULL;
-				gboolean _tmp16_ = FALSE;
+				GeeList* _tmp15_;
+				gboolean _tmp16_;
 #line 106 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp15_ = items;
 #line 106 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -618,9 +618,9 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) {
 #line 619 "SortedList.c"
 			}
 		} else {
-			GeeArrayList* _tmp17_ = NULL;
-			GeeList* _tmp18_ = NULL;
-			gboolean _tmp19_ = FALSE;
+			GeeArrayList* _tmp17_;
+			GeeList* _tmp18_;
+			gboolean _tmp19_;
 #line 109 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp17_ = self->priv->list;
 #line 109 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -642,7 +642,7 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) {
 
 static void sorted_list_real_clear (GeeCollection* base) {
 	SortedList * self;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 #line 119 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
 #line 120 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -656,9 +656,9 @@ static void sorted_list_real_clear (GeeCollection* base) {
 static gboolean sorted_list_real_contains (GeeCollection* base, gconstpointer item) {
 	SortedList * self;
 	gboolean result = FALSE;
-	GeeArrayList* _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeArrayList* _tmp0_;
+	gconstpointer _tmp1_;
+	gboolean _tmp2_;
 #line 123 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
 #line 124 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -678,9 +678,9 @@ static gboolean sorted_list_real_contains (GeeCollection* base, gconstpointer it
 static gboolean sorted_list_real_contains_all (GeeCollection* base, GeeCollection* collection) {
 	SortedList * self;
 	gboolean result = FALSE;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeArrayList* _tmp0_;
+	GeeCollection* _tmp1_;
+	gboolean _tmp2_;
 #line 127 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
 #line 127 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -702,9 +702,9 @@ static gboolean sorted_list_real_contains_all (GeeCollection* base, GeeCollectio
 static gboolean sorted_list_real_remove (GeeCollection* base, gconstpointer item) {
 	SortedList * self;
 	gboolean result = FALSE;
-	GeeArrayList* _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeArrayList* _tmp0_;
+	gconstpointer _tmp1_;
+	gboolean _tmp2_;
 #line 137 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
 #line 138 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -724,9 +724,9 @@ static gboolean sorted_list_real_remove (GeeCollection* base, gconstpointer item
 static gboolean sorted_list_real_remove_all (GeeCollection* base, GeeCollection* collection) {
 	SortedList * self;
 	gboolean result = FALSE;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeArrayList* _tmp0_;
+	GeeCollection* _tmp1_;
+	gboolean _tmp2_;
 #line 141 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
 #line 141 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -748,9 +748,9 @@ static gboolean sorted_list_real_remove_all (GeeCollection* base, GeeCollection*
 static gboolean sorted_list_real_retain_all (GeeCollection* base, GeeCollection* collection) {
 	SortedList * self;
 	gboolean result = FALSE;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeArrayList* _tmp0_;
+	GeeCollection* _tmp1_;
+	gboolean _tmp2_;
 #line 145 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
 #line 145 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -771,9 +771,9 @@ static gboolean sorted_list_real_retain_all (GeeCollection* base, GeeCollection*
 
 inline gint sorted_list_get_count (SortedList* self) {
 	gint result = 0;
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 153 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), 0);
 #line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -792,9 +792,9 @@ inline gint sorted_list_get_count (SortedList* self) {
 
 gpointer sorted_list_get_at (SortedList* self, gint index) {
 	gpointer result = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gpointer _tmp2_ = NULL;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gpointer _tmp2_;
 #line 157 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), NULL);
 #line 158 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -813,13 +813,13 @@ gpointer sorted_list_get_at (SortedList* self, gint index) {
 
 static gint sorted_list_binary_search (SortedList* self, gconstpointer search, GEqualFunc equal_func) {
 	gint result = 0;
-	Comparator _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
+	Comparator _tmp0_;
+	void* _tmp0__target;
 	gint min = 0;
 	gint max = 0;
-	GeeArrayList* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	GeeArrayList* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 161 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), 0);
 #line 162 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -847,24 +847,24 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G
 		while (TRUE) {
 #line 849 "SortedList.c"
 			gint mid = 0;
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
+			gint _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
 			gpointer item = NULL;
-			GeeArrayList* _tmp8_ = NULL;
-			gint _tmp9_ = 0;
-			gpointer _tmp10_ = NULL;
+			GeeArrayList* _tmp8_;
+			gint _tmp9_;
+			gpointer _tmp10_;
 			gboolean _tmp11_ = FALSE;
-			GEqualFunc _tmp12_ = NULL;
+			GEqualFunc _tmp12_;
 			gint64 compare = 0LL;
-			Comparator _tmp17_ = NULL;
-			void* _tmp17__target = NULL;
-			gconstpointer _tmp18_ = NULL;
-			gconstpointer _tmp19_ = NULL;
-			gint64 _tmp20_ = 0LL;
-			gint64 _tmp21_ = 0LL;
-			gint _tmp25_ = 0;
-			gint _tmp26_ = 0;
+			Comparator _tmp17_;
+			void* _tmp17__target;
+			gconstpointer _tmp18_;
+			gconstpointer _tmp19_;
+			gint64 _tmp20_;
+			gint64 _tmp21_;
+			gint _tmp25_;
+			gint _tmp26_;
 #line 166 "/home/jens/Source/shotwell/src/SortedList.vala"
 			if (!_tmp4_) {
 #line 871 "SortedList.c"
@@ -892,10 +892,10 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G
 #line 170 "/home/jens/Source/shotwell/src/SortedList.vala"
 			if (_tmp12_ != NULL) {
 #line 895 "SortedList.c"
-				GEqualFunc _tmp13_ = NULL;
-				gconstpointer _tmp14_ = NULL;
-				gconstpointer _tmp15_ = NULL;
-				gboolean _tmp16_ = FALSE;
+				GEqualFunc _tmp13_;
+				gconstpointer _tmp14_;
+				gconstpointer _tmp15_;
+				gboolean _tmp16_;
 #line 170 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp13_ = equal_func;
 #line 170 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -946,20 +946,20 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G
 				return result;
 #line 948 "SortedList.c"
 			} else {
-				gint64 _tmp22_ = 0LL;
+				gint64 _tmp22_;
 #line 176 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp22_ = compare;
 #line 176 "/home/jens/Source/shotwell/src/SortedList.vala"
 				if (_tmp22_ > ((gint64) 0)) {
 #line 955 "SortedList.c"
-					gint _tmp23_ = 0;
+					gint _tmp23_;
 #line 177 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp23_ = mid;
 #line 177 "/home/jens/Source/shotwell/src/SortedList.vala"
 					max = _tmp23_ - 1;
 #line 961 "SortedList.c"
 				} else {
-					gint _tmp24_ = 0;
+					gint _tmp24_;
 #line 179 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp24_ = mid;
 #line 179 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -995,8 +995,8 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G
 gint sorted_list_index_of (SortedList* self, gconstpointer search) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-	Comparator _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
+	Comparator _tmp1_;
+	void* _tmp1__target;
 #line 195 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), 0);
 #line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1006,8 +1006,8 @@ gint sorted_list_index_of (SortedList* self, gconstpointer search) {
 #line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp1_ != NULL) {
 #line 1009 "SortedList.c"
-		gconstpointer _tmp2_ = NULL;
-		gint _tmp3_ = 0;
+		gconstpointer _tmp2_;
+		gint _tmp3_;
 #line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp2_ = search;
 #line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1016,9 +1016,9 @@ gint sorted_list_index_of (SortedList* self, gconstpointer search) {
 		_tmp0_ = _tmp3_;
 #line 1018 "SortedList.c"
 	} else {
-		gconstpointer _tmp4_ = NULL;
-		GEqualFunc _tmp5_ = NULL;
-		gint _tmp6_ = 0;
+		gconstpointer _tmp4_;
+		GEqualFunc _tmp5_;
+		gint _tmp6_;
 #line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp4_ = search;
 #line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1040,11 +1040,11 @@ gint sorted_list_index_of (SortedList* self, gconstpointer search) {
 gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altered, GEqualFunc equal_func) {
 	gint result = 0;
 	gboolean _tmp0_ = FALSE;
-	Comparator _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	gconstpointer _tmp18_ = NULL;
-	GEqualFunc _tmp19_ = NULL;
-	gint _tmp20_ = 0;
+	Comparator _tmp1_;
+	void* _tmp1__target;
+	gconstpointer _tmp18_;
+	GEqualFunc _tmp19_;
+	gint _tmp20_;
 #line 200 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), 0);
 #line 201 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1057,7 +1057,7 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere
 		_tmp0_ = TRUE;
 #line 1059 "SortedList.c"
 	} else {
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 201 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp2_ = altered;
 #line 201 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1068,9 +1068,9 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere
 	if (_tmp0_) {
 #line 1070 "SortedList.c"
 		gint count = 0;
-		GeeArrayList* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+		GeeArrayList* _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
 #line 202 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp3_ = self->priv->list;
 #line 202 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1092,20 +1092,20 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere
 #line 203 "/home/jens/Source/shotwell/src/SortedList.vala"
 				while (TRUE) {
 #line 1095 "SortedList.c"
-					gint _tmp8_ = 0;
-					gint _tmp9_ = 0;
-					GEqualFunc _tmp10_ = NULL;
-					GeeArrayList* _tmp11_ = NULL;
-					gint _tmp12_ = 0;
-					gpointer _tmp13_ = NULL;
-					gpointer _tmp14_ = NULL;
-					gconstpointer _tmp15_ = NULL;
-					gboolean _tmp16_ = FALSE;
-					gboolean _tmp17_ = FALSE;
+					gint _tmp8_;
+					gint _tmp9_;
+					GEqualFunc _tmp10_;
+					GeeArrayList* _tmp11_;
+					gint _tmp12_;
+					gpointer _tmp13_;
+					gpointer _tmp14_;
+					gconstpointer _tmp15_;
+					gboolean _tmp16_;
+					gboolean _tmp17_;
 #line 203 "/home/jens/Source/shotwell/src/SortedList.vala"
 					if (!_tmp6_) {
 #line 1108 "SortedList.c"
-						gint _tmp7_ = 0;
+						gint _tmp7_;
 #line 203 "/home/jens/Source/shotwell/src/SortedList.vala"
 						_tmp7_ = ctr;
 #line 203 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1175,9 +1175,9 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere
 
 gpointer sorted_list_remove_at (SortedList* self, gint index) {
 	gpointer result = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gpointer _tmp2_ = NULL;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gpointer _tmp2_;
 #line 226 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), NULL);
 #line 227 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1197,11 +1197,11 @@ gpointer sorted_list_remove_at (SortedList* self, gint index) {
 static gpointer* sorted_list_real_to_array (GeeCollection* base, int* result_length1) {
 	SortedList * self;
 	gpointer* result = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gpointer* _tmp2_ = NULL;
-	gpointer* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gpointer* _tmp2_;
+	gpointer* _tmp3_;
+	gint _tmp3__length1;
 #line 230 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
 #line 231 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1227,8 +1227,8 @@ static gpointer* sorted_list_real_to_array (GeeCollection* base, int* result_len
 
 
 void sorted_list_resort (SortedList* self, Comparator new_cmp, void* new_cmp_target) {
-	Comparator _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
+	Comparator _tmp0_;
+	void* _tmp0__target;
 #line 234 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_if_fail (IS_SORTED_LIST (self));
 #line 235 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1248,17 +1248,17 @@ void sorted_list_resort (SortedList* self, Comparator new_cmp, void* new_cmp_tar
 gboolean sorted_list_resort_item (SortedList* self, gconstpointer item) {
 	gboolean result = FALSE;
 	gint index = 0;
-	gconstpointer _tmp0_ = NULL;
-	GEqualFunc _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gconstpointer _tmp0_;
+	GEqualFunc _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	gint new_index = 0;
-	gconstpointer _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
+	gconstpointer _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
 #line 245 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), FALSE);
 #line 246 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1298,15 +1298,15 @@ gboolean sorted_list_resort_item (SortedList* self, gconstpointer item) {
 #line 256 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp8_ > _tmp9_) {
 #line 1301 "SortedList.c"
-		GeeArrayList* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		gconstpointer _tmp12_ = NULL;
+		GeeArrayList* _tmp10_;
+		gint _tmp11_;
+		gconstpointer _tmp12_;
 		gpointer removed_item = NULL;
-		GeeArrayList* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
-		gpointer _tmp15_ = NULL;
-		gconstpointer _tmp16_ = NULL;
-		gconstpointer _tmp17_ = NULL;
+		GeeArrayList* _tmp13_;
+		gint _tmp14_;
+		gpointer _tmp15_;
+		gconstpointer _tmp16_;
+		gconstpointer _tmp17_;
 #line 257 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp10_ = self->priv->list;
 #line 257 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1334,14 +1334,14 @@ gboolean sorted_list_resort_item (SortedList* self, gconstpointer item) {
 #line 1335 "SortedList.c"
 	} else {
 		gpointer removed_item = NULL;
-		GeeArrayList* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
-		gpointer _tmp20_ = NULL;
-		gconstpointer _tmp21_ = NULL;
-		gconstpointer _tmp22_ = NULL;
-		GeeArrayList* _tmp23_ = NULL;
-		gint _tmp24_ = 0;
-		gconstpointer _tmp25_ = NULL;
+		GeeArrayList* _tmp18_;
+		gint _tmp19_;
+		gpointer _tmp20_;
+		gconstpointer _tmp21_;
+		gconstpointer _tmp22_;
+		GeeArrayList* _tmp23_;
+		gint _tmp24_;
+		gconstpointer _tmp25_;
 #line 261 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp18_ = self->priv->list;
 #line 261 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1380,9 +1380,9 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i
 	gint result = 0;
 	gint low = 0;
 	gint high = 0;
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 273 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), 0);
 #line 274 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1403,25 +1403,25 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i
 #line 276 "/home/jens/Source/shotwell/src/SortedList.vala"
 		while (TRUE) {
 #line 1406 "SortedList.c"
-			gint _tmp4_ = 0;
-			gint _tmp5_ = 0;
+			gint _tmp4_;
+			gint _tmp5_;
 			gint mid = 0;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
+			gint _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 			gpointer cmp_item = NULL;
-			GeeArrayList* _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			gpointer _tmp11_ = NULL;
-			gconstpointer _tmp12_ = NULL;
-			gconstpointer _tmp13_ = NULL;
+			GeeArrayList* _tmp9_;
+			gint _tmp10_;
+			gpointer _tmp11_;
+			gconstpointer _tmp12_;
+			gconstpointer _tmp13_;
 			gint64 _result_ = 0LL;
-			Comparator _tmp24_ = NULL;
-			void* _tmp24__target = NULL;
-			gconstpointer _tmp25_ = NULL;
-			gconstpointer _tmp26_ = NULL;
-			gint64 _tmp27_ = 0LL;
-			gint64 _tmp28_ = 0LL;
+			Comparator _tmp24_;
+			void* _tmp24__target;
+			gconstpointer _tmp25_;
+			gconstpointer _tmp26_;
+			gint64 _tmp27_;
+			gint64 _tmp28_;
 #line 276 "/home/jens/Source/shotwell/src/SortedList.vala"
 			if (!_tmp3_) {
 #line 1428 "SortedList.c"
@@ -1463,13 +1463,13 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i
 #line 285 "/home/jens/Source/shotwell/src/SortedList.vala"
 			if (_tmp12_ == _tmp13_) {
 #line 1466 "SortedList.c"
-				gint _tmp14_ = 0;
-				GeeArrayList* _tmp15_ = NULL;
-				gint _tmp16_ = 0;
-				gint _tmp17_ = 0;
-				GeeArrayList* _tmp21_ = NULL;
-				gint _tmp22_ = 0;
-				gpointer _tmp23_ = NULL;
+				gint _tmp14_;
+				GeeArrayList* _tmp15_;
+				gint _tmp16_;
+				gint _tmp17_;
+				GeeArrayList* _tmp21_;
+				gint _tmp22_;
+				gpointer _tmp23_;
 #line 287 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp14_ = mid;
 #line 287 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1481,9 +1481,9 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i
 #line 287 "/home/jens/Source/shotwell/src/SortedList.vala"
 				if (_tmp14_ >= (_tmp17_ - 1)) {
 #line 1484 "SortedList.c"
-					GeeArrayList* _tmp18_ = NULL;
-					gint _tmp19_ = 0;
-					gint _tmp20_ = 0;
+					GeeArrayList* _tmp18_;
+					gint _tmp19_;
+					gint _tmp20_;
 #line 288 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp18_ = self->priv->list;
 #line 288 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1527,20 +1527,20 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i
 #line 294 "/home/jens/Source/shotwell/src/SortedList.vala"
 			if (_tmp28_ < ((gint64) 0)) {
 #line 1530 "SortedList.c"
-				gint _tmp29_ = 0;
+				gint _tmp29_;
 #line 295 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp29_ = mid;
 #line 295 "/home/jens/Source/shotwell/src/SortedList.vala"
 				high = _tmp29_;
 #line 1536 "SortedList.c"
 			} else {
-				gint64 _tmp30_ = 0LL;
+				gint64 _tmp30_;
 #line 296 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp30_ = _result_;
 #line 296 "/home/jens/Source/shotwell/src/SortedList.vala"
 				if (_tmp30_ > ((gint64) 0)) {
 #line 1543 "SortedList.c"
-					gint _tmp31_ = 0;
+					gint _tmp31_;
 #line 297 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp31_ = mid;
 #line 297 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1567,11 +1567,11 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i
 SortedList* sorted_list_copy (SortedList* self) {
 	SortedList* result = NULL;
 	SortedList* copy = NULL;
-	Comparator _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	SortedList* _tmp1_ = NULL;
-	GeeArrayList* _tmp2_ = NULL;
-	GeeArrayList* _tmp3_ = NULL;
+	Comparator _tmp0_;
+	void* _tmp0__target;
+	SortedList* _tmp1_;
+	GeeArrayList* _tmp2_;
+	GeeArrayList* _tmp3_;
 #line 303 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), NULL);
 #line 304 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1598,35 +1598,35 @@ SortedList* sorted_list_copy (SortedList* self) {
 
 static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) {
 	gboolean result = FALSE;
-	Comparator _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
+	Comparator _tmp0_;
+	void* _tmp0__target;
 	gint list_count = 0;
-	GeeArrayList* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	GeeArrayList* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	gint _tmp4_ = 0;
-	GeeList* _tmp5_ = NULL;
+	GeeList* _tmp5_;
 	gint add_count = 0;
 	gint count = 0;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	gint _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 	gpointer* array = NULL;
-	gint _tmp12_ = 0;
-	gpointer* _tmp13_ = NULL;
-	gint array_length1 = 0;
-	gint _array_size_ = 0;
+	gint _tmp12_;
+	gpointer* _tmp13_;
+	gint array_length1;
+	gint _array_size_;
 	gint offset = 0;
-	GeeList* _tmp23_ = NULL;
-	gint _tmp33_ = 0;
-	gint _tmp34_ = 0;
-	gpointer* _tmp35_ = NULL;
-	gint _tmp35__length1 = 0;
-	gint _tmp36_ = 0;
-	gpointer* _tmp37_ = NULL;
-	gpointer* _tmp38_ = NULL;
-	gint _tmp38__length1 = 0;
-	gint _tmp39_ = 0;
+	GeeList* _tmp23_;
+	gint _tmp33_;
+	gint _tmp34_;
+	gpointer* _tmp35_;
+	gint _tmp35__length1;
+	gint _tmp36_;
+	gpointer* _tmp37_;
+	gpointer* _tmp38_;
+	gint _tmp38__length1;
+	gint _tmp39_;
 #line 329 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), FALSE);
 #line 329 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1650,9 +1650,9 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) {
 #line 333 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp5_ != NULL) {
 #line 1653 "SortedList.c"
-		GeeList* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
+		GeeList* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
 #line 333 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp6_ = add;
 #line 333 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1700,16 +1700,16 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) {
 #line 344 "/home/jens/Source/shotwell/src/SortedList.vala"
 	while (TRUE) {
 #line 1703 "SortedList.c"
-		gint _tmp14_ = 0;
-		gint _tmp15_ = 0;
-		gpointer* _tmp16_ = NULL;
-		gint _tmp16__length1 = 0;
-		gint _tmp17_ = 0;
-		GeeArrayList* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
-		gpointer _tmp20_ = NULL;
-		gpointer _tmp21_ = NULL;
-		gint _tmp22_ = 0;
+		gint _tmp14_;
+		gint _tmp15_;
+		gpointer* _tmp16_;
+		gint _tmp16__length1;
+		gint _tmp17_;
+		GeeArrayList* _tmp18_;
+		gint _tmp19_;
+		gpointer _tmp20_;
+		gpointer _tmp21_;
+		gint _tmp22_;
 #line 344 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp14_ = offset;
 #line 344 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1755,16 +1755,16 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) {
 #line 351 "/home/jens/Source/shotwell/src/SortedList.vala"
 		while (TRUE) {
 #line 1758 "SortedList.c"
-			gint _tmp24_ = 0;
-			gint _tmp25_ = 0;
-			gpointer* _tmp26_ = NULL;
-			gint _tmp26__length1 = 0;
-			gint _tmp27_ = 0;
-			GeeList* _tmp28_ = NULL;
-			gint _tmp29_ = 0;
-			gpointer _tmp30_ = NULL;
-			gpointer _tmp31_ = NULL;
-			gint _tmp32_ = 0;
+			gint _tmp24_;
+			gint _tmp25_;
+			gpointer* _tmp26_;
+			gint _tmp26__length1;
+			gint _tmp27_;
+			GeeList* _tmp28_;
+			gint _tmp29_;
+			gpointer _tmp30_;
+			gpointer _tmp31_;
+			gint _tmp32_;
 #line 351 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp24_ = offset;
 #line 351 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1831,15 +1831,15 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) {
 #line 362 "/home/jens/Source/shotwell/src/SortedList.vala"
 	while (TRUE) {
 #line 1834 "SortedList.c"
-		gint _tmp40_ = 0;
-		gint _tmp41_ = 0;
-		GeeArrayList* _tmp42_ = NULL;
-		gint _tmp43_ = 0;
-		gpointer* _tmp44_ = NULL;
-		gint _tmp44__length1 = 0;
-		gint _tmp45_ = 0;
-		gconstpointer _tmp46_ = NULL;
-		gint _tmp47_ = 0;
+		gint _tmp40_;
+		gint _tmp41_;
+		GeeArrayList* _tmp42_;
+		gint _tmp43_;
+		gpointer* _tmp44_;
+		gint _tmp44__length1;
+		gint _tmp45_;
+		gconstpointer _tmp46_;
+		gint _tmp47_;
 #line 362 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp40_ = offset;
 #line 362 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1873,15 +1873,15 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) {
 #line 367 "/home/jens/Source/shotwell/src/SortedList.vala"
 	while (TRUE) {
 #line 1876 "SortedList.c"
-		gint _tmp48_ = 0;
-		gint _tmp49_ = 0;
-		GeeArrayList* _tmp50_ = NULL;
-		gint _tmp51_ = 0;
-		gpointer* _tmp52_ = NULL;
-		gint _tmp52__length1 = 0;
-		gint _tmp53_ = 0;
-		gconstpointer _tmp54_ = NULL;
-		gint _tmp55_ = 0;
+		gint _tmp48_;
+		gint _tmp49_;
+		GeeArrayList* _tmp50_;
+		gint _tmp51_;
+		gpointer* _tmp52_;
+		gint _tmp52__length1;
+		gint _tmp53_;
+		gconstpointer _tmp54_;
+		gint _tmp55_;
 #line 367 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp48_ = offset;
 #line 367 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1923,38 +1923,38 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) {
 
 
 static void _sorted_list_merge_sort (SortedList* self, gpointer* array, int array_length1, gpointer* scratch, int scratch_length1, gint start_index, gint end_index) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	gint count = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	gint middle_index = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gpointer* _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	gpointer* _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	gpointer* _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-	gpointer* _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	Comparator _tmp15_ = NULL;
-	void* _tmp15__target = NULL;
-	gpointer* _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
-	gint _tmp17_ = 0;
-	gconstpointer _tmp18_ = NULL;
-	gpointer* _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
-	gint _tmp20_ = 0;
-	gconstpointer _tmp21_ = NULL;
-	gint64 _tmp22_ = 0LL;
+	gint _tmp5_;
+	gint _tmp6_;
+	gpointer* _tmp7_;
+	gint _tmp7__length1;
+	gpointer* _tmp8_;
+	gint _tmp8__length1;
+	gint _tmp9_;
+	gint _tmp10_;
+	gpointer* _tmp11_;
+	gint _tmp11__length1;
+	gpointer* _tmp12_;
+	gint _tmp12__length1;
+	gint _tmp13_;
+	gint _tmp14_;
+	Comparator _tmp15_;
+	void* _tmp15__target;
+	gpointer* _tmp16_;
+	gint _tmp16__length1;
+	gint _tmp17_;
+	gconstpointer _tmp18_;
+	gpointer* _tmp19_;
+	gint _tmp19__length1;
+	gint _tmp20_;
+	gconstpointer _tmp21_;
+	gint64 _tmp22_;
 #line 375 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_if_fail (IS_SORTED_LIST (self));
 #line 376 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2036,13 +2036,13 @@ static void _sorted_list_merge_sort (SortedList* self, gpointer* array, int arra
 #line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp22_ > ((gint64) 0)) {
 #line 2039 "SortedList.c"
-		gpointer* _tmp23_ = NULL;
-		gint _tmp23__length1 = 0;
-		gpointer* _tmp24_ = NULL;
-		gint _tmp24__length1 = 0;
-		gint _tmp25_ = 0;
-		gint _tmp26_ = 0;
-		gint _tmp27_ = 0;
+		gpointer* _tmp23_;
+		gint _tmp23__length1;
+		gpointer* _tmp24_;
+		gint _tmp24__length1;
+		gint _tmp25_;
+		gint _tmp26_;
+		gint _tmp27_;
 #line 388 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp23_ = array;
 #line 388 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2065,25 +2065,25 @@ static void _sorted_list_merge_sort (SortedList* self, gpointer* array, int arra
 
 
 static void sorted_list_merge (SortedList* self, gpointer* array, int array_length1, gpointer* scratch, int scratch_length1, gint start_index, gint middle_index, gint end_index) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	gint count = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	gint left_start = 0;
-	gint _tmp4_ = 0;
+	gint _tmp4_;
 	gint left_end = 0;
-	gint _tmp5_ = 0;
+	gint _tmp5_;
 	gint right_start = 0;
-	gint _tmp6_ = 0;
+	gint _tmp6_;
 	gint right_end = 0;
-	gint _tmp7_ = 0;
-	gpointer* _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	gint _tmp9_ = 0;
+	gint _tmp7_;
+	gpointer* _tmp8_;
+	gint _tmp8__length1;
+	gint _tmp9_;
 	gint scratch_index = 0;
-	gint _tmp57_ = 0;
-	gint _tmp58_ = 0;
+	gint _tmp57_;
+	gint _tmp58_;
 #line 391 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_if_fail (IS_SORTED_LIST (self));
 #line 392 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2128,25 +2128,25 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng
 	while (TRUE) {
 #line 2130 "SortedList.c"
 		gboolean _tmp10_ = FALSE;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
+		gint _tmp11_;
+		gint _tmp12_;
 		gpointer left = NULL;
-		gpointer* _tmp15_ = NULL;
-		gint _tmp15__length1 = 0;
-		gint _tmp16_ = 0;
-		gconstpointer _tmp17_ = NULL;
-		gpointer _tmp18_ = NULL;
+		gpointer* _tmp15_;
+		gint _tmp15__length1;
+		gint _tmp16_;
+		gconstpointer _tmp17_;
+		gpointer _tmp18_;
 		gpointer right = NULL;
-		gpointer* _tmp19_ = NULL;
-		gint _tmp19__length1 = 0;
-		gint _tmp20_ = 0;
-		gconstpointer _tmp21_ = NULL;
-		gpointer _tmp22_ = NULL;
-		Comparator _tmp23_ = NULL;
-		void* _tmp23__target = NULL;
-		gconstpointer _tmp24_ = NULL;
-		gconstpointer _tmp25_ = NULL;
-		gint64 _tmp26_ = 0LL;
+		gpointer* _tmp19_;
+		gint _tmp19__length1;
+		gint _tmp20_;
+		gconstpointer _tmp21_;
+		gpointer _tmp22_;
+		Comparator _tmp23_;
+		void* _tmp23__target;
+		gconstpointer _tmp24_;
+		gconstpointer _tmp25_;
+		gint64 _tmp26_;
 #line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp11_ = left_start;
 #line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2154,8 +2154,8 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng
 #line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
 		if (_tmp11_ <= _tmp12_) {
 #line 2157 "SortedList.c"
-			gint _tmp13_ = 0;
-			gint _tmp14_ = 0;
+			gint _tmp13_;
+			gint _tmp14_;
 #line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp13_ = right_start;
 #line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2211,13 +2211,13 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng
 #line 407 "/home/jens/Source/shotwell/src/SortedList.vala"
 		if (_tmp26_ <= ((gint64) 0)) {
 #line 2214 "SortedList.c"
-			gpointer* _tmp27_ = NULL;
-			gint _tmp27__length1 = 0;
-			gint _tmp28_ = 0;
-			gconstpointer _tmp29_ = NULL;
-			gpointer _tmp30_ = NULL;
-			gpointer _tmp31_ = NULL;
-			gint _tmp32_ = 0;
+			gpointer* _tmp27_;
+			gint _tmp27__length1;
+			gint _tmp28_;
+			gconstpointer _tmp29_;
+			gpointer _tmp30_;
+			gpointer _tmp31_;
+			gint _tmp32_;
 #line 408 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp27_ = scratch;
 #line 408 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2242,13 +2242,13 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng
 			left_start = _tmp32_ + 1;
 #line 2244 "SortedList.c"
 		} else {
-			gpointer* _tmp33_ = NULL;
-			gint _tmp33__length1 = 0;
-			gint _tmp34_ = 0;
-			gconstpointer _tmp35_ = NULL;
-			gpointer _tmp36_ = NULL;
-			gpointer _tmp37_ = NULL;
-			gint _tmp38_ = 0;
+			gpointer* _tmp33_;
+			gint _tmp33__length1;
+			gint _tmp34_;
+			gconstpointer _tmp35_;
+			gpointer _tmp36_;
+			gpointer _tmp37_;
+			gint _tmp38_;
 #line 411 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp33_ = scratch;
 #line 411 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2282,17 +2282,17 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng
 #line 416 "/home/jens/Source/shotwell/src/SortedList.vala"
 	while (TRUE) {
 #line 2285 "SortedList.c"
-		gint _tmp39_ = 0;
-		gint _tmp40_ = 0;
-		gpointer* _tmp41_ = NULL;
-		gint _tmp41__length1 = 0;
-		gint _tmp42_ = 0;
-		gpointer* _tmp43_ = NULL;
-		gint _tmp43__length1 = 0;
-		gint _tmp44_ = 0;
-		gconstpointer _tmp45_ = NULL;
-		gpointer _tmp46_ = NULL;
-		gpointer _tmp47_ = NULL;
+		gint _tmp39_;
+		gint _tmp40_;
+		gpointer* _tmp41_;
+		gint _tmp41__length1;
+		gint _tmp42_;
+		gpointer* _tmp43_;
+		gint _tmp43__length1;
+		gint _tmp44_;
+		gconstpointer _tmp45_;
+		gpointer _tmp46_;
+		gpointer _tmp47_;
 #line 416 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp39_ = left_start;
 #line 416 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2334,17 +2334,17 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng
 #line 419 "/home/jens/Source/shotwell/src/SortedList.vala"
 	while (TRUE) {
 #line 2337 "SortedList.c"
-		gint _tmp48_ = 0;
-		gint _tmp49_ = 0;
-		gpointer* _tmp50_ = NULL;
-		gint _tmp50__length1 = 0;
-		gint _tmp51_ = 0;
-		gpointer* _tmp52_ = NULL;
-		gint _tmp52__length1 = 0;
-		gint _tmp53_ = 0;
-		gconstpointer _tmp54_ = NULL;
-		gpointer _tmp55_ = NULL;
-		gpointer _tmp56_ = NULL;
+		gint _tmp48_;
+		gint _tmp49_;
+		gpointer* _tmp50_;
+		gint _tmp50__length1;
+		gint _tmp51_;
+		gpointer* _tmp52_;
+		gint _tmp52__length1;
+		gint _tmp53_;
+		gconstpointer _tmp54_;
+		gpointer _tmp55_;
+		gpointer _tmp56_;
 #line 419 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp48_ = right_start;
 #line 419 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2394,7 +2394,7 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng
 #line 2395 "SortedList.c"
 	{
 		gint list_index = 0;
-		gint _tmp59_ = 0;
+		gint _tmp59_;
 #line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp59_ = start_index;
 #line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2407,21 +2407,21 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng
 #line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
 			while (TRUE) {
 #line 2410 "SortedList.c"
-				gint _tmp62_ = 0;
-				gint _tmp63_ = 0;
-				gpointer* _tmp64_ = NULL;
-				gint _tmp64__length1 = 0;
-				gint _tmp65_ = 0;
-				gpointer* _tmp66_ = NULL;
-				gint _tmp66__length1 = 0;
-				gint _tmp67_ = 0;
-				gconstpointer _tmp68_ = NULL;
-				gpointer _tmp69_ = NULL;
-				gpointer _tmp70_ = NULL;
+				gint _tmp62_;
+				gint _tmp63_;
+				gpointer* _tmp64_;
+				gint _tmp64__length1;
+				gint _tmp65_;
+				gpointer* _tmp66_;
+				gint _tmp66__length1;
+				gint _tmp67_;
+				gconstpointer _tmp68_;
+				gpointer _tmp69_;
+				gpointer _tmp70_;
 #line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
 				if (!_tmp60_) {
 #line 2424 "SortedList.c"
-					gint _tmp61_ = 0;
+					gint _tmp61_;
 #line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp61_ = list_index;
 #line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2487,9 +2487,9 @@ static GType sorted_list_real_get_element_type (GeeTraversable* base) {
 static gboolean sorted_list_real_get_read_only (GeeCollection* base) {
 	gboolean result;
 	SortedList* self;
-	GeeArrayList* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	GeeArrayList* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 #line 39 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
 #line 39 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2509,9 +2509,9 @@ static gboolean sorted_list_real_get_read_only (GeeCollection* base) {
 static gboolean sorted_list_real_get_is_empty (GeeCollection* base) {
 	gboolean result;
 	SortedList* self;
-	GeeArrayList* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	GeeArrayList* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 #line 132 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
 #line 133 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2531,9 +2531,9 @@ static gboolean sorted_list_real_get_is_empty (GeeCollection* base) {
 static gint sorted_list_real_get_size (GeeCollection* base) {
 	gint result;
 	SortedList* self;
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 150 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
 #line 150 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2553,9 +2553,9 @@ static gint sorted_list_real_get_size (GeeCollection* base) {
 static GeeCollection* sorted_list_real_get_read_only_view (GeeCollection* base) {
 	GeeCollection* result;
 	SortedList* self;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeBidirList* _tmp1_ = NULL;
-	GeeBidirList* _tmp2_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeBidirList* _tmp1_;
+	GeeBidirList* _tmp2_;
 #line 215 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
 #line 216 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2574,9 +2574,9 @@ static GeeCollection* sorted_list_real_get_read_only_view (GeeCollection* base)
 
 GeeList* sorted_list_get_read_only_view_as_list (SortedList* self) {
 	GeeList* result;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeBidirList* _tmp1_ = NULL;
-	GeeBidirList* _tmp2_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeBidirList* _tmp1_;
+	GeeBidirList* _tmp2_;
 #line 221 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), NULL);
 #line 222 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2611,17 +2611,17 @@ static void sorted_list_class_init (SortedListClass * klass) {
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_ELEMENT_TYPE, g_param_spec_gtype ("element-type", "element-type", "element-type", G_TYPE_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_ELEMENT_TYPE_PROPERTY, g_param_spec_gtype ("element-type", "element-type", "element-type", G_TYPE_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_PROPERTY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_IS_EMPTY, g_param_spec_boolean ("is-empty", "is-empty", "is-empty", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_IS_EMPTY_PROPERTY, g_param_spec_boolean ("is-empty", "is-empty", "is-empty", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_SIZE, g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_SIZE_PROPERTY, g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_VIEW, g_param_spec_object ("read-only-view", "read-only-view", "read-only-view", GEE_TYPE_COLLECTION, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_VIEW_PROPERTY, g_param_spec_object ("read-only-view", "read-only-view", "read-only-view", GEE_TYPE_COLLECTION, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_VIEW_AS_LIST, g_param_spec_object ("read-only-view-as-list", "read-only-view-as-list", "read-only-view-as-list", GEE_TYPE_LIST, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_VIEW_AS_LIST_PROPERTY, g_param_spec_object ("read-only-view-as-list", "read-only-view-as-list", "read-only-view-as-list", GEE_TYPE_LIST, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 2626 "SortedList.c"
 }
 
@@ -2651,13 +2651,13 @@ static void sorted_list_gee_traversable_interface_init (GeeTraversableIface * if
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 	sorted_list_gee_traversable_parent_iface = g_type_interface_peek_parent (iface);
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->foreach = (gboolean (*)(GeeTraversable*, GeeForallFunc, void*)) sorted_list_real_foreach;
+	iface->foreach = (gboolean (*) (GeeTraversable *, GeeForallFunc, void*)) sorted_list_real_foreach;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->get_g_type = (GType(*)(GeeTraversable*)) sorted_list_gee_traversable_get_g_type;
+	iface->get_g_type = (GType (*) (GeeTraversable *)) sorted_list_gee_traversable_get_g_type;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->get_g_dup_func = (GBoxedCopyFunc(*)(GeeTraversable*)) sorted_list_gee_traversable_get_g_dup_func;
+	iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeTraversable *)) sorted_list_gee_traversable_get_g_dup_func;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->get_g_destroy_func = (GDestroyNotify(*)(GeeTraversable*)) sorted_list_gee_traversable_get_g_destroy_func;
+	iface->get_g_destroy_func = (GDestroyNotify (*) (GeeTraversable *)) sorted_list_gee_traversable_get_g_destroy_func;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->get_element_type = sorted_list_real_get_element_type;
 #line 2664 "SortedList.c"
@@ -2689,13 +2689,13 @@ static void sorted_list_gee_iterable_interface_init (GeeIterableIface * iface) {
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 	sorted_list_gee_iterable_parent_iface = g_type_interface_peek_parent (iface);
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->iterator = (GeeIterator* (*)(GeeIterable*)) sorted_list_real_iterator;
+	iface->iterator = (GeeIterator* (*) (GeeIterable *)) sorted_list_real_iterator;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->get_g_type = (GType(*)(GeeIterable*)) sorted_list_gee_iterable_get_g_type;
+	iface->get_g_type = (GType (*) (GeeIterable *)) sorted_list_gee_iterable_get_g_type;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->get_g_dup_func = (GBoxedCopyFunc(*)(GeeIterable*)) sorted_list_gee_iterable_get_g_dup_func;
+	iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeIterable *)) sorted_list_gee_iterable_get_g_dup_func;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->get_g_destroy_func = (GDestroyNotify(*)(GeeIterable*)) sorted_list_gee_iterable_get_g_destroy_func;
+	iface->get_g_destroy_func = (GDestroyNotify (*) (GeeIterable *)) sorted_list_gee_iterable_get_g_destroy_func;
 #line 2700 "SortedList.c"
 }
 
@@ -2725,29 +2725,29 @@ static void sorted_list_gee_collection_interface_init (GeeCollectionIface * ifac
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 	sorted_list_gee_collection_parent_iface = g_type_interface_peek_parent (iface);
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->add = (gboolean (*)(GeeCollection*, gconstpointer)) sorted_list_real_add;
+	iface->add = (gboolean (*) (GeeCollection *, gconstpointer)) sorted_list_real_add;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->add_all = (gboolean (*)(GeeCollection*, GeeCollection*)) sorted_list_real_add_all;
+	iface->add_all = (gboolean (*) (GeeCollection *, GeeCollection*)) sorted_list_real_add_all;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->clear = (void (*)(GeeCollection*)) sorted_list_real_clear;
+	iface->clear = (void (*) (GeeCollection *)) sorted_list_real_clear;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->contains = (gboolean (*)(GeeCollection*, gconstpointer)) sorted_list_real_contains;
+	iface->contains = (gboolean (*) (GeeCollection *, gconstpointer)) sorted_list_real_contains;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->contains_all = (gboolean (*)(GeeCollection*, GeeCollection*)) sorted_list_real_contains_all;
+	iface->contains_all = (gboolean (*) (GeeCollection *, GeeCollection*)) sorted_list_real_contains_all;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->remove = (gboolean (*)(GeeCollection*, gconstpointer)) sorted_list_real_remove;
+	iface->remove = (gboolean (*) (GeeCollection *, gconstpointer)) sorted_list_real_remove;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->remove_all = (gboolean (*)(GeeCollection*, GeeCollection*)) sorted_list_real_remove_all;
+	iface->remove_all = (gboolean (*) (GeeCollection *, GeeCollection*)) sorted_list_real_remove_all;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->retain_all = (gboolean (*)(GeeCollection*, GeeCollection*)) sorted_list_real_retain_all;
+	iface->retain_all = (gboolean (*) (GeeCollection *, GeeCollection*)) sorted_list_real_retain_all;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->to_array = (gpointer* (*)(GeeCollection*, int*)) sorted_list_real_to_array;
+	iface->to_array = (gpointer* (*) (GeeCollection *, int*)) sorted_list_real_to_array;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->get_g_type = (GType(*)(GeeCollection*)) sorted_list_gee_collection_get_g_type;
+	iface->get_g_type = (GType (*) (GeeCollection *)) sorted_list_gee_collection_get_g_type;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->get_g_dup_func = (GBoxedCopyFunc(*)(GeeCollection*)) sorted_list_gee_collection_get_g_dup_func;
+	iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeCollection *)) sorted_list_gee_collection_get_g_dup_func;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-	iface->get_g_destroy_func = (GDestroyNotify(*)(GeeCollection*)) sorted_list_gee_collection_get_g_destroy_func;
+	iface->get_g_destroy_func = (GDestroyNotify (*) (GeeCollection *)) sorted_list_gee_collection_get_g_destroy_func;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->get_read_only = sorted_list_real_get_read_only;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2767,7 +2767,7 @@ static void sorted_list_instance_init (SortedList * self) {
 }
 
 
-static void sorted_list_finalize (GObject* obj) {
+static void sorted_list_finalize (GObject * obj) {
 	SortedList * self;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SORTED_LIST, SortedList);
@@ -2803,37 +2803,37 @@ static void _vala_sorted_list_get_property (GObject * object, guint property_id,
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 	switch (property_id) {
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-		case SORTED_LIST_ELEMENT_TYPE:
+		case SORTED_LIST_ELEMENT_TYPE_PROPERTY:
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 		g_value_set_gtype (value, gee_traversable_get_element_type (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_TRAVERSABLE, GeeTraversable)));
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 		break;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-		case SORTED_LIST_READ_ONLY:
+		case SORTED_LIST_READ_ONLY_PROPERTY:
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 		g_value_set_boolean (value, gee_collection_get_read_only (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection)));
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 		break;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-		case SORTED_LIST_IS_EMPTY:
+		case SORTED_LIST_IS_EMPTY_PROPERTY:
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 		g_value_set_boolean (value, gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection)));
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 		break;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-		case SORTED_LIST_SIZE:
+		case SORTED_LIST_SIZE_PROPERTY:
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 		g_value_set_int (value, gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection)));
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 		break;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-		case SORTED_LIST_READ_ONLY_VIEW:
+		case SORTED_LIST_READ_ONLY_VIEW_PROPERTY:
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 		g_value_take_object (value, gee_collection_get_read_only_view (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection)));
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 		break;
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
-		case SORTED_LIST_READ_ONLY_VIEW_AS_LIST:
+		case SORTED_LIST_READ_ONLY_VIEW_AS_LIST_PROPERTY:
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
 		g_value_take_object (value, sorted_list_get_read_only_view_as_list (self));
 #line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
diff --git a/src/Tag.c b/src/Tag.c
index 000dd2d..5f27dfc 100644
--- a/src/Tag.c
+++ b/src/Tag.c
@@ -1,4 +1,4 @@
-/* Tag.c generated by valac 0.34.7, the Vala compiler
+/* Tag.c generated by valac 0.36.6, the Vala compiler
  * generated from Tag.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -707,9 +707,9 @@ extern TagSourceCollection* tag_global;
 TagSourceCollection* tag_global = NULL;
 static gpointer tag_tag_snapshot_parent_class = NULL;
 static gpointer tag_tag_proxy_parent_class = NULL;
-static ContainerSourceIface* tag_container_source_parent_iface = NULL;
-static ProxyableIface* tag_proxyable_parent_iface = NULL;
-static IndexableIface* tag_indexable_parent_iface = NULL;
+static ContainerSourceIface * tag_container_source_parent_iface = NULL;
+static ProxyableIface * tag_proxyable_parent_iface = NULL;
+static IndexableIface * tag_indexable_parent_iface = NULL;
 
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
@@ -818,7 +818,7 @@ static gint _tag_compare_names_gcompare_data_func (gconstpointer a, gconstpointe
 void container_source_collection_notify_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked);
 static void tag_source_collection_real_notify_container_contents_removed (ContainerSourceCollection* base, ContainerSource* container, GeeCollection* removed, gboolean unlinking);
 void container_source_collection_notify_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked);
-static void tag_source_collection_finalize (DataCollection* obj);
+static void tag_source_collection_finalize (DataCollection * obj);
 gpointer source_holding_tank_ref (gpointer instance);
 void source_holding_tank_unref (gpointer instance);
 GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -923,7 +923,7 @@ GType prepare_input_text_options_get_type (void) G_GNUC_CONST;
 gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length);
 #define DEFAULT_USER_TEXT_INPUT_LENGTH 1024
 gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length1);
-static void _vala_array_add127 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add127 (gchar** * array, int* length, int* size, gchar* value);
 static void tag_set_raw_flat_name (Tag* self, const gchar* name);
 void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GError** error);
 void data_object_notify_altered (DataObject* self, Alteration* alteration);
@@ -997,13 +997,13 @@ static void tag_tag_snapshot_real_notify_broken (SourceSnapshot* base);
 TagRow* tag_row_new (void);
 TagRow* tag_row_construct (GType object_type);
 void source_snapshot_notify_broken (SourceSnapshot* self);
-static void tag_tag_snapshot_finalize (SourceSnapshot* obj);
+static void tag_tag_snapshot_finalize (SourceSnapshot * obj);
 enum  {
 	TAG_TAG_PROXY_DUMMY_PROPERTY
 };
 SourceProxy* source_proxy_construct (GType object_type, DataSource* source);
 static DataSource* tag_tag_proxy_real_reconstitute (SourceProxy* base, gint64 object_id, SourceSnapshot* snapshot);
-static void tag_finalize (GObject* obj);
+static void tag_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -1044,9 +1044,9 @@ static gint64 _tag_source_collection_get_tag_key_get_source_database_key (DataSo
 
 TagSourceCollection* tag_source_collection_construct (GType object_type) {
 	TagSourceCollection* self = NULL;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	VideoSourceCollection* _tmp1_ = NULL;
-	LibraryPhotoSourceCollection* _tmp2_ = NULL;
+	LibraryPhotoSourceCollection* _tmp0_;
+	VideoSourceCollection* _tmp1_;
+	LibraryPhotoSourceCollection* _tmp2_;
 #line 16 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = (TagSourceCollection*) container_source_collection_construct (object_type, TAG_TYPENAME, "TagSourceCollection", _tag_source_collection_get_tag_key_get_source_database_key, NULL);
 #line 18 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1077,7 +1077,7 @@ TagSourceCollection* tag_source_collection_new (void) {
 static gboolean tag_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) {
 	TagSourceCollection * self;
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 29 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection);
 #line 29 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1094,8 +1094,8 @@ static gboolean tag_source_collection_real_holds_type_of_source (SourceCollectio
 
 static gint64 tag_source_collection_get_tag_key (DataSource* source) {
 	gint64 result = 0LL;
-	DataSource* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
+	DataSource* _tmp0_;
+	gint64 _tmp1_;
 #line 33 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
 #line 34 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1113,8 +1113,8 @@ static gint64 tag_source_collection_get_tag_key (DataSource* source) {
 static GeeCollection* tag_source_collection_real_get_containers_holding_source (ContainerSourceCollection* base, DataSource* source) {
 	TagSourceCollection * self;
 	GeeCollection* result = NULL;
-	DataSource* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	GeeList* _tmp1_;
 #line 37 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection);
 #line 37 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1142,15 +1142,15 @@ static ContainerSource* tag_source_collection_real_convert_backlink_to_container
 	TagSourceCollection * self;
 	ContainerSource* result = NULL;
 	TagID tag_id = {0};
-	SourceBacklink* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-	gint64 _tmp2_ = 0LL;
+	SourceBacklink* _tmp0_;
+	gint64 _tmp1_;
+	gint64 _tmp2_;
 	Tag* _result_ = NULL;
 	Tag* tag = NULL;
-	TagID _tmp3_ = {0};
-	Tag* _tmp4_ = NULL;
-	Tag* _tmp5_ = NULL;
-	Tag* _tmp25_ = NULL;
+	TagID _tmp3_;
+	Tag* _tmp4_;
+	Tag* _tmp5_;
+	Tag* _tmp25_;
 #line 41 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection);
 #line 41 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1176,8 +1176,8 @@ static ContainerSource* tag_source_collection_real_convert_backlink_to_container
 #line 47 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (_tmp5_ != NULL) {
 #line 1179 "Tag.c"
-		Tag* _tmp6_ = NULL;
-		Tag* _tmp7_ = NULL;
+		Tag* _tmp6_;
+		Tag* _tmp7_;
 #line 48 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp6_ = tag;
 #line 48 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1190,10 +1190,10 @@ static ContainerSource* tag_source_collection_real_convert_backlink_to_container
 	} else {
 		{
 			GeeIterator* _container_it = NULL;
-			GeeCollection* _tmp8_ = NULL;
-			GeeCollection* _tmp9_ = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			GeeIterator* _tmp11_ = NULL;
+			GeeCollection* _tmp8_;
+			GeeCollection* _tmp9_;
+			GeeIterator* _tmp10_;
+			GeeIterator* _tmp11_;
 #line 51 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp8_ = container_source_collection_get_holding_tank (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection));
 #line 51 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1209,18 +1209,18 @@ static ContainerSource* tag_source_collection_real_convert_backlink_to_container
 #line 51 "/home/jens/Source/shotwell/src/Tag.vala"
 			while (TRUE) {
 #line 1212 "Tag.c"
-				GeeIterator* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
+				GeeIterator* _tmp12_;
+				gboolean _tmp13_;
 				ContainerSource* container = NULL;
-				GeeIterator* _tmp14_ = NULL;
-				gpointer _tmp15_ = NULL;
-				ContainerSource* _tmp16_ = NULL;
-				Tag* _tmp17_ = NULL;
-				Tag* _tmp18_ = NULL;
+				GeeIterator* _tmp14_;
+				gpointer _tmp15_;
+				ContainerSource* _tmp16_;
+				Tag* _tmp17_;
+				Tag* _tmp18_;
 				TagID _tmp19_ = {0};
-				gint64 _tmp20_ = 0LL;
-				TagID _tmp21_ = {0};
-				gint64 _tmp22_ = 0LL;
+				gint64 _tmp20_;
+				TagID _tmp21_;
+				gint64 _tmp22_;
 #line 51 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp12_ = _container_it;
 #line 51 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1258,8 +1258,8 @@ static ContainerSource* tag_source_collection_real_convert_backlink_to_container
 #line 53 "/home/jens/Source/shotwell/src/Tag.vala"
 				if (_tmp20_ == _tmp22_) {
 #line 1261 "Tag.c"
-					Tag* _tmp23_ = NULL;
-					Tag* _tmp24_ = NULL;
+					Tag* _tmp23_;
+					Tag* _tmp24_;
 #line 54 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp23_ = tag;
 #line 54 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1289,11 +1289,11 @@ static ContainerSource* tag_source_collection_real_convert_backlink_to_container
 	if (_tmp25_ != NULL) {
 #line 1291 "Tag.c"
 		gboolean _tmp26_ = FALSE;
-		Tag* _tmp27_ = NULL;
-		gchar* _tmp28_ = NULL;
-		gchar* _tmp29_ = NULL;
-		gboolean _tmp30_ = FALSE;
-		gboolean _tmp31_ = FALSE;
+		Tag* _tmp27_;
+		gchar* _tmp28_;
+		gchar* _tmp29_;
+		gboolean _tmp30_;
+		gboolean _tmp31_;
 #line 64 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp27_ = _result_;
 #line 64 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1309,13 +1309,13 @@ static ContainerSource* tag_source_collection_real_convert_backlink_to_container
 #line 64 "/home/jens/Source/shotwell/src/Tag.vala"
 		if (_tmp31_) {
 #line 1312 "Tag.c"
-			Tag* _tmp32_ = NULL;
-			gchar* _tmp33_ = NULL;
-			gchar* _tmp34_ = NULL;
-			GeeList* _tmp35_ = NULL;
-			GeeList* _tmp36_ = NULL;
-			gint _tmp37_ = 0;
-			gint _tmp38_ = 0;
+			Tag* _tmp32_;
+			gchar* _tmp33_;
+			gchar* _tmp34_;
+			GeeList* _tmp35_;
+			GeeList* _tmp36_;
+			gint _tmp37_;
+			gint _tmp38_;
 #line 65 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp32_ = _result_;
 #line 65 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1346,16 +1346,16 @@ static ContainerSource* tag_source_collection_real_convert_backlink_to_container
 		if (_tmp26_) {
 #line 1348 "Tag.c"
 			gchar* top_level_with_prefix_path = NULL;
-			Tag* _tmp39_ = NULL;
-			gchar* _tmp40_ = NULL;
-			gchar* _tmp41_ = NULL;
-			GeeList* _tmp42_ = NULL;
-			GeeList* _tmp43_ = NULL;
-			gpointer _tmp44_ = NULL;
-			gchar* _tmp45_ = NULL;
+			Tag* _tmp39_;
+			gchar* _tmp40_;
+			gchar* _tmp41_;
+			GeeList* _tmp42_;
+			GeeList* _tmp43_;
+			gpointer _tmp44_;
+			gchar* _tmp45_;
 			gchar* top_level_no_prefix_path = NULL;
-			const gchar* _tmp46_ = NULL;
-			gchar* _tmp47_ = NULL;
+			const gchar* _tmp46_;
+			gchar* _tmp47_;
 #line 66 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp39_ = _result_;
 #line 66 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1385,10 +1385,10 @@ static ContainerSource* tag_source_collection_real_convert_backlink_to_container
 #line 1386 "Tag.c"
 			{
 				GeeIterator* _container_it = NULL;
-				GeeCollection* _tmp48_ = NULL;
-				GeeCollection* _tmp49_ = NULL;
-				GeeIterator* _tmp50_ = NULL;
-				GeeIterator* _tmp51_ = NULL;
+				GeeCollection* _tmp48_;
+				GeeCollection* _tmp49_;
+				GeeIterator* _tmp50_;
+				GeeIterator* _tmp51_;
 #line 71 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp48_ = container_source_collection_get_holding_tank (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection));
 #line 71 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1404,19 +1404,19 @@ static ContainerSource* tag_source_collection_real_convert_backlink_to_container
 #line 71 "/home/jens/Source/shotwell/src/Tag.vala"
 				while (TRUE) {
 #line 1407 "Tag.c"
-					GeeIterator* _tmp52_ = NULL;
-					gboolean _tmp53_ = FALSE;
+					GeeIterator* _tmp52_;
+					gboolean _tmp53_;
 					ContainerSource* container = NULL;
-					GeeIterator* _tmp54_ = NULL;
-					gpointer _tmp55_ = NULL;
+					GeeIterator* _tmp54_;
+					gpointer _tmp55_;
 					Tag* parent_candidate = NULL;
-					ContainerSource* _tmp56_ = NULL;
-					Tag* _tmp57_ = NULL;
-					Tag* _tmp58_ = NULL;
-					gchar* _tmp59_ = NULL;
-					gchar* _tmp60_ = NULL;
-					const gchar* _tmp61_ = NULL;
-					gboolean _tmp62_ = FALSE;
+					ContainerSource* _tmp56_;
+					Tag* _tmp57_;
+					Tag* _tmp58_;
+					gchar* _tmp59_;
+					gchar* _tmp60_;
+					const gchar* _tmp61_;
+					gboolean _tmp62_;
 #line 71 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp52_ = _container_it;
 #line 71 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1454,7 +1454,7 @@ static ContainerSource* tag_source_collection_real_convert_backlink_to_container
 #line 73 "/home/jens/Source/shotwell/src/Tag.vala"
 					if (_tmp62_) {
 #line 1457 "Tag.c"
-						Tag* _tmp63_ = NULL;
+						Tag* _tmp63_;
 #line 74 "/home/jens/Source/shotwell/src/Tag.vala"
 						_tmp63_ = parent_candidate;
 #line 74 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1490,9 +1490,9 @@ static ContainerSource* tag_source_collection_real_convert_backlink_to_container
 
 Tag* tag_source_collection_fetch (TagSourceCollection* self, TagID* tag_id) {
 	Tag* result = NULL;
-	TagID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	DataSource* _tmp2_ = NULL;
+	TagID _tmp0_;
+	gint64 _tmp1_;
+	DataSource* _tmp2_;
 #line 82 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG_SOURCE_COLLECTION (self), NULL);
 #line 82 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1513,11 +1513,11 @@ Tag* tag_source_collection_fetch (TagSourceCollection* self, TagID* tag_id) {
 
 gboolean tag_source_collection_exists (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	Tag* _tmp2_ = NULL;
-	Tag* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
+	Tag* _tmp2_;
+	Tag* _tmp3_;
+	gboolean _tmp4_;
 #line 86 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG_SOURCE_COLLECTION (self), FALSE);
 #line 86 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1544,9 +1544,9 @@ gboolean tag_source_collection_exists (TagSourceCollection* self, const gchar* n
 
 GeeCollection* tag_source_collection_get_all_names (TagSourceCollection* self) {
 	GeeCollection* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GeeSet* _tmp1_ = NULL;
-	GeeSet* _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeSet* _tmp1_;
+	GeeSet* _tmp2_;
 #line 90 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG_SOURCE_COLLECTION (self), NULL);
 #line 91 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1565,9 +1565,9 @@ GeeCollection* tag_source_collection_get_all_names (TagSourceCollection* self) {
 
 GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, MediaSource* source) {
 	GeeList* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	MediaSource* _tmp1_;
+	gpointer _tmp2_;
 #line 98 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG_SOURCE_COLLECTION (self), NULL);
 #line 98 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1588,9 +1588,9 @@ GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, Medi
 
 GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection* self, MediaSource* photo) {
 	GeeSortedSet* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	MediaSource* _tmp1_;
+	gpointer _tmp2_;
 #line 106 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG_SOURCE_COLLECTION (self), NULL);
 #line 106 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1611,10 +1611,10 @@ GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection
 
 Tag* tag_source_collection_fetch_by_name (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root) {
 	Tag* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	GeeHashMap* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	gpointer _tmp25_ = NULL;
+	gboolean _tmp0_;
+	GeeHashMap* _tmp23_;
+	const gchar* _tmp24_;
+	gpointer _tmp25_;
 #line 112 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG_SOURCE_COLLECTION (self), NULL);
 #line 112 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1624,8 +1624,8 @@ Tag* tag_source_collection_fetch_by_name (TagSourceCollection* self, const gchar
 #line 113 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (_tmp0_) {
 #line 1627 "Tag.c"
-		const gchar* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		const gchar* _tmp1_;
+		gboolean _tmp2_;
 #line 114 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp1_ = name;
 #line 114 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1633,12 +1633,12 @@ Tag* tag_source_collection_fetch_by_name (TagSourceCollection* self, const gchar
 #line 114 "/home/jens/Source/shotwell/src/Tag.vala"
 		if (_tmp2_) {
 #line 1636 "Tag.c"
-			const gchar* _tmp3_ = NULL;
-			GeeList* _tmp4_ = NULL;
-			GeeList* _tmp5_ = NULL;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
-			gboolean _tmp8_ = FALSE;
+			const gchar* _tmp3_;
+			GeeList* _tmp4_;
+			GeeList* _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
+			gboolean _tmp8_;
 #line 115 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp3_ = name;
 #line 115 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1657,13 +1657,13 @@ Tag* tag_source_collection_fetch_by_name (TagSourceCollection* self, const gchar
 			if (_tmp8_) {
 #line 1659 "Tag.c"
 				Tag* tag = NULL;
-				GeeHashMap* _tmp9_ = NULL;
-				const gchar* _tmp10_ = NULL;
-				gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
-				gpointer _tmp13_ = NULL;
-				Tag* _tmp14_ = NULL;
-				Tag* _tmp15_ = NULL;
+				GeeHashMap* _tmp9_;
+				const gchar* _tmp10_;
+				gchar* _tmp11_;
+				gchar* _tmp12_;
+				gpointer _tmp13_;
+				Tag* _tmp14_;
+				Tag* _tmp15_;
 #line 116 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp9_ = self->priv->name_map;
 #line 116 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1696,13 +1696,13 @@ Tag* tag_source_collection_fetch_by_name (TagSourceCollection* self, const gchar
 			}
 		} else {
 			Tag* tag = NULL;
-			GeeHashMap* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
-			gpointer _tmp20_ = NULL;
-			Tag* _tmp21_ = NULL;
-			Tag* _tmp22_ = NULL;
+			GeeHashMap* _tmp16_;
+			const gchar* _tmp17_;
+			gchar* _tmp18_;
+			gchar* _tmp19_;
+			gpointer _tmp20_;
+			Tag* _tmp21_;
+			Tag* _tmp22_;
 #line 121 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp16_ = self->priv->name_map;
 #line 121 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1751,7 +1751,7 @@ Tag* tag_source_collection_fetch_by_name (TagSourceCollection* self, const gchar
 Tag* tag_source_collection_restore_tag_from_holding_tank (TagSourceCollection* self, const gchar* name) {
 	Tag* result = NULL;
 	Tag* found = NULL;
-	Tag* _tmp17_ = NULL;
+	Tag* _tmp17_;
 #line 130 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG_SOURCE_COLLECTION (self), NULL);
 #line 130 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1761,10 +1761,10 @@ Tag* tag_source_collection_restore_tag_from_holding_tank (TagSourceCollection* s
 #line 1762 "Tag.c"
 	{
 		GeeIterator* _container_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 132 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp0_ = container_source_collection_get_holding_tank (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection));
 #line 132 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1780,19 +1780,19 @@ Tag* tag_source_collection_restore_tag_from_holding_tank (TagSourceCollection* s
 #line 132 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 1783 "Tag.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			ContainerSource* container = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
 			Tag* tag = NULL;
-			ContainerSource* _tmp8_ = NULL;
-			Tag* _tmp9_ = NULL;
-			Tag* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-			gchar* _tmp12_ = NULL;
-			const gchar* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
+			ContainerSource* _tmp8_;
+			Tag* _tmp9_;
+			Tag* _tmp10_;
+			gchar* _tmp11_;
+			gchar* _tmp12_;
+			const gchar* _tmp13_;
+			gboolean _tmp14_;
 #line 132 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp4_ = _container_it;
 #line 132 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1830,8 +1830,8 @@ Tag* tag_source_collection_restore_tag_from_holding_tank (TagSourceCollection* s
 #line 134 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp14_) {
 #line 1833 "Tag.c"
-				Tag* _tmp15_ = NULL;
-				Tag* _tmp16_ = NULL;
+				Tag* _tmp15_;
+				Tag* _tmp16_;
 #line 135 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp15_ = tag;
 #line 135 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1864,9 +1864,9 @@ Tag* tag_source_collection_restore_tag_from_holding_tank (TagSourceCollection* s
 	if (_tmp17_ != NULL) {
 #line 1866 "Tag.c"
 		gboolean relinked = FALSE;
-		Tag* _tmp18_ = NULL;
-		gboolean _tmp19_ = FALSE;
-		gboolean _tmp20_ = FALSE;
+		Tag* _tmp18_;
+		gboolean _tmp19_;
+		gboolean _tmp20_;
 #line 142 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp18_ = found;
 #line 142 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1889,7 +1889,7 @@ Tag* tag_source_collection_restore_tag_from_holding_tank (TagSourceCollection* s
 
 static void tag_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added) {
 	TagSourceCollection * self;
-	GeeIterable* _tmp18_ = NULL;
+	GeeIterable* _tmp18_;
 #line 149 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection);
 #line 149 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1897,8 +1897,8 @@ static void tag_source_collection_real_notify_items_added (DataCollection* base,
 #line 1898 "Tag.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 150 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp0_ = added;
 #line 150 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1908,24 +1908,24 @@ static void tag_source_collection_real_notify_items_added (DataCollection* base,
 #line 150 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 1911 "Tag.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			Tag* tag = NULL;
-			DataObject* _tmp6_ = NULL;
-			Tag* _tmp7_ = NULL;
-			GeeHashMap* _tmp8_ = NULL;
-			Tag* _tmp9_ = NULL;
-			gchar* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
-			GeeHashMap* _tmp13_ = NULL;
-			Tag* _tmp14_ = NULL;
-			gchar* _tmp15_ = NULL;
-			gchar* _tmp16_ = NULL;
-			Tag* _tmp17_ = NULL;
+			DataObject* _tmp6_;
+			Tag* _tmp7_;
+			GeeHashMap* _tmp8_;
+			Tag* _tmp9_;
+			gchar* _tmp10_;
+			gchar* _tmp11_;
+			gboolean _tmp12_;
+			GeeHashMap* _tmp13_;
+			Tag* _tmp14_;
+			gchar* _tmp15_;
+			gchar* _tmp16_;
+			Tag* _tmp17_;
 #line 150 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp2_ = _object_it;
 #line 150 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -1996,7 +1996,7 @@ static void tag_source_collection_real_notify_items_added (DataCollection* base,
 
 static void tag_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) {
 	TagSourceCollection * self;
-	GeeIterable* _tmp29_ = NULL;
+	GeeIterable* _tmp29_;
 #line 160 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection);
 #line 160 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2004,8 +2004,8 @@ static void tag_source_collection_real_notify_items_removed (DataCollection* bas
 #line 2005 "Tag.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 161 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp0_ = removed;
 #line 161 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2015,27 +2015,27 @@ static void tag_source_collection_real_notify_items_removed (DataCollection* bas
 #line 161 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 2018 "Tag.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			Tag* tag = NULL;
-			DataObject* _tmp6_ = NULL;
-			Tag* _tmp7_ = NULL;
+			DataObject* _tmp6_;
+			Tag* _tmp7_;
 			gboolean unset = FALSE;
-			GeeHashMap* _tmp8_ = NULL;
-			Tag* _tmp9_ = NULL;
-			gchar* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
-			gboolean _tmp13_ = FALSE;
-			gboolean _tmp14_ = FALSE;
+			GeeHashMap* _tmp8_;
+			Tag* _tmp9_;
+			gchar* _tmp10_;
+			gchar* _tmp11_;
+			gboolean _tmp12_;
+			gboolean _tmp13_;
+			gboolean _tmp14_;
 			Tag* parent = NULL;
-			Tag* _tmp15_ = NULL;
-			Tag* _tmp16_ = NULL;
+			Tag* _tmp15_;
+			Tag* _tmp16_;
 			gboolean _tmp17_ = FALSE;
-			Tag* _tmp18_ = NULL;
+			Tag* _tmp18_;
 #line 161 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp2_ = _object_it;
 #line 161 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2089,9 +2089,9 @@ static void tag_source_collection_real_notify_items_removed (DataCollection* bas
 #line 170 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp18_ != NULL) {
 #line 2092 "Tag.c"
-				Tag* _tmp19_ = NULL;
-				Tag* _tmp20_ = NULL;
-				Tag* _tmp21_ = NULL;
+				Tag* _tmp19_;
+				Tag* _tmp20_;
+				Tag* _tmp21_;
 #line 170 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp19_ = parent;
 #line 170 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2111,12 +2111,12 @@ static void tag_source_collection_real_notify_items_removed (DataCollection* bas
 #line 170 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp17_) {
 #line 2114 "Tag.c"
-				Tag* _tmp22_ = NULL;
-				GeeList* _tmp23_ = NULL;
-				GeeList* _tmp24_ = NULL;
-				gint _tmp25_ = 0;
-				gint _tmp26_ = 0;
-				gboolean _tmp27_ = FALSE;
+				Tag* _tmp22_;
+				GeeList* _tmp23_;
+				GeeList* _tmp24_;
+				gint _tmp25_;
+				gint _tmp26_;
+				gboolean _tmp27_;
 #line 171 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp22_ = parent;
 #line 171 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2134,7 +2134,7 @@ static void tag_source_collection_real_notify_items_removed (DataCollection* bas
 #line 171 "/home/jens/Source/shotwell/src/Tag.vala"
 				if (_tmp27_) {
 #line 2137 "Tag.c"
-					Tag* _tmp28_ = NULL;
+					Tag* _tmp28_;
 #line 172 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp28_ = parent;
 #line 172 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2164,7 +2164,7 @@ static void tag_source_collection_real_notify_items_removed (DataCollection* bas
 
 static void tag_source_collection_real_notify_items_altered (DataCollection* base, GeeMap* map) {
 	TagSourceCollection * self;
-	GeeMap* _tmp37_ = NULL;
+	GeeMap* _tmp37_;
 #line 179 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection);
 #line 179 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2172,12 +2172,12 @@ static void tag_source_collection_real_notify_items_altered (DataCollection* bas
 #line 2173 "Tag.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 180 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp0_ = map;
 #line 180 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2197,24 +2197,24 @@ static void tag_source_collection_real_notify_items_altered (DataCollection* bas
 #line 180 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 2200 "Tag.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			Tag* tag = NULL;
-			DataObject* _tmp10_ = NULL;
-			Tag* _tmp11_ = NULL;
+			DataObject* _tmp10_;
+			Tag* _tmp11_;
 			gchar* old_name = NULL;
 			GeeMapIterator* iter = NULL;
-			GeeHashMap* _tmp12_ = NULL;
-			GeeMapIterator* _tmp13_ = NULL;
-			const gchar* _tmp24_ = NULL;
-			Tag* _tmp25_ = NULL;
-			gchar* _tmp26_ = NULL;
-			gchar* _tmp27_ = NULL;
-			const gchar* _tmp28_ = NULL;
-			gboolean _tmp29_ = FALSE;
+			GeeHashMap* _tmp12_;
+			GeeMapIterator* _tmp13_;
+			const gchar* _tmp24_;
+			Tag* _tmp25_;
+			gchar* _tmp26_;
+			gchar* _tmp27_;
+			const gchar* _tmp28_;
+			gboolean _tmp29_;
 #line 180 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp6_ = _object_it;
 #line 180 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2248,16 +2248,16 @@ static void tag_source_collection_real_notify_items_altered (DataCollection* bas
 #line 187 "/home/jens/Source/shotwell/src/Tag.vala"
 			while (TRUE) {
 #line 2251 "Tag.c"
-				GeeMapIterator* _tmp14_ = NULL;
-				gboolean _tmp15_ = FALSE;
-				GeeMapIterator* _tmp16_ = NULL;
-				gpointer _tmp17_ = NULL;
-				Tag* _tmp18_ = NULL;
-				Tag* _tmp19_ = NULL;
-				gboolean _tmp20_ = FALSE;
-				gboolean _tmp21_ = FALSE;
-				GeeMapIterator* _tmp22_ = NULL;
-				gpointer _tmp23_ = NULL;
+				GeeMapIterator* _tmp14_;
+				gboolean _tmp15_;
+				GeeMapIterator* _tmp16_;
+				gpointer _tmp17_;
+				Tag* _tmp18_;
+				Tag* _tmp19_;
+				gboolean _tmp20_;
+				gboolean _tmp21_;
+				GeeMapIterator* _tmp22_;
+				gpointer _tmp23_;
 #line 187 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp14_ = iter;
 #line 187 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2319,13 +2319,13 @@ static void tag_source_collection_real_notify_items_altered (DataCollection* bas
 #line 198 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp29_) {
 #line 2322 "Tag.c"
-				GeeHashMap* _tmp30_ = NULL;
-				const gchar* _tmp31_ = NULL;
-				GeeHashMap* _tmp32_ = NULL;
-				Tag* _tmp33_ = NULL;
-				gchar* _tmp34_ = NULL;
-				gchar* _tmp35_ = NULL;
-				Tag* _tmp36_ = NULL;
+				GeeHashMap* _tmp30_;
+				const gchar* _tmp31_;
+				GeeHashMap* _tmp32_;
+				Tag* _tmp33_;
+				gchar* _tmp34_;
+				gchar* _tmp35_;
+				Tag* _tmp36_;
 #line 199 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp30_ = self->priv->name_map;
 #line 199 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2382,14 +2382,14 @@ static gint _tag_compare_names_gcompare_data_func (gconstpointer a, gconstpointe
 static void tag_source_collection_real_notify_container_contents_added (ContainerSourceCollection* base, ContainerSource* container, GeeCollection* added, gboolean relinking) {
 	TagSourceCollection * self;
 	Tag* tag = NULL;
-	ContainerSource* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
+	ContainerSource* _tmp0_;
+	Tag* _tmp1_;
 	GeeCollection* sources = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	ContainerSource* _tmp34_ = NULL;
-	GeeCollection* _tmp35_ = NULL;
-	gboolean _tmp36_ = FALSE;
+	GeeCollection* _tmp2_;
+	GeeCollection* _tmp3_;
+	ContainerSource* _tmp34_;
+	GeeCollection* _tmp35_;
+	gboolean _tmp36_;
 #line 207 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection);
 #line 207 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2411,8 +2411,8 @@ static void tag_source_collection_real_notify_container_contents_added (Containe
 #line 2412 "Tag.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeCollection* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 212 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp4_ = sources;
 #line 212 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2422,30 +2422,30 @@ static void tag_source_collection_real_notify_container_contents_added (Containe
 #line 212 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 2425 "Tag.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSource* source = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			GeeList* tags = NULL;
-			GeeHashMap* _tmp10_ = NULL;
-			MediaSource* _tmp11_ = NULL;
-			gpointer _tmp12_ = NULL;
-			GeeList* _tmp13_ = NULL;
+			GeeHashMap* _tmp10_;
+			MediaSource* _tmp11_;
+			gpointer _tmp12_;
+			GeeList* _tmp13_;
 			gboolean is_added = FALSE;
-			GeeList* _tmp18_ = NULL;
-			Tag* _tmp19_ = NULL;
-			gboolean _tmp20_ = FALSE;
-			gboolean _tmp21_ = FALSE;
+			GeeList* _tmp18_;
+			Tag* _tmp19_;
+			gboolean _tmp20_;
+			gboolean _tmp21_;
 			GeeSortedSet* sorted_tags = NULL;
-			GeeHashMap* _tmp22_ = NULL;
-			MediaSource* _tmp23_ = NULL;
-			gpointer _tmp24_ = NULL;
-			GeeSortedSet* _tmp25_ = NULL;
-			GeeSortedSet* _tmp30_ = NULL;
-			Tag* _tmp31_ = NULL;
-			gboolean _tmp32_ = FALSE;
-			gboolean _tmp33_ = FALSE;
+			GeeHashMap* _tmp22_;
+			MediaSource* _tmp23_;
+			gpointer _tmp24_;
+			GeeSortedSet* _tmp25_;
+			GeeSortedSet* _tmp30_;
+			Tag* _tmp31_;
+			gboolean _tmp32_;
+			gboolean _tmp33_;
 #line 212 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp6_ = _source_it;
 #line 212 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2475,10 +2475,10 @@ static void tag_source_collection_real_notify_container_contents_added (Containe
 #line 214 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp13_ == NULL) {
 #line 2478 "Tag.c"
-				GeeArrayList* _tmp14_ = NULL;
-				GeeHashMap* _tmp15_ = NULL;
-				MediaSource* _tmp16_ = NULL;
-				GeeList* _tmp17_ = NULL;
+				GeeArrayList* _tmp14_;
+				GeeHashMap* _tmp15_;
+				MediaSource* _tmp16_;
+				GeeList* _tmp17_;
 #line 215 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp14_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 215 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2520,10 +2520,10 @@ static void tag_source_collection_real_notify_container_contents_added (Containe
 #line 223 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp25_ == NULL) {
 #line 2523 "Tag.c"
-				GeeTreeSet* _tmp26_ = NULL;
-				GeeHashMap* _tmp27_ = NULL;
-				MediaSource* _tmp28_ = NULL;
-				GeeSortedSet* _tmp29_ = NULL;
+				GeeTreeSet* _tmp26_;
+				GeeHashMap* _tmp27_;
+				MediaSource* _tmp28_;
+				GeeSortedSet* _tmp29_;
 #line 224 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp26_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL);
 #line 224 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2583,14 +2583,14 @@ static void tag_source_collection_real_notify_container_contents_added (Containe
 static void tag_source_collection_real_notify_container_contents_removed (ContainerSourceCollection* base, ContainerSource* container, GeeCollection* removed, gboolean unlinking) {
 	TagSourceCollection * self;
 	Tag* tag = NULL;
-	ContainerSource* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
+	ContainerSource* _tmp0_;
+	Tag* _tmp1_;
 	GeeCollection* sources = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	ContainerSource* _tmp36_ = NULL;
-	GeeCollection* _tmp37_ = NULL;
-	gboolean _tmp38_ = FALSE;
+	GeeCollection* _tmp2_;
+	GeeCollection* _tmp3_;
+	ContainerSource* _tmp36_;
+	GeeCollection* _tmp37_;
+	gboolean _tmp38_;
 #line 235 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection);
 #line 235 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2612,8 +2612,8 @@ static void tag_source_collection_real_notify_container_contents_removed (Contai
 #line 2613 "Tag.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeCollection* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 240 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp4_ = sources;
 #line 240 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2623,36 +2623,36 @@ static void tag_source_collection_real_notify_container_contents_removed (Contai
 #line 240 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 2626 "Tag.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSource* source = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			GeeList* tags = NULL;
-			GeeHashMap* _tmp10_ = NULL;
-			MediaSource* _tmp11_ = NULL;
-			gpointer _tmp12_ = NULL;
-			GeeList* _tmp13_ = NULL;
+			GeeHashMap* _tmp10_;
+			MediaSource* _tmp11_;
+			gpointer _tmp12_;
+			GeeList* _tmp13_;
 			gboolean is_removed = FALSE;
-			GeeList* _tmp14_ = NULL;
-			Tag* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
-			gboolean _tmp17_ = FALSE;
-			GeeList* _tmp18_ = NULL;
-			gint _tmp19_ = 0;
-			gint _tmp20_ = 0;
+			GeeList* _tmp14_;
+			Tag* _tmp15_;
+			gboolean _tmp16_;
+			gboolean _tmp17_;
+			GeeList* _tmp18_;
+			gint _tmp19_;
+			gint _tmp20_;
 			GeeSortedSet* sorted_tags = NULL;
-			GeeHashMap* _tmp23_ = NULL;
-			MediaSource* _tmp24_ = NULL;
-			gpointer _tmp25_ = NULL;
-			GeeSortedSet* _tmp26_ = NULL;
-			GeeSortedSet* _tmp27_ = NULL;
-			Tag* _tmp28_ = NULL;
-			gboolean _tmp29_ = FALSE;
-			gboolean _tmp30_ = FALSE;
-			GeeSortedSet* _tmp31_ = NULL;
-			gint _tmp32_ = 0;
-			gint _tmp33_ = 0;
+			GeeHashMap* _tmp23_;
+			MediaSource* _tmp24_;
+			gpointer _tmp25_;
+			GeeSortedSet* _tmp26_;
+			GeeSortedSet* _tmp27_;
+			Tag* _tmp28_;
+			gboolean _tmp29_;
+			gboolean _tmp30_;
+			GeeSortedSet* _tmp31_;
+			gint _tmp32_;
+			gint _tmp33_;
 #line 240 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp6_ = _source_it;
 #line 240 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2702,8 +2702,8 @@ static void tag_source_collection_real_notify_container_contents_removed (Contai
 #line 247 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp20_ == 0) {
 #line 2705 "Tag.c"
-				GeeHashMap* _tmp21_ = NULL;
-				MediaSource* _tmp22_ = NULL;
+				GeeHashMap* _tmp21_;
+				MediaSource* _tmp22_;
 #line 248 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp21_ = self->priv->source_map;
 #line 248 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2745,8 +2745,8 @@ static void tag_source_collection_real_notify_container_contents_removed (Contai
 #line 256 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp33_ == 0) {
 #line 2748 "Tag.c"
-				GeeHashMap* _tmp34_ = NULL;
-				MediaSource* _tmp35_ = NULL;
+				GeeHashMap* _tmp34_;
+				MediaSource* _tmp35_;
 #line 257 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp34_ = self->priv->sorted_source_map;
 #line 257 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2802,29 +2802,29 @@ static void tag_source_collection_class_init (TagSourceCollectionClass * klass)
 #line 7 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_type_class_add_private (klass, sizeof (TagSourceCollectionPrivate));
 #line 7 "/home/jens/Source/shotwell/src/Tag.vala"
-	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) tag_source_collection_real_holds_type_of_source;
+	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) tag_source_collection_real_holds_type_of_source;
 #line 7 "/home/jens/Source/shotwell/src/Tag.vala"
-	((ContainerSourceCollectionClass *) klass)->get_containers_holding_source = (GeeCollection* (*)(ContainerSourceCollection*, DataSource*)) tag_source_collection_real_get_containers_holding_source;
+	((ContainerSourceCollectionClass *) klass)->get_containers_holding_source = (GeeCollection* (*) (ContainerSourceCollection *, DataSource*)) tag_source_collection_real_get_containers_holding_source;
 #line 7 "/home/jens/Source/shotwell/src/Tag.vala"
-	((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = (ContainerSource* (*)(ContainerSourceCollection*, SourceBacklink*)) tag_source_collection_real_convert_backlink_to_container;
+	((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = (ContainerSource* (*) (ContainerSourceCollection *, SourceBacklink*)) tag_source_collection_real_convert_backlink_to_container;
 #line 7 "/home/jens/Source/shotwell/src/Tag.vala"
-	((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) tag_source_collection_real_notify_items_added;
+	((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) tag_source_collection_real_notify_items_added;
 #line 7 "/home/jens/Source/shotwell/src/Tag.vala"
-	((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) tag_source_collection_real_notify_items_removed;
+	((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) tag_source_collection_real_notify_items_removed;
 #line 7 "/home/jens/Source/shotwell/src/Tag.vala"
-	((DataCollectionClass *) klass)->notify_items_altered = (void (*)(DataCollection*, GeeMap*)) tag_source_collection_real_notify_items_altered;
+	((DataCollectionClass *) klass)->notify_items_altered = (void (*) (DataCollection *, GeeMap*)) tag_source_collection_real_notify_items_altered;
 #line 7 "/home/jens/Source/shotwell/src/Tag.vala"
-	((ContainerSourceCollectionClass *) klass)->notify_container_contents_added = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*, gboolean)) tag_source_collection_real_notify_container_contents_added;
+	((ContainerSourceCollectionClass *) klass)->notify_container_contents_added = (void (*) (ContainerSourceCollection *, ContainerSource*, GeeCollection*, gboolean)) tag_source_collection_real_notify_container_contents_added;
 #line 7 "/home/jens/Source/shotwell/src/Tag.vala"
-	((ContainerSourceCollectionClass *) klass)->notify_container_contents_removed = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*, gboolean)) tag_source_collection_real_notify_container_contents_removed;
+	((ContainerSourceCollectionClass *) klass)->notify_container_contents_removed = (void (*) (ContainerSourceCollection *, ContainerSource*, GeeCollection*, gboolean)) tag_source_collection_real_notify_container_contents_removed;
 #line 2821 "Tag.c"
 }
 
 
 static void tag_source_collection_instance_init (TagSourceCollection * self) {
-	GeeHashMap* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeHashMap* _tmp1_;
+	GeeHashMap* _tmp2_;
 #line 7 "/home/jens/Source/shotwell/src/Tag.vala"
 	self->priv = TAG_SOURCE_COLLECTION_GET_PRIVATE (self);
 #line 8 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2843,10 +2843,10 @@ static void tag_source_collection_instance_init (TagSourceCollection * self) {
 }
 
 
-static void tag_source_collection_finalize (DataCollection* obj) {
+static void tag_source_collection_finalize (DataCollection * obj) {
 	TagSourceCollection * self;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	LibraryPhotoSourceCollection* _tmp0_;
+	guint _tmp1_;
 #line 7 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection);
 #line 26 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2902,37 +2902,37 @@ static gpointer _tag_row_ref0 (gpointer self) {
 
 static Tag* tag_construct (GType object_type, TagRow* row, gint64 object_id) {
 	Tag * self = NULL;
-	gint64 _tmp0_ = 0LL;
-	TagRow* _tmp1_ = NULL;
-	TagRow* _tmp2_ = NULL;
-	TagRow* _tmp3_ = NULL;
-	TagRow* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gint64 _tmp0_;
+	TagRow* _tmp1_;
+	TagRow* _tmp2_;
+	TagRow* _tmp3_;
+	TagRow* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 	GeeArrayList* source_list = NULL;
-	GeeArrayList* _tmp7_ = NULL;
+	GeeArrayList* _tmp7_;
 	GeeArrayList* thumbnail_views = NULL;
-	GeeArrayList* _tmp8_ = NULL;
-	TagRow* _tmp9_ = NULL;
-	GeeSet* _tmp10_ = NULL;
-	TagRow* _tmp32_ = NULL;
-	TagID _tmp33_ = {0};
-	gint64 _tmp34_ = 0LL;
-	gchar* _tmp35_ = NULL;
-	gchar* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
-	ViewCollection* _tmp39_ = NULL;
-	ViewCollection* _tmp40_ = NULL;
-	GeeArrayList* _tmp41_ = NULL;
-	GeeCollection* _tmp42_ = NULL;
-	GeeCollection* _tmp43_ = NULL;
-	GeeArrayList* _tmp44_ = NULL;
-	gint _tmp45_ = 0;
-	gint _tmp46_ = 0;
-	ViewCollection* _tmp51_ = NULL;
-	LibraryPhotoSourceCollection* _tmp52_ = NULL;
-	VideoSourceCollection* _tmp53_ = NULL;
+	GeeArrayList* _tmp8_;
+	TagRow* _tmp9_;
+	GeeSet* _tmp10_;
+	TagRow* _tmp32_;
+	TagID _tmp33_;
+	gint64 _tmp34_;
+	gchar* _tmp35_;
+	gchar* _tmp36_;
+	gchar* _tmp37_;
+	gchar* _tmp38_;
+	ViewCollection* _tmp39_;
+	ViewCollection* _tmp40_;
+	GeeArrayList* _tmp41_;
+	GeeCollection* _tmp42_;
+	GeeCollection* _tmp43_;
+	GeeArrayList* _tmp44_;
+	gint _tmp45_;
+	gint _tmp46_;
+	ViewCollection* _tmp51_;
+	LibraryPhotoSourceCollection* _tmp52_;
+	VideoSourceCollection* _tmp53_;
 #line 332 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG_ROW (row), NULL);
 #line 333 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2976,9 +2976,9 @@ static Tag* tag_construct (GType object_type, TagRow* row, gint64 object_id) {
 #line 2977 "Tag.c"
 		{
 			GeeIterator* _source_id_it = NULL;
-			TagRow* _tmp11_ = NULL;
-			GeeSet* _tmp12_ = NULL;
-			GeeIterator* _tmp13_ = NULL;
+			TagRow* _tmp11_;
+			GeeSet* _tmp12_;
+			GeeIterator* _tmp13_;
 #line 344 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp11_ = self->priv->row;
 #line 344 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2990,24 +2990,24 @@ static Tag* tag_construct (GType object_type, TagRow* row, gint64 object_id) {
 #line 344 "/home/jens/Source/shotwell/src/Tag.vala"
 			while (TRUE) {
 #line 2993 "Tag.c"
-				GeeIterator* _tmp14_ = NULL;
-				gboolean _tmp15_ = FALSE;
+				GeeIterator* _tmp14_;
+				gboolean _tmp15_;
 				gchar* source_id = NULL;
-				GeeIterator* _tmp16_ = NULL;
-				gpointer _tmp17_ = NULL;
+				GeeIterator* _tmp16_;
+				gpointer _tmp17_;
 				MediaSource* current_source = NULL;
-				MediaCollectionRegistry* _tmp18_ = NULL;
-				MediaCollectionRegistry* _tmp19_ = NULL;
-				const gchar* _tmp20_ = NULL;
-				MediaSource* _tmp21_ = NULL;
-				MediaSource* _tmp22_ = NULL;
-				MediaSource* _tmp23_ = NULL;
-				GeeArrayList* _tmp24_ = NULL;
-				MediaSource* _tmp25_ = NULL;
-				GeeArrayList* _tmp26_ = NULL;
-				MediaSource* _tmp27_ = NULL;
-				ThumbnailView* _tmp28_ = NULL;
-				ThumbnailView* _tmp29_ = NULL;
+				MediaCollectionRegistry* _tmp18_;
+				MediaCollectionRegistry* _tmp19_;
+				const gchar* _tmp20_;
+				MediaSource* _tmp21_;
+				MediaSource* _tmp22_;
+				MediaSource* _tmp23_;
+				GeeArrayList* _tmp24_;
+				MediaSource* _tmp25_;
+				GeeArrayList* _tmp26_;
+				MediaSource* _tmp27_;
+				ThumbnailView* _tmp28_;
+				ThumbnailView* _tmp29_;
 #line 344 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp14_ = _source_id_it;
 #line 344 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3079,8 +3079,8 @@ static Tag* tag_construct (GType object_type, TagRow* row, gint64 object_id) {
 #line 3080 "Tag.c"
 		}
 	} else {
-		TagRow* _tmp30_ = NULL;
-		GeeHashSet* _tmp31_ = NULL;
+		TagRow* _tmp30_;
+		GeeHashSet* _tmp31_;
 #line 355 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp30_ = self->priv->row;
 #line 355 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3134,10 +3134,10 @@ static Tag* tag_construct (GType object_type, TagRow* row, gint64 object_id) {
 #line 364 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (_tmp46_ > 0) {
 #line 3137 "Tag.c"
-		TagSourceCollection* _tmp47_ = NULL;
-		GeeArrayList* _tmp48_ = NULL;
-		TagSourceCollection* _tmp49_ = NULL;
-		GeeArrayList* _tmp50_ = NULL;
+		TagSourceCollection* _tmp47_;
+		GeeArrayList* _tmp48_;
+		TagSourceCollection* _tmp49_;
+		GeeArrayList* _tmp50_;
 #line 365 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp47_ = tag_global;
 #line 365 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3184,28 +3184,28 @@ static Tag* tag_new (TagRow* row, gint64 object_id) {
 
 
 void tag_init (ProgressMonitor monitor, void* monitor_target) {
-	TagSourceCollection* _tmp0_ = NULL;
+	TagSourceCollection* _tmp0_;
 	GeeList* rows = NULL;
 	GeeTreeMap* ancestry_dictionary = NULL;
-	GeeTreeMap* _tmp8_ = NULL;
+	GeeTreeMap* _tmp8_;
 	GeeArrayList* unlinked = NULL;
-	GeeArrayList* _tmp9_ = NULL;
+	GeeArrayList* _tmp9_;
 	gint count = 0;
-	GeeList* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
+	GeeList* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
 	GeeSet* victim_set = NULL;
-	GeeHashSet* _tmp54_ = NULL;
-	GeeSet* _tmp110_ = NULL;
-	TagSourceCollection* _tmp171_ = NULL;
-	GeeTreeMap* _tmp172_ = NULL;
-	GeeCollection* _tmp173_ = NULL;
-	GeeCollection* _tmp174_ = NULL;
-	GeeCollection* _tmp175_ = NULL;
-	GeeCollection* _tmp176_ = NULL;
-	GeeCollection* _tmp177_ = NULL;
-	TagSourceCollection* _tmp178_ = NULL;
-	GeeArrayList* _tmp179_ = NULL;
+	GeeHashSet* _tmp54_;
+	GeeSet* _tmp110_;
+	TagSourceCollection* _tmp171_;
+	GeeTreeMap* _tmp172_;
+	GeeCollection* _tmp173_;
+	GeeCollection* _tmp174_;
+	GeeCollection* _tmp175_;
+	GeeCollection* _tmp176_;
+	GeeCollection* _tmp177_;
+	TagSourceCollection* _tmp178_;
+	GeeArrayList* _tmp179_;
 	GError * _inner_error_ = NULL;
 #line 388 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp0_ = tag_source_collection_new ();
@@ -3218,11 +3218,11 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 3219 "Tag.c"
 	{
 		GeeList* _tmp1_ = NULL;
-		TagTable* _tmp2_ = NULL;
-		TagTable* _tmp3_ = NULL;
-		GeeList* _tmp4_ = NULL;
-		GeeList* _tmp5_ = NULL;
-		GeeList* _tmp6_ = NULL;
+		TagTable* _tmp2_;
+		TagTable* _tmp3_;
+		GeeList* _tmp4_;
+		GeeList* _tmp5_;
+		GeeList* _tmp6_;
 #line 393 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp2_ = tag_table_get_instance ();
 #line 393 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3240,7 +3240,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 393 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3243 "Tag.c"
-				goto __catch470_database_error;
+				goto __catch471_database_error;
 			}
 #line 393 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (rows);
@@ -3264,11 +3264,11 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 		_g_object_unref0 (_tmp1_);
 #line 3266 "Tag.c"
 	}
-	goto __finally470;
-	__catch470_database_error:
+	goto __finally471;
+	__catch471_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp7_ = NULL;
+		GError* _tmp7_;
 #line 392 "/home/jens/Source/shotwell/src/Tag.vala"
 		err = _inner_error_;
 #line 392 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3281,7 +3281,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 		_g_error_free0 (err);
 #line 3283 "Tag.c"
 	}
-	__finally470:
+	__finally471:
 #line 392 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 392 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3323,36 +3323,36 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 408 "/home/jens/Source/shotwell/src/Tag.vala"
 			while (TRUE) {
 #line 3326 "Tag.c"
-				gint _tmp15_ = 0;
-				gint _tmp16_ = 0;
+				gint _tmp15_;
+				gint _tmp16_;
 				TagRow* row = NULL;
-				GeeList* _tmp17_ = NULL;
-				gint _tmp18_ = 0;
-				gpointer _tmp19_ = NULL;
+				GeeList* _tmp17_;
+				gint _tmp18_;
+				gpointer _tmp19_;
 				gchar* name = NULL;
-				TagRow* _tmp20_ = NULL;
-				const gchar* _tmp21_ = NULL;
-				gchar* _tmp22_ = NULL;
-				const gchar* _tmp23_ = NULL;
-				TagRow* _tmp34_ = NULL;
-				const gchar* _tmp35_ = NULL;
-				gchar* _tmp36_ = NULL;
+				TagRow* _tmp20_;
+				const gchar* _tmp21_;
+				gchar* _tmp22_;
+				const gchar* _tmp23_;
+				TagRow* _tmp34_;
+				const gchar* _tmp35_;
+				gchar* _tmp36_;
 				Tag* tag = NULL;
-				TagRow* _tmp37_ = NULL;
-				Tag* _tmp38_ = NULL;
-				ProgressMonitor _tmp39_ = NULL;
-				void* _tmp39__target = NULL;
-				GeeTreeMap* _tmp43_ = NULL;
-				Tag* _tmp44_ = NULL;
-				gchar* _tmp45_ = NULL;
-				gchar* _tmp46_ = NULL;
-				Tag* _tmp47_ = NULL;
-				Tag* _tmp48_ = NULL;
-				gboolean _tmp49_ = FALSE;
+				TagRow* _tmp37_;
+				Tag* _tmp38_;
+				ProgressMonitor _tmp39_;
+				void* _tmp39__target;
+				GeeTreeMap* _tmp43_;
+				Tag* _tmp44_;
+				gchar* _tmp45_;
+				gchar* _tmp46_;
+				Tag* _tmp47_;
+				Tag* _tmp48_;
+				gboolean _tmp49_;
 #line 408 "/home/jens/Source/shotwell/src/Tag.vala"
 				if (!_tmp13_) {
 #line 3355 "Tag.c"
-					gint _tmp14_ = 0;
+					gint _tmp14_;
 #line 408 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp14_ = ctr;
 #line 408 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3392,8 +3392,8 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 413 "/home/jens/Source/shotwell/src/Tag.vala"
 				if (_tmp23_ == NULL) {
 #line 3395 "Tag.c"
-					TagRow* _tmp24_ = NULL;
-					const gchar* _tmp25_ = NULL;
+					TagRow* _tmp24_;
+					const gchar* _tmp25_;
 #line 416 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp24_ = row;
 #line 416 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3402,10 +3402,10 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 					g_warning ("Tag.vala:416: Invalid tag name \"%s\": removing from database", _tmp25_);
 #line 3404 "Tag.c"
 					{
-						TagTable* _tmp26_ = NULL;
-						TagTable* _tmp27_ = NULL;
-						TagRow* _tmp28_ = NULL;
-						TagID _tmp29_ = {0};
+						TagTable* _tmp26_;
+						TagTable* _tmp27_;
+						TagRow* _tmp28_;
+						TagID _tmp29_;
 #line 418 "/home/jens/Source/shotwell/src/Tag.vala"
 						_tmp26_ = tag_table_get_instance ();
 #line 418 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3423,7 +3423,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 418 "/home/jens/Source/shotwell/src/Tag.vala"
 							if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3426 "Tag.c"
-								goto __catch471_database_error;
+								goto __catch472_database_error;
 							}
 #line 418 "/home/jens/Source/shotwell/src/Tag.vala"
 							_g_free0 (name);
@@ -3444,14 +3444,14 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 3445 "Tag.c"
 						}
 					}
-					goto __finally471;
-					__catch471_database_error:
+					goto __finally472;
+					__catch472_database_error:
 					{
 						GError* err = NULL;
-						TagRow* _tmp30_ = NULL;
-						const gchar* _tmp31_ = NULL;
-						GError* _tmp32_ = NULL;
-						const gchar* _tmp33_ = NULL;
+						TagRow* _tmp30_;
+						const gchar* _tmp31_;
+						GError* _tmp32_;
+						const gchar* _tmp33_;
 #line 417 "/home/jens/Source/shotwell/src/Tag.vala"
 						err = _inner_error_;
 #line 417 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3470,7 +3470,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 						_g_error_free0 (err);
 #line 3472 "Tag.c"
 					}
-					__finally471:
+					__finally472:
 #line 417 "/home/jens/Source/shotwell/src/Tag.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 417 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3522,10 +3522,10 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 429 "/home/jens/Source/shotwell/src/Tag.vala"
 				if (_tmp39_ != NULL) {
 #line 3525 "Tag.c"
-					ProgressMonitor _tmp40_ = NULL;
-					void* _tmp40__target = NULL;
-					gint _tmp41_ = 0;
-					gint _tmp42_ = 0;
+					ProgressMonitor _tmp40_;
+					void* _tmp40__target;
+					gint _tmp41_;
+					gint _tmp42_;
 #line 430 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp40_ = monitor;
 #line 430 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3559,10 +3559,10 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 434 "/home/jens/Source/shotwell/src/Tag.vala"
 				if (_tmp49_) {
 #line 3562 "Tag.c"
-					Tag* _tmp50_ = NULL;
-					TagSourceCollection* _tmp51_ = NULL;
-					GeeArrayList* _tmp52_ = NULL;
-					Tag* _tmp53_ = NULL;
+					Tag* _tmp50_;
+					TagSourceCollection* _tmp51_;
+					GeeArrayList* _tmp52_;
+					Tag* _tmp53_;
 #line 435 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp50_ = tag;
 #line 435 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3594,12 +3594,12 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 3595 "Tag.c"
 	{
 		GeeIterator* _fq_tag_path_it = NULL;
-		GeeTreeMap* _tmp55_ = NULL;
-		GeeSet* _tmp56_ = NULL;
-		GeeSet* _tmp57_ = NULL;
-		GeeSet* _tmp58_ = NULL;
-		GeeIterator* _tmp59_ = NULL;
-		GeeIterator* _tmp60_ = NULL;
+		GeeTreeMap* _tmp55_;
+		GeeSet* _tmp56_;
+		GeeSet* _tmp57_;
+		GeeSet* _tmp58_;
+		GeeIterator* _tmp59_;
+		GeeIterator* _tmp60_;
 #line 445 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp55_ = ancestry_dictionary;
 #line 445 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3619,17 +3619,17 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 445 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 3622 "Tag.c"
-			GeeIterator* _tmp61_ = NULL;
-			gboolean _tmp62_ = FALSE;
+			GeeIterator* _tmp61_;
+			gboolean _tmp62_;
 			gchar* fq_tag_path = NULL;
-			GeeIterator* _tmp63_ = NULL;
-			gpointer _tmp64_ = NULL;
-			const gchar* _tmp65_ = NULL;
-			GeeList* _tmp66_ = NULL;
-			GeeList* _tmp67_ = NULL;
-			gint _tmp68_ = 0;
-			gint _tmp69_ = 0;
-			gboolean _tmp70_ = FALSE;
+			GeeIterator* _tmp63_;
+			gpointer _tmp64_;
+			const gchar* _tmp65_;
+			GeeList* _tmp66_;
+			GeeList* _tmp67_;
+			gint _tmp68_;
+			gint _tmp69_;
+			gboolean _tmp70_;
 #line 445 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp61_ = _fq_tag_path_it;
 #line 445 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3664,8 +3664,8 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 			if (_tmp70_) {
 #line 3666 "Tag.c"
 				gboolean _tmp71_ = FALSE;
-				const gchar* _tmp72_ = NULL;
-				gboolean _tmp73_ = FALSE;
+				const gchar* _tmp72_;
+				gboolean _tmp73_;
 #line 447 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp72_ = fq_tag_path;
 #line 447 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3673,11 +3673,11 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 447 "/home/jens/Source/shotwell/src/Tag.vala"
 				if (_tmp73_) {
 #line 3676 "Tag.c"
-					GeeTreeMap* _tmp74_ = NULL;
-					const gchar* _tmp75_ = NULL;
-					gchar* _tmp76_ = NULL;
-					gchar* _tmp77_ = NULL;
-					gboolean _tmp78_ = FALSE;
+					GeeTreeMap* _tmp74_;
+					const gchar* _tmp75_;
+					gchar* _tmp76_;
+					gchar* _tmp77_;
+					gboolean _tmp78_;
 #line 448 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp74_ = ancestry_dictionary;
 #line 448 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3701,11 +3701,11 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 447 "/home/jens/Source/shotwell/src/Tag.vala"
 				if (_tmp71_) {
 #line 3704 "Tag.c"
-					GeeSet* _tmp79_ = NULL;
-					GeeTreeMap* _tmp80_ = NULL;
-					const gchar* _tmp81_ = NULL;
-					gpointer _tmp82_ = NULL;
-					Tag* _tmp83_ = NULL;
+					GeeSet* _tmp79_;
+					GeeTreeMap* _tmp80_;
+					const gchar* _tmp81_;
+					gpointer _tmp82_;
+					Tag* _tmp83_;
 #line 449 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp79_ = victim_set;
 #line 449 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3733,8 +3733,8 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 	}
 	{
 		GeeIterator* _tag_it = NULL;
-		GeeSet* _tmp84_ = NULL;
-		GeeIterator* _tmp85_ = NULL;
+		GeeSet* _tmp84_;
+		GeeIterator* _tmp85_;
 #line 454 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp84_ = victim_set;
 #line 454 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3744,33 +3744,33 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 454 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 3747 "Tag.c"
-			GeeIterator* _tmp86_ = NULL;
-			gboolean _tmp87_ = FALSE;
+			GeeIterator* _tmp86_;
+			gboolean _tmp87_;
 			Tag* tag = NULL;
-			GeeIterator* _tmp88_ = NULL;
-			gpointer _tmp89_ = NULL;
+			GeeIterator* _tmp88_;
+			gpointer _tmp89_;
 			GeeCollection* source_collection = NULL;
-			Tag* _tmp90_ = NULL;
-			GeeCollection* _tmp91_ = NULL;
+			Tag* _tmp90_;
+			GeeCollection* _tmp91_;
 			gchar* flat_version = NULL;
-			Tag* _tmp92_ = NULL;
-			gchar* _tmp93_ = NULL;
-			TagSourceCollection* _tmp94_ = NULL;
-			const gchar* _tmp95_ = NULL;
-			Tag* _tmp96_ = NULL;
-			Tag* _tmp97_ = NULL;
-			GeeCollection* _tmp98_ = NULL;
-			GeeTreeMap* _tmp99_ = NULL;
-			Tag* _tmp100_ = NULL;
-			gchar* _tmp101_ = NULL;
-			gchar* _tmp102_ = NULL;
-			Tag* _tmp103_ = NULL;
-			Tag* _tmp104_ = NULL;
-			GeeCollection* _tmp105_ = NULL;
-			GeeCollection* _tmp106_ = NULL;
-			GeeMultiMap* _tmp107_ = NULL;
-			GeeMultiMap* _tmp108_ = NULL;
-			Tag* _tmp109_ = NULL;
+			Tag* _tmp92_;
+			gchar* _tmp93_;
+			TagSourceCollection* _tmp94_;
+			const gchar* _tmp95_;
+			Tag* _tmp96_;
+			Tag* _tmp97_;
+			GeeCollection* _tmp98_;
+			GeeTreeMap* _tmp99_;
+			Tag* _tmp100_;
+			gchar* _tmp101_;
+			gchar* _tmp102_;
+			Tag* _tmp103_;
+			Tag* _tmp104_;
+			GeeCollection* _tmp105_;
+			GeeCollection* _tmp106_;
+			GeeMultiMap* _tmp107_;
+			GeeMultiMap* _tmp108_;
+			Tag* _tmp109_;
 #line 454 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp86_ = _tag_it;
 #line 454 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3864,12 +3864,12 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 3865 "Tag.c"
 	{
 		GeeIterator* _fq_tag_path_it = NULL;
-		GeeTreeMap* _tmp111_ = NULL;
-		GeeSet* _tmp112_ = NULL;
-		GeeSet* _tmp113_ = NULL;
-		GeeSet* _tmp114_ = NULL;
-		GeeIterator* _tmp115_ = NULL;
-		GeeIterator* _tmp116_ = NULL;
+		GeeTreeMap* _tmp111_;
+		GeeSet* _tmp112_;
+		GeeSet* _tmp113_;
+		GeeSet* _tmp114_;
+		GeeIterator* _tmp115_;
+		GeeIterator* _tmp116_;
 #line 470 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp111_ = ancestry_dictionary;
 #line 470 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3889,18 +3889,18 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 470 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 3892 "Tag.c"
-			GeeIterator* _tmp117_ = NULL;
-			gboolean _tmp118_ = FALSE;
+			GeeIterator* _tmp117_;
+			gboolean _tmp118_;
 			gchar* fq_tag_path = NULL;
-			GeeIterator* _tmp119_ = NULL;
-			gpointer _tmp120_ = NULL;
+			GeeIterator* _tmp119_;
+			gpointer _tmp120_;
 			GeeList* parents_to_search = NULL;
-			const gchar* _tmp121_ = NULL;
-			GeeList* _tmp122_ = NULL;
+			const gchar* _tmp121_;
+			GeeList* _tmp122_;
 			Tag* curr_child = NULL;
-			GeeTreeMap* _tmp123_ = NULL;
-			const gchar* _tmp124_ = NULL;
-			gpointer _tmp125_ = NULL;
+			GeeTreeMap* _tmp123_;
+			const gchar* _tmp124_;
+			gpointer _tmp125_;
 #line 470 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp117_ = _fq_tag_path_it;
 #line 470 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3934,12 +3934,12 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 3935 "Tag.c"
 			{
 				GeeList* _parent_path_list = NULL;
-				GeeList* _tmp126_ = NULL;
-				GeeList* _tmp127_ = NULL;
+				GeeList* _tmp126_;
+				GeeList* _tmp127_;
 				gint _parent_path_size = 0;
-				GeeList* _tmp128_ = NULL;
-				gint _tmp129_ = 0;
-				gint _tmp130_ = 0;
+				GeeList* _tmp128_;
+				gint _tmp129_;
+				gint _tmp130_;
 				gint _parent_path_index = 0;
 #line 476 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp126_ = parents_to_search;
@@ -3960,29 +3960,29 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 476 "/home/jens/Source/shotwell/src/Tag.vala"
 				while (TRUE) {
 #line 3963 "Tag.c"
-					gint _tmp131_ = 0;
-					gint _tmp132_ = 0;
-					gint _tmp133_ = 0;
+					gint _tmp131_;
+					gint _tmp132_;
+					gint _tmp133_;
 					gchar* parent_path = NULL;
-					GeeList* _tmp134_ = NULL;
-					gint _tmp135_ = 0;
-					gpointer _tmp136_ = NULL;
+					GeeList* _tmp134_;
+					gint _tmp135_;
+					gpointer _tmp136_;
 					gint child_ref_count = 0;
-					Tag* _tmp137_ = NULL;
-					gint _tmp138_ = 0;
+					Tag* _tmp137_;
+					gint _tmp138_;
 					gint parent_ref_count = 0;
-					GeeTreeMap* _tmp139_ = NULL;
-					const gchar* _tmp140_ = NULL;
-					gboolean _tmp141_ = FALSE;
-					gint _tmp147_ = 0;
-					gint _tmp148_ = 0;
-					GeeSet* _tmp151_ = NULL;
-					GeeTreeMap* _tmp152_ = NULL;
-					const gchar* _tmp153_ = NULL;
-					gpointer _tmp154_ = NULL;
-					Tag* _tmp155_ = NULL;
-					gboolean _tmp156_ = FALSE;
-					gboolean _tmp157_ = FALSE;
+					GeeTreeMap* _tmp139_;
+					const gchar* _tmp140_;
+					gboolean _tmp141_;
+					gint _tmp147_;
+					gint _tmp148_;
+					GeeSet* _tmp151_;
+					GeeTreeMap* _tmp152_;
+					const gchar* _tmp153_;
+					gpointer _tmp154_;
+					Tag* _tmp155_;
+					gboolean _tmp156_;
+					gboolean _tmp157_;
 #line 476 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp131_ = _parent_path_index;
 #line 476 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4022,11 +4022,11 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 483 "/home/jens/Source/shotwell/src/Tag.vala"
 					if (_tmp141_) {
 #line 4025 "Tag.c"
-						GeeTreeMap* _tmp142_ = NULL;
-						const gchar* _tmp143_ = NULL;
-						gpointer _tmp144_ = NULL;
-						Tag* _tmp145_ = NULL;
-						gint _tmp146_ = 0;
+						GeeTreeMap* _tmp142_;
+						const gchar* _tmp143_;
+						gpointer _tmp144_;
+						Tag* _tmp145_;
+						gint _tmp146_;
 #line 485 "/home/jens/Source/shotwell/src/Tag.vala"
 						_tmp142_ = ancestry_dictionary;
 #line 485 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4050,8 +4050,8 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 489 "/home/jens/Source/shotwell/src/Tag.vala"
 					if (_tmp147_ > _tmp148_) {
 #line 4053 "Tag.c"
-						GeeSet* _tmp149_ = NULL;
-						Tag* _tmp150_ = NULL;
+						GeeSet* _tmp149_;
+						Tag* _tmp150_;
 #line 493 "/home/jens/Source/shotwell/src/Tag.vala"
 						_tmp149_ = victim_set;
 #line 493 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4083,8 +4083,8 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 501 "/home/jens/Source/shotwell/src/Tag.vala"
 					if (_tmp157_) {
 #line 4086 "Tag.c"
-						GeeSet* _tmp158_ = NULL;
-						Tag* _tmp159_ = NULL;
+						GeeSet* _tmp158_;
+						Tag* _tmp159_;
 #line 503 "/home/jens/Source/shotwell/src/Tag.vala"
 						_tmp158_ = victim_set;
 #line 503 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4119,8 +4119,8 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 	}
 	{
 		GeeIterator* _t_it = NULL;
-		GeeSet* _tmp160_ = NULL;
-		GeeIterator* _tmp161_ = NULL;
+		GeeSet* _tmp160_;
+		GeeIterator* _tmp161_;
 #line 510 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp160_ = victim_set;
 #line 510 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4130,16 +4130,16 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 510 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 4133 "Tag.c"
-			GeeIterator* _tmp162_ = NULL;
-			gboolean _tmp163_ = FALSE;
+			GeeIterator* _tmp162_;
+			gboolean _tmp163_;
 			Tag* t = NULL;
-			GeeIterator* _tmp164_ = NULL;
-			gpointer _tmp165_ = NULL;
-			GeeTreeMap* _tmp166_ = NULL;
-			Tag* _tmp167_ = NULL;
-			gchar* _tmp168_ = NULL;
-			gchar* _tmp169_ = NULL;
-			Tag* _tmp170_ = NULL;
+			GeeIterator* _tmp164_;
+			gpointer _tmp165_;
+			GeeTreeMap* _tmp166_;
+			Tag* _tmp167_;
+			gchar* _tmp168_;
+			gchar* _tmp169_;
+			Tag* _tmp170_;
 #line 510 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp162_ = _t_it;
 #line 510 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4207,12 +4207,12 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 4208 "Tag.c"
 	{
 		GeeIterator* _t_it = NULL;
-		GeeTreeMap* _tmp180_ = NULL;
-		GeeCollection* _tmp181_ = NULL;
-		GeeCollection* _tmp182_ = NULL;
-		GeeCollection* _tmp183_ = NULL;
-		GeeIterator* _tmp184_ = NULL;
-		GeeIterator* _tmp185_ = NULL;
+		GeeTreeMap* _tmp180_;
+		GeeCollection* _tmp181_;
+		GeeCollection* _tmp182_;
+		GeeCollection* _tmp183_;
+		GeeIterator* _tmp184_;
+		GeeIterator* _tmp185_;
 #line 521 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp180_ = ancestry_dictionary;
 #line 521 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4232,18 +4232,18 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 521 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 4235 "Tag.c"
-			GeeIterator* _tmp186_ = NULL;
-			gboolean _tmp187_ = FALSE;
+			GeeIterator* _tmp186_;
+			gboolean _tmp187_;
 			Tag* t = NULL;
-			GeeIterator* _tmp188_ = NULL;
-			gpointer _tmp189_ = NULL;
+			GeeIterator* _tmp188_;
+			gpointer _tmp189_;
 			gboolean _tmp190_ = FALSE;
-			Tag* _tmp191_ = NULL;
-			GeeList* _tmp192_ = NULL;
-			GeeList* _tmp193_ = NULL;
-			gint _tmp194_ = 0;
-			gint _tmp195_ = 0;
-			gboolean _tmp196_ = FALSE;
+			Tag* _tmp191_;
+			GeeList* _tmp192_;
+			GeeList* _tmp193_;
+			gint _tmp194_;
+			gint _tmp195_;
+			gboolean _tmp196_;
 #line 521 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp186_ = _t_it;
 #line 521 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4277,9 +4277,9 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 523 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp196_) {
 #line 4280 "Tag.c"
-				Tag* _tmp197_ = NULL;
-				Tag* _tmp198_ = NULL;
-				Tag* _tmp199_ = NULL;
+				Tag* _tmp197_;
+				Tag* _tmp198_;
+				Tag* _tmp199_;
 #line 523 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp197_ = t;
 #line 523 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4299,7 +4299,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 523 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp190_) {
 #line 4302 "Tag.c"
-				Tag* _tmp200_ = NULL;
+				Tag* _tmp200_;
 #line 525 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp200_ = t;
 #line 525 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4332,20 +4332,20 @@ void tag_terminate (void) {
 
 gint tag_compare_names (Tag* a, Tag* b) {
 	gint result = 0;
-	Tag* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	Tag* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	Tag* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	Tag* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
+	Tag* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	Tag* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	Tag* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	Tag* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
 #line 533 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (a), 0);
 #line 533 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4396,20 +4396,20 @@ gint tag_compare_names (Tag* a, Tag* b) {
 
 gint tag_compare_user_visible_names (Tag* a, Tag* b) {
 	gint result = 0;
-	Tag* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	Tag* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	Tag* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	Tag* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
+	Tag* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	Tag* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	Tag* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	Tag* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
 #line 538 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (a), 0);
 #line 538 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4460,8 +4460,8 @@ gint tag_compare_user_visible_names (Tag* a, Tag* b) {
 
 guint tag_hash_name_string (const gchar* a) {
 	guint result = 0U;
-	const gchar* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	const gchar* _tmp0_;
+	guint _tmp1_;
 #line 543 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (a != NULL, 0U);
 #line 544 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4478,9 +4478,9 @@ guint tag_hash_name_string (const gchar* a) {
 
 gboolean tag_equal_name_strings (const gchar* a, const gchar* b) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 547 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (a != NULL, FALSE);
 #line 547 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4502,13 +4502,13 @@ gboolean tag_equal_name_strings (const gchar* a, const gchar* b) {
 Tag* tag_for_path (const gchar* name) {
 	Tag* result = NULL;
 	Tag* tag = NULL;
-	TagSourceCollection* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	Tag* _tmp2_ = NULL;
-	Tag* _tmp3_ = NULL;
-	Tag* _tmp7_ = NULL;
-	TagSourceCollection* _tmp16_ = NULL;
-	Tag* _tmp17_ = NULL;
+	TagSourceCollection* _tmp0_;
+	const gchar* _tmp1_;
+	Tag* _tmp2_;
+	Tag* _tmp3_;
+	Tag* _tmp7_;
+	TagSourceCollection* _tmp16_;
+	Tag* _tmp17_;
 	GError * _inner_error_ = NULL;
 #line 553 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (name != NULL, NULL);
@@ -4525,9 +4525,9 @@ Tag* tag_for_path (const gchar* name) {
 #line 555 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (_tmp3_ == NULL) {
 #line 4528 "Tag.c"
-		TagSourceCollection* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		Tag* _tmp6_ = NULL;
+		TagSourceCollection* _tmp4_;
+		const gchar* _tmp5_;
+		Tag* _tmp6_;
 #line 556 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp4_ = tag_global;
 #line 556 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4552,12 +4552,12 @@ Tag* tag_for_path (const gchar* name) {
 	}
 	{
 		TagRow* _tmp8_ = NULL;
-		TagTable* _tmp9_ = NULL;
-		TagTable* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		TagRow* _tmp12_ = NULL;
-		TagRow* _tmp13_ = NULL;
-		Tag* _tmp14_ = NULL;
+		TagTable* _tmp9_;
+		TagTable* _tmp10_;
+		const gchar* _tmp11_;
+		TagRow* _tmp12_;
+		TagRow* _tmp13_;
+		Tag* _tmp14_;
 #line 563 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp9_ = tag_table_get_instance ();
 #line 563 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4577,7 +4577,7 @@ Tag* tag_for_path (const gchar* name) {
 #line 563 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 4580 "Tag.c"
-				goto __catch472_database_error;
+				goto __catch473_database_error;
 			}
 #line 563 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (tag);
@@ -4599,11 +4599,11 @@ Tag* tag_for_path (const gchar* name) {
 		_tag_row_unref0 (_tmp8_);
 #line 4601 "Tag.c"
 	}
-	goto __finally472;
-	__catch472_database_error:
+	goto __finally473;
+	__catch473_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp15_ = NULL;
+		GError* _tmp15_;
 #line 562 "/home/jens/Source/shotwell/src/Tag.vala"
 		err = _inner_error_;
 #line 562 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4616,7 +4616,7 @@ Tag* tag_for_path (const gchar* name) {
 		_g_error_free0 (err);
 #line 4618 "Tag.c"
 	}
-	__finally472:
+	__finally473:
 #line 562 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 562 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4646,9 +4646,9 @@ Tag* tag_for_path (const gchar* name) {
 GeeCollection* tag_get_terminal_tags (GeeCollection* tags) {
 	GeeCollection* result = NULL;
 	GeeSet* result_paths = NULL;
-	GeeHashSet* _tmp0_ = NULL;
+	GeeHashSet* _tmp0_;
 	GeeArrayList* _result_ = NULL;
-	GeeArrayList* _tmp38_ = NULL;
+	GeeArrayList* _tmp38_;
 #line 573 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (tags), NULL);
 #line 574 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4658,8 +4658,8 @@ GeeCollection* tag_get_terminal_tags (GeeCollection* tags) {
 #line 4659 "Tag.c"
 	{
 		GeeIterator* _tag_it = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 576 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp1_ = tags;
 #line 576 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4669,24 +4669,24 @@ GeeCollection* tag_get_terminal_tags (GeeCollection* tags) {
 #line 576 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 4672 "Tag.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			Tag* tag = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
-			Tag* _tmp7_ = NULL;
-			gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
-			gboolean _tmp10_ = FALSE;
-			gboolean _tmp11_ = FALSE;
-			Tag* _tmp16_ = NULL;
-			Tag* _tmp17_ = NULL;
-			Tag* _tmp18_ = NULL;
-			gboolean _tmp19_ = FALSE;
-			GeeSet* _tmp34_ = NULL;
-			Tag* _tmp35_ = NULL;
-			gchar* _tmp36_ = NULL;
-			gchar* _tmp37_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
+			Tag* _tmp7_;
+			gchar* _tmp8_;
+			gchar* _tmp9_;
+			gboolean _tmp10_;
+			gboolean _tmp11_;
+			Tag* _tmp16_;
+			Tag* _tmp17_;
+			Tag* _tmp18_;
+			gboolean _tmp19_;
+			GeeSet* _tmp34_;
+			Tag* _tmp35_;
+			gchar* _tmp36_;
+			gchar* _tmp37_;
 #line 576 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp3_ = _tag_it;
 #line 576 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4718,10 +4718,10 @@ GeeCollection* tag_get_terminal_tags (GeeCollection* tags) {
 #line 578 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp11_) {
 #line 4721 "Tag.c"
-				GeeSet* _tmp12_ = NULL;
-				Tag* _tmp13_ = NULL;
-				gchar* _tmp14_ = NULL;
-				gchar* _tmp15_ = NULL;
+				GeeSet* _tmp12_;
+				Tag* _tmp13_;
+				gchar* _tmp14_;
+				gchar* _tmp15_;
 #line 579 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp12_ = result_paths;
 #line 579 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4753,14 +4753,14 @@ GeeCollection* tag_get_terminal_tags (GeeCollection* tags) {
 #line 586 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp19_) {
 #line 4756 "Tag.c"
-				GeeSet* _tmp20_ = NULL;
-				Tag* _tmp21_ = NULL;
-				Tag* _tmp22_ = NULL;
-				Tag* _tmp23_ = NULL;
-				gchar* _tmp24_ = NULL;
-				gchar* _tmp25_ = NULL;
-				gboolean _tmp26_ = FALSE;
-				gboolean _tmp27_ = FALSE;
+				GeeSet* _tmp20_;
+				Tag* _tmp21_;
+				Tag* _tmp22_;
+				Tag* _tmp23_;
+				gchar* _tmp24_;
+				gchar* _tmp25_;
+				gboolean _tmp26_;
+				gboolean _tmp27_;
 #line 589 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp20_ = result_paths;
 #line 589 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4784,12 +4784,12 @@ GeeCollection* tag_get_terminal_tags (GeeCollection* tags) {
 #line 589 "/home/jens/Source/shotwell/src/Tag.vala"
 				if (_tmp27_) {
 #line 4787 "Tag.c"
-					GeeSet* _tmp28_ = NULL;
-					Tag* _tmp29_ = NULL;
-					Tag* _tmp30_ = NULL;
-					Tag* _tmp31_ = NULL;
-					gchar* _tmp32_ = NULL;
-					gchar* _tmp33_ = NULL;
+					GeeSet* _tmp28_;
+					Tag* _tmp29_;
+					Tag* _tmp30_;
+					Tag* _tmp31_;
+					gchar* _tmp32_;
+					gchar* _tmp33_;
 #line 590 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp28_ = result_paths;
 #line 590 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4838,8 +4838,8 @@ GeeCollection* tag_get_terminal_tags (GeeCollection* tags) {
 #line 4839 "Tag.c"
 	{
 		GeeIterator* _path_it = NULL;
-		GeeSet* _tmp39_ = NULL;
-		GeeIterator* _tmp40_ = NULL;
+		GeeSet* _tmp39_;
+		GeeIterator* _tmp40_;
 #line 597 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp39_ = result_paths;
 #line 597 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4849,14 +4849,14 @@ GeeCollection* tag_get_terminal_tags (GeeCollection* tags) {
 #line 597 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 4852 "Tag.c"
-			GeeIterator* _tmp41_ = NULL;
-			gboolean _tmp42_ = FALSE;
+			GeeIterator* _tmp41_;
+			gboolean _tmp42_;
 			gchar* path = NULL;
-			GeeIterator* _tmp43_ = NULL;
-			gpointer _tmp44_ = NULL;
-			TagSourceCollection* _tmp45_ = NULL;
-			const gchar* _tmp46_ = NULL;
-			gboolean _tmp47_ = FALSE;
+			GeeIterator* _tmp43_;
+			gpointer _tmp44_;
+			TagSourceCollection* _tmp45_;
+			const gchar* _tmp46_;
+			gboolean _tmp47_;
 #line 597 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp41_ = _path_it;
 #line 597 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4882,10 +4882,10 @@ GeeCollection* tag_get_terminal_tags (GeeCollection* tags) {
 #line 598 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp47_) {
 #line 4885 "Tag.c"
-				GeeArrayList* _tmp48_ = NULL;
-				const gchar* _tmp49_ = NULL;
-				Tag* _tmp50_ = NULL;
-				Tag* _tmp51_ = NULL;
+				GeeArrayList* _tmp48_;
+				const gchar* _tmp49_;
+				Tag* _tmp50_;
+				Tag* _tmp51_;
 #line 599 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp48_ = _result_;
 #line 599 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4902,8 +4902,8 @@ GeeCollection* tag_get_terminal_tags (GeeCollection* tags) {
 			} else {
 				{
 					GeeIterator* _probed_tag_it = NULL;
-					GeeCollection* _tmp52_ = NULL;
-					GeeIterator* _tmp53_ = NULL;
+					GeeCollection* _tmp52_;
+					GeeIterator* _tmp53_;
 #line 601 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp52_ = tags;
 #line 601 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4913,16 +4913,16 @@ GeeCollection* tag_get_terminal_tags (GeeCollection* tags) {
 #line 601 "/home/jens/Source/shotwell/src/Tag.vala"
 					while (TRUE) {
 #line 4916 "Tag.c"
-						GeeIterator* _tmp54_ = NULL;
-						gboolean _tmp55_ = FALSE;
+						GeeIterator* _tmp54_;
+						gboolean _tmp55_;
 						Tag* probed_tag = NULL;
-						GeeIterator* _tmp56_ = NULL;
-						gpointer _tmp57_ = NULL;
-						Tag* _tmp58_ = NULL;
-						gchar* _tmp59_ = NULL;
-						gchar* _tmp60_ = NULL;
-						const gchar* _tmp61_ = NULL;
-						gboolean _tmp62_ = FALSE;
+						GeeIterator* _tmp56_;
+						gpointer _tmp57_;
+						Tag* _tmp58_;
+						gchar* _tmp59_;
+						gchar* _tmp60_;
+						const gchar* _tmp61_;
+						gboolean _tmp62_;
 #line 601 "/home/jens/Source/shotwell/src/Tag.vala"
 						_tmp54_ = _probed_tag_it;
 #line 601 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4954,8 +4954,8 @@ GeeCollection* tag_get_terminal_tags (GeeCollection* tags) {
 #line 602 "/home/jens/Source/shotwell/src/Tag.vala"
 						if (_tmp62_) {
 #line 4957 "Tag.c"
-							GeeArrayList* _tmp63_ = NULL;
-							Tag* _tmp64_ = NULL;
+							GeeArrayList* _tmp63_;
+							Tag* _tmp64_;
 #line 603 "/home/jens/Source/shotwell/src/Tag.vala"
 							_tmp63_ = _result_;
 #line 603 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5003,13 +5003,13 @@ static gint _tag_compare_user_visible_names_gcompare_data_func (gconstpointer a,
 GeeList* tag_make_user_visible_tag_list (GeeCollection* tags) {
 	GeeList* result = NULL;
 	GeeHashSet* seen_tags = NULL;
-	GeeHashSet* _tmp0_ = NULL;
+	GeeHashSet* _tmp0_;
 	GeeCollection* terminal_tags = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp2_;
 	GeeArrayList* sorted_tags = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	GeeArrayList* _tmp19_ = NULL;
+	GeeArrayList* _tmp3_;
+	GeeArrayList* _tmp19_;
 #line 612 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (tags), NULL);
 #line 613 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5029,8 +5029,8 @@ GeeList* tag_make_user_visible_tag_list (GeeCollection* tags) {
 #line 5030 "Tag.c"
 	{
 		GeeIterator* _tag_it = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeCollection* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 616 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp4_ = terminal_tags;
 #line 616 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5040,17 +5040,17 @@ GeeList* tag_make_user_visible_tag_list (GeeCollection* tags) {
 #line 616 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 5043 "Tag.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			Tag* tag = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			gchar* user_visible_name = NULL;
-			Tag* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-			GeeHashSet* _tmp12_ = NULL;
-			const gchar* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
+			Tag* _tmp10_;
+			gchar* _tmp11_;
+			GeeHashSet* _tmp12_;
+			const gchar* _tmp13_;
+			gboolean _tmp14_;
 #line 616 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp6_ = _tag_it;
 #line 616 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5082,10 +5082,10 @@ GeeList* tag_make_user_visible_tag_list (GeeCollection* tags) {
 #line 618 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (!_tmp14_) {
 #line 5085 "Tag.c"
-				GeeArrayList* _tmp15_ = NULL;
-				Tag* _tmp16_ = NULL;
-				GeeHashSet* _tmp17_ = NULL;
-				const gchar* _tmp18_ = NULL;
+				GeeArrayList* _tmp15_;
+				Tag* _tmp16_;
+				GeeHashSet* _tmp17_;
+				const gchar* _tmp18_;
 #line 619 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp15_ = sorted_tags;
 #line 619 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5129,14 +5129,14 @@ GeeList* tag_make_user_visible_tag_list (GeeCollection* tags) {
 gchar* tag_make_tag_markup_string (GeeList* tags, gint highlight_index) {
 	gchar* result = NULL;
 	GString* builder = NULL;
-	GString* _tmp0_ = NULL;
+	GString* _tmp0_;
 	gint i = 0;
 	gboolean first = FALSE;
-	GString* _tmp27_ = NULL;
+	GString* _tmp27_;
 	gchar* built = NULL;
-	GString* _tmp28_ = NULL;
-	const gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
+	GString* _tmp28_;
+	const gchar* _tmp29_;
+	gchar* _tmp30_;
 #line 627 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (GEE_IS_LIST (tags), NULL);
 #line 628 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5150,12 +5150,12 @@ gchar* tag_make_tag_markup_string (GeeList* tags, gint highlight_index) {
 #line 5151 "Tag.c"
 	{
 		GeeList* _tag_list = NULL;
-		GeeList* _tmp1_ = NULL;
-		GeeList* _tmp2_ = NULL;
+		GeeList* _tmp1_;
+		GeeList* _tmp2_;
 		gint _tag_size = 0;
-		GeeList* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+		GeeList* _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
 		gint _tag_index = 0;
 #line 631 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp1_ = tags;
@@ -5176,27 +5176,27 @@ gchar* tag_make_tag_markup_string (GeeList* tags, gint highlight_index) {
 #line 631 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 5179 "Tag.c"
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
+			gint _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 			Tag* tag = NULL;
-			GeeList* _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			gpointer _tmp11_ = NULL;
+			GeeList* _tmp9_;
+			gint _tmp10_;
+			gpointer _tmp11_;
 			gchar* tag_name = NULL;
-			Tag* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
+			Tag* _tmp12_;
+			gchar* _tmp13_;
 			gchar* esc_tag_name = NULL;
-			const gchar* _tmp14_ = NULL;
-			gchar* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
-			gint _tmp18_ = 0;
-			gint _tmp19_ = 0;
-			GString* _tmp21_ = NULL;
-			const gchar* _tmp22_ = NULL;
-			gint _tmp23_ = 0;
-			gint _tmp24_ = 0;
-			gint _tmp26_ = 0;
+			const gchar* _tmp14_;
+			gchar* _tmp15_;
+			gboolean _tmp16_;
+			gint _tmp18_;
+			gint _tmp19_;
+			GString* _tmp21_;
+			const gchar* _tmp22_;
+			gint _tmp23_;
+			gint _tmp24_;
+			gint _tmp26_;
 #line 631 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp6_ = _tag_index;
 #line 631 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5239,7 +5239,7 @@ gchar* tag_make_tag_markup_string (GeeList* tags, gint highlight_index) {
 				first = FALSE;
 #line 5241 "Tag.c"
 			} else {
-				GString* _tmp17_ = NULL;
+				GString* _tmp17_;
 #line 637 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp17_ = builder;
 #line 637 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5253,7 +5253,7 @@ gchar* tag_make_tag_markup_string (GeeList* tags, gint highlight_index) {
 #line 638 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp18_ == _tmp19_) {
 #line 5256 "Tag.c"
-				GString* _tmp20_ = NULL;
+				GString* _tmp20_;
 #line 639 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp20_ = builder;
 #line 639 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5273,7 +5273,7 @@ gchar* tag_make_tag_markup_string (GeeList* tags, gint highlight_index) {
 #line 641 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp23_ == _tmp24_) {
 #line 5276 "Tag.c"
-				GString* _tmp25_ = NULL;
+				GString* _tmp25_;
 #line 642 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp25_ = builder;
 #line 642 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5320,8 +5320,8 @@ gchar* tag_make_tag_markup_string (GeeList* tags, gint highlight_index) {
 
 gchar* tag_prep_tag_name (const gchar* name) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 653 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 654 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5336,7 +5336,7 @@ gchar* tag_prep_tag_name (const gchar* name) {
 }
 
 
-static void _vala_array_add127 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add127 (gchar** * array, int* length, int* size, gchar* value) {
 #line 665 "/home/jens/Source/shotwell/src/Tag.vala"
 	if ((*length) == (*size)) {
 #line 665 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5356,11 +5356,11 @@ static void _vala_array_add127 (gchar*** array, int* length, int* size, gchar* v
 gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length1) {
 	gchar** result = NULL;
 	gchar** _result_ = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	gchar** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
+	gchar** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	gchar** _tmp13_;
+	gint _tmp13__length1;
 #line 660 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp0_ = g_new0 (gchar*, 0 + 1);
 #line 660 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5382,20 +5382,20 @@ gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length
 #line 662 "/home/jens/Source/shotwell/src/Tag.vala"
 			while (TRUE) {
 #line 5385 "Tag.c"
-				gint _tmp3_ = 0;
-				gchar** _tmp4_ = NULL;
-				gint _tmp4__length1 = 0;
+				gint _tmp3_;
+				gchar** _tmp4_;
+				gint _tmp4__length1;
 				gchar* new_name = NULL;
-				gchar** _tmp5_ = NULL;
-				gint _tmp5__length1 = 0;
-				gint _tmp6_ = 0;
-				const gchar* _tmp7_ = NULL;
-				gchar* _tmp8_ = NULL;
-				const gchar* _tmp9_ = NULL;
+				gchar** _tmp5_;
+				gint _tmp5__length1;
+				gint _tmp6_;
+				const gchar* _tmp7_;
+				gchar* _tmp8_;
+				const gchar* _tmp9_;
 #line 662 "/home/jens/Source/shotwell/src/Tag.vala"
 				if (!_tmp1_) {
 #line 5398 "Tag.c"
-					gint _tmp2_ = 0;
+					gint _tmp2_;
 #line 662 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp2_ = ctr;
 #line 662 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5433,10 +5433,10 @@ gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length
 #line 664 "/home/jens/Source/shotwell/src/Tag.vala"
 				if (_tmp9_ != NULL) {
 #line 5436 "Tag.c"
-					gchar** _tmp10_ = NULL;
-					gint _tmp10__length1 = 0;
-					const gchar* _tmp11_ = NULL;
-					gchar* _tmp12_ = NULL;
+					gchar** _tmp10_;
+					gint _tmp10__length1;
+					const gchar* _tmp11_;
+					gchar* _tmp12_;
 #line 665 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp10_ = _result_;
 #line 665 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5475,16 +5475,16 @@ gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length
 
 static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
 	gchar* prepped_name = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	TagRow* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	Alteration* _tmp14_ = NULL;
-	Alteration* _tmp15_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gboolean _tmp4_;
+	TagRow* _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
+	Alteration* _tmp14_;
+	Alteration* _tmp15_;
 	GError * _inner_error_ = NULL;
 #line 671 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_if_fail (IS_TAG (self));
@@ -5508,11 +5508,11 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
 	_vala_assert (!_tmp4_, "!prepped_name.has_prefix(Tag.PATH_SEPARATOR_STRING)");
 #line 5510 "Tag.c"
 	{
-		TagTable* _tmp5_ = NULL;
-		TagTable* _tmp6_ = NULL;
-		TagRow* _tmp7_ = NULL;
-		TagID _tmp8_ = {0};
-		const gchar* _tmp9_ = NULL;
+		TagTable* _tmp5_;
+		TagTable* _tmp6_;
+		TagRow* _tmp7_;
+		TagID _tmp8_;
+		const gchar* _tmp9_;
 #line 678 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp5_ = tag_table_get_instance ();
 #line 678 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5532,7 +5532,7 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
 #line 678 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5535 "Tag.c"
-				goto __catch473_database_error;
+				goto __catch474_database_error;
 			}
 #line 678 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_free0 (prepped_name);
@@ -5545,11 +5545,11 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
 #line 5546 "Tag.c"
 		}
 	}
-	goto __finally473;
-	__catch473_database_error:
+	goto __finally474;
+	__catch474_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp10_ = NULL;
+		GError* _tmp10_;
 #line 677 "/home/jens/Source/shotwell/src/Tag.vala"
 		err = _inner_error_;
 #line 677 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5566,7 +5566,7 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
 		return;
 #line 5568 "Tag.c"
 	}
-	__finally473:
+	__finally474:
 #line 677 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 677 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5611,18 +5611,18 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
 
 static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_notify) {
 	gchar* prepped_path = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	TagSourceCollection* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	TagRow* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gboolean _tmp17_ = FALSE;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gboolean _tmp4_;
+	TagSourceCollection* _tmp5_;
+	const gchar* _tmp6_;
+	gboolean _tmp7_;
+	TagRow* _tmp14_;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
+	gboolean _tmp17_;
 	GError * _inner_error_ = NULL;
 #line 692 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_if_fail (IS_TAG (self));
@@ -5654,11 +5654,11 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no
 	_vala_assert (!_tmp7_, "!Tag.global.exists(prepped_path)");
 #line 5656 "Tag.c"
 	{
-		TagTable* _tmp8_ = NULL;
-		TagTable* _tmp9_ = NULL;
-		TagRow* _tmp10_ = NULL;
-		TagID _tmp11_ = {0};
-		const gchar* _tmp12_ = NULL;
+		TagTable* _tmp8_;
+		TagTable* _tmp9_;
+		TagRow* _tmp10_;
+		TagID _tmp11_;
+		const gchar* _tmp12_;
 #line 700 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp8_ = tag_table_get_instance ();
 #line 700 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5678,7 +5678,7 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no
 #line 700 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5681 "Tag.c"
-				goto __catch474_database_error;
+				goto __catch475_database_error;
 			}
 #line 700 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_free0 (prepped_path);
@@ -5691,11 +5691,11 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no
 #line 5692 "Tag.c"
 		}
 	}
-	goto __finally474;
-	__catch474_database_error:
+	goto __finally475;
+	__catch475_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp13_ = NULL;
+		GError* _tmp13_;
 #line 699 "/home/jens/Source/shotwell/src/Tag.vala"
 		err = _inner_error_;
 #line 699 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5712,7 +5712,7 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no
 		return;
 #line 5714 "Tag.c"
 	}
-	__finally474:
+	__finally475:
 #line 699 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 699 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5744,8 +5744,8 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no
 #line 709 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (!_tmp17_) {
 #line 5747 "Tag.c"
-		Alteration* _tmp18_ = NULL;
-		Alteration* _tmp19_ = NULL;
+		Alteration* _tmp18_;
+		Alteration* _tmp19_;
 #line 710 "/home/jens/Source/shotwell/src/Tag.vala"
 		tag_update_indexable_keywords (self);
 #line 711 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5767,7 +5767,7 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no
 static gchar* tag_real_get_typename (DataSource* base) {
 	Tag * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 715 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag);
 #line 716 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5784,7 +5784,7 @@ static gint64 tag_real_get_instance_id (DataSource* base) {
 	Tag * self;
 	gint64 result = 0LL;
 	TagID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	gint64 _tmp1_;
 #line 719 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag);
 #line 720 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5802,9 +5802,9 @@ static gint64 tag_real_get_instance_id (DataSource* base) {
 static gchar* tag_real_get_name (DataObject* base) {
 	Tag * self;
 	gchar* result = NULL;
-	TagRow* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	TagRow* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 723 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag);
 #line 724 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5823,7 +5823,7 @@ static gchar* tag_real_get_name (DataObject* base) {
 
 gchar* tag_get_path (Tag* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 727 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (self), NULL);
 #line 728 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5838,10 +5838,10 @@ gchar* tag_get_path (Tag* self) {
 
 gchar* tag_get_user_visible_name (Tag* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 731 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (self), NULL);
 #line 732 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5865,13 +5865,13 @@ gchar* tag_get_user_visible_name (Tag* self) {
 gchar* tag_get_searchable_name (Tag* self) {
 	gchar* result = NULL;
 	gchar* istring = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 735 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (self), NULL);
 #line 736 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5905,10 +5905,10 @@ gchar* tag_get_searchable_name (Tag* self) {
 
 
 void tag_flatten (Tag* self) {
-	Tag* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	Tag* _tmp0_;
+	Tag* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 740 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_if_fail (IS_TAG (self));
 #line 741 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5932,14 +5932,14 @@ void tag_flatten (Tag* self) {
 
 
 void tag_promote (Tag* self) {
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
 #line 746 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_if_fail (IS_TAG (self));
 #line 747 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5978,26 +5978,26 @@ void tag_promote (Tag* self) {
 
 Tag* tag_get_hierarchical_parent (Tag* self) {
 	Tag* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 	GeeList* components = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
-	GeeList* _tmp7_ = NULL;
-	GeeList* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	GeeList* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	GeeList* _tmp6_;
+	GeeList* _tmp7_;
+	GeeList* _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	GeeList* _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
 	gchar* parent_path = NULL;
-	gchar* _tmp14_ = NULL;
-	TagSourceCollection* _tmp29_ = NULL;
-	const gchar* _tmp30_ = NULL;
-	gboolean _tmp31_ = FALSE;
+	gchar* _tmp14_;
+	TagSourceCollection* _tmp29_;
+	const gchar* _tmp30_;
+	gboolean _tmp31_;
 #line 753 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (self), NULL);
 #line 755 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6071,22 +6071,22 @@ Tag* tag_get_hierarchical_parent (Tag* self) {
 #line 768 "/home/jens/Source/shotwell/src/Tag.vala"
 			while (TRUE) {
 #line 6074 "Tag.c"
-				gint _tmp17_ = 0;
-				GeeList* _tmp18_ = NULL;
-				gint _tmp19_ = 0;
-				gint _tmp20_ = 0;
-				const gchar* _tmp21_ = NULL;
-				GeeList* _tmp22_ = NULL;
-				gint _tmp23_ = 0;
-				gpointer _tmp24_ = NULL;
-				gchar* _tmp25_ = NULL;
-				gchar* _tmp26_ = NULL;
-				gchar* _tmp27_ = NULL;
-				gchar* _tmp28_ = NULL;
+				gint _tmp17_;
+				GeeList* _tmp18_;
+				gint _tmp19_;
+				gint _tmp20_;
+				const gchar* _tmp21_;
+				GeeList* _tmp22_;
+				gint _tmp23_;
+				gpointer _tmp24_;
+				gchar* _tmp25_;
+				gchar* _tmp26_;
+				gchar* _tmp27_;
+				gchar* _tmp28_;
 #line 768 "/home/jens/Source/shotwell/src/Tag.vala"
 				if (!_tmp15_) {
 #line 6089 "Tag.c"
-					gint _tmp16_ = 0;
+					gint _tmp16_;
 #line 768 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp16_ = i;
 #line 768 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6146,8 +6146,8 @@ Tag* tag_get_hierarchical_parent (Tag* self) {
 #line 771 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (_tmp31_) {
 #line 6149 "Tag.c"
-		const gchar* _tmp32_ = NULL;
-		Tag* _tmp33_ = NULL;
+		const gchar* _tmp32_;
+		Tag* _tmp33_;
 #line 772 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp32_ = parent_path;
 #line 772 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6182,8 +6182,8 @@ Tag* tag_get_hierarchical_parent (Tag* self) {
 
 gint tag_get_attachment_count (Tag* self, MediaSource* source) {
 	gint result = 0;
-	MediaSource* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	MediaSource* _tmp0_;
+	gboolean _tmp1_;
 	gint _result_ = 0;
 #line 777 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (self), 0);
@@ -6206,11 +6206,11 @@ gint tag_get_attachment_count (Tag* self, MediaSource* source) {
 #line 6207 "Tag.c"
 	{
 		GeeList* _child_list = NULL;
-		GeeList* _tmp2_ = NULL;
+		GeeList* _tmp2_;
 		gint _child_size = 0;
-		GeeList* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+		GeeList* _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
 		gint _child_index = 0;
 #line 786 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp2_ = tag_get_hierarchical_children (self);
@@ -6229,16 +6229,16 @@ gint tag_get_attachment_count (Tag* self, MediaSource* source) {
 #line 786 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 6232 "Tag.c"
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
+			gint _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 			Tag* child = NULL;
-			GeeList* _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			gpointer _tmp11_ = NULL;
-			Tag* _tmp12_ = NULL;
-			MediaSource* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
+			GeeList* _tmp9_;
+			gint _tmp10_;
+			gpointer _tmp11_;
+			Tag* _tmp12_;
+			MediaSource* _tmp13_;
+			gboolean _tmp14_;
 #line 786 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp6_ = _child_index;
 #line 786 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6270,7 +6270,7 @@ gint tag_get_attachment_count (Tag* self, MediaSource* source) {
 #line 787 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp14_) {
 #line 6273 "Tag.c"
-				gint _tmp15_ = 0;
+				gint _tmp15_;
 #line 788 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp15_ = _result_;
 #line 788 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6300,20 +6300,20 @@ gint tag_get_attachment_count (Tag* self, MediaSource* source) {
 GeeList* tag_get_hierarchical_children (Tag* self) {
 	GeeList* result = NULL;
 	GeeArrayList* _result_ = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 	GeeArrayList* result_reversed = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	GeeArrayList* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
 	GeeTreeSet* forward_sorted_paths = NULL;
-	GeeTreeSet* _tmp6_ = NULL;
+	GeeTreeSet* _tmp6_;
 	gchar* target_path = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
 #line 797 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (self), NULL);
 #line 798 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6363,11 +6363,11 @@ GeeList* tag_get_hierarchical_children (Tag* self) {
 #line 6364 "Tag.c"
 	{
 		GeeIterator* _path_it = NULL;
-		TagSourceCollection* _tmp11_ = NULL;
-		GeeCollection* _tmp12_ = NULL;
-		GeeCollection* _tmp13_ = NULL;
-		GeeIterator* _tmp14_ = NULL;
-		GeeIterator* _tmp15_ = NULL;
+		TagSourceCollection* _tmp11_;
+		GeeCollection* _tmp12_;
+		GeeCollection* _tmp13_;
+		GeeIterator* _tmp14_;
+		GeeIterator* _tmp15_;
 #line 810 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp11_ = tag_global;
 #line 810 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6385,14 +6385,14 @@ GeeList* tag_get_hierarchical_children (Tag* self) {
 #line 810 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 6388 "Tag.c"
-			GeeIterator* _tmp16_ = NULL;
-			gboolean _tmp17_ = FALSE;
+			GeeIterator* _tmp16_;
+			gboolean _tmp17_;
 			gchar* path = NULL;
-			GeeIterator* _tmp18_ = NULL;
-			gpointer _tmp19_ = NULL;
-			const gchar* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
-			gboolean _tmp22_ = FALSE;
+			GeeIterator* _tmp18_;
+			gpointer _tmp19_;
+			const gchar* _tmp20_;
+			const gchar* _tmp21_;
+			gboolean _tmp22_;
 #line 810 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp16_ = _path_it;
 #line 810 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6418,8 +6418,8 @@ GeeList* tag_get_hierarchical_children (Tag* self) {
 #line 811 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp22_) {
 #line 6421 "Tag.c"
-				GeeTreeSet* _tmp23_ = NULL;
-				const gchar* _tmp24_ = NULL;
+				GeeTreeSet* _tmp23_;
+				const gchar* _tmp24_;
 #line 812 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp23_ = forward_sorted_paths;
 #line 812 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6438,8 +6438,8 @@ GeeList* tag_get_hierarchical_children (Tag* self) {
 	}
 	{
 		GeeIterator* _tmp_it = NULL;
-		GeeTreeSet* _tmp25_ = NULL;
-		GeeIterator* _tmp26_ = NULL;
+		GeeTreeSet* _tmp25_;
+		GeeIterator* _tmp26_;
 #line 815 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp25_ = forward_sorted_paths;
 #line 815 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6449,15 +6449,15 @@ GeeList* tag_get_hierarchical_children (Tag* self) {
 #line 815 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
 #line 6452 "Tag.c"
-			GeeIterator* _tmp27_ = NULL;
-			gboolean _tmp28_ = FALSE;
+			GeeIterator* _tmp27_;
+			gboolean _tmp28_;
 			gchar* tmp = NULL;
-			GeeIterator* _tmp29_ = NULL;
-			gpointer _tmp30_ = NULL;
-			GeeArrayList* _tmp31_ = NULL;
-			const gchar* _tmp32_ = NULL;
-			Tag* _tmp33_ = NULL;
-			Tag* _tmp34_ = NULL;
+			GeeIterator* _tmp29_;
+			gpointer _tmp30_;
+			GeeArrayList* _tmp31_;
+			const gchar* _tmp32_;
+			Tag* _tmp33_;
+			Tag* _tmp34_;
 #line 815 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp27_ = _tmp_it;
 #line 815 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6496,9 +6496,9 @@ GeeList* tag_get_hierarchical_children (Tag* self) {
 	}
 	{
 		gint index = 0;
-		GeeArrayList* _tmp35_ = NULL;
-		gint _tmp36_ = 0;
-		gint _tmp37_ = 0;
+		GeeArrayList* _tmp35_;
+		gint _tmp36_;
+		gint _tmp37_;
 #line 819 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp35_ = result_reversed;
 #line 819 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6515,16 +6515,16 @@ GeeList* tag_get_hierarchical_children (Tag* self) {
 #line 819 "/home/jens/Source/shotwell/src/Tag.vala"
 			while (TRUE) {
 #line 6518 "Tag.c"
-				gint _tmp40_ = 0;
-				GeeArrayList* _tmp41_ = NULL;
-				GeeArrayList* _tmp42_ = NULL;
-				gint _tmp43_ = 0;
-				gpointer _tmp44_ = NULL;
-				Tag* _tmp45_ = NULL;
+				gint _tmp40_;
+				GeeArrayList* _tmp41_;
+				GeeArrayList* _tmp42_;
+				gint _tmp43_;
+				gpointer _tmp44_;
+				Tag* _tmp45_;
 #line 819 "/home/jens/Source/shotwell/src/Tag.vala"
 				if (!_tmp38_) {
 #line 6527 "Tag.c"
-					gint _tmp39_ = 0;
+					gint _tmp39_;
 #line 819 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp39_ = index;
 #line 819 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6576,156 +6576,153 @@ GeeList* tag_get_hierarchical_children (Tag* self) {
 static gchar* tag_get_next_untitled_tag_name (const gchar* _prefix) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp1_;
 	gchar* prefix = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp3_;
 	gchar* candidate_name = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	gchar* _tmp4_;
 	guint64 counter = 0ULL;
 #line 829 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp1_ = _prefix;
 #line 829 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (_tmp1_ != NULL) {
-#line 6591 "Tag.c"
-		const gchar* _tmp2_ = NULL;
+#line 6590 "Tag.c"
+		const gchar* _tmp2_;
 #line 829 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp2_ = _prefix;
 #line 829 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp0_ = _tmp2_;
-#line 6597 "Tag.c"
+#line 6596 "Tag.c"
 	} else {
 #line 829 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp0_ = "";
-#line 6601 "Tag.c"
+#line 6600 "Tag.c"
 	}
 #line 829 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp3_ = g_strdup (_tmp0_);
 #line 829 "/home/jens/Source/shotwell/src/Tag.vala"
 	prefix = _tmp3_;
 #line 830 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp4_ = _ ("untitled");
-#line 830 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp5_ = g_strdup (_tmp4_);
+	_tmp4_ = g_strdup (_ ("untitled"));
 #line 830 "/home/jens/Source/shotwell/src/Tag.vala"
-	candidate_name = _tmp5_;
+	candidate_name = _tmp4_;
 #line 831 "/home/jens/Source/shotwell/src/Tag.vala"
 	counter = (guint64) 0;
-#line 6615 "Tag.c"
+#line 6612 "Tag.c"
 	{
-		gboolean _tmp6_ = FALSE;
+		gboolean _tmp5_ = FALSE;
 #line 832 "/home/jens/Source/shotwell/src/Tag.vala"
-		_tmp6_ = TRUE;
+		_tmp5_ = TRUE;
 #line 832 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
-#line 6622 "Tag.c"
-			gchar* _tmp8_ = NULL;
-			guint64 _tmp9_ = 0ULL;
+#line 6619 "Tag.c"
+			gchar* _tmp7_ = NULL;
+			guint64 _tmp8_;
 			gchar* path_candidate = NULL;
-			const gchar* _tmp15_ = NULL;
-			const gchar* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
-			gchar* _tmp20_ = NULL;
-			TagSourceCollection* _tmp21_ = NULL;
-			const gchar* _tmp22_ = NULL;
-			gboolean _tmp23_ = FALSE;
-			guint64 _tmp24_ = 0ULL;
+			const gchar* _tmp14_;
+			const gchar* _tmp15_;
+			gchar* _tmp16_;
+			gchar* _tmp17_;
+			gchar* _tmp18_;
+			gchar* _tmp19_;
+			TagSourceCollection* _tmp20_;
+			const gchar* _tmp21_;
+			gboolean _tmp22_;
+			guint64 _tmp23_;
 #line 832 "/home/jens/Source/shotwell/src/Tag.vala"
-			if (!_tmp6_) {
-#line 6638 "Tag.c"
-				guint64 _tmp7_ = 0ULL;
+			if (!_tmp5_) {
+#line 6635 "Tag.c"
+				guint64 _tmp6_;
 #line 840 "/home/jens/Source/shotwell/src/Tag.vala"
-				_tmp7_ = counter;
+				_tmp6_ = counter;
 #line 840 "/home/jens/Source/shotwell/src/Tag.vala"
-				if (!(_tmp7_ < G_MAXUINT64)) {
+				if (!(_tmp6_ < G_MAXUINT64)) {
 #line 840 "/home/jens/Source/shotwell/src/Tag.vala"
 					break;
-#line 6646 "Tag.c"
+#line 6643 "Tag.c"
 				}
 			}
 #line 832 "/home/jens/Source/shotwell/src/Tag.vala"
-			_tmp6_ = FALSE;
+			_tmp5_ = FALSE;
 #line 834 "/home/jens/Source/shotwell/src/Tag.vala"
-			_tmp9_ = counter;
+			_tmp8_ = counter;
 #line 834 "/home/jens/Source/shotwell/src/Tag.vala"
-			if (_tmp9_ == ((guint64) 0)) {
-#line 6655 "Tag.c"
-				gchar* _tmp10_ = NULL;
+			if (_tmp8_ == ((guint64) 0)) {
+#line 6652 "Tag.c"
+				gchar* _tmp9_;
 #line 834 "/home/jens/Source/shotwell/src/Tag.vala"
-				_tmp10_ = g_strdup ("");
+				_tmp9_ = g_strdup ("");
 #line 834 "/home/jens/Source/shotwell/src/Tag.vala"
-				_g_free0 (_tmp8_);
+				_g_free0 (_tmp7_);
 #line 834 "/home/jens/Source/shotwell/src/Tag.vala"
-				_tmp8_ = _tmp10_;
-#line 6663 "Tag.c"
+				_tmp7_ = _tmp9_;
+#line 6660 "Tag.c"
 			} else {
-				guint64 _tmp11_ = 0ULL;
-				gchar* _tmp12_ = NULL;
-				gchar* _tmp13_ = NULL;
-				gchar* _tmp14_ = NULL;
+				guint64 _tmp10_;
+				gchar* _tmp11_;
+				gchar* _tmp12_;
+				gchar* _tmp13_;
 #line 834 "/home/jens/Source/shotwell/src/Tag.vala"
-				_tmp11_ = counter;
+				_tmp10_ = counter;
 #line 834 "/home/jens/Source/shotwell/src/Tag.vala"
-				_tmp12_ = g_strdup_printf ("%" G_GUINT64_FORMAT, _tmp11_);
+				_tmp11_ = g_strdup_printf ("%" G_GUINT64_FORMAT, _tmp10_);
 #line 834 "/home/jens/Source/shotwell/src/Tag.vala"
-				_tmp13_ = _tmp12_;
+				_tmp12_ = _tmp11_;
 #line 834 "/home/jens/Source/shotwell/src/Tag.vala"
-				_tmp14_ = g_strconcat (" ", _tmp13_, NULL);
+				_tmp13_ = g_strconcat (" ", _tmp12_, NULL);
 #line 834 "/home/jens/Source/shotwell/src/Tag.vala"
-				_g_free0 (_tmp8_);
+				_g_free0 (_tmp7_);
 #line 834 "/home/jens/Source/shotwell/src/Tag.vala"
-				_tmp8_ = _tmp14_;
+				_tmp7_ = _tmp13_;
 #line 834 "/home/jens/Source/shotwell/src/Tag.vala"
-				_g_free0 (_tmp13_);
-#line 6683 "Tag.c"
+				_g_free0 (_tmp12_);
+#line 6680 "Tag.c"
 			}
 #line 833 "/home/jens/Source/shotwell/src/Tag.vala"
-			_tmp15_ = prefix;
+			_tmp14_ = prefix;
 #line 833 "/home/jens/Source/shotwell/src/Tag.vala"
-			_tmp16_ = candidate_name;
+			_tmp15_ = candidate_name;
 #line 833 "/home/jens/Source/shotwell/src/Tag.vala"
-			_tmp17_ = g_strconcat (_tmp15_, _tmp16_, NULL);
+			_tmp16_ = g_strconcat (_tmp14_, _tmp15_, NULL);
 #line 833 "/home/jens/Source/shotwell/src/Tag.vala"
-			_tmp18_ = _tmp17_;
+			_tmp17_ = _tmp16_;
 #line 833 "/home/jens/Source/shotwell/src/Tag.vala"
-			_tmp19_ = g_strconcat (_tmp18_, _tmp8_, NULL);
+			_tmp18_ = g_strconcat (_tmp17_, _tmp7_, NULL);
 #line 833 "/home/jens/Source/shotwell/src/Tag.vala"
-			_tmp20_ = _tmp19_;
+			_tmp19_ = _tmp18_;
 #line 833 "/home/jens/Source/shotwell/src/Tag.vala"
-			_g_free0 (_tmp18_);
+			_g_free0 (_tmp17_);
 #line 833 "/home/jens/Source/shotwell/src/Tag.vala"
-			path_candidate = _tmp20_;
+			path_candidate = _tmp19_;
 #line 836 "/home/jens/Source/shotwell/src/Tag.vala"
-			_tmp21_ = tag_global;
+			_tmp20_ = tag_global;
 #line 836 "/home/jens/Source/shotwell/src/Tag.vala"
-			_tmp22_ = path_candidate;
+			_tmp21_ = path_candidate;
 #line 836 "/home/jens/Source/shotwell/src/Tag.vala"
-			_tmp23_ = tag_source_collection_exists (_tmp21_, _tmp22_, FALSE);
+			_tmp22_ = tag_source_collection_exists (_tmp20_, _tmp21_, FALSE);
 #line 836 "/home/jens/Source/shotwell/src/Tag.vala"
-			if (!_tmp23_) {
+			if (!_tmp22_) {
 #line 837 "/home/jens/Source/shotwell/src/Tag.vala"
 				result = path_candidate;
 #line 837 "/home/jens/Source/shotwell/src/Tag.vala"
-				_g_free0 (_tmp8_);
+				_g_free0 (_tmp7_);
 #line 837 "/home/jens/Source/shotwell/src/Tag.vala"
 				_g_free0 (candidate_name);
 #line 837 "/home/jens/Source/shotwell/src/Tag.vala"
 				_g_free0 (prefix);
 #line 837 "/home/jens/Source/shotwell/src/Tag.vala"
 				return result;
-#line 6719 "Tag.c"
+#line 6716 "Tag.c"
 			}
 #line 839 "/home/jens/Source/shotwell/src/Tag.vala"
-			_tmp24_ = counter;
+			_tmp23_ = counter;
 #line 839 "/home/jens/Source/shotwell/src/Tag.vala"
-			counter = _tmp24_ + 1;
+			counter = _tmp23_ + 1;
 #line 832 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_free0 (path_candidate);
 #line 832 "/home/jens/Source/shotwell/src/Tag.vala"
-			_g_free0 (_tmp8_);
-#line 6729 "Tag.c"
+			_g_free0 (_tmp7_);
+#line 6726 "Tag.c"
 		}
 	}
 #line 843 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6734,23 +6731,23 @@ static gchar* tag_get_next_untitled_tag_name (const gchar* _prefix) {
 	_g_free0 (candidate_name);
 #line 828 "/home/jens/Source/shotwell/src/Tag.vala"
 	_g_free0 (prefix);
-#line 6738 "Tag.c"
+#line 6735 "Tag.c"
 }
 
 
 Tag* tag_create_new_child (Tag* self) {
 	Tag* result = NULL;
 	gchar* path_prefix = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	Tag* _tmp13_ = NULL;
-	Tag* _tmp14_ = NULL;
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
+	const gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	Tag* _tmp13_;
+	Tag* _tmp14_;
 #line 846 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (self), NULL);
 #line 847 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6763,12 +6760,12 @@ Tag* tag_create_new_child (Tag* self) {
 	_tmp2_ = g_str_has_prefix (_tmp1_, TAG_PATH_SEPARATOR_STRING);
 #line 849 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (!_tmp2_) {
-#line 6767 "Tag.c"
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 6764 "Tag.c"
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 850 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp3_ = tag_get_path (self);
 #line 850 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6789,7 +6786,7 @@ Tag* tag_create_new_child (Tag* self) {
 		_g_free0 (path_prefix);
 #line 852 "/home/jens/Source/shotwell/src/Tag.vala"
 		path_prefix = _tmp7_;
-#line 6793 "Tag.c"
+#line 6790 "Tag.c"
 	}
 #line 855 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp8_ = path_prefix;
@@ -6815,16 +6812,16 @@ Tag* tag_create_new_child (Tag* self) {
 	_g_free0 (path_prefix);
 #line 855 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 6819 "Tag.c"
+#line 6816 "Tag.c"
 }
 
 
 Tag* tag_create_new_root (void) {
 	Tag* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	Tag* _tmp2_ = NULL;
-	Tag* _tmp3_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	Tag* _tmp2_;
+	Tag* _tmp3_;
 #line 859 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp0_ = tag_get_next_untitled_tag_name (NULL);
 #line 859 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6839,25 +6836,25 @@ Tag* tag_create_new_root (void) {
 	result = _tmp3_;
 #line 859 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 6843 "Tag.c"
+#line 6840 "Tag.c"
 }
 
 
 gchar* tag_get_name_collation_key (Tag* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 862 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (self), NULL);
 #line 863 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp0_ = self->priv->name_collation_key;
 #line 863 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (_tmp0_ == NULL) {
-#line 6858 "Tag.c"
-		TagRow* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+#line 6855 "Tag.c"
+		TagRow* _tmp1_;
+		const gchar* _tmp2_;
+		gchar* _tmp3_;
 #line 864 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp1_ = self->priv->row;
 #line 864 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6868,7 +6865,7 @@ gchar* tag_get_name_collation_key (Tag* self) {
 		_g_free0 (self->priv->name_collation_key);
 #line 864 "/home/jens/Source/shotwell/src/Tag.vala"
 		self->priv->name_collation_key = _tmp3_;
-#line 6872 "Tag.c"
+#line 6869 "Tag.c"
 	}
 #line 866 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp4_ = self->priv->name_collation_key;
@@ -6878,18 +6875,18 @@ gchar* tag_get_name_collation_key (Tag* self) {
 	result = _tmp5_;
 #line 866 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 6882 "Tag.c"
+#line 6879 "Tag.c"
 }
 
 
 static gchar* tag_real_to_string (DataObject* base) {
 	Tag * self;
 	gchar* result = NULL;
-	TagRow* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gchar* _tmp4_ = NULL;
+	TagRow* _tmp0_;
+	const gchar* _tmp1_;
+	ViewCollection* _tmp2_;
+	gint _tmp3_;
+	gchar* _tmp4_;
 #line 869 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag);
 #line 870 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6906,7 +6903,7 @@ static gchar* tag_real_to_string (DataObject* base) {
 	result = _tmp4_;
 #line 870 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 6910 "Tag.c"
+#line 6907 "Tag.c"
 }
 
 
@@ -6914,11 +6911,11 @@ static gboolean tag_real_equals (DataSource* base, DataSource* source) {
 	Tag * self;
 	gboolean result = FALSE;
 	Tag* tag = NULL;
-	DataSource* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
-	Tag* _tmp2_ = NULL;
-	DataSource* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	DataSource* _tmp0_;
+	Tag* _tmp1_;
+	Tag* _tmp2_;
+	DataSource* _tmp11_;
+	gboolean _tmp12_;
 #line 873 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag);
 #line 873 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6933,20 +6930,20 @@ static gboolean tag_real_equals (DataSource* base, DataSource* source) {
 	_tmp2_ = tag;
 #line 876 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (_tmp2_ != NULL) {
-#line 6937 "Tag.c"
-		Tag* _tmp3_ = NULL;
+#line 6934 "Tag.c"
+		Tag* _tmp3_;
 #line 877 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp3_ = tag;
 #line 877 "/home/jens/Source/shotwell/src/Tag.vala"
 		if (_tmp3_ != self) {
-#line 6943 "Tag.c"
-			Tag* _tmp4_ = NULL;
-			TagRow* _tmp5_ = NULL;
-			TagID _tmp6_ = {0};
-			gint64 _tmp7_ = 0LL;
-			TagRow* _tmp8_ = NULL;
-			TagID _tmp9_ = {0};
-			gint64 _tmp10_ = 0LL;
+#line 6940 "Tag.c"
+			Tag* _tmp4_;
+			TagRow* _tmp5_;
+			TagID _tmp6_;
+			gint64 _tmp7_;
+			TagRow* _tmp8_;
+			TagID _tmp9_;
+			gint64 _tmp10_;
 #line 878 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp4_ = tag;
 #line 878 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6963,7 +6960,7 @@ static gboolean tag_real_equals (DataSource* base, DataSource* source) {
 			_tmp10_ = _tmp9_.id;
 #line 878 "/home/jens/Source/shotwell/src/Tag.vala"
 			_vala_assert (_tmp7_ != _tmp10_, "tag.row.tag_id.id != row.tag_id.id");
-#line 6967 "Tag.c"
+#line 6964 "Tag.c"
 		}
 	}
 #line 882 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6976,13 +6973,13 @@ static gboolean tag_real_equals (DataSource* base, DataSource* source) {
 	_g_object_unref0 (tag);
 #line 882 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 6980 "Tag.c"
+#line 6977 "Tag.c"
 }
 
 
 void tag_get_tag_id (Tag* self, TagID* result) {
-	TagRow* _tmp0_ = NULL;
-	TagID _tmp1_ = {0};
+	TagRow* _tmp0_;
+	TagID _tmp1_;
 #line 885 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_if_fail (IS_TAG (self));
 #line 886 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6993,14 +6990,14 @@ void tag_get_tag_id (Tag* self, TagID* result) {
 	*result = _tmp1_;
 #line 886 "/home/jens/Source/shotwell/src/Tag.vala"
 	return;
-#line 6997 "Tag.c"
+#line 6994 "Tag.c"
 }
 
 
 static SourceSnapshot* tag_real_save_snapshot (DataSource* base) {
 	Tag * self;
 	SourceSnapshot* result = NULL;
-	TagTagSnapshot* _tmp0_ = NULL;
+	TagTagSnapshot* _tmp0_;
 #line 889 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag);
 #line 890 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7009,14 +7006,14 @@ static SourceSnapshot* tag_real_save_snapshot (DataSource* base) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_SNAPSHOT, SourceSnapshot);
 #line 890 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 7013 "Tag.c"
+#line 7010 "Tag.c"
 }
 
 
 static SourceProxy* tag_real_get_proxy (Proxyable* base) {
 	Tag * self;
 	SourceProxy* result = NULL;
-	TagTagProxy* _tmp0_ = NULL;
+	TagTagProxy* _tmp0_;
 #line 893 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag);
 #line 894 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7025,31 +7022,31 @@ static SourceProxy* tag_real_get_proxy (Proxyable* base) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_PROXY, SourceProxy);
 #line 894 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 7029 "Tag.c"
+#line 7026 "Tag.c"
 }
 
 
 Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
 	Tag* result = NULL;
 	Tag* tag = NULL;
-	TagRow* _tmp8_ = NULL;
-	gint64 _tmp9_ = 0LL;
-	Tag* _tmp10_ = NULL;
-	TagSourceCollection* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	TagRow* _tmp8_;
+	gint64 _tmp9_;
+	Tag* _tmp10_;
+	TagSourceCollection* _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
 	GError * _inner_error_ = NULL;
 #line 897 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG_ROW (row), NULL);
-#line 7045 "Tag.c"
+#line 7042 "Tag.c"
 	{
 		TagID _tmp0_ = {0};
-		TagTable* _tmp1_ = NULL;
-		TagTable* _tmp2_ = NULL;
-		TagRow* _tmp3_ = NULL;
+		TagTable* _tmp1_;
+		TagTable* _tmp2_;
+		TagRow* _tmp3_;
 		TagID _tmp4_ = {0};
-		TagID _tmp5_ = {0};
-		TagRow* _tmp6_ = NULL;
+		TagID _tmp5_;
+		TagRow* _tmp6_;
 #line 900 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp1_ = tag_table_get_instance ();
 #line 900 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7068,8 +7065,8 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 900 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 7072 "Tag.c"
-				goto __catch475_database_error;
+#line 7069 "Tag.c"
+				goto __catch476_database_error;
 			}
 #line 900 "/home/jens/Source/shotwell/src/Tag.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7077,19 +7074,19 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
 			g_clear_error (&_inner_error_);
 #line 900 "/home/jens/Source/shotwell/src/Tag.vala"
 			return NULL;
-#line 7081 "Tag.c"
+#line 7078 "Tag.c"
 		}
 #line 900 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp6_ = row;
 #line 900 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp6_->tag_id = _tmp0_;
-#line 7087 "Tag.c"
+#line 7084 "Tag.c"
 	}
-	goto __finally475;
-	__catch475_database_error:
+	goto __finally476;
+	__catch476_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp7_ = NULL;
+		GError* _tmp7_;
 #line 899 "/home/jens/Source/shotwell/src/Tag.vala"
 		err = _inner_error_;
 #line 899 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7100,9 +7097,9 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
 		app_window_database_error (_tmp7_);
 #line 899 "/home/jens/Source/shotwell/src/Tag.vala"
 		_g_error_free0 (err);
-#line 7104 "Tag.c"
+#line 7101 "Tag.c"
 	}
-	__finally475:
+	__finally476:
 #line 899 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 899 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7111,7 +7108,7 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
 		g_clear_error (&_inner_error_);
 #line 899 "/home/jens/Source/shotwell/src/Tag.vala"
 		return NULL;
-#line 7115 "Tag.c"
+#line 7112 "Tag.c"
 	}
 #line 905 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp8_ = row;
@@ -7137,18 +7134,18 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
 	result = tag;
 #line 910 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 7141 "Tag.c"
+#line 7138 "Tag.c"
 }
 
 
 static gboolean tag_real_has_links (ContainerSource* base) {
 	Tag * self;
 	gboolean result = FALSE;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	SourceBacklink* _tmp1_ = NULL;
-	SourceBacklink* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	LibraryPhotoSourceCollection* _tmp0_;
+	SourceBacklink* _tmp1_;
+	SourceBacklink* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 #line 913 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag);
 #line 914 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7167,14 +7164,14 @@ static gboolean tag_real_has_links (ContainerSource* base) {
 	result = _tmp4_;
 #line 914 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 7171 "Tag.c"
+#line 7168 "Tag.c"
 }
 
 
 static SourceBacklink* tag_real_get_backlink (ContainerSource* base) {
 	Tag * self;
 	SourceBacklink* result = NULL;
-	SourceBacklink* _tmp0_ = NULL;
+	SourceBacklink* _tmp0_;
 #line 917 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag);
 #line 918 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7183,15 +7180,15 @@ static SourceBacklink* tag_real_get_backlink (ContainerSource* base) {
 	result = _tmp0_;
 #line 918 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 7187 "Tag.c"
+#line 7184 "Tag.c"
 }
 
 
 static void tag_real_break_link (ContainerSource* base, DataSource* source) {
 	Tag * self;
-	DataSource* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
+	DataSource* _tmp0_;
+	GeeList* _tmp1_;
+	GeeList* _tmp2_;
 #line 921 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag);
 #line 921 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7208,15 +7205,15 @@ static void tag_real_break_link (ContainerSource* base, DataSource* source) {
 	_g_object_unref0 (_tmp2_);
 #line 926 "/home/jens/Source/shotwell/src/Tag.vala"
 	self->priv->unlinking = FALSE;
-#line 7212 "Tag.c"
+#line 7209 "Tag.c"
 }
 
 
 static void tag_real_break_link_many (ContainerSource* base, GeeCollection* sources) {
 	Tag * self;
-	GeeCollection* _tmp0_ = NULL;
-	GeeMultiMap* _tmp1_ = NULL;
-	GeeMultiMap* _tmp2_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeMultiMap* _tmp1_;
+	GeeMultiMap* _tmp2_;
 #line 929 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag);
 #line 929 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7233,13 +7230,13 @@ static void tag_real_break_link_many (ContainerSource* base, GeeCollection* sour
 	_g_object_unref0 (_tmp2_);
 #line 934 "/home/jens/Source/shotwell/src/Tag.vala"
 	self->priv->unlinking = FALSE;
-#line 7237 "Tag.c"
+#line 7234 "Tag.c"
 }
 
 
 static void tag_real_establish_link (ContainerSource* base, DataSource* source) {
 	Tag * self;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 937 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag);
 #line 937 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7252,13 +7249,13 @@ static void tag_real_establish_link (ContainerSource* base, DataSource* source)
 	tag_attach (self, G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource));
 #line 942 "/home/jens/Source/shotwell/src/Tag.vala"
 	self->priv->relinking = FALSE;
-#line 7256 "Tag.c"
+#line 7253 "Tag.c"
 }
 
 
 static void tag_real_establish_link_many (ContainerSource* base, GeeCollection* sources) {
 	Tag * self;
-	GeeCollection* _tmp0_ = NULL;
+	GeeCollection* _tmp0_;
 #line 945 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag);
 #line 945 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7271,14 +7268,14 @@ static void tag_real_establish_link_many (ContainerSource* base, GeeCollection*
 	tag_attach_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 950 "/home/jens/Source/shotwell/src/Tag.vala"
 	self->priv->relinking = FALSE;
-#line 7275 "Tag.c"
+#line 7272 "Tag.c"
 }
 
 
 static void tag_update_indexable_keywords (Tag* self) {
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 953 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_if_fail (IS_TAG (self));
 #line 954 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7293,14 +7290,14 @@ static void tag_update_indexable_keywords (Tag* self) {
 	self->priv->indexable_keywords = _tmp2_;
 #line 954 "/home/jens/Source/shotwell/src/Tag.vala"
 	_g_free0 (_tmp1_);
-#line 7297 "Tag.c"
+#line 7294 "Tag.c"
 }
 
 
 static const gchar* tag_real_get_indexable_keywords (Indexable* base) {
 	Tag * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 957 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag);
 #line 958 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7309,13 +7306,13 @@ static const gchar* tag_real_get_indexable_keywords (Indexable* base) {
 	result = _tmp0_;
 #line 958 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 7313 "Tag.c"
+#line 7310 "Tag.c"
 }
 
 
 void tag_attach (Tag* self, MediaSource* source) {
 	Tag* attach_to = NULL;
-	Tag* _tmp0_ = NULL;
+	Tag* _tmp0_;
 #line 961 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_if_fail (IS_TAG (self));
 #line 961 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7326,21 +7323,21 @@ void tag_attach (Tag* self, MediaSource* source) {
 	attach_to = _tmp0_;
 #line 963 "/home/jens/Source/shotwell/src/Tag.vala"
 	while (TRUE) {
-#line 7330 "Tag.c"
-		Tag* _tmp1_ = NULL;
-		Tag* _tmp2_ = NULL;
-		ViewCollection* _tmp3_ = NULL;
-		MediaSource* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		Tag* _tmp11_ = NULL;
-		Tag* _tmp12_ = NULL;
+#line 7327 "Tag.c"
+		Tag* _tmp1_;
+		Tag* _tmp2_;
+		ViewCollection* _tmp3_;
+		MediaSource* _tmp4_;
+		gboolean _tmp5_;
+		Tag* _tmp11_;
+		Tag* _tmp12_;
 #line 963 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp1_ = attach_to;
 #line 963 "/home/jens/Source/shotwell/src/Tag.vala"
 		if (!(_tmp1_ != NULL)) {
 #line 963 "/home/jens/Source/shotwell/src/Tag.vala"
 			break;
-#line 7344 "Tag.c"
+#line 7341 "Tag.c"
 		}
 #line 964 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp2_ = attach_to;
@@ -7352,12 +7349,12 @@ void tag_attach (Tag* self, MediaSource* source) {
 		_tmp5_ = view_collection_has_view_for_source (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource));
 #line 964 "/home/jens/Source/shotwell/src/Tag.vala"
 		if (!_tmp5_) {
-#line 7356 "Tag.c"
-			Tag* _tmp6_ = NULL;
-			ViewCollection* _tmp7_ = NULL;
-			MediaSource* _tmp8_ = NULL;
-			ThumbnailView* _tmp9_ = NULL;
-			ThumbnailView* _tmp10_ = NULL;
+#line 7353 "Tag.c"
+			Tag* _tmp6_;
+			ViewCollection* _tmp7_;
+			MediaSource* _tmp8_;
+			ThumbnailView* _tmp9_;
+			ThumbnailView* _tmp10_;
 #line 965 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp6_ = attach_to;
 #line 965 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7372,7 +7369,7 @@ void tag_attach (Tag* self, MediaSource* source) {
 			data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
 #line 965 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (_tmp10_);
-#line 7376 "Tag.c"
+#line 7373 "Tag.c"
 		}
 #line 968 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp11_ = attach_to;
@@ -7382,17 +7379,17 @@ void tag_attach (Tag* self, MediaSource* source) {
 		_g_object_unref0 (attach_to);
 #line 968 "/home/jens/Source/shotwell/src/Tag.vala"
 		attach_to = _tmp12_;
-#line 7386 "Tag.c"
+#line 7383 "Tag.c"
 	}
 #line 961 "/home/jens/Source/shotwell/src/Tag.vala"
 	_g_object_unref0 (attach_to);
-#line 7390 "Tag.c"
+#line 7387 "Tag.c"
 }
 
 
 void tag_attach_many (Tag* self, GeeCollection* sources) {
 	Tag* attach_to = NULL;
-	Tag* _tmp0_ = NULL;
+	Tag* _tmp0_;
 #line 972 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_if_fail (IS_TAG (self));
 #line 972 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7403,32 +7400,32 @@ void tag_attach_many (Tag* self, GeeCollection* sources) {
 	attach_to = _tmp0_;
 #line 974 "/home/jens/Source/shotwell/src/Tag.vala"
 	while (TRUE) {
-#line 7407 "Tag.c"
-		Tag* _tmp1_ = NULL;
+#line 7404 "Tag.c"
+		Tag* _tmp1_;
 		GeeArrayList* view_list = NULL;
-		GeeArrayList* _tmp2_ = NULL;
-		GeeArrayList* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
-		Tag* _tmp25_ = NULL;
-		Tag* _tmp26_ = NULL;
+		GeeArrayList* _tmp2_;
+		GeeArrayList* _tmp17_;
+		gint _tmp18_;
+		gint _tmp19_;
+		Tag* _tmp25_;
+		Tag* _tmp26_;
 #line 974 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp1_ = attach_to;
 #line 974 "/home/jens/Source/shotwell/src/Tag.vala"
 		if (!(_tmp1_ != NULL)) {
 #line 974 "/home/jens/Source/shotwell/src/Tag.vala"
 			break;
-#line 7422 "Tag.c"
+#line 7419 "Tag.c"
 		}
 #line 975 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp2_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 975 "/home/jens/Source/shotwell/src/Tag.vala"
 		view_list = _tmp2_;
-#line 7428 "Tag.c"
+#line 7425 "Tag.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp3_ = NULL;
-			GeeIterator* _tmp4_ = NULL;
+			GeeCollection* _tmp3_;
+			GeeIterator* _tmp4_;
 #line 976 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp3_ = sources;
 #line 976 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7437,16 +7434,16 @@ void tag_attach_many (Tag* self, GeeCollection* sources) {
 			_source_it = _tmp4_;
 #line 976 "/home/jens/Source/shotwell/src/Tag.vala"
 			while (TRUE) {
-#line 7441 "Tag.c"
-				GeeIterator* _tmp5_ = NULL;
-				gboolean _tmp6_ = FALSE;
+#line 7438 "Tag.c"
+				GeeIterator* _tmp5_;
+				gboolean _tmp6_;
 				MediaSource* source = NULL;
-				GeeIterator* _tmp7_ = NULL;
-				gpointer _tmp8_ = NULL;
-				Tag* _tmp9_ = NULL;
-				ViewCollection* _tmp10_ = NULL;
-				MediaSource* _tmp11_ = NULL;
-				gboolean _tmp12_ = FALSE;
+				GeeIterator* _tmp7_;
+				gpointer _tmp8_;
+				Tag* _tmp9_;
+				ViewCollection* _tmp10_;
+				MediaSource* _tmp11_;
+				gboolean _tmp12_;
 #line 976 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp5_ = _source_it;
 #line 976 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7455,7 +7452,7 @@ void tag_attach_many (Tag* self, GeeCollection* sources) {
 				if (!_tmp6_) {
 #line 976 "/home/jens/Source/shotwell/src/Tag.vala"
 					break;
-#line 7459 "Tag.c"
+#line 7456 "Tag.c"
 				}
 #line 976 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp7_ = _source_it;
@@ -7473,11 +7470,11 @@ void tag_attach_many (Tag* self, GeeCollection* sources) {
 				_tmp12_ = view_collection_has_view_for_source (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_SOURCE, DataSource));
 #line 977 "/home/jens/Source/shotwell/src/Tag.vala"
 				if (!_tmp12_) {
-#line 7477 "Tag.c"
-					GeeArrayList* _tmp13_ = NULL;
-					MediaSource* _tmp14_ = NULL;
-					ThumbnailView* _tmp15_ = NULL;
-					ThumbnailView* _tmp16_ = NULL;
+#line 7474 "Tag.c"
+					GeeArrayList* _tmp13_;
+					MediaSource* _tmp14_;
+					ThumbnailView* _tmp15_;
+					ThumbnailView* _tmp16_;
 #line 978 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp13_ = view_list;
 #line 978 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7490,15 +7487,15 @@ void tag_attach_many (Tag* self, GeeCollection* sources) {
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_);
 #line 978 "/home/jens/Source/shotwell/src/Tag.vala"
 					_g_object_unref0 (_tmp16_);
-#line 7494 "Tag.c"
+#line 7491 "Tag.c"
 				}
 #line 976 "/home/jens/Source/shotwell/src/Tag.vala"
 				_g_object_unref0 (source);
-#line 7498 "Tag.c"
+#line 7495 "Tag.c"
 			}
 #line 976 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (_source_it);
-#line 7502 "Tag.c"
+#line 7499 "Tag.c"
 		}
 #line 981 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp17_ = view_list;
@@ -7508,12 +7505,12 @@ void tag_attach_many (Tag* self, GeeCollection* sources) {
 		_tmp19_ = _tmp18_;
 #line 981 "/home/jens/Source/shotwell/src/Tag.vala"
 		if (_tmp19_ > 0) {
-#line 7512 "Tag.c"
-			Tag* _tmp20_ = NULL;
-			ViewCollection* _tmp21_ = NULL;
-			GeeArrayList* _tmp22_ = NULL;
-			GeeCollection* _tmp23_ = NULL;
-			GeeCollection* _tmp24_ = NULL;
+#line 7509 "Tag.c"
+			Tag* _tmp20_;
+			ViewCollection* _tmp21_;
+			GeeArrayList* _tmp22_;
+			GeeCollection* _tmp23_;
+			GeeCollection* _tmp24_;
 #line 982 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp20_ = attach_to;
 #line 982 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7526,7 +7523,7 @@ void tag_attach_many (Tag* self, GeeCollection* sources) {
 			_tmp24_ = _tmp23_;
 #line 982 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (_tmp24_);
-#line 7530 "Tag.c"
+#line 7527 "Tag.c"
 		}
 #line 984 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp25_ = attach_to;
@@ -7538,29 +7535,29 @@ void tag_attach_many (Tag* self, GeeCollection* sources) {
 		attach_to = _tmp26_;
 #line 974 "/home/jens/Source/shotwell/src/Tag.vala"
 		_g_object_unref0 (view_list);
-#line 7542 "Tag.c"
+#line 7539 "Tag.c"
 	}
 #line 972 "/home/jens/Source/shotwell/src/Tag.vala"
 	_g_object_unref0 (attach_to);
-#line 7546 "Tag.c"
+#line 7543 "Tag.c"
 }
 
 
 GeeList* tag_detach (Tag* self, MediaSource* source) {
 	GeeList* result = NULL;
 	DataView* this_view = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	DataView* _tmp2_ = NULL;
-	DataView* _tmp3_ = NULL;
+	ViewCollection* _tmp0_;
+	MediaSource* _tmp1_;
+	DataView* _tmp2_;
+	DataView* _tmp3_;
 	GeeList* detached_from = NULL;
-	GeeArrayList* _tmp4_ = NULL;
-	ViewCollection* _tmp29_ = NULL;
-	ViewCollection* _tmp30_ = NULL;
-	DataView* _tmp31_ = NULL;
-	Marker* _tmp32_ = NULL;
-	Marker* _tmp33_ = NULL;
-	GeeList* _tmp34_ = NULL;
+	GeeArrayList* _tmp4_;
+	ViewCollection* _tmp29_;
+	ViewCollection* _tmp30_;
+	DataView* _tmp31_;
+	Marker* _tmp32_;
+	Marker* _tmp33_;
+	GeeList* _tmp34_;
 #line 991 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (self), NULL);
 #line 991 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7583,20 +7580,20 @@ GeeList* tag_detach (Tag* self, MediaSource* source) {
 		_g_object_unref0 (this_view);
 #line 994 "/home/jens/Source/shotwell/src/Tag.vala"
 		return result;
-#line 7587 "Tag.c"
+#line 7584 "Tag.c"
 	}
 #line 996 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp4_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 996 "/home/jens/Source/shotwell/src/Tag.vala"
 	detached_from = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList);
-#line 7593 "Tag.c"
+#line 7590 "Tag.c"
 	{
 		GeeList* _child_tag_list = NULL;
-		GeeList* _tmp5_ = NULL;
+		GeeList* _tmp5_;
 		gint _child_tag_size = 0;
-		GeeList* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
+		GeeList* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
 		gint _child_tag_index = 0;
 #line 998 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp5_ = tag_get_hierarchical_children (self);
@@ -7614,20 +7611,20 @@ GeeList* tag_detach (Tag* self, MediaSource* source) {
 		_child_tag_index = -1;
 #line 998 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
-#line 7618 "Tag.c"
-			gint _tmp9_ = 0;
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
+#line 7615 "Tag.c"
+			gint _tmp9_;
+			gint _tmp10_;
+			gint _tmp11_;
 			Tag* child_tag = NULL;
-			GeeList* _tmp12_ = NULL;
-			gint _tmp13_ = 0;
-			gpointer _tmp14_ = NULL;
+			GeeList* _tmp12_;
+			gint _tmp13_;
+			gpointer _tmp14_;
 			DataView* child_view = NULL;
-			Tag* _tmp15_ = NULL;
-			ViewCollection* _tmp16_ = NULL;
-			MediaSource* _tmp17_ = NULL;
-			DataView* _tmp18_ = NULL;
-			DataView* _tmp19_ = NULL;
+			Tag* _tmp15_;
+			ViewCollection* _tmp16_;
+			MediaSource* _tmp17_;
+			DataView* _tmp18_;
+			DataView* _tmp19_;
 #line 998 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp9_ = _child_tag_index;
 #line 998 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7640,7 +7637,7 @@ GeeList* tag_detach (Tag* self, MediaSource* source) {
 			if (!(_tmp10_ < _tmp11_)) {
 #line 998 "/home/jens/Source/shotwell/src/Tag.vala"
 				break;
-#line 7644 "Tag.c"
+#line 7641 "Tag.c"
 			}
 #line 998 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp12_ = _child_tag_list;
@@ -7664,16 +7661,16 @@ GeeList* tag_detach (Tag* self, MediaSource* source) {
 			_tmp19_ = child_view;
 #line 1000 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_tmp19_ != NULL) {
-#line 7668 "Tag.c"
-				Tag* _tmp20_ = NULL;
-				ViewCollection* _tmp21_ = NULL;
-				Tag* _tmp22_ = NULL;
-				ViewCollection* _tmp23_ = NULL;
-				DataView* _tmp24_ = NULL;
-				Marker* _tmp25_ = NULL;
-				Marker* _tmp26_ = NULL;
-				GeeList* _tmp27_ = NULL;
-				Tag* _tmp28_ = NULL;
+#line 7665 "Tag.c"
+				Tag* _tmp20_;
+				ViewCollection* _tmp21_;
+				Tag* _tmp22_;
+				ViewCollection* _tmp23_;
+				DataView* _tmp24_;
+				Marker* _tmp25_;
+				Marker* _tmp26_;
+				GeeList* _tmp27_;
+				Tag* _tmp28_;
 #line 1001 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp20_ = child_tag;
 #line 1001 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7698,17 +7695,17 @@ GeeList* tag_detach (Tag* self, MediaSource* source) {
 				_tmp28_ = child_tag;
 #line 1002 "/home/jens/Source/shotwell/src/Tag.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_);
-#line 7702 "Tag.c"
+#line 7699 "Tag.c"
 			}
 #line 998 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (child_view);
 #line 998 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (child_tag);
-#line 7708 "Tag.c"
+#line 7705 "Tag.c"
 		}
 #line 998 "/home/jens/Source/shotwell/src/Tag.vala"
 		_g_object_unref0 (_child_tag_list);
-#line 7712 "Tag.c"
+#line 7709 "Tag.c"
 	}
 #line 1006 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp29_ = self->priv->media_views;
@@ -7734,24 +7731,24 @@ GeeList* tag_detach (Tag* self, MediaSource* source) {
 	_g_object_unref0 (this_view);
 #line 1009 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 7738 "Tag.c"
+#line 7735 "Tag.c"
 }
 
 
 GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources) {
 	GeeMultiMap* result = NULL;
 	GeeMultiMap* detached_from = NULL;
-	GeeHashMultiMap* _tmp0_ = NULL;
+	GeeHashMultiMap* _tmp0_;
 	Marker* marker = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	Marker* _tmp2_ = NULL;
-	ViewCollection* _tmp42_ = NULL;
-	Marker* _tmp43_ = NULL;
+	ViewCollection* _tmp1_;
+	Marker* _tmp2_;
+	ViewCollection* _tmp42_;
+	Marker* _tmp43_;
 	GeeMultiMap* _tmp44_ = NULL;
-	GeeMultiMap* _tmp45_ = NULL;
-	gint _tmp46_ = 0;
-	gint _tmp47_ = 0;
-	GeeMultiMap* _tmp49_ = NULL;
+	GeeMultiMap* _tmp45_;
+	gint _tmp46_;
+	gint _tmp47_;
+	GeeMultiMap* _tmp49_;
 #line 1015 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (self), NULL);
 #line 1015 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7766,11 +7763,11 @@ GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources) {
 	_tmp2_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
 #line 1018 "/home/jens/Source/shotwell/src/Tag.vala"
 	marker = _tmp2_;
-#line 7770 "Tag.c"
+#line 7767 "Tag.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
 #line 1019 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp3_ = sources;
 #line 1019 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7779,21 +7776,21 @@ GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources) {
 		_source_it = _tmp4_;
 #line 1019 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
-#line 7783 "Tag.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+#line 7780 "Tag.c"
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			MediaSource* source = NULL;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
 			DataView* view = NULL;
-			ViewCollection* _tmp9_ = NULL;
-			MediaSource* _tmp10_ = NULL;
-			DataView* _tmp11_ = NULL;
-			DataView* _tmp12_ = NULL;
-			Marker* _tmp38_ = NULL;
-			DataView* _tmp39_ = NULL;
-			GeeMultiMap* _tmp40_ = NULL;
-			MediaSource* _tmp41_ = NULL;
+			ViewCollection* _tmp9_;
+			MediaSource* _tmp10_;
+			DataView* _tmp11_;
+			DataView* _tmp12_;
+			Marker* _tmp38_;
+			DataView* _tmp39_;
+			GeeMultiMap* _tmp40_;
+			MediaSource* _tmp41_;
 #line 1019 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp5_ = _source_it;
 #line 1019 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7802,7 +7799,7 @@ GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources) {
 			if (!_tmp6_) {
 #line 1019 "/home/jens/Source/shotwell/src/Tag.vala"
 				break;
-#line 7806 "Tag.c"
+#line 7803 "Tag.c"
 			}
 #line 1019 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp7_ = _source_it;
@@ -7828,15 +7825,15 @@ GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources) {
 				_g_object_unref0 (source);
 #line 1022 "/home/jens/Source/shotwell/src/Tag.vala"
 				continue;
-#line 7832 "Tag.c"
+#line 7829 "Tag.c"
 			}
 			{
 				GeeList* _child_tag_list = NULL;
-				GeeList* _tmp13_ = NULL;
+				GeeList* _tmp13_;
 				gint _child_tag_size = 0;
-				GeeList* _tmp14_ = NULL;
-				gint _tmp15_ = 0;
-				gint _tmp16_ = 0;
+				GeeList* _tmp14_;
+				gint _tmp15_;
+				gint _tmp16_;
 				gint _child_tag_index = 0;
 #line 1024 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp13_ = tag_get_hierarchical_children (self);
@@ -7854,20 +7851,20 @@ GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources) {
 				_child_tag_index = -1;
 #line 1024 "/home/jens/Source/shotwell/src/Tag.vala"
 				while (TRUE) {
-#line 7858 "Tag.c"
-					gint _tmp17_ = 0;
-					gint _tmp18_ = 0;
-					gint _tmp19_ = 0;
+#line 7855 "Tag.c"
+					gint _tmp17_;
+					gint _tmp18_;
+					gint _tmp19_;
 					Tag* child_tag = NULL;
-					GeeList* _tmp20_ = NULL;
-					gint _tmp21_ = 0;
-					gpointer _tmp22_ = NULL;
+					GeeList* _tmp20_;
+					gint _tmp21_;
+					gpointer _tmp22_;
 					DataView* child_view = NULL;
-					Tag* _tmp23_ = NULL;
-					ViewCollection* _tmp24_ = NULL;
-					MediaSource* _tmp25_ = NULL;
-					DataView* _tmp26_ = NULL;
-					DataView* _tmp27_ = NULL;
+					Tag* _tmp23_;
+					ViewCollection* _tmp24_;
+					MediaSource* _tmp25_;
+					DataView* _tmp26_;
+					DataView* _tmp27_;
 #line 1024 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp17_ = _child_tag_index;
 #line 1024 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7880,7 +7877,7 @@ GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources) {
 					if (!(_tmp18_ < _tmp19_)) {
 #line 1024 "/home/jens/Source/shotwell/src/Tag.vala"
 						break;
-#line 7884 "Tag.c"
+#line 7881 "Tag.c"
 					}
 #line 1024 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp20_ = _child_tag_list;
@@ -7904,17 +7901,17 @@ GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources) {
 					_tmp27_ = child_view;
 #line 1026 "/home/jens/Source/shotwell/src/Tag.vala"
 					if (_tmp27_ != NULL) {
-#line 7908 "Tag.c"
-						Tag* _tmp28_ = NULL;
-						ViewCollection* _tmp29_ = NULL;
-						Tag* _tmp30_ = NULL;
-						ViewCollection* _tmp31_ = NULL;
-						DataView* _tmp32_ = NULL;
-						Marker* _tmp33_ = NULL;
-						Marker* _tmp34_ = NULL;
-						GeeMultiMap* _tmp35_ = NULL;
-						Tag* _tmp36_ = NULL;
-						MediaSource* _tmp37_ = NULL;
+#line 7905 "Tag.c"
+						Tag* _tmp28_;
+						ViewCollection* _tmp29_;
+						Tag* _tmp30_;
+						ViewCollection* _tmp31_;
+						DataView* _tmp32_;
+						Marker* _tmp33_;
+						Marker* _tmp34_;
+						GeeMultiMap* _tmp35_;
+						Tag* _tmp36_;
+						MediaSource* _tmp37_;
 #line 1027 "/home/jens/Source/shotwell/src/Tag.vala"
 						_tmp28_ = child_tag;
 #line 1027 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7941,17 +7938,17 @@ GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources) {
 						_tmp37_ = source;
 #line 1028 "/home/jens/Source/shotwell/src/Tag.vala"
 						gee_multi_map_set (_tmp35_, _tmp36_, _tmp37_);
-#line 7945 "Tag.c"
+#line 7942 "Tag.c"
 					}
 #line 1024 "/home/jens/Source/shotwell/src/Tag.vala"
 					_g_object_unref0 (child_view);
 #line 1024 "/home/jens/Source/shotwell/src/Tag.vala"
 					_g_object_unref0 (child_tag);
-#line 7951 "Tag.c"
+#line 7948 "Tag.c"
 				}
 #line 1024 "/home/jens/Source/shotwell/src/Tag.vala"
 				_g_object_unref0 (_child_tag_list);
-#line 7955 "Tag.c"
+#line 7952 "Tag.c"
 			}
 #line 1032 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp38_ = marker;
@@ -7969,11 +7966,11 @@ GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources) {
 			_g_object_unref0 (view);
 #line 1019 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (source);
-#line 7973 "Tag.c"
+#line 7970 "Tag.c"
 		}
 #line 1019 "/home/jens/Source/shotwell/src/Tag.vala"
 		_g_object_unref0 (_source_it);
-#line 7977 "Tag.c"
+#line 7974 "Tag.c"
 	}
 #line 1036 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp42_ = self->priv->media_views;
@@ -7989,17 +7986,17 @@ GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources) {
 	_tmp47_ = _tmp46_;
 #line 1038 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (_tmp47_ > 0) {
-#line 7993 "Tag.c"
-		GeeMultiMap* _tmp48_ = NULL;
+#line 7990 "Tag.c"
+		GeeMultiMap* _tmp48_;
 #line 1038 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp48_ = detached_from;
 #line 1038 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp44_ = _tmp48_;
-#line 7999 "Tag.c"
+#line 7996 "Tag.c"
 	} else {
 #line 1038 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp44_ = NULL;
-#line 8003 "Tag.c"
+#line 8000 "Tag.c"
 	}
 #line 1038 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp49_ = _g_object_ref0 (_tmp44_);
@@ -8011,48 +8008,48 @@ GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources) {
 	_g_object_unref0 (detached_from);
 #line 1038 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 8015 "Tag.c"
+#line 8012 "Tag.c"
 }
 
 
 static gint string_index_of (const gchar* self, const gchar* needle, gint start_index) {
 	gint result = 0;
 	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 8042 "Tag.c"
-		gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8039 "Tag.c"
+		gchar* _tmp4_;
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 8050 "Tag.c"
+#line 8047 "Tag.c"
 	} else {
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = -1;
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 8056 "Tag.c"
+#line 8053 "Tag.c"
 	}
 }
 
@@ -8060,43 +8057,43 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 8080 "Tag.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8077 "Tag.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 8088 "Tag.c"
+#line 8085 "Tag.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 8100 "Tag.c"
+#line 8097 "Tag.c"
 	}
 }
 
@@ -8105,140 +8102,140 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 8124 "Tag.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8121 "Tag.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 8130 "Tag.c"
+#line 8127 "Tag.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 8134 "Tag.c"
+#line 8131 "Tag.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 8138 "Tag.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8135 "Tag.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 8150 "Tag.c"
+#line 8147 "Tag.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 8160 "Tag.c"
+#line 8157 "Tag.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 8166 "Tag.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8163 "Tag.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 8180 "Tag.c"
+#line 8177 "Tag.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 8190 "Tag.c"
+#line 8187 "Tag.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 8196 "Tag.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8193 "Tag.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 8205 "Tag.c"
+#line 8202 "Tag.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 8225 "Tag.c"
+#line 8222 "Tag.c"
 }
 
 
 gboolean tag_rename (Tag* self, const gchar* name) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gboolean _tmp3_;
 	gchar* new_name = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
-	gboolean _tmp10_ = FALSE;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gboolean _tmp9_;
+	gboolean _tmp10_;
 #line 1042 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (self), FALSE);
 #line 1042 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8259,7 +8256,7 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 		result = TRUE;
 #line 1044 "/home/jens/Source/shotwell/src/Tag.vala"
 		return result;
-#line 8263 "Tag.c"
+#line 8260 "Tag.c"
 	}
 #line 1046 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp4_ = name;
@@ -8277,7 +8274,7 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 		_g_free0 (new_name);
 #line 1048 "/home/jens/Source/shotwell/src/Tag.vala"
 		return result;
-#line 8281 "Tag.c"
+#line 8278 "Tag.c"
 	}
 #line 1051 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp7_ = tag_get_path (self);
@@ -8291,23 +8288,23 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 	_g_free0 (_tmp8_);
 #line 1051 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (_tmp10_) {
-#line 8295 "Tag.c"
+#line 8292 "Tag.c"
 		gchar* new_path = NULL;
-		const gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
+		const gchar* _tmp11_;
+		gchar* _tmp12_;
 		gchar* old_path = NULL;
-		gchar* _tmp13_ = NULL;
+		gchar* _tmp13_;
 		Tag* parent = NULL;
-		Tag* _tmp14_ = NULL;
-		Tag* _tmp15_ = NULL;
-		TagSourceCollection* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		gboolean _tmp27_ = FALSE;
+		Tag* _tmp14_;
+		Tag* _tmp15_;
+		TagSourceCollection* _tmp25_;
+		const gchar* _tmp26_;
+		gboolean _tmp27_;
 		GeeCollection* children = NULL;
-		GeeList* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		Alteration* _tmp53_ = NULL;
-		Alteration* _tmp54_ = NULL;
+		GeeList* _tmp28_;
+		const gchar* _tmp29_;
+		Alteration* _tmp53_;
+		Alteration* _tmp54_;
 #line 1052 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp11_ = new_name;
 #line 1052 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8326,14 +8323,14 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 		_tmp15_ = parent;
 #line 1056 "/home/jens/Source/shotwell/src/Tag.vala"
 		if (_tmp15_ != NULL) {
-#line 8330 "Tag.c"
-			Tag* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
-			gchar* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
-			gchar* _tmp22_ = NULL;
+#line 8327 "Tag.c"
+			Tag* _tmp16_;
+			gchar* _tmp17_;
+			gchar* _tmp18_;
+			gchar* _tmp19_;
+			gchar* _tmp20_;
+			const gchar* _tmp21_;
+			gchar* _tmp22_;
 #line 1057 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp16_ = parent;
 #line 1057 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8356,10 +8353,10 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 			_g_free0 (_tmp20_);
 #line 1057 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_free0 (_tmp18_);
-#line 8360 "Tag.c"
+#line 8357 "Tag.c"
 		} else {
-			const gchar* _tmp23_ = NULL;
-			gchar* _tmp24_ = NULL;
+			const gchar* _tmp23_;
+			gchar* _tmp24_;
 #line 1059 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp23_ = new_path;
 #line 1059 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8368,7 +8365,7 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 			_g_free0 (new_path);
 #line 1059 "/home/jens/Source/shotwell/src/Tag.vala"
 			new_path = _tmp24_;
-#line 8372 "Tag.c"
+#line 8369 "Tag.c"
 		}
 #line 1062 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp25_ = tag_global;
@@ -8390,7 +8387,7 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 			_g_free0 (new_name);
 #line 1063 "/home/jens/Source/shotwell/src/Tag.vala"
 			return result;
-#line 8394 "Tag.c"
+#line 8391 "Tag.c"
 		}
 #line 1065 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp28_ = tag_get_hierarchical_children (self);
@@ -8400,11 +8397,11 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 		_tmp29_ = new_path;
 #line 1067 "/home/jens/Source/shotwell/src/Tag.vala"
 		tag_set_raw_path (self, _tmp29_, TRUE);
-#line 8404 "Tag.c"
+#line 8401 "Tag.c"
 		{
 			GeeIterator* _child_it = NULL;
-			GeeCollection* _tmp30_ = NULL;
-			GeeIterator* _tmp31_ = NULL;
+			GeeCollection* _tmp30_;
+			GeeIterator* _tmp31_;
 #line 1069 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp30_ = children;
 #line 1069 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8413,33 +8410,33 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 			_child_it = _tmp31_;
 #line 1069 "/home/jens/Source/shotwell/src/Tag.vala"
 			while (TRUE) {
-#line 8417 "Tag.c"
-				GeeIterator* _tmp32_ = NULL;
-				gboolean _tmp33_ = FALSE;
+#line 8414 "Tag.c"
+				GeeIterator* _tmp32_;
+				gboolean _tmp33_;
 				Tag* child = NULL;
-				GeeIterator* _tmp34_ = NULL;
-				gpointer _tmp35_ = NULL;
+				GeeIterator* _tmp34_;
+				gpointer _tmp35_;
 				gchar* old_child_path = NULL;
-				Tag* _tmp36_ = NULL;
-				gchar* _tmp37_ = NULL;
+				Tag* _tmp36_;
+				gchar* _tmp37_;
 				gint old_path_index = 0;
-				const gchar* _tmp38_ = NULL;
-				const gchar* _tmp39_ = NULL;
-				gint _tmp40_ = 0;
-				gint _tmp41_ = 0;
+				const gchar* _tmp38_;
+				const gchar* _tmp39_;
+				gint _tmp40_;
+				gint _tmp41_;
 				gchar* child_subpath = NULL;
-				const gchar* _tmp42_ = NULL;
-				gint _tmp43_ = 0;
-				const gchar* _tmp44_ = NULL;
-				gint _tmp45_ = 0;
-				gint _tmp46_ = 0;
-				gchar* _tmp47_ = NULL;
+				const gchar* _tmp42_;
+				gint _tmp43_;
+				const gchar* _tmp44_;
+				gint _tmp45_;
+				gint _tmp46_;
+				gchar* _tmp47_;
 				gchar* new_child_path = NULL;
-				const gchar* _tmp48_ = NULL;
-				const gchar* _tmp49_ = NULL;
-				gchar* _tmp50_ = NULL;
-				Tag* _tmp51_ = NULL;
-				const gchar* _tmp52_ = NULL;
+				const gchar* _tmp48_;
+				const gchar* _tmp49_;
+				gchar* _tmp50_;
+				Tag* _tmp51_;
+				const gchar* _tmp52_;
 #line 1069 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp32_ = _child_it;
 #line 1069 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8448,7 +8445,7 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 				if (!_tmp33_) {
 #line 1069 "/home/jens/Source/shotwell/src/Tag.vala"
 					break;
-#line 8452 "Tag.c"
+#line 8449 "Tag.c"
 				}
 #line 1069 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp34_ = _child_it;
@@ -8510,11 +8507,11 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 				_g_free0 (old_child_path);
 #line 1069 "/home/jens/Source/shotwell/src/Tag.vala"
 				_g_object_unref0 (child);
-#line 8514 "Tag.c"
+#line 8511 "Tag.c"
 			}
 #line 1069 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (_child_it);
-#line 8518 "Tag.c"
+#line 8515 "Tag.c"
 		}
 #line 1086 "/home/jens/Source/shotwell/src/Tag.vala"
 		tag_update_indexable_keywords (self);
@@ -8526,11 +8523,11 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp54_);
 #line 1087 "/home/jens/Source/shotwell/src/Tag.vala"
 		_alteration_unref0 (_tmp54_);
-#line 8530 "Tag.c"
+#line 8527 "Tag.c"
 		{
 			GeeIterator* _child_it = NULL;
-			GeeCollection* _tmp55_ = NULL;
-			GeeIterator* _tmp56_ = NULL;
+			GeeCollection* _tmp55_;
+			GeeIterator* _tmp56_;
 #line 1088 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp55_ = children;
 #line 1088 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8539,15 +8536,15 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 			_child_it = _tmp56_;
 #line 1088 "/home/jens/Source/shotwell/src/Tag.vala"
 			while (TRUE) {
-#line 8543 "Tag.c"
-				GeeIterator* _tmp57_ = NULL;
-				gboolean _tmp58_ = FALSE;
+#line 8540 "Tag.c"
+				GeeIterator* _tmp57_;
+				gboolean _tmp58_;
 				Tag* child = NULL;
-				GeeIterator* _tmp59_ = NULL;
-				gpointer _tmp60_ = NULL;
-				Tag* _tmp61_ = NULL;
-				Alteration* _tmp62_ = NULL;
-				Alteration* _tmp63_ = NULL;
+				GeeIterator* _tmp59_;
+				gpointer _tmp60_;
+				Tag* _tmp61_;
+				Alteration* _tmp62_;
+				Alteration* _tmp63_;
 #line 1088 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp57_ = _child_it;
 #line 1088 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8556,7 +8553,7 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 				if (!_tmp58_) {
 #line 1088 "/home/jens/Source/shotwell/src/Tag.vala"
 					break;
-#line 8560 "Tag.c"
+#line 8557 "Tag.c"
 				}
 #line 1088 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp59_ = _child_it;
@@ -8576,11 +8573,11 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 				_alteration_unref0 (_tmp63_);
 #line 1088 "/home/jens/Source/shotwell/src/Tag.vala"
 				_g_object_unref0 (child);
-#line 8580 "Tag.c"
+#line 8577 "Tag.c"
 			}
 #line 1088 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (_child_it);
-#line 8584 "Tag.c"
+#line 8581 "Tag.c"
 		}
 #line 1051 "/home/jens/Source/shotwell/src/Tag.vala"
 		_g_object_unref0 (children);
@@ -8590,12 +8587,12 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 		_g_free0 (old_path);
 #line 1051 "/home/jens/Source/shotwell/src/Tag.vala"
 		_g_free0 (new_path);
-#line 8594 "Tag.c"
+#line 8591 "Tag.c"
 	} else {
-		TagSourceCollection* _tmp64_ = NULL;
-		const gchar* _tmp65_ = NULL;
-		gboolean _tmp66_ = FALSE;
-		const gchar* _tmp67_ = NULL;
+		TagSourceCollection* _tmp64_;
+		const gchar* _tmp65_;
+		gboolean _tmp66_;
+		const gchar* _tmp67_;
 #line 1093 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp64_ = tag_global;
 #line 1093 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8610,13 +8607,13 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 			_g_free0 (new_name);
 #line 1094 "/home/jens/Source/shotwell/src/Tag.vala"
 			return result;
-#line 8614 "Tag.c"
+#line 8611 "Tag.c"
 		}
 #line 1096 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp67_ = new_name;
 #line 1096 "/home/jens/Source/shotwell/src/Tag.vala"
 		tag_set_raw_flat_name (self, _tmp67_);
-#line 8620 "Tag.c"
+#line 8617 "Tag.c"
 	}
 #line 1099 "/home/jens/Source/shotwell/src/Tag.vala"
 	result = TRUE;
@@ -8624,15 +8621,15 @@ gboolean tag_rename (Tag* self, const gchar* name) {
 	_g_free0 (new_name);
 #line 1099 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 8628 "Tag.c"
+#line 8625 "Tag.c"
 }
 
 
 gboolean tag_contains (Tag* self, MediaSource* source) {
 	gboolean result = FALSE;
-	ViewCollection* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	ViewCollection* _tmp0_;
+	MediaSource* _tmp1_;
+	gboolean _tmp2_;
 #line 1102 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (self), FALSE);
 #line 1102 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8647,14 +8644,14 @@ gboolean tag_contains (Tag* self, MediaSource* source) {
 	result = _tmp2_;
 #line 1103 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 8651 "Tag.c"
+#line 8648 "Tag.c"
 }
 
 
 gint tag_get_sources_count (Tag* self) {
 	gint result = 0;
-	ViewCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	ViewCollection* _tmp0_;
+	gint _tmp1_;
 #line 1106 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (self), 0);
 #line 1107 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8665,14 +8662,14 @@ gint tag_get_sources_count (Tag* self) {
 	result = _tmp1_;
 #line 1107 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 8669 "Tag.c"
+#line 8666 "Tag.c"
 }
 
 
 GeeCollection* tag_get_sources (Tag* self) {
 	GeeCollection* result = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	ViewCollection* _tmp0_;
+	GeeCollection* _tmp1_;
 #line 1110 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (self), NULL);
 #line 1111 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8683,15 +8680,15 @@ GeeCollection* tag_get_sources (Tag* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 1111 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 8687 "Tag.c"
+#line 8684 "Tag.c"
 }
 
 
 void tag_mirror_sources (Tag* self, ViewCollection* view, CreateView mirroring_ctor, void* mirroring_ctor_target) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	CreateView _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	CreateView _tmp2_;
+	void* _tmp2__target;
 #line 1114 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_if_fail (IS_TAG (self));
 #line 1114 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8706,19 +8703,19 @@ void tag_mirror_sources (Tag* self, ViewCollection* view, CreateView mirroring_c
 	_tmp2__target = mirroring_ctor_target;
 #line 1115 "/home/jens/Source/shotwell/src/Tag.vala"
 	view_collection_mirror (_tmp0_, _tmp1_, _tmp2_, _tmp2__target, NULL, NULL);
-#line 8710 "Tag.c"
+#line 8707 "Tag.c"
 }
 
 
 static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added, GeeIterable* removed) {
 	GeeCollection* added_sources = NULL;
-	GeeIterable* _tmp0_ = NULL;
+	GeeIterable* _tmp0_;
 	GeeCollection* removed_sources = NULL;
-	GeeIterable* _tmp29_ = NULL;
-	GeeCollection* _tmp58_ = NULL;
-	GeeCollection* _tmp62_ = NULL;
+	GeeIterable* _tmp29_;
+	GeeCollection* _tmp58_;
+	GeeCollection* _tmp62_;
 	gboolean _tmp66_ = FALSE;
-	GeeCollection* _tmp67_ = NULL;
+	GeeCollection* _tmp67_;
 	GError * _inner_error_ = NULL;
 #line 1118 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_if_fail (IS_TAG (self));
@@ -8732,19 +8729,19 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 	_tmp0_ = added;
 #line 1121 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (_tmp0_ != NULL) {
-#line 8736 "Tag.c"
-		GeeArrayList* _tmp1_ = NULL;
+#line 8733 "Tag.c"
+		GeeArrayList* _tmp1_;
 #line 1122 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1122 "/home/jens/Source/shotwell/src/Tag.vala"
 		_g_object_unref0 (added_sources);
 #line 1122 "/home/jens/Source/shotwell/src/Tag.vala"
 		added_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 8744 "Tag.c"
+#line 8741 "Tag.c"
 		{
 			GeeIterator* _view_it = NULL;
-			GeeIterable* _tmp2_ = NULL;
-			GeeIterator* _tmp3_ = NULL;
+			GeeIterable* _tmp2_;
+			GeeIterator* _tmp3_;
 #line 1123 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp2_ = added;
 #line 1123 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8753,27 +8750,27 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 			_view_it = _tmp3_;
 #line 1123 "/home/jens/Source/shotwell/src/Tag.vala"
 			while (TRUE) {
-#line 8757 "Tag.c"
-				GeeIterator* _tmp4_ = NULL;
-				gboolean _tmp5_ = FALSE;
+#line 8754 "Tag.c"
+				GeeIterator* _tmp4_;
+				gboolean _tmp5_;
 				DataView* view = NULL;
-				GeeIterator* _tmp6_ = NULL;
-				gpointer _tmp7_ = NULL;
+				GeeIterator* _tmp6_;
+				gpointer _tmp7_;
 				MediaSource* source = NULL;
-				DataView* _tmp8_ = NULL;
-				DataSource* _tmp9_ = NULL;
-				TagRow* _tmp10_ = NULL;
-				GeeSet* _tmp11_ = NULL;
-				MediaSource* _tmp12_ = NULL;
-				gchar* _tmp13_ = NULL;
-				gchar* _tmp14_ = NULL;
-				gboolean _tmp15_ = FALSE;
-				gboolean _tmp16_ = FALSE;
+				DataView* _tmp8_;
+				DataSource* _tmp9_;
+				TagRow* _tmp10_;
+				GeeSet* _tmp11_;
+				MediaSource* _tmp12_;
+				gchar* _tmp13_;
+				gchar* _tmp14_;
+				gboolean _tmp15_;
+				gboolean _tmp16_;
 				gboolean is_added = FALSE;
-				GeeCollection* _tmp25_ = NULL;
-				MediaSource* _tmp26_ = NULL;
-				gboolean _tmp27_ = FALSE;
-				gboolean _tmp28_ = FALSE;
+				GeeCollection* _tmp25_;
+				MediaSource* _tmp26_;
+				gboolean _tmp27_;
+				gboolean _tmp28_;
 #line 1123 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp4_ = _view_it;
 #line 1123 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8782,7 +8779,7 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 				if (!_tmp5_) {
 #line 1123 "/home/jens/Source/shotwell/src/Tag.vala"
 					break;
-#line 8786 "Tag.c"
+#line 8783 "Tag.c"
 				}
 #line 1123 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp6_ = _view_it;
@@ -8814,16 +8811,16 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 				_g_free0 (_tmp14_);
 #line 1128 "/home/jens/Source/shotwell/src/Tag.vala"
 				if (_tmp16_) {
-#line 8818 "Tag.c"
+#line 8815 "Tag.c"
 					gboolean is_added = FALSE;
-					TagRow* _tmp17_ = NULL;
-					GeeSet* _tmp18_ = NULL;
-					MediaSource* _tmp19_ = NULL;
-					gchar* _tmp20_ = NULL;
-					gchar* _tmp21_ = NULL;
-					gboolean _tmp22_ = FALSE;
-					gboolean _tmp23_ = FALSE;
-					gboolean _tmp24_ = FALSE;
+					TagRow* _tmp17_;
+					GeeSet* _tmp18_;
+					MediaSource* _tmp19_;
+					gchar* _tmp20_;
+					gchar* _tmp21_;
+					gboolean _tmp22_;
+					gboolean _tmp23_;
+					gboolean _tmp24_;
 #line 1129 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp17_ = self->priv->row;
 #line 1129 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8846,7 +8843,7 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 					_tmp24_ = is_added;
 #line 1130 "/home/jens/Source/shotwell/src/Tag.vala"
 					_vala_assert (_tmp24_, "is_added");
-#line 8850 "Tag.c"
+#line 8847 "Tag.c"
 				}
 #line 1133 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp25_ = added_sources;
@@ -8864,11 +8861,11 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 				_g_object_unref0 (source);
 #line 1123 "/home/jens/Source/shotwell/src/Tag.vala"
 				_g_object_unref0 (view);
-#line 8868 "Tag.c"
+#line 8865 "Tag.c"
 			}
 #line 1123 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (_view_it);
-#line 8872 "Tag.c"
+#line 8869 "Tag.c"
 		}
 	}
 #line 1138 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8877,19 +8874,19 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 	_tmp29_ = removed;
 #line 1139 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (_tmp29_ != NULL) {
-#line 8881 "Tag.c"
-		GeeArrayList* _tmp30_ = NULL;
+#line 8878 "Tag.c"
+		GeeArrayList* _tmp30_;
 #line 1140 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp30_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1140 "/home/jens/Source/shotwell/src/Tag.vala"
 		_g_object_unref0 (removed_sources);
 #line 1140 "/home/jens/Source/shotwell/src/Tag.vala"
 		removed_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 8889 "Tag.c"
+#line 8886 "Tag.c"
 		{
 			GeeIterator* _view_it = NULL;
-			GeeIterable* _tmp31_ = NULL;
-			GeeIterator* _tmp32_ = NULL;
+			GeeIterable* _tmp31_;
+			GeeIterator* _tmp32_;
 #line 1141 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp31_ = removed;
 #line 1141 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8898,29 +8895,29 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 			_view_it = _tmp32_;
 #line 1141 "/home/jens/Source/shotwell/src/Tag.vala"
 			while (TRUE) {
-#line 8902 "Tag.c"
-				GeeIterator* _tmp33_ = NULL;
-				gboolean _tmp34_ = FALSE;
+#line 8899 "Tag.c"
+				GeeIterator* _tmp33_;
+				gboolean _tmp34_;
 				DataView* view = NULL;
-				GeeIterator* _tmp35_ = NULL;
-				gpointer _tmp36_ = NULL;
+				GeeIterator* _tmp35_;
+				gpointer _tmp36_;
 				MediaSource* source = NULL;
-				DataView* _tmp37_ = NULL;
-				DataSource* _tmp38_ = NULL;
+				DataView* _tmp37_;
+				DataSource* _tmp38_;
 				gboolean is_removed = FALSE;
-				TagRow* _tmp39_ = NULL;
-				GeeSet* _tmp40_ = NULL;
-				MediaSource* _tmp41_ = NULL;
-				gchar* _tmp42_ = NULL;
-				gchar* _tmp43_ = NULL;
-				gboolean _tmp44_ = FALSE;
-				gboolean _tmp45_ = FALSE;
-				gboolean _tmp46_ = FALSE;
+				TagRow* _tmp39_;
+				GeeSet* _tmp40_;
+				MediaSource* _tmp41_;
+				gchar* _tmp42_;
+				gchar* _tmp43_;
+				gboolean _tmp44_;
+				gboolean _tmp45_;
+				gboolean _tmp46_;
 				gboolean is_added = FALSE;
-				GeeCollection* _tmp47_ = NULL;
-				MediaSource* _tmp48_ = NULL;
-				gboolean _tmp49_ = FALSE;
-				gboolean _tmp50_ = FALSE;
+				GeeCollection* _tmp47_;
+				MediaSource* _tmp48_;
+				gboolean _tmp49_;
+				gboolean _tmp50_;
 #line 1141 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp33_ = _view_it;
 #line 1141 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8929,7 +8926,7 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 				if (!_tmp34_) {
 #line 1141 "/home/jens/Source/shotwell/src/Tag.vala"
 					break;
-#line 8933 "Tag.c"
+#line 8930 "Tag.c"
 				}
 #line 1141 "/home/jens/Source/shotwell/src/Tag.vala"
 				_tmp35_ = _view_it;
@@ -8981,20 +8978,20 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 				_g_object_unref0 (source);
 #line 1141 "/home/jens/Source/shotwell/src/Tag.vala"
 				_g_object_unref0 (view);
-#line 8985 "Tag.c"
+#line 8982 "Tag.c"
 			}
 #line 1141 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (_view_it);
-#line 8989 "Tag.c"
+#line 8986 "Tag.c"
 		}
 	}
 	{
-		TagTable* _tmp51_ = NULL;
-		TagTable* _tmp52_ = NULL;
-		TagRow* _tmp53_ = NULL;
-		TagID _tmp54_ = {0};
-		TagRow* _tmp55_ = NULL;
-		GeeSet* _tmp56_ = NULL;
+		TagTable* _tmp51_;
+		TagTable* _tmp52_;
+		TagRow* _tmp53_;
+		TagID _tmp54_;
+		TagRow* _tmp55_;
+		GeeSet* _tmp56_;
 #line 1153 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp51_ = tag_table_get_instance ();
 #line 1153 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9015,8 +9012,8 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1153 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 9019 "Tag.c"
-				goto __catch476_database_error;
+#line 9016 "Tag.c"
+				goto __catch477_database_error;
 			}
 #line 1153 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (removed_sources);
@@ -9028,14 +9025,14 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 			g_clear_error (&_inner_error_);
 #line 1153 "/home/jens/Source/shotwell/src/Tag.vala"
 			return;
-#line 9032 "Tag.c"
+#line 9029 "Tag.c"
 		}
 	}
-	goto __finally476;
-	__catch476_database_error:
+	goto __finally477;
+	__catch477_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp57_ = NULL;
+		GError* _tmp57_;
 #line 1152 "/home/jens/Source/shotwell/src/Tag.vala"
 		err = _inner_error_;
 #line 1152 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9046,9 +9043,9 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 		app_window_database_error (_tmp57_);
 #line 1152 "/home/jens/Source/shotwell/src/Tag.vala"
 		_g_error_free0 (err);
-#line 9050 "Tag.c"
+#line 9047 "Tag.c"
 	}
-	__finally476:
+	__finally477:
 #line 1152 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1152 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9061,16 +9058,16 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 		g_clear_error (&_inner_error_);
 #line 1152 "/home/jens/Source/shotwell/src/Tag.vala"
 		return;
-#line 9065 "Tag.c"
+#line 9062 "Tag.c"
 	}
 #line 1159 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp58_ = added_sources;
 #line 1159 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (_tmp58_ != NULL) {
-#line 9071 "Tag.c"
-		TagSourceCollection* _tmp59_ = NULL;
-		GeeCollection* _tmp60_ = NULL;
-		gboolean _tmp61_ = FALSE;
+#line 9068 "Tag.c"
+		TagSourceCollection* _tmp59_;
+		GeeCollection* _tmp60_;
+		gboolean _tmp61_;
 #line 1160 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp59_ = tag_global;
 #line 1160 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9079,16 +9076,16 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 		_tmp61_ = self->priv->relinking;
 #line 1160 "/home/jens/Source/shotwell/src/Tag.vala"
 		container_source_collection_notify_container_contents_added (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), _tmp60_, _tmp61_);
-#line 9083 "Tag.c"
+#line 9080 "Tag.c"
 	}
 #line 1162 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp62_ = removed_sources;
 #line 1162 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (_tmp62_ != NULL) {
-#line 9089 "Tag.c"
-		TagSourceCollection* _tmp63_ = NULL;
-		GeeCollection* _tmp64_ = NULL;
-		gboolean _tmp65_ = FALSE;
+#line 9086 "Tag.c"
+		TagSourceCollection* _tmp63_;
+		GeeCollection* _tmp64_;
+		gboolean _tmp65_;
 #line 1163 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp63_ = tag_global;
 #line 1163 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9097,7 +9094,7 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 		_tmp65_ = self->priv->unlinking;
 #line 1163 "/home/jens/Source/shotwell/src/Tag.vala"
 		container_source_collection_notify_container_contents_removed (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), _tmp64_, _tmp65_);
-#line 9101 "Tag.c"
+#line 9098 "Tag.c"
 	}
 #line 1165 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp67_ = added_sources;
@@ -9105,23 +9102,23 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 	if (_tmp67_ != NULL) {
 #line 1165 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp66_ = TRUE;
-#line 9109 "Tag.c"
+#line 9106 "Tag.c"
 	} else {
-		GeeCollection* _tmp68_ = NULL;
+		GeeCollection* _tmp68_;
 #line 1165 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp68_ = removed_sources;
 #line 1165 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp66_ = _tmp68_ != NULL;
-#line 9116 "Tag.c"
+#line 9113 "Tag.c"
 	}
 #line 1165 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (_tmp66_) {
-#line 9120 "Tag.c"
-		TagSourceCollection* _tmp69_ = NULL;
-		GeeCollection* _tmp70_ = NULL;
-		gboolean _tmp71_ = FALSE;
-		GeeCollection* _tmp72_ = NULL;
-		gboolean _tmp73_ = FALSE;
+#line 9117 "Tag.c"
+		TagSourceCollection* _tmp69_;
+		GeeCollection* _tmp70_;
+		gboolean _tmp71_;
+		GeeCollection* _tmp72_;
+		gboolean _tmp73_;
 #line 1166 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp69_ = tag_global;
 #line 1166 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9134,20 +9131,20 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 		_tmp73_ = self->priv->unlinking;
 #line 1166 "/home/jens/Source/shotwell/src/Tag.vala"
 		container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), _tmp70_, _tmp71_, _tmp72_, _tmp73_);
-#line 9138 "Tag.c"
+#line 9135 "Tag.c"
 	}
 #line 1118 "/home/jens/Source/shotwell/src/Tag.vala"
 	_g_object_unref0 (removed_sources);
 #line 1118 "/home/jens/Source/shotwell/src/Tag.vala"
 	_g_object_unref0 (added_sources);
-#line 9144 "Tag.c"
+#line 9141 "Tag.c"
 }
 
 
 static void tag_on_sources_destroyed (Tag* self, GeeCollection* sources) {
-	GeeCollection* _tmp0_ = NULL;
-	GeeMultiMap* _tmp1_ = NULL;
-	GeeMultiMap* _tmp2_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeMultiMap* _tmp1_;
+	GeeMultiMap* _tmp2_;
 #line 1171 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_if_fail (IS_TAG (self));
 #line 1171 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9160,14 +9157,14 @@ static void tag_on_sources_destroyed (Tag* self, GeeCollection* sources) {
 	_tmp2_ = _tmp1_;
 #line 1172 "/home/jens/Source/shotwell/src/Tag.vala"
 	_g_object_unref0 (_tmp2_);
-#line 9164 "Tag.c"
+#line 9161 "Tag.c"
 }
 
 
 static void tag_real_destroy (DataSource* base) {
 	Tag * self;
-	ViewCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	ViewCollection* _tmp0_;
+	gint _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 1175 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag);
@@ -9177,21 +9174,21 @@ static void tag_real_destroy (DataSource* base) {
 	_tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection));
 #line 1179 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (_tmp1_ > 0) {
-#line 9181 "Tag.c"
-		ViewCollection* _tmp2_ = NULL;
-		guint _tmp3_ = 0U;
+#line 9178 "Tag.c"
+		ViewCollection* _tmp2_;
+		guint _tmp3_;
 		GeeArrayList* removed = NULL;
-		GeeArrayList* _tmp4_ = NULL;
-		GeeArrayList* _tmp5_ = NULL;
-		ViewCollection* _tmp6_ = NULL;
-		GeeCollection* _tmp7_ = NULL;
-		GeeCollection* _tmp8_ = NULL;
-		ViewCollection* _tmp9_ = NULL;
-		TagSourceCollection* _tmp10_ = NULL;
-		GeeArrayList* _tmp11_ = NULL;
-		TagSourceCollection* _tmp12_ = NULL;
-		GeeArrayList* _tmp13_ = NULL;
-		ViewCollection* _tmp14_ = NULL;
+		GeeArrayList* _tmp4_;
+		GeeArrayList* _tmp5_;
+		ViewCollection* _tmp6_;
+		GeeCollection* _tmp7_;
+		GeeCollection* _tmp8_;
+		ViewCollection* _tmp9_;
+		TagSourceCollection* _tmp10_;
+		GeeArrayList* _tmp11_;
+		TagSourceCollection* _tmp12_;
+		GeeArrayList* _tmp13_;
+		ViewCollection* _tmp14_;
 #line 1180 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp2_ = self->priv->media_views;
 #line 1180 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9236,13 +9233,13 @@ static void tag_real_destroy (DataSource* base) {
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _tag_on_media_views_contents_altered_data_collection_contents_altered, self, 0);
 #line 1179 "/home/jens/Source/shotwell/src/Tag.vala"
 		_g_object_unref0 (removed);
-#line 9240 "Tag.c"
+#line 9237 "Tag.c"
 	}
 	{
-		TagTable* _tmp15_ = NULL;
-		TagTable* _tmp16_ = NULL;
-		TagRow* _tmp17_ = NULL;
-		TagID _tmp18_ = {0};
+		TagTable* _tmp15_;
+		TagTable* _tmp16_;
+		TagRow* _tmp17_;
+		TagID _tmp18_;
 #line 1194 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp15_ = tag_table_get_instance ();
 #line 1194 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9259,8 +9256,8 @@ static void tag_real_destroy (DataSource* base) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1194 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 9263 "Tag.c"
-				goto __catch477_database_error;
+#line 9260 "Tag.c"
+				goto __catch478_database_error;
 			}
 #line 1194 "/home/jens/Source/shotwell/src/Tag.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9268,14 +9265,14 @@ static void tag_real_destroy (DataSource* base) {
 			g_clear_error (&_inner_error_);
 #line 1194 "/home/jens/Source/shotwell/src/Tag.vala"
 			return;
-#line 9272 "Tag.c"
+#line 9269 "Tag.c"
 		}
 	}
-	goto __finally477;
-	__catch477_database_error:
+	goto __finally478;
+	__catch478_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp19_ = NULL;
+		GError* _tmp19_;
 #line 1193 "/home/jens/Source/shotwell/src/Tag.vala"
 		err = _inner_error_;
 #line 1193 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9286,9 +9283,9 @@ static void tag_real_destroy (DataSource* base) {
 		app_window_database_error (_tmp19_);
 #line 1193 "/home/jens/Source/shotwell/src/Tag.vala"
 		_g_error_free0 (err);
-#line 9290 "Tag.c"
+#line 9287 "Tag.c"
 	}
-	__finally477:
+	__finally478:
 #line 1193 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1193 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9297,28 +9294,28 @@ static void tag_real_destroy (DataSource* base) {
 		g_clear_error (&_inner_error_);
 #line 1193 "/home/jens/Source/shotwell/src/Tag.vala"
 		return;
-#line 9301 "Tag.c"
+#line 9298 "Tag.c"
 	}
 #line 1199 "/home/jens/Source/shotwell/src/Tag.vala"
 	DATA_SOURCE_CLASS (tag_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource));
-#line 9305 "Tag.c"
+#line 9302 "Tag.c"
 }
 
 
 static void _tag_tag_snapshot_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 292 "/home/jens/Source/shotwell/src/Tag.vala"
 	tag_tag_snapshot_on_source_destroyed ((TagTagSnapshot*) self, source);
-#line 9312 "Tag.c"
+#line 9309 "Tag.c"
 }
 
 
 static TagTagSnapshot* tag_tag_snapshot_construct (GType object_type, Tag* tag) {
 	TagTagSnapshot* self = NULL;
-	Tag* _tmp0_ = NULL;
-	TagRow* _tmp1_ = NULL;
-	TagRow* _tmp2_ = NULL;
-	LibraryPhotoSourceCollection* _tmp14_ = NULL;
-	VideoSourceCollection* _tmp15_ = NULL;
+	Tag* _tmp0_;
+	TagRow* _tmp1_;
+	TagRow* _tmp2_;
+	LibraryPhotoSourceCollection* _tmp14_;
+	VideoSourceCollection* _tmp15_;
 #line 278 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (tag), NULL);
 #line 278 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9333,14 +9330,14 @@ static TagTagSnapshot* tag_tag_snapshot_construct (GType object_type, Tag* tag)
 	_tag_row_unref0 (self->priv->row);
 #line 280 "/home/jens/Source/shotwell/src/Tag.vala"
 	self->priv->row = _tmp2_;
-#line 9337 "Tag.c"
+#line 9334 "Tag.c"
 	{
 		GeeIterator* _source_it = NULL;
-		Tag* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeCollection* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
-		GeeIterator* _tmp7_ = NULL;
+		Tag* _tmp3_;
+		GeeCollection* _tmp4_;
+		GeeCollection* _tmp5_;
+		GeeIterator* _tmp6_;
+		GeeIterator* _tmp7_;
 #line 284 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp3_ = tag;
 #line 284 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9357,14 +9354,14 @@ static TagTagSnapshot* tag_tag_snapshot_construct (GType object_type, Tag* tag)
 		_source_it = _tmp7_;
 #line 284 "/home/jens/Source/shotwell/src/Tag.vala"
 		while (TRUE) {
-#line 9361 "Tag.c"
-			GeeIterator* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+#line 9358 "Tag.c"
+			GeeIterator* _tmp8_;
+			gboolean _tmp9_;
 			MediaSource* source = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			gpointer _tmp11_ = NULL;
-			GeeHashSet* _tmp12_ = NULL;
-			MediaSource* _tmp13_ = NULL;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			GeeHashSet* _tmp12_;
+			MediaSource* _tmp13_;
 #line 284 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp8_ = _source_it;
 #line 284 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9373,7 +9370,7 @@ static TagTagSnapshot* tag_tag_snapshot_construct (GType object_type, Tag* tag)
 			if (!_tmp9_) {
 #line 284 "/home/jens/Source/shotwell/src/Tag.vala"
 				break;
-#line 9377 "Tag.c"
+#line 9374 "Tag.c"
 			}
 #line 284 "/home/jens/Source/shotwell/src/Tag.vala"
 			_tmp10_ = _source_it;
@@ -9389,11 +9386,11 @@ static TagTagSnapshot* tag_tag_snapshot_construct (GType object_type, Tag* tag)
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
 #line 284 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (source);
-#line 9393 "Tag.c"
+#line 9390 "Tag.c"
 		}
 #line 284 "/home/jens/Source/shotwell/src/Tag.vala"
 		_g_object_unref0 (_source_it);
-#line 9397 "Tag.c"
+#line 9394 "Tag.c"
 	}
 #line 287 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp14_ = library_photo_global;
@@ -9405,21 +9402,21 @@ static TagTagSnapshot* tag_tag_snapshot_construct (GType object_type, Tag* tag)
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _tag_tag_snapshot_on_source_destroyed_source_collection_item_destroyed, self);
 #line 278 "/home/jens/Source/shotwell/src/Tag.vala"
 	return self;
-#line 9409 "Tag.c"
+#line 9406 "Tag.c"
 }
 
 
 static TagTagSnapshot* tag_tag_snapshot_new (Tag* tag) {
 #line 278 "/home/jens/Source/shotwell/src/Tag.vala"
 	return tag_tag_snapshot_construct (TAG_TYPE_TAG_SNAPSHOT, tag);
-#line 9416 "Tag.c"
+#line 9413 "Tag.c"
 }
 
 
 static TagRow* tag_tag_snapshot_get_row (TagTagSnapshot* self) {
 	TagRow* result = NULL;
-	TagRow* _tmp0_ = NULL;
-	TagRow* _tmp1_ = NULL;
+	TagRow* _tmp0_;
+	TagRow* _tmp1_;
 #line 296 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (TAG_IS_TAG_SNAPSHOT (self), NULL);
 #line 297 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9430,14 +9427,14 @@ static TagRow* tag_tag_snapshot_get_row (TagTagSnapshot* self) {
 	result = _tmp1_;
 #line 297 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 9434 "Tag.c"
+#line 9431 "Tag.c"
 }
 
 
 static void tag_tag_snapshot_real_notify_broken (SourceSnapshot* base) {
 	TagTagSnapshot * self;
-	TagRow* _tmp0_ = NULL;
-	GeeHashSet* _tmp1_ = NULL;
+	TagRow* _tmp0_;
+	GeeHashSet* _tmp1_;
 #line 300 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAG_TYPE_TAG_SNAPSHOT, TagTagSnapshot);
 #line 301 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9452,14 +9449,14 @@ static void tag_tag_snapshot_real_notify_broken (SourceSnapshot* base) {
 	gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 304 "/home/jens/Source/shotwell/src/Tag.vala"
 	SOURCE_SNAPSHOT_CLASS (tag_tag_snapshot_parent_class)->notify_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_SNAPSHOT, SourceSnapshot));
-#line 9456 "Tag.c"
+#line 9453 "Tag.c"
 }
 
 
 static void tag_tag_snapshot_on_source_destroyed (TagTagSnapshot* self, DataSource* source) {
-	GeeHashSet* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashSet* _tmp0_;
+	DataSource* _tmp1_;
+	gboolean _tmp2_;
 #line 307 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_if_fail (TAG_IS_TAG_SNAPSHOT (self));
 #line 307 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9474,7 +9471,7 @@ static void tag_tag_snapshot_on_source_destroyed (TagTagSnapshot* self, DataSour
 	if (_tmp2_) {
 #line 309 "/home/jens/Source/shotwell/src/Tag.vala"
 		source_snapshot_notify_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_SNAPSHOT, SourceSnapshot));
-#line 9478 "Tag.c"
+#line 9475 "Tag.c"
 	}
 }
 
@@ -9487,29 +9484,29 @@ static void tag_tag_snapshot_class_init (TagTagSnapshotClass * klass) {
 #line 274 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_type_class_add_private (klass, sizeof (TagTagSnapshotPrivate));
 #line 274 "/home/jens/Source/shotwell/src/Tag.vala"
-	((SourceSnapshotClass *) klass)->notify_broken = (void (*)(SourceSnapshot*)) tag_tag_snapshot_real_notify_broken;
-#line 9492 "Tag.c"
+	((SourceSnapshotClass *) klass)->notify_broken = (void (*) (SourceSnapshot *)) tag_tag_snapshot_real_notify_broken;
+#line 9489 "Tag.c"
 }
 
 
 static void tag_tag_snapshot_instance_init (TagTagSnapshot * self) {
-	GeeHashSet* _tmp0_ = NULL;
+	GeeHashSet* _tmp0_;
 #line 274 "/home/jens/Source/shotwell/src/Tag.vala"
 	self->priv = TAG_TAG_SNAPSHOT_GET_PRIVATE (self);
 #line 276 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp0_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 276 "/home/jens/Source/shotwell/src/Tag.vala"
 	self->priv->sources = _tmp0_;
-#line 9504 "Tag.c"
+#line 9501 "Tag.c"
 }
 
 
-static void tag_tag_snapshot_finalize (SourceSnapshot* obj) {
+static void tag_tag_snapshot_finalize (SourceSnapshot * obj) {
 	TagTagSnapshot * self;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	VideoSourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	LibraryPhotoSourceCollection* _tmp0_;
+	guint _tmp1_;
+	VideoSourceCollection* _tmp2_;
+	guint _tmp3_;
 #line 274 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAG_TYPE_TAG_SNAPSHOT, TagTagSnapshot);
 #line 292 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9530,7 +9527,7 @@ static void tag_tag_snapshot_finalize (SourceSnapshot* obj) {
 	_g_object_unref0 (self->priv->sources);
 #line 274 "/home/jens/Source/shotwell/src/Tag.vala"
 	SOURCE_SNAPSHOT_CLASS (tag_tag_snapshot_parent_class)->finalize (obj);
-#line 9534 "Tag.c"
+#line 9531 "Tag.c"
 }
 
 
@@ -9548,7 +9545,7 @@ static GType tag_tag_snapshot_get_type (void) {
 
 static TagTagProxy* tag_tag_proxy_construct (GType object_type, Tag* tag) {
 	TagTagProxy* self = NULL;
-	Tag* _tmp0_ = NULL;
+	Tag* _tmp0_;
 #line 314 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (IS_TAG (tag), NULL);
 #line 315 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9557,26 +9554,26 @@ static TagTagProxy* tag_tag_proxy_construct (GType object_type, Tag* tag) {
 	self = (TagTagProxy*) source_proxy_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource));
 #line 314 "/home/jens/Source/shotwell/src/Tag.vala"
 	return self;
-#line 9561 "Tag.c"
+#line 9558 "Tag.c"
 }
 
 
 static TagTagProxy* tag_tag_proxy_new (Tag* tag) {
 #line 314 "/home/jens/Source/shotwell/src/Tag.vala"
 	return tag_tag_proxy_construct (TAG_TYPE_TAG_PROXY, tag);
-#line 9568 "Tag.c"
+#line 9565 "Tag.c"
 }
 
 
 static DataSource* tag_tag_proxy_real_reconstitute (SourceProxy* base, gint64 object_id, SourceSnapshot* snapshot) {
 	TagTagProxy * self;
 	DataSource* result = NULL;
-	gint64 _tmp0_ = 0LL;
-	SourceSnapshot* _tmp1_ = NULL;
-	TagRow* _tmp2_ = NULL;
-	TagRow* _tmp3_ = NULL;
-	Tag* _tmp4_ = NULL;
-	DataSource* _tmp5_ = NULL;
+	gint64 _tmp0_;
+	SourceSnapshot* _tmp1_;
+	TagRow* _tmp2_;
+	TagRow* _tmp3_;
+	Tag* _tmp4_;
+	DataSource* _tmp5_;
 #line 318 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAG_TYPE_TAG_PROXY, TagTagProxy);
 #line 318 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9599,7 +9596,7 @@ static DataSource* tag_tag_proxy_real_reconstitute (SourceProxy* base, gint64 ob
 	result = _tmp5_;
 #line 319 "/home/jens/Source/shotwell/src/Tag.vala"
 	return result;
-#line 9603 "Tag.c"
+#line 9600 "Tag.c"
 }
 
 
@@ -9607,8 +9604,8 @@ static void tag_tag_proxy_class_init (TagTagProxyClass * klass) {
 #line 313 "/home/jens/Source/shotwell/src/Tag.vala"
 	tag_tag_proxy_parent_class = g_type_class_peek_parent (klass);
 #line 313 "/home/jens/Source/shotwell/src/Tag.vala"
-	((SourceProxyClass *) klass)->reconstitute = (DataSource* (*)(SourceProxy*, gint64, SourceSnapshot*)) tag_tag_proxy_real_reconstitute;
-#line 9612 "Tag.c"
+	((SourceProxyClass *) klass)->reconstitute = (DataSource* (*) (SourceProxy *, gint64, SourceSnapshot*)) tag_tag_proxy_real_reconstitute;
+#line 9609 "Tag.c"
 }
 
 
@@ -9634,22 +9631,22 @@ static void tag_class_init (TagClass * klass) {
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_type_class_add_private (klass, sizeof (TagPrivate));
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
-	((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) tag_real_get_typename;
+	((DataSourceClass *) klass)->get_typename = (gchar* (*) (DataSource *)) tag_real_get_typename;
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
-	((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) tag_real_get_instance_id;
+	((DataSourceClass *) klass)->get_instance_id = (gint64 (*) (DataSource *)) tag_real_get_instance_id;
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
-	((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) tag_real_get_name;
+	((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) tag_real_get_name;
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
-	((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) tag_real_to_string;
+	((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) tag_real_to_string;
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
-	((DataSourceClass *) klass)->equals = (gboolean (*)(DataSource*, DataSource*)) tag_real_equals;
+	((DataSourceClass *) klass)->equals = (gboolean (*) (DataSource *, DataSource*)) tag_real_equals;
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
-	((DataSourceClass *) klass)->save_snapshot = (SourceSnapshot* (*)(DataSource*)) tag_real_save_snapshot;
+	((DataSourceClass *) klass)->save_snapshot = (SourceSnapshot* (*) (DataSource *)) tag_real_save_snapshot;
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
-	((DataSourceClass *) klass)->destroy = (void (*)(DataSource*)) tag_real_destroy;
+	((DataSourceClass *) klass)->destroy = (void (*) (DataSource *)) tag_real_destroy;
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
 	G_OBJECT_CLASS (klass)->finalize = tag_finalize;
-#line 9653 "Tag.c"
+#line 9650 "Tag.c"
 }
 
 
@@ -9657,18 +9654,18 @@ static void tag_container_source_interface_init (ContainerSourceIface * iface) {
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
 	tag_container_source_parent_iface = g_type_interface_peek_parent (iface);
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
-	iface->has_links = (gboolean (*)(ContainerSource*)) tag_real_has_links;
+	iface->has_links = (gboolean (*) (ContainerSource *)) tag_real_has_links;
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
-	iface->get_backlink = (SourceBacklink* (*)(ContainerSource*)) tag_real_get_backlink;
+	iface->get_backlink = (SourceBacklink* (*) (ContainerSource *)) tag_real_get_backlink;
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
-	iface->break_link = (void (*)(ContainerSource*, DataSource*)) tag_real_break_link;
+	iface->break_link = (void (*) (ContainerSource *, DataSource*)) tag_real_break_link;
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
-	iface->break_link_many = (void (*)(ContainerSource*, GeeCollection*)) tag_real_break_link_many;
+	iface->break_link_many = (void (*) (ContainerSource *, GeeCollection*)) tag_real_break_link_many;
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
-	iface->establish_link = (void (*)(ContainerSource*, DataSource*)) tag_real_establish_link;
+	iface->establish_link = (void (*) (ContainerSource *, DataSource*)) tag_real_establish_link;
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
-	iface->establish_link_many = (void (*)(ContainerSource*, GeeCollection*)) tag_real_establish_link_many;
-#line 9672 "Tag.c"
+	iface->establish_link_many = (void (*) (ContainerSource *, GeeCollection*)) tag_real_establish_link_many;
+#line 9669 "Tag.c"
 }
 
 
@@ -9676,8 +9673,8 @@ static void tag_proxyable_interface_init (ProxyableIface * iface) {
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
 	tag_proxyable_parent_iface = g_type_interface_peek_parent (iface);
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
-	iface->get_proxy = (SourceProxy* (*)(Proxyable*)) tag_real_get_proxy;
-#line 9681 "Tag.c"
+	iface->get_proxy = (SourceProxy* (*) (Proxyable *)) tag_real_get_proxy;
+#line 9678 "Tag.c"
 }
 
 
@@ -9685,8 +9682,8 @@ static void tag_indexable_interface_init (IndexableIface * iface) {
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
 	tag_indexable_parent_iface = g_type_interface_peek_parent (iface);
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
-	iface->get_indexable_keywords = (const gchar* (*)(Indexable*)) tag_real_get_indexable_keywords;
-#line 9690 "Tag.c"
+	iface->get_indexable_keywords = (const gchar* (*) (Indexable *)) tag_real_get_indexable_keywords;
+#line 9687 "Tag.c"
 }
 
 
@@ -9701,18 +9698,18 @@ static void tag_instance_init (Tag * self) {
 	self->priv->relinking = FALSE;
 #line 330 "/home/jens/Source/shotwell/src/Tag.vala"
 	self->priv->indexable_keywords = NULL;
-#line 9705 "Tag.c"
+#line 9702 "Tag.c"
 }
 
 
-static void tag_finalize (GObject* obj) {
+static void tag_finalize (GObject * obj) {
 	Tag * self;
-	ViewCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	LibraryPhotoSourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	VideoSourceCollection* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
+	ViewCollection* _tmp0_;
+	guint _tmp1_;
+	LibraryPhotoSourceCollection* _tmp2_;
+	guint _tmp3_;
+	VideoSourceCollection* _tmp4_;
+	guint _tmp5_;
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TAG, Tag);
 #line 382 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9743,7 +9740,7 @@ static void tag_finalize (GObject* obj) {
 	_g_free0 (self->priv->indexable_keywords);
 #line 269 "/home/jens/Source/shotwell/src/Tag.vala"
 	G_OBJECT_CLASS (tag_parent_class)->finalize (obj);
-#line 9747 "Tag.c"
+#line 9744 "Tag.c"
 }
 
 
diff --git a/src/Thumbnail.c b/src/Thumbnail.c
index a368b97..c884d23 100644
--- a/src/Thumbnail.c
+++ b/src/Thumbnail.c
@@ -1,4 +1,4 @@
-/* Thumbnail.c generated by valac 0.34.7, the Vala compiler
+/* Thumbnail.c generated by valac 0.36.6, the Vala compiler
  * generated from Thumbnail.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -575,7 +575,7 @@ static void _vala_GValue_free (GValue* self);
 GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale);
 gint thumbnail_cache_size_get_scale (ThumbnailCacheSize self);
 gint thumbnail_get_DEFAULT_SCALE (void);
-static void thumbnail_finalize (GObject* obj);
+static void thumbnail_finalize (GObject * obj);
 static void _vala_thumbnail_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 
 
@@ -602,28 +602,28 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scale) {
 	Thumbnail * self = NULL;
-	MediaSource* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
+	MediaSource* _tmp0_;
+	MediaSource* _tmp1_;
 	Dimensions _tmp2_ = {0};
-	gint _tmp3_ = 0;
+	gint _tmp3_;
 	Dimensions _tmp4_ = {0};
-	MediaSource* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	MediaSource* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	MediaSource* _tmp11_ = NULL;
-	MediaSource* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	TagSourceCollection* _tmp14_ = NULL;
-	TagSourceCollection* _tmp15_ = NULL;
+	MediaSource* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	MediaSource* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	MediaSource* _tmp11_;
+	MediaSource* _tmp12_;
+	gint _tmp13_;
+	TagSourceCollection* _tmp14_;
+	TagSourceCollection* _tmp15_;
 	gboolean _tmp16_ = FALSE;
-	MediaSource* _tmp17_ = NULL;
-	MediaSource* _tmp19_ = NULL;
-	MediaSource* _tmp20_ = NULL;
+	MediaSource* _tmp17_;
+	MediaSource* _tmp19_;
+	MediaSource* _tmp20_;
 	Dimensions _tmp21_ = {0};
-	gint _tmp22_ = 0;
+	gint _tmp22_;
 	Dimensions _tmp23_ = {0};
 #line 49 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (media), NULL);
@@ -683,7 +683,7 @@ Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scal
 		_tmp16_ = TRUE;
 #line 685 "Thumbnail.c"
 	} else {
-		MediaSource* _tmp18_ = NULL;
+		MediaSource* _tmp18_;
 #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp18_ = media;
 #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -729,11 +729,11 @@ Thumbnail* thumbnail_new (MediaSource* media, gint scale) {
 
 static void thumbnail_update_tags (Thumbnail* self, gboolean init) {
 	GeeCollection* tags = NULL;
-	TagSourceCollection* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	GeeSortedSet* _tmp2_ = NULL;
+	TagSourceCollection* _tmp0_;
+	MediaSource* _tmp1_;
+	GeeSortedSet* _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	GeeCollection* _tmp4_ = NULL;
+	GeeCollection* _tmp4_;
 #line 80 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 81 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -752,9 +752,9 @@ static void thumbnail_update_tags (Thumbnail* self, gboolean init) {
 		_tmp3_ = TRUE;
 #line 754 "Thumbnail.c"
 	} else {
-		GeeCollection* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		GeeCollection* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 #line 82 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = tags;
 #line 82 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -771,7 +771,7 @@ static void thumbnail_update_tags (Thumbnail* self, gboolean init) {
 		checkerboard_item_clear_tags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
 #line 773 "Thumbnail.c"
 	} else {
-		GeeCollection* _tmp8_ = NULL;
+		GeeCollection* _tmp8_;
 #line 85 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = tags;
 #line 85 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -785,15 +785,15 @@ static void thumbnail_update_tags (Thumbnail* self, gboolean init) {
 
 
 static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource* container, GeeCollection* added, gboolean relinking, GeeCollection* removed, gboolean unlinking) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	GeeCollection* _tmp2_ = NULL;
+	GeeCollection* _tmp2_;
 	gboolean tag_added = FALSE;
 	gboolean _tmp6_ = FALSE;
-	GeeCollection* _tmp7_ = NULL;
+	GeeCollection* _tmp7_;
 	gboolean tag_removed = FALSE;
 	gboolean _tmp11_ = FALSE;
-	gboolean _tmp12_ = FALSE;
+	gboolean _tmp12_;
 #line 88 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 88 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -815,9 +815,9 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource*
 #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp2_ != NULL) {
 #line 818 "Thumbnail.c"
-		GeeCollection* _tmp3_ = NULL;
-		MediaSource* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+		GeeCollection* _tmp3_;
+		MediaSource* _tmp4_;
+		gboolean _tmp5_;
 #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = added;
 #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -839,9 +839,9 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource*
 #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp7_ != NULL) {
 #line 842 "Thumbnail.c"
-		GeeCollection* _tmp8_ = NULL;
-		MediaSource* _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
+		GeeCollection* _tmp8_;
+		MediaSource* _tmp9_;
+		gboolean _tmp10_;
 #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = removed;
 #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -866,7 +866,7 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource*
 		_tmp11_ = TRUE;
 #line 868 "Thumbnail.c"
 	} else {
-		gboolean _tmp13_ = FALSE;
+		gboolean _tmp13_;
 #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp13_ = tag_removed;
 #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -883,7 +883,7 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource*
 
 
 static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 101 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -898,12 +898,12 @@ static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) {
 	}
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeSet* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
+		GeeMap* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeSet* _tmp4_;
+		GeeIterator* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp1_ = altered;
 #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -923,17 +923,17 @@ static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) {
 #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		while (TRUE) {
 #line 926 "Thumbnail.c"
-			GeeIterator* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
 			Tag* tag = NULL;
-			DataObject* _tmp11_ = NULL;
-			Tag* _tmp12_ = NULL;
-			Tag* _tmp13_ = NULL;
-			MediaSource* _tmp14_ = NULL;
-			gboolean _tmp15_ = FALSE;
+			DataObject* _tmp11_;
+			Tag* _tmp12_;
+			Tag* _tmp13_;
+			MediaSource* _tmp14_;
+			gboolean _tmp15_;
 #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp7_ = _object_it;
 #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -989,10 +989,10 @@ static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) {
 
 static void thumbnail_update_title (Thumbnail* self, gboolean init) {
 	gchar* title = NULL;
-	MediaSource* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	MediaSource* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 #line 116 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 117 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1011,13 +1011,13 @@ static void thumbnail_update_title (Thumbnail* self, gboolean init) {
 		checkerboard_item_clear_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
 #line 1013 "Thumbnail.c"
 	} else {
-		gboolean _tmp4_ = FALSE;
+		gboolean _tmp4_;
 #line 120 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp4_ = init;
 #line 120 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		if (!_tmp4_) {
 #line 1020 "Thumbnail.c"
-			const gchar* _tmp5_ = NULL;
+			const gchar* _tmp5_;
 #line 121 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp5_ = title;
 #line 121 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1037,10 +1037,10 @@ static void thumbnail_update_title (Thumbnail* self, gboolean init) {
 
 static void thumbnail_update_comment (Thumbnail* self, gboolean init) {
 	gchar* comment = NULL;
-	MediaSource* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	MediaSource* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 #line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 127 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1059,13 +1059,13 @@ static void thumbnail_update_comment (Thumbnail* self, gboolean init) {
 		checkerboard_item_clear_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
 #line 1061 "Thumbnail.c"
 	} else {
-		gboolean _tmp4_ = FALSE;
+		gboolean _tmp4_;
 #line 130 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp4_ = init;
 #line 130 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		if (!_tmp4_) {
 #line 1068 "Thumbnail.c"
-			const gchar* _tmp5_ = NULL;
+			const gchar* _tmp5_;
 #line 131 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp5_ = comment;
 #line 131 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1086,10 +1086,10 @@ static void thumbnail_update_comment (Thumbnail* self, gboolean init) {
 static void thumbnail_real_notify_altered (DataObject* base, Alteration* alteration) {
 	Thumbnail * self;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	Alteration* _tmp8_ = NULL;
+	gboolean _tmp5_;
+	Alteration* _tmp8_;
 #line 136 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
 #line 136 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1099,8 +1099,8 @@ static void thumbnail_real_notify_altered (DataObject* base, Alteration* alterat
 #line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp1_) {
 #line 1102 "Thumbnail.c"
-		Alteration* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+		Alteration* _tmp2_;
+		gboolean _tmp3_;
 #line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp2_ = alteration;
 #line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1124,8 +1124,8 @@ static void thumbnail_real_notify_altered (DataObject* base, Alteration* alterat
 #line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp5_) {
 #line 1127 "Thumbnail.c"
-		Alteration* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+		Alteration* _tmp6_;
+		gboolean _tmp7_;
 #line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = alteration;
 #line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1154,8 +1154,8 @@ static void thumbnail_real_notify_altered (DataObject* base, Alteration* alterat
 
 MediaSource* thumbnail_get_media_source (Thumbnail* self) {
 	MediaSource* result = NULL;
-	MediaSource* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
+	MediaSource* _tmp0_;
+	MediaSource* _tmp1_;
 #line 145 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_THUMBNAIL (self), NULL);
 #line 146 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1172,12 +1172,12 @@ MediaSource* thumbnail_get_media_source (Thumbnail* self) {
 
 gint64 thumbnail_photo_id_ascending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	void* _tmp3_ = NULL;
-	MediaSource* _tmp4_ = NULL;
-	gint64 _tmp5_ = 0LL;
+	void* _tmp0_;
+	MediaSource* _tmp1_;
+	gint64 _tmp2_;
+	void* _tmp3_;
+	MediaSource* _tmp4_;
+	gint64 _tmp5_;
 #line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = a;
 #line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1200,9 +1200,9 @@ gint64 thumbnail_photo_id_ascending_comparator (void* a, void* b) {
 
 gint64 thumbnail_photo_id_descending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
+	void* _tmp0_;
+	void* _tmp1_;
+	gint64 _tmp2_;
 #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = b;
 #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1220,17 +1220,17 @@ gint64 thumbnail_photo_id_descending_comparator (void* a, void* b) {
 gint64 thumbnail_title_ascending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	gint64 _result_ = 0LL;
-	GCompareFunc _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	void* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	GCompareFunc _tmp0_;
+	void* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	void* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
 	gint64 _tmp9_ = 0LL;
-	gint64 _tmp10_ = 0LL;
+	gint64 _tmp10_;
 #line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = g_strcmp0;
 #line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1260,16 +1260,16 @@ gint64 thumbnail_title_ascending_comparator (void* a, void* b) {
 #line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp10_ != ((gint64) 0)) {
 #line 1263 "Thumbnail.c"
-		gint64 _tmp11_ = 0LL;
+		gint64 _tmp11_;
 #line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp11_ = _result_;
 #line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp9_ = _tmp11_;
 #line 1269 "Thumbnail.c"
 	} else {
-		void* _tmp12_ = NULL;
-		void* _tmp13_ = NULL;
-		gint64 _tmp14_ = 0LL;
+		void* _tmp12_;
+		void* _tmp13_;
+		gint64 _tmp14_;
 #line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp12_ = a;
 #line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1291,11 +1291,11 @@ gint64 thumbnail_title_ascending_comparator (void* a, void* b) {
 gint64 thumbnail_title_descending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	gint64 _result_ = 0LL;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
+	void* _tmp0_;
+	void* _tmp1_;
+	gint64 _tmp2_;
 	gint64 _tmp3_ = 0LL;
-	gint64 _tmp4_ = 0LL;
+	gint64 _tmp4_;
 #line 167 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = b;
 #line 167 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1309,16 +1309,16 @@ gint64 thumbnail_title_descending_comparator (void* a, void* b) {
 #line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp4_ != ((gint64) 0)) {
 #line 1312 "Thumbnail.c"
-		gint64 _tmp5_ = 0LL;
+		gint64 _tmp5_;
 #line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = _result_;
 #line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp5_;
 #line 1318 "Thumbnail.c"
 	} else {
-		void* _tmp6_ = NULL;
-		void* _tmp7_ = NULL;
-		gint64 _tmp8_ = 0LL;
+		void* _tmp6_;
+		void* _tmp7_;
+		gint64 _tmp8_;
 #line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = a;
 #line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1339,8 +1339,8 @@ gint64 thumbnail_title_descending_comparator (void* a, void* b) {
 
 gboolean thumbnail_title_comparator_predicate (DataObject* object, Alteration* alteration) {
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Alteration* _tmp0_;
+	gboolean _tmp1_;
 #line 172 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
 #line 172 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1360,18 +1360,18 @@ gboolean thumbnail_title_comparator_predicate (DataObject* object, Alteration* a
 gint64 thumbnail_exposure_time_ascending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	gint64 time_a = 0LL;
-	void* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	time_t _tmp2_ = 0;
+	void* _tmp0_;
+	MediaSource* _tmp1_;
+	time_t _tmp2_;
 	gint64 time_b = 0LL;
-	void* _tmp3_ = NULL;
-	MediaSource* _tmp4_ = NULL;
-	time_t _tmp5_ = 0;
+	void* _tmp3_;
+	MediaSource* _tmp4_;
+	time_t _tmp5_;
 	gint64 _result_ = 0LL;
-	gint64 _tmp6_ = 0LL;
-	gint64 _tmp7_ = 0LL;
+	gint64 _tmp6_;
+	gint64 _tmp7_;
 	gint64 _tmp8_ = 0LL;
-	gint64 _tmp9_ = 0LL;
+	gint64 _tmp9_;
 #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = a;
 #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1399,16 +1399,16 @@ gint64 thumbnail_exposure_time_ascending_comparator (void* a, void* b) {
 #line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp9_ != ((gint64) 0)) {
 #line 1402 "Thumbnail.c"
-		gint64 _tmp10_ = 0LL;
+		gint64 _tmp10_;
 #line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp10_ = _result_;
 #line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = _tmp10_;
 #line 1408 "Thumbnail.c"
 	} else {
-		void* _tmp11_ = NULL;
-		void* _tmp12_ = NULL;
-		gint64 _tmp13_ = 0LL;
+		void* _tmp11_;
+		void* _tmp12_;
+		gint64 _tmp13_;
 #line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp11_ = a;
 #line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1430,11 +1430,11 @@ gint64 thumbnail_exposure_time_ascending_comparator (void* a, void* b) {
 gint64 thumbnail_exposure_time_desending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	gint64 _result_ = 0LL;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
+	void* _tmp0_;
+	void* _tmp1_;
+	gint64 _tmp2_;
 	gint64 _tmp3_ = 0LL;
-	gint64 _tmp4_ = 0LL;
+	gint64 _tmp4_;
 #line 185 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = b;
 #line 185 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1448,16 +1448,16 @@ gint64 thumbnail_exposure_time_desending_comparator (void* a, void* b) {
 #line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp4_ != ((gint64) 0)) {
 #line 1451 "Thumbnail.c"
-		gint64 _tmp5_ = 0LL;
+		gint64 _tmp5_;
 #line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = _result_;
 #line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp5_;
 #line 1457 "Thumbnail.c"
 	} else {
-		void* _tmp6_ = NULL;
-		void* _tmp7_ = NULL;
-		gint64 _tmp8_ = 0LL;
+		void* _tmp6_;
+		void* _tmp7_;
+		gint64 _tmp8_;
 #line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = a;
 #line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1478,8 +1478,8 @@ gint64 thumbnail_exposure_time_desending_comparator (void* a, void* b) {
 
 gboolean thumbnail_exposure_time_comparator_predicate (DataObject* object, Alteration* alteration) {
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Alteration* _tmp0_;
+	gboolean _tmp1_;
 #line 190 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
 #line 190 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1498,8 +1498,8 @@ gboolean thumbnail_exposure_time_comparator_predicate (DataObject* object, Alter
 
 gboolean thumbnail_filename_comparator_predicate (DataObject* object, Alteration* alteration) {
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Alteration* _tmp0_;
+	gboolean _tmp1_;
 #line 194 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
 #line 194 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1519,35 +1519,35 @@ gboolean thumbnail_filename_comparator_predicate (DataObject* object, Alteration
 gint64 thumbnail_filename_ascending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	gchar* path_a = NULL;
-	void* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	void* _tmp0_;
+	MediaSource* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
 	gchar* path_b = NULL;
-	void* _tmp8_ = NULL;
-	MediaSource* _tmp9_ = NULL;
-	GFile* _tmp10_ = NULL;
-	GFile* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
+	void* _tmp8_;
+	MediaSource* _tmp9_;
+	GFile* _tmp10_;
+	GFile* _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
 	gint64 _result_ = 0LL;
-	GCompareFunc _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-	gint _tmp23_ = 0;
-	gint64 _tmp24_ = 0LL;
+	GCompareFunc _tmp16_;
+	const gchar* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
+	const gchar* _tmp20_;
+	gchar* _tmp21_;
+	gchar* _tmp22_;
+	gint _tmp23_;
+	gint64 _tmp24_;
 	gint64 _tmp25_ = 0LL;
-	gint64 _tmp26_ = 0LL;
+	gint64 _tmp26_;
 #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = a;
 #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1621,16 +1621,16 @@ gint64 thumbnail_filename_ascending_comparator (void* a, void* b) {
 #line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp26_ != ((gint64) 0)) {
 #line 1624 "Thumbnail.c"
-		gint64 _tmp27_ = 0LL;
+		gint64 _tmp27_;
 #line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp27_ = _result_;
 #line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp25_ = _tmp27_;
 #line 1630 "Thumbnail.c"
 	} else {
-		void* _tmp28_ = NULL;
-		void* _tmp29_ = NULL;
-		gint64 _tmp30_ = 0LL;
+		void* _tmp28_;
+		void* _tmp29_;
+		gint64 _tmp30_;
 #line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp28_ = a;
 #line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1656,11 +1656,11 @@ gint64 thumbnail_filename_ascending_comparator (void* a, void* b) {
 gint64 thumbnail_filename_descending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	gint64 _result_ = 0LL;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
+	void* _tmp0_;
+	void* _tmp1_;
+	gint64 _tmp2_;
 	gint64 _tmp3_ = 0LL;
-	gint64 _tmp4_ = 0LL;
+	gint64 _tmp4_;
 #line 208 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = b;
 #line 208 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1674,16 +1674,16 @@ gint64 thumbnail_filename_descending_comparator (void* a, void* b) {
 #line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp4_ != ((gint64) 0)) {
 #line 1677 "Thumbnail.c"
-		gint64 _tmp5_ = 0LL;
+		gint64 _tmp5_;
 #line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = _result_;
 #line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp5_;
 #line 1683 "Thumbnail.c"
 	} else {
-		void* _tmp6_ = NULL;
-		void* _tmp7_ = NULL;
-		gint64 _tmp8_ = 0LL;
+		void* _tmp6_;
+		void* _tmp7_;
+		gint64 _tmp8_;
 #line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = a;
 #line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1705,14 +1705,14 @@ gint64 thumbnail_filename_descending_comparator (void* a, void* b) {
 gint64 thumbnail_rating_ascending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	gint64 _result_ = 0LL;
-	void* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	Rating _tmp2_ = 0;
-	void* _tmp3_ = NULL;
-	MediaSource* _tmp4_ = NULL;
-	Rating _tmp5_ = 0;
+	void* _tmp0_;
+	MediaSource* _tmp1_;
+	Rating _tmp2_;
+	void* _tmp3_;
+	MediaSource* _tmp4_;
+	Rating _tmp5_;
 	gint64 _tmp6_ = 0LL;
-	gint64 _tmp7_ = 0LL;
+	gint64 _tmp7_;
 #line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = a;
 #line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1732,16 +1732,16 @@ gint64 thumbnail_rating_ascending_comparator (void* a, void* b) {
 #line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp7_ != ((gint64) 0)) {
 #line 1735 "Thumbnail.c"
-		gint64 _tmp8_ = 0LL;
+		gint64 _tmp8_;
 #line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = _result_;
 #line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = _tmp8_;
 #line 1741 "Thumbnail.c"
 	} else {
-		void* _tmp9_ = NULL;
-		void* _tmp10_ = NULL;
-		gint64 _tmp11_ = 0LL;
+		void* _tmp9_;
+		void* _tmp10_;
+		gint64 _tmp11_;
 #line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp9_ = a;
 #line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1763,11 +1763,11 @@ gint64 thumbnail_rating_ascending_comparator (void* a, void* b) {
 gint64 thumbnail_rating_descending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	gint64 _result_ = 0LL;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
+	void* _tmp0_;
+	void* _tmp1_;
+	gint64 _tmp2_;
 	gint64 _tmp3_ = 0LL;
-	gint64 _tmp4_ = 0LL;
+	gint64 _tmp4_;
 #line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = b;
 #line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1781,16 +1781,16 @@ gint64 thumbnail_rating_descending_comparator (void* a, void* b) {
 #line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp4_ != ((gint64) 0)) {
 #line 1784 "Thumbnail.c"
-		gint64 _tmp5_ = 0LL;
+		gint64 _tmp5_;
 #line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = _result_;
 #line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp5_;
 #line 1790 "Thumbnail.c"
 	} else {
-		void* _tmp6_ = NULL;
-		void* _tmp7_ = NULL;
-		gint64 _tmp8_ = 0LL;
+		void* _tmp6_;
+		void* _tmp7_;
+		gint64 _tmp8_;
 #line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = a;
 #line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1811,8 +1811,8 @@ gint64 thumbnail_rating_descending_comparator (void* a, void* b) {
 
 gboolean thumbnail_rating_comparator_predicate (DataObject* object, Alteration* alteration) {
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Alteration* _tmp0_;
+	gboolean _tmp1_;
 #line 225 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
 #line 225 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1831,11 +1831,11 @@ gboolean thumbnail_rating_comparator_predicate (DataObject* object, Alteration*
 
 static void thumbnail_real_thumbnail_altered (ThumbnailView* base) {
 	Thumbnail * self;
-	MediaSource* _tmp0_ = NULL;
+	MediaSource* _tmp0_;
 	Dimensions _tmp1_ = {0};
-	gint _tmp2_ = 0;
+	gint _tmp2_;
 	Dimensions _tmp3_ = {0};
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp4_;
 #line 229 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
 #line 230 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1870,12 +1870,12 @@ static void thumbnail_real_thumbnail_altered (ThumbnailView* base) {
 
 static void thumbnail_real_notify_collection_property_set (DataObject* base, const gchar* name, GValue* old, GValue* val) {
 	Thumbnail * self;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GQuark _tmp3_ = 0U;
-	const gchar* _tmp5_ = NULL;
-	GValue* _tmp6_ = NULL;
-	GValue _tmp7_ = {0};
+	const gchar* _tmp5_;
+	GValue* _tmp6_;
+	GValue _tmp7_;
 #line 241 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
 #line 241 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1895,7 +1895,7 @@ static void thumbnail_real_notify_collection_property_set (DataObject* base, con
 #line 1896 "Thumbnail.c"
 			default:
 			{
-				GValue _tmp4_ = {0};
+				GValue _tmp4_;
 #line 244 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 				_tmp4_ = *val;
 #line 244 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1932,18 +1932,18 @@ static void thumbnail_real_notify_collection_property_set (DataObject* base, con
 
 
 static void thumbnail_resize (Thumbnail* self, gint new_scale) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
 	Dimensions _tmp10_ = {0};
-	gboolean _tmp11_ = FALSE;
+	gboolean _tmp11_;
 #line 255 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 256 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1990,8 +1990,8 @@ static void thumbnail_resize (Thumbnail* self, gint new_scale) {
 	if (_tmp11_) {
 #line 1992 "Thumbnail.c"
 		GdkPixbuf* resizable = NULL;
-		GdkPixbuf* _tmp12_ = NULL;
-		GdkPixbuf* _tmp17_ = NULL;
+		GdkPixbuf* _tmp12_;
+		GdkPixbuf* _tmp17_;
 #line 272 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		resizable = NULL;
 #line 273 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1999,8 +1999,8 @@ static void thumbnail_resize (Thumbnail* self, gint new_scale) {
 #line 273 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		if (_tmp12_ != NULL) {
 #line 2002 "Thumbnail.c"
-			GdkPixbuf* _tmp13_ = NULL;
-			GdkPixbuf* _tmp14_ = NULL;
+			GdkPixbuf* _tmp13_;
+			GdkPixbuf* _tmp14_;
 #line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp13_ = self->priv->unscaled_pixbuf;
 #line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2011,13 +2011,13 @@ static void thumbnail_resize (Thumbnail* self, gint new_scale) {
 			resizable = _tmp14_;
 #line 2013 "Thumbnail.c"
 		} else {
-			gboolean _tmp15_ = FALSE;
+			gboolean _tmp15_;
 #line 275 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp15_ = checkerboard_item_has_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
 #line 275 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			if (_tmp15_) {
 #line 2020 "Thumbnail.c"
-				GdkPixbuf* _tmp16_ = NULL;
+				GdkPixbuf* _tmp16_;
 #line 276 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 				_tmp16_ = checkerboard_item_get_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
 #line 276 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2032,10 +2032,10 @@ static void thumbnail_resize (Thumbnail* self, gint new_scale) {
 #line 278 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		if (_tmp17_ != NULL) {
 #line 2035 "Thumbnail.c"
-			GdkPixbuf* _tmp18_ = NULL;
-			Dimensions _tmp19_ = {0};
-			GdkPixbuf* _tmp20_ = NULL;
-			GdkPixbuf* _tmp21_ = NULL;
+			GdkPixbuf* _tmp18_;
+			Dimensions _tmp19_;
+			GdkPixbuf* _tmp20_;
+			GdkPixbuf* _tmp21_;
 #line 279 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp18_ = resizable;
 #line 279 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2056,7 +2056,7 @@ static void thumbnail_resize (Thumbnail* self, gint new_scale) {
 		_g_object_unref0 (resizable);
 #line 2058 "Thumbnail.c"
 	} else {
-		Dimensions _tmp22_ = {0};
+		Dimensions _tmp22_;
 #line 283 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp22_ = self->priv->dim;
 #line 283 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2067,7 +2067,7 @@ static void thumbnail_resize (Thumbnail* self, gint new_scale) {
 
 
 static void thumbnail_paint_empty (Thumbnail* self) {
-	Dimensions _tmp0_ = {0};
+	Dimensions _tmp0_;
 #line 287 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 288 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2092,10 +2092,10 @@ static void _thumbnail_on_low_quality_fetched_thumbnail_cache_async_fetch_callba
 
 
 static void thumbnail_schedule_low_quality_fetch (Thumbnail* self) {
-	GCancellable* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	Dimensions _tmp2_ = {0};
-	GCancellable* _tmp3_ = NULL;
+	GCancellable* _tmp0_;
+	MediaSource* _tmp1_;
+	Dimensions _tmp2_;
+	GCancellable* _tmp3_;
 #line 293 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 294 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2128,7 +2128,7 @@ static gboolean _thumbnail_on_schedule_high_quality_gsource_func (gpointer self)
 
 
 static void thumbnail_delayed_high_quality_fetch (Thumbnail* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 301 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 302 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2158,9 +2158,9 @@ static void _thumbnail_on_high_quality_fetched_thumbnail_cache_async_fetch_callb
 
 static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	GCancellable* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp0_;
+	GCancellable* _tmp1_;
+	gboolean _tmp2_;
 #line 312 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_THUMBNAIL (self), FALSE);
 #line 313 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2188,10 +2188,10 @@ static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) {
 #line 322 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp2_) {
 #line 2191 "Thumbnail.c"
-		MediaSource* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		Dimensions _tmp5_ = {0};
-		GCancellable* _tmp6_ = NULL;
+		MediaSource* _tmp3_;
+		gint _tmp4_;
+		Dimensions _tmp5_;
+		GCancellable* _tmp6_;
 #line 323 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = self->priv->media;
 #line 323 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2215,7 +2215,7 @@ static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) {
 
 
 static void thumbnail_cancel_async_fetch (Thumbnail* self) {
-	GCancellable* _tmp0_ = NULL;
+	GCancellable* _tmp0_;
 #line 332 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 334 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2223,7 +2223,7 @@ static void thumbnail_cancel_async_fetch (Thumbnail* self) {
 #line 334 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp0_ != NULL) {
 #line 2226 "Thumbnail.c"
-		GCancellable* _tmp1_ = NULL;
+		GCancellable* _tmp1_;
 #line 335 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp1_ = self->priv->cancellable;
 #line 335 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2234,9 +2234,9 @@ static void thumbnail_cancel_async_fetch (Thumbnail* self) {
 
 
 static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err) {
-	GError* _tmp0_ = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
+	GError* _tmp0_;
+	GdkPixbuf* _tmp6_;
+	GdkPixbuf* _tmp8_;
 #line 338 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 338 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2250,11 +2250,11 @@ static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf
 #line 340 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp0_ != NULL) {
 #line 2253 "Thumbnail.c"
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+		gchar* _tmp1_;
+		gchar* _tmp2_;
+		gint _tmp3_;
+		GError* _tmp4_;
+		const gchar* _tmp5_;
 #line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
 #line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2277,7 +2277,7 @@ static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf
 #line 344 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp6_ != NULL) {
 #line 2279 "Thumbnail.c"
-		GdkPixbuf* _tmp7_ = NULL;
+		GdkPixbuf* _tmp7_;
 #line 345 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp7_ = pixbuf;
 #line 345 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2289,8 +2289,8 @@ static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf
 #line 347 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp8_ != NULL) {
 #line 2291 "Thumbnail.c"
-		GdkPixbuf* _tmp9_ = NULL;
-		GdkPixbuf* _tmp10_ = NULL;
+		GdkPixbuf* _tmp9_;
+		GdkPixbuf* _tmp10_;
 #line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp9_ = unscaled;
 #line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2308,9 +2308,9 @@ static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf
 
 
 static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err) {
-	GError* _tmp0_ = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
+	GError* _tmp0_;
+	GdkPixbuf* _tmp6_;
+	GdkPixbuf* _tmp8_;
 #line 353 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 353 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2324,11 +2324,11 @@ static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbu
 #line 355 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp0_ != NULL) {
 #line 2326 "Thumbnail.c"
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+		gchar* _tmp1_;
+		gchar* _tmp2_;
+		gint _tmp3_;
+		GError* _tmp4_;
+		const gchar* _tmp5_;
 #line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
 #line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2351,7 +2351,7 @@ static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbu
 #line 359 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp6_ != NULL) {
 #line 2352 "Thumbnail.c"
-		GdkPixbuf* _tmp7_ = NULL;
+		GdkPixbuf* _tmp7_;
 #line 360 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp7_ = pixbuf;
 #line 360 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2363,8 +2363,8 @@ static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbu
 #line 362 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp8_ != NULL) {
 #line 2364 "Thumbnail.c"
-		GdkPixbuf* _tmp9_ = NULL;
-		GdkPixbuf* _tmp10_ = NULL;
+		GdkPixbuf* _tmp9_;
+		GdkPixbuf* _tmp10_;
 #line 363 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp9_ = unscaled;
 #line 363 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2380,7 +2380,7 @@ static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbu
 
 static void thumbnail_real_exposed (CheckerboardItem* base) {
 	Thumbnail * self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 366 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
 #line 367 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2423,11 +2423,11 @@ static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base,
 	Thumbnail * self;
 	GdkPixbuf* result = NULL;
 	Flaggable* flaggable = NULL;
-	MediaSource* _tmp0_ = NULL;
-	Flaggable* _tmp1_ = NULL;
+	MediaSource* _tmp0_;
+	Flaggable* _tmp1_;
 	GdkPixbuf* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-	Flaggable* _tmp4_ = NULL;
+	Flaggable* _tmp4_;
 #line 387 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
 #line 388 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2441,8 +2441,8 @@ static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base,
 #line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp4_ != NULL) {
 #line 2442 "Thumbnail.c"
-		Flaggable* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		Flaggable* _tmp5_;
+		gboolean _tmp6_;
 #line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = flaggable;
 #line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2458,7 +2458,7 @@ static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base,
 #line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp3_) {
 #line 2459 "Thumbnail.c"
-		GdkPixbuf* _tmp7_ = NULL;
+		GdkPixbuf* _tmp7_;
 #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp7_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE);
 #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2496,15 +2496,15 @@ static GdkPixbuf* thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base
 	Thumbnail * self;
 	GdkPixbuf* result = NULL;
 	Rating rating = 0;
-	MediaSource* _tmp0_ = NULL;
-	Rating _tmp1_ = 0;
+	MediaSource* _tmp0_;
+	Rating _tmp1_;
 	gboolean show_ratings = FALSE;
 	GValue* _tmp2_ = NULL;
 	GValue _tmp3_ = {0};
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp4_;
 	GdkPixbuf* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-	Rating _tmp7_ = 0;
+	Rating _tmp7_;
 #line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
 #line 395 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2532,7 +2532,7 @@ static GdkPixbuf* thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base
 #line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp7_ != RATING_UNRATED) {
 #line 2533 "Thumbnail.c"
-		gboolean _tmp8_ = FALSE;
+		gboolean _tmp8_;
 #line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = show_ratings;
 #line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2546,9 +2546,9 @@ static GdkPixbuf* thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base
 #line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp6_) {
 #line 2547 "Thumbnail.c"
-		Rating _tmp9_ = 0;
-		gint _tmp10_ = 0;
-		GdkPixbuf* _tmp11_ = NULL;
+		Rating _tmp9_;
+		gint _tmp10_;
+		GdkPixbuf* _tmp11_;
 #line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp9_ = rating;
 #line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2587,7 +2587,7 @@ gint thumbnail_get_MIN_SCALE (void) {
 
 gint thumbnail_get_MAX_SCALE (void) {
 	gint result;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 23 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_LARGEST);
 #line 23 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2600,7 +2600,7 @@ gint thumbnail_get_MAX_SCALE (void) {
 
 gint thumbnail_get_DEFAULT_SCALE (void) {
 	gint result;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM);
 #line 28 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2617,19 +2617,19 @@ static void thumbnail_class_init (ThumbnailClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_type_class_add_private (klass, sizeof (ThumbnailPrivate));
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-	((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) thumbnail_real_notify_altered;
+	((DataObjectClass *) klass)->notify_altered = (void (*) (DataObject *, Alteration*)) thumbnail_real_notify_altered;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-	((ThumbnailViewClass *) klass)->thumbnail_altered = (void (*)(ThumbnailView*)) thumbnail_real_thumbnail_altered;
+	((ThumbnailViewClass *) klass)->thumbnail_altered = (void (*) (ThumbnailView *)) thumbnail_real_thumbnail_altered;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-	((DataObjectClass *) klass)->notify_collection_property_set = (void (*)(DataObject*, const gchar*, GValue*, GValue*)) thumbnail_real_notify_collection_property_set;
+	((DataObjectClass *) klass)->notify_collection_property_set = (void (*) (DataObject *, const gchar*, GValue*, GValue*)) thumbnail_real_notify_collection_property_set;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-	((CheckerboardItemClass *) klass)->exposed = (void (*)(CheckerboardItem*)) thumbnail_real_exposed;
+	((CheckerboardItemClass *) klass)->exposed = (void (*) (CheckerboardItem *)) thumbnail_real_exposed;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-	((CheckerboardItemClass *) klass)->unexposed = (void (*)(CheckerboardItem*)) thumbnail_real_unexposed;
+	((CheckerboardItemClass *) klass)->unexposed = (void (*) (CheckerboardItem *)) thumbnail_real_unexposed;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-	((CheckerboardItemClass *) klass)->get_top_right_trinket = (GdkPixbuf* (*)(CheckerboardItem*, gint)) thumbnail_real_get_top_right_trinket;
+	((CheckerboardItemClass *) klass)->get_top_right_trinket = (GdkPixbuf* (*) (CheckerboardItem *, gint)) thumbnail_real_get_top_right_trinket;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-	((CheckerboardItemClass *) klass)->get_bottom_left_trinket = (GdkPixbuf* (*)(CheckerboardItem*, gint)) thumbnail_real_get_bottom_left_trinket;
+	((CheckerboardItemClass *) klass)->get_bottom_left_trinket = (GdkPixbuf* (*) (CheckerboardItem *, gint)) thumbnail_real_get_bottom_left_trinket;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_thumbnail_get_property;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2655,13 +2655,13 @@ static void thumbnail_instance_init (Thumbnail * self) {
 }
 
 
-static void thumbnail_finalize (GObject* obj) {
+static void thumbnail_finalize (GObject * obj) {
 	Thumbnail * self;
-	GCancellable* _tmp0_ = NULL;
-	TagSourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	TagSourceCollection* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
+	GCancellable* _tmp0_;
+	TagSourceCollection* _tmp2_;
+	guint _tmp3_;
+	TagSourceCollection* _tmp4_;
+	guint _tmp5_;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_THUMBNAIL, Thumbnail);
 #line 73 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2669,7 +2669,7 @@ static void thumbnail_finalize (GObject* obj) {
 #line 73 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp0_ != NULL) {
 #line 2670 "Thumbnail.c"
-		GCancellable* _tmp1_ = NULL;
+		GCancellable* _tmp1_;
 #line 74 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp1_ = self->priv->cancellable;
 #line 74 "/home/jens/Source/shotwell/src/Thumbnail.vala"
diff --git a/src/ThumbnailCache.c b/src/ThumbnailCache.c
index 0dac00c..5ef8ed9 100644
--- a/src/ThumbnailCache.c
+++ b/src/ThumbnailCache.c
@@ -1,4 +1,4 @@
-/* ThumbnailCache.c generated by valac 0.34.7, the Vala compiler
+/* ThumbnailCache.c generated by valac 0.36.6, the Vala compiler
  * generated from ThumbnailCache.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -472,7 +472,7 @@ Thumbnails* thumbnails_construct (GType object_type);
 void thumbnails_set (Thumbnails* self, ThumbnailCacheSize size, GdkPixbuf* pixbuf);
 void thumbnails_remove (Thumbnails* self, ThumbnailCacheSize size);
 GdkPixbuf* thumbnails_get (Thumbnails* self, ThumbnailCacheSize size);
-static void thumbnails_finalize (Thumbnails* obj);
+static void thumbnails_finalize (Thumbnails * obj);
 GType thumbnail_cache_get_type (void) G_GNUC_CONST;
 GType jpeg_quality_get_type (void) G_GNUC_CONST;
 static gpointer thumbnail_cache_image_data_ref (gpointer instance);
@@ -618,7 +618,7 @@ void photo_file_writer_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQual
 enum  {
 	THUMBNAIL_CACHE_IMAGE_DATA_DUMMY_PROPERTY
 };
-static void thumbnail_cache_image_data_finalize (ThumbnailCacheImageData* obj);
+static void thumbnail_cache_image_data_finalize (ThumbnailCacheImageData * obj);
 enum  {
 	THUMBNAIL_CACHE_ASYNC_FETCH_JOB_DUMMY_PROPERTY
 };
@@ -639,8 +639,8 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs
 GType video_source_get_type (void) G_GNUC_CONST;
 GType video_get_type (void) G_GNUC_CONST;
 GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, gint scale, GError** error);
-static void thumbnail_cache_async_fetch_job_finalize (BackgroundJob* obj);
-static void thumbnail_cache_finalize (GObject* obj);
+static void thumbnail_cache_async_fetch_job_finalize (BackgroundJob * obj);
+static void thumbnail_cache_finalize (GObject * obj);
 
 
 Thumbnails* thumbnails_construct (GType object_type) {
@@ -661,9 +661,9 @@ Thumbnails* thumbnails_new (void) {
 
 
 void thumbnails_set (Thumbnails* self, ThumbnailCacheSize size, GdkPixbuf* pixbuf) {
-	GeeHashMap* _tmp0_ = NULL;
-	ThumbnailCacheSize _tmp1_ = 0;
-	GdkPixbuf* _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	ThumbnailCacheSize _tmp1_;
+	GdkPixbuf* _tmp2_;
 #line 14 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAILS (self));
 #line 14 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -681,8 +681,8 @@ void thumbnails_set (Thumbnails* self, ThumbnailCacheSize size, GdkPixbuf* pixbu
 
 
 void thumbnails_remove (Thumbnails* self, ThumbnailCacheSize size) {
-	GeeHashMap* _tmp0_ = NULL;
-	ThumbnailCacheSize _tmp1_ = 0;
+	GeeHashMap* _tmp0_;
+	ThumbnailCacheSize _tmp1_;
 #line 18 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAILS (self));
 #line 19 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -697,9 +697,9 @@ void thumbnails_remove (Thumbnails* self, ThumbnailCacheSize size) {
 
 GdkPixbuf* thumbnails_get (Thumbnails* self, ThumbnailCacheSize size) {
 	GdkPixbuf* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	ThumbnailCacheSize _tmp1_ = 0;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	ThumbnailCacheSize _tmp1_;
+	gpointer _tmp2_;
 #line 22 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_val_if_fail (IS_THUMBNAILS (self), NULL);
 #line 23 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -758,7 +758,7 @@ static gchar* value_thumbnails_collect_value (GValue* value, guint n_collect_val
 #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (collect_values[0].v_pointer) {
 #line 761 "ThumbnailCache.c"
-		Thumbnails* object;
+		Thumbnails * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -785,7 +785,7 @@ static gchar* value_thumbnails_collect_value (GValue* value, guint n_collect_val
 
 
 static gchar* value_thumbnails_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	Thumbnails** object_p;
+	Thumbnails ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (!object_p) {
@@ -837,7 +837,7 @@ gpointer value_get_thumbnails (const GValue* value) {
 
 
 void value_set_thumbnails (GValue* value, gpointer v_object) {
-	Thumbnails* old;
+	Thumbnails * old;
 #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_THUMBNAILS));
 #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -868,7 +868,7 @@ void value_set_thumbnails (GValue* value, gpointer v_object) {
 
 
 void value_take_thumbnails (GValue* value, gpointer v_object) {
-	Thumbnails* old;
+	Thumbnails * old;
 #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_THUMBNAILS));
 #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -908,7 +908,7 @@ static void thumbnails_class_init (ThumbnailsClass * klass) {
 
 
 static void thumbnails_instance_init (Thumbnails * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self->priv = THUMBNAILS_GET_PRIVATE (self);
 #line 8 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -921,7 +921,7 @@ static void thumbnails_instance_init (Thumbnails * self) {
 }
 
 
-static void thumbnails_finalize (Thumbnails* obj) {
+static void thumbnails_finalize (Thumbnails * obj) {
 	Thumbnails * self;
 #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_THUMBNAILS, Thumbnails);
@@ -948,7 +948,7 @@ GType thumbnails_get_type (void) {
 
 
 gpointer thumbnails_ref (gpointer instance) {
-	Thumbnails* self;
+	Thumbnails * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -959,7 +959,7 @@ gpointer thumbnails_ref (gpointer instance) {
 
 
 void thumbnails_unref (gpointer instance) {
-	Thumbnails* self;
+	Thumbnails * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -983,7 +983,7 @@ gint thumbnail_cache_size_get_scale (ThumbnailCacheSize self) {
 
 
 void thumbnail_cache_size_get_scaling (ThumbnailCacheSize self, Scaling* result) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	Scaling _tmp1_ = {0};
 #line 46 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	_tmp0_ = thumbnail_cache_size_get_scale (self);
@@ -1000,8 +1000,8 @@ void thumbnail_cache_size_get_scaling (ThumbnailCacheSize self, Scaling* result)
 ThumbnailCacheSize thumbnail_cache_size_get_best_size (gint scale) {
 	ThumbnailCacheSize result = 0;
 	ThumbnailCacheSize _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 50 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	_tmp1_ = scale;
 #line 50 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1038,15 +1038,15 @@ GType thumbnail_cache_size_get_type (void) {
 
 static ThumbnailCache* thumbnail_cache_construct (GType object_type, ThumbnailCacheSize size, gulong max_cached_bytes, GdkInterpType interp, JpegQuality quality) {
 	ThumbnailCache * self = NULL;
-	ThumbnailCacheSize _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	ThumbnailCacheSize _tmp5_ = 0;
-	gulong _tmp6_ = 0UL;
-	GdkInterpType _tmp7_ = 0;
-	JpegQuality _tmp8_ = 0;
+	ThumbnailCacheSize _tmp0_;
+	gint _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	GFile* _tmp4_;
+	ThumbnailCacheSize _tmp5_;
+	gulong _tmp6_;
+	GdkInterpType _tmp7_;
+	JpegQuality _tmp8_;
 #line 190 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self = (ThumbnailCache*) g_object_new (object_type, NULL);
 #line 192 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1102,11 +1102,11 @@ static void _thumbnail_cache_report_cycle_one_shot_callback (gpointer self) {
 
 
 void thumbnail_cache_init (void) {
-	OneShotScheduler* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	Workers* _tmp2_ = NULL;
-	ThumbnailCache* _tmp3_ = NULL;
-	ThumbnailCache* _tmp4_ = NULL;
+	OneShotScheduler* _tmp0_;
+	guint _tmp1_;
+	Workers* _tmp2_;
+	ThumbnailCache* _tmp3_;
+	ThumbnailCache* _tmp4_;
 #line 201 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	_tmp0_ = one_shot_scheduler_new ("ThumbnailCache cycle reporter", _thumbnail_cache_report_cycle_one_shot_callback, NULL);
 #line 201 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1142,15 +1142,15 @@ void thumbnail_cache_terminate (void) {
 
 
 void thumbnail_cache_import_from_source (ThumbnailSource* source, gboolean force, GError** error) {
-	ThumbnailSource* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	ThumbnailCache* _tmp3_ = NULL;
-	ThumbnailSource* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	ThumbnailCache* _tmp6_ = NULL;
-	ThumbnailSource* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	ThumbnailSource* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	ThumbnailCache* _tmp3_;
+	ThumbnailSource* _tmp4_;
+	gboolean _tmp5_;
+	ThumbnailCache* _tmp6_;
+	ThumbnailSource* _tmp7_;
+	gboolean _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 211 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAIL_SOURCE (source));
@@ -1200,18 +1200,18 @@ void thumbnail_cache_import_from_source (ThumbnailSource* source, gboolean force
 
 
 void thumbnail_cache_import_thumbnails (ThumbnailSource* source, Thumbnails* thumbnails, gboolean force, GError** error) {
-	ThumbnailCache* _tmp0_ = NULL;
-	ThumbnailSource* _tmp1_ = NULL;
-	Thumbnails* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	ThumbnailCache* _tmp6_ = NULL;
-	ThumbnailSource* _tmp7_ = NULL;
-	Thumbnails* _tmp8_ = NULL;
-	GdkPixbuf* _tmp9_ = NULL;
-	GdkPixbuf* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
+	ThumbnailCache* _tmp0_;
+	ThumbnailSource* _tmp1_;
+	Thumbnails* _tmp2_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
+	gboolean _tmp5_;
+	ThumbnailCache* _tmp6_;
+	ThumbnailSource* _tmp7_;
+	Thumbnails* _tmp8_;
+	GdkPixbuf* _tmp9_;
+	GdkPixbuf* _tmp10_;
+	gboolean _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 218 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAIL_SOURCE (source));
@@ -1269,12 +1269,12 @@ void thumbnail_cache_import_thumbnails (ThumbnailSource* source, Thumbnails* thu
 
 
 void thumbnail_cache_duplicate (ThumbnailSource* src_source, ThumbnailSource* dest_source) {
-	ThumbnailCache* _tmp0_ = NULL;
-	ThumbnailSource* _tmp1_ = NULL;
-	ThumbnailSource* _tmp2_ = NULL;
-	ThumbnailCache* _tmp3_ = NULL;
-	ThumbnailSource* _tmp4_ = NULL;
-	ThumbnailSource* _tmp5_ = NULL;
+	ThumbnailCache* _tmp0_;
+	ThumbnailSource* _tmp1_;
+	ThumbnailSource* _tmp2_;
+	ThumbnailCache* _tmp3_;
+	ThumbnailSource* _tmp4_;
+	ThumbnailSource* _tmp5_;
 #line 224 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAIL_SOURCE (src_source));
 #line 224 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1300,10 +1300,10 @@ void thumbnail_cache_duplicate (ThumbnailSource* src_source, ThumbnailSource* de
 
 
 void thumbnail_cache_remove (ThumbnailSource* source) {
-	ThumbnailCache* _tmp0_ = NULL;
-	ThumbnailSource* _tmp1_ = NULL;
-	ThumbnailCache* _tmp2_ = NULL;
-	ThumbnailSource* _tmp3_ = NULL;
+	ThumbnailCache* _tmp0_;
+	ThumbnailSource* _tmp1_;
+	ThumbnailCache* _tmp2_;
+	ThumbnailSource* _tmp3_;
 #line 229 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAIL_SOURCE (source));
 #line 230 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1332,9 +1332,9 @@ static gpointer _g_object_ref0 (gpointer self) {
 static ThumbnailCache* thumbnail_cache_get_best_cache (gint scale) {
 	ThumbnailCache* result = NULL;
 	ThumbnailCacheSize size = 0;
-	gint _tmp0_ = 0;
-	ThumbnailCacheSize _tmp1_ = 0;
-	ThumbnailCacheSize _tmp2_ = 0;
+	gint _tmp0_;
+	ThumbnailCacheSize _tmp1_;
+	ThumbnailCacheSize _tmp2_;
 #line 235 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	_tmp0_ = scale;
 #line 235 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1346,8 +1346,8 @@ static ThumbnailCache* thumbnail_cache_get_best_cache (gint scale) {
 #line 236 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (_tmp2_ == THUMBNAIL_CACHE_SIZE_BIG) {
 #line 1349 "ThumbnailCache.c"
-		ThumbnailCache* _tmp3_ = NULL;
-		ThumbnailCache* _tmp4_ = NULL;
+		ThumbnailCache* _tmp3_;
+		ThumbnailCache* _tmp4_;
 #line 237 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp3_ = thumbnail_cache_big;
 #line 237 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1358,9 +1358,9 @@ static ThumbnailCache* thumbnail_cache_get_best_cache (gint scale) {
 		return result;
 #line 1360 "ThumbnailCache.c"
 	} else {
-		ThumbnailCacheSize _tmp5_ = 0;
-		ThumbnailCache* _tmp6_ = NULL;
-		ThumbnailCache* _tmp7_ = NULL;
+		ThumbnailCacheSize _tmp5_;
+		ThumbnailCache* _tmp6_;
+		ThumbnailCache* _tmp7_;
 #line 239 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp5_ = size;
 #line 239 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1380,7 +1380,7 @@ static ThumbnailCache* thumbnail_cache_get_best_cache (gint scale) {
 
 static ThumbnailCache* thumbnail_cache_get_cache_for (ThumbnailCacheSize size) {
 	ThumbnailCache* result = NULL;
-	ThumbnailCacheSize _tmp0_ = 0;
+	ThumbnailCacheSize _tmp0_;
 #line 246 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	_tmp0_ = size;
 #line 246 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1389,8 +1389,8 @@ static ThumbnailCache* thumbnail_cache_get_cache_for (ThumbnailCacheSize size) {
 		case THUMBNAIL_CACHE_SIZE_BIG:
 #line 1391 "ThumbnailCache.c"
 		{
-			ThumbnailCache* _tmp1_ = NULL;
-			ThumbnailCache* _tmp2_ = NULL;
+			ThumbnailCache* _tmp1_;
+			ThumbnailCache* _tmp2_;
 #line 248 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp1_ = thumbnail_cache_big;
 #line 248 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1405,8 +1405,8 @@ static ThumbnailCache* thumbnail_cache_get_cache_for (ThumbnailCacheSize size) {
 		case THUMBNAIL_CACHE_SIZE_MEDIUM:
 #line 1407 "ThumbnailCache.c"
 		{
-			ThumbnailCache* _tmp3_ = NULL;
-			ThumbnailCache* _tmp4_ = NULL;
+			ThumbnailCache* _tmp3_;
+			ThumbnailCache* _tmp4_;
 #line 251 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp3_ = thumbnail_cache_medium;
 #line 251 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1419,8 +1419,8 @@ static ThumbnailCache* thumbnail_cache_get_cache_for (ThumbnailCacheSize size) {
 		}
 		default:
 		{
-			ThumbnailCacheSize _tmp5_ = 0;
-			gint _tmp6_ = 0;
+			ThumbnailCacheSize _tmp5_;
+			gint _tmp6_;
 #line 254 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp5_ = size;
 #line 254 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1436,13 +1436,13 @@ static ThumbnailCache* thumbnail_cache_get_cache_for (ThumbnailCacheSize size) {
 GdkPixbuf* thumbnail_cache_fetch (ThumbnailSource* source, gint scale, GError** error) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	ThumbnailCache* _tmp2_ = NULL;
-	ThumbnailCache* _tmp3_ = NULL;
-	ThumbnailSource* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
-	GdkPixbuf* _tmp7_ = NULL;
+	gint _tmp1_;
+	ThumbnailCache* _tmp2_;
+	ThumbnailCache* _tmp3_;
+	ThumbnailSource* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	GdkPixbuf* _tmp6_;
+	GdkPixbuf* _tmp7_;
 	GError * _inner_error_ = NULL;
 #line 258 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_val_if_fail (IS_THUMBNAIL_SOURCE (source), NULL);
@@ -1485,16 +1485,16 @@ GdkPixbuf* thumbnail_cache_fetch (ThumbnailSource* source, gint scale, GError**
 
 
 void thumbnail_cache_fetch_async (ThumbnailSource* source, gint scale, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable) {
-	gint _tmp0_ = 0;
-	ThumbnailCache* _tmp1_ = NULL;
-	ThumbnailCache* _tmp2_ = NULL;
-	ThumbnailSource* _tmp3_ = NULL;
-	ThumbnailSource* _tmp4_ = NULL;
-	PhotoFileFormat _tmp5_ = 0;
+	gint _tmp0_;
+	ThumbnailCache* _tmp1_;
+	ThumbnailCache* _tmp2_;
+	ThumbnailSource* _tmp3_;
+	ThumbnailSource* _tmp4_;
+	PhotoFileFormat _tmp5_;
 	Dimensions _tmp6_ = {0};
-	ThumbnailCacheAsyncFetchCallback _tmp7_ = NULL;
-	void* _tmp7__target = NULL;
-	GCancellable* _tmp8_ = NULL;
+	ThumbnailCacheAsyncFetchCallback _tmp7_;
+	void* _tmp7__target;
+	GCancellable* _tmp8_;
 #line 262 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAIL_SOURCE (source));
 #line 262 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1528,17 +1528,17 @@ void thumbnail_cache_fetch_async (ThumbnailSource* source, gint scale, Thumbnail
 
 
 void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, gint scale, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable) {
-	gint _tmp0_ = 0;
-	ThumbnailCache* _tmp1_ = NULL;
-	ThumbnailCache* _tmp2_ = NULL;
-	ThumbnailSource* _tmp3_ = NULL;
-	ThumbnailSource* _tmp4_ = NULL;
-	PhotoFileFormat _tmp5_ = 0;
-	Dimensions _tmp6_ = {0};
-	GdkInterpType _tmp7_ = 0;
-	ThumbnailCacheAsyncFetchCallback _tmp8_ = NULL;
-	void* _tmp8__target = NULL;
-	GCancellable* _tmp9_ = NULL;
+	gint _tmp0_;
+	ThumbnailCache* _tmp1_;
+	ThumbnailCache* _tmp2_;
+	ThumbnailSource* _tmp3_;
+	ThumbnailSource* _tmp4_;
+	PhotoFileFormat _tmp5_;
+	Dimensions _tmp6_;
+	GdkInterpType _tmp7_;
+	ThumbnailCacheAsyncFetchCallback _tmp8_;
+	void* _tmp8__target;
+	GCancellable* _tmp9_;
 #line 268 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAIL_SOURCE (source));
 #line 268 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1576,11 +1576,11 @@ void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, gint scale, Di
 
 
 void thumbnail_cache_replace (ThumbnailSource* source, ThumbnailCacheSize size, GdkPixbuf* replacement, GError** error) {
-	ThumbnailCacheSize _tmp0_ = 0;
-	ThumbnailCache* _tmp1_ = NULL;
-	ThumbnailCache* _tmp2_ = NULL;
-	ThumbnailSource* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
+	ThumbnailCacheSize _tmp0_;
+	ThumbnailCache* _tmp1_;
+	ThumbnailCache* _tmp2_;
+	ThumbnailSource* _tmp3_;
+	GdkPixbuf* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 274 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAIL_SOURCE (source));
@@ -1614,9 +1614,9 @@ void thumbnail_cache_replace (ThumbnailSource* source, ThumbnailCacheSize size,
 gboolean thumbnail_cache_exists (ThumbnailSource* source) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	ThumbnailCache* _tmp1_ = NULL;
-	ThumbnailSource* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	ThumbnailCache* _tmp1_;
+	ThumbnailSource* _tmp2_;
+	gboolean _tmp3_;
 #line 279 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_val_if_fail (IS_THUMBNAIL_SOURCE (source), FALSE);
 #line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1628,9 +1628,9 @@ gboolean thumbnail_cache_exists (ThumbnailSource* source) {
 #line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (_tmp3_) {
 #line 1631 "ThumbnailCache.c"
-		ThumbnailCache* _tmp4_ = NULL;
-		ThumbnailSource* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		ThumbnailCache* _tmp4_;
+		ThumbnailSource* _tmp5_;
+		gboolean _tmp6_;
 #line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp4_ = thumbnail_cache_medium;
 #line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1654,8 +1654,8 @@ gboolean thumbnail_cache_exists (ThumbnailSource* source) {
 
 
 void thumbnail_cache_rotate (ThumbnailSource* source, Rotation rotation, GError** error) {
-	ThumbnailCacheSize* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	ThumbnailCacheSize* _tmp0_;
+	gint _tmp0__length1;
 	GError * _inner_error_ = NULL;
 #line 283 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAIL_SOURCE (source));
@@ -1682,15 +1682,15 @@ void thumbnail_cache_rotate (ThumbnailSource* source, Rotation rotation, GError*
 #line 1683 "ThumbnailCache.c"
 			{
 				GdkPixbuf* thumbnail = NULL;
-				ThumbnailSource* _tmp1_ = NULL;
-				ThumbnailCacheSize _tmp2_ = 0;
-				GdkPixbuf* _tmp3_ = NULL;
-				Rotation _tmp4_ = 0;
-				GdkPixbuf* _tmp5_ = NULL;
-				GdkPixbuf* _tmp6_ = NULL;
-				ThumbnailSource* _tmp7_ = NULL;
-				ThumbnailCacheSize _tmp8_ = 0;
-				GdkPixbuf* _tmp9_ = NULL;
+				ThumbnailSource* _tmp1_;
+				ThumbnailCacheSize _tmp2_;
+				GdkPixbuf* _tmp3_;
+				Rotation _tmp4_;
+				GdkPixbuf* _tmp5_;
+				GdkPixbuf* _tmp6_;
+				ThumbnailSource* _tmp7_;
+				ThumbnailCacheSize _tmp8_;
+				GdkPixbuf* _tmp9_;
 #line 285 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 				_tmp1_ = source;
 #line 285 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1747,19 +1747,19 @@ void thumbnail_cache_rotate (ThumbnailSource* source, Rotation rotation, GError*
 void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader* reader, Orientation orientation, Dimensions* original_dim, GError** error) {
 	ThumbnailCacheSize max_size = 0;
 	Dimensions dim = {0};
-	ThumbnailCacheSize _tmp0_ = 0;
+	ThumbnailCacheSize _tmp0_;
 	Scaling _tmp1_ = {0};
-	Dimensions _tmp2_ = {0};
+	Dimensions _tmp2_;
 	Dimensions _tmp3_ = {0};
 	GdkPixbuf* largest_thumbnail = NULL;
-	Orientation _tmp14_ = 0;
-	GdkPixbuf* _tmp15_ = NULL;
-	GdkPixbuf* _tmp16_ = NULL;
+	Orientation _tmp14_;
+	GdkPixbuf* _tmp15_;
+	GdkPixbuf* _tmp16_;
 	Dimensions largest_thumb_dimensions = {0};
-	GdkPixbuf* _tmp17_ = NULL;
+	GdkPixbuf* _tmp17_;
 	Dimensions _tmp18_ = {0};
-	ThumbnailCacheSize* _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
+	ThumbnailCacheSize* _tmp19_;
+	gint _tmp19__length1;
 	GError * _inner_error_ = NULL;
 #line 293 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAILS (thumbnails));
@@ -1784,11 +1784,11 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
 #line 1785 "ThumbnailCache.c"
 	{
 		GdkPixbuf* _tmp4_ = NULL;
-		PhotoFileReader* _tmp5_ = NULL;
-		Dimensions _tmp6_ = {0};
-		Dimensions _tmp7_ = {0};
-		GdkPixbuf* _tmp8_ = NULL;
-		GdkPixbuf* _tmp9_ = NULL;
+		PhotoFileReader* _tmp5_;
+		Dimensions _tmp6_;
+		Dimensions _tmp7_;
+		GdkPixbuf* _tmp8_;
+		GdkPixbuf* _tmp9_;
 #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp5_ = reader;
 #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1802,7 +1802,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
 #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1805 "ThumbnailCache.c"
-			goto __catch236_g_error;
+			goto __catch237_g_error;
 		}
 #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp9_ = _tmp4_;
@@ -1816,14 +1816,14 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
 		_g_object_unref0 (_tmp4_);
 #line 1818 "ThumbnailCache.c"
 	}
-	goto __finally236;
-	__catch236_g_error:
+	goto __finally237;
+	__catch237_g_error:
 	{
 		GError* err = NULL;
 		GdkPixbuf* _tmp10_ = NULL;
-		PhotoFileReader* _tmp11_ = NULL;
-		GdkPixbuf* _tmp12_ = NULL;
-		GdkPixbuf* _tmp13_ = NULL;
+		PhotoFileReader* _tmp11_;
+		GdkPixbuf* _tmp12_;
+		GdkPixbuf* _tmp13_;
 #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		err = _inner_error_;
 #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1839,7 +1839,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
 #line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_g_error_free0 (err);
 #line 1842 "ThumbnailCache.c"
-			goto __finally236;
+			goto __finally237;
 		}
 #line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp13_ = _tmp10_;
@@ -1855,7 +1855,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
 		_g_error_free0 (err);
 #line 1857 "ThumbnailCache.c"
 	}
-	__finally236:
+	__finally237:
 #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1904,19 +1904,19 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
 			size = size_collection[size_it];
 #line 1906 "ThumbnailCache.c"
 			{
-				ThumbnailCacheSize _tmp20_ = 0;
+				ThumbnailCacheSize _tmp20_;
 				Scaling _tmp21_ = {0};
-				Dimensions _tmp22_ = {0};
+				Dimensions _tmp22_;
 				Dimensions _tmp23_ = {0};
-				Thumbnails* _tmp24_ = NULL;
-				ThumbnailCacheSize _tmp25_ = 0;
-				GdkPixbuf* _tmp26_ = NULL;
-				Dimensions _tmp27_ = {0};
-				gint _tmp28_ = 0;
-				Dimensions _tmp29_ = {0};
-				gint _tmp30_ = 0;
-				GdkPixbuf* _tmp31_ = NULL;
-				GdkPixbuf* _tmp32_ = NULL;
+				Thumbnails* _tmp24_;
+				ThumbnailCacheSize _tmp25_;
+				GdkPixbuf* _tmp26_;
+				Dimensions _tmp27_;
+				gint _tmp28_;
+				Dimensions _tmp29_;
+				gint _tmp30_;
+				GdkPixbuf* _tmp31_;
+				GdkPixbuf* _tmp32_;
 #line 311 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 				_tmp20_ = size;
 #line 311 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1960,8 +1960,8 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
 
 
 void thumbnail_cache_generate_for_video_frame (Thumbnails* thumbnails, GdkPixbuf* preview_frame) {
-	ThumbnailCacheSize* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	ThumbnailCacheSize* _tmp0_;
+	gint _tmp0__length1;
 #line 316 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAILS (thumbnails));
 #line 316 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -1989,14 +1989,14 @@ void thumbnail_cache_generate_for_video_frame (Thumbnails* thumbnails, GdkPixbuf
 #line 1990 "ThumbnailCache.c"
 			{
 				Scaling current_scaling = {0};
-				ThumbnailCacheSize _tmp1_ = 0;
+				ThumbnailCacheSize _tmp1_;
 				Scaling _tmp2_ = {0};
 				GdkPixbuf* current_thumbnail = NULL;
-				GdkPixbuf* _tmp3_ = NULL;
-				GdkPixbuf* _tmp4_ = NULL;
-				Thumbnails* _tmp5_ = NULL;
-				ThumbnailCacheSize _tmp6_ = 0;
-				GdkPixbuf* _tmp7_ = NULL;
+				GdkPixbuf* _tmp3_;
+				GdkPixbuf* _tmp4_;
+				Thumbnails* _tmp5_;
+				ThumbnailCacheSize _tmp6_;
+				GdkPixbuf* _tmp7_;
 #line 318 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 				_tmp1_ = size;
 #line 318 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2037,26 +2037,26 @@ static void thumbnail_cache_report_cycle (void) {
 static GdkPixbuf* _thumbnail_cache_fetch (ThumbnailCache* self, ThumbnailSource* source, GError** error) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* pixbuf = NULL;
-	ThumbnailSource* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
+	ThumbnailSource* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
+	GdkPixbuf* _tmp5_;
 	GdkPixbuf* _tmp6_ = NULL;
-	ThumbnailSource* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	ThumbnailSource* _tmp10_ = NULL;
-	PhotoFileFormat _tmp11_ = 0;
-	GdkPixbuf* _tmp12_ = NULL;
-	GdkPixbuf* _tmp13_ = NULL;
-	GdkPixbuf* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	ThumbnailSource* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	GdkPixbuf* _tmp19_ = NULL;
+	ThumbnailSource* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	ThumbnailSource* _tmp10_;
+	PhotoFileFormat _tmp11_;
+	GdkPixbuf* _tmp12_;
+	GdkPixbuf* _tmp13_;
+	GdkPixbuf* _tmp14_;
+	gint _tmp15_;
+	ThumbnailSource* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	GdkPixbuf* _tmp19_;
 	GError * _inner_error_ = NULL;
 #line 371 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), NULL);
@@ -2152,24 +2152,24 @@ static GdkPixbuf* _thumbnail_cache_fetch (ThumbnailCache* self, ThumbnailSource*
 
 static void _thumbnail_cache_fetch_async (ThumbnailCache* self, ThumbnailSource* source, PhotoFileFormat format, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable) {
 	gchar* thumbnail_name = NULL;
-	ThumbnailSource* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	ThumbnailSource* _tmp0_;
+	gchar* _tmp1_;
 	GdkPixbuf* pixbuf = NULL;
-	const gchar* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
+	const gchar* _tmp2_;
+	GdkPixbuf* _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	GdkPixbuf* _tmp5_ = NULL;
-	Workers* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	ThumbnailSource* _tmp19_ = NULL;
-	GdkPixbuf* _tmp20_ = NULL;
-	Dimensions _tmp21_ = {0};
-	GdkInterpType _tmp22_ = 0;
-	ThumbnailCacheAsyncFetchCallback _tmp23_ = NULL;
-	void* _tmp23__target = NULL;
-	GCancellable* _tmp24_ = NULL;
-	ThumbnailCacheAsyncFetchJob* _tmp25_ = NULL;
-	ThumbnailCacheAsyncFetchJob* _tmp26_ = NULL;
+	GdkPixbuf* _tmp5_;
+	Workers* _tmp17_;
+	const gchar* _tmp18_;
+	ThumbnailSource* _tmp19_;
+	GdkPixbuf* _tmp20_;
+	Dimensions _tmp21_;
+	GdkInterpType _tmp22_;
+	ThumbnailCacheAsyncFetchCallback _tmp23_;
+	void* _tmp23__target;
+	GCancellable* _tmp24_;
+	ThumbnailCacheAsyncFetchJob* _tmp25_;
+	ThumbnailCacheAsyncFetchJob* _tmp26_;
 #line 388 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAIL_CACHE (self));
 #line 388 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2196,7 +2196,7 @@ static void _thumbnail_cache_fetch_async (ThumbnailCache* self, ThumbnailSource*
 	if (_tmp5_ != NULL) {
 #line 2198 "ThumbnailCache.c"
 		gboolean _tmp6_ = FALSE;
-		gboolean _tmp7_ = FALSE;
+		gboolean _tmp7_;
 #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp7_ = dimensions_has_area (dim);
 #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2205,10 +2205,10 @@ static void _thumbnail_cache_fetch_async (ThumbnailCache* self, ThumbnailSource*
 			_tmp6_ = TRUE;
 #line 2207 "ThumbnailCache.c"
 		} else {
-			GdkPixbuf* _tmp8_ = NULL;
+			GdkPixbuf* _tmp8_;
 			Dimensions _tmp9_ = {0};
-			Dimensions _tmp10_ = {0};
-			gboolean _tmp11_ = FALSE;
+			Dimensions _tmp10_;
+			gboolean _tmp11_;
 #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp8_ = pixbuf;
 #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2232,12 +2232,12 @@ static void _thumbnail_cache_fetch_async (ThumbnailCache* self, ThumbnailSource*
 #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (_tmp4_) {
 #line 2235 "ThumbnailCache.c"
-		ThumbnailCacheAsyncFetchCallback _tmp12_ = NULL;
-		void* _tmp12__target = NULL;
-		GdkPixbuf* _tmp13_ = NULL;
-		GdkPixbuf* _tmp14_ = NULL;
-		Dimensions _tmp15_ = {0};
-		GdkInterpType _tmp16_ = 0;
+		ThumbnailCacheAsyncFetchCallback _tmp12_;
+		void* _tmp12__target;
+		GdkPixbuf* _tmp13_;
+		GdkPixbuf* _tmp14_;
+		Dimensions _tmp15_;
+		GdkInterpType _tmp16_;
 #line 396 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp12_ = callback;
 #line 396 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2310,26 +2310,26 @@ static gpointer _g_error_copy0 (gpointer self) {
 
 static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* background_job) {
 	ThumbnailCacheAsyncFetchJob* job = NULL;
-	BackgroundJob* _tmp0_ = NULL;
-	ThumbnailCacheAsyncFetchJob* _tmp1_ = NULL;
+	BackgroundJob* _tmp0_;
+	ThumbnailCacheAsyncFetchJob* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	ThumbnailCacheAsyncFetchJob* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	ThumbnailCacheAsyncFetchJob* _tmp17_ = NULL;
-	GdkPixbuf* _tmp18_ = NULL;
-	ThumbnailCacheAsyncFetchJob* _tmp29_ = NULL;
-	ThumbnailCacheAsyncFetchCallback _tmp30_ = NULL;
-	void* _tmp30__target = NULL;
-	ThumbnailCacheAsyncFetchJob* _tmp31_ = NULL;
-	GdkPixbuf* _tmp32_ = NULL;
-	ThumbnailCacheAsyncFetchJob* _tmp33_ = NULL;
-	GdkPixbuf* _tmp34_ = NULL;
-	ThumbnailCacheAsyncFetchJob* _tmp35_ = NULL;
-	Dimensions _tmp36_ = {0};
-	ThumbnailCacheAsyncFetchJob* _tmp37_ = NULL;
-	GdkInterpType _tmp38_ = 0;
-	ThumbnailCacheAsyncFetchJob* _tmp39_ = NULL;
-	GError* _tmp40_ = NULL;
+	ThumbnailCacheAsyncFetchJob* _tmp3_;
+	gboolean _tmp4_;
+	ThumbnailCacheAsyncFetchJob* _tmp17_;
+	GdkPixbuf* _tmp18_;
+	ThumbnailCacheAsyncFetchJob* _tmp29_;
+	ThumbnailCacheAsyncFetchCallback _tmp30_;
+	void* _tmp30__target;
+	ThumbnailCacheAsyncFetchJob* _tmp31_;
+	GdkPixbuf* _tmp32_;
+	ThumbnailCacheAsyncFetchJob* _tmp33_;
+	GdkPixbuf* _tmp34_;
+	ThumbnailCacheAsyncFetchJob* _tmp35_;
+	Dimensions _tmp36_;
+	ThumbnailCacheAsyncFetchJob* _tmp37_;
+	GdkInterpType _tmp38_;
+	ThumbnailCacheAsyncFetchJob* _tmp39_;
+	GError* _tmp40_;
 	GError * _inner_error_ = NULL;
 #line 416 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (background_job));
@@ -2346,8 +2346,8 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back
 #line 421 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (_tmp4_) {
 #line 2349 "ThumbnailCache.c"
-		ThumbnailCacheAsyncFetchJob* _tmp5_ = NULL;
-		GdkPixbuf* _tmp6_ = NULL;
+		ThumbnailCacheAsyncFetchJob* _tmp5_;
+		GdkPixbuf* _tmp6_;
 #line 421 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp5_ = job;
 #line 421 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2364,13 +2364,13 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back
 	if (_tmp2_) {
 #line 2366 "ThumbnailCache.c"
 		{
-			ThumbnailCacheAsyncFetchJob* _tmp7_ = NULL;
-			ThumbnailSource* _tmp8_ = NULL;
-			ThumbnailCacheAsyncFetchJob* _tmp9_ = NULL;
-			ThumbnailCache* _tmp10_ = NULL;
-			ThumbnailCacheSize _tmp11_ = 0;
-			ThumbnailCacheAsyncFetchJob* _tmp12_ = NULL;
-			GdkPixbuf* _tmp13_ = NULL;
+			ThumbnailCacheAsyncFetchJob* _tmp7_;
+			ThumbnailSource* _tmp8_;
+			ThumbnailCacheAsyncFetchJob* _tmp9_;
+			ThumbnailCache* _tmp10_;
+			ThumbnailCacheSize _tmp11_;
+			ThumbnailCacheAsyncFetchJob* _tmp12_;
+			GdkPixbuf* _tmp13_;
 #line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp7_ = job;
 #line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2390,16 +2390,16 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back
 #line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2393 "ThumbnailCache.c"
-				goto __catch237_g_error;
+				goto __catch238_g_error;
 			}
 		}
-		goto __finally237;
-		__catch237_g_error:
+		goto __finally238;
+		__catch238_g_error:
 		{
 			GError* err = NULL;
-			ThumbnailCacheAsyncFetchJob* _tmp14_ = NULL;
-			GError* _tmp15_ = NULL;
-			GError* _tmp16_ = NULL;
+			ThumbnailCacheAsyncFetchJob* _tmp14_;
+			GError* _tmp15_;
+			GError* _tmp16_;
 #line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			err = _inner_error_;
 #line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2418,7 +2418,7 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back
 			_g_error_free0 (err);
 #line 2420 "ThumbnailCache.c"
 		}
-		__finally237:
+		__finally238:
 #line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2439,8 +2439,8 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back
 #line 429 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (_tmp18_ != NULL) {
 #line 2442 "ThumbnailCache.c"
-		ThumbnailCacheAsyncFetchJob* _tmp19_ = NULL;
-		gboolean _tmp20_ = FALSE;
+		ThumbnailCacheAsyncFetchJob* _tmp19_;
+		gboolean _tmp20_;
 #line 430 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp19_ = job;
 #line 430 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2448,13 +2448,13 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back
 #line 430 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (_tmp20_) {
 #line 2451 "ThumbnailCache.c"
-			ThumbnailCacheAsyncFetchJob* _tmp21_ = NULL;
-			ThumbnailCache* _tmp22_ = NULL;
-			ThumbnailCacheAsyncFetchJob* _tmp23_ = NULL;
-			const gchar* _tmp24_ = NULL;
-			ThumbnailCacheAsyncFetchJob* _tmp25_ = NULL;
-			GdkPixbuf* _tmp26_ = NULL;
-			gint _tmp27_ = 0;
+			ThumbnailCacheAsyncFetchJob* _tmp21_;
+			ThumbnailCache* _tmp22_;
+			ThumbnailCacheAsyncFetchJob* _tmp23_;
+			const gchar* _tmp24_;
+			ThumbnailCacheAsyncFetchJob* _tmp25_;
+			GdkPixbuf* _tmp26_;
+			gint _tmp27_;
 #line 432 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp21_ = job;
 #line 432 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2477,7 +2477,7 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back
 			thumbnail_cache_schedule_debug ();
 #line 2479 "ThumbnailCache.c"
 		} else {
-			gint _tmp28_ = 0;
+			gint _tmp28_;
 #line 437 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp28_ = thumbnail_cache_cycle_async_resized_thumbnails;
 #line 437 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2523,20 +2523,20 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back
 
 static void _thumbnail_cache_import_from_source (ThumbnailCache* self, ThumbnailSource* source, gboolean force, GError** error) {
 	GFile* file = NULL;
-	ThumbnailSource* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	ThumbnailSource* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 	LibraryPhoto* photo = NULL;
-	ThumbnailSource* _tmp6_ = NULL;
-	LibraryPhoto* _tmp7_ = NULL;
+	ThumbnailSource* _tmp6_;
+	LibraryPhoto* _tmp7_;
 	GdkPixbuf* _tmp8_ = NULL;
-	LibraryPhoto* _tmp9_ = NULL;
-	ThumbnailCacheSize _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	LibraryPhoto* _tmp9_;
+	ThumbnailCacheSize _tmp10_;
+	gint _tmp11_;
 	Scaling _tmp12_ = {0};
-	GdkPixbuf* _tmp13_ = NULL;
-	GFile* _tmp14_ = NULL;
-	ThumbnailSource* _tmp15_ = NULL;
+	GdkPixbuf* _tmp13_;
+	GFile* _tmp14_;
+	ThumbnailSource* _tmp15_;
 	GError * _inner_error_ = NULL;
 #line 445 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAIL_CACHE (self));
@@ -2553,8 +2553,8 @@ static void _thumbnail_cache_import_from_source (ThumbnailCache* self, Thumbnail
 #line 451 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (!_tmp2_) {
 #line 2556 "ThumbnailCache.c"
-		ThumbnailSource* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+		ThumbnailSource* _tmp3_;
+		gboolean _tmp4_;
 #line 452 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp3_ = source;
 #line 452 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2568,7 +2568,7 @@ static void _thumbnail_cache_import_from_source (ThumbnailCache* self, Thumbnail
 #line 2569 "ThumbnailCache.c"
 		}
 	} else {
-		ThumbnailSource* _tmp5_ = NULL;
+		ThumbnailSource* _tmp5_;
 #line 456 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp5_ = source;
 #line 456 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2636,18 +2636,18 @@ static void _thumbnail_cache_import_from_source (ThumbnailCache* self, Thumbnail
 
 
 static void _thumbnail_cache_import_thumbnail (ThumbnailCache* self, ThumbnailSource* source, GdkPixbuf* scaled, gboolean force, GError** error) {
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
 	Dimensions _tmp2_ = {0};
-	ThumbnailCacheSize _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	ThumbnailSource* _tmp10_ = NULL;
-	GFile* _tmp11_ = NULL;
-	GFile* _tmp12_ = NULL;
-	GdkPixbuf* _tmp13_ = NULL;
-	ThumbnailSource* _tmp14_ = NULL;
+	ThumbnailCacheSize _tmp3_;
+	gint _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	ThumbnailSource* _tmp10_;
+	GFile* _tmp11_;
+	GFile* _tmp12_;
+	GdkPixbuf* _tmp13_;
+	ThumbnailSource* _tmp14_;
 	GError * _inner_error_ = NULL;
 #line 466 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAIL_CACHE (self));
@@ -2676,8 +2676,8 @@ static void _thumbnail_cache_import_thumbnail (ThumbnailCache* self, ThumbnailSo
 #line 473 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (!_tmp6_) {
 #line 2679 "ThumbnailCache.c"
-		ThumbnailSource* _tmp7_ = NULL;
-		gboolean _tmp8_ = FALSE;
+		ThumbnailSource* _tmp7_;
+		gboolean _tmp8_;
 #line 474 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp7_ = source;
 #line 474 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2689,7 +2689,7 @@ static void _thumbnail_cache_import_thumbnail (ThumbnailCache* self, ThumbnailSo
 #line 2690 "ThumbnailCache.c"
 		}
 	} else {
-		ThumbnailSource* _tmp9_ = NULL;
+		ThumbnailSource* _tmp9_;
 #line 478 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp9_ = source;
 #line 478 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2723,16 +2723,16 @@ static void _thumbnail_cache_import_thumbnail (ThumbnailCache* self, ThumbnailSo
 
 static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* src_source, ThumbnailSource* dest_source) {
 	GFile* src_file = NULL;
-	ThumbnailSource* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	ThumbnailSource* _tmp0_;
+	GFile* _tmp1_;
 	GFile* dest_file = NULL;
-	ThumbnailSource* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	ThumbnailSource* _tmp5_ = NULL;
-	PhotoFileFormat _tmp6_ = 0;
-	GFile* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
+	ThumbnailSource* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	ThumbnailSource* _tmp5_;
+	PhotoFileFormat _tmp6_;
+	GFile* _tmp7_;
+	GFile* _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 488 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAIL_CACHE (self));
@@ -2771,17 +2771,17 @@ static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* s
 #line 494 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2774 "ThumbnailCache.c"
-			goto __catch238_g_error;
+			goto __catch239_g_error;
 		}
 	}
-	goto __finally238;
-	__catch238_g_error:
+	goto __finally239;
+	__catch239_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
+		GError* _tmp9_;
+		const gchar* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
 #line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		err = _inner_error_;
 #line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2802,7 +2802,7 @@ static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* s
 		_g_error_free0 (err);
 #line 2804 "ThumbnailCache.c"
 	}
-	__finally238:
+	__finally239:
 #line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2827,21 +2827,21 @@ static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* s
 
 static void _thumbnail_cache_replace (ThumbnailCache* self, ThumbnailSource* source, GdkPixbuf* original, GError** error) {
 	GFile* file = NULL;
-	ThumbnailSource* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	ThumbnailSource* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	ThumbnailSource* _tmp0_;
+	GFile* _tmp1_;
+	ThumbnailSource* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 	GdkPixbuf* scaled = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	ThumbnailCacheSize _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	GdkInterpType _tmp8_ = 0;
-	GdkPixbuf* _tmp9_ = NULL;
-	ThumbnailSource* _tmp10_ = NULL;
-	ThumbnailSource* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	GdkPixbuf* _tmp5_;
+	ThumbnailCacheSize _tmp6_;
+	gint _tmp7_;
+	GdkInterpType _tmp8_;
+	GdkPixbuf* _tmp9_;
+	ThumbnailSource* _tmp10_;
+	ThumbnailSource* _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
 	GError * _inner_error_ = NULL;
 #line 502 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAIL_CACHE (self));
@@ -2913,11 +2913,11 @@ static void _thumbnail_cache_replace (ThumbnailCache* self, ThumbnailSource* sou
 
 static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* source) {
 	GFile* file = NULL;
-	ThumbnailSource* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	ThumbnailSource* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	ThumbnailSource* _tmp0_;
+	GFile* _tmp1_;
+	ThumbnailSource* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 521 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAIL_CACHE (self));
@@ -2946,11 +2946,11 @@ static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* sour
 #line 529 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2949 "ThumbnailCache.c"
-			goto __catch239_g_error;
+			goto __catch240_g_error;
 		}
 	}
-	goto __finally239;
-	__catch239_g_error:
+	goto __finally240;
+	__catch240_g_error:
 	{
 		GError* err = NULL;
 #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2961,7 +2961,7 @@ static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* sour
 		_g_error_free0 (err);
 #line 2963 "ThumbnailCache.c"
 	}
-	__finally239:
+	__finally240:
 #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2982,11 +2982,11 @@ static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* sour
 
 static gboolean _thumbnail_cache_exists (ThumbnailCache* self, ThumbnailSource* source) {
 	gboolean result = FALSE;
-	ThumbnailSource* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	ThumbnailSource* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 #line 535 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), FALSE);
 #line 535 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -3014,18 +3014,18 @@ static gboolean _thumbnail_cache_exists (ThumbnailCache* self, ThumbnailSource*
 static GdkPixbuf* thumbnail_cache_read_pixbuf (ThumbnailCache* self, const gchar* thumbnail_name, PhotoFileFormat format, GError** error) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	PhotoFileFormat _tmp1_ = 0;
-	const gchar* _tmp2_ = NULL;
-	PhotoFileFormat _tmp3_ = 0;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	PhotoFileReader* _tmp8_ = NULL;
-	PhotoFileReader* _tmp9_ = NULL;
-	GdkPixbuf* _tmp10_ = NULL;
-	GdkPixbuf* _tmp11_ = NULL;
-	GdkPixbuf* _tmp12_ = NULL;
+	PhotoFileFormat _tmp1_;
+	const gchar* _tmp2_;
+	PhotoFileFormat _tmp3_;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	PhotoFileReader* _tmp8_;
+	PhotoFileReader* _tmp9_;
+	GdkPixbuf* _tmp10_;
+	GdkPixbuf* _tmp11_;
+	GdkPixbuf* _tmp12_;
 	GError * _inner_error_ = NULL;
 #line 540 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), NULL);
@@ -3085,13 +3085,13 @@ static GdkPixbuf* thumbnail_cache_read_pixbuf (ThumbnailCache* self, const gchar
 
 static GFile* thumbnail_cache_get_source_cached_file (ThumbnailCache* self, ThumbnailSource* source) {
 	GFile* result = NULL;
-	ThumbnailSource* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	ThumbnailSource* _tmp3_ = NULL;
-	PhotoFileFormat _tmp4_ = 0;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
+	ThumbnailSource* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	ThumbnailSource* _tmp3_;
+	PhotoFileFormat _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
 #line 545 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), NULL);
 #line 545 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -3122,13 +3122,13 @@ static GFile* thumbnail_cache_get_source_cached_file (ThumbnailCache* self, Thum
 
 static GFile* thumbnail_cache_get_cached_file (ThumbnailCache* self, const gchar* thumbnail_name, PhotoFileFormat thumbnail_format) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	PhotoFileFormat _tmp1_ = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
+	GFile* _tmp0_;
+	PhotoFileFormat _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
 #line 550 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), NULL);
 #line 550 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -3160,12 +3160,12 @@ static GFile* thumbnail_cache_get_cached_file (ThumbnailCache* self, const gchar
 static GdkPixbuf* thumbnail_cache_fetch_from_memory (ThumbnailCache* self, const gchar* thumbnail_name) {
 	GdkPixbuf* result = NULL;
 	ThumbnailCacheImageData* data = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
 	GdkPixbuf* _tmp3_ = NULL;
-	ThumbnailCacheImageData* _tmp4_ = NULL;
-	GdkPixbuf* _tmp7_ = NULL;
+	ThumbnailCacheImageData* _tmp4_;
+	GdkPixbuf* _tmp7_;
 #line 554 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), NULL);
 #line 554 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -3183,8 +3183,8 @@ static GdkPixbuf* thumbnail_cache_fetch_from_memory (ThumbnailCache* self, const
 #line 557 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (_tmp4_ != NULL) {
 #line 3186 "ThumbnailCache.c"
-		ThumbnailCacheImageData* _tmp5_ = NULL;
-		GdkPixbuf* _tmp6_ = NULL;
+		ThumbnailCacheImageData* _tmp5_;
+		GdkPixbuf* _tmp6_;
 #line 557 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp5_ = data;
 #line 557 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -3210,21 +3210,21 @@ static GdkPixbuf* thumbnail_cache_fetch_from_memory (ThumbnailCache* self, const
 
 
 static void thumbnail_cache_store_in_memory (ThumbnailCache* self, const gchar* thumbnail_name, GdkPixbuf* thumbnail) {
-	gulong _tmp0_ = 0UL;
-	const gchar* _tmp1_ = NULL;
+	gulong _tmp0_;
+	const gchar* _tmp1_;
 	ThumbnailCacheImageData* data = NULL;
-	GdkPixbuf* _tmp2_ = NULL;
-	ThumbnailCacheImageData* _tmp3_ = NULL;
-	ThumbnailCacheImageData* _tmp4_ = NULL;
-	gulong _tmp5_ = 0UL;
-	GeeHashMap* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	ThumbnailCacheImageData* _tmp9_ = NULL;
-	GeeArrayList* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gulong _tmp12_ = 0UL;
-	ThumbnailCacheImageData* _tmp13_ = NULL;
-	gulong _tmp14_ = 0UL;
+	GdkPixbuf* _tmp2_;
+	ThumbnailCacheImageData* _tmp3_;
+	ThumbnailCacheImageData* _tmp4_;
+	gulong _tmp5_;
+	GeeHashMap* _tmp7_;
+	const gchar* _tmp8_;
+	ThumbnailCacheImageData* _tmp9_;
+	GeeArrayList* _tmp10_;
+	const gchar* _tmp11_;
+	gulong _tmp12_;
+	ThumbnailCacheImageData* _tmp13_;
+	gulong _tmp14_;
 #line 560 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAIL_CACHE (self));
 #line 560 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -3256,7 +3256,7 @@ static void thumbnail_cache_store_in_memory (ThumbnailCache* self, const gchar*
 #line 569 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (_tmp5_ > ((gulong) THUMBNAIL_CACHE_MAX_INMEMORY_DATA_SIZE)) {
 #line 3259 "ThumbnailCache.c"
-		const gchar* _tmp6_ = NULL;
+		const gchar* _tmp6_;
 #line 570 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp6_ = thumbnail_name;
 #line 570 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -3293,38 +3293,38 @@ static void thumbnail_cache_store_in_memory (ThumbnailCache* self, const gchar*
 #line 581 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	while (TRUE) {
 #line 3295 "ThumbnailCache.c"
-		gulong _tmp15_ = 0UL;
-		gulong _tmp16_ = 0UL;
-		GeeArrayList* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
+		gulong _tmp15_;
+		gulong _tmp16_;
+		GeeArrayList* _tmp17_;
+		gint _tmp18_;
+		gint _tmp19_;
 		gint index = 0;
-		GeeArrayList* _tmp20_ = NULL;
-		gint _tmp21_ = 0;
-		gint _tmp22_ = 0;
+		GeeArrayList* _tmp20_;
+		gint _tmp21_;
+		gint _tmp22_;
 		gchar* victim_name = NULL;
-		GeeArrayList* _tmp23_ = NULL;
-		gint _tmp24_ = 0;
-		gpointer _tmp25_ = NULL;
-		GeeArrayList* _tmp26_ = NULL;
-		gint _tmp27_ = 0;
-		gpointer _tmp28_ = NULL;
-		gchar* _tmp29_ = NULL;
-		GeeHashMap* _tmp30_ = NULL;
-		const gchar* _tmp31_ = NULL;
-		gpointer _tmp32_ = NULL;
-		gint _tmp33_ = 0;
+		GeeArrayList* _tmp23_;
+		gint _tmp24_;
+		gpointer _tmp25_;
+		GeeArrayList* _tmp26_;
+		gint _tmp27_;
+		gpointer _tmp28_;
+		gchar* _tmp29_;
+		GeeHashMap* _tmp30_;
+		const gchar* _tmp31_;
+		gpointer _tmp32_;
+		gint _tmp33_;
 		gboolean removed = FALSE;
-		GeeHashMap* _tmp34_ = NULL;
-		const gchar* _tmp35_ = NULL;
-		gboolean _tmp36_ = FALSE;
-		gboolean _tmp37_ = FALSE;
-		ThumbnailCacheImageData* _tmp38_ = NULL;
-		gulong _tmp39_ = 0UL;
-		gulong _tmp40_ = 0UL;
-		gulong _tmp41_ = 0UL;
-		ThumbnailCacheImageData* _tmp42_ = NULL;
-		gulong _tmp43_ = 0UL;
+		GeeHashMap* _tmp34_;
+		const gchar* _tmp35_;
+		gboolean _tmp36_;
+		gboolean _tmp37_;
+		ThumbnailCacheImageData* _tmp38_;
+		gulong _tmp39_;
+		gulong _tmp40_;
+		gulong _tmp41_;
+		ThumbnailCacheImageData* _tmp42_;
+		gulong _tmp43_;
 #line 581 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp15_ = self->priv->cached_bytes;
 #line 581 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -3426,25 +3426,25 @@ static void thumbnail_cache_store_in_memory (ThumbnailCache* self, const gchar*
 static gboolean thumbnail_cache_remove_from_memory (ThumbnailCache* self, const gchar* thumbnail_name) {
 	gboolean result = FALSE;
 	ThumbnailCacheImageData* data = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	ThumbnailCacheImageData* _tmp3_ = NULL;
-	gulong _tmp4_ = 0UL;
-	ThumbnailCacheImageData* _tmp5_ = NULL;
-	gulong _tmp6_ = 0UL;
-	gulong _tmp7_ = 0UL;
-	ThumbnailCacheImageData* _tmp8_ = NULL;
-	gulong _tmp9_ = 0UL;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
+	ThumbnailCacheImageData* _tmp3_;
+	gulong _tmp4_;
+	ThumbnailCacheImageData* _tmp5_;
+	gulong _tmp6_;
+	gulong _tmp7_;
+	ThumbnailCacheImageData* _tmp8_;
+	gulong _tmp9_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
-	gboolean _tmp13_ = FALSE;
-	GeeArrayList* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	gboolean _tmp16_ = FALSE;
-	gboolean _tmp17_ = FALSE;
+	GeeHashMap* _tmp10_;
+	const gchar* _tmp11_;
+	gboolean _tmp12_;
+	gboolean _tmp13_;
+	GeeArrayList* _tmp14_;
+	const gchar* _tmp15_;
+	gboolean _tmp16_;
+	gboolean _tmp17_;
 #line 601 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), FALSE);
 #line 601 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -3521,16 +3521,14 @@ static gboolean thumbnail_cache_remove_from_memory (ThumbnailCache* self, const
 
 static void thumbnail_cache_save_thumbnail (ThumbnailCache* self, GFile* file, GdkPixbuf* pixbuf, ThumbnailSource* source, GError** error) {
 	PhotoFileWriter* _tmp0_ = NULL;
-	ThumbnailSource* _tmp1_ = NULL;
-	PhotoFileFormat _tmp2_ = 0;
-	GFile* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	PhotoFileWriter* _tmp6_ = NULL;
-	PhotoFileWriter* _tmp7_ = NULL;
-	PhotoFileWriter* _tmp8_ = NULL;
-	PhotoFileWriter* _tmp9_ = NULL;
-	GdkPixbuf* _tmp10_ = NULL;
+	ThumbnailSource* _tmp1_;
+	PhotoFileFormat _tmp2_;
+	GFile* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	PhotoFileWriter* _tmp6_;
+	PhotoFileWriter* _tmp7_;
+	GdkPixbuf* _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 620 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (IS_THUMBNAIL_CACHE (self));
@@ -3564,20 +3562,12 @@ static void thumbnail_cache_save_thumbnail (ThumbnailCache* self, GFile* file, G
 		g_propagate_error (error, _inner_error_);
 #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		return;
-#line 3567 "ThumbnailCache.c"
+#line 3565 "ThumbnailCache.c"
 	}
 #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
-	_tmp8_ = _tmp0_;
+	_tmp8_ = pixbuf;
 #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
-	_tmp0_ = NULL;
-#line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
-	_tmp9_ = _tmp8_;
-#line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
-	_tmp10_ = pixbuf;
-#line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
-	photo_file_writer_write (_tmp9_, _tmp10_, THUMBNAIL_CACHE_DEFAULT_QUALITY, &_inner_error_);
-#line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
-	_photo_file_adapter_unref0 (_tmp9_);
+	photo_file_writer_write (_tmp0_, _tmp8_, THUMBNAIL_CACHE_DEFAULT_QUALITY, &_inner_error_);
 #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -3586,22 +3576,22 @@ static void thumbnail_cache_save_thumbnail (ThumbnailCache* self, GFile* file, G
 		_photo_file_adapter_unref0 (_tmp0_);
 #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		return;
-#line 3589 "ThumbnailCache.c"
+#line 3579 "ThumbnailCache.c"
 	}
 #line 620 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	_photo_file_adapter_unref0 (_tmp0_);
-#line 3593 "ThumbnailCache.c"
+#line 3583 "ThumbnailCache.c"
 }
 
 
 static ThumbnailCacheImageData* thumbnail_cache_image_data_construct (GType object_type, GdkPixbuf* pixbuf) {
 	ThumbnailCacheImageData* self = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	GdkPixbuf* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	GdkPixbuf* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	GdkPixbuf* _tmp2_;
+	gint _tmp3_;
+	GdkPixbuf* _tmp4_;
+	gint _tmp5_;
 #line 63 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
 #line 63 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -3626,21 +3616,21 @@ static ThumbnailCacheImageData* thumbnail_cache_image_data_construct (GType obje
 	self->bytes = ((gulong) _tmp3_) * ((gulong) _tmp5_);
 #line 63 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	return self;
-#line 3629 "ThumbnailCache.c"
+#line 3619 "ThumbnailCache.c"
 }
 
 
 static ThumbnailCacheImageData* thumbnail_cache_image_data_new (GdkPixbuf* pixbuf) {
 #line 63 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	return thumbnail_cache_image_data_construct (THUMBNAIL_CACHE_TYPE_IMAGE_DATA, pixbuf);
-#line 3636 "ThumbnailCache.c"
+#line 3626 "ThumbnailCache.c"
 }
 
 
 static void thumbnail_cache_value_image_data_init (GValue* value) {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	value->data[0].v_pointer = NULL;
-#line 3643 "ThumbnailCache.c"
+#line 3633 "ThumbnailCache.c"
 }
 
 
@@ -3649,7 +3639,7 @@ static void thumbnail_cache_value_image_data_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		thumbnail_cache_image_data_unref (value->data[0].v_pointer);
-#line 3652 "ThumbnailCache.c"
+#line 3642 "ThumbnailCache.c"
 	}
 }
 
@@ -3659,11 +3649,11 @@ static void thumbnail_cache_value_image_data_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		dest_value->data[0].v_pointer = thumbnail_cache_image_data_ref (src_value->data[0].v_pointer);
-#line 3662 "ThumbnailCache.c"
+#line 3652 "ThumbnailCache.c"
 	} else {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3666 "ThumbnailCache.c"
+#line 3656 "ThumbnailCache.c"
 	}
 }
 
@@ -3671,66 +3661,66 @@ static void thumbnail_cache_value_image_data_copy_value (const GValue* src_value
 static gpointer thumbnail_cache_value_image_data_peek_pointer (const GValue* value) {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	return value->data[0].v_pointer;
-#line 3674 "ThumbnailCache.c"
+#line 3664 "ThumbnailCache.c"
 }
 
 
 static gchar* thumbnail_cache_value_image_data_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (collect_values[0].v_pointer) {
-#line 3681 "ThumbnailCache.c"
-		ThumbnailCacheImageData* object;
+#line 3671 "ThumbnailCache.c"
+		ThumbnailCacheImageData * object;
 		object = collect_values[0].v_pointer;
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3688 "ThumbnailCache.c"
+#line 3678 "ThumbnailCache.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3692 "ThumbnailCache.c"
+#line 3682 "ThumbnailCache.c"
 		}
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		value->data[0].v_pointer = thumbnail_cache_image_data_ref (object);
-#line 3696 "ThumbnailCache.c"
+#line 3686 "ThumbnailCache.c"
 	} else {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		value->data[0].v_pointer = NULL;
-#line 3700 "ThumbnailCache.c"
+#line 3690 "ThumbnailCache.c"
 	}
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	return NULL;
-#line 3704 "ThumbnailCache.c"
+#line 3694 "ThumbnailCache.c"
 }
 
 
 static gchar* thumbnail_cache_value_image_data_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	ThumbnailCacheImageData** object_p;
+	ThumbnailCacheImageData ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (!object_p) {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3715 "ThumbnailCache.c"
+#line 3705 "ThumbnailCache.c"
 	}
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (!value->data[0].v_pointer) {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		*object_p = NULL;
-#line 3721 "ThumbnailCache.c"
+#line 3711 "ThumbnailCache.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3725 "ThumbnailCache.c"
+#line 3715 "ThumbnailCache.c"
 	} else {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		*object_p = thumbnail_cache_image_data_ref (value->data[0].v_pointer);
-#line 3729 "ThumbnailCache.c"
+#line 3719 "ThumbnailCache.c"
 	}
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	return NULL;
-#line 3733 "ThumbnailCache.c"
+#line 3723 "ThumbnailCache.c"
 }
 
 
@@ -3744,7 +3734,7 @@ static GParamSpec* thumbnail_cache_param_spec_image_data (const gchar* name, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	return G_PARAM_SPEC (spec);
-#line 3747 "ThumbnailCache.c"
+#line 3737 "ThumbnailCache.c"
 }
 
 
@@ -3753,12 +3743,12 @@ static gpointer thumbnail_cache_value_get_image_data (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, THUMBNAIL_CACHE_TYPE_IMAGE_DATA), NULL);
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	return value->data[0].v_pointer;
-#line 3756 "ThumbnailCache.c"
+#line 3746 "ThumbnailCache.c"
 }
 
 
 static void thumbnail_cache_value_set_image_data (GValue* value, gpointer v_object) {
-	ThumbnailCacheImageData* old;
+	ThumbnailCacheImageData * old;
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, THUMBNAIL_CACHE_TYPE_IMAGE_DATA));
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -3773,23 +3763,23 @@ static void thumbnail_cache_value_set_image_data (GValue* value, gpointer v_obje
 		value->data[0].v_pointer = v_object;
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		thumbnail_cache_image_data_ref (value->data[0].v_pointer);
-#line 3776 "ThumbnailCache.c"
+#line 3766 "ThumbnailCache.c"
 	} else {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		value->data[0].v_pointer = NULL;
-#line 3780 "ThumbnailCache.c"
+#line 3770 "ThumbnailCache.c"
 	}
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (old) {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		thumbnail_cache_image_data_unref (old);
-#line 3786 "ThumbnailCache.c"
+#line 3776 "ThumbnailCache.c"
 	}
 }
 
 
 static void thumbnail_cache_value_take_image_data (GValue* value, gpointer v_object) {
-	ThumbnailCacheImageData* old;
+	ThumbnailCacheImageData * old;
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, THUMBNAIL_CACHE_TYPE_IMAGE_DATA));
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -3802,17 +3792,17 @@ static void thumbnail_cache_value_take_image_data (GValue* value, gpointer v_obj
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		value->data[0].v_pointer = v_object;
-#line 3805 "ThumbnailCache.c"
+#line 3795 "ThumbnailCache.c"
 	} else {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		value->data[0].v_pointer = NULL;
-#line 3809 "ThumbnailCache.c"
+#line 3799 "ThumbnailCache.c"
 	}
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (old) {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		thumbnail_cache_image_data_unref (old);
-#line 3815 "ThumbnailCache.c"
+#line 3805 "ThumbnailCache.c"
 	}
 }
 
@@ -3822,21 +3812,21 @@ static void thumbnail_cache_image_data_class_init (ThumbnailCacheImageDataClass
 	thumbnail_cache_image_data_parent_class = g_type_class_peek_parent (klass);
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	((ThumbnailCacheImageDataClass *) klass)->finalize = thumbnail_cache_image_data_finalize;
-#line 3825 "ThumbnailCache.c"
+#line 3815 "ThumbnailCache.c"
 }
 
 
 static void thumbnail_cache_image_data_instance_init (ThumbnailCacheImageData * self) {
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self->ref_count = 1;
-#line 3832 "ThumbnailCache.c"
+#line 3822 "ThumbnailCache.c"
 }
 
 
-static void thumbnail_cache_image_data_finalize (ThumbnailCacheImageData* obj) {
+static void thumbnail_cache_image_data_finalize (ThumbnailCacheImageData * obj) {
 	ThumbnailCacheImageData * self;
-	gulong _tmp0_ = 0UL;
-	gulong _tmp1_ = 0UL;
+	gulong _tmp0_;
+	gulong _tmp1_;
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, THUMBNAIL_CACHE_TYPE_IMAGE_DATA, ThumbnailCacheImageData);
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -3851,7 +3841,7 @@ static void thumbnail_cache_image_data_finalize (ThumbnailCacheImageData* obj) {
 	thumbnail_cache_schedule_debug ();
 #line 60 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	_g_object_unref0 (self->pixbuf);
-#line 3854 "ThumbnailCache.c"
+#line 3844 "ThumbnailCache.c"
 }
 
 
@@ -3870,18 +3860,18 @@ static GType thumbnail_cache_image_data_get_type (void) {
 
 
 static gpointer thumbnail_cache_image_data_ref (gpointer instance) {
-	ThumbnailCacheImageData* self;
+	ThumbnailCacheImageData * self;
 	self = instance;
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	return instance;
-#line 3879 "ThumbnailCache.c"
+#line 3869 "ThumbnailCache.c"
 }
 
 
 static void thumbnail_cache_image_data_unref (gpointer instance) {
-	ThumbnailCacheImageData* self;
+	ThumbnailCacheImageData * self;
 	self = instance;
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -3889,7 +3879,7 @@ static void thumbnail_cache_image_data_unref (gpointer instance) {
 		THUMBNAIL_CACHE_IMAGE_DATA_GET_CLASS (self)->finalize (self);
 #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3892 "ThumbnailCache.c"
+#line 3882 "ThumbnailCache.c"
 	}
 }
 
@@ -3897,28 +3887,28 @@ static void thumbnail_cache_image_data_unref (gpointer instance) {
 static void _thumbnail_cache_async_fetch_completion_callback_completion_callback (BackgroundJob* job, gpointer self) {
 #line 94 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	thumbnail_cache_async_fetch_completion_callback (job);
-#line 3900 "ThumbnailCache.c"
+#line 3890 "ThumbnailCache.c"
 }
 
 
 static ThumbnailCacheAsyncFetchJob* thumbnail_cache_async_fetch_job_construct (GType object_type, ThumbnailCache* cache, const gchar* thumbnail_name, ThumbnailSource* source, GdkPixbuf* prefetched, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable) {
 	ThumbnailCacheAsyncFetchJob* self = NULL;
-	ThumbnailCache* _tmp0_ = NULL;
-	GCancellable* _tmp1_ = NULL;
-	ThumbnailCache* _tmp2_ = NULL;
-	ThumbnailCache* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	ThumbnailSource* _tmp6_ = NULL;
-	ThumbnailSource* _tmp7_ = NULL;
-	ThumbnailSource* _tmp8_ = NULL;
-	PhotoFileFormat _tmp9_ = 0;
-	GdkPixbuf* _tmp10_ = NULL;
-	GdkPixbuf* _tmp11_ = NULL;
-	Dimensions _tmp12_ = {0};
-	GdkInterpType _tmp13_ = 0;
-	ThumbnailCacheAsyncFetchCallback _tmp14_ = NULL;
-	void* _tmp14__target = NULL;
+	ThumbnailCache* _tmp0_;
+	GCancellable* _tmp1_;
+	ThumbnailCache* _tmp2_;
+	ThumbnailCache* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	ThumbnailSource* _tmp6_;
+	ThumbnailSource* _tmp7_;
+	ThumbnailSource* _tmp8_;
+	PhotoFileFormat _tmp9_;
+	GdkPixbuf* _tmp10_;
+	GdkPixbuf* _tmp11_;
+	Dimensions _tmp12_;
+	GdkInterpType _tmp13_;
+	ThumbnailCacheAsyncFetchCallback _tmp14_;
+	void* _tmp14__target;
 #line 91 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_val_if_fail (IS_THUMBNAIL_CACHE (cache), NULL);
 #line 91 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -3993,21 +3983,21 @@ static ThumbnailCacheAsyncFetchJob* thumbnail_cache_async_fetch_job_construct (G
 	self->callback_target = _tmp14__target;
 #line 91 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	return self;
-#line 3996 "ThumbnailCache.c"
+#line 3986 "ThumbnailCache.c"
 }
 
 
 static ThumbnailCacheAsyncFetchJob* thumbnail_cache_async_fetch_job_new (ThumbnailCache* cache, const gchar* thumbnail_name, ThumbnailSource* source, GdkPixbuf* prefetched, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable) {
 #line 91 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	return thumbnail_cache_async_fetch_job_construct (THUMBNAIL_CACHE_TYPE_ASYNC_FETCH_JOB, cache, thumbnail_name, source, prefetched, dim, interp, callback, callback_target, cancellable);
-#line 4003 "ThumbnailCache.c"
+#line 3993 "ThumbnailCache.c"
 }
 
 
 static BackgroundJobJobPriority thumbnail_cache_async_fetch_job_real_get_priority (BackgroundJob* base) {
 	ThumbnailCacheAsyncFetchJob * self;
 	BackgroundJobJobPriority result = 0;
-	GdkInterpType _tmp0_ = 0;
+	GdkInterpType _tmp0_;
 #line 106 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, THUMBNAIL_CACHE_TYPE_ASYNC_FETCH_JOB, ThumbnailCacheAsyncFetchJob);
 #line 109 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4018,26 +4008,26 @@ static BackgroundJobJobPriority thumbnail_cache_async_fetch_job_real_get_priorit
 		case GDK_INTERP_NEAREST:
 #line 109 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		case GDK_INTERP_TILES:
-#line 4021 "ThumbnailCache.c"
+#line 4011 "ThumbnailCache.c"
 		{
 #line 112 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			result = BACKGROUND_JOB_JOB_PRIORITY_HIGH;
 #line 112 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			return result;
-#line 4027 "ThumbnailCache.c"
+#line 4017 "ThumbnailCache.c"
 		}
 		default:
 #line 109 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		case GDK_INTERP_BILINEAR:
 #line 109 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		case GDK_INTERP_HYPER:
-#line 4034 "ThumbnailCache.c"
+#line 4024 "ThumbnailCache.c"
 		{
 #line 117 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			result = BACKGROUND_JOB_JOB_PRIORITY_NORMAL;
 #line 117 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			return result;
-#line 4040 "ThumbnailCache.c"
+#line 4030 "ThumbnailCache.c"
 		}
 	}
 }
@@ -4048,24 +4038,24 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 	GError * _inner_error_ = NULL;
 #line 121 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, THUMBNAIL_CACHE_TYPE_ASYNC_FETCH_JOB, ThumbnailCacheAsyncFetchJob);
-#line 4051 "ThumbnailCache.c"
+#line 4041 "ThumbnailCache.c"
 	{
-		GdkPixbuf* _tmp0_ = NULL;
-		gboolean _tmp7_ = FALSE;
+		GdkPixbuf* _tmp0_;
+		gboolean _tmp7_;
 		GdkPixbuf* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
-		GdkPixbuf* _tmp16_ = NULL;
+		gboolean _tmp9_;
+		GdkPixbuf* _tmp16_;
 #line 124 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp0_ = self->unscaled;
 #line 124 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (_tmp0_ == NULL) {
-#line 4062 "ThumbnailCache.c"
+#line 4052 "ThumbnailCache.c"
 			GdkPixbuf* _tmp1_ = NULL;
-			ThumbnailCache* _tmp2_ = NULL;
-			const gchar* _tmp3_ = NULL;
-			PhotoFileFormat _tmp4_ = 0;
-			GdkPixbuf* _tmp5_ = NULL;
-			GdkPixbuf* _tmp6_ = NULL;
+			ThumbnailCache* _tmp2_;
+			const gchar* _tmp3_;
+			PhotoFileFormat _tmp4_;
+			GdkPixbuf* _tmp5_;
+			GdkPixbuf* _tmp6_;
 #line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp2_ = self->cache;
 #line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4078,8 +4068,8 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 			_tmp1_ = _tmp5_;
 #line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4081 "ThumbnailCache.c"
-				goto __catch240_g_error;
+#line 4071 "ThumbnailCache.c"
+				goto __catch241_g_error;
 			}
 #line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp6_ = _tmp1_;
@@ -4093,7 +4083,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 			self->fetched = TRUE;
 #line 124 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_g_object_unref0 (_tmp1_);
-#line 4096 "ThumbnailCache.c"
+#line 4086 "ThumbnailCache.c"
 		}
 #line 129 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp7_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
@@ -4101,17 +4091,17 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 		if (_tmp7_) {
 #line 130 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			return;
-#line 4104 "ThumbnailCache.c"
+#line 4094 "ThumbnailCache.c"
 		}
 #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp9_ = dimensions_has_area (&self->dim);
 #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (_tmp9_) {
-#line 4110 "ThumbnailCache.c"
-			GdkPixbuf* _tmp10_ = NULL;
-			Dimensions _tmp11_ = {0};
-			GdkInterpType _tmp12_ = 0;
-			GdkPixbuf* _tmp13_ = NULL;
+#line 4100 "ThumbnailCache.c"
+			GdkPixbuf* _tmp10_;
+			Dimensions _tmp11_;
+			GdkInterpType _tmp12_;
+			GdkPixbuf* _tmp13_;
 #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp10_ = self->unscaled;
 #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4124,10 +4114,10 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 			_g_object_unref0 (_tmp8_);
 #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp8_ = _tmp13_;
-#line 4127 "ThumbnailCache.c"
+#line 4117 "ThumbnailCache.c"
 		} else {
-			GdkPixbuf* _tmp14_ = NULL;
-			GdkPixbuf* _tmp15_ = NULL;
+			GdkPixbuf* _tmp14_;
+			GdkPixbuf* _tmp15_;
 #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp14_ = self->unscaled;
 #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4136,7 +4126,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 			_g_object_unref0 (_tmp8_);
 #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp8_ = _tmp15_;
-#line 4139 "ThumbnailCache.c"
+#line 4129 "ThumbnailCache.c"
 		}
 #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp16_ = _g_object_ref0 (_tmp8_);
@@ -4146,13 +4136,13 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 		self->scaled = _tmp16_;
 #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_g_object_unref0 (_tmp8_);
-#line 4149 "ThumbnailCache.c"
+#line 4139 "ThumbnailCache.c"
 	}
-	goto __finally240;
-	__catch240_g_error:
+	goto __finally241;
+	__catch241_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp17_ = NULL;
+		GError* _tmp17_;
 #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		err = _inner_error_;
 #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4161,22 +4151,22 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 		_tmp17_ = err;
 #line 135 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (_tmp17_->domain == G_FILE_ERROR) {
-#line 4164 "ThumbnailCache.c"
+#line 4154 "ThumbnailCache.c"
 			{
 #line 137 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 				thumbnail_cache_async_fetch_job_generate_thumbnail (self, &_inner_error_);
 #line 137 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4170 "ThumbnailCache.c"
-					goto __catch241_g_error;
+#line 4160 "ThumbnailCache.c"
+					goto __catch242_g_error;
 				}
 			}
-			goto __finally241;
-			__catch241_g_error:
+			goto __finally242;
+			__catch242_g_error:
 			{
 				GError* generr = NULL;
-				GError* _tmp18_ = NULL;
-				GError* _tmp19_ = NULL;
+				GError* _tmp18_;
+				GError* _tmp19_;
 #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 				generr = _inner_error_;
 #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4191,9 +4181,9 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 				err = _tmp19_;
 #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 				_g_error_free0 (generr);
-#line 4194 "ThumbnailCache.c"
+#line 4184 "ThumbnailCache.c"
 			}
-			__finally241:
+			__finally242:
 #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4206,11 +4196,11 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 				g_clear_error (&_inner_error_);
 #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 				return;
-#line 4209 "ThumbnailCache.c"
+#line 4199 "ThumbnailCache.c"
 			}
 		} else {
-			GError* _tmp20_ = NULL;
-			GError* _tmp21_ = NULL;
+			GError* _tmp20_;
+			GError* _tmp21_;
 #line 144 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp20_ = err;
 #line 144 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4219,13 +4209,13 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 			_g_error_free0 (self->err);
 #line 144 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			self->err = _tmp21_;
-#line 4222 "ThumbnailCache.c"
+#line 4212 "ThumbnailCache.c"
 		}
 #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_g_error_free0 (err);
-#line 4226 "ThumbnailCache.c"
+#line 4216 "ThumbnailCache.c"
 	}
-	__finally240:
+	__finally241:
 #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4234,17 +4224,17 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 		g_clear_error (&_inner_error_);
 #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		return;
-#line 4237 "ThumbnailCache.c"
+#line 4227 "ThumbnailCache.c"
 	}
 }
 
 
 static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAsyncFetchJob* self, GError** error) {
 	Photo* photo = NULL;
-	ThumbnailSource* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	GdkPixbuf* _tmp19_ = NULL;
+	ThumbnailSource* _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	GdkPixbuf* _tmp19_;
 	GError * _inner_error_ = NULL;
 #line 149 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	g_return_if_fail (THUMBNAIL_CACHE_IS_ASYNC_FETCH_JOB (self));
@@ -4258,14 +4248,14 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs
 	_tmp2_ = photo;
 #line 151 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (_tmp2_ != NULL) {
-#line 4261 "ThumbnailCache.c"
+#line 4251 "ThumbnailCache.c"
 		GdkPixbuf* _tmp3_ = NULL;
-		Photo* _tmp4_ = NULL;
-		Dimensions _tmp5_ = {0};
-		gint _tmp6_ = 0;
+		Photo* _tmp4_;
+		Dimensions _tmp5_;
+		gint _tmp6_;
 		Scaling _tmp7_ = {0};
-		GdkPixbuf* _tmp8_ = NULL;
-		GdkPixbuf* _tmp9_ = NULL;
+		GdkPixbuf* _tmp8_;
+		GdkPixbuf* _tmp9_;
 #line 152 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp4_ = photo;
 #line 152 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4286,7 +4276,7 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs
 			_g_object_unref0 (photo);
 #line 152 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			return;
-#line 4289 "ThumbnailCache.c"
+#line 4279 "ThumbnailCache.c"
 		}
 #line 152 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp9_ = _tmp3_;
@@ -4298,12 +4288,12 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs
 		self->unscaled = _tmp9_;
 #line 151 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_g_object_unref0 (_tmp3_);
-#line 4301 "ThumbnailCache.c"
+#line 4291 "ThumbnailCache.c"
 	} else {
 		Video* video = NULL;
-		ThumbnailSource* _tmp10_ = NULL;
-		Video* _tmp11_ = NULL;
-		Video* _tmp12_ = NULL;
+		ThumbnailSource* _tmp10_;
+		Video* _tmp11_;
+		Video* _tmp12_;
 #line 154 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp10_ = self->source;
 #line 154 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4314,13 +4304,13 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs
 		_tmp12_ = video;
 #line 155 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (_tmp12_ != NULL) {
-#line 4317 "ThumbnailCache.c"
+#line 4307 "ThumbnailCache.c"
 			GdkPixbuf* _tmp13_ = NULL;
-			Video* _tmp14_ = NULL;
-			Dimensions _tmp15_ = {0};
-			gint _tmp16_ = 0;
-			GdkPixbuf* _tmp17_ = NULL;
-			GdkPixbuf* _tmp18_ = NULL;
+			Video* _tmp14_;
+			Dimensions _tmp15_;
+			gint _tmp16_;
+			GdkPixbuf* _tmp17_;
+			GdkPixbuf* _tmp18_;
 #line 156 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp14_ = video;
 #line 156 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4341,7 +4331,7 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs
 				_g_object_unref0 (photo);
 #line 156 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 				return;
-#line 4344 "ThumbnailCache.c"
+#line 4334 "ThumbnailCache.c"
 			}
 #line 156 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp18_ = _tmp13_;
@@ -4353,21 +4343,21 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs
 			self->unscaled = _tmp18_;
 #line 155 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_g_object_unref0 (_tmp13_);
-#line 4356 "ThumbnailCache.c"
+#line 4346 "ThumbnailCache.c"
 		}
 #line 151 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_g_object_unref0 (video);
-#line 4360 "ThumbnailCache.c"
+#line 4350 "ThumbnailCache.c"
 	}
 #line 159 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	_tmp19_ = self->unscaled;
 #line 159 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (_tmp19_ != NULL) {
-#line 4366 "ThumbnailCache.c"
-		GdkPixbuf* _tmp20_ = NULL;
-		Dimensions _tmp21_ = {0};
-		GdkInterpType _tmp22_ = 0;
-		GdkPixbuf* _tmp23_ = NULL;
+#line 4356 "ThumbnailCache.c"
+		GdkPixbuf* _tmp20_;
+		Dimensions _tmp21_;
+		GdkInterpType _tmp22_;
+		GdkPixbuf* _tmp23_;
 #line 160 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp20_ = self->unscaled;
 #line 160 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4382,11 +4372,11 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs
 		self->scaled = _tmp23_;
 #line 161 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		self->replace = TRUE;
-#line 4385 "ThumbnailCache.c"
+#line 4375 "ThumbnailCache.c"
 	}
 #line 149 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	_g_object_unref0 (photo);
-#line 4389 "ThumbnailCache.c"
+#line 4379 "ThumbnailCache.c"
 }
 
 
@@ -4396,10 +4386,10 @@ static void thumbnail_cache_async_fetch_job_class_init (ThumbnailCacheAsyncFetch
 #line 77 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	((BackgroundJobClass *) klass)->finalize = thumbnail_cache_async_fetch_job_finalize;
 #line 77 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
-	((BackgroundJobClass *) klass)->get_priority = (BackgroundJobJobPriority (*)(BackgroundJob*)) thumbnail_cache_async_fetch_job_real_get_priority;
+	((BackgroundJobClass *) klass)->get_priority = (BackgroundJobJobPriority (*) (BackgroundJob *)) thumbnail_cache_async_fetch_job_real_get_priority;
 #line 77 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) thumbnail_cache_async_fetch_job_real_execute;
-#line 4402 "ThumbnailCache.c"
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) thumbnail_cache_async_fetch_job_real_execute;
+#line 4392 "ThumbnailCache.c"
 }
 
 
@@ -4412,11 +4402,11 @@ static void thumbnail_cache_async_fetch_job_instance_init (ThumbnailCacheAsyncFe
 	self->fetched = FALSE;
 #line 89 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self->replace = FALSE;
-#line 4415 "ThumbnailCache.c"
+#line 4405 "ThumbnailCache.c"
 }
 
 
-static void thumbnail_cache_async_fetch_job_finalize (BackgroundJob* obj) {
+static void thumbnail_cache_async_fetch_job_finalize (BackgroundJob * obj) {
 	ThumbnailCacheAsyncFetchJob * self;
 #line 77 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, THUMBNAIL_CACHE_TYPE_ASYNC_FETCH_JOB, ThumbnailCacheAsyncFetchJob);
@@ -4434,7 +4424,7 @@ static void thumbnail_cache_async_fetch_job_finalize (BackgroundJob* obj) {
 	_g_error_free0 (self->err);
 #line 77 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	BACKGROUND_JOB_CLASS (thumbnail_cache_async_fetch_job_parent_class)->finalize (obj);
-#line 4437 "ThumbnailCache.c"
+#line 4427 "ThumbnailCache.c"
 }
 
 
@@ -4451,7 +4441,7 @@ static GType thumbnail_cache_async_fetch_job_get_type (void) {
 
 
 static void thumbnail_cache_class_init (ThumbnailCacheClass * klass) {
-	ThumbnailCacheSize* _tmp0_ = NULL;
+	ThumbnailCacheSize* _tmp0_;
 #line 27 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	thumbnail_cache_parent_class = g_type_class_peek_parent (klass);
 #line 27 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4468,13 +4458,13 @@ static void thumbnail_cache_class_init (ThumbnailCacheClass * klass) {
 	thumbnail_cache_ALL_SIZES = _tmp0_;
 #line 54 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	thumbnail_cache_ALL_SIZES_length1 = 2;
-#line 4471 "ThumbnailCache.c"
+#line 4461 "ThumbnailCache.c"
 }
 
 
 static void thumbnail_cache_instance_init (ThumbnailCache * self) {
-	GeeHashMap* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeArrayList* _tmp1_;
 #line 27 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self->priv = THUMBNAIL_CACHE_GET_PRIVATE (self);
 #line 186 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4487,11 +4477,11 @@ static void thumbnail_cache_instance_init (ThumbnailCache * self) {
 	self->priv->cache_lru = _tmp1_;
 #line 188 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self->priv->cached_bytes = (gulong) 0;
-#line 4490 "ThumbnailCache.c"
+#line 4480 "ThumbnailCache.c"
 }
 
 
-static void thumbnail_cache_finalize (GObject* obj) {
+static void thumbnail_cache_finalize (GObject * obj) {
 	ThumbnailCache * self;
 #line 27 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_THUMBNAIL_CACHE, ThumbnailCache);
@@ -4503,7 +4493,7 @@ static void thumbnail_cache_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->cache_lru);
 #line 27 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	G_OBJECT_CLASS (thumbnail_cache_parent_class)->finalize (obj);
-#line 4506 "ThumbnailCache.c"
+#line 4496 "ThumbnailCache.c"
 }
 
 
diff --git a/src/TimedQueue.c b/src/TimedQueue.c
index 2139827..7aa045d 100644
--- a/src/TimedQueue.c
+++ b/src/TimedQueue.c
@@ -1,4 +1,4 @@
-/* TimedQueue.c generated by valac 0.34.7, the Vala compiler
+/* TimedQueue.c generated by valac 0.36.6, the Vala compiler
  * generated from TimedQueue.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -60,6 +60,11 @@ typedef struct _TimedQueueElementPrivate TimedQueueElementPrivate;
 #define _g_destroy_func0(var) (((var == NULL) || (g_destroy_func == NULL)) ? NULL : (var = (g_destroy_func (var), NULL)))
 typedef struct _TimedQueueParamSpecElement TimedQueueParamSpecElement;
 typedef struct _ParamSpecTimedQueue ParamSpecTimedQueue;
+enum  {
+	TIMED_QUEUE_PAUSED_SIGNAL,
+	TIMED_QUEUE_LAST_SIGNAL
+};
+static guint timed_queue_signals[TIMED_QUEUE_LAST_SIGNAL] = {0};
 
 #define TYPE_HASH_TIMED_QUEUE (hash_timed_queue_get_type ())
 #define HASH_TIMED_QUEUE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_HASH_TIMED_QUEUE, HashTimedQueue))
@@ -221,8 +226,8 @@ static void timed_queue_real_paused (TimedQueue* self, gboolean is_paused);
 enum  {
 	TIMED_QUEUE_ELEMENT_DUMMY_PROPERTY
 };
-static void timed_queue_element_finalize (TimedQueueElement* obj);
-static void timed_queue_finalize (TimedQueue* obj);
+static void timed_queue_element_finalize (TimedQueueElement * obj);
+static void timed_queue_finalize (TimedQueue * obj);
 GType hash_timed_queue_get_type (void) G_GNUC_CONST;
 #define HASH_TIMED_QUEUE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_HASH_TIMED_QUEUE, HashTimedQueuePrivate))
 enum  {
@@ -237,7 +242,7 @@ static gboolean hash_timed_queue_real_contains (TimedQueue* base, gconstpointer
 static gboolean hash_timed_queue_real_enqueue (TimedQueue* base, gconstpointer item);
 static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollection* items);
 static gboolean hash_timed_queue_real_remove_first (TimedQueue* base, gconstpointer item);
-static void hash_timed_queue_finalize (TimedQueue* obj);
+static void hash_timed_queue_finalize (TimedQueue * obj);
 
 
 static gint64 _timed_queue_element_comparator_comparator (void* a, void* b, gpointer self) {
@@ -245,7 +250,7 @@ static gint64 _timed_queue_element_comparator_comparator (void* a, void* b, gpoi
 	result = timed_queue_element_comparator (a, b);
 #line 64 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 249 "TimedQueue.c"
+#line 254 "TimedQueue.c"
 }
 
 
@@ -254,22 +259,22 @@ static gboolean _timed_queue_on_heartbeat_gsource_func (gpointer self) {
 	result = timed_queue_on_heartbeat ((TimedQueue*) self);
 #line 66 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 258 "TimedQueue.c"
+#line 263 "TimedQueue.c"
 }
 
 
 TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority) {
 	TimedQueue* self = NULL;
-	guint _tmp0_ = 0U;
-	DequeuedCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	GeeEqualDataFunc _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	gint _tmp7_ = 0;
-	SortedList* _tmp8_ = NULL;
-	guint _tmp9_ = 0U;
-	gint _tmp10_ = 0;
-	guint _tmp11_ = 0U;
+	guint _tmp0_;
+	DequeuedCallback _tmp1_;
+	void* _tmp1__target;
+	GeeEqualDataFunc _tmp2_;
+	void* _tmp2__target;
+	gint _tmp7_;
+	SortedList* _tmp8_;
+	guint _tmp9_;
+	gint _tmp10_;
+	guint _tmp11_;
 #line 52 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = (TimedQueue*) g_type_create_instance (object_type);
 #line 52 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -296,10 +301,10 @@ TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFu
 	_tmp2__target = equal_func_target;
 #line 57 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (_tmp2_ != NULL) {
-#line 300 "TimedQueue.c"
-		GeeEqualDataFunc _tmp3_ = NULL;
-		void* _tmp3__target = NULL;
-		GDestroyNotify _tmp3__target_destroy_notify = NULL;
+#line 305 "TimedQueue.c"
+		GeeEqualDataFunc _tmp3_;
+		void* _tmp3__target;
+		GDestroyNotify _tmp3__target_destroy_notify;
 #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp3_ = equal_func;
 #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -326,11 +331,11 @@ TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFu
 		self->priv->equal_func_target = _tmp3__target;
 #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		self->priv->equal_func_target_destroy_notify = _tmp3__target_destroy_notify;
-#line 330 "TimedQueue.c"
+#line 335 "TimedQueue.c"
 	} else {
-		void* _tmp4_ = NULL;
-		GDestroyNotify _tmp5_ = NULL;
-		GeeEqualDataFunc _tmp6_ = NULL;
+		void* _tmp4_;
+		GDestroyNotify _tmp5_;
+		GeeEqualDataFunc _tmp6_;
 #line 60 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp6_ = gee_functions_get_equal_func_for (g_type, &_tmp4_, &_tmp5_);
 #line 60 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -347,7 +352,7 @@ TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFu
 		self->priv->equal_func_target = _tmp4_;
 #line 60 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		self->priv->equal_func_target_destroy_notify = _tmp5_;
-#line 351 "TimedQueue.c"
+#line 356 "TimedQueue.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp7_ = priority;
@@ -377,20 +382,20 @@ TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFu
 	equal_func_target_destroy_notify = NULL;
 #line 52 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return self;
-#line 381 "TimedQueue.c"
+#line 386 "TimedQueue.c"
 }
 
 
 TimedQueue* timed_queue_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority) {
 #line 52 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return timed_queue_construct (TYPE_TIMED_QUEUE, g_type, g_dup_func, g_destroy_func, hold_msec, callback, callback_target, equal_func, equal_func_target, equal_func_target_destroy_notify, priority);
-#line 388 "TimedQueue.c"
+#line 393 "TimedQueue.c"
 }
 
 
 guint timed_queue_get_dequeue_spacing_msec (TimedQueue* self) {
 	guint result = 0U;
-	guint _tmp0_ = 0U;
+	guint _tmp0_;
 #line 74 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), 0U);
 #line 75 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -399,18 +404,18 @@ guint timed_queue_get_dequeue_spacing_msec (TimedQueue* self) {
 	result = _tmp0_;
 #line 75 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 403 "TimedQueue.c"
+#line 408 "TimedQueue.c"
 }
 
 
 void timed_queue_set_dequeue_spacing_msec (TimedQueue* self, guint msec) {
-	guint _tmp0_ = 0U;
-	guint _tmp1_ = 0U;
-	guint _tmp2_ = 0U;
-	guint _tmp4_ = 0U;
-	guint _tmp5_ = 0U;
-	gint _tmp6_ = 0;
-	guint _tmp7_ = 0U;
+	guint _tmp0_;
+	guint _tmp1_;
+	guint _tmp2_;
+	guint _tmp4_;
+	guint _tmp5_;
+	gint _tmp6_;
+	guint _tmp7_;
 #line 78 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_if_fail (IS_TIMED_QUEUE (self));
 #line 79 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -421,19 +426,19 @@ void timed_queue_set_dequeue_spacing_msec (TimedQueue* self, guint msec) {
 	if (_tmp0_ == _tmp1_) {
 #line 80 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return;
-#line 425 "TimedQueue.c"
+#line 430 "TimedQueue.c"
 	}
 #line 82 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp2_ = self->priv->timer_id;
 #line 82 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (_tmp2_ != ((guint) 0)) {
-#line 431 "TimedQueue.c"
-		guint _tmp3_ = 0U;
+#line 436 "TimedQueue.c"
+		guint _tmp3_;
 #line 83 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp3_ = self->priv->timer_id;
 #line 83 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		g_source_remove (_tmp3_);
-#line 437 "TimedQueue.c"
+#line 442 "TimedQueue.c"
 	}
 #line 85 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp4_ = msec;
@@ -447,35 +452,35 @@ void timed_queue_set_dequeue_spacing_msec (TimedQueue* self, guint msec) {
 	_tmp7_ = g_timeout_add_full (_tmp6_, _tmp5_, _timed_queue_on_heartbeat_gsource_func, timed_queue_ref (self), timed_queue_unref);
 #line 87 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self->priv->timer_id = _tmp7_;
-#line 451 "TimedQueue.c"
+#line 456 "TimedQueue.c"
 }
 
 
 static guint timed_queue_get_heartbeat_timeout (TimedQueue* self) {
 	guint result = 0U;
 	guint _tmp0_ = 0U;
-	guint _tmp1_ = 0U;
-	guint _tmp4_ = 0U;
+	guint _tmp1_;
+	guint _tmp4_;
 #line 90 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), 0U);
 #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp1_ = self->priv->dequeue_spacing_msec;
 #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (_tmp1_ == ((guint) 0)) {
-#line 466 "TimedQueue.c"
-		guint _tmp2_ = 0U;
+#line 471 "TimedQueue.c"
+		guint _tmp2_;
 #line 92 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp2_ = self->priv->hold_msec;
 #line 92 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp0_ = _tmp2_ / 10;
-#line 472 "TimedQueue.c"
+#line 477 "TimedQueue.c"
 	} else {
-		guint _tmp3_ = 0U;
+		guint _tmp3_;
 #line 93 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp3_ = self->priv->dequeue_spacing_msec;
 #line 93 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp0_ = _tmp3_ / 2;
-#line 479 "TimedQueue.c"
+#line 484 "TimedQueue.c"
 	}
 #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp4_ = CLAMP (_tmp0_, (guint) 10, G_MAXUINT);
@@ -483,14 +488,14 @@ static guint timed_queue_get_heartbeat_timeout (TimedQueue* self) {
 	result = _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 487 "TimedQueue.c"
+#line 492 "TimedQueue.c"
 }
 
 
 static void timed_queue_real_notify_dequeued (TimedQueue* self, gconstpointer item) {
-	DequeuedCallback _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	gconstpointer _tmp1_ = NULL;
+	DequeuedCallback _tmp0_;
+	void* _tmp0__target;
+	gconstpointer _tmp1_;
 #line 97 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp0_ = self->priv->callback;
 #line 97 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -499,7 +504,7 @@ static void timed_queue_real_notify_dequeued (TimedQueue* self, gconstpointer it
 	_tmp1_ = item;
 #line 97 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp0_ (_tmp1_, _tmp0__target);
-#line 503 "TimedQueue.c"
+#line 508 "TimedQueue.c"
 }
 
 
@@ -508,13 +513,13 @@ void timed_queue_notify_dequeued (TimedQueue* self, gconstpointer item) {
 	g_return_if_fail (IS_TIMED_QUEUE (self));
 #line 96 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	TIMED_QUEUE_GET_CLASS (self)->notify_dequeued (self, item);
-#line 512 "TimedQueue.c"
+#line 517 "TimedQueue.c"
 }
 
 
 gboolean timed_queue_is_paused (TimedQueue* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 100 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), FALSE);
 #line 101 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -523,12 +528,12 @@ gboolean timed_queue_is_paused (TimedQueue* self) {
 	result = _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 527 "TimedQueue.c"
+#line 532 "TimedQueue.c"
 }
 
 
 void timed_queue_pause (TimedQueue* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 104 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_if_fail (IS_TIMED_QUEUE (self));
 #line 105 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -537,18 +542,18 @@ void timed_queue_pause (TimedQueue* self) {
 	if (_tmp0_) {
 #line 106 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return;
-#line 541 "TimedQueue.c"
+#line 546 "TimedQueue.c"
 	}
 #line 108 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self->priv->paused_state = TRUE;
 #line 110 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	g_signal_emit_by_name (self, "paused", TRUE);
-#line 547 "TimedQueue.c"
+	g_signal_emit (self, timed_queue_signals[TIMED_QUEUE_PAUSED_SIGNAL], 0, TRUE);
+#line 552 "TimedQueue.c"
 }
 
 
 void timed_queue_unpause (TimedQueue* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 113 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_if_fail (IS_TIMED_QUEUE (self));
 #line 114 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -557,23 +562,23 @@ void timed_queue_unpause (TimedQueue* self) {
 	if (!_tmp0_) {
 #line 115 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return;
-#line 561 "TimedQueue.c"
+#line 566 "TimedQueue.c"
 	}
 #line 117 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self->priv->paused_state = FALSE;
 #line 119 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	g_signal_emit_by_name (self, "paused", FALSE);
-#line 567 "TimedQueue.c"
+	g_signal_emit (self, timed_queue_signals[TIMED_QUEUE_PAUSED_SIGNAL], 0, FALSE);
+#line 572 "TimedQueue.c"
 }
 
 
 static void timed_queue_real_clear (TimedQueue* self) {
-	SortedList* _tmp0_ = NULL;
+	SortedList* _tmp0_;
 #line 123 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp0_ = self->priv->queue;
 #line 123 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 577 "TimedQueue.c"
+#line 582 "TimedQueue.c"
 }
 
 
@@ -582,7 +587,7 @@ void timed_queue_clear (TimedQueue* self) {
 	g_return_if_fail (IS_TIMED_QUEUE (self));
 #line 122 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	TIMED_QUEUE_GET_CLASS (self)->clear (self);
-#line 586 "TimedQueue.c"
+#line 591 "TimedQueue.c"
 }
 
 
@@ -590,8 +595,8 @@ static gboolean timed_queue_real_contains (TimedQueue* self, gconstpointer item)
 	gboolean result = FALSE;
 	{
 		GeeIterator* _e_it = NULL;
-		SortedList* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		SortedList* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp0_ = self->priv->queue;
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -600,18 +605,18 @@ static gboolean timed_queue_real_contains (TimedQueue* self, gconstpointer item)
 		_e_it = _tmp1_;
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		while (TRUE) {
-#line 604 "TimedQueue.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 609 "TimedQueue.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			TimedQueueElement* e = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			GeeEqualDataFunc _tmp6_ = NULL;
-			void* _tmp6__target = NULL;
-			gconstpointer _tmp7_ = NULL;
-			TimedQueueElement* _tmp8_ = NULL;
-			gconstpointer _tmp9_ = NULL;
-			gboolean _tmp10_ = FALSE;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			GeeEqualDataFunc _tmp6_;
+			void* _tmp6__target;
+			gconstpointer _tmp7_;
+			TimedQueueElement* _tmp8_;
+			gconstpointer _tmp9_;
+			gboolean _tmp10_;
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp2_ = _e_it;
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -620,7 +625,7 @@ static gboolean timed_queue_real_contains (TimedQueue* self, gconstpointer item)
 			if (!_tmp3_) {
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 624 "TimedQueue.c"
+#line 629 "TimedQueue.c"
 			}
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp4_ = _e_it;
@@ -650,21 +655,21 @@ static gboolean timed_queue_real_contains (TimedQueue* self, gconstpointer item)
 				_g_object_unref0 (_e_it);
 #line 129 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				return result;
-#line 654 "TimedQueue.c"
+#line 659 "TimedQueue.c"
 			}
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_timed_queue_element_unref0 (e);
-#line 658 "TimedQueue.c"
+#line 663 "TimedQueue.c"
 		}
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_g_object_unref0 (_e_it);
-#line 662 "TimedQueue.c"
+#line 667 "TimedQueue.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	result = FALSE;
 #line 132 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 668 "TimedQueue.c"
+#line 673 "TimedQueue.c"
 }
 
 
@@ -673,19 +678,19 @@ gboolean timed_queue_contains (TimedQueue* self, gconstpointer item) {
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), FALSE);
 #line 126 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return TIMED_QUEUE_GET_CLASS (self)->contains (self, item);
-#line 677 "TimedQueue.c"
+#line 682 "TimedQueue.c"
 }
 
 
 static gboolean timed_queue_real_enqueue (TimedQueue* self, gconstpointer item) {
 	gboolean result = FALSE;
-	SortedList* _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
-	gulong _tmp2_ = 0UL;
-	TimedQueueElement* _tmp3_ = NULL;
-	TimedQueueElement* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
+	SortedList* _tmp0_;
+	gconstpointer _tmp1_;
+	gulong _tmp2_;
+	TimedQueueElement* _tmp3_;
+	TimedQueueElement* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
 #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp0_ = self->priv->queue;
 #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -706,7 +711,7 @@ static gboolean timed_queue_real_enqueue (TimedQueue* self, gconstpointer item)
 	result = _tmp6_;
 #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 710 "TimedQueue.c"
+#line 715 "TimedQueue.c"
 }
 
 
@@ -715,19 +720,19 @@ gboolean timed_queue_enqueue (TimedQueue* self, gconstpointer item) {
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), FALSE);
 #line 135 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return TIMED_QUEUE_GET_CLASS (self)->enqueue (self, item);
-#line 719 "TimedQueue.c"
+#line 724 "TimedQueue.c"
 }
 
 
 static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection* items) {
 	gboolean result = FALSE;
 	gulong ready_time = 0UL;
-	gulong _tmp0_ = 0UL;
+	gulong _tmp0_;
 	GeeArrayList* elements = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	SortedList* _tmp13_ = NULL;
-	GeeArrayList* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
+	GeeArrayList* _tmp1_;
+	SortedList* _tmp13_;
+	GeeArrayList* _tmp14_;
+	gboolean _tmp15_;
 #line 139 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (items), FALSE);
 #line 140 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -738,11 +743,11 @@ static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection*
 	_tmp1_ = gee_array_list_new (TIMED_QUEUE_TYPE_ELEMENT, (GBoxedCopyFunc) timed_queue_element_ref, (GDestroyNotify) timed_queue_element_unref, NULL, NULL, NULL);
 #line 142 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	elements = _tmp1_;
-#line 742 "TimedQueue.c"
+#line 747 "TimedQueue.c"
 	{
 		GeeIterator* _item_it = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeCollection* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp2_ = items;
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -751,17 +756,17 @@ static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection*
 		_item_it = _tmp3_;
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		while (TRUE) {
-#line 755 "TimedQueue.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 760 "TimedQueue.c"
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			gpointer item = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
-			GeeArrayList* _tmp8_ = NULL;
-			gconstpointer _tmp9_ = NULL;
-			gulong _tmp10_ = 0UL;
-			TimedQueueElement* _tmp11_ = NULL;
-			TimedQueueElement* _tmp12_ = NULL;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			GeeArrayList* _tmp8_;
+			gconstpointer _tmp9_;
+			gulong _tmp10_;
+			TimedQueueElement* _tmp11_;
+			TimedQueueElement* _tmp12_;
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp4_ = _item_it;
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -770,7 +775,7 @@ static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection*
 			if (!_tmp5_) {
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 774 "TimedQueue.c"
+#line 779 "TimedQueue.c"
 			}
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp6_ = _item_it;
@@ -794,11 +799,11 @@ static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection*
 			_timed_queue_element_unref0 (_tmp12_);
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL));
-#line 798 "TimedQueue.c"
+#line 803 "TimedQueue.c"
 		}
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_g_object_unref0 (_item_it);
-#line 802 "TimedQueue.c"
+#line 807 "TimedQueue.c"
 	}
 #line 146 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp13_ = self->priv->queue;
@@ -812,7 +817,7 @@ static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection*
 	_g_object_unref0 (elements);
 #line 146 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 816 "TimedQueue.c"
+#line 821 "TimedQueue.c"
 }
 
 
@@ -821,15 +826,15 @@ gboolean timed_queue_enqueue_many (TimedQueue* self, GeeCollection* items) {
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), FALSE);
 #line 139 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return TIMED_QUEUE_GET_CLASS (self)->enqueue_many (self, items);
-#line 825 "TimedQueue.c"
+#line 830 "TimedQueue.c"
 }
 
 
 static gboolean timed_queue_real_remove_first (TimedQueue* self, gconstpointer item) {
 	gboolean result = FALSE;
 	GeeIterator* iter = NULL;
-	SortedList* _tmp0_ = NULL;
-	GeeIterator* _tmp1_ = NULL;
+	SortedList* _tmp0_;
+	GeeIterator* _tmp1_;
 #line 150 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp0_ = self->priv->queue;
 #line 150 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -838,18 +843,18 @@ static gboolean timed_queue_real_remove_first (TimedQueue* self, gconstpointer i
 	iter = _tmp1_;
 #line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	while (TRUE) {
-#line 842 "TimedQueue.c"
-		GeeIterator* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+#line 847 "TimedQueue.c"
+		GeeIterator* _tmp2_;
+		gboolean _tmp3_;
 		TimedQueueElement* e = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		gpointer _tmp5_ = NULL;
-		GeeEqualDataFunc _tmp6_ = NULL;
-		void* _tmp6__target = NULL;
-		gconstpointer _tmp7_ = NULL;
-		TimedQueueElement* _tmp8_ = NULL;
-		gconstpointer _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
+		GeeIterator* _tmp4_;
+		gpointer _tmp5_;
+		GeeEqualDataFunc _tmp6_;
+		void* _tmp6__target;
+		gconstpointer _tmp7_;
+		TimedQueueElement* _tmp8_;
+		gconstpointer _tmp9_;
+		gboolean _tmp10_;
 #line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp2_ = iter;
 #line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -858,7 +863,7 @@ static gboolean timed_queue_real_remove_first (TimedQueue* self, gconstpointer i
 		if (!_tmp3_) {
 #line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			break;
-#line 862 "TimedQueue.c"
+#line 867 "TimedQueue.c"
 		}
 #line 152 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp4_ = iter;
@@ -880,8 +885,8 @@ static gboolean timed_queue_real_remove_first (TimedQueue* self, gconstpointer i
 		_tmp10_ = _tmp6_ (_tmp7_, _tmp9_, _tmp6__target);
 #line 153 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		if (_tmp10_) {
-#line 884 "TimedQueue.c"
-			GeeIterator* _tmp11_ = NULL;
+#line 889 "TimedQueue.c"
+			GeeIterator* _tmp11_;
 #line 154 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp11_ = iter;
 #line 154 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -894,11 +899,11 @@ static gboolean timed_queue_real_remove_first (TimedQueue* self, gconstpointer i
 			_g_object_unref0 (iter);
 #line 156 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			return result;
-#line 898 "TimedQueue.c"
+#line 903 "TimedQueue.c"
 		}
 #line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_timed_queue_element_unref0 (e);
-#line 902 "TimedQueue.c"
+#line 907 "TimedQueue.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	result = FALSE;
@@ -906,7 +911,7 @@ static gboolean timed_queue_real_remove_first (TimedQueue* self, gconstpointer i
 	_g_object_unref0 (iter);
 #line 160 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 910 "TimedQueue.c"
+#line 915 "TimedQueue.c"
 }
 
 
@@ -915,14 +920,14 @@ gboolean timed_queue_remove_first (TimedQueue* self, gconstpointer item) {
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), FALSE);
 #line 149 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return TIMED_QUEUE_GET_CLASS (self)->remove_first (self, item);
-#line 919 "TimedQueue.c"
+#line 924 "TimedQueue.c"
 }
 
 
 static gulong timed_queue_calc_ready_time (TimedQueue* self) {
 	gulong result = 0UL;
-	gulong _tmp0_ = 0UL;
-	guint _tmp1_ = 0U;
+	gulong _tmp0_;
+	guint _tmp1_;
 #line 169 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), 0UL);
 #line 170 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -933,13 +938,13 @@ static gulong timed_queue_calc_ready_time (TimedQueue* self) {
 	result = _tmp0_ + ((gulong) _tmp1_);
 #line 170 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 937 "TimedQueue.c"
+#line 942 "TimedQueue.c"
 }
 
 
 static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	gulong now = 0UL;
 #line 173 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), FALSE);
@@ -951,43 +956,43 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 		result = TRUE;
 #line 175 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return result;
-#line 955 "TimedQueue.c"
+#line 960 "TimedQueue.c"
 	}
 #line 177 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	now = (gulong) 0;
-#line 959 "TimedQueue.c"
+#line 964 "TimedQueue.c"
 	{
 		gboolean _tmp1_ = FALSE;
 #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp1_ = TRUE;
 #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		while (TRUE) {
-#line 966 "TimedQueue.c"
-			SortedList* _tmp2_ = NULL;
-			gint _tmp3_ = 0;
-			gint _tmp4_ = 0;
+#line 971 "TimedQueue.c"
+			SortedList* _tmp2_;
+			gint _tmp3_;
+			gint _tmp4_;
 			TimedQueueElement* head = NULL;
-			SortedList* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
-			TimedQueueElement* _tmp7_ = NULL;
-			gulong _tmp8_ = 0UL;
-			TimedQueueElement* _tmp10_ = NULL;
-			gulong _tmp11_ = 0UL;
-			gulong _tmp12_ = 0UL;
+			SortedList* _tmp5_;
+			gpointer _tmp6_;
+			TimedQueueElement* _tmp7_;
+			gulong _tmp8_;
+			TimedQueueElement* _tmp10_;
+			gulong _tmp11_;
+			gulong _tmp12_;
 			gboolean _tmp13_ = FALSE;
-			guint _tmp14_ = 0U;
+			guint _tmp14_;
 			TimedQueueElement* h = NULL;
-			SortedList* _tmp18_ = NULL;
-			gpointer _tmp19_ = NULL;
-			TimedQueueElement* _tmp20_ = NULL;
-			TimedQueueElement* _tmp21_ = NULL;
-			TimedQueueElement* _tmp22_ = NULL;
-			gconstpointer _tmp23_ = NULL;
-			gulong _tmp24_ = 0UL;
-			guint _tmp25_ = 0U;
+			SortedList* _tmp18_;
+			gpointer _tmp19_;
+			TimedQueueElement* _tmp20_;
+			TimedQueueElement* _tmp21_;
+			TimedQueueElement* _tmp22_;
+			gconstpointer _tmp23_;
+			gulong _tmp24_;
+			guint _tmp25_;
 #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			if (!_tmp1_) {
-#line 991 "TimedQueue.c"
+#line 996 "TimedQueue.c"
 			}
 #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp1_ = FALSE;
@@ -1001,7 +1006,7 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 			if (_tmp4_ == 0) {
 #line 181 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 1005 "TimedQueue.c"
+#line 1010 "TimedQueue.c"
 			}
 #line 183 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp5_ = self->priv->queue;
@@ -1017,13 +1022,13 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 			_tmp8_ = now;
 #line 186 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			if (_tmp8_ == ((gulong) 0)) {
-#line 1021 "TimedQueue.c"
-				gulong _tmp9_ = 0UL;
+#line 1026 "TimedQueue.c"
+				gulong _tmp9_;
 #line 187 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp9_ = now_ms ();
 #line 187 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				now = _tmp9_;
-#line 1027 "TimedQueue.c"
+#line 1032 "TimedQueue.c"
 			}
 #line 189 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp10_ = head;
@@ -1037,16 +1042,16 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 				_timed_queue_element_unref0 (head);
 #line 190 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 1041 "TimedQueue.c"
+#line 1046 "TimedQueue.c"
 			}
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp14_ = self->priv->dequeue_spacing_msec;
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			if (_tmp14_ != ((guint) 0)) {
-#line 1047 "TimedQueue.c"
-				gulong _tmp15_ = 0UL;
-				gulong _tmp16_ = 0UL;
-				guint _tmp17_ = 0U;
+#line 1052 "TimedQueue.c"
+				gulong _tmp15_;
+				gulong _tmp16_;
+				guint _tmp17_;
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp15_ = now;
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1055,11 +1060,11 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 				_tmp17_ = self->priv->dequeue_spacing_msec;
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp13_ = (_tmp15_ - _tmp16_) < ((gulong) _tmp17_);
-#line 1059 "TimedQueue.c"
+#line 1064 "TimedQueue.c"
 			} else {
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp13_ = FALSE;
-#line 1063 "TimedQueue.c"
+#line 1068 "TimedQueue.c"
 			}
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			if (_tmp13_) {
@@ -1067,7 +1072,7 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 				_timed_queue_element_unref0 (head);
 #line 194 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 1071 "TimedQueue.c"
+#line 1076 "TimedQueue.c"
 			}
 #line 196 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp18_ = self->priv->queue;
@@ -1101,20 +1106,20 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 				_timed_queue_element_unref0 (head);
 #line 205 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 1105 "TimedQueue.c"
+#line 1110 "TimedQueue.c"
 			}
 #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_timed_queue_element_unref0 (h);
 #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_timed_queue_element_unref0 (head);
-#line 1111 "TimedQueue.c"
+#line 1116 "TimedQueue.c"
 		}
 	}
 #line 208 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	result = TRUE;
 #line 208 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 1118 "TimedQueue.c"
+#line 1123 "TimedQueue.c"
 }
 
 
@@ -1123,16 +1128,16 @@ gint timed_queue_get_size (TimedQueue* self) {
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), 0);
 #line 164 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return TIMED_QUEUE_GET_CLASS (self)->get_size (self);
-#line 1127 "TimedQueue.c"
+#line 1132 "TimedQueue.c"
 }
 
 
 static gint timed_queue_real_get_size (TimedQueue* base) {
 	gint result;
 	TimedQueue* self;
-	SortedList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	SortedList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 164 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = base;
 #line 165 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1145,7 +1150,7 @@ static gint timed_queue_real_get_size (TimedQueue* base) {
 	result = _tmp2_;
 #line 165 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 1149 "TimedQueue.c"
+#line 1154 "TimedQueue.c"
 }
 
 
@@ -1155,9 +1160,9 @@ static void timed_queue_real_paused (TimedQueue* self, gboolean is_paused) {
 
 static TimedQueueElement* timed_queue_element_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer item, gulong ready) {
 	TimedQueueElement* self = NULL;
-	gconstpointer _tmp0_ = NULL;
-	gpointer _tmp1_ = NULL;
-	gulong _tmp2_ = 0UL;
+	gconstpointer _tmp0_;
+	gpointer _tmp1_;
+	gulong _tmp2_;
 #line 26 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = (TimedQueueElement*) g_type_create_instance (object_type);
 #line 26 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1180,23 +1185,23 @@ static TimedQueueElement* timed_queue_element_construct (GType object_type, GTyp
 	self->ready = _tmp2_;
 #line 26 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return self;
-#line 1184 "TimedQueue.c"
+#line 1189 "TimedQueue.c"
 }
 
 
 static TimedQueueElement* timed_queue_element_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer item, gulong ready) {
 #line 26 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return timed_queue_element_construct (TIMED_QUEUE_TYPE_ELEMENT, g_type, g_dup_func, g_destroy_func, item, ready);
-#line 1191 "TimedQueue.c"
+#line 1196 "TimedQueue.c"
 }
 
 
 static gint64 timed_queue_element_comparator (void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	gulong _tmp1_ = 0UL;
-	void* _tmp2_ = NULL;
-	gulong _tmp3_ = 0UL;
+	void* _tmp0_;
+	gulong _tmp1_;
+	void* _tmp2_;
+	gulong _tmp3_;
 #line 32 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp0_ = a;
 #line 32 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1209,14 +1214,14 @@ static gint64 timed_queue_element_comparator (void* a, void* b) {
 	result = ((gint64) _tmp1_) - ((gint64) _tmp3_);
 #line 32 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 1213 "TimedQueue.c"
+#line 1218 "TimedQueue.c"
 }
 
 
 static void timed_queue_value_element_init (GValue* value) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	value->data[0].v_pointer = NULL;
-#line 1220 "TimedQueue.c"
+#line 1225 "TimedQueue.c"
 }
 
 
@@ -1225,7 +1230,7 @@ static void timed_queue_value_element_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		timed_queue_element_unref (value->data[0].v_pointer);
-#line 1229 "TimedQueue.c"
+#line 1234 "TimedQueue.c"
 	}
 }
 
@@ -1235,11 +1240,11 @@ static void timed_queue_value_element_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		dest_value->data[0].v_pointer = timed_queue_element_ref (src_value->data[0].v_pointer);
-#line 1239 "TimedQueue.c"
+#line 1244 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1243 "TimedQueue.c"
+#line 1248 "TimedQueue.c"
 	}
 }
 
@@ -1247,66 +1252,66 @@ static void timed_queue_value_element_copy_value (const GValue* src_value, GValu
 static gpointer timed_queue_value_element_peek_pointer (const GValue* value) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return value->data[0].v_pointer;
-#line 1251 "TimedQueue.c"
+#line 1256 "TimedQueue.c"
 }
 
 
 static gchar* timed_queue_value_element_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (collect_values[0].v_pointer) {
-#line 1258 "TimedQueue.c"
-		TimedQueueElement* object;
+#line 1263 "TimedQueue.c"
+		TimedQueueElement * object;
 		object = collect_values[0].v_pointer;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1265 "TimedQueue.c"
+#line 1270 "TimedQueue.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1269 "TimedQueue.c"
+#line 1274 "TimedQueue.c"
 		}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = timed_queue_element_ref (object);
-#line 1273 "TimedQueue.c"
+#line 1278 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1277 "TimedQueue.c"
+#line 1282 "TimedQueue.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return NULL;
-#line 1281 "TimedQueue.c"
+#line 1286 "TimedQueue.c"
 }
 
 
 static gchar* timed_queue_value_element_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	TimedQueueElement** object_p;
+	TimedQueueElement ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (!object_p) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1292 "TimedQueue.c"
+#line 1297 "TimedQueue.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (!value->data[0].v_pointer) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		*object_p = NULL;
-#line 1298 "TimedQueue.c"
+#line 1303 "TimedQueue.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1302 "TimedQueue.c"
+#line 1307 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		*object_p = timed_queue_element_ref (value->data[0].v_pointer);
-#line 1306 "TimedQueue.c"
+#line 1311 "TimedQueue.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return NULL;
-#line 1310 "TimedQueue.c"
+#line 1315 "TimedQueue.c"
 }
 
 
@@ -1320,7 +1325,7 @@ static GParamSpec* timed_queue_param_spec_element (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return G_PARAM_SPEC (spec);
-#line 1324 "TimedQueue.c"
+#line 1329 "TimedQueue.c"
 }
 
 
@@ -1329,12 +1334,12 @@ static gpointer timed_queue_value_get_element (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TIMED_QUEUE_TYPE_ELEMENT), NULL);
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return value->data[0].v_pointer;
-#line 1333 "TimedQueue.c"
+#line 1338 "TimedQueue.c"
 }
 
 
 static void timed_queue_value_set_element (GValue* value, gpointer v_object) {
-	TimedQueueElement* old;
+	TimedQueueElement * old;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TIMED_QUEUE_TYPE_ELEMENT));
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1349,23 +1354,23 @@ static void timed_queue_value_set_element (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		timed_queue_element_ref (value->data[0].v_pointer);
-#line 1353 "TimedQueue.c"
+#line 1358 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1357 "TimedQueue.c"
+#line 1362 "TimedQueue.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (old) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		timed_queue_element_unref (old);
-#line 1363 "TimedQueue.c"
+#line 1368 "TimedQueue.c"
 	}
 }
 
 
 static void timed_queue_value_take_element (GValue* value, gpointer v_object) {
-	TimedQueueElement* old;
+	TimedQueueElement * old;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TIMED_QUEUE_TYPE_ELEMENT));
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1378,17 +1383,17 @@ static void timed_queue_value_take_element (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = v_object;
-#line 1382 "TimedQueue.c"
+#line 1387 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1386 "TimedQueue.c"
+#line 1391 "TimedQueue.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (old) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		timed_queue_element_unref (old);
-#line 1392 "TimedQueue.c"
+#line 1397 "TimedQueue.c"
 	}
 }
 
@@ -1400,7 +1405,7 @@ static void timed_queue_element_class_init (TimedQueueElementClass * klass) {
 	((TimedQueueElementClass *) klass)->finalize = timed_queue_element_finalize;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_type_class_add_private (klass, sizeof (TimedQueueElementPrivate));
-#line 1404 "TimedQueue.c"
+#line 1409 "TimedQueue.c"
 }
 
 
@@ -1409,11 +1414,11 @@ static void timed_queue_element_instance_init (TimedQueueElement * self) {
 	self->priv = TIMED_QUEUE_ELEMENT_GET_PRIVATE (self);
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self->ref_count = 1;
-#line 1413 "TimedQueue.c"
+#line 1418 "TimedQueue.c"
 }
 
 
-static void timed_queue_element_finalize (TimedQueueElement* obj) {
+static void timed_queue_element_finalize (TimedQueueElement * obj) {
 	TimedQueueElement * self;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TIMED_QUEUE_TYPE_ELEMENT, TimedQueueElement);
@@ -1421,7 +1426,7 @@ static void timed_queue_element_finalize (TimedQueueElement* obj) {
 	g_signal_handlers_destroy (self);
 #line 23 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	((self->item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->item = (self->priv->g_destroy_func (self->item), NULL));
-#line 1425 "TimedQueue.c"
+#line 1430 "TimedQueue.c"
 }
 
 
@@ -1440,18 +1445,18 @@ static GType timed_queue_element_get_type (void) {
 
 
 static gpointer timed_queue_element_ref (gpointer instance) {
-	TimedQueueElement* self;
+	TimedQueueElement * self;
 	self = instance;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return instance;
-#line 1450 "TimedQueue.c"
+#line 1455 "TimedQueue.c"
 }
 
 
 static void timed_queue_element_unref (gpointer instance) {
-	TimedQueueElement* self;
+	TimedQueueElement * self;
 	self = instance;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1459,7 +1464,7 @@ static void timed_queue_element_unref (gpointer instance) {
 		TIMED_QUEUE_ELEMENT_GET_CLASS (self)->finalize (self);
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1463 "TimedQueue.c"
+#line 1468 "TimedQueue.c"
 	}
 }
 
@@ -1467,7 +1472,7 @@ static void timed_queue_element_unref (gpointer instance) {
 static void value_timed_queue_init (GValue* value) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	value->data[0].v_pointer = NULL;
-#line 1471 "TimedQueue.c"
+#line 1476 "TimedQueue.c"
 }
 
 
@@ -1476,7 +1481,7 @@ static void value_timed_queue_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		timed_queue_unref (value->data[0].v_pointer);
-#line 1480 "TimedQueue.c"
+#line 1485 "TimedQueue.c"
 	}
 }
 
@@ -1486,11 +1491,11 @@ static void value_timed_queue_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		dest_value->data[0].v_pointer = timed_queue_ref (src_value->data[0].v_pointer);
-#line 1490 "TimedQueue.c"
+#line 1495 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1494 "TimedQueue.c"
+#line 1499 "TimedQueue.c"
 	}
 }
 
@@ -1498,66 +1503,66 @@ static void value_timed_queue_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_timed_queue_peek_pointer (const GValue* value) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return value->data[0].v_pointer;
-#line 1502 "TimedQueue.c"
+#line 1507 "TimedQueue.c"
 }
 
 
 static gchar* value_timed_queue_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (collect_values[0].v_pointer) {
-#line 1509 "TimedQueue.c"
-		TimedQueue* object;
+#line 1514 "TimedQueue.c"
+		TimedQueue * object;
 		object = collect_values[0].v_pointer;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1516 "TimedQueue.c"
+#line 1521 "TimedQueue.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1520 "TimedQueue.c"
+#line 1525 "TimedQueue.c"
 		}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = timed_queue_ref (object);
-#line 1524 "TimedQueue.c"
+#line 1529 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1528 "TimedQueue.c"
+#line 1533 "TimedQueue.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return NULL;
-#line 1532 "TimedQueue.c"
+#line 1537 "TimedQueue.c"
 }
 
 
 static gchar* value_timed_queue_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	TimedQueue** object_p;
+	TimedQueue ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (!object_p) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1543 "TimedQueue.c"
+#line 1548 "TimedQueue.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (!value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		*object_p = NULL;
-#line 1549 "TimedQueue.c"
+#line 1554 "TimedQueue.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1553 "TimedQueue.c"
+#line 1558 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		*object_p = timed_queue_ref (value->data[0].v_pointer);
-#line 1557 "TimedQueue.c"
+#line 1562 "TimedQueue.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return NULL;
-#line 1561 "TimedQueue.c"
+#line 1566 "TimedQueue.c"
 }
 
 
@@ -1571,7 +1576,7 @@ GParamSpec* param_spec_timed_queue (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return G_PARAM_SPEC (spec);
-#line 1575 "TimedQueue.c"
+#line 1580 "TimedQueue.c"
 }
 
 
@@ -1580,12 +1585,12 @@ gpointer value_get_timed_queue (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TIMED_QUEUE), NULL);
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return value->data[0].v_pointer;
-#line 1584 "TimedQueue.c"
+#line 1589 "TimedQueue.c"
 }
 
 
 void value_set_timed_queue (GValue* value, gpointer v_object) {
-	TimedQueue* old;
+	TimedQueue * old;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TIMED_QUEUE));
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1600,23 +1605,23 @@ void value_set_timed_queue (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		timed_queue_ref (value->data[0].v_pointer);
-#line 1604 "TimedQueue.c"
+#line 1609 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1608 "TimedQueue.c"
+#line 1613 "TimedQueue.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (old) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		timed_queue_unref (old);
-#line 1614 "TimedQueue.c"
+#line 1619 "TimedQueue.c"
 	}
 }
 
 
 void value_take_timed_queue (GValue* value, gpointer v_object) {
-	TimedQueue* old;
+	TimedQueue * old;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TIMED_QUEUE));
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1629,17 +1634,17 @@ void value_take_timed_queue (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = v_object;
-#line 1633 "TimedQueue.c"
+#line 1638 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1637 "TimedQueue.c"
+#line 1642 "TimedQueue.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (old) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		timed_queue_unref (old);
-#line 1643 "TimedQueue.c"
+#line 1648 "TimedQueue.c"
 	}
 }
 
@@ -1652,24 +1657,24 @@ static void timed_queue_class_init (TimedQueueClass * klass) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_type_class_add_private (klass, sizeof (TimedQueuePrivate));
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->notify_dequeued = (void (*)(TimedQueue*, gconstpointer)) timed_queue_real_notify_dequeued;
+	((TimedQueueClass *) klass)->notify_dequeued = (void (*) (TimedQueue *, gconstpointer)) timed_queue_real_notify_dequeued;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->clear = (void (*)(TimedQueue*)) timed_queue_real_clear;
+	((TimedQueueClass *) klass)->clear = (void (*) (TimedQueue *)) timed_queue_real_clear;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->contains = (gboolean (*)(TimedQueue*, gconstpointer)) timed_queue_real_contains;
+	((TimedQueueClass *) klass)->contains = (gboolean (*) (TimedQueue *, gconstpointer)) timed_queue_real_contains;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->enqueue = (gboolean (*)(TimedQueue*, gconstpointer)) timed_queue_real_enqueue;
+	((TimedQueueClass *) klass)->enqueue = (gboolean (*) (TimedQueue *, gconstpointer)) timed_queue_real_enqueue;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->enqueue_many = (gboolean (*)(TimedQueue*, GeeCollection*)) timed_queue_real_enqueue_many;
+	((TimedQueueClass *) klass)->enqueue_many = (gboolean (*) (TimedQueue *, GeeCollection*)) timed_queue_real_enqueue_many;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->remove_first = (gboolean (*)(TimedQueue*, gconstpointer)) timed_queue_real_remove_first;
+	((TimedQueueClass *) klass)->remove_first = (gboolean (*) (TimedQueue *, gconstpointer)) timed_queue_real_remove_first;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	((TimedQueueClass *) klass)->paused = timed_queue_real_paused;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	TIMED_QUEUE_CLASS (klass)->get_size = timed_queue_real_get_size;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	g_signal_new ("paused", TYPE_TIMED_QUEUE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (TimedQueueClass, paused), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 1673 "TimedQueue.c"
+	timed_queue_signals[TIMED_QUEUE_PAUSED_SIGNAL] = g_signal_new ("paused", TYPE_TIMED_QUEUE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (TimedQueueClass, paused), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+#line 1678 "TimedQueue.c"
 }
 
 
@@ -1686,13 +1691,13 @@ static void timed_queue_instance_init (TimedQueue * self) {
 	self->priv->paused_state = FALSE;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self->ref_count = 1;
-#line 1690 "TimedQueue.c"
+#line 1695 "TimedQueue.c"
 }
 
 
-static void timed_queue_finalize (TimedQueue* obj) {
+static void timed_queue_finalize (TimedQueue * obj) {
 	TimedQueue * self;
-	guint _tmp0_ = 0U;
+	guint _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TIMED_QUEUE, TimedQueue);
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1701,13 +1706,13 @@ static void timed_queue_finalize (TimedQueue* obj) {
 	_tmp0_ = self->priv->timer_id;
 #line 70 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (_tmp0_ != ((guint) 0)) {
-#line 1705 "TimedQueue.c"
-		guint _tmp1_ = 0U;
+#line 1710 "TimedQueue.c"
+		guint _tmp1_;
 #line 71 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp1_ = self->priv->timer_id;
 #line 71 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		g_source_remove (_tmp1_);
-#line 1711 "TimedQueue.c"
+#line 1716 "TimedQueue.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	(self->priv->equal_func_target_destroy_notify == NULL) ? NULL : (self->priv->equal_func_target_destroy_notify (self->priv->equal_func_target), NULL);
@@ -1719,7 +1724,7 @@ static void timed_queue_finalize (TimedQueue* obj) {
 	self->priv->equal_func_target_destroy_notify = NULL;
 #line 41 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_g_object_unref0 (self->priv->queue);
-#line 1723 "TimedQueue.c"
+#line 1728 "TimedQueue.c"
 }
 
 
@@ -1738,18 +1743,18 @@ GType timed_queue_get_type (void) {
 
 
 gpointer timed_queue_ref (gpointer instance) {
-	TimedQueue* self;
+	TimedQueue * self;
 	self = instance;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return instance;
-#line 1748 "TimedQueue.c"
+#line 1753 "TimedQueue.c"
 }
 
 
 void timed_queue_unref (gpointer instance) {
-	TimedQueue* self;
+	TimedQueue * self;
 	self = instance;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1757,27 +1762,27 @@ void timed_queue_unref (gpointer instance) {
 		TIMED_QUEUE_GET_CLASS (self)->finalize (self);
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1761 "TimedQueue.c"
+#line 1766 "TimedQueue.c"
 	}
 }
 
 
 HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeHashDataFunc hash_func, void* hash_func_target, GDestroyNotify hash_func_target_destroy_notify, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority) {
 	HashTimedQueue* self = NULL;
-	guint _tmp0_ = 0U;
-	DequeuedCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	GeeEqualDataFunc _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	GDestroyNotify _tmp2__target_destroy_notify = NULL;
-	gint _tmp3_ = 0;
-	GeeHashDataFunc _tmp4_ = NULL;
-	void* _tmp4__target = NULL;
-	GDestroyNotify _tmp4__target_destroy_notify = NULL;
-	GeeEqualDataFunc _tmp5_ = NULL;
-	void* _tmp5__target = NULL;
-	GDestroyNotify _tmp5__target_destroy_notify = NULL;
-	GeeHashMap* _tmp6_ = NULL;
+	guint _tmp0_;
+	DequeuedCallback _tmp1_;
+	void* _tmp1__target;
+	GeeEqualDataFunc _tmp2_;
+	void* _tmp2__target;
+	GDestroyNotify _tmp2__target_destroy_notify;
+	gint _tmp3_;
+	GeeHashDataFunc _tmp4_;
+	void* _tmp4__target;
+	GDestroyNotify _tmp4__target_destroy_notify;
+	GeeEqualDataFunc _tmp5_;
+	void* _tmp5__target;
+	GDestroyNotify _tmp5__target_destroy_notify;
+	GeeHashMap* _tmp6_;
 #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp0_ = hold_msec;
 #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1854,21 +1859,21 @@ HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBo
 	equal_func_target_destroy_notify = NULL;
 #line 217 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return self;
-#line 1858 "TimedQueue.c"
+#line 1863 "TimedQueue.c"
 }
 
 
 HashTimedQueue* hash_timed_queue_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeHashDataFunc hash_func, void* hash_func_target, GDestroyNotify hash_func_target_destroy_notify, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority) {
 #line 217 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return hash_timed_queue_construct (TYPE_HASH_TIMED_QUEUE, g_type, g_dup_func, g_destroy_func, hold_msec, callback, callback_target, hash_func, hash_func_target, hash_func_target_destroy_notify, equal_func, equal_func_target, equal_func_target_destroy_notify, priority);
-#line 1865 "TimedQueue.c"
+#line 1870 "TimedQueue.c"
 }
 
 
 static void hash_timed_queue_real_notify_dequeued (TimedQueue* base, gconstpointer item) {
 	HashTimedQueue * self;
-	gconstpointer _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
+	gconstpointer _tmp0_;
+	gconstpointer _tmp1_;
 #line 225 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HASH_TIMED_QUEUE, HashTimedQueue);
 #line 226 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1879,13 +1884,13 @@ static void hash_timed_queue_real_notify_dequeued (TimedQueue* base, gconstpoint
 	_tmp1_ = item;
 #line 228 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	TIMED_QUEUE_CLASS (hash_timed_queue_parent_class)->notify_dequeued (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TIMED_QUEUE, TimedQueue), _tmp1_);
-#line 1883 "TimedQueue.c"
+#line 1888 "TimedQueue.c"
 }
 
 
 static void hash_timed_queue_real_clear (TimedQueue* base) {
 	HashTimedQueue * self;
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 231 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HASH_TIMED_QUEUE, HashTimedQueue);
 #line 232 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1894,16 +1899,16 @@ static void hash_timed_queue_real_clear (TimedQueue* base) {
 	gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 234 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	TIMED_QUEUE_CLASS (hash_timed_queue_parent_class)->clear (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TIMED_QUEUE, TimedQueue));
-#line 1898 "TimedQueue.c"
+#line 1903 "TimedQueue.c"
 }
 
 
 static gboolean hash_timed_queue_real_contains (TimedQueue* base, gconstpointer item) {
 	HashTimedQueue * self;
 	gboolean result = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	gconstpointer _tmp1_;
+	gboolean _tmp2_;
 #line 237 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HASH_TIMED_QUEUE, HashTimedQueue);
 #line 238 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1916,21 +1921,21 @@ static gboolean hash_timed_queue_real_contains (TimedQueue* base, gconstpointer
 	result = _tmp2_;
 #line 238 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 1920 "TimedQueue.c"
+#line 1925 "TimedQueue.c"
 }
 
 
 static gboolean hash_timed_queue_real_enqueue (TimedQueue* base, gconstpointer item) {
 	HashTimedQueue * self;
 	gboolean result = FALSE;
-	gconstpointer _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	gconstpointer _tmp0_;
+	gboolean _tmp1_;
 	gint _tmp2_ = 0;
-	GeeHashMap* _tmp3_ = NULL;
-	gconstpointer _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	GeeHashMap* _tmp9_ = NULL;
-	gconstpointer _tmp10_ = NULL;
+	GeeHashMap* _tmp3_;
+	gconstpointer _tmp4_;
+	gboolean _tmp5_;
+	GeeHashMap* _tmp9_;
+	gconstpointer _tmp10_;
 #line 241 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HASH_TIMED_QUEUE, HashTimedQueue);
 #line 242 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1943,7 +1948,7 @@ static gboolean hash_timed_queue_real_enqueue (TimedQueue* base, gconstpointer i
 		result = FALSE;
 #line 243 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return result;
-#line 1947 "TimedQueue.c"
+#line 1952 "TimedQueue.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp3_ = self->priv->item_count;
@@ -1953,10 +1958,10 @@ static gboolean hash_timed_queue_real_enqueue (TimedQueue* base, gconstpointer i
 	_tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (_tmp5_) {
-#line 1957 "TimedQueue.c"
-		GeeHashMap* _tmp6_ = NULL;
-		gconstpointer _tmp7_ = NULL;
-		gpointer _tmp8_ = NULL;
+#line 1962 "TimedQueue.c"
+		GeeHashMap* _tmp6_;
+		gconstpointer _tmp7_;
+		gpointer _tmp8_;
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp6_ = self->priv->item_count;
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1965,11 +1970,11 @@ static gboolean hash_timed_queue_real_enqueue (TimedQueue* base, gconstpointer i
 		_tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_);
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp2_ = ((gint) ((gintptr) _tmp8_)) + 1;
-#line 1969 "TimedQueue.c"
+#line 1974 "TimedQueue.c"
 	} else {
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp2_ = 1;
-#line 1973 "TimedQueue.c"
+#line 1978 "TimedQueue.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp9_ = self->priv->item_count;
@@ -1981,15 +1986,15 @@ static gboolean hash_timed_queue_real_enqueue (TimedQueue* base, gconstpointer i
 	result = TRUE;
 #line 247 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 1985 "TimedQueue.c"
+#line 1990 "TimedQueue.c"
 }
 
 
 static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollection* items) {
 	HashTimedQueue * self;
 	gboolean result = FALSE;
-	GeeCollection* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GeeCollection* _tmp0_;
+	gboolean _tmp1_;
 #line 250 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HASH_TIMED_QUEUE, HashTimedQueue);
 #line 250 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -2004,12 +2009,12 @@ static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollect
 		result = FALSE;
 #line 252 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return result;
-#line 2008 "TimedQueue.c"
+#line 2013 "TimedQueue.c"
 	}
 	{
 		GeeIterator* _item_it = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeCollection* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp2_ = items;
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -2018,18 +2023,18 @@ static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollect
 		_item_it = _tmp3_;
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		while (TRUE) {
-#line 2022 "TimedQueue.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 2027 "TimedQueue.c"
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			gpointer item = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
 			gint _tmp8_ = 0;
-			GeeHashMap* _tmp9_ = NULL;
-			gconstpointer _tmp10_ = NULL;
-			gboolean _tmp11_ = FALSE;
-			GeeHashMap* _tmp15_ = NULL;
-			gconstpointer _tmp16_ = NULL;
+			GeeHashMap* _tmp9_;
+			gconstpointer _tmp10_;
+			gboolean _tmp11_;
+			GeeHashMap* _tmp15_;
+			gconstpointer _tmp16_;
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp4_ = _item_it;
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -2038,7 +2043,7 @@ static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollect
 			if (!_tmp5_) {
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 2042 "TimedQueue.c"
+#line 2047 "TimedQueue.c"
 			}
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp6_ = _item_it;
@@ -2054,10 +2059,10 @@ static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollect
 			_tmp11_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_);
 #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			if (_tmp11_) {
-#line 2058 "TimedQueue.c"
-				GeeHashMap* _tmp12_ = NULL;
-				gconstpointer _tmp13_ = NULL;
-				gpointer _tmp14_ = NULL;
+#line 2063 "TimedQueue.c"
+				GeeHashMap* _tmp12_;
+				gconstpointer _tmp13_;
+				gpointer _tmp14_;
 #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp12_ = self->priv->item_count;
 #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -2066,11 +2071,11 @@ static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollect
 				_tmp14_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_);
 #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp8_ = ((gint) ((gintptr) _tmp14_)) + 1;
-#line 2070 "TimedQueue.c"
+#line 2075 "TimedQueue.c"
 			} else {
 #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp8_ = 1;
-#line 2074 "TimedQueue.c"
+#line 2079 "TimedQueue.c"
 			}
 #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp15_ = self->priv->item_count;
@@ -2080,26 +2085,26 @@ static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollect
 			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, (gpointer) ((gintptr) _tmp8_));
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL));
-#line 2084 "TimedQueue.c"
+#line 2089 "TimedQueue.c"
 		}
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_g_object_unref0 (_item_it);
-#line 2088 "TimedQueue.c"
+#line 2093 "TimedQueue.c"
 	}
 #line 257 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	result = TRUE;
 #line 257 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 2094 "TimedQueue.c"
+#line 2099 "TimedQueue.c"
 }
 
 
 static gboolean hash_timed_queue_real_remove_first (TimedQueue* base, gconstpointer item) {
 	HashTimedQueue * self;
 	gboolean result = FALSE;
-	gconstpointer _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gconstpointer _tmp2_ = NULL;
+	gconstpointer _tmp0_;
+	gboolean _tmp1_;
+	gconstpointer _tmp2_;
 #line 260 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HASH_TIMED_QUEUE, HashTimedQueue);
 #line 261 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -2112,7 +2117,7 @@ static gboolean hash_timed_queue_real_remove_first (TimedQueue* base, gconstpoin
 		result = FALSE;
 #line 262 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return result;
-#line 2116 "TimedQueue.c"
+#line 2121 "TimedQueue.c"
 	}
 #line 264 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp2_ = item;
@@ -2122,21 +2127,21 @@ static gboolean hash_timed_queue_real_remove_first (TimedQueue* base, gconstpoin
 	result = TRUE;
 #line 266 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 2126 "TimedQueue.c"
+#line 2131 "TimedQueue.c"
 }
 
 
 static void hash_timed_queue_removed (HashTimedQueue* self, gconstpointer item) {
-	GeeHashMap* _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	gconstpointer _tmp1_;
+	gboolean _tmp2_;
 	gint count = 0;
-	GeeHashMap* _tmp3_ = NULL;
-	gconstpointer _tmp4_ = NULL;
-	gpointer _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	GeeHashMap* _tmp3_;
+	gconstpointer _tmp4_;
+	gpointer _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 #line 269 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_if_fail (IS_HASH_TIMED_QUEUE (self));
 #line 272 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -2149,7 +2154,7 @@ static void hash_timed_queue_removed (HashTimedQueue* self, gconstpointer item)
 	if (!_tmp2_) {
 #line 273 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return;
-#line 2153 "TimedQueue.c"
+#line 2158 "TimedQueue.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp3_ = self->priv->item_count;
@@ -2171,20 +2176,20 @@ static void hash_timed_queue_removed (HashTimedQueue* self, gconstpointer item)
 	_tmp8_ = count;
 #line 278 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (_tmp8_ == 0) {
-#line 2175 "TimedQueue.c"
-		GeeHashMap* _tmp9_ = NULL;
-		gconstpointer _tmp10_ = NULL;
+#line 2180 "TimedQueue.c"
+		GeeHashMap* _tmp9_;
+		gconstpointer _tmp10_;
 #line 279 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp9_ = self->priv->item_count;
 #line 279 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp10_ = item;
 #line 279 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_, NULL);
-#line 2184 "TimedQueue.c"
+#line 2189 "TimedQueue.c"
 	} else {
-		GeeHashMap* _tmp11_ = NULL;
-		gconstpointer _tmp12_ = NULL;
-		gint _tmp13_ = 0;
+		GeeHashMap* _tmp11_;
+		gconstpointer _tmp12_;
+		gint _tmp13_;
 #line 281 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp11_ = self->priv->item_count;
 #line 281 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -2193,7 +2198,7 @@ static void hash_timed_queue_removed (HashTimedQueue* self, gconstpointer item)
 		_tmp13_ = count;
 #line 281 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_, (gpointer) ((gintptr) _tmp13_));
-#line 2197 "TimedQueue.c"
+#line 2202 "TimedQueue.c"
 	}
 }
 
@@ -2206,29 +2211,29 @@ static void hash_timed_queue_class_init (HashTimedQueueClass * klass) {
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_type_class_add_private (klass, sizeof (HashTimedQueuePrivate));
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->notify_dequeued = (void (*)(TimedQueue*, gconstpointer)) hash_timed_queue_real_notify_dequeued;
+	((TimedQueueClass *) klass)->notify_dequeued = (void (*) (TimedQueue *, gconstpointer)) hash_timed_queue_real_notify_dequeued;
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->clear = (void (*)(TimedQueue*)) hash_timed_queue_real_clear;
+	((TimedQueueClass *) klass)->clear = (void (*) (TimedQueue *)) hash_timed_queue_real_clear;
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->contains = (gboolean (*)(TimedQueue*, gconstpointer)) hash_timed_queue_real_contains;
+	((TimedQueueClass *) klass)->contains = (gboolean (*) (TimedQueue *, gconstpointer)) hash_timed_queue_real_contains;
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->enqueue = (gboolean (*)(TimedQueue*, gconstpointer)) hash_timed_queue_real_enqueue;
+	((TimedQueueClass *) klass)->enqueue = (gboolean (*) (TimedQueue *, gconstpointer)) hash_timed_queue_real_enqueue;
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->enqueue_many = (gboolean (*)(TimedQueue*, GeeCollection*)) hash_timed_queue_real_enqueue_many;
+	((TimedQueueClass *) klass)->enqueue_many = (gboolean (*) (TimedQueue *, GeeCollection*)) hash_timed_queue_real_enqueue_many;
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->remove_first = (gboolean (*)(TimedQueue*, gconstpointer)) hash_timed_queue_real_remove_first;
-#line 2221 "TimedQueue.c"
+	((TimedQueueClass *) klass)->remove_first = (gboolean (*) (TimedQueue *, gconstpointer)) hash_timed_queue_real_remove_first;
+#line 2226 "TimedQueue.c"
 }
 
 
 static void hash_timed_queue_instance_init (HashTimedQueue * self) {
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self->priv = HASH_TIMED_QUEUE_GET_PRIVATE (self);
-#line 2228 "TimedQueue.c"
+#line 2233 "TimedQueue.c"
 }
 
 
-static void hash_timed_queue_finalize (TimedQueue* obj) {
+static void hash_timed_queue_finalize (TimedQueue * obj) {
 	HashTimedQueue * self;
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HASH_TIMED_QUEUE, HashTimedQueue);
@@ -2236,7 +2241,7 @@ static void hash_timed_queue_finalize (TimedQueue* obj) {
 	_g_object_unref0 (self->priv->item_count);
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	TIMED_QUEUE_CLASS (hash_timed_queue_parent_class)->finalize (obj);
-#line 2240 "TimedQueue.c"
+#line 2245 "TimedQueue.c"
 }
 
 
diff --git a/src/Tombstone.c b/src/Tombstone.c
index d660e10..7c57055 100644
--- a/src/Tombstone.c
+++ b/src/Tombstone.c
@@ -1,4 +1,4 @@
-/* Tombstone.c generated by valac 0.34.7, the Vala compiler
+/* Tombstone.c generated by valac 0.36.6, the Vala compiler
  * generated from Tombstone.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -367,7 +367,9 @@ struct _TombstoneSourceCollectionAsyncScanData {
 	int _state_;
 	GObject* _source_object_;
 	GAsyncResult* _res_;
-	GSimpleAsyncResult* _async_result;
+	GTask* _async_result;
+	GAsyncReadyCallback _callback_;
+	gboolean _task_complete_;
 	TombstoneSourceCollection* self;
 	DirectoryMonitor* monitor;
 	GCancellable* cancellable;
@@ -609,6 +611,7 @@ void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, D
 static void tombstone_source_collection_async_scan (TombstoneSourceCollection* self, DirectoryMonitor* monitor, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_);
 static void tombstone_source_collection_async_scan_finish (TombstoneSourceCollection* self, GAsyncResult* _res_);
 static void tombstone_source_collection_async_scan_data_free (gpointer _data);
+static void tombstone_source_collection_async_scan_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data);
 static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollectionAsyncScanData* _data_);
 Marker* data_collection_start_marking (DataCollection* self);
 GeeCollection* data_collection_get_all (DataCollection* self);
@@ -617,7 +620,7 @@ static void tombstone_source_collection_async_scan_ready (GObject* source_object
 void marker_mark (Marker* self, DataObject* object);
 static gboolean _tombstone_source_collection_async_scan_co_gsource_func (gpointer self);
 gint marker_get_count (Marker* self);
-static void tombstone_source_collection_finalize (DataCollection* obj);
+static void tombstone_source_collection_finalize (DataCollection * obj);
 gpointer tombstoned_file_ref (gpointer instance);
 void tombstoned_file_unref (gpointer instance);
 GParamSpec* param_spec_tombstoned_file (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -630,7 +633,7 @@ enum  {
 };
 TombstonedFile* tombstoned_file_new (GFile* file, gint64 filesize, const gchar* md5);
 TombstonedFile* tombstoned_file_construct (GType object_type, GFile* file, gint64 filesize, const gchar* md5);
-static void tombstoned_file_finalize (TombstonedFile* obj);
+static void tombstoned_file_finalize (TombstonedFile * obj);
 gpointer source_holding_tank_ref (gpointer instance);
 void source_holding_tank_unref (gpointer instance);
 GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -705,7 +708,7 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const
 static void tombstone_real_destroy (DataSource* base);
 void tombstone_table_remove (TombstoneTable* self, TombstoneID* tombstone_id, GError** error);
 void data_source_destroy (DataSource* self);
-static void tombstone_finalize (GObject* obj);
+static void tombstone_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -715,7 +718,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
 	result = file_hash ((GFile*) v);
 #line 8 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return result;
-#line 719 "Tombstone.c"
+#line 722 "Tombstone.c"
 }
 
 
@@ -724,7 +727,7 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer
 	result = file_equal ((GFile*) a, (GFile*) b);
 #line 8 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return result;
-#line 728 "Tombstone.c"
+#line 731 "Tombstone.c"
 }
 
 
@@ -733,7 +736,7 @@ static gint64 _tombstone_source_collection_get_tombstone_id_get_source_database_
 	result = tombstone_source_collection_get_tombstone_id (source);
 #line 12 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return result;
-#line 737 "Tombstone.c"
+#line 740 "Tombstone.c"
 }
 
 
@@ -743,21 +746,21 @@ TombstoneSourceCollection* tombstone_source_collection_construct (GType object_t
 	self = (TombstoneSourceCollection*) database_source_collection_construct (object_type, "Tombstones", _tombstone_source_collection_get_tombstone_id_get_source_database_key, NULL);
 #line 11 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return self;
-#line 747 "Tombstone.c"
+#line 750 "Tombstone.c"
 }
 
 
 TombstoneSourceCollection* tombstone_source_collection_new (void) {
 #line 11 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return tombstone_source_collection_construct (TYPE_TOMBSTONE_SOURCE_COLLECTION);
-#line 754 "Tombstone.c"
+#line 757 "Tombstone.c"
 }
 
 
 static gboolean tombstone_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) {
 	TombstoneSourceCollection * self;
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollection);
 #line 15 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -768,15 +771,15 @@ static gboolean tombstone_source_collection_real_holds_type_of_source (SourceCol
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_TOMBSTONE);
 #line 16 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return result;
-#line 772 "Tombstone.c"
+#line 775 "Tombstone.c"
 }
 
 
 static gint64 tombstone_source_collection_get_tombstone_id (DataSource* source) {
 	gint64 result = 0LL;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 	TombstoneID _tmp1_ = {0};
-	gint64 _tmp2_ = 0LL;
+	gint64 _tmp2_;
 #line 19 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
 #line 20 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -789,23 +792,23 @@ static gint64 tombstone_source_collection_get_tombstone_id (DataSource* source)
 	result = _tmp2_;
 #line 20 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return result;
-#line 793 "Tombstone.c"
+#line 796 "Tombstone.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 27 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 800 "Tombstone.c"
+#line 803 "Tombstone.c"
 }
 
 
 static void tombstone_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed) {
 	TombstoneSourceCollection * self;
-	GeeIterable* _tmp0_ = NULL;
-	GeeIterable* _tmp14_ = NULL;
-	GeeIterable* _tmp36_ = NULL;
-	GeeIterable* _tmp37_ = NULL;
+	GeeIterable* _tmp0_;
+	GeeIterable* _tmp14_;
+	GeeIterable* _tmp36_;
+	GeeIterable* _tmp37_;
 #line 23 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollection);
 #line 23 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -816,11 +819,11 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
 	_tmp0_ = added;
 #line 25 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (_tmp0_ != NULL) {
-#line 820 "Tombstone.c"
+#line 823 "Tombstone.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp1_ = NULL;
-			GeeIterator* _tmp2_ = NULL;
+			GeeIterable* _tmp1_;
+			GeeIterator* _tmp2_;
 #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_tmp1_ = added;
 #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -829,20 +832,20 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
 			_object_it = _tmp2_;
 #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			while (TRUE) {
-#line 833 "Tombstone.c"
-				GeeIterator* _tmp3_ = NULL;
-				gboolean _tmp4_ = FALSE;
+#line 836 "Tombstone.c"
+				GeeIterator* _tmp3_;
+				gboolean _tmp4_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
+				GeeIterator* _tmp5_;
+				gpointer _tmp6_;
 				Tombstone* tombstone = NULL;
-				DataObject* _tmp7_ = NULL;
-				Tombstone* _tmp8_ = NULL;
-				GeeHashMap* _tmp9_ = NULL;
-				Tombstone* _tmp10_ = NULL;
-				GFile* _tmp11_ = NULL;
-				GFile* _tmp12_ = NULL;
-				Tombstone* _tmp13_ = NULL;
+				DataObject* _tmp7_;
+				Tombstone* _tmp8_;
+				GeeHashMap* _tmp9_;
+				Tombstone* _tmp10_;
+				GFile* _tmp11_;
+				GFile* _tmp12_;
+				Tombstone* _tmp13_;
 #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_tmp3_ = _object_it;
 #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -851,7 +854,7 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
 				if (!_tmp4_) {
 #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					break;
-#line 855 "Tombstone.c"
+#line 858 "Tombstone.c"
 				}
 #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_tmp5_ = _object_it;
@@ -883,22 +886,22 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
 				_g_object_unref0 (tombstone);
 #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_g_object_unref0 (object);
-#line 887 "Tombstone.c"
+#line 890 "Tombstone.c"
 			}
 #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_g_object_unref0 (_object_it);
-#line 891 "Tombstone.c"
+#line 894 "Tombstone.c"
 		}
 	}
 #line 33 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_tmp14_ = removed;
 #line 33 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (_tmp14_ != NULL) {
-#line 898 "Tombstone.c"
+#line 901 "Tombstone.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp15_ = NULL;
-			GeeIterator* _tmp16_ = NULL;
+			GeeIterable* _tmp15_;
+			GeeIterator* _tmp16_;
 #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_tmp15_ = removed;
 #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -907,21 +910,21 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
 			_object_it = _tmp16_;
 #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			while (TRUE) {
-#line 911 "Tombstone.c"
-				GeeIterator* _tmp17_ = NULL;
-				gboolean _tmp18_ = FALSE;
+#line 914 "Tombstone.c"
+				GeeIterator* _tmp17_;
+				gboolean _tmp18_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp19_ = NULL;
-				gpointer _tmp20_ = NULL;
+				GeeIterator* _tmp19_;
+				gpointer _tmp20_;
 				Tombstone* tombstone = NULL;
-				DataObject* _tmp21_ = NULL;
-				Tombstone* _tmp22_ = NULL;
-				GeeHashMap* _tmp23_ = NULL;
-				Tombstone* _tmp24_ = NULL;
-				GFile* _tmp25_ = NULL;
-				GFile* _tmp26_ = NULL;
-				gboolean _tmp27_ = FALSE;
-				gboolean _tmp28_ = FALSE;
+				DataObject* _tmp21_;
+				Tombstone* _tmp22_;
+				GeeHashMap* _tmp23_;
+				Tombstone* _tmp24_;
+				GFile* _tmp25_;
+				GFile* _tmp26_;
+				gboolean _tmp27_;
+				gboolean _tmp28_;
 #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_tmp17_ = _object_it;
 #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -930,7 +933,7 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
 				if (!_tmp18_) {
 #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					break;
-#line 934 "Tombstone.c"
+#line 937 "Tombstone.c"
 				}
 #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_tmp19_ = _object_it;
@@ -960,15 +963,15 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
 				_g_object_unref0 (_tmp26_);
 #line 38 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				if (_tmp28_) {
-#line 964 "Tombstone.c"
+#line 967 "Tombstone.c"
 					gboolean is_removed = FALSE;
-					GeeHashMap* _tmp29_ = NULL;
-					Tombstone* _tmp30_ = NULL;
-					GFile* _tmp31_ = NULL;
-					GFile* _tmp32_ = NULL;
-					gboolean _tmp33_ = FALSE;
-					gboolean _tmp34_ = FALSE;
-					gboolean _tmp35_ = FALSE;
+					GeeHashMap* _tmp29_;
+					Tombstone* _tmp30_;
+					GFile* _tmp31_;
+					GFile* _tmp32_;
+					gboolean _tmp33_;
+					gboolean _tmp34_;
+					gboolean _tmp35_;
 #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_tmp29_ = self->priv->file_map;
 #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -989,17 +992,17 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
 					_tmp35_ = is_removed;
 #line 41 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_vala_assert (_tmp35_, "is_removed");
-#line 993 "Tombstone.c"
+#line 996 "Tombstone.c"
 				}
 #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_g_object_unref0 (tombstone);
 #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_g_object_unref0 (object);
-#line 999 "Tombstone.c"
+#line 1002 "Tombstone.c"
 			}
 #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_g_object_unref0 (_object_it);
-#line 1003 "Tombstone.c"
+#line 1006 "Tombstone.c"
 		}
 	}
 #line 49 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1008,7 +1011,7 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
 	_tmp37_ = removed;
 #line 49 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	DATA_COLLECTION_CLASS (tombstone_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp36_, _tmp37_);
-#line 1012 "Tombstone.c"
+#line 1015 "Tombstone.c"
 }
 
 
@@ -1018,15 +1021,15 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollection);
 #line 52 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_if_fail (GEE_IS_MAP (items));
-#line 1022 "Tombstone.c"
+#line 1025 "Tombstone.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp0_ = items;
 #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1045,21 +1048,21 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
 		_object_it = _tmp5_;
 #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		while (TRUE) {
-#line 1049 "Tombstone.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 1052 "Tombstone.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			Alteration* alteration = NULL;
-			GeeMap* _tmp10_ = NULL;
-			DataObject* _tmp11_ = NULL;
-			gpointer _tmp12_ = NULL;
-			Alteration* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
+			GeeMap* _tmp10_;
+			DataObject* _tmp11_;
+			gpointer _tmp12_;
+			Alteration* _tmp13_;
+			gboolean _tmp14_;
 			Tombstone* tombstone = NULL;
-			DataObject* _tmp15_ = NULL;
-			Tombstone* _tmp16_ = NULL;
+			DataObject* _tmp15_;
+			Tombstone* _tmp16_;
 #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_tmp6_ = _object_it;
 #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1068,7 +1071,7 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
 			if (!_tmp7_) {
 #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				break;
-#line 1072 "Tombstone.c"
+#line 1075 "Tombstone.c"
 			}
 #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_tmp8_ = _object_it;
@@ -1096,7 +1099,7 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
 				_g_object_unref0 (object);
 #line 56 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				continue;
-#line 1100 "Tombstone.c"
+#line 1103 "Tombstone.c"
 			}
 #line 58 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_tmp15_ = object;
@@ -1104,14 +1107,14 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
 			_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_TOMBSTONE, Tombstone));
 #line 58 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			tombstone = _tmp16_;
-#line 1108 "Tombstone.c"
+#line 1111 "Tombstone.c"
 			{
 				GeeIterator* _detail_it = NULL;
-				Alteration* _tmp17_ = NULL;
-				GeeCollection* _tmp18_ = NULL;
-				GeeCollection* _tmp19_ = NULL;
-				GeeIterator* _tmp20_ = NULL;
-				GeeIterator* _tmp21_ = NULL;
+				Alteration* _tmp17_;
+				GeeCollection* _tmp18_;
+				GeeCollection* _tmp19_;
+				GeeIterator* _tmp20_;
+				GeeIterator* _tmp21_;
 #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_tmp17_ = alteration;
 #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1128,25 +1131,25 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
 				_detail_it = _tmp21_;
 #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				while (TRUE) {
-#line 1132 "Tombstone.c"
-					GeeIterator* _tmp22_ = NULL;
-					gboolean _tmp23_ = FALSE;
+#line 1135 "Tombstone.c"
+					GeeIterator* _tmp22_;
+					gboolean _tmp23_;
 					gchar* detail = NULL;
-					GeeIterator* _tmp24_ = NULL;
-					gpointer _tmp25_ = NULL;
+					GeeIterator* _tmp24_;
+					gpointer _tmp25_;
 					GFile* old_file = NULL;
-					const gchar* _tmp26_ = NULL;
-					GFile* _tmp27_ = NULL;
+					const gchar* _tmp26_;
+					GFile* _tmp27_;
 					gboolean removed = FALSE;
-					GeeHashMap* _tmp28_ = NULL;
-					GFile* _tmp29_ = NULL;
-					gboolean _tmp30_ = FALSE;
-					gboolean _tmp31_ = FALSE;
-					GeeHashMap* _tmp32_ = NULL;
-					Tombstone* _tmp33_ = NULL;
-					GFile* _tmp34_ = NULL;
-					GFile* _tmp35_ = NULL;
-					Tombstone* _tmp36_ = NULL;
+					GeeHashMap* _tmp28_;
+					GFile* _tmp29_;
+					gboolean _tmp30_;
+					gboolean _tmp31_;
+					GeeHashMap* _tmp32_;
+					Tombstone* _tmp33_;
+					GFile* _tmp34_;
+					GFile* _tmp35_;
+					Tombstone* _tmp36_;
 #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_tmp22_ = _detail_it;
 #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1155,7 +1158,7 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
 					if (!_tmp23_) {
 #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala"
 						break;
-#line 1159 "Tombstone.c"
+#line 1162 "Tombstone.c"
 					}
 #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_tmp24_ = _detail_it;
@@ -1201,11 +1204,11 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
 					_g_free0 (detail);
 #line 68 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					break;
-#line 1205 "Tombstone.c"
+#line 1208 "Tombstone.c"
 				}
 #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_g_object_unref0 (_detail_it);
-#line 1209 "Tombstone.c"
+#line 1212 "Tombstone.c"
 			}
 #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_g_object_unref0 (tombstone);
@@ -1213,20 +1216,20 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
 			_alteration_unref0 (alteration);
 #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_g_object_unref0 (object);
-#line 1217 "Tombstone.c"
+#line 1220 "Tombstone.c"
 		}
 #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_g_object_unref0 (_object_it);
-#line 1221 "Tombstone.c"
+#line 1224 "Tombstone.c"
 	}
 }
 
 
 Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, GFile* file) {
 	Tombstone* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gpointer _tmp2_;
 #line 73 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_val_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self), NULL);
 #line 73 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1241,15 +1244,15 @@ Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self,
 	result = (Tombstone*) _tmp2_;
 #line 74 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return result;
-#line 1245 "Tombstone.c"
+#line 1248 "Tombstone.c"
 }
 
 
 gboolean tombstone_source_collection_matches (TombstoneSourceCollection* self, GFile* file) {
 	gboolean result = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 #line 77 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_val_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self), FALSE);
 #line 77 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1264,14 +1267,14 @@ gboolean tombstone_source_collection_matches (TombstoneSourceCollection* self, G
 	result = _tmp2_;
 #line 78 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return result;
-#line 1268 "Tombstone.c"
+#line 1271 "Tombstone.c"
 }
 
 
 void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, Tombstone* tombstone) {
-	Tombstone* _tmp0_ = NULL;
-	Marker* _tmp1_ = NULL;
-	Marker* _tmp2_ = NULL;
+	Tombstone* _tmp0_;
+	Marker* _tmp1_;
+	Marker* _tmp2_;
 #line 81 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self));
 #line 81 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1286,14 +1289,14 @@ void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, Tom
 	source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp2_, FALSE, NULL, NULL, NULL);
 #line 82 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1290 "Tombstone.c"
+#line 1293 "Tombstone.c"
 }
 
 
 void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self, GeeCollection* tombstones) {
 	Marker* marker = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	Marker* _tmp1_ = NULL;
+	GeeCollection* _tmp0_;
+	Marker* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 85 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self));
@@ -1311,7 +1314,7 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
 	database_table_begin_transaction ();
 #line 91 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), marker, FALSE, NULL, NULL, NULL);
-#line 1315 "Tombstone.c"
+#line 1318 "Tombstone.c"
 	{
 #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		database_table_commit_transaction (&_inner_error_);
@@ -1319,8 +1322,8 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1323 "Tombstone.c"
-				goto __catch547_database_error;
+#line 1326 "Tombstone.c"
+				goto __catch548_database_error;
 			}
 #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_g_object_unref0 (marker);
@@ -1330,14 +1333,14 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
 			g_clear_error (&_inner_error_);
 #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			return;
-#line 1334 "Tombstone.c"
+#line 1337 "Tombstone.c"
 		}
 	}
-	goto __finally547;
-	__catch547_database_error:
+	goto __finally548;
+	__catch548_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp2_ = NULL;
+		GError* _tmp2_;
 #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		err = _inner_error_;
 #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1348,9 +1351,9 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
 		app_window_database_error (_tmp2_);
 #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_g_error_free0 (err);
-#line 1352 "Tombstone.c"
+#line 1355 "Tombstone.c"
 	}
-	__finally547:
+	__finally548:
 #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1361,19 +1364,19 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
 		g_clear_error (&_inner_error_);
 #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		return;
-#line 1365 "Tombstone.c"
+#line 1368 "Tombstone.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 85 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_g_object_unref0 (marker);
-#line 1371 "Tombstone.c"
+#line 1374 "Tombstone.c"
 }
 
 
 void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, DirectoryMonitor* monitor, GCancellable* cancellable) {
-	DirectoryMonitor* _tmp0_ = NULL;
-	GCancellable* _tmp1_ = NULL;
+	DirectoryMonitor* _tmp0_;
+	GCancellable* _tmp1_;
 #line 108 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self));
 #line 108 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1386,7 +1389,7 @@ void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, D
 	_tmp1_ = cancellable;
 #line 109 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	tombstone_source_collection_async_scan (self, _tmp0_, _tmp1_, NULL, NULL);
-#line 1390 "Tombstone.c"
+#line 1393 "Tombstone.c"
 }
 
 
@@ -1401,30 +1404,54 @@ static void tombstone_source_collection_async_scan_data_free (gpointer _data) {
 	_data_collection_unref0 (_data_->self);
 #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_slice_free (TombstoneSourceCollectionAsyncScanData, _data_);
-#line 1405 "Tombstone.c"
+#line 1408 "Tombstone.c"
+}
+
+
+static void tombstone_source_collection_async_scan_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) {
+	TombstoneSourceCollectionAsyncScanData* _task_data_;
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+	_task_data_ = g_task_get_task_data (G_TASK (res));
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+	if (_task_data_->_callback_ != NULL) {
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+		_task_data_->_callback_ (source_object, res, user_data);
+#line 1420 "Tombstone.c"
+	}
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+	_task_data_->_task_complete_ = TRUE;
+#line 1424 "Tombstone.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 1412 "Tombstone.c"
+#line 1431 "Tombstone.c"
 }
 
 
 static void tombstone_source_collection_async_scan (TombstoneSourceCollection* self, DirectoryMonitor* monitor, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_) {
 	TombstoneSourceCollectionAsyncScanData* _data_;
-	TombstoneSourceCollection* _tmp0_ = NULL;
-	DirectoryMonitor* _tmp1_ = NULL;
-	DirectoryMonitor* _tmp2_ = NULL;
-	GCancellable* _tmp3_ = NULL;
-	GCancellable* _tmp4_ = NULL;
+	TombstoneSourceCollection* _tmp0_;
+	DirectoryMonitor* _tmp1_;
+	DirectoryMonitor* _tmp2_;
+	GCancellable* _tmp3_;
+	GCancellable* _tmp4_;
 #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_data_ = g_slice_new0 (TombstoneSourceCollectionAsyncScanData);
 #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	_data_->_async_result = g_simple_async_result_new (NULL, _callback_, _user_data_, tombstone_source_collection_async_scan);
+	_data_->_callback_ = _callback_;
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+	_data_->_async_result = g_task_new (NULL, cancellable, tombstone_source_collection_async_scan_async_ready_wrapper, _user_data_);
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+	if (_callback_ == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, tombstone_source_collection_async_scan_data_free);
+		_data_->_task_complete_ = TRUE;
+#line 1452 "Tombstone.c"
+	}
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+	g_task_set_task_data (_data_->_async_result, _data_, tombstone_source_collection_async_scan_data_free);
 #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_tmp0_ = _data_collection_ref0 (self);
 #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1447,15 +1474,20 @@ static void tombstone_source_collection_async_scan (TombstoneSourceCollection* s
 	_data_->cancellable = _tmp4_;
 #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	tombstone_source_collection_async_scan_co (_data_);
-#line 1451 "Tombstone.c"
+#line 1478 "Tombstone.c"
 }
 
 
 static void tombstone_source_collection_async_scan_finish (TombstoneSourceCollection* self, GAsyncResult* _res_) {
 	TombstoneSourceCollectionAsyncScanData* _data_;
 #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
-#line 1459 "Tombstone.c"
+	_data_ = g_task_propagate_pointer (G_TASK (_res_), NULL);
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+	if (NULL == _data_) {
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+		return;
+#line 1490 "Tombstone.c"
+	}
 }
 
 
@@ -1468,8 +1500,10 @@ static void tombstone_source_collection_async_scan_ready (GObject* source_object
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_data_->_res_ = _res_;
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
+	_data_->_task_complete_ = TRUE;
+#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	tombstone_source_collection_async_scan_co (_data_);
-#line 1473 "Tombstone.c"
+#line 1507 "Tombstone.c"
 }
 
 
@@ -1478,7 +1512,7 @@ static gboolean _tombstone_source_collection_async_scan_co_gsource_func (gpointe
 	result = tombstone_source_collection_async_scan_co (self);
 #line 145 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return result;
-#line 1482 "Tombstone.c"
+#line 1516 "Tombstone.c"
 }
 
 
@@ -1487,45 +1521,35 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 	switch (_data_->_state_) {
 #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		case 0:
-#line 1491 "Tombstone.c"
+#line 1525 "Tombstone.c"
 		goto _state_0;
 #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		case 1:
-#line 1495 "Tombstone.c"
+#line 1529 "Tombstone.c"
 		goto _state_1;
 #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		case 2:
-#line 1499 "Tombstone.c"
+#line 1533 "Tombstone.c"
 		goto _state_2;
 		default:
 #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		g_assert_not_reached ();
-#line 1504 "Tombstone.c"
+#line 1538 "Tombstone.c"
 	}
 	_state_0:
 #line 114 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	_data_->_tmp0_ = NULL;
-#line 114 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_data_->_tmp0_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DATA_COLLECTION, DataCollection));
 #line 114 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_data_->marker = _data_->_tmp0_;
-#line 1513 "Tombstone.c"
+#line 1545 "Tombstone.c"
 	{
 #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
-		_data_->_tmp1_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_data_->_tmp1_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DATA_COLLECTION, DataCollection));
 #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
-		_data_->_tmp2_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_data_->_tmp2_ = _data_->_tmp1_;
 #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
-		_data_->_tmp3_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_data_->_tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
-		_data_->_tmp4_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_data_->_tmp4_ = _data_->_tmp3_;
 #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_g_object_unref0 (_data_->_tmp2_);
@@ -1534,68 +1558,44 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		while (TRUE) {
 #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
-			_data_->_tmp5_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->_tmp5_ = _data_->_object_it;
 #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
-			_data_->_tmp6_ = FALSE;
-#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->_tmp6_ = gee_iterator_next (_data_->_tmp5_);
 #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (!_data_->_tmp6_) {
 #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				break;
-#line 1549 "Tombstone.c"
+#line 1569 "Tombstone.c"
 			}
 #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
-			_data_->_tmp7_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->_tmp7_ = _data_->_object_it;
 #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
-			_data_->_tmp8_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->_tmp8_ = gee_iterator_get (_data_->_tmp7_);
 #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->object = (DataObject*) _data_->_tmp8_;
 #line 116 "/home/jens/Source/shotwell/src/Tombstone.vala"
-			_data_->_tmp9_ = NULL;
-#line 116 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->_tmp9_ = _data_->object;
 #line 116 "/home/jens/Source/shotwell/src/Tombstone.vala"
-			_data_->_tmp10_ = NULL;
-#line 116 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp9_, TYPE_TOMBSTONE, Tombstone));
 #line 116 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->tombstone = _data_->_tmp10_;
 #line 117 "/home/jens/Source/shotwell/src/Tombstone.vala"
-			_data_->_tmp11_ = NULL;
-#line 117 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->_tmp11_ = _data_->tombstone;
 #line 117 "/home/jens/Source/shotwell/src/Tombstone.vala"
-			_data_->_tmp12_ = NULL;
-#line 117 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->_tmp12_ = tombstone_get_file (_data_->_tmp11_);
 #line 117 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->file = _data_->_tmp12_;
 #line 119 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->info = NULL;
 #line 120 "/home/jens/Source/shotwell/src/Tombstone.vala"
-			_data_->_tmp13_ = NULL;
-#line 120 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->_tmp13_ = _data_->monitor;
 #line 120 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_data_->_tmp13_ != NULL) {
 #line 121 "/home/jens/Source/shotwell/src/Tombstone.vala"
-				_data_->_tmp14_ = NULL;
-#line 121 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_data_->_tmp14_ = _data_->monitor;
 #line 121 "/home/jens/Source/shotwell/src/Tombstone.vala"
-				_data_->_tmp15_ = NULL;
-#line 121 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_data_->_tmp15_ = _data_->file;
 #line 121 "/home/jens/Source/shotwell/src/Tombstone.vala"
-				_data_->_tmp16_ = NULL;
-#line 121 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_data_->_tmp16_ = directory_monitor_get_file_info (_data_->_tmp14_, _data_->_tmp15_);
 #line 121 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_g_object_unref0 (_data_->info);
@@ -1604,20 +1604,14 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 #line 1605 "Tombstone.c"
 			}
 #line 125 "/home/jens/Source/shotwell/src/Tombstone.vala"
-			_data_->_tmp17_ = NULL;
-#line 125 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->_tmp17_ = _data_->info;
 #line 125 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_data_->_tmp17_ == NULL) {
-#line 1613 "Tombstone.c"
+#line 1611 "Tombstone.c"
 				{
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
-					_data_->_tmp19_ = NULL;
-#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->_tmp19_ = _data_->file;
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
-					_data_->_tmp20_ = NULL;
-#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->_tmp20_ = _data_->cancellable;
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->_state_ = 1;
@@ -1625,22 +1619,18 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 					g_file_query_info_async (_data_->_tmp19_, G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_PRIORITY_LOW, _data_->_tmp20_, tombstone_source_collection_async_scan_ready, _data_);
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					return FALSE;
-#line 1629 "Tombstone.c"
+#line 1623 "Tombstone.c"
 					_state_1:
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
-					_data_->_tmp21_ = NULL;
-#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->_tmp21_ = g_file_query_info_finish (_data_->_tmp19_, _data_->_res_, &_data_->_inner_error_);
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->_tmp18_ = _data_->_tmp21_;
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 1639 "Tombstone.c"
-						goto __catch548_g_error;
+#line 1631 "Tombstone.c"
+						goto __catch549_g_error;
 					}
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
-					_data_->_tmp22_ = NULL;
-#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->_tmp22_ = _data_->_tmp18_;
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->_tmp18_ = NULL;
@@ -1650,18 +1640,16 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 					_data_->info = _data_->_tmp22_;
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_g_object_unref0 (_data_->_tmp18_);
-#line 1654 "Tombstone.c"
+#line 1644 "Tombstone.c"
 				}
-				goto __finally548;
-				__catch548_g_error:
+				goto __finally549;
+				__catch549_g_error:
 				{
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->err = _data_->_inner_error_;
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->_inner_error_ = NULL;
 #line 131 "/home/jens/Source/shotwell/src/Tombstone.vala"
-					_data_->_tmp23_ = NULL;
-#line 131 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->_tmp23_ = _data_->err;
 #line 131 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					if (g_error_matches (_data_->_tmp23_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
@@ -1677,46 +1665,34 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 						_g_object_unref0 (_data_->object);
 #line 132 "/home/jens/Source/shotwell/src/Tombstone.vala"
 						break;
-#line 1681 "Tombstone.c"
+#line 1669 "Tombstone.c"
 					}
 #line 134 "/home/jens/Source/shotwell/src/Tombstone.vala"
-					_data_->_tmp24_ = NULL;
-#line 134 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->_tmp24_ = _data_->err;
 #line 134 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					if (!g_error_matches (_data_->_tmp24_, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) {
 #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
-						_data_->_tmp25_ = NULL;
-#line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
 						_data_->_tmp25_ = _data_->file;
 #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
-						_data_->_tmp26_ = NULL;
-#line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
 						_data_->_tmp26_ = g_file_get_path (_data_->_tmp25_);
 #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
-						_data_->_tmp27_ = NULL;
-#line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
 						_data_->_tmp27_ = _data_->_tmp26_;
 #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
-						_data_->_tmp28_ = NULL;
-#line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
 						_data_->_tmp28_ = _data_->err;
 #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
-						_data_->_tmp29_ = NULL;
-#line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
 						_data_->_tmp29_ = _data_->_tmp28_->message;
 #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
 						g_warning ("Tombstone.vala:135: Unable to check for existence of tombstoned file %" \
 "s: %s", _data_->_tmp27_, _data_->_tmp29_);
 #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
 						_g_free0 (_data_->_tmp27_);
-#line 1713 "Tombstone.c"
+#line 1689 "Tombstone.c"
 					}
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_g_error_free0 (_data_->err);
-#line 1717 "Tombstone.c"
+#line 1693 "Tombstone.c"
 				}
-				__finally548:
+				__finally549:
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1736,27 +1712,23 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					g_clear_error (&_data_->_inner_error_);
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
+					g_object_unref (_data_->_async_result);
+#line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					return FALSE;
-#line 1740 "Tombstone.c"
+#line 1718 "Tombstone.c"
 				}
 			}
 #line 142 "/home/jens/Source/shotwell/src/Tombstone.vala"
-			_data_->_tmp30_ = NULL;
-#line 142 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->_tmp30_ = _data_->info;
 #line 142 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_data_->_tmp30_ == NULL) {
 #line 143 "/home/jens/Source/shotwell/src/Tombstone.vala"
-				_data_->_tmp31_ = NULL;
-#line 143 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_data_->_tmp31_ = _data_->marker;
 #line 143 "/home/jens/Source/shotwell/src/Tombstone.vala"
-				_data_->_tmp32_ = NULL;
-#line 143 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_data_->_tmp32_ = _data_->tombstone;
 #line 143 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				marker_mark (_data_->_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp32_, TYPE_DATA_OBJECT, DataObject));
-#line 1759 "Tombstone.c"
+#line 1731 "Tombstone.c"
 			}
 #line 145 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _tombstone_source_collection_async_scan_co_gsource_func, _data_, NULL);
@@ -1764,7 +1736,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 			_data_->_state_ = 2;
 #line 146 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			return FALSE;
-#line 1767 "Tombstone.c"
+#line 1739 "Tombstone.c"
 			_state_2:
 			;
 #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1775,41 +1747,31 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 			_g_object_unref0 (_data_->tombstone);
 #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_g_object_unref0 (_data_->object);
-#line 1778 "Tombstone.c"
+#line 1750 "Tombstone.c"
 		}
 #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_g_object_unref0 (_data_->_object_it);
-#line 1782 "Tombstone.c"
+#line 1754 "Tombstone.c"
 	}
 #line 149 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	_data_->_tmp33_ = NULL;
-#line 149 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_data_->_tmp33_ = _data_->marker;
 #line 149 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	_data_->_tmp34_ = 0;
-#line 149 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_data_->_tmp34_ = marker_get_count (_data_->_tmp33_);
 #line 149 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (_data_->_tmp34_ > 0) {
 #line 150 "/home/jens/Source/shotwell/src/Tombstone.vala"
-		_data_->_tmp35_ = NULL;
-#line 150 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_data_->_tmp35_ = _data_->marker;
 #line 150 "/home/jens/Source/shotwell/src/Tombstone.vala"
-		_data_->_tmp36_ = 0;
-#line 150 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_data_->_tmp36_ = marker_get_count (_data_->_tmp35_);
 #line 150 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		g_debug ("Tombstone.vala:150: Resurrecting %d tombstones with no backing file", _data_->_tmp36_);
 #line 151 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		database_table_begin_transaction ();
 #line 152 "/home/jens/Source/shotwell/src/Tombstone.vala"
-		_data_->_tmp37_ = NULL;
-#line 152 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_data_->_tmp37_ = _data_->marker;
 #line 152 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_SOURCE_COLLECTION, SourceCollection), _data_->_tmp37_, FALSE, NULL, NULL, NULL);
-#line 1812 "Tombstone.c"
+#line 1774 "Tombstone.c"
 		{
 #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			database_table_commit_transaction (&_data_->_inner_error_);
@@ -1817,8 +1779,8 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 			if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				if (_data_->_inner_error_->domain == DATABASE_ERROR) {
-#line 1820 "Tombstone.c"
-					goto __catch549_database_error;
+#line 1782 "Tombstone.c"
+					goto __catch550_database_error;
 				}
 #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_g_object_unref0 (_data_->marker);
@@ -1827,28 +1789,28 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				g_clear_error (&_data_->_inner_error_);
 #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
+				g_object_unref (_data_->_async_result);
+#line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				return FALSE;
-#line 1831 "Tombstone.c"
+#line 1795 "Tombstone.c"
 			}
 		}
-		goto __finally549;
-		__catch549_database_error:
+		goto __finally550;
+		__catch550_database_error:
 		{
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->err2 = _data_->_inner_error_;
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->_inner_error_ = NULL;
 #line 156 "/home/jens/Source/shotwell/src/Tombstone.vala"
-			_data_->_tmp38_ = NULL;
-#line 156 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->_tmp38_ = _data_->err2;
 #line 156 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			app_window_database_error (_data_->_tmp38_);
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_g_error_free0 (_data_->err2);
-#line 1849 "Tombstone.c"
+#line 1811 "Tombstone.c"
 		}
-		__finally549:
+		__finally550:
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1858,27 +1820,30 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			g_clear_error (&_data_->_inner_error_);
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
+			g_object_unref (_data_->_async_result);
+#line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			return FALSE;
-#line 1862 "Tombstone.c"
+#line 1826 "Tombstone.c"
 		}
 	}
 #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_g_object_unref0 (_data_->marker);
 #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	if (_data_->_state_ == 0) {
+	g_task_return_pointer (_data_->_async_result, _data_, NULL);
 #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
-		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 1871 "Tombstone.c"
-	} else {
+	if (_data_->_state_ != 0) {
 #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
-		g_simple_async_result_complete (_data_->_async_result);
-#line 1875 "Tombstone.c"
+		while (_data_->_task_complete_ != TRUE) {
+#line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
+			g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
+#line 1839 "Tombstone.c"
+		}
 	}
 #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_object_unref (_data_->_async_result);
 #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return FALSE;
-#line 1881 "Tombstone.c"
+#line 1846 "Tombstone.c"
 }
 
 
@@ -1890,28 +1855,28 @@ static void tombstone_source_collection_class_init (TombstoneSourceCollectionCla
 #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_type_class_add_private (klass, sizeof (TombstoneSourceCollectionPrivate));
 #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) tombstone_source_collection_real_holds_type_of_source;
+	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) tombstone_source_collection_real_holds_type_of_source;
 #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	((DataCollectionClass *) klass)->notify_contents_altered = (void (*)(DataCollection*, GeeIterable*, GeeIterable*)) tombstone_source_collection_real_notify_contents_altered;
+	((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) tombstone_source_collection_real_notify_contents_altered;
 #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	((DataCollectionClass *) klass)->notify_items_altered = (void (*)(DataCollection*, GeeMap*)) tombstone_source_collection_real_notify_items_altered;
-#line 1898 "Tombstone.c"
+	((DataCollectionClass *) klass)->notify_items_altered = (void (*) (DataCollection *, GeeMap*)) tombstone_source_collection_real_notify_items_altered;
+#line 1863 "Tombstone.c"
 }
 
 
 static void tombstone_source_collection_instance_init (TombstoneSourceCollection * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	self->priv = TOMBSTONE_SOURCE_COLLECTION_GET_PRIVATE (self);
 #line 8 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 8 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	self->priv->file_map = _tmp0_;
-#line 1910 "Tombstone.c"
+#line 1875 "Tombstone.c"
 }
 
 
-static void tombstone_source_collection_finalize (DataCollection* obj) {
+static void tombstone_source_collection_finalize (DataCollection * obj) {
 	TombstoneSourceCollection * self;
 #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollection);
@@ -1919,7 +1884,7 @@ static void tombstone_source_collection_finalize (DataCollection* obj) {
 	_g_object_unref0 (self->priv->file_map);
 #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	DATA_COLLECTION_CLASS (tombstone_source_collection_parent_class)->finalize (obj);
-#line 1922 "Tombstone.c"
+#line 1887 "Tombstone.c"
 }
 
 
@@ -1937,11 +1902,11 @@ GType tombstone_source_collection_get_type (void) {
 
 TombstonedFile* tombstoned_file_construct (GType object_type, GFile* file, gint64 filesize, const gchar* md5) {
 	TombstonedFile* self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gint64 _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 167 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 167 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1968,21 +1933,21 @@ TombstonedFile* tombstoned_file_construct (GType object_type, GFile* file, gint6
 	self->md5 = _tmp4_;
 #line 167 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return self;
-#line 1971 "Tombstone.c"
+#line 1936 "Tombstone.c"
 }
 
 
 TombstonedFile* tombstoned_file_new (GFile* file, gint64 filesize, const gchar* md5) {
 #line 167 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return tombstoned_file_construct (TYPE_TOMBSTONED_FILE, file, filesize, md5);
-#line 1978 "Tombstone.c"
+#line 1943 "Tombstone.c"
 }
 
 
 static void value_tombstoned_file_init (GValue* value) {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	value->data[0].v_pointer = NULL;
-#line 1985 "Tombstone.c"
+#line 1950 "Tombstone.c"
 }
 
 
@@ -1991,7 +1956,7 @@ static void value_tombstoned_file_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		tombstoned_file_unref (value->data[0].v_pointer);
-#line 1994 "Tombstone.c"
+#line 1959 "Tombstone.c"
 	}
 }
 
@@ -2001,11 +1966,11 @@ static void value_tombstoned_file_copy_value (const GValue* src_value, GValue* d
 	if (src_value->data[0].v_pointer) {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		dest_value->data[0].v_pointer = tombstoned_file_ref (src_value->data[0].v_pointer);
-#line 2004 "Tombstone.c"
+#line 1969 "Tombstone.c"
 	} else {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2008 "Tombstone.c"
+#line 1973 "Tombstone.c"
 	}
 }
 
@@ -2013,66 +1978,66 @@ static void value_tombstoned_file_copy_value (const GValue* src_value, GValue* d
 static gpointer value_tombstoned_file_peek_pointer (const GValue* value) {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return value->data[0].v_pointer;
-#line 2016 "Tombstone.c"
+#line 1981 "Tombstone.c"
 }
 
 
 static gchar* value_tombstoned_file_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (collect_values[0].v_pointer) {
-#line 2023 "Tombstone.c"
-		TombstonedFile* object;
+#line 1988 "Tombstone.c"
+		TombstonedFile * object;
 		object = collect_values[0].v_pointer;
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2030 "Tombstone.c"
+#line 1995 "Tombstone.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2034 "Tombstone.c"
+#line 1999 "Tombstone.c"
 		}
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		value->data[0].v_pointer = tombstoned_file_ref (object);
-#line 2038 "Tombstone.c"
+#line 2003 "Tombstone.c"
 	} else {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		value->data[0].v_pointer = NULL;
-#line 2042 "Tombstone.c"
+#line 2007 "Tombstone.c"
 	}
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return NULL;
-#line 2046 "Tombstone.c"
+#line 2011 "Tombstone.c"
 }
 
 
 static gchar* value_tombstoned_file_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	TombstonedFile** object_p;
+	TombstonedFile ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (!object_p) {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2057 "Tombstone.c"
+#line 2022 "Tombstone.c"
 	}
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (!value->data[0].v_pointer) {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		*object_p = NULL;
-#line 2063 "Tombstone.c"
+#line 2028 "Tombstone.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2067 "Tombstone.c"
+#line 2032 "Tombstone.c"
 	} else {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		*object_p = tombstoned_file_ref (value->data[0].v_pointer);
-#line 2071 "Tombstone.c"
+#line 2036 "Tombstone.c"
 	}
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return NULL;
-#line 2075 "Tombstone.c"
+#line 2040 "Tombstone.c"
 }
 
 
@@ -2086,7 +2051,7 @@ GParamSpec* param_spec_tombstoned_file (const gchar* name, const gchar* nick, co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return G_PARAM_SPEC (spec);
-#line 2089 "Tombstone.c"
+#line 2054 "Tombstone.c"
 }
 
 
@@ -2095,12 +2060,12 @@ gpointer value_get_tombstoned_file (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONED_FILE), NULL);
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return value->data[0].v_pointer;
-#line 2098 "Tombstone.c"
+#line 2063 "Tombstone.c"
 }
 
 
 void value_set_tombstoned_file (GValue* value, gpointer v_object) {
-	TombstonedFile* old;
+	TombstonedFile * old;
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONED_FILE));
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2115,23 +2080,23 @@ void value_set_tombstoned_file (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		tombstoned_file_ref (value->data[0].v_pointer);
-#line 2118 "Tombstone.c"
+#line 2083 "Tombstone.c"
 	} else {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		value->data[0].v_pointer = NULL;
-#line 2122 "Tombstone.c"
+#line 2087 "Tombstone.c"
 	}
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (old) {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		tombstoned_file_unref (old);
-#line 2128 "Tombstone.c"
+#line 2093 "Tombstone.c"
 	}
 }
 
 
 void value_take_tombstoned_file (GValue* value, gpointer v_object) {
-	TombstonedFile* old;
+	TombstonedFile * old;
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONED_FILE));
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2144,17 +2109,17 @@ void value_take_tombstoned_file (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		value->data[0].v_pointer = v_object;
-#line 2147 "Tombstone.c"
+#line 2112 "Tombstone.c"
 	} else {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		value->data[0].v_pointer = NULL;
-#line 2151 "Tombstone.c"
+#line 2116 "Tombstone.c"
 	}
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (old) {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		tombstoned_file_unref (old);
-#line 2157 "Tombstone.c"
+#line 2122 "Tombstone.c"
 	}
 }
 
@@ -2164,18 +2129,18 @@ static void tombstoned_file_class_init (TombstonedFileClass * klass) {
 	tombstoned_file_parent_class = g_type_class_peek_parent (klass);
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	((TombstonedFileClass *) klass)->finalize = tombstoned_file_finalize;
-#line 2167 "Tombstone.c"
+#line 2132 "Tombstone.c"
 }
 
 
 static void tombstoned_file_instance_init (TombstonedFile * self) {
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	self->ref_count = 1;
-#line 2174 "Tombstone.c"
+#line 2139 "Tombstone.c"
 }
 
 
-static void tombstoned_file_finalize (TombstonedFile* obj) {
+static void tombstoned_file_finalize (TombstonedFile * obj) {
 	TombstonedFile * self;
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONED_FILE, TombstonedFile);
@@ -2185,7 +2150,7 @@ static void tombstoned_file_finalize (TombstonedFile* obj) {
 	_g_object_unref0 (self->file);
 #line 165 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_g_free0 (self->md5);
-#line 2188 "Tombstone.c"
+#line 2153 "Tombstone.c"
 }
 
 
@@ -2204,18 +2169,18 @@ GType tombstoned_file_get_type (void) {
 
 
 gpointer tombstoned_file_ref (gpointer instance) {
-	TombstonedFile* self;
+	TombstonedFile * self;
 	self = instance;
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return instance;
-#line 2213 "Tombstone.c"
+#line 2178 "Tombstone.c"
 }
 
 
 void tombstoned_file_unref (gpointer instance) {
-	TombstonedFile* self;
+	TombstonedFile * self;
 	self = instance;
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2223,7 +2188,7 @@ void tombstoned_file_unref (gpointer instance) {
 		TOMBSTONED_FILE_GET_CLASS (self)->finalize (self);
 #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2226 "Tombstone.c"
+#line 2191 "Tombstone.c"
 	}
 }
 
@@ -2234,37 +2199,37 @@ gint tombstone_reason_serialize (TombstoneReason self) {
 	result = (gint) self;
 #line 181 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return result;
-#line 2237 "Tombstone.c"
+#line 2202 "Tombstone.c"
 }
 
 
 TombstoneReason tombstone_reason_unserialize (gint value) {
 	TombstoneReason result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 185 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_tmp0_ = value;
 #line 185 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	switch ((TombstoneReason) _tmp0_) {
 #line 185 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		case TOMBSTONE_REASON_AUTO_DETECTED_DUPLICATE:
-#line 2250 "Tombstone.c"
+#line 2215 "Tombstone.c"
 		{
 #line 187 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			result = TOMBSTONE_REASON_AUTO_DETECTED_DUPLICATE;
 #line 187 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			return result;
-#line 2256 "Tombstone.c"
+#line 2221 "Tombstone.c"
 		}
 		default:
 #line 185 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		case TOMBSTONE_REASON_REMOVED_BY_USER:
-#line 2261 "Tombstone.c"
+#line 2226 "Tombstone.c"
 		{
 #line 192 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			result = TOMBSTONE_REASON_REMOVED_BY_USER;
 #line 192 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			return result;
-#line 2267 "Tombstone.c"
+#line 2232 "Tombstone.c"
 		}
 	}
 }
@@ -2285,14 +2250,14 @@ GType tombstone_reason_get_type (void) {
 static gpointer _tombstone_row_ref0 (gpointer self) {
 #line 203 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return self ? tombstone_row_ref (self) : NULL;
-#line 2288 "Tombstone.c"
+#line 2253 "Tombstone.c"
 }
 
 
 static Tombstone* tombstone_construct (GType object_type, TombstoneRow* row) {
 	Tombstone * self = NULL;
-	TombstoneRow* _tmp0_ = NULL;
-	TombstoneRow* _tmp1_ = NULL;
+	TombstoneRow* _tmp0_;
+	TombstoneRow* _tmp1_;
 #line 202 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_val_if_fail (IS_TOMBSTONE_ROW (row), NULL);
 #line 202 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2307,24 +2272,24 @@ static Tombstone* tombstone_construct (GType object_type, TombstoneRow* row) {
 	self->priv->row = _tmp1_;
 #line 202 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return self;
-#line 2310 "Tombstone.c"
+#line 2275 "Tombstone.c"
 }
 
 
 static Tombstone* tombstone_new (TombstoneRow* row) {
 #line 202 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return tombstone_construct (TYPE_TOMBSTONE, row);
-#line 2317 "Tombstone.c"
+#line 2282 "Tombstone.c"
 }
 
 
 void tombstone_init (void) {
-	TombstoneSourceCollection* _tmp0_ = NULL;
+	TombstoneSourceCollection* _tmp0_;
 	TombstoneRow** rows = NULL;
-	gint rows_length1 = 0;
-	gint _rows_size_ = 0;
-	TombstoneRow** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
+	gint rows_length1;
+	gint _rows_size_;
+	TombstoneRow** _tmp9_;
+	gint _tmp9__length1;
 	GError * _inner_error_ = NULL;
 #line 207 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_tmp0_ = tombstone_source_collection_new ();
@@ -2338,19 +2303,19 @@ void tombstone_init (void) {
 	rows_length1 = 0;
 #line 209 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_rows_size_ = rows_length1;
-#line 2341 "Tombstone.c"
+#line 2306 "Tombstone.c"
 	{
 		TombstoneRow** _tmp1_ = NULL;
-		TombstoneTable* _tmp2_ = NULL;
-		TombstoneTable* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		TombstoneRow** _tmp5_ = NULL;
-		TombstoneRow** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-		gint _tmp1__length1 = 0;
-		gint __tmp1__size_ = 0;
-		TombstoneRow** _tmp7_ = NULL;
-		gint _tmp7__length1 = 0;
+		TombstoneTable* _tmp2_;
+		TombstoneTable* _tmp3_;
+		gint _tmp4_;
+		TombstoneRow** _tmp5_;
+		TombstoneRow** _tmp6_;
+		gint _tmp6__length1;
+		gint _tmp1__length1;
+		gint __tmp1__size_;
+		TombstoneRow** _tmp7_;
+		gint _tmp7__length1;
 #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp2_ = tombstone_table_get_instance ();
 #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2373,8 +2338,8 @@ void tombstone_init (void) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 2376 "Tombstone.c"
-				goto __catch550_database_error;
+#line 2341 "Tombstone.c"
+				goto __catch551_database_error;
 			}
 #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL);
@@ -2384,7 +2349,7 @@ void tombstone_init (void) {
 			g_clear_error (&_inner_error_);
 #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			return;
-#line 2387 "Tombstone.c"
+#line 2352 "Tombstone.c"
 		}
 #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp7_ = _tmp1_;
@@ -2404,13 +2369,13 @@ void tombstone_init (void) {
 		_rows_size_ = rows_length1;
 #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp1_ = (_vala_array_free (_tmp1_, _tmp1__length1, (GDestroyNotify) tombstone_row_unref), NULL);
-#line 2407 "Tombstone.c"
+#line 2372 "Tombstone.c"
 	}
-	goto __finally550;
-	__catch550_database_error:
+	goto __finally551;
+	__catch551_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp8_ = NULL;
+		GError* _tmp8_;
 #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		err = _inner_error_;
 #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2421,9 +2386,9 @@ void tombstone_init (void) {
 		app_window_database_error (_tmp8_);
 #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_g_error_free0 (err);
-#line 2424 "Tombstone.c"
+#line 2389 "Tombstone.c"
 	}
-	__finally550:
+	__finally551:
 #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2434,7 +2399,7 @@ void tombstone_init (void) {
 		g_clear_error (&_inner_error_);
 #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		return;
-#line 2437 "Tombstone.c"
+#line 2402 "Tombstone.c"
 	}
 #line 216 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_tmp9_ = rows;
@@ -2442,15 +2407,15 @@ void tombstone_init (void) {
 	_tmp9__length1 = rows_length1;
 #line 216 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (_tmp9_ != NULL) {
-#line 2445 "Tombstone.c"
+#line 2410 "Tombstone.c"
 		GeeArrayList* tombstones = NULL;
-		GeeArrayList* _tmp10_ = NULL;
-		TombstoneRow** _tmp11_ = NULL;
-		gint _tmp11__length1 = 0;
-		TombstoneSourceCollection* _tmp17_ = NULL;
-		GeeArrayList* _tmp18_ = NULL;
-		GeeCollection* _tmp19_ = NULL;
-		GeeCollection* _tmp20_ = NULL;
+		GeeArrayList* _tmp10_;
+		TombstoneRow** _tmp11_;
+		gint _tmp11__length1;
+		TombstoneSourceCollection* _tmp17_;
+		GeeArrayList* _tmp18_;
+		GeeCollection* _tmp19_;
+		GeeCollection* _tmp20_;
 #line 217 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp10_ = gee_array_list_new (TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 217 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2459,7 +2424,7 @@ void tombstone_init (void) {
 		_tmp11_ = rows;
 #line 218 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp11__length1 = rows_length1;
-#line 2462 "Tombstone.c"
+#line 2427 "Tombstone.c"
 		{
 			TombstoneRow** row_collection = NULL;
 			gint row_collection_length1 = 0;
@@ -2471,19 +2436,19 @@ void tombstone_init (void) {
 			row_collection_length1 = _tmp11__length1;
 #line 218 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			for (row_it = 0; row_it < _tmp11__length1; row_it = row_it + 1) {
-#line 2474 "Tombstone.c"
-				TombstoneRow* _tmp12_ = NULL;
+#line 2439 "Tombstone.c"
+				TombstoneRow* _tmp12_;
 				TombstoneRow* row = NULL;
 #line 218 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_tmp12_ = _tombstone_row_ref0 (row_collection[row_it]);
 #line 218 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				row = _tmp12_;
-#line 2481 "Tombstone.c"
+#line 2446 "Tombstone.c"
 				{
-					GeeArrayList* _tmp13_ = NULL;
-					TombstoneRow* _tmp14_ = NULL;
-					Tombstone* _tmp15_ = NULL;
-					Tombstone* _tmp16_ = NULL;
+					GeeArrayList* _tmp13_;
+					TombstoneRow* _tmp14_;
+					Tombstone* _tmp15_;
+					Tombstone* _tmp16_;
 #line 219 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_tmp13_ = tombstones;
 #line 219 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2498,7 +2463,7 @@ void tombstone_init (void) {
 					_g_object_unref0 (_tmp16_);
 #line 218 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_tombstone_row_unref0 (row);
-#line 2501 "Tombstone.c"
+#line 2466 "Tombstone.c"
 				}
 			}
 		}
@@ -2514,11 +2479,11 @@ void tombstone_init (void) {
 		_g_object_unref0 (_tmp20_);
 #line 216 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_g_object_unref0 (tombstones);
-#line 2517 "Tombstone.c"
+#line 2482 "Tombstone.c"
 	}
 #line 206 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL);
-#line 2521 "Tombstone.c"
+#line 2486 "Tombstone.c"
 }
 
 
@@ -2529,15 +2494,15 @@ void tombstone_terminate (void) {
 static gpointer _backing_file_state_ref0 (gpointer self) {
 #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return self ? backing_file_state_ref (self) : NULL;
-#line 2532 "Tombstone.c"
+#line 2497 "Tombstone.c"
 }
 
 
 void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reason, GError** error) {
 	GeeCollection* files = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeCollection* _tmp21_ = NULL;
-	TombstoneReason _tmp22_ = 0;
+	GeeArrayList* _tmp0_;
+	GeeCollection* _tmp21_;
+	TombstoneReason _tmp22_;
 	GError * _inner_error_ = NULL;
 #line 228 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
@@ -2545,11 +2510,11 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas
 	_tmp0_ = gee_array_list_new (TYPE_TOMBSTONED_FILE, (GBoxedCopyFunc) tombstoned_file_ref, (GDestroyNotify) tombstoned_file_unref, NULL, NULL, NULL);
 #line 230 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	files = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2548 "Tombstone.c"
+#line 2513 "Tombstone.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp1_ = sources;
 #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2558,15 +2523,15 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas
 		_source_it = _tmp2_;
 #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		while (TRUE) {
-#line 2561 "Tombstone.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 2526 "Tombstone.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			MediaSource* source = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
-			MediaSource* _tmp7_ = NULL;
-			gint _tmp8_ = 0;
-			BackingFileState** _tmp9_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
+			MediaSource* _tmp7_;
+			gint _tmp8_;
+			BackingFileState** _tmp9_;
 #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_tmp3_ = _source_it;
 #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2575,7 +2540,7 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas
 			if (!_tmp4_) {
 #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				break;
-#line 2578 "Tombstone.c"
+#line 2543 "Tombstone.c"
 			}
 #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_tmp5_ = _source_it;
@@ -2587,7 +2552,7 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas
 			_tmp7_ = source;
 #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_tmp9_ = media_source_get_backing_files_state (_tmp7_, &_tmp8_);
-#line 2590 "Tombstone.c"
+#line 2555 "Tombstone.c"
 			{
 				BackingFileState** state_collection = NULL;
 				gint state_collection_length1 = 0;
@@ -2599,25 +2564,25 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas
 				state_collection_length1 = _tmp8_;
 #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				for (state_it = 0; state_it < _tmp8_; state_it = state_it + 1) {
-#line 2602 "Tombstone.c"
-					BackingFileState* _tmp10_ = NULL;
+#line 2567 "Tombstone.c"
+					BackingFileState* _tmp10_;
 					BackingFileState* state = NULL;
 #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_tmp10_ = _backing_file_state_ref0 (state_collection[state_it]);
 #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					state = _tmp10_;
-#line 2609 "Tombstone.c"
+#line 2574 "Tombstone.c"
 					{
-						GeeCollection* _tmp11_ = NULL;
-						BackingFileState* _tmp12_ = NULL;
-						GFile* _tmp13_ = NULL;
-						GFile* _tmp14_ = NULL;
-						BackingFileState* _tmp15_ = NULL;
-						gint64 _tmp16_ = 0LL;
-						BackingFileState* _tmp17_ = NULL;
-						const gchar* _tmp18_ = NULL;
-						TombstonedFile* _tmp19_ = NULL;
-						TombstonedFile* _tmp20_ = NULL;
+						GeeCollection* _tmp11_;
+						BackingFileState* _tmp12_;
+						GFile* _tmp13_;
+						GFile* _tmp14_;
+						BackingFileState* _tmp15_;
+						gint64 _tmp16_;
+						BackingFileState* _tmp17_;
+						const gchar* _tmp18_;
+						TombstonedFile* _tmp19_;
+						TombstonedFile* _tmp20_;
 #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala"
 						_tmp11_ = files;
 #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2646,20 +2611,20 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas
 						_g_object_unref0 (_tmp14_);
 #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala"
 						_backing_file_state_unref0 (state);
-#line 2649 "Tombstone.c"
+#line 2614 "Tombstone.c"
 					}
 				}
 #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				state_collection = (_vala_array_free (state_collection, state_collection_length1, (GDestroyNotify) backing_file_state_unref), NULL);
-#line 2654 "Tombstone.c"
+#line 2619 "Tombstone.c"
 			}
 #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_g_object_unref0 (source);
-#line 2658 "Tombstone.c"
+#line 2623 "Tombstone.c"
 		}
 #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_g_object_unref0 (_source_it);
-#line 2662 "Tombstone.c"
+#line 2627 "Tombstone.c"
 	}
 #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_tmp21_ = files;
@@ -2677,7 +2642,7 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas
 			_g_object_unref0 (files);
 #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			return;
-#line 2680 "Tombstone.c"
+#line 2645 "Tombstone.c"
 		} else {
 #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_g_object_unref0 (files);
@@ -2687,27 +2652,27 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas
 			g_clear_error (&_inner_error_);
 #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			return;
-#line 2690 "Tombstone.c"
+#line 2655 "Tombstone.c"
 		}
 	}
 #line 228 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_g_object_unref0 (files);
-#line 2695 "Tombstone.c"
+#line 2660 "Tombstone.c"
 }
 
 
 void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason, GError** error) {
 	Marker* to_destroy = NULL;
-	TombstoneSourceCollection* _tmp0_ = NULL;
-	Marker* _tmp1_ = NULL;
-	TombstoneSourceCollection* _tmp15_ = NULL;
-	Marker* _tmp16_ = NULL;
+	TombstoneSourceCollection* _tmp0_;
+	Marker* _tmp1_;
+	TombstoneSourceCollection* _tmp15_;
+	Marker* _tmp16_;
 	GeeArrayList* tombstones = NULL;
-	GeeArrayList* _tmp17_ = NULL;
-	TombstoneSourceCollection* _tmp41_ = NULL;
-	GeeArrayList* _tmp42_ = NULL;
-	GeeCollection* _tmp43_ = NULL;
-	GeeCollection* _tmp44_ = NULL;
+	GeeArrayList* _tmp17_;
+	TombstoneSourceCollection* _tmp41_;
+	GeeArrayList* _tmp42_;
+	GeeCollection* _tmp43_;
+	GeeCollection* _tmp44_;
 	GError * _inner_error_ = NULL;
 #line 239 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (files));
@@ -2717,11 +2682,11 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
 	_tmp1_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection));
 #line 242 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	to_destroy = _tmp1_;
-#line 2720 "Tombstone.c"
+#line 2685 "Tombstone.c"
 	{
 		GeeIterator* _file_it = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeCollection* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp2_ = files;
 #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2730,18 +2695,18 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
 		_file_it = _tmp3_;
 #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		while (TRUE) {
-#line 2733 "Tombstone.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 2698 "Tombstone.c"
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			TombstonedFile* file = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
 			Tombstone* tombstone = NULL;
-			TombstoneSourceCollection* _tmp8_ = NULL;
-			TombstonedFile* _tmp9_ = NULL;
-			GFile* _tmp10_ = NULL;
-			Tombstone* _tmp11_ = NULL;
-			Tombstone* _tmp12_ = NULL;
+			TombstoneSourceCollection* _tmp8_;
+			TombstonedFile* _tmp9_;
+			GFile* _tmp10_;
+			Tombstone* _tmp11_;
+			Tombstone* _tmp12_;
 #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_tmp4_ = _file_it;
 #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2750,7 +2715,7 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
 			if (!_tmp5_) {
 #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				break;
-#line 2753 "Tombstone.c"
+#line 2718 "Tombstone.c"
 			}
 #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_tmp6_ = _file_it;
@@ -2772,26 +2737,26 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
 			_tmp12_ = tombstone;
 #line 245 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_tmp12_ != NULL) {
-#line 2775 "Tombstone.c"
-				Marker* _tmp13_ = NULL;
-				Tombstone* _tmp14_ = NULL;
+#line 2740 "Tombstone.c"
+				Marker* _tmp13_;
+				Tombstone* _tmp14_;
 #line 246 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_tmp13_ = to_destroy;
 #line 246 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_tmp14_ = tombstone;
 #line 246 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				marker_mark (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
-#line 2784 "Tombstone.c"
+#line 2749 "Tombstone.c"
 			}
 #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_g_object_unref0 (tombstone);
 #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_tombstoned_file_unref0 (file);
-#line 2790 "Tombstone.c"
+#line 2755 "Tombstone.c"
 		}
 #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_g_object_unref0 (_file_it);
-#line 2794 "Tombstone.c"
+#line 2759 "Tombstone.c"
 	}
 #line 249 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_tmp15_ = tombstone_global;
@@ -2803,11 +2768,11 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
 	_tmp17_ = gee_array_list_new (TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 251 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	tombstones = _tmp17_;
-#line 2806 "Tombstone.c"
+#line 2771 "Tombstone.c"
 	{
 		GeeIterator* _file_it = NULL;
-		GeeCollection* _tmp18_ = NULL;
-		GeeIterator* _tmp19_ = NULL;
+		GeeCollection* _tmp18_;
+		GeeIterator* _tmp19_;
 #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp18_ = files;
 #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2816,29 +2781,29 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
 		_file_it = _tmp19_;
 #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		while (TRUE) {
-#line 2819 "Tombstone.c"
-			GeeIterator* _tmp20_ = NULL;
-			gboolean _tmp21_ = FALSE;
+#line 2784 "Tombstone.c"
+			GeeIterator* _tmp20_;
+			gboolean _tmp21_;
 			TombstonedFile* file = NULL;
-			GeeIterator* _tmp22_ = NULL;
-			gpointer _tmp23_ = NULL;
+			GeeIterator* _tmp22_;
+			gpointer _tmp23_;
 			TombstoneRow* _tmp24_ = NULL;
-			TombstoneTable* _tmp25_ = NULL;
-			TombstoneTable* _tmp26_ = NULL;
-			TombstonedFile* _tmp27_ = NULL;
-			GFile* _tmp28_ = NULL;
-			gchar* _tmp29_ = NULL;
-			gchar* _tmp30_ = NULL;
-			TombstonedFile* _tmp31_ = NULL;
-			gint64 _tmp32_ = 0LL;
-			TombstonedFile* _tmp33_ = NULL;
-			const gchar* _tmp34_ = NULL;
-			TombstoneReason _tmp35_ = 0;
-			TombstoneRow* _tmp36_ = NULL;
-			TombstoneRow* _tmp37_ = NULL;
-			GeeArrayList* _tmp38_ = NULL;
-			Tombstone* _tmp39_ = NULL;
-			Tombstone* _tmp40_ = NULL;
+			TombstoneTable* _tmp25_;
+			TombstoneTable* _tmp26_;
+			TombstonedFile* _tmp27_;
+			GFile* _tmp28_;
+			gchar* _tmp29_;
+			gchar* _tmp30_;
+			TombstonedFile* _tmp31_;
+			gint64 _tmp32_;
+			TombstonedFile* _tmp33_;
+			const gchar* _tmp34_;
+			TombstoneReason _tmp35_;
+			TombstoneRow* _tmp36_;
+			TombstoneRow* _tmp37_;
+			GeeArrayList* _tmp38_;
+			Tombstone* _tmp39_;
+			Tombstone* _tmp40_;
 #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_tmp20_ = _file_it;
 #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2847,7 +2812,7 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
 			if (!_tmp21_) {
 #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				break;
-#line 2850 "Tombstone.c"
+#line 2815 "Tombstone.c"
 			}
 #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_tmp22_ = _file_it;
@@ -2903,7 +2868,7 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
 					_g_object_unref0 (to_destroy);
 #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					return;
-#line 2906 "Tombstone.c"
+#line 2871 "Tombstone.c"
 				} else {
 #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_tombstoned_file_unref0 (file);
@@ -2919,7 +2884,7 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
 					g_clear_error (&_inner_error_);
 #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					return;
-#line 2922 "Tombstone.c"
+#line 2887 "Tombstone.c"
 				}
 			}
 #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2936,11 +2901,11 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
 			_tombstone_row_unref0 (_tmp24_);
 #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_tombstoned_file_unref0 (file);
-#line 2939 "Tombstone.c"
+#line 2904 "Tombstone.c"
 		}
 #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_g_object_unref0 (_file_it);
-#line 2943 "Tombstone.c"
+#line 2908 "Tombstone.c"
 	}
 #line 257 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_tmp41_ = tombstone_global;
@@ -2956,14 +2921,14 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
 	_g_object_unref0 (tombstones);
 #line 239 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_g_object_unref0 (to_destroy);
-#line 2959 "Tombstone.c"
+#line 2924 "Tombstone.c"
 }
 
 
 static gchar* tombstone_real_get_typename (DataSource* base) {
 	Tombstone * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 260 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE, Tombstone);
 #line 261 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2972,7 +2937,7 @@ static gchar* tombstone_real_get_typename (DataSource* base) {
 	result = _tmp0_;
 #line 261 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return result;
-#line 2975 "Tombstone.c"
+#line 2940 "Tombstone.c"
 }
 
 
@@ -2980,7 +2945,7 @@ static gint64 tombstone_real_get_instance_id (DataSource* base) {
 	Tombstone * self;
 	gint64 result = 0LL;
 	TombstoneID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	gint64 _tmp1_;
 #line 264 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE, Tombstone);
 #line 265 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2991,16 +2956,16 @@ static gint64 tombstone_real_get_instance_id (DataSource* base) {
 	result = _tmp1_;
 #line 265 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return result;
-#line 2994 "Tombstone.c"
+#line 2959 "Tombstone.c"
 }
 
 
 static gchar* tombstone_real_get_name (DataObject* base) {
 	Tombstone * self;
 	gchar* result = NULL;
-	TombstoneRow* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	TombstoneRow* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 268 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE, Tombstone);
 #line 269 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3013,17 +2978,17 @@ static gchar* tombstone_real_get_name (DataObject* base) {
 	result = _tmp2_;
 #line 269 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return result;
-#line 3016 "Tombstone.c"
+#line 2981 "Tombstone.c"
 }
 
 
 static gchar* tombstone_real_to_string (DataObject* base) {
 	Tombstone * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 272 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE, Tombstone);
 #line 273 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3040,13 +3005,13 @@ static gchar* tombstone_real_to_string (DataObject* base) {
 	result = _tmp3_;
 #line 273 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return result;
-#line 3043 "Tombstone.c"
+#line 3008 "Tombstone.c"
 }
 
 
 void tombstone_get_tombstone_id (Tombstone* self, TombstoneID* result) {
-	TombstoneRow* _tmp0_ = NULL;
-	TombstoneID _tmp1_ = {0};
+	TombstoneRow* _tmp0_;
+	TombstoneID _tmp1_;
 #line 276 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_if_fail (IS_TOMBSTONE (self));
 #line 277 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3057,25 +3022,25 @@ void tombstone_get_tombstone_id (Tombstone* self, TombstoneID* result) {
 	*result = _tmp1_;
 #line 277 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return;
-#line 3060 "Tombstone.c"
+#line 3025 "Tombstone.c"
 }
 
 
 GFile* tombstone_get_file (Tombstone* self) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
 #line 280 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_val_if_fail (IS_TOMBSTONE (self), NULL);
 #line 281 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_tmp0_ = self->priv->file;
 #line 281 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (_tmp0_ == NULL) {
-#line 3075 "Tombstone.c"
-		TombstoneRow* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		GFile* _tmp3_ = NULL;
+#line 3040 "Tombstone.c"
+		TombstoneRow* _tmp1_;
+		const gchar* _tmp2_;
+		GFile* _tmp3_;
 #line 282 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp1_ = self->priv->row;
 #line 282 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3086,7 +3051,7 @@ GFile* tombstone_get_file (Tombstone* self) {
 		_g_object_unref0 (self->priv->file);
 #line 282 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		self->priv->file = _tmp3_;
-#line 3089 "Tombstone.c"
+#line 3054 "Tombstone.c"
 	}
 #line 284 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_tmp4_ = self->priv->file;
@@ -3096,17 +3061,17 @@ GFile* tombstone_get_file (Tombstone* self) {
 	result = _tmp5_;
 #line 284 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return result;
-#line 3099 "Tombstone.c"
+#line 3064 "Tombstone.c"
 }
 
 
 gchar* tombstone_get_md5 (Tombstone* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
-	TombstoneRow* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gchar* _tmp6_ = NULL;
+	TombstoneRow* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
+	gchar* _tmp6_;
 #line 287 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_val_if_fail (IS_TOMBSTONE (self), NULL);
 #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3119,17 +3084,17 @@ gchar* tombstone_get_md5 (Tombstone* self) {
 	if (_tmp3_) {
 #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp0_ = NULL;
-#line 3122 "Tombstone.c"
+#line 3087 "Tombstone.c"
 	} else {
-		TombstoneRow* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+		TombstoneRow* _tmp4_;
+		const gchar* _tmp5_;
 #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp4_ = self->priv->row;
 #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp5_ = _tmp4_->md5;
 #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp0_ = _tmp5_;
-#line 3132 "Tombstone.c"
+#line 3097 "Tombstone.c"
 	}
 #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_tmp6_ = g_strdup (_tmp0_);
@@ -3137,14 +3102,14 @@ gchar* tombstone_get_md5 (Tombstone* self) {
 	result = _tmp6_;
 #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return result;
-#line 3140 "Tombstone.c"
+#line 3105 "Tombstone.c"
 }
 
 
 TombstoneReason tombstone_get_reason (Tombstone* self) {
 	TombstoneReason result = 0;
-	TombstoneRow* _tmp0_ = NULL;
-	TombstoneReason _tmp1_ = 0;
+	TombstoneRow* _tmp0_;
+	TombstoneReason _tmp1_;
 #line 291 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_val_if_fail (IS_TOMBSTONE (self), 0);
 #line 292 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3155,36 +3120,36 @@ TombstoneReason tombstone_get_reason (Tombstone* self) {
 	result = _tmp1_;
 #line 292 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return result;
-#line 3158 "Tombstone.c"
+#line 3123 "Tombstone.c"
 }
 
 
 void tombstone_move (Tombstone* self, GFile* file) {
 	gchar* old_filepath = NULL;
-	TombstoneRow* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	TombstoneRow* _tmp11_ = NULL;
-	GFile* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	GFile* _tmp14_ = NULL;
-	GFile* _tmp15_ = NULL;
-	Alteration* _tmp16_ = NULL;
-	Alteration* _tmp17_ = NULL;
+	TombstoneRow* _tmp8_;
+	const gchar* _tmp9_;
+	gchar* _tmp10_;
+	TombstoneRow* _tmp11_;
+	GFile* _tmp12_;
+	gchar* _tmp13_;
+	GFile* _tmp14_;
+	GFile* _tmp15_;
+	Alteration* _tmp16_;
+	Alteration* _tmp17_;
 	GError * _inner_error_ = NULL;
 #line 295 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_if_fail (IS_TOMBSTONE (self));
 #line 295 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 3179 "Tombstone.c"
+#line 3144 "Tombstone.c"
 	{
-		TombstoneTable* _tmp0_ = NULL;
-		TombstoneTable* _tmp1_ = NULL;
-		TombstoneRow* _tmp2_ = NULL;
-		TombstoneID _tmp3_ = {0};
-		GFile* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+		TombstoneTable* _tmp0_;
+		TombstoneTable* _tmp1_;
+		TombstoneRow* _tmp2_;
+		TombstoneID _tmp3_;
+		GFile* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp0_ = tombstone_table_get_instance ();
 #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3209,8 +3174,8 @@ void tombstone_move (Tombstone* self, GFile* file) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3212 "Tombstone.c"
-				goto __catch551_database_error;
+#line 3177 "Tombstone.c"
+				goto __catch552_database_error;
 			}
 #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3218,14 +3183,14 @@ void tombstone_move (Tombstone* self, GFile* file) {
 			g_clear_error (&_inner_error_);
 #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			return;
-#line 3221 "Tombstone.c"
+#line 3186 "Tombstone.c"
 		}
 	}
-	goto __finally551;
-	__catch551_database_error:
+	goto __finally552;
+	__catch552_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp7_ = NULL;
+		GError* _tmp7_;
 #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		err = _inner_error_;
 #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3236,9 +3201,9 @@ void tombstone_move (Tombstone* self, GFile* file) {
 		app_window_database_error (_tmp7_);
 #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_g_error_free0 (err);
-#line 3239 "Tombstone.c"
+#line 3204 "Tombstone.c"
 	}
-	__finally551:
+	__finally552:
 #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3247,7 +3212,7 @@ void tombstone_move (Tombstone* self, GFile* file) {
 		g_clear_error (&_inner_error_);
 #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		return;
-#line 3250 "Tombstone.c"
+#line 3215 "Tombstone.c"
 	}
 #line 302 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_tmp8_ = self->priv->row;
@@ -3285,33 +3250,33 @@ void tombstone_move (Tombstone* self, GFile* file) {
 	_alteration_unref0 (_tmp17_);
 #line 295 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_g_free0 (old_filepath);
-#line 3288 "Tombstone.c"
+#line 3253 "Tombstone.c"
 }
 
 
 gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const gchar* md5) {
 	gboolean result = FALSE;
-	TombstoneRow* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-	gint64 _tmp2_ = 0LL;
+	TombstoneRow* _tmp0_;
+	gint64 _tmp1_;
+	gint64 _tmp2_;
 	const gchar* _tmp3_ = NULL;
-	TombstoneRow* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	TombstoneRow* _tmp4_;
+	const gchar* _tmp5_;
+	gboolean _tmp6_;
 	gchar* this_md5 = NULL;
-	gchar* _tmp9_ = NULL;
+	gchar* _tmp9_;
 	const gchar* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	const gchar* _tmp11_;
+	gboolean _tmp12_;
 	gchar* other_md5 = NULL;
-	gchar* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	GFile* _tmp17_ = NULL;
-	GFile* _tmp18_ = NULL;
-	GFile* _tmp19_ = NULL;
-	gboolean _tmp20_ = FALSE;
-	gboolean _tmp21_ = FALSE;
+	gchar* _tmp14_;
+	const gchar* _tmp15_;
+	const gchar* _tmp16_;
+	GFile* _tmp17_;
+	GFile* _tmp18_;
+	GFile* _tmp19_;
+	gboolean _tmp20_;
+	gboolean _tmp21_;
 #line 309 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_val_if_fail (IS_TOMBSTONE (self), FALSE);
 #line 309 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3328,7 +3293,7 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const
 		result = FALSE;
 #line 311 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		return result;
-#line 3331 "Tombstone.c"
+#line 3296 "Tombstone.c"
 	}
 #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_tmp4_ = self->priv->row;
@@ -3340,17 +3305,17 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const
 	if (_tmp6_) {
 #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp3_ = NULL;
-#line 3343 "Tombstone.c"
+#line 3308 "Tombstone.c"
 	} else {
-		TombstoneRow* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
+		TombstoneRow* _tmp7_;
+		const gchar* _tmp8_;
 #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp7_ = self->priv->row;
 #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp8_ = _tmp7_->md5;
 #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp3_ = _tmp8_;
-#line 3353 "Tombstone.c"
+#line 3318 "Tombstone.c"
 	}
 #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_tmp9_ = g_strdup (_tmp3_);
@@ -3364,14 +3329,14 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const
 	if (_tmp12_) {
 #line 315 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp10_ = NULL;
-#line 3367 "Tombstone.c"
+#line 3332 "Tombstone.c"
 	} else {
-		const gchar* _tmp13_ = NULL;
+		const gchar* _tmp13_;
 #line 315 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp13_ = md5;
 #line 315 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp10_ = _tmp13_;
-#line 3374 "Tombstone.c"
+#line 3339 "Tombstone.c"
 	}
 #line 315 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_tmp14_ = g_strdup (_tmp10_);
@@ -3391,7 +3356,7 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const
 		_g_free0 (this_md5);
 #line 318 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		return result;
-#line 3394 "Tombstone.c"
+#line 3359 "Tombstone.c"
 	}
 #line 320 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	_tmp17_ = tombstone_get_file (self);
@@ -3415,7 +3380,7 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const
 		_g_free0 (this_md5);
 #line 321 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		return result;
-#line 3418 "Tombstone.c"
+#line 3383 "Tombstone.c"
 	}
 #line 323 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	result = TRUE;
@@ -3425,7 +3390,7 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const
 	_g_free0 (this_md5);
 #line 323 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	return result;
-#line 3428 "Tombstone.c"
+#line 3393 "Tombstone.c"
 }
 
 
@@ -3434,12 +3399,12 @@ static void tombstone_real_destroy (DataSource* base) {
 	GError * _inner_error_ = NULL;
 #line 326 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE, Tombstone);
-#line 3437 "Tombstone.c"
+#line 3402 "Tombstone.c"
 	{
-		TombstoneTable* _tmp0_ = NULL;
-		TombstoneTable* _tmp1_ = NULL;
-		TombstoneRow* _tmp2_ = NULL;
-		TombstoneID _tmp3_ = {0};
+		TombstoneTable* _tmp0_;
+		TombstoneTable* _tmp1_;
+		TombstoneRow* _tmp2_;
+		TombstoneID _tmp3_;
 #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_tmp0_ = tombstone_table_get_instance ();
 #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3456,8 +3421,8 @@ static void tombstone_real_destroy (DataSource* base) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3459 "Tombstone.c"
-				goto __catch552_database_error;
+#line 3424 "Tombstone.c"
+				goto __catch553_database_error;
 			}
 #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3465,14 +3430,14 @@ static void tombstone_real_destroy (DataSource* base) {
 			g_clear_error (&_inner_error_);
 #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			return;
-#line 3468 "Tombstone.c"
+#line 3433 "Tombstone.c"
 		}
 	}
-	goto __finally552;
-	__catch552_database_error:
+	goto __finally553;
+	__catch553_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp4_ = NULL;
+		GError* _tmp4_;
 #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		err = _inner_error_;
 #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3483,9 +3448,9 @@ static void tombstone_real_destroy (DataSource* base) {
 		app_window_database_error (_tmp4_);
 #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		_g_error_free0 (err);
-#line 3486 "Tombstone.c"
+#line 3451 "Tombstone.c"
 	}
-	__finally552:
+	__finally553:
 #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3494,11 +3459,11 @@ static void tombstone_real_destroy (DataSource* base) {
 		g_clear_error (&_inner_error_);
 #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		return;
-#line 3497 "Tombstone.c"
+#line 3462 "Tombstone.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	DATA_SOURCE_CLASS (tombstone_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource));
-#line 3501 "Tombstone.c"
+#line 3466 "Tombstone.c"
 }
 
 
@@ -3508,18 +3473,18 @@ static void tombstone_class_init (TombstoneClass * klass) {
 #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_type_class_add_private (klass, sizeof (TombstonePrivate));
 #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) tombstone_real_get_typename;
+	((DataSourceClass *) klass)->get_typename = (gchar* (*) (DataSource *)) tombstone_real_get_typename;
 #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) tombstone_real_get_instance_id;
+	((DataSourceClass *) klass)->get_instance_id = (gint64 (*) (DataSource *)) tombstone_real_get_instance_id;
 #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) tombstone_real_get_name;
+	((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) tombstone_real_get_name;
 #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) tombstone_real_to_string;
+	((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) tombstone_real_to_string;
 #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	((DataSourceClass *) klass)->destroy = (void (*)(DataSource*)) tombstone_real_destroy;
+	((DataSourceClass *) klass)->destroy = (void (*) (DataSource *)) tombstone_real_destroy;
 #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	G_OBJECT_CLASS (klass)->finalize = tombstone_finalize;
-#line 3522 "Tombstone.c"
+#line 3487 "Tombstone.c"
 }
 
 
@@ -3528,11 +3493,11 @@ static void tombstone_instance_init (Tombstone * self) {
 	self->priv = TOMBSTONE_GET_PRIVATE (self);
 #line 200 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	self->priv->file = NULL;
-#line 3531 "Tombstone.c"
+#line 3496 "Tombstone.c"
 }
 
 
-static void tombstone_finalize (GObject* obj) {
+static void tombstone_finalize (GObject * obj) {
 	Tombstone * self;
 #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE, Tombstone);
@@ -3542,7 +3507,7 @@ static void tombstone_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->file);
 #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	G_OBJECT_CLASS (tombstone_parent_class)->finalize (obj);
-#line 3545 "Tombstone.c"
+#line 3510 "Tombstone.c"
 }
 
 
diff --git a/src/UnityProgressBar.c b/src/UnityProgressBar.c
index a2854be..442cc3a 100644
--- a/src/UnityProgressBar.c
+++ b/src/UnityProgressBar.c
@@ -1,4 +1,4 @@
-/* UnityProgressBar.c generated by valac 0.34.7, the Vala compiler
+/* UnityProgressBar.c generated by valac 0.36.6, the Vala compiler
  * generated from UnityProgressBar.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Upgrades.c b/src/Upgrades.c
index a402c40..80ae01f 100644
--- a/src/Upgrades.c
+++ b/src/Upgrades.c
@@ -1,4 +1,4 @@
-/* Upgrades.c generated by valac 0.34.7, the Vala compiler
+/* Upgrades.c generated by valac 0.36.6, the Vala compiler
  * generated from Upgrades.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -443,10 +443,10 @@ static gpointer upgrades_parent_class = NULL;
 static Upgrades* upgrades_instance;
 static Upgrades* upgrades_instance = NULL;
 static gpointer mimics_removal_task_parent_class = NULL;
-static UpgradeTaskIface* mimics_removal_task_upgrade_task_parent_iface = NULL;
+static UpgradeTaskIface * mimics_removal_task_upgrade_task_parent_iface = NULL;
 static gpointer fixup_raw_thumbnails_task_parent_class = NULL;
 extern LibraryPhotoSourceCollection* library_photo_global;
-static UpgradeTaskIface* fixup_raw_thumbnails_task_upgrade_task_parent_iface = NULL;
+static UpgradeTaskIface * fixup_raw_thumbnails_task_upgrade_task_parent_iface = NULL;
 
 gpointer upgrades_ref (gpointer instance);
 void upgrades_unref (gpointer instance);
@@ -484,7 +484,7 @@ guint64 upgrades_get_step_count (Upgrades* self);
 void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_target);
 void upgrade_task_execute (UpgradeTask* self, ProgressMonitor monitor, void* monitor_target);
 guint64 upgrade_task_get_step_count (UpgradeTask* self);
-static void upgrades_finalize (Upgrades* obj);
+static void upgrades_finalize (Upgrades * obj);
 #define MIMICS_REMOVAL_TASK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTaskPrivate))
 enum  {
 	MIMICS_REMOVAL_TASK_DUMMY_PROPERTY
@@ -494,7 +494,7 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base);
 guint64 count_files_in_directory (GFile* dir, GError** error);
 static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor monitor, void* monitor_target);
 void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, void* monitor_target, guint64 file_count, GCancellable* cancellable, GError** error);
-static void mimics_removal_task_finalize (GObject* obj);
+static void mimics_removal_task_finalize (GObject * obj);
 enum  {
 	FIXUP_RAW_THUMBNAILS_TASK_DUMMY_PROPERTY
 };
@@ -574,12 +574,12 @@ LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollectio
 
 static Upgrades* upgrades_construct (GType object_type) {
 	Upgrades* self = NULL;
-	MimicsRemovalTask* _tmp0_ = NULL;
-	MimicsRemovalTask* _tmp1_ = NULL;
-	Application* _tmp2_ = NULL;
-	Application* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	MimicsRemovalTask* _tmp0_;
+	MimicsRemovalTask* _tmp1_;
+	Application* _tmp2_;
+	Application* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
 #line 15 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self = (Upgrades*) g_type_create_instance (object_type);
 #line 17 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -603,8 +603,8 @@ static Upgrades* upgrades_construct (GType object_type) {
 #line 19 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (_tmp5_) {
 #line 606 "Upgrades.c"
-		FixupRawThumbnailsTask* _tmp6_ = NULL;
-		FixupRawThumbnailsTask* _tmp7_ = NULL;
+		FixupRawThumbnailsTask* _tmp6_;
+		FixupRawThumbnailsTask* _tmp7_;
 #line 20 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp6_ = fixup_raw_thumbnails_task_new ();
 #line 20 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -629,8 +629,8 @@ static Upgrades* upgrades_new (void) {
 
 
 void upgrades_init (void) {
-	Upgrades* _tmp0_ = NULL;
-	Upgrades* _tmp1_ = NULL;
+	Upgrades* _tmp0_;
+	Upgrades* _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	_tmp0_ = upgrades_instance;
 #line 25 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -654,8 +654,8 @@ static gpointer _upgrades_ref0 (gpointer self) {
 
 Upgrades* upgrades_get_instance (void) {
 	Upgrades* result = NULL;
-	Upgrades* _tmp0_ = NULL;
-	Upgrades* _tmp1_ = NULL;
+	Upgrades* _tmp0_;
+	Upgrades* _tmp1_;
 #line 30 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	_tmp0_ = upgrades_instance;
 #line 30 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -670,7 +670,7 @@ Upgrades* upgrades_get_instance (void) {
 
 guint64 upgrades_get_step_count (Upgrades* self) {
 	guint64 result = 0ULL;
-	guint64 _tmp0_ = 0ULL;
+	guint64 _tmp0_;
 #line 34 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	g_return_val_if_fail (IS_UPGRADES (self), 0ULL);
 #line 35 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -696,12 +696,12 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta
 #line 697 "Upgrades.c"
 	{
 		GeeLinkedList* _task_list = NULL;
-		GeeLinkedList* _tmp0_ = NULL;
-		GeeLinkedList* _tmp1_ = NULL;
+		GeeLinkedList* _tmp0_;
+		GeeLinkedList* _tmp1_;
 		gint _task_size = 0;
-		GeeLinkedList* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		GeeLinkedList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 		gint _task_index = 0;
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp0_ = self->priv->task_list;
@@ -722,16 +722,16 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		while (TRUE) {
 #line 725 "Upgrades.c"
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
+			gint _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
 			UpgradeTask* task = NULL;
-			GeeLinkedList* _tmp8_ = NULL;
-			gint _tmp9_ = 0;
-			gpointer _tmp10_ = NULL;
-			UpgradeTask* _tmp11_ = NULL;
-			ProgressMonitor _tmp12_ = NULL;
-			void* _tmp12__target = NULL;
+			GeeLinkedList* _tmp8_;
+			gint _tmp9_;
+			gpointer _tmp10_;
+			UpgradeTask* _tmp11_;
+			ProgressMonitor _tmp12_;
+			void* _tmp12__target;
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_tmp5_ = _task_index;
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -774,11 +774,11 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta
 
 
 static void upgrades_add (Upgrades* self, UpgradeTask* task) {
-	guint64 _tmp0_ = 0ULL;
-	UpgradeTask* _tmp1_ = NULL;
-	guint64 _tmp2_ = 0ULL;
-	GeeLinkedList* _tmp3_ = NULL;
-	UpgradeTask* _tmp4_ = NULL;
+	guint64 _tmp0_;
+	UpgradeTask* _tmp1_;
+	guint64 _tmp2_;
+	GeeLinkedList* _tmp3_;
+	UpgradeTask* _tmp4_;
 #line 44 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	g_return_if_fail (IS_UPGRADES (self));
 #line 44 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -843,7 +843,7 @@ static gchar* value_upgrades_collect_value (GValue* value, guint n_collect_value
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (collect_values[0].v_pointer) {
 #line 846 "Upgrades.c"
-		Upgrades* object;
+		Upgrades * object;
 		object = collect_values[0].v_pointer;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -870,7 +870,7 @@ static gchar* value_upgrades_collect_value (GValue* value, guint n_collect_value
 
 
 static gchar* value_upgrades_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	Upgrades** object_p;
+	Upgrades ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (!object_p) {
@@ -922,7 +922,7 @@ gpointer value_get_upgrades (const GValue* value) {
 
 
 void value_set_upgrades (GValue* value, gpointer v_object) {
-	Upgrades* old;
+	Upgrades * old;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UPGRADES));
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -953,7 +953,7 @@ void value_set_upgrades (GValue* value, gpointer v_object) {
 
 
 void value_take_upgrades (GValue* value, gpointer v_object) {
-	Upgrades* old;
+	Upgrades * old;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UPGRADES));
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -993,7 +993,7 @@ static void upgrades_class_init (UpgradesClass * klass) {
 
 
 static void upgrades_instance_init (Upgrades * self) {
-	GeeLinkedList* _tmp0_ = NULL;
+	GeeLinkedList* _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self->priv = UPGRADES_GET_PRIVATE (self);
 #line 12 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1008,7 +1008,7 @@ static void upgrades_instance_init (Upgrades * self) {
 }
 
 
-static void upgrades_finalize (Upgrades* obj) {
+static void upgrades_finalize (Upgrades * obj) {
 	Upgrades * self;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_UPGRADES, Upgrades);
@@ -1035,7 +1035,7 @@ GType upgrades_get_type (void) {
 
 
 gpointer upgrades_ref (gpointer instance) {
-	Upgrades* self;
+	Upgrades * self;
 	self = instance;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1046,7 +1046,7 @@ gpointer upgrades_ref (gpointer instance) {
 
 
 void upgrades_unref (gpointer instance) {
-	Upgrades* self;
+	Upgrades * self;
 	self = instance;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1105,15 +1105,15 @@ GType upgrade_task_get_type (void) {
 static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 	MimicsRemovalTask * self;
 	guint64 result = 0ULL;
-	guint64 _tmp6_ = 0ULL;
+	guint64 _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 71 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTask);
 #line 1113 "Upgrades.c"
 	{
 		guint64 _tmp0_ = 0ULL;
-		GFile* _tmp1_ = NULL;
-		guint64 _tmp2_ = 0ULL;
+		GFile* _tmp1_;
+		guint64 _tmp2_;
 #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp1_ = self->priv->mimic_dir;
 #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1123,18 +1123,18 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1126 "Upgrades.c"
-			goto __catch593_g_error;
+			goto __catch595_g_error;
 		}
 #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		self->priv->num_mimics = _tmp0_;
 #line 1131 "Upgrades.c"
 	}
-	goto __finally593;
-	__catch593_g_error:
+	goto __finally595;
+	__catch595_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
+		GError* _tmp3_;
+		const gchar* _tmp4_;
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		e = _inner_error_;
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1149,7 +1149,7 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 		_g_error_free0 (e);
 #line 1151 "Upgrades.c"
 	}
-	__finally593:
+	__finally595:
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1156 "Upgrades.c"
@@ -1179,11 +1179,11 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTask);
 #line 1181 "Upgrades.c"
 	{
-		GFile* _tmp0_ = NULL;
-		ProgressMonitor _tmp1_ = NULL;
-		void* _tmp1__target = NULL;
-		guint64 _tmp2_ = 0ULL;
-		GFile* _tmp3_ = NULL;
+		GFile* _tmp0_;
+		ProgressMonitor _tmp1_;
+		void* _tmp1__target;
+		guint64 _tmp2_;
+		GFile* _tmp3_;
 #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp0_ = self->priv->mimic_dir;
 #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1197,7 +1197,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1200 "Upgrades.c"
-			goto __catch594_g_error;
+			goto __catch596_g_error;
 		}
 #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp3_ = self->priv->mimic_dir;
@@ -1206,15 +1206,15 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1209 "Upgrades.c"
-			goto __catch594_g_error;
+			goto __catch596_g_error;
 		}
 	}
-	goto __finally594;
-	__catch594_g_error:
+	goto __finally596;
+	__catch596_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+		GError* _tmp4_;
+		const gchar* _tmp5_;
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		e = _inner_error_;
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1229,7 +1229,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 		_g_error_free0 (e);
 #line 1231 "Upgrades.c"
 	}
-	__finally594:
+	__finally596:
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1275,17 +1275,17 @@ static void mimics_removal_task_upgrade_task_interface_init (UpgradeTaskIface *
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	mimics_removal_task_upgrade_task_parent_iface = g_type_interface_peek_parent (iface);
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
-	iface->get_step_count = (guint64 (*)(UpgradeTask*)) mimics_removal_task_real_get_step_count;
+	iface->get_step_count = (guint64 (*) (UpgradeTask *)) mimics_removal_task_real_get_step_count;
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
-	iface->execute = (void (*)(UpgradeTask*, ProgressMonitor, void*)) mimics_removal_task_real_execute;
+	iface->execute = (void (*) (UpgradeTask *, ProgressMonitor, void*)) mimics_removal_task_real_execute;
 #line 1282 "Upgrades.c"
 }
 
 
 static void mimics_removal_task_instance_init (MimicsRemovalTask * self) {
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self->priv = MIMICS_REMOVAL_TASK_GET_PRIVATE (self);
 #line 68 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1304,7 +1304,7 @@ static void mimics_removal_task_instance_init (MimicsRemovalTask * self) {
 }
 
 
-static void mimics_removal_task_finalize (GObject* obj) {
+static void mimics_removal_task_finalize (GObject * obj) {
 	MimicsRemovalTask * self;
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTask);
@@ -1341,14 +1341,14 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 #line 1342 "Upgrades.c"
 	{
 		GeeArrayList* _phr_list = NULL;
-		PhotoTable* _tmp0_ = NULL;
-		PhotoTable* _tmp1_ = NULL;
-		GeeArrayList* _tmp2_ = NULL;
-		GeeArrayList* _tmp3_ = NULL;
+		PhotoTable* _tmp0_;
+		PhotoTable* _tmp1_;
+		GeeArrayList* _tmp2_;
+		GeeArrayList* _tmp3_;
 		gint _phr_size = 0;
-		GeeArrayList* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+		GeeArrayList* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 		gint _phr_index = 0;
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp0_ = photo_table_get_instance ();
@@ -1375,16 +1375,16 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		while (TRUE) {
 #line 1378 "Upgrades.c"
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
+			gint _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
 			PhotoRow* phr = NULL;
-			GeeArrayList* _tmp10_ = NULL;
-			gint _tmp11_ = 0;
-			gpointer _tmp12_ = NULL;
-			PhotoRow* _tmp13_ = NULL;
-			BackingPhotoRow* _tmp14_ = NULL;
-			PhotoFileFormat _tmp15_ = 0;
+			GeeArrayList* _tmp10_;
+			gint _tmp11_;
+			gpointer _tmp12_;
+			PhotoRow* _tmp13_;
+			BackingPhotoRow* _tmp14_;
+			PhotoFileFormat _tmp15_;
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_tmp7_ = _phr_index;
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1416,7 +1416,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 #line 98 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			if (_tmp15_ == PHOTO_FILE_FORMAT_RAW) {
 #line 1419 "Upgrades.c"
-				gint _tmp16_ = 0;
+				gint _tmp16_;
 #line 99 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_tmp16_ = num_raw_files;
 #line 99 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1448,14 +1448,14 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 #line 1449 "Upgrades.c"
 	{
 		GeeArrayList* _phr_list = NULL;
-		PhotoTable* _tmp0_ = NULL;
-		PhotoTable* _tmp1_ = NULL;
-		GeeArrayList* _tmp2_ = NULL;
-		GeeArrayList* _tmp3_ = NULL;
+		PhotoTable* _tmp0_;
+		PhotoTable* _tmp1_;
+		GeeArrayList* _tmp2_;
+		GeeArrayList* _tmp3_;
 		gint _phr_size = 0;
-		GeeArrayList* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+		GeeArrayList* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 		gint _phr_index = 0;
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp0_ = photo_table_get_instance ();
@@ -1482,17 +1482,17 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		while (TRUE) {
 #line 1485 "Upgrades.c"
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
+			gint _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
 			PhotoRow* phr = NULL;
-			GeeArrayList* _tmp10_ = NULL;
-			gint _tmp11_ = 0;
-			gpointer _tmp12_ = NULL;
+			GeeArrayList* _tmp10_;
+			gint _tmp11_;
+			gpointer _tmp12_;
 			gboolean _tmp13_ = FALSE;
-			PhotoRow* _tmp14_ = NULL;
-			BackingPhotoRow* _tmp15_ = NULL;
-			PhotoFileFormat _tmp16_ = 0;
+			PhotoRow* _tmp14_;
+			BackingPhotoRow* _tmp15_;
+			PhotoFileFormat _tmp16_;
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_tmp7_ = _phr_index;
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1524,8 +1524,8 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			if (_tmp16_ == PHOTO_FILE_FORMAT_RAW) {
 #line 1527 "Upgrades.c"
-				PhotoRow* _tmp17_ = NULL;
-				RawDeveloper _tmp18_ = 0;
+				PhotoRow* _tmp17_;
+				RawDeveloper _tmp18_;
 #line 109 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_tmp17_ = phr;
 #line 109 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1541,11 +1541,11 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			if (_tmp13_) {
 #line 1544 "Upgrades.c"
-				LibraryPhotoSourceCollection* _tmp19_ = NULL;
-				PhotoRow* _tmp20_ = NULL;
-				PhotoID _tmp21_ = {0};
-				LibraryPhoto* _tmp22_ = NULL;
-				LibraryPhoto* _tmp23_ = NULL;
+				LibraryPhotoSourceCollection* _tmp19_;
+				PhotoRow* _tmp20_;
+				PhotoID _tmp21_;
+				LibraryPhoto* _tmp22_;
+				LibraryPhoto* _tmp23_;
 #line 110 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_tmp19_ = library_photo_global;
 #line 110 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1601,9 +1601,9 @@ static void fixup_raw_thumbnails_task_upgrade_task_interface_init (UpgradeTaskIf
 #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	fixup_raw_thumbnails_task_upgrade_task_parent_iface = g_type_interface_peek_parent (iface);
 #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala"
-	iface->get_step_count = (guint64 (*)(UpgradeTask*)) fixup_raw_thumbnails_task_real_get_step_count;
+	iface->get_step_count = (guint64 (*) (UpgradeTask *)) fixup_raw_thumbnails_task_real_get_step_count;
 #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala"
-	iface->execute = (void (*)(UpgradeTask*, ProgressMonitor, void*)) fixup_raw_thumbnails_task_real_execute;
+	iface->execute = (void (*) (UpgradeTask *, ProgressMonitor, void*)) fixup_raw_thumbnails_task_real_execute;
 #line 1608 "Upgrades.c"
 }
 
diff --git a/src/VideoMetadata.c b/src/VideoMetadata.c
index 52b5d2d..c914694 100644
--- a/src/VideoMetadata.c
+++ b/src/VideoMetadata.c
@@ -1,4 +1,4 @@
-/* VideoMetadata.c generated by valac 0.34.7, the Vala compiler
+/* VideoMetadata.c generated by valac 0.36.6, the Vala compiler
  * generated from VideoMetadata.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -283,7 +283,7 @@ gchar* avi_metadata_loader_get_title (AVIMetadataLoader* self);
 static MetadataDateTime* video_metadata_real_get_creation_date_time (MediaMetadata* base);
 static gchar* video_metadata_real_get_title (MediaMetadata* base);
 static gchar* video_metadata_real_get_comment (MediaMetadata* base);
-static void video_metadata_finalize (MediaMetadata* obj);
+static void video_metadata_finalize (MediaMetadata * obj);
 #define QUICK_TIME_METADATA_LOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_QUICK_TIME_METADATA_LOADER, QuickTimeMetadataLoaderPrivate))
 enum  {
 	QUICK_TIME_METADATA_LOADER_DUMMY_PROPERTY
@@ -310,7 +310,7 @@ void quick_time_atom_close_file (QuickTimeAtom* self, GError** error);
 QuickTimeAtom* quick_time_atom_get_first_child_atom (QuickTimeAtom* self);
 guint64 quick_time_atom_section_size_remaining (QuickTimeAtom* self);
 guint32 quick_time_atom_read_uint32 (QuickTimeAtom* self, GError** error);
-static void quick_time_metadata_loader_finalize (QuickTimeMetadataLoader* obj);
+static void quick_time_metadata_loader_finalize (QuickTimeMetadataLoader * obj);
 #define QUICK_TIME_ATOM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_QUICK_TIME_ATOM, QuickTimeAtomPrivate))
 enum  {
 	QUICK_TIME_ATOM_DUMMY_PROPERTY
@@ -322,7 +322,7 @@ guchar quick_time_atom_read_byte (QuickTimeAtom* self, GError** error);
 guint64 quick_time_atom_read_uint64 (QuickTimeAtom* self, GError** error);
 static void quick_time_atom_skip (QuickTimeAtom* self, guint64 skip_amount, GError** error);
 void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error);
-static void quick_time_atom_finalize (QuickTimeAtom* obj);
+static void quick_time_atom_finalize (QuickTimeAtom * obj);
 #define AVI_METADATA_LOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_AVI_METADATA_LOADER, AVIMetadataLoaderPrivate))
 enum  {
 	AVI_METADATA_LOADER_DUMMY_PROPERTY
@@ -359,7 +359,7 @@ void avi_chunk_next_chunk (AVIChunk* self, GError** error);
 static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gchar* sdate);
 static GDateMonth avi_metadata_loader_month_from_string (AVIMetadataLoader* self, const gchar* s);
 void avi_chunk_nonsection_skip (AVIChunk* self, guint64 skip_amount, GError** error);
-static void avi_metadata_loader_finalize (AVIMetadataLoader* obj);
+static void avi_metadata_loader_finalize (AVIMetadataLoader * obj);
 #define AVI_CHUNK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_AVI_CHUNK, AVIChunkPrivate))
 enum  {
 	AVI_CHUNK_DUMMY_PROPERTY
@@ -368,7 +368,7 @@ enum  {
 static AVIChunk* avi_chunk_new_with_input_stream (GDataInputStream* input, AVIChunk* parent);
 static AVIChunk* avi_chunk_construct_with_input_stream (GType object_type, GDataInputStream* input, AVIChunk* parent);
 static void avi_chunk_advance_section_offset (AVIChunk* self, guint64 amount);
-static void avi_chunk_finalize (AVIChunk* obj);
+static void avi_chunk_finalize (AVIChunk * obj);
 
 
 VideoMetadata* video_metadata_construct (GType object_type) {
@@ -391,20 +391,20 @@ VideoMetadata* video_metadata_new (void) {
 static void video_metadata_real_read_from_file (MediaMetadata* base, GFile* file, GError** error) {
 	VideoMetadata * self;
 	QuickTimeMetadataLoader* quicktime = NULL;
-	GFile* _tmp0_ = NULL;
-	QuickTimeMetadataLoader* _tmp1_ = NULL;
-	QuickTimeMetadataLoader* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	GFile* _tmp0_;
+	QuickTimeMetadataLoader* _tmp1_;
+	QuickTimeMetadataLoader* _tmp2_;
+	gboolean _tmp3_;
 	AVIMetadataLoader* avi = NULL;
-	GFile* _tmp8_ = NULL;
-	AVIMetadataLoader* _tmp9_ = NULL;
-	AVIMetadataLoader* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
-	GFile* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	GError* _tmp19_ = NULL;
-	GError* _tmp20_ = NULL;
+	GFile* _tmp8_;
+	AVIMetadataLoader* _tmp9_;
+	AVIMetadataLoader* _tmp10_;
+	gboolean _tmp11_;
+	GFile* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	GError* _tmp19_;
+	GError* _tmp20_;
 	GError * _inner_error_ = NULL;
 #line 19 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_METADATA, VideoMetadata);
@@ -423,10 +423,10 @@ static void video_metadata_real_read_from_file (MediaMetadata* base, GFile* file
 #line 21 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (_tmp3_) {
 #line 426 "VideoMetadata.c"
-		QuickTimeMetadataLoader* _tmp4_ = NULL;
-		MetadataDateTime* _tmp5_ = NULL;
-		QuickTimeMetadataLoader* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		QuickTimeMetadataLoader* _tmp4_;
+		MetadataDateTime* _tmp5_;
+		QuickTimeMetadataLoader* _tmp6_;
+		gchar* _tmp7_;
 #line 22 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp4_ = quicktime;
 #line 22 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -466,10 +466,10 @@ static void video_metadata_real_read_from_file (MediaMetadata* base, GFile* file
 #line 29 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (_tmp11_) {
 #line 469 "VideoMetadata.c"
-		AVIMetadataLoader* _tmp12_ = NULL;
-		MetadataDateTime* _tmp13_ = NULL;
-		AVIMetadataLoader* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
+		AVIMetadataLoader* _tmp12_;
+		MetadataDateTime* _tmp13_;
+		AVIMetadataLoader* _tmp14_;
+		gchar* _tmp15_;
 #line 30 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp12_ = avi;
 #line 30 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -534,8 +534,8 @@ static gpointer _metadata_date_time_ref0 (gpointer self) {
 static MetadataDateTime* video_metadata_real_get_creation_date_time (MediaMetadata* base) {
 	VideoMetadata * self;
 	MetadataDateTime* result = NULL;
-	MetadataDateTime* _tmp0_ = NULL;
-	MetadataDateTime* _tmp1_ = NULL;
+	MetadataDateTime* _tmp0_;
+	MetadataDateTime* _tmp1_;
 #line 39 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_METADATA, VideoMetadata);
 #line 40 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -553,8 +553,8 @@ static MetadataDateTime* video_metadata_real_get_creation_date_time (MediaMetada
 static gchar* video_metadata_real_get_title (MediaMetadata* base) {
 	VideoMetadata * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 43 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_METADATA, VideoMetadata);
 #line 44 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -572,8 +572,8 @@ static gchar* video_metadata_real_get_title (MediaMetadata* base) {
 static gchar* video_metadata_real_get_comment (MediaMetadata* base) {
 	VideoMetadata * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 47 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_METADATA, VideoMetadata);
 #line 48 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -596,13 +596,13 @@ static void video_metadata_class_init (VideoMetadataClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_type_class_add_private (klass, sizeof (VideoMetadataPrivate));
 #line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	((MediaMetadataClass *) klass)->read_from_file = (void (*)(MediaMetadata*, GFile*, GError**)) video_metadata_real_read_from_file;
+	((MediaMetadataClass *) klass)->read_from_file = (void (*) (MediaMetadata *, GFile*, GError**)) video_metadata_real_read_from_file;
 #line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	((MediaMetadataClass *) klass)->get_creation_date_time = (MetadataDateTime* (*)(MediaMetadata*)) video_metadata_real_get_creation_date_time;
+	((MediaMetadataClass *) klass)->get_creation_date_time = (MetadataDateTime* (*) (MediaMetadata *)) video_metadata_real_get_creation_date_time;
 #line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	((MediaMetadataClass *) klass)->get_title = (gchar* (*)(MediaMetadata*)) video_metadata_real_get_title;
+	((MediaMetadataClass *) klass)->get_title = (gchar* (*) (MediaMetadata *)) video_metadata_real_get_title;
 #line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	((MediaMetadataClass *) klass)->get_comment = (gchar* (*)(MediaMetadata*)) video_metadata_real_get_comment;
+	((MediaMetadataClass *) klass)->get_comment = (gchar* (*) (MediaMetadata *)) video_metadata_real_get_comment;
 #line 607 "VideoMetadata.c"
 }
 
@@ -620,7 +620,7 @@ static void video_metadata_instance_init (VideoMetadata * self) {
 }
 
 
-static void video_metadata_finalize (MediaMetadata* obj) {
+static void video_metadata_finalize (MediaMetadata * obj) {
 	VideoMetadata * self;
 #line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_METADATA, VideoMetadata);
@@ -657,8 +657,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 QuickTimeMetadataLoader* quick_time_metadata_loader_construct (GType object_type, GFile* file) {
 	QuickTimeMetadataLoader* self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 61 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 61 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -686,8 +686,8 @@ QuickTimeMetadataLoader* quick_time_metadata_loader_new (GFile* file) {
 
 MetadataDateTime* quick_time_metadata_loader_get_creation_date_time (QuickTimeMetadataLoader* self) {
 	MetadataDateTime* result = NULL;
-	gulong _tmp0_ = 0UL;
-	MetadataDateTime* _tmp1_ = NULL;
+	gulong _tmp0_;
+	MetadataDateTime* _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_QUICK_TIME_METADATA_LOADER (self), NULL);
 #line 66 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -717,8 +717,8 @@ gchar* quick_time_metadata_loader_get_title (QuickTimeMetadataLoader* self) {
 gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) {
 	gboolean result = FALSE;
 	QuickTimeAtom* test = NULL;
-	GFile* _tmp0_ = NULL;
-	QuickTimeAtom* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	QuickTimeAtom* _tmp1_;
 	gboolean ret = FALSE;
 	GError * _inner_error_ = NULL;
 #line 75 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -733,12 +733,12 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 	ret = FALSE;
 #line 735 "VideoMetadata.c"
 	{
-		QuickTimeAtom* _tmp2_ = NULL;
-		QuickTimeAtom* _tmp3_ = NULL;
-		QuickTimeAtom* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+		QuickTimeAtom* _tmp2_;
+		QuickTimeAtom* _tmp3_;
+		QuickTimeAtom* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gboolean _tmp7_;
 #line 80 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp2_ = test;
 #line 80 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -746,7 +746,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 80 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 749 "VideoMetadata.c"
-			goto __catch575_g_error;
+			goto __catch577_g_error;
 		}
 #line 81 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = test;
@@ -755,7 +755,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 81 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 758 "VideoMetadata.c"
-			goto __catch575_g_error;
+			goto __catch577_g_error;
 		}
 #line 84 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp4_ = test;
@@ -776,14 +776,14 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 90 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			while (TRUE) {
 #line 779 "VideoMetadata.c"
-				QuickTimeAtom* _tmp8_ = NULL;
-				gchar* _tmp9_ = NULL;
-				gchar* _tmp10_ = NULL;
-				gboolean _tmp11_ = FALSE;
-				QuickTimeAtom* _tmp12_ = NULL;
-				QuickTimeAtom* _tmp13_ = NULL;
-				QuickTimeAtom* _tmp14_ = NULL;
-				gboolean _tmp15_ = FALSE;
+				QuickTimeAtom* _tmp8_;
+				gchar* _tmp9_;
+				gchar* _tmp10_;
+				gboolean _tmp11_;
+				QuickTimeAtom* _tmp12_;
+				QuickTimeAtom* _tmp13_;
+				QuickTimeAtom* _tmp14_;
+				gboolean _tmp15_;
 #line 91 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_tmp8_ = test;
 #line 91 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -809,7 +809,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 95 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 812 "VideoMetadata.c"
-					goto __catch575_g_error;
+					goto __catch577_g_error;
 				}
 #line 96 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_tmp13_ = test;
@@ -818,7 +818,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 96 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 821 "VideoMetadata.c"
-					goto __catch575_g_error;
+					goto __catch577_g_error;
 				}
 #line 97 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_tmp14_ = test;
@@ -833,15 +833,15 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 			}
 		}
 	}
-	goto __finally575;
-	__catch575_g_error:
+	goto __finally577;
+	__catch577_g_error:
 	{
 		GError* e = NULL;
-		GFile* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-		GError* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
+		GFile* _tmp16_;
+		gchar* _tmp17_;
+		gchar* _tmp18_;
+		GError* _tmp19_;
+		const gchar* _tmp20_;
 #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		e = _inner_error_;
 #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -865,7 +865,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 		_g_error_free0 (e);
 #line 866 "VideoMetadata.c"
 	}
-	__finally575:
+	__finally577:
 #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 871 "VideoMetadata.c"
@@ -881,7 +881,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 881 "VideoMetadata.c"
 	}
 	{
-		QuickTimeAtom* _tmp22_ = NULL;
+		QuickTimeAtom* _tmp22_;
 #line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp22_ = test;
 #line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -889,15 +889,15 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 891 "VideoMetadata.c"
-			goto __catch576_g_error;
+			goto __catch578_g_error;
 		}
 	}
-	goto __finally576;
-	__catch576_g_error:
+	goto __finally578;
+	__catch578_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
+		GError* _tmp23_;
+		const gchar* _tmp24_;
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		e = _inner_error_;
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -912,7 +912,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 		_g_error_free0 (e);
 #line 913 "VideoMetadata.c"
 	}
-	__finally576:
+	__finally578:
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 918 "VideoMetadata.c"
@@ -940,11 +940,11 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (QuickTimeMetadataLoader* self) {
 	gulong result = 0UL;
 	QuickTimeAtom* test = NULL;
-	GFile* _tmp0_ = NULL;
-	QuickTimeAtom* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	QuickTimeAtom* _tmp1_;
 	time_t timestamp = 0;
-	time_t _tmp37_ = 0;
-	time_t _tmp39_ = 0;
+	time_t _tmp37_;
+	time_t _tmp39_;
 	GError * _inner_error_ = NULL;
 #line 114 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_QUICK_TIME_METADATA_LOADER (self), 0UL);
@@ -958,7 +958,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 	timestamp = (time_t) 0;
 #line 959 "VideoMetadata.c"
 	{
-		QuickTimeAtom* _tmp2_ = NULL;
+		QuickTimeAtom* _tmp2_;
 		gboolean done = FALSE;
 #line 119 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp2_ = test;
@@ -967,22 +967,22 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 119 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 969 "VideoMetadata.c"
-			goto __catch577_g_error;
+			goto __catch579_g_error;
 		}
 #line 120 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		done = FALSE;
 #line 121 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		while (TRUE) {
 #line 976 "VideoMetadata.c"
-			gboolean _tmp3_ = FALSE;
-			QuickTimeAtom* _tmp4_ = NULL;
-			QuickTimeAtom* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
-			QuickTimeAtom* _tmp7_ = NULL;
-			gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
-			gboolean _tmp10_ = FALSE;
-			QuickTimeAtom* _tmp29_ = NULL;
+			gboolean _tmp3_;
+			QuickTimeAtom* _tmp4_;
+			QuickTimeAtom* _tmp5_;
+			gboolean _tmp6_;
+			QuickTimeAtom* _tmp7_;
+			gchar* _tmp8_;
+			gchar* _tmp9_;
+			gboolean _tmp10_;
+			QuickTimeAtom* _tmp29_;
 #line 121 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp3_ = done;
 #line 121 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -998,7 +998,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 123 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1000 "VideoMetadata.c"
-				goto __catch577_g_error;
+				goto __catch579_g_error;
 			}
 #line 124 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp5_ = test;
@@ -1024,8 +1024,8 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 			if (_tmp10_) {
 #line 1025 "VideoMetadata.c"
 				QuickTimeAtom* child = NULL;
-				QuickTimeAtom* _tmp11_ = NULL;
-				QuickTimeAtom* _tmp12_ = NULL;
+				QuickTimeAtom* _tmp11_;
+				QuickTimeAtom* _tmp12_;
 #line 126 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_tmp11_ = test;
 #line 126 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1035,16 +1035,16 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 127 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				while (TRUE) {
 #line 1037 "VideoMetadata.c"
-					gboolean _tmp13_ = FALSE;
-					QuickTimeAtom* _tmp14_ = NULL;
+					gboolean _tmp13_;
+					QuickTimeAtom* _tmp14_;
 					gboolean _tmp15_ = FALSE;
-					QuickTimeAtom* _tmp16_ = NULL;
-					gboolean _tmp17_ = FALSE;
-					QuickTimeAtom* _tmp20_ = NULL;
-					gchar* _tmp21_ = NULL;
-					gchar* _tmp22_ = NULL;
-					gboolean _tmp23_ = FALSE;
-					QuickTimeAtom* _tmp28_ = NULL;
+					QuickTimeAtom* _tmp16_;
+					gboolean _tmp17_;
+					QuickTimeAtom* _tmp20_;
+					gchar* _tmp21_;
+					gchar* _tmp22_;
+					gboolean _tmp23_;
+					QuickTimeAtom* _tmp28_;
 #line 127 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp13_ = done;
 #line 127 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1062,7 +1062,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 129 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_quick_time_atom_unref0 (child);
 #line 1064 "VideoMetadata.c"
-						goto __catch577_g_error;
+						goto __catch579_g_error;
 					}
 #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp16_ = child;
@@ -1074,8 +1074,8 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 						_tmp15_ = TRUE;
 #line 1075 "VideoMetadata.c"
 					} else {
-						QuickTimeAtom* _tmp18_ = NULL;
-						guint64 _tmp19_ = 0ULL;
+						QuickTimeAtom* _tmp18_;
+						guint64 _tmp19_;
 #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_tmp18_ = child;
 #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1105,10 +1105,10 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 135 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					if (_tmp23_) {
 #line 1107 "VideoMetadata.c"
-						QuickTimeAtom* _tmp24_ = NULL;
+						QuickTimeAtom* _tmp24_;
 						guint32 _tmp25_ = 0U;
-						QuickTimeAtom* _tmp26_ = NULL;
-						guint32 _tmp27_ = 0U;
+						QuickTimeAtom* _tmp26_;
+						guint32 _tmp27_;
 #line 137 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_tmp24_ = child;
 #line 137 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1118,7 +1118,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 137 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 							_quick_time_atom_unref0 (child);
 #line 1120 "VideoMetadata.c"
-							goto __catch577_g_error;
+							goto __catch579_g_error;
 						}
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_tmp26_ = child;
@@ -1131,7 +1131,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 							_quick_time_atom_unref0 (child);
 #line 1133 "VideoMetadata.c"
-							goto __catch577_g_error;
+							goto __catch579_g_error;
 						}
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						timestamp = _tmp25_ - QUICK_TIME_METADATA_LOADER_QUICKTIME_EPOCH_ADJUSTMENT;
@@ -1150,7 +1150,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 143 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_quick_time_atom_unref0 (child);
 #line 1152 "VideoMetadata.c"
-						goto __catch577_g_error;
+						goto __catch579_g_error;
 					}
 				}
 #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1164,16 +1164,16 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 146 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1166 "VideoMetadata.c"
-				goto __catch577_g_error;
+				goto __catch579_g_error;
 			}
 		}
 	}
-	goto __finally577;
-	__catch577_g_error:
+	goto __finally579;
+	__catch579_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp30_ = NULL;
-		const gchar* _tmp31_ = NULL;
+		GError* _tmp30_;
+		const gchar* _tmp31_;
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		e = _inner_error_;
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1188,7 +1188,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 		_g_error_free0 (e);
 #line 1189 "VideoMetadata.c"
 	}
-	__finally577:
+	__finally579:
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1194 "VideoMetadata.c"
@@ -1204,7 +1204,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 1204 "VideoMetadata.c"
 	}
 	{
-		QuickTimeAtom* _tmp33_ = NULL;
+		QuickTimeAtom* _tmp33_;
 #line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp33_ = test;
 #line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1212,15 +1212,15 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1214 "VideoMetadata.c"
-			goto __catch578_g_error;
+			goto __catch580_g_error;
 		}
 	}
-	goto __finally578;
-	__catch578_g_error:
+	goto __finally580;
+	__catch580_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp34_ = NULL;
-		const gchar* _tmp35_ = NULL;
+		GError* _tmp34_;
+		const gchar* _tmp35_;
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		e = _inner_error_;
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1235,7 +1235,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 		_g_error_free0 (e);
 #line 1236 "VideoMetadata.c"
 	}
-	__finally578:
+	__finally580:
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1241 "VideoMetadata.c"
@@ -1255,7 +1255,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 166 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (_tmp37_ < ((time_t) 0)) {
 #line 1257 "VideoMetadata.c"
-		time_t _tmp38_ = 0;
+		time_t _tmp38_;
 #line 167 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp38_ = timestamp;
 #line 167 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1316,7 +1316,7 @@ static gchar* value_quick_time_metadata_loader_collect_value (GValue* value, gui
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (collect_values[0].v_pointer) {
 #line 1318 "VideoMetadata.c"
-		QuickTimeMetadataLoader* object;
+		QuickTimeMetadataLoader * object;
 		object = collect_values[0].v_pointer;
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1343,7 +1343,7 @@ static gchar* value_quick_time_metadata_loader_collect_value (GValue* value, gui
 
 
 static gchar* value_quick_time_metadata_loader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	QuickTimeMetadataLoader** object_p;
+	QuickTimeMetadataLoader ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (!object_p) {
@@ -1395,7 +1395,7 @@ gpointer value_get_quick_time_metadata_loader (const GValue* value) {
 
 
 void value_set_quick_time_metadata_loader (GValue* value, gpointer v_object) {
-	QuickTimeMetadataLoader* old;
+	QuickTimeMetadataLoader * old;
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_METADATA_LOADER));
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1426,7 +1426,7 @@ void value_set_quick_time_metadata_loader (GValue* value, gpointer v_object) {
 
 
 void value_take_quick_time_metadata_loader (GValue* value, gpointer v_object) {
-	QuickTimeMetadataLoader* old;
+	QuickTimeMetadataLoader * old;
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_METADATA_LOADER));
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1476,7 +1476,7 @@ static void quick_time_metadata_loader_instance_init (QuickTimeMetadataLoader *
 }
 
 
-static void quick_time_metadata_loader_finalize (QuickTimeMetadataLoader* obj) {
+static void quick_time_metadata_loader_finalize (QuickTimeMetadataLoader * obj) {
 	QuickTimeMetadataLoader * self;
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_QUICK_TIME_METADATA_LOADER, QuickTimeMetadataLoader);
@@ -1503,7 +1503,7 @@ GType quick_time_metadata_loader_get_type (void) {
 
 
 gpointer quick_time_metadata_loader_ref (gpointer instance) {
-	QuickTimeMetadataLoader* self;
+	QuickTimeMetadataLoader * self;
 	self = instance;
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1514,7 +1514,7 @@ gpointer quick_time_metadata_loader_ref (gpointer instance) {
 
 
 void quick_time_metadata_loader_unref (gpointer instance) {
-	QuickTimeMetadataLoader* self;
+	QuickTimeMetadataLoader * self;
 	self = instance;
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1529,8 +1529,8 @@ void quick_time_metadata_loader_unref (gpointer instance) {
 
 QuickTimeAtom* quick_time_atom_construct (GType object_type, GFile* file) {
 	QuickTimeAtom* self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 181 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 181 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1565,10 +1565,10 @@ static gpointer _quick_time_atom_ref0 (gpointer self) {
 
 static QuickTimeAtom* quick_time_atom_construct_with_input_stream (GType object_type, GDataInputStream* input, QuickTimeAtom* parent) {
 	QuickTimeAtom* self = NULL;
-	GDataInputStream* _tmp0_ = NULL;
-	GDataInputStream* _tmp1_ = NULL;
-	QuickTimeAtom* _tmp2_ = NULL;
-	QuickTimeAtom* _tmp3_ = NULL;
+	GDataInputStream* _tmp0_;
+	GDataInputStream* _tmp1_;
+	QuickTimeAtom* _tmp2_;
+	QuickTimeAtom* _tmp3_;
 #line 185 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (G_IS_DATA_INPUT_STREAM (input), NULL);
 #line 185 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1606,11 +1606,11 @@ static QuickTimeAtom* quick_time_atom_new_with_input_stream (GDataInputStream* i
 
 void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) {
 	GFileInputStream* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFileInputStream* _tmp2_ = NULL;
-	GDataInputStream* _tmp3_ = NULL;
-	GDataInputStream* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	GFile* _tmp1_;
+	GFileInputStream* _tmp2_;
+	GDataInputStream* _tmp3_;
+	GDataInputStream* _tmp4_;
+	gchar* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 190 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (IS_QUICK_TIME_ATOM (self));
@@ -1665,7 +1665,7 @@ void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) {
 
 
 void quick_time_atom_close_file (QuickTimeAtom* self, GError** error) {
-	GDataInputStream* _tmp0_ = NULL;
+	GDataInputStream* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 199 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (IS_QUICK_TIME_ATOM (self));
@@ -1674,7 +1674,7 @@ void quick_time_atom_close_file (QuickTimeAtom* self, GError** error) {
 #line 200 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (NULL != _tmp0_) {
 #line 1676 "VideoMetadata.c"
-		GDataInputStream* _tmp1_ = NULL;
+		GDataInputStream* _tmp1_;
 #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp1_ = self->priv->input;
 #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1697,9 +1697,9 @@ void quick_time_atom_close_file (QuickTimeAtom* self, GError** error) {
 
 
 static void quick_time_atom_advance_section_offset (QuickTimeAtom* self, guint64 amount) {
-	guint64 _tmp0_ = 0ULL;
-	guint64 _tmp1_ = 0ULL;
-	QuickTimeAtom* _tmp2_ = NULL;
+	guint64 _tmp0_;
+	guint64 _tmp1_;
+	QuickTimeAtom* _tmp2_;
 #line 206 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (IS_QUICK_TIME_ATOM (self));
 #line 207 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1713,8 +1713,8 @@ static void quick_time_atom_advance_section_offset (QuickTimeAtom* self, guint64
 #line 208 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (NULL != _tmp2_) {
 #line 1715 "VideoMetadata.c"
-		QuickTimeAtom* _tmp3_ = NULL;
-		guint64 _tmp4_ = 0ULL;
+		QuickTimeAtom* _tmp3_;
+		guint64 _tmp4_;
 #line 209 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = self->priv->parent;
 #line 209 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1728,8 +1728,8 @@ static void quick_time_atom_advance_section_offset (QuickTimeAtom* self, guint64
 
 QuickTimeAtom* quick_time_atom_get_first_child_atom (QuickTimeAtom* self) {
 	QuickTimeAtom* result = NULL;
-	GDataInputStream* _tmp0_ = NULL;
-	QuickTimeAtom* _tmp1_ = NULL;
+	GDataInputStream* _tmp0_;
+	QuickTimeAtom* _tmp1_;
 #line 213 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_QUICK_TIME_ATOM (self), NULL);
 #line 219 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1747,8 +1747,8 @@ QuickTimeAtom* quick_time_atom_get_first_child_atom (QuickTimeAtom* self) {
 guchar quick_time_atom_read_byte (QuickTimeAtom* self, GError** error) {
 	guchar result = '\0';
 	guint8 _tmp0_ = 0U;
-	GDataInputStream* _tmp1_ = NULL;
-	guint8 _tmp2_ = 0U;
+	GDataInputStream* _tmp1_;
+	guint8 _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 222 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_QUICK_TIME_ATOM (self), '\0');
@@ -1781,8 +1781,8 @@ guchar quick_time_atom_read_byte (QuickTimeAtom* self, GError** error) {
 guint32 quick_time_atom_read_uint32 (QuickTimeAtom* self, GError** error) {
 	guint32 result = 0U;
 	guint32 _tmp0_ = 0U;
-	GDataInputStream* _tmp1_ = NULL;
-	guint32 _tmp2_ = 0U;
+	GDataInputStream* _tmp1_;
+	guint32 _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 227 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_QUICK_TIME_ATOM (self), 0U);
@@ -1815,8 +1815,8 @@ guint32 quick_time_atom_read_uint32 (QuickTimeAtom* self, GError** error) {
 guint64 quick_time_atom_read_uint64 (QuickTimeAtom* self, GError** error) {
 	guint64 result = 0ULL;
 	guint64 _tmp0_ = 0ULL;
-	GDataInputStream* _tmp1_ = NULL;
-	guint64 _tmp2_ = 0ULL;
+	GDataInputStream* _tmp1_;
+	guint64 _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 232 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_QUICK_TIME_ATOM (self), 0ULL);
@@ -1848,17 +1848,17 @@ guint64 quick_time_atom_read_uint64 (QuickTimeAtom* self, GError** error) {
 
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_ = 0L;
-	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 1863 "VideoMetadata.c"
 }
@@ -1866,28 +1866,28 @@ static gchar string_get (const gchar* self, glong index) {
 
 void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 	guint32 _tmp0_ = 0U;
-	guint32 _tmp1_ = 0U;
+	guint32 _tmp1_;
 	GString* sb = NULL;
-	GString* _tmp2_ = NULL;
+	GString* _tmp2_;
 	guchar _tmp3_ = '\0';
-	guchar _tmp4_ = '\0';
-	GString* _tmp5_ = NULL;
+	guchar _tmp4_;
+	GString* _tmp5_;
 	guchar _tmp6_ = '\0';
-	guchar _tmp7_ = '\0';
-	GString* _tmp8_ = NULL;
+	guchar _tmp7_;
+	GString* _tmp8_;
 	guchar _tmp9_ = '\0';
-	guchar _tmp10_ = '\0';
-	GString* _tmp11_ = NULL;
+	guchar _tmp10_;
+	GString* _tmp11_;
 	guchar _tmp12_ = '\0';
-	guchar _tmp13_ = '\0';
-	GString* _tmp14_ = NULL;
-	GString* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	guint64 _tmp41_ = 0ULL;
+	guchar _tmp13_;
+	GString* _tmp14_;
+	GString* _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
+	const gchar* _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
+	guint64 _tmp41_;
 	GError * _inner_error_ = NULL;
 #line 237 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (IS_QUICK_TIME_ATOM (self));
@@ -2000,11 +2000,11 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 #line 250 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (_tmp20_ != 4) {
 #line 2002 "VideoMetadata.c"
-		GFile* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
-		GError* _tmp24_ = NULL;
-		GError* _tmp25_ = NULL;
+		GFile* _tmp21_;
+		gchar* _tmp22_;
+		gchar* _tmp23_;
+		GError* _tmp24_;
+		GError* _tmp25_;
 #line 251 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp21_ = self->priv->file;
 #line 251 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2039,18 +2039,18 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			while (TRUE) {
 #line 2041 "VideoMetadata.c"
-				gint _tmp28_ = 0;
-				const gchar* _tmp29_ = NULL;
-				gint _tmp30_ = 0;
-				gint _tmp31_ = 0;
-				const gchar* _tmp32_ = NULL;
-				gint _tmp33_ = 0;
-				gchar _tmp34_ = '\0';
-				gboolean _tmp35_ = FALSE;
+				gint _tmp28_;
+				const gchar* _tmp29_;
+				gint _tmp30_;
+				gint _tmp31_;
+				const gchar* _tmp32_;
+				gint _tmp33_;
+				gchar _tmp34_;
+				gboolean _tmp35_;
 #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				if (!_tmp26_) {
 #line 2052 "VideoMetadata.c"
-					gint _tmp27_ = 0;
+					gint _tmp27_;
 #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp27_ = i;
 #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2084,11 +2084,11 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 #line 255 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				if (!_tmp35_) {
 #line 2086 "VideoMetadata.c"
-					GFile* _tmp36_ = NULL;
-					gchar* _tmp37_ = NULL;
-					gchar* _tmp38_ = NULL;
-					GError* _tmp39_ = NULL;
-					GError* _tmp40_ = NULL;
+					GFile* _tmp36_;
+					gchar* _tmp37_;
+					gchar* _tmp38_;
+					GError* _tmp39_;
+					GError* _tmp40_;
 #line 256 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp36_ = self->priv->file;
 #line 256 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2120,7 +2120,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 	if (((guint64) 1) == _tmp41_) {
 #line 2121 "VideoMetadata.c"
 		guint64 _tmp42_ = 0ULL;
-		guint64 _tmp43_ = 0ULL;
+		guint64 _tmp43_;
 #line 263 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp43_ = quick_time_atom_read_uint64 (self, &_inner_error_);
 #line 263 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2146,8 +2146,8 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 
 
 static void quick_time_atom_skip (QuickTimeAtom* self, guint64 skip_amount, GError** error) {
-	GDataInputStream* _tmp0_ = NULL;
-	guint64 _tmp1_ = 0ULL;
+	GDataInputStream* _tmp0_;
+	guint64 _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 267 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (IS_QUICK_TIME_ATOM (self));
@@ -2170,10 +2170,10 @@ static void quick_time_atom_skip (QuickTimeAtom* self, guint64 skip_amount, GErr
 
 guint64 quick_time_atom_section_size_remaining (QuickTimeAtom* self) {
 	guint64 result = 0ULL;
-	guint64 _tmp0_ = 0ULL;
-	guint64 _tmp1_ = 0ULL;
-	guint64 _tmp2_ = 0ULL;
-	guint64 _tmp3_ = 0ULL;
+	guint64 _tmp0_;
+	guint64 _tmp1_;
+	guint64 _tmp2_;
+	guint64 _tmp3_;
 #line 271 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_QUICK_TIME_ATOM (self), 0ULL);
 #line 272 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2195,7 +2195,7 @@ guint64 quick_time_atom_section_size_remaining (QuickTimeAtom* self) {
 
 
 void quick_time_atom_next_atom (QuickTimeAtom* self, GError** error) {
-	guint64 _tmp0_ = 0ULL;
+	guint64 _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 276 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (IS_QUICK_TIME_ATOM (self));
@@ -2221,8 +2221,8 @@ void quick_time_atom_next_atom (QuickTimeAtom* self, GError** error) {
 
 gchar* quick_time_atom_get_current_atom_name (QuickTimeAtom* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 282 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_QUICK_TIME_ATOM (self), NULL);
 #line 283 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2239,7 +2239,7 @@ gchar* quick_time_atom_get_current_atom_name (QuickTimeAtom* self) {
 
 gboolean quick_time_atom_is_last_atom (QuickTimeAtom* self) {
 	gboolean result = FALSE;
-	guint64 _tmp0_ = 0ULL;
+	guint64 _tmp0_;
 #line 286 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_QUICK_TIME_ATOM (self), FALSE);
 #line 287 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2294,7 +2294,7 @@ static gchar* value_quick_time_atom_collect_value (GValue* value, guint n_collec
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (collect_values[0].v_pointer) {
 #line 2296 "VideoMetadata.c"
-		QuickTimeAtom* object;
+		QuickTimeAtom * object;
 		object = collect_values[0].v_pointer;
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -2321,7 +2321,7 @@ static gchar* value_quick_time_atom_collect_value (GValue* value, guint n_collec
 
 
 static gchar* value_quick_time_atom_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	QuickTimeAtom** object_p;
+	QuickTimeAtom ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (!object_p) {
@@ -2373,7 +2373,7 @@ gpointer value_get_quick_time_atom (const GValue* value) {
 
 
 void value_set_quick_time_atom (GValue* value, gpointer v_object) {
-	QuickTimeAtom* old;
+	QuickTimeAtom * old;
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_ATOM));
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2404,7 +2404,7 @@ void value_set_quick_time_atom (GValue* value, gpointer v_object) {
 
 
 void value_take_quick_time_atom (GValue* value, gpointer v_object) {
-	QuickTimeAtom* old;
+	QuickTimeAtom * old;
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_ATOM));
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2444,7 +2444,7 @@ static void quick_time_atom_class_init (QuickTimeAtomClass * klass) {
 
 
 static void quick_time_atom_instance_init (QuickTimeAtom * self) {
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self->priv = QUICK_TIME_ATOM_GET_PRIVATE (self);
 #line 174 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2467,7 +2467,7 @@ static void quick_time_atom_instance_init (QuickTimeAtom * self) {
 }
 
 
-static void quick_time_atom_finalize (QuickTimeAtom* obj) {
+static void quick_time_atom_finalize (QuickTimeAtom * obj) {
 	QuickTimeAtom * self;
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_QUICK_TIME_ATOM, QuickTimeAtom);
@@ -2500,7 +2500,7 @@ GType quick_time_atom_get_type (void) {
 
 
 gpointer quick_time_atom_ref (gpointer instance) {
-	QuickTimeAtom* self;
+	QuickTimeAtom * self;
 	self = instance;
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -2511,7 +2511,7 @@ gpointer quick_time_atom_ref (gpointer instance) {
 
 
 void quick_time_atom_unref (gpointer instance) {
-	QuickTimeAtom* self;
+	QuickTimeAtom * self;
 	self = instance;
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2526,8 +2526,8 @@ void quick_time_atom_unref (gpointer instance) {
 
 AVIMetadataLoader* avi_metadata_loader_construct (GType object_type, GFile* file) {
 	AVIMetadataLoader* self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 305 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 305 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2555,8 +2555,8 @@ AVIMetadataLoader* avi_metadata_loader_new (GFile* file) {
 
 MetadataDateTime* avi_metadata_loader_get_creation_date_time (AVIMetadataLoader* self) {
 	MetadataDateTime* result = NULL;
-	gulong _tmp0_ = 0UL;
-	MetadataDateTime* _tmp1_ = NULL;
+	gulong _tmp0_;
+	MetadataDateTime* _tmp1_;
 #line 309 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_AVI_METADATA_LOADER (self), NULL);
 #line 310 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2586,8 +2586,8 @@ gchar* avi_metadata_loader_get_title (AVIMetadataLoader* self) {
 gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 	gboolean result = FALSE;
 	AVIChunk* chunk = NULL;
-	GFile* _tmp0_ = NULL;
-	AVIChunk* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	AVIChunk* _tmp1_;
 	gboolean ret = FALSE;
 	GError * _inner_error_ = NULL;
 #line 319 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2602,13 +2602,13 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 	ret = FALSE;
 #line 2603 "VideoMetadata.c"
 	{
-		AVIChunk* _tmp2_ = NULL;
-		AVIChunk* _tmp3_ = NULL;
+		AVIChunk* _tmp2_;
+		AVIChunk* _tmp3_;
 		gboolean _tmp4_ = FALSE;
-		AVIChunk* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gboolean _tmp8_ = FALSE;
+		AVIChunk* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		gboolean _tmp8_;
 #line 323 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp2_ = chunk;
 #line 323 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2616,7 +2616,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 323 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2618 "VideoMetadata.c"
-			goto __catch579_g_error;
+			goto __catch581_g_error;
 		}
 #line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = chunk;
@@ -2625,7 +2625,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2627 "VideoMetadata.c"
-			goto __catch579_g_error;
+			goto __catch581_g_error;
 		}
 #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp5_ = chunk;
@@ -2641,10 +2641,8 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 		if (_tmp8_) {
 #line 2642 "VideoMetadata.c"
 			gchar* _tmp9_ = NULL;
-			AVIChunk* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-			gchar* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
+			AVIChunk* _tmp10_;
+			gchar* _tmp11_;
 #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp10_ = chunk;
 #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2653,59 +2651,51 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 			_tmp9_ = _tmp11_;
 #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2656 "VideoMetadata.c"
-				goto __catch579_g_error;
+#line 2654 "VideoMetadata.c"
+				goto __catch581_g_error;
 			}
 #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-			_tmp12_ = _tmp9_;
-#line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-			_tmp9_ = NULL;
-#line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-			_tmp13_ = _tmp12_;
-#line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-			_tmp4_ = g_strcmp0 ("AVI ", _tmp13_) == 0;
-#line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-			_g_free0 (_tmp13_);
+			_tmp4_ = g_strcmp0 ("AVI ", _tmp9_) == 0;
 #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_g_free0 (_tmp9_);
-#line 2671 "VideoMetadata.c"
+#line 2661 "VideoMetadata.c"
 		} else {
 #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp4_ = FALSE;
-#line 2675 "VideoMetadata.c"
+#line 2665 "VideoMetadata.c"
 		}
 #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (_tmp4_) {
 #line 328 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			ret = TRUE;
-#line 2681 "VideoMetadata.c"
+#line 2671 "VideoMetadata.c"
 		}
 	}
-	goto __finally579;
-	__catch579_g_error:
+	goto __finally581;
+	__catch581_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
+		GError* _tmp12_;
+		const gchar* _tmp13_;
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		e = _inner_error_;
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_inner_error_ = NULL;
 #line 331 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		_tmp14_ = e;
+		_tmp12_ = e;
 #line 331 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		_tmp15_ = _tmp14_->message;
+		_tmp13_ = _tmp12_->message;
 #line 331 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		g_debug ("VideoMetadata.vala:331: Error while testing for AVI file: %s", _tmp15_);
+		g_debug ("VideoMetadata.vala:331: Error while testing for AVI file: %s", _tmp13_);
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_g_error_free0 (e);
-#line 2702 "VideoMetadata.c"
+#line 2692 "VideoMetadata.c"
 	}
-	__finally579:
+	__finally581:
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2707 "VideoMetadata.c"
-		gboolean _tmp16_ = FALSE;
+#line 2697 "VideoMetadata.c"
+		gboolean _tmp14_ = FALSE;
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_avi_chunk_unref0 (chunk);
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2713,46 +2703,46 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		g_clear_error (&_inner_error_);
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		return _tmp16_;
-#line 2717 "VideoMetadata.c"
+		return _tmp14_;
+#line 2707 "VideoMetadata.c"
 	}
 	{
-		AVIChunk* _tmp17_ = NULL;
+		AVIChunk* _tmp15_;
 #line 335 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		_tmp17_ = chunk;
+		_tmp15_ = chunk;
 #line 335 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		avi_chunk_close_file (_tmp17_, &_inner_error_);
+		avi_chunk_close_file (_tmp15_, &_inner_error_);
 #line 335 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2727 "VideoMetadata.c"
-			goto __catch580_g_error;
+#line 2717 "VideoMetadata.c"
+			goto __catch582_g_error;
 		}
 	}
-	goto __finally580;
-	__catch580_g_error:
+	goto __finally582;
+	__catch582_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
+		GError* _tmp16_;
+		const gchar* _tmp17_;
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		e = _inner_error_;
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_inner_error_ = NULL;
 #line 337 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		_tmp18_ = e;
+		_tmp16_ = e;
 #line 337 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		_tmp19_ = _tmp18_->message;
+		_tmp17_ = _tmp16_->message;
 #line 337 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		g_debug ("VideoMetadata.vala:337: Error while closing AVI file: %s", _tmp19_);
+		g_debug ("VideoMetadata.vala:337: Error while closing AVI file: %s", _tmp17_);
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_g_error_free0 (e);
-#line 2749 "VideoMetadata.c"
+#line 2739 "VideoMetadata.c"
 	}
-	__finally580:
+	__finally582:
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2754 "VideoMetadata.c"
-		gboolean _tmp20_ = FALSE;
+#line 2744 "VideoMetadata.c"
+		gboolean _tmp18_ = FALSE;
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_avi_chunk_unref0 (chunk);
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2760,8 +2750,8 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		g_clear_error (&_inner_error_);
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		return _tmp20_;
-#line 2764 "VideoMetadata.c"
+		return _tmp18_;
+#line 2754 "VideoMetadata.c"
 	}
 #line 339 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	result = ret;
@@ -2769,15 +2759,15 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 	_avi_chunk_unref0 (chunk);
 #line 339 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 2772 "VideoMetadata.c"
+#line 2762 "VideoMetadata.c"
 }
 
 
 static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, AVIChunk* chunk, GError** error) {
 	gchar* result = NULL;
 	gboolean found_date = FALSE;
-	gboolean _tmp9_ = FALSE;
-	gchar* _tmp21_ = NULL;
+	gboolean _tmp9_;
+	gchar* _tmp21_;
 	GError * _inner_error_ = NULL;
 #line 343 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_AVI_METADATA_LOADER (self), NULL);
@@ -2787,18 +2777,18 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self,
 	found_date = FALSE;
 #line 345 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	while (TRUE) {
-#line 2790 "VideoMetadata.c"
-		AVIChunk* _tmp0_ = NULL;
-		guint64 _tmp1_ = 0ULL;
+#line 2780 "VideoMetadata.c"
+		AVIChunk* _tmp0_;
+		guint64 _tmp1_;
 		guint16 tag = 0U;
-		AVIChunk* _tmp2_ = NULL;
-		guint16 _tmp3_ = 0U;
+		AVIChunk* _tmp2_;
+		guint16 _tmp3_;
 		guint16 size = 0U;
-		AVIChunk* _tmp4_ = NULL;
-		guint16 _tmp5_ = 0U;
-		guint16 _tmp6_ = 0U;
-		AVIChunk* _tmp7_ = NULL;
-		guint16 _tmp8_ = 0U;
+		AVIChunk* _tmp4_;
+		guint16 _tmp5_;
+		guint16 _tmp6_;
+		AVIChunk* _tmp7_;
+		guint16 _tmp8_;
 #line 345 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp0_ = chunk;
 #line 345 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2807,7 +2797,7 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self,
 		if (!(_tmp1_ > ((guint64) (sizeof (guint16) * 2)))) {
 #line 345 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			break;
-#line 2810 "VideoMetadata.c"
+#line 2800 "VideoMetadata.c"
 		}
 #line 346 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp2_ = chunk;
@@ -2821,7 +2811,7 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self,
 			g_propagate_error (error, _inner_error_);
 #line 346 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return NULL;
-#line 2824 "VideoMetadata.c"
+#line 2814 "VideoMetadata.c"
 		}
 #line 347 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp4_ = chunk;
@@ -2835,7 +2825,7 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self,
 			g_propagate_error (error, _inner_error_);
 #line 347 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return NULL;
-#line 2838 "VideoMetadata.c"
+#line 2828 "VideoMetadata.c"
 		}
 #line 348 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp6_ = tag;
@@ -2845,7 +2835,7 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self,
 			found_date = TRUE;
 #line 350 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			break;
-#line 2848 "VideoMetadata.c"
+#line 2838 "VideoMetadata.c"
 		}
 #line 352 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp7_ = chunk;
@@ -2859,50 +2849,50 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self,
 			g_propagate_error (error, _inner_error_);
 #line 352 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return NULL;
-#line 2862 "VideoMetadata.c"
+#line 2852 "VideoMetadata.c"
 		}
 	}
 #line 355 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp9_ = found_date;
 #line 355 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (_tmp9_) {
-#line 2869 "VideoMetadata.c"
+#line 2859 "VideoMetadata.c"
 		GString* sb = NULL;
-		GString* _tmp10_ = NULL;
-		GString* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
+		GString* _tmp10_;
+		GString* _tmp18_;
+		const gchar* _tmp19_;
+		gchar* _tmp20_;
 #line 357 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp10_ = g_string_new ("");
 #line 357 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		sb = _tmp10_;
-#line 2879 "VideoMetadata.c"
+#line 2869 "VideoMetadata.c"
 		{
 			gint i = 0;
 #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			i = 0;
-#line 2884 "VideoMetadata.c"
+#line 2874 "VideoMetadata.c"
 			{
 				gboolean _tmp11_ = FALSE;
 #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_tmp11_ = TRUE;
 #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				while (TRUE) {
-#line 2891 "VideoMetadata.c"
-					gint _tmp13_ = 0;
+#line 2881 "VideoMetadata.c"
+					gint _tmp13_;
 					guchar _tmp14_ = '\0';
-					AVIChunk* _tmp15_ = NULL;
-					guchar _tmp16_ = '\0';
-					GString* _tmp17_ = NULL;
+					AVIChunk* _tmp15_;
+					guchar _tmp16_;
+					GString* _tmp17_;
 #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					if (!_tmp11_) {
-#line 2899 "VideoMetadata.c"
-						gint _tmp12_ = 0;
+#line 2889 "VideoMetadata.c"
+						gint _tmp12_;
 #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_tmp12_ = i;
 #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						i = _tmp12_ + 1;
-#line 2905 "VideoMetadata.c"
+#line 2895 "VideoMetadata.c"
 					}
 #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp11_ = FALSE;
@@ -2912,7 +2902,7 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self,
 					if (!(_tmp13_ < AVI_METADATA_LOADER_NUMERICAL_DATE_LENGTH)) {
 #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						break;
-#line 2915 "VideoMetadata.c"
+#line 2905 "VideoMetadata.c"
 					}
 #line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp15_ = chunk;
@@ -2928,13 +2918,13 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self,
 						_g_string_free0 (sb);
 #line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						return NULL;
-#line 2931 "VideoMetadata.c"
+#line 2921 "VideoMetadata.c"
 					}
 #line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp17_ = sb;
 #line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					g_string_append_c (_tmp17_, (gchar) _tmp14_);
-#line 2937 "VideoMetadata.c"
+#line 2927 "VideoMetadata.c"
 				}
 			}
 		}
@@ -2950,7 +2940,7 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self,
 		_g_string_free0 (sb);
 #line 361 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return result;
-#line 2953 "VideoMetadata.c"
+#line 2943 "VideoMetadata.c"
 	}
 #line 363 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp21_ = g_strdup ("");
@@ -2958,50 +2948,50 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self,
 	result = _tmp21_;
 #line 363 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 2961 "VideoMetadata.c"
+#line 2951 "VideoMetadata.c"
 }
 
 
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 2984 "VideoMetadata.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2974 "VideoMetadata.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2992 "VideoMetadata.c"
+#line 2982 "VideoMetadata.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 3004 "VideoMetadata.c"
+#line 2994 "VideoMetadata.c"
 	}
 }
 
@@ -3010,145 +3000,145 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 3028 "VideoMetadata.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3018 "VideoMetadata.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 3034 "VideoMetadata.c"
+#line 3024 "VideoMetadata.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 3038 "VideoMetadata.c"
+#line 3028 "VideoMetadata.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 3042 "VideoMetadata.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3032 "VideoMetadata.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 3054 "VideoMetadata.c"
+#line 3044 "VideoMetadata.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 3064 "VideoMetadata.c"
+#line 3054 "VideoMetadata.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 3070 "VideoMetadata.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3060 "VideoMetadata.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 3084 "VideoMetadata.c"
+#line 3074 "VideoMetadata.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 3094 "VideoMetadata.c"
+#line 3084 "VideoMetadata.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 3100 "VideoMetadata.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3090 "VideoMetadata.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 3109 "VideoMetadata.c"
+#line 3099 "VideoMetadata.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 3129 "VideoMetadata.c"
+#line 3119 "VideoMetadata.c"
 }
 
 
 static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, AVIChunk* chunk, GError** error) {
 	gchar* result = NULL;
-	AVIChunk* _tmp0_ = NULL;
-	AVIChunk* _tmp1_ = NULL;
+	AVIChunk* _tmp0_;
+	AVIChunk* _tmp1_;
 	gint colons = 0;
 	gint post_colons = 0;
 	GString* sb = NULL;
-	GString* _tmp2_ = NULL;
-	GString* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	gint _tmp23_ = 0;
-	GString* _tmp25_ = NULL;
-	const gchar* _tmp26_ = NULL;
-	GString* _tmp27_ = NULL;
-	const gchar* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	gint _tmp30_ = 0;
-	gchar* _tmp31_ = NULL;
+	GString* _tmp2_;
+	GString* _tmp20_;
+	const gchar* _tmp21_;
+	gint _tmp22_;
+	gint _tmp23_;
+	GString* _tmp25_;
+	const gchar* _tmp26_;
+	GString* _tmp27_;
+	const gchar* _tmp28_;
+	gint _tmp29_;
+	gint _tmp30_;
+	gchar* _tmp31_;
 	GError * _inner_error_ = NULL;
 #line 368 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_AVI_METADATA_LOADER (self), NULL);
@@ -3164,7 +3154,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A
 		g_propagate_error (error, _inner_error_);
 #line 369 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return NULL;
-#line 3167 "VideoMetadata.c"
+#line 3157 "VideoMetadata.c"
 	}
 #line 370 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp1_ = chunk;
@@ -3176,7 +3166,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A
 		g_propagate_error (error, _inner_error_);
 #line 370 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return NULL;
-#line 3179 "VideoMetadata.c"
+#line 3169 "VideoMetadata.c"
 	}
 #line 372 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	colons = 0;
@@ -3188,40 +3178,40 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A
 	sb = _tmp2_;
 #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	while (TRUE) {
-#line 3191 "VideoMetadata.c"
+#line 3181 "VideoMetadata.c"
 		gboolean _tmp3_ = FALSE;
-		gint _tmp4_ = 0;
+		gint _tmp4_;
 		guchar _tmp6_ = '\0';
-		AVIChunk* _tmp7_ = NULL;
-		guchar _tmp8_ = '\0';
+		AVIChunk* _tmp7_;
+		guchar _tmp8_;
 		gchar c = '\0';
-		gint _tmp9_ = 0;
-		gchar _tmp11_ = '\0';
-		gchar _tmp13_ = '\0';
-		gboolean _tmp14_ = FALSE;
-		GString* _tmp17_ = NULL;
-		gssize _tmp18_ = 0L;
+		gint _tmp9_;
+		gchar _tmp11_;
+		gchar _tmp13_;
+		gboolean _tmp14_;
+		GString* _tmp17_;
+		gssize _tmp18_;
 #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp4_ = colons;
 #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (_tmp4_ <= 4) {
-#line 3208 "VideoMetadata.c"
-			gint _tmp5_ = 0;
+#line 3198 "VideoMetadata.c"
+			gint _tmp5_;
 #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp5_ = post_colons;
 #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp3_ = _tmp5_ < 2;
-#line 3214 "VideoMetadata.c"
+#line 3204 "VideoMetadata.c"
 		} else {
 #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp3_ = FALSE;
-#line 3218 "VideoMetadata.c"
+#line 3208 "VideoMetadata.c"
 		}
 #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (!_tmp3_) {
 #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			break;
-#line 3224 "VideoMetadata.c"
+#line 3214 "VideoMetadata.c"
 		}
 #line 377 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp7_ = chunk;
@@ -3237,7 +3227,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A
 			_g_string_free0 (sb);
 #line 377 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return NULL;
-#line 3240 "VideoMetadata.c"
+#line 3230 "VideoMetadata.c"
 		}
 #line 377 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		c = (gchar) _tmp6_;
@@ -3245,25 +3235,25 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A
 		_tmp9_ = colons;
 #line 378 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (4 == _tmp9_) {
-#line 3248 "VideoMetadata.c"
-			gint _tmp10_ = 0;
+#line 3238 "VideoMetadata.c"
+			gint _tmp10_;
 #line 379 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp10_ = post_colons;
 #line 379 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			post_colons = _tmp10_ + 1;
-#line 3254 "VideoMetadata.c"
+#line 3244 "VideoMetadata.c"
 		}
 #line 381 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp11_ = c;
 #line 381 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (':' == _tmp11_) {
-#line 3260 "VideoMetadata.c"
-			gint _tmp12_ = 0;
+#line 3250 "VideoMetadata.c"
+			gint _tmp12_;
 #line 382 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp12_ = colons;
 #line 382 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			colons = _tmp12_ + 1;
-#line 3266 "VideoMetadata.c"
+#line 3256 "VideoMetadata.c"
 		}
 #line 384 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp13_ = c;
@@ -3271,16 +3261,16 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A
 		_tmp14_ = g_ascii_isprint (_tmp13_);
 #line 384 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (_tmp14_) {
-#line 3274 "VideoMetadata.c"
-			GString* _tmp15_ = NULL;
-			gchar _tmp16_ = '\0';
+#line 3264 "VideoMetadata.c"
+			GString* _tmp15_;
+			gchar _tmp16_;
 #line 385 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp15_ = sb;
 #line 385 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp16_ = c;
 #line 385 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			g_string_append_c (_tmp15_, _tmp16_);
-#line 3283 "VideoMetadata.c"
+#line 3273 "VideoMetadata.c"
 		}
 #line 387 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp17_ = sb;
@@ -3288,8 +3278,8 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A
 		_tmp18_ = _tmp17_->len;
 #line 387 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (_tmp18_ > ((gssize) AVI_METADATA_LOADER_MAX_STRD_LENGTH)) {
-#line 3291 "VideoMetadata.c"
-			gchar* _tmp19_ = NULL;
+#line 3281 "VideoMetadata.c"
+			gchar* _tmp19_;
 #line 388 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp19_ = g_strdup ("");
 #line 388 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3298,7 +3288,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A
 			_g_string_free0 (sb);
 #line 388 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return result;
-#line 3301 "VideoMetadata.c"
+#line 3291 "VideoMetadata.c"
 		}
 	}
 #line 392 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3311,8 +3301,8 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A
 	_tmp23_ = _tmp22_;
 #line 392 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (_tmp23_ < AVI_METADATA_LOADER_NUMERICAL_DATE_LENGTH) {
-#line 3314 "VideoMetadata.c"
-		gchar* _tmp24_ = NULL;
+#line 3304 "VideoMetadata.c"
+		gchar* _tmp24_;
 #line 393 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp24_ = g_strdup ("");
 #line 393 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3321,7 +3311,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A
 		_g_string_free0 (sb);
 #line 393 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return result;
-#line 3324 "VideoMetadata.c"
+#line 3314 "VideoMetadata.c"
 	}
 #line 396 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp25_ = sb;
@@ -3343,7 +3333,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A
 	_g_string_free0 (sb);
 #line 396 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 3346 "VideoMetadata.c"
+#line 3336 "VideoMetadata.c"
 }
 
 
@@ -3356,16 +3346,16 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun
 	g_return_val_if_fail (IS_AVI_CHUNK (chunk), NULL);
 #line 401 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	while (TRUE) {
-#line 3359 "VideoMetadata.c"
-		AVIChunk* _tmp0_ = NULL;
+#line 3349 "VideoMetadata.c"
+		AVIChunk* _tmp0_;
 		gchar* name = NULL;
-		AVIChunk* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		const gchar* _tmp18_ = NULL;
-		AVIChunk* _tmp28_ = NULL;
-		gboolean _tmp29_ = FALSE;
-		AVIChunk* _tmp30_ = NULL;
+		AVIChunk* _tmp1_;
+		gchar* _tmp2_;
+		const gchar* _tmp3_;
+		const gchar* _tmp18_;
+		AVIChunk* _tmp28_;
+		gboolean _tmp29_;
+		AVIChunk* _tmp30_;
 #line 402 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp0_ = chunk;
 #line 402 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3376,7 +3366,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun
 			g_propagate_error (error, _inner_error_);
 #line 402 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return NULL;
-#line 3379 "VideoMetadata.c"
+#line 3369 "VideoMetadata.c"
 		}
 #line 403 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp1_ = chunk;
@@ -3388,11 +3378,11 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun
 		_tmp3_ = name;
 #line 404 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (g_strcmp0 ("IDIT", _tmp3_) == 0) {
-#line 3391 "VideoMetadata.c"
+#line 3381 "VideoMetadata.c"
 			gchar* _tmp4_ = NULL;
-			AVIChunk* _tmp5_ = NULL;
-			gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
+			AVIChunk* _tmp5_;
+			gchar* _tmp6_;
+			gchar* _tmp7_;
 #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp5_ = chunk;
 #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3407,7 +3397,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun
 				_g_free0 (name);
 #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				return NULL;
-#line 3410 "VideoMetadata.c"
+#line 3400 "VideoMetadata.c"
 			}
 #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp7_ = _tmp4_;
@@ -3421,18 +3411,18 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun
 			_g_free0 (name);
 #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return result;
-#line 3424 "VideoMetadata.c"
+#line 3414 "VideoMetadata.c"
 		} else {
-			const gchar* _tmp8_ = NULL;
+			const gchar* _tmp8_;
 #line 406 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp8_ = name;
 #line 406 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (g_strcmp0 ("nctg", _tmp8_) == 0) {
-#line 3431 "VideoMetadata.c"
+#line 3421 "VideoMetadata.c"
 				gchar* _tmp9_ = NULL;
-				AVIChunk* _tmp10_ = NULL;
-				gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
+				AVIChunk* _tmp10_;
+				gchar* _tmp11_;
+				gchar* _tmp12_;
 #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_tmp10_ = chunk;
 #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3447,7 +3437,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun
 					_g_free0 (name);
 #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					return NULL;
-#line 3450 "VideoMetadata.c"
+#line 3440 "VideoMetadata.c"
 				}
 #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_tmp12_ = _tmp9_;
@@ -3461,18 +3451,18 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun
 				_g_free0 (name);
 #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				return result;
-#line 3464 "VideoMetadata.c"
+#line 3454 "VideoMetadata.c"
 			} else {
-				const gchar* _tmp13_ = NULL;
+				const gchar* _tmp13_;
 #line 408 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_tmp13_ = name;
 #line 408 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				if (g_strcmp0 ("strd", _tmp13_) == 0) {
-#line 3471 "VideoMetadata.c"
+#line 3461 "VideoMetadata.c"
 					gchar* _tmp14_ = NULL;
-					AVIChunk* _tmp15_ = NULL;
-					gchar* _tmp16_ = NULL;
-					gchar* _tmp17_ = NULL;
+					AVIChunk* _tmp15_;
+					gchar* _tmp16_;
+					gchar* _tmp17_;
 #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp15_ = chunk;
 #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3487,7 +3477,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun
 						_g_free0 (name);
 #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						return NULL;
-#line 3490 "VideoMetadata.c"
+#line 3480 "VideoMetadata.c"
 					}
 #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp17_ = _tmp14_;
@@ -3501,7 +3491,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun
 					_g_free0 (name);
 #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					return result;
-#line 3504 "VideoMetadata.c"
+#line 3494 "VideoMetadata.c"
 				}
 			}
 		}
@@ -3509,17 +3499,17 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun
 		_tmp18_ = name;
 #line 412 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (g_strcmp0 ("LIST", _tmp18_) == 0) {
-#line 3512 "VideoMetadata.c"
-			AVIChunk* _tmp19_ = NULL;
-			gchar* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
+#line 3502 "VideoMetadata.c"
+			AVIChunk* _tmp19_;
+			gchar* _tmp20_;
+			gchar* _tmp21_;
 			gchar* _result_ = NULL;
-			AVIChunk* _tmp22_ = NULL;
-			AVIChunk* _tmp23_ = NULL;
-			AVIChunk* _tmp24_ = NULL;
-			gchar* _tmp25_ = NULL;
-			gchar* _tmp26_ = NULL;
-			const gchar* _tmp27_ = NULL;
+			AVIChunk* _tmp22_;
+			AVIChunk* _tmp23_;
+			AVIChunk* _tmp24_;
+			gchar* _tmp25_;
+			gchar* _tmp26_;
+			const gchar* _tmp27_;
 #line 413 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp19_ = chunk;
 #line 413 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3536,7 +3526,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun
 				_g_free0 (name);
 #line 413 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				return NULL;
-#line 3539 "VideoMetadata.c"
+#line 3529 "VideoMetadata.c"
 			}
 #line 414 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp22_ = chunk;
@@ -3560,7 +3550,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun
 				_g_free0 (name);
 #line 414 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				return NULL;
-#line 3563 "VideoMetadata.c"
+#line 3553 "VideoMetadata.c"
 			}
 #line 415 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp27_ = _result_;
@@ -3572,11 +3562,11 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun
 				_g_free0 (name);
 #line 416 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				return result;
-#line 3575 "VideoMetadata.c"
+#line 3565 "VideoMetadata.c"
 			}
 #line 412 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_g_free0 (_result_);
-#line 3579 "VideoMetadata.c"
+#line 3569 "VideoMetadata.c"
 		}
 #line 420 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp28_ = chunk;
@@ -3588,7 +3578,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun
 			_g_free0 (name);
 #line 421 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			break;
-#line 3591 "VideoMetadata.c"
+#line 3581 "VideoMetadata.c"
 		}
 #line 423 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp30_ = chunk;
@@ -3602,25 +3592,25 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun
 			_g_free0 (name);
 #line 423 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return NULL;
-#line 3605 "VideoMetadata.c"
+#line 3595 "VideoMetadata.c"
 		}
 #line 401 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_g_free0 (name);
-#line 3609 "VideoMetadata.c"
+#line 3599 "VideoMetadata.c"
 	}
 #line 425 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	result = NULL;
 #line 425 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 3615 "VideoMetadata.c"
+#line 3605 "VideoMetadata.c"
 }
 
 
 static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gchar* sdate) {
 	gulong result = 0UL;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	const gchar* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	GDate date = {0};
 	guint seconds = 0U;
 	gint year = 0;
@@ -3631,18 +3621,18 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch
 	gint sec = 0;
 	gchar weekday[4] = {0};
 	gchar monthstr[4] = {0};
-	const gchar* _tmp3_ = NULL;
-	gchar _tmp4_ = '\0';
-	gboolean _tmp5_ = FALSE;
+	const gchar* _tmp3_;
+	gchar _tmp4_;
+	gboolean _tmp5_;
 	struct tm time = {0};
 	struct tm _tmp26_ = {0};
 	time_t tm = 0;
-	time_t _tmp27_ = 0;
+	time_t _tmp27_;
 	gulong _result_ = 0UL;
-	time_t _tmp28_ = 0;
-	guint _tmp29_ = 0U;
-	gulong _tmp30_ = 0UL;
-	time_t _tmp31_ = 0;
+	time_t _tmp28_;
+	guint _tmp29_;
+	gulong _tmp30_;
+	time_t _tmp31_;
 #line 432 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_AVI_METADATA_LOADER (self), 0UL);
 #line 432 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3659,7 +3649,7 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch
 		result = (gulong) 0;
 #line 434 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return result;
-#line 3662 "VideoMetadata.c"
+#line 3652 "VideoMetadata.c"
 	}
 #line 437 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	memset (&date, 0, sizeof (GDate));
@@ -3673,21 +3663,21 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch
 	_tmp5_ = g_ascii_isdigit (_tmp4_);
 #line 443 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (_tmp5_) {
-#line 3676 "VideoMetadata.c"
+#line 3666 "VideoMetadata.c"
 		gchar* tmp = NULL;
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		const gchar* _tmp8_;
 		gint _result_ = 0;
-		const gchar* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
-		gint _tmp15_ = 0;
-		gint _tmp16_ = 0;
-		gint _tmp17_ = 0;
+		const gchar* _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
+		gint _tmp14_;
+		gint _tmp15_;
+		gint _tmp16_;
+		gint _tmp17_;
 #line 447 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp6_ = sdate;
 #line 447 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3716,7 +3706,7 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch
 			_g_free0 (tmp);
 #line 452 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return result;
-#line 3719 "VideoMetadata.c"
+#line 3709 "VideoMetadata.c"
 		}
 #line 454 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp12_ = day;
@@ -3736,16 +3726,16 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch
 		seconds = (guint) ((_tmp15_ + (_tmp16_ * 60)) + (_tmp17_ * 3600));
 #line 443 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_g_free0 (tmp);
-#line 3739 "VideoMetadata.c"
+#line 3729 "VideoMetadata.c"
 	} else {
-		const gchar* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
-		gint _tmp20_ = 0;
-		GDateMonth _tmp21_ = 0;
-		gint _tmp22_ = 0;
-		gint _tmp23_ = 0;
-		gint _tmp24_ = 0;
-		gint _tmp25_ = 0;
+		const gchar* _tmp18_;
+		gint _tmp19_;
+		gint _tmp20_;
+		GDateMonth _tmp21_;
+		gint _tmp22_;
+		gint _tmp23_;
+		gint _tmp24_;
+		gint _tmp25_;
 #line 458 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp18_ = sdate;
 #line 458 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3756,7 +3746,7 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch
 			result = (gulong) 0;
 #line 460 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return result;
-#line 3759 "VideoMetadata.c"
+#line 3749 "VideoMetadata.c"
 		}
 #line 462 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp20_ = day;
@@ -3774,7 +3764,7 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch
 		_tmp25_ = hour;
 #line 463 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		seconds = (guint) ((_tmp23_ + (_tmp24_ * 60)) + (_tmp25_ * 3600));
-#line 3777 "VideoMetadata.c"
+#line 3767 "VideoMetadata.c"
 	}
 #line 466 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	memset (&time, 0, sizeof (struct tm));
@@ -3798,10 +3788,10 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch
 	_tmp31_ = tm;
 #line 472 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (_tmp30_ < ((gulong) _tmp31_)) {
-#line 3801 "VideoMetadata.c"
-		GFile* _tmp32_ = NULL;
-		gchar* _tmp33_ = NULL;
-		gchar* _tmp34_ = NULL;
+#line 3791 "VideoMetadata.c"
+		GFile* _tmp32_;
+		gchar* _tmp33_;
+		gchar* _tmp34_;
 #line 473 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp32_ = self->priv->file;
 #line 473 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3816,21 +3806,21 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch
 		result = (gulong) 0;
 #line 475 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return result;
-#line 3819 "VideoMetadata.c"
+#line 3809 "VideoMetadata.c"
 	}
 #line 478 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	result = _result_;
 #line 478 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 3825 "VideoMetadata.c"
+#line 3815 "VideoMetadata.c"
 }
 
 
 static GDateMonth avi_metadata_loader_month_from_string (AVIMetadataLoader* self, const gchar* s) {
 	GDateMonth result = 0;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	GQuark _tmp4_ = 0U;
 #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	static GQuark _tmp3_label0 = 0;
@@ -3874,157 +3864,157 @@ static GDateMonth avi_metadata_loader_month_from_string (AVIMetadataLoader* self
 	if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("jan")))) {
 #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		switch (0) {
-#line 3877 "VideoMetadata.c"
+#line 3867 "VideoMetadata.c"
 			default:
 			{
 #line 484 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				result = G_DATE_JANUARY;
 #line 484 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				return result;
-#line 3884 "VideoMetadata.c"
+#line 3874 "VideoMetadata.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("feb")))) {
 #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		switch (0) {
-#line 3890 "VideoMetadata.c"
+#line 3880 "VideoMetadata.c"
 			default:
 			{
 #line 486 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				result = G_DATE_FEBRUARY;
 #line 486 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				return result;
-#line 3897 "VideoMetadata.c"
+#line 3887 "VideoMetadata.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label2) ? _tmp3_label2 : (_tmp3_label2 = g_quark_from_static_string ("mar")))) {
 #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		switch (0) {
-#line 3903 "VideoMetadata.c"
+#line 3893 "VideoMetadata.c"
 			default:
 			{
 #line 488 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				result = G_DATE_MARCH;
 #line 488 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				return result;
-#line 3910 "VideoMetadata.c"
+#line 3900 "VideoMetadata.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label3) ? _tmp3_label3 : (_tmp3_label3 = g_quark_from_static_string ("apr")))) {
 #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		switch (0) {
-#line 3916 "VideoMetadata.c"
+#line 3906 "VideoMetadata.c"
 			default:
 			{
 #line 490 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				result = G_DATE_APRIL;
 #line 490 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				return result;
-#line 3923 "VideoMetadata.c"
+#line 3913 "VideoMetadata.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label4) ? _tmp3_label4 : (_tmp3_label4 = g_quark_from_static_string ("may")))) {
 #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		switch (0) {
-#line 3929 "VideoMetadata.c"
+#line 3919 "VideoMetadata.c"
 			default:
 			{
 #line 492 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				result = G_DATE_MAY;
 #line 492 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				return result;
-#line 3936 "VideoMetadata.c"
+#line 3926 "VideoMetadata.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label5) ? _tmp3_label5 : (_tmp3_label5 = g_quark_from_static_string ("jun")))) {
 #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		switch (0) {
-#line 3942 "VideoMetadata.c"
+#line 3932 "VideoMetadata.c"
 			default:
 			{
 #line 494 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				result = G_DATE_JUNE;
 #line 494 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				return result;
-#line 3949 "VideoMetadata.c"
+#line 3939 "VideoMetadata.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label6) ? _tmp3_label6 : (_tmp3_label6 = g_quark_from_static_string ("jul")))) {
 #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		switch (0) {
-#line 3955 "VideoMetadata.c"
+#line 3945 "VideoMetadata.c"
 			default:
 			{
 #line 496 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				result = G_DATE_JULY;
 #line 496 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				return result;
-#line 3962 "VideoMetadata.c"
+#line 3952 "VideoMetadata.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label7) ? _tmp3_label7 : (_tmp3_label7 = g_quark_from_static_string ("aug")))) {
 #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		switch (0) {
-#line 3968 "VideoMetadata.c"
+#line 3958 "VideoMetadata.c"
 			default:
 			{
 #line 498 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				result = G_DATE_AUGUST;
 #line 498 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				return result;
-#line 3975 "VideoMetadata.c"
+#line 3965 "VideoMetadata.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label8) ? _tmp3_label8 : (_tmp3_label8 = g_quark_from_static_string ("sep")))) {
 #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		switch (0) {
-#line 3981 "VideoMetadata.c"
+#line 3971 "VideoMetadata.c"
 			default:
 			{
 #line 500 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				result = G_DATE_SEPTEMBER;
 #line 500 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				return result;
-#line 3988 "VideoMetadata.c"
+#line 3978 "VideoMetadata.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label9) ? _tmp3_label9 : (_tmp3_label9 = g_quark_from_static_string ("oct")))) {
 #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		switch (0) {
-#line 3994 "VideoMetadata.c"
+#line 3984 "VideoMetadata.c"
 			default:
 			{
 #line 502 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				result = G_DATE_OCTOBER;
 #line 502 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				return result;
-#line 4001 "VideoMetadata.c"
+#line 3991 "VideoMetadata.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label10) ? _tmp3_label10 : (_tmp3_label10 = g_quark_from_static_string ("nov")))) {
 #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		switch (0) {
-#line 4007 "VideoMetadata.c"
+#line 3997 "VideoMetadata.c"
 			default:
 			{
 #line 504 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				result = G_DATE_NOVEMBER;
 #line 504 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				return result;
-#line 4014 "VideoMetadata.c"
+#line 4004 "VideoMetadata.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label11) ? _tmp3_label11 : (_tmp3_label11 = g_quark_from_static_string ("dec")))) {
 #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		switch (0) {
-#line 4020 "VideoMetadata.c"
+#line 4010 "VideoMetadata.c"
 			default:
 			{
 #line 506 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				result = G_DATE_DECEMBER;
 #line 506 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				return result;
-#line 4027 "VideoMetadata.c"
+#line 4017 "VideoMetadata.c"
 			}
 		}
 	}
@@ -4032,38 +4022,38 @@ static GDateMonth avi_metadata_loader_month_from_string (AVIMetadataLoader* self
 	result = G_DATE_BAD_MONTH;
 #line 508 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 4035 "VideoMetadata.c"
+#line 4025 "VideoMetadata.c"
 }
 
 
 static gchar* string_strip (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 4058 "VideoMetadata.c"
+#line 4048 "VideoMetadata.c"
 }
 
 
 static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoader* self) {
 	gulong result = 0UL;
 	AVIChunk* chunk = NULL;
-	GFile* _tmp0_ = NULL;
-	AVIChunk* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	AVIChunk* _tmp1_;
 	gulong timestamp = 0UL;
 	GError * _inner_error_ = NULL;
 #line 511 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4076,22 +4066,22 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 	chunk = _tmp1_;
 #line 513 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	timestamp = (gulong) 0;
-#line 4079 "VideoMetadata.c"
+#line 4069 "VideoMetadata.c"
 	{
-		AVIChunk* _tmp2_ = NULL;
-		AVIChunk* _tmp3_ = NULL;
+		AVIChunk* _tmp2_;
+		AVIChunk* _tmp3_;
 		gchar* sdate = NULL;
-		AVIChunk* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+		AVIChunk* _tmp4_;
+		gchar* _tmp5_;
+		const gchar* _tmp6_;
 #line 515 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp2_ = chunk;
 #line 515 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		avi_chunk_open_file (_tmp2_, &_inner_error_);
 #line 515 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4093 "VideoMetadata.c"
-			goto __catch581_g_error;
+#line 4083 "VideoMetadata.c"
+			goto __catch583_g_error;
 		}
 #line 516 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = chunk;
@@ -4099,8 +4089,8 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		avi_chunk_nonsection_skip (_tmp3_, (guint64) 12, &_inner_error_);
 #line 516 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4102 "VideoMetadata.c"
-			goto __catch581_g_error;
+#line 4092 "VideoMetadata.c"
+			goto __catch583_g_error;
 		}
 #line 517 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp4_ = chunk;
@@ -4110,18 +4100,18 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		sdate = _tmp5_;
 #line 517 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4113 "VideoMetadata.c"
-			goto __catch581_g_error;
+#line 4103 "VideoMetadata.c"
+			goto __catch583_g_error;
 		}
 #line 518 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp6_ = sdate;
 #line 518 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (NULL != _tmp6_) {
-#line 4120 "VideoMetadata.c"
-			const gchar* _tmp7_ = NULL;
-			gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
-			gulong _tmp10_ = 0UL;
+#line 4110 "VideoMetadata.c"
+			const gchar* _tmp7_;
+			gchar* _tmp8_;
+			gchar* _tmp9_;
+			gulong _tmp10_;
 #line 519 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp7_ = sdate;
 #line 519 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4134,18 +4124,18 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 			timestamp = _tmp10_;
 #line 519 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_g_free0 (_tmp9_);
-#line 4137 "VideoMetadata.c"
+#line 4127 "VideoMetadata.c"
 		}
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_g_free0 (sdate);
-#line 4141 "VideoMetadata.c"
+#line 4131 "VideoMetadata.c"
 	}
-	goto __finally581;
-	__catch581_g_error:
+	goto __finally583;
+	__catch583_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
+		GError* _tmp11_;
+		const gchar* _tmp12_;
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		e = _inner_error_;
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4158,12 +4148,12 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		g_debug ("VideoMetadata.vala:522: Error while reading AVI file: %s", _tmp12_);
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_g_error_free0 (e);
-#line 4161 "VideoMetadata.c"
+#line 4151 "VideoMetadata.c"
 	}
-	__finally581:
+	__finally583:
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4166 "VideoMetadata.c"
+#line 4156 "VideoMetadata.c"
 		gulong _tmp13_ = 0UL;
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_avi_chunk_unref0 (chunk);
@@ -4173,26 +4163,26 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		g_clear_error (&_inner_error_);
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return _tmp13_;
-#line 4176 "VideoMetadata.c"
+#line 4166 "VideoMetadata.c"
 	}
 	{
-		AVIChunk* _tmp14_ = NULL;
+		AVIChunk* _tmp14_;
 #line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp14_ = chunk;
 #line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		avi_chunk_close_file (_tmp14_, &_inner_error_);
 #line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4186 "VideoMetadata.c"
-			goto __catch582_g_error;
+#line 4176 "VideoMetadata.c"
+			goto __catch584_g_error;
 		}
 	}
-	goto __finally582;
-	__catch582_g_error:
+	goto __finally584;
+	__catch584_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
+		GError* _tmp15_;
+		const gchar* _tmp16_;
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		e = _inner_error_;
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4205,12 +4195,12 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		g_debug ("VideoMetadata.vala:528: Error while closing AVI file: %s", _tmp16_);
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_g_error_free0 (e);
-#line 4208 "VideoMetadata.c"
+#line 4198 "VideoMetadata.c"
 	}
-	__finally582:
+	__finally584:
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4213 "VideoMetadata.c"
+#line 4203 "VideoMetadata.c"
 		gulong _tmp17_ = 0UL;
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_avi_chunk_unref0 (chunk);
@@ -4220,7 +4210,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		g_clear_error (&_inner_error_);
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return _tmp17_;
-#line 4223 "VideoMetadata.c"
+#line 4213 "VideoMetadata.c"
 	}
 #line 530 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	result = timestamp;
@@ -4228,14 +4218,14 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 	_avi_chunk_unref0 (chunk);
 #line 530 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 4231 "VideoMetadata.c"
+#line 4221 "VideoMetadata.c"
 }
 
 
 static void value_avi_metadata_loader_init (GValue* value) {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	value->data[0].v_pointer = NULL;
-#line 4238 "VideoMetadata.c"
+#line 4228 "VideoMetadata.c"
 }
 
 
@@ -4244,7 +4234,7 @@ static void value_avi_metadata_loader_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		avi_metadata_loader_unref (value->data[0].v_pointer);
-#line 4247 "VideoMetadata.c"
+#line 4237 "VideoMetadata.c"
 	}
 }
 
@@ -4254,11 +4244,11 @@ static void value_avi_metadata_loader_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		dest_value->data[0].v_pointer = avi_metadata_loader_ref (src_value->data[0].v_pointer);
-#line 4257 "VideoMetadata.c"
+#line 4247 "VideoMetadata.c"
 	} else {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4261 "VideoMetadata.c"
+#line 4251 "VideoMetadata.c"
 	}
 }
 
@@ -4266,66 +4256,66 @@ static void value_avi_metadata_loader_copy_value (const GValue* src_value, GValu
 static gpointer value_avi_metadata_loader_peek_pointer (const GValue* value) {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 4269 "VideoMetadata.c"
+#line 4259 "VideoMetadata.c"
 }
 
 
 static gchar* value_avi_metadata_loader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (collect_values[0].v_pointer) {
-#line 4276 "VideoMetadata.c"
-		AVIMetadataLoader* object;
+#line 4266 "VideoMetadata.c"
+		AVIMetadataLoader * object;
 		object = collect_values[0].v_pointer;
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4283 "VideoMetadata.c"
+#line 4273 "VideoMetadata.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4287 "VideoMetadata.c"
+#line 4277 "VideoMetadata.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = avi_metadata_loader_ref (object);
-#line 4291 "VideoMetadata.c"
+#line 4281 "VideoMetadata.c"
 	} else {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 4295 "VideoMetadata.c"
+#line 4285 "VideoMetadata.c"
 	}
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return NULL;
-#line 4299 "VideoMetadata.c"
+#line 4289 "VideoMetadata.c"
 }
 
 
 static gchar* value_avi_metadata_loader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	AVIMetadataLoader** object_p;
+	AVIMetadataLoader ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (!object_p) {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4310 "VideoMetadata.c"
+#line 4300 "VideoMetadata.c"
 	}
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (!value->data[0].v_pointer) {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		*object_p = NULL;
-#line 4316 "VideoMetadata.c"
+#line 4306 "VideoMetadata.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4320 "VideoMetadata.c"
+#line 4310 "VideoMetadata.c"
 	} else {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		*object_p = avi_metadata_loader_ref (value->data[0].v_pointer);
-#line 4324 "VideoMetadata.c"
+#line 4314 "VideoMetadata.c"
 	}
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return NULL;
-#line 4328 "VideoMetadata.c"
+#line 4318 "VideoMetadata.c"
 }
 
 
@@ -4339,7 +4329,7 @@ GParamSpec* param_spec_avi_metadata_loader (const gchar* name, const gchar* nick
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return G_PARAM_SPEC (spec);
-#line 4342 "VideoMetadata.c"
+#line 4332 "VideoMetadata.c"
 }
 
 
@@ -4348,12 +4338,12 @@ gpointer value_get_avi_metadata_loader (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_METADATA_LOADER), NULL);
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 4351 "VideoMetadata.c"
+#line 4341 "VideoMetadata.c"
 }
 
 
 void value_set_avi_metadata_loader (GValue* value, gpointer v_object) {
-	AVIMetadataLoader* old;
+	AVIMetadataLoader * old;
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_METADATA_LOADER));
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4368,23 +4358,23 @@ void value_set_avi_metadata_loader (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		avi_metadata_loader_ref (value->data[0].v_pointer);
-#line 4371 "VideoMetadata.c"
+#line 4361 "VideoMetadata.c"
 	} else {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 4375 "VideoMetadata.c"
+#line 4365 "VideoMetadata.c"
 	}
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (old) {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		avi_metadata_loader_unref (old);
-#line 4381 "VideoMetadata.c"
+#line 4371 "VideoMetadata.c"
 	}
 }
 
 
 void value_take_avi_metadata_loader (GValue* value, gpointer v_object) {
-	AVIMetadataLoader* old;
+	AVIMetadataLoader * old;
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_METADATA_LOADER));
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4397,17 +4387,17 @@ void value_take_avi_metadata_loader (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = v_object;
-#line 4400 "VideoMetadata.c"
+#line 4390 "VideoMetadata.c"
 	} else {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 4404 "VideoMetadata.c"
+#line 4394 "VideoMetadata.c"
 	}
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (old) {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		avi_metadata_loader_unref (old);
-#line 4410 "VideoMetadata.c"
+#line 4400 "VideoMetadata.c"
 	}
 }
 
@@ -4419,7 +4409,7 @@ static void avi_metadata_loader_class_init (AVIMetadataLoaderClass * klass) {
 	((AVIMetadataLoaderClass *) klass)->finalize = avi_metadata_loader_finalize;
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_type_class_add_private (klass, sizeof (AVIMetadataLoaderPrivate));
-#line 4422 "VideoMetadata.c"
+#line 4412 "VideoMetadata.c"
 }
 
 
@@ -4430,11 +4420,11 @@ static void avi_metadata_loader_instance_init (AVIMetadataLoader * self) {
 	self->priv->file = NULL;
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self->ref_count = 1;
-#line 4433 "VideoMetadata.c"
+#line 4423 "VideoMetadata.c"
 }
 
 
-static void avi_metadata_loader_finalize (AVIMetadataLoader* obj) {
+static void avi_metadata_loader_finalize (AVIMetadataLoader * obj) {
 	AVIMetadataLoader * self;
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_AVI_METADATA_LOADER, AVIMetadataLoader);
@@ -4442,7 +4432,7 @@ static void avi_metadata_loader_finalize (AVIMetadataLoader* obj) {
 	g_signal_handlers_destroy (self);
 #line 294 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_g_object_unref0 (self->priv->file);
-#line 4445 "VideoMetadata.c"
+#line 4435 "VideoMetadata.c"
 }
 
 
@@ -4461,18 +4451,18 @@ GType avi_metadata_loader_get_type (void) {
 
 
 gpointer avi_metadata_loader_ref (gpointer instance) {
-	AVIMetadataLoader* self;
+	AVIMetadataLoader * self;
 	self = instance;
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return instance;
-#line 4470 "VideoMetadata.c"
+#line 4460 "VideoMetadata.c"
 }
 
 
 void avi_metadata_loader_unref (gpointer instance) {
-	AVIMetadataLoader* self;
+	AVIMetadataLoader * self;
 	self = instance;
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -4480,15 +4470,15 @@ void avi_metadata_loader_unref (gpointer instance) {
 		AVI_METADATA_LOADER_GET_CLASS (self)->finalize (self);
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4483 "VideoMetadata.c"
+#line 4473 "VideoMetadata.c"
 	}
 }
 
 
 AVIChunk* avi_chunk_construct (GType object_type, GFile* file) {
 	AVIChunk* self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 543 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 543 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4503,30 +4493,30 @@ AVIChunk* avi_chunk_construct (GType object_type, GFile* file) {
 	self->priv->file = _tmp1_;
 #line 543 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return self;
-#line 4506 "VideoMetadata.c"
+#line 4496 "VideoMetadata.c"
 }
 
 
 AVIChunk* avi_chunk_new (GFile* file) {
 #line 543 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return avi_chunk_construct (TYPE_AVI_CHUNK, file);
-#line 4513 "VideoMetadata.c"
+#line 4503 "VideoMetadata.c"
 }
 
 
 static gpointer _avi_chunk_ref0 (gpointer self) {
 #line 549 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return self ? avi_chunk_ref (self) : NULL;
-#line 4520 "VideoMetadata.c"
+#line 4510 "VideoMetadata.c"
 }
 
 
 static AVIChunk* avi_chunk_construct_with_input_stream (GType object_type, GDataInputStream* input, AVIChunk* parent) {
 	AVIChunk* self = NULL;
-	GDataInputStream* _tmp0_ = NULL;
-	GDataInputStream* _tmp1_ = NULL;
-	AVIChunk* _tmp2_ = NULL;
-	AVIChunk* _tmp3_ = NULL;
+	GDataInputStream* _tmp0_;
+	GDataInputStream* _tmp1_;
+	AVIChunk* _tmp2_;
+	AVIChunk* _tmp3_;
 #line 547 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (G_IS_DATA_INPUT_STREAM (input), NULL);
 #line 547 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4551,24 +4541,24 @@ static AVIChunk* avi_chunk_construct_with_input_stream (GType object_type, GData
 	self->priv->parent = _tmp3_;
 #line 547 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return self;
-#line 4554 "VideoMetadata.c"
+#line 4544 "VideoMetadata.c"
 }
 
 
 static AVIChunk* avi_chunk_new_with_input_stream (GDataInputStream* input, AVIChunk* parent) {
 #line 547 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return avi_chunk_construct_with_input_stream (TYPE_AVI_CHUNK, input, parent);
-#line 4561 "VideoMetadata.c"
+#line 4551 "VideoMetadata.c"
 }
 
 
 void avi_chunk_open_file (AVIChunk* self, GError** error) {
 	GFileInputStream* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFileInputStream* _tmp2_ = NULL;
-	GDataInputStream* _tmp3_ = NULL;
-	GDataInputStream* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	GFile* _tmp1_;
+	GFileInputStream* _tmp2_;
+	GDataInputStream* _tmp3_;
+	GDataInputStream* _tmp4_;
+	gchar* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 552 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (IS_AVI_CHUNK (self));
@@ -4580,7 +4570,7 @@ void avi_chunk_open_file (AVIChunk* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 553 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 4583 "VideoMetadata.c"
+#line 4573 "VideoMetadata.c"
 	}
 #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp1_ = self->priv->file;
@@ -4594,7 +4584,7 @@ void avi_chunk_open_file (AVIChunk* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 4597 "VideoMetadata.c"
+#line 4587 "VideoMetadata.c"
 	}
 #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
@@ -4618,12 +4608,12 @@ void avi_chunk_open_file (AVIChunk* self, GError** error) {
 	self->priv->section_name = _tmp5_;
 #line 552 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_g_object_unref0 (_tmp0_);
-#line 4621 "VideoMetadata.c"
+#line 4611 "VideoMetadata.c"
 }
 
 
 void avi_chunk_close_file (AVIChunk* self, GError** error) {
-	GDataInputStream* _tmp0_ = NULL;
+	GDataInputStream* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 561 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (IS_AVI_CHUNK (self));
@@ -4631,8 +4621,8 @@ void avi_chunk_close_file (AVIChunk* self, GError** error) {
 	_tmp0_ = self->priv->input;
 #line 562 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (NULL != _tmp0_) {
-#line 4634 "VideoMetadata.c"
-		GDataInputStream* _tmp1_ = NULL;
+#line 4624 "VideoMetadata.c"
+		GDataInputStream* _tmp1_;
 #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp1_ = self->priv->input;
 #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4643,20 +4633,20 @@ void avi_chunk_close_file (AVIChunk* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return;
-#line 4646 "VideoMetadata.c"
+#line 4636 "VideoMetadata.c"
 		}
 #line 564 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_g_object_unref0 (self->priv->input);
 #line 564 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		self->priv->input = NULL;
-#line 4652 "VideoMetadata.c"
+#line 4642 "VideoMetadata.c"
 	}
 }
 
 
 void avi_chunk_nonsection_skip (AVIChunk* self, guint64 skip_amount, GError** error) {
-	GDataInputStream* _tmp0_ = NULL;
-	guint64 _tmp1_ = 0ULL;
+	GDataInputStream* _tmp0_;
+	guint64 _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 568 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (IS_AVI_CHUNK (self));
@@ -4672,15 +4662,15 @@ void avi_chunk_nonsection_skip (AVIChunk* self, guint64 skip_amount, GError** er
 		g_propagate_error (error, _inner_error_);
 #line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 4675 "VideoMetadata.c"
+#line 4665 "VideoMetadata.c"
 	}
 }
 
 
 void avi_chunk_skip (AVIChunk* self, guint64 skip_amount, GError** error) {
-	guint64 _tmp0_ = 0ULL;
-	GDataInputStream* _tmp1_ = NULL;
-	guint64 _tmp2_ = 0ULL;
+	guint64 _tmp0_;
+	GDataInputStream* _tmp1_;
+	guint64 _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 572 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (IS_AVI_CHUNK (self));
@@ -4700,15 +4690,15 @@ void avi_chunk_skip (AVIChunk* self, guint64 skip_amount, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 4703 "VideoMetadata.c"
+#line 4693 "VideoMetadata.c"
 	}
 }
 
 
 AVIChunk* avi_chunk_get_first_child_chunk (AVIChunk* self) {
 	AVIChunk* result = NULL;
-	GDataInputStream* _tmp0_ = NULL;
-	AVIChunk* _tmp1_ = NULL;
+	GDataInputStream* _tmp0_;
+	AVIChunk* _tmp1_;
 #line 577 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_AVI_CHUNK (self), NULL);
 #line 578 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4719,17 +4709,17 @@ AVIChunk* avi_chunk_get_first_child_chunk (AVIChunk* self) {
 	result = _tmp1_;
 #line 578 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 4722 "VideoMetadata.c"
+#line 4712 "VideoMetadata.c"
 }
 
 
 static void avi_chunk_advance_section_offset (AVIChunk* self, guint64 amount) {
-	guint64 _tmp0_ = 0ULL;
-	guint64 _tmp1_ = 0ULL;
-	guint64 _tmp2_ = 0ULL;
-	guint64 _tmp5_ = 0ULL;
-	guint64 _tmp6_ = 0ULL;
-	AVIChunk* _tmp7_ = NULL;
+	guint64 _tmp0_;
+	guint64 _tmp1_;
+	guint64 _tmp2_;
+	guint64 _tmp5_;
+	guint64 _tmp6_;
+	AVIChunk* _tmp7_;
 #line 581 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (IS_AVI_CHUNK (self));
 #line 582 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4740,16 +4730,16 @@ static void avi_chunk_advance_section_offset (AVIChunk* self, guint64 amount) {
 	_tmp2_ = self->priv->section_size;
 #line 582 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if ((_tmp0_ + _tmp1_) > _tmp2_) {
-#line 4743 "VideoMetadata.c"
-		guint64 _tmp3_ = 0ULL;
-		guint64 _tmp4_ = 0ULL;
+#line 4733 "VideoMetadata.c"
+		guint64 _tmp3_;
+		guint64 _tmp4_;
 #line 583 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = self->priv->section_size;
 #line 583 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp4_ = self->priv->section_offset;
 #line 583 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		amount = _tmp3_ - _tmp4_;
-#line 4752 "VideoMetadata.c"
+#line 4742 "VideoMetadata.c"
 	}
 #line 585 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp5_ = self->priv->section_offset;
@@ -4761,16 +4751,16 @@ static void avi_chunk_advance_section_offset (AVIChunk* self, guint64 amount) {
 	_tmp7_ = self->priv->parent;
 #line 586 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (NULL != _tmp7_) {
-#line 4764 "VideoMetadata.c"
-		AVIChunk* _tmp8_ = NULL;
-		guint64 _tmp9_ = 0ULL;
+#line 4754 "VideoMetadata.c"
+		AVIChunk* _tmp8_;
+		guint64 _tmp9_;
 #line 587 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp8_ = self->priv->parent;
 #line 587 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp9_ = amount;
 #line 587 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		avi_chunk_advance_section_offset (_tmp8_, _tmp9_);
-#line 4773 "VideoMetadata.c"
+#line 4763 "VideoMetadata.c"
 	}
 }
 
@@ -4778,8 +4768,8 @@ static void avi_chunk_advance_section_offset (AVIChunk* self, guint64 amount) {
 guchar avi_chunk_read_byte (AVIChunk* self, GError** error) {
 	guchar result = '\0';
 	guint8 _tmp0_ = 0U;
-	GDataInputStream* _tmp1_ = NULL;
-	guint8 _tmp2_ = 0U;
+	GDataInputStream* _tmp1_;
+	guint8 _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 591 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_AVI_CHUNK (self), '\0');
@@ -4793,27 +4783,27 @@ guchar avi_chunk_read_byte (AVIChunk* self, GError** error) {
 	_tmp0_ = _tmp2_;
 #line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4796 "VideoMetadata.c"
+#line 4786 "VideoMetadata.c"
 		guchar _tmp3_ = '\0';
 #line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		g_propagate_error (error, _inner_error_);
 #line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return _tmp3_;
-#line 4802 "VideoMetadata.c"
+#line 4792 "VideoMetadata.c"
 	}
 #line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	result = (guchar) _tmp0_;
 #line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 4808 "VideoMetadata.c"
+#line 4798 "VideoMetadata.c"
 }
 
 
 guint16 avi_chunk_read_uint16 (AVIChunk* self, GError** error) {
 	guint16 result = 0U;
 	guint16 _tmp0_ = 0U;
-	GDataInputStream* _tmp1_ = NULL;
-	guint16 _tmp2_ = 0U;
+	GDataInputStream* _tmp1_;
+	guint16 _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 596 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_AVI_CHUNK (self), 0U);
@@ -4827,47 +4817,47 @@ guint16 avi_chunk_read_uint16 (AVIChunk* self, GError** error) {
 	_tmp0_ = _tmp2_;
 #line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4830 "VideoMetadata.c"
+#line 4820 "VideoMetadata.c"
 		guint16 _tmp3_ = 0U;
 #line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		g_propagate_error (error, _inner_error_);
 #line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return _tmp3_;
-#line 4836 "VideoMetadata.c"
+#line 4826 "VideoMetadata.c"
 	}
 #line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	result = _tmp0_;
 #line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 4842 "VideoMetadata.c"
+#line 4832 "VideoMetadata.c"
 }
 
 
 void avi_chunk_read_chunk (AVIChunk* self, GError** error) {
 	GString* sb = NULL;
-	GString* _tmp0_ = NULL;
+	GString* _tmp0_;
 	guint8 _tmp1_ = 0U;
-	GDataInputStream* _tmp2_ = NULL;
-	guint8 _tmp3_ = 0U;
-	GString* _tmp4_ = NULL;
+	GDataInputStream* _tmp2_;
+	guint8 _tmp3_;
+	GString* _tmp4_;
 	guint8 _tmp5_ = 0U;
-	GDataInputStream* _tmp6_ = NULL;
-	guint8 _tmp7_ = 0U;
-	GString* _tmp8_ = NULL;
+	GDataInputStream* _tmp6_;
+	guint8 _tmp7_;
+	GString* _tmp8_;
 	guint8 _tmp9_ = 0U;
-	GDataInputStream* _tmp10_ = NULL;
-	guint8 _tmp11_ = 0U;
-	GString* _tmp12_ = NULL;
+	GDataInputStream* _tmp10_;
+	guint8 _tmp11_;
+	GString* _tmp12_;
 	guint8 _tmp13_ = 0U;
-	GDataInputStream* _tmp14_ = NULL;
-	guint8 _tmp15_ = 0U;
-	GString* _tmp16_ = NULL;
-	GString* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
+	GDataInputStream* _tmp14_;
+	guint8 _tmp15_;
+	GString* _tmp16_;
+	GString* _tmp17_;
+	const gchar* _tmp18_;
+	gchar* _tmp19_;
 	guint32 _tmp20_ = 0U;
-	GDataInputStream* _tmp21_ = NULL;
-	guint32 _tmp22_ = 0U;
+	GDataInputStream* _tmp21_;
+	guint32 _tmp22_;
 	GError * _inner_error_ = NULL;
 #line 601 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (IS_AVI_CHUNK (self));
@@ -4889,7 +4879,7 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) {
 		_g_string_free0 (sb);
 #line 605 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 4892 "VideoMetadata.c"
+#line 4882 "VideoMetadata.c"
 	}
 #line 605 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp4_ = sb;
@@ -4909,7 +4899,7 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) {
 		_g_string_free0 (sb);
 #line 606 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 4912 "VideoMetadata.c"
+#line 4902 "VideoMetadata.c"
 	}
 #line 606 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp8_ = sb;
@@ -4929,7 +4919,7 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) {
 		_g_string_free0 (sb);
 #line 607 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 4932 "VideoMetadata.c"
+#line 4922 "VideoMetadata.c"
 	}
 #line 607 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp12_ = sb;
@@ -4949,7 +4939,7 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) {
 		_g_string_free0 (sb);
 #line 608 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 4952 "VideoMetadata.c"
+#line 4942 "VideoMetadata.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp16_ = sb;
@@ -4979,7 +4969,7 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) {
 		_g_string_free0 (sb);
 #line 610 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 4982 "VideoMetadata.c"
+#line 4972 "VideoMetadata.c"
 	}
 #line 610 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self->priv->section_size = (guint64) _tmp20_;
@@ -4987,29 +4977,29 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) {
 	self->priv->section_offset = (guint64) 0;
 #line 601 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_g_string_free0 (sb);
-#line 4990 "VideoMetadata.c"
+#line 4980 "VideoMetadata.c"
 }
 
 
 gchar* avi_chunk_read_name (AVIChunk* self, GError** error) {
 	gchar* result = NULL;
 	GString* sb = NULL;
-	GString* _tmp0_ = NULL;
+	GString* _tmp0_;
 	guchar _tmp1_ = '\0';
-	guchar _tmp2_ = '\0';
-	GString* _tmp3_ = NULL;
+	guchar _tmp2_;
+	GString* _tmp3_;
 	guchar _tmp4_ = '\0';
-	guchar _tmp5_ = '\0';
-	GString* _tmp6_ = NULL;
+	guchar _tmp5_;
+	GString* _tmp6_;
 	guchar _tmp7_ = '\0';
-	guchar _tmp8_ = '\0';
-	GString* _tmp9_ = NULL;
+	guchar _tmp8_;
+	GString* _tmp9_;
 	guchar _tmp10_ = '\0';
-	guchar _tmp11_ = '\0';
-	GString* _tmp12_ = NULL;
-	GString* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
+	guchar _tmp11_;
+	GString* _tmp12_;
+	GString* _tmp13_;
+	const gchar* _tmp14_;
+	gchar* _tmp15_;
 	GError * _inner_error_ = NULL;
 #line 614 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_AVI_CHUNK (self), NULL);
@@ -5029,7 +5019,7 @@ gchar* avi_chunk_read_name (AVIChunk* self, GError** error) {
 		_g_string_free0 (sb);
 #line 616 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return NULL;
-#line 5032 "VideoMetadata.c"
+#line 5022 "VideoMetadata.c"
 	}
 #line 616 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp3_ = sb;
@@ -5047,7 +5037,7 @@ gchar* avi_chunk_read_name (AVIChunk* self, GError** error) {
 		_g_string_free0 (sb);
 #line 617 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return NULL;
-#line 5050 "VideoMetadata.c"
+#line 5040 "VideoMetadata.c"
 	}
 #line 617 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp6_ = sb;
@@ -5065,7 +5055,7 @@ gchar* avi_chunk_read_name (AVIChunk* self, GError** error) {
 		_g_string_free0 (sb);
 #line 618 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return NULL;
-#line 5068 "VideoMetadata.c"
+#line 5058 "VideoMetadata.c"
 	}
 #line 618 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp9_ = sb;
@@ -5083,7 +5073,7 @@ gchar* avi_chunk_read_name (AVIChunk* self, GError** error) {
 		_g_string_free0 (sb);
 #line 619 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return NULL;
-#line 5086 "VideoMetadata.c"
+#line 5076 "VideoMetadata.c"
 	}
 #line 619 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp12_ = sb;
@@ -5101,12 +5091,12 @@ gchar* avi_chunk_read_name (AVIChunk* self, GError** error) {
 	_g_string_free0 (sb);
 #line 620 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 5104 "VideoMetadata.c"
+#line 5094 "VideoMetadata.c"
 }
 
 
 void avi_chunk_next_chunk (AVIChunk* self, GError** error) {
-	guint64 _tmp0_ = 0ULL;
+	guint64 _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 623 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (IS_AVI_CHUNK (self));
@@ -5120,20 +5110,20 @@ void avi_chunk_next_chunk (AVIChunk* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 624 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 5123 "VideoMetadata.c"
+#line 5113 "VideoMetadata.c"
 	}
 #line 625 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self->priv->section_size = (guint64) 0;
 #line 626 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self->priv->section_offset = (guint64) 0;
-#line 5129 "VideoMetadata.c"
+#line 5119 "VideoMetadata.c"
 }
 
 
 gchar* avi_chunk_get_current_chunk_name (AVIChunk* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 629 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_AVI_CHUNK (self), NULL);
 #line 630 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5144,13 +5134,13 @@ gchar* avi_chunk_get_current_chunk_name (AVIChunk* self) {
 	result = _tmp1_;
 #line 630 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 5147 "VideoMetadata.c"
+#line 5137 "VideoMetadata.c"
 }
 
 
 gboolean avi_chunk_is_last_chunk (AVIChunk* self) {
 	gboolean result = FALSE;
-	guint64 _tmp0_ = 0ULL;
+	guint64 _tmp0_;
 #line 633 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_AVI_CHUNK (self), FALSE);
 #line 634 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5159,16 +5149,16 @@ gboolean avi_chunk_is_last_chunk (AVIChunk* self) {
 	result = _tmp0_ == ((guint64) 0);
 #line 634 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 5162 "VideoMetadata.c"
+#line 5152 "VideoMetadata.c"
 }
 
 
 guint64 avi_chunk_section_size_remaining (AVIChunk* self) {
 	guint64 result = 0ULL;
-	guint64 _tmp0_ = 0ULL;
-	guint64 _tmp1_ = 0ULL;
-	guint64 _tmp2_ = 0ULL;
-	guint64 _tmp3_ = 0ULL;
+	guint64 _tmp0_;
+	guint64 _tmp1_;
+	guint64 _tmp2_;
+	guint64 _tmp3_;
 #line 637 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_AVI_CHUNK (self), 0ULL);
 #line 638 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5185,17 +5175,17 @@ guint64 avi_chunk_section_size_remaining (AVIChunk* self) {
 	result = _tmp2_ - _tmp3_;
 #line 639 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 5188 "VideoMetadata.c"
+#line 5178 "VideoMetadata.c"
 }
 
 
 gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) {
 	gchar* result = NULL;
 	GString* sb = NULL;
-	GString* _tmp0_ = NULL;
-	GString* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	GString* _tmp0_;
+	GString* _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
 	GError * _inner_error_ = NULL;
 #line 643 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_val_if_fail (IS_AVI_CHUNK (self), NULL);
@@ -5205,14 +5195,14 @@ gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) {
 	sb = _tmp0_;
 #line 645 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	while (TRUE) {
-#line 5208 "VideoMetadata.c"
-		guint64 _tmp1_ = 0ULL;
-		guint64 _tmp2_ = 0ULL;
+#line 5198 "VideoMetadata.c"
+		guint64 _tmp1_;
+		guint64 _tmp2_;
 		guchar _tmp3_ = '\0';
-		guchar _tmp4_ = '\0';
-		GString* _tmp5_ = NULL;
-		GString* _tmp6_ = NULL;
-		gssize _tmp7_ = 0L;
+		guchar _tmp4_;
+		GString* _tmp5_;
+		GString* _tmp6_;
+		gssize _tmp7_;
 #line 645 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp1_ = self->priv->section_offset;
 #line 645 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5221,7 +5211,7 @@ gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) {
 		if (!(_tmp1_ < _tmp2_)) {
 #line 645 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			break;
-#line 5224 "VideoMetadata.c"
+#line 5214 "VideoMetadata.c"
 		}
 #line 646 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp4_ = avi_chunk_read_byte (self, &_inner_error_);
@@ -5235,7 +5225,7 @@ gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) {
 			_g_string_free0 (sb);
 #line 646 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return NULL;
-#line 5238 "VideoMetadata.c"
+#line 5228 "VideoMetadata.c"
 		}
 #line 646 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp5_ = sb;
@@ -5247,10 +5237,10 @@ gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) {
 		_tmp7_ = _tmp6_->len;
 #line 647 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (_tmp7_ > ((gssize) AVI_CHUNK_MAX_STRING_TO_SECTION_LENGTH)) {
-#line 5250 "VideoMetadata.c"
-			GString* _tmp8_ = NULL;
-			const gchar* _tmp9_ = NULL;
-			gchar* _tmp10_ = NULL;
+#line 5240 "VideoMetadata.c"
+			GString* _tmp8_;
+			const gchar* _tmp9_;
+			gchar* _tmp10_;
 #line 648 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp8_ = sb;
 #line 648 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5263,7 +5253,7 @@ gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) {
 			_g_string_free0 (sb);
 #line 648 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return result;
-#line 5266 "VideoMetadata.c"
+#line 5256 "VideoMetadata.c"
 		}
 	}
 #line 651 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5278,14 +5268,14 @@ gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) {
 	_g_string_free0 (sb);
 #line 651 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 5281 "VideoMetadata.c"
+#line 5271 "VideoMetadata.c"
 }
 
 
 static void value_avi_chunk_init (GValue* value) {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	value->data[0].v_pointer = NULL;
-#line 5288 "VideoMetadata.c"
+#line 5278 "VideoMetadata.c"
 }
 
 
@@ -5294,7 +5284,7 @@ static void value_avi_chunk_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		avi_chunk_unref (value->data[0].v_pointer);
-#line 5297 "VideoMetadata.c"
+#line 5287 "VideoMetadata.c"
 	}
 }
 
@@ -5304,11 +5294,11 @@ static void value_avi_chunk_copy_value (const GValue* src_value, GValue* dest_va
 	if (src_value->data[0].v_pointer) {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		dest_value->data[0].v_pointer = avi_chunk_ref (src_value->data[0].v_pointer);
-#line 5307 "VideoMetadata.c"
+#line 5297 "VideoMetadata.c"
 	} else {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5311 "VideoMetadata.c"
+#line 5301 "VideoMetadata.c"
 	}
 }
 
@@ -5316,66 +5306,66 @@ static void value_avi_chunk_copy_value (const GValue* src_value, GValue* dest_va
 static gpointer value_avi_chunk_peek_pointer (const GValue* value) {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 5319 "VideoMetadata.c"
+#line 5309 "VideoMetadata.c"
 }
 
 
 static gchar* value_avi_chunk_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (collect_values[0].v_pointer) {
-#line 5326 "VideoMetadata.c"
-		AVIChunk* object;
+#line 5316 "VideoMetadata.c"
+		AVIChunk * object;
 		object = collect_values[0].v_pointer;
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5333 "VideoMetadata.c"
+#line 5323 "VideoMetadata.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5337 "VideoMetadata.c"
+#line 5327 "VideoMetadata.c"
 		}
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = avi_chunk_ref (object);
-#line 5341 "VideoMetadata.c"
+#line 5331 "VideoMetadata.c"
 	} else {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 5345 "VideoMetadata.c"
+#line 5335 "VideoMetadata.c"
 	}
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return NULL;
-#line 5349 "VideoMetadata.c"
+#line 5339 "VideoMetadata.c"
 }
 
 
 static gchar* value_avi_chunk_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	AVIChunk** object_p;
+	AVIChunk ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (!object_p) {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5360 "VideoMetadata.c"
+#line 5350 "VideoMetadata.c"
 	}
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (!value->data[0].v_pointer) {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		*object_p = NULL;
-#line 5366 "VideoMetadata.c"
+#line 5356 "VideoMetadata.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5370 "VideoMetadata.c"
+#line 5360 "VideoMetadata.c"
 	} else {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		*object_p = avi_chunk_ref (value->data[0].v_pointer);
-#line 5374 "VideoMetadata.c"
+#line 5364 "VideoMetadata.c"
 	}
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return NULL;
-#line 5378 "VideoMetadata.c"
+#line 5368 "VideoMetadata.c"
 }
 
 
@@ -5389,7 +5379,7 @@ GParamSpec* param_spec_avi_chunk (const gchar* name, const gchar* nick, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return G_PARAM_SPEC (spec);
-#line 5392 "VideoMetadata.c"
+#line 5382 "VideoMetadata.c"
 }
 
 
@@ -5398,12 +5388,12 @@ gpointer value_get_avi_chunk (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_CHUNK), NULL);
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 5401 "VideoMetadata.c"
+#line 5391 "VideoMetadata.c"
 }
 
 
 void value_set_avi_chunk (GValue* value, gpointer v_object) {
-	AVIChunk* old;
+	AVIChunk * old;
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_CHUNK));
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5418,23 +5408,23 @@ void value_set_avi_chunk (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		avi_chunk_ref (value->data[0].v_pointer);
-#line 5421 "VideoMetadata.c"
+#line 5411 "VideoMetadata.c"
 	} else {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 5425 "VideoMetadata.c"
+#line 5415 "VideoMetadata.c"
 	}
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (old) {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		avi_chunk_unref (old);
-#line 5431 "VideoMetadata.c"
+#line 5421 "VideoMetadata.c"
 	}
 }
 
 
 void value_take_avi_chunk (GValue* value, gpointer v_object) {
-	AVIChunk* old;
+	AVIChunk * old;
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_CHUNK));
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5447,17 +5437,17 @@ void value_take_avi_chunk (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = v_object;
-#line 5450 "VideoMetadata.c"
+#line 5440 "VideoMetadata.c"
 	} else {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 5454 "VideoMetadata.c"
+#line 5444 "VideoMetadata.c"
 	}
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (old) {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		avi_chunk_unref (old);
-#line 5460 "VideoMetadata.c"
+#line 5450 "VideoMetadata.c"
 	}
 }
 
@@ -5469,12 +5459,12 @@ static void avi_chunk_class_init (AVIChunkClass * klass) {
 	((AVIChunkClass *) klass)->finalize = avi_chunk_finalize;
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_type_class_add_private (klass, sizeof (AVIChunkPrivate));
-#line 5472 "VideoMetadata.c"
+#line 5462 "VideoMetadata.c"
 }
 
 
 static void avi_chunk_instance_init (AVIChunk * self) {
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self->priv = AVI_CHUNK_GET_PRIVATE (self);
 #line 535 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5493,11 +5483,11 @@ static void avi_chunk_instance_init (AVIChunk * self) {
 	self->priv->parent = NULL;
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self->ref_count = 1;
-#line 5496 "VideoMetadata.c"
+#line 5486 "VideoMetadata.c"
 }
 
 
-static void avi_chunk_finalize (AVIChunk* obj) {
+static void avi_chunk_finalize (AVIChunk * obj) {
 	AVIChunk * self;
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_AVI_CHUNK, AVIChunk);
@@ -5511,7 +5501,7 @@ static void avi_chunk_finalize (AVIChunk* obj) {
 	_g_object_unref0 (self->priv->input);
 #line 540 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_avi_chunk_unref0 (self->priv->parent);
-#line 5514 "VideoMetadata.c"
+#line 5504 "VideoMetadata.c"
 }
 
 
@@ -5530,18 +5520,18 @@ GType avi_chunk_get_type (void) {
 
 
 gpointer avi_chunk_ref (gpointer instance) {
-	AVIChunk* self;
+	AVIChunk * self;
 	self = instance;
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return instance;
-#line 5539 "VideoMetadata.c"
+#line 5529 "VideoMetadata.c"
 }
 
 
 void avi_chunk_unref (gpointer instance) {
-	AVIChunk* self;
+	AVIChunk * self;
 	self = instance;
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -5549,7 +5539,7 @@ void avi_chunk_unref (gpointer instance) {
 		AVI_CHUNK_GET_CLASS (self)->finalize (self);
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5552 "VideoMetadata.c"
+#line 5542 "VideoMetadata.c"
 	}
 }
 
diff --git a/src/VideoMonitor.c b/src/VideoMonitor.c
index d7410e2..5edd809 100644
--- a/src/VideoMonitor.c
+++ b/src/VideoMonitor.c
@@ -1,4 +1,4 @@
-/* VideoMonitor.c generated by valac 0.34.7, the Vala compiler
+/* VideoMonitor.c generated by valac 0.36.6, the Vala compiler
  * generated from VideoMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -320,7 +320,7 @@ struct _MediaMonitorClass {
 	MonitorableUpdates* (*create_updates) (MediaMonitor* self, Monitorable* monitorable);
 	void (*on_media_source_destroyed) (MediaMonitor* self, DataSource* source);
 	void (*notify_discovery_started) (MediaMonitor* self);
-	MediaMonitorDiscoveredFile (*notify_file_discovered) (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable** monitorable);
+	MediaMonitorDiscoveredFile (*notify_file_discovered) (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable);
 	GeeCollection* (*candidates_for_unknown_file) (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_);
 	GFile** (*get_auxilliary_backing_files) (MediaMonitor* self, Monitorable* monitorable, int* result_length1);
 	void (*update_backing_file_info) (MediaMonitor* self, Monitorable* monitorable, GFile* file, GFileInfo* info);
@@ -426,7 +426,7 @@ void monitorable_updates_mark_online (MonitorableUpdates* self);
 gboolean video_updates_is_check_interpretable (VideoUpdates* self);
 static gboolean video_updates_real_is_all_updated (MonitorableUpdates* base);
 gboolean monitorable_updates_is_all_updated (MonitorableUpdates* self);
-static void video_updates_finalize (MonitorableUpdates* obj);
+static void video_updates_finalize (MonitorableUpdates * obj);
 GType media_monitor_get_type (void) G_GNUC_CONST;
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
@@ -473,7 +473,7 @@ static MediaSourceCollection* video_monitor_real_get_media_source_collection (Me
 static gboolean video_monitor_real_is_file_represented (MediaMonitor* base, GFile* file);
 GType video_source_collection_state_get_type (void) G_GNUC_CONST;
 static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSourceCollectionState* state);
-static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable** monitorable);
+static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable* * monitorable);
 static GeeCollection* video_monitor_real_candidates_for_unknown_file (MediaMonitor* base, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_);
 void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self, GFileInfo* info, GeeCollection* matching_master);
 static gboolean video_monitor_real_notify_file_created (MediaMonitor* base, GFile* file, GFileInfo* info);
@@ -537,8 +537,8 @@ GType abstract_semaphore_get_type (void) G_GNUC_CONST;
 BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore);
 static void video_monitor_video_interpretable_check_job_real_execute (BackgroundJob* base);
 VideoInterpretableResults* video_check_is_interpretable (Video* self);
-static void video_monitor_video_interpretable_check_job_finalize (BackgroundJob* obj);
-static void video_monitor_finalize (GObject* obj);
+static void video_monitor_video_interpretable_check_job_finalize (BackgroundJob * obj);
+static void video_monitor_finalize (GObject * obj);
 
 
 static gpointer _g_object_ref0 (gpointer self) {
@@ -550,9 +550,9 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 VideoUpdates* video_updates_construct (GType object_type, Video* video) {
 	VideoUpdates* self = NULL;
-	Video* _tmp0_ = NULL;
-	Video* _tmp1_ = NULL;
-	Video* _tmp2_ = NULL;
+	Video* _tmp0_;
+	Video* _tmp1_;
+	Video* _tmp2_;
 #line 12 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_val_if_fail (IS_VIDEO (video), NULL);
 #line 13 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -581,7 +581,7 @@ VideoUpdates* video_updates_new (Video* video) {
 
 
 static void video_updates_real_set_check_interpretable (VideoUpdates* self, gboolean check) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 19 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	_tmp0_ = check;
 #line 19 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -613,7 +613,7 @@ static void video_updates_real_mark_online (MonitorableUpdates* base) {
 
 gboolean video_updates_is_check_interpretable (VideoUpdates* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_val_if_fail (IS_VIDEO_UPDATES (self), FALSE);
 #line 29 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -630,7 +630,7 @@ static gboolean video_updates_real_is_all_updated (MonitorableUpdates* base) {
 	VideoUpdates * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 32 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_UPDATES, VideoUpdates);
 #line 33 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -638,7 +638,7 @@ static gboolean video_updates_real_is_all_updated (MonitorableUpdates* base) {
 #line 33 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	if (_tmp1_ == FALSE) {
 #line 641 "VideoMonitor.c"
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 33 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp2_ = MONITORABLE_UPDATES_CLASS (video_updates_parent_class)->is_all_updated (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates));
 #line 33 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -665,11 +665,11 @@ static void video_updates_class_init (VideoUpdatesClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_type_class_add_private (klass, sizeof (VideoUpdatesPrivate));
 #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((VideoUpdatesClass *) klass)->set_check_interpretable = (void (*)(VideoUpdates*, gboolean)) video_updates_real_set_check_interpretable;
+	((VideoUpdatesClass *) klass)->set_check_interpretable = (void (*) (VideoUpdates *, gboolean)) video_updates_real_set_check_interpretable;
 #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->mark_online = (void (*)(MonitorableUpdates*)) video_updates_real_mark_online;
+	((MonitorableUpdatesClass *) klass)->mark_online = (void (*) (MonitorableUpdates *)) video_updates_real_mark_online;
 #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*)(MonitorableUpdates*)) video_updates_real_is_all_updated;
+	((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*) (MonitorableUpdates *)) video_updates_real_is_all_updated;
 #line 674 "VideoMonitor.c"
 }
 
@@ -683,7 +683,7 @@ static void video_updates_instance_init (VideoUpdates * self) {
 }
 
 
-static void video_updates_finalize (MonitorableUpdates* obj) {
+static void video_updates_finalize (MonitorableUpdates * obj) {
 	VideoUpdates * self;
 #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_UPDATES, VideoUpdates);
@@ -709,8 +709,8 @@ GType video_updates_get_type (void) {
 
 VideoMonitor* video_monitor_construct (GType object_type, GCancellable* cancellable) {
 	VideoMonitor * self = NULL;
-	VideoSourceCollection* _tmp0_ = NULL;
-	GCancellable* _tmp1_ = NULL;
+	VideoSourceCollection* _tmp0_;
+	GCancellable* _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
 #line 66 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -722,11 +722,11 @@ VideoMonitor* video_monitor_construct (GType object_type, GCancellable* cancella
 #line 723 "VideoMonitor.c"
 	{
 		GeeIterator* _obj_it = NULL;
-		VideoSourceCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
+		VideoSourceCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeCollection* _tmp4_;
+		GeeIterator* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp2_ = video_global;
 #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -744,17 +744,17 @@ VideoMonitor* video_monitor_construct (GType object_type, GCancellable* cancella
 #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		while (TRUE) {
 #line 747 "VideoMonitor.c"
-			GeeIterator* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			DataObject* obj = NULL;
-			GeeIterator* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
 			Video* video = NULL;
-			DataObject* _tmp11_ = NULL;
-			Video* _tmp12_ = NULL;
-			Video* _tmp13_ = NULL;
-			Video* _tmp14_ = NULL;
-			gboolean _tmp15_ = FALSE;
+			DataObject* _tmp11_;
+			Video* _tmp12_;
+			Video* _tmp13_;
+			Video* _tmp14_;
+			gboolean _tmp15_;
 #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp7_ = _obj_it;
 #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -788,7 +788,7 @@ VideoMonitor* video_monitor_construct (GType object_type, GCancellable* cancella
 #line 71 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			if (!_tmp15_) {
 #line 791 "VideoMonitor.c"
-				Video* _tmp16_ = NULL;
+				Video* _tmp16_;
 #line 72 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp16_ = video;
 #line 72 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -821,9 +821,9 @@ VideoMonitor* video_monitor_new (GCancellable* cancellable) {
 static MonitorableUpdates* video_monitor_real_create_updates (MediaMonitor* base, Monitorable* monitorable) {
 	VideoMonitor * self;
 	MonitorableUpdates* result = NULL;
-	Monitorable* _tmp0_ = NULL;
-	Monitorable* _tmp1_ = NULL;
-	VideoUpdates* _tmp2_ = NULL;
+	Monitorable* _tmp0_;
+	Monitorable* _tmp1_;
+	VideoUpdates* _tmp2_;
 #line 76 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 76 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -854,8 +854,8 @@ static gpointer _data_collection_ref0 (gpointer self) {
 static MediaSourceCollection* video_monitor_real_get_media_source_collection (MediaMonitor* base) {
 	VideoMonitor * self;
 	MediaSourceCollection* result = NULL;
-	VideoSourceCollection* _tmp0_ = NULL;
-	MediaSourceCollection* _tmp1_ = NULL;
+	VideoSourceCollection* _tmp0_;
+	MediaSourceCollection* _tmp1_;
 #line 82 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 83 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -874,11 +874,11 @@ static gboolean video_monitor_real_is_file_represented (MediaMonitor* base, GFil
 	VideoMonitor * self;
 	gboolean result = FALSE;
 	VideoSourceCollectionState state = 0;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoSourceCollectionState _tmp1_ = 0;
-	Video* _tmp2_ = NULL;
-	Video* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	Video* _tmp2_;
+	Video* _tmp3_;
+	gboolean _tmp4_;
 #line 86 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 86 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -903,17 +903,17 @@ static gboolean video_monitor_real_is_file_represented (MediaMonitor* base, GFil
 }
 
 
-static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable** monitorable) {
+static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable* * monitorable) {
 	VideoMonitor * self;
 	Monitorable* _vala_monitorable = NULL;
 	MediaMonitorDiscoveredFile result = 0;
 	VideoSourceCollectionState state = 0;
 	Video* video = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoSourceCollectionState _tmp1_ = 0;
-	Video* _tmp2_ = NULL;
-	Video* _tmp3_ = NULL;
-	VideoSourceCollectionState _tmp4_ = 0;
+	Video* _tmp2_;
+	Video* _tmp3_;
+	VideoSourceCollectionState _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 91 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -964,8 +964,8 @@ static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (Med
 		case VIDEO_SOURCE_COLLECTION_STATE_OFFLINE:
 #line 966 "VideoMonitor.c"
 		{
-			Video* _tmp5_ = NULL;
-			Monitorable* _tmp6_ = NULL;
+			Video* _tmp5_;
+			Monitorable* _tmp6_;
 #line 104 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp5_ = video;
 #line 104 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1040,9 +1040,9 @@ static GeeCollection* video_monitor_real_candidates_for_unknown_file (MediaMonit
 	MediaMonitorDiscoveredFile _vala_result = 0;
 	GeeCollection* result = NULL;
 	GeeCollection* matched = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	VideoSourceCollection* _tmp1_ = NULL;
-	GFileInfo* _tmp2_ = NULL;
+	GeeArrayList* _tmp0_;
+	VideoSourceCollection* _tmp1_;
+	GFileInfo* _tmp2_;
 #line 117 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 117 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1080,11 +1080,11 @@ static gboolean video_monitor_real_notify_file_created (MediaMonitor* base, GFil
 	gboolean result = FALSE;
 	VideoSourceCollectionState state = 0;
 	Video* video = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoSourceCollectionState _tmp1_ = 0;
-	Video* _tmp2_ = NULL;
-	Video* _tmp3_ = NULL;
-	Video* _tmp4_ = NULL;
+	Video* _tmp2_;
+	Video* _tmp3_;
+	Video* _tmp4_;
 #line 127 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 127 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1130,16 +1130,16 @@ static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 	gboolean result = FALSE;
 	VideoSourceCollectionState old_state = 0;
 	Video* old_video = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoSourceCollectionState _tmp1_ = 0;
-	Video* _tmp2_ = NULL;
+	Video* _tmp2_;
 	VideoSourceCollectionState new_state = 0;
 	Video* new_video = NULL;
-	GFile* _tmp3_ = NULL;
+	GFile* _tmp3_;
 	VideoSourceCollectionState _tmp4_ = 0;
-	Video* _tmp5_ = NULL;
+	Video* _tmp5_;
 	gboolean _tmp6_ = FALSE;
-	Video* _tmp7_ = NULL;
+	Video* _tmp7_;
 #line 138 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 138 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1169,7 +1169,7 @@ static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 #line 157 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	if (_tmp7_ != NULL) {
 #line 1172 "VideoMonitor.c"
-		Video* _tmp8_ = NULL;
+		Video* _tmp8_;
 #line 157 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp8_ = new_video;
 #line 157 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1183,8 +1183,8 @@ static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 #line 157 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	if (_tmp6_) {
 #line 1186 "VideoMonitor.c"
-		Video* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
+		Video* _tmp9_;
+		GFile* _tmp10_;
 #line 159 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp9_ = old_video;
 #line 159 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1194,13 +1194,13 @@ static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 #line 1195 "VideoMonitor.c"
 	} else {
 		gboolean _tmp11_ = FALSE;
-		Video* _tmp12_ = NULL;
+		Video* _tmp12_;
 #line 160 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp12_ = old_video;
 #line 160 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		if (_tmp12_ == NULL) {
 #line 1203 "VideoMonitor.c"
-			Video* _tmp13_ = NULL;
+			Video* _tmp13_;
 #line 160 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp13_ = new_video;
 #line 160 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1214,7 +1214,7 @@ static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 #line 160 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		if (_tmp11_) {
 #line 1217 "VideoMonitor.c"
-			Video* _tmp14_ = NULL;
+			Video* _tmp14_;
 #line 162 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp14_ = new_video;
 #line 162 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1222,13 +1222,13 @@ static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 #line 1223 "VideoMonitor.c"
 		} else {
 			gboolean _tmp15_ = FALSE;
-			Video* _tmp16_ = NULL;
+			Video* _tmp16_;
 #line 163 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp16_ = old_video;
 #line 163 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			if (_tmp16_ == NULL) {
 #line 1231 "VideoMonitor.c"
-				Video* _tmp17_ = NULL;
+				Video* _tmp17_;
 #line 163 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp17_ = new_video;
 #line 163 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1252,15 +1252,15 @@ static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 #line 1253 "VideoMonitor.c"
 			} else {
 				gboolean _tmp18_ = FALSE;
-				Video* _tmp19_ = NULL;
-				Video* _tmp21_ = NULL;
-				Video* _tmp22_ = NULL;
+				Video* _tmp19_;
+				Video* _tmp21_;
+				Video* _tmp22_;
 #line 167 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp19_ = old_video;
 #line 167 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				if (_tmp19_ != NULL) {
 #line 1263 "VideoMonitor.c"
-					Video* _tmp20_ = NULL;
+					Video* _tmp20_;
 #line 167 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 					_tmp20_ = new_video;
 #line 167 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1301,11 +1301,11 @@ static gboolean video_monitor_real_notify_file_altered (MediaMonitor* base, GFil
 	VideoMonitor * self;
 	gboolean result = FALSE;
 	VideoSourceCollectionState state = 0;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoSourceCollectionState _tmp1_ = 0;
-	Video* _tmp2_ = NULL;
-	Video* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	Video* _tmp2_;
+	Video* _tmp3_;
+	gboolean _tmp4_;
 #line 177 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 177 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1335,12 +1335,12 @@ static gboolean video_monitor_real_notify_file_attributes_altered (MediaMonitor*
 	gboolean result = FALSE;
 	VideoSourceCollectionState state = 0;
 	Video* video = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoSourceCollectionState _tmp1_ = 0;
-	Video* _tmp2_ = NULL;
-	Video* _tmp3_ = NULL;
-	Video* _tmp4_ = NULL;
-	Video* _tmp5_ = NULL;
+	Video* _tmp2_;
+	Video* _tmp3_;
+	Video* _tmp4_;
+	Video* _tmp5_;
 #line 182 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 182 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1388,12 +1388,12 @@ static gboolean video_monitor_real_notify_file_alteration_completed (MediaMonito
 	gboolean result = FALSE;
 	VideoSourceCollectionState state = 0;
 	Video* video = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoSourceCollectionState _tmp1_ = 0;
-	Video* _tmp2_ = NULL;
-	Video* _tmp3_ = NULL;
-	Video* _tmp4_ = NULL;
-	GFileInfo* _tmp5_ = NULL;
+	Video* _tmp2_;
+	Video* _tmp3_;
+	Video* _tmp4_;
+	GFileInfo* _tmp5_;
 #line 194 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 194 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1441,12 +1441,12 @@ static gboolean video_monitor_real_notify_file_deleted (MediaMonitor* base, GFil
 	gboolean result = FALSE;
 	VideoSourceCollectionState state = 0;
 	Video* video = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoSourceCollectionState _tmp1_ = 0;
-	Video* _tmp2_ = NULL;
-	Video* _tmp3_ = NULL;
-	Video* _tmp4_ = NULL;
-	Video* _tmp5_ = NULL;
+	Video* _tmp2_;
+	Video* _tmp3_;
+	Video* _tmp4_;
+	Video* _tmp5_;
 #line 205 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 205 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1494,10 +1494,10 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou
 	Video* result = NULL;
 	GFile* real_file = NULL;
 	GFile* _tmp25_ = NULL;
-	GFile* _tmp26_ = NULL;
-	VideoSourceCollection* _tmp28_ = NULL;
+	GFile* _tmp26_;
+	VideoSourceCollection* _tmp28_;
 	VideoSourceCollectionState _tmp29_ = 0;
-	Video* _tmp30_ = NULL;
+	Video* _tmp30_;
 #line 217 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_val_if_fail (IS_VIDEO_MONITOR (self), NULL);
 #line 217 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1507,10 +1507,10 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou
 #line 1508 "VideoMonitor.c"
 	{
 		GeeIterator* _monitorable_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp0_ = media_monitor_get_monitorables (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor));
 #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1526,23 +1526,23 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou
 #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		while (TRUE) {
 #line 1529 "VideoMonitor.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			Monitorable* monitorable = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
 			Video* video = NULL;
-			Monitorable* _tmp8_ = NULL;
-			Video* _tmp9_ = NULL;
+			Monitorable* _tmp8_;
+			Video* _tmp9_;
 			VideoUpdates* updates = NULL;
-			Video* _tmp10_ = NULL;
-			VideoUpdates* _tmp11_ = NULL;
-			VideoUpdates* _tmp12_ = NULL;
+			Video* _tmp10_;
+			VideoUpdates* _tmp11_;
+			VideoUpdates* _tmp12_;
 			gboolean _tmp13_ = FALSE;
-			VideoUpdates* _tmp14_ = NULL;
-			GFile* _tmp15_ = NULL;
-			GFile* _tmp16_ = NULL;
-			gboolean _tmp17_ = FALSE;
+			VideoUpdates* _tmp14_;
+			GFile* _tmp15_;
+			GFile* _tmp16_;
+			gboolean _tmp17_;
 #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp4_ = _monitorable_it;
 #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1598,11 +1598,11 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou
 #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			if (_tmp17_) {
 #line 1601 "VideoMonitor.c"
-				VideoUpdates* _tmp18_ = NULL;
-				GFile* _tmp19_ = NULL;
-				GFile* _tmp20_ = NULL;
-				GFile* _tmp21_ = NULL;
-				gboolean _tmp22_ = FALSE;
+				VideoUpdates* _tmp18_;
+				GFile* _tmp19_;
+				GFile* _tmp20_;
+				GFile* _tmp21_;
+				gboolean _tmp22_;
 #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp18_ = updates;
 #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1626,8 +1626,8 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou
 #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			if (_tmp13_) {
 #line 1629 "VideoMonitor.c"
-				Video* _tmp23_ = NULL;
-				GFile* _tmp24_ = NULL;
+				Video* _tmp23_;
+				GFile* _tmp24_;
 #line 227 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp23_ = video;
 #line 227 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1665,7 +1665,7 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou
 #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	if (_tmp25_ == NULL) {
 #line 1668 "VideoMonitor.c"
-		GFile* _tmp27_ = NULL;
+		GFile* _tmp27_;
 #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp27_ = file;
 #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1697,9 +1697,9 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou
 VideoUpdates* video_monitor_fetch_video_updates (VideoMonitor* self, Video* video) {
 	VideoUpdates* result = NULL;
 	VideoUpdates* updates = NULL;
-	Video* _tmp0_ = NULL;
-	MonitorableUpdates* _tmp1_ = NULL;
-	VideoUpdates* _tmp2_ = NULL;
+	Video* _tmp0_;
+	MonitorableUpdates* _tmp1_;
+	VideoUpdates* _tmp2_;
 #line 236 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_val_if_fail (IS_VIDEO_MONITOR (self), NULL);
 #line 236 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1730,9 +1730,9 @@ VideoUpdates* video_monitor_fetch_video_updates (VideoMonitor* self, Video* vide
 
 VideoUpdates* video_monitor_get_existing_video_updates (VideoMonitor* self, Video* video) {
 	VideoUpdates* result = NULL;
-	Video* _tmp0_ = NULL;
-	MonitorableUpdates* _tmp1_ = NULL;
-	VideoUpdates* _tmp2_ = NULL;
+	Video* _tmp0_;
+	MonitorableUpdates* _tmp1_;
+	VideoUpdates* _tmp2_;
 #line 243 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_val_if_fail (IS_VIDEO_MONITOR (self), NULL);
 #line 243 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1758,10 +1758,10 @@ VideoUpdates* video_monitor_get_existing_video_updates (VideoMonitor* self, Vide
 
 
 void video_monitor_set_check_interpretable (VideoMonitor* self, Video* video, gboolean check) {
-	Video* _tmp0_ = NULL;
-	VideoUpdates* _tmp1_ = NULL;
-	VideoUpdates* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	Video* _tmp0_;
+	VideoUpdates* _tmp1_;
+	VideoUpdates* _tmp2_;
+	gboolean _tmp3_;
 #line 247 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_if_fail (IS_VIDEO_MONITOR (self));
 #line 247 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1798,10 +1798,10 @@ static void _video_monitor_on_interpretable_check_complete_completion_callback (
 
 static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error) {
 	VideoMonitor * self;
-	GeeCollection* _tmp0_ = NULL;
-	TransactionController* _tmp1_ = NULL;
+	GeeCollection* _tmp0_;
+	TransactionController* _tmp1_;
 	GeeArrayList* check = NULL;
-	GeeArrayList* _tmp26_ = NULL;
+	GeeArrayList* _tmp26_;
 	GError * _inner_error_ = NULL;
 #line 251 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
@@ -1828,8 +1828,8 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1829 "VideoMonitor.c"
 	{
 		GeeIterator* _monitorable_updates_it = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeCollection* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp2_ = all_updates;
 #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1839,20 +1839,20 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		while (TRUE) {
 #line 1842 "VideoMonitor.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			MonitorableUpdates* monitorable_updates = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
-			gint _tmp8_ = 0;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			gint _tmp8_;
 			gboolean _tmp9_ = FALSE;
-			GeeArrayList* _tmp10_ = NULL;
+			GeeArrayList* _tmp10_;
 			VideoUpdates* updates = NULL;
-			MonitorableUpdates* _tmp14_ = NULL;
-			VideoUpdates* _tmp15_ = NULL;
-			VideoUpdates* _tmp16_ = NULL;
-			VideoUpdates* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
+			MonitorableUpdates* _tmp14_;
+			VideoUpdates* _tmp15_;
+			VideoUpdates* _tmp16_;
+			VideoUpdates* _tmp17_;
+			gboolean _tmp18_;
 #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp4_ = _monitorable_updates_it;
 #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1884,9 +1884,9 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			if (_tmp10_ != NULL) {
 #line 1887 "VideoMonitor.c"
-				GeeArrayList* _tmp11_ = NULL;
-				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
+				GeeArrayList* _tmp11_;
+				gint _tmp12_;
+				gint _tmp13_;
 #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp11_ = check;
 #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1934,18 +1934,18 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 270 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			if (_tmp18_) {
 #line 1937 "VideoMonitor.c"
-				GeeArrayList* _tmp19_ = NULL;
-				GeeArrayList* _tmp21_ = NULL;
-				VideoUpdates* _tmp22_ = NULL;
-				Video* _tmp23_ = NULL;
-				VideoUpdates* _tmp24_ = NULL;
-				gint _tmp25_ = 0;
+				GeeArrayList* _tmp19_;
+				GeeArrayList* _tmp21_;
+				VideoUpdates* _tmp22_;
+				Video* _tmp23_;
+				VideoUpdates* _tmp24_;
+				gint _tmp25_;
 #line 271 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp19_ = check;
 #line 271 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				if (_tmp19_ == NULL) {
 #line 1948 "VideoMonitor.c"
-					GeeArrayList* _tmp20_ = NULL;
+					GeeArrayList* _tmp20_;
 #line 272 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 					_tmp20_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 272 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1987,15 +1987,15 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 280 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	if (_tmp26_ != NULL) {
 #line 1990 "VideoMonitor.c"
-		GeeArrayList* _tmp27_ = NULL;
-		gint _tmp28_ = 0;
-		gint _tmp29_ = 0;
-		gchar* _tmp30_ = NULL;
-		gchar* _tmp31_ = NULL;
-		guint64 _tmp32_ = 0ULL;
-		GeeArrayList* _tmp33_ = NULL;
-		gint _tmp34_ = 0;
-		gint _tmp35_ = 0;
+		GeeArrayList* _tmp27_;
+		gint _tmp28_;
+		gint _tmp29_;
+		gchar* _tmp30_;
+		gchar* _tmp31_;
+		guint64 _tmp32_;
+		GeeArrayList* _tmp33_;
+		gint _tmp34_;
+		gint _tmp35_;
 #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp27_ = check;
 #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -2025,12 +2025,12 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 2026 "VideoMonitor.c"
 		{
 			GeeArrayList* _video_list = NULL;
-			GeeArrayList* _tmp36_ = NULL;
-			GeeArrayList* _tmp37_ = NULL;
+			GeeArrayList* _tmp36_;
+			GeeArrayList* _tmp37_;
 			gint _video_size = 0;
-			GeeArrayList* _tmp38_ = NULL;
-			gint _tmp39_ = 0;
-			gint _tmp40_ = 0;
+			GeeArrayList* _tmp38_;
+			gint _tmp39_;
+			gint _tmp40_;
 			gint _video_index = 0;
 #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp36_ = check;
@@ -2051,17 +2051,17 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			while (TRUE) {
 #line 2054 "VideoMonitor.c"
-				gint _tmp41_ = 0;
-				gint _tmp42_ = 0;
-				gint _tmp43_ = 0;
+				gint _tmp41_;
+				gint _tmp42_;
+				gint _tmp43_;
 				Video* video = NULL;
-				GeeArrayList* _tmp44_ = NULL;
-				gint _tmp45_ = 0;
-				gpointer _tmp46_ = NULL;
-				Workers* _tmp47_ = NULL;
-				Video* _tmp48_ = NULL;
-				VideoMonitorVideoInterpretableCheckJob* _tmp49_ = NULL;
-				VideoMonitorVideoInterpretableCheckJob* _tmp50_ = NULL;
+				GeeArrayList* _tmp44_;
+				gint _tmp45_;
+				gpointer _tmp46_;
+				Workers* _tmp47_;
+				Video* _tmp48_;
+				VideoMonitorVideoInterpretableCheckJob* _tmp49_;
+				VideoMonitorVideoInterpretableCheckJob* _tmp50_;
 #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp41_ = _video_index;
 #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -2120,12 +2120,12 @@ static gpointer _background_job_ref0 (gpointer self) {
 
 static void video_monitor_on_interpretable_check_complete (VideoMonitor* self, BackgroundJob* j) {
 	VideoMonitorVideoInterpretableCheckJob* job = NULL;
-	BackgroundJob* _tmp0_ = NULL;
-	VideoMonitorVideoInterpretableCheckJob* _tmp1_ = NULL;
-	VideoMonitorVideoInterpretableCheckJob* _tmp2_ = NULL;
-	VideoInterpretableResults* _tmp3_ = NULL;
-	guint64 _tmp4_ = 0ULL;
-	guint64 _tmp5_ = 0ULL;
+	BackgroundJob* _tmp0_;
+	VideoMonitorVideoInterpretableCheckJob* _tmp1_;
+	VideoMonitorVideoInterpretableCheckJob* _tmp2_;
+	VideoInterpretableResults* _tmp3_;
+	guint64 _tmp4_;
+	guint64 _tmp5_;
 #line 291 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_if_fail (IS_VIDEO_MONITOR (self));
 #line 291 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -2162,11 +2162,11 @@ static void video_monitor_on_interpretable_check_complete (VideoMonitor* self, B
 
 static VideoMonitorVideoInterpretableCheckJob* video_monitor_video_interpretable_check_job_construct (GType object_type, Video* video, CompletionCallback callback, void* callback_target) {
 	VideoMonitorVideoInterpretableCheckJob* self = NULL;
-	Video* _tmp0_ = NULL;
-	CompletionCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	Video* _tmp2_ = NULL;
-	Video* _tmp3_ = NULL;
+	Video* _tmp0_;
+	CompletionCallback _tmp1_;
+	void* _tmp1__target;
+	Video* _tmp2_;
+	Video* _tmp3_;
 #line 49 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_val_if_fail (IS_VIDEO (video), NULL);
 #line 50 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -2200,8 +2200,8 @@ static VideoMonitorVideoInterpretableCheckJob* video_monitor_video_interpretable
 
 static void video_monitor_video_interpretable_check_job_real_execute (BackgroundJob* base) {
 	VideoMonitorVideoInterpretableCheckJob * self;
-	Video* _tmp0_ = NULL;
-	VideoInterpretableResults* _tmp1_ = NULL;
+	Video* _tmp0_;
+	VideoInterpretableResults* _tmp1_;
 #line 54 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, VIDEO_MONITOR_TYPE_VIDEO_INTERPRETABLE_CHECK_JOB, VideoMonitorVideoInterpretableCheckJob);
 #line 55 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -2222,7 +2222,7 @@ static void video_monitor_video_interpretable_check_job_class_init (VideoMonitor
 #line 42 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	((BackgroundJobClass *) klass)->finalize = video_monitor_video_interpretable_check_job_finalize;
 #line 42 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) video_monitor_video_interpretable_check_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) video_monitor_video_interpretable_check_job_real_execute;
 #line 2227 "VideoMonitor.c"
 }
 
@@ -2234,7 +2234,7 @@ static void video_monitor_video_interpretable_check_job_instance_init (VideoMoni
 }
 
 
-static void video_monitor_video_interpretable_check_job_finalize (BackgroundJob* obj) {
+static void video_monitor_video_interpretable_check_job_finalize (BackgroundJob * obj) {
 	VideoMonitorVideoInterpretableCheckJob * self;
 #line 42 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIDEO_MONITOR_TYPE_VIDEO_INTERPRETABLE_CHECK_JOB, VideoMonitorVideoInterpretableCheckJob);
@@ -2266,29 +2266,29 @@ static void video_monitor_class_init (VideoMonitorClass * klass) {
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_type_class_add_private (klass, sizeof (VideoMonitorPrivate));
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->create_updates = (MonitorableUpdates* (*)(MediaMonitor*, Monitorable*)) video_monitor_real_create_updates;
+	((MediaMonitorClass *) klass)->create_updates = (MonitorableUpdates* (*) (MediaMonitor *, Monitorable*)) video_monitor_real_create_updates;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->get_media_source_collection = (MediaSourceCollection* (*)(MediaMonitor*)) video_monitor_real_get_media_source_collection;
+	((MediaMonitorClass *) klass)->get_media_source_collection = (MediaSourceCollection* (*) (MediaMonitor *)) video_monitor_real_get_media_source_collection;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->is_file_represented = (gboolean (*)(MediaMonitor*, GFile*)) video_monitor_real_is_file_represented;
+	((MediaMonitorClass *) klass)->is_file_represented = (gboolean (*) (MediaMonitor *, GFile*)) video_monitor_real_is_file_represented;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_discovered = (MediaMonitorDiscoveredFile (*)(MediaMonitor*, GFile*, GFileInfo*, Monitorable**)) video_monitor_real_notify_file_discovered;
+	((MediaMonitorClass *) klass)->notify_file_discovered = (MediaMonitorDiscoveredFile (*) (MediaMonitor *, GFile*, GFileInfo*, Monitorable* *)) video_monitor_real_notify_file_discovered;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->candidates_for_unknown_file = (GeeCollection* (*)(MediaMonitor*, GFile*, GFileInfo*, MediaMonitorDiscoveredFile*)) video_monitor_real_candidates_for_unknown_file;
+	((MediaMonitorClass *) klass)->candidates_for_unknown_file = (GeeCollection* (*) (MediaMonitor *, GFile*, GFileInfo*, MediaMonitorDiscoveredFile*)) video_monitor_real_candidates_for_unknown_file;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_created = (gboolean (*)(MediaMonitor*, GFile*, GFileInfo*)) video_monitor_real_notify_file_created;
+	((MediaMonitorClass *) klass)->notify_file_created = (gboolean (*) (MediaMonitor *, GFile*, GFileInfo*)) video_monitor_real_notify_file_created;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_moved = (gboolean (*)(MediaMonitor*, GFile*, GFile*, GFileInfo*)) video_monitor_real_notify_file_moved;
+	((MediaMonitorClass *) klass)->notify_file_moved = (gboolean (*) (MediaMonitor *, GFile*, GFile*, GFileInfo*)) video_monitor_real_notify_file_moved;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_altered = (gboolean (*)(MediaMonitor*, GFile*)) video_monitor_real_notify_file_altered;
+	((MediaMonitorClass *) klass)->notify_file_altered = (gboolean (*) (MediaMonitor *, GFile*)) video_monitor_real_notify_file_altered;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_attributes_altered = (gboolean (*)(MediaMonitor*, GFile*)) video_monitor_real_notify_file_attributes_altered;
+	((MediaMonitorClass *) klass)->notify_file_attributes_altered = (gboolean (*) (MediaMonitor *, GFile*)) video_monitor_real_notify_file_attributes_altered;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_alteration_completed = (gboolean (*)(MediaMonitor*, GFile*, GFileInfo*)) video_monitor_real_notify_file_alteration_completed;
+	((MediaMonitorClass *) klass)->notify_file_alteration_completed = (gboolean (*) (MediaMonitor *, GFile*, GFileInfo*)) video_monitor_real_notify_file_alteration_completed;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_deleted = (gboolean (*)(MediaMonitor*, GFile*)) video_monitor_real_notify_file_deleted;
+	((MediaMonitorClass *) klass)->notify_file_deleted = (gboolean (*) (MediaMonitor *, GFile*)) video_monitor_real_notify_file_deleted;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->process_updates = (void (*)(MediaMonitor*, GeeCollection*, TransactionController*, gint*, GError**)) video_monitor_real_process_updates;
+	((MediaMonitorClass *) klass)->process_updates = (void (*) (MediaMonitor *, GeeCollection*, TransactionController*, gint*, GError**)) video_monitor_real_process_updates;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	G_OBJECT_CLASS (klass)->finalize = video_monitor_finalize;
 #line 2295 "VideoMonitor.c"
@@ -2296,7 +2296,7 @@ static void video_monitor_class_init (VideoMonitorClass * klass) {
 
 
 static void video_monitor_instance_init (VideoMonitor * self) {
-	Workers* _tmp0_ = NULL;
+	Workers* _tmp0_;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self->priv = VIDEO_MONITOR_GET_PRIVATE (self);
 #line 62 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -2309,7 +2309,7 @@ static void video_monitor_instance_init (VideoMonitor * self) {
 }
 
 
-static void video_monitor_finalize (GObject* obj) {
+static void video_monitor_finalize (GObject * obj) {
 	VideoMonitor * self;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_MONITOR, VideoMonitor);
diff --git a/src/VideoSupport.c b/src/VideoSupport.c
index fb3aa6e..dd6a15f 100644
--- a/src/VideoSupport.c
+++ b/src/VideoSupport.c
@@ -1,4 +1,4 @@
-/* VideoSupport.c generated by valac 0.34.7, the Vala compiler
+/* VideoSupport.c generated by valac 0.36.6, the Vala compiler
  * generated from VideoSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1052,9 +1052,9 @@ static gboolean video_offline_regen_complete = FALSE;
 extern VideoSourceCollection* video_global;
 VideoSourceCollection* video_global = NULL;
 static gpointer video_interpretable_results_parent_class = NULL;
-static FlaggableIface* video_flaggable_parent_iface = NULL;
-static MonitorableIface* video_monitorable_parent_iface = NULL;
-static DateableIface* video_dateable_parent_iface = NULL;
+static FlaggableIface * video_flaggable_parent_iface = NULL;
+static MonitorableIface * video_monitorable_parent_iface = NULL;
+static DateableIface * video_dateable_parent_iface = NULL;
 static gpointer video_source_collection_parent_class = NULL;
 
 GQuark video_error_quark (void);
@@ -1091,7 +1091,7 @@ VideoRow* video_row_new (void);
 VideoRow* video_row_construct (GType object_type);
 VideoImportParams* video_import_params_new (GFile* file, ImportID* import_id, const gchar* md5, Thumbnails* thumbnails, time_t exposure_time_override);
 VideoImportParams* video_import_params_construct (GType object_type, GFile* file, ImportID* import_id, const gchar* md5, Thumbnails* thumbnails, time_t exposure_time_override);
-static void video_import_params_finalize (VideoImportParams* obj);
+static void video_import_params_finalize (VideoImportParams * obj);
 gpointer video_reader_ref (gpointer instance);
 void video_reader_unref (gpointer instance);
 GParamSpec* param_spec_video_reader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1109,7 +1109,7 @@ VideoReader* video_reader_new (GFile* file);
 VideoReader* video_reader_construct (GType object_type, GFile* file);
 gboolean video_reader_is_supported_video_file (GFile* file);
 gboolean video_reader_is_supported_video_filename (const gchar* filename);
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
 gint utf8_ci_compare (void* a, void* b);
 GType import_result_get_type (void) G_GNUC_CONST;
 ImportResult video_reader_prepare_for_import (VideoImportParams* params);
@@ -1164,7 +1164,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void);
 VideoMetadata* video_metadata_new (void);
 VideoMetadata* video_metadata_construct (GType object_type);
 void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error);
-static void video_reader_finalize (VideoReader* obj);
+static void video_reader_finalize (VideoReader * obj);
 GType data_object_get_type (void) G_GNUC_CONST;
 gpointer alteration_ref (gpointer instance);
 void alteration_unref (gpointer instance);
@@ -1308,7 +1308,7 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id);
 gboolean video_table_set_event (VideoTable* self, VideoID* video_id, EventID* event_id);
 gboolean video_is_duplicate (GFile* file, const gchar* full_md5);
 gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* md5);
-ImportResult video_import_create (VideoImportParams* params, Video** video);
+ImportResult video_import_create (VideoImportParams* params, Video* * video);
 void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GError** error);
 gboolean video_id_is_invalid (VideoID *self);
 void video_import_failed (Video* video);
@@ -1415,8 +1415,8 @@ enum  {
 };
 void thumbnail_cache_replace (ThumbnailSource* source, ThumbnailCacheSize size, GdkPixbuf* replacement, GError** error);
 void thumbnail_source_notify_thumbnail_altered (ThumbnailSource* self);
-static void video_interpretable_results_finalize (VideoInterpretableResults* obj);
-static void video_finalize (GObject* obj);
+static void video_interpretable_results_finalize (VideoInterpretableResults * obj);
+static void video_finalize (GObject * obj);
 GType marker_get_type (void) G_GNUC_CONST;
 gpointer source_backlink_ref (gpointer instance);
 void source_backlink_unref (gpointer instance);
@@ -1497,7 +1497,7 @@ gboolean video_id_is_valid (VideoID *self);
 MediaSourceTransactionController* media_source_transaction_controller_new (MediaSourceCollection* sources);
 MediaSourceTransactionController* media_source_transaction_controller_construct (GType object_type, MediaSourceCollection* sources);
 GType media_source_transaction_controller_get_type (void) G_GNUC_CONST;
-static void video_source_collection_finalize (DataCollection* obj);
+static void video_source_collection_finalize (DataCollection * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -1524,14 +1524,14 @@ static gpointer _thumbnails_ref0 (gpointer self) {
 
 VideoImportParams* video_import_params_construct (GType object_type, GFile* file, ImportID* import_id, const gchar* md5, Thumbnails* thumbnails, time_t exposure_time_override) {
 	VideoImportParams* self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	ImportID _tmp2_ = {0};
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	Thumbnails* _tmp5_ = NULL;
-	Thumbnails* _tmp6_ = NULL;
-	time_t _tmp7_ = 0;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	ImportID _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	Thumbnails* _tmp5_;
+	Thumbnails* _tmp6_;
+	time_t _tmp7_;
 #line 28 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 28 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -1627,7 +1627,7 @@ static gchar* value_video_import_params_collect_value (GValue* value, guint n_co
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (collect_values[0].v_pointer) {
 #line 1630 "VideoSupport.c"
-		VideoImportParams* object;
+		VideoImportParams * object;
 		object = collect_values[0].v_pointer;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1654,7 +1654,7 @@ static gchar* value_video_import_params_collect_value (GValue* value, guint n_co
 
 
 static gchar* value_video_import_params_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	VideoImportParams** object_p;
+	VideoImportParams ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!object_p) {
@@ -1706,7 +1706,7 @@ gpointer value_get_video_import_params (const GValue* value) {
 
 
 void value_set_video_import_params (GValue* value, gpointer v_object) {
-	VideoImportParams* old;
+	VideoImportParams * old;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_IMPORT_PARAMS));
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -1737,7 +1737,7 @@ void value_set_video_import_params (GValue* value, gpointer v_object) {
 
 
 void value_take_video_import_params (GValue* value, gpointer v_object) {
-	VideoImportParams* old;
+	VideoImportParams * old;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_IMPORT_PARAMS));
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -1775,7 +1775,7 @@ static void video_import_params_class_init (VideoImportParamsClass * klass) {
 
 
 static void video_import_params_instance_init (VideoImportParams * self) {
-	VideoRow* _tmp0_ = NULL;
+	VideoRow* _tmp0_;
 #line 18 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	import_id_init (&self->import_id, IMPORT_ID_INVALID);
 #line 26 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -1788,7 +1788,7 @@ static void video_import_params_instance_init (VideoImportParams * self) {
 }
 
 
-static void video_import_params_finalize (VideoImportParams* obj) {
+static void video_import_params_finalize (VideoImportParams * obj) {
 	VideoImportParams * self;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_IMPORT_PARAMS, VideoImportParams);
@@ -1821,7 +1821,7 @@ GType video_import_params_get_type (void) {
 
 
 gpointer video_import_params_ref (gpointer instance) {
-	VideoImportParams* self;
+	VideoImportParams * self;
 	self = instance;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1832,7 +1832,7 @@ gpointer video_import_params_ref (gpointer instance) {
 
 
 void video_import_params_unref (gpointer instance) {
-	VideoImportParams* self;
+	VideoImportParams * self;
 	self = instance;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1847,8 +1847,8 @@ void video_import_params_unref (gpointer instance) {
 
 VideoReader* video_reader_construct (GType object_type, GFile* file) {
 	VideoReader* self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 51 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 51 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -1877,21 +1877,21 @@ VideoReader* video_reader_new (GFile* file) {
 gboolean video_reader_is_supported_video_file (GFile* file) {
 	gboolean result = FALSE;
 	gchar* mime_type = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	guchar* _tmp3_ = NULL;
-	guchar* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	guchar* _tmp3_;
+	guchar* _tmp4_;
+	gint _tmp4__length1;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 	gboolean _tmp7_ = FALSE;
-	const gchar* _tmp8_ = NULL;
-	GFile* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	gboolean _tmp26_ = FALSE;
-	gboolean _tmp27_ = FALSE;
+	const gchar* _tmp8_;
+	GFile* _tmp23_;
+	gchar* _tmp24_;
+	gchar* _tmp25_;
+	gboolean _tmp26_;
+	gboolean _tmp27_;
 	GError * _inner_error_ = NULL;
 #line 55 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
@@ -1922,8 +1922,8 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (g_strcmp0 (_tmp8_, "audio/ogg") == 0) {
 #line 1925 "VideoSupport.c"
-		GFile* _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
+		GFile* _tmp9_;
+		gboolean _tmp10_;
 #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = file;
 #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -1941,14 +1941,14 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 #line 1942 "VideoSupport.c"
 		{
 			GFileInfo* info = NULL;
-			GFile* _tmp11_ = NULL;
-			GFileInfo* _tmp12_ = NULL;
+			GFile* _tmp11_;
+			GFileInfo* _tmp12_;
 			gchar* content_type = NULL;
-			GFileInfo* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			gchar* _tmp15_ = NULL;
+			GFileInfo* _tmp13_;
+			const gchar* _tmp14_;
+			gchar* _tmp15_;
 			gboolean _tmp16_ = FALSE;
-			const gchar* _tmp17_ = NULL;
+			const gchar* _tmp17_;
 #line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = file;
 #line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -1958,7 +1958,7 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 #line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1961 "VideoSupport.c"
-				goto __catch493_g_error;
+				goto __catch494_g_error;
 			}
 #line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp13_ = info;
@@ -1973,8 +1973,8 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp17_ != NULL) {
 #line 1976 "VideoSupport.c"
-				const gchar* _tmp18_ = NULL;
-				gboolean _tmp19_ = FALSE;
+				const gchar* _tmp18_;
+				gboolean _tmp19_;
 #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = content_type;
 #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2007,12 +2007,12 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 			_g_object_unref0 (info);
 #line 2009 "VideoSupport.c"
 		}
-		goto __finally493;
-		__catch493_g_error:
+		goto __finally494;
+		__catch494_g_error:
 		{
 			GError* _error_ = NULL;
-			GError* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
+			GError* _tmp20_;
+			const gchar* _tmp21_;
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_error_ = _inner_error_;
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2027,7 +2027,7 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 			_g_error_free0 (_error_);
 #line 2029 "VideoSupport.c"
 		}
-		__finally493:
+		__finally494:
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2034 "VideoSupport.c"
@@ -2065,137 +2065,17 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 }
 
 
-static gchar* string_slice (const gchar* self, glong start, glong end) {
-	gchar* result = NULL;
-	glong string_length = 0L;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	glong _tmp2_ = 0L;
-	glong _tmp5_ = 0L;
-	gboolean _tmp8_ = FALSE;
-	glong _tmp9_ = 0L;
-	gboolean _tmp12_ = FALSE;
-	glong _tmp13_ = 0L;
-	glong _tmp16_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp2_ < ((glong) 0)) {
-#line 2098 "VideoSupport.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		start = _tmp3_ + _tmp4_;
-#line 2107 "VideoSupport.c"
-	}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp5_ < ((glong) 0)) {
-#line 2113 "VideoSupport.c"
-		glong _tmp6_ = 0L;
-		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		end = _tmp6_ + _tmp7_;
-#line 2122 "VideoSupport.c"
-	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp9_ >= ((glong) 0)) {
-#line 2128 "VideoSupport.c"
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 2137 "VideoSupport.c"
-	} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = FALSE;
-#line 2141 "VideoSupport.c"
-	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp13_ >= ((glong) 0)) {
-#line 2149 "VideoSupport.c"
-		glong _tmp14_ = 0L;
-		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 2158 "VideoSupport.c"
-	} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp12_ = FALSE;
-#line 2162 "VideoSupport.c"
-	}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 2184 "VideoSupport.c"
-}
-
-
 gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 	gboolean result = FALSE;
 	gchar* mime_type = NULL;
-	const gchar* _tmp0_ = NULL;
-	guchar* _tmp1_ = NULL;
-	guchar* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	guchar* _tmp1_;
+	guchar* _tmp2_;
+	gint _tmp2__length1;
+	gchar* _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	const gchar* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	const gchar* _tmp5_;
+	gboolean _tmp6_;
 #line 74 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (filename != NULL, FALSE);
 #line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2214,1231 +2094,1223 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 	mime_type = _tmp3_;
 #line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = (g_free (_tmp2_), NULL);
-#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = mime_type;
-#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp6_ = strlen (_tmp5_);
-#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp7_ = _tmp6_;
-#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp7_ >= 6) {
-#line 2226 "VideoSupport.c"
-		const gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp8_ = mime_type;
-#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp9_ = string_slice (_tmp8_, (glong) 0, (glong) 6);
-#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp10_ = _tmp9_;
-#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp4_ = g_strcmp0 (_tmp10_, "video/") == 0;
-#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_g_free0 (_tmp10_);
-#line 2240 "VideoSupport.c"
+#line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp6_ = g_str_has_prefix (_tmp5_, "video/");
+#line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp6_) {
+#line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp4_ = TRUE;
+#line 2106 "VideoSupport.c"
 	} else {
-#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp4_ = FALSE;
-#line 2244 "VideoSupport.c"
+		const gchar* _tmp7_;
+		gboolean _tmp8_;
+#line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp7_ = mime_type;
+#line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp8_ = g_str_has_suffix (_tmp7_, "mp4");
+#line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp4_ = _tmp8_;
+#line 2116 "VideoSupport.c"
 	}
-#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp4_) {
-#line 2248 "VideoSupport.c"
+#line 2120 "VideoSupport.c"
 		gchar* extension = NULL;
 		gchar* name = NULL;
-		const gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-#line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		extension = NULL;
+		const gchar* _tmp9_;
+		gchar* _tmp10_ = NULL;
+		gchar* _tmp11_ = NULL;
+		const gchar* _tmp12_;
 #line 79 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		name = NULL;
-#line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp11_ = filename;
-#line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		disassemble_filename (_tmp11_, &_tmp12_, &_tmp13_);
+		extension = NULL;
 #line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		name = NULL;
+#line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp9_ = filename;
+#line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		disassemble_filename (_tmp9_, &_tmp10_, &_tmp11_);
+#line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (name);
-#line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		name = _tmp12_;
-#line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		name = _tmp10_;
+#line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (extension);
-#line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		extension = _tmp13_;
-#line 82 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp14_ = extension;
-#line 82 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp14_ == NULL) {
+#line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		extension = _tmp11_;
 #line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			result = TRUE;
+		_tmp12_ = extension;
 #line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		if (_tmp12_ == NULL) {
+#line 84 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			result = TRUE;
+#line 84 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (name);
-#line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 84 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (extension);
-#line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 84 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (mime_type);
-#line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 84 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 2285 "VideoSupport.c"
+#line 2157 "VideoSupport.c"
 		}
 		{
 			const gchar** s_collection = NULL;
 			gint s_collection_length1 = 0;
 			gint _s_collection_size_ = 0;
 			gint s_it = 0;
-#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			s_collection = VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS;
-#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			s_collection_length1 = G_N_ELEMENTS (VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS);
-#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			for (s_it = 0; s_it < G_N_ELEMENTS (VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS); s_it = s_it + 1) {
-#line 2298 "VideoSupport.c"
-				gchar* _tmp15_ = NULL;
+#line 2170 "VideoSupport.c"
+				gchar* _tmp13_;
 				gchar* s = NULL;
-#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp15_ = g_strdup (s_collection[s_it]);
-#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				s = _tmp15_;
-#line 2305 "VideoSupport.c"
-				{
-					const gchar* _tmp16_ = NULL;
-					const gchar* _tmp17_ = NULL;
-					gint _tmp18_ = 0;
-#line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp16_ = s;
 #line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp17_ = extension;
+				_tmp13_ = g_strdup (s_collection[s_it]);
 #line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp18_ = utf8_ci_compare (_tmp16_, _tmp17_);
-#line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					if (_tmp18_ == 0) {
+				s = _tmp13_;
+#line 2177 "VideoSupport.c"
+				{
+					const gchar* _tmp14_;
+					const gchar* _tmp15_;
+					gint _tmp16_;
 #line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						result = FALSE;
+					_tmp14_ = s;
 #line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_g_free0 (s);
+					_tmp15_ = extension;
 #line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_g_free0 (name);
+					_tmp16_ = utf8_ci_compare (_tmp14_, _tmp15_);
 #line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					if (_tmp16_ == 0) {
+#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+						result = FALSE;
+#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+						_g_free0 (s);
+#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+						_g_free0 (name);
+#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_g_free0 (extension);
-#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_g_free0 (mime_type);
-#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						return result;
-#line 2330 "VideoSupport.c"
+#line 2202 "VideoSupport.c"
 					}
-#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (s);
-#line 2334 "VideoSupport.c"
+#line 2206 "VideoSupport.c"
 				}
 			}
 		}
-#line 90 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 91 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = TRUE;
-#line 90 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 91 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (name);
-#line 90 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 91 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (extension);
-#line 90 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 91 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (mime_type);
-#line 90 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 91 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2348 "VideoSupport.c"
+#line 2220 "VideoSupport.c"
 	} else {
-		const gchar* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp19_ = filename;
-#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp20_ = mime_type;
-#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:92: Skipping %s, unsupported mime type %s", _tmp19_, _tmp20_);
+		const gchar* _tmp17_;
+		const gchar* _tmp18_;
 #line 93 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		result = FALSE;
+		_tmp17_ = filename;
 #line 93 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_g_free0 (mime_type);
+		_tmp18_ = mime_type;
 #line 93 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:93: Skipping %s, unsupported mime type %s", _tmp17_, _tmp18_);
+#line 94 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		result = FALSE;
+#line 94 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_g_free0 (mime_type);
+#line 94 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2364 "VideoSupport.c"
+#line 2236 "VideoSupport.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (mime_type);
-#line 2368 "VideoSupport.c"
+#line 2240 "VideoSupport.c"
 }
 
 
 ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	ImportResult result = 0;
 	GFile* file = NULL;
-	VideoImportParams* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	VideoImportParams* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
 	GFileInfo* info = NULL;
-	GFileInfo* _tmp7_ = NULL;
-	GFileType _tmp8_ = 0;
-	GFile* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
+	GFileInfo* _tmp7_;
+	GFileType _tmp8_;
+	GFile* _tmp9_;
+	gboolean _tmp10_;
 	GTimeVal timestamp = {0};
-	GFileInfo* _tmp14_ = NULL;
+	GFileInfo* _tmp14_;
 	GTimeVal _tmp15_ = {0};
-	VideoImportParams* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
+	VideoImportParams* _tmp16_;
+	const gchar* _tmp17_;
 	time_t exposure_time = 0;
-	VideoImportParams* _tmp18_ = NULL;
-	time_t _tmp19_ = 0;
+	VideoImportParams* _tmp18_;
+	time_t _tmp19_;
 	gchar* title = NULL;
-	gchar* _tmp20_ = NULL;
+	gchar* _tmp20_;
 	gchar* comment = NULL;
-	gchar* _tmp21_ = NULL;
+	gchar* _tmp21_;
 	VideoReader* reader = NULL;
-	GFile* _tmp22_ = NULL;
-	VideoReader* _tmp23_ = NULL;
+	GFile* _tmp22_;
+	VideoReader* _tmp23_;
 	gboolean is_interpretable = FALSE;
 	gdouble clip_duration = 0.0;
 	GdkPixbuf* preview_frame = NULL;
-	VideoReader* _tmp24_ = NULL;
-	GdkPixbuf* _tmp25_ = NULL;
-	time_t _tmp53_ = 0;
-	VideoImportParams* _tmp60_ = NULL;
-	VideoRow* _tmp61_ = NULL;
-	VideoImportParams* _tmp62_ = NULL;
-	VideoRow* _tmp63_ = NULL;
-	GFile* _tmp64_ = NULL;
-	gchar* _tmp65_ = NULL;
-	VideoImportParams* _tmp66_ = NULL;
-	VideoRow* _tmp67_ = NULL;
-	GFileInfo* _tmp68_ = NULL;
-	gint64 _tmp69_ = 0LL;
-	VideoImportParams* _tmp70_ = NULL;
-	VideoRow* _tmp71_ = NULL;
-	GTimeVal _tmp72_ = {0};
-	glong _tmp73_ = 0L;
-	VideoImportParams* _tmp74_ = NULL;
-	VideoRow* _tmp75_ = NULL;
-	GdkPixbuf* _tmp76_ = NULL;
-	gint _tmp77_ = 0;
-	gint _tmp78_ = 0;
-	VideoImportParams* _tmp79_ = NULL;
-	VideoRow* _tmp80_ = NULL;
-	GdkPixbuf* _tmp81_ = NULL;
-	gint _tmp82_ = 0;
-	gint _tmp83_ = 0;
-	VideoImportParams* _tmp84_ = NULL;
-	VideoRow* _tmp85_ = NULL;
-	gdouble _tmp86_ = 0.0;
-	VideoImportParams* _tmp87_ = NULL;
-	VideoRow* _tmp88_ = NULL;
-	gboolean _tmp89_ = FALSE;
-	VideoImportParams* _tmp90_ = NULL;
-	VideoRow* _tmp91_ = NULL;
-	time_t _tmp92_ = 0;
-	VideoImportParams* _tmp93_ = NULL;
-	VideoRow* _tmp94_ = NULL;
-	VideoImportParams* _tmp95_ = NULL;
-	ImportID _tmp96_ = {0};
-	VideoImportParams* _tmp97_ = NULL;
-	VideoRow* _tmp98_ = NULL;
-	VideoImportParams* _tmp99_ = NULL;
-	VideoRow* _tmp100_ = NULL;
-	VideoImportParams* _tmp101_ = NULL;
-	const gchar* _tmp102_ = NULL;
-	gchar* _tmp103_ = NULL;
-	VideoImportParams* _tmp104_ = NULL;
-	VideoRow* _tmp105_ = NULL;
-	VideoImportParams* _tmp106_ = NULL;
-	VideoRow* _tmp107_ = NULL;
-	const gchar* _tmp108_ = NULL;
-	gchar* _tmp109_ = NULL;
-	VideoImportParams* _tmp110_ = NULL;
-	VideoRow* _tmp111_ = NULL;
-	const gchar* _tmp112_ = NULL;
-	gchar* _tmp113_ = NULL;
-	VideoImportParams* _tmp114_ = NULL;
-	VideoRow* _tmp115_ = NULL;
-	gchar* _tmp116_ = NULL;
-	VideoImportParams* _tmp117_ = NULL;
-	VideoRow* _tmp118_ = NULL;
-	VideoImportParams* _tmp119_ = NULL;
-	VideoRow* _tmp120_ = NULL;
-	VideoImportParams* _tmp121_ = NULL;
-	Thumbnails* _tmp122_ = NULL;
+	VideoReader* _tmp24_;
+	GdkPixbuf* _tmp25_;
+	time_t _tmp53_;
+	VideoImportParams* _tmp60_;
+	VideoRow* _tmp61_;
+	VideoImportParams* _tmp62_;
+	VideoRow* _tmp63_;
+	GFile* _tmp64_;
+	gchar* _tmp65_;
+	VideoImportParams* _tmp66_;
+	VideoRow* _tmp67_;
+	GFileInfo* _tmp68_;
+	gint64 _tmp69_;
+	VideoImportParams* _tmp70_;
+	VideoRow* _tmp71_;
+	GTimeVal _tmp72_;
+	glong _tmp73_;
+	VideoImportParams* _tmp74_;
+	VideoRow* _tmp75_;
+	GdkPixbuf* _tmp76_;
+	gint _tmp77_;
+	gint _tmp78_;
+	VideoImportParams* _tmp79_;
+	VideoRow* _tmp80_;
+	GdkPixbuf* _tmp81_;
+	gint _tmp82_;
+	gint _tmp83_;
+	VideoImportParams* _tmp84_;
+	VideoRow* _tmp85_;
+	gdouble _tmp86_;
+	VideoImportParams* _tmp87_;
+	VideoRow* _tmp88_;
+	gboolean _tmp89_;
+	VideoImportParams* _tmp90_;
+	VideoRow* _tmp91_;
+	time_t _tmp92_;
+	VideoImportParams* _tmp93_;
+	VideoRow* _tmp94_;
+	VideoImportParams* _tmp95_;
+	ImportID _tmp96_;
+	VideoImportParams* _tmp97_;
+	VideoRow* _tmp98_;
+	VideoImportParams* _tmp99_;
+	VideoRow* _tmp100_;
+	VideoImportParams* _tmp101_;
+	const gchar* _tmp102_;
+	gchar* _tmp103_;
+	VideoImportParams* _tmp104_;
+	VideoRow* _tmp105_;
+	VideoImportParams* _tmp106_;
+	VideoRow* _tmp107_;
+	const gchar* _tmp108_;
+	gchar* _tmp109_;
+	VideoImportParams* _tmp110_;
+	VideoRow* _tmp111_;
+	const gchar* _tmp112_;
+	gchar* _tmp113_;
+	VideoImportParams* _tmp114_;
+	VideoRow* _tmp115_;
+	gchar* _tmp116_;
+	VideoImportParams* _tmp117_;
+	VideoRow* _tmp118_;
+	VideoImportParams* _tmp119_;
+	VideoRow* _tmp120_;
+	VideoImportParams* _tmp121_;
+	Thumbnails* _tmp122_;
 	GError * _inner_error_ = NULL;
-#line 97 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 98 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_IMPORT_PARAMS (params), 0);
-#line 101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = params;
-#line 101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_->file;
-#line 101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	file = _tmp2_;
-#line 103 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	info = NULL;
-#line 2480 "VideoSupport.c"
+#line 2352 "VideoSupport.c"
 	{
 		GFileInfo* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		GFileInfo* _tmp5_ = NULL;
-		GFileInfo* _tmp6_ = NULL;
-#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		GFile* _tmp4_;
+		GFileInfo* _tmp5_;
+		GFileInfo* _tmp6_;
+#line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = file;
-#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = g_file_query_info (_tmp4_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
-#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp5_;
-#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2494 "VideoSupport.c"
-			goto __catch494_g_error;
+#line 2366 "VideoSupport.c"
+			goto __catch495_g_error;
 		}
-#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp3_;
-#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = NULL;
-#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		info = _tmp6_;
-#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2507 "VideoSupport.c"
+#line 2379 "VideoSupport.c"
 	}
-	goto __finally494;
-	__catch494_g_error:
+	goto __finally495;
+	__catch495_g_error:
 	{
 		GError* err = NULL;
-#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = IMPORT_RESULT_FILE_ERROR;
-#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2527 "VideoSupport.c"
+#line 2399 "VideoSupport.c"
 	}
-	__finally494:
-#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally495:
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2542 "VideoSupport.c"
+#line 2414 "VideoSupport.c"
 	}
-#line 111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = info;
-#line 111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = g_file_info_get_file_type (_tmp7_);
-#line 111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp8_ != G_FILE_TYPE_REGULAR) {
 #line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp8_ != G_FILE_TYPE_REGULAR) {
+#line 113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = IMPORT_RESULT_NOT_A_FILE;
-#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2558 "VideoSupport.c"
+#line 2430 "VideoSupport.c"
 	}
-#line 114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = file;
-#line 114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = video_reader_is_supported_video_file (_tmp9_);
-#line 114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (!_tmp10_) {
-#line 2566 "VideoSupport.c"
-		GFile* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
 #line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (!_tmp10_) {
+#line 2438 "VideoSupport.c"
+		GFile* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
+#line 116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = file;
-#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = g_file_get_path (_tmp11_);
-#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp13_ = _tmp12_;
-#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_message ("Not importing %s: file is marked as a video file but doesn't have a" "supported extension", _tmp13_);
-#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp13_);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2588 "VideoSupport.c"
+#line 2460 "VideoSupport.c"
 	}
-#line 121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp14_ = info;
-#line 121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_info_get_modification_time (_tmp14_, &_tmp15_);
-#line 121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	timestamp = _tmp15_;
-#line 124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp16_ = params;
-#line 124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp17_ = _tmp16_->md5;
-#line 124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_assert (_tmp17_ != NULL, "params.md5 != null");
-#line 126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp18_ = params;
-#line 126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = _tmp18_->exposure_time_override;
-#line 126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	exposure_time = _tmp19_;
 #line 127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	exposure_time = _tmp19_;
+#line 128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = g_strdup ("");
-#line 127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	title = _tmp20_;
 #line 128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	title = _tmp20_;
+#line 129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = g_strdup ("");
-#line 128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	comment = _tmp21_;
-#line 130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp22_ = file;
-#line 130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp23_ = video_reader_new (_tmp22_);
-#line 130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	reader = _tmp23_;
 #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	is_interpretable = TRUE;
+	reader = _tmp23_;
 #line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	clip_duration = 0.0;
+	is_interpretable = TRUE;
 #line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	clip_duration = 0.0;
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = reader;
-#line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = video_reader_read_preview_frame (_tmp24_);
-#line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	preview_frame = _tmp25_;
-#line 2632 "VideoSupport.c"
+#line 2504 "VideoSupport.c"
 	{
 		gdouble _tmp26_ = 0.0;
-		VideoReader* _tmp27_ = NULL;
-		gdouble _tmp28_ = 0.0;
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoReader* _tmp27_;
+		gdouble _tmp28_;
+#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp27_ = reader;
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp28_ = video_reader_read_clip_duration (_tmp27_, &_inner_error_);
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp26_ = _tmp28_;
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 2647 "VideoSupport.c"
-				goto __catch495_video_error;
+#line 2519 "VideoSupport.c"
+				goto __catch496_video_error;
 			}
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (reader);
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (comment);
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (title);
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (info);
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (file);
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0;
-#line 2668 "VideoSupport.c"
+#line 2540 "VideoSupport.c"
 		}
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		clip_duration = _tmp26_;
-#line 2672 "VideoSupport.c"
+#line 2544 "VideoSupport.c"
 	}
-	goto __finally495;
-	__catch495_video_error:
+	goto __finally496;
+	__catch496_video_error:
 	{
 		GError* err = NULL;
-		GError* _tmp29_ = NULL;
-#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		GError* _tmp29_;
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp29_ = err;
-#line 137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (g_error_matches (_tmp29_, VIDEO_ERROR, VIDEO_ERROR_FILE)) {
 #line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		if (g_error_matches (_tmp29_, VIDEO_ERROR, VIDEO_ERROR_FILE)) {
+#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = IMPORT_RESULT_FILE_ERROR;
-#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (reader);
-#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (comment);
-#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (title);
-#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (info);
-#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (file);
-#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 2705 "VideoSupport.c"
+#line 2577 "VideoSupport.c"
 		} else {
-			GError* _tmp30_ = NULL;
-#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			GError* _tmp30_;
+#line 140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp30_ = err;
-#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (g_error_matches (_tmp30_, VIDEO_ERROR, VIDEO_ERROR_CONTENTS)) {
 #line 140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				is_interpretable = FALSE;
+			if (g_error_matches (_tmp30_, VIDEO_ERROR, VIDEO_ERROR_CONTENTS)) {
 #line 141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				is_interpretable = FALSE;
+#line 142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				clip_duration = 0.0;
-#line 2716 "VideoSupport.c"
+#line 2588 "VideoSupport.c"
 			} else {
-#line 143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				g_error ("VideoSupport.vala:143: can't prepare video for import: an unknown kind" \
+#line 144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				g_error ("VideoSupport.vala:144: can't prepare video for import: an unknown kind" \
 " of video error occurred");
-#line 2720 "VideoSupport.c"
+#line 2592 "VideoSupport.c"
 			}
 		}
-#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 2725 "VideoSupport.c"
+#line 2597 "VideoSupport.c"
 	}
-	__finally495:
-#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally496:
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (reader);
-#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (comment);
-#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (title);
-#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2748 "VideoSupport.c"
+#line 2620 "VideoSupport.c"
 	}
 	{
 		VideoMetadata* metadata = NULL;
-		VideoReader* _tmp31_ = NULL;
-		VideoMetadata* _tmp32_ = NULL;
+		VideoReader* _tmp31_;
+		VideoMetadata* _tmp32_;
 		MetadataDateTime* creation_date_time = NULL;
-		VideoMetadata* _tmp33_ = NULL;
-		MetadataDateTime* _tmp34_ = NULL;
+		VideoMetadata* _tmp33_;
+		MetadataDateTime* _tmp34_;
 		gboolean _tmp35_ = FALSE;
-		MetadataDateTime* _tmp36_ = NULL;
+		MetadataDateTime* _tmp36_;
 		gchar* video_title = NULL;
-		VideoMetadata* _tmp41_ = NULL;
-		gchar* _tmp42_ = NULL;
+		VideoMetadata* _tmp41_;
+		gchar* _tmp42_;
 		gchar* video_comment = NULL;
-		VideoMetadata* _tmp43_ = NULL;
-		gchar* _tmp44_ = NULL;
-		const gchar* _tmp45_ = NULL;
-		const gchar* _tmp48_ = NULL;
-#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoMetadata* _tmp43_;
+		gchar* _tmp44_;
+		const gchar* _tmp45_;
+		const gchar* _tmp48_;
+#line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp31_ = reader;
-#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp32_ = video_reader_read_metadata (_tmp31_, &_inner_error_);
-#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		metadata = _tmp32_;
-#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2775 "VideoSupport.c"
-			goto __catch496_g_error;
+#line 2647 "VideoSupport.c"
+			goto __catch497_g_error;
 		}
-#line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp33_ = metadata;
-#line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp34_ = media_metadata_get_creation_date_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		creation_date_time = _tmp34_;
-#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp36_ = creation_date_time;
-#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp36_ != NULL) {
-#line 2788 "VideoSupport.c"
-			MetadataDateTime* _tmp37_ = NULL;
-			time_t _tmp38_ = 0;
-#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 2660 "VideoSupport.c"
+			MetadataDateTime* _tmp37_;
+			time_t _tmp38_;
+#line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp37_ = creation_date_time;
-#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp38_ = metadata_date_time_get_timestamp (_tmp37_);
-#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = _tmp38_ != ((time_t) 0);
-#line 2797 "VideoSupport.c"
+#line 2669 "VideoSupport.c"
 		} else {
-#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = FALSE;
-#line 2801 "VideoSupport.c"
+#line 2673 "VideoSupport.c"
 		}
-#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp35_) {
-#line 2805 "VideoSupport.c"
-			MetadataDateTime* _tmp39_ = NULL;
-			time_t _tmp40_ = 0;
 #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		if (_tmp35_) {
+#line 2677 "VideoSupport.c"
+			MetadataDateTime* _tmp39_;
+			time_t _tmp40_;
+#line 153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp39_ = creation_date_time;
-#line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp40_ = metadata_date_time_get_timestamp (_tmp39_);
-#line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			exposure_time = _tmp40_;
-#line 2814 "VideoSupport.c"
+#line 2686 "VideoSupport.c"
 		}
-#line 154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp41_ = metadata;
-#line 154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp42_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		video_title = _tmp42_;
 #line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		video_title = _tmp42_;
+#line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp43_ = metadata;
-#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp44_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		video_comment = _tmp44_;
 #line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		video_comment = _tmp44_;
+#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp45_ = video_title;
-#line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp45_ != NULL) {
-#line 2832 "VideoSupport.c"
-			const gchar* _tmp46_ = NULL;
-			gchar* _tmp47_ = NULL;
 #line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		if (_tmp45_ != NULL) {
+#line 2704 "VideoSupport.c"
+			const gchar* _tmp46_;
+			gchar* _tmp47_;
+#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp46_ = video_title;
-#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp47_ = g_strdup (_tmp46_);
-#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (title);
-#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			title = _tmp47_;
-#line 2843 "VideoSupport.c"
+#line 2715 "VideoSupport.c"
 		}
-#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp48_ = video_comment;
-#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp48_ != NULL) {
-#line 2849 "VideoSupport.c"
-			const gchar* _tmp49_ = NULL;
-			gchar* _tmp50_ = NULL;
 #line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		if (_tmp48_ != NULL) {
+#line 2721 "VideoSupport.c"
+			const gchar* _tmp49_;
+			gchar* _tmp50_;
+#line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp49_ = video_comment;
-#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp50_ = g_strdup (_tmp49_);
-#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (comment);
-#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			comment = _tmp50_;
-#line 2860 "VideoSupport.c"
+#line 2732 "VideoSupport.c"
 		}
-#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (video_comment);
-#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (video_title);
-#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_metadata_date_time_unref0 (creation_date_time);
-#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_media_metadata_unref0 (metadata);
-#line 2870 "VideoSupport.c"
+#line 2742 "VideoSupport.c"
 	}
-	goto __finally496;
-	__catch496_g_error:
+	goto __finally497;
+	__catch497_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp51_ = NULL;
-		const gchar* _tmp52_ = NULL;
-#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		GError* _tmp51_;
+		const gchar* _tmp52_;
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp51_ = err;
-#line 161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp52_ = _tmp51_->message;
-#line 161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_warning ("VideoSupport.vala:161: Unable to read video metadata: %s", _tmp52_);
-#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_warning ("VideoSupport.vala:162: Unable to read video metadata: %s", _tmp52_);
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 2890 "VideoSupport.c"
+#line 2762 "VideoSupport.c"
 	}
-	__finally496:
-#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally497:
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (reader);
-#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (comment);
-#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (title);
-#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2913 "VideoSupport.c"
+#line 2785 "VideoSupport.c"
 	}
-#line 164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp53_ = exposure_time;
-#line 164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp53_ == ((time_t) 0)) {
-#line 2919 "VideoSupport.c"
+#line 2791 "VideoSupport.c"
 		gint64 _tmp54_ = 0LL;
-		VideoReader* _tmp55_ = NULL;
-		GDateTime* _tmp56_ = NULL;
-#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoReader* _tmp55_;
+		GDateTime* _tmp56_;
+#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp55_ = reader;
-#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp56_ = _tmp55_->priv->_timestamp;
-#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp56_ != NULL) {
-#line 2929 "VideoSupport.c"
-			VideoReader* _tmp57_ = NULL;
-			GDateTime* _tmp58_ = NULL;
-			gint64 _tmp59_ = 0LL;
 #line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		if (_tmp56_ != NULL) {
+#line 2801 "VideoSupport.c"
+			VideoReader* _tmp57_;
+			GDateTime* _tmp58_;
+			gint64 _tmp59_;
+#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp57_ = reader;
-#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp58_ = _tmp57_->priv->_timestamp;
-#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp59_ = g_date_time_to_unix (_tmp58_);
-#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp54_ = _tmp59_;
-#line 2941 "VideoSupport.c"
+#line 2813 "VideoSupport.c"
 		} else {
-#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp54_ = (gint64) 0;
-#line 2945 "VideoSupport.c"
+#line 2817 "VideoSupport.c"
 		}
-#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		exposure_time = (time_t) _tmp54_;
-#line 2949 "VideoSupport.c"
+#line 2821 "VideoSupport.c"
 	}
-#line 170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp60_ = params;
-#line 170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp61_ = _tmp60_->row;
-#line 170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_id_init (&_tmp61_->video_id, VIDEO_ID_INVALID);
 #line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	video_id_init (&_tmp61_->video_id, VIDEO_ID_INVALID);
+#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp62_ = params;
-#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp63_ = _tmp62_->row;
-#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp64_ = file;
-#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp65_ = g_file_get_path (_tmp64_);
-#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp63_->filepath);
-#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp63_->filepath = _tmp65_;
 #line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp63_->filepath = _tmp65_;
+#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp66_ = params;
-#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp67_ = _tmp66_->row;
-#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp68_ = info;
-#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp69_ = g_file_info_get_size (_tmp68_);
-#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp67_->filesize = _tmp69_;
 #line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp67_->filesize = _tmp69_;
+#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp70_ = params;
-#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp71_ = _tmp70_->row;
-#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp72_ = timestamp;
-#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp73_ = _tmp72_.tv_sec;
-#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp71_->timestamp = (time_t) _tmp73_;
 #line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp71_->timestamp = (time_t) _tmp73_;
+#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp74_ = params;
-#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp75_ = _tmp74_->row;
-#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp76_ = preview_frame;
-#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp77_ = gdk_pixbuf_get_width (_tmp76_);
-#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp78_ = _tmp77_;
-#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp75_->width = _tmp78_;
 #line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp75_->width = _tmp78_;
+#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp79_ = params;
-#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp80_ = _tmp79_->row;
-#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp81_ = preview_frame;
-#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp82_ = gdk_pixbuf_get_height (_tmp81_);
-#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp83_ = _tmp82_;
-#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp80_->height = _tmp83_;
 #line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp80_->height = _tmp83_;
+#line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp84_ = params;
-#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp85_ = _tmp84_->row;
-#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp86_ = clip_duration;
-#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp85_->clip_duration = _tmp86_;
 #line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp85_->clip_duration = _tmp86_;
+#line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp87_ = params;
-#line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp88_ = _tmp87_->row;
-#line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp89_ = is_interpretable;
-#line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp88_->is_interpretable = _tmp89_;
 #line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp88_->is_interpretable = _tmp89_;
+#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp90_ = params;
-#line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp91_ = _tmp90_->row;
-#line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp92_ = exposure_time;
-#line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp91_->exposure_time = _tmp92_;
 #line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp91_->exposure_time = _tmp92_;
+#line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp93_ = params;
-#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp94_ = _tmp93_->row;
-#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp95_ = params;
-#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp96_ = _tmp95_->import_id;
-#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp94_->import_id = _tmp96_;
 #line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp94_->import_id = _tmp96_;
+#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp97_ = params;
-#line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp98_ = _tmp97_->row;
-#line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	event_id_init (&_tmp98_->event_id, EVENT_ID_INVALID);
 #line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	event_id_init (&_tmp98_->event_id, EVENT_ID_INVALID);
+#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp99_ = params;
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp100_ = _tmp99_->row;
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp101_ = params;
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp102_ = _tmp101_->md5;
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp103_ = g_strdup (_tmp102_);
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp100_->md5);
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp100_->md5 = _tmp103_;
 #line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp100_->md5 = _tmp103_;
+#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp104_ = params;
-#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp105_ = _tmp104_->row;
-#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp105_->time_created = (time_t) 0;
 #line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp105_->time_created = (time_t) 0;
+#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp106_ = params;
-#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp107_ = _tmp106_->row;
-#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp108_ = title;
-#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp109_ = g_strdup (_tmp108_);
-#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp107_->title);
-#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp107_->title = _tmp109_;
 #line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp107_->title = _tmp109_;
+#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp110_ = params;
-#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp111_ = _tmp110_->row;
-#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp112_ = comment;
-#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp113_ = g_strdup (_tmp112_);
-#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp111_->comment);
-#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp111_->comment = _tmp113_;
 #line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp111_->comment = _tmp113_;
+#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp114_ = params;
-#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp115_ = _tmp114_->row;
-#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp116_ = g_strdup ("");
-#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp115_->backlinks);
-#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp115_->backlinks = _tmp116_;
 #line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp115_->backlinks = _tmp116_;
+#line 187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp117_ = params;
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp118_ = _tmp117_->row;
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp118_->time_reimported = (time_t) 0;
 #line 187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp118_->time_reimported = (time_t) 0;
+#line 188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp119_ = params;
-#line 187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp120_ = _tmp119_->row;
-#line 187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp120_->flags = (guint64) 0;
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp121_ = params;
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp122_ = _tmp121_->thumbnails;
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp122_ != NULL) {
-#line 3125 "VideoSupport.c"
-		VideoImportParams* _tmp123_ = NULL;
-		Thumbnails* _tmp124_ = NULL;
-		VideoImportParams* _tmp125_ = NULL;
-		Thumbnails* _tmp126_ = NULL;
-		GdkPixbuf* _tmp127_ = NULL;
 #line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp122_ != NULL) {
+#line 2997 "VideoSupport.c"
+		VideoImportParams* _tmp123_;
+		Thumbnails* _tmp124_;
+		VideoImportParams* _tmp125_;
+		Thumbnails* _tmp126_;
+		GdkPixbuf* _tmp127_;
+#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp123_ = params;
-#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp124_ = thumbnails_new ();
-#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_thumbnails_unref0 (_tmp123_->thumbnails);
-#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp123_->thumbnails = _tmp124_;
 #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp123_->thumbnails = _tmp124_;
+#line 192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp125_ = params;
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp126_ = _tmp125_->thumbnails;
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp127_ = preview_frame;
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		thumbnail_cache_generate_for_video_frame (_tmp126_, _tmp127_);
-#line 3147 "VideoSupport.c"
+#line 3019 "VideoSupport.c"
 	}
-#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = IMPORT_RESULT_SUCCESS;
-#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (preview_frame);
-#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (reader);
-#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (comment);
-#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (title);
-#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (info);
-#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (file);
-#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3165 "VideoSupport.c"
+#line 3037 "VideoSupport.c"
 }
 
 
 static GDate* _g_date_dup (GDate* self) {
 	GDate* dup;
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	dup = g_new0 (GDate, 1);
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	memcpy (dup, self, sizeof (GDate));
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return dup;
-#line 3177 "VideoSupport.c"
+#line 3049 "VideoSupport.c"
 }
 
 
 static gpointer __g_date_dup0 (gpointer self) {
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? _g_date_dup (self) : NULL;
-#line 3184 "VideoSupport.c"
+#line 3056 "VideoSupport.c"
 }
 
 
 static void video_reader_read_internal (VideoReader* self, GError** error) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	GError * _inner_error_ = NULL;
-#line 200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_if_fail (IS_VIDEO_READER (self));
 #line 201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_if_fail (IS_VIDEO_READER (self));
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_reader_does_file_exist (self);
-#line 201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (!_tmp0_) {
-#line 3197 "VideoSupport.c"
-		GFile* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
 #line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (!_tmp0_) {
+#line 3069 "VideoSupport.c"
+		GFile* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		GError* _tmp6_;
+		GError* _tmp7_;
+#line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->file;
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = g_file_get_path (_tmp1_);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp2_;
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = g_strdup_printf ("video file '%s' does not exist or is inaccessible", _tmp3_);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp4_;
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = g_error_new_literal (VIDEO_ERROR, VIDEO_ERROR_FILE, _tmp5_);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = _tmp6_;
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp5_);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp3_);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = _tmp7_;
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_inner_error_->domain == VIDEO_ERROR) {
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3231 "VideoSupport.c"
+#line 3103 "VideoSupport.c"
 		} else {
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3239 "VideoSupport.c"
+#line 3111 "VideoSupport.c"
 		}
 	}
 	{
 		GstDiscoverer* d = NULL;
-		GstDiscoverer* _tmp8_ = NULL;
+		GstDiscoverer* _tmp8_;
 		GstDiscovererInfo* info = NULL;
-		GstDiscoverer* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		GstDiscovererInfo* _tmp13_ = NULL;
-		GstDiscovererInfo* _tmp14_ = NULL;
-		GstDiscovererInfo* _tmp15_ = NULL;
-		GstClockTime _tmp16_ = 0ULL;
+		GstDiscoverer* _tmp9_;
+		GFile* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		GstDiscovererInfo* _tmp13_;
+		GstDiscovererInfo* _tmp14_;
+		GstDiscovererInfo* _tmp15_;
+		GstClockTime _tmp16_;
 		GDate* video_date = NULL;
 		gboolean _tmp17_ = FALSE;
-		GstDiscovererInfo* _tmp18_ = NULL;
-		GstTagList* _tmp19_ = NULL;
-#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		GstDiscovererInfo* _tmp18_;
+		GstTagList* _tmp19_;
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = gst_discoverer_new ((GstClockTime) (GST_SECOND * 5), &_inner_error_);
-#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		d = _tmp8_;
-#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3264 "VideoSupport.c"
-			goto __catch497_g_error;
+#line 3136 "VideoSupport.c"
+			goto __catch498_g_error;
 		}
-#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = d;
-#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = self->priv->file;
-#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = g_file_get_uri (_tmp10_);
-#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = _tmp11_;
-#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp13_ = gst_discoverer_discover_uri (_tmp9_, _tmp12_, &_inner_error_);
-#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = _tmp13_;
-#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp12_);
-#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		info = _tmp14_;
-#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (d);
-#line 3287 "VideoSupport.c"
-			goto __catch497_g_error;
+#line 3159 "VideoSupport.c"
+			goto __catch498_g_error;
 		}
-#line 209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 210 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = info;
-#line 209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 210 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp16_ = gst_discoverer_info_get_duration (_tmp15_);
-#line 209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 210 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->clip_duration = ((gdouble) _tmp16_) / 1000000000.0;
-#line 214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		video_date = NULL;
 #line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		video_date = NULL;
+#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp18_ = info;
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp19_ = gst_discoverer_info_get_tags (_tmp18_);
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp19_ != NULL) {
-#line 3304 "VideoSupport.c"
-			GstDiscovererInfo* _tmp20_ = NULL;
-			GstTagList* _tmp21_ = NULL;
+#line 3176 "VideoSupport.c"
+			GstDiscovererInfo* _tmp20_;
+			GstTagList* _tmp21_;
 			GDate _tmp22_ = {0};
-			gboolean _tmp23_ = FALSE;
-			GDate _tmp24_ = {0};
-			GDate* _tmp25_ = NULL;
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			gboolean _tmp23_;
+			GDate _tmp24_;
+			GDate* _tmp25_;
+#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp20_ = info;
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = gst_discoverer_info_get_tags (_tmp20_);
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = gst_tag_list_get_date (_tmp21_, GST_TAG_DATE, &_tmp22_);
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (video_date);
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp24_ = _tmp22_;
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp25_ = __g_date_dup0 (&_tmp24_);
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_date = _tmp25_;
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = _tmp23_;
-#line 3327 "VideoSupport.c"
+#line 3199 "VideoSupport.c"
 		} else {
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = FALSE;
-#line 3331 "VideoSupport.c"
+#line 3203 "VideoSupport.c"
 		}
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp17_) {
-#line 3335 "VideoSupport.c"
-			GDate* _tmp26_ = NULL;
-#line 217 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 3207 "VideoSupport.c"
+			GDate* _tmp26_;
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp26_ = video_date;
-#line 217 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (_tmp26_ != NULL) {
-#line 3341 "VideoSupport.c"
-				GDate* _tmp27_ = NULL;
-				GDateYear _tmp28_ = 0U;
-				GDate* _tmp29_ = NULL;
-				GDateMonth _tmp30_ = 0;
-				GDate* _tmp31_ = NULL;
-				GDateDay _tmp32_ = '\0';
-				GDateTime* _tmp33_ = NULL;
-				GDateTime* _tmp34_ = NULL;
 #line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			if (_tmp26_ != NULL) {
+#line 3213 "VideoSupport.c"
+				GDate* _tmp27_;
+				GDateYear _tmp28_;
+				GDate* _tmp29_;
+				GDateMonth _tmp30_;
+				GDate* _tmp31_;
+				GDateDay _tmp32_;
+				GDateTime* _tmp33_;
+				GDateTime* _tmp34_;
+#line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp27_ = video_date;
-#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp28_ = g_date_get_year (_tmp27_);
-#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp29_ = video_date;
-#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp30_ = g_date_get_month (_tmp29_);
-#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp31_ = video_date;
-#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp32_ = g_date_get_day (_tmp31_);
-#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp33_ = g_date_time_new_local ((gint) _tmp28_, (gint) _tmp30_, (gint) _tmp32_, 0, 0, (gdouble) 0);
-#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp34_ = _tmp33_;
-#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_reader_set_timestamp (self, _tmp34_);
-#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_date_time_unref0 (_tmp34_);
-#line 3370 "VideoSupport.c"
+#line 3242 "VideoSupport.c"
 			}
 		}
-#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (video_date);
-#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (d);
-#line 3379 "VideoSupport.c"
+#line 3251 "VideoSupport.c"
 	}
-	goto __finally497;
-	__catch497_g_error:
+	goto __finally498;
+	__catch498_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp35_ = NULL;
-		const gchar* _tmp36_ = NULL;
-		GError* _tmp37_ = NULL;
-		const gchar* _tmp38_ = NULL;
-		gchar* _tmp39_ = NULL;
-		gchar* _tmp40_ = NULL;
-		GError* _tmp41_ = NULL;
-		GError* _tmp42_ = NULL;
-#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		GError* _tmp35_;
+		const gchar* _tmp36_;
+		GError* _tmp37_;
+		const gchar* _tmp38_;
+		gchar* _tmp39_;
+		gchar* _tmp40_;
+		GError* _tmp41_;
+		GError* _tmp42_;
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp35_ = e;
-#line 223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp36_ = _tmp35_->message;
-#line 223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:223: Video read error: %s", _tmp36_);
 #line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:224: Video read error: %s", _tmp36_);
+#line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp37_ = e;
-#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp38_ = _tmp37_->message;
-#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp39_ = g_strdup_printf ("GStreamer couldn't extract clip information: %s", _tmp38_);
-#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp40_ = _tmp39_;
-#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp41_ = g_error_new_literal (VIDEO_ERROR, VIDEO_ERROR_CONTENTS, _tmp40_);
-#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp42_ = _tmp41_;
-#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp40_);
-#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = _tmp42_;
-#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 3421 "VideoSupport.c"
-		goto __finally497;
+#line 3293 "VideoSupport.c"
+		goto __finally498;
 	}
-	__finally497:
-#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally498:
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_inner_error_->domain == VIDEO_ERROR) {
-#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3433 "VideoSupport.c"
+#line 3305 "VideoSupport.c"
 		} else {
-#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3441 "VideoSupport.c"
+#line 3313 "VideoSupport.c"
 		}
 	}
 }
@@ -3446,557 +3318,557 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 
 static gboolean video_reader_on_thumbnailer_timer (VideoReader* self) {
 	gboolean result = FALSE;
-	GPid _tmp0_ = 0;
-#line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (IS_VIDEO_READER (self), FALSE);
+	GPid _tmp0_;
 #line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_debug ("VideoSupport.vala:231: Thumbnailer timer called");
+	g_return_val_if_fail (IS_VIDEO_READER (self), FALSE);
 #line 232 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_debug ("VideoSupport.vala:232: Thumbnailer timer called");
+#line 233 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->thumbnailer_pid;
-#line 232 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp0_ != ((GPid) 0)) {
-#line 3458 "VideoSupport.c"
-		GPid _tmp1_ = 0;
-		GPid _tmp2_ = 0;
 #line 233 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp0_ != ((GPid) 0)) {
+#line 3330 "VideoSupport.c"
+		GPid _tmp1_;
+		GPid _tmp2_;
+#line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->thumbnailer_pid;
-#line 233 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:233: Killing thumbnailer process: %d", (gint) _tmp1_);
 #line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:234: Killing thumbnailer process: %d", (gint) _tmp1_);
+#line 235 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->priv->thumbnailer_pid;
-#line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 235 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		kill ((pid_t) _tmp2_, SIGKILL);
-#line 3469 "VideoSupport.c"
+#line 3341 "VideoSupport.c"
 	}
-#line 236 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 237 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = FALSE;
-#line 236 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 237 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3475 "VideoSupport.c"
+#line 3347 "VideoSupport.c"
 }
 
 
 static gboolean _video_reader_on_thumbnailer_timer_gsource_func (gpointer self) {
 	gboolean result;
 	result = video_reader_on_thumbnailer_timer ((VideoReader*) self);
-#line 259 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 260 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3484 "VideoSupport.c"
+#line 3356 "VideoSupport.c"
 }
 
 
 static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* video_file) {
 	GdkPixbuf* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	gchar** argv = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar** _tmp9_ = NULL;
-	gchar** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	gint argv_length1 = 0;
-	gint _argv_size_ = 0;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
+	gchar* _tmp6_;
+	const gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar** _tmp9_;
+	gchar** _tmp10_;
+	gint _tmp10__length1;
+	gint argv_length1;
+	gint _argv_size_;
 	gint child_stdout = 0;
 	GdkPixbuf* buf = NULL;
 	gint child_status = 0;
 	gint ret_waitpid = 0;
-	GPid _tmp27_ = 0;
+	GPid _tmp27_;
 	gint _tmp28_ = 0;
-	pid_t _tmp29_ = 0;
-	gint _tmp30_ = 0;
-	GPid _tmp36_ = 0;
+	pid_t _tmp29_;
+	gint _tmp30_;
+	GPid _tmp36_;
 	GError * _inner_error_ = NULL;
-#line 241 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 242 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), NULL);
-#line 241 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 242 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (video_file != NULL, NULL);
-#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = app_dirs_get_thumbnailer_bin ();
-#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_debug ("VideoSupport.vala:243: Launching thumbnailer process: %s", _tmp3_);
-#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_debug ("VideoSupport.vala:244: Launching thumbnailer process: %s", _tmp3_);
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp3_);
-#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_object_unref0 (_tmp1_);
 #line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_g_object_unref0 (_tmp1_);
+#line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = app_dirs_get_thumbnailer_bin ();
-#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = g_file_get_path (_tmp5_);
-#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video_file;
-#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = g_strdup (_tmp7_);
-#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = g_new0 (gchar*, 2 + 1);
-#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_[0] = _tmp6_;
-#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_[1] = _tmp8_;
-#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = _tmp9_;
-#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10__length1 = 2;
-#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp5_);
-#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	argv = _tmp10_;
-#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	argv_length1 = _tmp10__length1;
-#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_argv_size_ = argv_length1;
-#line 3561 "VideoSupport.c"
+#line 3433 "VideoSupport.c"
 	{
-		gchar** _tmp11_ = NULL;
-		gint _tmp11__length1 = 0;
+		gchar** _tmp11_;
+		gint _tmp11__length1;
 		GPid _tmp12_ = 0;
 		gint _tmp13_ = 0;
-		GPid _tmp14_ = 0;
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		GPid _tmp14_;
+#line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = argv;
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11__length1 = argv_length1;
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_spawn_async_with_pipes (NULL, _tmp11_, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &_tmp12_, NULL, &_tmp13_, NULL, &_inner_error_);
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->thumbnailer_pid = _tmp12_;
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		child_stdout = _tmp13_;
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3580 "VideoSupport.c"
-			goto __catch498_g_error;
+#line 3452 "VideoSupport.c"
+			goto __catch499_g_error;
 		}
-#line 250 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 251 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = self->priv->thumbnailer_pid;
-#line 250 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:250: Spawned thumbnailer, child pid: %d", (gint) _tmp14_);
-#line 3587 "VideoSupport.c"
+#line 251 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:251: Spawned thumbnailer, child pid: %d", (gint) _tmp14_);
+#line 3459 "VideoSupport.c"
 	}
-	goto __finally498;
-	__catch498_g_error:
+	goto __finally499;
+	__catch499_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
-		GPid _tmp17_ = 0;
-#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		GError* _tmp15_;
+		const gchar* _tmp16_;
+		GPid _tmp17_;
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 252 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 253 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = e;
-#line 252 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 253 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp16_ = _tmp15_->message;
-#line 252 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:252: Error spawning process: %s", _tmp16_);
 #line 253 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:253: Error spawning process: %s", _tmp16_);
+#line 254 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp17_ = self->priv->thumbnailer_pid;
-#line 253 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp17_ != ((GPid) 0)) {
-#line 3610 "VideoSupport.c"
-			GPid _tmp18_ = 0;
 #line 254 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		if (_tmp17_ != ((GPid) 0)) {
+#line 3482 "VideoSupport.c"
+			GPid _tmp18_;
+#line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = self->priv->thumbnailer_pid;
-#line 254 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_spawn_close_pid (_tmp18_);
-#line 3616 "VideoSupport.c"
+#line 3488 "VideoSupport.c"
 		}
-#line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 256 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 256 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 256 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 256 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3626 "VideoSupport.c"
+#line 3498 "VideoSupport.c"
 	}
-	__finally498:
-#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally499:
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3639 "VideoSupport.c"
+#line 3511 "VideoSupport.c"
 	}
-#line 259 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 260 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_timeout_add_full (G_PRIORITY_DEFAULT, VIDEO_READER_THUMBNAILER_TIMEOUT, _video_reader_on_thumbnailer_timer_gsource_func, video_reader_ref (self), video_reader_unref);
-#line 262 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	buf = NULL;
-#line 3645 "VideoSupport.c"
+#line 3517 "VideoSupport.c"
 	{
 		GUnixInputStream* unix_input = NULL;
-		gint _tmp19_ = 0;
-		GUnixInputStream* _tmp20_ = NULL;
+		gint _tmp19_;
+		GUnixInputStream* _tmp20_;
 		GdkPixbuf* _tmp21_ = NULL;
-		GUnixInputStream* _tmp22_ = NULL;
-		GdkPixbuf* _tmp23_ = NULL;
-		GdkPixbuf* _tmp24_ = NULL;
-#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		GUnixInputStream* _tmp22_;
+		GdkPixbuf* _tmp23_;
+		GdkPixbuf* _tmp24_;
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp19_ = child_stdout;
-#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp20_ = (GUnixInputStream*) g_unix_input_stream_new (_tmp19_, TRUE);
-#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		unix_input = _tmp20_;
 #line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		unix_input = _tmp20_;
+#line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp22_ = unix_input;
-#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp23_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
-#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp21_ = _tmp23_;
-#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (unix_input);
-#line 3670 "VideoSupport.c"
-			goto __catch499_g_error;
+#line 3542 "VideoSupport.c"
+			goto __catch500_g_error;
 		}
-#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp24_ = _tmp21_;
-#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp21_ = NULL;
-#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (buf);
-#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		buf = _tmp24_;
-#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp21_);
-#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (unix_input);
-#line 3685 "VideoSupport.c"
+#line 3557 "VideoSupport.c"
 	}
-	goto __finally499;
-	__catch499_g_error:
+	goto __finally500;
+	__catch500_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		GError* _tmp25_;
+		const gchar* _tmp26_;
+#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 267 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp25_ = e;
-#line 267 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp26_ = _tmp25_->message;
-#line 267 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:267: Error creating pixbuf: %s", _tmp26_);
 #line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:268: Error creating pixbuf: %s", _tmp26_);
+#line 269 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (buf);
-#line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 269 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		buf = NULL;
-#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 3709 "VideoSupport.c"
+#line 3581 "VideoSupport.c"
 	}
-	__finally499:
-#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally500:
+#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (buf);
-#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3724 "VideoSupport.c"
+#line 3596 "VideoSupport.c"
 	}
-#line 272 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	child_status = 0;
 #line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	child_status = 0;
+#line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = self->priv->thumbnailer_pid;
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp29_ = waitpid ((pid_t) _tmp27_, &_tmp28_, 0);
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	child_status = _tmp28_;
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	ret_waitpid = (gint) _tmp29_;
 #line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	ret_waitpid = (gint) _tmp29_;
+#line 275 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp30_ = ret_waitpid;
-#line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp30_ < 0) {
-#line 3740 "VideoSupport.c"
-		gint _tmp31_ = 0;
 #line 275 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp30_ < 0) {
+#line 3612 "VideoSupport.c"
+		gint _tmp31_;
+#line 276 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp31_ = ret_waitpid;
-#line 275 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:275: waitpid returned error code: %d", _tmp31_);
 #line 276 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:276: waitpid returned error code: %d", _tmp31_);
+#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (buf);
-#line 276 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		buf = NULL;
-#line 3750 "VideoSupport.c"
+#line 3622 "VideoSupport.c"
 	} else {
-		gint _tmp32_ = 0;
-		gint _tmp33_ = 0;
-#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		gint _tmp32_;
+		gint _tmp33_;
+#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp32_ = child_status;
-#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp33_ = WEXITSTATUS (_tmp32_);
-#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (0 != _tmp33_) {
-#line 3760 "VideoSupport.c"
-			gint _tmp34_ = 0;
-			gint _tmp35_ = 0;
 #line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		if (0 != _tmp33_) {
+#line 3632 "VideoSupport.c"
+			gint _tmp34_;
+			gint _tmp35_;
+#line 279 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp34_ = child_status;
-#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 279 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = WEXITSTATUS (_tmp34_);
-#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			g_debug ("VideoSupport.vala:278: Thumbnailer exited with error code: %d", _tmp35_);
-#line 280 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 279 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			g_debug ("VideoSupport.vala:279: Thumbnailer exited with error code: %d", _tmp35_);
+#line 281 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (buf);
-#line 280 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			buf = NULL;
-#line 3773 "VideoSupport.c"
+#line 3645 "VideoSupport.c"
 		}
 	}
-#line 283 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp36_ = self->priv->thumbnailer_pid;
-#line 283 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_spawn_close_pid (_tmp36_);
 #line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self->priv->thumbnailer_pid = (GPid) 0;
+	g_spawn_close_pid (_tmp36_);
 #line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self->priv->thumbnailer_pid = (GPid) 0;
+#line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = buf;
-#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3788 "VideoSupport.c"
+#line 3660 "VideoSupport.c"
 }
 
 
 static gboolean video_reader_does_file_exist (VideoReader* self) {
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-#line 288 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (IS_VIDEO_READER (self), FALSE);
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 #line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (IS_VIDEO_READER (self), FALSE);
+#line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->file;
-#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = g_file_test (_tmp2_, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR);
-#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp2_);
-#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp4_;
-#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3817 "VideoSupport.c"
+#line 3689 "VideoSupport.c"
 }
 
 
 GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
 	GdkPixbuf* result = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	GFile* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GdkPixbuf* _tmp7_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
-	GdkPixbuf* _tmp10_ = NULL;
-	GdkPixbuf* _tmp11_ = NULL;
-#line 292 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (IS_VIDEO_READER (self), NULL);
+	GdkPixbuf* _tmp0_;
+	gboolean _tmp3_;
+	GFile* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	GdkPixbuf* _tmp7_;
+	GdkPixbuf* _tmp8_;
+	GdkPixbuf* _tmp10_;
+	GdkPixbuf* _tmp11_;
 #line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (IS_VIDEO_READER (self), NULL);
+#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->preview_frame;
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp0_ != NULL) {
-#line 3838 "VideoSupport.c"
-		GdkPixbuf* _tmp1_ = NULL;
-		GdkPixbuf* _tmp2_ = NULL;
 #line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp0_ != NULL) {
+#line 3710 "VideoSupport.c"
+		GdkPixbuf* _tmp1_;
+		GdkPixbuf* _tmp2_;
+#line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->preview_frame;
-#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = _tmp2_;
-#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3849 "VideoSupport.c"
+#line 3721 "VideoSupport.c"
 	}
-#line 296 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 297 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_does_file_exist (self);
-#line 296 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (!_tmp3_) {
 #line 297 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (!_tmp3_) {
+#line 298 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 297 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3859 "VideoSupport.c"
+#line 3731 "VideoSupport.c"
 	}
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = self->priv->file;
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = g_file_get_path (_tmp4_);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = _tmp5_;
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video_reader_thumbnailer (self, _tmp6_);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->priv->preview_frame);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->preview_frame = _tmp7_;
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_free0 (_tmp6_);
 #line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_g_free0 (_tmp6_);
+#line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = self->priv->preview_frame;
-#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (NULL == _tmp8_) {
-#line 3879 "VideoSupport.c"
-		GdkPixbuf* _tmp9_ = NULL;
 #line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (NULL == _tmp8_) {
+#line 3751 "VideoSupport.c"
+		GdkPixbuf* _tmp9_;
+#line 303 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = resources_get_noninterpretable_badge_pixbuf ();
-#line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 303 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (self->priv->preview_frame);
-#line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 303 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->preview_frame = _tmp9_;
-#line 3887 "VideoSupport.c"
+#line 3759 "VideoSupport.c"
 	}
-#line 304 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 305 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = self->priv->preview_frame;
-#line 304 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 305 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 304 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 305 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp11_;
-#line 304 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 305 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3897 "VideoSupport.c"
+#line 3769 "VideoSupport.c"
 }
 
 
 gdouble video_reader_read_clip_duration (VideoReader* self, GError** error) {
 	gdouble result = 0.0;
-	gdouble _tmp0_ = 0.0;
-	gdouble _tmp3_ = 0.0;
+	gdouble _tmp0_;
+	gdouble _tmp3_;
 	GError * _inner_error_ = NULL;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (IS_VIDEO_READER (self), 0.0);
 #line 308 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (IS_VIDEO_READER (self), 0.0);
+#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->clip_duration;
-#line 308 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp0_ == VIDEO_READER_UNKNOWN_CLIP_DURATION) {
 #line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp0_ == VIDEO_READER_UNKNOWN_CLIP_DURATION) {
+#line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_read_internal (self, &_inner_error_);
-#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 3918 "VideoSupport.c"
+#line 3790 "VideoSupport.c"
 				gdouble _tmp1_ = 0.0;
-#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_propagate_error (error, _inner_error_);
-#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return _tmp1_;
-#line 3924 "VideoSupport.c"
+#line 3796 "VideoSupport.c"
 			} else {
 				gdouble _tmp2_ = 0.0;
-#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return _tmp2_;
-#line 3933 "VideoSupport.c"
+#line 3805 "VideoSupport.c"
 			}
 		}
 	}
-#line 311 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 312 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = self->priv->clip_duration;
-#line 311 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 312 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 311 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 312 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3943 "VideoSupport.c"
+#line 3815 "VideoSupport.c"
 }
 
 
 VideoMetadata* video_reader_read_metadata (VideoReader* self, GError** error) {
 	VideoMetadata* result = NULL;
 	VideoMetadata* metadata = NULL;
-	VideoMetadata* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
+	VideoMetadata* _tmp0_;
+	GFile* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
 	GError * _inner_error_ = NULL;
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (IS_VIDEO_READER (self), NULL);
 #line 315 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (IS_VIDEO_READER (self), NULL);
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_metadata_new ();
-#line 315 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	metadata = _tmp0_;
 #line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	metadata = _tmp0_;
+#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = self->priv->file;
-#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = g_file_new_for_path (_tmp3_);
-#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (metadata, TYPE_MEDIA_METADATA, MediaMetadata), _tmp5_, &_inner_error_);
-#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp5_);
-#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp3_);
-#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_media_metadata_unref0 (metadata);
-#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3987 "VideoSupport.c"
+#line 3859 "VideoSupport.c"
 	}
-#line 318 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = metadata;
-#line 318 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3993 "VideoSupport.c"
+#line 3865 "VideoSupport.c"
 }
 
 
 GDateTime* video_reader_get_timestamp (VideoReader* self) {
 	GDateTime* result;
-	GDateTime* _tmp0_ = NULL;
+	GDateTime* _tmp0_;
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), NULL);
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4005,20 +3877,20 @@ GDateTime* video_reader_get_timestamp (VideoReader* self) {
 	result = _tmp0_;
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 4008 "VideoSupport.c"
+#line 3880 "VideoSupport.c"
 }
 
 
 static gpointer _g_date_time_ref0 (gpointer self) {
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? g_date_time_ref (self) : NULL;
-#line 4015 "VideoSupport.c"
+#line 3887 "VideoSupport.c"
 }
 
 
 static void video_reader_set_timestamp (VideoReader* self, GDateTime* value) {
-	GDateTime* _tmp0_ = NULL;
-	GDateTime* _tmp1_ = NULL;
+	GDateTime* _tmp0_;
+	GDateTime* _tmp1_;
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_READER (self));
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4029,14 +3901,14 @@ static void video_reader_set_timestamp (VideoReader* self, GDateTime* value) {
 	_g_date_time_unref0 (self->priv->_timestamp);
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->_timestamp = _tmp1_;
-#line 4032 "VideoSupport.c"
+#line 3904 "VideoSupport.c"
 }
 
 
 static void value_video_reader_init (GValue* value) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 4039 "VideoSupport.c"
+#line 3911 "VideoSupport.c"
 }
 
 
@@ -4045,7 +3917,7 @@ static void value_video_reader_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_unref (value->data[0].v_pointer);
-#line 4048 "VideoSupport.c"
+#line 3920 "VideoSupport.c"
 	}
 }
 
@@ -4055,11 +3927,11 @@ static void value_video_reader_copy_value (const GValue* src_value, GValue* dest
 	if (src_value->data[0].v_pointer) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = video_reader_ref (src_value->data[0].v_pointer);
-#line 4058 "VideoSupport.c"
+#line 3930 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4062 "VideoSupport.c"
+#line 3934 "VideoSupport.c"
 	}
 }
 
@@ -4067,66 +3939,66 @@ static void value_video_reader_copy_value (const GValue* src_value, GValue* dest
 static gpointer value_video_reader_peek_pointer (const GValue* value) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 4070 "VideoSupport.c"
+#line 3942 "VideoSupport.c"
 }
 
 
 static gchar* value_video_reader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 4077 "VideoSupport.c"
-		VideoReader* object;
+#line 3949 "VideoSupport.c"
+		VideoReader * object;
 		object = collect_values[0].v_pointer;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4084 "VideoSupport.c"
+#line 3956 "VideoSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4088 "VideoSupport.c"
+#line 3960 "VideoSupport.c"
 		}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_reader_ref (object);
-#line 4092 "VideoSupport.c"
+#line 3964 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4096 "VideoSupport.c"
+#line 3968 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 4100 "VideoSupport.c"
+#line 3972 "VideoSupport.c"
 }
 
 
 static gchar* value_video_reader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	VideoReader** object_p;
+	VideoReader ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!object_p) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4111 "VideoSupport.c"
+#line 3983 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = NULL;
-#line 4117 "VideoSupport.c"
+#line 3989 "VideoSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4121 "VideoSupport.c"
+#line 3993 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_reader_ref (value->data[0].v_pointer);
-#line 4125 "VideoSupport.c"
+#line 3997 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 4129 "VideoSupport.c"
+#line 4001 "VideoSupport.c"
 }
 
 
@@ -4140,7 +4012,7 @@ GParamSpec* param_spec_video_reader (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 4143 "VideoSupport.c"
+#line 4015 "VideoSupport.c"
 }
 
 
@@ -4149,12 +4021,12 @@ gpointer value_get_video_reader (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_READER), NULL);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 4152 "VideoSupport.c"
+#line 4024 "VideoSupport.c"
 }
 
 
 void value_set_video_reader (GValue* value, gpointer v_object) {
-	VideoReader* old;
+	VideoReader * old;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_READER));
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4169,23 +4041,23 @@ void value_set_video_reader (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_ref (value->data[0].v_pointer);
-#line 4172 "VideoSupport.c"
+#line 4044 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4176 "VideoSupport.c"
+#line 4048 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_unref (old);
-#line 4182 "VideoSupport.c"
+#line 4054 "VideoSupport.c"
 	}
 }
 
 
 void value_take_video_reader (GValue* value, gpointer v_object) {
-	VideoReader* old;
+	VideoReader * old;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_READER));
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4198,17 +4070,17 @@ void value_take_video_reader (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 4201 "VideoSupport.c"
+#line 4073 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4205 "VideoSupport.c"
+#line 4077 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_unref (old);
-#line 4211 "VideoSupport.c"
+#line 4083 "VideoSupport.c"
 	}
 }
 
@@ -4220,7 +4092,7 @@ static void video_reader_class_init (VideoReaderClass * klass) {
 	((VideoReaderClass *) klass)->finalize = video_reader_finalize;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_type_class_add_private (klass, sizeof (VideoReaderPrivate));
-#line 4223 "VideoSupport.c"
+#line 4095 "VideoSupport.c"
 }
 
 
@@ -4239,11 +4111,11 @@ static void video_reader_instance_init (VideoReader * self) {
 	self->priv->_timestamp = NULL;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->ref_count = 1;
-#line 4242 "VideoSupport.c"
+#line 4114 "VideoSupport.c"
 }
 
 
-static void video_reader_finalize (VideoReader* obj) {
+static void video_reader_finalize (VideoReader * obj) {
 	VideoReader * self;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_READER, VideoReader);
@@ -4255,7 +4127,7 @@ static void video_reader_finalize (VideoReader* obj) {
 	_g_object_unref0 (self->priv->file);
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_date_time_unref0 (self->priv->_timestamp);
-#line 4258 "VideoSupport.c"
+#line 4130 "VideoSupport.c"
 }
 
 
@@ -4274,18 +4146,18 @@ GType video_reader_get_type (void) {
 
 
 gpointer video_reader_ref (gpointer instance) {
-	VideoReader* self;
+	VideoReader * self;
 	self = instance;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return instance;
-#line 4283 "VideoSupport.c"
+#line 4155 "VideoSupport.c"
 }
 
 
 void video_reader_unref (gpointer instance) {
-	VideoReader* self;
+	VideoReader * self;
 	self = instance;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -4293,609 +4165,609 @@ void video_reader_unref (gpointer instance) {
 		VIDEO_READER_GET_CLASS (self)->finalize (self);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4296 "VideoSupport.c"
+#line 4168 "VideoSupport.c"
 	}
 }
 
 
 static gpointer _video_row_ref0 (gpointer self) {
-#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? video_row_ref (self) : NULL;
-#line 4304 "VideoSupport.c"
+#line 4176 "VideoSupport.c"
 }
 
 
 Video* video_construct (GType object_type, VideoRow* row) {
 	Video * self = NULL;
-	VideoRow* _tmp0_ = NULL;
-	VideoRow* _tmp1_ = NULL;
-	VideoRow* _tmp2_ = NULL;
-	VideoRow* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	VideoRow* _tmp0_;
+	VideoRow* _tmp1_;
+	VideoRow* _tmp2_;
+	VideoRow* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
 	gboolean _tmp6_ = FALSE;
-	VideoRow* _tmp7_ = NULL;
-	guint64 _tmp8_ = 0ULL;
-#line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	VideoRow* _tmp7_;
+	guint64 _tmp8_;
+#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_ROW (row), NULL);
-#line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = (Video*) video_source_construct (object_type);
 #line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = (Video*) video_source_construct (object_type);
+#line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = row;
-#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _video_row_ref0 (_tmp0_);
-#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_row_unref0 (self->priv->backing_row);
-#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->backing_row = _tmp1_;
-#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = self->priv->backing_row;
-#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = self->priv->backing_row;
-#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_->title;
-#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = media_source_prep_title (_tmp4_);
-#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp2_->title);
-#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_->title = _tmp5_;
-#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = row;
-#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = _tmp7_->flags;
-#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if ((_tmp8_ & VIDEO_FLAG_TRASH) != ((guint64) 0)) {
-#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = TRUE;
-#line 4351 "VideoSupport.c"
+#line 4223 "VideoSupport.c"
 	} else {
-		VideoRow* _tmp9_ = NULL;
-		guint64 _tmp10_ = 0ULL;
-#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp9_;
+		guint64 _tmp10_;
+#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = row;
-#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_->flags;
-#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = (_tmp10_ & VIDEO_FLAG_OFFLINE) != ((guint64) 0);
-#line 4361 "VideoSupport.c"
+#line 4233 "VideoSupport.c"
 	}
-#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp6_) {
-#line 4365 "VideoSupport.c"
-		VideoSourceCollection* _tmp11_ = NULL;
-		VideoRow* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
 #line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp6_) {
+#line 4237 "VideoSupport.c"
+		VideoSourceCollection* _tmp11_;
+		VideoRow* _tmp12_;
+		const gchar* _tmp13_;
+#line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = video_global;
-#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = row;
-#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp13_ = _tmp12_->backlinks;
-#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp13_);
-#line 4377 "VideoSupport.c"
+#line 4249 "VideoSupport.c"
 	}
-#line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 4381 "VideoSupport.c"
+#line 4253 "VideoSupport.c"
 }
 
 
 Video* video_new (VideoRow* row) {
-#line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_construct (TYPE_VIDEO, row);
-#line 4388 "VideoSupport.c"
+#line 4260 "VideoSupport.c"
 }
 
 
 void video_init (ProgressMonitor monitor, void* monitor_target) {
 	gchar** args = NULL;
-	gint args_length1 = 0;
-	gint _args_size_ = 0;
+	gint args_length1;
+	gint _args_size_;
 	GstRegistry* registry = NULL;
-	GstRegistry* _tmp0_ = NULL;
-	GstRegistry* _tmp1_ = NULL;
+	GstRegistry* _tmp0_;
+	GstRegistry* _tmp1_;
 	gint saved_state = 0;
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	GstRegistry* _tmp6_ = NULL;
-	guint32 _tmp7_ = 0U;
-	gint _tmp8_ = 0;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	GstRegistry* _tmp6_;
+	guint32 _tmp7_;
+	gint _tmp8_;
 	GstPluginFeature* feature = NULL;
-	GstRegistry* _tmp11_ = NULL;
-	GstPluginFeature* _tmp12_ = NULL;
-	GstPluginFeature* _tmp13_ = NULL;
-	GstRegistry* _tmp16_ = NULL;
-	GstPluginFeature* _tmp17_ = NULL;
-	GstPluginFeature* _tmp18_ = NULL;
-	VideoSourceCollection* _tmp21_ = NULL;
+	GstRegistry* _tmp11_;
+	GstPluginFeature* _tmp12_;
+	GstPluginFeature* _tmp13_;
+	GstRegistry* _tmp16_;
+	GstPluginFeature* _tmp17_;
+	GstPluginFeature* _tmp18_;
+	VideoSourceCollection* _tmp21_;
 	GeeArrayList* all = NULL;
-	VideoTable* _tmp22_ = NULL;
-	VideoTable* _tmp23_ = NULL;
-	GeeArrayList* _tmp24_ = NULL;
-	GeeArrayList* _tmp25_ = NULL;
+	VideoTable* _tmp22_;
+	VideoTable* _tmp23_;
+	GeeArrayList* _tmp24_;
+	GeeArrayList* _tmp25_;
 	GeeArrayList* all_videos = NULL;
-	GeeArrayList* _tmp26_ = NULL;
+	GeeArrayList* _tmp26_;
 	GeeArrayList* trashed_videos = NULL;
-	GeeArrayList* _tmp27_ = NULL;
+	GeeArrayList* _tmp27_;
 	GeeArrayList* offline_videos = NULL;
-	GeeArrayList* _tmp28_ = NULL;
+	GeeArrayList* _tmp28_;
 	gint count = 0;
-	GeeArrayList* _tmp29_ = NULL;
-	gint _tmp30_ = 0;
-	gint _tmp31_ = 0;
-	VideoSourceCollection* _tmp58_ = NULL;
-	GeeArrayList* _tmp59_ = NULL;
-	VideoSourceCollection* _tmp60_ = NULL;
-	GeeArrayList* _tmp61_ = NULL;
-	VideoSourceCollection* _tmp62_ = NULL;
-	GeeArrayList* _tmp63_ = NULL;
-	GeeCollection* _tmp64_ = NULL;
-	GeeCollection* _tmp65_ = NULL;
-#line 379 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_interpreter_state_changed = FALSE;
+	GeeArrayList* _tmp29_;
+	gint _tmp30_;
+	gint _tmp31_;
+	VideoSourceCollection* _tmp58_;
+	GeeArrayList* _tmp59_;
+	VideoSourceCollection* _tmp60_;
+	GeeArrayList* _tmp61_;
+	VideoSourceCollection* _tmp62_;
+	GeeArrayList* _tmp63_;
+	GeeCollection* _tmp64_;
+	GeeCollection* _tmp65_;
 #line 380 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_current_state = -1;
+	video_interpreter_state_changed = FALSE;
 #line 381 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_normal_regen_complete = FALSE;
+	video_current_state = -1;
 #line 382 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	video_normal_regen_complete = FALSE;
+#line 383 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_offline_regen_complete = FALSE;
-#line 386 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 387 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	args = NULL;
-#line 386 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 387 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	args_length1 = 0;
-#line 386 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_args_size_ = args_length1;
 #line 387 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_args_size_ = args_length1;
+#line 388 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	gst_init (&args_length1, &args);
-#line 389 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = gst_registry_get ();
-#line 389 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 389 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	registry = _tmp1_;
 #line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	registry = _tmp1_;
+#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = configuration_facade_get_video_interpreter_state_cookie (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp3_);
-#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	saved_state = _tmp5_;
 #line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	saved_state = _tmp5_;
+#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = registry;
-#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = gst_registry_get_feature_list_cookie (_tmp6_);
-#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_current_state = (gint) _tmp7_;
 #line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	video_current_state = (gint) _tmp7_;
+#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = saved_state;
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp8_ == CONFIG_FACADE_NO_VIDEO_INTERPRETER_STATE) {
 #line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_message ("VideoSupport.vala:393: interpreter state cookie not found; assuming al" \
-"l video thumbnails are out of date");
+	if (_tmp8_ == CONFIG_FACADE_NO_VIDEO_INTERPRETER_STATE) {
 #line 394 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_message ("VideoSupport.vala:394: interpreter state cookie not found; assuming al" \
+"l video thumbnails are out of date");
+#line 395 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpreter_state_changed = TRUE;
-#line 4486 "VideoSupport.c"
+#line 4358 "VideoSupport.c"
 	} else {
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-#line 395 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		gint _tmp9_;
+		gint _tmp10_;
+#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = saved_state;
-#line 395 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = video_current_state;
-#line 395 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp9_ != _tmp10_) {
 #line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			g_message ("VideoSupport.vala:396: interpreter state has changed; video thumbnails" \
-" may be out of date");
+		if (_tmp9_ != _tmp10_) {
 #line 397 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			g_message ("VideoSupport.vala:397: interpreter state has changed; video thumbnails" \
+" may be out of date");
+#line 398 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_interpreter_state_changed = TRUE;
-#line 4500 "VideoSupport.c"
+#line 4372 "VideoSupport.c"
 		}
 	}
-#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp11_ = registry;
-#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp12_ = gst_registry_find_feature (_tmp11_, "vaapidecodebin", gst_element_factory_get_type ());
-#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	feature = _tmp12_;
-#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = feature;
-#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp13_ != NULL) {
-#line 4513 "VideoSupport.c"
-		GstRegistry* _tmp14_ = NULL;
-		GstPluginFeature* _tmp15_ = NULL;
 #line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp13_ != NULL) {
+#line 4385 "VideoSupport.c"
+		GstRegistry* _tmp14_;
+		GstPluginFeature* _tmp15_;
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = registry;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = feature;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		gst_registry_remove_feature (_tmp14_, _tmp15_);
-#line 4522 "VideoSupport.c"
+#line 4394 "VideoSupport.c"
 	}
-#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp16_ = registry;
-#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp17_ = gst_registry_find_feature (_tmp16_, "vaapidecode", gst_element_factory_get_type ());
-#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (feature);
-#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	feature = _tmp17_;
-#line 414 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp18_ = feature;
-#line 414 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp18_ != NULL) {
-#line 4536 "VideoSupport.c"
-		GstRegistry* _tmp19_ = NULL;
-		GstPluginFeature* _tmp20_ = NULL;
 #line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp18_ != NULL) {
+#line 4408 "VideoSupport.c"
+		GstRegistry* _tmp19_;
+		GstPluginFeature* _tmp20_;
+#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp19_ = registry;
-#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp20_ = feature;
-#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		gst_registry_remove_feature (_tmp19_, _tmp20_);
-#line 4545 "VideoSupport.c"
+#line 4417 "VideoSupport.c"
 	}
-#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = video_source_collection_new ();
-#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_data_collection_unref0 (video_global);
-#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_global = _tmp21_;
-#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp22_ = video_table_get_instance ();
-#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp23_ = _tmp22_;
-#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = video_table_get_all (_tmp23_);
-#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = _tmp24_;
-#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_database_table_unref0 (_tmp23_);
-#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	all = _tmp25_;
 #line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	all = _tmp25_;
+#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	all_videos = _tmp26_;
 #line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	all_videos = _tmp26_;
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	trashed_videos = _tmp27_;
 #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	trashed_videos = _tmp27_;
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp28_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	offline_videos = _tmp28_;
 #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	offline_videos = _tmp28_;
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp29_ = all;
-#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp31_ = _tmp30_;
-#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	count = _tmp31_;
-#line 4585 "VideoSupport.c"
+#line 4457 "VideoSupport.c"
 	{
 		gint ctr = 0;
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		ctr = 0;
-#line 4590 "VideoSupport.c"
+#line 4462 "VideoSupport.c"
 		{
 			gboolean _tmp32_ = FALSE;
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp32_ = TRUE;
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 4597 "VideoSupport.c"
-				gint _tmp34_ = 0;
-				gint _tmp35_ = 0;
+#line 4469 "VideoSupport.c"
+				gint _tmp34_;
+				gint _tmp35_;
 				Video* video = NULL;
-				GeeArrayList* _tmp36_ = NULL;
-				gint _tmp37_ = 0;
-				gpointer _tmp38_ = NULL;
-				VideoRow* _tmp39_ = NULL;
-				Video* _tmp40_ = NULL;
-				Video* _tmp41_ = NULL;
-				gboolean _tmp42_ = FALSE;
-				Video* _tmp44_ = NULL;
-				gboolean _tmp45_ = FALSE;
-				ProgressMonitor _tmp54_ = NULL;
-				void* _tmp54__target = NULL;
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				GeeArrayList* _tmp36_;
+				gint _tmp37_;
+				gpointer _tmp38_;
+				VideoRow* _tmp39_;
+				Video* _tmp40_;
+				Video* _tmp41_;
+				gboolean _tmp42_;
+				Video* _tmp44_;
+				gboolean _tmp45_;
+				ProgressMonitor _tmp54_;
+				void* _tmp54__target;
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp32_) {
-#line 4614 "VideoSupport.c"
-					gint _tmp33_ = 0;
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 4486 "VideoSupport.c"
+					gint _tmp33_;
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp33_ = ctr;
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					ctr = _tmp33_ + 1;
-#line 4620 "VideoSupport.c"
+#line 4492 "VideoSupport.c"
 				}
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp32_ = FALSE;
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp34_ = ctr;
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp35_ = count;
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!(_tmp34_ < _tmp35_)) {
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 4632 "VideoSupport.c"
+#line 4504 "VideoSupport.c"
 				}
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp36_ = all;
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp37_ = ctr;
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp38_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp37_);
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp39_ = (VideoRow*) _tmp38_;
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp40_ = video_new (_tmp39_);
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp41_ = _tmp40_;
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_video_row_unref0 (_tmp39_);
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp41_;
-#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp42_ = video_interpreter_state_changed;
-#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (_tmp42_) {
-#line 4654 "VideoSupport.c"
-					Video* _tmp43_ = NULL;
 #line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				if (_tmp42_) {
+#line 4526 "VideoSupport.c"
+					Video* _tmp43_;
+#line 430 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp43_ = video;
-#line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 430 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					video_set_is_interpretable (_tmp43_, FALSE);
-#line 4660 "VideoSupport.c"
+#line 4532 "VideoSupport.c"
 				}
-#line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp44_ = video;
-#line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp45_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (_tmp45_) {
-#line 4668 "VideoSupport.c"
-					GeeArrayList* _tmp46_ = NULL;
-					Video* _tmp47_ = NULL;
 #line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				if (_tmp45_) {
+#line 4540 "VideoSupport.c"
+					GeeArrayList* _tmp46_;
+					Video* _tmp47_;
+#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp46_ = trashed_videos;
-#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp47_ = video;
-#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp47_);
-#line 4677 "VideoSupport.c"
+#line 4549 "VideoSupport.c"
 				} else {
-					Video* _tmp48_ = NULL;
-					gboolean _tmp49_ = FALSE;
-#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					Video* _tmp48_;
+					gboolean _tmp49_;
+#line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp48_ = video;
-#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp49_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					if (_tmp49_) {
-#line 4687 "VideoSupport.c"
-						GeeArrayList* _tmp50_ = NULL;
-						Video* _tmp51_ = NULL;
 #line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					if (_tmp49_) {
+#line 4559 "VideoSupport.c"
+						GeeArrayList* _tmp50_;
+						Video* _tmp51_;
+#line 435 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp50_ = offline_videos;
-#line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 435 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp51_ = video;
-#line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 435 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp51_);
-#line 4696 "VideoSupport.c"
+#line 4568 "VideoSupport.c"
 					} else {
-						GeeArrayList* _tmp52_ = NULL;
-						Video* _tmp53_ = NULL;
-#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+						GeeArrayList* _tmp52_;
+						Video* _tmp53_;
+#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp52_ = all_videos;
-#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp53_ = video;
-#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp53_);
-#line 4706 "VideoSupport.c"
+#line 4578 "VideoSupport.c"
 					}
 				}
-#line 438 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp54_ = monitor;
-#line 438 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp54__target = monitor_target;
-#line 438 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (_tmp54_ != NULL) {
-#line 4715 "VideoSupport.c"
-					ProgressMonitor _tmp55_ = NULL;
-					void* _tmp55__target = NULL;
-					gint _tmp56_ = 0;
-					gint _tmp57_ = 0;
 #line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				if (_tmp54_ != NULL) {
+#line 4587 "VideoSupport.c"
+					ProgressMonitor _tmp55_;
+					void* _tmp55__target;
+					gint _tmp56_;
+					gint _tmp57_;
+#line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp55_ = monitor;
-#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp55__target = monitor_target;
-#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp56_ = ctr;
-#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp57_ = count;
-#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp55_ ((guint64) _tmp56_, (guint64) _tmp57_, TRUE, _tmp55__target);
-#line 4730 "VideoSupport.c"
+#line 4602 "VideoSupport.c"
 				}
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 4734 "VideoSupport.c"
+#line 4606 "VideoSupport.c"
 			}
 		}
 	}
-#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp58_ = video_global;
-#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp59_ = trashed_videos;
-#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp60_ = video_global;
-#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp61_ = offline_videos;
-#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 445 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp62_ = video_global;
-#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 445 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp63_ = all_videos;
-#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 445 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp64_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL);
-#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 445 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp65_ = _tmp64_;
-#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 445 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp65_);
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (offline_videos);
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (trashed_videos);
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (all_videos);
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (all);
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (feature);
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (registry);
-#line 4772 "VideoSupport.c"
+#line 4644 "VideoSupport.c"
 }
 
 
 gboolean video_has_interpreter_state_changed (void) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 448 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	gboolean _tmp0_;
+#line 449 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpreter_state_changed;
-#line 448 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 449 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 448 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 449 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 4785 "VideoSupport.c"
+#line 4657 "VideoSupport.c"
 }
 
 
 void video_notify_normal_thumbs_regenerated (void) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 452 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	gboolean _tmp2_;
+#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_normal_regen_complete;
-#line 452 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp0_) {
 #line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp0_) {
+#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 4799 "VideoSupport.c"
+#line 4671 "VideoSupport.c"
 	}
-#line 455 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_message ("VideoSupport.vala:455: normal video thumbnail regeneration completed");
-#line 457 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_normal_regen_complete = TRUE;
+#line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_message ("VideoSupport.vala:456: normal video thumbnail regeneration completed");
 #line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	video_normal_regen_complete = TRUE;
+#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_normal_regen_complete;
-#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 4809 "VideoSupport.c"
-		gboolean _tmp3_ = FALSE;
-#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 4681 "VideoSupport.c"
+		gboolean _tmp3_;
+#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_offline_regen_complete;
-#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp3_;
-#line 4815 "VideoSupport.c"
+#line 4687 "VideoSupport.c"
 	} else {
-#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 4819 "VideoSupport.c"
+#line 4691 "VideoSupport.c"
 	}
-#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp1_) {
 #line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp1_) {
+#line 460 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_save_interpreter_state ();
-#line 4825 "VideoSupport.c"
+#line 4697 "VideoSupport.c"
 	}
 }
 
 
 void video_notify_offline_thumbs_regenerated (void) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 463 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	gboolean _tmp2_;
+#line 464 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_offline_regen_complete;
-#line 463 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp0_) {
 #line 464 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp0_) {
+#line 465 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 4840 "VideoSupport.c"
+#line 4712 "VideoSupport.c"
 	}
-#line 466 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_message ("VideoSupport.vala:466: offline video thumbnail regeneration completed");
-#line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_offline_regen_complete = TRUE;
+#line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_message ("VideoSupport.vala:467: offline video thumbnail regeneration completed");
 #line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	video_offline_regen_complete = TRUE;
+#line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_normal_regen_complete;
-#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 4850 "VideoSupport.c"
-		gboolean _tmp3_ = FALSE;
-#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 4722 "VideoSupport.c"
+		gboolean _tmp3_;
+#line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_offline_regen_complete;
-#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp3_;
-#line 4856 "VideoSupport.c"
+#line 4728 "VideoSupport.c"
 	} else {
-#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 4860 "VideoSupport.c"
+#line 4732 "VideoSupport.c"
 	}
-#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp1_) {
 #line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp1_) {
+#line 471 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_save_interpreter_state ();
-#line 4866 "VideoSupport.c"
+#line 4738 "VideoSupport.c"
 	}
 }
 
 
 static void video_save_interpreter_state (void) {
-	gboolean _tmp0_ = FALSE;
-#line 474 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	gboolean _tmp0_;
+#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpreter_state_changed;
-#line 474 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp0_) {
-#line 4877 "VideoSupport.c"
-		ConfigFacade* _tmp1_ = NULL;
-		ConfigFacade* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
 #line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_message ("VideoSupport.vala:475: saving video interpreter state to configuration" \
+	if (_tmp0_) {
+#line 4749 "VideoSupport.c"
+		ConfigFacade* _tmp1_;
+		ConfigFacade* _tmp2_;
+		gint _tmp3_;
+#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_message ("VideoSupport.vala:476: saving video interpreter state to configuration" \
 " system");
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = config_facade_get_instance ();
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_current_state;
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		configuration_facade_set_video_interpreter_state_cookie (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_);
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_g_object_unref0 (_tmp2_);
 #line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_g_object_unref0 (_tmp2_);
+#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpreter_state_changed = FALSE;
-#line 4895 "VideoSupport.c"
+#line 4767 "VideoSupport.c"
 	}
 }
 
@@ -4906,467 +4778,464 @@ void video_terminate (void) {
 
 ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback done, void* done_target, gboolean export_in_place) {
 	ExporterUI* result = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
-	GeeCollection* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
+	GeeCollection* _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
 	GFile* export_dir = NULL;
-	const gchar* _tmp39_ = NULL;
-	GFile* _tmp40_ = NULL;
-	GFile* _tmp41_ = NULL;
+	GFile* _tmp39_;
+	GFile* _tmp40_;
 	ExporterUI* exporter = NULL;
-	GeeCollection* _tmp42_ = NULL;
-	GFile* _tmp43_ = NULL;
-	Scaling _tmp44_ = {0};
-	ExportFormatParameters _tmp45_ = {0};
-	Exporter* _tmp46_ = NULL;
-	Exporter* _tmp47_ = NULL;
-	ExporterUI* _tmp48_ = NULL;
-	ExporterUI* _tmp49_ = NULL;
-	ExporterUI* _tmp50_ = NULL;
-	ExporterCompletionCallback _tmp51_ = NULL;
-	void* _tmp51__target = NULL;
+	GeeCollection* _tmp41_;
+	GFile* _tmp42_;
+	Scaling _tmp43_ = {0};
+	ExportFormatParameters _tmp44_ = {0};
+	Exporter* _tmp45_;
+	Exporter* _tmp46_;
+	ExporterUI* _tmp47_;
+	ExporterUI* _tmp48_;
+	ExporterUI* _tmp49_;
+	ExporterCompletionCallback _tmp50_;
+	void* _tmp50__target;
 	GError * _inner_error_ = NULL;
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (videos), NULL);
-#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = videos;
-#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp2_ == 0) {
 #line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp2_ == 0) {
+#line 489 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 489 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4944 "VideoSupport.c"
+#line 4815 "VideoSupport.c"
 	}
-#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = export_in_place;
-#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp3_) {
-#line 4950 "VideoSupport.c"
+#line 4821 "VideoSupport.c"
 		ExporterUI* temp_exporter = NULL;
-		GeeCollection* _tmp4_ = NULL;
+		GeeCollection* _tmp4_;
 		Scaling _tmp5_ = {0};
 		ExportFormatParameters _tmp6_ = {0};
-		Exporter* _tmp7_ = NULL;
-		Exporter* _tmp8_ = NULL;
-		ExporterUI* _tmp9_ = NULL;
-		ExporterUI* _tmp10_ = NULL;
-		ExporterUI* _tmp11_ = NULL;
-		ExporterCompletionCallback _tmp12_ = NULL;
-		void* _tmp12__target = NULL;
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		Exporter* _tmp7_;
+		Exporter* _tmp8_;
+		ExporterUI* _tmp9_;
+		ExporterUI* _tmp10_;
+		ExporterUI* _tmp11_;
+		ExporterCompletionCallback _tmp12_;
+		void* _tmp12__target;
+#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = videos;
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		scaling_for_original (&_tmp5_);
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		export_format_parameters_unmodified (&_tmp6_);
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = exporter_new_for_temp_file (_tmp4_, &_tmp5_, &_tmp6_);
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = _tmp7_;
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = exporter_ui_new (_tmp8_);
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_;
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp8_);
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		temp_exporter = _tmp10_;
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = temp_exporter;
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = done;
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12__target = done_target;
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		exporter_ui_export (_tmp11_, _tmp12_, _tmp12__target);
 #line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		exporter_ui_export (_tmp11_, _tmp12_, _tmp12__target);
+#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = temp_exporter;
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4992 "VideoSupport.c"
+#line 4863 "VideoSupport.c"
 	}
-#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = videos;
-#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp14_ = gee_collection_get_size (_tmp13_);
-#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp15_ = _tmp14_;
-#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp15_ == 1) {
-#line 5002 "VideoSupport.c"
+#line 4873 "VideoSupport.c"
 		Video* video = NULL;
 		GFile* save_as = NULL;
-		Video* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
-		GFile* _tmp27_ = NULL;
-		GFile* _tmp28_ = NULL;
-		GFile* _tmp29_ = NULL;
-#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		Video* _tmp24_;
+		gchar* _tmp25_;
+		gchar* _tmp26_;
+		GFile* _tmp27_;
+		GFile* _tmp28_;
+		GFile* _tmp29_;
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video = NULL;
-#line 5013 "VideoSupport.c"
+#line 4884 "VideoSupport.c"
 		{
 			GeeIterator* _v_it = NULL;
-			GeeCollection* _tmp16_ = NULL;
-			GeeIterator* _tmp17_ = NULL;
-#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			GeeCollection* _tmp16_;
+			GeeIterator* _tmp17_;
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = videos;
-#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_v_it = _tmp17_;
-#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 5026 "VideoSupport.c"
-				GeeIterator* _tmp18_ = NULL;
-				gboolean _tmp19_ = FALSE;
+#line 4897 "VideoSupport.c"
+				GeeIterator* _tmp18_;
+				gboolean _tmp19_;
 				Video* v = NULL;
-				GeeIterator* _tmp20_ = NULL;
-				gpointer _tmp21_ = NULL;
-				Video* _tmp22_ = NULL;
-				Video* _tmp23_ = NULL;
-#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				GeeIterator* _tmp20_;
+				gpointer _tmp21_;
+				Video* _tmp22_;
+				Video* _tmp23_;
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _v_it;
-#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp19_ = gee_iterator_next (_tmp18_);
-#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp19_) {
-#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 5042 "VideoSupport.c"
+#line 4913 "VideoSupport.c"
 				}
-#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp20_ = _v_it;
-#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp21_ = gee_iterator_get (_tmp20_);
-#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				v = (Video*) _tmp21_;
 #line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				v = (Video*) _tmp21_;
+#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp22_ = v;
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp23_ = _g_object_ref0 (_tmp22_);
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video = _tmp23_;
 #line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				video = _tmp23_;
+#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (v);
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 5062 "VideoSupport.c"
+#line 4933 "VideoSupport.c"
 			}
-#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_v_it);
-#line 5066 "VideoSupport.c"
+#line 4937 "VideoSupport.c"
 		}
-#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp24_ = video;
-#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp25_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp26_ = _tmp25_;
-#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp27_ = export_ui_choose_file (_tmp26_);
-#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp28_ = _tmp27_;
-#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp26_);
-#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		save_as = _tmp28_;
 #line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		save_as = _tmp28_;
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp29_ = save_as;
-#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp29_ == NULL) {
 #line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		if (_tmp29_ == NULL) {
+#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = NULL;
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (save_as);
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5094 "VideoSupport.c"
+#line 4965 "VideoSupport.c"
 		}
 		{
-			AppWindow* _tmp30_ = NULL;
-			AppWindow* _tmp31_ = NULL;
-			Video* _tmp32_ = NULL;
-			GFile* _tmp33_ = NULL;
-			AppWindow* _tmp34_ = NULL;
-			AppWindow* _tmp35_ = NULL;
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			AppWindow* _tmp30_;
+			AppWindow* _tmp31_;
+			Video* _tmp32_;
+			GFile* _tmp33_;
+			AppWindow* _tmp34_;
+			AppWindow* _tmp35_;
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp30_ = app_window_get_instance ();
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp31_ = _tmp30_;
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PAGE_WINDOW, PageWindow));
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_g_object_unref0 (_tmp31_);
 #line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_g_object_unref0 (_tmp31_);
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp32_ = video;
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp33_ = save_as;
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_export (_tmp32_, _tmp33_, &_inner_error_);
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5119 "VideoSupport.c"
-				goto __catch500_g_error;
+#line 4990 "VideoSupport.c"
+				goto __catch501_g_error;
 			}
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp34_ = app_window_get_instance ();
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = _tmp34_;
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PAGE_WINDOW, PageWindow));
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp35_);
-#line 5130 "VideoSupport.c"
+#line 5001 "VideoSupport.c"
 		}
-		goto __finally500;
-		__catch500_g_error:
+		goto __finally501;
+		__catch501_g_error:
 		{
 			GError* err = NULL;
-			AppWindow* _tmp36_ = NULL;
-			AppWindow* _tmp37_ = NULL;
-			GFile* _tmp38_ = NULL;
-#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			AppWindow* _tmp36_;
+			AppWindow* _tmp37_;
+			GFile* _tmp38_;
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			err = _inner_error_;
-#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_inner_error_ = NULL;
-#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp36_ = app_window_get_instance ();
-#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp37_ = _tmp36_;
-#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_PAGE_WINDOW, PageWindow));
-#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_g_object_unref0 (_tmp37_);
 #line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_g_object_unref0 (_tmp37_);
+#line 517 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp38_ = save_as;
-#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 517 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			export_error_dialog (_tmp38_, FALSE);
-#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 5157 "VideoSupport.c"
+#line 5028 "VideoSupport.c"
 		}
-		__finally500:
-#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		__finally501:
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (save_as);
-#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 5172 "VideoSupport.c"
+#line 5043 "VideoSupport.c"
 		}
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (save_as);
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (video);
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5182 "VideoSupport.c"
-	}
-#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp39_ = _ ("Export Videos");
-#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp40_ = export_ui_choose_dir (_tmp39_);
-#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	export_dir = _tmp40_;
+#line 5053 "VideoSupport.c"
+	}
 #line 524 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp41_ = export_dir;
+	_tmp39_ = export_ui_choose_dir (_ ("Export Videos"));
 #line 524 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp41_ == NULL) {
+	export_dir = _tmp39_;
 #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		result = NULL;
+	_tmp40_ = export_dir;
 #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp40_ == NULL) {
+#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		result = NULL;
+#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (export_dir);
-#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5200 "VideoSupport.c"
-	}
-#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp42_ = videos;
-#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp43_ = export_dir;
-#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	scaling_for_original (&_tmp44_);
-#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	export_format_parameters_unmodified (&_tmp45_);
-#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp46_ = exporter_new (_tmp42_, _tmp43_, &_tmp44_, &_tmp45_, FALSE);
-#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp47_ = _tmp46_;
-#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp48_ = exporter_ui_new (_tmp47_);
-#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp49_ = _tmp48_;
-#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_object_unref0 (_tmp47_);
-#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	exporter = _tmp49_;
-#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp50_ = exporter;
-#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp51_ = done;
-#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp51__target = done_target;
-#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	exporter_ui_export (_tmp50_, _tmp51_, _tmp51__target);
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 5069 "VideoSupport.c"
+	}
+#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp41_ = videos;
+#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp42_ = export_dir;
+#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	scaling_for_original (&_tmp43_);
+#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	export_format_parameters_unmodified (&_tmp44_);
+#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp45_ = exporter_new (_tmp41_, _tmp42_, &_tmp43_, &_tmp44_, FALSE);
+#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp46_ = _tmp45_;
+#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp47_ = exporter_ui_new (_tmp46_);
+#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp48_ = _tmp47_;
+#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_g_object_unref0 (_tmp46_);
+#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	exporter = _tmp48_;
+#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp49_ = exporter;
+#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp50_ = done;
+#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp50__target = done_target;
+#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	exporter_ui_export (_tmp49_, _tmp50_, _tmp50__target);
+#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = exporter;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (export_dir);
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5236 "VideoSupport.c"
+#line 5105 "VideoSupport.c"
 }
 
 
 static void video_real_commit_backlinks (DataSource* base, SourceCollection* sources, const gchar* backlinks) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources));
-#line 5247 "VideoSupport.c"
+#line 5116 "VideoSupport.c"
 	{
-		VideoTable* _tmp0_ = NULL;
-		VideoTable* _tmp1_ = NULL;
+		VideoTable* _tmp0_;
+		VideoTable* _tmp1_;
 		VideoID _tmp2_ = {0};
-		const gchar* _tmp3_ = NULL;
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		const gchar* _tmp3_;
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = video_table_get_instance ();
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (self, &_tmp2_);
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = backlinks;
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_update_backlinks (_tmp1_, &_tmp2_, _tmp3_, &_inner_error_);
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp1_);
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5269 "VideoSupport.c"
-				goto __catch501_database_error;
+#line 5138 "VideoSupport.c"
+				goto __catch502_database_error;
 			}
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5278 "VideoSupport.c"
+#line 5147 "VideoSupport.c"
 		}
 		{
-			VideoRow* _tmp4_ = NULL;
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp4_;
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5286 "VideoSupport.c"
+#line 5155 "VideoSupport.c"
 			{
-				VideoRow* _tmp5_ = NULL;
-				const gchar* _tmp6_ = NULL;
-				gchar* _tmp7_ = NULL;
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp5_;
+				const gchar* _tmp6_;
+				gchar* _tmp7_;
+#line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = backlinks;
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = g_strdup (_tmp6_);
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (_tmp5_->backlinks);
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_->backlinks = _tmp7_;
-#line 5301 "VideoSupport.c"
+#line 5170 "VideoSupport.c"
 			}
-			__finally502:
+			__finally503:
 			{
-				VideoRow* _tmp8_ = NULL;
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp8_;
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5310 "VideoSupport.c"
+#line 5179 "VideoSupport.c"
 			}
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5316 "VideoSupport.c"
-					goto __catch501_database_error;
+#line 5185 "VideoSupport.c"
+					goto __catch502_database_error;
 				}
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 5325 "VideoSupport.c"
+#line 5194 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally501;
-	__catch501_database_error:
+	goto __finally502;
+	__catch502_database_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		GError* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+		GError* _tmp11_;
+		const gchar* _tmp12_;
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_;
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = err;
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = _tmp11_->message;
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_warning ("VideoSupport.vala:541: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_warning ("VideoSupport.vala:542: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
+#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp10_);
-#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 5355 "VideoSupport.c"
+#line 5224 "VideoSupport.c"
 	}
-	__finally501:
-#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally502:
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5366 "VideoSupport.c"
+#line 5235 "VideoSupport.c"
 	}
 }
 
@@ -5375,93 +5244,93 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 	Video * self;
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 5379 "VideoSupport.c"
+#line 5248 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
+		VideoRow* _tmp0_;
 		gboolean _tmp13_ = FALSE;
-#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5387 "VideoSupport.c"
+#line 5256 "VideoSupport.c"
 		{
 			gboolean committed = FALSE;
-			VideoTable* _tmp1_ = NULL;
-			VideoTable* _tmp2_ = NULL;
-			VideoRow* _tmp3_ = NULL;
-			VideoID _tmp4_ = {0};
-			EventID _tmp5_ = {0};
-			gboolean _tmp6_ = FALSE;
-			gboolean _tmp7_ = FALSE;
-			gboolean _tmp8_ = FALSE;
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoTable* _tmp1_;
+			VideoTable* _tmp2_;
+			VideoRow* _tmp3_;
+			VideoID _tmp4_;
+			EventID _tmp5_;
+			gboolean _tmp6_;
+			gboolean _tmp7_;
+			gboolean _tmp8_;
+#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = video_table_get_instance ();
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_;
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->video_id;
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = *event_id;
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = video_table_set_event (_tmp2_, &_tmp4_, &_tmp5_);
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_;
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_database_table_unref0 (_tmp2_);
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			committed = _tmp7_;
-#line 549 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = committed;
-#line 549 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (_tmp8_) {
-#line 5420 "VideoSupport.c"
-				VideoRow* _tmp9_ = NULL;
-				EventID _tmp10_ = {0};
 #line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			if (_tmp8_) {
+#line 5289 "VideoSupport.c"
+				VideoRow* _tmp9_;
+				EventID _tmp10_;
+#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = *event_id;
-#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_->event_id = _tmp10_;
-#line 5429 "VideoSupport.c"
+#line 5298 "VideoSupport.c"
 			}
-#line 552 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = committed;
-#line 5433 "VideoSupport.c"
+#line 5302 "VideoSupport.c"
 			{
-				VideoRow* _tmp11_ = NULL;
-#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp11_;
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = self->priv->backing_row;
-#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5440 "VideoSupport.c"
+#line 5309 "VideoSupport.c"
 			}
-#line 552 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5444 "VideoSupport.c"
+#line 5313 "VideoSupport.c"
 		}
-		__finally503:
+		__finally504:
 		{
-			VideoRow* _tmp12_ = NULL;
-#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp12_;
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = self->priv->backing_row;
-#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5453 "VideoSupport.c"
+#line 5322 "VideoSupport.c"
 		}
-#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp13_;
-#line 5461 "VideoSupport.c"
+#line 5330 "VideoSupport.c"
 	}
 }
 
@@ -5469,259 +5338,259 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 gboolean video_is_duplicate (GFile* file, const gchar* full_md5) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	GFile* _tmp1_ = NULL;
-	VideoTable* _tmp3_ = NULL;
-	VideoTable* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	gboolean _tmp8_ = FALSE;
-#line 556 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
+	GFile* _tmp1_;
+	VideoTable* _tmp3_;
+	VideoTable* _tmp4_;
+	GFile* _tmp5_;
+	const gchar* _tmp6_;
+	gboolean _tmp7_;
+	gboolean _tmp8_;
 #line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
+#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = file;
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = TRUE;
-#line 5484 "VideoSupport.c"
+#line 5353 "VideoSupport.c"
 	} else {
-		const gchar* _tmp2_ = NULL;
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		const gchar* _tmp2_;
+#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = full_md5;
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 5491 "VideoSupport.c"
+#line 5360 "VideoSupport.c"
 	}
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_assert (_tmp0_, "file != null || full_md5 != null");
-#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_table_get_instance ();
-#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = file;
-#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = full_md5;
-#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video_table_has_duplicate (_tmp4_, _tmp5_, _tmp6_);
-#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = _tmp7_;
-#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_database_table_unref0 (_tmp4_);
-#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp8_;
-#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5513 "VideoSupport.c"
+#line 5382 "VideoSupport.c"
 }
 
 
-ImportResult video_import_create (VideoImportParams* params, Video** video) {
+ImportResult video_import_create (VideoImportParams* params, Video* * video) {
 	Video* _vala_video = NULL;
 	ImportResult result = 0;
-	VideoImportParams* _tmp8_ = NULL;
-	VideoRow* _tmp9_ = NULL;
-	Video* _tmp10_ = NULL;
+	VideoImportParams* _tmp8_;
+	VideoRow* _tmp9_;
+	Video* _tmp10_;
 	GError * _inner_error_ = NULL;
-#line 565 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (IS_VIDEO_IMPORT_PARAMS (params), 0);
 #line 566 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (IS_VIDEO_IMPORT_PARAMS (params), 0);
+#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_vala_video);
-#line 566 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_video = NULL;
-#line 5530 "VideoSupport.c"
+#line 5399 "VideoSupport.c"
 	{
 		VideoID _tmp0_ = {0};
-		VideoTable* _tmp1_ = NULL;
-		VideoTable* _tmp2_ = NULL;
-		VideoImportParams* _tmp3_ = NULL;
-		VideoRow* _tmp4_ = NULL;
+		VideoTable* _tmp1_;
+		VideoTable* _tmp2_;
+		VideoImportParams* _tmp3_;
+		VideoRow* _tmp4_;
 		VideoID _tmp5_ = {0};
-		VideoID _tmp6_ = {0};
-		gboolean _tmp7_ = FALSE;
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoID _tmp6_;
+		gboolean _tmp7_;
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = video_table_get_instance ();
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = params;
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = _tmp3_->row;
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_add (_tmp2_, _tmp4_, &_tmp5_, &_inner_error_);
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp5_;
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp2_);
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp6_;
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5560 "VideoSupport.c"
-				goto __catch504_database_error;
+#line 5429 "VideoSupport.c"
+				goto __catch505_database_error;
 			}
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0;
-#line 5569 "VideoSupport.c"
+#line 5438 "VideoSupport.c"
 		}
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = video_id_is_invalid (&_tmp0_);
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp7_) {
 #line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		if (_tmp7_) {
+#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = IMPORT_RESULT_DATABASE_ERROR;
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (video) {
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				*video = _vala_video;
-#line 5581 "VideoSupport.c"
+#line 5450 "VideoSupport.c"
 			} else {
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (_vala_video);
-#line 5585 "VideoSupport.c"
+#line 5454 "VideoSupport.c"
 			}
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5589 "VideoSupport.c"
+#line 5458 "VideoSupport.c"
 		}
 	}
-	goto __finally504;
-	__catch504_database_error:
+	goto __finally505;
+	__catch505_database_error:
 	{
 		GError* err = NULL;
-#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 574 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = IMPORT_RESULT_DATABASE_ERROR;
-#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 574 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 574 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (video) {
-#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 574 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*video = _vala_video;
-#line 5608 "VideoSupport.c"
+#line 5477 "VideoSupport.c"
 		} else {
-#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 574 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_vala_video);
-#line 5612 "VideoSupport.c"
+#line 5481 "VideoSupport.c"
 		}
-#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 574 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5616 "VideoSupport.c"
+#line 5485 "VideoSupport.c"
 	}
-	__finally504:
-#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally505:
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 5627 "VideoSupport.c"
+#line 5496 "VideoSupport.c"
 	}
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = params;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = _tmp8_->row;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = video_new (_tmp9_);
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_vala_video);
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_video = _tmp10_;
-#line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 580 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = IMPORT_RESULT_SUCCESS;
-#line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 580 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (video) {
-#line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 580 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*video = _vala_video;
-#line 5645 "VideoSupport.c"
+#line 5514 "VideoSupport.c"
 	} else {
-#line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 580 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_vala_video);
-#line 5649 "VideoSupport.c"
+#line 5518 "VideoSupport.c"
 	}
-#line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 580 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5653 "VideoSupport.c"
+#line 5522 "VideoSupport.c"
 }
 
 
 void video_import_failed (Video* video) {
 	GError * _inner_error_ = NULL;
-#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (video));
-#line 5661 "VideoSupport.c"
+#line 5530 "VideoSupport.c"
 	{
-		VideoTable* _tmp0_ = NULL;
-		VideoTable* _tmp1_ = NULL;
-		Video* _tmp2_ = NULL;
+		VideoTable* _tmp0_;
+		VideoTable* _tmp1_;
+		Video* _tmp2_;
 		VideoID _tmp3_ = {0};
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = video_table_get_instance ();
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = video;
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (_tmp2_, &_tmp3_);
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_remove (_tmp1_, &_tmp3_, &_inner_error_);
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp1_);
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5683 "VideoSupport.c"
-				goto __catch505_database_error;
+#line 5552 "VideoSupport.c"
+				goto __catch506_database_error;
 			}
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5692 "VideoSupport.c"
+#line 5561 "VideoSupport.c"
 		}
 	}
-	goto __finally505;
-	__catch505_database_error:
+	goto __finally506;
+	__catch506_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp4_ = NULL;
-#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		GError* _tmp4_;
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = err;
-#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp4_);
-#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 5710 "VideoSupport.c"
+#line 5579 "VideoSupport.c"
 	}
-	__finally505:
-#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally506:
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5721 "VideoSupport.c"
+#line 5590 "VideoSupport.c"
 	}
 }
 
@@ -5730,104 +5599,104 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 	Video * self;
 	BackingFileState** result = NULL;
 	BackingFileState** backing = NULL;
-	BackingFileState** _tmp0_ = NULL;
-	gint backing_length1 = 0;
-	gint _backing_size_ = 0;
-	BackingFileState** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
+	BackingFileState** _tmp0_;
+	gint backing_length1;
+	gint _backing_size_;
+	BackingFileState** _tmp13_;
+	gint _tmp13__length1;
 	GError * _inner_error_ = NULL;
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_new0 (BackingFileState*, 1 + 1);
-#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing = _tmp0_;
-#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing_length1 = 1;
-#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_backing_size_ = backing_length1;
-#line 5746 "VideoSupport.c"
+#line 5615 "VideoSupport.c"
 	{
-		VideoRow* _tmp1_ = NULL;
-#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp1_;
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->backing_row;
-#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5753 "VideoSupport.c"
+#line 5622 "VideoSupport.c"
 		{
-			VideoRow* _tmp2_ = NULL;
-			const gchar* _tmp3_ = NULL;
-			VideoRow* _tmp4_ = NULL;
-			gint64 _tmp5_ = 0LL;
-			VideoRow* _tmp6_ = NULL;
-			time_t _tmp7_ = 0;
-			VideoRow* _tmp8_ = NULL;
-			const gchar* _tmp9_ = NULL;
-			BackingFileState* _tmp10_ = NULL;
-			BackingFileState* _tmp11_ = NULL;
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp2_;
+			const gchar* _tmp3_;
+			VideoRow* _tmp4_;
+			gint64 _tmp5_;
+			VideoRow* _tmp6_;
+			time_t _tmp7_;
+			VideoRow* _tmp8_;
+			const gchar* _tmp9_;
+			BackingFileState* _tmp10_;
+			BackingFileState* _tmp11_;
+#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = _tmp2_->filepath;
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = _tmp4_->filesize;
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_->timestamp;
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = self->priv->backing_row;
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = _tmp8_->md5;
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = backing_file_state_new (_tmp3_, _tmp5_, _tmp7_, _tmp9_);
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_backing_file_state_unref0 (backing[0]);
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			backing[0] = _tmp10_;
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = backing[0];
-#line 5789 "VideoSupport.c"
+#line 5658 "VideoSupport.c"
 		}
-		__finally506:
+		__finally507:
 		{
-			VideoRow* _tmp12_ = NULL;
-#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp12_;
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = self->priv->backing_row;
-#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5798 "VideoSupport.c"
+#line 5667 "VideoSupport.c"
 		}
-#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			backing = (_vala_array_free (backing, backing_length1, (GDestroyNotify) backing_file_state_unref), NULL);
-#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 5810 "VideoSupport.c"
+#line 5679 "VideoSupport.c"
 		}
 	}
-#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = backing;
-#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13__length1 = backing_length1;
-#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (result_length1) {
-#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*result_length1 = _tmp13__length1;
-#line 5821 "VideoSupport.c"
+#line 5690 "VideoSupport.c"
 	}
-#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp13_;
-#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5827 "VideoSupport.c"
+#line 5696 "VideoSupport.c"
 }
 
 
@@ -5835,37 +5704,37 @@ static GdkPixbuf* video_real_get_thumbnail (ThumbnailSource* base, gint scale, G
 	Video * self;
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
+	gint _tmp1_;
+	GdkPixbuf* _tmp2_;
+	GdkPixbuf* _tmp3_;
 	GError * _inner_error_ = NULL;
-#line 600 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = scale;
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = thumbnail_cache_fetch (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_);
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = _tmp2_;
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5853 "VideoSupport.c"
+#line 5722 "VideoSupport.c"
 	}
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp0_;
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = NULL;
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp0_);
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5865 "VideoSupport.c"
+#line 5734 "VideoSupport.c"
 }
 
 
@@ -5873,57 +5742,57 @@ static gchar* video_real_get_master_md5 (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 5875 "VideoSupport.c"
+#line 5744 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp0_;
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5882 "VideoSupport.c"
+#line 5751 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			const gchar* _tmp2_ = NULL;
-			gchar* _tmp3_ = NULL;
-#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			const gchar* _tmp2_;
+			gchar* _tmp3_;
+#line 607 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 607 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->md5;
-#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 607 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 607 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 5895 "VideoSupport.c"
+#line 5764 "VideoSupport.c"
 			{
-				VideoRow* _tmp4_ = NULL;
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp4_;
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5902 "VideoSupport.c"
+#line 5771 "VideoSupport.c"
 			}
-#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 607 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5906 "VideoSupport.c"
+#line 5775 "VideoSupport.c"
 		}
-		__finally507:
+		__finally508:
 		{
-			VideoRow* _tmp5_ = NULL;
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp5_;
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5915 "VideoSupport.c"
+#line 5784 "VideoSupport.c"
 		}
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5923 "VideoSupport.c"
+#line 5792 "VideoSupport.c"
 	}
 }
 
@@ -5932,34 +5801,34 @@ static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base, Scaling* sca
 	Video * self;
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* pixbuf = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 610 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 610 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (scaling != NULL, NULL);
 #line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (scaling != NULL, NULL);
+#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_BIG, &_inner_error_);
-#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	pixbuf = _tmp0_;
-#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5949 "VideoSupport.c"
+#line 5818 "VideoSupport.c"
 	}
-#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 614 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_NEAREST, TRUE);
-#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 614 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 614 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (pixbuf);
-#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 614 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5959 "VideoSupport.c"
+#line 5828 "VideoSupport.c"
 }
 
 
@@ -5967,94 +5836,94 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale
 	Video * self;
 	GdkPixbuf* result = NULL;
 	VideoReader* reader = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	VideoReader* _tmp2_ = NULL;
-	VideoReader* _tmp3_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	VideoReader* _tmp2_;
+	VideoReader* _tmp3_;
 	GdkPixbuf* frame = NULL;
-	VideoReader* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
+	VideoReader* _tmp4_;
+	GdkPixbuf* _tmp5_;
 	GdkPixbuf* _tmp6_ = NULL;
-	GdkPixbuf* _tmp7_ = NULL;
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+	GdkPixbuf* _tmp7_;
 #line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_reader_new (_tmp1_);
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp1_);
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	reader = _tmp3_;
 #line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	reader = _tmp3_;
+#line 619 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = reader;
-#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 619 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = video_reader_read_preview_frame (_tmp4_);
-#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 619 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	frame = _tmp5_;
-#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = frame;
-#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 6000 "VideoSupport.c"
-		GdkPixbuf* _tmp8_ = NULL;
-		GdkPixbuf* _tmp9_ = NULL;
-#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 5869 "VideoSupport.c"
+		GdkPixbuf* _tmp8_;
+		GdkPixbuf* _tmp9_;
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = frame;
-#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp6_);
-#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp9_;
-#line 6011 "VideoSupport.c"
+#line 5880 "VideoSupport.c"
 	} else {
-		GdkPixbuf* _tmp10_ = NULL;
-		GdkPixbuf* _tmp11_ = NULL;
-		GdkPixbuf* _tmp12_ = NULL;
-#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		GdkPixbuf* _tmp10_;
+		GdkPixbuf* _tmp11_;
+		GdkPixbuf* _tmp12_;
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = resources_get_noninterpretable_badge_pixbuf ();
-#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = _tmp10_;
-#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = gdk_pixbuf_copy (_tmp11_);
-#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp6_);
-#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp12_;
-#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp11_);
-#line 6028 "VideoSupport.c"
+#line 5897 "VideoSupport.c"
 	}
-#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp6_;
-#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (frame);
-#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (reader);
-#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6038 "VideoSupport.c"
+#line 5907 "VideoSupport.c"
 }
 
 
 static gchar* video_real_get_typename (DataSource* base) {
 	Video * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-#line 623 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+	gchar* _tmp0_;
 #line 624 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 625 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_strdup (VIDEO_TYPENAME);
-#line 624 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 625 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 624 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 625 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6054 "VideoSupport.c"
+#line 5923 "VideoSupport.c"
 }
 
 
@@ -6062,72 +5931,72 @@ static gint64 video_real_get_instance_id (DataSource* base) {
 	Video * self;
 	gint64 result = 0LL;
 	VideoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+	gint64 _tmp1_;
 #line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 629 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (self, &_tmp0_);
-#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 629 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_.id;
-#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 629 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 629 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6073 "VideoSupport.c"
+#line 5942 "VideoSupport.c"
 }
 
 
 static void video_real_get_import_id (MediaSource* base, ImportID* result) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6082 "VideoSupport.c"
+#line 5951 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp0_;
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6089 "VideoSupport.c"
+#line 5958 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			ImportID _tmp2_ = {0};
-#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			ImportID _tmp2_;
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->import_id;
-#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 6099 "VideoSupport.c"
+#line 5968 "VideoSupport.c"
 			{
-				VideoRow* _tmp3_ = NULL;
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp3_;
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6106 "VideoSupport.c"
+#line 5975 "VideoSupport.c"
 			}
-#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6110 "VideoSupport.c"
+#line 5979 "VideoSupport.c"
 		}
-		__finally508:
+		__finally509:
 		{
-			VideoRow* _tmp4_ = NULL;
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp4_;
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6119 "VideoSupport.c"
+#line 5988 "VideoSupport.c"
 		}
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 6127 "VideoSupport.c"
+#line 5996 "VideoSupport.c"
 	}
 }
 
@@ -6135,16 +6004,16 @@ static void video_real_get_import_id (MediaSource* base, ImportID* result) {
 static PhotoFileFormat video_real_get_preferred_thumbnail_format (ThumbnailSource* base) {
 	Video * self;
 	PhotoFileFormat result = 0;
-	PhotoFileFormat _tmp0_ = 0;
-#line 637 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+	PhotoFileFormat _tmp0_;
 #line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = photo_file_format_get_system_default_format ();
-#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6144 "VideoSupport.c"
+#line 6013 "VideoSupport.c"
 }
 
 
@@ -6152,57 +6021,57 @@ static gchar* video_real_get_title (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6154 "VideoSupport.c"
+#line 6023 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp0_;
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6161 "VideoSupport.c"
+#line 6030 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			const gchar* _tmp2_ = NULL;
-			gchar* _tmp3_ = NULL;
-#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			const gchar* _tmp2_;
+			gchar* _tmp3_;
+#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->title;
-#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 6174 "VideoSupport.c"
+#line 6043 "VideoSupport.c"
 			{
-				VideoRow* _tmp4_ = NULL;
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp4_;
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6181 "VideoSupport.c"
+#line 6050 "VideoSupport.c"
 			}
-#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6185 "VideoSupport.c"
+#line 6054 "VideoSupport.c"
 		}
-		__finally509:
+		__finally510:
 		{
-			VideoRow* _tmp5_ = NULL;
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp5_;
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6194 "VideoSupport.c"
+#line 6063 "VideoSupport.c"
 		}
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 6202 "VideoSupport.c"
+#line 6071 "VideoSupport.c"
 	}
 }
 
@@ -6210,200 +6079,200 @@ static gchar* video_real_get_title (MediaSource* base) {
 static void video_real_set_title (MediaSource* base, const gchar* title) {
 	Video * self;
 	gchar* new_title = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	Alteration* _tmp20_ = NULL;
-	Alteration* _tmp21_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	Alteration* _tmp20_;
+	Alteration* _tmp21_;
 	GError * _inner_error_ = NULL;
-#line 647 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = title;
-#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_prep_title (_tmp0_);
-#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_title = _tmp1_;
-#line 6223 "VideoSupport.c"
+#line 6092 "VideoSupport.c"
 	{
-		VideoRow* _tmp2_ = NULL;
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp2_;
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->priv->backing_row;
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6230 "VideoSupport.c"
+#line 6099 "VideoSupport.c"
 		{
-			VideoRow* _tmp3_ = NULL;
-			const gchar* _tmp4_ = NULL;
-			const gchar* _tmp5_ = NULL;
-			VideoRow* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp3_;
+			const gchar* _tmp4_;
+			const gchar* _tmp5_;
+			VideoRow* _tmp16_;
+			const gchar* _tmp17_;
+			gchar* _tmp18_;
+#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->title;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = new_title;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 6246 "VideoSupport.c"
+#line 6115 "VideoSupport.c"
 				{
-					VideoRow* _tmp6_ = NULL;
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					VideoRow* _tmp6_;
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp6_ = self->priv->backing_row;
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6253 "VideoSupport.c"
+#line 6122 "VideoSupport.c"
 				}
-#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6259 "VideoSupport.c"
+#line 6128 "VideoSupport.c"
 			}
 			{
-				VideoTable* _tmp7_ = NULL;
-				VideoTable* _tmp8_ = NULL;
-				VideoRow* _tmp9_ = NULL;
-				VideoID _tmp10_ = {0};
-				const gchar* _tmp11_ = NULL;
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoTable* _tmp7_;
+				VideoTable* _tmp8_;
+				VideoRow* _tmp9_;
+				VideoID _tmp10_;
+				const gchar* _tmp11_;
+#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = video_table_get_instance ();
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_;
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = _tmp9_->video_id;
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = new_title;
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_title (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp8_);
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6285 "VideoSupport.c"
-						goto __catch511_database_error;
+#line 6154 "VideoSupport.c"
+						goto __catch512_database_error;
 					}
 					{
-						VideoRow* _tmp12_ = NULL;
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+						VideoRow* _tmp12_;
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6294 "VideoSupport.c"
+#line 6163 "VideoSupport.c"
 					}
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_title);
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 6304 "VideoSupport.c"
+#line 6173 "VideoSupport.c"
 				}
 			}
-			goto __finally511;
-			__catch511_database_error:
+			goto __finally512;
+			__catch512_database_error:
 			{
 				GError* e = NULL;
-				GError* _tmp13_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				GError* _tmp13_;
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 657 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = e;
-#line 657 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				app_window_database_error (_tmp13_);
 #line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				app_window_database_error (_tmp13_);
+#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6322 "VideoSupport.c"
+#line 6191 "VideoSupport.c"
 				{
-					VideoRow* _tmp14_ = NULL;
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					VideoRow* _tmp14_;
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6329 "VideoSupport.c"
+#line 6198 "VideoSupport.c"
 				}
-#line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6335 "VideoSupport.c"
+#line 6204 "VideoSupport.c"
 			}
-			__finally511:
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally512:
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6340 "VideoSupport.c"
+#line 6209 "VideoSupport.c"
 				{
-					VideoRow* _tmp15_ = NULL;
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					VideoRow* _tmp15_;
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6347 "VideoSupport.c"
+#line 6216 "VideoSupport.c"
 				}
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6357 "VideoSupport.c"
+#line 6226 "VideoSupport.c"
 			}
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = new_title;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = g_strdup (_tmp17_);
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp16_->title);
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->title = _tmp18_;
-#line 6369 "VideoSupport.c"
+#line 6238 "VideoSupport.c"
 		}
-		__finally510:
+		__finally511:
 		{
-			VideoRow* _tmp19_ = NULL;
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp19_;
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = self->priv->backing_row;
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6378 "VideoSupport.c"
+#line 6247 "VideoSupport.c"
 		}
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (new_title);
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6390 "VideoSupport.c"
+#line 6259 "VideoSupport.c"
 		}
 	}
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = alteration_new ("metadata", "name");
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = _tmp20_;
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_);
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp21_);
-#line 647 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_title);
-#line 6403 "VideoSupport.c"
+#line 6272 "VideoSupport.c"
 }
 
 
@@ -6411,57 +6280,57 @@ static gchar* video_real_get_comment (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6413 "VideoSupport.c"
+#line 6282 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp0_;
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6420 "VideoSupport.c"
+#line 6289 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			const gchar* _tmp2_ = NULL;
-			gchar* _tmp3_ = NULL;
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			const gchar* _tmp2_;
+			gchar* _tmp3_;
+#line 671 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 671 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->comment;
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 671 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 671 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 6433 "VideoSupport.c"
+#line 6302 "VideoSupport.c"
 			{
-				VideoRow* _tmp4_ = NULL;
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp4_;
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6440 "VideoSupport.c"
+#line 6309 "VideoSupport.c"
 			}
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 671 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6444 "VideoSupport.c"
+#line 6313 "VideoSupport.c"
 		}
-		__finally512:
+		__finally513:
 		{
-			VideoRow* _tmp5_ = NULL;
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp5_;
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6453 "VideoSupport.c"
+#line 6322 "VideoSupport.c"
 		}
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 6461 "VideoSupport.c"
+#line 6330 "VideoSupport.c"
 	}
 }
 
@@ -6470,213 +6339,213 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 	Video * self;
 	gboolean result = FALSE;
 	gchar* new_comment = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	Alteration* _tmp23_ = NULL;
-	Alteration* _tmp24_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	Alteration* _tmp23_;
+	Alteration* _tmp24_;
 	GError * _inner_error_ = NULL;
-#line 674 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = comment;
-#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_prep_title (_tmp0_);
-#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_comment = _tmp1_;
-#line 6483 "VideoSupport.c"
+#line 6352 "VideoSupport.c"
 	{
-		VideoRow* _tmp2_ = NULL;
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp2_;
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->priv->backing_row;
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6490 "VideoSupport.c"
+#line 6359 "VideoSupport.c"
 		{
-			VideoRow* _tmp3_ = NULL;
-			const gchar* _tmp4_ = NULL;
-			const gchar* _tmp5_ = NULL;
-			VideoRow* _tmp18_ = NULL;
-			const gchar* _tmp19_ = NULL;
-			gchar* _tmp20_ = NULL;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp3_;
+			const gchar* _tmp4_;
+			const gchar* _tmp5_;
+			VideoRow* _tmp18_;
+			const gchar* _tmp19_;
+			gchar* _tmp20_;
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->comment;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = new_comment;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
 #line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
+#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = TRUE;
-#line 6508 "VideoSupport.c"
+#line 6377 "VideoSupport.c"
 				{
-					VideoRow* _tmp6_ = NULL;
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					VideoRow* _tmp6_;
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp6_ = self->priv->backing_row;
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6515 "VideoSupport.c"
+#line 6384 "VideoSupport.c"
 				}
-#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 6521 "VideoSupport.c"
+#line 6390 "VideoSupport.c"
 			}
 			{
-				VideoTable* _tmp7_ = NULL;
-				VideoTable* _tmp8_ = NULL;
-				VideoRow* _tmp9_ = NULL;
-				VideoID _tmp10_ = {0};
-				const gchar* _tmp11_ = NULL;
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoTable* _tmp7_;
+				VideoTable* _tmp8_;
+				VideoRow* _tmp9_;
+				VideoID _tmp10_;
+				const gchar* _tmp11_;
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = video_table_get_instance ();
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_;
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = _tmp9_->video_id;
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = new_comment;
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_comment (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp8_);
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6545 "VideoSupport.c"
+#line 6414 "VideoSupport.c"
 					gboolean _tmp13_ = FALSE;
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6549 "VideoSupport.c"
-						goto __catch514_database_error;
+#line 6418 "VideoSupport.c"
+						goto __catch515_database_error;
 					}
 					{
-						VideoRow* _tmp12_ = NULL;
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+						VideoRow* _tmp12_;
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6558 "VideoSupport.c"
+#line 6427 "VideoSupport.c"
 					}
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_comment);
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return _tmp13_;
-#line 6568 "VideoSupport.c"
+#line 6437 "VideoSupport.c"
 				}
 			}
-			goto __finally514;
-			__catch514_database_error:
+			goto __finally515;
+			__catch515_database_error:
 			{
 				GError* e = NULL;
-				GError* _tmp14_ = NULL;
-#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				GError* _tmp14_;
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = e;
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				app_window_database_error (_tmp14_);
 #line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				app_window_database_error (_tmp14_);
+#line 686 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = FALSE;
-#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 686 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6588 "VideoSupport.c"
+#line 6457 "VideoSupport.c"
 				{
-					VideoRow* _tmp15_ = NULL;
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					VideoRow* _tmp15_;
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6595 "VideoSupport.c"
+#line 6464 "VideoSupport.c"
 				}
-#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 686 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 686 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 6601 "VideoSupport.c"
+#line 6470 "VideoSupport.c"
 			}
-			__finally514:
-#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally515:
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6606 "VideoSupport.c"
+#line 6475 "VideoSupport.c"
 				gboolean _tmp17_ = FALSE;
 				{
-					VideoRow* _tmp16_ = NULL;
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					VideoRow* _tmp16_;
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp16_ = self->priv->backing_row;
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6614 "VideoSupport.c"
+#line 6483 "VideoSupport.c"
 				}
-#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return _tmp17_;
-#line 6624 "VideoSupport.c"
+#line 6493 "VideoSupport.c"
 			}
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = self->priv->backing_row;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = new_comment;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp20_ = g_strdup (_tmp19_);
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp18_->comment);
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_->comment = _tmp20_;
-#line 6636 "VideoSupport.c"
+#line 6505 "VideoSupport.c"
 		}
-		__finally513:
+		__finally514:
 		{
-			VideoRow* _tmp21_ = NULL;
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp21_;
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = self->priv->backing_row;
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6645 "VideoSupport.c"
+#line 6514 "VideoSupport.c"
 		}
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6649 "VideoSupport.c"
+#line 6518 "VideoSupport.c"
 			gboolean _tmp22_ = FALSE;
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (new_comment);
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return _tmp22_;
-#line 6659 "VideoSupport.c"
+#line 6528 "VideoSupport.c"
 		}
 	}
-#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp23_ = alteration_new ("metadata", "comment");
-#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = _tmp23_;
-#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp24_);
-#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp24_);
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = TRUE;
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_comment);
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6676 "VideoSupport.c"
+#line 6545 "VideoSupport.c"
 }
 
 
@@ -6684,291 +6553,291 @@ static Rating video_real_get_rating (MediaSource* base) {
 	Video * self;
 	Rating result = 0;
 	GError * _inner_error_ = NULL;
-#line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6686 "VideoSupport.c"
+#line 6555 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
-#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp0_;
+#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6693 "VideoSupport.c"
+#line 6562 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			Rating _tmp2_ = 0;
-#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			Rating _tmp2_;
+#line 701 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 701 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 701 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 6703 "VideoSupport.c"
+#line 6572 "VideoSupport.c"
 			{
-				VideoRow* _tmp3_ = NULL;
-#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp3_;
+#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6710 "VideoSupport.c"
+#line 6579 "VideoSupport.c"
 			}
-#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 701 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6714 "VideoSupport.c"
+#line 6583 "VideoSupport.c"
 		}
-		__finally515:
+		__finally516:
 		{
-			VideoRow* _tmp4_ = NULL;
-#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp4_;
+#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6723 "VideoSupport.c"
+#line 6592 "VideoSupport.c"
 		}
-#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 6731 "VideoSupport.c"
+#line 6600 "VideoSupport.c"
 	}
 }
 
 
 static void video_real_set_rating (MediaSource* base, Rating rating) {
 	Video * self;
-	Alteration* _tmp19_ = NULL;
-	Alteration* _tmp20_ = NULL;
+	Alteration* _tmp19_;
+	Alteration* _tmp20_;
 	GError * _inner_error_ = NULL;
-#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6743 "VideoSupport.c"
+#line 6612 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp0_;
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6750 "VideoSupport.c"
+#line 6619 "VideoSupport.c"
 		{
 			gboolean _tmp1_ = FALSE;
-			Rating _tmp2_ = 0;
-			gboolean _tmp3_ = FALSE;
-			VideoRow* _tmp16_ = NULL;
-			Rating _tmp17_ = 0;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			Rating _tmp2_;
+			gboolean _tmp3_;
+			VideoRow* _tmp16_;
+			Rating _tmp17_;
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = rating;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_is_valid (_tmp2_);
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp3_) {
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = TRUE;
-#line 6765 "VideoSupport.c"
+#line 6634 "VideoSupport.c"
 			} else {
-				Rating _tmp4_ = 0;
-				VideoRow* _tmp5_ = NULL;
-				Rating _tmp6_ = 0;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				Rating _tmp4_;
+				VideoRow* _tmp5_;
+				Rating _tmp6_;
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = rating;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = _tmp5_->rating;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = _tmp4_ == _tmp6_;
-#line 6778 "VideoSupport.c"
+#line 6647 "VideoSupport.c"
 			}
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp1_) {
-#line 6782 "VideoSupport.c"
+#line 6651 "VideoSupport.c"
 				{
-					VideoRow* _tmp7_ = NULL;
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					VideoRow* _tmp7_;
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp7_ = self->priv->backing_row;
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6789 "VideoSupport.c"
+#line 6658 "VideoSupport.c"
 				}
-#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6793 "VideoSupport.c"
+#line 6662 "VideoSupport.c"
 			}
 			{
-				VideoTable* _tmp8_ = NULL;
-				VideoTable* _tmp9_ = NULL;
+				VideoTable* _tmp8_;
+				VideoTable* _tmp9_;
 				VideoID _tmp10_ = {0};
-				Rating _tmp11_ = 0;
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				Rating _tmp11_;
+#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = video_table_get_instance ();
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_;
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp10_);
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = rating;
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_rating (_tmp9_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp9_);
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6816 "VideoSupport.c"
-						goto __catch517_database_error;
+#line 6685 "VideoSupport.c"
+						goto __catch518_database_error;
 					}
 					{
-						VideoRow* _tmp12_ = NULL;
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+						VideoRow* _tmp12_;
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6825 "VideoSupport.c"
+#line 6694 "VideoSupport.c"
 					}
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 6833 "VideoSupport.c"
+#line 6702 "VideoSupport.c"
 				}
 			}
-			goto __finally517;
-			__catch517_database_error:
+			goto __finally518;
+			__catch518_database_error:
 			{
 				GError* e = NULL;
-				GError* _tmp13_ = NULL;
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				GError* _tmp13_;
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 712 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 713 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = e;
-#line 712 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				app_window_database_error (_tmp13_);
 #line 713 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				app_window_database_error (_tmp13_);
+#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6851 "VideoSupport.c"
+#line 6720 "VideoSupport.c"
 				{
-					VideoRow* _tmp14_ = NULL;
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					VideoRow* _tmp14_;
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6858 "VideoSupport.c"
+#line 6727 "VideoSupport.c"
 				}
-#line 713 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6862 "VideoSupport.c"
+#line 6731 "VideoSupport.c"
 			}
-			__finally517:
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally518:
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6867 "VideoSupport.c"
+#line 6736 "VideoSupport.c"
 				{
-					VideoRow* _tmp15_ = NULL;
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					VideoRow* _tmp15_;
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6874 "VideoSupport.c"
+#line 6743 "VideoSupport.c"
 				}
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6882 "VideoSupport.c"
+#line 6751 "VideoSupport.c"
 			}
-#line 717 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
-#line 717 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = rating;
-#line 717 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->rating = _tmp17_;
-#line 6890 "VideoSupport.c"
+#line 6759 "VideoSupport.c"
 		}
-		__finally516:
+		__finally517:
 		{
-			VideoRow* _tmp18_ = NULL;
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp18_;
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = self->priv->backing_row;
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6899 "VideoSupport.c"
+#line 6768 "VideoSupport.c"
 		}
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6909 "VideoSupport.c"
+#line 6778 "VideoSupport.c"
 		}
 	}
-#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 721 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = alteration_new ("metadata", "rating");
-#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 721 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = _tmp19_;
-#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 721 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
-#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 721 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp20_);
-#line 6920 "VideoSupport.c"
+#line 6789 "VideoSupport.c"
 }
 
 
 static void video_real_increase_rating (MediaSource* base) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6929 "VideoSupport.c"
+#line 6798 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
-#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp0_;
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6936 "VideoSupport.c"
+#line 6805 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			Rating _tmp2_ = 0;
-			Rating _tmp3_ = 0;
-#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			Rating _tmp2_;
+			Rating _tmp3_;
+#line 726 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 726 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 726 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_increase (_tmp2_);
-#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 726 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 6949 "VideoSupport.c"
+#line 6818 "VideoSupport.c"
 		}
-		__finally518:
+		__finally519:
 		{
-			VideoRow* _tmp4_ = NULL;
-#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp4_;
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6958 "VideoSupport.c"
+#line 6827 "VideoSupport.c"
 		}
-#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6968 "VideoSupport.c"
+#line 6837 "VideoSupport.c"
 		}
 	}
 }
@@ -6977,48 +6846,48 @@ static void video_real_increase_rating (MediaSource* base) {
 static void video_real_decrease_rating (MediaSource* base) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6979 "VideoSupport.c"
+#line 6848 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
-#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp0_;
+#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6986 "VideoSupport.c"
+#line 6855 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			Rating _tmp2_ = 0;
-			Rating _tmp3_ = 0;
-#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			Rating _tmp2_;
+			Rating _tmp3_;
+#line 732 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 732 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 732 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_decrease (_tmp2_);
-#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 732 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 6999 "VideoSupport.c"
+#line 6868 "VideoSupport.c"
 		}
-		__finally519:
+		__finally520:
 		{
-			VideoRow* _tmp4_ = NULL;
-#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp4_;
+#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7008 "VideoSupport.c"
+#line 6877 "VideoSupport.c"
 		}
-#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7018 "VideoSupport.c"
+#line 6887 "VideoSupport.c"
 		}
 	}
 }
@@ -7027,210 +6896,210 @@ static void video_real_decrease_rating (MediaSource* base) {
 static gboolean video_real_is_trashed (MediaSource* base) {
 	Video * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+	gboolean _tmp0_;
 #line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 737 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_TRASH);
-#line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 737 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 737 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7036 "VideoSupport.c"
+#line 6905 "VideoSupport.c"
 }
 
 
 static gboolean video_real_is_offline (Monitorable* base) {
 	Video * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 739 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+	gboolean _tmp0_;
 #line 740 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 741 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_OFFLINE);
-#line 740 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 741 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 740 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 741 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7052 "VideoSupport.c"
+#line 6921 "VideoSupport.c"
 }
 
 
 static void video_real_mark_offline (Monitorable* base) {
 	Video * self;
-#line 743 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 744 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 745 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_OFFLINE, NULL);
-#line 7062 "VideoSupport.c"
+#line 6931 "VideoSupport.c"
 }
 
 
 static void video_real_mark_online (Monitorable* base) {
 	Video * self;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-#line 747 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+	gboolean _tmp1_;
 #line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_OFFLINE, NULL);
-#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_get_is_interpretable (self);
-#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp1_) {
-#line 7078 "VideoSupport.c"
-		gboolean _tmp2_ = FALSE;
-#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 6947 "VideoSupport.c"
+		gboolean _tmp2_;
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = video_has_interpreter_state_changed ();
-#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp2_;
-#line 7084 "VideoSupport.c"
+#line 6953 "VideoSupport.c"
 	} else {
-#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = FALSE;
-#line 7088 "VideoSupport.c"
+#line 6957 "VideoSupport.c"
 	}
-#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp0_) {
-#line 7092 "VideoSupport.c"
-		VideoInterpretableResults* _tmp3_ = NULL;
-		VideoInterpretableResults* _tmp4_ = NULL;
 #line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp0_) {
+#line 6961 "VideoSupport.c"
+		VideoInterpretableResults* _tmp3_;
+		VideoInterpretableResults* _tmp4_;
+#line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_check_is_interpretable (self);
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = _tmp3_;
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_foreground_finish (_tmp4_);
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_interpretable_results_unref0 (_tmp4_);
-#line 7103 "VideoSupport.c"
+#line 6972 "VideoSupport.c"
 	}
 }
 
 
 static void video_real_trash (MediaSource* base) {
 	Video * self;
-#line 754 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 756 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_TRASH, NULL);
-#line 7114 "VideoSupport.c"
+#line 6983 "VideoSupport.c"
 }
 
 
 static void video_real_untrash (MediaSource* base) {
 	Video * self;
-#line 758 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_TRASH, NULL);
-#line 7124 "VideoSupport.c"
+#line 6993 "VideoSupport.c"
 }
 
 
 static gboolean video_real_is_flagged (Flaggable* base) {
 	Video * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 762 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+	gboolean _tmp0_;
 #line 763 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 764 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_FLAGGED);
-#line 763 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 764 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 763 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 764 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7140 "VideoSupport.c"
+#line 7009 "VideoSupport.c"
 }
 
 
 static void video_real_mark_flagged (Flaggable* base) {
 	Video * self;
-	Alteration* _tmp0_ = NULL;
-	Alteration* _tmp1_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+	Alteration* _tmp0_;
+	Alteration* _tmp1_;
 #line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 768 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 768 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 768 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_);
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 768 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp1_);
-#line 7158 "VideoSupport.c"
+#line 7027 "VideoSupport.c"
 }
 
 
 static void video_real_mark_unflagged (Flaggable* base) {
 	Video * self;
-	Alteration* _tmp0_ = NULL;
-	Alteration* _tmp1_ = NULL;
-#line 770 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+	Alteration* _tmp0_;
+	Alteration* _tmp1_;
 #line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_);
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp1_);
-#line 7176 "VideoSupport.c"
+#line 7045 "VideoSupport.c"
 }
 
 
 static void video_real_get_event_id (MediaSource* base, EventID* result) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 774 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7185 "VideoSupport.c"
+#line 7054 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp0_;
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7192 "VideoSupport.c"
+#line 7061 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			EventID _tmp2_ = {0};
-#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			EventID _tmp2_;
+#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->event_id;
-#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 7202 "VideoSupport.c"
+#line 7071 "VideoSupport.c"
 			{
-				VideoRow* _tmp3_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp3_;
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7209 "VideoSupport.c"
+#line 7078 "VideoSupport.c"
 			}
-#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7213 "VideoSupport.c"
+#line 7082 "VideoSupport.c"
 		}
-		__finally520:
+		__finally521:
 		{
-			VideoRow* _tmp4_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp4_;
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7222 "VideoSupport.c"
+#line 7091 "VideoSupport.c"
 		}
-#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7230 "VideoSupport.c"
+#line 7099 "VideoSupport.c"
 	}
 }
 
@@ -7239,131 +7108,131 @@ static gchar* video_real_to_string (DataObject* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7241 "VideoSupport.c"
+#line 7110 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
-#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp0_;
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7248 "VideoSupport.c"
+#line 7117 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			VideoID _tmp2_ = {0};
-			gint64 _tmp3_ = 0LL;
-			gchar* _tmp4_ = NULL;
-			gchar* _tmp5_ = NULL;
-			VideoRow* _tmp6_ = NULL;
-			const gchar* _tmp7_ = NULL;
-			gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			VideoID _tmp2_;
+			gint64 _tmp3_;
+			gchar* _tmp4_;
+			gchar* _tmp5_;
+			VideoRow* _tmp6_;
+			const gchar* _tmp7_;
+			gchar* _tmp8_;
+			gchar* _tmp9_;
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->video_id;
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = _tmp2_.id;
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp3_);
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = _tmp4_;
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_->filepath;
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = g_strdup_printf ("[%s] %s", _tmp5_, _tmp7_);
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = _tmp8_;
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp5_);
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp9_;
-#line 7281 "VideoSupport.c"
+#line 7150 "VideoSupport.c"
 			{
-				VideoRow* _tmp10_ = NULL;
-#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp10_;
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = self->priv->backing_row;
-#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7288 "VideoSupport.c"
+#line 7157 "VideoSupport.c"
 			}
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7292 "VideoSupport.c"
+#line 7161 "VideoSupport.c"
 		}
-		__finally521:
+		__finally522:
 		{
-			VideoRow* _tmp11_ = NULL;
-#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp11_;
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = self->priv->backing_row;
-#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7301 "VideoSupport.c"
+#line 7170 "VideoSupport.c"
 		}
-#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 7309 "VideoSupport.c"
+#line 7178 "VideoSupport.c"
 	}
 }
 
 
 void video_get_video_id (Video* self, VideoID* result) {
 	GError * _inner_error_ = NULL;
-#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7318 "VideoSupport.c"
+#line 7187 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
-#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp0_;
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7325 "VideoSupport.c"
+#line 7194 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			VideoID _tmp2_ = {0};
-#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			VideoID _tmp2_;
+#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->video_id;
-#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 7335 "VideoSupport.c"
+#line 7204 "VideoSupport.c"
 			{
-				VideoRow* _tmp3_ = NULL;
-#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp3_;
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7342 "VideoSupport.c"
+#line 7211 "VideoSupport.c"
 			}
-#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7346 "VideoSupport.c"
+#line 7215 "VideoSupport.c"
 		}
-		__finally522:
+		__finally523:
 		{
-			VideoRow* _tmp4_ = NULL;
-#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp4_;
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7355 "VideoSupport.c"
+#line 7224 "VideoSupport.c"
 		}
-#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7363 "VideoSupport.c"
+#line 7232 "VideoSupport.c"
 	}
 }
 
@@ -7372,242 +7241,242 @@ static time_t video_real_get_exposure_time (Dateable* base) {
 	Video * self;
 	time_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7374 "VideoSupport.c"
+#line 7243 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
+		VideoRow* _tmp0_;
 		time_t _tmp5_ = 0;
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7382 "VideoSupport.c"
+#line 7251 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			time_t _tmp2_ = 0;
-#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			time_t _tmp2_;
+#line 795 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 795 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->exposure_time;
-#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 795 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7392 "VideoSupport.c"
+#line 7261 "VideoSupport.c"
 			{
-				VideoRow* _tmp3_ = NULL;
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp3_;
+#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7399 "VideoSupport.c"
+#line 7268 "VideoSupport.c"
 			}
-#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 795 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7403 "VideoSupport.c"
+#line 7272 "VideoSupport.c"
 		}
-		__finally523:
+		__finally524:
 		{
-			VideoRow* _tmp4_ = NULL;
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp4_;
+#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7412 "VideoSupport.c"
+#line 7281 "VideoSupport.c"
 		}
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp5_;
-#line 7420 "VideoSupport.c"
+#line 7289 "VideoSupport.c"
 	}
 }
 
 
 static void video_real_set_exposure_time (Dateable* base, time_t time) {
 	Video * self;
-	Alteration* _tmp12_ = NULL;
-	Alteration* _tmp13_ = NULL;
+	Alteration* _tmp12_;
+	Alteration* _tmp13_;
 	GError * _inner_error_ = NULL;
-#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7432 "VideoSupport.c"
+#line 7301 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp0_;
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7439 "VideoSupport.c"
+#line 7308 "VideoSupport.c"
 		{
-			VideoRow* _tmp9_ = NULL;
-			time_t _tmp10_ = 0;
+			VideoRow* _tmp9_;
+			time_t _tmp10_;
 			{
-				VideoTable* _tmp1_ = NULL;
-				VideoTable* _tmp2_ = NULL;
-				VideoRow* _tmp3_ = NULL;
-				VideoID _tmp4_ = {0};
-				time_t _tmp5_ = 0;
-#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoTable* _tmp1_;
+				VideoTable* _tmp2_;
+				VideoRow* _tmp3_;
+				VideoID _tmp4_;
+				time_t _tmp5_;
+#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = video_table_get_instance ();
-#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp2_ = _tmp1_;
-#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->video_id;
-#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = time;
-#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_exposure_time (_tmp2_, &_tmp4_, _tmp5_, &_inner_error_);
-#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp2_);
-#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7465 "VideoSupport.c"
-					goto __catch525_g_error;
+#line 7334 "VideoSupport.c"
+					goto __catch526_g_error;
 				}
 			}
-			goto __finally525;
-			__catch525_g_error:
+			goto __finally526;
+			__catch526_g_error:
 			{
 				GError* e = NULL;
-				GError* _tmp6_ = NULL;
-				const gchar* _tmp7_ = NULL;
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				GError* _tmp6_;
+				const gchar* _tmp7_;
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 804 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = e;
-#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 804 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = _tmp6_->message;
-#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				g_debug ("VideoSupport.vala:803: Warning - %s", _tmp7_);
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 804 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				g_debug ("VideoSupport.vala:804: Warning - %s", _tmp7_);
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 7487 "VideoSupport.c"
+#line 7356 "VideoSupport.c"
 			}
-			__finally525:
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally526:
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7492 "VideoSupport.c"
+#line 7361 "VideoSupport.c"
 				{
-					VideoRow* _tmp8_ = NULL;
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					VideoRow* _tmp8_;
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp8_ = self->priv->backing_row;
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7499 "VideoSupport.c"
+#line 7368 "VideoSupport.c"
 				}
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 7507 "VideoSupport.c"
+#line 7376 "VideoSupport.c"
 			}
-#line 805 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = self->priv->backing_row;
-#line 805 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = time;
-#line 805 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_->exposure_time = _tmp10_;
-#line 7515 "VideoSupport.c"
+#line 7384 "VideoSupport.c"
 		}
-		__finally524:
+		__finally525:
 		{
-			VideoRow* _tmp11_ = NULL;
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp11_;
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = self->priv->backing_row;
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7524 "VideoSupport.c"
+#line 7393 "VideoSupport.c"
 		}
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7534 "VideoSupport.c"
+#line 7403 "VideoSupport.c"
 		}
 	}
-#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp12_ = alteration_new ("metadata", "exposure-time");
-#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = _tmp12_;
-#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_);
-#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp13_);
-#line 7545 "VideoSupport.c"
+#line 7414 "VideoSupport.c"
 }
 
 
 void video_get_frame_dimensions (Video* self, Dimensions* result) {
 	GError * _inner_error_ = NULL;
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7553 "VideoSupport.c"
+#line 7422 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp0_;
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7560 "VideoSupport.c"
+#line 7429 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			gint _tmp2_ = 0;
-			VideoRow* _tmp3_ = NULL;
-			gint _tmp4_ = 0;
+			VideoRow* _tmp1_;
+			gint _tmp2_;
+			VideoRow* _tmp3_;
+			gint _tmp4_;
 			Dimensions _tmp5_ = {0};
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 814 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 814 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->width;
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 814 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 814 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->height;
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 814 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			dimensions_init (&_tmp5_, _tmp2_, _tmp4_);
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 814 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp5_;
-#line 7579 "VideoSupport.c"
+#line 7448 "VideoSupport.c"
 			{
-				VideoRow* _tmp6_ = NULL;
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp6_;
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = self->priv->backing_row;
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7586 "VideoSupport.c"
+#line 7455 "VideoSupport.c"
 			}
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 814 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7590 "VideoSupport.c"
+#line 7459 "VideoSupport.c"
 		}
-		__finally526:
+		__finally527:
 		{
-			VideoRow* _tmp7_ = NULL;
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp7_;
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = self->priv->backing_row;
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7599 "VideoSupport.c"
+#line 7468 "VideoSupport.c"
 		}
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7607 "VideoSupport.c"
+#line 7476 "VideoSupport.c"
 	}
 }
 
@@ -7615,31 +7484,31 @@ void video_get_frame_dimensions (Video* self, Dimensions* result) {
 static void video_real_get_dimensions (MediaSource* base, PhotoException disallowed_steps, Dimensions* result) {
 	Video * self;
 	Dimensions _tmp0_ = {0};
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 819 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_frame_dimensions (self, &_tmp0_);
-#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 819 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	*result = _tmp0_;
-#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 819 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return;
-#line 7623 "VideoSupport.c"
+#line 7492 "VideoSupport.c"
 }
 
 
 static guint64 video_real_get_filesize (MediaSource* base) {
 	Video * self;
 	guint64 result = 0ULL;
-	guint64 _tmp0_ = 0ULL;
-#line 821 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+	guint64 _tmp0_;
 #line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 823 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 823 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 823 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7639 "VideoSupport.c"
+#line 7508 "VideoSupport.c"
 }
 
 
@@ -7647,55 +7516,55 @@ static guint64 video_real_get_master_filesize (MediaSource* base) {
 	Video * self;
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7649 "VideoSupport.c"
+#line 7518 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
+		VideoRow* _tmp0_;
 		guint64 _tmp5_ = 0ULL;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7657 "VideoSupport.c"
+#line 7526 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			gint64 _tmp2_ = 0LL;
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			gint64 _tmp2_;
+#line 828 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 828 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->filesize;
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 828 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = (guint64) _tmp2_;
-#line 7667 "VideoSupport.c"
+#line 7536 "VideoSupport.c"
 			{
-				VideoRow* _tmp3_ = NULL;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp3_;
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7674 "VideoSupport.c"
+#line 7543 "VideoSupport.c"
 			}
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 828 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7678 "VideoSupport.c"
+#line 7547 "VideoSupport.c"
 		}
-		__finally527:
+		__finally528:
 		{
-			VideoRow* _tmp4_ = NULL;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp4_;
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7687 "VideoSupport.c"
+#line 7556 "VideoSupport.c"
 		}
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp5_;
-#line 7695 "VideoSupport.c"
+#line 7564 "VideoSupport.c"
 	}
 }
 
@@ -7704,55 +7573,55 @@ static time_t video_real_get_timestamp (MediaSource* base) {
 	Video * self;
 	time_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7706 "VideoSupport.c"
+#line 7575 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
+		VideoRow* _tmp0_;
 		time_t _tmp5_ = 0;
-#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7714 "VideoSupport.c"
+#line 7583 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			time_t _tmp2_ = 0;
-#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			time_t _tmp2_;
+#line 834 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 834 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->timestamp;
-#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 834 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7724 "VideoSupport.c"
+#line 7593 "VideoSupport.c"
 			{
-				VideoRow* _tmp3_ = NULL;
-#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp3_;
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7731 "VideoSupport.c"
+#line 7600 "VideoSupport.c"
 			}
-#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 834 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7735 "VideoSupport.c"
+#line 7604 "VideoSupport.c"
 		}
-		__finally528:
+		__finally529:
 		{
-			VideoRow* _tmp4_ = NULL;
-#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp4_;
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7744 "VideoSupport.c"
+#line 7613 "VideoSupport.c"
 		}
-#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp5_;
-#line 7752 "VideoSupport.c"
+#line 7621 "VideoSupport.c"
 	}
 }
 
@@ -7760,220 +7629,220 @@ static time_t video_real_get_timestamp (MediaSource* base) {
 static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info) {
 	Video * self;
 	GTimeVal time_val = {0};
-	GFileInfo* _tmp0_ = NULL;
+	GFileInfo* _tmp0_;
 	GTimeVal _tmp1_ = {0};
-	Alteration* _tmp19_ = NULL;
-	Alteration* _tmp20_ = NULL;
+	Alteration* _tmp19_;
+	Alteration* _tmp20_;
 	GError * _inner_error_ = NULL;
-#line 837 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 837 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_if_fail (G_IS_FILE_INFO (info));
 #line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_if_fail (G_IS_FILE_INFO (info));
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = info;
-#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_info_get_modification_time (_tmp0_, &_tmp1_);
-#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	time_val = _tmp1_;
-#line 7775 "VideoSupport.c"
+#line 7644 "VideoSupport.c"
 	{
 		{
-			VideoRow* _tmp2_ = NULL;
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp2_;
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7783 "VideoSupport.c"
+#line 7652 "VideoSupport.c"
 			{
-				VideoRow* _tmp3_ = NULL;
-				time_t _tmp4_ = 0;
-				GTimeVal _tmp5_ = {0};
-				glong _tmp6_ = 0L;
-				VideoTable* _tmp8_ = NULL;
-				VideoTable* _tmp9_ = NULL;
-				VideoRow* _tmp10_ = NULL;
-				VideoID _tmp11_ = {0};
-				GTimeVal _tmp12_ = {0};
-				glong _tmp13_ = 0L;
-				VideoRow* _tmp14_ = NULL;
-				GTimeVal _tmp15_ = {0};
-				glong _tmp16_ = 0L;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp3_;
+				time_t _tmp4_;
+				GTimeVal _tmp5_;
+				glong _tmp6_;
+				VideoTable* _tmp8_;
+				VideoTable* _tmp9_;
+				VideoRow* _tmp10_;
+				VideoID _tmp11_;
+				GTimeVal _tmp12_;
+				glong _tmp13_;
+				VideoRow* _tmp14_;
+				GTimeVal _tmp15_;
+				glong _tmp16_;
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->timestamp;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = time_val;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = _tmp5_.tv_sec;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp4_ == ((time_t) _tmp6_)) {
-#line 7808 "VideoSupport.c"
+#line 7677 "VideoSupport.c"
 					{
-						VideoRow* _tmp7_ = NULL;
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+						VideoRow* _tmp7_;
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp7_ = self->priv->backing_row;
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7815 "VideoSupport.c"
+#line 7684 "VideoSupport.c"
 					}
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 7819 "VideoSupport.c"
+#line 7688 "VideoSupport.c"
 				}
-#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = video_table_get_instance ();
-#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_;
-#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = self->priv->backing_row;
-#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = _tmp10_->video_id;
-#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = time_val;
-#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = _tmp12_.tv_sec;
-#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_timestamp (_tmp9_, &_tmp11_, (time_t) _tmp13_, &_inner_error_);
-#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp9_);
-#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7839 "VideoSupport.c"
-					goto __finally530;
+#line 7708 "VideoSupport.c"
+					goto __finally531;
 				}
-#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 847 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = self->priv->backing_row;
-#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 847 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = time_val;
-#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 847 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = _tmp15_.tv_sec;
-#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 847 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_->timestamp = (time_t) _tmp16_;
-#line 7850 "VideoSupport.c"
+#line 7719 "VideoSupport.c"
 			}
-			__finally530:
+			__finally531:
 			{
-				VideoRow* _tmp17_ = NULL;
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp17_;
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = self->priv->backing_row;
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7859 "VideoSupport.c"
+#line 7728 "VideoSupport.c"
 			}
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 7865 "VideoSupport.c"
-					goto __catch529_database_error;
+#line 7734 "VideoSupport.c"
+					goto __catch530_database_error;
 				}
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 7874 "VideoSupport.c"
+#line 7743 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally529;
-	__catch529_database_error:
+	goto __finally530;
+	__catch530_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp18_ = NULL;
-#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		GError* _tmp18_;
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 850 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp18_ = err;
-#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 850 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp18_);
-#line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7895 "VideoSupport.c"
+#line 7764 "VideoSupport.c"
 	}
-	__finally529:
-#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally530:
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7906 "VideoSupport.c"
+#line 7775 "VideoSupport.c"
 	}
-#line 854 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = alteration_new ("metadata", "master-timestamp");
-#line 854 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = _tmp19_;
-#line 854 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
-#line 854 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp20_);
-#line 7916 "VideoSupport.c"
+#line 7785 "VideoSupport.c"
 }
 
 
 gchar* video_get_filename (Video* self) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 7925 "VideoSupport.c"
+#line 7794 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp0_;
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7932 "VideoSupport.c"
+#line 7801 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			const gchar* _tmp2_ = NULL;
-			gchar* _tmp3_ = NULL;
-#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			const gchar* _tmp2_;
+			gchar* _tmp3_;
+#line 860 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 860 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->filepath;
-#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 860 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 860 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 7945 "VideoSupport.c"
+#line 7814 "VideoSupport.c"
 			{
-				VideoRow* _tmp4_ = NULL;
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp4_;
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7952 "VideoSupport.c"
+#line 7821 "VideoSupport.c"
 			}
-#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 860 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7956 "VideoSupport.c"
+#line 7825 "VideoSupport.c"
 		}
-		__finally531:
+		__finally532:
 		{
-			VideoRow* _tmp5_ = NULL;
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp5_;
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7965 "VideoSupport.c"
+#line 7834 "VideoSupport.c"
 		}
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 7973 "VideoSupport.c"
+#line 7842 "VideoSupport.c"
 	}
 }
 
@@ -7981,142 +7850,142 @@ gchar* video_get_filename (Video* self) {
 static GFile* video_real_get_file (MediaSource* base) {
 	Video * self;
 	GFile* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
 #line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_get_filename (self);
-#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp1_);
-#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8001 "VideoSupport.c"
+#line 7870 "VideoSupport.c"
 }
 
 
 static GFile* video_real_get_master_file (MediaSource* base) {
 	Video * self;
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-#line 867 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+	GFile* _tmp0_;
 #line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8017 "VideoSupport.c"
+#line 7886 "VideoSupport.c"
 }
 
 
 void video_export (Video* self, GFile* dest_file, GError** error) {
 	GFile* source_file = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
 	GError * _inner_error_ = NULL;
-#line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_if_fail (G_IS_FILE (dest_file));
 #line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_if_fail (G_IS_FILE (dest_file));
+#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_get_filename (self);
-#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp1_);
-#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	source_file = _tmp3_;
 #line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	source_file = _tmp3_;
+#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = dest_file;
-#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_copy (source_file, _tmp4_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_);
-#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (source_file);
-#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8057 "VideoSupport.c"
+#line 7926 "VideoSupport.c"
 	}
-#line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (source_file);
-#line 8061 "VideoSupport.c"
+#line 7930 "VideoSupport.c"
 }
 
 
 gdouble video_get_clip_duration (Video* self) {
 	gdouble result = 0.0;
 	GError * _inner_error_ = NULL;
-#line 877 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0.0);
-#line 8070 "VideoSupport.c"
+#line 7939 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
+		VideoRow* _tmp0_;
 		gdouble _tmp5_ = 0.0;
-#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8078 "VideoSupport.c"
+#line 7947 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			gdouble _tmp2_ = 0.0;
-#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			gdouble _tmp2_;
+#line 880 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 880 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->clip_duration;
-#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 880 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 8088 "VideoSupport.c"
+#line 7957 "VideoSupport.c"
 			{
-				VideoRow* _tmp3_ = NULL;
-#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp3_;
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8095 "VideoSupport.c"
+#line 7964 "VideoSupport.c"
 			}
-#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 880 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 8099 "VideoSupport.c"
+#line 7968 "VideoSupport.c"
 		}
-		__finally532:
+		__finally533:
 		{
-			VideoRow* _tmp4_ = NULL;
-#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp4_;
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8108 "VideoSupport.c"
+#line 7977 "VideoSupport.c"
 		}
-#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp5_;
-#line 8116 "VideoSupport.c"
+#line 7985 "VideoSupport.c"
 	}
 }
 
@@ -8124,186 +7993,186 @@ gdouble video_get_clip_duration (Video* self) {
 gboolean video_get_is_interpretable (Video* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), FALSE);
-#line 8126 "VideoSupport.c"
+#line 7995 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
+		VideoRow* _tmp0_;
 		gboolean _tmp5_ = FALSE;
-#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8134 "VideoSupport.c"
+#line 8003 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			gboolean _tmp2_ = FALSE;
-#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			gboolean _tmp2_;
+#line 886 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 886 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->is_interpretable;
-#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 886 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 8144 "VideoSupport.c"
+#line 8013 "VideoSupport.c"
 			{
-				VideoRow* _tmp3_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp3_;
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8151 "VideoSupport.c"
+#line 8020 "VideoSupport.c"
 			}
-#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 886 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 8155 "VideoSupport.c"
+#line 8024 "VideoSupport.c"
 		}
-		__finally533:
+		__finally534:
 		{
-			VideoRow* _tmp4_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp4_;
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8164 "VideoSupport.c"
+#line 8033 "VideoSupport.c"
 		}
-#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp5_;
-#line 8172 "VideoSupport.c"
+#line 8041 "VideoSupport.c"
 	}
 }
 
 
 static void video_set_is_interpretable (Video* self, gboolean is_interpretable) {
 	GError * _inner_error_ = NULL;
-#line 889 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 8181 "VideoSupport.c"
+#line 8050 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
-#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp0_;
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8188 "VideoSupport.c"
+#line 8057 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			gboolean _tmp2_ = FALSE;
-			gboolean _tmp3_ = FALSE;
-			VideoRow* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
-#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			gboolean _tmp2_;
+			gboolean _tmp3_;
+			VideoRow* _tmp5_;
+			gboolean _tmp6_;
+#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->is_interpretable;
-#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = is_interpretable;
-#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp2_ == _tmp3_) {
-#line 8203 "VideoSupport.c"
+#line 8072 "VideoSupport.c"
 				{
-					VideoRow* _tmp4_ = NULL;
-#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					VideoRow* _tmp4_;
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp4_ = self->priv->backing_row;
-#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8210 "VideoSupport.c"
+#line 8079 "VideoSupport.c"
 				}
-#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 893 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 8214 "VideoSupport.c"
+#line 8083 "VideoSupport.c"
 			}
-#line 894 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 894 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = is_interpretable;
-#line 894 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_->is_interpretable = _tmp6_;
-#line 8222 "VideoSupport.c"
+#line 8091 "VideoSupport.c"
 		}
-		__finally534:
+		__finally535:
 		{
-			VideoRow* _tmp7_ = NULL;
-#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp7_;
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = self->priv->backing_row;
-#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8231 "VideoSupport.c"
+#line 8100 "VideoSupport.c"
 		}
-#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8241 "VideoSupport.c"
+#line 8110 "VideoSupport.c"
 		}
 	}
 	{
-		VideoTable* _tmp8_ = NULL;
-		VideoTable* _tmp9_ = NULL;
+		VideoTable* _tmp8_;
+		VideoTable* _tmp9_;
 		VideoID _tmp10_ = {0};
-		gboolean _tmp11_ = FALSE;
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		gboolean _tmp11_;
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = video_table_get_instance ();
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = _tmp8_;
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (self, &_tmp10_);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = is_interpretable;
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_update_is_interpretable (_tmp9_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp9_);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8265 "VideoSupport.c"
-				goto __catch535_database_error;
+#line 8134 "VideoSupport.c"
+				goto __catch536_database_error;
 			}
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8274 "VideoSupport.c"
+#line 8143 "VideoSupport.c"
 		}
 	}
-	goto __finally535;
-	__catch535_database_error:
+	goto __finally536;
+	__catch536_database_error:
 	{
 		GError* e = NULL;
-		GError* _tmp12_ = NULL;
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		GError* _tmp12_;
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = e;
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp12_);
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 8292 "VideoSupport.c"
+#line 8161 "VideoSupport.c"
 	}
-	__finally535:
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally536:
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8303 "VideoSupport.c"
+#line 8172 "VideoSupport.c"
 	}
 }
 
@@ -8311,254 +8180,254 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 	VideoInterpretableResults* result = NULL;
 	VideoInterpretableResults* results = NULL;
-	VideoInterpretableResults* _tmp0_ = NULL;
+	VideoInterpretableResults* _tmp0_;
 	gdouble clip_duration = 0.0;
 	GdkPixbuf* preview_frame = NULL;
 	VideoReader* backing_file_reader = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	VideoReader* _tmp3_ = NULL;
-	VideoReader* _tmp4_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	GFile* _tmp16_ = NULL;
-	GFile* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	VideoInterpretableResults* _tmp24_ = NULL;
-	VideoInterpretableResults* _tmp25_ = NULL;
-	VideoInterpretableResults* _tmp26_ = NULL;
-	GdkPixbuf* _tmp27_ = NULL;
-	GdkPixbuf* _tmp28_ = NULL;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	VideoReader* _tmp3_;
+	VideoReader* _tmp4_;
+	gboolean _tmp13_;
+	GFile* _tmp16_;
+	GFile* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
+	VideoInterpretableResults* _tmp24_;
+	VideoInterpretableResults* _tmp25_;
+	VideoInterpretableResults* _tmp26_;
+	GdkPixbuf* _tmp27_;
+	GdkPixbuf* _tmp28_;
 	GError * _inner_error_ = NULL;
-#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (IS_VIDEO (self), NULL);
 #line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (IS_VIDEO (self), NULL);
+#line 909 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpretable_results_new (self);
-#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 909 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	results = _tmp0_;
-#line 910 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	clip_duration = -1.0;
 #line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	clip_duration = -1.0;
+#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	preview_frame = NULL;
-#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_new (_tmp2_);
-#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp2_);
-#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing_file_reader = _tmp4_;
-#line 8352 "VideoSupport.c"
+#line 8221 "VideoSupport.c"
 	{
 		gdouble _tmp5_ = 0.0;
-		VideoReader* _tmp6_ = NULL;
-		gdouble _tmp7_ = 0.0;
-		VideoReader* _tmp8_ = NULL;
-		GdkPixbuf* _tmp9_ = NULL;
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoReader* _tmp6_;
+		gdouble _tmp7_;
+		VideoReader* _tmp8_;
+		GdkPixbuf* _tmp9_;
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = backing_file_reader;
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = video_reader_read_clip_duration (_tmp6_, &_inner_error_);
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp7_;
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 8369 "VideoSupport.c"
-				goto __catch536_video_error;
+#line 8238 "VideoSupport.c"
+				goto __catch537_video_error;
 			}
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (backing_file_reader);
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_interpretable_results_unref0 (results);
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 8384 "VideoSupport.c"
+#line 8253 "VideoSupport.c"
 		}
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		clip_duration = _tmp5_;
 #line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		clip_duration = _tmp5_;
+#line 917 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = backing_file_reader;
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 917 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = video_reader_read_preview_frame (_tmp8_);
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 917 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 917 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		preview_frame = _tmp9_;
-#line 8396 "VideoSupport.c"
+#line 8265 "VideoSupport.c"
 	}
-	goto __finally536;
-	__catch536_video_error:
+	goto __finally537;
+	__catch537_video_error:
 	{
 		GError* e = NULL;
-		VideoInterpretableResults* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
-		VideoInterpretableResults* _tmp12_ = NULL;
-#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoInterpretableResults* _tmp10_;
+		gboolean _tmp11_;
+		VideoInterpretableResults* _tmp12_;
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 920 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = results;
-#line 920 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = video_get_is_interpretable (self);
-#line 920 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp10_->update_interpretable = _tmp11_;
 #line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp10_->update_interpretable = _tmp11_;
+#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = results;
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_->is_interpretable = FALSE;
-#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 924 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = results;
-#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 924 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 924 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 924 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 924 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 8429 "VideoSupport.c"
+#line 8298 "VideoSupport.c"
 	}
-	__finally536:
-#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally537:
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_interpretable_results_unref0 (results);
-#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 8446 "VideoSupport.c"
+#line 8315 "VideoSupport.c"
 	}
-#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = video_get_is_interpretable (self);
-#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp13_) {
-#line 8452 "VideoSupport.c"
-		VideoInterpretableResults* _tmp14_ = NULL;
-		VideoInterpretableResults* _tmp15_ = NULL;
 #line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp13_) {
+#line 8321 "VideoSupport.c"
+		VideoInterpretableResults* _tmp14_;
+		VideoInterpretableResults* _tmp15_;
+#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = results;
-#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp14_->update_interpretable = FALSE;
 #line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp14_->update_interpretable = FALSE;
+#line 930 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = results;
-#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 930 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_->is_interpretable = TRUE;
-#line 931 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = results;
-#line 931 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 931 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 931 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 8471 "VideoSupport.c"
+#line 8340 "VideoSupport.c"
 	}
-#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp16_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp17_ = _tmp16_;
-#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp18_ = g_file_get_basename (_tmp17_);
-#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = _tmp18_;
-#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_debug ("VideoSupport.vala:934: video %s has become interpretable", _tmp19_);
-#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_debug ("VideoSupport.vala:935: video %s has become interpretable", _tmp19_);
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp19_);
-#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp17_);
-#line 8487 "VideoSupport.c"
+#line 8356 "VideoSupport.c"
 	{
-		VideoRow* _tmp20_ = NULL;
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp20_;
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp20_ = self->priv->backing_row;
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8494 "VideoSupport.c"
+#line 8363 "VideoSupport.c"
 		{
-			VideoRow* _tmp21_ = NULL;
-			gdouble _tmp22_ = 0.0;
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp21_;
+			gdouble _tmp22_;
+#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = self->priv->backing_row;
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp22_ = clip_duration;
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_->clip_duration = _tmp22_;
-#line 8504 "VideoSupport.c"
+#line 8373 "VideoSupport.c"
 		}
-		__finally537:
+		__finally538:
 		{
-			VideoRow* _tmp23_ = NULL;
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp23_;
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8513 "VideoSupport.c"
+#line 8382 "VideoSupport.c"
 		}
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (backing_file_reader);
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_interpretable_results_unref0 (results);
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 8529 "VideoSupport.c"
+#line 8398 "VideoSupport.c"
 		}
 	}
-#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 942 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = results;
-#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp24_->update_interpretable = TRUE;
 #line 942 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp24_->update_interpretable = TRUE;
+#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = results;
-#line 942 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp25_->is_interpretable = TRUE;
 #line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp25_->is_interpretable = TRUE;
+#line 944 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = results;
-#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 944 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = preview_frame;
-#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 944 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 944 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp26_->new_thumbnail);
-#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 944 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_->new_thumbnail = _tmp28_;
-#line 945 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = results;
-#line 945 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (backing_file_reader);
-#line 945 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (preview_frame);
-#line 945 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8558 "VideoSupport.c"
+#line 8427 "VideoSupport.c"
 }
 
 
@@ -8567,81 +8436,81 @@ static void video_real_destroy (DataSource* base) {
 	VideoID video_id = {0};
 	VideoID _tmp0_ = {0};
 	GError * _inner_error_ = NULL;
-#line 948 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 949 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (self, &_tmp0_);
-#line 949 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id = _tmp0_;
-#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 8575 "VideoSupport.c"
+#line 8444 "VideoSupport.c"
 	{
-		VideoTable* _tmp1_ = NULL;
-		VideoTable* _tmp2_ = NULL;
-		VideoID _tmp3_ = {0};
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoTable* _tmp1_;
+		VideoTable* _tmp2_;
+		VideoID _tmp3_;
+#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = video_table_get_instance ();
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_id;
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_remove (_tmp2_, &_tmp3_, &_inner_error_);
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp2_);
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8594 "VideoSupport.c"
-				goto __catch538_database_error;
+#line 8463 "VideoSupport.c"
+				goto __catch539_database_error;
 			}
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8603 "VideoSupport.c"
+#line 8472 "VideoSupport.c"
 		}
 	}
-	goto __finally538;
-	__catch538_database_error:
+	goto __finally539;
+	__catch539_database_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp4_;
-#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_error ("VideoSupport.vala:956: failed to remove video %s from video table", _tmp5_);
-#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_error ("VideoSupport.vala:957: failed to remove video %s from video table", _tmp5_);
+#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp5_);
-#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 8626 "VideoSupport.c"
+#line 8495 "VideoSupport.c"
 	}
-	__finally538:
-#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally539:
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8637 "VideoSupport.c"
+#line 8506 "VideoSupport.c"
 	}
-#line 959 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 960 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	DATA_SOURCE_CLASS (video_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIDEO_SOURCE, VideoSource), TYPE_DATA_SOURCE, DataSource));
-#line 8641 "VideoSupport.c"
+#line 8510 "VideoSupport.c"
 }
 
 
@@ -8649,568 +8518,568 @@ static gboolean video_real_internal_delete_backing (DataSource* base, GError** e
 	Video * self;
 	gboolean result = FALSE;
 	gboolean ret = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp3_;
 	GError * _inner_error_ = NULL;
-#line 962 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	ret = _tmp0_;
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = DATA_SOURCE_CLASS (video_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIDEO_SOURCE, VideoSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp3_;
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8666 "VideoSupport.c"
+#line 8535 "VideoSupport.c"
 		gboolean _tmp4_ = FALSE;
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp4_;
-#line 8672 "VideoSupport.c"
+#line 8541 "VideoSupport.c"
 	}
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = ret;
-#line 8678 "VideoSupport.c"
+#line 8547 "VideoSupport.c"
 	} else {
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 8682 "VideoSupport.c"
+#line 8551 "VideoSupport.c"
 	}
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8688 "VideoSupport.c"
+#line 8557 "VideoSupport.c"
 }
 
 
 static void video_notify_flags_altered (Video* self, Alteration* additional_alteration) {
 	Alteration* alteration = NULL;
-	Alteration* _tmp0_ = NULL;
-	Alteration* _tmp1_ = NULL;
-	Alteration* _tmp5_ = NULL;
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	Alteration* _tmp0_;
+	Alteration* _tmp1_;
+	Alteration* _tmp5_;
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration));
 #line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration));
+#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flags");
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	alteration = _tmp0_;
 #line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	alteration = _tmp0_;
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = additional_alteration;
-#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp1_ != NULL) {
-#line 8709 "VideoSupport.c"
-		Alteration* _tmp2_ = NULL;
-		Alteration* _tmp3_ = NULL;
-		Alteration* _tmp4_ = NULL;
 #line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp1_ != NULL) {
+#line 8578 "VideoSupport.c"
+		Alteration* _tmp2_;
+		Alteration* _tmp3_;
+		Alteration* _tmp4_;
+#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = alteration;
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = additional_alteration;
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = alteration_compress (_tmp2_, _tmp3_);
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_alteration_unref0 (alteration);
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		alteration = _tmp4_;
-#line 8723 "VideoSupport.c"
+#line 8592 "VideoSupport.c"
 	}
-#line 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = alteration;
-#line 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_);
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (alteration);
-#line 8731 "VideoSupport.c"
+#line 8600 "VideoSupport.c"
 }
 
 
 guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* additional_alteration) {
 	guint64 result = 0ULL;
 	guint64 new_flags = 0ULL;
-	Alteration* _tmp27_ = NULL;
+	Alteration* _tmp27_;
 	GError * _inner_error_ = NULL;
-#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0ULL);
-#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 8744 "VideoSupport.c"
+#line 8613 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp0_;
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8751 "VideoSupport.c"
+#line 8620 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			guint64 _tmp2_ = 0ULL;
-			guint64 _tmp3_ = 0ULL;
-			guint64 _tmp4_ = 0ULL;
-			VideoRow* _tmp5_ = NULL;
-			guint64 _tmp6_ = 0ULL;
-			guint64 _tmp7_ = 0ULL;
-			VideoRow* _tmp23_ = NULL;
-			guint64 _tmp24_ = 0ULL;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			guint64 _tmp2_;
+			guint64 _tmp3_;
+			guint64 _tmp4_;
+			VideoRow* _tmp5_;
+			guint64 _tmp6_;
+			guint64 _tmp7_;
+			VideoRow* _tmp23_;
+			guint64 _tmp24_;
+#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flags_to_add;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_add_flags (_tmp2_, _tmp3_);
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			new_flags = _tmp4_;
 #line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			new_flags = _tmp4_;
+#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = new_flags;
-#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (_tmp6_ == _tmp7_) {
-#line 8780 "VideoSupport.c"
-				VideoRow* _tmp8_ = NULL;
-				guint64 _tmp9_ = 0ULL;
 #line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			if (_tmp6_ == _tmp7_) {
+#line 8649 "VideoSupport.c"
+				VideoRow* _tmp8_;
+				guint64 _tmp9_;
+#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_->flags;
-#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp9_;
-#line 8789 "VideoSupport.c"
+#line 8658 "VideoSupport.c"
 				{
-					VideoRow* _tmp10_ = NULL;
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					VideoRow* _tmp10_;
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp10_ = self->priv->backing_row;
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8796 "VideoSupport.c"
+#line 8665 "VideoSupport.c"
 				}
-#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8800 "VideoSupport.c"
+#line 8669 "VideoSupport.c"
 			}
 			{
-				VideoTable* _tmp11_ = NULL;
-				VideoTable* _tmp12_ = NULL;
+				VideoTable* _tmp11_;
+				VideoTable* _tmp12_;
 				VideoID _tmp13_ = {0};
-				guint64 _tmp14_ = 0ULL;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				guint64 _tmp14_;
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = video_table_get_instance ();
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = _tmp11_;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp13_);
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_flags;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_flags (_tmp12_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp12_);
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8821 "VideoSupport.c"
+#line 8690 "VideoSupport.c"
 					guint64 _tmp16_ = 0ULL;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8825 "VideoSupport.c"
-						goto __catch540_database_error;
+#line 8694 "VideoSupport.c"
+						goto __catch541_database_error;
 					}
 					{
-						VideoRow* _tmp15_ = NULL;
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+						VideoRow* _tmp15_;
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp15_ = self->priv->backing_row;
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8834 "VideoSupport.c"
+#line 8703 "VideoSupport.c"
 					}
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return _tmp16_;
-#line 8842 "VideoSupport.c"
+#line 8711 "VideoSupport.c"
 				}
 			}
-			goto __finally540;
-			__catch540_database_error:
+			goto __finally541;
+			__catch541_database_error:
 			{
 				GError* e = NULL;
-				GError* _tmp17_ = NULL;
-				VideoRow* _tmp18_ = NULL;
-				guint64 _tmp19_ = 0ULL;
-#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				GError* _tmp17_;
+				VideoRow* _tmp18_;
+				guint64 _tmp19_;
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = e;
-#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				app_window_database_error (_tmp17_);
 #line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				app_window_database_error (_tmp17_);
+#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = self->priv->backing_row;
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp19_ = _tmp18_->flags;
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp19_;
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 8868 "VideoSupport.c"
+#line 8737 "VideoSupport.c"
 				{
-					VideoRow* _tmp20_ = NULL;
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					VideoRow* _tmp20_;
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp20_ = self->priv->backing_row;
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8875 "VideoSupport.c"
+#line 8744 "VideoSupport.c"
 				}
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8879 "VideoSupport.c"
+#line 8748 "VideoSupport.c"
 			}
-			__finally540:
-#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally541:
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8884 "VideoSupport.c"
+#line 8753 "VideoSupport.c"
 				guint64 _tmp22_ = 0ULL;
 				{
-					VideoRow* _tmp21_ = NULL;
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					VideoRow* _tmp21_;
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp21_ = self->priv->backing_row;
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8892 "VideoSupport.c"
+#line 8761 "VideoSupport.c"
 				}
-#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return _tmp22_;
-#line 8900 "VideoSupport.c"
+#line 8769 "VideoSupport.c"
 			}
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp24_ = new_flags;
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_->flags = _tmp24_;
-#line 8908 "VideoSupport.c"
+#line 8777 "VideoSupport.c"
 		}
-		__finally539:
+		__finally540:
 		{
-			VideoRow* _tmp25_ = NULL;
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp25_;
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp25_ = self->priv->backing_row;
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8917 "VideoSupport.c"
+#line 8786 "VideoSupport.c"
 		}
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8921 "VideoSupport.c"
+#line 8790 "VideoSupport.c"
 			guint64 _tmp26_ = 0ULL;
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return _tmp26_;
-#line 8929 "VideoSupport.c"
+#line 8798 "VideoSupport.c"
 		}
 	}
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 995 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = additional_alteration;
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 995 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_notify_flags_altered (self, _tmp27_);
-#line 996 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = new_flags;
-#line 996 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8940 "VideoSupport.c"
+#line 8809 "VideoSupport.c"
 }
 
 
 guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* additional_alteration) {
 	guint64 result = 0ULL;
 	guint64 new_flags = 0ULL;
-	Alteration* _tmp27_ = NULL;
+	Alteration* _tmp27_;
 	GError * _inner_error_ = NULL;
-#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0ULL);
-#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 8953 "VideoSupport.c"
+#line 8822 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		VideoRow* _tmp0_;
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8960 "VideoSupport.c"
+#line 8829 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			guint64 _tmp2_ = 0ULL;
-			guint64 _tmp3_ = 0ULL;
-			guint64 _tmp4_ = 0ULL;
-			VideoRow* _tmp5_ = NULL;
-			guint64 _tmp6_ = 0ULL;
-			guint64 _tmp7_ = 0ULL;
-			VideoRow* _tmp23_ = NULL;
-			guint64 _tmp24_ = 0ULL;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			guint64 _tmp2_;
+			guint64 _tmp3_;
+			guint64 _tmp4_;
+			VideoRow* _tmp5_;
+			guint64 _tmp6_;
+			guint64 _tmp7_;
+			VideoRow* _tmp23_;
+			guint64 _tmp24_;
+#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flags_to_remove;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_remove_flags (_tmp2_, _tmp3_);
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			new_flags = _tmp4_;
 #line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			new_flags = _tmp4_;
+#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = new_flags;
-#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (_tmp6_ == _tmp7_) {
-#line 8989 "VideoSupport.c"
-				VideoRow* _tmp8_ = NULL;
-				guint64 _tmp9_ = 0ULL;
 #line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			if (_tmp6_ == _tmp7_) {
+#line 8858 "VideoSupport.c"
+				VideoRow* _tmp8_;
+				guint64 _tmp9_;
+#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_->flags;
-#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp9_;
-#line 8998 "VideoSupport.c"
+#line 8867 "VideoSupport.c"
 				{
-					VideoRow* _tmp10_ = NULL;
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					VideoRow* _tmp10_;
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp10_ = self->priv->backing_row;
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9005 "VideoSupport.c"
+#line 8874 "VideoSupport.c"
 				}
-#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 9009 "VideoSupport.c"
+#line 8878 "VideoSupport.c"
 			}
 			{
-				VideoTable* _tmp11_ = NULL;
-				VideoTable* _tmp12_ = NULL;
+				VideoTable* _tmp11_;
+				VideoTable* _tmp12_;
 				VideoID _tmp13_ = {0};
-				guint64 _tmp14_ = 0ULL;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				guint64 _tmp14_;
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = video_table_get_instance ();
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = _tmp11_;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp13_);
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_flags;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_flags (_tmp12_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp12_);
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9030 "VideoSupport.c"
+#line 8899 "VideoSupport.c"
 					guint64 _tmp16_ = 0ULL;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 9034 "VideoSupport.c"
-						goto __catch542_database_error;
+#line 8903 "VideoSupport.c"
+						goto __catch543_database_error;
 					}
 					{
-						VideoRow* _tmp15_ = NULL;
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+						VideoRow* _tmp15_;
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp15_ = self->priv->backing_row;
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9043 "VideoSupport.c"
+#line 8912 "VideoSupport.c"
 					}
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return _tmp16_;
-#line 9051 "VideoSupport.c"
+#line 8920 "VideoSupport.c"
 				}
 			}
-			goto __finally542;
-			__catch542_database_error:
+			goto __finally543;
+			__catch543_database_error:
 			{
 				GError* e = NULL;
-				GError* _tmp17_ = NULL;
-				VideoRow* _tmp18_ = NULL;
-				guint64 _tmp19_ = 0ULL;
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				GError* _tmp17_;
+				VideoRow* _tmp18_;
+				guint64 _tmp19_;
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = e;
-#line 1009 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				app_window_database_error (_tmp17_);
 #line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				app_window_database_error (_tmp17_);
+#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = self->priv->backing_row;
-#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp19_ = _tmp18_->flags;
-#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp19_;
-#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 9077 "VideoSupport.c"
+#line 8946 "VideoSupport.c"
 				{
-					VideoRow* _tmp20_ = NULL;
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					VideoRow* _tmp20_;
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp20_ = self->priv->backing_row;
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9084 "VideoSupport.c"
+#line 8953 "VideoSupport.c"
 				}
-#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 9088 "VideoSupport.c"
+#line 8957 "VideoSupport.c"
 			}
-			__finally542:
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally543:
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9093 "VideoSupport.c"
+#line 8962 "VideoSupport.c"
 				guint64 _tmp22_ = 0ULL;
 				{
-					VideoRow* _tmp21_ = NULL;
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					VideoRow* _tmp21_;
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp21_ = self->priv->backing_row;
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9101 "VideoSupport.c"
+#line 8970 "VideoSupport.c"
 				}
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return _tmp22_;
-#line 9109 "VideoSupport.c"
+#line 8978 "VideoSupport.c"
 			}
-#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp24_ = new_flags;
-#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_->flags = _tmp24_;
-#line 9117 "VideoSupport.c"
+#line 8986 "VideoSupport.c"
 		}
-		__finally541:
+		__finally542:
 		{
-			VideoRow* _tmp25_ = NULL;
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp25_;
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp25_ = self->priv->backing_row;
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9126 "VideoSupport.c"
+#line 8995 "VideoSupport.c"
 		}
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9130 "VideoSupport.c"
+#line 8999 "VideoSupport.c"
 			guint64 _tmp26_ = 0ULL;
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return _tmp26_;
-#line 9138 "VideoSupport.c"
+#line 9007 "VideoSupport.c"
 		}
 	}
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = additional_alteration;
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_notify_flags_altered (self, _tmp27_);
-#line 1018 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = new_flags;
-#line 1018 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9149 "VideoSupport.c"
+#line 9018 "VideoSupport.c"
 }
 
 
 gboolean video_is_flag_set (Video* self, guint64 flag) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), FALSE);
-#line 9158 "VideoSupport.c"
+#line 9027 "VideoSupport.c"
 	{
-		VideoRow* _tmp0_ = NULL;
+		VideoRow* _tmp0_;
 		gboolean _tmp7_ = FALSE;
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 9166 "VideoSupport.c"
+#line 9035 "VideoSupport.c"
 		{
-			VideoRow* _tmp1_ = NULL;
-			guint64 _tmp2_ = 0ULL;
-			guint64 _tmp3_ = 0ULL;
-			gboolean _tmp4_ = FALSE;
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp1_;
+			guint64 _tmp2_;
+			guint64 _tmp3_;
+			gboolean _tmp4_;
+#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flag;
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_);
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp4_;
-#line 9182 "VideoSupport.c"
+#line 9051 "VideoSupport.c"
 			{
-				VideoRow* _tmp5_ = NULL;
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp5_;
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9189 "VideoSupport.c"
+#line 9058 "VideoSupport.c"
 			}
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 9193 "VideoSupport.c"
+#line 9062 "VideoSupport.c"
 		}
-		__finally543:
+		__finally544:
 		{
-			VideoRow* _tmp6_ = NULL;
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp6_;
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9202 "VideoSupport.c"
+#line 9071 "VideoSupport.c"
 		}
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp7_;
-#line 9210 "VideoSupport.c"
+#line 9079 "VideoSupport.c"
 	}
 }
 
@@ -9218,620 +9087,620 @@ gboolean video_is_flag_set (Video* self, guint64 flag) {
 static void video_real_set_master_file (Monitorable* base, GFile* file) {
 	Video * self;
 	gchar* new_filepath = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
 	gchar* old_filepath = NULL;
-	const gchar* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	GFile* _tmp22_ = NULL;
-	GFile* _tmp23_ = NULL;
-	GFile* _tmp24_ = NULL;
-	Alteration* _tmp25_ = NULL;
-	Alteration* _tmp26_ = NULL;
+	const gchar* _tmp20_;
+	const gchar* _tmp21_;
+	GFile* _tmp22_;
+	GFile* _tmp23_;
+	GFile* _tmp24_;
+	Alteration* _tmp25_;
+	Alteration* _tmp26_;
 	GError * _inner_error_ = NULL;
-#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_if_fail (G_IS_FILE (file));
 #line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_if_fail (G_IS_FILE (file));
+#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	new_filepath = _tmp1_;
 #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	new_filepath = _tmp1_;
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	old_filepath = NULL;
-#line 9241 "VideoSupport.c"
+#line 9110 "VideoSupport.c"
 	{
 		{
-			VideoRow* _tmp2_ = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			VideoRow* _tmp2_;
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 9249 "VideoSupport.c"
+#line 9118 "VideoSupport.c"
 			{
-				VideoRow* _tmp3_ = NULL;
-				const gchar* _tmp4_ = NULL;
-				const gchar* _tmp5_ = NULL;
-				VideoRow* _tmp7_ = NULL;
-				const gchar* _tmp8_ = NULL;
-				gchar* _tmp9_ = NULL;
-				VideoTable* _tmp10_ = NULL;
-				VideoTable* _tmp11_ = NULL;
-				VideoRow* _tmp12_ = NULL;
-				VideoID _tmp13_ = {0};
-				const gchar* _tmp14_ = NULL;
-				VideoRow* _tmp15_ = NULL;
-				const gchar* _tmp16_ = NULL;
-				gchar* _tmp17_ = NULL;
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp3_;
+				const gchar* _tmp4_;
+				const gchar* _tmp5_;
+				VideoRow* _tmp7_;
+				const gchar* _tmp8_;
+				gchar* _tmp9_;
+				VideoTable* _tmp10_;
+				VideoTable* _tmp11_;
+				VideoRow* _tmp12_;
+				VideoID _tmp13_;
+				const gchar* _tmp14_;
+				VideoRow* _tmp15_;
+				const gchar* _tmp16_;
+				gchar* _tmp17_;
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->filepath;
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = new_filepath;
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 9273 "VideoSupport.c"
+#line 9142 "VideoSupport.c"
 					{
-						VideoRow* _tmp6_ = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+						VideoRow* _tmp6_;
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp6_ = self->priv->backing_row;
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9280 "VideoSupport.c"
+#line 9149 "VideoSupport.c"
 					}
-#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1034 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (old_filepath);
-#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1034 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_filepath);
-#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1034 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 9288 "VideoSupport.c"
+#line 9157 "VideoSupport.c"
 				}
-#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = self->priv->backing_row;
-#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_->filepath;
-#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = g_strdup (_tmp8_);
-#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (old_filepath);
-#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				old_filepath = _tmp9_;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = video_table_get_instance ();
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = _tmp10_;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = self->priv->backing_row;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = _tmp12_->video_id;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_filepath;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_filepath (_tmp11_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp11_);
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9316 "VideoSupport.c"
-					goto __finally545;
+#line 9185 "VideoSupport.c"
+					goto __finally546;
 				}
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1039 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = self->priv->backing_row;
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1039 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = new_filepath;
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1039 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = g_strdup (_tmp16_);
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1039 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (_tmp15_->filepath);
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1039 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_->filepath = _tmp17_;
-#line 9329 "VideoSupport.c"
+#line 9198 "VideoSupport.c"
 			}
-			__finally545:
+			__finally546:
 			{
-				VideoRow* _tmp18_ = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				VideoRow* _tmp18_;
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = self->priv->backing_row;
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9338 "VideoSupport.c"
+#line 9207 "VideoSupport.c"
 			}
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 9344 "VideoSupport.c"
-					goto __catch544_database_error;
+#line 9213 "VideoSupport.c"
+					goto __catch545_database_error;
 				}
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (old_filepath);
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_filepath);
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 9357 "VideoSupport.c"
+#line 9226 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally544;
-	__catch544_database_error:
+	goto __finally545;
+	__catch545_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp19_ = NULL;
-#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		GError* _tmp19_;
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp19_ = err;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp19_);
-#line 1043 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1044 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 1043 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1044 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (old_filepath);
-#line 1043 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1044 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (new_filepath);
-#line 1043 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1044 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 9382 "VideoSupport.c"
+#line 9251 "VideoSupport.c"
 	}
-	__finally544:
-#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally545:
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (old_filepath);
-#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (new_filepath);
-#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 9397 "VideoSupport.c"
+#line 9266 "VideoSupport.c"
 	}
-#line 1046 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = old_filepath;
-#line 1046 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_vala_assert (_tmp20_ != NULL, "old_filepath != null");
 #line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_vala_assert (_tmp20_ != NULL, "old_filepath != null");
+#line 1048 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = old_filepath;
-#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1048 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp22_ = g_file_new_for_path (_tmp21_);
-#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1048 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp23_ = _tmp22_;
-#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1048 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = file;
-#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1048 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	media_source_notify_master_replaced (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp23_, _tmp24_);
-#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1048 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp23_);
-#line 1049 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1050 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = alteration_new_from_list ("backing:master,metadata:name");
-#line 1049 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1050 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = _tmp25_;
-#line 1049 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1050 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp26_);
-#line 1049 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1050 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp26_);
-#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (old_filepath);
-#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_filepath);
-#line 9427 "VideoSupport.c"
+#line 9296 "VideoSupport.c"
 }
 
 
 VideoMetadata* video_read_metadata (Video* self, GError** error) {
 	VideoMetadata* result = NULL;
 	VideoMetadata* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	VideoReader* _tmp3_ = NULL;
-	VideoReader* _tmp4_ = NULL;
-	VideoMetadata* _tmp5_ = NULL;
-	VideoMetadata* _tmp6_ = NULL;
-	VideoMetadata* _tmp7_ = NULL;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	VideoReader* _tmp3_;
+	VideoReader* _tmp4_;
+	VideoMetadata* _tmp5_;
+	VideoMetadata* _tmp6_;
+	VideoMetadata* _tmp7_;
 	GError * _inner_error_ = NULL;
-#line 1052 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (IS_VIDEO (self), NULL);
 #line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (IS_VIDEO (self), NULL);
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_new (_tmp2_);
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = video_reader_read_metadata (_tmp4_, &_inner_error_);
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = _tmp5_;
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (_tmp4_);
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = _tmp6_;
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 9468 "VideoSupport.c"
+#line 9337 "VideoSupport.c"
 	}
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = _tmp0_;
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = NULL;
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp7_;
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_media_metadata_unref0 (_tmp0_);
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9480 "VideoSupport.c"
+#line 9349 "VideoSupport.c"
 }
 
 
 VideoInterpretableResults* video_interpretable_results_construct (GType object_type, Video* video) {
 	VideoInterpretableResults* self = NULL;
-	Video* _tmp0_ = NULL;
-	Video* _tmp1_ = NULL;
-#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	Video* _tmp0_;
+	Video* _tmp1_;
+#line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (video), NULL);
-#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = (VideoInterpretableResults*) g_type_create_instance (object_type);
 #line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = (VideoInterpretableResults*) g_type_create_instance (object_type);
+#line 337 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video;
-#line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 337 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 337 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->video);
-#line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 337 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->video = _tmp1_;
-#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 9502 "VideoSupport.c"
+#line 9371 "VideoSupport.c"
 }
 
 
 VideoInterpretableResults* video_interpretable_results_new (Video* video) {
-#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_interpretable_results_construct (VIDEO_TYPE_INTERPRETABLE_RESULTS, video);
-#line 9509 "VideoSupport.c"
+#line 9378 "VideoSupport.c"
 }
 
 
 void video_interpretable_results_foreground_finish (VideoInterpretableResults* self) {
-	gboolean _tmp0_ = FALSE;
-	GdkPixbuf* _tmp3_ = NULL;
+	gboolean _tmp0_;
+	GdkPixbuf* _tmp3_;
 	GError * _inner_error_ = NULL;
-#line 339 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_if_fail (VIDEO_IS_INTERPRETABLE_RESULTS (self));
 #line 340 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_if_fail (VIDEO_IS_INTERPRETABLE_RESULTS (self));
+#line 341 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->update_interpretable;
-#line 340 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp0_) {
-#line 9523 "VideoSupport.c"
-		Video* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
 #line 341 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp0_) {
+#line 9392 "VideoSupport.c"
+		Video* _tmp1_;
+		gboolean _tmp2_;
+#line 342 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->video;
-#line 341 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->is_interpretable;
-#line 341 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_set_is_interpretable (_tmp1_, _tmp2_);
-#line 9532 "VideoSupport.c"
+#line 9401 "VideoSupport.c"
 	}
-#line 343 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = self->new_thumbnail;
-#line 343 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp3_ != NULL) {
-#line 9538 "VideoSupport.c"
+#line 9407 "VideoSupport.c"
 		{
-			Video* _tmp4_ = NULL;
-			GdkPixbuf* _tmp5_ = NULL;
-			Video* _tmp6_ = NULL;
-			GdkPixbuf* _tmp7_ = NULL;
-			Video* _tmp8_ = NULL;
-#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			Video* _tmp4_;
+			GdkPixbuf* _tmp5_;
+			Video* _tmp6_;
+			GdkPixbuf* _tmp7_;
+			Video* _tmp8_;
+#line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->video;
-#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->new_thumbnail;
-#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			thumbnail_cache_replace (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), THUMBNAIL_CACHE_SIZE_BIG, _tmp5_, &_inner_error_);
-#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9553 "VideoSupport.c"
-				goto __catch546_g_error;
+#line 9422 "VideoSupport.c"
+				goto __catch547_g_error;
 			}
-#line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->video;
-#line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = self->new_thumbnail;
-#line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			thumbnail_cache_replace (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), THUMBNAIL_CACHE_SIZE_MEDIUM, _tmp7_, &_inner_error_);
-#line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9564 "VideoSupport.c"
-				goto __catch546_g_error;
+#line 9433 "VideoSupport.c"
+				goto __catch547_g_error;
 			}
-#line 348 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = self->video;
-#line 348 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 9571 "VideoSupport.c"
+#line 9440 "VideoSupport.c"
 		}
-		goto __finally546;
-		__catch546_g_error:
+		goto __finally547;
+		__catch547_g_error:
 		{
 			GError* err = NULL;
-			Video* _tmp9_ = NULL;
-			gchar* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-			GError* _tmp12_ = NULL;
-			const gchar* _tmp13_ = NULL;
-#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			Video* _tmp9_;
+			gchar* _tmp10_;
+			gchar* _tmp11_;
+			GError* _tmp12_;
+			const gchar* _tmp13_;
+#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			err = _inner_error_;
-#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_inner_error_ = NULL;
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 351 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = self->video;
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 351 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject));
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 351 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = _tmp10_;
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 351 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = err;
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 351 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp13_ = _tmp12_->message;
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			g_message ("VideoSupport.vala:350: Unable to update video thumbnails for %s: %s", _tmp11_, _tmp13_);
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 351 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			g_message ("VideoSupport.vala:351: Unable to update video thumbnails for %s: %s", _tmp11_, _tmp13_);
+#line 351 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp11_);
-#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 9602 "VideoSupport.c"
+#line 9471 "VideoSupport.c"
 		}
-		__finally546:
-#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		__finally547:
+#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 9613 "VideoSupport.c"
+#line 9482 "VideoSupport.c"
 		}
 	}
 }
 
 
 static void video_value_interpretable_results_init (GValue* value) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 9622 "VideoSupport.c"
+#line 9491 "VideoSupport.c"
 }
 
 
 static void video_value_interpretable_results_free_value (GValue* value) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (value->data[0].v_pointer) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (value->data[0].v_pointer);
-#line 9631 "VideoSupport.c"
+#line 9500 "VideoSupport.c"
 	}
 }
 
 
 static void video_value_interpretable_results_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = video_interpretable_results_ref (src_value->data[0].v_pointer);
-#line 9641 "VideoSupport.c"
+#line 9510 "VideoSupport.c"
 	} else {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9645 "VideoSupport.c"
+#line 9514 "VideoSupport.c"
 	}
 }
 
 
 static gpointer video_value_interpretable_results_peek_pointer (const GValue* value) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 9653 "VideoSupport.c"
+#line 9522 "VideoSupport.c"
 }
 
 
 static gchar* video_value_interpretable_results_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 9660 "VideoSupport.c"
-		VideoInterpretableResults* object;
+#line 9529 "VideoSupport.c"
+		VideoInterpretableResults * object;
 		object = collect_values[0].v_pointer;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9667 "VideoSupport.c"
+#line 9536 "VideoSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9671 "VideoSupport.c"
+#line 9540 "VideoSupport.c"
 		}
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_interpretable_results_ref (object);
-#line 9675 "VideoSupport.c"
+#line 9544 "VideoSupport.c"
 	} else {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9679 "VideoSupport.c"
+#line 9548 "VideoSupport.c"
 	}
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 9683 "VideoSupport.c"
+#line 9552 "VideoSupport.c"
 }
 
 
 static gchar* video_value_interpretable_results_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	VideoInterpretableResults** object_p;
+	VideoInterpretableResults ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!object_p) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9694 "VideoSupport.c"
+#line 9563 "VideoSupport.c"
 	}
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!value->data[0].v_pointer) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = NULL;
-#line 9700 "VideoSupport.c"
+#line 9569 "VideoSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9704 "VideoSupport.c"
+#line 9573 "VideoSupport.c"
 	} else {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_interpretable_results_ref (value->data[0].v_pointer);
-#line 9708 "VideoSupport.c"
+#line 9577 "VideoSupport.c"
 	}
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 9712 "VideoSupport.c"
+#line 9581 "VideoSupport.c"
 }
 
 
 GParamSpec* video_param_spec_interpretable_results (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	VideoParamSpecInterpretableResults* spec;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, VIDEO_TYPE_INTERPRETABLE_RESULTS), NULL);
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 9726 "VideoSupport.c"
+#line 9595 "VideoSupport.c"
 }
 
 
 gpointer video_value_get_interpretable_results (const GValue* value) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS), NULL);
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 9735 "VideoSupport.c"
+#line 9604 "VideoSupport.c"
 }
 
 
 void video_value_set_interpretable_results (GValue* value, gpointer v_object) {
-	VideoInterpretableResults* old;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	VideoInterpretableResults * old;
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS));
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	old = value->data[0].v_pointer;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (v_object) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, VIDEO_TYPE_INTERPRETABLE_RESULTS));
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_ref (value->data[0].v_pointer);
-#line 9755 "VideoSupport.c"
+#line 9624 "VideoSupport.c"
 	} else {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9759 "VideoSupport.c"
+#line 9628 "VideoSupport.c"
 	}
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (old);
-#line 9765 "VideoSupport.c"
+#line 9634 "VideoSupport.c"
 	}
 }
 
 
 void video_value_take_interpretable_results (GValue* value, gpointer v_object) {
-	VideoInterpretableResults* old;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	VideoInterpretableResults * old;
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS));
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	old = value->data[0].v_pointer;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (v_object) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, VIDEO_TYPE_INTERPRETABLE_RESULTS));
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 9784 "VideoSupport.c"
+#line 9653 "VideoSupport.c"
 	} else {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9788 "VideoSupport.c"
+#line 9657 "VideoSupport.c"
 	}
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (old);
-#line 9794 "VideoSupport.c"
+#line 9663 "VideoSupport.c"
 	}
 }
 
 
 static void video_interpretable_results_class_init (VideoInterpretableResultsClass * klass) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_interpretable_results_parent_class = g_type_class_peek_parent (klass);
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((VideoInterpretableResultsClass *) klass)->finalize = video_interpretable_results_finalize;
-#line 9804 "VideoSupport.c"
+#line 9673 "VideoSupport.c"
 }
 
 
 static void video_interpretable_results_instance_init (VideoInterpretableResults * self) {
-#line 331 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self->update_interpretable = FALSE;
 #line 332 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self->is_interpretable = FALSE;
+	self->update_interpretable = FALSE;
 #line 333 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self->is_interpretable = FALSE;
+#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->new_thumbnail = NULL;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->ref_count = 1;
-#line 9817 "VideoSupport.c"
+#line 9686 "VideoSupport.c"
 }
 
 
-static void video_interpretable_results_finalize (VideoInterpretableResults* obj) {
+static void video_interpretable_results_finalize (VideoInterpretableResults * obj) {
 	VideoInterpretableResults * self;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIDEO_TYPE_INTERPRETABLE_RESULTS, VideoInterpretableResults);
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_signal_handlers_destroy (self);
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_signal_handlers_destroy (self);
+#line 331 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->video);
-#line 333 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->new_thumbnail);
-#line 9831 "VideoSupport.c"
+#line 9700 "VideoSupport.c"
 }
 
 
@@ -9850,174 +9719,174 @@ GType video_interpretable_results_get_type (void) {
 
 
 gpointer video_interpretable_results_ref (gpointer instance) {
-	VideoInterpretableResults* self;
+	VideoInterpretableResults * self;
 	self = instance;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return instance;
-#line 9856 "VideoSupport.c"
+#line 9725 "VideoSupport.c"
 }
 
 
 void video_interpretable_results_unref (gpointer instance) {
-	VideoInterpretableResults* self;
+	VideoInterpretableResults * self;
 	self = instance;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		VIDEO_INTERPRETABLE_RESULTS_GET_CLASS (self)->finalize (self);
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9869 "VideoSupport.c"
+#line 9738 "VideoSupport.c"
 	}
 }
 
 
 static void video_class_init (VideoClass * klass) {
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_parent_class = g_type_class_peek_parent (klass);
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_type_class_add_private (klass, sizeof (VideoPrivate));
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((DataSourceClass *) klass)->commit_backlinks = (void (*)(DataSource*, SourceCollection*, const gchar*)) video_real_commit_backlinks;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->set_event_id = (gboolean (*)(MediaSource*, EventID*)) video_real_set_event_id;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_backing_files_state = (BackingFileState** (*)(MediaSource*, int*)) video_real_get_backing_files_state;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) video_real_get_thumbnail;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_master_md5 = (gchar* (*)(MediaSource*)) video_real_get_master_md5;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*)(MediaSource*, Scaling*, GError**)) video_real_get_preview_pixbuf;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) video_real_create_thumbnail;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) video_real_get_typename;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) video_real_get_instance_id;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_import_id = (void (*)(MediaSource*, ImportID*)) video_real_get_import_id;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*)(ThumbnailSource*)) video_real_get_preferred_thumbnail_format;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_title = (gchar* (*)(MediaSource*)) video_real_get_title;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->set_title = (void (*)(MediaSource*, const gchar*)) video_real_set_title;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_comment = (gchar* (*)(MediaSource*)) video_real_get_comment;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->set_comment = (gboolean (*)(MediaSource*, const gchar*)) video_real_set_comment;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_rating = (Rating (*)(MediaSource*)) video_real_get_rating;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->set_rating = (void (*)(MediaSource*, Rating)) video_real_set_rating;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->increase_rating = (void (*)(MediaSource*)) video_real_increase_rating;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->decrease_rating = (void (*)(MediaSource*)) video_real_decrease_rating;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->is_trashed = (gboolean (*)(MediaSource*)) video_real_is_trashed;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->is_offline = (gboolean (*)(MediaSource*)) video_real_is_offline;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->mark_offline = (void (*)(MediaSource*)) video_real_mark_offline;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->mark_online = (void (*)(MediaSource*)) video_real_mark_online;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->trash = (void (*)(MediaSource*)) video_real_trash;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->untrash = (void (*)(MediaSource*)) video_real_untrash;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_event_id = (void (*)(MediaSource*, EventID*)) video_real_get_event_id;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) video_real_to_string;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_exposure_time = (time_t (*)(MediaSource*)) video_real_get_exposure_time;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_dimensions = (void (*)(MediaSource*, PhotoException, Dimensions*)) video_real_get_dimensions;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_filesize = (guint64 (*)(MediaSource*)) video_real_get_filesize;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_master_filesize = (guint64 (*)(MediaSource*)) video_real_get_master_filesize;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_timestamp = (time_t (*)(MediaSource*)) video_real_get_timestamp;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_file = (GFile* (*)(MediaSource*)) video_real_get_file;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_master_file = (GFile* (*)(MediaSource*)) video_real_get_master_file;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((DataSourceClass *) klass)->destroy = (void (*)(DataSource*)) video_real_destroy;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*)(DataSource*, GError**)) video_real_internal_delete_backing;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((DataSourceClass *) klass)->commit_backlinks = (void (*) (DataSource *, SourceCollection*, const gchar*)) video_real_commit_backlinks;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->set_event_id = (gboolean (*) (MediaSource *, EventID*)) video_real_set_event_id;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->get_backing_files_state = (BackingFileState** (*) (MediaSource *, int*)) video_real_get_backing_files_state;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) video_real_get_thumbnail;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->get_master_md5 = (gchar* (*) (MediaSource *)) video_real_get_master_md5;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*) (MediaSource *, Scaling*, GError**)) video_real_get_preview_pixbuf;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) video_real_create_thumbnail;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((DataSourceClass *) klass)->get_typename = (gchar* (*) (DataSource *)) video_real_get_typename;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((DataSourceClass *) klass)->get_instance_id = (gint64 (*) (DataSource *)) video_real_get_instance_id;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->get_import_id = (void (*) (MediaSource *, ImportID*)) video_real_get_import_id;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*) (ThumbnailSource *)) video_real_get_preferred_thumbnail_format;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->get_title = (gchar* (*) (MediaSource *)) video_real_get_title;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->set_title = (void (*) (MediaSource *, const gchar*)) video_real_set_title;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->get_comment = (gchar* (*) (MediaSource *)) video_real_get_comment;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->set_comment = (gboolean (*) (MediaSource *, const gchar*)) video_real_set_comment;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->get_rating = (Rating (*) (MediaSource *)) video_real_get_rating;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->set_rating = (void (*) (MediaSource *, Rating)) video_real_set_rating;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->increase_rating = (void (*) (MediaSource *)) video_real_increase_rating;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->decrease_rating = (void (*) (MediaSource *)) video_real_decrease_rating;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->is_trashed = (gboolean (*) (MediaSource *)) video_real_is_trashed;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->is_offline = (gboolean (*) (MediaSource *)) video_real_is_offline;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->mark_offline = (void (*) (MediaSource *)) video_real_mark_offline;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->mark_online = (void (*) (MediaSource *)) video_real_mark_online;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->trash = (void (*) (MediaSource *)) video_real_trash;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->untrash = (void (*) (MediaSource *)) video_real_untrash;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->get_event_id = (void (*) (MediaSource *, EventID*)) video_real_get_event_id;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) video_real_to_string;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->get_exposure_time = (time_t (*) (MediaSource *)) video_real_get_exposure_time;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->get_dimensions = (void (*) (MediaSource *, PhotoException, Dimensions*)) video_real_get_dimensions;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->get_filesize = (guint64 (*) (MediaSource *)) video_real_get_filesize;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->get_master_filesize = (guint64 (*) (MediaSource *)) video_real_get_master_filesize;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->get_timestamp = (time_t (*) (MediaSource *)) video_real_get_timestamp;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->get_file = (GFile* (*) (MediaSource *)) video_real_get_file;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceClass *) klass)->get_master_file = (GFile* (*) (MediaSource *)) video_real_get_master_file;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((DataSourceClass *) klass)->destroy = (void (*) (DataSource *)) video_real_destroy;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) video_real_internal_delete_backing;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_OBJECT_CLASS (klass)->finalize = video_finalize;
-#line 9953 "VideoSupport.c"
+#line 9822 "VideoSupport.c"
 }
 
 
 static void video_flaggable_interface_init (FlaggableIface * iface) {
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_flaggable_parent_iface = g_type_interface_peek_parent (iface);
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	iface->is_flagged = (gboolean (*)(Flaggable*)) video_real_is_flagged;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	iface->mark_flagged = (void (*)(Flaggable*)) video_real_mark_flagged;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	iface->mark_unflagged = (void (*)(Flaggable*)) video_real_mark_unflagged;
-#line 9966 "VideoSupport.c"
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	iface->is_flagged = (gboolean (*) (Flaggable *)) video_real_is_flagged;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	iface->mark_flagged = (void (*) (Flaggable *)) video_real_mark_flagged;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	iface->mark_unflagged = (void (*) (Flaggable *)) video_real_mark_unflagged;
+#line 9835 "VideoSupport.c"
 }
 
 
 static void video_monitorable_interface_init (MonitorableIface * iface) {
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_monitorable_parent_iface = g_type_interface_peek_parent (iface);
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	iface->is_offline = (gboolean (*)(Monitorable*)) video_real_is_offline;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	iface->mark_offline = (void (*)(Monitorable*)) video_real_mark_offline;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	iface->mark_online = (void (*)(Monitorable*)) video_real_mark_online;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	iface->set_master_timestamp = (void (*)(Monitorable*, GFileInfo*)) video_real_set_master_timestamp;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	iface->set_master_file = (void (*)(Monitorable*, GFile*)) video_real_set_master_file;
-#line 9983 "VideoSupport.c"
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	iface->is_offline = (gboolean (*) (Monitorable *)) video_real_is_offline;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	iface->mark_offline = (void (*) (Monitorable *)) video_real_mark_offline;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	iface->mark_online = (void (*) (Monitorable *)) video_real_mark_online;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	iface->set_master_timestamp = (void (*) (Monitorable *, GFileInfo*)) video_real_set_master_timestamp;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	iface->set_master_file = (void (*) (Monitorable *, GFile*)) video_real_set_master_file;
+#line 9852 "VideoSupport.c"
 }
 
 
 static void video_dateable_interface_init (DateableIface * iface) {
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_dateable_parent_iface = g_type_interface_peek_parent (iface);
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	iface->get_exposure_time = (time_t (*)(Dateable*)) video_real_get_exposure_time;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	iface->set_exposure_time = (void (*)(Dateable*, time_t)) video_real_set_exposure_time;
-#line 9994 "VideoSupport.c"
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	iface->get_exposure_time = (time_t (*) (Dateable *)) video_real_get_exposure_time;
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	iface->set_exposure_time = (void (*) (Dateable *, time_t)) video_real_set_exposure_time;
+#line 9863 "VideoSupport.c"
 }
 
 
 static void video_instance_init (Video * self) {
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv = VIDEO_GET_PRIVATE (self);
-#line 363 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 364 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_rec_mutex_init (&self->priv->__lock_backing_row);
-#line 10003 "VideoSupport.c"
+#line 9872 "VideoSupport.c"
 }
 
 
-static void video_finalize (GObject* obj) {
+static void video_finalize (GObject * obj) {
 	Video * self;
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO, Video);
-#line 363 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 364 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_rec_mutex_clear (&self->priv->__lock_backing_row);
-#line 363 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 364 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_row_unref0 (self->priv->backing_row);
-#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_OBJECT_CLASS (video_parent_class)->finalize (obj);
-#line 10017 "VideoSupport.c"
+#line 9886 "VideoSupport.c"
 }
 
 
@@ -10054,395 +9923,395 @@ GType video_source_collection_state_get_type (void) {
 static gint _uint64_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = uint64_compare ((guint64*) a, (guint64*) b);
-#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10056 "VideoSupport.c"
+#line 9925 "VideoSupport.c"
 }
 
 
 static guint64* _uint64_dup (guint64* self) {
 	guint64* dup;
-#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	dup = g_new0 (guint64, 1);
-#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	memcpy (dup, self, sizeof (guint64));
-#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return dup;
-#line 10068 "VideoSupport.c"
+#line 9937 "VideoSupport.c"
 }
 
 
 static gint64 _video_source_collection_get_video_key_get_source_database_key (DataSource* source, gpointer self) {
 	gint64 result;
 	result = video_source_collection_get_video_key (source);
-#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1080 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10077 "VideoSupport.c"
+#line 9946 "VideoSupport.c"
 }
 
 
 static void _video_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
-#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_on_trashcan_contents_altered ((VideoSourceCollection*) self, added, removed);
-#line 10084 "VideoSupport.c"
+#line 9953 "VideoSupport.c"
 }
 
 
 static void _video_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1083 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_on_offline_contents_altered ((VideoSourceCollection*) self, added, removed);
-#line 10091 "VideoSupport.c"
+#line 9960 "VideoSupport.c"
 }
 
 
 VideoSourceCollection* video_source_collection_construct (GType object_type) {
 	VideoSourceCollection* self = NULL;
-	MediaSourceHoldingTank* _tmp0_ = NULL;
-	MediaSourceHoldingTank* _tmp1_ = NULL;
-	MediaSourceHoldingTank* _tmp2_ = NULL;
-	MediaSourceHoldingTank* _tmp3_ = NULL;
-#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	MediaSourceHoldingTank* _tmp0_;
+	MediaSourceHoldingTank* _tmp1_;
+	MediaSourceHoldingTank* _tmp2_;
+	MediaSourceHoldingTank* _tmp3_;
+#line 1080 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = (VideoSourceCollection*) media_source_collection_construct (object_type, "VideoSourceCollection", _video_source_collection_get_video_key_get_source_database_key, NULL);
-#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), "contents-altered", (GCallback) _video_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered, self);
-#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_source_holding_tank_unref0 (_tmp1_);
 #line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_source_holding_tank_unref0 (_tmp1_);
+#line 1083 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1083 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1083 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), "contents-altered", (GCallback) _video_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered, self);
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1083 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp3_);
-#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 10121 "VideoSupport.c"
+#line 9990 "VideoSupport.c"
 }
 
 
 VideoSourceCollection* video_source_collection_new (void) {
-#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_source_collection_construct (TYPE_VIDEO_SOURCE_COLLECTION);
-#line 10128 "VideoSupport.c"
+#line 9997 "VideoSupport.c"
 }
 
 
 static gboolean _video_source_collection_is_video_trashed_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = video_source_collection_is_video_trashed (source);
-#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1087 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10137 "VideoSupport.c"
+#line 10006 "VideoSupport.c"
 }
 
 
 static MediaSourceHoldingTank* video_source_collection_real_create_trashcan (MediaSourceCollection* base) {
 	VideoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
-	MediaSourceHoldingTank* _tmp0_ = NULL;
-#line 1085 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
+	MediaSourceHoldingTank* _tmp0_;
 #line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
+#line 1087 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_holding_tank_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _video_source_collection_is_video_trashed_source_holding_tank_check_to_keep, NULL, _video_source_collection_get_video_key_get_source_database_key, NULL);
-#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1087 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1087 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10153 "VideoSupport.c"
+#line 10022 "VideoSupport.c"
 }
 
 
 static gboolean _video_source_collection_is_video_offline_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = video_source_collection_is_video_offline (source);
-#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10162 "VideoSupport.c"
+#line 10031 "VideoSupport.c"
 }
 
 
 static MediaSourceHoldingTank* video_source_collection_real_create_offline_bin (MediaSourceCollection* base) {
 	VideoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
-	MediaSourceHoldingTank* _tmp0_ = NULL;
-#line 1089 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
+	MediaSourceHoldingTank* _tmp0_;
 #line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
+#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_holding_tank_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _video_source_collection_is_video_offline_source_holding_tank_check_to_keep, NULL, _video_source_collection_get_video_key_get_source_database_key, NULL);
-#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10178 "VideoSupport.c"
+#line 10047 "VideoSupport.c"
 }
 
 
 static MediaMonitor* video_source_collection_real_create_media_monitor (MediaSourceCollection* base, Workers* workers, GCancellable* cancellable) {
 	VideoSourceCollection * self;
 	MediaMonitor* result = NULL;
-	GCancellable* _tmp0_ = NULL;
-	VideoMonitor* _tmp1_ = NULL;
-#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	GCancellable* _tmp0_;
+	VideoMonitor* _tmp1_;
+#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_WORKERS (workers), NULL);
-#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
 #line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
+#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = cancellable;
-#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_monitor_new (_tmp0_);
-#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_MONITOR, MediaMonitor);
-#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10201 "VideoSupport.c"
+#line 10070 "VideoSupport.c"
 }
 
 
 static gboolean video_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) {
 	VideoSourceCollection * self;
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
-#line 1097 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	DataSource* _tmp0_;
+#line 1098 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1097 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
 #line 1098 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
+#line 1099 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1098 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1099 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_VIDEO);
-#line 1098 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1099 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10219 "VideoSupport.c"
+#line 10088 "VideoSupport.c"
 }
 
 
 static gchar* video_source_collection_real_get_typename (MediaSourceCollection* base) {
 	VideoSourceCollection * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-#line 1101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
+	gchar* _tmp0_;
 #line 1102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
+#line 1103 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_strdup (VIDEO_TYPENAME);
-#line 1102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1103 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1103 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10235 "VideoSupport.c"
+#line 10104 "VideoSupport.c"
 }
 
 
 static gboolean video_source_collection_real_is_file_recognized (MediaSourceCollection* base, GFile* file) {
 	VideoSourceCollection * self;
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-#line 1105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	GFile* _tmp0_;
+	gboolean _tmp1_;
+#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (G_IS_FILE (file), FALSE);
+#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_reader_is_supported_video_file (_tmp0_);
-#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10256 "VideoSupport.c"
+#line 10125 "VideoSupport.c"
 }
 
 
 static void video_source_collection_on_trashcan_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp1_;
+#line 1110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = removed;
-#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 10275 "VideoSupport.c"
+#line 10144 "VideoSupport.c"
 }
 
 
 static void video_source_collection_on_offline_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp1_;
+#line 1116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = removed;
-#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 10294 "VideoSupport.c"
+#line 10163 "VideoSupport.c"
 }
 
 
 static MediaSource* video_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base, gint64 numeric_id) {
 	VideoSourceCollection * self;
 	MediaSource* result = NULL;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 	VideoID _tmp1_ = {0};
-	Video* _tmp2_ = NULL;
-#line 1121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
+	Video* _tmp2_;
 #line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
+#line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = numeric_id;
-#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id_init (&_tmp1_, _tmp0_);
-#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_source_collection_fetch (self, &_tmp1_);
-#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10316 "VideoSupport.c"
+#line 10185 "VideoSupport.c"
 }
 
 
 gint64 video_source_collection_get_video_key (DataSource* source) {
 	gint64 result = 0LL;
 	Video* video = NULL;
-	DataSource* _tmp0_ = NULL;
-	Video* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	Video* _tmp1_;
 	VideoID video_id = {0};
 	VideoID _tmp2_ = {0};
-	VideoID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
-#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
+	VideoID _tmp3_;
+	gint64 _tmp4_;
 #line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
+#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video));
-#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video = _tmp1_;
 #line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	video = _tmp1_;
+#line 1128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (video, &_tmp2_);
-#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id = _tmp2_;
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_id;
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_.id;
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp4_;
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10351 "VideoSupport.c"
+#line 10220 "VideoSupport.c"
 }
 
 
 gboolean video_source_collection_is_video_trashed (DataSource* source) {
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-#line 1132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
+	DataSource* _tmp0_;
+	gboolean _tmp1_;
 #line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
+#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource));
-#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10369 "VideoSupport.c"
+#line 10238 "VideoSupport.c"
 }
 
 
 gboolean video_source_collection_is_video_offline (DataSource* source) {
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-#line 1136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
+	DataSource* _tmp0_;
+	gboolean _tmp1_;
 #line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
+#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource));
-#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10387 "VideoSupport.c"
+#line 10256 "VideoSupport.c"
 }
 
 
 Video* video_source_collection_fetch (VideoSourceCollection* self, VideoID* video_id) {
 	Video* result = NULL;
-	VideoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	DataSource* _tmp2_ = NULL;
-#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	VideoID _tmp0_;
+	gint64 _tmp1_;
+	DataSource* _tmp2_;
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), NULL);
-#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (video_id != NULL, NULL);
 #line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (video_id != NULL, NULL);
+#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = *video_id;
-#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_.id;
-#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = database_source_collection_fetch_by_key (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), _tmp1_);
-#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_VIDEO, Video);
-#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10410 "VideoSupport.c"
+#line 10279 "VideoSupport.c"
 }
 
 
 static GeeCollection* video_source_collection_real_get_event_source_ids (MediaSourceCollection* base, EventID* event_id) {
 	VideoSourceCollection * self;
 	GeeCollection* result = NULL;
-	VideoTable* _tmp0_ = NULL;
-	VideoTable* _tmp1_ = NULL;
-	EventID _tmp2_ = {0};
-	GeeArrayList* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
-#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	VideoTable* _tmp0_;
+	VideoTable* _tmp1_;
+	EventID _tmp2_;
+	GeeArrayList* _tmp3_;
+	GeeCollection* _tmp4_;
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (event_id != NULL, NULL);
 #line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (event_id != NULL, NULL);
+#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_table_get_instance ();
-#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = *event_id;
-#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_table_get_event_source_ids (_tmp1_, &_tmp2_);
-#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_database_table_unref0 (_tmp1_);
-#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp4_;
-#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10442 "VideoSupport.c"
+#line 10311 "VideoSupport.c"
 }
 
 
@@ -10450,716 +10319,716 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G
 	VideoSourceCollectionState _vala_state = 0;
 	Video* result = NULL;
 	Video* video = NULL;
-	GFile* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	Video* _tmp2_ = NULL;
-	MediaSourceHoldingTank* _tmp3_ = NULL;
-	MediaSourceHoldingTank* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	MediaSource* _tmp6_ = NULL;
-	Video* _tmp7_ = NULL;
-	MediaSourceHoldingTank* _tmp8_ = NULL;
-	MediaSourceHoldingTank* _tmp9_ = NULL;
-	GFile* _tmp10_ = NULL;
-	MediaSource* _tmp11_ = NULL;
-	Video* _tmp12_ = NULL;
-#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	GFile* _tmp0_;
+	MediaSource* _tmp1_;
+	Video* _tmp2_;
+	MediaSourceHoldingTank* _tmp3_;
+	MediaSourceHoldingTank* _tmp4_;
+	GFile* _tmp5_;
+	MediaSource* _tmp6_;
+	Video* _tmp7_;
+	MediaSourceHoldingTank* _tmp8_;
+	MediaSourceHoldingTank* _tmp9_;
+	GFile* _tmp10_;
+	MediaSource* _tmp11_;
+	Video* _tmp12_;
+#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), NULL);
-#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (G_IS_FILE (file), NULL);
+#line 1150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_collection_fetch_by_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp0_);
-#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_VIDEO, Video);
 #line 1150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_VIDEO, Video);
+#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video;
-#line 1150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp2_ != NULL) {
 #line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp2_ != NULL) {
+#line 1152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_ONLINE;
-#line 1153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10485 "VideoSupport.c"
+#line 10354 "VideoSupport.c"
 		}
-#line 1153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10489 "VideoSupport.c"
+#line 10358 "VideoSupport.c"
 	}
-#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = file;
-#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = media_source_holding_tank_fetch_by_master_file (_tmp4_, _tmp5_);
-#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_VIDEO, Video);
-#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_source_holding_tank_unref0 (_tmp4_);
 #line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_source_holding_tank_unref0 (_tmp4_);
+#line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video;
-#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp7_ != NULL) {
 #line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp7_ != NULL) {
+#line 1159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_TRASH;
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10517 "VideoSupport.c"
+#line 10386 "VideoSupport.c"
 		}
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10521 "VideoSupport.c"
+#line 10390 "VideoSupport.c"
 	}
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = _tmp8_;
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = file;
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp11_ = media_source_holding_tank_fetch_by_master_file (_tmp9_, _tmp10_);
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_VIDEO, Video);
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_source_holding_tank_unref0 (_tmp9_);
 #line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_source_holding_tank_unref0 (_tmp9_);
+#line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp12_ = video;
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp12_ != NULL) {
 #line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp12_ != NULL) {
+#line 1166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_OFFLINE;
-#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10549 "VideoSupport.c"
+#line 10418 "VideoSupport.c"
 		}
-#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10553 "VideoSupport.c"
+#line 10422 "VideoSupport.c"
 	}
-#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_state = VIDEO_SOURCE_COLLECTION_STATE_UNKNOWN;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = NULL;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (state) {
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*state = _vala_state;
-#line 10565 "VideoSupport.c"
+#line 10434 "VideoSupport.c"
 	}
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10569 "VideoSupport.c"
+#line 10438 "VideoSupport.c"
 }
 
 
 static void video_source_collection_compare_backing (VideoSourceCollection* self, Video* video, GFileInfo* info, GeeCollection* matching_master) {
-	Video* _tmp0_ = NULL;
-	guint64 _tmp1_ = 0ULL;
-	GFileInfo* _tmp2_ = NULL;
-	gint64 _tmp3_ = 0LL;
-	Video* _tmp4_ = NULL;
-	time_t _tmp5_ = 0;
-	GFileInfo* _tmp6_ = NULL;
+	Video* _tmp0_;
+	guint64 _tmp1_;
+	GFileInfo* _tmp2_;
+	gint64 _tmp3_;
+	Video* _tmp4_;
+	time_t _tmp5_;
+	GFileInfo* _tmp6_;
 	GTimeVal _tmp7_ = {0};
-	glong _tmp8_ = 0L;
-#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	glong _tmp8_;
+#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (video));
-#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_if_fail (GEE_IS_COLLECTION (matching_master));
 #line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_if_fail (GEE_IS_COLLECTION (matching_master));
+#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video;
-#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = info;
-#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = g_file_info_get_size (_tmp2_);
-#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp1_ != ((guint64) _tmp3_)) {
 #line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp1_ != ((guint64) _tmp3_)) {
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 10603 "VideoSupport.c"
+#line 10472 "VideoSupport.c"
 	}
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = video;
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = media_source_get_timestamp (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = info;
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_info_get_modification_time (_tmp6_, &_tmp7_);
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = _tmp7_.tv_sec;
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp5_ == ((time_t) _tmp8_)) {
-#line 10617 "VideoSupport.c"
-		GeeCollection* _tmp9_ = NULL;
-		Video* _tmp10_ = NULL;
 #line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp5_ == ((time_t) _tmp8_)) {
+#line 10486 "VideoSupport.c"
+		GeeCollection* _tmp9_;
+		Video* _tmp10_;
+#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = matching_master;
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = video;
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		gee_collection_add (_tmp9_, _tmp10_);
-#line 10626 "VideoSupport.c"
+#line 10495 "VideoSupport.c"
 	}
 }
 
 
 void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self, GFileInfo* info, GeeCollection* matching_master) {
-#line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matching_master));
-#line 10638 "VideoSupport.c"
+#line 10507 "VideoSupport.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		GeeCollection* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
+		GeeIterator* _tmp3_;
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp2_;
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_object_it = _tmp3_;
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10659 "VideoSupport.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 10528 "VideoSupport.c"
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
-			DataObject* _tmp8_ = NULL;
-			GFileInfo* _tmp9_ = NULL;
-			GeeCollection* _tmp10_ = NULL;
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			DataObject* _tmp8_;
+			GFileInfo* _tmp9_;
+			GeeCollection* _tmp10_;
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _object_it;
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp5_) {
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10676 "VideoSupport.c"
+#line 10545 "VideoSupport.c"
 			}
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _object_it;
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			object = (DataObject*) _tmp7_;
 #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			object = (DataObject*) _tmp7_;
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = object;
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = info;
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = matching_master;
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_VIDEO, Video), _tmp9_, _tmp10_);
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (object);
-#line 10694 "VideoSupport.c"
+#line 10563 "VideoSupport.c"
 		}
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_object_it);
-#line 10698 "VideoSupport.c"
+#line 10567 "VideoSupport.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
-		GeeCollection* _tmp11_ = NULL;
-		GeeCollection* _tmp12_ = NULL;
-		GeeIterator* _tmp13_ = NULL;
-		GeeIterator* _tmp14_ = NULL;
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		GeeCollection* _tmp11_;
+		GeeCollection* _tmp12_;
+		GeeIterator* _tmp13_;
+		GeeIterator* _tmp14_;
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = media_source_collection_get_offline_bin_contents (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = _tmp11_;
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = _tmp13_;
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp12_);
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_media_it = _tmp14_;
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10720 "VideoSupport.c"
-			GeeIterator* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
+#line 10589 "VideoSupport.c"
+			GeeIterator* _tmp15_;
+			gboolean _tmp16_;
 			MediaSource* media = NULL;
-			GeeIterator* _tmp17_ = NULL;
-			gpointer _tmp18_ = NULL;
-			MediaSource* _tmp19_ = NULL;
-			GFileInfo* _tmp20_ = NULL;
-			GeeCollection* _tmp21_ = NULL;
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			GeeIterator* _tmp17_;
+			gpointer _tmp18_;
+			MediaSource* _tmp19_;
+			GFileInfo* _tmp20_;
+			GeeCollection* _tmp21_;
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = _media_it;
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = gee_iterator_next (_tmp15_);
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp16_) {
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10737 "VideoSupport.c"
+#line 10606 "VideoSupport.c"
 			}
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = _media_it;
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = gee_iterator_get (_tmp17_);
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			media = (MediaSource*) _tmp18_;
 #line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			media = (MediaSource*) _tmp18_;
+#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = media;
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp20_ = info;
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = matching_master;
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_VIDEO, Video), _tmp20_, _tmp21_);
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (media);
-#line 10755 "VideoSupport.c"
+#line 10624 "VideoSupport.c"
 		}
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_media_it);
-#line 10759 "VideoSupport.c"
+#line 10628 "VideoSupport.c"
 	}
 }
 
 
 static void video_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed) {
 	VideoSourceCollection * self;
-	GeeIterable* _tmp0_ = NULL;
-	GeeIterable* _tmp13_ = NULL;
-	GeeIterable* _tmp26_ = NULL;
-	GeeIterable* _tmp27_ = NULL;
-#line 1191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	GeeIterable* _tmp0_;
+	GeeIterable* _tmp13_;
+	GeeIterable* _tmp26_;
+	GeeIterable* _tmp27_;
+#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 1191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != NULL) {
-#line 10780 "VideoSupport.c"
+#line 10649 "VideoSupport.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp1_ = NULL;
-			GeeIterator* _tmp2_ = NULL;
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			GeeIterable* _tmp1_;
+			GeeIterator* _tmp2_;
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = added;
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = gee_iterable_iterator (_tmp1_);
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_object_it = _tmp2_;
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 10793 "VideoSupport.c"
-				GeeIterator* _tmp3_ = NULL;
-				gboolean _tmp4_ = FALSE;
+#line 10662 "VideoSupport.c"
+				GeeIterator* _tmp3_;
+				gboolean _tmp4_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
+				GeeIterator* _tmp5_;
+				gpointer _tmp6_;
 				Video* video = NULL;
-				DataObject* _tmp7_ = NULL;
-				Video* _tmp8_ = NULL;
-				GeeMultiMap* _tmp9_ = NULL;
-				Video* _tmp10_ = NULL;
-				guint64 _tmp11_ = 0ULL;
-				Video* _tmp12_ = NULL;
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				DataObject* _tmp7_;
+				Video* _tmp8_;
+				GeeMultiMap* _tmp9_;
+				Video* _tmp10_;
+				guint64 _tmp11_;
+				Video* _tmp12_;
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = _object_it;
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp4_) {
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 10814 "VideoSupport.c"
+#line 10683 "VideoSupport.c"
 				}
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = _object_it;
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				object = (DataObject*) _tmp6_;
 #line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				object = (DataObject*) _tmp6_;
+#line 1196 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = object;
-#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1196 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIDEO, Video));
-#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1196 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp8_;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->filesize_to_video;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = video;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = video;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				gee_multi_map_set (_tmp9_, &_tmp11_, _tmp12_);
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (object);
-#line 10842 "VideoSupport.c"
+#line 10711 "VideoSupport.c"
 			}
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_object_it);
-#line 10846 "VideoSupport.c"
+#line 10715 "VideoSupport.c"
 		}
 	}
-#line 1201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = removed;
-#line 1201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp13_ != NULL) {
-#line 10853 "VideoSupport.c"
+#line 10722 "VideoSupport.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp14_ = NULL;
-			GeeIterator* _tmp15_ = NULL;
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			GeeIterable* _tmp14_;
+			GeeIterator* _tmp15_;
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp14_ = removed;
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = gee_iterable_iterator (_tmp14_);
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_object_it = _tmp15_;
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 10866 "VideoSupport.c"
-				GeeIterator* _tmp16_ = NULL;
-				gboolean _tmp17_ = FALSE;
+#line 10735 "VideoSupport.c"
+				GeeIterator* _tmp16_;
+				gboolean _tmp17_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp18_ = NULL;
-				gpointer _tmp19_ = NULL;
+				GeeIterator* _tmp18_;
+				gpointer _tmp19_;
 				Video* video = NULL;
-				DataObject* _tmp20_ = NULL;
-				Video* _tmp21_ = NULL;
-				GeeMultiMap* _tmp22_ = NULL;
-				Video* _tmp23_ = NULL;
-				guint64 _tmp24_ = 0ULL;
-				Video* _tmp25_ = NULL;
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				DataObject* _tmp20_;
+				Video* _tmp21_;
+				GeeMultiMap* _tmp22_;
+				Video* _tmp23_;
+				guint64 _tmp24_;
+				Video* _tmp25_;
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = _object_it;
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = gee_iterator_next (_tmp16_);
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp17_) {
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 10887 "VideoSupport.c"
+#line 10756 "VideoSupport.c"
 				}
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _object_it;
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp19_ = gee_iterator_get (_tmp18_);
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				object = (DataObject*) _tmp19_;
 #line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				object = (DataObject*) _tmp19_;
+#line 1204 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp20_ = object;
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1204 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_VIDEO, Video));
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1204 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp21_;
-#line 1205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp22_ = self->priv->filesize_to_video;
-#line 1205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp23_ = video;
-#line 1205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp24_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp25_ = video;
-#line 1205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				gee_multi_map_remove (_tmp22_, &_tmp24_, _tmp25_);
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (object);
-#line 10915 "VideoSupport.c"
+#line 10784 "VideoSupport.c"
 			}
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_object_it);
-#line 10919 "VideoSupport.c"
+#line 10788 "VideoSupport.c"
 		}
 	}
-#line 1209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1210 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = added;
-#line 1209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1210 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = removed;
-#line 1209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1210 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	DATA_COLLECTION_CLASS (video_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp26_, _tmp27_);
-#line 10928 "VideoSupport.c"
+#line 10797 "VideoSupport.c"
 }
 
 
 void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize, VideoID* result) {
 	VideoID _tmp19_ = {0};
-#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (basename != NULL);
-#line 10938 "VideoSupport.c"
+#line 10807 "VideoSupport.c"
 	{
 		GeeIterator* _video_it = NULL;
-		GeeMultiMap* _tmp0_ = NULL;
-		guint64 _tmp1_ = 0ULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		GeeMultiMap* _tmp0_;
+		guint64 _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->filesize_to_video;
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = filesize;
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_);
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp2_;
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp4_;
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_it = _tmp5_;
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10965 "VideoSupport.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 10834 "VideoSupport.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			Video* video = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			Video* _tmp10_ = NULL;
-			GFile* _tmp11_ = NULL;
-			GFile* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			gint _tmp15_ = 0;
-			gboolean _tmp16_ = FALSE;
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			Video* _tmp10_;
+			GFile* _tmp11_;
+			GFile* _tmp12_;
+			gchar* _tmp13_;
+			const gchar* _tmp14_;
+			gint _tmp15_;
+			gboolean _tmp16_;
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _video_it;
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp7_) {
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10986 "VideoSupport.c"
+#line 10855 "VideoSupport.c"
 			}
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = _video_it;
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			video = (Video*) _tmp9_;
 #line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			video = (Video*) _tmp9_;
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = video;
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = _tmp11_;
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp13_ = g_file_get_basename (_tmp12_);
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp14_ = basename;
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = utf8_ci_compare (_tmp13_, _tmp14_);
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = _tmp15_ == 0;
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp12_);
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp16_) {
-#line 11012 "VideoSupport.c"
-				Video* _tmp17_ = NULL;
+#line 10881 "VideoSupport.c"
+				Video* _tmp17_;
 				VideoID _tmp18_ = {0};
-#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = video;
-#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (_tmp17_, &_tmp18_);
-#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				*result = _tmp18_;
-#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (_video_it);
-#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 11027 "VideoSupport.c"
+#line 10896 "VideoSupport.c"
 			}
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 11031 "VideoSupport.c"
+#line 10900 "VideoSupport.c"
 		}
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_video_it);
-#line 11035 "VideoSupport.c"
+#line 10904 "VideoSupport.c"
 	}
-#line 1218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id_init (&_tmp19_, VIDEO_ID_INVALID);
-#line 1218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	*result = _tmp19_;
-#line 1218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return;
-#line 11043 "VideoSupport.c"
+#line 10912 "VideoSupport.c"
 }
 
 
 gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	guint64 _tmp1_ = 0ULL;
+	const gchar* _tmp0_;
+	guint64 _tmp1_;
 	VideoID _tmp2_ = {0};
-	gboolean _tmp3_ = FALSE;
-#line 1222 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	gboolean _tmp3_;
+#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), FALSE);
-#line 1222 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_return_val_if_fail (basename != NULL, FALSE);
 #line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (basename != NULL, FALSE);
+#line 1224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = basename;
-#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = filesize;
-#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_get_basename_filesize_duplicate (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_id_is_valid (&_tmp2_);
-#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 11069 "VideoSupport.c"
+#line 10938 "VideoSupport.c"
 }
 
 
 static TransactionController* video_source_collection_real_get_transaction_controller (MediaSourceCollection* base) {
 	TransactionController* result;
 	VideoSourceCollection* self;
-	TransactionController* _tmp0_ = NULL;
-	TransactionController* _tmp2_ = NULL;
-#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
+	TransactionController* _tmp0_;
+	TransactionController* _tmp2_;
 #line 1067 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
+#line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->_transaction_controller;
-#line 1067 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp0_ == NULL) {
-#line 11084 "VideoSupport.c"
-		MediaSourceTransactionController* _tmp1_ = NULL;
 #line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp0_ == NULL) {
+#line 10953 "VideoSupport.c"
+		MediaSourceTransactionController* _tmp1_;
+#line 1069 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = media_source_transaction_controller_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1069 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_transaction_controller_unref0 (self->priv->_transaction_controller);
-#line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1069 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController);
-#line 11092 "VideoSupport.c"
+#line 10961 "VideoSupport.c"
 	}
-#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1071 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = self->priv->_transaction_controller;
-#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1071 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp2_;
-#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1071 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 11100 "VideoSupport.c"
+#line 10969 "VideoSupport.c"
 }
 
 
 static void video_source_collection_class_init (VideoSourceCollectionClass * klass) {
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_parent_class = g_type_class_peek_parent (klass);
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataCollectionClass *) klass)->finalize = video_source_collection_finalize;
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_type_class_add_private (klass, sizeof (VideoSourceCollectionPrivate));
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceCollectionClass *) klass)->create_trashcan = (MediaSourceHoldingTank* (*)(MediaSourceCollection*)) video_source_collection_real_create_trashcan;
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceCollectionClass *) klass)->create_offline_bin = (MediaSourceHoldingTank* (*)(MediaSourceCollection*)) video_source_collection_real_create_offline_bin;
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceCollectionClass *) klass)->create_media_monitor = (MediaMonitor* (*)(MediaSourceCollection*, Workers*, GCancellable*)) video_source_collection_real_create_media_monitor;
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) video_source_collection_real_holds_type_of_source;
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceCollectionClass *) klass)->get_typename = (gchar* (*)(MediaSourceCollection*)) video_source_collection_real_get_typename;
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceCollectionClass *) klass)->is_file_recognized = (gboolean (*)(MediaSourceCollection*, GFile*)) video_source_collection_real_is_file_recognized;
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = (MediaSource* (*)(MediaSourceCollection*, gint64)) video_source_collection_real_fetch_by_numeric_id;
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceCollectionClass *) klass)->get_event_source_ids = (GeeCollection* (*)(MediaSourceCollection*, EventID*)) video_source_collection_real_get_event_source_ids;
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((DataCollectionClass *) klass)->notify_contents_altered = (void (*)(DataCollection*, GeeIterable*, GeeIterable*)) video_source_collection_real_notify_contents_altered;
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceCollectionClass *) klass)->create_trashcan = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) video_source_collection_real_create_trashcan;
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceCollectionClass *) klass)->create_offline_bin = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) video_source_collection_real_create_offline_bin;
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceCollectionClass *) klass)->create_media_monitor = (MediaMonitor* (*) (MediaSourceCollection *, Workers*, GCancellable*)) video_source_collection_real_create_media_monitor;
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) video_source_collection_real_holds_type_of_source;
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceCollectionClass *) klass)->get_typename = (gchar* (*) (MediaSourceCollection *)) video_source_collection_real_get_typename;
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceCollectionClass *) klass)->is_file_recognized = (gboolean (*) (MediaSourceCollection *, GFile*)) video_source_collection_real_is_file_recognized;
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = (MediaSource* (*) (MediaSourceCollection *, gint64)) video_source_collection_real_fetch_by_numeric_id;
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((MediaSourceCollectionClass *) klass)->get_event_source_ids = (GeeCollection* (*) (MediaSourceCollection *, EventID*)) video_source_collection_real_get_event_source_ids;
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) video_source_collection_real_notify_contents_altered;
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	MEDIA_SOURCE_COLLECTION_CLASS (klass)->get_transaction_controller = video_source_collection_real_get_transaction_controller;
-#line 11131 "VideoSupport.c"
+#line 11000 "VideoSupport.c"
 }
 
 
 static void video_source_collection_instance_init (VideoSourceCollection * self) {
-	GeeTreeMultiMap* _tmp0_ = NULL;
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	GeeTreeMultiMap* _tmp0_;
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv = VIDEO_SOURCE_COLLECTION_GET_PRIVATE (self);
-#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self->priv->_transaction_controller = NULL;
 #line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self->priv->_transaction_controller = NULL;
+#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = gee_tree_multi_map_new (G_TYPE_UINT64, (GBoxedCopyFunc) _uint64_dup, (GDestroyNotify) g_free, TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _uint64_compare_gcompare_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->filesize_to_video = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 11145 "VideoSupport.c"
+#line 11014 "VideoSupport.c"
 }
 
 
-static void video_source_collection_finalize (DataCollection* obj) {
+static void video_source_collection_finalize (DataCollection * obj) {
 	VideoSourceCollection * self;
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_transaction_controller_unref0 (self->priv->_transaction_controller);
 #line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_transaction_controller_unref0 (self->priv->_transaction_controller);
+#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->priv->filesize_to_video);
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	DATA_COLLECTION_CLASS (video_source_collection_parent_class)->finalize (obj);
-#line 11159 "VideoSupport.c"
+#line 11028 "VideoSupport.c"
 }
 
 
diff --git a/src/VideoSupport.vala b/src/VideoSupport.vala
index 5076a31..d742dda 100644
--- a/src/VideoSupport.vala
+++ b/src/VideoSupport.vala
@@ -74,7 +74,8 @@ public class VideoReader {
     public static bool is_supported_video_filename(string filename) {
         string mime_type;
         mime_type = ContentType.guess(filename, new uchar[0], null);
-        if (mime_type.length >= 6 && mime_type[0:6] == "video/") {
+        // Guessed mp4 from filename has application/ as prefix, so check for mp4 in the end
+        if (mime_type.has_prefix ("video/") || mime_type.has_suffix("mp4")) {
             string? extension = null;
             string? name = null;
             disassemble_filename(filename, out name, out extension);
diff --git a/src/camera/Branch.c b/src/camera/Branch.c
index e41b06f..60ed699 100644
--- a/src/camera/Branch.c
+++ b/src/camera/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.7, the Vala compiler
+/* Branch.c generated by valac 0.36.6, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -426,7 +426,7 @@ CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, Discovere
 void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator);
 SidebarEntry* sidebar_branch_get_root (SidebarBranch* self);
 void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
-static void camera_branch_finalize (GObject* obj);
+static void camera_branch_finalize (GObject * obj);
 GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
@@ -453,7 +453,7 @@ ImportPage* import_page_new (Camera* camera, const gchar* uri, const gchar* disp
 ImportPage* import_page_construct (GType object_type, Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon);
 GType checkerboard_page_get_type (void) G_GNUC_CONST;
 GType import_page_get_type (void) G_GNUC_CONST;
-static void camera_sidebar_entry_finalize (GObject* obj);
+static void camera_sidebar_entry_finalize (GObject * obj);
 
 
 static gint _camera_branch_camera_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
@@ -481,12 +481,12 @@ static void _camera_branch_on_camera_removed_camera_table_camera_removed (Camera
 
 CameraBranch* camera_branch_construct (GType object_type) {
 	CameraBranch * self = NULL;
-	CameraHeader* _tmp0_ = NULL;
-	CameraHeader* _tmp1_ = NULL;
-	CameraTable* _tmp13_ = NULL;
-	CameraTable* _tmp14_ = NULL;
-	CameraTable* _tmp15_ = NULL;
-	CameraTable* _tmp16_ = NULL;
+	CameraHeader* _tmp0_;
+	CameraHeader* _tmp1_;
+	CameraTable* _tmp13_;
+	CameraTable* _tmp14_;
+	CameraTable* _tmp15_;
+	CameraTable* _tmp16_;
 #line 14 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	_tmp0_ = camera_header_new ();
 #line 14 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -498,12 +498,12 @@ CameraBranch* camera_branch_construct (GType object_type) {
 #line 499 "Branch.c"
 	{
 		GeeIterator* _camera_it = NULL;
-		CameraTable* _tmp2_ = NULL;
-		CameraTable* _tmp3_ = NULL;
-		GeeIterable* _tmp4_ = NULL;
-		GeeIterable* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
-		GeeIterator* _tmp7_ = NULL;
+		CameraTable* _tmp2_;
+		CameraTable* _tmp3_;
+		GeeIterable* _tmp4_;
+		GeeIterable* _tmp5_;
+		GeeIterator* _tmp6_;
+		GeeIterator* _tmp7_;
 #line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 		_tmp2_ = camera_table_get_instance ();
 #line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -525,12 +525,12 @@ CameraBranch* camera_branch_construct (GType object_type) {
 #line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 		while (TRUE) {
 #line 528 "Branch.c"
-			GeeIterator* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			GeeIterator* _tmp8_;
+			gboolean _tmp9_;
 			DiscoveredCamera* camera = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			gpointer _tmp11_ = NULL;
-			DiscoveredCamera* _tmp12_ = NULL;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			DiscoveredCamera* _tmp12_;
 #line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 			_tmp8_ = _camera_it;
 #line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -605,18 +605,18 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gint result = 0;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarEntry* _tmp1_;
 	gint ret = 0;
-	SidebarEntry* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	SidebarEntry* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
+	SidebarEntry* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	SidebarEntry* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
 #line 31 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
 #line 31 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -661,20 +661,20 @@ static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
 	if (_tmp10_ == 0) {
 #line 663 "Branch.c"
 		CameraSidebarEntry* cam_a = NULL;
-		SidebarEntry* _tmp11_ = NULL;
-		CameraSidebarEntry* _tmp12_ = NULL;
+		SidebarEntry* _tmp11_;
+		CameraSidebarEntry* _tmp12_;
 		CameraSidebarEntry* cam_b = NULL;
-		SidebarEntry* _tmp13_ = NULL;
-		CameraSidebarEntry* _tmp14_ = NULL;
+		SidebarEntry* _tmp13_;
+		CameraSidebarEntry* _tmp14_;
 		gboolean _tmp15_ = FALSE;
-		CameraSidebarEntry* _tmp16_ = NULL;
-		CameraSidebarEntry* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		CameraSidebarEntry* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
-		gint _tmp24_ = 0;
+		CameraSidebarEntry* _tmp16_;
+		CameraSidebarEntry* _tmp18_;
+		gchar* _tmp19_;
+		gchar* _tmp20_;
+		CameraSidebarEntry* _tmp21_;
+		gchar* _tmp22_;
+		gchar* _tmp23_;
+		gint _tmp24_;
 #line 39 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 		_tmp11_ = a;
 #line 39 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -692,7 +692,7 @@ static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
 #line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 		if (_tmp16_ != NULL) {
 #line 695 "Branch.c"
-			CameraSidebarEntry* _tmp17_ = NULL;
+			CameraSidebarEntry* _tmp17_;
 #line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 			_tmp17_ = cam_b;
 #line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -741,9 +741,9 @@ static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
 
 CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, DiscoveredCamera* camera) {
 	CameraSidebarEntry* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	DiscoveredCamera* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	DiscoveredCamera* _tmp1_;
+	gpointer _tmp2_;
 #line 48 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_return_val_if_fail (CAMERA_IS_BRANCH (self), NULL);
 #line 48 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -763,7 +763,7 @@ CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, Disc
 
 
 static void camera_branch_on_camera_added (CameraBranch* self, DiscoveredCamera* camera) {
-	DiscoveredCamera* _tmp0_ = NULL;
+	DiscoveredCamera* _tmp0_;
 #line 52 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_return_if_fail (CAMERA_IS_BRANCH (self));
 #line 52 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -777,7 +777,7 @@ static void camera_branch_on_camera_added (CameraBranch* self, DiscoveredCamera*
 
 
 static void camera_branch_on_camera_removed (CameraBranch* self, DiscoveredCamera* camera) {
-	DiscoveredCamera* _tmp0_ = NULL;
+	DiscoveredCamera* _tmp0_;
 #line 56 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_return_if_fail (CAMERA_IS_BRANCH (self));
 #line 56 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -791,16 +791,16 @@ static void camera_branch_on_camera_removed (CameraBranch* self, DiscoveredCamer
 
 
 static void camera_branch_add_camera (CameraBranch* self, DiscoveredCamera* camera) {
-	GeeHashMap* _tmp0_ = NULL;
-	DiscoveredCamera* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	DiscoveredCamera* _tmp1_;
+	gboolean _tmp2_;
 	CameraSidebarEntry* entry = NULL;
-	DiscoveredCamera* _tmp3_ = NULL;
-	CameraSidebarEntry* _tmp4_ = NULL;
-	GeeHashMap* _tmp5_ = NULL;
-	DiscoveredCamera* _tmp6_ = NULL;
-	SidebarEntry* _tmp7_ = NULL;
-	SidebarEntry* _tmp8_ = NULL;
+	DiscoveredCamera* _tmp3_;
+	CameraSidebarEntry* _tmp4_;
+	GeeHashMap* _tmp5_;
+	DiscoveredCamera* _tmp6_;
+	SidebarEntry* _tmp7_;
+	SidebarEntry* _tmp8_;
 #line 60 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_return_if_fail (CAMERA_IS_BRANCH (self));
 #line 60 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -840,17 +840,17 @@ static void camera_branch_add_camera (CameraBranch* self, DiscoveredCamera* came
 
 
 static void camera_branch_remove_camera (CameraBranch* self, DiscoveredCamera* camera) {
-	GeeHashMap* _tmp0_ = NULL;
-	DiscoveredCamera* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	DiscoveredCamera* _tmp1_;
+	gboolean _tmp2_;
 	CameraSidebarEntry* entry = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	DiscoveredCamera* _tmp4_ = NULL;
-	gpointer _tmp5_ = NULL;
+	GeeHashMap* _tmp3_;
+	DiscoveredCamera* _tmp4_;
+	gpointer _tmp5_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp6_ = NULL;
-	DiscoveredCamera* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	GeeHashMap* _tmp6_;
+	DiscoveredCamera* _tmp7_;
+	gboolean _tmp8_;
 #line 70 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_return_if_fail (CAMERA_IS_BRANCH (self));
 #line 70 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -892,7 +892,7 @@ static void camera_branch_remove_camera (CameraBranch* self, DiscoveredCamera* c
 
 
 static void camera_branch_class_init (CameraBranchClass * klass) {
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	camera_branch_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -908,7 +908,7 @@ static void camera_branch_class_init (CameraBranchClass * klass) {
 
 
 static void camera_branch_instance_init (CameraBranch * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	self->priv = CAMERA_BRANCH_GET_PRIVATE (self);
 #line 10 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -919,7 +919,7 @@ static void camera_branch_instance_init (CameraBranch * self) {
 }
 
 
-static void camera_branch_finalize (GObject* obj) {
+static void camera_branch_finalize (GObject * obj) {
 	CameraBranch * self;
 #line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CAMERA_TYPE_BRANCH, CameraBranch);
@@ -945,28 +945,25 @@ GType camera_branch_get_type (void) {
 
 CameraHeader* camera_header_construct (GType object_type) {
 	CameraHeader * self = NULL;
-	const gchar* _tmp0_ = NULL;
-#line 85 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-	_tmp0_ = _ ("Cameras");
 #line 85 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-	self = (CameraHeader*) sidebar_header_construct (object_type, _tmp0_, TRUE);
+	self = (CameraHeader*) sidebar_header_construct (object_type, _ ("Cameras"), TRUE);
 #line 84 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return self;
-#line 956 "Branch.c"
+#line 953 "Branch.c"
 }
 
 
 CameraHeader* camera_header_new (void) {
 #line 84 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return camera_header_construct (CAMERA_TYPE_HEADER);
-#line 963 "Branch.c"
+#line 960 "Branch.c"
 }
 
 
 static void camera_header_class_init (CameraHeaderClass * klass) {
 #line 83 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	camera_header_parent_class = g_type_class_peek_parent (klass);
-#line 970 "Branch.c"
+#line 967 "Branch.c"
 }
 
 
@@ -989,17 +986,17 @@ GType camera_header_get_type (void) {
 static gpointer _discovered_camera_ref0 (gpointer self) {
 #line 94 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return self ? discovered_camera_ref (self) : NULL;
-#line 993 "Branch.c"
+#line 990 "Branch.c"
 }
 
 
 CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, DiscoveredCamera* camera) {
 	CameraSidebarEntry * self = NULL;
-	DiscoveredCamera* _tmp0_ = NULL;
-	DiscoveredCamera* _tmp1_ = NULL;
-	DiscoveredCamera* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	DiscoveredCamera* _tmp0_;
+	DiscoveredCamera* _tmp1_;
+	DiscoveredCamera* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_return_val_if_fail (IS_DISCOVERED_CAMERA (camera), NULL);
 #line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -1024,14 +1021,14 @@ CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, Discovere
 	self->priv->uri = _tmp4_;
 #line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return self;
-#line 1028 "Branch.c"
+#line 1025 "Branch.c"
 }
 
 
 CameraSidebarEntry* camera_sidebar_entry_new (DiscoveredCamera* camera) {
 #line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return camera_sidebar_entry_construct (CAMERA_TYPE_SIDEBAR_ENTRY, camera);
-#line 1035 "Branch.c"
+#line 1032 "Branch.c"
 }
 
 
@@ -1039,9 +1036,9 @@ static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry
 	CameraSidebarEntry * self;
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
-	DiscoveredCamera* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp4_ = NULL;
+	DiscoveredCamera* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 98 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
 #line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -1052,21 +1049,17 @@ static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry
 	_tmp0_ = _tmp2_;
 #line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	if (_tmp0_ == NULL) {
-#line 1056 "Branch.c"
-		const gchar* _tmp3_ = NULL;
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-		_tmp3_ = _ ("Camera");
 #line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-		_tmp0_ = _tmp3_;
-#line 1062 "Branch.c"
+		_tmp0_ = _ ("Camera");
+#line 1055 "Branch.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-	_tmp4_ = g_strdup (_tmp0_);
+	_tmp3_ = g_strdup (_tmp0_);
 #line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-	result = _tmp4_;
+	result = _tmp3_;
 #line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return result;
-#line 1070 "Branch.c"
+#line 1063 "Branch.c"
 }
 
 
@@ -1074,9 +1067,9 @@ static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry
 	CameraSidebarEntry * self;
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
-	DiscoveredCamera* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp4_ = NULL;
+	DiscoveredCamera* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp4_;
 #line 102 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
 #line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -1087,13 +1080,13 @@ static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry
 	_tmp0_ = _tmp2_;
 #line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	if (_tmp0_ == NULL) {
-#line 1091 "Branch.c"
-		const gchar* _tmp3_ = NULL;
+#line 1084 "Branch.c"
+		const gchar* _tmp3_;
 #line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 		_tmp3_ = camera_branch_cameras_icon;
 #line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 		_tmp0_ = _tmp3_;
-#line 1097 "Branch.c"
+#line 1090 "Branch.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	_tmp4_ = g_strdup (_tmp0_);
@@ -1101,22 +1094,22 @@ static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry
 	result = _tmp4_;
 #line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return result;
-#line 1105 "Branch.c"
+#line 1098 "Branch.c"
 }
 
 
 static Page* camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
 	CameraSidebarEntry * self;
 	Page* result = NULL;
-	DiscoveredCamera* _tmp0_ = NULL;
-	Camera* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	ImportPage* _tmp7_ = NULL;
-	Page* _tmp8_ = NULL;
+	DiscoveredCamera* _tmp0_;
+	Camera* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	ImportPage* _tmp7_;
+	Page* _tmp8_;
 #line 106 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
 #line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -1147,14 +1140,14 @@ static Page* camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base
 	result = _tmp8_;
 #line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return result;
-#line 1151 "Branch.c"
+#line 1144 "Branch.c"
 }
 
 
 gchar* camera_sidebar_entry_get_uri (CameraSidebarEntry* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 110 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_return_val_if_fail (CAMERA_IS_SIDEBAR_ENTRY (self), NULL);
 #line 111 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -1165,7 +1158,7 @@ gchar* camera_sidebar_entry_get_uri (CameraSidebarEntry* self) {
 	result = _tmp1_;
 #line 111 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return result;
-#line 1169 "Branch.c"
+#line 1162 "Branch.c"
 }
 
 
@@ -1175,25 +1168,25 @@ static void camera_sidebar_entry_class_init (CameraSidebarEntryClass * klass) {
 #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_type_class_add_private (klass, sizeof (CameraSidebarEntryPrivate));
 #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) camera_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) camera_sidebar_entry_real_get_sidebar_name;
 #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) camera_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) camera_sidebar_entry_real_get_sidebar_icon;
 #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) camera_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) camera_sidebar_entry_real_create_page;
 #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = camera_sidebar_entry_finalize;
-#line 1186 "Branch.c"
+#line 1179 "Branch.c"
 }
 
 
 static void camera_sidebar_entry_instance_init (CameraSidebarEntry * self) {
 #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	self->priv = CAMERA_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 1193 "Branch.c"
+#line 1186 "Branch.c"
 }
 
 
-static void camera_sidebar_entry_finalize (GObject* obj) {
+static void camera_sidebar_entry_finalize (GObject * obj) {
 	CameraSidebarEntry * self;
 #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
@@ -1203,7 +1196,7 @@ static void camera_sidebar_entry_finalize (GObject* obj) {
 	_g_free0 (self->priv->uri);
 #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	G_OBJECT_CLASS (camera_sidebar_entry_parent_class)->finalize (obj);
-#line 1207 "Branch.c"
+#line 1200 "Branch.c"
 }
 
 
diff --git a/src/camera/Camera.c b/src/camera/Camera.c
index a67eb27..0d6d3ce 100644
--- a/src/camera/Camera.c
+++ b/src/camera/Camera.c
@@ -1,4 +1,4 @@
-/* Camera.c generated by valac 0.34.7, the Vala compiler
+/* Camera.c generated by valac 0.36.6, the Vala compiler
  * generated from Camera.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c
index bbf944b..864a4e8 100644
--- a/src/camera/CameraTable.c
+++ b/src/camera/CameraTable.c
@@ -1,4 +1,4 @@
-/* CameraTable.c generated by valac 0.34.7, the Vala compiler
+/* CameraTable.c generated by valac 0.36.6, the Vala compiler
  * generated from CameraTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -103,6 +103,12 @@ typedef struct _LibraryWindowClass LibraryWindowClass;
 #define _gp_list_unref0(var) ((var == NULL) ? NULL : (var = (gp_list_unref (var), NULL)))
 #define _discovered_camera_unref0(var) ((var == NULL) ? NULL : (var = (discovered_camera_unref (var), NULL)))
 typedef struct _ParamSpecCameraTable ParamSpecCameraTable;
+enum  {
+	CAMERA_TABLE_CAMERA_ADDED_SIGNAL,
+	CAMERA_TABLE_CAMERA_REMOVED_SIGNAL,
+	CAMERA_TABLE_LAST_SIGNAL
+};
+static guint camera_table_signals[CAMERA_TABLE_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -174,7 +180,7 @@ enum  {
 };
 DiscoveredCamera* discovered_camera_new (Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon);
 DiscoveredCamera* discovered_camera_construct (GType object_type, Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon);
-static void discovered_camera_finalize (DiscoveredCamera* obj);
+static void discovered_camera_finalize (DiscoveredCamera * obj);
 gpointer camera_table_ref (gpointer instance);
 void camera_table_unref (gpointer instance);
 GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -221,18 +227,18 @@ gint camera_table_get_count (CameraTable* self);
 DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri);
 static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GError** error);
 static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_length1);
-static void _vala_array_add66 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add66 (gchar** * array, int* length, int* size, gchar* value);
 static void _g_object_unref0_ (gpointer var);
 static void _g_list_free__g_object_unref0_ (GList* self);
-static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_count, gchar** usb_cameras, int usb_cameras_length1, const gchar* port, gchar** full_port);
+static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_count, gchar** usb_cameras, int usb_cameras_length1, const gchar* port, gchar* * full_port);
 gchar* camera_table_get_port_uri (const gchar* port);
 gchar* camera_table_get_port_path (const gchar* port);
 static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uuid);
 static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uuid);
-static void _vala_array_add67 (DiscoveredCamera*** array, int* length, int* size, DiscoveredCamera* value);
+static void _vala_array_add67 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value);
 void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule);
 static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void camera_table_finalize (CameraTable* obj);
+static void camera_table_finalize (CameraTable * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -241,20 +247,20 @@ static const gchar* CAMERA_TABLE_SUBSYSTEMS[3] = {"usb", "block", NULL};
 static gpointer _GPHOTO_REF_CAMERA0 (gpointer self) {
 #line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return self ? GPHOTO_REF_CAMERA (self) : NULL;
-#line 245 "CameraTable.c"
+#line 251 "CameraTable.c"
 }
 
 
 DiscoveredCamera* discovered_camera_construct (GType object_type, Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon) {
 	DiscoveredCamera* self = NULL;
-	Camera* _tmp0_ = NULL;
-	Camera* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	Camera* _tmp0_;
+	Camera* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
 #line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (gcamera != NULL, NULL);
 #line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -297,21 +303,21 @@ DiscoveredCamera* discovered_camera_construct (GType object_type, Camera* gcamer
 	self->icon = _tmp7_;
 #line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return self;
-#line 301 "CameraTable.c"
+#line 307 "CameraTable.c"
 }
 
 
 DiscoveredCamera* discovered_camera_new (Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon) {
 #line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return discovered_camera_construct (TYPE_DISCOVERED_CAMERA, gcamera, uri, display_name, icon);
-#line 308 "CameraTable.c"
+#line 314 "CameraTable.c"
 }
 
 
 static void value_discovered_camera_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	value->data[0].v_pointer = NULL;
-#line 315 "CameraTable.c"
+#line 321 "CameraTable.c"
 }
 
 
@@ -320,7 +326,7 @@ static void value_discovered_camera_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		discovered_camera_unref (value->data[0].v_pointer);
-#line 324 "CameraTable.c"
+#line 330 "CameraTable.c"
 	}
 }
 
@@ -330,11 +336,11 @@ static void value_discovered_camera_copy_value (const GValue* src_value, GValue*
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		dest_value->data[0].v_pointer = discovered_camera_ref (src_value->data[0].v_pointer);
-#line 334 "CameraTable.c"
+#line 340 "CameraTable.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 338 "CameraTable.c"
+#line 344 "CameraTable.c"
 	}
 }
 
@@ -342,66 +348,66 @@ static void value_discovered_camera_copy_value (const GValue* src_value, GValue*
 static gpointer value_discovered_camera_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return value->data[0].v_pointer;
-#line 346 "CameraTable.c"
+#line 352 "CameraTable.c"
 }
 
 
 static gchar* value_discovered_camera_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (collect_values[0].v_pointer) {
-#line 353 "CameraTable.c"
-		DiscoveredCamera* object;
+#line 359 "CameraTable.c"
+		DiscoveredCamera * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 360 "CameraTable.c"
+#line 366 "CameraTable.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 364 "CameraTable.c"
+#line 370 "CameraTable.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = discovered_camera_ref (object);
-#line 368 "CameraTable.c"
+#line 374 "CameraTable.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 372 "CameraTable.c"
+#line 378 "CameraTable.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return NULL;
-#line 376 "CameraTable.c"
+#line 382 "CameraTable.c"
 }
 
 
 static gchar* value_discovered_camera_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	DiscoveredCamera** object_p;
+	DiscoveredCamera ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 387 "CameraTable.c"
+#line 393 "CameraTable.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = NULL;
-#line 393 "CameraTable.c"
+#line 399 "CameraTable.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = value->data[0].v_pointer;
-#line 397 "CameraTable.c"
+#line 403 "CameraTable.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = discovered_camera_ref (value->data[0].v_pointer);
-#line 401 "CameraTable.c"
+#line 407 "CameraTable.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return NULL;
-#line 405 "CameraTable.c"
+#line 411 "CameraTable.c"
 }
 
 
@@ -415,7 +421,7 @@ GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return G_PARAM_SPEC (spec);
-#line 419 "CameraTable.c"
+#line 425 "CameraTable.c"
 }
 
 
@@ -424,12 +430,12 @@ gpointer value_get_discovered_camera (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DISCOVERED_CAMERA), NULL);
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return value->data[0].v_pointer;
-#line 428 "CameraTable.c"
+#line 434 "CameraTable.c"
 }
 
 
 void value_set_discovered_camera (GValue* value, gpointer v_object) {
-	DiscoveredCamera* old;
+	DiscoveredCamera * old;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DISCOVERED_CAMERA));
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -444,23 +450,23 @@ void value_set_discovered_camera (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		discovered_camera_ref (value->data[0].v_pointer);
-#line 448 "CameraTable.c"
+#line 454 "CameraTable.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 452 "CameraTable.c"
+#line 458 "CameraTable.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		discovered_camera_unref (old);
-#line 458 "CameraTable.c"
+#line 464 "CameraTable.c"
 	}
 }
 
 
 void value_take_discovered_camera (GValue* value, gpointer v_object) {
-	DiscoveredCamera* old;
+	DiscoveredCamera * old;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DISCOVERED_CAMERA));
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -473,17 +479,17 @@ void value_take_discovered_camera (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = v_object;
-#line 477 "CameraTable.c"
+#line 483 "CameraTable.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 481 "CameraTable.c"
+#line 487 "CameraTable.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		discovered_camera_unref (old);
-#line 487 "CameraTable.c"
+#line 493 "CameraTable.c"
 	}
 }
 
@@ -493,18 +499,18 @@ static void discovered_camera_class_init (DiscoveredCameraClass * klass) {
 	discovered_camera_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	((DiscoveredCameraClass *) klass)->finalize = discovered_camera_finalize;
-#line 497 "CameraTable.c"
+#line 503 "CameraTable.c"
 }
 
 
 static void discovered_camera_instance_init (DiscoveredCamera * self) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	self->ref_count = 1;
-#line 504 "CameraTable.c"
+#line 510 "CameraTable.c"
 }
 
 
-static void discovered_camera_finalize (DiscoveredCamera* obj) {
+static void discovered_camera_finalize (DiscoveredCamera * obj) {
 	DiscoveredCamera * self;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DISCOVERED_CAMERA, DiscoveredCamera);
@@ -518,7 +524,7 @@ static void discovered_camera_finalize (DiscoveredCamera* obj) {
 	_g_free0 (self->display_name);
 #line 11 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_g_free0 (self->icon);
-#line 522 "CameraTable.c"
+#line 528 "CameraTable.c"
 }
 
 
@@ -537,18 +543,18 @@ GType discovered_camera_get_type (void) {
 
 
 gpointer discovered_camera_ref (gpointer instance) {
-	DiscoveredCamera* self;
+	DiscoveredCamera * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return instance;
-#line 547 "CameraTable.c"
+#line 553 "CameraTable.c"
 }
 
 
 void discovered_camera_unref (gpointer instance) {
-	DiscoveredCamera* self;
+	DiscoveredCamera * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -556,7 +562,7 @@ void discovered_camera_unref (gpointer instance) {
 		DISCOVERED_CAMERA_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 560 "CameraTable.c"
+#line 566 "CameraTable.c"
 	}
 }
 
@@ -564,28 +570,28 @@ void discovered_camera_unref (gpointer instance) {
 static void _camera_table_on_update_cameras_one_shot_callback (gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_on_update_cameras ((CameraTable*) self);
-#line 568 "CameraTable.c"
+#line 574 "CameraTable.c"
 }
 
 
 static void _camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self) {
 #line 46 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_on_udev_event ((CameraTable*) self, action, device);
-#line 575 "CameraTable.c"
+#line 581 "CameraTable.c"
 }
 
 
 static void _camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor* _sender, GVolume* volume, gpointer self) {
 #line 48 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_on_volume_changed ((CameraTable*) self, volume);
-#line 582 "CameraTable.c"
+#line 588 "CameraTable.c"
 }
 
 
 static void _camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _sender, GVolume* volume, gpointer self) {
 #line 49 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_on_volume_changed ((CameraTable*) self, volume);
-#line 589 "CameraTable.c"
+#line 595 "CameraTable.c"
 }
 
 
@@ -594,17 +600,17 @@ static gboolean _camera_table_delayed_init_gsource_func (gpointer self) {
 	result = camera_table_delayed_init ((CameraTable*) self);
 #line 54 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 598 "CameraTable.c"
+#line 604 "CameraTable.c"
 }
 
 
 static CameraTable* camera_table_construct (GType object_type) {
 	CameraTable* self = NULL;
-	OneShotScheduler* _tmp0_ = NULL;
-	GUdevClient* _tmp1_ = NULL;
-	GVolumeMonitor* _tmp2_ = NULL;
-	GVolumeMonitor* _tmp3_ = NULL;
-	GVolumeMonitor* _tmp4_ = NULL;
+	OneShotScheduler* _tmp0_;
+	GUdevClient* _tmp1_;
+	GVolumeMonitor* _tmp2_;
+	GVolumeMonitor* _tmp3_;
+	GVolumeMonitor* _tmp4_;
 #line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	self = (CameraTable*) g_type_create_instance (object_type);
 #line 42 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -635,23 +641,23 @@ static CameraTable* camera_table_construct (GType object_type) {
 	g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, _camera_table_delayed_init_gsource_func, camera_table_ref (self), camera_table_unref);
 #line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return self;
-#line 639 "CameraTable.c"
+#line 645 "CameraTable.c"
 }
 
 
 static CameraTable* camera_table_new (void) {
 #line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return camera_table_construct (TYPE_CAMERA_TABLE);
-#line 646 "CameraTable.c"
+#line 652 "CameraTable.c"
 }
 
 
 static gboolean camera_table_delayed_init (CameraTable* self) {
 	gboolean result = FALSE;
-	AppWindow* _tmp0_ = NULL;
-	LibraryWindow* _tmp1_ = NULL;
-	AppWindow* _tmp10_ = NULL;
-	LibraryWindow* _tmp11_ = NULL;
+	AppWindow* _tmp0_;
+	LibraryWindow* _tmp1_;
+	AppWindow* _tmp10_;
+	LibraryWindow* _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 57 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (IS_CAMERA_TABLE (self), FALSE);
@@ -663,18 +669,18 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 	library_window_set_page_switching_enabled (_tmp1_, FALSE);
 #line 60 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_g_object_unref0 (_tmp1_);
-#line 667 "CameraTable.c"
+#line 673 "CameraTable.c"
 	{
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_init_camera_table (self, &_inner_error_);
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 673 "CameraTable.c"
+#line 679 "CameraTable.c"
 			gboolean _tmp2_ = FALSE;
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 677 "CameraTable.c"
-				goto __catch57_gphoto_error;
+#line 683 "CameraTable.c"
+				goto __catch58_gphoto_error;
 			}
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -682,15 +688,15 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 			g_clear_error (&_inner_error_);
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return _tmp2_;
-#line 686 "CameraTable.c"
+#line 692 "CameraTable.c"
 		}
 	}
-	goto __finally57;
-	__catch57_gphoto_error:
+	goto __finally58;
+	__catch58_gphoto_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
+		GError* _tmp3_;
+		const gchar* _tmp4_;
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		err = _inner_error_;
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -707,12 +713,12 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 		_g_error_free0 (err);
 #line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return result;
-#line 711 "CameraTable.c"
+#line 717 "CameraTable.c"
 	}
-	__finally57:
+	__finally58:
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 716 "CameraTable.c"
+#line 722 "CameraTable.c"
 		gboolean _tmp5_ = FALSE;
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -720,19 +726,19 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 		g_clear_error (&_inner_error_);
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return _tmp5_;
-#line 724 "CameraTable.c"
+#line 730 "CameraTable.c"
 	}
 	{
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_update_camera_table (self, &_inner_error_);
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 731 "CameraTable.c"
+#line 737 "CameraTable.c"
 			gboolean _tmp6_ = FALSE;
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 735 "CameraTable.c"
-				goto __catch58_gphoto_error;
+#line 741 "CameraTable.c"
+				goto __catch59_gphoto_error;
 			}
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -740,15 +746,15 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 			g_clear_error (&_inner_error_);
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return _tmp6_;
-#line 744 "CameraTable.c"
+#line 750 "CameraTable.c"
 		}
 	}
-	goto __finally58;
-	__catch58_gphoto_error:
+	goto __finally59;
+	__catch59_gphoto_error:
 	{
 		GError* err = NULL;
-		GError* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
+		GError* _tmp7_;
+		const gchar* _tmp8_;
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		err = _inner_error_;
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -761,12 +767,12 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 		g_warning ("CameraTable.vala:73: Unable to update camera table: %s", _tmp8_);
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_error_free0 (err);
-#line 765 "CameraTable.c"
+#line 771 "CameraTable.c"
 	}
-	__finally58:
+	__finally59:
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 770 "CameraTable.c"
+#line 776 "CameraTable.c"
 		gboolean _tmp9_ = FALSE;
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -774,7 +780,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 		g_clear_error (&_inner_error_);
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return _tmp9_;
-#line 778 "CameraTable.c"
+#line 784 "CameraTable.c"
 	}
 #line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp10_ = app_window_get_instance ();
@@ -788,35 +794,35 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 	result = FALSE;
 #line 79 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 792 "CameraTable.c"
+#line 798 "CameraTable.c"
 }
 
 
 static gpointer _camera_table_ref0 (gpointer self) {
 #line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return self ? camera_table_ref (self) : NULL;
-#line 799 "CameraTable.c"
+#line 805 "CameraTable.c"
 }
 
 
 CameraTable* camera_table_get_instance (void) {
 	CameraTable* result = NULL;
-	CameraTable* _tmp0_ = NULL;
-	CameraTable* _tmp2_ = NULL;
-	CameraTable* _tmp3_ = NULL;
+	CameraTable* _tmp0_;
+	CameraTable* _tmp2_;
+	CameraTable* _tmp3_;
 #line 83 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp0_ = camera_table_instance;
 #line 83 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (_tmp0_ == NULL) {
-#line 812 "CameraTable.c"
-		CameraTable* _tmp1_ = NULL;
+#line 818 "CameraTable.c"
+		CameraTable* _tmp1_;
 #line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp1_ = camera_table_new ();
 #line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_camera_table_unref0 (camera_table_instance);
 #line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_instance = _tmp1_;
-#line 820 "CameraTable.c"
+#line 826 "CameraTable.c"
 	}
 #line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp2_ = camera_table_instance;
@@ -826,15 +832,15 @@ CameraTable* camera_table_get_instance (void) {
 	result = _tmp3_;
 #line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 830 "CameraTable.c"
+#line 836 "CameraTable.c"
 }
 
 
 GeeIterable* camera_table_get_cameras (CameraTable* self) {
 	GeeIterable* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp2_;
 #line 89 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL);
 #line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -847,15 +853,15 @@ GeeIterable* camera_table_get_cameras (CameraTable* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable);
 #line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 851 "CameraTable.c"
+#line 857 "CameraTable.c"
 }
 
 
 gint camera_table_get_count (CameraTable* self) {
 	gint result = 0;
-	GeeHashMap* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeHashMap* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 93 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (IS_CAMERA_TABLE (self), 0);
 #line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -868,15 +874,15 @@ gint camera_table_get_count (CameraTable* self) {
 	result = _tmp2_;
 #line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 872 "CameraTable.c"
+#line 878 "CameraTable.c"
 }
 
 
 DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri) {
 	DiscoveredCamera* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
 #line 97 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL);
 #line 97 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -891,12 +897,12 @@ DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri)
 	result = (DiscoveredCamera*) _tmp2_;
 #line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 895 "CameraTable.c"
+#line 901 "CameraTable.c"
 }
 
 
 static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GError** error) {
-	int _tmp0_ = 0;
+	int _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 101 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (IS_CAMERA_TABLE (self));
@@ -906,12 +912,12 @@ static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GEr
 	_tmp0_ = res;
 #line 102 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (_tmp0_ != GP_OK) {
-#line 910 "CameraTable.c"
-		int _tmp1_ = 0;
-		const gchar* _tmp2_ = NULL;
-		int _tmp3_ = 0;
-		const gchar* _tmp4_ = NULL;
-		GError* _tmp5_ = NULL;
+#line 916 "CameraTable.c"
+		int _tmp1_;
+		const gchar* _tmp2_;
+		int _tmp3_;
+		const gchar* _tmp4_;
+		GError* _tmp5_;
 #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp1_ = res;
 #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -930,7 +936,7 @@ static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GEr
 			g_propagate_error (error, _inner_error_);
 #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 934 "CameraTable.c"
+#line 940 "CameraTable.c"
 		} else {
 #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -938,7 +944,7 @@ static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GEr
 			g_clear_error (&_inner_error_);
 #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 942 "CameraTable.c"
+#line 948 "CameraTable.c"
 		}
 	}
 }
@@ -946,10 +952,10 @@ static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GEr
 
 static void camera_table_init_camera_table (CameraTable* self, GError** error) {
 	CameraAbilitiesList* _tmp0_ = NULL;
-	int _tmp1_ = 0;
-	CameraAbilitiesList* _tmp2_ = NULL;
-	GPContext* _tmp3_ = NULL;
-	int _tmp4_ = 0;
+	int _tmp1_;
+	CameraAbilitiesList* _tmp2_;
+	GPContext* _tmp3_;
+	int _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 106 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (IS_CAMERA_TABLE (self));
@@ -969,7 +975,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 973 "CameraTable.c"
+#line 979 "CameraTable.c"
 		} else {
 #line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -977,7 +983,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 981 "CameraTable.c"
+#line 987 "CameraTable.c"
 		}
 	}
 #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -996,7 +1002,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 1000 "CameraTable.c"
+#line 1006 "CameraTable.c"
 		} else {
 #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1004,7 +1010,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 1008 "CameraTable.c"
+#line 1014 "CameraTable.c"
 		}
 	}
 }
@@ -1013,31 +1019,31 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1017 "CameraTable.c"
+#line 1023 "CameraTable.c"
 }
 
 
-static void _vala_array_add66 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add66 (gchar** * array, int* length, int* size, gchar* value) {
 #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if ((*length) == (*size)) {
 #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 1028 "CameraTable.c"
+#line 1034 "CameraTable.c"
 	}
 #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	(*array)[(*length)++] = value;
 #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	(*array)[*length] = NULL;
-#line 1034 "CameraTable.c"
+#line 1040 "CameraTable.c"
 }
 
 
 static void _g_object_unref0_ (gpointer var) {
 #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
-#line 1041 "CameraTable.c"
+#line 1047 "CameraTable.c"
 }
 
 
@@ -1046,22 +1052,22 @@ static void _g_list_free__g_object_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
 #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_list_free (self);
-#line 1050 "CameraTable.c"
+#line 1056 "CameraTable.c"
 }
 
 
 static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_length1) {
 	gchar** result = NULL;
 	gchar** cameras = NULL;
-	gchar** _tmp0_ = NULL;
-	gint cameras_length1 = 0;
-	gint _cameras_size_ = 0;
+	gchar** _tmp0_;
+	gint cameras_length1;
+	gint _cameras_size_;
 	GList* device_list = NULL;
-	GUdevClient* _tmp1_ = NULL;
-	GList* _tmp2_ = NULL;
-	GList* _tmp3_ = NULL;
-	gchar** _tmp25_ = NULL;
-	gint _tmp25__length1 = 0;
+	GUdevClient* _tmp1_;
+	GList* _tmp2_;
+	GList* _tmp3_;
+	gchar** _tmp25_;
+	gint _tmp25__length1;
 #line 111 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL);
 #line 112 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1080,7 +1086,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 	device_list = _tmp2_;
 #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp3_ = device_list;
-#line 1084 "CameraTable.c"
+#line 1090 "CameraTable.c"
 	{
 		GList* device_collection = NULL;
 		GList* device_it = NULL;
@@ -1088,22 +1094,22 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 		device_collection = _tmp3_;
 #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 1092 "CameraTable.c"
-			GUdevDevice* _tmp4_ = NULL;
+#line 1098 "CameraTable.c"
+			GUdevDevice* _tmp4_;
 			GUdevDevice* device = NULL;
 #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp4_ = _g_object_ref0 ((GUdevDevice*) device_it->data);
 #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			device = _tmp4_;
-#line 1099 "CameraTable.c"
+#line 1105 "CameraTable.c"
 			{
 				gchar* device_file = NULL;
-				GUdevDevice* _tmp5_ = NULL;
-				const gchar* _tmp6_ = NULL;
-				gchar* _tmp7_ = NULL;
+				GUdevDevice* _tmp5_;
+				const gchar* _tmp6_;
+				gchar* _tmp7_;
 				gboolean _tmp8_ = FALSE;
 				gboolean _tmp9_ = FALSE;
-				const gchar* _tmp10_ = NULL;
+				const gchar* _tmp10_;
 #line 116 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp5_ = device;
 #line 116 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1116,62 +1122,62 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 				_tmp10_ = device_file;
 #line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp10_ != NULL) {
-#line 1120 "CameraTable.c"
-					GUdevDevice* _tmp11_ = NULL;
-					gboolean _tmp12_ = FALSE;
+#line 1126 "CameraTable.c"
+					GUdevDevice* _tmp11_;
+					gboolean _tmp12_;
 #line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp11_ = device;
 #line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp12_ = g_udev_device_has_property (_tmp11_, "ID_GPHOTO2");
 #line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp9_ = _tmp12_;
-#line 1129 "CameraTable.c"
+#line 1135 "CameraTable.c"
 				} else {
 #line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp9_ = FALSE;
-#line 1133 "CameraTable.c"
+#line 1139 "CameraTable.c"
 				}
 #line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp9_) {
-#line 1137 "CameraTable.c"
-					GUdevDevice* _tmp13_ = NULL;
-					gboolean _tmp14_ = FALSE;
+#line 1143 "CameraTable.c"
+					GUdevDevice* _tmp13_;
+					gboolean _tmp14_;
 #line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp13_ = device;
 #line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp14_ = g_udev_device_has_property (_tmp13_, "GPHOTO2_DRIVER");
 #line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp8_ = _tmp14_;
-#line 1146 "CameraTable.c"
+#line 1152 "CameraTable.c"
 				} else {
 #line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp8_ = FALSE;
-#line 1150 "CameraTable.c"
+#line 1156 "CameraTable.c"
 				}
 #line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp8_) {
-#line 1154 "CameraTable.c"
+#line 1160 "CameraTable.c"
 					gint camera_bus = 0;
 					gint camera_device = 0;
-					const gchar* _tmp15_ = NULL;
-					gint _tmp16_ = 0;
+					const gchar* _tmp15_;
+					gint _tmp16_;
 					gchar* camera = NULL;
-					gint _tmp18_ = 0;
-					gint _tmp19_ = 0;
-					gchar* _tmp20_ = NULL;
-					const gchar* _tmp21_ = NULL;
-					gchar** _tmp22_ = NULL;
-					gint _tmp22__length1 = 0;
-					const gchar* _tmp23_ = NULL;
-					gchar* _tmp24_ = NULL;
+					gint _tmp18_;
+					gint _tmp19_;
+					gchar* _tmp20_;
+					const gchar* _tmp21_;
+					gchar** _tmp22_;
+					gint _tmp22__length1;
+					const gchar* _tmp23_;
+					gchar* _tmp24_;
 #line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp15_ = device_file;
 #line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp16_ = sscanf (_tmp15_, "/dev/bus/usb/%d/%d", &camera_bus, &camera_device);
 #line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					if (_tmp16_ < 2) {
-#line 1174 "CameraTable.c"
-						const gchar* _tmp17_ = NULL;
+#line 1180 "CameraTable.c"
+						const gchar* _tmp17_;
 #line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_tmp17_ = device_file;
 #line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1183,7 +1189,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 						_g_object_unref0 (device);
 #line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						continue;
-#line 1186 "CameraTable.c"
+#line 1192 "CameraTable.c"
 					}
 #line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp18_ = camera_bus;
@@ -1209,13 +1215,13 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 					_vala_array_add66 (&cameras, &cameras_length1, &_cameras_size_, _tmp24_);
 #line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (camera);
-#line 1212 "CameraTable.c"
+#line 1218 "CameraTable.c"
 				}
 #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (device_file);
 #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_object_unref0 (device);
-#line 1218 "CameraTable.c"
+#line 1224 "CameraTable.c"
 			}
 		}
 	}
@@ -1227,7 +1233,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 	if (result_length1) {
 #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*result_length1 = _tmp25__length1;
-#line 1230 "CameraTable.c"
+#line 1236 "CameraTable.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	result = _tmp25_;
@@ -1235,26 +1241,26 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 	__g_list_free__g_object_unref0_0 (device_list);
 #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 1238 "CameraTable.c"
+#line 1244 "CameraTable.c"
 }
 
 
-static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_count, gchar** usb_cameras, int usb_cameras_length1, const gchar* port, gchar** full_port) {
+static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_count, gchar** usb_cameras, int usb_cameras_length1, const gchar* port, gchar* * full_port) {
 	gchar* _vala_full_port = NULL;
 	gboolean result = FALSE;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	const gchar* _tmp2_ = NULL;
+	gint _tmp0_;
+	gint _tmp1_;
+	const gchar* _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	gint _tmp4_ = 0;
-	const gchar* _tmp11_ = NULL;
+	gint _tmp4_;
+	const gchar* _tmp11_;
 	gint bus = 0;
 	gint device = 0;
-	const gchar* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	gchar** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
-	const gchar* _tmp30_ = NULL;
+	const gchar* _tmp13_;
+	gint _tmp14_;
+	gchar** _tmp16_;
+	gint _tmp16__length1;
+	const gchar* _tmp30_;
 #line 150 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (IS_CAMERA_TABLE (self), FALSE);
 #line 150 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1277,30 +1283,30 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 	_tmp4_ = current_camera_count;
 #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (_tmp4_ == 1) {
-#line 1280 "CameraTable.c"
-		gchar** _tmp5_ = NULL;
-		gint _tmp5__length1 = 0;
+#line 1286 "CameraTable.c"
+		gchar** _tmp5_;
+		gint _tmp5__length1;
 #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp5_ = usb_cameras;
 #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp5__length1 = usb_cameras_length1;
 #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp3_ = _tmp5__length1 == 1;
-#line 1289 "CameraTable.c"
+#line 1295 "CameraTable.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp3_ = FALSE;
-#line 1293 "CameraTable.c"
+#line 1299 "CameraTable.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (_tmp3_) {
-#line 1297 "CameraTable.c"
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
+#line 1303 "CameraTable.c"
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
+		const gchar* _tmp9_;
+		const gchar* _tmp10_;
 #line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp6_ = usb_cameras;
 #line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1325,22 +1331,22 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 		if (full_port) {
 #line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			*full_port = _vala_full_port;
-#line 1328 "CameraTable.c"
+#line 1334 "CameraTable.c"
 		} else {
 #line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (_vala_full_port);
-#line 1332 "CameraTable.c"
+#line 1338 "CameraTable.c"
 		}
 #line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return result;
-#line 1336 "CameraTable.c"
+#line 1342 "CameraTable.c"
 	}
 #line 169 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp11_ = port;
 #line 169 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (g_strcmp0 (_tmp11_, "usb:") == 0) {
-#line 1342 "CameraTable.c"
-		const gchar* _tmp12_ = NULL;
+#line 1348 "CameraTable.c"
+		const gchar* _tmp12_;
 #line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp12_ = port;
 #line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1351,15 +1357,15 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 		if (full_port) {
 #line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			*full_port = _vala_full_port;
-#line 1354 "CameraTable.c"
+#line 1360 "CameraTable.c"
 		} else {
 #line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (_vala_full_port);
-#line 1358 "CameraTable.c"
+#line 1364 "CameraTable.c"
 		}
 #line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return result;
-#line 1362 "CameraTable.c"
+#line 1368 "CameraTable.c"
 	}
 #line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp13_ = port;
@@ -1367,8 +1373,8 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 	_tmp14_ = sscanf (_tmp13_, "usb:%d,%d", &bus, &device);
 #line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (_tmp14_ < 2) {
-#line 1370 "CameraTable.c"
-		const gchar* _tmp15_ = NULL;
+#line 1376 "CameraTable.c"
+		const gchar* _tmp15_;
 #line 178 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp15_ = port;
 #line 178 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1379,21 +1385,21 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 		if (full_port) {
 #line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			*full_port = _vala_full_port;
-#line 1382 "CameraTable.c"
+#line 1388 "CameraTable.c"
 		} else {
 #line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (_vala_full_port);
-#line 1386 "CameraTable.c"
+#line 1392 "CameraTable.c"
 		}
 #line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return result;
-#line 1390 "CameraTable.c"
+#line 1396 "CameraTable.c"
 	}
 #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp16_ = usb_cameras;
 #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp16__length1 = usb_cameras_length1;
-#line 1396 "CameraTable.c"
+#line 1402 "CameraTable.c"
 	{
 		gchar** usb_camera_collection = NULL;
 		gint usb_camera_collection_length1 = 0;
@@ -1405,30 +1411,30 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 		usb_camera_collection_length1 = _tmp16__length1;
 #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		for (usb_camera_it = 0; usb_camera_it < _tmp16__length1; usb_camera_it = usb_camera_it + 1) {
-#line 1408 "CameraTable.c"
-			gchar* _tmp17_ = NULL;
+#line 1414 "CameraTable.c"
+			gchar* _tmp17_;
 			gchar* usb_camera = NULL;
 #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp17_ = g_strdup (usb_camera_collection[usb_camera_it]);
 #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			usb_camera = _tmp17_;
-#line 1415 "CameraTable.c"
+#line 1421 "CameraTable.c"
 			{
 				gint camera_bus = 0;
 				gint camera_device = 0;
-				const gchar* _tmp18_ = NULL;
-				gint _tmp19_ = 0;
+				const gchar* _tmp18_;
+				gint _tmp19_;
 				gboolean _tmp21_ = FALSE;
-				gint _tmp22_ = 0;
-				gint _tmp23_ = 0;
+				gint _tmp22_;
+				gint _tmp23_;
 #line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp18_ = usb_camera;
 #line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp19_ = sscanf (_tmp18_, "usb:%d,%d", &camera_bus, &camera_device);
 #line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp19_ < 2) {
-#line 1430 "CameraTable.c"
-					const gchar* _tmp20_ = NULL;
+#line 1436 "CameraTable.c"
+					const gchar* _tmp20_;
 #line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp20_ = usb_camera;
 #line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1437,7 +1443,7 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 					_g_free0 (usb_camera);
 #line 188 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					continue;
-#line 1440 "CameraTable.c"
+#line 1446 "CameraTable.c"
 				}
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp22_ = bus;
@@ -1445,28 +1451,28 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 				_tmp23_ = camera_bus;
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp22_ == _tmp23_) {
-#line 1448 "CameraTable.c"
-					gint _tmp24_ = 0;
-					gint _tmp25_ = 0;
+#line 1454 "CameraTable.c"
+					gint _tmp24_;
+					gint _tmp25_;
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp24_ = device;
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp25_ = camera_device;
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp21_ = _tmp24_ == _tmp25_;
-#line 1457 "CameraTable.c"
+#line 1463 "CameraTable.c"
 				} else {
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp21_ = FALSE;
-#line 1461 "CameraTable.c"
+#line 1467 "CameraTable.c"
 				}
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp21_) {
-#line 1465 "CameraTable.c"
-					const gchar* _tmp26_ = NULL;
-					gchar* _tmp27_ = NULL;
-					const gchar* _tmp28_ = NULL;
-					const gchar* _tmp29_ = NULL;
+#line 1471 "CameraTable.c"
+					const gchar* _tmp26_;
+					gchar* _tmp27_;
+					const gchar* _tmp28_;
+					const gchar* _tmp29_;
 #line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp26_ = port;
 #line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1489,19 +1495,19 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 					if (full_port) {
 #line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						*full_port = _vala_full_port;
-#line 1492 "CameraTable.c"
+#line 1498 "CameraTable.c"
 					} else {
 #line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (_vala_full_port);
-#line 1496 "CameraTable.c"
+#line 1502 "CameraTable.c"
 					}
 #line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return result;
-#line 1500 "CameraTable.c"
+#line 1506 "CameraTable.c"
 				}
 #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (usb_camera);
-#line 1504 "CameraTable.c"
+#line 1510 "CameraTable.c"
 			}
 		}
 	}
@@ -1516,22 +1522,22 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 	if (full_port) {
 #line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*full_port = _vala_full_port;
-#line 1518 "CameraTable.c"
+#line 1524 "CameraTable.c"
 	} else {
 #line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_free0 (_vala_full_port);
-#line 1522 "CameraTable.c"
+#line 1528 "CameraTable.c"
 	}
 #line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 1526 "CameraTable.c"
+#line 1532 "CameraTable.c"
 }
 
 
 gchar* camera_table_get_port_uri (const gchar* port) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 205 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (port != NULL, NULL);
 #line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1542,50 +1548,50 @@ gchar* camera_table_get_port_uri (const gchar* port) {
 	result = _tmp1_;
 #line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 1544 "CameraTable.c"
+#line 1550 "CameraTable.c"
 }
 
 
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 1567 "CameraTable.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1573 "CameraTable.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1575 "CameraTable.c"
+#line 1581 "CameraTable.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1587 "CameraTable.c"
+#line 1593 "CameraTable.c"
 	}
 }
 
@@ -1594,242 +1600,284 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 1611 "CameraTable.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1617 "CameraTable.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1617 "CameraTable.c"
+#line 1623 "CameraTable.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 1621 "CameraTable.c"
+#line 1627 "CameraTable.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 1625 "CameraTable.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1631 "CameraTable.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 1637 "CameraTable.c"
+#line 1643 "CameraTable.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 1647 "CameraTable.c"
+#line 1653 "CameraTable.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 1653 "CameraTable.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1659 "CameraTable.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1667 "CameraTable.c"
+#line 1673 "CameraTable.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1677 "CameraTable.c"
+#line 1683 "CameraTable.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 1683 "CameraTable.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1689 "CameraTable.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 1692 "CameraTable.c"
+#line 1698 "CameraTable.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1712 "CameraTable.c"
+#line 1718 "CameraTable.c"
 }
 
 
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 1725 "CameraTable.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 1737 "CameraTable.c"
+	} else {
+		const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 1744 "CameraTable.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = TRUE;
+#line 1750 "CameraTable.c"
+	} else {
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 1760 "CameraTable.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 1764 "CameraTable.c"
+		gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 1772 "CameraTable.c"
+	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GRegex* _tmp9_;
+		GRegex* _tmp10_;
+		gchar* _tmp11_ = NULL;
+		GRegex* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1756 "CameraTable.c"
-				goto __catch59_g_regex_error;
+#line 1804 "CameraTable.c"
+				goto __catch60_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 1765 "CameraTable.c"
+#line 1813 "CameraTable.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1781 "CameraTable.c"
-				goto __catch59_g_regex_error;
+#line 1829 "CameraTable.c"
+				goto __catch60_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 1792 "CameraTable.c"
+#line 1840 "CameraTable.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1806 "CameraTable.c"
+#line 1854 "CameraTable.c"
 	}
-	goto __finally59;
-	__catch59_g_regex_error:
+	goto __finally60;
+	__catch60_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 1820 "CameraTable.c"
+#line 1868 "CameraTable.c"
 	}
-	__finally59:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	__finally60:
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 1831 "CameraTable.c"
+#line 1879 "CameraTable.c"
 	}
 }
 
@@ -1837,8 +1885,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 gchar* camera_table_get_port_path (const gchar* port) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 209 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (port != NULL, NULL);
 #line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1847,13 +1895,13 @@ gchar* camera_table_get_port_path (const gchar* port) {
 	_tmp2_ = g_str_has_prefix (_tmp1_, "usb:");
 #line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (_tmp2_) {
-#line 1849 "CameraTable.c"
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
+#line 1897 "CameraTable.c"
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
 #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp3_ = port;
 #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1874,26 +1922,26 @@ gchar* camera_table_get_port_path (const gchar* port) {
 		_g_free0 (_tmp7_);
 #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_free0 (_tmp5_);
-#line 1876 "CameraTable.c"
+#line 1924 "CameraTable.c"
 	} else {
 #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_free0 (_tmp0_);
 #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp0_ = NULL;
-#line 1882 "CameraTable.c"
+#line 1930 "CameraTable.c"
 	}
 #line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	result = _tmp0_;
 #line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 1888 "CameraTable.c"
+#line 1936 "CameraTable.c"
 }
 
 
 static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uuid) {
 	gchar* result = NULL;
-	GVolumeMonitor* _tmp0_ = NULL;
-	GList* _tmp1_ = NULL;
+	GVolumeMonitor* _tmp0_;
+	GList* _tmp1_;
 #line 215 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL);
 #line 215 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1902,7 +1950,7 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
 	_tmp0_ = self->priv->volume_monitor;
 #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp1_ = g_volume_monitor_get_volumes (_tmp0_);
-#line 1904 "CameraTable.c"
+#line 1952 "CameraTable.c"
 	{
 		GList* volume_collection = NULL;
 		GList* volume_it = NULL;
@@ -1910,20 +1958,20 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
 		volume_collection = _tmp1_;
 #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		for (volume_it = volume_collection; volume_it != NULL; volume_it = volume_it->next) {
-#line 1912 "CameraTable.c"
-			GVolume* _tmp2_ = NULL;
+#line 1960 "CameraTable.c"
+			GVolume* _tmp2_;
 			GVolume* volume = NULL;
 #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp2_ = _g_object_ref0 ((GVolume*) volume_it->data);
 #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			volume = _tmp2_;
-#line 1919 "CameraTable.c"
+#line 1967 "CameraTable.c"
 			{
-				GVolume* _tmp3_ = NULL;
-				gchar* _tmp4_ = NULL;
-				gchar* _tmp5_ = NULL;
-				const gchar* _tmp6_ = NULL;
-				gboolean _tmp7_ = FALSE;
+				GVolume* _tmp3_;
+				gchar* _tmp4_;
+				gchar* _tmp5_;
+				const gchar* _tmp6_;
+				gboolean _tmp7_;
 #line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp3_ = volume;
 #line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1938,9 +1986,9 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
 				_g_free0 (_tmp5_);
 #line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp7_) {
-#line 1940 "CameraTable.c"
-					GVolume* _tmp8_ = NULL;
-					gchar* _tmp9_ = NULL;
+#line 1988 "CameraTable.c"
+					GVolume* _tmp8_;
+					gchar* _tmp9_;
 #line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp8_ = volume;
 #line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1953,29 +2001,29 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
 					__g_list_free__g_object_unref0_0 (volume_collection);
 #line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return result;
-#line 1955 "CameraTable.c"
+#line 2003 "CameraTable.c"
 				}
 #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_object_unref0 (volume);
-#line 1959 "CameraTable.c"
+#line 2007 "CameraTable.c"
 			}
 		}
 #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		__g_list_free__g_object_unref0_0 (volume_collection);
-#line 1964 "CameraTable.c"
+#line 2012 "CameraTable.c"
 	}
 #line 221 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	result = NULL;
 #line 221 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 1970 "CameraTable.c"
+#line 2018 "CameraTable.c"
 }
 
 
 static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uuid) {
 	gchar* result = NULL;
-	GVolumeMonitor* _tmp0_ = NULL;
-	GList* _tmp1_ = NULL;
+	GVolumeMonitor* _tmp0_;
+	GList* _tmp1_;
 #line 224 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL);
 #line 224 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1984,7 +2032,7 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
 	_tmp0_ = self->priv->volume_monitor;
 #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp1_ = g_volume_monitor_get_volumes (_tmp0_);
-#line 1986 "CameraTable.c"
+#line 2034 "CameraTable.c"
 	{
 		GList* volume_collection = NULL;
 		GList* volume_it = NULL;
@@ -1992,20 +2040,20 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
 		volume_collection = _tmp1_;
 #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		for (volume_it = volume_collection; volume_it != NULL; volume_it = volume_it->next) {
-#line 1994 "CameraTable.c"
-			GVolume* _tmp2_ = NULL;
+#line 2042 "CameraTable.c"
+			GVolume* _tmp2_;
 			GVolume* volume = NULL;
 #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp2_ = _g_object_ref0 ((GVolume*) volume_it->data);
 #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			volume = _tmp2_;
-#line 2001 "CameraTable.c"
+#line 2049 "CameraTable.c"
 			{
-				GVolume* _tmp3_ = NULL;
-				gchar* _tmp4_ = NULL;
-				gchar* _tmp5_ = NULL;
-				const gchar* _tmp6_ = NULL;
-				gboolean _tmp7_ = FALSE;
+				GVolume* _tmp3_;
+				gchar* _tmp4_;
+				gchar* _tmp5_;
+				const gchar* _tmp6_;
+				gboolean _tmp7_;
 #line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp3_ = volume;
 #line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2020,12 +2068,12 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
 				_g_free0 (_tmp5_);
 #line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp7_) {
-#line 2022 "CameraTable.c"
-					GVolume* _tmp8_ = NULL;
-					GIcon* _tmp9_ = NULL;
-					GIcon* _tmp10_ = NULL;
-					gchar* _tmp11_ = NULL;
-					gchar* _tmp12_ = NULL;
+#line 2070 "CameraTable.c"
+					GVolume* _tmp8_;
+					GIcon* _tmp9_;
+					GIcon* _tmp10_;
+					gchar* _tmp11_;
+					gchar* _tmp12_;
 #line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp8_ = volume;
 #line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2046,76 +2094,76 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
 					__g_list_free__g_object_unref0_0 (volume_collection);
 #line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return result;
-#line 2048 "CameraTable.c"
+#line 2096 "CameraTable.c"
 				}
 #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_object_unref0 (volume);
-#line 2052 "CameraTable.c"
+#line 2100 "CameraTable.c"
 			}
 		}
 #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		__g_list_free__g_object_unref0_0 (volume_collection);
-#line 2057 "CameraTable.c"
+#line 2105 "CameraTable.c"
 	}
 #line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	result = NULL;
 #line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 2063 "CameraTable.c"
+#line 2111 "CameraTable.c"
 }
 
 
 static gpointer _discovered_camera_ref0 (gpointer self) {
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return self ? discovered_camera_ref (self) : NULL;
-#line 2070 "CameraTable.c"
+#line 2118 "CameraTable.c"
 }
 
 
-static void _vala_array_add67 (DiscoveredCamera*** array, int* length, int* size, DiscoveredCamera* value) {
+static void _vala_array_add67 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value) {
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if ((*length) == (*size)) {
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*array = g_renew (DiscoveredCamera*, *array, (*size) + 1);
-#line 2081 "CameraTable.c"
+#line 2129 "CameraTable.c"
 	}
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	(*array)[(*length)++] = value;
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	(*array)[*length] = NULL;
-#line 2087 "CameraTable.c"
+#line 2135 "CameraTable.c"
 }
 
 
 static void camera_table_update_camera_table (CameraTable* self, GError** error) {
 	GPPortInfoList* port_info_list = NULL;
 	GPPortInfoList* _tmp0_ = NULL;
-	int _tmp1_ = 0;
-	GPPortInfoList* _tmp2_ = NULL;
-	int _tmp3_ = 0;
+	int _tmp1_;
+	GPPortInfoList* _tmp2_;
+	int _tmp3_;
 	CameraList* camera_list = NULL;
 	CameraList* _tmp4_ = NULL;
-	int _tmp5_ = 0;
-	CameraAbilitiesList* _tmp6_ = NULL;
-	GPPortInfoList* _tmp7_ = NULL;
-	CameraList* _tmp8_ = NULL;
-	GPContext* _tmp9_ = NULL;
-	int _tmp10_ = 0;
+	int _tmp5_;
+	CameraAbilitiesList* _tmp6_;
+	GPPortInfoList* _tmp7_;
+	CameraList* _tmp8_;
+	GPContext* _tmp9_;
+	int _tmp10_;
 	GeeHashMap* detected_map = NULL;
-	GeeHashMap* _tmp11_ = NULL;
+	GeeHashMap* _tmp11_;
 	gchar** usb_cameras = NULL;
-	gint _tmp12_ = 0;
-	gchar** _tmp13_ = NULL;
-	gint usb_cameras_length1 = 0;
-	gint _usb_cameras_size_ = 0;
+	gint _tmp12_;
+	gchar** _tmp13_;
+	gint usb_cameras_length1;
+	gint _usb_cameras_size_;
 	DiscoveredCamera** missing = NULL;
-	DiscoveredCamera** _tmp47_ = NULL;
-	gint missing_length1 = 0;
-	gint _missing_size_ = 0;
-	DiscoveredCamera** _tmp80_ = NULL;
-	gint _tmp80__length1 = 0;
+	DiscoveredCamera** _tmp47_;
+	gint missing_length1;
+	gint _missing_size_;
+	DiscoveredCamera** _tmp80_;
+	gint _tmp80__length1;
 	GError * _inner_error_ = NULL;
 #line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (IS_CAMERA_TABLE (self));
@@ -2137,7 +2185,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_gp_port_info_list_free0 (port_info_list);
 #line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2139 "CameraTable.c"
+#line 2187 "CameraTable.c"
 		} else {
 #line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_port_info_list_free0 (port_info_list);
@@ -2147,7 +2195,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			g_clear_error (&_inner_error_);
 #line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2149 "CameraTable.c"
+#line 2197 "CameraTable.c"
 		}
 	}
 #line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2166,7 +2214,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_gp_port_info_list_free0 (port_info_list);
 #line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2168 "CameraTable.c"
+#line 2216 "CameraTable.c"
 		} else {
 #line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_port_info_list_free0 (port_info_list);
@@ -2176,7 +2224,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			g_clear_error (&_inner_error_);
 #line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2178 "CameraTable.c"
+#line 2226 "CameraTable.c"
 		}
 	}
 #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2199,7 +2247,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_gp_port_info_list_free0 (port_info_list);
 #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2201 "CameraTable.c"
+#line 2249 "CameraTable.c"
 		} else {
 #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_list_unref0 (camera_list);
@@ -2211,7 +2259,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			g_clear_error (&_inner_error_);
 #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2213 "CameraTable.c"
+#line 2261 "CameraTable.c"
 		}
 	}
 #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2238,7 +2286,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_gp_port_info_list_free0 (port_info_list);
 #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2240 "CameraTable.c"
+#line 2288 "CameraTable.c"
 		} else {
 #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_list_unref0 (camera_list);
@@ -2250,7 +2298,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			g_clear_error (&_inner_error_);
 #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2252 "CameraTable.c"
+#line 2300 "CameraTable.c"
 		}
 	}
 #line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2265,53 +2313,53 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 	usb_cameras_length1 = _tmp12_;
 #line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_usb_cameras_size_ = usb_cameras_length1;
-#line 2267 "CameraTable.c"
+#line 2315 "CameraTable.c"
 	{
 		gint ctr = 0;
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		ctr = 0;
-#line 2272 "CameraTable.c"
+#line 2320 "CameraTable.c"
 		{
 			gboolean _tmp14_ = FALSE;
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp14_ = TRUE;
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			while (TRUE) {
-#line 2279 "CameraTable.c"
-				gint _tmp16_ = 0;
-				CameraList* _tmp17_ = NULL;
-				gint _tmp18_ = 0;
+#line 2327 "CameraTable.c"
+				gint _tmp16_;
+				CameraList* _tmp17_;
+				gint _tmp18_;
 				gchar* name = NULL;
-				CameraList* _tmp19_ = NULL;
-				gint _tmp20_ = 0;
+				CameraList* _tmp19_;
+				gint _tmp20_;
 				const gchar* _tmp21_ = NULL;
-				int _tmp22_ = 0;
-				gchar* _tmp23_ = NULL;
+				int _tmp22_;
+				gchar* _tmp23_;
 				gchar* port = NULL;
-				CameraList* _tmp24_ = NULL;
-				gint _tmp25_ = 0;
+				CameraList* _tmp24_;
+				gint _tmp25_;
 				const gchar* _tmp26_ = NULL;
-				int _tmp27_ = 0;
-				gchar* _tmp28_ = NULL;
-				gint _tmp29_ = 0;
-				CameraList* _tmp30_ = NULL;
-				gint _tmp31_ = 0;
-				const gchar* _tmp32_ = NULL;
-				const gchar* _tmp33_ = NULL;
-				const gchar* _tmp34_ = NULL;
-				gboolean _tmp35_ = FALSE;
-				GeeHashMap* _tmp44_ = NULL;
-				const gchar* _tmp45_ = NULL;
-				const gchar* _tmp46_ = NULL;
+				int _tmp27_;
+				gchar* _tmp28_;
+				gint _tmp29_;
+				CameraList* _tmp30_;
+				gint _tmp31_;
+				const gchar* _tmp32_;
+				const gchar* _tmp33_;
+				const gchar* _tmp34_;
+				gboolean _tmp35_;
+				GeeHashMap* _tmp44_;
+				const gchar* _tmp45_;
+				const gchar* _tmp46_;
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (!_tmp14_) {
-#line 2307 "CameraTable.c"
-					gint _tmp15_ = 0;
+#line 2355 "CameraTable.c"
+					gint _tmp15_;
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp15_ = ctr;
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					ctr = _tmp15_ + 1;
-#line 2313 "CameraTable.c"
+#line 2361 "CameraTable.c"
 				}
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp14_ = FALSE;
@@ -2325,7 +2373,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 				if (!(_tmp16_ < _tmp18_)) {
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					break;
-#line 2327 "CameraTable.c"
+#line 2375 "CameraTable.c"
 				}
 #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp19_ = camera_list;
@@ -2359,7 +2407,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						_gp_port_info_list_free0 (port_info_list);
 #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2361 "CameraTable.c"
+#line 2409 "CameraTable.c"
 					} else {
 #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (name);
@@ -2377,7 +2425,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						g_clear_error (&_inner_error_);
 #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2379 "CameraTable.c"
+#line 2427 "CameraTable.c"
 					}
 				}
 #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2414,7 +2462,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						_gp_port_info_list_free0 (port_info_list);
 #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2416 "CameraTable.c"
+#line 2464 "CameraTable.c"
 					} else {
 #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (port);
@@ -2434,7 +2482,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						g_clear_error (&_inner_error_);
 #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2436 "CameraTable.c"
+#line 2484 "CameraTable.c"
 					}
 				}
 #line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2455,17 +2503,17 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 				_tmp35_ = g_str_has_prefix (_tmp34_, "usb:");
 #line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp35_) {
-#line 2457 "CameraTable.c"
+#line 2505 "CameraTable.c"
 					gchar* full_port = NULL;
-					CameraList* _tmp36_ = NULL;
-					gint _tmp37_ = 0;
-					gchar** _tmp38_ = NULL;
-					gint _tmp38__length1 = 0;
-					const gchar* _tmp39_ = NULL;
+					CameraList* _tmp36_;
+					gint _tmp37_;
+					gchar** _tmp38_;
+					gint _tmp38__length1;
+					const gchar* _tmp39_;
 					gchar* _tmp40_ = NULL;
-					gboolean _tmp41_ = FALSE;
-					const gchar* _tmp42_ = NULL;
-					gchar* _tmp43_ = NULL;
+					gboolean _tmp41_;
+					const gchar* _tmp42_;
+					gchar* _tmp43_;
 #line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp36_ = camera_list;
 #line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2492,7 +2540,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						_g_free0 (name);
 #line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						continue;
-#line 2494 "CameraTable.c"
+#line 2542 "CameraTable.c"
 					}
 #line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp42_ = full_port;
@@ -2504,7 +2552,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					port = _tmp43_;
 #line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (full_port);
-#line 2506 "CameraTable.c"
+#line 2554 "CameraTable.c"
 				}
 #line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp44_ = detected_map;
@@ -2518,7 +2566,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 				_g_free0 (port);
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (name);
-#line 2520 "CameraTable.c"
+#line 2568 "CameraTable.c"
 			}
 		}
 	}
@@ -2530,15 +2578,15 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 	missing_length1 = 0;
 #line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_missing_size_ = missing_length1;
-#line 2532 "CameraTable.c"
+#line 2580 "CameraTable.c"
 	{
 		GeeIterator* _camera_it = NULL;
-		GeeHashMap* _tmp48_ = NULL;
-		GeeCollection* _tmp49_ = NULL;
-		GeeCollection* _tmp50_ = NULL;
-		GeeCollection* _tmp51_ = NULL;
-		GeeIterator* _tmp52_ = NULL;
-		GeeIterator* _tmp53_ = NULL;
+		GeeHashMap* _tmp48_;
+		GeeCollection* _tmp49_;
+		GeeCollection* _tmp50_;
+		GeeCollection* _tmp51_;
+		GeeIterator* _tmp52_;
+		GeeIterator* _tmp53_;
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp48_ = self->priv->camera_map;
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2557,35 +2605,35 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 		_camera_it = _tmp53_;
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		while (TRUE) {
-#line 2559 "CameraTable.c"
-			GeeIterator* _tmp54_ = NULL;
-			gboolean _tmp55_ = FALSE;
+#line 2607 "CameraTable.c"
+			GeeIterator* _tmp54_;
+			gboolean _tmp55_;
 			DiscoveredCamera* camera = NULL;
-			GeeIterator* _tmp56_ = NULL;
-			gpointer _tmp57_ = NULL;
+			GeeIterator* _tmp56_;
+			gpointer _tmp57_;
 			GPPortInfo port_info = {0};
 			gchar* tmp_path = NULL;
-			DiscoveredCamera* _tmp58_ = NULL;
-			Camera* _tmp59_ = NULL;
+			DiscoveredCamera* _tmp58_;
+			Camera* _tmp59_;
 			GPPortInfo _tmp60_ = {0};
-			int _tmp61_ = 0;
+			int _tmp61_;
 			const gchar* _tmp62_ = NULL;
-			gchar* _tmp63_ = NULL;
+			gchar* _tmp63_;
 			CameraAbilities abilities = {0};
-			DiscoveredCamera* _tmp64_ = NULL;
-			Camera* _tmp65_ = NULL;
+			DiscoveredCamera* _tmp64_;
+			Camera* _tmp65_;
 			CameraAbilities _tmp66_ = {0};
-			int _tmp67_ = 0;
-			GeeHashMap* _tmp68_ = NULL;
-			const gchar* _tmp69_ = NULL;
-			gboolean _tmp70_ = FALSE;
-			CameraAbilities _tmp74_ = {0};
-			const gchar* _tmp75_ = NULL;
-			const gchar* _tmp76_ = NULL;
-			DiscoveredCamera** _tmp77_ = NULL;
-			gint _tmp77__length1 = 0;
-			DiscoveredCamera* _tmp78_ = NULL;
-			DiscoveredCamera* _tmp79_ = NULL;
+			int _tmp67_;
+			GeeHashMap* _tmp68_;
+			const gchar* _tmp69_;
+			gboolean _tmp70_;
+			CameraAbilities _tmp74_;
+			const gchar* _tmp75_;
+			const gchar* _tmp76_;
+			DiscoveredCamera** _tmp77_;
+			gint _tmp77__length1;
+			DiscoveredCamera* _tmp78_;
+			DiscoveredCamera* _tmp79_;
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp54_ = _camera_it;
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2594,7 +2642,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			if (!_tmp55_) {
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				break;
-#line 2596 "CameraTable.c"
+#line 2644 "CameraTable.c"
 			}
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp56_ = _camera_it;
@@ -2640,7 +2688,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					_gp_port_info_list_free0 (port_info_list);
 #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 2642 "CameraTable.c"
+#line 2690 "CameraTable.c"
 				} else {
 #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
@@ -2666,7 +2714,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					g_clear_error (&_inner_error_);
 #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 2668 "CameraTable.c"
+#line 2716 "CameraTable.c"
 				}
 			}
 #line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2717,7 +2765,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					_gp_port_info_list_free0 (port_info_list);
 #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 2719 "CameraTable.c"
+#line 2767 "CameraTable.c"
 				} else {
 #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (abilities);
@@ -2745,7 +2793,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					g_clear_error (&_inner_error_);
 #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 2747 "CameraTable.c"
+#line 2795 "CameraTable.c"
 				}
 			}
 #line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2756,10 +2804,10 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_tmp70_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp69_);
 #line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_tmp70_) {
-#line 2758 "CameraTable.c"
-				CameraAbilities _tmp71_ = {0};
-				const gchar* _tmp72_ = NULL;
-				const gchar* _tmp73_ = NULL;
+#line 2806 "CameraTable.c"
+				CameraAbilities _tmp71_;
+				const gchar* _tmp72_;
+				const gchar* _tmp73_;
 #line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp71_ = abilities;
 #line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2778,7 +2826,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 				_discovered_camera_unref0 (camera);
 #line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				continue;
-#line 2780 "CameraTable.c"
+#line 2828 "CameraTable.c"
 			}
 #line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp74_ = abilities;
@@ -2806,17 +2854,17 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			 (port_info);
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_discovered_camera_unref0 (camera);
-#line 2808 "CameraTable.c"
+#line 2856 "CameraTable.c"
 		}
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_object_unref0 (_camera_it);
-#line 2812 "CameraTable.c"
+#line 2860 "CameraTable.c"
 	}
 #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp80_ = missing;
 #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp80__length1 = missing_length1;
-#line 2818 "CameraTable.c"
+#line 2866 "CameraTable.c"
 	{
 		DiscoveredCamera** camera_collection = NULL;
 		gint camera_collection_length1 = 0;
@@ -2828,36 +2876,36 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 		camera_collection_length1 = _tmp80__length1;
 #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		for (camera_it = 0; camera_it < _tmp80__length1; camera_it = camera_it + 1) {
-#line 2830 "CameraTable.c"
-			DiscoveredCamera* _tmp81_ = NULL;
+#line 2878 "CameraTable.c"
+			DiscoveredCamera* _tmp81_;
 			DiscoveredCamera* camera = NULL;
 #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp81_ = _discovered_camera_ref0 (camera_collection[camera_it]);
 #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			camera = _tmp81_;
-#line 2837 "CameraTable.c"
+#line 2885 "CameraTable.c"
 			{
 				GPPortInfo port_info = {0};
 				gchar* tmp_path = NULL;
-				DiscoveredCamera* _tmp82_ = NULL;
-				Camera* _tmp83_ = NULL;
+				DiscoveredCamera* _tmp82_;
+				Camera* _tmp83_;
 				GPPortInfo _tmp84_ = {0};
-				int _tmp85_ = 0;
+				int _tmp85_;
 				const gchar* _tmp86_ = NULL;
-				gchar* _tmp87_ = NULL;
+				gchar* _tmp87_;
 				CameraAbilities abilities = {0};
-				DiscoveredCamera* _tmp88_ = NULL;
-				Camera* _tmp89_ = NULL;
+				DiscoveredCamera* _tmp88_;
+				Camera* _tmp89_;
 				CameraAbilities _tmp90_ = {0};
-				int _tmp91_ = 0;
-				CameraAbilities _tmp92_ = {0};
-				const gchar* _tmp93_ = NULL;
-				const gchar* _tmp94_ = NULL;
-				GeeHashMap* _tmp95_ = NULL;
-				const gchar* _tmp96_ = NULL;
-				gchar* _tmp97_ = NULL;
-				gchar* _tmp98_ = NULL;
-				DiscoveredCamera* _tmp99_ = NULL;
+				int _tmp91_;
+				CameraAbilities _tmp92_;
+				const gchar* _tmp93_;
+				const gchar* _tmp94_;
+				GeeHashMap* _tmp95_;
+				const gchar* _tmp96_;
+				gchar* _tmp97_;
+				gchar* _tmp98_;
+				DiscoveredCamera* _tmp99_;
 #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp82_ = camera;
 #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2894,7 +2942,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						_gp_port_info_list_free0 (port_info_list);
 #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2896 "CameraTable.c"
+#line 2944 "CameraTable.c"
 					} else {
 #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (tmp_path);
@@ -2918,7 +2966,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						g_clear_error (&_inner_error_);
 #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2920 "CameraTable.c"
+#line 2968 "CameraTable.c"
 					}
 				}
 #line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2967,7 +3015,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						_gp_port_info_list_free0 (port_info_list);
 #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2969 "CameraTable.c"
+#line 3017 "CameraTable.c"
 					} else {
 #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						 (abilities);
@@ -2993,7 +3041,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						g_clear_error (&_inner_error_);
 #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2995 "CameraTable.c"
+#line 3043 "CameraTable.c"
 					}
 				}
 #line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3019,7 +3067,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 #line 311 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp99_ = camera;
 #line 311 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				g_signal_emit_by_name (self, "camera-removed", _tmp99_);
+				g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL], 0, _tmp99_);
 #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				 (abilities);
 #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3028,18 +3076,18 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 				 (port_info);
 #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_discovered_camera_unref0 (camera);
-#line 3030 "CameraTable.c"
+#line 3078 "CameraTable.c"
 			}
 		}
 	}
 	{
 		GeeIterator* _port_it = NULL;
-		GeeHashMap* _tmp100_ = NULL;
-		GeeSet* _tmp101_ = NULL;
-		GeeSet* _tmp102_ = NULL;
-		GeeSet* _tmp103_ = NULL;
-		GeeIterator* _tmp104_ = NULL;
-		GeeIterator* _tmp105_ = NULL;
+		GeeHashMap* _tmp100_;
+		GeeSet* _tmp101_;
+		GeeSet* _tmp102_;
+		GeeSet* _tmp103_;
+		GeeIterator* _tmp104_;
+		GeeIterator* _tmp105_;
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp100_ = detected_map;
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3058,90 +3106,90 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 		_port_it = _tmp105_;
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		while (TRUE) {
-#line 3060 "CameraTable.c"
-			GeeIterator* _tmp106_ = NULL;
-			gboolean _tmp107_ = FALSE;
+#line 3108 "CameraTable.c"
+			GeeIterator* _tmp106_;
+			gboolean _tmp107_;
 			gchar* port = NULL;
-			GeeIterator* _tmp108_ = NULL;
-			gpointer _tmp109_ = NULL;
+			GeeIterator* _tmp108_;
+			gpointer _tmp109_;
 			gchar* name = NULL;
-			GeeHashMap* _tmp110_ = NULL;
-			const gchar* _tmp111_ = NULL;
-			gpointer _tmp112_ = NULL;
+			GeeHashMap* _tmp110_;
+			const gchar* _tmp111_;
+			gpointer _tmp112_;
 			gchar* display_name = NULL;
 			gchar* icon = NULL;
 			gchar* uri = NULL;
-			const gchar* _tmp113_ = NULL;
-			gchar* _tmp114_ = NULL;
-			GeeHashMap* _tmp115_ = NULL;
-			const gchar* _tmp116_ = NULL;
-			gboolean _tmp117_ = FALSE;
+			const gchar* _tmp113_;
+			gchar* _tmp114_;
+			GeeHashMap* _tmp115_;
+			const gchar* _tmp116_;
+			gboolean _tmp117_;
 			gchar* path = NULL;
-			const gchar* _tmp120_ = NULL;
-			gchar* _tmp121_ = NULL;
-			const gchar* _tmp122_ = NULL;
-			const gchar* _tmp142_ = NULL;
+			const gchar* _tmp120_;
+			gchar* _tmp121_;
+			const gchar* _tmp122_;
+			const gchar* _tmp142_;
 			gint index = 0;
-			GPPortInfoList* _tmp145_ = NULL;
-			const gchar* _tmp146_ = NULL;
-			gint _tmp147_ = 0;
-			gint _tmp148_ = 0;
+			GPPortInfoList* _tmp145_;
+			const gchar* _tmp146_;
+			gint _tmp147_;
+			gint _tmp148_;
 			GPPortInfo port_info = {0};
 			gchar* tmp_path = NULL;
-			GPPortInfoList* _tmp153_ = NULL;
-			gint _tmp154_ = 0;
+			GPPortInfoList* _tmp153_;
+			gint _tmp154_;
 			GPPortInfo _tmp155_ = {0};
-			int _tmp156_ = 0;
-			const gchar* _tmp157_ = NULL;
-			gchar* _tmp158_ = NULL;
-			gchar* _tmp159_ = NULL;
+			int _tmp156_;
+			const gchar* _tmp157_;
+			gchar* _tmp158_;
+			gchar* _tmp159_;
 			const gchar* _tmp160_ = NULL;
-			gchar* _tmp161_ = NULL;
-			const gchar* _tmp162_ = NULL;
-			const gchar* _tmp163_ = NULL;
-			CameraAbilitiesList* _tmp164_ = NULL;
-			const gchar* _tmp165_ = NULL;
-			gint _tmp166_ = 0;
-			gint _tmp167_ = 0;
+			gchar* _tmp161_;
+			const gchar* _tmp162_;
+			const gchar* _tmp163_;
+			CameraAbilitiesList* _tmp164_;
+			const gchar* _tmp165_;
+			gint _tmp166_;
+			gint _tmp167_;
 			CameraAbilities camera_abilities = {0};
-			CameraAbilitiesList* _tmp172_ = NULL;
-			gint _tmp173_ = 0;
+			CameraAbilitiesList* _tmp172_;
+			gint _tmp173_;
 			CameraAbilities _tmp174_ = {0};
-			int _tmp175_ = 0;
-			const gchar* _tmp176_ = NULL;
-			gchar* _tmp177_ = NULL;
-			gchar* _tmp178_ = NULL;
+			int _tmp175_;
+			const gchar* _tmp176_;
+			gchar* _tmp177_;
+			gchar* _tmp178_;
 			Camera* gcamera = NULL;
 			Camera* _tmp179_ = NULL;
-			int _tmp180_ = 0;
-			const gchar* _tmp181_ = NULL;
-			gchar* _tmp182_ = NULL;
-			gchar* _tmp183_ = NULL;
-			Camera* _tmp184_ = NULL;
-			CameraAbilities _tmp185_ = {0};
-			int _tmp186_ = 0;
-			const gchar* _tmp187_ = NULL;
-			gchar* _tmp188_ = NULL;
-			gchar* _tmp189_ = NULL;
-			Camera* _tmp190_ = NULL;
-			GPPortInfo _tmp191_ = {0};
-			int _tmp192_ = 0;
-			const gchar* _tmp193_ = NULL;
-			const gchar* _tmp194_ = NULL;
-			gchar* _tmp195_ = NULL;
-			gchar* _tmp196_ = NULL;
-			const gchar* _tmp197_ = NULL;
-			const gchar* _tmp198_ = NULL;
+			int _tmp180_;
+			const gchar* _tmp181_;
+			gchar* _tmp182_;
+			gchar* _tmp183_;
+			Camera* _tmp184_;
+			CameraAbilities _tmp185_;
+			int _tmp186_;
+			const gchar* _tmp187_;
+			gchar* _tmp188_;
+			gchar* _tmp189_;
+			Camera* _tmp190_;
+			GPPortInfo _tmp191_;
+			int _tmp192_;
+			const gchar* _tmp193_;
+			const gchar* _tmp194_;
+			gchar* _tmp195_;
+			gchar* _tmp196_;
+			const gchar* _tmp197_;
+			const gchar* _tmp198_;
 			DiscoveredCamera* camera = NULL;
-			Camera* _tmp199_ = NULL;
-			const gchar* _tmp200_ = NULL;
-			const gchar* _tmp201_ = NULL;
-			const gchar* _tmp202_ = NULL;
-			DiscoveredCamera* _tmp203_ = NULL;
-			GeeHashMap* _tmp204_ = NULL;
-			const gchar* _tmp205_ = NULL;
-			DiscoveredCamera* _tmp206_ = NULL;
-			DiscoveredCamera* _tmp207_ = NULL;
+			Camera* _tmp199_;
+			const gchar* _tmp200_;
+			const gchar* _tmp201_;
+			const gchar* _tmp202_;
+			DiscoveredCamera* _tmp203_;
+			GeeHashMap* _tmp204_;
+			const gchar* _tmp205_;
+			DiscoveredCamera* _tmp206_;
+			DiscoveredCamera* _tmp207_;
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp106_ = _port_it;
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3150,7 +3198,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			if (!_tmp107_) {
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				break;
-#line 3152 "CameraTable.c"
+#line 3200 "CameraTable.c"
 			}
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp108_ = _port_it;
@@ -3184,9 +3232,9 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_tmp117_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp116_);
 #line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_tmp117_) {
-#line 3186 "CameraTable.c"
-				const gchar* _tmp118_ = NULL;
-				const gchar* _tmp119_ = NULL;
+#line 3234 "CameraTable.c"
+				const gchar* _tmp118_;
+				const gchar* _tmp119_;
 #line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp118_ = name;
 #line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3205,7 +3253,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 				_g_free0 (port);
 #line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				continue;
-#line 3207 "CameraTable.c"
+#line 3255 "CameraTable.c"
 			}
 #line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp120_ = port;
@@ -3217,18 +3265,18 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_tmp122_ = path;
 #line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (NULL != _tmp122_) {
-#line 3219 "CameraTable.c"
+#line 3267 "CameraTable.c"
 				GUdevDevice* device = NULL;
-				GUdevClient* _tmp123_ = NULL;
-				const gchar* _tmp124_ = NULL;
-				GUdevDevice* _tmp125_ = NULL;
+				GUdevClient* _tmp123_;
+				const gchar* _tmp124_;
+				GUdevDevice* _tmp125_;
 				gchar* serial = NULL;
-				GUdevDevice* _tmp126_ = NULL;
-				const gchar* _tmp127_ = NULL;
-				gchar* _tmp128_ = NULL;
-				const gchar* _tmp129_ = NULL;
-				const gchar* _tmp134_ = NULL;
-				const gchar* _tmp138_ = NULL;
+				GUdevDevice* _tmp126_;
+				const gchar* _tmp127_;
+				gchar* _tmp128_;
+				const gchar* _tmp129_;
+				const gchar* _tmp134_;
+				const gchar* _tmp138_;
 #line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp123_ = self->priv->client;
 #line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3249,11 +3297,11 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 				_tmp129_ = serial;
 #line 333 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (NULL != _tmp129_) {
-#line 3251 "CameraTable.c"
-					const gchar* _tmp130_ = NULL;
-					gchar* _tmp131_ = NULL;
-					const gchar* _tmp132_ = NULL;
-					gchar* _tmp133_ = NULL;
+#line 3299 "CameraTable.c"
+					const gchar* _tmp130_;
+					gchar* _tmp131_;
+					const gchar* _tmp132_;
+					gchar* _tmp133_;
 #line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp130_ = serial;
 #line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3270,16 +3318,16 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					_g_free0 (icon);
 #line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					icon = _tmp133_;
-#line 3272 "CameraTable.c"
+#line 3320 "CameraTable.c"
 				}
 #line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp134_ = display_name;
 #line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (NULL == _tmp134_) {
-#line 3278 "CameraTable.c"
-					GUdevDevice* _tmp135_ = NULL;
-					const gchar* _tmp136_ = NULL;
-					gchar* _tmp137_ = NULL;
+#line 3326 "CameraTable.c"
+					GUdevDevice* _tmp135_;
+					const gchar* _tmp136_;
+					gchar* _tmp137_;
 #line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp135_ = device;
 #line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3290,16 +3338,16 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					_g_free0 (display_name);
 #line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					display_name = _tmp137_;
-#line 3292 "CameraTable.c"
+#line 3340 "CameraTable.c"
 				}
 #line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp138_ = display_name;
 #line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (NULL == _tmp138_) {
-#line 3298 "CameraTable.c"
-					GUdevDevice* _tmp139_ = NULL;
-					const gchar* _tmp140_ = NULL;
-					gchar* _tmp141_ = NULL;
+#line 3346 "CameraTable.c"
+					GUdevDevice* _tmp139_;
+					const gchar* _tmp140_;
+					gchar* _tmp141_;
 #line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp139_ = device;
 #line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3310,21 +3358,21 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					_g_free0 (display_name);
 #line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					display_name = _tmp141_;
-#line 3312 "CameraTable.c"
+#line 3360 "CameraTable.c"
 				}
 #line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (serial);
 #line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_object_unref0 (device);
-#line 3318 "CameraTable.c"
+#line 3366 "CameraTable.c"
 			}
 #line 345 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp142_ = display_name;
 #line 345 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (NULL == _tmp142_) {
-#line 3324 "CameraTable.c"
-				const gchar* _tmp143_ = NULL;
-				gchar* _tmp144_ = NULL;
+#line 3372 "CameraTable.c"
+				const gchar* _tmp143_;
+				gchar* _tmp144_;
 #line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp143_ = name;
 #line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3333,7 +3381,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 				_g_free0 (display_name);
 #line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				display_name = _tmp144_;
-#line 3335 "CameraTable.c"
+#line 3383 "CameraTable.c"
 			}
 #line 350 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp145_ = port_info_list;
@@ -3347,11 +3395,11 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_tmp148_ = index;
 #line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_tmp148_ < 0) {
-#line 3349 "CameraTable.c"
-				gint _tmp149_ = 0;
-				const gchar* _tmp150_ = NULL;
-				gchar* _tmp151_ = NULL;
-				gchar* _tmp152_ = NULL;
+#line 3397 "CameraTable.c"
+				gint _tmp149_;
+				const gchar* _tmp150_;
+				gchar* _tmp151_;
+				gchar* _tmp152_;
 #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp149_ = index;
 #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3396,7 +3444,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						_gp_port_info_list_free0 (port_info_list);
 #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3398 "CameraTable.c"
+#line 3446 "CameraTable.c"
 					} else {
 #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (path);
@@ -3428,7 +3476,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						g_clear_error (&_inner_error_);
 #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3430 "CameraTable.c"
+#line 3478 "CameraTable.c"
 					}
 				}
 			}
@@ -3488,7 +3536,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					_gp_port_info_list_free0 (port_info_list);
 #line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3490 "CameraTable.c"
+#line 3538 "CameraTable.c"
 				} else {
 #line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
@@ -3524,7 +3572,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					g_clear_error (&_inner_error_);
 #line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3526 "CameraTable.c"
+#line 3574 "CameraTable.c"
 				}
 			}
 #line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3553,11 +3601,11 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_tmp167_ = index;
 #line 364 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_tmp167_ < 0) {
-#line 3555 "CameraTable.c"
-				gint _tmp168_ = 0;
-				const gchar* _tmp169_ = NULL;
-				gchar* _tmp170_ = NULL;
-				gchar* _tmp171_ = NULL;
+#line 3603 "CameraTable.c"
+				gint _tmp168_;
+				const gchar* _tmp169_;
+				gchar* _tmp170_;
+				gchar* _tmp171_;
 #line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp168_ = index;
 #line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3606,7 +3654,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						_gp_port_info_list_free0 (port_info_list);
 #line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3608 "CameraTable.c"
+#line 3656 "CameraTable.c"
 					} else {
 #line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (tmp_path);
@@ -3642,7 +3690,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						g_clear_error (&_inner_error_);
 #line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3644 "CameraTable.c"
+#line 3692 "CameraTable.c"
 					}
 				}
 			}
@@ -3704,7 +3752,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					_gp_port_info_list_free0 (port_info_list);
 #line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3706 "CameraTable.c"
+#line 3754 "CameraTable.c"
 				} else {
 #line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
@@ -3742,7 +3790,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					g_clear_error (&_inner_error_);
 #line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3744 "CameraTable.c"
+#line 3792 "CameraTable.c"
 				}
 			}
 #line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3801,7 +3849,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					_gp_port_info_list_free0 (port_info_list);
 #line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3803 "CameraTable.c"
+#line 3851 "CameraTable.c"
 				} else {
 #line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
@@ -3841,7 +3889,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					g_clear_error (&_inner_error_);
 #line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3843 "CameraTable.c"
+#line 3891 "CameraTable.c"
 				}
 			}
 #line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3900,7 +3948,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					_gp_port_info_list_free0 (port_info_list);
 #line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3902 "CameraTable.c"
+#line 3950 "CameraTable.c"
 				} else {
 #line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
@@ -3940,7 +3988,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					g_clear_error (&_inner_error_);
 #line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3942 "CameraTable.c"
+#line 3990 "CameraTable.c"
 				}
 			}
 #line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4001,7 +4049,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					_gp_port_info_list_free0 (port_info_list);
 #line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 4003 "CameraTable.c"
+#line 4051 "CameraTable.c"
 				} else {
 #line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
@@ -4041,7 +4089,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					g_clear_error (&_inner_error_);
 #line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 4043 "CameraTable.c"
+#line 4091 "CameraTable.c"
 				}
 			}
 #line 376 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4073,7 +4121,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 #line 381 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp207_ = camera;
 #line 381 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			g_signal_emit_by_name (self, "camera-added", _tmp207_);
+			g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL], 0, _tmp207_);
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_discovered_camera_unref0 (camera);
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4096,11 +4144,11 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_g_free0 (name);
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (port);
-#line 4098 "CameraTable.c"
+#line 4146 "CameraTable.c"
 		}
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_object_unref0 (_port_it);
-#line 4102 "CameraTable.c"
+#line 4150 "CameraTable.c"
 	}
 #line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
@@ -4112,15 +4160,15 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 	_gp_list_unref0 (camera_list);
 #line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_gp_port_info_list_free0 (port_info_list);
-#line 4114 "CameraTable.c"
+#line 4162 "CameraTable.c"
 }
 
 
 static void camera_table_on_udev_event (CameraTable* self, const gchar* action, GUdevDevice* device) {
-	const gchar* _tmp0_ = NULL;
-	GUdevDevice* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	OneShotScheduler* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	GUdevDevice* _tmp1_;
+	const gchar* _tmp2_;
+	OneShotScheduler* _tmp3_;
 #line 385 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (IS_CAMERA_TABLE (self));
 #line 385 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4139,12 +4187,12 @@ static void camera_table_on_udev_event (CameraTable* self, const gchar* action,
 	_tmp3_ = self->priv->camera_update_scheduler;
 #line 390 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	one_shot_scheduler_after_timeout (_tmp3_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4141 "CameraTable.c"
+#line 4189 "CameraTable.c"
 }
 
 
 void camera_table_on_volume_changed (CameraTable* self, GVolume* volume) {
-	OneShotScheduler* _tmp0_ = NULL;
+	OneShotScheduler* _tmp0_;
 #line 393 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (IS_CAMERA_TABLE (self));
 #line 393 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4153,7 +4201,7 @@ void camera_table_on_volume_changed (CameraTable* self, GVolume* volume) {
 	_tmp0_ = self->priv->camera_update_scheduler;
 #line 394 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	one_shot_scheduler_after_timeout (_tmp0_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4155 "CameraTable.c"
+#line 4203 "CameraTable.c"
 }
 
 
@@ -4161,10 +4209,10 @@ static void camera_table_on_update_cameras (CameraTable* self) {
 	GError * _inner_error_ = NULL;
 #line 397 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 4163 "CameraTable.c"
+#line 4211 "CameraTable.c"
 	{
-		CameraTable* _tmp0_ = NULL;
-		CameraTable* _tmp1_ = NULL;
+		CameraTable* _tmp0_;
+		CameraTable* _tmp1_;
 #line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp0_ = camera_table_get_instance ();
 #line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4177,8 +4225,8 @@ static void camera_table_on_update_cameras (CameraTable* self) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 4179 "CameraTable.c"
-				goto __catch60_gphoto_error;
+#line 4227 "CameraTable.c"
+				goto __catch61_gphoto_error;
 			}
 #line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4186,15 +4234,15 @@ static void camera_table_on_update_cameras (CameraTable* self) {
 			g_clear_error (&_inner_error_);
 #line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 4188 "CameraTable.c"
+#line 4236 "CameraTable.c"
 		}
 	}
-	goto __finally60;
-	__catch60_gphoto_error:
+	goto __finally61;
+	__catch61_gphoto_error:
 	{
 		GError* err = NULL;
-		GError* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
+		GError* _tmp2_;
+		const gchar* _tmp3_;
 #line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		err = _inner_error_;
 #line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4207,9 +4255,9 @@ static void camera_table_on_update_cameras (CameraTable* self) {
 		g_warning ("CameraTable.vala:401: Error updating camera table: %s", _tmp3_);
 #line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_error_free0 (err);
-#line 4209 "CameraTable.c"
+#line 4257 "CameraTable.c"
 	}
-	__finally60:
+	__finally61:
 #line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4218,7 +4266,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
 		g_clear_error (&_inner_error_);
 #line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return;
-#line 4220 "CameraTable.c"
+#line 4268 "CameraTable.c"
 	}
 }
 
@@ -4238,26 +4286,26 @@ static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure,
 		data1 = closure->data;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4240 "CameraTable.c"
+#line 4288 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		data2 = closure->data;
-#line 4246 "CameraTable.c"
+#line 4294 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	callback = (GMarshalFunc_VOID__DISCOVERED_CAMERA) (marshal_data ? marshal_data : cc->callback);
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	callback (data1, value_get_discovered_camera (param_values + 1), data2);
-#line 4252 "CameraTable.c"
+#line 4300 "CameraTable.c"
 }
 
 
 static void value_camera_table_init (GValue* value) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	value->data[0].v_pointer = NULL;
-#line 4259 "CameraTable.c"
+#line 4307 "CameraTable.c"
 }
 
 
@@ -4266,7 +4314,7 @@ static void value_camera_table_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_unref (value->data[0].v_pointer);
-#line 4268 "CameraTable.c"
+#line 4316 "CameraTable.c"
 	}
 }
 
@@ -4276,11 +4324,11 @@ static void value_camera_table_copy_value (const GValue* src_value, GValue* dest
 	if (src_value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		dest_value->data[0].v_pointer = camera_table_ref (src_value->data[0].v_pointer);
-#line 4278 "CameraTable.c"
+#line 4326 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4282 "CameraTable.c"
+#line 4330 "CameraTable.c"
 	}
 }
 
@@ -4288,66 +4336,66 @@ static void value_camera_table_copy_value (const GValue* src_value, GValue* dest
 static gpointer value_camera_table_peek_pointer (const GValue* value) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return value->data[0].v_pointer;
-#line 4290 "CameraTable.c"
+#line 4338 "CameraTable.c"
 }
 
 
 static gchar* value_camera_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (collect_values[0].v_pointer) {
-#line 4297 "CameraTable.c"
-		CameraTable* object;
+#line 4345 "CameraTable.c"
+		CameraTable * object;
 		object = collect_values[0].v_pointer;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4304 "CameraTable.c"
+#line 4352 "CameraTable.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4308 "CameraTable.c"
+#line 4356 "CameraTable.c"
 		}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = camera_table_ref (object);
-#line 4312 "CameraTable.c"
+#line 4360 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 4316 "CameraTable.c"
+#line 4364 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return NULL;
-#line 4320 "CameraTable.c"
+#line 4368 "CameraTable.c"
 }
 
 
 static gchar* value_camera_table_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	CameraTable** object_p;
+	CameraTable ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (!object_p) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4331 "CameraTable.c"
+#line 4379 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (!value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = NULL;
-#line 4337 "CameraTable.c"
+#line 4385 "CameraTable.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4341 "CameraTable.c"
+#line 4389 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = camera_table_ref (value->data[0].v_pointer);
-#line 4345 "CameraTable.c"
+#line 4393 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return NULL;
-#line 4349 "CameraTable.c"
+#line 4397 "CameraTable.c"
 }
 
 
@@ -4361,7 +4409,7 @@ GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return G_PARAM_SPEC (spec);
-#line 4363 "CameraTable.c"
+#line 4411 "CameraTable.c"
 }
 
 
@@ -4370,12 +4418,12 @@ gpointer value_get_camera_table (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CAMERA_TABLE), NULL);
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return value->data[0].v_pointer;
-#line 4372 "CameraTable.c"
+#line 4420 "CameraTable.c"
 }
 
 
 void value_set_camera_table (GValue* value, gpointer v_object) {
-	CameraTable* old;
+	CameraTable * old;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CAMERA_TABLE));
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4390,23 +4438,23 @@ void value_set_camera_table (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_ref (value->data[0].v_pointer);
-#line 4392 "CameraTable.c"
+#line 4440 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 4396 "CameraTable.c"
+#line 4444 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (old) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_unref (old);
-#line 4402 "CameraTable.c"
+#line 4450 "CameraTable.c"
 	}
 }
 
 
 void value_take_camera_table (GValue* value, gpointer v_object) {
-	CameraTable* old;
+	CameraTable * old;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CAMERA_TABLE));
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4419,17 +4467,17 @@ void value_take_camera_table (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = v_object;
-#line 4421 "CameraTable.c"
+#line 4469 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 4425 "CameraTable.c"
+#line 4473 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (old) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_unref (old);
-#line 4431 "CameraTable.c"
+#line 4479 "CameraTable.c"
 	}
 }
 
@@ -4442,17 +4490,17 @@ static void camera_table_class_init (CameraTableClass * klass) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_type_class_add_private (klass, sizeof (CameraTablePrivate));
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	g_signal_new ("camera_added", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
+	camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL] = g_signal_new ("camera-added", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	g_signal_new ("camera_removed", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
-#line 4447 "CameraTable.c"
+	camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL] = g_signal_new ("camera-removed", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
+#line 4495 "CameraTable.c"
 }
 
 
 static void camera_table_instance_init (CameraTable * self) {
-	GUdevClient* _tmp0_ = NULL;
-	GPContext* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
+	GUdevClient* _tmp0_;
+	GPContext* _tmp1_;
+	GeeHashMap* _tmp2_;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	self->priv = CAMERA_TABLE_GET_PRIVATE (self);
 #line 29 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4471,11 +4519,11 @@ static void camera_table_instance_init (CameraTable * self) {
 	self->priv->camera_map = _tmp2_;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	self->ref_count = 1;
-#line 4473 "CameraTable.c"
+#line 4521 "CameraTable.c"
 }
 
 
-static void camera_table_finalize (CameraTable* obj) {
+static void camera_table_finalize (CameraTable * obj) {
 	CameraTable * self;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CAMERA_TABLE, CameraTable);
@@ -4493,7 +4541,7 @@ static void camera_table_finalize (CameraTable* obj) {
 	_g_object_unref0 (self->priv->volume_monitor);
 #line 35 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_g_object_unref0 (self->priv->camera_map);
-#line 4495 "CameraTable.c"
+#line 4543 "CameraTable.c"
 }
 
 
@@ -4512,18 +4560,18 @@ GType camera_table_get_type (void) {
 
 
 gpointer camera_table_ref (gpointer instance) {
-	CameraTable* self;
+	CameraTable * self;
 	self = instance;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return instance;
-#line 4520 "CameraTable.c"
+#line 4568 "CameraTable.c"
 }
 
 
 void camera_table_unref (gpointer instance) {
-	CameraTable* self;
+	CameraTable * self;
 	self = instance;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -4531,7 +4579,7 @@ void camera_table_unref (gpointer instance) {
 		CAMERA_TABLE_GET_CLASS (self)->finalize (self);
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4533 "CameraTable.c"
+#line 4581 "CameraTable.c"
 	}
 }
 
diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c
index e482a97..6deedf6 100644
--- a/src/camera/GPhoto.c
+++ b/src/camera/GPhoto.c
@@ -1,4 +1,4 @@
-/* GPhoto.c generated by valac 0.34.7, the Vala compiler
+/* GPhoto.c generated by valac 0.36.6, the Vala compiler
  * generated from GPhoto.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -86,8 +86,6 @@ typedef struct _PhotoMetadataClass PhotoMetadataClass;
 typedef struct _PhotoPreview PhotoPreview;
 typedef struct _PhotoPreviewClass PhotoPreviewClass;
 #define _photo_preview_unref0(var) ((var == NULL) ? NULL : (var = (photo_preview_unref (var), NULL)))
-
-#define JPEG_TYPE_MARKER (jpeg_marker_get_type ())
 #define _gp_file_unref0(var) ((var == NULL) ? NULL : (var = (gp_file_unref (var), NULL)))
 
 typedef enum  {
@@ -126,14 +124,6 @@ struct _GPSpinIdleWrapperClass {
 	GPContextWrapperClass parent_class;
 };
 
-typedef enum  {
-	JPEG_MARKER_INVALID = 0x00,
-	JPEG_MARKER_SOI = 0xD8,
-	JPEG_MARKER_EOI = 0xD9,
-	JPEG_MARKER_APP0 = 0xE0,
-	JPEG_MARKER_APP1 = 0xE1
-} JpegMarker;
-
 
 static gpointer gp_context_wrapper_parent_class = NULL;
 static gpointer gp_spin_idle_wrapper_parent_class = NULL;
@@ -179,7 +169,7 @@ void gp_context_wrapper_progress_update (GPContextWrapper* self, gfloat current,
 static void gp_context_wrapper_real_progress_update (GPContextWrapper* self, gfloat current, void* data);
 void gp_context_wrapper_progress_stop (GPContextWrapper* self);
 static void gp_context_wrapper_real_progress_stop (GPContextWrapper* self);
-static void gp_context_wrapper_finalize (GPContextWrapper* obj);
+static void gp_context_wrapper_finalize (GPContextWrapper * obj);
 GType gp_spin_idle_wrapper_get_type (void) G_GNUC_CONST;
 enum  {
 	GP_SPIN_IDLE_WRAPPER_DUMMY_PROPERTY
@@ -216,8 +206,6 @@ gpointer value_get_photo_preview (const GValue* value);
 GType photo_preview_get_type (void) G_GNUC_CONST;
 PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number);
 guint8* photo_preview_flatten (PhotoPreview* self, int* result_length1, GError** error);
-#define JPEG_MARKER_PREFIX ((guint8) 0xFF)
-GType jpeg_marker_get_type (void) G_GNUC_CONST;
 static guint8* _vala_array_dup23 (guint8* self, int length);
 #define IMPORT_PREVIEW_MAX_SCALE 128
 GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error);
@@ -239,28 +227,28 @@ GQuark gphoto_error_quark (void) {
 static void _gp_context_wrapper_on_idle_gp_context_idle_func (GPContext* context, gpointer self) {
 #line 18 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_idle ((GPContextWrapper*) self, context);
-#line 243 "GPhoto.c"
+#line 231 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_error_gp_context_error_func (GPContext* context, const gchar* text, gpointer self) {
 #line 19 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_error ((GPContextWrapper*) self, context, text);
-#line 250 "GPhoto.c"
+#line 238 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_status_gp_context_status_func (GPContext* context, const gchar* text, gpointer self) {
 #line 20 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_status ((GPContextWrapper*) self, context, text);
-#line 257 "GPhoto.c"
+#line 245 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_message_gp_context_message_func (GPContext* context, const gchar* text, gpointer self) {
 #line 21 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_message ((GPContextWrapper*) self, context, text);
-#line 264 "GPhoto.c"
+#line 252 "GPhoto.c"
 }
 
 
@@ -269,31 +257,31 @@ static guint _gp_context_wrapper_on_progress_start_gp_context_progress_start_fun
 	result = gp_context_wrapper_on_progress_start ((GPContextWrapper*) self, context, target, text);
 #line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 273 "GPhoto.c"
+#line 261 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_progress_update_gp_context_progress_update_func (GPContext* context, guint id, gfloat current, gpointer self) {
 #line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_progress_update ((GPContextWrapper*) self, context, id, current);
-#line 280 "GPhoto.c"
+#line 268 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func (GPContext* context, guint id, gpointer self) {
 #line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_progress_stop ((GPContextWrapper*) self, context, id);
-#line 287 "GPhoto.c"
+#line 275 "GPhoto.c"
 }
 
 
 GPContextWrapper* gp_context_wrapper_construct (GType object_type) {
 	GPContextWrapper* self = NULL;
-	GPContext* _tmp0_ = NULL;
-	GPContext* _tmp1_ = NULL;
-	GPContext* _tmp2_ = NULL;
-	GPContext* _tmp3_ = NULL;
-	GPContext* _tmp4_ = NULL;
+	GPContext* _tmp0_;
+	GPContext* _tmp1_;
+	GPContext* _tmp2_;
+	GPContext* _tmp3_;
+	GPContext* _tmp4_;
 #line 17 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	self = (GPContextWrapper*) g_type_create_instance (object_type);
 #line 18 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -318,14 +306,14 @@ GPContextWrapper* gp_context_wrapper_construct (GType object_type) {
 	gp_context_set_progress_funcs (_tmp4_, _gp_context_wrapper_on_progress_start_gp_context_progress_start_func, _gp_context_wrapper_on_progress_update_gp_context_progress_update_func, _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func, self);
 #line 17 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return self;
-#line 322 "GPhoto.c"
+#line 310 "GPhoto.c"
 }
 
 
 GPContextWrapper* gp_context_wrapper_new (void) {
 #line 17 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return gp_context_wrapper_construct (GP_TYPE_CONTEXT_WRAPPER);
-#line 329 "GPhoto.c"
+#line 317 "GPhoto.c"
 }
 
 
@@ -338,14 +326,14 @@ void gp_context_wrapper_idle (GPContextWrapper* self) {
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 25 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->idle (self);
-#line 342 "GPhoto.c"
+#line 330 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_real_error (GPContextWrapper* self, const gchar* text, void* data) {
 #line 28 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (text != NULL);
-#line 349 "GPhoto.c"
+#line 337 "GPhoto.c"
 }
 
 
@@ -354,14 +342,14 @@ void gp_context_wrapper_error (GPContextWrapper* self, const gchar* text, void*
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 28 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->error (self, text, data);
-#line 358 "GPhoto.c"
+#line 346 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_real_status (GPContextWrapper* self, const gchar* text, void* data) {
 #line 31 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (text != NULL);
-#line 365 "GPhoto.c"
+#line 353 "GPhoto.c"
 }
 
 
@@ -370,14 +358,14 @@ void gp_context_wrapper_status (GPContextWrapper* self, const gchar* text, void*
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 31 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->status (self, text, data);
-#line 374 "GPhoto.c"
+#line 362 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_real_message (GPContextWrapper* self, const gchar* text, void* data) {
 #line 34 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (text != NULL);
-#line 381 "GPhoto.c"
+#line 369 "GPhoto.c"
 }
 
 
@@ -386,14 +374,14 @@ void gp_context_wrapper_message (GPContextWrapper* self, const gchar* text, void
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 34 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->message (self, text, data);
-#line 390 "GPhoto.c"
+#line 378 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_real_progress_start (GPContextWrapper* self, gfloat current, const gchar* text, void* data) {
 #line 37 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (text != NULL);
-#line 397 "GPhoto.c"
+#line 385 "GPhoto.c"
 }
 
 
@@ -402,7 +390,7 @@ void gp_context_wrapper_progress_start (GPContextWrapper* self, gfloat current,
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 37 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_start (self, current, text, data);
-#line 406 "GPhoto.c"
+#line 394 "GPhoto.c"
 }
 
 
@@ -415,7 +403,7 @@ void gp_context_wrapper_progress_update (GPContextWrapper* self, gfloat current,
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 40 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_update (self, current, data);
-#line 419 "GPhoto.c"
+#line 407 "GPhoto.c"
 }
 
 
@@ -428,7 +416,7 @@ void gp_context_wrapper_progress_stop (GPContextWrapper* self) {
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 43 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_stop (self);
-#line 432 "GPhoto.c"
+#line 420 "GPhoto.c"
 }
 
 
@@ -439,12 +427,12 @@ static void gp_context_wrapper_on_idle (GPContextWrapper* self, GPContext* conte
 	g_return_if_fail (context != NULL);
 #line 47 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_idle (self);
-#line 443 "GPhoto.c"
+#line 431 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_on_error (GPContextWrapper* self, GPContext* context, const gchar* text) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 50 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 50 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -455,12 +443,12 @@ static void gp_context_wrapper_on_error (GPContextWrapper* self, GPContext* cont
 	_tmp0_ = text;
 #line 51 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_error (self, _tmp0_, NULL);
-#line 459 "GPhoto.c"
+#line 447 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_on_status (GPContextWrapper* self, GPContext* context, const gchar* text) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 54 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 54 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -471,12 +459,12 @@ static void gp_context_wrapper_on_status (GPContextWrapper* self, GPContext* con
 	_tmp0_ = text;
 #line 55 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_status (self, _tmp0_, NULL);
-#line 475 "GPhoto.c"
+#line 463 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_on_message (GPContextWrapper* self, GPContext* context, const gchar* text) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 58 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 58 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -487,14 +475,14 @@ static void gp_context_wrapper_on_message (GPContextWrapper* self, GPContext* co
 	_tmp0_ = text;
 #line 59 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_message (self, _tmp0_, NULL);
-#line 491 "GPhoto.c"
+#line 479 "GPhoto.c"
 }
 
 
 static guint gp_context_wrapper_on_progress_start (GPContextWrapper* self, GPContext* context, gfloat target, const gchar* text) {
 	guint result = 0U;
-	gfloat _tmp0_ = 0.0F;
-	const gchar* _tmp1_ = NULL;
+	gfloat _tmp0_;
+	const gchar* _tmp1_;
 #line 62 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (GP_IS_CONTEXT_WRAPPER (self), 0U);
 #line 62 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -511,12 +499,12 @@ static guint gp_context_wrapper_on_progress_start (GPContextWrapper* self, GPCon
 	result = (guint) 0;
 #line 65 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 515 "GPhoto.c"
+#line 503 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_on_progress_update (GPContextWrapper* self, GPContext* context, guint id, gfloat current) {
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 #line 68 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 68 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -525,7 +513,7 @@ static void gp_context_wrapper_on_progress_update (GPContextWrapper* self, GPCon
 	_tmp0_ = current;
 #line 69 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_progress_update (self, _tmp0_, NULL);
-#line 529 "GPhoto.c"
+#line 517 "GPhoto.c"
 }
 
 
@@ -536,14 +524,14 @@ static void gp_context_wrapper_on_progress_stop (GPContextWrapper* self, GPConte
 	g_return_if_fail (context != NULL);
 #line 73 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_progress_stop (self);
-#line 540 "GPhoto.c"
+#line 528 "GPhoto.c"
 }
 
 
 static void gp_value_context_wrapper_init (GValue* value) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	value->data[0].v_pointer = NULL;
-#line 547 "GPhoto.c"
+#line 535 "GPhoto.c"
 }
 
 
@@ -552,7 +540,7 @@ static void gp_value_context_wrapper_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		gp_context_wrapper_unref (value->data[0].v_pointer);
-#line 556 "GPhoto.c"
+#line 544 "GPhoto.c"
 	}
 }
 
@@ -562,11 +550,11 @@ static void gp_value_context_wrapper_copy_value (const GValue* src_value, GValue
 	if (src_value->data[0].v_pointer) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		dest_value->data[0].v_pointer = gp_context_wrapper_ref (src_value->data[0].v_pointer);
-#line 566 "GPhoto.c"
+#line 554 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 570 "GPhoto.c"
+#line 558 "GPhoto.c"
 	}
 }
 
@@ -574,66 +562,66 @@ static void gp_value_context_wrapper_copy_value (const GValue* src_value, GValue
 static gpointer gp_value_context_wrapper_peek_pointer (const GValue* value) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return value->data[0].v_pointer;
-#line 578 "GPhoto.c"
+#line 566 "GPhoto.c"
 }
 
 
 static gchar* gp_value_context_wrapper_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (collect_values[0].v_pointer) {
-#line 585 "GPhoto.c"
-		GPContextWrapper* object;
+#line 573 "GPhoto.c"
+		GPContextWrapper * object;
 		object = collect_values[0].v_pointer;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 592 "GPhoto.c"
+#line 580 "GPhoto.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 596 "GPhoto.c"
+#line 584 "GPhoto.c"
 		}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = gp_context_wrapper_ref (object);
-#line 600 "GPhoto.c"
+#line 588 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = NULL;
-#line 604 "GPhoto.c"
+#line 592 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return NULL;
-#line 608 "GPhoto.c"
+#line 596 "GPhoto.c"
 }
 
 
 static gchar* gp_value_context_wrapper_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	GPContextWrapper** object_p;
+	GPContextWrapper ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (!object_p) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 619 "GPhoto.c"
+#line 607 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (!value->data[0].v_pointer) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*object_p = NULL;
-#line 625 "GPhoto.c"
+#line 613 "GPhoto.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*object_p = value->data[0].v_pointer;
-#line 629 "GPhoto.c"
+#line 617 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*object_p = gp_context_wrapper_ref (value->data[0].v_pointer);
-#line 633 "GPhoto.c"
+#line 621 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return NULL;
-#line 637 "GPhoto.c"
+#line 625 "GPhoto.c"
 }
 
 
@@ -647,7 +635,7 @@ GParamSpec* gp_param_spec_context_wrapper (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return G_PARAM_SPEC (spec);
-#line 651 "GPhoto.c"
+#line 639 "GPhoto.c"
 }
 
 
@@ -656,12 +644,12 @@ gpointer gp_value_get_context_wrapper (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GP_TYPE_CONTEXT_WRAPPER), NULL);
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return value->data[0].v_pointer;
-#line 660 "GPhoto.c"
+#line 648 "GPhoto.c"
 }
 
 
 void gp_value_set_context_wrapper (GValue* value, gpointer v_object) {
-	GPContextWrapper* old;
+	GPContextWrapper * old;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GP_TYPE_CONTEXT_WRAPPER));
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -676,23 +664,23 @@ void gp_value_set_context_wrapper (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		gp_context_wrapper_ref (value->data[0].v_pointer);
-#line 680 "GPhoto.c"
+#line 668 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = NULL;
-#line 684 "GPhoto.c"
+#line 672 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (old) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		gp_context_wrapper_unref (old);
-#line 690 "GPhoto.c"
+#line 678 "GPhoto.c"
 	}
 }
 
 
 void gp_value_take_context_wrapper (GValue* value, gpointer v_object) {
-	GPContextWrapper* old;
+	GPContextWrapper * old;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GP_TYPE_CONTEXT_WRAPPER));
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -705,17 +693,17 @@ void gp_value_take_context_wrapper (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = v_object;
-#line 709 "GPhoto.c"
+#line 697 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = NULL;
-#line 713 "GPhoto.c"
+#line 701 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (old) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		gp_context_wrapper_unref (old);
-#line 719 "GPhoto.c"
+#line 707 "GPhoto.c"
 	}
 }
 
@@ -726,36 +714,36 @@ static void gp_context_wrapper_class_init (GPContextWrapperClass * klass) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	((GPContextWrapperClass *) klass)->finalize = gp_context_wrapper_finalize;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->idle = (void (*)(GPContextWrapper*)) gp_context_wrapper_real_idle;
+	((GPContextWrapperClass *) klass)->idle = (void (*) (GPContextWrapper *)) gp_context_wrapper_real_idle;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->error = (void (*)(GPContextWrapper*, const gchar*, void*)) gp_context_wrapper_real_error;
+	((GPContextWrapperClass *) klass)->error = (void (*) (GPContextWrapper *, const gchar*, void*)) gp_context_wrapper_real_error;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->status = (void (*)(GPContextWrapper*, const gchar*, void*)) gp_context_wrapper_real_status;
+	((GPContextWrapperClass *) klass)->status = (void (*) (GPContextWrapper *, const gchar*, void*)) gp_context_wrapper_real_status;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->message = (void (*)(GPContextWrapper*, const gchar*, void*)) gp_context_wrapper_real_message;
+	((GPContextWrapperClass *) klass)->message = (void (*) (GPContextWrapper *, const gchar*, void*)) gp_context_wrapper_real_message;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->progress_start = (void (*)(GPContextWrapper*, gfloat, const gchar*, void*)) gp_context_wrapper_real_progress_start;
+	((GPContextWrapperClass *) klass)->progress_start = (void (*) (GPContextWrapper *, gfloat, const gchar*, void*)) gp_context_wrapper_real_progress_start;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->progress_update = (void (*)(GPContextWrapper*, gfloat, void*)) gp_context_wrapper_real_progress_update;
+	((GPContextWrapperClass *) klass)->progress_update = (void (*) (GPContextWrapper *, gfloat, void*)) gp_context_wrapper_real_progress_update;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->progress_stop = (void (*)(GPContextWrapper*)) gp_context_wrapper_real_progress_stop;
-#line 743 "GPhoto.c"
+	((GPContextWrapperClass *) klass)->progress_stop = (void (*) (GPContextWrapper *)) gp_context_wrapper_real_progress_stop;
+#line 731 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_instance_init (GPContextWrapper * self) {
-	GPContext* _tmp0_ = NULL;
+	GPContext* _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp0_ = gp_context_new ();
 #line 15 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	self->context = _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	self->ref_count = 1;
-#line 755 "GPhoto.c"
+#line 743 "GPhoto.c"
 }
 
 
-static void gp_context_wrapper_finalize (GPContextWrapper* obj) {
+static void gp_context_wrapper_finalize (GPContextWrapper * obj) {
 	GPContextWrapper * self;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper);
@@ -763,7 +751,7 @@ static void gp_context_wrapper_finalize (GPContextWrapper* obj) {
 	g_signal_handlers_destroy (self);
 #line 15 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_context_unref0 (self->context);
-#line 767 "GPhoto.c"
+#line 755 "GPhoto.c"
 }
 
 
@@ -782,18 +770,18 @@ GType gp_context_wrapper_get_type (void) {
 
 
 gpointer gp_context_wrapper_ref (gpointer instance) {
-	GPContextWrapper* self;
+	GPContextWrapper * self;
 	self = instance;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return instance;
-#line 792 "GPhoto.c"
+#line 780 "GPhoto.c"
 }
 
 
 void gp_context_wrapper_unref (gpointer instance) {
-	GPContextWrapper* self;
+	GPContextWrapper * self;
 	self = instance;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -801,7 +789,7 @@ void gp_context_wrapper_unref (gpointer instance) {
 		GP_CONTEXT_WRAPPER_GET_CLASS (self)->finalize (self);
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 805 "GPhoto.c"
+#line 793 "GPhoto.c"
 	}
 }
 
@@ -812,14 +800,14 @@ GPSpinIdleWrapper* gp_spin_idle_wrapper_construct (GType object_type) {
 	self = (GPSpinIdleWrapper*) gp_context_wrapper_construct (object_type);
 #line 79 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return self;
-#line 816 "GPhoto.c"
+#line 804 "GPhoto.c"
 }
 
 
 GPSpinIdleWrapper* gp_spin_idle_wrapper_new (void) {
 #line 79 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return gp_spin_idle_wrapper_construct (GP_TYPE_SPIN_IDLE_WRAPPER);
-#line 823 "GPhoto.c"
+#line 811 "GPhoto.c"
 }
 
 
@@ -831,14 +819,14 @@ static void gp_spin_idle_wrapper_real_idle (GPContextWrapper* base) {
 	GP_CONTEXT_WRAPPER_CLASS (gp_spin_idle_wrapper_parent_class)->idle (G_TYPE_CHECK_INSTANCE_CAST (self, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper));
 #line 85 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	spin_event_loop ();
-#line 835 "GPhoto.c"
+#line 823 "GPhoto.c"
 }
 
 
 static void gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base, gfloat current, void* data) {
 	GPSpinIdleWrapper * self;
-	gfloat _tmp0_ = 0.0F;
-	void* _tmp1_ = NULL;
+	gfloat _tmp0_;
+	void* _tmp1_;
 #line 88 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, GP_TYPE_SPIN_IDLE_WRAPPER, GPSpinIdleWrapper);
 #line 89 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -849,7 +837,7 @@ static void gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base, g
 	GP_CONTEXT_WRAPPER_CLASS (gp_spin_idle_wrapper_parent_class)->progress_update (G_TYPE_CHECK_INSTANCE_CAST (self, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper), _tmp0_, _tmp1_);
 #line 91 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	spin_event_loop ();
-#line 853 "GPhoto.c"
+#line 841 "GPhoto.c"
 }
 
 
@@ -857,10 +845,10 @@ static void gp_spin_idle_wrapper_class_init (GPSpinIdleWrapperClass * klass) {
 #line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_spin_idle_wrapper_parent_class = g_type_class_peek_parent (klass);
 #line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->idle = (void (*)(GPContextWrapper*)) gp_spin_idle_wrapper_real_idle;
+	((GPContextWrapperClass *) klass)->idle = (void (*) (GPContextWrapper *)) gp_spin_idle_wrapper_real_idle;
 #line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->progress_update = (void (*)(GPContextWrapper*, gfloat, void*)) gp_spin_idle_wrapper_real_progress_update;
-#line 864 "GPhoto.c"
+	((GPContextWrapperClass *) klass)->progress_update = (void (*) (GPContextWrapper *, gfloat, void*)) gp_spin_idle_wrapper_real_progress_update;
+#line 852 "GPhoto.c"
 }
 
 
@@ -884,17 +872,17 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 	CameraFileInfo _vala_info = {0};
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	const gchar* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	int res = 0;
-	Camera* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	GPContext* _tmp11_ = NULL;
+	Camera* _tmp8_;
+	const gchar* _tmp9_;
+	const gchar* _tmp10_;
+	GPContext* _tmp11_;
 	CameraFileInfo _tmp12_ = {0};
-	int _tmp13_ = 0;
-	int _tmp14_ = 0;
+	int _tmp13_;
+	int _tmp14_;
 	GError * _inner_error_ = NULL;
 #line 102 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, FALSE);
@@ -914,11 +902,11 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 	if (_tmp3_ > GP_MAX_BASEDIR_LENGTH) {
 #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = TRUE;
-#line 918 "GPhoto.c"
+#line 906 "GPhoto.c"
 	} else {
-		const gchar* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+		const gchar* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = filename;
 #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -927,11 +915,11 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 		_tmp6_ = _tmp5_;
 #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = _tmp6_ > GP_MAX_FILENAME_LENGTH;
-#line 931 "GPhoto.c"
+#line 919 "GPhoto.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp0_) {
-#line 935 "GPhoto.c"
+#line 923 "GPhoto.c"
 		CameraFileInfo _tmp7_ = {0};
 #line 105 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		 (_vala_info);
@@ -943,15 +931,15 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 		if (info) {
 #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*info = _vala_info;
-#line 947 "GPhoto.c"
+#line 935 "GPhoto.c"
 		} else {
 #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			 (_vala_info);
-#line 951 "GPhoto.c"
+#line 939 "GPhoto.c"
 		}
 #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 955 "GPhoto.c"
+#line 943 "GPhoto.c"
 	}
 #line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = camera;
@@ -973,13 +961,13 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 	_tmp14_ = res;
 #line 111 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp14_ != GP_OK) {
-#line 977 "GPhoto.c"
-		int _tmp15_ = 0;
-		const gchar* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
-		int _tmp18_ = 0;
-		const gchar* _tmp19_ = NULL;
-		GError* _tmp20_ = NULL;
+#line 965 "GPhoto.c"
+		int _tmp15_;
+		const gchar* _tmp16_;
+		const gchar* _tmp17_;
+		int _tmp18_;
+		const gchar* _tmp19_;
+		GError* _tmp20_;
 		gboolean _tmp21_ = FALSE;
 #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = res;
@@ -999,7 +987,7 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 		g_propagate_error (error, _inner_error_);
 #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return _tmp21_;
-#line 1003 "GPhoto.c"
+#line 991 "GPhoto.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = TRUE;
@@ -1007,134 +995,134 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 	if (info) {
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*info = _vala_info;
-#line 1011 "GPhoto.c"
+#line 999 "GPhoto.c"
 	} else {
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		 (_vala_info);
-#line 1015 "GPhoto.c"
+#line 1003 "GPhoto.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1019 "GPhoto.c"
+#line 1007 "GPhoto.c"
 }
 
 
 static gchar* string_slice (const gchar* self, glong start, glong end) {
 	gchar* result = NULL;
 	glong string_length = 0L;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	glong _tmp2_ = 0L;
-	glong _tmp5_ = 0L;
+	gint _tmp0_;
+	gint _tmp1_;
+	glong _tmp2_;
+	glong _tmp5_;
 	gboolean _tmp8_ = FALSE;
-	glong _tmp9_ = 0L;
+	glong _tmp9_;
 	gboolean _tmp12_ = FALSE;
-	glong _tmp13_ = 0L;
-	glong _tmp16_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp13_;
+	glong _tmp16_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	gchar* _tmp21_;
+#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 1052 "GPhoto.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1040 "GPhoto.c"
+		glong _tmp3_;
+		glong _tmp4_;
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 1061 "GPhoto.c"
+#line 1049 "GPhoto.c"
 	}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 1067 "GPhoto.c"
-		glong _tmp6_ = 0L;
-		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1055 "GPhoto.c"
+		glong _tmp6_;
+		glong _tmp7_;
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 1076 "GPhoto.c"
+#line 1064 "GPhoto.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 1082 "GPhoto.c"
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1070 "GPhoto.c"
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1091 "GPhoto.c"
+#line 1079 "GPhoto.c"
 	} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 1095 "GPhoto.c"
+#line 1083 "GPhoto.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 1103 "GPhoto.c"
-		glong _tmp14_ = 0L;
-		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "GPhoto.c"
+		glong _tmp14_;
+		glong _tmp15_;
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1112 "GPhoto.c"
+#line 1100 "GPhoto.c"
 	} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 1116 "GPhoto.c"
+#line 1104 "GPhoto.c"
 	}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1138 "GPhoto.c"
+#line 1126 "GPhoto.c"
 }
 
 
@@ -1142,21 +1130,21 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 	PhotoMetadata* result = NULL;
 	CameraStorageInformation* sifs = NULL;
 	gint count = 0;
-	Camera* _tmp0_ = NULL;
-	GPContext* _tmp1_ = NULL;
+	Camera* _tmp0_;
+	GPContext* _tmp1_;
 	gint _tmp2_ = 0;
 	GPPortInfo port_info = {0};
-	Camera* _tmp3_ = NULL;
+	Camera* _tmp3_;
 	GPPortInfo _tmp4_ = {0};
 	gchar* path = NULL;
 	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar* _tmp6_;
 	gchar* prefix = NULL;
-	gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	gchar* _tmp7_;
+	const gchar* _tmp8_;
+	gboolean _tmp9_;
 	PhotoMetadata* metadata = NULL;
-	PhotoMetadata* _tmp17_ = NULL;
+	PhotoMetadata* _tmp17_;
 	GError * _inner_error_ = NULL;
 #line 121 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
@@ -1204,14 +1192,14 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 	_tmp9_ = g_str_has_prefix (_tmp8_, prefix);
 #line 133 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp9_) {
-#line 1208 "GPhoto.c"
-		const gchar* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
-		const gchar* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
-		gint _tmp15_ = 0;
-		gchar* _tmp16_ = NULL;
+#line 1196 "GPhoto.c"
+		const gchar* _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
+		const gchar* _tmp13_;
+		gint _tmp14_;
+		gint _tmp15_;
+		gchar* _tmp16_;
 #line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp10_ = path;
 #line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1230,7 +1218,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		_g_free0 (path);
 #line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		path = _tmp16_;
-#line 1234 "GPhoto.c"
+#line 1222 "GPhoto.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = NULL;
@@ -1242,26 +1230,26 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		 (port_info);
 #line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 1246 "GPhoto.c"
+#line 1234 "GPhoto.c"
 	}
 #line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp17_ = photo_metadata_new ();
 #line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	metadata = _tmp17_;
-#line 1252 "GPhoto.c"
+#line 1240 "GPhoto.c"
 	{
-		PhotoMetadata* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
-		GFile* _tmp28_ = NULL;
-		GFile* _tmp29_ = NULL;
+		PhotoMetadata* _tmp18_;
+		const gchar* _tmp19_;
+		const gchar* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
+		gchar* _tmp23_;
+		gchar* _tmp24_;
+		const gchar* _tmp25_;
+		gchar* _tmp26_;
+		gchar* _tmp27_;
+		GFile* _tmp28_;
+		GFile* _tmp29_;
 #line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp18_ = metadata;
 #line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1298,12 +1286,12 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		_g_free0 (_tmp22_);
 #line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1302 "GPhoto.c"
-			goto __catch61_g_error;
+#line 1290 "GPhoto.c"
+			goto __catch62_g_error;
 		}
 	}
-	goto __finally61;
-	__catch61_g_error:
+	goto __finally62;
+	__catch62_g_error:
 	{
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_clear_error (&_inner_error_);
@@ -1313,9 +1301,9 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		_media_metadata_unref0 (metadata);
 #line 142 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		metadata = NULL;
-#line 1317 "GPhoto.c"
+#line 1305 "GPhoto.c"
 	}
-	__finally61:
+	__finally62:
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1332,7 +1320,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		g_clear_error (&_inner_error_);
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1336 "GPhoto.c"
+#line 1324 "GPhoto.c"
 	}
 #line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = metadata;
@@ -1344,14 +1332,14 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 	 (port_info);
 #line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1348 "GPhoto.c"
+#line 1336 "GPhoto.c"
 }
 
 
 static guint8* _vala_array_dup23 (guint8* self, int length) {
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 1355 "GPhoto.c"
+#line 1343 "GPhoto.c"
 }
 
 
@@ -1360,21 +1348,20 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 	int _vala_raw_length1 = 0;
 	gsize _vala_raw_length = 0UL;
 	GdkPixbuf* result = NULL;
-	guint8* _tmp25_ = NULL;
-	gint _tmp25__length1 = 0;
-	guint8* _tmp26_ = NULL;
-	gint _tmp26__length1 = 0;
-	gsize _tmp27_ = 0UL;
+	guint8* _tmp25_;
+	gint _tmp25__length1;
+	guint8* _tmp26_;
+	gint _tmp26__length1;
 	GMemoryInputStream* mins = NULL;
-	guint8* _tmp42_ = NULL;
-	gint _tmp42__length1 = 0;
-	guint8* _tmp43_ = NULL;
-	gint _tmp43__length1 = 0;
-	GMemoryInputStream* _tmp44_ = NULL;
-	GdkPixbuf* _tmp45_ = NULL;
-	GMemoryInputStream* _tmp46_ = NULL;
-	GdkPixbuf* _tmp47_ = NULL;
-	GdkPixbuf* _tmp48_ = NULL;
+	guint8* _tmp27_;
+	gint _tmp27__length1;
+	guint8* _tmp28_;
+	gint _tmp28__length1;
+	GMemoryInputStream* _tmp29_;
+	GdkPixbuf* _tmp30_ = NULL;
+	GMemoryInputStream* _tmp31_;
+	GdkPixbuf* _tmp32_;
+	GdkPixbuf* _tmp33_;
 	GError * _inner_error_ = NULL;
 #line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
@@ -1392,19 +1379,19 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 	_vala_raw_length1 = 0;
 #line 151 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_vala_raw_length = (gsize) 0;
-#line 1396 "GPhoto.c"
+#line 1383 "GPhoto.c"
 	{
 		guint8* _tmp0_ = NULL;
-		GPContext* _tmp1_ = NULL;
-		Camera* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		guint8* _tmp6_ = NULL;
-		gint _tmp0__length1 = 0;
-		gint __tmp0__size_ = 0;
-		guint8* _tmp7_ = NULL;
-		gint _tmp7__length1 = 0;
+		GPContext* _tmp1_;
+		Camera* _tmp2_;
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+		gint _tmp5_;
+		guint8* _tmp6_;
+		gint _tmp0__length1;
+		gint __tmp0__size_;
+		guint8* _tmp7_;
+		gint _tmp7__length1;
 #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp1_ = context;
 #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1423,8 +1410,8 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		__tmp0__size_ = _tmp0__length1;
 #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1427 "GPhoto.c"
-			goto __catch62_g_error;
+#line 1414 "GPhoto.c"
+			goto __catch63_g_error;
 		}
 #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7_ = _tmp0_;
@@ -1442,33 +1429,33 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		_vala_raw_length1 = _tmp7__length1;
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = (g_free (_tmp0_), NULL);
-#line 1446 "GPhoto.c"
+#line 1433 "GPhoto.c"
 	}
-	goto __finally62;
-	__catch62_g_error:
+	goto __finally63;
+	__catch63_g_error:
 	{
 		PhotoMetadata* metadata = NULL;
-		Camera* _tmp8_ = NULL;
-		GPContext* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		PhotoMetadata* _tmp12_ = NULL;
-		PhotoMetadata* _tmp13_ = NULL;
-		PhotoMetadata* _tmp14_ = NULL;
-		guint _tmp15_ = 0U;
+		Camera* _tmp8_;
+		GPContext* _tmp9_;
+		const gchar* _tmp10_;
+		const gchar* _tmp11_;
+		PhotoMetadata* _tmp12_;
+		PhotoMetadata* _tmp13_;
+		PhotoMetadata* _tmp14_;
+		guint _tmp15_;
 		PhotoPreview* preview = NULL;
-		PhotoMetadata* _tmp16_ = NULL;
-		PhotoMetadata* _tmp17_ = NULL;
-		guint _tmp18_ = 0U;
-		PhotoPreview* _tmp19_ = NULL;
+		PhotoMetadata* _tmp16_;
+		PhotoMetadata* _tmp17_;
+		guint _tmp18_;
+		PhotoPreview* _tmp19_;
 		guint8* _tmp20_ = NULL;
-		PhotoPreview* _tmp21_ = NULL;
-		gint _tmp22_ = 0;
-		guint8* _tmp23_ = NULL;
-		gint _tmp20__length1 = 0;
-		gint __tmp20__size_ = 0;
-		guint8* _tmp24_ = NULL;
-		gint _tmp24__length1 = 0;
+		PhotoPreview* _tmp21_;
+		gint _tmp22_;
+		guint8* _tmp23_;
+		gint _tmp20__length1;
+		gint __tmp20__size_;
+		guint8* _tmp24_;
+		gint _tmp24__length1;
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_clear_error (&_inner_error_);
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1497,27 +1484,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 			if (raw) {
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw = _vala_raw;
-#line 1501 "GPhoto.c"
+#line 1488 "GPhoto.c"
 			} else {
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				_vala_raw = (g_free (_vala_raw), NULL);
-#line 1505 "GPhoto.c"
+#line 1492 "GPhoto.c"
 			}
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			if (raw_length1) {
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw_length1 = _vala_raw_length1;
-#line 1511 "GPhoto.c"
+#line 1498 "GPhoto.c"
 			}
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			if (raw_length) {
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw_length = _vala_raw_length;
-#line 1517 "GPhoto.c"
+#line 1504 "GPhoto.c"
 			}
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return result;
-#line 1521 "GPhoto.c"
+#line 1508 "GPhoto.c"
 		}
 #line 159 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp14_ = metadata;
@@ -1533,27 +1520,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 			if (raw) {
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw = _vala_raw;
-#line 1537 "GPhoto.c"
+#line 1524 "GPhoto.c"
 			} else {
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				_vala_raw = (g_free (_vala_raw), NULL);
-#line 1541 "GPhoto.c"
+#line 1528 "GPhoto.c"
 			}
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			if (raw_length1) {
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw_length1 = _vala_raw_length1;
-#line 1547 "GPhoto.c"
+#line 1534 "GPhoto.c"
 			}
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			if (raw_length) {
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw_length = _vala_raw_length;
-#line 1553 "GPhoto.c"
+#line 1540 "GPhoto.c"
 			}
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return result;
-#line 1557 "GPhoto.c"
+#line 1544 "GPhoto.c"
 		}
 #line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = metadata;
@@ -1581,8 +1568,8 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 			_photo_preview_unref0 (preview);
 #line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			_media_metadata_unref0 (metadata);
-#line 1585 "GPhoto.c"
-			goto __finally62;
+#line 1572 "GPhoto.c"
+			goto __finally63;
 		}
 #line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp24_ = _tmp20_;
@@ -1604,16 +1591,16 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		_photo_preview_unref0 (preview);
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_media_metadata_unref0 (metadata);
-#line 1608 "GPhoto.c"
+#line 1595 "GPhoto.c"
 	}
-	__finally62:
+	__finally63:
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1617 "GPhoto.c"
+#line 1604 "GPhoto.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp25_ = _vala_raw;
@@ -1629,27 +1616,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		if (raw) {
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*raw = _vala_raw;
-#line 1633 "GPhoto.c"
+#line 1620 "GPhoto.c"
 		} else {
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			_vala_raw = (g_free (_vala_raw), NULL);
-#line 1637 "GPhoto.c"
+#line 1624 "GPhoto.c"
 		}
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (raw_length1) {
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*raw_length1 = _vala_raw_length1;
-#line 1643 "GPhoto.c"
+#line 1630 "GPhoto.c"
 		}
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (raw_length) {
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*raw_length = _vala_raw_length;
-#line 1649 "GPhoto.c"
+#line 1636 "GPhoto.c"
 		}
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 1653 "GPhoto.c"
+#line 1640 "GPhoto.c"
 	}
 #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp26_ = _vala_raw;
@@ -1657,626 +1644,525 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 	_tmp26__length1 = _vala_raw_length1;
 #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_vala_raw_length = (gsize) _tmp26__length1;
-#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp27_ = _vala_raw_length;
-#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (_tmp27_ > ((gsize) 32)) {
-#line 1665 "GPhoto.c"
-		{
-			gsize i = 0UL;
-			gsize _tmp28_ = 0UL;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-			_tmp28_ = _vala_raw_length;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-			i = _tmp28_ - 2;
-#line 1673 "GPhoto.c"
-			{
-				gboolean _tmp29_ = FALSE;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-				_tmp29_ = TRUE;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-				while (TRUE) {
-#line 1680 "GPhoto.c"
-					gsize _tmp31_ = 0UL;
-					gsize _tmp32_ = 0UL;
-					gboolean _tmp33_ = FALSE;
-					guint8* _tmp34_ = NULL;
-					gint _tmp34__length1 = 0;
-					gsize _tmp35_ = 0UL;
-					guint8 _tmp36_ = 0U;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					if (!_tmp29_) {
-#line 1690 "GPhoto.c"
-						gsize _tmp30_ = 0UL;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp30_ = i;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						i = _tmp30_ - 1;
-#line 1696 "GPhoto.c"
-					}
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					_tmp29_ = FALSE;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					_tmp31_ = i;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					_tmp32_ = _vala_raw_length;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					if (!(_tmp31_ > (_tmp32_ - 32))) {
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						break;
-#line 1708 "GPhoto.c"
-					}
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					_tmp34_ = _vala_raw;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					_tmp34__length1 = _vala_raw_length1;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					_tmp35_ = i;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					_tmp36_ = _tmp34_[_tmp35_];
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					if (_tmp36_ == JPEG_MARKER_PREFIX) {
-#line 1720 "GPhoto.c"
-						guint8* _tmp37_ = NULL;
-						gint _tmp37__length1 = 0;
-						gsize _tmp38_ = 0UL;
-						guint8 _tmp39_ = 0U;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp37_ = _vala_raw;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp37__length1 = _vala_raw_length1;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp38_ = i;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp39_ = _tmp37_[_tmp38_ + 1];
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp33_ = _tmp39_ == JPEG_MARKER_EOI;
-#line 1735 "GPhoto.c"
-					} else {
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp33_ = FALSE;
-#line 1739 "GPhoto.c"
-					}
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					if (_tmp33_) {
-#line 1743 "GPhoto.c"
-						const gchar* _tmp40_ = NULL;
-						gsize _tmp41_ = 0UL;
-#line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp40_ = filename;
-#line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						g_debug ("GPhoto.vala:179: Adjusted length of thumbnail for: %s", _tmp40_);
-#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp41_ = i;
-#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_vala_raw_length = _tmp41_ + 2;
-#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						break;
-#line 1756 "GPhoto.c"
-					}
-				}
-			}
-		}
-	}
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp42_ = _vala_raw;
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp42__length1 = _vala_raw_length1;
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp43_ = (_tmp42_ != NULL) ? _vala_array_dup23 (_tmp42_, _tmp42__length1) : ((gpointer) _tmp42_);
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp43__length1 = _tmp42__length1;
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp44_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp43_, _tmp43__length1, NULL);
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	mins = _tmp44_;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp46_ = mins;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp47_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp45_ = _tmp47_;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp27_ = _vala_raw;
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp27__length1 = _vala_raw_length1;
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp28_ = (_tmp27_ != NULL) ? _vala_array_dup23 (_tmp27_, _tmp27__length1) : ((gpointer) _tmp27_);
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp28__length1 = _tmp27__length1;
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp29_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp28_, _tmp28__length1, NULL);
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	mins = _tmp29_;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp31_ = mins;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp32_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp30_ = _tmp32_;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (mins);
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1788 "GPhoto.c"
+#line 1674 "GPhoto.c"
 	}
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp48_ = _tmp45_;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp45_ = NULL;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	result = _tmp48_;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_g_object_unref0 (_tmp45_);
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp33_ = _tmp30_;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp30_ = NULL;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	result = _tmp33_;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_g_object_unref0 (_tmp30_);
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (mins);
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (raw) {
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*raw = _vala_raw;
-#line 1804 "GPhoto.c"
+#line 1690 "GPhoto.c"
 	} else {
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_vala_raw = (g_free (_vala_raw), NULL);
-#line 1808 "GPhoto.c"
+#line 1694 "GPhoto.c"
 	}
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (raw_length1) {
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*raw_length1 = _vala_raw_length1;
-#line 1814 "GPhoto.c"
+#line 1700 "GPhoto.c"
 	}
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (raw_length) {
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*raw_length = _vala_raw_length;
-#line 1820 "GPhoto.c"
+#line 1706 "GPhoto.c"
 	}
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1824 "GPhoto.c"
+#line 1710 "GPhoto.c"
 }
 
 
 GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error) {
 	GdkPixbuf* result = NULL;
 	GInputStream* ins = NULL;
-	GPContext* _tmp0_ = NULL;
-	Camera* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	GInputStream* _tmp4_ = NULL;
-	GInputStream* _tmp5_ = NULL;
+	GPContext* _tmp0_;
+	Camera* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	GInputStream* _tmp4_;
+	GInputStream* _tmp5_;
 	GdkPixbuf* _tmp6_ = NULL;
-	GInputStream* _tmp7_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
-	GdkPixbuf* _tmp9_ = NULL;
+	GInputStream* _tmp7_;
+	GdkPixbuf* _tmp8_;
+	GdkPixbuf* _tmp9_;
 	GError * _inner_error_ = NULL;
-#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp0_ = context;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp1_ = camera;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp2_ = folder;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp3_ = filename;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp4_ = gp_load_file_into_stream (_tmp0_, _tmp1_, _tmp2_, _tmp3_, GP_FILE_TYPE_NORMAL, &_inner_error_);
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	ins = _tmp4_;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1868 "GPhoto.c"
+#line 1754 "GPhoto.c"
 	}
-#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp5_ = ins;
-#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp5_ == NULL) {
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = NULL;
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (ins);
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 1880 "GPhoto.c"
+#line 1766 "GPhoto.c"
 	}
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = ins;
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = gdk_pixbuf_new_from_stream (_tmp7_, NULL, &_inner_error_);
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp6_ = _tmp8_;
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (ins);
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1896 "GPhoto.c"
+#line 1782 "GPhoto.c"
 	}
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp9_ = _tmp6_;
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp6_ = NULL;
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = _tmp9_;
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (_tmp6_);
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (ins);
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1910 "GPhoto.c"
+#line 1796 "GPhoto.c"
 }
 
 
 void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GFile* dest_file, GError** error) {
 	gint fd = 0;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 	CameraFile* camera_file = NULL;
 	int res = 0;
-	gint _tmp12_ = 0;
+	gint _tmp12_;
 	CameraFile* _tmp13_ = NULL;
-	int _tmp14_ = 0;
-	int _tmp15_ = 0;
-	Camera* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	CameraFile* _tmp23_ = NULL;
-	GPContext* _tmp24_ = NULL;
-	int _tmp25_ = 0;
-	int _tmp26_ = 0;
+	int _tmp14_;
+	int _tmp15_;
+	Camera* _tmp20_;
+	const gchar* _tmp21_;
+	const gchar* _tmp22_;
+	CameraFile* _tmp23_;
+	GPContext* _tmp24_;
+	int _tmp25_;
+	int _tmp26_;
 	GError * _inner_error_ = NULL;
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (context != NULL);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (camera != NULL);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (folder != NULL);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (filename != NULL);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (G_IS_FILE (dest_file));
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp0_ = dest_file;
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp2_ = _tmp1_;
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp3_ = creat (_tmp2_, (mode_t) 0640);
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp4_ = _tmp3_;
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_free0 (_tmp2_);
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	fd = _tmp4_;
-#line 201 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp5_ = fd;
-#line 201 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp5_ < 0) {
-#line 1964 "GPhoto.c"
-		gint _tmp6_ = 0;
-		GFile* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		GError* _tmp10_ = NULL;
-		GError* _tmp11_ = NULL;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 1850 "GPhoto.c"
+		gint _tmp6_;
+		GFile* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		GError* _tmp10_;
+		GError* _tmp11_;
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp6_ = errno;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7_ = dest_file;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp8_ = g_file_get_path (_tmp7_);
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp9_ = _tmp8_;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp10_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "[%d] Error creating file %s: %m", _tmp6_, _tmp9_);
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp11_ = _tmp10_;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_free0 (_tmp9_);
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp11_;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 1991 "GPhoto.c"
+#line 1877 "GPhoto.c"
 	}
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp12_ = fd;
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp14_ = gp_file_new_from_fd (&_tmp13_, _tmp12_);
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_file = _tmp13_;
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp14_;
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp15_ = res;
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp15_ != GP_OK) {
-#line 2007 "GPhoto.c"
-		int _tmp16_ = 0;
-		int _tmp17_ = 0;
-		const gchar* _tmp18_ = NULL;
-		GError* _tmp19_ = NULL;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 1893 "GPhoto.c"
+		int _tmp16_;
+		int _tmp17_;
+		const gchar* _tmp18_;
+		GError* _tmp19_;
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = res;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp17_ = res;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp18_ = gp_port_result_as_string (_tmp17_);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp19_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp16_, _tmp18_);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp19_;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 2028 "GPhoto.c"
+#line 1914 "GPhoto.c"
 	}
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp20_ = camera;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp21_ = folder;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp22_ = filename;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp23_ = camera_file;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp24_ = context;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp25_ = gp_camera_file_get (_tmp20_, _tmp21_, _tmp22_, GP_FILE_TYPE_NORMAL, _tmp23_, _tmp24_);
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp25_;
-#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 198 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp26_ = res;
-#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 198 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp26_ != GP_OK) {
-#line 2048 "GPhoto.c"
-		int _tmp27_ = 0;
-		const gchar* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		int _tmp30_ = 0;
-		const gchar* _tmp31_ = NULL;
-		GError* _tmp32_ = NULL;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 1934 "GPhoto.c"
+		int _tmp27_;
+		const gchar* _tmp28_;
+		const gchar* _tmp29_;
+		int _tmp30_;
+		const gchar* _tmp31_;
+		GError* _tmp32_;
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp27_ = res;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp28_ = folder;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp29_ = filename;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp30_ = res;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp31_ = gp_port_result_as_string (_tmp30_);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp32_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp27_, _tmp28_, _tmp29_, _tmp31_);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp32_;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 2075 "GPhoto.c"
+#line 1961 "GPhoto.c"
 	}
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 2079 "GPhoto.c"
+#line 1965 "GPhoto.c"
 }
 
 
 PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error) {
 	PhotoMetadata* result = NULL;
 	guint8* camera_raw = NULL;
-	gint camera_raw_length1 = 0;
-	gint _camera_raw_size_ = 0;
+	gint camera_raw_length1;
+	gint _camera_raw_size_;
 	gboolean _tmp13_ = FALSE;
-	guint8* _tmp14_ = NULL;
-	gint _tmp14__length1 = 0;
+	guint8* _tmp14_;
+	gint _tmp14__length1;
 	PhotoMetadata* metadata = NULL;
-	PhotoMetadata* _tmp16_ = NULL;
-	PhotoMetadata* _tmp17_ = NULL;
-	guint8* _tmp18_ = NULL;
-	gint _tmp18__length1 = 0;
+	PhotoMetadata* _tmp16_;
+	PhotoMetadata* _tmp17_;
+	guint8* _tmp18_;
+	gint _tmp18__length1;
 	GError * _inner_error_ = NULL;
-#line 218 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 218 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 218 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 218 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_raw = NULL;
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_raw_length1 = 0;
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_camera_raw_size_ = camera_raw_length1;
-#line 2111 "GPhoto.c"
+#line 1997 "GPhoto.c"
 	{
 		guint8* _tmp0_ = NULL;
-		GPContext* _tmp1_ = NULL;
-		Camera* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		guint8* _tmp6_ = NULL;
-		gint _tmp0__length1 = 0;
-		gint __tmp0__size_ = 0;
-		guint8* _tmp7_ = NULL;
-		gint _tmp7__length1 = 0;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		GPContext* _tmp1_;
+		Camera* _tmp2_;
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+		gint _tmp5_;
+		guint8* _tmp6_;
+		gint _tmp0__length1;
+		gint __tmp0__size_;
+		guint8* _tmp7_;
+		gint _tmp7__length1;
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp1_ = context;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp2_ = camera;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp3_ = folder;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = filename;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp6_ = gp_load_file_into_buffer (_tmp1_, _tmp2_, _tmp3_, _tmp4_, GP_FILE_TYPE_EXIF, &_tmp5_, &_inner_error_);
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = _tmp6_;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0__length1 = _tmp5_;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		__tmp0__size_ = _tmp0__length1;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2142 "GPhoto.c"
-			goto __catch63_g_error;
+#line 2028 "GPhoto.c"
+			goto __catch64_g_error;
 		}
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7_ = _tmp0_;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7__length1 = _tmp0__length1;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = NULL;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0__length1 = 0;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = _tmp7_;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw_length1 = _tmp7__length1;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_camera_raw_size_ = camera_raw_length1;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = (g_free (_tmp0_), NULL);
-#line 2163 "GPhoto.c"
+#line 2049 "GPhoto.c"
 	}
-	goto __finally63;
-	__catch63_g_error:
+	goto __finally64;
+	__catch64_g_error:
 	{
-		Camera* _tmp8_ = NULL;
-		GPContext* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		PhotoMetadata* _tmp12_ = NULL;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		Camera* _tmp8_;
+		GPContext* _tmp9_;
+		const gchar* _tmp10_;
+		const gchar* _tmp11_;
+		PhotoMetadata* _tmp12_;
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_clear_error (&_inner_error_);
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = NULL;
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp8_ = camera;
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp9_ = context;
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp10_ = folder;
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp11_ = filename;
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp12_ = gp_get_fallback_metadata (_tmp8_, _tmp9_, _tmp10_, _tmp11_);
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = _tmp12_;
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2193 "GPhoto.c"
+#line 2079 "GPhoto.c"
 	}
-	__finally63:
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	__finally64:
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2204 "GPhoto.c"
+#line 2090 "GPhoto.c"
 	}
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp14_ = camera_raw;
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp14__length1 = camera_raw_length1;
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp14_ == NULL) {
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp13_ = TRUE;
-#line 2214 "GPhoto.c"
+#line 2100 "GPhoto.c"
 	} else {
-		guint8* _tmp15_ = NULL;
-		gint _tmp15__length1 = 0;
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		guint8* _tmp15_;
+		gint _tmp15__length1;
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = camera_raw;
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15__length1 = camera_raw_length1;
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp13_ = _tmp15__length1 == 0;
-#line 2224 "GPhoto.c"
+#line 2110 "GPhoto.c"
 	}
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp13_) {
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = NULL;
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2234 "GPhoto.c"
+#line 2120 "GPhoto.c"
 	}
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp16_ = photo_metadata_new ();
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	metadata = _tmp16_;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp17_ = metadata;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp18_ = camera_raw;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp18__length1 = camera_raw_length1;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	photo_metadata_read_from_app1_segment (_tmp17_, _tmp18_, _tmp18__length1, 0, &_inner_error_);
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_media_metadata_unref0 (metadata);
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2258 "GPhoto.c"
+#line 2144 "GPhoto.c"
 	}
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = metadata;
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_raw = (g_free (camera_raw), NULL);
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2266 "GPhoto.c"
+#line 2152 "GPhoto.c"
 }
 
 
 static guint8* _vala_array_dup24 (guint8* self, int length) {
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 2273 "GPhoto.c"
+#line 2159 "GPhoto.c"
 }
 
 
 static void _gp_on_mins_destroyed_gdestroy_notify (void* data) {
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_on_mins_destroyed (data);
-#line 2280 "GPhoto.c"
+#line 2166 "GPhoto.c"
 }
 
 
@@ -2285,312 +2171,312 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 	CameraFile* camera_file = NULL;
 	int res = 0;
 	CameraFile* _tmp0_ = NULL;
-	int _tmp1_ = 0;
-	int _tmp2_ = 0;
-	Camera* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	CameraFileType _tmp10_ = 0;
-	GPContext* _tmp11_ = NULL;
-	int _tmp12_ = 0;
-	int _tmp13_ = 0;
+	int _tmp1_;
+	int _tmp2_;
+	Camera* _tmp7_;
+	const gchar* _tmp8_;
+	const gchar* _tmp9_;
+	CameraFileType _tmp10_;
+	GPContext* _tmp11_;
+	int _tmp12_;
+	int _tmp13_;
 	guint8* data = NULL;
 	gulong data_len = 0UL;
 	guint8* _tmp20_ = NULL;
 	gulong _tmp21_ = 0UL;
-	int _tmp22_ = 0;
-	int _tmp23_ = 0;
+	int _tmp22_;
+	int _tmp23_;
 	GFile* temp = NULL;
-	GFile* _tmp32_ = NULL;
-	GFile* _tmp33_ = NULL;
-	GFile* _tmp34_ = NULL;
-	GFile* _tmp35_ = NULL;
-	GFile* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
-	int _tmp39_ = 0;
-	int _tmp40_ = 0;
+	GFile* _tmp32_;
+	GFile* _tmp33_;
+	GFile* _tmp34_;
+	GFile* _tmp35_;
+	GFile* _tmp36_;
+	gchar* _tmp37_;
+	gchar* _tmp38_;
+	int _tmp39_;
+	int _tmp40_;
 	GFileInputStream* _tmp51_ = NULL;
-	GFile* _tmp52_ = NULL;
-	GFileInputStream* _tmp53_ = NULL;
-	GFileInputStream* _tmp54_ = NULL;
+	GFile* _tmp52_;
+	GFileInputStream* _tmp53_;
+	GFileInputStream* _tmp54_;
 	GError * _inner_error_ = NULL;
-#line 238 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 238 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 238 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 238 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp1_ = gp_file_new (&_tmp0_);
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_file = _tmp0_;
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp1_;
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp2_ = res;
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp2_ != GP_OK) {
-#line 2339 "GPhoto.c"
-		int _tmp3_ = 0;
-		int _tmp4_ = 0;
-		const gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2225 "GPhoto.c"
+		int _tmp3_;
+		int _tmp4_;
+		const gchar* _tmp5_;
+		GError* _tmp6_;
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp3_ = res;
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = res;
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp5_ = gp_port_result_as_string (_tmp4_);
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp6_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp3_, _tmp5_);
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp6_;
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2360 "GPhoto.c"
+#line 2246 "GPhoto.c"
 	}
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = camera;
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = folder;
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp9_ = filename;
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp10_ = filetype;
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp11_ = context;
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp12_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, camera_file, _tmp11_);
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp12_;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp13_ = res;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp13_ != GP_OK) {
-#line 2380 "GPhoto.c"
-		int _tmp14_ = 0;
-		const gchar* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
-		int _tmp17_ = 0;
-		const gchar* _tmp18_ = NULL;
-		GError* _tmp19_ = NULL;
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2266 "GPhoto.c"
+		int _tmp14_;
+		const gchar* _tmp15_;
+		const gchar* _tmp16_;
+		int _tmp17_;
+		const gchar* _tmp18_;
+		GError* _tmp19_;
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp14_ = res;
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = folder;
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = filename;
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp17_ = res;
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp18_ = gp_port_result_as_string (_tmp17_);
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp19_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp14_, _tmp15_, _tmp16_, _tmp18_);
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp19_;
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2407 "GPhoto.c"
+#line 2293 "GPhoto.c"
 	}
-#line 255 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp22_ = gp_file_get_data_and_size (camera_file, &_tmp20_, &_tmp21_);
-#line 255 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	data = _tmp20_;
-#line 255 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	data_len = _tmp21_;
-#line 255 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp22_;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp23_ = res;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp23_ == GP_OK) {
-#line 2421 "GPhoto.c"
+#line 2307 "GPhoto.c"
 		guint8* buffer = NULL;
-		gulong _tmp24_ = 0UL;
-		guint8* _tmp25_ = NULL;
-		gint buffer_length1 = 0;
-		gint _buffer_size_ = 0;
-		guint8* _tmp26_ = NULL;
-		gint _tmp26__length1 = 0;
-		guint8* _tmp27_ = NULL;
-		guint8* _tmp28_ = NULL;
-		gint _tmp28__length1 = 0;
-		guint8* _tmp29_ = NULL;
-		gint _tmp29__length1 = 0;
-		guint8* _tmp30_ = NULL;
-		gint _tmp30__length1 = 0;
-		GMemoryInputStream* _tmp31_ = NULL;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		gulong _tmp24_;
+		guint8* _tmp25_;
+		gint buffer_length1;
+		gint _buffer_size_;
+		guint8* _tmp26_;
+		gint _tmp26__length1;
+		guint8* _tmp27_;
+		guint8* _tmp28_;
+		gint _tmp28__length1;
+		guint8* _tmp29_;
+		gint _tmp29__length1;
+		guint8* _tmp30_;
+		gint _tmp30__length1;
+		GMemoryInputStream* _tmp31_;
+#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp24_ = data_len;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp25_ = g_new0 (guint8, _tmp24_);
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		buffer = _tmp25_;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		buffer_length1 = _tmp24_;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_buffer_size_ = buffer_length1;
-#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp26_ = buffer;
-#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp26__length1 = buffer_length1;
-#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp27_ = data;
-#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp28_ = buffer;
-#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp28__length1 = buffer_length1;
-#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		memcpy (_tmp26_, _tmp27_, (gsize) _tmp28__length1);
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp29_ = buffer;
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp29__length1 = buffer_length1;
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp30_ = (_tmp29_ != NULL) ? _vala_array_dup24 (_tmp29_, _tmp29__length1) : ((gpointer) _tmp29_);
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp30__length1 = _tmp29__length1;
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp31_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp30_, _tmp30__length1, _gp_on_mins_destroyed_gdestroy_notify);
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_input_stream_get_type (), GInputStream);
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		buffer = (g_free (buffer), NULL);
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2477 "GPhoto.c"
+#line 2363 "GPhoto.c"
 	}
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp32_ = app_dirs_get_temp_dir ();
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp33_ = _tmp32_;
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp34_ = g_file_get_child (_tmp33_, "import.tmp");
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp35_ = _tmp34_;
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (_tmp33_);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	temp = _tmp35_;
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp36_ = temp;
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp37_ = g_file_get_path (_tmp36_);
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp38_ = _tmp37_;
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp39_ = gp_file_save (camera_file, _tmp38_);
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp39_;
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_free0 (_tmp38_);
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 252 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp40_ = res;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 252 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp40_ != GP_OK) {
-#line 2507 "GPhoto.c"
-		int _tmp41_ = 0;
-		const gchar* _tmp42_ = NULL;
-		const gchar* _tmp43_ = NULL;
-		GFile* _tmp44_ = NULL;
-		gchar* _tmp45_ = NULL;
-		gchar* _tmp46_ = NULL;
-		int _tmp47_ = 0;
-		const gchar* _tmp48_ = NULL;
-		GError* _tmp49_ = NULL;
-		GError* _tmp50_ = NULL;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2393 "GPhoto.c"
+		int _tmp41_;
+		const gchar* _tmp42_;
+		const gchar* _tmp43_;
+		GFile* _tmp44_;
+		gchar* _tmp45_;
+		gchar* _tmp46_;
+		int _tmp47_;
+		const gchar* _tmp48_;
+		GError* _tmp49_;
+		GError* _tmp50_;
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp41_ = res;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp42_ = folder;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp43_ = filename;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp44_ = temp;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp45_ = g_file_get_path (_tmp44_);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp46_ = _tmp45_;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp47_ = res;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp48_ = gp_port_result_as_string (_tmp47_);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp49_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error copying file %s/%s to %s: %s", (gint) _tmp41_, _tmp42_, _tmp43_, _tmp46_, _tmp48_);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp50_ = _tmp49_;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_free0 (_tmp46_);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp50_;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (temp);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2550 "GPhoto.c"
+#line 2436 "GPhoto.c"
 	}
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp52_ = temp;
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp53_ = g_file_read (_tmp52_, NULL, &_inner_error_);
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp51_ = _tmp53_;
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (temp);
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2568 "GPhoto.c"
+#line 2454 "GPhoto.c"
 	}
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp54_ = _tmp51_;
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp51_ = NULL;
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, g_input_stream_get_type (), GInputStream);
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (_tmp51_);
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (temp);
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2584 "GPhoto.c"
+#line 2470 "GPhoto.c"
 }
 
 
 void gp_on_mins_destroyed (void* data) {
-	void* _tmp0_ = NULL;
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	void* _tmp0_;
+#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp0_ = data;
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_free (_tmp0_);
-#line 2594 "GPhoto.c"
+#line 2480 "GPhoto.c"
 }
 
 
@@ -2599,202 +2485,202 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
 	CameraFile* camera_file = NULL;
 	int res = 0;
 	CameraFile* _tmp0_ = NULL;
-	int _tmp1_ = 0;
-	int _tmp2_ = 0;
-	Camera* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	CameraFileType _tmp10_ = 0;
-	CameraFile* _tmp11_ = NULL;
-	GPContext* _tmp12_ = NULL;
-	int _tmp13_ = 0;
-	int _tmp14_ = 0;
+	int _tmp1_;
+	int _tmp2_;
+	Camera* _tmp7_;
+	const gchar* _tmp8_;
+	const gchar* _tmp9_;
+	CameraFileType _tmp10_;
+	CameraFile* _tmp11_;
+	GPContext* _tmp12_;
+	int _tmp13_;
+	int _tmp14_;
 	guint8* data = NULL;
 	gulong data_len = 0UL;
-	CameraFile* _tmp21_ = NULL;
+	CameraFile* _tmp21_;
 	guint8* _tmp22_ = NULL;
 	gulong _tmp23_ = 0UL;
-	int _tmp24_ = 0;
-	int _tmp25_ = 0;
+	int _tmp24_;
+	int _tmp25_;
 	guint8* buffer = NULL;
-	gulong _tmp27_ = 0UL;
-	guint8* _tmp28_ = NULL;
-	gint buffer_length1 = 0;
-	gint _buffer_size_ = 0;
-	guint8* _tmp29_ = NULL;
-	gint _tmp29__length1 = 0;
-	guint8* _tmp30_ = NULL;
-	guint8* _tmp31_ = NULL;
-	gint _tmp31__length1 = 0;
-	guint8* _tmp32_ = NULL;
-	gint _tmp32__length1 = 0;
+	gulong _tmp27_;
+	guint8* _tmp28_;
+	gint buffer_length1;
+	gint _buffer_size_;
+	guint8* _tmp29_;
+	gint _tmp29__length1;
+	guint8* _tmp30_;
+	guint8* _tmp31_;
+	gint _tmp31__length1;
+	guint8* _tmp32_;
+	gint _tmp32__length1;
 	GError * _inner_error_ = NULL;
-#line 278 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 278 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 278 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 278 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp1_ = gp_file_new (&_tmp0_);
-#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_file = _tmp0_;
-#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp1_;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp2_ = res;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp2_ != GP_OK) {
-#line 2653 "GPhoto.c"
-		int _tmp3_ = 0;
-		int _tmp4_ = 0;
-		const gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-#line 283 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2539 "GPhoto.c"
+		int _tmp3_;
+		int _tmp4_;
+		const gchar* _tmp5_;
+		GError* _tmp6_;
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp3_ = res;
-#line 283 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = res;
-#line 283 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp5_ = gp_port_result_as_string (_tmp4_);
-#line 283 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp6_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp3_, _tmp5_);
-#line 283 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp6_;
-#line 283 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 283 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 283 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2674 "GPhoto.c"
+#line 2560 "GPhoto.c"
 	}
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = camera;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = folder;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp9_ = filename;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp10_ = filetype;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp11_ = camera_file;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp12_ = context;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp13_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, _tmp11_, _tmp12_);
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp13_;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp14_ = res;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp14_ != GP_OK) {
-#line 2696 "GPhoto.c"
-		int _tmp15_ = 0;
-		const gchar* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
-		int _tmp18_ = 0;
-		const gchar* _tmp19_ = NULL;
-		GError* _tmp20_ = NULL;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2582 "GPhoto.c"
+		int _tmp15_;
+		const gchar* _tmp16_;
+		const gchar* _tmp17_;
+		int _tmp18_;
+		const gchar* _tmp19_;
+		GError* _tmp20_;
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = res;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = folder;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp17_ = filename;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp18_ = res;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp19_ = gp_port_result_as_string (_tmp18_);
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp20_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp15_, _tmp16_, _tmp17_, _tmp19_);
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp20_;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2723 "GPhoto.c"
+#line 2609 "GPhoto.c"
 	}
-#line 294 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp21_ = camera_file;
-#line 294 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp24_ = gp_file_get_data_and_size (_tmp21_, &_tmp22_, &_tmp23_);
-#line 294 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	data = _tmp22_;
-#line 294 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	data_len = _tmp23_;
-#line 294 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp24_;
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp25_ = res;
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp25_ != GP_OK) {
-#line 2739 "GPhoto.c"
-		guint8* _tmp26_ = NULL;
-		gint _tmp26__length1 = 0;
-#line 296 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2625 "GPhoto.c"
+		guint8* _tmp26_;
+		gint _tmp26__length1;
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp26_ = NULL;
-#line 296 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp26__length1 = 0;
-#line 296 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (result_length1) {
-#line 296 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*result_length1 = _tmp26__length1;
-#line 2750 "GPhoto.c"
+#line 2636 "GPhoto.c"
 		}
-#line 296 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = _tmp26_;
-#line 296 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 296 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2758 "GPhoto.c"
+#line 2644 "GPhoto.c"
 	}
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp27_ = data_len;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp28_ = g_new0 (guint8, _tmp27_);
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	buffer = _tmp28_;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	buffer_length1 = _tmp27_;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_buffer_size_ = buffer_length1;
-#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp29_ = buffer;
-#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp29__length1 = buffer_length1;
-#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp30_ = data;
-#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp31_ = buffer;
-#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp31__length1 = buffer_length1;
-#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	memcpy (_tmp29_, _tmp30_, (gsize) _tmp31__length1);
-#line 301 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp32_ = buffer;
-#line 301 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp32__length1 = buffer_length1;
-#line 301 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (result_length1) {
-#line 301 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*result_length1 = _tmp32__length1;
-#line 2790 "GPhoto.c"
+#line 2676 "GPhoto.c"
 	}
-#line 301 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = _tmp32_;
-#line 301 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 301 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2798 "GPhoto.c"
+#line 2684 "GPhoto.c"
 }
 
 
diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala
index 5919080..8dab941 100644
--- a/src/camera/GPhoto.vala
+++ b/src/camera/GPhoto.vala
@@ -169,20 +169,6 @@ namespace GPhoto {
         
         raw_length = raw.length;
         
-        // Try to make sure last two bytes are JPEG footer.
-        // This is necessary because GPhoto sometimes includes a few extra bytes. See
-        // Yorba bug #2905 and the following GPhoto bug:
-        // http://sourceforge.net/tracker/?func=detail&aid=3141521&group_id=8874&atid=108874
-        if (raw_length > 32) {
-            for (size_t i = raw_length - 2; i > raw_length - 32; i--) {
-                if (raw[i] == Jpeg.MARKER_PREFIX && raw[i + 1] == Jpeg.Marker.EOI) {
-                    debug("Adjusted length of thumbnail for: %s", filename);
-                    raw_length = i + 2;
-                    break;
-                }
-            }
-        }
-        
         MemoryInputStream mins = new MemoryInputStream.from_data(raw, null);
         return new Gdk.Pixbuf.from_stream_at_scale(mins, ImportPreview.MAX_SCALE, ImportPreview.MAX_SCALE, true, null);
     }
diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c
index e049511..2f5582f 100644
--- a/src/camera/ImportPage.c
+++ b/src/camera/ImportPage.c
@@ -1,4 +1,4 @@
-/* ImportPage.c generated by valac 0.34.7, the Vala compiler
+/* ImportPage.c generated by valac 0.36.6, the Vala compiler
  * generated from ImportPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1393,8 +1393,8 @@ struct _BatchImportJobClass {
 	gchar* (*get_path) (BatchImportJob* self);
 	DuplicatedFile* (*get_duplicated_file) (BatchImportJob* self);
 	void (*set_associated) (BatchImportJob* self, BatchImportJob* associated);
-	gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile** file_or_dir);
-	gboolean (*prepare) (BatchImportJob* self, GFile** file_to_import, gboolean* copy_to_library, GError** error);
+	gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir);
+	gboolean (*prepare) (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
 	gboolean (*complete) (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
 	time_t (*get_exposure_time_override) (BatchImportJob* self);
 };
@@ -1507,7 +1507,7 @@ struct _ImportPageHideImportedViewFilterClass {
 static gpointer import_source_collection_parent_class = NULL;
 static gpointer import_source_parent_class = NULL;
 extern GPSpinIdleWrapper* import_page_spin_idle_context;
-static IndexableIface* import_source_indexable_parent_iface = NULL;
+static IndexableIface * import_source_indexable_parent_iface = NULL;
 static gpointer video_import_source_parent_class = NULL;
 static gpointer photo_import_source_parent_class = NULL;
 static gpointer import_preview_parent_class = NULL;
@@ -1517,7 +1517,7 @@ extern LibraryPhotoSourceCollection* library_photo_global;
 extern VideoSourceCollection* video_global;
 static gpointer camera_view_tracker_parent_class = NULL;
 static gpointer camera_accumulator_parent_class = NULL;
-static CoreTrackerAccumulatorIface* camera_accumulator_core_tracker_accumulator_parent_iface = NULL;
+static CoreTrackerAccumulatorIface * camera_accumulator_core_tracker_accumulator_parent_iface = NULL;
 static gpointer import_page_parent_class = NULL;
 extern GPContextWrapper* import_page_null_context;
 GPContextWrapper* import_page_null_context = NULL;
@@ -1613,7 +1613,7 @@ gpointer gp_value_get_context_wrapper (const GValue* value);
 GType gp_context_wrapper_get_type (void) G_GNUC_CONST;
 GType gp_spin_idle_wrapper_get_type (void) G_GNUC_CONST;
 static const gchar* import_source_real_get_indexable_keywords (Indexable* base);
-static void import_source_finalize (GObject* obj);
+static void import_source_finalize (GObject * obj);
 GType video_import_source_get_type (void) G_GNUC_CONST;
 enum  {
 	VIDEO_IMPORT_SOURCE_DUMMY_PROPERTY
@@ -1676,7 +1676,7 @@ gchar* photo_import_source_get_preview_md5 (PhotoImportSource* self);
 void photo_import_source_set_associated (PhotoImportSource* self, PhotoImportSource* associated);
 PhotoImportSource* photo_import_source_get_associated (PhotoImportSource* self);
 static gboolean photo_import_source_real_internal_delete_backing (DataSource* base, GError** error);
-static void photo_import_source_finalize (GObject* obj);
+static void photo_import_source_finalize (GObject * obj);
 GType data_view_get_type (void) G_GNUC_CONST;
 GType thumbnail_view_get_type (void) G_GNUC_CONST;
 GType checkerboard_item_get_type (void) G_GNUC_CONST;
@@ -1733,7 +1733,7 @@ DuplicatedFile* duplicated_file_create_from_video_id (VideoID* video_id);
 void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize, VideoID* result);
 DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self);
 DataSource* data_view_get_source (DataView* self);
-static void import_preview_finalize (GObject* obj);
+static void import_preview_finalize (GObject * obj);
 gpointer core_tracker_ref (gpointer instance);
 void core_tracker_unref (gpointer instance);
 GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1756,14 +1756,14 @@ CoreViewTracker* core_view_tracker_new (ViewCollection* collection);
 CoreViewTracker* core_view_tracker_construct (GType object_type, ViewCollection* collection);
 GType core_tracker_accumulator_get_type (void) G_GNUC_CONST;
 void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected);
-static void camera_view_tracker_finalize (CoreTracker* obj);
+static void camera_view_tracker_finalize (CoreTracker * obj);
 #define CAMERA_ACCUMULATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CAMERA_ACCUMULATOR, CameraAccumulatorPrivate))
 enum  {
 	CAMERA_ACCUMULATOR_DUMMY_PROPERTY,
-	CAMERA_ACCUMULATOR_TOTAL,
-	CAMERA_ACCUMULATOR_PHOTOS,
-	CAMERA_ACCUMULATOR_VIDEOS,
-	CAMERA_ACCUMULATOR_RAW
+	CAMERA_ACCUMULATOR_TOTAL_PROPERTY,
+	CAMERA_ACCUMULATOR_PHOTOS_PROPERTY,
+	CAMERA_ACCUMULATOR_VIDEOS_PROPERTY,
+	CAMERA_ACCUMULATOR_RAW_PROPERTY
 };
 static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, DataObject* object);
 gint camera_accumulator_get_total (CameraAccumulator* self);
@@ -1777,7 +1777,7 @@ static void camera_accumulator_set_videos (CameraAccumulator* self, gint value);
 static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base, DataObject* object);
 static gboolean camera_accumulator_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration);
 gchar* camera_accumulator_to_string (CameraAccumulator* self);
-static void camera_accumulator_finalize (GObject* obj);
+static void camera_accumulator_finalize (GObject * obj);
 static void _vala_camera_accumulator_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_camera_accumulator_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 GType page_get_type (void) G_GNUC_CONST;
@@ -1947,7 +1947,7 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename);
 PhotoFileFormat photo_file_format_from_gphoto_type (const gchar* type);
 PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basename);
 void spin_event_loop (void);
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
 PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error);
 guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_preview, int* result_length1);
 gchar* md5_binary (guint8* buffer, gsize length);
@@ -2032,7 +2032,7 @@ enum  {
 };
 ViewManager* view_manager_construct (GType object_type);
 static DataView* import_page_import_view_manager_real_create_view (ViewManager* base, DataSource* source);
-static void import_page_import_view_manager_finalize (ViewManager* obj);
+static void import_page_import_view_manager_finalize (ViewManager * obj);
 gpointer backing_photo_row_ref (gpointer instance);
 void backing_photo_row_unref (gpointer instance);
 GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -2053,8 +2053,8 @@ static gchar* import_page_camera_import_job_real_get_basename (BatchImportJob* b
 static gchar* import_page_camera_import_job_real_get_path (BatchImportJob* base);
 static void import_page_camera_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated);
 static gboolean import_page_camera_import_job_real_is_directory (BatchImportJob* base);
-static gboolean import_page_camera_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile** file);
-static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base, GFile** file_to_import, gboolean* copy_to_library, GError** error);
+static gboolean import_page_camera_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file);
+static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
 GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata* metadata, time_t ts, gboolean* collision, GError** error);
 void library_monitor_blacklist_file (GFile* file, const gchar* reason);
 void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GFile* dest_file, GError** error);
@@ -2069,7 +2069,7 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
 void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, GError** error);
 void photo_set_raw_developer (Photo* self, RawDeveloper d);
 RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
-static void import_page_camera_import_job_finalize (BatchImportJob* obj);
+static void import_page_camera_import_job_finalize (BatchImportJob * obj);
 enum  {
 	IMPORT_PAGE_IMPORT_PAGE_SEARCH_VIEW_FILTER_DUMMY_PROPERTY
 };
@@ -2089,13 +2089,13 @@ enum  {
 };
 static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter* base, DataView* view);
 ViewFilter* view_filter_construct (GType object_type);
-static void import_page_finalize (GObject* obj);
+static void import_page_finalize (GObject * obj);
 
 static const GActionEntry IMPORT_PAGE_entries[3] = {{"ImportSelected", _import_page_on_import_selected_gsimple_action_activate_callback}, {"ImportAll", _import_page_on_import_all_gsimple_action_activate_callback}, {"ViewTitle", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _import_page_on_display_titles_gsimple_action_change_state_callback}};
 
 ImportSourceCollection* import_source_collection_construct (GType object_type, const gchar* name) {
 	ImportSourceCollection* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 8 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 9 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2118,7 +2118,7 @@ ImportSourceCollection* import_source_collection_new (const gchar* name) {
 static gboolean import_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) {
 	ImportSourceCollection * self;
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_SOURCE_COLLECTION, ImportSourceCollection);
 #line 12 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2137,7 +2137,7 @@ static void import_source_collection_class_init (ImportSourceCollectionClass * k
 #line 7 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_source_collection_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) import_source_collection_real_holds_type_of_source;
+	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) import_source_collection_real_holds_type_of_source;
 #line 2141 "ImportPage.c"
 }
 
@@ -2167,19 +2167,19 @@ static gpointer _GPHOTO_REF_CAMERA0 (gpointer self) {
 
 ImportSource* import_source_construct (GType object_type, const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time) {
 	ImportSource * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	Camera* _tmp2_ = NULL;
-	Camera* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gulong _tmp9_ = 0UL;
-	time_t _tmp10_ = 0;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	Camera* _tmp2_;
+	Camera* _tmp3_;
+	gint _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	const gchar* _tmp7_;
+	gchar* _tmp8_;
+	gulong _tmp9_;
+	time_t _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
 #line 28 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (camera_name != NULL, NULL);
 #line 28 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2256,8 +2256,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 
 void import_source_set_preview (ImportSource* self, GdkPixbuf* preview) {
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
 #line 40 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_SOURCE (self));
 #line 40 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2276,8 +2276,8 @@ void import_source_set_preview (ImportSource* self, GdkPixbuf* preview) {
 
 gchar* import_source_get_camera_name (ImportSource* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 44 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_SOURCE (self), NULL);
 #line 45 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2294,8 +2294,8 @@ gchar* import_source_get_camera_name (ImportSource* self) {
 
 Camera* import_source_get_camera (ImportSource* self) {
 	Camera* result = NULL;
-	Camera* _tmp0_ = NULL;
-	Camera* _tmp1_ = NULL;
+	Camera* _tmp0_;
+	Camera* _tmp1_;
 #line 48 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_SOURCE (self), NULL);
 #line 49 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2312,7 +2312,7 @@ Camera* import_source_get_camera (ImportSource* self) {
 
 gint import_source_get_fsid (ImportSource* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 52 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_SOURCE (self), 0);
 #line 53 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2327,8 +2327,8 @@ gint import_source_get_fsid (ImportSource* self) {
 
 gchar* import_source_get_folder (ImportSource* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_SOURCE (self), NULL);
 #line 57 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2345,8 +2345,8 @@ gchar* import_source_get_folder (ImportSource* self) {
 
 gchar* import_source_get_filename (ImportSource* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 60 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_SOURCE (self), NULL);
 #line 61 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2363,7 +2363,7 @@ gchar* import_source_get_filename (ImportSource* self) {
 
 gulong import_source_get_filesize (ImportSource* self) {
 	gulong result = 0UL;
-	gulong _tmp0_ = 0UL;
+	gulong _tmp0_;
 #line 64 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_SOURCE (self), 0UL);
 #line 65 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2378,7 +2378,7 @@ gulong import_source_get_filesize (ImportSource* self) {
 
 time_t import_source_get_modification_time (ImportSource* self) {
 	time_t result = 0;
-	time_t _tmp0_ = 0;
+	time_t _tmp0_;
 #line 68 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_SOURCE (self), 0);
 #line 69 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2393,8 +2393,8 @@ time_t import_source_get_modification_time (ImportSource* self) {
 
 static GdkPixbuf* import_source_real_get_preview (ImportSource* self) {
 	GdkPixbuf* result = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
 #line 73 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->preview;
 #line 73 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2418,7 +2418,7 @@ GdkPixbuf* import_source_get_preview (ImportSource* self) {
 
 static time_t import_source_real_get_exposure_time (ImportSource* self) {
 	time_t result = 0;
-	time_t _tmp0_ = 0;
+	time_t _tmp0_;
 #line 77 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = import_source_get_modification_time (self);
 #line 77 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2440,15 +2440,15 @@ time_t import_source_get_exposure_time (ImportSource* self) {
 
 gchar* import_source_get_fulldir (ImportSource* self) {
 	gchar* result = NULL;
-	Camera* _tmp0_ = NULL;
-	Camera* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	Camera* _tmp0_;
+	Camera* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gint _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
 #line 80 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_SOURCE (self), NULL);
 #line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2486,14 +2486,14 @@ gchar* import_source_get_fulldir (ImportSource* self) {
 static gchar* import_source_real_to_string (DataObject* base) {
 	ImportSource * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
 #line 84 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_SOURCE, ImportSource);
 #line 85 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2528,8 +2528,8 @@ static gchar* import_source_real_to_string (DataObject* base) {
 
 static gchar* gp_result_to_full_string (int self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 482 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
 	_tmp0_ = gp_port_result_as_string (self);
 #line 482 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
@@ -2545,26 +2545,26 @@ static gchar* gp_result_to_full_string (int self) {
 static gboolean import_source_real_internal_delete_backing (DataSource* base, GError** error) {
 	ImportSource * self;
 	gboolean result = FALSE;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
 	gchar* fulldir = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
 	int _result_ = 0;
-	Camera* _tmp11_ = NULL;
-	Camera* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	GPSpinIdleWrapper* _tmp16_ = NULL;
-	GPContext* _tmp17_ = NULL;
-	int _tmp18_ = 0;
-	int _tmp19_ = 0;
-	int _tmp20_ = 0;
+	Camera* _tmp11_;
+	Camera* _tmp12_;
+	const gchar* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	GPSpinIdleWrapper* _tmp16_;
+	GPContext* _tmp17_;
+	int _tmp18_;
+	int _tmp19_;
+	int _tmp20_;
 	gboolean _tmp27_ = FALSE;
 	gboolean _tmp28_ = FALSE;
-	gboolean _tmp29_ = FALSE;
+	gboolean _tmp29_;
 	GError * _inner_error_ = NULL;
 #line 88 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_SOURCE, ImportSource);
@@ -2587,11 +2587,11 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 #line 92 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ == NULL) {
 #line 2589 "ImportPage.c"
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		const gchar* _tmp7_;
 		gboolean _tmp8_ = FALSE;
-		gboolean _tmp9_ = FALSE;
+		gboolean _tmp9_;
 #line 93 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
 #line 93 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2655,12 +2655,12 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 #line 100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp20_ != GP_OK) {
 #line 2657 "ImportPage.c"
-		gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		const gchar* _tmp23_ = NULL;
-		int _tmp24_ = 0;
-		gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
+		const gchar* _tmp23_;
+		int _tmp24_;
+		gchar* _tmp25_;
+		gchar* _tmp26_;
 #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp21_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
 #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2700,7 +2700,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp28_) {
 #line 2702 "ImportPage.c"
-		int _tmp31_ = 0;
+		int _tmp31_;
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp31_ = _result_;
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2724,7 +2724,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 static const gchar* import_source_real_get_indexable_keywords (Indexable* base) {
 	ImportSource * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 106 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_SOURCE, ImportSource);
 #line 107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2743,13 +2743,13 @@ static void import_source_class_init (ImportSourceClass * klass) {
 #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_type_class_add_private (klass, sizeof (ImportSourcePrivate));
 #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((ImportSourceClass *) klass)->get_preview = (GdkPixbuf* (*)(ImportSource*)) import_source_real_get_preview;
+	((ImportSourceClass *) klass)->get_preview = (GdkPixbuf* (*) (ImportSource *)) import_source_real_get_preview;
 #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((ImportSourceClass *) klass)->get_exposure_time = (time_t (*)(ImportSource*)) import_source_real_get_exposure_time;
+	((ImportSourceClass *) klass)->get_exposure_time = (time_t (*) (ImportSource *)) import_source_real_get_exposure_time;
 #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) import_source_real_to_string;
+	((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) import_source_real_to_string;
 #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*)(DataSource*, GError**)) import_source_real_internal_delete_backing;
+	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) import_source_real_internal_delete_backing;
 #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = import_source_finalize;
 #line 2755 "ImportPage.c"
@@ -2760,7 +2760,7 @@ static void import_source_indexable_interface_init (IndexableIface * iface) {
 #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_source_indexable_parent_iface = g_type_interface_peek_parent (iface);
 #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	iface->get_indexable_keywords = (const gchar* (*)(Indexable*)) import_source_real_get_indexable_keywords;
+	iface->get_indexable_keywords = (const gchar* (*) (Indexable *)) import_source_real_get_indexable_keywords;
 #line 2764 "ImportPage.c"
 }
 
@@ -2776,7 +2776,7 @@ static void import_source_instance_init (ImportSource * self) {
 }
 
 
-static void import_source_finalize (GObject* obj) {
+static void import_source_finalize (GObject * obj) {
 	ImportSource * self;
 #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_SOURCE, ImportSource);
@@ -2814,13 +2814,13 @@ GType import_source_get_type (void) {
 
 VideoImportSource* video_import_source_construct (GType object_type, const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time) {
 	VideoImportSource * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	Camera* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gulong _tmp5_ = 0UL;
-	time_t _tmp6_ = 0;
+	const gchar* _tmp0_;
+	Camera* _tmp1_;
+	gint _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gulong _tmp5_;
+	time_t _tmp6_;
 #line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (camera_name != NULL, NULL);
 #line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2862,9 +2862,9 @@ static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base,
 	VideoImportSource * self;
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
+	gint _tmp1_;
+	GdkPixbuf* _tmp2_;
+	GdkPixbuf* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 117 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource);
@@ -2899,11 +2899,11 @@ static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base,
 static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error) {
 	VideoImportSource * self;
 	GdkPixbuf* result = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	gboolean _tmp2_;
 	GdkPixbuf* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	gint _tmp4_;
 #line 121 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource);
 #line 122 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2927,10 +2927,10 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba
 #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ > 0) {
 #line 2929 "ImportPage.c"
-		GdkPixbuf* _tmp5_ = NULL;
-		GdkPixbuf* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		GdkPixbuf* _tmp8_ = NULL;
+		GdkPixbuf* _tmp5_;
+		GdkPixbuf* _tmp6_;
+		gint _tmp7_;
+		GdkPixbuf* _tmp8_;
 #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
 #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2947,7 +2947,7 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba
 		_g_object_unref0 (_tmp6_);
 #line 2948 "ImportPage.c"
 	} else {
-		GdkPixbuf* _tmp9_ = NULL;
+		GdkPixbuf* _tmp9_;
 #line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
 #line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2967,7 +2967,7 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba
 static gchar* video_import_source_real_get_typename (DataSource* base) {
 	VideoImportSource * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource);
 #line 132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2983,7 +2983,7 @@ static gchar* video_import_source_real_get_typename (DataSource* base) {
 static gint64 video_import_source_real_get_instance_id (DataSource* base) {
 	VideoImportSource * self;
 	gint64 result = 0LL;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource);
 #line 136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2999,7 +2999,7 @@ static gint64 video_import_source_real_get_instance_id (DataSource* base) {
 static PhotoFileFormat video_import_source_real_get_preferred_thumbnail_format (ThumbnailSource* base) {
 	VideoImportSource * self;
 	PhotoFileFormat result = 0;
-	PhotoFileFormat _tmp0_ = 0;
+	PhotoFileFormat _tmp0_;
 #line 139 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource);
 #line 140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3015,7 +3015,7 @@ static PhotoFileFormat video_import_source_real_get_preferred_thumbnail_format (
 static gchar* video_import_source_real_get_name (DataObject* base) {
 	VideoImportSource * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource);
 #line 144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3030,7 +3030,7 @@ static gchar* video_import_source_real_get_name (DataObject* base) {
 
 void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) {
 	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
+	GdkPixbuf* _tmp1_;
 #line 147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_VIDEO_IMPORT_SOURCE (self));
 #line 147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3040,8 +3040,8 @@ void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) {
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_ != NULL) {
 #line 3042 "ImportPage.c"
-		GdkPixbuf* _tmp2_ = NULL;
-		GdkPixbuf* _tmp3_ = NULL;
+		GdkPixbuf* _tmp2_;
+		GdkPixbuf* _tmp3_;
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = preview;
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3052,7 +3052,7 @@ void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) {
 		_tmp0_ = _tmp3_;
 #line 3053 "ImportPage.c"
 	} else {
-		GdkPixbuf* _tmp4_ = NULL;
+		GdkPixbuf* _tmp4_;
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = resources_get_noninterpretable_badge_pixbuf ();
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3073,17 +3073,17 @@ static void video_import_source_class_init (VideoImportSourceClass * klass) {
 #line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	video_import_source_parent_class = g_type_class_peek_parent (klass);
 #line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) video_import_source_real_get_thumbnail;
+	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) video_import_source_real_get_thumbnail;
 #line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) video_import_source_real_create_thumbnail;
+	((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) video_import_source_real_create_thumbnail;
 #line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) video_import_source_real_get_typename;
+	((DataSourceClass *) klass)->get_typename = (gchar* (*) (DataSource *)) video_import_source_real_get_typename;
 #line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) video_import_source_real_get_instance_id;
+	((DataSourceClass *) klass)->get_instance_id = (gint64 (*) (DataSource *)) video_import_source_real_get_instance_id;
 #line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*)(ThumbnailSource*)) video_import_source_real_get_preferred_thumbnail_format;
+	((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*) (ThumbnailSource *)) video_import_source_real_get_preferred_thumbnail_format;
 #line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) video_import_source_real_get_name;
+	((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) video_import_source_real_get_name;
 #line 3087 "ImportPage.c"
 }
 
@@ -3106,14 +3106,14 @@ GType video_import_source_get_type (void) {
 
 PhotoImportSource* photo_import_source_construct (GType object_type, const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time, PhotoFileFormat file_format) {
 	PhotoImportSource * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	Camera* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gulong _tmp5_ = 0UL;
-	time_t _tmp6_ = 0;
-	PhotoFileFormat _tmp7_ = 0;
+	const gchar* _tmp0_;
+	Camera* _tmp1_;
+	gint _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gulong _tmp5_;
+	time_t _tmp6_;
+	PhotoFileFormat _tmp7_;
 #line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (camera_name != NULL, NULL);
 #line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3159,10 +3159,10 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
 	PhotoImportSource * self;
 	gchar* result = NULL;
 	gchar* title = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 #line 167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
 #line 168 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3176,8 +3176,8 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp3_) {
 #line 3178 "ImportPage.c"
-		const gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = title;
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3188,7 +3188,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
 		_tmp1_ = _tmp5_;
 #line 3189 "ImportPage.c"
 	} else {
-		gchar* _tmp6_ = NULL;
+		gchar* _tmp6_;
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3210,7 +3210,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
 static gchar* photo_import_source_real_get_typename (DataSource* base) {
 	PhotoImportSource * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 173 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
 #line 174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3226,7 +3226,7 @@ static gchar* photo_import_source_real_get_typename (DataSource* base) {
 static gint64 photo_import_source_real_get_instance_id (DataSource* base) {
 	PhotoImportSource * self;
 	gint64 result = 0LL;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
 #line 178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3243,8 +3243,8 @@ static PhotoFileFormat photo_import_source_real_get_preferred_thumbnail_format (
 	PhotoImportSource * self;
 	PhotoFileFormat result = 0;
 	PhotoFileFormat _tmp0_ = 0;
-	PhotoFileFormat _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
+	PhotoFileFormat _tmp1_;
+	gboolean _tmp2_;
 #line 181 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
 #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3254,14 +3254,14 @@ static PhotoFileFormat photo_import_source_real_get_preferred_thumbnail_format (
 #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_) {
 #line 3256 "ImportPage.c"
-		PhotoFileFormat _tmp3_ = 0;
+		PhotoFileFormat _tmp3_;
 #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->file_format;
 #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp3_;
 #line 3262 "ImportPage.c"
 	} else {
-		PhotoFileFormat _tmp4_ = 0;
+		PhotoFileFormat _tmp4_;
 #line 183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = photo_file_format_get_system_default_format ();
 #line 183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3279,11 +3279,11 @@ static PhotoFileFormat photo_import_source_real_get_preferred_thumbnail_format (
 static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error) {
 	PhotoImportSource * self;
 	GdkPixbuf* result = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	gboolean _tmp2_;
 	GdkPixbuf* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	gint _tmp4_;
 #line 186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
 #line 187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3307,10 +3307,10 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ > 0) {
 #line 3309 "ImportPage.c"
-		GdkPixbuf* _tmp5_ = NULL;
-		GdkPixbuf* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		GdkPixbuf* _tmp8_ = NULL;
+		GdkPixbuf* _tmp5_;
+		GdkPixbuf* _tmp6_;
+		gint _tmp7_;
+		GdkPixbuf* _tmp8_;
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3327,7 +3327,7 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba
 		_g_object_unref0 (_tmp6_);
 #line 3328 "ImportPage.c"
 	} else {
-		GdkPixbuf* _tmp9_ = NULL;
+		GdkPixbuf* _tmp9_;
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3352,13 +3352,13 @@ static gpointer _media_metadata_ref0 (gpointer self) {
 
 
 void photo_import_source_update (PhotoImportSource* self, GdkPixbuf* preview, const gchar* preview_md5, PhotoMetadata* metadata, const gchar* exif_md5) {
-	GdkPixbuf* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	PhotoMetadata* _tmp3_ = NULL;
-	PhotoMetadata* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	GdkPixbuf* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	PhotoMetadata* _tmp3_;
+	PhotoMetadata* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_PHOTO_IMPORT_SOURCE (self));
 #line 196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3400,12 +3400,12 @@ void photo_import_source_update (PhotoImportSource* self, GdkPixbuf* preview, co
 static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
 	PhotoImportSource * self;
 	time_t result = 0;
-	PhotoMetadata* _tmp0_ = NULL;
+	PhotoMetadata* _tmp0_;
 	MetadataDateTime* date_time = NULL;
-	PhotoMetadata* _tmp2_ = NULL;
-	MetadataDateTime* _tmp3_ = NULL;
+	PhotoMetadata* _tmp2_;
+	MetadataDateTime* _tmp3_;
 	time_t _tmp4_ = 0;
-	MetadataDateTime* _tmp5_ = NULL;
+	MetadataDateTime* _tmp5_;
 #line 203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
 #line 204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3413,7 +3413,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
 #line 204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ == NULL) {
 #line 3415 "ImportPage.c"
-		time_t _tmp1_ = 0;
+		time_t _tmp1_;
 #line 205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = import_source_get_modification_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
 #line 205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3433,8 +3433,8 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_ != NULL) {
 #line 3435 "ImportPage.c"
-		MetadataDateTime* _tmp6_ = NULL;
-		time_t _tmp7_ = 0;
+		MetadataDateTime* _tmp6_;
+		time_t _tmp7_;
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = date_time;
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3443,7 +3443,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
 		_tmp4_ = _tmp7_;
 #line 3444 "ImportPage.c"
 	} else {
-		time_t _tmp8_ = 0;
+		time_t _tmp8_;
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = import_source_get_modification_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3463,7 +3463,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
 gchar* photo_import_source_get_title (PhotoImportSource* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	PhotoMetadata* _tmp1_ = NULL;
+	PhotoMetadata* _tmp1_;
 #line 212 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_PHOTO_IMPORT_SOURCE (self), NULL);
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3471,8 +3471,8 @@ gchar* photo_import_source_get_title (PhotoImportSource* self) {
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_ != NULL) {
 #line 3473 "ImportPage.c"
-		PhotoMetadata* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+		PhotoMetadata* _tmp2_;
+		gchar* _tmp3_;
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = self->priv->metadata;
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3499,9 +3499,9 @@ gchar* photo_import_source_get_title (PhotoImportSource* self) {
 
 PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
 	PhotoMetadata* result = NULL;
-	PhotoImportSource* _tmp0_ = NULL;
-	PhotoMetadata* _tmp3_ = NULL;
-	PhotoMetadata* _tmp4_ = NULL;
+	PhotoImportSource* _tmp0_;
+	PhotoMetadata* _tmp3_;
+	PhotoMetadata* _tmp4_;
 #line 216 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_PHOTO_IMPORT_SOURCE (self), NULL);
 #line 217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3509,8 +3509,8 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
 #line 217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ != NULL) {
 #line 3511 "ImportPage.c"
-		PhotoImportSource* _tmp1_ = NULL;
-		PhotoMetadata* _tmp2_ = NULL;
+		PhotoImportSource* _tmp1_;
+		PhotoMetadata* _tmp2_;
 #line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = self->priv->associated;
 #line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3536,10 +3536,10 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
 static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
 	PhotoImportSource * self;
 	GdkPixbuf* result = NULL;
-	PhotoImportSource* _tmp0_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	PhotoImportSource* _tmp0_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
+	gboolean _tmp5_;
 #line 223 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
 #line 224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3547,8 +3547,8 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
 #line 224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ != NULL) {
 #line 3549 "ImportPage.c"
-		PhotoImportSource* _tmp1_ = NULL;
-		GdkPixbuf* _tmp2_ = NULL;
+		PhotoImportSource* _tmp1_;
+		GdkPixbuf* _tmp2_;
 #line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = self->priv->associated;
 #line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3570,7 +3570,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
 #line 227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_) {
 #line 3572 "ImportPage.c"
-		GdkPixbuf* _tmp6_ = NULL;
+		GdkPixbuf* _tmp6_;
 #line 228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = IMPORT_SOURCE_CLASS (photo_import_source_parent_class)->get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
 #line 228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3590,11 +3590,11 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
 static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error) {
 	PhotoImportSource * self;
 	GdkPixbuf* result = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	gboolean _tmp2_;
 	GdkPixbuf* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	gint _tmp4_;
 #line 233 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
 #line 234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3618,10 +3618,10 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base,
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ > 0) {
 #line 3620 "ImportPage.c"
-		GdkPixbuf* _tmp5_ = NULL;
-		GdkPixbuf* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		GdkPixbuf* _tmp8_ = NULL;
+		GdkPixbuf* _tmp5_;
+		GdkPixbuf* _tmp6_;
+		gint _tmp7_;
+		GdkPixbuf* _tmp8_;
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3638,7 +3638,7 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base,
 		_g_object_unref0 (_tmp6_);
 #line 3639 "ImportPage.c"
 	} else {
-		GdkPixbuf* _tmp9_ = NULL;
+		GdkPixbuf* _tmp9_;
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3657,7 +3657,7 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base,
 
 PhotoFileFormat photo_import_source_get_file_format (PhotoImportSource* self) {
 	PhotoFileFormat result = 0;
-	PhotoFileFormat _tmp0_ = 0;
+	PhotoFileFormat _tmp0_;
 #line 240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_PHOTO_IMPORT_SOURCE (self), 0);
 #line 241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3672,8 +3672,8 @@ PhotoFileFormat photo_import_source_get_file_format (PhotoImportSource* self) {
 
 gchar* photo_import_source_get_preview_md5 (PhotoImportSource* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 244 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_PHOTO_IMPORT_SOURCE (self), NULL);
 #line 245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3689,8 +3689,8 @@ gchar* photo_import_source_get_preview_md5 (PhotoImportSource* self) {
 
 
 void photo_import_source_set_associated (PhotoImportSource* self, PhotoImportSource* associated) {
-	PhotoImportSource* _tmp0_ = NULL;
-	PhotoImportSource* _tmp1_ = NULL;
+	PhotoImportSource* _tmp0_;
+	PhotoImportSource* _tmp1_;
 #line 248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_PHOTO_IMPORT_SOURCE (self));
 #line 248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3709,8 +3709,8 @@ void photo_import_source_set_associated (PhotoImportSource* self, PhotoImportSou
 
 PhotoImportSource* photo_import_source_get_associated (PhotoImportSource* self) {
 	PhotoImportSource* result = NULL;
-	PhotoImportSource* _tmp0_ = NULL;
-	PhotoImportSource* _tmp1_ = NULL;
+	PhotoImportSource* _tmp0_;
+	PhotoImportSource* _tmp1_;
 #line 252 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_PHOTO_IMPORT_SOURCE (self), NULL);
 #line 253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3729,8 +3729,8 @@ static gboolean photo_import_source_real_internal_delete_backing (DataSource* ba
 	PhotoImportSource * self;
 	gboolean result = FALSE;
 	gboolean ret = FALSE;
-	gboolean _tmp0_ = FALSE;
-	PhotoImportSource* _tmp2_ = NULL;
+	gboolean _tmp0_;
+	PhotoImportSource* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
@@ -3754,9 +3754,9 @@ static gboolean photo_import_source_real_internal_delete_backing (DataSource* ba
 	if (_tmp2_ != NULL) {
 #line 3755 "ImportPage.c"
 		gboolean _tmp3_ = FALSE;
-		PhotoImportSource* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		gboolean _tmp7_ = FALSE;
+		PhotoImportSource* _tmp4_;
+		gboolean _tmp5_;
+		gboolean _tmp7_;
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = self->priv->associated;
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3793,23 +3793,23 @@ static void photo_import_source_class_init (PhotoImportSourceClass * klass) {
 #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_type_class_add_private (klass, sizeof (PhotoImportSourcePrivate));
 #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) photo_import_source_real_get_name;
+	((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) photo_import_source_real_get_name;
 #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) photo_import_source_real_get_typename;
+	((DataSourceClass *) klass)->get_typename = (gchar* (*) (DataSource *)) photo_import_source_real_get_typename;
 #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) photo_import_source_real_get_instance_id;
+	((DataSourceClass *) klass)->get_instance_id = (gint64 (*) (DataSource *)) photo_import_source_real_get_instance_id;
 #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*)(ThumbnailSource*)) photo_import_source_real_get_preferred_thumbnail_format;
+	((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*) (ThumbnailSource *)) photo_import_source_real_get_preferred_thumbnail_format;
 #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) photo_import_source_real_create_thumbnail;
+	((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) photo_import_source_real_create_thumbnail;
 #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((ImportSourceClass *) klass)->get_exposure_time = (time_t (*)(ImportSource*)) photo_import_source_real_get_exposure_time;
+	((ImportSourceClass *) klass)->get_exposure_time = (time_t (*) (ImportSource *)) photo_import_source_real_get_exposure_time;
 #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((ImportSourceClass *) klass)->get_preview = (GdkPixbuf* (*)(ImportSource*)) photo_import_source_real_get_preview;
+	((ImportSourceClass *) klass)->get_preview = (GdkPixbuf* (*) (ImportSource *)) photo_import_source_real_get_preview;
 #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) photo_import_source_real_get_thumbnail;
+	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) photo_import_source_real_get_thumbnail;
 #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*)(DataSource*, GError**)) photo_import_source_real_internal_delete_backing;
+	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) photo_import_source_real_internal_delete_backing;
 #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = photo_import_source_finalize;
 #line 3815 "ImportPage.c"
@@ -3831,7 +3831,7 @@ static void photo_import_source_instance_init (PhotoImportSource * self) {
 }
 
 
-static void photo_import_source_finalize (GObject* obj) {
+static void photo_import_source_finalize (GObject * obj) {
 	PhotoImportSource * self;
 #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
@@ -3863,21 +3863,21 @@ GType photo_import_source_get_type (void) {
 
 ImportPreview* import_preview_construct (GType object_type, ImportSource* source) {
 	ImportPreview * self = NULL;
-	ImportSource* _tmp0_ = NULL;
+	ImportSource* _tmp0_;
 	Dimensions _tmp1_ = {0};
-	ImportSource* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	ImportSource* _tmp5_ = NULL;
+	ImportSource* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	ImportSource* _tmp5_;
 	GdkPixbuf* pixbuf = NULL;
 	gboolean using_placeholder = FALSE;
-	GdkPixbuf* _tmp14_ = NULL;
-	GdkPixbuf* _tmp15_ = NULL;
+	GdkPixbuf* _tmp14_;
+	GdkPixbuf* _tmp15_;
 	gboolean _tmp22_ = FALSE;
-	GdkPixbuf* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	ImportSource* _tmp29_ = NULL;
-	GdkPixbuf* _tmp50_ = NULL;
+	GdkPixbuf* _tmp23_;
+	gint _tmp24_;
+	ImportSource* _tmp29_;
+	GdkPixbuf* _tmp49_;
 	GError * _inner_error_ = NULL;
 #line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_SOURCE (source), NULL);
@@ -3912,9 +3912,9 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 #line 3912 "ImportPage.c"
 	{
 		GdkPixbuf* _tmp6_ = NULL;
-		ImportSource* _tmp7_ = NULL;
-		GdkPixbuf* _tmp8_ = NULL;
-		GdkPixbuf* _tmp9_ = NULL;
+		ImportSource* _tmp7_;
+		GdkPixbuf* _tmp8_;
+		GdkPixbuf* _tmp9_;
 #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = source;
 #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3924,7 +3924,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3926 "ImportPage.c"
-			goto __catch64_g_error;
+			goto __catch65_g_error;
 		}
 #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = _tmp6_;
@@ -3938,14 +3938,14 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_g_object_unref0 (_tmp6_);
 #line 3939 "ImportPage.c"
 	}
-	goto __finally64;
-	__catch64_g_error:
+	goto __finally65;
+	__catch65_g_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		GError* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+		GError* _tmp12_;
+		const gchar* _tmp13_;
 #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		err = _inner_error_;
 #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3966,7 +3966,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_g_error_free0 (err);
 #line 3967 "ImportPage.c"
 	}
-	__finally64:
+	__finally65:
 #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3988,17 +3988,17 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 #line 290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp15_ == NULL) {
 #line 3990 "ImportPage.c"
-		GdkPixbuf* _tmp16_ = NULL;
-		GdkPixbuf* _tmp20_ = NULL;
-		GdkPixbuf* _tmp21_ = NULL;
+		GdkPixbuf* _tmp16_;
+		GdkPixbuf* _tmp20_;
+		GdkPixbuf* _tmp21_;
 #line 291 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp16_ = import_preview_placeholder_preview;
 #line 291 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp16_ == NULL) {
 #line 3998 "ImportPage.c"
-			GdkPixbuf* _tmp17_ = NULL;
-			GdkPixbuf* _tmp18_ = NULL;
-			GdkPixbuf* _tmp19_ = NULL;
+			GdkPixbuf* _tmp17_;
+			GdkPixbuf* _tmp18_;
+			GdkPixbuf* _tmp19_;
 #line 292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp17_ = get_placeholder_pixbuf ();
 #line 292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4035,8 +4035,8 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_tmp22_ = TRUE;
 #line 4036 "ImportPage.c"
 	} else {
-		GdkPixbuf* _tmp25_ = NULL;
-		gint _tmp26_ = 0;
+		GdkPixbuf* _tmp25_;
+		gint _tmp26_;
 #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp25_ = pixbuf;
 #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4048,8 +4048,8 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp22_) {
 #line 4050 "ImportPage.c"
-		GdkPixbuf* _tmp27_ = NULL;
-		GdkPixbuf* _tmp28_ = NULL;
+		GdkPixbuf* _tmp27_;
+		GdkPixbuf* _tmp28_;
 #line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp27_ = pixbuf;
 #line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4066,14 +4066,14 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, TYPE_PHOTO_IMPORT_SOURCE)) {
 #line 4067 "ImportPage.c"
 		PhotoImportSource* photo_import_source = NULL;
-		ImportSource* _tmp30_ = NULL;
-		PhotoImportSource* _tmp31_ = NULL;
+		ImportSource* _tmp30_;
+		PhotoImportSource* _tmp31_;
 		gboolean _tmp32_ = FALSE;
-		gboolean _tmp33_ = FALSE;
-		PhotoImportSource* _tmp43_ = NULL;
-		PhotoImportSource* _tmp44_ = NULL;
-		PhotoImportSource* _tmp45_ = NULL;
-		gboolean _tmp46_ = FALSE;
+		gboolean _tmp33_;
+		PhotoImportSource* _tmp43_;
+		PhotoImportSource* _tmp44_;
+		PhotoImportSource* _tmp45_;
+		gboolean _tmp46_;
 #line 306 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp30_ = source;
 #line 306 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4085,9 +4085,9 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (!_tmp33_) {
 #line 4087 "ImportPage.c"
-			PhotoImportSource* _tmp34_ = NULL;
-			PhotoMetadata* _tmp35_ = NULL;
-			PhotoMetadata* _tmp36_ = NULL;
+			PhotoImportSource* _tmp34_;
+			PhotoMetadata* _tmp35_;
+			PhotoMetadata* _tmp36_;
 #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp34_ = photo_import_source;
 #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4107,12 +4107,12 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp32_) {
 #line 4109 "ImportPage.c"
-			PhotoImportSource* _tmp37_ = NULL;
-			PhotoMetadata* _tmp38_ = NULL;
-			PhotoMetadata* _tmp39_ = NULL;
-			Orientation _tmp40_ = 0;
-			GdkPixbuf* _tmp41_ = NULL;
-			GdkPixbuf* _tmp42_ = NULL;
+			PhotoImportSource* _tmp37_;
+			PhotoMetadata* _tmp38_;
+			PhotoMetadata* _tmp39_;
+			Orientation _tmp40_;
+			GdkPixbuf* _tmp41_;
+			GdkPixbuf* _tmp42_;
 #line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp37_ = photo_import_source;
 #line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4146,54 +4146,51 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 #line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp46_) {
 #line 4148 "ImportPage.c"
-			const gchar* _tmp47_ = NULL;
-			gchar* _tmp48_ = NULL;
-			gchar* _tmp49_ = NULL;
-#line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp47_ = _ ("RAW+JPEG");
+			gchar* _tmp47_;
+			gchar* _tmp48_;
 #line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp48_ = g_strdup_printf ("<small>%s</small>", _tmp47_);
+			_tmp47_ = g_strdup_printf ("<small>%s</small>", _ ("RAW+JPEG"));
 #line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp49_ = _tmp48_;
+			_tmp48_ = _tmp47_;
 #line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			checkerboard_item_set_subtitle (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp49_, TRUE, PANGO_ALIGN_LEFT);
+			checkerboard_item_set_subtitle (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp48_, TRUE, PANGO_ALIGN_LEFT);
 #line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_free0 (_tmp49_);
-#line 4162 "ImportPage.c"
+			_g_free0 (_tmp48_);
+#line 4159 "ImportPage.c"
 		}
 #line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (photo_import_source);
-#line 4166 "ImportPage.c"
+#line 4163 "ImportPage.c"
 	}
 #line 315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp50_ = pixbuf;
+	_tmp49_ = pixbuf;
 #line 315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp50_);
+	checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp49_);
 #line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (pixbuf);
 #line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 4176 "ImportPage.c"
+#line 4173 "ImportPage.c"
 }
 
 
 ImportPreview* import_preview_new (ImportSource* source) {
 #line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_preview_construct (TYPE_IMPORT_PREVIEW, source);
-#line 4183 "ImportPage.c"
+#line 4180 "ImportPage.c"
 }
 
 
 gboolean import_preview_is_already_imported (ImportPreview* self) {
 	gboolean result = FALSE;
 	PhotoImportSource* photo_import_source = NULL;
-	ImportSource* _tmp0_ = NULL;
-	PhotoImportSource* _tmp1_ = NULL;
-	PhotoImportSource* _tmp2_ = NULL;
+	ImportSource* _tmp0_;
+	PhotoImportSource* _tmp1_;
+	PhotoImportSource* _tmp2_;
 	VideoImportSource* video_import_source = NULL;
-	ImportSource* _tmp49_ = NULL;
-	VideoImportSource* _tmp50_ = NULL;
-	VideoImportSource* _tmp51_ = NULL;
+	ImportSource* _tmp49_;
+	VideoImportSource* _tmp50_;
+	VideoImportSource* _tmp51_;
 #line 318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PREVIEW (self), FALSE);
 #line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4204,7 +4201,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 	if (_tmp1_ == NULL) {
 #line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 4207 "ImportPage.c"
+#line 4204 "ImportPage.c"
 	}
 #line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	photo_import_source = _tmp1_;
@@ -4212,17 +4209,17 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 	_tmp2_ = photo_import_source;
 #line 320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_ != NULL) {
-#line 4215 "ImportPage.c"
+#line 4212 "ImportPage.c"
 		gchar* preview_md5 = NULL;
-		PhotoImportSource* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
+		PhotoImportSource* _tmp3_;
+		gchar* _tmp4_;
 		PhotoFileFormat file_format = 0;
-		PhotoImportSource* _tmp5_ = NULL;
-		PhotoFileFormat _tmp6_ = 0;
+		PhotoImportSource* _tmp5_;
+		PhotoFileFormat _tmp6_;
 		gboolean _tmp7_ = FALSE;
-		const gchar* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
-		PhotoFileFormat _tmp17_ = 0;
+		const gchar* _tmp8_;
+		gboolean _tmp9_;
+		PhotoFileFormat _tmp17_;
 #line 321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = photo_import_source;
 #line 321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4241,10 +4238,10 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 		_tmp9_ = is_string_empty (_tmp8_);
 #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (!_tmp9_) {
-#line 4244 "ImportPage.c"
-			const gchar* _tmp10_ = NULL;
-			PhotoFileFormat _tmp11_ = 0;
-			gboolean _tmp12_ = FALSE;
+#line 4241 "ImportPage.c"
+			const gchar* _tmp10_;
+			PhotoFileFormat _tmp11_;
+			gboolean _tmp12_;
 #line 326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp10_ = preview_md5;
 #line 326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4253,19 +4250,19 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 			_tmp12_ = library_photo_has_nontrash_duplicate (NULL, _tmp10_, NULL, _tmp11_);
 #line 326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = _tmp12_;
-#line 4256 "ImportPage.c"
+#line 4253 "ImportPage.c"
 		} else {
 #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = FALSE;
-#line 4260 "ImportPage.c"
+#line 4257 "ImportPage.c"
 		}
 #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp7_) {
-#line 4264 "ImportPage.c"
-			const gchar* _tmp13_ = NULL;
-			PhotoFileFormat _tmp14_ = 0;
+#line 4261 "ImportPage.c"
+			const gchar* _tmp13_;
+			PhotoFileFormat _tmp14_;
 			PhotoID _tmp15_ = {0};
-			DuplicatedFile* _tmp16_ = NULL;
+			DuplicatedFile* _tmp16_;
 #line 328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp13_ = preview_md5;
 #line 328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4286,19 +4283,19 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 			_g_object_unref0 (photo_import_source);
 #line 331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 4289 "ImportPage.c"
+#line 4286 "ImportPage.c"
 		}
 #line 337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp17_ = file_format;
 #line 337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp17_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4295 "ImportPage.c"
+#line 4292 "ImportPage.c"
 			guint64 filesize = 0ULL;
-			ImportSource* _tmp18_ = NULL;
-			ImportSource* _tmp19_ = NULL;
-			gulong _tmp20_ = 0UL;
-			guint64 _tmp21_ = 0ULL;
-			guint64 _tmp22_ = 0ULL;
+			ImportSource* _tmp18_;
+			ImportSource* _tmp19_;
+			gulong _tmp20_;
+			guint64 _tmp21_;
+			guint64 _tmp22_;
 #line 338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp18_ = import_preview_get_import_source (self);
 #line 338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4315,17 +4312,17 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 			_tmp22_ = filesize;
 #line 340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp22_ <= ((guint64) G_MAXINT64)) {
-#line 4318 "ImportPage.c"
+#line 4315 "ImportPage.c"
 				PhotoID duplicated_photo_id = {0};
-				LibraryPhotoSourceCollection* _tmp23_ = NULL;
-				ImportSource* _tmp24_ = NULL;
-				ImportSource* _tmp25_ = NULL;
-				gchar* _tmp26_ = NULL;
-				gchar* _tmp27_ = NULL;
-				guint64 _tmp28_ = 0ULL;
+				LibraryPhotoSourceCollection* _tmp23_;
+				ImportSource* _tmp24_;
+				ImportSource* _tmp25_;
+				gchar* _tmp26_;
+				gchar* _tmp27_;
+				guint64 _tmp28_;
 				PhotoID _tmp29_ = {0};
-				PhotoID _tmp30_ = {0};
-				gboolean _tmp31_ = FALSE;
+				PhotoID _tmp30_;
+				gboolean _tmp31_;
 #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp23_ = library_photo_global;
 #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4352,19 +4349,19 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 				_tmp31_ = photo_id_is_valid (&duplicated_photo_id);
 #line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp31_) {
-#line 4355 "ImportPage.c"
+#line 4352 "ImportPage.c"
 					LibraryPhoto* duplicated_photo = NULL;
-					LibraryPhotoSourceCollection* _tmp32_ = NULL;
-					PhotoID _tmp33_ = {0};
-					LibraryPhoto* _tmp34_ = NULL;
+					LibraryPhotoSourceCollection* _tmp32_;
+					PhotoID _tmp33_;
+					LibraryPhoto* _tmp34_;
 					time_t photo_exposure_time = 0;
-					PhotoImportSource* _tmp35_ = NULL;
-					time_t _tmp36_ = 0;
+					PhotoImportSource* _tmp35_;
+					time_t _tmp36_;
 					time_t duplicated_photo_exposure_time = 0;
-					LibraryPhoto* _tmp37_ = NULL;
-					time_t _tmp38_ = 0;
-					time_t _tmp39_ = 0;
-					time_t _tmp40_ = 0;
+					LibraryPhoto* _tmp37_;
+					time_t _tmp38_;
+					time_t _tmp39_;
+					time_t _tmp40_;
 #line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp32_ = library_photo_global;
 #line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4391,15 +4388,15 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 					_tmp40_ = duplicated_photo_exposure_time;
 #line 350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp39_ == _tmp40_) {
-#line 4394 "ImportPage.c"
-						LibraryPhotoSourceCollection* _tmp41_ = NULL;
-						ImportSource* _tmp42_ = NULL;
-						ImportSource* _tmp43_ = NULL;
-						gchar* _tmp44_ = NULL;
-						gchar* _tmp45_ = NULL;
-						guint64 _tmp46_ = 0ULL;
+#line 4391 "ImportPage.c"
+						LibraryPhotoSourceCollection* _tmp41_;
+						ImportSource* _tmp42_;
+						ImportSource* _tmp43_;
+						gchar* _tmp44_;
+						gchar* _tmp45_;
+						guint64 _tmp46_;
 						PhotoID _tmp47_ = {0};
-						DuplicatedFile* _tmp48_ = NULL;
+						DuplicatedFile* _tmp48_;
 #line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp41_ = library_photo_global;
 #line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4434,11 +4431,11 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 						_g_object_unref0 (photo_import_source);
 #line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						return result;
-#line 4437 "ImportPage.c"
+#line 4434 "ImportPage.c"
 					}
 #line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (duplicated_photo);
-#line 4441 "ImportPage.c"
+#line 4438 "ImportPage.c"
 				}
 			}
 		}
@@ -4450,7 +4447,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 		_g_object_unref0 (photo_import_source);
 #line 361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 4453 "ImportPage.c"
+#line 4450 "ImportPage.c"
 	}
 #line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp49_ = import_preview_get_import_source (self);
@@ -4460,7 +4457,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 	if (_tmp50_ == NULL) {
 #line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp49_);
-#line 4463 "ImportPage.c"
+#line 4460 "ImportPage.c"
 	}
 #line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	video_import_source = _tmp50_;
@@ -4468,15 +4465,15 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 	_tmp51_ = video_import_source;
 #line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp51_ != NULL) {
-#line 4471 "ImportPage.c"
-		VideoSourceCollection* _tmp52_ = NULL;
-		VideoImportSource* _tmp53_ = NULL;
-		gchar* _tmp54_ = NULL;
-		gchar* _tmp55_ = NULL;
-		VideoImportSource* _tmp56_ = NULL;
-		gulong _tmp57_ = 0UL;
-		gboolean _tmp58_ = FALSE;
-		gboolean _tmp59_ = FALSE;
+#line 4468 "ImportPage.c"
+		VideoSourceCollection* _tmp52_;
+		VideoImportSource* _tmp53_;
+		gchar* _tmp54_;
+		gchar* _tmp55_;
+		VideoImportSource* _tmp56_;
+		gulong _tmp57_;
+		gboolean _tmp58_;
+		gboolean _tmp59_;
 #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp52_ = video_global;
 #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4497,15 +4494,15 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 		_g_free0 (_tmp55_);
 #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp59_) {
-#line 4500 "ImportPage.c"
-			VideoSourceCollection* _tmp60_ = NULL;
-			VideoImportSource* _tmp61_ = NULL;
-			gchar* _tmp62_ = NULL;
-			gchar* _tmp63_ = NULL;
-			VideoImportSource* _tmp64_ = NULL;
-			gulong _tmp65_ = 0UL;
+#line 4497 "ImportPage.c"
+			VideoSourceCollection* _tmp60_;
+			VideoImportSource* _tmp61_;
+			gchar* _tmp62_;
+			gchar* _tmp63_;
+			VideoImportSource* _tmp64_;
+			gulong _tmp65_;
 			VideoID _tmp66_ = {0};
-			DuplicatedFile* _tmp67_ = NULL;
+			DuplicatedFile* _tmp67_;
 #line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp60_ = video_global;
 #line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4536,7 +4533,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 			_g_object_unref0 (photo_import_source);
 #line 378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 4539 "ImportPage.c"
+#line 4536 "ImportPage.c"
 		}
 #line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
@@ -4546,7 +4543,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 		_g_object_unref0 (photo_import_source);
 #line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 4549 "ImportPage.c"
+#line 4546 "ImportPage.c"
 	}
 #line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = FALSE;
@@ -4556,15 +4553,15 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 	_g_object_unref0 (photo_import_source);
 #line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4559 "ImportPage.c"
+#line 4556 "ImportPage.c"
 }
 
 
 DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
 	DuplicatedFile* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	DuplicatedFile* _tmp1_ = NULL;
-	DuplicatedFile* _tmp2_ = NULL;
+	gboolean _tmp0_;
+	DuplicatedFile* _tmp1_;
+	DuplicatedFile* _tmp2_;
 #line 387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PREVIEW (self), NULL);
 #line 388 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4575,7 +4572,7 @@ DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
 		result = NULL;
 #line 389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 4578 "ImportPage.c"
+#line 4575 "ImportPage.c"
 	}
 #line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->duplicated_file;
@@ -4585,13 +4582,13 @@ DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
 	result = _tmp2_;
 #line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4588 "ImportPage.c"
+#line 4585 "ImportPage.c"
 }
 
 
 ImportSource* import_preview_get_import_source (ImportPreview* self) {
 	ImportSource* result = NULL;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PREVIEW (self), NULL);
 #line 395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4600,7 +4597,7 @@ ImportSource* import_preview_get_import_source (ImportPreview* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_SOURCE, ImportSource);
 #line 395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4603 "ImportPage.c"
+#line 4600 "ImportPage.c"
 }
 
 
@@ -4611,18 +4608,18 @@ static void import_preview_class_init (ImportPreviewClass * klass) {
 	g_type_class_add_private (klass, sizeof (ImportPreviewPrivate));
 #line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = import_preview_finalize;
-#line 4614 "ImportPage.c"
+#line 4611 "ImportPage.c"
 }
 
 
 static void import_preview_instance_init (ImportPreview * self) {
 #line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv = IMPORT_PREVIEW_GET_PRIVATE (self);
-#line 4621 "ImportPage.c"
+#line 4618 "ImportPage.c"
 }
 
 
-static void import_preview_finalize (GObject* obj) {
+static void import_preview_finalize (GObject * obj) {
 	ImportPreview * self;
 #line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_PREVIEW, ImportPreview);
@@ -4630,7 +4627,7 @@ static void import_preview_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->duplicated_file);
 #line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (import_preview_parent_class)->finalize (obj);
-#line 4633 "ImportPage.c"
+#line 4630 "ImportPage.c"
 }
 
 
@@ -4648,10 +4645,10 @@ GType import_preview_get_type (void) {
 
 CameraViewTracker* camera_view_tracker_construct (GType object_type, ViewCollection* collection) {
 	CameraViewTracker* self = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	CameraAccumulator* _tmp1_ = NULL;
-	CameraAccumulator* _tmp2_ = NULL;
-	CameraAccumulator* _tmp3_ = NULL;
+	ViewCollection* _tmp0_;
+	CameraAccumulator* _tmp1_;
+	CameraAccumulator* _tmp2_;
+	CameraAccumulator* _tmp3_;
 #line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (collection), NULL);
 #line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4668,14 +4665,14 @@ CameraViewTracker* camera_view_tracker_construct (GType object_type, ViewCollect
 	core_view_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_VIEW_TRACKER, CoreViewTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator));
 #line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 4671 "ImportPage.c"
+#line 4668 "ImportPage.c"
 }
 
 
 CameraViewTracker* camera_view_tracker_new (ViewCollection* collection) {
 #line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return camera_view_tracker_construct (TYPE_CAMERA_VIEW_TRACKER, collection);
-#line 4678 "ImportPage.c"
+#line 4675 "ImportPage.c"
 }
 
 
@@ -4684,14 +4681,14 @@ static void camera_view_tracker_class_init (CameraViewTrackerClass * klass) {
 	camera_view_tracker_parent_class = g_type_class_peek_parent (klass);
 #line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((CoreTrackerClass *) klass)->finalize = camera_view_tracker_finalize;
-#line 4687 "ImportPage.c"
+#line 4684 "ImportPage.c"
 }
 
 
 static void camera_view_tracker_instance_init (CameraViewTracker * self) {
-	CameraAccumulator* _tmp0_ = NULL;
-	CameraAccumulator* _tmp1_ = NULL;
-	CameraAccumulator* _tmp2_ = NULL;
+	CameraAccumulator* _tmp0_;
+	CameraAccumulator* _tmp1_;
+	CameraAccumulator* _tmp2_;
 #line 400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = camera_accumulator_new ();
 #line 400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4704,11 +4701,11 @@ static void camera_view_tracker_instance_init (CameraViewTracker * self) {
 	_tmp2_ = camera_accumulator_new ();
 #line 402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->selected = _tmp2_;
-#line 4707 "ImportPage.c"
+#line 4704 "ImportPage.c"
 }
 
 
-static void camera_view_tracker_finalize (CoreTracker* obj) {
+static void camera_view_tracker_finalize (CoreTracker * obj) {
 	CameraViewTracker * self;
 #line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CAMERA_VIEW_TRACKER, CameraViewTracker);
@@ -4720,7 +4717,7 @@ static void camera_view_tracker_finalize (CoreTracker* obj) {
 	_g_object_unref0 (self->selected);
 #line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	CORE_TRACKER_CLASS (camera_view_tracker_parent_class)->finalize (obj);
-#line 4723 "ImportPage.c"
+#line 4720 "ImportPage.c"
 }
 
 
@@ -4740,14 +4737,14 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
 	CameraAccumulator * self;
 	gboolean result = FALSE;
 	ImportSource* source = NULL;
-	DataObject* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	DataObject* _tmp0_;
+	DataSource* _tmp1_;
+	gint _tmp2_;
 	PhotoImportSource* photo = NULL;
-	ImportSource* _tmp3_ = NULL;
-	PhotoImportSource* _tmp4_ = NULL;
+	ImportSource* _tmp3_;
+	PhotoImportSource* _tmp4_;
 	gboolean _tmp5_ = FALSE;
-	PhotoImportSource* _tmp6_ = NULL;
+	PhotoImportSource* _tmp6_;
 #line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator);
 #line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4772,74 +4769,74 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
 	_tmp6_ = photo;
 #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp6_ != NULL) {
-#line 4775 "ImportPage.c"
-		PhotoImportSource* _tmp7_ = NULL;
-		PhotoFileFormat _tmp8_ = 0;
+#line 4772 "ImportPage.c"
+		PhotoImportSource* _tmp7_;
+		PhotoFileFormat _tmp8_;
 #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = photo;
 #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = photo_import_source_get_file_format (_tmp7_);
 #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = _tmp8_ != PHOTO_FILE_FORMAT_RAW;
-#line 4784 "ImportPage.c"
+#line 4781 "ImportPage.c"
 	} else {
 #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = FALSE;
-#line 4788 "ImportPage.c"
+#line 4785 "ImportPage.c"
 	}
 #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_) {
-#line 4792 "ImportPage.c"
-		gint _tmp9_ = 0;
+#line 4789 "ImportPage.c"
+		gint _tmp9_;
 #line 424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = self->priv->_photos;
 #line 424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		camera_accumulator_set_photos (self, _tmp9_ + 1);
-#line 4798 "ImportPage.c"
+#line 4795 "ImportPage.c"
 	} else {
 		gboolean _tmp10_ = FALSE;
-		PhotoImportSource* _tmp11_ = NULL;
+		PhotoImportSource* _tmp11_;
 #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = photo;
 #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp11_ != NULL) {
-#line 4806 "ImportPage.c"
-			PhotoImportSource* _tmp12_ = NULL;
-			PhotoFileFormat _tmp13_ = 0;
+#line 4803 "ImportPage.c"
+			PhotoImportSource* _tmp12_;
+			PhotoFileFormat _tmp13_;
 #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp12_ = photo;
 #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp13_ = photo_import_source_get_file_format (_tmp12_);
 #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp10_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW;
-#line 4815 "ImportPage.c"
+#line 4812 "ImportPage.c"
 		} else {
 #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp10_ = FALSE;
-#line 4819 "ImportPage.c"
+#line 4816 "ImportPage.c"
 		}
 #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp10_) {
-#line 4823 "ImportPage.c"
-			gint _tmp14_ = 0;
+#line 4820 "ImportPage.c"
+			gint _tmp14_;
 #line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp14_ = self->priv->_raw;
 #line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			camera_accumulator_set_raw (self, _tmp14_ + 1);
-#line 4829 "ImportPage.c"
+#line 4826 "ImportPage.c"
 		} else {
-			ImportSource* _tmp15_ = NULL;
+			ImportSource* _tmp15_;
 #line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp15_ = source;
 #line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 4836 "ImportPage.c"
-				gint _tmp16_ = 0;
+#line 4833 "ImportPage.c"
+				gint _tmp16_;
 #line 428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp16_ = self->priv->_videos;
 #line 428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				camera_accumulator_set_videos (self, _tmp16_ + 1);
-#line 4842 "ImportPage.c"
+#line 4839 "ImportPage.c"
 			}
 		}
 	}
@@ -4851,7 +4848,7 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
 	_g_object_unref0 (source);
 #line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4854 "ImportPage.c"
+#line 4851 "ImportPage.c"
 }
 
 
@@ -4859,14 +4856,14 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 	CameraAccumulator * self;
 	gboolean result = FALSE;
 	ImportSource* source = NULL;
-	DataObject* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	DataObject* _tmp0_;
+	DataSource* _tmp1_;
+	gint _tmp2_;
 	PhotoImportSource* photo = NULL;
-	ImportSource* _tmp3_ = NULL;
-	PhotoImportSource* _tmp4_ = NULL;
+	ImportSource* _tmp3_;
+	PhotoImportSource* _tmp4_;
 	gboolean _tmp5_ = FALSE;
-	PhotoImportSource* _tmp6_ = NULL;
+	PhotoImportSource* _tmp6_;
 #line 434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator);
 #line 434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4891,26 +4888,26 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 	_tmp6_ = photo;
 #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp6_ != NULL) {
-#line 4894 "ImportPage.c"
-		PhotoImportSource* _tmp7_ = NULL;
-		PhotoFileFormat _tmp8_ = 0;
+#line 4891 "ImportPage.c"
+		PhotoImportSource* _tmp7_;
+		PhotoFileFormat _tmp8_;
 #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = photo;
 #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = photo_import_source_get_file_format (_tmp7_);
 #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = _tmp8_ != PHOTO_FILE_FORMAT_RAW;
-#line 4903 "ImportPage.c"
+#line 4900 "ImportPage.c"
 	} else {
 #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = FALSE;
-#line 4907 "ImportPage.c"
+#line 4904 "ImportPage.c"
 	}
 #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_) {
-#line 4911 "ImportPage.c"
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
+#line 4908 "ImportPage.c"
+		gint _tmp9_;
+		gint _tmp10_;
 #line 441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = self->priv->_photos;
 #line 441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4919,34 +4916,34 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 		_tmp10_ = self->priv->_photos;
 #line 442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		camera_accumulator_set_photos (self, _tmp10_ - 1);
-#line 4922 "ImportPage.c"
+#line 4919 "ImportPage.c"
 	} else {
 		gboolean _tmp11_ = FALSE;
-		PhotoImportSource* _tmp12_ = NULL;
+		PhotoImportSource* _tmp12_;
 #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = photo;
 #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp12_ != NULL) {
-#line 4930 "ImportPage.c"
-			PhotoImportSource* _tmp13_ = NULL;
-			PhotoFileFormat _tmp14_ = 0;
+#line 4927 "ImportPage.c"
+			PhotoImportSource* _tmp13_;
+			PhotoFileFormat _tmp14_;
 #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp13_ = photo;
 #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp14_ = photo_import_source_get_file_format (_tmp13_);
 #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = _tmp14_ == PHOTO_FILE_FORMAT_RAW;
-#line 4939 "ImportPage.c"
+#line 4936 "ImportPage.c"
 		} else {
 #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = FALSE;
-#line 4943 "ImportPage.c"
+#line 4940 "ImportPage.c"
 		}
 #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp11_) {
-#line 4947 "ImportPage.c"
-			gint _tmp15_ = 0;
-			gint _tmp16_ = 0;
+#line 4944 "ImportPage.c"
+			gint _tmp15_;
+			gint _tmp16_;
 #line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp15_ = self->priv->_raw;
 #line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4955,16 +4952,16 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 			_tmp16_ = self->priv->_raw;
 #line 445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			camera_accumulator_set_raw (self, _tmp16_ - 1);
-#line 4958 "ImportPage.c"
+#line 4955 "ImportPage.c"
 		} else {
-			ImportSource* _tmp17_ = NULL;
+			ImportSource* _tmp17_;
 #line 446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp17_ = source;
 #line 446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 4965 "ImportPage.c"
-				gint _tmp18_ = 0;
-				gint _tmp19_ = 0;
+#line 4962 "ImportPage.c"
+				gint _tmp18_;
+				gint _tmp19_;
 #line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp18_ = self->priv->_videos;
 #line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4973,7 +4970,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 				_tmp19_ = self->priv->_videos;
 #line 448 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				camera_accumulator_set_videos (self, _tmp19_ - 1);
-#line 4976 "ImportPage.c"
+#line 4973 "ImportPage.c"
 			}
 		}
 	}
@@ -4985,7 +4982,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 	_g_object_unref0 (source);
 #line 452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4988 "ImportPage.c"
+#line 4985 "ImportPage.c"
 }
 
 
@@ -5002,17 +4999,17 @@ static gboolean camera_accumulator_real_altered (CoreTrackerAccumulator* base, D
 	result = FALSE;
 #line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5005 "ImportPage.c"
+#line 5002 "ImportPage.c"
 }
 
 
 gchar* camera_accumulator_to_string (CameraAccumulator* self) {
 	gchar* result = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gchar* _tmp4_ = NULL;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gchar* _tmp4_;
 #line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), NULL);
 #line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5029,7 +5026,7 @@ gchar* camera_accumulator_to_string (CameraAccumulator* self) {
 	result = _tmp4_;
 #line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5032 "ImportPage.c"
+#line 5029 "ImportPage.c"
 }
 
 
@@ -5039,20 +5036,20 @@ CameraAccumulator* camera_accumulator_construct (GType object_type) {
 	self = (CameraAccumulator*) g_object_new (object_type, NULL);
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 5042 "ImportPage.c"
+#line 5039 "ImportPage.c"
 }
 
 
 CameraAccumulator* camera_accumulator_new (void) {
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return camera_accumulator_construct (TYPE_CAMERA_ACCUMULATOR);
-#line 5049 "ImportPage.c"
+#line 5046 "ImportPage.c"
 }
 
 
 gint camera_accumulator_get_total (CameraAccumulator* self) {
 	gint result;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), 0);
 #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5061,27 +5058,31 @@ gint camera_accumulator_get_total (CameraAccumulator* self) {
 	result = _tmp0_;
 #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5064 "ImportPage.c"
+#line 5061 "ImportPage.c"
 }
 
 
 static void camera_accumulator_set_total (CameraAccumulator* self, gint value) {
-	gint _tmp0_ = 0;
 #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
 #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp0_ = value;
+	if (camera_accumulator_get_total (self) != value) {
+#line 5070 "ImportPage.c"
+		gint _tmp0_;
+#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp0_ = value;
 #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self->priv->_total = _tmp0_;
+		self->priv->_total = _tmp0_;
 #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_object_notify ((GObject *) self, "total");
+		g_object_notify ((GObject *) self, "total");
 #line 5078 "ImportPage.c"
+	}
 }
 
 
 gint camera_accumulator_get_photos (CameraAccumulator* self) {
 	gint result;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), 0);
 #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5090,27 +5091,31 @@ gint camera_accumulator_get_photos (CameraAccumulator* self) {
 	result = _tmp0_;
 #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5093 "ImportPage.c"
+#line 5094 "ImportPage.c"
 }
 
 
 static void camera_accumulator_set_photos (CameraAccumulator* self, gint value) {
-	gint _tmp0_ = 0;
 #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
 #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp0_ = value;
+	if (camera_accumulator_get_photos (self) != value) {
+#line 5103 "ImportPage.c"
+		gint _tmp0_;
 #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self->priv->_photos = _tmp0_;
+		_tmp0_ = value;
 #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_object_notify ((GObject *) self, "photos");
-#line 5107 "ImportPage.c"
+		self->priv->_photos = _tmp0_;
+#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_object_notify ((GObject *) self, "photos");
+#line 5111 "ImportPage.c"
+	}
 }
 
 
 gint camera_accumulator_get_videos (CameraAccumulator* self) {
 	gint result;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), 0);
 #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5119,27 +5124,31 @@ gint camera_accumulator_get_videos (CameraAccumulator* self) {
 	result = _tmp0_;
 #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5122 "ImportPage.c"
+#line 5127 "ImportPage.c"
 }
 
 
 static void camera_accumulator_set_videos (CameraAccumulator* self, gint value) {
-	gint _tmp0_ = 0;
 #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
 #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp0_ = value;
+	if (camera_accumulator_get_videos (self) != value) {
+#line 5136 "ImportPage.c"
+		gint _tmp0_;
 #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self->priv->_videos = _tmp0_;
+		_tmp0_ = value;
 #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_object_notify ((GObject *) self, "videos");
-#line 5136 "ImportPage.c"
+		self->priv->_videos = _tmp0_;
+#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_object_notify ((GObject *) self, "videos");
+#line 5144 "ImportPage.c"
+	}
 }
 
 
 gint camera_accumulator_get_raw (CameraAccumulator* self) {
 	gint result;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), 0);
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5148,21 +5157,25 @@ gint camera_accumulator_get_raw (CameraAccumulator* self) {
 	result = _tmp0_;
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5151 "ImportPage.c"
+#line 5160 "ImportPage.c"
 }
 
 
 static void camera_accumulator_set_raw (CameraAccumulator* self, gint value) {
-	gint _tmp0_ = 0;
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp0_ = value;
+	if (camera_accumulator_get_raw (self) != value) {
+#line 5169 "ImportPage.c"
+		gint _tmp0_;
+#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp0_ = value;
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self->priv->_raw = _tmp0_;
+		self->priv->_raw = _tmp0_;
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_object_notify ((GObject *) self, "raw");
-#line 5165 "ImportPage.c"
+		g_object_notify ((GObject *) self, "raw");
+#line 5177 "ImportPage.c"
+	}
 }
 
 
@@ -5178,14 +5191,14 @@ static void camera_accumulator_class_init (CameraAccumulatorClass * klass) {
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = camera_accumulator_finalize;
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_TOTAL, g_param_spec_int ("total", "total", "total", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_TOTAL_PROPERTY, g_param_spec_int ("total", "total", "total", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_PHOTOS, g_param_spec_int ("photos", "photos", "photos", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_PHOTOS_PROPERTY, g_param_spec_int ("photos", "photos", "photos", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_VIDEOS, g_param_spec_int ("videos", "videos", "videos", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_VIDEOS_PROPERTY, g_param_spec_int ("videos", "videos", "videos", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_RAW, g_param_spec_int ("raw", "raw", "raw", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 5188 "ImportPage.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_RAW_PROPERTY, g_param_spec_int ("raw", "raw", "raw", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 5201 "ImportPage.c"
 }
 
 
@@ -5193,12 +5206,12 @@ static void camera_accumulator_core_tracker_accumulator_interface_init (CoreTrac
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	camera_accumulator_core_tracker_accumulator_parent_iface = g_type_interface_peek_parent (iface);
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	iface->include = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) camera_accumulator_real_include;
+	iface->include = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) camera_accumulator_real_include;
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	iface->uninclude = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) camera_accumulator_real_uninclude;
+	iface->uninclude = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) camera_accumulator_real_uninclude;
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	iface->altered = (gboolean (*)(CoreTrackerAccumulator*, DataObject*, Alteration*)) camera_accumulator_real_altered;
-#line 5201 "ImportPage.c"
+	iface->altered = (gboolean (*) (CoreTrackerAccumulator *, DataObject*, Alteration*)) camera_accumulator_real_altered;
+#line 5214 "ImportPage.c"
 }
 
 
@@ -5213,17 +5226,17 @@ static void camera_accumulator_instance_init (CameraAccumulator * self) {
 	self->priv->_videos = 0;
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->_raw = 0;
-#line 5216 "ImportPage.c"
+#line 5229 "ImportPage.c"
 }
 
 
-static void camera_accumulator_finalize (GObject* obj) {
+static void camera_accumulator_finalize (GObject * obj) {
 	CameraAccumulator * self;
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator);
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (camera_accumulator_parent_class)->finalize (obj);
-#line 5226 "ImportPage.c"
+#line 5239 "ImportPage.c"
 }
 
 
@@ -5247,36 +5260,36 @@ static void _vala_camera_accumulator_get_property (GObject * object, guint prope
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	switch (property_id) {
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		case CAMERA_ACCUMULATOR_TOTAL:
+		case CAMERA_ACCUMULATOR_TOTAL_PROPERTY:
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_value_set_int (value, camera_accumulator_get_total (self));
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		case CAMERA_ACCUMULATOR_PHOTOS:
+		case CAMERA_ACCUMULATOR_PHOTOS_PROPERTY:
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_value_set_int (value, camera_accumulator_get_photos (self));
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		case CAMERA_ACCUMULATOR_VIDEOS:
+		case CAMERA_ACCUMULATOR_VIDEOS_PROPERTY:
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_value_set_int (value, camera_accumulator_get_videos (self));
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		case CAMERA_ACCUMULATOR_RAW:
+		case CAMERA_ACCUMULATOR_RAW_PROPERTY:
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_value_set_int (value, camera_accumulator_get_raw (self));
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5273 "ImportPage.c"
+#line 5286 "ImportPage.c"
 		default:
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5279 "ImportPage.c"
+#line 5292 "ImportPage.c"
 	}
 }
 
@@ -5287,36 +5300,36 @@ static void _vala_camera_accumulator_set_property (GObject * object, guint prope
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	switch (property_id) {
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		case CAMERA_ACCUMULATOR_TOTAL:
+		case CAMERA_ACCUMULATOR_TOTAL_PROPERTY:
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		camera_accumulator_set_total (self, g_value_get_int (value));
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		case CAMERA_ACCUMULATOR_PHOTOS:
+		case CAMERA_ACCUMULATOR_PHOTOS_PROPERTY:
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		camera_accumulator_set_photos (self, g_value_get_int (value));
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		case CAMERA_ACCUMULATOR_VIDEOS:
+		case CAMERA_ACCUMULATOR_VIDEOS_PROPERTY:
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		camera_accumulator_set_videos (self, g_value_get_int (value));
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		case CAMERA_ACCUMULATOR_RAW:
+		case CAMERA_ACCUMULATOR_RAW_PROPERTY:
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		camera_accumulator_set_raw (self, g_value_get_int (value));
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5313 "ImportPage.c"
+#line 5326 "ImportPage.c"
 		default:
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5319 "ImportPage.c"
+#line 5332 "ImportPage.c"
 	}
 }
 
@@ -5324,7 +5337,7 @@ static void _vala_camera_accumulator_set_property (GObject * object, guint prope
 static void _import_page_on_media_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
 #line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_media_added_removed ((ImportPage*) self);
-#line 5327 "ImportPage.c"
+#line 5340 "ImportPage.c"
 }
 
 
@@ -5343,28 +5356,28 @@ GType import_page_refresh_result_get_type (void) {
 static void _import_page_on_import_selected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_import_selected ((ImportPage*) self);
-#line 5346 "ImportPage.c"
+#line 5359 "ImportPage.c"
 }
 
 
 static void _import_page_on_import_all_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_import_all ((ImportPage*) self);
-#line 5353 "ImportPage.c"
+#line 5366 "ImportPage.c"
 }
 
 
 static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_on_action_toggle ((Page*) self, action, parameter);
-#line 5360 "ImportPage.c"
+#line 5373 "ImportPage.c"
 }
 
 
 static void _import_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_display_titles ((ImportPage*) self, action, value);
-#line 5367 "ImportPage.c"
+#line 5380 "ImportPage.c"
 }
 
 
@@ -5373,7 +5386,7 @@ static gint64 _import_page_preview_comparator_comparator (void* a, void* b, gpoi
 	result = import_page_preview_comparator (a, b);
 #line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5376 "ImportPage.c"
+#line 5389 "ImportPage.c"
 }
 
 
@@ -5382,418 +5395,408 @@ static gboolean _import_page_preview_comparator_predicate_comparator_predicate (
 	result = import_page_preview_comparator_predicate (object, alteration);
 #line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5385 "ImportPage.c"
+#line 5398 "ImportPage.c"
 }
 
 
 static void _import_page_on_view_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
 #line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed ((ImportPage*) self);
-#line 5392 "ImportPage.c"
+#line 5405 "ImportPage.c"
 }
 
 
 static void _import_page_on_view_changed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
 #line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed ((ImportPage*) self);
-#line 5399 "ImportPage.c"
+#line 5412 "ImportPage.c"
 }
 
 
 static void _import_page_on_view_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
 #line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed ((ImportPage*) self);
-#line 5406 "ImportPage.c"
+#line 5419 "ImportPage.c"
 }
 
 
 ImportPage* import_page_construct (GType object_type, Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon) {
 	ImportPage * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	Camera* _tmp1_ = NULL;
-	Camera* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	ImportSourceCollection* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	ViewCollection* _tmp11_ = NULL;
-	ViewCollection* _tmp12_ = NULL;
-	CameraViewTracker* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	GtkLabel* _tmp26_ = NULL;
-	const gchar* _tmp27_ = NULL;
-	const gchar* _tmp28_ = NULL;
-	GVolumeMonitor* _tmp29_ = NULL;
-	GPContextWrapper* _tmp30_ = NULL;
-	GPSpinIdleWrapper* _tmp32_ = NULL;
-	ViewCollection* _tmp34_ = NULL;
-	ViewCollection* _tmp35_ = NULL;
-	SourceCollection* _tmp36_ = NULL;
-	ImportPageImportViewManager* _tmp37_ = NULL;
-	ImportPageImportViewManager* _tmp38_ = NULL;
-	ViewCollectionMonitor* _tmp39_ = NULL;
-	ViewCollectionMonitor* _tmp40_ = NULL;
-	ViewCollection* _tmp41_ = NULL;
-	ViewCollection* _tmp42_ = NULL;
-	ViewCollection* _tmp43_ = NULL;
-	ViewCollection* _tmp44_ = NULL;
-	ViewCollection* _tmp45_ = NULL;
-	ViewCollection* _tmp46_ = NULL;
-	ViewCollection* _tmp47_ = NULL;
-	ViewCollection* _tmp48_ = NULL;
-	ViewCollection* _tmp49_ = NULL;
-	ViewCollection* _tmp50_ = NULL;
-	GValue _tmp51_ = {0};
-	LibraryPhotoSourceCollection* _tmp52_ = NULL;
-	VideoSourceCollection* _tmp53_ = NULL;
+	Camera* _tmp0_;
+	Camera* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	ImportSourceCollection* _tmp7_;
+	const gchar* _tmp8_;
+	gchar* _tmp9_;
+	ViewCollection* _tmp10_;
+	ViewCollection* _tmp11_;
+	CameraViewTracker* _tmp12_;
+	const gchar* _tmp13_;
+	GtkLabel* _tmp24_;
+	const gchar* _tmp25_;
+	const gchar* _tmp26_;
+	GVolumeMonitor* _tmp27_;
+	GPContextWrapper* _tmp28_;
+	GPSpinIdleWrapper* _tmp30_;
+	ViewCollection* _tmp32_;
+	ViewCollection* _tmp33_;
+	SourceCollection* _tmp34_;
+	ImportPageImportViewManager* _tmp35_;
+	ImportPageImportViewManager* _tmp36_;
+	ViewCollectionMonitor* _tmp37_;
+	ViewCollectionMonitor* _tmp38_;
+	ViewCollection* _tmp39_;
+	ViewCollection* _tmp40_;
+	ViewCollection* _tmp41_;
+	ViewCollection* _tmp42_;
+	ViewCollection* _tmp43_;
+	ViewCollection* _tmp44_;
+	ViewCollection* _tmp45_;
+	ViewCollection* _tmp46_;
+	ViewCollection* _tmp47_;
+	ViewCollection* _tmp48_;
+	GValue _tmp49_ = {0};
+	LibraryPhotoSourceCollection* _tmp50_;
+	VideoSourceCollection* _tmp51_;
 #line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
 #line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (uri != NULL, NULL);
 #line 718 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp0_ = _ ("Camera");
-#line 718 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self = (ImportPage*) checkerboard_page_construct (object_type, _tmp0_);
+	self = (ImportPage*) checkerboard_page_construct (object_type, _ ("Camera"));
 #line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp1_ = camera;
+	_tmp0_ = camera;
 #line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp2_ = _GPHOTO_REF_CAMERA0 (_tmp1_);
+	_tmp1_ = _GPHOTO_REF_CAMERA0 (_tmp0_);
 #line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_camera_unref0 (self->priv->camera);
 #line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self->priv->camera = _tmp2_;
+	self->priv->camera = _tmp1_;
 #line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp3_ = uri;
+	_tmp2_ = uri;
 #line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp4_ = g_strdup (_tmp3_);
+	_tmp3_ = g_strdup (_tmp2_);
 #line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->uri);
 #line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self->priv->uri = _tmp4_;
+	self->priv->uri = _tmp3_;
 #line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp5_ = uri;
+	_tmp4_ = uri;
 #line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp6_ = g_strdup_printf ("ImportSources for %s", _tmp5_);
+	_tmp5_ = g_strdup_printf ("ImportSources for %s", _tmp4_);
 #line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp8_ = import_source_collection_new (_tmp7_);
+	_tmp7_ = import_source_collection_new (_tmp6_);
 #line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (self->priv->import_sources);
 #line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self->priv->import_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SOURCE_COLLECTION, SourceCollection);
+	self->priv->import_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_SOURCE_COLLECTION, SourceCollection);
 #line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_g_free0 (_tmp7_);
+	_g_free0 (_tmp6_);
 #line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp9_ = icon;
+	_tmp8_ = icon;
 #line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp10_ = g_strdup (_tmp9_);
+	_tmp9_ = g_strdup (_tmp8_);
 #line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->icon);
 #line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self->priv->icon = _tmp10_;
+	self->priv->icon = _tmp9_;
 #line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp12_ = _tmp11_;
+	_tmp11_ = _tmp10_;
 #line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp13_ = camera_view_tracker_new (_tmp12_);
+	_tmp12_ = camera_view_tracker_new (_tmp11_);
 #line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_core_tracker_unref0 (self->priv->tracker);
 #line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self->priv->tracker = _tmp13_;
+	self->priv->tracker = _tmp12_;
 #line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_data_collection_unref0 (_tmp12_);
+	_data_collection_unref0 (_tmp11_);
 #line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp14_ = display_name;
+	_tmp13_ = display_name;
 #line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (NULL != _tmp14_) {
-#line 5515 "ImportPage.c"
-		const gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
+	if (NULL != _tmp13_) {
+#line 5525 "ImportPage.c"
+		const gchar* _tmp14_;
+		gchar* _tmp15_;
 #line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp15_ = display_name;
+		_tmp14_ = display_name;
 #line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp16_ = g_strdup (_tmp15_);
+		_tmp15_ = g_strdup (_tmp14_);
 #line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (self->priv->camera_name);
 #line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		self->priv->camera_name = _tmp16_;
-#line 5526 "ImportPage.c"
+		self->priv->camera_name = _tmp15_;
+#line 5536 "ImportPage.c"
 	} else {
 		CameraAbilities abilities = {0};
 		int res = 0;
-		Camera* _tmp17_ = NULL;
-		CameraAbilities _tmp18_ = {0};
-		int _tmp19_ = 0;
-		int _tmp20_ = 0;
+		Camera* _tmp16_;
+		CameraAbilities _tmp17_ = {0};
+		int _tmp18_;
+		int _tmp19_;
 #line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp17_ = camera;
+		_tmp16_ = camera;
 #line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp19_ = gp_camera_get_abilities (_tmp17_, &_tmp18_);
+		_tmp18_ = gp_camera_get_abilities (_tmp16_, &_tmp17_);
 #line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		 (abilities);
 #line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		abilities = _tmp18_;
+		abilities = _tmp17_;
 #line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		res = _tmp19_;
+		res = _tmp18_;
 #line 732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp20_ = res;
+		_tmp19_ = res;
 #line 732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		if (_tmp20_ != GP_OK) {
-#line 5548 "ImportPage.c"
-			int _tmp21_ = 0;
-			gchar* _tmp22_ = NULL;
-			gchar* _tmp23_ = NULL;
-			const gchar* _tmp24_ = NULL;
-			gchar* _tmp25_ = NULL;
+		if (_tmp19_ != GP_OK) {
+#line 5558 "ImportPage.c"
+			int _tmp20_;
+			gchar* _tmp21_;
+			gchar* _tmp22_;
+			gchar* _tmp23_;
 #line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp21_ = res;
+			_tmp20_ = res;
 #line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp22_ = gp_result_to_full_string (_tmp21_);
+			_tmp21_ = gp_result_to_full_string (_tmp20_);
 #line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp23_ = _tmp22_;
+			_tmp22_ = _tmp21_;
 #line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			g_debug ("ImportPage.vala:733: Unable to get camera abilities: %s", _tmp23_);
+			g_debug ("ImportPage.vala:733: Unable to get camera abilities: %s", _tmp22_);
 #line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_free0 (_tmp23_);
-#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp24_ = _ ("Camera");
+			_g_free0 (_tmp22_);
 #line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp25_ = g_strdup (_tmp24_);
+			_tmp23_ = g_strdup (_ ("Camera"));
 #line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (self->priv->camera_name);
 #line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			self->priv->camera_name = _tmp25_;
-#line 5572 "ImportPage.c"
+			self->priv->camera_name = _tmp23_;
+#line 5579 "ImportPage.c"
 		}
 #line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		 (abilities);
-#line 5576 "ImportPage.c"
+#line 5583 "ImportPage.c"
 	}
 #line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp26_ = self->priv->camera_label;
+	_tmp24_ = self->priv->camera_label;
 #line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp27_ = self->priv->camera_name;
+	_tmp25_ = self->priv->camera_name;
 #line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_label_set_text (_tmp26_, _tmp27_);
+	gtk_label_set_text (_tmp24_, _tmp25_);
 #line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp28_ = self->priv->camera_name;
+	_tmp26_ = self->priv->camera_name;
 #line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp28_);
+	page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp26_);
 #line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp29_ = g_volume_monitor_get ();
+	_tmp27_ = g_volume_monitor_get ();
 #line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->volume_monitor);
 #line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self->priv->volume_monitor = _tmp29_;
+	self->priv->volume_monitor = _tmp27_;
 #line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp30_ = import_page_null_context;
+	_tmp28_ = import_page_null_context;
 #line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp30_ == NULL) {
-#line 5598 "ImportPage.c"
-		GPContextWrapper* _tmp31_ = NULL;
+	if (_tmp28_ == NULL) {
+#line 5605 "ImportPage.c"
+		GPContextWrapper* _tmp29_;
 #line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp31_ = gp_context_wrapper_new ();
+		_tmp29_ = gp_context_wrapper_new ();
 #line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_context_wrapper_unref0 (import_page_null_context);
 #line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		import_page_null_context = _tmp31_;
-#line 5606 "ImportPage.c"
+		import_page_null_context = _tmp29_;
+#line 5613 "ImportPage.c"
 	}
 #line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp32_ = import_page_spin_idle_context;
+	_tmp30_ = import_page_spin_idle_context;
 #line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp32_ == NULL) {
-#line 5612 "ImportPage.c"
-		GPSpinIdleWrapper* _tmp33_ = NULL;
+	if (_tmp30_ == NULL) {
+#line 5619 "ImportPage.c"
+		GPSpinIdleWrapper* _tmp31_;
 #line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp33_ = gp_spin_idle_wrapper_new ();
+		_tmp31_ = gp_spin_idle_wrapper_new ();
 #line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_context_wrapper_unref0 (import_page_spin_idle_context);
 #line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		import_page_spin_idle_context = _tmp33_;
-#line 5620 "ImportPage.c"
+		import_page_spin_idle_context = _tmp31_;
+#line 5627 "ImportPage.c"
 	}
 #line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp34_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp32_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp35_ = _tmp34_;
+	_tmp33_ = _tmp32_;
 #line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp36_ = self->priv->import_sources;
+	_tmp34_ = self->priv->import_sources;
 #line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp37_ = import_page_import_view_manager_new (self);
+	_tmp35_ = import_page_import_view_manager_new (self);
 #line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp38_ = _tmp37_;
+	_tmp36_ = _tmp35_;
 #line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp39_ = view_collection_monitor_source_collection (_tmp35_, _tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL);
+	_tmp37_ = view_collection_monitor_source_collection (_tmp33_, _tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL);
 #line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp40_ = _tmp39_;
+	_tmp38_ = _tmp37_;
 #line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_view_collection_monitor_unref0 (_tmp40_);
+	_view_collection_monitor_unref0 (_tmp38_);
 #line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_view_manager_unref0 (_tmp38_);
+	_view_manager_unref0 (_tmp36_);
 #line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_data_collection_unref0 (_tmp35_);
+	_data_collection_unref0 (_tmp33_);
 #line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp41_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp39_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp42_ = _tmp41_;
+	_tmp40_ = _tmp39_;
 #line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_DATA_COLLECTION, DataCollection), _import_page_preview_comparator_comparator, NULL, _import_page_preview_comparator_predicate_comparator_predicate, NULL);
+	data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_COLLECTION, DataCollection), _import_page_preview_comparator_comparator, NULL, _import_page_preview_comparator_predicate_comparator_predicate, NULL);
 #line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_data_collection_unref0 (_tmp42_);
+	_data_collection_unref0 (_tmp40_);
 #line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp41_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp44_ = _tmp43_;
+	_tmp42_ = _tmp41_;
 #line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_signal_connect_object (_tmp44_, "items-state-changed", (GCallback) _import_page_on_view_changed_view_collection_items_state_changed, self, 0);
+	g_signal_connect_object (_tmp42_, "items-state-changed", (GCallback) _import_page_on_view_changed_view_collection_items_state_changed, self, 0);
 #line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_data_collection_unref0 (_tmp44_);
+	_data_collection_unref0 (_tmp42_);
 #line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp45_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp46_ = _tmp45_;
+	_tmp44_ = _tmp43_;
 #line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_view_changed_data_collection_contents_altered, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_view_changed_data_collection_contents_altered, self, 0);
 #line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_data_collection_unref0 (_tmp46_);
+	_data_collection_unref0 (_tmp44_);
 #line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp45_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp48_ = _tmp47_;
+	_tmp46_ = _tmp45_;
 #line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_signal_connect_object (_tmp48_, "items-visibility-changed", (GCallback) _import_page_on_view_changed_view_collection_items_visibility_changed, self, 0);
+	g_signal_connect_object (_tmp46_, "items-visibility-changed", (GCallback) _import_page_on_view_changed_view_collection_items_visibility_changed, self, 0);
 #line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_data_collection_unref0 (_tmp48_);
+	_data_collection_unref0 (_tmp46_);
 #line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp49_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp50_ = _tmp49_;
+	_tmp48_ = _tmp47_;
 #line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_value_init (&_tmp51_, G_TYPE_BOOLEAN);
+	g_value_init (&_tmp49_, G_TYPE_BOOLEAN);
 #line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_value_set_boolean (&_tmp51_, TRUE);
+	g_value_set_boolean (&_tmp49_, TRUE);
 #line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES, &_tmp51_, NULL, NULL);
+	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES, &_tmp49_, NULL, NULL);
 #line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	G_IS_VALUE (&_tmp51_) ? (g_value_unset (&_tmp51_), NULL) : NULL;
+	G_IS_VALUE (&_tmp49_) ? (g_value_unset (&_tmp49_), NULL) : NULL;
 #line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_data_collection_unref0 (_tmp50_);
+	_data_collection_unref0 (_tmp48_);
 #line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp52_ = library_photo_global;
+	_tmp50_ = library_photo_global;
 #line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
 #line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp53_ = video_global;
+	_tmp51_ = video_global;
 #line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
 #line 769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "ImportContextMenu");
 #line 770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "ImportContextMenu");
 #line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 5702 "ImportPage.c"
+#line 5709 "ImportPage.c"
 }
 
 
 ImportPage* import_page_new (Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon) {
 #line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_page_construct (TYPE_IMPORT_PAGE, camera, uri, display_name, icon);
-#line 5709 "ImportPage.c"
+#line 5716 "ImportPage.c"
 }
 
 
 static void _import_page_on_hide_imported_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_hide_imported ((ImportPage*) self);
-#line 5716 "ImportPage.c"
+#line 5723 "ImportPage.c"
 }
 
 
 static GtkToolbar* import_page_real_get_toolbar (Page* base) {
 	ImportPage * self;
 	GtkToolbar* result = NULL;
-	GtkToolbar* _tmp0_ = NULL;
-	GtkToolbar* _tmp59_ = NULL;
-	GtkToolbar* _tmp60_ = NULL;
+	GtkToolbar* _tmp0_;
+	GtkToolbar* _tmp55_;
+	GtkToolbar* _tmp56_;
 #line 778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
 #line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
 #line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ == NULL) {
-#line 5732 "ImportPage.c"
-		GtkToolbar* _tmp1_ = NULL;
-		GtkToolbar* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		GtkCheckButton* _tmp4_ = NULL;
-		GtkCheckButton* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-		GtkCheckButton* _tmp7_ = NULL;
-		GtkCheckButton* _tmp8_ = NULL;
-		GtkCheckButton* _tmp9_ = NULL;
-		ConfigFacade* _tmp10_ = NULL;
-		ConfigFacade* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
+#line 5739 "ImportPage.c"
+		GtkToolbar* _tmp1_;
+		GtkToolbar* _tmp2_;
+		GtkCheckButton* _tmp3_;
+		GtkCheckButton* _tmp4_;
+		GtkCheckButton* _tmp5_;
+		GtkCheckButton* _tmp6_;
+		GtkCheckButton* _tmp7_;
+		ConfigFacade* _tmp8_;
+		ConfigFacade* _tmp9_;
+		gboolean _tmp10_;
 		GtkToolItem* hide_item = NULL;
-		GtkToolItem* _tmp13_ = NULL;
-		GtkToolItem* _tmp14_ = NULL;
-		GtkToolItem* _tmp15_ = NULL;
-		GtkCheckButton* _tmp16_ = NULL;
-		GtkToolbar* _tmp17_ = NULL;
-		GtkToolItem* _tmp18_ = NULL;
+		GtkToolItem* _tmp11_;
+		GtkToolItem* _tmp12_;
+		GtkToolItem* _tmp13_;
+		GtkCheckButton* _tmp14_;
+		GtkToolbar* _tmp15_;
+		GtkToolItem* _tmp16_;
 		GtkSeparatorToolItem* separator = NULL;
-		GtkSeparatorToolItem* _tmp19_ = NULL;
-		GtkSeparatorToolItem* _tmp20_ = NULL;
-		GtkToolbar* _tmp21_ = NULL;
-		GtkSeparatorToolItem* _tmp22_ = NULL;
-		GtkProgressBar* _tmp23_ = NULL;
-		GtkProgressBar* _tmp24_ = NULL;
+		GtkSeparatorToolItem* _tmp17_;
+		GtkSeparatorToolItem* _tmp18_;
+		GtkToolbar* _tmp19_;
+		GtkSeparatorToolItem* _tmp20_;
+		GtkProgressBar* _tmp21_;
+		GtkProgressBar* _tmp22_;
 		GtkToolItem* progress_item = NULL;
-		GtkToolItem* _tmp25_ = NULL;
-		GtkToolItem* _tmp26_ = NULL;
-		GtkToolItem* _tmp27_ = NULL;
-		GtkProgressBar* _tmp28_ = NULL;
-		GtkProgressBar* _tmp29_ = NULL;
-		GtkToolbar* _tmp30_ = NULL;
-		GtkToolItem* _tmp31_ = NULL;
+		GtkToolItem* _tmp23_;
+		GtkToolItem* _tmp24_;
+		GtkToolItem* _tmp25_;
+		GtkProgressBar* _tmp26_;
+		GtkProgressBar* _tmp27_;
+		GtkToolbar* _tmp28_;
+		GtkToolItem* _tmp29_;
 		GtkToggleToolButton* find_button = NULL;
-		GtkToggleToolButton* _tmp32_ = NULL;
-		GtkToggleToolButton* _tmp33_ = NULL;
-		GtkToggleToolButton* _tmp34_ = NULL;
-		GtkToolbar* _tmp35_ = NULL;
-		GtkToggleToolButton* _tmp36_ = NULL;
-		GtkToolbar* _tmp37_ = NULL;
-		GtkSeparatorToolItem* _tmp38_ = NULL;
-		GtkSeparatorToolItem* _tmp39_ = NULL;
+		GtkToggleToolButton* _tmp30_;
+		GtkToggleToolButton* _tmp31_;
+		GtkToggleToolButton* _tmp32_;
+		GtkToolbar* _tmp33_;
+		GtkToggleToolButton* _tmp34_;
+		GtkToolbar* _tmp35_;
+		GtkSeparatorToolItem* _tmp36_;
+		GtkSeparatorToolItem* _tmp37_;
 		GtkToolButton* import_selected_button = NULL;
-		GtkToolButton* _tmp40_ = NULL;
-		GtkToolButton* _tmp41_ = NULL;
-		GtkToolButton* _tmp42_ = NULL;
-		const gchar* _tmp43_ = NULL;
-		GtkToolButton* _tmp44_ = NULL;
-		GtkToolButton* _tmp45_ = NULL;
-		GtkToolButton* _tmp46_ = NULL;
-		GtkToolbar* _tmp47_ = NULL;
-		GtkToolButton* _tmp48_ = NULL;
+		GtkToolButton* _tmp38_;
+		GtkToolButton* _tmp39_;
+		GtkToolButton* _tmp40_;
+		GtkToolButton* _tmp41_;
+		GtkToolButton* _tmp42_;
+		GtkToolButton* _tmp43_;
+		GtkToolbar* _tmp44_;
+		GtkToolButton* _tmp45_;
 		GtkToolButton* import_all_button = NULL;
-		GtkToolButton* _tmp49_ = NULL;
-		GtkToolButton* _tmp50_ = NULL;
-		GtkToolButton* _tmp51_ = NULL;
-		const gchar* _tmp52_ = NULL;
-		GtkToolButton* _tmp53_ = NULL;
-		GtkToolButton* _tmp54_ = NULL;
-		GtkToolButton* _tmp55_ = NULL;
-		GtkToolbar* _tmp56_ = NULL;
-		GtkToolButton* _tmp57_ = NULL;
-		GtkProgressBar* _tmp58_ = NULL;
+		GtkToolButton* _tmp46_;
+		GtkToolButton* _tmp47_;
+		GtkToolButton* _tmp48_;
+		GtkToolButton* _tmp49_;
+		GtkToolButton* _tmp50_;
+		GtkToolButton* _tmp51_;
+		GtkToolbar* _tmp52_;
+		GtkToolButton* _tmp53_;
+		GtkProgressBar* _tmp54_;
 #line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = PAGE_CLASS (import_page_parent_class)->get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
 #line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5801,217 +5804,209 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
 #line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp2_);
 #line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp3_ = _ ("Hide photos already imported");
+		_tmp3_ = (GtkCheckButton*) gtk_check_button_new_with_label (_ ("Hide photos already imported"));
 #line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp4_ = (GtkCheckButton*) gtk_check_button_new_with_label (_tmp3_);
-#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_object_ref_sink (_tmp4_);
+		g_object_ref_sink (_tmp3_);
 #line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (self->priv->hide_imported);
 #line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		self->priv->hide_imported = _tmp4_;
-#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp5_ = self->priv->hide_imported;
+		self->priv->hide_imported = _tmp3_;
 #line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp6_ = _ ("Only display photos that have not been imported");
+		_tmp4_ = self->priv->hide_imported;
 #line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), _tmp6_);
+		gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _ ("Only display photos that have not been imported"));
 #line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp7_ = self->priv->hide_imported;
+		_tmp5_ = self->priv->hide_imported;
 #line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _import_page_on_hide_imported_gtk_button_clicked, self, 0);
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _import_page_on_hide_imported_gtk_button_clicked, self, 0);
 #line 786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp8_ = self->priv->hide_imported;
+		_tmp6_ = self->priv->hide_imported;
 #line 786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), FALSE);
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp9_ = self->priv->hide_imported;
+		_tmp7_ = self->priv->hide_imported;
 #line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp10_ = config_facade_get_instance ();
+		_tmp8_ = config_facade_get_instance ();
 #line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp11_ = _tmp10_;
+		_tmp9_ = _tmp8_;
 #line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp12_ = configuration_facade_get_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+		_tmp10_ = configuration_facade_get_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp12_);
+		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp10_);
 #line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_object_unref0 (_tmp11_);
+		_g_object_unref0 (_tmp9_);
 #line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp13_ = gtk_tool_item_new ();
+		_tmp11_ = gtk_tool_item_new ();
 #line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_object_ref_sink (_tmp13_);
+		g_object_ref_sink (_tmp11_);
 #line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		hide_item = _tmp13_;
+		hide_item = _tmp11_;
 #line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp14_ = hide_item;
+		_tmp12_ = hide_item;
 #line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_tool_item_set_is_important (_tmp14_, TRUE);
+		gtk_tool_item_set_is_important (_tmp12_, TRUE);
 #line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp15_ = hide_item;
+		_tmp13_ = hide_item;
 #line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp16_ = self->priv->hide_imported;
+		_tmp14_ = self->priv->hide_imported;
 #line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget));
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
 #line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+		_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
 #line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp18_ = hide_item;
+		_tmp16_ = hide_item;
 #line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_toolbar_insert (_tmp17_, _tmp18_, -1);
+		gtk_toolbar_insert (_tmp15_, _tmp16_, -1);
 #line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp19_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+		_tmp17_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
 #line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_object_ref_sink (_tmp19_);
+		g_object_ref_sink (_tmp17_);
 #line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		separator = _tmp19_;
+		separator = _tmp17_;
 #line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp20_ = separator;
+		_tmp18_ = separator;
 #line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_separator_tool_item_set_draw (_tmp20_, FALSE);
+		gtk_separator_tool_item_set_draw (_tmp18_, FALSE);
 #line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+		_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
 #line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp22_ = separator;
+		_tmp20_ = separator;
 #line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_toolbar_insert (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_tool_item_get_type (), GtkToolItem), -1);
+		gtk_toolbar_insert (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp23_ = self->priv->progress_bar;
+		_tmp21_ = self->priv->progress_bar;
 #line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_orientable_set_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GTK_TYPE_ORIENTABLE, GtkOrientable), GTK_ORIENTATION_HORIZONTAL);
+		gtk_orientable_set_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_ORIENTABLE, GtkOrientable), GTK_ORIENTATION_HORIZONTAL);
 #line 802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp24_ = self->priv->progress_bar;
+		_tmp22_ = self->priv->progress_bar;
 #line 802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), FALSE);
+		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp25_ = gtk_tool_item_new ();
+		_tmp23_ = gtk_tool_item_new ();
 #line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_object_ref_sink (_tmp25_);
+		g_object_ref_sink (_tmp23_);
 #line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		progress_item = _tmp25_;
+		progress_item = _tmp23_;
 #line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp26_ = progress_item;
+		_tmp24_ = progress_item;
 #line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_tool_item_set_expand (_tmp26_, TRUE);
+		gtk_tool_item_set_expand (_tmp24_, TRUE);
 #line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp27_ = progress_item;
+		_tmp25_ = progress_item;
 #line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp28_ = self->priv->progress_bar;
+		_tmp26_ = self->priv->progress_bar;
 #line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
 #line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp29_ = self->priv->progress_bar;
+		_tmp27_ = self->priv->progress_bar;
 #line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_progress_bar_set_show_text (_tmp29_, TRUE);
+		gtk_progress_bar_set_show_text (_tmp27_, TRUE);
 #line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+		_tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
 #line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp31_ = progress_item;
+		_tmp29_ = progress_item;
 #line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_toolbar_insert (_tmp30_, _tmp31_, -1);
+		gtk_toolbar_insert (_tmp28_, _tmp29_, -1);
 #line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp32_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
+		_tmp30_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
 #line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_object_ref_sink (_tmp32_);
+		g_object_ref_sink (_tmp30_);
 #line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		find_button = _tmp32_;
+		find_button = _tmp30_;
 #line 812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp33_ = find_button;
+		_tmp31_ = find_button;
 #line 812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_button_get_type (), GtkToolButton), "edit-find");
+		gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_button_get_type (), GtkToolButton), "edit-find");
 #line 813 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp34_ = find_button;
+		_tmp32_ = find_button;
 #line 813 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.CommonDisplaySearchbar");
+		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.CommonDisplaySearchbar");
 #line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+		_tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
 #line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp36_ = find_button;
+		_tmp34_ = find_button;
 #line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1);
+		gtk_toolbar_insert (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+		_tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
 #line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp38_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+		_tmp36_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
 #line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_object_ref_sink (_tmp38_);
+		g_object_ref_sink (_tmp36_);
 #line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp39_ = _tmp38_;
+		_tmp37_ = _tmp36_;
 #line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_toolbar_insert (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_item_get_type (), GtkToolItem), -1);
+		gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_object_unref0 (_tmp39_);
+		_g_object_unref0 (_tmp37_);
 #line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp40_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
+		_tmp38_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
 #line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_object_ref_sink (_tmp40_);
+		g_object_ref_sink (_tmp38_);
 #line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		import_selected_button = _tmp40_;
+		import_selected_button = _tmp38_;
 #line 822 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp41_ = import_selected_button;
+		_tmp39_ = import_selected_button;
 #line 822 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_tool_button_set_icon_name (_tmp41_, "import");
+		gtk_tool_button_set_icon_name (_tmp39_, "import");
 #line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp42_ = import_selected_button;
+		_tmp40_ = import_selected_button;
 #line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp43_ = _ ("Import _Selected");
-#line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_tool_button_set_label (_tmp42_, _tmp43_);
+		gtk_tool_button_set_label (_tmp40_, _ ("Import _Selected"));
 #line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp44_ = import_selected_button;
+		_tmp41_ = import_selected_button;
 #line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+		gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp45_ = import_selected_button;
+		_tmp42_ = import_selected_button;
 #line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_tool_button_set_use_underline (_tmp45_, TRUE);
+		gtk_tool_button_set_use_underline (_tmp42_, TRUE);
 #line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp46_ = import_selected_button;
+		_tmp43_ = import_selected_button;
 #line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportSelected");
+		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportSelected");
 #line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+		_tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
 #line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp48_ = import_selected_button;
+		_tmp45_ = import_selected_button;
 #line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_toolbar_insert (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_tool_item_get_type (), GtkToolItem), -1);
+		gtk_toolbar_insert (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp49_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
+		_tmp46_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
 #line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_object_ref_sink (_tmp49_);
+		g_object_ref_sink (_tmp46_);
 #line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		import_all_button = _tmp49_;
+		import_all_button = _tmp46_;
 #line 832 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp50_ = import_all_button;
+		_tmp47_ = import_all_button;
 #line 832 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_tool_button_set_icon_name (_tmp50_, "import-all");
-#line 833 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp51_ = import_all_button;
+		gtk_tool_button_set_icon_name (_tmp47_, "import-all");
 #line 833 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp52_ = _ ("Import _All");
+		_tmp48_ = import_all_button;
 #line 833 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_tool_button_set_label (_tmp51_, _tmp52_);
+		gtk_tool_button_set_label (_tmp48_, _ ("Import _All"));
 #line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp53_ = import_all_button;
+		_tmp49_ = import_all_button;
 #line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+		gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp54_ = import_all_button;
+		_tmp50_ = import_all_button;
 #line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_tool_button_set_use_underline (_tmp54_, TRUE);
+		gtk_tool_button_set_use_underline (_tmp50_, TRUE);
 #line 836 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp55_ = import_all_button;
+		_tmp51_ = import_all_button;
 #line 836 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportAll");
+		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportAll");
 #line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp56_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+		_tmp52_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
 #line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp57_ = import_all_button;
+		_tmp53_ = import_all_button;
 #line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_toolbar_insert (_tmp56_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_tool_item_get_type (), GtkToolItem), -1);
+		gtk_toolbar_insert (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp58_ = self->priv->progress_bar;
+		_tmp54_ = self->priv->progress_bar;
 #line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), TRUE);
+		gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 844 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_update_toolbar_state (self);
 #line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6028,32 +6023,32 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
 		_g_object_unref0 (separator);
 #line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (hide_item);
-#line 6031 "ImportPage.c"
+#line 6026 "ImportPage.c"
 	}
 #line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp59_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+	_tmp55_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
 #line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp60_ = _g_object_ref0 (_tmp59_);
+	_tmp56_ = _g_object_ref0 (_tmp55_);
 #line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	result = _tmp60_;
+	result = _tmp56_;
 #line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6041 "ImportPage.c"
+#line 6036 "ImportPage.c"
 }
 
 
 static gpointer _core_tracker_ref0 (gpointer self) {
 #line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 6048 "ImportPage.c"
+#line 6043 "ImportPage.c"
 }
 
 
 static CoreViewTracker* import_page_real_get_view_tracker (CheckerboardPage* base) {
 	ImportPage * self;
 	CoreViewTracker* result = NULL;
-	CameraViewTracker* _tmp0_ = NULL;
-	CoreViewTracker* _tmp1_ = NULL;
+	CameraViewTracker* _tmp0_;
+	CoreViewTracker* _tmp1_;
 #line 852 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
 #line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6064,59 +6059,53 @@ static CoreViewTracker* import_page_real_get_view_tracker (CheckerboardPage* bas
 	result = _tmp1_;
 #line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6067 "ImportPage.c"
+#line 6062 "ImportPage.c"
 }
 
 
 static gchar* import_page_real_get_view_empty_message (CheckerboardPage* base) {
 	ImportPage * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
 #line 856 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
 #line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp0_ = _ ("The camera seems to be empty. No photos/videos found to import");
-#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (_ ("The camera seems to be empty. No photos/videos found to import"));
 #line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6086 "ImportPage.c"
+#line 6078 "ImportPage.c"
 }
 
 
 static gchar* import_page_real_get_filter_no_match_message (CheckerboardPage* base) {
 	ImportPage * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
 #line 860 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
 #line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp0_ = _ ("No new photos/videos found on camera");
-#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (_ ("No new photos/videos found on camera"));
 #line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6105 "ImportPage.c"
+#line 6094 "ImportPage.c"
 }
 
 
 static gint64 import_page_preview_comparator (void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	ImportSource* _tmp1_ = NULL;
-	ImportSource* _tmp2_ = NULL;
-	time_t _tmp3_ = 0;
-	void* _tmp4_ = NULL;
-	ImportSource* _tmp5_ = NULL;
-	ImportSource* _tmp6_ = NULL;
-	time_t _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	void* _tmp0_;
+	ImportSource* _tmp1_;
+	ImportSource* _tmp2_;
+	time_t _tmp3_;
+	void* _tmp4_;
+	ImportSource* _tmp5_;
+	ImportSource* _tmp6_;
+	time_t _tmp7_;
+	gint64 _tmp8_;
 #line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = a;
 #line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6143,14 +6132,14 @@ static gint64 import_page_preview_comparator (void* a, void* b) {
 	result = _tmp8_;
 #line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6146 "ImportPage.c"
+#line 6135 "ImportPage.c"
 }
 
 
 static gboolean import_page_preview_comparator_predicate (DataObject* object, Alteration* alteration) {
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Alteration* _tmp0_;
+	gboolean _tmp1_;
 #line 869 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
 #line 869 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6163,16 +6152,16 @@ static gboolean import_page_preview_comparator_predicate (DataObject* object, Al
 	result = _tmp1_;
 #line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6166 "ImportPage.c"
+#line 6155 "ImportPage.c"
 }
 
 
 static gint64 import_page_import_job_comparator (ImportPage* self, void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	time_t _tmp1_ = 0;
-	void* _tmp2_ = NULL;
-	time_t _tmp3_ = 0;
+	void* _tmp0_;
+	time_t _tmp1_;
+	void* _tmp2_;
+	time_t _tmp3_;
 #line 873 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), 0LL);
 #line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6187,14 +6176,14 @@ static gint64 import_page_import_job_comparator (ImportPage* self, void* a, void
 	result = (gint64) (_tmp1_ - _tmp3_);
 #line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6190 "ImportPage.c"
+#line 6179 "ImportPage.c"
 }
 
 
 static void import_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	ImportPage * self;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
 #line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
 #line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6207,27 +6196,27 @@ static void import_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_
 	_tmp1_ = ui_filenames;
 #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "import.ui");
-#line 6210 "ImportPage.c"
+#line 6199 "ImportPage.c"
 }
 
 
 static GVariant* _variant_new15 (gboolean value) {
 #line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6217 "ImportPage.c"
+#line 6206 "ImportPage.c"
 }
 
 
 static void import_page_real_add_actions (Page* base, GActionMap* map) {
 	ImportPage * self;
-	GActionMap* _tmp0_ = NULL;
-	GActionMap* _tmp1_ = NULL;
-	GAction* _tmp2_ = NULL;
-	GAction* _tmp3_ = NULL;
-	ConfigFacade* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	GVariant* _tmp7_ = NULL;
+	GActionMap* _tmp0_;
+	GActionMap* _tmp1_;
+	GAction* _tmp2_;
+	GAction* _tmp3_;
+	ConfigFacade* _tmp4_;
+	ConfigFacade* _tmp5_;
+	gboolean _tmp6_;
+	GVariant* _tmp7_;
 #line 890 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
 #line 890 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6260,13 +6249,13 @@ static void import_page_real_add_actions (Page* base, GActionMap* map) {
 	_g_object_unref0 (_tmp5_);
 #line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 6263 "ImportPage.c"
+#line 6252 "ImportPage.c"
 }
 
 
 static void import_page_real_remove_actions (Page* base, GActionMap* map) {
 	ImportPage * self;
-	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp0_;
 #line 898 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
 #line 898 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6275,7 +6264,7 @@ static void import_page_real_remove_actions (Page* base, GActionMap* map) {
 	_tmp0_ = map;
 #line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	PAGE_CLASS (import_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 6278 "ImportPage.c"
+#line 6267 "ImportPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -6287,15 +6276,15 @@ static void import_page_real_remove_actions (Page* base, GActionMap* map) {
 		entry_collection_length1 = G_N_ELEMENTS (IMPORT_PAGE_entries);
 #line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (IMPORT_PAGE_entries); entry_it = entry_it + 1) {
-#line 6290 "ImportPage.c"
+#line 6279 "ImportPage.c"
 			GActionEntry entry = {0};
 #line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			entry = entry_collection[entry_it];
-#line 6294 "ImportPage.c"
+#line 6283 "ImportPage.c"
 			{
-				GActionMap* _tmp1_ = NULL;
-				GActionEntry _tmp2_ = {0};
-				const gchar* _tmp3_ = NULL;
+				GActionMap* _tmp1_;
+				GActionEntry _tmp2_;
+				const gchar* _tmp3_;
 #line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp1_ = map;
 #line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6304,7 +6293,7 @@ static void import_page_real_remove_actions (Page* base, GActionMap* map) {
 				_tmp3_ = _tmp2_.name;
 #line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 6307 "ImportPage.c"
+#line 6296 "ImportPage.c"
 			}
 		}
 	}
@@ -6313,8 +6302,8 @@ static void import_page_real_remove_actions (Page* base, GActionMap* map) {
 
 Camera* import_page_get_camera (ImportPage* self) {
 	Camera* result = NULL;
-	Camera* _tmp0_ = NULL;
-	Camera* _tmp1_ = NULL;
+	Camera* _tmp0_;
+	Camera* _tmp1_;
 #line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
 #line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6325,14 +6314,14 @@ Camera* import_page_get_camera (ImportPage* self) {
 	result = _tmp1_;
 #line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6328 "ImportPage.c"
+#line 6317 "ImportPage.c"
 }
 
 
 gchar* import_page_get_uri (ImportPage* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 909 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
 #line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6343,13 +6332,13 @@ gchar* import_page_get_uri (ImportPage* self) {
 	result = _tmp1_;
 #line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6346 "ImportPage.c"
+#line 6335 "ImportPage.c"
 }
 
 
 gboolean import_page_is_busy (ImportPage* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 913 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
 #line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6358,14 +6347,14 @@ gboolean import_page_is_busy (ImportPage* self) {
 	result = _tmp0_;
 #line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6361 "ImportPage.c"
+#line 6350 "ImportPage.c"
 }
 
 
 static void import_page_real_init_actions (Page* base, gint selected_count, gint count) {
 	ImportPage * self;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 917 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
 #line 918 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6380,44 +6369,44 @@ static void import_page_real_init_actions (Page* base, gint selected_count, gint
 	_tmp1_ = count;
 #line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	PAGE_CLASS (import_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_, _tmp1_);
-#line 6383 "ImportPage.c"
+#line 6372 "ImportPage.c"
 }
 
 
 gboolean import_page_is_refreshed (ImportPage* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
 #line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->refreshed;
 #line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 6397 "ImportPage.c"
-		gboolean _tmp2_ = FALSE;
+#line 6386 "ImportPage.c"
+		gboolean _tmp2_;
 #line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = self->priv->busy;
 #line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = !_tmp2_;
-#line 6403 "ImportPage.c"
+#line 6392 "ImportPage.c"
 	} else {
 #line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 6407 "ImportPage.c"
+#line 6396 "ImportPage.c"
 	}
 #line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
 #line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6413 "ImportPage.c"
+#line 6402 "ImportPage.c"
 }
 
 
 gchar* import_page_get_refresh_message (ImportPage* self) {
 	gchar* result = NULL;
 	gchar* msg = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
 #line 931 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6426,9 +6415,9 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
 	_tmp0_ = self->priv->refresh_error;
 #line 932 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ != NULL) {
-#line 6429 "ImportPage.c"
-		const gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
+#line 6418 "ImportPage.c"
+		const gchar* _tmp1_;
+		gchar* _tmp2_;
 #line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = self->priv->refresh_error;
 #line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6437,17 +6426,17 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
 		_g_free0 (msg);
 #line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		msg = _tmp2_;
-#line 6440 "ImportPage.c"
+#line 6429 "ImportPage.c"
 	} else {
-		int _tmp3_ = 0;
+		int _tmp3_;
 #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->refresh_result;
 #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp3_ == GP_OK) {
-#line 6447 "ImportPage.c"
+#line 6436 "ImportPage.c"
 		} else {
-			int _tmp4_ = 0;
-			gchar* _tmp5_ = NULL;
+			int _tmp4_;
+			gchar* _tmp5_;
 #line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp4_ = self->priv->refresh_result;
 #line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6456,20 +6445,20 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
 			_g_free0 (msg);
 #line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			msg = _tmp5_;
-#line 6459 "ImportPage.c"
+#line 6448 "ImportPage.c"
 		}
 	}
 #line 940 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = msg;
 #line 940 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6466 "ImportPage.c"
+#line 6455 "ImportPage.c"
 }
 
 
 static void import_page_update_status (ImportPage* self, gboolean busy, gboolean refreshed) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
 #line 943 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
 #line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6482,45 +6471,45 @@ static void import_page_update_status (ImportPage* self, gboolean busy, gboolean
 	self->priv->refreshed = _tmp1_;
 #line 947 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 6485 "ImportPage.c"
+#line 6474 "ImportPage.c"
 }
 
 
 static void import_page_update_toolbar_state (ImportPage* self) {
-	GtkCheckButton* _tmp0_ = NULL;
+	GtkCheckButton* _tmp0_;
 #line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
 #line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->hide_imported;
 #line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ != NULL) {
-#line 6497 "ImportPage.c"
+#line 6486 "ImportPage.c"
 		gboolean _tmp1_ = FALSE;
 		gboolean _tmp2_ = FALSE;
-		gboolean _tmp3_ = FALSE;
-		GtkCheckButton* _tmp8_ = NULL;
+		gboolean _tmp3_;
+		GtkCheckButton* _tmp8_;
 #line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->busy;
 #line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (!_tmp3_) {
-#line 6506 "ImportPage.c"
-			gboolean _tmp4_ = FALSE;
+#line 6495 "ImportPage.c"
+			gboolean _tmp4_;
 #line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp4_ = self->priv->refreshed;
 #line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp2_ = _tmp4_;
-#line 6512 "ImportPage.c"
+#line 6501 "ImportPage.c"
 		} else {
 #line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp2_ = FALSE;
-#line 6516 "ImportPage.c"
+#line 6505 "ImportPage.c"
 		}
 #line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp2_) {
-#line 6520 "ImportPage.c"
-			ViewCollection* _tmp5_ = NULL;
-			ViewCollection* _tmp6_ = NULL;
-			gint _tmp7_ = 0;
+#line 6509 "ImportPage.c"
+			ViewCollection* _tmp5_;
+			ViewCollection* _tmp6_;
+			gint _tmp7_;
 #line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6531,17 +6520,17 @@ static void import_page_update_toolbar_state (ImportPage* self) {
 			_tmp1_ = _tmp7_ > 0;
 #line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_data_collection_unref0 (_tmp6_);
-#line 6534 "ImportPage.c"
+#line 6523 "ImportPage.c"
 		} else {
 #line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp1_ = FALSE;
-#line 6538 "ImportPage.c"
+#line 6527 "ImportPage.c"
 		}
 #line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = self->priv->hide_imported;
 #line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 6544 "ImportPage.c"
+#line 6533 "ImportPage.c"
 	}
 }
 
@@ -6549,36 +6538,36 @@ static void import_page_update_toolbar_state (ImportPage* self) {
 static void import_page_on_view_changed (ImportPage* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp2_;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_ = FALSE;
+	gboolean _tmp9_;
 	gboolean _tmp14_ = FALSE;
-	gboolean _tmp15_ = FALSE;
+	gboolean _tmp15_;
 #line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
 #line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->busy;
 #line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp2_) {
-#line 6564 "ImportPage.c"
-		gboolean _tmp3_ = FALSE;
+#line 6553 "ImportPage.c"
+		gboolean _tmp3_;
 #line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->refreshed;
 #line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = _tmp3_;
-#line 6570 "ImportPage.c"
+#line 6559 "ImportPage.c"
 	} else {
 #line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = FALSE;
-#line 6574 "ImportPage.c"
+#line 6563 "ImportPage.c"
 	}
 #line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 6578 "ImportPage.c"
-		ViewCollection* _tmp4_ = NULL;
-		ViewCollection* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
+#line 6567 "ImportPage.c"
+		ViewCollection* _tmp4_;
+		ViewCollection* _tmp5_;
+		gint _tmp6_;
 #line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6589,11 +6578,11 @@ static void import_page_on_view_changed (ImportPage* self) {
 		_tmp0_ = _tmp6_ > 0;
 #line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 6592 "ImportPage.c"
+#line 6581 "ImportPage.c"
 	} else {
 #line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 6596 "ImportPage.c"
+#line 6585 "ImportPage.c"
 	}
 #line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected", _tmp0_);
@@ -6601,24 +6590,24 @@ static void import_page_on_view_changed (ImportPage* self) {
 	_tmp9_ = self->priv->busy;
 #line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp9_) {
-#line 6604 "ImportPage.c"
-		gboolean _tmp10_ = FALSE;
+#line 6593 "ImportPage.c"
+		gboolean _tmp10_;
 #line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = self->priv->refreshed;
 #line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = _tmp10_;
-#line 6610 "ImportPage.c"
+#line 6599 "ImportPage.c"
 	} else {
 #line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = FALSE;
-#line 6614 "ImportPage.c"
+#line 6603 "ImportPage.c"
 	}
 #line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp8_) {
-#line 6618 "ImportPage.c"
-		ViewCollection* _tmp11_ = NULL;
-		ViewCollection* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
+#line 6607 "ImportPage.c"
+		ViewCollection* _tmp11_;
+		ViewCollection* _tmp12_;
+		gint _tmp13_;
 #line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6629,11 +6618,11 @@ static void import_page_on_view_changed (ImportPage* self) {
 		_tmp7_ = _tmp13_ > 0;
 #line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp12_);
-#line 6632 "ImportPage.c"
+#line 6621 "ImportPage.c"
 	} else {
 #line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = FALSE;
-#line 6636 "ImportPage.c"
+#line 6625 "ImportPage.c"
 	}
 #line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", _tmp7_);
@@ -6641,10 +6630,10 @@ static void import_page_on_view_changed (ImportPage* self) {
 	_tmp15_ = self->priv->busy;
 #line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp15_) {
-#line 6644 "ImportPage.c"
-		ViewCollection* _tmp16_ = NULL;
-		ViewCollection* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
+#line 6633 "ImportPage.c"
+		ViewCollection* _tmp16_;
+		ViewCollection* _tmp17_;
+		gint _tmp18_;
 #line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6655,40 +6644,40 @@ static void import_page_on_view_changed (ImportPage* self) {
 		_tmp14_ = _tmp18_ > 0;
 #line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 6658 "ImportPage.c"
+#line 6647 "ImportPage.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = FALSE;
-#line 6662 "ImportPage.c"
+#line 6651 "ImportPage.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSelectAll", _tmp14_);
 #line 960 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_toolbar_state (self);
-#line 6668 "ImportPage.c"
+#line 6657 "ImportPage.c"
 }
 
 
 static void import_page_on_media_added_removed (ImportPage* self) {
-	ImportPageImportPageSearchViewFilter* _tmp0_ = NULL;
+	ImportPageImportPageSearchViewFilter* _tmp0_;
 #line 963 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
 #line 964 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->search_filter;
 #line 964 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 6680 "ImportPage.c"
+#line 6669 "ImportPage.c"
 }
 
 
 static void import_page_on_display_titles (ImportPage* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GVariant* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
+	GVariant* _tmp0_;
+	gboolean _tmp1_;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	GSimpleAction* _tmp4_;
+	GVariant* _tmp5_;
 #line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
 #line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6715,15 +6704,15 @@ static void import_page_on_display_titles (ImportPage* self, GSimpleAction* acti
 	_tmp5_ = value;
 #line 973 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6718 "ImportPage.c"
+#line 6707 "ImportPage.c"
 }
 
 
 static void import_page_real_switched_to (Page* base) {
 	ImportPage * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
 #line 976 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
 #line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6738,13 +6727,13 @@ static void import_page_real_switched_to (Page* base) {
 	_g_object_unref0 (_tmp1_);
 #line 979 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	PAGE_CLASS (import_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
-#line 6741 "ImportPage.c"
+#line 6730 "ImportPage.c"
 }
 
 
 static void import_page_real_ready (Page* base) {
 	ImportPage * self;
-	ImportPageHideImportedViewFilter* _tmp0_ = NULL;
+	ImportPageHideImportedViewFilter* _tmp0_;
 #line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
 #line 983 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6753,16 +6742,16 @@ static void import_page_real_ready (Page* base) {
 	_tmp0_ = self->priv->hide_imported_filter;
 #line 984 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 6756 "ImportPage.c"
+#line 6745 "ImportPage.c"
 }
 
 
 static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_on_locked) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	ImportPageRefreshResult res = 0;
-	ImportPageRefreshResult _tmp3_ = 0;
-	ImportPageRefreshResult _tmp4_ = 0;
+	ImportPageRefreshResult _tmp3_;
+	ImportPageRefreshResult _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 987 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
@@ -6772,20 +6761,20 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 	if (_tmp1_) {
 #line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = TRUE;
-#line 6775 "ImportPage.c"
+#line 6764 "ImportPage.c"
 	} else {
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = self->priv->busy;
 #line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp2_;
-#line 6782 "ImportPage.c"
+#line 6771 "ImportPage.c"
 	}
 #line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
 #line 990 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 6788 "ImportPage.c"
+#line 6777 "ImportPage.c"
 	}
 #line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = import_page_refresh_camera (self);
@@ -6799,23 +6788,23 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 		case IMPORT_PAGE_REFRESH_RESULT_OK:
 #line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_BUSY:
-#line 6802 "ImportPage.c"
+#line 6791 "ImportPage.c"
 		{
 #line 998 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 6806 "ImportPage.c"
+#line 6795 "ImportPage.c"
 		}
 #line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_LOCKED:
-#line 6810 "ImportPage.c"
+#line 6799 "ImportPage.c"
 		{
-			gboolean _tmp5_ = FALSE;
-			const gchar* _tmp6_ = NULL;
+			gboolean _tmp5_;
+			const gchar* _tmp6_;
 			GFile* uri = NULL;
-			const gchar* _tmp7_ = NULL;
-			GFile* _tmp8_ = NULL;
+			const gchar* _tmp7_;
+			GFile* _tmp8_;
 			GMount* mount = NULL;
-			GMount* _tmp13_ = NULL;
+			GMount* _tmp13_;
 #line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp5_ = fail_on_locked;
 #line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6824,7 +6813,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL);
 #line 1004 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 6827 "ImportPage.c"
+#line 6816 "ImportPage.c"
 			}
 #line 1008 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp6_ = self->priv->uri;
@@ -6838,12 +6827,12 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 			uri = _tmp8_;
 #line 1012 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			mount = NULL;
-#line 6841 "ImportPage.c"
+#line 6830 "ImportPage.c"
 			{
 				GMount* _tmp9_ = NULL;
-				GFile* _tmp10_ = NULL;
-				GMount* _tmp11_ = NULL;
-				GMount* _tmp12_ = NULL;
+				GFile* _tmp10_;
+				GMount* _tmp11_;
+				GMount* _tmp12_;
 #line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp10_ = uri;
 #line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6852,8 +6841,8 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				_tmp9_ = _tmp11_;
 #line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6855 "ImportPage.c"
-					goto __catch65_g_error;
+#line 6844 "ImportPage.c"
+					goto __catch66_g_error;
 				}
 #line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp12_ = _tmp9_;
@@ -6865,10 +6854,10 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				mount = _tmp12_;
 #line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp9_);
-#line 6868 "ImportPage.c"
+#line 6857 "ImportPage.c"
 			}
-			goto __finally65;
-			__catch65_g_error:
+			goto __finally66;
+			__catch66_g_error:
 			{
 				GError* err = NULL;
 #line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6877,9 +6866,9 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				_inner_error_ = NULL;
 #line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_error_free0 (err);
-#line 6880 "ImportPage.c"
+#line 6869 "ImportPage.c"
 			}
-			__finally65:
+			__finally66:
 #line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6892,156 +6881,140 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				g_clear_error (&_inner_error_);
 #line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return;
-#line 6895 "ImportPage.c"
+#line 6884 "ImportPage.c"
 			}
 #line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp13_ = mount;
 #line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp13_ != NULL) {
-#line 6901 "ImportPage.c"
+#line 6890 "ImportPage.c"
 				gchar* mounted_message = NULL;
-				const gchar* _tmp14_ = NULL;
-				gchar* _tmp15_ = NULL;
+				gchar* _tmp14_;
 				GtkMessageDialog* dialog = NULL;
-				AppWindow* _tmp16_ = NULL;
-				AppWindow* _tmp17_ = NULL;
-				const gchar* _tmp18_ = NULL;
-				GtkMessageDialog* _tmp19_ = NULL;
-				GtkMessageDialog* _tmp20_ = NULL;
-				GtkMessageDialog* _tmp21_ = NULL;
-				GtkMessageDialog* _tmp22_ = NULL;
-				const gchar* _tmp23_ = NULL;
+				AppWindow* _tmp15_;
+				AppWindow* _tmp16_;
+				const gchar* _tmp17_;
+				GtkMessageDialog* _tmp18_;
+				GtkMessageDialog* _tmp19_;
+				GtkMessageDialog* _tmp20_;
+				GtkMessageDialog* _tmp21_;
 				gint dialog_res = 0;
-				GtkMessageDialog* _tmp24_ = NULL;
-				gint _tmp25_ = 0;
-				GtkMessageDialog* _tmp26_ = NULL;
-				gint _tmp27_ = 0;
+				GtkMessageDialog* _tmp22_;
+				gint _tmp23_;
+				GtkMessageDialog* _tmp24_;
+				gint _tmp25_;
 #line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp14_ = _ ("Shotwell needs to unmount the camera from the filesystem in order to a" \
-"ccess it. Continue?");
+				_tmp14_ = g_strdup (_ ("Shotwell needs to unmount the camera from the filesystem in order to a" \
+"ccess it. Continue?"));
 #line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp15_ = g_strdup (_tmp14_);
-#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				mounted_message = _tmp15_;
+				mounted_message = _tmp14_;
 #line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp16_ = app_window_get_instance ();
+				_tmp15_ = app_window_get_instance ();
 #line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp17_ = _tmp16_;
+				_tmp16_ = _tmp15_;
 #line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp18_ = mounted_message;
+				_tmp17_ = mounted_message;
 #line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp19_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", _tmp18_);
+				_tmp18_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", _tmp17_);
 #line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				g_object_ref_sink (_tmp19_);
+				g_object_ref_sink (_tmp18_);
 #line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp20_ = _tmp19_;
+				_tmp19_ = _tmp18_;
 #line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_g_object_unref0 (_tmp17_);
+				_g_object_unref0 (_tmp16_);
 #line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				dialog = _tmp20_;
+				dialog = _tmp19_;
 #line 1026 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp21_ = dialog;
+				_tmp20_ = dialog;
 #line 1026 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
+				gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
 #line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp22_ = dialog;
-#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp23_ = _ ("_Unmount");
+				_tmp21_ = dialog;
 #line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_dialog_get_type (), GtkDialog), _tmp23_, (gint) GTK_RESPONSE_YES);
+				gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_dialog_get_type (), GtkDialog), _ ("_Unmount"), (gint) GTK_RESPONSE_YES);
 #line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp24_ = dialog;
+				_tmp22_ = dialog;
 #line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp25_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_dialog_get_type (), GtkDialog));
+				_tmp23_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_dialog_get_type (), GtkDialog));
 #line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				dialog_res = _tmp25_;
+				dialog_res = _tmp23_;
 #line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp26_ = dialog;
+				_tmp24_ = dialog;
 #line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
+				gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
 #line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp27_ = dialog_res;
+				_tmp25_ = dialog_res;
 #line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (_tmp27_ != ((gint) GTK_RESPONSE_YES)) {
-#line 6965 "ImportPage.c"
-					const gchar* _tmp28_ = NULL;
-#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp28_ = _ ("Please unmount the camera.");
+				if (_tmp25_ != ((gint) GTK_RESPONSE_YES)) {
 #line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp28_);
-#line 6971 "ImportPage.c"
+					checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Please unmount the camera."));
+#line 6950 "ImportPage.c"
 				} else {
-					GMount* _tmp29_ = NULL;
+					GMount* _tmp26_;
 #line 1034 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp29_ = mount;
+					_tmp26_ = mount;
 #line 1034 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					import_page_unmount_camera (self, _tmp29_);
-#line 6978 "ImportPage.c"
+					import_page_unmount_camera (self, _tmp26_);
+#line 6957 "ImportPage.c"
 				}
 #line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (dialog);
 #line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (mounted_message);
-#line 6984 "ImportPage.c"
+#line 6963 "ImportPage.c"
 			} else {
 				gchar* locked_message = NULL;
-				const gchar* _tmp30_ = NULL;
-				gchar* _tmp31_ = NULL;
+				gchar* _tmp27_;
 				GtkMessageDialog* dialog = NULL;
-				AppWindow* _tmp32_ = NULL;
-				AppWindow* _tmp33_ = NULL;
-				const gchar* _tmp34_ = NULL;
-				GtkMessageDialog* _tmp35_ = NULL;
-				GtkMessageDialog* _tmp36_ = NULL;
-				GtkMessageDialog* _tmp37_ = NULL;
-				GtkMessageDialog* _tmp38_ = NULL;
-				GtkMessageDialog* _tmp39_ = NULL;
-				const gchar* _tmp40_ = NULL;
+				AppWindow* _tmp28_;
+				AppWindow* _tmp29_;
+				const gchar* _tmp30_;
+				GtkMessageDialog* _tmp31_;
+				GtkMessageDialog* _tmp32_;
+				GtkMessageDialog* _tmp33_;
+				GtkMessageDialog* _tmp34_;
+				GtkMessageDialog* _tmp35_;
 #line 1037 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp30_ = _ ("The camera is locked by another application. Shotwell can only access " \
+				_tmp27_ = g_strdup (_ ("The camera is locked by another application. Shotwell can only access " \
 "the camera when it’s unlocked. Please close any other application usin" \
-"g the camera and try again.");
-#line 1037 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp31_ = g_strdup (_tmp30_);
+"g the camera and try again."));
 #line 1037 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				locked_message = _tmp31_;
+				locked_message = _tmp27_;
 #line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp32_ = app_window_get_instance ();
+				_tmp28_ = app_window_get_instance ();
 #line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp33_ = _tmp32_;
+				_tmp29_ = _tmp28_;
 #line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp34_ = locked_message;
+				_tmp30_ = locked_message;
 #line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp35_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", _tmp34_);
+				_tmp31_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", _tmp30_);
 #line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				g_object_ref_sink (_tmp35_);
+				g_object_ref_sink (_tmp31_);
 #line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp36_ = _tmp35_;
+				_tmp32_ = _tmp31_;
 #line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_g_object_unref0 (_tmp33_);
+				_g_object_unref0 (_tmp29_);
 #line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				dialog = _tmp36_;
+				dialog = _tmp32_;
 #line 1043 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp37_ = dialog;
+				_tmp33_ = dialog;
 #line 1043 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
+				gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
 #line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp38_ = dialog;
+				_tmp34_ = dialog;
 #line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_dialog_get_type (), GtkDialog));
+				gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_dialog_get_type (), GtkDialog));
 #line 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp39_ = dialog;
+				_tmp35_ = dialog;
 #line 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+				gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget));
 #line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp40_ = _ ("Please close any other application using the camera.");
-#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp40_);
+				checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Please close any other application using the camera."));
 #line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (dialog);
 #line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (locked_message);
-#line 7041 "ImportPage.c"
+#line 7014 "ImportPage.c"
 			}
 #line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (mount);
@@ -7049,45 +7022,42 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 			_g_object_unref0 (uri);
 #line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 7049 "ImportPage.c"
+#line 7022 "ImportPage.c"
 		}
 #line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR:
-#line 7053 "ImportPage.c"
+#line 7026 "ImportPage.c"
 		{
-			const gchar* _tmp41_ = NULL;
-			gchar* _tmp42_ = NULL;
-			gchar* _tmp43_ = NULL;
-			gchar* _tmp44_ = NULL;
-			gchar* _tmp45_ = NULL;
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp41_ = _ ("Unable to fetch previews from the camera:\n%s");
+			gchar* _tmp36_;
+			gchar* _tmp37_;
+			gchar* _tmp38_;
+			gchar* _tmp39_;
 #line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp42_ = import_page_get_refresh_message (self);
+			_tmp36_ = import_page_get_refresh_message (self);
 #line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp43_ = _tmp42_;
+			_tmp37_ = _tmp36_;
 #line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp44_ = g_strdup_printf (_tmp41_, _tmp43_);
+			_tmp38_ = g_strdup_printf (_ ("Unable to fetch previews from the camera:\n%s"), _tmp37_);
 #line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp45_ = _tmp44_;
+			_tmp39_ = _tmp38_;
 #line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			app_window_error_message (_tmp45_, NULL);
+			app_window_error_message (_tmp39_, NULL);
 #line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_free0 (_tmp45_);
+			_g_free0 (_tmp39_);
 #line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_free0 (_tmp43_);
+			_g_free0 (_tmp37_);
 #line 1054 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 7078 "ImportPage.c"
+#line 7048 "ImportPage.c"
 		}
 		default:
 		{
-			ImportPageRefreshResult _tmp46_ = 0;
+			ImportPageRefreshResult _tmp40_;
 #line 1057 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp46_ = res;
+			_tmp40_ = res;
 #line 1057 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			g_error ("ImportPage.vala:1057: Unknown result type %d", (gint) _tmp46_);
-#line 7087 "ImportPage.c"
+			g_error ("ImportPage.vala:1057: Unknown result type %d", (gint) _tmp40_);
+#line 7057 "ImportPage.c"
 		}
 	}
 }
@@ -7096,7 +7066,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 static void _import_page_on_unmounted_g_mount_unmounted (GMount* _sender, gpointer self) {
 #line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_unmounted ((ImportPage*) self, _sender);
-#line 7096 "ImportPage.c"
+#line 7066 "ImportPage.c"
 }
 
 
@@ -7105,24 +7075,23 @@ static void _import_page_on_unmount_finished_gasync_ready_callback (GObject* sou
 	import_page_on_unmount_finished ((ImportPage*) self, source_object, res);
 #line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_unref (self);
-#line 7105 "ImportPage.c"
+#line 7075 "ImportPage.c"
 }
 
 
 gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	GtkProgressBar* _tmp1_ = NULL;
-	GtkProgressBar* _tmp2_ = NULL;
-	GtkProgressBar* _tmp3_ = NULL;
-	GtkProgressBar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	GMount* _tmp6_ = NULL;
-	GMount* _tmp7_ = NULL;
-	AppWindow* _tmp8_ = NULL;
-	AppWindow* _tmp9_ = NULL;
-	GtkMountOperation* _tmp10_ = NULL;
-	GtkMountOperation* _tmp11_ = NULL;
+	gboolean _tmp0_;
+	GtkProgressBar* _tmp1_;
+	GtkProgressBar* _tmp2_;
+	GtkProgressBar* _tmp3_;
+	GtkProgressBar* _tmp4_;
+	GMount* _tmp5_;
+	GMount* _tmp6_;
+	AppWindow* _tmp7_;
+	AppWindow* _tmp8_;
+	GtkMountOperation* _tmp9_;
+	GtkMountOperation* _tmp10_;
 #line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
 #line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7135,7 +7104,7 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
 		result = FALSE;
 #line 1063 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7135 "ImportPage.c"
+#line 7104 "ImportPage.c"
 	}
 #line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, TRUE, FALSE);
@@ -7154,43 +7123,41 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
 #line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = self->priv->progress_bar;
 #line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp5_ = _ ("Unmounting…");
-#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_progress_bar_set_text (_tmp4_, _tmp5_);
+	gtk_progress_bar_set_text (_tmp4_, _ ("Unmounting…"));
 #line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp6_ = mount;
+	_tmp5_ = mount;
 #line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_signal_connect_object (_tmp6_, "unmounted", (GCallback) _import_page_on_unmounted_g_mount_unmounted, self, 0);
+	g_signal_connect_object (_tmp5_, "unmounted", (GCallback) _import_page_on_unmounted_g_mount_unmounted, self, 0);
 #line 1076 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_debug ("ImportPage.vala:1076: Unmounting camera…");
 #line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp7_ = mount;
+	_tmp6_ = mount;
 #line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp8_ = app_window_get_instance ();
+	_tmp7_ = app_window_get_instance ();
 #line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp10_ = (GtkMountOperation*) gtk_mount_operation_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow));
+	_tmp9_ = (GtkMountOperation*) gtk_mount_operation_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow));
 #line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp11_ = _tmp10_;
+	_tmp10_ = _tmp9_;
 #line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_mount_unmount_with_operation (_tmp7_, G_MOUNT_UNMOUNT_NONE, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, g_mount_operation_get_type (), GMountOperation), NULL, _import_page_on_unmount_finished_gasync_ready_callback, g_object_ref (self));
+	g_mount_unmount_with_operation (_tmp6_, G_MOUNT_UNMOUNT_NONE, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_mount_operation_get_type (), GMountOperation), NULL, _import_page_on_unmount_finished_gasync_ready_callback, g_object_ref (self));
 #line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_g_object_unref0 (_tmp11_);
+	_g_object_unref0 (_tmp10_);
 #line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_g_object_unref0 (_tmp9_);
+	_g_object_unref0 (_tmp8_);
 #line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = TRUE;
 #line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 7183 "ImportPage.c"
+#line 7150 "ImportPage.c"
 }
 
 
 static void import_page_on_unmount_finished (ImportPage* self, GObject* source, GAsyncResult* aresult) {
 	GMount* mount = NULL;
-	GObject* _tmp0_ = NULL;
-	GMount* _tmp1_ = NULL;
+	GObject* _tmp0_;
+	GMount* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
@@ -7206,28 +7173,28 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_mount_get_type (), GMount));
 #line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	mount = _tmp1_;
-#line 7206 "ImportPage.c"
+#line 7173 "ImportPage.c"
 	{
-		GAsyncResult* _tmp2_ = NULL;
+		GAsyncResult* _tmp2_;
 #line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = aresult;
 #line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_mount_unmount_with_operation_finish (mount, _tmp2_, &_inner_error_);
 #line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7215 "ImportPage.c"
-			goto __catch66_g_error;
+#line 7182 "ImportPage.c"
+			goto __catch67_g_error;
 		}
 	}
-	goto __finally66;
-	__catch66_g_error:
+	goto __finally67;
+	__catch67_g_error:
 	{
 		GError* err = NULL;
-		guint _tmp3_ = 0U;
-		gboolean _tmp4_ = FALSE;
-		GtkProgressBar* _tmp5_ = NULL;
-		GtkProgressBar* _tmp6_ = NULL;
-		GtkProgressBar* _tmp7_ = NULL;
+		guint _tmp3_;
+		gboolean _tmp4_;
+		GtkProgressBar* _tmp5_;
+		GtkProgressBar* _tmp6_;
+		GtkProgressBar* _tmp7_;
 #line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		err = _inner_error_;
 #line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7256,9 +7223,9 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_error_free0 (err);
-#line 7256 "ImportPage.c"
+#line 7223 "ImportPage.c"
 	}
-	__finally66:
+	__finally67:
 #line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7269,19 +7236,19 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 		g_clear_error (&_inner_error_);
 #line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 7269 "ImportPage.c"
+#line 7236 "ImportPage.c"
 	}
 #line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (mount);
-#line 7273 "ImportPage.c"
+#line 7240 "ImportPage.c"
 }
 
 
 static void import_page_on_unmounted (ImportPage* self, GMount* mount) {
-	gboolean _tmp0_ = FALSE;
-	GtkProgressBar* _tmp1_ = NULL;
-	GtkProgressBar* _tmp2_ = NULL;
-	GtkProgressBar* _tmp3_ = NULL;
+	gboolean _tmp0_;
+	GtkProgressBar* _tmp1_;
+	GtkProgressBar* _tmp2_;
+	GtkProgressBar* _tmp3_;
 #line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
 #line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7306,15 +7273,15 @@ static void import_page_on_unmounted (ImportPage* self, GMount* mount) {
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 1110 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_try_refreshing_camera (self, TRUE);
-#line 7306 "ImportPage.c"
+#line 7273 "ImportPage.c"
 }
 
 
 static void import_page_clear_all_import_sources (ImportPage* self) {
 	Marker* marker = NULL;
-	SourceCollection* _tmp0_ = NULL;
-	Marker* _tmp1_ = NULL;
-	SourceCollection* _tmp2_ = NULL;
+	SourceCollection* _tmp0_;
+	Marker* _tmp1_;
+	SourceCollection* _tmp2_;
 #line 1113 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
 #line 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7331,7 +7298,7 @@ static void import_page_clear_all_import_sources (ImportPage* self) {
 	source_collection_destroy_marked (_tmp2_, marker, FALSE, NULL, NULL, NULL);
 #line 1113 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (marker);
-#line 7331 "ImportPage.c"
+#line 7298 "ImportPage.c"
 }
 
 
@@ -7345,26 +7312,26 @@ static void import_page_clear_all_import_sources (ImportPage* self) {
 static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, const gchar* dir, const gchar* search_target) {
 	gboolean result = FALSE;
 	gchar* fulldir = NULL;
-	Camera* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	Camera* _tmp0_;
+	const gchar* _tmp1_;
+	gint _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
 	int _result_ = 0;
 	CameraList* folders = NULL;
 	CameraList* _tmp5_ = NULL;
-	int _tmp6_ = 0;
-	int _tmp7_ = 0;
-	Camera* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	CameraList* _tmp10_ = NULL;
-	GPSpinIdleWrapper* _tmp11_ = NULL;
-	GPContext* _tmp12_ = NULL;
-	int _tmp13_ = 0;
-	int _tmp14_ = 0;
+	int _tmp6_;
+	int _tmp7_;
+	Camera* _tmp8_;
+	const gchar* _tmp9_;
+	CameraList* _tmp10_;
+	GPSpinIdleWrapper* _tmp11_;
+	GPContext* _tmp12_;
+	int _tmp13_;
+	int _tmp14_;
 	gint list_len = 0;
-	CameraList* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
+	CameraList* _tmp15_;
+	gint _tmp16_;
 #line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
 #line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7403,7 +7370,7 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 		_g_free0 (fulldir);
 #line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7403 "ImportPage.c"
+#line 7370 "ImportPage.c"
 	}
 #line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = self->priv->camera;
@@ -7431,7 +7398,7 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 		_g_free0 (fulldir);
 #line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7431 "ImportPage.c"
+#line 7398 "ImportPage.c"
 	}
 #line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = folders;
@@ -7439,37 +7406,37 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 	_tmp16_ = gp_list_count (_tmp15_);
 #line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	list_len = _tmp16_;
-#line 7439 "ImportPage.c"
+#line 7406 "ImportPage.c"
 	{
 		gint list_index = 0;
 #line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		list_index = 0;
-#line 7444 "ImportPage.c"
+#line 7411 "ImportPage.c"
 		{
 			gboolean _tmp17_ = FALSE;
 #line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp17_ = TRUE;
 #line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 7451 "ImportPage.c"
-				gint _tmp19_ = 0;
-				gint _tmp20_ = 0;
+#line 7418 "ImportPage.c"
+				gint _tmp19_;
+				gint _tmp20_;
 				gchar* tmp = NULL;
-				CameraList* _tmp21_ = NULL;
-				gint _tmp22_ = 0;
+				CameraList* _tmp21_;
+				gint _tmp22_;
 				const gchar* _tmp23_ = NULL;
-				gchar* _tmp24_ = NULL;
-				const gchar* _tmp25_ = NULL;
-				const gchar* _tmp26_ = NULL;
+				gchar* _tmp24_;
+				const gchar* _tmp25_;
+				const gchar* _tmp26_;
 #line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp17_) {
-#line 7463 "ImportPage.c"
-					gint _tmp18_ = 0;
+#line 7430 "ImportPage.c"
+					gint _tmp18_;
 #line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp18_ = list_index;
 #line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					list_index = _tmp18_ + 1;
-#line 7469 "ImportPage.c"
+#line 7436 "ImportPage.c"
 				}
 #line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp17_ = FALSE;
@@ -7481,7 +7448,7 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 				if (!(_tmp19_ < _tmp20_)) {
 #line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 7481 "ImportPage.c"
+#line 7448 "ImportPage.c"
 				}
 #line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = folders;
@@ -7511,11 +7478,11 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 					_g_free0 (fulldir);
 #line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 7511 "ImportPage.c"
+#line 7478 "ImportPage.c"
 				}
 #line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (tmp);
-#line 7515 "ImportPage.c"
+#line 7482 "ImportPage.c"
 			}
 		}
 	}
@@ -7527,51 +7494,49 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 	_g_free0 (fulldir);
 #line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 7527 "ImportPage.c"
+#line 7494 "ImportPage.c"
 }
 
 
 static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 	ImportPageRefreshResult result = 0;
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	Camera* _tmp3_ = NULL;
-	GPSpinIdleWrapper* _tmp4_ = NULL;
-	GPContext* _tmp5_ = NULL;
-	int _tmp6_ = 0;
-	int _tmp7_ = 0;
-	gboolean _tmp13_ = FALSE;
-	GtkProgressBar* _tmp14_ = NULL;
-	GtkProgressBar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	GtkProgressBar* _tmp17_ = NULL;
-	GtkProgressBar* _tmp18_ = NULL;
-	GtkProgressBar* _tmp19_ = NULL;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	Camera* _tmp2_;
+	GPSpinIdleWrapper* _tmp3_;
+	GPContext* _tmp4_;
+	int _tmp5_;
+	int _tmp6_;
+	gboolean _tmp12_;
+	GtkProgressBar* _tmp13_;
+	GtkProgressBar* _tmp14_;
+	GtkProgressBar* _tmp15_;
+	GtkProgressBar* _tmp16_;
+	GtkProgressBar* _tmp17_;
 	GeeArrayList* import_list = NULL;
-	GeeArrayList* _tmp20_ = NULL;
+	GeeArrayList* _tmp18_;
 	CameraStorageInformation* sifs = NULL;
 	gint count = 0;
-	Camera* _tmp21_ = NULL;
-	GPSpinIdleWrapper* _tmp22_ = NULL;
-	GPContext* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	int _tmp25_ = 0;
-	int _tmp26_ = 0;
-	GeeArrayList* _tmp75_ = NULL;
-	GeeArrayList* _tmp76_ = NULL;
-	GtkProgressBar* _tmp77_ = NULL;
-	GtkProgressBar* _tmp78_ = NULL;
-	GtkProgressBar* _tmp79_ = NULL;
-	GtkProgressBar* _tmp80_ = NULL;
+	Camera* _tmp19_;
+	GPSpinIdleWrapper* _tmp20_;
+	GPContext* _tmp21_;
+	gint _tmp22_ = 0;
+	int _tmp23_;
+	int _tmp24_;
+	GeeArrayList* _tmp73_;
+	GeeArrayList* _tmp74_;
+	GtkProgressBar* _tmp75_;
+	GtkProgressBar* _tmp76_;
+	GtkProgressBar* _tmp77_;
+	GtkProgressBar* _tmp78_;
 	int res = 0;
-	Camera* _tmp81_ = NULL;
-	GPSpinIdleWrapper* _tmp82_ = NULL;
-	GPContext* _tmp83_ = NULL;
-	int _tmp84_ = 0;
-	int _tmp85_ = 0;
-	int _tmp89_ = 0;
-	int _tmp94_ = 0;
+	Camera* _tmp79_;
+	GPSpinIdleWrapper* _tmp80_;
+	GPContext* _tmp81_;
+	int _tmp82_;
+	int _tmp83_;
+	int _tmp87_;
+	int _tmp92_;
 #line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), 0);
 #line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7582,390 +7547,386 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 		result = IMPORT_PAGE_REFRESH_RESULT_BUSY;
 #line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7582 "ImportPage.c"
+#line 7547 "ImportPage.c"
 	}
 #line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp1_ = _ ("Starting import, please wait…");
-#line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp1_);
+	checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Starting import, please wait…"));
 #line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp2_ = self->priv->busy;
+	_tmp1_ = self->priv->busy;
 #line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_page_update_status (self, _tmp2_, FALSE);
+	import_page_update_status (self, _tmp1_, FALSE);
 #line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->refresh_error);
 #line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_error = NULL;
 #line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp3_ = self->priv->camera;
+	_tmp2_ = self->priv->camera;
 #line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp4_ = import_page_spin_idle_context;
+	_tmp3_ = import_page_spin_idle_context;
 #line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
 #line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp6_ = gp_camera_init (_tmp3_, _tmp5_);
+	_tmp5_ = gp_camera_init (_tmp2_, _tmp4_);
 #line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self->priv->refresh_result = _tmp6_;
+	self->priv->refresh_result = _tmp5_;
 #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp7_ = self->priv->refresh_result;
+	_tmp6_ = self->priv->refresh_result;
 #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp7_ != GP_OK) {
-#line 7610 "ImportPage.c"
-		int _tmp8_ = 0;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		ImportPageRefreshResult _tmp11_ = 0;
-		int _tmp12_ = 0;
+	if (_tmp6_ != GP_OK) {
+#line 7573 "ImportPage.c"
+		int _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		ImportPageRefreshResult _tmp10_ = 0;
+		int _tmp11_;
 #line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp8_ = self->priv->refresh_result;
+		_tmp7_ = self->priv->refresh_result;
 #line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp9_ = gp_result_to_full_string (_tmp8_);
+		_tmp8_ = gp_result_to_full_string (_tmp7_);
 #line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp10_ = _tmp9_;
+		_tmp9_ = _tmp8_;
 #line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_warning ("ImportPage.vala:1167: Unable to initialize camera: %s", _tmp10_);
+		g_warning ("ImportPage.vala:1167: Unable to initialize camera: %s", _tmp9_);
 #line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_free0 (_tmp10_);
+		_g_free0 (_tmp9_);
 #line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp12_ = self->priv->refresh_result;
+		_tmp11_ = self->priv->refresh_result;
 #line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		if (_tmp12_ == GP_ERROR_IO_LOCK) {
+		if (_tmp11_ == GP_ERROR_IO_LOCK) {
 #line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
-#line 7632 "ImportPage.c"
+			_tmp10_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
+#line 7595 "ImportPage.c"
 		} else {
 #line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
-#line 7636 "ImportPage.c"
+			_tmp10_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
+#line 7599 "ImportPage.c"
 		}
 #line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		result = _tmp11_;
+		result = _tmp10_;
 #line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7642 "ImportPage.c"
+#line 7605 "ImportPage.c"
 	}
 #line 1172 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp13_ = self->priv->refreshed;
+	_tmp12_ = self->priv->refreshed;
 #line 1172 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_page_update_status (self, TRUE, _tmp13_);
+	import_page_update_status (self, TRUE, _tmp12_);
 #line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
 #line 1176 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp14_ = self->priv->progress_bar;
+	_tmp13_ = self->priv->progress_bar;
 #line 1176 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_progress_bar_set_ellipsize (_tmp14_, PANGO_ELLIPSIZE_NONE);
-#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp15_ = self->priv->progress_bar;
+	gtk_progress_bar_set_ellipsize (_tmp13_, PANGO_ELLIPSIZE_NONE);
 #line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp16_ = _ ("Fetching photo information");
+	_tmp14_ = self->priv->progress_bar;
 #line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_progress_bar_set_text (_tmp15_, _tmp16_);
+	gtk_progress_bar_set_text (_tmp14_, _ ("Fetching photo information"));
 #line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp17_ = self->priv->progress_bar;
+	_tmp15_ = self->priv->progress_bar;
 #line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_progress_bar_set_fraction (_tmp17_, 0.0);
+	gtk_progress_bar_set_fraction (_tmp15_, 0.0);
 #line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp18_ = self->priv->progress_bar;
+	_tmp16_ = self->priv->progress_bar;
 #line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_progress_bar_set_pulse_step (_tmp18_, 0.01);
+	gtk_progress_bar_set_pulse_step (_tmp16_, 0.01);
 #line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp19_ = self->priv->progress_bar;
+	_tmp17_ = self->priv->progress_bar;
 #line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), TRUE);
+	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 1182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp20_ = gee_array_list_new (TYPE_IMPORT_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp18_ = gee_array_list_new (TYPE_IMPORT_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_list = _tmp20_;
+	import_list = _tmp18_;
 #line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	sifs = NULL;
 #line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	count = 0;
 #line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp21_ = self->priv->camera;
+	_tmp19_ = self->priv->camera;
 #line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp22_ = import_page_spin_idle_context;
+	_tmp20_ = import_page_spin_idle_context;
 #line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+	_tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
 #line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp25_ = gp_camera_get_storageinfo (_tmp21_, &sifs, &_tmp24_, _tmp23_);
+	_tmp23_ = gp_camera_get_storageinfo (_tmp19_, &sifs, &_tmp22_, _tmp21_);
 #line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	count = _tmp24_;
+	count = _tmp22_;
 #line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self->priv->refresh_result = _tmp25_;
+	self->priv->refresh_result = _tmp23_;
 #line 1187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp26_ = self->priv->refresh_result;
+	_tmp24_ = self->priv->refresh_result;
 #line 1187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp26_ == GP_OK) {
-#line 7696 "ImportPage.c"
+	if (_tmp24_ == GP_OK) {
+#line 7657 "ImportPage.c"
 		{
 			gint fsid = 0;
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			fsid = 0;
-#line 7701 "ImportPage.c"
+#line 7662 "ImportPage.c"
 			{
-				gboolean _tmp27_ = FALSE;
+				gboolean _tmp25_ = FALSE;
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp27_ = TRUE;
+				_tmp25_ = TRUE;
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				while (TRUE) {
-#line 7708 "ImportPage.c"
-					gint _tmp29_ = 0;
-					gint _tmp30_ = 0;
+#line 7669 "ImportPage.c"
+					gint _tmp27_;
+					gint _tmp28_;
 					gboolean got_well_known_dir = FALSE;
-					gint _tmp31_ = 0;
-					gboolean _tmp32_ = FALSE;
-					gint _tmp35_ = 0;
-					gboolean _tmp36_ = FALSE;
-					gint _tmp39_ = 0;
-					gboolean _tmp40_ = FALSE;
-					gint _tmp43_ = 0;
-					gboolean _tmp44_ = FALSE;
-					gint _tmp47_ = 0;
-					gboolean _tmp48_ = FALSE;
-					gint _tmp51_ = 0;
-					gboolean _tmp52_ = FALSE;
-					gint _tmp55_ = 0;
-					gboolean _tmp56_ = FALSE;
-					gint _tmp59_ = 0;
-					gboolean _tmp60_ = FALSE;
-					gint _tmp63_ = 0;
-					gboolean _tmp64_ = FALSE;
-					gint _tmp67_ = 0;
-					gboolean _tmp68_ = FALSE;
-					gboolean _tmp71_ = FALSE;
+					gint _tmp29_;
+					gboolean _tmp30_;
+					gint _tmp33_;
+					gboolean _tmp34_;
+					gint _tmp37_;
+					gboolean _tmp38_;
+					gint _tmp41_;
+					gboolean _tmp42_;
+					gint _tmp45_;
+					gboolean _tmp46_;
+					gint _tmp49_;
+					gboolean _tmp50_;
+					gint _tmp53_;
+					gboolean _tmp54_;
+					gint _tmp57_;
+					gboolean _tmp58_;
+					gint _tmp61_;
+					gboolean _tmp62_;
+					gint _tmp65_;
+					gboolean _tmp66_;
+					gboolean _tmp69_;
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (!_tmp27_) {
-#line 7735 "ImportPage.c"
-						gint _tmp28_ = 0;
+					if (!_tmp25_) {
+#line 7696 "ImportPage.c"
+						gint _tmp26_;
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp28_ = fsid;
+						_tmp26_ = fsid;
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						fsid = _tmp28_ + 1;
-#line 7741 "ImportPage.c"
+						fsid = _tmp26_ + 1;
+#line 7702 "ImportPage.c"
 					}
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp27_ = FALSE;
+					_tmp25_ = FALSE;
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp29_ = fsid;
+					_tmp27_ = fsid;
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp30_ = count;
+					_tmp28_ = count;
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (!(_tmp29_ < _tmp30_)) {
+					if (!(_tmp27_ < _tmp28_)) {
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						break;
-#line 7753 "ImportPage.c"
+#line 7714 "ImportPage.c"
 					}
 #line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					got_well_known_dir = FALSE;
 #line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp31_ = fsid;
+					_tmp29_ = fsid;
 #line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp32_ = import_page_check_directory_exists (self, _tmp31_, "/", "DCIM");
+					_tmp30_ = import_page_check_directory_exists (self, _tmp29_, "/", "DCIM");
 #line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (_tmp32_) {
-#line 7763 "ImportPage.c"
-						gint _tmp33_ = 0;
-						GeeArrayList* _tmp34_ = NULL;
+					if (_tmp30_) {
+#line 7724 "ImportPage.c"
+						gint _tmp31_;
+						GeeArrayList* _tmp32_;
 #line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp33_ = fsid;
+						_tmp31_ = fsid;
 #line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp34_ = import_list;
+						_tmp32_ = import_list;
 #line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp33_, "/DCIM", _tmp34_);
+						import_page_enumerate_files (self, _tmp31_, "/DCIM", _tmp32_);
 #line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7774 "ImportPage.c"
+#line 7735 "ImportPage.c"
 					}
 #line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp35_ = fsid;
+					_tmp33_ = fsid;
 #line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp36_ = import_page_check_directory_exists (self, _tmp35_, "/", "dcim");
+					_tmp34_ = import_page_check_directory_exists (self, _tmp33_, "/", "dcim");
 #line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (_tmp36_) {
-#line 7782 "ImportPage.c"
-						gint _tmp37_ = 0;
-						GeeArrayList* _tmp38_ = NULL;
+					if (_tmp34_) {
+#line 7743 "ImportPage.c"
+						gint _tmp35_;
+						GeeArrayList* _tmp36_;
 #line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp37_ = fsid;
+						_tmp35_ = fsid;
 #line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp38_ = import_list;
+						_tmp36_ = import_list;
 #line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp37_, "/dcim", _tmp38_);
+						import_page_enumerate_files (self, _tmp35_, "/dcim", _tmp36_);
 #line 1201 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7793 "ImportPage.c"
+#line 7754 "ImportPage.c"
 					}
 #line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp39_ = fsid;
+					_tmp37_ = fsid;
 #line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp40_ = import_page_check_directory_exists (self, _tmp39_, "/PRIVATE/", "AVCHD");
+					_tmp38_ = import_page_check_directory_exists (self, _tmp37_, "/PRIVATE/", "AVCHD");
 #line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (_tmp40_) {
-#line 7801 "ImportPage.c"
-						gint _tmp41_ = 0;
-						GeeArrayList* _tmp42_ = NULL;
+					if (_tmp38_) {
+#line 7762 "ImportPage.c"
+						gint _tmp39_;
+						GeeArrayList* _tmp40_;
 #line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp41_ = fsid;
+						_tmp39_ = fsid;
 #line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp42_ = import_list;
+						_tmp40_ = import_list;
 #line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp41_, "/PRIVATE/AVCHD", _tmp42_);
+						import_page_enumerate_files (self, _tmp39_, "/PRIVATE/AVCHD", _tmp40_);
 #line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7812 "ImportPage.c"
+#line 7773 "ImportPage.c"
 					}
 #line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp43_ = fsid;
+					_tmp41_ = fsid;
 #line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp44_ = import_page_check_directory_exists (self, _tmp43_, "/private/", "avchd");
+					_tmp42_ = import_page_check_directory_exists (self, _tmp41_, "/private/", "avchd");
 #line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (_tmp44_) {
-#line 7820 "ImportPage.c"
-						gint _tmp45_ = 0;
-						GeeArrayList* _tmp46_ = NULL;
+					if (_tmp42_) {
+#line 7781 "ImportPage.c"
+						gint _tmp43_;
+						GeeArrayList* _tmp44_;
 #line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp45_ = fsid;
+						_tmp43_ = fsid;
 #line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp46_ = import_list;
+						_tmp44_ = import_list;
 #line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp45_, "/private/avchd", _tmp46_);
+						import_page_enumerate_files (self, _tmp43_, "/private/avchd", _tmp44_);
 #line 1212 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7831 "ImportPage.c"
+#line 7792 "ImportPage.c"
 					}
 #line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp47_ = fsid;
+					_tmp45_ = fsid;
 #line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp48_ = import_page_check_directory_exists (self, _tmp47_, "/", "AVCHD");
+					_tmp46_ = import_page_check_directory_exists (self, _tmp45_, "/", "AVCHD");
 #line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (_tmp48_) {
-#line 7839 "ImportPage.c"
-						gint _tmp49_ = 0;
-						GeeArrayList* _tmp50_ = NULL;
+					if (_tmp46_) {
+#line 7800 "ImportPage.c"
+						gint _tmp47_;
+						GeeArrayList* _tmp48_;
 #line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp49_ = fsid;
+						_tmp47_ = fsid;
 #line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp50_ = import_list;
+						_tmp48_ = import_list;
 #line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp49_, "/AVCHD", _tmp50_);
+						import_page_enumerate_files (self, _tmp47_, "/AVCHD", _tmp48_);
 #line 1216 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7850 "ImportPage.c"
+#line 7811 "ImportPage.c"
 					}
 #line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp51_ = fsid;
+					_tmp49_ = fsid;
 #line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp52_ = import_page_check_directory_exists (self, _tmp51_, "/", "avchd");
+					_tmp50_ = import_page_check_directory_exists (self, _tmp49_, "/", "avchd");
 #line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (_tmp52_) {
-#line 7858 "ImportPage.c"
-						gint _tmp53_ = 0;
-						GeeArrayList* _tmp54_ = NULL;
+					if (_tmp50_) {
+#line 7819 "ImportPage.c"
+						gint _tmp51_;
+						GeeArrayList* _tmp52_;
 #line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp53_ = fsid;
+						_tmp51_ = fsid;
 #line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp54_ = import_list;
+						_tmp52_ = import_list;
 #line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp53_, "/avchd", _tmp54_);
+						import_page_enumerate_files (self, _tmp51_, "/avchd", _tmp52_);
 #line 1220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7869 "ImportPage.c"
+#line 7830 "ImportPage.c"
 					}
 #line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp55_ = fsid;
+					_tmp53_ = fsid;
 #line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp56_ = import_page_check_directory_exists (self, _tmp55_, "/PRIVATE/", "SONY");
+					_tmp54_ = import_page_check_directory_exists (self, _tmp53_, "/PRIVATE/", "SONY");
 #line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (_tmp56_) {
-#line 7877 "ImportPage.c"
-						gint _tmp57_ = 0;
-						GeeArrayList* _tmp58_ = NULL;
+					if (_tmp54_) {
+#line 7838 "ImportPage.c"
+						gint _tmp55_;
+						GeeArrayList* _tmp56_;
 #line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp57_ = fsid;
+						_tmp55_ = fsid;
 #line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp58_ = import_list;
+						_tmp56_ = import_list;
 #line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp57_, "/PRIVATE/SONY", _tmp58_);
+						import_page_enumerate_files (self, _tmp55_, "/PRIVATE/SONY", _tmp56_);
 #line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7888 "ImportPage.c"
+#line 7849 "ImportPage.c"
 					}
 #line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp59_ = fsid;
+					_tmp57_ = fsid;
 #line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp60_ = import_page_check_directory_exists (self, _tmp59_, "/private/", "sony");
+					_tmp58_ = import_page_check_directory_exists (self, _tmp57_, "/private/", "sony");
 #line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (_tmp60_) {
-#line 7896 "ImportPage.c"
-						gint _tmp61_ = 0;
-						GeeArrayList* _tmp62_ = NULL;
+					if (_tmp58_) {
+#line 7857 "ImportPage.c"
+						gint _tmp59_;
+						GeeArrayList* _tmp60_;
 #line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp61_ = fsid;
+						_tmp59_ = fsid;
 #line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp62_ = import_list;
+						_tmp60_ = import_list;
 #line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp61_, "/private/sony", _tmp62_);
+						import_page_enumerate_files (self, _tmp59_, "/private/sony", _tmp60_);
 #line 1231 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7907 "ImportPage.c"
+#line 7868 "ImportPage.c"
 					}
 #line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp63_ = fsid;
+					_tmp61_ = fsid;
 #line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp64_ = import_page_check_directory_exists (self, _tmp63_, "/", "MP_ROOT");
+					_tmp62_ = import_page_check_directory_exists (self, _tmp61_, "/", "MP_ROOT");
 #line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (_tmp64_) {
-#line 7915 "ImportPage.c"
-						gint _tmp65_ = 0;
-						GeeArrayList* _tmp66_ = NULL;
+					if (_tmp62_) {
+#line 7876 "ImportPage.c"
+						gint _tmp63_;
+						GeeArrayList* _tmp64_;
 #line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp65_ = fsid;
+						_tmp63_ = fsid;
 #line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp66_ = import_list;
+						_tmp64_ = import_list;
 #line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp65_, "/MP_ROOT", _tmp66_);
+						import_page_enumerate_files (self, _tmp63_, "/MP_ROOT", _tmp64_);
 #line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7926 "ImportPage.c"
+#line 7887 "ImportPage.c"
 					}
 #line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp67_ = fsid;
+					_tmp65_ = fsid;
 #line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp68_ = import_page_check_directory_exists (self, _tmp67_, "/", "mp_root");
+					_tmp66_ = import_page_check_directory_exists (self, _tmp65_, "/", "mp_root");
 #line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (_tmp68_) {
-#line 7934 "ImportPage.c"
-						gint _tmp69_ = 0;
-						GeeArrayList* _tmp70_ = NULL;
+					if (_tmp66_) {
+#line 7895 "ImportPage.c"
+						gint _tmp67_;
+						GeeArrayList* _tmp68_;
 #line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp69_ = fsid;
+						_tmp67_ = fsid;
 #line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp70_ = import_list;
+						_tmp68_ = import_list;
 #line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp69_, "/mp_root", _tmp70_);
+						import_page_enumerate_files (self, _tmp67_, "/mp_root", _tmp68_);
 #line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7945 "ImportPage.c"
+#line 7906 "ImportPage.c"
 					}
 #line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp71_ = got_well_known_dir;
+					_tmp69_ = got_well_known_dir;
 #line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (!_tmp71_) {
-#line 7951 "ImportPage.c"
-						gint _tmp72_ = 0;
-						GeeArrayList* _tmp73_ = NULL;
-						gboolean _tmp74_ = FALSE;
+					if (!_tmp69_) {
+#line 7912 "ImportPage.c"
+						gint _tmp70_;
+						GeeArrayList* _tmp71_;
+						gboolean _tmp72_;
 #line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp72_ = fsid;
+						_tmp70_ = fsid;
 #line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp73_ = import_list;
+						_tmp71_ = import_list;
 #line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp74_ = import_page_enumerate_files (self, _tmp72_, "/", _tmp73_);
+						_tmp72_ = import_page_enumerate_files (self, _tmp70_, "/", _tmp71_);
 #line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						if (!_tmp74_) {
+						if (!_tmp72_) {
 #line 1248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							break;
-#line 7965 "ImportPage.c"
+#line 7926 "ImportPage.c"
 						}
 					}
 				}
@@ -7975,104 +7936,104 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 #line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_clear_all_import_sources (self);
 #line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp75_ = import_list;
+	_tmp73_ = import_list;
 #line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_page_auto_match_raw_jpeg (self, _tmp75_);
+	import_page_auto_match_raw_jpeg (self, _tmp73_);
 #line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp76_ = import_list;
+	_tmp74_ = import_list;
 #line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_page_load_previews_and_metadata (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_LIST, GeeList));
+	import_page_load_previews_and_metadata (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_LIST, GeeList));
 #line 1270 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp77_ = self->priv->progress_bar;
+	_tmp75_ = self->priv->progress_bar;
 #line 1270 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget), FALSE);
+	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 1271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp78_ = self->priv->progress_bar;
+	_tmp76_ = self->priv->progress_bar;
 #line 1271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_progress_bar_set_ellipsize (_tmp78_, PANGO_ELLIPSIZE_NONE);
+	gtk_progress_bar_set_ellipsize (_tmp76_, PANGO_ELLIPSIZE_NONE);
 #line 1272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp79_ = self->priv->progress_bar;
+	_tmp77_ = self->priv->progress_bar;
 #line 1272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_progress_bar_set_text (_tmp79_, "");
+	gtk_progress_bar_set_text (_tmp77_, "");
 #line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp80_ = self->priv->progress_bar;
+	_tmp78_ = self->priv->progress_bar;
 #line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_progress_bar_set_fraction (_tmp80_, 0.0);
+	gtk_progress_bar_set_fraction (_tmp78_, 0.0);
 #line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp81_ = self->priv->camera;
+	_tmp79_ = self->priv->camera;
 #line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp82_ = import_page_spin_idle_context;
+	_tmp80_ = import_page_spin_idle_context;
 #line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp83_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+	_tmp81_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
 #line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp84_ = gp_camera_exit (_tmp81_, _tmp83_);
+	_tmp82_ = gp_camera_exit (_tmp79_, _tmp81_);
 #line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	res = _tmp84_;
+	res = _tmp82_;
 #line 1276 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp85_ = res;
+	_tmp83_ = res;
 #line 1276 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp85_ != GP_OK) {
-#line 8012 "ImportPage.c"
-		int _tmp86_ = 0;
-		gchar* _tmp87_ = NULL;
-		gchar* _tmp88_ = NULL;
+	if (_tmp83_ != GP_OK) {
+#line 7973 "ImportPage.c"
+		int _tmp84_;
+		gchar* _tmp85_;
+		gchar* _tmp86_;
 #line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp86_ = res;
+		_tmp84_ = res;
 #line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp87_ = gp_result_to_full_string (_tmp86_);
+		_tmp85_ = gp_result_to_full_string (_tmp84_);
 #line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp88_ = _tmp87_;
+		_tmp86_ = _tmp85_;
 #line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_warning ("ImportPage.vala:1278: Unable to unlock camera: %s", _tmp88_);
+		g_warning ("ImportPage.vala:1278: Unable to unlock camera: %s", _tmp86_);
 #line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_free0 (_tmp88_);
-#line 8026 "ImportPage.c"
+		_g_free0 (_tmp86_);
+#line 7987 "ImportPage.c"
 	}
 #line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp89_ = self->priv->refresh_result;
+	_tmp87_ = self->priv->refresh_result;
 #line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp89_ == GP_OK) {
-#line 8032 "ImportPage.c"
-		SourceCollection* _tmp90_ = NULL;
-		gint _tmp91_ = 0;
+	if (_tmp87_ == GP_OK) {
+#line 7993 "ImportPage.c"
+		SourceCollection* _tmp88_;
+		gint _tmp89_;
 #line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp90_ = self->priv->import_sources;
+		_tmp88_ = self->priv->import_sources;
 #line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp91_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_DATA_COLLECTION, DataCollection));
+		_tmp89_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_DATA_COLLECTION, DataCollection));
 #line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		if (_tmp91_ == 0) {
-#line 8041 "ImportPage.c"
-			gchar* _tmp92_ = NULL;
-			gchar* _tmp93_ = NULL;
+		if (_tmp89_ == 0) {
+#line 8002 "ImportPage.c"
+			gchar* _tmp90_;
+			gchar* _tmp91_;
 #line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp92_ = checkerboard_page_get_view_empty_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
+			_tmp90_ = checkerboard_page_get_view_empty_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
 #line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp93_ = _tmp92_;
+			_tmp91_ = _tmp90_;
 #line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp93_);
+			checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp91_);
 #line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_free0 (_tmp93_);
-#line 8052 "ImportPage.c"
+			_g_free0 (_tmp91_);
+#line 8013 "ImportPage.c"
 		}
 #line 1285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_update_status (self, FALSE, TRUE);
-#line 8056 "ImportPage.c"
+#line 8017 "ImportPage.c"
 	} else {
 #line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_update_status (self, FALSE, FALSE);
 #line 1290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_clear_all_import_sources (self);
-#line 8062 "ImportPage.c"
+#line 8023 "ImportPage.c"
 	}
 #line 1293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
 #line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp94_ = self->priv->refresh_result;
+	_tmp92_ = self->priv->refresh_result;
 #line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	switch (_tmp94_) {
+	switch (_tmp92_) {
 #line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case GP_OK:
-#line 8072 "ImportPage.c"
+#line 8033 "ImportPage.c"
 		{
 #line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = IMPORT_PAGE_REFRESH_RESULT_OK;
@@ -8080,11 +8041,11 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 			_g_object_unref0 (import_list);
 #line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8080 "ImportPage.c"
+#line 8041 "ImportPage.c"
 		}
 #line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case GP_ERROR_IO_LOCK:
-#line 8084 "ImportPage.c"
+#line 8045 "ImportPage.c"
 		{
 #line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
@@ -8092,7 +8053,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 			_g_object_unref0 (import_list);
 #line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8092 "ImportPage.c"
+#line 8053 "ImportPage.c"
 		}
 		default:
 		{
@@ -8102,159 +8063,159 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 			_g_object_unref0 (import_list);
 #line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8102 "ImportPage.c"
+#line 8063 "ImportPage.c"
 		}
 	}
 #line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (import_list);
-#line 8107 "ImportPage.c"
+#line 8068 "ImportPage.c"
 }
 
 
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_ = 0L;
-	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 8125 "ImportPage.c"
+#line 8086 "ImportPage.c"
 }
 
 
 static gchar* string_slice (const gchar* self, glong start, glong end) {
 	gchar* result = NULL;
 	glong string_length = 0L;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	glong _tmp2_ = 0L;
-	glong _tmp5_ = 0L;
+	gint _tmp0_;
+	gint _tmp1_;
+	glong _tmp2_;
+	glong _tmp5_;
 	gboolean _tmp8_ = FALSE;
-	glong _tmp9_ = 0L;
+	glong _tmp9_;
 	gboolean _tmp12_ = FALSE;
-	glong _tmp13_ = 0L;
-	glong _tmp16_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp13_;
+	glong _tmp16_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	gchar* _tmp21_;
+#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 8158 "ImportPage.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8119 "ImportPage.c"
+		glong _tmp3_;
+		glong _tmp4_;
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 8167 "ImportPage.c"
+#line 8128 "ImportPage.c"
 	}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 8173 "ImportPage.c"
-		glong _tmp6_ = 0L;
-		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8134 "ImportPage.c"
+		glong _tmp6_;
+		glong _tmp7_;
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 8182 "ImportPage.c"
+#line 8143 "ImportPage.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 8188 "ImportPage.c"
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8149 "ImportPage.c"
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 8197 "ImportPage.c"
+#line 8158 "ImportPage.c"
 	} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 8201 "ImportPage.c"
+#line 8162 "ImportPage.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 8209 "ImportPage.c"
-		glong _tmp14_ = 0L;
-		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8170 "ImportPage.c"
+		glong _tmp14_;
+		glong _tmp15_;
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 8218 "ImportPage.c"
+#line 8179 "ImportPage.c"
 	} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 8222 "ImportPage.c"
+#line 8183 "ImportPage.c"
 	}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 8244 "ImportPage.c"
+#line 8205 "ImportPage.c"
 }
 
 
 static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
 	gchar* result = NULL;
 	glong offset = 0L;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gchar* _tmp12_ = NULL;
+	const gchar* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gchar* _tmp12_;
 #line 1307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (str != NULL, NULL);
 #line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8267,13 +8228,13 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
 	offset = (glong) _tmp2_;
 #line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	while (TRUE) {
-#line 8267 "ImportPage.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		const gchar* _tmp5_ = NULL;
-		glong _tmp6_ = 0L;
-		gchar _tmp7_ = '\0';
-		gchar _tmp8_ = '\0';
+#line 8228 "ImportPage.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		const gchar* _tmp5_;
+		glong _tmp6_;
+		gchar _tmp7_;
+		gchar _tmp8_;
 #line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = offset;
 #line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8284,7 +8245,7 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
 		if (!(_tmp4_ >= ((glong) 0))) {
 #line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 8284 "ImportPage.c"
+#line 8245 "ImportPage.c"
 		}
 #line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = str;
@@ -8296,10 +8257,10 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
 		_tmp8_ = ch;
 #line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp7_ != _tmp8_) {
-#line 8296 "ImportPage.c"
-			const gchar* _tmp9_ = NULL;
-			glong _tmp10_ = 0L;
-			gchar* _tmp11_ = NULL;
+#line 8257 "ImportPage.c"
+			const gchar* _tmp9_;
+			glong _tmp10_;
+			gchar* _tmp11_;
 #line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp9_ = str;
 #line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8310,7 +8271,7 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
 			result = _tmp11_;
 #line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8310 "ImportPage.c"
+#line 8271 "ImportPage.c"
 		}
 	}
 #line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8319,15 +8280,15 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
 	result = _tmp12_;
 #line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 8319 "ImportPage.c"
+#line 8280 "ImportPage.c"
 }
 
 
 gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 	gchar* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 1317 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (basepath != NULL, NULL);
 #line 1317 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8338,30 +8299,30 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 	_tmp2_ = g_str_has_suffix (_tmp1_, "/");
 #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp2_) {
-#line 8338 "ImportPage.c"
-		const gchar* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+#line 8299 "ImportPage.c"
+		const gchar* _tmp3_;
+		gboolean _tmp4_;
 #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = addition;
 #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = g_str_has_prefix (_tmp3_, "/");
 #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 8347 "ImportPage.c"
+#line 8308 "ImportPage.c"
 	} else {
 #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 8351 "ImportPage.c"
+#line 8312 "ImportPage.c"
 	}
 #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 8355 "ImportPage.c"
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
+#line 8316 "ImportPage.c"
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		const gchar* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
 #line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = basepath;
 #line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8380,41 +8341,41 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 		result = _tmp10_;
 #line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8380 "ImportPage.c"
+#line 8341 "ImportPage.c"
 	} else {
 		gboolean _tmp11_ = FALSE;
-		const gchar* _tmp12_ = NULL;
-		gboolean _tmp13_ = FALSE;
+		const gchar* _tmp12_;
+		gboolean _tmp13_;
 #line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = basepath;
 #line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp13_ = g_str_has_suffix (_tmp12_, "/");
 #line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp13_) {
-#line 8391 "ImportPage.c"
-			const gchar* _tmp14_ = NULL;
-			gboolean _tmp15_ = FALSE;
+#line 8352 "ImportPage.c"
+			const gchar* _tmp14_;
+			gboolean _tmp15_;
 #line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp14_ = addition;
 #line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp15_ = g_str_has_prefix (_tmp14_, "/");
 #line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = _tmp15_;
-#line 8400 "ImportPage.c"
+#line 8361 "ImportPage.c"
 		} else {
 #line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = FALSE;
-#line 8404 "ImportPage.c"
+#line 8365 "ImportPage.c"
 		}
 #line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp11_) {
-#line 8408 "ImportPage.c"
-			const gchar* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
-			const gchar* _tmp19_ = NULL;
-			gchar* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
+#line 8369 "ImportPage.c"
+			const gchar* _tmp16_;
+			gchar* _tmp17_;
+			gchar* _tmp18_;
+			const gchar* _tmp19_;
+			gchar* _tmp20_;
+			gchar* _tmp21_;
 #line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp16_ = basepath;
 #line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8433,11 +8394,11 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 			result = _tmp21_;
 #line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8433 "ImportPage.c"
+#line 8394 "ImportPage.c"
 		} else {
-			const gchar* _tmp22_ = NULL;
-			const gchar* _tmp23_ = NULL;
-			gchar* _tmp24_ = NULL;
+			const gchar* _tmp22_;
+			const gchar* _tmp23_;
+			gchar* _tmp24_;
 #line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp22_ = basepath;
 #line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8448,7 +8409,7 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 			result = _tmp24_;
 #line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8448 "ImportPage.c"
+#line 8409 "ImportPage.c"
 		}
 	}
 }
@@ -8459,21 +8420,21 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
 	CameraStorageInformation* sifs = NULL;
 	gint count = 0;
 	int res = 0;
-	Camera* _tmp0_ = NULL;
-	GPContextWrapper* _tmp1_ = NULL;
-	GPContext* _tmp2_ = NULL;
+	Camera* _tmp0_;
+	GPContextWrapper* _tmp1_;
+	GPContext* _tmp2_;
 	gint _tmp3_ = 0;
-	int _tmp4_ = 0;
-	int _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	int _tmp4_;
+	int _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	CameraStorageInformation* ifs = NULL;
-	CameraStorageInformation* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
+	CameraStorageInformation* _tmp8_;
+	gint _tmp9_;
 	const gchar* _tmp10_ = NULL;
-	CameraStorageInformation* _tmp11_ = NULL;
-	CameraStorageInfoFields _tmp12_ = 0;
-	gchar* _tmp15_ = NULL;
+	CameraStorageInformation* _tmp11_;
+	CameraStorageInfoFields _tmp12_;
+	gchar* _tmp15_;
 #line 1328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
 #line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8500,7 +8461,7 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
 		result = NULL;
 #line 1333 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8500 "ImportPage.c"
+#line 8461 "ImportPage.c"
 	}
 #line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = fsid;
@@ -8512,7 +8473,7 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
 		result = NULL;
 #line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8512 "ImportPage.c"
+#line 8473 "ImportPage.c"
 	}
 #line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = sifs;
@@ -8526,20 +8487,20 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
 	_tmp12_ = (*_tmp11_).fields;
 #line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if ((_tmp12_ & GP_STORAGEINFO_BASE) != 0) {
-#line 8526 "ImportPage.c"
-		CameraStorageInformation* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
+#line 8487 "ImportPage.c"
+		CameraStorageInformation* _tmp13_;
+		const gchar* _tmp14_;
 #line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp13_ = ifs;
 #line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = (*_tmp13_).basedir;
 #line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = _tmp14_;
-#line 8535 "ImportPage.c"
+#line 8496 "ImportPage.c"
 	} else {
 #line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = "/";
-#line 8539 "ImportPage.c"
+#line 8500 "ImportPage.c"
 	}
 #line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = g_strdup (_tmp10_);
@@ -8547,23 +8508,23 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
 	result = _tmp15_;
 #line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 8547 "ImportPage.c"
+#line 8508 "ImportPage.c"
 }
 
 
 gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint fsid, const gchar* folder) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	const gchar* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gchar* basedir = NULL;
-	Camera* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	Camera* _tmp3_;
+	gint _tmp4_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	const gchar* _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
 #line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
 #line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8582,7 +8543,7 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f
 		result = NULL;
 #line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8582 "ImportPage.c"
+#line 8543 "ImportPage.c"
 	}
 #line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = camera;
@@ -8596,11 +8557,11 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f
 	_tmp6_ = basedir;
 #line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp6_ == NULL) {
-#line 8596 "ImportPage.c"
-		const gchar* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
+#line 8557 "ImportPage.c"
+		const gchar* _tmp7_;
+		gint _tmp8_;
+		const gchar* _tmp9_;
+		gchar* _tmp10_;
 #line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = camera_name;
 #line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8617,7 +8578,7 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f
 		_g_free0 (basedir);
 #line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8617 "ImportPage.c"
+#line 8578 "ImportPage.c"
 	}
 #line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = basedir;
@@ -8631,41 +8592,41 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f
 	_g_free0 (basedir);
 #line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 8631 "ImportPage.c"
+#line 8592 "ImportPage.c"
 }
 
 
 static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const gchar* dir, GeeArrayList* import_list) {
 	gboolean result = FALSE;
 	gchar* fulldir = NULL;
-	Camera* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	Camera* _tmp0_;
+	const gchar* _tmp1_;
+	gint _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	const gchar* _tmp5_;
 	CameraList* files = NULL;
 	CameraList* _tmp7_ = NULL;
-	int _tmp8_ = 0;
-	int _tmp9_ = 0;
-	Camera* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	CameraList* _tmp15_ = NULL;
-	GPSpinIdleWrapper* _tmp16_ = NULL;
-	GPContext* _tmp17_ = NULL;
-	int _tmp18_ = 0;
-	int _tmp19_ = 0;
+	int _tmp8_;
+	int _tmp9_;
+	Camera* _tmp13_;
+	const gchar* _tmp14_;
+	CameraList* _tmp15_;
+	GPSpinIdleWrapper* _tmp16_;
+	GPContext* _tmp17_;
+	int _tmp18_;
+	int _tmp19_;
 	CameraList* folders = NULL;
 	CameraList* _tmp110_ = NULL;
-	int _tmp111_ = 0;
-	int _tmp112_ = 0;
-	Camera* _tmp116_ = NULL;
-	const gchar* _tmp117_ = NULL;
-	CameraList* _tmp118_ = NULL;
-	GPSpinIdleWrapper* _tmp119_ = NULL;
-	GPContext* _tmp120_ = NULL;
-	int _tmp121_ = 0;
-	int _tmp122_ = 0;
+	int _tmp111_;
+	int _tmp112_;
+	Camera* _tmp116_;
+	const gchar* _tmp117_;
+	CameraList* _tmp118_;
+	GPSpinIdleWrapper* _tmp119_;
+	GPContext* _tmp120_;
+	int _tmp121_;
+	int _tmp122_;
 	GError * _inner_error_ = NULL;
 #line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
@@ -8689,8 +8650,8 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 	_tmp5_ = fulldir;
 #line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_ == NULL) {
-#line 8689 "ImportPage.c"
-		const gchar* _tmp6_ = NULL;
+#line 8650 "ImportPage.c"
+		const gchar* _tmp6_;
 #line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = dir;
 #line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8701,7 +8662,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 		_g_free0 (fulldir);
 #line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8701 "ImportPage.c"
+#line 8662 "ImportPage.c"
 	}
 #line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = gp_list_new (&_tmp7_);
@@ -8715,10 +8676,10 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 	_tmp9_ = self->priv->refresh_result;
 #line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp9_ != GP_OK) {
-#line 8715 "ImportPage.c"
-		int _tmp10_ = 0;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
+#line 8676 "ImportPage.c"
+		int _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
 #line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = self->priv->refresh_result;
 #line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8737,7 +8698,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 		_g_free0 (fulldir);
 #line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8737 "ImportPage.c"
+#line 8698 "ImportPage.c"
 	}
 #line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = self->priv->camera;
@@ -8757,11 +8718,11 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 	_tmp19_ = self->priv->refresh_result;
 #line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp19_ != GP_OK) {
-#line 8757 "ImportPage.c"
-		const gchar* _tmp20_ = NULL;
-		int _tmp21_ = 0;
-		gchar* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
+#line 8718 "ImportPage.c"
+		const gchar* _tmp20_;
+		int _tmp21_;
+		gchar* _tmp22_;
+		gchar* _tmp23_;
 #line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp20_ = fulldir;
 #line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8784,39 +8745,39 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 		_g_free0 (fulldir);
 #line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8784 "ImportPage.c"
+#line 8745 "ImportPage.c"
 	}
 	{
 		gint ctr = 0;
 #line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		ctr = 0;
-#line 8790 "ImportPage.c"
+#line 8751 "ImportPage.c"
 		{
 			gboolean _tmp24_ = FALSE;
 #line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp24_ = TRUE;
 #line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 8797 "ImportPage.c"
-				gint _tmp26_ = 0;
-				CameraList* _tmp27_ = NULL;
-				gint _tmp28_ = 0;
+#line 8758 "ImportPage.c"
+				gint _tmp26_;
+				CameraList* _tmp27_;
+				gint _tmp28_;
 				gchar* filename = NULL;
-				CameraList* _tmp29_ = NULL;
-				gint _tmp30_ = 0;
+				CameraList* _tmp29_;
+				gint _tmp30_;
 				const gchar* _tmp31_ = NULL;
-				int _tmp32_ = 0;
-				gchar* _tmp33_ = NULL;
-				int _tmp34_ = 0;
+				int _tmp32_;
+				gchar* _tmp33_;
+				int _tmp34_;
 #line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp24_) {
-#line 8810 "ImportPage.c"
-					gint _tmp25_ = 0;
+#line 8771 "ImportPage.c"
+					gint _tmp25_;
 #line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp25_ = ctr;
 #line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					ctr = _tmp25_ + 1;
-#line 8816 "ImportPage.c"
+#line 8777 "ImportPage.c"
 				}
 #line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp24_ = FALSE;
@@ -8830,7 +8791,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 				if (!(_tmp26_ < _tmp28_)) {
 #line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 8830 "ImportPage.c"
+#line 8791 "ImportPage.c"
 				}
 #line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp29_ = files;
@@ -8850,12 +8811,12 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 				_tmp34_ = self->priv->refresh_result;
 #line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp34_ != GP_OK) {
-#line 8850 "ImportPage.c"
-					gint _tmp35_ = 0;
-					const gchar* _tmp36_ = NULL;
-					int _tmp37_ = 0;
-					gchar* _tmp38_ = NULL;
-					gchar* _tmp39_ = NULL;
+#line 8811 "ImportPage.c"
+					gint _tmp35_;
+					const gchar* _tmp36_;
+					int _tmp37_;
+					gchar* _tmp38_;
+					gchar* _tmp39_;
 #line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp35_ = ctr;
 #line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8880,24 +8841,24 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					_g_free0 (fulldir);
 #line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 8880 "ImportPage.c"
+#line 8841 "ImportPage.c"
 				}
 				{
 					CameraFileInfo info = {0};
 					gboolean _tmp40_ = FALSE;
-					GPSpinIdleWrapper* _tmp41_ = NULL;
-					GPContext* _tmp42_ = NULL;
-					Camera* _tmp43_ = NULL;
-					const gchar* _tmp44_ = NULL;
-					const gchar* _tmp45_ = NULL;
+					GPSpinIdleWrapper* _tmp41_;
+					GPContext* _tmp42_;
+					Camera* _tmp43_;
+					const gchar* _tmp44_;
+					const gchar* _tmp45_;
 					CameraFileInfo _tmp46_ = {0};
-					gboolean _tmp47_ = FALSE;
-					CameraFileInfo _tmp50_ = {0};
-					CameraFileInfoFile _tmp51_ = {0};
-					CameraFileInfoFields _tmp52_ = 0;
-					const gchar* _tmp58_ = NULL;
-					gboolean _tmp59_ = FALSE;
-					GtkProgressBar* _tmp102_ = NULL;
+					gboolean _tmp47_;
+					CameraFileInfo _tmp50_;
+					CameraFileInfoFile _tmp51_;
+					CameraFileInfoFields _tmp52_;
+					const gchar* _tmp58_;
+					gboolean _tmp59_;
+					GtkProgressBar* _tmp102_;
 #line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp41_ = import_page_spin_idle_context;
 #line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8920,14 +8881,14 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						 (info);
-#line 8920 "ImportPage.c"
-						goto __catch67_g_error;
+#line 8881 "ImportPage.c"
+						goto __catch68_g_error;
 					}
 #line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp40_) {
-#line 8925 "ImportPage.c"
-						const gchar* _tmp48_ = NULL;
-						const gchar* _tmp49_ = NULL;
+#line 8886 "ImportPage.c"
+						const gchar* _tmp48_;
+						const gchar* _tmp49_;
 #line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp48_ = fulldir;
 #line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8940,7 +8901,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 						_g_free0 (filename);
 #line 1398 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						continue;
-#line 8940 "ImportPage.c"
+#line 8901 "ImportPage.c"
 					}
 #line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp50_ = info;
@@ -8950,12 +8911,12 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					_tmp52_ = _tmp51_.fields;
 #line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if ((_tmp52_ & GP_FILE_INFO_TYPE) == 0) {
-#line 8950 "ImportPage.c"
-						const gchar* _tmp53_ = NULL;
-						const gchar* _tmp54_ = NULL;
-						CameraFileInfo _tmp55_ = {0};
-						CameraFileInfoFile _tmp56_ = {0};
-						CameraFileInfoFields _tmp57_ = 0;
+#line 8911 "ImportPage.c"
+						const gchar* _tmp53_;
+						const gchar* _tmp54_;
+						CameraFileInfo _tmp55_;
+						CameraFileInfoFile _tmp56_;
+						CameraFileInfoFields _tmp57_;
 #line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp53_ = fulldir;
 #line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8974,7 +8935,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 						_g_free0 (filename);
 #line 1405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						continue;
-#line 8974 "ImportPage.c"
+#line 8935 "ImportPage.c"
 					}
 #line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp58_ = filename;
@@ -8982,22 +8943,22 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					_tmp59_ = video_reader_is_supported_video_filename (_tmp58_);
 #line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp59_) {
-#line 8982 "ImportPage.c"
+#line 8943 "ImportPage.c"
 						VideoImportSource* video_source = NULL;
-						const gchar* _tmp60_ = NULL;
-						Camera* _tmp61_ = NULL;
-						gint _tmp62_ = 0;
-						const gchar* _tmp63_ = NULL;
-						const gchar* _tmp64_ = NULL;
-						CameraFileInfo _tmp65_ = {0};
-						CameraFileInfoFile _tmp66_ = {0};
-						gulong _tmp67_ = 0UL;
-						CameraFileInfo _tmp68_ = {0};
-						CameraFileInfoFile _tmp69_ = {0};
-						time_t _tmp70_ = 0;
-						VideoImportSource* _tmp71_ = NULL;
-						GeeArrayList* _tmp72_ = NULL;
-						VideoImportSource* _tmp73_ = NULL;
+						const gchar* _tmp60_;
+						Camera* _tmp61_;
+						gint _tmp62_;
+						const gchar* _tmp63_;
+						const gchar* _tmp64_;
+						CameraFileInfo _tmp65_;
+						CameraFileInfoFile _tmp66_;
+						gulong _tmp67_;
+						CameraFileInfo _tmp68_;
+						CameraFileInfoFile _tmp69_;
+						time_t _tmp70_;
+						VideoImportSource* _tmp71_;
+						GeeArrayList* _tmp72_;
+						VideoImportSource* _tmp73_;
 #line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp60_ = self->priv->camera_name;
 #line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9032,29 +8993,29 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_IMPORT_SOURCE, ImportSource));
 #line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (video_source);
-#line 9032 "ImportPage.c"
+#line 8993 "ImportPage.c"
 					} else {
 						PhotoFileFormat file_format = 0;
-						CameraFileInfo _tmp74_ = {0};
-						CameraFileInfoFile _tmp75_ = {0};
-						const gchar* _tmp76_ = NULL;
-						PhotoFileFormat _tmp77_ = 0;
-						PhotoFileFormat _tmp78_ = 0;
-						GeeArrayList* _tmp87_ = NULL;
-						const gchar* _tmp88_ = NULL;
-						Camera* _tmp89_ = NULL;
-						gint _tmp90_ = 0;
-						const gchar* _tmp91_ = NULL;
-						const gchar* _tmp92_ = NULL;
-						CameraFileInfo _tmp93_ = {0};
-						CameraFileInfoFile _tmp94_ = {0};
-						gulong _tmp95_ = 0UL;
-						CameraFileInfo _tmp96_ = {0};
-						CameraFileInfoFile _tmp97_ = {0};
-						time_t _tmp98_ = 0;
-						PhotoFileFormat _tmp99_ = 0;
-						PhotoImportSource* _tmp100_ = NULL;
-						PhotoImportSource* _tmp101_ = NULL;
+						CameraFileInfo _tmp74_;
+						CameraFileInfoFile _tmp75_;
+						const gchar* _tmp76_;
+						PhotoFileFormat _tmp77_;
+						PhotoFileFormat _tmp78_;
+						GeeArrayList* _tmp87_;
+						const gchar* _tmp88_;
+						Camera* _tmp89_;
+						gint _tmp90_;
+						const gchar* _tmp91_;
+						const gchar* _tmp92_;
+						CameraFileInfo _tmp93_;
+						CameraFileInfoFile _tmp94_;
+						gulong _tmp95_;
+						CameraFileInfo _tmp96_;
+						CameraFileInfoFile _tmp97_;
+						time_t _tmp98_;
+						PhotoFileFormat _tmp99_;
+						PhotoImportSource* _tmp100_;
+						PhotoImportSource* _tmp101_;
 #line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp74_ = info;
 #line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9069,10 +9030,10 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 						_tmp78_ = file_format;
 #line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (_tmp78_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 9069 "ImportPage.c"
-							const gchar* _tmp79_ = NULL;
-							PhotoFileFormat _tmp80_ = 0;
-							PhotoFileFormat _tmp81_ = 0;
+#line 9030 "ImportPage.c"
+							const gchar* _tmp79_;
+							PhotoFileFormat _tmp80_;
+							PhotoFileFormat _tmp81_;
 #line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp79_ = filename;
 #line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9083,12 +9044,12 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 							_tmp81_ = file_format;
 #line 1417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							if (_tmp81_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 9083 "ImportPage.c"
-								const gchar* _tmp82_ = NULL;
-								const gchar* _tmp83_ = NULL;
-								CameraFileInfo _tmp84_ = {0};
-								CameraFileInfoFile _tmp85_ = {0};
-								const gchar* _tmp86_ = NULL;
+#line 9044 "ImportPage.c"
+								const gchar* _tmp82_;
+								const gchar* _tmp83_;
+								CameraFileInfo _tmp84_;
+								CameraFileInfoFile _tmp85_;
+								const gchar* _tmp86_;
 #line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								_tmp82_ = fulldir;
 #line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9108,7 +9069,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 								_g_free0 (filename);
 #line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								continue;
-#line 9107 "ImportPage.c"
+#line 9068 "ImportPage.c"
 							}
 						}
 #line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9145,7 +9106,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, TYPE_IMPORT_SOURCE, ImportSource));
 #line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (_tmp101_);
-#line 9144 "ImportPage.c"
+#line 9105 "ImportPage.c"
 					}
 #line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp102_ = self->priv->progress_bar;
@@ -9155,18 +9116,18 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					spin_event_loop ();
 #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					 (info);
-#line 9154 "ImportPage.c"
+#line 9115 "ImportPage.c"
 				}
-				goto __finally67;
-				__catch67_g_error:
+				goto __finally68;
+				__catch68_g_error:
 				{
 					GError* err = NULL;
-					const gchar* _tmp103_ = NULL;
-					GError* _tmp104_ = NULL;
-					const gchar* _tmp105_ = NULL;
-					GError* _tmp106_ = NULL;
-					const gchar* _tmp107_ = NULL;
-					gchar* _tmp108_ = NULL;
+					const gchar* _tmp103_;
+					GError* _tmp104_;
+					const gchar* _tmp105_;
+					GError* _tmp106_;
+					const gchar* _tmp107_;
+					gchar* _tmp108_;
 #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					err = _inner_error_;
 #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9201,12 +9162,12 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					_g_free0 (fulldir);
 #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 9200 "ImportPage.c"
+#line 9161 "ImportPage.c"
 				}
-				__finally67:
+				__finally68:
 #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9205 "ImportPage.c"
+#line 9166 "ImportPage.c"
 					gboolean _tmp109_ = FALSE;
 #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (filename);
@@ -9220,11 +9181,11 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					g_clear_error (&_inner_error_);
 #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return _tmp109_;
-#line 9219 "ImportPage.c"
+#line 9180 "ImportPage.c"
 				}
 #line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (filename);
-#line 9223 "ImportPage.c"
+#line 9184 "ImportPage.c"
 			}
 		}
 	}
@@ -9240,10 +9201,10 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 	_tmp112_ = self->priv->refresh_result;
 #line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp112_ != GP_OK) {
-#line 9239 "ImportPage.c"
-		int _tmp113_ = 0;
-		gchar* _tmp114_ = NULL;
-		gchar* _tmp115_ = NULL;
+#line 9200 "ImportPage.c"
+		int _tmp113_;
+		gchar* _tmp114_;
+		gchar* _tmp115_;
 #line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp113_ = self->priv->refresh_result;
 #line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9264,7 +9225,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 		_g_free0 (fulldir);
 #line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 9263 "ImportPage.c"
+#line 9224 "ImportPage.c"
 	}
 #line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp116_ = self->priv->camera;
@@ -9284,11 +9245,11 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 	_tmp122_ = self->priv->refresh_result;
 #line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp122_ != GP_OK) {
-#line 9283 "ImportPage.c"
-		const gchar* _tmp123_ = NULL;
-		int _tmp124_ = 0;
-		gchar* _tmp125_ = NULL;
-		gchar* _tmp126_ = NULL;
+#line 9244 "ImportPage.c"
+		const gchar* _tmp123_;
+		int _tmp124_;
+		gchar* _tmp125_;
+		gchar* _tmp126_;
 #line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp123_ = fulldir;
 #line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9313,47 +9274,47 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 		_g_free0 (fulldir);
 #line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 9312 "ImportPage.c"
+#line 9273 "ImportPage.c"
 	}
 	{
 		gint ctr = 0;
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		ctr = 0;
-#line 9318 "ImportPage.c"
+#line 9279 "ImportPage.c"
 		{
 			gboolean _tmp127_ = FALSE;
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp127_ = TRUE;
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 9325 "ImportPage.c"
-				gint _tmp129_ = 0;
-				CameraList* _tmp130_ = NULL;
-				gint _tmp131_ = 0;
+#line 9286 "ImportPage.c"
+				gint _tmp129_;
+				CameraList* _tmp130_;
+				gint _tmp131_;
 				gchar* subdir = NULL;
-				CameraList* _tmp132_ = NULL;
-				gint _tmp133_ = 0;
+				CameraList* _tmp132_;
+				gint _tmp133_;
 				const gchar* _tmp134_ = NULL;
-				int _tmp135_ = 0;
-				gchar* _tmp136_ = NULL;
-				int _tmp137_ = 0;
-				gint _tmp142_ = 0;
-				const gchar* _tmp143_ = NULL;
-				const gchar* _tmp144_ = NULL;
-				gchar* _tmp145_ = NULL;
-				gchar* _tmp146_ = NULL;
-				GeeArrayList* _tmp147_ = NULL;
-				gboolean _tmp148_ = FALSE;
-				gboolean _tmp149_ = FALSE;
+				int _tmp135_;
+				gchar* _tmp136_;
+				int _tmp137_;
+				gint _tmp142_;
+				const gchar* _tmp143_;
+				const gchar* _tmp144_;
+				gchar* _tmp145_;
+				gchar* _tmp146_;
+				GeeArrayList* _tmp147_;
+				gboolean _tmp148_;
+				gboolean _tmp149_;
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp127_) {
-#line 9346 "ImportPage.c"
-					gint _tmp128_ = 0;
+#line 9307 "ImportPage.c"
+					gint _tmp128_;
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp128_ = ctr;
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					ctr = _tmp128_ + 1;
-#line 9352 "ImportPage.c"
+#line 9313 "ImportPage.c"
 				}
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp127_ = FALSE;
@@ -9367,7 +9328,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 				if (!(_tmp129_ < _tmp131_)) {
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 9366 "ImportPage.c"
+#line 9327 "ImportPage.c"
 				}
 #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp132_ = folders;
@@ -9387,11 +9348,11 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 				_tmp137_ = self->priv->refresh_result;
 #line 1462 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp137_ != GP_OK) {
-#line 9386 "ImportPage.c"
-					gint _tmp138_ = 0;
-					int _tmp139_ = 0;
-					gchar* _tmp140_ = NULL;
-					gchar* _tmp141_ = NULL;
+#line 9347 "ImportPage.c"
+					gint _tmp138_;
+					int _tmp139_;
+					gchar* _tmp140_;
+					gchar* _tmp141_;
 #line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp138_ = ctr;
 #line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9416,7 +9377,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					_g_free0 (fulldir);
 #line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 9415 "ImportPage.c"
+#line 9376 "ImportPage.c"
 				}
 #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp142_ = fsid;
@@ -9450,11 +9411,11 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					_g_free0 (fulldir);
 #line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 9449 "ImportPage.c"
+#line 9410 "ImportPage.c"
 				}
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (subdir);
-#line 9453 "ImportPage.c"
+#line 9414 "ImportPage.c"
 			}
 		}
 	}
@@ -9468,7 +9429,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 	_g_free0 (fulldir);
 #line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 9467 "ImportPage.c"
+#line 9428 "ImportPage.c"
 }
 
 
@@ -9477,51 +9438,51 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 	g_return_if_fail (IS_IMPORT_PAGE (self));
 #line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (GEE_IS_ARRAY_LIST (import_list));
-#line 9476 "ImportPage.c"
+#line 9437 "ImportPage.c"
 	{
 		gint i = 0;
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		i = 0;
-#line 9481 "ImportPage.c"
+#line 9442 "ImportPage.c"
 		{
 			gboolean _tmp0_ = FALSE;
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp0_ = TRUE;
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 9488 "ImportPage.c"
-				gint _tmp2_ = 0;
-				GeeArrayList* _tmp3_ = NULL;
-				gint _tmp4_ = 0;
-				gint _tmp5_ = 0;
+#line 9449 "ImportPage.c"
+				gint _tmp2_;
+				GeeArrayList* _tmp3_;
+				gint _tmp4_;
+				gint _tmp5_;
 				PhotoImportSource* current = NULL;
-				GeeArrayList* _tmp6_ = NULL;
-				gint _tmp7_ = 0;
-				gpointer _tmp8_ = NULL;
-				ImportSource* _tmp9_ = NULL;
-				PhotoImportSource* _tmp10_ = NULL;
+				GeeArrayList* _tmp6_;
+				gint _tmp7_;
+				gpointer _tmp8_;
+				ImportSource* _tmp9_;
+				PhotoImportSource* _tmp10_;
 				PhotoImportSource* _tmp11_ = NULL;
-				gint _tmp12_ = 0;
-				GeeArrayList* _tmp13_ = NULL;
-				gint _tmp14_ = 0;
-				gint _tmp15_ = 0;
+				gint _tmp12_;
+				GeeArrayList* _tmp13_;
+				gint _tmp14_;
+				gint _tmp15_;
 				PhotoImportSource* next = NULL;
-				PhotoImportSource* _tmp21_ = NULL;
+				PhotoImportSource* _tmp21_;
 				PhotoImportSource* _tmp22_ = NULL;
-				gint _tmp23_ = 0;
+				gint _tmp23_;
 				PhotoImportSource* prev = NULL;
-				PhotoImportSource* _tmp29_ = NULL;
+				PhotoImportSource* _tmp29_;
 				gboolean _tmp30_ = FALSE;
-				PhotoImportSource* _tmp31_ = NULL;
+				PhotoImportSource* _tmp31_;
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp0_) {
-#line 9514 "ImportPage.c"
-					gint _tmp1_ = 0;
+#line 9475 "ImportPage.c"
+					gint _tmp1_;
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp1_ = i;
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					i = _tmp1_ + 1;
-#line 9520 "ImportPage.c"
+#line 9481 "ImportPage.c"
 				}
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp0_ = FALSE;
@@ -9537,7 +9498,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 				if (!(_tmp2_ < _tmp5_)) {
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 9536 "ImportPage.c"
+#line 9497 "ImportPage.c"
 				}
 #line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp6_ = import_list;
@@ -9553,7 +9514,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 				if (_tmp10_ == NULL) {
 #line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp9_);
-#line 9552 "ImportPage.c"
+#line 9513 "ImportPage.c"
 				}
 #line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				current = _tmp10_;
@@ -9567,12 +9528,12 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 				_tmp15_ = _tmp14_;
 #line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if ((_tmp12_ + 1) < _tmp15_) {
-#line 9566 "ImportPage.c"
-					GeeArrayList* _tmp16_ = NULL;
-					gint _tmp17_ = 0;
-					gpointer _tmp18_ = NULL;
-					ImportSource* _tmp19_ = NULL;
-					PhotoImportSource* _tmp20_ = NULL;
+#line 9527 "ImportPage.c"
+					GeeArrayList* _tmp16_;
+					gint _tmp17_;
+					gpointer _tmp18_;
+					ImportSource* _tmp19_;
+					PhotoImportSource* _tmp20_;
 #line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp16_ = import_list;
 #line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9587,19 +9548,19 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 					if (_tmp20_ == NULL) {
 #line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (_tmp19_);
-#line 9586 "ImportPage.c"
+#line 9547 "ImportPage.c"
 					}
 #line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp11_);
 #line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp11_ = _tmp20_;
-#line 9592 "ImportPage.c"
+#line 9553 "ImportPage.c"
 				} else {
 #line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp11_);
 #line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp11_ = NULL;
-#line 9598 "ImportPage.c"
+#line 9559 "ImportPage.c"
 				}
 #line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = _g_object_ref0 (_tmp11_);
@@ -9609,12 +9570,12 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 				_tmp23_ = i;
 #line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp23_ > 0) {
-#line 9608 "ImportPage.c"
-					GeeArrayList* _tmp24_ = NULL;
-					gint _tmp25_ = 0;
-					gpointer _tmp26_ = NULL;
-					ImportSource* _tmp27_ = NULL;
-					PhotoImportSource* _tmp28_ = NULL;
+#line 9569 "ImportPage.c"
+					GeeArrayList* _tmp24_;
+					gint _tmp25_;
+					gpointer _tmp26_;
+					ImportSource* _tmp27_;
+					PhotoImportSource* _tmp28_;
 #line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp24_ = import_list;
 #line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9629,19 +9590,19 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 					if (_tmp28_ == NULL) {
 #line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (_tmp27_);
-#line 9628 "ImportPage.c"
+#line 9589 "ImportPage.c"
 					}
 #line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp22_);
 #line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp22_ = _tmp28_;
-#line 9634 "ImportPage.c"
+#line 9595 "ImportPage.c"
 				} else {
 #line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp22_);
 #line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp22_ = NULL;
-#line 9640 "ImportPage.c"
+#line 9601 "ImportPage.c"
 				}
 #line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp29_ = _g_object_ref0 (_tmp22_);
@@ -9651,37 +9612,37 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 				_tmp31_ = current;
 #line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp31_ != NULL) {
-#line 9650 "ImportPage.c"
-					PhotoImportSource* _tmp32_ = NULL;
-					PhotoFileFormat _tmp33_ = 0;
+#line 9611 "ImportPage.c"
+					PhotoImportSource* _tmp32_;
+					PhotoFileFormat _tmp33_;
 #line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp32_ = current;
 #line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp33_ = photo_import_source_get_file_format (_tmp32_);
 #line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp30_ = _tmp33_ == PHOTO_FILE_FORMAT_RAW;
-#line 9659 "ImportPage.c"
+#line 9620 "ImportPage.c"
 				} else {
 #line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp30_ = FALSE;
-#line 9663 "ImportPage.c"
+#line 9624 "ImportPage.c"
 				}
 #line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp30_) {
-#line 9667 "ImportPage.c"
+#line 9628 "ImportPage.c"
 					gchar* current_name = NULL;
 					gchar* ext = NULL;
-					PhotoImportSource* _tmp34_ = NULL;
-					gchar* _tmp35_ = NULL;
-					gchar* _tmp36_ = NULL;
+					PhotoImportSource* _tmp34_;
+					gchar* _tmp35_;
+					gchar* _tmp36_;
 					gchar* _tmp37_ = NULL;
 					gchar* _tmp38_ = NULL;
 					PhotoImportSource* associated = NULL;
 					gboolean _tmp39_ = FALSE;
-					PhotoImportSource* _tmp40_ = NULL;
+					PhotoImportSource* _tmp40_;
 					gboolean _tmp52_ = FALSE;
-					PhotoImportSource* _tmp53_ = NULL;
-					PhotoImportSource* _tmp65_ = NULL;
+					PhotoImportSource* _tmp53_;
+					PhotoImportSource* _tmp65_;
 #line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp34_ = current;
 #line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9706,32 +9667,32 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 					_tmp40_ = next;
 #line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp40_ != NULL) {
-#line 9705 "ImportPage.c"
-						PhotoImportSource* _tmp41_ = NULL;
-						PhotoFileFormat _tmp42_ = 0;
+#line 9666 "ImportPage.c"
+						PhotoImportSource* _tmp41_;
+						PhotoFileFormat _tmp42_;
 #line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp41_ = next;
 #line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp42_ = photo_import_source_get_file_format (_tmp41_);
 #line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp39_ = _tmp42_ == PHOTO_FILE_FORMAT_JFIF;
-#line 9714 "ImportPage.c"
+#line 9675 "ImportPage.c"
 					} else {
 #line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp39_ = FALSE;
-#line 9718 "ImportPage.c"
+#line 9679 "ImportPage.c"
 					}
 #line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp39_) {
-#line 9722 "ImportPage.c"
+#line 9683 "ImportPage.c"
 						gchar* next_name = NULL;
-						PhotoImportSource* _tmp43_ = NULL;
-						gchar* _tmp44_ = NULL;
-						gchar* _tmp45_ = NULL;
+						PhotoImportSource* _tmp43_;
+						gchar* _tmp44_;
+						gchar* _tmp45_;
 						gchar* _tmp46_ = NULL;
 						gchar* _tmp47_ = NULL;
-						const gchar* _tmp48_ = NULL;
-						const gchar* _tmp49_ = NULL;
+						const gchar* _tmp48_;
+						const gchar* _tmp49_;
 #line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp43_ = next;
 #line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9756,9 +9717,9 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 						_tmp49_ = current_name;
 #line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (g_strcmp0 (_tmp48_, _tmp49_) == 0) {
-#line 9755 "ImportPage.c"
-							PhotoImportSource* _tmp50_ = NULL;
-							PhotoImportSource* _tmp51_ = NULL;
+#line 9716 "ImportPage.c"
+							PhotoImportSource* _tmp50_;
+							PhotoImportSource* _tmp51_;
 #line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp50_ = next;
 #line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9767,42 +9728,42 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 							_g_object_unref0 (associated);
 #line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							associated = _tmp51_;
-#line 9766 "ImportPage.c"
+#line 9727 "ImportPage.c"
 						}
 #line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (next_name);
-#line 9770 "ImportPage.c"
+#line 9731 "ImportPage.c"
 					}
 #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp53_ = prev;
 #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp53_ != NULL) {
-#line 9776 "ImportPage.c"
-						PhotoImportSource* _tmp54_ = NULL;
-						PhotoFileFormat _tmp55_ = 0;
+#line 9737 "ImportPage.c"
+						PhotoImportSource* _tmp54_;
+						PhotoFileFormat _tmp55_;
 #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp54_ = prev;
 #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp55_ = photo_import_source_get_file_format (_tmp54_);
 #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp52_ = _tmp55_ == PHOTO_FILE_FORMAT_JFIF;
-#line 9785 "ImportPage.c"
+#line 9746 "ImportPage.c"
 					} else {
 #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp52_ = FALSE;
-#line 9789 "ImportPage.c"
+#line 9750 "ImportPage.c"
 					}
 #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp52_) {
-#line 9793 "ImportPage.c"
+#line 9754 "ImportPage.c"
 						gchar* prev_name = NULL;
-						PhotoImportSource* _tmp56_ = NULL;
-						gchar* _tmp57_ = NULL;
-						gchar* _tmp58_ = NULL;
+						PhotoImportSource* _tmp56_;
+						gchar* _tmp57_;
+						gchar* _tmp58_;
 						gchar* _tmp59_ = NULL;
 						gchar* _tmp60_ = NULL;
-						const gchar* _tmp61_ = NULL;
-						const gchar* _tmp62_ = NULL;
+						const gchar* _tmp61_;
+						const gchar* _tmp62_;
 #line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp56_ = prev;
 #line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9827,9 +9788,9 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 						_tmp62_ = current_name;
 #line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (g_strcmp0 (_tmp61_, _tmp62_) == 0) {
-#line 9826 "ImportPage.c"
-							PhotoImportSource* _tmp63_ = NULL;
-							PhotoImportSource* _tmp64_ = NULL;
+#line 9787 "ImportPage.c"
+							PhotoImportSource* _tmp63_;
+							PhotoImportSource* _tmp64_;
 #line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp63_ = prev;
 #line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9838,28 +9799,28 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 							_g_object_unref0 (associated);
 #line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							associated = _tmp64_;
-#line 9837 "ImportPage.c"
+#line 9798 "ImportPage.c"
 						}
 #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (prev_name);
-#line 9841 "ImportPage.c"
+#line 9802 "ImportPage.c"
 					}
 #line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp65_ = associated;
 #line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp65_ != NULL) {
-#line 9847 "ImportPage.c"
-						PhotoImportSource* _tmp66_ = NULL;
-						gchar* _tmp67_ = NULL;
-						gchar* _tmp68_ = NULL;
-						PhotoImportSource* _tmp69_ = NULL;
-						gchar* _tmp70_ = NULL;
-						gchar* _tmp71_ = NULL;
-						PhotoImportSource* _tmp72_ = NULL;
-						PhotoImportSource* _tmp73_ = NULL;
-						GeeArrayList* _tmp74_ = NULL;
-						PhotoImportSource* _tmp75_ = NULL;
-						gboolean _tmp76_ = FALSE;
+#line 9808 "ImportPage.c"
+						PhotoImportSource* _tmp66_;
+						gchar* _tmp67_;
+						gchar* _tmp68_;
+						PhotoImportSource* _tmp69_;
+						gchar* _tmp70_;
+						gchar* _tmp71_;
+						PhotoImportSource* _tmp72_;
+						PhotoImportSource* _tmp73_;
+						GeeArrayList* _tmp74_;
+						PhotoImportSource* _tmp75_;
+						gboolean _tmp76_;
 #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp66_ = current;
 #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9892,15 +9853,15 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 						_tmp76_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_IMPORT_SOURCE, ImportSource));
 #line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (!_tmp76_) {
-#line 9891 "ImportPage.c"
-							PhotoImportSource* _tmp77_ = NULL;
+#line 9852 "ImportPage.c"
+							PhotoImportSource* _tmp77_;
 #line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							g_debug ("ImportPage.vala:1508: Unable to associate files");
 #line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp77_ = current;
 #line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							photo_import_source_set_associated (_tmp77_, NULL);
-#line 9899 "ImportPage.c"
+#line 9860 "ImportPage.c"
 						}
 					}
 #line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9909,7 +9870,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 					_g_free0 (ext);
 #line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (current_name);
-#line 9908 "ImportPage.c"
+#line 9869 "ImportPage.c"
 				}
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (prev);
@@ -9921,7 +9882,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 				_g_object_unref0 (_tmp11_);
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (current);
-#line 9920 "ImportPage.c"
+#line 9881 "ImportPage.c"
 			}
 		}
 	}
@@ -9937,15 +9898,15 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 	g_return_if_fail (GEE_IS_LIST (import_list));
 #line 1517 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	loaded_photos = 0;
-#line 9936 "ImportPage.c"
+#line 9897 "ImportPage.c"
 	{
 		GeeList* _import_source_list = NULL;
-		GeeList* _tmp0_ = NULL;
-		GeeList* _tmp1_ = NULL;
+		GeeList* _tmp0_;
+		GeeList* _tmp1_;
 		gint _import_source_size = 0;
-		GeeList* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		GeeList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 		gint _import_source_index = 0;
 #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = import_list;
@@ -9965,57 +9926,56 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 		_import_source_index = -1;
 #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		while (TRUE) {
-#line 9964 "ImportPage.c"
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
+#line 9925 "ImportPage.c"
+			gint _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
 			ImportSource* import_source = NULL;
-			GeeList* _tmp8_ = NULL;
-			gint _tmp9_ = 0;
-			gpointer _tmp10_ = NULL;
+			GeeList* _tmp8_;
+			gint _tmp9_;
+			gpointer _tmp10_;
 			gchar* filename = NULL;
-			ImportSource* _tmp11_ = NULL;
-			gchar* _tmp12_ = NULL;
+			ImportSource* _tmp11_;
+			gchar* _tmp12_;
 			gchar* fulldir = NULL;
-			ImportSource* _tmp13_ = NULL;
-			gchar* _tmp14_ = NULL;
-			const gchar* _tmp15_ = NULL;
+			ImportSource* _tmp13_;
+			gchar* _tmp14_;
+			const gchar* _tmp15_;
 			PhotoImportSource* associated = NULL;
 			gboolean _tmp19_ = FALSE;
-			ImportSource* _tmp20_ = NULL;
-			GtkProgressBar* _tmp26_ = NULL;
-			GtkProgressBar* _tmp27_ = NULL;
-			const gchar* _tmp28_ = NULL;
-			ImportSource* _tmp29_ = NULL;
-			gchar* _tmp30_ = NULL;
-			gchar* _tmp31_ = NULL;
-			gchar* _tmp32_ = NULL;
-			gchar* _tmp33_ = NULL;
+			ImportSource* _tmp20_;
+			GtkProgressBar* _tmp26_;
+			GtkProgressBar* _tmp27_;
+			ImportSource* _tmp28_;
+			gchar* _tmp29_;
+			gchar* _tmp30_;
+			gchar* _tmp31_;
+			gchar* _tmp32_;
 			PhotoMetadata* metadata = NULL;
-			const gchar* _tmp34_ = NULL;
-			gboolean _tmp35_ = FALSE;
+			const gchar* _tmp33_;
+			gboolean _tmp34_;
 			gchar* exif_only_md5 = NULL;
-			PhotoMetadata* _tmp48_ = NULL;
+			PhotoMetadata* _tmp47_;
 			guint8* preview_raw = NULL;
-			gint preview_raw_length1 = 0;
-			gint _preview_raw_size_ = 0;
+			gint preview_raw_length1;
+			gint _preview_raw_size_;
 			gsize preview_raw_length = 0UL;
 			GdkPixbuf* preview = NULL;
 			gchar* preview_md5 = NULL;
+			gboolean _tmp83_ = FALSE;
 			gboolean _tmp84_ = FALSE;
-			gboolean _tmp85_ = FALSE;
-			GdkPixbuf* _tmp86_ = NULL;
-			ImportSource* _tmp92_ = NULL;
-			ImportSource* _tmp95_ = NULL;
-			PhotoImportSource* _tmp101_ = NULL;
-			SourceCollection* _tmp125_ = NULL;
-			ImportSource* _tmp126_ = NULL;
-			GtkProgressBar* _tmp127_ = NULL;
-			gint _tmp128_ = 0;
-			gint _tmp129_ = 0;
-			GeeList* _tmp130_ = NULL;
-			gint _tmp131_ = 0;
-			gint _tmp132_ = 0;
+			GdkPixbuf* _tmp85_;
+			ImportSource* _tmp91_;
+			ImportSource* _tmp94_;
+			PhotoImportSource* _tmp100_;
+			SourceCollection* _tmp124_;
+			ImportSource* _tmp125_;
+			GtkProgressBar* _tmp126_;
+			gint _tmp127_;
+			gint _tmp128_;
+			GeeList* _tmp129_;
+			gint _tmp130_;
+			gint _tmp131_;
 #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp5_ = _import_source_index;
 #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10028,7 +9988,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			if (!(_tmp6_ < _tmp7_)) {
 #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 10027 "ImportPage.c"
+#line 9987 "ImportPage.c"
 			}
 #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp8_ = _import_source_list;
@@ -10054,10 +10014,10 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			_tmp15_ = fulldir;
 #line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp15_ == NULL) {
-#line 10053 "ImportPage.c"
-				ImportSource* _tmp16_ = NULL;
-				gchar* _tmp17_ = NULL;
-				gchar* _tmp18_ = NULL;
+#line 10013 "ImportPage.c"
+				ImportSource* _tmp16_;
+				gchar* _tmp17_;
+				gchar* _tmp18_;
 #line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp16_ = import_source;
 #line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10077,7 +10037,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_g_object_unref0 (import_source);
 #line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				continue;
-#line 10075 "ImportPage.c"
+#line 10035 "ImportPage.c"
 			}
 #line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			associated = NULL;
@@ -10085,10 +10045,10 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			_tmp20_ = import_source;
 #line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10083 "ImportPage.c"
-				ImportSource* _tmp21_ = NULL;
-				PhotoImportSource* _tmp22_ = NULL;
-				PhotoImportSource* _tmp23_ = NULL;
+#line 10043 "ImportPage.c"
+				ImportSource* _tmp21_;
+				PhotoImportSource* _tmp22_;
+				PhotoImportSource* _tmp23_;
 #line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = import_source;
 #line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10099,17 +10059,17 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_tmp19_ = _tmp23_ != NULL;
 #line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp23_);
-#line 10097 "ImportPage.c"
+#line 10057 "ImportPage.c"
 			} else {
 #line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp19_ = FALSE;
-#line 10101 "ImportPage.c"
+#line 10061 "ImportPage.c"
 			}
 #line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp19_) {
-#line 10105 "ImportPage.c"
-				ImportSource* _tmp24_ = NULL;
-				PhotoImportSource* _tmp25_ = NULL;
+#line 10065 "ImportPage.c"
+				ImportSource* _tmp24_;
+				PhotoImportSource* _tmp25_;
 #line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp24_ = import_source;
 #line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10118,7 +10078,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_g_object_unref0 (associated);
 #line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				associated = _tmp25_;
-#line 10116 "ImportPage.c"
+#line 10076 "ImportPage.c"
 			}
 #line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp26_ = self->priv->progress_bar;
@@ -10127,99 +10087,97 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp27_ = self->priv->progress_bar;
 #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp28_ = _ ("Fetching preview for %s");
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp29_ = import_source;
+			_tmp28_ = import_source;
 #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp30_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject));
+			_tmp29_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject));
 #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp31_ = _tmp30_;
+			_tmp30_ = _tmp29_;
 #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp32_ = g_strdup_printf (_tmp28_, _tmp31_);
+			_tmp31_ = g_strdup_printf (_ ("Fetching preview for %s"), _tmp30_);
 #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp33_ = _tmp32_;
+			_tmp32_ = _tmp31_;
 #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			gtk_progress_bar_set_text (_tmp27_, _tmp33_);
+			gtk_progress_bar_set_text (_tmp27_, _tmp32_);
 #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_free0 (_tmp33_);
+			_g_free0 (_tmp32_);
 #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_free0 (_tmp31_);
+			_g_free0 (_tmp30_);
 #line 1542 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			metadata = NULL;
 #line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp34_ = filename;
+			_tmp33_ = filename;
 #line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp35_ = video_reader_is_supported_video_filename (_tmp34_);
+			_tmp34_ = video_reader_is_supported_video_filename (_tmp33_);
 #line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (!_tmp35_) {
-#line 10150 "ImportPage.c"
+			if (!_tmp34_) {
+#line 10108 "ImportPage.c"
 				{
-					PhotoMetadata* _tmp36_ = NULL;
-					GPSpinIdleWrapper* _tmp37_ = NULL;
-					GPContext* _tmp38_ = NULL;
-					Camera* _tmp39_ = NULL;
-					const gchar* _tmp40_ = NULL;
-					const gchar* _tmp41_ = NULL;
-					PhotoMetadata* _tmp42_ = NULL;
-					PhotoMetadata* _tmp43_ = NULL;
+					PhotoMetadata* _tmp35_ = NULL;
+					GPSpinIdleWrapper* _tmp36_;
+					GPContext* _tmp37_;
+					Camera* _tmp38_;
+					const gchar* _tmp39_;
+					const gchar* _tmp40_;
+					PhotoMetadata* _tmp41_;
+					PhotoMetadata* _tmp42_;
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp37_ = import_page_spin_idle_context;
+					_tmp36_ = import_page_spin_idle_context;
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+					_tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp39_ = self->priv->camera;
+					_tmp38_ = self->priv->camera;
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp40_ = fulldir;
+					_tmp39_ = fulldir;
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp41_ = filename;
+					_tmp40_ = filename;
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp42_ = gp_load_metadata (_tmp38_, _tmp39_, _tmp40_, _tmp41_, &_inner_error_);
+					_tmp41_ = gp_load_metadata (_tmp37_, _tmp38_, _tmp39_, _tmp40_, &_inner_error_);
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp36_ = _tmp42_;
+					_tmp35_ = _tmp41_;
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10176 "ImportPage.c"
-						goto __catch68_g_error;
+#line 10134 "ImportPage.c"
+						goto __catch69_g_error;
 					}
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp43_ = _tmp36_;
+					_tmp42_ = _tmp35_;
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp36_ = NULL;
+					_tmp35_ = NULL;
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (metadata);
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					metadata = _tmp43_;
+					metadata = _tmp42_;
 #line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_media_metadata_unref0 (_tmp36_);
-#line 10189 "ImportPage.c"
+					_media_metadata_unref0 (_tmp35_);
+#line 10147 "ImportPage.c"
 				}
-				goto __finally68;
-				__catch68_g_error:
+				goto __finally69;
+				__catch69_g_error:
 				{
 					GError* err = NULL;
-					const gchar* _tmp44_ = NULL;
-					const gchar* _tmp45_ = NULL;
-					GError* _tmp46_ = NULL;
-					const gchar* _tmp47_ = NULL;
+					const gchar* _tmp43_;
+					const gchar* _tmp44_;
+					GError* _tmp45_;
+					const gchar* _tmp46_;
 #line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					err = _inner_error_;
 #line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_inner_error_ = NULL;
 #line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp44_ = fulldir;
+					_tmp43_ = fulldir;
 #line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp45_ = filename;
+					_tmp44_ = filename;
 #line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp46_ = err;
+					_tmp45_ = err;
 #line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp47_ = _tmp46_->message;
+					_tmp46_ = _tmp45_->message;
 #line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					g_warning ("ImportPage.vala:1548: Unable to fetch metadata for %s/%s: %s", _tmp44_, _tmp45_, _tmp47_);
+					g_warning ("ImportPage.vala:1548: Unable to fetch metadata for %s/%s: %s", _tmp43_, _tmp44_, _tmp46_);
 #line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_error_free0 (err);
-#line 10215 "ImportPage.c"
+#line 10173 "ImportPage.c"
 				}
-				__finally68:
+				__finally69:
 #line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10240,83 +10198,83 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					g_clear_error (&_inner_error_);
 #line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return;
-#line 10238 "ImportPage.c"
+#line 10196 "ImportPage.c"
 				}
 			}
 #line 1554 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			exif_only_md5 = NULL;
 #line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp48_ = metadata;
+			_tmp47_ = metadata;
 #line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (_tmp48_ != NULL) {
-#line 10247 "ImportPage.c"
+			if (_tmp47_ != NULL) {
+#line 10205 "ImportPage.c"
 				guint8* flattened_sans_thumbnail = NULL;
-				PhotoMetadata* _tmp49_ = NULL;
-				gint _tmp50_ = 0;
-				guint8* _tmp51_ = NULL;
-				gint flattened_sans_thumbnail_length1 = 0;
-				gint _flattened_sans_thumbnail_size_ = 0;
-				gboolean _tmp52_ = FALSE;
-				guint8* _tmp53_ = NULL;
-				gint _tmp53__length1 = 0;
+				PhotoMetadata* _tmp48_;
+				gint _tmp49_;
+				guint8* _tmp50_;
+				gint flattened_sans_thumbnail_length1;
+				gint _flattened_sans_thumbnail_size_;
+				gboolean _tmp51_ = FALSE;
+				guint8* _tmp52_;
+				gint _tmp52__length1;
 #line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp49_ = metadata;
+				_tmp48_ = metadata;
 #line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp51_ = photo_metadata_flatten_exif (_tmp49_, FALSE, &_tmp50_);
+				_tmp50_ = photo_metadata_flatten_exif (_tmp48_, FALSE, &_tmp49_);
 #line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				flattened_sans_thumbnail = _tmp51_;
+				flattened_sans_thumbnail = _tmp50_;
 #line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				flattened_sans_thumbnail_length1 = _tmp50_;
+				flattened_sans_thumbnail_length1 = _tmp49_;
 #line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_flattened_sans_thumbnail_size_ = flattened_sans_thumbnail_length1;
 #line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp53_ = flattened_sans_thumbnail;
+				_tmp52_ = flattened_sans_thumbnail;
 #line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp53__length1 = flattened_sans_thumbnail_length1;
+				_tmp52__length1 = flattened_sans_thumbnail_length1;
 #line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (_tmp53_ != NULL) {
-#line 10273 "ImportPage.c"
-					guint8* _tmp54_ = NULL;
-					gint _tmp54__length1 = 0;
+				if (_tmp52_ != NULL) {
+#line 10231 "ImportPage.c"
+					guint8* _tmp53_;
+					gint _tmp53__length1;
 #line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp54_ = flattened_sans_thumbnail;
+					_tmp53_ = flattened_sans_thumbnail;
 #line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp54__length1 = flattened_sans_thumbnail_length1;
+					_tmp53__length1 = flattened_sans_thumbnail_length1;
 #line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp52_ = _tmp54__length1 > 0;
-#line 10282 "ImportPage.c"
+					_tmp51_ = _tmp53__length1 > 0;
+#line 10240 "ImportPage.c"
 				} else {
 #line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp52_ = FALSE;
-#line 10286 "ImportPage.c"
+					_tmp51_ = FALSE;
+#line 10244 "ImportPage.c"
 				}
 #line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (_tmp52_) {
-#line 10290 "ImportPage.c"
-					guint8* _tmp55_ = NULL;
-					gint _tmp55__length1 = 0;
-					guint8* _tmp56_ = NULL;
-					gint _tmp56__length1 = 0;
-					gchar* _tmp57_ = NULL;
+				if (_tmp51_) {
+#line 10248 "ImportPage.c"
+					guint8* _tmp54_;
+					gint _tmp54__length1;
+					guint8* _tmp55_;
+					gint _tmp55__length1;
+					gchar* _tmp56_;
 #line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp55_ = flattened_sans_thumbnail;
+					_tmp54_ = flattened_sans_thumbnail;
 #line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp55__length1 = flattened_sans_thumbnail_length1;
+					_tmp54__length1 = flattened_sans_thumbnail_length1;
 #line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp56_ = flattened_sans_thumbnail;
+					_tmp55_ = flattened_sans_thumbnail;
 #line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp56__length1 = flattened_sans_thumbnail_length1;
+					_tmp55__length1 = flattened_sans_thumbnail_length1;
 #line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp57_ = md5_binary (_tmp55_, (gsize) _tmp56__length1);
+					_tmp56_ = md5_binary (_tmp54_, (gsize) _tmp55__length1);
 #line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (exif_only_md5);
 #line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					exif_only_md5 = _tmp57_;
-#line 10310 "ImportPage.c"
+					exif_only_md5 = _tmp56_;
+#line 10268 "ImportPage.c"
 				}
 #line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 10314 "ImportPage.c"
+#line 10272 "ImportPage.c"
 			}
 #line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview_raw = NULL;
@@ -10328,152 +10286,152 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			preview_raw_length = (gsize) 0;
 #line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview = NULL;
-#line 10326 "ImportPage.c"
+#line 10284 "ImportPage.c"
 			{
 				gchar* preview_fulldir = NULL;
-				const gchar* _tmp58_ = NULL;
-				gchar* _tmp59_ = NULL;
+				const gchar* _tmp57_;
+				gchar* _tmp58_;
 				gchar* preview_filename = NULL;
-				const gchar* _tmp60_ = NULL;
-				gchar* _tmp61_ = NULL;
-				PhotoImportSource* _tmp62_ = NULL;
-				GdkPixbuf* _tmp67_ = NULL;
-				GPSpinIdleWrapper* _tmp68_ = NULL;
-				GPContext* _tmp69_ = NULL;
-				Camera* _tmp70_ = NULL;
-				const gchar* _tmp71_ = NULL;
-				const gchar* _tmp72_ = NULL;
-				guint8* _tmp73_ = NULL;
-				gint _tmp74_ = 0;
-				gsize _tmp75_ = 0UL;
-				GdkPixbuf* _tmp76_ = NULL;
-				GdkPixbuf* _tmp77_ = NULL;
+				const gchar* _tmp59_;
+				gchar* _tmp60_;
+				PhotoImportSource* _tmp61_;
+				GdkPixbuf* _tmp66_ = NULL;
+				GPSpinIdleWrapper* _tmp67_;
+				GPContext* _tmp68_;
+				Camera* _tmp69_;
+				const gchar* _tmp70_;
+				const gchar* _tmp71_;
+				guint8* _tmp72_ = NULL;
+				gint _tmp73_;
+				gsize _tmp74_ = 0UL;
+				GdkPixbuf* _tmp75_;
+				GdkPixbuf* _tmp76_;
 #line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp58_ = fulldir;
+				_tmp57_ = fulldir;
 #line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp59_ = g_strdup (_tmp58_);
+				_tmp58_ = g_strdup (_tmp57_);
 #line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				preview_fulldir = _tmp59_;
+				preview_fulldir = _tmp58_;
 #line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp60_ = filename;
+				_tmp59_ = filename;
 #line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp61_ = g_strdup (_tmp60_);
+				_tmp60_ = g_strdup (_tmp59_);
 #line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				preview_filename = _tmp61_;
+				preview_filename = _tmp60_;
 #line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp62_ = associated;
+				_tmp61_ = associated;
 #line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (_tmp62_ != NULL) {
-#line 10362 "ImportPage.c"
-					PhotoImportSource* _tmp63_ = NULL;
-					gchar* _tmp64_ = NULL;
-					PhotoImportSource* _tmp65_ = NULL;
-					gchar* _tmp66_ = NULL;
+				if (_tmp61_ != NULL) {
+#line 10320 "ImportPage.c"
+					PhotoImportSource* _tmp62_;
+					gchar* _tmp63_;
+					PhotoImportSource* _tmp64_;
+					gchar* _tmp65_;
 #line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp63_ = associated;
+					_tmp62_ = associated;
 #line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp64_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_IMPORT_SOURCE, ImportSource));
+					_tmp63_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_IMPORT_SOURCE, ImportSource));
 #line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_fulldir);
 #line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					preview_fulldir = _tmp64_;
+					preview_fulldir = _tmp63_;
 #line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp65_ = associated;
+					_tmp64_ = associated;
 #line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp66_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_IMPORT_SOURCE, ImportSource));
+					_tmp65_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_IMPORT_SOURCE, ImportSource));
 #line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_filename);
 #line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					preview_filename = _tmp66_;
-#line 10383 "ImportPage.c"
+					preview_filename = _tmp65_;
+#line 10341 "ImportPage.c"
 				}
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp68_ = import_page_spin_idle_context;
+				_tmp67_ = import_page_spin_idle_context;
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp69_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+				_tmp68_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp70_ = self->priv->camera;
+				_tmp69_ = self->priv->camera;
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp71_ = preview_fulldir;
+				_tmp70_ = preview_fulldir;
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp72_ = preview_filename;
+				_tmp71_ = preview_filename;
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp76_ = gp_load_preview (_tmp69_, _tmp70_, _tmp71_, _tmp72_, &_tmp73_, &_tmp74_, &_tmp75_, &_inner_error_);
+				_tmp75_ = gp_load_preview (_tmp68_, _tmp69_, _tmp70_, _tmp71_, &_tmp72_, &_tmp73_, &_tmp74_, &_inner_error_);
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_raw = (g_free (preview_raw), NULL);
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				preview_raw = _tmp73_;
+				preview_raw = _tmp72_;
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				preview_raw_length1 = _tmp74_;
+				preview_raw_length1 = _tmp73_;
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_preview_raw_size_ = preview_raw_length1;
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				preview_raw_length = _tmp75_;
+				preview_raw_length = _tmp74_;
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp67_ = _tmp76_;
+				_tmp66_ = _tmp75_;
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_filename);
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_fulldir);
-#line 10415 "ImportPage.c"
-					goto __catch69_g_error;
+#line 10373 "ImportPage.c"
+					goto __catch70_g_error;
 				}
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp77_ = _tmp67_;
+				_tmp76_ = _tmp66_;
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp67_ = NULL;
+				_tmp66_ = NULL;
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (preview);
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				preview = _tmp77_;
+				preview = _tmp76_;
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_g_object_unref0 (_tmp67_);
+				_g_object_unref0 (_tmp66_);
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (preview_filename);
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (preview_fulldir);
-#line 10432 "ImportPage.c"
+#line 10390 "ImportPage.c"
 			}
-			goto __finally69;
-			__catch69_g_error:
+			goto __finally70;
+			__catch70_g_error:
 			{
 				GError* err = NULL;
-				const gchar* _tmp78_ = NULL;
-				gboolean _tmp79_ = FALSE;
+				const gchar* _tmp77_;
+				gboolean _tmp78_;
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				err = _inner_error_;
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_inner_error_ = NULL;
 #line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp78_ = filename;
+				_tmp77_ = filename;
 #line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp79_ = video_reader_is_supported_video_filename (_tmp78_);
+				_tmp78_ = video_reader_is_supported_video_filename (_tmp77_);
 #line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (!_tmp79_) {
-#line 10450 "ImportPage.c"
-					const gchar* _tmp80_ = NULL;
-					const gchar* _tmp81_ = NULL;
-					GError* _tmp82_ = NULL;
-					const gchar* _tmp83_ = NULL;
+				if (!_tmp78_) {
+#line 10408 "ImportPage.c"
+					const gchar* _tmp79_;
+					const gchar* _tmp80_;
+					GError* _tmp81_;
+					const gchar* _tmp82_;
 #line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp80_ = fulldir;
+					_tmp79_ = fulldir;
 #line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp81_ = filename;
+					_tmp80_ = filename;
 #line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp82_ = err;
+					_tmp81_ = err;
 #line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp83_ = _tmp82_->message;
+					_tmp82_ = _tmp81_->message;
 #line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					g_warning ("ImportPage.vala:1586: Unable to fetch preview for %s/%s: %s", _tmp80_, _tmp81_, _tmp83_);
-#line 10465 "ImportPage.c"
+					g_warning ("ImportPage.vala:1586: Unable to fetch preview for %s/%s: %s", _tmp79_, _tmp80_, _tmp82_);
+#line 10423 "ImportPage.c"
 				}
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_error_free0 (err);
-#line 10469 "ImportPage.c"
+#line 10427 "ImportPage.c"
 			}
-			__finally69:
+			__finally70:
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10500,215 +10458,215 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				g_clear_error (&_inner_error_);
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return;
-#line 10498 "ImportPage.c"
+#line 10456 "ImportPage.c"
 			}
 #line 1591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview_md5 = NULL;
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp86_ = preview;
+			_tmp85_ = preview;
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (_tmp86_ != NULL) {
-#line 10506 "ImportPage.c"
-				guint8* _tmp87_ = NULL;
-				gint _tmp87__length1 = 0;
+			if (_tmp85_ != NULL) {
+#line 10464 "ImportPage.c"
+				guint8* _tmp86_;
+				gint _tmp86__length1;
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp87_ = preview_raw;
+				_tmp86_ = preview_raw;
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp87__length1 = preview_raw_length1;
+				_tmp86__length1 = preview_raw_length1;
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp85_ = _tmp87_ != NULL;
-#line 10515 "ImportPage.c"
+				_tmp84_ = _tmp86_ != NULL;
+#line 10473 "ImportPage.c"
 			} else {
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp85_ = FALSE;
-#line 10519 "ImportPage.c"
+				_tmp84_ = FALSE;
+#line 10477 "ImportPage.c"
 			}
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (_tmp85_) {
-#line 10523 "ImportPage.c"
-				gsize _tmp88_ = 0UL;
+			if (_tmp84_) {
+#line 10481 "ImportPage.c"
+				gsize _tmp87_;
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp88_ = preview_raw_length;
+				_tmp87_ = preview_raw_length;
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp84_ = _tmp88_ > ((gsize) 0);
-#line 10529 "ImportPage.c"
+				_tmp83_ = _tmp87_ > ((gsize) 0);
+#line 10487 "ImportPage.c"
 			} else {
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp84_ = FALSE;
-#line 10533 "ImportPage.c"
+				_tmp83_ = FALSE;
+#line 10491 "ImportPage.c"
 			}
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (_tmp84_) {
-#line 10537 "ImportPage.c"
-				guint8* _tmp89_ = NULL;
-				gint _tmp89__length1 = 0;
-				gsize _tmp90_ = 0UL;
-				gchar* _tmp91_ = NULL;
+			if (_tmp83_) {
+#line 10495 "ImportPage.c"
+				guint8* _tmp88_;
+				gint _tmp88__length1;
+				gsize _tmp89_;
+				gchar* _tmp90_;
 #line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp89_ = preview_raw;
+				_tmp88_ = preview_raw;
 #line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp89__length1 = preview_raw_length1;
+				_tmp88__length1 = preview_raw_length1;
 #line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp90_ = preview_raw_length;
+				_tmp89_ = preview_raw_length;
 #line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp91_ = md5_binary (_tmp89_, _tmp90_);
+				_tmp90_ = md5_binary (_tmp88_, _tmp89_);
 #line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (preview_md5);
 #line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				preview_md5 = _tmp91_;
-#line 10554 "ImportPage.c"
+				preview_md5 = _tmp90_;
+#line 10512 "ImportPage.c"
 			}
 #line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp92_ = import_source;
+			_tmp91_ = import_source;
 #line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp92_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 10560 "ImportPage.c"
-				ImportSource* _tmp93_ = NULL;
-				GdkPixbuf* _tmp94_ = NULL;
+			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp91_, TYPE_VIDEO_IMPORT_SOURCE)) {
+#line 10518 "ImportPage.c"
+				ImportSource* _tmp92_;
+				GdkPixbuf* _tmp93_;
 #line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp93_ = import_source;
+				_tmp92_ = import_source;
 #line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp94_ = preview;
+				_tmp93_ = preview;
 #line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				video_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp93_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp93_) : NULL, _tmp94_);
-#line 10569 "ImportPage.c"
+				video_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp92_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp92_) : NULL, _tmp93_);
+#line 10527 "ImportPage.c"
 			}
 #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp95_ = import_source;
+			_tmp94_ = import_source;
 #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp95_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10575 "ImportPage.c"
-				ImportSource* _tmp96_ = NULL;
-				GdkPixbuf* _tmp97_ = NULL;
-				const gchar* _tmp98_ = NULL;
-				PhotoMetadata* _tmp99_ = NULL;
-				const gchar* _tmp100_ = NULL;
+			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp94_, TYPE_PHOTO_IMPORT_SOURCE)) {
+#line 10533 "ImportPage.c"
+				ImportSource* _tmp95_;
+				GdkPixbuf* _tmp96_;
+				const gchar* _tmp97_;
+				PhotoMetadata* _tmp98_;
+				const gchar* _tmp99_;
 #line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp96_ = import_source;
+				_tmp95_ = import_source;
 #line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp97_ = preview;
+				_tmp96_ = preview;
 #line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp98_ = preview_md5;
+				_tmp97_ = preview_md5;
 #line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp99_ = metadata;
+				_tmp98_ = metadata;
 #line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp100_ = exif_only_md5;
+				_tmp99_ = exif_only_md5;
 #line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				photo_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp96_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp96_) : NULL, _tmp97_, _tmp98_, _tmp99_, _tmp100_);
-#line 10593 "ImportPage.c"
+				photo_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp95_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp95_) : NULL, _tmp96_, _tmp97_, _tmp98_, _tmp99_);
+#line 10551 "ImportPage.c"
 			}
 #line 1606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp101_ = associated;
+			_tmp100_ = associated;
 #line 1606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (_tmp101_ != NULL) {
-#line 10599 "ImportPage.c"
+			if (_tmp100_ != NULL) {
+#line 10557 "ImportPage.c"
 				{
 					PhotoMetadata* associated_metadata = NULL;
-					GPSpinIdleWrapper* _tmp102_ = NULL;
-					GPContext* _tmp103_ = NULL;
-					Camera* _tmp104_ = NULL;
-					PhotoImportSource* _tmp105_ = NULL;
-					gchar* _tmp106_ = NULL;
-					gchar* _tmp107_ = NULL;
-					PhotoImportSource* _tmp108_ = NULL;
-					gchar* _tmp109_ = NULL;
-					gchar* _tmp110_ = NULL;
-					PhotoMetadata* _tmp111_ = NULL;
-					PhotoMetadata* _tmp112_ = NULL;
-					PhotoImportSource* _tmp113_ = NULL;
-					GdkPixbuf* _tmp114_ = NULL;
-					const gchar* _tmp115_ = NULL;
-					PhotoMetadata* _tmp116_ = NULL;
+					GPSpinIdleWrapper* _tmp101_;
+					GPContext* _tmp102_;
+					Camera* _tmp103_;
+					PhotoImportSource* _tmp104_;
+					gchar* _tmp105_;
+					gchar* _tmp106_;
+					PhotoImportSource* _tmp107_;
+					gchar* _tmp108_;
+					gchar* _tmp109_;
+					PhotoMetadata* _tmp110_;
+					PhotoMetadata* _tmp111_;
+					PhotoImportSource* _tmp112_;
+					GdkPixbuf* _tmp113_;
+					const gchar* _tmp114_;
+					PhotoMetadata* _tmp115_;
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp102_ = import_page_spin_idle_context;
+					_tmp101_ = import_page_spin_idle_context;
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp103_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+					_tmp102_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp104_ = self->priv->camera;
+					_tmp103_ = self->priv->camera;
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp105_ = associated;
+					_tmp104_ = associated;
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp106_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, TYPE_IMPORT_SOURCE, ImportSource));
+					_tmp105_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, TYPE_IMPORT_SOURCE, ImportSource));
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp107_ = _tmp106_;
+					_tmp106_ = _tmp105_;
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp108_ = associated;
+					_tmp107_ = associated;
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp109_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, TYPE_IMPORT_SOURCE, ImportSource));
+					_tmp108_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_IMPORT_SOURCE, ImportSource));
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp110_ = _tmp109_;
+					_tmp109_ = _tmp108_;
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp111_ = gp_load_metadata (_tmp103_, _tmp104_, _tmp107_, _tmp110_, &_inner_error_);
+					_tmp110_ = gp_load_metadata (_tmp102_, _tmp103_, _tmp106_, _tmp109_, &_inner_error_);
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp112_ = _tmp111_;
+					_tmp111_ = _tmp110_;
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_g_free0 (_tmp110_);
+					_g_free0 (_tmp109_);
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_g_free0 (_tmp107_);
+					_g_free0 (_tmp106_);
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					associated_metadata = _tmp112_;
+					associated_metadata = _tmp111_;
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10647 "ImportPage.c"
-						goto __catch70_g_error;
+#line 10605 "ImportPage.c"
+						goto __catch71_g_error;
 					}
 #line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp113_ = associated;
+					_tmp112_ = associated;
 #line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp114_ = preview;
+					_tmp113_ = preview;
 #line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp115_ = preview_md5;
+					_tmp114_ = preview_md5;
 #line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp116_ = associated_metadata;
+					_tmp115_ = associated_metadata;
 #line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					photo_import_source_update (_tmp113_, _tmp114_, _tmp115_, _tmp116_, NULL);
+					photo_import_source_update (_tmp112_, _tmp113_, _tmp114_, _tmp115_, NULL);
 #line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (associated_metadata);
-#line 10662 "ImportPage.c"
+#line 10620 "ImportPage.c"
 				}
-				goto __finally70;
-				__catch70_g_error:
+				goto __finally71;
+				__catch71_g_error:
 				{
 					GError* err = NULL;
-					PhotoImportSource* _tmp117_ = NULL;
-					gchar* _tmp118_ = NULL;
-					gchar* _tmp119_ = NULL;
-					PhotoImportSource* _tmp120_ = NULL;
-					gchar* _tmp121_ = NULL;
-					gchar* _tmp122_ = NULL;
-					GError* _tmp123_ = NULL;
-					const gchar* _tmp124_ = NULL;
+					PhotoImportSource* _tmp116_;
+					gchar* _tmp117_;
+					gchar* _tmp118_;
+					PhotoImportSource* _tmp119_;
+					gchar* _tmp120_;
+					gchar* _tmp121_;
+					GError* _tmp122_;
+					const gchar* _tmp123_;
 #line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					err = _inner_error_;
 #line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_inner_error_ = NULL;
 #line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp117_ = associated;
+					_tmp116_ = associated;
 #line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp118_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, TYPE_IMPORT_SOURCE, ImportSource));
+					_tmp117_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, TYPE_IMPORT_SOURCE, ImportSource));
 #line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp119_ = _tmp118_;
+					_tmp118_ = _tmp117_;
 #line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp120_ = associated;
+					_tmp119_ = associated;
 #line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp121_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, TYPE_IMPORT_SOURCE, ImportSource));
+					_tmp120_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_IMPORT_SOURCE, ImportSource));
 #line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp122_ = _tmp121_;
+					_tmp121_ = _tmp120_;
 #line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp123_ = err;
+					_tmp122_ = err;
 #line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp124_ = _tmp123_->message;
+					_tmp123_ = _tmp122_->message;
 #line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					g_warning ("ImportPage.vala:1612: Unable to fetch metadata for %s/%s: %s", _tmp119_, _tmp122_, _tmp124_);
+					g_warning ("ImportPage.vala:1612: Unable to fetch metadata for %s/%s: %s", _tmp118_, _tmp121_, _tmp123_);
 #line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_g_free0 (_tmp122_);
+					_g_free0 (_tmp121_);
 #line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_g_free0 (_tmp119_);
+					_g_free0 (_tmp118_);
 #line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_error_free0 (err);
-#line 10704 "ImportPage.c"
+#line 10662 "ImportPage.c"
 				}
-				__finally70:
+				__finally71:
 #line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10737,31 +10695,31 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					g_clear_error (&_inner_error_);
 #line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return;
-#line 10735 "ImportPage.c"
+#line 10693 "ImportPage.c"
 				}
 			}
 #line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp125_ = self->priv->import_sources;
+			_tmp124_ = self->priv->import_sources;
 #line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp126_ = import_source;
+			_tmp125_ = import_source;
 #line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, TYPE_DATA_OBJECT, DataObject));
+			data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_DATA_OBJECT, DataObject));
 #line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp127_ = self->priv->progress_bar;
+			_tmp126_ = self->priv->progress_bar;
 #line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp128_ = loaded_photos;
+			_tmp127_ = loaded_photos;
 #line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			loaded_photos = _tmp128_ + 1;
+			loaded_photos = _tmp127_ + 1;
 #line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp129_ = loaded_photos;
+			_tmp128_ = loaded_photos;
 #line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp130_ = import_list;
+			_tmp129_ = import_list;
 #line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp131_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp130_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp132_ = _tmp131_;
+			_tmp131_ = _tmp130_;
 #line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			gtk_progress_bar_set_fraction (_tmp127_, ((gdouble) _tmp129_) / ((gdouble) _tmp132_));
+			gtk_progress_bar_set_fraction (_tmp126_, ((gdouble) _tmp128_) / ((gdouble) _tmp131_));
 #line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			spin_event_loop ();
 #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10782,22 +10740,22 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			_g_free0 (filename);
 #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (import_source);
-#line 10780 "ImportPage.c"
+#line 10738 "ImportPage.c"
 		}
 #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_import_source_list);
-#line 10784 "ImportPage.c"
+#line 10742 "ImportPage.c"
 	}
 }
 
 
 static void import_page_on_hide_imported (ImportPage* self) {
-	GtkCheckButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	ConfigFacade* _tmp8_ = NULL;
-	ConfigFacade* _tmp9_ = NULL;
-	GtkCheckButton* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
+	GtkCheckButton* _tmp0_;
+	gboolean _tmp1_;
+	ConfigFacade* _tmp8_;
+	ConfigFacade* _tmp9_;
+	GtkCheckButton* _tmp10_;
+	gboolean _tmp11_;
 #line 1631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
 #line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10806,10 +10764,10 @@ static void import_page_on_hide_imported (ImportPage* self) {
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 10804 "ImportPage.c"
-		ViewCollection* _tmp2_ = NULL;
-		ViewCollection* _tmp3_ = NULL;
-		ImportPageHideImportedViewFilter* _tmp4_ = NULL;
+#line 10762 "ImportPage.c"
+		ViewCollection* _tmp2_;
+		ViewCollection* _tmp3_;
+		ImportPageHideImportedViewFilter* _tmp4_;
 #line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10820,11 +10778,11 @@ static void import_page_on_hide_imported (ImportPage* self) {
 		view_collection_install_view_filter (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIEW_FILTER, ViewFilter));
 #line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp3_);
-#line 10818 "ImportPage.c"
+#line 10776 "ImportPage.c"
 	} else {
-		ViewCollection* _tmp5_ = NULL;
-		ViewCollection* _tmp6_ = NULL;
-		ImportPageHideImportedViewFilter* _tmp7_ = NULL;
+		ViewCollection* _tmp5_;
+		ViewCollection* _tmp6_;
+		ImportPageHideImportedViewFilter* _tmp7_;
 #line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10835,7 +10793,7 @@ static void import_page_on_hide_imported (ImportPage* self) {
 		view_collection_remove_view_filter (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIEW_FILTER, ViewFilter));
 #line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 10833 "ImportPage.c"
+#line 10791 "ImportPage.c"
 	}
 #line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = config_facade_get_instance ();
@@ -10849,15 +10807,15 @@ static void import_page_on_hide_imported (ImportPage* self) {
 	configuration_facade_set_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp11_);
 #line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 10847 "ImportPage.c"
+#line 10805 "ImportPage.c"
 }
 
 
 static void import_page_on_import_selected (ImportPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	GeeList* _tmp3_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	GeeList* _tmp2_;
+	GeeList* _tmp3_;
 #line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
 #line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10874,15 +10832,15 @@ static void import_page_on_import_selected (ImportPage* self) {
 	_g_object_unref0 (_tmp3_);
 #line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 10872 "ImportPage.c"
+#line 10830 "ImportPage.c"
 }
 
 
 static void import_page_on_import_all (ImportPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	GeeCollection* _tmp2_;
+	GeeCollection* _tmp3_;
 #line 1644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
 #line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10899,7 +10857,7 @@ static void import_page_on_import_all (ImportPage* self) {
 	_g_object_unref0 (_tmp3_);
 #line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 10897 "ImportPage.c"
+#line 10855 "ImportPage.c"
 }
 
 
@@ -10908,51 +10866,51 @@ static gint64 _import_page_import_job_comparator_comparator (void* a, void* b, g
 	result = import_page_import_job_comparator ((ImportPage*) self, a, b);
 #line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 10906 "ImportPage.c"
+#line 10864 "ImportPage.c"
 }
 
 
 static void _import_page_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
 #line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_import_reporter ((ImportPage*) self, manifest);
-#line 10913 "ImportPage.c"
+#line 10871 "ImportPage.c"
 }
 
 
 static void _import_page_on_import_job_failed_batch_import_import_job_failed (BatchImport* _sender, BatchImportResult* _result_, gpointer self) {
 #line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_import_job_failed ((ImportPage*) self, _result_);
-#line 10920 "ImportPage.c"
+#line 10878 "ImportPage.c"
 }
 
 
 static void _import_page_close_import_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
 #line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_close_import ((ImportPage*) self);
-#line 10927 "ImportPage.c"
+#line 10885 "ImportPage.c"
 }
 
 
 static void import_page_import (ImportPage* self, GeeIterable* items) {
 	int res = 0;
-	Camera* _tmp0_ = NULL;
-	GPSpinIdleWrapper* _tmp1_ = NULL;
-	GPContext* _tmp2_ = NULL;
-	int _tmp3_ = 0;
-	int _tmp4_ = 0;
-	gboolean _tmp11_ = FALSE;
-	GtkProgressBar* _tmp12_ = NULL;
+	Camera* _tmp0_;
+	GPSpinIdleWrapper* _tmp1_;
+	GPContext* _tmp2_;
+	int _tmp3_;
+	int _tmp4_;
+	gboolean _tmp10_;
+	GtkProgressBar* _tmp11_;
 	SortedList* jobs = NULL;
-	SortedList* _tmp13_ = NULL;
+	SortedList* _tmp12_;
 	GeeArrayList* already_imported = NULL;
-	GeeArrayList* _tmp14_ = NULL;
-	SortedList* _tmp55_ = NULL;
-	gint _tmp56_ = 0;
-	gint _tmp57_ = 0;
-	const gchar* _tmp58_ = NULL;
-	SortedList* _tmp59_ = NULL;
-	gint _tmp60_ = 0;
-	gint _tmp61_ = 0;
+	GeeArrayList* _tmp13_;
+	SortedList* _tmp54_;
+	gint _tmp55_;
+	gint _tmp56_;
+	const gchar* _tmp57_;
+	SortedList* _tmp58_;
+	gint _tmp59_;
+	gint _tmp60_;
 #line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
 #line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10971,167 +10929,164 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 	_tmp4_ = res;
 #line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ != GP_OK) {
-#line 10969 "ImportPage.c"
-		const gchar* _tmp5_ = NULL;
-		int _tmp6_ = 0;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp5_ = _ ("Unable to lock camera: %s");
+#line 10927 "ImportPage.c"
+		int _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp6_ = res;
+		_tmp5_ = res;
 #line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp7_ = gp_result_to_full_string (_tmp6_);
+		_tmp6_ = gp_result_to_full_string (_tmp5_);
 #line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp9_ = g_strdup_printf (_tmp5_, _tmp8_);
+		_tmp8_ = g_strdup_printf (_ ("Unable to lock camera: %s"), _tmp7_);
 #line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp10_ = _tmp9_;
+		_tmp9_ = _tmp8_;
 #line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		app_window_error_message (_tmp10_, NULL);
+		app_window_error_message (_tmp9_, NULL);
 #line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_free0 (_tmp10_);
+		_g_free0 (_tmp9_);
 #line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_free0 (_tmp8_);
+		_g_free0 (_tmp7_);
 #line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 10996 "ImportPage.c"
+#line 10951 "ImportPage.c"
 	}
 #line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp11_ = self->priv->refreshed;
+	_tmp10_ = self->priv->refreshed;
 #line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_page_update_status (self, TRUE, _tmp11_);
+	import_page_update_status (self, TRUE, _tmp10_);
 #line 1658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
 #line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp12_ = self->priv->progress_bar;
+	_tmp11_ = self->priv->progress_bar;
 #line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE);
+	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp13_ = sorted_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, _import_page_import_job_comparator_comparator, self);
+	_tmp12_ = sorted_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, _import_page_import_job_comparator_comparator, self);
 #line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	jobs = _tmp13_;
+	jobs = _tmp12_;
 #line 1662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp14_ = gee_array_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
+	_tmp13_ = gee_array_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
 #line 1662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	already_imported = _tmp14_;
-#line 11016 "ImportPage.c"
+	already_imported = _tmp13_;
+#line 10971 "ImportPage.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp15_ = NULL;
-		GeeIterator* _tmp16_ = NULL;
+		GeeIterable* _tmp14_;
+		GeeIterator* _tmp15_;
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp15_ = items;
+		_tmp14_ = items;
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp16_ = gee_iterable_iterator (_tmp15_);
+		_tmp15_ = gee_iterable_iterator (_tmp14_);
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_object_it = _tmp16_;
+		_object_it = _tmp15_;
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		while (TRUE) {
-#line 11029 "ImportPage.c"
-			GeeIterator* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
+#line 10984 "ImportPage.c"
+			GeeIterator* _tmp16_;
+			gboolean _tmp17_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp19_ = NULL;
-			gpointer _tmp20_ = NULL;
+			GeeIterator* _tmp18_;
+			gpointer _tmp19_;
 			ImportPreview* preview = NULL;
-			DataObject* _tmp21_ = NULL;
-			ImportPreview* _tmp22_ = NULL;
+			DataObject* _tmp20_;
+			ImportPreview* _tmp21_;
 			ImportSource* import_file = NULL;
-			ImportPreview* _tmp23_ = NULL;
-			DataSource* _tmp24_ = NULL;
-			ImportPreview* _tmp25_ = NULL;
-			gboolean _tmp26_ = FALSE;
+			ImportPreview* _tmp22_;
+			DataSource* _tmp23_;
+			ImportPreview* _tmp24_;
+			gboolean _tmp25_;
 			ImportPageCameraImportJob* import_job = NULL;
-			GPContextWrapper* _tmp38_ = NULL;
-			ImportSource* _tmp39_ = NULL;
-			ImportPageCameraImportJob* _tmp40_ = NULL;
-			gboolean _tmp41_ = FALSE;
-			ImportSource* _tmp42_ = NULL;
-			SortedList* _tmp53_ = NULL;
-			ImportPageCameraImportJob* _tmp54_ = NULL;
+			GPContextWrapper* _tmp37_;
+			ImportSource* _tmp38_;
+			ImportPageCameraImportJob* _tmp39_;
+			gboolean _tmp40_ = FALSE;
+			ImportSource* _tmp41_;
+			SortedList* _tmp52_;
+			ImportPageCameraImportJob* _tmp53_;
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp17_ = _object_it;
+			_tmp16_ = _object_it;
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp18_ = gee_iterator_next (_tmp17_);
+			_tmp17_ = gee_iterator_next (_tmp16_);
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (!_tmp18_) {
+			if (!_tmp17_) {
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 11059 "ImportPage.c"
+#line 11014 "ImportPage.c"
 			}
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp19_ = _object_it;
+			_tmp18_ = _object_it;
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp20_ = gee_iterator_get (_tmp19_);
+			_tmp19_ = gee_iterator_get (_tmp18_);
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			object = (DataObject*) _tmp20_;
+			object = (DataObject*) _tmp19_;
 #line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp21_ = object;
+			_tmp20_ = object;
 #line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_IMPORT_PREVIEW, ImportPreview));
+			_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_IMPORT_PREVIEW, ImportPreview));
 #line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			preview = _tmp22_;
+			preview = _tmp21_;
 #line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp23_ = preview;
+			_tmp22_ = preview;
 #line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp24_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_VIEW, DataView));
+			_tmp23_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_VIEW, DataView));
 #line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			import_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_IMPORT_SOURCE, ImportSource);
+			import_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_IMPORT_SOURCE, ImportSource);
 #line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp25_ = preview;
+			_tmp24_ = preview;
 #line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp26_ = import_preview_is_already_imported (_tmp25_);
+			_tmp25_ = import_preview_is_already_imported (_tmp24_);
 #line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (_tmp26_) {
-#line 11085 "ImportPage.c"
-				ImportSource* _tmp27_ = NULL;
-				gchar* _tmp28_ = NULL;
-				gchar* _tmp29_ = NULL;
-				GeeArrayList* _tmp30_ = NULL;
-				GPContextWrapper* _tmp31_ = NULL;
-				ImportSource* _tmp32_ = NULL;
-				ImportPreview* _tmp33_ = NULL;
-				DuplicatedFile* _tmp34_ = NULL;
-				DuplicatedFile* _tmp35_ = NULL;
-				ImportPageCameraImportJob* _tmp36_ = NULL;
-				ImportPageCameraImportJob* _tmp37_ = NULL;
+			if (_tmp25_) {
+#line 11040 "ImportPage.c"
+				ImportSource* _tmp26_;
+				gchar* _tmp27_;
+				gchar* _tmp28_;
+				GeeArrayList* _tmp29_;
+				GPContextWrapper* _tmp30_;
+				ImportSource* _tmp31_;
+				ImportPreview* _tmp32_;
+				DuplicatedFile* _tmp33_;
+				DuplicatedFile* _tmp34_;
+				ImportPageCameraImportJob* _tmp35_;
+				ImportPageCameraImportJob* _tmp36_;
 #line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp27_ = import_file;
+				_tmp26_ = import_file;
 #line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp28_ = import_source_get_filename (_tmp27_);
+				_tmp27_ = import_source_get_filename (_tmp26_);
 #line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp29_ = _tmp28_;
+				_tmp28_ = _tmp27_;
 #line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_message ("ImportPage.vala:1669: Skipping import of %s: checksum detected in libr" \
-"ary", _tmp29_);
+"ary", _tmp28_);
 #line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_g_free0 (_tmp29_);
+				_g_free0 (_tmp28_);
 #line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp30_ = already_imported;
+				_tmp29_ = already_imported;
 #line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp31_ = import_page_null_context;
+				_tmp30_ = import_page_null_context;
 #line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp32_ = import_file;
+				_tmp31_ = import_file;
 #line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp33_ = preview;
+				_tmp32_ = preview;
 #line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp34_ = import_preview_get_duplicated_file (_tmp33_);
+				_tmp33_ = import_preview_get_duplicated_file (_tmp32_);
 #line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp35_ = _tmp34_;
+				_tmp34_ = _tmp33_;
 #line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp36_ = import_page_camera_import_job_new (_tmp31_, _tmp32_, _tmp35_);
+				_tmp35_ = import_page_camera_import_job_new (_tmp30_, _tmp31_, _tmp34_);
 #line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp37_ = _tmp36_;
+				_tmp36_ = _tmp35_;
 #line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp37_);
+				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp36_);
 #line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_batch_import_job_unref0 (_tmp37_);
+				_batch_import_job_unref0 (_tmp36_);
 #line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_g_object_unref0 (_tmp35_);
+				_g_object_unref0 (_tmp34_);
 #line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (import_file);
 #line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11140,78 +11095,78 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 				_g_object_unref0 (object);
 #line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				continue;
-#line 11137 "ImportPage.c"
+#line 11092 "ImportPage.c"
 			}
 #line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp38_ = import_page_null_context;
+			_tmp37_ = import_page_null_context;
 #line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp39_ = import_file;
+			_tmp38_ = import_file;
 #line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp40_ = import_page_camera_import_job_new (_tmp38_, _tmp39_, NULL);
+			_tmp39_ = import_page_camera_import_job_new (_tmp37_, _tmp38_, NULL);
 #line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			import_job = _tmp40_;
+			import_job = _tmp39_;
 #line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp42_ = import_file;
+			_tmp41_ = import_file;
 #line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 11151 "ImportPage.c"
-				ImportSource* _tmp43_ = NULL;
-				PhotoImportSource* _tmp44_ = NULL;
-				PhotoImportSource* _tmp45_ = NULL;
+			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, TYPE_PHOTO_IMPORT_SOURCE)) {
+#line 11106 "ImportPage.c"
+				ImportSource* _tmp42_;
+				PhotoImportSource* _tmp43_;
+				PhotoImportSource* _tmp44_;
 #line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp43_ = import_file;
+				_tmp42_ = import_file;
 #line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp44_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
+				_tmp43_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
 #line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp45_ = _tmp44_;
+				_tmp44_ = _tmp43_;
 #line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp41_ = _tmp45_ != NULL;
+				_tmp40_ = _tmp44_ != NULL;
 #line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_g_object_unref0 (_tmp45_);
-#line 11165 "ImportPage.c"
+				_g_object_unref0 (_tmp44_);
+#line 11120 "ImportPage.c"
 			} else {
 #line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp41_ = FALSE;
-#line 11169 "ImportPage.c"
+				_tmp40_ = FALSE;
+#line 11124 "ImportPage.c"
 			}
 #line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (_tmp41_) {
-#line 11173 "ImportPage.c"
-				ImportPageCameraImportJob* _tmp46_ = NULL;
-				GPContextWrapper* _tmp47_ = NULL;
-				ImportSource* _tmp48_ = NULL;
-				PhotoImportSource* _tmp49_ = NULL;
-				PhotoImportSource* _tmp50_ = NULL;
-				ImportPageCameraImportJob* _tmp51_ = NULL;
-				ImportPageCameraImportJob* _tmp52_ = NULL;
+			if (_tmp40_) {
+#line 11128 "ImportPage.c"
+				ImportPageCameraImportJob* _tmp45_;
+				GPContextWrapper* _tmp46_;
+				ImportSource* _tmp47_;
+				PhotoImportSource* _tmp48_;
+				PhotoImportSource* _tmp49_;
+				ImportPageCameraImportJob* _tmp50_;
+				ImportPageCameraImportJob* _tmp51_;
 #line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp46_ = import_job;
+				_tmp45_ = import_job;
 #line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp47_ = import_page_null_context;
+				_tmp46_ = import_page_null_context;
 #line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp48_ = import_file;
+				_tmp47_ = import_file;
 #line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp49_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
+				_tmp48_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
 #line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp50_ = _tmp49_;
+				_tmp49_ = _tmp48_;
 #line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp51_ = import_page_camera_import_job_new (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_IMPORT_SOURCE, ImportSource), NULL);
+				_tmp50_ = import_page_camera_import_job_new (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_IMPORT_SOURCE, ImportSource), NULL);
 #line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp52_ = _tmp51_;
+				_tmp51_ = _tmp50_;
 #line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				batch_import_job_set_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_BATCH_IMPORT_JOB, BatchImportJob), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
+				batch_import_job_set_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_BATCH_IMPORT_JOB, BatchImportJob), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
 #line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_batch_import_job_unref0 (_tmp52_);
+				_batch_import_job_unref0 (_tmp51_);
 #line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_g_object_unref0 (_tmp50_);
-#line 11201 "ImportPage.c"
+				_g_object_unref0 (_tmp49_);
+#line 11156 "ImportPage.c"
 			}
 #line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp53_ = jobs;
+			_tmp52_ = jobs;
 #line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp54_ = import_job;
+			_tmp53_ = import_job;
 #line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), _tmp54_);
+			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), _tmp53_);
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_batch_import_job_unref0 (import_job);
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11220,138 +11175,138 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 			_g_object_unref0 (preview);
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (object);
-#line 11217 "ImportPage.c"
+#line 11172 "ImportPage.c"
 		}
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_object_it);
-#line 11221 "ImportPage.c"
+#line 11176 "ImportPage.c"
 	}
 #line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp55_ = jobs;
+	_tmp54_ = jobs;
 #line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp56_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp55_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp57_ = _tmp56_;
+	_tmp56_ = _tmp55_;
 #line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp58_ = self->priv->camera_name;
+	_tmp57_ = self->priv->camera_name;
 #line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_debug ("ImportPage.vala:1690: Importing %d files from %s", _tmp57_, _tmp58_);
+	g_debug ("ImportPage.vala:1690: Importing %d files from %s", _tmp56_, _tmp57_);
 #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp59_ = jobs;
+	_tmp58_ = jobs;
 #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp60_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp59_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp61_ = _tmp60_;
+	_tmp60_ = _tmp59_;
 #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp61_ > 0) {
-#line 11241 "ImportPage.c"
-		ImportPage* _tmp62_ = NULL;
-		ImportPage* _tmp63_ = NULL;
+	if (_tmp60_ > 0) {
+#line 11196 "ImportPage.c"
+		ImportPage* _tmp61_;
+		ImportPage* _tmp62_;
 		BatchImport* batch_import = NULL;
-		SortedList* _tmp64_ = NULL;
-		const gchar* _tmp65_ = NULL;
-		GeeArrayList* _tmp66_ = NULL;
-		BatchImport* _tmp67_ = NULL;
-		BatchImport* _tmp68_ = NULL;
-		BatchImport* _tmp69_ = NULL;
-		LibraryWindow* _tmp70_ = NULL;
-		LibraryWindow* _tmp71_ = NULL;
-		BatchImport* _tmp72_ = NULL;
-		LibraryWindow* _tmp73_ = NULL;
-		LibraryWindow* _tmp74_ = NULL;
+		SortedList* _tmp63_;
+		const gchar* _tmp64_;
+		GeeArrayList* _tmp65_;
+		BatchImport* _tmp66_;
+		BatchImport* _tmp67_;
+		BatchImport* _tmp68_;
+		LibraryWindow* _tmp69_;
+		LibraryWindow* _tmp70_;
+		BatchImport* _tmp71_;
+		LibraryWindow* _tmp72_;
+		LibraryWindow* _tmp73_;
 #line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp62_ = self->priv->local_ref;
+		_tmp61_ = self->priv->local_ref;
 #line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_vala_assert (_tmp62_ == NULL, "local_ref == null");
+		_vala_assert (_tmp61_ == NULL, "local_ref == null");
 #line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp63_ = _g_object_ref0 (self);
+		_tmp62_ = _g_object_ref0 (self);
 #line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (self->priv->local_ref);
 #line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		self->priv->local_ref = _tmp63_;
+		self->priv->local_ref = _tmp62_;
 #line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp64_ = jobs;
+		_tmp63_ = jobs;
 #line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp65_ = self->priv->camera_name;
+		_tmp64_ = self->priv->camera_name;
 #line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp66_ = already_imported;
+		_tmp65_ = already_imported;
 #line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp67_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ITERABLE, GeeIterable), _tmp65_, _import_page_import_reporter_batch_import_import_reporter, self, NULL, _tmp66_, NULL, NULL, NULL);
+		_tmp66_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ITERABLE, GeeIterable), _tmp64_, _import_page_import_reporter_batch_import_import_reporter, self, NULL, _tmp65_, NULL, NULL, NULL);
 #line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		batch_import = _tmp67_;
+		batch_import = _tmp66_;
 #line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp68_ = batch_import;
+		_tmp67_ = batch_import;
 #line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_signal_connect_object (_tmp68_, "import-job-failed", (GCallback) _import_page_on_import_job_failed_batch_import_import_job_failed, self, 0);
+		g_signal_connect_object (_tmp67_, "import-job-failed", (GCallback) _import_page_on_import_job_failed_batch_import_import_job_failed, self, 0);
 #line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp69_ = batch_import;
+		_tmp68_ = batch_import;
 #line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_signal_connect_object (_tmp69_, "import-complete", (GCallback) _import_page_close_import_batch_import_import_complete, self, 0);
+		g_signal_connect_object (_tmp68_, "import-complete", (GCallback) _import_page_close_import_batch_import_import_complete, self, 0);
 #line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp70_ = library_window_get_app ();
+		_tmp69_ = library_window_get_app ();
 #line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp71_ = _tmp70_;
+		_tmp70_ = _tmp69_;
 #line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp72_ = batch_import;
+		_tmp71_ = batch_import;
 #line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		library_window_enqueue_batch_import (_tmp71_, _tmp72_, TRUE);
+		library_window_enqueue_batch_import (_tmp70_, _tmp71_, TRUE);
 #line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_object_unref0 (_tmp71_);
+		_g_object_unref0 (_tmp70_);
 #line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp73_ = library_window_get_app ();
+		_tmp72_ = library_window_get_app ();
 #line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp74_ = _tmp73_;
+		_tmp73_ = _tmp72_;
 #line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		library_window_switch_to_import_queue_page (_tmp74_);
+		library_window_switch_to_import_queue_page (_tmp73_);
 #line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_object_unref0 (_tmp74_);
+		_g_object_unref0 (_tmp73_);
 #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (batch_import);
-#line 11304 "ImportPage.c"
+#line 11259 "ImportPage.c"
 	} else {
-		GeeArrayList* _tmp75_ = NULL;
-		gint _tmp76_ = 0;
-		gint _tmp77_ = 0;
+		GeeArrayList* _tmp74_;
+		gint _tmp75_;
+		gint _tmp76_;
 #line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp75_ = already_imported;
+		_tmp74_ = already_imported;
 #line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp76_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+		_tmp75_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp77_ = _tmp76_;
+		_tmp76_ = _tmp75_;
 #line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		if (_tmp77_ > 0) {
-#line 11317 "ImportPage.c"
-			GeeArrayList* _tmp78_ = NULL;
-			ImportManifest* _tmp79_ = NULL;
-			ImportManifest* _tmp80_ = NULL;
+		if (_tmp76_ > 0) {
+#line 11272 "ImportPage.c"
+			GeeArrayList* _tmp77_;
+			ImportManifest* _tmp78_;
+			ImportManifest* _tmp79_;
 #line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp78_ = already_imported;
+			_tmp77_ = already_imported;
 #line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp79_ = import_manifest_new (NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, GEE_TYPE_LIST, GeeList));
+			_tmp78_ = import_manifest_new (NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_LIST, GeeList));
 #line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp80_ = _tmp79_;
+			_tmp79_ = _tmp78_;
 #line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			import_page_import_reporter (self, _tmp80_);
+			import_page_import_reporter (self, _tmp79_);
 #line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_import_manifest_unref0 (_tmp80_);
-#line 11331 "ImportPage.c"
+			_import_manifest_unref0 (_tmp79_);
+#line 11286 "ImportPage.c"
 		}
 #line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_close_import (self);
-#line 11335 "ImportPage.c"
+#line 11290 "ImportPage.c"
 	}
 #line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (already_imported);
 #line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (jobs);
-#line 11341 "ImportPage.c"
+#line 11296 "ImportPage.c"
 }
 
 
 static void import_page_on_import_job_failed (ImportPage* self, BatchImportResult* _result_) {
 	gboolean _tmp0_ = FALSE;
-	BatchImportResult* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	BatchImportResult* _tmp1_;
+	GFile* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
@@ -11365,27 +11320,27 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 	if (_tmp2_ == NULL) {
 #line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = TRUE;
-#line 11362 "ImportPage.c"
+#line 11317 "ImportPage.c"
 	} else {
-		BatchImportResult* _tmp3_ = NULL;
-		ImportResult _tmp4_ = 0;
+		BatchImportResult* _tmp3_;
+		ImportResult _tmp4_;
 #line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = _result_;
 #line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = _tmp3_->result;
 #line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp4_ == IMPORT_RESULT_SUCCESS;
-#line 11372 "ImportPage.c"
+#line 11327 "ImportPage.c"
 	}
 #line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
 #line 1716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 11378 "ImportPage.c"
+#line 11333 "ImportPage.c"
 	}
 	{
-		BatchImportResult* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
+		BatchImportResult* _tmp5_;
+		GFile* _tmp6_;
 #line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = _result_;
 #line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11394,20 +11349,20 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 		g_file_delete (_tmp6_, NULL, &_inner_error_);
 #line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11391 "ImportPage.c"
-			goto __catch71_g_error;
+#line 11346 "ImportPage.c"
+			goto __catch72_g_error;
 		}
 	}
-	goto __finally71;
-	__catch71_g_error:
+	goto __finally72;
+	__catch72_g_error:
 	{
 		GError* err = NULL;
-		BatchImportResult* _tmp7_ = NULL;
-		GFile* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		GError* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
+		BatchImportResult* _tmp7_;
+		GFile* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+		GError* _tmp11_;
+		const gchar* _tmp12_;
 #line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		err = _inner_error_;
 #line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11430,9 +11385,9 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 		_g_free0 (_tmp10_);
 #line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_error_free0 (err);
-#line 11427 "ImportPage.c"
+#line 11382 "ImportPage.c"
 	}
-	__finally71:
+	__finally72:
 #line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11441,7 +11396,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 		g_clear_error (&_inner_error_);
 #line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 11438 "ImportPage.c"
+#line 11393 "ImportPage.c"
 	}
 }
 
@@ -11449,7 +11404,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 static gpointer _batch_import_job_ref0 (gpointer self) {
 #line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? batch_import_job_ref (self) : NULL;
-#line 11446 "ImportPage.c"
+#line 11401 "ImportPage.c"
 }
 
 
@@ -11458,36 +11413,35 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin
 	result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
 #line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 11455 "ImportPage.c"
+#line 11410 "ImportPage.c"
 }
 
 
 static void import_page_import_reporter (ImportPage* self, ImportManifest* manifest) {
 	ImportPage* local_ref = NULL;
-	ImportPage* _tmp0_ = NULL;
-	ImportPage* _tmp1_ = NULL;
-	ImportManifest* _tmp2_ = NULL;
-	GeeList* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	ImportPage* _tmp0_;
+	ImportPage* _tmp1_;
+	ImportManifest* _tmp2_;
+	GeeList* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 	Marker* marker = NULL;
-	SourceCollection* _tmp60_ = NULL;
-	Marker* _tmp61_ = NULL;
+	SourceCollection* _tmp55_;
+	Marker* _tmp56_;
 	ProgressDialog* progress = NULL;
-	AppWindow* _tmp81_ = NULL;
-	AppWindow* _tmp82_ = NULL;
-	const gchar* _tmp83_ = NULL;
-	GCancellable* _tmp84_ = NULL;
-	GCancellable* _tmp85_ = NULL;
-	ProgressDialog* _tmp86_ = NULL;
-	ProgressDialog* _tmp87_ = NULL;
+	AppWindow* _tmp76_;
+	AppWindow* _tmp77_;
+	GCancellable* _tmp78_;
+	GCancellable* _tmp79_;
+	ProgressDialog* _tmp80_;
+	ProgressDialog* _tmp81_;
 	gint error_count = 0;
-	SourceCollection* _tmp88_ = NULL;
-	Marker* _tmp89_ = NULL;
-	ProgressDialog* _tmp90_ = NULL;
-	gint _tmp91_ = 0;
-	gint _tmp92_ = 0;
-	ProgressDialog* _tmp98_ = NULL;
+	SourceCollection* _tmp82_;
+	Marker* _tmp83_;
+	ProgressDialog* _tmp84_;
+	gint _tmp85_;
+	gint _tmp86_;
+	ProgressDialog* _tmp91_;
 #line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
 #line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11512,66 +11466,61 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 	_tmp5_ = _tmp4_;
 #line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_ > 0) {
-#line 11509 "ImportPage.c"
+#line 11463 "ImportPage.c"
 		gchar* photos_string = NULL;
-		ImportManifest* _tmp6_ = NULL;
-		GeeList* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
-		const gchar* _tmp10_ = NULL;
-		ImportManifest* _tmp11_ = NULL;
-		GeeList* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
-		gchar* _tmp15_ = NULL;
+		ImportManifest* _tmp6_;
+		GeeList* _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
+		ImportManifest* _tmp10_;
+		GeeList* _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
+		gchar* _tmp14_;
 		gchar* videos_string = NULL;
-		ImportManifest* _tmp16_ = NULL;
-		GeeList* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
-		const gchar* _tmp20_ = NULL;
-		ImportManifest* _tmp21_ = NULL;
-		GeeList* _tmp22_ = NULL;
-		gint _tmp23_ = 0;
-		gint _tmp24_ = 0;
-		gchar* _tmp25_ = NULL;
+		ImportManifest* _tmp15_;
+		GeeList* _tmp16_;
+		gint _tmp17_;
+		gint _tmp18_;
+		ImportManifest* _tmp19_;
+		GeeList* _tmp20_;
+		gint _tmp21_;
+		gint _tmp22_;
+		gchar* _tmp23_;
 		gchar* both_string = NULL;
-		ImportManifest* _tmp26_ = NULL;
-		GeeList* _tmp27_ = NULL;
-		gint _tmp28_ = 0;
-		gint _tmp29_ = 0;
-		const gchar* _tmp30_ = NULL;
-		ImportManifest* _tmp31_ = NULL;
-		GeeList* _tmp32_ = NULL;
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
-		gchar* _tmp35_ = NULL;
+		ImportManifest* _tmp24_;
+		GeeList* _tmp25_;
+		gint _tmp26_;
+		gint _tmp27_;
+		ImportManifest* _tmp28_;
+		GeeList* _tmp29_;
+		gint _tmp30_;
+		gint _tmp31_;
+		gchar* _tmp32_;
 		gchar* neither_string = NULL;
-		ImportManifest* _tmp36_ = NULL;
-		GeeList* _tmp37_ = NULL;
-		gint _tmp38_ = 0;
-		gint _tmp39_ = 0;
-		const gchar* _tmp40_ = NULL;
-		ImportManifest* _tmp41_ = NULL;
-		GeeList* _tmp42_ = NULL;
-		gint _tmp43_ = 0;
-		gint _tmp44_ = 0;
-		gchar* _tmp45_ = NULL;
+		ImportManifest* _tmp33_;
+		GeeList* _tmp34_;
+		gint _tmp35_;
+		gint _tmp36_;
+		ImportManifest* _tmp37_;
+		GeeList* _tmp38_;
+		gint _tmp39_;
+		gint _tmp40_;
+		gchar* _tmp41_;
 		gchar* question_string = NULL;
-		ImportManifest* _tmp46_ = NULL;
-		GeeList* _tmp47_ = NULL;
-		const gchar* _tmp48_ = NULL;
-		const gchar* _tmp49_ = NULL;
-		const gchar* _tmp50_ = NULL;
-		const gchar* _tmp51_ = NULL;
-		gchar* _tmp52_ = NULL;
+		ImportManifest* _tmp42_;
+		GeeList* _tmp43_;
+		const gchar* _tmp44_;
+		const gchar* _tmp45_;
+		const gchar* _tmp46_;
+		const gchar* _tmp47_;
+		gchar* _tmp48_;
 		ImportUIQuestionParams* question = NULL;
-		const gchar* _tmp53_ = NULL;
-		const gchar* _tmp54_ = NULL;
-		ImportUIQuestionParams* _tmp55_ = NULL;
-		ImportManifest* _tmp56_ = NULL;
-		ImportUIQuestionParams* _tmp57_ = NULL;
-		gboolean _tmp58_ = FALSE;
+		const gchar* _tmp49_;
+		ImportUIQuestionParams* _tmp50_;
+		ImportManifest* _tmp51_;
+		ImportUIQuestionParams* _tmp52_;
+		gboolean _tmp53_;
 #line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = manifest;
 #line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11581,117 +11530,107 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 #line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = _tmp8_;
 #line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp10_ = ngettext ("Delete this photo from camera?", "Delete these %d photos from camera?", (gulong) _tmp9_);
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp11_ = manifest;
+		_tmp10_ = manifest;
 #line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp12_ = _tmp11_->success;
+		_tmp11_ = _tmp10_->success;
 #line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp14_ = _tmp13_;
+		_tmp13_ = _tmp12_;
 #line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp15_ = g_strdup_printf (_tmp10_, _tmp14_);
+		_tmp14_ = g_strdup_printf (ngettext ("Delete this photo from camera?", "Delete these %d photos from camera?", (gulong) _tmp9_), _tmp13_);
 #line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		photos_string = _tmp15_;
+		photos_string = _tmp14_;
 #line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp16_ = manifest;
+		_tmp15_ = manifest;
 #line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp17_ = _tmp16_->success;
+		_tmp16_ = _tmp15_->success;
 #line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp19_ = _tmp18_;
+		_tmp18_ = _tmp17_;
 #line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp20_ = ngettext ("Delete this video from camera?", "Delete these %d videos from camera?", (gulong) _tmp19_);
+		_tmp19_ = manifest;
 #line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp21_ = manifest;
+		_tmp20_ = _tmp19_->success;
 #line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp22_ = _tmp21_->success;
+		_tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp24_ = _tmp23_;
+		_tmp22_ = _tmp21_;
 #line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp25_ = g_strdup_printf (_tmp20_, _tmp24_);
+		_tmp23_ = g_strdup_printf (ngettext ("Delete this video from camera?", "Delete these %d videos from camera?", (gulong) _tmp18_), _tmp22_);
 #line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		videos_string = _tmp25_;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp26_ = manifest;
+		videos_string = _tmp23_;
 #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp27_ = _tmp26_->success;
+		_tmp24_ = manifest;
 #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp25_ = _tmp24_->success;
 #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp29_ = _tmp28_;
+		_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp30_ = ngettext ("Delete this photo/video from camera?", "Delete these %d photos/videos from camera?", (gulong) _tmp29_);
+		_tmp27_ = _tmp26_;
 #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp31_ = manifest;
+		_tmp28_ = manifest;
 #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp32_ = _tmp31_->success;
+		_tmp29_ = _tmp28_->success;
 #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp33_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp34_ = _tmp33_;
+		_tmp31_ = _tmp30_;
 #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp35_ = g_strdup_printf (_tmp30_, _tmp34_);
+		_tmp32_ = g_strdup_printf (ngettext ("Delete this photo/video from camera?", "Delete these %d photos/videos from camera?", (gulong) _tmp27_), _tmp31_);
 #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		both_string = _tmp35_;
+		both_string = _tmp32_;
 #line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp36_ = manifest;
+		_tmp33_ = manifest;
 #line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp37_ = _tmp36_->success;
+		_tmp34_ = _tmp33_->success;
 #line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp38_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp35_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp39_ = _tmp38_;
+		_tmp36_ = _tmp35_;
 #line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp40_ = ngettext ("Delete these files from camera?", "Delete these %d files from camera?", (gulong) _tmp39_);
+		_tmp37_ = manifest;
 #line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp41_ = manifest;
+		_tmp38_ = _tmp37_->success;
 #line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp42_ = _tmp41_->success;
+		_tmp39_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp43_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp40_ = _tmp39_;
 #line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp44_ = _tmp43_;
+		_tmp41_ = g_strdup_printf (ngettext ("Delete these files from camera?", "Delete these %d files from camera?", (gulong) _tmp36_), _tmp40_);
 #line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp45_ = g_strdup_printf (_tmp40_, _tmp44_);
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		neither_string = _tmp45_;
+		neither_string = _tmp41_;
 #line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp46_ = manifest;
+		_tmp42_ = manifest;
 #line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp47_ = _tmp46_->success;
+		_tmp43_ = _tmp42_->success;
 #line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp48_ = photos_string;
+		_tmp44_ = photos_string;
 #line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp49_ = videos_string;
+		_tmp45_ = videos_string;
 #line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp50_ = both_string;
+		_tmp46_ = both_string;
 #line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp51_ = neither_string;
+		_tmp47_ = neither_string;
 #line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp52_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_COLLECTION, GeeCollection), _tmp48_, _tmp49_, _tmp50_, _tmp51_);
+		_tmp48_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection), _tmp44_, _tmp45_, _tmp46_, _tmp47_);
 #line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		question_string = _tmp52_;
-#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp53_ = question_string;
+		question_string = _tmp48_;
 #line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp54_ = _ ("_Keep");
+		_tmp49_ = question_string;
 #line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp55_ = import_ui_question_params_new (_tmp53_, RESOURCES_DELETE_LABEL, _tmp54_);
+		_tmp50_ = import_ui_question_params_new (_tmp49_, RESOURCES_DELETE_LABEL, _ ("_Keep"));
 #line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		question = _tmp55_;
+		question = _tmp50_;
 #line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp56_ = manifest;
+		_tmp51_ = manifest;
 #line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp57_ = question;
+		_tmp52_ = question;
 #line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp58_ = import_ui_report_manifest (_tmp56_, FALSE, _tmp57_);
+		_tmp53_ = import_ui_report_manifest (_tmp51_, FALSE, _tmp52_);
 #line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		if (!_tmp58_) {
+		if (!_tmp53_) {
 #line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_import_ui_question_params_unref0 (question);
 #line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11708,7 +11647,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 			_g_object_unref0 (local_ref);
 #line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return;
-#line 11705 "ImportPage.c"
+#line 11644 "ImportPage.c"
 		}
 #line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_import_ui_question_params_unref0 (question);
@@ -11722,189 +11661,184 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 		_g_free0 (videos_string);
 #line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (photos_string);
-#line 11719 "ImportPage.c"
+#line 11658 "ImportPage.c"
 	} else {
-		ImportManifest* _tmp59_ = NULL;
+		ImportManifest* _tmp54_;
 #line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp59_ = manifest;
+		_tmp54_ = manifest;
 #line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		import_ui_report_manifest (_tmp59_, FALSE, NULL);
+		import_ui_report_manifest (_tmp54_, FALSE, NULL);
 #line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (local_ref);
 #line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 11730 "ImportPage.c"
+#line 11669 "ImportPage.c"
 	}
 #line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp60_ = self->priv->import_sources;
+	_tmp55_ = self->priv->import_sources;
 #line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp61_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_COLLECTION, DataCollection));
+	_tmp56_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_DATA_COLLECTION, DataCollection));
 #line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	marker = _tmp61_;
-#line 11738 "ImportPage.c"
+	marker = _tmp56_;
+#line 11677 "ImportPage.c"
 	{
 		GeeList* _batch_result_list = NULL;
-		ImportManifest* _tmp62_ = NULL;
-		GeeList* _tmp63_ = NULL;
-		GeeList* _tmp64_ = NULL;
+		ImportManifest* _tmp57_;
+		GeeList* _tmp58_;
+		GeeList* _tmp59_;
 		gint _batch_result_size = 0;
-		GeeList* _tmp65_ = NULL;
-		gint _tmp66_ = 0;
-		gint _tmp67_ = 0;
+		GeeList* _tmp60_;
+		gint _tmp61_;
+		gint _tmp62_;
 		gint _batch_result_index = 0;
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp62_ = manifest;
+		_tmp57_ = manifest;
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp63_ = _tmp62_->success;
+		_tmp58_ = _tmp57_->success;
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp64_ = _g_object_ref0 (_tmp63_);
+		_tmp59_ = _g_object_ref0 (_tmp58_);
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_batch_result_list = _tmp64_;
+		_batch_result_list = _tmp59_;
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp65_ = _batch_result_list;
+		_tmp60_ = _batch_result_list;
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp66_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp61_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp67_ = _tmp66_;
+		_tmp62_ = _tmp61_;
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_batch_result_size = _tmp67_;
+		_batch_result_size = _tmp62_;
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_batch_result_index = -1;
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		while (TRUE) {
-#line 11769 "ImportPage.c"
-			gint _tmp68_ = 0;
-			gint _tmp69_ = 0;
-			gint _tmp70_ = 0;
+#line 11708 "ImportPage.c"
+			gint _tmp63_;
+			gint _tmp64_;
+			gint _tmp65_;
 			BatchImportResult* batch_result = NULL;
-			GeeList* _tmp71_ = NULL;
-			gint _tmp72_ = 0;
-			gpointer _tmp73_ = NULL;
+			GeeList* _tmp66_;
+			gint _tmp67_;
+			gpointer _tmp68_;
 			ImportPageCameraImportJob* job = NULL;
-			BatchImportResult* _tmp74_ = NULL;
-			BatchImportJob* _tmp75_ = NULL;
-			ImportPageCameraImportJob* _tmp76_ = NULL;
-			Marker* _tmp77_ = NULL;
-			ImportPageCameraImportJob* _tmp78_ = NULL;
-			ImportSource* _tmp79_ = NULL;
-			ImportSource* _tmp80_ = NULL;
+			BatchImportResult* _tmp69_;
+			BatchImportJob* _tmp70_;
+			ImportPageCameraImportJob* _tmp71_;
+			Marker* _tmp72_;
+			ImportPageCameraImportJob* _tmp73_;
+			ImportSource* _tmp74_;
+			ImportSource* _tmp75_;
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp68_ = _batch_result_index;
+			_tmp63_ = _batch_result_index;
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_batch_result_index = _tmp68_ + 1;
+			_batch_result_index = _tmp63_ + 1;
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp69_ = _batch_result_index;
+			_tmp64_ = _batch_result_index;
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp70_ = _batch_result_size;
+			_tmp65_ = _batch_result_size;
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (!(_tmp69_ < _tmp70_)) {
+			if (!(_tmp64_ < _tmp65_)) {
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 11797 "ImportPage.c"
+#line 11736 "ImportPage.c"
 			}
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp71_ = _batch_result_list;
+			_tmp66_ = _batch_result_list;
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp72_ = _batch_result_index;
+			_tmp67_ = _batch_result_index;
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp73_ = gee_list_get (_tmp71_, _tmp72_);
+			_tmp68_ = gee_list_get (_tmp66_, _tmp67_);
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			batch_result = (BatchImportResult*) _tmp73_;
+			batch_result = (BatchImportResult*) _tmp68_;
 #line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp74_ = batch_result;
+			_tmp69_ = batch_result;
 #line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp75_ = _tmp74_->job;
+			_tmp70_ = _tmp69_->job;
 #line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp76_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) _tmp75_) : NULL);
+			_tmp71_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp70_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) _tmp70_) : NULL);
 #line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			job = _tmp76_;
+			job = _tmp71_;
 #line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp77_ = marker;
+			_tmp72_ = marker;
 #line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp78_ = job;
+			_tmp73_ = job;
 #line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp79_ = import_page_camera_import_job_get_source (_tmp78_);
+			_tmp74_ = import_page_camera_import_job_get_source (_tmp73_);
 #line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp80_ = _tmp79_;
+			_tmp75_ = _tmp74_;
 #line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			marker_mark (_tmp77_, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_DATA_OBJECT, DataObject));
+			marker_mark (_tmp72_, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_DATA_OBJECT, DataObject));
 #line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_object_unref0 (_tmp80_);
+			_g_object_unref0 (_tmp75_);
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_batch_import_job_unref0 (job);
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_batch_import_result_unref0 (batch_result);
-#line 11831 "ImportPage.c"
+#line 11770 "ImportPage.c"
 		}
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_batch_result_list);
-#line 11835 "ImportPage.c"
+#line 11774 "ImportPage.c"
 	}
 #line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp81_ = app_window_get_instance ();
+	_tmp76_ = app_window_get_instance ();
 #line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp82_ = _tmp81_;
+	_tmp77_ = _tmp76_;
 #line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp83_ = _ ("Removing photos/videos from camera");
+	_tmp78_ = g_cancellable_new ();
 #line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp84_ = g_cancellable_new ();
+	_tmp79_ = _tmp78_;
 #line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp85_ = _tmp84_;
+	_tmp80_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_window_get_type (), GtkWindow), _ ("Removing photos/videos from camera"), _tmp79_);
 #line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp86_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_window_get_type (), GtkWindow), _tmp83_, _tmp85_);
+	g_object_ref_sink (_tmp80_);
 #line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_object_ref_sink (_tmp86_);
+	_tmp81_ = _tmp80_;
 #line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp87_ = _tmp86_;
+	_g_object_unref0 (_tmp79_);
 #line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_g_object_unref0 (_tmp85_);
+	_g_object_unref0 (_tmp77_);
 #line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_g_object_unref0 (_tmp82_);
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	progress = _tmp87_;
+	progress = _tmp81_;
 #line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp88_ = self->priv->import_sources;
+	_tmp82_ = self->priv->import_sources;
 #line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp89_ = marker;
+	_tmp83_ = marker;
 #line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp90_ = progress;
+	_tmp84_ = progress;
 #line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp91_ = source_collection_destroy_marked (_tmp88_, _tmp89_, TRUE, _progress_dialog_monitor_progress_monitor, _tmp90_, NULL);
+	_tmp85_ = source_collection_destroy_marked (_tmp82_, _tmp83_, TRUE, _progress_dialog_monitor_progress_monitor, _tmp84_, NULL);
 #line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	error_count = _tmp91_;
+	error_count = _tmp85_;
 #line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp92_ = error_count;
+	_tmp86_ = error_count;
 #line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp92_ > 0) {
-#line 11873 "ImportPage.c"
+	if (_tmp86_ > 0) {
+#line 11810 "ImportPage.c"
 		gchar* error_string = NULL;
-		gint _tmp93_ = 0;
-		const gchar* _tmp94_ = NULL;
-		gint _tmp95_ = 0;
-		gchar* _tmp96_ = NULL;
-		const gchar* _tmp97_ = NULL;
-#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp93_ = error_count;
+		gint _tmp87_;
+		gint _tmp88_;
+		gchar* _tmp89_;
+		const gchar* _tmp90_;
 #line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp94_ = ngettext ("Unable to delete %d photo/video from the camera due to errors.", "Unable to delete %d photos/videos from the camera due to errors.", (gulong) _tmp93_);
+		_tmp87_ = error_count;
 #line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp95_ = error_count;
+		_tmp88_ = error_count;
 #line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp96_ = g_strdup_printf (_tmp94_, _tmp95_);
+		_tmp89_ = g_strdup_printf (ngettext ("Unable to delete %d photo/video from the camera due to errors.", "Unable to delete %d photos/videos from the camera due to errors.", (gulong) _tmp87_), _tmp88_);
 #line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		error_string = _tmp96_;
+		error_string = _tmp89_;
 #line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp97_ = error_string;
+		_tmp90_ = error_string;
 #line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		app_window_error_message (_tmp97_, NULL);
+		app_window_error_message (_tmp90_, NULL);
 #line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (error_string);
-#line 11896 "ImportPage.c"
+#line 11830 "ImportPage.c"
 	}
 #line 1782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp98_ = progress;
+	_tmp91_ = progress;
 #line 1782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	progress_dialog_close (_tmp98_);
+	progress_dialog_close (_tmp91_);
 #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (local_ref);
 #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11915,18 +11849,18 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 	_g_object_unref0 (marker);
 #line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (local_ref);
-#line 11912 "ImportPage.c"
+#line 11846 "ImportPage.c"
 }
 
 
 static void import_page_close_import (ImportPage* self) {
 	int res = 0;
-	Camera* _tmp0_ = NULL;
-	GPSpinIdleWrapper* _tmp1_ = NULL;
-	GPContext* _tmp2_ = NULL;
-	int _tmp3_ = 0;
-	int _tmp4_ = 0;
-	gboolean _tmp8_ = FALSE;
+	Camera* _tmp0_;
+	GPSpinIdleWrapper* _tmp1_;
+	GPContext* _tmp2_;
+	int _tmp3_;
+	int _tmp4_;
+	gboolean _tmp8_;
 #line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
 #line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11943,10 +11877,10 @@ static void import_page_close_import (ImportPage* self) {
 	_tmp4_ = res;
 #line 1790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ != GP_OK) {
-#line 11940 "ImportPage.c"
-		int _tmp5_ = 0;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 11874 "ImportPage.c"
+		int _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = res;
 #line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11957,7 +11891,7 @@ static void import_page_close_import (ImportPage* self) {
 		g_message ("ImportPage.vala:1792: Unable to unlock camera: %s", _tmp7_);
 #line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp7_);
-#line 11954 "ImportPage.c"
+#line 11888 "ImportPage.c"
 	}
 #line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = self->priv->refreshed;
@@ -11965,14 +11899,14 @@ static void import_page_close_import (ImportPage* self) {
 	import_page_update_status (self, FALSE, _tmp8_);
 #line 1797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 11962 "ImportPage.c"
+#line 11896 "ImportPage.c"
 }
 
 
 static void import_page_real_set_display_titles (CheckerboardPage* base, gboolean display) {
 	ImportPage * self;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
 #line 1800 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
 #line 1801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11983,22 +11917,22 @@ static void import_page_real_set_display_titles (CheckerboardPage* base, gboolea
 	_tmp1_ = display;
 #line 1803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_);
-#line 11980 "ImportPage.c"
+#line 11914 "ImportPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
 #line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 11987 "ImportPage.c"
+#line 11921 "ImportPage.c"
 }
 
 
 static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPage* base) {
 	ImportPage * self;
 	SearchViewFilter* result = NULL;
-	ImportPageImportPageSearchViewFilter* _tmp0_ = NULL;
-	SearchViewFilter* _tmp1_ = NULL;
+	ImportPageImportPageSearchViewFilter* _tmp0_;
+	SearchViewFilter* _tmp1_;
 #line 1807 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
 #line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12009,14 +11943,14 @@ static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPa
 	result = _tmp1_;
 #line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12006 "ImportPage.c"
+#line 11940 "ImportPage.c"
 }
 
 
 static ImportPageImportViewManager* import_page_import_view_manager_construct (GType object_type, ImportPage* owner) {
 	ImportPageImportViewManager* self = NULL;
-	ImportPage* _tmp0_ = NULL;
-	ImportPage* _tmp1_ = NULL;
+	ImportPage* _tmp0_;
+	ImportPage* _tmp1_;
 #line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (owner), NULL);
 #line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12031,22 +11965,22 @@ static ImportPageImportViewManager* import_page_import_view_manager_construct (G
 	self->priv->owner = _tmp1_;
 #line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 12028 "ImportPage.c"
+#line 11962 "ImportPage.c"
 }
 
 
 static ImportPageImportViewManager* import_page_import_view_manager_new (ImportPage* owner) {
 #line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_page_import_view_manager_construct (IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, owner);
-#line 12035 "ImportPage.c"
+#line 11969 "ImportPage.c"
 }
 
 
 static DataView* import_page_import_view_manager_real_create_view (ViewManager* base, DataSource* source) {
 	ImportPageImportViewManager * self;
 	DataView* result = NULL;
-	DataSource* _tmp0_ = NULL;
-	ImportPreview* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	ImportPreview* _tmp1_;
 #line 475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, ImportPageImportViewManager);
 #line 475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12059,7 +11993,7 @@ static DataView* import_page_import_view_manager_real_create_view (ViewManager*
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
 #line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12056 "ImportPage.c"
+#line 11990 "ImportPage.c"
 }
 
 
@@ -12071,19 +12005,19 @@ static void import_page_import_view_manager_class_init (ImportPageImportViewMana
 #line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_type_class_add_private (klass, sizeof (ImportPageImportViewManagerPrivate));
 #line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) import_page_import_view_manager_real_create_view;
-#line 12069 "ImportPage.c"
+	((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) import_page_import_view_manager_real_create_view;
+#line 12003 "ImportPage.c"
 }
 
 
 static void import_page_import_view_manager_instance_init (ImportPageImportViewManager * self) {
 #line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv = IMPORT_PAGE_IMPORT_VIEW_MANAGER_GET_PRIVATE (self);
-#line 12076 "ImportPage.c"
+#line 12010 "ImportPage.c"
 }
 
 
-static void import_page_import_view_manager_finalize (ViewManager* obj) {
+static void import_page_import_view_manager_finalize (ViewManager * obj) {
 	ImportPageImportViewManager * self;
 #line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, ImportPageImportViewManager);
@@ -12091,7 +12025,7 @@ static void import_page_import_view_manager_finalize (ViewManager* obj) {
 	_g_object_unref0 (self->priv->owner);
 #line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	VIEW_MANAGER_CLASS (import_page_import_view_manager_parent_class)->finalize (obj);
-#line 12088 "ImportPage.c"
+#line 12022 "ImportPage.c"
 }
 
 
@@ -12110,32 +12044,32 @@ static GType import_page_import_view_manager_get_type (void) {
 static gpointer _gp_context_wrapper_ref0 (gpointer self) {
 #line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? gp_context_wrapper_ref (self) : NULL;
-#line 12107 "ImportPage.c"
+#line 12041 "ImportPage.c"
 }
 
 
 static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType object_type, GPContextWrapper* context, ImportSource* import_file, DuplicatedFile* duplicated_file) {
 	ImportPageCameraImportJob* self = NULL;
-	GPContextWrapper* _tmp0_ = NULL;
-	GPContextWrapper* _tmp1_ = NULL;
-	ImportSource* _tmp2_ = NULL;
-	ImportSource* _tmp3_ = NULL;
-	DuplicatedFile* _tmp4_ = NULL;
-	DuplicatedFile* _tmp5_ = NULL;
-	ImportSource* _tmp6_ = NULL;
-	Camera* _tmp7_ = NULL;
-	ImportSource* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	ImportSource* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	ImportSource* _tmp13_ = NULL;
-	gulong _tmp14_ = 0UL;
+	GPContextWrapper* _tmp0_;
+	GPContextWrapper* _tmp1_;
+	ImportSource* _tmp2_;
+	ImportSource* _tmp3_;
+	DuplicatedFile* _tmp4_;
+	DuplicatedFile* _tmp5_;
+	ImportSource* _tmp6_;
+	Camera* _tmp7_;
+	ImportSource* _tmp8_;
+	gchar* _tmp9_;
+	const gchar* _tmp10_;
+	ImportSource* _tmp11_;
+	gchar* _tmp12_;
+	ImportSource* _tmp13_;
+	gulong _tmp14_;
 	PhotoMetadata* _tmp15_ = NULL;
-	ImportSource* _tmp16_ = NULL;
-	PhotoMetadata* _tmp19_ = NULL;
-	ImportSource* _tmp20_ = NULL;
-	time_t _tmp21_ = 0;
+	ImportSource* _tmp16_;
+	PhotoMetadata* _tmp19_;
+	ImportSource* _tmp20_;
+	time_t _tmp21_;
 #line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (GP_IS_CONTEXT_WRAPPER (context), NULL);
 #line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12206,9 +12140,9 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType
 	_tmp16_ = import_file;
 #line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 12203 "ImportPage.c"
-		ImportSource* _tmp17_ = NULL;
-		PhotoMetadata* _tmp18_ = NULL;
+#line 12137 "ImportPage.c"
+		ImportSource* _tmp17_;
+		PhotoMetadata* _tmp18_;
 #line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp17_ = import_file;
 #line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12217,13 +12151,13 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType
 		_media_metadata_unref0 (_tmp15_);
 #line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = _tmp18_;
-#line 12214 "ImportPage.c"
+#line 12148 "ImportPage.c"
 	} else {
 #line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_media_metadata_unref0 (_tmp15_);
 #line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = NULL;
-#line 12220 "ImportPage.c"
+#line 12154 "ImportPage.c"
 	}
 #line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp19_ = _media_metadata_ref0 (_tmp15_);
@@ -12241,20 +12175,20 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType
 	_media_metadata_unref0 (_tmp15_);
 #line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 12238 "ImportPage.c"
+#line 12172 "ImportPage.c"
 }
 
 
 static ImportPageCameraImportJob* import_page_camera_import_job_new (GPContextWrapper* context, ImportSource* import_file, DuplicatedFile* duplicated_file) {
 #line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_page_camera_import_job_construct (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, context, import_file, duplicated_file);
-#line 12245 "ImportPage.c"
+#line 12179 "ImportPage.c"
 }
 
 
 static time_t import_page_camera_import_job_get_exposure_time (ImportPageCameraImportJob* self) {
 	time_t result = 0;
-	time_t _tmp0_ = 0;
+	time_t _tmp0_;
 #line 511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IMPORT_PAGE_IS_CAMERA_IMPORT_JOB (self), 0);
 #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12263,15 +12197,15 @@ static time_t import_page_camera_import_job_get_exposure_time (ImportPageCameraI
 	result = _tmp0_;
 #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12260 "ImportPage.c"
+#line 12194 "ImportPage.c"
 }
 
 
 static DuplicatedFile* import_page_camera_import_job_real_get_duplicated_file (BatchImportJob* base) {
 	ImportPageCameraImportJob * self;
 	DuplicatedFile* result = NULL;
-	DuplicatedFile* _tmp0_ = NULL;
-	DuplicatedFile* _tmp1_ = NULL;
+	DuplicatedFile* _tmp0_;
+	DuplicatedFile* _tmp1_;
 #line 515 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
 #line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12282,7 +12216,7 @@ static DuplicatedFile* import_page_camera_import_job_real_get_duplicated_file (B
 	result = _tmp1_;
 #line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12279 "ImportPage.c"
+#line 12213 "ImportPage.c"
 }
 
 
@@ -12290,38 +12224,38 @@ static time_t import_page_camera_import_job_real_get_exposure_time_override (Bat
 	ImportPageCameraImportJob * self;
 	time_t result = 0;
 	time_t _tmp0_ = 0;
-	ImportSource* _tmp1_ = NULL;
+	ImportSource* _tmp1_;
 #line 519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
 #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->import_file;
 #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 12294 "ImportPage.c"
-		time_t _tmp2_ = 0;
+#line 12228 "ImportPage.c"
+		time_t _tmp2_;
 #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = import_page_camera_import_job_get_exposure_time (self);
 #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp2_;
-#line 12300 "ImportPage.c"
+#line 12234 "ImportPage.c"
 	} else {
 #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = (time_t) 0;
-#line 12304 "ImportPage.c"
+#line 12238 "ImportPage.c"
 	}
 #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
 #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12310 "ImportPage.c"
+#line 12244 "ImportPage.c"
 }
 
 
 static gchar* import_page_camera_import_job_real_get_dest_identifier (BatchImportJob* base) {
 	ImportPageCameraImportJob * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
 #line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12332,15 +12266,15 @@ static gchar* import_page_camera_import_job_real_get_dest_identifier (BatchImpor
 	result = _tmp1_;
 #line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12329 "ImportPage.c"
+#line 12263 "ImportPage.c"
 }
 
 
 static gchar* import_page_camera_import_job_real_get_source_identifier (BatchImportJob* base) {
 	ImportPageCameraImportJob * self;
 	gchar* result = NULL;
-	ImportSource* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	ImportSource* _tmp0_;
+	gchar* _tmp1_;
 #line 527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
 #line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12351,15 +12285,15 @@ static gchar* import_page_camera_import_job_real_get_source_identifier (BatchImp
 	result = _tmp1_;
 #line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12348 "ImportPage.c"
+#line 12282 "ImportPage.c"
 }
 
 
 static gchar* import_page_camera_import_job_real_get_basename (BatchImportJob* base) {
 	ImportPageCameraImportJob * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
 #line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12370,15 +12304,15 @@ static gchar* import_page_camera_import_job_real_get_basename (BatchImportJob* b
 	result = _tmp1_;
 #line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12367 "ImportPage.c"
+#line 12301 "ImportPage.c"
 }
 
 
 static gchar* import_page_camera_import_job_real_get_path (BatchImportJob* base) {
 	ImportPageCameraImportJob * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
 #line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12389,14 +12323,14 @@ static gchar* import_page_camera_import_job_real_get_path (BatchImportJob* base)
 	result = _tmp1_;
 #line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12386 "ImportPage.c"
+#line 12320 "ImportPage.c"
 }
 
 
 static void import_page_camera_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated) {
 	ImportPageCameraImportJob * self;
-	BatchImportJob* _tmp0_ = NULL;
-	ImportPageCameraImportJob* _tmp1_ = NULL;
+	BatchImportJob* _tmp0_;
+	ImportPageCameraImportJob* _tmp1_;
 #line 539 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
 #line 539 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12409,14 +12343,14 @@ static void import_page_camera_import_job_real_set_associated (BatchImportJob* b
 	_batch_import_job_unref0 (self->priv->associated);
 #line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->associated = _tmp1_;
-#line 12406 "ImportPage.c"
+#line 12340 "ImportPage.c"
 }
 
 
 static ImportSource* import_page_camera_import_job_get_source (ImportPageCameraImportJob* self) {
 	ImportSource* result = NULL;
-	ImportSource* _tmp0_ = NULL;
-	ImportSource* _tmp1_ = NULL;
+	ImportSource* _tmp0_;
+	ImportSource* _tmp1_;
 #line 543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IMPORT_PAGE_IS_CAMERA_IMPORT_JOB (self), NULL);
 #line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12427,7 +12361,7 @@ static ImportSource* import_page_camera_import_job_get_source (ImportPageCameraI
 	result = _tmp1_;
 #line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12424 "ImportPage.c"
+#line 12358 "ImportPage.c"
 }
 
 
@@ -12440,16 +12374,16 @@ static gboolean import_page_camera_import_job_real_is_directory (BatchImportJob*
 	result = FALSE;
 #line 548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12437 "ImportPage.c"
+#line 12371 "ImportPage.c"
 }
 
 
-static gboolean import_page_camera_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile** file) {
+static gboolean import_page_camera_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file) {
 	ImportPageCameraImportJob * self;
 	guint64 _vala_filesize = 0ULL;
 	GFile* _vala_file = NULL;
 	gboolean result = FALSE;
-	guint64 _tmp0_ = 0ULL;
+	guint64 _tmp0_;
 #line 551 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
 #line 552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12466,35 +12400,35 @@ static gboolean import_page_camera_import_job_real_determine_file_size (BatchImp
 	if (filesize) {
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*filesize = _vala_filesize;
-#line 12463 "ImportPage.c"
+#line 12397 "ImportPage.c"
 	}
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (file) {
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*file = _vala_file;
-#line 12469 "ImportPage.c"
+#line 12403 "ImportPage.c"
 	} else {
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_vala_file);
-#line 12473 "ImportPage.c"
+#line 12407 "ImportPage.c"
 	}
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12477 "ImportPage.c"
+#line 12411 "ImportPage.c"
 }
 
 
-static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base, GFile** file_to_import, gboolean* copy_to_library, GError** error) {
+static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error) {
 	ImportPageCameraImportJob * self;
 	GFile* _vala_file_to_import = NULL;
 	gboolean _vala_copy_to_library = FALSE;
 	gboolean result = FALSE;
 	GFile* dest_file = NULL;
-	GFile* _tmp13_ = NULL;
-	GFile* _tmp17_ = NULL;
-	ImportPageCameraImportJob* _tmp26_ = NULL;
-	GFile* _tmp59_ = NULL;
-	GFile* _tmp60_ = NULL;
+	GFile* _tmp13_;
+	GFile* _tmp17_;
+	ImportPageCameraImportJob* _tmp26_;
+	GFile* _tmp59_;
+	GFile* _tmp60_;
 	GError * _inner_error_ = NULL;
 #line 558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
@@ -12506,16 +12440,16 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 	_vala_copy_to_library = FALSE;
 #line 562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	dest_file = NULL;
-#line 12503 "ImportPage.c"
+#line 12437 "ImportPage.c"
 	{
 		gboolean collision = FALSE;
 		GFile* _tmp0_ = NULL;
-		const gchar* _tmp1_ = NULL;
-		PhotoMetadata* _tmp2_ = NULL;
-		time_t _tmp3_ = 0;
+		const gchar* _tmp1_;
+		PhotoMetadata* _tmp2_;
+		time_t _tmp3_;
 		gboolean _tmp4_ = FALSE;
-		GFile* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
+		GFile* _tmp5_;
+		GFile* _tmp6_;
 #line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = self->priv->filename;
 #line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12530,8 +12464,8 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_tmp0_ = _tmp5_;
 #line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12527 "ImportPage.c"
-			goto __catch72_g_error;
+#line 12461 "ImportPage.c"
+			goto __catch73_g_error;
 		}
 #line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = _tmp0_;
@@ -12543,17 +12477,17 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		dest_file = _tmp6_;
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 12540 "ImportPage.c"
+#line 12474 "ImportPage.c"
 	}
-	goto __finally72;
-	__catch72_g_error:
+	goto __finally73;
+	__catch73_g_error:
 	{
 		GError* err = NULL;
-		ImportSource* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		GError* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
+		ImportSource* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		GError* _tmp10_;
+		const gchar* _tmp11_;
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		err = _inner_error_;
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12574,12 +12508,12 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_free0 (_tmp9_);
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_error_free0 (err);
-#line 12571 "ImportPage.c"
+#line 12505 "ImportPage.c"
 	}
-	__finally72:
+	__finally73:
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12576 "ImportPage.c"
+#line 12510 "ImportPage.c"
 		gboolean _tmp12_ = FALSE;
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_propagate_error (error, _inner_error_);
@@ -12587,16 +12521,16 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_object_unref0 (dest_file);
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return _tmp12_;
-#line 12584 "ImportPage.c"
+#line 12518 "ImportPage.c"
 	}
 #line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = dest_file;
 #line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp13_ == NULL) {
-#line 12590 "ImportPage.c"
-		ImportSource* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
+#line 12524 "ImportPage.c"
+		ImportSource* _tmp14_;
+		gchar* _tmp15_;
+		gchar* _tmp16_;
 #line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = self->priv->import_file;
 #line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12615,34 +12549,34 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		if (file_to_import) {
 #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			*file_to_import = _vala_file_to_import;
-#line 12612 "ImportPage.c"
+#line 12546 "ImportPage.c"
 		} else {
 #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (_vala_file_to_import);
-#line 12616 "ImportPage.c"
+#line 12550 "ImportPage.c"
 		}
 #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (copy_to_library) {
 #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			*copy_to_library = _vala_copy_to_library;
-#line 12622 "ImportPage.c"
+#line 12556 "ImportPage.c"
 		}
 #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 12626 "ImportPage.c"
+#line 12560 "ImportPage.c"
 	}
 #line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp17_ = dest_file;
 #line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	library_monitor_blacklist_file (_tmp17_, "CameraImportJob.prepare");
-#line 12632 "ImportPage.c"
+#line 12566 "ImportPage.c"
 	{
-		GPContextWrapper* _tmp18_ = NULL;
-		GPContext* _tmp19_ = NULL;
-		Camera* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
-		GFile* _tmp23_ = NULL;
+		GPContextWrapper* _tmp18_;
+		GPContext* _tmp19_;
+		Camera* _tmp20_;
+		const gchar* _tmp21_;
+		const gchar* _tmp22_;
+		GFile* _tmp23_;
 #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp18_ = self->priv->context;
 #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12659,22 +12593,22 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		gp_save_image (_tmp19_, _tmp20_, _tmp21_, _tmp22_, _tmp23_, &_inner_error_);
 #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12656 "ImportPage.c"
-			goto __finally73;
+#line 12590 "ImportPage.c"
+			goto __finally74;
 		}
 	}
-	__finally73:
+	__finally74:
 	{
-		GFile* _tmp24_ = NULL;
+		GFile* _tmp24_;
 #line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp24_ = dest_file;
 #line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		library_monitor_unblacklist_file (_tmp24_);
-#line 12667 "ImportPage.c"
+#line 12601 "ImportPage.c"
 	}
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12671 "ImportPage.c"
+#line 12605 "ImportPage.c"
 		gboolean _tmp25_ = FALSE;
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_propagate_error (error, _inner_error_);
@@ -12682,30 +12616,30 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_object_unref0 (dest_file);
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return _tmp25_;
-#line 12679 "ImportPage.c"
+#line 12613 "ImportPage.c"
 	}
 #line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp26_ = self->priv->associated;
 #line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp26_ != NULL) {
-#line 12685 "ImportPage.c"
-		BackingPhotoRow* _tmp42_ = NULL;
+#line 12619 "ImportPage.c"
+		BackingPhotoRow* _tmp42_;
 		GFile* assoc_dest = NULL;
-		BackingPhotoRow* _tmp45_ = NULL;
-		const gchar* _tmp46_ = NULL;
-		GFile* _tmp47_ = NULL;
-		GFile* _tmp48_ = NULL;
+		BackingPhotoRow* _tmp45_;
+		const gchar* _tmp46_;
+		GFile* _tmp47_;
+		GFile* _tmp48_;
 		{
 			BackingPhotoRow* _tmp27_ = NULL;
-			GFile* _tmp28_ = NULL;
-			gchar* _tmp29_ = NULL;
-			gchar* _tmp30_ = NULL;
-			ImportPageCameraImportJob* _tmp31_ = NULL;
-			gchar* _tmp32_ = NULL;
-			gchar* _tmp33_ = NULL;
-			BackingPhotoRow* _tmp34_ = NULL;
-			BackingPhotoRow* _tmp35_ = NULL;
-			BackingPhotoRow* _tmp36_ = NULL;
+			GFile* _tmp28_;
+			gchar* _tmp29_;
+			gchar* _tmp30_;
+			ImportPageCameraImportJob* _tmp31_;
+			gchar* _tmp32_;
+			gchar* _tmp33_;
+			BackingPhotoRow* _tmp34_;
+			BackingPhotoRow* _tmp35_;
+			BackingPhotoRow* _tmp36_;
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp28_ = dest_file;
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12730,8 +12664,8 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_tmp27_ = _tmp35_;
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12727 "ImportPage.c"
-				goto __catch74_g_error;
+#line 12661 "ImportPage.c"
+				goto __catch75_g_error;
 			}
 #line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp36_ = _tmp27_;
@@ -12743,16 +12677,16 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			self->priv->associated_file = _tmp36_;
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_backing_photo_row_unref0 (_tmp27_);
-#line 12740 "ImportPage.c"
+#line 12674 "ImportPage.c"
 		}
-		goto __finally74;
-		__catch74_g_error:
+		goto __finally75;
+		__catch75_g_error:
 		{
 			GError* err = NULL;
-			ImportPageCameraImportJob* _tmp37_ = NULL;
-			const gchar* _tmp38_ = NULL;
-			GError* _tmp39_ = NULL;
-			const gchar* _tmp40_ = NULL;
+			ImportPageCameraImportJob* _tmp37_;
+			const gchar* _tmp38_;
+			GError* _tmp39_;
+			const gchar* _tmp40_;
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			err = _inner_error_;
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12770,12 +12704,12 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 ": %s", _tmp38_, _tmp40_);
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_error_free0 (err);
-#line 12766 "ImportPage.c"
+#line 12700 "ImportPage.c"
 		}
-		__finally74:
+		__finally75:
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12771 "ImportPage.c"
+#line 12705 "ImportPage.c"
 			gboolean _tmp41_ = FALSE;
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			g_propagate_error (error, _inner_error_);
@@ -12783,15 +12717,15 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_g_object_unref0 (dest_file);
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return _tmp41_;
-#line 12779 "ImportPage.c"
+#line 12713 "ImportPage.c"
 		}
 #line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp42_ = self->priv->associated_file;
 #line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp42_ == NULL) {
-#line 12785 "ImportPage.c"
-			ImportPageCameraImportJob* _tmp43_ = NULL;
-			const gchar* _tmp44_ = NULL;
+#line 12719 "ImportPage.c"
+			ImportPageCameraImportJob* _tmp43_;
+			const gchar* _tmp44_;
 #line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp43_ = self->priv->associated;
 #line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12806,21 +12740,21 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			if (file_to_import) {
 #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				*file_to_import = _vala_file_to_import;
-#line 12802 "ImportPage.c"
+#line 12736 "ImportPage.c"
 			} else {
 #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_vala_file_to_import);
-#line 12806 "ImportPage.c"
+#line 12740 "ImportPage.c"
 			}
 #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (copy_to_library) {
 #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				*copy_to_library = _vala_copy_to_library;
-#line 12812 "ImportPage.c"
+#line 12746 "ImportPage.c"
 			}
 #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 12816 "ImportPage.c"
+#line 12750 "ImportPage.c"
 		}
 #line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp45_ = self->priv->associated_file;
@@ -12834,16 +12768,16 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_tmp48_ = assoc_dest;
 #line 604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		library_monitor_blacklist_file (_tmp48_, "CameraImportJob.prepare");
-#line 12830 "ImportPage.c"
+#line 12764 "ImportPage.c"
 		{
-			GPContextWrapper* _tmp49_ = NULL;
-			GPContext* _tmp50_ = NULL;
-			Camera* _tmp51_ = NULL;
-			ImportPageCameraImportJob* _tmp52_ = NULL;
-			const gchar* _tmp53_ = NULL;
-			ImportPageCameraImportJob* _tmp54_ = NULL;
-			const gchar* _tmp55_ = NULL;
-			GFile* _tmp56_ = NULL;
+			GPContextWrapper* _tmp49_;
+			GPContext* _tmp50_;
+			Camera* _tmp51_;
+			ImportPageCameraImportJob* _tmp52_;
+			const gchar* _tmp53_;
+			ImportPageCameraImportJob* _tmp54_;
+			const gchar* _tmp55_;
+			GFile* _tmp56_;
 #line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp49_ = self->priv->context;
 #line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12864,22 +12798,22 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			gp_save_image (_tmp50_, _tmp51_, _tmp53_, _tmp55_, _tmp56_, &_inner_error_);
 #line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12860 "ImportPage.c"
-				goto __finally75;
+#line 12794 "ImportPage.c"
+				goto __finally76;
 			}
 		}
-		__finally75:
+		__finally76:
 		{
-			GFile* _tmp57_ = NULL;
+			GFile* _tmp57_;
 #line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp57_ = assoc_dest;
 #line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			library_monitor_unblacklist_file (_tmp57_);
-#line 12871 "ImportPage.c"
+#line 12805 "ImportPage.c"
 		}
 #line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12875 "ImportPage.c"
+#line 12809 "ImportPage.c"
 			gboolean _tmp58_ = FALSE;
 #line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			g_propagate_error (error, _inner_error_);
@@ -12889,11 +12823,11 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_g_object_unref0 (dest_file);
 #line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return _tmp58_;
-#line 12885 "ImportPage.c"
+#line 12819 "ImportPage.c"
 		}
 #line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (assoc_dest);
-#line 12889 "ImportPage.c"
+#line 12823 "ImportPage.c"
 	}
 #line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp59_ = dest_file;
@@ -12913,21 +12847,21 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 	if (file_to_import) {
 #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*file_to_import = _vala_file_to_import;
-#line 12909 "ImportPage.c"
+#line 12843 "ImportPage.c"
 	} else {
 #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_vala_file_to_import);
-#line 12913 "ImportPage.c"
+#line 12847 "ImportPage.c"
 	}
 #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (copy_to_library) {
 #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*copy_to_library = _vala_copy_to_library;
-#line 12919 "ImportPage.c"
+#line 12853 "ImportPage.c"
 	}
 #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12923 "ImportPage.c"
+#line 12857 "ImportPage.c"
 }
 
 
@@ -12935,7 +12869,7 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
 	ImportPageCameraImportJob * self;
 	gboolean result = FALSE;
 	gboolean ret = FALSE;
-	MediaSource* _tmp0_ = NULL;
+	MediaSource* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
@@ -12949,11 +12883,11 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
 	_tmp0_ = source;
 #line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO)) {
-#line 12945 "ImportPage.c"
+#line 12879 "ImportPage.c"
 		Photo* photo = NULL;
-		MediaSource* _tmp1_ = NULL;
-		Photo* _tmp2_ = NULL;
-		BackingPhotoRow* _tmp3_ = NULL;
+		MediaSource* _tmp1_;
+		Photo* _tmp2_;
+		BackingPhotoRow* _tmp3_;
 #line 622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = source;
 #line 622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12964,13 +12898,13 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
 		_tmp3_ = self->priv->associated_file;
 #line 625 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp3_ != NULL) {
-#line 12960 "ImportPage.c"
-			Photo* _tmp4_ = NULL;
-			BackingPhotoRow* _tmp5_ = NULL;
-			Photo* _tmp7_ = NULL;
-			ConfigFacade* _tmp8_ = NULL;
-			ConfigFacade* _tmp9_ = NULL;
-			RawDeveloper _tmp10_ = 0;
+#line 12894 "ImportPage.c"
+			Photo* _tmp4_;
+			BackingPhotoRow* _tmp5_;
+			Photo* _tmp7_;
+			ConfigFacade* _tmp8_;
+			ConfigFacade* _tmp9_;
+			RawDeveloper _tmp10_;
 #line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp4_ = photo;
 #line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12979,7 +12913,7 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
 			photo_add_backing_photo_for_development (_tmp4_, RAW_DEVELOPER_CAMERA, _tmp5_, &_inner_error_);
 #line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12975 "ImportPage.c"
+#line 12909 "ImportPage.c"
 				gboolean _tmp6_ = FALSE;
 #line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_propagate_error (error, _inner_error_);
@@ -12987,7 +12921,7 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
 				_g_object_unref0 (photo);
 #line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return _tmp6_;
-#line 12983 "ImportPage.c"
+#line 12917 "ImportPage.c"
 			}
 #line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			ret = TRUE;
@@ -13003,17 +12937,17 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
 			photo_set_raw_developer (_tmp7_, _tmp10_);
 #line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (_tmp9_);
-#line 12999 "ImportPage.c"
+#line 12933 "ImportPage.c"
 		}
 #line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (photo);
-#line 13003 "ImportPage.c"
+#line 12937 "ImportPage.c"
 	}
 #line 631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = ret;
 #line 631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 13009 "ImportPage.c"
+#line 12943 "ImportPage.c"
 }
 
 
@@ -13025,28 +12959,28 @@ static void import_page_camera_import_job_class_init (ImportPageCameraImportJobC
 #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_type_class_add_private (klass, sizeof (ImportPageCameraImportJobPrivate));
 #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((BatchImportJobClass *) klass)->get_duplicated_file = (DuplicatedFile* (*)(BatchImportJob*)) import_page_camera_import_job_real_get_duplicated_file;
+	((BatchImportJobClass *) klass)->get_duplicated_file = (DuplicatedFile* (*) (BatchImportJob *)) import_page_camera_import_job_real_get_duplicated_file;
 #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((BatchImportJobClass *) klass)->get_exposure_time_override = (time_t (*)(BatchImportJob*)) import_page_camera_import_job_real_get_exposure_time_override;
+	((BatchImportJobClass *) klass)->get_exposure_time_override = (time_t (*) (BatchImportJob *)) import_page_camera_import_job_real_get_exposure_time_override;
 #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*)(BatchImportJob*)) import_page_camera_import_job_real_get_dest_identifier;
+	((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*) (BatchImportJob *)) import_page_camera_import_job_real_get_dest_identifier;
 #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*)(BatchImportJob*)) import_page_camera_import_job_real_get_source_identifier;
+	((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*) (BatchImportJob *)) import_page_camera_import_job_real_get_source_identifier;
 #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((BatchImportJobClass *) klass)->get_basename = (gchar* (*)(BatchImportJob*)) import_page_camera_import_job_real_get_basename;
+	((BatchImportJobClass *) klass)->get_basename = (gchar* (*) (BatchImportJob *)) import_page_camera_import_job_real_get_basename;
 #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((BatchImportJobClass *) klass)->get_path = (gchar* (*)(BatchImportJob*)) import_page_camera_import_job_real_get_path;
+	((BatchImportJobClass *) klass)->get_path = (gchar* (*) (BatchImportJob *)) import_page_camera_import_job_real_get_path;
 #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((BatchImportJobClass *) klass)->set_associated = (void (*)(BatchImportJob*, BatchImportJob*)) import_page_camera_import_job_real_set_associated;
+	((BatchImportJobClass *) klass)->set_associated = (void (*) (BatchImportJob *, BatchImportJob*)) import_page_camera_import_job_real_set_associated;
 #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((BatchImportJobClass *) klass)->is_directory = (gboolean (*)(BatchImportJob*)) import_page_camera_import_job_real_is_directory;
+	((BatchImportJobClass *) klass)->is_directory = (gboolean (*) (BatchImportJob *)) import_page_camera_import_job_real_is_directory;
 #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*)(BatchImportJob*, guint64*, GFile**)) import_page_camera_import_job_real_determine_file_size;
+	((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*) (BatchImportJob *, guint64*, GFile* *)) import_page_camera_import_job_real_determine_file_size;
 #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((BatchImportJobClass *) klass)->prepare = (gboolean (*)(BatchImportJob*, GFile**, gboolean*, GError**)) import_page_camera_import_job_real_prepare;
+	((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) import_page_camera_import_job_real_prepare;
 #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((BatchImportJobClass *) klass)->complete = (gboolean (*)(BatchImportJob*, MediaSource*, BatchImportRoll*, GError**)) import_page_camera_import_job_real_complete;
-#line 13042 "ImportPage.c"
+	((BatchImportJobClass *) klass)->complete = (gboolean (*) (BatchImportJob *, MediaSource*, BatchImportRoll*, GError**)) import_page_camera_import_job_real_complete;
+#line 12976 "ImportPage.c"
 }
 
 
@@ -13057,11 +12991,11 @@ static void import_page_camera_import_job_instance_init (ImportPageCameraImportJ
 	self->priv->associated = NULL;
 #line 490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->associated_file = NULL;
-#line 13053 "ImportPage.c"
+#line 12987 "ImportPage.c"
 }
 
 
-static void import_page_camera_import_job_finalize (BatchImportJob* obj) {
+static void import_page_camera_import_job_finalize (BatchImportJob * obj) {
 	ImportPageCameraImportJob * self;
 #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
@@ -13085,7 +13019,7 @@ static void import_page_camera_import_job_finalize (BatchImportJob* obj) {
 	_g_object_unref0 (self->priv->duplicated_file);
 #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	BATCH_IMPORT_JOB_CLASS (import_page_camera_import_job_parent_class)->finalize (obj);
-#line 13081 "ImportPage.c"
+#line 13015 "ImportPage.c"
 }
 
 
@@ -13110,27 +13044,27 @@ static guint import_page_import_page_search_view_filter_real_get_criteria (Searc
 	result = (guint) (SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_MEDIA);
 #line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 13106 "ImportPage.c"
+#line 13040 "ImportPage.c"
 }
 
 
 static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 13126 "ImportPage.c"
+#line 13060 "ImportPage.c"
 }
 
 
@@ -13138,11 +13072,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 	ImportPageImportPageSearchViewFilter * self;
 	gboolean result = FALSE;
 	ImportSource* source = NULL;
-	DataView* _tmp0_ = NULL;
-	ImportSource* _tmp1_ = NULL;
+	DataView* _tmp0_;
+	ImportSource* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	guint _tmp3_ = 0U;
-	guint _tmp26_ = 0U;
+	guint _tmp3_;
+	guint _tmp26_;
 #line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_IMPORT_PAGE_SEARCH_VIEW_FILTER, ImportPageImportPageSearchViewFilter);
 #line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13157,29 +13091,29 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 	_tmp3_ = search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if ((gboolean) (SEARCH_FILTER_CRITERIA_MEDIA & _tmp3_)) {
-#line 13153 "ImportPage.c"
-		gboolean _tmp4_ = FALSE;
+#line 13087 "ImportPage.c"
+		gboolean _tmp4_;
 #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = search_view_filter_filter_by_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = _tmp4_;
-#line 13159 "ImportPage.c"
+#line 13093 "ImportPage.c"
 	} else {
 #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = FALSE;
-#line 13163 "ImportPage.c"
+#line 13097 "ImportPage.c"
 	}
 #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_) {
-#line 13167 "ImportPage.c"
-		ImportSource* _tmp5_ = NULL;
+#line 13101 "ImportPage.c"
+		ImportSource* _tmp5_;
 #line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = source;
 #line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 13173 "ImportPage.c"
-			gboolean _tmp6_ = FALSE;
-			gboolean _tmp7_ = FALSE;
+#line 13107 "ImportPage.c"
+			gboolean _tmp6_;
+			gboolean _tmp7_;
 #line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp6_ = search_view_filter_get_show_media_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13192,20 +13126,20 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 				_g_object_unref0 (source);
 #line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return result;
-#line 13188 "ImportPage.c"
+#line 13122 "ImportPage.c"
 			}
 		} else {
-			ImportSource* _tmp8_ = NULL;
+			ImportSource* _tmp8_;
 #line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp8_ = source;
 #line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 13196 "ImportPage.c"
+#line 13130 "ImportPage.c"
 				PhotoImportSource* photo = NULL;
-				ImportSource* _tmp9_ = NULL;
-				PhotoImportSource* _tmp10_ = NULL;
-				PhotoImportSource* _tmp11_ = NULL;
-				PhotoFileFormat _tmp12_ = 0;
+				ImportSource* _tmp9_;
+				PhotoImportSource* _tmp10_;
+				PhotoImportSource* _tmp11_;
+				PhotoFileFormat _tmp12_;
 #line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp9_ = source;
 #line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13218,11 +13152,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 				_tmp12_ = photo_import_source_get_file_format (_tmp11_);
 #line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp12_ == PHOTO_FILE_FORMAT_RAW) {
-#line 13214 "ImportPage.c"
-					PhotoImportSource* _tmp13_ = NULL;
-					PhotoImportSource* _tmp14_ = NULL;
-					PhotoImportSource* _tmp15_ = NULL;
-					gboolean _tmp16_ = FALSE;
+#line 13148 "ImportPage.c"
+					PhotoImportSource* _tmp13_;
+					PhotoImportSource* _tmp14_;
+					PhotoImportSource* _tmp15_;
+					gboolean _tmp16_;
 #line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp13_ = photo;
 #line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13235,30 +13169,30 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 					_g_object_unref0 (_tmp15_);
 #line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp16_) {
-#line 13231 "ImportPage.c"
+#line 13165 "ImportPage.c"
 						gboolean _tmp17_ = FALSE;
-						gboolean _tmp18_ = FALSE;
-						gboolean _tmp19_ = FALSE;
+						gboolean _tmp18_;
+						gboolean _tmp19_;
 #line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp18_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp19_ = _tmp18_;
 #line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (!_tmp19_) {
-#line 13241 "ImportPage.c"
-							gboolean _tmp20_ = FALSE;
-							gboolean _tmp21_ = FALSE;
+#line 13175 "ImportPage.c"
+							gboolean _tmp20_;
+							gboolean _tmp21_;
 #line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp20_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp21_ = _tmp20_;
 #line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp17_ = !_tmp21_;
-#line 13250 "ImportPage.c"
+#line 13184 "ImportPage.c"
 						} else {
 #line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp17_ = FALSE;
-#line 13254 "ImportPage.c"
+#line 13188 "ImportPage.c"
 						}
 #line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (_tmp17_) {
@@ -13270,11 +13204,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 							_g_object_unref0 (source);
 #line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							return result;
-#line 13266 "ImportPage.c"
+#line 13200 "ImportPage.c"
 						}
 					} else {
-						gboolean _tmp22_ = FALSE;
-						gboolean _tmp23_ = FALSE;
+						gboolean _tmp22_;
+						gboolean _tmp23_;
 #line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp22_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13289,12 +13223,12 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 							_g_object_unref0 (source);
 #line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							return result;
-#line 13285 "ImportPage.c"
+#line 13219 "ImportPage.c"
 						}
 					}
 				} else {
-					gboolean _tmp24_ = FALSE;
-					gboolean _tmp25_ = FALSE;
+					gboolean _tmp24_;
+					gboolean _tmp25_;
 #line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp24_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13309,12 +13243,12 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 						_g_object_unref0 (source);
 #line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						return result;
-#line 13305 "ImportPage.c"
+#line 13239 "ImportPage.c"
 					}
 				}
 #line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (photo);
-#line 13310 "ImportPage.c"
+#line 13244 "ImportPage.c"
 			}
 		}
 	}
@@ -13322,14 +13256,14 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 	_tmp26_ = search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if ((gboolean) (SEARCH_FILTER_CRITERIA_TEXT & _tmp26_)) {
-#line 13318 "ImportPage.c"
+#line 13252 "ImportPage.c"
 		const gchar* keywords = NULL;
-		ImportSource* _tmp27_ = NULL;
-		const gchar* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		gboolean _tmp30_ = FALSE;
-		gint _tmp31_ = 0;
-		gchar** _tmp32_ = NULL;
+		ImportSource* _tmp27_;
+		const gchar* _tmp28_;
+		const gchar* _tmp29_;
+		gboolean _tmp30_;
+		gint _tmp31_;
+		gchar** _tmp32_;
 #line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp27_ = source;
 #line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13348,11 +13282,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 			_g_object_unref0 (source);
 #line 665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 13344 "ImportPage.c"
+#line 13278 "ImportPage.c"
 		}
 #line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp32_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp31_);
-#line 13348 "ImportPage.c"
+#line 13282 "ImportPage.c"
 		{
 			gchar** word_collection = NULL;
 			gint word_collection_length1 = 0;
@@ -13364,15 +13298,15 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 			word_collection_length1 = _tmp31_;
 #line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			for (word_it = 0; word_it < _tmp31_; word_it = word_it + 1) {
-#line 13360 "ImportPage.c"
+#line 13294 "ImportPage.c"
 				const gchar* word = NULL;
 #line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				word = word_collection[word_it];
-#line 13364 "ImportPage.c"
+#line 13298 "ImportPage.c"
 				{
-					const gchar* _tmp33_ = NULL;
-					const gchar* _tmp34_ = NULL;
-					gboolean _tmp35_ = FALSE;
+					const gchar* _tmp33_;
+					const gchar* _tmp34_;
+					gboolean _tmp35_;
 #line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp33_ = keywords;
 #line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13387,7 +13321,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 						_g_object_unref0 (source);
 #line 670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						return result;
-#line 13383 "ImportPage.c"
+#line 13317 "ImportPage.c"
 					}
 				}
 			}
@@ -13399,7 +13333,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 	_g_object_unref0 (source);
 #line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 13395 "ImportPage.c"
+#line 13329 "ImportPage.c"
 }
 
 
@@ -13409,14 +13343,14 @@ static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view
 	self = (ImportPageImportPageSearchViewFilter*) search_view_filter_construct (object_type);
 #line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 13405 "ImportPage.c"
+#line 13339 "ImportPage.c"
 }
 
 
 static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_new (void) {
 #line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_page_import_page_search_view_filter_construct (IMPORT_PAGE_TYPE_IMPORT_PAGE_SEARCH_VIEW_FILTER);
-#line 13412 "ImportPage.c"
+#line 13346 "ImportPage.c"
 }
 
 
@@ -13424,10 +13358,10 @@ static void import_page_import_page_search_view_filter_class_init (ImportPageImp
 #line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_import_page_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) import_page_import_page_search_view_filter_real_get_criteria;
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) import_page_import_page_search_view_filter_real_get_criteria;
 #line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) import_page_import_page_search_view_filter_real_predicate;
-#line 13423 "ImportPage.c"
+	((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) import_page_import_page_search_view_filter_real_predicate;
+#line 13357 "ImportPage.c"
 }
 
 
@@ -13450,8 +13384,8 @@ static GType import_page_import_page_search_view_filter_get_type (void) {
 static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter* base, DataView* view) {
 	ImportPageHideImportedViewFilter * self;
 	gboolean result = FALSE;
-	DataView* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	DataView* _tmp0_;
+	gboolean _tmp1_;
 #line 680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER, ImportPageHideImportedViewFilter);
 #line 680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13464,7 +13398,7 @@ static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter
 	result = !_tmp1_;
 #line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 13460 "ImportPage.c"
+#line 13394 "ImportPage.c"
 }
 
 
@@ -13474,14 +13408,14 @@ static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_c
 	self = (ImportPageHideImportedViewFilter*) view_filter_construct (object_type);
 #line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 13470 "ImportPage.c"
+#line 13404 "ImportPage.c"
 }
 
 
 static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_new (void) {
 #line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_page_hide_imported_view_filter_construct (IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER);
-#line 13477 "ImportPage.c"
+#line 13411 "ImportPage.c"
 }
 
 
@@ -13489,8 +13423,8 @@ static void import_page_hide_imported_view_filter_class_init (ImportPageHideImpo
 #line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_hide_imported_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) import_page_hide_imported_view_filter_real_predicate;
-#line 13486 "ImportPage.c"
+	((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) import_page_hide_imported_view_filter_real_predicate;
+#line 13420 "ImportPage.c"
 }
 
 
@@ -13516,40 +13450,40 @@ static void import_page_class_init (ImportPageClass * klass) {
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_type_class_add_private (klass, sizeof (ImportPagePrivate));
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((PageClass *) klass)->get_toolbar = (GtkToolbar* (*)(Page*)) import_page_real_get_toolbar;
+	((PageClass *) klass)->get_toolbar = (GtkToolbar* (*) (Page *)) import_page_real_get_toolbar;
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*)(CheckerboardPage*)) import_page_real_get_view_tracker;
+	((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*) (CheckerboardPage *)) import_page_real_get_view_tracker;
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*)(CheckerboardPage*)) import_page_real_get_view_empty_message;
+	((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*) (CheckerboardPage *)) import_page_real_get_view_empty_message;
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((CheckerboardPageClass *) klass)->get_filter_no_match_message = (gchar* (*)(CheckerboardPage*)) import_page_real_get_filter_no_match_message;
+	((CheckerboardPageClass *) klass)->get_filter_no_match_message = (gchar* (*) (CheckerboardPage *)) import_page_real_get_filter_no_match_message;
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) import_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) import_page_real_init_collect_ui_filenames;
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) import_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) import_page_real_add_actions;
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) import_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) import_page_real_remove_actions;
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((PageClass *) klass)->init_actions = (void (*)(Page*, gint, gint)) import_page_real_init_actions;
+	((PageClass *) klass)->init_actions = (void (*) (Page *, gint, gint)) import_page_real_init_actions;
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((PageClass *) klass)->switched_to = (void (*)(Page*)) import_page_real_switched_to;
+	((PageClass *) klass)->switched_to = (void (*) (Page *)) import_page_real_switched_to;
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((PageClass *) klass)->ready = (void (*)(Page*)) import_page_real_ready;
+	((PageClass *) klass)->ready = (void (*) (Page *)) import_page_real_ready;
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((CheckerboardPageClass *) klass)->set_display_titles = (void (*)(CheckerboardPage*, gboolean)) import_page_real_set_display_titles;
+	((CheckerboardPageClass *) klass)->set_display_titles = (void (*) (CheckerboardPage *, gboolean)) import_page_real_set_display_titles;
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) import_page_real_get_search_view_filter;
+	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) import_page_real_get_search_view_filter;
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = import_page_finalize;
-#line 13537 "ImportPage.c"
+#line 13471 "ImportPage.c"
 }
 
 
 static void import_page_instance_init (ImportPage * self) {
-	GtkLabel* _tmp0_ = NULL;
-	GtkProgressBar* _tmp1_ = NULL;
-	ImportPageImportPageSearchViewFilter* _tmp2_ = NULL;
-	ImportPageHideImportedViewFilter* _tmp3_ = NULL;
+	GtkLabel* _tmp0_;
+	GtkProgressBar* _tmp1_;
+	ImportPageImportPageSearchViewFilter* _tmp2_;
+	ImportPageHideImportedViewFilter* _tmp3_;
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv = IMPORT_PAGE_GET_PRIVATE (self);
 #line 688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13586,16 +13520,16 @@ static void import_page_instance_init (ImportPage * self) {
 	_tmp3_ = import_page_hide_imported_view_filter_new ();
 #line 703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->hide_imported_filter = _tmp3_;
-#line 13582 "ImportPage.c"
+#line 13516 "ImportPage.c"
 }
 
 
-static void import_page_finalize (GObject* obj) {
+static void import_page_finalize (GObject * obj) {
 	ImportPage * self;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	VideoSourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	LibraryPhotoSourceCollection* _tmp0_;
+	guint _tmp1_;
+	VideoSourceCollection* _tmp2_;
+	guint _tmp3_;
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_PAGE, ImportPage);
 #line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13640,7 +13574,7 @@ static void import_page_finalize (GObject* obj) {
 	_core_tracker_unref0 (self->priv->tracker);
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (import_page_parent_class)->finalize (obj);
-#line 13636 "ImportPage.c"
+#line 13570 "ImportPage.c"
 }
 
 
diff --git a/src/config/Config.c b/src/config/Config.c
index 8c5fc92..4d9bba5 100644
--- a/src/config/Config.c
+++ b/src/config/Config.c
@@ -1,4 +1,4 @@
-/* Config.c generated by valac 0.34.7, the Vala compiler
+/* Config.c generated by valac 0.36.6, the Vala compiler
  * generated from Config.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -82,6 +82,11 @@ typedef struct _ConfigurationEngineIface ConfigurationEngineIface;
 
 #define TYPE_CONFIGURABLE_PROPERTY (configurable_property_get_type ())
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+enum  {
+	CONFIG_FACADE_COLORS_CHANGED_SIGNAL,
+	CONFIG_FACADE_LAST_SIGNAL
+};
+static guint config_facade_signals[CONFIG_FACADE_LAST_SIGNAL] = {0};
 
 struct _Dimensions {
 	gint width;
@@ -460,7 +465,7 @@ void config_facade_get_border_color (ConfigFacade* self, GdkRGBA* result);
 void config_facade_set_bg_color (ConfigFacade* self, GdkRGBA* color);
 void configuration_facade_set_bg_color_name (ConfigurationFacade* self, const gchar* color_name);
 void config_facade_commit_bg_color (ConfigFacade* self);
-static void config_facade_finalize (GObject* obj);
+static void config_facade_finalize (GObject * obj);
 void config_preconfigure (void);
 void config_init (GError** error);
 void config_terminate (void);
@@ -469,14 +474,14 @@ void config_terminate (void);
 static void _config_facade_on_color_name_changed_configuration_facade_bg_color_name_changed (ConfigurationFacade* _sender, gpointer self) {
 #line 55 "/home/jens/Source/shotwell/src/config/Config.vala"
 	config_facade_on_color_name_changed ((ConfigFacade*) self);
-#line 473 "Config.c"
+#line 478 "Config.c"
 }
 
 
 static ConfigFacade* config_facade_construct (GType object_type) {
 	ConfigFacade * self = NULL;
-	GSettingsConfigurationEngine* _tmp0_ = NULL;
-	GSettingsConfigurationEngine* _tmp1_ = NULL;
+	GSettingsConfigurationEngine* _tmp0_;
+	GSettingsConfigurationEngine* _tmp1_;
 #line 53 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp0_ = gsettings_configuration_engine_new ();
 #line 53 "/home/jens/Source/shotwell/src/config/Config.vala"
@@ -489,42 +494,42 @@ static ConfigFacade* config_facade_construct (GType object_type) {
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "bg-color-name-changed", (GCallback) _config_facade_on_color_name_changed_configuration_facade_bg_color_name_changed, self, 0);
 #line 52 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return self;
-#line 493 "Config.c"
+#line 498 "Config.c"
 }
 
 
 static ConfigFacade* config_facade_new (void) {
 #line 52 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return config_facade_construct (CONFIG_TYPE_FACADE);
-#line 500 "Config.c"
+#line 505 "Config.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 62 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 507 "Config.c"
+#line 512 "Config.c"
 }
 
 
 ConfigFacade* config_facade_get_instance (void) {
 	ConfigFacade* result = NULL;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
 #line 59 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp0_ = config_facade_instance;
 #line 59 "/home/jens/Source/shotwell/src/config/Config.vala"
 	if (_tmp0_ == NULL) {
-#line 520 "Config.c"
-		ConfigFacade* _tmp1_ = NULL;
+#line 525 "Config.c"
+		ConfigFacade* _tmp1_;
 #line 60 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp1_ = config_facade_new ();
 #line 60 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_g_object_unref0 (config_facade_instance);
 #line 60 "/home/jens/Source/shotwell/src/config/Config.vala"
 		config_facade_instance = _tmp1_;
-#line 528 "Config.c"
+#line 533 "Config.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp2_ = config_facade_instance;
@@ -534,7 +539,7 @@ ConfigFacade* config_facade_get_instance (void) {
 	result = _tmp3_;
 #line 62 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return result;
-#line 538 "Config.c"
+#line 543 "Config.c"
 }
 
 
@@ -542,14 +547,14 @@ static void config_facade_on_color_name_changed (ConfigFacade* self) {
 #line 65 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
 #line 66 "/home/jens/Source/shotwell/src/config/Config.vala"
-	g_signal_emit_by_name (self, "colors-changed");
-#line 547 "Config.c"
+	g_signal_emit (self, config_facade_signals[CONFIG_FACADE_COLORS_CHANGED_SIGNAL], 0);
+#line 552 "Config.c"
 }
 
 
 static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color) {
-	GdkRGBA _tmp0_ = {0};
-	gdouble _tmp1_ = 0.0;
+	GdkRGBA _tmp0_;
+	gdouble _tmp1_;
 #line 69 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
 #line 69 "/home/jens/Source/shotwell/src/config/Config.vala"
@@ -560,11 +565,11 @@ static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color
 	_tmp1_ = _tmp0_.red;
 #line 73 "/home/jens/Source/shotwell/src/config/Config.vala"
 	if (_tmp1_ > CONFIG_FACADE_BLACK_THRESHOLD) {
-#line 564 "Config.c"
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+#line 569 "Config.c"
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 74 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp2_ = g_strdup (CONFIG_FACADE_DARK_SELECTED_COLOR);
 #line 74 "/home/jens/Source/shotwell/src/config/Config.vala"
@@ -589,12 +594,12 @@ static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color
 		_g_free0 (self->priv->border_color);
 #line 77 "/home/jens/Source/shotwell/src/config/Config.vala"
 		self->priv->border_color = _tmp5_;
-#line 593 "Config.c"
+#line 598 "Config.c"
 	} else {
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 79 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp6_ = g_strdup (CONFIG_FACADE_LIGHT_SELECTED_COLOR);
 #line 79 "/home/jens/Source/shotwell/src/config/Config.vala"
@@ -619,16 +624,16 @@ static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color
 		_g_free0 (self->priv->border_color);
 #line 82 "/home/jens/Source/shotwell/src/config/Config.vala"
 		self->priv->border_color = _tmp9_;
-#line 623 "Config.c"
+#line 628 "Config.c"
 	}
 }
 
 
 static void config_facade_get_colors (ConfigFacade* self) {
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp4_ = NULL;
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
+	const gchar* _tmp4_;
 	GdkRGBA _tmp5_ = {0};
 #line 86 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
@@ -644,15 +649,15 @@ static void config_facade_get_colors (ConfigFacade* self) {
 	_tmp2_ = is_color_parsable (_tmp1_);
 #line 89 "/home/jens/Source/shotwell/src/config/Config.vala"
 	if (!_tmp2_) {
-#line 648 "Config.c"
-		gchar* _tmp3_ = NULL;
+#line 653 "Config.c"
+		gchar* _tmp3_;
 #line 90 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp3_ = g_strdup (CONFIG_FACADE_DEFAULT_BG_COLOR);
 #line 90 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_g_free0 (self->priv->bg_color);
 #line 90 "/home/jens/Source/shotwell/src/config/Config.vala"
 		self->priv->bg_color = _tmp3_;
-#line 656 "Config.c"
+#line 661 "Config.c"
 	}
 #line 92 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp4_ = self->priv->bg_color;
@@ -660,14 +665,14 @@ static void config_facade_get_colors (ConfigFacade* self) {
 	parse_color (_tmp4_, &_tmp5_);
 #line 92 "/home/jens/Source/shotwell/src/config/Config.vala"
 	config_facade_set_text_colors (self, &_tmp5_);
-#line 664 "Config.c"
+#line 669 "Config.c"
 }
 
 
 void config_facade_get_bg_color (ConfigFacade* self, GdkRGBA* result) {
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
+	const gchar* _tmp2_;
 	GdkRGBA _tmp3_ = {0};
 #line 95 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
@@ -679,7 +684,7 @@ void config_facade_get_bg_color (ConfigFacade* self, GdkRGBA* result) {
 	if (_tmp1_) {
 #line 97 "/home/jens/Source/shotwell/src/config/Config.vala"
 		config_facade_get_colors (self);
-#line 683 "Config.c"
+#line 688 "Config.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp2_ = self->priv->bg_color;
@@ -689,22 +694,22 @@ void config_facade_get_bg_color (ConfigFacade* self, GdkRGBA* result) {
 	*result = _tmp3_;
 #line 99 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return;
-#line 693 "Config.c"
+#line 698 "Config.c"
 }
 
 
 void config_facade_get_selected_color (ConfigFacade* self, gboolean in_focus, GdkRGBA* result) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 102 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
 #line 103 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp0_ = in_focus;
 #line 103 "/home/jens/Source/shotwell/src/config/Config.vala"
 	if (_tmp0_) {
-#line 705 "Config.c"
-		const gchar* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
-		const gchar* _tmp3_ = NULL;
+#line 710 "Config.c"
+		const gchar* _tmp1_;
+		gboolean _tmp2_;
+		const gchar* _tmp3_;
 		GdkRGBA _tmp4_ = {0};
 #line 104 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp1_ = self->priv->selected_color;
@@ -714,7 +719,7 @@ void config_facade_get_selected_color (ConfigFacade* self, gboolean in_focus, Gd
 		if (_tmp2_) {
 #line 105 "/home/jens/Source/shotwell/src/config/Config.vala"
 			config_facade_get_colors (self);
-#line 718 "Config.c"
+#line 723 "Config.c"
 		}
 #line 107 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp3_ = self->priv->selected_color;
@@ -724,11 +729,11 @@ void config_facade_get_selected_color (ConfigFacade* self, gboolean in_focus, Gd
 		*result = _tmp4_;
 #line 107 "/home/jens/Source/shotwell/src/config/Config.vala"
 		return;
-#line 728 "Config.c"
+#line 733 "Config.c"
 	} else {
-		const gchar* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
-		const gchar* _tmp7_ = NULL;
+		const gchar* _tmp5_;
+		gboolean _tmp6_;
+		const gchar* _tmp7_;
 		GdkRGBA _tmp8_ = {0};
 #line 109 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp5_ = self->priv->unfocused_selected_color;
@@ -738,7 +743,7 @@ void config_facade_get_selected_color (ConfigFacade* self, gboolean in_focus, Gd
 		if (_tmp6_) {
 #line 110 "/home/jens/Source/shotwell/src/config/Config.vala"
 			config_facade_get_colors (self);
-#line 742 "Config.c"
+#line 747 "Config.c"
 		}
 #line 112 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp7_ = self->priv->unfocused_selected_color;
@@ -748,15 +753,15 @@ void config_facade_get_selected_color (ConfigFacade* self, gboolean in_focus, Gd
 		*result = _tmp8_;
 #line 112 "/home/jens/Source/shotwell/src/config/Config.vala"
 		return;
-#line 752 "Config.c"
+#line 757 "Config.c"
 	}
 }
 
 
 void config_facade_get_unselected_color (ConfigFacade* self, GdkRGBA* result) {
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
+	const gchar* _tmp2_;
 	GdkRGBA _tmp3_ = {0};
 #line 116 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
@@ -768,7 +773,7 @@ void config_facade_get_unselected_color (ConfigFacade* self, GdkRGBA* result) {
 	if (_tmp1_) {
 #line 118 "/home/jens/Source/shotwell/src/config/Config.vala"
 		config_facade_get_colors (self);
-#line 772 "Config.c"
+#line 777 "Config.c"
 	}
 #line 120 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp2_ = self->priv->unselected_color;
@@ -778,14 +783,14 @@ void config_facade_get_unselected_color (ConfigFacade* self, GdkRGBA* result) {
 	*result = _tmp3_;
 #line 120 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return;
-#line 782 "Config.c"
+#line 787 "Config.c"
 }
 
 
 void config_facade_get_border_color (ConfigFacade* self, GdkRGBA* result) {
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
+	const gchar* _tmp2_;
 	GdkRGBA _tmp3_ = {0};
 #line 123 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
@@ -797,7 +802,7 @@ void config_facade_get_border_color (ConfigFacade* self, GdkRGBA* result) {
 	if (_tmp1_) {
 #line 125 "/home/jens/Source/shotwell/src/config/Config.vala"
 		config_facade_get_colors (self);
-#line 801 "Config.c"
+#line 806 "Config.c"
 	}
 #line 127 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp2_ = self->priv->border_color;
@@ -807,17 +812,17 @@ void config_facade_get_border_color (ConfigFacade* self, GdkRGBA* result) {
 	*result = _tmp3_;
 #line 127 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return;
-#line 811 "Config.c"
+#line 816 "Config.c"
 }
 
 
 void config_facade_set_bg_color (ConfigFacade* self, GdkRGBA* color) {
 	guint8 col_tmp = 0U;
-	GdkRGBA _tmp0_ = {0};
-	gdouble _tmp1_ = 0.0;
-	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	GdkRGBA _tmp4_ = {0};
+	GdkRGBA _tmp0_;
+	gdouble _tmp1_;
+	gchar* _tmp2_;
+	const gchar* _tmp3_;
+	GdkRGBA _tmp4_;
 #line 130 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
 #line 130 "/home/jens/Source/shotwell/src/config/Config.vala"
@@ -842,19 +847,19 @@ void config_facade_set_bg_color (ConfigFacade* self, GdkRGBA* color) {
 	_tmp4_ = *color;
 #line 136 "/home/jens/Source/shotwell/src/config/Config.vala"
 	config_facade_set_text_colors (self, &_tmp4_);
-#line 846 "Config.c"
+#line 851 "Config.c"
 }
 
 
 void config_facade_commit_bg_color (ConfigFacade* self) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 139 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
 #line 140 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp0_ = self->priv->bg_color;
 #line 140 "/home/jens/Source/shotwell/src/config/Config.vala"
 	CONFIGURATION_FACADE_CLASS (config_facade_parent_class)->set_bg_color_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp0_);
-#line 858 "Config.c"
+#line 863 "Config.c"
 }
 
 
@@ -866,8 +871,8 @@ static void config_facade_class_init (ConfigFacadeClass * klass) {
 #line 18 "/home/jens/Source/shotwell/src/config/Config.vala"
 	G_OBJECT_CLASS (klass)->finalize = config_facade_finalize;
 #line 18 "/home/jens/Source/shotwell/src/config/Config.vala"
-	g_signal_new ("colors_changed", CONFIG_TYPE_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 871 "Config.c"
+	config_facade_signals[CONFIG_FACADE_COLORS_CHANGED_SIGNAL] = g_signal_new ("colors-changed", CONFIG_TYPE_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 876 "Config.c"
 }
 
 
@@ -884,11 +889,11 @@ static void config_facade_instance_init (ConfigFacade * self) {
 	self->priv->unfocused_selected_color = NULL;
 #line 46 "/home/jens/Source/shotwell/src/config/Config.vala"
 	self->priv->border_color = NULL;
-#line 888 "Config.c"
+#line 893 "Config.c"
 }
 
 
-static void config_facade_finalize (GObject* obj) {
+static void config_facade_finalize (GObject * obj) {
 	ConfigFacade * self;
 #line 18 "/home/jens/Source/shotwell/src/config/Config.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CONFIG_TYPE_FACADE, ConfigFacade);
@@ -904,7 +909,7 @@ static void config_facade_finalize (GObject* obj) {
 	_g_free0 (self->priv->border_color);
 #line 18 "/home/jens/Source/shotwell/src/config/Config.vala"
 	G_OBJECT_CLASS (config_facade_parent_class)->finalize (obj);
-#line 908 "Config.c"
+#line 913 "Config.c"
 }
 
 
diff --git a/src/config/ConfigurationInterfaces.c b/src/config/ConfigurationInterfaces.c
index 3b225bb..1b7a93f 100644
--- a/src/config/ConfigurationInterfaces.c
+++ b/src/config/ConfigurationInterfaces.c
@@ -1,4 +1,4 @@
-/* ConfigurationInterfaces.c generated by valac 0.34.7, the Vala compiler
+/* ConfigurationInterfaces.c generated by valac 0.36.6, the Vala compiler
  * generated from ConfigurationInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -27,6 +27,11 @@
 
 typedef struct _ConfigurationEngine ConfigurationEngine;
 typedef struct _ConfigurationEngineIface ConfigurationEngineIface;
+enum  {
+	CONFIGURATION_ENGINE_PROPERTY_CHANGED_SIGNAL,
+	CONFIGURATION_ENGINE_LAST_SIGNAL
+};
+static guint configuration_engine_signals[CONFIGURATION_ENGINE_LAST_SIGNAL] = {0};
 
 #define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
 #define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
@@ -56,6 +61,16 @@ typedef struct _Dimensions Dimensions;
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 #define RESOURCES_TYPE_UNIT_SYSTEM (resources_unit_system_get_type ())
+enum  {
+	CONFIGURATION_FACADE_AUTO_IMPORT_FROM_LIBRARY_CHANGED_SIGNAL,
+	CONFIGURATION_FACADE_BG_COLOR_NAME_CHANGED_SIGNAL,
+	CONFIGURATION_FACADE_COMMIT_METADATA_TO_MASTERS_CHANGED_SIGNAL,
+	CONFIGURATION_FACADE_EVENTS_SORT_ASCENDING_CHANGED_SIGNAL,
+	CONFIGURATION_FACADE_EXTERNAL_APP_CHANGED_SIGNAL,
+	CONFIGURATION_FACADE_IMPORT_DIRECTORY_CHANGED_SIGNAL,
+	CONFIGURATION_FACADE_LAST_SIGNAL
+};
+static guint configuration_facade_signals[CONFIGURATION_FACADE_LAST_SIGNAL] = {0};
 
 typedef enum  {
 	CONFIGURATION_ERROR_PROPERTY_HAS_NO_VALUE,
@@ -686,7 +701,7 @@ FuzzyPropertyState configuration_facade_is_plugin_enabled (ConfigurationFacade*
 static FuzzyPropertyState configuration_facade_real_is_plugin_enabled (ConfigurationFacade* self, const gchar* id);
 void configuration_facade_set_plugin_enabled (ConfigurationFacade* self, const gchar* id, gboolean enabled);
 static void configuration_facade_real_set_plugin_enabled (ConfigurationFacade* self, const gchar* id, gboolean enabled);
-static void configuration_facade_finalize (GObject* obj);
+static void configuration_facade_finalize (GObject * obj);
 
 
 GQuark configuration_error_quark (void) {
@@ -712,907 +727,907 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 	switch (self) {
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY:
-#line 716 "ConfigurationInterfaces.c"
+#line 731 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp0_ = NULL;
+			gchar* _tmp0_;
 #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp0_ = g_strdup ("AUTO_IMPORT_FROM_LIBRARY");
 #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp0_;
 #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 725 "ConfigurationInterfaces.c"
+#line 740 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_BG_COLOR_NAME:
-#line 729 "ConfigurationInterfaces.c"
+#line 744 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp1_ = g_strdup ("BG_COLOR_NAME");
 #line 102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp1_;
 #line 102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 738 "ConfigurationInterfaces.c"
+#line 753 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS:
-#line 742 "ConfigurationInterfaces.c"
+#line 757 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp2_ = g_strdup ("COMMIT_METADATA_TO_MASTERS");
 #line 105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp2_;
 #line 105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 751 "ConfigurationInterfaces.c"
+#line 766 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE:
-#line 755 "ConfigurationInterfaces.c"
+#line 770 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp3_ = NULL;
+			gchar* _tmp3_;
 #line 108 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp3_ = g_strdup ("DESKTOP_BACKGROUND_FILE");
 #line 108 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp3_;
 #line 108 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 764 "ConfigurationInterfaces.c"
+#line 779 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE:
-#line 768 "ConfigurationInterfaces.c"
+#line 783 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp4_ = NULL;
+			gchar* _tmp4_;
 #line 111 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp4_ = g_strdup ("DESKTOP_BACKGROUND_MODE");
 #line 111 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp4_;
 #line 111 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 777 "ConfigurationInterfaces.c"
+#line 792 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SCREENSAVER_FILE:
-#line 781 "ConfigurationInterfaces.c"
+#line 796 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp5_ = NULL;
+			gchar* _tmp5_;
 #line 114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp5_ = g_strdup ("SCREENSAVER_FILE");
 #line 114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp5_;
 #line 114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 790 "ConfigurationInterfaces.c"
+#line 805 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SCREENSAVER_MODE:
-#line 794 "ConfigurationInterfaces.c"
+#line 809 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp6_ = NULL;
+			gchar* _tmp6_;
 #line 117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp6_ = g_strdup ("SCREENSAVER_MODE");
 #line 117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp6_;
 #line 117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 803 "ConfigurationInterfaces.c"
+#line 818 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN:
-#line 807 "ConfigurationInterfaces.c"
+#line 822 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp7_ = NULL;
+			gchar* _tmp7_;
 #line 120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp7_ = g_strdup ("DIRECTORY_PATTERN");
 #line 120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp7_;
 #line 120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 816 "ConfigurationInterfaces.c"
+#line 831 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM:
-#line 820 "ConfigurationInterfaces.c"
+#line 835 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp8_ = NULL;
+			gchar* _tmp8_;
 #line 123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp8_ = g_strdup ("DIRECTORY_PATTERN_CUSTOM");
 #line 123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp8_;
 #line 123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 829 "ConfigurationInterfaces.c"
+#line 844 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT:
-#line 833 "ConfigurationInterfaces.c"
+#line 848 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp9_ = NULL;
+			gchar* _tmp9_;
 #line 126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp9_ = g_strdup ("DIRECT_WINDOW_HEIGHT");
 #line 126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp9_;
 #line 126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 842 "ConfigurationInterfaces.c"
+#line 857 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE:
-#line 846 "ConfigurationInterfaces.c"
+#line 861 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp10_ = NULL;
+			gchar* _tmp10_;
 #line 129 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp10_ = g_strdup ("DIRECT_WINDOW_MAXIMIZE");
 #line 129 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp10_;
 #line 129 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 855 "ConfigurationInterfaces.c"
+#line 870 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH:
-#line 859 "ConfigurationInterfaces.c"
+#line 874 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp11_ = NULL;
+			gchar* _tmp11_;
 #line 132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp11_ = g_strdup ("DIRECT_WINDOW_WIDTH");
 #line 132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp11_;
 #line 132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 868 "ConfigurationInterfaces.c"
+#line 883 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES:
-#line 872 "ConfigurationInterfaces.c"
+#line 887 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp12_ = NULL;
+			gchar* _tmp12_;
 #line 135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp12_ = g_strdup ("DISPLAY_BASIC_PROPERTIES");
 #line 135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp12_;
 #line 135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 881 "ConfigurationInterfaces.c"
+#line 896 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES:
-#line 885 "ConfigurationInterfaces.c"
+#line 900 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp13_ = NULL;
+			gchar* _tmp13_;
 #line 138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp13_ = g_strdup ("DISPLAY_EXTENDED_PROPERTIES");
 #line 138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp13_;
 #line 138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 894 "ConfigurationInterfaces.c"
+#line 909 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR:
-#line 898 "ConfigurationInterfaces.c"
+#line 913 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp14_ = NULL;
+			gchar* _tmp14_;
 #line 141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp14_ = g_strdup ("DISPLAY_SIDEBAR");
 #line 141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp14_;
 #line 141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 907 "ConfigurationInterfaces.c"
+#line 922 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR:
-#line 911 "ConfigurationInterfaces.c"
+#line 926 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp15_ = NULL;
+			gchar* _tmp15_;
 #line 144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp15_ = g_strdup ("DISPLAY_TOOLBAR");
 #line 144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp15_;
 #line 144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 920 "ConfigurationInterfaces.c"
+#line 935 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR:
-#line 924 "ConfigurationInterfaces.c"
+#line 939 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp16_ = NULL;
+			gchar* _tmp16_;
 #line 147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp16_ = g_strdup ("DISPLAY_SEARCH_BAR");
 #line 147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp16_;
 #line 147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 933 "ConfigurationInterfaces.c"
+#line 948 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS:
-#line 937 "ConfigurationInterfaces.c"
+#line 952 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp17_ = NULL;
+			gchar* _tmp17_;
 #line 150 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp17_ = g_strdup ("DISPLAY_PHOTO_RATINGS");
 #line 150 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp17_;
 #line 150 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 946 "ConfigurationInterfaces.c"
+#line 961 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS:
-#line 950 "ConfigurationInterfaces.c"
+#line 965 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp18_ = NULL;
+			gchar* _tmp18_;
 #line 153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp18_ = g_strdup ("DISPLAY_PHOTO_TAGS");
 #line 153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp18_;
 #line 153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 959 "ConfigurationInterfaces.c"
+#line 974 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES:
-#line 963 "ConfigurationInterfaces.c"
+#line 978 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp19_ = NULL;
+			gchar* _tmp19_;
 #line 156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp19_ = g_strdup ("DISPLAY_PHOTO_TITLES");
 #line 156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp19_;
 #line 156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 972 "ConfigurationInterfaces.c"
+#line 987 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS:
-#line 976 "ConfigurationInterfaces.c"
+#line 991 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp20_ = NULL;
+			gchar* _tmp20_;
 #line 159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp20_ = g_strdup ("DISPLAY_PHOTO_COMMENTS");
 #line 159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp20_;
 #line 159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 985 "ConfigurationInterfaces.c"
+#line 1000 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS:
-#line 989 "ConfigurationInterfaces.c"
+#line 1004 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp21_ = NULL;
+			gchar* _tmp21_;
 #line 162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp21_ = g_strdup ("DISPLAY_EVENT_COMMENTS");
 #line 162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp21_;
 #line 162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 998 "ConfigurationInterfaces.c"
+#line 1013 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING:
-#line 1002 "ConfigurationInterfaces.c"
+#line 1017 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp22_ = NULL;
+			gchar* _tmp22_;
 #line 165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp22_ = g_strdup ("EVENT_PHOTOS_SORT_ASCENDING");
 #line 165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp22_;
 #line 165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1011 "ConfigurationInterfaces.c"
+#line 1026 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY:
-#line 1015 "ConfigurationInterfaces.c"
+#line 1030 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp23_ = NULL;
+			gchar* _tmp23_;
 #line 168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp23_ = g_strdup ("EVENT_PHOTOS_SORT_BY");
 #line 168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp23_;
 #line 168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1024 "ConfigurationInterfaces.c"
+#line 1039 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING:
-#line 1028 "ConfigurationInterfaces.c"
+#line 1043 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp24_ = NULL;
+			gchar* _tmp24_;
 #line 171 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp24_ = g_strdup ("EVENTS_SORT_ASCENDING");
 #line 171 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp24_;
 #line 171 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1037 "ConfigurationInterfaces.c"
+#line 1052 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT:
-#line 1041 "ConfigurationInterfaces.c"
+#line 1056 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp25_ = NULL;
+			gchar* _tmp25_;
 #line 174 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp25_ = g_strdup ("EXPORT_CONSTRAINT");
 #line 174 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp25_;
 #line 174 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1050 "ConfigurationInterfaces.c"
+#line 1065 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE:
-#line 1054 "ConfigurationInterfaces.c"
+#line 1069 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp26_ = NULL;
+			gchar* _tmp26_;
 #line 177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp26_ = g_strdup ("EXPORT_EXPORT_FORMAT_MODE");
 #line 177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp26_;
 #line 177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1063 "ConfigurationInterfaces.c"
+#line 1078 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA:
-#line 1067 "ConfigurationInterfaces.c"
+#line 1082 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp27_ = NULL;
+			gchar* _tmp27_;
 #line 180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp27_ = g_strdup ("EXPORT_EXPORT_METADATA");
 #line 180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp27_;
 #line 180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1076 "ConfigurationInterfaces.c"
+#line 1091 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT:
-#line 1080 "ConfigurationInterfaces.c"
+#line 1095 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp28_ = NULL;
+			gchar* _tmp28_;
 #line 183 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp28_ = g_strdup ("EXPORT_PHOTO_FILE_FORMAT");
 #line 183 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp28_;
 #line 183 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1089 "ConfigurationInterfaces.c"
+#line 1104 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_QUALITY:
-#line 1093 "ConfigurationInterfaces.c"
+#line 1108 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp29_ = NULL;
+			gchar* _tmp29_;
 #line 186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp29_ = g_strdup ("EXPORT_QUALITY");
 #line 186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp29_;
 #line 186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1102 "ConfigurationInterfaces.c"
+#line 1117 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_SCALE:
-#line 1106 "ConfigurationInterfaces.c"
+#line 1121 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp30_ = NULL;
+			gchar* _tmp30_;
 #line 189 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp30_ = g_strdup ("EXPORT_SCALE");
 #line 189 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp30_;
 #line 189 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1115 "ConfigurationInterfaces.c"
+#line 1130 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP:
-#line 1119 "ConfigurationInterfaces.c"
+#line 1134 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp31_ = NULL;
+			gchar* _tmp31_;
 #line 192 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp31_ = g_strdup ("EXTERNAL_PHOTO_APP");
 #line 192 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp31_;
 #line 192 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1128 "ConfigurationInterfaces.c"
+#line 1143 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP:
-#line 1132 "ConfigurationInterfaces.c"
+#line 1147 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp32_ = NULL;
+			gchar* _tmp32_;
 #line 195 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp32_ = g_strdup ("EXTERNAL_RAW_APP");
 #line 195 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp32_;
 #line 195 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1141 "ConfigurationInterfaces.c"
+#line 1156 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED:
-#line 1145 "ConfigurationInterfaces.c"
+#line 1160 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp33_ = NULL;
+			gchar* _tmp33_;
 #line 198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp33_ = g_strdup ("HIDE_PHOTOS_ALREADY_IMPORTED");
 #line 198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp33_;
 #line 198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1154 "ConfigurationInterfaces.c"
+#line 1169 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_IMPORT_DIR:
-#line 1158 "ConfigurationInterfaces.c"
+#line 1173 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp34_ = NULL;
+			gchar* _tmp34_;
 #line 201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp34_ = g_strdup ("IMPORT_DIR");
 #line 201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp34_;
 #line 201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1167 "ConfigurationInterfaces.c"
+#line 1182 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_KEEP_RELATIVITY:
-#line 1171 "ConfigurationInterfaces.c"
+#line 1186 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp35_ = NULL;
+			gchar* _tmp35_;
 #line 204 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp35_ = g_strdup ("KEEP_RELATIVITY");
 #line 204 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp35_;
 #line 204 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1180 "ConfigurationInterfaces.c"
+#line 1195 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT:
-#line 1184 "ConfigurationInterfaces.c"
+#line 1199 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp36_ = NULL;
+			gchar* _tmp36_;
 #line 207 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp36_ = g_strdup ("LAST_CROP_HEIGHT");
 #line 207 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp36_;
 #line 207 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1193 "ConfigurationInterfaces.c"
+#line 1208 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE:
-#line 1197 "ConfigurationInterfaces.c"
+#line 1212 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp37_ = NULL;
+			gchar* _tmp37_;
 #line 210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp37_ = g_strdup ("LAST_CROP_MENU_CHOICE");
 #line 210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp37_;
 #line 210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1206 "ConfigurationInterfaces.c"
+#line 1221 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH:
-#line 1210 "ConfigurationInterfaces.c"
+#line 1225 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp38_ = NULL;
+			gchar* _tmp38_;
 #line 213 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp38_ = g_strdup ("LAST_CROP_WIDTH");
 #line 213 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp38_;
 #line 213 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1219 "ConfigurationInterfaces.c"
+#line 1234 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LAST_USED_SERVICE:
-#line 1223 "ConfigurationInterfaces.c"
+#line 1238 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp39_ = NULL;
+			gchar* _tmp39_;
 #line 216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp39_ = g_strdup ("LAST_USED_SERVICE");
 #line 216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp39_;
 #line 216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1232 "ConfigurationInterfaces.c"
+#line 1247 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE:
-#line 1236 "ConfigurationInterfaces.c"
+#line 1251 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp40_ = NULL;
+			gchar* _tmp40_;
 #line 219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp40_ = g_strdup ("LAST_USED_DATAIMPORTS_SERVICE");
 #line 219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp40_;
 #line 219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1245 "ConfigurationInterfaces.c"
+#line 1260 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING:
-#line 1249 "ConfigurationInterfaces.c"
+#line 1264 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp41_ = NULL;
+			gchar* _tmp41_;
 #line 222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp41_ = g_strdup ("LIBRARY_PHOTOS_SORT_ASCENDING");
 #line 222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp41_;
 #line 222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1258 "ConfigurationInterfaces.c"
+#line 1273 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY:
-#line 1262 "ConfigurationInterfaces.c"
+#line 1277 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp42_ = NULL;
+			gchar* _tmp42_;
 #line 225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp42_ = g_strdup ("LIBRARY_PHOTOS_SORT_BY");
 #line 225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp42_;
 #line 225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1271 "ConfigurationInterfaces.c"
+#line 1286 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT:
-#line 1275 "ConfigurationInterfaces.c"
+#line 1290 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp43_ = NULL;
+			gchar* _tmp43_;
 #line 228 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp43_ = g_strdup ("LIBRARY_WINDOW_HEIGHT");
 #line 228 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp43_;
 #line 228 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1284 "ConfigurationInterfaces.c"
+#line 1299 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE:
-#line 1288 "ConfigurationInterfaces.c"
+#line 1303 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp44_ = NULL;
+			gchar* _tmp44_;
 #line 231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp44_ = g_strdup ("LIBRARY_WINDOW_MAXIMIZE");
 #line 231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp44_;
 #line 231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1297 "ConfigurationInterfaces.c"
+#line 1312 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH:
-#line 1301 "ConfigurationInterfaces.c"
+#line 1316 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp45_ = NULL;
+			gchar* _tmp45_;
 #line 234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp45_ = g_strdup ("LIBRARY_WINDOW_WIDTH");
 #line 234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp45_;
 #line 234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1310 "ConfigurationInterfaces.c"
+#line 1325 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS:
-#line 1314 "ConfigurationInterfaces.c"
+#line 1329 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp46_ = NULL;
+			gchar* _tmp46_;
 #line 237 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp46_ = g_strdup ("MODIFY_ORIGINALS");
 #line 237 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp46_;
 #line 237 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1323 "ConfigurationInterfaces.c"
+#line 1338 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE:
-#line 1327 "ConfigurationInterfaces.c"
+#line 1342 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp47_ = NULL;
+			gchar* _tmp47_;
 #line 240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp47_ = g_strdup ("PHOTO_THUMBNAIL_SCALE");
 #line 240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp47_;
 #line 240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1336 "ConfigurationInterfaces.c"
+#line 1351 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE:
-#line 1340 "ConfigurationInterfaces.c"
+#line 1355 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp48_ = NULL;
+			gchar* _tmp48_;
 #line 243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp48_ = g_strdup ("PIN_TOOLBAR_STATE");
 #line 243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp48_;
 #line 243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1349 "ConfigurationInterfaces.c"
+#line 1364 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT:
-#line 1353 "ConfigurationInterfaces.c"
+#line 1368 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp49_ = NULL;
+			gchar* _tmp49_;
 #line 246 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp49_ = g_strdup ("PRINTING_CONTENT_HEIGHT");
 #line 246 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp49_;
 #line 246 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1362 "ConfigurationInterfaces.c"
+#line 1377 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT:
-#line 1366 "ConfigurationInterfaces.c"
+#line 1381 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp50_ = NULL;
+			gchar* _tmp50_;
 #line 249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp50_ = g_strdup ("PRINTING_CONTENT_LAYOUT");
 #line 249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp50_;
 #line 249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1375 "ConfigurationInterfaces.c"
+#line 1390 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI:
-#line 1379 "ConfigurationInterfaces.c"
+#line 1394 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp51_ = NULL;
+			gchar* _tmp51_;
 #line 252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp51_ = g_strdup ("PRINTING_CONTENT_PPI");
 #line 252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp51_;
 #line 252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1388 "ConfigurationInterfaces.c"
+#line 1403 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS:
-#line 1392 "ConfigurationInterfaces.c"
+#line 1407 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp52_ = NULL;
+			gchar* _tmp52_;
 #line 255 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp52_ = g_strdup ("PRINTING_CONTENT_UNITS");
 #line 255 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp52_;
 #line 255 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1401 "ConfigurationInterfaces.c"
+#line 1416 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH:
-#line 1405 "ConfigurationInterfaces.c"
+#line 1420 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp53_ = NULL;
+			gchar* _tmp53_;
 #line 258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp53_ = g_strdup ("PRINTING_CONTENT_WIDTH");
 #line 258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp53_;
 #line 258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1414 "ConfigurationInterfaces.c"
+#line 1429 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE:
-#line 1418 "ConfigurationInterfaces.c"
+#line 1433 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp54_ = NULL;
+			gchar* _tmp54_;
 #line 261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp54_ = g_strdup ("PRINTING_IMAGES_PER_PAGE");
 #line 261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp54_;
 #line 261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1427 "ConfigurationInterfaces.c"
+#line 1442 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO:
-#line 1431 "ConfigurationInterfaces.c"
+#line 1446 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp55_ = NULL;
+			gchar* _tmp55_;
 #line 264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp55_ = g_strdup ("PRINTING_MATCH_ASPECT_RATIO");
 #line 264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp55_;
 #line 264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1440 "ConfigurationInterfaces.c"
+#line 1455 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES:
-#line 1444 "ConfigurationInterfaces.c"
+#line 1459 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp56_ = NULL;
+			gchar* _tmp56_;
 #line 267 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp56_ = g_strdup ("PRINTING_PRINT_TITLES");
 #line 267 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp56_;
 #line 267 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1453 "ConfigurationInterfaces.c"
+#line 1468 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION:
-#line 1457 "ConfigurationInterfaces.c"
+#line 1472 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp57_ = NULL;
+			gchar* _tmp57_;
 #line 270 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp57_ = g_strdup ("PRINTING_SIZE_SELECTION");
 #line 270 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp57_;
 #line 270 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1466 "ConfigurationInterfaces.c"
+#line 1481 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT:
-#line 1470 "ConfigurationInterfaces.c"
+#line 1485 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp58_ = NULL;
+			gchar* _tmp58_;
 #line 273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp58_ = g_strdup ("PRINTING_TITLES_FONT");
 #line 273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp58_;
 #line 273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1479 "ConfigurationInterfaces.c"
+#line 1494 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT:
-#line 1483 "ConfigurationInterfaces.c"
+#line 1498 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp59_ = NULL;
+			gchar* _tmp59_;
 #line 276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp59_ = g_strdup ("RAW_DEVELOPER_DEFAULT");
 #line 276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp59_;
 #line 276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1492 "ConfigurationInterfaces.c"
+#line 1507 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG:
-#line 1496 "ConfigurationInterfaces.c"
+#line 1511 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp60_ = NULL;
+			gchar* _tmp60_;
 #line 279 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp60_ = g_strdup ("SHOW_WELCOME_DIALOG");
 #line 279 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp60_;
 #line 279 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1505 "ConfigurationInterfaces.c"
+#line 1520 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SIDEBAR_POSITION:
-#line 1509 "ConfigurationInterfaces.c"
+#line 1524 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp61_ = NULL;
+			gchar* _tmp61_;
 #line 282 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp61_ = g_strdup ("SIDEBAR_POSITION");
 #line 282 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp61_;
 #line 282 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1518 "ConfigurationInterfaces.c"
+#line 1533 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY:
-#line 1522 "ConfigurationInterfaces.c"
+#line 1537 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp62_ = NULL;
+			gchar* _tmp62_;
 #line 285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp62_ = g_strdup ("SLIDESHOW_DELAY");
 #line 285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp62_;
 #line 285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1531 "ConfigurationInterfaces.c"
+#line 1546 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY:
-#line 1535 "ConfigurationInterfaces.c"
+#line 1550 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp63_ = NULL;
+			gchar* _tmp63_;
 #line 288 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp63_ = g_strdup ("SLIDESHOW_TRANSITION_DELAY");
 #line 288 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp63_;
 #line 288 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1544 "ConfigurationInterfaces.c"
+#line 1559 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID:
-#line 1548 "ConfigurationInterfaces.c"
+#line 1563 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp64_ = NULL;
+			gchar* _tmp64_;
 #line 291 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp64_ = g_strdup ("SLIDESHOW_TRANSITION_EFFECT_ID");
 #line 291 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp64_;
 #line 291 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1557 "ConfigurationInterfaces.c"
+#line 1572 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE:
-#line 1561 "ConfigurationInterfaces.c"
+#line 1576 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp65_ = NULL;
+			gchar* _tmp65_;
 #line 294 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp65_ = g_strdup ("SLIDESHOW_SHOW_TITLE");
 #line 294 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp65_;
 #line 294 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1570 "ConfigurationInterfaces.c"
+#line 1585 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME:
-#line 1574 "ConfigurationInterfaces.c"
+#line 1589 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp66_ = NULL;
+			gchar* _tmp66_;
 #line 297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp66_ = g_strdup ("USE_24_HOUR_TIME");
 #line 297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp66_;
 #line 297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1583 "ConfigurationInterfaces.c"
+#line 1598 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES:
-#line 1587 "ConfigurationInterfaces.c"
+#line 1602 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp67_ = NULL;
+			gchar* _tmp67_;
 #line 300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp67_ = g_strdup ("USE_LOWERCASE_FILENAMES");
 #line 300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp67_;
 #line 300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1596 "ConfigurationInterfaces.c"
+#line 1611 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE:
-#line 1600 "ConfigurationInterfaces.c"
+#line 1615 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp68_ = NULL;
+			gchar* _tmp68_;
 #line 303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp68_ = g_strdup ("VIDEO_INTERPRETER_STATE_COOKIE");
 #line 303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp68_;
 #line 303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1609 "ConfigurationInterfaces.c"
+#line 1624 "ConfigurationInterfaces.c"
 		}
 		default:
 		{
 #line 306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_error ("ConfigurationInterfaces.vala:306: unknown ConfigurableProperty enumera" \
 "tion value");
-#line 1615 "ConfigurationInterfaces.c"
+#line 1630 "ConfigurationInterfaces.c"
 		}
 	}
 }
@@ -1635,7 +1650,7 @@ gchar* configuration_engine_get_name (ConfigurationEngine* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL);
 #line 314 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_name (self);
-#line 1638 "ConfigurationInterfaces.c"
+#line 1653 "ConfigurationInterfaces.c"
 }
 
 
@@ -1644,7 +1659,7 @@ gint configuration_engine_get_int_property (ConfigurationEngine* self, Configura
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
 #line 316 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_int_property (self, p, error);
-#line 1647 "ConfigurationInterfaces.c"
+#line 1662 "ConfigurationInterfaces.c"
 }
 
 
@@ -1653,7 +1668,7 @@ void configuration_engine_set_int_property (ConfigurationEngine* self, Configura
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 317 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_int_property (self, p, val, error);
-#line 1656 "ConfigurationInterfaces.c"
+#line 1671 "ConfigurationInterfaces.c"
 }
 
 
@@ -1662,7 +1677,7 @@ gint configuration_engine_get_enum_property (ConfigurationEngine* self, Configur
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
 #line 319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_enum_property (self, p, error);
-#line 1665 "ConfigurationInterfaces.c"
+#line 1680 "ConfigurationInterfaces.c"
 }
 
 
@@ -1671,7 +1686,7 @@ void configuration_engine_set_enum_property (ConfigurationEngine* self, Configur
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 320 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_enum_property (self, p, val, error);
-#line 1674 "ConfigurationInterfaces.c"
+#line 1689 "ConfigurationInterfaces.c"
 }
 
 
@@ -1680,7 +1695,7 @@ gchar* configuration_engine_get_string_property (ConfigurationEngine* self, Conf
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL);
 #line 322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_string_property (self, p, error);
-#line 1683 "ConfigurationInterfaces.c"
+#line 1698 "ConfigurationInterfaces.c"
 }
 
 
@@ -1689,7 +1704,7 @@ void configuration_engine_set_string_property (ConfigurationEngine* self, Config
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_string_property (self, p, val, error);
-#line 1692 "ConfigurationInterfaces.c"
+#line 1707 "ConfigurationInterfaces.c"
 }
 
 
@@ -1698,7 +1713,7 @@ gboolean configuration_engine_get_bool_property (ConfigurationEngine* self, Conf
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), FALSE);
 #line 325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_bool_property (self, p, error);
-#line 1701 "ConfigurationInterfaces.c"
+#line 1716 "ConfigurationInterfaces.c"
 }
 
 
@@ -1707,7 +1722,7 @@ void configuration_engine_set_bool_property (ConfigurationEngine* self, Configur
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_bool_property (self, p, val, error);
-#line 1710 "ConfigurationInterfaces.c"
+#line 1725 "ConfigurationInterfaces.c"
 }
 
 
@@ -1716,7 +1731,7 @@ gdouble configuration_engine_get_double_property (ConfigurationEngine* self, Con
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0.0);
 #line 328 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_double_property (self, p, error);
-#line 1719 "ConfigurationInterfaces.c"
+#line 1734 "ConfigurationInterfaces.c"
 }
 
 
@@ -1725,7 +1740,7 @@ void configuration_engine_set_double_property (ConfigurationEngine* self, Config
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 329 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_double_property (self, p, val, error);
-#line 1728 "ConfigurationInterfaces.c"
+#line 1743 "ConfigurationInterfaces.c"
 }
 
 
@@ -1734,7 +1749,7 @@ gboolean configuration_engine_get_plugin_bool (ConfigurationEngine* self, const
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), FALSE);
 #line 331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_bool (self, domain, id, key, def);
-#line 1737 "ConfigurationInterfaces.c"
+#line 1752 "ConfigurationInterfaces.c"
 }
 
 
@@ -1743,7 +1758,7 @@ void configuration_engine_set_plugin_bool (ConfigurationEngine* self, const gcha
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_bool (self, domain, id, key, val);
-#line 1746 "ConfigurationInterfaces.c"
+#line 1761 "ConfigurationInterfaces.c"
 }
 
 
@@ -1752,7 +1767,7 @@ gdouble configuration_engine_get_plugin_double (ConfigurationEngine* self, const
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0.0);
 #line 333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_double (self, domain, id, key, def);
-#line 1755 "ConfigurationInterfaces.c"
+#line 1770 "ConfigurationInterfaces.c"
 }
 
 
@@ -1761,7 +1776,7 @@ void configuration_engine_set_plugin_double (ConfigurationEngine* self, const gc
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_double (self, domain, id, key, val);
-#line 1764 "ConfigurationInterfaces.c"
+#line 1779 "ConfigurationInterfaces.c"
 }
 
 
@@ -1770,7 +1785,7 @@ gint configuration_engine_get_plugin_int (ConfigurationEngine* self, const gchar
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
 #line 335 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_int (self, domain, id, key, def);
-#line 1773 "ConfigurationInterfaces.c"
+#line 1788 "ConfigurationInterfaces.c"
 }
 
 
@@ -1779,7 +1794,7 @@ void configuration_engine_set_plugin_int (ConfigurationEngine* self, const gchar
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_int (self, domain, id, key, val);
-#line 1782 "ConfigurationInterfaces.c"
+#line 1797 "ConfigurationInterfaces.c"
 }
 
 
@@ -1788,7 +1803,7 @@ gchar* configuration_engine_get_plugin_string (ConfigurationEngine* self, const
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL);
 #line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_string (self, domain, id, key, def);
-#line 1791 "ConfigurationInterfaces.c"
+#line 1806 "ConfigurationInterfaces.c"
 }
 
 
@@ -1797,7 +1812,7 @@ void configuration_engine_set_plugin_string (ConfigurationEngine* self, const gc
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_string (self, domain, id, key, val);
-#line 1800 "ConfigurationInterfaces.c"
+#line 1815 "ConfigurationInterfaces.c"
 }
 
 
@@ -1806,7 +1821,7 @@ void configuration_engine_unset_plugin_key (ConfigurationEngine* self, const gch
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->unset_plugin_key (self, domain, id, key);
-#line 1809 "ConfigurationInterfaces.c"
+#line 1824 "ConfigurationInterfaces.c"
 }
 
 
@@ -1815,7 +1830,7 @@ FuzzyPropertyState configuration_engine_is_plugin_enabled (ConfigurationEngine*
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
 #line 341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->is_plugin_enabled (self, id);
-#line 1818 "ConfigurationInterfaces.c"
+#line 1833 "ConfigurationInterfaces.c"
 }
 
 
@@ -1824,7 +1839,7 @@ void configuration_engine_set_plugin_enabled (ConfigurationEngine* self, const g
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_enabled (self, id, enabled);
-#line 1827 "ConfigurationInterfaces.c"
+#line 1842 "ConfigurationInterfaces.c"
 }
 
 
@@ -1836,8 +1851,8 @@ static void configuration_engine_base_init (ConfigurationEngineIface * iface) {
 #line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		initialized = TRUE;
 #line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		g_signal_new ("property_changed", TYPE_CONFIGURATION_ENGINE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__ENUM, G_TYPE_NONE, 1, TYPE_CONFIGURABLE_PROPERTY);
-#line 1840 "ConfigurationInterfaces.c"
+		configuration_engine_signals[CONFIGURATION_ENGINE_PROPERTY_CHANGED_SIGNAL] = g_signal_new ("property-changed", TYPE_CONFIGURATION_ENGINE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__ENUM, G_TYPE_NONE, 1, TYPE_CONFIGURABLE_PROPERTY);
+#line 1855 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -1858,22 +1873,22 @@ GType configuration_engine_get_type (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1861 "ConfigurationInterfaces.c"
+#line 1876 "ConfigurationInterfaces.c"
 }
 
 
 static void _configuration_facade_on_property_changed_configuration_engine_property_changed (ConfigurationEngine* _sender, ConfigurableProperty p, gpointer self) {
 #line 358 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_facade_on_property_changed ((ConfigurationFacade*) self, p);
-#line 1868 "ConfigurationInterfaces.c"
+#line 1883 "ConfigurationInterfaces.c"
 }
 
 
 ConfigurationFacade* configuration_facade_construct (GType object_type, ConfigurationEngine* engine) {
 	ConfigurationFacade * self = NULL;
-	ConfigurationEngine* _tmp0_ = NULL;
-	ConfigurationEngine* _tmp1_ = NULL;
-	ConfigurationEngine* _tmp2_ = NULL;
+	ConfigurationEngine* _tmp0_;
+	ConfigurationEngine* _tmp1_;
+	ConfigurationEngine* _tmp2_;
 #line 355 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (engine), NULL);
 #line 355 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1892,15 +1907,15 @@ ConfigurationFacade* configuration_facade_construct (GType object_type, Configur
 	g_signal_connect_object (_tmp2_, "property-changed", (GCallback) _configuration_facade_on_property_changed_configuration_engine_property_changed, self, 0);
 #line 355 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return self;
-#line 1895 "ConfigurationInterfaces.c"
+#line 1910 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_on_property_changed (ConfigurationFacade* self, ConfigurableProperty p) {
-	ConfigurableProperty _tmp0_ = 0;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	ConfigurableProperty _tmp3_ = 0;
+	ConfigurableProperty _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	ConfigurableProperty _tmp3_;
 #line 361 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1920,78 +1935,78 @@ static void configuration_facade_on_property_changed (ConfigurationFacade* self,
 	switch (_tmp3_) {
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY:
-#line 1922 "ConfigurationInterfaces.c"
+#line 1937 "ConfigurationInterfaces.c"
 		{
 #line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			g_signal_emit_by_name (self, "auto-import-from-library-changed");
+			g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_AUTO_IMPORT_FROM_LIBRARY_CHANGED_SIGNAL], 0);
 #line 367 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1928 "ConfigurationInterfaces.c"
+#line 1943 "ConfigurationInterfaces.c"
 		}
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_BG_COLOR_NAME:
-#line 1932 "ConfigurationInterfaces.c"
+#line 1947 "ConfigurationInterfaces.c"
 		{
 #line 370 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			g_signal_emit_by_name (self, "bg-color-name-changed");
+			g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_BG_COLOR_NAME_CHANGED_SIGNAL], 0);
 #line 371 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1938 "ConfigurationInterfaces.c"
+#line 1953 "ConfigurationInterfaces.c"
 		}
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS:
-#line 1942 "ConfigurationInterfaces.c"
+#line 1957 "ConfigurationInterfaces.c"
 		{
 #line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			g_signal_emit_by_name (self, "commit-metadata-to-masters-changed");
+			g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_COMMIT_METADATA_TO_MASTERS_CHANGED_SIGNAL], 0);
 #line 375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1948 "ConfigurationInterfaces.c"
+#line 1963 "ConfigurationInterfaces.c"
 		}
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING:
-#line 1952 "ConfigurationInterfaces.c"
+#line 1967 "ConfigurationInterfaces.c"
 		{
 #line 378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			g_signal_emit_by_name (self, "events-sort-ascending-changed");
+			g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_EVENTS_SORT_ASCENDING_CHANGED_SIGNAL], 0);
 #line 379 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1958 "ConfigurationInterfaces.c"
+#line 1973 "ConfigurationInterfaces.c"
 		}
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP:
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP:
-#line 1964 "ConfigurationInterfaces.c"
+#line 1979 "ConfigurationInterfaces.c"
 		{
 #line 383 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			g_signal_emit_by_name (self, "external-app-changed");
+			g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_EXTERNAL_APP_CHANGED_SIGNAL], 0);
 #line 384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1970 "ConfigurationInterfaces.c"
+#line 1985 "ConfigurationInterfaces.c"
 		}
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_IMPORT_DIR:
-#line 1974 "ConfigurationInterfaces.c"
+#line 1989 "ConfigurationInterfaces.c"
 		{
 #line 387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			g_signal_emit_by_name (self, "import-directory-changed");
+			g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_IMPORT_DIRECTORY_CHANGED_SIGNAL], 0);
 #line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1980 "ConfigurationInterfaces.c"
+#line 1995 "ConfigurationInterfaces.c"
 		}
 		default:
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		break;
-#line 1985 "ConfigurationInterfaces.c"
+#line 2000 "ConfigurationInterfaces.c"
 	}
 }
 
 
 ConfigurationEngine* configuration_facade_get_engine (ConfigurationFacade* self) {
 	ConfigurationEngine* result = NULL;
-	ConfigurationEngine* _tmp0_ = NULL;
-	ConfigurationEngine* _tmp1_ = NULL;
+	ConfigurationEngine* _tmp0_;
+	ConfigurationEngine* _tmp1_;
 #line 392 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2002,24 +2017,24 @@ ConfigurationEngine* configuration_facade_get_engine (ConfigurationFacade* self)
 	result = _tmp1_;
 #line 393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 2004 "ConfigurationInterfaces.c"
+#line 2019 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_on_configuration_error (ConfigurationFacade* self, GError* err) {
-	GError* _tmp0_ = NULL;
+	GError* _tmp0_;
 #line 396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = err;
 #line 397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (g_error_matches (_tmp0_, CONFIGURATION_ERROR, CONFIGURATION_ERROR_PROPERTY_HAS_NO_VALUE)) {
-#line 2016 "ConfigurationInterfaces.c"
-		ConfigurationEngine* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+#line 2031 "ConfigurationInterfaces.c"
+		ConfigurationEngine* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		GError* _tmp4_;
+		const gchar* _tmp5_;
 #line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = self->priv->engine;
 #line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2035,19 +2050,19 @@ void configuration_facade_on_configuration_error (ConfigurationFacade* self, GEr
 "OPERTY_HAS_NO_VALUE error: %s", _tmp3_, _tmp5_);
 #line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp3_);
-#line 2036 "ConfigurationInterfaces.c"
+#line 2051 "ConfigurationInterfaces.c"
 	} else {
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 401 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
 #line 401 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (g_error_matches (_tmp6_, CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR)) {
-#line 2043 "ConfigurationInterfaces.c"
-			ConfigurationEngine* _tmp7_ = NULL;
-			gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
-			GError* _tmp10_ = NULL;
-			const gchar* _tmp11_ = NULL;
+#line 2058 "ConfigurationInterfaces.c"
+			ConfigurationEngine* _tmp7_;
+			gchar* _tmp8_;
+			gchar* _tmp9_;
+			GError* _tmp10_;
+			const gchar* _tmp11_;
 #line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp7_ = self->priv->engine;
 #line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2063,13 +2078,13 @@ void configuration_facade_on_configuration_error (ConfigurationFacade* self, GEr
 "GINE_ERROR: %s", _tmp9_, _tmp11_);
 #line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_g_free0 (_tmp9_);
-#line 2063 "ConfigurationInterfaces.c"
+#line 2078 "ConfigurationInterfaces.c"
 		} else {
-			ConfigurationEngine* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			gchar* _tmp14_ = NULL;
-			GError* _tmp15_ = NULL;
-			const gchar* _tmp16_ = NULL;
+			ConfigurationEngine* _tmp12_;
+			gchar* _tmp13_;
+			gchar* _tmp14_;
+			GError* _tmp15_;
+			const gchar* _tmp16_;
 #line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp12_ = self->priv->engine;
 #line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2085,7 +2100,7 @@ void configuration_facade_on_configuration_error (ConfigurationFacade* self, GEr
 "known error: %s", _tmp14_, _tmp16_);
 #line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_g_free0 (_tmp14_);
-#line 2084 "ConfigurationInterfaces.c"
+#line 2099 "ConfigurationInterfaces.c"
 		}
 	}
 }
@@ -2097,10 +2112,10 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2115,12 +2130,12 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur
 		_tmp0_ = _tmp4_;
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2114 "ConfigurationInterfaces.c"
+#line 2129 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2118 "ConfigurationInterfaces.c"
-				goto __catch82_configuration_error;
+#line 2133 "ConfigurationInterfaces.c"
+				goto __catch83_configuration_error;
 			}
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2128,19 +2143,19 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur
 			g_clear_error (&_inner_error_);
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 2127 "ConfigurationInterfaces.c"
+#line 2142 "ConfigurationInterfaces.c"
 		}
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2133 "ConfigurationInterfaces.c"
+#line 2148 "ConfigurationInterfaces.c"
 	}
-	goto __finally82;
-	__catch82_configuration_error:
+	goto __finally83;
+	__catch83_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2155,16 +2170,16 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur
 		_g_error_free0 (err);
 #line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2154 "ConfigurationInterfaces.c"
+#line 2169 "ConfigurationInterfaces.c"
 	}
-	__finally82:
+	__finally83:
 #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 2163 "ConfigurationInterfaces.c"
+#line 2178 "ConfigurationInterfaces.c"
 }
 
 
@@ -2173,16 +2188,16 @@ gboolean configuration_facade_get_auto_import_from_library (ConfigurationFacade*
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 413 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_auto_import_from_library (self);
-#line 2172 "ConfigurationInterfaces.c"
+#line 2187 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_auto_import_from_library (ConfigurationFacade* self, gboolean auto_import) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2197,8 +2212,8 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2196 "ConfigurationInterfaces.c"
-				goto __catch83_configuration_error;
+#line 2211 "ConfigurationInterfaces.c"
+				goto __catch84_configuration_error;
 			}
 #line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2206,14 +2221,14 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio
 			g_clear_error (&_inner_error_);
 #line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2205 "ConfigurationInterfaces.c"
+#line 2220 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally83;
-	__catch83_configuration_error:
+	goto __finally84;
+	__catch84_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2226,9 +2241,9 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio
 		_g_error_free0 (err);
 #line 429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2225 "ConfigurationInterfaces.c"
+#line 2240 "ConfigurationInterfaces.c"
 	}
-	__finally83:
+	__finally84:
 #line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2237,7 +2252,7 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio
 		g_clear_error (&_inner_error_);
 #line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2236 "ConfigurationInterfaces.c"
+#line 2251 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2247,7 +2262,7 @@ void configuration_facade_set_auto_import_from_library (ConfigurationFacade* sel
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_auto_import_from_library (self, auto_import);
-#line 2246 "ConfigurationInterfaces.c"
+#line 2261 "ConfigurationInterfaces.c"
 }
 
 
@@ -2256,11 +2271,11 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 	GError * _inner_error_ = NULL;
 	{
 		gchar* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2277,8 +2292,8 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2276 "ConfigurationInterfaces.c"
-				goto __catch84_configuration_error;
+#line 2291 "ConfigurationInterfaces.c"
+				goto __catch85_configuration_error;
 			}
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2286,7 +2301,7 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2285 "ConfigurationInterfaces.c"
+#line 2300 "ConfigurationInterfaces.c"
 		}
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -2298,14 +2313,14 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 		_g_free0 (_tmp0_);
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2297 "ConfigurationInterfaces.c"
+#line 2312 "ConfigurationInterfaces.c"
 	}
-	goto __finally84;
-	__catch84_configuration_error:
+	goto __finally85;
+	__catch85_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		GError* _tmp6_;
+		gchar* _tmp7_;
 #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2322,16 +2337,16 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2321 "ConfigurationInterfaces.c"
+#line 2336 "ConfigurationInterfaces.c"
 	}
-	__finally84:
+	__finally85:
 #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2330 "ConfigurationInterfaces.c"
+#line 2345 "ConfigurationInterfaces.c"
 }
 
 
@@ -2340,7 +2355,7 @@ gchar* configuration_facade_get_bg_color_name (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_bg_color_name (self);
-#line 2339 "ConfigurationInterfaces.c"
+#line 2354 "ConfigurationInterfaces.c"
 }
 
 
@@ -2348,11 +2363,11 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 	GError * _inner_error_ = NULL;
 #line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (color_name != NULL);
-#line 2347 "ConfigurationInterfaces.c"
+#line 2362 "ConfigurationInterfaces.c"
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		const gchar* _tmp2_;
 #line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2367,8 +2382,8 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2366 "ConfigurationInterfaces.c"
-				goto __catch85_configuration_error;
+#line 2381 "ConfigurationInterfaces.c"
+				goto __catch86_configuration_error;
 			}
 #line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2376,14 +2391,14 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 			g_clear_error (&_inner_error_);
 #line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2375 "ConfigurationInterfaces.c"
+#line 2390 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally85;
-	__catch85_configuration_error:
+	goto __finally86;
+	__catch86_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2396,9 +2411,9 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 		_g_error_free0 (err);
 #line 451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2395 "ConfigurationInterfaces.c"
+#line 2410 "ConfigurationInterfaces.c"
 	}
-	__finally85:
+	__finally86:
 #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2407,7 +2422,7 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 		g_clear_error (&_inner_error_);
 #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2406 "ConfigurationInterfaces.c"
+#line 2421 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2417,7 +2432,7 @@ void configuration_facade_set_bg_color_name (ConfigurationFacade* self, const gc
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_bg_color_name (self, color_name);
-#line 2416 "ConfigurationInterfaces.c"
+#line 2431 "ConfigurationInterfaces.c"
 }
 
 
@@ -2427,10 +2442,10 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2445,12 +2460,12 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config
 		_tmp0_ = _tmp4_;
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2444 "ConfigurationInterfaces.c"
+#line 2459 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2448 "ConfigurationInterfaces.c"
-				goto __catch86_configuration_error;
+#line 2463 "ConfigurationInterfaces.c"
+				goto __catch87_configuration_error;
 			}
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2458,19 +2473,19 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config
 			g_clear_error (&_inner_error_);
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 2457 "ConfigurationInterfaces.c"
+#line 2472 "ConfigurationInterfaces.c"
 		}
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2463 "ConfigurationInterfaces.c"
+#line 2478 "ConfigurationInterfaces.c"
 	}
-	goto __finally86;
-	__catch86_configuration_error:
+	goto __finally87;
+	__catch87_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2485,16 +2500,16 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config
 		_g_error_free0 (err);
 #line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2484 "ConfigurationInterfaces.c"
+#line 2499 "ConfigurationInterfaces.c"
 	}
-	__finally86:
+	__finally87:
 #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 2493 "ConfigurationInterfaces.c"
+#line 2508 "ConfigurationInterfaces.c"
 }
 
 
@@ -2503,16 +2518,16 @@ gboolean configuration_facade_get_commit_metadata_to_masters (ConfigurationFacad
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_commit_metadata_to_masters (self);
-#line 2502 "ConfigurationInterfaces.c"
+#line 2517 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_commit_metadata_to_masters (ConfigurationFacade* self, gboolean commit_metadata) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2527,8 +2542,8 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2526 "ConfigurationInterfaces.c"
-				goto __catch87_configuration_error;
+#line 2541 "ConfigurationInterfaces.c"
+				goto __catch88_configuration_error;
 			}
 #line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2536,14 +2551,14 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat
 			g_clear_error (&_inner_error_);
 #line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2535 "ConfigurationInterfaces.c"
+#line 2550 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally87;
-	__catch87_configuration_error:
+	goto __finally88;
+	__catch88_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2556,9 +2571,9 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat
 		_g_error_free0 (err);
 #line 474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2555 "ConfigurationInterfaces.c"
+#line 2570 "ConfigurationInterfaces.c"
 	}
-	__finally87:
+	__finally88:
 #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2567,7 +2582,7 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat
 		g_clear_error (&_inner_error_);
 #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2566 "ConfigurationInterfaces.c"
+#line 2581 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2577,7 +2592,7 @@ void configuration_facade_set_commit_metadata_to_masters (ConfigurationFacade* s
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_commit_metadata_to_masters (self, commit_metadata);
-#line 2576 "ConfigurationInterfaces.c"
+#line 2591 "ConfigurationInterfaces.c"
 }
 
 
@@ -2586,11 +2601,11 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 	GError * _inner_error_ = NULL;
 	{
 		gchar* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2607,8 +2622,8 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2606 "ConfigurationInterfaces.c"
-				goto __catch88_configuration_error;
+#line 2621 "ConfigurationInterfaces.c"
+				goto __catch89_configuration_error;
 			}
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2616,7 +2631,7 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2615 "ConfigurationInterfaces.c"
+#line 2630 "ConfigurationInterfaces.c"
 		}
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -2628,14 +2643,14 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 		_g_free0 (_tmp0_);
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2627 "ConfigurationInterfaces.c"
+#line 2642 "ConfigurationInterfaces.c"
 	}
-	goto __finally88;
-	__catch88_configuration_error:
+	goto __finally89;
+	__catch89_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		GError* _tmp6_;
+		gchar* _tmp7_;
 #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2652,16 +2667,16 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 		_g_error_free0 (err);
 #line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2651 "ConfigurationInterfaces.c"
+#line 2666 "ConfigurationInterfaces.c"
 	}
-	__finally88:
+	__finally89:
 #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2660 "ConfigurationInterfaces.c"
+#line 2675 "ConfigurationInterfaces.c"
 }
 
 
@@ -2670,7 +2685,7 @@ gchar* configuration_facade_get_desktop_background (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 481 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_desktop_background (self);
-#line 2669 "ConfigurationInterfaces.c"
+#line 2684 "ConfigurationInterfaces.c"
 }
 
 
@@ -2678,13 +2693,13 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 	GError * _inner_error_ = NULL;
 #line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (filename != NULL);
-#line 2677 "ConfigurationInterfaces.c"
+#line 2692 "ConfigurationInterfaces.c"
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		ConfigurationEngine* _tmp3_ = NULL;
-		ConfigurationEngine* _tmp4_ = NULL;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		const gchar* _tmp2_;
+		ConfigurationEngine* _tmp3_;
+		ConfigurationEngine* _tmp4_;
 #line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2699,8 +2714,8 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2698 "ConfigurationInterfaces.c"
-				goto __catch89_configuration_error;
+#line 2713 "ConfigurationInterfaces.c"
+				goto __catch90_configuration_error;
 			}
 #line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2708,7 +2723,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2707 "ConfigurationInterfaces.c"
+#line 2722 "ConfigurationInterfaces.c"
 		}
 #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -2722,8 +2737,8 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2721 "ConfigurationInterfaces.c"
-				goto __catch89_configuration_error;
+#line 2736 "ConfigurationInterfaces.c"
+				goto __catch90_configuration_error;
 			}
 #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2731,14 +2746,14 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2730 "ConfigurationInterfaces.c"
+#line 2745 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally89;
-	__catch89_configuration_error:
+	goto __finally90;
+	__catch90_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp5_;
 #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2749,9 +2764,9 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 		configuration_facade_on_configuration_error (self, _tmp5_);
 #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 2748 "ConfigurationInterfaces.c"
+#line 2763 "ConfigurationInterfaces.c"
 	}
-	__finally89:
+	__finally90:
 #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2760,7 +2775,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 		g_clear_error (&_inner_error_);
 #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2759 "ConfigurationInterfaces.c"
+#line 2774 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2770,7 +2785,7 @@ void configuration_facade_set_desktop_background (ConfigurationFacade* self, con
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_desktop_background (self, filename);
-#line 2769 "ConfigurationInterfaces.c"
+#line 2784 "ConfigurationInterfaces.c"
 }
 
 
@@ -2779,11 +2794,11 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 	GError * _inner_error_ = NULL;
 	{
 		gchar* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2800,8 +2815,8 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2799 "ConfigurationInterfaces.c"
-				goto __catch90_configuration_error;
+#line 2814 "ConfigurationInterfaces.c"
+				goto __catch91_configuration_error;
 			}
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2809,7 +2824,7 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 			g_clear_error (&_inner_error_);
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2808 "ConfigurationInterfaces.c"
+#line 2823 "ConfigurationInterfaces.c"
 		}
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -2821,14 +2836,14 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 		_g_free0 (_tmp0_);
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2820 "ConfigurationInterfaces.c"
+#line 2835 "ConfigurationInterfaces.c"
 	}
-	goto __finally90;
-	__catch90_configuration_error:
+	goto __finally91;
+	__catch91_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		GError* _tmp6_;
+		gchar* _tmp7_;
 #line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2845,16 +2860,16 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 		_g_error_free0 (err);
 #line 511 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2844 "ConfigurationInterfaces.c"
+#line 2859 "ConfigurationInterfaces.c"
 	}
-	__finally90:
+	__finally91:
 #line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2853 "ConfigurationInterfaces.c"
+#line 2868 "ConfigurationInterfaces.c"
 }
 
 
@@ -2863,7 +2878,7 @@ gchar* configuration_facade_get_screensaver (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_screensaver (self);
-#line 2862 "ConfigurationInterfaces.c"
+#line 2877 "ConfigurationInterfaces.c"
 }
 
 
@@ -2871,13 +2886,13 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 	GError * _inner_error_ = NULL;
 #line 515 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (filename != NULL);
-#line 2870 "ConfigurationInterfaces.c"
+#line 2885 "ConfigurationInterfaces.c"
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		ConfigurationEngine* _tmp3_ = NULL;
-		ConfigurationEngine* _tmp4_ = NULL;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		const gchar* _tmp2_;
+		ConfigurationEngine* _tmp3_;
+		ConfigurationEngine* _tmp4_;
 #line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2892,8 +2907,8 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2891 "ConfigurationInterfaces.c"
-				goto __catch91_configuration_error;
+#line 2906 "ConfigurationInterfaces.c"
+				goto __catch92_configuration_error;
 			}
 #line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2901,7 +2916,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 			g_clear_error (&_inner_error_);
 #line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2900 "ConfigurationInterfaces.c"
+#line 2915 "ConfigurationInterfaces.c"
 		}
 #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -2915,8 +2930,8 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2914 "ConfigurationInterfaces.c"
-				goto __catch91_configuration_error;
+#line 2929 "ConfigurationInterfaces.c"
+				goto __catch92_configuration_error;
 			}
 #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2924,14 +2939,14 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 			g_clear_error (&_inner_error_);
 #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2923 "ConfigurationInterfaces.c"
+#line 2938 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally91;
-	__catch91_configuration_error:
+	goto __finally92;
+	__catch92_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp5_;
 #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2942,9 +2957,9 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 		configuration_facade_on_configuration_error (self, _tmp5_);
 #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 2941 "ConfigurationInterfaces.c"
+#line 2956 "ConfigurationInterfaces.c"
 	}
-	__finally91:
+	__finally92:
 #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2953,7 +2968,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 		g_clear_error (&_inner_error_);
 #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2952 "ConfigurationInterfaces.c"
+#line 2967 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2963,7 +2978,7 @@ void configuration_facade_set_screensaver (ConfigurationFacade* self, const gcha
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 515 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_screensaver (self, filename);
-#line 2962 "ConfigurationInterfaces.c"
+#line 2977 "ConfigurationInterfaces.c"
 }
 
 
@@ -2972,12 +2987,12 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 	GError * _inner_error_ = NULL;
 	{
 		gchar* s = NULL;
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
 		const gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		gchar* _tmp5_;
 #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2994,8 +3009,8 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2993 "ConfigurationInterfaces.c"
-				goto __catch92_configuration_error;
+#line 3008 "ConfigurationInterfaces.c"
+				goto __catch93_configuration_error;
 			}
 #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3003,17 +3018,17 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 3002 "ConfigurationInterfaces.c"
+#line 3017 "ConfigurationInterfaces.c"
 		}
 #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (g_strcmp0 (s, "") == 0) {
 #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp4_ = NULL;
-#line 3008 "ConfigurationInterfaces.c"
+#line 3023 "ConfigurationInterfaces.c"
 		} else {
 #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp4_ = s;
-#line 3012 "ConfigurationInterfaces.c"
+#line 3027 "ConfigurationInterfaces.c"
 		}
 #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = g_strdup (_tmp4_);
@@ -3023,14 +3038,14 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 		_g_free0 (s);
 #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3022 "ConfigurationInterfaces.c"
+#line 3037 "ConfigurationInterfaces.c"
 	}
-	goto __finally92;
-	__catch92_configuration_error:
+	goto __finally93;
+	__catch93_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		GError* _tmp6_;
+		gchar* _tmp7_;
 #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3047,16 +3062,16 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 		_g_error_free0 (err);
 #line 536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3046 "ConfigurationInterfaces.c"
+#line 3061 "ConfigurationInterfaces.c"
 	}
-	__finally92:
+	__finally93:
 #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 3055 "ConfigurationInterfaces.c"
+#line 3070 "ConfigurationInterfaces.c"
 }
 
 
@@ -3065,24 +3080,24 @@ gchar* configuration_facade_get_directory_pattern (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_directory_pattern (self);
-#line 3064 "ConfigurationInterfaces.c"
+#line 3079 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_directory_pattern (ConfigurationFacade* self, const gchar* s) {
 	GError * _inner_error_ = NULL;
 	{
-		const gchar* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
+		const gchar* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		const gchar* _tmp3_;
 #line 542 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = s;
 #line 542 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (_tmp0_ == NULL) {
 #line 543 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			s = "";
-#line 3081 "ConfigurationInterfaces.c"
+#line 3096 "ConfigurationInterfaces.c"
 		}
 #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
@@ -3098,8 +3113,8 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3097 "ConfigurationInterfaces.c"
-				goto __catch93_configuration_error;
+#line 3112 "ConfigurationInterfaces.c"
+				goto __catch94_configuration_error;
 			}
 #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3107,14 +3122,14 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3106 "ConfigurationInterfaces.c"
+#line 3121 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally93;
-	__catch93_configuration_error:
+	goto __finally94;
+	__catch94_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp4_ = NULL;
+		GError* _tmp4_;
 #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3125,9 +3140,9 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 		configuration_facade_on_configuration_error (self, _tmp4_);
 #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3124 "ConfigurationInterfaces.c"
+#line 3139 "ConfigurationInterfaces.c"
 	}
-	__finally93:
+	__finally94:
 #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3136,7 +3151,7 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3135 "ConfigurationInterfaces.c"
+#line 3150 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3146,7 +3161,7 @@ void configuration_facade_set_directory_pattern (ConfigurationFacade* self, cons
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_directory_pattern (self, s);
-#line 3145 "ConfigurationInterfaces.c"
+#line 3160 "ConfigurationInterfaces.c"
 }
 
 
@@ -3155,11 +3170,11 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 	GError * _inner_error_ = NULL;
 	{
 		gchar* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3176,8 +3191,8 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3175 "ConfigurationInterfaces.c"
-				goto __catch94_configuration_error;
+#line 3190 "ConfigurationInterfaces.c"
+				goto __catch95_configuration_error;
 			}
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3185,7 +3200,7 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 			g_clear_error (&_inner_error_);
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 3184 "ConfigurationInterfaces.c"
+#line 3199 "ConfigurationInterfaces.c"
 		}
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -3197,14 +3212,14 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 		_g_free0 (_tmp0_);
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3196 "ConfigurationInterfaces.c"
+#line 3211 "ConfigurationInterfaces.c"
 	}
-	goto __finally94;
-	__catch94_configuration_error:
+	goto __finally95;
+	__catch95_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		GError* _tmp6_;
+		gchar* _tmp7_;
 #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3221,16 +3236,16 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 		_g_error_free0 (err);
 #line 560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3220 "ConfigurationInterfaces.c"
+#line 3235 "ConfigurationInterfaces.c"
 	}
-	__finally94:
+	__finally95:
 #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 3229 "ConfigurationInterfaces.c"
+#line 3244 "ConfigurationInterfaces.c"
 }
 
 
@@ -3239,7 +3254,7 @@ gchar* configuration_facade_get_directory_pattern_custom (ConfigurationFacade* s
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_directory_pattern_custom (self);
-#line 3238 "ConfigurationInterfaces.c"
+#line 3253 "ConfigurationInterfaces.c"
 }
 
 
@@ -3247,11 +3262,11 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 	GError * _inner_error_ = NULL;
 #line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (s != NULL);
-#line 3246 "ConfigurationInterfaces.c"
+#line 3261 "ConfigurationInterfaces.c"
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		const gchar* _tmp2_;
 #line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3266,8 +3281,8 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3265 "ConfigurationInterfaces.c"
-				goto __catch95_configuration_error;
+#line 3280 "ConfigurationInterfaces.c"
+				goto __catch96_configuration_error;
 			}
 #line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3275,14 +3290,14 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 			g_clear_error (&_inner_error_);
 #line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3274 "ConfigurationInterfaces.c"
+#line 3289 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally95;
-	__catch95_configuration_error:
+	goto __finally96;
+	__catch96_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3293,9 +3308,9 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3292 "ConfigurationInterfaces.c"
+#line 3307 "ConfigurationInterfaces.c"
 	}
-	__finally95:
+	__finally96:
 #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3304,7 +3319,7 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 		g_clear_error (&_inner_error_);
 #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3303 "ConfigurationInterfaces.c"
+#line 3318 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3314,7 +3329,7 @@ void configuration_facade_set_directory_pattern_custom (ConfigurationFacade* sel
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_directory_pattern_custom (self, s);
-#line 3313 "ConfigurationInterfaces.c"
+#line 3328 "ConfigurationInterfaces.c"
 }
 
 
@@ -3326,25 +3341,25 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 	_vala_maximize = FALSE;
 #line 577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	dimensions_init (&_vala_dimensions, 1024, 768);
-#line 3325 "ConfigurationInterfaces.c"
+#line 3340 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 		gint w = 0;
-		ConfigurationEngine* _tmp5_ = NULL;
-		ConfigurationEngine* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
+		ConfigurationEngine* _tmp5_;
+		ConfigurationEngine* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
 		gint h = 0;
-		ConfigurationEngine* _tmp9_ = NULL;
-		ConfigurationEngine* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
+		ConfigurationEngine* _tmp9_;
+		ConfigurationEngine* _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
+		gint _tmp14_;
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3361,8 +3376,8 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3360 "ConfigurationInterfaces.c"
-				goto __catch96_configuration_error;
+#line 3375 "ConfigurationInterfaces.c"
+				goto __catch97_configuration_error;
 			}
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3370,7 +3385,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3369 "ConfigurationInterfaces.c"
+#line 3384 "ConfigurationInterfaces.c"
 		}
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_maximize = _tmp0_;
@@ -3390,8 +3405,8 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3389 "ConfigurationInterfaces.c"
-				goto __catch96_configuration_error;
+#line 3404 "ConfigurationInterfaces.c"
+				goto __catch97_configuration_error;
 			}
 #line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3399,7 +3414,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3398 "ConfigurationInterfaces.c"
+#line 3413 "ConfigurationInterfaces.c"
 		}
 #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = configuration_facade_get_engine (self);
@@ -3417,8 +3432,8 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3416 "ConfigurationInterfaces.c"
-				goto __catch96_configuration_error;
+#line 3431 "ConfigurationInterfaces.c"
+				goto __catch97_configuration_error;
 			}
 #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3426,7 +3441,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3425 "ConfigurationInterfaces.c"
+#line 3440 "ConfigurationInterfaces.c"
 		}
 #line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp13_ = w;
@@ -3434,13 +3449,13 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		_tmp14_ = h;
 #line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		dimensions_init (&_vala_dimensions, _tmp13_, _tmp14_);
-#line 3433 "ConfigurationInterfaces.c"
+#line 3448 "ConfigurationInterfaces.c"
 	}
-	goto __finally96;
-	__catch96_configuration_error:
+	goto __finally97;
+	__catch97_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp15_ = NULL;
+		GError* _tmp15_;
 #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3451,9 +3466,9 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		configuration_facade_on_configuration_error (self, _tmp15_);
 #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3450 "ConfigurationInterfaces.c"
+#line 3465 "ConfigurationInterfaces.c"
 	}
-	__finally96:
+	__finally97:
 #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3462,19 +3477,19 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		g_clear_error (&_inner_error_);
 #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3461 "ConfigurationInterfaces.c"
+#line 3476 "ConfigurationInterfaces.c"
 	}
 #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (maximize) {
 #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*maximize = _vala_maximize;
-#line 3467 "ConfigurationInterfaces.c"
+#line 3482 "ConfigurationInterfaces.c"
 	}
 #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (dimensions) {
 #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*dimensions = _vala_dimensions;
-#line 3473 "ConfigurationInterfaces.c"
+#line 3488 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3484,7 +3499,7 @@ void configuration_facade_get_direct_window_state (ConfigurationFacade* self, gb
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_direct_window_state (self, maximize, dimensions);
-#line 3483 "ConfigurationInterfaces.c"
+#line 3498 "ConfigurationInterfaces.c"
 }
 
 
@@ -3492,19 +3507,19 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 	GError * _inner_error_ = NULL;
 #line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (dimensions != NULL);
-#line 3491 "ConfigurationInterfaces.c"
-	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
-		ConfigurationEngine* _tmp3_ = NULL;
-		ConfigurationEngine* _tmp4_ = NULL;
-		Dimensions _tmp5_ = {0};
-		gint _tmp6_ = 0;
-		ConfigurationEngine* _tmp7_ = NULL;
-		ConfigurationEngine* _tmp8_ = NULL;
-		Dimensions _tmp9_ = {0};
-		gint _tmp10_ = 0;
+#line 3506 "ConfigurationInterfaces.c"
+	{
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
+		ConfigurationEngine* _tmp3_;
+		ConfigurationEngine* _tmp4_;
+		Dimensions _tmp5_;
+		gint _tmp6_;
+		ConfigurationEngine* _tmp7_;
+		ConfigurationEngine* _tmp8_;
+		Dimensions _tmp9_;
+		gint _tmp10_;
 #line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3519,8 +3534,8 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3518 "ConfigurationInterfaces.c"
-				goto __catch97_configuration_error;
+#line 3533 "ConfigurationInterfaces.c"
+				goto __catch98_configuration_error;
 			}
 #line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3528,7 +3543,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3527 "ConfigurationInterfaces.c"
+#line 3542 "ConfigurationInterfaces.c"
 		}
 #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -3546,8 +3561,8 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3545 "ConfigurationInterfaces.c"
-				goto __catch97_configuration_error;
+#line 3560 "ConfigurationInterfaces.c"
+				goto __catch98_configuration_error;
 			}
 #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3555,7 +3570,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3554 "ConfigurationInterfaces.c"
+#line 3569 "ConfigurationInterfaces.c"
 		}
 #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = configuration_facade_get_engine (self);
@@ -3573,8 +3588,8 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3572 "ConfigurationInterfaces.c"
-				goto __catch97_configuration_error;
+#line 3587 "ConfigurationInterfaces.c"
+				goto __catch98_configuration_error;
 			}
 #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3582,14 +3597,14 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3581 "ConfigurationInterfaces.c"
+#line 3596 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally97;
-	__catch97_configuration_error:
+	goto __finally98;
+	__catch98_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp11_ = NULL;
+		GError* _tmp11_;
 #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3600,9 +3615,9 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		configuration_facade_on_configuration_error (self, _tmp11_);
 #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3599 "ConfigurationInterfaces.c"
+#line 3614 "ConfigurationInterfaces.c"
 	}
-	__finally97:
+	__finally98:
 #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3611,7 +3626,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		g_clear_error (&_inner_error_);
 #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3610 "ConfigurationInterfaces.c"
+#line 3625 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3621,7 +3636,7 @@ void configuration_facade_set_direct_window_state (ConfigurationFacade* self, gb
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_direct_window_state (self, maximize, dimensions);
-#line 3620 "ConfigurationInterfaces.c"
+#line 3635 "ConfigurationInterfaces.c"
 }
 
 
@@ -3631,10 +3646,10 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3649,12 +3664,12 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur
 		_tmp0_ = _tmp4_;
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3648 "ConfigurationInterfaces.c"
+#line 3663 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3652 "ConfigurationInterfaces.c"
-				goto __catch98_configuration_error;
+#line 3667 "ConfigurationInterfaces.c"
+				goto __catch99_configuration_error;
 			}
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3662,19 +3677,19 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur
 			g_clear_error (&_inner_error_);
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 3661 "ConfigurationInterfaces.c"
+#line 3676 "ConfigurationInterfaces.c"
 		}
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3667 "ConfigurationInterfaces.c"
+#line 3682 "ConfigurationInterfaces.c"
 	}
-	goto __finally98;
-	__catch98_configuration_error:
+	goto __finally99;
+	__catch99_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3689,16 +3704,16 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur
 		_g_error_free0 (err);
 #line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3688 "ConfigurationInterfaces.c"
+#line 3703 "ConfigurationInterfaces.c"
 	}
-	__finally98:
+	__finally99:
 #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 3697 "ConfigurationInterfaces.c"
+#line 3712 "ConfigurationInterfaces.c"
 }
 
 
@@ -3707,16 +3722,16 @@ gboolean configuration_facade_get_display_basic_properties (ConfigurationFacade*
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_basic_properties (self);
-#line 3706 "ConfigurationInterfaces.c"
+#line 3721 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_display_basic_properties (ConfigurationFacade* self, gboolean display) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3731,8 +3746,8 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3730 "ConfigurationInterfaces.c"
-				goto __catch99_configuration_error;
+#line 3745 "ConfigurationInterfaces.c"
+				goto __catch100_configuration_error;
 			}
 #line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3740,14 +3755,14 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio
 			g_clear_error (&_inner_error_);
 #line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3739 "ConfigurationInterfaces.c"
+#line 3754 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally99;
-	__catch99_configuration_error:
+	goto __finally100;
+	__catch100_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3758,9 +3773,9 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3757 "ConfigurationInterfaces.c"
+#line 3772 "ConfigurationInterfaces.c"
 	}
-	__finally99:
+	__finally100:
 #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3769,7 +3784,7 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio
 		g_clear_error (&_inner_error_);
 #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3768 "ConfigurationInterfaces.c"
+#line 3783 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3779,7 +3794,7 @@ void configuration_facade_set_display_basic_properties (ConfigurationFacade* sel
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_basic_properties (self, display);
-#line 3778 "ConfigurationInterfaces.c"
+#line 3793 "ConfigurationInterfaces.c"
 }
 
 
@@ -3789,10 +3804,10 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3807,12 +3822,12 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi
 		_tmp0_ = _tmp4_;
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3806 "ConfigurationInterfaces.c"
+#line 3821 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3810 "ConfigurationInterfaces.c"
-				goto __catch100_configuration_error;
+#line 3825 "ConfigurationInterfaces.c"
+				goto __catch101_configuration_error;
 			}
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3820,19 +3835,19 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi
 			g_clear_error (&_inner_error_);
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 3819 "ConfigurationInterfaces.c"
+#line 3834 "ConfigurationInterfaces.c"
 		}
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3825 "ConfigurationInterfaces.c"
+#line 3840 "ConfigurationInterfaces.c"
 	}
-	goto __finally100;
-	__catch100_configuration_error:
+	goto __finally101;
+	__catch101_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3847,16 +3862,16 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi
 		_g_error_free0 (err);
 #line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3846 "ConfigurationInterfaces.c"
+#line 3861 "ConfigurationInterfaces.c"
 	}
-	__finally100:
+	__finally101:
 #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 3855 "ConfigurationInterfaces.c"
+#line 3870 "ConfigurationInterfaces.c"
 }
 
 
@@ -3865,16 +3880,16 @@ gboolean configuration_facade_get_display_extended_properties (ConfigurationFaca
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_extended_properties (self);
-#line 3864 "ConfigurationInterfaces.c"
+#line 3879 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_display_extended_properties (ConfigurationFacade* self, gboolean display) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3889,8 +3904,8 @@ static void configuration_facade_real_set_display_extended_properties (Configura
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3888 "ConfigurationInterfaces.c"
-				goto __catch101_configuration_error;
+#line 3903 "ConfigurationInterfaces.c"
+				goto __catch102_configuration_error;
 			}
 #line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3898,14 +3913,14 @@ static void configuration_facade_real_set_display_extended_properties (Configura
 			g_clear_error (&_inner_error_);
 #line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3897 "ConfigurationInterfaces.c"
+#line 3912 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally101;
-	__catch101_configuration_error:
+	goto __finally102;
+	__catch102_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3916,9 +3931,9 @@ static void configuration_facade_real_set_display_extended_properties (Configura
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3915 "ConfigurationInterfaces.c"
+#line 3930 "ConfigurationInterfaces.c"
 	}
-	__finally101:
+	__finally102:
 #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3927,7 +3942,7 @@ static void configuration_facade_real_set_display_extended_properties (Configura
 		g_clear_error (&_inner_error_);
 #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3926 "ConfigurationInterfaces.c"
+#line 3941 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3937,7 +3952,7 @@ void configuration_facade_set_display_extended_properties (ConfigurationFacade*
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_extended_properties (self, display);
-#line 3936 "ConfigurationInterfaces.c"
+#line 3951 "ConfigurationInterfaces.c"
 }
 
 
@@ -3947,10 +3962,10 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3965,12 +3980,12 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca
 		_tmp0_ = _tmp4_;
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3964 "ConfigurationInterfaces.c"
+#line 3979 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3968 "ConfigurationInterfaces.c"
-				goto __catch102_configuration_error;
+#line 3983 "ConfigurationInterfaces.c"
+				goto __catch103_configuration_error;
 			}
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3978,19 +3993,19 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 3977 "ConfigurationInterfaces.c"
+#line 3992 "ConfigurationInterfaces.c"
 		}
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3983 "ConfigurationInterfaces.c"
+#line 3998 "ConfigurationInterfaces.c"
 	}
-	goto __finally102;
-	__catch102_configuration_error:
+	goto __finally103;
+	__catch103_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4005,16 +4020,16 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca
 		_g_error_free0 (err);
 #line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4004 "ConfigurationInterfaces.c"
+#line 4019 "ConfigurationInterfaces.c"
 	}
-	__finally102:
+	__finally103:
 #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 4013 "ConfigurationInterfaces.c"
+#line 4028 "ConfigurationInterfaces.c"
 }
 
 
@@ -4023,16 +4038,16 @@ gboolean configuration_facade_get_display_sidebar (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_sidebar (self);
-#line 4022 "ConfigurationInterfaces.c"
+#line 4037 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_display_sidebar (ConfigurationFacade* self, gboolean display) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4047,8 +4062,8 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4046 "ConfigurationInterfaces.c"
-				goto __catch103_configuration_error;
+#line 4061 "ConfigurationInterfaces.c"
+				goto __catch104_configuration_error;
 			}
 #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4056,14 +4071,14 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4055 "ConfigurationInterfaces.c"
+#line 4070 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally103;
-	__catch103_configuration_error:
+	goto __finally104;
+	__catch104_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4074,9 +4089,9 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4073 "ConfigurationInterfaces.c"
+#line 4088 "ConfigurationInterfaces.c"
 	}
-	__finally103:
+	__finally104:
 #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4085,7 +4100,7 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4084 "ConfigurationInterfaces.c"
+#line 4099 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4095,7 +4110,7 @@ void configuration_facade_set_display_sidebar (ConfigurationFacade* self, gboole
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_sidebar (self, display);
-#line 4094 "ConfigurationInterfaces.c"
+#line 4109 "ConfigurationInterfaces.c"
 }
 
 
@@ -4105,10 +4120,10 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4123,12 +4138,12 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca
 		_tmp0_ = _tmp4_;
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4122 "ConfigurationInterfaces.c"
+#line 4137 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4126 "ConfigurationInterfaces.c"
-				goto __catch104_configuration_error;
+#line 4141 "ConfigurationInterfaces.c"
+				goto __catch105_configuration_error;
 			}
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4136,19 +4151,19 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 4135 "ConfigurationInterfaces.c"
+#line 4150 "ConfigurationInterfaces.c"
 		}
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4141 "ConfigurationInterfaces.c"
+#line 4156 "ConfigurationInterfaces.c"
 	}
-	goto __finally104;
-	__catch104_configuration_error:
+	goto __finally105;
+	__catch105_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4163,16 +4178,16 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca
 		_g_error_free0 (err);
 #line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4162 "ConfigurationInterfaces.c"
+#line 4177 "ConfigurationInterfaces.c"
 	}
-	__finally104:
+	__finally105:
 #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 4171 "ConfigurationInterfaces.c"
+#line 4186 "ConfigurationInterfaces.c"
 }
 
 
@@ -4181,16 +4196,16 @@ gboolean configuration_facade_get_display_toolbar (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 668 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_toolbar (self);
-#line 4180 "ConfigurationInterfaces.c"
+#line 4195 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_display_toolbar (ConfigurationFacade* self, gboolean display) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4205,8 +4220,8 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4204 "ConfigurationInterfaces.c"
-				goto __catch105_configuration_error;
+#line 4219 "ConfigurationInterfaces.c"
+				goto __catch106_configuration_error;
 			}
 #line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4214,14 +4229,14 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4213 "ConfigurationInterfaces.c"
+#line 4228 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally105;
-	__catch105_configuration_error:
+	goto __finally106;
+	__catch106_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4232,9 +4247,9 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4231 "ConfigurationInterfaces.c"
+#line 4246 "ConfigurationInterfaces.c"
 	}
-	__finally105:
+	__finally106:
 #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4243,7 +4258,7 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4242 "ConfigurationInterfaces.c"
+#line 4257 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4253,7 +4268,7 @@ void configuration_facade_set_display_toolbar (ConfigurationFacade* self, gboole
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 678 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_toolbar (self, display);
-#line 4252 "ConfigurationInterfaces.c"
+#line 4267 "ConfigurationInterfaces.c"
 }
 
 
@@ -4263,10 +4278,10 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4281,12 +4296,12 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF
 		_tmp0_ = _tmp4_;
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4280 "ConfigurationInterfaces.c"
+#line 4295 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4284 "ConfigurationInterfaces.c"
-				goto __catch106_configuration_error;
+#line 4299 "ConfigurationInterfaces.c"
+				goto __catch107_configuration_error;
 			}
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4294,19 +4309,19 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 4293 "ConfigurationInterfaces.c"
+#line 4308 "ConfigurationInterfaces.c"
 		}
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4299 "ConfigurationInterfaces.c"
+#line 4314 "ConfigurationInterfaces.c"
 	}
-	goto __finally106;
-	__catch106_configuration_error:
+	goto __finally107;
+	__catch107_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4321,16 +4336,16 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF
 		_g_error_free0 (err);
 #line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4320 "ConfigurationInterfaces.c"
+#line 4335 "ConfigurationInterfaces.c"
 	}
-	__finally106:
+	__finally107:
 #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 4329 "ConfigurationInterfaces.c"
+#line 4344 "ConfigurationInterfaces.c"
 }
 
 
@@ -4339,16 +4354,16 @@ gboolean configuration_facade_get_display_search_bar (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 689 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_search_bar (self);
-#line 4338 "ConfigurationInterfaces.c"
+#line 4353 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_display_search_bar (ConfigurationFacade* self, gboolean display) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4363,8 +4378,8 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4362 "ConfigurationInterfaces.c"
-				goto __catch107_configuration_error;
+#line 4377 "ConfigurationInterfaces.c"
+				goto __catch108_configuration_error;
 			}
 #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4372,14 +4387,14 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4371 "ConfigurationInterfaces.c"
+#line 4386 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally107;
-	__catch107_configuration_error:
+	goto __finally108;
+	__catch108_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4390,9 +4405,9 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4389 "ConfigurationInterfaces.c"
+#line 4404 "ConfigurationInterfaces.c"
 	}
-	__finally107:
+	__finally108:
 #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4401,7 +4416,7 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad
 		g_clear_error (&_inner_error_);
 #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4400 "ConfigurationInterfaces.c"
+#line 4415 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4411,7 +4426,7 @@ void configuration_facade_set_display_search_bar (ConfigurationFacade* self, gbo
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 699 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_search_bar (self, display);
-#line 4410 "ConfigurationInterfaces.c"
+#line 4425 "ConfigurationInterfaces.c"
 }
 
 
@@ -4421,10 +4436,10 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4439,12 +4454,12 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati
 		_tmp0_ = _tmp4_;
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4438 "ConfigurationInterfaces.c"
+#line 4453 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4442 "ConfigurationInterfaces.c"
-				goto __catch108_configuration_error;
+#line 4457 "ConfigurationInterfaces.c"
+				goto __catch109_configuration_error;
 			}
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4452,19 +4467,19 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati
 			g_clear_error (&_inner_error_);
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 4451 "ConfigurationInterfaces.c"
+#line 4466 "ConfigurationInterfaces.c"
 		}
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4457 "ConfigurationInterfaces.c"
+#line 4472 "ConfigurationInterfaces.c"
 	}
-	goto __finally108;
-	__catch108_configuration_error:
+	goto __finally109;
+	__catch109_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4479,16 +4494,16 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati
 		_g_error_free0 (err);
 #line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4478 "ConfigurationInterfaces.c"
+#line 4493 "ConfigurationInterfaces.c"
 	}
-	__finally108:
+	__finally109:
 #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 4487 "ConfigurationInterfaces.c"
+#line 4502 "ConfigurationInterfaces.c"
 }
 
 
@@ -4497,16 +4512,16 @@ gboolean configuration_facade_get_display_photo_ratings (ConfigurationFacade* se
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_ratings (self);
-#line 4496 "ConfigurationInterfaces.c"
+#line 4511 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_display_photo_ratings (ConfigurationFacade* self, gboolean display) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4521,8 +4536,8 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4520 "ConfigurationInterfaces.c"
-				goto __catch109_configuration_error;
+#line 4535 "ConfigurationInterfaces.c"
+				goto __catch110_configuration_error;
 			}
 #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4530,14 +4545,14 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4529 "ConfigurationInterfaces.c"
+#line 4544 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally109;
-	__catch109_configuration_error:
+	goto __finally110;
+	__catch110_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4548,9 +4563,9 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4547 "ConfigurationInterfaces.c"
+#line 4562 "ConfigurationInterfaces.c"
 	}
-	__finally109:
+	__finally110:
 #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4559,7 +4574,7 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4558 "ConfigurationInterfaces.c"
+#line 4573 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4569,7 +4584,7 @@ void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_ratings (self, display);
-#line 4568 "ConfigurationInterfaces.c"
+#line 4583 "ConfigurationInterfaces.c"
 }
 
 
@@ -4579,10 +4594,10 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4597,12 +4612,12 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF
 		_tmp0_ = _tmp4_;
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4596 "ConfigurationInterfaces.c"
+#line 4611 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4600 "ConfigurationInterfaces.c"
-				goto __catch110_configuration_error;
+#line 4615 "ConfigurationInterfaces.c"
+				goto __catch111_configuration_error;
 			}
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4610,19 +4625,19 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 4609 "ConfigurationInterfaces.c"
+#line 4624 "ConfigurationInterfaces.c"
 		}
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4615 "ConfigurationInterfaces.c"
+#line 4630 "ConfigurationInterfaces.c"
 	}
-	goto __finally110;
-	__catch110_configuration_error:
+	goto __finally111;
+	__catch111_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4637,16 +4652,16 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF
 		_g_error_free0 (err);
 #line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4636 "ConfigurationInterfaces.c"
+#line 4651 "ConfigurationInterfaces.c"
 	}
-	__finally110:
+	__finally111:
 #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 4645 "ConfigurationInterfaces.c"
+#line 4660 "ConfigurationInterfaces.c"
 }
 
 
@@ -4655,16 +4670,16 @@ gboolean configuration_facade_get_display_photo_tags (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_tags (self);
-#line 4654 "ConfigurationInterfaces.c"
+#line 4669 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_display_photo_tags (ConfigurationFacade* self, gboolean display) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4679,8 +4694,8 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4678 "ConfigurationInterfaces.c"
-				goto __catch111_configuration_error;
+#line 4693 "ConfigurationInterfaces.c"
+				goto __catch112_configuration_error;
 			}
 #line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4688,14 +4703,14 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4687 "ConfigurationInterfaces.c"
+#line 4702 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally111;
-	__catch111_configuration_error:
+	goto __finally112;
+	__catch112_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4706,9 +4721,9 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4705 "ConfigurationInterfaces.c"
+#line 4720 "ConfigurationInterfaces.c"
 	}
-	__finally111:
+	__finally112:
 #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4717,7 +4732,7 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad
 		g_clear_error (&_inner_error_);
 #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4716 "ConfigurationInterfaces.c"
+#line 4731 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4727,7 +4742,7 @@ void configuration_facade_set_display_photo_tags (ConfigurationFacade* self, gbo
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_tags (self, display);
-#line 4726 "ConfigurationInterfaces.c"
+#line 4741 "ConfigurationInterfaces.c"
 }
 
 
@@ -4737,10 +4752,10 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4755,12 +4770,12 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio
 		_tmp0_ = _tmp4_;
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4754 "ConfigurationInterfaces.c"
+#line 4769 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4758 "ConfigurationInterfaces.c"
-				goto __catch112_configuration_error;
+#line 4773 "ConfigurationInterfaces.c"
+				goto __catch113_configuration_error;
 			}
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4768,19 +4783,19 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio
 			g_clear_error (&_inner_error_);
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 4767 "ConfigurationInterfaces.c"
+#line 4782 "ConfigurationInterfaces.c"
 		}
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4773 "ConfigurationInterfaces.c"
+#line 4788 "ConfigurationInterfaces.c"
 	}
-	goto __finally112;
-	__catch112_configuration_error:
+	goto __finally113;
+	__catch113_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4795,16 +4810,16 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio
 		_g_error_free0 (err);
 #line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4794 "ConfigurationInterfaces.c"
+#line 4809 "ConfigurationInterfaces.c"
 	}
-	__finally112:
+	__finally113:
 #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 4803 "ConfigurationInterfaces.c"
+#line 4818 "ConfigurationInterfaces.c"
 }
 
 
@@ -4813,16 +4828,16 @@ gboolean configuration_facade_get_display_photo_titles (ConfigurationFacade* sel
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_titles (self);
-#line 4812 "ConfigurationInterfaces.c"
+#line 4827 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_display_photo_titles (ConfigurationFacade* self, gboolean display) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4837,8 +4852,8 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4836 "ConfigurationInterfaces.c"
-				goto __catch113_configuration_error;
+#line 4851 "ConfigurationInterfaces.c"
+				goto __catch114_configuration_error;
 			}
 #line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4846,14 +4861,14 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4845 "ConfigurationInterfaces.c"
+#line 4860 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally113;
-	__catch113_configuration_error:
+	goto __finally114;
+	__catch114_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4864,9 +4879,9 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4863 "ConfigurationInterfaces.c"
+#line 4878 "ConfigurationInterfaces.c"
 	}
-	__finally113:
+	__finally114:
 #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4875,7 +4890,7 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac
 		g_clear_error (&_inner_error_);
 #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4874 "ConfigurationInterfaces.c"
+#line 4889 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4885,7 +4900,7 @@ void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, g
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_titles (self, display);
-#line 4884 "ConfigurationInterfaces.c"
+#line 4899 "ConfigurationInterfaces.c"
 }
 
 
@@ -4895,10 +4910,10 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4913,12 +4928,12 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat
 		_tmp0_ = _tmp4_;
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4912 "ConfigurationInterfaces.c"
+#line 4927 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4916 "ConfigurationInterfaces.c"
-				goto __catch114_configuration_error;
+#line 4931 "ConfigurationInterfaces.c"
+				goto __catch115_configuration_error;
 			}
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4926,19 +4941,19 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat
 			g_clear_error (&_inner_error_);
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 4925 "ConfigurationInterfaces.c"
+#line 4940 "ConfigurationInterfaces.c"
 		}
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4931 "ConfigurationInterfaces.c"
+#line 4946 "ConfigurationInterfaces.c"
 	}
-	goto __finally114;
-	__catch114_configuration_error:
+	goto __finally115;
+	__catch115_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4953,16 +4968,16 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat
 		_g_error_free0 (err);
 #line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4952 "ConfigurationInterfaces.c"
+#line 4967 "ConfigurationInterfaces.c"
 	}
-	__finally114:
+	__finally115:
 #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 4961 "ConfigurationInterfaces.c"
+#line 4976 "ConfigurationInterfaces.c"
 }
 
 
@@ -4971,16 +4986,16 @@ gboolean configuration_facade_get_display_photo_comments (ConfigurationFacade* s
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_comments (self);
-#line 4970 "ConfigurationInterfaces.c"
+#line 4985 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_display_photo_comments (ConfigurationFacade* self, gboolean display) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4995,8 +5010,8 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4994 "ConfigurationInterfaces.c"
-				goto __catch115_configuration_error;
+#line 5009 "ConfigurationInterfaces.c"
+				goto __catch116_configuration_error;
 			}
 #line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5004,14 +5019,14 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5003 "ConfigurationInterfaces.c"
+#line 5018 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally115;
-	__catch115_configuration_error:
+	goto __finally116;
+	__catch116_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5022,9 +5037,9 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 5021 "ConfigurationInterfaces.c"
+#line 5036 "ConfigurationInterfaces.c"
 	}
-	__finally115:
+	__finally116:
 #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5033,7 +5048,7 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF
 		g_clear_error (&_inner_error_);
 #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5032 "ConfigurationInterfaces.c"
+#line 5047 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5043,7 +5058,7 @@ void configuration_facade_set_display_photo_comments (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_comments (self, display);
-#line 5042 "ConfigurationInterfaces.c"
+#line 5057 "ConfigurationInterfaces.c"
 }
 
 
@@ -5053,10 +5068,10 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5071,12 +5086,12 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat
 		_tmp0_ = _tmp4_;
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5070 "ConfigurationInterfaces.c"
+#line 5085 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5074 "ConfigurationInterfaces.c"
-				goto __catch116_configuration_error;
+#line 5089 "ConfigurationInterfaces.c"
+				goto __catch117_configuration_error;
 			}
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5084,19 +5099,19 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat
 			g_clear_error (&_inner_error_);
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 5083 "ConfigurationInterfaces.c"
+#line 5098 "ConfigurationInterfaces.c"
 		}
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5089 "ConfigurationInterfaces.c"
+#line 5104 "ConfigurationInterfaces.c"
 	}
-	goto __finally116;
-	__catch116_configuration_error:
+	goto __finally117;
+	__catch117_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5111,16 +5126,16 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat
 		_g_error_free0 (err);
 #line 800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5110 "ConfigurationInterfaces.c"
+#line 5125 "ConfigurationInterfaces.c"
 	}
-	__finally116:
+	__finally117:
 #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 5119 "ConfigurationInterfaces.c"
+#line 5134 "ConfigurationInterfaces.c"
 }
 
 
@@ -5129,16 +5144,16 @@ gboolean configuration_facade_get_display_event_comments (ConfigurationFacade* s
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_event_comments (self);
-#line 5128 "ConfigurationInterfaces.c"
+#line 5143 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_display_event_comments (ConfigurationFacade* self, gboolean display) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5153,8 +5168,8 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5152 "ConfigurationInterfaces.c"
-				goto __catch117_configuration_error;
+#line 5167 "ConfigurationInterfaces.c"
+				goto __catch118_configuration_error;
 			}
 #line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5162,14 +5177,14 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5161 "ConfigurationInterfaces.c"
+#line 5176 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally117;
-	__catch117_configuration_error:
+	goto __finally118;
+	__catch118_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5180,9 +5195,9 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 5179 "ConfigurationInterfaces.c"
+#line 5194 "ConfigurationInterfaces.c"
 	}
-	__finally117:
+	__finally118:
 #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5191,7 +5206,7 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF
 		g_clear_error (&_inner_error_);
 #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5190 "ConfigurationInterfaces.c"
+#line 5205 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5201,7 +5216,7 @@ void configuration_facade_set_display_event_comments (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_event_comments (self, display);
-#line 5200 "ConfigurationInterfaces.c"
+#line 5215 "ConfigurationInterfaces.c"
 }
 
 
@@ -5213,18 +5228,18 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 	_vala_sort_order = FALSE;
 #line 817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_sort_by = 2;
-#line 5212 "ConfigurationInterfaces.c"
+#line 5227 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 		gint _tmp5_ = 0;
-		ConfigurationEngine* _tmp6_ = NULL;
-		ConfigurationEngine* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
+		ConfigurationEngine* _tmp6_;
+		ConfigurationEngine* _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5241,8 +5256,8 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5240 "ConfigurationInterfaces.c"
-				goto __catch118_configuration_error;
+#line 5255 "ConfigurationInterfaces.c"
+				goto __catch119_configuration_error;
 			}
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5250,7 +5265,7 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5249 "ConfigurationInterfaces.c"
+#line 5264 "ConfigurationInterfaces.c"
 		}
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_order = _tmp0_;
@@ -5270,8 +5285,8 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5269 "ConfigurationInterfaces.c"
-				goto __catch118_configuration_error;
+#line 5284 "ConfigurationInterfaces.c"
+				goto __catch119_configuration_error;
 			}
 #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5279,17 +5294,17 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5278 "ConfigurationInterfaces.c"
+#line 5293 "ConfigurationInterfaces.c"
 		}
 #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_by = _tmp5_;
-#line 5282 "ConfigurationInterfaces.c"
+#line 5297 "ConfigurationInterfaces.c"
 	}
-	goto __finally118;
-	__catch118_configuration_error:
+	goto __finally119;
+	__catch119_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp10_ = NULL;
+		GError* _tmp10_;
 #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5300,9 +5315,9 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 		configuration_facade_on_configuration_error (self, _tmp10_);
 #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 5299 "ConfigurationInterfaces.c"
+#line 5314 "ConfigurationInterfaces.c"
 	}
-	__finally118:
+	__finally119:
 #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5311,19 +5326,19 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5310 "ConfigurationInterfaces.c"
+#line 5325 "ConfigurationInterfaces.c"
 	}
 #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_order) {
 #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_order = _vala_sort_order;
-#line 5316 "ConfigurationInterfaces.c"
+#line 5331 "ConfigurationInterfaces.c"
 	}
 #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_by) {
 #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_by = _vala_sort_by;
-#line 5322 "ConfigurationInterfaces.c"
+#line 5337 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5333,19 +5348,19 @@ void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, gboo
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_event_photos_sort (self, sort_order, sort_by);
-#line 5332 "ConfigurationInterfaces.c"
+#line 5347 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
-		ConfigurationEngine* _tmp3_ = NULL;
-		ConfigurationEngine* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
+		ConfigurationEngine* _tmp3_;
+		ConfigurationEngine* _tmp4_;
+		gint _tmp5_;
 #line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5360,8 +5375,8 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5359 "ConfigurationInterfaces.c"
-				goto __catch119_configuration_error;
+#line 5374 "ConfigurationInterfaces.c"
+				goto __catch120_configuration_error;
 			}
 #line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5369,7 +5384,7 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5368 "ConfigurationInterfaces.c"
+#line 5383 "ConfigurationInterfaces.c"
 		}
 #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -5385,8 +5400,8 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5384 "ConfigurationInterfaces.c"
-				goto __catch119_configuration_error;
+#line 5399 "ConfigurationInterfaces.c"
+				goto __catch120_configuration_error;
 			}
 #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5394,14 +5409,14 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5393 "ConfigurationInterfaces.c"
+#line 5408 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally119;
-	__catch119_configuration_error:
+	goto __finally120;
+	__catch120_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5412,9 +5427,9 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 5411 "ConfigurationInterfaces.c"
+#line 5426 "ConfigurationInterfaces.c"
 	}
-	__finally119:
+	__finally120:
 #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5423,7 +5438,7 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5422 "ConfigurationInterfaces.c"
+#line 5437 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5433,7 +5448,7 @@ void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, gboo
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 827 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_event_photos_sort (self, sort_order, sort_by);
-#line 5432 "ConfigurationInterfaces.c"
+#line 5447 "ConfigurationInterfaces.c"
 }
 
 
@@ -5443,10 +5458,10 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5461,12 +5476,12 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati
 		_tmp0_ = _tmp4_;
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5460 "ConfigurationInterfaces.c"
+#line 5475 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5464 "ConfigurationInterfaces.c"
-				goto __catch120_configuration_error;
+#line 5479 "ConfigurationInterfaces.c"
+				goto __catch121_configuration_error;
 			}
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5474,19 +5489,19 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati
 			g_clear_error (&_inner_error_);
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 5473 "ConfigurationInterfaces.c"
+#line 5488 "ConfigurationInterfaces.c"
 		}
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5479 "ConfigurationInterfaces.c"
+#line 5494 "ConfigurationInterfaces.c"
 	}
-	goto __finally120;
-	__catch120_configuration_error:
+	goto __finally121;
+	__catch121_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5501,16 +5516,16 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati
 		_g_error_free0 (err);
 #line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5500 "ConfigurationInterfaces.c"
+#line 5515 "ConfigurationInterfaces.c"
 	}
-	__finally120:
+	__finally121:
 #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 5509 "ConfigurationInterfaces.c"
+#line 5524 "ConfigurationInterfaces.c"
 }
 
 
@@ -5519,16 +5534,16 @@ gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* se
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_events_sort_ascending (self);
-#line 5518 "ConfigurationInterfaces.c"
+#line 5533 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_events_sort_ascending (ConfigurationFacade* self, gboolean sort) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5543,8 +5558,8 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5542 "ConfigurationInterfaces.c"
-				goto __catch121_configuration_error;
+#line 5557 "ConfigurationInterfaces.c"
+				goto __catch122_configuration_error;
 			}
 #line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5552,14 +5567,14 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5551 "ConfigurationInterfaces.c"
+#line 5566 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally121;
-	__catch121_configuration_error:
+	goto __finally122;
+	__catch122_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5572,9 +5587,9 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa
 		_g_error_free0 (err);
 #line 856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5571 "ConfigurationInterfaces.c"
+#line 5586 "ConfigurationInterfaces.c"
 	}
-	__finally121:
+	__finally122:
 #line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5583,7 +5598,7 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5582 "ConfigurationInterfaces.c"
+#line 5597 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5593,7 +5608,7 @@ void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 851 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_events_sort_ascending (self, sort);
-#line 5592 "ConfigurationInterfaces.c"
+#line 5607 "ConfigurationInterfaces.c"
 }
 
 
@@ -5602,11 +5617,11 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 	GError * _inner_error_ = NULL;
 	{
 		gchar* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5623,8 +5638,8 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5622 "ConfigurationInterfaces.c"
-				goto __catch122_configuration_error;
+#line 5637 "ConfigurationInterfaces.c"
+				goto __catch123_configuration_error;
 			}
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5632,7 +5647,7 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 5631 "ConfigurationInterfaces.c"
+#line 5646 "ConfigurationInterfaces.c"
 		}
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -5644,14 +5659,14 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 		_g_free0 (_tmp0_);
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5643 "ConfigurationInterfaces.c"
+#line 5658 "ConfigurationInterfaces.c"
 	}
-	goto __finally122;
-	__catch122_configuration_error:
+	goto __finally123;
+	__catch123_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		GError* _tmp6_;
+		gchar* _tmp7_;
 #line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5668,16 +5683,16 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 		_g_error_free0 (err);
 #line 869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5667 "ConfigurationInterfaces.c"
+#line 5682 "ConfigurationInterfaces.c"
 	}
-	__finally122:
+	__finally123:
 #line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 5676 "ConfigurationInterfaces.c"
+#line 5691 "ConfigurationInterfaces.c"
 }
 
 
@@ -5686,7 +5701,7 @@ gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 863 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_external_photo_app (self);
-#line 5685 "ConfigurationInterfaces.c"
+#line 5700 "ConfigurationInterfaces.c"
 }
 
 
@@ -5694,11 +5709,11 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 	GError * _inner_error_ = NULL;
 #line 873 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (external_photo_app != NULL);
-#line 5693 "ConfigurationInterfaces.c"
+#line 5708 "ConfigurationInterfaces.c"
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		const gchar* _tmp2_;
 #line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5713,8 +5728,8 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5712 "ConfigurationInterfaces.c"
-				goto __catch123_configuration_error;
+#line 5727 "ConfigurationInterfaces.c"
+				goto __catch124_configuration_error;
 			}
 #line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5722,14 +5737,14 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5721 "ConfigurationInterfaces.c"
+#line 5736 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally123;
-	__catch123_configuration_error:
+	goto __finally124;
+	__catch124_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5742,9 +5757,9 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 		_g_error_free0 (err);
 #line 879 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5741 "ConfigurationInterfaces.c"
+#line 5756 "ConfigurationInterfaces.c"
 	}
-	__finally123:
+	__finally124:
 #line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5753,7 +5768,7 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 		g_clear_error (&_inner_error_);
 #line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5752 "ConfigurationInterfaces.c"
+#line 5767 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5763,7 +5778,7 @@ void configuration_facade_set_external_photo_app (ConfigurationFacade* self, con
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 873 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_external_photo_app (self, external_photo_app);
-#line 5762 "ConfigurationInterfaces.c"
+#line 5777 "ConfigurationInterfaces.c"
 }
 
 
@@ -5772,11 +5787,11 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 	GError * _inner_error_ = NULL;
 	{
 		gchar* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5793,8 +5808,8 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5792 "ConfigurationInterfaces.c"
-				goto __catch124_configuration_error;
+#line 5807 "ConfigurationInterfaces.c"
+				goto __catch125_configuration_error;
 			}
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5802,7 +5817,7 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 5801 "ConfigurationInterfaces.c"
+#line 5816 "ConfigurationInterfaces.c"
 		}
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -5814,14 +5829,14 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 		_g_free0 (_tmp0_);
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5813 "ConfigurationInterfaces.c"
+#line 5828 "ConfigurationInterfaces.c"
 	}
-	goto __finally124;
-	__catch124_configuration_error:
+	goto __finally125;
+	__catch125_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		GError* _tmp6_;
+		gchar* _tmp7_;
 #line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5838,16 +5853,16 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 		_g_error_free0 (err);
 #line 892 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5837 "ConfigurationInterfaces.c"
+#line 5852 "ConfigurationInterfaces.c"
 	}
-	__finally124:
+	__finally125:
 #line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 5846 "ConfigurationInterfaces.c"
+#line 5861 "ConfigurationInterfaces.c"
 }
 
 
@@ -5856,7 +5871,7 @@ gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 886 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_external_raw_app (self);
-#line 5855 "ConfigurationInterfaces.c"
+#line 5870 "ConfigurationInterfaces.c"
 }
 
 
@@ -5864,11 +5879,11 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 	GError * _inner_error_ = NULL;
 #line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (external_raw_app != NULL);
-#line 5863 "ConfigurationInterfaces.c"
+#line 5878 "ConfigurationInterfaces.c"
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		const gchar* _tmp2_;
 #line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5883,8 +5898,8 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5882 "ConfigurationInterfaces.c"
-				goto __catch125_configuration_error;
+#line 5897 "ConfigurationInterfaces.c"
+				goto __catch126_configuration_error;
 			}
 #line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5892,14 +5907,14 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5891 "ConfigurationInterfaces.c"
+#line 5906 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally125;
-	__catch125_configuration_error:
+	goto __finally126;
+	__catch126_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5912,9 +5927,9 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 902 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5911 "ConfigurationInterfaces.c"
+#line 5926 "ConfigurationInterfaces.c"
 	}
-	__finally125:
+	__finally126:
 #line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5923,7 +5938,7 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5922 "ConfigurationInterfaces.c"
+#line 5937 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5933,7 +5948,7 @@ void configuration_facade_set_external_raw_app (ConfigurationFacade* self, const
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_external_raw_app (self, external_raw_app);
-#line 5932 "ConfigurationInterfaces.c"
+#line 5947 "ConfigurationInterfaces.c"
 }
 
 
@@ -5942,10 +5957,10 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5962,8 +5977,8 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5961 "ConfigurationInterfaces.c"
-				goto __catch126_configuration_error;
+#line 5976 "ConfigurationInterfaces.c"
+				goto __catch127_configuration_error;
 			}
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5971,19 +5986,19 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur
 			g_clear_error (&_inner_error_);
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 5970 "ConfigurationInterfaces.c"
+#line 5985 "ConfigurationInterfaces.c"
 		}
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = (ScaleConstraint) _tmp0_;
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5976 "ConfigurationInterfaces.c"
+#line 5991 "ConfigurationInterfaces.c"
 	}
-	goto __finally126;
-	__catch126_configuration_error:
+	goto __finally127;
+	__catch127_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp5_;
 #line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5998,16 +6013,16 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur
 		_g_error_free0 (err);
 #line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5997 "ConfigurationInterfaces.c"
+#line 6012 "ConfigurationInterfaces.c"
 	}
-	__finally126:
+	__finally127:
 #line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6006 "ConfigurationInterfaces.c"
+#line 6021 "ConfigurationInterfaces.c"
 }
 
 
@@ -6016,16 +6031,16 @@ ScaleConstraint configuration_facade_get_export_constraint (ConfigurationFacade*
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 909 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_constraint (self);
-#line 6015 "ConfigurationInterfaces.c"
+#line 6030 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_export_constraint (ConfigurationFacade* self, ScaleConstraint constraint) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ScaleConstraint _tmp2_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		ScaleConstraint _tmp2_;
 #line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6040,8 +6055,8 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6039 "ConfigurationInterfaces.c"
-				goto __catch127_configuration_error;
+#line 6054 "ConfigurationInterfaces.c"
+				goto __catch128_configuration_error;
 			}
 #line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6049,14 +6064,14 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6048 "ConfigurationInterfaces.c"
+#line 6063 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally127;
-	__catch127_configuration_error:
+	goto __finally128;
+	__catch128_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6069,9 +6084,9 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade
 		_g_error_free0 (err);
 #line 924 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6068 "ConfigurationInterfaces.c"
+#line 6083 "ConfigurationInterfaces.c"
 	}
-	__finally127:
+	__finally128:
 #line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6080,7 +6095,7 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6079 "ConfigurationInterfaces.c"
+#line 6094 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6090,7 +6105,7 @@ void configuration_facade_set_export_constraint (ConfigurationFacade* self, Scal
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 919 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_constraint (self, constraint);
-#line 6089 "ConfigurationInterfaces.c"
+#line 6104 "ConfigurationInterfaces.c"
 }
 
 
@@ -6099,10 +6114,10 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6119,8 +6134,8 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6118 "ConfigurationInterfaces.c"
-				goto __catch128_configuration_error;
+#line 6133 "ConfigurationInterfaces.c"
+				goto __catch129_configuration_error;
 			}
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6128,19 +6143,19 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode
 			g_clear_error (&_inner_error_);
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6127 "ConfigurationInterfaces.c"
+#line 6142 "ConfigurationInterfaces.c"
 		}
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = (ExportFormatMode) _tmp0_;
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6133 "ConfigurationInterfaces.c"
+#line 6148 "ConfigurationInterfaces.c"
 	}
-	goto __finally128;
-	__catch128_configuration_error:
+	goto __finally129;
+	__catch129_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp5_;
 #line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6155,16 +6170,16 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode
 		_g_error_free0 (err);
 #line 934 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6154 "ConfigurationInterfaces.c"
+#line 6169 "ConfigurationInterfaces.c"
 	}
-	__finally128:
+	__finally129:
 #line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6163 "ConfigurationInterfaces.c"
+#line 6178 "ConfigurationInterfaces.c"
 }
 
 
@@ -6173,16 +6188,16 @@ ExportFormatMode configuration_facade_get_export_export_format_mode (Configurati
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 928 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_export_format_mode (self);
-#line 6172 "ConfigurationInterfaces.c"
+#line 6187 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_export_export_format_mode (ConfigurationFacade* self, ExportFormatMode export_format_mode) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ExportFormatMode _tmp2_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		ExportFormatMode _tmp2_;
 #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6197,8 +6212,8 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6196 "ConfigurationInterfaces.c"
-				goto __catch129_configuration_error;
+#line 6211 "ConfigurationInterfaces.c"
+				goto __catch130_configuration_error;
 			}
 #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6206,14 +6221,14 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati
 			g_clear_error (&_inner_error_);
 #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6205 "ConfigurationInterfaces.c"
+#line 6220 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally129;
-	__catch129_configuration_error:
+	goto __finally130;
+	__catch130_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6226,9 +6241,9 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati
 		_g_error_free0 (err);
 #line 943 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6225 "ConfigurationInterfaces.c"
+#line 6240 "ConfigurationInterfaces.c"
 	}
-	__finally129:
+	__finally130:
 #line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6237,7 +6252,7 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati
 		g_clear_error (&_inner_error_);
 #line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6236 "ConfigurationInterfaces.c"
+#line 6251 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6247,7 +6262,7 @@ void configuration_facade_set_export_export_format_mode (ConfigurationFacade* se
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 938 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_export_format_mode (self, export_format_mode);
-#line 6246 "ConfigurationInterfaces.c"
+#line 6261 "ConfigurationInterfaces.c"
 }
 
 
@@ -6257,10 +6272,10 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6275,12 +6290,12 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat
 		_tmp0_ = _tmp4_;
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6274 "ConfigurationInterfaces.c"
+#line 6289 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6278 "ConfigurationInterfaces.c"
-				goto __catch130_configuration_error;
+#line 6293 "ConfigurationInterfaces.c"
+				goto __catch131_configuration_error;
 			}
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6288,19 +6303,19 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat
 			g_clear_error (&_inner_error_);
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 6287 "ConfigurationInterfaces.c"
+#line 6302 "ConfigurationInterfaces.c"
 		}
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6293 "ConfigurationInterfaces.c"
+#line 6308 "ConfigurationInterfaces.c"
 	}
-	goto __finally130;
-	__catch130_configuration_error:
+	goto __finally131;
+	__catch131_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6315,16 +6330,16 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat
 		_g_error_free0 (err);
 #line 953 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6314 "ConfigurationInterfaces.c"
+#line 6329 "ConfigurationInterfaces.c"
 	}
-	__finally130:
+	__finally131:
 #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 6323 "ConfigurationInterfaces.c"
+#line 6338 "ConfigurationInterfaces.c"
 }
 
 
@@ -6333,16 +6348,16 @@ gboolean configuration_facade_get_export_export_metadata (ConfigurationFacade* s
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 947 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_export_metadata (self);
-#line 6332 "ConfigurationInterfaces.c"
+#line 6347 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_export_export_metadata (ConfigurationFacade* self, gboolean export_metadata) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6357,8 +6372,8 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6356 "ConfigurationInterfaces.c"
-				goto __catch131_configuration_error;
+#line 6371 "ConfigurationInterfaces.c"
+				goto __catch132_configuration_error;
 			}
 #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6366,14 +6381,14 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6365 "ConfigurationInterfaces.c"
+#line 6380 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally131;
-	__catch131_configuration_error:
+	goto __finally132;
+	__catch132_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6386,9 +6401,9 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF
 		_g_error_free0 (err);
 #line 962 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6385 "ConfigurationInterfaces.c"
+#line 6400 "ConfigurationInterfaces.c"
 	}
-	__finally131:
+	__finally132:
 #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6397,7 +6412,7 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF
 		g_clear_error (&_inner_error_);
 #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6396 "ConfigurationInterfaces.c"
+#line 6411 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6407,7 +6422,7 @@ void configuration_facade_set_export_export_metadata (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 957 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_export_metadata (self, export_metadata);
-#line 6406 "ConfigurationInterfaces.c"
+#line 6421 "ConfigurationInterfaces.c"
 }
 
 
@@ -6416,11 +6431,11 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
-		PhotoFileFormat _tmp5_ = 0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
+		PhotoFileFormat _tmp5_;
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6437,8 +6452,8 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6436 "ConfigurationInterfaces.c"
-				goto __catch132_configuration_error;
+#line 6451 "ConfigurationInterfaces.c"
+				goto __catch133_configuration_error;
 			}
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6446,7 +6461,7 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 			g_clear_error (&_inner_error_);
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6445 "ConfigurationInterfaces.c"
+#line 6460 "ConfigurationInterfaces.c"
 		}
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = photo_file_format_unserialize (_tmp0_);
@@ -6454,13 +6469,13 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 		result = _tmp5_;
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6453 "ConfigurationInterfaces.c"
+#line 6468 "ConfigurationInterfaces.c"
 	}
-	goto __finally132;
-	__catch132_configuration_error:
+	goto __finally133;
+	__catch133_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6475,16 +6490,16 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 		_g_error_free0 (err);
 #line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6474 "ConfigurationInterfaces.c"
+#line 6489 "ConfigurationInterfaces.c"
 	}
-	__finally132:
+	__finally133:
 #line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6483 "ConfigurationInterfaces.c"
+#line 6498 "ConfigurationInterfaces.c"
 }
 
 
@@ -6493,17 +6508,17 @@ PhotoFileFormat configuration_facade_get_export_photo_file_format (Configuration
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 966 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_photo_file_format (self);
-#line 6492 "ConfigurationInterfaces.c"
+#line 6507 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_export_photo_file_format (ConfigurationFacade* self, PhotoFileFormat photo_file_format) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		PhotoFileFormat _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		PhotoFileFormat _tmp2_;
+		gint _tmp3_;
 #line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6520,8 +6535,8 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6519 "ConfigurationInterfaces.c"
-				goto __catch133_configuration_error;
+#line 6534 "ConfigurationInterfaces.c"
+				goto __catch134_configuration_error;
 			}
 #line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6529,14 +6544,14 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio
 			g_clear_error (&_inner_error_);
 #line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6528 "ConfigurationInterfaces.c"
+#line 6543 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally133;
-	__catch133_configuration_error:
+	goto __finally134;
+	__catch134_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp4_ = NULL;
+		GError* _tmp4_;
 #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6549,9 +6564,9 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio
 		_g_error_free0 (err);
 #line 981 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6548 "ConfigurationInterfaces.c"
+#line 6563 "ConfigurationInterfaces.c"
 	}
-	__finally133:
+	__finally134:
 #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6560,7 +6575,7 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio
 		g_clear_error (&_inner_error_);
 #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6559 "ConfigurationInterfaces.c"
+#line 6574 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6570,7 +6585,7 @@ void configuration_facade_set_export_photo_file_format (ConfigurationFacade* sel
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 976 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_photo_file_format (self, photo_file_format);
-#line 6569 "ConfigurationInterfaces.c"
+#line 6584 "ConfigurationInterfaces.c"
 }
 
 
@@ -6579,10 +6594,10 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6599,8 +6614,8 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6598 "ConfigurationInterfaces.c"
-				goto __catch134_configuration_error;
+#line 6613 "ConfigurationInterfaces.c"
+				goto __catch135_configuration_error;
 			}
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6608,19 +6623,19 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6607 "ConfigurationInterfaces.c"
+#line 6622 "ConfigurationInterfaces.c"
 		}
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = (JpegQuality) _tmp0_;
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6613 "ConfigurationInterfaces.c"
+#line 6628 "ConfigurationInterfaces.c"
 	}
-	goto __finally134;
-	__catch134_configuration_error:
+	goto __finally135;
+	__catch135_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp5_;
 #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6635,16 +6650,16 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa
 		_g_error_free0 (err);
 #line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6634 "ConfigurationInterfaces.c"
+#line 6649 "ConfigurationInterfaces.c"
 	}
-	__finally134:
+	__finally135:
 #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6643 "ConfigurationInterfaces.c"
+#line 6658 "ConfigurationInterfaces.c"
 }
 
 
@@ -6653,16 +6668,16 @@ JpegQuality configuration_facade_get_export_quality (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 985 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_quality (self);
-#line 6652 "ConfigurationInterfaces.c"
+#line 6667 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_export_quality (ConfigurationFacade* self, JpegQuality quality) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		JpegQuality _tmp2_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		JpegQuality _tmp2_;
 #line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6677,8 +6692,8 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6676 "ConfigurationInterfaces.c"
-				goto __catch135_configuration_error;
+#line 6691 "ConfigurationInterfaces.c"
+				goto __catch136_configuration_error;
 			}
 #line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6686,14 +6701,14 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s
 			g_clear_error (&_inner_error_);
 #line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6685 "ConfigurationInterfaces.c"
+#line 6700 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally135;
-	__catch135_configuration_error:
+	goto __finally136;
+	__catch136_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6706,9 +6721,9 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s
 		_g_error_free0 (err);
 #line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6705 "ConfigurationInterfaces.c"
+#line 6720 "ConfigurationInterfaces.c"
 	}
-	__finally135:
+	__finally136:
 #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6717,7 +6732,7 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s
 		g_clear_error (&_inner_error_);
 #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6716 "ConfigurationInterfaces.c"
+#line 6731 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6727,7 +6742,7 @@ void configuration_facade_set_export_quality (ConfigurationFacade* self, JpegQua
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 995 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_quality (self, quality);
-#line 6726 "ConfigurationInterfaces.c"
+#line 6741 "ConfigurationInterfaces.c"
 }
 
 
@@ -6737,10 +6752,10 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6755,12 +6770,12 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel
 		_tmp0_ = _tmp4_;
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6754 "ConfigurationInterfaces.c"
+#line 6769 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6758 "ConfigurationInterfaces.c"
-				goto __catch136_configuration_error;
+#line 6773 "ConfigurationInterfaces.c"
+				goto __catch137_configuration_error;
 			}
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6768,19 +6783,19 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel
 			g_clear_error (&_inner_error_);
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 6767 "ConfigurationInterfaces.c"
+#line 6782 "ConfigurationInterfaces.c"
 		}
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6773 "ConfigurationInterfaces.c"
+#line 6788 "ConfigurationInterfaces.c"
 	}
-	goto __finally136;
-	__catch136_configuration_error:
+	goto __finally137;
+	__catch137_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6795,16 +6810,16 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel
 		_g_error_free0 (err);
 #line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6794 "ConfigurationInterfaces.c"
+#line 6809 "ConfigurationInterfaces.c"
 	}
-	__finally136:
+	__finally137:
 #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 6803 "ConfigurationInterfaces.c"
+#line 6818 "ConfigurationInterfaces.c"
 }
 
 
@@ -6813,16 +6828,16 @@ gint configuration_facade_get_export_scale (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1004 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_scale (self);
-#line 6812 "ConfigurationInterfaces.c"
+#line 6827 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_export_scale (ConfigurationFacade* self, gint scale) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gint _tmp2_;
 #line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6837,8 +6852,8 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6836 "ConfigurationInterfaces.c"
-				goto __catch137_configuration_error;
+#line 6851 "ConfigurationInterfaces.c"
+				goto __catch138_configuration_error;
 			}
 #line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6846,14 +6861,14 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel
 			g_clear_error (&_inner_error_);
 #line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6845 "ConfigurationInterfaces.c"
+#line 6860 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally137;
-	__catch137_configuration_error:
+	goto __finally138;
+	__catch138_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6866,9 +6881,9 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel
 		_g_error_free0 (err);
 #line 1019 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6865 "ConfigurationInterfaces.c"
+#line 6880 "ConfigurationInterfaces.c"
 	}
-	__finally137:
+	__finally138:
 #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6877,7 +6892,7 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel
 		g_clear_error (&_inner_error_);
 #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6876 "ConfigurationInterfaces.c"
+#line 6891 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6887,7 +6902,7 @@ void configuration_facade_set_export_scale (ConfigurationFacade* self, gint scal
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1014 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_scale (self, scale);
-#line 6886 "ConfigurationInterfaces.c"
+#line 6901 "ConfigurationInterfaces.c"
 }
 
 
@@ -6896,11 +6911,11 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 	GError * _inner_error_ = NULL;
 	{
 		gchar* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		RawDeveloper _tmp5_ = 0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		RawDeveloper _tmp5_;
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6917,8 +6932,8 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6916 "ConfigurationInterfaces.c"
-				goto __catch138_configuration_error;
+#line 6931 "ConfigurationInterfaces.c"
+				goto __catch139_configuration_error;
 			}
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6926,7 +6941,7 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 			g_clear_error (&_inner_error_);
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6925 "ConfigurationInterfaces.c"
+#line 6940 "ConfigurationInterfaces.c"
 		}
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = raw_developer_from_string (_tmp0_);
@@ -6936,13 +6951,13 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 		_g_free0 (_tmp0_);
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6935 "ConfigurationInterfaces.c"
+#line 6950 "ConfigurationInterfaces.c"
 	}
-	goto __finally138;
-	__catch138_configuration_error:
+	goto __finally139;
+	__catch139_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6957,16 +6972,16 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 		_g_error_free0 (err);
 #line 1033 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6956 "ConfigurationInterfaces.c"
+#line 6971 "ConfigurationInterfaces.c"
 	}
-	__finally138:
+	__finally139:
 #line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6965 "ConfigurationInterfaces.c"
+#line 6980 "ConfigurationInterfaces.c"
 }
 
 
@@ -6975,18 +6990,18 @@ RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1026 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_default_raw_developer (self);
-#line 6974 "ConfigurationInterfaces.c"
+#line 6989 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_default_raw_developer (ConfigurationFacade* self, RawDeveloper d) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		RawDeveloper _tmp2_ = 0;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		RawDeveloper _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
 #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7007,8 +7022,8 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7006 "ConfigurationInterfaces.c"
-				goto __catch139_configuration_error;
+#line 7021 "ConfigurationInterfaces.c"
+				goto __catch140_configuration_error;
 			}
 #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7016,14 +7031,14 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7015 "ConfigurationInterfaces.c"
+#line 7030 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally139;
-	__catch139_configuration_error:
+	goto __finally140;
+	__catch140_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp5_;
 #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7036,9 +7051,9 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa
 		_g_error_free0 (err);
 #line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7035 "ConfigurationInterfaces.c"
+#line 7050 "ConfigurationInterfaces.c"
 	}
-	__finally139:
+	__finally140:
 #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7047,7 +7062,7 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7046 "ConfigurationInterfaces.c"
+#line 7061 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7057,7 +7072,7 @@ void configuration_facade_set_default_raw_developer (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1037 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_default_raw_developer (self, d);
-#line 7056 "ConfigurationInterfaces.c"
+#line 7071 "ConfigurationInterfaces.c"
 }
 
 
@@ -7067,10 +7082,10 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7085,12 +7100,12 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf
 		_tmp0_ = _tmp4_;
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7084 "ConfigurationInterfaces.c"
+#line 7099 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7088 "ConfigurationInterfaces.c"
-				goto __catch140_configuration_error;
+#line 7103 "ConfigurationInterfaces.c"
+				goto __catch141_configuration_error;
 			}
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7098,19 +7113,19 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf
 			g_clear_error (&_inner_error_);
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 7097 "ConfigurationInterfaces.c"
+#line 7112 "ConfigurationInterfaces.c"
 		}
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7103 "ConfigurationInterfaces.c"
+#line 7118 "ConfigurationInterfaces.c"
 	}
-	goto __finally140;
-	__catch140_configuration_error:
+	goto __finally141;
+	__catch141_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7125,16 +7140,16 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf
 		_g_error_free0 (err);
 #line 1056 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7124 "ConfigurationInterfaces.c"
+#line 7139 "ConfigurationInterfaces.c"
 	}
-	__finally140:
+	__finally141:
 #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 7133 "ConfigurationInterfaces.c"
+#line 7148 "ConfigurationInterfaces.c"
 }
 
 
@@ -7143,16 +7158,16 @@ gboolean configuration_facade_get_hide_photos_already_imported (ConfigurationFac
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1050 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_hide_photos_already_imported (self);
-#line 7142 "ConfigurationInterfaces.c"
+#line 7157 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_hide_photos_already_imported (ConfigurationFacade* self, gboolean hide_imported) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7167,8 +7182,8 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7166 "ConfigurationInterfaces.c"
-				goto __catch141_configuration_error;
+#line 7181 "ConfigurationInterfaces.c"
+				goto __catch142_configuration_error;
 			}
 #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7176,14 +7191,14 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur
 			g_clear_error (&_inner_error_);
 #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7175 "ConfigurationInterfaces.c"
+#line 7190 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally141;
-	__catch141_configuration_error:
+	goto __finally142;
+	__catch142_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7194,9 +7209,9 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7193 "ConfigurationInterfaces.c"
+#line 7208 "ConfigurationInterfaces.c"
 	}
-	__finally141:
+	__finally142:
 #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7205,7 +7220,7 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur
 		g_clear_error (&_inner_error_);
 #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7204 "ConfigurationInterfaces.c"
+#line 7219 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7215,7 +7230,7 @@ void configuration_facade_set_hide_photos_already_imported (ConfigurationFacade*
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1060 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_hide_photos_already_imported (self, hide_imported);
-#line 7214 "ConfigurationInterfaces.c"
+#line 7229 "ConfigurationInterfaces.c"
 }
 
 
@@ -7224,11 +7239,11 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 	GError * _inner_error_ = NULL;
 	{
 		gchar* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7245,8 +7260,8 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7244 "ConfigurationInterfaces.c"
-				goto __catch142_configuration_error;
+#line 7259 "ConfigurationInterfaces.c"
+				goto __catch143_configuration_error;
 			}
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7254,7 +7269,7 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 			g_clear_error (&_inner_error_);
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 7253 "ConfigurationInterfaces.c"
+#line 7268 "ConfigurationInterfaces.c"
 		}
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -7266,14 +7281,14 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 		_g_free0 (_tmp0_);
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7265 "ConfigurationInterfaces.c"
+#line 7280 "ConfigurationInterfaces.c"
 	}
-	goto __finally142;
-	__catch142_configuration_error:
+	goto __finally143;
+	__catch143_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		GError* _tmp6_;
+		gchar* _tmp7_;
 #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7290,16 +7305,16 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 		_g_error_free0 (err);
 #line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7289 "ConfigurationInterfaces.c"
+#line 7304 "ConfigurationInterfaces.c"
 	}
-	__finally142:
+	__finally143:
 #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 7298 "ConfigurationInterfaces.c"
+#line 7313 "ConfigurationInterfaces.c"
 }
 
 
@@ -7308,7 +7323,7 @@ gchar* configuration_facade_get_import_dir (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 1071 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_import_dir (self);
-#line 7307 "ConfigurationInterfaces.c"
+#line 7322 "ConfigurationInterfaces.c"
 }
 
 
@@ -7316,11 +7331,11 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 	GError * _inner_error_ = NULL;
 #line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (import_dir != NULL);
-#line 7315 "ConfigurationInterfaces.c"
+#line 7330 "ConfigurationInterfaces.c"
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		const gchar* _tmp2_;
 #line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7335,8 +7350,8 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7334 "ConfigurationInterfaces.c"
-				goto __catch143_configuration_error;
+#line 7349 "ConfigurationInterfaces.c"
+				goto __catch144_configuration_error;
 			}
 #line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7344,14 +7359,14 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 			g_clear_error (&_inner_error_);
 #line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7343 "ConfigurationInterfaces.c"
+#line 7358 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally143;
-	__catch143_configuration_error:
+	goto __finally144;
+	__catch144_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7362,9 +7377,9 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7361 "ConfigurationInterfaces.c"
+#line 7376 "ConfigurationInterfaces.c"
 	}
-	__finally143:
+	__finally144:
 #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7373,7 +7388,7 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 		g_clear_error (&_inner_error_);
 #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7372 "ConfigurationInterfaces.c"
+#line 7387 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7383,7 +7398,7 @@ void configuration_facade_set_import_dir (ConfigurationFacade* self, const gchar
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_import_dir (self, import_dir);
-#line 7382 "ConfigurationInterfaces.c"
+#line 7397 "ConfigurationInterfaces.c"
 }
 
 
@@ -7393,10 +7408,10 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7411,12 +7426,12 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca
 		_tmp0_ = _tmp4_;
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7410 "ConfigurationInterfaces.c"
+#line 7425 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7414 "ConfigurationInterfaces.c"
-				goto __catch144_configuration_error;
+#line 7429 "ConfigurationInterfaces.c"
+				goto __catch145_configuration_error;
 			}
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7424,19 +7439,19 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 7423 "ConfigurationInterfaces.c"
+#line 7438 "ConfigurationInterfaces.c"
 		}
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7429 "ConfigurationInterfaces.c"
+#line 7444 "ConfigurationInterfaces.c"
 	}
-	goto __finally144;
-	__catch144_configuration_error:
+	goto __finally145;
+	__catch145_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7451,16 +7466,16 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca
 		_g_error_free0 (err);
 #line 1098 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7450 "ConfigurationInterfaces.c"
+#line 7465 "ConfigurationInterfaces.c"
 	}
-	__finally144:
+	__finally145:
 #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 7459 "ConfigurationInterfaces.c"
+#line 7474 "ConfigurationInterfaces.c"
 }
 
 
@@ -7469,16 +7484,16 @@ gboolean configuration_facade_get_keep_relativity (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_keep_relativity (self);
-#line 7468 "ConfigurationInterfaces.c"
+#line 7483 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_keep_relativity (ConfigurationFacade* self, gboolean keep_relativity) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7493,8 +7508,8 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7492 "ConfigurationInterfaces.c"
-				goto __catch145_configuration_error;
+#line 7507 "ConfigurationInterfaces.c"
+				goto __catch146_configuration_error;
 			}
 #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7502,14 +7517,14 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7501 "ConfigurationInterfaces.c"
+#line 7516 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally145;
-	__catch145_configuration_error:
+	goto __finally146;
+	__catch146_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7520,9 +7535,9 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7519 "ConfigurationInterfaces.c"
+#line 7534 "ConfigurationInterfaces.c"
 	}
-	__finally145:
+	__finally146:
 #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7531,7 +7546,7 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7530 "ConfigurationInterfaces.c"
+#line 7545 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7541,7 +7556,7 @@ void configuration_facade_set_keep_relativity (ConfigurationFacade* self, gboole
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_keep_relativity (self, keep_relativity);
-#line 7540 "ConfigurationInterfaces.c"
+#line 7555 "ConfigurationInterfaces.c"
 }
 
 
@@ -7551,10 +7566,10 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7569,12 +7584,12 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa
 		_tmp0_ = _tmp4_;
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7568 "ConfigurationInterfaces.c"
+#line 7583 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7572 "ConfigurationInterfaces.c"
-				goto __catch146_configuration_error;
+#line 7587 "ConfigurationInterfaces.c"
+				goto __catch147_configuration_error;
 			}
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7582,19 +7597,19 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 7581 "ConfigurationInterfaces.c"
+#line 7596 "ConfigurationInterfaces.c"
 		}
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7587 "ConfigurationInterfaces.c"
+#line 7602 "ConfigurationInterfaces.c"
 	}
-	goto __finally146;
-	__catch146_configuration_error:
+	goto __finally147;
+	__catch147_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7609,16 +7624,16 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa
 		_g_error_free0 (err);
 #line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7608 "ConfigurationInterfaces.c"
+#line 7623 "ConfigurationInterfaces.c"
 	}
-	__finally146:
+	__finally147:
 #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 7617 "ConfigurationInterfaces.c"
+#line 7632 "ConfigurationInterfaces.c"
 }
 
 
@@ -7627,16 +7642,16 @@ gboolean configuration_facade_get_pin_toolbar_state (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_pin_toolbar_state (self);
-#line 7626 "ConfigurationInterfaces.c"
+#line 7641 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade* self, gboolean state) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7651,8 +7666,8 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7650 "ConfigurationInterfaces.c"
-				goto __catch147_configuration_error;
+#line 7665 "ConfigurationInterfaces.c"
+				goto __catch148_configuration_error;
 			}
 #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7660,14 +7675,14 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7659 "ConfigurationInterfaces.c"
+#line 7674 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally147;
-	__catch147_configuration_error:
+	goto __finally148;
+	__catch148_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7678,9 +7693,9 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7677 "ConfigurationInterfaces.c"
+#line 7692 "ConfigurationInterfaces.c"
 	}
-	__finally147:
+	__finally148:
 #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7689,7 +7704,7 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7688 "ConfigurationInterfaces.c"
+#line 7703 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7699,7 +7714,7 @@ void configuration_facade_set_pin_toolbar_state (ConfigurationFacade* self, gboo
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1122 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_pin_toolbar_state (self, state);
-#line 7698 "ConfigurationInterfaces.c"
+#line 7713 "ConfigurationInterfaces.c"
 }
 
 
@@ -7709,10 +7724,10 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade*
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7727,12 +7742,12 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade*
 		_tmp0_ = _tmp4_;
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7726 "ConfigurationInterfaces.c"
+#line 7741 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7730 "ConfigurationInterfaces.c"
-				goto __catch148_configuration_error;
+#line 7745 "ConfigurationInterfaces.c"
+				goto __catch149_configuration_error;
 			}
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7740,19 +7755,19 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 7739 "ConfigurationInterfaces.c"
+#line 7754 "ConfigurationInterfaces.c"
 		}
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7745 "ConfigurationInterfaces.c"
+#line 7760 "ConfigurationInterfaces.c"
 	}
-	goto __finally148;
-	__catch148_configuration_error:
+	goto __finally149;
+	__catch149_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7767,16 +7782,16 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 1138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7766 "ConfigurationInterfaces.c"
+#line 7781 "ConfigurationInterfaces.c"
 	}
-	__finally148:
+	__finally149:
 #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 7775 "ConfigurationInterfaces.c"
+#line 7790 "ConfigurationInterfaces.c"
 }
 
 
@@ -7785,16 +7800,16 @@ gint configuration_facade_get_last_crop_height (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_height (self);
-#line 7784 "ConfigurationInterfaces.c"
+#line 7799 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_last_crop_height (ConfigurationFacade* self, gint choice) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gint _tmp2_;
 #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7809,8 +7824,8 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7808 "ConfigurationInterfaces.c"
-				goto __catch149_configuration_error;
+#line 7823 "ConfigurationInterfaces.c"
+				goto __catch150_configuration_error;
 			}
 #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7818,14 +7833,14 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7817 "ConfigurationInterfaces.c"
+#line 7832 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally149;
-	__catch149_configuration_error:
+	goto __finally150;
+	__catch150_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7836,9 +7851,9 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7835 "ConfigurationInterfaces.c"
+#line 7850 "ConfigurationInterfaces.c"
 	}
-	__finally149:
+	__finally150:
 #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7847,7 +7862,7 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7846 "ConfigurationInterfaces.c"
+#line 7861 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7857,7 +7872,7 @@ void configuration_facade_set_last_crop_height (ConfigurationFacade* self, gint
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_height (self, choice);
-#line 7856 "ConfigurationInterfaces.c"
+#line 7871 "ConfigurationInterfaces.c"
 }
 
 
@@ -7867,10 +7882,10 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7885,12 +7900,12 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa
 		_tmp0_ = _tmp4_;
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7884 "ConfigurationInterfaces.c"
+#line 7899 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7888 "ConfigurationInterfaces.c"
-				goto __catch150_configuration_error;
+#line 7903 "ConfigurationInterfaces.c"
+				goto __catch151_configuration_error;
 			}
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7898,19 +7913,19 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 7897 "ConfigurationInterfaces.c"
+#line 7912 "ConfigurationInterfaces.c"
 		}
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7903 "ConfigurationInterfaces.c"
+#line 7918 "ConfigurationInterfaces.c"
 	}
-	goto __finally150;
-	__catch150_configuration_error:
+	goto __finally151;
+	__catch151_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7925,16 +7940,16 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa
 		_g_error_free0 (err);
 #line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7924 "ConfigurationInterfaces.c"
+#line 7939 "ConfigurationInterfaces.c"
 	}
-	__finally150:
+	__finally151:
 #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 7933 "ConfigurationInterfaces.c"
+#line 7948 "ConfigurationInterfaces.c"
 }
 
 
@@ -7943,16 +7958,16 @@ gint configuration_facade_get_last_crop_menu_choice (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_menu_choice (self);
-#line 7942 "ConfigurationInterfaces.c"
+#line 7957 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFacade* self, gint choice) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gint _tmp2_;
 #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7967,8 +7982,8 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7966 "ConfigurationInterfaces.c"
-				goto __catch151_configuration_error;
+#line 7981 "ConfigurationInterfaces.c"
+				goto __catch152_configuration_error;
 			}
 #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7976,14 +7991,14 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7975 "ConfigurationInterfaces.c"
+#line 7990 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally151;
-	__catch151_configuration_error:
+	goto __finally152;
+	__catch152_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7994,9 +8009,9 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7993 "ConfigurationInterfaces.c"
+#line 8008 "ConfigurationInterfaces.c"
 	}
-	__finally151:
+	__finally152:
 #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8005,7 +8020,7 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8004 "ConfigurationInterfaces.c"
+#line 8019 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8015,7 +8030,7 @@ void configuration_facade_set_last_crop_menu_choice (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_menu_choice (self, choice);
-#line 8014 "ConfigurationInterfaces.c"
+#line 8029 "ConfigurationInterfaces.c"
 }
 
 
@@ -8025,10 +8040,10 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade*
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8043,12 +8058,12 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade*
 		_tmp0_ = _tmp4_;
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8042 "ConfigurationInterfaces.c"
+#line 8057 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8046 "ConfigurationInterfaces.c"
-				goto __catch152_configuration_error;
+#line 8061 "ConfigurationInterfaces.c"
+				goto __catch153_configuration_error;
 			}
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8056,19 +8071,19 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 8055 "ConfigurationInterfaces.c"
+#line 8070 "ConfigurationInterfaces.c"
 		}
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8061 "ConfigurationInterfaces.c"
+#line 8076 "ConfigurationInterfaces.c"
 	}
-	goto __finally152;
-	__catch152_configuration_error:
+	goto __finally153;
+	__catch153_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8083,16 +8098,16 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8082 "ConfigurationInterfaces.c"
+#line 8097 "ConfigurationInterfaces.c"
 	}
-	__finally152:
+	__finally153:
 #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 8091 "ConfigurationInterfaces.c"
+#line 8106 "ConfigurationInterfaces.c"
 }
 
 
@@ -8101,16 +8116,16 @@ gint configuration_facade_get_last_crop_width (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_width (self);
-#line 8100 "ConfigurationInterfaces.c"
+#line 8115 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_last_crop_width (ConfigurationFacade* self, gint choice) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gint _tmp2_;
 #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8125,8 +8140,8 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8124 "ConfigurationInterfaces.c"
-				goto __catch153_configuration_error;
+#line 8139 "ConfigurationInterfaces.c"
+				goto __catch154_configuration_error;
 			}
 #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8134,14 +8149,14 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8133 "ConfigurationInterfaces.c"
+#line 8148 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally153;
-	__catch153_configuration_error:
+	goto __finally154;
+	__catch154_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8152,9 +8167,9 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8151 "ConfigurationInterfaces.c"
+#line 8166 "ConfigurationInterfaces.c"
 	}
-	__finally153:
+	__finally154:
 #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8163,7 +8178,7 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8162 "ConfigurationInterfaces.c"
+#line 8177 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8173,7 +8188,7 @@ void configuration_facade_set_last_crop_width (ConfigurationFacade* self, gint c
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_width (self, choice);
-#line 8172 "ConfigurationInterfaces.c"
+#line 8187 "ConfigurationInterfaces.c"
 }
 
 
@@ -8182,11 +8197,11 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 	GError * _inner_error_ = NULL;
 	{
 		gchar* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8203,8 +8218,8 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8202 "ConfigurationInterfaces.c"
-				goto __catch154_configuration_error;
+#line 8217 "ConfigurationInterfaces.c"
+				goto __catch155_configuration_error;
 			}
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8212,7 +8227,7 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 8211 "ConfigurationInterfaces.c"
+#line 8226 "ConfigurationInterfaces.c"
 		}
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -8224,14 +8239,14 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 		_g_free0 (_tmp0_);
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8223 "ConfigurationInterfaces.c"
+#line 8238 "ConfigurationInterfaces.c"
 	}
-	goto __finally154;
-	__catch154_configuration_error:
+	goto __finally155;
+	__catch155_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		GError* _tmp6_;
+		gchar* _tmp7_;
 #line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8248,16 +8263,16 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 		_g_error_free0 (err);
 #line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8247 "ConfigurationInterfaces.c"
+#line 8262 "ConfigurationInterfaces.c"
 	}
-	__finally154:
+	__finally155:
 #line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 8256 "ConfigurationInterfaces.c"
+#line 8271 "ConfigurationInterfaces.c"
 }
 
 
@@ -8266,7 +8281,7 @@ gchar* configuration_facade_get_last_used_service (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_used_service (self);
-#line 8265 "ConfigurationInterfaces.c"
+#line 8280 "ConfigurationInterfaces.c"
 }
 
 
@@ -8274,11 +8289,11 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 	GError * _inner_error_ = NULL;
 #line 1210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (service_name != NULL);
-#line 8273 "ConfigurationInterfaces.c"
+#line 8288 "ConfigurationInterfaces.c"
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		const gchar* _tmp2_;
 #line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8293,8 +8308,8 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8292 "ConfigurationInterfaces.c"
-				goto __catch155_configuration_error;
+#line 8307 "ConfigurationInterfaces.c"
+				goto __catch156_configuration_error;
 			}
 #line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8302,14 +8317,14 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8301 "ConfigurationInterfaces.c"
+#line 8316 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally155;
-	__catch155_configuration_error:
+	goto __finally156;
+	__catch156_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8320,9 +8335,9 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8319 "ConfigurationInterfaces.c"
+#line 8334 "ConfigurationInterfaces.c"
 	}
-	__finally155:
+	__finally156:
 #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8331,7 +8346,7 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8330 "ConfigurationInterfaces.c"
+#line 8345 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8341,7 +8356,7 @@ void configuration_facade_set_last_used_service (ConfigurationFacade* self, cons
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_used_service (self, service_name);
-#line 8340 "ConfigurationInterfaces.c"
+#line 8355 "ConfigurationInterfaces.c"
 }
 
 
@@ -8350,11 +8365,11 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 	GError * _inner_error_ = NULL;
 	{
 		gchar* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8371,8 +8386,8 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8370 "ConfigurationInterfaces.c"
-				goto __catch156_configuration_error;
+#line 8385 "ConfigurationInterfaces.c"
+				goto __catch157_configuration_error;
 			}
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8380,7 +8395,7 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 			g_clear_error (&_inner_error_);
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 8379 "ConfigurationInterfaces.c"
+#line 8394 "ConfigurationInterfaces.c"
 		}
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -8392,14 +8407,14 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 		_g_free0 (_tmp0_);
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8391 "ConfigurationInterfaces.c"
+#line 8406 "ConfigurationInterfaces.c"
 	}
-	goto __finally156;
-	__catch156_configuration_error:
+	goto __finally157;
+	__catch157_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		GError* _tmp6_;
+		gchar* _tmp7_;
 #line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8416,16 +8431,16 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 		_g_error_free0 (err);
 #line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8415 "ConfigurationInterfaces.c"
+#line 8430 "ConfigurationInterfaces.c"
 	}
-	__finally156:
+	__finally157:
 #line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 8424 "ConfigurationInterfaces.c"
+#line 8439 "ConfigurationInterfaces.c"
 }
 
 
@@ -8434,7 +8449,7 @@ gchar* configuration_facade_get_last_used_dataimports_service (ConfigurationFaca
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_used_dataimports_service (self);
-#line 8433 "ConfigurationInterfaces.c"
+#line 8448 "ConfigurationInterfaces.c"
 }
 
 
@@ -8442,11 +8457,11 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 	GError * _inner_error_ = NULL;
 #line 1234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (service_name != NULL);
-#line 8441 "ConfigurationInterfaces.c"
+#line 8456 "ConfigurationInterfaces.c"
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		const gchar* _tmp2_;
 #line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8461,8 +8476,8 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8460 "ConfigurationInterfaces.c"
-				goto __catch157_configuration_error;
+#line 8475 "ConfigurationInterfaces.c"
+				goto __catch158_configuration_error;
 			}
 #line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8470,14 +8485,14 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 			g_clear_error (&_inner_error_);
 #line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8469 "ConfigurationInterfaces.c"
+#line 8484 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally157;
-	__catch157_configuration_error:
+	goto __finally158;
+	__catch158_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8488,9 +8503,9 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8487 "ConfigurationInterfaces.c"
+#line 8502 "ConfigurationInterfaces.c"
 	}
-	__finally157:
+	__finally158:
 #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8499,7 +8514,7 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 		g_clear_error (&_inner_error_);
 #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8498 "ConfigurationInterfaces.c"
+#line 8513 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8509,7 +8524,7 @@ void configuration_facade_set_last_used_dataimports_service (ConfigurationFacade
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_used_dataimports_service (self, service_name);
-#line 8508 "ConfigurationInterfaces.c"
+#line 8523 "ConfigurationInterfaces.c"
 }
 
 
@@ -8521,18 +8536,18 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 	_vala_sort_order = FALSE;
 #line 1247 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_sort_by = 2;
-#line 8520 "ConfigurationInterfaces.c"
+#line 8535 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 		gint _tmp5_ = 0;
-		ConfigurationEngine* _tmp6_ = NULL;
-		ConfigurationEngine* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
+		ConfigurationEngine* _tmp6_;
+		ConfigurationEngine* _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8549,8 +8564,8 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8548 "ConfigurationInterfaces.c"
-				goto __catch158_configuration_error;
+#line 8563 "ConfigurationInterfaces.c"
+				goto __catch159_configuration_error;
 			}
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8558,7 +8573,7 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8557 "ConfigurationInterfaces.c"
+#line 8572 "ConfigurationInterfaces.c"
 		}
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_order = _tmp0_;
@@ -8578,8 +8593,8 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8577 "ConfigurationInterfaces.c"
-				goto __catch158_configuration_error;
+#line 8592 "ConfigurationInterfaces.c"
+				goto __catch159_configuration_error;
 			}
 #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8587,17 +8602,17 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8586 "ConfigurationInterfaces.c"
+#line 8601 "ConfigurationInterfaces.c"
 		}
 #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_by = _tmp5_;
-#line 8590 "ConfigurationInterfaces.c"
+#line 8605 "ConfigurationInterfaces.c"
 	}
-	goto __finally158;
-	__catch158_configuration_error:
+	goto __finally159;
+	__catch159_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp10_ = NULL;
+		GError* _tmp10_;
 #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8608,9 +8623,9 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 		configuration_facade_on_configuration_error (self, _tmp10_);
 #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8607 "ConfigurationInterfaces.c"
+#line 8622 "ConfigurationInterfaces.c"
 	}
-	__finally158:
+	__finally159:
 #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8619,19 +8634,19 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 		g_clear_error (&_inner_error_);
 #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8618 "ConfigurationInterfaces.c"
+#line 8633 "ConfigurationInterfaces.c"
 	}
 #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_order) {
 #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_order = _vala_sort_order;
-#line 8624 "ConfigurationInterfaces.c"
+#line 8639 "ConfigurationInterfaces.c"
 	}
 #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_by) {
 #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_by = _vala_sort_by;
-#line 8630 "ConfigurationInterfaces.c"
+#line 8645 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8641,19 +8656,19 @@ void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, gb
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_library_photos_sort (self, sort_order, sort_by);
-#line 8640 "ConfigurationInterfaces.c"
+#line 8655 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_library_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
-		ConfigurationEngine* _tmp3_ = NULL;
-		ConfigurationEngine* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
+		ConfigurationEngine* _tmp3_;
+		ConfigurationEngine* _tmp4_;
+		gint _tmp5_;
 #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8668,8 +8683,8 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8667 "ConfigurationInterfaces.c"
-				goto __catch159_configuration_error;
+#line 8682 "ConfigurationInterfaces.c"
+				goto __catch160_configuration_error;
 			}
 #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8677,7 +8692,7 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8676 "ConfigurationInterfaces.c"
+#line 8691 "ConfigurationInterfaces.c"
 		}
 #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -8693,8 +8708,8 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8692 "ConfigurationInterfaces.c"
-				goto __catch159_configuration_error;
+#line 8707 "ConfigurationInterfaces.c"
+				goto __catch160_configuration_error;
 			}
 #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8702,14 +8717,14 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8701 "ConfigurationInterfaces.c"
+#line 8716 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally159;
-	__catch159_configuration_error:
+	goto __finally160;
+	__catch160_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8720,9 +8735,9 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8719 "ConfigurationInterfaces.c"
+#line 8734 "ConfigurationInterfaces.c"
 	}
-	__finally159:
+	__finally160:
 #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8731,7 +8746,7 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 		g_clear_error (&_inner_error_);
 #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8730 "ConfigurationInterfaces.c"
+#line 8745 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8741,7 +8756,7 @@ void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, gb
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1257 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_library_photos_sort (self, sort_order, sort_by);
-#line 8740 "ConfigurationInterfaces.c"
+#line 8755 "ConfigurationInterfaces.c"
 }
 
 
@@ -8753,25 +8768,25 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 	_vala_maximize = FALSE;
 #line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	dimensions_init (&_vala_dimensions, 1024, 768);
-#line 8752 "ConfigurationInterfaces.c"
+#line 8767 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 		gint w = 0;
-		ConfigurationEngine* _tmp5_ = NULL;
-		ConfigurationEngine* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
+		ConfigurationEngine* _tmp5_;
+		ConfigurationEngine* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
 		gint h = 0;
-		ConfigurationEngine* _tmp9_ = NULL;
-		ConfigurationEngine* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
+		ConfigurationEngine* _tmp9_;
+		ConfigurationEngine* _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
+		gint _tmp14_;
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8788,8 +8803,8 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8787 "ConfigurationInterfaces.c"
-				goto __catch160_configuration_error;
+#line 8802 "ConfigurationInterfaces.c"
+				goto __catch161_configuration_error;
 			}
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8797,7 +8812,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8796 "ConfigurationInterfaces.c"
+#line 8811 "ConfigurationInterfaces.c"
 		}
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_maximize = _tmp0_;
@@ -8817,8 +8832,8 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8816 "ConfigurationInterfaces.c"
-				goto __catch160_configuration_error;
+#line 8831 "ConfigurationInterfaces.c"
+				goto __catch161_configuration_error;
 			}
 #line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8826,7 +8841,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8825 "ConfigurationInterfaces.c"
+#line 8840 "ConfigurationInterfaces.c"
 		}
 #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = configuration_facade_get_engine (self);
@@ -8844,8 +8859,8 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8843 "ConfigurationInterfaces.c"
-				goto __catch160_configuration_error;
+#line 8858 "ConfigurationInterfaces.c"
+				goto __catch161_configuration_error;
 			}
 #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8853,7 +8868,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8852 "ConfigurationInterfaces.c"
+#line 8867 "ConfigurationInterfaces.c"
 		}
 #line 1278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp13_ = w;
@@ -8861,13 +8876,13 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		_tmp14_ = h;
 #line 1278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		dimensions_init (&_vala_dimensions, _tmp13_, _tmp14_);
-#line 8860 "ConfigurationInterfaces.c"
+#line 8875 "ConfigurationInterfaces.c"
 	}
-	goto __finally160;
-	__catch160_configuration_error:
+	goto __finally161;
+	__catch161_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp15_ = NULL;
+		GError* _tmp15_;
 #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8878,9 +8893,9 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		configuration_facade_on_configuration_error (self, _tmp15_);
 #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8877 "ConfigurationInterfaces.c"
+#line 8892 "ConfigurationInterfaces.c"
 	}
-	__finally160:
+	__finally161:
 #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8889,19 +8904,19 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		g_clear_error (&_inner_error_);
 #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8888 "ConfigurationInterfaces.c"
+#line 8903 "ConfigurationInterfaces.c"
 	}
 #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (maximize) {
 #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*maximize = _vala_maximize;
-#line 8894 "ConfigurationInterfaces.c"
+#line 8909 "ConfigurationInterfaces.c"
 	}
 #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (dimensions) {
 #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*dimensions = _vala_dimensions;
-#line 8900 "ConfigurationInterfaces.c"
+#line 8915 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8911,7 +8926,7 @@ void configuration_facade_get_library_window_state (ConfigurationFacade* self, g
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_library_window_state (self, maximize, dimensions);
-#line 8910 "ConfigurationInterfaces.c"
+#line 8925 "ConfigurationInterfaces.c"
 }
 
 
@@ -8919,19 +8934,19 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 	GError * _inner_error_ = NULL;
 #line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (dimensions != NULL);
-#line 8918 "ConfigurationInterfaces.c"
-	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
-		ConfigurationEngine* _tmp3_ = NULL;
-		ConfigurationEngine* _tmp4_ = NULL;
-		Dimensions _tmp5_ = {0};
-		gint _tmp6_ = 0;
-		ConfigurationEngine* _tmp7_ = NULL;
-		ConfigurationEngine* _tmp8_ = NULL;
-		Dimensions _tmp9_ = {0};
-		gint _tmp10_ = 0;
+#line 8933 "ConfigurationInterfaces.c"
+	{
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
+		ConfigurationEngine* _tmp3_;
+		ConfigurationEngine* _tmp4_;
+		Dimensions _tmp5_;
+		gint _tmp6_;
+		ConfigurationEngine* _tmp7_;
+		ConfigurationEngine* _tmp8_;
+		Dimensions _tmp9_;
+		gint _tmp10_;
 #line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8946,8 +8961,8 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8945 "ConfigurationInterfaces.c"
-				goto __catch161_configuration_error;
+#line 8960 "ConfigurationInterfaces.c"
+				goto __catch162_configuration_error;
 			}
 #line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8955,7 +8970,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8954 "ConfigurationInterfaces.c"
+#line 8969 "ConfigurationInterfaces.c"
 		}
 #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -8973,8 +8988,8 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8972 "ConfigurationInterfaces.c"
-				goto __catch161_configuration_error;
+#line 8987 "ConfigurationInterfaces.c"
+				goto __catch162_configuration_error;
 			}
 #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8982,7 +8997,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8981 "ConfigurationInterfaces.c"
+#line 8996 "ConfigurationInterfaces.c"
 		}
 #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = configuration_facade_get_engine (self);
@@ -9000,8 +9015,8 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8999 "ConfigurationInterfaces.c"
-				goto __catch161_configuration_error;
+#line 9014 "ConfigurationInterfaces.c"
+				goto __catch162_configuration_error;
 			}
 #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9009,14 +9024,14 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9008 "ConfigurationInterfaces.c"
+#line 9023 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally161;
-	__catch161_configuration_error:
+	goto __finally162;
+	__catch162_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp11_ = NULL;
+		GError* _tmp11_;
 #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9027,9 +9042,9 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		configuration_facade_on_configuration_error (self, _tmp11_);
 #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9026 "ConfigurationInterfaces.c"
+#line 9041 "ConfigurationInterfaces.c"
 	}
-	__finally161:
+	__finally162:
 #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9038,7 +9053,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		g_clear_error (&_inner_error_);
 #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9037 "ConfigurationInterfaces.c"
+#line 9052 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9048,7 +9063,7 @@ void configuration_facade_set_library_window_state (ConfigurationFacade* self, g
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_library_window_state (self, maximize, dimensions);
-#line 9047 "ConfigurationInterfaces.c"
+#line 9062 "ConfigurationInterfaces.c"
 }
 
 
@@ -9058,10 +9073,10 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9076,12 +9091,12 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac
 		_tmp0_ = _tmp4_;
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9075 "ConfigurationInterfaces.c"
+#line 9090 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9079 "ConfigurationInterfaces.c"
-				goto __catch162_configuration_error;
+#line 9094 "ConfigurationInterfaces.c"
+				goto __catch163_configuration_error;
 			}
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9089,19 +9104,19 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 9088 "ConfigurationInterfaces.c"
+#line 9103 "ConfigurationInterfaces.c"
 		}
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9094 "ConfigurationInterfaces.c"
+#line 9109 "ConfigurationInterfaces.c"
 	}
-	goto __finally162;
-	__catch162_configuration_error:
+	goto __finally163;
+	__catch163_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9116,16 +9131,16 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac
 		_g_error_free0 (err);
 #line 1306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9115 "ConfigurationInterfaces.c"
+#line 9130 "ConfigurationInterfaces.c"
 	}
-	__finally162:
+	__finally163:
 #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 9124 "ConfigurationInterfaces.c"
+#line 9139 "ConfigurationInterfaces.c"
 }
 
 
@@ -9134,16 +9149,16 @@ gboolean configuration_facade_get_modify_originals (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1299 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_modify_originals (self);
-#line 9133 "ConfigurationInterfaces.c"
+#line 9148 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_modify_originals (ConfigurationFacade* self, gboolean modify_originals) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9158,8 +9173,8 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9157 "ConfigurationInterfaces.c"
-				goto __catch163_configuration_error;
+#line 9172 "ConfigurationInterfaces.c"
+				goto __catch164_configuration_error;
 			}
 #line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9167,14 +9182,14 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9166 "ConfigurationInterfaces.c"
+#line 9181 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally163;
-	__catch163_configuration_error:
+	goto __finally164;
+	__catch164_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9185,9 +9200,9 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9184 "ConfigurationInterfaces.c"
+#line 9199 "ConfigurationInterfaces.c"
 	}
-	__finally163:
+	__finally164:
 #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9196,7 +9211,7 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9195 "ConfigurationInterfaces.c"
+#line 9210 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9206,7 +9221,7 @@ void configuration_facade_set_modify_originals (ConfigurationFacade* self, gbool
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_modify_originals (self, modify_originals);
-#line 9205 "ConfigurationInterfaces.c"
+#line 9220 "ConfigurationInterfaces.c"
 }
 
 
@@ -9216,10 +9231,10 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9234,12 +9249,12 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa
 		_tmp0_ = _tmp4_;
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9233 "ConfigurationInterfaces.c"
+#line 9248 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9237 "ConfigurationInterfaces.c"
-				goto __catch164_configuration_error;
+#line 9252 "ConfigurationInterfaces.c"
+				goto __catch165_configuration_error;
 			}
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9247,21 +9262,21 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 9246 "ConfigurationInterfaces.c"
+#line 9261 "ConfigurationInterfaces.c"
 		}
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9252 "ConfigurationInterfaces.c"
+#line 9267 "ConfigurationInterfaces.c"
 	}
-	goto __finally164;
-	__catch164_configuration_error:
+	goto __finally165;
+	__catch165_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
+		GError* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
 #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9280,16 +9295,16 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa
 		_g_error_free0 (err);
 #line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9279 "ConfigurationInterfaces.c"
+#line 9294 "ConfigurationInterfaces.c"
 	}
-	__finally164:
+	__finally165:
 #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp9_;
-#line 9288 "ConfigurationInterfaces.c"
+#line 9303 "ConfigurationInterfaces.c"
 }
 
 
@@ -9298,16 +9313,16 @@ gint configuration_facade_get_photo_thumbnail_scale (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_photo_thumbnail_scale (self);
-#line 9297 "ConfigurationInterfaces.c"
+#line 9312 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFacade* self, gint scale) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gint _tmp2_;
 #line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9322,8 +9337,8 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9321 "ConfigurationInterfaces.c"
-				goto __catch165_configuration_error;
+#line 9336 "ConfigurationInterfaces.c"
+				goto __catch166_configuration_error;
 			}
 #line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9331,14 +9346,14 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9330 "ConfigurationInterfaces.c"
+#line 9345 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally165;
-	__catch165_configuration_error:
+	goto __finally166;
+	__catch166_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9349,9 +9364,9 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9348 "ConfigurationInterfaces.c"
+#line 9363 "ConfigurationInterfaces.c"
 	}
-	__finally165:
+	__finally166:
 #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9360,7 +9375,7 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9359 "ConfigurationInterfaces.c"
+#line 9374 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9370,7 +9385,7 @@ void configuration_facade_set_photo_thumbnail_scale (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_photo_thumbnail_scale (self, scale);
-#line 9369 "ConfigurationInterfaces.c"
+#line 9384 "ConfigurationInterfaces.c"
 }
 
 
@@ -9380,10 +9395,10 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat
 	GError * _inner_error_ = NULL;
 	{
 		gdouble _tmp0_ = 0.0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gdouble _tmp3_ = 0.0;
-		gdouble _tmp4_ = 0.0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gdouble _tmp3_;
+		gdouble _tmp4_;
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9398,12 +9413,12 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat
 		_tmp0_ = _tmp4_;
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9397 "ConfigurationInterfaces.c"
+#line 9412 "ConfigurationInterfaces.c"
 			gdouble _tmp5_ = 0.0;
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9401 "ConfigurationInterfaces.c"
-				goto __catch166_configuration_error;
+#line 9416 "ConfigurationInterfaces.c"
+				goto __catch167_configuration_error;
 			}
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9411,19 +9426,19 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat
 			g_clear_error (&_inner_error_);
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 9410 "ConfigurationInterfaces.c"
+#line 9425 "ConfigurationInterfaces.c"
 		}
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9416 "ConfigurationInterfaces.c"
+#line 9431 "ConfigurationInterfaces.c"
 	}
-	goto __finally166;
-	__catch166_configuration_error:
+	goto __finally167;
+	__catch167_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9438,16 +9453,16 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat
 		_g_error_free0 (err);
 #line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9437 "ConfigurationInterfaces.c"
+#line 9452 "ConfigurationInterfaces.c"
 	}
-	__finally166:
+	__finally167:
 #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 9446 "ConfigurationInterfaces.c"
+#line 9461 "ConfigurationInterfaces.c"
 }
 
 
@@ -9456,16 +9471,16 @@ gdouble configuration_facade_get_printing_content_height (ConfigurationFacade* s
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
 #line 1341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_height (self);
-#line 9455 "ConfigurationInterfaces.c"
+#line 9470 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_printing_content_height (ConfigurationFacade* self, gdouble content_height) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gdouble _tmp2_ = 0.0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gdouble _tmp2_;
 #line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9480,8 +9495,8 @@ static void configuration_facade_real_set_printing_content_height (Configuration
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9479 "ConfigurationInterfaces.c"
-				goto __catch167_configuration_error;
+#line 9494 "ConfigurationInterfaces.c"
+				goto __catch168_configuration_error;
 			}
 #line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9489,14 +9504,14 @@ static void configuration_facade_real_set_printing_content_height (Configuration
 			g_clear_error (&_inner_error_);
 #line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9488 "ConfigurationInterfaces.c"
+#line 9503 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally167;
-	__catch167_configuration_error:
+	goto __finally168;
+	__catch168_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9507,9 +9522,9 @@ static void configuration_facade_real_set_printing_content_height (Configuration
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9506 "ConfigurationInterfaces.c"
+#line 9521 "ConfigurationInterfaces.c"
 	}
-	__finally167:
+	__finally168:
 #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9518,7 +9533,7 @@ static void configuration_facade_real_set_printing_content_height (Configuration
 		g_clear_error (&_inner_error_);
 #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9517 "ConfigurationInterfaces.c"
+#line 9532 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9528,7 +9543,7 @@ void configuration_facade_set_printing_content_height (ConfigurationFacade* self
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_height (self, content_height);
-#line 9527 "ConfigurationInterfaces.c"
+#line 9542 "ConfigurationInterfaces.c"
 }
 
 
@@ -9538,10 +9553,10 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9556,12 +9571,12 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration
 		_tmp0_ = _tmp4_;
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9555 "ConfigurationInterfaces.c"
+#line 9570 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9559 "ConfigurationInterfaces.c"
-				goto __catch168_configuration_error;
+#line 9574 "ConfigurationInterfaces.c"
+				goto __catch169_configuration_error;
 			}
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9569,19 +9584,19 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration
 			g_clear_error (&_inner_error_);
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 9568 "ConfigurationInterfaces.c"
+#line 9583 "ConfigurationInterfaces.c"
 		}
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_ - 1;
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9574 "ConfigurationInterfaces.c"
+#line 9589 "ConfigurationInterfaces.c"
 	}
-	goto __finally168;
-	__catch168_configuration_error:
+	goto __finally169;
+	__catch169_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9596,16 +9611,16 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration
 		_g_error_free0 (err);
 #line 1369 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9595 "ConfigurationInterfaces.c"
+#line 9610 "ConfigurationInterfaces.c"
 	}
-	__finally168:
+	__finally169:
 #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 9604 "ConfigurationInterfaces.c"
+#line 9619 "ConfigurationInterfaces.c"
 }
 
 
@@ -9614,16 +9629,16 @@ gint configuration_facade_get_printing_content_layout (ConfigurationFacade* self
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_layout (self);
-#line 9613 "ConfigurationInterfaces.c"
+#line 9628 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_printing_content_layout (ConfigurationFacade* self, gint layout_code) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gint _tmp2_;
 #line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9638,8 +9653,8 @@ static void configuration_facade_real_set_printing_content_layout (Configuration
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9637 "ConfigurationInterfaces.c"
-				goto __catch169_configuration_error;
+#line 9652 "ConfigurationInterfaces.c"
+				goto __catch170_configuration_error;
 			}
 #line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9647,14 +9662,14 @@ static void configuration_facade_real_set_printing_content_layout (Configuration
 			g_clear_error (&_inner_error_);
 #line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9646 "ConfigurationInterfaces.c"
+#line 9661 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally169;
-	__catch169_configuration_error:
+	goto __finally170;
+	__catch170_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9665,9 +9680,9 @@ static void configuration_facade_real_set_printing_content_layout (Configuration
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9664 "ConfigurationInterfaces.c"
+#line 9679 "ConfigurationInterfaces.c"
 	}
-	__finally169:
+	__finally170:
 #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9676,7 +9691,7 @@ static void configuration_facade_real_set_printing_content_layout (Configuration
 		g_clear_error (&_inner_error_);
 #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9675 "ConfigurationInterfaces.c"
+#line 9690 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9686,7 +9701,7 @@ void configuration_facade_set_printing_content_layout (ConfigurationFacade* self
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_layout (self, layout_code);
-#line 9685 "ConfigurationInterfaces.c"
+#line 9700 "ConfigurationInterfaces.c"
 }
 
 
@@ -9696,10 +9711,10 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9714,12 +9729,12 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac
 		_tmp0_ = _tmp4_;
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9713 "ConfigurationInterfaces.c"
+#line 9728 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9717 "ConfigurationInterfaces.c"
-				goto __catch170_configuration_error;
+#line 9732 "ConfigurationInterfaces.c"
+				goto __catch171_configuration_error;
 			}
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9727,19 +9742,19 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 9726 "ConfigurationInterfaces.c"
+#line 9741 "ConfigurationInterfaces.c"
 		}
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9732 "ConfigurationInterfaces.c"
+#line 9747 "ConfigurationInterfaces.c"
 	}
-	goto __finally170;
-	__catch170_configuration_error:
+	goto __finally171;
+	__catch171_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9754,16 +9769,16 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac
 		_g_error_free0 (err);
 #line 1391 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9753 "ConfigurationInterfaces.c"
+#line 9768 "ConfigurationInterfaces.c"
 	}
-	__finally170:
+	__finally171:
 #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 9762 "ConfigurationInterfaces.c"
+#line 9777 "ConfigurationInterfaces.c"
 }
 
 
@@ -9772,16 +9787,16 @@ gint configuration_facade_get_printing_content_ppi (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_ppi (self);
-#line 9771 "ConfigurationInterfaces.c"
+#line 9786 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_printing_content_ppi (ConfigurationFacade* self, gint content_ppi) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gint _tmp2_;
 #line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9796,8 +9811,8 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9795 "ConfigurationInterfaces.c"
-				goto __catch171_configuration_error;
+#line 9810 "ConfigurationInterfaces.c"
+				goto __catch172_configuration_error;
 			}
 #line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9805,14 +9820,14 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9804 "ConfigurationInterfaces.c"
+#line 9819 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally171;
-	__catch171_configuration_error:
+	goto __finally172;
+	__catch172_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9823,9 +9838,9 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9822 "ConfigurationInterfaces.c"
+#line 9837 "ConfigurationInterfaces.c"
 	}
-	__finally171:
+	__finally172:
 #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9834,7 +9849,7 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac
 		g_clear_error (&_inner_error_);
 #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9833 "ConfigurationInterfaces.c"
+#line 9848 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9844,7 +9859,7 @@ void configuration_facade_set_printing_content_ppi (ConfigurationFacade* self, g
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1395 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_ppi (self, content_ppi);
-#line 9843 "ConfigurationInterfaces.c"
+#line 9858 "ConfigurationInterfaces.c"
 }
 
 
@@ -9854,10 +9869,10 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9872,12 +9887,12 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF
 		_tmp0_ = _tmp4_;
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9871 "ConfigurationInterfaces.c"
+#line 9886 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9875 "ConfigurationInterfaces.c"
-				goto __catch172_configuration_error;
+#line 9890 "ConfigurationInterfaces.c"
+				goto __catch173_configuration_error;
 			}
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9885,19 +9900,19 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 9884 "ConfigurationInterfaces.c"
+#line 9899 "ConfigurationInterfaces.c"
 		}
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_ - 1;
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9890 "ConfigurationInterfaces.c"
+#line 9905 "ConfigurationInterfaces.c"
 	}
-	goto __finally172;
-	__catch172_configuration_error:
+	goto __finally173;
+	__catch173_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9912,16 +9927,16 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF
 		_g_error_free0 (err);
 #line 1412 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9911 "ConfigurationInterfaces.c"
+#line 9926 "ConfigurationInterfaces.c"
 	}
-	__finally172:
+	__finally173:
 #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 9920 "ConfigurationInterfaces.c"
+#line 9935 "ConfigurationInterfaces.c"
 }
 
 
@@ -9930,16 +9945,16 @@ gint configuration_facade_get_printing_content_units (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1406 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_units (self);
-#line 9929 "ConfigurationInterfaces.c"
+#line 9944 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_printing_content_units (ConfigurationFacade* self, gint units_code) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gint _tmp2_;
 #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9954,8 +9969,8 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9953 "ConfigurationInterfaces.c"
-				goto __catch173_configuration_error;
+#line 9968 "ConfigurationInterfaces.c"
+				goto __catch174_configuration_error;
 			}
 #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9963,14 +9978,14 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9962 "ConfigurationInterfaces.c"
+#line 9977 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally173;
-	__catch173_configuration_error:
+	goto __finally174;
+	__catch174_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9981,9 +9996,9 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9980 "ConfigurationInterfaces.c"
+#line 9995 "ConfigurationInterfaces.c"
 	}
-	__finally173:
+	__finally174:
 #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9992,7 +10007,7 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF
 		g_clear_error (&_inner_error_);
 #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9991 "ConfigurationInterfaces.c"
+#line 10006 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10002,7 +10017,7 @@ void configuration_facade_set_printing_content_units (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_units (self, units_code);
-#line 10001 "ConfigurationInterfaces.c"
+#line 10016 "ConfigurationInterfaces.c"
 }
 
 
@@ -10012,10 +10027,10 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati
 	GError * _inner_error_ = NULL;
 	{
 		gdouble _tmp0_ = 0.0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gdouble _tmp3_ = 0.0;
-		gdouble _tmp4_ = 0.0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gdouble _tmp3_;
+		gdouble _tmp4_;
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10030,12 +10045,12 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati
 		_tmp0_ = _tmp4_;
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10029 "ConfigurationInterfaces.c"
+#line 10044 "ConfigurationInterfaces.c"
 			gdouble _tmp5_ = 0.0;
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10033 "ConfigurationInterfaces.c"
-				goto __catch174_configuration_error;
+#line 10048 "ConfigurationInterfaces.c"
+				goto __catch175_configuration_error;
 			}
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10043,19 +10058,19 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati
 			g_clear_error (&_inner_error_);
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 10042 "ConfigurationInterfaces.c"
+#line 10057 "ConfigurationInterfaces.c"
 		}
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10048 "ConfigurationInterfaces.c"
+#line 10063 "ConfigurationInterfaces.c"
 	}
-	goto __finally174;
-	__catch174_configuration_error:
+	goto __finally175;
+	__catch175_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10070,16 +10085,16 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati
 		_g_error_free0 (err);
 #line 1434 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10069 "ConfigurationInterfaces.c"
+#line 10084 "ConfigurationInterfaces.c"
 	}
-	__finally174:
+	__finally175:
 #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 10078 "ConfigurationInterfaces.c"
+#line 10093 "ConfigurationInterfaces.c"
 }
 
 
@@ -10088,16 +10103,16 @@ gdouble configuration_facade_get_printing_content_width (ConfigurationFacade* se
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
 #line 1428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_width (self);
-#line 10087 "ConfigurationInterfaces.c"
+#line 10102 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_printing_content_width (ConfigurationFacade* self, gdouble content_width) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gdouble _tmp2_ = 0.0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gdouble _tmp2_;
 #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10112,8 +10127,8 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10111 "ConfigurationInterfaces.c"
-				goto __catch175_configuration_error;
+#line 10126 "ConfigurationInterfaces.c"
+				goto __catch176_configuration_error;
 			}
 #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10121,14 +10136,14 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10120 "ConfigurationInterfaces.c"
+#line 10135 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally175;
-	__catch175_configuration_error:
+	goto __finally176;
+	__catch176_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10139,9 +10154,9 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10138 "ConfigurationInterfaces.c"
+#line 10153 "ConfigurationInterfaces.c"
 	}
-	__finally175:
+	__finally176:
 #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10150,7 +10165,7 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF
 		g_clear_error (&_inner_error_);
 #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10149 "ConfigurationInterfaces.c"
+#line 10164 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10160,7 +10175,7 @@ void configuration_facade_set_printing_content_width (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_width (self, content_width);
-#line 10159 "ConfigurationInterfaces.c"
+#line 10174 "ConfigurationInterfaces.c"
 }
 
 
@@ -10170,10 +10185,10 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10188,12 +10203,12 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio
 		_tmp0_ = _tmp4_;
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10187 "ConfigurationInterfaces.c"
+#line 10202 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10191 "ConfigurationInterfaces.c"
-				goto __catch176_configuration_error;
+#line 10206 "ConfigurationInterfaces.c"
+				goto __catch177_configuration_error;
 			}
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10201,19 +10216,19 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio
 			g_clear_error (&_inner_error_);
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 10200 "ConfigurationInterfaces.c"
+#line 10215 "ConfigurationInterfaces.c"
 		}
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_ - 1;
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10206 "ConfigurationInterfaces.c"
+#line 10221 "ConfigurationInterfaces.c"
 	}
-	goto __finally176;
-	__catch176_configuration_error:
+	goto __finally177;
+	__catch177_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10228,16 +10243,16 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio
 		_g_error_free0 (err);
 #line 1456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10227 "ConfigurationInterfaces.c"
+#line 10242 "ConfigurationInterfaces.c"
 	}
-	__finally176:
+	__finally177:
 #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 10236 "ConfigurationInterfaces.c"
+#line 10251 "ConfigurationInterfaces.c"
 }
 
 
@@ -10246,16 +10261,16 @@ gint configuration_facade_get_printing_images_per_page (ConfigurationFacade* sel
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_images_per_page (self);
-#line 10245 "ConfigurationInterfaces.c"
+#line 10260 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_printing_images_per_page (ConfigurationFacade* self, gint images_per_page_code) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gint _tmp2_;
 #line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10270,8 +10285,8 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10269 "ConfigurationInterfaces.c"
-				goto __catch177_configuration_error;
+#line 10284 "ConfigurationInterfaces.c"
+				goto __catch178_configuration_error;
 			}
 #line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10279,14 +10294,14 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio
 			g_clear_error (&_inner_error_);
 #line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10278 "ConfigurationInterfaces.c"
+#line 10293 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally177;
-	__catch177_configuration_error:
+	goto __finally178;
+	__catch178_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10297,9 +10312,9 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10296 "ConfigurationInterfaces.c"
+#line 10311 "ConfigurationInterfaces.c"
 	}
-	__finally177:
+	__finally178:
 #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10308,7 +10323,7 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio
 		g_clear_error (&_inner_error_);
 #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10307 "ConfigurationInterfaces.c"
+#line 10322 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10318,7 +10333,7 @@ void configuration_facade_set_printing_images_per_page (ConfigurationFacade* sel
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_images_per_page (self, images_per_page_code);
-#line 10317 "ConfigurationInterfaces.c"
+#line 10332 "ConfigurationInterfaces.c"
 }
 
 
@@ -10328,10 +10343,10 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10346,12 +10361,12 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi
 		_tmp0_ = _tmp4_;
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10345 "ConfigurationInterfaces.c"
+#line 10360 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10349 "ConfigurationInterfaces.c"
-				goto __catch178_configuration_error;
+#line 10364 "ConfigurationInterfaces.c"
+				goto __catch179_configuration_error;
 			}
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10359,19 +10374,19 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi
 			g_clear_error (&_inner_error_);
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 10358 "ConfigurationInterfaces.c"
+#line 10373 "ConfigurationInterfaces.c"
 		}
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10364 "ConfigurationInterfaces.c"
+#line 10379 "ConfigurationInterfaces.c"
 	}
-	goto __finally178;
-	__catch178_configuration_error:
+	goto __finally179;
+	__catch179_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10386,16 +10401,16 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi
 		_g_error_free0 (err);
 #line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10385 "ConfigurationInterfaces.c"
+#line 10400 "ConfigurationInterfaces.c"
 	}
-	__finally178:
+	__finally179:
 #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 10394 "ConfigurationInterfaces.c"
+#line 10409 "ConfigurationInterfaces.c"
 }
 
 
@@ -10404,16 +10419,16 @@ gboolean configuration_facade_get_printing_match_aspect_ratio (ConfigurationFaca
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_match_aspect_ratio (self);
-#line 10403 "ConfigurationInterfaces.c"
+#line 10418 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_printing_match_aspect_ratio (ConfigurationFacade* self, gboolean match_aspect_ratio) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10428,8 +10443,8 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10427 "ConfigurationInterfaces.c"
-				goto __catch179_configuration_error;
+#line 10442 "ConfigurationInterfaces.c"
+				goto __catch180_configuration_error;
 			}
 #line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10437,14 +10452,14 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura
 			g_clear_error (&_inner_error_);
 #line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10436 "ConfigurationInterfaces.c"
+#line 10451 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally179;
-	__catch179_configuration_error:
+	goto __finally180;
+	__catch180_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10455,9 +10470,9 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10454 "ConfigurationInterfaces.c"
+#line 10469 "ConfigurationInterfaces.c"
 	}
-	__finally179:
+	__finally180:
 #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10466,7 +10481,7 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura
 		g_clear_error (&_inner_error_);
 #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10465 "ConfigurationInterfaces.c"
+#line 10480 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10476,7 +10491,7 @@ void configuration_facade_set_printing_match_aspect_ratio (ConfigurationFacade*
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_match_aspect_ratio (self, match_aspect_ratio);
-#line 10475 "ConfigurationInterfaces.c"
+#line 10490 "ConfigurationInterfaces.c"
 }
 
 
@@ -10486,10 +10501,10 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10504,12 +10519,12 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati
 		_tmp0_ = _tmp4_;
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10503 "ConfigurationInterfaces.c"
+#line 10518 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10507 "ConfigurationInterfaces.c"
-				goto __catch180_configuration_error;
+#line 10522 "ConfigurationInterfaces.c"
+				goto __catch181_configuration_error;
 			}
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10517,19 +10532,19 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati
 			g_clear_error (&_inner_error_);
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 10516 "ConfigurationInterfaces.c"
+#line 10531 "ConfigurationInterfaces.c"
 		}
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10522 "ConfigurationInterfaces.c"
+#line 10537 "ConfigurationInterfaces.c"
 	}
-	goto __finally180;
-	__catch180_configuration_error:
+	goto __finally181;
+	__catch181_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10544,16 +10559,16 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati
 		_g_error_free0 (err);
 #line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10543 "ConfigurationInterfaces.c"
+#line 10558 "ConfigurationInterfaces.c"
 	}
-	__finally180:
+	__finally181:
 #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 10552 "ConfigurationInterfaces.c"
+#line 10567 "ConfigurationInterfaces.c"
 }
 
 
@@ -10562,16 +10577,16 @@ gboolean configuration_facade_get_printing_print_titles (ConfigurationFacade* se
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_print_titles (self);
-#line 10561 "ConfigurationInterfaces.c"
+#line 10576 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_printing_print_titles (ConfigurationFacade* self, gboolean print_titles) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10586,8 +10601,8 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10585 "ConfigurationInterfaces.c"
-				goto __catch181_configuration_error;
+#line 10600 "ConfigurationInterfaces.c"
+				goto __catch182_configuration_error;
 			}
 #line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10595,14 +10610,14 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10594 "ConfigurationInterfaces.c"
+#line 10609 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally181;
-	__catch181_configuration_error:
+	goto __finally182;
+	__catch182_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10613,9 +10628,9 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10612 "ConfigurationInterfaces.c"
+#line 10627 "ConfigurationInterfaces.c"
 	}
-	__finally181:
+	__finally182:
 #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10624,7 +10639,7 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10623 "ConfigurationInterfaces.c"
+#line 10638 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10634,7 +10649,7 @@ void configuration_facade_set_printing_print_titles (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_print_titles (self, print_titles);
-#line 10633 "ConfigurationInterfaces.c"
+#line 10648 "ConfigurationInterfaces.c"
 }
 
 
@@ -10644,12 +10659,12 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 		gint val = 0;
-		gint _tmp6_ = 0;
+		gint _tmp6_;
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10664,12 +10679,12 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 		_tmp0_ = _tmp4_;
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10663 "ConfigurationInterfaces.c"
+#line 10678 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10667 "ConfigurationInterfaces.c"
-				goto __catch182_configuration_error;
+#line 10682 "ConfigurationInterfaces.c"
+				goto __catch183_configuration_error;
 			}
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10677,7 +10692,7 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 			g_clear_error (&_inner_error_);
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 10676 "ConfigurationInterfaces.c"
+#line 10691 "ConfigurationInterfaces.c"
 		}
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		val = _tmp0_ - 1;
@@ -10685,32 +10700,32 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 		_tmp6_ = val;
 #line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (_tmp6_ == -2) {
-#line 10684 "ConfigurationInterfaces.c"
-			ResourcesUnitSystem _tmp7_ = 0;
+#line 10699 "ConfigurationInterfaces.c"
+			ResourcesUnitSystem _tmp7_;
 #line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp7_ = resources_get_default_measurement_unit ();
 #line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_tmp7_ == RESOURCES_UNIT_SYSTEM_IMPERIAL) {
 #line 1521 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 				val = 2;
-#line 10692 "ConfigurationInterfaces.c"
+#line 10707 "ConfigurationInterfaces.c"
 			} else {
 #line 1523 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 				val = 10;
-#line 10696 "ConfigurationInterfaces.c"
+#line 10711 "ConfigurationInterfaces.c"
 			}
 		}
 #line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = val;
 #line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10703 "ConfigurationInterfaces.c"
+#line 10718 "ConfigurationInterfaces.c"
 	}
-	goto __finally182;
-	__catch182_configuration_error:
+	goto __finally183;
+	__catch183_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp8_ = NULL;
+		GError* _tmp8_;
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10725,16 +10740,16 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 		_g_error_free0 (err);
 #line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10724 "ConfigurationInterfaces.c"
+#line 10739 "ConfigurationInterfaces.c"
 	}
-	__finally182:
+	__finally183:
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp9_;
-#line 10733 "ConfigurationInterfaces.c"
+#line 10748 "ConfigurationInterfaces.c"
 }
 
 
@@ -10743,16 +10758,16 @@ gint configuration_facade_get_printing_size_selection (ConfigurationFacade* self
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_size_selection (self);
-#line 10742 "ConfigurationInterfaces.c"
+#line 10757 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_printing_size_selection (ConfigurationFacade* self, gint size_code) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gint _tmp2_;
 #line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10767,8 +10782,8 @@ static void configuration_facade_real_set_printing_size_selection (Configuration
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10766 "ConfigurationInterfaces.c"
-				goto __catch183_configuration_error;
+#line 10781 "ConfigurationInterfaces.c"
+				goto __catch184_configuration_error;
 			}
 #line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10776,14 +10791,14 @@ static void configuration_facade_real_set_printing_size_selection (Configuration
 			g_clear_error (&_inner_error_);
 #line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10775 "ConfigurationInterfaces.c"
+#line 10790 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally183;
-	__catch183_configuration_error:
+	goto __finally184;
+	__catch184_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10794,9 +10809,9 @@ static void configuration_facade_real_set_printing_size_selection (Configuration
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10793 "ConfigurationInterfaces.c"
+#line 10808 "ConfigurationInterfaces.c"
 	}
-	__finally183:
+	__finally184:
 #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10805,7 +10820,7 @@ static void configuration_facade_real_set_printing_size_selection (Configuration
 		g_clear_error (&_inner_error_);
 #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10804 "ConfigurationInterfaces.c"
+#line 10819 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10815,7 +10830,7 @@ void configuration_facade_set_printing_size_selection (ConfigurationFacade* self
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_size_selection (self, size_code);
-#line 10814 "ConfigurationInterfaces.c"
+#line 10829 "ConfigurationInterfaces.c"
 }
 
 
@@ -10824,11 +10839,11 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF
 	GError * _inner_error_ = NULL;
 	{
 		gchar* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10845,8 +10860,8 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10844 "ConfigurationInterfaces.c"
-				goto __catch184_configuration_error;
+#line 10859 "ConfigurationInterfaces.c"
+				goto __catch185_configuration_error;
 			}
 #line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10854,7 +10869,7 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 10853 "ConfigurationInterfaces.c"
+#line 10868 "ConfigurationInterfaces.c"
 		}
 #line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -10866,14 +10881,14 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF
 		_g_free0 (_tmp0_);
 #line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10865 "ConfigurationInterfaces.c"
+#line 10880 "ConfigurationInterfaces.c"
 	}
-	goto __finally184;
-	__catch184_configuration_error:
+	goto __finally185;
+	__catch185_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		GError* _tmp6_;
+		gchar* _tmp7_;
 #line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10890,16 +10905,16 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF
 		_g_error_free0 (err);
 #line 1555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10889 "ConfigurationInterfaces.c"
+#line 10904 "ConfigurationInterfaces.c"
 	}
-	__finally184:
+	__finally185:
 #line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 10898 "ConfigurationInterfaces.c"
+#line 10913 "ConfigurationInterfaces.c"
 }
 
 
@@ -10908,7 +10923,7 @@ gchar* configuration_facade_get_printing_titles_font (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 1547 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_titles_font (self);
-#line 10907 "ConfigurationInterfaces.c"
+#line 10922 "ConfigurationInterfaces.c"
 }
 
 
@@ -10916,11 +10931,11 @@ static void configuration_facade_real_set_printing_titles_font (ConfigurationFac
 	GError * _inner_error_ = NULL;
 #line 1559 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (font_name != NULL);
-#line 10915 "ConfigurationInterfaces.c"
+#line 10930 "ConfigurationInterfaces.c"
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		const gchar* _tmp2_;
 #line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10935,8 +10950,8 @@ static void configuration_facade_real_set_printing_titles_font (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10934 "ConfigurationInterfaces.c"
-				goto __catch185_configuration_error;
+#line 10949 "ConfigurationInterfaces.c"
+				goto __catch186_configuration_error;
 			}
 #line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10944,14 +10959,14 @@ static void configuration_facade_real_set_printing_titles_font (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10943 "ConfigurationInterfaces.c"
+#line 10958 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally185;
-	__catch185_configuration_error:
+	goto __finally186;
+	__catch186_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10962,9 +10977,9 @@ static void configuration_facade_real_set_printing_titles_font (ConfigurationFac
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10961 "ConfigurationInterfaces.c"
+#line 10976 "ConfigurationInterfaces.c"
 	}
-	__finally185:
+	__finally186:
 #line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10973,7 +10988,7 @@ static void configuration_facade_real_set_printing_titles_font (ConfigurationFac
 		g_clear_error (&_inner_error_);
 #line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10972 "ConfigurationInterfaces.c"
+#line 10987 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10983,7 +10998,7 @@ void configuration_facade_set_printing_titles_font (ConfigurationFacade* self, c
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1559 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_titles_font (self, font_name);
-#line 10982 "ConfigurationInterfaces.c"
+#line 10997 "ConfigurationInterfaces.c"
 }
 
 
@@ -10993,10 +11008,10 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11011,12 +11026,12 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration
 		_tmp0_ = _tmp4_;
 #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11010 "ConfigurationInterfaces.c"
+#line 11025 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11014 "ConfigurationInterfaces.c"
-				goto __catch186_configuration_error;
+#line 11029 "ConfigurationInterfaces.c"
+				goto __catch187_configuration_error;
 			}
 #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11024,19 +11039,19 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration
 			g_clear_error (&_inner_error_);
 #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 11023 "ConfigurationInterfaces.c"
+#line 11038 "ConfigurationInterfaces.c"
 		}
 #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11029 "ConfigurationInterfaces.c"
+#line 11044 "ConfigurationInterfaces.c"
 	}
-	goto __finally186;
-	__catch186_configuration_error:
+	goto __finally187;
+	__catch187_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11051,16 +11066,16 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration
 		_g_error_free0 (err);
 #line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11050 "ConfigurationInterfaces.c"
+#line 11065 "ConfigurationInterfaces.c"
 	}
-	__finally186:
+	__finally187:
 #line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 11059 "ConfigurationInterfaces.c"
+#line 11074 "ConfigurationInterfaces.c"
 }
 
 
@@ -11069,16 +11084,16 @@ gboolean configuration_facade_get_show_welcome_dialog (ConfigurationFacade* self
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1570 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_show_welcome_dialog (self);
-#line 11068 "ConfigurationInterfaces.c"
+#line 11083 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFacade* self, gboolean show) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11093,8 +11108,8 @@ static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11092 "ConfigurationInterfaces.c"
-				goto __catch187_configuration_error;
+#line 11107 "ConfigurationInterfaces.c"
+				goto __catch188_configuration_error;
 			}
 #line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11102,14 +11117,14 @@ static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11101 "ConfigurationInterfaces.c"
+#line 11116 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally187;
-	__catch187_configuration_error:
+	goto __finally188;
+	__catch188_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11120,9 +11135,9 @@ static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFaca
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11119 "ConfigurationInterfaces.c"
+#line 11134 "ConfigurationInterfaces.c"
 	}
-	__finally187:
+	__finally188:
 #line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11131,7 +11146,7 @@ static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFaca
 		g_clear_error (&_inner_error_);
 #line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11130 "ConfigurationInterfaces.c"
+#line 11145 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -11141,7 +11156,7 @@ void configuration_facade_set_show_welcome_dialog (ConfigurationFacade* self, gb
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_show_welcome_dialog (self, show);
-#line 11140 "ConfigurationInterfaces.c"
+#line 11155 "ConfigurationInterfaces.c"
 }
 
 
@@ -11151,10 +11166,10 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade*
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11169,12 +11184,12 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade*
 		_tmp0_ = _tmp4_;
 #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11168 "ConfigurationInterfaces.c"
+#line 11183 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
 #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11172 "ConfigurationInterfaces.c"
-				goto __catch188_configuration_error;
+#line 11187 "ConfigurationInterfaces.c"
+				goto __catch189_configuration_error;
 			}
 #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11182,19 +11197,19 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 11181 "ConfigurationInterfaces.c"
+#line 11196 "ConfigurationInterfaces.c"
 		}
 #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11187 "ConfigurationInterfaces.c"
+#line 11202 "ConfigurationInterfaces.c"
 	}
-	goto __finally188;
-	__catch188_configuration_error:
+	goto __finally189;
+	__catch189_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11209,16 +11224,16 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11208 "ConfigurationInterfaces.c"
+#line 11223 "ConfigurationInterfaces.c"
 	}
-	__finally188:
+	__finally189:
 #line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 11217 "ConfigurationInterfaces.c"
+#line 11232 "ConfigurationInterfaces.c"
 }
 
 
@@ -11227,16 +11242,16 @@ gint configuration_facade_get_sidebar_position (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1592 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_sidebar_position (self);
-#line 11226 "ConfigurationInterfaces.c"
+#line 11241 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_sidebar_position (ConfigurationFacade* self, gint position) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gint _tmp2_;
 #line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11251,8 +11266,8 @@ static void configuration_facade_real_set_sidebar_position (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11250 "ConfigurationInterfaces.c"
-				goto __catch189_configuration_error;
+#line 11265 "ConfigurationInterfaces.c"
+				goto __catch190_configuration_error;
 			}
 #line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11260,14 +11275,14 @@ static void configuration_facade_real_set_sidebar_position (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11259 "ConfigurationInterfaces.c"
+#line 11274 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally189;
-	__catch189_configuration_error:
+	goto __finally190;
+	__catch190_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11278,9 +11293,9 @@ static void configuration_facade_real_set_sidebar_position (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11277 "ConfigurationInterfaces.c"
+#line 11292 "ConfigurationInterfaces.c"
 	}
-	__finally189:
+	__finally190:
 #line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11289,7 +11304,7 @@ static void configuration_facade_real_set_sidebar_position (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11288 "ConfigurationInterfaces.c"
+#line 11303 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -11299,7 +11314,7 @@ void configuration_facade_set_sidebar_position (ConfigurationFacade* self, gint
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1602 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_sidebar_position (self, position);
-#line 11298 "ConfigurationInterfaces.c"
+#line 11313 "ConfigurationInterfaces.c"
 }
 
 
@@ -11309,10 +11324,10 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad
 	GError * _inner_error_ = NULL;
 	{
 		gdouble _tmp0_ = 0.0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gdouble _tmp3_ = 0.0;
-		gdouble _tmp4_ = 0.0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gdouble _tmp3_;
+		gdouble _tmp4_;
 #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11327,12 +11342,12 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad
 		_tmp0_ = _tmp4_;
 #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11326 "ConfigurationInterfaces.c"
+#line 11341 "ConfigurationInterfaces.c"
 			gdouble _tmp5_ = 0.0;
 #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11330 "ConfigurationInterfaces.c"
-				goto __catch190_configuration_error;
+#line 11345 "ConfigurationInterfaces.c"
+				goto __catch191_configuration_error;
 			}
 #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11340,19 +11355,19 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 11339 "ConfigurationInterfaces.c"
+#line 11354 "ConfigurationInterfaces.c"
 		}
 #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11345 "ConfigurationInterfaces.c"
+#line 11360 "ConfigurationInterfaces.c"
 	}
-	goto __finally190;
-	__catch190_configuration_error:
+	goto __finally191;
+	__catch191_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11367,16 +11382,16 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad
 		_g_error_free0 (err);
 #line 1619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11366 "ConfigurationInterfaces.c"
+#line 11381 "ConfigurationInterfaces.c"
 	}
-	__finally190:
+	__finally191:
 #line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 11375 "ConfigurationInterfaces.c"
+#line 11390 "ConfigurationInterfaces.c"
 }
 
 
@@ -11385,16 +11400,16 @@ gdouble configuration_facade_get_slideshow_delay (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
 #line 1613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_delay (self);
-#line 11384 "ConfigurationInterfaces.c"
+#line 11399 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade* self, gdouble delay) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gdouble _tmp2_ = 0.0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gdouble _tmp2_;
 #line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11409,8 +11424,8 @@ static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11408 "ConfigurationInterfaces.c"
-				goto __catch191_configuration_error;
+#line 11423 "ConfigurationInterfaces.c"
+				goto __catch192_configuration_error;
 			}
 #line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11418,14 +11433,14 @@ static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11417 "ConfigurationInterfaces.c"
+#line 11432 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally191;
-	__catch191_configuration_error:
+	goto __finally192;
+	__catch192_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11436,9 +11451,9 @@ static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11435 "ConfigurationInterfaces.c"
+#line 11450 "ConfigurationInterfaces.c"
 	}
-	__finally191:
+	__finally192:
 #line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11447,7 +11462,7 @@ static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11446 "ConfigurationInterfaces.c"
+#line 11461 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -11457,7 +11472,7 @@ void configuration_facade_set_slideshow_delay (ConfigurationFacade* self, gdoubl
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_delay (self, delay);
-#line 11456 "ConfigurationInterfaces.c"
+#line 11471 "ConfigurationInterfaces.c"
 }
 
 
@@ -11467,10 +11482,10 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu
 	GError * _inner_error_ = NULL;
 	{
 		gdouble _tmp0_ = 0.0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gdouble _tmp3_ = 0.0;
-		gdouble _tmp4_ = 0.0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gdouble _tmp3_;
+		gdouble _tmp4_;
 #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11485,12 +11500,12 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu
 		_tmp0_ = _tmp4_;
 #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11484 "ConfigurationInterfaces.c"
+#line 11499 "ConfigurationInterfaces.c"
 			gdouble _tmp5_ = 0.0;
 #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11488 "ConfigurationInterfaces.c"
-				goto __catch192_configuration_error;
+#line 11503 "ConfigurationInterfaces.c"
+				goto __catch193_configuration_error;
 			}
 #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11498,19 +11513,19 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu
 			g_clear_error (&_inner_error_);
 #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 11497 "ConfigurationInterfaces.c"
+#line 11512 "ConfigurationInterfaces.c"
 		}
 #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11503 "ConfigurationInterfaces.c"
+#line 11518 "ConfigurationInterfaces.c"
 	}
-	goto __finally192;
-	__catch192_configuration_error:
+	goto __finally193;
+	__catch193_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11525,16 +11540,16 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu
 		_g_error_free0 (err);
 #line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11524 "ConfigurationInterfaces.c"
+#line 11539 "ConfigurationInterfaces.c"
 	}
-	__finally192:
+	__finally193:
 #line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 11533 "ConfigurationInterfaces.c"
+#line 11548 "ConfigurationInterfaces.c"
 }
 
 
@@ -11543,16 +11558,16 @@ gdouble configuration_facade_get_slideshow_transition_delay (ConfigurationFacade
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
 #line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_transition_delay (self);
-#line 11542 "ConfigurationInterfaces.c"
+#line 11557 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_slideshow_transition_delay (ConfigurationFacade* self, gdouble delay) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gdouble _tmp2_ = 0.0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gdouble _tmp2_;
 #line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11567,8 +11582,8 @@ static void configuration_facade_real_set_slideshow_transition_delay (Configurat
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11566 "ConfigurationInterfaces.c"
-				goto __catch193_configuration_error;
+#line 11581 "ConfigurationInterfaces.c"
+				goto __catch194_configuration_error;
 			}
 #line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11576,14 +11591,14 @@ static void configuration_facade_real_set_slideshow_transition_delay (Configurat
 			g_clear_error (&_inner_error_);
 #line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11575 "ConfigurationInterfaces.c"
+#line 11590 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally193;
-	__catch193_configuration_error:
+	goto __finally194;
+	__catch194_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11594,9 +11609,9 @@ static void configuration_facade_real_set_slideshow_transition_delay (Configurat
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11593 "ConfigurationInterfaces.c"
+#line 11608 "ConfigurationInterfaces.c"
 	}
-	__finally193:
+	__finally194:
 #line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11605,7 +11620,7 @@ static void configuration_facade_real_set_slideshow_transition_delay (Configurat
 		g_clear_error (&_inner_error_);
 #line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11604 "ConfigurationInterfaces.c"
+#line 11619 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -11615,7 +11630,7 @@ void configuration_facade_set_slideshow_transition_delay (ConfigurationFacade* s
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1645 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_transition_delay (self, delay);
-#line 11614 "ConfigurationInterfaces.c"
+#line 11629 "ConfigurationInterfaces.c"
 }
 
 
@@ -11624,11 +11639,11 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf
 	GError * _inner_error_ = NULL;
 	{
 		gchar* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11645,8 +11660,8 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11644 "ConfigurationInterfaces.c"
-				goto __catch194_configuration_error;
+#line 11659 "ConfigurationInterfaces.c"
+				goto __catch195_configuration_error;
 			}
 #line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11654,7 +11669,7 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf
 			g_clear_error (&_inner_error_);
 #line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 11653 "ConfigurationInterfaces.c"
+#line 11668 "ConfigurationInterfaces.c"
 		}
 #line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -11666,14 +11681,14 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf
 		_g_free0 (_tmp0_);
 #line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11665 "ConfigurationInterfaces.c"
+#line 11680 "ConfigurationInterfaces.c"
 	}
-	goto __finally194;
-	__catch194_configuration_error:
+	goto __finally195;
+	__catch195_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		GError* _tmp6_;
+		gchar* _tmp7_;
 #line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11690,16 +11705,16 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf
 		_g_error_free0 (err);
 #line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11689 "ConfigurationInterfaces.c"
+#line 11704 "ConfigurationInterfaces.c"
 	}
-	__finally194:
+	__finally195:
 #line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 11698 "ConfigurationInterfaces.c"
+#line 11713 "ConfigurationInterfaces.c"
 }
 
 
@@ -11708,7 +11723,7 @@ gchar* configuration_facade_get_slideshow_transition_effect_id (ConfigurationFac
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_transition_effect_id (self);
-#line 11707 "ConfigurationInterfaces.c"
+#line 11722 "ConfigurationInterfaces.c"
 }
 
 
@@ -11716,11 +11731,11 @@ static void configuration_facade_real_set_slideshow_transition_effect_id (Config
 	GError * _inner_error_ = NULL;
 #line 1670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 11715 "ConfigurationInterfaces.c"
+#line 11730 "ConfigurationInterfaces.c"
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		const gchar* _tmp2_;
 #line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11735,8 +11750,8 @@ static void configuration_facade_real_set_slideshow_transition_effect_id (Config
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11734 "ConfigurationInterfaces.c"
-				goto __catch195_configuration_error;
+#line 11749 "ConfigurationInterfaces.c"
+				goto __catch196_configuration_error;
 			}
 #line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11744,14 +11759,14 @@ static void configuration_facade_real_set_slideshow_transition_effect_id (Config
 			g_clear_error (&_inner_error_);
 #line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11743 "ConfigurationInterfaces.c"
+#line 11758 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally195;
-	__catch195_configuration_error:
+	goto __finally196;
+	__catch196_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11762,9 +11777,9 @@ static void configuration_facade_real_set_slideshow_transition_effect_id (Config
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11761 "ConfigurationInterfaces.c"
+#line 11776 "ConfigurationInterfaces.c"
 	}
-	__finally195:
+	__finally196:
 #line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11773,7 +11788,7 @@ static void configuration_facade_real_set_slideshow_transition_effect_id (Config
 		g_clear_error (&_inner_error_);
 #line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11772 "ConfigurationInterfaces.c"
+#line 11787 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -11783,7 +11798,7 @@ void configuration_facade_set_slideshow_transition_effect_id (ConfigurationFacad
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_transition_effect_id (self, id);
-#line 11782 "ConfigurationInterfaces.c"
+#line 11797 "ConfigurationInterfaces.c"
 }
 
 
@@ -11793,10 +11808,10 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11811,12 +11826,12 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio
 		_tmp0_ = _tmp4_;
 #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11810 "ConfigurationInterfaces.c"
+#line 11825 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11814 "ConfigurationInterfaces.c"
-				goto __catch196_configuration_error;
+#line 11829 "ConfigurationInterfaces.c"
+				goto __catch197_configuration_error;
 			}
 #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11824,19 +11839,19 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio
 			g_clear_error (&_inner_error_);
 #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 11823 "ConfigurationInterfaces.c"
+#line 11838 "ConfigurationInterfaces.c"
 		}
 #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11829 "ConfigurationInterfaces.c"
+#line 11844 "ConfigurationInterfaces.c"
 	}
-	goto __finally196;
-	__catch196_configuration_error:
+	goto __finally197;
+	__catch197_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11851,16 +11866,16 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio
 		_g_error_free0 (err);
 #line 1688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11850 "ConfigurationInterfaces.c"
+#line 11865 "ConfigurationInterfaces.c"
 	}
-	__finally196:
+	__finally197:
 #line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 11859 "ConfigurationInterfaces.c"
+#line 11874 "ConfigurationInterfaces.c"
 }
 
 
@@ -11869,16 +11884,16 @@ gboolean configuration_facade_get_slideshow_show_title (ConfigurationFacade* sel
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1682 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_show_title (self);
-#line 11868 "ConfigurationInterfaces.c"
+#line 11883 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_slideshow_show_title (ConfigurationFacade* self, gboolean show_title) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11893,8 +11908,8 @@ static void configuration_facade_real_set_slideshow_show_title (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11892 "ConfigurationInterfaces.c"
-				goto __catch197_configuration_error;
+#line 11907 "ConfigurationInterfaces.c"
+				goto __catch198_configuration_error;
 			}
 #line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11902,14 +11917,14 @@ static void configuration_facade_real_set_slideshow_show_title (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11901 "ConfigurationInterfaces.c"
+#line 11916 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally197;
-	__catch197_configuration_error:
+	goto __finally198;
+	__catch198_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11920,9 +11935,9 @@ static void configuration_facade_real_set_slideshow_show_title (ConfigurationFac
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11919 "ConfigurationInterfaces.c"
+#line 11934 "ConfigurationInterfaces.c"
 	}
-	__finally197:
+	__finally198:
 #line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11931,7 +11946,7 @@ static void configuration_facade_real_set_slideshow_show_title (ConfigurationFac
 		g_clear_error (&_inner_error_);
 #line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11930 "ConfigurationInterfaces.c"
+#line 11945 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -11941,68 +11956,68 @@ void configuration_facade_set_slideshow_show_title (ConfigurationFacade* self, g
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1692 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_show_title (self, show_title);
-#line 11940 "ConfigurationInterfaces.c"
+#line 11955 "ConfigurationInterfaces.c"
 }
 
 
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return;
-#line 11955 "ConfigurationInterfaces.c"
+#line 11970 "ConfigurationInterfaces.c"
 }
 
 
 static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* result = NULL;
 	gchar* buffer = NULL;
-	gchar* _tmp0_ = NULL;
-	gint buffer_length1 = 0;
-	gint _buffer_size_ = 0;
-	gchar* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	gint buffer_length1;
+	gint _buffer_size_;
+	gchar* _tmp1_;
+	gint _tmp1__length1;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
+#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 12001 "ConfigurationInterfaces.c"
+#line 12016 "ConfigurationInterfaces.c"
 }
 
 
@@ -12012,10 +12027,10 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12030,12 +12045,12 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac
 		_tmp0_ = _tmp4_;
 #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12029 "ConfigurationInterfaces.c"
+#line 12044 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12033 "ConfigurationInterfaces.c"
-				goto __catch198_configuration_error;
+#line 12048 "ConfigurationInterfaces.c"
+				goto __catch199_configuration_error;
 			}
 #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -12043,24 +12058,24 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 12042 "ConfigurationInterfaces.c"
+#line 12057 "ConfigurationInterfaces.c"
 		}
 #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12048 "ConfigurationInterfaces.c"
+#line 12063 "ConfigurationInterfaces.c"
 	}
-	goto __finally198;
-	__catch198_configuration_error:
+	goto __finally199;
+	__catch199_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 		struct tm _tmp7_ = {0};
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
-		gboolean _tmp11_ = FALSE;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		gboolean _tmp10_;
+		gboolean _tmp11_;
 #line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12087,16 +12102,16 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac
 		_g_error_free0 (err);
 #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12086 "ConfigurationInterfaces.c"
+#line 12101 "ConfigurationInterfaces.c"
 	}
-	__finally198:
+	__finally199:
 #line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp12_;
-#line 12095 "ConfigurationInterfaces.c"
+#line 12110 "ConfigurationInterfaces.c"
 }
 
 
@@ -12105,16 +12120,16 @@ gboolean configuration_facade_get_use_24_hour_time (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_use_24_hour_time (self);
-#line 12104 "ConfigurationInterfaces.c"
+#line 12119 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade* self, gboolean use_24_hour_time) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12129,8 +12144,8 @@ static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12128 "ConfigurationInterfaces.c"
-				goto __catch199_configuration_error;
+#line 12143 "ConfigurationInterfaces.c"
+				goto __catch200_configuration_error;
 			}
 #line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -12138,14 +12153,14 @@ static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 12137 "ConfigurationInterfaces.c"
+#line 12152 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally199;
-	__catch199_configuration_error:
+	goto __finally200;
+	__catch200_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12156,9 +12171,9 @@ static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 12155 "ConfigurationInterfaces.c"
+#line 12170 "ConfigurationInterfaces.c"
 	}
-	__finally199:
+	__finally200:
 #line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12167,7 +12182,7 @@ static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 12166 "ConfigurationInterfaces.c"
+#line 12181 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -12177,7 +12192,7 @@ void configuration_facade_set_use_24_hour_time (ConfigurationFacade* self, gbool
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1715 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_use_24_hour_time (self, use_24_hour_time);
-#line 12176 "ConfigurationInterfaces.c"
+#line 12191 "ConfigurationInterfaces.c"
 }
 
 
@@ -12187,10 +12202,10 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gboolean _tmp3_;
+		gboolean _tmp4_;
 #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12205,12 +12220,12 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura
 		_tmp0_ = _tmp4_;
 #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12204 "ConfigurationInterfaces.c"
+#line 12219 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
 #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12208 "ConfigurationInterfaces.c"
-				goto __catch200_configuration_error;
+#line 12223 "ConfigurationInterfaces.c"
+				goto __catch201_configuration_error;
 			}
 #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -12218,19 +12233,19 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura
 			g_clear_error (&_inner_error_);
 #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 12217 "ConfigurationInterfaces.c"
+#line 12232 "ConfigurationInterfaces.c"
 		}
 #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12223 "ConfigurationInterfaces.c"
+#line 12238 "ConfigurationInterfaces.c"
 	}
-	goto __finally200;
-	__catch200_configuration_error:
+	goto __finally201;
+	__catch201_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12245,16 +12260,16 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura
 		_g_error_free0 (err);
 #line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12244 "ConfigurationInterfaces.c"
+#line 12259 "ConfigurationInterfaces.c"
 	}
-	__finally200:
+	__finally201:
 #line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 12253 "ConfigurationInterfaces.c"
+#line 12268 "ConfigurationInterfaces.c"
 }
 
 
@@ -12263,16 +12278,16 @@ gboolean configuration_facade_get_use_lowercase_filenames (ConfigurationFacade*
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1726 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_use_lowercase_filenames (self);
-#line 12262 "ConfigurationInterfaces.c"
+#line 12277 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_use_lowercase_filenames (ConfigurationFacade* self, gboolean b) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gboolean _tmp2_;
 #line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12287,8 +12302,8 @@ static void configuration_facade_real_set_use_lowercase_filenames (Configuration
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12286 "ConfigurationInterfaces.c"
-				goto __catch201_configuration_error;
+#line 12301 "ConfigurationInterfaces.c"
+				goto __catch202_configuration_error;
 			}
 #line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -12296,14 +12311,14 @@ static void configuration_facade_real_set_use_lowercase_filenames (Configuration
 			g_clear_error (&_inner_error_);
 #line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 12295 "ConfigurationInterfaces.c"
+#line 12310 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally201;
-	__catch201_configuration_error:
+	goto __finally202;
+	__catch202_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12314,9 +12329,9 @@ static void configuration_facade_real_set_use_lowercase_filenames (Configuration
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 12313 "ConfigurationInterfaces.c"
+#line 12328 "ConfigurationInterfaces.c"
 	}
-	__finally201:
+	__finally202:
 #line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12325,7 +12340,7 @@ static void configuration_facade_real_set_use_lowercase_filenames (Configuration
 		g_clear_error (&_inner_error_);
 #line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 12324 "ConfigurationInterfaces.c"
+#line 12339 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -12335,7 +12350,7 @@ void configuration_facade_set_use_lowercase_filenames (ConfigurationFacade* self
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_use_lowercase_filenames (self, b);
-#line 12334 "ConfigurationInterfaces.c"
+#line 12349 "ConfigurationInterfaces.c"
 }
 
 
@@ -12345,10 +12360,10 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
-		ConfigurationEngine* _tmp1_ = NULL;
-		ConfigurationEngine* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12363,12 +12378,12 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config
 		_tmp0_ = _tmp4_;
 #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12362 "ConfigurationInterfaces.c"
+#line 12377 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
 #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12366 "ConfigurationInterfaces.c"
-				goto __catch202_configuration_error;
+#line 12381 "ConfigurationInterfaces.c"
+				goto __catch203_configuration_error;
 			}
 #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -12376,19 +12391,19 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config
 			g_clear_error (&_inner_error_);
 #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 12375 "ConfigurationInterfaces.c"
+#line 12390 "ConfigurationInterfaces.c"
 		}
 #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12381 "ConfigurationInterfaces.c"
+#line 12396 "ConfigurationInterfaces.c"
 	}
-	goto __finally202;
-	__catch202_configuration_error:
+	goto __finally203;
+	__catch203_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12403,16 +12418,16 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config
 		_g_error_free0 (err);
 #line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12402 "ConfigurationInterfaces.c"
+#line 12417 "ConfigurationInterfaces.c"
 	}
-	__finally202:
+	__finally203:
 #line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 12411 "ConfigurationInterfaces.c"
+#line 12426 "ConfigurationInterfaces.c"
 }
 
 
@@ -12421,16 +12436,16 @@ gint configuration_facade_get_video_interpreter_state_cookie (ConfigurationFacad
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1747 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_video_interpreter_state_cookie (self);
-#line 12420 "ConfigurationInterfaces.c"
+#line 12435 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_video_interpreter_state_cookie (ConfigurationFacade* self, gint state_cookie) {
 	GError * _inner_error_ = NULL;
 	{
-		ConfigurationEngine* _tmp0_ = NULL;
-		ConfigurationEngine* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		gint _tmp2_;
 #line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
 #line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12445,8 +12460,8 @@ static void configuration_facade_real_set_video_interpreter_state_cookie (Config
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12444 "ConfigurationInterfaces.c"
-				goto __catch203_configuration_error;
+#line 12459 "ConfigurationInterfaces.c"
+				goto __catch204_configuration_error;
 			}
 #line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -12454,14 +12469,14 @@ static void configuration_facade_real_set_video_interpreter_state_cookie (Config
 			g_clear_error (&_inner_error_);
 #line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 12453 "ConfigurationInterfaces.c"
+#line 12468 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally203;
-	__catch203_configuration_error:
+	goto __finally204;
+	__catch204_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12472,9 +12487,9 @@ static void configuration_facade_real_set_video_interpreter_state_cookie (Config
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 12471 "ConfigurationInterfaces.c"
+#line 12486 "ConfigurationInterfaces.c"
 	}
-	__finally203:
+	__finally204:
 #line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12483,7 +12498,7 @@ static void configuration_facade_real_set_video_interpreter_state_cookie (Config
 		g_clear_error (&_inner_error_);
 #line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 12482 "ConfigurationInterfaces.c"
+#line 12497 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -12493,20 +12508,20 @@ void configuration_facade_set_video_interpreter_state_cookie (ConfigurationFacad
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_video_interpreter_state_cookie (self, state_cookie);
-#line 12492 "ConfigurationInterfaces.c"
+#line 12507 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean def) {
 	gboolean result = FALSE;
-	ConfigurationEngine* _tmp0_ = NULL;
-	ConfigurationEngine* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
+	ConfigurationEngine* _tmp0_;
+	ConfigurationEngine* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp7_;
 #line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, FALSE);
 #line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12535,7 +12550,7 @@ static gboolean configuration_facade_real_get_plugin_bool (ConfigurationFacade*
 	result = _tmp7_;
 #line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12534 "ConfigurationInterfaces.c"
+#line 12549 "ConfigurationInterfaces.c"
 }
 
 
@@ -12544,17 +12559,17 @@ gboolean configuration_facade_get_plugin_bool (ConfigurationFacade* self, const
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_bool (self, domain, id, key, def);
-#line 12543 "ConfigurationInterfaces.c"
+#line 12558 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean val) {
-	ConfigurationEngine* _tmp0_ = NULL;
-	ConfigurationEngine* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	ConfigurationEngine* _tmp0_;
+	ConfigurationEngine* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gboolean _tmp5_;
 #line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
 #line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12577,7 +12592,7 @@ static void configuration_facade_real_set_plugin_bool (ConfigurationFacade* self
 	configuration_engine_set_plugin_bool (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
 #line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12576 "ConfigurationInterfaces.c"
+#line 12591 "ConfigurationInterfaces.c"
 }
 
 
@@ -12586,20 +12601,20 @@ void configuration_facade_set_plugin_bool (ConfigurationFacade* self, const gcha
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_bool (self, domain, id, key, val);
-#line 12585 "ConfigurationInterfaces.c"
+#line 12600 "ConfigurationInterfaces.c"
 }
 
 
 static gdouble configuration_facade_real_get_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble def) {
 	gdouble result = 0.0;
-	ConfigurationEngine* _tmp0_ = NULL;
-	ConfigurationEngine* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
-	gdouble _tmp7_ = 0.0;
+	ConfigurationEngine* _tmp0_;
+	ConfigurationEngine* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
+	gdouble _tmp7_;
 #line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, 0.0);
 #line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12628,7 +12643,7 @@ static gdouble configuration_facade_real_get_plugin_double (ConfigurationFacade*
 	result = _tmp7_;
 #line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12627 "ConfigurationInterfaces.c"
+#line 12642 "ConfigurationInterfaces.c"
 }
 
 
@@ -12637,17 +12652,17 @@ gdouble configuration_facade_get_plugin_double (ConfigurationFacade* self, const
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
 #line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_double (self, domain, id, key, def);
-#line 12636 "ConfigurationInterfaces.c"
+#line 12651 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble val) {
-	ConfigurationEngine* _tmp0_ = NULL;
-	ConfigurationEngine* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gdouble _tmp5_ = 0.0;
+	ConfigurationEngine* _tmp0_;
+	ConfigurationEngine* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gdouble _tmp5_;
 #line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
 #line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12670,7 +12685,7 @@ static void configuration_facade_real_set_plugin_double (ConfigurationFacade* se
 	configuration_engine_set_plugin_double (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
 #line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12669 "ConfigurationInterfaces.c"
+#line 12684 "ConfigurationInterfaces.c"
 }
 
 
@@ -12679,20 +12694,20 @@ void configuration_facade_set_plugin_double (ConfigurationFacade* self, const gc
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_double (self, domain, id, key, val);
-#line 12678 "ConfigurationInterfaces.c"
+#line 12693 "ConfigurationInterfaces.c"
 }
 
 
 static gint configuration_facade_real_get_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint def) {
 	gint result = 0;
-	ConfigurationEngine* _tmp0_ = NULL;
-	ConfigurationEngine* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	ConfigurationEngine* _tmp0_;
+	ConfigurationEngine* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 #line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, 0);
 #line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12721,7 +12736,7 @@ static gint configuration_facade_real_get_plugin_int (ConfigurationFacade* self,
 	result = _tmp7_;
 #line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12720 "ConfigurationInterfaces.c"
+#line 12735 "ConfigurationInterfaces.c"
 }
 
 
@@ -12730,17 +12745,17 @@ gint configuration_facade_get_plugin_int (ConfigurationFacade* self, const gchar
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_int (self, domain, id, key, def);
-#line 12729 "ConfigurationInterfaces.c"
+#line 12744 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint val) {
-	ConfigurationEngine* _tmp0_ = NULL;
-	ConfigurationEngine* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	ConfigurationEngine* _tmp0_;
+	ConfigurationEngine* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gint _tmp5_;
 #line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
 #line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12763,7 +12778,7 @@ static void configuration_facade_real_set_plugin_int (ConfigurationFacade* self,
 	configuration_engine_set_plugin_int (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
 #line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12762 "ConfigurationInterfaces.c"
+#line 12777 "ConfigurationInterfaces.c"
 }
 
 
@@ -12772,24 +12787,24 @@ void configuration_facade_set_plugin_int (ConfigurationFacade* self, const gchar
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_int (self, domain, id, key, val);
-#line 12771 "ConfigurationInterfaces.c"
+#line 12786 "ConfigurationInterfaces.c"
 }
 
 
 static gchar* configuration_facade_real_get_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* def) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	ConfigurationEngine* _tmp0_ = NULL;
-	ConfigurationEngine* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	ConfigurationEngine* _tmp0_;
+	ConfigurationEngine* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
 	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp11_ = NULL;
+	const gchar* _tmp9_;
+	gchar* _tmp11_;
 #line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, NULL);
 #line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12822,14 +12837,14 @@ static gchar* configuration_facade_real_get_plugin_string (ConfigurationFacade*
 	if (g_strcmp0 (_tmp9_, "") == 0) {
 #line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = NULL;
-#line 12821 "ConfigurationInterfaces.c"
+#line 12836 "ConfigurationInterfaces.c"
 	} else {
-		const gchar* _tmp10_ = NULL;
+		const gchar* _tmp10_;
 #line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = _result_;
 #line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = _tmp10_;
-#line 12828 "ConfigurationInterfaces.c"
+#line 12843 "ConfigurationInterfaces.c"
 	}
 #line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp11_ = g_strdup (_tmp8_);
@@ -12839,7 +12854,7 @@ static gchar* configuration_facade_real_get_plugin_string (ConfigurationFacade*
 	_g_free0 (_result_);
 #line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12838 "ConfigurationInterfaces.c"
+#line 12853 "ConfigurationInterfaces.c"
 }
 
 
@@ -12848,18 +12863,18 @@ gchar* configuration_facade_get_plugin_string (ConfigurationFacade* self, const
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_string (self, domain, id, key, def);
-#line 12847 "ConfigurationInterfaces.c"
+#line 12862 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* val) {
-	const gchar* _tmp0_ = NULL;
-	ConfigurationEngine* _tmp1_ = NULL;
-	ConfigurationEngine* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
+	const gchar* _tmp0_;
+	ConfigurationEngine* _tmp1_;
+	ConfigurationEngine* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
+	const gchar* _tmp6_;
 #line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
 #line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12872,7 +12887,7 @@ static void configuration_facade_real_set_plugin_string (ConfigurationFacade* se
 	if (_tmp0_ == NULL) {
 #line 1801 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		val = "";
-#line 12871 "ConfigurationInterfaces.c"
+#line 12886 "ConfigurationInterfaces.c"
 	}
 #line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = configuration_facade_get_engine (self);
@@ -12890,7 +12905,7 @@ static void configuration_facade_real_set_plugin_string (ConfigurationFacade* se
 	configuration_engine_set_plugin_string (_tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
 #line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp2_);
-#line 12889 "ConfigurationInterfaces.c"
+#line 12904 "ConfigurationInterfaces.c"
 }
 
 
@@ -12899,16 +12914,16 @@ void configuration_facade_set_plugin_string (ConfigurationFacade* self, const gc
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_string (self, domain, id, key, val);
-#line 12898 "ConfigurationInterfaces.c"
+#line 12913 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_unset_plugin_key (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key) {
-	ConfigurationEngine* _tmp0_ = NULL;
-	ConfigurationEngine* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	ConfigurationEngine* _tmp0_;
+	ConfigurationEngine* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
 #line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
 #line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12929,7 +12944,7 @@ static void configuration_facade_real_unset_plugin_key (ConfigurationFacade* sel
 	configuration_engine_unset_plugin_key (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
 #line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12928 "ConfigurationInterfaces.c"
+#line 12943 "ConfigurationInterfaces.c"
 }
 
 
@@ -12938,17 +12953,17 @@ void configuration_facade_unset_plugin_key (ConfigurationFacade* self, const gch
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->unset_plugin_key (self, domain, id, key);
-#line 12937 "ConfigurationInterfaces.c"
+#line 12952 "ConfigurationInterfaces.c"
 }
 
 
 static FuzzyPropertyState configuration_facade_real_is_plugin_enabled (ConfigurationFacade* self, const gchar* id) {
 	FuzzyPropertyState result = 0;
-	ConfigurationEngine* _tmp0_ = NULL;
-	ConfigurationEngine* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	FuzzyPropertyState _tmp3_ = 0;
-	FuzzyPropertyState _tmp4_ = 0;
+	ConfigurationEngine* _tmp0_;
+	ConfigurationEngine* _tmp1_;
+	const gchar* _tmp2_;
+	FuzzyPropertyState _tmp3_;
+	FuzzyPropertyState _tmp4_;
 #line 1813 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, 0);
 #line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12967,7 +12982,7 @@ static FuzzyPropertyState configuration_facade_real_is_plugin_enabled (Configura
 	result = _tmp4_;
 #line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12966 "ConfigurationInterfaces.c"
+#line 12981 "ConfigurationInterfaces.c"
 }
 
 
@@ -12976,15 +12991,15 @@ FuzzyPropertyState configuration_facade_is_plugin_enabled (ConfigurationFacade*
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1813 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->is_plugin_enabled (self, id);
-#line 12975 "ConfigurationInterfaces.c"
+#line 12990 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_plugin_enabled (ConfigurationFacade* self, const gchar* id, gboolean enabled) {
-	ConfigurationEngine* _tmp0_ = NULL;
-	ConfigurationEngine* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	ConfigurationEngine* _tmp0_;
+	ConfigurationEngine* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 #line 1817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
 #line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12999,7 +13014,7 @@ static void configuration_facade_real_set_plugin_enabled (ConfigurationFacade* s
 	configuration_engine_set_plugin_enabled (_tmp1_, _tmp2_, _tmp3_);
 #line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12998 "ConfigurationInterfaces.c"
+#line 13013 "ConfigurationInterfaces.c"
 }
 
 
@@ -13008,7 +13023,7 @@ void configuration_facade_set_plugin_enabled (ConfigurationFacade* self, const g
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_enabled (self, id, enabled);
-#line 13007 "ConfigurationInterfaces.c"
+#line 13022 "ConfigurationInterfaces.c"
 }
 
 
@@ -13018,297 +13033,297 @@ static void configuration_facade_class_init (ConfigurationFacadeClass * klass) {
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_type_class_add_private (klass, sizeof (ConfigurationFacadePrivate));
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_auto_import_from_library = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_auto_import_from_library;
+	((ConfigurationFacadeClass *) klass)->get_auto_import_from_library = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_auto_import_from_library;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_auto_import_from_library = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_auto_import_from_library;
+	((ConfigurationFacadeClass *) klass)->set_auto_import_from_library = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_auto_import_from_library;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_bg_color_name = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_bg_color_name;
+	((ConfigurationFacadeClass *) klass)->get_bg_color_name = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_bg_color_name;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_bg_color_name = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_bg_color_name;
+	((ConfigurationFacadeClass *) klass)->set_bg_color_name = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_bg_color_name;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_commit_metadata_to_masters = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_commit_metadata_to_masters;
+	((ConfigurationFacadeClass *) klass)->get_commit_metadata_to_masters = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_commit_metadata_to_masters;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_commit_metadata_to_masters = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_commit_metadata_to_masters;
+	((ConfigurationFacadeClass *) klass)->set_commit_metadata_to_masters = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_commit_metadata_to_masters;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_desktop_background = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_desktop_background;
+	((ConfigurationFacadeClass *) klass)->get_desktop_background = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_desktop_background;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_desktop_background = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_desktop_background;
+	((ConfigurationFacadeClass *) klass)->set_desktop_background = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_desktop_background;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_screensaver = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_screensaver;
+	((ConfigurationFacadeClass *) klass)->get_screensaver = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_screensaver;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_screensaver = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_screensaver;
+	((ConfigurationFacadeClass *) klass)->set_screensaver = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_screensaver;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_directory_pattern = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_directory_pattern;
+	((ConfigurationFacadeClass *) klass)->get_directory_pattern = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_directory_pattern;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_directory_pattern = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_directory_pattern;
+	((ConfigurationFacadeClass *) klass)->set_directory_pattern = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_directory_pattern;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_directory_pattern_custom = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_directory_pattern_custom;
+	((ConfigurationFacadeClass *) klass)->get_directory_pattern_custom = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_directory_pattern_custom;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_directory_pattern_custom = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_directory_pattern_custom;
+	((ConfigurationFacadeClass *) klass)->set_directory_pattern_custom = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_directory_pattern_custom;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_direct_window_state = (void (*)(ConfigurationFacade*, gboolean*, Dimensions*)) configuration_facade_real_get_direct_window_state;
+	((ConfigurationFacadeClass *) klass)->get_direct_window_state = (void (*) (ConfigurationFacade *, gboolean*, Dimensions*)) configuration_facade_real_get_direct_window_state;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_direct_window_state = (void (*)(ConfigurationFacade*, gboolean, Dimensions*)) configuration_facade_real_set_direct_window_state;
+	((ConfigurationFacadeClass *) klass)->set_direct_window_state = (void (*) (ConfigurationFacade *, gboolean, Dimensions*)) configuration_facade_real_set_direct_window_state;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_display_basic_properties = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_basic_properties;
+	((ConfigurationFacadeClass *) klass)->get_display_basic_properties = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_basic_properties;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_display_basic_properties = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_basic_properties;
+	((ConfigurationFacadeClass *) klass)->set_display_basic_properties = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_basic_properties;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_display_extended_properties = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_extended_properties;
+	((ConfigurationFacadeClass *) klass)->get_display_extended_properties = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_extended_properties;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_display_extended_properties = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_extended_properties;
+	((ConfigurationFacadeClass *) klass)->set_display_extended_properties = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_extended_properties;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_display_sidebar = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_sidebar;
+	((ConfigurationFacadeClass *) klass)->get_display_sidebar = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_sidebar;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_display_sidebar = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_sidebar;
+	((ConfigurationFacadeClass *) klass)->set_display_sidebar = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_sidebar;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_display_toolbar = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_toolbar;
+	((ConfigurationFacadeClass *) klass)->get_display_toolbar = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_toolbar;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_display_toolbar = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_toolbar;
+	((ConfigurationFacadeClass *) klass)->set_display_toolbar = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_toolbar;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_display_search_bar = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_search_bar;
+	((ConfigurationFacadeClass *) klass)->get_display_search_bar = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_search_bar;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_display_search_bar = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_search_bar;
+	((ConfigurationFacadeClass *) klass)->set_display_search_bar = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_search_bar;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_display_photo_ratings = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_photo_ratings;
+	((ConfigurationFacadeClass *) klass)->get_display_photo_ratings = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_photo_ratings;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_display_photo_ratings = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_photo_ratings;
+	((ConfigurationFacadeClass *) klass)->set_display_photo_ratings = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_photo_ratings;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_display_photo_tags = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_photo_tags;
+	((ConfigurationFacadeClass *) klass)->get_display_photo_tags = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_photo_tags;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_display_photo_tags = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_photo_tags;
+	((ConfigurationFacadeClass *) klass)->set_display_photo_tags = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_photo_tags;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_display_photo_titles = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_photo_titles;
+	((ConfigurationFacadeClass *) klass)->get_display_photo_titles = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_photo_titles;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_display_photo_titles = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_photo_titles;
+	((ConfigurationFacadeClass *) klass)->set_display_photo_titles = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_photo_titles;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_display_photo_comments = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_photo_comments;
+	((ConfigurationFacadeClass *) klass)->get_display_photo_comments = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_photo_comments;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_display_photo_comments = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_photo_comments;
+	((ConfigurationFacadeClass *) klass)->set_display_photo_comments = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_photo_comments;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_display_event_comments = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_event_comments;
+	((ConfigurationFacadeClass *) klass)->get_display_event_comments = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_event_comments;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_display_event_comments = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_event_comments;
+	((ConfigurationFacadeClass *) klass)->set_display_event_comments = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_event_comments;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_event_photos_sort = (void (*)(ConfigurationFacade*, gboolean*, gint*)) configuration_facade_real_get_event_photos_sort;
+	((ConfigurationFacadeClass *) klass)->get_event_photos_sort = (void (*) (ConfigurationFacade *, gboolean*, gint*)) configuration_facade_real_get_event_photos_sort;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_event_photos_sort = (void (*)(ConfigurationFacade*, gboolean, gint)) configuration_facade_real_set_event_photos_sort;
+	((ConfigurationFacadeClass *) klass)->set_event_photos_sort = (void (*) (ConfigurationFacade *, gboolean, gint)) configuration_facade_real_set_event_photos_sort;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_events_sort_ascending = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_events_sort_ascending;
+	((ConfigurationFacadeClass *) klass)->get_events_sort_ascending = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_events_sort_ascending;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_events_sort_ascending = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_events_sort_ascending;
+	((ConfigurationFacadeClass *) klass)->set_events_sort_ascending = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_events_sort_ascending;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_external_photo_app = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_external_photo_app;
+	((ConfigurationFacadeClass *) klass)->get_external_photo_app = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_external_photo_app;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_external_photo_app = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_external_photo_app;
+	((ConfigurationFacadeClass *) klass)->set_external_photo_app = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_external_photo_app;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_external_raw_app = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_external_raw_app;
+	((ConfigurationFacadeClass *) klass)->get_external_raw_app = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_external_raw_app;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_external_raw_app = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_external_raw_app;
+	((ConfigurationFacadeClass *) klass)->set_external_raw_app = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_external_raw_app;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_export_constraint = (ScaleConstraint (*)(ConfigurationFacade*)) configuration_facade_real_get_export_constraint;
+	((ConfigurationFacadeClass *) klass)->get_export_constraint = (ScaleConstraint (*) (ConfigurationFacade *)) configuration_facade_real_get_export_constraint;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_export_constraint = (void (*)(ConfigurationFacade*, ScaleConstraint)) configuration_facade_real_set_export_constraint;
+	((ConfigurationFacadeClass *) klass)->set_export_constraint = (void (*) (ConfigurationFacade *, ScaleConstraint)) configuration_facade_real_set_export_constraint;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_export_export_format_mode = (ExportFormatMode (*)(ConfigurationFacade*)) configuration_facade_real_get_export_export_format_mode;
+	((ConfigurationFacadeClass *) klass)->get_export_export_format_mode = (ExportFormatMode (*) (ConfigurationFacade *)) configuration_facade_real_get_export_export_format_mode;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_export_export_format_mode = (void (*)(ConfigurationFacade*, ExportFormatMode)) configuration_facade_real_set_export_export_format_mode;
+	((ConfigurationFacadeClass *) klass)->set_export_export_format_mode = (void (*) (ConfigurationFacade *, ExportFormatMode)) configuration_facade_real_set_export_export_format_mode;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_export_export_metadata = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_export_export_metadata;
+	((ConfigurationFacadeClass *) klass)->get_export_export_metadata = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_export_export_metadata;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_export_export_metadata = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_export_export_metadata;
+	((ConfigurationFacadeClass *) klass)->set_export_export_metadata = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_export_export_metadata;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_export_photo_file_format = (PhotoFileFormat (*)(ConfigurationFacade*)) configuration_facade_real_get_export_photo_file_format;
+	((ConfigurationFacadeClass *) klass)->get_export_photo_file_format = (PhotoFileFormat (*) (ConfigurationFacade *)) configuration_facade_real_get_export_photo_file_format;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_export_photo_file_format = (void (*)(ConfigurationFacade*, PhotoFileFormat)) configuration_facade_real_set_export_photo_file_format;
+	((ConfigurationFacadeClass *) klass)->set_export_photo_file_format = (void (*) (ConfigurationFacade *, PhotoFileFormat)) configuration_facade_real_set_export_photo_file_format;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_export_quality = (JpegQuality (*)(ConfigurationFacade*)) configuration_facade_real_get_export_quality;
+	((ConfigurationFacadeClass *) klass)->get_export_quality = (JpegQuality (*) (ConfigurationFacade *)) configuration_facade_real_get_export_quality;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_export_quality = (void (*)(ConfigurationFacade*, JpegQuality)) configuration_facade_real_set_export_quality;
+	((ConfigurationFacadeClass *) klass)->set_export_quality = (void (*) (ConfigurationFacade *, JpegQuality)) configuration_facade_real_set_export_quality;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_export_scale = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_export_scale;
+	((ConfigurationFacadeClass *) klass)->get_export_scale = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_export_scale;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_export_scale = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_export_scale;
+	((ConfigurationFacadeClass *) klass)->set_export_scale = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_export_scale;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_default_raw_developer = (RawDeveloper (*)(ConfigurationFacade*)) configuration_facade_real_get_default_raw_developer;
+	((ConfigurationFacadeClass *) klass)->get_default_raw_developer = (RawDeveloper (*) (ConfigurationFacade *)) configuration_facade_real_get_default_raw_developer;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_default_raw_developer = (void (*)(ConfigurationFacade*, RawDeveloper)) configuration_facade_real_set_default_raw_developer;
+	((ConfigurationFacadeClass *) klass)->set_default_raw_developer = (void (*) (ConfigurationFacade *, RawDeveloper)) configuration_facade_real_set_default_raw_developer;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_hide_photos_already_imported = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_hide_photos_already_imported;
+	((ConfigurationFacadeClass *) klass)->get_hide_photos_already_imported = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_hide_photos_already_imported;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_hide_photos_already_imported = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_hide_photos_already_imported;
+	((ConfigurationFacadeClass *) klass)->set_hide_photos_already_imported = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_hide_photos_already_imported;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_import_dir = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_import_dir;
+	((ConfigurationFacadeClass *) klass)->get_import_dir = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_import_dir;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_import_dir = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_import_dir;
+	((ConfigurationFacadeClass *) klass)->set_import_dir = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_import_dir;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_keep_relativity = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_keep_relativity;
+	((ConfigurationFacadeClass *) klass)->get_keep_relativity = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_keep_relativity;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_keep_relativity = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_keep_relativity;
+	((ConfigurationFacadeClass *) klass)->set_keep_relativity = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_keep_relativity;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_pin_toolbar_state = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_pin_toolbar_state;
+	((ConfigurationFacadeClass *) klass)->get_pin_toolbar_state = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_pin_toolbar_state;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_pin_toolbar_state = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_pin_toolbar_state;
+	((ConfigurationFacadeClass *) klass)->set_pin_toolbar_state = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_pin_toolbar_state;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_last_crop_height = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_last_crop_height;
+	((ConfigurationFacadeClass *) klass)->get_last_crop_height = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_last_crop_height;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_last_crop_height = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_last_crop_height;
+	((ConfigurationFacadeClass *) klass)->set_last_crop_height = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_last_crop_height;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_last_crop_menu_choice = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_last_crop_menu_choice;
+	((ConfigurationFacadeClass *) klass)->get_last_crop_menu_choice = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_last_crop_menu_choice;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_last_crop_menu_choice = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_last_crop_menu_choice;
+	((ConfigurationFacadeClass *) klass)->set_last_crop_menu_choice = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_last_crop_menu_choice;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_last_crop_width = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_last_crop_width;
+	((ConfigurationFacadeClass *) klass)->get_last_crop_width = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_last_crop_width;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_last_crop_width = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_last_crop_width;
+	((ConfigurationFacadeClass *) klass)->set_last_crop_width = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_last_crop_width;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_last_used_service = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_last_used_service;
+	((ConfigurationFacadeClass *) klass)->get_last_used_service = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_last_used_service;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_last_used_service = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_last_used_service;
+	((ConfigurationFacadeClass *) klass)->set_last_used_service = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_last_used_service;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_last_used_dataimports_service = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_last_used_dataimports_service;
+	((ConfigurationFacadeClass *) klass)->get_last_used_dataimports_service = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_last_used_dataimports_service;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_last_used_dataimports_service = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_last_used_dataimports_service;
+	((ConfigurationFacadeClass *) klass)->set_last_used_dataimports_service = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_last_used_dataimports_service;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_library_photos_sort = (void (*)(ConfigurationFacade*, gboolean*, gint*)) configuration_facade_real_get_library_photos_sort;
+	((ConfigurationFacadeClass *) klass)->get_library_photos_sort = (void (*) (ConfigurationFacade *, gboolean*, gint*)) configuration_facade_real_get_library_photos_sort;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_library_photos_sort = (void (*)(ConfigurationFacade*, gboolean, gint)) configuration_facade_real_set_library_photos_sort;
+	((ConfigurationFacadeClass *) klass)->set_library_photos_sort = (void (*) (ConfigurationFacade *, gboolean, gint)) configuration_facade_real_set_library_photos_sort;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_library_window_state = (void (*)(ConfigurationFacade*, gboolean*, Dimensions*)) configuration_facade_real_get_library_window_state;
+	((ConfigurationFacadeClass *) klass)->get_library_window_state = (void (*) (ConfigurationFacade *, gboolean*, Dimensions*)) configuration_facade_real_get_library_window_state;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_library_window_state = (void (*)(ConfigurationFacade*, gboolean, Dimensions*)) configuration_facade_real_set_library_window_state;
+	((ConfigurationFacadeClass *) klass)->set_library_window_state = (void (*) (ConfigurationFacade *, gboolean, Dimensions*)) configuration_facade_real_set_library_window_state;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_modify_originals = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_modify_originals;
+	((ConfigurationFacadeClass *) klass)->get_modify_originals = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_modify_originals;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_modify_originals = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_modify_originals;
+	((ConfigurationFacadeClass *) klass)->set_modify_originals = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_modify_originals;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_photo_thumbnail_scale = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_photo_thumbnail_scale;
+	((ConfigurationFacadeClass *) klass)->get_photo_thumbnail_scale = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_photo_thumbnail_scale;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_photo_thumbnail_scale = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_photo_thumbnail_scale;
+	((ConfigurationFacadeClass *) klass)->set_photo_thumbnail_scale = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_photo_thumbnail_scale;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_printing_content_height = (gdouble (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_content_height;
+	((ConfigurationFacadeClass *) klass)->get_printing_content_height = (gdouble (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_content_height;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_printing_content_height = (void (*)(ConfigurationFacade*, gdouble)) configuration_facade_real_set_printing_content_height;
+	((ConfigurationFacadeClass *) klass)->set_printing_content_height = (void (*) (ConfigurationFacade *, gdouble)) configuration_facade_real_set_printing_content_height;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_printing_content_layout = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_content_layout;
+	((ConfigurationFacadeClass *) klass)->get_printing_content_layout = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_content_layout;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_printing_content_layout = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_printing_content_layout;
+	((ConfigurationFacadeClass *) klass)->set_printing_content_layout = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_printing_content_layout;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_printing_content_ppi = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_content_ppi;
+	((ConfigurationFacadeClass *) klass)->get_printing_content_ppi = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_content_ppi;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_printing_content_ppi = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_printing_content_ppi;
+	((ConfigurationFacadeClass *) klass)->set_printing_content_ppi = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_printing_content_ppi;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_printing_content_units = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_content_units;
+	((ConfigurationFacadeClass *) klass)->get_printing_content_units = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_content_units;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_printing_content_units = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_printing_content_units;
+	((ConfigurationFacadeClass *) klass)->set_printing_content_units = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_printing_content_units;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_printing_content_width = (gdouble (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_content_width;
+	((ConfigurationFacadeClass *) klass)->get_printing_content_width = (gdouble (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_content_width;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_printing_content_width = (void (*)(ConfigurationFacade*, gdouble)) configuration_facade_real_set_printing_content_width;
+	((ConfigurationFacadeClass *) klass)->set_printing_content_width = (void (*) (ConfigurationFacade *, gdouble)) configuration_facade_real_set_printing_content_width;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_printing_images_per_page = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_images_per_page;
+	((ConfigurationFacadeClass *) klass)->get_printing_images_per_page = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_images_per_page;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_printing_images_per_page = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_printing_images_per_page;
+	((ConfigurationFacadeClass *) klass)->set_printing_images_per_page = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_printing_images_per_page;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_printing_match_aspect_ratio = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_match_aspect_ratio;
+	((ConfigurationFacadeClass *) klass)->get_printing_match_aspect_ratio = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_match_aspect_ratio;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_printing_match_aspect_ratio = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_printing_match_aspect_ratio;
+	((ConfigurationFacadeClass *) klass)->set_printing_match_aspect_ratio = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_printing_match_aspect_ratio;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_printing_print_titles = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_print_titles;
+	((ConfigurationFacadeClass *) klass)->get_printing_print_titles = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_print_titles;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_printing_print_titles = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_printing_print_titles;
+	((ConfigurationFacadeClass *) klass)->set_printing_print_titles = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_printing_print_titles;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_printing_size_selection = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_size_selection;
+	((ConfigurationFacadeClass *) klass)->get_printing_size_selection = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_size_selection;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_printing_size_selection = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_printing_size_selection;
+	((ConfigurationFacadeClass *) klass)->set_printing_size_selection = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_printing_size_selection;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_printing_titles_font = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_titles_font;
+	((ConfigurationFacadeClass *) klass)->get_printing_titles_font = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_titles_font;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_printing_titles_font = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_printing_titles_font;
+	((ConfigurationFacadeClass *) klass)->set_printing_titles_font = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_printing_titles_font;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_show_welcome_dialog = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_show_welcome_dialog;
+	((ConfigurationFacadeClass *) klass)->get_show_welcome_dialog = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_show_welcome_dialog;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_show_welcome_dialog = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_show_welcome_dialog;
+	((ConfigurationFacadeClass *) klass)->set_show_welcome_dialog = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_show_welcome_dialog;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_sidebar_position = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_sidebar_position;
+	((ConfigurationFacadeClass *) klass)->get_sidebar_position = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_sidebar_position;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_sidebar_position = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_sidebar_position;
+	((ConfigurationFacadeClass *) klass)->set_sidebar_position = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_sidebar_position;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_slideshow_delay = (gdouble (*)(ConfigurationFacade*)) configuration_facade_real_get_slideshow_delay;
+	((ConfigurationFacadeClass *) klass)->get_slideshow_delay = (gdouble (*) (ConfigurationFacade *)) configuration_facade_real_get_slideshow_delay;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_slideshow_delay = (void (*)(ConfigurationFacade*, gdouble)) configuration_facade_real_set_slideshow_delay;
+	((ConfigurationFacadeClass *) klass)->set_slideshow_delay = (void (*) (ConfigurationFacade *, gdouble)) configuration_facade_real_set_slideshow_delay;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_slideshow_transition_delay = (gdouble (*)(ConfigurationFacade*)) configuration_facade_real_get_slideshow_transition_delay;
+	((ConfigurationFacadeClass *) klass)->get_slideshow_transition_delay = (gdouble (*) (ConfigurationFacade *)) configuration_facade_real_get_slideshow_transition_delay;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_slideshow_transition_delay = (void (*)(ConfigurationFacade*, gdouble)) configuration_facade_real_set_slideshow_transition_delay;
+	((ConfigurationFacadeClass *) klass)->set_slideshow_transition_delay = (void (*) (ConfigurationFacade *, gdouble)) configuration_facade_real_set_slideshow_transition_delay;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_slideshow_transition_effect_id = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_slideshow_transition_effect_id;
+	((ConfigurationFacadeClass *) klass)->get_slideshow_transition_effect_id = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_slideshow_transition_effect_id;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_slideshow_transition_effect_id = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_slideshow_transition_effect_id;
+	((ConfigurationFacadeClass *) klass)->set_slideshow_transition_effect_id = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_slideshow_transition_effect_id;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_slideshow_show_title = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_slideshow_show_title;
+	((ConfigurationFacadeClass *) klass)->get_slideshow_show_title = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_slideshow_show_title;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_slideshow_show_title = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_slideshow_show_title;
+	((ConfigurationFacadeClass *) klass)->set_slideshow_show_title = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_slideshow_show_title;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_use_24_hour_time = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_use_24_hour_time;
+	((ConfigurationFacadeClass *) klass)->get_use_24_hour_time = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_use_24_hour_time;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_use_24_hour_time = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_use_24_hour_time;
+	((ConfigurationFacadeClass *) klass)->set_use_24_hour_time = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_use_24_hour_time;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_use_lowercase_filenames = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_use_lowercase_filenames;
+	((ConfigurationFacadeClass *) klass)->get_use_lowercase_filenames = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_use_lowercase_filenames;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_use_lowercase_filenames = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_use_lowercase_filenames;
+	((ConfigurationFacadeClass *) klass)->set_use_lowercase_filenames = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_use_lowercase_filenames;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_video_interpreter_state_cookie = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_video_interpreter_state_cookie;
+	((ConfigurationFacadeClass *) klass)->get_video_interpreter_state_cookie = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_video_interpreter_state_cookie;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_video_interpreter_state_cookie = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_video_interpreter_state_cookie;
+	((ConfigurationFacadeClass *) klass)->set_video_interpreter_state_cookie = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_video_interpreter_state_cookie;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_plugin_bool = (gboolean (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*, gboolean)) configuration_facade_real_get_plugin_bool;
+	((ConfigurationFacadeClass *) klass)->get_plugin_bool = (gboolean (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*, gboolean)) configuration_facade_real_get_plugin_bool;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_plugin_bool = (void (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*, gboolean)) configuration_facade_real_set_plugin_bool;
+	((ConfigurationFacadeClass *) klass)->set_plugin_bool = (void (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*, gboolean)) configuration_facade_real_set_plugin_bool;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_plugin_double = (gdouble (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*, gdouble)) configuration_facade_real_get_plugin_double;
+	((ConfigurationFacadeClass *) klass)->get_plugin_double = (gdouble (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*, gdouble)) configuration_facade_real_get_plugin_double;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_plugin_double = (void (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*, gdouble)) configuration_facade_real_set_plugin_double;
+	((ConfigurationFacadeClass *) klass)->set_plugin_double = (void (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*, gdouble)) configuration_facade_real_set_plugin_double;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_plugin_int = (gint (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*, gint)) configuration_facade_real_get_plugin_int;
+	((ConfigurationFacadeClass *) klass)->get_plugin_int = (gint (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*, gint)) configuration_facade_real_get_plugin_int;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_plugin_int = (void (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*, gint)) configuration_facade_real_set_plugin_int;
+	((ConfigurationFacadeClass *) klass)->set_plugin_int = (void (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*, gint)) configuration_facade_real_set_plugin_int;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->get_plugin_string = (gchar* (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*, const gchar*)) configuration_facade_real_get_plugin_string;
+	((ConfigurationFacadeClass *) klass)->get_plugin_string = (gchar* (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*, const gchar*)) configuration_facade_real_get_plugin_string;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_plugin_string = (void (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*, const gchar*)) configuration_facade_real_set_plugin_string;
+	((ConfigurationFacadeClass *) klass)->set_plugin_string = (void (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*, const gchar*)) configuration_facade_real_set_plugin_string;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->unset_plugin_key = (void (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*)) configuration_facade_real_unset_plugin_key;
+	((ConfigurationFacadeClass *) klass)->unset_plugin_key = (void (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*)) configuration_facade_real_unset_plugin_key;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->is_plugin_enabled = (FuzzyPropertyState (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_is_plugin_enabled;
+	((ConfigurationFacadeClass *) klass)->is_plugin_enabled = (FuzzyPropertyState (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_is_plugin_enabled;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	((ConfigurationFacadeClass *) klass)->set_plugin_enabled = (void (*)(ConfigurationFacade*, const gchar*, gboolean)) configuration_facade_real_set_plugin_enabled;
+	((ConfigurationFacadeClass *) klass)->set_plugin_enabled = (void (*) (ConfigurationFacade *, const gchar*, gboolean)) configuration_facade_real_set_plugin_enabled;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	G_OBJECT_CLASS (klass)->finalize = configuration_facade_finalize;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	g_signal_new ("auto_import_from_library_changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	configuration_facade_signals[CONFIGURATION_FACADE_AUTO_IMPORT_FROM_LIBRARY_CHANGED_SIGNAL] = g_signal_new ("auto-import-from-library-changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	g_signal_new ("bg_color_name_changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	configuration_facade_signals[CONFIGURATION_FACADE_BG_COLOR_NAME_CHANGED_SIGNAL] = g_signal_new ("bg-color-name-changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	g_signal_new ("commit_metadata_to_masters_changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	configuration_facade_signals[CONFIGURATION_FACADE_COMMIT_METADATA_TO_MASTERS_CHANGED_SIGNAL] = g_signal_new ("commit-metadata-to-masters-changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	g_signal_new ("events_sort_ascending_changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	configuration_facade_signals[CONFIGURATION_FACADE_EVENTS_SORT_ASCENDING_CHANGED_SIGNAL] = g_signal_new ("events-sort-ascending-changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	g_signal_new ("external_app_changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	configuration_facade_signals[CONFIGURATION_FACADE_EXTERNAL_APP_CHANGED_SIGNAL] = g_signal_new ("external-app-changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	g_signal_new ("import_directory_changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 13296 "ConfigurationInterfaces.c"
+	configuration_facade_signals[CONFIGURATION_FACADE_IMPORT_DIRECTORY_CHANGED_SIGNAL] = g_signal_new ("import-directory-changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 13311 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_instance_init (ConfigurationFacade * self) {
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	self->priv = CONFIGURATION_FACADE_GET_PRIVATE (self);
-#line 13303 "ConfigurationInterfaces.c"
+#line 13318 "ConfigurationInterfaces.c"
 }
 
 
-static void configuration_facade_finalize (GObject* obj) {
+static void configuration_facade_finalize (GObject * obj) {
 	ConfigurationFacade * self;
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CONFIGURATION_FACADE, ConfigurationFacade);
@@ -13316,7 +13331,7 @@ static void configuration_facade_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->engine);
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	G_OBJECT_CLASS (configuration_facade_parent_class)->finalize (obj);
-#line 13315 "ConfigurationInterfaces.c"
+#line 13330 "ConfigurationInterfaces.c"
 }
 
 
diff --git a/src/config/GSettingsEngine.c b/src/config/GSettingsEngine.c
index d70a944..c1d8730 100644
--- a/src/config/GSettingsEngine.c
+++ b/src/config/GSettingsEngine.c
@@ -1,4 +1,4 @@
-/* GSettingsEngine.c generated by valac 0.34.7, the Vala compiler
+/* GSettingsEngine.c generated by valac 0.36.6, the Vala compiler
  * generated from GSettingsEngine.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -175,7 +175,7 @@ struct _GSettingsConfigurationEnginePrivate {
 
 
 static gpointer gsettings_configuration_engine_parent_class = NULL;
-static ConfigurationEngineIface* gsettings_configuration_engine_configuration_engine_parent_iface = NULL;
+static ConfigurationEngineIface * gsettings_configuration_engine_configuration_engine_parent_iface = NULL;
 
 GType configurable_property_get_type (void) G_GNUC_CONST;
 GQuark configuration_error_quark (void);
@@ -245,567 +245,567 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 static void gsettings_configuration_engine_real_set_plugin_enabled (ConfigurationEngine* base, const gchar* id, gboolean enabled);
 void gsettings_configuration_engine_run_gsettings_migrator (void);
 GFile* app_dirs_get_settings_migrator_bin (void);
-static void gsettings_configuration_engine_finalize (GObject* obj);
+static void gsettings_configuration_engine_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
 GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType object_type) {
 	GSettingsConfigurationEngine * self = NULL;
-	gchar** _tmp0_ = NULL;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar** _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
-	gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	gchar** _tmp22_ = NULL;
-	gint _tmp22__length1 = 0;
-	gchar* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	gchar** _tmp25_ = NULL;
-	gint _tmp25__length1 = 0;
-	gchar* _tmp26_ = NULL;
-	gchar* _tmp27_ = NULL;
-	gchar** _tmp28_ = NULL;
-	gint _tmp28__length1 = 0;
-	gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	gchar** _tmp31_ = NULL;
-	gint _tmp31__length1 = 0;
-	gchar* _tmp32_ = NULL;
-	gchar* _tmp33_ = NULL;
-	gchar** _tmp34_ = NULL;
-	gint _tmp34__length1 = 0;
-	gchar* _tmp35_ = NULL;
-	gchar* _tmp36_ = NULL;
-	gchar** _tmp37_ = NULL;
-	gint _tmp37__length1 = 0;
-	gchar* _tmp38_ = NULL;
-	gchar* _tmp39_ = NULL;
-	gchar** _tmp40_ = NULL;
-	gint _tmp40__length1 = 0;
-	gchar* _tmp41_ = NULL;
-	gchar* _tmp42_ = NULL;
-	gchar** _tmp43_ = NULL;
-	gint _tmp43__length1 = 0;
-	gchar* _tmp44_ = NULL;
-	gchar* _tmp45_ = NULL;
-	gchar** _tmp46_ = NULL;
-	gint _tmp46__length1 = 0;
-	gchar* _tmp47_ = NULL;
-	gchar* _tmp48_ = NULL;
-	gchar** _tmp49_ = NULL;
-	gint _tmp49__length1 = 0;
-	gchar* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
-	gchar** _tmp52_ = NULL;
-	gint _tmp52__length1 = 0;
-	gchar* _tmp53_ = NULL;
-	gchar* _tmp54_ = NULL;
-	gchar** _tmp55_ = NULL;
-	gint _tmp55__length1 = 0;
-	gchar* _tmp56_ = NULL;
-	gchar* _tmp57_ = NULL;
-	gchar** _tmp58_ = NULL;
-	gint _tmp58__length1 = 0;
-	gchar* _tmp59_ = NULL;
-	gchar* _tmp60_ = NULL;
-	gchar** _tmp61_ = NULL;
-	gint _tmp61__length1 = 0;
-	gchar* _tmp62_ = NULL;
-	gchar* _tmp63_ = NULL;
-	gchar** _tmp64_ = NULL;
-	gint _tmp64__length1 = 0;
-	gchar* _tmp65_ = NULL;
-	gchar* _tmp66_ = NULL;
-	gchar** _tmp67_ = NULL;
-	gint _tmp67__length1 = 0;
-	gchar* _tmp68_ = NULL;
-	gchar* _tmp69_ = NULL;
-	gchar** _tmp70_ = NULL;
-	gint _tmp70__length1 = 0;
-	gchar* _tmp71_ = NULL;
-	gchar* _tmp72_ = NULL;
-	gchar** _tmp73_ = NULL;
-	gint _tmp73__length1 = 0;
-	gchar* _tmp74_ = NULL;
-	gchar* _tmp75_ = NULL;
-	gchar** _tmp76_ = NULL;
-	gint _tmp76__length1 = 0;
-	gchar* _tmp77_ = NULL;
-	gchar* _tmp78_ = NULL;
-	gchar** _tmp79_ = NULL;
-	gint _tmp79__length1 = 0;
-	gchar* _tmp80_ = NULL;
-	gchar* _tmp81_ = NULL;
-	gchar** _tmp82_ = NULL;
-	gint _tmp82__length1 = 0;
-	gchar* _tmp83_ = NULL;
-	gchar* _tmp84_ = NULL;
-	gchar** _tmp85_ = NULL;
-	gint _tmp85__length1 = 0;
-	gchar* _tmp86_ = NULL;
-	gchar* _tmp87_ = NULL;
-	gchar** _tmp88_ = NULL;
-	gint _tmp88__length1 = 0;
-	gchar* _tmp89_ = NULL;
-	gchar* _tmp90_ = NULL;
-	gchar** _tmp91_ = NULL;
-	gint _tmp91__length1 = 0;
-	gchar* _tmp92_ = NULL;
-	gchar* _tmp93_ = NULL;
-	gchar** _tmp94_ = NULL;
-	gint _tmp94__length1 = 0;
-	gchar* _tmp95_ = NULL;
-	gchar* _tmp96_ = NULL;
-	gchar** _tmp97_ = NULL;
-	gint _tmp97__length1 = 0;
-	gchar* _tmp98_ = NULL;
-	gchar* _tmp99_ = NULL;
-	gchar** _tmp100_ = NULL;
-	gint _tmp100__length1 = 0;
-	gchar* _tmp101_ = NULL;
-	gchar* _tmp102_ = NULL;
-	gchar** _tmp103_ = NULL;
-	gint _tmp103__length1 = 0;
-	gchar* _tmp104_ = NULL;
-	gchar* _tmp105_ = NULL;
-	gchar** _tmp106_ = NULL;
-	gint _tmp106__length1 = 0;
-	gchar* _tmp107_ = NULL;
-	gchar* _tmp108_ = NULL;
-	gchar** _tmp109_ = NULL;
-	gint _tmp109__length1 = 0;
-	gchar* _tmp110_ = NULL;
-	gchar* _tmp111_ = NULL;
-	gchar** _tmp112_ = NULL;
-	gint _tmp112__length1 = 0;
-	gchar* _tmp113_ = NULL;
-	gchar* _tmp114_ = NULL;
-	gchar** _tmp115_ = NULL;
-	gint _tmp115__length1 = 0;
-	gchar* _tmp116_ = NULL;
-	gchar* _tmp117_ = NULL;
-	gchar** _tmp118_ = NULL;
-	gint _tmp118__length1 = 0;
-	gchar* _tmp119_ = NULL;
-	gchar* _tmp120_ = NULL;
-	gchar** _tmp121_ = NULL;
-	gint _tmp121__length1 = 0;
-	gchar* _tmp122_ = NULL;
-	gchar* _tmp123_ = NULL;
-	gchar** _tmp124_ = NULL;
-	gint _tmp124__length1 = 0;
-	gchar* _tmp125_ = NULL;
-	gchar* _tmp126_ = NULL;
-	gchar** _tmp127_ = NULL;
-	gint _tmp127__length1 = 0;
-	gchar* _tmp128_ = NULL;
-	gchar* _tmp129_ = NULL;
-	gchar** _tmp130_ = NULL;
-	gint _tmp130__length1 = 0;
-	gchar* _tmp131_ = NULL;
-	gchar* _tmp132_ = NULL;
-	gchar** _tmp133_ = NULL;
-	gint _tmp133__length1 = 0;
-	gchar* _tmp134_ = NULL;
-	gchar* _tmp135_ = NULL;
-	gchar** _tmp136_ = NULL;
-	gint _tmp136__length1 = 0;
-	gchar* _tmp137_ = NULL;
-	gchar* _tmp138_ = NULL;
-	gchar** _tmp139_ = NULL;
-	gint _tmp139__length1 = 0;
-	gchar* _tmp140_ = NULL;
-	gchar* _tmp141_ = NULL;
-	gchar** _tmp142_ = NULL;
-	gint _tmp142__length1 = 0;
-	gchar* _tmp143_ = NULL;
-	gchar* _tmp144_ = NULL;
-	gchar** _tmp145_ = NULL;
-	gint _tmp145__length1 = 0;
-	gchar* _tmp146_ = NULL;
-	gchar* _tmp147_ = NULL;
-	gchar** _tmp148_ = NULL;
-	gint _tmp148__length1 = 0;
-	gchar* _tmp149_ = NULL;
-	gchar* _tmp150_ = NULL;
-	gchar** _tmp151_ = NULL;
-	gint _tmp151__length1 = 0;
-	gchar* _tmp152_ = NULL;
-	gchar* _tmp153_ = NULL;
-	gchar** _tmp154_ = NULL;
-	gint _tmp154__length1 = 0;
-	gchar* _tmp155_ = NULL;
-	gchar* _tmp156_ = NULL;
-	gchar** _tmp157_ = NULL;
-	gint _tmp157__length1 = 0;
-	gchar* _tmp158_ = NULL;
-	gchar* _tmp159_ = NULL;
-	gchar** _tmp160_ = NULL;
-	gint _tmp160__length1 = 0;
-	gchar* _tmp161_ = NULL;
-	gchar* _tmp162_ = NULL;
-	gchar** _tmp163_ = NULL;
-	gint _tmp163__length1 = 0;
-	gchar* _tmp164_ = NULL;
-	gchar* _tmp165_ = NULL;
-	gchar** _tmp166_ = NULL;
-	gint _tmp166__length1 = 0;
-	gchar* _tmp167_ = NULL;
-	gchar* _tmp168_ = NULL;
-	gchar** _tmp169_ = NULL;
-	gint _tmp169__length1 = 0;
-	gchar* _tmp170_ = NULL;
-	gchar* _tmp171_ = NULL;
-	gchar** _tmp172_ = NULL;
-	gint _tmp172__length1 = 0;
-	gchar* _tmp173_ = NULL;
-	gchar* _tmp174_ = NULL;
-	gchar** _tmp175_ = NULL;
-	gint _tmp175__length1 = 0;
-	gchar* _tmp176_ = NULL;
-	gchar* _tmp177_ = NULL;
-	gchar** _tmp178_ = NULL;
-	gint _tmp178__length1 = 0;
-	gchar* _tmp179_ = NULL;
-	gchar* _tmp180_ = NULL;
-	gchar** _tmp181_ = NULL;
-	gint _tmp181__length1 = 0;
-	gchar* _tmp182_ = NULL;
-	gchar* _tmp183_ = NULL;
-	gchar** _tmp184_ = NULL;
-	gint _tmp184__length1 = 0;
-	gchar* _tmp185_ = NULL;
-	gchar* _tmp186_ = NULL;
-	gchar** _tmp187_ = NULL;
-	gint _tmp187__length1 = 0;
-	gchar* _tmp188_ = NULL;
-	gchar* _tmp189_ = NULL;
-	gchar** _tmp190_ = NULL;
-	gint _tmp190__length1 = 0;
-	gchar* _tmp191_ = NULL;
-	gchar* _tmp192_ = NULL;
-	gchar** _tmp193_ = NULL;
-	gint _tmp193__length1 = 0;
-	gchar* _tmp194_ = NULL;
-	gchar* _tmp195_ = NULL;
-	gchar** _tmp196_ = NULL;
-	gint _tmp196__length1 = 0;
-	gchar* _tmp197_ = NULL;
-	gchar* _tmp198_ = NULL;
-	gchar** _tmp199_ = NULL;
-	gint _tmp199__length1 = 0;
-	gchar* _tmp200_ = NULL;
-	gchar* _tmp201_ = NULL;
-	gchar** _tmp202_ = NULL;
-	gint _tmp202__length1 = 0;
-	gchar* _tmp203_ = NULL;
-	gchar* _tmp204_ = NULL;
-	gchar** _tmp205_ = NULL;
-	gint _tmp205__length1 = 0;
-	gchar* _tmp206_ = NULL;
-	gchar* _tmp207_ = NULL;
-	gchar** _tmp208_ = NULL;
-	gchar** _tmp209_ = NULL;
-	gint _tmp209__length1 = 0;
-	gchar* _tmp210_ = NULL;
-	gchar* _tmp211_ = NULL;
-	gchar** _tmp212_ = NULL;
-	gint _tmp212__length1 = 0;
-	gchar* _tmp213_ = NULL;
-	gchar* _tmp214_ = NULL;
-	gchar** _tmp215_ = NULL;
-	gint _tmp215__length1 = 0;
-	gchar* _tmp216_ = NULL;
-	gchar* _tmp217_ = NULL;
-	gchar** _tmp218_ = NULL;
-	gint _tmp218__length1 = 0;
-	gchar* _tmp219_ = NULL;
-	gchar* _tmp220_ = NULL;
-	gchar** _tmp221_ = NULL;
-	gint _tmp221__length1 = 0;
-	gchar* _tmp222_ = NULL;
-	gchar* _tmp223_ = NULL;
-	gchar** _tmp224_ = NULL;
-	gint _tmp224__length1 = 0;
-	gchar* _tmp225_ = NULL;
-	gchar* _tmp226_ = NULL;
-	gchar** _tmp227_ = NULL;
-	gint _tmp227__length1 = 0;
-	gchar* _tmp228_ = NULL;
-	gchar* _tmp229_ = NULL;
-	gchar** _tmp230_ = NULL;
-	gint _tmp230__length1 = 0;
-	gchar* _tmp231_ = NULL;
-	gchar* _tmp232_ = NULL;
-	gchar** _tmp233_ = NULL;
-	gint _tmp233__length1 = 0;
-	gchar* _tmp234_ = NULL;
-	gchar* _tmp235_ = NULL;
-	gchar** _tmp236_ = NULL;
-	gint _tmp236__length1 = 0;
-	gchar* _tmp237_ = NULL;
-	gchar* _tmp238_ = NULL;
-	gchar** _tmp239_ = NULL;
-	gint _tmp239__length1 = 0;
-	gchar* _tmp240_ = NULL;
-	gchar* _tmp241_ = NULL;
-	gchar** _tmp242_ = NULL;
-	gint _tmp242__length1 = 0;
-	gchar* _tmp243_ = NULL;
-	gchar* _tmp244_ = NULL;
-	gchar** _tmp245_ = NULL;
-	gint _tmp245__length1 = 0;
-	gchar* _tmp246_ = NULL;
-	gchar* _tmp247_ = NULL;
-	gchar** _tmp248_ = NULL;
-	gint _tmp248__length1 = 0;
-	gchar* _tmp249_ = NULL;
-	gchar* _tmp250_ = NULL;
-	gchar** _tmp251_ = NULL;
-	gint _tmp251__length1 = 0;
-	gchar* _tmp252_ = NULL;
-	gchar* _tmp253_ = NULL;
-	gchar** _tmp254_ = NULL;
-	gint _tmp254__length1 = 0;
-	gchar* _tmp255_ = NULL;
-	gchar* _tmp256_ = NULL;
-	gchar** _tmp257_ = NULL;
-	gint _tmp257__length1 = 0;
-	gchar* _tmp258_ = NULL;
-	gchar* _tmp259_ = NULL;
-	gchar** _tmp260_ = NULL;
-	gint _tmp260__length1 = 0;
-	gchar* _tmp261_ = NULL;
-	gchar* _tmp262_ = NULL;
-	gchar** _tmp263_ = NULL;
-	gint _tmp263__length1 = 0;
-	gchar* _tmp264_ = NULL;
-	gchar* _tmp265_ = NULL;
-	gchar** _tmp266_ = NULL;
-	gint _tmp266__length1 = 0;
-	gchar* _tmp267_ = NULL;
-	gchar* _tmp268_ = NULL;
-	gchar** _tmp269_ = NULL;
-	gint _tmp269__length1 = 0;
-	gchar* _tmp270_ = NULL;
-	gchar* _tmp271_ = NULL;
-	gchar** _tmp272_ = NULL;
-	gint _tmp272__length1 = 0;
-	gchar* _tmp273_ = NULL;
-	gchar* _tmp274_ = NULL;
-	gchar** _tmp275_ = NULL;
-	gint _tmp275__length1 = 0;
-	gchar* _tmp276_ = NULL;
-	gchar* _tmp277_ = NULL;
-	gchar** _tmp278_ = NULL;
-	gint _tmp278__length1 = 0;
-	gchar* _tmp279_ = NULL;
-	gchar* _tmp280_ = NULL;
-	gchar** _tmp281_ = NULL;
-	gint _tmp281__length1 = 0;
-	gchar* _tmp282_ = NULL;
-	gchar* _tmp283_ = NULL;
-	gchar** _tmp284_ = NULL;
-	gint _tmp284__length1 = 0;
-	gchar* _tmp285_ = NULL;
-	gchar* _tmp286_ = NULL;
-	gchar** _tmp287_ = NULL;
-	gint _tmp287__length1 = 0;
-	gchar* _tmp288_ = NULL;
-	gchar* _tmp289_ = NULL;
-	gchar** _tmp290_ = NULL;
-	gint _tmp290__length1 = 0;
-	gchar* _tmp291_ = NULL;
-	gchar* _tmp292_ = NULL;
-	gchar** _tmp293_ = NULL;
-	gint _tmp293__length1 = 0;
-	gchar* _tmp294_ = NULL;
-	gchar* _tmp295_ = NULL;
-	gchar** _tmp296_ = NULL;
-	gint _tmp296__length1 = 0;
-	gchar* _tmp297_ = NULL;
-	gchar* _tmp298_ = NULL;
-	gchar** _tmp299_ = NULL;
-	gint _tmp299__length1 = 0;
-	gchar* _tmp300_ = NULL;
-	gchar* _tmp301_ = NULL;
-	gchar** _tmp302_ = NULL;
-	gint _tmp302__length1 = 0;
-	gchar* _tmp303_ = NULL;
-	gchar* _tmp304_ = NULL;
-	gchar** _tmp305_ = NULL;
-	gint _tmp305__length1 = 0;
-	gchar* _tmp306_ = NULL;
-	gchar* _tmp307_ = NULL;
-	gchar** _tmp308_ = NULL;
-	gint _tmp308__length1 = 0;
-	gchar* _tmp309_ = NULL;
-	gchar* _tmp310_ = NULL;
-	gchar** _tmp311_ = NULL;
-	gint _tmp311__length1 = 0;
-	gchar* _tmp312_ = NULL;
-	gchar* _tmp313_ = NULL;
-	gchar** _tmp314_ = NULL;
-	gint _tmp314__length1 = 0;
-	gchar* _tmp315_ = NULL;
-	gchar* _tmp316_ = NULL;
-	gchar** _tmp317_ = NULL;
-	gint _tmp317__length1 = 0;
-	gchar* _tmp318_ = NULL;
-	gchar* _tmp319_ = NULL;
-	gchar** _tmp320_ = NULL;
-	gint _tmp320__length1 = 0;
-	gchar* _tmp321_ = NULL;
-	gchar* _tmp322_ = NULL;
-	gchar** _tmp323_ = NULL;
-	gint _tmp323__length1 = 0;
-	gchar* _tmp324_ = NULL;
-	gchar* _tmp325_ = NULL;
-	gchar** _tmp326_ = NULL;
-	gint _tmp326__length1 = 0;
-	gchar* _tmp327_ = NULL;
-	gchar* _tmp328_ = NULL;
-	gchar** _tmp329_ = NULL;
-	gint _tmp329__length1 = 0;
-	gchar* _tmp330_ = NULL;
-	gchar* _tmp331_ = NULL;
-	gchar** _tmp332_ = NULL;
-	gint _tmp332__length1 = 0;
-	gchar* _tmp333_ = NULL;
-	gchar* _tmp334_ = NULL;
-	gchar** _tmp335_ = NULL;
-	gint _tmp335__length1 = 0;
-	gchar* _tmp336_ = NULL;
-	gchar* _tmp337_ = NULL;
-	gchar** _tmp338_ = NULL;
-	gint _tmp338__length1 = 0;
-	gchar* _tmp339_ = NULL;
-	gchar* _tmp340_ = NULL;
-	gchar** _tmp341_ = NULL;
-	gint _tmp341__length1 = 0;
-	gchar* _tmp342_ = NULL;
-	gchar* _tmp343_ = NULL;
-	gchar** _tmp344_ = NULL;
-	gint _tmp344__length1 = 0;
-	gchar* _tmp345_ = NULL;
-	gchar* _tmp346_ = NULL;
-	gchar** _tmp347_ = NULL;
-	gint _tmp347__length1 = 0;
-	gchar* _tmp348_ = NULL;
-	gchar* _tmp349_ = NULL;
-	gchar** _tmp350_ = NULL;
-	gint _tmp350__length1 = 0;
-	gchar* _tmp351_ = NULL;
-	gchar* _tmp352_ = NULL;
-	gchar** _tmp353_ = NULL;
-	gint _tmp353__length1 = 0;
-	gchar* _tmp354_ = NULL;
-	gchar* _tmp355_ = NULL;
-	gchar** _tmp356_ = NULL;
-	gint _tmp356__length1 = 0;
-	gchar* _tmp357_ = NULL;
-	gchar* _tmp358_ = NULL;
-	gchar** _tmp359_ = NULL;
-	gint _tmp359__length1 = 0;
-	gchar* _tmp360_ = NULL;
-	gchar* _tmp361_ = NULL;
-	gchar** _tmp362_ = NULL;
-	gint _tmp362__length1 = 0;
-	gchar* _tmp363_ = NULL;
-	gchar* _tmp364_ = NULL;
-	gchar** _tmp365_ = NULL;
-	gint _tmp365__length1 = 0;
-	gchar* _tmp366_ = NULL;
-	gchar* _tmp367_ = NULL;
-	gchar** _tmp368_ = NULL;
-	gint _tmp368__length1 = 0;
-	gchar* _tmp369_ = NULL;
-	gchar* _tmp370_ = NULL;
-	gchar** _tmp371_ = NULL;
-	gint _tmp371__length1 = 0;
-	gchar* _tmp372_ = NULL;
-	gchar* _tmp373_ = NULL;
-	gchar** _tmp374_ = NULL;
-	gint _tmp374__length1 = 0;
-	gchar* _tmp375_ = NULL;
-	gchar* _tmp376_ = NULL;
-	gchar** _tmp377_ = NULL;
-	gint _tmp377__length1 = 0;
-	gchar* _tmp378_ = NULL;
-	gchar* _tmp379_ = NULL;
-	gchar** _tmp380_ = NULL;
-	gint _tmp380__length1 = 0;
-	gchar* _tmp381_ = NULL;
-	gchar* _tmp382_ = NULL;
-	gchar** _tmp383_ = NULL;
-	gint _tmp383__length1 = 0;
-	gchar* _tmp384_ = NULL;
-	gchar* _tmp385_ = NULL;
-	gchar** _tmp386_ = NULL;
-	gint _tmp386__length1 = 0;
-	gchar* _tmp387_ = NULL;
-	gchar* _tmp388_ = NULL;
-	gchar** _tmp389_ = NULL;
-	gint _tmp389__length1 = 0;
-	gchar* _tmp390_ = NULL;
-	gchar* _tmp391_ = NULL;
-	gchar** _tmp392_ = NULL;
-	gint _tmp392__length1 = 0;
-	gchar* _tmp393_ = NULL;
-	gchar* _tmp394_ = NULL;
-	gchar** _tmp395_ = NULL;
-	gint _tmp395__length1 = 0;
-	gchar* _tmp396_ = NULL;
-	gchar* _tmp397_ = NULL;
-	gchar** _tmp398_ = NULL;
-	gint _tmp398__length1 = 0;
-	gchar* _tmp399_ = NULL;
-	gchar* _tmp400_ = NULL;
-	gchar** _tmp401_ = NULL;
-	gint _tmp401__length1 = 0;
-	gchar* _tmp402_ = NULL;
-	gchar* _tmp403_ = NULL;
-	gchar** _tmp404_ = NULL;
-	gint _tmp404__length1 = 0;
-	gchar* _tmp405_ = NULL;
-	gchar* _tmp406_ = NULL;
-	gchar** _tmp407_ = NULL;
-	gint _tmp407__length1 = 0;
-	gchar* _tmp408_ = NULL;
-	gchar* _tmp409_ = NULL;
-	gchar** _tmp410_ = NULL;
-	gint _tmp410__length1 = 0;
-	gchar* _tmp411_ = NULL;
-	gchar* _tmp412_ = NULL;
-	gchar** _tmp413_ = NULL;
-	gint _tmp413__length1 = 0;
-	gchar* _tmp414_ = NULL;
-	gchar* _tmp415_ = NULL;
+	gchar** _tmp0_;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar** _tmp4_;
+	gint _tmp4__length1;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar** _tmp10_;
+	gint _tmp10__length1;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	gchar** _tmp13_;
+	gint _tmp13__length1;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	gchar** _tmp16_;
+	gint _tmp16__length1;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	gchar** _tmp19_;
+	gint _tmp19__length1;
+	gchar* _tmp20_;
+	gchar* _tmp21_;
+	gchar** _tmp22_;
+	gint _tmp22__length1;
+	gchar* _tmp23_;
+	gchar* _tmp24_;
+	gchar** _tmp25_;
+	gint _tmp25__length1;
+	gchar* _tmp26_;
+	gchar* _tmp27_;
+	gchar** _tmp28_;
+	gint _tmp28__length1;
+	gchar* _tmp29_;
+	gchar* _tmp30_;
+	gchar** _tmp31_;
+	gint _tmp31__length1;
+	gchar* _tmp32_;
+	gchar* _tmp33_;
+	gchar** _tmp34_;
+	gint _tmp34__length1;
+	gchar* _tmp35_;
+	gchar* _tmp36_;
+	gchar** _tmp37_;
+	gint _tmp37__length1;
+	gchar* _tmp38_;
+	gchar* _tmp39_;
+	gchar** _tmp40_;
+	gint _tmp40__length1;
+	gchar* _tmp41_;
+	gchar* _tmp42_;
+	gchar** _tmp43_;
+	gint _tmp43__length1;
+	gchar* _tmp44_;
+	gchar* _tmp45_;
+	gchar** _tmp46_;
+	gint _tmp46__length1;
+	gchar* _tmp47_;
+	gchar* _tmp48_;
+	gchar** _tmp49_;
+	gint _tmp49__length1;
+	gchar* _tmp50_;
+	gchar* _tmp51_;
+	gchar** _tmp52_;
+	gint _tmp52__length1;
+	gchar* _tmp53_;
+	gchar* _tmp54_;
+	gchar** _tmp55_;
+	gint _tmp55__length1;
+	gchar* _tmp56_;
+	gchar* _tmp57_;
+	gchar** _tmp58_;
+	gint _tmp58__length1;
+	gchar* _tmp59_;
+	gchar* _tmp60_;
+	gchar** _tmp61_;
+	gint _tmp61__length1;
+	gchar* _tmp62_;
+	gchar* _tmp63_;
+	gchar** _tmp64_;
+	gint _tmp64__length1;
+	gchar* _tmp65_;
+	gchar* _tmp66_;
+	gchar** _tmp67_;
+	gint _tmp67__length1;
+	gchar* _tmp68_;
+	gchar* _tmp69_;
+	gchar** _tmp70_;
+	gint _tmp70__length1;
+	gchar* _tmp71_;
+	gchar* _tmp72_;
+	gchar** _tmp73_;
+	gint _tmp73__length1;
+	gchar* _tmp74_;
+	gchar* _tmp75_;
+	gchar** _tmp76_;
+	gint _tmp76__length1;
+	gchar* _tmp77_;
+	gchar* _tmp78_;
+	gchar** _tmp79_;
+	gint _tmp79__length1;
+	gchar* _tmp80_;
+	gchar* _tmp81_;
+	gchar** _tmp82_;
+	gint _tmp82__length1;
+	gchar* _tmp83_;
+	gchar* _tmp84_;
+	gchar** _tmp85_;
+	gint _tmp85__length1;
+	gchar* _tmp86_;
+	gchar* _tmp87_;
+	gchar** _tmp88_;
+	gint _tmp88__length1;
+	gchar* _tmp89_;
+	gchar* _tmp90_;
+	gchar** _tmp91_;
+	gint _tmp91__length1;
+	gchar* _tmp92_;
+	gchar* _tmp93_;
+	gchar** _tmp94_;
+	gint _tmp94__length1;
+	gchar* _tmp95_;
+	gchar* _tmp96_;
+	gchar** _tmp97_;
+	gint _tmp97__length1;
+	gchar* _tmp98_;
+	gchar* _tmp99_;
+	gchar** _tmp100_;
+	gint _tmp100__length1;
+	gchar* _tmp101_;
+	gchar* _tmp102_;
+	gchar** _tmp103_;
+	gint _tmp103__length1;
+	gchar* _tmp104_;
+	gchar* _tmp105_;
+	gchar** _tmp106_;
+	gint _tmp106__length1;
+	gchar* _tmp107_;
+	gchar* _tmp108_;
+	gchar** _tmp109_;
+	gint _tmp109__length1;
+	gchar* _tmp110_;
+	gchar* _tmp111_;
+	gchar** _tmp112_;
+	gint _tmp112__length1;
+	gchar* _tmp113_;
+	gchar* _tmp114_;
+	gchar** _tmp115_;
+	gint _tmp115__length1;
+	gchar* _tmp116_;
+	gchar* _tmp117_;
+	gchar** _tmp118_;
+	gint _tmp118__length1;
+	gchar* _tmp119_;
+	gchar* _tmp120_;
+	gchar** _tmp121_;
+	gint _tmp121__length1;
+	gchar* _tmp122_;
+	gchar* _tmp123_;
+	gchar** _tmp124_;
+	gint _tmp124__length1;
+	gchar* _tmp125_;
+	gchar* _tmp126_;
+	gchar** _tmp127_;
+	gint _tmp127__length1;
+	gchar* _tmp128_;
+	gchar* _tmp129_;
+	gchar** _tmp130_;
+	gint _tmp130__length1;
+	gchar* _tmp131_;
+	gchar* _tmp132_;
+	gchar** _tmp133_;
+	gint _tmp133__length1;
+	gchar* _tmp134_;
+	gchar* _tmp135_;
+	gchar** _tmp136_;
+	gint _tmp136__length1;
+	gchar* _tmp137_;
+	gchar* _tmp138_;
+	gchar** _tmp139_;
+	gint _tmp139__length1;
+	gchar* _tmp140_;
+	gchar* _tmp141_;
+	gchar** _tmp142_;
+	gint _tmp142__length1;
+	gchar* _tmp143_;
+	gchar* _tmp144_;
+	gchar** _tmp145_;
+	gint _tmp145__length1;
+	gchar* _tmp146_;
+	gchar* _tmp147_;
+	gchar** _tmp148_;
+	gint _tmp148__length1;
+	gchar* _tmp149_;
+	gchar* _tmp150_;
+	gchar** _tmp151_;
+	gint _tmp151__length1;
+	gchar* _tmp152_;
+	gchar* _tmp153_;
+	gchar** _tmp154_;
+	gint _tmp154__length1;
+	gchar* _tmp155_;
+	gchar* _tmp156_;
+	gchar** _tmp157_;
+	gint _tmp157__length1;
+	gchar* _tmp158_;
+	gchar* _tmp159_;
+	gchar** _tmp160_;
+	gint _tmp160__length1;
+	gchar* _tmp161_;
+	gchar* _tmp162_;
+	gchar** _tmp163_;
+	gint _tmp163__length1;
+	gchar* _tmp164_;
+	gchar* _tmp165_;
+	gchar** _tmp166_;
+	gint _tmp166__length1;
+	gchar* _tmp167_;
+	gchar* _tmp168_;
+	gchar** _tmp169_;
+	gint _tmp169__length1;
+	gchar* _tmp170_;
+	gchar* _tmp171_;
+	gchar** _tmp172_;
+	gint _tmp172__length1;
+	gchar* _tmp173_;
+	gchar* _tmp174_;
+	gchar** _tmp175_;
+	gint _tmp175__length1;
+	gchar* _tmp176_;
+	gchar* _tmp177_;
+	gchar** _tmp178_;
+	gint _tmp178__length1;
+	gchar* _tmp179_;
+	gchar* _tmp180_;
+	gchar** _tmp181_;
+	gint _tmp181__length1;
+	gchar* _tmp182_;
+	gchar* _tmp183_;
+	gchar** _tmp184_;
+	gint _tmp184__length1;
+	gchar* _tmp185_;
+	gchar* _tmp186_;
+	gchar** _tmp187_;
+	gint _tmp187__length1;
+	gchar* _tmp188_;
+	gchar* _tmp189_;
+	gchar** _tmp190_;
+	gint _tmp190__length1;
+	gchar* _tmp191_;
+	gchar* _tmp192_;
+	gchar** _tmp193_;
+	gint _tmp193__length1;
+	gchar* _tmp194_;
+	gchar* _tmp195_;
+	gchar** _tmp196_;
+	gint _tmp196__length1;
+	gchar* _tmp197_;
+	gchar* _tmp198_;
+	gchar** _tmp199_;
+	gint _tmp199__length1;
+	gchar* _tmp200_;
+	gchar* _tmp201_;
+	gchar** _tmp202_;
+	gint _tmp202__length1;
+	gchar* _tmp203_;
+	gchar* _tmp204_;
+	gchar** _tmp205_;
+	gint _tmp205__length1;
+	gchar* _tmp206_;
+	gchar* _tmp207_;
+	gchar** _tmp208_;
+	gchar** _tmp209_;
+	gint _tmp209__length1;
+	gchar* _tmp210_;
+	gchar* _tmp211_;
+	gchar** _tmp212_;
+	gint _tmp212__length1;
+	gchar* _tmp213_;
+	gchar* _tmp214_;
+	gchar** _tmp215_;
+	gint _tmp215__length1;
+	gchar* _tmp216_;
+	gchar* _tmp217_;
+	gchar** _tmp218_;
+	gint _tmp218__length1;
+	gchar* _tmp219_;
+	gchar* _tmp220_;
+	gchar** _tmp221_;
+	gint _tmp221__length1;
+	gchar* _tmp222_;
+	gchar* _tmp223_;
+	gchar** _tmp224_;
+	gint _tmp224__length1;
+	gchar* _tmp225_;
+	gchar* _tmp226_;
+	gchar** _tmp227_;
+	gint _tmp227__length1;
+	gchar* _tmp228_;
+	gchar* _tmp229_;
+	gchar** _tmp230_;
+	gint _tmp230__length1;
+	gchar* _tmp231_;
+	gchar* _tmp232_;
+	gchar** _tmp233_;
+	gint _tmp233__length1;
+	gchar* _tmp234_;
+	gchar* _tmp235_;
+	gchar** _tmp236_;
+	gint _tmp236__length1;
+	gchar* _tmp237_;
+	gchar* _tmp238_;
+	gchar** _tmp239_;
+	gint _tmp239__length1;
+	gchar* _tmp240_;
+	gchar* _tmp241_;
+	gchar** _tmp242_;
+	gint _tmp242__length1;
+	gchar* _tmp243_;
+	gchar* _tmp244_;
+	gchar** _tmp245_;
+	gint _tmp245__length1;
+	gchar* _tmp246_;
+	gchar* _tmp247_;
+	gchar** _tmp248_;
+	gint _tmp248__length1;
+	gchar* _tmp249_;
+	gchar* _tmp250_;
+	gchar** _tmp251_;
+	gint _tmp251__length1;
+	gchar* _tmp252_;
+	gchar* _tmp253_;
+	gchar** _tmp254_;
+	gint _tmp254__length1;
+	gchar* _tmp255_;
+	gchar* _tmp256_;
+	gchar** _tmp257_;
+	gint _tmp257__length1;
+	gchar* _tmp258_;
+	gchar* _tmp259_;
+	gchar** _tmp260_;
+	gint _tmp260__length1;
+	gchar* _tmp261_;
+	gchar* _tmp262_;
+	gchar** _tmp263_;
+	gint _tmp263__length1;
+	gchar* _tmp264_;
+	gchar* _tmp265_;
+	gchar** _tmp266_;
+	gint _tmp266__length1;
+	gchar* _tmp267_;
+	gchar* _tmp268_;
+	gchar** _tmp269_;
+	gint _tmp269__length1;
+	gchar* _tmp270_;
+	gchar* _tmp271_;
+	gchar** _tmp272_;
+	gint _tmp272__length1;
+	gchar* _tmp273_;
+	gchar* _tmp274_;
+	gchar** _tmp275_;
+	gint _tmp275__length1;
+	gchar* _tmp276_;
+	gchar* _tmp277_;
+	gchar** _tmp278_;
+	gint _tmp278__length1;
+	gchar* _tmp279_;
+	gchar* _tmp280_;
+	gchar** _tmp281_;
+	gint _tmp281__length1;
+	gchar* _tmp282_;
+	gchar* _tmp283_;
+	gchar** _tmp284_;
+	gint _tmp284__length1;
+	gchar* _tmp285_;
+	gchar* _tmp286_;
+	gchar** _tmp287_;
+	gint _tmp287__length1;
+	gchar* _tmp288_;
+	gchar* _tmp289_;
+	gchar** _tmp290_;
+	gint _tmp290__length1;
+	gchar* _tmp291_;
+	gchar* _tmp292_;
+	gchar** _tmp293_;
+	gint _tmp293__length1;
+	gchar* _tmp294_;
+	gchar* _tmp295_;
+	gchar** _tmp296_;
+	gint _tmp296__length1;
+	gchar* _tmp297_;
+	gchar* _tmp298_;
+	gchar** _tmp299_;
+	gint _tmp299__length1;
+	gchar* _tmp300_;
+	gchar* _tmp301_;
+	gchar** _tmp302_;
+	gint _tmp302__length1;
+	gchar* _tmp303_;
+	gchar* _tmp304_;
+	gchar** _tmp305_;
+	gint _tmp305__length1;
+	gchar* _tmp306_;
+	gchar* _tmp307_;
+	gchar** _tmp308_;
+	gint _tmp308__length1;
+	gchar* _tmp309_;
+	gchar* _tmp310_;
+	gchar** _tmp311_;
+	gint _tmp311__length1;
+	gchar* _tmp312_;
+	gchar* _tmp313_;
+	gchar** _tmp314_;
+	gint _tmp314__length1;
+	gchar* _tmp315_;
+	gchar* _tmp316_;
+	gchar** _tmp317_;
+	gint _tmp317__length1;
+	gchar* _tmp318_;
+	gchar* _tmp319_;
+	gchar** _tmp320_;
+	gint _tmp320__length1;
+	gchar* _tmp321_;
+	gchar* _tmp322_;
+	gchar** _tmp323_;
+	gint _tmp323__length1;
+	gchar* _tmp324_;
+	gchar* _tmp325_;
+	gchar** _tmp326_;
+	gint _tmp326__length1;
+	gchar* _tmp327_;
+	gchar* _tmp328_;
+	gchar** _tmp329_;
+	gint _tmp329__length1;
+	gchar* _tmp330_;
+	gchar* _tmp331_;
+	gchar** _tmp332_;
+	gint _tmp332__length1;
+	gchar* _tmp333_;
+	gchar* _tmp334_;
+	gchar** _tmp335_;
+	gint _tmp335__length1;
+	gchar* _tmp336_;
+	gchar* _tmp337_;
+	gchar** _tmp338_;
+	gint _tmp338__length1;
+	gchar* _tmp339_;
+	gchar* _tmp340_;
+	gchar** _tmp341_;
+	gint _tmp341__length1;
+	gchar* _tmp342_;
+	gchar* _tmp343_;
+	gchar** _tmp344_;
+	gint _tmp344__length1;
+	gchar* _tmp345_;
+	gchar* _tmp346_;
+	gchar** _tmp347_;
+	gint _tmp347__length1;
+	gchar* _tmp348_;
+	gchar* _tmp349_;
+	gchar** _tmp350_;
+	gint _tmp350__length1;
+	gchar* _tmp351_;
+	gchar* _tmp352_;
+	gchar** _tmp353_;
+	gint _tmp353__length1;
+	gchar* _tmp354_;
+	gchar* _tmp355_;
+	gchar** _tmp356_;
+	gint _tmp356__length1;
+	gchar* _tmp357_;
+	gchar* _tmp358_;
+	gchar** _tmp359_;
+	gint _tmp359__length1;
+	gchar* _tmp360_;
+	gchar* _tmp361_;
+	gchar** _tmp362_;
+	gint _tmp362__length1;
+	gchar* _tmp363_;
+	gchar* _tmp364_;
+	gchar** _tmp365_;
+	gint _tmp365__length1;
+	gchar* _tmp366_;
+	gchar* _tmp367_;
+	gchar** _tmp368_;
+	gint _tmp368__length1;
+	gchar* _tmp369_;
+	gchar* _tmp370_;
+	gchar** _tmp371_;
+	gint _tmp371__length1;
+	gchar* _tmp372_;
+	gchar* _tmp373_;
+	gchar** _tmp374_;
+	gint _tmp374__length1;
+	gchar* _tmp375_;
+	gchar* _tmp376_;
+	gchar** _tmp377_;
+	gint _tmp377__length1;
+	gchar* _tmp378_;
+	gchar* _tmp379_;
+	gchar** _tmp380_;
+	gint _tmp380__length1;
+	gchar* _tmp381_;
+	gchar* _tmp382_;
+	gchar** _tmp383_;
+	gint _tmp383__length1;
+	gchar* _tmp384_;
+	gchar* _tmp385_;
+	gchar** _tmp386_;
+	gint _tmp386__length1;
+	gchar* _tmp387_;
+	gchar* _tmp388_;
+	gchar** _tmp389_;
+	gint _tmp389__length1;
+	gchar* _tmp390_;
+	gchar* _tmp391_;
+	gchar** _tmp392_;
+	gint _tmp392__length1;
+	gchar* _tmp393_;
+	gchar* _tmp394_;
+	gchar** _tmp395_;
+	gint _tmp395__length1;
+	gchar* _tmp396_;
+	gchar* _tmp397_;
+	gchar** _tmp398_;
+	gint _tmp398__length1;
+	gchar* _tmp399_;
+	gchar* _tmp400_;
+	gchar** _tmp401_;
+	gint _tmp401__length1;
+	gchar* _tmp402_;
+	gchar* _tmp403_;
+	gchar** _tmp404_;
+	gint _tmp404__length1;
+	gchar* _tmp405_;
+	gchar* _tmp406_;
+	gchar** _tmp407_;
+	gint _tmp407__length1;
+	gchar* _tmp408_;
+	gchar* _tmp409_;
+	gchar** _tmp410_;
+	gint _tmp410__length1;
+	gchar* _tmp411_;
+	gchar* _tmp412_;
+	gchar** _tmp413_;
+	gint _tmp413__length1;
+	gchar* _tmp414_;
+	gchar* _tmp415_;
 #line 29 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = (GSettingsConfigurationEngine*) g_object_new (object_type, NULL);
 #line 30 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -2506,16 +2506,16 @@ static gpointer _g_settings_schema_source_ref0 (gpointer self) {
 
 static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) {
 	GSettingsSchemaSource* schema_source = NULL;
-	GSettingsSchemaSource* _tmp0_ = NULL;
-	GSettingsSchemaSource* _tmp1_ = NULL;
+	GSettingsSchemaSource* _tmp0_;
+	GSettingsSchemaSource* _tmp1_;
 	GSettingsSchema* settings_scheme = NULL;
-	GSettingsSchemaSource* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	GSettingsSchema* _tmp4_ = NULL;
-	GSettingsSchema* _tmp5_ = NULL;
-	GSettingsSchema* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
+	GSettingsSchemaSource* _tmp2_;
+	const gchar* _tmp3_;
+	GSettingsSchema* _tmp4_;
+	GSettingsSchema* _tmp5_;
+	GSettingsSchema* _tmp11_;
+	const gchar* _tmp12_;
+	gboolean _tmp13_;
 	GError * _inner_error_ = NULL;
 #line 175 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
@@ -2542,11 +2542,11 @@ static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurati
 #line 178 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (_tmp5_ == NULL) {
 #line 2545 "GSettingsEngine.c"
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		GError* _tmp9_ = NULL;
-		GError* _tmp10_ = NULL;
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GError* _tmp9_;
+		GError* _tmp10_;
 #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = schema;
 #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -2595,12 +2595,12 @@ static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurati
 #line 182 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (!_tmp13_) {
 #line 2598 "GSettingsEngine.c"
-		const gchar* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		GError* _tmp18_ = NULL;
-		GError* _tmp19_ = NULL;
+		const gchar* _tmp14_;
+		const gchar* _tmp15_;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
+		GError* _tmp18_;
+		GError* _tmp19_;
 #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp14_ = schema;
 #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -2652,14 +2652,14 @@ static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurati
 
 static gboolean gsettings_configuration_engine_get_gs_bool (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GSettings* schema_object = NULL;
-	const gchar* _tmp4_ = NULL;
-	GSettings* _tmp5_ = NULL;
-	GSettings* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	const gchar* _tmp4_;
+	GSettings* _tmp5_;
+	GSettings* _tmp6_;
+	const gchar* _tmp7_;
+	gboolean _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), FALSE);
@@ -2718,14 +2718,14 @@ static gboolean gsettings_configuration_engine_get_gs_bool (GSettingsConfigurati
 
 
 static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gboolean value, GError** error) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GSettings* schema_object = NULL;
-	const gchar* _tmp2_ = NULL;
-	GSettings* _tmp3_ = NULL;
-	GSettings* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	const gchar* _tmp2_;
+	GSettings* _tmp3_;
+	GSettings* _tmp4_;
+	const gchar* _tmp5_;
+	gboolean _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 195 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
@@ -2779,14 +2779,14 @@ static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEn
 
 
 static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gint value, GError** error) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GSettings* schema_object = NULL;
-	const gchar* _tmp2_ = NULL;
-	GSettings* _tmp3_ = NULL;
-	GSettings* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
+	const gchar* _tmp2_;
+	GSettings* _tmp3_;
+	GSettings* _tmp4_;
+	const gchar* _tmp5_;
+	gint _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 203 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
@@ -2841,14 +2841,14 @@ static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEn
 
 static gint gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) {
 	gint result = 0;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GSettings* schema_object = NULL;
-	const gchar* _tmp4_ = NULL;
-	GSettings* _tmp5_ = NULL;
-	GSettings* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
+	const gchar* _tmp4_;
+	GSettings* _tmp5_;
+	GSettings* _tmp6_;
+	const gchar* _tmp7_;
+	gint _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 210 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0);
@@ -2908,14 +2908,14 @@ static gint gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEn
 
 static gint gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) {
 	gint result = 0;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GSettings* schema_object = NULL;
-	const gchar* _tmp4_ = NULL;
-	GSettings* _tmp5_ = NULL;
-	GSettings* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
+	const gchar* _tmp4_;
+	GSettings* _tmp5_;
+	GSettings* _tmp6_;
+	const gchar* _tmp7_;
+	gint _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0);
@@ -2974,14 +2974,14 @@ static gint gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEng
 
 
 static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gint value, GError** error) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GSettings* schema_object = NULL;
-	const gchar* _tmp2_ = NULL;
-	GSettings* _tmp3_ = NULL;
-	GSettings* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
+	const gchar* _tmp2_;
+	GSettings* _tmp3_;
+	GSettings* _tmp4_;
+	const gchar* _tmp5_;
+	gint _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 225 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
@@ -3036,14 +3036,14 @@ static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEng
 
 static gdouble gsettings_configuration_engine_get_gs_double (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) {
 	gdouble result = 0.0;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GSettings* schema_object = NULL;
-	const gchar* _tmp4_ = NULL;
-	GSettings* _tmp5_ = NULL;
-	GSettings* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gdouble _tmp8_ = 0.0;
+	const gchar* _tmp4_;
+	GSettings* _tmp5_;
+	GSettings* _tmp6_;
+	const gchar* _tmp7_;
+	gdouble _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 233 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0.0);
@@ -3102,14 +3102,14 @@ static gdouble gsettings_configuration_engine_get_gs_double (GSettingsConfigurat
 
 
 static void gsettings_configuration_engine_set_gs_double (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gdouble value, GError** error) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GSettings* schema_object = NULL;
-	const gchar* _tmp2_ = NULL;
-	GSettings* _tmp3_ = NULL;
-	GSettings* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gdouble _tmp6_ = 0.0;
+	const gchar* _tmp2_;
+	GSettings* _tmp3_;
+	GSettings* _tmp4_;
+	const gchar* _tmp5_;
+	gdouble _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 241 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
@@ -3164,14 +3164,14 @@ static void gsettings_configuration_engine_set_gs_double (GSettingsConfiguration
 
 static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GSettings* schema_object = NULL;
-	const gchar* _tmp2_ = NULL;
-	GSettings* _tmp3_ = NULL;
-	GSettings* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	const gchar* _tmp2_;
+	GSettings* _tmp3_;
+	GSettings* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 249 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), NULL);
@@ -3227,14 +3227,14 @@ static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurati
 
 
 static void gsettings_configuration_engine_set_gs_string (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, const gchar* value, GError** error) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GSettings* schema_object = NULL;
-	const gchar* _tmp2_ = NULL;
-	GSettings* _tmp3_ = NULL;
-	GSettings* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
+	const gchar* _tmp2_;
+	GSettings* _tmp3_;
+	GSettings* _tmp4_;
+	const gchar* _tmp5_;
+	const gchar* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 257 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
@@ -3290,13 +3290,13 @@ static void gsettings_configuration_engine_set_gs_string (GSettingsConfiguration
 
 
 static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GSettings* schema_object = NULL;
-	const gchar* _tmp2_ = NULL;
-	GSettings* _tmp3_ = NULL;
-	GSettings* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	const gchar* _tmp2_;
+	GSettings* _tmp3_;
+	GSettings* _tmp4_;
+	const gchar* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 265 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
@@ -3349,120 +3349,162 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu
 
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 3360 "GSettingsEngine.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 3366 "GSettingsEngine.c"
+	} else {
+		const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 3373 "GSettingsEngine.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = TRUE;
+#line 3379 "GSettingsEngine.c"
+	} else {
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 3389 "GSettingsEngine.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 3393 "GSettingsEngine.c"
+		gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 3401 "GSettingsEngine.c"
+	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GRegex* _tmp9_;
+		GRegex* _tmp10_;
+		gchar* _tmp11_ = NULL;
+		GRegex* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3391 "GSettingsEngine.c"
-				goto __catch204_g_regex_error;
+#line 3433 "GSettingsEngine.c"
+				goto __catch205_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3400 "GSettingsEngine.c"
+#line 3442 "GSettingsEngine.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3416 "GSettingsEngine.c"
-				goto __catch204_g_regex_error;
+#line 3458 "GSettingsEngine.c"
+				goto __catch205_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3427 "GSettingsEngine.c"
+#line 3469 "GSettingsEngine.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 3441 "GSettingsEngine.c"
+#line 3483 "GSettingsEngine.c"
 	}
-	goto __finally204;
-	__catch204_g_regex_error:
+	goto __finally205;
+	__catch205_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 3455 "GSettingsEngine.c"
+#line 3497 "GSettingsEngine.c"
 	}
-	__finally204:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	__finally205:
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 3466 "GSettingsEngine.c"
+#line 3508 "GSettingsEngine.c"
 	}
 }
 
@@ -3470,37 +3512,37 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 static gchar* string_strip (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 3490 "GSettingsEngine.c"
+#line 3532 "GSettingsEngine.c"
 }
 
 
 static gchar* gsettings_configuration_engine_clean_plugin_id (const gchar* id) {
 	gchar* result = NULL;
 	gchar* cleaned = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	gchar* _tmp8_ = NULL;
+	const gchar* _tmp5_;
+	gboolean _tmp6_;
+	gchar* _tmp8_;
 #line 273 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, NULL);
 #line 274 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -3523,17 +3565,17 @@ static gchar* gsettings_configuration_engine_clean_plugin_id (const gchar* id) {
 	_tmp6_ = is_string_empty (_tmp5_);
 #line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (!_tmp6_) {
-#line 3527 "GSettingsEngine.c"
-		const gchar* _tmp7_ = NULL;
+#line 3569 "GSettingsEngine.c"
+		const gchar* _tmp7_;
 #line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = cleaned;
 #line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = _tmp7_;
-#line 3533 "GSettingsEngine.c"
+#line 3575 "GSettingsEngine.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = NULL;
-#line 3537 "GSettingsEngine.c"
+#line 3579 "GSettingsEngine.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp8_ = g_strdup (_tmp4_);
@@ -3543,20 +3585,20 @@ static gchar* gsettings_configuration_engine_clean_plugin_id (const gchar* id) {
 	_g_free0 (cleaned);
 #line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3547 "GSettingsEngine.c"
+#line 3589 "GSettingsEngine.c"
 }
 
 
 static gchar* gsettings_configuration_engine_get_plugin_enable_disable_name (const gchar* id) {
 	gchar* result = NULL;
 	gchar* cleaned_id = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
 #line 280 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, NULL);
 #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -3569,15 +3611,15 @@ static gchar* gsettings_configuration_engine_get_plugin_enable_disable_name (con
 	_tmp2_ = cleaned_id;
 #line 282 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (_tmp2_ == NULL) {
-#line 3573 "GSettingsEngine.c"
-		gchar* _tmp3_ = NULL;
+#line 3615 "GSettingsEngine.c"
+		gchar* _tmp3_;
 #line 283 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = g_strdup ("default");
 #line 283 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (cleaned_id);
 #line 283 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		cleaned_id = _tmp3_;
-#line 3581 "GSettingsEngine.c"
+#line 3623 "GSettingsEngine.c"
 	}
 #line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = cleaned_id;
@@ -3599,21 +3641,21 @@ static gchar* gsettings_configuration_engine_get_plugin_enable_disable_name (con
 	result = cleaned_id;
 #line 288 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3603 "GSettingsEngine.c"
+#line 3645 "GSettingsEngine.c"
 }
 
 
 static gchar* gsettings_configuration_engine_make_plugin_schema_name (const gchar* domain, const gchar* id) {
 	gchar* result = NULL;
 	gchar* cleaned_id = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	const gchar* _tmp7_;
+	gchar* _tmp8_;
 #line 291 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (domain != NULL, NULL);
 #line 291 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -3628,15 +3670,15 @@ static gchar* gsettings_configuration_engine_make_plugin_schema_name (const gcha
 	_tmp2_ = cleaned_id;
 #line 293 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (_tmp2_ == NULL) {
-#line 3632 "GSettingsEngine.c"
-		gchar* _tmp3_ = NULL;
+#line 3674 "GSettingsEngine.c"
+		gchar* _tmp3_;
 #line 294 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = g_strdup ("default");
 #line 294 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (cleaned_id);
 #line 294 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		cleaned_id = _tmp3_;
-#line 3640 "GSettingsEngine.c"
+#line 3682 "GSettingsEngine.c"
 	}
 #line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = cleaned_id;
@@ -3658,14 +3700,14 @@ static gchar* gsettings_configuration_engine_make_plugin_schema_name (const gcha
 	_g_free0 (cleaned_id);
 #line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3662 "GSettingsEngine.c"
+#line 3704 "GSettingsEngine.c"
 }
 
 
 static gchar* gsettings_configuration_engine_make_gsettings_key (const gchar* gconf_key) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (gconf_key != NULL, NULL);
 #line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -3676,14 +3718,14 @@ static gchar* gsettings_configuration_engine_make_gsettings_key (const gchar* gc
 	result = _tmp1_;
 #line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3680 "GSettingsEngine.c"
+#line 3722 "GSettingsEngine.c"
 }
 
 
 static gchar* gsettings_configuration_engine_real_get_name (ConfigurationEngine* base) {
 	GSettingsConfigurationEngine * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 304 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
 #line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -3692,7 +3734,7 @@ static gchar* gsettings_configuration_engine_real_get_name (ConfigurationEngine*
 	result = _tmp0_;
 #line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3696 "GSettingsEngine.c"
+#line 3738 "GSettingsEngine.c"
 }
 
 
@@ -3700,15 +3742,15 @@ static gint gsettings_configuration_engine_real_get_enum_property (Configuration
 	GSettingsConfigurationEngine * self;
 	gint result = 0;
 	gint _tmp0_ = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	ConfigurableProperty _tmp2_ = 0;
-	const gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	ConfigurableProperty _tmp5_ = 0;
-	const gchar* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	ConfigurableProperty _tmp2_;
+	const gchar* _tmp3_;
+	gchar** _tmp4_;
+	gint _tmp4__length1;
+	ConfigurableProperty _tmp5_;
+	const gchar* _tmp6_;
+	gint _tmp7_;
 	GError * _inner_error_ = NULL;
 #line 308 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -3736,13 +3778,13 @@ static gint gsettings_configuration_engine_real_get_enum_property (Configuration
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3740 "GSettingsEngine.c"
+#line 3782 "GSettingsEngine.c"
 			gint _tmp8_ = 0;
 #line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
 #line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp8_;
-#line 3746 "GSettingsEngine.c"
+#line 3788 "GSettingsEngine.c"
 		} else {
 			gint _tmp9_ = 0;
 #line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -3751,29 +3793,29 @@ static gint gsettings_configuration_engine_real_get_enum_property (Configuration
 			g_clear_error (&_inner_error_);
 #line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp9_;
-#line 3755 "GSettingsEngine.c"
+#line 3797 "GSettingsEngine.c"
 		}
 	}
 #line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp0_;
 #line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3762 "GSettingsEngine.c"
+#line 3804 "GSettingsEngine.c"
 }
 
 
 static void gsettings_configuration_engine_real_set_enum_property (ConfigurationEngine* base, ConfigurableProperty p, gint val, GError** error) {
 	GSettingsConfigurationEngine * self;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	ConfigurableProperty _tmp1_ = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	ConfigurableProperty _tmp4_ = 0;
-	const gchar* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	ConfigurableProperty _tmp7_ = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	ConfigurableProperty _tmp1_;
+	const gchar* _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	ConfigurableProperty _tmp4_;
+	const gchar* _tmp5_;
+	gint _tmp6_;
+	ConfigurableProperty _tmp7_;
 	GError * _inner_error_ = NULL;
 #line 312 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -3805,7 +3847,7 @@ static void gsettings_configuration_engine_real_set_enum_property (Configuration
 			g_propagate_error (error, _inner_error_);
 #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3809 "GSettingsEngine.c"
+#line 3851 "GSettingsEngine.c"
 		} else {
 #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3813,14 +3855,14 @@ static void gsettings_configuration_engine_real_set_enum_property (Configuration
 			g_clear_error (&_inner_error_);
 #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3817 "GSettingsEngine.c"
+#line 3859 "GSettingsEngine.c"
 		}
 	}
 #line 314 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = p;
 #line 314 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_);
-#line 3824 "GSettingsEngine.c"
+#line 3866 "GSettingsEngine.c"
 }
 
 
@@ -3828,15 +3870,15 @@ static gint gsettings_configuration_engine_real_get_int_property (ConfigurationE
 	GSettingsConfigurationEngine * self;
 	gint result = 0;
 	gint _tmp0_ = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	ConfigurableProperty _tmp2_ = 0;
-	const gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	ConfigurableProperty _tmp5_ = 0;
-	const gchar* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	ConfigurableProperty _tmp2_;
+	const gchar* _tmp3_;
+	gchar** _tmp4_;
+	gint _tmp4__length1;
+	ConfigurableProperty _tmp5_;
+	const gchar* _tmp6_;
+	gint _tmp7_;
 	GError * _inner_error_ = NULL;
 #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -3864,13 +3906,13 @@ static gint gsettings_configuration_engine_real_get_int_property (ConfigurationE
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3868 "GSettingsEngine.c"
+#line 3910 "GSettingsEngine.c"
 			gint _tmp8_ = 0;
 #line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
 #line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp8_;
-#line 3874 "GSettingsEngine.c"
+#line 3916 "GSettingsEngine.c"
 		} else {
 			gint _tmp9_ = 0;
 #line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -3879,29 +3921,29 @@ static gint gsettings_configuration_engine_real_get_int_property (ConfigurationE
 			g_clear_error (&_inner_error_);
 #line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp9_;
-#line 3883 "GSettingsEngine.c"
+#line 3925 "GSettingsEngine.c"
 		}
 	}
 #line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp0_;
 #line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3890 "GSettingsEngine.c"
+#line 3932 "GSettingsEngine.c"
 }
 
 
 static void gsettings_configuration_engine_real_set_int_property (ConfigurationEngine* base, ConfigurableProperty p, gint val, GError** error) {
 	GSettingsConfigurationEngine * self;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	ConfigurableProperty _tmp1_ = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	ConfigurableProperty _tmp4_ = 0;
-	const gchar* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	ConfigurableProperty _tmp7_ = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	ConfigurableProperty _tmp1_;
+	const gchar* _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	ConfigurableProperty _tmp4_;
+	const gchar* _tmp5_;
+	gint _tmp6_;
+	ConfigurableProperty _tmp7_;
 	GError * _inner_error_ = NULL;
 #line 321 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -3933,7 +3975,7 @@ static void gsettings_configuration_engine_real_set_int_property (ConfigurationE
 			g_propagate_error (error, _inner_error_);
 #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3937 "GSettingsEngine.c"
+#line 3979 "GSettingsEngine.c"
 		} else {
 #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3941,57 +3983,57 @@ static void gsettings_configuration_engine_real_set_int_property (ConfigurationE
 			g_clear_error (&_inner_error_);
 #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3945 "GSettingsEngine.c"
+#line 3987 "GSettingsEngine.c"
 		}
 	}
 #line 323 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = p;
 #line 323 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_);
-#line 3952 "GSettingsEngine.c"
+#line 3994 "GSettingsEngine.c"
 }
 
 
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 3975 "GSettingsEngine.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 4017 "GSettingsEngine.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 3983 "GSettingsEngine.c"
+#line 4025 "GSettingsEngine.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 3995 "GSettingsEngine.c"
+#line 4037 "GSettingsEngine.c"
 	}
 }
 
@@ -4000,123 +4042,123 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 4019 "GSettingsEngine.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 4061 "GSettingsEngine.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 4025 "GSettingsEngine.c"
+#line 4067 "GSettingsEngine.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 4029 "GSettingsEngine.c"
+#line 4071 "GSettingsEngine.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 4033 "GSettingsEngine.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 4075 "GSettingsEngine.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 4045 "GSettingsEngine.c"
+#line 4087 "GSettingsEngine.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 4055 "GSettingsEngine.c"
+#line 4097 "GSettingsEngine.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 4061 "GSettingsEngine.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 4103 "GSettingsEngine.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 4075 "GSettingsEngine.c"
+#line 4117 "GSettingsEngine.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 4085 "GSettingsEngine.c"
+#line 4127 "GSettingsEngine.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 4091 "GSettingsEngine.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 4133 "GSettingsEngine.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 4100 "GSettingsEngine.c"
+#line 4142 "GSettingsEngine.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 4120 "GSettingsEngine.c"
+#line 4162 "GSettingsEngine.c"
 }
 
 
@@ -4124,18 +4166,18 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura
 	GSettingsConfigurationEngine * self;
 	gchar* result = NULL;
 	gchar* gs_result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	ConfigurableProperty _tmp1_ = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	ConfigurableProperty _tmp4_ = 0;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	ConfigurableProperty _tmp1_;
+	const gchar* _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	ConfigurableProperty _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 	gchar* _result_ = NULL;
-	gchar* _tmp7_ = NULL;
-	ConfigurableProperty _tmp8_ = 0;
+	gchar* _tmp7_;
+	ConfigurableProperty _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -4167,7 +4209,7 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura
 			g_propagate_error (error, _inner_error_);
 #line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return NULL;
-#line 4171 "GSettingsEngine.c"
+#line 4213 "GSettingsEngine.c"
 		} else {
 #line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4175,7 +4217,7 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura
 			g_clear_error (&_inner_error_);
 #line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return NULL;
-#line 4179 "GSettingsEngine.c"
+#line 4221 "GSettingsEngine.c"
 		}
 	}
 #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4186,15 +4228,15 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura
 	_tmp8_ = p;
 #line 332 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (_tmp8_ == CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE) {
-#line 4190 "GSettingsEngine.c"
-		gchar* _tmp9_ = NULL;
+#line 4232 "GSettingsEngine.c"
+		gchar* _tmp9_;
 #line 333 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp9_ = string_substring (gs_result, (glong) 7, (glong) -1);
 #line 333 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_result_);
 #line 333 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_result_ = _tmp9_;
-#line 4198 "GSettingsEngine.c"
+#line 4240 "GSettingsEngine.c"
 	}
 #line 336 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _result_;
@@ -4202,27 +4244,27 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura
 	_g_free0 (gs_result);
 #line 336 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 4206 "GSettingsEngine.c"
+#line 4248 "GSettingsEngine.c"
 }
 
 
 static void gsettings_configuration_engine_real_set_string_property (ConfigurationEngine* base, ConfigurableProperty p, const gchar* val, GError** error) {
 	GSettingsConfigurationEngine * self;
 	gchar* converted_val = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	ConfigurableProperty _tmp3_ = 0;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	ConfigurableProperty _tmp8_ = 0;
-	const gchar* _tmp9_ = NULL;
-	gchar** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	ConfigurableProperty _tmp11_ = 0;
-	const gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	ConfigurableProperty _tmp14_ = 0;
+	ConfigurableProperty _tmp3_;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
+	ConfigurableProperty _tmp8_;
+	const gchar* _tmp9_;
+	gchar** _tmp10_;
+	gint _tmp10__length1;
+	ConfigurableProperty _tmp11_;
+	const gchar* _tmp12_;
+	const gchar* _tmp13_;
+	ConfigurableProperty _tmp14_;
 	GError * _inner_error_ = NULL;
 #line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -4240,20 +4282,20 @@ static void gsettings_configuration_engine_real_set_string_property (Configurati
 	if (_tmp3_ == CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE) {
 #line 342 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp2_ = TRUE;
-#line 4244 "GSettingsEngine.c"
+#line 4286 "GSettingsEngine.c"
 	} else {
-		ConfigurableProperty _tmp4_ = 0;
+		ConfigurableProperty _tmp4_;
 #line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = p;
 #line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp2_ = _tmp4_ == CONFIGURABLE_PROPERTY_SCREENSAVER_FILE;
-#line 4251 "GSettingsEngine.c"
+#line 4293 "GSettingsEngine.c"
 	}
 #line 342 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (_tmp2_) {
-#line 4255 "GSettingsEngine.c"
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+#line 4297 "GSettingsEngine.c"
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 344 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = val;
 #line 344 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4262,7 +4304,7 @@ static void gsettings_configuration_engine_real_set_string_property (Configurati
 		_g_free0 (converted_val);
 #line 344 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		converted_val = _tmp6_;
-#line 4266 "GSettingsEngine.c"
+#line 4308 "GSettingsEngine.c"
 	}
 #line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = self->priv->schema_names;
@@ -4294,7 +4336,7 @@ static void gsettings_configuration_engine_real_set_string_property (Configurati
 			_g_free0 (converted_val);
 #line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4298 "GSettingsEngine.c"
+#line 4340 "GSettingsEngine.c"
 		} else {
 #line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (converted_val);
@@ -4304,7 +4346,7 @@ static void gsettings_configuration_engine_real_set_string_property (Configurati
 			g_clear_error (&_inner_error_);
 #line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4308 "GSettingsEngine.c"
+#line 4350 "GSettingsEngine.c"
 		}
 	}
 #line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4313,7 +4355,7 @@ static void gsettings_configuration_engine_real_set_string_property (Configurati
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp14_);
 #line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (converted_val);
-#line 4317 "GSettingsEngine.c"
+#line 4359 "GSettingsEngine.c"
 }
 
 
@@ -4321,15 +4363,15 @@ static gboolean gsettings_configuration_engine_real_get_bool_property (Configura
 	GSettingsConfigurationEngine * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	ConfigurableProperty _tmp2_ = 0;
-	const gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	ConfigurableProperty _tmp5_ = 0;
-	const gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	ConfigurableProperty _tmp2_;
+	const gchar* _tmp3_;
+	gchar** _tmp4_;
+	gint _tmp4__length1;
+	ConfigurableProperty _tmp5_;
+	const gchar* _tmp6_;
+	gboolean _tmp7_;
 	GError * _inner_error_ = NULL;
 #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -4357,13 +4399,13 @@ static gboolean gsettings_configuration_engine_real_get_bool_property (Configura
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4361 "GSettingsEngine.c"
+#line 4403 "GSettingsEngine.c"
 			gboolean _tmp8_ = FALSE;
 #line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
 #line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp8_;
-#line 4367 "GSettingsEngine.c"
+#line 4409 "GSettingsEngine.c"
 		} else {
 			gboolean _tmp9_ = FALSE;
 #line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4372,29 +4414,29 @@ static gboolean gsettings_configuration_engine_real_get_bool_property (Configura
 			g_clear_error (&_inner_error_);
 #line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp9_;
-#line 4376 "GSettingsEngine.c"
+#line 4418 "GSettingsEngine.c"
 		}
 	}
 #line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp0_;
 #line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 4383 "GSettingsEngine.c"
+#line 4425 "GSettingsEngine.c"
 }
 
 
 static void gsettings_configuration_engine_real_set_bool_property (ConfigurationEngine* base, ConfigurableProperty p, gboolean val, GError** error) {
 	GSettingsConfigurationEngine * self;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	ConfigurableProperty _tmp1_ = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	ConfigurableProperty _tmp4_ = 0;
-	const gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	ConfigurableProperty _tmp7_ = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	ConfigurableProperty _tmp1_;
+	const gchar* _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	ConfigurableProperty _tmp4_;
+	const gchar* _tmp5_;
+	gboolean _tmp6_;
+	ConfigurableProperty _tmp7_;
 	GError * _inner_error_ = NULL;
 #line 355 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -4426,7 +4468,7 @@ static void gsettings_configuration_engine_real_set_bool_property (Configuration
 			g_propagate_error (error, _inner_error_);
 #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4430 "GSettingsEngine.c"
+#line 4472 "GSettingsEngine.c"
 		} else {
 #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4434,14 +4476,14 @@ static void gsettings_configuration_engine_real_set_bool_property (Configuration
 			g_clear_error (&_inner_error_);
 #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4438 "GSettingsEngine.c"
+#line 4480 "GSettingsEngine.c"
 		}
 	}
 #line 357 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = p;
 #line 357 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_);
-#line 4445 "GSettingsEngine.c"
+#line 4487 "GSettingsEngine.c"
 }
 
 
@@ -4449,15 +4491,15 @@ static gdouble gsettings_configuration_engine_real_get_double_property (Configur
 	GSettingsConfigurationEngine * self;
 	gdouble result = 0.0;
 	gdouble _tmp0_ = 0.0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	ConfigurableProperty _tmp2_ = 0;
-	const gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	ConfigurableProperty _tmp5_ = 0;
-	const gchar* _tmp6_ = NULL;
-	gdouble _tmp7_ = 0.0;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	ConfigurableProperty _tmp2_;
+	const gchar* _tmp3_;
+	gchar** _tmp4_;
+	gint _tmp4__length1;
+	ConfigurableProperty _tmp5_;
+	const gchar* _tmp6_;
+	gdouble _tmp7_;
 	GError * _inner_error_ = NULL;
 #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -4485,13 +4527,13 @@ static gdouble gsettings_configuration_engine_real_get_double_property (Configur
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4489 "GSettingsEngine.c"
+#line 4531 "GSettingsEngine.c"
 			gdouble _tmp8_ = 0.0;
 #line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
 #line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp8_;
-#line 4495 "GSettingsEngine.c"
+#line 4537 "GSettingsEngine.c"
 		} else {
 			gdouble _tmp9_ = 0.0;
 #line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4500,29 +4542,29 @@ static gdouble gsettings_configuration_engine_real_get_double_property (Configur
 			g_clear_error (&_inner_error_);
 #line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp9_;
-#line 4504 "GSettingsEngine.c"
+#line 4546 "GSettingsEngine.c"
 		}
 	}
 #line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp0_;
 #line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 4511 "GSettingsEngine.c"
+#line 4553 "GSettingsEngine.c"
 }
 
 
 static void gsettings_configuration_engine_real_set_double_property (ConfigurationEngine* base, ConfigurableProperty p, gdouble val, GError** error) {
 	GSettingsConfigurationEngine * self;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	ConfigurableProperty _tmp1_ = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	ConfigurableProperty _tmp4_ = 0;
-	const gchar* _tmp5_ = NULL;
-	gdouble _tmp6_ = 0.0;
-	ConfigurableProperty _tmp7_ = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	ConfigurableProperty _tmp1_;
+	const gchar* _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	ConfigurableProperty _tmp4_;
+	const gchar* _tmp5_;
+	gdouble _tmp6_;
+	ConfigurableProperty _tmp7_;
 	GError * _inner_error_ = NULL;
 #line 364 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -4554,7 +4596,7 @@ static void gsettings_configuration_engine_real_set_double_property (Configurati
 			g_propagate_error (error, _inner_error_);
 #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4558 "GSettingsEngine.c"
+#line 4600 "GSettingsEngine.c"
 		} else {
 #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4562,14 +4604,14 @@ static void gsettings_configuration_engine_real_set_double_property (Configurati
 			g_clear_error (&_inner_error_);
 #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4566 "GSettingsEngine.c"
+#line 4608 "GSettingsEngine.c"
 		}
 	}
 #line 366 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = p;
 #line 366 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_);
-#line 4573 "GSettingsEngine.c"
+#line 4615 "GSettingsEngine.c"
 }
 
 
@@ -4577,9 +4619,9 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 	GSettingsConfigurationEngine * self;
 	gboolean result = FALSE;
 	gchar* schema_name = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	gboolean _tmp13_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4598,14 +4640,14 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
 #line 370 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 4602 "GSettingsEngine.c"
+#line 4644 "GSettingsEngine.c"
 	{
 		gboolean _tmp3_ = FALSE;
-		const gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
-		gboolean _tmp8_ = FALSE;
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gboolean _tmp7_;
+		gboolean _tmp8_;
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = key;
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4622,12 +4664,12 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 		_tmp3_ = _tmp8_;
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4626 "GSettingsEngine.c"
+#line 4668 "GSettingsEngine.c"
 			gboolean _tmp9_ = FALSE;
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4630 "GSettingsEngine.c"
-				goto __catch205_configuration_error;
+#line 4672 "GSettingsEngine.c"
+				goto __catch206_configuration_error;
 			}
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -4637,7 +4679,7 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 			g_clear_error (&_inner_error_);
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp9_;
-#line 4641 "GSettingsEngine.c"
+#line 4683 "GSettingsEngine.c"
 		}
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp3_;
@@ -4645,15 +4687,15 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 		_g_free0 (schema_name);
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4649 "GSettingsEngine.c"
+#line 4691 "GSettingsEngine.c"
 	}
-	goto __finally205;
-	__catch205_configuration_error:
+	goto __finally206;
+	__catch206_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
+		GError* _tmp10_;
+		const gchar* _tmp11_;
+		gboolean _tmp12_;
 #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
 #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4674,9 +4716,9 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 		_g_free0 (schema_name);
 #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4678 "GSettingsEngine.c"
+#line 4720 "GSettingsEngine.c"
 	}
-	__finally205:
+	__finally206:
 #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
 #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4685,16 +4727,16 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 	g_clear_error (&_inner_error_);
 #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return _tmp13_;
-#line 4689 "GSettingsEngine.c"
+#line 4731 "GSettingsEngine.c"
 }
 
 
 static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gboolean val) {
 	GSettingsConfigurationEngine * self;
 	gchar* schema_name = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -4712,12 +4754,12 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
 #line 381 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 4716 "GSettingsEngine.c"
+#line 4758 "GSettingsEngine.c"
 	{
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gboolean _tmp6_;
 #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = key;
 #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4734,8 +4776,8 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4738 "GSettingsEngine.c"
-				goto __catch206_configuration_error;
+#line 4780 "GSettingsEngine.c"
+				goto __catch207_configuration_error;
 			}
 #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -4745,15 +4787,15 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn
 			g_clear_error (&_inner_error_);
 #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4749 "GSettingsEngine.c"
+#line 4791 "GSettingsEngine.c"
 		}
 	}
-	goto __finally206;
-	__catch206_configuration_error:
+	goto __finally207;
+	__catch207_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
+		GError* _tmp7_;
+		const gchar* _tmp8_;
 #line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
 #line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4766,9 +4808,9 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn
 		g_critical ("GSettingsEngine.vala:386: GSettingsConfigurationEngine: error: %s", _tmp8_);
 #line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 4770 "GSettingsEngine.c"
+#line 4812 "GSettingsEngine.c"
 	}
-	__finally206:
+	__finally207:
 #line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4779,11 +4821,11 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn
 		g_clear_error (&_inner_error_);
 #line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 4783 "GSettingsEngine.c"
+#line 4825 "GSettingsEngine.c"
 	}
 #line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 4787 "GSettingsEngine.c"
+#line 4829 "GSettingsEngine.c"
 }
 
 
@@ -4791,9 +4833,9 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 	GSettingsConfigurationEngine * self;
 	gdouble result = 0.0;
 	gchar* schema_name = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	gdouble _tmp13_ = 0.0;
 	GError * _inner_error_ = NULL;
 #line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4812,14 +4854,14 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
 #line 391 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 4816 "GSettingsEngine.c"
+#line 4858 "GSettingsEngine.c"
 	{
 		gdouble _tmp3_ = 0.0;
-		const gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gdouble _tmp7_ = 0.0;
-		gdouble _tmp8_ = 0.0;
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gdouble _tmp7_;
+		gdouble _tmp8_;
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = key;
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4836,12 +4878,12 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 		_tmp3_ = _tmp8_;
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4840 "GSettingsEngine.c"
+#line 4882 "GSettingsEngine.c"
 			gdouble _tmp9_ = 0.0;
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4844 "GSettingsEngine.c"
-				goto __catch207_configuration_error;
+#line 4886 "GSettingsEngine.c"
+				goto __catch208_configuration_error;
 			}
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -4851,7 +4893,7 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 			g_clear_error (&_inner_error_);
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp9_;
-#line 4855 "GSettingsEngine.c"
+#line 4897 "GSettingsEngine.c"
 		}
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp3_;
@@ -4859,15 +4901,15 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 		_g_free0 (schema_name);
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4863 "GSettingsEngine.c"
+#line 4905 "GSettingsEngine.c"
 	}
-	goto __finally207;
-	__catch207_configuration_error:
+	goto __finally208;
+	__catch208_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		gdouble _tmp12_ = 0.0;
+		GError* _tmp10_;
+		const gchar* _tmp11_;
+		gdouble _tmp12_;
 #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
 #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4888,9 +4930,9 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 		_g_free0 (schema_name);
 #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4892 "GSettingsEngine.c"
+#line 4934 "GSettingsEngine.c"
 	}
-	__finally207:
+	__finally208:
 #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
 #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4899,16 +4941,16 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 	g_clear_error (&_inner_error_);
 #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return _tmp13_;
-#line 4903 "GSettingsEngine.c"
+#line 4945 "GSettingsEngine.c"
 }
 
 
 static void gsettings_configuration_engine_real_set_plugin_double (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gdouble val) {
 	GSettingsConfigurationEngine * self;
 	gchar* schema_name = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -4926,12 +4968,12 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
 #line 402 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 4930 "GSettingsEngine.c"
+#line 4972 "GSettingsEngine.c"
 	{
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gdouble _tmp6_ = 0.0;
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gdouble _tmp6_;
 #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = key;
 #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4948,8 +4990,8 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4952 "GSettingsEngine.c"
-				goto __catch208_configuration_error;
+#line 4994 "GSettingsEngine.c"
+				goto __catch209_configuration_error;
 			}
 #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -4959,15 +5001,15 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration
 			g_clear_error (&_inner_error_);
 #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4963 "GSettingsEngine.c"
+#line 5005 "GSettingsEngine.c"
 		}
 	}
-	goto __finally208;
-	__catch208_configuration_error:
+	goto __finally209;
+	__catch209_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
+		GError* _tmp7_;
+		const gchar* _tmp8_;
 #line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
 #line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4980,9 +5022,9 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration
 		g_critical ("GSettingsEngine.vala:407: GSettingsConfigurationEngine: error: %s", _tmp8_);
 #line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 4984 "GSettingsEngine.c"
+#line 5026 "GSettingsEngine.c"
 	}
-	__finally208:
+	__finally209:
 #line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4993,11 +5035,11 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration
 		g_clear_error (&_inner_error_);
 #line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 4997 "GSettingsEngine.c"
+#line 5039 "GSettingsEngine.c"
 	}
 #line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 5001 "GSettingsEngine.c"
+#line 5043 "GSettingsEngine.c"
 }
 
 
@@ -5005,9 +5047,9 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 	GSettingsConfigurationEngine * self;
 	gint result = 0;
 	gchar* schema_name = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	gint _tmp13_ = 0;
 	GError * _inner_error_ = NULL;
 #line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5026,14 +5068,14 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
 #line 412 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 5030 "GSettingsEngine.c"
+#line 5072 "GSettingsEngine.c"
 	{
 		gint _tmp3_ = 0;
-		const gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = key;
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5050,12 +5092,12 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 		_tmp3_ = _tmp8_;
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5054 "GSettingsEngine.c"
+#line 5096 "GSettingsEngine.c"
 			gint _tmp9_ = 0;
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5058 "GSettingsEngine.c"
-				goto __catch209_configuration_error;
+#line 5100 "GSettingsEngine.c"
+				goto __catch210_configuration_error;
 			}
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5065,7 +5107,7 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 			g_clear_error (&_inner_error_);
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp9_;
-#line 5069 "GSettingsEngine.c"
+#line 5111 "GSettingsEngine.c"
 		}
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp3_;
@@ -5073,15 +5115,15 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 		_g_free0 (schema_name);
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 5077 "GSettingsEngine.c"
+#line 5119 "GSettingsEngine.c"
 	}
-	goto __finally209;
-	__catch209_configuration_error:
+	goto __finally210;
+	__catch210_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
+		GError* _tmp10_;
+		const gchar* _tmp11_;
+		gint _tmp12_;
 #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
 #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5102,9 +5144,9 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 		_g_free0 (schema_name);
 #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 5106 "GSettingsEngine.c"
+#line 5148 "GSettingsEngine.c"
 	}
-	__finally209:
+	__finally210:
 #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
 #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5113,16 +5155,16 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 	g_clear_error (&_inner_error_);
 #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return _tmp13_;
-#line 5117 "GSettingsEngine.c"
+#line 5159 "GSettingsEngine.c"
 }
 
 
 static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gint val) {
 	GSettingsConfigurationEngine * self;
 	gchar* schema_name = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -5140,12 +5182,12 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
 #line 423 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 5144 "GSettingsEngine.c"
+#line 5186 "GSettingsEngine.c"
 	{
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gint _tmp6_;
 #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = key;
 #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5162,8 +5204,8 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5166 "GSettingsEngine.c"
-				goto __catch210_configuration_error;
+#line 5208 "GSettingsEngine.c"
+				goto __catch211_configuration_error;
 			}
 #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5173,15 +5215,15 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng
 			g_clear_error (&_inner_error_);
 #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 5177 "GSettingsEngine.c"
+#line 5219 "GSettingsEngine.c"
 		}
 	}
-	goto __finally210;
-	__catch210_configuration_error:
+	goto __finally211;
+	__catch211_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
+		GError* _tmp7_;
+		const gchar* _tmp8_;
 #line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
 #line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5194,9 +5236,9 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng
 		g_critical ("GSettingsEngine.vala:428: GSettingsConfigurationEngine: error: %s", _tmp8_);
 #line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 5198 "GSettingsEngine.c"
+#line 5240 "GSettingsEngine.c"
 	}
-	__finally210:
+	__finally211:
 #line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5207,11 +5249,11 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng
 		g_clear_error (&_inner_error_);
 #line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 5211 "GSettingsEngine.c"
+#line 5253 "GSettingsEngine.c"
 	}
 #line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 5215 "GSettingsEngine.c"
+#line 5257 "GSettingsEngine.c"
 }
 
 
@@ -5219,9 +5261,9 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 	GSettingsConfigurationEngine * self;
 	gchar* result = NULL;
 	gchar* schema_name = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -5239,15 +5281,15 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
 #line 433 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 5243 "GSettingsEngine.c"
+#line 5285 "GSettingsEngine.c"
 	{
 		gchar* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = key;
 #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5266,8 +5308,8 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5270 "GSettingsEngine.c"
-				goto __catch211_configuration_error;
+#line 5312 "GSettingsEngine.c"
+				goto __catch212_configuration_error;
 			}
 #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5277,7 +5319,7 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 			g_clear_error (&_inner_error_);
 #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return NULL;
-#line 5281 "GSettingsEngine.c"
+#line 5323 "GSettingsEngine.c"
 		}
 #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp9_ = _tmp3_;
@@ -5291,16 +5333,16 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 		_g_free0 (schema_name);
 #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 5295 "GSettingsEngine.c"
+#line 5337 "GSettingsEngine.c"
 	}
-	goto __finally211;
-	__catch211_configuration_error:
+	goto __finally212;
+	__catch212_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
+		GError* _tmp10_;
+		const gchar* _tmp11_;
+		const gchar* _tmp12_;
+		gchar* _tmp13_;
 #line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
 #line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5323,9 +5365,9 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 		_g_free0 (schema_name);
 #line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 5327 "GSettingsEngine.c"
+#line 5369 "GSettingsEngine.c"
 	}
-	__finally211:
+	__finally212:
 #line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
 #line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5334,16 +5376,16 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 	g_clear_error (&_inner_error_);
 #line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return NULL;
-#line 5338 "GSettingsEngine.c"
+#line 5380 "GSettingsEngine.c"
 }
 
 
 static void gsettings_configuration_engine_real_set_plugin_string (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, const gchar* val) {
 	GSettingsConfigurationEngine * self;
 	gchar* schema_name = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -5361,12 +5403,12 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
 #line 444 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 5365 "GSettingsEngine.c"
+#line 5407 "GSettingsEngine.c"
 	{
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		const gchar* _tmp6_;
 #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = key;
 #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5383,8 +5425,8 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5387 "GSettingsEngine.c"
-				goto __catch212_configuration_error;
+#line 5429 "GSettingsEngine.c"
+				goto __catch213_configuration_error;
 			}
 #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5394,15 +5436,15 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration
 			g_clear_error (&_inner_error_);
 #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 5398 "GSettingsEngine.c"
+#line 5440 "GSettingsEngine.c"
 		}
 	}
-	goto __finally212;
-	__catch212_configuration_error:
+	goto __finally213;
+	__catch213_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
+		GError* _tmp7_;
+		const gchar* _tmp8_;
 #line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
 #line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5415,9 +5457,9 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration
 		g_critical ("GSettingsEngine.vala:449: GSettingsConfigurationEngine: error: %s", _tmp8_);
 #line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 5419 "GSettingsEngine.c"
+#line 5461 "GSettingsEngine.c"
 	}
-	__finally212:
+	__finally213:
 #line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5428,20 +5470,20 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration
 		g_clear_error (&_inner_error_);
 #line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 5432 "GSettingsEngine.c"
+#line 5474 "GSettingsEngine.c"
 	}
 #line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 5436 "GSettingsEngine.c"
+#line 5478 "GSettingsEngine.c"
 }
 
 
 static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key) {
 	GSettingsConfigurationEngine * self;
 	gchar* schema_name = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -5459,11 +5501,11 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
 #line 454 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 5463 "GSettingsEngine.c"
+#line 5505 "GSettingsEngine.c"
 	{
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = key;
 #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5478,8 +5520,8 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5482 "GSettingsEngine.c"
-				goto __catch213_configuration_error;
+#line 5524 "GSettingsEngine.c"
+				goto __catch214_configuration_error;
 			}
 #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5489,15 +5531,15 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE
 			g_clear_error (&_inner_error_);
 #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 5493 "GSettingsEngine.c"
+#line 5535 "GSettingsEngine.c"
 		}
 	}
-	goto __finally213;
-	__catch213_configuration_error:
+	goto __finally214;
+	__catch214_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+		GError* _tmp6_;
+		const gchar* _tmp7_;
 #line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
 #line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5510,9 +5552,9 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE
 		g_critical ("GSettingsEngine.vala:459: GSettingsConfigurationEngine: error: %s", _tmp7_);
 #line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 5514 "GSettingsEngine.c"
+#line 5556 "GSettingsEngine.c"
 	}
-	__finally213:
+	__finally214:
 #line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5523,11 +5565,11 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE
 		g_clear_error (&_inner_error_);
 #line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 5527 "GSettingsEngine.c"
+#line 5569 "GSettingsEngine.c"
 	}
 #line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 5531 "GSettingsEngine.c"
+#line 5573 "GSettingsEngine.c"
 }
 
 
@@ -5535,8 +5577,8 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 	GSettingsConfigurationEngine * self;
 	FuzzyPropertyState result = 0;
 	gchar* enable_disable_name = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 463 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -5548,11 +5590,11 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 	_tmp1_ = gsettings_configuration_engine_get_plugin_enable_disable_name (_tmp0_);
 #line 464 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	enable_disable_name = _tmp1_;
-#line 5552 "GSettingsEngine.c"
+#line 5594 "GSettingsEngine.c"
 	{
 		FuzzyPropertyState _tmp2_ = 0;
 		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
+		gboolean _tmp4_;
 #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = gsettings_configuration_engine_get_gs_bool (self, GSETTINGS_CONFIGURATION_ENGINE_PLUGINS_ENABLE_DISABLE_SCHEMA_NAME, enable_disable_name, &_inner_error_);
 #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5561,8 +5603,8 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5565 "GSettingsEngine.c"
-				goto __catch214_configuration_error;
+#line 5607 "GSettingsEngine.c"
+				goto __catch215_configuration_error;
 			}
 #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (enable_disable_name);
@@ -5572,17 +5614,17 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 			g_clear_error (&_inner_error_);
 #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return 0;
-#line 5576 "GSettingsEngine.c"
+#line 5618 "GSettingsEngine.c"
 		}
 #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_tmp3_) {
 #line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_tmp2_ = FUZZY_PROPERTY_STATE_ENABLED;
-#line 5582 "GSettingsEngine.c"
+#line 5624 "GSettingsEngine.c"
 		} else {
 #line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_tmp2_ = FUZZY_PROPERTY_STATE_DISABLED;
-#line 5586 "GSettingsEngine.c"
+#line 5628 "GSettingsEngine.c"
 		}
 #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp2_;
@@ -5590,14 +5632,14 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 		_g_free0 (enable_disable_name);
 #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 5594 "GSettingsEngine.c"
+#line 5636 "GSettingsEngine.c"
 	}
-	goto __finally214;
-	__catch214_configuration_error:
+	goto __finally215;
+	__catch215_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+		GError* _tmp5_;
+		const gchar* _tmp6_;
 #line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
 #line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5616,9 +5658,9 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 		_g_free0 (enable_disable_name);
 #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 5620 "GSettingsEngine.c"
+#line 5662 "GSettingsEngine.c"
 	}
-	__finally214:
+	__finally215:
 #line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (enable_disable_name);
 #line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5627,15 +5669,15 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 	g_clear_error (&_inner_error_);
 #line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return 0;
-#line 5631 "GSettingsEngine.c"
+#line 5673 "GSettingsEngine.c"
 }
 
 
 static void gsettings_configuration_engine_real_set_plugin_enabled (ConfigurationEngine* base, const gchar* id, gboolean enabled) {
 	GSettingsConfigurationEngine * self;
 	gchar* enable_disable_name = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -5647,9 +5689,9 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio
 	_tmp1_ = gsettings_configuration_engine_get_plugin_enable_disable_name (_tmp0_);
 #line 476 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	enable_disable_name = _tmp1_;
-#line 5651 "GSettingsEngine.c"
+#line 5693 "GSettingsEngine.c"
 	{
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp2_ = enabled;
 #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5658,8 +5700,8 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5662 "GSettingsEngine.c"
-				goto __catch215_configuration_error;
+#line 5704 "GSettingsEngine.c"
+				goto __catch216_configuration_error;
 			}
 #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (enable_disable_name);
@@ -5669,15 +5711,15 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio
 			g_clear_error (&_inner_error_);
 #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 5673 "GSettingsEngine.c"
+#line 5715 "GSettingsEngine.c"
 		}
 	}
-	goto __finally215;
-	__catch215_configuration_error:
+	goto __finally216;
+	__catch216_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
+		GError* _tmp3_;
+		const gchar* _tmp4_;
 #line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
 #line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5690,9 +5732,9 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio
 		g_critical ("GSettingsEngine.vala:481: GSettingsConfigurationEngine: error: %s", _tmp4_);
 #line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 5694 "GSettingsEngine.c"
+#line 5736 "GSettingsEngine.c"
 	}
-	__finally215:
+	__finally216:
 #line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5703,22 +5745,22 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio
 		g_clear_error (&_inner_error_);
 #line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 5707 "GSettingsEngine.c"
+#line 5749 "GSettingsEngine.c"
 	}
 #line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (enable_disable_name);
-#line 5711 "GSettingsEngine.c"
+#line 5753 "GSettingsEngine.c"
 }
 
 
 void gsettings_configuration_engine_run_gsettings_migrator (void) {
 	gchar* cmd_line = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = app_dirs_get_settings_migrator_bin ();
@@ -5738,22 +5780,22 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) {
 	_g_object_unref0 (_tmp1_);
 #line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	cmd_line = _tmp5_;
-#line 5742 "GSettingsEngine.c"
+#line 5784 "GSettingsEngine.c"
 	{
 #line 493 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_spawn_command_line_sync (cmd_line, NULL, NULL, NULL, &_inner_error_);
 #line 493 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5748 "GSettingsEngine.c"
-			goto __catch216_g_error;
+#line 5790 "GSettingsEngine.c"
+			goto __catch217_g_error;
 		}
 	}
-	goto __finally216;
-	__catch216_g_error:
+	goto __finally217;
+	__catch217_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+		GError* _tmp6_;
+		const gchar* _tmp7_;
 #line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
 #line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5766,9 +5808,9 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) {
 		g_message ("GSettingsEngine.vala:495: Error running shotwell-settings-migrator: %s", _tmp7_);
 #line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 5770 "GSettingsEngine.c"
+#line 5812 "GSettingsEngine.c"
 	}
-	__finally216:
+	__finally217:
 #line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5779,11 +5821,11 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) {
 		g_clear_error (&_inner_error_);
 #line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 5783 "GSettingsEngine.c"
+#line 5825 "GSettingsEngine.c"
 	}
 #line 489 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (cmd_line);
-#line 5787 "GSettingsEngine.c"
+#line 5829 "GSettingsEngine.c"
 }
 
 
@@ -5794,7 +5836,7 @@ static void gsettings_configuration_engine_class_init (GSettingsConfigurationEng
 	g_type_class_add_private (klass, sizeof (GSettingsConfigurationEnginePrivate));
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	G_OBJECT_CLASS (klass)->finalize = gsettings_configuration_engine_finalize;
-#line 5798 "GSettingsEngine.c"
+#line 5840 "GSettingsEngine.c"
 }
 
 
@@ -5802,61 +5844,61 @@ static void gsettings_configuration_engine_configuration_engine_interface_init (
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_configuration_engine_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->get_name = (gchar* (*)(ConfigurationEngine*)) gsettings_configuration_engine_real_get_name;
+	iface->get_name = (gchar* (*) (ConfigurationEngine *)) gsettings_configuration_engine_real_get_name;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->get_enum_property = (gint (*)(ConfigurationEngine*, ConfigurableProperty, GError**)) gsettings_configuration_engine_real_get_enum_property;
+	iface->get_enum_property = (gint (*) (ConfigurationEngine *, ConfigurableProperty, GError**)) gsettings_configuration_engine_real_get_enum_property;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->set_enum_property = (void (*)(ConfigurationEngine*, ConfigurableProperty, gint, GError**)) gsettings_configuration_engine_real_set_enum_property;
+	iface->set_enum_property = (void (*) (ConfigurationEngine *, ConfigurableProperty, gint, GError**)) gsettings_configuration_engine_real_set_enum_property;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->get_int_property = (gint (*)(ConfigurationEngine*, ConfigurableProperty, GError**)) gsettings_configuration_engine_real_get_int_property;
+	iface->get_int_property = (gint (*) (ConfigurationEngine *, ConfigurableProperty, GError**)) gsettings_configuration_engine_real_get_int_property;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->set_int_property = (void (*)(ConfigurationEngine*, ConfigurableProperty, gint, GError**)) gsettings_configuration_engine_real_set_int_property;
+	iface->set_int_property = (void (*) (ConfigurationEngine *, ConfigurableProperty, gint, GError**)) gsettings_configuration_engine_real_set_int_property;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->get_string_property = (gchar* (*)(ConfigurationEngine*, ConfigurableProperty, GError**)) gsettings_configuration_engine_real_get_string_property;
+	iface->get_string_property = (gchar* (*) (ConfigurationEngine *, ConfigurableProperty, GError**)) gsettings_configuration_engine_real_get_string_property;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->set_string_property = (void (*)(ConfigurationEngine*, ConfigurableProperty, const gchar*, GError**)) gsettings_configuration_engine_real_set_string_property;
+	iface->set_string_property = (void (*) (ConfigurationEngine *, ConfigurableProperty, const gchar*, GError**)) gsettings_configuration_engine_real_set_string_property;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->get_bool_property = (gboolean (*)(ConfigurationEngine*, ConfigurableProperty, GError**)) gsettings_configuration_engine_real_get_bool_property;
+	iface->get_bool_property = (gboolean (*) (ConfigurationEngine *, ConfigurableProperty, GError**)) gsettings_configuration_engine_real_get_bool_property;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->set_bool_property = (void (*)(ConfigurationEngine*, ConfigurableProperty, gboolean, GError**)) gsettings_configuration_engine_real_set_bool_property;
+	iface->set_bool_property = (void (*) (ConfigurationEngine *, ConfigurableProperty, gboolean, GError**)) gsettings_configuration_engine_real_set_bool_property;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->get_double_property = (gdouble (*)(ConfigurationEngine*, ConfigurableProperty, GError**)) gsettings_configuration_engine_real_get_double_property;
+	iface->get_double_property = (gdouble (*) (ConfigurationEngine *, ConfigurableProperty, GError**)) gsettings_configuration_engine_real_get_double_property;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->set_double_property = (void (*)(ConfigurationEngine*, ConfigurableProperty, gdouble, GError**)) gsettings_configuration_engine_real_set_double_property;
+	iface->set_double_property = (void (*) (ConfigurationEngine *, ConfigurableProperty, gdouble, GError**)) gsettings_configuration_engine_real_set_double_property;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->get_plugin_bool = (gboolean (*)(ConfigurationEngine*, const gchar*, const gchar*, const gchar*, gboolean)) gsettings_configuration_engine_real_get_plugin_bool;
+	iface->get_plugin_bool = (gboolean (*) (ConfigurationEngine *, const gchar*, const gchar*, const gchar*, gboolean)) gsettings_configuration_engine_real_get_plugin_bool;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->set_plugin_bool = (void (*)(ConfigurationEngine*, const gchar*, const gchar*, const gchar*, gboolean)) gsettings_configuration_engine_real_set_plugin_bool;
+	iface->set_plugin_bool = (void (*) (ConfigurationEngine *, const gchar*, const gchar*, const gchar*, gboolean)) gsettings_configuration_engine_real_set_plugin_bool;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->get_plugin_double = (gdouble (*)(ConfigurationEngine*, const gchar*, const gchar*, const gchar*, gdouble)) gsettings_configuration_engine_real_get_plugin_double;
+	iface->get_plugin_double = (gdouble (*) (ConfigurationEngine *, const gchar*, const gchar*, const gchar*, gdouble)) gsettings_configuration_engine_real_get_plugin_double;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->set_plugin_double = (void (*)(ConfigurationEngine*, const gchar*, const gchar*, const gchar*, gdouble)) gsettings_configuration_engine_real_set_plugin_double;
+	iface->set_plugin_double = (void (*) (ConfigurationEngine *, const gchar*, const gchar*, const gchar*, gdouble)) gsettings_configuration_engine_real_set_plugin_double;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->get_plugin_int = (gint (*)(ConfigurationEngine*, const gchar*, const gchar*, const gchar*, gint)) gsettings_configuration_engine_real_get_plugin_int;
+	iface->get_plugin_int = (gint (*) (ConfigurationEngine *, const gchar*, const gchar*, const gchar*, gint)) gsettings_configuration_engine_real_get_plugin_int;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->set_plugin_int = (void (*)(ConfigurationEngine*, const gchar*, const gchar*, const gchar*, gint)) gsettings_configuration_engine_real_set_plugin_int;
+	iface->set_plugin_int = (void (*) (ConfigurationEngine *, const gchar*, const gchar*, const gchar*, gint)) gsettings_configuration_engine_real_set_plugin_int;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->get_plugin_string = (gchar* (*)(ConfigurationEngine*, const gchar*, const gchar*, const gchar*, const gchar*)) gsettings_configuration_engine_real_get_plugin_string;
+	iface->get_plugin_string = (gchar* (*) (ConfigurationEngine *, const gchar*, const gchar*, const gchar*, const gchar*)) gsettings_configuration_engine_real_get_plugin_string;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->set_plugin_string = (void (*)(ConfigurationEngine*, const gchar*, const gchar*, const gchar*, const gchar*)) gsettings_configuration_engine_real_set_plugin_string;
+	iface->set_plugin_string = (void (*) (ConfigurationEngine *, const gchar*, const gchar*, const gchar*, const gchar*)) gsettings_configuration_engine_real_set_plugin_string;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->unset_plugin_key = (void (*)(ConfigurationEngine*, const gchar*, const gchar*, const gchar*)) gsettings_configuration_engine_real_unset_plugin_key;
+	iface->unset_plugin_key = (void (*) (ConfigurationEngine *, const gchar*, const gchar*, const gchar*)) gsettings_configuration_engine_real_unset_plugin_key;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->is_plugin_enabled = (FuzzyPropertyState (*)(ConfigurationEngine*, const gchar*)) gsettings_configuration_engine_real_is_plugin_enabled;
+	iface->is_plugin_enabled = (FuzzyPropertyState (*) (ConfigurationEngine *, const gchar*)) gsettings_configuration_engine_real_is_plugin_enabled;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	iface->set_plugin_enabled = (void (*)(ConfigurationEngine*, const gchar*, gboolean)) gsettings_configuration_engine_real_set_plugin_enabled;
-#line 5849 "GSettingsEngine.c"
+	iface->set_plugin_enabled = (void (*) (ConfigurationEngine *, const gchar*, gboolean)) gsettings_configuration_engine_real_set_plugin_enabled;
+#line 5891 "GSettingsEngine.c"
 }
 
 
 static void gsettings_configuration_engine_instance_init (GSettingsConfigurationEngine * self) {
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self->priv = GSETTINGS_CONFIGURATION_ENGINE_GET_PRIVATE (self);
-#line 5856 "GSettingsEngine.c"
+#line 5898 "GSettingsEngine.c"
 }
 
 
-static void gsettings_configuration_engine_finalize (GObject* obj) {
+static void gsettings_configuration_engine_finalize (GObject * obj) {
 	GSettingsConfigurationEngine * self;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -5866,7 +5908,7 @@ static void gsettings_configuration_engine_finalize (GObject* obj) {
 	self->priv->key_names = (_vala_array_free (self->priv->key_names, self->priv->key_names_length1, (GDestroyNotify) g_free), NULL);
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	G_OBJECT_CLASS (gsettings_configuration_engine_parent_class)->finalize (obj);
-#line 5870 "GSettingsEngine.c"
+#line 5912 "GSettingsEngine.c"
 }
 
 
diff --git a/src/core/Alteration.c b/src/core/Alteration.c
index b1e62b6..173f45f 100644
--- a/src/core/Alteration.c
+++ b/src/core/Alteration.c
@@ -1,4 +1,4 @@
-/* Alteration.c generated by valac 0.34.7, the Vala compiler
+/* Alteration.c generated by valac 0.36.6, the Vala compiler
  * generated from Alteration.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -111,7 +111,7 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other);
 gboolean alteration_equals (Alteration* self, Alteration* other);
 static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src);
 Alteration* alteration_compress (Alteration* self, Alteration* other);
-static void alteration_finalize (Alteration* obj);
+static void alteration_finalize (Alteration * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
@@ -119,8 +119,8 @@ static gint _vala_array_length (gpointer array);
 
 Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail) {
 	Alteration* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 #line 32 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (subject != NULL, NULL);
 #line 32 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -148,19 +148,19 @@ Alteration* alteration_new (const gchar* subject, const gchar* detail) {
 
 Alteration* alteration_construct_from_list (GType object_type, const gchar* list) {
 	Alteration* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	const gchar* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gchar** pairs = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gchar** _tmp5_ = NULL;
-	gint pairs_length1 = 0;
-	gint _pairs_size_ = 0;
-	gchar** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
+	const gchar* _tmp3_;
+	gchar** _tmp4_;
+	gchar** _tmp5_;
+	gint pairs_length1;
+	gint _pairs_size_;
+	gchar** _tmp6_;
+	gint _tmp6__length1;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
 #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (list != NULL, NULL);
 #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -206,7 +206,7 @@ Alteration* alteration_construct_from_list (GType object_type, const gchar* list
 #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		for (pair_it = 0; pair_it < _tmp7__length1; pair_it = pair_it + 1) {
 #line 209 "Alteration.c"
-			gchar* _tmp8_ = NULL;
+			gchar* _tmp8_;
 			gchar* pair = NULL;
 #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp8_ = g_strdup (pair_collection[pair_it]);
@@ -215,19 +215,19 @@ Alteration* alteration_construct_from_list (GType object_type, const gchar* list
 #line 216 "Alteration.c"
 			{
 				gchar** subject_detail = NULL;
-				const gchar* _tmp9_ = NULL;
-				gchar** _tmp10_ = NULL;
-				gchar** _tmp11_ = NULL;
-				gint subject_detail_length1 = 0;
-				gint _subject_detail_size_ = 0;
-				gchar** _tmp12_ = NULL;
-				gint _tmp12__length1 = 0;
-				gchar** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
-				const gchar* _tmp14_ = NULL;
-				gchar** _tmp15_ = NULL;
-				gint _tmp15__length1 = 0;
-				const gchar* _tmp16_ = NULL;
+				const gchar* _tmp9_;
+				gchar** _tmp10_;
+				gchar** _tmp11_;
+				gint subject_detail_length1;
+				gint _subject_detail_size_;
+				gchar** _tmp12_;
+				gint _tmp12__length1;
+				gchar** _tmp13_;
+				gint _tmp13__length1;
+				const gchar* _tmp14_;
+				gchar** _tmp15_;
+				gint _tmp15__length1;
+				const gchar* _tmp16_;
 #line 43 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				_tmp9_ = pair;
 #line 43 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -283,10 +283,10 @@ Alteration* alteration_new_from_list (const gchar* list) {
 
 Alteration* alteration_construct_from_array (GType object_type, gchar** array, int array_length1) {
 	Alteration* self = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
 #line 52 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	self = (Alteration*) g_type_create_instance (object_type);
 #line 52 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -312,7 +312,7 @@ Alteration* alteration_construct_from_array (GType object_type, gchar** array, i
 #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		for (pair_it = 0; pair_it < _tmp1__length1; pair_it = pair_it + 1) {
 #line 315 "Alteration.c"
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 			gchar* pair = NULL;
 #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp2_ = g_strdup (pair_collection[pair_it]);
@@ -321,19 +321,19 @@ Alteration* alteration_construct_from_array (GType object_type, gchar** array, i
 #line 322 "Alteration.c"
 			{
 				gchar** subject_detail = NULL;
-				const gchar* _tmp3_ = NULL;
-				gchar** _tmp4_ = NULL;
-				gchar** _tmp5_ = NULL;
-				gint subject_detail_length1 = 0;
-				gint _subject_detail_size_ = 0;
-				gchar** _tmp6_ = NULL;
-				gint _tmp6__length1 = 0;
-				gchar** _tmp7_ = NULL;
-				gint _tmp7__length1 = 0;
-				const gchar* _tmp8_ = NULL;
-				gchar** _tmp9_ = NULL;
-				gint _tmp9__length1 = 0;
-				const gchar* _tmp10_ = NULL;
+				const gchar* _tmp3_;
+				gchar** _tmp4_;
+				gchar** _tmp5_;
+				gint subject_detail_length1;
+				gint _subject_detail_size_;
+				gchar** _tmp6_;
+				gint _tmp6__length1;
+				gchar** _tmp7_;
+				gint _tmp7__length1;
+				const gchar* _tmp8_;
+				gchar** _tmp9_;
+				gint _tmp9__length1;
+				const gchar* _tmp10_;
 #line 54 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				_tmp3_ = pair;
 #line 54 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -394,8 +394,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static Alteration* alteration_construct_from_map (GType object_type, GeeMultiMap* map) {
 	Alteration* self = NULL;
-	GeeMultiMap* _tmp0_ = NULL;
-	GeeMultiMap* _tmp1_ = NULL;
+	GeeMultiMap* _tmp0_;
+	GeeMultiMap* _tmp1_;
 #line 62 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (GEE_IS_MULTI_MAP (map), NULL);
 #line 62 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -424,21 +424,21 @@ static Alteration* alteration_new_from_map (GeeMultiMap* map) {
 static gchar* string_strip (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 444 "Alteration.c"
 }
@@ -446,24 +446,24 @@ static gchar* string_strip (const gchar* self) {
 
 static void alteration_add_detail (Alteration* self, const gchar* sub, const gchar* det) {
 	gchar* subject = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	gchar* detail = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	const gchar* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
 	gboolean _tmp10_ = FALSE;
-	const gchar* _tmp11_ = NULL;
-	GeeMultiMap* _tmp18_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	GeeMultiMap* _tmp25_ = NULL;
-	const gchar* _tmp26_ = NULL;
-	const gchar* _tmp27_ = NULL;
+	const gchar* _tmp11_;
+	GeeMultiMap* _tmp18_;
+	const gchar* _tmp20_;
+	GeeMultiMap* _tmp25_;
+	const gchar* _tmp26_;
+	const gchar* _tmp27_;
 #line 66 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_if_fail (IS_ALTERATION (self));
 #line 66 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -503,7 +503,7 @@ static void alteration_add_detail (Alteration* self, const gchar* sub, const gch
 #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp11_ == NULL) {
 #line 506 "Alteration.c"
-		GeeMultiMap* _tmp12_ = NULL;
+		GeeMultiMap* _tmp12_;
 #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp12_ = self->priv->map;
 #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -517,11 +517,11 @@ static void alteration_add_detail (Alteration* self, const gchar* sub, const gch
 #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp10_) {
 #line 520 "Alteration.c"
-		const gchar* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
+		const gchar* _tmp13_;
+		const gchar* _tmp14_;
+		gchar* _tmp15_;
+		const gchar* _tmp16_;
+		gchar* _tmp17_;
 #line 76 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp13_ = self->priv->detail;
 #line 76 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -555,7 +555,7 @@ static void alteration_add_detail (Alteration* self, const gchar* sub, const gch
 #line 85 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp18_ == NULL) {
 #line 558 "Alteration.c"
-		GeeMultiMap* _tmp19_ = NULL;
+		GeeMultiMap* _tmp19_;
 #line 86 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp19_ = alteration_create_map (self);
 #line 86 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -569,10 +569,10 @@ static void alteration_add_detail (Alteration* self, const gchar* sub, const gch
 #line 89 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp20_ != NULL) {
 #line 572 "Alteration.c"
-		const gchar* _tmp21_ = NULL;
-		GeeMultiMap* _tmp22_ = NULL;
-		const gchar* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
+		const gchar* _tmp21_;
+		GeeMultiMap* _tmp22_;
+		const gchar* _tmp23_;
+		const gchar* _tmp24_;
 #line 90 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp21_ = self->priv->detail;
 #line 90 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -631,7 +631,7 @@ static gboolean _alteration_case_equal_gee_equal_data_func (gconstpointer a, gco
 
 static GeeMultiMap* alteration_create_map (Alteration* self) {
 	GeeMultiMap* result = NULL;
-	GeeHashMultiMap* _tmp0_ = NULL;
+	GeeHashMultiMap* _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (IS_ALTERATION (self), NULL);
 #line 102 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -646,9 +646,9 @@ static GeeMultiMap* alteration_create_map (Alteration* self) {
 
 static gboolean alteration_case_equal (const gchar* a, const gchar* b) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 106 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	_tmp0_ = a;
 #line 106 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -665,8 +665,8 @@ static gboolean alteration_case_equal (const gchar* a, const gchar* b) {
 
 static guint alteration_case_hash (const gchar* a) {
 	guint result = 0U;
-	const gchar* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	const gchar* _tmp0_;
+	guint _tmp1_;
 #line 110 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	_tmp0_ = a;
 #line 110 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -681,9 +681,9 @@ static guint alteration_case_hash (const gchar* a) {
 
 static inline gboolean alteration_equal_values (const gchar* str1, const gchar* str2) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gint _tmp2_;
 #line 113 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (str1 != NULL, FALSE);
 #line 113 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -704,9 +704,9 @@ static inline gboolean alteration_equal_values (const gchar* str1, const gchar*
 
 static inline guint alteration_hash_value (const gchar* str) {
 	guint result = 0U;
-	GHashFunc _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
+	GHashFunc _tmp0_;
+	const gchar* _tmp1_;
+	guint _tmp2_;
 #line 117 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (str != NULL, 0U);
 #line 118 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -725,12 +725,12 @@ static inline guint alteration_hash_value (const gchar* str) {
 
 gboolean alteration_has_subject (Alteration* self, const gchar* subject) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	GeeMultiMap* _tmp4_ = NULL;
+	const gchar* _tmp0_;
+	GeeMultiMap* _tmp4_;
 	GeeSet* keys = NULL;
-	GeeMultiMap* _tmp5_ = NULL;
-	GeeSet* _tmp6_ = NULL;
-	GeeSet* _tmp7_ = NULL;
+	GeeMultiMap* _tmp5_;
+	GeeSet* _tmp6_;
+	GeeSet* _tmp7_;
 #line 121 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (IS_ALTERATION (self), FALSE);
 #line 121 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -740,9 +740,9 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) {
 #line 122 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp0_ != NULL) {
 #line 743 "Alteration.c"
-		const gchar* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+		const gchar* _tmp1_;
+		const gchar* _tmp2_;
+		gboolean _tmp3_;
 #line 123 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp1_ = self->priv->subject;
 #line 123 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -772,8 +772,8 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) {
 #line 773 "Alteration.c"
 		{
 			GeeIterator* _key_it = NULL;
-			GeeSet* _tmp8_ = NULL;
-			GeeIterator* _tmp9_ = NULL;
+			GeeSet* _tmp8_;
+			GeeIterator* _tmp9_;
 #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp8_ = keys;
 #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -783,14 +783,14 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) {
 #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			while (TRUE) {
 #line 786 "Alteration.c"
-				GeeIterator* _tmp10_ = NULL;
-				gboolean _tmp11_ = FALSE;
+				GeeIterator* _tmp10_;
+				gboolean _tmp11_;
 				gchar* key = NULL;
-				GeeIterator* _tmp12_ = NULL;
-				gpointer _tmp13_ = NULL;
-				const gchar* _tmp14_ = NULL;
-				const gchar* _tmp15_ = NULL;
-				gboolean _tmp16_ = FALSE;
+				GeeIterator* _tmp12_;
+				gpointer _tmp13_;
+				const gchar* _tmp14_;
+				const gchar* _tmp15_;
+				gboolean _tmp16_;
 #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				_tmp10_ = _key_it;
 #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -849,13 +849,13 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) {
 gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	GeeMultiMap* _tmp10_ = NULL;
+	const gchar* _tmp1_;
+	GeeMultiMap* _tmp10_;
 	GeeCollection* values = NULL;
-	GeeMultiMap* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	GeeCollection* _tmp13_ = NULL;
-	GeeCollection* _tmp14_ = NULL;
+	GeeMultiMap* _tmp11_;
+	const gchar* _tmp12_;
+	GeeCollection* _tmp13_;
+	GeeCollection* _tmp14_;
 #line 137 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (IS_ALTERATION (self), FALSE);
 #line 137 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -867,7 +867,7 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc
 #line 138 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp1_ != NULL) {
 #line 870 "Alteration.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 138 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp2_ = self->priv->detail;
 #line 138 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -882,9 +882,9 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc
 	if (_tmp0_) {
 #line 884 "Alteration.c"
 		gboolean _tmp3_ = FALSE;
-		const gchar* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		const gchar* _tmp4_;
+		const gchar* _tmp5_;
+		gboolean _tmp6_;
 #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp4_ = self->priv->subject;
 #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -894,9 +894,9 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc
 #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (_tmp6_) {
 #line 897 "Alteration.c"
-			const gchar* _tmp7_ = NULL;
-			const gchar* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			const gchar* _tmp7_;
+			const gchar* _tmp8_;
+			gboolean _tmp9_;
 #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp7_ = self->priv->detail;
 #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -936,8 +936,8 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc
 #line 937 "Alteration.c"
 		{
 			GeeIterator* _value_it = NULL;
-			GeeCollection* _tmp15_ = NULL;
-			GeeIterator* _tmp16_ = NULL;
+			GeeCollection* _tmp15_;
+			GeeIterator* _tmp16_;
 #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp15_ = values;
 #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -947,14 +947,14 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc
 #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			while (TRUE) {
 #line 950 "Alteration.c"
-				GeeIterator* _tmp17_ = NULL;
-				gboolean _tmp18_ = FALSE;
+				GeeIterator* _tmp17_;
+				gboolean _tmp18_;
 				gchar* value = NULL;
-				GeeIterator* _tmp19_ = NULL;
-				gpointer _tmp20_ = NULL;
-				const gchar* _tmp21_ = NULL;
-				const gchar* _tmp22_ = NULL;
-				gboolean _tmp23_ = FALSE;
+				GeeIterator* _tmp19_;
+				gpointer _tmp20_;
+				const gchar* _tmp21_;
+				const gchar* _tmp22_;
+				gboolean _tmp23_;
 #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				_tmp17_ = _value_it;
 #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1014,9 +1014,9 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) {
 	GeeCollection* result = NULL;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp2_;
 	GeeCollection* _tmp10_ = NULL;
-	GeeMultiMap* _tmp11_ = NULL;
+	GeeMultiMap* _tmp11_;
 #line 153 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (IS_ALTERATION (self), NULL);
 #line 153 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1026,7 +1026,7 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) {
 #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp2_ != NULL) {
 #line 1029 "Alteration.c"
-		const gchar* _tmp3_ = NULL;
+		const gchar* _tmp3_;
 #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp3_ = self->priv->detail;
 #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1040,9 +1040,9 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) {
 #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp1_) {
 #line 1043 "Alteration.c"
-		const gchar* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		const gchar* _tmp4_;
+		const gchar* _tmp5_;
+		gboolean _tmp6_;
 #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp4_ = self->priv->subject;
 #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1061,9 +1061,9 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) {
 	if (_tmp0_) {
 #line 1063 "Alteration.c"
 		GeeArrayList* details = NULL;
-		GeeArrayList* _tmp7_ = NULL;
-		GeeArrayList* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
+		GeeArrayList* _tmp7_;
+		GeeArrayList* _tmp8_;
+		const gchar* _tmp9_;
 #line 155 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 155 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1085,9 +1085,9 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) {
 #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp11_ != NULL) {
 #line 1088 "Alteration.c"
-		GeeMultiMap* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		GeeCollection* _tmp14_ = NULL;
+		GeeMultiMap* _tmp12_;
+		const gchar* _tmp13_;
+		GeeCollection* _tmp14_;
 #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp12_ = self->priv->map;
 #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1116,10 +1116,10 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) {
 
 gchar* alteration_to_string (Alteration* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	GeeMultiMap* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	GeeMultiMap* _tmp5_;
 	gchar* str = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar* _tmp6_;
 #line 164 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (IS_ALTERATION (self), NULL);
 #line 165 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1127,10 +1127,10 @@ gchar* alteration_to_string (Alteration* self) {
 #line 165 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp0_ != NULL) {
 #line 1130 "Alteration.c"
-		const gchar* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
+		const gchar* _tmp1_;
+		const gchar* _tmp2_;
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
 #line 166 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp1_ = self->priv->detail;
 #line 166 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1158,11 +1158,11 @@ gchar* alteration_to_string (Alteration* self) {
 #line 1159 "Alteration.c"
 	{
 		GeeIterator* _key_it = NULL;
-		GeeMultiMap* _tmp7_ = NULL;
-		GeeSet* _tmp8_ = NULL;
-		GeeSet* _tmp9_ = NULL;
-		GeeIterator* _tmp10_ = NULL;
-		GeeIterator* _tmp11_ = NULL;
+		GeeMultiMap* _tmp7_;
+		GeeSet* _tmp8_;
+		GeeSet* _tmp9_;
+		GeeIterator* _tmp10_;
+		GeeIterator* _tmp11_;
 #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp7_ = self->priv->map;
 #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1180,11 +1180,11 @@ gchar* alteration_to_string (Alteration* self) {
 #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		while (TRUE) {
 #line 1183 "Alteration.c"
-			GeeIterator* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
+			GeeIterator* _tmp12_;
+			gboolean _tmp13_;
 			gchar* key = NULL;
-			GeeIterator* _tmp14_ = NULL;
-			gpointer _tmp15_ = NULL;
+			GeeIterator* _tmp14_;
+			gpointer _tmp15_;
 #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp12_ = _key_it;
 #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1204,12 +1204,12 @@ gchar* alteration_to_string (Alteration* self) {
 #line 1205 "Alteration.c"
 			{
 				GeeIterator* _value_it = NULL;
-				GeeMultiMap* _tmp16_ = NULL;
-				const gchar* _tmp17_ = NULL;
-				GeeCollection* _tmp18_ = NULL;
-				GeeCollection* _tmp19_ = NULL;
-				GeeIterator* _tmp20_ = NULL;
-				GeeIterator* _tmp21_ = NULL;
+				GeeMultiMap* _tmp16_;
+				const gchar* _tmp17_;
+				GeeCollection* _tmp18_;
+				GeeCollection* _tmp19_;
+				GeeIterator* _tmp20_;
+				GeeIterator* _tmp21_;
 #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				_tmp16_ = self->priv->map;
 #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1229,20 +1229,20 @@ gchar* alteration_to_string (Alteration* self) {
 #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				while (TRUE) {
 #line 1232 "Alteration.c"
-					GeeIterator* _tmp22_ = NULL;
-					gboolean _tmp23_ = FALSE;
+					GeeIterator* _tmp22_;
+					gboolean _tmp23_;
 					gchar* value = NULL;
-					GeeIterator* _tmp24_ = NULL;
-					gpointer _tmp25_ = NULL;
-					const gchar* _tmp26_ = NULL;
-					gint _tmp27_ = 0;
-					gint _tmp28_ = 0;
-					const gchar* _tmp31_ = NULL;
-					const gchar* _tmp32_ = NULL;
-					const gchar* _tmp33_ = NULL;
-					gchar* _tmp34_ = NULL;
-					gchar* _tmp35_ = NULL;
-					gchar* _tmp36_ = NULL;
+					GeeIterator* _tmp24_;
+					gpointer _tmp25_;
+					const gchar* _tmp26_;
+					gint _tmp27_;
+					gint _tmp28_;
+					const gchar* _tmp31_;
+					const gchar* _tmp32_;
+					const gchar* _tmp33_;
+					gchar* _tmp34_;
+					gchar* _tmp35_;
+					gchar* _tmp36_;
 #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 					_tmp22_ = _value_it;
 #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1268,8 +1268,8 @@ gchar* alteration_to_string (Alteration* self) {
 #line 176 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 					if (_tmp28_ != 0) {
 #line 1271 "Alteration.c"
-						const gchar* _tmp29_ = NULL;
-						gchar* _tmp30_ = NULL;
+						const gchar* _tmp29_;
+						gchar* _tmp30_;
 #line 177 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 						_tmp29_ = str;
 #line 177 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1324,16 +1324,16 @@ gchar* alteration_to_string (Alteration* self) {
 
 gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
+	Alteration* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-	const gchar* _tmp4_ = NULL;
+	const gchar* _tmp4_;
 	gboolean _tmp19_ = FALSE;
 	gboolean _tmp20_ = FALSE;
-	GeeMultiMap* _tmp21_ = NULL;
+	GeeMultiMap* _tmp21_;
 	gboolean _tmp56_ = FALSE;
-	GeeMultiMap* _tmp57_ = NULL;
+	GeeMultiMap* _tmp57_;
 #line 187 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (IS_ALTERATION (self), FALSE);
 #line 187 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1353,8 +1353,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp4_ != NULL) {
 #line 1356 "Alteration.c"
-		Alteration* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+		Alteration* _tmp5_;
+		const gchar* _tmp6_;
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp5_ = other;
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1370,7 +1370,7 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp3_) {
 #line 1373 "Alteration.c"
-		const gchar* _tmp7_ = NULL;
+		const gchar* _tmp7_;
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp7_ = self->priv->detail;
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1384,8 +1384,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp2_) {
 #line 1387 "Alteration.c"
-		Alteration* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
+		Alteration* _tmp8_;
+		const gchar* _tmp9_;
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp8_ = other;
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1402,10 +1402,10 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 	if (_tmp1_) {
 #line 1404 "Alteration.c"
 		gboolean _tmp10_ = FALSE;
-		const gchar* _tmp11_ = NULL;
-		Alteration* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		gboolean _tmp14_ = FALSE;
+		const gchar* _tmp11_;
+		Alteration* _tmp12_;
+		const gchar* _tmp13_;
+		gboolean _tmp14_;
 #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp11_ = self->priv->subject;
 #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1417,10 +1417,10 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (_tmp14_) {
 #line 1420 "Alteration.c"
-			const gchar* _tmp15_ = NULL;
-			Alteration* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
+			const gchar* _tmp15_;
+			Alteration* _tmp16_;
+			const gchar* _tmp17_;
+			gboolean _tmp18_;
 #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp15_ = self->priv->detail;
 #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1448,8 +1448,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp21_ != NULL) {
 #line 1451 "Alteration.c"
-		Alteration* _tmp22_ = NULL;
-		GeeMultiMap* _tmp23_ = NULL;
+		Alteration* _tmp22_;
+		GeeMultiMap* _tmp23_;
 #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp22_ = other;
 #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1469,14 +1469,14 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 1470 "Alteration.c"
 	} else {
 		gboolean _tmp24_ = FALSE;
-		GeeMultiMap* _tmp25_ = NULL;
+		GeeMultiMap* _tmp25_;
 #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp25_ = self->priv->map;
 #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (_tmp25_ == NULL) {
 #line 1478 "Alteration.c"
-			Alteration* _tmp26_ = NULL;
-			GeeMultiMap* _tmp27_ = NULL;
+			Alteration* _tmp26_;
+			GeeMultiMap* _tmp27_;
 #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp26_ = other;
 #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1497,35 +1497,35 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 	if (_tmp19_) {
 #line 1499 "Alteration.c"
 		const gchar* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
+		const gchar* _tmp29_;
 		gchar* single_subject = NULL;
-		gchar* _tmp33_ = NULL;
+		gchar* _tmp33_;
 		const gchar* _tmp34_ = NULL;
-		const gchar* _tmp35_ = NULL;
+		const gchar* _tmp35_;
 		gchar* single_detail = NULL;
-		gchar* _tmp39_ = NULL;
+		gchar* _tmp39_;
 		GeeMultiMap* _tmp40_ = NULL;
-		GeeMultiMap* _tmp41_ = NULL;
+		GeeMultiMap* _tmp41_;
 		GeeMultiMap* multimap = NULL;
-		GeeMultiMap* _tmp45_ = NULL;
+		GeeMultiMap* _tmp45_;
 		gboolean _tmp46_ = FALSE;
-		GeeMultiMap* _tmp47_ = NULL;
-		const gchar* _tmp48_ = NULL;
-		gboolean _tmp49_ = FALSE;
+		GeeMultiMap* _tmp47_;
+		const gchar* _tmp48_;
+		gboolean _tmp49_;
 #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp29_ = self->priv->subject;
 #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (_tmp29_ != NULL) {
 #line 1520 "Alteration.c"
-			const gchar* _tmp30_ = NULL;
+			const gchar* _tmp30_;
 #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp30_ = self->priv->subject;
 #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp28_ = _tmp30_;
 #line 1526 "Alteration.c"
 		} else {
-			Alteration* _tmp31_ = NULL;
-			const gchar* _tmp32_ = NULL;
+			Alteration* _tmp31_;
+			const gchar* _tmp32_;
 #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp31_ = other;
 #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1543,15 +1543,15 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (_tmp35_ != NULL) {
 #line 1546 "Alteration.c"
-			const gchar* _tmp36_ = NULL;
+			const gchar* _tmp36_;
 #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp36_ = self->priv->detail;
 #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp34_ = _tmp36_;
 #line 1552 "Alteration.c"
 		} else {
-			Alteration* _tmp37_ = NULL;
-			const gchar* _tmp38_ = NULL;
+			Alteration* _tmp37_;
+			const gchar* _tmp38_;
 #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp37_ = other;
 #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1569,15 +1569,15 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (_tmp41_ != NULL) {
 #line 1572 "Alteration.c"
-			GeeMultiMap* _tmp42_ = NULL;
+			GeeMultiMap* _tmp42_;
 #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp42_ = self->priv->map;
 #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp40_ = _tmp42_;
 #line 1578 "Alteration.c"
 		} else {
-			Alteration* _tmp43_ = NULL;
-			GeeMultiMap* _tmp44_ = NULL;
+			Alteration* _tmp43_;
+			GeeMultiMap* _tmp44_;
 #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp43_ = other;
 #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1599,12 +1599,12 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (_tmp49_) {
 #line 1602 "Alteration.c"
-			GeeMultiMap* _tmp50_ = NULL;
-			const gchar* _tmp51_ = NULL;
-			GeeCollection* _tmp52_ = NULL;
-			GeeCollection* _tmp53_ = NULL;
-			const gchar* _tmp54_ = NULL;
-			gboolean _tmp55_ = FALSE;
+			GeeMultiMap* _tmp50_;
+			const gchar* _tmp51_;
+			GeeCollection* _tmp52_;
+			GeeCollection* _tmp53_;
+			const gchar* _tmp54_;
+			gboolean _tmp55_;
 #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp50_ = self->priv->map;
 #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1644,8 +1644,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp57_ != NULL) {
 #line 1647 "Alteration.c"
-		Alteration* _tmp58_ = NULL;
-		GeeMultiMap* _tmp59_ = NULL;
+		Alteration* _tmp58_;
+		GeeMultiMap* _tmp59_;
 #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp58_ = other;
 #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1662,14 +1662,14 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 	if (_tmp56_) {
 #line 1664 "Alteration.c"
 		GeeSet* keys = NULL;
-		GeeMultiMap* _tmp60_ = NULL;
-		GeeSet* _tmp61_ = NULL;
-		GeeSet* _tmp62_ = NULL;
+		GeeMultiMap* _tmp60_;
+		GeeSet* _tmp61_;
+		GeeSet* _tmp62_;
 		GeeSet* other_keys = NULL;
-		Alteration* _tmp63_ = NULL;
-		GeeMultiMap* _tmp64_ = NULL;
-		GeeSet* _tmp65_ = NULL;
-		GeeSet* _tmp66_ = NULL;
+		Alteration* _tmp63_;
+		GeeMultiMap* _tmp64_;
+		GeeSet* _tmp65_;
+		GeeSet* _tmp66_;
 #line 207 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp60_ = self->priv->map;
 #line 207 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1695,8 +1695,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 1696 "Alteration.c"
 		{
 			GeeIterator* _subject_it = NULL;
-			GeeSet* _tmp67_ = NULL;
-			GeeIterator* _tmp68_ = NULL;
+			GeeSet* _tmp67_;
+			GeeIterator* _tmp68_;
 #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp67_ = other_keys;
 #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1706,25 +1706,25 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			while (TRUE) {
 #line 1709 "Alteration.c"
-				GeeIterator* _tmp69_ = NULL;
-				gboolean _tmp70_ = FALSE;
+				GeeIterator* _tmp69_;
+				gboolean _tmp70_;
 				gchar* subject = NULL;
-				GeeIterator* _tmp71_ = NULL;
-				gpointer _tmp72_ = NULL;
-				GeeSet* _tmp73_ = NULL;
-				const gchar* _tmp74_ = NULL;
-				gboolean _tmp75_ = FALSE;
+				GeeIterator* _tmp71_;
+				gpointer _tmp72_;
+				GeeSet* _tmp73_;
+				const gchar* _tmp74_;
+				gboolean _tmp75_;
 				GeeCollection* details = NULL;
-				GeeMultiMap* _tmp76_ = NULL;
-				const gchar* _tmp77_ = NULL;
-				GeeCollection* _tmp78_ = NULL;
+				GeeMultiMap* _tmp76_;
+				const gchar* _tmp77_;
+				GeeCollection* _tmp78_;
 				GeeCollection* other_details = NULL;
-				Alteration* _tmp79_ = NULL;
-				GeeMultiMap* _tmp80_ = NULL;
-				const gchar* _tmp81_ = NULL;
-				GeeCollection* _tmp82_ = NULL;
+				Alteration* _tmp79_;
+				GeeMultiMap* _tmp80_;
+				const gchar* _tmp81_;
+				GeeCollection* _tmp82_;
 				gboolean _tmp83_ = FALSE;
-				GeeCollection* _tmp84_ = NULL;
+				GeeCollection* _tmp84_;
 #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				_tmp69_ = _subject_it;
 #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1778,7 +1778,7 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				if (_tmp84_ != NULL) {
 #line 1781 "Alteration.c"
-					GeeCollection* _tmp85_ = NULL;
+					GeeCollection* _tmp85_;
 #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 					_tmp85_ = other_details;
 #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1794,8 +1794,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 1795 "Alteration.c"
 					{
 						GeeIterator* _detail_it = NULL;
-						GeeCollection* _tmp86_ = NULL;
-						GeeIterator* _tmp87_ = NULL;
+						GeeCollection* _tmp86_;
+						GeeIterator* _tmp87_;
 #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 						_tmp86_ = other_details;
 #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1805,14 +1805,14 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 						while (TRUE) {
 #line 1808 "Alteration.c"
-							GeeIterator* _tmp88_ = NULL;
-							gboolean _tmp89_ = FALSE;
+							GeeIterator* _tmp88_;
+							gboolean _tmp89_;
 							gchar* detail = NULL;
-							GeeIterator* _tmp90_ = NULL;
-							gpointer _tmp91_ = NULL;
-							GeeCollection* _tmp92_ = NULL;
-							const gchar* _tmp93_ = NULL;
-							gboolean _tmp94_ = FALSE;
+							GeeIterator* _tmp90_;
+							gpointer _tmp91_;
+							GeeCollection* _tmp92_;
+							const gchar* _tmp93_;
+							gboolean _tmp94_;
 #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 							_tmp88_ = _detail_it;
 #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1896,13 +1896,13 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 
 gboolean alteration_equals (Alteration* self, Alteration* other) {
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
+	Alteration* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-	const gchar* _tmp4_ = NULL;
+	const gchar* _tmp4_;
 	gboolean _tmp19_ = FALSE;
-	GeeMultiMap* _tmp20_ = NULL;
+	GeeMultiMap* _tmp20_;
 #line 231 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (IS_ALTERATION (self), FALSE);
 #line 231 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1922,8 +1922,8 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp4_ != NULL) {
 #line 1925 "Alteration.c"
-		Alteration* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+		Alteration* _tmp5_;
+		const gchar* _tmp6_;
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp5_ = other;
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1939,7 +1939,7 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp3_) {
 #line 1942 "Alteration.c"
-		const gchar* _tmp7_ = NULL;
+		const gchar* _tmp7_;
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp7_ = self->priv->detail;
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1953,8 +1953,8 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp2_) {
 #line 1956 "Alteration.c"
-		Alteration* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
+		Alteration* _tmp8_;
+		const gchar* _tmp9_;
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp8_ = other;
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1971,10 +1971,10 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 	if (_tmp1_) {
 #line 1973 "Alteration.c"
 		gboolean _tmp10_ = FALSE;
-		const gchar* _tmp11_ = NULL;
-		Alteration* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		gboolean _tmp14_ = FALSE;
+		const gchar* _tmp11_;
+		Alteration* _tmp12_;
+		const gchar* _tmp13_;
+		gboolean _tmp14_;
 #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp11_ = self->priv->subject;
 #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1986,10 +1986,10 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (_tmp14_) {
 #line 1989 "Alteration.c"
-			const gchar* _tmp15_ = NULL;
-			Alteration* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
+			const gchar* _tmp15_;
+			Alteration* _tmp16_;
+			const gchar* _tmp17_;
+			gboolean _tmp18_;
 #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp15_ = self->priv->detail;
 #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2017,8 +2017,8 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp20_ != NULL) {
 #line 2020 "Alteration.c"
-		Alteration* _tmp21_ = NULL;
-		GeeMultiMap* _tmp22_ = NULL;
+		Alteration* _tmp21_;
+		GeeMultiMap* _tmp22_;
 #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp21_ = other;
 #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2035,26 +2035,26 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 	if (_tmp19_) {
 #line 2037 "Alteration.c"
 		GeeSet* keys = NULL;
-		GeeMultiMap* _tmp23_ = NULL;
-		GeeSet* _tmp24_ = NULL;
-		GeeSet* _tmp25_ = NULL;
+		GeeMultiMap* _tmp23_;
+		GeeSet* _tmp24_;
+		GeeSet* _tmp25_;
 		GeeSet* other_keys = NULL;
-		Alteration* _tmp26_ = NULL;
-		GeeMultiMap* _tmp27_ = NULL;
-		GeeSet* _tmp28_ = NULL;
-		GeeSet* _tmp29_ = NULL;
-		GeeSet* _tmp30_ = NULL;
-		gint _tmp31_ = 0;
-		gint _tmp32_ = 0;
-		GeeSet* _tmp33_ = NULL;
-		gint _tmp34_ = 0;
-		gint _tmp35_ = 0;
-		GeeSet* _tmp36_ = NULL;
-		GeeSet* _tmp37_ = NULL;
-		gboolean _tmp38_ = FALSE;
-		GeeSet* _tmp39_ = NULL;
-		GeeSet* _tmp40_ = NULL;
-		gboolean _tmp41_ = FALSE;
+		Alteration* _tmp26_;
+		GeeMultiMap* _tmp27_;
+		GeeSet* _tmp28_;
+		GeeSet* _tmp29_;
+		GeeSet* _tmp30_;
+		gint _tmp31_;
+		gint _tmp32_;
+		GeeSet* _tmp33_;
+		gint _tmp34_;
+		gint _tmp35_;
+		GeeSet* _tmp36_;
+		GeeSet* _tmp37_;
+		gboolean _tmp38_;
+		GeeSet* _tmp39_;
+		GeeSet* _tmp40_;
+		gboolean _tmp41_;
 #line 243 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp23_ = self->priv->map;
 #line 243 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2139,8 +2139,8 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 		}
 		{
 			GeeIterator* _key_it = NULL;
-			GeeSet* _tmp42_ = NULL;
-			GeeIterator* _tmp43_ = NULL;
+			GeeSet* _tmp42_;
+			GeeIterator* _tmp43_;
 #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp42_ = keys;
 #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2150,32 +2150,32 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			while (TRUE) {
 #line 2153 "Alteration.c"
-				GeeIterator* _tmp44_ = NULL;
-				gboolean _tmp45_ = FALSE;
+				GeeIterator* _tmp44_;
+				gboolean _tmp45_;
 				gchar* key = NULL;
-				GeeIterator* _tmp46_ = NULL;
-				gpointer _tmp47_ = NULL;
+				GeeIterator* _tmp46_;
+				gpointer _tmp47_;
 				GeeCollection* values = NULL;
-				GeeMultiMap* _tmp48_ = NULL;
-				const gchar* _tmp49_ = NULL;
-				GeeCollection* _tmp50_ = NULL;
+				GeeMultiMap* _tmp48_;
+				const gchar* _tmp49_;
+				GeeCollection* _tmp50_;
 				GeeCollection* other_values = NULL;
-				Alteration* _tmp51_ = NULL;
-				GeeMultiMap* _tmp52_ = NULL;
-				const gchar* _tmp53_ = NULL;
-				GeeCollection* _tmp54_ = NULL;
-				GeeCollection* _tmp55_ = NULL;
-				gint _tmp56_ = 0;
-				gint _tmp57_ = 0;
-				GeeCollection* _tmp58_ = NULL;
-				gint _tmp59_ = 0;
-				gint _tmp60_ = 0;
-				GeeCollection* _tmp61_ = NULL;
-				GeeCollection* _tmp62_ = NULL;
-				gboolean _tmp63_ = FALSE;
-				GeeCollection* _tmp64_ = NULL;
-				GeeCollection* _tmp65_ = NULL;
-				gboolean _tmp66_ = FALSE;
+				Alteration* _tmp51_;
+				GeeMultiMap* _tmp52_;
+				const gchar* _tmp53_;
+				GeeCollection* _tmp54_;
+				GeeCollection* _tmp55_;
+				gint _tmp56_;
+				gint _tmp57_;
+				GeeCollection* _tmp58_;
+				gint _tmp59_;
+				gint _tmp60_;
+				GeeCollection* _tmp61_;
+				GeeCollection* _tmp62_;
+				gboolean _tmp63_;
+				GeeCollection* _tmp64_;
+				GeeCollection* _tmp65_;
+				gboolean _tmp66_;
 #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				_tmp44_ = _key_it;
 #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2326,8 +2326,8 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 
 static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src) {
 	GeeSet* keys = NULL;
-	GeeMultiMap* _tmp0_ = NULL;
-	GeeSet* _tmp1_ = NULL;
+	GeeMultiMap* _tmp0_;
+	GeeSet* _tmp1_;
 #line 279 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_if_fail (GEE_IS_MULTI_MAP (dest));
 #line 279 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2341,8 +2341,8 @@ static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src) {
 #line 2342 "Alteration.c"
 	{
 		GeeIterator* _key_it = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeSet* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp2_ = keys;
 #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2352,15 +2352,15 @@ static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src) {
 #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		while (TRUE) {
 #line 2355 "Alteration.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			gchar* key = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
 			GeeCollection* values = NULL;
-			GeeMultiMap* _tmp8_ = NULL;
-			const gchar* _tmp9_ = NULL;
-			GeeCollection* _tmp10_ = NULL;
+			GeeMultiMap* _tmp8_;
+			const gchar* _tmp9_;
+			GeeCollection* _tmp10_;
 #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp4_ = _key_it;
 #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2388,8 +2388,8 @@ static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src) {
 #line 2389 "Alteration.c"
 			{
 				GeeIterator* _value_it = NULL;
-				GeeCollection* _tmp11_ = NULL;
-				GeeIterator* _tmp12_ = NULL;
+				GeeCollection* _tmp11_;
+				GeeIterator* _tmp12_;
 #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				_tmp11_ = values;
 #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2399,14 +2399,14 @@ static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src) {
 #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				while (TRUE) {
 #line 2402 "Alteration.c"
-					GeeIterator* _tmp13_ = NULL;
-					gboolean _tmp14_ = FALSE;
+					GeeIterator* _tmp13_;
+					gboolean _tmp14_;
 					gchar* value = NULL;
-					GeeIterator* _tmp15_ = NULL;
-					gpointer _tmp16_ = NULL;
-					GeeMultiMap* _tmp17_ = NULL;
-					const gchar* _tmp18_ = NULL;
-					const gchar* _tmp19_ = NULL;
+					GeeIterator* _tmp15_;
+					gpointer _tmp16_;
+					GeeMultiMap* _tmp17_;
+					const gchar* _tmp18_;
+					const gchar* _tmp19_;
 #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 					_tmp13_ = _value_it;
 #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2464,17 +2464,17 @@ static gpointer _alteration_ref0 (gpointer self) {
 
 Alteration* alteration_compress (Alteration* self, Alteration* other) {
 	Alteration* result = NULL;
-	Alteration* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Alteration* _tmp0_;
+	gboolean _tmp1_;
 	GeeMultiMap* compressed = NULL;
-	GeeMultiMap* _tmp3_ = NULL;
+	GeeMultiMap* _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	const gchar* _tmp5_ = NULL;
+	const gchar* _tmp5_;
 	gboolean _tmp13_ = FALSE;
-	Alteration* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	GeeMultiMap* _tmp28_ = NULL;
-	Alteration* _tmp29_ = NULL;
+	Alteration* _tmp14_;
+	const gchar* _tmp15_;
+	GeeMultiMap* _tmp28_;
+	Alteration* _tmp29_;
 #line 291 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (IS_ALTERATION (self), NULL);
 #line 291 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2486,7 +2486,7 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) {
 #line 292 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp1_) {
 #line 2489 "Alteration.c"
-		Alteration* _tmp2_ = NULL;
+		Alteration* _tmp2_;
 #line 293 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp2_ = _alteration_ref0 (self);
 #line 293 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2504,7 +2504,7 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) {
 #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp5_ != NULL) {
 #line 2507 "Alteration.c"
-		const gchar* _tmp6_ = NULL;
+		const gchar* _tmp6_;
 #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp6_ = self->priv->detail;
 #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2518,9 +2518,9 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) {
 #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp4_) {
 #line 2521 "Alteration.c"
-		GeeMultiMap* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
+		GeeMultiMap* _tmp7_;
+		const gchar* _tmp8_;
+		const gchar* _tmp9_;
 #line 300 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp7_ = compressed;
 #line 300 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2531,9 +2531,9 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) {
 		gee_multi_map_set (_tmp7_, _tmp8_, _tmp9_);
 #line 2533 "Alteration.c"
 	} else {
-		GeeMultiMap* _tmp10_ = NULL;
-		GeeMultiMap* _tmp11_ = NULL;
-		GeeMultiMap* _tmp12_ = NULL;
+		GeeMultiMap* _tmp10_;
+		GeeMultiMap* _tmp11_;
+		GeeMultiMap* _tmp12_;
 #line 302 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp10_ = self->priv->map;
 #line 302 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2553,8 +2553,8 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) {
 #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp15_ != NULL) {
 #line 2556 "Alteration.c"
-		Alteration* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
+		Alteration* _tmp16_;
+		const gchar* _tmp17_;
 #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp16_ = other;
 #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2570,11 +2570,11 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) {
 #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp13_) {
 #line 2573 "Alteration.c"
-		GeeMultiMap* _tmp18_ = NULL;
-		Alteration* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		Alteration* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
+		GeeMultiMap* _tmp18_;
+		Alteration* _tmp19_;
+		const gchar* _tmp20_;
+		Alteration* _tmp21_;
+		const gchar* _tmp22_;
 #line 307 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp18_ = compressed;
 #line 307 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2589,11 +2589,11 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) {
 		gee_multi_map_set (_tmp18_, _tmp20_, _tmp22_);
 #line 2591 "Alteration.c"
 	} else {
-		Alteration* _tmp23_ = NULL;
-		GeeMultiMap* _tmp24_ = NULL;
-		GeeMultiMap* _tmp25_ = NULL;
-		Alteration* _tmp26_ = NULL;
-		GeeMultiMap* _tmp27_ = NULL;
+		Alteration* _tmp23_;
+		GeeMultiMap* _tmp24_;
+		GeeMultiMap* _tmp25_;
+		Alteration* _tmp26_;
+		GeeMultiMap* _tmp27_;
 #line 309 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp23_ = other;
 #line 309 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2666,7 +2666,7 @@ static gchar* value_alteration_collect_value (GValue* value, guint n_collect_val
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (collect_values[0].v_pointer) {
 #line 2669 "Alteration.c"
-		Alteration* object;
+		Alteration * object;
 		object = collect_values[0].v_pointer;
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -2693,7 +2693,7 @@ static gchar* value_alteration_collect_value (GValue* value, guint n_collect_val
 
 
 static gchar* value_alteration_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	Alteration** object_p;
+	Alteration ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (!object_p) {
@@ -2745,7 +2745,7 @@ gpointer value_get_alteration (const GValue* value) {
 
 
 void value_set_alteration (GValue* value, gpointer v_object) {
-	Alteration* old;
+	Alteration * old;
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ALTERATION));
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2776,7 +2776,7 @@ void value_set_alteration (GValue* value, gpointer v_object) {
 
 
 void value_take_alteration (GValue* value, gpointer v_object) {
-	Alteration* old;
+	Alteration * old;
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ALTERATION));
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2830,7 +2830,7 @@ static void alteration_instance_init (Alteration * self) {
 }
 
 
-static void alteration_finalize (Alteration* obj) {
+static void alteration_finalize (Alteration * obj) {
 	Alteration * self;
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ALTERATION, Alteration);
@@ -2861,7 +2861,7 @@ GType alteration_get_type (void) {
 
 
 gpointer alteration_ref (gpointer instance) {
-	Alteration* self;
+	Alteration * self;
 	self = instance;
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -2872,7 +2872,7 @@ gpointer alteration_ref (gpointer instance) {
 
 
 void alteration_unref (gpointer instance) {
-	Alteration* self;
+	Alteration * self;
 	self = instance;
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
diff --git a/src/core/ContainerSourceCollection.c b/src/core/ContainerSourceCollection.c
index 247e471..7bd5826 100644
--- a/src/core/ContainerSourceCollection.c
+++ b/src/core/ContainerSourceCollection.c
@@ -1,4 +1,4 @@
-/* ContainerSourceCollection.c generated by valac 0.34.7, the Vala compiler
+/* ContainerSourceCollection.c generated by valac 0.36.6, the Vala compiler
  * generated from ContainerSourceCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -155,6 +155,14 @@ typedef struct _ThumbnailSourceClass ThumbnailSourceClass;
 
 typedef struct _MediaSource MediaSource;
 typedef struct _MediaSourceClass MediaSourceClass;
+enum  {
+	CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ADDED_SIGNAL,
+	CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_REMOVED_SIGNAL,
+	CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ALTERED_SIGNAL,
+	CONTAINER_SOURCE_COLLECTION_BACKLINK_TO_CONTAINER_REMOVED_SIGNAL,
+	CONTAINER_SOURCE_COLLECTION_LAST_SIGNAL
+};
+static guint container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -384,16 +392,16 @@ static void container_source_collection_real_container_contents_altered (Contain
 static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void container_source_collection_real_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources);
 static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void container_source_collection_finalize (DataCollection* obj);
+static void container_source_collection_finalize (DataCollection * obj);
 
 
 ContainerSourceCollection* container_source_collection_construct (GType object_type, const gchar* backlink_name, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target) {
 	ContainerSourceCollection* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	GetSourceDatabaseKey _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	GetSourceDatabaseKey _tmp1_;
+	void* _tmp1__target;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_val_if_fail (backlink_name != NULL, NULL);
 #line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -416,18 +424,18 @@ ContainerSourceCollection* container_source_collection_construct (GType object_t
 	self->priv->backlink_name = _tmp3_;
 #line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	return self;
-#line 420 "ContainerSourceCollection.c"
+#line 428 "ContainerSourceCollection.c"
 }
 
 
 static void container_source_collection_real_notify_backlink_removed (SourceCollection* base, SourceBacklink* backlink, GeeCollection* sources) {
 	ContainerSourceCollection * self;
-	SourceBacklink* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	SourceBacklink* _tmp0_;
+	GeeCollection* _tmp1_;
 	ContainerSource* container = NULL;
-	SourceBacklink* _tmp2_ = NULL;
-	ContainerSource* _tmp3_ = NULL;
-	ContainerSource* _tmp4_ = NULL;
+	SourceBacklink* _tmp2_;
+	ContainerSource* _tmp3_;
+	ContainerSource* _tmp4_;
 #line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection);
 #line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -450,30 +458,30 @@ static void container_source_collection_real_notify_backlink_removed (SourceColl
 	_tmp4_ = container;
 #line 54 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	if (_tmp4_ != NULL) {
-#line 454 "ContainerSourceCollection.c"
-		ContainerSource* _tmp5_ = NULL;
-		GeeCollection* _tmp6_ = NULL;
+#line 462 "ContainerSourceCollection.c"
+		ContainerSource* _tmp5_;
+		GeeCollection* _tmp6_;
 #line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp5_ = container;
 #line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp6_ = sources;
 #line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		container_source_collection_notify_backlink_to_container_removed (self, _tmp5_, _tmp6_);
-#line 463 "ContainerSourceCollection.c"
+#line 471 "ContainerSourceCollection.c"
 	}
 #line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_g_object_unref0 (container);
-#line 467 "ContainerSourceCollection.c"
+#line 475 "ContainerSourceCollection.c"
 }
 
 
 static void container_source_collection_real_notify_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked) {
-	GeeHashSet* _tmp0_ = NULL;
-	ContainerSource* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	ContainerSource* _tmp8_ = NULL;
-	GeeCollection* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
+	GeeHashSet* _tmp0_;
+	ContainerSource* _tmp1_;
+	gboolean _tmp2_;
+	ContainerSource* _tmp8_;
+	GeeCollection* _tmp9_;
+	gboolean _tmp10_;
 #line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE (container));
 #line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -486,13 +494,13 @@ static void container_source_collection_real_notify_container_contents_added (Co
 	_tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
 #line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	if (_tmp2_) {
-#line 490 "ContainerSourceCollection.c"
+#line 498 "ContainerSourceCollection.c"
 		gboolean removed = FALSE;
-		GeeHashSet* _tmp3_ = NULL;
-		ContainerSource* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		gboolean _tmp6_ = FALSE;
-		ContainerSource* _tmp7_ = NULL;
+		GeeHashSet* _tmp3_;
+		ContainerSource* _tmp4_;
+		gboolean _tmp5_;
+		gboolean _tmp6_;
+		ContainerSource* _tmp7_;
 #line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp3_ = self->priv->holding_tank;
 #line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -509,7 +517,7 @@ static void container_source_collection_real_notify_container_contents_added (Co
 		_tmp7_ = container;
 #line 65 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		source_collection_relink (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource));
-#line 513 "ContainerSourceCollection.c"
+#line 521 "ContainerSourceCollection.c"
 	}
 #line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp8_ = container;
@@ -518,8 +526,8 @@ static void container_source_collection_real_notify_container_contents_added (Co
 #line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp10_ = relinked;
 #line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_signal_emit_by_name (self, "container-contents-added", _tmp8_, _tmp9_, _tmp10_);
-#line 523 "ContainerSourceCollection.c"
+	g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ADDED_SIGNAL], 0, _tmp8_, _tmp9_, _tmp10_);
+#line 531 "ContainerSourceCollection.c"
 }
 
 
@@ -528,14 +536,14 @@ void container_source_collection_notify_container_contents_added (ContainerSourc
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
 #line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_container_contents_added (self, container, added, relinked);
-#line 532 "ContainerSourceCollection.c"
+#line 540 "ContainerSourceCollection.c"
 }
 
 
 static void container_source_collection_real_notify_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked) {
-	ContainerSource* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	ContainerSource* _tmp0_;
+	GeeCollection* _tmp1_;
+	gboolean _tmp2_;
 #line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE (container));
 #line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -547,8 +555,8 @@ static void container_source_collection_real_notify_container_contents_removed (
 #line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp2_ = unlinked;
 #line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_signal_emit_by_name (self, "container-contents-removed", _tmp0_, _tmp1_, _tmp2_);
-#line 552 "ContainerSourceCollection.c"
+	g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_REMOVED_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_);
+#line 560 "ContainerSourceCollection.c"
 }
 
 
@@ -557,16 +565,16 @@ void container_source_collection_notify_container_contents_removed (ContainerSou
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
 #line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_container_contents_removed (self, container, removed, unlinked);
-#line 561 "ContainerSourceCollection.c"
+#line 569 "ContainerSourceCollection.c"
 }
 
 
 static void container_source_collection_real_notify_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked) {
-	ContainerSource* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GeeCollection* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	ContainerSource* _tmp0_;
+	GeeCollection* _tmp1_;
+	gboolean _tmp2_;
+	GeeCollection* _tmp3_;
+	gboolean _tmp4_;
 #line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE (container));
 #line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -584,8 +592,8 @@ static void container_source_collection_real_notify_container_contents_altered (
 #line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp4_ = unlinked;
 #line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_signal_emit_by_name (self, "container-contents-altered", _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 589 "ContainerSourceCollection.c"
+	g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ALTERED_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
+#line 597 "ContainerSourceCollection.c"
 }
 
 
@@ -594,13 +602,13 @@ void container_source_collection_notify_container_contents_altered (ContainerSou
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
 #line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_container_contents_altered (self, container, added, relinked, removed, unlinked);
-#line 598 "ContainerSourceCollection.c"
+#line 606 "ContainerSourceCollection.c"
 }
 
 
 static void container_source_collection_real_notify_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources) {
-	ContainerSource* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	ContainerSource* _tmp0_;
+	GeeCollection* _tmp1_;
 #line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE (container));
 #line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -610,8 +618,8 @@ static void container_source_collection_real_notify_backlink_to_container_remove
 #line 84 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp1_ = sources;
 #line 84 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_signal_emit_by_name (self, "backlink-to-container-removed", _tmp0_, _tmp1_);
-#line 615 "ContainerSourceCollection.c"
+	g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_BACKLINK_TO_CONTAINER_REMOVED_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 623 "ContainerSourceCollection.c"
 }
 
 
@@ -620,7 +628,7 @@ void container_source_collection_notify_backlink_to_container_removed (Container
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
 #line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_backlink_to_container_removed (self, container, sources);
-#line 624 "ContainerSourceCollection.c"
+#line 632 "ContainerSourceCollection.c"
 }
 
 
@@ -629,7 +637,7 @@ static GeeCollection* container_source_collection_real_get_containers_holding_so
 	g_critical ("Type `%s' does not implement abstract method `container_source_collection_get_containers_holding_source'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	return NULL;
-#line 633 "ContainerSourceCollection.c"
+#line 641 "ContainerSourceCollection.c"
 }
 
 
@@ -638,7 +646,7 @@ GeeCollection* container_source_collection_get_containers_holding_source (Contai
 	g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL);
 #line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	return CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->get_containers_holding_source (self, source);
-#line 642 "ContainerSourceCollection.c"
+#line 650 "ContainerSourceCollection.c"
 }
 
 
@@ -647,7 +655,7 @@ static ContainerSource* container_source_collection_real_convert_backlink_to_con
 	g_critical ("Type `%s' does not implement abstract method `container_source_collection_convert_backlink_to_container'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	return NULL;
-#line 651 "ContainerSourceCollection.c"
+#line 659 "ContainerSourceCollection.c"
 }
 
 
@@ -656,18 +664,18 @@ ContainerSource* container_source_collection_convert_backlink_to_container (Cont
 	g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL);
 #line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	return CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->convert_backlink_to_container (self, backlink);
-#line 660 "ContainerSourceCollection.c"
+#line 668 "ContainerSourceCollection.c"
 }
 
 
 void container_source_collection_freeze_attached_notifications (ContainerSourceCollection* self) {
 #line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 667 "ContainerSourceCollection.c"
+#line 675 "ContainerSourceCollection.c"
 	{
 		GeeIterator* _collection_it = NULL;
-		GeeHashSet* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeHashSet* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp0_ = self->priv->attached_collections;
 #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -676,13 +684,13 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC
 		_collection_it = _tmp1_;
 #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
-#line 680 "ContainerSourceCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 688 "ContainerSourceCollection.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			SourceCollection* collection = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			SourceCollection* _tmp6_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			SourceCollection* _tmp6_;
 #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp2_ = _collection_it;
 #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -691,7 +699,7 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC
 			if (!_tmp3_) {
 #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
-#line 695 "ContainerSourceCollection.c"
+#line 703 "ContainerSourceCollection.c"
 			}
 #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp4_ = _collection_it;
@@ -705,11 +713,11 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC
 			data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
 #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_data_collection_unref0 (collection);
-#line 709 "ContainerSourceCollection.c"
+#line 717 "ContainerSourceCollection.c"
 		}
 #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_collection_it);
-#line 713 "ContainerSourceCollection.c"
+#line 721 "ContainerSourceCollection.c"
 	}
 }
 
@@ -717,11 +725,11 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC
 void container_source_collection_thaw_attached_notifications (ContainerSourceCollection* self) {
 #line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 721 "ContainerSourceCollection.c"
+#line 729 "ContainerSourceCollection.c"
 	{
 		GeeIterator* _collection_it = NULL;
-		GeeHashSet* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeHashSet* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp0_ = self->priv->attached_collections;
 #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -730,13 +738,13 @@ void container_source_collection_thaw_attached_notifications (ContainerSourceCol
 		_collection_it = _tmp1_;
 #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
-#line 734 "ContainerSourceCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 742 "ContainerSourceCollection.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			SourceCollection* collection = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			SourceCollection* _tmp6_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			SourceCollection* _tmp6_;
 #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp2_ = _collection_it;
 #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -745,7 +753,7 @@ void container_source_collection_thaw_attached_notifications (ContainerSourceCol
 			if (!_tmp3_) {
 #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
-#line 749 "ContainerSourceCollection.c"
+#line 757 "ContainerSourceCollection.c"
 			}
 #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp4_ = _collection_it;
@@ -759,20 +767,20 @@ void container_source_collection_thaw_attached_notifications (ContainerSourceCol
 			data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
 #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_data_collection_unref0 (collection);
-#line 763 "ContainerSourceCollection.c"
+#line 771 "ContainerSourceCollection.c"
 		}
 #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_collection_it);
-#line 767 "ContainerSourceCollection.c"
+#line 775 "ContainerSourceCollection.c"
 	}
 }
 
 
 GeeCollection* container_source_collection_get_holding_tank (ContainerSourceCollection* self) {
 	GeeCollection* result = NULL;
-	GeeHashSet* _tmp0_ = NULL;
-	GeeSet* _tmp1_ = NULL;
-	GeeSet* _tmp2_ = NULL;
+	GeeHashSet* _tmp0_;
+	GeeSet* _tmp1_;
+	GeeSet* _tmp2_;
 #line 102 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL);
 #line 103 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -785,13 +793,13 @@ GeeCollection* container_source_collection_get_holding_tank (ContainerSourceColl
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 103 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	return result;
-#line 789 "ContainerSourceCollection.c"
+#line 797 "ContainerSourceCollection.c"
 }
 
 
 void container_source_collection_init_add_unlinked (ContainerSourceCollection* self, ContainerSource* unlinked) {
-	GeeHashSet* _tmp0_ = NULL;
-	ContainerSource* _tmp1_ = NULL;
+	GeeHashSet* _tmp0_;
+	ContainerSource* _tmp1_;
 #line 106 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
 #line 106 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -802,13 +810,13 @@ void container_source_collection_init_add_unlinked (ContainerSourceCollection* s
 	_tmp1_ = unlinked;
 #line 107 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 806 "ContainerSourceCollection.c"
+#line 814 "ContainerSourceCollection.c"
 }
 
 
 void container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, GeeCollection* unlinked) {
-	GeeHashSet* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	GeeHashSet* _tmp0_;
+	GeeCollection* _tmp1_;
 #line 110 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
 #line 110 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -819,16 +827,16 @@ void container_source_collection_init_add_many_unlinked (ContainerSourceCollecti
 	_tmp1_ = unlinked;
 #line 111 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_);
-#line 823 "ContainerSourceCollection.c"
+#line 831 "ContainerSourceCollection.c"
 }
 
 
 gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCollection* self, ContainerSource* source) {
 	gboolean result = FALSE;
-	GeeHashSet* _tmp0_ = NULL;
-	ContainerSource* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	ContainerSource* _tmp3_ = NULL;
+	GeeHashSet* _tmp0_;
+	ContainerSource* _tmp1_;
+	gboolean _tmp2_;
+	ContainerSource* _tmp3_;
 #line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), FALSE);
 #line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -845,7 +853,7 @@ gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCo
 		result = FALSE;
 #line 116 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		return result;
-#line 849 "ContainerSourceCollection.c"
+#line 857 "ContainerSourceCollection.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp3_ = source;
@@ -855,13 +863,13 @@ gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCo
 	result = TRUE;
 #line 120 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	return result;
-#line 859 "ContainerSourceCollection.c"
+#line 867 "ContainerSourceCollection.c"
 }
 
 
 static void container_source_collection_on_contained_sources_unlinking (ContainerSourceCollection* self, GeeCollection* unlinking) {
 	GeeHashMultiMap* map = NULL;
-	GeeHashMultiMap* _tmp0_ = NULL;
+	GeeHashMultiMap* _tmp0_;
 #line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
 #line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -872,11 +880,11 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 	_tmp0_ = gee_hash_multi_map_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 126 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	map = _tmp0_;
-#line 876 "ContainerSourceCollection.c"
+#line 884 "ContainerSourceCollection.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp1_ = unlinking;
 #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -885,17 +893,17 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 		_source_it = _tmp2_;
 #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
-#line 889 "ContainerSourceCollection.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 897 "ContainerSourceCollection.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
 			GeeCollection* containers = NULL;
-			DataSource* _tmp7_ = NULL;
-			GeeCollection* _tmp8_ = NULL;
+			DataSource* _tmp7_;
+			GeeCollection* _tmp8_;
 			gboolean _tmp9_ = FALSE;
-			GeeCollection* _tmp10_ = NULL;
+			GeeCollection* _tmp10_;
 #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp3_ = _source_it;
 #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -904,7 +912,7 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 			if (!_tmp4_) {
 #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
-#line 908 "ContainerSourceCollection.c"
+#line 916 "ContainerSourceCollection.c"
 			}
 #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp5_ = _source_it;
@@ -924,11 +932,11 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 			if (_tmp10_ == NULL) {
 #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp9_ = TRUE;
-#line 928 "ContainerSourceCollection.c"
+#line 936 "ContainerSourceCollection.c"
 			} else {
-				GeeCollection* _tmp11_ = NULL;
-				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
+				GeeCollection* _tmp11_;
+				gint _tmp12_;
+				gint _tmp13_;
 #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp11_ = containers;
 #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -937,7 +945,7 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 				_tmp13_ = _tmp12_;
 #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp9_ = _tmp13_ == 0;
-#line 941 "ContainerSourceCollection.c"
+#line 949 "ContainerSourceCollection.c"
 			}
 #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			if (_tmp9_) {
@@ -947,12 +955,12 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 				_g_object_unref0 (source);
 #line 132 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				continue;
-#line 951 "ContainerSourceCollection.c"
+#line 959 "ContainerSourceCollection.c"
 			}
 			{
 				GeeIterator* _container_it = NULL;
-				GeeCollection* _tmp14_ = NULL;
-				GeeIterator* _tmp15_ = NULL;
+				GeeCollection* _tmp14_;
+				GeeIterator* _tmp15_;
 #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp14_ = containers;
 #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -961,19 +969,19 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 				_container_it = _tmp15_;
 #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				while (TRUE) {
-#line 965 "ContainerSourceCollection.c"
-					GeeIterator* _tmp16_ = NULL;
-					gboolean _tmp17_ = FALSE;
+#line 973 "ContainerSourceCollection.c"
+					GeeIterator* _tmp16_;
+					gboolean _tmp17_;
 					ContainerSource* container = NULL;
-					GeeIterator* _tmp18_ = NULL;
-					gpointer _tmp19_ = NULL;
-					GeeHashMultiMap* _tmp20_ = NULL;
-					ContainerSource* _tmp21_ = NULL;
-					DataSource* _tmp22_ = NULL;
-					DataSource* _tmp23_ = NULL;
-					ContainerSource* _tmp24_ = NULL;
-					SourceBacklink* _tmp25_ = NULL;
-					SourceBacklink* _tmp26_ = NULL;
+					GeeIterator* _tmp18_;
+					gpointer _tmp19_;
+					GeeHashMultiMap* _tmp20_;
+					ContainerSource* _tmp21_;
+					DataSource* _tmp22_;
+					DataSource* _tmp23_;
+					ContainerSource* _tmp24_;
+					SourceBacklink* _tmp25_;
+					SourceBacklink* _tmp26_;
 #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp16_ = _container_it;
 #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -982,7 +990,7 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 					if (!_tmp17_) {
 #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						break;
-#line 986 "ContainerSourceCollection.c"
+#line 994 "ContainerSourceCollection.c"
 					}
 #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp18_ = _container_it;
@@ -1012,29 +1020,29 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 					_source_backlink_unref0 (_tmp26_);
 #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_g_object_unref0 (container);
-#line 1016 "ContainerSourceCollection.c"
+#line 1024 "ContainerSourceCollection.c"
 				}
 #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_g_object_unref0 (_container_it);
-#line 1020 "ContainerSourceCollection.c"
+#line 1028 "ContainerSourceCollection.c"
 			}
 #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_g_object_unref0 (containers);
 #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_g_object_unref0 (source);
-#line 1026 "ContainerSourceCollection.c"
+#line 1034 "ContainerSourceCollection.c"
 		}
 #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_source_it);
-#line 1030 "ContainerSourceCollection.c"
+#line 1038 "ContainerSourceCollection.c"
 	}
 	{
 		GeeIterator* _container_it = NULL;
-		GeeHashMultiMap* _tmp27_ = NULL;
-		GeeSet* _tmp28_ = NULL;
-		GeeSet* _tmp29_ = NULL;
-		GeeIterator* _tmp30_ = NULL;
-		GeeIterator* _tmp31_ = NULL;
+		GeeHashMultiMap* _tmp27_;
+		GeeSet* _tmp28_;
+		GeeSet* _tmp29_;
+		GeeIterator* _tmp30_;
+		GeeIterator* _tmp31_;
 #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp27_ = map;
 #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1051,17 +1059,17 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 		_container_it = _tmp31_;
 #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
-#line 1055 "ContainerSourceCollection.c"
-			GeeIterator* _tmp32_ = NULL;
-			gboolean _tmp33_ = FALSE;
+#line 1063 "ContainerSourceCollection.c"
+			GeeIterator* _tmp32_;
+			gboolean _tmp33_;
 			ContainerSource* container = NULL;
-			GeeIterator* _tmp34_ = NULL;
-			gpointer _tmp35_ = NULL;
-			ContainerSource* _tmp36_ = NULL;
-			GeeHashMultiMap* _tmp37_ = NULL;
-			ContainerSource* _tmp38_ = NULL;
-			GeeCollection* _tmp39_ = NULL;
-			GeeCollection* _tmp40_ = NULL;
+			GeeIterator* _tmp34_;
+			gpointer _tmp35_;
+			ContainerSource* _tmp36_;
+			GeeHashMultiMap* _tmp37_;
+			ContainerSource* _tmp38_;
+			GeeCollection* _tmp39_;
+			GeeCollection* _tmp40_;
 #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp32_ = _container_it;
 #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1070,7 +1078,7 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 			if (!_tmp33_) {
 #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
-#line 1074 "ContainerSourceCollection.c"
+#line 1082 "ContainerSourceCollection.c"
 			}
 #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp34_ = _container_it;
@@ -1094,30 +1102,30 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 			_g_object_unref0 (_tmp40_);
 #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_g_object_unref0 (container);
-#line 1098 "ContainerSourceCollection.c"
+#line 1106 "ContainerSourceCollection.c"
 		}
 #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_container_it);
-#line 1102 "ContainerSourceCollection.c"
+#line 1110 "ContainerSourceCollection.c"
 	}
 #line 143 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	container_source_collection_thaw_attached_notifications (self);
 #line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_g_object_unref0 (map);
-#line 1108 "ContainerSourceCollection.c"
+#line 1116 "ContainerSourceCollection.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1115 "ContainerSourceCollection.c"
+#line 1123 "ContainerSourceCollection.c"
 }
 
 
 static void container_source_collection_on_contained_sources_relinked (ContainerSourceCollection* self, GeeCollection* relinked) {
 	GeeHashMultiMap* map = NULL;
-	GeeHashMultiMap* _tmp0_ = NULL;
+	GeeHashMultiMap* _tmp0_;
 #line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
 #line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1128,11 +1136,11 @@ static void container_source_collection_on_contained_sources_relinked (Container
 	_tmp0_ = gee_hash_multi_map_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 149 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	map = _tmp0_;
-#line 1132 "ContainerSourceCollection.c"
+#line 1140 "ContainerSourceCollection.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp1_ = relinked;
 #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1141,18 +1149,18 @@ static void container_source_collection_on_contained_sources_relinked (Container
 		_source_it = _tmp2_;
 #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
-#line 1145 "ContainerSourceCollection.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 1153 "ContainerSourceCollection.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
 			GeeList* backlinks = NULL;
-			DataSource* _tmp7_ = NULL;
-			const gchar* _tmp8_ = NULL;
-			GeeList* _tmp9_ = NULL;
+			DataSource* _tmp7_;
+			const gchar* _tmp8_;
+			GeeList* _tmp9_;
 			gboolean _tmp10_ = FALSE;
-			GeeList* _tmp11_ = NULL;
+			GeeList* _tmp11_;
 #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp3_ = _source_it;
 #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1161,7 +1169,7 @@ static void container_source_collection_on_contained_sources_relinked (Container
 			if (!_tmp4_) {
 #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
-#line 1165 "ContainerSourceCollection.c"
+#line 1173 "ContainerSourceCollection.c"
 			}
 #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp5_ = _source_it;
@@ -1183,11 +1191,11 @@ static void container_source_collection_on_contained_sources_relinked (Container
 			if (_tmp11_ == NULL) {
 #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp10_ = TRUE;
-#line 1187 "ContainerSourceCollection.c"
+#line 1195 "ContainerSourceCollection.c"
 			} else {
-				GeeList* _tmp12_ = NULL;
-				gint _tmp13_ = 0;
-				gint _tmp14_ = 0;
+				GeeList* _tmp12_;
+				gint _tmp13_;
+				gint _tmp14_;
 #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp12_ = backlinks;
 #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1196,7 +1204,7 @@ static void container_source_collection_on_contained_sources_relinked (Container
 				_tmp14_ = _tmp13_;
 #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp10_ = _tmp14_ == 0;
-#line 1200 "ContainerSourceCollection.c"
+#line 1208 "ContainerSourceCollection.c"
 			}
 #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			if (_tmp10_) {
@@ -1206,16 +1214,16 @@ static void container_source_collection_on_contained_sources_relinked (Container
 				_g_object_unref0 (source);
 #line 155 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				continue;
-#line 1210 "ContainerSourceCollection.c"
+#line 1218 "ContainerSourceCollection.c"
 			}
 			{
 				GeeList* _backlink_list = NULL;
-				GeeList* _tmp15_ = NULL;
-				GeeList* _tmp16_ = NULL;
+				GeeList* _tmp15_;
+				GeeList* _tmp16_;
 				gint _backlink_size = 0;
-				GeeList* _tmp17_ = NULL;
-				gint _tmp18_ = 0;
-				gint _tmp19_ = 0;
+				GeeList* _tmp17_;
+				gint _tmp18_;
+				gint _tmp19_;
 				gint _backlink_index = 0;
 #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp15_ = backlinks;
@@ -1235,18 +1243,18 @@ static void container_source_collection_on_contained_sources_relinked (Container
 				_backlink_index = -1;
 #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				while (TRUE) {
-#line 1239 "ContainerSourceCollection.c"
-					gint _tmp20_ = 0;
-					gint _tmp21_ = 0;
-					gint _tmp22_ = 0;
+#line 1247 "ContainerSourceCollection.c"
+					gint _tmp20_;
+					gint _tmp21_;
+					gint _tmp22_;
 					SourceBacklink* backlink = NULL;
-					GeeList* _tmp23_ = NULL;
-					gint _tmp24_ = 0;
-					gpointer _tmp25_ = NULL;
+					GeeList* _tmp23_;
+					gint _tmp24_;
+					gpointer _tmp25_;
 					ContainerSource* container = NULL;
-					SourceBacklink* _tmp26_ = NULL;
-					ContainerSource* _tmp27_ = NULL;
-					ContainerSource* _tmp28_ = NULL;
+					SourceBacklink* _tmp26_;
+					ContainerSource* _tmp27_;
+					ContainerSource* _tmp28_;
 #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp20_ = _backlink_index;
 #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1259,7 +1267,7 @@ static void container_source_collection_on_contained_sources_relinked (Container
 					if (!(_tmp21_ < _tmp22_)) {
 #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						break;
-#line 1263 "ContainerSourceCollection.c"
+#line 1271 "ContainerSourceCollection.c"
 					}
 #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp23_ = _backlink_list;
@@ -1279,10 +1287,10 @@ static void container_source_collection_on_contained_sources_relinked (Container
 					_tmp28_ = container;
 #line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					if (_tmp28_ != NULL) {
-#line 1283 "ContainerSourceCollection.c"
-						GeeHashMultiMap* _tmp29_ = NULL;
-						ContainerSource* _tmp30_ = NULL;
-						DataSource* _tmp31_ = NULL;
+#line 1291 "ContainerSourceCollection.c"
+						GeeHashMultiMap* _tmp29_;
+						ContainerSource* _tmp30_;
+						DataSource* _tmp31_;
 #line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						_tmp29_ = map;
 #line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1291,14 +1299,14 @@ static void container_source_collection_on_contained_sources_relinked (Container
 						_tmp31_ = source;
 #line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp30_, _tmp31_);
-#line 1295 "ContainerSourceCollection.c"
+#line 1303 "ContainerSourceCollection.c"
 					} else {
-						DataSource* _tmp32_ = NULL;
-						gchar* _tmp33_ = NULL;
-						gchar* _tmp34_ = NULL;
-						SourceBacklink* _tmp35_ = NULL;
-						gchar* _tmp36_ = NULL;
-						gchar* _tmp37_ = NULL;
+						DataSource* _tmp32_;
+						gchar* _tmp33_;
+						gchar* _tmp34_;
+						SourceBacklink* _tmp35_;
+						gchar* _tmp36_;
+						gchar* _tmp37_;
 #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						_tmp32_ = source;
 #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1318,35 +1326,35 @@ static void container_source_collection_on_contained_sources_relinked (Container
 						_g_free0 (_tmp37_);
 #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						_g_free0 (_tmp34_);
-#line 1321 "ContainerSourceCollection.c"
+#line 1329 "ContainerSourceCollection.c"
 					}
 #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_g_object_unref0 (container);
 #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_source_backlink_unref0 (backlink);
-#line 1327 "ContainerSourceCollection.c"
+#line 1335 "ContainerSourceCollection.c"
 				}
 #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_g_object_unref0 (_backlink_list);
-#line 1331 "ContainerSourceCollection.c"
+#line 1339 "ContainerSourceCollection.c"
 			}
 #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_g_object_unref0 (backlinks);
 #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_g_object_unref0 (source);
-#line 1337 "ContainerSourceCollection.c"
+#line 1345 "ContainerSourceCollection.c"
 		}
 #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_source_it);
-#line 1341 "ContainerSourceCollection.c"
+#line 1349 "ContainerSourceCollection.c"
 	}
 	{
 		GeeIterator* _container_it = NULL;
-		GeeHashMultiMap* _tmp38_ = NULL;
-		GeeSet* _tmp39_ = NULL;
-		GeeSet* _tmp40_ = NULL;
-		GeeIterator* _tmp41_ = NULL;
-		GeeIterator* _tmp42_ = NULL;
+		GeeHashMultiMap* _tmp38_;
+		GeeSet* _tmp39_;
+		GeeSet* _tmp40_;
+		GeeIterator* _tmp41_;
+		GeeIterator* _tmp42_;
 #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp38_ = map;
 #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1363,17 +1371,17 @@ static void container_source_collection_on_contained_sources_relinked (Container
 		_container_it = _tmp42_;
 #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
-#line 1366 "ContainerSourceCollection.c"
-			GeeIterator* _tmp43_ = NULL;
-			gboolean _tmp44_ = FALSE;
+#line 1374 "ContainerSourceCollection.c"
+			GeeIterator* _tmp43_;
+			gboolean _tmp44_;
 			ContainerSource* container = NULL;
-			GeeIterator* _tmp45_ = NULL;
-			gpointer _tmp46_ = NULL;
-			ContainerSource* _tmp47_ = NULL;
-			GeeHashMultiMap* _tmp48_ = NULL;
-			ContainerSource* _tmp49_ = NULL;
-			GeeCollection* _tmp50_ = NULL;
-			GeeCollection* _tmp51_ = NULL;
+			GeeIterator* _tmp45_;
+			gpointer _tmp46_;
+			ContainerSource* _tmp47_;
+			GeeHashMultiMap* _tmp48_;
+			ContainerSource* _tmp49_;
+			GeeCollection* _tmp50_;
+			GeeCollection* _tmp51_;
 #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp43_ = _container_it;
 #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1382,7 +1390,7 @@ static void container_source_collection_on_contained_sources_relinked (Container
 			if (!_tmp44_) {
 #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
-#line 1385 "ContainerSourceCollection.c"
+#line 1393 "ContainerSourceCollection.c"
 			}
 #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp45_ = _container_it;
@@ -1406,24 +1414,24 @@ static void container_source_collection_on_contained_sources_relinked (Container
 			_g_object_unref0 (_tmp51_);
 #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_g_object_unref0 (container);
-#line 1409 "ContainerSourceCollection.c"
+#line 1417 "ContainerSourceCollection.c"
 		}
 #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_container_it);
-#line 1413 "ContainerSourceCollection.c"
+#line 1421 "ContainerSourceCollection.c"
 	}
 #line 171 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	container_source_collection_thaw_attached_notifications (self);
 #line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_g_object_unref0 (map);
-#line 1419 "ContainerSourceCollection.c"
+#line 1427 "ContainerSourceCollection.c"
 }
 
 
 static void container_source_collection_on_contained_source_destroyed (ContainerSourceCollection* self, DataSource* source) {
 	GeeIterator* iter = NULL;
-	GeeHashSet* _tmp0_ = NULL;
-	GeeIterator* _tmp1_ = NULL;
+	GeeHashSet* _tmp0_;
+	GeeIterator* _tmp1_;
 #line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
 #line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1436,15 +1444,15 @@ static void container_source_collection_on_contained_source_destroyed (Container
 	iter = _tmp1_;
 #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	while (TRUE) {
-#line 1439 "ContainerSourceCollection.c"
-		GeeIterator* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+#line 1447 "ContainerSourceCollection.c"
+		GeeIterator* _tmp2_;
+		gboolean _tmp3_;
 		ContainerSource* container = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		gpointer _tmp5_ = NULL;
+		GeeIterator* _tmp4_;
+		gpointer _tmp5_;
 		gboolean _tmp6_ = FALSE;
-		ContainerSource* _tmp7_ = NULL;
-		gboolean _tmp8_ = FALSE;
+		ContainerSource* _tmp7_;
+		gboolean _tmp8_;
 #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp2_ = iter;
 #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1453,7 +1461,7 @@ static void container_source_collection_on_contained_source_destroyed (Container
 		if (!_tmp3_) {
 #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			break;
-#line 1456 "ContainerSourceCollection.c"
+#line 1464 "ContainerSourceCollection.c"
 		}
 #line 177 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp4_ = iter;
@@ -1467,23 +1475,23 @@ static void container_source_collection_on_contained_source_destroyed (Container
 		_tmp8_ = container_source_has_links (_tmp7_);
 #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		if (!_tmp8_) {
-#line 1470 "ContainerSourceCollection.c"
-			ContainerSource* _tmp9_ = NULL;
+#line 1478 "ContainerSourceCollection.c"
+			ContainerSource* _tmp9_;
 #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp9_ = container;
 #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp6_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_TAG);
-#line 1476 "ContainerSourceCollection.c"
+#line 1484 "ContainerSourceCollection.c"
 		} else {
 #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp6_ = FALSE;
-#line 1480 "ContainerSourceCollection.c"
+#line 1488 "ContainerSourceCollection.c"
 		}
 #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		if (_tmp6_) {
-#line 1484 "ContainerSourceCollection.c"
-			GeeIterator* _tmp10_ = NULL;
-			ContainerSource* _tmp11_ = NULL;
+#line 1492 "ContainerSourceCollection.c"
+			GeeIterator* _tmp10_;
+			ContainerSource* _tmp11_;
 #line 182 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp10_ = iter;
 #line 182 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1492,30 +1500,30 @@ static void container_source_collection_on_contained_source_destroyed (Container
 			_tmp11_ = container;
 #line 183 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			data_source_destroy_orphan (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_SOURCE, DataSource), TRUE);
-#line 1495 "ContainerSourceCollection.c"
+#line 1503 "ContainerSourceCollection.c"
 		}
 #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (container);
-#line 1499 "ContainerSourceCollection.c"
+#line 1507 "ContainerSourceCollection.c"
 	}
 #line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_g_object_unref0 (iter);
-#line 1503 "ContainerSourceCollection.c"
+#line 1511 "ContainerSourceCollection.c"
 }
 
 
 static void container_source_collection_real_notify_item_destroyed (SourceCollection* base, DataSource* source) {
 	ContainerSourceCollection * self;
-	DataSource* _tmp10_ = NULL;
+	DataSource* _tmp10_;
 #line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection);
 #line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
-#line 1514 "ContainerSourceCollection.c"
+#line 1522 "ContainerSourceCollection.c"
 	{
 		GeeIterator* _collection_it = NULL;
-		GeeHashSet* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeHashSet* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp0_ = self->priv->attached_collections;
 #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1524,16 +1532,16 @@ static void container_source_collection_real_notify_item_destroyed (SourceCollec
 		_collection_it = _tmp1_;
 #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
-#line 1527 "ContainerSourceCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 1535 "ContainerSourceCollection.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			SourceCollection* collection = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			SourceCollection* _tmp6_ = NULL;
-			DataSource* _tmp7_ = NULL;
-			SourceBacklink* _tmp8_ = NULL;
-			SourceBacklink* _tmp9_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			SourceCollection* _tmp6_;
+			DataSource* _tmp7_;
+			SourceBacklink* _tmp8_;
+			SourceBacklink* _tmp9_;
 #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp2_ = _collection_it;
 #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1542,7 +1550,7 @@ static void container_source_collection_real_notify_item_destroyed (SourceCollec
 			if (!_tmp3_) {
 #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
-#line 1545 "ContainerSourceCollection.c"
+#line 1553 "ContainerSourceCollection.c"
 			}
 #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp4_ = _collection_it;
@@ -1564,33 +1572,33 @@ static void container_source_collection_real_notify_item_destroyed (SourceCollec
 			_source_backlink_unref0 (_tmp9_);
 #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_data_collection_unref0 (collection);
-#line 1567 "ContainerSourceCollection.c"
+#line 1575 "ContainerSourceCollection.c"
 		}
 #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_collection_it);
-#line 1571 "ContainerSourceCollection.c"
+#line 1579 "ContainerSourceCollection.c"
 	}
 #line 193 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp10_ = source;
 #line 193 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	SOURCE_COLLECTION_CLASS (container_source_collection_parent_class)->notify_item_destroyed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp10_);
-#line 1577 "ContainerSourceCollection.c"
+#line 1585 "ContainerSourceCollection.c"
 }
 
 
 void container_source_collection_evaporate (ContainerSourceCollection* self, ContainerSource* container) {
-	ContainerSource* _tmp21_ = NULL;
-	Marker* _tmp22_ = NULL;
-	Marker* _tmp23_ = NULL;
+	ContainerSource* _tmp21_;
+	Marker* _tmp22_;
+	Marker* _tmp23_;
 #line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
 #line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE (container));
-#line 1589 "ContainerSourceCollection.c"
+#line 1597 "ContainerSourceCollection.c"
 	{
 		GeeIterator* _collection_it = NULL;
-		GeeHashSet* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeHashSet* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp0_ = self->priv->attached_collections;
 #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1599,18 +1607,18 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con
 		_collection_it = _tmp1_;
 #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
-#line 1602 "ContainerSourceCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 1610 "ContainerSourceCollection.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			SourceCollection* collection = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			SourceCollection* _tmp6_ = NULL;
-			ContainerSource* _tmp7_ = NULL;
-			SourceBacklink* _tmp8_ = NULL;
-			SourceBacklink* _tmp9_ = NULL;
-			gboolean _tmp10_ = FALSE;
-			gboolean _tmp11_ = FALSE;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			SourceCollection* _tmp6_;
+			ContainerSource* _tmp7_;
+			SourceBacklink* _tmp8_;
+			SourceBacklink* _tmp9_;
+			gboolean _tmp10_;
+			gboolean _tmp11_;
 #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp2_ = _collection_it;
 #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1619,7 +1627,7 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con
 			if (!_tmp3_) {
 #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
-#line 1622 "ContainerSourceCollection.c"
+#line 1630 "ContainerSourceCollection.c"
 			}
 #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp4_ = _collection_it;
@@ -1643,17 +1651,17 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con
 			_source_backlink_unref0 (_tmp9_);
 #line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			if (_tmp11_) {
-#line 1646 "ContainerSourceCollection.c"
-				ContainerSource* _tmp12_ = NULL;
-				Marker* _tmp13_ = NULL;
-				Marker* _tmp14_ = NULL;
-				GeeCollection* _tmp15_ = NULL;
-				GeeCollection* _tmp16_ = NULL;
+#line 1654 "ContainerSourceCollection.c"
+				ContainerSource* _tmp12_;
+				Marker* _tmp13_;
+				Marker* _tmp14_;
+				GeeCollection* _tmp15_;
+				GeeCollection* _tmp16_;
 				gboolean added = FALSE;
-				GeeHashSet* _tmp17_ = NULL;
-				ContainerSource* _tmp18_ = NULL;
-				gboolean _tmp19_ = FALSE;
-				gboolean _tmp20_ = FALSE;
+				GeeHashSet* _tmp17_;
+				ContainerSource* _tmp18_;
+				gboolean _tmp19_;
+				gboolean _tmp20_;
 #line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp12_ = container;
 #line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1686,15 +1694,15 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con
 				_g_object_unref0 (_collection_it);
 #line 206 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				return;
-#line 1689 "ContainerSourceCollection.c"
+#line 1697 "ContainerSourceCollection.c"
 			}
 #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_data_collection_unref0 (collection);
-#line 1693 "ContainerSourceCollection.c"
+#line 1701 "ContainerSourceCollection.c"
 		}
 #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_collection_it);
-#line 1697 "ContainerSourceCollection.c"
+#line 1705 "ContainerSourceCollection.c"
 	}
 #line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp21_ = container;
@@ -1706,48 +1714,48 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con
 	source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp23_, TRUE, NULL, NULL, NULL);
 #line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_g_object_unref0 (_tmp23_);
-#line 1709 "ContainerSourceCollection.c"
+#line 1717 "ContainerSourceCollection.c"
 }
 
 
 static void _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) {
 #line 221 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	container_source_collection_on_contained_sources_unlinking ((ContainerSourceCollection*) self, unlinking);
-#line 1716 "ContainerSourceCollection.c"
+#line 1724 "ContainerSourceCollection.c"
 }
 
 
 static void _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) {
 #line 222 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	container_source_collection_on_contained_sources_relinked ((ContainerSourceCollection*) self, relinked);
-#line 1723 "ContainerSourceCollection.c"
+#line 1731 "ContainerSourceCollection.c"
 }
 
 
 static void _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 223 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	container_source_collection_on_contained_source_destroyed ((ContainerSourceCollection*) self, source);
-#line 1730 "ContainerSourceCollection.c"
+#line 1738 "ContainerSourceCollection.c"
 }
 
 
 static void _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 224 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	container_source_collection_on_contained_source_destroyed ((ContainerSourceCollection*) self, source);
-#line 1737 "ContainerSourceCollection.c"
+#line 1745 "ContainerSourceCollection.c"
 }
 
 
 void container_source_collection_attach_collection (ContainerSourceCollection* self, SourceCollection* collection) {
-	GeeHashSet* _tmp0_ = NULL;
-	SourceCollection* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GeeHashSet* _tmp8_ = NULL;
-	SourceCollection* _tmp9_ = NULL;
-	SourceCollection* _tmp10_ = NULL;
-	SourceCollection* _tmp11_ = NULL;
-	SourceCollection* _tmp12_ = NULL;
-	SourceCollection* _tmp13_ = NULL;
+	GeeHashSet* _tmp0_;
+	SourceCollection* _tmp1_;
+	gboolean _tmp2_;
+	GeeHashSet* _tmp8_;
+	SourceCollection* _tmp9_;
+	SourceCollection* _tmp10_;
+	SourceCollection* _tmp11_;
+	SourceCollection* _tmp12_;
+	SourceCollection* _tmp13_;
 #line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
 #line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1760,12 +1768,12 @@ void container_source_collection_attach_collection (ContainerSourceCollection* s
 	_tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
 #line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	if (_tmp2_) {
-#line 1763 "ContainerSourceCollection.c"
-		SourceCollection* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 1771 "ContainerSourceCollection.c"
+		SourceCollection* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp3_ = collection;
 #line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1785,7 +1793,7 @@ void container_source_collection_attach_collection (ContainerSourceCollection* s
 		_g_free0 (_tmp5_);
 #line 216 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		return;
-#line 1787 "ContainerSourceCollection.c"
+#line 1795 "ContainerSourceCollection.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp8_ = self->priv->attached_collections;
@@ -1809,19 +1817,19 @@ void container_source_collection_attach_collection (ContainerSourceCollection* s
 	_tmp13_ = collection;
 #line 224 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_signal_connect (_tmp13_, "unlinked-destroyed", (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed, self);
-#line 1811 "ContainerSourceCollection.c"
+#line 1819 "ContainerSourceCollection.c"
 }
 
 
 void container_source_collection_detach_all_collections (ContainerSourceCollection* self) {
-	GeeHashSet* _tmp14_ = NULL;
+	GeeHashSet* _tmp14_;
 #line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 1819 "ContainerSourceCollection.c"
+#line 1827 "ContainerSourceCollection.c"
 	{
 		GeeIterator* _collection_it = NULL;
-		GeeHashSet* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeHashSet* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp0_ = self->priv->attached_collections;
 #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1830,20 +1838,20 @@ void container_source_collection_detach_all_collections (ContainerSourceCollecti
 		_collection_it = _tmp1_;
 #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
-#line 1832 "ContainerSourceCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 1840 "ContainerSourceCollection.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			SourceCollection* collection = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			SourceCollection* _tmp6_ = NULL;
-			guint _tmp7_ = 0U;
-			SourceCollection* _tmp8_ = NULL;
-			guint _tmp9_ = 0U;
-			SourceCollection* _tmp10_ = NULL;
-			guint _tmp11_ = 0U;
-			SourceCollection* _tmp12_ = NULL;
-			guint _tmp13_ = 0U;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			SourceCollection* _tmp6_;
+			guint _tmp7_;
+			SourceCollection* _tmp8_;
+			guint _tmp9_;
+			SourceCollection* _tmp10_;
+			guint _tmp11_;
+			SourceCollection* _tmp12_;
+			guint _tmp13_;
 #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp2_ = _collection_it;
 #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -1852,7 +1860,7 @@ void container_source_collection_detach_all_collections (ContainerSourceCollecti
 			if (!_tmp3_) {
 #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
-#line 1854 "ContainerSourceCollection.c"
+#line 1862 "ContainerSourceCollection.c"
 			}
 #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp4_ = _collection_it;
@@ -1886,17 +1894,17 @@ void container_source_collection_detach_all_collections (ContainerSourceCollecti
 			g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed, self);
 #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_data_collection_unref0 (collection);
-#line 1888 "ContainerSourceCollection.c"
+#line 1896 "ContainerSourceCollection.c"
 		}
 #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_collection_it);
-#line 1892 "ContainerSourceCollection.c"
+#line 1900 "ContainerSourceCollection.c"
 	}
 #line 235 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp14_ = self->priv->attached_collections;
 #line 235 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1898 "ContainerSourceCollection.c"
+#line 1906 "ContainerSourceCollection.c"
 }
 
 
@@ -1905,7 +1913,7 @@ static void container_source_collection_real_container_contents_added (Container
 	g_return_if_fail (IS_CONTAINER_SOURCE (container));
 #line 20 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (added));
-#line 1907 "ContainerSourceCollection.c"
+#line 1915 "ContainerSourceCollection.c"
 }
 
 
@@ -1924,19 +1932,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN (GClosure * clos
 		data1 = closure->data;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 1926 "ContainerSourceCollection.c"
+#line 1934 "ContainerSourceCollection.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		data2 = closure->data;
-#line 1932 "ContainerSourceCollection.c"
+#line 1940 "ContainerSourceCollection.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boolean (param_values + 3), data2);
-#line 1938 "ContainerSourceCollection.c"
+#line 1946 "ContainerSourceCollection.c"
 }
 
 
@@ -1945,7 +1953,7 @@ static void container_source_collection_real_container_contents_removed (Contain
 	g_return_if_fail (IS_CONTAINER_SOURCE (container));
 #line 24 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (removed));
-#line 1947 "ContainerSourceCollection.c"
+#line 1955 "ContainerSourceCollection.c"
 }
 
 
@@ -1956,7 +1964,7 @@ static void container_source_collection_real_container_contents_altered (Contain
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
 #line 28 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 1958 "ContainerSourceCollection.c"
+#line 1966 "ContainerSourceCollection.c"
 }
 
 
@@ -1975,19 +1983,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN (
 		data1 = closure->data;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 1977 "ContainerSourceCollection.c"
+#line 1985 "ContainerSourceCollection.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		data2 = closure->data;
-#line 1983 "ContainerSourceCollection.c"
+#line 1991 "ContainerSourceCollection.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boolean (param_values + 3), g_value_get_object (param_values + 4), g_value_get_boolean (param_values + 5), data2);
-#line 1989 "ContainerSourceCollection.c"
+#line 1997 "ContainerSourceCollection.c"
 }
 
 
@@ -1996,7 +2004,7 @@ static void container_source_collection_real_backlink_to_container_removed (Cont
 	g_return_if_fail (IS_CONTAINER_SOURCE (container));
 #line 34 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 1998 "ContainerSourceCollection.c"
+#line 2006 "ContainerSourceCollection.c"
 }
 
 
@@ -2015,19 +2023,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 		data1 = closure->data;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 2017 "ContainerSourceCollection.c"
+#line 2025 "ContainerSourceCollection.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		data2 = closure->data;
-#line 2023 "ContainerSourceCollection.c"
+#line 2031 "ContainerSourceCollection.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 2029 "ContainerSourceCollection.c"
+#line 2037 "ContainerSourceCollection.c"
 }
 
 
@@ -2039,21 +2047,21 @@ static void container_source_collection_class_init (ContainerSourceCollectionCla
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_type_class_add_private (klass, sizeof (ContainerSourceCollectionPrivate));
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	((SourceCollectionClass *) klass)->notify_backlink_removed = (void (*)(SourceCollection*, SourceBacklink*, GeeCollection*)) container_source_collection_real_notify_backlink_removed;
+	((SourceCollectionClass *) klass)->notify_backlink_removed = (void (*) (SourceCollection *, SourceBacklink*, GeeCollection*)) container_source_collection_real_notify_backlink_removed;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	((ContainerSourceCollectionClass *) klass)->notify_container_contents_added = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_added;
+	((ContainerSourceCollectionClass *) klass)->notify_container_contents_added = (void (*) (ContainerSourceCollection *, ContainerSource*, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_added;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	((ContainerSourceCollectionClass *) klass)->notify_container_contents_removed = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_removed;
+	((ContainerSourceCollectionClass *) klass)->notify_container_contents_removed = (void (*) (ContainerSourceCollection *, ContainerSource*, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_removed;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	((ContainerSourceCollectionClass *) klass)->notify_container_contents_altered = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*, gboolean, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_altered;
+	((ContainerSourceCollectionClass *) klass)->notify_container_contents_altered = (void (*) (ContainerSourceCollection *, ContainerSource*, GeeCollection*, gboolean, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_altered;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	((ContainerSourceCollectionClass *) klass)->notify_backlink_to_container_removed = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*)) container_source_collection_real_notify_backlink_to_container_removed;
+	((ContainerSourceCollectionClass *) klass)->notify_backlink_to_container_removed = (void (*) (ContainerSourceCollection *, ContainerSource*, GeeCollection*)) container_source_collection_real_notify_backlink_to_container_removed;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	((ContainerSourceCollectionClass *) klass)->get_containers_holding_source = (GeeCollection* (*)(ContainerSourceCollection*, DataSource*)) container_source_collection_real_get_containers_holding_source;
+	((ContainerSourceCollectionClass *) klass)->get_containers_holding_source = (GeeCollection* (*) (ContainerSourceCollection *, DataSource*)) container_source_collection_real_get_containers_holding_source;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = (ContainerSource* (*)(ContainerSourceCollection*, SourceBacklink*)) container_source_collection_real_convert_backlink_to_container;
+	((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = (ContainerSource* (*) (ContainerSourceCollection *, SourceBacklink*)) container_source_collection_real_convert_backlink_to_container;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	((SourceCollectionClass *) klass)->notify_item_destroyed = (void (*)(SourceCollection*, DataSource*)) container_source_collection_real_notify_item_destroyed;
+	((SourceCollectionClass *) klass)->notify_item_destroyed = (void (*) (SourceCollection *, DataSource*)) container_source_collection_real_notify_item_destroyed;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	((ContainerSourceCollectionClass *) klass)->container_contents_added = container_source_collection_real_container_contents_added;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -2063,20 +2071,20 @@ static void container_source_collection_class_init (ContainerSourceCollectionCla
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	((ContainerSourceCollectionClass *) klass)->backlink_to_container_removed = container_source_collection_real_backlink_to_container_removed;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_signal_new ("container_contents_added", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_added), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN, G_TYPE_NONE, 3, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN);
+	container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ADDED_SIGNAL] = g_signal_new ("container-contents-added", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_added), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN, G_TYPE_NONE, 3, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN);
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_signal_new ("container_contents_removed", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_removed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN, G_TYPE_NONE, 3, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN);
+	container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_REMOVED_SIGNAL] = g_signal_new ("container-contents-removed", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_removed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN, G_TYPE_NONE, 3, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN);
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_signal_new ("container_contents_altered", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN, G_TYPE_NONE, 5, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN);
+	container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("container-contents-altered", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN, G_TYPE_NONE, 5, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN);
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_signal_new ("backlink_to_container_removed", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, backlink_to_container_removed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION);
-#line 2072 "ContainerSourceCollection.c"
+	container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_BACKLINK_TO_CONTAINER_REMOVED_SIGNAL] = g_signal_new ("backlink-to-container-removed", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, backlink_to_container_removed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION);
+#line 2080 "ContainerSourceCollection.c"
 }
 
 
 static void container_source_collection_instance_init (ContainerSourceCollection * self) {
-	GeeHashSet* _tmp0_ = NULL;
-	GeeHashSet* _tmp1_ = NULL;
+	GeeHashSet* _tmp0_;
+	GeeHashSet* _tmp1_;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	self->priv = CONTAINER_SOURCE_COLLECTION_GET_PRIVATE (self);
 #line 16 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -2087,11 +2095,11 @@ static void container_source_collection_instance_init (ContainerSourceCollection
 	_tmp1_ = gee_hash_set_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 18 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	self->priv->holding_tank = _tmp1_;
-#line 2089 "ContainerSourceCollection.c"
+#line 2097 "ContainerSourceCollection.c"
 }
 
 
-static void container_source_collection_finalize (DataCollection* obj) {
+static void container_source_collection_finalize (DataCollection * obj) {
 	ContainerSourceCollection * self;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection);
@@ -2105,7 +2113,7 @@ static void container_source_collection_finalize (DataCollection* obj) {
 	_g_object_unref0 (self->priv->holding_tank);
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	DATA_COLLECTION_CLASS (container_source_collection_parent_class)->finalize (obj);
-#line 2107 "ContainerSourceCollection.c"
+#line 2115 "ContainerSourceCollection.c"
 }
 
 
diff --git a/src/core/Core.c b/src/core/Core.c
index d67d1ab..bb3c27b 100644
--- a/src/core/Core.c
+++ b/src/core/Core.c
@@ -1,4 +1,4 @@
-/* Core.c generated by valac 0.34.7, the Vala compiler
+/* Core.c generated by valac 0.36.6, the Vala compiler
  * generated from Core.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataCollection.c b/src/core/DataCollection.c
index 21c509f..658dfa3 100644
--- a/src/core/DataCollection.c
+++ b/src/core/DataCollection.c
@@ -1,4 +1,4 @@
-/* DataCollection.c generated by valac 0.34.7, the Vala compiler
+/* DataCollection.c generated by valac 0.36.6, the Vala compiler
  * generated from DataCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -91,6 +91,19 @@ typedef struct _DataCollectionMarkerImplPrivate DataCollectionMarkerImplPrivate;
 #define _alteration_unref0(var) ((var == NULL) ? NULL : (var = (alteration_unref (var), NULL)))
 #define __vala_GValue_free0(var) ((var == NULL) ? NULL : (var = (_vala_GValue_free (var), NULL)))
 typedef struct _ParamSpecDataCollection ParamSpecDataCollection;
+enum  {
+	DATA_COLLECTION_ITEMS_ADDED_SIGNAL,
+	DATA_COLLECTION_ITEMS_REMOVED_SIGNAL,
+	DATA_COLLECTION_CONTENTS_ALTERED_SIGNAL,
+	DATA_COLLECTION_ITEMS_ALTERED_SIGNAL,
+	DATA_COLLECTION_ORDERING_CHANGED_SIGNAL,
+	DATA_COLLECTION_PROPERTY_SET_SIGNAL,
+	DATA_COLLECTION_PROPERTY_CLEARED_SIGNAL,
+	DATA_COLLECTION_FROZEN_SIGNAL,
+	DATA_COLLECTION_THAWED_SIGNAL,
+	DATA_COLLECTION_LAST_SIGNAL
+};
+static guint data_collection_signals[DATA_COLLECTION_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -185,7 +198,7 @@ struct _ParamSpecDataCollection {
 
 static gpointer data_collection_parent_class = NULL;
 static gpointer data_collection_marker_impl_parent_class = NULL;
-static MarkerIface* data_collection_marker_impl_marker_parent_iface = NULL;
+static MarkerIface * data_collection_marker_impl_marker_parent_iface = NULL;
 
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
@@ -331,7 +344,7 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 static void data_collection_real_items_altered (DataCollection* self, GeeMap* items);
 static void data_collection_real_ordering_changed (DataCollection* self);
 static void data_collection_real_property_set (DataCollection* self, const gchar* name, GValue* old, GValue* val);
-static void g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__STRING_POINTER_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void data_collection_real_property_cleared (DataCollection* self, const gchar* name);
 static void data_collection_real_frozen (DataCollection* self);
 static void data_collection_real_thawed (DataCollection* self);
@@ -348,14 +361,14 @@ static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeColle
 static void data_collection_marker_impl_real_mark_all (Marker* base);
 static gint data_collection_marker_impl_real_get_count (Marker* base);
 static GeeCollection* data_collection_marker_impl_real_get_all (Marker* base);
-static void data_collection_marker_impl_finalize (GObject* obj);
-static void data_collection_finalize (DataCollection* obj);
+static void data_collection_marker_impl_finalize (GObject * obj);
+static void data_collection_finalize (DataCollection * obj);
 
 
 static GValue* _g_value_dup (GValue* self) {
 #line 109 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return g_boxed_copy (G_TYPE_VALUE, self);
-#line 359 "DataCollection.c"
+#line 372 "DataCollection.c"
 }
 
 
@@ -364,14 +377,14 @@ static void _vala_GValue_free (GValue* self) {
 	g_value_unset (self);
 #line 109 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_free (self);
-#line 368 "DataCollection.c"
+#line 381 "DataCollection.c"
 }
 
 
 DataCollection* data_collection_construct (GType object_type, const gchar* name) {
 	DataCollection* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 157 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 157 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -386,22 +399,22 @@ DataCollection* data_collection_construct (GType object_type, const gchar* name)
 	self->priv->name = _tmp1_;
 #line 157 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return self;
-#line 390 "DataCollection.c"
+#line 403 "DataCollection.c"
 }
 
 
 DataCollection* data_collection_new (const gchar* name) {
 #line 157 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return data_collection_construct (TYPE_DATA_COLLECTION, name);
-#line 397 "DataCollection.c"
+#line 410 "DataCollection.c"
 }
 
 
 static gchar* data_collection_real_to_string (DataCollection* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gint _tmp1_;
+	gchar* _tmp2_;
 #line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp0_ = self->priv->name;
 #line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -412,7 +425,7 @@ static gchar* data_collection_real_to_string (DataCollection* self) {
 	result = _tmp2_;
 #line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 416 "DataCollection.c"
+#line 429 "DataCollection.c"
 }
 
 
@@ -421,19 +434,19 @@ gchar* data_collection_to_string (DataCollection* self) {
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
 #line 167 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return DATA_COLLECTION_GET_CLASS (self)->to_string (self);
-#line 425 "DataCollection.c"
+#line 438 "DataCollection.c"
 }
 
 
 static void data_collection_real_notify_items_added (DataCollection* self, GeeIterable* added) {
-	GeeIterable* _tmp0_ = NULL;
+	GeeIterable* _tmp0_;
 #line 172 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (added));
 #line 173 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp0_ = added;
 #line 173 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_emit_by_name (self, "items-added", _tmp0_);
-#line 437 "DataCollection.c"
+	g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_ADDED_SIGNAL], 0, _tmp0_);
+#line 450 "DataCollection.c"
 }
 
 
@@ -442,19 +455,19 @@ void data_collection_notify_items_added (DataCollection* self, GeeIterable* adde
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 172 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	DATA_COLLECTION_GET_CLASS (self)->notify_items_added (self, added);
-#line 446 "DataCollection.c"
+#line 459 "DataCollection.c"
 }
 
 
 static void data_collection_real_notify_items_removed (DataCollection* self, GeeIterable* removed) {
-	GeeIterable* _tmp0_ = NULL;
+	GeeIterable* _tmp0_;
 #line 176 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (removed));
 #line 177 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp0_ = removed;
 #line 177 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_emit_by_name (self, "items-removed", _tmp0_);
-#line 458 "DataCollection.c"
+	g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_REMOVED_SIGNAL], 0, _tmp0_);
+#line 471 "DataCollection.c"
 }
 
 
@@ -463,13 +476,13 @@ void data_collection_notify_items_removed (DataCollection* self, GeeIterable* re
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 176 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	DATA_COLLECTION_GET_CLASS (self)->notify_items_removed (self, removed);
-#line 467 "DataCollection.c"
+#line 480 "DataCollection.c"
 }
 
 
 static void data_collection_real_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed) {
-	GeeIterable* _tmp0_ = NULL;
-	GeeIterable* _tmp1_ = NULL;
+	GeeIterable* _tmp0_;
+	GeeIterable* _tmp1_;
 #line 180 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
 #line 180 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -479,8 +492,8 @@ static void data_collection_real_notify_contents_altered (DataCollection* self,
 #line 182 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp1_ = removed;
 #line 182 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_emit_by_name (self, "contents-altered", _tmp0_, _tmp1_);
-#line 484 "DataCollection.c"
+	g_signal_emit (self, data_collection_signals[DATA_COLLECTION_CONTENTS_ALTERED_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 497 "DataCollection.c"
 }
 
 
@@ -489,19 +502,19 @@ void data_collection_notify_contents_altered (DataCollection* self, GeeIterable*
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 180 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	DATA_COLLECTION_GET_CLASS (self)->notify_contents_altered (self, added, removed);
-#line 493 "DataCollection.c"
+#line 506 "DataCollection.c"
 }
 
 
 static void data_collection_real_notify_items_altered (DataCollection* self, GeeMap* items) {
-	GeeMap* _tmp0_ = NULL;
+	GeeMap* _tmp0_;
 #line 185 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (GEE_IS_MAP (items));
 #line 186 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp0_ = items;
 #line 186 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_emit_by_name (self, "items-altered", _tmp0_);
-#line 505 "DataCollection.c"
+	g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_ALTERED_SIGNAL], 0, _tmp0_);
+#line 518 "DataCollection.c"
 }
 
 
@@ -510,14 +523,14 @@ void data_collection_notify_items_altered (DataCollection* self, GeeMap* items)
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 185 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	DATA_COLLECTION_GET_CLASS (self)->notify_items_altered (self, items);
-#line 514 "DataCollection.c"
+#line 527 "DataCollection.c"
 }
 
 
 static void data_collection_real_notify_ordering_changed (DataCollection* self) {
 #line 190 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_emit_by_name (self, "ordering-changed");
-#line 521 "DataCollection.c"
+	g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ORDERING_CHANGED_SIGNAL], 0);
+#line 534 "DataCollection.c"
 }
 
 
@@ -526,14 +539,14 @@ void data_collection_notify_ordering_changed (DataCollection* self) {
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 189 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	DATA_COLLECTION_GET_CLASS (self)->notify_ordering_changed (self);
-#line 530 "DataCollection.c"
+#line 543 "DataCollection.c"
 }
 
 
 static void data_collection_real_notify_property_set (DataCollection* self, const gchar* name, GValue* old, GValue* val) {
-	const gchar* _tmp0_ = NULL;
-	GValue* _tmp1_ = NULL;
-	GValue _tmp2_ = {0};
+	const gchar* _tmp0_;
+	GValue* _tmp1_;
+	GValue _tmp2_;
 #line 193 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (name != NULL);
 #line 193 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -545,8 +558,8 @@ static void data_collection_real_notify_property_set (DataCollection* self, cons
 #line 194 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp2_ = *val;
 #line 194 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_emit_by_name (self, "property-set", _tmp0_, _tmp1_, &_tmp2_);
-#line 550 "DataCollection.c"
+	g_signal_emit (self, data_collection_signals[DATA_COLLECTION_PROPERTY_SET_SIGNAL], 0, _tmp0_, _tmp1_, &_tmp2_);
+#line 563 "DataCollection.c"
 }
 
 
@@ -555,19 +568,19 @@ void data_collection_notify_property_set (DataCollection* self, const gchar* nam
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 193 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	DATA_COLLECTION_GET_CLASS (self)->notify_property_set (self, name, old, val);
-#line 559 "DataCollection.c"
+#line 572 "DataCollection.c"
 }
 
 
 static void data_collection_real_notify_property_cleared (DataCollection* self, const gchar* name) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 197 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (name != NULL);
 #line 198 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp0_ = name;
 #line 198 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_emit_by_name (self, "property-cleared", _tmp0_);
-#line 571 "DataCollection.c"
+	g_signal_emit (self, data_collection_signals[DATA_COLLECTION_PROPERTY_CLEARED_SIGNAL], 0, _tmp0_);
+#line 584 "DataCollection.c"
 }
 
 
@@ -576,14 +589,14 @@ void data_collection_notify_property_cleared (DataCollection* self, const gchar*
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 197 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	DATA_COLLECTION_GET_CLASS (self)->notify_property_cleared (self, name);
-#line 580 "DataCollection.c"
+#line 593 "DataCollection.c"
 }
 
 
 GeeCollection* data_collection_get_singleton (DataObject* object) {
 	GeeCollection* result = NULL;
-	DataObject* _tmp0_ = NULL;
-	SingletonCollection* _tmp1_ = NULL;
+	DataObject* _tmp0_;
+	SingletonCollection* _tmp1_;
 #line 206 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), NULL);
 #line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -594,16 +607,16 @@ GeeCollection* data_collection_get_singleton (DataObject* object) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 598 "DataCollection.c"
+#line 611 "DataCollection.c"
 }
 
 
 GeeMap* data_collection_get_alteration_singleton (DataObject* object, Alteration* alteration) {
 	GeeMap* result = NULL;
 	GeeMap* map = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	DataObject* _tmp1_ = NULL;
-	Alteration* _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	DataObject* _tmp1_;
+	Alteration* _tmp2_;
 #line 210 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), NULL);
 #line 210 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -622,7 +635,7 @@ GeeMap* data_collection_get_alteration_singleton (DataObject* object, Alteration
 	result = map;
 #line 215 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 626 "DataCollection.c"
+#line 639 "DataCollection.c"
 }
 
 
@@ -634,7 +647,7 @@ static gboolean data_collection_real_valid_type (DataCollection* self, DataObjec
 	result = TRUE;
 #line 219 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 638 "DataCollection.c"
+#line 651 "DataCollection.c"
 }
 
 
@@ -643,17 +656,17 @@ gboolean data_collection_valid_type (DataCollection* self, DataObject* object) {
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE);
 #line 218 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return DATA_COLLECTION_GET_CLASS (self)->valid_type (self, object);
-#line 647 "DataCollection.c"
+#line 660 "DataCollection.c"
 }
 
 
 Comparator data_collection_get_comparator (DataCollection* self, void** result_target) {
 	Comparator result = NULL;
-	DataSet* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	Comparator _tmp2_ = NULL;
-	Comparator _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
+	DataSet* _tmp0_;
+	void* _tmp1_;
+	Comparator _tmp2_;
+	Comparator _tmp3_;
+	void* _tmp3__target;
 #line 222 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
 #line 223 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -670,17 +683,17 @@ Comparator data_collection_get_comparator (DataCollection* self, void** result_t
 	result = _tmp3_;
 #line 223 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 674 "DataCollection.c"
+#line 687 "DataCollection.c"
 }
 
 
 ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* self, void** result_target) {
 	ComparatorPredicate result = NULL;
-	DataSet* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	ComparatorPredicate _tmp2_ = NULL;
-	ComparatorPredicate _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
+	DataSet* _tmp0_;
+	void* _tmp1_;
+	ComparatorPredicate _tmp2_;
+	ComparatorPredicate _tmp3_;
+	void* _tmp3__target;
 #line 226 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
 #line 227 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -697,16 +710,16 @@ ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* se
 	result = _tmp3_;
 #line 227 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 701 "DataCollection.c"
+#line 714 "DataCollection.c"
 }
 
 
 static void data_collection_real_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target) {
-	DataSet* _tmp0_ = NULL;
-	Comparator _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	ComparatorPredicate _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
+	DataSet* _tmp0_;
+	Comparator _tmp1_;
+	void* _tmp1__target;
+	ComparatorPredicate _tmp2_;
+	void* _tmp2__target;
 #line 231 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp0_ = self->priv->dataset;
 #line 231 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -721,7 +734,7 @@ static void data_collection_real_set_comparator (DataCollection* self, Comparato
 	data_set_set_comparator (_tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp2__target);
 #line 232 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	data_collection_notify_ordering_changed (self);
-#line 725 "DataCollection.c"
+#line 738 "DataCollection.c"
 }
 
 
@@ -730,19 +743,19 @@ void data_collection_set_comparator (DataCollection* self, Comparator comparator
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 230 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	DATA_COLLECTION_GET_CLASS (self)->set_comparator (self, comparator, comparator_target, predicate, predicate_target);
-#line 734 "DataCollection.c"
+#line 747 "DataCollection.c"
 }
 
 
 static void data_collection_real_reset_comparator (DataCollection* self) {
-	DataSet* _tmp0_ = NULL;
+	DataSet* _tmp0_;
 #line 237 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp0_ = self->priv->dataset;
 #line 237 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	data_set_reset_comparator (_tmp0_);
 #line 238 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	data_collection_notify_ordering_changed (self);
-#line 746 "DataCollection.c"
+#line 759 "DataCollection.c"
 }
 
 
@@ -751,14 +764,14 @@ void data_collection_reset_comparator (DataCollection* self) {
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 236 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	DATA_COLLECTION_GET_CLASS (self)->reset_comparator (self);
-#line 755 "DataCollection.c"
+#line 768 "DataCollection.c"
 }
 
 
 static GeeCollection* data_collection_real_get_all (DataCollection* self) {
 	GeeCollection* result = NULL;
-	DataSet* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	DataSet* _tmp0_;
+	GeeList* _tmp1_;
 #line 242 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp0_ = self->priv->dataset;
 #line 242 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -767,7 +780,7 @@ static GeeCollection* data_collection_real_get_all (DataCollection* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 242 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 771 "DataCollection.c"
+#line 784 "DataCollection.c"
 }
 
 
@@ -776,14 +789,14 @@ GeeCollection* data_collection_get_all (DataCollection* self) {
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
 #line 241 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return DATA_COLLECTION_GET_CLASS (self)->get_all (self);
-#line 780 "DataCollection.c"
+#line 793 "DataCollection.c"
 }
 
 
 DataSet* data_collection_get_dataset_copy (DataCollection* self) {
 	DataSet* result = NULL;
-	DataSet* _tmp0_ = NULL;
-	DataSet* _tmp1_ = NULL;
+	DataSet* _tmp0_;
+	DataSet* _tmp1_;
 #line 245 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
 #line 246 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -794,14 +807,14 @@ DataSet* data_collection_get_dataset_copy (DataCollection* self) {
 	result = _tmp1_;
 #line 246 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 798 "DataCollection.c"
+#line 811 "DataCollection.c"
 }
 
 
 static gint data_collection_real_get_count (DataCollection* self) {
 	gint result = 0;
-	DataSet* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	DataSet* _tmp0_;
+	gint _tmp1_;
 #line 250 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp0_ = self->priv->dataset;
 #line 250 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -810,7 +823,7 @@ static gint data_collection_real_get_count (DataCollection* self) {
 	result = _tmp1_;
 #line 250 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 814 "DataCollection.c"
+#line 827 "DataCollection.c"
 }
 
 
@@ -819,15 +832,15 @@ gint data_collection_get_count (DataCollection* self) {
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), 0);
 #line 249 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return DATA_COLLECTION_GET_CLASS (self)->get_count (self);
-#line 823 "DataCollection.c"
+#line 836 "DataCollection.c"
 }
 
 
 static DataObject* data_collection_real_get_at (DataCollection* self, gint index) {
 	DataObject* result = NULL;
-	DataSet* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	DataObject* _tmp2_ = NULL;
+	DataSet* _tmp0_;
+	gint _tmp1_;
+	DataObject* _tmp2_;
 #line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp0_ = self->priv->dataset;
 #line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -838,7 +851,7 @@ static DataObject* data_collection_real_get_at (DataCollection* self, gint index
 	result = _tmp2_;
 #line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 842 "DataCollection.c"
+#line 855 "DataCollection.c"
 }
 
 
@@ -847,15 +860,15 @@ DataObject* data_collection_get_at (DataCollection* self, gint index) {
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
 #line 253 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return DATA_COLLECTION_GET_CLASS (self)->get_at (self, index);
-#line 851 "DataCollection.c"
+#line 864 "DataCollection.c"
 }
 
 
 static gint data_collection_real_index_of (DataCollection* self, DataObject* object) {
 	gint result = 0;
-	DataSet* _tmp0_ = NULL;
-	DataObject* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	DataSet* _tmp0_;
+	DataObject* _tmp1_;
+	gint _tmp2_;
 #line 257 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), 0);
 #line 258 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -868,7 +881,7 @@ static gint data_collection_real_index_of (DataCollection* self, DataObject* obj
 	result = _tmp2_;
 #line 258 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 872 "DataCollection.c"
+#line 885 "DataCollection.c"
 }
 
 
@@ -877,14 +890,14 @@ gint data_collection_index_of (DataCollection* self, DataObject* object) {
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), 0);
 #line 257 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return DATA_COLLECTION_GET_CLASS (self)->index_of (self, object);
-#line 881 "DataCollection.c"
+#line 894 "DataCollection.c"
 }
 
 
 static gboolean data_collection_real_contains (DataCollection* self, DataObject* object) {
 	gboolean result = FALSE;
-	DataObject* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	DataObject* _tmp0_;
+	gboolean _tmp1_;
 #line 261 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
 #line 262 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -895,7 +908,7 @@ static gboolean data_collection_real_contains (DataCollection* self, DataObject*
 	result = _tmp1_;
 #line 262 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 899 "DataCollection.c"
+#line 912 "DataCollection.c"
 }
 
 
@@ -904,18 +917,18 @@ gboolean data_collection_contains (DataCollection* self, DataObject* object) {
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE);
 #line 261 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return DATA_COLLECTION_GET_CLASS (self)->contains (self, object);
-#line 908 "DataCollection.c"
+#line 921 "DataCollection.c"
 }
 
 
 static gboolean data_collection_internal_contains (DataCollection* self, DataObject* object) {
 	gboolean result = FALSE;
-	DataSet* _tmp0_ = NULL;
-	DataObject* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	DataObject* _tmp3_ = NULL;
-	DataCollection* _tmp4_ = NULL;
-	DataCollection* _tmp5_ = NULL;
+	DataSet* _tmp0_;
+	DataObject* _tmp1_;
+	gboolean _tmp2_;
+	DataObject* _tmp3_;
+	DataCollection* _tmp4_;
+	DataCollection* _tmp5_;
 #line 267 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE);
 #line 267 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -932,7 +945,7 @@ static gboolean data_collection_internal_contains (DataCollection* self, DataObj
 		result = FALSE;
 #line 269 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		return result;
-#line 936 "DataCollection.c"
+#line 949 "DataCollection.c"
 	}
 #line 271 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp3_ = object;
@@ -948,19 +961,19 @@ static gboolean data_collection_internal_contains (DataCollection* self, DataObj
 	result = TRUE;
 #line 273 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 952 "DataCollection.c"
+#line 965 "DataCollection.c"
 }
 
 
 static void data_collection_internal_add (DataCollection* self, DataObject* object) {
-	DataObject* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	DataObject* _tmp2_ = NULL;
-	gint64 _tmp3_ = 0LL;
+	DataObject* _tmp0_;
+	gboolean _tmp1_;
+	DataObject* _tmp2_;
+	gint64 _tmp3_;
 	gboolean added = FALSE;
-	DataSet* _tmp4_ = NULL;
-	DataObject* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	DataSet* _tmp4_;
+	DataObject* _tmp5_;
+	gboolean _tmp6_;
 #line 276 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 276 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -989,19 +1002,19 @@ static void data_collection_internal_add (DataCollection* self, DataObject* obje
 	added = _tmp6_;
 #line 282 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_vala_assert (added, "added");
-#line 993 "DataCollection.c"
+#line 1006 "DataCollection.c"
 }
 
 
 static void data_collection_internal_add_many (DataCollection* self, GeeList* objects, ProgressMonitor monitor, void* monitor_target) {
 	gint count = 0;
-	GeeList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gboolean added = FALSE;
-	DataSet* _tmp18_ = NULL;
-	GeeList* _tmp19_ = NULL;
-	gboolean _tmp20_ = FALSE;
+	DataSet* _tmp18_;
+	GeeList* _tmp19_;
+	gboolean _tmp20_;
 #line 285 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 285 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1014,40 +1027,40 @@ static void data_collection_internal_add_many (DataCollection* self, GeeList* ob
 	_tmp2_ = _tmp1_;
 #line 286 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	count = _tmp2_;
-#line 1018 "DataCollection.c"
+#line 1031 "DataCollection.c"
 	{
 		gint ctr = 0;
 #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		ctr = 0;
-#line 1023 "DataCollection.c"
+#line 1036 "DataCollection.c"
 		{
 			gboolean _tmp3_ = FALSE;
 #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp3_ = TRUE;
 #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			while (TRUE) {
-#line 1030 "DataCollection.c"
-				gint _tmp5_ = 0;
-				gint _tmp6_ = 0;
+#line 1043 "DataCollection.c"
+				gint _tmp5_;
+				gint _tmp6_;
 				DataObject* object = NULL;
-				GeeList* _tmp7_ = NULL;
-				gint _tmp8_ = 0;
-				gpointer _tmp9_ = NULL;
-				DataObject* _tmp10_ = NULL;
-				gboolean _tmp11_ = FALSE;
-				DataObject* _tmp12_ = NULL;
-				gint64 _tmp13_ = 0LL;
-				ProgressMonitor _tmp14_ = NULL;
-				void* _tmp14__target = NULL;
+				GeeList* _tmp7_;
+				gint _tmp8_;
+				gpointer _tmp9_;
+				DataObject* _tmp10_;
+				gboolean _tmp11_;
+				DataObject* _tmp12_;
+				gint64 _tmp13_;
+				ProgressMonitor _tmp14_;
+				void* _tmp14__target;
 #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				if (!_tmp3_) {
-#line 1045 "DataCollection.c"
-					gint _tmp4_ = 0;
+#line 1058 "DataCollection.c"
+					gint _tmp4_;
 #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					_tmp4_ = ctr;
 #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					ctr = _tmp4_ + 1;
-#line 1051 "DataCollection.c"
+#line 1064 "DataCollection.c"
 				}
 #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_tmp3_ = FALSE;
@@ -1059,7 +1072,7 @@ static void data_collection_internal_add_many (DataCollection* self, GeeList* ob
 				if (!(_tmp5_ < _tmp6_)) {
 #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					break;
-#line 1063 "DataCollection.c"
+#line 1076 "DataCollection.c"
 				}
 #line 288 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_tmp7_ = objects;
@@ -1089,11 +1102,11 @@ static void data_collection_internal_add_many (DataCollection* self, GeeList* ob
 				_tmp14__target = monitor_target;
 #line 293 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				if (_tmp14_ != NULL) {
-#line 1093 "DataCollection.c"
-					ProgressMonitor _tmp15_ = NULL;
-					void* _tmp15__target = NULL;
-					gint _tmp16_ = 0;
-					gint _tmp17_ = 0;
+#line 1106 "DataCollection.c"
+					ProgressMonitor _tmp15_;
+					void* _tmp15__target;
+					gint _tmp16_;
+					gint _tmp17_;
 #line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					_tmp15_ = monitor;
 #line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1104,11 +1117,11 @@ static void data_collection_internal_add_many (DataCollection* self, GeeList* ob
 					_tmp17_ = count;
 #line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					_tmp15_ ((guint64) _tmp16_, (guint64) _tmp17_, TRUE, _tmp15__target);
-#line 1108 "DataCollection.c"
+#line 1121 "DataCollection.c"
 				}
 #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_g_object_unref0 (object);
-#line 1112 "DataCollection.c"
+#line 1125 "DataCollection.c"
 			}
 		}
 	}
@@ -1122,16 +1135,16 @@ static void data_collection_internal_add_many (DataCollection* self, GeeList* ob
 	added = _tmp20_;
 #line 298 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_vala_assert (added, "added");
-#line 1126 "DataCollection.c"
+#line 1139 "DataCollection.c"
 }
 
 
 static void data_collection_internal_remove (DataCollection* self, DataObject* object) {
 	gboolean removed = FALSE;
-	DataSet* _tmp0_ = NULL;
-	DataObject* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	DataObject* _tmp3_ = NULL;
+	DataSet* _tmp0_;
+	DataObject* _tmp1_;
+	gboolean _tmp2_;
+	DataObject* _tmp3_;
 #line 301 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 301 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1150,21 +1163,21 @@ static void data_collection_internal_remove (DataCollection* self, DataObject* o
 	_tmp3_ = object;
 #line 305 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	data_object_internal_clear_membership (_tmp3_);
-#line 1154 "DataCollection.c"
+#line 1167 "DataCollection.c"
 }
 
 
 static gboolean data_collection_real_add (DataCollection* self, DataObject* object) {
 	gboolean result = FALSE;
-	DataObject* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	DataObject* _tmp7_ = NULL;
+	DataObject* _tmp0_;
+	gboolean _tmp1_;
+	DataObject* _tmp7_;
 	GeeCollection* added = NULL;
-	DataObject* _tmp8_ = NULL;
-	GeeCollection* _tmp9_ = NULL;
-	GeeCollection* _tmp10_ = NULL;
-	GeeCollection* _tmp11_ = NULL;
-	DataObject* _tmp12_ = NULL;
+	DataObject* _tmp8_;
+	GeeCollection* _tmp9_;
+	GeeCollection* _tmp10_;
+	GeeCollection* _tmp11_;
+	DataObject* _tmp12_;
 #line 309 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
 #line 310 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1173,12 +1186,12 @@ static gboolean data_collection_real_add (DataCollection* self, DataObject* obje
 	_tmp1_ = data_collection_internal_contains (self, _tmp0_);
 #line 310 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	if (_tmp1_) {
-#line 1177 "DataCollection.c"
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		DataObject* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+#line 1190 "DataCollection.c"
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		DataObject* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp2_ = data_collection_to_string (self);
 #line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1199,7 +1212,7 @@ static gboolean data_collection_real_add (DataCollection* self, DataObject* obje
 		result = FALSE;
 #line 313 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		return result;
-#line 1203 "DataCollection.c"
+#line 1216 "DataCollection.c"
 	}
 #line 316 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp7_ = object;
@@ -1229,7 +1242,7 @@ static gboolean data_collection_real_add (DataCollection* self, DataObject* obje
 	_g_object_unref0 (added);
 #line 326 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 1233 "DataCollection.c"
+#line 1246 "DataCollection.c"
 }
 
 
@@ -1238,35 +1251,35 @@ gboolean data_collection_add (DataCollection* self, DataObject* object) {
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE);
 #line 309 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return DATA_COLLECTION_GET_CLASS (self)->add (self, object);
-#line 1242 "DataCollection.c"
+#line 1255 "DataCollection.c"
 }
 
 
 static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target) {
 	GeeCollection* result = NULL;
 	GeeArrayList* added = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 	gint count = 0;
-	GeeArrayList* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	GeeArrayList* _tmp20_ = NULL;
-	ProgressMonitor _tmp21_ = NULL;
-	void* _tmp21__target = NULL;
-	GeeArrayList* _tmp22_ = NULL;
-	GeeArrayList* _tmp23_ = NULL;
+	GeeArrayList* _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	GeeArrayList* _tmp20_;
+	ProgressMonitor _tmp21_;
+	void* _tmp21__target;
+	GeeArrayList* _tmp22_;
+	GeeArrayList* _tmp23_;
 #line 330 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (objects), NULL);
 #line 332 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp0_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 332 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	added = _tmp0_;
-#line 1266 "DataCollection.c"
+#line 1279 "DataCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp1_ = objects;
 #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1275,16 +1288,16 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
 		_object_it = _tmp2_;
 #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		while (TRUE) {
-#line 1279 "DataCollection.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 1292 "DataCollection.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
-			DataObject* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
-			GeeArrayList* _tmp14_ = NULL;
-			DataObject* _tmp15_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
+			DataObject* _tmp7_;
+			gboolean _tmp8_;
+			GeeArrayList* _tmp14_;
+			DataObject* _tmp15_;
 #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp3_ = _object_it;
 #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1293,7 +1306,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
 			if (!_tmp4_) {
 #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				break;
-#line 1297 "DataCollection.c"
+#line 1310 "DataCollection.c"
 			}
 #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp5_ = _object_it;
@@ -1307,12 +1320,12 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
 			_tmp8_ = data_collection_internal_contains (self, _tmp7_);
 #line 334 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			if (_tmp8_) {
-#line 1311 "DataCollection.c"
-				gchar* _tmp9_ = NULL;
-				gchar* _tmp10_ = NULL;
-				DataObject* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
-				gchar* _tmp13_ = NULL;
+#line 1324 "DataCollection.c"
+				gchar* _tmp9_;
+				gchar* _tmp10_;
+				DataObject* _tmp11_;
+				gchar* _tmp12_;
+				gchar* _tmp13_;
 #line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_tmp9_ = data_collection_to_string (self);
 #line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1333,7 +1346,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
 				_g_object_unref0 (object);
 #line 337 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				continue;
-#line 1337 "DataCollection.c"
+#line 1350 "DataCollection.c"
 			}
 #line 340 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp14_ = added;
@@ -1343,11 +1356,11 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_);
 #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_g_object_unref0 (object);
-#line 1347 "DataCollection.c"
+#line 1360 "DataCollection.c"
 		}
 #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 1351 "DataCollection.c"
+#line 1364 "DataCollection.c"
 	}
 #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp16_ = added;
@@ -1365,7 +1378,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
 		result = G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection);
 #line 345 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		return result;
-#line 1369 "DataCollection.c"
+#line 1382 "DataCollection.c"
 	}
 #line 347 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp20_ = added;
@@ -1383,34 +1396,34 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
 	_tmp23_ = added;
 #line 351 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	data_collection_notify_contents_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable), NULL);
-#line 1387 "DataCollection.c"
+#line 1400 "DataCollection.c"
 	{
 		gint ctr = 0;
 #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		ctr = 0;
-#line 1392 "DataCollection.c"
+#line 1405 "DataCollection.c"
 		{
 			gboolean _tmp24_ = FALSE;
 #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp24_ = TRUE;
 #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			while (TRUE) {
-#line 1399 "DataCollection.c"
-				gint _tmp26_ = 0;
-				gint _tmp27_ = 0;
-				GeeArrayList* _tmp28_ = NULL;
-				gint _tmp29_ = 0;
-				gpointer _tmp30_ = NULL;
-				DataObject* _tmp31_ = NULL;
+#line 1412 "DataCollection.c"
+				gint _tmp26_;
+				gint _tmp27_;
+				GeeArrayList* _tmp28_;
+				gint _tmp29_;
+				gpointer _tmp30_;
+				DataObject* _tmp31_;
 #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				if (!_tmp24_) {
-#line 1408 "DataCollection.c"
-					gint _tmp25_ = 0;
+#line 1421 "DataCollection.c"
+					gint _tmp25_;
 #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					_tmp25_ = ctr;
 #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					ctr = _tmp25_ + 1;
-#line 1414 "DataCollection.c"
+#line 1427 "DataCollection.c"
 				}
 #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_tmp24_ = FALSE;
@@ -1422,7 +1435,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
 				if (!(_tmp26_ < _tmp27_)) {
 #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					break;
-#line 1426 "DataCollection.c"
+#line 1439 "DataCollection.c"
 				}
 #line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_tmp28_ = added;
@@ -1436,7 +1449,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
 				data_object_notify_membership_changed (_tmp31_, self);
 #line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_g_object_unref0 (_tmp31_);
-#line 1440 "DataCollection.c"
+#line 1453 "DataCollection.c"
 			}
 		}
 	}
@@ -1444,7 +1457,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
 	result = G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection);
 #line 357 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 1448 "DataCollection.c"
+#line 1461 "DataCollection.c"
 }
 
 
@@ -1453,13 +1466,13 @@ GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* ob
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
 #line 330 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return DATA_COLLECTION_GET_CLASS (self)->add_many (self, objects, monitor, monitor_target);
-#line 1457 "DataCollection.c"
+#line 1470 "DataCollection.c"
 }
 
 
 Marker* data_collection_start_marking (DataCollection* self) {
 	Marker* result = NULL;
-	DataCollectionMarkerImpl* _tmp0_ = NULL;
+	DataCollectionMarkerImpl* _tmp0_;
 #line 361 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
 #line 362 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1468,15 +1481,15 @@ Marker* data_collection_start_marking (DataCollection* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MARKER, Marker);
 #line 362 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 1472 "DataCollection.c"
+#line 1485 "DataCollection.c"
 }
 
 
 Marker* data_collection_mark (DataCollection* self, DataObject* object) {
 	Marker* result = NULL;
 	Marker* marker = NULL;
-	DataCollectionMarkerImpl* _tmp0_ = NULL;
-	DataObject* _tmp1_ = NULL;
+	DataCollectionMarkerImpl* _tmp0_;
+	DataObject* _tmp1_;
 #line 366 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
 #line 366 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1493,15 +1506,15 @@ Marker* data_collection_mark (DataCollection* self, DataObject* object) {
 	result = marker;
 #line 370 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 1497 "DataCollection.c"
+#line 1510 "DataCollection.c"
 }
 
 
 Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects) {
 	Marker* result = NULL;
 	Marker* marker = NULL;
-	DataCollectionMarkerImpl* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	DataCollectionMarkerImpl* _tmp0_;
+	GeeCollection* _tmp1_;
 #line 374 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
 #line 374 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1518,31 +1531,31 @@ Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects)
 	result = marker;
 #line 378 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 1522 "DataCollection.c"
+#line 1535 "DataCollection.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 385 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1529 "DataCollection.c"
+#line 1542 "DataCollection.c"
 }
 
 
 void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedAction action, void* action_target, ProgressMonitor monitor, void* monitor_target, GObject* user) {
 	DataCollectionMarkerImpl* marker = NULL;
-	Marker* _tmp0_ = NULL;
-	DataCollectionMarkerImpl* _tmp1_ = NULL;
-	DataCollectionMarkerImpl* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	DataCollectionMarkerImpl* _tmp4_ = NULL;
+	Marker* _tmp0_;
+	DataCollectionMarkerImpl* _tmp1_;
+	DataCollectionMarkerImpl* _tmp2_;
+	gboolean _tmp3_;
+	DataCollectionMarkerImpl* _tmp4_;
 	guint64 count = 0ULL;
 	guint64 total = 0ULL;
-	DataCollectionMarkerImpl* _tmp5_ = NULL;
-	GeeHashSet* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	DataCollectionMarkerImpl* _tmp31_ = NULL;
+	DataCollectionMarkerImpl* _tmp5_;
+	GeeHashSet* _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	DataCollectionMarkerImpl* _tmp31_;
 #line 383 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 383 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1577,12 +1590,12 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
 	_tmp8_ = _tmp7_;
 #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	total = (guint64) _tmp8_;
-#line 1581 "DataCollection.c"
+#line 1594 "DataCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		DataCollectionMarkerImpl* _tmp9_ = NULL;
-		GeeHashSet* _tmp10_ = NULL;
-		GeeIterator* _tmp11_ = NULL;
+		DataCollectionMarkerImpl* _tmp9_;
+		GeeHashSet* _tmp10_;
+		GeeIterator* _tmp11_;
 #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp9_ = marker;
 #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1593,21 +1606,21 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
 		_object_it = _tmp11_;
 #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		while (TRUE) {
-#line 1597 "DataCollection.c"
-			GeeIterator* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
+#line 1610 "DataCollection.c"
+			GeeIterator* _tmp12_;
+			gboolean _tmp13_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp14_ = NULL;
-			gpointer _tmp15_ = NULL;
-			DataObject* _tmp16_ = NULL;
-			gboolean _tmp17_ = FALSE;
-			MarkedAction _tmp21_ = NULL;
-			void* _tmp21__target = NULL;
-			DataObject* _tmp22_ = NULL;
-			GObject* _tmp23_ = NULL;
-			gboolean _tmp24_ = FALSE;
-			ProgressMonitor _tmp25_ = NULL;
-			void* _tmp25__target = NULL;
+			GeeIterator* _tmp14_;
+			gpointer _tmp15_;
+			DataObject* _tmp16_;
+			gboolean _tmp17_;
+			MarkedAction _tmp21_;
+			void* _tmp21__target;
+			DataObject* _tmp22_;
+			GObject* _tmp23_;
+			gboolean _tmp24_;
+			ProgressMonitor _tmp25_;
+			void* _tmp25__target;
 #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp12_ = _object_it;
 #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1616,7 +1629,7 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
 			if (!_tmp13_) {
 #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				break;
-#line 1620 "DataCollection.c"
+#line 1633 "DataCollection.c"
 			}
 #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp14_ = _object_it;
@@ -1630,10 +1643,10 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
 			_tmp17_ = data_collection_internal_contains (self, _tmp16_);
 #line 398 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			if (!_tmp17_) {
-#line 1634 "DataCollection.c"
-				DataObject* _tmp18_ = NULL;
-				gchar* _tmp19_ = NULL;
-				gchar* _tmp20_ = NULL;
+#line 1647 "DataCollection.c"
+				DataObject* _tmp18_;
+				gchar* _tmp19_;
+				gchar* _tmp20_;
 #line 399 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_tmp18_ = object;
 #line 399 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1649,7 +1662,7 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
 				_g_object_unref0 (object);
 #line 401 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				continue;
-#line 1652 "DataCollection.c"
+#line 1665 "DataCollection.c"
 			}
 #line 404 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp21_ = action;
@@ -1667,7 +1680,7 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
 				_g_object_unref0 (object);
 #line 405 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				break;
-#line 1670 "DataCollection.c"
+#line 1683 "DataCollection.c"
 			}
 #line 407 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp25_ = monitor;
@@ -1675,13 +1688,13 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
 			_tmp25__target = monitor_target;
 #line 407 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			if (_tmp25_ != NULL) {
-#line 1678 "DataCollection.c"
-				ProgressMonitor _tmp26_ = NULL;
-				void* _tmp26__target = NULL;
-				guint64 _tmp27_ = 0ULL;
-				guint64 _tmp28_ = 0ULL;
-				guint64 _tmp29_ = 0ULL;
-				gboolean _tmp30_ = FALSE;
+#line 1691 "DataCollection.c"
+				ProgressMonitor _tmp26_;
+				void* _tmp26__target;
+				guint64 _tmp27_;
+				guint64 _tmp28_;
+				guint64 _tmp29_;
+				gboolean _tmp30_;
 #line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_tmp26_ = monitor;
 #line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1702,16 +1715,16 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
 					_g_object_unref0 (object);
 #line 409 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					break;
-#line 1705 "DataCollection.c"
+#line 1718 "DataCollection.c"
 				}
 			}
 #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_g_object_unref0 (object);
-#line 1710 "DataCollection.c"
+#line 1723 "DataCollection.c"
 		}
 #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 1714 "DataCollection.c"
+#line 1727 "DataCollection.c"
 	}
 #line 414 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp31_ = marker;
@@ -1719,24 +1732,24 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
 	data_collection_marker_impl_finished (_tmp31_);
 #line 383 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_g_object_unref0 (marker);
-#line 1722 "DataCollection.c"
+#line 1735 "DataCollection.c"
 }
 
 
 static void data_collection_real_remove_marked (DataCollection* self, Marker* m) {
 	DataCollectionMarkerImpl* marker = NULL;
-	Marker* _tmp0_ = NULL;
-	DataCollectionMarkerImpl* _tmp1_ = NULL;
-	DataCollectionMarkerImpl* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	DataCollectionMarkerImpl* _tmp4_ = NULL;
+	Marker* _tmp0_;
+	DataCollectionMarkerImpl* _tmp1_;
+	DataCollectionMarkerImpl* _tmp2_;
+	gboolean _tmp3_;
+	DataCollectionMarkerImpl* _tmp4_;
 	GeeArrayList* skipped = NULL;
-	GeeArrayList* _tmp22_ = NULL;
-	DataCollectionMarkerImpl* _tmp26_ = NULL;
-	GeeHashSet* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	DataCollectionMarkerImpl* _tmp42_ = NULL;
+	GeeArrayList* _tmp22_;
+	DataCollectionMarkerImpl* _tmp26_;
+	GeeHashSet* _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
+	DataCollectionMarkerImpl* _tmp42_;
 #line 419 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (IS_MARKER (m));
 #line 420 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1757,12 +1770,12 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 	data_collection_marker_impl_freeze (_tmp4_);
 #line 428 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	skipped = NULL;
-#line 1760 "DataCollection.c"
+#line 1773 "DataCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		DataCollectionMarkerImpl* _tmp5_ = NULL;
-		GeeHashSet* _tmp6_ = NULL;
-		GeeIterator* _tmp7_ = NULL;
+		DataCollectionMarkerImpl* _tmp5_;
+		GeeHashSet* _tmp6_;
+		GeeIterator* _tmp7_;
 #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp5_ = marker;
 #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1773,15 +1786,15 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 		_object_it = _tmp7_;
 #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		while (TRUE) {
-#line 1776 "DataCollection.c"
-			GeeIterator* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+#line 1789 "DataCollection.c"
+			GeeIterator* _tmp8_;
+			gboolean _tmp9_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			gpointer _tmp11_ = NULL;
-			DataObject* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
-			DataObject* _tmp21_ = NULL;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			DataObject* _tmp12_;
+			gboolean _tmp13_;
+			DataObject* _tmp21_;
 #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp8_ = _object_it;
 #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1790,7 +1803,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 			if (!_tmp9_) {
 #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				break;
-#line 1793 "DataCollection.c"
+#line 1806 "DataCollection.c"
 			}
 #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp10_ = _object_it;
@@ -1804,13 +1817,13 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 			_tmp13_ = data_collection_internal_contains (self, _tmp12_);
 #line 431 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			if (!_tmp13_) {
-#line 1807 "DataCollection.c"
-				DataObject* _tmp14_ = NULL;
-				gchar* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
-				GeeArrayList* _tmp17_ = NULL;
-				GeeArrayList* _tmp19_ = NULL;
-				DataObject* _tmp20_ = NULL;
+#line 1820 "DataCollection.c"
+				DataObject* _tmp14_;
+				gchar* _tmp15_;
+				gchar* _tmp16_;
+				GeeArrayList* _tmp17_;
+				GeeArrayList* _tmp19_;
+				DataObject* _tmp20_;
 #line 432 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_tmp14_ = object;
 #line 432 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1826,15 +1839,15 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 				_tmp17_ = skipped;
 #line 434 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				if (_tmp17_ == NULL) {
-#line 1828 "DataCollection.c"
-					GeeArrayList* _tmp18_ = NULL;
+#line 1841 "DataCollection.c"
+					GeeArrayList* _tmp18_;
 #line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					_tmp18_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					_g_object_unref0 (skipped);
 #line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					skipped = _tmp18_;
-#line 1836 "DataCollection.c"
+#line 1849 "DataCollection.c"
 				}
 #line 437 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_tmp19_ = skipped;
@@ -1846,7 +1859,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 				_g_object_unref0 (object);
 #line 439 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				continue;
-#line 1848 "DataCollection.c"
+#line 1861 "DataCollection.c"
 			}
 #line 442 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp21_ = object;
@@ -1854,20 +1867,20 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 			data_collection_internal_remove (self, _tmp21_);
 #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_g_object_unref0 (object);
-#line 1856 "DataCollection.c"
+#line 1869 "DataCollection.c"
 		}
 #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 1860 "DataCollection.c"
+#line 1873 "DataCollection.c"
 	}
 #line 445 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp22_ = skipped;
 #line 445 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	if (_tmp22_ != NULL) {
-#line 1866 "DataCollection.c"
-		DataCollectionMarkerImpl* _tmp23_ = NULL;
-		GeeHashSet* _tmp24_ = NULL;
-		GeeArrayList* _tmp25_ = NULL;
+#line 1879 "DataCollection.c"
+		DataCollectionMarkerImpl* _tmp23_;
+		GeeHashSet* _tmp24_;
+		GeeArrayList* _tmp25_;
 #line 446 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp23_ = marker;
 #line 446 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1876,7 +1889,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 		_tmp25_ = skipped;
 #line 446 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1878 "DataCollection.c"
+#line 1891 "DataCollection.c"
 	}
 #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp26_ = marker;
@@ -1888,11 +1901,11 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 	_tmp29_ = _tmp28_;
 #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	if (_tmp29_ > 0) {
-#line 1890 "DataCollection.c"
-		DataCollectionMarkerImpl* _tmp30_ = NULL;
-		GeeHashSet* _tmp31_ = NULL;
-		DataCollectionMarkerImpl* _tmp32_ = NULL;
-		GeeHashSet* _tmp33_ = NULL;
+#line 1903 "DataCollection.c"
+		DataCollectionMarkerImpl* _tmp30_;
+		GeeHashSet* _tmp31_;
+		DataCollectionMarkerImpl* _tmp32_;
+		GeeHashSet* _tmp33_;
 #line 450 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp30_ = marker;
 #line 450 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1905,12 +1918,12 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 		_tmp33_ = _tmp32_->marked;
 #line 451 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		data_collection_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1907 "DataCollection.c"
+#line 1920 "DataCollection.c"
 		{
 			GeeIterator* _object_it = NULL;
-			DataCollectionMarkerImpl* _tmp34_ = NULL;
-			GeeHashSet* _tmp35_ = NULL;
-			GeeIterator* _tmp36_ = NULL;
+			DataCollectionMarkerImpl* _tmp34_;
+			GeeHashSet* _tmp35_;
+			GeeIterator* _tmp36_;
 #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp34_ = marker;
 #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1921,13 +1934,13 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 			_object_it = _tmp36_;
 #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			while (TRUE) {
-#line 1923 "DataCollection.c"
-				GeeIterator* _tmp37_ = NULL;
-				gboolean _tmp38_ = FALSE;
+#line 1936 "DataCollection.c"
+				GeeIterator* _tmp37_;
+				gboolean _tmp38_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp39_ = NULL;
-				gpointer _tmp40_ = NULL;
-				DataObject* _tmp41_ = NULL;
+				GeeIterator* _tmp39_;
+				gpointer _tmp40_;
+				DataObject* _tmp41_;
 #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_tmp37_ = _object_it;
 #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1936,7 +1949,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 				if (!_tmp38_) {
 #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					break;
-#line 1938 "DataCollection.c"
+#line 1951 "DataCollection.c"
 				}
 #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_tmp39_ = _object_it;
@@ -1950,11 +1963,11 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 				data_object_notify_membership_changed (_tmp41_, NULL);
 #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_g_object_unref0 (object);
-#line 1952 "DataCollection.c"
+#line 1965 "DataCollection.c"
 			}
 #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_g_object_unref0 (_object_it);
-#line 1956 "DataCollection.c"
+#line 1969 "DataCollection.c"
 		}
 	}
 #line 459 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1965,7 +1978,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 	_g_object_unref0 (skipped);
 #line 419 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_g_object_unref0 (marker);
-#line 1967 "DataCollection.c"
+#line 1980 "DataCollection.c"
 }
 
 
@@ -1974,17 +1987,17 @@ void data_collection_remove_marked (DataCollection* self, Marker* m) {
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 419 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	DATA_COLLECTION_GET_CLASS (self)->remove_marked (self, m);
-#line 1976 "DataCollection.c"
+#line 1989 "DataCollection.c"
 }
 
 
 static void data_collection_real_clear (DataCollection* self) {
-	DataSet* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	DataSet* _tmp0_;
+	gint _tmp1_;
 	GeeArrayList* removed = NULL;
-	GeeArrayList* _tmp2_ = NULL;
-	GeeArrayList* _tmp12_ = NULL;
-	GeeArrayList* _tmp13_ = NULL;
+	GeeArrayList* _tmp2_;
+	GeeArrayList* _tmp12_;
+	GeeArrayList* _tmp13_;
 #line 463 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp0_ = self->priv->dataset;
 #line 463 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1993,32 +2006,32 @@ static void data_collection_real_clear (DataCollection* self) {
 	if (_tmp1_ == 0) {
 #line 464 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		return;
-#line 1995 "DataCollection.c"
+#line 2008 "DataCollection.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp2_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 468 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	removed = _tmp2_;
-#line 2001 "DataCollection.c"
+#line 2014 "DataCollection.c"
 	{
 		gboolean _tmp3_ = FALSE;
 #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp3_ = TRUE;
 #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		while (TRUE) {
-#line 2008 "DataCollection.c"
+#line 2021 "DataCollection.c"
 			DataObject* object = NULL;
-			DataSet* _tmp6_ = NULL;
-			DataObject* _tmp7_ = NULL;
-			DataObject* _tmp8_ = NULL;
-			GeeArrayList* _tmp9_ = NULL;
-			DataObject* _tmp10_ = NULL;
-			DataObject* _tmp11_ = NULL;
+			DataSet* _tmp6_;
+			DataObject* _tmp7_;
+			DataObject* _tmp8_;
+			GeeArrayList* _tmp9_;
+			DataObject* _tmp10_;
+			DataObject* _tmp11_;
 #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			if (!_tmp3_) {
-#line 2018 "DataCollection.c"
-				DataSet* _tmp4_ = NULL;
-				gint _tmp5_ = 0;
+#line 2031 "DataCollection.c"
+				DataSet* _tmp4_;
+				gint _tmp5_;
 #line 475 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_tmp4_ = self->priv->dataset;
 #line 475 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2027,7 +2040,7 @@ static void data_collection_real_clear (DataCollection* self) {
 				if (!(_tmp5_ > 0)) {
 #line 475 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					break;
-#line 2029 "DataCollection.c"
+#line 2042 "DataCollection.c"
 				}
 			}
 #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2054,7 +2067,7 @@ static void data_collection_real_clear (DataCollection* self) {
 			data_collection_internal_remove (self, _tmp11_);
 #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_g_object_unref0 (object);
-#line 2056 "DataCollection.c"
+#line 2069 "DataCollection.c"
 		}
 	}
 #line 478 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2065,15 +2078,15 @@ static void data_collection_real_clear (DataCollection* self) {
 	_tmp13_ = removed;
 #line 479 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	data_collection_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2067 "DataCollection.c"
+#line 2080 "DataCollection.c"
 	{
 		GeeArrayList* _object_list = NULL;
-		GeeArrayList* _tmp14_ = NULL;
-		GeeArrayList* _tmp15_ = NULL;
+		GeeArrayList* _tmp14_;
+		GeeArrayList* _tmp15_;
 		gint _object_size = 0;
-		GeeArrayList* _tmp16_ = NULL;
-		gint _tmp17_ = 0;
-		gint _tmp18_ = 0;
+		GeeArrayList* _tmp16_;
+		gint _tmp17_;
+		gint _tmp18_;
 		gint _object_index = 0;
 #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp14_ = removed;
@@ -2093,15 +2106,15 @@ static void data_collection_real_clear (DataCollection* self) {
 		_object_index = -1;
 #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		while (TRUE) {
-#line 2095 "DataCollection.c"
-			gint _tmp19_ = 0;
-			gint _tmp20_ = 0;
-			gint _tmp21_ = 0;
+#line 2108 "DataCollection.c"
+			gint _tmp19_;
+			gint _tmp20_;
+			gint _tmp21_;
 			DataObject* object = NULL;
-			GeeArrayList* _tmp22_ = NULL;
-			gint _tmp23_ = 0;
-			gpointer _tmp24_ = NULL;
-			DataObject* _tmp25_ = NULL;
+			GeeArrayList* _tmp22_;
+			gint _tmp23_;
+			gpointer _tmp24_;
+			DataObject* _tmp25_;
 #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp19_ = _object_index;
 #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2114,7 +2127,7 @@ static void data_collection_real_clear (DataCollection* self) {
 			if (!(_tmp20_ < _tmp21_)) {
 #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				break;
-#line 2116 "DataCollection.c"
+#line 2129 "DataCollection.c"
 			}
 #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp22_ = _object_list;
@@ -2130,15 +2143,15 @@ static void data_collection_real_clear (DataCollection* self) {
 			data_object_notify_membership_changed (_tmp25_, NULL);
 #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_g_object_unref0 (object);
-#line 2132 "DataCollection.c"
+#line 2145 "DataCollection.c"
 		}
 #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_g_object_unref0 (_object_list);
-#line 2136 "DataCollection.c"
+#line 2149 "DataCollection.c"
 	}
 #line 462 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_g_object_unref0 (removed);
-#line 2140 "DataCollection.c"
+#line 2153 "DataCollection.c"
 }
 
 
@@ -2147,14 +2160,14 @@ void data_collection_clear (DataCollection* self) {
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 462 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	DATA_COLLECTION_GET_CLASS (self)->clear (self);
-#line 2149 "DataCollection.c"
+#line 2162 "DataCollection.c"
 }
 
 
 static void data_collection_real_close (DataCollection* self) {
 #line 493 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	data_collection_clear (self);
-#line 2156 "DataCollection.c"
+#line 2169 "DataCollection.c"
 }
 
 
@@ -2163,31 +2176,31 @@ void data_collection_close (DataCollection* self) {
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 492 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	DATA_COLLECTION_GET_CLASS (self)->close (self);
-#line 2165 "DataCollection.c"
+#line 2178 "DataCollection.c"
 }
 
 
 static gpointer _alteration_ref0 (gpointer self) {
 #line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return self ? alteration_ref (self) : NULL;
-#line 2172 "DataCollection.c"
+#line 2185 "DataCollection.c"
 }
 
 
 void data_collection_internal_notify_altered (DataCollection* self, DataObject* object, Alteration* alteration) {
-	DataObject* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	DataObject* _tmp0_;
+	gboolean _tmp1_;
 	gboolean resort_occurred = FALSE;
-	DataSet* _tmp2_ = NULL;
-	DataObject* _tmp3_ = NULL;
-	Alteration* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp24_ = FALSE;
-	DataObject* _tmp25_ = NULL;
-	Alteration* _tmp26_ = NULL;
-	GeeMap* _tmp27_ = NULL;
-	GeeMap* _tmp28_ = NULL;
+	DataSet* _tmp2_;
+	DataObject* _tmp3_;
+	Alteration* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp24_;
+	DataObject* _tmp25_;
+	Alteration* _tmp26_;
+	GeeMap* _tmp27_;
+	GeeMap* _tmp28_;
 #line 498 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 498 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2214,31 +2227,31 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
 	_tmp6_ = data_collection_are_notifications_frozen (self);
 #line 503 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	if (_tmp6_) {
-#line 2216 "DataCollection.c"
-		GeeHashMap* _tmp7_ = NULL;
+#line 2229 "DataCollection.c"
+		GeeHashMap* _tmp7_;
 		Alteration* current = NULL;
-		GeeHashMap* _tmp9_ = NULL;
-		DataObject* _tmp10_ = NULL;
-		gpointer _tmp11_ = NULL;
-		Alteration* _tmp12_ = NULL;
-		GeeHashMap* _tmp18_ = NULL;
-		DataObject* _tmp19_ = NULL;
-		Alteration* _tmp20_ = NULL;
+		GeeHashMap* _tmp9_;
+		DataObject* _tmp10_;
+		gpointer _tmp11_;
+		Alteration* _tmp12_;
+		GeeHashMap* _tmp18_;
+		DataObject* _tmp19_;
+		Alteration* _tmp20_;
 		gboolean _tmp21_ = FALSE;
-		gboolean _tmp22_ = FALSE;
+		gboolean _tmp22_;
 #line 504 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp7_ = self->priv->frozen_items_altered;
 #line 504 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		if (_tmp7_ == NULL) {
-#line 2232 "DataCollection.c"
-			GeeHashMap* _tmp8_ = NULL;
+#line 2245 "DataCollection.c"
+			GeeHashMap* _tmp8_;
 #line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp8_ = gee_hash_map_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_ALTERATION, (GBoxedCopyFunc) alteration_ref, (GDestroyNotify) alteration_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_g_object_unref0 (self->priv->frozen_items_altered);
 #line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			self->priv->frozen_items_altered = _tmp8_;
-#line 2240 "DataCollection.c"
+#line 2253 "DataCollection.c"
 		}
 #line 509 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp9_ = self->priv->frozen_items_altered;
@@ -2252,10 +2265,10 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
 		_tmp12_ = current;
 #line 510 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		if (_tmp12_ != NULL) {
-#line 2254 "DataCollection.c"
-			Alteration* _tmp13_ = NULL;
-			Alteration* _tmp14_ = NULL;
-			Alteration* _tmp15_ = NULL;
+#line 2267 "DataCollection.c"
+			Alteration* _tmp13_;
+			Alteration* _tmp14_;
+			Alteration* _tmp15_;
 #line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp13_ = current;
 #line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2266,10 +2279,10 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
 			_alteration_unref0 (current);
 #line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			current = _tmp15_;
-#line 2268 "DataCollection.c"
+#line 2281 "DataCollection.c"
 		} else {
-			Alteration* _tmp16_ = NULL;
-			Alteration* _tmp17_ = NULL;
+			Alteration* _tmp16_;
+			Alteration* _tmp17_;
 #line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp16_ = alteration;
 #line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2278,7 +2291,7 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
 			_alteration_unref0 (current);
 #line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			current = _tmp17_;
-#line 2280 "DataCollection.c"
+#line 2293 "DataCollection.c"
 		}
 #line 515 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp18_ = self->priv->frozen_items_altered;
@@ -2294,14 +2307,14 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
 		if (_tmp22_) {
 #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp21_ = TRUE;
-#line 2296 "DataCollection.c"
+#line 2309 "DataCollection.c"
 		} else {
-			gboolean _tmp23_ = FALSE;
+			gboolean _tmp23_;
 #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp23_ = resort_occurred;
 #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp21_ = _tmp23_;
-#line 2303 "DataCollection.c"
+#line 2316 "DataCollection.c"
 		}
 #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		self->priv->fire_ordering_changed = _tmp21_;
@@ -2309,7 +2322,7 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
 		_alteration_unref0 (current);
 #line 519 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		return;
-#line 2311 "DataCollection.c"
+#line 2324 "DataCollection.c"
 	}
 #line 522 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp24_ = resort_occurred;
@@ -2317,7 +2330,7 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
 	if (_tmp24_) {
 #line 523 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		data_collection_notify_ordering_changed (self);
-#line 2319 "DataCollection.c"
+#line 2332 "DataCollection.c"
 	}
 #line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp25_ = object;
@@ -2331,15 +2344,15 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
 	data_collection_notify_items_altered (self, _tmp28_);
 #line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_g_object_unref0 (_tmp28_);
-#line 2333 "DataCollection.c"
+#line 2346 "DataCollection.c"
 }
 
 
 GValue* data_collection_get_property (DataCollection* self, const gchar* name) {
 	GValue* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
 #line 528 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
 #line 528 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2354,7 +2367,7 @@ GValue* data_collection_get_property (DataCollection* self, const gchar* name) {
 	result = (GValue*) _tmp2_;
 #line 529 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 2356 "DataCollection.c"
+#line 2369 "DataCollection.c"
 }
 
 
@@ -2363,7 +2376,7 @@ static gboolean _bool_value_equals_value_equal_func (GValue* a, GValue* b, gpoin
 	result = bool_value_equals (a, b);
 #line 535 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 2365 "DataCollection.c"
+#line 2378 "DataCollection.c"
 }
 
 
@@ -2372,27 +2385,27 @@ static gboolean _int_value_equals_value_equal_func (GValue* a, GValue* b, gpoint
 	result = int_value_equals (a, b);
 #line 537 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 2374 "DataCollection.c"
+#line 2387 "DataCollection.c"
 }
 
 
 void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target) {
-	ValueEqualFunc _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
+	ValueEqualFunc _tmp0_;
+	void* _tmp0__target;
 	GValue* old = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gpointer _tmp5_ = NULL;
-	GValue* _tmp6_ = NULL;
-	GeeHashMap* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	GValue _tmp14_ = {0};
-	const gchar* _tmp15_ = NULL;
-	GValue* _tmp16_ = NULL;
-	GValue _tmp17_ = {0};
+	GeeHashMap* _tmp3_;
+	const gchar* _tmp4_;
+	gpointer _tmp5_;
+	GValue* _tmp6_;
+	GeeHashMap* _tmp12_;
+	const gchar* _tmp13_;
+	GValue _tmp14_;
+	const gchar* _tmp15_;
+	GValue* _tmp16_;
+	GValue _tmp17_;
 	gint count = 0;
-	DataSet* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
+	DataSet* _tmp18_;
+	gint _tmp19_;
 #line 532 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 532 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2405,8 +2418,8 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal
 	_tmp0__target = value_equals_target;
 #line 533 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	if (_tmp0_ == NULL) {
-#line 2407 "DataCollection.c"
-		gboolean _tmp1_ = FALSE;
+#line 2420 "DataCollection.c"
+		gboolean _tmp1_;
 #line 534 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp1_ = G_VALUE_HOLDS (val, G_TYPE_BOOLEAN);
 #line 534 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2415,9 +2428,9 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal
 			value_equals = _bool_value_equals_value_equal_func;
 #line 535 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			value_equals_target = NULL;
-#line 2417 "DataCollection.c"
+#line 2430 "DataCollection.c"
 		} else {
-			gboolean _tmp2_ = FALSE;
+			gboolean _tmp2_;
 #line 536 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp2_ = G_VALUE_HOLDS (val, G_TYPE_INT);
 #line 536 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2426,11 +2439,11 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal
 				value_equals = _int_value_equals_value_equal_func;
 #line 537 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				value_equals_target = NULL;
-#line 2428 "DataCollection.c"
+#line 2441 "DataCollection.c"
 			} else {
 #line 539 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				g_error ("DataCollection.vala:539: value_equals must be specified for this type");
-#line 2432 "DataCollection.c"
+#line 2445 "DataCollection.c"
 			}
 		}
 	}
@@ -2446,13 +2459,13 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal
 	_tmp6_ = old;
 #line 543 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	if (_tmp6_ != NULL) {
-#line 2448 "DataCollection.c"
-		ValueEqualFunc _tmp7_ = NULL;
-		void* _tmp7__target = NULL;
-		GValue* _tmp8_ = NULL;
-		GValue _tmp9_ = {0};
-		GValue _tmp10_ = {0};
-		gboolean _tmp11_ = FALSE;
+#line 2461 "DataCollection.c"
+		ValueEqualFunc _tmp7_;
+		void* _tmp7__target;
+		GValue* _tmp8_;
+		GValue _tmp9_;
+		GValue _tmp10_;
+		gboolean _tmp11_;
 #line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp7_ = value_equals;
 #line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2471,7 +2484,7 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal
 			__vala_GValue_free0 (old);
 #line 545 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			return;
-#line 2473 "DataCollection.c"
+#line 2486 "DataCollection.c"
 		}
 	}
 #line 548 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2496,37 +2509,37 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal
 	_tmp19_ = data_set_get_count (_tmp18_);
 #line 553 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	count = _tmp19_;
-#line 2498 "DataCollection.c"
+#line 2511 "DataCollection.c"
 	{
 		gint ctr = 0;
 #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		ctr = 0;
-#line 2503 "DataCollection.c"
+#line 2516 "DataCollection.c"
 		{
 			gboolean _tmp20_ = FALSE;
 #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp20_ = TRUE;
 #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			while (TRUE) {
-#line 2510 "DataCollection.c"
-				gint _tmp22_ = 0;
-				gint _tmp23_ = 0;
-				DataSet* _tmp24_ = NULL;
-				gint _tmp25_ = 0;
-				DataObject* _tmp26_ = NULL;
-				DataObject* _tmp27_ = NULL;
-				const gchar* _tmp28_ = NULL;
-				GValue* _tmp29_ = NULL;
-				GValue _tmp30_ = {0};
+#line 2523 "DataCollection.c"
+				gint _tmp22_;
+				gint _tmp23_;
+				DataSet* _tmp24_;
+				gint _tmp25_;
+				DataObject* _tmp26_;
+				DataObject* _tmp27_;
+				const gchar* _tmp28_;
+				GValue* _tmp29_;
+				GValue _tmp30_;
 #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				if (!_tmp20_) {
-#line 2522 "DataCollection.c"
-					gint _tmp21_ = 0;
+#line 2535 "DataCollection.c"
+					gint _tmp21_;
 #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					_tmp21_ = ctr;
 #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					ctr = _tmp21_ + 1;
-#line 2528 "DataCollection.c"
+#line 2541 "DataCollection.c"
 				}
 #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_tmp20_ = FALSE;
@@ -2538,7 +2551,7 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal
 				if (!(_tmp22_ < _tmp23_)) {
 #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					break;
-#line 2540 "DataCollection.c"
+#line 2553 "DataCollection.c"
 				}
 #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_tmp24_ = self->priv->dataset;
@@ -2558,24 +2571,24 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal
 				data_object_notify_collection_property_set (_tmp27_, _tmp28_, _tmp29_, &_tmp30_);
 #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_g_object_unref0 (_tmp27_);
-#line 2560 "DataCollection.c"
+#line 2573 "DataCollection.c"
 			}
 		}
 	}
 #line 532 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	__vala_GValue_free0 (old);
-#line 2566 "DataCollection.c"
+#line 2579 "DataCollection.c"
 }
 
 
 void data_collection_clear_property (DataCollection* self, const gchar* name) {
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_ = NULL;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
+	const gchar* _tmp3_;
 	gint count = 0;
-	DataSet* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	DataSet* _tmp4_;
+	gint _tmp5_;
 #line 558 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 558 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2590,7 +2603,7 @@ void data_collection_clear_property (DataCollection* self, const gchar* name) {
 	if (!_tmp2_) {
 #line 560 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		return;
-#line 2592 "DataCollection.c"
+#line 2605 "DataCollection.c"
 	}
 #line 563 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp3_ = name;
@@ -2602,35 +2615,35 @@ void data_collection_clear_property (DataCollection* self, const gchar* name) {
 	_tmp5_ = data_set_get_count (_tmp4_);
 #line 566 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	count = _tmp5_;
-#line 2604 "DataCollection.c"
+#line 2617 "DataCollection.c"
 	{
 		gint ctr = 0;
 #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		ctr = 0;
-#line 2609 "DataCollection.c"
+#line 2622 "DataCollection.c"
 		{
 			gboolean _tmp6_ = FALSE;
 #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp6_ = TRUE;
 #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			while (TRUE) {
-#line 2616 "DataCollection.c"
-				gint _tmp8_ = 0;
-				gint _tmp9_ = 0;
-				DataSet* _tmp10_ = NULL;
-				gint _tmp11_ = 0;
-				DataObject* _tmp12_ = NULL;
-				DataObject* _tmp13_ = NULL;
-				const gchar* _tmp14_ = NULL;
+#line 2629 "DataCollection.c"
+				gint _tmp8_;
+				gint _tmp9_;
+				DataSet* _tmp10_;
+				gint _tmp11_;
+				DataObject* _tmp12_;
+				DataObject* _tmp13_;
+				const gchar* _tmp14_;
 #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				if (!_tmp6_) {
-#line 2626 "DataCollection.c"
-					gint _tmp7_ = 0;
+#line 2639 "DataCollection.c"
+					gint _tmp7_;
 #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					_tmp7_ = ctr;
 #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					ctr = _tmp7_ + 1;
-#line 2632 "DataCollection.c"
+#line 2645 "DataCollection.c"
 				}
 #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_tmp6_ = FALSE;
@@ -2642,7 +2655,7 @@ void data_collection_clear_property (DataCollection* self, const gchar* name) {
 				if (!(_tmp8_ < _tmp9_)) {
 #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					break;
-#line 2644 "DataCollection.c"
+#line 2657 "DataCollection.c"
 				}
 #line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_tmp10_ = self->priv->dataset;
@@ -2658,7 +2671,7 @@ void data_collection_clear_property (DataCollection* self, const gchar* name) {
 				data_object_notify_collection_property_cleared (_tmp13_, _tmp14_);
 #line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				_g_object_unref0 (_tmp13_);
-#line 2660 "DataCollection.c"
+#line 2673 "DataCollection.c"
 			}
 		}
 	}
@@ -2666,7 +2679,7 @@ void data_collection_clear_property (DataCollection* self, const gchar* name) {
 
 
 void data_collection_freeze_notifications (DataCollection* self) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 581 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 582 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2677,15 +2690,15 @@ void data_collection_freeze_notifications (DataCollection* self) {
 	if (_tmp0_ == 0) {
 #line 583 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		data_collection_notify_frozen (self);
-#line 2679 "DataCollection.c"
+#line 2692 "DataCollection.c"
 	}
 }
 
 
 void data_collection_thaw_notifications (DataCollection* self) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 586 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 587 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2694,7 +2707,7 @@ void data_collection_thaw_notifications (DataCollection* self) {
 	if (_tmp0_ == 0) {
 #line 588 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		return;
-#line 2696 "DataCollection.c"
+#line 2709 "DataCollection.c"
 	}
 #line 590 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp1_ = self->priv->notifies_frozen;
@@ -2706,14 +2719,14 @@ void data_collection_thaw_notifications (DataCollection* self) {
 	if (_tmp2_ == 0) {
 #line 591 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		data_collection_notify_thawed (self);
-#line 2708 "DataCollection.c"
+#line 2721 "DataCollection.c"
 	}
 }
 
 
 gboolean data_collection_are_notifications_frozen (DataCollection* self) {
 	gboolean result = FALSE;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 594 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE);
 #line 595 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2722,14 +2735,14 @@ gboolean data_collection_are_notifications_frozen (DataCollection* self) {
 	result = _tmp0_ > 0;
 #line 595 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 2724 "DataCollection.c"
+#line 2737 "DataCollection.c"
 }
 
 
 static void data_collection_real_notify_frozen (DataCollection* self) {
 #line 601 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_emit_by_name (self, "frozen");
-#line 2731 "DataCollection.c"
+	g_signal_emit (self, data_collection_signals[DATA_COLLECTION_FROZEN_SIGNAL], 0);
+#line 2744 "DataCollection.c"
 }
 
 
@@ -2738,22 +2751,22 @@ void data_collection_notify_frozen (DataCollection* self) {
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 600 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	DATA_COLLECTION_GET_CLASS (self)->notify_frozen (self);
-#line 2740 "DataCollection.c"
+#line 2753 "DataCollection.c"
 }
 
 
 static void data_collection_real_notify_thawed (DataCollection* self) {
-	GeeHashMap* _tmp0_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GeeHashMap* _tmp0_;
+	gboolean _tmp4_;
 #line 607 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp0_ = self->priv->frozen_items_altered;
 #line 607 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	if (_tmp0_ != NULL) {
-#line 2751 "DataCollection.c"
+#line 2764 "DataCollection.c"
 		GeeMap* copy = NULL;
-		GeeHashMap* _tmp1_ = NULL;
-		GeeMap* _tmp2_ = NULL;
-		GeeMap* _tmp3_ = NULL;
+		GeeHashMap* _tmp1_;
+		GeeMap* _tmp2_;
+		GeeMap* _tmp3_;
 #line 609 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp1_ = self->priv->frozen_items_altered;
 #line 609 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2770,7 +2783,7 @@ static void data_collection_real_notify_thawed (DataCollection* self) {
 		data_collection_notify_items_altered (self, _tmp3_);
 #line 607 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_g_object_unref0 (copy);
-#line 2772 "DataCollection.c"
+#line 2785 "DataCollection.c"
 	}
 #line 615 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp4_ = self->priv->fire_ordering_changed;
@@ -2780,11 +2793,11 @@ static void data_collection_real_notify_thawed (DataCollection* self) {
 		self->priv->fire_ordering_changed = FALSE;
 #line 617 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		data_collection_notify_ordering_changed (self);
-#line 2782 "DataCollection.c"
+#line 2795 "DataCollection.c"
 	}
 #line 620 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_emit_by_name (self, "thawed");
-#line 2786 "DataCollection.c"
+	g_signal_emit (self, data_collection_signals[DATA_COLLECTION_THAWED_SIGNAL], 0);
+#line 2799 "DataCollection.c"
 }
 
 
@@ -2793,21 +2806,21 @@ void data_collection_notify_thawed (DataCollection* self) {
 	g_return_if_fail (IS_DATA_COLLECTION (self));
 #line 606 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	DATA_COLLECTION_GET_CLASS (self)->notify_thawed (self);
-#line 2795 "DataCollection.c"
+#line 2808 "DataCollection.c"
 }
 
 
 static void data_collection_real_items_added (DataCollection* self, GeeIterable* added) {
 #line 116 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (added));
-#line 2802 "DataCollection.c"
+#line 2815 "DataCollection.c"
 }
 
 
 static void data_collection_real_items_removed (DataCollection* self, GeeIterable* removed) {
 #line 120 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (removed));
-#line 2809 "DataCollection.c"
+#line 2822 "DataCollection.c"
 }
 
 
@@ -2816,7 +2829,7 @@ static void data_collection_real_contents_altered (DataCollection* self, GeeIter
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
 #line 124 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 2818 "DataCollection.c"
+#line 2831 "DataCollection.c"
 }
 
 
@@ -2835,26 +2848,26 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 		data1 = closure->data;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 2837 "DataCollection.c"
+#line 2850 "DataCollection.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		data2 = closure->data;
-#line 2843 "DataCollection.c"
+#line 2856 "DataCollection.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 2849 "DataCollection.c"
+#line 2862 "DataCollection.c"
 }
 
 
 static void data_collection_real_items_altered (DataCollection* self, GeeMap* items) {
 #line 130 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (GEE_IS_MAP (items));
-#line 2856 "DataCollection.c"
+#line 2869 "DataCollection.c"
 }
 
 
@@ -2867,13 +2880,13 @@ static void data_collection_real_property_set (DataCollection* self, const gchar
 	g_return_if_fail (name != NULL);
 #line 140 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (val != NULL);
-#line 2869 "DataCollection.c"
+#line 2882 "DataCollection.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
-	typedef void (*GMarshalFunc_VOID__STRING_BOXED_BOXED) (gpointer data1, const char* arg_1, gpointer arg_2, gpointer arg_3, gpointer data2);
-	register GMarshalFunc_VOID__STRING_BOXED_BOXED callback;
+static void g_cclosure_user_marshal_VOID__STRING_POINTER_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+	typedef void (*GMarshalFunc_VOID__STRING_POINTER_BOXED) (gpointer data1, const char* arg_1, gpointer arg_2, gpointer arg_3, gpointer data2);
+	register GMarshalFunc_VOID__STRING_POINTER_BOXED callback;
 	register GCClosure * cc;
 	register gpointer data1;
 	register gpointer data2;
@@ -2886,26 +2899,26 @@ static void g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED (GClosure * closure
 		data1 = closure->data;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 2888 "DataCollection.c"
+#line 2901 "DataCollection.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		data2 = closure->data;
-#line 2894 "DataCollection.c"
+#line 2907 "DataCollection.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	callback = (GMarshalFunc_VOID__STRING_BOXED_BOXED) (marshal_data ? marshal_data : cc->callback);
+	callback = (GMarshalFunc_VOID__STRING_POINTER_BOXED) (marshal_data ? marshal_data : cc->callback);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_pointer (param_values + 2), g_value_get_boxed (param_values + 3), data2);
-#line 2900 "DataCollection.c"
+#line 2913 "DataCollection.c"
 }
 
 
 static void data_collection_real_property_cleared (DataCollection* self, const gchar* name) {
 #line 144 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (name != NULL);
-#line 2907 "DataCollection.c"
+#line 2920 "DataCollection.c"
 }
 
 
@@ -2920,22 +2933,22 @@ static void data_collection_real_thawed (DataCollection* self) {
 static void _data_collection_marker_impl_on_items_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) {
 #line 24 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	data_collection_marker_impl_on_items_removed ((DataCollectionMarkerImpl*) self, removed);
-#line 2922 "DataCollection.c"
+#line 2935 "DataCollection.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 16 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 2929 "DataCollection.c"
+#line 2942 "DataCollection.c"
 }
 
 
 static DataCollectionMarkerImpl* data_collection_marker_impl_construct (GType object_type, DataCollection* owner) {
 	DataCollectionMarkerImpl * self = NULL;
-	DataCollection* _tmp0_ = NULL;
-	DataCollection* _tmp1_ = NULL;
-	DataCollection* _tmp2_ = NULL;
+	DataCollection* _tmp0_;
+	DataCollection* _tmp1_;
+	DataCollection* _tmp2_;
 #line 15 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (IS_DATA_COLLECTION (owner), NULL);
 #line 15 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2954,24 +2967,24 @@ static DataCollectionMarkerImpl* data_collection_marker_impl_construct (GType ob
 	g_signal_connect_object (_tmp2_, "items-removed", (GCallback) _data_collection_marker_impl_on_items_removed_data_collection_items_removed, self, 0);
 #line 15 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return self;
-#line 2956 "DataCollection.c"
+#line 2969 "DataCollection.c"
 }
 
 
 static DataCollectionMarkerImpl* data_collection_marker_impl_new (DataCollection* owner) {
 #line 15 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return data_collection_marker_impl_construct (DATA_COLLECTION_TYPE_MARKER_IMPL, owner);
-#line 2963 "DataCollection.c"
+#line 2976 "DataCollection.c"
 }
 
 
 static void data_collection_marker_impl_real_mark (Marker* base, DataObject* object) {
 	DataCollectionMarkerImpl * self;
-	DataCollection* _tmp0_ = NULL;
-	DataObject* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GeeHashSet* _tmp3_ = NULL;
-	DataObject* _tmp4_ = NULL;
+	DataCollection* _tmp0_;
+	DataObject* _tmp1_;
+	gboolean _tmp2_;
+	GeeHashSet* _tmp3_;
+	DataObject* _tmp4_;
 #line 27 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
 #line 27 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2990,17 +3003,17 @@ static void data_collection_marker_impl_real_mark (Marker* base, DataObject* obj
 	_tmp4_ = object;
 #line 30 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
-#line 2992 "DataCollection.c"
+#line 3005 "DataCollection.c"
 }
 
 
 static void data_collection_marker_impl_real_unmark (Marker* base, DataObject* object) {
 	DataCollectionMarkerImpl * self;
-	DataCollection* _tmp0_ = NULL;
-	DataObject* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GeeHashSet* _tmp3_ = NULL;
-	DataObject* _tmp4_ = NULL;
+	DataCollection* _tmp0_;
+	DataObject* _tmp1_;
+	gboolean _tmp2_;
+	GeeHashSet* _tmp3_;
+	DataObject* _tmp4_;
 #line 33 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
 #line 33 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3019,22 +3032,22 @@ static void data_collection_marker_impl_real_unmark (Marker* base, DataObject* o
 	_tmp4_ = object;
 #line 36 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
-#line 3021 "DataCollection.c"
+#line 3034 "DataCollection.c"
 }
 
 
 static gboolean data_collection_marker_impl_real_toggle (Marker* base, DataObject* object) {
 	DataCollectionMarkerImpl * self;
 	gboolean result = FALSE;
-	DataCollection* _tmp0_ = NULL;
-	DataObject* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GeeHashSet* _tmp3_ = NULL;
-	DataObject* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	GeeHashSet* _tmp10_ = NULL;
-	DataObject* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	DataCollection* _tmp0_;
+	DataObject* _tmp1_;
+	gboolean _tmp2_;
+	GeeHashSet* _tmp3_;
+	DataObject* _tmp4_;
+	gboolean _tmp5_;
+	GeeHashSet* _tmp10_;
+	DataObject* _tmp11_;
+	gboolean _tmp12_;
 #line 39 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
 #line 39 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3055,26 +3068,26 @@ static gboolean data_collection_marker_impl_real_toggle (Marker* base, DataObjec
 	_tmp5_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
 #line 42 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	if (_tmp5_) {
-#line 3057 "DataCollection.c"
-		GeeHashSet* _tmp6_ = NULL;
-		DataObject* _tmp7_ = NULL;
+#line 3070 "DataCollection.c"
+		GeeHashSet* _tmp6_;
+		DataObject* _tmp7_;
 #line 43 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp6_ = self->marked;
 #line 43 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp7_ = object;
 #line 43 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_);
-#line 3066 "DataCollection.c"
+#line 3079 "DataCollection.c"
 	} else {
-		GeeHashSet* _tmp8_ = NULL;
-		DataObject* _tmp9_ = NULL;
+		GeeHashSet* _tmp8_;
+		DataObject* _tmp9_;
 #line 45 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp8_ = self->marked;
 #line 45 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp9_ = object;
 #line 45 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_);
-#line 3076 "DataCollection.c"
+#line 3089 "DataCollection.c"
 	}
 #line 48 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp10_ = self->marked;
@@ -3086,7 +3099,7 @@ static gboolean data_collection_marker_impl_real_toggle (Marker* base, DataObjec
 	result = _tmp12_;
 #line 48 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 3088 "DataCollection.c"
+#line 3101 "DataCollection.c"
 }
 
 
@@ -3096,11 +3109,11 @@ static void data_collection_marker_impl_real_mark_many (Marker* base, GeeCollect
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
 #line 51 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (list));
-#line 3098 "DataCollection.c"
+#line 3111 "DataCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp0_ = list;
 #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3109,17 +3122,17 @@ static void data_collection_marker_impl_real_mark_many (Marker* base, GeeCollect
 		_object_it = _tmp1_;
 #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		while (TRUE) {
-#line 3111 "DataCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 3124 "DataCollection.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			DataCollection* _tmp6_ = NULL;
-			DataObject* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
-			GeeHashSet* _tmp9_ = NULL;
-			DataObject* _tmp10_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			DataCollection* _tmp6_;
+			DataObject* _tmp7_;
+			gboolean _tmp8_;
+			GeeHashSet* _tmp9_;
+			DataObject* _tmp10_;
 #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp2_ = _object_it;
 #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3128,7 +3141,7 @@ static void data_collection_marker_impl_real_mark_many (Marker* base, GeeCollect
 			if (!_tmp3_) {
 #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				break;
-#line 3130 "DataCollection.c"
+#line 3143 "DataCollection.c"
 			}
 #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp4_ = _object_it;
@@ -3152,11 +3165,11 @@ static void data_collection_marker_impl_real_mark_many (Marker* base, GeeCollect
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
 #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_g_object_unref0 (object);
-#line 3154 "DataCollection.c"
+#line 3167 "DataCollection.c"
 		}
 #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 3158 "DataCollection.c"
+#line 3171 "DataCollection.c"
 	}
 }
 
@@ -3167,11 +3180,11 @@ static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeColle
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
 #line 59 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (list));
-#line 3169 "DataCollection.c"
+#line 3182 "DataCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp0_ = list;
 #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3180,17 +3193,17 @@ static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeColle
 		_object_it = _tmp1_;
 #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		while (TRUE) {
-#line 3182 "DataCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 3195 "DataCollection.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			DataCollection* _tmp6_ = NULL;
-			DataObject* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
-			GeeHashSet* _tmp9_ = NULL;
-			DataObject* _tmp10_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			DataCollection* _tmp6_;
+			DataObject* _tmp7_;
+			gboolean _tmp8_;
+			GeeHashSet* _tmp9_;
+			DataObject* _tmp10_;
 #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp2_ = _object_it;
 #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3199,7 +3212,7 @@ static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeColle
 			if (!_tmp3_) {
 #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				break;
-#line 3201 "DataCollection.c"
+#line 3214 "DataCollection.c"
 			}
 #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp4_ = _object_it;
@@ -3223,11 +3236,11 @@ static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeColle
 			gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
 #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_g_object_unref0 (object);
-#line 3225 "DataCollection.c"
+#line 3238 "DataCollection.c"
 		}
 #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 3229 "DataCollection.c"
+#line 3242 "DataCollection.c"
 	}
 }
 
@@ -3236,14 +3249,14 @@ static void data_collection_marker_impl_real_mark_all (Marker* base) {
 	DataCollectionMarkerImpl * self;
 #line 67 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
-#line 3238 "DataCollection.c"
+#line 3251 "DataCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		DataCollection* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
+		DataCollection* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeIterator* _tmp3_;
+		GeeIterator* _tmp4_;
 #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp0_ = self->owner;
 #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3260,14 +3273,14 @@ static void data_collection_marker_impl_real_mark_all (Marker* base) {
 		_object_it = _tmp4_;
 #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		while (TRUE) {
-#line 3262 "DataCollection.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+#line 3275 "DataCollection.c"
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
-			GeeHashSet* _tmp9_ = NULL;
-			DataObject* _tmp10_ = NULL;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			GeeHashSet* _tmp9_;
+			DataObject* _tmp10_;
 #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp5_ = _object_it;
 #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3276,7 +3289,7 @@ static void data_collection_marker_impl_real_mark_all (Marker* base) {
 			if (!_tmp6_) {
 #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				break;
-#line 3278 "DataCollection.c"
+#line 3291 "DataCollection.c"
 			}
 #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp7_ = _object_it;
@@ -3292,11 +3305,11 @@ static void data_collection_marker_impl_real_mark_all (Marker* base) {
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
 #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_g_object_unref0 (object);
-#line 3294 "DataCollection.c"
+#line 3307 "DataCollection.c"
 		}
 #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 3298 "DataCollection.c"
+#line 3311 "DataCollection.c"
 	}
 }
 
@@ -3305,17 +3318,17 @@ static gint data_collection_marker_impl_real_get_count (Marker* base) {
 	DataCollectionMarkerImpl * self;
 	gint result = 0;
 	gint _tmp0_ = 0;
-	GeeHashSet* _tmp1_ = NULL;
+	GeeHashSet* _tmp1_;
 #line 72 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
 #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp1_ = self->marked;
 #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	if (_tmp1_ != NULL) {
-#line 3314 "DataCollection.c"
-		GeeHashSet* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+#line 3327 "DataCollection.c"
+		GeeHashSet* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp2_ = self->marked;
 #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3324,20 +3337,20 @@ static gint data_collection_marker_impl_real_get_count (Marker* base) {
 		_tmp4_ = _tmp3_;
 #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp0_ = _tmp4_;
-#line 3326 "DataCollection.c"
+#line 3339 "DataCollection.c"
 	} else {
-		gint _tmp5_ = 0;
+		gint _tmp5_;
 #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp5_ = self->freeze_count;
 #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp0_ = _tmp5_;
-#line 3333 "DataCollection.c"
+#line 3346 "DataCollection.c"
 	}
 #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	result = _tmp0_;
 #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 3339 "DataCollection.c"
+#line 3352 "DataCollection.c"
 }
 
 
@@ -3345,8 +3358,8 @@ static GeeCollection* data_collection_marker_impl_real_get_all (Marker* base) {
 	DataCollectionMarkerImpl * self;
 	GeeCollection* result = NULL;
 	GeeArrayList* copy = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeHashSet* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeHashSet* _tmp1_;
 #line 76 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
 #line 77 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3361,7 +3374,7 @@ static GeeCollection* data_collection_marker_impl_real_get_all (Marker* base) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (copy, GEE_TYPE_COLLECTION, GeeCollection);
 #line 80 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 3363 "DataCollection.c"
+#line 3376 "DataCollection.c"
 }
 
 
@@ -3370,11 +3383,11 @@ static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerIm
 	g_return_if_fail (DATA_COLLECTION_IS_MARKER_IMPL (self));
 #line 83 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (removed));
-#line 3372 "DataCollection.c"
+#line 3385 "DataCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp0_ = removed;
 #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3383,14 +3396,14 @@ static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerIm
 		_object_it = _tmp1_;
 #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		while (TRUE) {
-#line 3385 "DataCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 3398 "DataCollection.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			GeeHashSet* _tmp6_ = NULL;
-			DataObject* _tmp7_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			GeeHashSet* _tmp6_;
+			DataObject* _tmp7_;
 #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp2_ = _object_it;
 #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3399,7 +3412,7 @@ static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerIm
 			if (!_tmp3_) {
 #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 				break;
-#line 3401 "DataCollection.c"
+#line 3414 "DataCollection.c"
 			}
 #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_tmp4_ = _object_it;
@@ -3415,18 +3428,18 @@ static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerIm
 			gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_);
 #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_g_object_unref0 (object);
-#line 3417 "DataCollection.c"
+#line 3430 "DataCollection.c"
 		}
 #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 3421 "DataCollection.c"
+#line 3434 "DataCollection.c"
 	}
 }
 
 
 static void data_collection_marker_impl_freeze (DataCollectionMarkerImpl* self) {
-	DataCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	DataCollection* _tmp0_;
+	guint _tmp1_;
 #line 91 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (DATA_COLLECTION_IS_MARKER_IMPL (self));
 #line 92 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3435,22 +3448,22 @@ static void data_collection_marker_impl_freeze (DataCollectionMarkerImpl* self)
 	g_signal_parse_name ("items-removed", TYPE_DATA_COLLECTION, &_tmp1_, NULL, FALSE);
 #line 92 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _data_collection_marker_impl_on_items_removed_data_collection_items_removed, self);
-#line 3437 "DataCollection.c"
+#line 3450 "DataCollection.c"
 }
 
 
 static void data_collection_marker_impl_finished (DataCollectionMarkerImpl* self) {
-	GeeHashSet* _tmp0_ = NULL;
+	GeeHashSet* _tmp0_;
 #line 95 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (DATA_COLLECTION_IS_MARKER_IMPL (self));
 #line 96 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp0_ = self->marked;
 #line 96 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	if (_tmp0_ != NULL) {
-#line 3449 "DataCollection.c"
-		GeeHashSet* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+#line 3462 "DataCollection.c"
+		GeeHashSet* _tmp1_;
+		gint _tmp2_;
+		gint _tmp3_;
 #line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp1_ = self->marked;
 #line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3459,21 +3472,21 @@ static void data_collection_marker_impl_finished (DataCollectionMarkerImpl* self
 		_tmp3_ = _tmp2_;
 #line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		self->freeze_count = _tmp3_;
-#line 3461 "DataCollection.c"
+#line 3474 "DataCollection.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_g_object_unref0 (self->marked);
 #line 99 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self->marked = NULL;
-#line 3467 "DataCollection.c"
+#line 3480 "DataCollection.c"
 }
 
 
 static gboolean data_collection_marker_impl_is_valid (DataCollectionMarkerImpl* self, DataCollection* collection) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	DataCollection* _tmp1_ = NULL;
-	DataCollection* _tmp2_ = NULL;
+	DataCollection* _tmp1_;
+	DataCollection* _tmp2_;
 #line 102 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (DATA_COLLECTION_IS_MARKER_IMPL (self), FALSE);
 #line 102 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3484,23 +3497,23 @@ static gboolean data_collection_marker_impl_is_valid (DataCollectionMarkerImpl*
 	_tmp2_ = self->owner;
 #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	if (_tmp1_ == _tmp2_) {
-#line 3486 "DataCollection.c"
-		GeeHashSet* _tmp3_ = NULL;
+#line 3499 "DataCollection.c"
+		GeeHashSet* _tmp3_;
 #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp3_ = self->marked;
 #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp0_ = _tmp3_ != NULL;
-#line 3492 "DataCollection.c"
+#line 3505 "DataCollection.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp0_ = FALSE;
-#line 3496 "DataCollection.c"
+#line 3509 "DataCollection.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	result = _tmp0_;
 #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return result;
-#line 3502 "DataCollection.c"
+#line 3515 "DataCollection.c"
 }
 
 
@@ -3509,7 +3522,7 @@ static void data_collection_marker_impl_class_init (DataCollectionMarkerImplClas
 	data_collection_marker_impl_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_collection_marker_impl_finalize;
-#line 3511 "DataCollection.c"
+#line 3524 "DataCollection.c"
 }
 
 
@@ -3517,41 +3530,41 @@ static void data_collection_marker_impl_marker_interface_init (MarkerIface * ifa
 #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	data_collection_marker_impl_marker_parent_iface = g_type_interface_peek_parent (iface);
 #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	iface->mark = (void (*)(Marker*, DataObject*)) data_collection_marker_impl_real_mark;
+	iface->mark = (void (*) (Marker *, DataObject*)) data_collection_marker_impl_real_mark;
 #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	iface->unmark = (void (*)(Marker*, DataObject*)) data_collection_marker_impl_real_unmark;
+	iface->unmark = (void (*) (Marker *, DataObject*)) data_collection_marker_impl_real_unmark;
 #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	iface->toggle = (gboolean (*)(Marker*, DataObject*)) data_collection_marker_impl_real_toggle;
+	iface->toggle = (gboolean (*) (Marker *, DataObject*)) data_collection_marker_impl_real_toggle;
 #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	iface->mark_many = (void (*)(Marker*, GeeCollection*)) data_collection_marker_impl_real_mark_many;
+	iface->mark_many = (void (*) (Marker *, GeeCollection*)) data_collection_marker_impl_real_mark_many;
 #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	iface->unmark_many = (void (*)(Marker*, GeeCollection*)) data_collection_marker_impl_real_unmark_many;
+	iface->unmark_many = (void (*) (Marker *, GeeCollection*)) data_collection_marker_impl_real_unmark_many;
 #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	iface->mark_all = (void (*)(Marker*)) data_collection_marker_impl_real_mark_all;
+	iface->mark_all = (void (*) (Marker *)) data_collection_marker_impl_real_mark_all;
 #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	iface->get_count = (gint (*)(Marker*)) data_collection_marker_impl_real_get_count;
+	iface->get_count = (gint (*) (Marker *)) data_collection_marker_impl_real_get_count;
 #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	iface->get_all = (GeeCollection* (*)(Marker*)) data_collection_marker_impl_real_get_all;
-#line 3534 "DataCollection.c"
+	iface->get_all = (GeeCollection* (*) (Marker *)) data_collection_marker_impl_real_get_all;
+#line 3547 "DataCollection.c"
 }
 
 
 static void data_collection_marker_impl_instance_init (DataCollectionMarkerImpl * self) {
-	GeeHashSet* _tmp0_ = NULL;
+	GeeHashSet* _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp0_ = gee_hash_set_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 12 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self->marked = _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self->freeze_count = 0;
-#line 3546 "DataCollection.c"
+#line 3559 "DataCollection.c"
 }
 
 
-static void data_collection_marker_impl_finalize (GObject* obj) {
+static void data_collection_marker_impl_finalize (GObject * obj) {
 	DataCollectionMarkerImpl * self;
-	DataCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	DataCollection* _tmp0_;
+	guint _tmp1_;
 #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
 #line 24 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3566,7 +3579,7 @@ static void data_collection_marker_impl_finalize (GObject* obj) {
 	_g_object_unref0 (self->marked);
 #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	G_OBJECT_CLASS (data_collection_marker_impl_parent_class)->finalize (obj);
-#line 3568 "DataCollection.c"
+#line 3581 "DataCollection.c"
 }
 
 
@@ -3587,7 +3600,7 @@ static GType data_collection_marker_impl_get_type (void) {
 static void value_data_collection_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	value->data[0].v_pointer = NULL;
-#line 3589 "DataCollection.c"
+#line 3602 "DataCollection.c"
 }
 
 
@@ -3596,7 +3609,7 @@ static void value_data_collection_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		data_collection_unref (value->data[0].v_pointer);
-#line 3598 "DataCollection.c"
+#line 3611 "DataCollection.c"
 	}
 }
 
@@ -3606,11 +3619,11 @@ static void value_data_collection_copy_value (const GValue* src_value, GValue* d
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		dest_value->data[0].v_pointer = data_collection_ref (src_value->data[0].v_pointer);
-#line 3608 "DataCollection.c"
+#line 3621 "DataCollection.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3612 "DataCollection.c"
+#line 3625 "DataCollection.c"
 	}
 }
 
@@ -3618,66 +3631,66 @@ static void value_data_collection_copy_value (const GValue* src_value, GValue* d
 static gpointer value_data_collection_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return value->data[0].v_pointer;
-#line 3620 "DataCollection.c"
+#line 3633 "DataCollection.c"
 }
 
 
 static gchar* value_data_collection_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	if (collect_values[0].v_pointer) {
-#line 3627 "DataCollection.c"
-		DataCollection* object;
+#line 3640 "DataCollection.c"
+		DataCollection * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3634 "DataCollection.c"
+#line 3647 "DataCollection.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3638 "DataCollection.c"
+#line 3651 "DataCollection.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		value->data[0].v_pointer = data_collection_ref (object);
-#line 3642 "DataCollection.c"
+#line 3655 "DataCollection.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		value->data[0].v_pointer = NULL;
-#line 3646 "DataCollection.c"
+#line 3659 "DataCollection.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return NULL;
-#line 3650 "DataCollection.c"
+#line 3663 "DataCollection.c"
 }
 
 
 static gchar* value_data_collection_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	DataCollection** object_p;
+	DataCollection ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3661 "DataCollection.c"
+#line 3674 "DataCollection.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		*object_p = NULL;
-#line 3667 "DataCollection.c"
+#line 3680 "DataCollection.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3671 "DataCollection.c"
+#line 3684 "DataCollection.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		*object_p = data_collection_ref (value->data[0].v_pointer);
-#line 3675 "DataCollection.c"
+#line 3688 "DataCollection.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return NULL;
-#line 3679 "DataCollection.c"
+#line 3692 "DataCollection.c"
 }
 
 
@@ -3691,7 +3704,7 @@ GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return G_PARAM_SPEC (spec);
-#line 3693 "DataCollection.c"
+#line 3706 "DataCollection.c"
 }
 
 
@@ -3700,12 +3713,12 @@ gpointer value_get_data_collection (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_COLLECTION), NULL);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return value->data[0].v_pointer;
-#line 3702 "DataCollection.c"
+#line 3715 "DataCollection.c"
 }
 
 
 void value_set_data_collection (GValue* value, gpointer v_object) {
-	DataCollection* old;
+	DataCollection * old;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_COLLECTION));
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3720,23 +3733,23 @@ void value_set_data_collection (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		data_collection_ref (value->data[0].v_pointer);
-#line 3722 "DataCollection.c"
+#line 3735 "DataCollection.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		value->data[0].v_pointer = NULL;
-#line 3726 "DataCollection.c"
+#line 3739 "DataCollection.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		data_collection_unref (old);
-#line 3732 "DataCollection.c"
+#line 3745 "DataCollection.c"
 	}
 }
 
 
 void value_take_data_collection (GValue* value, gpointer v_object) {
-	DataCollection* old;
+	DataCollection * old;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_COLLECTION));
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3749,17 +3762,17 @@ void value_take_data_collection (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		value->data[0].v_pointer = v_object;
-#line 3751 "DataCollection.c"
+#line 3764 "DataCollection.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		value->data[0].v_pointer = NULL;
-#line 3755 "DataCollection.c"
+#line 3768 "DataCollection.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		data_collection_unref (old);
-#line 3761 "DataCollection.c"
+#line 3774 "DataCollection.c"
 	}
 }
 
@@ -3772,51 +3785,51 @@ static void data_collection_class_init (DataCollectionClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_type_class_add_private (klass, sizeof (DataCollectionPrivate));
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->to_string = (gchar* (*)(DataCollection*)) data_collection_real_to_string;
+	((DataCollectionClass *) klass)->to_string = (gchar* (*) (DataCollection *)) data_collection_real_to_string;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) data_collection_real_notify_items_added;
+	((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) data_collection_real_notify_items_added;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) data_collection_real_notify_items_removed;
+	((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) data_collection_real_notify_items_removed;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_contents_altered = (void (*)(DataCollection*, GeeIterable*, GeeIterable*)) data_collection_real_notify_contents_altered;
+	((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) data_collection_real_notify_contents_altered;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_items_altered = (void (*)(DataCollection*, GeeMap*)) data_collection_real_notify_items_altered;
+	((DataCollectionClass *) klass)->notify_items_altered = (void (*) (DataCollection *, GeeMap*)) data_collection_real_notify_items_altered;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_ordering_changed = (void (*)(DataCollection*)) data_collection_real_notify_ordering_changed;
+	((DataCollectionClass *) klass)->notify_ordering_changed = (void (*) (DataCollection *)) data_collection_real_notify_ordering_changed;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_property_set = (void (*)(DataCollection*, const gchar*, GValue*, GValue*)) data_collection_real_notify_property_set;
+	((DataCollectionClass *) klass)->notify_property_set = (void (*) (DataCollection *, const gchar*, GValue*, GValue*)) data_collection_real_notify_property_set;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_property_cleared = (void (*)(DataCollection*, const gchar*)) data_collection_real_notify_property_cleared;
+	((DataCollectionClass *) klass)->notify_property_cleared = (void (*) (DataCollection *, const gchar*)) data_collection_real_notify_property_cleared;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->valid_type = (gboolean (*)(DataCollection*, DataObject*)) data_collection_real_valid_type;
+	((DataCollectionClass *) klass)->valid_type = (gboolean (*) (DataCollection *, DataObject*)) data_collection_real_valid_type;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->set_comparator = (void (*)(DataCollection*, Comparator, void*, ComparatorPredicate, void*)) data_collection_real_set_comparator;
+	((DataCollectionClass *) klass)->set_comparator = (void (*) (DataCollection *, Comparator, void*, ComparatorPredicate, void*)) data_collection_real_set_comparator;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->reset_comparator = (void (*)(DataCollection*)) data_collection_real_reset_comparator;
+	((DataCollectionClass *) klass)->reset_comparator = (void (*) (DataCollection *)) data_collection_real_reset_comparator;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->get_all = (GeeCollection* (*)(DataCollection*)) data_collection_real_get_all;
+	((DataCollectionClass *) klass)->get_all = (GeeCollection* (*) (DataCollection *)) data_collection_real_get_all;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->get_count = (gint (*)(DataCollection*)) data_collection_real_get_count;
+	((DataCollectionClass *) klass)->get_count = (gint (*) (DataCollection *)) data_collection_real_get_count;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->get_at = (DataObject* (*)(DataCollection*, gint)) data_collection_real_get_at;
+	((DataCollectionClass *) klass)->get_at = (DataObject* (*) (DataCollection *, gint)) data_collection_real_get_at;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->index_of = (gint (*)(DataCollection*, DataObject*)) data_collection_real_index_of;
+	((DataCollectionClass *) klass)->index_of = (gint (*) (DataCollection *, DataObject*)) data_collection_real_index_of;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->contains = (gboolean (*)(DataCollection*, DataObject*)) data_collection_real_contains;
+	((DataCollectionClass *) klass)->contains = (gboolean (*) (DataCollection *, DataObject*)) data_collection_real_contains;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->add = (gboolean (*)(DataCollection*, DataObject*)) data_collection_real_add;
+	((DataCollectionClass *) klass)->add = (gboolean (*) (DataCollection *, DataObject*)) data_collection_real_add;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->add_many = (GeeCollection* (*)(DataCollection*, GeeCollection*, ProgressMonitor, void*)) data_collection_real_add_many;
+	((DataCollectionClass *) klass)->add_many = (GeeCollection* (*) (DataCollection *, GeeCollection*, ProgressMonitor, void*)) data_collection_real_add_many;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->remove_marked = (void (*)(DataCollection*, Marker*)) data_collection_real_remove_marked;
+	((DataCollectionClass *) klass)->remove_marked = (void (*) (DataCollection *, Marker*)) data_collection_real_remove_marked;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->clear = (void (*)(DataCollection*)) data_collection_real_clear;
+	((DataCollectionClass *) klass)->clear = (void (*) (DataCollection *)) data_collection_real_clear;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->close = (void (*)(DataCollection*)) data_collection_real_close;
+	((DataCollectionClass *) klass)->close = (void (*) (DataCollection *)) data_collection_real_close;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_frozen = (void (*)(DataCollection*)) data_collection_real_notify_frozen;
+	((DataCollectionClass *) klass)->notify_frozen = (void (*) (DataCollection *)) data_collection_real_notify_frozen;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_thawed = (void (*)(DataCollection*)) data_collection_real_notify_thawed;
+	((DataCollectionClass *) klass)->notify_thawed = (void (*) (DataCollection *)) data_collection_real_notify_thawed;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	((DataCollectionClass *) klass)->items_added = data_collection_real_items_added;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3836,30 +3849,30 @@ static void data_collection_class_init (DataCollectionClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	((DataCollectionClass *) klass)->thawed = data_collection_real_thawed;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_new ("items_added", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_added), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
+	data_collection_signals[DATA_COLLECTION_ITEMS_ADDED_SIGNAL] = g_signal_new ("items-added", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_added), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_new ("items_removed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_removed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
+	data_collection_signals[DATA_COLLECTION_ITEMS_REMOVED_SIGNAL] = g_signal_new ("items-removed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_removed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_new ("contents_altered", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_ITERABLE, GEE_TYPE_ITERABLE);
+	data_collection_signals[DATA_COLLECTION_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("contents-altered", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_ITERABLE, GEE_TYPE_ITERABLE);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_new ("items_altered", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_MAP);
+	data_collection_signals[DATA_COLLECTION_ITEMS_ALTERED_SIGNAL] = g_signal_new ("items-altered", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_MAP);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_new ("ordering_changed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, ordering_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	data_collection_signals[DATA_COLLECTION_ORDERING_CHANGED_SIGNAL] = g_signal_new ("ordering-changed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, ordering_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_new ("property_set", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_set), NULL, NULL, g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_VALUE);
+	data_collection_signals[DATA_COLLECTION_PROPERTY_SET_SIGNAL] = g_signal_new ("property-set", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_set), NULL, NULL, g_cclosure_user_marshal_VOID__STRING_POINTER_BOXED, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_VALUE);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_new ("property_cleared", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_cleared), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+	data_collection_signals[DATA_COLLECTION_PROPERTY_CLEARED_SIGNAL] = g_signal_new ("property-cleared", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_cleared), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_new ("frozen", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, frozen), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	data_collection_signals[DATA_COLLECTION_FROZEN_SIGNAL] = g_signal_new ("frozen", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, frozen), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_new ("thawed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, thawed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3855 "DataCollection.c"
+	data_collection_signals[DATA_COLLECTION_THAWED_SIGNAL] = g_signal_new ("thawed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, thawed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 3868 "DataCollection.c"
 }
 
 
 static void data_collection_instance_init (DataCollection * self) {
-	DataSet* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
+	DataSet* _tmp0_;
+	GeeHashMap* _tmp1_;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self->priv = DATA_COLLECTION_GET_PRIVATE (self);
 #line 108 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3880,11 +3893,11 @@ static void data_collection_instance_init (DataCollection * self) {
 	self->priv->fire_ordering_changed = FALSE;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self->ref_count = 1;
-#line 3882 "DataCollection.c"
+#line 3895 "DataCollection.c"
 }
 
 
-static void data_collection_finalize (DataCollection* obj) {
+static void data_collection_finalize (DataCollection * obj) {
 	DataCollection * self;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_COLLECTION, DataCollection);
@@ -3898,7 +3911,7 @@ static void data_collection_finalize (DataCollection* obj) {
 	_g_object_unref0 (self->priv->properties);
 #line 112 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_g_object_unref0 (self->priv->frozen_items_altered);
-#line 3900 "DataCollection.c"
+#line 3913 "DataCollection.c"
 }
 
 
@@ -3917,18 +3930,18 @@ GType data_collection_get_type (void) {
 
 
 gpointer data_collection_ref (gpointer instance) {
-	DataCollection* self;
+	DataCollection * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	return instance;
-#line 3925 "DataCollection.c"
+#line 3938 "DataCollection.c"
 }
 
 
 void data_collection_unref (gpointer instance) {
-	DataCollection* self;
+	DataCollection * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -3936,7 +3949,7 @@ void data_collection_unref (gpointer instance) {
 		DATA_COLLECTION_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3938 "DataCollection.c"
+#line 3951 "DataCollection.c"
 	}
 }
 
diff --git a/src/core/DataObject.c b/src/core/DataObject.c
index 58505c6..a34dc93 100644
--- a/src/core/DataObject.c
+++ b/src/core/DataObject.c
@@ -1,4 +1,4 @@
-/* DataObject.c generated by valac 0.34.7, the Vala compiler
+/* DataObject.c generated by valac 0.36.6, the Vala compiler
  * generated from DataObject.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -139,13 +139,13 @@ void data_object_set_collection_property (DataObject* self, const gchar* name, G
 void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target);
 void data_object_clear_collection_property (DataObject* self, const gchar* name);
 void data_collection_clear_property (DataCollection* self, const gchar* name);
-static void data_object_finalize (GObject* obj);
+static void data_object_finalize (GObject * obj);
 
 
 DataObject* data_object_construct (GType object_type, gint64 object_id) {
 	DataObject * self = NULL;
 	gint64 _tmp0_ = 0LL;
-	gint64 _tmp1_ = 0LL;
+	gint64 _tmp1_;
 #line 38 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	self = (DataObject*) g_object_new (object_type, NULL);
 #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -153,7 +153,7 @@ DataObject* data_object_construct (GType object_type, gint64 object_id) {
 #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	if (_tmp1_ == DATA_OBJECT_INVALID_OBJECT_ID) {
 #line 156 "DataObject.c"
-		gint64 _tmp2_ = 0LL;
+		gint64 _tmp2_;
 #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 		_tmp2_ = data_object_object_id_generator;
 #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -162,7 +162,7 @@ DataObject* data_object_construct (GType object_type, gint64 object_id) {
 		_tmp0_ = _tmp2_;
 #line 164 "DataObject.c"
 	} else {
-		gint64 _tmp3_ = 0LL;
+		gint64 _tmp3_;
 #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 		_tmp3_ = object_id;
 #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -178,7 +178,7 @@ DataObject* data_object_construct (GType object_type, gint64 object_id) {
 
 
 static void data_object_real_notify_altered (DataObject* self, Alteration* alteration) {
-	DataCollection* _tmp0_ = NULL;
+	DataCollection* _tmp0_;
 #line 42 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (IS_ALTERATION (alteration));
 #line 43 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -186,8 +186,8 @@ static void data_object_real_notify_altered (DataObject* self, Alteration* alter
 #line 43 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	if (_tmp0_ != NULL) {
 #line 189 "DataObject.c"
-		DataCollection* _tmp1_ = NULL;
-		Alteration* _tmp2_ = NULL;
+		DataCollection* _tmp1_;
+		Alteration* _tmp2_;
 #line 44 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 		_tmp1_ = self->priv->member_of;
 #line 44 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -303,8 +303,8 @@ static gpointer _data_collection_ref0 (gpointer self) {
 
 DataCollection* data_object_get_membership (DataObject* self) {
 	DataCollection* result = NULL;
-	DataCollection* _tmp0_ = NULL;
-	DataCollection* _tmp1_ = NULL;
+	DataCollection* _tmp0_;
+	DataCollection* _tmp1_;
 #line 73 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (self), NULL);
 #line 74 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -321,7 +321,7 @@ DataCollection* data_object_get_membership (DataObject* self) {
 
 gboolean data_object_has_membership (DataObject* self) {
 	gboolean result = FALSE;
-	DataCollection* _tmp0_ = NULL;
+	DataCollection* _tmp0_;
 #line 77 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (self), FALSE);
 #line 78 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -335,10 +335,10 @@ gboolean data_object_has_membership (DataObject* self) {
 
 
 void data_object_internal_set_membership (DataObject* self, DataCollection* collection, gint64 ordinal) {
-	DataCollection* _tmp0_ = NULL;
-	DataCollection* _tmp1_ = NULL;
-	DataCollection* _tmp2_ = NULL;
-	gint64 _tmp3_ = 0LL;
+	DataCollection* _tmp0_;
+	DataCollection* _tmp1_;
+	DataCollection* _tmp2_;
+	gint64 _tmp3_;
 #line 83 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (IS_DATA_OBJECT (self));
 #line 83 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -364,8 +364,8 @@ void data_object_internal_set_membership (DataObject* self, DataCollection* coll
 
 
 void data_object_internal_set_ordinal (DataObject* self, gint64 ordinal) {
-	DataCollection* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
+	DataCollection* _tmp0_;
+	gint64 _tmp1_;
 #line 96 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (IS_DATA_OBJECT (self));
 #line 97 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -395,7 +395,7 @@ void data_object_internal_clear_membership (DataObject* self) {
 
 inline gint64 data_object_internal_get_ordinal (DataObject* self) {
 	gint64 result = 0LL;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 110 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (self), 0LL);
 #line 111 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -410,7 +410,7 @@ inline gint64 data_object_internal_get_ordinal (DataObject* self) {
 
 inline gint64 data_object_get_object_id (DataObject* self) {
 	gint64 result = 0LL;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 114 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (self), 0LL);
 #line 115 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -433,13 +433,13 @@ static void _vala_GValue_free (GValue* self) {
 
 
 void data_object_get_collection_property (DataObject* self, const gchar* name, GValue* def, GValue* result) {
-	DataCollection* _tmp0_ = NULL;
+	DataCollection* _tmp0_;
 	GValue* _result_ = NULL;
-	DataCollection* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GValue* _tmp5_ = NULL;
+	DataCollection* _tmp3_;
+	const gchar* _tmp4_;
+	GValue* _tmp5_;
 	GValue* _tmp6_ = NULL;
-	GValue* _tmp7_ = NULL;
+	GValue* _tmp7_;
 	GValue _tmp10_ = {0};
 #line 118 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (IS_DATA_OBJECT (self));
@@ -450,7 +450,7 @@ void data_object_get_collection_property (DataObject* self, const gchar* name, G
 #line 119 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	if (_tmp0_ == NULL) {
 #line 453 "DataObject.c"
-		GValue* _tmp1_ = NULL;
+		GValue* _tmp1_;
 		GValue _tmp2_ = {0};
 #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 		_tmp1_ = def;
@@ -485,14 +485,14 @@ void data_object_get_collection_property (DataObject* self, const gchar* name, G
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	if (_tmp7_ != NULL) {
 #line 488 "DataObject.c"
-		GValue* _tmp8_ = NULL;
+		GValue* _tmp8_;
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 		_tmp8_ = _result_;
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 		_tmp6_ = _tmp8_;
 #line 494 "DataObject.c"
 	} else {
-		GValue* _tmp9_ = NULL;
+		GValue* _tmp9_;
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 		_tmp9_ = def;
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -522,7 +522,7 @@ void data_object_get_collection_property (DataObject* self, const gchar* name, G
 
 
 void data_object_set_collection_property (DataObject* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target) {
-	DataCollection* _tmp0_ = NULL;
+	DataCollection* _tmp0_;
 #line 127 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (IS_DATA_OBJECT (self));
 #line 127 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -534,11 +534,11 @@ void data_object_set_collection_property (DataObject* self, const gchar* name, G
 #line 128 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	if (_tmp0_ != NULL) {
 #line 537 "DataObject.c"
-		DataCollection* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		GValue _tmp3_ = {0};
-		ValueEqualFunc _tmp4_ = NULL;
-		void* _tmp4__target = NULL;
+		DataCollection* _tmp1_;
+		const gchar* _tmp2_;
+		GValue _tmp3_;
+		ValueEqualFunc _tmp4_;
+		void* _tmp4__target;
 #line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 		_tmp1_ = self->priv->member_of;
 #line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -557,7 +557,7 @@ void data_object_set_collection_property (DataObject* self, const gchar* name, G
 
 
 void data_object_clear_collection_property (DataObject* self, const gchar* name) {
-	DataCollection* _tmp0_ = NULL;
+	DataCollection* _tmp0_;
 #line 132 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (IS_DATA_OBJECT (self));
 #line 132 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -567,8 +567,8 @@ void data_object_clear_collection_property (DataObject* self, const gchar* name)
 #line 133 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	if (_tmp0_ != NULL) {
 #line 570 "DataObject.c"
-		DataCollection* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		DataCollection* _tmp1_;
+		const gchar* _tmp2_;
 #line 134 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 		_tmp1_ = self->priv->member_of;
 #line 134 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -586,17 +586,17 @@ static void data_object_class_init (DataObjectClass * klass) {
 #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_type_class_add_private (klass, sizeof (DataObjectPrivate));
 #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) data_object_real_notify_altered;
+	((DataObjectClass *) klass)->notify_altered = (void (*) (DataObject *, Alteration*)) data_object_real_notify_altered;
 #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	((DataObjectClass *) klass)->notify_membership_changed = (void (*)(DataObject*, DataCollection*)) data_object_real_notify_membership_changed;
+	((DataObjectClass *) klass)->notify_membership_changed = (void (*) (DataObject *, DataCollection*)) data_object_real_notify_membership_changed;
 #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	((DataObjectClass *) klass)->notify_collection_property_set = (void (*)(DataObject*, const gchar*, GValue*, GValue*)) data_object_real_notify_collection_property_set;
+	((DataObjectClass *) klass)->notify_collection_property_set = (void (*) (DataObject *, const gchar*, GValue*, GValue*)) data_object_real_notify_collection_property_set;
 #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	((DataObjectClass *) klass)->notify_collection_property_cleared = (void (*)(DataObject*, const gchar*)) data_object_real_notify_collection_property_cleared;
+	((DataObjectClass *) klass)->notify_collection_property_cleared = (void (*) (DataObject *, const gchar*)) data_object_real_notify_collection_property_cleared;
 #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) data_object_real_get_name;
+	((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) data_object_real_get_name;
 #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) data_object_real_to_string;
+	((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) data_object_real_to_string;
 #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_object_finalize;
 #line 603 "DataObject.c"
@@ -616,7 +616,7 @@ static void data_object_instance_init (DataObject * self) {
 }
 
 
-static void data_object_finalize (GObject* obj) {
+static void data_object_finalize (GObject * obj) {
 	DataObject * self;
 #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_OBJECT, DataObject);
diff --git a/src/core/DataSet.c b/src/core/DataSet.c
index a6ea6b0..cc12b64 100644
--- a/src/core/DataSet.c
+++ b/src/core/DataSet.c
@@ -1,4 +1,4 @@
-/* DataSet.c generated by valac 0.34.7, the Vala compiler
+/* DataSet.c generated by valac 0.36.6, the Vala compiler
  * generated from DataSet.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -162,7 +162,7 @@ gboolean data_set_remove (DataSet* self, DataObject* object);
 gboolean data_set_remove_many (DataSet* self, GeeCollection* objects);
 gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* alteration);
 gboolean sorted_list_resort_item (SortedList* self, gconstpointer item);
-static void data_set_finalize (DataSet* obj);
+static void data_set_finalize (DataSet * obj);
 
 
 DataSet* data_set_construct (GType object_type) {
@@ -186,10 +186,10 @@ DataSet* data_set_new (void) {
 
 static gint64 data_set_order_added_comparator (DataSet* self, void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-	void* _tmp2_ = NULL;
-	gint64 _tmp3_ = 0LL;
+	void* _tmp0_;
+	gint64 _tmp1_;
+	void* _tmp2_;
+	gint64 _tmp3_;
 #line 39 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), 0LL);
 #line 40 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -226,13 +226,13 @@ static gboolean data_set_order_added_predicate (DataSet* self, DataObject* objec
 
 static gint64 data_set_comparator_wrapper (DataSet* self, void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
+	void* _tmp0_;
+	void* _tmp1_;
 	gint64 _result_ = 0LL;
-	Comparator _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	gint64 _tmp7_ = 0LL;
-	gint64 _tmp11_ = 0LL;
+	Comparator _tmp2_;
+	void* _tmp2__target;
+	gint64 _tmp7_;
+	gint64 _tmp11_;
 #line 48 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), 0LL);
 #line 49 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -256,11 +256,11 @@ static gint64 data_set_comparator_wrapper (DataSet* self, void* a, void* b) {
 #line 56 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (_tmp2_ != NULL) {
 #line 259 "DataSet.c"
-		Comparator _tmp3_ = NULL;
-		void* _tmp3__target = NULL;
-		void* _tmp4_ = NULL;
-		void* _tmp5_ = NULL;
-		gint64 _tmp6_ = 0LL;
+		Comparator _tmp3_;
+		void* _tmp3__target;
+		void* _tmp4_;
+		void* _tmp5_;
+		gint64 _tmp6_;
 #line 57 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 		_tmp3_ = self->priv->user_comparator;
 #line 57 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -280,9 +280,9 @@ static gint64 data_set_comparator_wrapper (DataSet* self, void* a, void* b) {
 #line 59 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (_tmp7_ == ((gint64) 0)) {
 #line 283 "DataSet.c"
-		void* _tmp8_ = NULL;
-		void* _tmp9_ = NULL;
-		gint64 _tmp10_ = 0LL;
+		void* _tmp8_;
+		void* _tmp9_;
+		gint64 _tmp10_;
 #line 60 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 		_tmp8_ = a;
 #line 60 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -307,9 +307,9 @@ static gint64 data_set_comparator_wrapper (DataSet* self, void* a, void* b) {
 
 gboolean data_set_contains (DataSet* self, DataObject* object) {
 	gboolean result = FALSE;
-	GeeHashSet* _tmp0_ = NULL;
-	DataObject* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashSet* _tmp0_;
+	DataObject* _tmp1_;
+	gboolean _tmp2_;
 #line 67 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), FALSE);
 #line 67 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -330,8 +330,8 @@ gboolean data_set_contains (DataSet* self, DataObject* object) {
 
 inline gint data_set_get_count (DataSet* self) {
 	gint result = 0;
-	SortedList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SortedList* _tmp0_;
+	gint _tmp1_;
 #line 71 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), 0);
 #line 72 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -365,7 +365,7 @@ static gint64 _data_set_order_added_comparator_comparator (void* a, void* b, gpo
 
 
 void data_set_reset_comparator (DataSet* self) {
-	SortedList* _tmp0_ = NULL;
+	SortedList* _tmp0_;
 #line 75 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_if_fail (IS_DATA_SET (self));
 #line 76 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -386,10 +386,10 @@ void data_set_reset_comparator (DataSet* self) {
 
 Comparator data_set_get_comparator (DataSet* self, void** result_target) {
 	Comparator result = NULL;
-	Comparator _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	Comparator _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
+	Comparator _tmp0_;
+	void* _tmp0__target;
+	Comparator _tmp1_;
+	void* _tmp1__target;
 #line 81 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), NULL);
 #line 82 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -412,10 +412,10 @@ Comparator data_set_get_comparator (DataSet* self, void** result_target) {
 
 ComparatorPredicate data_set_get_comparator_predicate (DataSet* self, void** result_target) {
 	ComparatorPredicate result = NULL;
-	ComparatorPredicate _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	ComparatorPredicate _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
+	ComparatorPredicate _tmp0_;
+	void* _tmp0__target;
+	ComparatorPredicate _tmp1_;
+	void* _tmp1__target;
 #line 85 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), NULL);
 #line 86 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -446,11 +446,11 @@ static gint64 _data_set_comparator_wrapper_comparator (void* a, void* b, gpointe
 
 
 void data_set_set_comparator (DataSet* self, Comparator user_comparator, void* user_comparator_target, ComparatorPredicate comparator_predicate, void* comparator_predicate_target) {
-	Comparator _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	ComparatorPredicate _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	SortedList* _tmp2_ = NULL;
+	Comparator _tmp0_;
+	void* _tmp0__target;
+	ComparatorPredicate _tmp1_;
+	void* _tmp1__target;
+	SortedList* _tmp2_;
 #line 89 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_if_fail (IS_DATA_SET (self));
 #line 90 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -479,9 +479,9 @@ void data_set_set_comparator (DataSet* self, Comparator user_comparator, void* u
 
 GeeList* data_set_get_all (DataSet* self) {
 	GeeList* result = NULL;
-	SortedList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
+	SortedList* _tmp0_;
+	GeeList* _tmp1_;
+	GeeList* _tmp2_;
 #line 95 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), NULL);
 #line 96 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -501,11 +501,11 @@ GeeList* data_set_get_all (DataSet* self) {
 DataSet* data_set_copy (DataSet* self) {
 	DataSet* result = NULL;
 	DataSet* clone = NULL;
-	DataSet* _tmp0_ = NULL;
-	SortedList* _tmp1_ = NULL;
-	SortedList* _tmp2_ = NULL;
-	GeeHashSet* _tmp3_ = NULL;
-	GeeHashSet* _tmp4_ = NULL;
+	DataSet* _tmp0_;
+	SortedList* _tmp1_;
+	SortedList* _tmp2_;
+	GeeHashSet* _tmp3_;
+	GeeHashSet* _tmp4_;
 #line 99 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), NULL);
 #line 100 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -536,9 +536,9 @@ DataSet* data_set_copy (DataSet* self) {
 
 DataObject* data_set_get_at (DataSet* self, gint index) {
 	DataObject* result = NULL;
-	SortedList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gpointer _tmp2_ = NULL;
+	SortedList* _tmp0_;
+	gint _tmp1_;
+	gpointer _tmp2_;
 #line 107 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), NULL);
 #line 108 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -557,10 +557,10 @@ DataObject* data_set_get_at (DataSet* self, gint index) {
 
 gint data_set_index_of (DataSet* self, DataObject* object) {
 	gint result = 0;
-	SortedList* _tmp0_ = NULL;
-	DataObject* _tmp1_ = NULL;
-	GEqualFunc _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	SortedList* _tmp0_;
+	DataObject* _tmp1_;
+	GEqualFunc _tmp2_;
+	gint _tmp3_;
 #line 111 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), 0);
 #line 111 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -583,12 +583,12 @@ gint data_set_index_of (DataSet* self, DataObject* object) {
 
 gboolean data_set_add (DataSet* self, DataObject* object) {
 	gboolean result = FALSE;
-	SortedList* _tmp0_ = NULL;
-	DataObject* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GeeHashSet* _tmp3_ = NULL;
-	DataObject* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	SortedList* _tmp0_;
+	DataObject* _tmp1_;
+	gboolean _tmp2_;
+	GeeHashSet* _tmp3_;
+	DataObject* _tmp4_;
+	gboolean _tmp5_;
 #line 116 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), FALSE);
 #line 116 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -616,8 +616,8 @@ gboolean data_set_add (DataSet* self, DataObject* object) {
 #line 120 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (!_tmp5_) {
 #line 619 "DataSet.c"
-		SortedList* _tmp6_ = NULL;
-		DataObject* _tmp7_ = NULL;
+		SortedList* _tmp6_;
+		DataObject* _tmp7_;
 #line 122 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 		_tmp6_ = self->priv->list;
 #line 122 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -641,16 +641,16 @@ gboolean data_set_add (DataSet* self, DataObject* object) {
 gboolean data_set_add_many (DataSet* self, GeeCollection* objects) {
 	gboolean result = FALSE;
 	gint count = 0;
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	SortedList* _tmp4_ = NULL;
-	GeeCollection* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	GeeHashSet* _tmp7_ = NULL;
-	GeeCollection* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	SortedList* _tmp4_;
+	GeeCollection* _tmp5_;
+	gboolean _tmp6_;
+	GeeHashSet* _tmp7_;
+	GeeCollection* _tmp8_;
+	gboolean _tmp9_;
 #line 131 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), FALSE);
 #line 131 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -696,8 +696,8 @@ gboolean data_set_add_many (DataSet* self, GeeCollection* objects) {
 #line 139 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (!_tmp9_) {
 #line 699 "DataSet.c"
-		SortedList* _tmp10_ = NULL;
-		GeeCollection* _tmp11_ = NULL;
+		SortedList* _tmp10_;
+		GeeCollection* _tmp11_;
 #line 141 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 		_tmp10_ = self->priv->list;
 #line 141 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -721,12 +721,12 @@ gboolean data_set_add_many (DataSet* self, GeeCollection* objects) {
 gboolean data_set_remove (DataSet* self, DataObject* object) {
 	gboolean result = FALSE;
 	gboolean success = FALSE;
-	SortedList* _tmp0_ = NULL;
-	DataObject* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GeeHashSet* _tmp3_ = NULL;
-	DataObject* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	SortedList* _tmp0_;
+	DataObject* _tmp1_;
+	gboolean _tmp2_;
+	GeeHashSet* _tmp3_;
+	DataObject* _tmp4_;
+	gboolean _tmp5_;
 #line 149 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), FALSE);
 #line 149 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -768,12 +768,12 @@ gboolean data_set_remove (DataSet* self, DataObject* object) {
 gboolean data_set_remove_many (DataSet* self, GeeCollection* objects) {
 	gboolean result = FALSE;
 	gboolean success = FALSE;
-	SortedList* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GeeHashSet* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	SortedList* _tmp0_;
+	GeeCollection* _tmp1_;
+	gboolean _tmp2_;
+	GeeHashSet* _tmp3_;
+	GeeCollection* _tmp4_;
+	gboolean _tmp5_;
 #line 161 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), FALSE);
 #line 161 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -816,11 +816,11 @@ gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration*
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	ComparatorPredicate _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	SortedList* _tmp8_ = NULL;
-	DataObject* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
+	ComparatorPredicate _tmp2_;
+	void* _tmp2__target;
+	SortedList* _tmp8_;
+	DataObject* _tmp9_;
+	gboolean _tmp10_;
 #line 174 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), FALSE);
 #line 174 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -834,7 +834,7 @@ gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration*
 #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (_tmp2_ != NULL) {
 #line 837 "DataSet.c"
-		Alteration* _tmp3_ = NULL;
+		Alteration* _tmp3_;
 #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 		_tmp3_ = alteration;
 #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -848,11 +848,11 @@ gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration*
 #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (_tmp1_) {
 #line 851 "DataSet.c"
-		ComparatorPredicate _tmp4_ = NULL;
-		void* _tmp4__target = NULL;
-		DataObject* _tmp5_ = NULL;
-		Alteration* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+		ComparatorPredicate _tmp4_;
+		void* _tmp4__target;
+		DataObject* _tmp5_;
+		Alteration* _tmp6_;
+		gboolean _tmp7_;
 #line 176 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 		_tmp4_ = self->priv->comparator_predicate;
 #line 176 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -935,7 +935,7 @@ static gchar* value_data_set_collect_value (GValue* value, guint n_collect_value
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (collect_values[0].v_pointer) {
 #line 938 "DataSet.c"
-		DataSet* object;
+		DataSet * object;
 		object = collect_values[0].v_pointer;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -962,7 +962,7 @@ static gchar* value_data_set_collect_value (GValue* value, guint n_collect_value
 
 
 static gchar* value_data_set_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	DataSet** object_p;
+	DataSet ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (!object_p) {
@@ -1014,7 +1014,7 @@ gpointer value_get_data_set (const GValue* value) {
 
 
 void value_set_data_set (GValue* value, gpointer v_object) {
-	DataSet* old;
+	DataSet * old;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_SET));
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -1045,7 +1045,7 @@ void value_set_data_set (GValue* value, gpointer v_object) {
 
 
 void value_take_data_set (GValue* value, gpointer v_object) {
-	DataSet* old;
+	DataSet * old;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_SET));
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -1085,8 +1085,8 @@ static void data_set_class_init (DataSetClass * klass) {
 
 
 static void data_set_instance_init (DataSet * self) {
-	SortedList* _tmp0_ = NULL;
-	GeeHashSet* _tmp1_ = NULL;
+	SortedList* _tmp0_;
+	GeeHashSet* _tmp1_;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	self->priv = DATA_SET_GET_PRIVATE (self);
 #line 30 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -1099,15 +1099,19 @@ static void data_set_instance_init (DataSet * self) {
 	self->priv->hash_set = _tmp1_;
 #line 32 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	self->priv->user_comparator = NULL;
+#line 32 "/home/jens/Source/shotwell/src/core/DataSet.vala"
+	self->priv->user_comparator_target = self;
 #line 33 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	self->priv->comparator_predicate = NULL;
+#line 33 "/home/jens/Source/shotwell/src/core/DataSet.vala"
+	self->priv->comparator_predicate_target = self;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	self->ref_count = 1;
-#line 1107 "DataSet.c"
+#line 1111 "DataSet.c"
 }
 
 
-static void data_set_finalize (DataSet* obj) {
+static void data_set_finalize (DataSet * obj) {
 	DataSet * self;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_SET, DataSet);
@@ -1117,7 +1121,7 @@ static void data_set_finalize (DataSet* obj) {
 	_g_object_unref0 (self->priv->list);
 #line 31 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	_g_object_unref0 (self->priv->hash_set);
-#line 1121 "DataSet.c"
+#line 1125 "DataSet.c"
 }
 
 
@@ -1136,18 +1140,18 @@ GType data_set_get_type (void) {
 
 
 gpointer data_set_ref (gpointer instance) {
-	DataSet* self;
+	DataSet * self;
 	self = instance;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	return instance;
-#line 1146 "DataSet.c"
+#line 1150 "DataSet.c"
 }
 
 
 void data_set_unref (gpointer instance) {
-	DataSet* self;
+	DataSet * self;
 	self = instance;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1155,7 +1159,7 @@ void data_set_unref (gpointer instance) {
 		DATA_SET_GET_CLASS (self)->finalize (self);
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1159 "DataSet.c"
+#line 1163 "DataSet.c"
 	}
 }
 
diff --git a/src/core/DataSource.c b/src/core/DataSource.c
index c95b8ce..dc02548 100644
--- a/src/core/DataSource.c
+++ b/src/core/DataSource.c
@@ -1,4 +1,4 @@
-/* DataSource.c generated by valac 0.34.7, the Vala compiler
+/* DataSource.c generated by valac 0.36.6, the Vala compiler
  * generated from DataSource.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -143,8 +143,20 @@ typedef struct _SourceBacklinkClass SourceBacklinkClass;
 #define _source_backlink_unref0(var) ((var == NULL) ? NULL : (var = (source_backlink_unref (var), NULL)))
 #define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+enum  {
+	DATA_SOURCE_UNLINKED_SIGNAL,
+	DATA_SOURCE_RELINKED_SIGNAL,
+	DATA_SOURCE_DESTROYED_SIGNAL,
+	DATA_SOURCE_LAST_SIGNAL
+};
+static guint data_source_signals[DATA_SOURCE_LAST_SIGNAL] = {0};
 typedef struct _SourceSnapshotPrivate SourceSnapshotPrivate;
 typedef struct _ParamSpecSourceSnapshot ParamSpecSourceSnapshot;
+enum  {
+	SOURCE_SNAPSHOT_BROKEN_SIGNAL,
+	SOURCE_SNAPSHOT_LAST_SIGNAL
+};
+static guint source_snapshot_signals[SOURCE_SNAPSHOT_LAST_SIGNAL] = {0};
 typedef struct _SourceBacklinkPrivate SourceBacklinkPrivate;
 typedef struct _ParamSpecSourceBacklink ParamSpecSourceBacklink;
 
@@ -160,6 +172,13 @@ typedef struct _SourceProxyClass SourceProxyClass;
 typedef struct _SourceProxyPrivate SourceProxyPrivate;
 #define _source_snapshot_unref0(var) ((var == NULL) ? NULL : (var = (source_snapshot_unref (var), NULL)))
 typedef struct _ParamSpecSourceProxy ParamSpecSourceProxy;
+enum  {
+	SOURCE_PROXY_RECONSTITUTED_SIGNAL,
+	SOURCE_PROXY_DEHYDRATED_SIGNAL,
+	SOURCE_PROXY_BROKEN_SIGNAL,
+	SOURCE_PROXY_LAST_SIGNAL
+};
+static guint source_proxy_signals[SOURCE_PROXY_LAST_SIGNAL] = {0};
 
 #define TYPE_PROXYABLE (proxyable_get_type ())
 #define PROXYABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROXYABLE, Proxyable))
@@ -406,14 +425,14 @@ void data_view_notify_unsubscribed (DataView* self, DataSource* source);
 gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing);
 void source_collection_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked);
 void data_source_internal_subscribe (DataSource* self, DataView* view);
-static void _vala_array_add63 (DataView*** array, int* length, int* size, DataView* value);
+static void _vala_array_add63 (DataView** * array, int* length, int* size, DataView* value);
 void data_source_internal_unsubscribe (DataSource* self, DataView* view);
 void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscriber contact_subscriber, void* contact_subscriber_target);
 static void data_source_real_unlinked (DataSource* self, SourceCollection* sources);
 static void g_cclosure_user_marshal_VOID__DATA_COLLECTION (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void data_source_real_relinked (DataSource* self, SourceCollection* sources);
 static void data_source_real_destroyed (DataSource* self);
-static void data_source_finalize (GObject* obj);
+static void data_source_finalize (GObject * obj);
 #define SOURCE_SNAPSHOT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SOURCE_SNAPSHOT, SourceSnapshotPrivate))
 enum  {
 	SOURCE_SNAPSHOT_DUMMY_PROPERTY
@@ -423,7 +442,7 @@ static void source_snapshot_real_notify_broken (SourceSnapshot* self);
 gboolean source_snapshot_is_broken (SourceSnapshot* self);
 SourceSnapshot* source_snapshot_construct (GType object_type);
 static void source_snapshot_real_broken (SourceSnapshot* self);
-static void source_snapshot_finalize (SourceSnapshot* obj);
+static void source_snapshot_finalize (SourceSnapshot * obj);
 #define SOURCE_BACKLINK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SOURCE_BACKLINK, SourceBacklinkPrivate))
 enum  {
 	SOURCE_BACKLINK_DUMMY_PROPERTY
@@ -436,7 +455,7 @@ guint source_backlink_hash_func (SourceBacklink* backlink);
 gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blink);
 const gchar* source_backlink_get_typename (SourceBacklink* self);
 gint64 source_backlink_get_instance_id (SourceBacklink* self);
-static void source_backlink_finalize (SourceBacklink* obj);
+static void source_backlink_finalize (SourceBacklink * obj);
 gpointer source_proxy_ref (gpointer instance);
 void source_proxy_unref (gpointer instance);
 GParamSpec* param_spec_source_proxy (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -471,7 +490,7 @@ gboolean data_collection_contains (DataCollection* self, DataObject* object);
 static void source_proxy_real_reconstituted (SourceProxy* self, DataSource* source);
 static void source_proxy_real_dehydrated (SourceProxy* self);
 static void source_proxy_real_broken (SourceProxy* self);
-static void source_proxy_finalize (SourceProxy* obj);
+static void source_proxy_finalize (SourceProxy * obj);
 GType proxyable_get_type (void) G_GNUC_CONST;
 SourceProxy* proxyable_get_proxy (Proxyable* self);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
@@ -481,23 +500,23 @@ static gint _vala_array_length (gpointer array);
 
 DataSource* data_source_construct (GType object_type, gint64 object_id) {
 	DataSource * self = NULL;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 64 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp0_ = object_id;
 #line 64 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self = (DataSource*) data_object_construct (object_type, _tmp0_);
 #line 63 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return self;
-#line 492 "DataSource.c"
+#line 511 "DataSource.c"
 }
 
 
 static void data_source_real_notify_membership_changed (DataObject* base, DataCollection* collection) {
 	DataSource * self;
-	DataCollection* _tmp0_ = NULL;
+	DataCollection* _tmp0_;
 	gboolean _tmp5_ = FALSE;
-	DataCollection* _tmp6_ = NULL;
-	DataCollection* _tmp8_ = NULL;
+	DataCollection* _tmp6_;
+	DataCollection* _tmp8_;
 #line 73 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATA_SOURCE, DataSource);
 #line 73 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -506,78 +525,78 @@ static void data_source_real_notify_membership_changed (DataObject* base, DataCo
 	_tmp0_ = collection;
 #line 75 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp0_ == NULL) {
-#line 510 "DataSource.c"
+#line 529 "DataSource.c"
 		gboolean _tmp1_ = FALSE;
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp2_ = self->priv->is_destroyed;
 #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		if (_tmp2_) {
 #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp1_ = TRUE;
-#line 519 "DataSource.c"
+#line 538 "DataSource.c"
 		} else {
-			GeeHashMap* _tmp3_ = NULL;
+			GeeHashMap* _tmp3_;
 #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp3_ = self->priv->backlinks;
 #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp1_ = _tmp3_ != NULL;
-#line 526 "DataSource.c"
+#line 545 "DataSource.c"
 		}
 #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_vala_assert (_tmp1_, "is_destroyed || backlinks != null");
-#line 530 "DataSource.c"
+#line 549 "DataSource.c"
 	} else {
-		gboolean _tmp4_ = FALSE;
+		gboolean _tmp4_;
 #line 78 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp4_ = self->priv->is_destroyed;
 #line 78 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_vala_assert (!_tmp4_, "!is_destroyed");
-#line 537 "DataSource.c"
+#line 556 "DataSource.c"
 	}
 #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp6_ = collection;
 #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp6_ == NULL) {
-#line 543 "DataSource.c"
-		GeeHashMap* _tmp7_ = NULL;
+#line 562 "DataSource.c"
+		GeeHashMap* _tmp7_;
 #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp7_ = self->priv->backlinks;
 #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp5_ = _tmp7_ != NULL;
-#line 549 "DataSource.c"
+#line 568 "DataSource.c"
 	} else {
 #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp5_ = FALSE;
-#line 553 "DataSource.c"
+#line 572 "DataSource.c"
 	}
 #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp5_) {
 #line 83 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		data_source_notify_unlinked (self);
-#line 559 "DataSource.c"
+#line 578 "DataSource.c"
 	}
 #line 85 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp8_ = collection;
 #line 85 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	DATA_OBJECT_CLASS (data_source_parent_class)->notify_membership_changed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp8_);
-#line 565 "DataSource.c"
+#line 584 "DataSource.c"
 }
 
 
 static gpointer _source_holding_tank_ref0 (gpointer self) {
 #line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return self ? source_holding_tank_ref (self) : NULL;
-#line 572 "DataSource.c"
+#line 591 "DataSource.c"
 }
 
 
 static void data_source_real_notify_held_in_tank (DataSource* self, SourceHoldingTank* holding_tank) {
-	DataCollection* _tmp0_ = NULL;
-	DataCollection* _tmp1_ = NULL;
-	SourceHoldingTank* _tmp2_ = NULL;
-	SourceHoldingTank* _tmp5_ = NULL;
-	SourceHoldingTank* _tmp6_ = NULL;
+	DataCollection* _tmp0_;
+	DataCollection* _tmp1_;
+	SourceHoldingTank* _tmp2_;
+	SourceHoldingTank* _tmp5_;
+	SourceHoldingTank* _tmp6_;
 #line 88 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail ((holding_tank == NULL) || IS_SOURCE_HOLDING_TANK (holding_tank));
 #line 90 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -592,20 +611,20 @@ static void data_source_real_notify_held_in_tank (DataSource* self, SourceHoldin
 	_tmp2_ = holding_tank;
 #line 94 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp2_ != NULL) {
-#line 596 "DataSource.c"
-		SourceHoldingTank* _tmp3_ = NULL;
+#line 615 "DataSource.c"
+		SourceHoldingTank* _tmp3_;
 #line 95 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp3_ = self->priv->holding_tank;
 #line 95 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_vala_assert (_tmp3_ == NULL, "this.holding_tank == null");
-#line 602 "DataSource.c"
+#line 621 "DataSource.c"
 	} else {
-		SourceHoldingTank* _tmp4_ = NULL;
+		SourceHoldingTank* _tmp4_;
 #line 97 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp4_ = self->priv->holding_tank;
 #line 97 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_vala_assert (_tmp4_ != NULL, "this.holding_tank != null");
-#line 609 "DataSource.c"
+#line 628 "DataSource.c"
 	}
 #line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp5_ = holding_tank;
@@ -615,7 +634,7 @@ static void data_source_real_notify_held_in_tank (DataSource* self, SourceHoldin
 	_source_holding_tank_unref0 (self->priv->holding_tank);
 #line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv->holding_tank = _tmp6_;
-#line 619 "DataSource.c"
+#line 638 "DataSource.c"
 }
 
 
@@ -624,13 +643,13 @@ void data_source_notify_held_in_tank (DataSource* self, SourceHoldingTank* holdi
 	g_return_if_fail (IS_DATA_SOURCE (self));
 #line 88 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	DATA_SOURCE_GET_CLASS (self)->notify_held_in_tank (self, holding_tank);
-#line 628 "DataSource.c"
+#line 647 "DataSource.c"
 }
 
 
 static void data_source_real_notify_altered (DataObject* base, Alteration* alteration) {
 	DataSource * self;
-	SourceHoldingTank* _tmp0_ = NULL;
+	SourceHoldingTank* _tmp0_;
 #line 103 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATA_SOURCE, DataSource);
 #line 103 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -639,19 +658,19 @@ static void data_source_real_notify_altered (DataObject* base, Alteration* alter
 	_tmp0_ = self->priv->holding_tank;
 #line 105 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp0_ != NULL) {
-#line 643 "DataSource.c"
-		SourceHoldingTank* _tmp1_ = NULL;
-		Alteration* _tmp2_ = NULL;
+#line 662 "DataSource.c"
+		SourceHoldingTank* _tmp1_;
+		Alteration* _tmp2_;
 #line 106 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp1_ = self->priv->holding_tank;
 #line 106 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp2_ = alteration;
 #line 106 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_holding_tank_internal_notify_altered (_tmp1_, self, _tmp2_);
-#line 652 "DataSource.c"
+#line 671 "DataSource.c"
 	} else {
-		Alteration* _tmp3_ = NULL;
-		Alteration* _tmp4_ = NULL;
+		Alteration* _tmp3_;
+		Alteration* _tmp4_;
 #line 108 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp3_ = alteration;
 #line 108 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -660,33 +679,33 @@ static void data_source_real_notify_altered (DataObject* base, Alteration* alter
 		_tmp4_ = alteration;
 #line 110 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		DATA_OBJECT_CLASS (data_source_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp4_);
-#line 664 "DataSource.c"
+#line 683 "DataSource.c"
 	}
 }
 
 
 static void data_source_real_notify_unlinking (DataSource* self, SourceCollection* collection) {
 	gboolean _tmp0_ = FALSE;
-	GeeHashMap* _tmp1_ = NULL;
-	SourceCollection* _tmp3_ = NULL;
-	GeeHashMap* _tmp4_ = NULL;
+	GeeHashMap* _tmp1_;
+	SourceCollection* _tmp3_;
+	GeeHashMap* _tmp4_;
 #line 115 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (IS_SOURCE_COLLECTION (collection));
 #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp1_ = self->priv->backlinks;
 #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp1_ == NULL) {
-#line 680 "DataSource.c"
-		SourceCollection* _tmp2_ = NULL;
+#line 699 "DataSource.c"
+		SourceCollection* _tmp2_;
 #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp2_ = self->priv->unlinked_from_collection;
 #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 686 "DataSource.c"
+#line 705 "DataSource.c"
 	} else {
 #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = FALSE;
-#line 690 "DataSource.c"
+#line 709 "DataSource.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_vala_assert (_tmp0_, "backlinks == null && unlinked_from_collection == null");
@@ -700,7 +719,7 @@ static void data_source_real_notify_unlinking (DataSource* self, SourceCollectio
 	_g_object_unref0 (self->priv->backlinks);
 #line 119 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv->backlinks = _tmp4_;
-#line 704 "DataSource.c"
+#line 723 "DataSource.c"
 }
 
 
@@ -709,39 +728,39 @@ void data_source_notify_unlinking (DataSource* self, SourceCollection* collectio
 	g_return_if_fail (IS_DATA_SOURCE (self));
 #line 115 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	DATA_SOURCE_GET_CLASS (self)->notify_unlinking (self, collection);
-#line 713 "DataSource.c"
+#line 732 "DataSource.c"
 }
 
 
 static void data_source_real_notify_unlinked (DataSource* self) {
 	gboolean _tmp0_ = FALSE;
-	SourceCollection* _tmp1_ = NULL;
-	SourceCollection* _tmp3_ = NULL;
-	GeeHashMap* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	SourceCollection* _tmp1_;
+	SourceCollection* _tmp3_;
+	GeeHashMap* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp1_ = self->priv->unlinked_from_collection;
 #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp1_ != NULL) {
-#line 728 "DataSource.c"
-		GeeHashMap* _tmp2_ = NULL;
+#line 747 "DataSource.c"
+		GeeHashMap* _tmp2_;
 #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp2_ = self->priv->backlinks;
 #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 734 "DataSource.c"
+#line 753 "DataSource.c"
 	} else {
 #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = FALSE;
-#line 738 "DataSource.c"
+#line 757 "DataSource.c"
 	}
 #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_vala_assert (_tmp0_, "unlinked_from_collection != null && backlinks != null");
 #line 126 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp3_ = self->priv->unlinked_from_collection;
 #line 126 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	g_signal_emit_by_name (self, "unlinked", _tmp3_);
+	g_signal_emit (self, data_source_signals[DATA_SOURCE_UNLINKED_SIGNAL], 0, _tmp3_);
 #line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp4_ = self->priv->backlinks;
 #line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -750,10 +769,10 @@ static void data_source_real_notify_unlinked (DataSource* self) {
 	_tmp6_ = _tmp5_;
 #line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp6_ > 0) {
-#line 754 "DataSource.c"
-		SourceCollection* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+#line 773 "DataSource.c"
+		SourceCollection* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 130 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp7_ = self->priv->unlinked_from_collection;
 #line 130 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -764,7 +783,7 @@ static void data_source_real_notify_unlinked (DataSource* self) {
 		data_source_commit_backlinks (self, _tmp7_, _tmp9_);
 #line 130 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_g_free0 (_tmp9_);
-#line 768 "DataSource.c"
+#line 787 "DataSource.c"
 	}
 }
 
@@ -774,37 +793,37 @@ void data_source_notify_unlinked (DataSource* self) {
 	g_return_if_fail (IS_DATA_SOURCE (self));
 #line 123 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	DATA_SOURCE_GET_CLASS (self)->notify_unlinked (self);
-#line 778 "DataSource.c"
+#line 797 "DataSource.c"
 }
 
 
 static void data_source_real_notify_relinking (DataSource* self, SourceCollection* collection) {
 	gboolean _tmp0_ = FALSE;
-	GeeHashMap* _tmp1_ = NULL;
+	GeeHashMap* _tmp1_;
 #line 134 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (IS_SOURCE_COLLECTION (collection));
 #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp1_ = self->priv->backlinks;
 #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp1_ != NULL) {
-#line 791 "DataSource.c"
-		SourceCollection* _tmp2_ = NULL;
-		SourceCollection* _tmp3_ = NULL;
+#line 810 "DataSource.c"
+		SourceCollection* _tmp2_;
+		SourceCollection* _tmp3_;
 #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp2_ = self->priv->unlinked_from_collection;
 #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp3_ = collection;
 #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = _tmp2_ == _tmp3_;
-#line 800 "DataSource.c"
+#line 819 "DataSource.c"
 	} else {
 #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = FALSE;
-#line 804 "DataSource.c"
+#line 823 "DataSource.c"
 	}
 #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_vala_assert (_tmp0_, "(backlinks != null) && (unlinked_from_collection == collection)");
-#line 808 "DataSource.c"
+#line 827 "DataSource.c"
 }
 
 
@@ -813,38 +832,38 @@ void data_source_notify_relinking (DataSource* self, SourceCollection* collectio
 	g_return_if_fail (IS_DATA_SOURCE (self));
 #line 134 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	DATA_SOURCE_GET_CLASS (self)->notify_relinking (self, collection);
-#line 817 "DataSource.c"
+#line 836 "DataSource.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 142 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 824 "DataSource.c"
+#line 843 "DataSource.c"
 }
 
 
 static void data_source_real_notify_relinked (DataSource* self) {
 	gboolean _tmp0_ = FALSE;
-	GeeHashMap* _tmp1_ = NULL;
+	GeeHashMap* _tmp1_;
 	SourceCollection* relinked_to = NULL;
-	SourceCollection* _tmp3_ = NULL;
-	SourceCollection* _tmp4_ = NULL;
+	SourceCollection* _tmp3_;
+	SourceCollection* _tmp4_;
 #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp1_ = self->priv->backlinks;
 #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp1_ != NULL) {
-#line 838 "DataSource.c"
-		SourceCollection* _tmp2_ = NULL;
+#line 857 "DataSource.c"
+		SourceCollection* _tmp2_;
 #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp2_ = self->priv->unlinked_from_collection;
 #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 844 "DataSource.c"
+#line 863 "DataSource.c"
 	} else {
 #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = FALSE;
-#line 848 "DataSource.c"
+#line 867 "DataSource.c"
 	}
 #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_vala_assert (_tmp0_, "backlinks != null && unlinked_from_collection != null");
@@ -861,12 +880,12 @@ static void data_source_real_notify_relinked (DataSource* self) {
 #line 144 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv->unlinked_from_collection = NULL;
 #line 145 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	g_signal_emit_by_name (self, "relinked", relinked_to);
+	g_signal_emit (self, data_source_signals[DATA_SOURCE_RELINKED_SIGNAL], 0, relinked_to);
 #line 148 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	data_source_commit_backlinks (self, NULL, NULL);
 #line 139 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_data_collection_unref0 (relinked_to);
-#line 870 "DataSource.c"
+#line 889 "DataSource.c"
 }
 
 
@@ -875,7 +894,7 @@ void data_source_notify_relinked (DataSource* self) {
 	g_return_if_fail (IS_DATA_SOURCE (self));
 #line 139 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	DATA_SOURCE_GET_CLASS (self)->notify_relinked (self);
-#line 879 "DataSource.c"
+#line 898 "DataSource.c"
 }
 
 
@@ -884,7 +903,7 @@ static gchar* data_source_real_get_typename (DataSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `data_source_get_typename'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 156 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return NULL;
-#line 888 "DataSource.c"
+#line 907 "DataSource.c"
 }
 
 
@@ -893,7 +912,7 @@ gchar* data_source_get_typename (DataSource* self) {
 	g_return_val_if_fail (IS_DATA_SOURCE (self), NULL);
 #line 156 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return DATA_SOURCE_GET_CLASS (self)->get_typename (self);
-#line 897 "DataSource.c"
+#line 916 "DataSource.c"
 }
 
 
@@ -903,7 +922,7 @@ static gint64 data_source_real_get_instance_id (DataSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `data_source_get_instance_id'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 162 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return _tmp0_;
-#line 907 "DataSource.c"
+#line 926 "DataSource.c"
 }
 
 
@@ -912,17 +931,17 @@ gint64 data_source_get_instance_id (DataSource* self) {
 	g_return_val_if_fail (IS_DATA_SOURCE (self), 0LL);
 #line 162 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return DATA_SOURCE_GET_CLASS (self)->get_instance_id (self);
-#line 916 "DataSource.c"
+#line 935 "DataSource.c"
 }
 
 
 static gchar* data_source_real_get_source_id (DataSource* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gint64 _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp0_ = data_source_get_typename (self);
 #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -939,7 +958,7 @@ static gchar* data_source_real_get_source_id (DataSource* self) {
 	result = _tmp4_;
 #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 943 "DataSource.c"
+#line 962 "DataSource.c"
 }
 
 
@@ -948,21 +967,21 @@ gchar* data_source_get_source_id (DataSource* self) {
 	g_return_val_if_fail (IS_DATA_SOURCE (self), NULL);
 #line 166 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return DATA_SOURCE_GET_CLASS (self)->get_source_id (self);
-#line 952 "DataSource.c"
+#line 971 "DataSource.c"
 }
 
 
 gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) {
 	gboolean result = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 	GeeList* values = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	SourceBacklink* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gpointer _tmp5_ = NULL;
+	GeeHashMap* _tmp1_;
+	SourceBacklink* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gpointer _tmp5_;
 	gboolean _tmp6_ = FALSE;
-	GeeList* _tmp7_ = NULL;
+	GeeList* _tmp7_;
 #line 170 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE);
 #line 170 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -975,7 +994,7 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) {
 		result = FALSE;
 #line 172 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return result;
-#line 979 "DataSource.c"
+#line 998 "DataSource.c"
 	}
 #line 174 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp1_ = self->priv->backlinks;
@@ -993,12 +1012,12 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) {
 	_tmp7_ = values;
 #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp7_ != NULL) {
-#line 997 "DataSource.c"
-		GeeList* _tmp8_ = NULL;
-		SourceBacklink* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
+#line 1016 "DataSource.c"
+		GeeList* _tmp8_;
+		SourceBacklink* _tmp9_;
+		const gchar* _tmp10_;
+		const gchar* _tmp11_;
+		gboolean _tmp12_;
 #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp8_ = values;
 #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1011,11 +1030,11 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) {
 		_tmp12_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_);
 #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp6_ = _tmp12_;
-#line 1015 "DataSource.c"
+#line 1034 "DataSource.c"
 	} else {
 #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp6_ = FALSE;
-#line 1019 "DataSource.c"
+#line 1038 "DataSource.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	result = _tmp6_;
@@ -1023,28 +1042,28 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) {
 	_g_object_unref0 (values);
 #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 1027 "DataSource.c"
+#line 1046 "DataSource.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1034 "DataSource.c"
+#line 1053 "DataSource.c"
 }
 
 
 GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) {
 	GeeList* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 	GeeList* values = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gpointer _tmp3_ = NULL;
+	GeeHashMap* _tmp1_;
+	const gchar* _tmp2_;
+	gpointer _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	GeeList* _tmp5_ = NULL;
+	GeeList* _tmp5_;
 	GeeList* backlinks = NULL;
-	GeeArrayList* _tmp9_ = NULL;
+	GeeArrayList* _tmp9_;
 #line 179 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (self), NULL);
 #line 179 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1057,7 +1076,7 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) {
 		result = NULL;
 #line 181 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return result;
-#line 1061 "DataSource.c"
+#line 1080 "DataSource.c"
 	}
 #line 183 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp1_ = self->priv->backlinks;
@@ -1073,11 +1092,11 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) {
 	if (_tmp5_ == NULL) {
 #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp4_ = TRUE;
-#line 1077 "DataSource.c"
+#line 1096 "DataSource.c"
 	} else {
-		GeeList* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
+		GeeList* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
 #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp6_ = values;
 #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1086,7 +1105,7 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) {
 		_tmp8_ = _tmp7_;
 #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp4_ = _tmp8_ == 0;
-#line 1090 "DataSource.c"
+#line 1109 "DataSource.c"
 	}
 #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp4_) {
@@ -1096,21 +1115,21 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) {
 		_g_object_unref0 (values);
 #line 185 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return result;
-#line 1100 "DataSource.c"
+#line 1119 "DataSource.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp9_ = gee_array_list_new (TYPE_SOURCE_BACKLINK, (GBoxedCopyFunc) source_backlink_ref, (GDestroyNotify) source_backlink_unref, NULL, NULL, NULL);
 #line 187 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	backlinks = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_LIST, GeeList);
-#line 1106 "DataSource.c"
+#line 1125 "DataSource.c"
 	{
 		GeeList* _value_list = NULL;
-		GeeList* _tmp10_ = NULL;
-		GeeList* _tmp11_ = NULL;
+		GeeList* _tmp10_;
+		GeeList* _tmp11_;
 		gint _value_size = 0;
-		GeeList* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
+		GeeList* _tmp12_;
+		gint _tmp13_;
+		gint _tmp14_;
 		gint _value_index = 0;
 #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp10_ = values;
@@ -1130,19 +1149,19 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) {
 		_value_index = -1;
 #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		while (TRUE) {
-#line 1134 "DataSource.c"
-			gint _tmp15_ = 0;
-			gint _tmp16_ = 0;
-			gint _tmp17_ = 0;
+#line 1153 "DataSource.c"
+			gint _tmp15_;
+			gint _tmp16_;
+			gint _tmp17_;
 			gchar* value = NULL;
-			GeeList* _tmp18_ = NULL;
-			gint _tmp19_ = 0;
-			gpointer _tmp20_ = NULL;
-			GeeList* _tmp21_ = NULL;
-			const gchar* _tmp22_ = NULL;
-			const gchar* _tmp23_ = NULL;
-			SourceBacklink* _tmp24_ = NULL;
-			SourceBacklink* _tmp25_ = NULL;
+			GeeList* _tmp18_;
+			gint _tmp19_;
+			gpointer _tmp20_;
+			GeeList* _tmp21_;
+			const gchar* _tmp22_;
+			const gchar* _tmp23_;
+			SourceBacklink* _tmp24_;
+			SourceBacklink* _tmp25_;
 #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp15_ = _value_index;
 #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1155,7 +1174,7 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) {
 			if (!(_tmp16_ < _tmp17_)) {
 #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				break;
-#line 1159 "DataSource.c"
+#line 1178 "DataSource.c"
 			}
 #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp18_ = _value_list;
@@ -1181,11 +1200,11 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) {
 			_source_backlink_unref0 (_tmp25_);
 #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_g_free0 (value);
-#line 1185 "DataSource.c"
+#line 1204 "DataSource.c"
 		}
 #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_g_object_unref0 (_value_list);
-#line 1189 "DataSource.c"
+#line 1208 "DataSource.c"
 	}
 #line 191 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	result = backlinks;
@@ -1193,26 +1212,26 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) {
 	_g_object_unref0 (values);
 #line 191 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 1197 "DataSource.c"
+#line 1216 "DataSource.c"
 }
 
 
 void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 	GeeList* values = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	SourceBacklink* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gpointer _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
-	GeeList* _tmp13_ = NULL;
-	SourceBacklink* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
+	GeeHashMap* _tmp1_;
+	SourceBacklink* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gpointer _tmp5_;
+	GeeList* _tmp6_;
+	GeeList* _tmp13_;
+	SourceBacklink* _tmp14_;
+	const gchar* _tmp15_;
+	const gchar* _tmp16_;
 	SourceCollection* sources = NULL;
-	DataCollection* _tmp17_ = NULL;
-	SourceCollection* _tmp18_ = NULL;
+	DataCollection* _tmp17_;
+	SourceCollection* _tmp18_;
 #line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (IS_DATA_SOURCE (self));
 #line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1237,13 +1256,13 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) {
 	_tmp6_ = values;
 #line 199 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp6_ == NULL) {
-#line 1241 "DataSource.c"
-		GeeArrayList* _tmp7_ = NULL;
-		GeeHashMap* _tmp8_ = NULL;
-		SourceBacklink* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		GeeList* _tmp12_ = NULL;
+#line 1260 "DataSource.c"
+		GeeArrayList* _tmp7_;
+		GeeHashMap* _tmp8_;
+		SourceBacklink* _tmp9_;
+		const gchar* _tmp10_;
+		const gchar* _tmp11_;
+		GeeList* _tmp12_;
 #line 200 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 200 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1262,7 +1281,7 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) {
 		_tmp12_ = values;
 #line 201 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_);
-#line 1266 "DataSource.c"
+#line 1285 "DataSource.c"
 	}
 #line 204 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp13_ = values;
@@ -1282,56 +1301,56 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) {
 	_tmp18_ = sources;
 #line 207 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp18_ != NULL) {
-#line 1286 "DataSource.c"
-		SourceCollection* _tmp19_ = NULL;
-		SourceBacklink* _tmp20_ = NULL;
+#line 1305 "DataSource.c"
+		SourceCollection* _tmp19_;
+		SourceBacklink* _tmp20_;
 #line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp19_ = sources;
 #line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp20_ = backlink;
 #line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_collection_internal_backlink_set (_tmp19_, self, _tmp20_);
-#line 1295 "DataSource.c"
+#line 1314 "DataSource.c"
 	}
 #line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_data_collection_unref0 (sources);
 #line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_g_object_unref0 (values);
-#line 1301 "DataSource.c"
+#line 1320 "DataSource.c"
 }
 
 
 gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink) {
 	gboolean result = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 	GeeList* values = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	SourceBacklink* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gpointer _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
+	GeeHashMap* _tmp1_;
+	SourceBacklink* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gpointer _tmp5_;
+	GeeList* _tmp6_;
 	gint original_size = 0;
-	GeeList* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
+	GeeList* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
 	GeeIterator* iter = NULL;
-	GeeList* _tmp11_ = NULL;
-	GeeIterator* _tmp12_ = NULL;
-	GeeList* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	SourceCollection* _tmp30_ = NULL;
-	gchar* _tmp31_ = NULL;
-	gchar* _tmp32_ = NULL;
+	GeeList* _tmp11_;
+	GeeIterator* _tmp12_;
+	GeeList* _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	SourceCollection* _tmp30_;
+	gchar* _tmp31_;
+	gchar* _tmp32_;
 	SourceCollection* sources = NULL;
-	DataCollection* _tmp33_ = NULL;
-	SourceCollection* _tmp34_ = NULL;
-	GeeList* _tmp37_ = NULL;
-	gint _tmp38_ = 0;
-	gint _tmp39_ = 0;
-	gint _tmp40_ = 0;
+	DataCollection* _tmp33_;
+	SourceCollection* _tmp34_;
+	GeeList* _tmp37_;
+	gint _tmp38_;
+	gint _tmp39_;
+	gint _tmp40_;
 #line 211 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE);
 #line 211 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1344,7 +1363,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
 		result = FALSE;
 #line 213 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return result;
-#line 1348 "DataSource.c"
+#line 1367 "DataSource.c"
 	}
 #line 215 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp1_ = self->priv->backlinks;
@@ -1368,7 +1387,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
 		_g_object_unref0 (values);
 #line 217 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return result;
-#line 1372 "DataSource.c"
+#line 1391 "DataSource.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp7_ = values;
@@ -1390,16 +1409,16 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
 	iter = _tmp12_;
 #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	while (TRUE) {
-#line 1394 "DataSource.c"
-		GeeIterator* _tmp13_ = NULL;
-		gboolean _tmp14_ = FALSE;
-		GeeIterator* _tmp15_ = NULL;
-		gpointer _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		SourceBacklink* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		gboolean _tmp21_ = FALSE;
+#line 1413 "DataSource.c"
+		GeeIterator* _tmp13_;
+		gboolean _tmp14_;
+		GeeIterator* _tmp15_;
+		gpointer _tmp16_;
+		gchar* _tmp17_;
+		SourceBacklink* _tmp18_;
+		const gchar* _tmp19_;
+		const gchar* _tmp20_;
+		gboolean _tmp21_;
 #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp13_ = iter;
 #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1408,7 +1427,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
 		if (!_tmp14_) {
 #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			break;
-#line 1412 "DataSource.c"
+#line 1431 "DataSource.c"
 		}
 #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp15_ = iter;
@@ -1428,13 +1447,13 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
 		_g_free0 (_tmp17_);
 #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		if (_tmp21_) {
-#line 1432 "DataSource.c"
-			GeeIterator* _tmp22_ = NULL;
+#line 1451 "DataSource.c"
+			GeeIterator* _tmp22_;
 #line 225 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp22_ = iter;
 #line 225 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			gee_iterator_remove (_tmp22_);
-#line 1438 "DataSource.c"
+#line 1457 "DataSource.c"
 		}
 	}
 #line 228 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1445,11 +1464,11 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
 	_tmp25_ = _tmp24_;
 #line 228 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp25_ == 0) {
-#line 1449 "DataSource.c"
-		GeeHashMap* _tmp26_ = NULL;
-		SourceBacklink* _tmp27_ = NULL;
-		const gchar* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
+#line 1468 "DataSource.c"
+		GeeHashMap* _tmp26_;
+		SourceBacklink* _tmp27_;
+		const gchar* _tmp28_;
+		const gchar* _tmp29_;
 #line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp26_ = self->priv->backlinks;
 #line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1460,7 +1479,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
 		_tmp29_ = _tmp28_;
 #line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp29_, NULL);
-#line 1464 "DataSource.c"
+#line 1483 "DataSource.c"
 	}
 #line 233 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp30_ = self->priv->unlinked_from_collection;
@@ -1480,16 +1499,16 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
 	_tmp34_ = sources;
 #line 236 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp34_ != NULL) {
-#line 1484 "DataSource.c"
-		SourceCollection* _tmp35_ = NULL;
-		SourceBacklink* _tmp36_ = NULL;
+#line 1503 "DataSource.c"
+		SourceCollection* _tmp35_;
+		SourceBacklink* _tmp36_;
 #line 237 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp35_ = sources;
 #line 237 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp36_ = backlink;
 #line 237 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_collection_internal_backlink_removed (_tmp35_, self, _tmp36_);
-#line 1493 "DataSource.c"
+#line 1512 "DataSource.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp37_ = values;
@@ -1509,13 +1528,13 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
 	_g_object_unref0 (values);
 #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 1513 "DataSource.c"
+#line 1532 "DataSource.c"
 }
 
 
 static void data_source_real_commit_backlinks (DataSource* self, SourceCollection* sources, const gchar* dehydrated) {
 	gboolean _tmp0_ = FALSE;
-	SourceCollection* _tmp1_ = NULL;
+	SourceCollection* _tmp1_;
 #line 248 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources));
 #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1524,20 +1543,20 @@ static void data_source_real_commit_backlinks (DataSource* self, SourceCollectio
 	if (_tmp1_ != NULL) {
 #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = TRUE;
-#line 1528 "DataSource.c"
+#line 1547 "DataSource.c"
 	} else {
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp2_ = dehydrated;
 #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 1535 "DataSource.c"
+#line 1554 "DataSource.c"
 	}
 #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp0_) {
-#line 1539 "DataSource.c"
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
+#line 1558 "DataSource.c"
+		gchar* _tmp3_;
+		gchar* _tmp4_;
 #line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp3_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
 #line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1546,7 +1565,7 @@ static void data_source_real_commit_backlinks (DataSource* self, SourceCollectio
 		g_warning ("DataSource.vala:250: No implementation to commit link state for %s", _tmp4_);
 #line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_g_free0 (_tmp4_);
-#line 1550 "DataSource.c"
+#line 1569 "DataSource.c"
 	}
 }
 
@@ -1556,22 +1575,22 @@ void data_source_commit_backlinks (DataSource* self, SourceCollection* sources,
 	g_return_if_fail (IS_DATA_SOURCE (self));
 #line 248 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	DATA_SOURCE_GET_CLASS (self)->commit_backlinks (self, sources, dehydrated);
-#line 1560 "DataSource.c"
+#line 1579 "DataSource.c"
 }
 
 
 static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 	gchar* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	GeeHashMap* _tmp1_ = NULL;
+	GeeHashMap* _tmp1_;
 	GString* builder = NULL;
-	GString* _tmp5_ = NULL;
+	GString* _tmp5_;
 	const gchar* _tmp51_ = NULL;
-	GString* _tmp52_ = NULL;
-	const gchar* _tmp53_ = NULL;
-	gint _tmp54_ = 0;
-	gint _tmp55_ = 0;
-	gchar* _tmp58_ = NULL;
+	GString* _tmp52_;
+	const gchar* _tmp53_;
+	gint _tmp54_;
+	gint _tmp55_;
+	gchar* _tmp58_;
 #line 253 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (self), NULL);
 #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1580,11 +1599,11 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 	if (_tmp1_ == NULL) {
 #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = TRUE;
-#line 1584 "DataSource.c"
+#line 1603 "DataSource.c"
 	} else {
-		GeeHashMap* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		GeeHashMap* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp2_ = self->priv->backlinks;
 #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1593,7 +1612,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 		_tmp4_ = _tmp3_;
 #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = _tmp4_ == 0;
-#line 1597 "DataSource.c"
+#line 1616 "DataSource.c"
 	}
 #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp0_) {
@@ -1601,21 +1620,21 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 		result = NULL;
 #line 255 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return result;
-#line 1605 "DataSource.c"
+#line 1624 "DataSource.c"
 	}
 #line 257 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp5_ = g_string_new ("");
 #line 257 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	builder = _tmp5_;
-#line 1611 "DataSource.c"
+#line 1630 "DataSource.c"
 	{
 		GeeIterator* _name_it = NULL;
-		GeeHashMap* _tmp6_ = NULL;
-		GeeSet* _tmp7_ = NULL;
-		GeeSet* _tmp8_ = NULL;
-		GeeSet* _tmp9_ = NULL;
-		GeeIterator* _tmp10_ = NULL;
-		GeeIterator* _tmp11_ = NULL;
+		GeeHashMap* _tmp6_;
+		GeeSet* _tmp7_;
+		GeeSet* _tmp8_;
+		GeeSet* _tmp9_;
+		GeeIterator* _tmp10_;
+		GeeIterator* _tmp11_;
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp6_ = self->priv->backlinks;
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1634,23 +1653,23 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 		_name_it = _tmp11_;
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		while (TRUE) {
-#line 1638 "DataSource.c"
-			GeeIterator* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
+#line 1657 "DataSource.c"
+			GeeIterator* _tmp12_;
+			gboolean _tmp13_;
 			gchar* name = NULL;
-			GeeIterator* _tmp14_ = NULL;
-			gpointer _tmp15_ = NULL;
+			GeeIterator* _tmp14_;
+			gpointer _tmp15_;
 			GeeList* values = NULL;
-			GeeHashMap* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			gpointer _tmp18_ = NULL;
+			GeeHashMap* _tmp16_;
+			const gchar* _tmp17_;
+			gpointer _tmp18_;
 			gboolean _tmp19_ = FALSE;
-			GeeList* _tmp20_ = NULL;
+			GeeList* _tmp20_;
 			gchar* value_field = NULL;
-			gchar* _tmp24_ = NULL;
-			const gchar* _tmp43_ = NULL;
-			gint _tmp44_ = 0;
-			gint _tmp45_ = 0;
+			gchar* _tmp24_;
+			const gchar* _tmp43_;
+			gint _tmp44_;
+			gint _tmp45_;
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp12_ = _name_it;
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1659,7 +1678,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 			if (!_tmp13_) {
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				break;
-#line 1663 "DataSource.c"
+#line 1682 "DataSource.c"
 			}
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp14_ = _name_it;
@@ -1681,11 +1700,11 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 			if (_tmp20_ == NULL) {
 #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp19_ = TRUE;
-#line 1685 "DataSource.c"
+#line 1704 "DataSource.c"
 			} else {
-				GeeList* _tmp21_ = NULL;
-				gint _tmp22_ = 0;
-				gint _tmp23_ = 0;
+				GeeList* _tmp21_;
+				gint _tmp22_;
+				gint _tmp23_;
 #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp21_ = values;
 #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1694,7 +1713,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 				_tmp23_ = _tmp22_;
 #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp19_ = _tmp23_ == 0;
-#line 1698 "DataSource.c"
+#line 1717 "DataSource.c"
 			}
 #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			if (_tmp19_) {
@@ -1704,21 +1723,21 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 				_g_free0 (name);
 #line 261 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				continue;
-#line 1708 "DataSource.c"
+#line 1727 "DataSource.c"
 			}
 #line 263 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp24_ = g_strdup ("");
 #line 263 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			value_field = _tmp24_;
-#line 1714 "DataSource.c"
+#line 1733 "DataSource.c"
 			{
 				GeeList* _value_list = NULL;
-				GeeList* _tmp25_ = NULL;
-				GeeList* _tmp26_ = NULL;
+				GeeList* _tmp25_;
+				GeeList* _tmp26_;
 				gint _value_size = 0;
-				GeeList* _tmp27_ = NULL;
-				gint _tmp28_ = 0;
-				gint _tmp29_ = 0;
+				GeeList* _tmp27_;
+				gint _tmp28_;
+				gint _tmp29_;
 				gint _value_index = 0;
 #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp25_ = values;
@@ -1738,16 +1757,16 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 				_value_index = -1;
 #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				while (TRUE) {
-#line 1742 "DataSource.c"
-					gint _tmp30_ = 0;
-					gint _tmp31_ = 0;
-					gint _tmp32_ = 0;
+#line 1761 "DataSource.c"
+					gint _tmp30_;
+					gint _tmp31_;
+					gint _tmp32_;
 					gchar* value = NULL;
-					GeeList* _tmp33_ = NULL;
-					gint _tmp34_ = 0;
-					gpointer _tmp35_ = NULL;
-					const gchar* _tmp36_ = NULL;
-					gboolean _tmp37_ = FALSE;
+					GeeList* _tmp33_;
+					gint _tmp34_;
+					gpointer _tmp35_;
+					const gchar* _tmp36_;
+					gboolean _tmp37_;
 #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_tmp30_ = _value_index;
 #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1760,7 +1779,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 					if (!(_tmp31_ < _tmp32_)) {
 #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 						break;
-#line 1764 "DataSource.c"
+#line 1783 "DataSource.c"
 					}
 #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_tmp33_ = _value_list;
@@ -1776,12 +1795,12 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 					_tmp37_ = is_string_empty (_tmp36_);
 #line 265 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					if (!_tmp37_) {
-#line 1780 "DataSource.c"
-						const gchar* _tmp38_ = NULL;
-						const gchar* _tmp39_ = NULL;
-						gchar* _tmp40_ = NULL;
-						gchar* _tmp41_ = NULL;
-						gchar* _tmp42_ = NULL;
+#line 1799 "DataSource.c"
+						const gchar* _tmp38_;
+						const gchar* _tmp39_;
+						gchar* _tmp40_;
+						gchar* _tmp41_;
+						gchar* _tmp42_;
 #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 						_tmp38_ = value_field;
 #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1798,15 +1817,15 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 						value_field = _tmp42_;
 #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 						_g_free0 (_tmp41_);
-#line 1802 "DataSource.c"
+#line 1821 "DataSource.c"
 					}
 #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_g_free0 (value);
-#line 1806 "DataSource.c"
+#line 1825 "DataSource.c"
 				}
 #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_g_object_unref0 (_value_list);
-#line 1810 "DataSource.c"
+#line 1829 "DataSource.c"
 			}
 #line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp43_ = value_field;
@@ -1816,12 +1835,12 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 			_tmp45_ = _tmp44_;
 #line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			if (_tmp45_ > 0) {
-#line 1820 "DataSource.c"
-				GString* _tmp46_ = NULL;
-				const gchar* _tmp47_ = NULL;
-				const gchar* _tmp48_ = NULL;
-				gchar* _tmp49_ = NULL;
-				gchar* _tmp50_ = NULL;
+#line 1839 "DataSource.c"
+				GString* _tmp46_;
+				const gchar* _tmp47_;
+				const gchar* _tmp48_;
+				gchar* _tmp49_;
+				gchar* _tmp50_;
 #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp46_ = builder;
 #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1836,7 +1855,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 				g_string_append (_tmp46_, _tmp50_);
 #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_g_free0 (_tmp50_);
-#line 1840 "DataSource.c"
+#line 1859 "DataSource.c"
 			}
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_g_free0 (value_field);
@@ -1844,11 +1863,11 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 			_g_object_unref0 (values);
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_g_free0 (name);
-#line 1848 "DataSource.c"
+#line 1867 "DataSource.c"
 		}
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_g_object_unref0 (_name_it);
-#line 1852 "DataSource.c"
+#line 1871 "DataSource.c"
 	}
 #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp52_ = builder;
@@ -1860,20 +1879,20 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 	_tmp55_ = _tmp54_;
 #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp55_ > 0) {
-#line 1864 "DataSource.c"
-		GString* _tmp56_ = NULL;
-		const gchar* _tmp57_ = NULL;
+#line 1883 "DataSource.c"
+		GString* _tmp56_;
+		const gchar* _tmp57_;
 #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp56_ = builder;
 #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp57_ = _tmp56_->str;
 #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp51_ = _tmp57_;
-#line 1873 "DataSource.c"
+#line 1892 "DataSource.c"
 	} else {
 #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp51_ = NULL;
-#line 1877 "DataSource.c"
+#line 1896 "DataSource.c"
 	}
 #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp58_ = g_strdup (_tmp51_);
@@ -1883,22 +1902,22 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 	_g_string_free0 (builder);
 #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 1887 "DataSource.c"
+#line 1906 "DataSource.c"
 }
 
 
 void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlinked_from, const gchar* dehydrated) {
-	SourceCollection* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	SourceCollection* _tmp0_;
+	GeeHashMap* _tmp1_;
+	const gchar* _tmp2_;
 	gchar** lines = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gchar** _tmp5_ = NULL;
-	gint lines_length1 = 0;
-	gint _lines_size_ = 0;
-	gchar** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
+	const gchar* _tmp3_;
+	gchar** _tmp4_;
+	gchar** _tmp5_;
+	gint lines_length1;
+	gint _lines_size_;
+	gchar** _tmp6_;
+	gint _tmp6__length1;
 #line 278 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (IS_DATA_SOURCE (self));
 #line 278 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1919,7 +1938,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
 	if (_tmp2_ == NULL) {
 #line 283 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return;
-#line 1923 "DataSource.c"
+#line 1942 "DataSource.c"
 	}
 #line 285 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp3_ = dehydrated;
@@ -1935,7 +1954,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
 	_tmp6_ = lines;
 #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp6__length1 = lines_length1;
-#line 1939 "DataSource.c"
+#line 1958 "DataSource.c"
 	{
 		gchar** line_collection = NULL;
 		gint line_collection_length1 = 0;
@@ -1947,41 +1966,41 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
 		line_collection_length1 = _tmp6__length1;
 #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		for (line_it = 0; line_it < _tmp6__length1; line_it = line_it + 1) {
-#line 1951 "DataSource.c"
-			gchar* _tmp7_ = NULL;
+#line 1970 "DataSource.c"
+			gchar* _tmp7_;
 			gchar* line = NULL;
 #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp7_ = g_strdup (line_collection[line_it]);
 #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			line = _tmp7_;
-#line 1958 "DataSource.c"
+#line 1977 "DataSource.c"
 			{
-				const gchar* _tmp8_ = NULL;
-				gint _tmp9_ = 0;
-				gint _tmp10_ = 0;
+				const gchar* _tmp8_;
+				gint _tmp9_;
+				gint _tmp10_;
 				gchar** tokens = NULL;
-				const gchar* _tmp11_ = NULL;
-				gchar** _tmp12_ = NULL;
-				gchar** _tmp13_ = NULL;
-				gint tokens_length1 = 0;
-				gint _tokens_size_ = 0;
-				gchar** _tmp14_ = NULL;
-				gint _tmp14__length1 = 0;
+				const gchar* _tmp11_;
+				gchar** _tmp12_;
+				gchar** _tmp13_;
+				gint tokens_length1;
+				gint _tokens_size_;
+				gchar** _tmp14_;
+				gint _tmp14__length1;
 				gchar** decoded_values = NULL;
-				gchar** _tmp18_ = NULL;
-				gint _tmp18__length1 = 0;
-				const gchar* _tmp19_ = NULL;
-				gchar** _tmp20_ = NULL;
-				gchar** _tmp21_ = NULL;
-				gint decoded_values_length1 = 0;
-				gint _decoded_values_size_ = 0;
+				gchar** _tmp18_;
+				gint _tmp18__length1;
+				const gchar* _tmp19_;
+				gchar** _tmp20_;
+				gchar** _tmp21_;
+				gint decoded_values_length1;
+				gint _decoded_values_size_;
 				GeeList* values = NULL;
-				GeeArrayList* _tmp22_ = NULL;
-				gchar** _tmp23_ = NULL;
-				gint _tmp23__length1 = 0;
-				GeeList* _tmp32_ = NULL;
-				gint _tmp33_ = 0;
-				gint _tmp34_ = 0;
+				GeeArrayList* _tmp22_;
+				gchar** _tmp23_;
+				gint _tmp23__length1;
+				GeeList* _tmp32_;
+				gint _tmp33_;
+				gint _tmp34_;
 #line 287 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp8_ = line;
 #line 287 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1994,7 +2013,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
 					_g_free0 (line);
 #line 288 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					continue;
-#line 1998 "DataSource.c"
+#line 2017 "DataSource.c"
 				}
 #line 290 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp11_ = line;
@@ -2012,10 +2031,10 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
 				_tmp14__length1 = tokens_length1;
 #line 291 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				if (_tmp14__length1 < 2) {
-#line 2016 "DataSource.c"
-					const gchar* _tmp15_ = NULL;
-					gchar* _tmp16_ = NULL;
-					gchar* _tmp17_ = NULL;
+#line 2035 "DataSource.c"
+					const gchar* _tmp15_;
+					gchar* _tmp16_;
+					gchar* _tmp17_;
 #line 292 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_tmp15_ = line;
 #line 292 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2033,7 +2052,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
 					_g_free0 (line);
 #line 295 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					continue;
-#line 2036 "DataSource.c"
+#line 2055 "DataSource.c"
 				}
 #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp18_ = tokens;
@@ -2057,7 +2076,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
 				_tmp23_ = decoded_values;
 #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp23__length1 = decoded_values_length1;
-#line 2060 "DataSource.c"
+#line 2079 "DataSource.c"
 				{
 					gchar** value_collection = NULL;
 					gint value_collection_length1 = 0;
@@ -2069,25 +2088,25 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
 					value_collection_length1 = _tmp23__length1;
 #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					for (value_it = 0; value_it < _tmp23__length1; value_it = value_it + 1) {
-#line 2072 "DataSource.c"
-						gchar* _tmp24_ = NULL;
+#line 2091 "DataSource.c"
+						gchar* _tmp24_;
 						gchar* value = NULL;
 #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 						_tmp24_ = g_strdup (value_collection[value_it]);
 #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 						value = _tmp24_;
-#line 2079 "DataSource.c"
+#line 2098 "DataSource.c"
 						{
 							gboolean _tmp25_ = FALSE;
-							const gchar* _tmp26_ = NULL;
+							const gchar* _tmp26_;
 #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 							_tmp26_ = value;
 #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 							if (_tmp26_ != NULL) {
-#line 2087 "DataSource.c"
-								const gchar* _tmp27_ = NULL;
-								gint _tmp28_ = 0;
-								gint _tmp29_ = 0;
+#line 2106 "DataSource.c"
+								const gchar* _tmp27_;
+								gint _tmp28_;
+								gint _tmp29_;
 #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 								_tmp27_ = value;
 #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2096,28 +2115,28 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
 								_tmp29_ = _tmp28_;
 #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 								_tmp25_ = _tmp29_ > 0;
-#line 2099 "DataSource.c"
+#line 2118 "DataSource.c"
 							} else {
 #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 								_tmp25_ = FALSE;
-#line 2103 "DataSource.c"
+#line 2122 "DataSource.c"
 							}
 #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 							if (_tmp25_) {
-#line 2107 "DataSource.c"
-								GeeList* _tmp30_ = NULL;
-								const gchar* _tmp31_ = NULL;
+#line 2126 "DataSource.c"
+								GeeList* _tmp30_;
+								const gchar* _tmp31_;
 #line 302 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 								_tmp30_ = values;
 #line 302 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 								_tmp31_ = value;
 #line 302 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 								gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), _tmp31_);
-#line 2116 "DataSource.c"
+#line 2135 "DataSource.c"
 							}
 #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 							_g_free0 (value);
-#line 2120 "DataSource.c"
+#line 2139 "DataSource.c"
 						}
 					}
 				}
@@ -2129,12 +2148,12 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
 				_tmp34_ = _tmp33_;
 #line 305 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				if (_tmp34_ > 0) {
-#line 2132 "DataSource.c"
-					GeeHashMap* _tmp35_ = NULL;
-					gchar** _tmp36_ = NULL;
-					gint _tmp36__length1 = 0;
-					const gchar* _tmp37_ = NULL;
-					GeeList* _tmp38_ = NULL;
+#line 2151 "DataSource.c"
+					GeeHashMap* _tmp35_;
+					gchar** _tmp36_;
+					gint _tmp36__length1;
+					const gchar* _tmp37_;
+					GeeList* _tmp38_;
 #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_tmp35_ = self->priv->backlinks;
 #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2147,7 +2166,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
 					_tmp38_ = values;
 #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp37_, _tmp38_);
-#line 2150 "DataSource.c"
+#line 2169 "DataSource.c"
 				}
 #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_g_object_unref0 (values);
@@ -2157,13 +2176,13 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
 				tokens = (_vala_array_free (tokens, tokens_length1, (GDestroyNotify) g_free), NULL);
 #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_g_free0 (line);
-#line 2160 "DataSource.c"
+#line 2179 "DataSource.c"
 			}
 		}
 	}
 #line 278 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	lines = (_vala_array_free (lines, lines_length1, (GDestroyNotify) g_free), NULL);
-#line 2166 "DataSource.c"
+#line 2185 "DataSource.c"
 }
 
 
@@ -2173,7 +2192,7 @@ static SourceSnapshot* data_source_real_save_snapshot (DataSource* self) {
 	result = NULL;
 #line 312 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 2176 "DataSource.c"
+#line 2195 "DataSource.c"
 }
 
 
@@ -2182,7 +2201,7 @@ SourceSnapshot* data_source_save_snapshot (DataSource* self) {
 	g_return_val_if_fail (IS_DATA_SOURCE (self), NULL);
 #line 311 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return DATA_SOURCE_GET_CLASS (self)->save_snapshot (self);
-#line 2185 "DataSource.c"
+#line 2204 "DataSource.c"
 }
 
 
@@ -2191,7 +2210,7 @@ void data_source_internal_mark_for_destroy (DataSource* self) {
 	g_return_if_fail (IS_DATA_SOURCE (self));
 #line 317 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv->marked_for_destroy = TRUE;
-#line 2194 "DataSource.c"
+#line 2213 "DataSource.c"
 }
 
 
@@ -2201,7 +2220,7 @@ static gboolean data_source_real_internal_delete_backing (DataSource* self, GErr
 	result = TRUE;
 #line 325 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 2204 "DataSource.c"
+#line 2223 "DataSource.c"
 }
 
 
@@ -2210,13 +2229,13 @@ gboolean data_source_internal_delete_backing (DataSource* self, GError** error)
 	g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE);
 #line 324 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return DATA_SOURCE_GET_CLASS (self)->internal_delete_backing (self, error);
-#line 2213 "DataSource.c"
+#line 2232 "DataSource.c"
 }
 
 
 static gboolean data_source_real_equals (DataSource* self, DataSource* source) {
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 330 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail ((source == NULL) || IS_DATA_SOURCE (source), FALSE);
 #line 331 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2225,7 +2244,7 @@ static gboolean data_source_real_equals (DataSource* self, DataSource* source) {
 	result = self == _tmp0_;
 #line 331 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 2228 "DataSource.c"
+#line 2247 "DataSource.c"
 }
 
 
@@ -2234,47 +2253,47 @@ gboolean data_source_equals (DataSource* self, DataSource* source) {
 	g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE);
 #line 330 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return DATA_SOURCE_GET_CLASS (self)->equals (self, source);
-#line 2237 "DataSource.c"
+#line 2256 "DataSource.c"
 }
 
 
 static void data_source_real_destroy (DataSource* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 341 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp0_ = self->priv->marked_for_destroy;
 #line 341 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_vala_assert (_tmp0_, "marked_for_destroy");
 #line 344 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv->is_destroyed = TRUE;
-#line 2249 "DataSource.c"
+#line 2268 "DataSource.c"
 	{
 		gint ctr = 0;
 #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		ctr = 0;
-#line 2254 "DataSource.c"
+#line 2273 "DataSource.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp1_ = TRUE;
 #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			while (TRUE) {
-#line 2261 "DataSource.c"
-				gint _tmp3_ = 0;
-				DataView** _tmp4_ = NULL;
-				gint _tmp4__length1 = 0;
-				DataView** _tmp5_ = NULL;
-				gint _tmp5__length1 = 0;
-				gint _tmp6_ = 0;
-				DataView* _tmp7_ = NULL;
+#line 2280 "DataSource.c"
+				gint _tmp3_;
+				DataView** _tmp4_;
+				gint _tmp4__length1;
+				DataView** _tmp5_;
+				gint _tmp5__length1;
+				gint _tmp6_;
+				DataView* _tmp7_;
 #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				if (!_tmp1_) {
-#line 2271 "DataSource.c"
-					gint _tmp2_ = 0;
+#line 2290 "DataSource.c"
+					gint _tmp2_;
 #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_tmp2_ = ctr;
 #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					ctr = _tmp2_ + 1;
-#line 2277 "DataSource.c"
+#line 2296 "DataSource.c"
 				}
 #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp1_ = FALSE;
@@ -2288,7 +2307,7 @@ static void data_source_real_destroy (DataSource* self) {
 				if (!(_tmp3_ < _tmp4__length1)) {
 #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					break;
-#line 2291 "DataSource.c"
+#line 2310 "DataSource.c"
 				}
 #line 348 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp5_ = self->priv->subscribers;
@@ -2300,18 +2319,18 @@ static void data_source_real_destroy (DataSource* self) {
 				_tmp7_ = _tmp5_[_tmp6_];
 #line 348 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				if (_tmp7_ != NULL) {
-#line 2303 "DataSource.c"
+#line 2322 "DataSource.c"
 					DataView* view = NULL;
-					DataView** _tmp8_ = NULL;
-					gint _tmp8__length1 = 0;
-					gint _tmp9_ = 0;
-					DataView* _tmp10_ = NULL;
-					DataView* _tmp11_ = NULL;
-					DataView** _tmp12_ = NULL;
-					gint _tmp12__length1 = 0;
-					gint _tmp13_ = 0;
-					DataView* _tmp14_ = NULL;
-					DataView* _tmp15_ = NULL;
+					DataView** _tmp8_;
+					gint _tmp8__length1;
+					gint _tmp9_;
+					DataView* _tmp10_;
+					DataView* _tmp11_;
+					DataView** _tmp12_;
+					gint _tmp12__length1;
+					gint _tmp13_;
+					DataView* _tmp14_;
+					DataView* _tmp15_;
 #line 349 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_tmp8_ = self->priv->subscribers;
 #line 349 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2342,14 +2361,14 @@ static void data_source_real_destroy (DataSource* self) {
 					data_view_notify_unsubscribed (_tmp15_, self);
 #line 348 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_g_object_unref0 (view);
-#line 2345 "DataSource.c"
+#line 2364 "DataSource.c"
 				}
 			}
 		}
 	}
 #line 357 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	g_signal_emit_by_name (self, "destroyed");
-#line 2352 "DataSource.c"
+	g_signal_emit (self, data_source_signals[DATA_SOURCE_DESTROYED_SIGNAL], 0);
+#line 2371 "DataSource.c"
 }
 
 
@@ -2358,15 +2377,15 @@ void data_source_destroy (DataSource* self) {
 	g_return_if_fail (IS_DATA_SOURCE (self));
 #line 340 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	DATA_SOURCE_GET_CLASS (self)->destroy (self);
-#line 2361 "DataSource.c"
+#line 2380 "DataSource.c"
 }
 
 
 gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) {
 	gboolean result = FALSE;
 	gboolean ret = FALSE;
-	gboolean _tmp0_ = FALSE;
-	SourceCollection* _tmp11_ = NULL;
+	gboolean _tmp0_;
+	SourceCollection* _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 366 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE);
@@ -2376,18 +2395,18 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 	_tmp0_ = delete_backing;
 #line 368 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp0_) {
-#line 2379 "DataSource.c"
+#line 2398 "DataSource.c"
 		{
 			gboolean _tmp1_ = FALSE;
-			gboolean _tmp2_ = FALSE;
-			gboolean _tmp3_ = FALSE;
+			gboolean _tmp2_;
+			gboolean _tmp3_;
 #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp2_ = data_source_internal_delete_backing (self, &_inner_error_);
 #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp1_ = _tmp2_;
 #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2390 "DataSource.c"
+#line 2409 "DataSource.c"
 				goto __catch50_g_error;
 			}
 #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2396,9 +2415,9 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 			_tmp3_ = ret;
 #line 371 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			if (!_tmp3_) {
-#line 2399 "DataSource.c"
-				gchar* _tmp4_ = NULL;
-				gchar* _tmp5_ = NULL;
+#line 2418 "DataSource.c"
+				gchar* _tmp4_;
+				gchar* _tmp5_;
 #line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
 #line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2407,17 +2426,17 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 				g_warning ("DataSource.vala:372: Unable to delete backing for %s", _tmp5_);
 #line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_g_free0 (_tmp5_);
-#line 2410 "DataSource.c"
+#line 2429 "DataSource.c"
 			}
 		}
 		goto __finally50;
 		__catch50_g_error:
 		{
 			GError* err = NULL;
-			gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
-			GError* _tmp8_ = NULL;
-			const gchar* _tmp9_ = NULL;
+			gchar* _tmp6_;
+			gchar* _tmp7_;
+			GError* _tmp8_;
+			const gchar* _tmp9_;
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			err = _inner_error_;
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2438,12 +2457,12 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 			ret = FALSE;
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_g_error_free0 (err);
-#line 2441 "DataSource.c"
+#line 2460 "DataSource.c"
 		}
 		__finally50:
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2446 "DataSource.c"
+#line 2465 "DataSource.c"
 			gboolean _tmp10_ = FALSE;
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2451,7 +2470,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 			g_clear_error (&_inner_error_);
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			return _tmp10_;
-#line 2454 "DataSource.c"
+#line 2473 "DataSource.c"
 		}
 	}
 #line 380 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2462,45 +2481,45 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 	_tmp11_ = self->priv->unlinked_from_collection;
 #line 383 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp11_ != NULL) {
-#line 2465 "DataSource.c"
-		SourceCollection* _tmp12_ = NULL;
+#line 2484 "DataSource.c"
+		SourceCollection* _tmp12_;
 #line 384 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp12_ = self->priv->unlinked_from_collection;
 #line 384 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_collection_notify_unlinked_destroyed (_tmp12_, self);
-#line 2471 "DataSource.c"
+#line 2490 "DataSource.c"
 	}
 #line 386 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	result = ret;
 #line 386 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 2477 "DataSource.c"
+#line 2496 "DataSource.c"
 }
 
 
-static void _vala_array_add63 (DataView*** array, int* length, int* size, DataView* value) {
+static void _vala_array_add63 (DataView** * array, int* length, int* size, DataView* value) {
 #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if ((*length) == (*size)) {
 #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		*array = g_renew (DataView*, *array, (*size) + 1);
-#line 2488 "DataSource.c"
+#line 2507 "DataSource.c"
 	}
 #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	(*array)[(*length)++] = value;
 #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	(*array)[*length] = NULL;
-#line 2494 "DataSource.c"
+#line 2513 "DataSource.c"
 }
 
 
 void data_source_internal_subscribe (DataSource* self, DataView* view) {
-	gboolean _tmp0_ = FALSE;
-	DataView** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
-	DataView* _tmp14_ = NULL;
-	DataView* _tmp15_ = NULL;
+	gboolean _tmp0_;
+	DataView** _tmp13_;
+	gint _tmp13__length1;
+	DataView* _tmp14_;
+	DataView* _tmp15_;
 #line 395 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (IS_DATA_SOURCE (self));
 #line 395 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2509,35 +2528,35 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) {
 	_tmp0_ = self->priv->in_contact;
 #line 396 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_vala_assert (!_tmp0_, "!in_contact");
-#line 2512 "DataSource.c"
+#line 2531 "DataSource.c"
 	{
 		gint ctr = 0;
 #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		ctr = 0;
-#line 2517 "DataSource.c"
+#line 2536 "DataSource.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp1_ = TRUE;
 #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			while (TRUE) {
-#line 2524 "DataSource.c"
-				gint _tmp3_ = 0;
-				DataView** _tmp4_ = NULL;
-				gint _tmp4__length1 = 0;
-				DataView** _tmp5_ = NULL;
-				gint _tmp5__length1 = 0;
-				gint _tmp6_ = 0;
-				DataView* _tmp7_ = NULL;
+#line 2543 "DataSource.c"
+				gint _tmp3_;
+				DataView** _tmp4_;
+				gint _tmp4__length1;
+				DataView** _tmp5_;
+				gint _tmp5__length1;
+				gint _tmp6_;
+				DataView* _tmp7_;
 #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				if (!_tmp1_) {
-#line 2534 "DataSource.c"
-					gint _tmp2_ = 0;
+#line 2553 "DataSource.c"
+					gint _tmp2_;
 #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_tmp2_ = ctr;
 #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					ctr = _tmp2_ + 1;
-#line 2540 "DataSource.c"
+#line 2559 "DataSource.c"
 				}
 #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp1_ = FALSE;
@@ -2551,7 +2570,7 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) {
 				if (!(_tmp3_ < _tmp4__length1)) {
 #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					break;
-#line 2554 "DataSource.c"
+#line 2573 "DataSource.c"
 				}
 #line 399 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp5_ = self->priv->subscribers;
@@ -2563,13 +2582,13 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) {
 				_tmp7_ = _tmp5_[_tmp6_];
 #line 399 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				if (_tmp7_ == NULL) {
-#line 2566 "DataSource.c"
-					DataView** _tmp8_ = NULL;
-					gint _tmp8__length1 = 0;
-					gint _tmp9_ = 0;
-					DataView* _tmp10_ = NULL;
-					DataView* _tmp11_ = NULL;
-					DataView* _tmp12_ = NULL;
+#line 2585 "DataSource.c"
+					DataView** _tmp8_;
+					gint _tmp8__length1;
+					gint _tmp9_;
+					DataView* _tmp10_;
+					DataView* _tmp11_;
+					DataView* _tmp12_;
 #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_tmp8_ = self->priv->subscribers;
 #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2588,7 +2607,7 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) {
 					_tmp12_ = _tmp8_[_tmp9_];
 #line 402 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					return;
-#line 2591 "DataSource.c"
+#line 2610 "DataSource.c"
 				}
 			}
 		}
@@ -2603,12 +2622,12 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) {
 	_tmp15_ = _g_object_ref0 (_tmp14_);
 #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_vala_array_add63 (&self->priv->subscribers, &self->priv->subscribers_length1, &self->priv->_subscribers_size_, _tmp15_);
-#line 2606 "DataSource.c"
+#line 2625 "DataSource.c"
 }
 
 
 void data_source_internal_unsubscribe (DataSource* self, DataView* view) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 411 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (IS_DATA_SOURCE (self));
 #line 411 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2617,36 +2636,36 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) {
 	_tmp0_ = self->priv->in_contact;
 #line 412 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_vala_assert (!_tmp0_, "!in_contact");
-#line 2620 "DataSource.c"
+#line 2639 "DataSource.c"
 	{
 		gint ctr = 0;
 #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		ctr = 0;
-#line 2625 "DataSource.c"
+#line 2644 "DataSource.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp1_ = TRUE;
 #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			while (TRUE) {
-#line 2632 "DataSource.c"
-				gint _tmp3_ = 0;
-				DataView** _tmp4_ = NULL;
-				gint _tmp4__length1 = 0;
-				DataView** _tmp5_ = NULL;
-				gint _tmp5__length1 = 0;
-				gint _tmp6_ = 0;
-				DataView* _tmp7_ = NULL;
-				DataView* _tmp8_ = NULL;
+#line 2651 "DataSource.c"
+				gint _tmp3_;
+				DataView** _tmp4_;
+				gint _tmp4__length1;
+				DataView** _tmp5_;
+				gint _tmp5__length1;
+				gint _tmp6_;
+				DataView* _tmp7_;
+				DataView* _tmp8_;
 #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				if (!_tmp1_) {
-#line 2643 "DataSource.c"
-					gint _tmp2_ = 0;
+#line 2662 "DataSource.c"
+					gint _tmp2_;
 #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_tmp2_ = ctr;
 #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					ctr = _tmp2_ + 1;
-#line 2649 "DataSource.c"
+#line 2668 "DataSource.c"
 				}
 #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp1_ = FALSE;
@@ -2660,7 +2679,7 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) {
 				if (!(_tmp3_ < _tmp4__length1)) {
 #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					break;
-#line 2663 "DataSource.c"
+#line 2682 "DataSource.c"
 				}
 #line 415 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp5_ = self->priv->subscribers;
@@ -2674,11 +2693,11 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) {
 				_tmp8_ = view;
 #line 415 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				if (_tmp7_ == _tmp8_) {
-#line 2677 "DataSource.c"
-					DataView** _tmp9_ = NULL;
-					gint _tmp9__length1 = 0;
-					gint _tmp10_ = 0;
-					DataView* _tmp11_ = NULL;
+#line 2696 "DataSource.c"
+					DataView** _tmp9_;
+					gint _tmp9__length1;
+					gint _tmp10_;
+					DataView* _tmp11_;
 #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_tmp9_ = self->priv->subscribers;
 #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2693,7 +2712,7 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) {
 					_tmp11_ = _tmp9_[_tmp10_];
 #line 418 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					return;
-#line 2696 "DataSource.c"
+#line 2715 "DataSource.c"
 				}
 			}
 		}
@@ -2702,7 +2721,7 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) {
 
 
 void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscriber contact_subscriber, void* contact_subscriber_target) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 423 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (IS_DATA_SOURCE (self));
 #line 424 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2711,35 +2730,35 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri
 	_vala_assert (!_tmp0_, "!in_contact");
 #line 426 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv->in_contact = TRUE;
-#line 2714 "DataSource.c"
+#line 2733 "DataSource.c"
 	{
 		gint ctr = 0;
 #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		ctr = 0;
-#line 2719 "DataSource.c"
+#line 2738 "DataSource.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp1_ = TRUE;
 #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			while (TRUE) {
-#line 2726 "DataSource.c"
-				gint _tmp3_ = 0;
-				DataView** _tmp4_ = NULL;
-				gint _tmp4__length1 = 0;
-				DataView** _tmp5_ = NULL;
-				gint _tmp5__length1 = 0;
-				gint _tmp6_ = 0;
-				DataView* _tmp7_ = NULL;
+#line 2745 "DataSource.c"
+				gint _tmp3_;
+				DataView** _tmp4_;
+				gint _tmp4__length1;
+				DataView** _tmp5_;
+				gint _tmp5__length1;
+				gint _tmp6_;
+				DataView* _tmp7_;
 #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				if (!_tmp1_) {
-#line 2736 "DataSource.c"
-					gint _tmp2_ = 0;
+#line 2755 "DataSource.c"
+					gint _tmp2_;
 #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_tmp2_ = ctr;
 #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					ctr = _tmp2_ + 1;
-#line 2742 "DataSource.c"
+#line 2761 "DataSource.c"
 				}
 #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp1_ = FALSE;
@@ -2753,7 +2772,7 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri
 				if (!(_tmp3_ < _tmp4__length1)) {
 #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					break;
-#line 2756 "DataSource.c"
+#line 2775 "DataSource.c"
 				}
 #line 428 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp5_ = self->priv->subscribers;
@@ -2765,13 +2784,13 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri
 				_tmp7_ = _tmp5_[_tmp6_];
 #line 428 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				if (_tmp7_ != NULL) {
-#line 2768 "DataSource.c"
-					DataSourceContactSubscriber _tmp8_ = NULL;
-					void* _tmp8__target = NULL;
-					DataView** _tmp9_ = NULL;
-					gint _tmp9__length1 = 0;
-					gint _tmp10_ = 0;
-					DataView* _tmp11_ = NULL;
+#line 2787 "DataSource.c"
+					DataSourceContactSubscriber _tmp8_;
+					void* _tmp8__target;
+					DataView** _tmp9_;
+					gint _tmp9__length1;
+					gint _tmp10_;
+					DataView* _tmp11_;
 #line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_tmp8_ = contact_subscriber;
 #line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2786,19 +2805,19 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri
 					_tmp11_ = _tmp9_[_tmp10_];
 #line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_tmp8_ (_tmp11_, _tmp8__target);
-#line 2789 "DataSource.c"
+#line 2808 "DataSource.c"
 				}
 			}
 		}
 	}
 #line 431 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv->in_contact = FALSE;
-#line 2796 "DataSource.c"
+#line 2815 "DataSource.c"
 }
 
 
 void data_source_contact_subscribers_alteration (DataSource* self, Alteration* alteration) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 434 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (IS_DATA_SOURCE (self));
 #line 434 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2809,35 +2828,35 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a
 	_vala_assert (!_tmp0_, "!in_contact");
 #line 437 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv->in_contact = TRUE;
-#line 2812 "DataSource.c"
+#line 2831 "DataSource.c"
 	{
 		gint ctr = 0;
 #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		ctr = 0;
-#line 2817 "DataSource.c"
+#line 2836 "DataSource.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp1_ = TRUE;
 #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			while (TRUE) {
-#line 2824 "DataSource.c"
-				gint _tmp3_ = 0;
-				DataView** _tmp4_ = NULL;
-				gint _tmp4__length1 = 0;
-				DataView** _tmp5_ = NULL;
-				gint _tmp5__length1 = 0;
-				gint _tmp6_ = 0;
-				DataView* _tmp7_ = NULL;
+#line 2843 "DataSource.c"
+				gint _tmp3_;
+				DataView** _tmp4_;
+				gint _tmp4__length1;
+				DataView** _tmp5_;
+				gint _tmp5__length1;
+				gint _tmp6_;
+				DataView* _tmp7_;
 #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				if (!_tmp1_) {
-#line 2834 "DataSource.c"
-					gint _tmp2_ = 0;
+#line 2853 "DataSource.c"
+					gint _tmp2_;
 #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_tmp2_ = ctr;
 #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					ctr = _tmp2_ + 1;
-#line 2840 "DataSource.c"
+#line 2859 "DataSource.c"
 				}
 #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp1_ = FALSE;
@@ -2851,7 +2870,7 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a
 				if (!(_tmp3_ < _tmp4__length1)) {
 #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					break;
-#line 2854 "DataSource.c"
+#line 2873 "DataSource.c"
 				}
 #line 439 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp5_ = self->priv->subscribers;
@@ -2863,12 +2882,12 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a
 				_tmp7_ = _tmp5_[_tmp6_];
 #line 439 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				if (_tmp7_ != NULL) {
-#line 2866 "DataSource.c"
-					DataView** _tmp8_ = NULL;
-					gint _tmp8__length1 = 0;
-					gint _tmp9_ = 0;
-					DataView* _tmp10_ = NULL;
-					Alteration* _tmp11_ = NULL;
+#line 2885 "DataSource.c"
+					DataView** _tmp8_;
+					gint _tmp8__length1;
+					gint _tmp9_;
+					DataView* _tmp10_;
+					Alteration* _tmp11_;
 #line 440 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_tmp8_ = self->priv->subscribers;
 #line 440 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2881,21 +2900,21 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a
 					_tmp11_ = alteration;
 #line 440 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject), _tmp11_);
-#line 2884 "DataSource.c"
+#line 2903 "DataSource.c"
 				}
 			}
 		}
 	}
 #line 442 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv->in_contact = FALSE;
-#line 2891 "DataSource.c"
+#line 2910 "DataSource.c"
 }
 
 
 static void data_source_real_unlinked (DataSource* self, SourceCollection* sources) {
 #line 51 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (IS_SOURCE_COLLECTION (sources));
-#line 2898 "DataSource.c"
+#line 2917 "DataSource.c"
 }
 
 
@@ -2914,26 +2933,26 @@ static void g_cclosure_user_marshal_VOID__DATA_COLLECTION (GClosure * closure, G
 		data1 = closure->data;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 2917 "DataSource.c"
+#line 2936 "DataSource.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		data2 = closure->data;
-#line 2923 "DataSource.c"
+#line 2942 "DataSource.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	callback = (GMarshalFunc_VOID__DATA_COLLECTION) (marshal_data ? marshal_data : cc->callback);
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	callback (data1, value_get_data_collection (param_values + 1), data2);
-#line 2929 "DataSource.c"
+#line 2948 "DataSource.c"
 }
 
 
 static void data_source_real_relinked (DataSource* self, SourceCollection* sources) {
 #line 55 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (IS_SOURCE_COLLECTION (sources));
-#line 2936 "DataSource.c"
+#line 2955 "DataSource.c"
 }
 
 
@@ -2947,35 +2966,35 @@ static void data_source_class_init (DataSourceClass * klass) {
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_type_class_add_private (klass, sizeof (DataSourcePrivate));
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((DataObjectClass *) klass)->notify_membership_changed = (void (*)(DataObject*, DataCollection*)) data_source_real_notify_membership_changed;
+	((DataObjectClass *) klass)->notify_membership_changed = (void (*) (DataObject *, DataCollection*)) data_source_real_notify_membership_changed;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((DataSourceClass *) klass)->notify_held_in_tank = (void (*)(DataSource*, SourceHoldingTank*)) data_source_real_notify_held_in_tank;
+	((DataSourceClass *) klass)->notify_held_in_tank = (void (*) (DataSource *, SourceHoldingTank*)) data_source_real_notify_held_in_tank;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) data_source_real_notify_altered;
+	((DataObjectClass *) klass)->notify_altered = (void (*) (DataObject *, Alteration*)) data_source_real_notify_altered;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((DataSourceClass *) klass)->notify_unlinking = (void (*)(DataSource*, SourceCollection*)) data_source_real_notify_unlinking;
+	((DataSourceClass *) klass)->notify_unlinking = (void (*) (DataSource *, SourceCollection*)) data_source_real_notify_unlinking;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((DataSourceClass *) klass)->notify_unlinked = (void (*)(DataSource*)) data_source_real_notify_unlinked;
+	((DataSourceClass *) klass)->notify_unlinked = (void (*) (DataSource *)) data_source_real_notify_unlinked;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((DataSourceClass *) klass)->notify_relinking = (void (*)(DataSource*, SourceCollection*)) data_source_real_notify_relinking;
+	((DataSourceClass *) klass)->notify_relinking = (void (*) (DataSource *, SourceCollection*)) data_source_real_notify_relinking;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((DataSourceClass *) klass)->notify_relinked = (void (*)(DataSource*)) data_source_real_notify_relinked;
+	((DataSourceClass *) klass)->notify_relinked = (void (*) (DataSource *)) data_source_real_notify_relinked;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) data_source_real_get_typename;
+	((DataSourceClass *) klass)->get_typename = (gchar* (*) (DataSource *)) data_source_real_get_typename;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) data_source_real_get_instance_id;
+	((DataSourceClass *) klass)->get_instance_id = (gint64 (*) (DataSource *)) data_source_real_get_instance_id;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((DataSourceClass *) klass)->get_source_id = (gchar* (*)(DataSource*)) data_source_real_get_source_id;
+	((DataSourceClass *) klass)->get_source_id = (gchar* (*) (DataSource *)) data_source_real_get_source_id;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((DataSourceClass *) klass)->commit_backlinks = (void (*)(DataSource*, SourceCollection*, const gchar*)) data_source_real_commit_backlinks;
+	((DataSourceClass *) klass)->commit_backlinks = (void (*) (DataSource *, SourceCollection*, const gchar*)) data_source_real_commit_backlinks;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((DataSourceClass *) klass)->save_snapshot = (SourceSnapshot* (*)(DataSource*)) data_source_real_save_snapshot;
+	((DataSourceClass *) klass)->save_snapshot = (SourceSnapshot* (*) (DataSource *)) data_source_real_save_snapshot;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*)(DataSource*, GError**)) data_source_real_internal_delete_backing;
+	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) data_source_real_internal_delete_backing;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((DataSourceClass *) klass)->equals = (gboolean (*)(DataSource*, DataSource*)) data_source_real_equals;
+	((DataSourceClass *) klass)->equals = (gboolean (*) (DataSource *, DataSource*)) data_source_real_equals;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((DataSourceClass *) klass)->destroy = (void (*)(DataSource*)) data_source_real_destroy;
+	((DataSourceClass *) klass)->destroy = (void (*) (DataSource *)) data_source_real_destroy;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	((DataSourceClass *) klass)->unlinked = data_source_real_unlinked;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2985,17 +3004,17 @@ static void data_source_class_init (DataSourceClass * klass) {
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_source_finalize;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	g_signal_new ("unlinked", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, unlinked), NULL, NULL, g_cclosure_user_marshal_VOID__DATA_COLLECTION, G_TYPE_NONE, 1, TYPE_SOURCE_COLLECTION);
+	data_source_signals[DATA_SOURCE_UNLINKED_SIGNAL] = g_signal_new ("unlinked", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, unlinked), NULL, NULL, g_cclosure_user_marshal_VOID__DATA_COLLECTION, G_TYPE_NONE, 1, TYPE_SOURCE_COLLECTION);
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	g_signal_new ("relinked", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, relinked), NULL, NULL, g_cclosure_user_marshal_VOID__DATA_COLLECTION, G_TYPE_NONE, 1, TYPE_SOURCE_COLLECTION);
+	data_source_signals[DATA_SOURCE_RELINKED_SIGNAL] = g_signal_new ("relinked", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, relinked), NULL, NULL, g_cclosure_user_marshal_VOID__DATA_COLLECTION, G_TYPE_NONE, 1, TYPE_SOURCE_COLLECTION);
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	g_signal_new ("destroyed", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, destroyed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 2993 "DataSource.c"
+	data_source_signals[DATA_SOURCE_DESTROYED_SIGNAL] = g_signal_new ("destroyed", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, destroyed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 3012 "DataSource.c"
 }
 
 
 static void data_source_instance_init (DataSource * self) {
-	DataView** _tmp0_ = NULL;
+	DataView** _tmp0_;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv = DATA_SOURCE_GET_PRIVATE (self);
 #line 42 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3018,11 +3037,11 @@ static void data_source_instance_init (DataSource * self) {
 	self->priv->marked_for_destroy = FALSE;
 #line 48 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv->is_destroyed = FALSE;
-#line 3021 "DataSource.c"
+#line 3040 "DataSource.c"
 }
 
 
-static void data_source_finalize (GObject* obj) {
+static void data_source_finalize (GObject * obj) {
 	DataSource * self;
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_SOURCE, DataSource);
@@ -3034,7 +3053,7 @@ static void data_source_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->backlinks);
 #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	G_OBJECT_CLASS (data_source_parent_class)->finalize (obj);
-#line 3037 "DataSource.c"
+#line 3056 "DataSource.c"
 }
 
 
@@ -3054,8 +3073,8 @@ static void source_snapshot_real_notify_broken (SourceSnapshot* self) {
 #line 455 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv->snapshot_broken = TRUE;
 #line 457 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	g_signal_emit_by_name (self, "broken");
-#line 3058 "DataSource.c"
+	g_signal_emit (self, source_snapshot_signals[SOURCE_SNAPSHOT_BROKEN_SIGNAL], 0);
+#line 3077 "DataSource.c"
 }
 
 
@@ -3064,13 +3083,13 @@ void source_snapshot_notify_broken (SourceSnapshot* self) {
 	g_return_if_fail (IS_SOURCE_SNAPSHOT (self));
 #line 454 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	SOURCE_SNAPSHOT_GET_CLASS (self)->notify_broken (self);
-#line 3067 "DataSource.c"
+#line 3086 "DataSource.c"
 }
 
 
 gboolean source_snapshot_is_broken (SourceSnapshot* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 460 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail (IS_SOURCE_SNAPSHOT (self), FALSE);
 #line 461 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3079,7 +3098,7 @@ gboolean source_snapshot_is_broken (SourceSnapshot* self) {
 	result = _tmp0_;
 #line 461 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 3082 "DataSource.c"
+#line 3101 "DataSource.c"
 }
 
 
@@ -3089,7 +3108,7 @@ SourceSnapshot* source_snapshot_construct (GType object_type) {
 	self = (SourceSnapshot*) g_type_create_instance (object_type);
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return self;
-#line 3092 "DataSource.c"
+#line 3111 "DataSource.c"
 }
 
 
@@ -3100,7 +3119,7 @@ static void source_snapshot_real_broken (SourceSnapshot* self) {
 static void value_source_snapshot_init (GValue* value) {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	value->data[0].v_pointer = NULL;
-#line 3103 "DataSource.c"
+#line 3122 "DataSource.c"
 }
 
 
@@ -3109,7 +3128,7 @@ static void value_source_snapshot_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_snapshot_unref (value->data[0].v_pointer);
-#line 3112 "DataSource.c"
+#line 3131 "DataSource.c"
 	}
 }
 
@@ -3119,11 +3138,11 @@ static void value_source_snapshot_copy_value (const GValue* src_value, GValue* d
 	if (src_value->data[0].v_pointer) {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		dest_value->data[0].v_pointer = source_snapshot_ref (src_value->data[0].v_pointer);
-#line 3122 "DataSource.c"
+#line 3141 "DataSource.c"
 	} else {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3126 "DataSource.c"
+#line 3145 "DataSource.c"
 	}
 }
 
@@ -3131,66 +3150,66 @@ static void value_source_snapshot_copy_value (const GValue* src_value, GValue* d
 static gpointer value_source_snapshot_peek_pointer (const GValue* value) {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return value->data[0].v_pointer;
-#line 3134 "DataSource.c"
+#line 3153 "DataSource.c"
 }
 
 
 static gchar* value_source_snapshot_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (collect_values[0].v_pointer) {
-#line 3141 "DataSource.c"
-		SourceSnapshot* object;
+#line 3160 "DataSource.c"
+		SourceSnapshot * object;
 		object = collect_values[0].v_pointer;
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3148 "DataSource.c"
+#line 3167 "DataSource.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3152 "DataSource.c"
+#line 3171 "DataSource.c"
 		}
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = source_snapshot_ref (object);
-#line 3156 "DataSource.c"
+#line 3175 "DataSource.c"
 	} else {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 3160 "DataSource.c"
+#line 3179 "DataSource.c"
 	}
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return NULL;
-#line 3164 "DataSource.c"
+#line 3183 "DataSource.c"
 }
 
 
 static gchar* value_source_snapshot_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SourceSnapshot** object_p;
+	SourceSnapshot ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (!object_p) {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3175 "DataSource.c"
+#line 3194 "DataSource.c"
 	}
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (!value->data[0].v_pointer) {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		*object_p = NULL;
-#line 3181 "DataSource.c"
+#line 3200 "DataSource.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3185 "DataSource.c"
+#line 3204 "DataSource.c"
 	} else {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		*object_p = source_snapshot_ref (value->data[0].v_pointer);
-#line 3189 "DataSource.c"
+#line 3208 "DataSource.c"
 	}
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return NULL;
-#line 3193 "DataSource.c"
+#line 3212 "DataSource.c"
 }
 
 
@@ -3204,7 +3223,7 @@ GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return G_PARAM_SPEC (spec);
-#line 3207 "DataSource.c"
+#line 3226 "DataSource.c"
 }
 
 
@@ -3213,12 +3232,12 @@ gpointer value_get_source_snapshot (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_SNAPSHOT), NULL);
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return value->data[0].v_pointer;
-#line 3216 "DataSource.c"
+#line 3235 "DataSource.c"
 }
 
 
 void value_set_source_snapshot (GValue* value, gpointer v_object) {
-	SourceSnapshot* old;
+	SourceSnapshot * old;
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_SNAPSHOT));
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3233,23 +3252,23 @@ void value_set_source_snapshot (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_snapshot_ref (value->data[0].v_pointer);
-#line 3236 "DataSource.c"
+#line 3255 "DataSource.c"
 	} else {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 3240 "DataSource.c"
+#line 3259 "DataSource.c"
 	}
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (old) {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_snapshot_unref (old);
-#line 3246 "DataSource.c"
+#line 3265 "DataSource.c"
 	}
 }
 
 
 void value_take_source_snapshot (GValue* value, gpointer v_object) {
-	SourceSnapshot* old;
+	SourceSnapshot * old;
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_SNAPSHOT));
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3262,17 +3281,17 @@ void value_take_source_snapshot (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = v_object;
-#line 3265 "DataSource.c"
+#line 3284 "DataSource.c"
 	} else {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 3269 "DataSource.c"
+#line 3288 "DataSource.c"
 	}
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (old) {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_snapshot_unref (old);
-#line 3275 "DataSource.c"
+#line 3294 "DataSource.c"
 	}
 }
 
@@ -3285,12 +3304,12 @@ static void source_snapshot_class_init (SourceSnapshotClass * klass) {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_type_class_add_private (klass, sizeof (SourceSnapshotPrivate));
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((SourceSnapshotClass *) klass)->notify_broken = (void (*)(SourceSnapshot*)) source_snapshot_real_notify_broken;
+	((SourceSnapshotClass *) klass)->notify_broken = (void (*) (SourceSnapshot *)) source_snapshot_real_notify_broken;
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	((SourceSnapshotClass *) klass)->broken = source_snapshot_real_broken;
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	g_signal_new ("broken", TYPE_SOURCE_SNAPSHOT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceSnapshotClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3293 "DataSource.c"
+	source_snapshot_signals[SOURCE_SNAPSHOT_BROKEN_SIGNAL] = g_signal_new ("broken", TYPE_SOURCE_SNAPSHOT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceSnapshotClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 3312 "DataSource.c"
 }
 
 
@@ -3301,17 +3320,17 @@ static void source_snapshot_instance_init (SourceSnapshot * self) {
 	self->priv->snapshot_broken = FALSE;
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->ref_count = 1;
-#line 3304 "DataSource.c"
+#line 3323 "DataSource.c"
 }
 
 
-static void source_snapshot_finalize (SourceSnapshot* obj) {
+static void source_snapshot_finalize (SourceSnapshot * obj) {
 	SourceSnapshot * self;
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_SNAPSHOT, SourceSnapshot);
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_signal_handlers_destroy (self);
-#line 3314 "DataSource.c"
+#line 3333 "DataSource.c"
 }
 
 
@@ -3330,18 +3349,18 @@ GType source_snapshot_get_type (void) {
 
 
 gpointer source_snapshot_ref (gpointer instance) {
-	SourceSnapshot* self;
+	SourceSnapshot * self;
 	self = instance;
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return instance;
-#line 3339 "DataSource.c"
+#line 3358 "DataSource.c"
 }
 
 
 void source_snapshot_unref (gpointer instance) {
-	SourceSnapshot* self;
+	SourceSnapshot * self;
 	self = instance;
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -3349,7 +3368,7 @@ void source_snapshot_unref (gpointer instance) {
 		SOURCE_SNAPSHOT_GET_CLASS (self)->finalize (self);
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3352 "DataSource.c"
+#line 3371 "DataSource.c"
 	}
 }
 
@@ -3357,35 +3376,35 @@ void source_snapshot_unref (gpointer instance) {
 static gchar* string_strip (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 3376 "DataSource.c"
+#line 3395 "DataSource.c"
 }
 
 
 SourceBacklink* source_backlink_construct (GType object_type, const gchar* name, const gchar* value) {
 	SourceBacklink* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3418,31 +3437,31 @@ SourceBacklink* source_backlink_construct (GType object_type, const gchar* name,
 	self->priv->_value = _tmp6_;
 #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return self;
-#line 3421 "DataSource.c"
+#line 3440 "DataSource.c"
 }
 
 
 SourceBacklink* source_backlink_new (const gchar* name, const gchar* value) {
 #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return source_backlink_construct (TYPE_SOURCE_BACKLINK, name, value);
-#line 3428 "DataSource.c"
+#line 3447 "DataSource.c"
 }
 
 
 SourceBacklink* source_backlink_construct_from_source (GType object_type, DataSource* source) {
 	SourceBacklink* self = NULL;
-	DataSource* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	DataSource* _tmp4_ = NULL;
-	gint64 _tmp5_ = 0LL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
+	DataSource* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	DataSource* _tmp4_;
+	gint64 _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	const gchar* _tmp9_;
+	const gchar* _tmp10_;
+	gboolean _tmp11_;
 #line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
 #line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3487,34 +3506,34 @@ SourceBacklink* source_backlink_construct_from_source (GType object_type, DataSo
 	_vala_assert (_tmp11_, "validate_name_value(_name, _value)");
 #line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return self;
-#line 3490 "DataSource.c"
+#line 3509 "DataSource.c"
 }
 
 
 SourceBacklink* source_backlink_new_from_source (DataSource* source) {
 #line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return source_backlink_construct_from_source (TYPE_SOURCE_BACKLINK, source);
-#line 3497 "DataSource.c"
+#line 3516 "DataSource.c"
 }
 
 
 static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 3517 "DataSource.c"
+#line 3536 "DataSource.c"
 }
 
 
@@ -3522,8 +3541,8 @@ static gboolean source_backlink_validate_name_value (const gchar* name, const gc
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 #line 512 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail (name != NULL, FALSE);
 #line 512 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3534,53 +3553,53 @@ static gboolean source_backlink_validate_name_value (const gchar* name, const gc
 	_tmp3_ = string_contains (_tmp2_, "=");
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (!_tmp3_) {
-#line 3537 "DataSource.c"
-		const gchar* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+#line 3556 "DataSource.c"
+		const gchar* _tmp4_;
+		gboolean _tmp5_;
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp4_ = name;
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp5_ = string_contains (_tmp4_, "|");
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp1_ = !_tmp5_;
-#line 3546 "DataSource.c"
+#line 3565 "DataSource.c"
 	} else {
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp1_ = FALSE;
-#line 3550 "DataSource.c"
+#line 3569 "DataSource.c"
 	}
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp1_) {
-#line 3554 "DataSource.c"
-		const gchar* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+#line 3573 "DataSource.c"
+		const gchar* _tmp6_;
+		gboolean _tmp7_;
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp6_ = value;
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp7_ = string_contains (_tmp6_, "|");
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = !_tmp7_;
-#line 3563 "DataSource.c"
+#line 3582 "DataSource.c"
 	} else {
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = FALSE;
-#line 3567 "DataSource.c"
+#line 3586 "DataSource.c"
 	}
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	result = _tmp0_;
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 3573 "DataSource.c"
+#line 3592 "DataSource.c"
 }
 
 
 gchar* source_backlink_to_string (SourceBacklink* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 516 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail (IS_SOURCE_BACKLINK (self), NULL);
 #line 517 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3597,20 +3616,20 @@ gchar* source_backlink_to_string (SourceBacklink* self) {
 	result = _tmp4_;
 #line 517 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 3600 "DataSource.c"
+#line 3619 "DataSource.c"
 }
 
 
 guint source_backlink_hash_func (SourceBacklink* backlink) {
 	guint result = 0U;
-	GHashFunc _tmp0_ = NULL;
-	SourceBacklink* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	GHashFunc _tmp4_ = NULL;
-	SourceBacklink* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	guint _tmp7_ = 0U;
+	GHashFunc _tmp0_;
+	SourceBacklink* _tmp1_;
+	const gchar* _tmp2_;
+	guint _tmp3_;
+	GHashFunc _tmp4_;
+	SourceBacklink* _tmp5_;
+	const gchar* _tmp6_;
+	guint _tmp7_;
 #line 520 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail ((backlink == NULL) || IS_SOURCE_BACKLINK (backlink), 0U);
 #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3633,19 +3652,19 @@ guint source_backlink_hash_func (SourceBacklink* backlink) {
 	result = _tmp3_ ^ _tmp7_;
 #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 3636 "DataSource.c"
+#line 3655 "DataSource.c"
 }
 
 
 gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blink) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	GEqualFunc _tmp1_ = NULL;
-	SourceBacklink* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	SourceBacklink* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	GEqualFunc _tmp1_;
+	SourceBacklink* _tmp2_;
+	const gchar* _tmp3_;
+	SourceBacklink* _tmp4_;
+	const gchar* _tmp5_;
+	gboolean _tmp6_;
 #line 524 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail ((alink == NULL) || IS_SOURCE_BACKLINK (alink), FALSE);
 #line 524 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3664,13 +3683,13 @@ gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blin
 	_tmp6_ = _tmp1_ (_tmp3_, _tmp5_);
 #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp6_) {
-#line 3667 "DataSource.c"
-		GEqualFunc _tmp7_ = NULL;
-		SourceBacklink* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		SourceBacklink* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
+#line 3686 "DataSource.c"
+		GEqualFunc _tmp7_;
+		SourceBacklink* _tmp8_;
+		const gchar* _tmp9_;
+		SourceBacklink* _tmp10_;
+		const gchar* _tmp11_;
+		gboolean _tmp12_;
 #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp7_ = g_str_equal;
 #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3685,23 +3704,23 @@ gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blin
 		_tmp12_ = _tmp7_ (_tmp9_, _tmp11_);
 #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = _tmp12_;
-#line 3688 "DataSource.c"
+#line 3707 "DataSource.c"
 	} else {
 #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = FALSE;
-#line 3692 "DataSource.c"
+#line 3711 "DataSource.c"
 	}
 #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	result = _tmp0_;
 #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 3698 "DataSource.c"
+#line 3717 "DataSource.c"
 }
 
 
 const gchar* source_backlink_get_name (SourceBacklink* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 473 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail (IS_SOURCE_BACKLINK (self), NULL);
 #line 474 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3710,13 +3729,13 @@ const gchar* source_backlink_get_name (SourceBacklink* self) {
 	result = _tmp0_;
 #line 474 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 3713 "DataSource.c"
+#line 3732 "DataSource.c"
 }
 
 
 const gchar* source_backlink_get_value (SourceBacklink* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 479 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail (IS_SOURCE_BACKLINK (self), NULL);
 #line 480 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3725,13 +3744,13 @@ const gchar* source_backlink_get_value (SourceBacklink* self) {
 	result = _tmp0_;
 #line 480 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 3728 "DataSource.c"
+#line 3747 "DataSource.c"
 }
 
 
 const gchar* source_backlink_get_typename (SourceBacklink* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 486 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail (IS_SOURCE_BACKLINK (self), NULL);
 #line 487 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3740,32 +3759,32 @@ const gchar* source_backlink_get_typename (SourceBacklink* self) {
 	result = _tmp0_;
 #line 487 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 3743 "DataSource.c"
+#line 3762 "DataSource.c"
 }
 
 
 static gint64 int64_parse (const gchar* str) {
 	gint64 result = 0LL;
-	const gchar* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gint64 _tmp1_;
+#line 687 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, 0LL);
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0);
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 3761 "DataSource.c"
+#line 3780 "DataSource.c"
 }
 
 
 gint64 source_backlink_get_instance_id (SourceBacklink* self) {
 	gint64 result;
-	const gchar* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
+	const gchar* _tmp0_;
+	gint64 _tmp1_;
 #line 493 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail (IS_SOURCE_BACKLINK (self), 0LL);
 #line 494 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3776,14 +3795,14 @@ gint64 source_backlink_get_instance_id (SourceBacklink* self) {
 	result = _tmp1_;
 #line 494 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 3779 "DataSource.c"
+#line 3798 "DataSource.c"
 }
 
 
 static void value_source_backlink_init (GValue* value) {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	value->data[0].v_pointer = NULL;
-#line 3786 "DataSource.c"
+#line 3805 "DataSource.c"
 }
 
 
@@ -3792,7 +3811,7 @@ static void value_source_backlink_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_backlink_unref (value->data[0].v_pointer);
-#line 3795 "DataSource.c"
+#line 3814 "DataSource.c"
 	}
 }
 
@@ -3802,11 +3821,11 @@ static void value_source_backlink_copy_value (const GValue* src_value, GValue* d
 	if (src_value->data[0].v_pointer) {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		dest_value->data[0].v_pointer = source_backlink_ref (src_value->data[0].v_pointer);
-#line 3805 "DataSource.c"
+#line 3824 "DataSource.c"
 	} else {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3809 "DataSource.c"
+#line 3828 "DataSource.c"
 	}
 }
 
@@ -3814,66 +3833,66 @@ static void value_source_backlink_copy_value (const GValue* src_value, GValue* d
 static gpointer value_source_backlink_peek_pointer (const GValue* value) {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return value->data[0].v_pointer;
-#line 3817 "DataSource.c"
+#line 3836 "DataSource.c"
 }
 
 
 static gchar* value_source_backlink_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (collect_values[0].v_pointer) {
-#line 3824 "DataSource.c"
-		SourceBacklink* object;
+#line 3843 "DataSource.c"
+		SourceBacklink * object;
 		object = collect_values[0].v_pointer;
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3831 "DataSource.c"
+#line 3850 "DataSource.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3835 "DataSource.c"
+#line 3854 "DataSource.c"
 		}
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = source_backlink_ref (object);
-#line 3839 "DataSource.c"
+#line 3858 "DataSource.c"
 	} else {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 3843 "DataSource.c"
+#line 3862 "DataSource.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return NULL;
-#line 3847 "DataSource.c"
+#line 3866 "DataSource.c"
 }
 
 
 static gchar* value_source_backlink_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SourceBacklink** object_p;
+	SourceBacklink ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (!object_p) {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3858 "DataSource.c"
+#line 3877 "DataSource.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (!value->data[0].v_pointer) {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		*object_p = NULL;
-#line 3864 "DataSource.c"
+#line 3883 "DataSource.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3868 "DataSource.c"
+#line 3887 "DataSource.c"
 	} else {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		*object_p = source_backlink_ref (value->data[0].v_pointer);
-#line 3872 "DataSource.c"
+#line 3891 "DataSource.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return NULL;
-#line 3876 "DataSource.c"
+#line 3895 "DataSource.c"
 }
 
 
@@ -3887,7 +3906,7 @@ GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return G_PARAM_SPEC (spec);
-#line 3890 "DataSource.c"
+#line 3909 "DataSource.c"
 }
 
 
@@ -3896,12 +3915,12 @@ gpointer value_get_source_backlink (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_BACKLINK), NULL);
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return value->data[0].v_pointer;
-#line 3899 "DataSource.c"
+#line 3918 "DataSource.c"
 }
 
 
 void value_set_source_backlink (GValue* value, gpointer v_object) {
-	SourceBacklink* old;
+	SourceBacklink * old;
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_BACKLINK));
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3916,23 +3935,23 @@ void value_set_source_backlink (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_backlink_ref (value->data[0].v_pointer);
-#line 3919 "DataSource.c"
+#line 3938 "DataSource.c"
 	} else {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 3923 "DataSource.c"
+#line 3942 "DataSource.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (old) {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_backlink_unref (old);
-#line 3929 "DataSource.c"
+#line 3948 "DataSource.c"
 	}
 }
 
 
 void value_take_source_backlink (GValue* value, gpointer v_object) {
-	SourceBacklink* old;
+	SourceBacklink * old;
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_BACKLINK));
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3945,17 +3964,17 @@ void value_take_source_backlink (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = v_object;
-#line 3948 "DataSource.c"
+#line 3967 "DataSource.c"
 	} else {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 3952 "DataSource.c"
+#line 3971 "DataSource.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (old) {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_backlink_unref (old);
-#line 3958 "DataSource.c"
+#line 3977 "DataSource.c"
 	}
 }
 
@@ -3967,7 +3986,7 @@ static void source_backlink_class_init (SourceBacklinkClass * klass) {
 	((SourceBacklinkClass *) klass)->finalize = source_backlink_finalize;
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_type_class_add_private (klass, sizeof (SourceBacklinkPrivate));
-#line 3970 "DataSource.c"
+#line 3989 "DataSource.c"
 }
 
 
@@ -3976,11 +3995,11 @@ static void source_backlink_instance_init (SourceBacklink * self) {
 	self->priv = SOURCE_BACKLINK_GET_PRIVATE (self);
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->ref_count = 1;
-#line 3979 "DataSource.c"
+#line 3998 "DataSource.c"
 }
 
 
-static void source_backlink_finalize (SourceBacklink* obj) {
+static void source_backlink_finalize (SourceBacklink * obj) {
 	SourceBacklink * self;
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_BACKLINK, SourceBacklink);
@@ -3990,7 +4009,7 @@ static void source_backlink_finalize (SourceBacklink* obj) {
 	_g_free0 (self->priv->_name);
 #line 470 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_g_free0 (self->priv->_value);
-#line 3993 "DataSource.c"
+#line 4012 "DataSource.c"
 }
 
 
@@ -4009,18 +4028,18 @@ GType source_backlink_get_type (void) {
 
 
 gpointer source_backlink_ref (gpointer instance) {
-	SourceBacklink* self;
+	SourceBacklink * self;
 	self = instance;
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return instance;
-#line 4018 "DataSource.c"
+#line 4037 "DataSource.c"
 }
 
 
 void source_backlink_unref (gpointer instance) {
-	SourceBacklink* self;
+	SourceBacklink * self;
 	self = instance;
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -4028,7 +4047,7 @@ void source_backlink_unref (gpointer instance) {
 		SOURCE_BACKLINK_GET_CLASS (self)->finalize (self);
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4031 "DataSource.c"
+#line 4050 "DataSource.c"
 	}
 }
 
@@ -4036,32 +4055,32 @@ void source_backlink_unref (gpointer instance) {
 static void _source_proxy_on_source_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) {
 #line 588 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	source_proxy_on_source_added ((SourceProxy*) self, added);
-#line 4039 "DataSource.c"
+#line 4058 "DataSource.c"
 }
 
 
 static void _source_proxy_on_snapshot_broken_source_snapshot_broken (SourceSnapshot* _sender, gpointer self) {
 #line 577 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	source_proxy_on_snapshot_broken ((SourceProxy*) self);
-#line 4046 "DataSource.c"
+#line 4065 "DataSource.c"
 }
 
 
 SourceProxy* source_proxy_construct (GType object_type, DataSource* source) {
 	SourceProxy* self = NULL;
-	DataSource* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-	DataSource* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	DataSource* _tmp4_ = NULL;
-	SourceSnapshot* _tmp5_ = NULL;
-	SourceSnapshot* _tmp6_ = NULL;
-	SourceSnapshot* _tmp7_ = NULL;
-	DataSource* _tmp8_ = NULL;
-	DataSource* _tmp9_ = NULL;
-	DataCollection* _tmp10_ = NULL;
-	SourceCollection* _tmp11_ = NULL;
-	SourceCollection* _tmp12_ = NULL;
+	DataSource* _tmp0_;
+	gint64 _tmp1_;
+	DataSource* _tmp2_;
+	gchar* _tmp3_;
+	DataSource* _tmp4_;
+	SourceSnapshot* _tmp5_;
+	SourceSnapshot* _tmp6_;
+	SourceSnapshot* _tmp7_;
+	DataSource* _tmp8_;
+	DataSource* _tmp9_;
+	DataCollection* _tmp10_;
+	SourceCollection* _tmp11_;
+	SourceCollection* _tmp12_;
 #line 571 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
 #line 571 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4118,7 +4137,7 @@ SourceProxy* source_proxy_construct (GType object_type, DataSource* source) {
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _source_proxy_on_source_added_data_collection_items_added, self);
 #line 571 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return self;
-#line 4121 "DataSource.c"
+#line 4140 "DataSource.c"
 }
 
 
@@ -4127,7 +4146,7 @@ static DataSource* source_proxy_real_reconstitute (SourceProxy* self, gint64 obj
 	g_critical ("Type `%s' does not implement abstract method `source_proxy_reconstitute'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 591 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return NULL;
-#line 4130 "DataSource.c"
+#line 4149 "DataSource.c"
 }
 
 
@@ -4136,19 +4155,19 @@ DataSource* source_proxy_reconstitute (SourceProxy* self, gint64 object_id, Sour
 	g_return_val_if_fail (IS_SOURCE_PROXY (self), NULL);
 #line 591 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return SOURCE_PROXY_GET_CLASS (self)->reconstitute (self, object_id, snapshot);
-#line 4139 "DataSource.c"
+#line 4158 "DataSource.c"
 }
 
 
 static void source_proxy_real_notify_reconstituted (SourceProxy* self, DataSource* source) {
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 593 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
 #line 594 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp0_ = source;
 #line 594 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	g_signal_emit_by_name (self, "reconstituted", _tmp0_);
-#line 4151 "DataSource.c"
+	g_signal_emit (self, source_proxy_signals[SOURCE_PROXY_RECONSTITUTED_SIGNAL], 0, _tmp0_);
+#line 4170 "DataSource.c"
 }
 
 
@@ -4157,14 +4176,14 @@ void source_proxy_notify_reconstituted (SourceProxy* self, DataSource* source) {
 	g_return_if_fail (IS_SOURCE_PROXY (self));
 #line 593 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	SOURCE_PROXY_GET_CLASS (self)->notify_reconstituted (self, source);
-#line 4160 "DataSource.c"
+#line 4179 "DataSource.c"
 }
 
 
 static void source_proxy_real_notify_dehydrated (SourceProxy* self) {
 #line 598 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	g_signal_emit_by_name (self, "dehydrated");
-#line 4167 "DataSource.c"
+	g_signal_emit (self, source_proxy_signals[SOURCE_PROXY_DEHYDRATED_SIGNAL], 0);
+#line 4186 "DataSource.c"
 }
 
 
@@ -4173,14 +4192,14 @@ void source_proxy_notify_dehydrated (SourceProxy* self) {
 	g_return_if_fail (IS_SOURCE_PROXY (self));
 #line 597 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	SOURCE_PROXY_GET_CLASS (self)->notify_dehydrated (self);
-#line 4176 "DataSource.c"
+#line 4195 "DataSource.c"
 }
 
 
 static void source_proxy_real_notify_broken (SourceProxy* self) {
 #line 602 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	g_signal_emit_by_name (self, "broken");
-#line 4183 "DataSource.c"
+	g_signal_emit (self, source_proxy_signals[SOURCE_PROXY_BROKEN_SIGNAL], 0);
+#line 4202 "DataSource.c"
 }
 
 
@@ -4189,7 +4208,7 @@ void source_proxy_notify_broken (SourceProxy* self) {
 	g_return_if_fail (IS_SOURCE_PROXY (self));
 #line 601 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	SOURCE_PROXY_GET_CLASS (self)->notify_broken (self);
-#line 4192 "DataSource.c"
+#line 4211 "DataSource.c"
 }
 
 
@@ -4200,21 +4219,21 @@ static void source_proxy_on_snapshot_broken (SourceProxy* self) {
 	source_proxy_drop_source (self);
 #line 608 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	source_proxy_notify_broken (self);
-#line 4203 "DataSource.c"
+#line 4222 "DataSource.c"
 }
 
 
 static void _source_proxy_on_destroyed_data_source_destroyed (DataSource* _sender, gpointer self) {
 #line 615 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	source_proxy_on_destroyed ((SourceProxy*) self);
-#line 4210 "DataSource.c"
+#line 4229 "DataSource.c"
 }
 
 
 static void source_proxy_set_source (SourceProxy* self, DataSource* source) {
-	DataSource* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	DataSource* _tmp2_ = NULL;
+	DataSource* _tmp0_;
+	DataSource* _tmp1_;
+	DataSource* _tmp2_;
 #line 611 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (IS_SOURCE_PROXY (self));
 #line 611 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4233,14 +4252,14 @@ static void source_proxy_set_source (SourceProxy* self, DataSource* source) {
 	_tmp2_ = source;
 #line 615 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_signal_connect (_tmp2_, "destroyed", (GCallback) _source_proxy_on_destroyed_data_source_destroyed, self);
-#line 4236 "DataSource.c"
+#line 4255 "DataSource.c"
 }
 
 
 static void source_proxy_drop_source (SourceProxy* self) {
-	DataSource* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
+	DataSource* _tmp0_;
+	DataSource* _tmp1_;
+	guint _tmp2_;
 #line 618 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (IS_SOURCE_PROXY (self));
 #line 619 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4249,7 +4268,7 @@ static void source_proxy_drop_source (SourceProxy* self) {
 	if (_tmp0_ == NULL) {
 #line 620 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return;
-#line 4252 "DataSource.c"
+#line 4271 "DataSource.c"
 	}
 #line 622 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp1_ = self->priv->source;
@@ -4261,32 +4280,32 @@ static void source_proxy_drop_source (SourceProxy* self) {
 	_g_object_unref0 (self->priv->source);
 #line 623 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv->source = NULL;
-#line 4264 "DataSource.c"
+#line 4283 "DataSource.c"
 }
 
 
 DataSource* source_proxy_get_source (SourceProxy* self) {
 	DataSource* result = NULL;
-	SourceSnapshot* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	DataSource* _tmp2_ = NULL;
+	SourceSnapshot* _tmp0_;
+	gboolean _tmp1_;
+	DataSource* _tmp2_;
 	DataSource* new_source = NULL;
-	gint64 _tmp5_ = 0LL;
-	SourceSnapshot* _tmp6_ = NULL;
-	DataSource* _tmp7_ = NULL;
-	DataSource* _tmp8_ = NULL;
-	DataSource* _tmp9_ = NULL;
-	gint64 _tmp12_ = 0LL;
-	DataSource* _tmp13_ = NULL;
-	gint64 _tmp14_ = 0LL;
-	DataSource* _tmp17_ = NULL;
-	gint64 _tmp18_ = 0LL;
-	gint64 _tmp19_ = 0LL;
-	SourceCollection* _tmp20_ = NULL;
-	DataSource* _tmp21_ = NULL;
-	gboolean _tmp22_ = FALSE;
-	DataSource* _tmp23_ = NULL;
-	DataSource* _tmp24_ = NULL;
+	gint64 _tmp5_;
+	SourceSnapshot* _tmp6_;
+	DataSource* _tmp7_;
+	DataSource* _tmp8_;
+	DataSource* _tmp9_;
+	gint64 _tmp12_;
+	DataSource* _tmp13_;
+	gint64 _tmp14_;
+	DataSource* _tmp17_;
+	gint64 _tmp18_;
+	gint64 _tmp19_;
+	SourceCollection* _tmp20_;
+	DataSource* _tmp21_;
+	gboolean _tmp22_;
+	DataSource* _tmp23_;
+	DataSource* _tmp24_;
 #line 626 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail (IS_SOURCE_PROXY (self), NULL);
 #line 627 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4299,15 +4318,15 @@ DataSource* source_proxy_get_source (SourceProxy* self) {
 		result = NULL;
 #line 628 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return result;
-#line 4302 "DataSource.c"
+#line 4321 "DataSource.c"
 	}
 #line 630 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp2_ = self->priv->source;
 #line 630 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp2_ != NULL) {
-#line 4308 "DataSource.c"
-		DataSource* _tmp3_ = NULL;
-		DataSource* _tmp4_ = NULL;
+#line 4327 "DataSource.c"
+		DataSource* _tmp3_;
+		DataSource* _tmp4_;
 #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp3_ = self->priv->source;
 #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4316,7 +4335,7 @@ DataSource* source_proxy_get_source (SourceProxy* self) {
 		result = _tmp4_;
 #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return result;
-#line 4319 "DataSource.c"
+#line 4338 "DataSource.c"
 	}
 #line 636 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp5_ = self->priv->object_id;
@@ -4332,9 +4351,9 @@ DataSource* source_proxy_get_source (SourceProxy* self) {
 	_tmp9_ = new_source;
 #line 637 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp8_ != _tmp9_) {
-#line 4335 "DataSource.c"
-		DataSource* _tmp10_ = NULL;
-		DataSource* _tmp11_ = NULL;
+#line 4354 "DataSource.c"
+		DataSource* _tmp10_;
+		DataSource* _tmp11_;
 #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp10_ = new_source;
 #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4343,7 +4362,7 @@ DataSource* source_proxy_get_source (SourceProxy* self) {
 		_g_object_unref0 (self->priv->source);
 #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		self->priv->source = _tmp11_;
-#line 4346 "DataSource.c"
+#line 4365 "DataSource.c"
 	}
 #line 639 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp12_ = self->priv->object_id;
@@ -4353,16 +4372,16 @@ DataSource* source_proxy_get_source (SourceProxy* self) {
 	_tmp14_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject));
 #line 639 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp12_ != _tmp14_) {
-#line 4356 "DataSource.c"
-		DataSource* _tmp15_ = NULL;
-		gint64 _tmp16_ = 0LL;
+#line 4375 "DataSource.c"
+		DataSource* _tmp15_;
+		gint64 _tmp16_;
 #line 640 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp15_ = new_source;
 #line 640 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp16_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject));
 #line 640 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		self->priv->object_id = _tmp16_;
-#line 4365 "DataSource.c"
+#line 4384 "DataSource.c"
 	}
 #line 641 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp17_ = self->priv->source;
@@ -4390,12 +4409,12 @@ DataSource* source_proxy_get_source (SourceProxy* self) {
 	_g_object_unref0 (new_source);
 #line 644 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 4393 "DataSource.c"
+#line 4412 "DataSource.c"
 }
 
 
 static void source_proxy_on_destroyed (SourceProxy* self) {
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 647 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (IS_SOURCE_PROXY (self));
 #line 648 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4406,12 +4425,12 @@ static void source_proxy_on_destroyed (SourceProxy* self) {
 	source_proxy_drop_source (self);
 #line 653 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	source_proxy_notify_dehydrated (self);
-#line 4409 "DataSource.c"
+#line 4428 "DataSource.c"
 }
 
 
 static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) {
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 656 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (IS_SOURCE_PROXY (self));
 #line 656 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4422,12 +4441,12 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added)
 	if (_tmp0_ != NULL) {
 #line 659 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return;
-#line 4425 "DataSource.c"
+#line 4444 "DataSource.c"
 	}
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeIterable* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp1_ = added;
 #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4436,17 +4455,17 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added)
 		_object_it = _tmp2_;
 #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		while (TRUE) {
-#line 4439 "DataSource.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 4458 "DataSource.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
-			DataObject* _tmp7_ = NULL;
-			gint64 _tmp8_ = 0LL;
-			gint64 _tmp9_ = 0LL;
-			DataObject* _tmp10_ = NULL;
-			DataObject* _tmp11_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
+			DataObject* _tmp7_;
+			gint64 _tmp8_;
+			gint64 _tmp9_;
+			DataObject* _tmp10_;
+			DataObject* _tmp11_;
 #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp3_ = _object_it;
 #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4455,7 +4474,7 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added)
 			if (!_tmp4_) {
 #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				break;
-#line 4458 "DataSource.c"
+#line 4477 "DataSource.c"
 			}
 #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp5_ = _object_it;
@@ -4475,7 +4494,7 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added)
 				_g_object_unref0 (object);
 #line 664 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				continue;
-#line 4478 "DataSource.c"
+#line 4497 "DataSource.c"
 			}
 #line 667 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp10_ = object;
@@ -4489,11 +4508,11 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added)
 			_g_object_unref0 (object);
 #line 671 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			break;
-#line 4492 "DataSource.c"
+#line 4511 "DataSource.c"
 		}
 #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_g_object_unref0 (_object_it);
-#line 4496 "DataSource.c"
+#line 4515 "DataSource.c"
 	}
 }
 
@@ -4501,7 +4520,7 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added)
 static void source_proxy_real_reconstituted (SourceProxy* self, DataSource* source) {
 #line 558 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
-#line 4504 "DataSource.c"
+#line 4523 "DataSource.c"
 }
 
 
@@ -4516,7 +4535,7 @@ static void source_proxy_real_broken (SourceProxy* self) {
 static void value_source_proxy_init (GValue* value) {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	value->data[0].v_pointer = NULL;
-#line 4519 "DataSource.c"
+#line 4538 "DataSource.c"
 }
 
 
@@ -4525,7 +4544,7 @@ static void value_source_proxy_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_proxy_unref (value->data[0].v_pointer);
-#line 4528 "DataSource.c"
+#line 4547 "DataSource.c"
 	}
 }
 
@@ -4535,11 +4554,11 @@ static void value_source_proxy_copy_value (const GValue* src_value, GValue* dest
 	if (src_value->data[0].v_pointer) {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		dest_value->data[0].v_pointer = source_proxy_ref (src_value->data[0].v_pointer);
-#line 4538 "DataSource.c"
+#line 4557 "DataSource.c"
 	} else {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4542 "DataSource.c"
+#line 4561 "DataSource.c"
 	}
 }
 
@@ -4547,66 +4566,66 @@ static void value_source_proxy_copy_value (const GValue* src_value, GValue* dest
 static gpointer value_source_proxy_peek_pointer (const GValue* value) {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return value->data[0].v_pointer;
-#line 4550 "DataSource.c"
+#line 4569 "DataSource.c"
 }
 
 
 static gchar* value_source_proxy_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (collect_values[0].v_pointer) {
-#line 4557 "DataSource.c"
-		SourceProxy* object;
+#line 4576 "DataSource.c"
+		SourceProxy * object;
 		object = collect_values[0].v_pointer;
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4564 "DataSource.c"
+#line 4583 "DataSource.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4568 "DataSource.c"
+#line 4587 "DataSource.c"
 		}
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = source_proxy_ref (object);
-#line 4572 "DataSource.c"
+#line 4591 "DataSource.c"
 	} else {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 4576 "DataSource.c"
+#line 4595 "DataSource.c"
 	}
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return NULL;
-#line 4580 "DataSource.c"
+#line 4599 "DataSource.c"
 }
 
 
 static gchar* value_source_proxy_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SourceProxy** object_p;
+	SourceProxy ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (!object_p) {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4591 "DataSource.c"
+#line 4610 "DataSource.c"
 	}
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (!value->data[0].v_pointer) {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		*object_p = NULL;
-#line 4597 "DataSource.c"
+#line 4616 "DataSource.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4601 "DataSource.c"
+#line 4620 "DataSource.c"
 	} else {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		*object_p = source_proxy_ref (value->data[0].v_pointer);
-#line 4605 "DataSource.c"
+#line 4624 "DataSource.c"
 	}
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return NULL;
-#line 4609 "DataSource.c"
+#line 4628 "DataSource.c"
 }
 
 
@@ -4620,7 +4639,7 @@ GParamSpec* param_spec_source_proxy (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return G_PARAM_SPEC (spec);
-#line 4623 "DataSource.c"
+#line 4642 "DataSource.c"
 }
 
 
@@ -4629,12 +4648,12 @@ gpointer value_get_source_proxy (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_PROXY), NULL);
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return value->data[0].v_pointer;
-#line 4632 "DataSource.c"
+#line 4651 "DataSource.c"
 }
 
 
 void value_set_source_proxy (GValue* value, gpointer v_object) {
-	SourceProxy* old;
+	SourceProxy * old;
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_PROXY));
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4649,23 +4668,23 @@ void value_set_source_proxy (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_proxy_ref (value->data[0].v_pointer);
-#line 4652 "DataSource.c"
+#line 4671 "DataSource.c"
 	} else {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 4656 "DataSource.c"
+#line 4675 "DataSource.c"
 	}
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (old) {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_proxy_unref (old);
-#line 4662 "DataSource.c"
+#line 4681 "DataSource.c"
 	}
 }
 
 
 void value_take_source_proxy (GValue* value, gpointer v_object) {
-	SourceProxy* old;
+	SourceProxy * old;
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_PROXY));
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4678,17 +4697,17 @@ void value_take_source_proxy (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = v_object;
-#line 4681 "DataSource.c"
+#line 4700 "DataSource.c"
 	} else {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 4685 "DataSource.c"
+#line 4704 "DataSource.c"
 	}
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (old) {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_proxy_unref (old);
-#line 4691 "DataSource.c"
+#line 4710 "DataSource.c"
 	}
 }
 
@@ -4701,13 +4720,13 @@ static void source_proxy_class_init (SourceProxyClass * klass) {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_type_class_add_private (klass, sizeof (SourceProxyPrivate));
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((SourceProxyClass *) klass)->reconstitute = (DataSource* (*)(SourceProxy*, gint64, SourceSnapshot*)) source_proxy_real_reconstitute;
+	((SourceProxyClass *) klass)->reconstitute = (DataSource* (*) (SourceProxy *, gint64, SourceSnapshot*)) source_proxy_real_reconstitute;
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((SourceProxyClass *) klass)->notify_reconstituted = (void (*)(SourceProxy*, DataSource*)) source_proxy_real_notify_reconstituted;
+	((SourceProxyClass *) klass)->notify_reconstituted = (void (*) (SourceProxy *, DataSource*)) source_proxy_real_notify_reconstituted;
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((SourceProxyClass *) klass)->notify_dehydrated = (void (*)(SourceProxy*)) source_proxy_real_notify_dehydrated;
+	((SourceProxyClass *) klass)->notify_dehydrated = (void (*) (SourceProxy *)) source_proxy_real_notify_dehydrated;
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	((SourceProxyClass *) klass)->notify_broken = (void (*)(SourceProxy*)) source_proxy_real_notify_broken;
+	((SourceProxyClass *) klass)->notify_broken = (void (*) (SourceProxy *)) source_proxy_real_notify_broken;
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	((SourceProxyClass *) klass)->reconstituted = source_proxy_real_reconstituted;
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4715,12 +4734,12 @@ static void source_proxy_class_init (SourceProxyClass * klass) {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	((SourceProxyClass *) klass)->broken = source_proxy_real_broken;
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	g_signal_new ("reconstituted", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, reconstituted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE);
+	source_proxy_signals[SOURCE_PROXY_RECONSTITUTED_SIGNAL] = g_signal_new ("reconstituted", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, reconstituted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE);
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	g_signal_new ("dehydrated", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, dehydrated), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	source_proxy_signals[SOURCE_PROXY_DEHYDRATED_SIGNAL] = g_signal_new ("dehydrated", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, dehydrated), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	g_signal_new ("broken", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 4723 "DataSource.c"
+	source_proxy_signals[SOURCE_PROXY_BROKEN_SIGNAL] = g_signal_new ("broken", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 4742 "DataSource.c"
 }
 
 
@@ -4729,14 +4748,14 @@ static void source_proxy_instance_init (SourceProxy * self) {
 	self->priv = SOURCE_PROXY_GET_PRIVATE (self);
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->ref_count = 1;
-#line 4732 "DataSource.c"
+#line 4751 "DataSource.c"
 }
 
 
-static void source_proxy_finalize (SourceProxy* obj) {
+static void source_proxy_finalize (SourceProxy * obj) {
 	SourceProxy * self;
-	SourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	SourceCollection* _tmp0_;
+	guint _tmp1_;
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_PROXY, SourceProxy);
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4757,7 +4776,7 @@ static void source_proxy_finalize (SourceProxy* obj) {
 	_source_snapshot_unref0 (self->priv->snapshot);
 #line 554 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_data_collection_unref0 (self->priv->membership);
-#line 4760 "DataSource.c"
+#line 4779 "DataSource.c"
 }
 
 
@@ -4776,18 +4795,18 @@ GType source_proxy_get_type (void) {
 
 
 gpointer source_proxy_ref (gpointer instance) {
-	SourceProxy* self;
+	SourceProxy * self;
 	self = instance;
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return instance;
-#line 4785 "DataSource.c"
+#line 4804 "DataSource.c"
 }
 
 
 void source_proxy_unref (gpointer instance) {
-	SourceProxy* self;
+	SourceProxy * self;
 	self = instance;
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -4795,7 +4814,7 @@ void source_proxy_unref (gpointer instance) {
 		SOURCE_PROXY_GET_CLASS (self)->finalize (self);
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4798 "DataSource.c"
+#line 4817 "DataSource.c"
 	}
 }
 
@@ -4805,7 +4824,7 @@ SourceProxy* proxyable_get_proxy (Proxyable* self) {
 	g_return_val_if_fail (IS_PROXYABLE (self), NULL);
 #line 677 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return PROXYABLE_GET_INTERFACE (self)->get_proxy (self);
-#line 4808 "DataSource.c"
+#line 4827 "DataSource.c"
 }
 
 
@@ -4816,7 +4835,7 @@ static void proxyable_base_init (ProxyableIface * iface) {
 	if (!initialized) {
 #line 676 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		initialized = TRUE;
-#line 4819 "DataSource.c"
+#line 4838 "DataSource.c"
 	}
 }
 
diff --git a/src/core/DataSourceTypes.c b/src/core/DataSourceTypes.c
index a71a3c3..539ab93 100644
--- a/src/core/DataSourceTypes.c
+++ b/src/core/DataSourceTypes.c
@@ -1,4 +1,4 @@
-/* DataSourceTypes.c generated by valac 0.34.7, the Vala compiler
+/* DataSourceTypes.c generated by valac 0.36.6, the Vala compiler
  * generated from DataSourceTypes.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -124,6 +124,11 @@ typedef struct _DataViewClass DataViewClass;
 
 typedef struct _ThumbnailView ThumbnailView;
 typedef struct _ThumbnailViewClass ThumbnailViewClass;
+enum  {
+	THUMBNAIL_SOURCE_THUMBNAIL_ALTERED_SIGNAL,
+	THUMBNAIL_SOURCE_LAST_SIGNAL
+};
+static guint thumbnail_source_signals[THUMBNAIL_SOURCE_LAST_SIGNAL] = {0};
 
 #define TYPE_INDEXABLE (indexable_get_type ())
 #define INDEXABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_INDEXABLE, Indexable))
@@ -593,30 +598,30 @@ void container_source_establish_link_many (ContainerSource* self, GeeCollection*
 
 ThumbnailSource* thumbnail_source_construct (GType object_type, gint64 object_id) {
 	ThumbnailSource * self = NULL;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 16 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	_tmp0_ = object_id;
 #line 16 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	self = (ThumbnailSource*) data_source_construct (object_type, _tmp0_);
 #line 15 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return self;
-#line 604 "DataSourceTypes.c"
+#line 609 "DataSourceTypes.c"
 }
 
 
 static void _thumbnail_source_subscriber_thumbnail_altered_data_source_contact_subscriber (DataView* view, gpointer self) {
 #line 24 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	thumbnail_source_subscriber_thumbnail_altered ((ThumbnailSource*) self, view);
-#line 611 "DataSourceTypes.c"
+#line 616 "DataSourceTypes.c"
 }
 
 
 static void thumbnail_source_real_notify_thumbnail_altered (ThumbnailSource* self) {
 #line 21 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
-	g_signal_emit_by_name (self, "thumbnail-altered");
+	g_signal_emit (self, thumbnail_source_signals[THUMBNAIL_SOURCE_THUMBNAIL_ALTERED_SIGNAL], 0);
 #line 24 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	data_source_contact_subscribers (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), _thumbnail_source_subscriber_thumbnail_altered_data_source_contact_subscriber, self);
-#line 620 "DataSourceTypes.c"
+#line 625 "DataSourceTypes.c"
 }
 
 
@@ -625,12 +630,12 @@ void thumbnail_source_notify_thumbnail_altered (ThumbnailSource* self) {
 	g_return_if_fail (IS_THUMBNAIL_SOURCE (self));
 #line 19 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	THUMBNAIL_SOURCE_GET_CLASS (self)->notify_thumbnail_altered (self);
-#line 629 "DataSourceTypes.c"
+#line 634 "DataSourceTypes.c"
 }
 
 
 static void thumbnail_source_subscriber_thumbnail_altered (ThumbnailSource* self, DataView* view) {
-	DataView* _tmp0_ = NULL;
+	DataView* _tmp0_;
 #line 27 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	g_return_if_fail (IS_THUMBNAIL_SOURCE (self));
 #line 27 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
@@ -639,7 +644,7 @@ static void thumbnail_source_subscriber_thumbnail_altered (ThumbnailSource* self
 	_tmp0_ = view;
 #line 28 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	thumbnail_view_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_VIEW, ThumbnailView));
-#line 643 "DataSourceTypes.c"
+#line 648 "DataSourceTypes.c"
 }
 
 
@@ -648,7 +653,7 @@ static GdkPixbuf* thumbnail_source_real_get_thumbnail (ThumbnailSource* self, gi
 	g_critical ("Type `%s' does not implement abstract method `thumbnail_source_get_thumbnail'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 31 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return NULL;
-#line 652 "DataSourceTypes.c"
+#line 657 "DataSourceTypes.c"
 }
 
 
@@ -657,7 +662,7 @@ GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GE
 	g_return_val_if_fail (IS_THUMBNAIL_SOURCE (self), NULL);
 #line 31 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return THUMBNAIL_SOURCE_GET_CLASS (self)->get_thumbnail (self, scale, error);
-#line 661 "DataSourceTypes.c"
+#line 666 "DataSourceTypes.c"
 }
 
 
@@ -666,7 +671,7 @@ static GdkPixbuf* thumbnail_source_real_create_thumbnail (ThumbnailSource* self,
 	g_critical ("Type `%s' does not implement abstract method `thumbnail_source_create_thumbnail'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 35 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return NULL;
-#line 670 "DataSourceTypes.c"
+#line 675 "DataSourceTypes.c"
 }
 
 
@@ -675,20 +680,20 @@ GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, gint scale,
 	g_return_val_if_fail (IS_THUMBNAIL_SOURCE (self), NULL);
 #line 35 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return THUMBNAIL_SOURCE_GET_CLASS (self)->create_thumbnail (self, scale, error);
-#line 679 "DataSourceTypes.c"
+#line 684 "DataSourceTypes.c"
 }
 
 
 static gchar* thumbnail_source_real_get_representative_id (ThumbnailSource* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 47 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	_tmp0_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource));
 #line 47 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	result = _tmp0_;
 #line 47 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return result;
-#line 692 "DataSourceTypes.c"
+#line 697 "DataSourceTypes.c"
 }
 
 
@@ -697,7 +702,7 @@ gchar* thumbnail_source_get_representative_id (ThumbnailSource* self) {
 	g_return_val_if_fail (IS_THUMBNAIL_SOURCE (self), NULL);
 #line 46 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return THUMBNAIL_SOURCE_GET_CLASS (self)->get_representative_id (self);
-#line 701 "DataSourceTypes.c"
+#line 706 "DataSourceTypes.c"
 }
 
 
@@ -706,7 +711,7 @@ static PhotoFileFormat thumbnail_source_real_get_preferred_thumbnail_format (Thu
 	g_critical ("Type `%s' does not implement abstract method `thumbnail_source_get_preferred_thumbnail_format'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 50 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return 0;
-#line 710 "DataSourceTypes.c"
+#line 715 "DataSourceTypes.c"
 }
 
 
@@ -715,7 +720,7 @@ PhotoFileFormat thumbnail_source_get_preferred_thumbnail_format (ThumbnailSource
 	g_return_val_if_fail (IS_THUMBNAIL_SOURCE (self), 0);
 #line 50 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return THUMBNAIL_SOURCE_GET_CLASS (self)->get_preferred_thumbnail_format (self);
-#line 719 "DataSourceTypes.c"
+#line 724 "DataSourceTypes.c"
 }
 
 
@@ -727,20 +732,20 @@ static void thumbnail_source_class_init (ThumbnailSourceClass * klass) {
 #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	thumbnail_source_parent_class = g_type_class_peek_parent (klass);
 #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
-	((ThumbnailSourceClass *) klass)->notify_thumbnail_altered = (void (*)(ThumbnailSource*)) thumbnail_source_real_notify_thumbnail_altered;
+	((ThumbnailSourceClass *) klass)->notify_thumbnail_altered = (void (*) (ThumbnailSource *)) thumbnail_source_real_notify_thumbnail_altered;
 #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
-	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) thumbnail_source_real_get_thumbnail;
+	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) thumbnail_source_real_get_thumbnail;
 #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
-	((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) thumbnail_source_real_create_thumbnail;
+	((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) thumbnail_source_real_create_thumbnail;
 #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
-	((ThumbnailSourceClass *) klass)->get_representative_id = (gchar* (*)(ThumbnailSource*)) thumbnail_source_real_get_representative_id;
+	((ThumbnailSourceClass *) klass)->get_representative_id = (gchar* (*) (ThumbnailSource *)) thumbnail_source_real_get_representative_id;
 #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
-	((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*)(ThumbnailSource*)) thumbnail_source_real_get_preferred_thumbnail_format;
+	((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*) (ThumbnailSource *)) thumbnail_source_real_get_preferred_thumbnail_format;
 #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	((ThumbnailSourceClass *) klass)->thumbnail_altered = thumbnail_source_real_thumbnail_altered;
 #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
-	g_signal_new ("thumbnail_altered", TYPE_THUMBNAIL_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ThumbnailSourceClass, thumbnail_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 744 "DataSourceTypes.c"
+	thumbnail_source_signals[THUMBNAIL_SOURCE_THUMBNAIL_ALTERED_SIGNAL] = g_signal_new ("thumbnail-altered", TYPE_THUMBNAIL_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ThumbnailSourceClass, thumbnail_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 749 "DataSourceTypes.c"
 }
 
 
@@ -762,14 +767,14 @@ GType thumbnail_source_get_type (void) {
 
 PhotoSource* photo_source_construct (GType object_type, gint64 object_id) {
 	PhotoSource * self = NULL;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 55 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	_tmp0_ = object_id;
 #line 55 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	self = (PhotoSource*) media_source_construct (object_type, _tmp0_);
 #line 54 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return self;
-#line 773 "DataSourceTypes.c"
+#line 778 "DataSourceTypes.c"
 }
 
 
@@ -778,7 +783,7 @@ static PhotoMetadata* photo_source_real_get_metadata (PhotoSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `photo_source_get_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 58 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return NULL;
-#line 782 "DataSourceTypes.c"
+#line 787 "DataSourceTypes.c"
 }
 
 
@@ -787,7 +792,7 @@ PhotoMetadata* photo_source_get_metadata (PhotoSource* self) {
 	g_return_val_if_fail (IS_PHOTO_SOURCE (self), NULL);
 #line 58 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return PHOTO_SOURCE_GET_CLASS (self)->get_metadata (self);
-#line 791 "DataSourceTypes.c"
+#line 796 "DataSourceTypes.c"
 }
 
 
@@ -796,7 +801,7 @@ static GdkPixbuf* photo_source_real_get_pixbuf (PhotoSource* self, Scaling* scal
 	g_critical ("Type `%s' does not implement abstract method `photo_source_get_pixbuf'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 60 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return NULL;
-#line 800 "DataSourceTypes.c"
+#line 805 "DataSourceTypes.c"
 }
 
 
@@ -805,7 +810,7 @@ GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError*
 	g_return_val_if_fail (IS_PHOTO_SOURCE (self), NULL);
 #line 60 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return PHOTO_SOURCE_GET_CLASS (self)->get_pixbuf (self, scaling, error);
-#line 809 "DataSourceTypes.c"
+#line 814 "DataSourceTypes.c"
 }
 
 
@@ -813,10 +818,10 @@ static void photo_source_class_init (PhotoSourceClass * klass) {
 #line 53 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	photo_source_parent_class = g_type_class_peek_parent (klass);
 #line 53 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
-	((PhotoSourceClass *) klass)->get_metadata = (PhotoMetadata* (*)(PhotoSource*)) photo_source_real_get_metadata;
+	((PhotoSourceClass *) klass)->get_metadata = (PhotoMetadata* (*) (PhotoSource *)) photo_source_real_get_metadata;
 #line 53 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
-	((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoSource*, Scaling*, GError**)) photo_source_real_get_pixbuf;
-#line 820 "DataSourceTypes.c"
+	((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*) (PhotoSource *, Scaling*, GError**)) photo_source_real_get_pixbuf;
+#line 825 "DataSourceTypes.c"
 }
 
 
@@ -842,14 +847,14 @@ VideoSource* video_source_construct (GType object_type) {
 	self = (VideoSource*) media_source_construct (object_type, DATA_OBJECT_INVALID_OBJECT_ID);
 #line 63 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return self;
-#line 846 "DataSourceTypes.c"
+#line 851 "DataSourceTypes.c"
 }
 
 
 static void video_source_class_init (VideoSourceClass * klass) {
 #line 63 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	video_source_parent_class = g_type_class_peek_parent (klass);
-#line 853 "DataSourceTypes.c"
+#line 858 "DataSourceTypes.c"
 }
 
 
@@ -871,14 +876,14 @@ GType video_source_get_type (void) {
 
 EventSource* event_source_construct (GType object_type, gint64 object_id) {
 	EventSource * self = NULL;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 72 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	_tmp0_ = object_id;
 #line 72 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	self = (EventSource*) thumbnail_source_construct (object_type, _tmp0_);
 #line 71 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return self;
-#line 882 "DataSourceTypes.c"
+#line 887 "DataSourceTypes.c"
 }
 
 
@@ -888,7 +893,7 @@ static time_t event_source_real_get_start_time (EventSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `event_source_get_start_time'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 75 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return _tmp0_;
-#line 892 "DataSourceTypes.c"
+#line 897 "DataSourceTypes.c"
 }
 
 
@@ -897,7 +902,7 @@ time_t event_source_get_start_time (EventSource* self) {
 	g_return_val_if_fail (IS_EVENT_SOURCE (self), 0);
 #line 75 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return EVENT_SOURCE_GET_CLASS (self)->get_start_time (self);
-#line 901 "DataSourceTypes.c"
+#line 906 "DataSourceTypes.c"
 }
 
 
@@ -907,7 +912,7 @@ static time_t event_source_real_get_end_time (EventSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `event_source_get_end_time'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 77 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return _tmp0_;
-#line 911 "DataSourceTypes.c"
+#line 916 "DataSourceTypes.c"
 }
 
 
@@ -916,7 +921,7 @@ time_t event_source_get_end_time (EventSource* self) {
 	g_return_val_if_fail (IS_EVENT_SOURCE (self), 0);
 #line 77 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return EVENT_SOURCE_GET_CLASS (self)->get_end_time (self);
-#line 920 "DataSourceTypes.c"
+#line 925 "DataSourceTypes.c"
 }
 
 
@@ -926,7 +931,7 @@ static guint64 event_source_real_get_total_filesize (EventSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `event_source_get_total_filesize'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 79 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return _tmp0_;
-#line 930 "DataSourceTypes.c"
+#line 935 "DataSourceTypes.c"
 }
 
 
@@ -935,7 +940,7 @@ guint64 event_source_get_total_filesize (EventSource* self) {
 	g_return_val_if_fail (IS_EVENT_SOURCE (self), 0ULL);
 #line 79 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return EVENT_SOURCE_GET_CLASS (self)->get_total_filesize (self);
-#line 939 "DataSourceTypes.c"
+#line 944 "DataSourceTypes.c"
 }
 
 
@@ -945,7 +950,7 @@ static gint event_source_real_get_media_count (EventSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `event_source_get_media_count'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 81 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return _tmp0_;
-#line 949 "DataSourceTypes.c"
+#line 954 "DataSourceTypes.c"
 }
 
 
@@ -954,7 +959,7 @@ gint event_source_get_media_count (EventSource* self) {
 	g_return_val_if_fail (IS_EVENT_SOURCE (self), 0);
 #line 81 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return EVENT_SOURCE_GET_CLASS (self)->get_media_count (self);
-#line 958 "DataSourceTypes.c"
+#line 963 "DataSourceTypes.c"
 }
 
 
@@ -963,7 +968,7 @@ static GeeCollection* event_source_real_get_media (EventSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `event_source_get_media'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 83 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return NULL;
-#line 967 "DataSourceTypes.c"
+#line 972 "DataSourceTypes.c"
 }
 
 
@@ -972,7 +977,7 @@ GeeCollection* event_source_get_media (EventSource* self) {
 	g_return_val_if_fail (IS_EVENT_SOURCE (self), NULL);
 #line 83 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return EVENT_SOURCE_GET_CLASS (self)->get_media (self);
-#line 976 "DataSourceTypes.c"
+#line 981 "DataSourceTypes.c"
 }
 
 
@@ -981,7 +986,7 @@ static gchar* event_source_real_get_comment (EventSource* self) {
 	g_critical ("Type `%s' does not implement abstract method `event_source_get_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 85 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return NULL;
-#line 985 "DataSourceTypes.c"
+#line 990 "DataSourceTypes.c"
 }
 
 
@@ -990,7 +995,7 @@ gchar* event_source_get_comment (EventSource* self) {
 	g_return_val_if_fail (IS_EVENT_SOURCE (self), NULL);
 #line 85 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return EVENT_SOURCE_GET_CLASS (self)->get_comment (self);
-#line 994 "DataSourceTypes.c"
+#line 999 "DataSourceTypes.c"
 }
 
 
@@ -1000,7 +1005,7 @@ static gboolean event_source_real_set_comment (EventSource* self, const gchar* c
 	g_critical ("Type `%s' does not implement abstract method `event_source_set_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 87 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return _tmp0_;
-#line 1004 "DataSourceTypes.c"
+#line 1009 "DataSourceTypes.c"
 }
 
 
@@ -1009,7 +1014,7 @@ gboolean event_source_set_comment (EventSource* self, const gchar* comment) {
 	g_return_val_if_fail (IS_EVENT_SOURCE (self), FALSE);
 #line 87 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return EVENT_SOURCE_GET_CLASS (self)->set_comment (self, comment);
-#line 1013 "DataSourceTypes.c"
+#line 1018 "DataSourceTypes.c"
 }
 
 
@@ -1017,20 +1022,20 @@ static void event_source_class_init (EventSourceClass * klass) {
 #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	event_source_parent_class = g_type_class_peek_parent (klass);
 #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
-	((EventSourceClass *) klass)->get_start_time = (time_t (*)(EventSource*)) event_source_real_get_start_time;
+	((EventSourceClass *) klass)->get_start_time = (time_t (*) (EventSource *)) event_source_real_get_start_time;
 #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
-	((EventSourceClass *) klass)->get_end_time = (time_t (*)(EventSource*)) event_source_real_get_end_time;
+	((EventSourceClass *) klass)->get_end_time = (time_t (*) (EventSource *)) event_source_real_get_end_time;
 #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
-	((EventSourceClass *) klass)->get_total_filesize = (guint64 (*)(EventSource*)) event_source_real_get_total_filesize;
+	((EventSourceClass *) klass)->get_total_filesize = (guint64 (*) (EventSource *)) event_source_real_get_total_filesize;
 #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
-	((EventSourceClass *) klass)->get_media_count = (gint (*)(EventSource*)) event_source_real_get_media_count;
+	((EventSourceClass *) klass)->get_media_count = (gint (*) (EventSource *)) event_source_real_get_media_count;
 #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
-	((EventSourceClass *) klass)->get_media = (GeeCollection* (*)(EventSource*)) event_source_real_get_media;
+	((EventSourceClass *) klass)->get_media = (GeeCollection* (*) (EventSource *)) event_source_real_get_media;
 #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
-	((EventSourceClass *) klass)->get_comment = (gchar* (*)(EventSource*)) event_source_real_get_comment;
+	((EventSourceClass *) klass)->get_comment = (gchar* (*) (EventSource *)) event_source_real_get_comment;
 #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
-	((EventSourceClass *) klass)->set_comment = (gboolean (*)(EventSource*, const gchar*)) event_source_real_set_comment;
-#line 1034 "DataSourceTypes.c"
+	((EventSourceClass *) klass)->set_comment = (gboolean (*) (EventSource *, const gchar*)) event_source_real_set_comment;
+#line 1039 "DataSourceTypes.c"
 }
 
 
@@ -1055,7 +1060,7 @@ gboolean container_source_has_links (ContainerSource* self) {
 	g_return_val_if_fail (IS_CONTAINER_SOURCE (self), FALSE);
 #line 95 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return CONTAINER_SOURCE_GET_INTERFACE (self)->has_links (self);
-#line 1059 "DataSourceTypes.c"
+#line 1064 "DataSourceTypes.c"
 }
 
 
@@ -1064,7 +1069,7 @@ SourceBacklink* container_source_get_backlink (ContainerSource* self) {
 	g_return_val_if_fail (IS_CONTAINER_SOURCE (self), NULL);
 #line 97 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	return CONTAINER_SOURCE_GET_INTERFACE (self)->get_backlink (self);
-#line 1068 "DataSourceTypes.c"
+#line 1073 "DataSourceTypes.c"
 }
 
 
@@ -1073,7 +1078,7 @@ void container_source_break_link (ContainerSource* self, DataSource* source) {
 	g_return_if_fail (IS_CONTAINER_SOURCE (self));
 #line 99 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	CONTAINER_SOURCE_GET_INTERFACE (self)->break_link (self, source);
-#line 1077 "DataSourceTypes.c"
+#line 1082 "DataSourceTypes.c"
 }
 
 
@@ -1082,7 +1087,7 @@ void container_source_break_link_many (ContainerSource* self, GeeCollection* sou
 	g_return_if_fail (IS_CONTAINER_SOURCE (self));
 #line 101 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	CONTAINER_SOURCE_GET_INTERFACE (self)->break_link_many (self, sources);
-#line 1086 "DataSourceTypes.c"
+#line 1091 "DataSourceTypes.c"
 }
 
 
@@ -1091,7 +1096,7 @@ void container_source_establish_link (ContainerSource* self, DataSource* source)
 	g_return_if_fail (IS_CONTAINER_SOURCE (self));
 #line 103 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	CONTAINER_SOURCE_GET_INTERFACE (self)->establish_link (self, source);
-#line 1095 "DataSourceTypes.c"
+#line 1100 "DataSourceTypes.c"
 }
 
 
@@ -1100,7 +1105,7 @@ void container_source_establish_link_many (ContainerSource* self, GeeCollection*
 	g_return_if_fail (IS_CONTAINER_SOURCE (self));
 #line 105 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	CONTAINER_SOURCE_GET_INTERFACE (self)->establish_link_many (self, sources);
-#line 1104 "DataSourceTypes.c"
+#line 1109 "DataSourceTypes.c"
 }
 
 
@@ -1111,7 +1116,7 @@ static void container_source_base_init (ContainerSourceIface * iface) {
 	if (!initialized) {
 #line 94 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 		initialized = TRUE;
-#line 1115 "DataSourceTypes.c"
+#line 1120 "DataSourceTypes.c"
 	}
 }
 
diff --git a/src/core/DataView.c b/src/core/DataView.c
index b25fa1e..004d364 100644
--- a/src/core/DataView.c
+++ b/src/core/DataView.c
@@ -1,4 +1,4 @@
-/* DataView.c generated by valac 0.34.7, the Vala compiler
+/* DataView.c generated by valac 0.36.6, the Vala compiler
  * generated from DataView.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -77,6 +77,15 @@ typedef struct _DataSourceClass DataSourceClass;
 typedef struct _ViewCollection ViewCollection;
 typedef struct _ViewCollectionClass ViewCollectionClass;
 #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL)))
+enum  {
+	DATA_VIEW_STATE_CHANGED_SIGNAL,
+	DATA_VIEW_VISIBILITY_CHANGED_SIGNAL,
+	DATA_VIEW_VIEW_ALTERED_SIGNAL,
+	DATA_VIEW_GEOMETRY_ALTERED_SIGNAL,
+	DATA_VIEW_UNSUBSCRIBED_SIGNAL,
+	DATA_VIEW_LAST_SIGNAL
+};
+static guint data_view_signals[DATA_VIEW_LAST_SIGNAL] = {0};
 
 struct _DataObject {
 	GObject parent_instance;
@@ -172,21 +181,21 @@ static void data_view_real_visibility_changed (DataView* self, gboolean visible)
 static void data_view_real_view_altered (DataView* self);
 static void data_view_real_geometry_altered (DataView* self);
 static void data_view_real_unsubscribed (DataView* self, DataSource* source);
-static void data_view_finalize (GObject* obj);
+static void data_view_finalize (GObject * obj);
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 33 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 182 "DataView.c"
+#line 191 "DataView.c"
 }
 
 
 DataView* data_view_construct (GType object_type, DataSource* source) {
 	DataView * self = NULL;
-	DataSource* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	DataSource* _tmp2_ = NULL;
+	DataSource* _tmp0_;
+	DataSource* _tmp1_;
+	DataSource* _tmp2_;
 #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
 #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -205,25 +214,25 @@ DataView* data_view_construct (GType object_type, DataSource* source) {
 	data_source_internal_subscribe (_tmp2_, self);
 #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return self;
-#line 209 "DataView.c"
+#line 218 "DataView.c"
 }
 
 
 DataView* data_view_new (DataSource* source) {
 #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return data_view_construct (TYPE_DATA_VIEW, source);
-#line 216 "DataView.c"
+#line 225 "DataView.c"
 }
 
 
 static gchar* data_view_real_get_name (DataObject* base) {
 	DataView * self;
 	gchar* result = NULL;
-	DataSource* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	DataSource* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 47 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATA_VIEW, DataView);
 #line 48 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -242,20 +251,20 @@ static gchar* data_view_real_get_name (DataObject* base) {
 	result = _tmp4_;
 #line 48 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 246 "DataView.c"
+#line 255 "DataView.c"
 }
 
 
 static gchar* data_view_real_to_string (DataObject* base) {
 	DataView * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	DataSource* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	DataSource* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 51 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATA_VIEW, DataView);
 #line 52 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -280,14 +289,14 @@ static gchar* data_view_real_to_string (DataObject* base) {
 	result = _tmp6_;
 #line 52 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 284 "DataView.c"
+#line 293 "DataView.c"
 }
 
 
 DataSource* data_view_get_source (DataView* self) {
 	DataSource* result = NULL;
-	DataSource* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	DataSource* _tmp1_;
 #line 55 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (self), NULL);
 #line 56 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -298,13 +307,13 @@ DataSource* data_view_get_source (DataView* self) {
 	result = _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 302 "DataView.c"
+#line 311 "DataView.c"
 }
 
 
 gboolean data_view_is_selected (DataView* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 59 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (self), FALSE);
 #line 60 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -313,15 +322,15 @@ gboolean data_view_is_selected (DataView* self) {
 	result = _tmp0_;
 #line 60 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 317 "DataView.c"
+#line 326 "DataView.c"
 }
 
 
 void data_view_internal_set_selected (DataView* self, gboolean selected) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 64 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_if_fail (IS_DATA_VIEW (self));
 #line 65 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -332,7 +341,7 @@ void data_view_internal_set_selected (DataView* self, gboolean selected) {
 	if (_tmp0_ == _tmp1_) {
 #line 66 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		return;
-#line 336 "DataView.c"
+#line 345 "DataView.c"
 	}
 #line 68 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp2_ = selected;
@@ -341,16 +350,16 @@ void data_view_internal_set_selected (DataView* self, gboolean selected) {
 #line 69 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp3_ = selected;
 #line 69 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	g_signal_emit_by_name (self, "state-changed", _tmp3_);
-#line 346 "DataView.c"
+	g_signal_emit (self, data_view_signals[DATA_VIEW_STATE_CHANGED_SIGNAL], 0, _tmp3_);
+#line 355 "DataView.c"
 }
 
 
 gboolean data_view_internal_toggle (DataView* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 #line 73 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (self), FALSE);
 #line 74 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -360,20 +369,20 @@ gboolean data_view_internal_toggle (DataView* self) {
 #line 75 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp1_ = self->priv->selected;
 #line 75 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	g_signal_emit_by_name (self, "state-changed", _tmp1_);
+	g_signal_emit (self, data_view_signals[DATA_VIEW_STATE_CHANGED_SIGNAL], 0, _tmp1_);
 #line 77 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp2_ = self->priv->selected;
 #line 77 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	result = _tmp2_;
 #line 77 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 371 "DataView.c"
+#line 380 "DataView.c"
 }
 
 
 gboolean data_view_is_visible (DataView* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 80 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (self), FALSE);
 #line 81 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -382,15 +391,15 @@ gboolean data_view_is_visible (DataView* self) {
 	result = _tmp0_;
 #line 81 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 386 "DataView.c"
+#line 395 "DataView.c"
 }
 
 
 void data_view_internal_set_visible (DataView* self, gboolean visible) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 85 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_if_fail (IS_DATA_VIEW (self));
 #line 86 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -401,7 +410,7 @@ void data_view_internal_set_visible (DataView* self, gboolean visible) {
 	if (_tmp0_ == _tmp1_) {
 #line 87 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		return;
-#line 405 "DataView.c"
+#line 414 "DataView.c"
 	}
 #line 89 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp2_ = visible;
@@ -410,24 +419,24 @@ void data_view_internal_set_visible (DataView* self, gboolean visible) {
 #line 90 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp3_ = visible;
 #line 90 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	g_signal_emit_by_name (self, "visibility-changed", _tmp3_);
-#line 415 "DataView.c"
+	g_signal_emit (self, data_view_signals[DATA_VIEW_VISIBILITY_CHANGED_SIGNAL], 0, _tmp3_);
+#line 424 "DataView.c"
 }
 
 
 static void data_view_real_notify_view_altered (DataView* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	ViewCollection* vc = NULL;
-	DataCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
+	DataCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
 #line 95 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp0_ = self->priv->visible;
 #line 95 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	if (!_tmp0_) {
 #line 96 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		return;
-#line 431 "DataView.c"
+#line 440 "DataView.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp1_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
@@ -437,7 +446,7 @@ static void data_view_real_notify_view_altered (DataView* self) {
 	if (_tmp2_ == NULL) {
 #line 98 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 441 "DataView.c"
+#line 450 "DataView.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	vc = _tmp2_;
@@ -445,10 +454,10 @@ static void data_view_real_notify_view_altered (DataView* self) {
 	_tmp3_ = vc;
 #line 99 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	if (_tmp3_ != NULL) {
-#line 449 "DataView.c"
-		ViewCollection* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		ViewCollection* _tmp6_ = NULL;
+#line 458 "DataView.c"
+		ViewCollection* _tmp4_;
+		gboolean _tmp5_;
+		ViewCollection* _tmp6_;
 #line 100 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		_tmp4_ = vc;
 #line 100 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -456,22 +465,22 @@ static void data_view_real_notify_view_altered (DataView* self) {
 #line 100 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		if (!_tmp5_) {
 #line 101 "/home/jens/Source/shotwell/src/core/DataView.vala"
-			g_signal_emit_by_name (self, "view-altered");
-#line 461 "DataView.c"
+			g_signal_emit (self, data_view_signals[DATA_VIEW_VIEW_ALTERED_SIGNAL], 0);
+#line 470 "DataView.c"
 		}
 #line 104 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		_tmp6_ = vc;
 #line 104 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		view_collection_internal_notify_view_altered (_tmp6_, self);
-#line 467 "DataView.c"
+#line 476 "DataView.c"
 	} else {
 #line 106 "/home/jens/Source/shotwell/src/core/DataView.vala"
-		g_signal_emit_by_name (self, "view-altered");
-#line 471 "DataView.c"
+		g_signal_emit (self, data_view_signals[DATA_VIEW_VIEW_ALTERED_SIGNAL], 0);
+#line 480 "DataView.c"
 	}
 #line 93 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_data_collection_unref0 (vc);
-#line 475 "DataView.c"
+#line 484 "DataView.c"
 }
 
 
@@ -480,23 +489,23 @@ void data_view_notify_view_altered (DataView* self) {
 	g_return_if_fail (IS_DATA_VIEW (self));
 #line 93 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	DATA_VIEW_GET_CLASS (self)->notify_view_altered (self);
-#line 484 "DataView.c"
+#line 493 "DataView.c"
 }
 
 
 static void data_view_real_notify_geometry_altered (DataView* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	ViewCollection* vc = NULL;
-	DataCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
+	DataCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
 #line 112 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp0_ = self->priv->visible;
 #line 112 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	if (!_tmp0_) {
 #line 113 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		return;
-#line 500 "DataView.c"
+#line 509 "DataView.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp1_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
@@ -506,7 +515,7 @@ static void data_view_real_notify_geometry_altered (DataView* self) {
 	if (_tmp2_ == NULL) {
 #line 115 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 510 "DataView.c"
+#line 519 "DataView.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	vc = _tmp2_;
@@ -514,10 +523,10 @@ static void data_view_real_notify_geometry_altered (DataView* self) {
 	_tmp3_ = vc;
 #line 116 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	if (_tmp3_ != NULL) {
-#line 518 "DataView.c"
-		ViewCollection* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		ViewCollection* _tmp6_ = NULL;
+#line 527 "DataView.c"
+		ViewCollection* _tmp4_;
+		gboolean _tmp5_;
+		ViewCollection* _tmp6_;
 #line 117 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		_tmp4_ = vc;
 #line 117 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -525,22 +534,22 @@ static void data_view_real_notify_geometry_altered (DataView* self) {
 #line 117 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		if (!_tmp5_) {
 #line 118 "/home/jens/Source/shotwell/src/core/DataView.vala"
-			g_signal_emit_by_name (self, "geometry-altered");
-#line 530 "DataView.c"
+			g_signal_emit (self, data_view_signals[DATA_VIEW_GEOMETRY_ALTERED_SIGNAL], 0);
+#line 539 "DataView.c"
 		}
 #line 121 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		_tmp6_ = vc;
 #line 121 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		view_collection_internal_notify_geometry_altered (_tmp6_, self);
-#line 536 "DataView.c"
+#line 545 "DataView.c"
 	} else {
 #line 123 "/home/jens/Source/shotwell/src/core/DataView.vala"
-		g_signal_emit_by_name (self, "geometry-altered");
-#line 540 "DataView.c"
+		g_signal_emit (self, data_view_signals[DATA_VIEW_GEOMETRY_ALTERED_SIGNAL], 0);
+#line 549 "DataView.c"
 	}
 #line 110 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_data_collection_unref0 (vc);
-#line 544 "DataView.c"
+#line 553 "DataView.c"
 }
 
 
@@ -549,19 +558,19 @@ void data_view_notify_geometry_altered (DataView* self) {
 	g_return_if_fail (IS_DATA_VIEW (self));
 #line 110 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	DATA_VIEW_GET_CLASS (self)->notify_geometry_altered (self);
-#line 553 "DataView.c"
+#line 562 "DataView.c"
 }
 
 
 static void data_view_real_notify_unsubscribed (DataView* self, DataSource* source) {
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 128 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
 #line 129 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp0_ = source;
 #line 129 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	g_signal_emit_by_name (self, "unsubscribed", _tmp0_);
-#line 565 "DataView.c"
+	g_signal_emit (self, data_view_signals[DATA_VIEW_UNSUBSCRIBED_SIGNAL], 0, _tmp0_);
+#line 574 "DataView.c"
 }
 
 
@@ -570,7 +579,7 @@ void data_view_notify_unsubscribed (DataView* self, DataSource* source) {
 	g_return_if_fail (IS_DATA_VIEW (self));
 #line 128 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	DATA_VIEW_GET_CLASS (self)->notify_unsubscribed (self, source);
-#line 574 "DataView.c"
+#line 583 "DataView.c"
 }
 
 
@@ -593,7 +602,7 @@ static void data_view_real_geometry_altered (DataView* self) {
 static void data_view_real_unsubscribed (DataView* self, DataSource* source) {
 #line 29 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
-#line 597 "DataView.c"
+#line 606 "DataView.c"
 }
 
 
@@ -603,15 +612,15 @@ static void data_view_class_init (DataViewClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_type_class_add_private (klass, sizeof (DataViewPrivate));
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) data_view_real_get_name;
+	((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) data_view_real_get_name;
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) data_view_real_to_string;
+	((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) data_view_real_to_string;
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	((DataViewClass *) klass)->notify_view_altered = (void (*)(DataView*)) data_view_real_notify_view_altered;
+	((DataViewClass *) klass)->notify_view_altered = (void (*) (DataView *)) data_view_real_notify_view_altered;
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	((DataViewClass *) klass)->notify_geometry_altered = (void (*)(DataView*)) data_view_real_notify_geometry_altered;
+	((DataViewClass *) klass)->notify_geometry_altered = (void (*) (DataView *)) data_view_real_notify_geometry_altered;
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	((DataViewClass *) klass)->notify_unsubscribed = (void (*)(DataView*, DataSource*)) data_view_real_notify_unsubscribed;
+	((DataViewClass *) klass)->notify_unsubscribed = (void (*) (DataView *, DataSource*)) data_view_real_notify_unsubscribed;
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	((DataViewClass *) klass)->state_changed = data_view_real_state_changed;
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -625,16 +634,16 @@ static void data_view_class_init (DataViewClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_view_finalize;
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	g_signal_new ("state_changed", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, state_changed), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+	data_view_signals[DATA_VIEW_STATE_CHANGED_SIGNAL] = g_signal_new ("state-changed", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, state_changed), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	g_signal_new ("visibility_changed", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, visibility_changed), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+	data_view_signals[DATA_VIEW_VISIBILITY_CHANGED_SIGNAL] = g_signal_new ("visibility-changed", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, visibility_changed), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	g_signal_new ("view_altered", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, view_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	data_view_signals[DATA_VIEW_VIEW_ALTERED_SIGNAL] = g_signal_new ("view-altered", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, view_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	g_signal_new ("geometry_altered", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, geometry_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	data_view_signals[DATA_VIEW_GEOMETRY_ALTERED_SIGNAL] = g_signal_new ("geometry-altered", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, geometry_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	g_signal_new ("unsubscribed", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, unsubscribed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE);
-#line 638 "DataView.c"
+	data_view_signals[DATA_VIEW_UNSUBSCRIBED_SIGNAL] = g_signal_new ("unsubscribed", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, unsubscribed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE);
+#line 647 "DataView.c"
 }
 
 
@@ -645,13 +654,13 @@ static void data_view_instance_init (DataView * self) {
 	self->priv->selected = FALSE;
 #line 10 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	self->priv->visible = TRUE;
-#line 649 "DataView.c"
+#line 658 "DataView.c"
 }
 
 
-static void data_view_finalize (GObject* obj) {
+static void data_view_finalize (GObject * obj) {
 	DataView * self;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_VIEW, DataView);
 #line 44 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -662,7 +671,7 @@ static void data_view_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->source);
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	G_OBJECT_CLASS (data_view_parent_class)->finalize (obj);
-#line 666 "DataView.c"
+#line 675 "DataView.c"
 }
 
 
diff --git a/src/core/DataViewTypes.c b/src/core/DataViewTypes.c
index 806bca2..c1ae9e3 100644
--- a/src/core/DataViewTypes.c
+++ b/src/core/DataViewTypes.c
@@ -1,4 +1,4 @@
-/* DataViewTypes.c generated by valac 0.34.7, the Vala compiler
+/* DataViewTypes.c generated by valac 0.36.6, the Vala compiler
  * generated from DataViewTypes.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -85,6 +85,11 @@ typedef struct _ThumbnailViewPrivate ThumbnailViewPrivate;
 
 typedef struct _ThumbnailSource ThumbnailSource;
 typedef struct _ThumbnailSourceClass ThumbnailSourceClass;
+enum  {
+	THUMBNAIL_VIEW_THUMBNAIL_ALTERED_SIGNAL,
+	THUMBNAIL_VIEW_LAST_SIGNAL
+};
+static guint thumbnail_view_signals[THUMBNAIL_VIEW_LAST_SIGNAL] = {0};
 
 #define TYPE_PHOTO_VIEW (photo_view_get_type ())
 #define PHOTO_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_VIEW, PhotoView))
@@ -294,7 +299,7 @@ EventSource* event_view_get_event_source (EventView* self);
 
 ThumbnailView* thumbnail_view_construct (GType object_type, ThumbnailSource* source) {
 	ThumbnailView * self = NULL;
-	ThumbnailSource* _tmp0_ = NULL;
+	ThumbnailSource* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	g_return_val_if_fail (IS_THUMBNAIL_SOURCE (source), NULL);
 #line 12 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
@@ -303,21 +308,21 @@ ThumbnailView* thumbnail_view_construct (GType object_type, ThumbnailSource* sou
 	self = (ThumbnailView*) data_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource));
 #line 11 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	return self;
-#line 307 "DataViewTypes.c"
+#line 312 "DataViewTypes.c"
 }
 
 
 ThumbnailView* thumbnail_view_new (ThumbnailSource* source) {
 #line 11 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	return thumbnail_view_construct (TYPE_THUMBNAIL_VIEW, source);
-#line 314 "DataViewTypes.c"
+#line 319 "DataViewTypes.c"
 }
 
 
 static void thumbnail_view_real_notify_thumbnail_altered (ThumbnailView* self) {
 #line 17 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
-	g_signal_emit_by_name (self, "thumbnail-altered");
-#line 321 "DataViewTypes.c"
+	g_signal_emit (self, thumbnail_view_signals[THUMBNAIL_VIEW_THUMBNAIL_ALTERED_SIGNAL], 0);
+#line 326 "DataViewTypes.c"
 }
 
 
@@ -326,7 +331,7 @@ void thumbnail_view_notify_thumbnail_altered (ThumbnailView* self) {
 	g_return_if_fail (IS_THUMBNAIL_VIEW (self));
 #line 15 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	THUMBNAIL_VIEW_GET_CLASS (self)->notify_thumbnail_altered (self);
-#line 330 "DataViewTypes.c"
+#line 335 "DataViewTypes.c"
 }
 
 
@@ -338,12 +343,12 @@ static void thumbnail_view_class_init (ThumbnailViewClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	thumbnail_view_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
-	((ThumbnailViewClass *) klass)->notify_thumbnail_altered = (void (*)(ThumbnailView*)) thumbnail_view_real_notify_thumbnail_altered;
+	((ThumbnailViewClass *) klass)->notify_thumbnail_altered = (void (*) (ThumbnailView *)) thumbnail_view_real_notify_thumbnail_altered;
 #line 7 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	((ThumbnailViewClass *) klass)->thumbnail_altered = thumbnail_view_real_thumbnail_altered;
 #line 7 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
-	g_signal_new ("thumbnail_altered", TYPE_THUMBNAIL_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ThumbnailViewClass, thumbnail_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 347 "DataViewTypes.c"
+	thumbnail_view_signals[THUMBNAIL_VIEW_THUMBNAIL_ALTERED_SIGNAL] = g_signal_new ("thumbnail-altered", TYPE_THUMBNAIL_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ThumbnailViewClass, thumbnail_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 352 "DataViewTypes.c"
 }
 
 
@@ -365,7 +370,7 @@ GType thumbnail_view_get_type (void) {
 
 PhotoView* photo_view_construct (GType object_type, PhotoSource* source) {
 	PhotoView * self = NULL;
-	PhotoSource* _tmp0_ = NULL;
+	PhotoSource* _tmp0_;
 #line 22 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	g_return_val_if_fail (IS_PHOTO_SOURCE (source), NULL);
 #line 23 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
@@ -374,20 +379,20 @@ PhotoView* photo_view_construct (GType object_type, PhotoSource* source) {
 	self = (PhotoView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
 #line 22 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	return self;
-#line 378 "DataViewTypes.c"
+#line 383 "DataViewTypes.c"
 }
 
 
 PhotoView* photo_view_new (PhotoSource* source) {
 #line 22 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	return photo_view_construct (TYPE_PHOTO_VIEW, source);
-#line 385 "DataViewTypes.c"
+#line 390 "DataViewTypes.c"
 }
 
 
 PhotoSource* photo_view_get_photo_source (PhotoView* self) {
 	PhotoSource* result = NULL;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 26 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	g_return_val_if_fail (IS_PHOTO_VIEW (self), NULL);
 #line 27 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
@@ -396,14 +401,14 @@ PhotoSource* photo_view_get_photo_source (PhotoView* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_SOURCE, PhotoSource);
 #line 27 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	return result;
-#line 400 "DataViewTypes.c"
+#line 405 "DataViewTypes.c"
 }
 
 
 static void photo_view_class_init (PhotoViewClass * klass) {
 #line 21 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	photo_view_parent_class = g_type_class_peek_parent (klass);
-#line 407 "DataViewTypes.c"
+#line 412 "DataViewTypes.c"
 }
 
 
@@ -425,7 +430,7 @@ GType photo_view_get_type (void) {
 
 VideoView* video_view_construct (GType object_type, VideoSource* source) {
 	VideoView * self = NULL;
-	VideoSource* _tmp0_ = NULL;
+	VideoSource* _tmp0_;
 #line 32 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE (source), NULL);
 #line 33 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
@@ -434,20 +439,20 @@ VideoView* video_view_construct (GType object_type, VideoSource* source) {
 	self = (VideoView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
 #line 32 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	return self;
-#line 438 "DataViewTypes.c"
+#line 443 "DataViewTypes.c"
 }
 
 
 VideoView* video_view_new (VideoSource* source) {
 #line 32 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	return video_view_construct (TYPE_VIDEO_VIEW, source);
-#line 445 "DataViewTypes.c"
+#line 450 "DataViewTypes.c"
 }
 
 
 VideoSource* video_view_get_video_source (VideoView* self) {
 	VideoSource* result = NULL;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 36 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	g_return_val_if_fail (IS_VIDEO_VIEW (self), NULL);
 #line 37 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
@@ -456,14 +461,14 @@ VideoSource* video_view_get_video_source (VideoView* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO_SOURCE, VideoSource);
 #line 37 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	return result;
-#line 460 "DataViewTypes.c"
+#line 465 "DataViewTypes.c"
 }
 
 
 static void video_view_class_init (VideoViewClass * klass) {
 #line 31 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	video_view_parent_class = g_type_class_peek_parent (klass);
-#line 467 "DataViewTypes.c"
+#line 472 "DataViewTypes.c"
 }
 
 
@@ -485,7 +490,7 @@ GType video_view_get_type (void) {
 
 EventView* event_view_construct (GType object_type, EventSource* source) {
 	EventView * self = NULL;
-	EventSource* _tmp0_ = NULL;
+	EventSource* _tmp0_;
 #line 42 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	g_return_val_if_fail (IS_EVENT_SOURCE (source), NULL);
 #line 43 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
@@ -494,20 +499,20 @@ EventView* event_view_construct (GType object_type, EventSource* source) {
 	self = (EventView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
 #line 42 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	return self;
-#line 498 "DataViewTypes.c"
+#line 503 "DataViewTypes.c"
 }
 
 
 EventView* event_view_new (EventSource* source) {
 #line 42 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	return event_view_construct (TYPE_EVENT_VIEW, source);
-#line 505 "DataViewTypes.c"
+#line 510 "DataViewTypes.c"
 }
 
 
 EventSource* event_view_get_event_source (EventView* self) {
 	EventSource* result = NULL;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 46 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	g_return_val_if_fail (IS_EVENT_VIEW (self), NULL);
 #line 47 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
@@ -516,14 +521,14 @@ EventSource* event_view_get_event_source (EventView* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource);
 #line 47 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	return result;
-#line 520 "DataViewTypes.c"
+#line 525 "DataViewTypes.c"
 }
 
 
 static void event_view_class_init (EventViewClass * klass) {
 #line 41 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
 	event_view_parent_class = g_type_class_peek_parent (klass);
-#line 527 "DataViewTypes.c"
+#line 532 "DataViewTypes.c"
 }
 
 
diff --git a/src/core/DatabaseSourceCollection.c b/src/core/DatabaseSourceCollection.c
index d21ab1b..192d771 100644
--- a/src/core/DatabaseSourceCollection.c
+++ b/src/core/DatabaseSourceCollection.c
@@ -1,4 +1,4 @@
-/* DatabaseSourceCollection.c generated by valac 0.34.7, the Vala compiler
+/* DatabaseSourceCollection.c generated by valac 0.36.6, the Vala compiler
  * generated from DatabaseSourceCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -295,7 +295,7 @@ void data_collection_notify_items_added (DataCollection* self, GeeIterable* adde
 static void database_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed);
 void data_collection_notify_items_removed (DataCollection* self, GeeIterable* removed);
 DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key);
-static void database_source_collection_finalize (DataCollection* obj);
+static void database_source_collection_finalize (DataCollection * obj);
 gpointer source_holding_tank_ref (gpointer instance);
 void source_holding_tank_unref (gpointer instance);
 GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -315,7 +315,7 @@ SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceColle
 DataSource* database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* self, gint64 id);
 static void database_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed);
 void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed);
-static void database_source_holding_tank_finalize (SourceHoldingTank* obj);
+static void database_source_holding_tank_finalize (SourceHoldingTank * obj);
 
 
 static guint _int64_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
@@ -350,9 +350,9 @@ static gint64* _int64_dup (gint64* self) {
 
 DatabaseSourceCollection* database_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target) {
 	DatabaseSourceCollection* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	GetSourceDatabaseKey _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
+	const gchar* _tmp0_;
+	GetSourceDatabaseKey _tmp1_;
+	void* _tmp1__target;
 #line 20 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 21 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -382,7 +382,7 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static void database_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added) {
 	DatabaseSourceCollection * self;
-	GeeIterable* _tmp17_ = NULL;
+	GeeIterable* _tmp17_;
 #line 26 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection);
 #line 26 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -390,8 +390,8 @@ static void database_source_collection_real_notify_items_added (DataCollection*
 #line 391 "DatabaseSourceCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 		_tmp0_ = added;
 #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -401,25 +401,25 @@ static void database_source_collection_real_notify_items_added (DataCollection*
 #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 		while (TRUE) {
 #line 404 "DatabaseSourceCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			DataSource* source = NULL;
-			DataObject* _tmp6_ = NULL;
-			DataSource* _tmp7_ = NULL;
+			DataObject* _tmp6_;
+			DataSource* _tmp7_;
 			gint64 key = 0LL;
-			GetSourceDatabaseKey _tmp8_ = NULL;
-			void* _tmp8__target = NULL;
-			DataSource* _tmp9_ = NULL;
-			gint64 _tmp10_ = 0LL;
-			GeeHashMap* _tmp11_ = NULL;
-			gint64 _tmp12_ = 0LL;
-			gboolean _tmp13_ = FALSE;
-			GeeHashMap* _tmp14_ = NULL;
-			gint64 _tmp15_ = 0LL;
-			DataSource* _tmp16_ = NULL;
+			GetSourceDatabaseKey _tmp8_;
+			void* _tmp8__target;
+			DataSource* _tmp9_;
+			gint64 _tmp10_;
+			GeeHashMap* _tmp11_;
+			gint64 _tmp12_;
+			gboolean _tmp13_;
+			GeeHashMap* _tmp14_;
+			gint64 _tmp15_;
+			DataSource* _tmp16_;
 #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 			_tmp2_ = _object_it;
 #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -488,7 +488,7 @@ static void database_source_collection_real_notify_items_added (DataCollection*
 
 static void database_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) {
 	DatabaseSourceCollection * self;
-	GeeIterable* _tmp13_ = NULL;
+	GeeIterable* _tmp13_;
 #line 39 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection);
 #line 39 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -496,8 +496,8 @@ static void database_source_collection_real_notify_items_removed (DataCollection
 #line 497 "DatabaseSourceCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 		_tmp0_ = removed;
 #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -507,21 +507,21 @@ static void database_source_collection_real_notify_items_removed (DataCollection
 #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 		while (TRUE) {
 #line 510 "DatabaseSourceCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			gint64 key = 0LL;
-			GetSourceDatabaseKey _tmp6_ = NULL;
-			void* _tmp6__target = NULL;
-			DataObject* _tmp7_ = NULL;
-			gint64 _tmp8_ = 0LL;
+			GetSourceDatabaseKey _tmp6_;
+			void* _tmp6__target;
+			DataObject* _tmp7_;
+			gint64 _tmp8_;
 			gboolean is_removed = FALSE;
-			GeeHashMap* _tmp9_ = NULL;
-			gint64 _tmp10_ = 0LL;
-			gboolean _tmp11_ = FALSE;
-			gboolean _tmp12_ = FALSE;
+			GeeHashMap* _tmp9_;
+			gint64 _tmp10_;
+			gboolean _tmp11_;
+			gboolean _tmp12_;
 #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 			_tmp2_ = _object_it;
 #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -578,9 +578,9 @@ static void database_source_collection_real_notify_items_removed (DataCollection
 
 DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key) {
 	DataSource* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	gint64 _tmp1_;
+	gpointer _tmp2_;
 #line 50 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	g_return_val_if_fail (IS_DATABASE_SOURCE_COLLECTION (self), NULL);
 #line 51 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -605,15 +605,15 @@ static void database_source_collection_class_init (DatabaseSourceCollectionClass
 #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	g_type_class_add_private (klass, sizeof (DatabaseSourceCollectionPrivate));
 #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) database_source_collection_real_notify_items_added;
+	((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) database_source_collection_real_notify_items_added;
 #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) database_source_collection_real_notify_items_removed;
+	((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) database_source_collection_real_notify_items_removed;
 #line 612 "DatabaseSourceCollection.c"
 }
 
 
 static void database_source_collection_instance_init (DatabaseSourceCollection * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self->priv = DATABASE_SOURCE_COLLECTION_GET_PRIVATE (self);
 #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -624,7 +624,7 @@ static void database_source_collection_instance_init (DatabaseSourceCollection *
 }
 
 
-static void database_source_collection_finalize (DataCollection* obj) {
+static void database_source_collection_finalize (DataCollection * obj) {
 	DatabaseSourceCollection * self;
 #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection);
@@ -650,11 +650,11 @@ GType database_source_collection_get_type (void) {
 
 DatabaseSourceHoldingTank* database_source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) {
 	DatabaseSourceHoldingTank* self = NULL;
-	SourceCollection* _tmp0_ = NULL;
-	SourceHoldingTankCheckToKeep _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	GetSourceDatabaseKey _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
+	SourceCollection* _tmp0_;
+	SourceHoldingTankCheckToKeep _tmp1_;
+	void* _tmp1__target;
+	GetSourceDatabaseKey _tmp2_;
+	void* _tmp2__target;
 #line 60 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL);
 #line 62 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -688,9 +688,9 @@ DatabaseSourceHoldingTank* database_source_holding_tank_new (SourceCollection* s
 
 DataSource* database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* self, gint64 id) {
 	DataSource* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	gint64 _tmp1_;
+	gpointer _tmp2_;
 #line 67 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	g_return_val_if_fail (IS_DATABASE_SOURCE_HOLDING_TANK (self), NULL);
 #line 68 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -709,10 +709,10 @@ DataSource* database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* s
 
 static void database_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed) {
 	DatabaseSourceHoldingTank * self;
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp12_ = NULL;
-	GeeCollection* _tmp23_ = NULL;
-	GeeCollection* _tmp24_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp12_;
+	GeeCollection* _tmp23_;
+	GeeCollection* _tmp24_;
 #line 71 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTank);
 #line 71 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -726,8 +726,8 @@ static void database_source_holding_tank_real_notify_contents_altered (SourceHol
 #line 727 "DatabaseSourceCollection.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp1_ = NULL;
-			GeeIterator* _tmp2_ = NULL;
+			GeeCollection* _tmp1_;
+			GeeIterator* _tmp2_;
 #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 			_tmp1_ = added;
 #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -737,17 +737,17 @@ static void database_source_holding_tank_real_notify_contents_altered (SourceHol
 #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 			while (TRUE) {
 #line 740 "DatabaseSourceCollection.c"
-				GeeIterator* _tmp3_ = NULL;
-				gboolean _tmp4_ = FALSE;
+				GeeIterator* _tmp3_;
+				gboolean _tmp4_;
 				DataSource* source = NULL;
-				GeeIterator* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
-				GeeHashMap* _tmp7_ = NULL;
-				GetSourceDatabaseKey _tmp8_ = NULL;
-				void* _tmp8__target = NULL;
-				DataSource* _tmp9_ = NULL;
-				gint64 _tmp10_ = 0LL;
-				DataSource* _tmp11_ = NULL;
+				GeeIterator* _tmp5_;
+				gpointer _tmp6_;
+				GeeHashMap* _tmp7_;
+				GetSourceDatabaseKey _tmp8_;
+				void* _tmp8__target;
+				DataSource* _tmp9_;
+				gint64 _tmp10_;
+				DataSource* _tmp11_;
 #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 				_tmp3_ = _source_it;
 #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -794,8 +794,8 @@ static void database_source_holding_tank_real_notify_contents_altered (SourceHol
 #line 795 "DatabaseSourceCollection.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp13_ = NULL;
-			GeeIterator* _tmp14_ = NULL;
+			GeeCollection* _tmp13_;
+			GeeIterator* _tmp14_;
 #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 			_tmp13_ = removed;
 #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -805,16 +805,16 @@ static void database_source_holding_tank_real_notify_contents_altered (SourceHol
 #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 			while (TRUE) {
 #line 808 "DatabaseSourceCollection.c"
-				GeeIterator* _tmp15_ = NULL;
-				gboolean _tmp16_ = FALSE;
+				GeeIterator* _tmp15_;
+				gboolean _tmp16_;
 				DataSource* source = NULL;
-				GeeIterator* _tmp17_ = NULL;
-				gpointer _tmp18_ = NULL;
-				GeeHashMap* _tmp19_ = NULL;
-				GetSourceDatabaseKey _tmp20_ = NULL;
-				void* _tmp20__target = NULL;
-				DataSource* _tmp21_ = NULL;
-				gint64 _tmp22_ = 0LL;
+				GeeIterator* _tmp17_;
+				gpointer _tmp18_;
+				GeeHashMap* _tmp19_;
+				GetSourceDatabaseKey _tmp20_;
+				void* _tmp20__target;
+				DataSource* _tmp21_;
+				gint64 _tmp22_;
 #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 				_tmp15_ = _source_it;
 #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -870,13 +870,13 @@ static void database_source_holding_tank_class_init (DatabaseSourceHoldingTankCl
 #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	g_type_class_add_private (klass, sizeof (DatabaseSourceHoldingTankPrivate));
 #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*)(SourceHoldingTank*, GeeCollection*, GeeCollection*)) database_source_holding_tank_real_notify_contents_altered;
+	((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) database_source_holding_tank_real_notify_contents_altered;
 #line 875 "DatabaseSourceCollection.c"
 }
 
 
 static void database_source_holding_tank_instance_init (DatabaseSourceHoldingTank * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self->priv = DATABASE_SOURCE_HOLDING_TANK_GET_PRIVATE (self);
 #line 57 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -887,7 +887,7 @@ static void database_source_holding_tank_instance_init (DatabaseSourceHoldingTan
 }
 
 
-static void database_source_holding_tank_finalize (SourceHoldingTank* obj) {
+static void database_source_holding_tank_finalize (SourceHoldingTank * obj) {
 	DatabaseSourceHoldingTank * self;
 #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTank);
diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c
index 96c0bfd..0e96c86 100644
--- a/src/core/SourceCollection.c
+++ b/src/core/SourceCollection.c
@@ -1,4 +1,4 @@
-/* SourceCollection.c generated by valac 0.34.7, the Vala compiler
+/* SourceCollection.c generated by valac 0.36.6, the Vala compiler
  * generated from SourceCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -116,6 +116,16 @@ typedef struct _SourceCollectionDestroyCounter SourceCollectionDestroyCounter;
 typedef struct _SourceCollectionDestroyCounterClass SourceCollectionDestroyCounterClass;
 typedef struct _SourceCollectionDestroyCounterPrivate SourceCollectionDestroyCounterPrivate;
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+enum  {
+	SOURCE_COLLECTION_ITEMS_UNLINKING_SIGNAL,
+	SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL,
+	SOURCE_COLLECTION_ITEM_DESTROYED_SIGNAL,
+	SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL,
+	SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL,
+	SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL,
+	SOURCE_COLLECTION_LAST_SIGNAL
+};
+static guint source_collection_signals[SOURCE_COLLECTION_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -321,13 +331,13 @@ static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * clo
 enum  {
 	SOURCE_COLLECTION_DESTROY_COUNTER_DUMMY_PROPERTY
 };
-static void source_collection_destroy_counter_finalize (GObject* obj);
-static void source_collection_finalize (DataCollection* obj);
+static void source_collection_destroy_counter_finalize (GObject * obj);
+static void source_collection_finalize (DataCollection * obj);
 
 
 SourceCollection* source_collection_construct (GType object_type, const gchar* name) {
 	SourceCollection* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 50 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 51 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -336,7 +346,7 @@ SourceCollection* source_collection_construct (GType object_type, const gchar* n
 	self = (SourceCollection*) data_collection_construct (object_type, _tmp0_);
 #line 50 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return self;
-#line 340 "SourceCollection.c"
+#line 350 "SourceCollection.c"
 }
 
 
@@ -346,7 +356,7 @@ static gboolean source_collection_real_holds_type_of_source (SourceCollection* s
 	g_critical ("Type `%s' does not implement abstract method `source_collection_holds_type_of_source'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return _tmp0_;
-#line 350 "SourceCollection.c"
+#line 360 "SourceCollection.c"
 }
 
 
@@ -355,19 +365,19 @@ gboolean source_collection_holds_type_of_source (SourceCollection* self, DataSou
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE);
 #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return SOURCE_COLLECTION_GET_CLASS (self)->holds_type_of_source (self, source);
-#line 359 "SourceCollection.c"
+#line 369 "SourceCollection.c"
 }
 
 
 static void source_collection_real_notify_items_unlinking (SourceCollection* self, GeeCollection* unlinking) {
-	GeeCollection* _tmp0_ = NULL;
+	GeeCollection* _tmp0_;
 #line 56 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (unlinking));
 #line 57 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp0_ = unlinking;
 #line 57 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	g_signal_emit_by_name (self, "items-unlinking", _tmp0_);
-#line 371 "SourceCollection.c"
+	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_UNLINKING_SIGNAL], 0, _tmp0_);
+#line 381 "SourceCollection.c"
 }
 
 
@@ -376,19 +386,19 @@ void source_collection_notify_items_unlinking (SourceCollection* self, GeeCollec
 	g_return_if_fail (IS_SOURCE_COLLECTION (self));
 #line 56 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	SOURCE_COLLECTION_GET_CLASS (self)->notify_items_unlinking (self, unlinking);
-#line 380 "SourceCollection.c"
+#line 390 "SourceCollection.c"
 }
 
 
 static void source_collection_real_notify_items_relinked (SourceCollection* self, GeeCollection* relinked) {
-	GeeCollection* _tmp0_ = NULL;
+	GeeCollection* _tmp0_;
 #line 60 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (relinked));
 #line 61 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp0_ = relinked;
 #line 61 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	g_signal_emit_by_name (self, "items-relinked", _tmp0_);
-#line 392 "SourceCollection.c"
+	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL], 0, _tmp0_);
+#line 402 "SourceCollection.c"
 }
 
 
@@ -397,19 +407,19 @@ void source_collection_notify_items_relinked (SourceCollection* self, GeeCollect
 	g_return_if_fail (IS_SOURCE_COLLECTION (self));
 #line 60 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	SOURCE_COLLECTION_GET_CLASS (self)->notify_items_relinked (self, relinked);
-#line 401 "SourceCollection.c"
+#line 411 "SourceCollection.c"
 }
 
 
 static void source_collection_real_notify_item_destroyed (SourceCollection* self, DataSource* source) {
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 64 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
 #line 65 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp0_ = source;
 #line 65 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	g_signal_emit_by_name (self, "item-destroyed", _tmp0_);
-#line 413 "SourceCollection.c"
+	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEM_DESTROYED_SIGNAL], 0, _tmp0_);
+#line 423 "SourceCollection.c"
 }
 
 
@@ -418,19 +428,19 @@ void source_collection_notify_item_destroyed (SourceCollection* self, DataSource
 	g_return_if_fail (IS_SOURCE_COLLECTION (self));
 #line 64 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	SOURCE_COLLECTION_GET_CLASS (self)->notify_item_destroyed (self, source);
-#line 422 "SourceCollection.c"
+#line 432 "SourceCollection.c"
 }
 
 
 static void source_collection_real_notify_items_destroyed (SourceCollection* self, GeeCollection* destroyed) {
-	GeeCollection* _tmp0_ = NULL;
+	GeeCollection* _tmp0_;
 #line 68 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (destroyed));
 #line 69 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp0_ = destroyed;
 #line 69 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	g_signal_emit_by_name (self, "items-destroyed", _tmp0_);
-#line 434 "SourceCollection.c"
+	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL], 0, _tmp0_);
+#line 444 "SourceCollection.c"
 }
 
 
@@ -439,19 +449,19 @@ void source_collection_notify_items_destroyed (SourceCollection* self, GeeCollec
 	g_return_if_fail (IS_SOURCE_COLLECTION (self));
 #line 68 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	SOURCE_COLLECTION_GET_CLASS (self)->notify_items_destroyed (self, destroyed);
-#line 443 "SourceCollection.c"
+#line 453 "SourceCollection.c"
 }
 
 
 static void source_collection_real_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked) {
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 73 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_if_fail (IS_DATA_SOURCE (unlinked));
 #line 74 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp0_ = unlinked;
 #line 74 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	g_signal_emit_by_name (self, "unlinked-destroyed", _tmp0_);
-#line 455 "SourceCollection.c"
+	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL], 0, _tmp0_);
+#line 465 "SourceCollection.c"
 }
 
 
@@ -460,13 +470,13 @@ void source_collection_notify_unlinked_destroyed (SourceCollection* self, DataSo
 	g_return_if_fail (IS_SOURCE_COLLECTION (self));
 #line 73 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	SOURCE_COLLECTION_GET_CLASS (self)->notify_unlinked_destroyed (self, unlinked);
-#line 464 "SourceCollection.c"
+#line 474 "SourceCollection.c"
 }
 
 
 static void source_collection_real_notify_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources) {
-	SourceBacklink* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	SourceBacklink* _tmp0_;
+	GeeCollection* _tmp1_;
 #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_if_fail (IS_SOURCE_BACKLINK (backlink));
 #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -476,8 +486,8 @@ static void source_collection_real_notify_backlink_removed (SourceCollection* se
 #line 79 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp1_ = sources;
 #line 79 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	g_signal_emit_by_name (self, "backlink-removed", _tmp0_, _tmp1_);
-#line 481 "SourceCollection.c"
+	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 491 "SourceCollection.c"
 }
 
 
@@ -486,14 +496,14 @@ void source_collection_notify_backlink_removed (SourceCollection* self, SourceBa
 	g_return_if_fail (IS_SOURCE_COLLECTION (self));
 #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	SOURCE_COLLECTION_GET_CLASS (self)->notify_backlink_removed (self, backlink, sources);
-#line 490 "SourceCollection.c"
+#line 500 "SourceCollection.c"
 }
 
 
 static gboolean source_collection_real_valid_type (DataCollection* base, DataObject* object) {
 	SourceCollection * self;
 	gboolean result = FALSE;
-	DataObject* _tmp0_ = NULL;
+	DataObject* _tmp0_;
 #line 82 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SOURCE_COLLECTION, SourceCollection);
 #line 82 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -504,7 +514,7 @@ static gboolean source_collection_real_valid_type (DataCollection* base, DataObj
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DATA_SOURCE);
 #line 83 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return result;
-#line 508 "SourceCollection.c"
+#line 518 "SourceCollection.c"
 }
 
 
@@ -513,7 +523,7 @@ static gboolean _source_collection_destroy_and_delete_source_marked_action (Data
 	result = source_collection_destroy_and_delete_source ((SourceCollection*) self, object, user);
 #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return result;
-#line 517 "SourceCollection.c"
+#line 527 "SourceCollection.c"
 }
 
 
@@ -522,34 +532,34 @@ static gboolean _source_collection_destroy_source_marked_action (DataObject* obj
 	result = source_collection_destroy_source ((SourceCollection*) self, object, user);
 #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return result;
-#line 526 "SourceCollection.c"
+#line 536 "SourceCollection.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 533 "SourceCollection.c"
+#line 543 "SourceCollection.c"
 }
 
 
 gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed) {
 	gint result = 0;
 	SourceCollectionDestroyCounter* counter = NULL;
-	Marker* _tmp0_ = NULL;
-	Marker* _tmp1_ = NULL;
-	SourceCollectionDestroyCounter* _tmp2_ = NULL;
-	SourceCollectionDestroyCounter* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	SourceCollectionDestroyCounter* _tmp24_ = NULL;
-	GeeArrayList* _tmp25_ = NULL;
-	SourceCollectionDestroyCounter* _tmp26_ = NULL;
-	Marker* _tmp27_ = NULL;
-	GeeList* _tmp28_ = NULL;
-	SourceCollectionDestroyCounter* _tmp32_ = NULL;
-	GeeArrayList* _tmp33_ = NULL;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
+	Marker* _tmp0_;
+	Marker* _tmp1_;
+	SourceCollectionDestroyCounter* _tmp2_;
+	SourceCollectionDestroyCounter* _tmp3_;
+	gboolean _tmp4_;
+	SourceCollectionDestroyCounter* _tmp24_;
+	GeeArrayList* _tmp25_;
+	SourceCollectionDestroyCounter* _tmp26_;
+	Marker* _tmp27_;
+	GeeList* _tmp28_;
+	SourceCollectionDestroyCounter* _tmp32_;
+	GeeArrayList* _tmp33_;
+	gint _tmp34_;
+	gint _tmp35_;
 #line 88 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (self), 0);
 #line 88 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -572,11 +582,11 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g
 	_tmp4_ = delete_backing;
 #line 92 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	if (_tmp4_) {
-#line 576 "SourceCollection.c"
-		Marker* _tmp5_ = NULL;
-		ProgressMonitor _tmp6_ = NULL;
-		void* _tmp6__target = NULL;
-		SourceCollectionDestroyCounter* _tmp7_ = NULL;
+#line 586 "SourceCollection.c"
+		Marker* _tmp5_;
+		ProgressMonitor _tmp6_;
+		void* _tmp6__target;
+		SourceCollectionDestroyCounter* _tmp7_;
 #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp5_ = marker;
 #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -587,12 +597,12 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g
 		_tmp7_ = counter;
 #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp5_, _source_collection_destroy_and_delete_source_marked_action, self, _tmp6_, _tmp6__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, G_TYPE_OBJECT, GObject));
-#line 591 "SourceCollection.c"
+#line 601 "SourceCollection.c"
 	} else {
-		Marker* _tmp8_ = NULL;
-		ProgressMonitor _tmp9_ = NULL;
-		void* _tmp9__target = NULL;
-		SourceCollectionDestroyCounter* _tmp10_ = NULL;
+		Marker* _tmp8_;
+		ProgressMonitor _tmp9_;
+		void* _tmp9__target;
+		SourceCollectionDestroyCounter* _tmp10_;
 #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp8_ = marker;
 #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -603,17 +613,17 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g
 		_tmp10_ = counter;
 #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp8_, _source_collection_destroy_source_marked_action, self, _tmp9_, _tmp9__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, G_TYPE_OBJECT, GObject));
-#line 607 "SourceCollection.c"
+#line 617 "SourceCollection.c"
 	}
 	{
 		GeeArrayList* _source_list = NULL;
-		SourceCollectionDestroyCounter* _tmp11_ = NULL;
-		GeeArrayList* _tmp12_ = NULL;
-		GeeArrayList* _tmp13_ = NULL;
+		SourceCollectionDestroyCounter* _tmp11_;
+		GeeArrayList* _tmp12_;
+		GeeArrayList* _tmp13_;
 		gint _source_size = 0;
-		GeeArrayList* _tmp14_ = NULL;
-		gint _tmp15_ = 0;
-		gint _tmp16_ = 0;
+		GeeArrayList* _tmp14_;
+		gint _tmp15_;
+		gint _tmp16_;
 		gint _source_index = 0;
 #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp11_ = counter;
@@ -635,15 +645,15 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g
 		_source_index = -1;
 #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		while (TRUE) {
-#line 639 "SourceCollection.c"
-			gint _tmp17_ = 0;
-			gint _tmp18_ = 0;
-			gint _tmp19_ = 0;
+#line 649 "SourceCollection.c"
+			gint _tmp17_;
+			gint _tmp18_;
+			gint _tmp19_;
 			DataSource* source = NULL;
-			GeeArrayList* _tmp20_ = NULL;
-			gint _tmp21_ = 0;
-			gpointer _tmp22_ = NULL;
-			DataSource* _tmp23_ = NULL;
+			GeeArrayList* _tmp20_;
+			gint _tmp21_;
+			gpointer _tmp22_;
+			DataSource* _tmp23_;
 #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 			_tmp17_ = _source_index;
 #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -656,7 +666,7 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g
 			if (!(_tmp18_ < _tmp19_)) {
 #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 				break;
-#line 660 "SourceCollection.c"
+#line 670 "SourceCollection.c"
 			}
 #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 			_tmp20_ = _source_list;
@@ -672,11 +682,11 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g
 			source_collection_notify_item_destroyed (self, _tmp23_);
 #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 			_g_object_unref0 (source);
-#line 676 "SourceCollection.c"
+#line 686 "SourceCollection.c"
 		}
 #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_g_object_unref0 (_source_list);
-#line 680 "SourceCollection.c"
+#line 690 "SourceCollection.c"
 	}
 #line 100 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp24_ = counter;
@@ -694,10 +704,10 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g
 	_tmp28_ = not_removed;
 #line 105 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	if (NULL != _tmp28_) {
-#line 698 "SourceCollection.c"
-		GeeList* _tmp29_ = NULL;
-		SourceCollectionDestroyCounter* _tmp30_ = NULL;
-		GeeArrayList* _tmp31_ = NULL;
+#line 708 "SourceCollection.c"
+		GeeList* _tmp29_;
+		SourceCollectionDestroyCounter* _tmp30_;
+		GeeArrayList* _tmp31_;
 #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp29_ = not_removed;
 #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -706,7 +716,7 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g
 		_tmp31_ = _tmp30_->not_removed;
 #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 710 "SourceCollection.c"
+#line 720 "SourceCollection.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp32_ = counter;
@@ -722,7 +732,7 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g
 	_g_object_unref0 (counter);
 #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return result;
-#line 726 "SourceCollection.c"
+#line 736 "SourceCollection.c"
 }
 
 
@@ -730,11 +740,11 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s
 	gboolean result = FALSE;
 	gboolean success = FALSE;
 	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	gboolean _tmp5_;
 	gboolean _tmp10_ = FALSE;
-	DataObject* _tmp11_ = NULL;
-	GObject* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
+	DataObject* _tmp11_;
+	GObject* _tmp12_;
+	gboolean _tmp13_;
 	GError * _inner_error_ = NULL;
 #line 112 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE);
@@ -744,11 +754,11 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s
 	g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);
 #line 113 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	success = FALSE;
-#line 748 "SourceCollection.c"
+#line 758 "SourceCollection.c"
 	{
 		gboolean _tmp0_ = FALSE;
-		DataObject* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+		DataObject* _tmp1_;
+		gboolean _tmp2_;
 #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp1_ = object;
 #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -757,12 +767,12 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s
 		_tmp0_ = _tmp2_;
 #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 761 "SourceCollection.c"
+#line 771 "SourceCollection.c"
 			goto __catch49_g_error;
 		}
 #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		success = _tmp0_;
-#line 766 "SourceCollection.c"
+#line 776 "SourceCollection.c"
 	}
 	goto __finally49;
 	__catch49_g_error:
@@ -776,12 +786,12 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s
 		success = FALSE;
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_g_error_free0 (err);
-#line 780 "SourceCollection.c"
+#line 790 "SourceCollection.c"
 	}
 	__finally49:
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 785 "SourceCollection.c"
+#line 795 "SourceCollection.c"
 		gboolean _tmp3_ = FALSE;
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -789,30 +799,30 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s
 		g_clear_error (&_inner_error_);
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		return _tmp3_;
-#line 793 "SourceCollection.c"
+#line 803 "SourceCollection.c"
 	}
 #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp5_ = success;
 #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	if (!_tmp5_) {
-#line 799 "SourceCollection.c"
-		DataObject* _tmp6_ = NULL;
+#line 809 "SourceCollection.c"
+		DataObject* _tmp6_;
 #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp6_ = object;
 #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_MEDIA_SOURCE);
-#line 805 "SourceCollection.c"
+#line 815 "SourceCollection.c"
 	} else {
 #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp4_ = FALSE;
-#line 809 "SourceCollection.c"
+#line 819 "SourceCollection.c"
 	}
 #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	if (_tmp4_) {
-#line 813 "SourceCollection.c"
-		GObject* _tmp7_ = NULL;
-		GeeArrayList* _tmp8_ = NULL;
-		DataObject* _tmp9_ = NULL;
+#line 823 "SourceCollection.c"
+		GObject* _tmp7_;
+		GeeArrayList* _tmp8_;
+		DataObject* _tmp9_;
 #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp7_ = user;
 #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -821,7 +831,7 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s
 		_tmp9_ = object;
 #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 825 "SourceCollection.c"
+#line 835 "SourceCollection.c"
 	}
 #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp11_ = object;
@@ -831,35 +841,35 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s
 	_tmp13_ = source_collection_destroy_source (self, _tmp11_, _tmp12_);
 #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	if (_tmp13_) {
-#line 835 "SourceCollection.c"
-		gboolean _tmp14_ = FALSE;
+#line 845 "SourceCollection.c"
+		gboolean _tmp14_;
 #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp14_ = success;
 #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp10_ = _tmp14_;
-#line 841 "SourceCollection.c"
+#line 851 "SourceCollection.c"
 	} else {
 #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp10_ = FALSE;
-#line 845 "SourceCollection.c"
+#line 855 "SourceCollection.c"
 	}
 #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	result = _tmp10_;
 #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return result;
-#line 851 "SourceCollection.c"
+#line 861 "SourceCollection.c"
 }
 
 
 static gboolean source_collection_destroy_source (SourceCollection* self, DataObject* object, GObject* user) {
 	gboolean result = FALSE;
 	DataSource* source = NULL;
-	DataObject* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	GObject* _tmp2_ = NULL;
-	Marker* _tmp3_ = NULL;
-	GObject* _tmp4_ = NULL;
-	GeeArrayList* _tmp5_ = NULL;
+	DataObject* _tmp0_;
+	DataSource* _tmp1_;
+	GObject* _tmp2_;
+	Marker* _tmp3_;
+	GObject* _tmp4_;
+	GeeArrayList* _tmp5_;
 #line 127 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE);
 #line 127 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -894,7 +904,7 @@ static gboolean source_collection_destroy_source (SourceCollection* self, DataOb
 	_g_object_unref0 (source);
 #line 136 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return result;
-#line 898 "SourceCollection.c"
+#line 908 "SourceCollection.c"
 }
 
 
@@ -903,7 +913,7 @@ static guint _source_backlink_hash_func_gee_hash_data_func (gconstpointer v, gpo
 	result = source_backlink_hash_func ((SourceBacklink*) v);
 #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return result;
-#line 907 "SourceCollection.c"
+#line 917 "SourceCollection.c"
 }
 
 
@@ -912,15 +922,15 @@ static gboolean _source_backlink_equal_func_gee_equal_data_func (gconstpointer a
 	result = source_backlink_equal_func ((SourceBacklink*) a, (SourceBacklink*) b);
 #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return result;
-#line 916 "SourceCollection.c"
+#line 926 "SourceCollection.c"
 }
 
 
 void source_collection_internal_backlink_set (SourceCollection* self, DataSource* source, SourceBacklink* backlink) {
-	GeeMultiMap* _tmp0_ = NULL;
-	GeeMultiMap* _tmp2_ = NULL;
-	SourceBacklink* _tmp3_ = NULL;
-	DataSource* _tmp4_ = NULL;
+	GeeMultiMap* _tmp0_;
+	GeeMultiMap* _tmp2_;
+	SourceBacklink* _tmp3_;
+	DataSource* _tmp4_;
 #line 140 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_if_fail (IS_SOURCE_COLLECTION (self));
 #line 140 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -931,15 +941,15 @@ void source_collection_internal_backlink_set (SourceCollection* self, DataSource
 	_tmp0_ = self->priv->backlinks;
 #line 141 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	if (_tmp0_ == NULL) {
-#line 935 "SourceCollection.c"
-		GeeHashMultiMap* _tmp1_ = NULL;
+#line 945 "SourceCollection.c"
+		GeeHashMultiMap* _tmp1_;
 #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp1_ = gee_hash_multi_map_new (TYPE_SOURCE_BACKLINK, (GBoxedCopyFunc) source_backlink_ref, (GDestroyNotify) source_backlink_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _source_backlink_hash_func_gee_hash_data_func, NULL, NULL, _source_backlink_equal_func_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_g_object_unref0 (self->priv->backlinks);
 #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		self->priv->backlinks = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 943 "SourceCollection.c"
+#line 953 "SourceCollection.c"
 	}
 #line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp2_ = self->priv->backlinks;
@@ -949,17 +959,17 @@ void source_collection_internal_backlink_set (SourceCollection* self, DataSource
 	_tmp4_ = source;
 #line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	gee_multi_map_set (_tmp2_, _tmp3_, _tmp4_);
-#line 953 "SourceCollection.c"
+#line 963 "SourceCollection.c"
 }
 
 
 void source_collection_internal_backlink_removed (SourceCollection* self, DataSource* source, SourceBacklink* backlink) {
-	GeeMultiMap* _tmp0_ = NULL;
+	GeeMultiMap* _tmp0_;
 	gboolean removed = FALSE;
-	GeeMultiMap* _tmp1_ = NULL;
-	SourceBacklink* _tmp2_ = NULL;
-	DataSource* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GeeMultiMap* _tmp1_;
+	SourceBacklink* _tmp2_;
+	DataSource* _tmp3_;
+	gboolean _tmp4_;
 #line 150 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_if_fail (IS_SOURCE_COLLECTION (self));
 #line 150 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -982,24 +992,24 @@ void source_collection_internal_backlink_removed (SourceCollection* self, DataSo
 	removed = _tmp4_;
 #line 154 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_vala_assert (removed, "removed");
-#line 986 "SourceCollection.c"
+#line 996 "SourceCollection.c"
 }
 
 
 static gboolean source_collection_real_has_backlink (SourceCollection* self, SourceBacklink* backlink) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	GeeMultiMap* _tmp1_ = NULL;
+	GeeMultiMap* _tmp1_;
 #line 157 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_val_if_fail (IS_SOURCE_BACKLINK (backlink), FALSE);
 #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp1_ = self->priv->backlinks;
 #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	if (_tmp1_ != NULL) {
-#line 1000 "SourceCollection.c"
-		GeeMultiMap* _tmp2_ = NULL;
-		SourceBacklink* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+#line 1010 "SourceCollection.c"
+		GeeMultiMap* _tmp2_;
+		SourceBacklink* _tmp3_;
+		gboolean _tmp4_;
 #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp2_ = self->priv->backlinks;
 #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1008,17 +1018,17 @@ static gboolean source_collection_real_has_backlink (SourceCollection* self, Sou
 		_tmp4_ = gee_multi_map_contains (_tmp2_, _tmp3_);
 #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp0_ = _tmp4_;
-#line 1012 "SourceCollection.c"
+#line 1022 "SourceCollection.c"
 	} else {
 #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp0_ = FALSE;
-#line 1016 "SourceCollection.c"
+#line 1026 "SourceCollection.c"
 	}
 #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	result = _tmp0_;
 #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return result;
-#line 1022 "SourceCollection.c"
+#line 1032 "SourceCollection.c"
 }
 
 
@@ -1027,7 +1037,7 @@ gboolean source_collection_has_backlink (SourceCollection* self, SourceBacklink*
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE);
 #line 157 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return SOURCE_COLLECTION_GET_CLASS (self)->has_backlink (self, backlink);
-#line 1031 "SourceCollection.c"
+#line 1041 "SourceCollection.c"
 }
 
 
@@ -1036,25 +1046,25 @@ static gboolean _source_collection_prepare_for_unlink_marked_action (DataObject*
 	result = source_collection_prepare_for_unlink ((SourceCollection*) self, object, user);
 #line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return result;
-#line 1040 "SourceCollection.c"
+#line 1050 "SourceCollection.c"
 }
 
 
 GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* marker, ProgressMonitor monitor, void* monitor_target) {
 	GeeCollection* result = NULL;
 	GeeArrayList* list = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	Marker* _tmp1_ = NULL;
-	ProgressMonitor _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	GeeArrayList* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	GeeArrayList* _tmp7_ = NULL;
-	GeeArrayList* _tmp8_ = NULL;
-	Marker* _tmp9_ = NULL;
-	Marker* _tmp10_ = NULL;
+	GeeArrayList* _tmp0_;
+	Marker* _tmp1_;
+	ProgressMonitor _tmp2_;
+	void* _tmp2__target;
+	GeeArrayList* _tmp3_;
+	GeeArrayList* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	GeeArrayList* _tmp7_;
+	GeeArrayList* _tmp8_;
+	Marker* _tmp9_;
+	Marker* _tmp10_;
 #line 161 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (self), NULL);
 #line 161 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1087,7 +1097,7 @@ GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker*
 		_g_object_unref0 (list);
 #line 166 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		return result;
-#line 1091 "SourceCollection.c"
+#line 1101 "SourceCollection.c"
 	}
 #line 168 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp7_ = list;
@@ -1107,16 +1117,16 @@ GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker*
 	result = G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_COLLECTION, GeeCollection);
 #line 172 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return result;
-#line 1111 "SourceCollection.c"
+#line 1121 "SourceCollection.c"
 }
 
 
 static gboolean source_collection_prepare_for_unlink (SourceCollection* self, DataObject* object, GObject* user) {
 	gboolean result = FALSE;
 	DataSource* source = NULL;
-	DataObject* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	GObject* _tmp2_ = NULL;
+	DataObject* _tmp0_;
+	DataSource* _tmp1_;
+	GObject* _tmp2_;
 #line 175 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE);
 #line 175 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1141,17 +1151,17 @@ static gboolean source_collection_prepare_for_unlink (SourceCollection* self, Da
 	_g_object_unref0 (source);
 #line 181 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return result;
-#line 1145 "SourceCollection.c"
+#line 1155 "SourceCollection.c"
 }
 
 
 void source_collection_relink (SourceCollection* self, DataSource* source) {
-	DataSource* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	DataSource* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
-	DataSource* _tmp5_ = NULL;
+	DataSource* _tmp0_;
+	DataSource* _tmp1_;
+	DataSource* _tmp2_;
+	GeeCollection* _tmp3_;
+	GeeCollection* _tmp4_;
+	DataSource* _tmp5_;
 #line 184 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_if_fail (IS_SOURCE_COLLECTION (self));
 #line 184 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1178,18 +1188,18 @@ void source_collection_relink (SourceCollection* self, DataSource* source) {
 	_tmp5_ = source;
 #line 190 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	data_source_notify_relinked (_tmp5_);
-#line 1182 "SourceCollection.c"
+#line 1192 "SourceCollection.c"
 }
 
 
 void source_collection_relink_many (SourceCollection* self, GeeCollection* relink) {
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	GeeCollection* _tmp10_ = NULL;
-	GeeCollection* _tmp11_ = NULL;
-	GeeCollection* _tmp12_ = NULL;
-	GeeCollection* _tmp13_ = NULL;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	GeeCollection* _tmp10_;
+	GeeCollection* _tmp11_;
+	GeeCollection* _tmp12_;
+	GeeCollection* _tmp13_;
 #line 193 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_if_fail (IS_SOURCE_COLLECTION (self));
 #line 193 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1204,12 +1214,12 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin
 	if (_tmp2_ == 0) {
 #line 195 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		return;
-#line 1208 "SourceCollection.c"
+#line 1218 "SourceCollection.c"
 	}
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
 #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp3_ = relink;
 #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1218,13 +1228,13 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin
 		_source_it = _tmp4_;
 #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		while (TRUE) {
-#line 1222 "SourceCollection.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+#line 1232 "SourceCollection.c"
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
-			DataSource* _tmp9_ = NULL;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			DataSource* _tmp9_;
 #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 			_tmp5_ = _source_it;
 #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1233,7 +1243,7 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin
 			if (!_tmp6_) {
 #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 				break;
-#line 1237 "SourceCollection.c"
+#line 1247 "SourceCollection.c"
 			}
 #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 			_tmp7_ = _source_it;
@@ -1247,11 +1257,11 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin
 			data_source_notify_relinking (_tmp9_, self);
 #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 			_g_object_unref0 (source);
-#line 1251 "SourceCollection.c"
+#line 1261 "SourceCollection.c"
 		}
 #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_g_object_unref0 (_source_it);
-#line 1255 "SourceCollection.c"
+#line 1265 "SourceCollection.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp10_ = relink;
@@ -1265,11 +1275,11 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin
 	_tmp13_ = relink;
 #line 201 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	source_collection_notify_items_relinked (self, _tmp13_);
-#line 1269 "SourceCollection.c"
+#line 1279 "SourceCollection.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp14_ = NULL;
-		GeeIterator* _tmp15_ = NULL;
+		GeeCollection* _tmp14_;
+		GeeIterator* _tmp15_;
 #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp14_ = relink;
 #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1278,13 +1288,13 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin
 		_source_it = _tmp15_;
 #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		while (TRUE) {
-#line 1282 "SourceCollection.c"
-			GeeIterator* _tmp16_ = NULL;
-			gboolean _tmp17_ = FALSE;
+#line 1292 "SourceCollection.c"
+			GeeIterator* _tmp16_;
+			gboolean _tmp17_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp18_ = NULL;
-			gpointer _tmp19_ = NULL;
-			DataSource* _tmp20_ = NULL;
+			GeeIterator* _tmp18_;
+			gpointer _tmp19_;
+			DataSource* _tmp20_;
 #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 			_tmp16_ = _source_it;
 #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1293,7 +1303,7 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin
 			if (!_tmp17_) {
 #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 				break;
-#line 1297 "SourceCollection.c"
+#line 1307 "SourceCollection.c"
 			}
 #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 			_tmp18_ = _source_it;
@@ -1307,26 +1317,26 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin
 			data_source_notify_relinked (_tmp20_);
 #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 			_g_object_unref0 (source);
-#line 1311 "SourceCollection.c"
+#line 1321 "SourceCollection.c"
 		}
 #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_g_object_unref0 (_source_it);
-#line 1315 "SourceCollection.c"
+#line 1325 "SourceCollection.c"
 	}
 }
 
 
 static void source_collection_real_remove_backlink (SourceCollection* self, SourceBacklink* backlink) {
-	GeeMultiMap* _tmp0_ = NULL;
+	GeeMultiMap* _tmp0_;
 	GeeArrayList* sources = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	GeeArrayList* _tmp2_ = NULL;
-	GeeMultiMap* _tmp3_ = NULL;
-	SourceBacklink* _tmp4_ = NULL;
-	GeeCollection* _tmp5_ = NULL;
-	GeeCollection* _tmp6_ = NULL;
-	SourceBacklink* _tmp20_ = NULL;
-	GeeArrayList* _tmp21_ = NULL;
+	GeeArrayList* _tmp1_;
+	GeeArrayList* _tmp2_;
+	GeeMultiMap* _tmp3_;
+	SourceBacklink* _tmp4_;
+	GeeCollection* _tmp5_;
+	GeeCollection* _tmp6_;
+	SourceBacklink* _tmp20_;
+	GeeArrayList* _tmp21_;
 #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_if_fail (IS_SOURCE_BACKLINK (backlink));
 #line 208 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1335,7 +1345,7 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour
 	if (_tmp0_ == NULL) {
 #line 209 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		return;
-#line 1339 "SourceCollection.c"
+#line 1349 "SourceCollection.c"
 	}
 #line 212 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp1_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
@@ -1355,15 +1365,15 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour
 	gee_array_list_add_all (_tmp2_, _tmp6_);
 #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1359 "SourceCollection.c"
+#line 1369 "SourceCollection.c"
 	{
 		GeeArrayList* _source_list = NULL;
-		GeeArrayList* _tmp7_ = NULL;
-		GeeArrayList* _tmp8_ = NULL;
+		GeeArrayList* _tmp7_;
+		GeeArrayList* _tmp8_;
 		gint _source_size = 0;
-		GeeArrayList* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
+		GeeArrayList* _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
 		gint _source_index = 0;
 #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp7_ = sources;
@@ -1383,16 +1393,16 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour
 		_source_index = -1;
 #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		while (TRUE) {
-#line 1387 "SourceCollection.c"
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
-			gint _tmp14_ = 0;
+#line 1397 "SourceCollection.c"
+			gint _tmp12_;
+			gint _tmp13_;
+			gint _tmp14_;
 			DataSource* source = NULL;
-			GeeArrayList* _tmp15_ = NULL;
-			gint _tmp16_ = 0;
-			gpointer _tmp17_ = NULL;
-			DataSource* _tmp18_ = NULL;
-			SourceBacklink* _tmp19_ = NULL;
+			GeeArrayList* _tmp15_;
+			gint _tmp16_;
+			gpointer _tmp17_;
+			DataSource* _tmp18_;
+			SourceBacklink* _tmp19_;
 #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 			_tmp12_ = _source_index;
 #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1405,7 +1415,7 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour
 			if (!(_tmp13_ < _tmp14_)) {
 #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 				break;
-#line 1409 "SourceCollection.c"
+#line 1419 "SourceCollection.c"
 			}
 #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 			_tmp15_ = _source_list;
@@ -1423,11 +1433,11 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour
 			data_source_remove_backlink (_tmp18_, _tmp19_);
 #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 			_g_object_unref0 (source);
-#line 1427 "SourceCollection.c"
+#line 1437 "SourceCollection.c"
 		}
 #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_g_object_unref0 (_source_list);
-#line 1431 "SourceCollection.c"
+#line 1441 "SourceCollection.c"
 	}
 #line 218 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp20_ = backlink;
@@ -1437,7 +1447,7 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour
 	source_collection_notify_backlink_removed (self, _tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_g_object_unref0 (sources);
-#line 1441 "SourceCollection.c"
+#line 1451 "SourceCollection.c"
 }
 
 
@@ -1446,42 +1456,42 @@ void source_collection_remove_backlink (SourceCollection* self, SourceBacklink*
 	g_return_if_fail (IS_SOURCE_COLLECTION (self));
 #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	SOURCE_COLLECTION_GET_CLASS (self)->remove_backlink (self, backlink);
-#line 1450 "SourceCollection.c"
+#line 1460 "SourceCollection.c"
 }
 
 
 static void source_collection_real_items_unlinking (SourceCollection* self, GeeCollection* unlinking) {
 #line 20 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (unlinking));
-#line 1457 "SourceCollection.c"
+#line 1467 "SourceCollection.c"
 }
 
 
 static void source_collection_real_items_relinked (SourceCollection* self, GeeCollection* relinked) {
 #line 25 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (relinked));
-#line 1464 "SourceCollection.c"
+#line 1474 "SourceCollection.c"
 }
 
 
 static void source_collection_real_item_destroyed (SourceCollection* self, DataSource* source) {
 #line 30 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
-#line 1471 "SourceCollection.c"
+#line 1481 "SourceCollection.c"
 }
 
 
 static void source_collection_real_items_destroyed (SourceCollection* self, GeeCollection* destroyed) {
 #line 35 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (destroyed));
-#line 1478 "SourceCollection.c"
+#line 1488 "SourceCollection.c"
 }
 
 
 static void source_collection_real_unlinked_destroyed (SourceCollection* self, DataSource* source) {
 #line 40 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
-#line 1485 "SourceCollection.c"
+#line 1495 "SourceCollection.c"
 }
 
 
@@ -1490,7 +1500,7 @@ static void source_collection_real_backlink_removed (SourceCollection* self, Sou
 	g_return_if_fail (IS_SOURCE_BACKLINK (backlink));
 #line 44 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 1494 "SourceCollection.c"
+#line 1504 "SourceCollection.c"
 }
 
 
@@ -1509,26 +1519,26 @@ static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * clo
 		data1 = closure->data;
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 1513 "SourceCollection.c"
+#line 1523 "SourceCollection.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		data2 = closure->data;
-#line 1519 "SourceCollection.c"
+#line 1529 "SourceCollection.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	callback = (GMarshalFunc_VOID__SOURCE_BACKLINK_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	callback (data1, value_get_source_backlink (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 1525 "SourceCollection.c"
+#line 1535 "SourceCollection.c"
 }
 
 
 static SourceCollectionDestroyCounter* source_collection_destroy_counter_construct (GType object_type, Marker* remove_marker) {
 	SourceCollectionDestroyCounter * self = NULL;
-	Marker* _tmp0_ = NULL;
-	Marker* _tmp1_ = NULL;
+	Marker* _tmp0_;
+	Marker* _tmp1_;
 #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_val_if_fail (IS_MARKER (remove_marker), NULL);
 #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1543,14 +1553,14 @@ static SourceCollectionDestroyCounter* source_collection_destroy_counter_constru
 	self->remove_marker = _tmp1_;
 #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return self;
-#line 1547 "SourceCollection.c"
+#line 1557 "SourceCollection.c"
 }
 
 
 static SourceCollectionDestroyCounter* source_collection_destroy_counter_new (Marker* remove_marker) {
 #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return source_collection_destroy_counter_construct (SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, remove_marker);
-#line 1554 "SourceCollection.c"
+#line 1564 "SourceCollection.c"
 }
 
 
@@ -1559,13 +1569,13 @@ static void source_collection_destroy_counter_class_init (SourceCollectionDestro
 	source_collection_destroy_counter_parent_class = g_type_class_peek_parent (klass);
 #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	G_OBJECT_CLASS (klass)->finalize = source_collection_destroy_counter_finalize;
-#line 1563 "SourceCollection.c"
+#line 1573 "SourceCollection.c"
 }
 
 
 static void source_collection_destroy_counter_instance_init (SourceCollectionDestroyCounter * self) {
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp1_;
 #line 10 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 10 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1574,11 +1584,11 @@ static void source_collection_destroy_counter_instance_init (SourceCollectionDes
 	_tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 11 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	self->not_removed = _tmp1_;
-#line 1578 "SourceCollection.c"
+#line 1588 "SourceCollection.c"
 }
 
 
-static void source_collection_destroy_counter_finalize (GObject* obj) {
+static void source_collection_destroy_counter_finalize (GObject * obj) {
 	SourceCollectionDestroyCounter * self;
 #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter);
@@ -1590,7 +1600,7 @@ static void source_collection_destroy_counter_finalize (GObject* obj) {
 	_g_object_unref0 (self->not_removed);
 #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	G_OBJECT_CLASS (source_collection_destroy_counter_parent_class)->finalize (obj);
-#line 1594 "SourceCollection.c"
+#line 1604 "SourceCollection.c"
 }
 
 
@@ -1614,25 +1624,25 @@ static void source_collection_class_init (SourceCollectionClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_type_class_add_private (klass, sizeof (SourceCollectionPrivate));
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) source_collection_real_holds_type_of_source;
+	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) source_collection_real_holds_type_of_source;
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	((SourceCollectionClass *) klass)->notify_items_unlinking = (void (*)(SourceCollection*, GeeCollection*)) source_collection_real_notify_items_unlinking;
+	((SourceCollectionClass *) klass)->notify_items_unlinking = (void (*) (SourceCollection *, GeeCollection*)) source_collection_real_notify_items_unlinking;
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	((SourceCollectionClass *) klass)->notify_items_relinked = (void (*)(SourceCollection*, GeeCollection*)) source_collection_real_notify_items_relinked;
+	((SourceCollectionClass *) klass)->notify_items_relinked = (void (*) (SourceCollection *, GeeCollection*)) source_collection_real_notify_items_relinked;
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	((SourceCollectionClass *) klass)->notify_item_destroyed = (void (*)(SourceCollection*, DataSource*)) source_collection_real_notify_item_destroyed;
+	((SourceCollectionClass *) klass)->notify_item_destroyed = (void (*) (SourceCollection *, DataSource*)) source_collection_real_notify_item_destroyed;
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	((SourceCollectionClass *) klass)->notify_items_destroyed = (void (*)(SourceCollection*, GeeCollection*)) source_collection_real_notify_items_destroyed;
+	((SourceCollectionClass *) klass)->notify_items_destroyed = (void (*) (SourceCollection *, GeeCollection*)) source_collection_real_notify_items_destroyed;
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	((SourceCollectionClass *) klass)->notify_unlinked_destroyed = (void (*)(SourceCollection*, DataSource*)) source_collection_real_notify_unlinked_destroyed;
+	((SourceCollectionClass *) klass)->notify_unlinked_destroyed = (void (*) (SourceCollection *, DataSource*)) source_collection_real_notify_unlinked_destroyed;
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	((SourceCollectionClass *) klass)->notify_backlink_removed = (void (*)(SourceCollection*, SourceBacklink*, GeeCollection*)) source_collection_real_notify_backlink_removed;
+	((SourceCollectionClass *) klass)->notify_backlink_removed = (void (*) (SourceCollection *, SourceBacklink*, GeeCollection*)) source_collection_real_notify_backlink_removed;
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	((DataCollectionClass *) klass)->valid_type = (gboolean (*)(DataCollection*, DataObject*)) source_collection_real_valid_type;
+	((DataCollectionClass *) klass)->valid_type = (gboolean (*) (DataCollection *, DataObject*)) source_collection_real_valid_type;
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	((SourceCollectionClass *) klass)->has_backlink = (gboolean (*)(SourceCollection*, SourceBacklink*)) source_collection_real_has_backlink;
+	((SourceCollectionClass *) klass)->has_backlink = (gboolean (*) (SourceCollection *, SourceBacklink*)) source_collection_real_has_backlink;
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	((SourceCollectionClass *) klass)->remove_backlink = (void (*)(SourceCollection*, SourceBacklink*)) source_collection_real_remove_backlink;
+	((SourceCollectionClass *) klass)->remove_backlink = (void (*) (SourceCollection *, SourceBacklink*)) source_collection_real_remove_backlink;
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	((SourceCollectionClass *) klass)->items_unlinking = source_collection_real_items_unlinking;
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1646,18 +1656,18 @@ static void source_collection_class_init (SourceCollectionClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	((SourceCollectionClass *) klass)->backlink_removed = source_collection_real_backlink_removed;
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	g_signal_new ("items_unlinking", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_unlinking), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
+	source_collection_signals[SOURCE_COLLECTION_ITEMS_UNLINKING_SIGNAL] = g_signal_new ("items-unlinking", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_unlinking), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	g_signal_new ("items_relinked", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_relinked), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
+	source_collection_signals[SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL] = g_signal_new ("items-relinked", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_relinked), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	g_signal_new ("item_destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, item_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE);
+	source_collection_signals[SOURCE_COLLECTION_ITEM_DESTROYED_SIGNAL] = g_signal_new ("item-destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, item_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE);
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	g_signal_new ("items_destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
+	source_collection_signals[SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL] = g_signal_new ("items-destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	g_signal_new ("unlinked_destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, unlinked_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE);
+	source_collection_signals[SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL] = g_signal_new ("unlinked-destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, unlinked_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE);
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	g_signal_new ("backlink_removed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, backlink_removed), NULL, NULL, g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT, G_TYPE_NONE, 2, TYPE_SOURCE_BACKLINK, GEE_TYPE_COLLECTION);
-#line 1661 "SourceCollection.c"
+	source_collection_signals[SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL] = g_signal_new ("backlink-removed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, backlink_removed), NULL, NULL, g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT, G_TYPE_NONE, 2, TYPE_SOURCE_BACKLINK, GEE_TYPE_COLLECTION);
+#line 1671 "SourceCollection.c"
 }
 
 
@@ -1666,11 +1676,11 @@ static void source_collection_instance_init (SourceCollection * self) {
 	self->priv = SOURCE_COLLECTION_GET_PRIVATE (self);
 #line 48 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	self->priv->backlinks = NULL;
-#line 1670 "SourceCollection.c"
+#line 1680 "SourceCollection.c"
 }
 
 
-static void source_collection_finalize (DataCollection* obj) {
+static void source_collection_finalize (DataCollection * obj) {
 	SourceCollection * self;
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_COLLECTION, SourceCollection);
@@ -1678,7 +1688,7 @@ static void source_collection_finalize (DataCollection* obj) {
 	_g_object_unref0 (self->priv->backlinks);
 #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	DATA_COLLECTION_CLASS (source_collection_parent_class)->finalize (obj);
-#line 1682 "SourceCollection.c"
+#line 1692 "SourceCollection.c"
 }
 
 
diff --git a/src/core/SourceHoldingTank.c b/src/core/SourceHoldingTank.c
index 1203f72..7d92788 100644
--- a/src/core/SourceHoldingTank.c
+++ b/src/core/SourceHoldingTank.c
@@ -1,4 +1,4 @@
-/* SourceHoldingTank.c generated by valac 0.34.7, the Vala compiler
+/* SourceHoldingTank.c generated by valac 0.36.6, the Vala compiler
  * generated from SourceHoldingTank.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -134,6 +134,11 @@ typedef struct _SingletonCollection SingletonCollection;
 typedef struct _SingletonCollectionClass SingletonCollectionClass;
 #define _g_free0(var) (var = (g_free (var), NULL))
 typedef struct _ParamSpecSourceHoldingTank ParamSpecSourceHoldingTank;
+enum  {
+	SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL,
+	SOURCE_HOLDING_TANK_LAST_SIGNAL
+};
+static guint source_holding_tank_signals[SOURCE_HOLDING_TANK_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -269,38 +274,38 @@ void source_collection_relink (SourceCollection* self, DataSource* source);
 void source_collection_relink_many (SourceCollection* self, GeeCollection* relink);
 static void source_holding_tank_real_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed);
 static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void source_holding_tank_finalize (SourceHoldingTank* obj);
+static void source_holding_tank_finalize (SourceHoldingTank * obj);
 
 
 static void _source_holding_tank_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 48 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	source_holding_tank_on_source_destroyed ((SourceHoldingTank*) self, source);
-#line 279 "SourceHoldingTank.c"
+#line 284 "SourceHoldingTank.c"
 }
 
 
 static void _source_holding_tank_on_source_collection_thawed_data_collection_thawed (DataCollection* _sender, gpointer self) {
 #line 49 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	source_holding_tank_on_source_collection_thawed ((SourceHoldingTank*) self);
-#line 286 "SourceHoldingTank.c"
+#line 291 "SourceHoldingTank.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 293 "SourceHoldingTank.c"
+#line 298 "SourceHoldingTank.c"
 }
 
 
 SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target) {
 	SourceHoldingTank* self = NULL;
-	SourceCollection* _tmp0_ = NULL;
-	SourceCollection* _tmp1_ = NULL;
-	SourceHoldingTankCheckToKeep _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	SourceCollection* _tmp3_ = NULL;
-	SourceCollection* _tmp4_ = NULL;
+	SourceCollection* _tmp0_;
+	SourceCollection* _tmp1_;
+	SourceHoldingTankCheckToKeep _tmp2_;
+	void* _tmp2__target;
+	SourceCollection* _tmp3_;
+	SourceCollection* _tmp4_;
 #line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL);
 #line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -331,22 +336,22 @@ SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceColle
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "thawed", (GCallback) _source_holding_tank_on_source_collection_thawed_data_collection_thawed, self);
 #line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return self;
-#line 335 "SourceHoldingTank.c"
+#line 340 "SourceHoldingTank.c"
 }
 
 
 SourceHoldingTank* source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target) {
 #line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return source_holding_tank_construct (TYPE_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target);
-#line 342 "SourceHoldingTank.c"
+#line 347 "SourceHoldingTank.c"
 }
 
 
 static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed) {
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp8_ = NULL;
-	GeeCollection* _tmp16_ = NULL;
-	GeeCollection* _tmp17_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp8_;
+	GeeCollection* _tmp16_;
+	GeeCollection* _tmp17_;
 #line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
 #line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -355,11 +360,11 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank*
 	_tmp0_ = added;
 #line 54 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (_tmp0_ != NULL) {
-#line 359 "SourceHoldingTank.c"
+#line 364 "SourceHoldingTank.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp1_ = NULL;
-			GeeIterator* _tmp2_ = NULL;
+			GeeCollection* _tmp1_;
+			GeeIterator* _tmp2_;
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp1_ = added;
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -368,13 +373,13 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank*
 			_source_it = _tmp2_;
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			while (TRUE) {
-#line 372 "SourceHoldingTank.c"
-				GeeIterator* _tmp3_ = NULL;
-				gboolean _tmp4_ = FALSE;
+#line 377 "SourceHoldingTank.c"
+				GeeIterator* _tmp3_;
+				gboolean _tmp4_;
 				DataSource* source = NULL;
-				GeeIterator* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
-				DataSource* _tmp7_ = NULL;
+				GeeIterator* _tmp5_;
+				gpointer _tmp6_;
+				DataSource* _tmp7_;
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp3_ = _source_it;
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -383,7 +388,7 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank*
 				if (!_tmp4_) {
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					break;
-#line 387 "SourceHoldingTank.c"
+#line 392 "SourceHoldingTank.c"
 				}
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp5_ = _source_it;
@@ -397,22 +402,22 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank*
 				data_source_notify_held_in_tank (_tmp7_, self);
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_g_object_unref0 (source);
-#line 401 "SourceHoldingTank.c"
+#line 406 "SourceHoldingTank.c"
 			}
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_g_object_unref0 (_source_it);
-#line 405 "SourceHoldingTank.c"
+#line 410 "SourceHoldingTank.c"
 		}
 	}
 #line 59 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp8_ = removed;
 #line 59 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (_tmp8_ != NULL) {
-#line 412 "SourceHoldingTank.c"
+#line 417 "SourceHoldingTank.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp9_ = NULL;
-			GeeIterator* _tmp10_ = NULL;
+			GeeCollection* _tmp9_;
+			GeeIterator* _tmp10_;
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp9_ = removed;
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -421,13 +426,13 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank*
 			_source_it = _tmp10_;
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			while (TRUE) {
-#line 425 "SourceHoldingTank.c"
-				GeeIterator* _tmp11_ = NULL;
-				gboolean _tmp12_ = FALSE;
+#line 430 "SourceHoldingTank.c"
+				GeeIterator* _tmp11_;
+				gboolean _tmp12_;
 				DataSource* source = NULL;
-				GeeIterator* _tmp13_ = NULL;
-				gpointer _tmp14_ = NULL;
-				DataSource* _tmp15_ = NULL;
+				GeeIterator* _tmp13_;
+				gpointer _tmp14_;
+				DataSource* _tmp15_;
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp11_ = _source_it;
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -436,7 +441,7 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank*
 				if (!_tmp12_) {
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					break;
-#line 440 "SourceHoldingTank.c"
+#line 445 "SourceHoldingTank.c"
 				}
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp13_ = _source_it;
@@ -450,11 +455,11 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank*
 				data_source_notify_held_in_tank (_tmp15_, NULL);
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_g_object_unref0 (source);
-#line 454 "SourceHoldingTank.c"
+#line 459 "SourceHoldingTank.c"
 			}
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_g_object_unref0 (_source_it);
-#line 458 "SourceHoldingTank.c"
+#line 463 "SourceHoldingTank.c"
 		}
 	}
 #line 64 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -462,8 +467,8 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank*
 #line 64 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp17_ = removed;
 #line 64 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
-	g_signal_emit_by_name (self, "contents-altered", _tmp16_, _tmp17_);
-#line 467 "SourceHoldingTank.c"
+	g_signal_emit (self, source_holding_tank_signals[SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL], 0, _tmp16_, _tmp17_);
+#line 472 "SourceHoldingTank.c"
 }
 
 
@@ -472,14 +477,14 @@ void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCo
 	g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
 #line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	SOURCE_HOLDING_TANK_GET_CLASS (self)->notify_contents_altered (self, added, removed);
-#line 476 "SourceHoldingTank.c"
+#line 481 "SourceHoldingTank.c"
 }
 
 
 gint source_holding_tank_get_count (SourceHoldingTank* self) {
 	gint result = 0;
-	DataSet* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	DataSet* _tmp0_;
+	gint _tmp1_;
 #line 67 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), 0);
 #line 68 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -490,14 +495,14 @@ gint source_holding_tank_get_count (SourceHoldingTank* self) {
 	result = _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return result;
-#line 494 "SourceHoldingTank.c"
+#line 499 "SourceHoldingTank.c"
 }
 
 
 GeeCollection* source_holding_tank_get_all (SourceHoldingTank* self) {
 	GeeCollection* result = NULL;
-	DataSet* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	DataSet* _tmp0_;
+	GeeList* _tmp1_;
 #line 71 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), NULL);
 #line 72 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -508,16 +513,16 @@ GeeCollection* source_holding_tank_get_all (SourceHoldingTank* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 72 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return result;
-#line 512 "SourceHoldingTank.c"
+#line 517 "SourceHoldingTank.c"
 }
 
 
 gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* source) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	DataSet* _tmp1_ = NULL;
-	DataSource* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	DataSet* _tmp1_;
+	DataSource* _tmp2_;
+	gboolean _tmp3_;
 #line 75 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), FALSE);
 #line 75 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -532,11 +537,11 @@ gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* sour
 	if (_tmp3_) {
 #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_tmp0_ = TRUE;
-#line 536 "SourceHoldingTank.c"
+#line 541 "SourceHoldingTank.c"
 	} else {
-		GeeHashSet* _tmp4_ = NULL;
-		DataSource* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		GeeHashSet* _tmp4_;
+		DataSource* _tmp5_;
+		gboolean _tmp6_;
 #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_tmp4_ = self->priv->unlinking;
 #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -545,26 +550,26 @@ gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* sour
 		_tmp6_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_);
 #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_tmp0_ = _tmp6_;
-#line 549 "SourceHoldingTank.c"
+#line 554 "SourceHoldingTank.c"
 	}
 #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	result = _tmp0_;
 #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return result;
-#line 555 "SourceHoldingTank.c"
+#line 560 "SourceHoldingTank.c"
 }
 
 
 void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many) {
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gboolean added = FALSE;
-	DataSet* _tmp11_ = NULL;
-	GeeCollection* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	gboolean _tmp14_ = FALSE;
-	GeeCollection* _tmp15_ = NULL;
+	DataSet* _tmp11_;
+	GeeCollection* _tmp12_;
+	gboolean _tmp13_;
+	gboolean _tmp14_;
+	GeeCollection* _tmp15_;
 #line 80 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
 #line 80 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -579,12 +584,12 @@ void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many)
 	if (_tmp2_ == 0) {
 #line 82 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return;
-#line 583 "SourceHoldingTank.c"
+#line 588 "SourceHoldingTank.c"
 	}
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_tmp3_ = many;
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -593,14 +598,14 @@ void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many)
 		_source_it = _tmp4_;
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		while (TRUE) {
-#line 597 "SourceHoldingTank.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+#line 602 "SourceHoldingTank.c"
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
-			DataSource* _tmp9_ = NULL;
-			gint64 _tmp10_ = 0LL;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			DataSource* _tmp9_;
+			gint64 _tmp10_;
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp5_ = _source_it;
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -609,7 +614,7 @@ void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many)
 			if (!_tmp6_) {
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				break;
-#line 613 "SourceHoldingTank.c"
+#line 618 "SourceHoldingTank.c"
 			}
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp7_ = _source_it;
@@ -627,11 +632,11 @@ void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many)
 			data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject), _tmp10_);
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_g_object_unref0 (source);
-#line 631 "SourceHoldingTank.c"
+#line 636 "SourceHoldingTank.c"
 		}
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_g_object_unref0 (_source_it);
-#line 635 "SourceHoldingTank.c"
+#line 640 "SourceHoldingTank.c"
 	}
 #line 87 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp11_ = self->priv->tank;
@@ -649,31 +654,31 @@ void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many)
 	_tmp15_ = many;
 #line 90 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	source_holding_tank_notify_contents_altered (self, _tmp15_, NULL);
-#line 653 "SourceHoldingTank.c"
+#line 658 "SourceHoldingTank.c"
 }
 
 
 void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection* unlink) {
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	GeeHashSet* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
-	SourceCollection* _tmp5_ = NULL;
-	SourceCollection* _tmp6_ = NULL;
-	GeeCollection* _tmp7_ = NULL;
-	Marker* _tmp8_ = NULL;
-	Marker* _tmp9_ = NULL;
-	GeeCollection* _tmp10_ = NULL;
-	GeeCollection* _tmp11_ = NULL;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	GeeHashSet* _tmp3_;
+	GeeCollection* _tmp4_;
+	SourceCollection* _tmp5_;
+	SourceCollection* _tmp6_;
+	GeeCollection* _tmp7_;
+	Marker* _tmp8_;
+	Marker* _tmp9_;
+	GeeCollection* _tmp10_;
+	GeeCollection* _tmp11_;
 	gboolean added = FALSE;
-	DataSet* _tmp20_ = NULL;
-	GeeCollection* _tmp21_ = NULL;
-	gboolean _tmp22_ = FALSE;
-	gboolean _tmp23_ = FALSE;
-	GeeHashSet* _tmp24_ = NULL;
-	GeeCollection* _tmp25_ = NULL;
-	GeeCollection* _tmp26_ = NULL;
+	DataSet* _tmp20_;
+	GeeCollection* _tmp21_;
+	gboolean _tmp22_;
+	gboolean _tmp23_;
+	GeeHashSet* _tmp24_;
+	GeeCollection* _tmp25_;
+	GeeCollection* _tmp26_;
 #line 95 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
 #line 95 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -688,7 +693,7 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection
 	if (_tmp2_ == 0) {
 #line 97 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return;
-#line 692 "SourceHoldingTank.c"
+#line 697 "SourceHoldingTank.c"
 	}
 #line 100 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp3_ = self->priv->unlinking;
@@ -714,11 +719,11 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection
 	_g_object_unref0 (_tmp11_);
 #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_g_object_unref0 (_tmp9_);
-#line 718 "SourceHoldingTank.c"
+#line 723 "SourceHoldingTank.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp12_ = NULL;
-		GeeIterator* _tmp13_ = NULL;
+		GeeCollection* _tmp12_;
+		GeeIterator* _tmp13_;
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_tmp12_ = unlink;
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -727,14 +732,14 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection
 		_source_it = _tmp13_;
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		while (TRUE) {
-#line 731 "SourceHoldingTank.c"
-			GeeIterator* _tmp14_ = NULL;
-			gboolean _tmp15_ = FALSE;
+#line 736 "SourceHoldingTank.c"
+			GeeIterator* _tmp14_;
+			gboolean _tmp15_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp16_ = NULL;
-			gpointer _tmp17_ = NULL;
-			DataSource* _tmp18_ = NULL;
-			gint64 _tmp19_ = 0LL;
+			GeeIterator* _tmp16_;
+			gpointer _tmp17_;
+			DataSource* _tmp18_;
+			gint64 _tmp19_;
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp14_ = _source_it;
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -743,7 +748,7 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection
 			if (!_tmp15_) {
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				break;
-#line 747 "SourceHoldingTank.c"
+#line 752 "SourceHoldingTank.c"
 			}
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp16_ = _source_it;
@@ -761,11 +766,11 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection
 			data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject), _tmp19_);
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_g_object_unref0 (source);
-#line 765 "SourceHoldingTank.c"
+#line 770 "SourceHoldingTank.c"
 		}
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_g_object_unref0 (_source_it);
-#line 769 "SourceHoldingTank.c"
+#line 774 "SourceHoldingTank.c"
 	}
 #line 107 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp20_ = self->priv->tank;
@@ -789,15 +794,15 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection
 	_tmp26_ = unlink;
 #line 113 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	source_holding_tank_notify_contents_altered (self, _tmp26_, NULL);
-#line 793 "SourceHoldingTank.c"
+#line 798 "SourceHoldingTank.c"
 }
 
 
 gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBacklink* backlink) {
 	gboolean result = FALSE;
 	gint count = 0;
-	DataSet* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	DataSet* _tmp0_;
+	gint _tmp1_;
 #line 116 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), FALSE);
 #line 116 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -808,37 +813,37 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli
 	_tmp1_ = data_set_get_count (_tmp0_);
 #line 117 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	count = _tmp1_;
-#line 812 "SourceHoldingTank.c"
+#line 817 "SourceHoldingTank.c"
 	{
 		gint ctr = 0;
 #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		ctr = 0;
-#line 817 "SourceHoldingTank.c"
+#line 822 "SourceHoldingTank.c"
 		{
 			gboolean _tmp2_ = FALSE;
 #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp2_ = TRUE;
 #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			while (TRUE) {
-#line 824 "SourceHoldingTank.c"
-				gint _tmp4_ = 0;
-				gint _tmp5_ = 0;
-				DataSet* _tmp6_ = NULL;
-				gint _tmp7_ = 0;
-				DataObject* _tmp8_ = NULL;
-				DataSource* _tmp9_ = NULL;
-				SourceBacklink* _tmp10_ = NULL;
-				gboolean _tmp11_ = FALSE;
-				gboolean _tmp12_ = FALSE;
+#line 829 "SourceHoldingTank.c"
+				gint _tmp4_;
+				gint _tmp5_;
+				DataSet* _tmp6_;
+				gint _tmp7_;
+				DataObject* _tmp8_;
+				DataSource* _tmp9_;
+				SourceBacklink* _tmp10_;
+				gboolean _tmp11_;
+				gboolean _tmp12_;
 #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				if (!_tmp2_) {
-#line 836 "SourceHoldingTank.c"
-					gint _tmp3_ = 0;
+#line 841 "SourceHoldingTank.c"
+					gint _tmp3_;
 #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					_tmp3_ = ctr;
 #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					ctr = _tmp3_ + 1;
-#line 842 "SourceHoldingTank.c"
+#line 847 "SourceHoldingTank.c"
 				}
 #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp2_ = FALSE;
@@ -850,7 +855,7 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli
 				if (!(_tmp4_ < _tmp5_)) {
 #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					break;
-#line 854 "SourceHoldingTank.c"
+#line 859 "SourceHoldingTank.c"
 				}
 #line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp6_ = self->priv->tank;
@@ -874,7 +879,7 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli
 					result = TRUE;
 #line 120 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					return result;
-#line 878 "SourceHoldingTank.c"
+#line 883 "SourceHoldingTank.c"
 				}
 			}
 		}
@@ -883,14 +888,14 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli
 	result = FALSE;
 #line 123 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return result;
-#line 887 "SourceHoldingTank.c"
+#line 892 "SourceHoldingTank.c"
 }
 
 
 void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklink* backlink) {
 	gint count = 0;
-	DataSet* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	DataSet* _tmp0_;
+	gint _tmp1_;
 #line 126 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
 #line 126 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -901,35 +906,35 @@ void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklin
 	_tmp1_ = data_set_get_count (_tmp0_);
 #line 127 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	count = _tmp1_;
-#line 905 "SourceHoldingTank.c"
+#line 910 "SourceHoldingTank.c"
 	{
 		gint ctr = 0;
 #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		ctr = 0;
-#line 910 "SourceHoldingTank.c"
+#line 915 "SourceHoldingTank.c"
 		{
 			gboolean _tmp2_ = FALSE;
 #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp2_ = TRUE;
 #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			while (TRUE) {
-#line 917 "SourceHoldingTank.c"
-				gint _tmp4_ = 0;
-				gint _tmp5_ = 0;
-				DataSet* _tmp6_ = NULL;
-				gint _tmp7_ = 0;
-				DataObject* _tmp8_ = NULL;
-				DataSource* _tmp9_ = NULL;
-				SourceBacklink* _tmp10_ = NULL;
+#line 922 "SourceHoldingTank.c"
+				gint _tmp4_;
+				gint _tmp5_;
+				DataSet* _tmp6_;
+				gint _tmp7_;
+				DataObject* _tmp8_;
+				DataSource* _tmp9_;
+				SourceBacklink* _tmp10_;
 #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				if (!_tmp2_) {
-#line 927 "SourceHoldingTank.c"
-					gint _tmp3_ = 0;
+#line 932 "SourceHoldingTank.c"
+					gint _tmp3_;
 #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					_tmp3_ = ctr;
 #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					ctr = _tmp3_ + 1;
-#line 933 "SourceHoldingTank.c"
+#line 938 "SourceHoldingTank.c"
 				}
 #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp2_ = FALSE;
@@ -941,7 +946,7 @@ void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklin
 				if (!(_tmp4_ < _tmp5_)) {
 #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					break;
-#line 945 "SourceHoldingTank.c"
+#line 950 "SourceHoldingTank.c"
 				}
 #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp6_ = self->priv->tank;
@@ -957,7 +962,7 @@ void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklin
 				data_source_remove_backlink (_tmp9_, _tmp10_);
 #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_g_object_unref0 (_tmp9_);
-#line 961 "SourceHoldingTank.c"
+#line 966 "SourceHoldingTank.c"
 			}
 		}
 	}
@@ -965,19 +970,19 @@ void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklin
 
 
 void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* destroy, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed) {
-	GeeList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gboolean removed = FALSE;
-	DataSet* _tmp3_ = NULL;
-	GeeList* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	GeeList* _tmp7_ = NULL;
+	DataSet* _tmp3_;
+	GeeList* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	GeeList* _tmp7_;
 	gint count = 0;
-	GeeList* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
+	GeeList* _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
 #line 132 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
 #line 132 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -994,7 +999,7 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest
 	if (_tmp2_ == 0) {
 #line 135 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return;
-#line 998 "SourceHoldingTank.c"
+#line 1003 "SourceHoldingTank.c"
 	}
 #line 137 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp3_ = self->priv->tank;
@@ -1020,39 +1025,39 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest
 	_tmp10_ = _tmp9_;
 #line 142 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	count = _tmp10_;
-#line 1024 "SourceHoldingTank.c"
+#line 1029 "SourceHoldingTank.c"
 	{
 		gint ctr = 0;
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		ctr = 0;
-#line 1029 "SourceHoldingTank.c"
+#line 1034 "SourceHoldingTank.c"
 		{
 			gboolean _tmp11_ = FALSE;
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp11_ = TRUE;
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			while (TRUE) {
-#line 1036 "SourceHoldingTank.c"
-				gint _tmp13_ = 0;
-				gint _tmp14_ = 0;
+#line 1041 "SourceHoldingTank.c"
+				gint _tmp13_;
+				gint _tmp14_;
 				DataSource* source = NULL;
-				GeeList* _tmp15_ = NULL;
-				gint _tmp16_ = 0;
-				gpointer _tmp17_ = NULL;
-				DataSource* _tmp18_ = NULL;
-				gboolean _tmp19_ = FALSE;
-				gboolean _tmp20_ = FALSE;
-				ProgressMonitor _tmp24_ = NULL;
-				void* _tmp24__target = NULL;
+				GeeList* _tmp15_;
+				gint _tmp16_;
+				gpointer _tmp17_;
+				DataSource* _tmp18_;
+				gboolean _tmp19_;
+				gboolean _tmp20_;
+				ProgressMonitor _tmp24_;
+				void* _tmp24__target;
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				if (!_tmp11_) {
-#line 1050 "SourceHoldingTank.c"
-					gint _tmp12_ = 0;
+#line 1055 "SourceHoldingTank.c"
+					gint _tmp12_;
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					_tmp12_ = ctr;
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					ctr = _tmp12_ + 1;
-#line 1056 "SourceHoldingTank.c"
+#line 1061 "SourceHoldingTank.c"
 				}
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp11_ = FALSE;
@@ -1064,7 +1069,7 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest
 				if (!(_tmp13_ < _tmp14_)) {
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					break;
-#line 1068 "SourceHoldingTank.c"
+#line 1073 "SourceHoldingTank.c"
 				}
 #line 144 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp15_ = destroy;
@@ -1082,22 +1087,22 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest
 				_tmp20_ = data_source_destroy_orphan (_tmp18_, _tmp19_);
 #line 145 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				if (!_tmp20_) {
-#line 1086 "SourceHoldingTank.c"
-					GeeList* _tmp21_ = NULL;
+#line 1091 "SourceHoldingTank.c"
+					GeeList* _tmp21_;
 #line 146 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					_tmp21_ = not_removed;
 #line 146 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					if (NULL != _tmp21_) {
-#line 1092 "SourceHoldingTank.c"
-						GeeList* _tmp22_ = NULL;
-						DataSource* _tmp23_ = NULL;
+#line 1097 "SourceHoldingTank.c"
+						GeeList* _tmp22_;
+						DataSource* _tmp23_;
 #line 147 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 						_tmp22_ = not_removed;
 #line 147 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 						_tmp23_ = source;
 #line 147 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 1101 "SourceHoldingTank.c"
+#line 1106 "SourceHoldingTank.c"
 					}
 				}
 #line 150 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1106,11 +1111,11 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest
 				_tmp24__target = monitor_target;
 #line 150 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				if (_tmp24_ != NULL) {
-#line 1110 "SourceHoldingTank.c"
-					ProgressMonitor _tmp25_ = NULL;
-					void* _tmp25__target = NULL;
-					gint _tmp26_ = 0;
-					gint _tmp27_ = 0;
+#line 1115 "SourceHoldingTank.c"
+					ProgressMonitor _tmp25_;
+					void* _tmp25__target;
+					gint _tmp26_;
+					gint _tmp27_;
 #line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					_tmp25_ = monitor;
 #line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1121,11 +1126,11 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest
 					_tmp27_ = count;
 #line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					_tmp25_ ((guint64) (_tmp26_ + 1), (guint64) _tmp27_, TRUE, _tmp25__target);
-#line 1125 "SourceHoldingTank.c"
+#line 1130 "SourceHoldingTank.c"
 				}
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_g_object_unref0 (source);
-#line 1129 "SourceHoldingTank.c"
+#line 1134 "SourceHoldingTank.c"
 			}
 		}
 	}
@@ -1133,17 +1138,17 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest
 
 
 static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, DataSource* source) {
-	DataSet* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	DataSet* _tmp0_;
+	DataSource* _tmp1_;
+	gboolean _tmp2_;
 	gboolean removed = FALSE;
-	DataSet* _tmp3_ = NULL;
-	DataSource* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	DataSource* _tmp7_ = NULL;
-	SingletonCollection* _tmp8_ = NULL;
-	SingletonCollection* _tmp9_ = NULL;
+	DataSet* _tmp3_;
+	DataSource* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	DataSource* _tmp7_;
+	SingletonCollection* _tmp8_;
+	SingletonCollection* _tmp9_;
 #line 155 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
 #line 155 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1158,7 +1163,7 @@ static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, Da
 	if (!_tmp2_) {
 #line 157 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return;
-#line 1162 "SourceHoldingTank.c"
+#line 1167 "SourceHoldingTank.c"
 	}
 #line 159 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp3_ = self->priv->tank;
@@ -1182,31 +1187,31 @@ static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, Da
 	source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_g_object_unref0 (_tmp9_);
-#line 1186 "SourceHoldingTank.c"
+#line 1191 "SourceHoldingTank.c"
 }
 
 
 void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataSource* source, Alteration* alteration) {
-	DataSet* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	SourceHoldingTankCheckToKeep _tmp8_ = NULL;
-	void* _tmp8__target = NULL;
-	DataSource* _tmp9_ = NULL;
-	Alteration* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
+	DataSet* _tmp0_;
+	DataSource* _tmp1_;
+	gboolean _tmp2_;
+	SourceHoldingTankCheckToKeep _tmp8_;
+	void* _tmp8__target;
+	DataSource* _tmp9_;
+	Alteration* _tmp10_;
+	gboolean _tmp11_;
 	gboolean removed = FALSE;
-	DataSet* _tmp12_ = NULL;
-	DataSource* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
-	gboolean _tmp15_ = FALSE;
-	SourceCollection* _tmp16_ = NULL;
-	gboolean _tmp17_ = FALSE;
-	DataSource* _tmp20_ = NULL;
-	SingletonCollection* _tmp21_ = NULL;
-	SingletonCollection* _tmp22_ = NULL;
-	SourceCollection* _tmp23_ = NULL;
-	DataSource* _tmp24_ = NULL;
+	DataSet* _tmp12_;
+	DataSource* _tmp13_;
+	gboolean _tmp14_;
+	gboolean _tmp15_;
+	SourceCollection* _tmp16_;
+	gboolean _tmp17_;
+	DataSource* _tmp20_;
+	SingletonCollection* _tmp21_;
+	SingletonCollection* _tmp22_;
+	SourceCollection* _tmp23_;
+	DataSource* _tmp24_;
 #line 166 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
 #line 166 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1221,12 +1226,12 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS
 	_tmp2_ = data_set_contains (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
 #line 167 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (!_tmp2_) {
-#line 1225 "SourceHoldingTank.c"
-		DataSource* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 1230 "SourceHoldingTank.c"
+		DataSource* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_tmp3_ = source;
 #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1246,7 +1251,7 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS
 		_g_free0 (_tmp5_);
 #line 171 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return;
-#line 1249 "SourceHoldingTank.c"
+#line 1254 "SourceHoldingTank.c"
 	}
 #line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp8_ = self->priv->check_to_keep;
@@ -1262,7 +1267,7 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS
 	if (_tmp11_) {
 #line 176 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return;
-#line 1265 "SourceHoldingTank.c"
+#line 1270 "SourceHoldingTank.c"
 	}
 #line 178 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp12_ = self->priv->tank;
@@ -1282,9 +1287,9 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS
 	_tmp17_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection));
 #line 181 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (_tmp17_) {
-#line 1285 "SourceHoldingTank.c"
-		GeeHashSet* _tmp18_ = NULL;
-		DataSource* _tmp19_ = NULL;
+#line 1290 "SourceHoldingTank.c"
+		GeeHashSet* _tmp18_;
+		DataSource* _tmp19_;
 #line 182 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_tmp18_ = self->priv->relinks;
 #line 182 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1293,7 +1298,7 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_);
 #line 184 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return;
-#line 1296 "SourceHoldingTank.c"
+#line 1301 "SourceHoldingTank.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp20_ = source;
@@ -1311,28 +1316,28 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS
 	_tmp24_ = source;
 #line 189 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	source_collection_relink (_tmp23_, _tmp24_);
-#line 1314 "SourceHoldingTank.c"
+#line 1319 "SourceHoldingTank.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 197 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1321 "SourceHoldingTank.c"
+#line 1326 "SourceHoldingTank.c"
 }
 
 
 static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank* self) {
-	GeeHashSet* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeHashSet* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	GeeHashSet* copy = NULL;
-	GeeHashSet* _tmp3_ = NULL;
-	GeeHashSet* _tmp4_ = NULL;
-	GeeHashSet* _tmp5_ = NULL;
-	GeeHashSet* _tmp6_ = NULL;
-	SourceCollection* _tmp7_ = NULL;
-	GeeHashSet* _tmp8_ = NULL;
+	GeeHashSet* _tmp3_;
+	GeeHashSet* _tmp4_;
+	GeeHashSet* _tmp5_;
+	GeeHashSet* _tmp6_;
+	SourceCollection* _tmp7_;
+	GeeHashSet* _tmp8_;
 #line 192 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
 #line 193 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1345,7 +1350,7 @@ static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank*
 	if (_tmp2_ == 0) {
 #line 194 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return;
-#line 1348 "SourceHoldingTank.c"
+#line 1353 "SourceHoldingTank.c"
 	}
 #line 197 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp3_ = self->priv->relinks;
@@ -1371,13 +1376,13 @@ static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank*
 	source_collection_relink_many (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 192 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_g_object_unref0 (copy);
-#line 1374 "SourceHoldingTank.c"
+#line 1379 "SourceHoldingTank.c"
 }
 
 
 gchar* source_holding_tank_to_string (SourceHoldingTank* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 205 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), NULL);
 #line 206 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1386,7 +1391,7 @@ gchar* source_holding_tank_to_string (SourceHoldingTank* self) {
 	result = _tmp0_;
 #line 206 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return result;
-#line 1389 "SourceHoldingTank.c"
+#line 1394 "SourceHoldingTank.c"
 }
 
 
@@ -1395,7 +1400,7 @@ static void source_holding_tank_real_contents_altered (SourceHoldingTank* self,
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
 #line 35 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 1398 "SourceHoldingTank.c"
+#line 1403 "SourceHoldingTank.c"
 }
 
 
@@ -1414,26 +1419,26 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 		data1 = closure->data;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 1417 "SourceHoldingTank.c"
+#line 1422 "SourceHoldingTank.c"
 	} else {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		data2 = closure->data;
-#line 1423 "SourceHoldingTank.c"
+#line 1428 "SourceHoldingTank.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 1429 "SourceHoldingTank.c"
+#line 1434 "SourceHoldingTank.c"
 }
 
 
 static void value_source_holding_tank_init (GValue* value) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	value->data[0].v_pointer = NULL;
-#line 1436 "SourceHoldingTank.c"
+#line 1441 "SourceHoldingTank.c"
 }
 
 
@@ -1442,7 +1447,7 @@ static void value_source_holding_tank_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		source_holding_tank_unref (value->data[0].v_pointer);
-#line 1445 "SourceHoldingTank.c"
+#line 1450 "SourceHoldingTank.c"
 	}
 }
 
@@ -1452,11 +1457,11 @@ static void value_source_holding_tank_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		dest_value->data[0].v_pointer = source_holding_tank_ref (src_value->data[0].v_pointer);
-#line 1455 "SourceHoldingTank.c"
+#line 1460 "SourceHoldingTank.c"
 	} else {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1459 "SourceHoldingTank.c"
+#line 1464 "SourceHoldingTank.c"
 	}
 }
 
@@ -1464,66 +1469,66 @@ static void value_source_holding_tank_copy_value (const GValue* src_value, GValu
 static gpointer value_source_holding_tank_peek_pointer (const GValue* value) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return value->data[0].v_pointer;
-#line 1467 "SourceHoldingTank.c"
+#line 1472 "SourceHoldingTank.c"
 }
 
 
 static gchar* value_source_holding_tank_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (collect_values[0].v_pointer) {
-#line 1474 "SourceHoldingTank.c"
-		SourceHoldingTank* object;
+#line 1479 "SourceHoldingTank.c"
+		SourceHoldingTank * object;
 		object = collect_values[0].v_pointer;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1481 "SourceHoldingTank.c"
+#line 1486 "SourceHoldingTank.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1485 "SourceHoldingTank.c"
+#line 1490 "SourceHoldingTank.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		value->data[0].v_pointer = source_holding_tank_ref (object);
-#line 1489 "SourceHoldingTank.c"
+#line 1494 "SourceHoldingTank.c"
 	} else {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		value->data[0].v_pointer = NULL;
-#line 1493 "SourceHoldingTank.c"
+#line 1498 "SourceHoldingTank.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return NULL;
-#line 1497 "SourceHoldingTank.c"
+#line 1502 "SourceHoldingTank.c"
 }
 
 
 static gchar* value_source_holding_tank_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SourceHoldingTank** object_p;
+	SourceHoldingTank ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (!object_p) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1508 "SourceHoldingTank.c"
+#line 1513 "SourceHoldingTank.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (!value->data[0].v_pointer) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		*object_p = NULL;
-#line 1514 "SourceHoldingTank.c"
+#line 1519 "SourceHoldingTank.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1518 "SourceHoldingTank.c"
+#line 1523 "SourceHoldingTank.c"
 	} else {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		*object_p = source_holding_tank_ref (value->data[0].v_pointer);
-#line 1522 "SourceHoldingTank.c"
+#line 1527 "SourceHoldingTank.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return NULL;
-#line 1526 "SourceHoldingTank.c"
+#line 1531 "SourceHoldingTank.c"
 }
 
 
@@ -1537,7 +1542,7 @@ GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return G_PARAM_SPEC (spec);
-#line 1540 "SourceHoldingTank.c"
+#line 1545 "SourceHoldingTank.c"
 }
 
 
@@ -1546,12 +1551,12 @@ gpointer value_get_source_holding_tank (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_HOLDING_TANK), NULL);
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return value->data[0].v_pointer;
-#line 1549 "SourceHoldingTank.c"
+#line 1554 "SourceHoldingTank.c"
 }
 
 
 void value_set_source_holding_tank (GValue* value, gpointer v_object) {
-	SourceHoldingTank* old;
+	SourceHoldingTank * old;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_HOLDING_TANK));
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1566,23 +1571,23 @@ void value_set_source_holding_tank (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		source_holding_tank_ref (value->data[0].v_pointer);
-#line 1569 "SourceHoldingTank.c"
+#line 1574 "SourceHoldingTank.c"
 	} else {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		value->data[0].v_pointer = NULL;
-#line 1573 "SourceHoldingTank.c"
+#line 1578 "SourceHoldingTank.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (old) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		source_holding_tank_unref (old);
-#line 1579 "SourceHoldingTank.c"
+#line 1584 "SourceHoldingTank.c"
 	}
 }
 
 
 void value_take_source_holding_tank (GValue* value, gpointer v_object) {
-	SourceHoldingTank* old;
+	SourceHoldingTank * old;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_HOLDING_TANK));
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1595,17 +1600,17 @@ void value_take_source_holding_tank (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		value->data[0].v_pointer = v_object;
-#line 1598 "SourceHoldingTank.c"
+#line 1603 "SourceHoldingTank.c"
 	} else {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		value->data[0].v_pointer = NULL;
-#line 1602 "SourceHoldingTank.c"
+#line 1607 "SourceHoldingTank.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (old) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		source_holding_tank_unref (old);
-#line 1608 "SourceHoldingTank.c"
+#line 1613 "SourceHoldingTank.c"
 	}
 }
 
@@ -1618,19 +1623,19 @@ static void source_holding_tank_class_init (SourceHoldingTankClass * klass) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_type_class_add_private (klass, sizeof (SourceHoldingTankPrivate));
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
-	((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*)(SourceHoldingTank*, GeeCollection*, GeeCollection*)) source_holding_tank_real_notify_contents_altered;
+	((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) source_holding_tank_real_notify_contents_altered;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	((SourceHoldingTankClass *) klass)->contents_altered = source_holding_tank_real_contents_altered;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
-	g_signal_new ("contents_altered", TYPE_SOURCE_HOLDING_TANK, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceHoldingTankClass, contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION);
-#line 1626 "SourceHoldingTank.c"
+	source_holding_tank_signals[SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("contents-altered", TYPE_SOURCE_HOLDING_TANK, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceHoldingTankClass, contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION);
+#line 1631 "SourceHoldingTank.c"
 }
 
 
 static void source_holding_tank_instance_init (SourceHoldingTank * self) {
-	DataSet* _tmp0_ = NULL;
-	GeeHashSet* _tmp1_ = NULL;
-	GeeHashSet* _tmp2_ = NULL;
+	DataSet* _tmp0_;
+	GeeHashSet* _tmp1_;
+	GeeHashSet* _tmp2_;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	self->priv = SOURCE_HOLDING_TANK_GET_PRIVATE (self);
 #line 30 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1649,16 +1654,16 @@ static void source_holding_tank_instance_init (SourceHoldingTank * self) {
 	self->priv->ordinal = (gint64) 0;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	self->ref_count = 1;
-#line 1652 "SourceHoldingTank.c"
+#line 1657 "SourceHoldingTank.c"
 }
 
 
-static void source_holding_tank_finalize (SourceHoldingTank* obj) {
+static void source_holding_tank_finalize (SourceHoldingTank * obj) {
 	SourceHoldingTank * self;
-	SourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	SourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	SourceCollection* _tmp0_;
+	guint _tmp1_;
+	SourceCollection* _tmp2_;
+	guint _tmp3_;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank);
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1683,7 +1688,7 @@ static void source_holding_tank_finalize (SourceHoldingTank* obj) {
 	_g_object_unref0 (self->priv->relinks);
 #line 32 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_g_object_unref0 (self->priv->unlinking);
-#line 1686 "SourceHoldingTank.c"
+#line 1691 "SourceHoldingTank.c"
 }
 
 
@@ -1702,18 +1707,18 @@ GType source_holding_tank_get_type (void) {
 
 
 gpointer source_holding_tank_ref (gpointer instance) {
-	SourceHoldingTank* self;
+	SourceHoldingTank * self;
 	self = instance;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return instance;
-#line 1711 "SourceHoldingTank.c"
+#line 1716 "SourceHoldingTank.c"
 }
 
 
 void source_holding_tank_unref (gpointer instance) {
-	SourceHoldingTank* self;
+	SourceHoldingTank * self;
 	self = instance;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1721,7 +1726,7 @@ void source_holding_tank_unref (gpointer instance) {
 		SOURCE_HOLDING_TANK_GET_CLASS (self)->finalize (self);
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1724 "SourceHoldingTank.c"
+#line 1729 "SourceHoldingTank.c"
 	}
 }
 
diff --git a/src/core/SourceInterfaces.c b/src/core/SourceInterfaces.c
index f65f3e2..cc43f4e 100644
--- a/src/core/SourceInterfaces.c
+++ b/src/core/SourceInterfaces.c
@@ -1,4 +1,4 @@
-/* SourceInterfaces.c generated by valac 0.34.7, the Vala compiler
+/* SourceInterfaces.c generated by valac 0.36.6, the Vala compiler
  * generated from SourceInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -80,13 +80,13 @@ const gchar* indexable_get_indexable_keywords (Indexable* self) {
 
 gchar* indexable_prepare_indexable_string (const gchar* str) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 22 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 	_tmp0_ = str;
 #line 22 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
@@ -122,16 +122,16 @@ gchar* indexable_prepare_indexable_string (const gchar* str) {
 gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) {
 	gchar* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
 	GString* builder = NULL;
-	GString* _tmp3_ = NULL;
+	GString* _tmp3_;
 	gint ctr = 0;
 	const gchar* _tmp21_ = NULL;
-	GString* _tmp22_ = NULL;
-	const gchar* _tmp23_ = NULL;
-	gboolean _tmp24_ = FALSE;
-	gchar* _tmp27_ = NULL;
+	GString* _tmp22_;
+	const gchar* _tmp23_;
+	gboolean _tmp24_;
+	gchar* _tmp27_;
 #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 	_tmp1_ = strs;
 #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
@@ -142,8 +142,8 @@ gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) {
 		_tmp0_ = TRUE;
 #line 144 "SourceInterfaces.c"
 	} else {
-		gchar** _tmp2_ = NULL;
-		gint _tmp2__length1 = 0;
+		gchar** _tmp2_;
+		gint _tmp2__length1;
 #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 		_tmp2_ = strs;
 #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
@@ -174,18 +174,18 @@ gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) {
 #line 33 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 		while (TRUE) {
 #line 177 "SourceInterfaces.c"
-			gchar** _tmp8_ = NULL;
-			gint _tmp8__length1 = 0;
-			gint _tmp9_ = 0;
-			const gchar* _tmp10_ = NULL;
-			gboolean _tmp11_ = FALSE;
+			gchar** _tmp8_;
+			gint _tmp8__length1;
+			gint _tmp9_;
+			const gchar* _tmp10_;
+			gboolean _tmp11_;
 #line 33 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 			if (!_tmp4_) {
 #line 185 "SourceInterfaces.c"
-				gint _tmp5_ = 0;
-				gint _tmp6_ = 0;
-				gchar** _tmp7_ = NULL;
-				gint _tmp7__length1 = 0;
+				gint _tmp5_;
+				gint _tmp6_;
+				gchar** _tmp7_;
+				gint _tmp7__length1;
 #line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 				_tmp5_ = ctr;
 #line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
@@ -218,16 +218,16 @@ gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) {
 #line 34 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 			if (!_tmp11_) {
 #line 221 "SourceInterfaces.c"
-				GString* _tmp12_ = NULL;
-				gchar** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
-				gint _tmp14_ = 0;
-				const gchar* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
-				gchar* _tmp17_ = NULL;
-				gint _tmp18_ = 0;
-				gchar** _tmp19_ = NULL;
-				gint _tmp19__length1 = 0;
+				GString* _tmp12_;
+				gchar** _tmp13_;
+				gint _tmp13__length1;
+				gint _tmp14_;
+				const gchar* _tmp15_;
+				gchar* _tmp16_;
+				gchar* _tmp17_;
+				gint _tmp18_;
+				gchar** _tmp19_;
+				gint _tmp19__length1;
 #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 				_tmp12_ = builder;
 #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
@@ -255,7 +255,7 @@ gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) {
 #line 36 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 				if (_tmp18_ < (_tmp19__length1 - 1)) {
 #line 258 "SourceInterfaces.c"
-					GString* _tmp20_ = NULL;
+					GString* _tmp20_;
 #line 37 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 					_tmp20_ = builder;
 #line 37 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
@@ -274,8 +274,8 @@ gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) {
 #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 	if (!_tmp24_) {
 #line 277 "SourceInterfaces.c"
-		GString* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
+		GString* _tmp25_;
+		const gchar* _tmp26_;
 #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 		_tmp25_ = builder;
 #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
diff --git a/src/core/Tracker.c b/src/core/Tracker.c
index 93794c0..ff1dc00 100644
--- a/src/core/Tracker.c
+++ b/src/core/Tracker.c
@@ -1,4 +1,4 @@
-/* Tracker.c generated by valac 0.34.7, the Vala compiler
+/* Tracker.c generated by valac 0.36.6, the Vala compiler
  * generated from Tracker.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -65,6 +65,11 @@ typedef struct _DataCollectionClass DataCollectionClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _alteration_unref0(var) ((var == NULL) ? NULL : (var = (alteration_unref (var), NULL)))
 typedef struct _CoreParamSpecTracker CoreParamSpecTracker;
+enum  {
+	CORE_TRACKER_UPDATED_SIGNAL,
+	CORE_TRACKER_LAST_SIGNAL
+};
+static guint core_tracker_signals[CORE_TRACKER_LAST_SIGNAL] = {0};
 
 #define CORE_TYPE_VIEW_TRACKER (core_view_tracker_get_type ())
 #define CORE_VIEW_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CORE_TYPE_VIEW_TRACKER, CoreViewTracker))
@@ -171,7 +176,7 @@ struct _CoreViewTrackerMuxClass {
 static gpointer core_tracker_parent_class = NULL;
 static gpointer core_view_tracker_parent_class = NULL;
 static gpointer core_view_tracker_mux_parent_class = NULL;
-static CoreTrackerAccumulatorIface* core_view_tracker_mux_core_tracker_accumulator_parent_iface = NULL;
+static CoreTrackerAccumulatorIface * core_view_tracker_mux_core_tracker_accumulator_parent_iface = NULL;
 
 GType data_object_get_type (void) G_GNUC_CONST;
 gpointer alteration_ref (gpointer instance);
@@ -218,7 +223,7 @@ void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, Co
 static gboolean _core_tracker_accumulator_include_core_tracker_include_uninclude_object (DataObject* object, gpointer self);
 static gboolean _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object (DataObject* object, gpointer self);
 static void core_tracker_real_updated (CoreTracker* self);
-static void core_tracker_finalize (CoreTracker* obj);
+static void core_tracker_finalize (CoreTracker * obj);
 GType core_view_tracker_get_type (void) G_GNUC_CONST;
 static GType core_view_tracker_mux_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define CORE_VIEW_TRACKER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CORE_TYPE_VIEW_TRACKER, CoreViewTrackerPrivate))
@@ -249,8 +254,8 @@ gboolean data_view_is_visible (DataView* self);
 gboolean data_view_is_selected (DataView* self);
 static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* base, DataObject* object);
 static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration);
-static void core_view_tracker_mux_finalize (GObject* obj);
-static void core_view_tracker_finalize (CoreTracker* obj);
+static void core_view_tracker_mux_finalize (GObject * obj);
+static void core_view_tracker_finalize (CoreTracker * obj);
 
 
 gboolean core_tracker_accumulator_include (CoreTrackerAccumulator* self, DataObject* object) {
@@ -258,7 +263,7 @@ gboolean core_tracker_accumulator_include (CoreTrackerAccumulator* self, DataObj
 	g_return_val_if_fail (CORE_IS_TRACKER_ACCUMULATOR (self), FALSE);
 #line 13 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return CORE_TRACKER_ACCUMULATOR_GET_INTERFACE (self)->include (self, object);
-#line 262 "Tracker.c"
+#line 267 "Tracker.c"
 }
 
 
@@ -267,7 +272,7 @@ gboolean core_tracker_accumulator_uninclude (CoreTrackerAccumulator* self, DataO
 	g_return_val_if_fail (CORE_IS_TRACKER_ACCUMULATOR (self), FALSE);
 #line 15 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return CORE_TRACKER_ACCUMULATOR_GET_INTERFACE (self)->uninclude (self, object);
-#line 271 "Tracker.c"
+#line 276 "Tracker.c"
 }
 
 
@@ -276,7 +281,7 @@ gboolean core_tracker_accumulator_altered (CoreTrackerAccumulator* self, DataObj
 	g_return_val_if_fail (CORE_IS_TRACKER_ACCUMULATOR (self), FALSE);
 #line 17 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return CORE_TRACKER_ACCUMULATOR_GET_INTERFACE (self)->altered (self, object, alteration);
-#line 280 "Tracker.c"
+#line 285 "Tracker.c"
 }
 
 
@@ -287,7 +292,7 @@ static void core_tracker_accumulator_base_init (CoreTrackerAccumulatorIface * if
 	if (!initialized) {
 #line 12 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		initialized = TRUE;
-#line 291 "Tracker.c"
+#line 296 "Tracker.c"
 	}
 }
 
@@ -308,44 +313,44 @@ GType core_tracker_accumulator_get_type (void) {
 static void _core_tracker_on_items_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) {
 #line 40 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_tracker_on_items_added ((CoreTracker*) self, added);
-#line 312 "Tracker.c"
+#line 317 "Tracker.c"
 }
 
 
 static void _core_tracker_on_items_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) {
 #line 41 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_tracker_on_items_removed ((CoreTracker*) self, removed);
-#line 319 "Tracker.c"
+#line 324 "Tracker.c"
 }
 
 
 static void _core_tracker_on_items_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_tracker_on_items_altered ((CoreTracker*) self, items);
-#line 326 "Tracker.c"
+#line 331 "Tracker.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 34 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 333 "Tracker.c"
+#line 338 "Tracker.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 35 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 340 "Tracker.c"
+#line 345 "Tracker.c"
 }
 
 
 CoreTracker* core_tracker_construct (GType object_type, DataCollection* collection, GeeCollection* initial) {
 	CoreTracker* self = NULL;
-	DataCollection* _tmp0_ = NULL;
-	DataCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
+	DataCollection* _tmp0_;
+	DataCollection* _tmp1_;
+	GeeCollection* _tmp2_;
+	GeeCollection* _tmp3_;
 #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_val_if_fail (IS_DATA_COLLECTION (collection), NULL);
 #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -370,26 +375,26 @@ CoreTracker* core_tracker_construct (GType object_type, DataCollection* collecti
 	self->priv->initial = _tmp3_;
 #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return self;
-#line 374 "Tracker.c"
+#line 379 "Tracker.c"
 }
 
 
 CoreTracker* core_tracker_new (DataCollection* collection, GeeCollection* initial) {
 #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return core_tracker_construct (CORE_TYPE_TRACKER, collection, initial);
-#line 381 "Tracker.c"
+#line 386 "Tracker.c"
 }
 
 
 void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc) {
-	CoreTrackerAccumulator* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
-	CoreTrackerAccumulator* _tmp2_ = NULL;
-	DataCollection* _tmp3_ = NULL;
-	DataCollection* _tmp4_ = NULL;
-	DataCollection* _tmp5_ = NULL;
+	CoreTrackerAccumulator* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
+	CoreTrackerAccumulator* _tmp2_;
+	DataCollection* _tmp3_;
+	DataCollection* _tmp4_;
+	DataCollection* _tmp5_;
 	gboolean _tmp6_ = FALSE;
-	GeeCollection* _tmp7_ = NULL;
+	GeeCollection* _tmp7_;
 #line 46 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_TRACKER (self));
 #line 46 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -422,10 +427,10 @@ void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc) {
 	_tmp7_ = self->priv->initial;
 #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp7_ != NULL) {
-#line 426 "Tracker.c"
-		GeeCollection* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
+#line 431 "Tracker.c"
+		GeeCollection* _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
 #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp8_ = self->priv->initial;
 #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -434,31 +439,31 @@ void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc) {
 		_tmp10_ = _tmp9_;
 #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp6_ = _tmp10_ > 0;
-#line 438 "Tracker.c"
+#line 443 "Tracker.c"
 	} else {
 #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp6_ = FALSE;
-#line 442 "Tracker.c"
+#line 447 "Tracker.c"
 	}
 #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp6_) {
-#line 446 "Tracker.c"
-		GeeCollection* _tmp11_ = NULL;
+#line 451 "Tracker.c"
+		GeeCollection* _tmp11_;
 #line 57 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp11_ = self->priv->initial;
 #line 57 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_on_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 452 "Tracker.c"
+#line 457 "Tracker.c"
 	} else {
-		GeeCollection* _tmp12_ = NULL;
+		GeeCollection* _tmp12_;
 #line 58 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp12_ = self->priv->initial;
 #line 58 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		if (_tmp12_ == NULL) {
-#line 459 "Tracker.c"
-			DataCollection* _tmp13_ = NULL;
-			GeeCollection* _tmp14_ = NULL;
-			GeeCollection* _tmp15_ = NULL;
+#line 464 "Tracker.c"
+			DataCollection* _tmp13_;
+			GeeCollection* _tmp14_;
+			GeeCollection* _tmp15_;
 #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp13_ = self->priv->collection;
 #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -469,21 +474,21 @@ void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc) {
 			core_tracker_on_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_g_object_unref0 (_tmp15_);
-#line 473 "Tracker.c"
+#line 478 "Tracker.c"
 		}
 	}
 #line 61 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_g_object_unref0 (self->priv->initial);
 #line 61 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self->priv->initial = NULL;
-#line 480 "Tracker.c"
+#line 485 "Tracker.c"
 }
 
 
 DataCollection* core_tracker_get_collection (CoreTracker* self) {
 	DataCollection* result = NULL;
-	DataCollection* _tmp0_ = NULL;
-	DataCollection* _tmp1_ = NULL;
+	DataCollection* _tmp0_;
+	DataCollection* _tmp1_;
 #line 64 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_val_if_fail (CORE_IS_TRACKER (self), NULL);
 #line 65 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -494,7 +499,7 @@ DataCollection* core_tracker_get_collection (CoreTracker* self) {
 	result = _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return result;
-#line 498 "Tracker.c"
+#line 503 "Tracker.c"
 }
 
 
@@ -503,13 +508,13 @@ static gboolean _core_tracker_accumulator_include_core_tracker_include_uninclude
 	result = core_tracker_accumulator_include ((CoreTrackerAccumulator*) self, object);
 #line 69 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return result;
-#line 507 "Tracker.c"
+#line 512 "Tracker.c"
 }
 
 
 static void core_tracker_on_items_added (CoreTracker* self, GeeIterable* added) {
-	GeeIterable* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
+	GeeIterable* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_TRACKER (self));
 #line 68 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -520,7 +525,7 @@ static void core_tracker_on_items_added (CoreTracker* self, GeeIterable* added)
 	_tmp1_ = self->priv->acc;
 #line 69 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_tracker_include_uninclude (self, _tmp0_, _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp1_);
-#line 524 "Tracker.c"
+#line 529 "Tracker.c"
 }
 
 
@@ -529,13 +534,13 @@ static gboolean _core_tracker_accumulator_uninclude_core_tracker_include_uninclu
 	result = core_tracker_accumulator_uninclude ((CoreTrackerAccumulator*) self, object);
 #line 73 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return result;
-#line 533 "Tracker.c"
+#line 538 "Tracker.c"
 }
 
 
 static void core_tracker_on_items_removed (CoreTracker* self, GeeIterable* removed) {
-	GeeIterable* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
+	GeeIterable* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
 #line 72 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_TRACKER (self));
 #line 72 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -546,24 +551,24 @@ static void core_tracker_on_items_removed (CoreTracker* self, GeeIterable* remov
 	_tmp1_ = self->priv->acc;
 #line 73 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_tracker_include_uninclude (self, _tmp0_, _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp1_);
-#line 550 "Tracker.c"
+#line 555 "Tracker.c"
 }
 
 
 void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, CoreTrackerIncludeUnincludeObject cb, void* cb_target) {
 	gboolean fire_updated = FALSE;
-	gboolean _tmp11_ = FALSE;
+	gboolean _tmp11_;
 #line 77 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_TRACKER (self));
 #line 77 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (objects));
 #line 78 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	fire_updated = FALSE;
-#line 563 "Tracker.c"
+#line 568 "Tracker.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp0_ = objects;
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -572,17 +577,17 @@ void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, Co
 		_object_it = _tmp1_;
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		while (TRUE) {
-#line 576 "Tracker.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 581 "Tracker.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			gboolean _tmp6_ = FALSE;
-			CoreTrackerIncludeUnincludeObject _tmp7_ = NULL;
-			void* _tmp7__target = NULL;
-			DataObject* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			CoreTrackerIncludeUnincludeObject _tmp7_;
+			void* _tmp7__target;
+			DataObject* _tmp8_;
+			gboolean _tmp9_;
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp2_ = _object_it;
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -591,7 +596,7 @@ void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, Co
 			if (!_tmp3_) {
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 				break;
-#line 595 "Tracker.c"
+#line 600 "Tracker.c"
 			}
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp4_ = _object_it;
@@ -611,54 +616,54 @@ void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, Co
 			if (_tmp9_) {
 #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 				_tmp6_ = TRUE;
-#line 615 "Tracker.c"
+#line 620 "Tracker.c"
 			} else {
-				gboolean _tmp10_ = FALSE;
+				gboolean _tmp10_;
 #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 				_tmp10_ = fire_updated;
 #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 				_tmp6_ = _tmp10_;
-#line 622 "Tracker.c"
+#line 627 "Tracker.c"
 			}
 #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			fire_updated = _tmp6_;
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_g_object_unref0 (object);
-#line 628 "Tracker.c"
+#line 633 "Tracker.c"
 		}
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_g_object_unref0 (_object_it);
-#line 632 "Tracker.c"
+#line 637 "Tracker.c"
 	}
 #line 82 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp11_ = fire_updated;
 #line 82 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp11_) {
 #line 83 "/home/jens/Source/shotwell/src/core/Tracker.vala"
-		g_signal_emit_by_name (self, "updated");
-#line 640 "Tracker.c"
+		g_signal_emit (self, core_tracker_signals[CORE_TRACKER_UPDATED_SIGNAL], 0);
+#line 645 "Tracker.c"
 	}
 }
 
 
 static void core_tracker_on_items_altered (CoreTracker* self, GeeMap* map) {
 	gboolean fire_updated = FALSE;
-	gboolean _tmp20_ = FALSE;
+	gboolean _tmp20_;
 #line 86 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_TRACKER (self));
 #line 86 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
 #line 87 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	fire_updated = FALSE;
-#line 654 "Tracker.c"
+#line 659 "Tracker.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp0_ = map;
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -677,21 +682,21 @@ static void core_tracker_on_items_altered (CoreTracker* self, GeeMap* map) {
 		_object_it = _tmp5_;
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		while (TRUE) {
-#line 681 "Tracker.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 686 "Tracker.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			gboolean _tmp10_ = FALSE;
-			CoreTrackerAccumulator* _tmp11_ = NULL;
-			DataObject* _tmp12_ = NULL;
-			GeeMap* _tmp13_ = NULL;
-			DataObject* _tmp14_ = NULL;
-			gpointer _tmp15_ = NULL;
-			Alteration* _tmp16_ = NULL;
-			gboolean _tmp17_ = FALSE;
-			gboolean _tmp18_ = FALSE;
+			CoreTrackerAccumulator* _tmp11_;
+			DataObject* _tmp12_;
+			GeeMap* _tmp13_;
+			DataObject* _tmp14_;
+			gpointer _tmp15_;
+			Alteration* _tmp16_;
+			gboolean _tmp17_;
+			gboolean _tmp18_;
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp6_ = _object_it;
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -700,7 +705,7 @@ static void core_tracker_on_items_altered (CoreTracker* self, GeeMap* map) {
 			if (!_tmp7_) {
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 				break;
-#line 704 "Tracker.c"
+#line 709 "Tracker.c"
 			}
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp8_ = _object_it;
@@ -730,32 +735,32 @@ static void core_tracker_on_items_altered (CoreTracker* self, GeeMap* map) {
 			if (_tmp18_) {
 #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 				_tmp10_ = TRUE;
-#line 734 "Tracker.c"
+#line 739 "Tracker.c"
 			} else {
-				gboolean _tmp19_ = FALSE;
+				gboolean _tmp19_;
 #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 				_tmp19_ = fire_updated;
 #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 				_tmp10_ = _tmp19_;
-#line 741 "Tracker.c"
+#line 746 "Tracker.c"
 			}
 #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			fire_updated = _tmp10_;
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_g_object_unref0 (object);
-#line 747 "Tracker.c"
+#line 752 "Tracker.c"
 		}
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_g_object_unref0 (_object_it);
-#line 751 "Tracker.c"
+#line 756 "Tracker.c"
 	}
 #line 91 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp20_ = fire_updated;
 #line 91 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp20_) {
 #line 92 "/home/jens/Source/shotwell/src/core/Tracker.vala"
-		g_signal_emit_by_name (self, "updated");
-#line 759 "Tracker.c"
+		g_signal_emit (self, core_tracker_signals[CORE_TRACKER_UPDATED_SIGNAL], 0);
+#line 764 "Tracker.c"
 	}
 }
 
@@ -767,7 +772,7 @@ static void core_tracker_real_updated (CoreTracker* self) {
 static void core_value_tracker_init (GValue* value) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	value->data[0].v_pointer = NULL;
-#line 771 "Tracker.c"
+#line 776 "Tracker.c"
 }
 
 
@@ -776,7 +781,7 @@ static void core_value_tracker_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_unref (value->data[0].v_pointer);
-#line 780 "Tracker.c"
+#line 785 "Tracker.c"
 	}
 }
 
@@ -786,11 +791,11 @@ static void core_value_tracker_copy_value (const GValue* src_value, GValue* dest
 	if (src_value->data[0].v_pointer) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		dest_value->data[0].v_pointer = core_tracker_ref (src_value->data[0].v_pointer);
-#line 790 "Tracker.c"
+#line 795 "Tracker.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 794 "Tracker.c"
+#line 799 "Tracker.c"
 	}
 }
 
@@ -798,66 +803,66 @@ static void core_value_tracker_copy_value (const GValue* src_value, GValue* dest
 static gpointer core_value_tracker_peek_pointer (const GValue* value) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return value->data[0].v_pointer;
-#line 802 "Tracker.c"
+#line 807 "Tracker.c"
 }
 
 
 static gchar* core_value_tracker_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (collect_values[0].v_pointer) {
-#line 809 "Tracker.c"
-		CoreTracker* object;
+#line 814 "Tracker.c"
+		CoreTracker * object;
 		object = collect_values[0].v_pointer;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 816 "Tracker.c"
+#line 821 "Tracker.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 820 "Tracker.c"
+#line 825 "Tracker.c"
 		}
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		value->data[0].v_pointer = core_tracker_ref (object);
-#line 824 "Tracker.c"
+#line 829 "Tracker.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		value->data[0].v_pointer = NULL;
-#line 828 "Tracker.c"
+#line 833 "Tracker.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return NULL;
-#line 832 "Tracker.c"
+#line 837 "Tracker.c"
 }
 
 
 static gchar* core_value_tracker_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	CoreTracker** object_p;
+	CoreTracker ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (!object_p) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 843 "Tracker.c"
+#line 848 "Tracker.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (!value->data[0].v_pointer) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		*object_p = NULL;
-#line 849 "Tracker.c"
+#line 854 "Tracker.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		*object_p = value->data[0].v_pointer;
-#line 853 "Tracker.c"
+#line 858 "Tracker.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		*object_p = core_tracker_ref (value->data[0].v_pointer);
-#line 857 "Tracker.c"
+#line 862 "Tracker.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return NULL;
-#line 861 "Tracker.c"
+#line 866 "Tracker.c"
 }
 
 
@@ -871,7 +876,7 @@ GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return G_PARAM_SPEC (spec);
-#line 875 "Tracker.c"
+#line 880 "Tracker.c"
 }
 
 
@@ -880,12 +885,12 @@ gpointer core_value_get_tracker (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CORE_TYPE_TRACKER), NULL);
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return value->data[0].v_pointer;
-#line 884 "Tracker.c"
+#line 889 "Tracker.c"
 }
 
 
 void core_value_set_tracker (GValue* value, gpointer v_object) {
-	CoreTracker* old;
+	CoreTracker * old;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CORE_TYPE_TRACKER));
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -900,23 +905,23 @@ void core_value_set_tracker (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_ref (value->data[0].v_pointer);
-#line 904 "Tracker.c"
+#line 909 "Tracker.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		value->data[0].v_pointer = NULL;
-#line 908 "Tracker.c"
+#line 913 "Tracker.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (old) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_unref (old);
-#line 914 "Tracker.c"
+#line 919 "Tracker.c"
 	}
 }
 
 
 void core_value_take_tracker (GValue* value, gpointer v_object) {
-	CoreTracker* old;
+	CoreTracker * old;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CORE_TYPE_TRACKER));
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -929,17 +934,17 @@ void core_value_take_tracker (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		value->data[0].v_pointer = v_object;
-#line 933 "Tracker.c"
+#line 938 "Tracker.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		value->data[0].v_pointer = NULL;
-#line 937 "Tracker.c"
+#line 942 "Tracker.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (old) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_unref (old);
-#line 943 "Tracker.c"
+#line 948 "Tracker.c"
 	}
 }
 
@@ -954,8 +959,8 @@ static void core_tracker_class_init (CoreTrackerClass * klass) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	((CoreTrackerClass *) klass)->updated = core_tracker_real_updated;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
-	g_signal_new ("updated", CORE_TYPE_TRACKER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (CoreTrackerClass, updated), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 959 "Tracker.c"
+	core_tracker_signals[CORE_TRACKER_UPDATED_SIGNAL] = g_signal_new ("updated", CORE_TYPE_TRACKER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (CoreTrackerClass, updated), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 964 "Tracker.c"
 }
 
 
@@ -966,13 +971,13 @@ static void core_tracker_instance_init (CoreTracker * self) {
 	self->priv->acc = NULL;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self->ref_count = 1;
-#line 970 "Tracker.c"
+#line 975 "Tracker.c"
 }
 
 
-static void core_tracker_finalize (CoreTracker* obj) {
+static void core_tracker_finalize (CoreTracker * obj) {
 	CoreTracker * self;
-	CoreTrackerAccumulator* _tmp0_ = NULL;
+	CoreTrackerAccumulator* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CORE_TYPE_TRACKER, CoreTracker);
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -981,13 +986,13 @@ static void core_tracker_finalize (CoreTracker* obj) {
 	_tmp0_ = self->priv->acc;
 #line 39 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp0_ != NULL) {
-#line 985 "Tracker.c"
-		DataCollection* _tmp1_ = NULL;
-		guint _tmp2_ = 0U;
-		DataCollection* _tmp3_ = NULL;
-		guint _tmp4_ = 0U;
-		DataCollection* _tmp5_ = NULL;
-		guint _tmp6_ = 0U;
+#line 990 "Tracker.c"
+		DataCollection* _tmp1_;
+		guint _tmp2_;
+		DataCollection* _tmp3_;
+		guint _tmp4_;
+		DataCollection* _tmp5_;
+		guint _tmp6_;
 #line 40 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp1_ = self->priv->collection;
 #line 40 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1006,7 +1011,7 @@ static void core_tracker_finalize (CoreTracker* obj) {
 		g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp6_, NULL, FALSE);
 #line 42 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _core_tracker_on_items_altered_data_collection_items_altered, self);
-#line 1010 "Tracker.c"
+#line 1015 "Tracker.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_data_collection_unref0 (self->priv->collection);
@@ -1014,7 +1019,7 @@ static void core_tracker_finalize (CoreTracker* obj) {
 	_g_object_unref0 (self->priv->initial);
 #line 28 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_g_object_unref0 (self->priv->acc);
-#line 1018 "Tracker.c"
+#line 1023 "Tracker.c"
 }
 
 
@@ -1033,18 +1038,18 @@ GType core_tracker_get_type (void) {
 
 
 gpointer core_tracker_ref (gpointer instance) {
-	CoreTracker* self;
+	CoreTracker * self;
 	self = instance;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return instance;
-#line 1043 "Tracker.c"
+#line 1048 "Tracker.c"
 }
 
 
 void core_tracker_unref (gpointer instance) {
-	CoreTracker* self;
+	CoreTracker * self;
 	self = instance;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1052,7 +1057,7 @@ void core_tracker_unref (gpointer instance) {
 		CORE_TRACKER_GET_CLASS (self)->finalize (self);
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1056 "Tracker.c"
+#line 1061 "Tracker.c"
 	}
 }
 
@@ -1060,37 +1065,37 @@ void core_tracker_unref (gpointer instance) {
 static void _core_view_tracker_on_items_shown_view_collection_items_shown (ViewCollection* _sender, GeeCollection* visible, gpointer self) {
 #line 173 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_view_tracker_on_items_shown ((CoreViewTracker*) self, visible);
-#line 1064 "Tracker.c"
+#line 1069 "Tracker.c"
 }
 
 
 static void _core_view_tracker_on_items_hidden_view_collection_items_hidden (ViewCollection* _sender, GeeCollection* hidden, gpointer self) {
 #line 174 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_view_tracker_on_items_hidden ((CoreViewTracker*) self, hidden);
-#line 1071 "Tracker.c"
+#line 1076 "Tracker.c"
 }
 
 
 static void _core_view_tracker_on_items_selected_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) {
 #line 175 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_view_tracker_on_items_selected ((CoreViewTracker*) self, selected);
-#line 1078 "Tracker.c"
+#line 1083 "Tracker.c"
 }
 
 
 static void _core_view_tracker_on_items_unselected_view_collection_items_unselected (ViewCollection* _sender, GeeIterable* unselected, gpointer self) {
 #line 176 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_view_tracker_on_items_unselected ((CoreViewTracker*) self, unselected);
-#line 1085 "Tracker.c"
+#line 1090 "Tracker.c"
 }
 
 
 CoreViewTracker* core_view_tracker_construct (GType object_type, ViewCollection* collection) {
 	CoreViewTracker* self = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	GeeCollection* _tmp2_;
+	GeeCollection* _tmp3_;
 #line 165 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (collection), NULL);
 #line 166 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1107,27 +1112,27 @@ CoreViewTracker* core_view_tracker_construct (GType object_type, ViewCollection*
 	_g_object_unref0 (_tmp3_);
 #line 165 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return self;
-#line 1111 "Tracker.c"
+#line 1116 "Tracker.c"
 }
 
 
 CoreViewTracker* core_view_tracker_new (ViewCollection* collection) {
 #line 165 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return core_view_tracker_construct (CORE_TYPE_VIEW_TRACKER, collection);
-#line 1118 "Tracker.c"
+#line 1123 "Tracker.c"
 }
 
 
 void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected) {
-	CoreViewTrackerMux* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
-	CoreTrackerAccumulator* _tmp2_ = NULL;
-	CoreTrackerAccumulator* _tmp3_ = NULL;
-	CoreViewTrackerMux* _tmp4_ = NULL;
+	CoreViewTrackerMux* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
+	CoreTrackerAccumulator* _tmp2_;
+	CoreTrackerAccumulator* _tmp3_;
+	CoreViewTrackerMux* _tmp4_;
 	ViewCollection* collection = NULL;
-	DataCollection* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	CoreViewTrackerMux* _tmp7_ = NULL;
+	DataCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	CoreViewTrackerMux* _tmp7_;
 #line 180 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_VIEW_TRACKER (self));
 #line 180 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1160,7 +1165,7 @@ void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all
 	if (_tmp6_ == NULL) {
 #line 185 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 1164 "Tracker.c"
+#line 1169 "Tracker.c"
 	}
 #line 185 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	collection = _tmp6_;
@@ -1180,13 +1185,13 @@ void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all
 	core_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator));
 #line 180 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_data_collection_unref0 (collection);
-#line 1184 "Tracker.c"
+#line 1189 "Tracker.c"
 }
 
 
 static void core_view_tracker_on_items_shown (CoreViewTracker* self, GeeCollection* shown) {
-	CoreViewTrackerMux* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
+	CoreViewTrackerMux* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
 #line 195 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_VIEW_TRACKER (self));
 #line 195 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1197,10 +1202,10 @@ static void core_view_tracker_on_items_shown (CoreViewTracker* self, GeeCollecti
 	_tmp1_ = _tmp0_->visible;
 #line 196 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp1_ != NULL) {
-#line 1201 "Tracker.c"
-		GeeCollection* _tmp2_ = NULL;
-		CoreViewTrackerMux* _tmp3_ = NULL;
-		CoreTrackerAccumulator* _tmp4_ = NULL;
+#line 1206 "Tracker.c"
+		GeeCollection* _tmp2_;
+		CoreViewTrackerMux* _tmp3_;
+		CoreTrackerAccumulator* _tmp4_;
 #line 197 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp2_ = shown;
 #line 197 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1209,14 +1214,14 @@ static void core_view_tracker_on_items_shown (CoreViewTracker* self, GeeCollecti
 		_tmp4_ = _tmp3_->visible;
 #line 197 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable), _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp4_);
-#line 1213 "Tracker.c"
+#line 1218 "Tracker.c"
 	}
 }
 
 
 static void core_view_tracker_on_items_hidden (CoreViewTracker* self, GeeCollection* hidden) {
-	CoreViewTrackerMux* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
+	CoreViewTrackerMux* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
 #line 200 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_VIEW_TRACKER (self));
 #line 200 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1227,10 +1232,10 @@ static void core_view_tracker_on_items_hidden (CoreViewTracker* self, GeeCollect
 	_tmp1_ = _tmp0_->visible;
 #line 201 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp1_ != NULL) {
-#line 1231 "Tracker.c"
-		GeeCollection* _tmp2_ = NULL;
-		CoreViewTrackerMux* _tmp3_ = NULL;
-		CoreTrackerAccumulator* _tmp4_ = NULL;
+#line 1236 "Tracker.c"
+		GeeCollection* _tmp2_;
+		CoreViewTrackerMux* _tmp3_;
+		CoreTrackerAccumulator* _tmp4_;
 #line 202 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp2_ = hidden;
 #line 202 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1239,14 +1244,14 @@ static void core_view_tracker_on_items_hidden (CoreViewTracker* self, GeeCollect
 		_tmp4_ = _tmp3_->visible;
 #line 202 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable), _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp4_);
-#line 1243 "Tracker.c"
+#line 1248 "Tracker.c"
 	}
 }
 
 
 static void core_view_tracker_on_items_selected (CoreViewTracker* self, GeeIterable* selected) {
-	CoreViewTrackerMux* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
+	CoreViewTrackerMux* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
 #line 205 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_VIEW_TRACKER (self));
 #line 205 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1257,10 +1262,10 @@ static void core_view_tracker_on_items_selected (CoreViewTracker* self, GeeItera
 	_tmp1_ = _tmp0_->selected;
 #line 206 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp1_ != NULL) {
-#line 1261 "Tracker.c"
-		GeeIterable* _tmp2_ = NULL;
-		CoreViewTrackerMux* _tmp3_ = NULL;
-		CoreTrackerAccumulator* _tmp4_ = NULL;
+#line 1266 "Tracker.c"
+		GeeIterable* _tmp2_;
+		CoreViewTrackerMux* _tmp3_;
+		CoreTrackerAccumulator* _tmp4_;
 #line 207 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp2_ = selected;
 #line 207 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1269,14 +1274,14 @@ static void core_view_tracker_on_items_selected (CoreViewTracker* self, GeeItera
 		_tmp4_ = _tmp3_->selected;
 #line 207 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), _tmp2_, _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp4_);
-#line 1273 "Tracker.c"
+#line 1278 "Tracker.c"
 	}
 }
 
 
 static void core_view_tracker_on_items_unselected (CoreViewTracker* self, GeeIterable* unselected) {
-	CoreViewTrackerMux* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
+	CoreViewTrackerMux* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
 #line 210 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_VIEW_TRACKER (self));
 #line 210 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1287,10 +1292,10 @@ static void core_view_tracker_on_items_unselected (CoreViewTracker* self, GeeIte
 	_tmp1_ = _tmp0_->selected;
 #line 211 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp1_ != NULL) {
-#line 1291 "Tracker.c"
-		GeeIterable* _tmp2_ = NULL;
-		CoreViewTrackerMux* _tmp3_ = NULL;
-		CoreTrackerAccumulator* _tmp4_ = NULL;
+#line 1296 "Tracker.c"
+		GeeIterable* _tmp2_;
+		CoreViewTrackerMux* _tmp3_;
+		CoreTrackerAccumulator* _tmp4_;
 #line 212 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp2_ = unselected;
 #line 212 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1299,19 +1304,19 @@ static void core_view_tracker_on_items_unselected (CoreViewTracker* self, GeeIte
 		_tmp4_ = _tmp3_->selected;
 #line 212 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), _tmp2_, _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp4_);
-#line 1303 "Tracker.c"
+#line 1308 "Tracker.c"
 	}
 }
 
 
 static CoreViewTrackerMux* core_view_tracker_mux_construct (GType object_type, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected) {
 	CoreViewTrackerMux * self = NULL;
-	CoreTrackerAccumulator* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
-	CoreTrackerAccumulator* _tmp2_ = NULL;
-	CoreTrackerAccumulator* _tmp3_ = NULL;
-	CoreTrackerAccumulator* _tmp4_ = NULL;
-	CoreTrackerAccumulator* _tmp5_ = NULL;
+	CoreTrackerAccumulator* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
+	CoreTrackerAccumulator* _tmp2_;
+	CoreTrackerAccumulator* _tmp3_;
+	CoreTrackerAccumulator* _tmp4_;
+	CoreTrackerAccumulator* _tmp5_;
 #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_val_if_fail ((all == NULL) || CORE_IS_TRACKER_ACCUMULATOR (all), NULL);
 #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1346,14 +1351,14 @@ static CoreViewTrackerMux* core_view_tracker_mux_construct (GType object_type, C
 	self->selected = _tmp5_;
 #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return self;
-#line 1350 "Tracker.c"
+#line 1355 "Tracker.c"
 }
 
 
 static CoreViewTrackerMux* core_view_tracker_mux_new (CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected) {
 #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return core_view_tracker_mux_construct (CORE_VIEW_TRACKER_TYPE_MUX, all, visible, selected);
-#line 1357 "Tracker.c"
+#line 1362 "Tracker.c"
 }
 
 
@@ -1361,14 +1366,14 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base
 	CoreViewTrackerMux * self;
 	gboolean result = FALSE;
 	DataView* view = NULL;
-	DataObject* _tmp0_ = NULL;
-	DataView* _tmp1_ = NULL;
+	DataObject* _tmp0_;
+	DataView* _tmp1_;
 	gboolean fire_updated = FALSE;
-	CoreTrackerAccumulator* _tmp2_ = NULL;
+	CoreTrackerAccumulator* _tmp2_;
 	gboolean _tmp8_ = FALSE;
-	CoreTrackerAccumulator* _tmp9_ = NULL;
+	CoreTrackerAccumulator* _tmp9_;
 	gboolean _tmp17_ = FALSE;
-	CoreTrackerAccumulator* _tmp18_ = NULL;
+	CoreTrackerAccumulator* _tmp18_;
 #line 111 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, CORE_VIEW_TRACKER_TYPE_MUX, CoreViewTrackerMux);
 #line 111 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1385,11 +1390,11 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base
 	_tmp2_ = self->all;
 #line 116 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp2_ != NULL) {
-#line 1389 "Tracker.c"
+#line 1394 "Tracker.c"
 		gboolean _tmp3_ = FALSE;
-		CoreTrackerAccumulator* _tmp4_ = NULL;
-		DataView* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		CoreTrackerAccumulator* _tmp4_;
+		DataView* _tmp5_;
+		gboolean _tmp6_;
 #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp4_ = self->all;
 #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1400,45 +1405,45 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base
 		if (_tmp6_) {
 #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp3_ = TRUE;
-#line 1404 "Tracker.c"
+#line 1409 "Tracker.c"
 		} else {
-			gboolean _tmp7_ = FALSE;
+			gboolean _tmp7_;
 #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp7_ = fire_updated;
 #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp3_ = _tmp7_;
-#line 1411 "Tracker.c"
+#line 1416 "Tracker.c"
 		}
 #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp3_;
-#line 1415 "Tracker.c"
+#line 1420 "Tracker.c"
 	}
 #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp9_ = self->visible;
 #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp9_ != NULL) {
-#line 1421 "Tracker.c"
-		DataView* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
+#line 1426 "Tracker.c"
+		DataView* _tmp10_;
+		gboolean _tmp11_;
 #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp10_ = view;
 #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp11_ = data_view_is_visible (_tmp10_);
 #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp8_ = _tmp11_;
-#line 1430 "Tracker.c"
+#line 1435 "Tracker.c"
 	} else {
 #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp8_ = FALSE;
-#line 1434 "Tracker.c"
+#line 1439 "Tracker.c"
 	}
 #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp8_) {
-#line 1438 "Tracker.c"
+#line 1443 "Tracker.c"
 		gboolean _tmp12_ = FALSE;
-		CoreTrackerAccumulator* _tmp13_ = NULL;
-		DataView* _tmp14_ = NULL;
-		gboolean _tmp15_ = FALSE;
+		CoreTrackerAccumulator* _tmp13_;
+		DataView* _tmp14_;
+		gboolean _tmp15_;
 #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp13_ = self->visible;
 #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1449,45 +1454,45 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base
 		if (_tmp15_) {
 #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp12_ = TRUE;
-#line 1453 "Tracker.c"
+#line 1458 "Tracker.c"
 		} else {
-			gboolean _tmp16_ = FALSE;
+			gboolean _tmp16_;
 #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp16_ = fire_updated;
 #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp12_ = _tmp16_;
-#line 1460 "Tracker.c"
+#line 1465 "Tracker.c"
 		}
 #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp12_;
-#line 1464 "Tracker.c"
+#line 1469 "Tracker.c"
 	}
 #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp18_ = self->selected;
 #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp18_ != NULL) {
-#line 1470 "Tracker.c"
-		DataView* _tmp19_ = NULL;
-		gboolean _tmp20_ = FALSE;
+#line 1475 "Tracker.c"
+		DataView* _tmp19_;
+		gboolean _tmp20_;
 #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp19_ = view;
 #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp20_ = data_view_is_selected (_tmp19_);
 #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp17_ = _tmp20_;
-#line 1479 "Tracker.c"
+#line 1484 "Tracker.c"
 	} else {
 #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp17_ = FALSE;
-#line 1483 "Tracker.c"
+#line 1488 "Tracker.c"
 	}
 #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp17_) {
-#line 1487 "Tracker.c"
+#line 1492 "Tracker.c"
 		gboolean _tmp21_ = FALSE;
-		CoreTrackerAccumulator* _tmp22_ = NULL;
-		DataView* _tmp23_ = NULL;
-		gboolean _tmp24_ = FALSE;
+		CoreTrackerAccumulator* _tmp22_;
+		DataView* _tmp23_;
+		gboolean _tmp24_;
 #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp22_ = self->selected;
 #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1498,18 +1503,18 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base
 		if (_tmp24_) {
 #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp21_ = TRUE;
-#line 1502 "Tracker.c"
+#line 1507 "Tracker.c"
 		} else {
-			gboolean _tmp25_ = FALSE;
+			gboolean _tmp25_;
 #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp25_ = fire_updated;
 #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp21_ = _tmp25_;
-#line 1509 "Tracker.c"
+#line 1514 "Tracker.c"
 		}
 #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp21_;
-#line 1513 "Tracker.c"
+#line 1518 "Tracker.c"
 	}
 #line 125 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	result = fire_updated;
@@ -1517,7 +1522,7 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base
 	_g_object_unref0 (view);
 #line 125 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return result;
-#line 1521 "Tracker.c"
+#line 1526 "Tracker.c"
 }
 
 
@@ -1525,14 +1530,14 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba
 	CoreViewTrackerMux * self;
 	gboolean result = FALSE;
 	DataView* view = NULL;
-	DataObject* _tmp0_ = NULL;
-	DataView* _tmp1_ = NULL;
+	DataObject* _tmp0_;
+	DataView* _tmp1_;
 	gboolean fire_updated = FALSE;
-	CoreTrackerAccumulator* _tmp2_ = NULL;
+	CoreTrackerAccumulator* _tmp2_;
 	gboolean _tmp8_ = FALSE;
-	CoreTrackerAccumulator* _tmp9_ = NULL;
+	CoreTrackerAccumulator* _tmp9_;
 	gboolean _tmp17_ = FALSE;
-	CoreTrackerAccumulator* _tmp18_ = NULL;
+	CoreTrackerAccumulator* _tmp18_;
 #line 128 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, CORE_VIEW_TRACKER_TYPE_MUX, CoreViewTrackerMux);
 #line 128 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1549,11 +1554,11 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba
 	_tmp2_ = self->all;
 #line 133 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp2_ != NULL) {
-#line 1553 "Tracker.c"
+#line 1558 "Tracker.c"
 		gboolean _tmp3_ = FALSE;
-		CoreTrackerAccumulator* _tmp4_ = NULL;
-		DataView* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		CoreTrackerAccumulator* _tmp4_;
+		DataView* _tmp5_;
+		gboolean _tmp6_;
 #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp4_ = self->all;
 #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1564,45 +1569,45 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba
 		if (_tmp6_) {
 #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp3_ = TRUE;
-#line 1568 "Tracker.c"
+#line 1573 "Tracker.c"
 		} else {
-			gboolean _tmp7_ = FALSE;
+			gboolean _tmp7_;
 #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp7_ = fire_updated;
 #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp3_ = _tmp7_;
-#line 1575 "Tracker.c"
+#line 1580 "Tracker.c"
 		}
 #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp3_;
-#line 1579 "Tracker.c"
+#line 1584 "Tracker.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp9_ = self->visible;
 #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp9_ != NULL) {
-#line 1585 "Tracker.c"
-		DataView* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
+#line 1590 "Tracker.c"
+		DataView* _tmp10_;
+		gboolean _tmp11_;
 #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp10_ = view;
 #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp11_ = data_view_is_visible (_tmp10_);
 #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp8_ = _tmp11_;
-#line 1594 "Tracker.c"
+#line 1599 "Tracker.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp8_ = FALSE;
-#line 1598 "Tracker.c"
+#line 1603 "Tracker.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp8_) {
-#line 1602 "Tracker.c"
+#line 1607 "Tracker.c"
 		gboolean _tmp12_ = FALSE;
-		CoreTrackerAccumulator* _tmp13_ = NULL;
-		DataView* _tmp14_ = NULL;
-		gboolean _tmp15_ = FALSE;
+		CoreTrackerAccumulator* _tmp13_;
+		DataView* _tmp14_;
+		gboolean _tmp15_;
 #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp13_ = self->visible;
 #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1613,45 +1618,45 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba
 		if (_tmp15_) {
 #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp12_ = TRUE;
-#line 1617 "Tracker.c"
+#line 1622 "Tracker.c"
 		} else {
-			gboolean _tmp16_ = FALSE;
+			gboolean _tmp16_;
 #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp16_ = fire_updated;
 #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp12_ = _tmp16_;
-#line 1624 "Tracker.c"
+#line 1629 "Tracker.c"
 		}
 #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp12_;
-#line 1628 "Tracker.c"
+#line 1633 "Tracker.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp18_ = self->selected;
 #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp18_ != NULL) {
-#line 1634 "Tracker.c"
-		DataView* _tmp19_ = NULL;
-		gboolean _tmp20_ = FALSE;
+#line 1639 "Tracker.c"
+		DataView* _tmp19_;
+		gboolean _tmp20_;
 #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp19_ = view;
 #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp20_ = data_view_is_selected (_tmp19_);
 #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp17_ = _tmp20_;
-#line 1643 "Tracker.c"
+#line 1648 "Tracker.c"
 	} else {
 #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp17_ = FALSE;
-#line 1647 "Tracker.c"
+#line 1652 "Tracker.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp17_) {
-#line 1651 "Tracker.c"
+#line 1656 "Tracker.c"
 		gboolean _tmp21_ = FALSE;
-		CoreTrackerAccumulator* _tmp22_ = NULL;
-		DataView* _tmp23_ = NULL;
-		gboolean _tmp24_ = FALSE;
+		CoreTrackerAccumulator* _tmp22_;
+		DataView* _tmp23_;
+		gboolean _tmp24_;
 #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp22_ = self->selected;
 #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1662,18 +1667,18 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba
 		if (_tmp24_) {
 #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp21_ = TRUE;
-#line 1666 "Tracker.c"
+#line 1671 "Tracker.c"
 		} else {
-			gboolean _tmp25_ = FALSE;
+			gboolean _tmp25_;
 #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp25_ = fire_updated;
 #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp21_ = _tmp25_;
-#line 1673 "Tracker.c"
+#line 1678 "Tracker.c"
 		}
 #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp21_;
-#line 1677 "Tracker.c"
+#line 1682 "Tracker.c"
 	}
 #line 142 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	result = fire_updated;
@@ -1681,7 +1686,7 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba
 	_g_object_unref0 (view);
 #line 142 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return result;
-#line 1685 "Tracker.c"
+#line 1690 "Tracker.c"
 }
 
 
@@ -1689,14 +1694,14 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base
 	CoreViewTrackerMux * self;
 	gboolean result = FALSE;
 	DataView* view = NULL;
-	DataObject* _tmp0_ = NULL;
-	DataView* _tmp1_ = NULL;
+	DataObject* _tmp0_;
+	DataView* _tmp1_;
 	gboolean fire_updated = FALSE;
-	CoreTrackerAccumulator* _tmp2_ = NULL;
+	CoreTrackerAccumulator* _tmp2_;
 	gboolean _tmp9_ = FALSE;
-	CoreTrackerAccumulator* _tmp10_ = NULL;
+	CoreTrackerAccumulator* _tmp10_;
 	gboolean _tmp19_ = FALSE;
-	CoreTrackerAccumulator* _tmp20_ = NULL;
+	CoreTrackerAccumulator* _tmp20_;
 #line 145 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, CORE_VIEW_TRACKER_TYPE_MUX, CoreViewTrackerMux);
 #line 145 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1715,12 +1720,12 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base
 	_tmp2_ = self->all;
 #line 150 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp2_ != NULL) {
-#line 1719 "Tracker.c"
+#line 1724 "Tracker.c"
 		gboolean _tmp3_ = FALSE;
-		CoreTrackerAccumulator* _tmp4_ = NULL;
-		DataView* _tmp5_ = NULL;
-		Alteration* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+		CoreTrackerAccumulator* _tmp4_;
+		DataView* _tmp5_;
+		Alteration* _tmp6_;
+		gboolean _tmp7_;
 #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp4_ = self->all;
 #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1733,46 +1738,46 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base
 		if (_tmp7_) {
 #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp3_ = TRUE;
-#line 1737 "Tracker.c"
+#line 1742 "Tracker.c"
 		} else {
-			gboolean _tmp8_ = FALSE;
+			gboolean _tmp8_;
 #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp8_ = fire_updated;
 #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp3_ = _tmp8_;
-#line 1744 "Tracker.c"
+#line 1749 "Tracker.c"
 		}
 #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp3_;
-#line 1748 "Tracker.c"
+#line 1753 "Tracker.c"
 	}
 #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp10_ = self->visible;
 #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp10_ != NULL) {
-#line 1754 "Tracker.c"
-		DataView* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
+#line 1759 "Tracker.c"
+		DataView* _tmp11_;
+		gboolean _tmp12_;
 #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp11_ = view;
 #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp12_ = data_view_is_visible (_tmp11_);
 #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp9_ = _tmp12_;
-#line 1763 "Tracker.c"
+#line 1768 "Tracker.c"
 	} else {
 #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp9_ = FALSE;
-#line 1767 "Tracker.c"
+#line 1772 "Tracker.c"
 	}
 #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp9_) {
-#line 1771 "Tracker.c"
+#line 1776 "Tracker.c"
 		gboolean _tmp13_ = FALSE;
-		CoreTrackerAccumulator* _tmp14_ = NULL;
-		DataView* _tmp15_ = NULL;
-		Alteration* _tmp16_ = NULL;
-		gboolean _tmp17_ = FALSE;
+		CoreTrackerAccumulator* _tmp14_;
+		DataView* _tmp15_;
+		Alteration* _tmp16_;
+		gboolean _tmp17_;
 #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp14_ = self->visible;
 #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1785,46 +1790,46 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base
 		if (_tmp17_) {
 #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp13_ = TRUE;
-#line 1789 "Tracker.c"
+#line 1794 "Tracker.c"
 		} else {
-			gboolean _tmp18_ = FALSE;
+			gboolean _tmp18_;
 #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp18_ = fire_updated;
 #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp13_ = _tmp18_;
-#line 1796 "Tracker.c"
+#line 1801 "Tracker.c"
 		}
 #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp13_;
-#line 1800 "Tracker.c"
+#line 1805 "Tracker.c"
 	}
 #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp20_ = self->selected;
 #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp20_ != NULL) {
-#line 1806 "Tracker.c"
-		DataView* _tmp21_ = NULL;
-		gboolean _tmp22_ = FALSE;
+#line 1811 "Tracker.c"
+		DataView* _tmp21_;
+		gboolean _tmp22_;
 #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp21_ = view;
 #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp22_ = data_view_is_selected (_tmp21_);
 #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp19_ = _tmp22_;
-#line 1815 "Tracker.c"
+#line 1820 "Tracker.c"
 	} else {
 #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp19_ = FALSE;
-#line 1819 "Tracker.c"
+#line 1824 "Tracker.c"
 	}
 #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp19_) {
-#line 1823 "Tracker.c"
+#line 1828 "Tracker.c"
 		gboolean _tmp23_ = FALSE;
-		CoreTrackerAccumulator* _tmp24_ = NULL;
-		DataView* _tmp25_ = NULL;
-		Alteration* _tmp26_ = NULL;
-		gboolean _tmp27_ = FALSE;
+		CoreTrackerAccumulator* _tmp24_;
+		DataView* _tmp25_;
+		Alteration* _tmp26_;
+		gboolean _tmp27_;
 #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp24_ = self->selected;
 #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1837,18 +1842,18 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base
 		if (_tmp27_) {
 #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp23_ = TRUE;
-#line 1841 "Tracker.c"
+#line 1846 "Tracker.c"
 		} else {
-			gboolean _tmp28_ = FALSE;
+			gboolean _tmp28_;
 #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp28_ = fire_updated;
 #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp23_ = _tmp28_;
-#line 1848 "Tracker.c"
+#line 1853 "Tracker.c"
 		}
 #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp23_;
-#line 1852 "Tracker.c"
+#line 1857 "Tracker.c"
 	}
 #line 159 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	result = fire_updated;
@@ -1856,7 +1861,7 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base
 	_g_object_unref0 (view);
 #line 159 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return result;
-#line 1860 "Tracker.c"
+#line 1865 "Tracker.c"
 }
 
 
@@ -1865,7 +1870,7 @@ static void core_view_tracker_mux_class_init (CoreViewTrackerMuxClass * klass) {
 	core_view_tracker_mux_parent_class = g_type_class_peek_parent (klass);
 #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	G_OBJECT_CLASS (klass)->finalize = core_view_tracker_mux_finalize;
-#line 1869 "Tracker.c"
+#line 1874 "Tracker.c"
 }
 
 
@@ -1873,12 +1878,12 @@ static void core_view_tracker_mux_core_tracker_accumulator_interface_init (CoreT
 #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_view_tracker_mux_core_tracker_accumulator_parent_iface = g_type_interface_peek_parent (iface);
 #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala"
-	iface->include = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) core_view_tracker_mux_real_include;
+	iface->include = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) core_view_tracker_mux_real_include;
 #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala"
-	iface->uninclude = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) core_view_tracker_mux_real_uninclude;
+	iface->uninclude = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) core_view_tracker_mux_real_uninclude;
 #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala"
-	iface->altered = (gboolean (*)(CoreTrackerAccumulator*, DataObject*, Alteration*)) core_view_tracker_mux_real_altered;
-#line 1882 "Tracker.c"
+	iface->altered = (gboolean (*) (CoreTrackerAccumulator *, DataObject*, Alteration*)) core_view_tracker_mux_real_altered;
+#line 1887 "Tracker.c"
 }
 
 
@@ -1886,7 +1891,7 @@ static void core_view_tracker_mux_instance_init (CoreViewTrackerMux * self) {
 }
 
 
-static void core_view_tracker_mux_finalize (GObject* obj) {
+static void core_view_tracker_mux_finalize (GObject * obj) {
 	CoreViewTrackerMux * self;
 #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CORE_VIEW_TRACKER_TYPE_MUX, CoreViewTrackerMux);
@@ -1898,7 +1903,7 @@ static void core_view_tracker_mux_finalize (GObject* obj) {
 	_g_object_unref0 (self->selected);
 #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	G_OBJECT_CLASS (core_view_tracker_mux_parent_class)->finalize (obj);
-#line 1902 "Tracker.c"
+#line 1907 "Tracker.c"
 }
 
 
@@ -1923,7 +1928,7 @@ static void core_view_tracker_class_init (CoreViewTrackerClass * klass) {
 	((CoreTrackerClass *) klass)->finalize = core_view_tracker_finalize;
 #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_type_class_add_private (klass, sizeof (CoreViewTrackerPrivate));
-#line 1927 "Tracker.c"
+#line 1932 "Tracker.c"
 }
 
 
@@ -1932,32 +1937,32 @@ static void core_view_tracker_instance_init (CoreViewTracker * self) {
 	self->priv = CORE_VIEW_TRACKER_GET_PRIVATE (self);
 #line 163 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self->priv->mux = NULL;
-#line 1936 "Tracker.c"
+#line 1941 "Tracker.c"
 }
 
 
-static void core_view_tracker_finalize (CoreTracker* obj) {
+static void core_view_tracker_finalize (CoreTracker * obj) {
 	CoreViewTracker * self;
-	CoreViewTrackerMux* _tmp0_ = NULL;
+	CoreViewTrackerMux* _tmp0_;
 #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CORE_TYPE_VIEW_TRACKER, CoreViewTracker);
 #line 170 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp0_ = self->priv->mux;
 #line 170 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp0_ != NULL) {
-#line 1949 "Tracker.c"
+#line 1954 "Tracker.c"
 		ViewCollection* collection = NULL;
-		DataCollection* _tmp1_ = NULL;
-		ViewCollection* _tmp2_ = NULL;
-		ViewCollection* _tmp3_ = NULL;
-		ViewCollection* _tmp4_ = NULL;
-		guint _tmp5_ = 0U;
-		ViewCollection* _tmp6_ = NULL;
-		guint _tmp7_ = 0U;
-		ViewCollection* _tmp8_ = NULL;
-		guint _tmp9_ = 0U;
-		ViewCollection* _tmp10_ = NULL;
-		guint _tmp11_ = 0U;
+		DataCollection* _tmp1_;
+		ViewCollection* _tmp2_;
+		ViewCollection* _tmp3_;
+		ViewCollection* _tmp4_;
+		guint _tmp5_;
+		ViewCollection* _tmp6_;
+		guint _tmp7_;
+		ViewCollection* _tmp8_;
+		guint _tmp9_;
+		ViewCollection* _tmp10_;
+		guint _tmp11_;
 #line 171 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp1_ = core_tracker_get_collection (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker));
 #line 171 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1966,7 +1971,7 @@ static void core_view_tracker_finalize (CoreTracker* obj) {
 		if (_tmp2_ == NULL) {
 #line 171 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_data_collection_unref0 (_tmp1_);
-#line 1970 "Tracker.c"
+#line 1975 "Tracker.c"
 		}
 #line 171 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		collection = _tmp2_;
@@ -2000,13 +2005,13 @@ static void core_view_tracker_finalize (CoreTracker* obj) {
 		g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _core_view_tracker_on_items_unselected_view_collection_items_unselected, self);
 #line 170 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_data_collection_unref0 (collection);
-#line 2004 "Tracker.c"
+#line 2009 "Tracker.c"
 	}
 #line 163 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_g_object_unref0 (self->priv->mux);
 #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	CORE_TRACKER_CLASS (core_view_tracker_parent_class)->finalize (obj);
-#line 2010 "Tracker.c"
+#line 2015 "Tracker.c"
 }
 
 
diff --git a/src/core/ViewCollection.c b/src/core/ViewCollection.c
index 505093d..f1dc3ad 100644
--- a/src/core/ViewCollection.c
+++ b/src/core/ViewCollection.c
@@ -1,4 +1,4 @@
-/* ViewCollection.c generated by valac 0.34.7, the Vala compiler
+/* ViewCollection.c generated by valac 0.36.6, the Vala compiler
  * generated from ViewCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -202,10 +202,32 @@ typedef struct _ViewCollectionToggleListsClass ViewCollectionToggleListsClass;
 typedef struct _ViewCollectionToggleListsPrivate ViewCollectionToggleListsPrivate;
 typedef struct _ViewCollectionParamSpecMonitor ViewCollectionParamSpecMonitor;
 #define _view_manager_unref0(var) ((var == NULL) ? NULL : (var = (view_manager_unref (var), NULL)))
+enum  {
+	VIEW_COLLECTION_ITEMS_SELECTED_SIGNAL,
+	VIEW_COLLECTION_ITEMS_UNSELECTED_SIGNAL,
+	VIEW_COLLECTION_ITEMS_STATE_CHANGED_SIGNAL,
+	VIEW_COLLECTION_SELECTION_GROUP_ALTERED_SIGNAL,
+	VIEW_COLLECTION_ITEMS_SHOWN_SIGNAL,
+	VIEW_COLLECTION_ITEMS_HIDDEN_SIGNAL,
+	VIEW_COLLECTION_ITEMS_VISIBILITY_CHANGED_SIGNAL,
+	VIEW_COLLECTION_ITEM_VIEW_ALTERED_SIGNAL,
+	VIEW_COLLECTION_ITEM_GEOMETRY_ALTERED_SIGNAL,
+	VIEW_COLLECTION_VIEWS_ALTERED_SIGNAL,
+	VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL,
+	VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL,
+	VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL,
+	VIEW_COLLECTION_LAST_SIGNAL
+};
+static guint view_collection_signals[VIEW_COLLECTION_LAST_SIGNAL] = {0};
 typedef struct _ViewManagerPrivate ViewManagerPrivate;
 typedef struct _ParamSpecViewManager ParamSpecViewManager;
 typedef struct _ViewFilterPrivate ViewFilterPrivate;
 typedef struct _ParamSpecViewFilter ParamSpecViewFilter;
+enum  {
+	VIEW_FILTER_REFRESH_SIGNAL,
+	VIEW_FILTER_LAST_SIGNAL
+};
+static guint view_filter_signals[VIEW_FILTER_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -602,7 +624,7 @@ static DataView* view_collection_real_get_last (ViewCollection* self);
 static DataView* view_collection_real_get_next (ViewCollection* self, DataView* view);
 DataView* view_collection_get_previous (ViewCollection* self, DataView* view);
 static DataView* view_collection_real_get_previous (ViewCollection* self, DataView* view);
-gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource** next, DataSource** prev, const gchar* type_selector);
+gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource* * next, DataSource* * prev, const gchar* type_selector);
 gchar* data_source_get_typename (DataSource* self);
 GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource* home, const gchar* typename);
 gboolean data_set_add_many (DataSet* self, GeeCollection* objects);
@@ -667,38 +689,38 @@ enum  {
 };
 ViewCollectionMonitor* view_collection_monitor_new (void);
 ViewCollectionMonitor* view_collection_monitor_construct (GType object_type);
-static void view_collection_monitor_finalize (ViewCollectionMonitor* obj);
+static void view_collection_monitor_finalize (ViewCollectionMonitor * obj);
 enum  {
 	VIEW_COLLECTION_MONITOR_IMPL_DUMMY_PROPERTY
 };
 static void _view_collection_on_sources_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self);
 static void _view_collection_on_sources_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self);
 static void _view_collection_on_sources_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
-static void view_collection_monitor_impl_finalize (ViewCollectionMonitor* obj);
+static void view_collection_monitor_impl_finalize (ViewCollectionMonitor * obj);
 enum  {
 	VIEW_COLLECTION_TOGGLE_LISTS_DUMMY_PROPERTY
 };
-static void view_collection_toggle_lists_finalize (GObject* obj);
-static void view_collection_finalize (DataCollection* obj);
+static void view_collection_toggle_lists_finalize (GObject * obj);
+static void view_collection_finalize (DataCollection * obj);
 enum  {
 	VIEW_MANAGER_DUMMY_PROPERTY
 };
 static gboolean view_manager_real_include_in_view (ViewManager* self, DataSource* source);
 static DataView* view_manager_real_create_view (ViewManager* self, DataSource* source);
 ViewManager* view_manager_construct (GType object_type);
-static void view_manager_finalize (ViewManager* obj);
+static void view_manager_finalize (ViewManager * obj);
 enum  {
 	VIEW_FILTER_DUMMY_PROPERTY
 };
 static gboolean view_filter_real_predicate (ViewFilter* self, DataView* view);
 ViewFilter* view_filter_construct (GType object_type);
 static void view_filter_real_refresh (ViewFilter* self);
-static void view_filter_finalize (ViewFilter* obj);
+static void view_filter_finalize (ViewFilter * obj);
 
 
 ViewCollection* view_collection_construct (GType object_type, const gchar* name) {
 	ViewCollection* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 125 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 126 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -707,37 +729,37 @@ ViewCollection* view_collection_construct (GType object_type, const gchar* name)
 	self = (ViewCollection*) data_collection_construct (object_type, _tmp0_);
 #line 125 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return self;
-#line 711 "ViewCollection.c"
+#line 733 "ViewCollection.c"
 }
 
 
 ViewCollection* view_collection_new (const gchar* name) {
 #line 125 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return view_collection_construct (TYPE_VIEW_COLLECTION, name);
-#line 718 "ViewCollection.c"
+#line 740 "ViewCollection.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 725 "ViewCollection.c"
+#line 747 "ViewCollection.c"
 }
 
 
 static void view_collection_real_notify_items_selected_unselected (ViewCollection* self, GeeCollection* selected, GeeCollection* unselected) {
 	gboolean _tmp0_ = FALSE;
-	GeeCollection* _tmp1_ = NULL;
+	GeeCollection* _tmp1_;
 	gboolean has_selected = FALSE;
 	gboolean _tmp5_ = FALSE;
-	GeeCollection* _tmp6_ = NULL;
+	GeeCollection* _tmp6_;
 	gboolean has_unselected = FALSE;
-	gboolean _tmp10_ = FALSE;
-	gboolean _tmp12_ = FALSE;
+	gboolean _tmp10_;
+	gboolean _tmp12_;
 	GeeCollection* sum = NULL;
 	gboolean _tmp14_ = FALSE;
-	gboolean _tmp15_ = FALSE;
-	GeeCollection* _tmp32_ = NULL;
+	gboolean _tmp15_;
+	GeeCollection* _tmp32_;
 #line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail ((selected == NULL) || GEE_IS_COLLECTION (selected));
 #line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -746,10 +768,10 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
 	_tmp1_ = selected;
 #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp1_ != NULL) {
-#line 750 "ViewCollection.c"
-		GeeCollection* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+#line 772 "ViewCollection.c"
+		GeeCollection* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = selected;
 #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -758,11 +780,11 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
 		_tmp4_ = _tmp3_;
 #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp4_ > 0;
-#line 762 "ViewCollection.c"
+#line 784 "ViewCollection.c"
 	} else {
 #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = FALSE;
-#line 766 "ViewCollection.c"
+#line 788 "ViewCollection.c"
 	}
 #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	has_selected = _tmp0_;
@@ -770,10 +792,10 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
 	_tmp6_ = unselected;
 #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp6_ != NULL) {
-#line 774 "ViewCollection.c"
-		GeeCollection* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
+#line 796 "ViewCollection.c"
+		GeeCollection* _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
 #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp7_ = unselected;
 #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -782,11 +804,11 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
 		_tmp9_ = _tmp8_;
 #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = _tmp9_ > 0;
-#line 786 "ViewCollection.c"
+#line 808 "ViewCollection.c"
 	} else {
 #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = FALSE;
-#line 790 "ViewCollection.c"
+#line 812 "ViewCollection.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	has_unselected = _tmp5_;
@@ -794,47 +816,47 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
 	_tmp10_ = has_selected;
 #line 134 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp10_) {
-#line 798 "ViewCollection.c"
-		GeeCollection* _tmp11_ = NULL;
+#line 820 "ViewCollection.c"
+		GeeCollection* _tmp11_;
 #line 135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp11_ = selected;
 #line 135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-		g_signal_emit_by_name (self, "items-selected", G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 804 "ViewCollection.c"
+		g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_SELECTED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable));
+#line 826 "ViewCollection.c"
 	}
 #line 137 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp12_ = has_unselected;
 #line 137 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp12_) {
-#line 810 "ViewCollection.c"
-		GeeCollection* _tmp13_ = NULL;
+#line 832 "ViewCollection.c"
+		GeeCollection* _tmp13_;
 #line 138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp13_ = unselected;
 #line 138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-		g_signal_emit_by_name (self, "items-unselected", G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 816 "ViewCollection.c"
+		g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_UNSELECTED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
+#line 838 "ViewCollection.c"
 	}
 #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp15_ = has_selected;
 #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp15_) {
-#line 822 "ViewCollection.c"
-		gboolean _tmp16_ = FALSE;
+#line 844 "ViewCollection.c"
+		gboolean _tmp16_;
 #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp16_ = has_unselected;
 #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp14_ = !_tmp16_;
-#line 828 "ViewCollection.c"
+#line 850 "ViewCollection.c"
 	} else {
 #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp14_ = FALSE;
-#line 832 "ViewCollection.c"
+#line 854 "ViewCollection.c"
 	}
 #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp14_) {
-#line 836 "ViewCollection.c"
-		GeeCollection* _tmp17_ = NULL;
-		GeeCollection* _tmp18_ = NULL;
+#line 858 "ViewCollection.c"
+		GeeCollection* _tmp17_;
+		GeeCollection* _tmp18_;
 #line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp17_ = selected;
 #line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -843,31 +865,31 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
 		_g_object_unref0 (sum);
 #line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		sum = _tmp18_;
-#line 847 "ViewCollection.c"
+#line 869 "ViewCollection.c"
 	} else {
 		gboolean _tmp19_ = FALSE;
-		gboolean _tmp20_ = FALSE;
+		gboolean _tmp20_;
 #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp20_ = has_selected;
 #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (!_tmp20_) {
-#line 855 "ViewCollection.c"
-			gboolean _tmp21_ = FALSE;
+#line 877 "ViewCollection.c"
+			gboolean _tmp21_;
 #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp21_ = has_unselected;
 #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp19_ = _tmp21_;
-#line 861 "ViewCollection.c"
+#line 883 "ViewCollection.c"
 		} else {
 #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp19_ = FALSE;
-#line 865 "ViewCollection.c"
+#line 887 "ViewCollection.c"
 		}
 #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp19_) {
-#line 869 "ViewCollection.c"
-			GeeCollection* _tmp22_ = NULL;
-			GeeCollection* _tmp23_ = NULL;
+#line 891 "ViewCollection.c"
+			GeeCollection* _tmp22_;
+			GeeCollection* _tmp23_;
 #line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp22_ = unselected;
 #line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -876,25 +898,25 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
 			_g_object_unref0 (sum);
 #line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			sum = _tmp23_;
-#line 880 "ViewCollection.c"
+#line 902 "ViewCollection.c"
 		} else {
 			gboolean _tmp24_ = FALSE;
-			gboolean _tmp25_ = FALSE;
+			gboolean _tmp25_;
 #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp25_ = has_selected;
 #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (!_tmp25_) {
-#line 888 "ViewCollection.c"
-				gboolean _tmp26_ = FALSE;
+#line 910 "ViewCollection.c"
+				gboolean _tmp26_;
 #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp26_ = has_unselected;
 #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp24_ = !_tmp26_;
-#line 894 "ViewCollection.c"
+#line 916 "ViewCollection.c"
 			} else {
 #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp24_ = FALSE;
-#line 898 "ViewCollection.c"
+#line 920 "ViewCollection.c"
 			}
 #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp24_) {
@@ -902,13 +924,13 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
 				_g_object_unref0 (sum);
 #line 146 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				sum = NULL;
-#line 906 "ViewCollection.c"
+#line 928 "ViewCollection.c"
 			} else {
-				GeeHashSet* _tmp27_ = NULL;
-				GeeCollection* _tmp28_ = NULL;
-				GeeCollection* _tmp29_ = NULL;
-				GeeCollection* _tmp30_ = NULL;
-				GeeCollection* _tmp31_ = NULL;
+				GeeHashSet* _tmp27_;
+				GeeCollection* _tmp28_;
+				GeeCollection* _tmp29_;
+				GeeCollection* _tmp30_;
+				GeeCollection* _tmp31_;
 #line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp27_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -927,7 +949,7 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
 				_tmp31_ = unselected;
 #line 150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				gee_collection_add_all (_tmp30_, _tmp31_);
-#line 931 "ViewCollection.c"
+#line 953 "ViewCollection.c"
 			}
 		}
 	}
@@ -935,19 +957,19 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
 	_tmp32_ = sum;
 #line 153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp32_ != NULL) {
-#line 939 "ViewCollection.c"
-		GeeCollection* _tmp33_ = NULL;
+#line 961 "ViewCollection.c"
+		GeeCollection* _tmp33_;
 #line 154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp33_ = sum;
 #line 154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-		g_signal_emit_by_name (self, "items-state-changed", G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ITERABLE, GeeIterable));
+		g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_STATE_CHANGED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_notify_selection_group_altered (self);
-#line 947 "ViewCollection.c"
+#line 969 "ViewCollection.c"
 	}
 #line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (sum);
-#line 951 "ViewCollection.c"
+#line 973 "ViewCollection.c"
 }
 
 
@@ -956,14 +978,14 @@ void view_collection_notify_items_selected_unselected (ViewCollection* self, Gee
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	VIEW_COLLECTION_GET_CLASS (self)->notify_items_selected_unselected (self, selected, unselected);
-#line 960 "ViewCollection.c"
+#line 982 "ViewCollection.c"
 }
 
 
 static void view_collection_real_notify_selection_group_altered (ViewCollection* self) {
 #line 160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_emit_by_name (self, "selection-group-altered");
-#line 967 "ViewCollection.c"
+	g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_SELECTION_GROUP_ALTERED_SIGNAL], 0);
+#line 989 "ViewCollection.c"
 }
 
 
@@ -972,19 +994,19 @@ void view_collection_notify_selection_group_altered (ViewCollection* self) {
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 159 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	VIEW_COLLECTION_GET_CLASS (self)->notify_selection_group_altered (self);
-#line 976 "ViewCollection.c"
+#line 998 "ViewCollection.c"
 }
 
 
 static void view_collection_real_notify_item_view_altered (ViewCollection* self, DataView* view) {
-	DataView* _tmp0_ = NULL;
+	DataView* _tmp0_;
 #line 163 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_DATA_VIEW (view));
 #line 164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = view;
 #line 164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_emit_by_name (self, "item-view-altered", _tmp0_);
-#line 988 "ViewCollection.c"
+	g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_VIEW_ALTERED_SIGNAL], 0, _tmp0_);
+#line 1010 "ViewCollection.c"
 }
 
 
@@ -993,19 +1015,19 @@ void view_collection_notify_item_view_altered (ViewCollection* self, DataView* v
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 163 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	VIEW_COLLECTION_GET_CLASS (self)->notify_item_view_altered (self, view);
-#line 997 "ViewCollection.c"
+#line 1019 "ViewCollection.c"
 }
 
 
 static void view_collection_real_notify_views_altered (ViewCollection* self, GeeCollection* views) {
-	GeeCollection* _tmp0_ = NULL;
+	GeeCollection* _tmp0_;
 #line 167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (views));
 #line 168 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = views;
 #line 168 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_emit_by_name (self, "views-altered", _tmp0_);
-#line 1009 "ViewCollection.c"
+	g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEWS_ALTERED_SIGNAL], 0, _tmp0_);
+#line 1031 "ViewCollection.c"
 }
 
 
@@ -1014,19 +1036,19 @@ void view_collection_notify_views_altered (ViewCollection* self, GeeCollection*
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	VIEW_COLLECTION_GET_CLASS (self)->notify_views_altered (self, views);
-#line 1018 "ViewCollection.c"
+#line 1040 "ViewCollection.c"
 }
 
 
 static void view_collection_real_notify_item_geometry_altered (ViewCollection* self, DataView* view) {
-	DataView* _tmp0_ = NULL;
+	DataView* _tmp0_;
 #line 171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_DATA_VIEW (view));
 #line 172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = view;
 #line 172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_emit_by_name (self, "item-geometry-altered", _tmp0_);
-#line 1030 "ViewCollection.c"
+	g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_GEOMETRY_ALTERED_SIGNAL], 0, _tmp0_);
+#line 1052 "ViewCollection.c"
 }
 
 
@@ -1035,19 +1057,19 @@ void view_collection_notify_item_geometry_altered (ViewCollection* self, DataVie
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	VIEW_COLLECTION_GET_CLASS (self)->notify_item_geometry_altered (self, view);
-#line 1039 "ViewCollection.c"
+#line 1061 "ViewCollection.c"
 }
 
 
 static void view_collection_real_notify_geometries_altered (ViewCollection* self, GeeCollection* views) {
-	GeeCollection* _tmp0_ = NULL;
+	GeeCollection* _tmp0_;
 #line 175 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (views));
 #line 176 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = views;
 #line 176 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_emit_by_name (self, "geometries-altered", _tmp0_);
-#line 1051 "ViewCollection.c"
+	g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL], 0, _tmp0_);
+#line 1073 "ViewCollection.c"
 }
 
 
@@ -1056,19 +1078,19 @@ void view_collection_notify_geometries_altered (ViewCollection* self, GeeCollect
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 175 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	VIEW_COLLECTION_GET_CLASS (self)->notify_geometries_altered (self, views);
-#line 1060 "ViewCollection.c"
+#line 1082 "ViewCollection.c"
 }
 
 
 static void view_collection_real_notify_items_shown (ViewCollection* self, GeeCollection* shown) {
-	GeeCollection* _tmp0_ = NULL;
+	GeeCollection* _tmp0_;
 #line 179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (shown));
 #line 180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = shown;
 #line 180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_emit_by_name (self, "items-shown", _tmp0_);
-#line 1072 "ViewCollection.c"
+	g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_SHOWN_SIGNAL], 0, _tmp0_);
+#line 1094 "ViewCollection.c"
 }
 
 
@@ -1077,19 +1099,19 @@ void view_collection_notify_items_shown (ViewCollection* self, GeeCollection* sh
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	VIEW_COLLECTION_GET_CLASS (self)->notify_items_shown (self, shown);
-#line 1081 "ViewCollection.c"
+#line 1103 "ViewCollection.c"
 }
 
 
 static void view_collection_real_notify_items_hidden (ViewCollection* self, GeeCollection* hidden) {
-	GeeCollection* _tmp0_ = NULL;
+	GeeCollection* _tmp0_;
 #line 183 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (hidden));
 #line 184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = hidden;
 #line 184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_emit_by_name (self, "items-hidden", _tmp0_);
-#line 1093 "ViewCollection.c"
+	g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_HIDDEN_SIGNAL], 0, _tmp0_);
+#line 1115 "ViewCollection.c"
 }
 
 
@@ -1098,19 +1120,19 @@ void view_collection_notify_items_hidden (ViewCollection* self, GeeCollection* h
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 183 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	VIEW_COLLECTION_GET_CLASS (self)->notify_items_hidden (self, hidden);
-#line 1102 "ViewCollection.c"
+#line 1124 "ViewCollection.c"
 }
 
 
 static void view_collection_real_notify_items_visibility_changed (ViewCollection* self, GeeCollection* changed) {
-	GeeCollection* _tmp0_ = NULL;
+	GeeCollection* _tmp0_;
 #line 187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (changed));
 #line 188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = changed;
 #line 188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_emit_by_name (self, "items-visibility-changed", _tmp0_);
-#line 1114 "ViewCollection.c"
+	g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_VISIBILITY_CHANGED_SIGNAL], 0, _tmp0_);
+#line 1136 "ViewCollection.c"
 }
 
 
@@ -1119,19 +1141,19 @@ void view_collection_notify_items_visibility_changed (ViewCollection* self, GeeC
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	VIEW_COLLECTION_GET_CLASS (self)->notify_items_visibility_changed (self, changed);
-#line 1123 "ViewCollection.c"
+#line 1145 "ViewCollection.c"
 }
 
 
 static void view_collection_real_notify_view_filter_installed (ViewCollection* self, ViewFilter* filter) {
-	ViewFilter* _tmp0_ = NULL;
+	ViewFilter* _tmp0_;
 #line 191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_FILTER (filter));
 #line 192 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = filter;
 #line 192 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_emit_by_name (self, "view-filter-installed", _tmp0_);
-#line 1135 "ViewCollection.c"
+	g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL], 0, _tmp0_);
+#line 1157 "ViewCollection.c"
 }
 
 
@@ -1140,19 +1162,19 @@ void view_collection_notify_view_filter_installed (ViewCollection* self, ViewFil
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	VIEW_COLLECTION_GET_CLASS (self)->notify_view_filter_installed (self, filter);
-#line 1144 "ViewCollection.c"
+#line 1166 "ViewCollection.c"
 }
 
 
 static void view_collection_real_notify_view_filter_removed (ViewCollection* self, ViewFilter* filter) {
-	ViewFilter* _tmp0_ = NULL;
+	ViewFilter* _tmp0_;
 #line 195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_FILTER (filter));
 #line 196 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = filter;
 #line 196 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_emit_by_name (self, "view-filter-removed", _tmp0_);
-#line 1156 "ViewCollection.c"
+	g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL], 0, _tmp0_);
+#line 1178 "ViewCollection.c"
 }
 
 
@@ -1161,16 +1183,16 @@ void view_collection_notify_view_filter_removed (ViewCollection* self, ViewFilte
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	VIEW_COLLECTION_GET_CLASS (self)->notify_view_filter_removed (self, filter);
-#line 1165 "ViewCollection.c"
+#line 1187 "ViewCollection.c"
 }
 
 
 static void view_collection_real_clear (DataCollection* base) {
 	ViewCollection * self;
 	gboolean _tmp0_ = FALSE;
-	GeeHashMultiMap* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	GeeHashMultiMap* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1183,20 +1205,20 @@ static void view_collection_real_clear (DataCollection* base) {
 	if (_tmp3_ > 0) {
 #line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = TRUE;
-#line 1187 "ViewCollection.c"
+#line 1209 "ViewCollection.c"
 	} else {
-		ViewCollection* _tmp4_ = NULL;
+		ViewCollection* _tmp4_;
 #line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = self->priv->mirroring;
 #line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 1194 "ViewCollection.c"
+#line 1216 "ViewCollection.c"
 	}
 #line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp0_) {
-#line 1198 "ViewCollection.c"
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+#line 1220 "ViewCollection.c"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 203 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = data_collection_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 203 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1208,35 +1230,35 @@ static void view_collection_real_clear (DataCollection* base) {
 		_g_free0 (_tmp6_);
 #line 205 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return;
-#line 1211 "ViewCollection.c"
+#line 1233 "ViewCollection.c"
 	}
 #line 208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	DATA_COLLECTION_CLASS (view_collection_parent_class)->clear (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1215 "ViewCollection.c"
+#line 1237 "ViewCollection.c"
 }
 
 
 static void _view_collection_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, gpointer self) {
 #line 215 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_on_view_filter_refresh ((ViewCollection*) self);
-#line 1222 "ViewCollection.c"
+#line 1244 "ViewCollection.c"
 }
 
 
 static void view_collection_real_close (DataCollection* base) {
 	ViewCollection * self;
-	GeeSet* _tmp8_ = NULL;
+	GeeSet* _tmp8_;
 #line 211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_halt_all_monitoring (self);
 #line 213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_halt_mirroring (self);
-#line 1235 "ViewCollection.c"
+#line 1257 "ViewCollection.c"
 	{
 		GeeIterator* _f_it = NULL;
-		GeeSet* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeSet* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = self->priv->filters;
 #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1245,14 +1267,14 @@ static void view_collection_real_close (DataCollection* base) {
 		_f_it = _tmp1_;
 #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 1248 "ViewCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 1270 "ViewCollection.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			ViewFilter* f = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			ViewFilter* _tmp6_ = NULL;
-			guint _tmp7_ = 0U;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			ViewFilter* _tmp6_;
+			guint _tmp7_;
 #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp2_ = _f_it;
 #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1261,7 +1283,7 @@ static void view_collection_real_close (DataCollection* base) {
 			if (!_tmp3_) {
 #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 1264 "ViewCollection.c"
+#line 1286 "ViewCollection.c"
 			}
 #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp4_ = _f_it;
@@ -1277,11 +1299,11 @@ static void view_collection_real_close (DataCollection* base) {
 			g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self);
 #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_view_filter_unref0 (f);
-#line 1280 "ViewCollection.c"
+#line 1302 "ViewCollection.c"
 		}
 #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_f_it);
-#line 1284 "ViewCollection.c"
+#line 1306 "ViewCollection.c"
 	}
 #line 216 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp8_ = self->priv->filters;
@@ -1289,22 +1311,22 @@ static void view_collection_real_close (DataCollection* base) {
 	gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 218 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	DATA_COLLECTION_CLASS (view_collection_parent_class)->close (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1292 "ViewCollection.c"
+#line 1314 "ViewCollection.c"
 }
 
 
 ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target) {
 	ViewCollectionMonitor* result = NULL;
 	ViewCollectionMonitorImpl* monitor = NULL;
-	SourceCollection* _tmp0_ = NULL;
-	ViewManager* _tmp1_ = NULL;
-	Alteration* _tmp2_ = NULL;
-	ViewCollectionMonitorImpl* _tmp3_ = NULL;
-	GeeHashMultiMap* _tmp4_ = NULL;
-	SourceCollection* _tmp5_ = NULL;
-	ViewCollectionMonitorImpl* _tmp6_ = NULL;
+	SourceCollection* _tmp0_;
+	ViewManager* _tmp1_;
+	Alteration* _tmp2_;
+	ViewCollectionMonitorImpl* _tmp3_;
+	GeeHashMultiMap* _tmp4_;
+	SourceCollection* _tmp5_;
+	ViewCollectionMonitorImpl* _tmp6_;
 	gboolean _tmp7_ = FALSE;
-	GeeCollection* _tmp8_ = NULL;
+	GeeCollection* _tmp8_;
 #line 221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1341,10 +1363,10 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
 	_tmp8_ = initial;
 #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp8_ != NULL) {
-#line 1344 "ViewCollection.c"
-		GeeCollection* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
+#line 1366 "ViewCollection.c"
+		GeeCollection* _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
 #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp9_ = initial;
 #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1353,31 +1375,31 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
 		_tmp11_ = _tmp10_;
 #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp7_ = _tmp11_ > 0;
-#line 1356 "ViewCollection.c"
+#line 1378 "ViewCollection.c"
 	} else {
 #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp7_ = FALSE;
-#line 1360 "ViewCollection.c"
+#line 1382 "ViewCollection.c"
 	}
 #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp7_) {
-#line 1364 "ViewCollection.c"
+#line 1386 "ViewCollection.c"
 		GeeArrayList* created_views = NULL;
-		GeeArrayList* _tmp12_ = NULL;
-		GeeArrayList* _tmp24_ = NULL;
-		ProgressMonitor _tmp25_ = NULL;
-		void* _tmp25__target = NULL;
-		GeeCollection* _tmp26_ = NULL;
-		GeeCollection* _tmp27_ = NULL;
+		GeeArrayList* _tmp12_;
+		GeeArrayList* _tmp24_;
+		ProgressMonitor _tmp25_;
+		void* _tmp25__target;
+		GeeCollection* _tmp26_;
+		GeeCollection* _tmp27_;
 #line 235 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp12_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 235 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		created_views = _tmp12_;
-#line 1376 "ViewCollection.c"
+#line 1398 "ViewCollection.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp13_ = NULL;
-			GeeIterator* _tmp14_ = NULL;
+			GeeCollection* _tmp13_;
+			GeeIterator* _tmp14_;
 #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp13_ = initial;
 #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1386,17 +1408,17 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
 			_source_it = _tmp14_;
 #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			while (TRUE) {
-#line 1389 "ViewCollection.c"
-				GeeIterator* _tmp15_ = NULL;
-				gboolean _tmp16_ = FALSE;
+#line 1411 "ViewCollection.c"
+				GeeIterator* _tmp15_;
+				gboolean _tmp16_;
 				DataSource* source = NULL;
-				GeeIterator* _tmp17_ = NULL;
-				gpointer _tmp18_ = NULL;
-				GeeArrayList* _tmp19_ = NULL;
-				ViewManager* _tmp20_ = NULL;
-				DataSource* _tmp21_ = NULL;
-				DataView* _tmp22_ = NULL;
-				DataView* _tmp23_ = NULL;
+				GeeIterator* _tmp17_;
+				gpointer _tmp18_;
+				GeeArrayList* _tmp19_;
+				ViewManager* _tmp20_;
+				DataSource* _tmp21_;
+				DataView* _tmp22_;
+				DataView* _tmp23_;
 #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp15_ = _source_it;
 #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1405,7 +1427,7 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
 				if (!_tmp16_) {
 #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					break;
-#line 1408 "ViewCollection.c"
+#line 1430 "ViewCollection.c"
 				}
 #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp17_ = _source_it;
@@ -1429,11 +1451,11 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
 				_g_object_unref0 (_tmp23_);
 #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (source);
-#line 1432 "ViewCollection.c"
+#line 1454 "ViewCollection.c"
 			}
 #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_source_it);
-#line 1436 "ViewCollection.c"
+#line 1458 "ViewCollection.c"
 		}
 #line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp24_ = created_views;
@@ -1449,14 +1471,14 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
 		_g_object_unref0 (_tmp27_);
 #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (created_views);
-#line 1452 "ViewCollection.c"
+#line 1474 "ViewCollection.c"
 	} else {
-		SourceCollection* _tmp28_ = NULL;
-		SourceCollection* _tmp29_ = NULL;
-		GeeCollection* _tmp30_ = NULL;
-		GeeIterable* _tmp31_ = NULL;
-		ProgressMonitor _tmp32_ = NULL;
-		void* _tmp32__target = NULL;
+		SourceCollection* _tmp28_;
+		SourceCollection* _tmp29_;
+		GeeCollection* _tmp30_;
+		GeeIterable* _tmp31_;
+		ProgressMonitor _tmp32_;
+		void* _tmp32__target;
 #line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp28_ = sources;
 #line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1473,7 +1495,7 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
 		view_collection_add_sources (self, _tmp28_, _tmp31_, _tmp32_, _tmp32__target);
 #line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp31_);
-#line 1476 "ViewCollection.c"
+#line 1498 "ViewCollection.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
@@ -1481,25 +1503,25 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
 	result = G_TYPE_CHECK_INSTANCE_CAST (monitor, VIEW_COLLECTION_TYPE_MONITOR, ViewCollectionMonitor);
 #line 247 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 1484 "ViewCollection.c"
+#line 1506 "ViewCollection.c"
 }
 
 
 static gpointer _view_collection_monitor_ref0 (gpointer self) {
 #line 251 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return self ? view_collection_monitor_ref (self) : NULL;
-#line 1491 "ViewCollection.c"
+#line 1513 "ViewCollection.c"
 }
 
 
 void view_collection_halt_monitoring (ViewCollection* self, ViewCollectionMonitor* m) {
 	ViewCollectionMonitorImpl* monitor = NULL;
-	ViewCollectionMonitor* _tmp0_ = NULL;
-	ViewCollectionMonitorImpl* _tmp1_ = NULL;
+	ViewCollectionMonitor* _tmp0_;
+	ViewCollectionMonitorImpl* _tmp1_;
 	gboolean removed = FALSE;
-	GeeHashMultiMap* _tmp2_ = NULL;
-	SourceCollection* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GeeHashMultiMap* _tmp2_;
+	SourceCollection* _tmp3_;
+	gboolean _tmp4_;
 #line 250 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 250 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1522,61 +1544,61 @@ void view_collection_halt_monitoring (ViewCollection* self, ViewCollectionMonito
 	_vala_assert (removed, "removed");
 #line 250 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_view_collection_monitor_unref0 (monitor);
-#line 1525 "ViewCollection.c"
+#line 1547 "ViewCollection.c"
 }
 
 
 void view_collection_halt_all_monitoring (ViewCollection* self) {
-	GeeHashMultiMap* _tmp0_ = NULL;
+	GeeHashMultiMap* _tmp0_;
 #line 257 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = self->priv->monitors;
 #line 258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	gee_multi_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap));
-#line 1537 "ViewCollection.c"
+#line 1559 "ViewCollection.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 267 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 1544 "ViewCollection.c"
+#line 1566 "ViewCollection.c"
 }
 
 
 static void _view_collection_on_mirror_contents_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) {
 #line 275 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_on_mirror_contents_added ((ViewCollection*) self, added);
-#line 1551 "ViewCollection.c"
+#line 1573 "ViewCollection.c"
 }
 
 
 static void _view_collection_on_mirror_contents_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) {
 #line 276 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_on_mirror_contents_removed ((ViewCollection*) self, removed);
-#line 1558 "ViewCollection.c"
+#line 1580 "ViewCollection.c"
 }
 
 
 void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, CreateView mirroring_ctor, void* mirroring_ctor_target, CreateViewPredicate should_mirror, void* should_mirror_target) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	CreateView _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	CreateViewPredicate _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	void* _tmp5_ = NULL;
-	Comparator _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	void* _tmp8_ = NULL;
-	ComparatorPredicate _tmp9_ = NULL;
-	ViewCollection* _tmp10_ = NULL;
-	GeeCollection* _tmp11_ = NULL;
-	GeeCollection* _tmp12_ = NULL;
-	ViewCollection* _tmp13_ = NULL;
-	ViewCollection* _tmp14_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	CreateView _tmp2_;
+	void* _tmp2__target;
+	CreateViewPredicate _tmp3_;
+	void* _tmp3__target;
+	ViewCollection* _tmp4_;
+	void* _tmp5_;
+	Comparator _tmp6_;
+	ViewCollection* _tmp7_;
+	void* _tmp8_;
+	ComparatorPredicate _tmp9_;
+	ViewCollection* _tmp10_;
+	GeeCollection* _tmp11_;
+	GeeCollection* _tmp12_;
+	ViewCollection* _tmp13_;
+	ViewCollection* _tmp14_;
 #line 261 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 261 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1639,23 +1661,23 @@ void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, Cr
 	_tmp14_ = self->priv->mirroring;
 #line 276 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _view_collection_on_mirror_contents_removed_data_collection_items_removed, self);
-#line 1642 "ViewCollection.c"
+#line 1664 "ViewCollection.c"
 }
 
 
 void view_collection_halt_mirroring (ViewCollection* self) {
-	ViewCollection* _tmp0_ = NULL;
+	ViewCollection* _tmp0_;
 #line 279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 280 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = self->priv->mirroring;
 #line 280 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp0_ != NULL) {
-#line 1654 "ViewCollection.c"
-		ViewCollection* _tmp1_ = NULL;
-		guint _tmp2_ = 0U;
-		ViewCollection* _tmp3_ = NULL;
-		guint _tmp4_ = 0U;
+#line 1676 "ViewCollection.c"
+		ViewCollection* _tmp1_;
+		guint _tmp2_;
+		ViewCollection* _tmp3_;
+		guint _tmp4_;
 #line 281 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp1_ = self->priv->mirroring;
 #line 281 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1668,22 +1690,22 @@ void view_collection_halt_mirroring (ViewCollection* self) {
 		g_signal_parse_name ("items-removed", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE);
 #line 282 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _view_collection_on_mirror_contents_removed_data_collection_items_removed, self);
-#line 1671 "ViewCollection.c"
+#line 1693 "ViewCollection.c"
 	}
 #line 285 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_data_collection_unref0 (self->priv->mirroring);
 #line 285 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self->priv->mirroring = NULL;
-#line 1677 "ViewCollection.c"
+#line 1699 "ViewCollection.c"
 }
 
 
 void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, CreateView copying_ctor, void* copying_ctor_target, CreateViewPredicate should_copy, void* should_copy_target) {
 	GeeArrayList* copy_view = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp25_ = NULL;
-	GeeCollection* _tmp26_ = NULL;
-	GeeCollection* _tmp27_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp25_;
+	GeeCollection* _tmp26_;
+	GeeCollection* _tmp27_;
 #line 288 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 288 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1692,14 +1714,14 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C
 	_tmp0_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 291 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	copy_view = _tmp0_;
-#line 1695 "ViewCollection.c"
+#line 1717 "ViewCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		ViewCollection* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		ViewCollection* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp1_ = to_copy;
 #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1716,22 +1738,22 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C
 		_object_it = _tmp5_;
 #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 1719 "ViewCollection.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 1741 "ViewCollection.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			DataView* view = NULL;
-			DataObject* _tmp10_ = NULL;
-			DataView* _tmp11_ = NULL;
-			CreateViewPredicate _tmp12_ = NULL;
-			void* _tmp12__target = NULL;
-			DataView* _tmp13_ = NULL;
-			DataSource* _tmp14_ = NULL;
-			DataSource* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
-			gboolean _tmp17_ = FALSE;
+			DataObject* _tmp10_;
+			DataView* _tmp11_;
+			CreateViewPredicate _tmp12_;
+			void* _tmp12__target;
+			DataView* _tmp13_;
+			DataSource* _tmp14_;
+			DataSource* _tmp15_;
+			gboolean _tmp16_;
+			gboolean _tmp17_;
 #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp6_ = _object_it;
 #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1740,7 +1762,7 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C
 			if (!_tmp7_) {
 #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 1743 "ViewCollection.c"
+#line 1765 "ViewCollection.c"
 			}
 #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp8_ = _object_it;
@@ -1772,15 +1794,15 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C
 			_g_object_unref0 (_tmp15_);
 #line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp17_) {
-#line 1775 "ViewCollection.c"
-				GeeArrayList* _tmp18_ = NULL;
-				CreateView _tmp19_ = NULL;
-				void* _tmp19__target = NULL;
-				DataView* _tmp20_ = NULL;
-				DataSource* _tmp21_ = NULL;
-				DataSource* _tmp22_ = NULL;
-				DataView* _tmp23_ = NULL;
-				DataView* _tmp24_ = NULL;
+#line 1797 "ViewCollection.c"
+				GeeArrayList* _tmp18_;
+				CreateView _tmp19_;
+				void* _tmp19__target;
+				DataView* _tmp20_;
+				DataSource* _tmp21_;
+				DataSource* _tmp22_;
+				DataView* _tmp23_;
+				DataView* _tmp24_;
 #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp18_ = copy_view;
 #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1803,17 +1825,17 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C
 				_g_object_unref0 (_tmp24_);
 #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (_tmp22_);
-#line 1806 "ViewCollection.c"
+#line 1828 "ViewCollection.c"
 			}
 #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (view);
 #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (object);
-#line 1812 "ViewCollection.c"
+#line 1834 "ViewCollection.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 1816 "ViewCollection.c"
+#line 1838 "ViewCollection.c"
 	}
 #line 298 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp25_ = copy_view;
@@ -1825,15 +1847,15 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C
 	_g_object_unref0 (_tmp27_);
 #line 288 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (copy_view);
-#line 1828 "ViewCollection.c"
+#line 1850 "ViewCollection.c"
 }
 
 
 gboolean view_collection_is_view_filter_installed (ViewCollection* self, ViewFilter* f) {
 	gboolean result = FALSE;
-	GeeSet* _tmp0_ = NULL;
-	ViewFilter* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeSet* _tmp0_;
+	ViewFilter* _tmp1_;
+	gboolean _tmp2_;
 #line 301 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
 #line 301 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1848,17 +1870,17 @@ gboolean view_collection_is_view_filter_installed (ViewCollection* self, ViewFil
 	result = _tmp2_;
 #line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 1851 "ViewCollection.c"
+#line 1873 "ViewCollection.c"
 }
 
 
 void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f) {
-	ViewFilter* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GeeSet* _tmp2_ = NULL;
-	ViewFilter* _tmp3_ = NULL;
-	ViewFilter* _tmp4_ = NULL;
-	ViewFilter* _tmp5_ = NULL;
+	ViewFilter* _tmp0_;
+	gboolean _tmp1_;
+	GeeSet* _tmp2_;
+	ViewFilter* _tmp3_;
+	ViewFilter* _tmp4_;
+	ViewFilter* _tmp5_;
 #line 305 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 305 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1871,7 +1893,7 @@ void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f) {
 	if (_tmp1_) {
 #line 307 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return;
-#line 1874 "ViewCollection.c"
+#line 1896 "ViewCollection.c"
 	}
 #line 309 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = self->priv->filters;
@@ -1889,18 +1911,18 @@ void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f) {
 	_tmp5_ = f;
 #line 316 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_notify_view_filter_installed (self, _tmp5_);
-#line 1892 "ViewCollection.c"
+#line 1914 "ViewCollection.c"
 }
 
 
 void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f) {
-	ViewFilter* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GeeSet* _tmp2_ = NULL;
-	ViewFilter* _tmp3_ = NULL;
-	ViewFilter* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	ViewFilter* _tmp6_ = NULL;
+	ViewFilter* _tmp0_;
+	gboolean _tmp1_;
+	GeeSet* _tmp2_;
+	ViewFilter* _tmp3_;
+	ViewFilter* _tmp4_;
+	guint _tmp5_;
+	ViewFilter* _tmp6_;
 #line 319 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 319 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1913,7 +1935,7 @@ void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f) {
 	if (!_tmp1_) {
 #line 321 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return;
-#line 1916 "ViewCollection.c"
+#line 1938 "ViewCollection.c"
 	}
 #line 323 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = self->priv->filters;
@@ -1933,13 +1955,13 @@ void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f) {
 	_tmp6_ = f;
 #line 330 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_notify_view_filter_removed (self, _tmp6_);
-#line 1936 "ViewCollection.c"
+#line 1958 "ViewCollection.c"
 }
 
 
 static void view_collection_on_view_filter_refresh (ViewCollection* self) {
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp1_;
 #line 333 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 334 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1950,7 +1972,7 @@ static void view_collection_on_view_filter_refresh (ViewCollection* self) {
 	view_collection_filter_altered_items (self, _tmp1_);
 #line 334 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1953 "ViewCollection.c"
+#line 1975 "ViewCollection.c"
 }
 
 
@@ -1960,11 +1982,11 @@ static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* vi
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
 #line 338 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
-#line 1963 "ViewCollection.c"
+#line 1985 "ViewCollection.c"
 	{
 		GeeIterator* _f_it = NULL;
-		GeeSet* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeSet* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = self->priv->filters;
 #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1973,15 +1995,15 @@ static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* vi
 		_f_it = _tmp1_;
 #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 1976 "ViewCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 1998 "ViewCollection.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			ViewFilter* f = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			ViewFilter* _tmp6_ = NULL;
-			DataView* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			ViewFilter* _tmp6_;
+			DataView* _tmp7_;
+			gboolean _tmp8_;
 #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp2_ = _f_it;
 #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1990,7 +2012,7 @@ static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* vi
 			if (!_tmp3_) {
 #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 1993 "ViewCollection.c"
+#line 2015 "ViewCollection.c"
 			}
 #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp4_ = _f_it;
@@ -2014,28 +2036,28 @@ static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* vi
 				_g_object_unref0 (_f_it);
 #line 341 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				return result;
-#line 2017 "ViewCollection.c"
+#line 2039 "ViewCollection.c"
 			}
 #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_view_filter_unref0 (f);
-#line 2021 "ViewCollection.c"
+#line 2043 "ViewCollection.c"
 		}
 #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_f_it);
-#line 2025 "ViewCollection.c"
+#line 2047 "ViewCollection.c"
 	}
 #line 343 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = TRUE;
 #line 343 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 2031 "ViewCollection.c"
+#line 2053 "ViewCollection.c"
 }
 
 
 static gboolean view_collection_real_valid_type (DataCollection* base, DataObject* object) {
 	ViewCollection * self;
 	gboolean result = FALSE;
-	DataObject* _tmp0_ = NULL;
+	DataObject* _tmp0_;
 #line 346 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 346 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2046,13 +2068,13 @@ static gboolean view_collection_real_valid_type (DataCollection* base, DataObjec
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DATA_VIEW);
 #line 347 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 2049 "ViewCollection.c"
+#line 2071 "ViewCollection.c"
 }
 
 
 static void view_collection_on_sources_added (ViewCollection* self, DataCollection* sources, GeeIterable* added) {
-	DataCollection* _tmp0_ = NULL;
-	GeeIterable* _tmp1_ = NULL;
+	DataCollection* _tmp0_;
+	GeeIterable* _tmp1_;
 #line 350 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 350 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2065,7 +2087,7 @@ static void view_collection_on_sources_added (ViewCollection* self, DataCollecti
 	_tmp1_ = added;
 #line 351 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_add_sources (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp1_, NULL, NULL);
-#line 2068 "ViewCollection.c"
+#line 2090 "ViewCollection.c"
 }
 
 
@@ -2074,14 +2096,14 @@ static DataView* _view_manager_create_view_create_view (DataSource* source, gpoi
 	result = view_manager_create_view ((ViewManager*) self, source);
 #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 2077 "ViewCollection.c"
+#line 2099 "ViewCollection.c"
 }
 
 
 static void view_collection_add_sources (ViewCollection* self, SourceCollection* sources, GeeIterable* added, ProgressMonitor progress_monitor, void* progress_monitor_target) {
 	DataView* created_view = NULL;
 	GeeArrayList* created_views = NULL;
-	DataView* _tmp37_ = NULL;
+	DataView* _tmp37_;
 #line 354 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 354 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2092,11 +2114,11 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
 	created_view = NULL;
 #line 359 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	created_views = NULL;
-#line 2095 "ViewCollection.c"
+#line 2117 "ViewCollection.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = added;
 #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2105,17 +2127,17 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
 		_source_it = _tmp1_;
 #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 2108 "ViewCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 2130 "ViewCollection.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			CreateView factory = NULL;
-			void* factory_target = NULL;
-			GDestroyNotify factory_target_destroy_notify = NULL;
-			CreateView _tmp22_ = NULL;
-			void* _tmp22__target = NULL;
+			void* factory_target;
+			GDestroyNotify factory_target_destroy_notify;
+			CreateView _tmp22_;
+			void* _tmp22__target;
 #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp2_ = _source_it;
 #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2124,7 +2146,7 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
 			if (!_tmp3_) {
 #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 2127 "ViewCollection.c"
+#line 2149 "ViewCollection.c"
 			}
 #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp4_ = _source_it;
@@ -2138,15 +2160,15 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
 			factory_target = NULL;
 #line 361 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			factory_target_destroy_notify = NULL;
-#line 2141 "ViewCollection.c"
+#line 2163 "ViewCollection.c"
 			{
 				GeeIterator* _monitor_it = NULL;
-				GeeHashMultiMap* _tmp6_ = NULL;
-				SourceCollection* _tmp7_ = NULL;
-				GeeCollection* _tmp8_ = NULL;
-				GeeCollection* _tmp9_ = NULL;
-				GeeIterator* _tmp10_ = NULL;
-				GeeIterator* _tmp11_ = NULL;
+				GeeHashMultiMap* _tmp6_;
+				SourceCollection* _tmp7_;
+				GeeCollection* _tmp8_;
+				GeeCollection* _tmp9_;
+				GeeIterator* _tmp10_;
+				GeeIterator* _tmp11_;
 #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp6_ = self->priv->monitors;
 #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2165,16 +2187,16 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
 				_monitor_it = _tmp11_;
 #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				while (TRUE) {
-#line 2168 "ViewCollection.c"
-					GeeIterator* _tmp12_ = NULL;
-					gboolean _tmp13_ = FALSE;
+#line 2190 "ViewCollection.c"
+					GeeIterator* _tmp12_;
+					gboolean _tmp13_;
 					ViewCollectionMonitorImpl* monitor = NULL;
-					GeeIterator* _tmp14_ = NULL;
-					gpointer _tmp15_ = NULL;
-					ViewCollectionMonitorImpl* _tmp16_ = NULL;
-					ViewManager* _tmp17_ = NULL;
-					DataSource* _tmp18_ = NULL;
-					gboolean _tmp19_ = FALSE;
+					GeeIterator* _tmp14_;
+					gpointer _tmp15_;
+					ViewCollectionMonitorImpl* _tmp16_;
+					ViewManager* _tmp17_;
+					DataSource* _tmp18_;
+					gboolean _tmp19_;
 #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp12_ = _monitor_it;
 #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2183,7 +2205,7 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
 					if (!_tmp13_) {
 #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						break;
-#line 2186 "ViewCollection.c"
+#line 2208 "ViewCollection.c"
 					}
 #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp14_ = _monitor_it;
@@ -2201,9 +2223,9 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
 					_tmp19_ = view_manager_include_in_view (_tmp17_, _tmp18_);
 #line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					if (_tmp19_) {
-#line 2204 "ViewCollection.c"
-						ViewCollectionMonitorImpl* _tmp20_ = NULL;
-						ViewManager* _tmp21_ = NULL;
+#line 2226 "ViewCollection.c"
+						ViewCollectionMonitorImpl* _tmp20_;
+						ViewManager* _tmp21_;
 #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp20_ = monitor;
 #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2226,15 +2248,15 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
 						_view_collection_monitor_unref0 (monitor);
 #line 366 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						break;
-#line 2229 "ViewCollection.c"
+#line 2251 "ViewCollection.c"
 					}
 #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_view_collection_monitor_unref0 (monitor);
-#line 2233 "ViewCollection.c"
+#line 2255 "ViewCollection.c"
 				}
 #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (_monitor_it);
-#line 2237 "ViewCollection.c"
+#line 2259 "ViewCollection.c"
 			}
 #line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp22_ = factory;
@@ -2242,13 +2264,13 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
 			_tmp22__target = factory_target;
 #line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp22_ != NULL) {
-#line 2245 "ViewCollection.c"
+#line 2267 "ViewCollection.c"
 				DataView* new_view = NULL;
-				CreateView _tmp23_ = NULL;
-				void* _tmp23__target = NULL;
-				DataSource* _tmp24_ = NULL;
-				DataView* _tmp25_ = NULL;
-				GeeArrayList* _tmp26_ = NULL;
+				CreateView _tmp23_;
+				void* _tmp23__target;
+				DataSource* _tmp24_;
+				DataView* _tmp25_;
+				GeeArrayList* _tmp26_;
 #line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp23_ = factory;
 #line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2263,25 +2285,25 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
 				_tmp26_ = created_views;
 #line 375 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp26_ != NULL) {
-#line 2266 "ViewCollection.c"
-					GeeArrayList* _tmp27_ = NULL;
-					DataView* _tmp28_ = NULL;
+#line 2288 "ViewCollection.c"
+					GeeArrayList* _tmp27_;
+					DataView* _tmp28_;
 #line 376 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp27_ = created_views;
 #line 376 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp28_ = new_view;
 #line 376 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_);
-#line 2275 "ViewCollection.c"
+#line 2297 "ViewCollection.c"
 				} else {
-					DataView* _tmp29_ = NULL;
+					DataView* _tmp29_;
 #line 377 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp29_ = created_view;
 #line 377 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					if (_tmp29_ == NULL) {
-#line 2282 "ViewCollection.c"
-						DataView* _tmp30_ = NULL;
-						DataView* _tmp31_ = NULL;
+#line 2304 "ViewCollection.c"
+						DataView* _tmp30_;
+						DataView* _tmp31_;
 #line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp30_ = new_view;
 #line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2290,13 +2312,13 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
 						_g_object_unref0 (created_view);
 #line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						created_view = _tmp31_;
-#line 2293 "ViewCollection.c"
+#line 2315 "ViewCollection.c"
 					} else {
-						GeeArrayList* _tmp32_ = NULL;
-						GeeArrayList* _tmp33_ = NULL;
-						DataView* _tmp34_ = NULL;
-						GeeArrayList* _tmp35_ = NULL;
-						DataView* _tmp36_ = NULL;
+						GeeArrayList* _tmp32_;
+						GeeArrayList* _tmp33_;
+						DataView* _tmp34_;
+						GeeArrayList* _tmp35_;
+						DataView* _tmp36_;
 #line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp32_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2319,12 +2341,12 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
 						_tmp36_ = new_view;
 #line 383 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp36_);
-#line 2322 "ViewCollection.c"
+#line 2344 "ViewCollection.c"
 					}
 				}
 #line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (new_view);
-#line 2327 "ViewCollection.c"
+#line 2349 "ViewCollection.c"
 			}
 #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			(factory_target_destroy_notify == NULL) ? NULL : (factory_target_destroy_notify (factory_target), NULL);
@@ -2336,34 +2358,34 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
 			factory_target_destroy_notify = NULL;
 #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (source);
-#line 2339 "ViewCollection.c"
+#line 2361 "ViewCollection.c"
 		}
 #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_source_it);
-#line 2343 "ViewCollection.c"
+#line 2365 "ViewCollection.c"
 	}
 #line 388 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp37_ = created_view;
 #line 388 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp37_ != NULL) {
-#line 2349 "ViewCollection.c"
-		DataView* _tmp38_ = NULL;
+#line 2371 "ViewCollection.c"
+		DataView* _tmp38_;
 #line 389 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp38_ = created_view;
 #line 389 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_OBJECT, DataObject));
-#line 2355 "ViewCollection.c"
+#line 2377 "ViewCollection.c"
 	} else {
 		gboolean _tmp39_ = FALSE;
-		GeeArrayList* _tmp40_ = NULL;
+		GeeArrayList* _tmp40_;
 #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp40_ = created_views;
 #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp40_ != NULL) {
-#line 2363 "ViewCollection.c"
-			GeeArrayList* _tmp41_ = NULL;
-			gint _tmp42_ = 0;
-			gint _tmp43_ = 0;
+#line 2385 "ViewCollection.c"
+			GeeArrayList* _tmp41_;
+			gint _tmp42_;
+			gint _tmp43_;
 #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp41_ = created_views;
 #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2372,20 +2394,20 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
 			_tmp43_ = _tmp42_;
 #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp39_ = _tmp43_ > 0;
-#line 2375 "ViewCollection.c"
+#line 2397 "ViewCollection.c"
 		} else {
 #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp39_ = FALSE;
-#line 2379 "ViewCollection.c"
+#line 2401 "ViewCollection.c"
 		}
 #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp39_) {
-#line 2383 "ViewCollection.c"
-			GeeArrayList* _tmp44_ = NULL;
-			ProgressMonitor _tmp45_ = NULL;
-			void* _tmp45__target = NULL;
-			GeeCollection* _tmp46_ = NULL;
-			GeeCollection* _tmp47_ = NULL;
+#line 2405 "ViewCollection.c"
+			GeeArrayList* _tmp44_;
+			ProgressMonitor _tmp45_;
+			void* _tmp45__target;
+			GeeCollection* _tmp46_;
+			GeeCollection* _tmp47_;
 #line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp44_ = created_views;
 #line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2398,26 +2420,26 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
 			_tmp47_ = _tmp46_;
 #line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_tmp47_);
-#line 2401 "ViewCollection.c"
+#line 2423 "ViewCollection.c"
 		}
 	}
 #line 354 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (created_views);
 #line 354 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (created_view);
-#line 2408 "ViewCollection.c"
+#line 2430 "ViewCollection.c"
 }
 
 
 static gboolean view_collection_real_add (DataCollection* base, DataObject* object) {
 	ViewCollection * self;
 	gboolean result = FALSE;
-	DataObject* _tmp0_ = NULL;
-	DataObject* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	DataObject* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
-	GeeCollection* _tmp5_ = NULL;
+	DataObject* _tmp0_;
+	DataObject* _tmp1_;
+	gboolean _tmp2_;
+	DataObject* _tmp3_;
+	GeeCollection* _tmp4_;
+	GeeCollection* _tmp5_;
 #line 394 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 394 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2436,7 +2458,7 @@ static gboolean view_collection_real_add (DataCollection* base, DataObject* obje
 		result = FALSE;
 #line 398 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
-#line 2439 "ViewCollection.c"
+#line 2461 "ViewCollection.c"
 	}
 #line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = object;
@@ -2452,7 +2474,7 @@ static gboolean view_collection_real_add (DataCollection* base, DataObject* obje
 	result = TRUE;
 #line 402 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 2455 "ViewCollection.c"
+#line 2477 "ViewCollection.c"
 }
 
 
@@ -2460,19 +2482,19 @@ static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCo
 	ViewCollection * self;
 	GeeCollection* result = NULL;
 	GeeCollection* return_list = NULL;
-	GeeCollection* _tmp7_ = NULL;
-	ProgressMonitor _tmp8_ = NULL;
-	void* _tmp8__target = NULL;
-	GeeCollection* _tmp9_ = NULL;
+	GeeCollection* _tmp7_;
+	ProgressMonitor _tmp8_;
+	void* _tmp8__target;
+	GeeCollection* _tmp9_;
 #line 405 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 405 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (objects), NULL);
-#line 2471 "ViewCollection.c"
+#line 2493 "ViewCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = objects;
 #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2481,13 +2503,13 @@ static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCo
 		_object_it = _tmp1_;
 #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 2484 "ViewCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 2506 "ViewCollection.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			DataObject* _tmp6_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			DataObject* _tmp6_;
 #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp2_ = _object_it;
 #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2496,7 +2518,7 @@ static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCo
 			if (!_tmp3_) {
 #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 2499 "ViewCollection.c"
+#line 2521 "ViewCollection.c"
 			}
 #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp4_ = _object_it;
@@ -2510,11 +2532,11 @@ static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCo
 			data_view_internal_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_VIEW, DataView), TRUE);
 #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (object);
-#line 2513 "ViewCollection.c"
+#line 2535 "ViewCollection.c"
 		}
 #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 2517 "ViewCollection.c"
+#line 2539 "ViewCollection.c"
 	}
 #line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp7_ = objects;
@@ -2532,25 +2554,25 @@ static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCo
 	result = return_list;
 #line 414 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 2535 "ViewCollection.c"
+#line 2557 "ViewCollection.c"
 }
 
 
 static void view_collection_on_sources_removed (ViewCollection* self, GeeIterable* removed) {
 	Marker* marker = NULL;
 	gboolean _tmp14_ = FALSE;
-	Marker* _tmp15_ = NULL;
+	Marker* _tmp15_;
 #line 417 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 417 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (removed));
 #line 419 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	marker = NULL;
-#line 2549 "ViewCollection.c"
+#line 2571 "ViewCollection.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = removed;
 #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2559,17 +2581,17 @@ static void view_collection_on_sources_removed (ViewCollection* self, GeeIterabl
 		_source_it = _tmp1_;
 #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 2562 "ViewCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 2584 "ViewCollection.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			DataView* view = NULL;
-			GeeHashMap* _tmp6_ = NULL;
-			DataSource* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
-			DataView* _tmp9_ = NULL;
+			GeeHashMap* _tmp6_;
+			DataSource* _tmp7_;
+			gpointer _tmp8_;
+			DataView* _tmp9_;
 #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp2_ = _source_it;
 #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2578,7 +2600,7 @@ static void view_collection_on_sources_removed (ViewCollection* self, GeeIterabl
 			if (!_tmp3_) {
 #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 2581 "ViewCollection.c"
+#line 2603 "ViewCollection.c"
 			}
 #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp4_ = _source_it;
@@ -2598,23 +2620,23 @@ static void view_collection_on_sources_removed (ViewCollection* self, GeeIterabl
 			_tmp9_ = view;
 #line 424 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp9_ != NULL) {
-#line 2601 "ViewCollection.c"
-				Marker* _tmp10_ = NULL;
-				Marker* _tmp12_ = NULL;
-				DataView* _tmp13_ = NULL;
+#line 2623 "ViewCollection.c"
+				Marker* _tmp10_;
+				Marker* _tmp12_;
+				DataView* _tmp13_;
 #line 425 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp10_ = marker;
 #line 425 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp10_ == NULL) {
-#line 2609 "ViewCollection.c"
-					Marker* _tmp11_ = NULL;
+#line 2631 "ViewCollection.c"
+					Marker* _tmp11_;
 #line 426 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 426 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_g_object_unref0 (marker);
 #line 426 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					marker = _tmp11_;
-#line 2617 "ViewCollection.c"
+#line 2639 "ViewCollection.c"
 				}
 #line 428 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp12_ = marker;
@@ -2622,50 +2644,50 @@ static void view_collection_on_sources_removed (ViewCollection* self, GeeIterabl
 				_tmp13_ = view;
 #line 428 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				marker_mark (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject));
-#line 2625 "ViewCollection.c"
+#line 2647 "ViewCollection.c"
 			}
 #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (view);
 #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (source);
-#line 2631 "ViewCollection.c"
+#line 2653 "ViewCollection.c"
 		}
 #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_source_it);
-#line 2635 "ViewCollection.c"
+#line 2657 "ViewCollection.c"
 	}
 #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp15_ = marker;
 #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp15_ != NULL) {
-#line 2641 "ViewCollection.c"
-		Marker* _tmp16_ = NULL;
-		gint _tmp17_ = 0;
+#line 2663 "ViewCollection.c"
+		Marker* _tmp16_;
+		gint _tmp17_;
 #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp16_ = marker;
 #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp17_ = marker_get_count (_tmp16_);
 #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp14_ = _tmp17_ != 0;
-#line 2650 "ViewCollection.c"
+#line 2672 "ViewCollection.c"
 	} else {
 #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp14_ = FALSE;
-#line 2654 "ViewCollection.c"
+#line 2676 "ViewCollection.c"
 	}
 #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp14_) {
-#line 2658 "ViewCollection.c"
-		Marker* _tmp18_ = NULL;
+#line 2680 "ViewCollection.c"
+		Marker* _tmp18_;
 #line 433 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp18_ = marker;
 #line 433 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp18_);
-#line 2664 "ViewCollection.c"
+#line 2686 "ViewCollection.c"
 	}
 #line 417 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (marker);
-#line 2668 "ViewCollection.c"
+#line 2690 "ViewCollection.c"
 }
 
 
@@ -2673,9 +2695,9 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 	GeeArrayList* to_add = NULL;
 	GeeArrayList* to_remove = NULL;
 	gboolean ordering_changed = FALSE;
-	GeeArrayList* _tmp82_ = NULL;
-	GeeArrayList* _tmp86_ = NULL;
-	gboolean _tmp90_ = FALSE;
+	GeeArrayList* _tmp82_;
+	GeeArrayList* _tmp86_;
+	gboolean _tmp90_;
 #line 436 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 436 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2688,15 +2710,15 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 	to_remove = NULL;
 #line 441 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	ordering_changed = FALSE;
-#line 2691 "ViewCollection.c"
+#line 2713 "ViewCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = items;
 #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2715,24 +2737,24 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 		_object_it = _tmp5_;
 #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 2718 "ViewCollection.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 2740 "ViewCollection.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			Alteration* alteration = NULL;
-			GeeMap* _tmp10_ = NULL;
-			DataObject* _tmp11_ = NULL;
-			gpointer _tmp12_ = NULL;
+			GeeMap* _tmp10_;
+			DataObject* _tmp11_;
+			gpointer _tmp12_;
 			DataSource* source = NULL;
-			DataObject* _tmp13_ = NULL;
-			DataSource* _tmp14_ = NULL;
+			DataObject* _tmp13_;
+			DataSource* _tmp14_;
 			ViewCollectionMonitorImpl* monitor = NULL;
 			gboolean ignored = FALSE;
-			gboolean _tmp38_ = FALSE;
+			gboolean _tmp38_;
 			gboolean _tmp40_ = FALSE;
-			ViewCollectionMonitorImpl* _tmp41_ = NULL;
+			ViewCollectionMonitorImpl* _tmp41_;
 #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp6_ = _object_it;
 #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2741,7 +2763,7 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 			if (!_tmp7_) {
 #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 2744 "ViewCollection.c"
+#line 2766 "ViewCollection.c"
 			}
 #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp8_ = _object_it;
@@ -2767,15 +2789,15 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 			monitor = NULL;
 #line 447 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			ignored = TRUE;
-#line 2770 "ViewCollection.c"
+#line 2792 "ViewCollection.c"
 			{
 				GeeIterator* _monitor_impl_it = NULL;
-				GeeHashMultiMap* _tmp15_ = NULL;
-				DataCollection* _tmp16_ = NULL;
-				GeeCollection* _tmp17_ = NULL;
-				GeeCollection* _tmp18_ = NULL;
-				GeeIterator* _tmp19_ = NULL;
-				GeeIterator* _tmp20_ = NULL;
+				GeeHashMultiMap* _tmp15_;
+				DataCollection* _tmp16_;
+				GeeCollection* _tmp17_;
+				GeeCollection* _tmp18_;
+				GeeIterator* _tmp19_;
+				GeeIterator* _tmp20_;
 #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp15_ = self->priv->monitors;
 #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2794,19 +2816,19 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 				_monitor_impl_it = _tmp20_;
 #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				while (TRUE) {
-#line 2797 "ViewCollection.c"
-					GeeIterator* _tmp21_ = NULL;
-					gboolean _tmp22_ = FALSE;
+#line 2819 "ViewCollection.c"
+					GeeIterator* _tmp21_;
+					gboolean _tmp22_;
 					ViewCollectionMonitorImpl* monitor_impl = NULL;
-					GeeIterator* _tmp23_ = NULL;
-					gpointer _tmp24_ = NULL;
+					GeeIterator* _tmp23_;
+					gpointer _tmp24_;
 					gboolean _tmp25_ = FALSE;
-					ViewCollectionMonitorImpl* _tmp26_ = NULL;
-					Alteration* _tmp27_ = NULL;
-					ViewCollectionMonitorImpl* _tmp32_ = NULL;
-					ViewManager* _tmp33_ = NULL;
-					DataSource* _tmp34_ = NULL;
-					gboolean _tmp35_ = FALSE;
+					ViewCollectionMonitorImpl* _tmp26_;
+					Alteration* _tmp27_;
+					ViewCollectionMonitorImpl* _tmp32_;
+					ViewManager* _tmp33_;
+					DataSource* _tmp34_;
+					gboolean _tmp35_;
 #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp21_ = _monitor_impl_it;
 #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2815,7 +2837,7 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 					if (!_tmp22_) {
 #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						break;
-#line 2818 "ViewCollection.c"
+#line 2840 "ViewCollection.c"
 					}
 #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp23_ = _monitor_impl_it;
@@ -2829,11 +2851,11 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 					_tmp27_ = _tmp26_->prereq;
 #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					if (_tmp27_ != NULL) {
-#line 2832 "ViewCollection.c"
-						Alteration* _tmp28_ = NULL;
-						ViewCollectionMonitorImpl* _tmp29_ = NULL;
-						Alteration* _tmp30_ = NULL;
-						gboolean _tmp31_ = FALSE;
+#line 2854 "ViewCollection.c"
+						Alteration* _tmp28_;
+						ViewCollectionMonitorImpl* _tmp29_;
+						Alteration* _tmp30_;
+						gboolean _tmp31_;
 #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp28_ = alteration;
 #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2844,11 +2866,11 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 						_tmp31_ = alteration_contains_any (_tmp28_, _tmp30_);
 #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp25_ = !_tmp31_;
-#line 2847 "ViewCollection.c"
+#line 2869 "ViewCollection.c"
 					} else {
 #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp25_ = FALSE;
-#line 2851 "ViewCollection.c"
+#line 2873 "ViewCollection.c"
 					}
 #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					if (_tmp25_) {
@@ -2856,7 +2878,7 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 						_view_collection_monitor_unref0 (monitor_impl);
 #line 450 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						continue;
-#line 2859 "ViewCollection.c"
+#line 2881 "ViewCollection.c"
 					}
 #line 452 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					ignored = FALSE;
@@ -2870,9 +2892,9 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 					_tmp35_ = view_manager_include_in_view (_tmp33_, _tmp34_);
 #line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					if (_tmp35_) {
-#line 2873 "ViewCollection.c"
-						ViewCollectionMonitorImpl* _tmp36_ = NULL;
-						ViewCollectionMonitorImpl* _tmp37_ = NULL;
+#line 2895 "ViewCollection.c"
+						ViewCollectionMonitorImpl* _tmp36_;
+						ViewCollectionMonitorImpl* _tmp37_;
 #line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp36_ = monitor_impl;
 #line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2885,22 +2907,22 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 						_view_collection_monitor_unref0 (monitor_impl);
 #line 457 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						break;
-#line 2888 "ViewCollection.c"
+#line 2910 "ViewCollection.c"
 					}
 #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_view_collection_monitor_unref0 (monitor_impl);
-#line 2892 "ViewCollection.c"
+#line 2914 "ViewCollection.c"
 				}
 #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (_monitor_impl_it);
-#line 2896 "ViewCollection.c"
+#line 2918 "ViewCollection.c"
 			}
 #line 461 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp38_ = ignored;
 #line 461 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp38_) {
-#line 2902 "ViewCollection.c"
-				ViewCollectionMonitorImpl* _tmp39_ = NULL;
+#line 2924 "ViewCollection.c"
+				ViewCollectionMonitorImpl* _tmp39_;
 #line 462 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp39_ = monitor;
 #line 462 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2915,50 +2937,50 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 				_g_object_unref0 (object);
 #line 464 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				continue;
-#line 2918 "ViewCollection.c"
+#line 2940 "ViewCollection.c"
 			}
 #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp41_ = monitor;
 #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp41_ != NULL) {
-#line 2924 "ViewCollection.c"
-				DataSource* _tmp42_ = NULL;
-				gboolean _tmp43_ = FALSE;
+#line 2946 "ViewCollection.c"
+				DataSource* _tmp42_;
+				gboolean _tmp43_;
 #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp42_ = source;
 #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp43_ = view_collection_has_view_for_source (self, _tmp42_);
 #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp40_ = !_tmp43_;
-#line 2933 "ViewCollection.c"
+#line 2955 "ViewCollection.c"
 			} else {
 #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp40_ = FALSE;
-#line 2937 "ViewCollection.c"
+#line 2959 "ViewCollection.c"
 			}
 #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp40_) {
-#line 2941 "ViewCollection.c"
-				GeeArrayList* _tmp44_ = NULL;
-				GeeArrayList* _tmp46_ = NULL;
-				ViewCollectionMonitorImpl* _tmp47_ = NULL;
-				ViewManager* _tmp48_ = NULL;
-				DataSource* _tmp49_ = NULL;
-				DataView* _tmp50_ = NULL;
-				DataView* _tmp51_ = NULL;
+#line 2963 "ViewCollection.c"
+				GeeArrayList* _tmp44_;
+				GeeArrayList* _tmp46_;
+				ViewCollectionMonitorImpl* _tmp47_;
+				ViewManager* _tmp48_;
+				DataSource* _tmp49_;
+				DataView* _tmp50_;
+				DataView* _tmp51_;
 #line 468 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp44_ = to_add;
 #line 468 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp44_ == NULL) {
-#line 2953 "ViewCollection.c"
-					GeeArrayList* _tmp45_ = NULL;
+#line 2975 "ViewCollection.c"
+					GeeArrayList* _tmp45_;
 #line 469 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp45_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 469 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_g_object_unref0 (to_add);
 #line 469 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					to_add = _tmp45_;
-#line 2961 "ViewCollection.c"
+#line 2983 "ViewCollection.c"
 				}
 #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp46_ = to_add;
@@ -2976,50 +2998,50 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp51_);
 #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (_tmp51_);
-#line 2979 "ViewCollection.c"
+#line 3001 "ViewCollection.c"
 			} else {
 				gboolean _tmp52_ = FALSE;
-				ViewCollectionMonitorImpl* _tmp53_ = NULL;
+				ViewCollectionMonitorImpl* _tmp53_;
 #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp53_ = monitor;
 #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp53_ == NULL) {
-#line 2987 "ViewCollection.c"
-					DataSource* _tmp54_ = NULL;
-					gboolean _tmp55_ = FALSE;
+#line 3009 "ViewCollection.c"
+					DataSource* _tmp54_;
+					gboolean _tmp55_;
 #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp54_ = source;
 #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp55_ = view_collection_has_view_for_source (self, _tmp54_);
 #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp52_ = _tmp55_;
-#line 2996 "ViewCollection.c"
+#line 3018 "ViewCollection.c"
 				} else {
 #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp52_ = FALSE;
-#line 3000 "ViewCollection.c"
+#line 3022 "ViewCollection.c"
 				}
 #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp52_) {
-#line 3004 "ViewCollection.c"
-					GeeArrayList* _tmp56_ = NULL;
-					GeeArrayList* _tmp58_ = NULL;
-					DataSource* _tmp59_ = NULL;
-					DataView* _tmp60_ = NULL;
-					DataView* _tmp61_ = NULL;
+#line 3026 "ViewCollection.c"
+					GeeArrayList* _tmp56_;
+					GeeArrayList* _tmp58_;
+					DataSource* _tmp59_;
+					DataView* _tmp60_;
+					DataView* _tmp61_;
 #line 473 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp56_ = to_remove;
 #line 473 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					if (_tmp56_ == NULL) {
-#line 3014 "ViewCollection.c"
-						GeeArrayList* _tmp57_ = NULL;
+#line 3036 "ViewCollection.c"
+						GeeArrayList* _tmp57_;
 #line 474 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp57_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 474 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_g_object_unref0 (to_remove);
 #line 474 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						to_remove = _tmp57_;
-#line 3022 "ViewCollection.c"
+#line 3044 "ViewCollection.c"
 					}
 #line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp58_ = to_remove;
@@ -3033,40 +3055,40 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp61_);
 #line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_g_object_unref0 (_tmp61_);
-#line 3036 "ViewCollection.c"
+#line 3058 "ViewCollection.c"
 				} else {
 					gboolean _tmp62_ = FALSE;
-					ViewCollectionMonitorImpl* _tmp63_ = NULL;
+					ViewCollectionMonitorImpl* _tmp63_;
 #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp63_ = monitor;
 #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					if (_tmp63_ != NULL) {
-#line 3044 "ViewCollection.c"
-						DataSource* _tmp64_ = NULL;
-						gboolean _tmp65_ = FALSE;
+#line 3066 "ViewCollection.c"
+						DataSource* _tmp64_;
+						gboolean _tmp65_;
 #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp64_ = source;
 #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp65_ = view_collection_has_view_for_source (self, _tmp64_);
 #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp62_ = _tmp65_;
-#line 3053 "ViewCollection.c"
+#line 3075 "ViewCollection.c"
 					} else {
 #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp62_ = FALSE;
-#line 3057 "ViewCollection.c"
+#line 3079 "ViewCollection.c"
 					}
 #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					if (_tmp62_) {
-#line 3061 "ViewCollection.c"
+#line 3083 "ViewCollection.c"
 						DataView* view = NULL;
-						DataSource* _tmp66_ = NULL;
-						DataView* _tmp67_ = NULL;
-						DataSet* _tmp68_ = NULL;
-						DataView* _tmp69_ = NULL;
-						gboolean _tmp70_ = FALSE;
+						DataSource* _tmp66_;
+						DataView* _tmp67_;
+						DataSet* _tmp68_;
+						DataView* _tmp69_;
+						gboolean _tmp70_;
 						gboolean _tmp74_ = FALSE;
-						DataSet* _tmp75_ = NULL;
+						DataSet* _tmp75_;
 #line 478 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp66_ = source;
 #line 478 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3081,10 +3103,10 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 						_tmp70_ = data_set_contains (_tmp68_, G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_DATA_OBJECT, DataObject));
 #line 480 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						if (_tmp70_) {
-#line 3084 "ViewCollection.c"
-							DataSet* _tmp71_ = NULL;
-							DataView* _tmp72_ = NULL;
-							Alteration* _tmp73_ = NULL;
+#line 3106 "ViewCollection.c"
+							DataSet* _tmp71_;
+							DataView* _tmp72_;
+							Alteration* _tmp73_;
 #line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 							_tmp71_ = self->priv->selected;
 #line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3093,34 +3115,34 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 							_tmp73_ = alteration;
 #line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 							data_set_resort_object (_tmp71_, G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_DATA_OBJECT, DataObject), _tmp73_);
-#line 3096 "ViewCollection.c"
+#line 3118 "ViewCollection.c"
 						}
 #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp75_ = self->priv->visible;
 #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						if (_tmp75_ != NULL) {
-#line 3102 "ViewCollection.c"
-							DataView* _tmp76_ = NULL;
-							gboolean _tmp77_ = FALSE;
+#line 3124 "ViewCollection.c"
+							DataView* _tmp76_;
+							gboolean _tmp77_;
 #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 							_tmp76_ = view;
 #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 							_tmp77_ = view_collection_is_visible (self, _tmp76_);
 #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 							_tmp74_ = _tmp77_;
-#line 3111 "ViewCollection.c"
+#line 3133 "ViewCollection.c"
 						} else {
 #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 							_tmp74_ = FALSE;
-#line 3115 "ViewCollection.c"
+#line 3137 "ViewCollection.c"
 						}
 #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						if (_tmp74_) {
-#line 3119 "ViewCollection.c"
-							DataSet* _tmp78_ = NULL;
-							DataView* _tmp79_ = NULL;
-							Alteration* _tmp80_ = NULL;
-							gboolean _tmp81_ = FALSE;
+#line 3141 "ViewCollection.c"
+							DataSet* _tmp78_;
+							DataView* _tmp79_;
+							Alteration* _tmp80_;
+							gboolean _tmp81_;
 #line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 							_tmp78_ = self->priv->visible;
 #line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3133,12 +3155,12 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 							if (_tmp81_) {
 #line 485 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 								ordering_changed = TRUE;
-#line 3136 "ViewCollection.c"
+#line 3158 "ViewCollection.c"
 							}
 						}
 #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_g_object_unref0 (view);
-#line 3141 "ViewCollection.c"
+#line 3163 "ViewCollection.c"
 					}
 				}
 			}
@@ -3150,20 +3172,20 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 			_alteration_unref0 (alteration);
 #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (object);
-#line 3153 "ViewCollection.c"
+#line 3175 "ViewCollection.c"
 		}
 #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 3157 "ViewCollection.c"
+#line 3179 "ViewCollection.c"
 	}
 #line 490 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp82_ = to_add;
 #line 490 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp82_ != NULL) {
-#line 3163 "ViewCollection.c"
-		GeeArrayList* _tmp83_ = NULL;
-		GeeCollection* _tmp84_ = NULL;
-		GeeCollection* _tmp85_ = NULL;
+#line 3185 "ViewCollection.c"
+		GeeArrayList* _tmp83_;
+		GeeCollection* _tmp84_;
+		GeeCollection* _tmp85_;
 #line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp83_ = to_add;
 #line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3172,16 +3194,16 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 		_tmp85_ = _tmp84_;
 #line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp85_);
-#line 3175 "ViewCollection.c"
+#line 3197 "ViewCollection.c"
 	}
 #line 493 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp86_ = to_remove;
 #line 493 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp86_ != NULL) {
-#line 3181 "ViewCollection.c"
-		GeeArrayList* _tmp87_ = NULL;
-		Marker* _tmp88_ = NULL;
-		Marker* _tmp89_ = NULL;
+#line 3203 "ViewCollection.c"
+		GeeArrayList* _tmp87_;
+		Marker* _tmp88_;
+		Marker* _tmp89_;
 #line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp87_ = to_remove;
 #line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3192,7 +3214,7 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 		data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp89_);
 #line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp89_);
-#line 3195 "ViewCollection.c"
+#line 3217 "ViewCollection.c"
 	}
 #line 496 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp90_ = ordering_changed;
@@ -3200,22 +3222,22 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 	if (_tmp90_) {
 #line 497 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		data_collection_notify_ordering_changed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 3203 "ViewCollection.c"
+#line 3225 "ViewCollection.c"
 	}
 #line 436 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (to_remove);
 #line 436 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (to_add);
-#line 3209 "ViewCollection.c"
+#line 3231 "ViewCollection.c"
 }
 
 
 static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeIterable* added) {
 	GeeArrayList* to_add = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
 #line 500 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 500 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3224,11 +3246,11 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
 	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 501 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	to_add = _tmp0_;
-#line 3227 "ViewCollection.c"
+#line 3249 "ViewCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeIterable* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp1_ = added;
 #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3237,18 +3259,18 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
 		_object_it = _tmp2_;
 #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 3240 "ViewCollection.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 3262 "ViewCollection.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
 			DataSource* source = NULL;
-			DataObject* _tmp7_ = NULL;
-			DataSource* _tmp8_ = NULL;
+			DataObject* _tmp7_;
+			DataSource* _tmp8_;
 			gboolean _tmp9_ = FALSE;
-			CreateViewPredicate _tmp10_ = NULL;
-			void* _tmp10__target = NULL;
+			CreateViewPredicate _tmp10_;
+			void* _tmp10__target;
 #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp3_ = _object_it;
 #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3257,7 +3279,7 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
 			if (!_tmp4_) {
 #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 3260 "ViewCollection.c"
+#line 3282 "ViewCollection.c"
 			}
 #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp5_ = _object_it;
@@ -3279,12 +3301,12 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
 			if (_tmp10_ == NULL) {
 #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp9_ = TRUE;
-#line 3282 "ViewCollection.c"
+#line 3304 "ViewCollection.c"
 			} else {
-				CreateViewPredicate _tmp11_ = NULL;
-				void* _tmp11__target = NULL;
-				DataSource* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
+				CreateViewPredicate _tmp11_;
+				void* _tmp11__target;
+				DataSource* _tmp12_;
+				gboolean _tmp13_;
 #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp11_ = self->priv->should_mirror;
 #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3295,17 +3317,17 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
 				_tmp13_ = _tmp11_ (_tmp12_, _tmp11__target);
 #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp9_ = _tmp13_;
-#line 3298 "ViewCollection.c"
+#line 3320 "ViewCollection.c"
 			}
 #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp9_) {
-#line 3302 "ViewCollection.c"
-				GeeArrayList* _tmp14_ = NULL;
-				CreateView _tmp15_ = NULL;
-				void* _tmp15__target = NULL;
-				DataSource* _tmp16_ = NULL;
-				DataView* _tmp17_ = NULL;
-				DataView* _tmp18_ = NULL;
+#line 3324 "ViewCollection.c"
+				GeeArrayList* _tmp14_;
+				CreateView _tmp15_;
+				void* _tmp15__target;
+				DataSource* _tmp16_;
+				DataView* _tmp17_;
+				DataView* _tmp18_;
 #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp14_ = to_add;
 #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3322,17 +3344,17 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_);
 #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (_tmp18_);
-#line 3325 "ViewCollection.c"
+#line 3347 "ViewCollection.c"
 			}
 #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (source);
 #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (object);
-#line 3331 "ViewCollection.c"
+#line 3353 "ViewCollection.c"
 		}
 #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 3335 "ViewCollection.c"
+#line 3357 "ViewCollection.c"
 	}
 #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp19_ = to_add;
@@ -3342,10 +3364,10 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
 	_tmp21_ = _tmp20_;
 #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp21_ > 0) {
-#line 3345 "ViewCollection.c"
-		GeeArrayList* _tmp22_ = NULL;
-		GeeCollection* _tmp23_ = NULL;
-		GeeCollection* _tmp24_ = NULL;
+#line 3367 "ViewCollection.c"
+		GeeArrayList* _tmp22_;
+		GeeCollection* _tmp23_;
+		GeeCollection* _tmp24_;
 #line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp22_ = to_add;
 #line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3354,18 +3376,18 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
 		_tmp24_ = _tmp23_;
 #line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp24_);
-#line 3357 "ViewCollection.c"
+#line 3379 "ViewCollection.c"
 	}
 #line 500 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (to_add);
-#line 3361 "ViewCollection.c"
+#line 3383 "ViewCollection.c"
 }
 
 
 static void view_collection_on_mirror_contents_removed (ViewCollection* self, GeeIterable* removed) {
 	Marker* marker = NULL;
-	Marker* _tmp0_ = NULL;
-	Marker* _tmp17_ = NULL;
+	Marker* _tmp0_;
+	Marker* _tmp17_;
 #line 513 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 513 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3374,11 +3396,11 @@ static void view_collection_on_mirror_contents_removed (ViewCollection* self, Ge
 	_tmp0_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 514 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	marker = _tmp0_;
-#line 3377 "ViewCollection.c"
+#line 3399 "ViewCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeIterable* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp1_ = removed;
 #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3387,24 +3409,24 @@ static void view_collection_on_mirror_contents_removed (ViewCollection* self, Ge
 		_object_it = _tmp2_;
 #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 3390 "ViewCollection.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 3412 "ViewCollection.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
 			DataView* view = NULL;
-			DataObject* _tmp7_ = NULL;
-			DataView* _tmp8_ = NULL;
+			DataObject* _tmp7_;
+			DataView* _tmp8_;
 			DataView* our_view = NULL;
-			DataView* _tmp9_ = NULL;
-			DataSource* _tmp10_ = NULL;
-			DataSource* _tmp11_ = NULL;
-			DataView* _tmp12_ = NULL;
-			DataView* _tmp13_ = NULL;
-			DataView* _tmp14_ = NULL;
-			Marker* _tmp15_ = NULL;
-			DataView* _tmp16_ = NULL;
+			DataView* _tmp9_;
+			DataSource* _tmp10_;
+			DataSource* _tmp11_;
+			DataView* _tmp12_;
+			DataView* _tmp13_;
+			DataView* _tmp14_;
+			Marker* _tmp15_;
+			DataView* _tmp16_;
 #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp3_ = _object_it;
 #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3413,7 +3435,7 @@ static void view_collection_on_mirror_contents_removed (ViewCollection* self, Ge
 			if (!_tmp4_) {
 #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 3416 "ViewCollection.c"
+#line 3438 "ViewCollection.c"
 			}
 #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp5_ = _object_it;
@@ -3457,11 +3479,11 @@ static void view_collection_on_mirror_contents_removed (ViewCollection* self, Ge
 			_g_object_unref0 (view);
 #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (object);
-#line 3460 "ViewCollection.c"
+#line 3482 "ViewCollection.c"
 		}
 #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 3464 "ViewCollection.c"
+#line 3486 "ViewCollection.c"
 	}
 #line 524 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp17_ = marker;
@@ -3469,7 +3491,7 @@ static void view_collection_on_mirror_contents_removed (ViewCollection* self, Ge
 	data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp17_);
 #line 513 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (marker);
-#line 3472 "ViewCollection.c"
+#line 3494 "ViewCollection.c"
 }
 
 
@@ -3477,9 +3499,9 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
 	ViewCollection * self;
 	GeeArrayList* added_visible = NULL;
 	GeeArrayList* added_selected = NULL;
-	GeeArrayList* _tmp30_ = NULL;
-	GeeArrayList* _tmp34_ = NULL;
-	GeeIterable* _tmp37_ = NULL;
+	GeeArrayList* _tmp30_;
+	GeeArrayList* _tmp34_;
+	GeeIterable* _tmp37_;
 #line 528 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 528 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3488,11 +3510,11 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
 	added_visible = NULL;
 #line 530 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	added_selected = NULL;
-#line 3491 "ViewCollection.c"
+#line 3513 "ViewCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = added;
 #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3501,26 +3523,26 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
 		_object_it = _tmp1_;
 #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 3504 "ViewCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 3526 "ViewCollection.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			DataView* view = NULL;
-			DataObject* _tmp6_ = NULL;
-			DataView* _tmp7_ = NULL;
-			GeeHashMap* _tmp8_ = NULL;
-			DataView* _tmp9_ = NULL;
-			DataSource* _tmp10_ = NULL;
-			DataSource* _tmp11_ = NULL;
-			DataView* _tmp12_ = NULL;
+			DataObject* _tmp6_;
+			DataView* _tmp7_;
+			GeeHashMap* _tmp8_;
+			DataView* _tmp9_;
+			DataSource* _tmp10_;
+			DataSource* _tmp11_;
+			DataView* _tmp12_;
 			gboolean _tmp13_ = FALSE;
-			DataView* _tmp14_ = NULL;
-			gboolean _tmp15_ = FALSE;
+			DataView* _tmp14_;
+			gboolean _tmp15_;
 			gboolean _tmp22_ = FALSE;
-			DataView* _tmp23_ = NULL;
-			gboolean _tmp24_ = FALSE;
+			DataView* _tmp23_;
+			gboolean _tmp24_;
 #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp2_ = _object_it;
 #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3529,7 +3551,7 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
 			if (!_tmp3_) {
 #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 3532 "ViewCollection.c"
+#line 3554 "ViewCollection.c"
 			}
 #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp4_ = _object_it;
@@ -3563,40 +3585,40 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
 			_tmp15_ = data_view_is_selected (_tmp14_);
 #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp15_) {
-#line 3566 "ViewCollection.c"
-				DataView* _tmp16_ = NULL;
-				gboolean _tmp17_ = FALSE;
+#line 3588 "ViewCollection.c"
+				DataView* _tmp16_;
+				gboolean _tmp17_;
 #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp16_ = view;
 #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp17_ = data_view_is_visible (_tmp16_);
 #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp13_ = _tmp17_;
-#line 3575 "ViewCollection.c"
+#line 3597 "ViewCollection.c"
 			} else {
 #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp13_ = FALSE;
-#line 3579 "ViewCollection.c"
+#line 3601 "ViewCollection.c"
 			}
 #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp13_) {
-#line 3583 "ViewCollection.c"
-				GeeArrayList* _tmp18_ = NULL;
-				GeeArrayList* _tmp20_ = NULL;
-				DataView* _tmp21_ = NULL;
+#line 3605 "ViewCollection.c"
+				GeeArrayList* _tmp18_;
+				GeeArrayList* _tmp20_;
+				DataView* _tmp21_;
 #line 537 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp18_ = added_selected;
 #line 537 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp18_ == NULL) {
-#line 3591 "ViewCollection.c"
-					GeeArrayList* _tmp19_ = NULL;
+#line 3613 "ViewCollection.c"
+					GeeArrayList* _tmp19_;
 #line 538 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp19_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 538 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_g_object_unref0 (added_selected);
 #line 538 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					added_selected = _tmp19_;
-#line 3599 "ViewCollection.c"
+#line 3621 "ViewCollection.c"
 				}
 #line 540 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp20_ = added_selected;
@@ -3604,7 +3626,7 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
 				_tmp21_ = view;
 #line 540 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_);
-#line 3607 "ViewCollection.c"
+#line 3629 "ViewCollection.c"
 			}
 #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp23_ = view;
@@ -3612,37 +3634,37 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
 			_tmp24_ = data_view_is_visible (_tmp23_);
 #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp24_) {
-#line 3615 "ViewCollection.c"
-				DataSet* _tmp25_ = NULL;
+#line 3637 "ViewCollection.c"
+				DataSet* _tmp25_;
 #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp25_ = self->priv->visible;
 #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp22_ = _tmp25_ != NULL;
-#line 3621 "ViewCollection.c"
+#line 3643 "ViewCollection.c"
 			} else {
 #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp22_ = FALSE;
-#line 3625 "ViewCollection.c"
+#line 3647 "ViewCollection.c"
 			}
 #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp22_) {
-#line 3629 "ViewCollection.c"
-				GeeArrayList* _tmp26_ = NULL;
-				GeeArrayList* _tmp28_ = NULL;
-				DataView* _tmp29_ = NULL;
+#line 3651 "ViewCollection.c"
+				GeeArrayList* _tmp26_;
+				GeeArrayList* _tmp28_;
+				DataView* _tmp29_;
 #line 545 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp26_ = added_visible;
 #line 545 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp26_ == NULL) {
-#line 3637 "ViewCollection.c"
-					GeeArrayList* _tmp27_ = NULL;
+#line 3659 "ViewCollection.c"
+					GeeArrayList* _tmp27_;
 #line 546 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp27_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 546 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_g_object_unref0 (added_visible);
 #line 546 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					added_visible = _tmp27_;
-#line 3645 "ViewCollection.c"
+#line 3667 "ViewCollection.c"
 				}
 #line 548 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp28_ = added_visible;
@@ -3650,27 +3672,27 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
 				_tmp29_ = view;
 #line 548 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_);
-#line 3653 "ViewCollection.c"
+#line 3675 "ViewCollection.c"
 			}
 #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (view);
 #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (object);
-#line 3659 "ViewCollection.c"
+#line 3681 "ViewCollection.c"
 		}
 #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 3663 "ViewCollection.c"
+#line 3685 "ViewCollection.c"
 	}
 #line 552 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp30_ = added_visible;
 #line 552 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp30_ != NULL) {
-#line 3669 "ViewCollection.c"
+#line 3691 "ViewCollection.c"
 		gboolean is_added = FALSE;
-		GeeArrayList* _tmp31_ = NULL;
-		gboolean _tmp32_ = FALSE;
-		gboolean _tmp33_ = FALSE;
+		GeeArrayList* _tmp31_;
+		gboolean _tmp32_;
+		gboolean _tmp33_;
 #line 553 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp31_ = added_visible;
 #line 553 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3681,15 +3703,15 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
 		_tmp33_ = is_added;
 #line 554 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_vala_assert (_tmp33_, "is_added");
-#line 3684 "ViewCollection.c"
+#line 3706 "ViewCollection.c"
 	}
 #line 557 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp34_ = added_selected;
 #line 557 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp34_ != NULL) {
-#line 3690 "ViewCollection.c"
-		GeeArrayList* _tmp35_ = NULL;
-		GeeArrayList* _tmp36_ = NULL;
+#line 3712 "ViewCollection.c"
+		GeeArrayList* _tmp35_;
+		GeeArrayList* _tmp36_;
 #line 558 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp35_ = added_selected;
 #line 558 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3698,7 +3720,7 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
 		_tmp36_ = added_selected;
 #line 559 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), NULL);
-#line 3701 "ViewCollection.c"
+#line 3723 "ViewCollection.c"
 	}
 #line 562 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp37_ = added;
@@ -3708,26 +3730,26 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
 	_g_object_unref0 (added_selected);
 #line 528 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (added_visible);
-#line 3711 "ViewCollection.c"
+#line 3733 "ViewCollection.c"
 }
 
 
 static void view_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) {
 	ViewCollection * self;
 	GeeArrayList* selected_removed = NULL;
-	GeeArrayList* _tmp42_ = NULL;
-	GeeIterable* _tmp44_ = NULL;
+	GeeArrayList* _tmp42_;
+	GeeIterable* _tmp44_;
 #line 566 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 566 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (removed));
 #line 567 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	selected_removed = NULL;
-#line 3726 "ViewCollection.c"
+#line 3748 "ViewCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = removed;
 #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3736,21 +3758,21 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
 		_object_it = _tmp1_;
 #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 3739 "ViewCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 3761 "ViewCollection.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			DataView* view = NULL;
-			DataObject* _tmp6_ = NULL;
-			DataView* _tmp7_ = NULL;
-			GeeHashMap* _tmp8_ = NULL;
-			DataView* _tmp9_ = NULL;
-			DataSource* _tmp10_ = NULL;
-			DataSource* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
-			gboolean _tmp13_ = FALSE;
+			DataObject* _tmp6_;
+			DataView* _tmp7_;
+			GeeHashMap* _tmp8_;
+			DataView* _tmp9_;
+			DataSource* _tmp10_;
+			DataSource* _tmp11_;
+			gboolean _tmp12_;
+			gboolean _tmp13_;
 #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp2_ = _object_it;
 #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3759,7 +3781,7 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
 			if (!_tmp3_) {
 #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 3762 "ViewCollection.c"
+#line 3784 "ViewCollection.c"
 			}
 #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp4_ = _object_it;
@@ -3789,20 +3811,20 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
 			_g_object_unref0 (_tmp11_);
 #line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp13_) {
-#line 3792 "ViewCollection.c"
+#line 3814 "ViewCollection.c"
 				gboolean is_removed = FALSE;
-				GeeHashMap* _tmp14_ = NULL;
-				DataView* _tmp15_ = NULL;
-				DataSource* _tmp16_ = NULL;
-				DataSource* _tmp17_ = NULL;
-				gboolean _tmp18_ = FALSE;
-				gboolean _tmp19_ = FALSE;
-				gboolean _tmp20_ = FALSE;
-				DataView* _tmp21_ = NULL;
-				gboolean _tmp22_ = FALSE;
+				GeeHashMap* _tmp14_;
+				DataView* _tmp15_;
+				DataSource* _tmp16_;
+				DataSource* _tmp17_;
+				gboolean _tmp18_;
+				gboolean _tmp19_;
+				gboolean _tmp20_;
+				DataView* _tmp21_;
+				gboolean _tmp22_;
 				gboolean _tmp34_ = FALSE;
-				DataView* _tmp35_ = NULL;
-				gboolean _tmp36_ = FALSE;
+				DataView* _tmp35_;
+				gboolean _tmp36_;
 #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp14_ = self->priv->source_map;
 #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3829,14 +3851,14 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
 				_tmp22_ = data_view_is_selected (_tmp21_);
 #line 579 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp22_) {
-#line 3832 "ViewCollection.c"
-					DataSet* _tmp23_ = NULL;
-					DataView* _tmp24_ = NULL;
-					gboolean _tmp25_ = FALSE;
-					DataView* _tmp26_ = NULL;
-					gboolean _tmp27_ = FALSE;
-					DataView* _tmp28_ = NULL;
-					gboolean _tmp29_ = FALSE;
+#line 3854 "ViewCollection.c"
+					DataSet* _tmp23_;
+					DataView* _tmp24_;
+					gboolean _tmp25_;
+					DataView* _tmp26_;
+					gboolean _tmp27_;
+					DataView* _tmp28_;
+					gboolean _tmp29_;
 #line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp23_ = self->priv->selected;
 #line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3855,23 +3877,23 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
 					_tmp29_ = data_view_is_visible (_tmp28_);
 #line 583 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					if (_tmp29_) {
-#line 3858 "ViewCollection.c"
-						GeeArrayList* _tmp30_ = NULL;
-						GeeArrayList* _tmp32_ = NULL;
-						DataView* _tmp33_ = NULL;
+#line 3880 "ViewCollection.c"
+						GeeArrayList* _tmp30_;
+						GeeArrayList* _tmp32_;
+						DataView* _tmp33_;
 #line 584 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp30_ = selected_removed;
 #line 584 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						if (_tmp30_ == NULL) {
-#line 3866 "ViewCollection.c"
-							GeeArrayList* _tmp31_ = NULL;
+#line 3888 "ViewCollection.c"
+							GeeArrayList* _tmp31_;
 #line 585 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 							_tmp31_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 585 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 							_g_object_unref0 (selected_removed);
 #line 585 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 							selected_removed = _tmp31_;
-#line 3874 "ViewCollection.c"
+#line 3896 "ViewCollection.c"
 						}
 #line 587 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp32_ = selected_removed;
@@ -3879,7 +3901,7 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
 						_tmp33_ = view;
 #line 587 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp33_);
-#line 3882 "ViewCollection.c"
+#line 3904 "ViewCollection.c"
 					}
 				}
 #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3888,25 +3910,25 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
 				_tmp36_ = data_view_is_visible (_tmp35_);
 #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp36_) {
-#line 3891 "ViewCollection.c"
-					DataSet* _tmp37_ = NULL;
+#line 3913 "ViewCollection.c"
+					DataSet* _tmp37_;
 #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp37_ = self->priv->visible;
 #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp34_ = _tmp37_ != NULL;
-#line 3897 "ViewCollection.c"
+#line 3919 "ViewCollection.c"
 				} else {
 #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp34_ = FALSE;
-#line 3901 "ViewCollection.c"
+#line 3923 "ViewCollection.c"
 				}
 #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp34_) {
-#line 3905 "ViewCollection.c"
-					DataSet* _tmp38_ = NULL;
-					DataView* _tmp39_ = NULL;
-					gboolean _tmp40_ = FALSE;
-					gboolean _tmp41_ = FALSE;
+#line 3927 "ViewCollection.c"
+					DataSet* _tmp38_;
+					DataView* _tmp39_;
+					gboolean _tmp40_;
+					gboolean _tmp41_;
 #line 592 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp38_ = self->priv->visible;
 #line 592 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3919,32 +3941,32 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
 					_tmp41_ = is_removed;
 #line 593 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_vala_assert (_tmp41_, "is_removed");
-#line 3922 "ViewCollection.c"
+#line 3944 "ViewCollection.c"
 				}
 			}
 #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (view);
 #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (object);
-#line 3929 "ViewCollection.c"
+#line 3951 "ViewCollection.c"
 		}
 #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 3933 "ViewCollection.c"
+#line 3955 "ViewCollection.c"
 	}
 #line 598 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp42_ = selected_removed;
 #line 598 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp42_ != NULL) {
-#line 3939 "ViewCollection.c"
-		GeeArrayList* _tmp43_ = NULL;
+#line 3961 "ViewCollection.c"
+		GeeArrayList* _tmp43_;
 #line 599 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp43_ = selected_removed;
 #line 599 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 604 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_notify_selection_group_altered (self);
-#line 3947 "ViewCollection.c"
+#line 3969 "ViewCollection.c"
 	}
 #line 607 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp44_ = removed;
@@ -3952,15 +3974,15 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
 	DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp44_);
 #line 566 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (selected_removed);
-#line 3955 "ViewCollection.c"
+#line 3977 "ViewCollection.c"
 }
 
 
 static void view_collection_filter_altered_items (ViewCollection* self, GeeCollection* views) {
 	GeeArrayList* to_show = NULL;
 	GeeArrayList* to_hide = NULL;
-	GeeArrayList* _tmp20_ = NULL;
-	GeeArrayList* _tmp22_ = NULL;
+	GeeArrayList* _tmp20_;
+	GeeArrayList* _tmp22_;
 #line 610 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 610 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3969,11 +3991,11 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle
 	to_show = NULL;
 #line 614 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	to_hide = NULL;
-#line 3972 "ViewCollection.c"
+#line 3994 "ViewCollection.c"
 	{
 		GeeIterator* _view_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = views;
 #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3982,14 +4004,14 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle
 		_view_it = _tmp1_;
 #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 3985 "ViewCollection.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 4007 "ViewCollection.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataView* view = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			DataView* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			DataView* _tmp6_;
+			gboolean _tmp7_;
 #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp2_ = _view_it;
 #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3998,7 +4020,7 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle
 			if (!_tmp3_) {
 #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 4001 "ViewCollection.c"
+#line 4023 "ViewCollection.c"
 			}
 #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp4_ = _view_it;
@@ -4012,32 +4034,32 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle
 			_tmp7_ = view_collection_is_in_filter (self, _tmp6_);
 #line 620 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp7_) {
-#line 4015 "ViewCollection.c"
-				DataView* _tmp8_ = NULL;
-				gboolean _tmp9_ = FALSE;
+#line 4037 "ViewCollection.c"
+				DataView* _tmp8_;
+				gboolean _tmp9_;
 #line 621 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp8_ = view;
 #line 621 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp9_ = data_view_is_visible (_tmp8_);
 #line 621 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (!_tmp9_) {
-#line 4024 "ViewCollection.c"
-					GeeArrayList* _tmp10_ = NULL;
-					GeeArrayList* _tmp12_ = NULL;
-					DataView* _tmp13_ = NULL;
+#line 4046 "ViewCollection.c"
+					GeeArrayList* _tmp10_;
+					GeeArrayList* _tmp12_;
+					DataView* _tmp13_;
 #line 622 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp10_ = to_show;
 #line 622 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					if (_tmp10_ == NULL) {
-#line 4032 "ViewCollection.c"
-						GeeArrayList* _tmp11_ = NULL;
+#line 4054 "ViewCollection.c"
+						GeeArrayList* _tmp11_;
 #line 623 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp11_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 623 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_g_object_unref0 (to_show);
 #line 623 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						to_show = _tmp11_;
-#line 4040 "ViewCollection.c"
+#line 4062 "ViewCollection.c"
 					}
 #line 625 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp12_ = to_show;
@@ -4045,34 +4067,34 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle
 					_tmp13_ = view;
 #line 625 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
-#line 4048 "ViewCollection.c"
+#line 4070 "ViewCollection.c"
 				}
 			} else {
-				DataView* _tmp14_ = NULL;
-				gboolean _tmp15_ = FALSE;
+				DataView* _tmp14_;
+				gboolean _tmp15_;
 #line 628 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp14_ = view;
 #line 628 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp15_ = data_view_is_visible (_tmp14_);
 #line 628 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp15_) {
-#line 4059 "ViewCollection.c"
-					GeeArrayList* _tmp16_ = NULL;
-					GeeArrayList* _tmp18_ = NULL;
-					DataView* _tmp19_ = NULL;
+#line 4081 "ViewCollection.c"
+					GeeArrayList* _tmp16_;
+					GeeArrayList* _tmp18_;
+					DataView* _tmp19_;
 #line 629 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp16_ = to_hide;
 #line 629 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					if (_tmp16_ == NULL) {
-#line 4067 "ViewCollection.c"
-						GeeArrayList* _tmp17_ = NULL;
+#line 4089 "ViewCollection.c"
+						GeeArrayList* _tmp17_;
 #line 630 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_tmp17_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 630 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						_g_object_unref0 (to_hide);
 #line 630 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 						to_hide = _tmp17_;
-#line 4075 "ViewCollection.c"
+#line 4097 "ViewCollection.c"
 					}
 #line 632 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp18_ = to_hide;
@@ -4080,56 +4102,56 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle
 					_tmp19_ = view;
 #line 632 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_);
-#line 4083 "ViewCollection.c"
+#line 4105 "ViewCollection.c"
 				}
 			}
 #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (view);
-#line 4088 "ViewCollection.c"
+#line 4110 "ViewCollection.c"
 		}
 #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_view_it);
-#line 4092 "ViewCollection.c"
+#line 4114 "ViewCollection.c"
 	}
 #line 641 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp20_ = to_show;
 #line 641 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp20_ != NULL) {
-#line 4098 "ViewCollection.c"
-		GeeArrayList* _tmp21_ = NULL;
+#line 4120 "ViewCollection.c"
+		GeeArrayList* _tmp21_;
 #line 642 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp21_ = to_show;
 #line 642 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_show_items (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_LIST, GeeList));
-#line 4104 "ViewCollection.c"
+#line 4126 "ViewCollection.c"
 	}
 #line 644 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp22_ = to_hide;
 #line 644 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp22_ != NULL) {
-#line 4110 "ViewCollection.c"
-		GeeArrayList* _tmp23_ = NULL;
+#line 4132 "ViewCollection.c"
+		GeeArrayList* _tmp23_;
 #line 645 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp23_ = to_hide;
 #line 645 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_hide_items (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_LIST, GeeList));
-#line 4116 "ViewCollection.c"
+#line 4138 "ViewCollection.c"
 	}
 #line 610 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (to_hide);
 #line 610 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (to_show);
-#line 4122 "ViewCollection.c"
+#line 4144 "ViewCollection.c"
 }
 
 
 static void view_collection_real_items_altered (DataCollection* base, GeeMap* map) {
 	ViewCollection * self;
-	GeeMap* _tmp0_ = NULL;
-	GeeSet* _tmp1_ = NULL;
-	GeeSet* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	GeeMap* _tmp4_ = NULL;
+	GeeMap* _tmp0_;
+	GeeSet* _tmp1_;
+	GeeSet* _tmp2_;
+	GeeCollection* _tmp3_;
+	GeeMap* _tmp4_;
 #line 648 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 648 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4150,22 +4172,22 @@ static void view_collection_real_items_altered (DataCollection* base, GeeMap* ma
 	_tmp4_ = map;
 #line 652 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	DATA_COLLECTION_CLASS (view_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp4_);
-#line 4153 "ViewCollection.c"
+#line 4175 "ViewCollection.c"
 }
 
 
 static void view_collection_real_set_comparator (DataCollection* base, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target) {
 	ViewCollection * self;
-	DataSet* _tmp0_ = NULL;
-	Comparator _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	ComparatorPredicate _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	DataSet* _tmp3_ = NULL;
-	Comparator _tmp7_ = NULL;
-	void* _tmp7__target = NULL;
-	ComparatorPredicate _tmp8_ = NULL;
-	void* _tmp8__target = NULL;
+	DataSet* _tmp0_;
+	Comparator _tmp1_;
+	void* _tmp1__target;
+	ComparatorPredicate _tmp2_;
+	void* _tmp2__target;
+	DataSet* _tmp3_;
+	Comparator _tmp7_;
+	void* _tmp7__target;
+	ComparatorPredicate _tmp8_;
+	void* _tmp8__target;
 #line 655 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4184,12 +4206,12 @@ static void view_collection_real_set_comparator (DataCollection* base, Comparato
 	_tmp3_ = self->priv->visible;
 #line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp3_ != NULL) {
-#line 4187 "ViewCollection.c"
-		DataSet* _tmp4_ = NULL;
-		Comparator _tmp5_ = NULL;
-		void* _tmp5__target = NULL;
-		ComparatorPredicate _tmp6_ = NULL;
-		void* _tmp6__target = NULL;
+#line 4209 "ViewCollection.c"
+		DataSet* _tmp4_;
+		Comparator _tmp5_;
+		void* _tmp5__target;
+		ComparatorPredicate _tmp6_;
+		void* _tmp6__target;
 #line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = self->priv->visible;
 #line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4202,7 +4224,7 @@ static void view_collection_real_set_comparator (DataCollection* base, Comparato
 		_tmp6__target = predicate_target;
 #line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		data_set_set_comparator (_tmp4_, _tmp5_, _tmp5__target, _tmp6_, _tmp6__target);
-#line 4205 "ViewCollection.c"
+#line 4227 "ViewCollection.c"
 	}
 #line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp7_ = comparator;
@@ -4214,14 +4236,14 @@ static void view_collection_real_set_comparator (DataCollection* base, Comparato
 	_tmp8__target = predicate_target;
 #line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	DATA_COLLECTION_CLASS (view_collection_parent_class)->set_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp7_, _tmp7__target, _tmp8_, _tmp8__target);
-#line 4217 "ViewCollection.c"
+#line 4239 "ViewCollection.c"
 }
 
 
 static void view_collection_real_reset_comparator (DataCollection* base) {
 	ViewCollection * self;
-	DataSet* _tmp0_ = NULL;
-	DataSet* _tmp1_ = NULL;
+	DataSet* _tmp0_;
+	DataSet* _tmp1_;
 #line 663 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 664 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4232,17 +4254,17 @@ static void view_collection_real_reset_comparator (DataCollection* base) {
 	_tmp1_ = self->priv->visible;
 #line 665 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp1_ != NULL) {
-#line 4235 "ViewCollection.c"
-		DataSet* _tmp2_ = NULL;
+#line 4257 "ViewCollection.c"
+		DataSet* _tmp2_;
 #line 666 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = self->priv->visible;
 #line 666 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		data_set_reset_comparator (_tmp2_);
-#line 4241 "ViewCollection.c"
+#line 4263 "ViewCollection.c"
 	}
 #line 668 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	DATA_COLLECTION_CLASS (view_collection_parent_class)->reset_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 4245 "ViewCollection.c"
+#line 4267 "ViewCollection.c"
 }
 
 
@@ -4250,16 +4272,16 @@ static GeeCollection* view_collection_real_get_all (DataCollection* base) {
 	ViewCollection * self;
 	GeeCollection* result = NULL;
 	GeeCollection* _tmp0_ = NULL;
-	DataSet* _tmp1_ = NULL;
+	DataSet* _tmp1_;
 #line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = self->priv->visible;
 #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp1_ != NULL) {
-#line 4260 "ViewCollection.c"
-		DataSet* _tmp2_ = NULL;
-		GeeList* _tmp3_ = NULL;
+#line 4282 "ViewCollection.c"
+		DataSet* _tmp2_;
+		GeeList* _tmp3_;
 #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = self->priv->visible;
 #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4268,28 +4290,28 @@ static GeeCollection* view_collection_real_get_all (DataCollection* base) {
 		_g_object_unref0 (_tmp0_);
 #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 4271 "ViewCollection.c"
+#line 4293 "ViewCollection.c"
 	} else {
-		GeeCollection* _tmp4_ = NULL;
+		GeeCollection* _tmp4_;
 #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp0_);
 #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp4_;
-#line 4280 "ViewCollection.c"
+#line 4302 "ViewCollection.c"
 	}
 #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp0_;
 #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 4286 "ViewCollection.c"
+#line 4308 "ViewCollection.c"
 }
 
 
 GeeCollection* view_collection_get_all_unfiltered (ViewCollection* self) {
 	GeeCollection* result = NULL;
-	GeeCollection* _tmp0_ = NULL;
+	GeeCollection* _tmp0_;
 #line 675 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 676 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4298,7 +4320,7 @@ GeeCollection* view_collection_get_all_unfiltered (ViewCollection* self) {
 	result = _tmp0_;
 #line 676 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 4301 "ViewCollection.c"
+#line 4323 "ViewCollection.c"
 }
 
 
@@ -4306,42 +4328,42 @@ static gint view_collection_real_get_count (DataCollection* base) {
 	ViewCollection * self;
 	gint result = 0;
 	gint _tmp0_ = 0;
-	DataSet* _tmp1_ = NULL;
+	DataSet* _tmp1_;
 #line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = self->priv->visible;
 #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp1_ != NULL) {
-#line 4316 "ViewCollection.c"
-		DataSet* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
+#line 4338 "ViewCollection.c"
+		DataSet* _tmp2_;
+		gint _tmp3_;
 #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = self->priv->visible;
 #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = data_set_get_count (_tmp2_);
 #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp3_;
-#line 4325 "ViewCollection.c"
+#line 4347 "ViewCollection.c"
 	} else {
-		gint _tmp4_ = 0;
+		gint _tmp4_;
 #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp4_;
-#line 4332 "ViewCollection.c"
+#line 4354 "ViewCollection.c"
 	}
 #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp0_;
 #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 4338 "ViewCollection.c"
+#line 4360 "ViewCollection.c"
 }
 
 
 gint view_collection_get_unfiltered_count (ViewCollection* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 683 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
 #line 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4350,7 +4372,7 @@ gint view_collection_get_unfiltered_count (ViewCollection* self) {
 	result = _tmp0_;
 #line 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 4353 "ViewCollection.c"
+#line 4375 "ViewCollection.c"
 }
 
 
@@ -4358,17 +4380,17 @@ static DataObject* view_collection_real_get_at (DataCollection* base, gint index
 	ViewCollection * self;
 	DataObject* result = NULL;
 	DataObject* _tmp0_ = NULL;
-	DataSet* _tmp1_ = NULL;
+	DataSet* _tmp1_;
 #line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = self->priv->visible;
 #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp1_ != NULL) {
-#line 4368 "ViewCollection.c"
-		DataSet* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		DataObject* _tmp4_ = NULL;
+#line 4390 "ViewCollection.c"
+		DataSet* _tmp2_;
+		gint _tmp3_;
+		DataObject* _tmp4_;
 #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = self->priv->visible;
 #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4379,10 +4401,10 @@ static DataObject* view_collection_real_get_at (DataCollection* base, gint index
 		_g_object_unref0 (_tmp0_);
 #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp4_;
-#line 4382 "ViewCollection.c"
+#line 4404 "ViewCollection.c"
 	} else {
-		gint _tmp5_ = 0;
-		DataObject* _tmp6_ = NULL;
+		gint _tmp5_;
+		DataObject* _tmp6_;
 #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = index;
 #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4391,13 +4413,13 @@ static DataObject* view_collection_real_get_at (DataCollection* base, gint index
 		_g_object_unref0 (_tmp0_);
 #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp6_;
-#line 4394 "ViewCollection.c"
+#line 4416 "ViewCollection.c"
 	}
 #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp0_;
 #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 4400 "ViewCollection.c"
+#line 4422 "ViewCollection.c"
 }
 
 
@@ -4405,7 +4427,7 @@ static gint view_collection_real_index_of (DataCollection* base, DataObject* obj
 	ViewCollection * self;
 	gint result = 0;
 	gint _tmp0_ = 0;
-	DataSet* _tmp1_ = NULL;
+	DataSet* _tmp1_;
 #line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4414,10 +4436,10 @@ static gint view_collection_real_index_of (DataCollection* base, DataObject* obj
 	_tmp1_ = self->priv->visible;
 #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp1_ != NULL) {
-#line 4417 "ViewCollection.c"
-		DataSet* _tmp2_ = NULL;
-		DataObject* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
+#line 4439 "ViewCollection.c"
+		DataSet* _tmp2_;
+		DataObject* _tmp3_;
+		gint _tmp4_;
 #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = self->priv->visible;
 #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4426,33 +4448,33 @@ static gint view_collection_real_index_of (DataCollection* base, DataObject* obj
 		_tmp4_ = data_set_index_of (_tmp2_, _tmp3_);
 #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp4_;
-#line 4429 "ViewCollection.c"
+#line 4451 "ViewCollection.c"
 	} else {
-		DataObject* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
+		DataObject* _tmp5_;
+		gint _tmp6_;
 #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = object;
 #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp5_);
 #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp6_;
-#line 4439 "ViewCollection.c"
+#line 4461 "ViewCollection.c"
 	}
 #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp0_;
 #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 4445 "ViewCollection.c"
+#line 4467 "ViewCollection.c"
 }
 
 
 static gboolean view_collection_real_contains (DataCollection* base, DataObject* object) {
 	ViewCollection * self;
 	gboolean result = FALSE;
-	DataObject* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	DataObject* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	DataObject* _tmp0_;
+	gboolean _tmp1_;
+	DataObject* _tmp2_;
+	gboolean _tmp3_;
 #line 695 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 695 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4467,7 +4489,7 @@ static gboolean view_collection_real_contains (DataCollection* base, DataObject*
 		result = FALSE;
 #line 699 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
-#line 4470 "ViewCollection.c"
+#line 4492 "ViewCollection.c"
 	}
 #line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = object;
@@ -4477,39 +4499,39 @@ static gboolean view_collection_real_contains (DataCollection* base, DataObject*
 	result = _tmp3_;
 #line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 4480 "ViewCollection.c"
+#line 4502 "ViewCollection.c"
 }
 
 
 static DataView* view_collection_real_get_first (ViewCollection* self) {
 	DataView* result = NULL;
 	DataView* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp1_ > 0) {
-#line 4492 "ViewCollection.c"
-		DataObject* _tmp2_ = NULL;
+#line 4514 "ViewCollection.c"
+		DataObject* _tmp2_;
 #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), 0);
 #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp0_);
 #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView);
-#line 4500 "ViewCollection.c"
+#line 4522 "ViewCollection.c"
 	} else {
 #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp0_);
 #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = NULL;
-#line 4506 "ViewCollection.c"
+#line 4528 "ViewCollection.c"
 	}
 #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp0_;
 #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 4512 "ViewCollection.c"
+#line 4534 "ViewCollection.c"
 }
 
 
@@ -4518,7 +4540,7 @@ DataView* view_collection_get_first (ViewCollection* self) {
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return VIEW_COLLECTION_GET_CLASS (self)->get_first (self);
-#line 4521 "ViewCollection.c"
+#line 4543 "ViewCollection.c"
 }
 
 
@@ -4534,12 +4556,12 @@ DataView* view_collection_get_first (ViewCollection* self) {
      */
 static DataView* view_collection_real_get_first_unrejected (ViewCollection* self) {
 	DataView* result = NULL;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	DataView* dv = NULL;
-	DataView* _tmp1_ = NULL;
+	DataView* _tmp1_;
 	gint num_views = 0;
-	gint _tmp2_ = 0;
-	DataView* _tmp17_ = NULL;
+	gint _tmp2_;
+	DataView* _tmp17_;
 #line 721 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 721 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4548,7 +4570,7 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
 		result = NULL;
 #line 722 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
-#line 4551 "ViewCollection.c"
+#line 4573 "ViewCollection.c"
 	}
 #line 725 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = view_collection_get_first (self);
@@ -4560,23 +4582,23 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
 	num_views = _tmp2_;
 #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	while (TRUE) {
-#line 4563 "ViewCollection.c"
+#line 4585 "ViewCollection.c"
 		gboolean _tmp3_ = FALSE;
-		DataView* _tmp4_ = NULL;
+		DataView* _tmp4_;
 		MediaSource* tmp = NULL;
-		DataView* _tmp8_ = NULL;
-		DataSource* _tmp9_ = NULL;
-		MediaSource* _tmp10_ = NULL;
+		DataView* _tmp8_;
+		DataSource* _tmp9_;
+		MediaSource* _tmp10_;
 		gboolean _tmp11_ = FALSE;
-		MediaSource* _tmp12_ = NULL;
+		MediaSource* _tmp12_;
 #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = dv;
 #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp4_ != NULL) {
-#line 4576 "ViewCollection.c"
-			DataView* _tmp5_ = NULL;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
+#line 4598 "ViewCollection.c"
+			DataView* _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
 #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp5_ = dv;
 #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4585,17 +4607,17 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
 			_tmp7_ = num_views;
 #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp3_ = _tmp6_ < (_tmp7_ - 1);
-#line 4588 "ViewCollection.c"
+#line 4610 "ViewCollection.c"
 		} else {
 #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp3_ = FALSE;
-#line 4592 "ViewCollection.c"
+#line 4614 "ViewCollection.c"
 		}
 #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (!_tmp3_) {
 #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			break;
-#line 4598 "ViewCollection.c"
+#line 4620 "ViewCollection.c"
 		}
 #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp8_ = dv;
@@ -4607,7 +4629,7 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
 		if (_tmp10_ == NULL) {
 #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_tmp9_);
-#line 4610 "ViewCollection.c"
+#line 4632 "ViewCollection.c"
 		}
 #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		tmp = _tmp10_;
@@ -4615,20 +4637,20 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
 		_tmp12_ = tmp;
 #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp12_ != NULL) {
-#line 4618 "ViewCollection.c"
-			MediaSource* _tmp13_ = NULL;
-			Rating _tmp14_ = 0;
+#line 4640 "ViewCollection.c"
+			MediaSource* _tmp13_;
+			Rating _tmp14_;
 #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp13_ = tmp;
 #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp14_ = media_source_get_rating (_tmp13_);
 #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp11_ = _tmp14_ != RATING_REJECTED;
-#line 4627 "ViewCollection.c"
+#line 4649 "ViewCollection.c"
 		} else {
 #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp11_ = FALSE;
-#line 4631 "ViewCollection.c"
+#line 4653 "ViewCollection.c"
 		}
 #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp11_) {
@@ -4638,10 +4660,10 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
 			_g_object_unref0 (tmp);
 #line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			return result;
-#line 4641 "ViewCollection.c"
+#line 4663 "ViewCollection.c"
 		} else {
-			DataView* _tmp15_ = NULL;
-			DataView* _tmp16_ = NULL;
+			DataView* _tmp15_;
+			DataView* _tmp16_;
 #line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp15_ = dv;
 #line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4650,11 +4672,11 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
 			_g_object_unref0 (dv);
 #line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			dv = _tmp16_;
-#line 4653 "ViewCollection.c"
+#line 4675 "ViewCollection.c"
 		}
 #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (tmp);
-#line 4657 "ViewCollection.c"
+#line 4679 "ViewCollection.c"
 	}
 #line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp17_ = view_collection_get_first (self);
@@ -4664,7 +4686,7 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
 	_g_object_unref0 (dv);
 #line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 4667 "ViewCollection.c"
+#line 4689 "ViewCollection.c"
 }
 
 
@@ -4673,21 +4695,21 @@ DataView* view_collection_get_first_unrejected (ViewCollection* self) {
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 719 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return VIEW_COLLECTION_GET_CLASS (self)->get_first_unrejected (self);
-#line 4676 "ViewCollection.c"
+#line 4698 "ViewCollection.c"
 }
 
 
 static DataView* view_collection_real_get_last (ViewCollection* self) {
 	DataView* result = NULL;
 	DataView* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp1_ > 0) {
-#line 4688 "ViewCollection.c"
-		gint _tmp2_ = 0;
-		DataObject* _tmp3_ = NULL;
+#line 4710 "ViewCollection.c"
+		gint _tmp2_;
+		DataObject* _tmp3_;
 #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4696,19 +4718,19 @@ static DataView* view_collection_real_get_last (ViewCollection* self) {
 		_g_object_unref0 (_tmp0_);
 #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_VIEW, DataView);
-#line 4699 "ViewCollection.c"
+#line 4721 "ViewCollection.c"
 	} else {
 #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp0_);
 #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = NULL;
-#line 4705 "ViewCollection.c"
+#line 4727 "ViewCollection.c"
 	}
 #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp0_;
 #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 4711 "ViewCollection.c"
+#line 4733 "ViewCollection.c"
 }
 
 
@@ -4717,22 +4739,22 @@ DataView* view_collection_get_last (ViewCollection* self) {
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return VIEW_COLLECTION_GET_CLASS (self)->get_last (self);
-#line 4720 "ViewCollection.c"
+#line 4742 "ViewCollection.c"
 }
 
 
 static DataView* view_collection_real_get_next (ViewCollection* self, DataView* view) {
 	DataView* result = NULL;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gint index = 0;
-	DataView* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	DataObject* _tmp8_ = NULL;
+	DataView* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	DataObject* _tmp8_;
 #line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (view), NULL);
 #line 749 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4743,7 +4765,7 @@ static DataView* view_collection_real_get_next (ViewCollection* self, DataView*
 		result = NULL;
 #line 750 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
-#line 4746 "ViewCollection.c"
+#line 4768 "ViewCollection.c"
 	}
 #line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = view;
@@ -4759,7 +4781,7 @@ static DataView* view_collection_real_get_next (ViewCollection* self, DataView*
 		result = NULL;
 #line 754 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
-#line 4762 "ViewCollection.c"
+#line 4784 "ViewCollection.c"
 	}
 #line 756 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp4_ = index;
@@ -4773,7 +4795,7 @@ static DataView* view_collection_real_get_next (ViewCollection* self, DataView*
 	if (_tmp5_ >= _tmp6_) {
 #line 758 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		index = 0;
-#line 4776 "ViewCollection.c"
+#line 4798 "ViewCollection.c"
 	}
 #line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp7_ = index;
@@ -4783,7 +4805,7 @@ static DataView* view_collection_real_get_next (ViewCollection* self, DataView*
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView);
 #line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 4786 "ViewCollection.c"
+#line 4808 "ViewCollection.c"
 }
 
 
@@ -4792,21 +4814,21 @@ DataView* view_collection_get_next (ViewCollection* self, DataView* view) {
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return VIEW_COLLECTION_GET_CLASS (self)->get_next (self, view);
-#line 4795 "ViewCollection.c"
+#line 4817 "ViewCollection.c"
 }
 
 
 static DataView* view_collection_real_get_previous (ViewCollection* self, DataView* view) {
 	DataView* result = NULL;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gint index = 0;
-	DataView* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp7_ = 0;
-	DataObject* _tmp8_ = NULL;
+	DataView* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp7_;
+	DataObject* _tmp8_;
 #line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (view), NULL);
 #line 764 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4817,7 +4839,7 @@ static DataView* view_collection_real_get_previous (ViewCollection* self, DataVi
 		result = NULL;
 #line 765 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
-#line 4820 "ViewCollection.c"
+#line 4842 "ViewCollection.c"
 	}
 #line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = view;
@@ -4833,7 +4855,7 @@ static DataView* view_collection_real_get_previous (ViewCollection* self, DataVi
 		result = NULL;
 #line 769 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
-#line 4836 "ViewCollection.c"
+#line 4858 "ViewCollection.c"
 	}
 #line 771 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp4_ = index;
@@ -4843,13 +4865,13 @@ static DataView* view_collection_real_get_previous (ViewCollection* self, DataVi
 	_tmp5_ = index;
 #line 772 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp5_ < 0) {
-#line 4846 "ViewCollection.c"
-		gint _tmp6_ = 0;
+#line 4868 "ViewCollection.c"
+		gint _tmp6_;
 #line 773 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 773 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		index = _tmp6_ - 1;
-#line 4852 "ViewCollection.c"
+#line 4874 "ViewCollection.c"
 	}
 #line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp7_ = index;
@@ -4859,7 +4881,7 @@ static DataView* view_collection_real_get_previous (ViewCollection* self, DataVi
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView);
 #line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 4862 "ViewCollection.c"
+#line 4884 "ViewCollection.c"
 }
 
 
@@ -4868,24 +4890,24 @@ DataView* view_collection_get_previous (ViewCollection* self, DataView* view) {
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return VIEW_COLLECTION_GET_CLASS (self)->get_previous (self, view);
-#line 4871 "ViewCollection.c"
+#line 4893 "ViewCollection.c"
 }
 
 
-gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource** next, DataSource** prev, const gchar* type_selector) {
+gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource* * next, DataSource* * prev, const gchar* type_selector) {
 	DataSource* _vala_next = NULL;
 	DataSource* _vala_prev = NULL;
 	gboolean result = FALSE;
 	DataView* home_view = NULL;
-	DataSource* _tmp0_ = NULL;
-	DataView* _tmp1_ = NULL;
-	DataView* _tmp2_ = NULL;
+	DataSource* _tmp0_;
+	DataView* _tmp1_;
+	DataView* _tmp2_;
 	DataView* next_view = NULL;
-	DataView* _tmp3_ = NULL;
-	DataView* _tmp4_ = NULL;
+	DataView* _tmp3_;
+	DataView* _tmp4_;
 	DataView* prev_view = NULL;
-	DataView* _tmp19_ = NULL;
-	DataView* _tmp20_ = NULL;
+	DataView* _tmp19_;
+	DataView* _tmp20_;
 #line 778 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
 #line 778 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4916,25 +4938,25 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 		if (next) {
 #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			*next = _vala_next;
-#line 4919 "ViewCollection.c"
+#line 4941 "ViewCollection.c"
 		} else {
 #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_vala_next);
-#line 4923 "ViewCollection.c"
+#line 4945 "ViewCollection.c"
 		}
 #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (prev) {
 #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			*prev = _vala_prev;
-#line 4929 "ViewCollection.c"
+#line 4951 "ViewCollection.c"
 		} else {
 #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_vala_prev);
-#line 4933 "ViewCollection.c"
+#line 4955 "ViewCollection.c"
 		}
 #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
-#line 4937 "ViewCollection.c"
+#line 4959 "ViewCollection.c"
 	}
 #line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = home_view;
@@ -4944,13 +4966,13 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 	next_view = _tmp4_;
 #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	while (TRUE) {
-#line 4947 "ViewCollection.c"
-		DataView* _tmp5_ = NULL;
-		DataView* _tmp6_ = NULL;
+#line 4969 "ViewCollection.c"
+		DataView* _tmp5_;
+		DataView* _tmp6_;
 		gboolean _tmp7_ = FALSE;
-		const gchar* _tmp8_ = NULL;
-		DataView* _tmp17_ = NULL;
-		DataView* _tmp18_ = NULL;
+		const gchar* _tmp8_;
+		DataView* _tmp17_;
+		DataView* _tmp18_;
 #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = next_view;
 #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4959,7 +4981,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 		if (!(_tmp5_ != _tmp6_)) {
 #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			break;
-#line 4962 "ViewCollection.c"
+#line 4984 "ViewCollection.c"
 		}
 #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp8_ = type_selector;
@@ -4967,14 +4989,14 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 		if (_tmp8_ == NULL) {
 #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp7_ = TRUE;
-#line 4970 "ViewCollection.c"
+#line 4992 "ViewCollection.c"
 		} else {
-			DataView* _tmp9_ = NULL;
-			DataSource* _tmp10_ = NULL;
-			DataSource* _tmp11_ = NULL;
-			gchar* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
+			DataView* _tmp9_;
+			DataSource* _tmp10_;
+			DataSource* _tmp11_;
+			gchar* _tmp12_;
+			gchar* _tmp13_;
+			const gchar* _tmp14_;
 #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp9_ = next_view;
 #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4993,13 +5015,13 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 			_g_free0 (_tmp13_);
 #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_tmp11_);
-#line 4996 "ViewCollection.c"
+#line 5018 "ViewCollection.c"
 		}
 #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp7_) {
-#line 5000 "ViewCollection.c"
-			DataView* _tmp15_ = NULL;
-			DataSource* _tmp16_ = NULL;
+#line 5022 "ViewCollection.c"
+			DataView* _tmp15_;
+			DataSource* _tmp16_;
 #line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp15_ = next_view;
 #line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5010,7 +5032,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 			_vala_next = _tmp16_;
 #line 791 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			break;
-#line 5013 "ViewCollection.c"
+#line 5035 "ViewCollection.c"
 		}
 #line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp17_ = next_view;
@@ -5020,7 +5042,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 		_g_object_unref0 (next_view);
 #line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		next_view = _tmp18_;
-#line 5023 "ViewCollection.c"
+#line 5045 "ViewCollection.c"
 	}
 #line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp19_ = home_view;
@@ -5030,13 +5052,13 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 	prev_view = _tmp20_;
 #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	while (TRUE) {
-#line 5033 "ViewCollection.c"
-		DataView* _tmp21_ = NULL;
-		DataView* _tmp22_ = NULL;
+#line 5055 "ViewCollection.c"
+		DataView* _tmp21_;
+		DataView* _tmp22_;
 		gboolean _tmp23_ = FALSE;
-		const gchar* _tmp24_ = NULL;
-		DataView* _tmp33_ = NULL;
-		DataView* _tmp34_ = NULL;
+		const gchar* _tmp24_;
+		DataView* _tmp33_;
+		DataView* _tmp34_;
 #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp21_ = prev_view;
 #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5045,7 +5067,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 		if (!(_tmp21_ != _tmp22_)) {
 #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			break;
-#line 5048 "ViewCollection.c"
+#line 5070 "ViewCollection.c"
 		}
 #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp24_ = type_selector;
@@ -5053,14 +5075,14 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 		if (_tmp24_ == NULL) {
 #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp23_ = TRUE;
-#line 5056 "ViewCollection.c"
+#line 5078 "ViewCollection.c"
 		} else {
-			DataView* _tmp25_ = NULL;
-			DataSource* _tmp26_ = NULL;
-			DataSource* _tmp27_ = NULL;
-			gchar* _tmp28_ = NULL;
-			gchar* _tmp29_ = NULL;
-			const gchar* _tmp30_ = NULL;
+			DataView* _tmp25_;
+			DataSource* _tmp26_;
+			DataSource* _tmp27_;
+			gchar* _tmp28_;
+			gchar* _tmp29_;
+			const gchar* _tmp30_;
 #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp25_ = prev_view;
 #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5079,13 +5101,13 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 			_g_free0 (_tmp29_);
 #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_tmp27_);
-#line 5082 "ViewCollection.c"
+#line 5104 "ViewCollection.c"
 		}
 #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp23_) {
-#line 5086 "ViewCollection.c"
-			DataView* _tmp31_ = NULL;
-			DataSource* _tmp32_ = NULL;
+#line 5108 "ViewCollection.c"
+			DataView* _tmp31_;
+			DataSource* _tmp32_;
 #line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp31_ = prev_view;
 #line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5096,7 +5118,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 			_vala_prev = _tmp32_;
 #line 800 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			break;
-#line 5099 "ViewCollection.c"
+#line 5121 "ViewCollection.c"
 		}
 #line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp33_ = prev_view;
@@ -5106,7 +5128,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 		_g_object_unref0 (prev_view);
 #line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		prev_view = _tmp34_;
-#line 5109 "ViewCollection.c"
+#line 5131 "ViewCollection.c"
 	}
 #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = TRUE;
@@ -5120,43 +5142,43 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 	if (next) {
 #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*next = _vala_next;
-#line 5123 "ViewCollection.c"
+#line 5145 "ViewCollection.c"
 	} else {
 #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_vala_next);
-#line 5127 "ViewCollection.c"
+#line 5149 "ViewCollection.c"
 	}
 #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (prev) {
 #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*prev = _vala_prev;
-#line 5133 "ViewCollection.c"
+#line 5155 "ViewCollection.c"
 	} else {
 #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_vala_prev);
-#line 5137 "ViewCollection.c"
+#line 5159 "ViewCollection.c"
 	}
 #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 5141 "ViewCollection.c"
+#line 5163 "ViewCollection.c"
 }
 
 
 GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource* home, const gchar* typename) {
 	GeeSet* result = NULL;
 	GeeSet* neighbors = NULL;
-	GeeHashSet* _tmp0_ = NULL;
+	GeeHashSet* _tmp0_;
 	DataSource* next = NULL;
 	DataSource* prev = NULL;
-	DataSource* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	DataSource* _tmp1_;
+	const gchar* _tmp2_;
 	DataSource* _tmp3_ = NULL;
 	DataSource* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	DataSource* _tmp6_ = NULL;
-	DataSource* _tmp16_ = NULL;
-	GeeSet* _tmp26_ = NULL;
-	DataSource* _tmp27_ = NULL;
+	gboolean _tmp5_;
+	DataSource* _tmp6_;
+	DataSource* _tmp16_;
+	GeeSet* _tmp26_;
+	DataSource* _tmp27_;
 #line 809 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 809 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5189,22 +5211,22 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource
 		_g_object_unref0 (next);
 #line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
-#line 5192 "ViewCollection.c"
+#line 5214 "ViewCollection.c"
 	}
 #line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp6_ = next;
 #line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp6_ != NULL) {
-#line 5198 "ViewCollection.c"
-		GeeSet* _tmp7_ = NULL;
-		DataSource* _tmp8_ = NULL;
+#line 5220 "ViewCollection.c"
+		GeeSet* _tmp7_;
+		DataSource* _tmp8_;
 		DataSource* next_next = NULL;
 		DataSource* next_prev = NULL;
-		DataSource* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
+		DataSource* _tmp9_;
+		const gchar* _tmp10_;
 		DataSource* _tmp11_ = NULL;
 		DataSource* _tmp12_ = NULL;
-		DataSource* _tmp13_ = NULL;
+		DataSource* _tmp13_;
 #line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp7_ = neighbors;
 #line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5229,37 +5251,37 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource
 		_tmp13_ = next_next;
 #line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp13_ != NULL) {
-#line 5232 "ViewCollection.c"
-			GeeSet* _tmp14_ = NULL;
-			DataSource* _tmp15_ = NULL;
+#line 5254 "ViewCollection.c"
+			GeeSet* _tmp14_;
+			DataSource* _tmp15_;
 #line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp14_ = neighbors;
 #line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp15_ = next_next;
 #line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_);
-#line 5241 "ViewCollection.c"
+#line 5263 "ViewCollection.c"
 		}
 #line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (next_prev);
 #line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (next_next);
-#line 5247 "ViewCollection.c"
+#line 5269 "ViewCollection.c"
 	}
 #line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp16_ = prev;
 #line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp16_ != NULL) {
-#line 5253 "ViewCollection.c"
-		GeeSet* _tmp17_ = NULL;
-		DataSource* _tmp18_ = NULL;
+#line 5275 "ViewCollection.c"
+		GeeSet* _tmp17_;
+		DataSource* _tmp18_;
 		DataSource* next_prev = NULL;
 		DataSource* prev_prev = NULL;
-		DataSource* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
+		DataSource* _tmp19_;
+		const gchar* _tmp20_;
 		DataSource* _tmp21_ = NULL;
 		DataSource* _tmp22_ = NULL;
-		DataSource* _tmp23_ = NULL;
+		DataSource* _tmp23_;
 #line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp17_ = neighbors;
 #line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5284,22 +5306,22 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource
 		_tmp23_ = prev_prev;
 #line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp23_ != NULL) {
-#line 5287 "ViewCollection.c"
-			GeeSet* _tmp24_ = NULL;
-			DataSource* _tmp25_ = NULL;
+#line 5309 "ViewCollection.c"
+			GeeSet* _tmp24_;
+			DataSource* _tmp25_;
 #line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp24_ = neighbors;
 #line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp25_ = prev_prev;
 #line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
-#line 5296 "ViewCollection.c"
+#line 5318 "ViewCollection.c"
 		}
 #line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (prev_prev);
 #line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (next_prev);
-#line 5302 "ViewCollection.c"
+#line 5324 "ViewCollection.c"
 	}
 #line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp26_ = neighbors;
@@ -5315,19 +5337,19 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource
 	_g_object_unref0 (next);
 #line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 5318 "ViewCollection.c"
+#line 5340 "ViewCollection.c"
 }
 
 
 static void view_collection_add_many_selected (ViewCollection* self, GeeCollection* views) {
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gboolean added = FALSE;
-	DataSet* _tmp11_ = NULL;
-	GeeCollection* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	gboolean _tmp14_ = FALSE;
+	DataSet* _tmp11_;
+	GeeCollection* _tmp12_;
+	gboolean _tmp13_;
+	gboolean _tmp14_;
 #line 850 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 850 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5342,12 +5364,12 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti
 	if (_tmp2_ == 0) {
 #line 852 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return;
-#line 5345 "ViewCollection.c"
+#line 5367 "ViewCollection.c"
 	}
 	{
 		GeeIterator* _view_it = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
 #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = views;
 #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5356,14 +5378,14 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti
 		_view_it = _tmp4_;
 #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 5359 "ViewCollection.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+#line 5381 "ViewCollection.c"
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			DataView* view = NULL;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
-			DataView* _tmp9_ = NULL;
-			gboolean _tmp10_ = FALSE;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			DataView* _tmp9_;
+			gboolean _tmp10_;
 #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp5_ = _view_it;
 #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5372,7 +5394,7 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti
 			if (!_tmp6_) {
 #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 5375 "ViewCollection.c"
+#line 5397 "ViewCollection.c"
 			}
 #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp7_ = _view_it;
@@ -5388,11 +5410,11 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti
 			_vala_assert (_tmp10_, "view.is_visible()");
 #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (view);
-#line 5391 "ViewCollection.c"
+#line 5413 "ViewCollection.c"
 		}
 #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_view_it);
-#line 5395 "ViewCollection.c"
+#line 5417 "ViewCollection.c"
 	}
 #line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp11_ = self->priv->selected;
@@ -5406,19 +5428,19 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti
 	_tmp14_ = added;
 #line 858 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_vala_assert (_tmp14_, "added");
-#line 5409 "ViewCollection.c"
+#line 5431 "ViewCollection.c"
 }
 
 
 static void view_collection_remove_many_selected (ViewCollection* self, GeeCollection* views) {
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gboolean removed = FALSE;
-	DataSet* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
+	DataSet* _tmp3_;
+	GeeCollection* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
 #line 861 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 861 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5433,7 +5455,7 @@ static void view_collection_remove_many_selected (ViewCollection* self, GeeColle
 	if (_tmp2_ == 0) {
 #line 863 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return;
-#line 5436 "ViewCollection.c"
+#line 5458 "ViewCollection.c"
 	}
 #line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = self->priv->selected;
@@ -5447,7 +5469,7 @@ static void view_collection_remove_many_selected (ViewCollection* self, GeeColle
 	_tmp6_ = removed;
 #line 866 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_vala_assert (_tmp6_, "removed");
-#line 5450 "ViewCollection.c"
+#line 5472 "ViewCollection.c"
 }
 
 
@@ -5456,18 +5478,18 @@ static gboolean _view_collection_select_item_marked_action (DataObject* object,
 	result = view_collection_select_item ((ViewCollection*) self, object, user);
 #line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 5459 "ViewCollection.c"
+#line 5481 "ViewCollection.c"
 }
 
 
 void view_collection_select_marked (ViewCollection* self, Marker* marker) {
 	GeeArrayList* selected = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	Marker* _tmp1_ = NULL;
-	GeeArrayList* _tmp2_ = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	GeeArrayList* _tmp0_;
+	Marker* _tmp1_;
+	GeeArrayList* _tmp2_;
+	GeeArrayList* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5490,9 +5512,9 @@ void view_collection_select_marked (ViewCollection* self, Marker* marker) {
 	_tmp5_ = _tmp4_;
 #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp5_ > 0) {
-#line 5493 "ViewCollection.c"
-		GeeArrayList* _tmp6_ = NULL;
-		GeeArrayList* _tmp7_ = NULL;
+#line 5515 "ViewCollection.c"
+		GeeArrayList* _tmp6_;
+		GeeArrayList* _tmp7_;
 #line 875 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = selected;
 #line 875 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5501,17 +5523,17 @@ void view_collection_select_marked (ViewCollection* self, Marker* marker) {
 		_tmp7_ = selected;
 #line 876 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), NULL);
-#line 5504 "ViewCollection.c"
+#line 5526 "ViewCollection.c"
 	}
 #line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (selected);
-#line 5508 "ViewCollection.c"
+#line 5530 "ViewCollection.c"
 }
 
 
 void view_collection_select_all (ViewCollection* self) {
 	Marker* marker = NULL;
-	Marker* _tmp0_ = NULL;
+	Marker* _tmp0_;
 #line 881 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 882 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5524,20 +5546,20 @@ void view_collection_select_all (ViewCollection* self) {
 	view_collection_select_marked (self, marker);
 #line 881 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (marker);
-#line 5527 "ViewCollection.c"
+#line 5549 "ViewCollection.c"
 }
 
 
 static gboolean view_collection_select_item (ViewCollection* self, DataObject* object, GObject* user) {
 	gboolean result = FALSE;
 	DataView* view = NULL;
-	DataObject* _tmp0_ = NULL;
-	DataView* _tmp1_ = NULL;
-	DataView* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	DataView* _tmp9_ = NULL;
-	DataView* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
+	DataObject* _tmp0_;
+	DataView* _tmp1_;
+	DataView* _tmp2_;
+	gboolean _tmp3_;
+	DataView* _tmp9_;
+	DataView* _tmp10_;
+	gboolean _tmp11_;
 #line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
 #line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5556,19 +5578,19 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o
 	_tmp3_ = data_view_is_selected (_tmp2_);
 #line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp3_) {
-#line 5559 "ViewCollection.c"
-		DataView* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+#line 5581 "ViewCollection.c"
+		DataView* _tmp4_;
+		gboolean _tmp5_;
 #line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = view;
 #line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = data_view_is_visible (_tmp4_);
 #line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp5_) {
-#line 5568 "ViewCollection.c"
-			DataSet* _tmp6_ = NULL;
-			DataView* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+#line 5590 "ViewCollection.c"
+			DataSet* _tmp6_;
+			DataView* _tmp7_;
+			gboolean _tmp8_;
 #line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp6_ = self->priv->selected;
 #line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5577,7 +5599,7 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o
 			_tmp8_ = data_set_contains (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject));
 #line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_vala_assert (_tmp8_, "selected.contains(view)");
-#line 5580 "ViewCollection.c"
+#line 5602 "ViewCollection.c"
 		}
 #line 893 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		result = TRUE;
@@ -5585,7 +5607,7 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o
 		_g_object_unref0 (view);
 #line 893 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
-#line 5588 "ViewCollection.c"
+#line 5610 "ViewCollection.c"
 	}
 #line 896 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp9_ = view;
@@ -5597,16 +5619,16 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o
 	_tmp11_ = data_view_is_visible (_tmp10_);
 #line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp11_) {
-#line 5600 "ViewCollection.c"
-		GObject* _tmp12_ = NULL;
-		DataView* _tmp13_ = NULL;
+#line 5622 "ViewCollection.c"
+		GObject* _tmp12_;
+		DataView* _tmp13_;
 #line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp12_ = user;
 #line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp13_ = view;
 #line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ARRAY_LIST, GeeArrayList), GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
-#line 5609 "ViewCollection.c"
+#line 5631 "ViewCollection.c"
 	}
 #line 903 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = TRUE;
@@ -5614,7 +5636,7 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o
 	_g_object_unref0 (view);
 #line 903 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 5617 "ViewCollection.c"
+#line 5639 "ViewCollection.c"
 }
 
 
@@ -5623,18 +5645,18 @@ static gboolean _view_collection_unselect_item_marked_action (DataObject* object
 	result = view_collection_unselect_item ((ViewCollection*) self, object, user);
 #line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 5626 "ViewCollection.c"
+#line 5648 "ViewCollection.c"
 }
 
 
 void view_collection_unselect_marked (ViewCollection* self, Marker* marker) {
 	GeeArrayList* unselected = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	Marker* _tmp1_ = NULL;
-	GeeArrayList* _tmp2_ = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	GeeArrayList* _tmp0_;
+	Marker* _tmp1_;
+	GeeArrayList* _tmp2_;
+	GeeArrayList* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5657,9 +5679,9 @@ void view_collection_unselect_marked (ViewCollection* self, Marker* marker) {
 	_tmp5_ = _tmp4_;
 #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp5_ > 0) {
-#line 5660 "ViewCollection.c"
-		GeeArrayList* _tmp6_ = NULL;
-		GeeArrayList* _tmp7_ = NULL;
+#line 5682 "ViewCollection.c"
+		GeeArrayList* _tmp6_;
+		GeeArrayList* _tmp7_;
 #line 912 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = unselected;
 #line 912 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5668,23 +5690,23 @@ void view_collection_unselect_marked (ViewCollection* self, Marker* marker) {
 		_tmp7_ = unselected;
 #line 913 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_notify_items_selected_unselected (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5671 "ViewCollection.c"
+#line 5693 "ViewCollection.c"
 	}
 #line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (unselected);
-#line 5675 "ViewCollection.c"
+#line 5697 "ViewCollection.c"
 }
 
 
 void view_collection_unselect_all (ViewCollection* self) {
-	DataSet* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	DataSet* _tmp0_;
+	gint _tmp1_;
 	Marker* marker = NULL;
-	Marker* _tmp2_ = NULL;
-	Marker* _tmp3_ = NULL;
-	GeeList* _tmp4_ = NULL;
-	GeeList* _tmp5_ = NULL;
-	Marker* _tmp6_ = NULL;
+	Marker* _tmp2_;
+	Marker* _tmp3_;
+	GeeList* _tmp4_;
+	GeeList* _tmp5_;
+	Marker* _tmp6_;
 #line 918 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 919 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5695,7 +5717,7 @@ void view_collection_unselect_all (ViewCollection* self) {
 	if (_tmp1_ == 0) {
 #line 920 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return;
-#line 5698 "ViewCollection.c"
+#line 5720 "ViewCollection.c"
 	}
 #line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
@@ -5717,14 +5739,14 @@ void view_collection_unselect_all (ViewCollection* self) {
 	view_collection_unselect_marked (self, _tmp6_);
 #line 918 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (marker);
-#line 5720 "ViewCollection.c"
+#line 5742 "ViewCollection.c"
 }
 
 
 void view_collection_unselect_all_but (ViewCollection* self, DataView* exception) {
 	Marker* marker = NULL;
-	Marker* _tmp0_ = NULL;
-	Marker* _tmp15_ = NULL;
+	Marker* _tmp0_;
+	Marker* _tmp15_;
 #line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5733,13 +5755,13 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception
 	_tmp0_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	marker = _tmp0_;
-#line 5736 "ViewCollection.c"
+#line 5758 "ViewCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
+		GeeCollection* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeIterator* _tmp3_;
+		GeeIterator* _tmp4_;
 #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp1_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5754,17 +5776,17 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception
 		_object_it = _tmp4_;
 #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 5757 "ViewCollection.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+#line 5779 "ViewCollection.c"
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
 			DataView* view = NULL;
-			DataObject* _tmp9_ = NULL;
-			DataView* _tmp10_ = NULL;
-			DataView* _tmp11_ = NULL;
-			DataView* _tmp12_ = NULL;
+			DataObject* _tmp9_;
+			DataView* _tmp10_;
+			DataView* _tmp11_;
+			DataView* _tmp12_;
 #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp5_ = _object_it;
 #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5773,7 +5795,7 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception
 			if (!_tmp6_) {
 #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 5776 "ViewCollection.c"
+#line 5798 "ViewCollection.c"
 			}
 #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp7_ = _object_it;
@@ -5793,26 +5815,26 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception
 			_tmp12_ = exception;
 #line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp11_ != _tmp12_) {
-#line 5796 "ViewCollection.c"
-				Marker* _tmp13_ = NULL;
-				DataView* _tmp14_ = NULL;
+#line 5818 "ViewCollection.c"
+				Marker* _tmp13_;
+				DataView* _tmp14_;
 #line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp13_ = marker;
 #line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp14_ = view;
 #line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				marker_mark (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
-#line 5805 "ViewCollection.c"
+#line 5827 "ViewCollection.c"
 			}
 #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (view);
 #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (object);
-#line 5811 "ViewCollection.c"
+#line 5833 "ViewCollection.c"
 		}
 #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 5815 "ViewCollection.c"
+#line 5837 "ViewCollection.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp15_ = marker;
@@ -5820,20 +5842,20 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception
 	view_collection_unselect_marked (self, _tmp15_);
 #line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (marker);
-#line 5823 "ViewCollection.c"
+#line 5845 "ViewCollection.c"
 }
 
 
 static gboolean view_collection_unselect_item (ViewCollection* self, DataObject* object, GObject* user) {
 	gboolean result = FALSE;
 	DataView* view = NULL;
-	DataObject* _tmp0_ = NULL;
-	DataView* _tmp1_ = NULL;
-	DataView* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	DataView* _tmp7_ = NULL;
-	GObject* _tmp8_ = NULL;
-	DataView* _tmp9_ = NULL;
+	DataObject* _tmp0_;
+	DataView* _tmp1_;
+	DataView* _tmp2_;
+	gboolean _tmp3_;
+	DataView* _tmp7_;
+	GObject* _tmp8_;
+	DataView* _tmp9_;
 #line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
 #line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5852,10 +5874,10 @@ static gboolean view_collection_unselect_item (ViewCollection* self, DataObject*
 	_tmp3_ = data_view_is_selected (_tmp2_);
 #line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (!_tmp3_) {
-#line 5855 "ViewCollection.c"
-		DataSet* _tmp4_ = NULL;
-		DataView* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+#line 5877 "ViewCollection.c"
+		DataSet* _tmp4_;
+		DataView* _tmp5_;
+		gboolean _tmp6_;
 #line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = self->priv->selected;
 #line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5870,7 +5892,7 @@ static gboolean view_collection_unselect_item (ViewCollection* self, DataObject*
 		_g_object_unref0 (view);
 #line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
-#line 5873 "ViewCollection.c"
+#line 5895 "ViewCollection.c"
 	}
 #line 948 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp7_ = view;
@@ -5888,17 +5910,17 @@ static gboolean view_collection_unselect_item (ViewCollection* self, DataObject*
 	_g_object_unref0 (view);
 #line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 5891 "ViewCollection.c"
+#line 5913 "ViewCollection.c"
 }
 
 
 void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* unselect, Marker* select) {
 	GeeArrayList* unselected = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	Marker* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	Marker* _tmp1_;
 	GeeArrayList* selected = NULL;
-	GeeArrayList* _tmp2_ = NULL;
-	Marker* _tmp3_ = NULL;
+	GeeArrayList* _tmp2_;
+	Marker* _tmp3_;
 #line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5931,7 +5953,7 @@ void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* u
 	_g_object_unref0 (selected);
 #line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (unselected);
-#line 5934 "ViewCollection.c"
+#line 5956 "ViewCollection.c"
 }
 
 
@@ -5940,18 +5962,18 @@ static gboolean _view_collection_toggle_item_marked_action (DataObject* object,
 	result = view_collection_toggle_item ((ViewCollection*) self, object, user);
 #line 973 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 5943 "ViewCollection.c"
+#line 5965 "ViewCollection.c"
 }
 
 
 void view_collection_toggle_marked (ViewCollection* self, Marker* marker) {
 	ViewCollectionToggleLists* lists = NULL;
-	ViewCollectionToggleLists* _tmp0_ = NULL;
-	Marker* _tmp1_ = NULL;
-	GeeArrayList* _tmp2_ = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	GeeArrayList* _tmp4_ = NULL;
-	GeeArrayList* _tmp5_ = NULL;
+	ViewCollectionToggleLists* _tmp0_;
+	Marker* _tmp1_;
+	GeeArrayList* _tmp2_;
+	GeeArrayList* _tmp3_;
+	GeeArrayList* _tmp4_;
+	GeeArrayList* _tmp5_;
 #line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5980,20 +6002,20 @@ void view_collection_toggle_marked (ViewCollection* self, Marker* marker) {
 	view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (lists);
-#line 5983 "ViewCollection.c"
+#line 6005 "ViewCollection.c"
 }
 
 
 static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* object, GObject* user) {
 	gboolean result = FALSE;
 	DataView* view = NULL;
-	DataObject* _tmp0_ = NULL;
-	DataView* _tmp1_ = NULL;
+	DataObject* _tmp0_;
+	DataView* _tmp1_;
 	ViewCollectionToggleLists* lists = NULL;
-	GObject* _tmp2_ = NULL;
-	ViewCollectionToggleLists* _tmp3_ = NULL;
-	DataView* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	GObject* _tmp2_;
+	ViewCollectionToggleLists* _tmp3_;
+	DataView* _tmp4_;
+	gboolean _tmp5_;
 #line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
 #line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6018,19 +6040,19 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o
 	_tmp5_ = data_view_internal_toggle (_tmp4_);
 #line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp5_) {
-#line 6021 "ViewCollection.c"
-		DataView* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+#line 6043 "ViewCollection.c"
+		DataView* _tmp6_;
+		gboolean _tmp7_;
 #line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = view;
 #line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp7_ = data_view_is_visible (_tmp6_);
 #line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp7_) {
-#line 6030 "ViewCollection.c"
-			ViewCollectionToggleLists* _tmp8_ = NULL;
-			GeeArrayList* _tmp9_ = NULL;
-			DataView* _tmp10_ = NULL;
+#line 6052 "ViewCollection.c"
+			ViewCollectionToggleLists* _tmp8_;
+			GeeArrayList* _tmp9_;
+			DataView* _tmp10_;
 #line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp8_ = lists;
 #line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6039,12 +6061,12 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o
 			_tmp10_ = view;
 #line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
-#line 6042 "ViewCollection.c"
+#line 6064 "ViewCollection.c"
 		}
 	} else {
-		ViewCollectionToggleLists* _tmp11_ = NULL;
-		GeeArrayList* _tmp12_ = NULL;
-		DataView* _tmp13_ = NULL;
+		ViewCollectionToggleLists* _tmp11_;
+		GeeArrayList* _tmp12_;
+		DataView* _tmp13_;
 #line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp11_ = lists;
 #line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6053,7 +6075,7 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o
 		_tmp13_ = view;
 #line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
-#line 6056 "ViewCollection.c"
+#line 6078 "ViewCollection.c"
 	}
 #line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = TRUE;
@@ -6063,14 +6085,14 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o
 	_g_object_unref0 (view);
 #line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 6066 "ViewCollection.c"
+#line 6088 "ViewCollection.c"
 }
 
 
 gint view_collection_get_selected_count (ViewCollection* self) {
 	gint result = 0;
-	DataSet* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	DataSet* _tmp0_;
+	gint _tmp1_;
 #line 1000 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
 #line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6081,14 +6103,14 @@ gint view_collection_get_selected_count (ViewCollection* self) {
 	result = _tmp1_;
 #line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 6084 "ViewCollection.c"
+#line 6106 "ViewCollection.c"
 }
 
 
 GeeList* view_collection_get_selected (ViewCollection* self) {
 	GeeList* result = NULL;
-	DataSet* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	DataSet* _tmp0_;
+	GeeList* _tmp1_;
 #line 1004 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 1005 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6099,15 +6121,15 @@ GeeList* view_collection_get_selected (ViewCollection* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_LIST, GeeList);
 #line 1005 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 6102 "ViewCollection.c"
+#line 6124 "ViewCollection.c"
 }
 
 
 DataView* view_collection_get_selected_at (ViewCollection* self, gint index) {
 	DataView* result = NULL;
-	DataSet* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	DataObject* _tmp2_ = NULL;
+	DataSet* _tmp0_;
+	gint _tmp1_;
+	DataObject* _tmp2_;
 #line 1008 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6120,14 +6142,14 @@ DataView* view_collection_get_selected_at (ViewCollection* self, gint index) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView);
 #line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 6123 "ViewCollection.c"
+#line 6145 "ViewCollection.c"
 }
 
 
 static gboolean view_collection_is_visible (ViewCollection* self, DataView* view) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	DataSet* _tmp1_ = NULL;
+	DataSet* _tmp1_;
 #line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
 #line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6136,10 +6158,10 @@ static gboolean view_collection_is_visible (ViewCollection* self, DataView* view
 	_tmp1_ = self->priv->visible;
 #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp1_ != NULL) {
-#line 6139 "ViewCollection.c"
-		DataSet* _tmp2_ = NULL;
-		DataView* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+#line 6161 "ViewCollection.c"
+		DataSet* _tmp2_;
+		DataView* _tmp3_;
+		gboolean _tmp4_;
 #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = self->priv->visible;
 #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6148,29 +6170,29 @@ static gboolean view_collection_is_visible (ViewCollection* self, DataView* view
 		_tmp4_ = data_set_contains (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
 #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp4_;
-#line 6151 "ViewCollection.c"
+#line 6173 "ViewCollection.c"
 	} else {
 #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = TRUE;
-#line 6155 "ViewCollection.c"
+#line 6177 "ViewCollection.c"
 	}
 #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp0_;
 #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 6161 "ViewCollection.c"
+#line 6183 "ViewCollection.c"
 }
 
 
 static gboolean view_collection_add_many_visible (ViewCollection* self, GeeCollection* many) {
 	gboolean result = FALSE;
-	DataSet* _tmp0_ = NULL;
-	DataSet* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	DataSet* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	DataSet* _tmp0_;
+	DataSet* _tmp1_;
+	GeeCollection* _tmp2_;
+	gboolean _tmp3_;
+	DataSet* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 #line 1016 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
 #line 1016 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6183,7 +6205,7 @@ static gboolean view_collection_add_many_visible (ViewCollection* self, GeeColle
 		result = TRUE;
 #line 1018 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
-#line 6186 "ViewCollection.c"
+#line 6208 "ViewCollection.c"
 	}
 #line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = self->priv->visible;
@@ -6197,7 +6219,7 @@ static gboolean view_collection_add_many_visible (ViewCollection* self, GeeColle
 		result = FALSE;
 #line 1021 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
-#line 6200 "ViewCollection.c"
+#line 6222 "ViewCollection.c"
 	}
 #line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp4_ = self->priv->visible;
@@ -6211,36 +6233,36 @@ static gboolean view_collection_add_many_visible (ViewCollection* self, GeeColle
 		_data_set_unref0 (self->priv->visible);
 #line 1025 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		self->priv->visible = NULL;
-#line 6214 "ViewCollection.c"
+#line 6236 "ViewCollection.c"
 	}
 #line 1027 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = TRUE;
 #line 1027 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 6220 "ViewCollection.c"
+#line 6242 "ViewCollection.c"
 }
 
 
 static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) {
 	GeeArrayList* unselected = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 	gint count = 0;
-	GeeList* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	DataSet* _tmp22_ = NULL;
+	GeeList* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	DataSet* _tmp22_;
 	gboolean removed = FALSE;
-	DataSet* _tmp24_ = NULL;
-	GeeList* _tmp25_ = NULL;
-	gboolean _tmp26_ = FALSE;
-	gboolean _tmp27_ = FALSE;
-	GeeArrayList* _tmp28_ = NULL;
-	GeeArrayList* _tmp29_ = NULL;
-	gint _tmp30_ = 0;
-	gint _tmp31_ = 0;
-	GeeList* _tmp33_ = NULL;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
+	DataSet* _tmp24_;
+	GeeList* _tmp25_;
+	gboolean _tmp26_;
+	gboolean _tmp27_;
+	GeeArrayList* _tmp28_;
+	GeeArrayList* _tmp29_;
+	gint _tmp30_;
+	gint _tmp31_;
+	GeeList* _tmp33_;
+	gint _tmp34_;
+	gint _tmp35_;
 #line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6257,39 +6279,39 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
 	_tmp3_ = _tmp2_;
 #line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	count = _tmp3_;
-#line 6260 "ViewCollection.c"
+#line 6282 "ViewCollection.c"
 	{
 		gint ctr = 0;
 #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		ctr = 0;
-#line 6265 "ViewCollection.c"
+#line 6287 "ViewCollection.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp4_ = TRUE;
 #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			while (TRUE) {
-#line 6272 "ViewCollection.c"
-				gint _tmp6_ = 0;
-				gint _tmp7_ = 0;
+#line 6294 "ViewCollection.c"
+				gint _tmp6_;
+				gint _tmp7_;
 				DataView* view = NULL;
-				GeeList* _tmp8_ = NULL;
-				gint _tmp9_ = 0;
-				gpointer _tmp10_ = NULL;
-				DataView* _tmp11_ = NULL;
-				gboolean _tmp12_ = FALSE;
-				DataView* _tmp13_ = NULL;
-				gboolean _tmp14_ = FALSE;
-				DataView* _tmp21_ = NULL;
+				GeeList* _tmp8_;
+				gint _tmp9_;
+				gpointer _tmp10_;
+				DataView* _tmp11_;
+				gboolean _tmp12_;
+				DataView* _tmp13_;
+				gboolean _tmp14_;
+				DataView* _tmp21_;
 #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (!_tmp4_) {
-#line 6286 "ViewCollection.c"
-					gint _tmp5_ = 0;
+#line 6308 "ViewCollection.c"
+					gint _tmp5_;
 #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp5_ = ctr;
 #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					ctr = _tmp5_ + 1;
-#line 6292 "ViewCollection.c"
+#line 6314 "ViewCollection.c"
 				}
 #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp4_ = FALSE;
@@ -6301,7 +6323,7 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
 				if (!(_tmp6_ < _tmp7_)) {
 #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					break;
-#line 6304 "ViewCollection.c"
+#line 6326 "ViewCollection.c"
 				}
 #line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp8_ = to_hide;
@@ -6323,10 +6345,10 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
 				_tmp14_ = data_view_is_selected (_tmp13_);
 #line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp14_) {
-#line 6326 "ViewCollection.c"
-					DataView* _tmp15_ = NULL;
-					GeeArrayList* _tmp16_ = NULL;
-					DataView* _tmp17_ = NULL;
+#line 6348 "ViewCollection.c"
+					DataView* _tmp15_;
+					GeeArrayList* _tmp16_;
+					DataView* _tmp17_;
 #line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp15_ = view;
 #line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6337,11 +6359,11 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
 					_tmp17_ = view;
 #line 1041 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
-#line 6340 "ViewCollection.c"
+#line 6362 "ViewCollection.c"
 				} else {
-					DataSet* _tmp18_ = NULL;
-					DataView* _tmp19_ = NULL;
-					gboolean _tmp20_ = FALSE;
+					DataSet* _tmp18_;
+					DataView* _tmp19_;
+					gboolean _tmp20_;
 #line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp18_ = self->priv->selected;
 #line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6350,7 +6372,7 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
 					_tmp20_ = data_set_contains (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_OBJECT, DataObject));
 #line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_vala_assert (!_tmp20_, "!selected.contains(view)");
-#line 6353 "ViewCollection.c"
+#line 6375 "ViewCollection.c"
 				}
 #line 1046 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp21_ = view;
@@ -6358,7 +6380,7 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
 				data_view_internal_set_visible (_tmp21_, FALSE);
 #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (view);
-#line 6361 "ViewCollection.c"
+#line 6383 "ViewCollection.c"
 			}
 		}
 	}
@@ -6366,15 +6388,15 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
 	_tmp22_ = self->priv->visible;
 #line 1049 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp22_ == NULL) {
-#line 6369 "ViewCollection.c"
-		DataSet* _tmp23_ = NULL;
+#line 6391 "ViewCollection.c"
+		DataSet* _tmp23_;
 #line 1051 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp23_ = data_collection_get_dataset_copy (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 1051 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_data_set_unref0 (self->priv->visible);
 #line 1051 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		self->priv->visible = _tmp23_;
-#line 6377 "ViewCollection.c"
+#line 6399 "ViewCollection.c"
 	}
 #line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp24_ = self->priv->visible;
@@ -6400,13 +6422,13 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
 	_tmp31_ = _tmp30_;
 #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp31_ > 0) {
-#line 6403 "ViewCollection.c"
-		GeeArrayList* _tmp32_ = NULL;
+#line 6425 "ViewCollection.c"
+		GeeArrayList* _tmp32_;
 #line 1060 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp32_ = unselected;
 #line 1060 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_notify_items_selected_unselected (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 6409 "ViewCollection.c"
+#line 6431 "ViewCollection.c"
 	}
 #line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp33_ = to_hide;
@@ -6416,9 +6438,9 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
 	_tmp35_ = _tmp34_;
 #line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp35_ > 0) {
-#line 6419 "ViewCollection.c"
-		GeeList* _tmp36_ = NULL;
-		GeeList* _tmp37_ = NULL;
+#line 6441 "ViewCollection.c"
+		GeeList* _tmp36_;
+		GeeList* _tmp37_;
 #line 1063 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp36_ = to_hide;
 #line 1063 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6427,29 +6449,29 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
 		_tmp37_ = to_hide;
 #line 1064 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_notify_items_visibility_changed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 6430 "ViewCollection.c"
+#line 6452 "ViewCollection.c"
 	}
 #line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (unselected);
-#line 6434 "ViewCollection.c"
+#line 6456 "ViewCollection.c"
 }
 
 
 static void view_collection_show_items (ViewCollection* self, GeeList* to_show) {
 	GeeArrayList* added_selected = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 	gint count = 0;
-	GeeList* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	GeeList* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	gboolean added = FALSE;
-	GeeList* _tmp21_ = NULL;
-	gboolean _tmp22_ = FALSE;
-	gboolean _tmp23_ = FALSE;
-	GeeArrayList* _tmp24_ = NULL;
-	GeeList* _tmp25_ = NULL;
-	gint _tmp26_ = 0;
-	gint _tmp27_ = 0;
+	GeeList* _tmp21_;
+	gboolean _tmp22_;
+	gboolean _tmp23_;
+	GeeArrayList* _tmp24_;
+	GeeList* _tmp25_;
+	gint _tmp26_;
+	gint _tmp27_;
 #line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6466,39 +6488,39 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
 	_tmp3_ = _tmp2_;
 #line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	count = _tmp3_;
-#line 6469 "ViewCollection.c"
+#line 6491 "ViewCollection.c"
 	{
 		gint ctr = 0;
 #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		ctr = 0;
-#line 6474 "ViewCollection.c"
+#line 6496 "ViewCollection.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp4_ = TRUE;
 #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			while (TRUE) {
-#line 6481 "ViewCollection.c"
-				gint _tmp6_ = 0;
-				gint _tmp7_ = 0;
+#line 6503 "ViewCollection.c"
+				gint _tmp6_;
+				gint _tmp7_;
 				DataView* view = NULL;
-				GeeList* _tmp8_ = NULL;
-				gint _tmp9_ = 0;
-				gpointer _tmp10_ = NULL;
-				DataView* _tmp11_ = NULL;
-				gboolean _tmp12_ = FALSE;
-				DataView* _tmp13_ = NULL;
-				DataView* _tmp14_ = NULL;
-				gboolean _tmp15_ = FALSE;
+				GeeList* _tmp8_;
+				gint _tmp9_;
+				gpointer _tmp10_;
+				DataView* _tmp11_;
+				gboolean _tmp12_;
+				DataView* _tmp13_;
+				DataView* _tmp14_;
+				gboolean _tmp15_;
 #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (!_tmp4_) {
-#line 6495 "ViewCollection.c"
-					gint _tmp5_ = 0;
+#line 6517 "ViewCollection.c"
+					gint _tmp5_;
 #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp5_ = ctr;
 #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					ctr = _tmp5_ + 1;
-#line 6501 "ViewCollection.c"
+#line 6523 "ViewCollection.c"
 				}
 #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp4_ = FALSE;
@@ -6510,7 +6532,7 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
 				if (!(_tmp6_ < _tmp7_)) {
 #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					break;
-#line 6513 "ViewCollection.c"
+#line 6535 "ViewCollection.c"
 				}
 #line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp8_ = to_show;
@@ -6536,12 +6558,12 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
 				_tmp15_ = data_view_is_selected (_tmp14_);
 #line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp15_) {
-#line 6539 "ViewCollection.c"
-					DataSet* _tmp16_ = NULL;
-					DataView* _tmp17_ = NULL;
-					gboolean _tmp18_ = FALSE;
-					GeeArrayList* _tmp19_ = NULL;
-					DataView* _tmp20_ = NULL;
+#line 6561 "ViewCollection.c"
+					DataSet* _tmp16_;
+					DataView* _tmp17_;
+					gboolean _tmp18_;
+					GeeArrayList* _tmp19_;
+					DataView* _tmp20_;
 #line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp16_ = self->priv->selected;
 #line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6556,11 +6578,11 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
 					_tmp20_ = view;
 #line 1082 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_);
-#line 6559 "ViewCollection.c"
+#line 6581 "ViewCollection.c"
 				}
 #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (view);
-#line 6563 "ViewCollection.c"
+#line 6585 "ViewCollection.c"
 			}
 		}
 	}
@@ -6586,9 +6608,9 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
 	_tmp27_ = _tmp26_;
 #line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp27_ > 0) {
-#line 6589 "ViewCollection.c"
-		GeeList* _tmp28_ = NULL;
-		GeeList* _tmp29_ = NULL;
+#line 6611 "ViewCollection.c"
+		GeeList* _tmp28_;
+		GeeList* _tmp29_;
 #line 1092 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp28_ = to_show;
 #line 1092 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6597,20 +6619,20 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
 		_tmp29_ = to_show;
 #line 1093 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_notify_items_visibility_changed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 6600 "ViewCollection.c"
+#line 6622 "ViewCollection.c"
 	}
 #line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (added_selected);
-#line 6604 "ViewCollection.c"
+#line 6626 "ViewCollection.c"
 }
 
 
 gboolean view_collection_has_view_for_source (ViewCollection* self, DataSource* source) {
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
-	DataView* _tmp1_ = NULL;
-	DataView* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	DataSource* _tmp0_;
+	DataView* _tmp1_;
+	DataView* _tmp2_;
+	gboolean _tmp3_;
 #line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
 #line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6629,15 +6651,15 @@ gboolean view_collection_has_view_for_source (ViewCollection* self, DataSource*
 	result = _tmp3_;
 #line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 6632 "ViewCollection.c"
+#line 6654 "ViewCollection.c"
 }
 
 
 DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source) {
 	DataView* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	DataSource* _tmp1_;
+	gpointer _tmp2_;
 #line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6652,16 +6674,16 @@ DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource*
 	result = (DataView*) _tmp2_;
 #line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 6655 "ViewCollection.c"
+#line 6677 "ViewCollection.c"
 }
 
 
 gboolean view_collection_has_view_for_source_with_filtered (ViewCollection* self, DataSource* source) {
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
-	DataView* _tmp1_ = NULL;
-	DataView* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	DataSource* _tmp0_;
+	DataView* _tmp1_;
+	DataView* _tmp2_;
+	gboolean _tmp3_;
 #line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
 #line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6680,18 +6702,18 @@ gboolean view_collection_has_view_for_source_with_filtered (ViewCollection* self
 	result = _tmp3_;
 #line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 6683 "ViewCollection.c"
+#line 6705 "ViewCollection.c"
 }
 
 
 DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, DataSource* source) {
 	DataView* result = NULL;
 	DataView* view = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	DataSource* _tmp1_;
+	gpointer _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	DataView* _tmp4_ = NULL;
+	DataView* _tmp4_;
 #line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6708,20 +6730,20 @@ DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, Da
 	_tmp4_ = view;
 #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp4_ != NULL) {
-#line 6711 "ViewCollection.c"
-		DataView* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+#line 6733 "ViewCollection.c"
+		DataView* _tmp5_;
+		gboolean _tmp6_;
 #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = view;
 #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = view_collection_is_in_filter (self, _tmp5_);
 #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = !_tmp6_;
-#line 6720 "ViewCollection.c"
+#line 6742 "ViewCollection.c"
 	} else {
 #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = FALSE;
-#line 6724 "ViewCollection.c"
+#line 6746 "ViewCollection.c"
 	}
 #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp3_) {
@@ -6731,25 +6753,25 @@ DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, Da
 		_g_object_unref0 (view);
 #line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
-#line 6734 "ViewCollection.c"
+#line 6756 "ViewCollection.c"
 	}
 #line 1118 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = view;
 #line 1118 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 6740 "ViewCollection.c"
+#line 6762 "ViewCollection.c"
 }
 
 
 GeeCollection* view_collection_get_sources (ViewCollection* self) {
 	GeeCollection* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GeeSet* _tmp1_ = NULL;
-	GeeSet* _tmp2_ = NULL;
-	GeeSet* _tmp3_ = NULL;
-	GeeSet* _tmp4_ = NULL;
-	GeeSet* _tmp5_ = NULL;
-	GeeCollection* _tmp6_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeSet* _tmp1_;
+	GeeSet* _tmp2_;
+	GeeSet* _tmp3_;
+	GeeSet* _tmp4_;
+	GeeSet* _tmp5_;
+	GeeCollection* _tmp6_;
 #line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6772,14 +6794,14 @@ GeeCollection* view_collection_get_sources (ViewCollection* self) {
 	result = _tmp6_;
 #line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 6775 "ViewCollection.c"
+#line 6797 "ViewCollection.c"
 }
 
 
 gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
 	gboolean result = FALSE;
-	GType _tmp0_ = 0UL;
-	gboolean _tmp1_ = FALSE;
+	GType _tmp0_;
+	gboolean _tmp1_;
 #line 1127 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
 #line 1128 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6788,15 +6810,15 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
 	_tmp1_ = g_type_is_a (_tmp0_, TYPE_DATA_SOURCE);
 #line 1128 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_vala_assert (_tmp1_, "t.is_a(typeof(DataSource))");
-#line 6791 "ViewCollection.c"
+#line 6813 "ViewCollection.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeHashMap* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeSet* _tmp4_ = NULL;
-		GeeSet* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
-		GeeIterator* _tmp7_ = NULL;
+		GeeHashMap* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeSet* _tmp4_;
+		GeeSet* _tmp5_;
+		GeeIterator* _tmp6_;
+		GeeIterator* _tmp7_;
 #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = self->priv->source_map;
 #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6815,16 +6837,16 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
 		_source_it = _tmp7_;
 #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 6818 "ViewCollection.c"
-			GeeIterator* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+#line 6840 "ViewCollection.c"
+			GeeIterator* _tmp8_;
+			gboolean _tmp9_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			gpointer _tmp11_ = NULL;
-			DataSource* _tmp12_ = NULL;
-			GType _tmp13_ = 0UL;
-			GType _tmp14_ = 0UL;
-			gboolean _tmp15_ = FALSE;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			DataSource* _tmp12_;
+			GType _tmp13_;
+			GType _tmp14_;
+			gboolean _tmp15_;
 #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp8_ = _source_it;
 #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6833,7 +6855,7 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
 			if (!_tmp9_) {
 #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 6836 "ViewCollection.c"
+#line 6858 "ViewCollection.c"
 			}
 #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp10_ = _source_it;
@@ -6859,28 +6881,28 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
 				_g_object_unref0 (_source_it);
 #line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				return result;
-#line 6862 "ViewCollection.c"
+#line 6884 "ViewCollection.c"
 			}
 #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (source);
-#line 6866 "ViewCollection.c"
+#line 6888 "ViewCollection.c"
 		}
 #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_source_it);
-#line 6870 "ViewCollection.c"
+#line 6892 "ViewCollection.c"
 	}
 #line 1135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = FALSE;
 #line 1135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 6876 "ViewCollection.c"
+#line 6898 "ViewCollection.c"
 }
 
 
 gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) {
 	gint result = 0;
-	GType _tmp0_ = 0UL;
-	gboolean _tmp1_ = FALSE;
+	GType _tmp0_;
+	gboolean _tmp1_;
 	gint count = 0;
 #line 1138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
@@ -6892,13 +6914,13 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) {
 	_vala_assert (_tmp1_, "t.is_a(typeof(DataSource))");
 #line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	count = 0;
-#line 6895 "ViewCollection.c"
+#line 6917 "ViewCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6913,19 +6935,19 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) {
 		_object_it = _tmp5_;
 #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 6916 "ViewCollection.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 6938 "ViewCollection.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			DataObject* _tmp10_ = NULL;
-			DataSource* _tmp11_ = NULL;
-			DataSource* _tmp12_ = NULL;
-			GType _tmp13_ = 0UL;
-			GType _tmp14_ = 0UL;
-			gboolean _tmp15_ = FALSE;
-			gboolean _tmp16_ = FALSE;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			DataObject* _tmp10_;
+			DataSource* _tmp11_;
+			DataSource* _tmp12_;
+			GType _tmp13_;
+			GType _tmp14_;
+			gboolean _tmp15_;
+			gboolean _tmp16_;
 #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp6_ = _object_it;
 #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6934,7 +6956,7 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) {
 			if (!_tmp7_) {
 #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 6937 "ViewCollection.c"
+#line 6959 "ViewCollection.c"
 			}
 #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp8_ = _object_it;
@@ -6960,34 +6982,34 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) {
 			_g_object_unref0 (_tmp12_);
 #line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp16_) {
-#line 6963 "ViewCollection.c"
-				gint _tmp17_ = 0;
+#line 6985 "ViewCollection.c"
+				gint _tmp17_;
 #line 1144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp17_ = count;
 #line 1144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				count = _tmp17_ + 1;
-#line 6969 "ViewCollection.c"
+#line 6991 "ViewCollection.c"
 			}
 #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (object);
-#line 6973 "ViewCollection.c"
+#line 6995 "ViewCollection.c"
 		}
 #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 6977 "ViewCollection.c"
+#line 6999 "ViewCollection.c"
 	}
 #line 1147 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = count;
 #line 1147 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 6983 "ViewCollection.c"
+#line 7005 "ViewCollection.c"
 }
 
 
 GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
 	GeeList* result = NULL;
-	GType _tmp0_ = 0UL;
-	gboolean _tmp1_ = FALSE;
+	GType _tmp0_;
+	gboolean _tmp1_;
 	GeeList* sources = NULL;
 #line 1150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
@@ -6999,13 +7021,13 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
 	_vala_assert (_tmp1_, "t.is_a(typeof(DataSource))");
 #line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	sources = NULL;
-#line 7002 "ViewCollection.c"
+#line 7024 "ViewCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7020,19 +7042,19 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
 		_object_it = _tmp5_;
 #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 7023 "ViewCollection.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 7045 "ViewCollection.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			DataSource* source = NULL;
-			DataObject* _tmp10_ = NULL;
-			DataSource* _tmp11_ = NULL;
-			DataSource* _tmp12_ = NULL;
-			GType _tmp13_ = 0UL;
-			GType _tmp14_ = 0UL;
-			gboolean _tmp15_ = FALSE;
+			DataObject* _tmp10_;
+			DataSource* _tmp11_;
+			DataSource* _tmp12_;
+			GType _tmp13_;
+			GType _tmp14_;
+			gboolean _tmp15_;
 #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp6_ = _object_it;
 #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7041,7 +7063,7 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
 			if (!_tmp7_) {
 #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 7044 "ViewCollection.c"
+#line 7066 "ViewCollection.c"
 			}
 #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp8_ = _object_it;
@@ -7065,23 +7087,23 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
 			_tmp15_ = g_type_is_a (_tmp13_, _tmp14_);
 #line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp15_) {
-#line 7068 "ViewCollection.c"
-				GeeList* _tmp16_ = NULL;
-				GeeList* _tmp18_ = NULL;
-				DataSource* _tmp19_ = NULL;
+#line 7090 "ViewCollection.c"
+				GeeList* _tmp16_;
+				GeeList* _tmp18_;
+				DataSource* _tmp19_;
 #line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp16_ = sources;
 #line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp16_ == NULL) {
-#line 7076 "ViewCollection.c"
-					GeeArrayList* _tmp17_ = NULL;
+#line 7098 "ViewCollection.c"
+					GeeArrayList* _tmp17_;
 #line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_g_object_unref0 (sources);
 #line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_LIST, GeeList);
-#line 7084 "ViewCollection.c"
+#line 7106 "ViewCollection.c"
 				}
 #line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp18_ = sources;
@@ -7089,33 +7111,33 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
 				_tmp19_ = source;
 #line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_);
-#line 7092 "ViewCollection.c"
+#line 7114 "ViewCollection.c"
 			}
 #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (source);
 #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (object);
-#line 7098 "ViewCollection.c"
+#line 7120 "ViewCollection.c"
 		}
 #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 7102 "ViewCollection.c"
+#line 7124 "ViewCollection.c"
 	}
 #line 1164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = sources;
 #line 1164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 7108 "ViewCollection.c"
+#line 7130 "ViewCollection.c"
 }
 
 
 GeeList* view_collection_get_selected_sources (ViewCollection* self) {
 	GeeList* result = NULL;
 	GeeList* sources = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 	gint count = 0;
-	DataSet* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	DataSet* _tmp1_;
+	gint _tmp2_;
 #line 1167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 1168 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7128,37 +7150,37 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) {
 	_tmp2_ = data_set_get_count (_tmp1_);
 #line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	count = _tmp2_;
-#line 7131 "ViewCollection.c"
+#line 7153 "ViewCollection.c"
 	{
 		gint ctr = 0;
 #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		ctr = 0;
-#line 7136 "ViewCollection.c"
+#line 7158 "ViewCollection.c"
 		{
 			gboolean _tmp3_ = FALSE;
 #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp3_ = TRUE;
 #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			while (TRUE) {
-#line 7143 "ViewCollection.c"
-				gint _tmp5_ = 0;
-				gint _tmp6_ = 0;
-				GeeList* _tmp7_ = NULL;
-				DataSet* _tmp8_ = NULL;
-				gint _tmp9_ = 0;
-				DataObject* _tmp10_ = NULL;
-				DataView* _tmp11_ = NULL;
-				DataSource* _tmp12_ = NULL;
-				DataSource* _tmp13_ = NULL;
+#line 7165 "ViewCollection.c"
+				gint _tmp5_;
+				gint _tmp6_;
+				GeeList* _tmp7_;
+				DataSet* _tmp8_;
+				gint _tmp9_;
+				DataObject* _tmp10_;
+				DataView* _tmp11_;
+				DataSource* _tmp12_;
+				DataSource* _tmp13_;
 #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (!_tmp3_) {
-#line 7155 "ViewCollection.c"
-					gint _tmp4_ = 0;
+#line 7177 "ViewCollection.c"
+					gint _tmp4_;
 #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp4_ = ctr;
 #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					ctr = _tmp4_ + 1;
-#line 7161 "ViewCollection.c"
+#line 7183 "ViewCollection.c"
 				}
 #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp3_ = FALSE;
@@ -7170,7 +7192,7 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) {
 				if (!(_tmp5_ < _tmp6_)) {
 #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					break;
-#line 7173 "ViewCollection.c"
+#line 7195 "ViewCollection.c"
 				}
 #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp7_ = sources;
@@ -7192,7 +7214,7 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) {
 				_g_object_unref0 (_tmp13_);
 #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (_tmp11_);
-#line 7195 "ViewCollection.c"
+#line 7217 "ViewCollection.c"
 			}
 		}
 	}
@@ -7200,18 +7222,18 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) {
 	result = sources;
 #line 1174 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 7203 "ViewCollection.c"
+#line 7225 "ViewCollection.c"
 }
 
 
 DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index) {
 	DataSource* result = NULL;
 	DataObject* object = NULL;
-	DataSet* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	DataObject* _tmp2_ = NULL;
+	DataSet* _tmp0_;
+	gint _tmp1_;
+	DataObject* _tmp2_;
 	DataSource* _tmp3_ = NULL;
-	DataObject* _tmp4_ = NULL;
+	DataObject* _tmp4_;
 #line 1177 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7226,9 +7248,9 @@ DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint i
 	_tmp4_ = object;
 #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp4_ != NULL) {
-#line 7229 "ViewCollection.c"
-		DataObject* _tmp5_ = NULL;
-		DataSource* _tmp6_ = NULL;
+#line 7251 "ViewCollection.c"
+		DataObject* _tmp5_;
+		DataSource* _tmp6_;
 #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = object;
 #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7237,13 +7259,13 @@ DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint i
 		_g_object_unref0 (_tmp3_);
 #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = _tmp6_;
-#line 7240 "ViewCollection.c"
+#line 7262 "ViewCollection.c"
 	} else {
 #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp3_);
 #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = NULL;
-#line 7246 "ViewCollection.c"
+#line 7268 "ViewCollection.c"
 	}
 #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp3_;
@@ -7251,7 +7273,7 @@ DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint i
 	_g_object_unref0 (object);
 #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 7254 "ViewCollection.c"
+#line 7276 "ViewCollection.c"
 }
 
 
@@ -7262,14 +7284,14 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	sources = NULL;
-#line 7265 "ViewCollection.c"
+#line 7287 "ViewCollection.c"
 	{
 		GeeList* _view_list = NULL;
-		GeeList* _tmp0_ = NULL;
+		GeeList* _tmp0_;
 		gint _view_size = 0;
-		GeeList* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		GeeList* _tmp1_;
+		gint _tmp2_;
+		gint _tmp3_;
 		gint _view_index = 0;
 #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = view_collection_get_selected (self);
@@ -7287,21 +7309,21 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy
 		_view_index = -1;
 #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
-#line 7290 "ViewCollection.c"
-			gint _tmp4_ = 0;
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
+#line 7312 "ViewCollection.c"
+			gint _tmp4_;
+			gint _tmp5_;
+			gint _tmp6_;
 			DataView* view = NULL;
-			GeeList* _tmp7_ = NULL;
-			gint _tmp8_ = 0;
-			gpointer _tmp9_ = NULL;
+			GeeList* _tmp7_;
+			gint _tmp8_;
+			gpointer _tmp9_;
 			DataSource* source = NULL;
-			DataView* _tmp10_ = NULL;
-			DataSource* _tmp11_ = NULL;
-			DataSource* _tmp12_ = NULL;
-			GType _tmp13_ = 0UL;
-			GType _tmp14_ = 0UL;
-			gboolean _tmp15_ = FALSE;
+			DataView* _tmp10_;
+			DataSource* _tmp11_;
+			DataSource* _tmp12_;
+			GType _tmp13_;
+			GType _tmp14_;
+			gboolean _tmp15_;
 #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp4_ = _view_index;
 #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7314,7 +7336,7 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy
 			if (!(_tmp5_ < _tmp6_)) {
 #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
-#line 7317 "ViewCollection.c"
+#line 7339 "ViewCollection.c"
 			}
 #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp7_ = _view_list;
@@ -7340,23 +7362,23 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy
 			_tmp15_ = g_type_is_a (_tmp13_, _tmp14_);
 #line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp15_) {
-#line 7343 "ViewCollection.c"
-				GeeList* _tmp16_ = NULL;
-				GeeList* _tmp18_ = NULL;
-				DataSource* _tmp19_ = NULL;
+#line 7365 "ViewCollection.c"
+				GeeList* _tmp16_;
+				GeeList* _tmp18_;
+				DataSource* _tmp19_;
 #line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp16_ = sources;
 #line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp16_ == NULL) {
-#line 7351 "ViewCollection.c"
-					GeeArrayList* _tmp17_ = NULL;
+#line 7373 "ViewCollection.c"
+					GeeArrayList* _tmp17_;
 #line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_g_object_unref0 (sources);
 #line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_LIST, GeeList);
-#line 7359 "ViewCollection.c"
+#line 7381 "ViewCollection.c"
 				}
 #line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp18_ = sources;
@@ -7364,33 +7386,33 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy
 				_tmp19_ = source;
 #line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_);
-#line 7367 "ViewCollection.c"
+#line 7389 "ViewCollection.c"
 			}
 #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (source);
 #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (view);
-#line 7373 "ViewCollection.c"
+#line 7395 "ViewCollection.c"
 		}
 #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_view_list);
-#line 7377 "ViewCollection.c"
+#line 7399 "ViewCollection.c"
 	}
 #line 1195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = sources;
 #line 1195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 7383 "ViewCollection.c"
+#line 7405 "ViewCollection.c"
 }
 
 
 gint view_collection_index_of_source (ViewCollection* self, DataSource* source) {
 	gint result = 0;
 	DataView* view = NULL;
-	DataSource* _tmp0_ = NULL;
-	DataView* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	DataView* _tmp1_;
 	gint _tmp2_ = 0;
-	DataView* _tmp3_ = NULL;
+	DataView* _tmp3_;
 #line 1199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
 #line 1199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7405,20 +7427,20 @@ gint view_collection_index_of_source (ViewCollection* self, DataSource* source)
 	_tmp3_ = view;
 #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp3_ != NULL) {
-#line 7408 "ViewCollection.c"
-		DataView* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
+#line 7430 "ViewCollection.c"
+		DataView* _tmp4_;
+		gint _tmp5_;
 #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = view;
 #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject));
 #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = _tmp5_;
-#line 7417 "ViewCollection.c"
+#line 7439 "ViewCollection.c"
 	} else {
 #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = -1;
-#line 7421 "ViewCollection.c"
+#line 7443 "ViewCollection.c"
 	}
 #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp2_;
@@ -7426,12 +7448,12 @@ gint view_collection_index_of_source (ViewCollection* self, DataSource* source)
 	_g_object_unref0 (view);
 #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 7429 "ViewCollection.c"
+#line 7451 "ViewCollection.c"
 }
 
 
 void view_collection_internal_notify_view_altered (ViewCollection* self, DataView* view) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1206 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 1206 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7440,11 +7462,11 @@ void view_collection_internal_notify_view_altered (ViewCollection* self, DataVie
 	_tmp0_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 1207 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (!_tmp0_) {
-#line 7443 "ViewCollection.c"
-		DataView* _tmp1_ = NULL;
-		DataView* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
+#line 7465 "ViewCollection.c"
+		DataView* _tmp1_;
+		DataView* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeCollection* _tmp4_;
 #line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp1_ = view;
 #line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7459,24 +7481,24 @@ void view_collection_internal_notify_view_altered (ViewCollection* self, DataVie
 		view_collection_notify_views_altered (self, _tmp4_);
 #line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp4_);
-#line 7462 "ViewCollection.c"
+#line 7484 "ViewCollection.c"
 	} else {
-		GeeHashSet* _tmp5_ = NULL;
-		GeeHashSet* _tmp7_ = NULL;
-		DataView* _tmp8_ = NULL;
+		GeeHashSet* _tmp5_;
+		GeeHashSet* _tmp7_;
+		DataView* _tmp8_;
 #line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = self->priv->frozen_views_altered;
 #line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp5_ == NULL) {
-#line 7471 "ViewCollection.c"
-			GeeHashSet* _tmp6_ = NULL;
+#line 7493 "ViewCollection.c"
+			GeeHashSet* _tmp6_;
 #line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (self->priv->frozen_views_altered);
 #line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			self->priv->frozen_views_altered = _tmp6_;
-#line 7479 "ViewCollection.c"
+#line 7501 "ViewCollection.c"
 		}
 #line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp7_ = self->priv->frozen_views_altered;
@@ -7484,13 +7506,13 @@ void view_collection_internal_notify_view_altered (ViewCollection* self, DataVie
 		_tmp8_ = view;
 #line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_);
-#line 7487 "ViewCollection.c"
+#line 7509 "ViewCollection.c"
 	}
 }
 
 
 void view_collection_internal_notify_geometry_altered (ViewCollection* self, DataView* view) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1218 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 1218 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7499,11 +7521,11 @@ void view_collection_internal_notify_geometry_altered (ViewCollection* self, Dat
 	_tmp0_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 1219 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (!_tmp0_) {
-#line 7502 "ViewCollection.c"
-		DataView* _tmp1_ = NULL;
-		DataView* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
+#line 7524 "ViewCollection.c"
+		DataView* _tmp1_;
+		DataView* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeCollection* _tmp4_;
 #line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp1_ = view;
 #line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7518,24 +7540,24 @@ void view_collection_internal_notify_geometry_altered (ViewCollection* self, Dat
 		view_collection_notify_geometries_altered (self, _tmp4_);
 #line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp4_);
-#line 7521 "ViewCollection.c"
+#line 7543 "ViewCollection.c"
 	} else {
-		GeeHashSet* _tmp5_ = NULL;
-		GeeHashSet* _tmp7_ = NULL;
-		DataView* _tmp8_ = NULL;
+		GeeHashSet* _tmp5_;
+		GeeHashSet* _tmp7_;
+		DataView* _tmp8_;
 #line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = self->priv->frozen_geometries_altered;
 #line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp5_ == NULL) {
-#line 7530 "ViewCollection.c"
-			GeeHashSet* _tmp6_ = NULL;
+#line 7552 "ViewCollection.c"
+			GeeHashSet* _tmp6_;
 #line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (self->priv->frozen_geometries_altered);
 #line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			self->priv->frozen_geometries_altered = _tmp6_;
-#line 7538 "ViewCollection.c"
+#line 7560 "ViewCollection.c"
 		}
 #line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp7_ = self->priv->frozen_geometries_altered;
@@ -7543,27 +7565,27 @@ void view_collection_internal_notify_geometry_altered (ViewCollection* self, Dat
 		_tmp8_ = view;
 #line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_);
-#line 7546 "ViewCollection.c"
+#line 7568 "ViewCollection.c"
 	}
 }
 
 
 static void view_collection_real_notify_thawed (DataCollection* base) {
 	ViewCollection * self;
-	GeeHashSet* _tmp0_ = NULL;
-	GeeHashSet* _tmp9_ = NULL;
+	GeeHashSet* _tmp0_;
+	GeeHashSet* _tmp9_;
 #line 1229 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = self->priv->frozen_views_altered;
 #line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp0_ != NULL) {
-#line 7561 "ViewCollection.c"
-		GeeHashSet* _tmp8_ = NULL;
+#line 7583 "ViewCollection.c"
+		GeeHashSet* _tmp8_;
 		{
 			GeeIterator* _view_it = NULL;
-			GeeHashSet* _tmp1_ = NULL;
-			GeeIterator* _tmp2_ = NULL;
+			GeeHashSet* _tmp1_;
+			GeeIterator* _tmp2_;
 #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp1_ = self->priv->frozen_views_altered;
 #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7572,13 +7594,13 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
 			_view_it = _tmp2_;
 #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			while (TRUE) {
-#line 7575 "ViewCollection.c"
-				GeeIterator* _tmp3_ = NULL;
-				gboolean _tmp4_ = FALSE;
+#line 7597 "ViewCollection.c"
+				GeeIterator* _tmp3_;
+				gboolean _tmp4_;
 				DataView* view = NULL;
-				GeeIterator* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
-				DataView* _tmp7_ = NULL;
+				GeeIterator* _tmp5_;
+				gpointer _tmp6_;
+				DataView* _tmp7_;
 #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp3_ = _view_it;
 #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7587,7 +7609,7 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
 				if (!_tmp4_) {
 #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					break;
-#line 7590 "ViewCollection.c"
+#line 7612 "ViewCollection.c"
 				}
 #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp5_ = _view_it;
@@ -7601,11 +7623,11 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
 				view_collection_notify_item_view_altered (self, _tmp7_);
 #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (view);
-#line 7604 "ViewCollection.c"
+#line 7626 "ViewCollection.c"
 			}
 #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_view_it);
-#line 7608 "ViewCollection.c"
+#line 7630 "ViewCollection.c"
 		}
 #line 1233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp8_ = self->priv->frozen_views_altered;
@@ -7615,18 +7637,18 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
 		_g_object_unref0 (self->priv->frozen_views_altered);
 #line 1234 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		self->priv->frozen_views_altered = NULL;
-#line 7618 "ViewCollection.c"
+#line 7640 "ViewCollection.c"
 	}
 #line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp9_ = self->priv->frozen_geometries_altered;
 #line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp9_ != NULL) {
-#line 7624 "ViewCollection.c"
-		GeeHashSet* _tmp17_ = NULL;
+#line 7646 "ViewCollection.c"
+		GeeHashSet* _tmp17_;
 		{
 			GeeIterator* _view_it = NULL;
-			GeeHashSet* _tmp10_ = NULL;
-			GeeIterator* _tmp11_ = NULL;
+			GeeHashSet* _tmp10_;
+			GeeIterator* _tmp11_;
 #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp10_ = self->priv->frozen_geometries_altered;
 #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7635,13 +7657,13 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
 			_view_it = _tmp11_;
 #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			while (TRUE) {
-#line 7638 "ViewCollection.c"
-				GeeIterator* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
+#line 7660 "ViewCollection.c"
+				GeeIterator* _tmp12_;
+				gboolean _tmp13_;
 				DataView* view = NULL;
-				GeeIterator* _tmp14_ = NULL;
-				gpointer _tmp15_ = NULL;
-				DataView* _tmp16_ = NULL;
+				GeeIterator* _tmp14_;
+				gpointer _tmp15_;
+				DataView* _tmp16_;
 #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp12_ = _view_it;
 #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7650,7 +7672,7 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
 				if (!_tmp13_) {
 #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					break;
-#line 7653 "ViewCollection.c"
+#line 7675 "ViewCollection.c"
 				}
 #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp14_ = _view_it;
@@ -7664,11 +7686,11 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
 				view_collection_notify_item_geometry_altered (self, _tmp16_);
 #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (view);
-#line 7667 "ViewCollection.c"
+#line 7689 "ViewCollection.c"
 			}
 #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_view_it);
-#line 7671 "ViewCollection.c"
+#line 7693 "ViewCollection.c"
 		}
 #line 1240 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp17_ = self->priv->frozen_geometries_altered;
@@ -7678,18 +7700,18 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
 		_g_object_unref0 (self->priv->frozen_geometries_altered);
 #line 1241 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		self->priv->frozen_geometries_altered = NULL;
-#line 7681 "ViewCollection.c"
+#line 7703 "ViewCollection.c"
 	}
 #line 1244 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_thawed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 7685 "ViewCollection.c"
+#line 7707 "ViewCollection.c"
 }
 
 
 gboolean view_collection_are_items_filtered_out (ViewCollection* self) {
 	gboolean result = FALSE;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 1247 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
 #line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7700,28 +7722,28 @@ gboolean view_collection_are_items_filtered_out (ViewCollection* self) {
 	result = _tmp0_ != _tmp1_;
 #line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 7703 "ViewCollection.c"
+#line 7725 "ViewCollection.c"
 }
 
 
 static void view_collection_real_items_selected (ViewCollection* self, GeeIterable* selected) {
 #line 75 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (selected));
-#line 7710 "ViewCollection.c"
+#line 7732 "ViewCollection.c"
 }
 
 
 static void view_collection_real_items_unselected (ViewCollection* self, GeeIterable* unselected) {
 #line 79 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (unselected));
-#line 7717 "ViewCollection.c"
+#line 7739 "ViewCollection.c"
 }
 
 
 static void view_collection_real_items_state_changed (ViewCollection* self, GeeIterable* changed) {
 #line 83 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (changed));
-#line 7724 "ViewCollection.c"
+#line 7746 "ViewCollection.c"
 }
 
 
@@ -7732,56 +7754,56 @@ static void view_collection_real_selection_group_altered (ViewCollection* self)
 static void view_collection_real_items_shown (ViewCollection* self, GeeCollection* visible) {
 #line 94 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (visible));
-#line 7735 "ViewCollection.c"
+#line 7757 "ViewCollection.c"
 }
 
 
 static void view_collection_real_items_hidden (ViewCollection* self, GeeCollection* hidden) {
 #line 98 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (hidden));
-#line 7742 "ViewCollection.c"
+#line 7764 "ViewCollection.c"
 }
 
 
 static void view_collection_real_items_visibility_changed (ViewCollection* self, GeeCollection* changed) {
 #line 102 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (changed));
-#line 7749 "ViewCollection.c"
+#line 7771 "ViewCollection.c"
 }
 
 
 static void view_collection_real_item_view_altered (ViewCollection* self, DataView* view) {
 #line 106 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_DATA_VIEW (view));
-#line 7756 "ViewCollection.c"
+#line 7778 "ViewCollection.c"
 }
 
 
 static void view_collection_real_item_geometry_altered (ViewCollection* self, DataView* view) {
 #line 110 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_DATA_VIEW (view));
-#line 7763 "ViewCollection.c"
+#line 7785 "ViewCollection.c"
 }
 
 
 static void view_collection_real_views_altered (ViewCollection* self, GeeCollection* views) {
 #line 113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (views));
-#line 7770 "ViewCollection.c"
+#line 7792 "ViewCollection.c"
 }
 
 
 static void view_collection_real_geometries_altered (ViewCollection* self, GeeCollection* views) {
 #line 116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (views));
-#line 7777 "ViewCollection.c"
+#line 7799 "ViewCollection.c"
 }
 
 
 static void view_collection_real_view_filter_installed (ViewCollection* self, ViewFilter* filer) {
 #line 119 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_FILTER (filer));
-#line 7784 "ViewCollection.c"
+#line 7806 "ViewCollection.c"
 }
 
 
@@ -7800,26 +7822,26 @@ static void g_cclosure_user_marshal_VOID__VIEW_FILTER (GClosure * closure, GValu
 		data1 = closure->data;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7803 "ViewCollection.c"
+#line 7825 "ViewCollection.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		data2 = closure->data;
-#line 7809 "ViewCollection.c"
+#line 7831 "ViewCollection.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	callback = (GMarshalFunc_VOID__VIEW_FILTER) (marshal_data ? marshal_data : cc->callback);
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	callback (data1, value_get_view_filter (param_values + 1), data2);
-#line 7815 "ViewCollection.c"
+#line 7837 "ViewCollection.c"
 }
 
 
 static void view_collection_real_view_filter_removed (ViewCollection* self, ViewFilter* filer) {
 #line 122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_FILTER (filer));
-#line 7822 "ViewCollection.c"
+#line 7844 "ViewCollection.c"
 }
 
 
@@ -7829,21 +7851,21 @@ ViewCollectionMonitor* view_collection_monitor_construct (GType object_type) {
 	self = (ViewCollectionMonitor*) g_type_create_instance (object_type);
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return self;
-#line 7832 "ViewCollection.c"
+#line 7854 "ViewCollection.c"
 }
 
 
 ViewCollectionMonitor* view_collection_monitor_new (void) {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return view_collection_monitor_construct (VIEW_COLLECTION_TYPE_MONITOR);
-#line 7839 "ViewCollection.c"
+#line 7861 "ViewCollection.c"
 }
 
 
 static void view_collection_value_monitor_init (GValue* value) {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	value->data[0].v_pointer = NULL;
-#line 7846 "ViewCollection.c"
+#line 7868 "ViewCollection.c"
 }
 
 
@@ -7852,7 +7874,7 @@ static void view_collection_value_monitor_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_monitor_unref (value->data[0].v_pointer);
-#line 7855 "ViewCollection.c"
+#line 7877 "ViewCollection.c"
 	}
 }
 
@@ -7862,11 +7884,11 @@ static void view_collection_value_monitor_copy_value (const GValue* src_value, G
 	if (src_value->data[0].v_pointer) {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		dest_value->data[0].v_pointer = view_collection_monitor_ref (src_value->data[0].v_pointer);
-#line 7865 "ViewCollection.c"
+#line 7887 "ViewCollection.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 7869 "ViewCollection.c"
+#line 7891 "ViewCollection.c"
 	}
 }
 
@@ -7874,66 +7896,66 @@ static void view_collection_value_monitor_copy_value (const GValue* src_value, G
 static gpointer view_collection_value_monitor_peek_pointer (const GValue* value) {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return value->data[0].v_pointer;
-#line 7877 "ViewCollection.c"
+#line 7899 "ViewCollection.c"
 }
 
 
 static gchar* view_collection_value_monitor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (collect_values[0].v_pointer) {
-#line 7884 "ViewCollection.c"
-		ViewCollectionMonitor* object;
+#line 7906 "ViewCollection.c"
+		ViewCollectionMonitor * object;
 		object = collect_values[0].v_pointer;
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7891 "ViewCollection.c"
+#line 7913 "ViewCollection.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7895 "ViewCollection.c"
+#line 7917 "ViewCollection.c"
 		}
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = view_collection_monitor_ref (object);
-#line 7899 "ViewCollection.c"
+#line 7921 "ViewCollection.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
-#line 7903 "ViewCollection.c"
+#line 7925 "ViewCollection.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return NULL;
-#line 7907 "ViewCollection.c"
+#line 7929 "ViewCollection.c"
 }
 
 
 static gchar* view_collection_value_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	ViewCollectionMonitor** object_p;
+	ViewCollectionMonitor ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (!object_p) {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 7918 "ViewCollection.c"
+#line 7940 "ViewCollection.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (!value->data[0].v_pointer) {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*object_p = NULL;
-#line 7924 "ViewCollection.c"
+#line 7946 "ViewCollection.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*object_p = value->data[0].v_pointer;
-#line 7928 "ViewCollection.c"
+#line 7950 "ViewCollection.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*object_p = view_collection_monitor_ref (value->data[0].v_pointer);
-#line 7932 "ViewCollection.c"
+#line 7954 "ViewCollection.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return NULL;
-#line 7936 "ViewCollection.c"
+#line 7958 "ViewCollection.c"
 }
 
 
@@ -7947,7 +7969,7 @@ GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return G_PARAM_SPEC (spec);
-#line 7950 "ViewCollection.c"
+#line 7972 "ViewCollection.c"
 }
 
 
@@ -7956,12 +7978,12 @@ gpointer view_collection_value_get_monitor (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIEW_COLLECTION_TYPE_MONITOR), NULL);
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return value->data[0].v_pointer;
-#line 7959 "ViewCollection.c"
+#line 7981 "ViewCollection.c"
 }
 
 
 void view_collection_value_set_monitor (GValue* value, gpointer v_object) {
-	ViewCollectionMonitor* old;
+	ViewCollectionMonitor * old;
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIEW_COLLECTION_TYPE_MONITOR));
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7976,23 +7998,23 @@ void view_collection_value_set_monitor (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_monitor_ref (value->data[0].v_pointer);
-#line 7979 "ViewCollection.c"
+#line 8001 "ViewCollection.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
-#line 7983 "ViewCollection.c"
+#line 8005 "ViewCollection.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (old) {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_monitor_unref (old);
-#line 7989 "ViewCollection.c"
+#line 8011 "ViewCollection.c"
 	}
 }
 
 
 void view_collection_value_take_monitor (GValue* value, gpointer v_object) {
-	ViewCollectionMonitor* old;
+	ViewCollectionMonitor * old;
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIEW_COLLECTION_TYPE_MONITOR));
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8005,17 +8027,17 @@ void view_collection_value_take_monitor (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = v_object;
-#line 8008 "ViewCollection.c"
+#line 8030 "ViewCollection.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
-#line 8012 "ViewCollection.c"
+#line 8034 "ViewCollection.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (old) {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_monitor_unref (old);
-#line 8018 "ViewCollection.c"
+#line 8040 "ViewCollection.c"
 	}
 }
 
@@ -8025,24 +8047,24 @@ static void view_collection_monitor_class_init (ViewCollectionMonitorClass * kla
 	view_collection_monitor_parent_class = g_type_class_peek_parent (klass);
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	((ViewCollectionMonitorClass *) klass)->finalize = view_collection_monitor_finalize;
-#line 8028 "ViewCollection.c"
+#line 8050 "ViewCollection.c"
 }
 
 
 static void view_collection_monitor_instance_init (ViewCollectionMonitor * self) {
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self->ref_count = 1;
-#line 8035 "ViewCollection.c"
+#line 8057 "ViewCollection.c"
 }
 
 
-static void view_collection_monitor_finalize (ViewCollectionMonitor* obj) {
+static void view_collection_monitor_finalize (ViewCollectionMonitor * obj) {
 	ViewCollectionMonitor * self;
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIEW_COLLECTION_TYPE_MONITOR, ViewCollectionMonitor);
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_signal_handlers_destroy (self);
-#line 8045 "ViewCollection.c"
+#line 8067 "ViewCollection.c"
 }
 
 
@@ -8061,18 +8083,18 @@ GType view_collection_monitor_get_type (void) {
 
 
 gpointer view_collection_monitor_ref (gpointer instance) {
-	ViewCollectionMonitor* self;
+	ViewCollectionMonitor * self;
 	self = instance;
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return instance;
-#line 8070 "ViewCollection.c"
+#line 8092 "ViewCollection.c"
 }
 
 
 void view_collection_monitor_unref (gpointer instance) {
-	ViewCollectionMonitor* self;
+	ViewCollectionMonitor * self;
 	self = instance;
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -8080,7 +8102,7 @@ void view_collection_monitor_unref (gpointer instance) {
 		VIEW_COLLECTION_MONITOR_GET_CLASS (self)->finalize (self);
 #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8083 "ViewCollection.c"
+#line 8105 "ViewCollection.c"
 	}
 }
 
@@ -8088,54 +8110,54 @@ void view_collection_monitor_unref (gpointer instance) {
 static void _view_collection_on_sources_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) {
 #line 44 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_on_sources_added ((ViewCollection*) self, _sender, added);
-#line 8091 "ViewCollection.c"
+#line 8113 "ViewCollection.c"
 }
 
 
 static void _view_collection_on_sources_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) {
 #line 45 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_on_sources_removed ((ViewCollection*) self, removed);
-#line 8098 "ViewCollection.c"
+#line 8120 "ViewCollection.c"
 }
 
 
 static void _view_collection_on_sources_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 46 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_on_sources_altered ((ViewCollection*) self, _sender, items);
-#line 8105 "ViewCollection.c"
+#line 8127 "ViewCollection.c"
 }
 
 
 static gpointer _view_manager_ref0 (gpointer self) {
 #line 35 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return self ? view_manager_ref (self) : NULL;
-#line 8112 "ViewCollection.c"
+#line 8134 "ViewCollection.c"
 }
 
 
 static gpointer _alteration_ref0 (gpointer self) {
 #line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return self ? alteration_ref (self) : NULL;
-#line 8119 "ViewCollection.c"
+#line 8141 "ViewCollection.c"
 }
 
 
 static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType object_type, ViewCollection* owner, SourceCollection* sources, ViewManager* manager, Alteration* prereq) {
 	ViewCollectionMonitorImpl* self = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	SourceCollection* _tmp2_ = NULL;
-	SourceCollection* _tmp3_ = NULL;
-	ViewManager* _tmp4_ = NULL;
-	ViewManager* _tmp5_ = NULL;
-	Alteration* _tmp6_ = NULL;
-	Alteration* _tmp7_ = NULL;
-	SourceCollection* _tmp8_ = NULL;
-	ViewCollection* _tmp9_ = NULL;
-	SourceCollection* _tmp10_ = NULL;
-	ViewCollection* _tmp11_ = NULL;
-	SourceCollection* _tmp12_ = NULL;
-	ViewCollection* _tmp13_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	SourceCollection* _tmp2_;
+	SourceCollection* _tmp3_;
+	ViewManager* _tmp4_;
+	ViewManager* _tmp5_;
+	Alteration* _tmp6_;
+	Alteration* _tmp7_;
+	SourceCollection* _tmp8_;
+	ViewCollection* _tmp9_;
+	SourceCollection* _tmp10_;
+	ViewCollection* _tmp11_;
+	SourceCollection* _tmp12_;
+	ViewCollection* _tmp13_;
 #line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (owner), NULL);
 #line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8198,14 +8220,14 @@ static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _view_collection_on_sources_altered_data_collection_items_altered, _tmp13_);
 #line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return self;
-#line 8201 "ViewCollection.c"
+#line 8223 "ViewCollection.c"
 }
 
 
 static ViewCollectionMonitorImpl* view_collection_monitor_impl_new (ViewCollection* owner, SourceCollection* sources, ViewManager* manager, Alteration* prereq) {
 #line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return view_collection_monitor_impl_construct (VIEW_COLLECTION_TYPE_MONITOR_IMPL, owner, sources, manager, prereq);
-#line 8208 "ViewCollection.c"
+#line 8230 "ViewCollection.c"
 }
 
 
@@ -8214,7 +8236,7 @@ static void view_collection_monitor_impl_class_init (ViewCollectionMonitorImplCl
 	view_collection_monitor_impl_parent_class = g_type_class_peek_parent (klass);
 #line 25 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	((ViewCollectionMonitorClass *) klass)->finalize = view_collection_monitor_impl_finalize;
-#line 8217 "ViewCollection.c"
+#line 8239 "ViewCollection.c"
 }
 
 
@@ -8222,17 +8244,17 @@ static void view_collection_monitor_impl_instance_init (ViewCollectionMonitorImp
 }
 
 
-static void view_collection_monitor_impl_finalize (ViewCollectionMonitor* obj) {
+static void view_collection_monitor_impl_finalize (ViewCollectionMonitor * obj) {
 	ViewCollectionMonitorImpl * self;
-	SourceCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	SourceCollection* _tmp3_ = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	SourceCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
+	SourceCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	guint _tmp2_;
+	SourceCollection* _tmp3_;
+	ViewCollection* _tmp4_;
+	guint _tmp5_;
+	SourceCollection* _tmp6_;
+	ViewCollection* _tmp7_;
+	guint _tmp8_;
 #line 25 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIEW_COLLECTION_TYPE_MONITOR_IMPL, ViewCollectionMonitorImpl);
 #line 44 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8269,7 +8291,7 @@ static void view_collection_monitor_impl_finalize (ViewCollectionMonitor* obj) {
 	_alteration_unref0 (self->prereq);
 #line 25 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	VIEW_COLLECTION_MONITOR_CLASS (view_collection_monitor_impl_parent_class)->finalize (obj);
-#line 8272 "ViewCollection.c"
+#line 8294 "ViewCollection.c"
 }
 
 
@@ -8291,14 +8313,14 @@ static ViewCollectionToggleLists* view_collection_toggle_lists_construct (GType
 	self = (ViewCollectionToggleLists*) g_object_new (object_type, NULL);
 #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return self;
-#line 8294 "ViewCollection.c"
+#line 8316 "ViewCollection.c"
 }
 
 
 static ViewCollectionToggleLists* view_collection_toggle_lists_new (void) {
 #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return view_collection_toggle_lists_construct (VIEW_COLLECTION_TYPE_TOGGLE_LISTS);
-#line 8301 "ViewCollection.c"
+#line 8323 "ViewCollection.c"
 }
 
 
@@ -8307,13 +8329,13 @@ static void view_collection_toggle_lists_class_init (ViewCollectionToggleListsCl
 	view_collection_toggle_lists_parent_class = g_type_class_peek_parent (klass);
 #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	G_OBJECT_CLASS (klass)->finalize = view_collection_toggle_lists_finalize;
-#line 8310 "ViewCollection.c"
+#line 8332 "ViewCollection.c"
 }
 
 
 static void view_collection_toggle_lists_instance_init (ViewCollectionToggleLists * self) {
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp1_;
 #line 51 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 51 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8322,11 +8344,11 @@ static void view_collection_toggle_lists_instance_init (ViewCollectionToggleList
 	_tmp1_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 52 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self->unselected = _tmp1_;
-#line 8325 "ViewCollection.c"
+#line 8347 "ViewCollection.c"
 }
 
 
-static void view_collection_toggle_lists_finalize (GObject* obj) {
+static void view_collection_toggle_lists_finalize (GObject * obj) {
 	ViewCollectionToggleLists * self;
 #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIEW_COLLECTION_TYPE_TOGGLE_LISTS, ViewCollectionToggleLists);
@@ -8336,7 +8358,7 @@ static void view_collection_toggle_lists_finalize (GObject* obj) {
 	_g_object_unref0 (self->unselected);
 #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	G_OBJECT_CLASS (view_collection_toggle_lists_parent_class)->finalize (obj);
-#line 8339 "ViewCollection.c"
+#line 8361 "ViewCollection.c"
 }
 
 
@@ -8360,69 +8382,69 @@ static void view_collection_class_init (ViewCollectionClass * klass) {
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_type_class_add_private (klass, sizeof (ViewCollectionPrivate));
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewCollectionClass *) klass)->notify_items_selected_unselected = (void (*)(ViewCollection*, GeeCollection*, GeeCollection*)) view_collection_real_notify_items_selected_unselected;
+	((ViewCollectionClass *) klass)->notify_items_selected_unselected = (void (*) (ViewCollection *, GeeCollection*, GeeCollection*)) view_collection_real_notify_items_selected_unselected;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewCollectionClass *) klass)->notify_selection_group_altered = (void (*)(ViewCollection*)) view_collection_real_notify_selection_group_altered;
+	((ViewCollectionClass *) klass)->notify_selection_group_altered = (void (*) (ViewCollection *)) view_collection_real_notify_selection_group_altered;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewCollectionClass *) klass)->notify_item_view_altered = (void (*)(ViewCollection*, DataView*)) view_collection_real_notify_item_view_altered;
+	((ViewCollectionClass *) klass)->notify_item_view_altered = (void (*) (ViewCollection *, DataView*)) view_collection_real_notify_item_view_altered;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewCollectionClass *) klass)->notify_views_altered = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_views_altered;
+	((ViewCollectionClass *) klass)->notify_views_altered = (void (*) (ViewCollection *, GeeCollection*)) view_collection_real_notify_views_altered;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewCollectionClass *) klass)->notify_item_geometry_altered = (void (*)(ViewCollection*, DataView*)) view_collection_real_notify_item_geometry_altered;
+	((ViewCollectionClass *) klass)->notify_item_geometry_altered = (void (*) (ViewCollection *, DataView*)) view_collection_real_notify_item_geometry_altered;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewCollectionClass *) klass)->notify_geometries_altered = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_geometries_altered;
+	((ViewCollectionClass *) klass)->notify_geometries_altered = (void (*) (ViewCollection *, GeeCollection*)) view_collection_real_notify_geometries_altered;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewCollectionClass *) klass)->notify_items_shown = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_items_shown;
+	((ViewCollectionClass *) klass)->notify_items_shown = (void (*) (ViewCollection *, GeeCollection*)) view_collection_real_notify_items_shown;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewCollectionClass *) klass)->notify_items_hidden = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_items_hidden;
+	((ViewCollectionClass *) klass)->notify_items_hidden = (void (*) (ViewCollection *, GeeCollection*)) view_collection_real_notify_items_hidden;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewCollectionClass *) klass)->notify_items_visibility_changed = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_items_visibility_changed;
+	((ViewCollectionClass *) klass)->notify_items_visibility_changed = (void (*) (ViewCollection *, GeeCollection*)) view_collection_real_notify_items_visibility_changed;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewCollectionClass *) klass)->notify_view_filter_installed = (void (*)(ViewCollection*, ViewFilter*)) view_collection_real_notify_view_filter_installed;
+	((ViewCollectionClass *) klass)->notify_view_filter_installed = (void (*) (ViewCollection *, ViewFilter*)) view_collection_real_notify_view_filter_installed;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewCollectionClass *) klass)->notify_view_filter_removed = (void (*)(ViewCollection*, ViewFilter*)) view_collection_real_notify_view_filter_removed;
+	((ViewCollectionClass *) klass)->notify_view_filter_removed = (void (*) (ViewCollection *, ViewFilter*)) view_collection_real_notify_view_filter_removed;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((DataCollectionClass *) klass)->clear = (void (*)(DataCollection*)) view_collection_real_clear;
+	((DataCollectionClass *) klass)->clear = (void (*) (DataCollection *)) view_collection_real_clear;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((DataCollectionClass *) klass)->close = (void (*)(DataCollection*)) view_collection_real_close;
+	((DataCollectionClass *) klass)->close = (void (*) (DataCollection *)) view_collection_real_close;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((DataCollectionClass *) klass)->valid_type = (gboolean (*)(DataCollection*, DataObject*)) view_collection_real_valid_type;
+	((DataCollectionClass *) klass)->valid_type = (gboolean (*) (DataCollection *, DataObject*)) view_collection_real_valid_type;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((DataCollectionClass *) klass)->add = (gboolean (*)(DataCollection*, DataObject*)) view_collection_real_add;
+	((DataCollectionClass *) klass)->add = (gboolean (*) (DataCollection *, DataObject*)) view_collection_real_add;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((DataCollectionClass *) klass)->add_many = (GeeCollection* (*)(DataCollection*, GeeCollection*, ProgressMonitor, void*)) view_collection_real_add_many;
+	((DataCollectionClass *) klass)->add_many = (GeeCollection* (*) (DataCollection *, GeeCollection*, ProgressMonitor, void*)) view_collection_real_add_many;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) view_collection_real_notify_items_added;
+	((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) view_collection_real_notify_items_added;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) view_collection_real_notify_items_removed;
+	((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) view_collection_real_notify_items_removed;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((DataCollectionClass *) klass)->items_altered = (void (*)(DataCollection*, GeeMap*)) view_collection_real_items_altered;
+	((DataCollectionClass *) klass)->items_altered = (void (*) (DataCollection *, GeeMap*)) view_collection_real_items_altered;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((DataCollectionClass *) klass)->set_comparator = (void (*)(DataCollection*, Comparator, void*, ComparatorPredicate, void*)) view_collection_real_set_comparator;
+	((DataCollectionClass *) klass)->set_comparator = (void (*) (DataCollection *, Comparator, void*, ComparatorPredicate, void*)) view_collection_real_set_comparator;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((DataCollectionClass *) klass)->reset_comparator = (void (*)(DataCollection*)) view_collection_real_reset_comparator;
+	((DataCollectionClass *) klass)->reset_comparator = (void (*) (DataCollection *)) view_collection_real_reset_comparator;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((DataCollectionClass *) klass)->get_all = (GeeCollection* (*)(DataCollection*)) view_collection_real_get_all;
+	((DataCollectionClass *) klass)->get_all = (GeeCollection* (*) (DataCollection *)) view_collection_real_get_all;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((DataCollectionClass *) klass)->get_count = (gint (*)(DataCollection*)) view_collection_real_get_count;
+	((DataCollectionClass *) klass)->get_count = (gint (*) (DataCollection *)) view_collection_real_get_count;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((DataCollectionClass *) klass)->get_at = (DataObject* (*)(DataCollection*, gint)) view_collection_real_get_at;
+	((DataCollectionClass *) klass)->get_at = (DataObject* (*) (DataCollection *, gint)) view_collection_real_get_at;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((DataCollectionClass *) klass)->index_of = (gint (*)(DataCollection*, DataObject*)) view_collection_real_index_of;
+	((DataCollectionClass *) klass)->index_of = (gint (*) (DataCollection *, DataObject*)) view_collection_real_index_of;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((DataCollectionClass *) klass)->contains = (gboolean (*)(DataCollection*, DataObject*)) view_collection_real_contains;
+	((DataCollectionClass *) klass)->contains = (gboolean (*) (DataCollection *, DataObject*)) view_collection_real_contains;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewCollectionClass *) klass)->get_first = (DataView* (*)(ViewCollection*)) view_collection_real_get_first;
+	((ViewCollectionClass *) klass)->get_first = (DataView* (*) (ViewCollection *)) view_collection_real_get_first;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewCollectionClass *) klass)->get_first_unrejected = (DataView* (*)(ViewCollection*)) view_collection_real_get_first_unrejected;
+	((ViewCollectionClass *) klass)->get_first_unrejected = (DataView* (*) (ViewCollection *)) view_collection_real_get_first_unrejected;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewCollectionClass *) klass)->get_last = (DataView* (*)(ViewCollection*)) view_collection_real_get_last;
+	((ViewCollectionClass *) klass)->get_last = (DataView* (*) (ViewCollection *)) view_collection_real_get_last;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewCollectionClass *) klass)->get_next = (DataView* (*)(ViewCollection*, DataView*)) view_collection_real_get_next;
+	((ViewCollectionClass *) klass)->get_next = (DataView* (*) (ViewCollection *, DataView*)) view_collection_real_get_next;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewCollectionClass *) klass)->get_previous = (DataView* (*)(ViewCollection*, DataView*)) view_collection_real_get_previous;
+	((ViewCollectionClass *) klass)->get_previous = (DataView* (*) (ViewCollection *, DataView*)) view_collection_real_get_previous;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((DataCollectionClass *) klass)->notify_thawed = (void (*)(DataCollection*)) view_collection_real_notify_thawed;
+	((DataCollectionClass *) klass)->notify_thawed = (void (*) (DataCollection *)) view_collection_real_notify_thawed;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	((ViewCollectionClass *) klass)->items_selected = view_collection_real_items_selected;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8450,40 +8472,40 @@ static void view_collection_class_init (ViewCollectionClass * klass) {
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	((ViewCollectionClass *) klass)->view_filter_removed = view_collection_real_view_filter_removed;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_new ("items_selected", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_selected), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
+	view_collection_signals[VIEW_COLLECTION_ITEMS_SELECTED_SIGNAL] = g_signal_new ("items-selected", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_selected), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_new ("items_unselected", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_unselected), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
+	view_collection_signals[VIEW_COLLECTION_ITEMS_UNSELECTED_SIGNAL] = g_signal_new ("items-unselected", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_unselected), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_new ("items_state_changed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_state_changed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
+	view_collection_signals[VIEW_COLLECTION_ITEMS_STATE_CHANGED_SIGNAL] = g_signal_new ("items-state-changed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_state_changed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_new ("selection_group_altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, selection_group_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	view_collection_signals[VIEW_COLLECTION_SELECTION_GROUP_ALTERED_SIGNAL] = g_signal_new ("selection-group-altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, selection_group_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_new ("items_shown", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_shown), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
+	view_collection_signals[VIEW_COLLECTION_ITEMS_SHOWN_SIGNAL] = g_signal_new ("items-shown", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_shown), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_new ("items_hidden", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_hidden), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
+	view_collection_signals[VIEW_COLLECTION_ITEMS_HIDDEN_SIGNAL] = g_signal_new ("items-hidden", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_hidden), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_new ("items_visibility_changed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_visibility_changed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
+	view_collection_signals[VIEW_COLLECTION_ITEMS_VISIBILITY_CHANGED_SIGNAL] = g_signal_new ("items-visibility-changed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_visibility_changed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_new ("item_view_altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, item_view_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_VIEW);
+	view_collection_signals[VIEW_COLLECTION_ITEM_VIEW_ALTERED_SIGNAL] = g_signal_new ("item-view-altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, item_view_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_VIEW);
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_new ("item_geometry_altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, item_geometry_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_VIEW);
+	view_collection_signals[VIEW_COLLECTION_ITEM_GEOMETRY_ALTERED_SIGNAL] = g_signal_new ("item-geometry-altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, item_geometry_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_VIEW);
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_new ("views_altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, views_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
+	view_collection_signals[VIEW_COLLECTION_VIEWS_ALTERED_SIGNAL] = g_signal_new ("views-altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, views_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_new ("geometries_altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, geometries_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
+	view_collection_signals[VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL] = g_signal_new ("geometries-altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, geometries_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_new ("view_filter_installed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, view_filter_installed), NULL, NULL, g_cclosure_user_marshal_VOID__VIEW_FILTER, G_TYPE_NONE, 1, TYPE_VIEW_FILTER);
+	view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL] = g_signal_new ("view-filter-installed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, view_filter_installed), NULL, NULL, g_cclosure_user_marshal_VOID__VIEW_FILTER, G_TYPE_NONE, 1, TYPE_VIEW_FILTER);
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_new ("view_filter_removed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, view_filter_removed), NULL, NULL, g_cclosure_user_marshal_VOID__VIEW_FILTER, G_TYPE_NONE, 1, TYPE_VIEW_FILTER);
-#line 8478 "ViewCollection.c"
+	view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL] = g_signal_new ("view-filter-removed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, view_filter_removed), NULL, NULL, g_cclosure_user_marshal_VOID__VIEW_FILTER, G_TYPE_NONE, 1, TYPE_VIEW_FILTER);
+#line 8500 "ViewCollection.c"
 }
 
 
 static void view_collection_instance_init (ViewCollection * self) {
-	GeeHashMultiMap* _tmp0_ = NULL;
-	GeeHashSet* _tmp1_ = NULL;
-	DataSet* _tmp2_ = NULL;
-	GeeHashMap* _tmp3_ = NULL;
+	GeeHashMultiMap* _tmp0_;
+	GeeHashSet* _tmp1_;
+	DataSet* _tmp2_;
+	GeeHashMap* _tmp3_;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self->priv = VIEW_COLLECTION_GET_PRIVATE (self);
 #line 59 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8494,8 +8516,12 @@ static void view_collection_instance_init (ViewCollection * self) {
 	self->priv->mirroring = NULL;
 #line 62 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self->priv->mirroring_ctor = NULL;
+#line 62 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	self->priv->mirroring_ctor_target = self;
 #line 63 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self->priv->should_mirror = NULL;
+#line 63 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	self->priv->should_mirror_target = self;
 #line 64 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = gee_hash_set_new (TYPE_VIEW_FILTER, (GBoxedCopyFunc) view_filter_ref, (GDestroyNotify) view_filter_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 64 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8514,11 +8540,11 @@ static void view_collection_instance_init (ViewCollection * self) {
 	_tmp3_ = gee_hash_map_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 72 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self->priv->source_map = _tmp3_;
-#line 8517 "ViewCollection.c"
+#line 8543 "ViewCollection.c"
 }
 
 
-static void view_collection_finalize (DataCollection* obj) {
+static void view_collection_finalize (DataCollection * obj) {
 	ViewCollection * self;
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIEW_COLLECTION, ViewCollection);
@@ -8540,7 +8566,7 @@ static void view_collection_finalize (DataCollection* obj) {
 	_g_object_unref0 (self->priv->source_map);
 #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	DATA_COLLECTION_CLASS (view_collection_parent_class)->finalize (obj);
-#line 8543 "ViewCollection.c"
+#line 8569 "ViewCollection.c"
 }
 
 
@@ -8564,7 +8590,7 @@ static gboolean view_manager_real_include_in_view (ViewManager* self, DataSource
 	result = TRUE;
 #line 1259 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
-#line 8567 "ViewCollection.c"
+#line 8593 "ViewCollection.c"
 }
 
 
@@ -8573,7 +8599,7 @@ gboolean view_manager_include_in_view (ViewManager* self, DataSource* source) {
 	g_return_val_if_fail (IS_VIEW_MANAGER (self), FALSE);
 #line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return VIEW_MANAGER_GET_CLASS (self)->include_in_view (self, source);
-#line 8576 "ViewCollection.c"
+#line 8602 "ViewCollection.c"
 }
 
 
@@ -8582,7 +8608,7 @@ static DataView* view_manager_real_create_view (ViewManager* self, DataSource* s
 	g_critical ("Type `%s' does not implement abstract method `view_manager_create_view'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return NULL;
-#line 8585 "ViewCollection.c"
+#line 8611 "ViewCollection.c"
 }
 
 
@@ -8591,7 +8617,7 @@ DataView* view_manager_create_view (ViewManager* self, DataSource* source) {
 	g_return_val_if_fail (IS_VIEW_MANAGER (self), NULL);
 #line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return VIEW_MANAGER_GET_CLASS (self)->create_view (self, source);
-#line 8594 "ViewCollection.c"
+#line 8620 "ViewCollection.c"
 }
 
 
@@ -8601,14 +8627,14 @@ ViewManager* view_manager_construct (GType object_type) {
 	self = (ViewManager*) g_type_create_instance (object_type);
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return self;
-#line 8604 "ViewCollection.c"
+#line 8630 "ViewCollection.c"
 }
 
 
 static void value_view_manager_init (GValue* value) {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	value->data[0].v_pointer = NULL;
-#line 8611 "ViewCollection.c"
+#line 8637 "ViewCollection.c"
 }
 
 
@@ -8617,7 +8643,7 @@ static void value_view_manager_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_manager_unref (value->data[0].v_pointer);
-#line 8620 "ViewCollection.c"
+#line 8646 "ViewCollection.c"
 	}
 }
 
@@ -8627,11 +8653,11 @@ static void value_view_manager_copy_value (const GValue* src_value, GValue* dest
 	if (src_value->data[0].v_pointer) {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		dest_value->data[0].v_pointer = view_manager_ref (src_value->data[0].v_pointer);
-#line 8630 "ViewCollection.c"
+#line 8656 "ViewCollection.c"
 	} else {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8634 "ViewCollection.c"
+#line 8660 "ViewCollection.c"
 	}
 }
 
@@ -8639,66 +8665,66 @@ static void value_view_manager_copy_value (const GValue* src_value, GValue* dest
 static gpointer value_view_manager_peek_pointer (const GValue* value) {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return value->data[0].v_pointer;
-#line 8642 "ViewCollection.c"
+#line 8668 "ViewCollection.c"
 }
 
 
 static gchar* value_view_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (collect_values[0].v_pointer) {
-#line 8649 "ViewCollection.c"
-		ViewManager* object;
+#line 8675 "ViewCollection.c"
+		ViewManager * object;
 		object = collect_values[0].v_pointer;
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8656 "ViewCollection.c"
+#line 8682 "ViewCollection.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8660 "ViewCollection.c"
+#line 8686 "ViewCollection.c"
 		}
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = view_manager_ref (object);
-#line 8664 "ViewCollection.c"
+#line 8690 "ViewCollection.c"
 	} else {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
-#line 8668 "ViewCollection.c"
+#line 8694 "ViewCollection.c"
 	}
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return NULL;
-#line 8672 "ViewCollection.c"
+#line 8698 "ViewCollection.c"
 }
 
 
 static gchar* value_view_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	ViewManager** object_p;
+	ViewManager ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (!object_p) {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8683 "ViewCollection.c"
+#line 8709 "ViewCollection.c"
 	}
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (!value->data[0].v_pointer) {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*object_p = NULL;
-#line 8689 "ViewCollection.c"
+#line 8715 "ViewCollection.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8693 "ViewCollection.c"
+#line 8719 "ViewCollection.c"
 	} else {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*object_p = view_manager_ref (value->data[0].v_pointer);
-#line 8697 "ViewCollection.c"
+#line 8723 "ViewCollection.c"
 	}
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return NULL;
-#line 8701 "ViewCollection.c"
+#line 8727 "ViewCollection.c"
 }
 
 
@@ -8712,7 +8738,7 @@ GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return G_PARAM_SPEC (spec);
-#line 8715 "ViewCollection.c"
+#line 8741 "ViewCollection.c"
 }
 
 
@@ -8721,12 +8747,12 @@ gpointer value_get_view_manager (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_MANAGER), NULL);
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return value->data[0].v_pointer;
-#line 8724 "ViewCollection.c"
+#line 8750 "ViewCollection.c"
 }
 
 
 void value_set_view_manager (GValue* value, gpointer v_object) {
-	ViewManager* old;
+	ViewManager * old;
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_MANAGER));
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8741,23 +8767,23 @@ void value_set_view_manager (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_manager_ref (value->data[0].v_pointer);
-#line 8744 "ViewCollection.c"
+#line 8770 "ViewCollection.c"
 	} else {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
-#line 8748 "ViewCollection.c"
+#line 8774 "ViewCollection.c"
 	}
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (old) {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_manager_unref (old);
-#line 8754 "ViewCollection.c"
+#line 8780 "ViewCollection.c"
 	}
 }
 
 
 void value_take_view_manager (GValue* value, gpointer v_object) {
-	ViewManager* old;
+	ViewManager * old;
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_MANAGER));
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8770,17 +8796,17 @@ void value_take_view_manager (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = v_object;
-#line 8773 "ViewCollection.c"
+#line 8799 "ViewCollection.c"
 	} else {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
-#line 8777 "ViewCollection.c"
+#line 8803 "ViewCollection.c"
 	}
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (old) {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_manager_unref (old);
-#line 8783 "ViewCollection.c"
+#line 8809 "ViewCollection.c"
 	}
 }
 
@@ -8791,27 +8817,27 @@ static void view_manager_class_init (ViewManagerClass * klass) {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	((ViewManagerClass *) klass)->finalize = view_manager_finalize;
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) view_manager_real_include_in_view;
+	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) view_manager_real_include_in_view;
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) view_manager_real_create_view;
-#line 8797 "ViewCollection.c"
+	((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) view_manager_real_create_view;
+#line 8823 "ViewCollection.c"
 }
 
 
 static void view_manager_instance_init (ViewManager * self) {
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self->ref_count = 1;
-#line 8804 "ViewCollection.c"
+#line 8830 "ViewCollection.c"
 }
 
 
-static void view_manager_finalize (ViewManager* obj) {
+static void view_manager_finalize (ViewManager * obj) {
 	ViewManager * self;
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIEW_MANAGER, ViewManager);
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_signal_handlers_destroy (self);
-#line 8814 "ViewCollection.c"
+#line 8840 "ViewCollection.c"
 }
 
 
@@ -8830,18 +8856,18 @@ GType view_manager_get_type (void) {
 
 
 gpointer view_manager_ref (gpointer instance) {
-	ViewManager* self;
+	ViewManager * self;
 	self = instance;
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return instance;
-#line 8839 "ViewCollection.c"
+#line 8865 "ViewCollection.c"
 }
 
 
 void view_manager_unref (gpointer instance) {
-	ViewManager* self;
+	ViewManager * self;
 	self = instance;
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -8849,7 +8875,7 @@ void view_manager_unref (gpointer instance) {
 		VIEW_MANAGER_GET_CLASS (self)->finalize (self);
 #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8852 "ViewCollection.c"
+#line 8878 "ViewCollection.c"
 	}
 }
 
@@ -8860,7 +8886,7 @@ static gboolean view_filter_real_predicate (ViewFilter* self, DataView* view) {
 	g_critical ("Type `%s' does not implement abstract method `view_filter_predicate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return _tmp0_;
-#line 8863 "ViewCollection.c"
+#line 8889 "ViewCollection.c"
 }
 
 
@@ -8869,7 +8895,7 @@ gboolean view_filter_predicate (ViewFilter* self, DataView* view) {
 	g_return_val_if_fail (IS_VIEW_FILTER (self), FALSE);
 #line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return VIEW_FILTER_GET_CLASS (self)->predicate (self, view);
-#line 8872 "ViewCollection.c"
+#line 8898 "ViewCollection.c"
 }
 
 
@@ -8879,7 +8905,7 @@ ViewFilter* view_filter_construct (GType object_type) {
 	self = (ViewFilter*) g_type_create_instance (object_type);
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return self;
-#line 8882 "ViewCollection.c"
+#line 8908 "ViewCollection.c"
 }
 
 
@@ -8890,7 +8916,7 @@ static void view_filter_real_refresh (ViewFilter* self) {
 static void value_view_filter_init (GValue* value) {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	value->data[0].v_pointer = NULL;
-#line 8893 "ViewCollection.c"
+#line 8919 "ViewCollection.c"
 }
 
 
@@ -8899,7 +8925,7 @@ static void value_view_filter_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_filter_unref (value->data[0].v_pointer);
-#line 8902 "ViewCollection.c"
+#line 8928 "ViewCollection.c"
 	}
 }
 
@@ -8909,11 +8935,11 @@ static void value_view_filter_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		dest_value->data[0].v_pointer = view_filter_ref (src_value->data[0].v_pointer);
-#line 8912 "ViewCollection.c"
+#line 8938 "ViewCollection.c"
 	} else {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8916 "ViewCollection.c"
+#line 8942 "ViewCollection.c"
 	}
 }
 
@@ -8921,66 +8947,66 @@ static void value_view_filter_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_view_filter_peek_pointer (const GValue* value) {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return value->data[0].v_pointer;
-#line 8924 "ViewCollection.c"
+#line 8950 "ViewCollection.c"
 }
 
 
 static gchar* value_view_filter_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (collect_values[0].v_pointer) {
-#line 8931 "ViewCollection.c"
-		ViewFilter* object;
+#line 8957 "ViewCollection.c"
+		ViewFilter * object;
 		object = collect_values[0].v_pointer;
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8938 "ViewCollection.c"
+#line 8964 "ViewCollection.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8942 "ViewCollection.c"
+#line 8968 "ViewCollection.c"
 		}
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = view_filter_ref (object);
-#line 8946 "ViewCollection.c"
+#line 8972 "ViewCollection.c"
 	} else {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
-#line 8950 "ViewCollection.c"
+#line 8976 "ViewCollection.c"
 	}
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return NULL;
-#line 8954 "ViewCollection.c"
+#line 8980 "ViewCollection.c"
 }
 
 
 static gchar* value_view_filter_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	ViewFilter** object_p;
+	ViewFilter ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (!object_p) {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8965 "ViewCollection.c"
+#line 8991 "ViewCollection.c"
 	}
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (!value->data[0].v_pointer) {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*object_p = NULL;
-#line 8971 "ViewCollection.c"
+#line 8997 "ViewCollection.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8975 "ViewCollection.c"
+#line 9001 "ViewCollection.c"
 	} else {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*object_p = view_filter_ref (value->data[0].v_pointer);
-#line 8979 "ViewCollection.c"
+#line 9005 "ViewCollection.c"
 	}
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return NULL;
-#line 8983 "ViewCollection.c"
+#line 9009 "ViewCollection.c"
 }
 
 
@@ -8994,7 +9020,7 @@ GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return G_PARAM_SPEC (spec);
-#line 8997 "ViewCollection.c"
+#line 9023 "ViewCollection.c"
 }
 
 
@@ -9003,12 +9029,12 @@ gpointer value_get_view_filter (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER), NULL);
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return value->data[0].v_pointer;
-#line 9006 "ViewCollection.c"
+#line 9032 "ViewCollection.c"
 }
 
 
 void value_set_view_filter (GValue* value, gpointer v_object) {
-	ViewFilter* old;
+	ViewFilter * old;
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER));
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -9023,23 +9049,23 @@ void value_set_view_filter (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_filter_ref (value->data[0].v_pointer);
-#line 9026 "ViewCollection.c"
+#line 9052 "ViewCollection.c"
 	} else {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
-#line 9030 "ViewCollection.c"
+#line 9056 "ViewCollection.c"
 	}
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (old) {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_filter_unref (old);
-#line 9036 "ViewCollection.c"
+#line 9062 "ViewCollection.c"
 	}
 }
 
 
 void value_take_view_filter (GValue* value, gpointer v_object) {
-	ViewFilter* old;
+	ViewFilter * old;
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER));
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -9052,17 +9078,17 @@ void value_take_view_filter (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = v_object;
-#line 9055 "ViewCollection.c"
+#line 9081 "ViewCollection.c"
 	} else {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
-#line 9059 "ViewCollection.c"
+#line 9085 "ViewCollection.c"
 	}
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (old) {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_filter_unref (old);
-#line 9065 "ViewCollection.c"
+#line 9091 "ViewCollection.c"
 	}
 }
 
@@ -9073,29 +9099,29 @@ static void view_filter_class_init (ViewFilterClass * klass) {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	((ViewFilterClass *) klass)->finalize = view_filter_finalize;
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) view_filter_real_predicate;
+	((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) view_filter_real_predicate;
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	((ViewFilterClass *) klass)->refresh = view_filter_real_refresh;
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_signal_new ("refresh", TYPE_VIEW_FILTER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewFilterClass, refresh), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 9081 "ViewCollection.c"
+	view_filter_signals[VIEW_FILTER_REFRESH_SIGNAL] = g_signal_new ("refresh", TYPE_VIEW_FILTER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewFilterClass, refresh), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 9107 "ViewCollection.c"
 }
 
 
 static void view_filter_instance_init (ViewFilter * self) {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self->ref_count = 1;
-#line 9088 "ViewCollection.c"
+#line 9114 "ViewCollection.c"
 }
 
 
-static void view_filter_finalize (ViewFilter* obj) {
+static void view_filter_finalize (ViewFilter * obj) {
 	ViewFilter * self;
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIEW_FILTER, ViewFilter);
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_signal_handlers_destroy (self);
-#line 9098 "ViewCollection.c"
+#line 9124 "ViewCollection.c"
 }
 
 
@@ -9114,18 +9140,18 @@ GType view_filter_get_type (void) {
 
 
 gpointer view_filter_ref (gpointer instance) {
-	ViewFilter* self;
+	ViewFilter * self;
 	self = instance;
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return instance;
-#line 9123 "ViewCollection.c"
+#line 9149 "ViewCollection.c"
 }
 
 
 void view_filter_unref (gpointer instance) {
-	ViewFilter* self;
+	ViewFilter * self;
 	self = instance;
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -9133,7 +9159,7 @@ void view_filter_unref (gpointer instance) {
 		VIEW_FILTER_GET_CLASS (self)->finalize (self);
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9136 "ViewCollection.c"
+#line 9162 "ViewCollection.c"
 	}
 }
 
diff --git a/src/core/util.c b/src/core/util.c
index 0ddab1f..f4143d3 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -1,4 +1,4 @@
-/* util.c generated by valac 0.34.7, the Vala compiler
+/* util.c generated by valac 0.36.6, the Vala compiler
  * generated from util.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -184,8 +184,8 @@ struct _ParamSpecAggregateProgressMonitor {
 
 static gpointer singleton_collection_parent_class = NULL;
 static gpointer singleton_collection_singleton_iterator_parent_class = NULL;
-static GeeTraversableIface* singleton_collection_singleton_iterator_gee_traversable_parent_iface = NULL;
-static GeeIteratorIface* singleton_collection_singleton_iterator_gee_iterator_parent_iface = NULL;
+static GeeTraversableIface * singleton_collection_singleton_iterator_gee_traversable_parent_iface = NULL;
+static GeeIteratorIface * singleton_collection_singleton_iterator_gee_iterator_parent_iface = NULL;
 static gpointer unknown_total_monitor_parent_class = NULL;
 static gpointer aggregate_progress_monitor_parent_class = NULL;
 
@@ -196,8 +196,8 @@ enum  {
 	SINGLETON_COLLECTION_G_TYPE,
 	SINGLETON_COLLECTION_G_DUP_FUNC,
 	SINGLETON_COLLECTION_G_DESTROY_FUNC,
-	SINGLETON_COLLECTION_READ_ONLY,
-	SINGLETON_COLLECTION_SIZE
+	SINGLETON_COLLECTION_READ_ONLY_PROPERTY,
+	SINGLETON_COLLECTION_SIZE_PROPERTY
 };
 SingletonCollection* singleton_collection_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object);
 SingletonCollection* singleton_collection_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object);
@@ -215,18 +215,18 @@ enum  {
 	SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_TYPE,
 	SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DUP_FUNC,
 	SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DESTROY_FUNC,
-	SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY,
-	SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID
+	SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY,
+	SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY
 };
 static gboolean singleton_collection_singleton_iterator_real_foreach (GeeTraversable* base, GeeForallFunc f, void* f_target);
 static gpointer singleton_collection_singleton_iterator_real_get (GeeIterator* base);
 static gboolean singleton_collection_singleton_iterator_real_has_next (GeeIterator* base);
 static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* base);
 static void singleton_collection_singleton_iterator_real_remove (GeeIterator* base);
-static void singleton_collection_singleton_iterator_finalize (GObject* obj);
+static void singleton_collection_singleton_iterator_finalize (GObject * obj);
 static void _vala_singleton_collection_singleton_iterator_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_singleton_collection_singleton_iterator_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
-static void singleton_collection_finalize (GObject* obj);
+static void singleton_collection_finalize (GObject * obj);
 static void _vala_singleton_collection_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_singleton_collection_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 GType data_object_get_type (void) G_GNUC_CONST;
@@ -253,7 +253,7 @@ enum  {
 UnknownTotalMonitor* unknown_total_monitor_new (guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target);
 UnknownTotalMonitor* unknown_total_monitor_construct (GType object_type, guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target);
 gboolean unknown_total_monitor_monitor (UnknownTotalMonitor* self, guint64 count, guint64 total);
-static void unknown_total_monitor_finalize (UnknownTotalMonitor* obj);
+static void unknown_total_monitor_finalize (UnknownTotalMonitor * obj);
 gpointer aggregate_progress_monitor_ref (gpointer instance);
 void aggregate_progress_monitor_unref (gpointer instance);
 GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -269,15 +269,15 @@ AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, P
 AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target);
 void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, const gchar* name);
 gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, guint64 count, guint64 total);
-static void aggregate_progress_monitor_finalize (AggregateProgressMonitor* obj);
+static void aggregate_progress_monitor_finalize (AggregateProgressMonitor * obj);
 gboolean null_progress_monitor (guint64 count, guint64 total);
 gdouble degrees_to_radians (gdouble theta);
 
 
 SingletonCollection* singleton_collection_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object) {
 	SingletonCollection * self = NULL;
-	gconstpointer _tmp0_ = NULL;
-	gpointer _tmp1_ = NULL;
+	gconstpointer _tmp0_;
+	gpointer _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = (SingletonCollection*) gee_abstract_collection_construct (object_type, g_type, (GBoxedCopyFunc) g_dup_func, (GDestroyNotify) g_destroy_func);
 #line 65 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -337,8 +337,8 @@ static void singleton_collection_real_clear (GeeAbstractCollection* base) {
 static gboolean singleton_collection_real_contains (GeeAbstractCollection* base, gconstpointer object) {
 	SingletonCollection * self;
 	gboolean result = FALSE;
-	gconstpointer _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
+	gconstpointer _tmp0_;
+	gconstpointer _tmp1_;
 #line 83 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection);
 #line 84 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -356,7 +356,7 @@ static gboolean singleton_collection_real_contains (GeeAbstractCollection* base,
 static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* base) {
 	SingletonCollection * self;
 	GeeIterator* result = NULL;
-	SingletonCollectionSingletonIterator* _tmp0_ = NULL;
+	SingletonCollectionSingletonIterator* _tmp0_;
 #line 87 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection);
 #line 88 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -372,8 +372,8 @@ static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* b
 static gboolean singleton_collection_real_remove (GeeAbstractCollection* base, gconstpointer item) {
 	SingletonCollection * self;
 	gboolean result = FALSE;
-	gconstpointer _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
+	gconstpointer _tmp0_;
+	gconstpointer _tmp1_;
 #line 91 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection);
 #line 92 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -417,7 +417,7 @@ static gint singleton_collection_real_get_size (GeeAbstractCollection* base) {
 	gint result;
 	SingletonCollection* self;
 	gint _tmp0_ = 0;
-	gconstpointer _tmp1_ = NULL;
+	gconstpointer _tmp1_;
 #line 102 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection);
 #line 103 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -449,8 +449,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, SingletonCollection* c) {
 	SingletonCollectionSingletonIterator * self = NULL;
-	SingletonCollection* _tmp0_ = NULL;
-	SingletonCollection* _tmp1_ = NULL;
+	SingletonCollection* _tmp0_;
+	SingletonCollection* _tmp1_;
 #line 19 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_return_val_if_fail (IS_SINGLETON_COLLECTION (c), NULL);
 #line 19 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -485,12 +485,12 @@ static SingletonCollectionSingletonIterator* singleton_collection_singleton_iter
 static gboolean singleton_collection_singleton_iterator_real_foreach (GeeTraversable* base, GeeForallFunc f, void* f_target) {
 	SingletonCollectionSingletonIterator * self;
 	gboolean result = FALSE;
-	GeeForallFunc _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	SingletonCollection* _tmp1_ = NULL;
-	gconstpointer _tmp2_ = NULL;
-	gpointer _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GeeForallFunc _tmp0_;
+	void* _tmp0__target;
+	SingletonCollection* _tmp1_;
+	gconstpointer _tmp2_;
+	gpointer _tmp3_;
+	gboolean _tmp4_;
 #line 31 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator);
 #line 32 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -516,8 +516,8 @@ static gboolean singleton_collection_singleton_iterator_real_foreach (GeeTravers
 static gpointer singleton_collection_singleton_iterator_real_get (GeeIterator* base) {
 	SingletonCollectionSingletonIterator * self;
 	gpointer result = NULL;
-	gconstpointer _tmp0_ = NULL;
-	gpointer _tmp1_ = NULL;
+	gconstpointer _tmp0_;
+	gpointer _tmp1_;
 #line 35 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator);
 #line 36 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -548,10 +548,10 @@ static gboolean singleton_collection_singleton_iterator_real_has_next (GeeIterat
 static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* base) {
 	SingletonCollectionSingletonIterator * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	SingletonCollection* _tmp1_ = NULL;
-	gconstpointer _tmp2_ = NULL;
-	gpointer _tmp3_ = NULL;
+	gboolean _tmp0_;
+	SingletonCollection* _tmp1_;
+	gconstpointer _tmp2_;
+	gpointer _tmp3_;
 #line 43 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator);
 #line 44 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -586,7 +586,7 @@ static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator*
 
 static void singleton_collection_singleton_iterator_real_remove (GeeIterator* base) {
 	SingletonCollectionSingletonIterator * self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 53 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator);
 #line 54 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -594,7 +594,7 @@ static void singleton_collection_singleton_iterator_real_remove (GeeIterator* ba
 #line 54 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (!_tmp0_) {
 #line 597 "util.c"
-		SingletonCollection* _tmp1_ = NULL;
+		SingletonCollection* _tmp1_;
 #line 55 "/home/jens/Source/shotwell/src/core/util.vala"
 		_tmp1_ = self->priv->c;
 #line 55 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -616,7 +616,7 @@ static void singleton_collection_singleton_iterator_real_remove (GeeIterator* ba
 static gboolean singleton_collection_singleton_iterator_real_get_read_only (GeeIterator* base) {
 	gboolean result;
 	SingletonCollectionSingletonIterator* self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 24 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator);
 #line 24 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -632,7 +632,7 @@ static gboolean singleton_collection_singleton_iterator_real_get_read_only (GeeI
 static gboolean singleton_collection_singleton_iterator_real_get_valid (GeeIterator* base) {
 	gboolean result;
 	SingletonCollectionSingletonIterator* self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator);
 #line 28 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -663,9 +663,9 @@ static void singleton_collection_singleton_iterator_class_init (SingletonCollect
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID, g_param_spec_boolean ("valid", "valid", "valid", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY, g_param_spec_boolean ("valid", "valid", "valid", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 670 "util.c"
 }
 
@@ -695,13 +695,13 @@ static void singleton_collection_singleton_iterator_gee_traversable_interface_in
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 	singleton_collection_singleton_iterator_gee_traversable_parent_iface = g_type_interface_peek_parent (iface);
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	iface->foreach = (gboolean (*)(GeeTraversable*, GeeForallFunc, void*)) singleton_collection_singleton_iterator_real_foreach;
+	iface->foreach = (gboolean (*) (GeeTraversable *, GeeForallFunc, void*)) singleton_collection_singleton_iterator_real_foreach;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	iface->get_g_type = (GType(*)(GeeTraversable*)) singleton_collection_singleton_iterator_gee_traversable_get_g_type;
+	iface->get_g_type = (GType (*) (GeeTraversable *)) singleton_collection_singleton_iterator_gee_traversable_get_g_type;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	iface->get_g_dup_func = (GBoxedCopyFunc(*)(GeeTraversable*)) singleton_collection_singleton_iterator_gee_traversable_get_g_dup_func;
+	iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeTraversable *)) singleton_collection_singleton_iterator_gee_traversable_get_g_dup_func;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	iface->get_g_destroy_func = (GDestroyNotify(*)(GeeTraversable*)) singleton_collection_singleton_iterator_gee_traversable_get_g_destroy_func;
+	iface->get_g_destroy_func = (GDestroyNotify (*) (GeeTraversable *)) singleton_collection_singleton_iterator_gee_traversable_get_g_destroy_func;
 #line 706 "util.c"
 }
 
@@ -710,13 +710,13 @@ static void singleton_collection_singleton_iterator_gee_iterator_interface_init
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 	singleton_collection_singleton_iterator_gee_iterator_parent_iface = g_type_interface_peek_parent (iface);
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	iface->get = (gpointer (*)(GeeIterator*)) singleton_collection_singleton_iterator_real_get;
+	iface->get = (gpointer (*) (GeeIterator *)) singleton_collection_singleton_iterator_real_get;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	iface->has_next = (gboolean (*)(GeeIterator*)) singleton_collection_singleton_iterator_real_has_next;
+	iface->has_next = (gboolean (*) (GeeIterator *)) singleton_collection_singleton_iterator_real_has_next;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	iface->next = (gboolean (*)(GeeIterator*)) singleton_collection_singleton_iterator_real_next;
+	iface->next = (gboolean (*) (GeeIterator *)) singleton_collection_singleton_iterator_real_next;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	iface->remove = (void (*)(GeeIterator*)) singleton_collection_singleton_iterator_real_remove;
+	iface->remove = (void (*) (GeeIterator *)) singleton_collection_singleton_iterator_real_remove;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 	iface->get_read_only = singleton_collection_singleton_iterator_real_get_read_only;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -736,7 +736,7 @@ static void singleton_collection_singleton_iterator_instance_init (SingletonColl
 }
 
 
-static void singleton_collection_singleton_iterator_finalize (GObject* obj) {
+static void singleton_collection_singleton_iterator_finalize (GObject * obj) {
 	SingletonCollectionSingletonIterator * self;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator);
@@ -772,13 +772,13 @@ static void _vala_singleton_collection_singleton_iterator_get_property (GObject
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 	switch (property_id) {
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-		case SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY:
+		case SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY:
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 		g_value_set_boolean (value, gee_iterator_get_read_only (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_ITERATOR, GeeIterator)));
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 		break;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-		case SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID:
+		case SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY:
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 		g_value_set_boolean (value, gee_iterator_get_valid (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_ITERATOR, GeeIterator)));
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -834,15 +834,15 @@ static void singleton_collection_class_init (SingletonCollectionClass * klass) {
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_type_class_add_private (klass, sizeof (SingletonCollectionPrivate));
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-	((GeeAbstractCollectionClass *) klass)->add = (gboolean (*)(GeeAbstractCollection*, gconstpointer)) singleton_collection_real_add;
+	((GeeAbstractCollectionClass *) klass)->add = (gboolean (*) (GeeAbstractCollection *, gconstpointer)) singleton_collection_real_add;
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-	((GeeAbstractCollectionClass *) klass)->clear = (void (*)(GeeAbstractCollection*)) singleton_collection_real_clear;
+	((GeeAbstractCollectionClass *) klass)->clear = (void (*) (GeeAbstractCollection *)) singleton_collection_real_clear;
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-	((GeeAbstractCollectionClass *) klass)->contains = (gboolean (*)(GeeAbstractCollection*, gconstpointer)) singleton_collection_real_contains;
+	((GeeAbstractCollectionClass *) klass)->contains = (gboolean (*) (GeeAbstractCollection *, gconstpointer)) singleton_collection_real_contains;
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-	((GeeAbstractCollectionClass *) klass)->iterator = (GeeIterator* (*)(GeeAbstractCollection*)) singleton_collection_real_iterator;
+	((GeeAbstractCollectionClass *) klass)->iterator = (GeeIterator* (*) (GeeAbstractCollection *)) singleton_collection_real_iterator;
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-	((GeeAbstractCollectionClass *) klass)->remove = (gboolean (*)(GeeAbstractCollection*, gconstpointer)) singleton_collection_real_remove;
+	((GeeAbstractCollectionClass *) klass)->remove = (gboolean (*) (GeeAbstractCollection *, gconstpointer)) singleton_collection_real_remove;
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
 	GEE_ABSTRACT_COLLECTION_CLASS (klass)->get_read_only = singleton_collection_real_get_read_only;
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -860,9 +860,9 @@ static void singleton_collection_class_init (SingletonCollectionClass * klass) {
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_READ_ONLY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_READ_ONLY_PROPERTY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SIZE, g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SIZE_PROPERTY, g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 867 "util.c"
 }
 
@@ -874,7 +874,7 @@ static void singleton_collection_instance_init (SingletonCollection * self) {
 }
 
 
-static void singleton_collection_finalize (GObject* obj) {
+static void singleton_collection_finalize (GObject * obj) {
 	SingletonCollection * self;
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SINGLETON_COLLECTION, SingletonCollection);
@@ -904,13 +904,13 @@ static void _vala_singleton_collection_get_property (GObject * object, guint pro
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
 	switch (property_id) {
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-		case SINGLETON_COLLECTION_READ_ONLY:
+		case SINGLETON_COLLECTION_READ_ONLY_PROPERTY:
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
 		g_value_set_boolean (value, gee_abstract_collection_get_read_only (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)));
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
 		break;
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-		case SINGLETON_COLLECTION_SIZE:
+		case SINGLETON_COLLECTION_SIZE_PROPERTY:
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
 		g_value_set_int (value, gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)));
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1059,9 +1059,9 @@ GType marker_get_type (void) {
 
 UnknownTotalMonitor* unknown_total_monitor_construct (GType object_type, guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) {
 	UnknownTotalMonitor* self = NULL;
-	guint64 _tmp0_ = 0ULL;
-	ProgressMonitor _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
+	guint64 _tmp0_;
+	ProgressMonitor _tmp1_;
+	void* _tmp1__target;
 #line 147 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = (UnknownTotalMonitor*) g_type_create_instance (object_type);
 #line 148 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1091,11 +1091,11 @@ UnknownTotalMonitor* unknown_total_monitor_new (guint64 total, ProgressMonitor w
 
 gboolean unknown_total_monitor_monitor (UnknownTotalMonitor* self, guint64 count, guint64 total) {
 	gboolean result = FALSE;
-	ProgressMonitor _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	guint64 _tmp1_ = 0ULL;
-	guint64 _tmp2_ = 0ULL;
-	gboolean _tmp3_ = FALSE;
+	ProgressMonitor _tmp0_;
+	void* _tmp0__target;
+	guint64 _tmp1_;
+	guint64 _tmp2_;
+	gboolean _tmp3_;
 #line 152 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_return_val_if_fail (IS_UNKNOWN_TOTAL_MONITOR (self), FALSE);
 #line 153 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1158,7 +1158,7 @@ static gchar* value_unknown_total_monitor_collect_value (GValue* value, guint n_
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (collect_values[0].v_pointer) {
 #line 1161 "util.c"
-		UnknownTotalMonitor* object;
+		UnknownTotalMonitor * object;
 		object = collect_values[0].v_pointer;
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1185,7 +1185,7 @@ static gchar* value_unknown_total_monitor_collect_value (GValue* value, guint n_
 
 
 static gchar* value_unknown_total_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	UnknownTotalMonitor** object_p;
+	UnknownTotalMonitor ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (!object_p) {
@@ -1237,7 +1237,7 @@ gpointer value_get_unknown_total_monitor (const GValue* value) {
 
 
 void value_set_unknown_total_monitor (GValue* value, gpointer v_object) {
-	UnknownTotalMonitor* old;
+	UnknownTotalMonitor * old;
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UNKNOWN_TOTAL_MONITOR));
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1268,7 +1268,7 @@ void value_set_unknown_total_monitor (GValue* value, gpointer v_object) {
 
 
 void value_take_unknown_total_monitor (GValue* value, gpointer v_object) {
-	UnknownTotalMonitor* old;
+	UnknownTotalMonitor * old;
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UNKNOWN_TOTAL_MONITOR));
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1316,7 +1316,7 @@ static void unknown_total_monitor_instance_init (UnknownTotalMonitor * self) {
 }
 
 
-static void unknown_total_monitor_finalize (UnknownTotalMonitor* obj) {
+static void unknown_total_monitor_finalize (UnknownTotalMonitor * obj) {
 	UnknownTotalMonitor * self;
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_UNKNOWN_TOTAL_MONITOR, UnknownTotalMonitor);
@@ -1341,7 +1341,7 @@ GType unknown_total_monitor_get_type (void) {
 
 
 gpointer unknown_total_monitor_ref (gpointer instance) {
-	UnknownTotalMonitor* self;
+	UnknownTotalMonitor * self;
 	self = instance;
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1352,7 +1352,7 @@ gpointer unknown_total_monitor_ref (gpointer instance) {
 
 
 void unknown_total_monitor_unref (gpointer instance) {
-	UnknownTotalMonitor* self;
+	UnknownTotalMonitor * self;
 	self = instance;
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1367,9 +1367,9 @@ void unknown_total_monitor_unref (gpointer instance) {
 
 AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) {
 	AggregateProgressMonitor* self = NULL;
-	guint64 _tmp0_ = 0ULL;
-	ProgressMonitor _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
+	guint64 _tmp0_;
+	ProgressMonitor _tmp1_;
+	void* _tmp1__target;
 #line 165 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = (AggregateProgressMonitor*) g_type_create_instance (object_type);
 #line 166 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1398,13 +1398,13 @@ AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, P
 
 
 void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, const gchar* name) {
-	const gchar* _tmp0_ = NULL;
-	guint64 _tmp1_ = 0ULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	guint64 _tmp4_ = 0ULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	const gchar* _tmp0_;
+	guint64 _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	guint64 _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 170 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_return_if_fail (IS_AGGREGATE_PROGRESS_MONITOR (self));
 #line 170 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1438,16 +1438,16 @@ void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, const
 gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, guint64 count, guint64 total) {
 	gboolean result = FALSE;
 	guint64 _tmp0_ = 0ULL;
-	guint64 _tmp1_ = 0ULL;
-	guint64 _tmp5_ = 0ULL;
-	guint64 _tmp6_ = 0ULL;
-	guint64 _tmp7_ = 0ULL;
-	guint64 _tmp9_ = 0ULL;
-	ProgressMonitor _tmp10_ = NULL;
-	void* _tmp10__target = NULL;
-	guint64 _tmp11_ = 0ULL;
-	guint64 _tmp12_ = 0ULL;
-	gboolean _tmp13_ = FALSE;
+	guint64 _tmp1_;
+	guint64 _tmp5_;
+	guint64 _tmp6_;
+	guint64 _tmp7_;
+	guint64 _tmp9_;
+	ProgressMonitor _tmp10_;
+	void* _tmp10__target;
+	guint64 _tmp11_;
+	guint64 _tmp12_;
+	gboolean _tmp13_;
 #line 175 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_return_val_if_fail (IS_AGGREGATE_PROGRESS_MONITOR (self), FALSE);
 #line 177 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1455,8 +1455,8 @@ gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, gui
 #line 177 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (_tmp1_ != G_MAXUINT64) {
 #line 1458 "util.c"
-		guint64 _tmp2_ = 0ULL;
-		guint64 _tmp3_ = 0ULL;
+		guint64 _tmp2_;
+		guint64 _tmp3_;
 #line 177 "/home/jens/Source/shotwell/src/core/util.vala"
 		_tmp2_ = count;
 #line 177 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1465,7 +1465,7 @@ gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, gui
 		_tmp0_ = _tmp2_ - _tmp3_;
 #line 1467 "util.c"
 	} else {
-		guint64 _tmp4_ = 0ULL;
+		guint64 _tmp4_;
 #line 177 "/home/jens/Source/shotwell/src/core/util.vala"
 		_tmp4_ = count;
 #line 177 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1483,7 +1483,7 @@ gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, gui
 #line 178 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (_tmp6_ > _tmp7_) {
 #line 1486 "util.c"
-		guint64 _tmp8_ = 0ULL;
+		guint64 _tmp8_;
 #line 179 "/home/jens/Source/shotwell/src/core/util.vala"
 		_tmp8_ = self->priv->grand_total;
 #line 179 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1554,7 +1554,7 @@ static gchar* value_aggregate_progress_monitor_collect_value (GValue* value, gui
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (collect_values[0].v_pointer) {
 #line 1557 "util.c"
-		AggregateProgressMonitor* object;
+		AggregateProgressMonitor * object;
 		object = collect_values[0].v_pointer;
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1581,7 +1581,7 @@ static gchar* value_aggregate_progress_monitor_collect_value (GValue* value, gui
 
 
 static gchar* value_aggregate_progress_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	AggregateProgressMonitor** object_p;
+	AggregateProgressMonitor ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (!object_p) {
@@ -1633,7 +1633,7 @@ gpointer value_get_aggregate_progress_monitor (const GValue* value) {
 
 
 void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object) {
-	AggregateProgressMonitor* old;
+	AggregateProgressMonitor * old;
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AGGREGATE_PROGRESS_MONITOR));
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1664,7 +1664,7 @@ void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object) {
 
 
 void value_take_aggregate_progress_monitor (GValue* value, gpointer v_object) {
-	AggregateProgressMonitor* old;
+	AggregateProgressMonitor * old;
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AGGREGATE_PROGRESS_MONITOR));
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1716,7 +1716,7 @@ static void aggregate_progress_monitor_instance_init (AggregateProgressMonitor *
 }
 
 
-static void aggregate_progress_monitor_finalize (AggregateProgressMonitor* obj) {
+static void aggregate_progress_monitor_finalize (AggregateProgressMonitor * obj) {
 	AggregateProgressMonitor * self;
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_AGGREGATE_PROGRESS_MONITOR, AggregateProgressMonitor);
@@ -1741,7 +1741,7 @@ GType aggregate_progress_monitor_get_type (void) {
 
 
 gpointer aggregate_progress_monitor_ref (gpointer instance) {
-	AggregateProgressMonitor* self;
+	AggregateProgressMonitor * self;
 	self = instance;
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1752,7 +1752,7 @@ gpointer aggregate_progress_monitor_ref (gpointer instance) {
 
 
 void aggregate_progress_monitor_unref (gpointer instance) {
-	AggregateProgressMonitor* self;
+	AggregateProgressMonitor * self;
 	self = instance;
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1777,7 +1777,7 @@ gboolean null_progress_monitor (guint64 count, guint64 total) {
 
 gdouble degrees_to_radians (gdouble theta) {
 	gdouble result = 0.0;
-	gdouble _tmp0_ = 0.0;
+	gdouble _tmp0_;
 #line 195 "/home/jens/Source/shotwell/src/core/util.vala"
 	_tmp0_ = theta;
 #line 195 "/home/jens/Source/shotwell/src/core/util.vala"
diff --git a/src/data_imports/DataImportJob.c b/src/data_imports/DataImportJob.c
index 8f75c81..5b62a91 100644
--- a/src/data_imports/DataImportJob.c
+++ b/src/data_imports/DataImportJob.c
@@ -1,4 +1,4 @@
-/* DataImportJob.c generated by valac 0.34.7, the Vala compiler
+/* DataImportJob.c generated by valac 0.36.6, the Vala compiler
  * generated from DataImportJob.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -260,8 +260,8 @@ struct _BatchImportJobClass {
 	gchar* (*get_path) (BatchImportJob* self);
 	DuplicatedFile* (*get_duplicated_file) (BatchImportJob* self);
 	void (*set_associated) (BatchImportJob* self, BatchImportJob* associated);
-	gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile** file_or_dir);
-	gboolean (*prepare) (BatchImportJob* self, GFile** file_to_import, gboolean* copy_to_library, GError** error);
+	gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir);
+	gboolean (*prepare) (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
 	gboolean (*complete) (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
 	time_t (*get_exposure_time_override) (BatchImportJob* self);
 };
@@ -390,8 +390,8 @@ static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImport
 static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJob* base);
 static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* base);
 static void spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated);
-static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile** file);
-static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile** file_to_import, gboolean* copy_to_library, GError** error);
+static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file);
+static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
 SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_photo (SpitDataImportsDataImportSource* self);
 static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob* base, MediaSource* source, BatchImportRoll* import_roll, GError** error);
 GType photo_source_get_type (void) G_GNUC_CONST;
@@ -431,7 +431,7 @@ GType dateable_get_type (void) G_GNUC_CONST;
 void dateable_set_exposure_time (Dateable* self, time_t target_time);
 void photo_set_import_id (Photo* self, ImportID* import_id);
 gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag);
-static void spit_data_imports_data_import_job_finalize (BatchImportJob* obj);
+static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -445,14 +445,14 @@ static gpointer _spit_data_imports_data_import_source_ref0 (gpointer self) {
 
 SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType object_type, SpitDataImportsDataImportSource* import_source) {
 	SpitDataImportsDataImportJob* self = NULL;
-	SpitDataImportsDataImportSource* _tmp0_ = NULL;
-	SpitDataImportsDataImportSource* _tmp1_ = NULL;
-	SpitDataImportsDataImportSource* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	SpitDataImportsDataImportSource* _tmp4_ = NULL;
-	guint64 _tmp5_ = 0ULL;
-	SpitDataImportsDataImportSource* _tmp6_ = NULL;
-	time_t _tmp7_ = 0;
+	SpitDataImportsDataImportSource* _tmp0_;
+	SpitDataImportsDataImportSource* _tmp1_;
+	SpitDataImportsDataImportSource* _tmp2_;
+	GFile* _tmp3_;
+	SpitDataImportsDataImportSource* _tmp4_;
+	guint64 _tmp5_;
+	SpitDataImportsDataImportSource* _tmp6_;
+	time_t _tmp7_;
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (import_source), NULL);
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -508,13 +508,13 @@ static gpointer _g_object_ref0 (gpointer self) {
 static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_index (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag** src_tags, int src_tags_length1) {
 	HierarchicalTagIndex* result = NULL;
 	GeeSet* detected_htags = NULL;
-	GeeHashSet* _tmp0_ = NULL;
-	SpitDataImportsImportableTag** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	GeeHashSet* _tmp0_;
+	SpitDataImportsImportableTag** _tmp1_;
+	gint _tmp1__length1;
 	HierarchicalTagIndex* _tmp33_ = NULL;
-	GeeSet* _tmp34_ = NULL;
-	gint _tmp35_ = 0;
-	gint _tmp36_ = 0;
+	GeeSet* _tmp34_;
+	gint _tmp35_;
+	gint _tmp36_;
 #line 29 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_JOB (self), NULL);
 #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -538,7 +538,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		for (src_tag_it = 0; src_tag_it < _tmp1__length1; src_tag_it = src_tag_it + 1) {
 #line 541 "DataImportJob.c"
-			SpitDataImportsImportableTag* _tmp2_ = NULL;
+			SpitDataImportsImportableTag* _tmp2_;
 			SpitDataImportsImportableTag* src_tag = NULL;
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			_tmp2_ = _g_object_ref0 (src_tag_collection[src_tag_it]);
@@ -547,19 +547,19 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 #line 548 "DataImportJob.c"
 			{
 				gchar* prepped = NULL;
-				SpitDataImportsImportableTag* _tmp3_ = NULL;
-				gint _tmp4_ = 0;
-				gchar** _tmp5_ = NULL;
-				gchar** _tmp6_ = NULL;
-				gint _tmp6__length1 = 0;
-				gint _tmp7_ = 0;
-				gchar** _tmp8_ = NULL;
-				gchar** _tmp9_ = NULL;
-				gint _tmp9__length1 = 0;
-				gchar* _tmp10_ = NULL;
-				gchar* _tmp11_ = NULL;
+				SpitDataImportsImportableTag* _tmp3_;
+				gint _tmp4_;
+				gchar** _tmp5_;
+				gchar** _tmp6_;
+				gint _tmp6__length1;
+				gint _tmp7_;
+				gchar** _tmp8_;
+				gchar** _tmp9_;
+				gint _tmp9__length1;
+				gchar* _tmp10_;
+				gchar* _tmp11_;
 				gboolean _tmp12_ = FALSE;
-				const gchar* _tmp13_ = NULL;
+				const gchar* _tmp13_;
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_tmp3_ = src_tag;
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -589,8 +589,8 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				if (_tmp13_ != NULL) {
 #line 592 "DataImportJob.c"
-					const gchar* _tmp14_ = NULL;
-					gboolean _tmp15_ = FALSE;
+					const gchar* _tmp14_;
+					gboolean _tmp15_;
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_tmp14_ = prepped;
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -606,11 +606,11 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				if (_tmp12_) {
 #line 609 "DataImportJob.c"
-					GeeSet* _tmp16_ = NULL;
-					const gchar* _tmp17_ = NULL;
+					GeeSet* _tmp16_;
+					const gchar* _tmp17_;
 					GeeList* parents = NULL;
-					const gchar* _tmp18_ = NULL;
-					GeeList* _tmp19_ = NULL;
+					const gchar* _tmp18_;
+					GeeList* _tmp19_;
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_tmp16_ = detected_htags;
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -626,12 +626,12 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 #line 627 "DataImportJob.c"
 					{
 						GeeList* _parent_list = NULL;
-						GeeList* _tmp20_ = NULL;
-						GeeList* _tmp21_ = NULL;
+						GeeList* _tmp20_;
+						GeeList* _tmp21_;
 						gint _parent_size = 0;
-						GeeList* _tmp22_ = NULL;
-						gint _tmp23_ = 0;
-						gint _tmp24_ = 0;
+						GeeList* _tmp22_;
+						gint _tmp23_;
+						gint _tmp24_;
 						gint _parent_index = 0;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						_tmp20_ = parents;
@@ -652,15 +652,15 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						while (TRUE) {
 #line 655 "DataImportJob.c"
-							gint _tmp25_ = 0;
-							gint _tmp26_ = 0;
-							gint _tmp27_ = 0;
+							gint _tmp25_;
+							gint _tmp26_;
+							gint _tmp27_;
 							gchar* parent = NULL;
-							GeeList* _tmp28_ = NULL;
-							gint _tmp29_ = 0;
-							gpointer _tmp30_ = NULL;
-							GeeSet* _tmp31_ = NULL;
-							const gchar* _tmp32_ = NULL;
+							GeeList* _tmp28_;
+							gint _tmp29_;
+							gpointer _tmp30_;
+							GeeSet* _tmp31_;
+							const gchar* _tmp32_;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 							_tmp25_ = _parent_index;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -718,8 +718,8 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (_tmp36_ > 0) {
 #line 721 "DataImportJob.c"
-		GeeSet* _tmp37_ = NULL;
-		HierarchicalTagIndex* _tmp38_ = NULL;
+		GeeSet* _tmp37_;
+		HierarchicalTagIndex* _tmp38_;
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp37_ = detected_htags;
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -748,7 +748,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 
 time_t spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataImportJob* self) {
 	time_t result = 0;
-	time_t _tmp0_ = 0;
+	time_t _tmp0_;
 #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_JOB (self), 0);
 #line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -764,8 +764,8 @@ time_t spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataI
 static gchar* spit_data_imports_data_import_job_real_get_dest_identifier (BatchImportJob* base) {
 	SpitDataImportsDataImportJob * self;
 	gchar* result = NULL;
-	SpitDataImportsDataImportSource* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitDataImportsDataImportSource* _tmp0_;
+	gchar* _tmp1_;
 #line 55 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -783,8 +783,8 @@ static gchar* spit_data_imports_data_import_job_real_get_dest_identifier (BatchI
 static gchar* spit_data_imports_data_import_job_real_get_source_identifier (BatchImportJob* base) {
 	SpitDataImportsDataImportJob * self;
 	gchar* result = NULL;
-	SpitDataImportsDataImportSource* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitDataImportsDataImportSource* _tmp0_;
+	gchar* _tmp1_;
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 60 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -815,8 +815,8 @@ static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImport
 static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJob* base) {
 	SpitDataImportsDataImportJob * self;
 	gchar* result = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
 #line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 68 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -834,11 +834,11 @@ static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJo
 static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* base) {
 	SpitDataImportsDataImportJob * self;
 	gchar* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 72 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -870,8 +870,8 @@ static gpointer _batch_import_job_ref0 (gpointer self) {
 
 static void spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated) {
 	SpitDataImportsDataImportJob * self;
-	BatchImportJob* _tmp0_ = NULL;
-	SpitDataImportsDataImportJob* _tmp1_ = NULL;
+	BatchImportJob* _tmp0_;
+	SpitDataImportsDataImportJob* _tmp1_;
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -888,12 +888,12 @@ static void spit_data_imports_data_import_job_real_set_associated (BatchImportJo
 }
 
 
-static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile** file) {
+static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file) {
 	SpitDataImportsDataImportJob * self;
 	guint64 _vala_filesize = 0ULL;
 	GFile* _vala_file = NULL;
 	gboolean result = FALSE;
-	guint64 _tmp0_ = 0ULL;
+	guint64 _tmp0_;
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -928,21 +928,21 @@ static gboolean spit_data_imports_data_import_job_real_determine_file_size (Batc
 }
 
 
-static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile** file_to_import, gboolean* copy_to_library, GError** error) {
+static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error) {
 	SpitDataImportsDataImportJob * self;
 	GFile* _vala_file_to_import = NULL;
 	gboolean _vala_copy_to_library = FALSE;
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	SpitDataImportsDataImportSource* _tmp2_ = NULL;
-	SpitDataImportsImportableMediaItem* _tmp3_ = NULL;
-	SpitDataImportsImportableMediaItem* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	SpitDataImportsImportableTag** _tmp6_ = NULL;
-	SpitDataImportsImportableTag** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	HierarchicalTagIndex* _tmp8_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	SpitDataImportsDataImportSource* _tmp2_;
+	SpitDataImportsImportableMediaItem* _tmp3_;
+	SpitDataImportsImportableMediaItem* _tmp4_;
+	gint _tmp5_;
+	SpitDataImportsImportableTag** _tmp6_;
+	SpitDataImportsImportableTag** _tmp7_;
+	gint _tmp7__length1;
+	HierarchicalTagIndex* _tmp8_;
 #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1005,44 +1005,44 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	SpitDataImportsDataImportJob * self;
 	gboolean result = FALSE;
 	LibraryPhoto* photo = NULL;
-	MediaSource* _tmp0_ = NULL;
-	LibraryPhoto* _tmp1_ = NULL;
-	LibraryPhoto* _tmp2_ = NULL;
+	MediaSource* _tmp0_;
+	LibraryPhoto* _tmp1_;
+	LibraryPhoto* _tmp2_;
 	SpitDataImportsImportableMediaItem* src_photo = NULL;
-	SpitDataImportsDataImportSource* _tmp3_ = NULL;
-	SpitDataImportsImportableMediaItem* _tmp4_ = NULL;
-	HierarchicalTagIndex* _tmp5_ = NULL;
+	SpitDataImportsDataImportSource* _tmp3_;
+	SpitDataImportsImportableMediaItem* _tmp4_;
+	HierarchicalTagIndex* _tmp5_;
 	SpitDataImportsImportableTag** src_tags = NULL;
-	SpitDataImportsImportableMediaItem* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	SpitDataImportsImportableTag** _tmp19_ = NULL;
-	gint src_tags_length1 = 0;
-	gint _src_tags_size_ = 0;
-	SpitDataImportsImportableTag** _tmp20_ = NULL;
-	gint _tmp20__length1 = 0;
+	SpitDataImportsImportableMediaItem* _tmp17_;
+	gint _tmp18_;
+	SpitDataImportsImportableTag** _tmp19_;
+	gint src_tags_length1;
+	gint _src_tags_size_;
+	SpitDataImportsImportableTag** _tmp20_;
+	gint _tmp20__length1;
 	SpitDataImportsImportableEvent* src_event = NULL;
-	SpitDataImportsImportableMediaItem* _tmp61_ = NULL;
-	SpitDataImportsImportableEvent* _tmp62_ = NULL;
-	SpitDataImportsImportableEvent* _tmp63_ = NULL;
+	SpitDataImportsImportableMediaItem* _tmp61_;
+	SpitDataImportsImportableEvent* _tmp62_;
+	SpitDataImportsImportableEvent* _tmp63_;
 	Rating dst_rating = 0;
 	SpitDataImportsImportableRating* src_rating = NULL;
-	SpitDataImportsImportableMediaItem* _tmp74_ = NULL;
-	SpitDataImportsImportableRating* _tmp75_ = NULL;
-	SpitDataImportsImportableRating* _tmp76_ = NULL;
-	gboolean _tmp77_ = FALSE;
-	LibraryPhoto* _tmp83_ = NULL;
-	Rating _tmp84_ = 0;
+	SpitDataImportsImportableMediaItem* _tmp74_;
+	SpitDataImportsImportableRating* _tmp75_;
+	SpitDataImportsImportableRating* _tmp76_;
+	gboolean _tmp77_;
+	LibraryPhoto* _tmp83_;
+	Rating _tmp84_;
 	gchar* title = NULL;
-	SpitDataImportsImportableMediaItem* _tmp85_ = NULL;
-	gchar* _tmp86_ = NULL;
-	const gchar* _tmp87_ = NULL;
+	SpitDataImportsImportableMediaItem* _tmp85_;
+	gchar* _tmp86_;
+	const gchar* _tmp87_;
 	time_t* date_time = NULL;
-	SpitDataImportsImportableMediaItem* _tmp90_ = NULL;
-	time_t* _tmp91_ = NULL;
-	time_t* _tmp92_ = NULL;
-	LibraryPhoto* _tmp95_ = NULL;
-	BatchImportRoll* _tmp96_ = NULL;
-	ImportID _tmp97_ = {0};
+	SpitDataImportsImportableMediaItem* _tmp90_;
+	time_t* _tmp91_;
+	time_t* _tmp92_;
+	LibraryPhoto* _tmp95_;
+	BatchImportRoll* _tmp96_;
+	ImportID _tmp97_;
 #line 95 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 95 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1079,8 +1079,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	if (_tmp5_ != NULL) {
 #line 1081 "DataImportJob.c"
 		GeeCollection* paths = NULL;
-		HierarchicalTagIndex* _tmp6_ = NULL;
-		GeeCollection* _tmp7_ = NULL;
+		HierarchicalTagIndex* _tmp6_;
+		GeeCollection* _tmp7_;
 #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp6_ = self->priv->detected_htags;
 #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1090,8 +1090,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 1091 "DataImportJob.c"
 		{
 			GeeIterator* _path_it = NULL;
-			GeeCollection* _tmp8_ = NULL;
-			GeeIterator* _tmp9_ = NULL;
+			GeeCollection* _tmp8_;
+			GeeIterator* _tmp9_;
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			_tmp8_ = paths;
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1101,14 +1101,14 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			while (TRUE) {
 #line 1104 "DataImportJob.c"
-				GeeIterator* _tmp10_ = NULL;
-				gboolean _tmp11_ = FALSE;
+				GeeIterator* _tmp10_;
+				gboolean _tmp11_;
 				gchar* path = NULL;
-				GeeIterator* _tmp12_ = NULL;
-				gpointer _tmp13_ = NULL;
-				const gchar* _tmp14_ = NULL;
-				Tag* _tmp15_ = NULL;
-				Tag* _tmp16_ = NULL;
+				GeeIterator* _tmp12_;
+				gpointer _tmp13_;
+				const gchar* _tmp14_;
+				Tag* _tmp15_;
+				Tag* _tmp16_;
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_tmp10_ = _path_it;
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1172,7 +1172,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		for (src_tag_it = 0; src_tag_it < _tmp20__length1; src_tag_it = src_tag_it + 1) {
 #line 1175 "DataImportJob.c"
-			SpitDataImportsImportableTag* _tmp21_ = NULL;
+			SpitDataImportsImportableTag* _tmp21_;
 			SpitDataImportsImportableTag* src_tag = NULL;
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			_tmp21_ = _g_object_ref0 (src_tag_collection[src_tag_it]);
@@ -1181,18 +1181,18 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 1182 "DataImportJob.c"
 			{
 				gchar* prepped = NULL;
-				SpitDataImportsImportableTag* _tmp22_ = NULL;
-				gint _tmp23_ = 0;
-				gchar** _tmp24_ = NULL;
-				gchar** _tmp25_ = NULL;
-				gint _tmp25__length1 = 0;
-				gint _tmp26_ = 0;
-				gchar** _tmp27_ = NULL;
-				gchar** _tmp28_ = NULL;
-				gint _tmp28__length1 = 0;
-				gchar* _tmp29_ = NULL;
-				gchar* _tmp30_ = NULL;
-				const gchar* _tmp31_ = NULL;
+				SpitDataImportsImportableTag* _tmp22_;
+				gint _tmp23_;
+				gchar** _tmp24_;
+				gchar** _tmp25_;
+				gint _tmp25__length1;
+				gint _tmp26_;
+				gchar** _tmp27_;
+				gchar** _tmp28_;
+				gint _tmp28__length1;
+				gchar* _tmp29_;
+				gchar* _tmp30_;
+				const gchar* _tmp31_;
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_tmp22_ = src_tag;
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1222,16 +1222,16 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				if (_tmp31_ != NULL) {
 #line 1225 "DataImportJob.c"
-					const gchar* _tmp32_ = NULL;
-					GeeList* _tmp33_ = NULL;
-					GeeList* _tmp34_ = NULL;
-					gint _tmp35_ = 0;
-					gint _tmp36_ = 0;
-					gboolean _tmp37_ = FALSE;
-					const gchar* _tmp57_ = NULL;
-					Tag* _tmp58_ = NULL;
-					Tag* _tmp59_ = NULL;
-					LibraryPhoto* _tmp60_ = NULL;
+					const gchar* _tmp32_;
+					GeeList* _tmp33_;
+					GeeList* _tmp34_;
+					gint _tmp35_;
+					gint _tmp36_;
+					gboolean _tmp37_;
+					const gchar* _tmp57_;
+					Tag* _tmp58_;
+					Tag* _tmp59_;
+					LibraryPhoto* _tmp60_;
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_tmp32_ = prepped;
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1249,8 +1249,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					if (_tmp37_) {
 #line 1252 "DataImportJob.c"
-						const gchar* _tmp38_ = NULL;
-						gboolean _tmp39_ = FALSE;
+						const gchar* _tmp38_;
+						gboolean _tmp39_;
 #line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						_tmp38_ = prepped;
 #line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1258,8 +1258,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						if (_tmp39_) {
 #line 1261 "DataImportJob.c"
-							const gchar* _tmp40_ = NULL;
-							gchar* _tmp41_ = NULL;
+							const gchar* _tmp40_;
+							gchar* _tmp41_;
 #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 							_tmp40_ = prepped;
 #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1272,20 +1272,20 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 						}
 					} else {
 						GeeList* parents = NULL;
-						const gchar* _tmp42_ = NULL;
-						GeeList* _tmp43_ = NULL;
-						GeeList* _tmp44_ = NULL;
-						gint _tmp45_ = 0;
-						gint _tmp46_ = 0;
+						const gchar* _tmp42_;
+						GeeList* _tmp43_;
+						GeeList* _tmp44_;
+						gint _tmp45_;
+						gint _tmp46_;
 						gchar* top_level_parent = NULL;
-						GeeList* _tmp47_ = NULL;
-						gpointer _tmp48_ = NULL;
+						GeeList* _tmp47_;
+						gpointer _tmp48_;
 						gchar* flat_top_level_parent = NULL;
-						const gchar* _tmp49_ = NULL;
-						gchar* _tmp50_ = NULL;
-						TagSourceCollection* _tmp51_ = NULL;
-						const gchar* _tmp52_ = NULL;
-						gboolean _tmp53_ = FALSE;
+						const gchar* _tmp49_;
+						gchar* _tmp50_;
+						TagSourceCollection* _tmp51_;
+						const gchar* _tmp52_;
+						gboolean _tmp53_;
 #line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						_tmp42_ = prepped;
 #line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1321,9 +1321,9 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						if (_tmp53_) {
 #line 1324 "DataImportJob.c"
-							const gchar* _tmp54_ = NULL;
-							Tag* _tmp55_ = NULL;
-							Tag* _tmp56_ = NULL;
+							const gchar* _tmp54_;
+							Tag* _tmp55_;
+							Tag* _tmp56_;
 #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 							_tmp54_ = flat_top_level_parent;
 #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1378,12 +1378,12 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	if (_tmp63_ != NULL) {
 #line 1380 "DataImportJob.c"
 		gchar* prepped = NULL;
-		SpitDataImportsImportableEvent* _tmp64_ = NULL;
-		gchar* _tmp65_ = NULL;
-		gchar* _tmp66_ = NULL;
-		gchar* _tmp67_ = NULL;
-		gchar* _tmp68_ = NULL;
-		const gchar* _tmp69_ = NULL;
+		SpitDataImportsImportableEvent* _tmp64_;
+		gchar* _tmp65_;
+		gchar* _tmp66_;
+		gchar* _tmp67_;
+		gchar* _tmp68_;
+		const gchar* _tmp69_;
 #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp64_ = src_event;
 #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1403,10 +1403,10 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		if (_tmp69_ != NULL) {
 #line 1406 "DataImportJob.c"
-			LibraryPhoto* _tmp70_ = NULL;
-			BatchImportRoll* _tmp71_ = NULL;
-			ViewCollection* _tmp72_ = NULL;
-			const gchar* _tmp73_ = NULL;
+			LibraryPhoto* _tmp70_;
+			BatchImportRoll* _tmp71_;
+			ViewCollection* _tmp72_;
+			const gchar* _tmp73_;
 #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			_tmp70_ = photo;
 #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1439,8 +1439,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 		dst_rating = RATING_REJECTED;
 #line 1441 "DataImportJob.c"
 	} else {
-		SpitDataImportsImportableRating* _tmp78_ = NULL;
-		gboolean _tmp79_ = FALSE;
+		SpitDataImportsImportableRating* _tmp78_;
+		gboolean _tmp79_;
 #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp78_ = src_rating;
 #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1451,9 +1451,9 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 			dst_rating = RATING_UNRATED;
 #line 1453 "DataImportJob.c"
 		} else {
-			SpitDataImportsImportableRating* _tmp80_ = NULL;
-			gint _tmp81_ = 0;
-			Rating _tmp82_ = 0;
+			SpitDataImportsImportableRating* _tmp80_;
+			gint _tmp81_;
+			Rating _tmp82_;
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			_tmp80_ = src_rating;
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1482,8 +1482,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (_tmp87_ != NULL) {
 #line 1485 "DataImportJob.c"
-		LibraryPhoto* _tmp88_ = NULL;
-		const gchar* _tmp89_ = NULL;
+		LibraryPhoto* _tmp88_;
+		const gchar* _tmp89_;
 #line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp88_ = photo;
 #line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1503,8 +1503,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (_tmp92_ != NULL) {
 #line 1506 "DataImportJob.c"
-		LibraryPhoto* _tmp93_ = NULL;
-		time_t* _tmp94_ = NULL;
+		LibraryPhoto* _tmp93_;
+		time_t* _tmp94_;
 #line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp93_ = photo;
 #line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1546,12 +1546,12 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 static gchar** spit_data_imports_data_import_job_build_path_components (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag* tag, int* result_length1) {
 	gchar** result = NULL;
 	GeeList* components = NULL;
-	GeeLinkedList* _tmp0_ = NULL;
-	GeeList* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	gpointer* _tmp15_ = NULL;
-	gchar** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
+	GeeLinkedList* _tmp0_;
+	GeeList* _tmp13_;
+	gint _tmp14_;
+	gpointer* _tmp15_;
+	gchar** _tmp16_;
+	gint _tmp16__length1;
 #line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_JOB (self), NULL);
 #line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1563,8 +1563,8 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 #line 1564 "DataImportJob.c"
 	{
 		SpitDataImportsImportableTag* current_tag = NULL;
-		SpitDataImportsImportableTag* _tmp1_ = NULL;
-		SpitDataImportsImportableTag* _tmp2_ = NULL;
+		SpitDataImportsImportableTag* _tmp1_;
+		SpitDataImportsImportableTag* _tmp2_;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp1_ = tag;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1579,18 +1579,18 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			while (TRUE) {
 #line 1582 "DataImportJob.c"
-				SpitDataImportsImportableTag* _tmp6_ = NULL;
-				GeeList* _tmp7_ = NULL;
-				SpitDataImportsImportableTag* _tmp8_ = NULL;
-				gchar* _tmp9_ = NULL;
-				gchar* _tmp10_ = NULL;
-				gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
+				SpitDataImportsImportableTag* _tmp6_;
+				GeeList* _tmp7_;
+				SpitDataImportsImportableTag* _tmp8_;
+				gchar* _tmp9_;
+				gchar* _tmp10_;
+				gchar* _tmp11_;
+				gchar* _tmp12_;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				if (!_tmp3_) {
 #line 1592 "DataImportJob.c"
-					SpitDataImportsImportableTag* _tmp4_ = NULL;
-					SpitDataImportsImportableTag* _tmp5_ = NULL;
+					SpitDataImportsImportableTag* _tmp4_;
+					SpitDataImportsImportableTag* _tmp5_;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_tmp4_ = current_tag;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1668,23 +1668,23 @@ static void spit_data_imports_data_import_job_class_init (SpitDataImportsDataImp
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	g_type_class_add_private (klass, sizeof (SpitDataImportsDataImportJobPrivate));
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_get_dest_identifier;
+	((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*) (BatchImportJob *)) spit_data_imports_data_import_job_real_get_dest_identifier;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_get_source_identifier;
+	((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*) (BatchImportJob *)) spit_data_imports_data_import_job_real_get_source_identifier;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->is_directory = (gboolean (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_is_directory;
+	((BatchImportJobClass *) klass)->is_directory = (gboolean (*) (BatchImportJob *)) spit_data_imports_data_import_job_real_is_directory;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->get_basename = (gchar* (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_get_basename;
+	((BatchImportJobClass *) klass)->get_basename = (gchar* (*) (BatchImportJob *)) spit_data_imports_data_import_job_real_get_basename;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->get_path = (gchar* (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_get_path;
+	((BatchImportJobClass *) klass)->get_path = (gchar* (*) (BatchImportJob *)) spit_data_imports_data_import_job_real_get_path;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->set_associated = (void (*)(BatchImportJob*, BatchImportJob*)) spit_data_imports_data_import_job_real_set_associated;
+	((BatchImportJobClass *) klass)->set_associated = (void (*) (BatchImportJob *, BatchImportJob*)) spit_data_imports_data_import_job_real_set_associated;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*)(BatchImportJob*, guint64*, GFile**)) spit_data_imports_data_import_job_real_determine_file_size;
+	((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*) (BatchImportJob *, guint64*, GFile* *)) spit_data_imports_data_import_job_real_determine_file_size;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->prepare = (gboolean (*)(BatchImportJob*, GFile**, gboolean*, GError**)) spit_data_imports_data_import_job_real_prepare;
+	((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) spit_data_imports_data_import_job_real_prepare;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->complete = (gboolean (*)(BatchImportJob*, MediaSource*, BatchImportRoll*, GError**)) spit_data_imports_data_import_job_real_complete;
+	((BatchImportJobClass *) klass)->complete = (gboolean (*) (BatchImportJob *, MediaSource*, BatchImportRoll*, GError**)) spit_data_imports_data_import_job_real_complete;
 #line 1689 "DataImportJob.c"
 }
 
@@ -1700,7 +1700,7 @@ static void spit_data_imports_data_import_job_instance_init (SpitDataImportsData
 }
 
 
-static void spit_data_imports_data_import_job_finalize (BatchImportJob* obj) {
+static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj) {
 	SpitDataImportsDataImportJob * self;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c
index 97e9bbd..715b62a 100644
--- a/src/data_imports/DataImportSource.c
+++ b/src/data_imports/DataImportSource.c
@@ -1,4 +1,4 @@
-/* DataImportSource.c generated by valac 0.34.7, the Vala compiler
+/* DataImportSource.c generated by valac 0.36.6, the Vala compiler
  * generated from DataImportSource.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -178,7 +178,7 @@ SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_pho
 gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImportsDataImportSource* self);
 gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format);
 gboolean spit_data_imports_data_import_source_was_backing_file_found (SpitDataImportsDataImportSource* self);
-static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource* obj);
+static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource * obj);
 
 
 static gpointer _g_object_ref0 (gpointer self) {
@@ -204,19 +204,19 @@ static gpointer _photo_preview_ref0 (gpointer self) {
 
 SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct (GType object_type, SpitDataImportsImportableMediaItem* db_photo) {
 	SpitDataImportsDataImportSource* self = NULL;
-	SpitDataImportsImportableMediaItem* _tmp0_ = NULL;
-	SpitDataImportsImportableMediaItem* _tmp1_ = NULL;
+	SpitDataImportsImportableMediaItem* _tmp0_;
+	SpitDataImportsImportableMediaItem* _tmp1_;
 	gchar* folder_path = NULL;
-	SpitDataImportsImportableMediaItem* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	SpitDataImportsImportableMediaItem* _tmp2_;
+	gchar* _tmp3_;
 	gchar* filename = NULL;
-	SpitDataImportsImportableMediaItem* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	SpitDataImportsImportableMediaItem* _tmp4_;
+	gchar* _tmp5_;
 	GFile* photo = NULL;
 	gboolean _tmp6_ = FALSE;
-	const gchar* _tmp7_ = NULL;
+	const gchar* _tmp7_;
 	gboolean _tmp20_ = FALSE;
-	GFile* _tmp21_ = NULL;
+	GFile* _tmp21_;
 	GError * _inner_error_ = NULL;
 #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (db_photo), NULL);
@@ -249,7 +249,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (_tmp7_ != NULL) {
 #line 252 "DataImportSource.c"
-		const gchar* _tmp8_ = NULL;
+		const gchar* _tmp8_;
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp8_ = filename;
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -263,17 +263,17 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (_tmp6_) {
 #line 266 "DataImportSource.c"
-		SpitDataImportsImportableMediaItem* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		GFile* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		SpitDataImportsImportableMediaItem* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		GFile* _tmp17_ = NULL;
-		GFile* _tmp18_ = NULL;
-		gboolean _tmp19_ = FALSE;
+		SpitDataImportsImportableMediaItem* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+		GFile* _tmp12_;
+		GFile* _tmp13_;
+		SpitDataImportsImportableMediaItem* _tmp14_;
+		gchar* _tmp15_;
+		gchar* _tmp16_;
+		GFile* _tmp17_;
+		GFile* _tmp18_;
+		gboolean _tmp19_;
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp9_ = db_photo;
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -319,7 +319,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (_tmp21_ != NULL) {
 #line 322 "DataImportSource.c"
-		gboolean _tmp22_ = FALSE;
+		gboolean _tmp22_;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp22_ = self->priv->backing_file_found;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -334,27 +334,27 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 	if (_tmp20_) {
 #line 336 "DataImportSource.c"
 		PhotoMetadata* metadata = NULL;
-		PhotoMetadata* _tmp23_ = NULL;
-		SpitDataImportsImportableMediaItem* _tmp30_ = NULL;
-		gchar* _tmp31_ = NULL;
-		const gchar* _tmp32_ = NULL;
+		PhotoMetadata* _tmp23_;
+		SpitDataImportsImportableMediaItem* _tmp30_;
+		gchar* _tmp31_;
+		const gchar* _tmp32_;
 		time_t* date_time = NULL;
-		SpitDataImportsImportableMediaItem* _tmp38_ = NULL;
-		time_t* _tmp39_ = NULL;
-		time_t* _tmp40_ = NULL;
+		SpitDataImportsImportableMediaItem* _tmp38_;
+		time_t* _tmp39_;
+		time_t* _tmp40_;
 		PhotoPreview* _tmp48_ = NULL;
-		PhotoMetadata* _tmp49_ = NULL;
+		PhotoMetadata* _tmp49_;
 		PhotoPreview* preview = NULL;
-		PhotoPreview* _tmp52_ = NULL;
-		PhotoPreview* _tmp53_ = NULL;
+		PhotoPreview* _tmp52_;
+		PhotoPreview* _tmp53_;
 #line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp23_ = photo_metadata_new ();
 #line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		metadata = _tmp23_;
 #line 355 "DataImportSource.c"
 		{
-			PhotoMetadata* _tmp24_ = NULL;
-			GFile* _tmp25_ = NULL;
+			PhotoMetadata* _tmp24_;
+			GFile* _tmp25_;
 #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_tmp24_ = metadata;
 #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -364,17 +364,17 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 367 "DataImportSource.c"
-				goto __catch217_g_error;
+				goto __catch218_g_error;
 			}
 		}
-		goto __finally217;
-		__catch217_g_error:
+		goto __finally218;
+		__catch218_g_error:
 		{
 			GError* e = NULL;
-			gchar* _tmp26_ = NULL;
-			gchar* _tmp27_ = NULL;
-			GError* _tmp28_ = NULL;
-			const gchar* _tmp29_ = NULL;
+			gchar* _tmp26_;
+			gchar* _tmp27_;
+			GError* _tmp28_;
+			const gchar* _tmp29_;
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			e = _inner_error_;
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -399,7 +399,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_g_error_free0 (e);
 #line 401 "DataImportSource.c"
 		}
-		__finally217:
+		__finally218:
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -432,15 +432,15 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 		if (_tmp32_ == NULL) {
 #line 434 "DataImportSource.c"
 			gchar* _tmp33_ = NULL;
-			PhotoMetadata* _tmp34_ = NULL;
-			gchar* _tmp37_ = NULL;
+			PhotoMetadata* _tmp34_;
+			gchar* _tmp37_;
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_tmp34_ = metadata;
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (_tmp34_ != NULL) {
 #line 442 "DataImportSource.c"
-				PhotoMetadata* _tmp35_ = NULL;
-				gchar* _tmp36_ = NULL;
+				PhotoMetadata* _tmp35_;
+				gchar* _tmp36_;
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				_tmp35_ = metadata;
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -478,8 +478,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (_tmp40_ != NULL) {
 #line 481 "DataImportSource.c"
-			time_t* _tmp41_ = NULL;
-			MetadataDateTime* _tmp42_ = NULL;
+			time_t* _tmp41_;
+			MetadataDateTime* _tmp42_;
 #line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_tmp41_ = date_time;
 #line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -491,15 +491,15 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 492 "DataImportSource.c"
 		} else {
 			MetadataDateTime* _tmp43_ = NULL;
-			PhotoMetadata* _tmp44_ = NULL;
-			MetadataDateTime* _tmp47_ = NULL;
+			PhotoMetadata* _tmp44_;
+			MetadataDateTime* _tmp47_;
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_tmp44_ = metadata;
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (_tmp44_ != NULL) {
 #line 501 "DataImportSource.c"
-				PhotoMetadata* _tmp45_ = NULL;
-				MetadataDateTime* _tmp46_ = NULL;
+				PhotoMetadata* _tmp45_;
+				MetadataDateTime* _tmp46_;
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				_tmp45_ = metadata;
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -531,8 +531,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (_tmp49_ != NULL) {
 #line 534 "DataImportSource.c"
-			PhotoMetadata* _tmp50_ = NULL;
-			PhotoPreview* _tmp51_ = NULL;
+			PhotoMetadata* _tmp50_;
+			PhotoPreview* _tmp51_;
 #line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_tmp50_ = metadata;
 #line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -560,16 +560,16 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 561 "DataImportSource.c"
 			{
 				guint8* preview_raw = NULL;
-				PhotoPreview* _tmp54_ = NULL;
-				gint _tmp55_ = 0;
-				guint8* _tmp56_ = NULL;
-				gint preview_raw_length1 = 0;
-				gint _preview_raw_size_ = 0;
-				guint8* _tmp57_ = NULL;
-				gint _tmp57__length1 = 0;
-				guint8* _tmp58_ = NULL;
-				gint _tmp58__length1 = 0;
-				gchar* _tmp59_ = NULL;
+				PhotoPreview* _tmp54_;
+				gint _tmp55_;
+				guint8* _tmp56_;
+				gint preview_raw_length1;
+				gint _preview_raw_size_;
+				guint8* _tmp57_;
+				gint _tmp57__length1;
+				guint8* _tmp58_;
+				gint _tmp58__length1;
+				gchar* _tmp59_;
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				_tmp54_ = preview;
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -583,7 +583,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 586 "DataImportSource.c"
-					goto __catch218_g_error;
+					goto __catch219_g_error;
 				}
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				_tmp57_ = preview_raw;
@@ -603,14 +603,14 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 				preview_raw = (g_free (preview_raw), NULL);
 #line 605 "DataImportSource.c"
 			}
-			goto __finally218;
-			__catch218_g_error:
+			goto __finally219;
+			__catch219_g_error:
 			{
 				GError* e = NULL;
-				gchar* _tmp60_ = NULL;
-				gchar* _tmp61_ = NULL;
-				GError* _tmp62_ = NULL;
-				const gchar* _tmp63_ = NULL;
+				gchar* _tmp60_;
+				gchar* _tmp61_;
+				GError* _tmp62_;
+				const gchar* _tmp63_;
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				e = _inner_error_;
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -631,7 +631,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 				_g_error_free0 (e);
 #line 633 "DataImportSource.c"
 			}
-			__finally218:
+			__finally219:
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -659,8 +659,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 		}
 		{
 			guint64 _tmp64_ = 0ULL;
-			GFile* _tmp65_ = NULL;
-			guint64 _tmp66_ = 0ULL;
+			GFile* _tmp65_;
+			guint64 _tmp66_;
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_tmp65_ = photo;
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -670,20 +670,20 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 673 "DataImportSource.c"
-				goto __catch219_g_error;
+				goto __catch220_g_error;
 			}
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			self->priv->file_size = _tmp64_;
 #line 678 "DataImportSource.c"
 		}
-		goto __finally219;
-		__catch219_g_error:
+		goto __finally220;
+		__catch220_g_error:
 		{
 			GError* e = NULL;
-			gchar* _tmp67_ = NULL;
-			gchar* _tmp68_ = NULL;
-			GError* _tmp69_ = NULL;
-			const gchar* _tmp70_ = NULL;
+			gchar* _tmp67_;
+			gchar* _tmp68_;
+			GError* _tmp69_;
+			const gchar* _tmp70_;
 #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			e = _inner_error_;
 #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -704,7 +704,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_g_error_free0 (e);
 #line 706 "DataImportSource.c"
 		}
-		__finally219:
+		__finally220:
 #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -731,8 +731,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 		}
 		{
 			time_t _tmp71_ = 0;
-			GFile* _tmp72_ = NULL;
-			time_t _tmp73_ = 0;
+			GFile* _tmp72_;
+			time_t _tmp73_;
 #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_tmp72_ = photo;
 #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -742,20 +742,20 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 745 "DataImportSource.c"
-				goto __catch220_g_error;
+				goto __catch221_g_error;
 			}
 #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			self->priv->modification_time = _tmp71_;
 #line 750 "DataImportSource.c"
 		}
-		goto __finally220;
-		__catch220_g_error:
+		goto __finally221;
+		__catch221_g_error:
 		{
 			GError* e = NULL;
-			gchar* _tmp74_ = NULL;
-			gchar* _tmp75_ = NULL;
-			GError* _tmp76_ = NULL;
-			const gchar* _tmp77_ = NULL;
+			gchar* _tmp74_;
+			gchar* _tmp75_;
+			GError* _tmp76_;
+			const gchar* _tmp77_;
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			e = _inner_error_;
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -776,7 +776,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_g_error_free0 (e);
 #line 778 "DataImportSource.c"
 		}
-		__finally220:
+		__finally221:
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -811,11 +811,11 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 		_media_metadata_unref0 (metadata);
 #line 813 "DataImportSource.c"
 	} else {
-		GFile* _tmp78_ = NULL;
-		gchar* _tmp79_ = NULL;
-		gchar* _tmp80_ = NULL;
-		gchar* _tmp81_ = NULL;
-		gchar* _tmp82_ = NULL;
+		GFile* _tmp78_;
+		gchar* _tmp79_;
+		gchar* _tmp80_;
+		gchar* _tmp81_;
+		gchar* _tmp82_;
 #line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp78_ = photo;
 #line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -855,8 +855,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_new (SpitD
 
 gchar* spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImportSource* self) {
 	gchar* result = NULL;
-	SpitDataImportsImportableMediaItem* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitDataImportsImportableMediaItem* _tmp0_;
+	gchar* _tmp1_;
 #line 89 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
 #line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -873,8 +873,8 @@ gchar* spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImp
 
 gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImportSource* self) {
 	gchar* result = NULL;
-	SpitDataImportsImportableMediaItem* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitDataImportsImportableMediaItem* _tmp0_;
+	gchar* _tmp1_;
 #line 93 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
 #line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -891,14 +891,14 @@ gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImpo
 
 GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportSource* self) {
 	GFile* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	GFile* _tmp7_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	GFile* _tmp6_;
+	GFile* _tmp7_;
 #line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -934,8 +934,8 @@ GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportS
 gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportSource* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
 #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -945,8 +945,8 @@ gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportS
 #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (!_tmp2_) {
 #line 948 "DataImportSource.c"
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
 #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp3_ = self->priv->title;
 #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -957,7 +957,7 @@ gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportS
 		_tmp0_ = _tmp4_;
 #line 959 "DataImportSource.c"
 	} else {
-		gchar* _tmp5_ = NULL;
+		gchar* _tmp5_;
 #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp5_ = spit_data_imports_data_import_source_get_filename (self);
 #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -976,8 +976,8 @@ gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportS
 
 gchar* spit_data_imports_data_import_source_get_title (SpitDataImportsDataImportSource* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -994,10 +994,10 @@ gchar* spit_data_imports_data_import_source_get_title (SpitDataImportsDataImport
 
 PhotoFileFormat spit_data_imports_data_import_source_get_file_format (SpitDataImportsDataImportSource* self) {
 	PhotoFileFormat result = 0;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	PhotoFileFormat _tmp2_ = 0;
-	PhotoFileFormat _tmp3_ = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	PhotoFileFormat _tmp2_;
+	PhotoFileFormat _tmp3_;
 #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), 0);
 #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1020,7 +1020,7 @@ PhotoFileFormat spit_data_imports_data_import_source_get_file_format (SpitDataIm
 
 gchar* spit_data_imports_data_import_source_to_string (SpitDataImportsDataImportSource* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1036,7 +1036,7 @@ gchar* spit_data_imports_data_import_source_to_string (SpitDataImportsDataImport
 time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDataImportSource* self) {
 	time_t result = 0;
 	time_t _tmp0_ = 0;
-	MetadataDateTime* _tmp1_ = NULL;
+	MetadataDateTime* _tmp1_;
 #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), 0);
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1044,8 +1044,8 @@ time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDa
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (_tmp1_ != NULL) {
 #line 1047 "DataImportSource.c"
-		MetadataDateTime* _tmp2_ = NULL;
-		time_t _tmp3_ = 0;
+		MetadataDateTime* _tmp2_;
+		time_t _tmp3_;
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp2_ = self->priv->exposure_time;
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1054,7 +1054,7 @@ time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDa
 		_tmp0_ = _tmp3_;
 #line 1056 "DataImportSource.c"
 	} else {
-		time_t _tmp4_ = 0;
+		time_t _tmp4_;
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp4_ = self->priv->modification_time;
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1071,7 +1071,7 @@ time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDa
 
 guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataImportSource* self) {
 	guint64 result = 0ULL;
-	guint64 _tmp0_ = 0ULL;
+	guint64 _tmp0_;
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), 0ULL);
 #line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1086,8 +1086,8 @@ guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataIm
 
 SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_photo (SpitDataImportsDataImportSource* self) {
 	SpitDataImportsImportableMediaItem* result = NULL;
-	SpitDataImportsImportableMediaItem* _tmp0_ = NULL;
-	SpitDataImportsImportableMediaItem* _tmp1_ = NULL;
+	SpitDataImportsImportableMediaItem* _tmp0_;
+	SpitDataImportsImportableMediaItem* _tmp1_;
 #line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1105,7 +1105,7 @@ SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_pho
 gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImportsDataImportSource* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp1_;
 #line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), FALSE);
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1113,9 +1113,9 @@ gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImpor
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (_tmp1_ != NULL) {
 #line 1116 "DataImportSource.c"
-		const gchar* _tmp2_ = NULL;
-		PhotoFileFormat _tmp3_ = 0;
-		gboolean _tmp4_ = FALSE;
+		const gchar* _tmp2_;
+		PhotoFileFormat _tmp3_;
+		gboolean _tmp4_;
 #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp2_ = self->priv->preview_md5;
 #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1140,7 +1140,7 @@ gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImpor
 
 gboolean spit_data_imports_data_import_source_was_backing_file_found (SpitDataImportsDataImportSource* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), FALSE);
 #line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1195,7 +1195,7 @@ static gchar* spit_data_imports_value_data_import_source_collect_value (GValue*
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (collect_values[0].v_pointer) {
 #line 1198 "DataImportSource.c"
-		SpitDataImportsDataImportSource* object;
+		SpitDataImportsDataImportSource * object;
 		object = collect_values[0].v_pointer;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1222,7 +1222,7 @@ static gchar* spit_data_imports_value_data_import_source_collect_value (GValue*
 
 
 static gchar* spit_data_imports_value_data_import_source_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SpitDataImportsDataImportSource** object_p;
+	SpitDataImportsDataImportSource ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (!object_p) {
@@ -1274,7 +1274,7 @@ gpointer spit_data_imports_value_get_data_import_source (const GValue* value) {
 
 
 void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_object) {
-	SpitDataImportsDataImportSource* old;
+	SpitDataImportsDataImportSource * old;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE));
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1305,7 +1305,7 @@ void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_o
 
 
 void spit_data_imports_value_take_data_import_source (GValue* value, gpointer v_object) {
-	SpitDataImportsDataImportSource* old;
+	SpitDataImportsDataImportSource * old;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE));
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1357,7 +1357,7 @@ static void spit_data_imports_data_import_source_instance_init (SpitDataImportsD
 }
 
 
-static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource* obj) {
+static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource * obj) {
 	SpitDataImportsDataImportSource * self;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE, SpitDataImportsDataImportSource);
@@ -1398,7 +1398,7 @@ GType spit_data_imports_data_import_source_get_type (void) {
 
 
 gpointer spit_data_imports_data_import_source_ref (gpointer instance) {
-	SpitDataImportsDataImportSource* self;
+	SpitDataImportsDataImportSource * self;
 	self = instance;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1409,7 +1409,7 @@ gpointer spit_data_imports_data_import_source_ref (gpointer instance) {
 
 
 void spit_data_imports_data_import_source_unref (gpointer instance) {
-	SpitDataImportsDataImportSource* self;
+	SpitDataImportsDataImportSource * self;
 	self = instance;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
diff --git a/src/data_imports/DataImports.c b/src/data_imports/DataImports.c
index b991c53..34a114f 100644
--- a/src/data_imports/DataImports.c
+++ b/src/data_imports/DataImports.c
@@ -1,4 +1,4 @@
-/* DataImports.c generated by valac 0.34.7, the Vala compiler
+/* DataImports.c generated by valac 0.36.6, the Vala compiler
  * generated from DataImports.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -26,7 +26,7 @@
 
 
 void data_imports_init (GError** error);
-static void _vala_array_add68 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add68 (gchar** * array, int* length, int* size, gchar* value);
 void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1);
 #define RESOURCES_IMPORT "import"
 void data_imports_terminate (void);
@@ -34,7 +34,7 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
-static void _vala_array_add68 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add68 (gchar** * array, int* length, int* size, gchar* value) {
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	if ((*length) == (*size)) {
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
@@ -53,15 +53,14 @@ static void _vala_array_add68 (gchar*** array, int* length, int* size, gchar* va
 
 void data_imports_init (GError** error) {
 	gchar** core_ids = NULL;
-	gchar** _tmp0_ = NULL;
-	gint core_ids_length1 = 0;
-	gint _core_ids_size_ = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
+	gchar** _tmp0_;
+	gint core_ids_length1;
+	gint _core_ids_size_;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar* _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
 #line 19 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	_tmp0_ = g_new0 (gchar*, 0 + 1);
 #line 19 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
@@ -79,16 +78,14 @@ void data_imports_init (GError** error) {
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	_vala_array_add68 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
 #line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
-	_tmp3_ = _ ("Data Imports");
+	_tmp3_ = core_ids;
 #line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
-	_tmp4_ = core_ids;
+	_tmp3__length1 = core_ids_length1;
 #line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
-	_tmp4__length1 = core_ids_length1;
-#line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
-	plugins_register_extension_point (SPIT_DATA_IMPORTS_TYPE_SERVICE, _tmp3_, RESOURCES_IMPORT, _tmp4_, _tmp4__length1);
+	plugins_register_extension_point (SPIT_DATA_IMPORTS_TYPE_SERVICE, _ ("Data Imports"), RESOURCES_IMPORT, _tmp3_, _tmp3__length1);
 #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	core_ids = (_vala_array_free (core_ids, core_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 92 "DataImports.c"
+#line 89 "DataImports.c"
 }
 
 
diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c
index 6fea799..0c9913d 100644
--- a/src/data_imports/DataImportsPluginHost.c
+++ b/src/data_imports/DataImportsPluginHost.c
@@ -1,4 +1,4 @@
-/* DataImportsPluginHost.c generated by valac 0.34.7, the Vala compiler
+/* DataImportsPluginHost.c generated by valac 0.36.6, the Vala compiler
  * generated from DataImportsPluginHost.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -452,11 +452,11 @@ struct _ImportManifestClass {
 
 static gpointer spit_data_imports_core_importer_parent_class = NULL;
 static gpointer spit_data_imports_concrete_data_imports_host_parent_class = NULL;
-static SpitDataImportsPluginHostIface* spit_data_imports_concrete_data_imports_host_spit_data_imports_plugin_host_parent_iface = NULL;
+static SpitDataImportsPluginHostIface * spit_data_imports_concrete_data_imports_host_spit_data_imports_plugin_host_parent_iface = NULL;
 static gpointer spit_data_imports_welcome_data_imports_host_parent_class = NULL;
-static SpitDataImportsPluginHostIface* spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin_host_parent_iface = NULL;
+static SpitDataImportsPluginHostIface * spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin_host_parent_iface = NULL;
 static gpointer spit_data_imports_welcome_import_service_entry_parent_class = NULL;
-static WelcomeServiceEntryIface* spit_data_imports_welcome_import_service_entry_welcome_service_entry_parent_iface = NULL;
+static WelcomeServiceEntryIface * spit_data_imports_welcome_import_service_entry_welcome_service_entry_parent_iface = NULL;
 static gpointer spit_data_imports_welcome_import_meta_host_parent_class = NULL;
 extern ImportManifest* spit_data_imports_meta_manifest;
 ImportManifest* spit_data_imports_meta_manifest = NULL;
@@ -529,7 +529,7 @@ GType library_window_get_type (void) G_GNUC_CONST;
 LibraryWindow* library_window_get_app (void);
 void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel);
 void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporter* self);
-static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter* obj);
+static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter * obj);
 GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST;
 GType spit_data_imports_concrete_data_imports_host_get_type (void) G_GNUC_CONST;
 GType data_imports_ui_data_imports_dialog_get_type (void) G_GNUC_CONST;
@@ -571,7 +571,7 @@ void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* s
 static void spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message);
 static void spit_data_imports_concrete_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message);
 void library_window_switch_to_import_queue_page (LibraryWindow* self);
-static void spit_data_imports_concrete_data_imports_host_finalize (GObject* obj);
+static void spit_data_imports_concrete_data_imports_host_finalize (GObject * obj);
 GType spit_data_imports_welcome_data_imports_host_get_type (void) G_GNUC_CONST;
 GType spit_data_imports_welcome_import_meta_host_get_type (void) G_GNUC_CONST;
 #define SPIT_DATA_IMPORTS_WELCOME_DATA_IMPORTS_HOST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHostPrivate))
@@ -599,7 +599,7 @@ static void spit_data_imports_welcome_data_imports_host_real_update_import_progr
 static void spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message);
 static void spit_data_imports_welcome_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message);
 void spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImportsWelcomeImportMetaHost* self, SpitDataImportsWelcomeDataImportsHost* host);
-static void spit_data_imports_welcome_data_imports_host_finalize (GObject* obj);
+static void spit_data_imports_welcome_data_imports_host_finalize (GObject * obj);
 #define SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, SpitDataImportsWelcomeImportServiceEntryPrivate))
 enum  {
 	SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_DUMMY_PROPERTY
@@ -607,7 +607,7 @@ enum  {
 static SpitDataImportsImportableLibrary** _vala_array_dup25 (SpitDataImportsImportableLibrary** self, int length);
 static gchar* spit_data_imports_welcome_import_service_entry_real_get_service_name (WelcomeServiceEntry* base);
 static void spit_data_imports_welcome_import_service_entry_real_execute (WelcomeServiceEntry* base);
-static void spit_data_imports_welcome_import_service_entry_finalize (GObject* obj);
+static void spit_data_imports_welcome_import_service_entry_finalize (GObject * obj);
 GType welcome_dialog_get_type (void) G_GNUC_CONST;
 #define SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, SpitDataImportsWelcomeImportMetaHostPrivate))
 enum  {
@@ -619,14 +619,14 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp
 SpitDataImportsService** spit_data_imports_load_all_services (int* result_length1);
 gchar* welcome_service_entry_get_service_name (WelcomeServiceEntry* self);
 void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEntry* entry);
-static void spit_data_imports_welcome_import_meta_host_finalize (GObject* obj);
+static void spit_data_imports_welcome_import_meta_host_finalize (GObject * obj);
 SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int* result_length1);
 GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled);
 gchar* plugins_get_pluggable_module_id (SpitPluggable* needle);
-static void _vala_array_add69 (SpitDataImportsService*** array, int* length, int* size, SpitDataImportsService* value);
-static gint __lambda22_ (void* a, void* b);
+static void _vala_array_add69 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value);
+static gint __lambda23_ (void* a, void* b);
 gint utf8_cs_compare (void* a, void* b);
-static gint ___lambda22____compar_fn_t (void* key1, void* key2);
+static gint ___lambda23____compar_fn_t (void* key1, void* key2);
 GType data_object_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
@@ -657,7 +657,7 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 
 SpitDataImportsCoreImporter* spit_data_imports_core_importer_construct (GType object_type, SpitDataImportsPluginHost* host) {
 	SpitDataImportsCoreImporter* self = NULL;
-	SpitDataImportsPluginHost* _tmp0_ = NULL;
+	SpitDataImportsPluginHost* _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (host), NULL);
 #line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -703,28 +703,28 @@ static void _spit_data_imports_data_import_reporter_batch_import_import_reporter
 
 
 void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImportsCoreImporter* self, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message) {
-	SpitDataImportsPluginHost* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	const gchar* _tmp2_ = NULL;
+	SpitDataImportsPluginHost* _tmp0_;
+	gdouble _tmp1_;
+	const gchar* _tmp2_;
 	SortedList* jobs = NULL;
-	SortedList* _tmp3_ = NULL;
+	SortedList* _tmp3_;
 	GeeArrayList* already_imported = NULL;
-	GeeArrayList* _tmp4_ = NULL;
+	GeeArrayList* _tmp4_;
 	GeeArrayList* failed = NULL;
-	GeeArrayList* _tmp5_ = NULL;
+	GeeArrayList* _tmp5_;
 	gint item_idx = 0;
 	gdouble item_progress_delta = 0.0;
-	gdouble _tmp6_ = 0.0;
-	SpitDataImportsImportableMediaItem** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	SpitDataImportsImportableMediaItem** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	SortedList* _tmp39_ = NULL;
-	gint _tmp40_ = 0;
-	gint _tmp41_ = 0;
-	SpitDataImportsPluginHost* _tmp66_ = NULL;
-	gdouble _tmp67_ = 0.0;
-	gdouble _tmp68_ = 0.0;
+	gdouble _tmp6_;
+	SpitDataImportsImportableMediaItem** _tmp7_;
+	gint _tmp7__length1;
+	SpitDataImportsImportableMediaItem** _tmp8_;
+	gint _tmp8__length1;
+	SortedList* _tmp39_;
+	gint _tmp40_;
+	gint _tmp41_;
+	SpitDataImportsPluginHost* _tmp65_;
+	gdouble _tmp66_;
+	gdouble _tmp67_;
 #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_CORE_IMPORTER (self));
 #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -774,7 +774,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		for (src_item_it = 0; src_item_it < _tmp8__length1; src_item_it = src_item_it + 1) {
 #line 777 "DataImportsPluginHost.c"
-			SpitDataImportsImportableMediaItem* _tmp9_ = NULL;
+			SpitDataImportsImportableMediaItem* _tmp9_;
 			SpitDataImportsImportableMediaItem* src_item = NULL;
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp9_ = _g_object_ref0 (src_item_collection[src_item_it]);
@@ -783,21 +783,21 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 #line 784 "DataImportsPluginHost.c"
 			{
 				SpitDataImportsDataImportSource* import_source = NULL;
-				SpitDataImportsImportableMediaItem* _tmp10_ = NULL;
-				SpitDataImportsDataImportSource* _tmp11_ = NULL;
-				SpitDataImportsDataImportSource* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
-				SpitDataImportsDataImportSource* _tmp21_ = NULL;
-				gboolean _tmp22_ = FALSE;
-				SortedList* _tmp30_ = NULL;
-				SpitDataImportsDataImportSource* _tmp31_ = NULL;
-				SpitDataImportsDataImportJob* _tmp32_ = NULL;
-				SpitDataImportsDataImportJob* _tmp33_ = NULL;
-				gint _tmp34_ = 0;
-				SpitDataImportsPluginHost* _tmp35_ = NULL;
-				gdouble _tmp36_ = 0.0;
-				gint _tmp37_ = 0;
-				gdouble _tmp38_ = 0.0;
+				SpitDataImportsImportableMediaItem* _tmp10_;
+				SpitDataImportsDataImportSource* _tmp11_;
+				SpitDataImportsDataImportSource* _tmp12_;
+				gboolean _tmp13_;
+				SpitDataImportsDataImportSource* _tmp21_;
+				gboolean _tmp22_;
+				SortedList* _tmp30_;
+				SpitDataImportsDataImportSource* _tmp31_;
+				SpitDataImportsDataImportJob* _tmp32_;
+				SpitDataImportsDataImportJob* _tmp33_;
+				gint _tmp34_;
+				SpitDataImportsPluginHost* _tmp35_;
+				gdouble _tmp36_;
+				gint _tmp37_;
+				gdouble _tmp38_;
 #line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_tmp10_ = src_item;
 #line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -811,13 +811,13 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 #line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				if (!_tmp13_) {
 #line 814 "DataImportsPluginHost.c"
-					SpitDataImportsDataImportSource* _tmp14_ = NULL;
-					gchar* _tmp15_ = NULL;
-					gchar* _tmp16_ = NULL;
-					GeeArrayList* _tmp17_ = NULL;
-					SpitDataImportsDataImportSource* _tmp18_ = NULL;
-					SpitDataImportsDataImportJob* _tmp19_ = NULL;
-					SpitDataImportsDataImportJob* _tmp20_ = NULL;
+					SpitDataImportsDataImportSource* _tmp14_;
+					gchar* _tmp15_;
+					gchar* _tmp16_;
+					GeeArrayList* _tmp17_;
+					SpitDataImportsDataImportSource* _tmp18_;
+					SpitDataImportsDataImportJob* _tmp19_;
+					SpitDataImportsDataImportJob* _tmp20_;
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 					_tmp14_ = import_source;
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -856,13 +856,13 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				if (_tmp22_) {
 #line 858 "DataImportsPluginHost.c"
-					SpitDataImportsDataImportSource* _tmp23_ = NULL;
-					gchar* _tmp24_ = NULL;
-					gchar* _tmp25_ = NULL;
-					GeeArrayList* _tmp26_ = NULL;
-					SpitDataImportsDataImportSource* _tmp27_ = NULL;
-					SpitDataImportsDataImportJob* _tmp28_ = NULL;
-					SpitDataImportsDataImportJob* _tmp29_ = NULL;
+					SpitDataImportsDataImportSource* _tmp23_;
+					gchar* _tmp24_;
+					gchar* _tmp25_;
+					GeeArrayList* _tmp26_;
+					SpitDataImportsDataImportSource* _tmp27_;
+					SpitDataImportsDataImportJob* _tmp28_;
+					SpitDataImportsDataImportJob* _tmp29_;
 #line 47 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 					_tmp23_ = import_source;
 #line 47 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -937,194 +937,188 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp41_ > 0) {
 #line 938 "DataImportsPluginHost.c"
-		BatchImportRoll* _tmp42_ = NULL;
+		BatchImportRoll* _tmp42_;
 		gchar* db_name = NULL;
-		const gchar* _tmp44_ = NULL;
-		SpitDataImportsPluginHost* _tmp45_ = NULL;
-		SpitDataImportsDataImporter* _tmp46_ = NULL;
-		SpitDataImportsDataImporter* _tmp47_ = NULL;
-		SpitDataImportsService* _tmp48_ = NULL;
-		SpitDataImportsService* _tmp49_ = NULL;
-		const gchar* _tmp50_ = NULL;
-		gchar* _tmp51_ = NULL;
-		gchar* _tmp52_ = NULL;
+		SpitDataImportsPluginHost* _tmp44_;
+		SpitDataImportsDataImporter* _tmp45_;
+		SpitDataImportsDataImporter* _tmp46_;
+		SpitDataImportsService* _tmp47_;
+		SpitDataImportsService* _tmp48_;
+		const gchar* _tmp49_;
+		gchar* _tmp50_;
+		gchar* _tmp51_;
 		BatchImport* batch_import = NULL;
-		SortedList* _tmp53_ = NULL;
-		const gchar* _tmp54_ = NULL;
-		GeeArrayList* _tmp55_ = NULL;
-		GeeArrayList* _tmp56_ = NULL;
-		BatchImportRoll* _tmp57_ = NULL;
-		BatchImport* _tmp58_ = NULL;
-		LibraryWindow* _tmp59_ = NULL;
-		LibraryWindow* _tmp60_ = NULL;
-		BatchImport* _tmp61_ = NULL;
-		gint _tmp62_ = 0;
-		SortedList* _tmp63_ = NULL;
-		gint _tmp64_ = 0;
-		gint _tmp65_ = 0;
+		SortedList* _tmp52_;
+		const gchar* _tmp53_;
+		GeeArrayList* _tmp54_;
+		GeeArrayList* _tmp55_;
+		BatchImportRoll* _tmp56_;
+		BatchImport* _tmp57_;
+		LibraryWindow* _tmp58_;
+		LibraryWindow* _tmp59_;
+		BatchImport* _tmp60_;
+		gint _tmp61_;
+		SortedList* _tmp62_;
+		gint _tmp63_;
+		gint _tmp64_;
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp42_ = self->current_import_roll;
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		if (_tmp42_ == NULL) {
-#line 968 "DataImportsPluginHost.c"
-			BatchImportRoll* _tmp43_ = NULL;
+#line 967 "DataImportsPluginHost.c"
+			BatchImportRoll* _tmp43_;
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp43_ = batch_import_roll_new ();
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_batch_import_roll_unref0 (self->current_import_roll);
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			self->current_import_roll = _tmp43_;
-#line 976 "DataImportsPluginHost.c"
+#line 975 "DataImportsPluginHost.c"
 		}
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp44_ = _ ("%s Database");
+		_tmp44_ = self->priv->host;
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp45_ = self->priv->host;
+		_tmp45_ = spit_data_imports_plugin_host_get_data_importer (_tmp44_);
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp46_ = spit_data_imports_plugin_host_get_data_importer (_tmp45_);
+		_tmp46_ = _tmp45_;
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp47_ = _tmp46_;
+		_tmp47_ = spit_data_imports_data_importer_get_service (_tmp46_);
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp48_ = spit_data_imports_data_importer_get_service (_tmp47_);
+		_tmp48_ = _tmp47_;
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp49_ = _tmp48_;
+		_tmp49_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp50_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+		_tmp50_ = g_strdup_printf (_ ("%s Database"), _tmp49_);
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp51_ = g_strdup_printf (_tmp44_, _tmp50_);
+		_tmp51_ = _tmp50_;
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp52_ = _tmp51_;
+		_g_object_unref0 (_tmp48_);
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_g_object_unref0 (_tmp49_);
+		_g_object_unref0 (_tmp46_);
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_g_object_unref0 (_tmp47_);
-#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		db_name = _tmp52_;
+		db_name = _tmp51_;
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp53_ = jobs;
+		_tmp52_ = jobs;
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp54_ = db_name;
+		_tmp53_ = db_name;
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp55_ = failed;
+		_tmp54_ = failed;
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp56_ = already_imported;
+		_tmp55_ = already_imported;
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp57_ = self->current_import_roll;
+		_tmp56_ = self->current_import_roll;
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp58_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ITERABLE, GeeIterable), _tmp54_, _spit_data_imports_data_import_reporter_batch_import_import_reporter, NULL, _tmp55_, _tmp56_, NULL, _tmp57_, NULL);
+		_tmp57_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ITERABLE, GeeIterable), _tmp53_, _spit_data_imports_data_import_reporter_batch_import_import_reporter, NULL, _tmp54_, _tmp55_, NULL, _tmp56_, NULL);
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		batch_import = _tmp58_;
+		batch_import = _tmp57_;
 #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp59_ = library_window_get_app ();
+		_tmp58_ = library_window_get_app ();
 #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp60_ = _tmp59_;
+		_tmp59_ = _tmp58_;
 #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp61_ = batch_import;
+		_tmp60_ = batch_import;
 #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		library_window_enqueue_batch_import (_tmp60_, _tmp61_, TRUE);
+		library_window_enqueue_batch_import (_tmp59_, _tmp60_, TRUE);
 #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_g_object_unref0 (_tmp60_);
+		_g_object_unref0 (_tmp59_);
 #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp62_ = self->imported_items_count;
+		_tmp61_ = self->imported_items_count;
 #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp63_ = jobs;
+		_tmp62_ = jobs;
 #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp64_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp63_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp65_ = _tmp64_;
+		_tmp64_ = _tmp63_;
 #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		self->imported_items_count = _tmp62_ + _tmp65_;
+		self->imported_items_count = _tmp61_ + _tmp64_;
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (batch_import);
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_free0 (db_name);
-#line 1040 "DataImportsPluginHost.c"
+#line 1037 "DataImportsPluginHost.c"
 	}
 #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp66_ = self->priv->host;
+	_tmp65_ = self->priv->host;
 #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp67_ = progress;
+	_tmp66_ = progress;
 #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp68_ = host_progress_delta;
+	_tmp67_ = host_progress_delta;
 #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_plugin_host_update_import_progress_pane (_tmp66_, _tmp67_ + _tmp68_, NULL);
+	spit_data_imports_plugin_host_update_import_progress_pane (_tmp65_, _tmp66_ + _tmp67_, NULL);
 #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (failed);
 #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (already_imported);
 #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (jobs);
-#line 1056 "DataImportsPluginHost.c"
+#line 1053 "DataImportsPluginHost.c"
 }
 
 
 void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporter* self) {
 	gchar* db_name = NULL;
-	const gchar* _tmp0_ = NULL;
-	SpitDataImportsPluginHost* _tmp1_ = NULL;
-	SpitDataImportsDataImporter* _tmp2_ = NULL;
-	SpitDataImportsDataImporter* _tmp3_ = NULL;
-	SpitDataImportsService* _tmp4_ = NULL;
-	SpitDataImportsService* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	SpitDataImportsPluginHost* _tmp0_;
+	SpitDataImportsDataImporter* _tmp1_;
+	SpitDataImportsDataImporter* _tmp2_;
+	SpitDataImportsService* _tmp3_;
+	SpitDataImportsService* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
 	BatchImport* batch_import = NULL;
-	GeeArrayList* _tmp9_ = NULL;
-	GeeArrayList* _tmp10_ = NULL;
-	BatchImportRoll* _tmp11_ = NULL;
-	BatchImport* _tmp12_ = NULL;
-	BatchImport* _tmp13_ = NULL;
-	LibraryWindow* _tmp14_ = NULL;
-	LibraryWindow* _tmp15_ = NULL;
+	GeeArrayList* _tmp8_;
+	GeeArrayList* _tmp9_;
+	BatchImportRoll* _tmp10_;
+	BatchImport* _tmp11_;
+	BatchImport* _tmp12_;
+	LibraryWindow* _tmp13_;
+	LibraryWindow* _tmp14_;
 #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_CORE_IMPORTER (self));
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = _ ("%s Database");
-#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = self->priv->host;
+	_tmp0_ = self->priv->host;
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = spit_data_imports_plugin_host_get_data_importer (_tmp1_);
+	_tmp1_ = spit_data_imports_plugin_host_get_data_importer (_tmp0_);
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = spit_data_imports_data_importer_get_service (_tmp3_);
+	_tmp3_ = spit_data_imports_data_importer_get_service (_tmp2_);
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp6_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+	_tmp5_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp7_ = g_strdup_printf (_tmp0_, _tmp6_);
+	_tmp6_ = g_strdup_printf (_ ("%s Database"), _tmp5_);
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp8_ = _tmp7_;
+	_tmp7_ = _tmp6_;
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_object_unref0 (_tmp5_);
+	_g_object_unref0 (_tmp4_);
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_object_unref0 (_tmp3_);
+	_g_object_unref0 (_tmp2_);
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	db_name = _tmp8_;
+	db_name = _tmp7_;
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp9_ = gee_array_list_new (TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
+	_tmp8_ = gee_array_list_new (TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp10_ = _tmp9_;
+	_tmp9_ = _tmp8_;
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp11_ = self->current_import_roll;
+	_tmp10_ = self->current_import_roll;
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp12_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable), db_name, _spit_data_imports_data_import_reporter_batch_import_import_reporter, NULL, NULL, NULL, NULL, _tmp11_, NULL);
+	_tmp11_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable), db_name, _spit_data_imports_data_import_reporter_batch_import_import_reporter, NULL, NULL, NULL, NULL, _tmp10_, NULL);
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp13_ = _tmp12_;
+	_tmp12_ = _tmp11_;
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_object_unref0 (_tmp10_);
+	_g_object_unref0 (_tmp9_);
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	batch_import = _tmp13_;
+	batch_import = _tmp12_;
 #line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp14_ = library_window_get_app ();
+	_tmp13_ = library_window_get_app ();
 #line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp15_ = _tmp14_;
+	_tmp14_ = _tmp13_;
 #line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	library_window_enqueue_batch_import (_tmp15_, batch_import, TRUE);
+	library_window_enqueue_batch_import (_tmp14_, batch_import, TRUE);
 #line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_object_unref0 (_tmp15_);
+	_g_object_unref0 (_tmp14_);
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_batch_import_roll_unref0 (self->current_import_roll);
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1133,14 +1127,14 @@ void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporte
 	_g_object_unref0 (batch_import);
 #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_free0 (db_name);
-#line 1135 "DataImportsPluginHost.c"
+#line 1129 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_value_core_importer_init (GValue* value) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	value->data[0].v_pointer = NULL;
-#line 1142 "DataImportsPluginHost.c"
+#line 1136 "DataImportsPluginHost.c"
 }
 
 
@@ -1149,7 +1143,7 @@ static void spit_data_imports_value_core_importer_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_core_importer_unref (value->data[0].v_pointer);
-#line 1151 "DataImportsPluginHost.c"
+#line 1145 "DataImportsPluginHost.c"
 	}
 }
 
@@ -1159,11 +1153,11 @@ static void spit_data_imports_value_core_importer_copy_value (const GValue* src_
 	if (src_value->data[0].v_pointer) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		dest_value->data[0].v_pointer = spit_data_imports_core_importer_ref (src_value->data[0].v_pointer);
-#line 1161 "DataImportsPluginHost.c"
+#line 1155 "DataImportsPluginHost.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1165 "DataImportsPluginHost.c"
+#line 1159 "DataImportsPluginHost.c"
 	}
 }
 
@@ -1171,66 +1165,66 @@ static void spit_data_imports_value_core_importer_copy_value (const GValue* src_
 static gpointer spit_data_imports_value_core_importer_peek_pointer (const GValue* value) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return value->data[0].v_pointer;
-#line 1173 "DataImportsPluginHost.c"
+#line 1167 "DataImportsPluginHost.c"
 }
 
 
 static gchar* spit_data_imports_value_core_importer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (collect_values[0].v_pointer) {
-#line 1180 "DataImportsPluginHost.c"
-		SpitDataImportsCoreImporter* object;
+#line 1174 "DataImportsPluginHost.c"
+		SpitDataImportsCoreImporter * object;
 		object = collect_values[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1187 "DataImportsPluginHost.c"
+#line 1181 "DataImportsPluginHost.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1191 "DataImportsPluginHost.c"
+#line 1185 "DataImportsPluginHost.c"
 		}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		value->data[0].v_pointer = spit_data_imports_core_importer_ref (object);
-#line 1195 "DataImportsPluginHost.c"
+#line 1189 "DataImportsPluginHost.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		value->data[0].v_pointer = NULL;
-#line 1199 "DataImportsPluginHost.c"
+#line 1193 "DataImportsPluginHost.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return NULL;
-#line 1203 "DataImportsPluginHost.c"
+#line 1197 "DataImportsPluginHost.c"
 }
 
 
 static gchar* spit_data_imports_value_core_importer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SpitDataImportsCoreImporter** object_p;
+	SpitDataImportsCoreImporter ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (!object_p) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1214 "DataImportsPluginHost.c"
+#line 1208 "DataImportsPluginHost.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (!value->data[0].v_pointer) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*object_p = NULL;
-#line 1220 "DataImportsPluginHost.c"
+#line 1214 "DataImportsPluginHost.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1224 "DataImportsPluginHost.c"
+#line 1218 "DataImportsPluginHost.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*object_p = spit_data_imports_core_importer_ref (value->data[0].v_pointer);
-#line 1228 "DataImportsPluginHost.c"
+#line 1222 "DataImportsPluginHost.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return NULL;
-#line 1232 "DataImportsPluginHost.c"
+#line 1226 "DataImportsPluginHost.c"
 }
 
 
@@ -1244,7 +1238,7 @@ GParamSpec* spit_data_imports_param_spec_core_importer (const gchar* name, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return G_PARAM_SPEC (spec);
-#line 1246 "DataImportsPluginHost.c"
+#line 1240 "DataImportsPluginHost.c"
 }
 
 
@@ -1253,12 +1247,12 @@ gpointer spit_data_imports_value_get_core_importer (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER), NULL);
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return value->data[0].v_pointer;
-#line 1255 "DataImportsPluginHost.c"
+#line 1249 "DataImportsPluginHost.c"
 }
 
 
 void spit_data_imports_value_set_core_importer (GValue* value, gpointer v_object) {
-	SpitDataImportsCoreImporter* old;
+	SpitDataImportsCoreImporter * old;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER));
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1273,23 +1267,23 @@ void spit_data_imports_value_set_core_importer (GValue* value, gpointer v_object
 		value->data[0].v_pointer = v_object;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_core_importer_ref (value->data[0].v_pointer);
-#line 1275 "DataImportsPluginHost.c"
+#line 1269 "DataImportsPluginHost.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		value->data[0].v_pointer = NULL;
-#line 1279 "DataImportsPluginHost.c"
+#line 1273 "DataImportsPluginHost.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (old) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_core_importer_unref (old);
-#line 1285 "DataImportsPluginHost.c"
+#line 1279 "DataImportsPluginHost.c"
 	}
 }
 
 
 void spit_data_imports_value_take_core_importer (GValue* value, gpointer v_object) {
-	SpitDataImportsCoreImporter* old;
+	SpitDataImportsCoreImporter * old;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER));
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1302,17 +1296,17 @@ void spit_data_imports_value_take_core_importer (GValue* value, gpointer v_objec
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		value->data[0].v_pointer = v_object;
-#line 1304 "DataImportsPluginHost.c"
+#line 1298 "DataImportsPluginHost.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		value->data[0].v_pointer = NULL;
-#line 1308 "DataImportsPluginHost.c"
+#line 1302 "DataImportsPluginHost.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (old) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_core_importer_unref (old);
-#line 1314 "DataImportsPluginHost.c"
+#line 1308 "DataImportsPluginHost.c"
 	}
 }
 
@@ -1324,7 +1318,7 @@ static void spit_data_imports_core_importer_class_init (SpitDataImportsCoreImpor
 	((SpitDataImportsCoreImporterClass *) klass)->finalize = spit_data_imports_core_importer_finalize;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_type_class_add_private (klass, sizeof (SpitDataImportsCoreImporterPrivate));
-#line 1326 "DataImportsPluginHost.c"
+#line 1320 "DataImportsPluginHost.c"
 }
 
 
@@ -1337,11 +1331,11 @@ static void spit_data_imports_core_importer_instance_init (SpitDataImportsCoreIm
 	self->current_import_roll = NULL;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->ref_count = 1;
-#line 1339 "DataImportsPluginHost.c"
+#line 1333 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter* obj) {
+static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter * obj) {
 	SpitDataImportsCoreImporter * self;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER, SpitDataImportsCoreImporter);
@@ -1349,7 +1343,7 @@ static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporte
 	g_signal_handlers_destroy (self);
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_batch_import_roll_unref0 (self->current_import_roll);
-#line 1351 "DataImportsPluginHost.c"
+#line 1345 "DataImportsPluginHost.c"
 }
 
 
@@ -1368,18 +1362,18 @@ GType spit_data_imports_core_importer_get_type (void) {
 
 
 gpointer spit_data_imports_core_importer_ref (gpointer instance) {
-	SpitDataImportsCoreImporter* self;
+	SpitDataImportsCoreImporter * self;
 	self = instance;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return instance;
-#line 1376 "DataImportsPluginHost.c"
+#line 1370 "DataImportsPluginHost.c"
 }
 
 
 void spit_data_imports_core_importer_unref (gpointer instance) {
-	SpitDataImportsCoreImporter* self;
+	SpitDataImportsCoreImporter * self;
 	self = instance;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1387,18 +1381,18 @@ void spit_data_imports_core_importer_unref (gpointer instance) {
 		SPIT_DATA_IMPORTS_CORE_IMPORTER_GET_CLASS (self)->finalize (self);
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1389 "DataImportsPluginHost.c"
+#line 1383 "DataImportsPluginHost.c"
 	}
 }
 
 
 SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_construct (GType object_type, SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog) {
 	SpitDataImportsConcreteDataImportsHost * self = NULL;
-	SpitDataImportsService* _tmp0_ = NULL;
-	DataImportsUIDataImportsDialog* _tmp1_ = NULL;
-	SpitDataImportsService* _tmp2_ = NULL;
-	SpitDataImportsDataImporter* _tmp3_ = NULL;
-	SpitDataImportsCoreImporter* _tmp4_ = NULL;
+	SpitDataImportsService* _tmp0_;
+	DataImportsUIDataImportsDialog* _tmp1_;
+	SpitDataImportsService* _tmp2_;
+	SpitDataImportsDataImporter* _tmp3_;
+	SpitDataImportsCoreImporter* _tmp4_;
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (service), NULL);
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1427,22 +1421,22 @@ SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_
 	self->priv->core_importer = _tmp4_;
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return self;
-#line 1429 "DataImportsPluginHost.c"
+#line 1423 "DataImportsPluginHost.c"
 }
 
 
 SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_new (SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog) {
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return spit_data_imports_concrete_data_imports_host_construct (SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, service, dialog);
-#line 1436 "DataImportsPluginHost.c"
+#line 1430 "DataImportsPluginHost.c"
 }
 
 
 static SpitDataImportsDataImporter* spit_data_imports_concrete_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base) {
 	SpitDataImportsConcreteDataImportsHost * self;
 	SpitDataImportsDataImporter* result = NULL;
-	SpitDataImportsDataImporter* _tmp0_ = NULL;
-	SpitDataImportsDataImporter* _tmp1_ = NULL;
+	SpitDataImportsDataImporter* _tmp0_;
+	SpitDataImportsDataImporter* _tmp1_;
 #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1453,18 +1447,18 @@ static SpitDataImportsDataImporter* spit_data_imports_concrete_data_imports_host
 	result = _tmp1_;
 #line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 1455 "DataImportsPluginHost.c"
+#line 1449 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_concrete_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base) {
 	SpitDataImportsConcreteDataImportsHost * self;
-	SpitDataImportsDataImporter* _tmp0_ = NULL;
-	SpitDataImportsDataImporter* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	SpitDataImportsDataImporter* _tmp4_ = NULL;
-	SpitDataImportsDataImporter* _tmp5_ = NULL;
+	SpitDataImportsDataImporter* _tmp0_;
+	SpitDataImportsDataImporter* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+	SpitDataImportsDataImporter* _tmp4_;
+	SpitDataImportsDataImporter* _tmp5_;
 #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1481,7 +1475,7 @@ static void spit_data_imports_concrete_data_imports_host_real_start_importing (S
 	if (_tmp3_) {
 #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		return;
-#line 1483 "DataImportsPluginHost.c"
+#line 1477 "DataImportsPluginHost.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_debug ("DataImportsPluginHost.vala:112: ConcreteDataImportsHost.start_importin" \
@@ -1494,16 +1488,16 @@ static void spit_data_imports_concrete_data_imports_host_real_start_importing (S
 	spit_data_imports_data_importer_start (_tmp5_);
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1495 "DataImportsPluginHost.c"
+#line 1489 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_concrete_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base) {
 	SpitDataImportsConcreteDataImportsHost * self;
-	SpitDataImportsDataImporter* _tmp0_ = NULL;
-	SpitDataImportsDataImporter* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	SpitDataImportsDataImporter* _tmp0_;
+	SpitDataImportsDataImporter* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1521,9 +1515,9 @@ static void spit_data_imports_concrete_data_imports_host_real_stop_importing (Sp
 	_g_object_unref0 (_tmp1_);
 #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp3_) {
-#line 1521 "DataImportsPluginHost.c"
-		SpitDataImportsDataImporter* _tmp4_ = NULL;
-		SpitDataImportsDataImporter* _tmp5_ = NULL;
+#line 1515 "DataImportsPluginHost.c"
+		SpitDataImportsDataImporter* _tmp4_;
+		SpitDataImportsDataImporter* _tmp5_;
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1532,13 +1526,13 @@ static void spit_data_imports_concrete_data_imports_host_real_stop_importing (Sp
 		spit_data_imports_data_importer_stop (_tmp5_);
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (_tmp5_);
-#line 1532 "DataImportsPluginHost.c"
+#line 1526 "DataImportsPluginHost.c"
 	}
 #line 123 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_concrete_data_imports_host_clean_up (self);
 #line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->importing_halted = TRUE;
-#line 1538 "DataImportsPluginHost.c"
+#line 1532 "DataImportsPluginHost.c"
 }
 
 
@@ -1549,43 +1543,43 @@ static void spit_data_imports_concrete_data_imports_host_clean_up (SpitDataImpor
 	_g_object_unref0 (self->priv->progress_pane);
 #line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->progress_pane = NULL;
-#line 1549 "DataImportsPluginHost.c"
+#line 1543 "DataImportsPluginHost.c"
 }
 
 
 void spit_data_imports_concrete_data_imports_host_set_button_mode (SpitDataImportsConcreteDataImportsHost* self, SpitDataImportsPluginHostButtonMode mode) {
-	SpitDataImportsPluginHostButtonMode _tmp0_ = 0;
+	SpitDataImportsPluginHostButtonMode _tmp0_;
 #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_CONCRETE_DATA_IMPORTS_HOST (self));
 #line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp0_ = mode;
 #line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp0_ == SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE) {
-#line 1561 "DataImportsPluginHost.c"
-		DataImportsUIDataImportsDialog* _tmp1_ = NULL;
+#line 1555 "DataImportsPluginHost.c"
+		DataImportsUIDataImportsDialog* _tmp1_;
 #line 134 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp1_ = self->priv->dialog;
 #line 134 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp1_);
-#line 1567 "DataImportsPluginHost.c"
+#line 1561 "DataImportsPluginHost.c"
 	} else {
-		SpitDataImportsPluginHostButtonMode _tmp2_ = 0;
+		SpitDataImportsPluginHostButtonMode _tmp2_;
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp2_ = mode;
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		if (_tmp2_ == SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CANCEL) {
-#line 1574 "DataImportsPluginHost.c"
-			DataImportsUIDataImportsDialog* _tmp3_ = NULL;
+#line 1568 "DataImportsPluginHost.c"
+			DataImportsUIDataImportsDialog* _tmp3_;
 #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp3_ = self->priv->dialog;
 #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			data_imports_ui_data_imports_dialog_set_cancel_button_mode (_tmp3_);
-#line 1580 "DataImportsPluginHost.c"
+#line 1574 "DataImportsPluginHost.c"
 		} else {
 #line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			g_error ("DataImportsPluginHost.vala:138: unrecognized button mode enumeration v" \
 "alue");
-#line 1584 "DataImportsPluginHost.c"
+#line 1578 "DataImportsPluginHost.c"
 		}
 	}
 }
@@ -1593,8 +1587,8 @@ void spit_data_imports_concrete_data_imports_host_set_button_mode (SpitDataImpor
 
 static void spit_data_imports_concrete_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, GError* err) {
 	SpitDataImportsConcreteDataImportsHost * self;
-	GError* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	GError* _tmp0_;
+	const gchar* _tmp1_;
 #line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1603,129 +1597,123 @@ static void spit_data_imports_concrete_data_imports_host_real_post_error (SpitDa
 	_tmp1_ = _tmp0_->message;
 #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp1_);
-#line 1602 "DataImportsPluginHost.c"
+#line 1596 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_concrete_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, const gchar* message) {
 	SpitDataImportsConcreteDataImportsHost * self;
 	gchar* msg = NULL;
-	const gchar* _tmp0_ = NULL;
-	SpitDataImportsDataImporter* _tmp1_ = NULL;
-	SpitDataImportsService* _tmp2_ = NULL;
-	SpitDataImportsService* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	DataImportsUIDataImportsDialog* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	DataImportsUIStaticMessagePane* _tmp17_ = NULL;
-	DataImportsUIStaticMessagePane* _tmp18_ = NULL;
-	DataImportsUIDataImportsDialog* _tmp19_ = NULL;
-	DataImportsUIDataImportsDialog* _tmp20_ = NULL;
-	SpitDataImportsDataImporter* _tmp21_ = NULL;
-	SpitDataImportsDataImporter* _tmp22_ = NULL;
+	SpitDataImportsDataImporter* _tmp0_;
+	SpitDataImportsService* _tmp1_;
+	SpitDataImportsService* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	const gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
+	DataImportsUIDataImportsDialog* _tmp13_;
+	const gchar* _tmp14_;
+	DataImportsUIStaticMessagePane* _tmp15_;
+	DataImportsUIStaticMessagePane* _tmp16_;
+	DataImportsUIDataImportsDialog* _tmp17_;
+	DataImportsUIDataImportsDialog* _tmp18_;
+	SpitDataImportsDataImporter* _tmp19_;
+	SpitDataImportsDataImporter* _tmp20_;
 #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (message != NULL);
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = _ ("Importing from %s can’t continue because an error occurred:");
-#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = self->priv->active_importer;
+	_tmp0_ = self->priv->active_importer;
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = spit_data_imports_data_importer_get_service (_tmp1_);
+	_tmp1_ = spit_data_imports_data_importer_get_service (_tmp0_);
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+	_tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp5_ = g_strdup_printf (_tmp0_, _tmp4_);
+	_tmp4_ = g_strdup_printf (_ ("Importing from %s can’t continue because an error occurred:"), _tmp3_);
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_object_unref0 (_tmp3_);
+	_g_object_unref0 (_tmp2_);
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	msg = _tmp6_;
+	msg = _tmp5_;
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp7_ = msg;
+	_tmp6_ = msg;
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp8_ = message;
+	_tmp7_ = message;
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp9_ = g_markup_printf_escaped ("\n\n<i>%s</i>\n\n", _tmp8_);
+	_tmp8_ = g_markup_printf_escaped ("\n\n<i>%s</i>\n\n", _tmp7_);
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp10_ = _tmp9_;
+	_tmp9_ = _tmp8_;
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp11_ = g_strconcat (_tmp7_, _tmp10_, NULL);
+	_tmp10_ = g_strconcat (_tmp6_, _tmp9_, NULL);
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_free0 (msg);
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	msg = _tmp11_;
+	msg = _tmp10_;
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_free0 (_tmp10_);
-#line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp12_ = msg;
+	_g_free0 (_tmp9_);
 #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp13_ = _ ("To try importing from another service, select one from the above menu.");
+	_tmp11_ = msg;
 #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp14_ = g_strconcat (_tmp12_, _tmp13_, NULL);
+	_tmp12_ = g_strconcat (_tmp11_, _ ("To try importing from another service, select one from the above menu."), NULL);
 #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_free0 (msg);
 #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	msg = _tmp14_;
+	msg = _tmp12_;
 #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp15_ = self->priv->dialog;
+	_tmp13_ = self->priv->dialog;
 #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp16_ = msg;
+	_tmp14_ = msg;
 #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp17_ = data_imports_ui_static_message_pane_new_with_pango (_tmp16_);
+	_tmp15_ = data_imports_ui_static_message_pane_new_with_pango (_tmp14_);
 #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp18_ = _tmp17_;
+	_tmp16_ = _tmp15_;
 #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	data_imports_ui_data_imports_dialog_install_pane (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+	data_imports_ui_data_imports_dialog_install_pane (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
 #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_object_unref0 (_tmp18_);
+	_g_object_unref0 (_tmp16_);
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp19_ = self->priv->dialog;
+	_tmp17_ = self->priv->dialog;
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp19_);
+	data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp17_);
 #line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp20_ = self->priv->dialog;
+	_tmp18_ = self->priv->dialog;
 #line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	data_imports_ui_data_imports_dialog_unlock_service (_tmp20_);
+	data_imports_ui_data_imports_dialog_unlock_service (_tmp18_);
 #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp21_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
+	_tmp19_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
 #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp22_ = _tmp21_;
+	_tmp20_ = _tmp19_;
 #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_data_importer_stop (_tmp22_);
+	spit_data_imports_data_importer_stop (_tmp20_);
 #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_object_unref0 (_tmp22_);
+	_g_object_unref0 (_tmp20_);
 #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_concrete_data_imports_host_clean_up (self);
 #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_free0 (msg);
-#line 1712 "DataImportsPluginHost.c"
+#line 1700 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base, SpitDataImportsDialogPane* pane, SpitDataImportsPluginHostButtonMode button_mode) {
 	SpitDataImportsConcreteDataImportsHost * self;
 	gboolean _tmp0_ = FALSE;
-	SpitDataImportsDataImporter* _tmp1_ = NULL;
-	SpitDataImportsDataImporter* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	DataImportsUIDataImportsDialog* _tmp7_ = NULL;
-	SpitDataImportsDialogPane* _tmp8_ = NULL;
-	SpitDataImportsPluginHostButtonMode _tmp9_ = 0;
+	SpitDataImportsDataImporter* _tmp1_;
+	SpitDataImportsDataImporter* _tmp2_;
+	gboolean _tmp3_;
+	DataImportsUIDataImportsDialog* _tmp7_;
+	SpitDataImportsDialogPane* _tmp8_;
+	SpitDataImportsPluginHostButtonMode _tmp9_;
 #line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1745,11 +1733,11 @@ static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pan
 	if (_tmp3_) {
 #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp0_ = TRUE;
-#line 1743 "DataImportsPluginHost.c"
+#line 1731 "DataImportsPluginHost.c"
 	} else {
-		SpitDataImportsDataImporter* _tmp4_ = NULL;
-		SpitDataImportsDataImporter* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		SpitDataImportsDataImporter* _tmp4_;
+		SpitDataImportsDataImporter* _tmp5_;
+		gboolean _tmp6_;
 #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
 #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1760,13 +1748,13 @@ static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pan
 		_tmp0_ = !_tmp6_;
 #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (_tmp5_);
-#line 1758 "DataImportsPluginHost.c"
+#line 1746 "DataImportsPluginHost.c"
 	}
 #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp0_) {
 #line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		return;
-#line 1764 "DataImportsPluginHost.c"
+#line 1752 "DataImportsPluginHost.c"
 	}
 #line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp7_ = self->priv->dialog;
@@ -1778,17 +1766,17 @@ static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pan
 	_tmp9_ = button_mode;
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_concrete_data_imports_host_set_button_mode (self, _tmp9_);
-#line 1776 "DataImportsPluginHost.c"
+#line 1764 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_concrete_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base, const gchar* message, SpitDataImportsPluginHostButtonMode button_mode) {
 	SpitDataImportsConcreteDataImportsHost * self;
-	SpitDataImportsPluginHostButtonMode _tmp0_ = 0;
-	DataImportsUIDataImportsDialog* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	DataImportsUIStaticMessagePane* _tmp3_ = NULL;
-	DataImportsUIStaticMessagePane* _tmp4_ = NULL;
+	SpitDataImportsPluginHostButtonMode _tmp0_;
+	DataImportsUIDataImportsDialog* _tmp1_;
+	const gchar* _tmp2_;
+	DataImportsUIStaticMessagePane* _tmp3_;
+	DataImportsUIStaticMessagePane* _tmp4_;
 #line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1809,15 +1797,15 @@ static void spit_data_imports_concrete_data_imports_host_real_install_static_mes
 	data_imports_ui_data_imports_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
 #line 182 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1807 "DataImportsPluginHost.c"
+#line 1795 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_concrete_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) {
 	SpitDataImportsConcreteDataImportsHost * self;
 	gboolean _tmp0_ = FALSE;
-	SpitDataImportsImportableLibrary** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	SpitDataImportsImportableLibrary** _tmp1_;
+	gint _tmp1__length1;
 #line 185 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 185 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1828,31 +1816,31 @@ static void spit_data_imports_concrete_data_imports_host_real_install_library_se
 	_tmp1__length1 = discovered_libraries_length1;
 #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp1__length1 == 0) {
-#line 1826 "DataImportsPluginHost.c"
-		const gchar* _tmp2_ = NULL;
+#line 1814 "DataImportsPluginHost.c"
+		const gchar* _tmp2_;
 #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp2_ = file_select_label;
 #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 1832 "DataImportsPluginHost.c"
+#line 1820 "DataImportsPluginHost.c"
 	} else {
 #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp0_ = FALSE;
-#line 1836 "DataImportsPluginHost.c"
+#line 1824 "DataImportsPluginHost.c"
 	}
 #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp0_) {
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), "Libraries or file option needed");
-#line 1842 "DataImportsPluginHost.c"
+#line 1830 "DataImportsPluginHost.c"
 	} else {
-		DataImportsUIDataImportsDialog* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		SpitDataImportsImportableLibrary** _tmp5_ = NULL;
-		gint _tmp5__length1 = 0;
-		const gchar* _tmp6_ = NULL;
-		DataImportsUILibrarySelectionPane* _tmp7_ = NULL;
-		DataImportsUILibrarySelectionPane* _tmp8_ = NULL;
+		DataImportsUIDataImportsDialog* _tmp3_;
+		const gchar* _tmp4_;
+		SpitDataImportsImportableLibrary** _tmp5_;
+		gint _tmp5__length1;
+		const gchar* _tmp6_;
+		DataImportsUILibrarySelectionPane* _tmp7_;
+		DataImportsUILibrarySelectionPane* _tmp8_;
 #line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp3_ = self->priv->dialog;
 #line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1871,22 +1859,22 @@ static void spit_data_imports_concrete_data_imports_host_real_install_library_se
 		data_imports_ui_data_imports_dialog_install_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
 #line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (_tmp8_);
-#line 1869 "DataImportsPluginHost.c"
+#line 1857 "DataImportsPluginHost.c"
 	}
 #line 199 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_concrete_data_imports_host_set_button_mode (self, SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 1873 "DataImportsPluginHost.c"
+#line 1861 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_concrete_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base, const gchar* message) {
 	SpitDataImportsConcreteDataImportsHost * self;
-	const gchar* _tmp0_ = NULL;
-	DataImportsUIProgressPane* _tmp1_ = NULL;
-	DataImportsUIDataImportsDialog* _tmp2_ = NULL;
-	DataImportsUIProgressPane* _tmp3_ = NULL;
-	SpitDataImportsCoreImporter* _tmp4_ = NULL;
-	SpitDataImportsCoreImporter* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	DataImportsUIProgressPane* _tmp1_;
+	DataImportsUIDataImportsDialog* _tmp2_;
+	DataImportsUIProgressPane* _tmp3_;
+	SpitDataImportsCoreImporter* _tmp4_;
+	SpitDataImportsCoreImporter* _tmp5_;
 #line 202 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 202 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1917,23 +1905,23 @@ static void spit_data_imports_concrete_data_imports_host_real_install_import_pro
 	_batch_import_roll_unref0 (_tmp5_->current_import_roll);
 #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp5_->current_import_roll = NULL;
-#line 1915 "DataImportsPluginHost.c"
+#line 1903 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_concrete_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base, gdouble progress, const gchar* progress_message) {
 	SpitDataImportsConcreteDataImportsHost * self;
-	DataImportsUIProgressPane* _tmp0_ = NULL;
+	DataImportsUIProgressPane* _tmp0_;
 #line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp0_ = self->priv->progress_pane;
 #line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp0_ != NULL) {
-#line 1928 "DataImportsPluginHost.c"
-		DataImportsUIProgressPane* _tmp1_ = NULL;
-		gdouble _tmp2_ = 0.0;
-		const gchar* _tmp3_ = NULL;
+#line 1916 "DataImportsPluginHost.c"
+		DataImportsUIProgressPane* _tmp1_;
+		gdouble _tmp2_;
+		const gchar* _tmp3_;
 #line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp1_ = self->priv->progress_pane;
 #line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1942,19 +1930,19 @@ static void spit_data_imports_concrete_data_imports_host_real_update_import_prog
 		_tmp3_ = progress_message;
 #line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		data_imports_ui_progress_pane_update_progress (_tmp1_, _tmp2_, _tmp3_);
-#line 1940 "DataImportsPluginHost.c"
+#line 1928 "DataImportsPluginHost.c"
 	}
 }
 
 
 static void spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message) {
 	SpitDataImportsConcreteDataImportsHost * self;
-	SpitDataImportsCoreImporter* _tmp0_ = NULL;
-	SpitDataImportsImportableMediaItem** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
-	const gchar* _tmp4_ = NULL;
+	SpitDataImportsCoreImporter* _tmp0_;
+	SpitDataImportsImportableMediaItem** _tmp1_;
+	gint _tmp1__length1;
+	gdouble _tmp2_;
+	gdouble _tmp3_;
+	const gchar* _tmp4_;
 #line 222 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1971,20 +1959,20 @@ static void spit_data_imports_concrete_data_imports_host_real_prepare_media_item
 	_tmp4_ = progress_message;
 #line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_core_importer_prepare_media_items_for_import (_tmp0_, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_, _tmp4_);
-#line 1969 "DataImportsPluginHost.c"
+#line 1957 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_concrete_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message) {
 	SpitDataImportsConcreteDataImportsHost * self;
-	const gchar* _tmp0_ = NULL;
-	SpitDataImportsCoreImporter* _tmp1_ = NULL;
-	SpitDataImportsImportedItemsCountCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	SpitDataImportsCoreImporter* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	SpitDataImportsCoreImporter* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
+	const gchar* _tmp0_;
+	SpitDataImportsCoreImporter* _tmp1_;
+	SpitDataImportsImportedItemsCountCallback _tmp2_;
+	void* _tmp2__target;
+	SpitDataImportsCoreImporter* _tmp3_;
+	gint _tmp4_;
+	SpitDataImportsCoreImporter* _tmp5_;
+	gint _tmp6_;
 #line 231 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 235 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2013,9 +2001,9 @@ static void spit_data_imports_concrete_data_imports_host_real_finalize_import (S
 	_tmp6_ = _tmp5_->imported_items_count;
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp6_ > 0) {
-#line 2011 "DataImportsPluginHost.c"
-		LibraryWindow* _tmp7_ = NULL;
-		LibraryWindow* _tmp8_ = NULL;
+#line 1999 "DataImportsPluginHost.c"
+		LibraryWindow* _tmp7_;
+		LibraryWindow* _tmp8_;
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp7_ = library_window_get_app ();
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2024,7 +2012,7 @@ static void spit_data_imports_concrete_data_imports_host_real_finalize_import (S
 		library_window_switch_to_import_queue_page (_tmp8_);
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (_tmp8_);
-#line 2022 "DataImportsPluginHost.c"
+#line 2010 "DataImportsPluginHost.c"
 	}
 }
 
@@ -2036,7 +2024,7 @@ static void spit_data_imports_concrete_data_imports_host_class_init (SpitDataImp
 	g_type_class_add_private (klass, sizeof (SpitDataImportsConcreteDataImportsHostPrivate));
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (klass)->finalize = spit_data_imports_concrete_data_imports_host_finalize;
-#line 2034 "DataImportsPluginHost.c"
+#line 2022 "DataImportsPluginHost.c"
 }
 
 
@@ -2044,30 +2032,30 @@ static void spit_data_imports_concrete_data_imports_host_spit_data_imports_plugi
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_concrete_data_imports_host_spit_data_imports_plugin_host_parent_iface = g_type_interface_peek_parent (iface);
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->get_data_importer = (SpitDataImportsDataImporter* (*)(SpitDataImportsPluginHost*)) spit_data_imports_concrete_data_imports_host_real_get_data_importer;
+	iface->get_data_importer = (SpitDataImportsDataImporter* (*) (SpitDataImportsPluginHost *)) spit_data_imports_concrete_data_imports_host_real_get_data_importer;
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->start_importing = (void (*)(SpitDataImportsPluginHost*)) spit_data_imports_concrete_data_imports_host_real_start_importing;
+	iface->start_importing = (void (*) (SpitDataImportsPluginHost *)) spit_data_imports_concrete_data_imports_host_real_start_importing;
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->stop_importing = (void (*)(SpitDataImportsPluginHost*)) spit_data_imports_concrete_data_imports_host_real_stop_importing;
+	iface->stop_importing = (void (*) (SpitDataImportsPluginHost *)) spit_data_imports_concrete_data_imports_host_real_stop_importing;
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->post_error = (void (*)(SpitDataImportsPluginHost*, GError*)) spit_data_imports_concrete_data_imports_host_real_post_error;
+	iface->post_error = (void (*) (SpitDataImportsPluginHost *, GError*)) spit_data_imports_concrete_data_imports_host_real_post_error;
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->post_error_message = (void (*)(SpitDataImportsPluginHost*, const gchar*)) spit_data_imports_concrete_data_imports_host_real_post_error_message;
+	iface->post_error_message = (void (*) (SpitDataImportsPluginHost *, const gchar*)) spit_data_imports_concrete_data_imports_host_real_post_error_message;
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->install_dialog_pane = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsDialogPane*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_concrete_data_imports_host_real_install_dialog_pane;
+	iface->install_dialog_pane = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsDialogPane*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_concrete_data_imports_host_real_install_dialog_pane;
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->install_static_message_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_concrete_data_imports_host_real_install_static_message_pane;
+	iface->install_static_message_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_concrete_data_imports_host_real_install_static_message_pane;
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->install_library_selection_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*, SpitDataImportsImportableLibrary**, int, const gchar*)) spit_data_imports_concrete_data_imports_host_real_install_library_selection_pane;
+	iface->install_library_selection_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*, SpitDataImportsImportableLibrary**, int, const gchar*)) spit_data_imports_concrete_data_imports_host_real_install_library_selection_pane;
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->install_import_progress_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*)) spit_data_imports_concrete_data_imports_host_real_install_import_progress_pane;
+	iface->install_import_progress_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*)) spit_data_imports_concrete_data_imports_host_real_install_import_progress_pane;
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->update_import_progress_pane = (void (*)(SpitDataImportsPluginHost*, gdouble, const gchar*)) spit_data_imports_concrete_data_imports_host_real_update_import_progress_pane;
+	iface->update_import_progress_pane = (void (*) (SpitDataImportsPluginHost *, gdouble, const gchar*)) spit_data_imports_concrete_data_imports_host_real_update_import_progress_pane;
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->prepare_media_items_for_import = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import;
+	iface->prepare_media_items_for_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import;
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->finalize_import = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_concrete_data_imports_host_real_finalize_import;
-#line 2065 "DataImportsPluginHost.c"
+	iface->finalize_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_concrete_data_imports_host_real_finalize_import;
+#line 2053 "DataImportsPluginHost.c"
 }
 
 
@@ -2082,11 +2070,11 @@ static void spit_data_imports_concrete_data_imports_host_instance_init (SpitData
 	self->priv->progress_pane = NULL;
 #line 93 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->importing_halted = FALSE;
-#line 2080 "DataImportsPluginHost.c"
+#line 2068 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_concrete_data_imports_host_finalize (GObject* obj) {
+static void spit_data_imports_concrete_data_imports_host_finalize (GObject * obj) {
 	SpitDataImportsConcreteDataImportsHost * self;
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
@@ -2098,7 +2086,7 @@ static void spit_data_imports_concrete_data_imports_host_finalize (GObject* obj)
 	_spit_data_imports_core_importer_unref0 (self->priv->core_importer);
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (spit_data_imports_concrete_data_imports_host_parent_class)->finalize (obj);
-#line 2096 "DataImportsPluginHost.c"
+#line 2084 "DataImportsPluginHost.c"
 }
 
 
@@ -2118,11 +2106,11 @@ GType spit_data_imports_concrete_data_imports_host_get_type (void) {
 
 SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_construct (GType object_type, SpitDataImportsService* service, SpitDataImportsWelcomeImportMetaHost* meta_host) {
 	SpitDataImportsWelcomeDataImportsHost * self = NULL;
-	SpitDataImportsService* _tmp0_ = NULL;
-	SpitDataImportsService* _tmp1_ = NULL;
-	SpitDataImportsDataImporter* _tmp2_ = NULL;
-	SpitDataImportsCoreImporter* _tmp3_ = NULL;
-	SpitDataImportsWelcomeImportMetaHost* _tmp4_ = NULL;
+	SpitDataImportsService* _tmp0_;
+	SpitDataImportsService* _tmp1_;
+	SpitDataImportsDataImporter* _tmp2_;
+	SpitDataImportsCoreImporter* _tmp3_;
+	SpitDataImportsWelcomeImportMetaHost* _tmp4_;
 #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (service), NULL);
 #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2151,22 +2139,22 @@ SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_ho
 	self->priv->meta_host = _tmp4_;
 #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return self;
-#line 2149 "DataImportsPluginHost.c"
+#line 2137 "DataImportsPluginHost.c"
 }
 
 
 SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_new (SpitDataImportsService* service, SpitDataImportsWelcomeImportMetaHost* meta_host) {
 #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return spit_data_imports_welcome_data_imports_host_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, service, meta_host);
-#line 2156 "DataImportsPluginHost.c"
+#line 2144 "DataImportsPluginHost.c"
 }
 
 
 static SpitDataImportsDataImporter* spit_data_imports_welcome_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base) {
 	SpitDataImportsWelcomeDataImportsHost * self;
 	SpitDataImportsDataImporter* result = NULL;
-	SpitDataImportsDataImporter* _tmp0_ = NULL;
-	SpitDataImportsDataImporter* _tmp1_ = NULL;
+	SpitDataImportsDataImporter* _tmp0_;
+	SpitDataImportsDataImporter* _tmp1_;
 #line 260 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 261 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2177,18 +2165,18 @@ static SpitDataImportsDataImporter* spit_data_imports_welcome_data_imports_host_
 	result = _tmp1_;
 #line 261 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 2175 "DataImportsPluginHost.c"
+#line 2163 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_welcome_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base) {
 	SpitDataImportsWelcomeDataImportsHost * self;
-	SpitDataImportsDataImporter* _tmp0_ = NULL;
-	SpitDataImportsDataImporter* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	SpitDataImportsDataImporter* _tmp4_ = NULL;
-	SpitDataImportsDataImporter* _tmp5_ = NULL;
+	SpitDataImportsDataImporter* _tmp0_;
+	SpitDataImportsDataImporter* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+	SpitDataImportsDataImporter* _tmp4_;
+	SpitDataImportsDataImporter* _tmp5_;
 #line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2205,7 +2193,7 @@ static void spit_data_imports_welcome_data_imports_host_real_start_importing (Sp
 	if (_tmp3_) {
 #line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		return;
-#line 2203 "DataImportsPluginHost.c"
+#line 2191 "DataImportsPluginHost.c"
 	}
 #line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_debug ("DataImportsPluginHost.vala:268: WelcomeDataImportsHost.start_importing" \
@@ -2218,16 +2206,16 @@ static void spit_data_imports_welcome_data_imports_host_real_start_importing (Sp
 	spit_data_imports_data_importer_start (_tmp5_);
 #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (_tmp5_);
-#line 2215 "DataImportsPluginHost.c"
+#line 2203 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_welcome_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base) {
 	SpitDataImportsWelcomeDataImportsHost * self;
-	SpitDataImportsDataImporter* _tmp0_ = NULL;
-	SpitDataImportsDataImporter* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	SpitDataImportsDataImporter* _tmp0_;
+	SpitDataImportsDataImporter* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 273 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 274 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2245,9 +2233,9 @@ static void spit_data_imports_welcome_data_imports_host_real_stop_importing (Spi
 	_g_object_unref0 (_tmp1_);
 #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp3_) {
-#line 2241 "DataImportsPluginHost.c"
-		SpitDataImportsDataImporter* _tmp4_ = NULL;
-		SpitDataImportsDataImporter* _tmp5_ = NULL;
+#line 2229 "DataImportsPluginHost.c"
+		SpitDataImportsDataImporter* _tmp4_;
+		SpitDataImportsDataImporter* _tmp5_;
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2256,27 +2244,27 @@ static void spit_data_imports_welcome_data_imports_host_real_stop_importing (Spi
 		spit_data_imports_data_importer_stop (_tmp5_);
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (_tmp5_);
-#line 2252 "DataImportsPluginHost.c"
+#line 2240 "DataImportsPluginHost.c"
 	}
 #line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_welcome_data_imports_host_clean_up (self);
 #line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->importing_halted = TRUE;
-#line 2258 "DataImportsPluginHost.c"
+#line 2246 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_welcome_data_imports_host_clean_up (SpitDataImportsWelcomeDataImportsHost* self) {
 #line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_DATA_IMPORTS_HOST (self));
-#line 2265 "DataImportsPluginHost.c"
+#line 2253 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_welcome_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, GError* err) {
 	SpitDataImportsWelcomeDataImportsHost * self;
-	GError* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	GError* _tmp0_;
+	const gchar* _tmp1_;
 #line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2285,59 +2273,56 @@ static void spit_data_imports_welcome_data_imports_host_real_post_error (SpitDat
 	_tmp1_ = _tmp0_->message;
 #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp1_);
-#line 2281 "DataImportsPluginHost.c"
+#line 2269 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_welcome_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, const gchar* message) {
 	SpitDataImportsWelcomeDataImportsHost * self;
 	gchar* msg = NULL;
-	const gchar* _tmp0_ = NULL;
-	SpitDataImportsDataImporter* _tmp1_ = NULL;
-	SpitDataImportsService* _tmp2_ = NULL;
-	SpitDataImportsService* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	SpitDataImportsDataImporter* _tmp7_ = NULL;
-	SpitDataImportsDataImporter* _tmp8_ = NULL;
+	SpitDataImportsDataImporter* _tmp0_;
+	SpitDataImportsService* _tmp1_;
+	SpitDataImportsService* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	SpitDataImportsDataImporter* _tmp6_;
+	SpitDataImportsDataImporter* _tmp7_;
 #line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (message != NULL);
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = _ ("Importing from %s can’t continue because an error occurred:");
-#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = self->priv->active_importer;
+	_tmp0_ = self->priv->active_importer;
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = spit_data_imports_data_importer_get_service (_tmp1_);
+	_tmp1_ = spit_data_imports_data_importer_get_service (_tmp0_);
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+	_tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp5_ = g_strdup_printf (_tmp0_, _tmp4_);
+	_tmp4_ = g_strdup_printf (_ ("Importing from %s can’t continue because an error occurred:"), _tmp3_);
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_object_unref0 (_tmp3_);
+	_g_object_unref0 (_tmp2_);
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	msg = _tmp6_;
+	msg = _tmp5_;
 #line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_debug ("DataImportsPluginHost.vala:297: %s", msg);
 #line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp7_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
+	_tmp6_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
 #line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp8_ = _tmp7_;
+	_tmp7_ = _tmp6_;
 #line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_data_importer_stop (_tmp8_);
+	spit_data_imports_data_importer_stop (_tmp7_);
 #line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_object_unref0 (_tmp8_);
+	_g_object_unref0 (_tmp7_);
 #line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_welcome_data_imports_host_clean_up (self);
 #line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_free0 (msg);
-#line 2333 "DataImportsPluginHost.c"
+#line 2318 "DataImportsPluginHost.c"
 }
 
 
@@ -2347,7 +2332,7 @@ static void spit_data_imports_welcome_data_imports_host_real_install_dialog_pane
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 307 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (pane));
-#line 2343 "DataImportsPluginHost.c"
+#line 2328 "DataImportsPluginHost.c"
 }
 
 
@@ -2357,21 +2342,21 @@ static void spit_data_imports_welcome_data_imports_host_real_install_static_mess
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 312 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (message != NULL);
-#line 2353 "DataImportsPluginHost.c"
+#line 2338 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_welcome_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) {
 	SpitDataImportsWelcomeDataImportsHost * self;
-	SpitDataImportsDataImporter* _tmp0_ = NULL;
-	SpitDataImportsDataImporter* _tmp1_ = NULL;
-	SpitDataImportsService* _tmp2_ = NULL;
-	SpitDataImportsService* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	SpitDataImportsImportableLibrary** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
+	SpitDataImportsDataImporter* _tmp0_;
+	SpitDataImportsDataImporter* _tmp1_;
+	SpitDataImportsService* _tmp2_;
+	SpitDataImportsService* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	SpitDataImportsImportableLibrary** _tmp7_;
+	gint _tmp7__length1;
 #line 317 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 317 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2404,17 +2389,17 @@ static void spit_data_imports_welcome_data_imports_host_real_install_library_sel
 	_tmp7__length1 = discovered_libraries_length1;
 #line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp7__length1 > 0) {
-#line 2400 "DataImportsPluginHost.c"
-		SpitDataImportsWelcomeImportMetaHost* _tmp8_ = NULL;
-		SpitDataImportsDataImporter* _tmp9_ = NULL;
-		SpitDataImportsDataImporter* _tmp10_ = NULL;
-		SpitDataImportsService* _tmp11_ = NULL;
-		SpitDataImportsService* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		SpitDataImportsImportableLibrary** _tmp14_ = NULL;
-		gint _tmp14__length1 = 0;
-		SpitDataImportsWelcomeImportServiceEntry* _tmp15_ = NULL;
-		SpitDataImportsWelcomeImportServiceEntry* _tmp16_ = NULL;
+#line 2385 "DataImportsPluginHost.c"
+		SpitDataImportsWelcomeImportMetaHost* _tmp8_;
+		SpitDataImportsDataImporter* _tmp9_;
+		SpitDataImportsDataImporter* _tmp10_;
+		SpitDataImportsService* _tmp11_;
+		SpitDataImportsService* _tmp12_;
+		const gchar* _tmp13_;
+		SpitDataImportsImportableLibrary** _tmp14_;
+		gint _tmp14__length1;
+		SpitDataImportsWelcomeImportServiceEntry* _tmp15_;
+		SpitDataImportsWelcomeImportServiceEntry* _tmp16_;
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp8_ = self->priv->meta_host;
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2443,7 +2428,7 @@ static void spit_data_imports_welcome_data_imports_host_real_install_library_sel
 		_g_object_unref0 (_tmp12_);
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (_tmp10_);
-#line 2439 "DataImportsPluginHost.c"
+#line 2424 "DataImportsPluginHost.c"
 	}
 }
 
@@ -2454,7 +2439,7 @@ static void spit_data_imports_welcome_data_imports_host_real_install_import_prog
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 332 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (message != NULL);
-#line 2450 "DataImportsPluginHost.c"
+#line 2435 "DataImportsPluginHost.c"
 }
 
 
@@ -2462,18 +2447,18 @@ static void spit_data_imports_welcome_data_imports_host_real_update_import_progr
 	SpitDataImportsWelcomeDataImportsHost * self;
 #line 338 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
-#line 2458 "DataImportsPluginHost.c"
+#line 2443 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message) {
 	SpitDataImportsWelcomeDataImportsHost * self;
-	SpitDataImportsCoreImporter* _tmp0_ = NULL;
-	SpitDataImportsImportableMediaItem** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
-	const gchar* _tmp4_ = NULL;
+	SpitDataImportsCoreImporter* _tmp0_;
+	SpitDataImportsImportableMediaItem** _tmp1_;
+	gint _tmp1__length1;
+	gdouble _tmp2_;
+	gdouble _tmp3_;
+	const gchar* _tmp4_;
 #line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2490,18 +2475,18 @@ static void spit_data_imports_welcome_data_imports_host_real_prepare_media_items
 	_tmp4_ = progress_message;
 #line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_core_importer_prepare_media_items_for_import (_tmp0_, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_, _tmp4_);
-#line 2486 "DataImportsPluginHost.c"
+#line 2471 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_welcome_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message) {
 	SpitDataImportsWelcomeDataImportsHost * self;
-	SpitDataImportsCoreImporter* _tmp0_ = NULL;
-	SpitDataImportsImportedItemsCountCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	SpitDataImportsCoreImporter* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	SpitDataImportsWelcomeImportMetaHost* _tmp4_ = NULL;
+	SpitDataImportsCoreImporter* _tmp0_;
+	SpitDataImportsImportedItemsCountCallback _tmp1_;
+	void* _tmp1__target;
+	SpitDataImportsCoreImporter* _tmp2_;
+	gint _tmp3_;
+	SpitDataImportsWelcomeImportMetaHost* _tmp4_;
 #line 354 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2522,7 +2507,7 @@ static void spit_data_imports_welcome_data_imports_host_real_finalize_import (Sp
 	_tmp4_ = self->priv->meta_host;
 #line 360 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_welcome_import_meta_host_finalize_import (_tmp4_, self);
-#line 2518 "DataImportsPluginHost.c"
+#line 2503 "DataImportsPluginHost.c"
 }
 
 
@@ -2533,7 +2518,7 @@ static void spit_data_imports_welcome_data_imports_host_class_init (SpitDataImpo
 	g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeDataImportsHostPrivate));
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_data_imports_host_finalize;
-#line 2529 "DataImportsPluginHost.c"
+#line 2514 "DataImportsPluginHost.c"
 }
 
 
@@ -2541,30 +2526,30 @@ static void spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin_host_parent_iface = g_type_interface_peek_parent (iface);
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->get_data_importer = (SpitDataImportsDataImporter* (*)(SpitDataImportsPluginHost*)) spit_data_imports_welcome_data_imports_host_real_get_data_importer;
+	iface->get_data_importer = (SpitDataImportsDataImporter* (*) (SpitDataImportsPluginHost *)) spit_data_imports_welcome_data_imports_host_real_get_data_importer;
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->start_importing = (void (*)(SpitDataImportsPluginHost*)) spit_data_imports_welcome_data_imports_host_real_start_importing;
+	iface->start_importing = (void (*) (SpitDataImportsPluginHost *)) spit_data_imports_welcome_data_imports_host_real_start_importing;
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->stop_importing = (void (*)(SpitDataImportsPluginHost*)) spit_data_imports_welcome_data_imports_host_real_stop_importing;
+	iface->stop_importing = (void (*) (SpitDataImportsPluginHost *)) spit_data_imports_welcome_data_imports_host_real_stop_importing;
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->post_error = (void (*)(SpitDataImportsPluginHost*, GError*)) spit_data_imports_welcome_data_imports_host_real_post_error;
+	iface->post_error = (void (*) (SpitDataImportsPluginHost *, GError*)) spit_data_imports_welcome_data_imports_host_real_post_error;
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->post_error_message = (void (*)(SpitDataImportsPluginHost*, const gchar*)) spit_data_imports_welcome_data_imports_host_real_post_error_message;
+	iface->post_error_message = (void (*) (SpitDataImportsPluginHost *, const gchar*)) spit_data_imports_welcome_data_imports_host_real_post_error_message;
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->install_dialog_pane = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsDialogPane*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_welcome_data_imports_host_real_install_dialog_pane;
+	iface->install_dialog_pane = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsDialogPane*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_welcome_data_imports_host_real_install_dialog_pane;
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->install_static_message_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_welcome_data_imports_host_real_install_static_message_pane;
+	iface->install_static_message_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_welcome_data_imports_host_real_install_static_message_pane;
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->install_library_selection_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*, SpitDataImportsImportableLibrary**, int, const gchar*)) spit_data_imports_welcome_data_imports_host_real_install_library_selection_pane;
+	iface->install_library_selection_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*, SpitDataImportsImportableLibrary**, int, const gchar*)) spit_data_imports_welcome_data_imports_host_real_install_library_selection_pane;
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->install_import_progress_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*)) spit_data_imports_welcome_data_imports_host_real_install_import_progress_pane;
+	iface->install_import_progress_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*)) spit_data_imports_welcome_data_imports_host_real_install_import_progress_pane;
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->update_import_progress_pane = (void (*)(SpitDataImportsPluginHost*, gdouble, const gchar*)) spit_data_imports_welcome_data_imports_host_real_update_import_progress_pane;
+	iface->update_import_progress_pane = (void (*) (SpitDataImportsPluginHost *, gdouble, const gchar*)) spit_data_imports_welcome_data_imports_host_real_update_import_progress_pane;
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->prepare_media_items_for_import = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import;
+	iface->prepare_media_items_for_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import;
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->finalize_import = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_welcome_data_imports_host_real_finalize_import;
-#line 2560 "DataImportsPluginHost.c"
+	iface->finalize_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_welcome_data_imports_host_real_finalize_import;
+#line 2545 "DataImportsPluginHost.c"
 }
 
 
@@ -2575,11 +2560,11 @@ static void spit_data_imports_welcome_data_imports_host_instance_init (SpitDataI
 	self->priv->active_importer = NULL;
 #line 249 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->importing_halted = FALSE;
-#line 2571 "DataImportsPluginHost.c"
+#line 2556 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_data_imports_host_finalize (GObject* obj) {
+static void spit_data_imports_welcome_data_imports_host_finalize (GObject * obj) {
 	SpitDataImportsWelcomeDataImportsHost * self;
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
@@ -2589,7 +2574,7 @@ static void spit_data_imports_welcome_data_imports_host_finalize (GObject* obj)
 	_spit_data_imports_core_importer_unref0 (self->priv->core_importer);
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (spit_data_imports_welcome_data_imports_host_parent_class)->finalize (obj);
-#line 2585 "DataImportsPluginHost.c"
+#line 2570 "DataImportsPluginHost.c"
 }
 
 
@@ -2614,30 +2599,30 @@ static SpitDataImportsImportableLibrary** _vala_array_dup25 (SpitDataImportsImpo
 	result = g_new0 (SpitDataImportsImportableLibrary*, length + 1);
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	for (i = 0; i < length; i++) {
-#line 2610 "DataImportsPluginHost.c"
-		SpitDataImportsImportableLibrary* _tmp0_ = NULL;
+#line 2595 "DataImportsPluginHost.c"
+		SpitDataImportsImportableLibrary* _tmp0_;
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		result[i] = _tmp0_;
-#line 2616 "DataImportsPluginHost.c"
+#line 2601 "DataImportsPluginHost.c"
 	}
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 2620 "DataImportsPluginHost.c"
+#line 2605 "DataImportsPluginHost.c"
 }
 
 
 SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_construct (GType object_type, SpitDataImportsPluginHost* host, const gchar* pluggable_name, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1) {
 	SpitDataImportsWelcomeImportServiceEntry * self = NULL;
-	SpitDataImportsPluginHost* _tmp0_ = NULL;
-	SpitDataImportsPluginHost* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	SpitDataImportsImportableLibrary** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	SpitDataImportsImportableLibrary** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
+	SpitDataImportsPluginHost* _tmp0_;
+	SpitDataImportsPluginHost* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	SpitDataImportsImportableLibrary** _tmp4_;
+	gint _tmp4__length1;
+	SpitDataImportsImportableLibrary** _tmp5_;
+	gint _tmp5__length1;
 #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (host), NULL);
 #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2678,22 +2663,22 @@ SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_servi
 	self->priv->_discovered_libraries_size_ = self->priv->discovered_libraries_length1;
 #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return self;
-#line 2674 "DataImportsPluginHost.c"
+#line 2659 "DataImportsPluginHost.c"
 }
 
 
 SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_new (SpitDataImportsPluginHost* host, const gchar* pluggable_name, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1) {
 #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return spit_data_imports_welcome_import_service_entry_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, host, pluggable_name, discovered_libraries, discovered_libraries_length1);
-#line 2681 "DataImportsPluginHost.c"
+#line 2666 "DataImportsPluginHost.c"
 }
 
 
 static gchar* spit_data_imports_welcome_import_service_entry_real_get_service_name (WelcomeServiceEntry* base) {
 	SpitDataImportsWelcomeImportServiceEntry * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 381 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, SpitDataImportsWelcomeImportServiceEntry);
 #line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2704,21 +2689,21 @@ static gchar* spit_data_imports_welcome_import_service_entry_real_get_service_na
 	result = _tmp1_;
 #line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 2700 "DataImportsPluginHost.c"
+#line 2685 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_welcome_import_service_entry_real_execute (WelcomeServiceEntry* base) {
 	SpitDataImportsWelcomeImportServiceEntry * self;
-	SpitDataImportsImportableLibrary** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	SpitDataImportsImportableLibrary** _tmp0_;
+	gint _tmp0__length1;
 #line 385 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, SpitDataImportsWelcomeImportServiceEntry);
 #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp0_ = self->priv->discovered_libraries;
 #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp0__length1 = self->priv->discovered_libraries_length1;
-#line 2714 "DataImportsPluginHost.c"
+#line 2699 "DataImportsPluginHost.c"
 	{
 		SpitDataImportsImportableLibrary** library_collection = NULL;
 		gint library_collection_length1 = 0;
@@ -2730,19 +2715,19 @@ static void spit_data_imports_welcome_import_service_entry_real_execute (Welcome
 		library_collection_length1 = _tmp0__length1;
 #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		for (library_it = 0; library_it < _tmp0__length1; library_it = library_it + 1) {
-#line 2726 "DataImportsPluginHost.c"
-			SpitDataImportsImportableLibrary* _tmp1_ = NULL;
+#line 2711 "DataImportsPluginHost.c"
+			SpitDataImportsImportableLibrary* _tmp1_;
 			SpitDataImportsImportableLibrary* library = NULL;
 #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp1_ = _g_object_ref0 (library_collection[library_it]);
 #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			library = _tmp1_;
-#line 2733 "DataImportsPluginHost.c"
+#line 2718 "DataImportsPluginHost.c"
 			{
-				SpitDataImportsPluginHost* _tmp2_ = NULL;
-				SpitDataImportsDataImporter* _tmp3_ = NULL;
-				SpitDataImportsDataImporter* _tmp4_ = NULL;
-				SpitDataImportsImportableLibrary* _tmp5_ = NULL;
+				SpitDataImportsPluginHost* _tmp2_;
+				SpitDataImportsDataImporter* _tmp3_;
+				SpitDataImportsDataImporter* _tmp4_;
+				SpitDataImportsImportableLibrary* _tmp5_;
 #line 387 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_tmp2_ = self->priv->host;
 #line 387 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2757,7 +2742,7 @@ static void spit_data_imports_welcome_import_service_entry_real_execute (Welcome
 				_g_object_unref0 (_tmp4_);
 #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_g_object_unref0 (library);
-#line 2753 "DataImportsPluginHost.c"
+#line 2738 "DataImportsPluginHost.c"
 			}
 		}
 	}
@@ -2771,7 +2756,7 @@ static void spit_data_imports_welcome_import_service_entry_class_init (SpitDataI
 	g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeImportServiceEntryPrivate));
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_import_service_entry_finalize;
-#line 2767 "DataImportsPluginHost.c"
+#line 2752 "DataImportsPluginHost.c"
 }
 
 
@@ -2779,21 +2764,21 @@ static void spit_data_imports_welcome_import_service_entry_welcome_service_entry
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_welcome_import_service_entry_welcome_service_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->get_service_name = (gchar* (*)(WelcomeServiceEntry*)) spit_data_imports_welcome_import_service_entry_real_get_service_name;
+	iface->get_service_name = (gchar* (*) (WelcomeServiceEntry *)) spit_data_imports_welcome_import_service_entry_real_get_service_name;
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	iface->execute = (void (*)(WelcomeServiceEntry*)) spit_data_imports_welcome_import_service_entry_real_execute;
-#line 2778 "DataImportsPluginHost.c"
+	iface->execute = (void (*) (WelcomeServiceEntry *)) spit_data_imports_welcome_import_service_entry_real_execute;
+#line 2763 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_welcome_import_service_entry_instance_init (SpitDataImportsWelcomeImportServiceEntry * self) {
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv = SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_GET_PRIVATE (self);
-#line 2785 "DataImportsPluginHost.c"
+#line 2770 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_import_service_entry_finalize (GObject* obj) {
+static void spit_data_imports_welcome_import_service_entry_finalize (GObject * obj) {
 	SpitDataImportsWelcomeImportServiceEntry * self;
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, SpitDataImportsWelcomeImportServiceEntry);
@@ -2805,7 +2790,7 @@ static void spit_data_imports_welcome_import_service_entry_finalize (GObject* ob
 	_g_object_unref0 (self->priv->host);
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (spit_data_imports_welcome_import_service_entry_parent_class)->finalize (obj);
-#line 2801 "DataImportsPluginHost.c"
+#line 2786 "DataImportsPluginHost.c"
 }
 
 
@@ -2825,8 +2810,8 @@ GType spit_data_imports_welcome_import_service_entry_get_type (void) {
 
 SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_construct (GType object_type, WelcomeDialog* dialog) {
 	SpitDataImportsWelcomeImportMetaHost * self = NULL;
-	WelcomeDialog* _tmp0_ = NULL;
-	WelcomeDialog* _tmp1_ = NULL;
+	WelcomeDialog* _tmp0_;
+	WelcomeDialog* _tmp1_;
 #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_val_if_fail (IS_WELCOME_DIALOG (dialog), NULL);
 #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2841,25 +2826,25 @@ SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host
 	self->priv->dialog = _tmp1_;
 #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return self;
-#line 2837 "DataImportsPluginHost.c"
+#line 2822 "DataImportsPluginHost.c"
 }
 
 
 SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_new (WelcomeDialog* dialog) {
 #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return spit_data_imports_welcome_import_meta_host_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, dialog);
-#line 2844 "DataImportsPluginHost.c"
+#line 2829 "DataImportsPluginHost.c"
 }
 
 
 void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImportMetaHost* self) {
 	SpitDataImportsService** services = NULL;
-	gint _tmp0_ = 0;
-	SpitDataImportsService** _tmp1_ = NULL;
-	gint services_length1 = 0;
-	gint _services_size_ = 0;
-	SpitDataImportsService** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gint _tmp0_;
+	SpitDataImportsService** _tmp1_;
+	gint services_length1;
+	gint _services_size_;
+	SpitDataImportsService** _tmp2_;
+	gint _tmp2__length1;
 #line 399 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST (self));
 #line 400 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2874,7 +2859,7 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp
 	_tmp2_ = services;
 #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp2__length1 = services_length1;
-#line 2870 "DataImportsPluginHost.c"
+#line 2855 "DataImportsPluginHost.c"
 	{
 		SpitDataImportsService** service_collection = NULL;
 		gint service_collection_length1 = 0;
@@ -2886,19 +2871,19 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp
 		service_collection_length1 = _tmp2__length1;
 #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		for (service_it = 0; service_it < _tmp2__length1; service_it = service_it + 1) {
-#line 2882 "DataImportsPluginHost.c"
-			SpitDataImportsService* _tmp3_ = NULL;
+#line 2867 "DataImportsPluginHost.c"
+			SpitDataImportsService* _tmp3_;
 			SpitDataImportsService* service = NULL;
 #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp3_ = _g_object_ref0 (service_collection[service_it]);
 #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			service = _tmp3_;
-#line 2889 "DataImportsPluginHost.c"
+#line 2874 "DataImportsPluginHost.c"
 			{
 				SpitDataImportsWelcomeDataImportsHost* host = NULL;
-				SpitDataImportsService* _tmp4_ = NULL;
-				SpitDataImportsWelcomeDataImportsHost* _tmp5_ = NULL;
-				SpitDataImportsWelcomeDataImportsHost* _tmp6_ = NULL;
+				SpitDataImportsService* _tmp4_;
+				SpitDataImportsWelcomeDataImportsHost* _tmp5_;
+				SpitDataImportsWelcomeDataImportsHost* _tmp6_;
 #line 402 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_tmp4_ = service;
 #line 402 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2913,18 +2898,18 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp
 				_g_object_unref0 (host);
 #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_g_object_unref0 (service);
-#line 2909 "DataImportsPluginHost.c"
+#line 2894 "DataImportsPluginHost.c"
 			}
 		}
 	}
 #line 399 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2915 "DataImportsPluginHost.c"
+#line 2900 "DataImportsPluginHost.c"
 }
 
 
 void spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImportsWelcomeImportMetaHost* self, SpitDataImportsWelcomeDataImportsHost* host) {
-	SpitDataImportsWelcomeDataImportsHost* _tmp0_ = NULL;
+	SpitDataImportsWelcomeDataImportsHost* _tmp0_;
 #line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST (self));
 #line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2933,18 +2918,18 @@ void spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImports
 	_tmp0_ = host;
 #line 408 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_plugin_host_stop_importing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
-#line 2929 "DataImportsPluginHost.c"
+#line 2914 "DataImportsPluginHost.c"
 }
 
 
 void spit_data_imports_welcome_import_meta_host_install_service_entry (SpitDataImportsWelcomeImportMetaHost* self, WelcomeServiceEntry* entry) {
-	WelcomeServiceEntry* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	WelcomeDialog* _tmp5_ = NULL;
-	WelcomeServiceEntry* _tmp6_ = NULL;
+	WelcomeServiceEntry* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	WelcomeDialog* _tmp5_;
+	WelcomeServiceEntry* _tmp6_;
 #line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST (self));
 #line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2971,7 +2956,7 @@ void spit_data_imports_welcome_import_meta_host_install_service_entry (SpitDataI
 	_tmp6_ = entry;
 #line 413 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	welcome_dialog_install_service_entry (_tmp5_, _tmp6_);
-#line 2967 "DataImportsPluginHost.c"
+#line 2952 "DataImportsPluginHost.c"
 }
 
 
@@ -2982,18 +2967,18 @@ static void spit_data_imports_welcome_import_meta_host_class_init (SpitDataImpor
 	g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeImportMetaHostPrivate));
 #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_import_meta_host_finalize;
-#line 2978 "DataImportsPluginHost.c"
+#line 2963 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_welcome_import_meta_host_instance_init (SpitDataImportsWelcomeImportMetaHost * self) {
 #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv = SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_GET_PRIVATE (self);
-#line 2985 "DataImportsPluginHost.c"
+#line 2970 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_import_meta_host_finalize (GObject* obj) {
+static void spit_data_imports_welcome_import_meta_host_finalize (GObject * obj) {
 	SpitDataImportsWelcomeImportMetaHost * self;
 #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, SpitDataImportsWelcomeImportMetaHost);
@@ -3001,7 +2986,7 @@ static void spit_data_imports_welcome_import_meta_host_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->dialog);
 #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (spit_data_imports_welcome_import_meta_host_parent_class)->finalize (obj);
-#line 2997 "DataImportsPluginHost.c"
+#line 2982 "DataImportsPluginHost.c"
 }
 
 
@@ -3019,10 +3004,10 @@ GType spit_data_imports_welcome_import_meta_host_get_type (void) {
 
 SpitDataImportsService** spit_data_imports_load_all_services (int* result_length1) {
 	SpitDataImportsService** result = NULL;
-	gint _tmp0_ = 0;
-	SpitDataImportsService** _tmp1_ = NULL;
-	SpitDataImportsService** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gint _tmp0_;
+	SpitDataImportsService** _tmp1_;
+	SpitDataImportsService** _tmp2_;
+	gint _tmp2__length1;
 #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp1_ = spit_data_imports_load_services (TRUE, &_tmp0_);
 #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3033,40 +3018,40 @@ SpitDataImportsService** spit_data_imports_load_all_services (int* result_length
 	if (result_length1) {
 #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*result_length1 = _tmp2__length1;
-#line 3029 "DataImportsPluginHost.c"
+#line 3014 "DataImportsPluginHost.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	result = _tmp2_;
 #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 3035 "DataImportsPluginHost.c"
+#line 3020 "DataImportsPluginHost.c"
 }
 
 
-static void _vala_array_add69 (SpitDataImportsService*** array, int* length, int* size, SpitDataImportsService* value) {
+static void _vala_array_add69 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value) {
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if ((*length) == (*size)) {
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*array = g_renew (SpitDataImportsService*, *array, (*size) + 1);
-#line 3046 "DataImportsPluginHost.c"
+#line 3031 "DataImportsPluginHost.c"
 	}
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	(*array)[(*length)++] = value;
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	(*array)[*length] = NULL;
-#line 3052 "DataImportsPluginHost.c"
+#line 3037 "DataImportsPluginHost.c"
 }
 
 
-static gint __lambda22_ (void* a, void* b) {
+static gint __lambda23_ (void* a, void* b) {
 	gint result = 0;
-	void* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	void* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	void* _tmp0_;
+	const gchar* _tmp1_;
+	void* _tmp2_;
+	const gchar* _tmp3_;
+	gint _tmp4_;
 #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp0_ = a;
 #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3081,37 +3066,37 @@ static gint __lambda22_ (void* a, void* b) {
 	result = _tmp4_;
 #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 3077 "DataImportsPluginHost.c"
+#line 3062 "DataImportsPluginHost.c"
 }
 
 
-static gint ___lambda22____compar_fn_t (void* key1, void* key2) {
+static gint ___lambda23____compar_fn_t (void* key1, void* key2) {
 	gint result;
-	result = __lambda22_ (key1, key2);
+	result = __lambda23_ (key1, key2);
 #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 3086 "DataImportsPluginHost.c"
+#line 3071 "DataImportsPluginHost.c"
 }
 
 
 SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int* result_length1) {
 	SpitDataImportsService** result = NULL;
 	SpitDataImportsService** loaded_services = NULL;
-	SpitDataImportsService** _tmp0_ = NULL;
-	gint loaded_services_length1 = 0;
-	gint _loaded_services_size_ = 0;
+	SpitDataImportsService** _tmp0_;
+	gint loaded_services_length1;
+	gint _loaded_services_size_;
 	GeeCollection* pluggables = NULL;
-	gboolean _tmp1_ = FALSE;
-	GeeCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	SpitDataImportsService** _tmp26_ = NULL;
-	gint _tmp26__length1 = 0;
-	SpitDataImportsService** _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
-	SpitDataImportsService** _tmp28_ = NULL;
-	gint _tmp28__length1 = 0;
+	gboolean _tmp1_;
+	GeeCollection* _tmp2_;
+	GeeCollection* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	SpitDataImportsService** _tmp26_;
+	gint _tmp26__length1;
+	SpitDataImportsService** _tmp27_;
+	gint _tmp27__length1;
+	SpitDataImportsService** _tmp28_;
+	gint _tmp28__length1;
 #line 422 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp0_ = g_new0 (SpitDataImportsService*, 0 + 1);
 #line 422 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3135,11 +3120,11 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 #line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_debug ("DataImportsPluginHost.vala:429: DataImportsDialog: discovered %d plugg" \
 "able data import services.", _tmp5_);
-#line 3130 "DataImportsPluginHost.c"
+#line 3115 "DataImportsPluginHost.c"
 	{
 		GeeIterator* _pluggable_it = NULL;
-		GeeCollection* _tmp6_ = NULL;
-		GeeIterator* _tmp7_ = NULL;
+		GeeCollection* _tmp6_;
+		GeeIterator* _tmp7_;
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp6_ = pluggables;
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3148,25 +3133,25 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 		_pluggable_it = _tmp7_;
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		while (TRUE) {
-#line 3143 "DataImportsPluginHost.c"
-			GeeIterator* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+#line 3128 "DataImportsPluginHost.c"
+			GeeIterator* _tmp8_;
+			gboolean _tmp9_;
 			SpitPluggable* pluggable = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			gpointer _tmp11_ = NULL;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
 			gint pluggable_interface = 0;
-			SpitPluggable* _tmp12_ = NULL;
-			gint _tmp13_ = 0;
-			gint _tmp14_ = 0;
+			SpitPluggable* _tmp12_;
+			gint _tmp13_;
+			gint _tmp14_;
 			SpitDataImportsService* service = NULL;
-			SpitPluggable* _tmp19_ = NULL;
-			SpitDataImportsService* _tmp20_ = NULL;
-			SpitDataImportsService* _tmp21_ = NULL;
-			const gchar* _tmp22_ = NULL;
-			SpitDataImportsService** _tmp23_ = NULL;
-			gint _tmp23__length1 = 0;
-			SpitDataImportsService* _tmp24_ = NULL;
-			SpitDataImportsService* _tmp25_ = NULL;
+			SpitPluggable* _tmp19_;
+			SpitDataImportsService* _tmp20_;
+			SpitDataImportsService* _tmp21_;
+			const gchar* _tmp22_;
+			SpitDataImportsService** _tmp23_;
+			gint _tmp23__length1;
+			SpitDataImportsService* _tmp24_;
+			SpitDataImportsService* _tmp25_;
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp8_ = _pluggable_it;
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3175,7 +3160,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 			if (!_tmp9_) {
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				break;
-#line 3170 "DataImportsPluginHost.c"
+#line 3155 "DataImportsPluginHost.c"
 			}
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp10_ = _pluggable_it;
@@ -3193,11 +3178,11 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 			_tmp14_ = pluggable_interface;
 #line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			if (_tmp14_ != SPIT_DATA_IMPORTS_CURRENT_INTERFACE) {
-#line 3188 "DataImportsPluginHost.c"
-				SpitPluggable* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
-				gchar* _tmp17_ = NULL;
-				gint _tmp18_ = 0;
+#line 3173 "DataImportsPluginHost.c"
+				SpitPluggable* _tmp15_;
+				gchar* _tmp16_;
+				gchar* _tmp17_;
+				gint _tmp18_;
 #line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_tmp15_ = pluggable;
 #line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3215,7 +3200,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 				_g_object_unref0 (pluggable);
 #line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				continue;
-#line 3209 "DataImportsPluginHost.c"
+#line 3194 "DataImportsPluginHost.c"
 			}
 #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp19_ = pluggable;
@@ -3244,11 +3229,11 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 			_g_object_unref0 (service);
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_g_object_unref0 (pluggable);
-#line 3237 "DataImportsPluginHost.c"
+#line 3222 "DataImportsPluginHost.c"
 		}
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (_pluggable_it);
-#line 3241 "DataImportsPluginHost.c"
+#line 3226 "DataImportsPluginHost.c"
 	}
 #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp26_ = loaded_services;
@@ -3259,7 +3244,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp27__length1 = loaded_services_length1;
 #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	qsort (_tmp26_, (gsize) _tmp27__length1, (gsize) sizeof (SpitDataImportsService*), ___lambda22____compar_fn_t);
+	qsort (_tmp26_, (gsize) _tmp27__length1, (gsize) sizeof (SpitDataImportsService*), ___lambda23____compar_fn_t);
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp28_ = loaded_services;
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3268,7 +3253,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 	if (result_length1) {
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*result_length1 = _tmp28__length1;
-#line 3261 "DataImportsPluginHost.c"
+#line 3246 "DataImportsPluginHost.c"
 	}
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	result = _tmp28_;
@@ -3276,15 +3261,15 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 	_g_object_unref0 (pluggables);
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 3269 "DataImportsPluginHost.c"
+#line 3254 "DataImportsPluginHost.c"
 }
 
 
 void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll) {
-	ImportManifest* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	ImportManifest* _tmp0_;
+	GeeList* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 462 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
 #line 462 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3299,31 +3284,31 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo
 	_tmp3_ = _tmp2_;
 #line 463 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp3_ > 0) {
-#line 3292 "DataImportsPluginHost.c"
-		ImportManifest* _tmp4_ = NULL;
+#line 3277 "DataImportsPluginHost.c"
+		ImportManifest* _tmp4_;
 #line 464 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp4_ = spit_data_imports_meta_manifest;
 #line 464 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		if (_tmp4_ == NULL) {
-#line 3298 "DataImportsPluginHost.c"
-			ImportManifest* _tmp5_ = NULL;
+#line 3283 "DataImportsPluginHost.c"
+			ImportManifest* _tmp5_;
 #line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp5_ = import_manifest_new (NULL, NULL);
 #line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_import_manifest_unref0 (spit_data_imports_meta_manifest);
 #line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			spit_data_imports_meta_manifest = _tmp5_;
-#line 3306 "DataImportsPluginHost.c"
+#line 3291 "DataImportsPluginHost.c"
 		}
 		{
 			GeeList* _result_list = NULL;
-			ImportManifest* _tmp6_ = NULL;
-			GeeList* _tmp7_ = NULL;
-			GeeList* _tmp8_ = NULL;
+			ImportManifest* _tmp6_;
+			GeeList* _tmp7_;
+			GeeList* _tmp8_;
 			gint _result_size = 0;
-			GeeList* _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
+			GeeList* _tmp9_;
+			gint _tmp10_;
+			gint _tmp11_;
 			gint _result_index = 0;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp6_ = manifest;
@@ -3345,16 +3330,16 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo
 			_result_index = -1;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			while (TRUE) {
-#line 3338 "DataImportsPluginHost.c"
-				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
-				gint _tmp14_ = 0;
+#line 3323 "DataImportsPluginHost.c"
+				gint _tmp12_;
+				gint _tmp13_;
+				gint _tmp14_;
 				BatchImportResult* _result_ = NULL;
-				GeeList* _tmp15_ = NULL;
-				gint _tmp16_ = 0;
-				gpointer _tmp17_ = NULL;
-				ImportManifest* _tmp18_ = NULL;
-				BatchImportResult* _tmp19_ = NULL;
+				GeeList* _tmp15_;
+				gint _tmp16_;
+				gpointer _tmp17_;
+				ImportManifest* _tmp18_;
+				BatchImportResult* _tmp19_;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_tmp12_ = _result_index;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3367,7 +3352,7 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo
 				if (!(_tmp13_ < _tmp14_)) {
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 					break;
-#line 3360 "DataImportsPluginHost.c"
+#line 3345 "DataImportsPluginHost.c"
 				}
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_tmp15_ = _result_list;
@@ -3385,14 +3370,14 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo
 				import_manifest_add_result (_tmp18_, _tmp19_);
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_batch_import_result_unref0 (_result_);
-#line 3378 "DataImportsPluginHost.c"
+#line 3363 "DataImportsPluginHost.c"
 			}
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_g_object_unref0 (_result_list);
-#line 3382 "DataImportsPluginHost.c"
+#line 3367 "DataImportsPluginHost.c"
 		}
 	} else {
-		ImportManifest* _tmp20_ = NULL;
+		ImportManifest* _tmp20_;
 #line 470 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		data_imports_ui_data_imports_dialog_terminate_instance ();
 #line 471 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3403,17 +3388,17 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo
 		_import_manifest_unref0 (spit_data_imports_meta_manifest);
 #line 472 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_meta_manifest = NULL;
-#line 3396 "DataImportsPluginHost.c"
+#line 3381 "DataImportsPluginHost.c"
 	}
 }
 
 
 gint64 spit_data_imports_import_job_comparator (void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	time_t _tmp1_ = 0;
-	void* _tmp2_ = NULL;
-	time_t _tmp3_ = 0;
+	void* _tmp0_;
+	time_t _tmp1_;
+	void* _tmp2_;
+	time_t _tmp3_;
 #line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp0_ = a;
 #line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3426,7 +3411,7 @@ gint64 spit_data_imports_import_job_comparator (void* a, void* b) {
 	result = (gint64) (_tmp1_ - _tmp3_);
 #line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 3419 "DataImportsPluginHost.c"
+#line 3404 "DataImportsPluginHost.c"
 }
 
 
diff --git a/src/data_imports/DataImportsUI.c b/src/data_imports/DataImportsUI.c
index c5428ba..28039a9 100644
--- a/src/data_imports/DataImportsUI.c
+++ b/src/data_imports/DataImportsUI.c
@@ -1,4 +1,4 @@
-/* DataImportsUI.c generated by valac 0.34.7, the Vala compiler
+/* DataImportsUI.c generated by valac 0.36.6, the Vala compiler
  * generated from DataImportsUI.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -209,7 +209,7 @@ struct _DataImportsUIDataImportsDialogPrivate {
 
 
 static gpointer data_imports_ui_concrete_dialog_pane_parent_class = NULL;
-static SpitDataImportsDialogPaneIface* data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_parent_iface = NULL;
+static SpitDataImportsDialogPaneIface * data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_parent_iface = NULL;
 static gpointer data_imports_ui_static_message_pane_parent_class = NULL;
 static gpointer data_imports_ui_library_selection_pane_parent_class = NULL;
 static gpointer data_imports_ui_progress_pane_parent_class = NULL;
@@ -233,7 +233,7 @@ static GtkWidget* data_imports_ui_concrete_dialog_pane_real_get_widget (SpitData
 static SpitDataImportsDialogPaneGeometryOptions data_imports_ui_concrete_dialog_pane_real_get_preferred_geometry (SpitDataImportsDialogPane* base);
 static void data_imports_ui_concrete_dialog_pane_real_on_pane_installed (SpitDataImportsDialogPane* base);
 static void data_imports_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitDataImportsDialogPane* base);
-static void data_imports_ui_concrete_dialog_pane_finalize (GObject* obj);
+static void data_imports_ui_concrete_dialog_pane_finalize (GObject * obj);
 GType data_imports_ui_static_message_pane_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_UI_STATIC_MESSAGE_PANE_DUMMY_PROPERTY
@@ -253,17 +253,17 @@ static void data_imports_ui_library_selection_pane_on_file_selected (DataImports
 static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_button (DataImportsUILibrarySelectionPane* self, GtkBox* box, GtkRadioButton* group, SpitDataImportsImportableLibrary* library, const gchar* label, gint margin_left, gint margin_right);
 static Block11Data* block11_data_ref (Block11Data* _data11_);
 static void block11_data_unref (void * _userdata_);
-static void ___lambda20_ (Block11Data* _data11_);
+static void ___lambda21_ (Block11Data* _data11_);
 static void data_imports_ui_library_selection_pane_set_import_button_sensitivity (DataImportsUILibrarySelectionPane* self);
-static void ____lambda20__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self);
-static void __lambda21_ (DataImportsUILibrarySelectionPane* self);
+static void ____lambda21__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self);
+static void __lambda22_ (DataImportsUILibrarySelectionPane* self);
 static void data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self, SpitDataImportsImportableLibrary* library);
-static void ___lambda21__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void ___lambda22__gtk_button_clicked (GtkButton* _sender, gpointer self);
 static Block12Data* block12_data_ref (Block12Data* _data12_);
 static void block12_data_unref (void * _userdata_);
-static void __lambda19_ (Block12Data* _data12_);
-static void ___lambda19__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
-static void data_imports_ui_library_selection_pane_finalize (GObject* obj);
+static void __lambda20_ (Block12Data* _data12_);
+static void ___lambda20__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+static void data_imports_ui_library_selection_pane_finalize (GObject * obj);
 GType data_imports_ui_progress_pane_get_type (void) G_GNUC_CONST;
 #define DATA_IMPORTS_UI_PROGRESS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, DataImportsUIProgressPanePrivate))
 enum  {
@@ -273,7 +273,7 @@ DataImportsUIProgressPane* data_imports_ui_progress_pane_new (const gchar* messa
 DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object_type, const gchar* message);
 void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* self, gdouble progress, const gchar* progress_message);
 void spin_event_loop (void);
-static void data_imports_ui_progress_pane_finalize (GObject* obj);
+static void data_imports_ui_progress_pane_finalize (GObject * obj);
 GType data_imports_ui_data_imports_dialog_get_type (void) G_GNUC_CONST;
 GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST;
 GType spit_data_imports_concrete_data_imports_host_get_type (void) G_GNUC_CONST;
@@ -322,14 +322,14 @@ SpitDataImportsDialogPane* data_imports_ui_data_imports_dialog_get_active_pane (
 void data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDataImportsDialog* self);
 void data_imports_ui_data_imports_dialog_lock_service (DataImportsUIDataImportsDialog* self);
 void data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImportsDialog* self);
-static void data_imports_ui_data_imports_dialog_finalize (GObject* obj);
+static void data_imports_ui_data_imports_dialog_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
 DataImportsUIConcreteDialogPane* data_imports_ui_concrete_dialog_pane_construct (GType object_type) {
 	DataImportsUIConcreteDialogPane * self = NULL;
-	GtkBox* _tmp0_ = NULL;
+	GtkBox* _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = (DataImportsUIConcreteDialogPane*) g_object_new (object_type, NULL);
 #line 16 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -363,8 +363,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 static GtkWidget* data_imports_ui_concrete_dialog_pane_real_get_widget (SpitDataImportsDialogPane* base) {
 	DataImportsUIConcreteDialogPane * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 19 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE, DataImportsUIConcreteDialogPane);
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -423,13 +423,13 @@ static void data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_i
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitDataImportsDialogPane*)) data_imports_ui_concrete_dialog_pane_real_get_widget;
+	iface->get_widget = (GtkWidget* (*) (SpitDataImportsDialogPane *)) data_imports_ui_concrete_dialog_pane_real_get_widget;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	iface->get_preferred_geometry = (SpitDataImportsDialogPaneGeometryOptions (*)(SpitDataImportsDialogPane*)) data_imports_ui_concrete_dialog_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitDataImportsDialogPaneGeometryOptions (*) (SpitDataImportsDialogPane *)) data_imports_ui_concrete_dialog_pane_real_get_preferred_geometry;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	iface->on_pane_installed = (void (*)(SpitDataImportsDialogPane*)) data_imports_ui_concrete_dialog_pane_real_on_pane_installed;
+	iface->on_pane_installed = (void (*) (SpitDataImportsDialogPane *)) data_imports_ui_concrete_dialog_pane_real_on_pane_installed;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitDataImportsDialogPane*)) data_imports_ui_concrete_dialog_pane_real_on_pane_uninstalled;
+	iface->on_pane_uninstalled = (void (*) (SpitDataImportsDialogPane *)) data_imports_ui_concrete_dialog_pane_real_on_pane_uninstalled;
 #line 430 "DataImportsUI.c"
 }
 
@@ -441,7 +441,7 @@ static void data_imports_ui_concrete_dialog_pane_instance_init (DataImportsUICon
 }
 
 
-static void data_imports_ui_concrete_dialog_pane_finalize (GObject* obj) {
+static void data_imports_ui_concrete_dialog_pane_finalize (GObject * obj) {
 	DataImportsUIConcreteDialogPane * self;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE, DataImportsUIConcreteDialogPane);
@@ -470,11 +470,11 @@ GType data_imports_ui_concrete_dialog_pane_get_type (void) {
 DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct (GType object_type, const gchar* message_string) {
 	DataImportsUIStaticMessagePane * self = NULL;
 	GtkLabel* message_label = NULL;
-	const gchar* _tmp0_ = NULL;
-	GtkLabel* _tmp1_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
-	GtkBox* _tmp3_ = NULL;
-	GtkBox* _tmp4_ = NULL;
+	const gchar* _tmp0_;
+	GtkLabel* _tmp1_;
+	GtkWidget* _tmp2_;
+	GtkBox* _tmp3_;
+	GtkBox* _tmp4_;
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (message_string != NULL, NULL);
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -521,11 +521,11 @@ DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_new (const g
 DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_with_pango (GType object_type, const gchar* msg) {
 	DataImportsUIStaticMessagePane * self = NULL;
 	GtkLabel* label = NULL;
-	GtkLabel* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
-	GtkBox* _tmp3_ = NULL;
-	GtkBox* _tmp4_ = NULL;
+	GtkLabel* _tmp0_;
+	const gchar* _tmp1_;
+	GtkWidget* _tmp2_;
+	GtkBox* _tmp3_;
+	GtkBox* _tmp4_;
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (msg != NULL, NULL);
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -625,11 +625,11 @@ static void block11_data_unref (void * _userdata_) {
 }
 
 
-static void ___lambda20_ (Block11Data* _data11_) {
+static void ___lambda21_ (Block11Data* _data11_) {
 	DataImportsUILibrarySelectionPane* self;
-	GtkFileChooserButton* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GtkRadioButton* _tmp2_ = NULL;
+	GtkFileChooserButton* _tmp0_;
+	GFile* _tmp1_;
+	GtkRadioButton* _tmp2_;
 #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = _data11_->self;
 #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -645,7 +645,7 @@ static void ___lambda20_ (Block11Data* _data11_) {
 #line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp2_ != NULL) {
 #line 644 "DataImportsUI.c"
-		GtkRadioButton* _tmp3_ = NULL;
+		GtkRadioButton* _tmp3_;
 #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp3_ = self->priv->file_radio;
 #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -658,34 +658,34 @@ static void ___lambda20_ (Block11Data* _data11_) {
 }
 
 
-static void ____lambda20__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self) {
+static void ____lambda21__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self) {
 #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	___lambda20_ (self);
+	___lambda21_ (self);
 #line 661 "DataImportsUI.c"
 }
 
 
-static void __lambda21_ (DataImportsUILibrarySelectionPane* self) {
-	SpitDataImportsImportableLibrary* _tmp0_ = NULL;
+static void __lambda22_ (DataImportsUILibrarySelectionPane* self) {
+	SpitDataImportsImportableLibrary* _tmp0_;
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->selected_library;
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ != NULL) {
 #line 671 "DataImportsUI.c"
-		SpitDataImportsImportableLibrary* _tmp1_ = NULL;
+		SpitDataImportsImportableLibrary* _tmp1_;
 #line 115 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = self->priv->selected_library;
 #line 115 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_library_selection_pane_on_library_selected (self, _tmp1_);
 #line 677 "DataImportsUI.c"
 	} else {
-		GFile* _tmp2_ = NULL;
+		GFile* _tmp2_;
 #line 116 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp2_ = self->priv->selected_file;
 #line 116 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		if (_tmp2_ != NULL) {
 #line 684 "DataImportsUI.c"
-			GFile* _tmp3_ = NULL;
+			GFile* _tmp3_;
 #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp3_ = self->priv->selected_file;
 #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -701,9 +701,9 @@ static void __lambda21_ (DataImportsUILibrarySelectionPane* self) {
 }
 
 
-static void ___lambda21__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void ___lambda22__gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	__lambda21_ ((DataImportsUILibrarySelectionPane*) self);
+	__lambda22_ ((DataImportsUILibrarySelectionPane*) self);
 #line 703 "DataImportsUI.c"
 }
 
@@ -711,42 +711,41 @@ static void ___lambda21__gtk_button_clicked (GtkButton* _sender, gpointer self)
 DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_construct (GType object_type, SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) {
 	DataImportsUILibrarySelectionPane * self = NULL;
 	gboolean _tmp0_ = FALSE;
-	SpitDataImportsImportableLibrary** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	SpitDataImportsPluginHost* _tmp2_ = NULL;
+	SpitDataImportsImportableLibrary** _tmp1_;
+	gint _tmp1__length1;
+	SpitDataImportsPluginHost* _tmp2_;
 	GtkBox* content_box = NULL;
-	GtkBox* _tmp3_ = NULL;
-	GtkBox* _tmp4_ = NULL;
-	GtkBox* _tmp5_ = NULL;
+	GtkBox* _tmp3_;
+	GtkBox* _tmp4_;
+	GtkBox* _tmp5_;
 	GtkLabel* welcome_label = NULL;
-	GtkLabel* _tmp6_ = NULL;
-	GtkLabel* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkLabel* _tmp9_ = NULL;
-	GtkLabel* _tmp10_ = NULL;
-	GtkBox* _tmp11_ = NULL;
-	GtkLabel* _tmp12_ = NULL;
+	GtkLabel* _tmp6_;
+	GtkLabel* _tmp7_;
+	const gchar* _tmp8_;
+	GtkLabel* _tmp9_;
+	GtkLabel* _tmp10_;
+	GtkBox* _tmp11_;
+	GtkLabel* _tmp12_;
 	gint radio_margin_left = 0;
 	gint radio_margin_right = 0;
 	gint chooser_margin_left = 0;
-	gint _tmp13_ = 0;
+	gint _tmp13_;
 	gint chooser_margin_right = 0;
-	gint _tmp14_ = 0;
+	gint _tmp14_;
 	GtkRadioButton* lib_radio = NULL;
-	SpitDataImportsImportableLibrary** _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	const gchar* _tmp37_ = NULL;
-	const gchar* _tmp47_ = NULL;
-	GtkButton* _tmp48_ = NULL;
-	GtkButton* _tmp49_ = NULL;
+	SpitDataImportsImportableLibrary** _tmp15_;
+	gint _tmp15__length1;
+	const gchar* _tmp37_;
+	GtkButton* _tmp46_;
+	GtkButton* _tmp47_;
 	GtkButtonBox* button_box = NULL;
-	GtkButtonBox* _tmp50_ = NULL;
-	GtkButton* _tmp51_ = NULL;
-	GtkBox* _tmp52_ = NULL;
-	GtkWidget* _tmp53_ = NULL;
-	GtkBox* _tmp54_ = NULL;
-	GtkBox* _tmp55_ = NULL;
-	GtkBox* _tmp56_ = NULL;
+	GtkButtonBox* _tmp48_;
+	GtkButton* _tmp49_;
+	GtkBox* _tmp50_;
+	GtkWidget* _tmp51_;
+	GtkBox* _tmp52_;
+	GtkBox* _tmp53_;
+	GtkBox* _tmp54_;
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (host), NULL);
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -761,11 +760,11 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 	if (_tmp1__length1 > 0) {
 #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp0_ = TRUE;
-#line 760 "DataImportsUI.c"
+#line 759 "DataImportsUI.c"
 	} else {
 #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp0_ = data_imports_ui_library_selection_pane_on_file_selected != NULL;
-#line 764 "DataImportsUI.c"
+#line 763 "DataImportsUI.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_vala_assert (_tmp0_, "discovered_libraries.length > 0 || on_file_selected != null");
@@ -833,11 +832,11 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 	_tmp15__length1 = discovered_libraries_length1;
 #line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp15__length1 > 0) {
-#line 832 "DataImportsUI.c"
-		gint _tmp16_ = 0;
-		SpitDataImportsImportableLibrary** _tmp17_ = NULL;
-		gint _tmp17__length1 = 0;
-		const gchar* _tmp28_ = NULL;
+#line 831 "DataImportsUI.c"
+		gint _tmp16_;
+		SpitDataImportsImportableLibrary** _tmp17_;
+		gint _tmp17__length1;
+		const gchar* _tmp28_;
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp16_ = radio_margin_left;
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -846,7 +845,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 		_tmp17_ = discovered_libraries;
 #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp17__length1 = discovered_libraries_length1;
-#line 845 "DataImportsUI.c"
+#line 844 "DataImportsUI.c"
 		{
 			SpitDataImportsImportableLibrary** library_collection = NULL;
 			gint library_collection_length1 = 0;
@@ -858,25 +857,25 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 			library_collection_length1 = _tmp17__length1;
 #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			for (library_it = 0; library_it < _tmp17__length1; library_it = library_it + 1) {
-#line 857 "DataImportsUI.c"
-				SpitDataImportsImportableLibrary* _tmp18_ = NULL;
+#line 856 "DataImportsUI.c"
+				SpitDataImportsImportableLibrary* _tmp18_;
 				SpitDataImportsImportableLibrary* library = NULL;
 #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				_tmp18_ = _g_object_ref0 (library_collection[library_it]);
 #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				library = _tmp18_;
-#line 864 "DataImportsUI.c"
+#line 863 "DataImportsUI.c"
 				{
 					gchar* lib_radio_label = NULL;
-					SpitDataImportsImportableLibrary* _tmp19_ = NULL;
-					gchar* _tmp20_ = NULL;
-					GtkBox* _tmp21_ = NULL;
-					GtkRadioButton* _tmp22_ = NULL;
-					SpitDataImportsImportableLibrary* _tmp23_ = NULL;
-					const gchar* _tmp24_ = NULL;
-					gint _tmp25_ = 0;
-					gint _tmp26_ = 0;
-					GtkRadioButton* _tmp27_ = NULL;
+					SpitDataImportsImportableLibrary* _tmp19_;
+					gchar* _tmp20_;
+					GtkBox* _tmp21_;
+					GtkRadioButton* _tmp22_;
+					SpitDataImportsImportableLibrary* _tmp23_;
+					const gchar* _tmp24_;
+					gint _tmp25_;
+					gint _tmp26_;
+					GtkRadioButton* _tmp27_;
 #line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_tmp19_ = library;
 #line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -905,7 +904,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 					_g_free0 (lib_radio_label);
 #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_g_object_unref0 (library);
-#line 904 "DataImportsUI.c"
+#line 903 "DataImportsUI.c"
 				}
 			}
 		}
@@ -913,15 +912,15 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 		_tmp28_ = file_select_label;
 #line 91 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		if (_tmp28_ != NULL) {
-#line 912 "DataImportsUI.c"
-			GtkBox* _tmp29_ = NULL;
-			GtkRadioButton* _tmp30_ = NULL;
-			const gchar* _tmp31_ = NULL;
-			gint _tmp32_ = 0;
-			gint _tmp33_ = 0;
-			GtkRadioButton* _tmp34_ = NULL;
-			GtkRadioButton* _tmp35_ = NULL;
-			GtkRadioButton* _tmp36_ = NULL;
+#line 911 "DataImportsUI.c"
+			GtkBox* _tmp29_;
+			GtkRadioButton* _tmp30_;
+			const gchar* _tmp31_;
+			gint _tmp32_;
+			gint _tmp33_;
+			GtkRadioButton* _tmp34_;
+			GtkRadioButton* _tmp35_;
+			GtkRadioButton* _tmp36_;
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp29_ = content_box;
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -946,24 +945,23 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 			_g_object_unref0 (self->priv->file_radio);
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			self->priv->file_radio = _tmp36_;
-#line 945 "DataImportsUI.c"
+#line 944 "DataImportsUI.c"
 		}
 	}
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp37_ = file_select_label;
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp37_ != NULL) {
-#line 952 "DataImportsUI.c"
+#line 951 "DataImportsUI.c"
 		Block11Data* _data11_;
-		const gchar* _tmp38_ = NULL;
-		GtkFileChooserButton* _tmp39_ = NULL;
-		GtkFileChooserButton* _tmp40_ = NULL;
-		GtkFileChooserButton* _tmp41_ = NULL;
-		gint _tmp42_ = 0;
-		GtkFileChooserButton* _tmp43_ = NULL;
-		gint _tmp44_ = 0;
-		GtkBox* _tmp45_ = NULL;
-		GtkFileChooserButton* _tmp46_ = NULL;
+		GtkFileChooserButton* _tmp38_;
+		GtkFileChooserButton* _tmp39_;
+		GtkFileChooserButton* _tmp40_;
+		gint _tmp41_;
+		GtkFileChooserButton* _tmp42_;
+		gint _tmp43_;
+		GtkBox* _tmp44_;
+		GtkFileChooserButton* _tmp45_;
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_data11_ = g_slice_new0 (Block11Data);
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -971,89 +969,85 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_data11_->self = g_object_ref (self);
 #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp38_ = _ ("Database file:");
+		_tmp38_ = (GtkFileChooserButton*) gtk_file_chooser_button_new (_ ("Database file:"), GTK_FILE_CHOOSER_ACTION_OPEN);
 #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp39_ = (GtkFileChooserButton*) gtk_file_chooser_button_new (_tmp38_, GTK_FILE_CHOOSER_ACTION_OPEN);
+		g_object_ref_sink (_tmp38_);
 #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		g_object_ref_sink (_tmp39_);
-#line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_data11_->file_chooser = _tmp39_;
+		_data11_->file_chooser = _tmp38_;
 #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp40_ = _data11_->file_chooser;
+		_tmp39_ = _data11_->file_chooser;
 #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "selection-changed", (GCallback) ____lambda20__gtk_file_chooser_selection_changed, block11_data_ref (_data11_), (GClosureNotify) block11_data_unref, 0);
+		g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "selection-changed", (GCallback) ____lambda21__gtk_file_chooser_selection_changed, block11_data_ref (_data11_), (GClosureNotify) block11_data_unref, 0);
 #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp41_ = _data11_->file_chooser;
+		_tmp40_ = _data11_->file_chooser;
 #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp42_ = chooser_margin_left;
+		_tmp41_ = chooser_margin_left;
 #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), _tmp42_);
+		gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), _tmp41_);
 #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp43_ = _data11_->file_chooser;
+		_tmp42_ = _data11_->file_chooser;
 #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp44_ = chooser_margin_right;
+		_tmp43_ = chooser_margin_right;
 #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), _tmp44_);
+		gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), _tmp43_);
 #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp45_ = content_box;
+		_tmp44_ = content_box;
 #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp46_ = _data11_->file_chooser;
+		_tmp45_ = _data11_->file_chooser;
 #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_box_pack_start (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
+		gtk_box_pack_start (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		block11_data_unref (_data11_);
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_data11_ = NULL;
-#line 1003 "DataImportsUI.c"
+#line 999 "DataImportsUI.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp47_ = _ ("_Import");
+	_tmp46_ = (GtkButton*) gtk_button_new_with_mnemonic (_ ("_Import"));
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp48_ = (GtkButton*) gtk_button_new_with_mnemonic (_tmp47_);
-#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_object_ref_sink (_tmp48_);
+	g_object_ref_sink (_tmp46_);
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (self->priv->import_button);
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	self->priv->import_button = _tmp48_;
+	self->priv->import_button = _tmp46_;
 #line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp49_ = self->priv->import_button;
+	_tmp47_ = self->priv->import_button;
 #line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_signal_connect_object (_tmp49_, "clicked", (GCallback) ___lambda21__gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp47_, "clicked", (GCallback) ___lambda22__gtk_button_clicked, self, 0);
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp50_ = (GtkButtonBox*) gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+	_tmp48_ = (GtkButtonBox*) gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_object_ref_sink (_tmp50_);
+	g_object_ref_sink (_tmp48_);
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	button_box = _tmp50_;
+	button_box = _tmp48_;
 #line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_object_set (button_box, "layout-style", GTK_BUTTONBOX_CENTER, NULL);
 #line 123 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp51_ = self->priv->import_button;
+	_tmp49_ = self->priv->import_button;
 #line 123 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (button_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (button_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
 #line 124 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp52_ = content_box;
+	_tmp50_ = content_box;
 #line 124 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_box_pack_end (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (button_box, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 6);
+	gtk_box_pack_end (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (button_box, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 6);
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp53_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+	_tmp51_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp54_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp53_, gtk_box_get_type ()) ? ((GtkBox*) _tmp53_) : NULL;
+	_tmp52_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp51_, gtk_box_get_type ()) ? ((GtkBox*) _tmp51_) : NULL;
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp54_ == NULL) {
+	if (_tmp52_ == NULL) {
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_g_object_unref0 (_tmp53_);
-#line 1043 "DataImportsUI.c"
+		_g_object_unref0 (_tmp51_);
+#line 1037 "DataImportsUI.c"
 	}
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp55_ = _tmp54_;
+	_tmp53_ = _tmp52_;
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp56_ = content_box;
+	_tmp54_ = content_box;
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_box_pack_start (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (_tmp53_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_g_object_unref0 (_tmp55_);
+	_g_object_unref0 (_tmp53_);
 #line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_library_selection_pane_set_import_button_sensitivity (self);
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1066,14 +1060,14 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 	_g_object_unref0 (content_box);
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self;
-#line 1065 "DataImportsUI.c"
+#line 1059 "DataImportsUI.c"
 }
 
 
 DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_new (SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) {
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return data_imports_ui_library_selection_pane_construct (DATA_IMPORTS_UI_TYPE_LIBRARY_SELECTION_PANE, host, welcome_message, discovered_libraries, discovered_libraries_length1, file_select_label);
-#line 1072 "DataImportsUI.c"
+#line 1066 "DataImportsUI.c"
 }
 
 
@@ -1082,7 +1076,7 @@ static Block12Data* block12_data_ref (Block12Data* _data12_) {
 	g_atomic_int_inc (&_data12_->_ref_count_);
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return _data12_;
-#line 1081 "DataImportsUI.c"
+#line 1075 "DataImportsUI.c"
 }
 
 
@@ -1091,7 +1085,7 @@ static void block12_data_unref (void * _userdata_) {
 	_data12_ = (Block12Data*) _userdata_;
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (g_atomic_int_dec_and_test (&_data12_->_ref_count_)) {
-#line 1090 "DataImportsUI.c"
+#line 1084 "DataImportsUI.c"
 		DataImportsUILibrarySelectionPane* self;
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		self = _data12_->self;
@@ -1103,16 +1097,16 @@ static void block12_data_unref (void * _userdata_) {
 		_g_object_unref0 (self);
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		g_slice_free (Block12Data, _data12_);
-#line 1102 "DataImportsUI.c"
+#line 1096 "DataImportsUI.c"
 	}
 }
 
 
-static void __lambda19_ (Block12Data* _data12_) {
+static void __lambda20_ (Block12Data* _data12_) {
 	DataImportsUILibrarySelectionPane* self;
-	GtkRadioButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	GtkRadioButton* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = _data12_->self;
 #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1123,9 +1117,9 @@ static void __lambda19_ (Block12Data* _data12_) {
 	_tmp2_ = _tmp1_;
 #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp2_) {
-#line 1122 "DataImportsUI.c"
-		SpitDataImportsImportableLibrary* _tmp3_ = NULL;
-		SpitDataImportsImportableLibrary* _tmp4_ = NULL;
+#line 1116 "DataImportsUI.c"
+		SpitDataImportsImportableLibrary* _tmp3_;
+		SpitDataImportsImportableLibrary* _tmp4_;
 #line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp3_ = _data12_->library;
 #line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1136,36 +1130,36 @@ static void __lambda19_ (Block12Data* _data12_) {
 		self->priv->selected_library = _tmp4_;
 #line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_library_selection_pane_set_import_button_sensitivity (self);
-#line 1135 "DataImportsUI.c"
+#line 1129 "DataImportsUI.c"
 	}
 }
 
 
-static void ___lambda19__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+static void ___lambda20__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
 #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	__lambda19_ (self);
-#line 1143 "DataImportsUI.c"
+	__lambda20_ (self);
+#line 1137 "DataImportsUI.c"
 }
 
 
 static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_button (DataImportsUILibrarySelectionPane* self, GtkBox* box, GtkRadioButton* group, SpitDataImportsImportableLibrary* library, const gchar* label, gint margin_left, gint margin_right) {
 	GtkRadioButton* result = NULL;
 	Block12Data* _data12_;
-	SpitDataImportsImportableLibrary* _tmp0_ = NULL;
-	SpitDataImportsImportableLibrary* _tmp1_ = NULL;
-	GtkRadioButton* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	GtkRadioButton* _tmp4_ = NULL;
-	GtkRadioButton* _tmp5_ = NULL;
-	GtkRadioButton* _tmp9_ = NULL;
-	GtkRadioButton* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	GtkRadioButton* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	GtkBox* _tmp14_ = NULL;
-	GtkRadioButton* _tmp15_ = NULL;
-	GtkRadioButton* _tmp16_ = NULL;
-	GtkRadioButton* _tmp17_ = NULL;
+	SpitDataImportsImportableLibrary* _tmp0_;
+	SpitDataImportsImportableLibrary* _tmp1_;
+	GtkRadioButton* _tmp2_;
+	const gchar* _tmp3_;
+	GtkRadioButton* _tmp4_;
+	GtkRadioButton* _tmp5_;
+	GtkRadioButton* _tmp9_;
+	GtkRadioButton* _tmp10_;
+	gint _tmp11_;
+	GtkRadioButton* _tmp12_;
+	gint _tmp13_;
+	GtkBox* _tmp14_;
+	GtkRadioButton* _tmp15_;
+	GtkRadioButton* _tmp16_;
+	GtkRadioButton* _tmp17_;
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (DATA_IMPORTS_UI_IS_LIBRARY_SELECTION_PANE (self), NULL);
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1204,10 +1198,10 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto
 	_tmp5_ = group;
 #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp5_ == NULL) {
-#line 1203 "DataImportsUI.c"
-		GtkRadioButton* _tmp6_ = NULL;
-		SpitDataImportsImportableLibrary* _tmp7_ = NULL;
-		SpitDataImportsImportableLibrary* _tmp8_ = NULL;
+#line 1197 "DataImportsUI.c"
+		GtkRadioButton* _tmp6_;
+		SpitDataImportsImportableLibrary* _tmp7_;
+		SpitDataImportsImportableLibrary* _tmp8_;
 #line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp6_ = _data12_->button;
 #line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1220,12 +1214,12 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto
 		_g_object_unref0 (self->priv->selected_library);
 #line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		self->priv->selected_library = _tmp8_;
-#line 1219 "DataImportsUI.c"
+#line 1213 "DataImportsUI.c"
 	}
 #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp9_ = _data12_->button;
 #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) ___lambda19__gtk_toggle_button_toggled, block12_data_ref (_data12_), (GClosureNotify) block12_data_unref, 0);
+	g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) ___lambda20__gtk_toggle_button_toggled, block12_data_ref (_data12_), (GClosureNotify) block12_data_unref, 0);
 #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp10_ = _data12_->button;
 #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1256,14 +1250,14 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto
 	_data12_ = NULL;
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 1255 "DataImportsUI.c"
+#line 1249 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_library_selection_pane_set_import_button_sensitivity (DataImportsUILibrarySelectionPane* self) {
 	gboolean _tmp0_ = FALSE;
-	SpitDataImportsImportableLibrary* _tmp1_ = NULL;
-	GtkButton* _tmp3_ = NULL;
+	SpitDataImportsImportableLibrary* _tmp1_;
+	GtkButton* _tmp3_;
 #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_LIBRARY_SELECTION_PANE (self));
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1272,28 +1266,28 @@ static void data_imports_ui_library_selection_pane_set_import_button_sensitivity
 	if (_tmp1_ != NULL) {
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp0_ = TRUE;
-#line 1271 "DataImportsUI.c"
+#line 1265 "DataImportsUI.c"
 	} else {
-		GFile* _tmp2_ = NULL;
+		GFile* _tmp2_;
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp2_ = self->priv->selected_file;
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 1278 "DataImportsUI.c"
+#line 1272 "DataImportsUI.c"
 	}
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp3_ = self->priv->import_button;
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 1284 "DataImportsUI.c"
+#line 1278 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self, SpitDataImportsImportableLibrary* library) {
-	SpitDataImportsPluginHost* _tmp0_ = NULL;
-	SpitDataImportsDataImporter* _tmp1_ = NULL;
-	SpitDataImportsDataImporter* _tmp2_ = NULL;
-	SpitDataImportsImportableLibrary* _tmp3_ = NULL;
+	SpitDataImportsPluginHost* _tmp0_;
+	SpitDataImportsDataImporter* _tmp1_;
+	SpitDataImportsDataImporter* _tmp2_;
+	SpitDataImportsImportableLibrary* _tmp3_;
 #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_LIBRARY_SELECTION_PANE (self));
 #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1310,15 +1304,15 @@ static void data_imports_ui_library_selection_pane_on_library_selected (DataImpo
 	spit_data_imports_data_importer_on_library_selected (_tmp2_, _tmp3_);
 #line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1309 "DataImportsUI.c"
+#line 1303 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_library_selection_pane_on_file_selected (DataImportsUILibrarySelectionPane* self, GFile* file) {
-	SpitDataImportsPluginHost* _tmp0_ = NULL;
-	SpitDataImportsDataImporter* _tmp1_ = NULL;
-	SpitDataImportsDataImporter* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	SpitDataImportsPluginHost* _tmp0_;
+	SpitDataImportsDataImporter* _tmp1_;
+	SpitDataImportsDataImporter* _tmp2_;
+	GFile* _tmp3_;
 #line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_LIBRARY_SELECTION_PANE (self));
 #line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1335,7 +1329,7 @@ static void data_imports_ui_library_selection_pane_on_file_selected (DataImports
 	spit_data_imports_data_importer_on_file_selected (_tmp2_, _tmp3_);
 #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1334 "DataImportsUI.c"
+#line 1328 "DataImportsUI.c"
 }
 
 
@@ -1346,7 +1340,7 @@ static void data_imports_ui_library_selection_pane_class_init (DataImportsUILibr
 	g_type_class_add_private (klass, sizeof (DataImportsUILibrarySelectionPanePrivate));
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_ui_library_selection_pane_finalize;
-#line 1345 "DataImportsUI.c"
+#line 1339 "DataImportsUI.c"
 }
 
 
@@ -1359,11 +1353,11 @@ static void data_imports_ui_library_selection_pane_instance_init (DataImportsUIL
 	self->priv->selected_file = NULL;
 #line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self->priv->file_radio = NULL;
-#line 1358 "DataImportsUI.c"
+#line 1352 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_library_selection_pane_finalize (GObject* obj) {
+static void data_imports_ui_library_selection_pane_finalize (GObject * obj) {
 	DataImportsUILibrarySelectionPane * self;
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_UI_TYPE_LIBRARY_SELECTION_PANE, DataImportsUILibrarySelectionPane);
@@ -1377,7 +1371,7 @@ static void data_imports_ui_library_selection_pane_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->file_radio);
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (data_imports_ui_library_selection_pane_parent_class)->finalize (obj);
-#line 1376 "DataImportsUI.c"
+#line 1370 "DataImportsUI.c"
 }
 
 
@@ -1396,17 +1390,17 @@ GType data_imports_ui_library_selection_pane_get_type (void) {
 DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object_type, const gchar* message) {
 	DataImportsUIProgressPane * self = NULL;
 	GtkBox* content_box = NULL;
-	GtkBox* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkLabel* _tmp2_ = NULL;
-	GtkLabel* _tmp3_ = NULL;
-	GtkProgressBar* _tmp4_ = NULL;
-	GtkProgressBar* _tmp5_ = NULL;
-	GtkLabel* _tmp6_ = NULL;
-	GtkLabel* _tmp7_ = NULL;
-	GtkWidget* _tmp8_ = NULL;
-	GtkContainer* _tmp9_ = NULL;
-	GtkContainer* _tmp10_ = NULL;
+	GtkBox* _tmp0_;
+	const gchar* _tmp1_;
+	GtkLabel* _tmp2_;
+	GtkLabel* _tmp3_;
+	GtkProgressBar* _tmp4_;
+	GtkProgressBar* _tmp5_;
+	GtkLabel* _tmp6_;
+	GtkLabel* _tmp7_;
+	GtkWidget* _tmp8_;
+	GtkContainer* _tmp9_;
+	GtkContainer* _tmp10_;
 #line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (message != NULL, NULL);
 #line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1463,7 +1457,7 @@ DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object
 	if (_tmp9_ == NULL) {
 #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (_tmp8_);
-#line 1462 "DataImportsUI.c"
+#line 1456 "DataImportsUI.c"
 	}
 #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp10_ = _tmp9_;
@@ -1475,21 +1469,21 @@ DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object
 	_g_object_unref0 (content_box);
 #line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self;
-#line 1474 "DataImportsUI.c"
+#line 1468 "DataImportsUI.c"
 }
 
 
 DataImportsUIProgressPane* data_imports_ui_progress_pane_new (const gchar* message) {
 #line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return data_imports_ui_progress_pane_construct (DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, message);
-#line 1481 "DataImportsUI.c"
+#line 1475 "DataImportsUI.c"
 }
 
 
 void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* self, gdouble progress, const gchar* progress_message) {
-	GtkProgressBar* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	const gchar* _tmp2_ = NULL;
+	GtkProgressBar* _tmp0_;
+	gdouble _tmp1_;
+	const gchar* _tmp2_;
 #line 183 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_PROGRESS_PANE (self));
 #line 184 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1502,20 +1496,20 @@ void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* s
 	_tmp2_ = progress_message;
 #line 185 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp2_ != NULL) {
-#line 1501 "DataImportsUI.c"
-		GtkLabel* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
+#line 1495 "DataImportsUI.c"
+		GtkLabel* _tmp3_;
+		const gchar* _tmp4_;
 #line 186 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp3_ = self->priv->progress_label;
 #line 186 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp4_ = progress_message;
 #line 186 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		gtk_label_set_label (_tmp3_, _tmp4_);
-#line 1510 "DataImportsUI.c"
+#line 1504 "DataImportsUI.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	spin_event_loop ();
-#line 1514 "DataImportsUI.c"
+#line 1508 "DataImportsUI.c"
 }
 
 
@@ -1526,18 +1520,18 @@ static void data_imports_ui_progress_pane_class_init (DataImportsUIProgressPaneC
 	g_type_class_add_private (klass, sizeof (DataImportsUIProgressPanePrivate));
 #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_ui_progress_pane_finalize;
-#line 1525 "DataImportsUI.c"
+#line 1519 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_progress_pane_instance_init (DataImportsUIProgressPane * self) {
 #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self->priv = DATA_IMPORTS_UI_PROGRESS_PANE_GET_PRIVATE (self);
-#line 1532 "DataImportsUI.c"
+#line 1526 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_progress_pane_finalize (GObject* obj) {
+static void data_imports_ui_progress_pane_finalize (GObject * obj) {
 	DataImportsUIProgressPane * self;
 #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, DataImportsUIProgressPane);
@@ -1549,7 +1543,7 @@ static void data_imports_ui_progress_pane_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->progress_bar);
 #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (data_imports_ui_progress_pane_parent_class)->finalize (obj);
-#line 1548 "DataImportsUI.c"
+#line 1542 "DataImportsUI.c"
 }
 
 
@@ -1570,52 +1564,50 @@ static gboolean _data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_
 	result = data_imports_ui_data_imports_dialog_on_window_close ((DataImportsUIDataImportsDialog*) self, event);
 #line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 1569 "DataImportsUI.c"
+#line 1563 "DataImportsUI.c"
 }
 
 
 static void _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 251 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_on_service_changed ((DataImportsUIDataImportsDialog*) self);
-#line 1576 "DataImportsUI.c"
+#line 1570 "DataImportsUI.c"
 }
 
 
 static void _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_on_close_cancel_clicked ((DataImportsUIDataImportsDialog*) self);
-#line 1583 "DataImportsUI.c"
+#line 1577 "DataImportsUI.c"
 }
 
 
 DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (GType object_type) {
 	DataImportsUIDataImportsDialog * self = NULL;
 	gboolean use_header = FALSE;
-	GtkSettings* _tmp0_ = NULL;
+	GtkSettings* _tmp0_;
 	gint _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 	gchar* title = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar* _tmp5_;
 	gchar* label = NULL;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
+	gchar* _tmp6_;
+	const gchar* _tmp7_;
 	SpitDataImportsService** loaded_services = NULL;
-	gint _tmp10_ = 0;
-	SpitDataImportsService** _tmp11_ = NULL;
-	gint loaded_services_length1 = 0;
-	gint _loaded_services_size_ = 0;
-	SpitDataImportsService** _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	GtkBox* _tmp67_ = NULL;
-	GtkBox* _tmp68_ = NULL;
-	GtkBox* _tmp69_ = NULL;
-	gboolean _tmp70_ = FALSE;
-	GtkButton* _tmp81_ = NULL;
-	SpitDataImportsService** _tmp82_ = NULL;
-	gint _tmp82__length1 = 0;
+	gint _tmp8_;
+	SpitDataImportsService** _tmp9_;
+	gint loaded_services_length1;
+	gint _loaded_services_size_;
+	SpitDataImportsService** _tmp10_;
+	gint _tmp10__length1;
+	GtkBox* _tmp65_;
+	GtkBox* _tmp66_;
+	GtkBox* _tmp67_;
+	gboolean _tmp68_;
+	GtkButton* _tmp78_;
+	SpitDataImportsService** _tmp79_;
+	gint _tmp79__length1;
 #line 211 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	use_header = FALSE;
 #line 212 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1628,11 +1620,11 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
 	if (_tmp2_) {
 #line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = 1;
-#line 1627 "DataImportsUI.c"
+#line 1619 "DataImportsUI.c"
 	} else {
 #line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = 0;
-#line 1631 "DataImportsUI.c"
+#line 1623 "DataImportsUI.c"
 	}
 #line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = (DataImportsUIDataImportsDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
@@ -1640,352 +1632,348 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
 	_tmp3_ = use_header;
 #line 214 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp3_) {
-#line 1639 "DataImportsUI.c"
-		GtkWidget* _tmp4_ = NULL;
+#line 1631 "DataImportsUI.c"
+		GtkWidget* _tmp4_;
 #line 215 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp4_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 215 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE);
-#line 1645 "DataImportsUI.c"
+#line 1637 "DataImportsUI.c"
 	}
 #line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
 #line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_delete_event, self, 0);
 #line 220 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp5_ = _ ("Import From Application");
+	_tmp5_ = g_strdup (_ ("Import From Application"));
 #line 220 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp6_ = g_strdup (_tmp5_);
-#line 220 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	title = _tmp6_;
-#line 221 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp7_ = _ ("Import media _from:");
+	title = _tmp5_;
 #line 221 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp8_ = g_strdup (_tmp7_);
+	_tmp6_ = g_strdup (_ ("Import media _from:"));
 #line 221 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	label = _tmp8_;
+	label = _tmp6_;
 #line 223 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp9_ = title;
+	_tmp7_ = title;
 #line 223 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp9_);
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp7_);
 #line 225 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp11_ = spit_data_imports_load_services (FALSE, &_tmp10_);
+	_tmp9_ = spit_data_imports_load_services (FALSE, &_tmp8_);
 #line 225 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	loaded_services = _tmp11_;
+	loaded_services = _tmp9_;
 #line 225 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	loaded_services_length1 = _tmp10_;
+	loaded_services_length1 = _tmp8_;
 #line 225 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_loaded_services_size_ = loaded_services_length1;
 #line 227 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp12_ = loaded_services;
+	_tmp10_ = loaded_services;
 #line 227 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp12__length1 = loaded_services_length1;
+	_tmp10__length1 = loaded_services_length1;
 #line 227 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp12__length1 > 0) {
-#line 1681 "DataImportsUI.c"
-		GtkComboBoxText* _tmp13_ = NULL;
-		GtkComboBoxText* _tmp14_ = NULL;
+	if (_tmp10__length1 > 0) {
+#line 1669 "DataImportsUI.c"
+		GtkComboBoxText* _tmp11_;
+		GtkComboBoxText* _tmp12_;
 		gchar* last_used_service = NULL;
-		ConfigFacade* _tmp15_ = NULL;
-		ConfigFacade* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
+		ConfigFacade* _tmp13_;
+		ConfigFacade* _tmp14_;
+		gchar* _tmp15_;
+		gchar* _tmp16_;
 		gint ticker = 0;
 		gint last_used_index = 0;
-		SpitDataImportsService** _tmp19_ = NULL;
-		gint _tmp19__length1 = 0;
-		gint _tmp33_ = 0;
-		GtkComboBoxText* _tmp37_ = NULL;
-		gboolean _tmp38_ = FALSE;
+		SpitDataImportsService** _tmp17_;
+		gint _tmp17__length1;
+		gint _tmp31_;
+		GtkComboBoxText* _tmp35_;
+		gboolean _tmp36_;
 #line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp13_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+		_tmp11_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
 #line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		g_object_ref_sink (_tmp13_);
+		g_object_ref_sink (_tmp11_);
 #line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (self->priv->service_selector_box);
 #line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		self->priv->service_selector_box = _tmp13_;
+		self->priv->service_selector_box = _tmp11_;
 #line 231 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp14_ = self->priv->service_selector_box;
+		_tmp12_ = self->priv->service_selector_box;
 #line 231 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_combo_box_get_type (), GtkComboBox), 0);
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp15_ = config_facade_get_instance ();
+		_tmp13_ = config_facade_get_instance ();
 #line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp16_ = _tmp15_;
+		_tmp14_ = _tmp13_;
 #line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp17_ = configuration_facade_get_last_used_dataimports_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+		_tmp15_ = configuration_facade_get_last_used_dataimports_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp18_ = _tmp17_;
+		_tmp16_ = _tmp15_;
 #line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_g_object_unref0 (_tmp16_);
+		_g_object_unref0 (_tmp14_);
 #line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		last_used_service = _tmp18_;
+		last_used_service = _tmp16_;
 #line 236 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		ticker = 0;
 #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		last_used_index = -1;
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp19_ = loaded_services;
+		_tmp17_ = loaded_services;
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp19__length1 = loaded_services_length1;
-#line 1728 "DataImportsUI.c"
+		_tmp17__length1 = loaded_services_length1;
+#line 1716 "DataImportsUI.c"
 		{
 			SpitDataImportsService** service_collection = NULL;
 			gint service_collection_length1 = 0;
 			gint _service_collection_size_ = 0;
 			gint service_it = 0;
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_collection = _tmp19_;
+			service_collection = _tmp17_;
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_collection_length1 = _tmp19__length1;
+			service_collection_length1 = _tmp17__length1;
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			for (service_it = 0; service_it < _tmp19__length1; service_it = service_it + 1) {
-#line 1740 "DataImportsUI.c"
-				SpitDataImportsService* _tmp20_ = NULL;
+			for (service_it = 0; service_it < _tmp17__length1; service_it = service_it + 1) {
+#line 1728 "DataImportsUI.c"
+				SpitDataImportsService* _tmp18_;
 				SpitDataImportsService* service = NULL;
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-				_tmp20_ = _g_object_ref0 (service_collection[service_it]);
+				_tmp18_ = _g_object_ref0 (service_collection[service_it]);
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-				service = _tmp20_;
-#line 1747 "DataImportsUI.c"
+				service = _tmp18_;
+#line 1735 "DataImportsUI.c"
 				{
 					gchar* curr_service_id = NULL;
-					SpitDataImportsService* _tmp21_ = NULL;
-					const gchar* _tmp22_ = NULL;
-					gchar* _tmp23_ = NULL;
-					gboolean _tmp24_ = FALSE;
-					const gchar* _tmp25_ = NULL;
-					GtkComboBoxText* _tmp29_ = NULL;
-					SpitDataImportsService* _tmp30_ = NULL;
-					const gchar* _tmp31_ = NULL;
-					gint _tmp32_ = 0;
+					SpitDataImportsService* _tmp19_;
+					const gchar* _tmp20_;
+					gchar* _tmp21_;
+					gboolean _tmp22_ = FALSE;
+					const gchar* _tmp23_;
+					GtkComboBoxText* _tmp27_;
+					SpitDataImportsService* _tmp28_;
+					const gchar* _tmp29_;
+					gint _tmp30_;
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp21_ = service;
+					_tmp19_ = service;
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp22_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+					_tmp20_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp23_ = g_strdup (_tmp22_);
+					_tmp21_ = g_strdup (_tmp20_);
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					curr_service_id = _tmp23_;
+					curr_service_id = _tmp21_;
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp25_ = last_used_service;
+					_tmp23_ = last_used_service;
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					if (_tmp25_ != NULL) {
-#line 1771 "DataImportsUI.c"
-						const gchar* _tmp26_ = NULL;
-						const gchar* _tmp27_ = NULL;
+					if (_tmp23_ != NULL) {
+#line 1759 "DataImportsUI.c"
+						const gchar* _tmp24_;
+						const gchar* _tmp25_;
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						_tmp26_ = last_used_service;
+						_tmp24_ = last_used_service;
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						_tmp27_ = curr_service_id;
+						_tmp25_ = curr_service_id;
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						_tmp24_ = g_strcmp0 (_tmp26_, _tmp27_) == 0;
-#line 1780 "DataImportsUI.c"
+						_tmp22_ = g_strcmp0 (_tmp24_, _tmp25_) == 0;
+#line 1768 "DataImportsUI.c"
 					} else {
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						_tmp24_ = FALSE;
-#line 1784 "DataImportsUI.c"
+						_tmp22_ = FALSE;
+#line 1772 "DataImportsUI.c"
 					}
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					if (_tmp24_) {
-#line 1788 "DataImportsUI.c"
-						gint _tmp28_ = 0;
+					if (_tmp22_) {
+#line 1776 "DataImportsUI.c"
+						gint _tmp26_;
 #line 241 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						_tmp28_ = ticker;
+						_tmp26_ = ticker;
 #line 241 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						last_used_index = _tmp28_;
-#line 1794 "DataImportsUI.c"
+						last_used_index = _tmp26_;
+#line 1782 "DataImportsUI.c"
 					}
 #line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp29_ = self->priv->service_selector_box;
+					_tmp27_ = self->priv->service_selector_box;
 #line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp30_ = service;
+					_tmp28_ = service;
 #line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp31_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+					_tmp29_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					gtk_combo_box_text_append_text (_tmp29_, _tmp31_);
+					gtk_combo_box_text_append_text (_tmp27_, _tmp29_);
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp32_ = ticker;
+					_tmp30_ = ticker;
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					ticker = _tmp32_ + 1;
+					ticker = _tmp30_ + 1;
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_g_free0 (curr_service_id);
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_g_object_unref0 (service);
-#line 1812 "DataImportsUI.c"
+#line 1800 "DataImportsUI.c"
 				}
 			}
 		}
 #line 246 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp33_ = last_used_index;
+		_tmp31_ = last_used_index;
 #line 246 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		if (_tmp33_ >= 0) {
-#line 1820 "DataImportsUI.c"
-			GtkComboBoxText* _tmp34_ = NULL;
-			gint _tmp35_ = 0;
+		if (_tmp31_ >= 0) {
+#line 1808 "DataImportsUI.c"
+			GtkComboBoxText* _tmp32_;
+			gint _tmp33_;
 #line 247 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp34_ = self->priv->service_selector_box;
+			_tmp32_ = self->priv->service_selector_box;
 #line 247 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp35_ = last_used_index;
+			_tmp33_ = last_used_index;
 #line 247 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), _tmp35_);
-#line 1829 "DataImportsUI.c"
+			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_get_type (), GtkComboBox), _tmp33_);
+#line 1817 "DataImportsUI.c"
 		} else {
-			GtkComboBoxText* _tmp36_ = NULL;
+			GtkComboBoxText* _tmp34_;
 #line 249 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp36_ = self->priv->service_selector_box;
+			_tmp34_ = self->priv->service_selector_box;
 #line 249 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 1836 "DataImportsUI.c"
+			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 1824 "DataImportsUI.c"
 		}
 #line 251 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp37_ = self->priv->service_selector_box;
+		_tmp35_ = self->priv->service_selector_box;
 #line 251 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
 #line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp38_ = use_header;
+		_tmp36_ = use_header;
 #line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		if (!_tmp38_) {
-#line 1846 "DataImportsUI.c"
+		if (!_tmp36_) {
+#line 1834 "DataImportsUI.c"
 			GtkLabel* service_selector_box_label = NULL;
-			const gchar* _tmp39_ = NULL;
-			GtkLabel* _tmp40_ = NULL;
-			GtkLabel* _tmp41_ = NULL;
-			GtkComboBoxText* _tmp42_ = NULL;
-			GtkLabel* _tmp43_ = NULL;
-			GtkLabel* _tmp44_ = NULL;
-			GtkComboBoxText* _tmp45_ = NULL;
-			GtkComboBoxText* _tmp46_ = NULL;
-			GtkComboBoxText* _tmp47_ = NULL;
-			GtkComboBoxText* _tmp48_ = NULL;
+			const gchar* _tmp37_;
+			GtkLabel* _tmp38_;
+			GtkLabel* _tmp39_;
+			GtkComboBoxText* _tmp40_;
+			GtkLabel* _tmp41_;
+			GtkLabel* _tmp42_;
+			GtkComboBoxText* _tmp43_;
+			GtkComboBoxText* _tmp44_;
+			GtkComboBoxText* _tmp45_;
+			GtkComboBoxText* _tmp46_;
 			GtkBox* service_selector_layouter = NULL;
-			GtkBox* _tmp49_ = NULL;
-			GtkBox* _tmp50_ = NULL;
-			GtkBox* _tmp51_ = NULL;
-			GtkLabel* _tmp52_ = NULL;
-			GtkBox* _tmp53_ = NULL;
-			GtkComboBoxText* _tmp54_ = NULL;
+			GtkBox* _tmp47_;
+			GtkBox* _tmp48_;
+			GtkBox* _tmp49_;
+			GtkLabel* _tmp50_;
+			GtkBox* _tmp51_;
+			GtkComboBoxText* _tmp52_;
 			GtkBox* service_area_layouter = NULL;
-			GtkBox* _tmp55_ = NULL;
-			GtkBox* _tmp56_ = NULL;
-			GtkBox* _tmp57_ = NULL;
+			GtkBox* _tmp53_;
+			GtkBox* _tmp54_;
+			GtkBox* _tmp55_;
 			GtkSeparator* service_central_separator = NULL;
-			GtkSeparator* _tmp58_ = NULL;
-			GtkBox* _tmp59_ = NULL;
-			GtkSeparator* _tmp60_ = NULL;
-			GtkBox* _tmp61_ = NULL;
-			GtkBox* _tmp62_ = NULL;
-			GtkBox* _tmp63_ = NULL;
-			GtkBox* _tmp64_ = NULL;
-			GtkBox* _tmp65_ = NULL;
-			GtkBox* _tmp66_ = NULL;
+			GtkSeparator* _tmp56_;
+			GtkBox* _tmp57_;
+			GtkSeparator* _tmp58_;
+			GtkBox* _tmp59_;
+			GtkBox* _tmp60_;
+			GtkBox* _tmp61_;
+			GtkBox* _tmp62_;
+			GtkBox* _tmp63_;
+			GtkBox* _tmp64_;
 #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp39_ = label;
+			_tmp37_ = label;
 #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp40_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp39_);
+			_tmp38_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp37_);
 #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			g_object_ref_sink (_tmp40_);
+			g_object_ref_sink (_tmp38_);
 #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_selector_box_label = _tmp40_;
+			service_selector_box_label = _tmp38_;
 #line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp41_ = service_selector_box_label;
+			_tmp39_ = service_selector_box_label;
 #line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp42_ = self->priv->service_selector_box;
+			_tmp40_ = self->priv->service_selector_box;
 #line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_label_set_mnemonic_widget (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
+			gtk_label_set_mnemonic_widget (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget));
 #line 257 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp43_ = service_selector_box_label;
+			_tmp41_ = service_selector_box_label;
 #line 257 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 258 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp44_ = service_selector_box_label;
+			_tmp42_ = service_selector_box_label;
 #line 258 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp45_ = self->priv->service_selector_box;
+			_tmp43_ = self->priv->service_selector_box;
 #line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
+			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
 #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp46_ = self->priv->service_selector_box;
+			_tmp44_ = self->priv->service_selector_box;
 #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp47_ = self->priv->service_selector_box;
+			_tmp45_ = self->priv->service_selector_box;
 #line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), FALSE);
+			gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 267 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp48_ = self->priv->service_selector_box;
+			_tmp46_ = self->priv->service_selector_box;
 #line 267 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget), FALSE);
+			gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp49_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+			_tmp47_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
 #line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			g_object_ref_sink (_tmp49_);
+			g_object_ref_sink (_tmp47_);
 #line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_selector_layouter = _tmp49_;
+			service_selector_layouter = _tmp47_;
 #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp50_ = service_selector_layouter;
+			_tmp48_ = service_selector_layouter;
 #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_container_get_type (), GtkContainer), (guint) 12);
+			gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_container_get_type (), GtkContainer), (guint) 12);
 #line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp51_ = service_selector_layouter;
+			_tmp49_ = service_selector_layouter;
 #line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp52_ = service_selector_box_label;
+			_tmp50_ = service_selector_box_label;
 #line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget));
+			gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget));
 #line 272 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp53_ = service_selector_layouter;
+			_tmp51_ = service_selector_layouter;
 #line 272 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp54_ = self->priv->service_selector_box;
+			_tmp52_ = self->priv->service_selector_box;
 #line 272 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_box_pack_start (_tmp53_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+			gtk_box_pack_start (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp55_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+			_tmp53_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			g_object_ref_sink (_tmp55_);
+			g_object_ref_sink (_tmp53_);
 #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_area_layouter = _tmp55_;
+			service_area_layouter = _tmp53_;
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp56_ = service_area_layouter;
+			_tmp54_ = service_area_layouter;
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp57_ = service_selector_layouter;
+			_tmp55_ = service_selector_layouter;
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_box_pack_start (_tmp56_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+			gtk_box_pack_start (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp58_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+			_tmp56_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
 #line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			g_object_ref_sink (_tmp58_);
+			g_object_ref_sink (_tmp56_);
 #line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_central_separator = _tmp58_;
+			service_central_separator = _tmp56_;
 #line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp59_ = service_area_layouter;
+			_tmp57_ = service_area_layouter;
 #line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp60_ = service_central_separator;
+			_tmp58_ = service_central_separator;
 #line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget));
+			gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
 #line 280 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp61_ = service_area_layouter;
+			_tmp59_ = service_area_layouter;
 #line 280 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
 #line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp62_ = service_area_layouter;
+			_tmp60_ = service_area_layouter;
 #line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 282 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp63_ = service_area_layouter;
+			_tmp61_ = service_area_layouter;
 #line 282 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), TRUE);
+			gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 283 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp64_ = service_area_layouter;
+			_tmp62_ = service_area_layouter;
 #line 283 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), FALSE);
+			gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 285 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp65_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+			_tmp63_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 285 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp66_ = service_area_layouter;
+			_tmp64_ = service_area_layouter;
 #line 285 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+			gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_g_object_unref0 (service_central_separator);
 #line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1994,116 +1982,113 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
 			_g_object_unref0 (service_selector_layouter);
 #line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_g_object_unref0 (service_selector_box_label);
-#line 1993 "DataImportsUI.c"
+#line 1981 "DataImportsUI.c"
 		}
 #line 227 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_free0 (last_used_service);
-#line 1997 "DataImportsUI.c"
+#line 1985 "DataImportsUI.c"
 	}
 #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp67_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	_tmp65_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_object_ref_sink (_tmp67_);
+	g_object_ref_sink (_tmp65_);
 #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (self->priv->central_area_layouter);
 #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	self->priv->central_area_layouter = _tmp67_;
+	self->priv->central_area_layouter = _tmp65_;
 #line 291 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp68_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+	_tmp66_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 291 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp69_ = self->priv->central_area_layouter;
+	_tmp67_ = self->priv->central_area_layouter;
 #line 291 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp70_ = use_header;
+	_tmp68_ = use_header;
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp70_) {
-#line 2017 "DataImportsUI.c"
-		GtkButton* _tmp71_ = NULL;
-		GtkButton* _tmp72_ = NULL;
-		GtkWidget* _tmp73_ = NULL;
-		GtkButton* _tmp74_ = NULL;
-		GtkComboBoxText* _tmp75_ = NULL;
+	if (_tmp68_) {
+#line 2005 "DataImportsUI.c"
+		GtkButton* _tmp69_;
+		GtkButton* _tmp70_;
+		GtkWidget* _tmp71_;
+		GtkButton* _tmp72_;
+		GtkComboBoxText* _tmp73_;
 #line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp71_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
+		_tmp69_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
 #line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		g_object_ref_sink (_tmp71_);
+		g_object_ref_sink (_tmp69_);
 #line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (self->priv->close_cancel_button);
 #line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		self->priv->close_cancel_button = _tmp71_;
+		self->priv->close_cancel_button = _tmp69_;
 #line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp72_ = self->priv->close_cancel_button;
+		_tmp70_ = self->priv->close_cancel_button;
 #line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), TRUE);
+		gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp73_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+		_tmp71_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp74_ = self->priv->close_cancel_button;
+		_tmp72_ = self->priv->close_cancel_button;
 #line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
+		gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget));
 #line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp75_ = self->priv->service_selector_box;
+		_tmp73_ = self->priv->service_selector_box;
 #line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		if (_tmp75_ != NULL) {
-#line 2045 "DataImportsUI.c"
-			GtkWidget* _tmp76_ = NULL;
-			GtkComboBoxText* _tmp77_ = NULL;
+		if (_tmp73_ != NULL) {
+#line 2033 "DataImportsUI.c"
+			GtkWidget* _tmp74_;
+			GtkComboBoxText* _tmp75_;
 #line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp76_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+			_tmp74_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp77_ = self->priv->service_selector_box;
+			_tmp75_ = self->priv->service_selector_box;
 #line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget));
-#line 2054 "DataImportsUI.c"
+			gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget));
+#line 2042 "DataImportsUI.c"
 		}
 	} else {
-		const gchar* _tmp78_ = NULL;
-		GtkWidget* _tmp79_ = NULL;
-		GtkButton* _tmp80_ = NULL;
+		GtkWidget* _tmp76_;
+		GtkButton* _tmp77_;
 #line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp78_ = _ ("_Cancel");
-#line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _tmp78_, (gint) GTK_RESPONSE_CANCEL);
+		gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL);
 #line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp79_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
+		_tmp76_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
 #line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp80_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, gtk_button_get_type ()) ? ((GtkButton*) _tmp79_) : NULL);
+		_tmp77_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp76_, gtk_button_get_type ()) ? ((GtkButton*) _tmp76_) : NULL);
 #line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (self->priv->close_cancel_button);
 #line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		self->priv->close_cancel_button = _tmp80_;
-#line 2072 "DataImportsUI.c"
+		self->priv->close_cancel_button = _tmp77_;
+#line 2057 "DataImportsUI.c"
 	}
 #line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp81_ = self->priv->close_cancel_button;
+	_tmp78_ = self->priv->close_cancel_button;
 #line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_signal_connect_object (_tmp81_, "clicked", (GCallback) _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp78_, "clicked", (GCallback) _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
 #line 308 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_set_standard_window_mode (self);
 #line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp82_ = loaded_services;
+	_tmp79_ = loaded_services;
 #line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp82__length1 = loaded_services_length1;
+	_tmp79__length1 = loaded_services_length1;
 #line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp82__length1 > 0) {
+	if (_tmp79__length1 > 0) {
 #line 312 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_on_service_changed (self);
-#line 2088 "DataImportsUI.c"
+#line 2073 "DataImportsUI.c"
 	} else {
-		DataImportsUIStaticMessagePane* _tmp83_ = NULL;
-		DataImportsUIStaticMessagePane* _tmp84_ = NULL;
+		DataImportsUIStaticMessagePane* _tmp80_;
+		DataImportsUIStaticMessagePane* _tmp81_;
 #line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp83_ = data_imports_ui_static_message_pane_new_with_pango (DATA_IMPORTS_UI_NO_PLUGINS_ENABLED_MESSAGE);
+		_tmp80_ = data_imports_ui_static_message_pane_new_with_pango (DATA_IMPORTS_UI_NO_PLUGINS_ENABLED_MESSAGE);
 #line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp84_ = _tmp83_;
+		_tmp81_ = _tmp80_;
 #line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		data_imports_ui_data_imports_dialog_install_pane (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+		data_imports_ui_data_imports_dialog_install_pane (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
 #line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_g_object_unref0 (_tmp84_);
+		_g_object_unref0 (_tmp81_);
 #line 316 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_set_close_button_mode (self);
-#line 2102 "DataImportsUI.c"
+#line 2087 "DataImportsUI.c"
 	}
 #line 319 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -2115,28 +2100,28 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
 	_g_free0 (title);
 #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self;
-#line 2114 "DataImportsUI.c"
+#line 2099 "DataImportsUI.c"
 }
 
 
 DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_new (void) {
 #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return data_imports_ui_data_imports_dialog_construct (DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG);
-#line 2121 "DataImportsUI.c"
+#line 2106 "DataImportsUI.c"
 }
 
 
 DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_create_instance (void) {
 	DataImportsUIDataImportsDialog* result = NULL;
-	DataImportsUIDataImportsDialog* _tmp0_ = NULL;
-	DataImportsUIDataImportsDialog* _tmp2_ = NULL;
-	DataImportsUIDataImportsDialog* _tmp3_ = NULL;
+	DataImportsUIDataImportsDialog* _tmp0_;
+	DataImportsUIDataImportsDialog* _tmp2_;
+	DataImportsUIDataImportsDialog* _tmp3_;
 #line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = data_imports_ui_data_imports_dialog_instance;
 #line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ == NULL) {
-#line 2134 "DataImportsUI.c"
-		DataImportsUIDataImportsDialog* _tmp1_ = NULL;
+#line 2119 "DataImportsUI.c"
+		DataImportsUIDataImportsDialog* _tmp1_;
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = data_imports_ui_data_imports_dialog_new ();
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2145,7 +2130,7 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_creat
 		_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_instance = _tmp1_;
-#line 2144 "DataImportsUI.c"
+#line 2129 "DataImportsUI.c"
 	}
 #line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp2_ = data_imports_ui_data_imports_dialog_instance;
@@ -2155,29 +2140,29 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_creat
 	result = _tmp3_;
 #line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 2154 "DataImportsUI.c"
+#line 2139 "DataImportsUI.c"
 }
 
 
 void data_imports_ui_data_imports_dialog_terminate_instance (void) {
-	DataImportsUIDataImportsDialog* _tmp0_ = NULL;
+	DataImportsUIDataImportsDialog* _tmp0_;
 #line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = data_imports_ui_data_imports_dialog_instance;
 #line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ != NULL) {
-#line 2164 "DataImportsUI.c"
-		DataImportsUIDataImportsDialog* _tmp1_ = NULL;
+#line 2149 "DataImportsUI.c"
+		DataImportsUIDataImportsDialog* _tmp1_;
 #line 331 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = data_imports_ui_data_imports_dialog_instance;
 #line 331 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_terminate (_tmp1_);
-#line 2170 "DataImportsUI.c"
+#line 2155 "DataImportsUI.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
 #line 333 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_instance = NULL;
-#line 2176 "DataImportsUI.c"
+#line 2161 "DataImportsUI.c"
 }
 
 
@@ -2196,30 +2181,30 @@ static gboolean data_imports_ui_data_imports_dialog_on_window_close (DataImports
 	result = TRUE;
 #line 340 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 2194 "DataImportsUI.c"
+#line 2179 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsUIDataImportsDialog* self) {
 	gchar* service_name = NULL;
-	GtkComboBoxText* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	GtkComboBoxText* _tmp0_;
+	gchar* _tmp1_;
 	SpitDataImportsService* selected_service = NULL;
 	SpitDataImportsService** services = NULL;
-	gint _tmp2_ = 0;
-	SpitDataImportsService** _tmp3_ = NULL;
-	gint services_length1 = 0;
-	gint _services_size_ = 0;
-	SpitDataImportsService** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	SpitDataImportsService* _tmp11_ = NULL;
-	ConfigFacade* _tmp12_ = NULL;
-	ConfigFacade* _tmp13_ = NULL;
-	SpitDataImportsService* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	SpitDataImportsService* _tmp16_ = NULL;
-	SpitDataImportsConcreteDataImportsHost* _tmp17_ = NULL;
-	SpitDataImportsConcreteDataImportsHost* _tmp18_ = NULL;
+	gint _tmp2_;
+	SpitDataImportsService** _tmp3_;
+	gint services_length1;
+	gint _services_size_;
+	SpitDataImportsService** _tmp4_;
+	gint _tmp4__length1;
+	SpitDataImportsService* _tmp11_;
+	ConfigFacade* _tmp12_;
+	ConfigFacade* _tmp13_;
+	SpitDataImportsService* _tmp14_;
+	const gchar* _tmp15_;
+	SpitDataImportsService* _tmp16_;
+	SpitDataImportsConcreteDataImportsHost* _tmp17_;
+	SpitDataImportsConcreteDataImportsHost* _tmp18_;
 #line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
 #line 344 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2244,7 +2229,7 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
 	_tmp4_ = services;
 #line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp4__length1 = services_length1;
-#line 2242 "DataImportsUI.c"
+#line 2227 "DataImportsUI.c"
 	{
 		SpitDataImportsService** service_collection = NULL;
 		gint service_collection_length1 = 0;
@@ -2256,18 +2241,18 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
 		service_collection_length1 = _tmp4__length1;
 #line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		for (service_it = 0; service_it < _tmp4__length1; service_it = service_it + 1) {
-#line 2254 "DataImportsUI.c"
-			SpitDataImportsService* _tmp5_ = NULL;
+#line 2239 "DataImportsUI.c"
+			SpitDataImportsService* _tmp5_;
 			SpitDataImportsService* service = NULL;
 #line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp5_ = _g_object_ref0 (service_collection[service_it]);
 #line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			service = _tmp5_;
-#line 2261 "DataImportsUI.c"
+#line 2246 "DataImportsUI.c"
 			{
-				SpitDataImportsService* _tmp6_ = NULL;
-				const gchar* _tmp7_ = NULL;
-				const gchar* _tmp8_ = NULL;
+				SpitDataImportsService* _tmp6_;
+				const gchar* _tmp7_;
+				const gchar* _tmp8_;
 #line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				_tmp6_ = service;
 #line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2276,9 +2261,9 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
 				_tmp8_ = service_name;
 #line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 2274 "DataImportsUI.c"
-					SpitDataImportsService* _tmp9_ = NULL;
-					SpitDataImportsService* _tmp10_ = NULL;
+#line 2259 "DataImportsUI.c"
+					SpitDataImportsService* _tmp9_;
+					SpitDataImportsService* _tmp10_;
 #line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_tmp9_ = service;
 #line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2291,11 +2276,11 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
 					_g_object_unref0 (service);
 #line 352 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					break;
-#line 2289 "DataImportsUI.c"
+#line 2274 "DataImportsUI.c"
 				}
 #line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				_g_object_unref0 (service);
-#line 2293 "DataImportsUI.c"
+#line 2278 "DataImportsUI.c"
 			}
 		}
 	}
@@ -2333,7 +2318,7 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
 	_g_object_unref0 (selected_service);
 #line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_free0 (service_name);
-#line 2331 "DataImportsUI.c"
+#line 2316 "DataImportsUI.c"
 }
 
 
@@ -2345,12 +2330,12 @@ static void data_imports_ui_data_imports_dialog_on_close_cancel_clicked (DataImp
 " invoked.");
 #line 366 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_terminate (self);
-#line 2342 "DataImportsUI.c"
+#line 2327 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImportsDialog* self) {
-	SpitDataImportsConcreteDataImportsHost* _tmp0_ = NULL;
+	SpitDataImportsConcreteDataImportsHost* _tmp0_;
 #line 369 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
 #line 370 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2359,8 +2344,8 @@ static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImpo
 	_tmp0_ = self->priv->host;
 #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ != NULL) {
-#line 2356 "DataImportsUI.c"
-		SpitDataImportsConcreteDataImportsHost* _tmp1_ = NULL;
+#line 2341 "DataImportsUI.c"
+		SpitDataImportsConcreteDataImportsHost* _tmp1_;
 #line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = self->priv->host;
 #line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2369,7 +2354,7 @@ static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImpo
 		_g_object_unref0 (self->priv->host);
 #line 374 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		self->priv->host = NULL;
-#line 2366 "DataImportsUI.c"
+#line 2351 "DataImportsUI.c"
 	}
 #line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -2379,12 +2364,12 @@ static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImpo
 	_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
 #line 379 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_instance = NULL;
-#line 2376 "DataImportsUI.c"
+#line 2361 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_set_large_window_mode (DataImportsUIDataImportsDialog* self) {
-	GtkBox* _tmp0_ = NULL;
+	GtkBox* _tmp0_;
 #line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
 #line 383 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2395,12 +2380,12 @@ static void data_imports_ui_data_imports_dialog_set_large_window_mode (DataImpor
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
 #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2392 "DataImportsUI.c"
+#line 2377 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_set_colossal_window_mode (DataImportsUIDataImportsDialog* self) {
-	GtkBox* _tmp0_ = NULL;
+	GtkBox* _tmp0_;
 #line 389 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
 #line 390 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2411,12 +2396,12 @@ static void data_imports_ui_data_imports_dialog_set_colossal_window_mode (DataIm
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
 #line 393 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2408 "DataImportsUI.c"
+#line 2393 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_set_standard_window_mode (DataImportsUIDataImportsDialog* self) {
-	GtkBox* _tmp0_ = NULL;
+	GtkBox* _tmp0_;
 #line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
 #line 397 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2427,7 +2412,7 @@ static void data_imports_ui_data_imports_dialog_set_standard_window_mode (DataIm
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
 #line 400 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2424 "DataImportsUI.c"
+#line 2409 "DataImportsUI.c"
 }
 
 
@@ -2436,7 +2421,7 @@ static void data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (Da
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
 #line 404 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 2433 "DataImportsUI.c"
+#line 2418 "DataImportsUI.c"
 }
 
 
@@ -2445,14 +2430,14 @@ static void data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
 #line 408 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2442 "DataImportsUI.c"
+#line 2427 "DataImportsUI.c"
 }
 
 
 SpitDataImportsDialogPane* data_imports_ui_data_imports_dialog_get_active_pane (DataImportsUIDataImportsDialog* self) {
 	SpitDataImportsDialogPane* result = NULL;
-	SpitDataImportsDialogPane* _tmp0_ = NULL;
-	SpitDataImportsDialogPane* _tmp1_ = NULL;
+	SpitDataImportsDialogPane* _tmp0_;
+	SpitDataImportsDialogPane* _tmp1_;
 #line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self), NULL);
 #line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2463,83 +2448,77 @@ SpitDataImportsDialogPane* data_imports_ui_data_imports_dialog_get_active_pane (
 	result = _tmp1_;
 #line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 2460 "DataImportsUI.c"
+#line 2445 "DataImportsUI.c"
 }
 
 
 void data_imports_ui_data_imports_dialog_set_close_button_mode (DataImportsUIDataImportsDialog* self) {
-	GtkButton* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkButton* _tmp2_ = NULL;
+	GtkButton* _tmp0_;
+	GtkButton* _tmp1_;
 #line 415 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
 #line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->close_cancel_button;
 #line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp1_ = _ ("_Close");
-#line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_button_set_label (_tmp0_, _tmp1_);
+	gtk_button_set_label (_tmp0_, _ ("_Close"));
 #line 417 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp2_ = self->priv->close_cancel_button;
+	_tmp1_ = self->priv->close_cancel_button;
 #line 417 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2480 "DataImportsUI.c"
+	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
+#line 2462 "DataImportsUI.c"
 }
 
 
 void data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDataImportsDialog* self) {
-	GtkButton* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	GtkButton* _tmp0_;
 #line 420 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
 #line 421 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->close_cancel_button;
 #line 421 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp1_ = _ ("_Cancel");
-#line 421 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_button_set_label (_tmp0_, _tmp1_);
-#line 2495 "DataImportsUI.c"
+	gtk_button_set_label (_tmp0_, _ ("_Cancel"));
+#line 2474 "DataImportsUI.c"
 }
 
 
 void data_imports_ui_data_imports_dialog_lock_service (DataImportsUIDataImportsDialog* self) {
-	GtkComboBoxText* _tmp0_ = NULL;
+	GtkComboBoxText* _tmp0_;
 #line 424 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
 #line 425 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
 #line 425 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2507 "DataImportsUI.c"
+#line 2486 "DataImportsUI.c"
 }
 
 
 void data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImportsDialog* self) {
-	GtkComboBoxText* _tmp0_ = NULL;
+	GtkComboBoxText* _tmp0_;
 #line 428 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
 #line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
 #line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 2519 "DataImportsUI.c"
+#line 2498 "DataImportsUI.c"
 }
 
 
 void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsDialog* self, SpitDataImportsDialogPane* pane) {
-	SpitDataImportsDialogPane* _tmp0_ = NULL;
-	GtkBox* _tmp6_ = NULL;
-	SpitDataImportsDialogPane* _tmp7_ = NULL;
-	GtkWidget* _tmp8_ = NULL;
-	GtkWidget* _tmp9_ = NULL;
+	SpitDataImportsDialogPane* _tmp0_;
+	GtkBox* _tmp6_;
+	SpitDataImportsDialogPane* _tmp7_;
+	GtkWidget* _tmp8_;
+	GtkWidget* _tmp9_;
 	SpitDataImportsDialogPaneGeometryOptions geometry_options = 0;
-	SpitDataImportsDialogPane* _tmp10_ = NULL;
-	SpitDataImportsDialogPaneGeometryOptions _tmp11_ = 0;
-	SpitDataImportsDialogPaneGeometryOptions _tmp12_ = 0;
-	SpitDataImportsDialogPaneGeometryOptions _tmp14_ = 0;
-	SpitDataImportsDialogPane* _tmp15_ = NULL;
-	SpitDataImportsDialogPane* _tmp16_ = NULL;
-	SpitDataImportsDialogPane* _tmp17_ = NULL;
+	SpitDataImportsDialogPane* _tmp10_;
+	SpitDataImportsDialogPaneGeometryOptions _tmp11_;
+	SpitDataImportsDialogPaneGeometryOptions _tmp12_;
+	SpitDataImportsDialogPaneGeometryOptions _tmp14_;
+	SpitDataImportsDialogPane* _tmp15_;
+	SpitDataImportsDialogPane* _tmp16_;
+	SpitDataImportsDialogPane* _tmp17_;
 #line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
 #line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2550,12 +2529,12 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD
 	_tmp0_ = self->priv->active_pane;
 #line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ != NULL) {
-#line 2547 "DataImportsUI.c"
-		SpitDataImportsDialogPane* _tmp1_ = NULL;
-		GtkBox* _tmp2_ = NULL;
-		SpitDataImportsDialogPane* _tmp3_ = NULL;
-		GtkWidget* _tmp4_ = NULL;
-		GtkWidget* _tmp5_ = NULL;
+#line 2526 "DataImportsUI.c"
+		SpitDataImportsDialogPane* _tmp1_;
+		GtkBox* _tmp2_;
+		SpitDataImportsDialogPane* _tmp3_;
+		GtkWidget* _tmp4_;
+		GtkWidget* _tmp5_;
 #line 436 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		g_debug ("DataImportsUI.vala:436: DataImportsDialog: install_pane( ): a pane is " \
 "already installed; removing it.");
@@ -2575,7 +2554,7 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), _tmp5_);
 #line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (_tmp5_);
-#line 2571 "DataImportsUI.c"
+#line 2550 "DataImportsUI.c"
 	}
 #line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp6_ = self->priv->central_area_layouter;
@@ -2603,20 +2582,20 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD
 	if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) {
 #line 448 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_set_large_window_mode (self);
-#line 2599 "DataImportsUI.c"
+#line 2578 "DataImportsUI.c"
 	} else {
-		SpitDataImportsDialogPaneGeometryOptions _tmp13_ = 0;
+		SpitDataImportsDialogPaneGeometryOptions _tmp13_;
 #line 449 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp13_ = geometry_options;
 #line 449 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		if ((_tmp13_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) {
 #line 450 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			data_imports_ui_data_imports_dialog_set_colossal_window_mode (self);
-#line 2608 "DataImportsUI.c"
+#line 2587 "DataImportsUI.c"
 		} else {
 #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			data_imports_ui_data_imports_dialog_set_standard_window_mode (self);
-#line 2612 "DataImportsUI.c"
+#line 2591 "DataImportsUI.c"
 		}
 	}
 #line 454 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2625,11 +2604,11 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD
 	if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) {
 #line 455 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (self);
-#line 2621 "DataImportsUI.c"
+#line 2600 "DataImportsUI.c"
 	} else {
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (self);
-#line 2625 "DataImportsUI.c"
+#line 2604 "DataImportsUI.c"
 	}
 #line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp15_ = pane;
@@ -2643,7 +2622,7 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD
 	_tmp17_ = pane;
 #line 460 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	spit_data_imports_dialog_pane_on_pane_installed (_tmp17_);
-#line 2639 "DataImportsUI.c"
+#line 2618 "DataImportsUI.c"
 }
 
 
@@ -2654,18 +2633,18 @@ static void data_imports_ui_data_imports_dialog_class_init (DataImportsUIDataImp
 	g_type_class_add_private (klass, sizeof (DataImportsUIDataImportsDialogPrivate));
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_ui_data_imports_dialog_finalize;
-#line 2650 "DataImportsUI.c"
+#line 2629 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_instance_init (DataImportsUIDataImportsDialog * self) {
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self->priv = DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_GET_PRIVATE (self);
-#line 2657 "DataImportsUI.c"
+#line 2636 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_data_imports_dialog_finalize (GObject* obj) {
+static void data_imports_ui_data_imports_dialog_finalize (GObject * obj) {
 	DataImportsUIDataImportsDialog * self;
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG, DataImportsUIDataImportsDialog);
@@ -2681,7 +2660,7 @@ static void data_imports_ui_data_imports_dialog_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->host);
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (data_imports_ui_data_imports_dialog_parent_class)->finalize (obj);
-#line 2677 "DataImportsUI.c"
+#line 2656 "DataImportsUI.c"
 }
 
 
diff --git a/src/db/DatabaseTable.c b/src/db/DatabaseTable.c
index cd0a93e..8d595f0 100644
--- a/src/db/DatabaseTable.c
+++ b/src/db/DatabaseTable.c
@@ -1,4 +1,4 @@
-/* DatabaseTable.c generated by valac 0.34.7, the Vala compiler
+/* DatabaseTable.c generated by valac 0.36.6, the Vala compiler
  * generated from DatabaseTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -94,8 +94,8 @@ void database_table_fatal (const gchar* op, gint res);
 void database_table_set_table_name (DatabaseTable* self, const gchar* table_name);
 void database_table_throw_error (const gchar* method, gint res, GError** error);
 gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id);
-gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt** stmt);
-static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id, const gchar* column, sqlite3_stmt** stmt);
+gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt);
+static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id, const gchar* column, sqlite3_stmt* * stmt);
 static gboolean database_table_execute_update_by_id (DatabaseTable* self, sqlite3_stmt* stmt);
 gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text);
 void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error);
@@ -112,7 +112,7 @@ gint database_table_get_row_count (DatabaseTable* self);
 void database_table_begin_transaction (void);
 void database_table_commit_transaction (GError** error);
 DatabaseTable* database_table_construct (GType object_type);
-static void database_table_finalize (DatabaseTable* obj);
+static void database_table_finalize (DatabaseTable * obj);
 
 
 GQuark database_error_quark (void) {
@@ -129,15 +129,15 @@ static void _database_table_on_trace_sqlite_trace_callback (gpointer self, const
 
 static void database_table_prepare_db (const gchar* filename) {
 	gint res = 0;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	sqlite3* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	const gchar* _tmp9_ = NULL;
+	gint _tmp2_;
+	gint _tmp3_;
+	const gchar* _tmp8_;
 	const gchar* sql_debug = NULL;
-	const gchar* _tmp26_ = NULL;
-	gboolean _tmp27_ = FALSE;
-	const gchar* _tmp28_ = NULL;
+	const gchar* _tmp23_;
+	gboolean _tmp24_ = FALSE;
+	const gchar* _tmp25_;
 	GError * _inner_error_ = NULL;
 #line 32 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (filename != NULL);
@@ -156,124 +156,115 @@ static void database_table_prepare_db (const gchar* filename) {
 #line 36 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp3_ != SQLITE_OK) {
 #line 159 "DatabaseTable.c"
-		const gchar* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
+		const gchar* _tmp4_;
+		gint _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp4_ = _ ("Unable to open/create photo database %s: error code %d");
+		_tmp4_ = filename;
 #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp5_ = filename;
-#line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp6_ = res;
+		_tmp5_ = res;
 #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp7_ = g_strdup_printf (_tmp4_, _tmp5_, _tmp6_);
+		_tmp6_ = g_strdup_printf (_ ("Unable to open/create photo database %s: error code %d"), _tmp4_, _tmp5_);
 #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		app_window_panic (_tmp8_);
+		app_window_panic (_tmp7_);
 #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_g_free0 (_tmp8_);
-#line 179 "DatabaseTable.c"
+		_g_free0 (_tmp7_);
+#line 176 "DatabaseTable.c"
 	}
 #line 41 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp9_ = filename;
+	_tmp8_ = filename;
 #line 41 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (g_strcmp0 (_tmp9_, DB_IN_MEMORY_NAME) != 0) {
-#line 185 "DatabaseTable.c"
+	if (g_strcmp0 (_tmp8_, DB_IN_MEMORY_NAME) != 0) {
+#line 182 "DatabaseTable.c"
 		{
 			GFile* file_db = NULL;
-			const gchar* _tmp10_ = NULL;
-			GFile* _tmp11_ = NULL;
+			const gchar* _tmp9_;
+			GFile* _tmp10_;
 			GFileInfo* info = NULL;
-			GFile* _tmp12_ = NULL;
-			GFileInfo* _tmp13_ = NULL;
-			GFileInfo* _tmp14_ = NULL;
-			gboolean _tmp15_ = FALSE;
+			GFile* _tmp11_;
+			GFileInfo* _tmp12_;
+			GFileInfo* _tmp13_;
+			gboolean _tmp14_;
 #line 43 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp10_ = filename;
+			_tmp9_ = filename;
 #line 43 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp11_ = g_file_new_for_path (_tmp10_);
+			_tmp10_ = g_file_new_for_path (_tmp9_);
 #line 43 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			file_db = _tmp11_;
+			file_db = _tmp10_;
 #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp12_ = file_db;
+			_tmp11_ = file_db;
 #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp13_ = g_file_query_info (_tmp12_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+			_tmp12_ = g_file_query_info (_tmp11_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
 #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			info = _tmp13_;
+			info = _tmp12_;
 #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_object_unref0 (file_db);
-#line 211 "DatabaseTable.c"
+#line 208 "DatabaseTable.c"
 				goto __catch15_g_error;
 			}
 #line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp14_ = info;
+			_tmp13_ = info;
 #line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp15_ = g_file_info_get_attribute_boolean (_tmp14_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE);
+			_tmp14_ = g_file_info_get_attribute_boolean (_tmp13_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE);
 #line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			if (!_tmp15_) {
-#line 220 "DatabaseTable.c"
-				const gchar* _tmp16_ = NULL;
-				const gchar* _tmp17_ = NULL;
-				gchar* _tmp18_ = NULL;
-				gchar* _tmp19_ = NULL;
-#line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_tmp16_ = _ ("Unable to write to photo database file:\n %s");
+			if (!_tmp14_) {
+#line 217 "DatabaseTable.c"
+				const gchar* _tmp15_;
+				gchar* _tmp16_;
+				gchar* _tmp17_;
 #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_tmp17_ = filename;
+				_tmp15_ = filename;
 #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_tmp18_ = g_strdup_printf (_tmp16_, _tmp17_);
+				_tmp16_ = g_strdup_printf (_ ("Unable to write to photo database file:\n %s"), _tmp15_);
 #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_tmp19_ = _tmp18_;
+				_tmp17_ = _tmp16_;
 #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				app_window_panic (_tmp19_);
+				app_window_panic (_tmp17_);
 #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_g_free0 (_tmp19_);
-#line 237 "DatabaseTable.c"
+				_g_free0 (_tmp17_);
+#line 231 "DatabaseTable.c"
 			}
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_object_unref0 (info);
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_object_unref0 (file_db);
-#line 243 "DatabaseTable.c"
+#line 237 "DatabaseTable.c"
 		}
 		goto __finally15;
 		__catch15_g_error:
 		{
 			GError* e = NULL;
-			const gchar* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
-			GError* _tmp22_ = NULL;
-			const gchar* _tmp23_ = NULL;
-			gchar* _tmp24_ = NULL;
-			gchar* _tmp25_ = NULL;
+			const gchar* _tmp18_;
+			GError* _tmp19_;
+			const gchar* _tmp20_;
+			gchar* _tmp21_;
+			gchar* _tmp22_;
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			e = _inner_error_;
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_inner_error_ = NULL;
 #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp20_ = _ ("Error accessing database file:\n %s\n\nError was: \n%s");
+			_tmp18_ = filename;
 #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp21_ = filename;
+			_tmp19_ = e;
 #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp22_ = e;
+			_tmp20_ = _tmp19_->message;
 #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp23_ = _tmp22_->message;
+			_tmp21_ = g_strdup_printf (_ ("Error accessing database file:\n %s\n\nError was: \n%s"), _tmp18_, _tmp20_);
 #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp24_ = g_strdup_printf (_tmp20_, _tmp21_, _tmp23_);
+			_tmp22_ = _tmp21_;
 #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp25_ = _tmp24_;
+			app_window_panic (_tmp22_);
 #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			app_window_panic (_tmp25_);
-#line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_g_free0 (_tmp25_);
+			_g_free0 (_tmp22_);
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_error_free0 (e);
-#line 277 "DatabaseTable.c"
+#line 268 "DatabaseTable.c"
 		}
 		__finally15:
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -284,129 +275,129 @@ static void database_table_prepare_db (const gchar* filename) {
 			g_clear_error (&_inner_error_);
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			return;
-#line 288 "DatabaseTable.c"
+#line 279 "DatabaseTable.c"
 		}
 	}
 #line 53 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp26_ = g_getenv ("SHOTWELL_SQL_DEBUG");
+	_tmp23_ = g_getenv ("SHOTWELL_SQL_DEBUG");
 #line 53 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	sql_debug = _tmp26_;
+	sql_debug = _tmp23_;
 #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp28_ = sql_debug;
+	_tmp25_ = sql_debug;
 #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp28_ != NULL) {
-#line 299 "DatabaseTable.c"
-		const gchar* _tmp29_ = NULL;
+	if (_tmp25_ != NULL) {
+#line 290 "DatabaseTable.c"
+		const gchar* _tmp26_;
 #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp29_ = sql_debug;
+		_tmp26_ = sql_debug;
 #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp27_ = g_strcmp0 (_tmp29_, "") != 0;
-#line 305 "DatabaseTable.c"
+		_tmp24_ = g_strcmp0 (_tmp26_, "") != 0;
+#line 296 "DatabaseTable.c"
 	} else {
 #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp27_ = FALSE;
-#line 309 "DatabaseTable.c"
+		_tmp24_ = FALSE;
+#line 300 "DatabaseTable.c"
 	}
 #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp27_) {
-#line 313 "DatabaseTable.c"
-		sqlite3* _tmp30_ = NULL;
+	if (_tmp24_) {
+#line 304 "DatabaseTable.c"
+		sqlite3* _tmp27_;
 #line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp30_ = database_table_db;
+		_tmp27_ = database_table_db;
 #line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		sqlite3_trace (_tmp30_, _database_table_on_trace_sqlite_trace_callback, NULL);
-#line 319 "DatabaseTable.c"
+		sqlite3_trace (_tmp27_, _database_table_on_trace_sqlite_trace_callback, NULL);
+#line 310 "DatabaseTable.c"
 	}
 }
 
 
 void database_table_on_trace (const gchar* message) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 61 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (message != NULL);
 #line 62 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = message;
 #line 62 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_debug ("DatabaseTable.vala:62: SQLITE: %s", _tmp0_);
-#line 332 "DatabaseTable.c"
+#line 323 "DatabaseTable.c"
 }
 
 
-static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback callback, void* callback_target, gchar** errmsg) {
+static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback callback, void* callback_target, gchar* * errmsg) {
 	gchar* _vala_errmsg = NULL;
 	gint result = 0;
 	const gchar* sqlite_errmsg = NULL;
 	gint ec = 0;
-	const gchar* _tmp0_ = NULL;
-	sqlite3_callback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
+	const gchar* _tmp0_;
+	sqlite3_callback _tmp1_;
+	void* _tmp1__target;
 	const gchar* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	const gchar* _tmp6_ = NULL;
-#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+	gint _tmp3_;
+	const gchar* _tmp6_;
+#line 34 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 34 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 	g_return_val_if_fail (sql != NULL, 0);
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 	_tmp0_ = sql;
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 	_tmp1_ = callback;
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 	_tmp1__target = callback_target;
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 	_tmp3_ = sqlite3_exec (self, _tmp0_, _tmp1_, _tmp1__target, (char**) (&_tmp2_));
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 	sqlite_errmsg = _tmp2_;
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 	ec = _tmp3_;
-#line 37 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 37 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 	if ((&_vala_errmsg) != NULL) {
-#line 365 "DatabaseTable.c"
-		const gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 356 "DatabaseTable.c"
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
+#line 38 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 		_tmp4_ = sqlite_errmsg;
-#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 		_tmp5_ = g_strdup (_tmp4_);
-#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 		_g_free0 (_vala_errmsg);
-#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 		_vala_errmsg = _tmp5_;
-#line 376 "DatabaseTable.c"
+#line 367 "DatabaseTable.c"
 	}
-#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 40 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 	_tmp6_ = sqlite_errmsg;
-#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 40 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 	sqlite3_free ((void*) _tmp6_);
-#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 	result = ec;
-#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 	if (errmsg) {
-#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 		*errmsg = _vala_errmsg;
-#line 388 "DatabaseTable.c"
+#line 379 "DatabaseTable.c"
 	} else {
-#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 		_g_free0 (_vala_errmsg);
-#line 392 "DatabaseTable.c"
+#line 383 "DatabaseTable.c"
 	}
-#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi"
 	return result;
-#line 396 "DatabaseTable.c"
+#line 387 "DatabaseTable.c"
 }
 
 
 void database_table_init (const gchar* filename) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp1_ = NULL;
+	sqlite3* _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	sqlite3* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
+	gint _tmp3_;
+	gint _tmp4_;
+	sqlite3* _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
 	GError * _inner_error_ = NULL;
 #line 65 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (filename != NULL);
@@ -428,10 +419,10 @@ void database_table_init (const gchar* filename) {
 	_tmp4_ = res;
 #line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp4_ != SQLITE_OK) {
-#line 432 "DatabaseTable.c"
+#line 423 "DatabaseTable.c"
 		gchar* backup_path = NULL;
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_sqlite3_close0 (database_table_db);
 #line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -442,17 +433,17 @@ void database_table_init (const gchar* filename) {
 		_tmp6_ = g_strconcat (_tmp5_, ".bak", NULL);
 #line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		backup_path = _tmp6_;
-#line 446 "DatabaseTable.c"
+#line 437 "DatabaseTable.c"
 		{
 			GFile* src = NULL;
-			const gchar* _tmp7_ = NULL;
-			GFile* _tmp8_ = NULL;
+			const gchar* _tmp7_;
+			GFile* _tmp8_;
 			GFile* dest = NULL;
-			const gchar* _tmp9_ = NULL;
-			GFile* _tmp10_ = NULL;
-			GFile* _tmp11_ = NULL;
-			GFile* _tmp12_ = NULL;
-			const gchar* _tmp13_ = NULL;
+			const gchar* _tmp9_;
+			GFile* _tmp10_;
+			GFile* _tmp11_;
+			GFile* _tmp12_;
+			const gchar* _tmp13_;
 #line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp7_ = backup_path;
 #line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -477,7 +468,7 @@ void database_table_init (const gchar* filename) {
 				_g_object_unref0 (dest);
 #line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_object_unref0 (src);
-#line 481 "DatabaseTable.c"
+#line 472 "DatabaseTable.c"
 				goto __catch16_g_error;
 			}
 #line 90 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -488,38 +479,35 @@ void database_table_init (const gchar* filename) {
 			_g_object_unref0 (dest);
 #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_object_unref0 (src);
-#line 492 "DatabaseTable.c"
+#line 483 "DatabaseTable.c"
 		}
 		goto __finally16;
 		__catch16_g_error:
 		{
 			GError* _error_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			GError* _tmp15_ = NULL;
-			const gchar* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
+			GError* _tmp14_;
+			const gchar* _tmp15_;
+			gchar* _tmp16_;
+			gchar* _tmp17_;
 #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_error_ = _inner_error_;
 #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_inner_error_ = NULL;
 #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp14_ = _ ("Unable to restore photo database %s");
+			_tmp14_ = _error_;
 #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp15_ = _error_;
+			_tmp15_ = _tmp14_->message;
 #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp16_ = _tmp15_->message;
+			_tmp16_ = g_strdup_printf (_ ("Unable to restore photo database %s"), _tmp15_);
 #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp17_ = g_strdup_printf (_tmp14_, _tmp16_);
+			_tmp17_ = _tmp16_;
 #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp18_ = _tmp17_;
+			app_window_panic (_tmp17_);
 #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			app_window_panic (_tmp18_);
-#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_g_free0 (_tmp18_);
+			_g_free0 (_tmp17_);
 #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_error_free0 (_error_);
-#line 523 "DatabaseTable.c"
+#line 511 "DatabaseTable.c"
 		}
 		__finally16:
 #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -534,33 +522,33 @@ void database_table_init (const gchar* filename) {
 			g_clear_error (&_inner_error_);
 #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			return;
-#line 538 "DatabaseTable.c"
+#line 526 "DatabaseTable.c"
 		}
 #line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_g_free0 (backup_path);
-#line 542 "DatabaseTable.c"
+#line 530 "DatabaseTable.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp19_ = database_table_db;
+	_tmp18_ = database_table_db;
 #line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp20_ = _sqlite3_exec (_tmp19_, "PRAGMA synchronous=OFF", NULL, NULL, NULL);
+	_tmp19_ = _sqlite3_exec (_tmp18_, "PRAGMA synchronous=OFF", NULL, NULL, NULL);
 #line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = _tmp20_;
+	res = _tmp19_;
 #line 99 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp21_ = res;
+	_tmp20_ = res;
 #line 99 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp21_ != SQLITE_OK) {
-#line 554 "DatabaseTable.c"
-		gint _tmp22_ = 0;
+	if (_tmp20_ != SQLITE_OK) {
+#line 542 "DatabaseTable.c"
+		gint _tmp21_;
 #line 100 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp22_ = res;
+		_tmp21_ = res;
 #line 100 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		database_table_warning ("Unable to disable synchronous mode", _tmp22_);
-#line 560 "DatabaseTable.c"
+		database_table_warning ("Unable to disable synchronous mode", _tmp21_);
+#line 548 "DatabaseTable.c"
 	}
 #line 65 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 564 "DatabaseTable.c"
+#line 552 "DatabaseTable.c"
 }
 
 
@@ -569,15 +557,15 @@ void database_table_terminate (void) {
 	_sqlite3_close0 (database_table_db);
 #line 105 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	database_table_db = NULL;
-#line 573 "DatabaseTable.c"
+#line 561 "DatabaseTable.c"
 }
 
 
 void database_table_fatal (const gchar* op, gint res) {
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	sqlite3* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gint _tmp1_;
+	sqlite3* _tmp2_;
+	const gchar* _tmp3_;
 #line 109 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (op != NULL);
 #line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -590,15 +578,15 @@ void database_table_fatal (const gchar* op, gint res) {
 	_tmp3_ = sqlite3_errmsg (_tmp2_);
 #line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_error ("DatabaseTable.vala:110: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_);
-#line 594 "DatabaseTable.c"
+#line 582 "DatabaseTable.c"
 }
 
 
 void database_table_warning (const gchar* op, gint res) {
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	sqlite3* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gint _tmp1_;
+	sqlite3* _tmp2_;
+	const gchar* _tmp3_;
 #line 114 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (op != NULL);
 #line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -611,13 +599,13 @@ void database_table_warning (const gchar* op, gint res) {
 	_tmp3_ = sqlite3_errmsg (_tmp2_);
 #line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_warning ("DatabaseTable.vala:115: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_);
-#line 615 "DatabaseTable.c"
+#line 603 "DatabaseTable.c"
 }
 
 
 void database_table_set_table_name (DatabaseTable* self, const gchar* table_name) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 118 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (IS_DATABASE_TABLE (self));
 #line 118 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -630,18 +618,18 @@ void database_table_set_table_name (DatabaseTable* self, const gchar* table_name
 	_g_free0 (self->table_name);
 #line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	self->table_name = _tmp1_;
-#line 634 "DatabaseTable.c"
+#line 622 "DatabaseTable.c"
 }
 
 
 void database_table_throw_error (const gchar* method, gint res, GError** error) {
 	gchar* msg = NULL;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	sqlite3* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	const gchar* _tmp0_;
+	gint _tmp1_;
+	sqlite3* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gint _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 124 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (method != NULL);
@@ -667,13 +655,13 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 		case SQLITE_DONE:
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_ROW:
-#line 671 "DatabaseTable.c"
+#line 659 "DatabaseTable.c"
 		{
 #line 131 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_free0 (msg);
 #line 131 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			return;
-#line 677 "DatabaseTable.c"
+#line 665 "DatabaseTable.c"
 		}
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_PERM:
@@ -695,10 +683,10 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 		case SQLITE_FORMAT:
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_NOTADB:
-#line 699 "DatabaseTable.c"
+#line 687 "DatabaseTable.c"
 		{
-			const gchar* _tmp6_ = NULL;
-			GError* _tmp7_ = NULL;
+			const gchar* _tmp6_;
+			GError* _tmp7_;
 #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp6_ = msg;
 #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -713,7 +701,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				_g_free0 (msg);
 #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 717 "DatabaseTable.c"
+#line 705 "DatabaseTable.c"
 			} else {
 #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
@@ -723,15 +711,15 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				g_clear_error (&_inner_error_);
 #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 727 "DatabaseTable.c"
+#line 715 "DatabaseTable.c"
 			}
 		}
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_NOMEM:
-#line 732 "DatabaseTable.c"
+#line 720 "DatabaseTable.c"
 		{
-			const gchar* _tmp8_ = NULL;
-			GError* _tmp9_ = NULL;
+			const gchar* _tmp8_;
+			GError* _tmp9_;
 #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp8_ = msg;
 #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -746,7 +734,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				_g_free0 (msg);
 #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 750 "DatabaseTable.c"
+#line 738 "DatabaseTable.c"
 			} else {
 #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
@@ -756,7 +744,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				g_clear_error (&_inner_error_);
 #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 760 "DatabaseTable.c"
+#line 748 "DatabaseTable.c"
 			}
 		}
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -765,10 +753,10 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 		case SQLITE_LOCKED:
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_INTERRUPT:
-#line 769 "DatabaseTable.c"
+#line 757 "DatabaseTable.c"
 		{
-			const gchar* _tmp10_ = NULL;
-			GError* _tmp11_ = NULL;
+			const gchar* _tmp10_;
+			GError* _tmp11_;
 #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp10_ = msg;
 #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -783,7 +771,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				_g_free0 (msg);
 #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 787 "DatabaseTable.c"
+#line 775 "DatabaseTable.c"
 			} else {
 #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
@@ -793,7 +781,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				g_clear_error (&_inner_error_);
 #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 797 "DatabaseTable.c"
+#line 785 "DatabaseTable.c"
 			}
 		}
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -806,10 +794,10 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 		case SQLITE_CONSTRAINT:
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_RANGE:
-#line 810 "DatabaseTable.c"
+#line 798 "DatabaseTable.c"
 		{
-			const gchar* _tmp12_ = NULL;
-			GError* _tmp13_ = NULL;
+			const gchar* _tmp12_;
+			GError* _tmp13_;
 #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp12_ = msg;
 #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -824,7 +812,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				_g_free0 (msg);
 #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 828 "DatabaseTable.c"
+#line 816 "DatabaseTable.c"
 			} else {
 #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
@@ -834,17 +822,17 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				g_clear_error (&_inner_error_);
 #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 838 "DatabaseTable.c"
+#line 826 "DatabaseTable.c"
 			}
 		}
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_SCHEMA:
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_MISMATCH:
-#line 845 "DatabaseTable.c"
+#line 833 "DatabaseTable.c"
 		{
-			const gchar* _tmp14_ = NULL;
-			GError* _tmp15_ = NULL;
+			const gchar* _tmp14_;
+			GError* _tmp15_;
 #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp14_ = msg;
 #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -859,7 +847,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				_g_free0 (msg);
 #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 863 "DatabaseTable.c"
+#line 851 "DatabaseTable.c"
 			} else {
 #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
@@ -869,7 +857,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				g_clear_error (&_inner_error_);
 #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 873 "DatabaseTable.c"
+#line 861 "DatabaseTable.c"
 			}
 		}
 		default:
@@ -879,10 +867,10 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 		case SQLITE_INTERNAL:
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_MISUSE:
-#line 883 "DatabaseTable.c"
+#line 871 "DatabaseTable.c"
 		{
-			const gchar* _tmp16_ = NULL;
-			GError* _tmp17_ = NULL;
+			const gchar* _tmp16_;
+			GError* _tmp17_;
 #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp16_ = msg;
 #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -897,7 +885,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				_g_free0 (msg);
 #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 901 "DatabaseTable.c"
+#line 889 "DatabaseTable.c"
 			} else {
 #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
@@ -907,13 +895,13 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				g_clear_error (&_inner_error_);
 #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 911 "DatabaseTable.c"
+#line 899 "DatabaseTable.c"
 			}
 		}
 	}
 #line 124 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_g_free0 (msg);
-#line 917 "DatabaseTable.c"
+#line 905 "DatabaseTable.c"
 }
 
 
@@ -921,23 +909,23 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) {
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	sqlite3* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	sqlite3_stmt* _tmp8_ = NULL;
-	gint64 _tmp9_ = 0LL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	sqlite3_stmt* _tmp8_;
+	gint64 _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	gint _tmp13_;
 	gboolean _tmp14_ = FALSE;
-	gint _tmp15_ = 0;
-	gint _tmp24_ = 0;
+	gint _tmp15_;
+	gint _tmp24_;
 #line 172 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
 #line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -986,28 +974,28 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) {
 	_tmp15_ = res;
 #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp15_ != SQLITE_ROW) {
-#line 990 "DatabaseTable.c"
-		gint _tmp16_ = 0;
+#line 978 "DatabaseTable.c"
+		gint _tmp16_;
 #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp16_ = res;
 #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp14_ = _tmp16_ != SQLITE_DONE;
-#line 996 "DatabaseTable.c"
+#line 984 "DatabaseTable.c"
 	} else {
 #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp14_ = FALSE;
-#line 1000 "DatabaseTable.c"
+#line 988 "DatabaseTable.c"
 	}
 #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp14_) {
-#line 1004 "DatabaseTable.c"
-		gint64 _tmp17_ = 0LL;
-		gchar* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		gint _tmp23_ = 0;
+#line 992 "DatabaseTable.c"
+		gint64 _tmp17_;
+		gchar* _tmp18_;
+		gchar* _tmp19_;
+		const gchar* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
+		gint _tmp23_;
 #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp17_ = id;
 #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -1028,7 +1016,7 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) {
 		_g_free0 (_tmp22_);
 #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_g_free0 (_tmp19_);
-#line 1032 "DatabaseTable.c"
+#line 1020 "DatabaseTable.c"
 	}
 #line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp24_ = res;
@@ -1038,32 +1026,32 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) {
 	_sqlite3_finalize0 (stmt);
 #line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1042 "DatabaseTable.c"
+#line 1030 "DatabaseTable.c"
 }
 
 
-gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt** stmt) {
+gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt) {
 	sqlite3_stmt* _vala_stmt = NULL;
 	gboolean result = FALSE;
 	gchar* sql = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	gint res = 0;
-	sqlite3* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	sqlite3* _tmp3_;
+	const gchar* _tmp4_;
 	sqlite3_stmt* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	sqlite3_stmt* _tmp8_ = NULL;
-	gint64 _tmp9_ = 0LL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
+	gint _tmp6_;
+	gint _tmp7_;
+	sqlite3_stmt* _tmp8_;
+	gint64 _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	gint _tmp13_;
 	gboolean _tmp14_ = FALSE;
-	gint _tmp15_ = 0;
-	gint _tmp25_ = 0;
+	gint _tmp15_;
+	gint _tmp25_;
 #line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
 #line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -1114,29 +1102,29 @@ gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gcha
 	_tmp15_ = res;
 #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp15_ != SQLITE_ROW) {
-#line 1118 "DatabaseTable.c"
-		gint _tmp16_ = 0;
+#line 1106 "DatabaseTable.c"
+		gint _tmp16_;
 #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp16_ = res;
 #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp14_ = _tmp16_ != SQLITE_DONE;
-#line 1124 "DatabaseTable.c"
+#line 1112 "DatabaseTable.c"
 	} else {
 #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp14_ = FALSE;
-#line 1128 "DatabaseTable.c"
+#line 1116 "DatabaseTable.c"
 	}
 #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp14_) {
-#line 1132 "DatabaseTable.c"
-		gint64 _tmp17_ = 0LL;
-		gchar* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
-		gint _tmp24_ = 0;
+#line 1120 "DatabaseTable.c"
+		gint64 _tmp17_;
+		gchar* _tmp18_;
+		gchar* _tmp19_;
+		const gchar* _tmp20_;
+		const gchar* _tmp21_;
+		gchar* _tmp22_;
+		gchar* _tmp23_;
+		gint _tmp24_;
 #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp17_ = id;
 #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -1159,7 +1147,7 @@ gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gcha
 		_g_free0 (_tmp23_);
 #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_g_free0 (_tmp19_);
-#line 1163 "DatabaseTable.c"
+#line 1151 "DatabaseTable.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp25_ = res;
@@ -1171,32 +1159,32 @@ gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gcha
 	if (stmt) {
 #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		*stmt = _vala_stmt;
-#line 1175 "DatabaseTable.c"
+#line 1163 "DatabaseTable.c"
 	} else {
 #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_sqlite3_finalize0 (_vala_stmt);
-#line 1179 "DatabaseTable.c"
+#line 1167 "DatabaseTable.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1183 "DatabaseTable.c"
+#line 1171 "DatabaseTable.c"
 }
 
 
-static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id, const gchar* column, sqlite3_stmt** stmt) {
+static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id, const gchar* column, sqlite3_stmt* * stmt) {
 	sqlite3_stmt* _vala_stmt = NULL;
 	gchar* sql = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	gint res = 0;
-	sqlite3* _tmp3_ = NULL;
+	sqlite3* _tmp3_;
 	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint64 _tmp7_ = 0LL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint64 _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
 #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (IS_DATABASE_TABLE (self));
 #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -1239,11 +1227,11 @@ static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id,
 	if (stmt) {
 #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		*stmt = _vala_stmt;
-#line 1243 "DatabaseTable.c"
+#line 1231 "DatabaseTable.c"
 	} else {
 #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_sqlite3_finalize0 (_vala_stmt);
-#line 1247 "DatabaseTable.c"
+#line 1235 "DatabaseTable.c"
 	}
 }
 
@@ -1251,9 +1239,9 @@ static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id,
 static gboolean database_table_execute_update_by_id (DatabaseTable* self, sqlite3_stmt* stmt) {
 	gboolean result = FALSE;
 	gint res = 0;
-	sqlite3_stmt* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	sqlite3_stmt* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 214 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
 #line 214 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -1268,8 +1256,8 @@ static gboolean database_table_execute_update_by_id (DatabaseTable* self, sqlite
 	_tmp2_ = res;
 #line 216 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp2_ != SQLITE_DONE) {
-#line 1272 "DatabaseTable.c"
-		gint _tmp3_ = 0;
+#line 1260 "DatabaseTable.c"
+		gint _tmp3_;
 #line 217 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp3_ = res;
 #line 217 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -1278,28 +1266,28 @@ static gboolean database_table_execute_update_by_id (DatabaseTable* self, sqlite
 		result = FALSE;
 #line 219 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return result;
-#line 1282 "DatabaseTable.c"
+#line 1270 "DatabaseTable.c"
 	}
 #line 222 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	result = TRUE;
 #line 222 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1288 "DatabaseTable.c"
+#line 1276 "DatabaseTable.c"
 }
 
 
 gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text) {
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
-	gint64 _tmp0_ = 0LL;
-	const gchar* _tmp1_ = NULL;
+	gint64 _tmp0_;
+	const gchar* _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
 	gint res = 0;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GDestroyNotify _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gboolean _tmp7_ = FALSE;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	GDestroyNotify _tmp5_;
+	gint _tmp6_;
+	gboolean _tmp7_;
 #line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
 #line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -1336,25 +1324,25 @@ gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const
 	_sqlite3_finalize0 (stmt);
 #line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1340 "DatabaseTable.c"
+#line 1328 "DatabaseTable.c"
 }
 
 
 void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error) {
 	sqlite3_stmt* stmt = NULL;
-	gint64 _tmp0_ = 0LL;
-	const gchar* _tmp1_ = NULL;
+	gint64 _tmp0_;
+	const gchar* _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
 	gint res = 0;
-	sqlite3_stmt* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	GDestroyNotify _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	sqlite3_stmt* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	GDestroyNotify _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (IS_DATABASE_TABLE (self));
@@ -1398,12 +1386,12 @@ void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const g
 	_tmp11_ = res;
 #line 243 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp11_ != SQLITE_DONE) {
-#line 1402 "DatabaseTable.c"
-		const gchar* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
+#line 1390 "DatabaseTable.c"
+		const gchar* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		gint _tmp16_;
 #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp12_ = self->table_name;
 #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -1428,7 +1416,7 @@ void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const g
 				_sqlite3_finalize0 (stmt);
 #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1432 "DatabaseTable.c"
+#line 1420 "DatabaseTable.c"
 			} else {
 #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -1438,26 +1426,26 @@ void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const g
 				g_clear_error (&_inner_error_);
 #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1442 "DatabaseTable.c"
+#line 1430 "DatabaseTable.c"
 			}
 		}
 	}
 #line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1448 "DatabaseTable.c"
+#line 1436 "DatabaseTable.c"
 }
 
 
 gboolean database_table_update_int_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint value) {
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
-	gint64 _tmp0_ = 0LL;
-	const gchar* _tmp1_ = NULL;
+	gint64 _tmp0_;
+	const gchar* _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
 	gint res = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gboolean _tmp5_ = FALSE;
+	gint _tmp3_;
+	gint _tmp4_;
+	gboolean _tmp5_;
 #line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
 #line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -1488,23 +1476,23 @@ gboolean database_table_update_int_by_id (DatabaseTable* self, gint64 id, const
 	_sqlite3_finalize0 (stmt);
 #line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1492 "DatabaseTable.c"
+#line 1480 "DatabaseTable.c"
 }
 
 
 void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint value, GError** error) {
 	sqlite3_stmt* stmt = NULL;
-	gint64 _tmp0_ = 0LL;
-	const gchar* _tmp1_ = NULL;
+	gint64 _tmp0_;
+	const gchar* _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
 	gint res = 0;
-	sqlite3_stmt* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	sqlite3_stmt* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
+	sqlite3_stmt* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	sqlite3_stmt* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
 	GError * _inner_error_ = NULL;
 #line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (IS_DATABASE_TABLE (self));
@@ -1542,12 +1530,12 @@ void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gc
 	_tmp9_ = res;
 #line 265 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp9_ != SQLITE_DONE) {
-#line 1546 "DatabaseTable.c"
-		const gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
+#line 1534 "DatabaseTable.c"
+		const gchar* _tmp10_;
+		const gchar* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
+		gint _tmp14_;
 #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp10_ = self->table_name;
 #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -1572,7 +1560,7 @@ void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gc
 				_sqlite3_finalize0 (stmt);
 #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1576 "DatabaseTable.c"
+#line 1564 "DatabaseTable.c"
 			} else {
 #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -1582,26 +1570,26 @@ void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gc
 				g_clear_error (&_inner_error_);
 #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1586 "DatabaseTable.c"
+#line 1574 "DatabaseTable.c"
 			}
 		}
 	}
 #line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1592 "DatabaseTable.c"
+#line 1580 "DatabaseTable.c"
 }
 
 
 gboolean database_table_update_int64_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint64 value) {
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
-	gint64 _tmp0_ = 0LL;
-	const gchar* _tmp1_ = NULL;
+	gint64 _tmp0_;
+	const gchar* _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
 	gint res = 0;
-	gint64 _tmp3_ = 0LL;
-	gint _tmp4_ = 0;
-	gboolean _tmp5_ = FALSE;
+	gint64 _tmp3_;
+	gint _tmp4_;
+	gboolean _tmp5_;
 #line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
 #line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -1632,23 +1620,23 @@ gboolean database_table_update_int64_by_id (DatabaseTable* self, gint64 id, cons
 	_sqlite3_finalize0 (stmt);
 #line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1636 "DatabaseTable.c"
+#line 1624 "DatabaseTable.c"
 }
 
 
 void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint64 value, GError** error) {
 	sqlite3_stmt* stmt = NULL;
-	gint64 _tmp0_ = 0LL;
-	const gchar* _tmp1_ = NULL;
+	gint64 _tmp0_;
+	const gchar* _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
 	gint res = 0;
-	sqlite3_stmt* _tmp3_ = NULL;
-	gint64 _tmp4_ = 0LL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	sqlite3_stmt* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
+	sqlite3_stmt* _tmp3_;
+	gint64 _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	sqlite3_stmt* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
 	GError * _inner_error_ = NULL;
 #line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (IS_DATABASE_TABLE (self));
@@ -1686,12 +1674,12 @@ void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const
 	_tmp9_ = res;
 #line 287 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp9_ != SQLITE_DONE) {
-#line 1690 "DatabaseTable.c"
-		const gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
+#line 1678 "DatabaseTable.c"
+		const gchar* _tmp10_;
+		const gchar* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
+		gint _tmp14_;
 #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp10_ = self->table_name;
 #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -1716,7 +1704,7 @@ void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const
 				_sqlite3_finalize0 (stmt);
 #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1720 "DatabaseTable.c"
+#line 1708 "DatabaseTable.c"
 			} else {
 #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -1726,34 +1714,34 @@ void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const
 				g_clear_error (&_inner_error_);
 #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1730 "DatabaseTable.c"
+#line 1718 "DatabaseTable.c"
 			}
 		}
 	}
 #line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1736 "DatabaseTable.c"
+#line 1724 "DatabaseTable.c"
 }
 
 
 void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	sqlite3* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	sqlite3_stmt* _tmp8_ = NULL;
-	gint64 _tmp9_ = 0LL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	sqlite3_stmt* _tmp8_;
+	gint64 _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
 	GError * _inner_error_ = NULL;
 #line 291 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (IS_DATABASE_TABLE (self));
@@ -1803,11 +1791,11 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error
 	_tmp14_ = res;
 #line 300 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp14_ != SQLITE_DONE) {
-#line 1807 "DatabaseTable.c"
-		const gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
+#line 1795 "DatabaseTable.c"
+		const gchar* _tmp15_;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
+		gint _tmp18_;
 #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp15_ = self->table_name;
 #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -1830,7 +1818,7 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error
 				_sqlite3_finalize0 (stmt);
 #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1834 "DatabaseTable.c"
+#line 1822 "DatabaseTable.c"
 			} else {
 #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -1840,13 +1828,13 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error
 				g_clear_error (&_inner_error_);
 #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1844 "DatabaseTable.c"
+#line 1832 "DatabaseTable.c"
 			}
 		}
 	}
 #line 291 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1850 "DatabaseTable.c"
+#line 1838 "DatabaseTable.c"
 }
 
 
@@ -1854,14 +1842,14 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	sqlite3* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 #line 304 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (table_name != NULL, FALSE);
 #line 304 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -1890,20 +1878,20 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
 	_tmp7_ = res;
 #line 307 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1894 "DatabaseTable.c"
+#line 1882 "DatabaseTable.c"
 	{
 		gboolean _tmp8_ = FALSE;
 #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp8_ = TRUE;
 #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		while (TRUE) {
-#line 1901 "DatabaseTable.c"
-			sqlite3_stmt* _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
+#line 1889 "DatabaseTable.c"
+			sqlite3_stmt* _tmp9_;
+			gint _tmp10_;
+			gint _tmp11_;
 #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (!_tmp8_) {
-#line 1907 "DatabaseTable.c"
+#line 1895 "DatabaseTable.c"
 			}
 #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp8_ = FALSE;
@@ -1919,18 +1907,18 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
 			if (_tmp11_ == SQLITE_DONE) {
 #line 312 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				break;
-#line 1923 "DatabaseTable.c"
+#line 1911 "DatabaseTable.c"
 			} else {
-				gint _tmp12_ = 0;
+				gint _tmp12_;
 #line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_tmp12_ = res;
 #line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				if (_tmp12_ != SQLITE_ROW) {
-#line 1930 "DatabaseTable.c"
-					const gchar* _tmp13_ = NULL;
-					gchar* _tmp14_ = NULL;
-					gchar* _tmp15_ = NULL;
-					gint _tmp16_ = 0;
+#line 1918 "DatabaseTable.c"
+					const gchar* _tmp13_;
+					gchar* _tmp14_;
+					gchar* _tmp15_;
+					gint _tmp16_;
 #line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					_tmp13_ = table_name;
 #line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -1945,14 +1933,14 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
 					_g_free0 (_tmp15_);
 #line 316 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					break;
-#line 1949 "DatabaseTable.c"
+#line 1937 "DatabaseTable.c"
 				} else {
 					gchar* column = NULL;
-					sqlite3_stmt* _tmp17_ = NULL;
-					const gchar* _tmp18_ = NULL;
-					gchar* _tmp19_ = NULL;
+					sqlite3_stmt* _tmp17_;
+					const gchar* _tmp18_;
+					gchar* _tmp19_;
 					gboolean _tmp20_ = FALSE;
-					const gchar* _tmp21_ = NULL;
+					const gchar* _tmp21_;
 #line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					_tmp17_ = stmt;
 #line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -1965,20 +1953,20 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
 					_tmp21_ = column;
 #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					if (_tmp21_ != NULL) {
-#line 1969 "DatabaseTable.c"
-						const gchar* _tmp22_ = NULL;
-						const gchar* _tmp23_ = NULL;
+#line 1957 "DatabaseTable.c"
+						const gchar* _tmp22_;
+						const gchar* _tmp23_;
 #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 						_tmp22_ = column;
 #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 						_tmp23_ = column_name;
 #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 						_tmp20_ = g_strcmp0 (_tmp22_, _tmp23_) == 0;
-#line 1978 "DatabaseTable.c"
+#line 1966 "DatabaseTable.c"
 					} else {
 #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 						_tmp20_ = FALSE;
-#line 1982 "DatabaseTable.c"
+#line 1970 "DatabaseTable.c"
 					}
 #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					if (_tmp20_) {
@@ -1990,11 +1978,11 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
 						_sqlite3_finalize0 (stmt);
 #line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 						return result;
-#line 1994 "DatabaseTable.c"
+#line 1982 "DatabaseTable.c"
 					}
 #line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					_g_free0 (column);
-#line 1998 "DatabaseTable.c"
+#line 1986 "DatabaseTable.c"
 				}
 			}
 		}
@@ -2005,7 +1993,7 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
 	_sqlite3_finalize0 (stmt);
 #line 324 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 2009 "DatabaseTable.c"
+#line 1997 "DatabaseTable.c"
 }
 
 
@@ -2013,16 +2001,16 @@ gboolean database_table_has_table (const gchar* table_name) {
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	sqlite3* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
 #line 327 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (table_name != NULL, FALSE);
 #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -2061,7 +2049,7 @@ gboolean database_table_has_table (const gchar* table_name) {
 	_sqlite3_finalize0 (stmt);
 #line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 2065 "DatabaseTable.c"
+#line 2053 "DatabaseTable.c"
 }
 
 
@@ -2069,19 +2057,19 @@ gboolean database_table_add_column (const gchar* table_name, const gchar* column
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	sqlite3* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
+	gint _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
 #line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (table_name != NULL, FALSE);
 #line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -2126,13 +2114,13 @@ gboolean database_table_add_column (const gchar* table_name, const gchar* column
 	_tmp12_ = res;
 #line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp12_ != SQLITE_DONE) {
-#line 2130 "DatabaseTable.c"
-		const gchar* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
-		sqlite3* _tmp17_ = NULL;
-		const gchar* _tmp18_ = NULL;
+#line 2118 "DatabaseTable.c"
+		const gchar* _tmp13_;
+		const gchar* _tmp14_;
+		const gchar* _tmp15_;
+		gint _tmp16_;
+		sqlite3* _tmp17_;
+		const gchar* _tmp18_;
 #line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp13_ = table_name;
 #line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -2153,7 +2141,7 @@ gboolean database_table_add_column (const gchar* table_name, const gchar* column
 		_sqlite3_finalize0 (stmt);
 #line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return result;
-#line 2157 "DatabaseTable.c"
+#line 2145 "DatabaseTable.c"
 	}
 #line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	result = TRUE;
@@ -2161,20 +2149,20 @@ gboolean database_table_add_column (const gchar* table_name, const gchar* column
 	_sqlite3_finalize0 (stmt);
 #line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 2165 "DatabaseTable.c"
+#line 2153 "DatabaseTable.c"
 }
 
 
 gboolean database_table_ensure_column (const gchar* table_name, const gchar* column_name, const gchar* column_constraints, const gchar* upgrade_msg) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
+	const gchar* _tmp6_;
+	const gchar* _tmp7_;
+	const gchar* _tmp8_;
+	const gchar* _tmp9_;
+	gboolean _tmp10_;
 #line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (table_name != NULL, FALSE);
 #line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -2191,11 +2179,11 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col
 	if (!_tmp2_) {
 #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp0_ = TRUE;
-#line 2195 "DatabaseTable.c"
+#line 2183 "DatabaseTable.c"
 	} else {
-		const gchar* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+		gboolean _tmp5_;
 #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp3_ = table_name;
 #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -2204,7 +2192,7 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col
 		_tmp5_ = database_table_has_column (_tmp3_, _tmp4_);
 #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp0_ = _tmp5_;
-#line 2208 "DatabaseTable.c"
+#line 2196 "DatabaseTable.c"
 	}
 #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp0_) {
@@ -2212,7 +2200,7 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col
 		result = TRUE;
 #line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return result;
-#line 2216 "DatabaseTable.c"
+#line 2204 "DatabaseTable.c"
 	}
 #line 362 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp6_ = upgrade_msg;
@@ -2230,7 +2218,7 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col
 	result = _tmp10_;
 #line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 2234 "DatabaseTable.c"
+#line 2222 "DatabaseTable.c"
 }
 
 
@@ -2238,19 +2226,19 @@ gint database_table_get_row_count (DatabaseTable* self) {
 	gint result = 0;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	sqlite3* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	sqlite3_stmt* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	sqlite3_stmt* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	sqlite3_stmt* _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	sqlite3_stmt* _tmp15_;
+	gint _tmp16_;
 #line 367 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (IS_DATABASE_TABLE (self), 0);
 #line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -2287,11 +2275,11 @@ gint database_table_get_row_count (DatabaseTable* self) {
 	_tmp10_ = res;
 #line 373 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp10_ != SQLITE_ROW) {
-#line 2291 "DatabaseTable.c"
-		const gchar* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
-		sqlite3* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
+#line 2279 "DatabaseTable.c"
+		const gchar* _tmp11_;
+		gint _tmp12_;
+		sqlite3* _tmp13_;
+		const gchar* _tmp14_;
 #line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp11_ = self->table_name;
 #line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -2308,7 +2296,7 @@ gint database_table_get_row_count (DatabaseTable* self) {
 		_sqlite3_finalize0 (stmt);
 #line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return result;
-#line 2312 "DatabaseTable.c"
+#line 2300 "DatabaseTable.c"
 	}
 #line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp15_ = stmt;
@@ -2320,16 +2308,16 @@ gint database_table_get_row_count (DatabaseTable* self) {
 	_sqlite3_finalize0 (stmt);
 #line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 2324 "DatabaseTable.c"
+#line 2312 "DatabaseTable.c"
 }
 
 
 void database_table_begin_transaction (void) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gint res = 0;
-	sqlite3* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	sqlite3* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 384 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = database_table_in_transaction;
 #line 384 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -2338,7 +2326,7 @@ void database_table_begin_transaction (void) {
 	if (_tmp0_ != 0) {
 #line 385 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return;
-#line 2342 "DatabaseTable.c"
+#line 2330 "DatabaseTable.c"
 	}
 #line 387 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = database_table_db;
@@ -2350,18 +2338,18 @@ void database_table_begin_transaction (void) {
 	_tmp3_ = res;
 #line 388 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 2354 "DatabaseTable.c"
+#line 2342 "DatabaseTable.c"
 }
 
 
 void database_table_commit_transaction (GError** error) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gint res = 0;
-	sqlite3* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	sqlite3* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 393 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = database_table_in_transaction;
@@ -2377,7 +2365,7 @@ void database_table_commit_transaction (GError** error) {
 	if (_tmp2_ != 0) {
 #line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return;
-#line 2381 "DatabaseTable.c"
+#line 2369 "DatabaseTable.c"
 	}
 #line 397 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = database_table_db;
@@ -2389,8 +2377,8 @@ void database_table_commit_transaction (GError** error) {
 	_tmp5_ = res;
 #line 398 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp5_ != SQLITE_DONE) {
-#line 2393 "DatabaseTable.c"
-		gint _tmp6_ = 0;
+#line 2381 "DatabaseTable.c"
+		gint _tmp6_;
 #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp6_ = res;
 #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -2403,7 +2391,7 @@ void database_table_commit_transaction (GError** error) {
 				g_propagate_error (error, _inner_error_);
 #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 2407 "DatabaseTable.c"
+#line 2395 "DatabaseTable.c"
 			} else {
 #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2411,7 +2399,7 @@ void database_table_commit_transaction (GError** error) {
 				g_clear_error (&_inner_error_);
 #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 2415 "DatabaseTable.c"
+#line 2403 "DatabaseTable.c"
 			}
 		}
 	}
@@ -2424,14 +2412,14 @@ DatabaseTable* database_table_construct (GType object_type) {
 	self = (DatabaseTable*) g_type_create_instance (object_type);
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return self;
-#line 2428 "DatabaseTable.c"
+#line 2416 "DatabaseTable.c"
 }
 
 
 static void value_database_table_init (GValue* value) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	value->data[0].v_pointer = NULL;
-#line 2435 "DatabaseTable.c"
+#line 2423 "DatabaseTable.c"
 }
 
 
@@ -2440,7 +2428,7 @@ static void value_database_table_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_unref (value->data[0].v_pointer);
-#line 2444 "DatabaseTable.c"
+#line 2432 "DatabaseTable.c"
 	}
 }
 
@@ -2450,11 +2438,11 @@ static void value_database_table_copy_value (const GValue* src_value, GValue* de
 	if (src_value->data[0].v_pointer) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		dest_value->data[0].v_pointer = database_table_ref (src_value->data[0].v_pointer);
-#line 2454 "DatabaseTable.c"
+#line 2442 "DatabaseTable.c"
 	} else {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2458 "DatabaseTable.c"
+#line 2446 "DatabaseTable.c"
 	}
 }
 
@@ -2462,66 +2450,66 @@ static void value_database_table_copy_value (const GValue* src_value, GValue* de
 static gpointer value_database_table_peek_pointer (const GValue* value) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return value->data[0].v_pointer;
-#line 2466 "DatabaseTable.c"
+#line 2454 "DatabaseTable.c"
 }
 
 
 static gchar* value_database_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (collect_values[0].v_pointer) {
-#line 2473 "DatabaseTable.c"
-		DatabaseTable* object;
+#line 2461 "DatabaseTable.c"
+		DatabaseTable * object;
 		object = collect_values[0].v_pointer;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2480 "DatabaseTable.c"
+#line 2468 "DatabaseTable.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2484 "DatabaseTable.c"
+#line 2472 "DatabaseTable.c"
 		}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		value->data[0].v_pointer = database_table_ref (object);
-#line 2488 "DatabaseTable.c"
+#line 2476 "DatabaseTable.c"
 	} else {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 2492 "DatabaseTable.c"
+#line 2480 "DatabaseTable.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return NULL;
-#line 2496 "DatabaseTable.c"
+#line 2484 "DatabaseTable.c"
 }
 
 
 static gchar* value_database_table_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	DatabaseTable** object_p;
+	DatabaseTable ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (!object_p) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2507 "DatabaseTable.c"
+#line 2495 "DatabaseTable.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (!value->data[0].v_pointer) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		*object_p = NULL;
-#line 2513 "DatabaseTable.c"
+#line 2501 "DatabaseTable.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2517 "DatabaseTable.c"
+#line 2505 "DatabaseTable.c"
 	} else {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		*object_p = database_table_ref (value->data[0].v_pointer);
-#line 2521 "DatabaseTable.c"
+#line 2509 "DatabaseTable.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return NULL;
-#line 2525 "DatabaseTable.c"
+#line 2513 "DatabaseTable.c"
 }
 
 
@@ -2535,7 +2523,7 @@ GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return G_PARAM_SPEC (spec);
-#line 2539 "DatabaseTable.c"
+#line 2527 "DatabaseTable.c"
 }
 
 
@@ -2544,12 +2532,12 @@ gpointer value_get_database_table (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATABASE_TABLE), NULL);
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return value->data[0].v_pointer;
-#line 2548 "DatabaseTable.c"
+#line 2536 "DatabaseTable.c"
 }
 
 
 void value_set_database_table (GValue* value, gpointer v_object) {
-	DatabaseTable* old;
+	DatabaseTable * old;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATABASE_TABLE));
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -2564,23 +2552,23 @@ void value_set_database_table (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_ref (value->data[0].v_pointer);
-#line 2568 "DatabaseTable.c"
+#line 2556 "DatabaseTable.c"
 	} else {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 2572 "DatabaseTable.c"
+#line 2560 "DatabaseTable.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (old) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_unref (old);
-#line 2578 "DatabaseTable.c"
+#line 2566 "DatabaseTable.c"
 	}
 }
 
 
 void value_take_database_table (GValue* value, gpointer v_object) {
-	DatabaseTable* old;
+	DatabaseTable * old;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATABASE_TABLE));
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -2593,17 +2581,17 @@ void value_take_database_table (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		value->data[0].v_pointer = v_object;
-#line 2597 "DatabaseTable.c"
+#line 2585 "DatabaseTable.c"
 	} else {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 2601 "DatabaseTable.c"
+#line 2589 "DatabaseTable.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (old) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_unref (old);
-#line 2607 "DatabaseTable.c"
+#line 2595 "DatabaseTable.c"
 	}
 }
 
@@ -2613,7 +2601,7 @@ static void database_table_class_init (DatabaseTableClass * klass) {
 	database_table_parent_class = g_type_class_peek_parent (klass);
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	((DatabaseTableClass *) klass)->finalize = database_table_finalize;
-#line 2617 "DatabaseTable.c"
+#line 2605 "DatabaseTable.c"
 }
 
 
@@ -2622,11 +2610,11 @@ static void database_table_instance_init (DatabaseTable * self) {
 	self->table_name = NULL;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	self->ref_count = 1;
-#line 2626 "DatabaseTable.c"
+#line 2614 "DatabaseTable.c"
 }
 
 
-static void database_table_finalize (DatabaseTable* obj) {
+static void database_table_finalize (DatabaseTable * obj) {
 	DatabaseTable * self;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATABASE_TABLE, DatabaseTable);
@@ -2634,7 +2622,7 @@ static void database_table_finalize (DatabaseTable* obj) {
 	g_signal_handlers_destroy (self);
 #line 30 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_g_free0 (self->table_name);
-#line 2638 "DatabaseTable.c"
+#line 2626 "DatabaseTable.c"
 }
 
 
@@ -2653,18 +2641,18 @@ GType database_table_get_type (void) {
 
 
 gpointer database_table_ref (gpointer instance) {
-	DatabaseTable* self;
+	DatabaseTable * self;
 	self = instance;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return instance;
-#line 2663 "DatabaseTable.c"
+#line 2651 "DatabaseTable.c"
 }
 
 
 void database_table_unref (gpointer instance) {
-	DatabaseTable* self;
+	DatabaseTable * self;
 	self = instance;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2672,7 +2660,7 @@ void database_table_unref (gpointer instance) {
 		DATABASE_TABLE_GET_CLASS (self)->finalize (self);
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2676 "DatabaseTable.c"
+#line 2664 "DatabaseTable.c"
 	}
 }
 
diff --git a/src/db/Db.c b/src/db/Db.c
index eeaf220..0695500 100644
--- a/src/db/Db.c
+++ b/src/db/Db.c
@@ -1,4 +1,4 @@
-/* Db.c generated by valac 0.34.7, the Vala compiler
+/* Db.c generated by valac 0.36.6, the Vala compiler
  * generated from Db.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -71,7 +71,7 @@ void database_table_init (const gchar* filename);
 void db_terminate (void);
 void database_table_terminate (void);
 GType db_verify_result_get_type (void) G_GNUC_CONST;
-DbVerifyResult db_verify_database (gchar** app_version, gint* schema_version);
+DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version);
 gpointer database_table_ref (gpointer instance);
 void database_table_unref (gpointer instance);
 GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -81,7 +81,7 @@ gpointer value_get_database_table (const GValue* value);
 GType database_table_get_type (void) G_GNUC_CONST;
 GType version_table_get_type (void) G_GNUC_CONST;
 VersionTable* version_table_get_instance (void);
-gint version_table_get_version (VersionTable* self, gchar** app_version);
+gint version_table_get_version (VersionTable* self, gchar* * app_version);
 #define DATABASE_TABLE_SCHEMA_VERSION 20
 #define RESOURCES_APP_VERSION _VERSION
 void version_table_set_version (VersionTable* self, gint version, const gchar* app_version, const gchar* user_data);
@@ -106,8 +106,8 @@ void version_table_update_version (VersionTable* self, gint version, const gchar
 
 void db_preconfigure (GFile* db_file) {
 	gchar* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gchar* _tmp5_ = NULL;
+	GFile* _tmp1_;
+	gchar* _tmp5_;
 #line 14 "/home/jens/Source/shotwell/src/db/Db.vala"
 	g_return_if_fail ((db_file == NULL) || G_IS_FILE (db_file));
 #line 15 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -115,8 +115,8 @@ void db_preconfigure (GFile* db_file) {
 #line 15 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (_tmp1_ != NULL) {
 #line 118 "Db.c"
-		GFile* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+		GFile* _tmp2_;
+		gchar* _tmp3_;
 #line 15 "/home/jens/Source/shotwell/src/db/Db.vala"
 		_tmp2_ = db_file;
 #line 15 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -127,7 +127,7 @@ void db_preconfigure (GFile* db_file) {
 		_tmp0_ = _tmp3_;
 #line 129 "Db.c"
 	} else {
-		gchar* _tmp4_ = NULL;
+		gchar* _tmp4_;
 #line 15 "/home/jens/Source/shotwell/src/db/Db.vala"
 		_tmp4_ = g_strdup (DB_IN_MEMORY_NAME);
 #line 15 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -149,8 +149,8 @@ void db_preconfigure (GFile* db_file) {
 
 
 void db_init (GError** error) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 #line 19 "/home/jens/Source/shotwell/src/db/Db.vala"
 	_tmp0_ = db_filename;
 #line 19 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -182,17 +182,17 @@ GType db_verify_result_get_type (void) {
 }
 
 
-DbVerifyResult db_verify_database (gchar** app_version, gint* schema_version) {
+DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version) {
 	gchar* _vala_app_version = NULL;
 	gint _vala_schema_version = 0;
 	DbVerifyResult result = 0;
 	VersionTable* version_table = NULL;
-	VersionTable* _tmp0_ = NULL;
-	VersionTable* _tmp1_ = NULL;
+	VersionTable* _tmp0_;
+	VersionTable* _tmp1_;
 	gchar* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp7_ = 0;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp7_;
 #line 36 "/home/jens/Source/shotwell/src/db/Db.vala"
 	_tmp0_ = version_table_get_instance ();
 #line 36 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -212,8 +212,8 @@ DbVerifyResult db_verify_database (gchar** app_version, gint* schema_version) {
 #line 39 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (_tmp4_ >= 0) {
 #line 215 "Db.c"
-		gint _tmp5_ = 0;
-		const gchar* _tmp6_ = NULL;
+		gint _tmp5_;
+		const gchar* _tmp6_;
 #line 40 "/home/jens/Source/shotwell/src/db/Db.vala"
 		_tmp5_ = _vala_schema_version;
 #line 40 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -227,8 +227,8 @@ DbVerifyResult db_verify_database (gchar** app_version, gint* schema_version) {
 #line 42 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (_tmp7_ == -1) {
 #line 230 "Db.c"
-		VersionTable* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+		VersionTable* _tmp8_;
+		gchar* _tmp9_;
 #line 44 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_debug ("Db.vala:44: Creating database schema version %d for app version %s", DATABASE_TABLE_SCHEMA_VERSION, RESOURCES_APP_VERSION);
 #line 46 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -245,7 +245,7 @@ DbVerifyResult db_verify_database (gchar** app_version, gint* schema_version) {
 		_vala_schema_version = DATABASE_TABLE_SCHEMA_VERSION;
 #line 247 "Db.c"
 	} else {
-		gint _tmp10_ = 0;
+		gint _tmp10_;
 #line 49 "/home/jens/Source/shotwell/src/db/Db.vala"
 		_tmp10_ = _vala_schema_version;
 #line 49 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -274,16 +274,16 @@ DbVerifyResult db_verify_database (gchar** app_version, gint* schema_version) {
 			return result;
 #line 276 "Db.c"
 		} else {
-			gint _tmp11_ = 0;
+			gint _tmp11_;
 #line 52 "/home/jens/Source/shotwell/src/db/Db.vala"
 			_tmp11_ = _vala_schema_version;
 #line 52 "/home/jens/Source/shotwell/src/db/Db.vala"
 			if (_tmp11_ < DATABASE_TABLE_SCHEMA_VERSION) {
 #line 283 "Db.c"
 				DbVerifyResult _result_ = 0;
-				gint _tmp12_ = 0;
-				DbVerifyResult _tmp13_ = 0;
-				DbVerifyResult _tmp14_ = 0;
+				gint _tmp12_;
+				DbVerifyResult _tmp13_;
+				DbVerifyResult _tmp14_;
 #line 54 "/home/jens/Source/shotwell/src/db/Db.vala"
 				_tmp12_ = _vala_schema_version;
 #line 54 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -349,38 +349,38 @@ DbVerifyResult db_verify_database (gchar** app_version, gint* schema_version) {
 
 DbVerifyResult db_upgrade_database (gint input_version) {
 	DbVerifyResult result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gint version = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp8_ = FALSE;
-	gboolean _tmp10_ = FALSE;
-	gboolean _tmp12_ = FALSE;
-	gboolean _tmp14_ = FALSE;
-	gboolean _tmp16_ = FALSE;
-	gboolean _tmp18_ = FALSE;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp6_;
+	gboolean _tmp8_;
+	gboolean _tmp10_;
+	gboolean _tmp12_;
+	gboolean _tmp14_;
+	gboolean _tmp16_;
+	gboolean _tmp18_;
 	gboolean _tmp20_ = FALSE;
-	gboolean _tmp21_ = FALSE;
-	gboolean _tmp24_ = FALSE;
-	gboolean _tmp26_ = FALSE;
-	gboolean _tmp27_ = FALSE;
-	gboolean _tmp29_ = FALSE;
-	gboolean _tmp31_ = FALSE;
-	gboolean _tmp33_ = FALSE;
-	gint _tmp35_ = 0;
-	gint _tmp36_ = 0;
-	gboolean _tmp37_ = FALSE;
-	gboolean _tmp39_ = FALSE;
-	gboolean _tmp41_ = FALSE;
-	gint _tmp43_ = 0;
-	gint _tmp46_ = 0;
-	VersionTable* _tmp47_ = NULL;
-	VersionTable* _tmp48_ = NULL;
-	gint _tmp49_ = 0;
-	gint _tmp50_ = 0;
+	gboolean _tmp21_;
+	gboolean _tmp24_;
+	gboolean _tmp26_;
+	gboolean _tmp27_;
+	gboolean _tmp29_;
+	gboolean _tmp31_;
+	gboolean _tmp33_;
+	gint _tmp35_;
+	gint _tmp36_;
+	gboolean _tmp37_;
+	gboolean _tmp39_;
+	gboolean _tmp41_;
+	gint _tmp43_;
+	gint _tmp46_;
+	VersionTable* _tmp47_;
+	VersionTable* _tmp48_;
+	gint _tmp49_;
+	gint _tmp50_;
 #line 63 "/home/jens/Source/shotwell/src/db/Db.vala"
 	_tmp0_ = input_version;
 #line 63 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -408,7 +408,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 83 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp4_) {
 #line 411 "Db.c"
-		gboolean _tmp5_ = FALSE;
+		gboolean _tmp5_;
 #line 84 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:84: upgrade_database: adding flags column to PhotoTable");
 #line 85 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -429,7 +429,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 100 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp6_) {
 #line 432 "Db.c"
-		gboolean _tmp7_ = FALSE;
+		gboolean _tmp7_;
 #line 101 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:101: upgrade_database: adding file_format column to PhotoTable");
 #line 102 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -450,7 +450,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 113 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp8_) {
 #line 453 "Db.c"
-		gboolean _tmp9_ = FALSE;
+		gboolean _tmp9_;
 #line 114 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:114: upgrade_database: adding title column to PhotoTable");
 #line 115 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -471,7 +471,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 126 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp10_) {
 #line 474 "Db.c"
-		gboolean _tmp11_ = FALSE;
+		gboolean _tmp11_;
 #line 127 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:127: upgrade_database: adding backlinks column to PhotoTable");
 #line 128 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -492,7 +492,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 146 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp12_) {
 #line 495 "Db.c"
-		gboolean _tmp13_ = FALSE;
+		gboolean _tmp13_;
 #line 147 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:147: upgrade_database: adding time_reimported column to PhotoT" \
 "able");
@@ -512,7 +512,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 152 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp14_) {
 #line 514 "Db.c"
-		gboolean _tmp15_ = FALSE;
+		gboolean _tmp15_;
 #line 153 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:153: upgrade_database: adding editable_id column to PhotoTable");
 #line 154 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -533,7 +533,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 170 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp16_) {
 #line 535 "Db.c"
-		gboolean _tmp17_ = FALSE;
+		gboolean _tmp17_;
 #line 171 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:171: upgrade_database: adding rating column to PhotoTable");
 #line 172 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -552,7 +552,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 182 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp18_) {
 #line 554 "Db.c"
-		gboolean _tmp19_ = FALSE;
+		gboolean _tmp19_;
 #line 183 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:183: upgrade_database: adding metadata_dirty column to PhotoTa" \
 "ble");
@@ -574,7 +574,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 195 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (_tmp21_) {
 #line 575 "Db.c"
-		gboolean _tmp22_ = FALSE;
+		gboolean _tmp22_;
 #line 195 "/home/jens/Source/shotwell/src/db/Db.vala"
 		_tmp22_ = database_table_has_column ("VideoTable", "flags");
 #line 195 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -588,7 +588,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 195 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (_tmp20_) {
 #line 589 "Db.c"
-		gboolean _tmp23_ = FALSE;
+		gboolean _tmp23_;
 #line 196 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:196: upgrade_database: adding flags column to VideoTable");
 #line 197 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -609,7 +609,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 208 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp24_) {
 #line 610 "Db.c"
-		gboolean _tmp25_ = FALSE;
+		gboolean _tmp25_;
 #line 209 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:209: upgrade_database: adding primary_source_id column to Even" \
 "tTable");
@@ -643,7 +643,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 233 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp27_) {
 #line 643 "Db.c"
-		gboolean _tmp28_ = FALSE;
+		gboolean _tmp28_;
 #line 234 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:234: upgrade_database: adding developer column to PhotoTable");
 #line 235 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -662,7 +662,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 239 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp29_) {
 #line 662 "Db.c"
-		gboolean _tmp30_ = FALSE;
+		gboolean _tmp30_;
 #line 240 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:240: upgrade_database: adding develop_shotwell_id column to Ph" \
 "otoTable");
@@ -682,7 +682,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 245 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp31_) {
 #line 681 "Db.c"
-		gboolean _tmp32_ = FALSE;
+		gboolean _tmp32_;
 #line 246 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:246: upgrade_database: adding develop_camera_id column to Phot" \
 "oTable");
@@ -702,7 +702,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 251 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp33_) {
 #line 700 "Db.c"
-		gboolean _tmp34_ = FALSE;
+		gboolean _tmp34_;
 #line 252 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:252: upgrade_database: adding develop_embedded_id column to Ph" \
 "otoTable");
@@ -746,7 +746,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 302 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp37_) {
 #line 743 "Db.c"
-		gboolean _tmp38_ = FALSE;
+		gboolean _tmp38_;
 #line 303 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:303: upgrade_database: adding comment column to PhotoTable");
 #line 304 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -765,7 +765,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 307 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp39_) {
 #line 762 "Db.c"
-		gboolean _tmp40_ = FALSE;
+		gboolean _tmp40_;
 #line 308 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:308: upgrade_database: adding comment column to VideoTable");
 #line 309 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -786,7 +786,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 320 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp41_) {
 #line 783 "Db.c"
-		gboolean _tmp42_ = FALSE;
+		gboolean _tmp42_;
 #line 321 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:321: upgrade_database: adding comment column to EventTable");
 #line 322 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -807,8 +807,8 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 #line 337 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (_tmp43_ < 19) {
 #line 804 "Db.c"
-		Application* _tmp44_ = NULL;
-		Application* _tmp45_ = NULL;
+		Application* _tmp44_;
+		Application* _tmp45_;
 #line 338 "/home/jens/Source/shotwell/src/db/Db.vala"
 		_tmp44_ = application_get_instance ();
 #line 338 "/home/jens/Source/shotwell/src/db/Db.vala"
diff --git a/src/db/EventTable.c b/src/db/EventTable.c
index 65a2508..462ebc8 100644
--- a/src/db/EventTable.c
+++ b/src/db/EventTable.c
@@ -1,4 +1,4 @@
-/* EventTable.c generated by valac 0.34.7, the Vala compiler
+/* EventTable.c generated by valac 0.36.6, the Vala compiler
  * generated from EventTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -161,7 +161,7 @@ enum  {
 };
 EventRow* event_row_new (void);
 EventRow* event_row_construct (GType object_type);
-static void event_row_finalize (EventRow* obj);
+static void event_row_finalize (EventRow * obj);
 gpointer database_table_ref (gpointer instance);
 void database_table_unref (gpointer instance);
 GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -207,16 +207,16 @@ GeeArrayList* event_table_get_events (EventTable* self);
 gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* name);
 gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text);
 gchar* event_table_get_name (EventTable* self, EventID* event_id);
-gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt** stmt);
+gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt);
 gchar* event_table_get_primary_source_id (EventTable* self, EventID* event_id);
 gboolean event_table_set_primary_source_id (EventTable* self, EventID* event_id, const gchar* primary_source_id);
 time_t event_table_get_time_created (EventTable* self, EventID* event_id);
 gboolean event_table_set_comment (EventTable* self, EventID* event_id, const gchar* new_comment);
-static void event_table_finalize (DatabaseTable* obj);
+static void event_table_finalize (DatabaseTable * obj);
 
 
 void event_id_init (EventID *self, gint64 id) {
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	memset (self, 0, sizeof (EventID));
 #line 13 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -229,7 +229,7 @@ void event_id_init (EventID *self, gint64 id) {
 
 gboolean event_id_is_invalid (EventID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 17 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	_tmp0_ = (*self).id;
 #line 17 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -242,7 +242,7 @@ gboolean event_id_is_invalid (EventID *self) {
 
 gboolean event_id_is_valid (EventID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	_tmp0_ = (*self).id;
 #line 21 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -342,7 +342,7 @@ static gchar* value_event_row_collect_value (GValue* value, guint n_collect_valu
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (collect_values[0].v_pointer) {
 #line 345 "EventTable.c"
-		EventRow* object;
+		EventRow * object;
 		object = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -369,7 +369,7 @@ static gchar* value_event_row_collect_value (GValue* value, guint n_collect_valu
 
 
 static gchar* value_event_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	EventRow** object_p;
+	EventRow ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (!object_p) {
@@ -421,7 +421,7 @@ gpointer value_get_event_row (const GValue* value) {
 
 
 void value_set_event_row (GValue* value, gpointer v_object) {
-	EventRow* old;
+	EventRow * old;
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EVENT_ROW));
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -452,7 +452,7 @@ void value_set_event_row (GValue* value, gpointer v_object) {
 
 
 void value_take_event_row (GValue* value, gpointer v_object) {
-	EventRow* old;
+	EventRow * old;
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EVENT_ROW));
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -496,7 +496,7 @@ static void event_row_instance_init (EventRow * self) {
 }
 
 
-static void event_row_finalize (EventRow* obj) {
+static void event_row_finalize (EventRow * obj) {
 	EventRow * self;
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_ROW, EventRow);
@@ -527,7 +527,7 @@ GType event_row_get_type (void) {
 
 
 gpointer event_row_ref (gpointer instance) {
-	EventRow* self;
+	EventRow * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -538,7 +538,7 @@ gpointer event_row_ref (gpointer instance) {
 
 
 void event_row_unref (gpointer instance) {
-	EventRow* self;
+	EventRow * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -555,13 +555,13 @@ static EventTable* event_table_construct (GType object_type) {
 	EventTable* self = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 #line 36 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	self = (EventTable*) database_table_construct (object_type);
 #line 38 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -589,7 +589,7 @@ static EventTable* event_table_construct (GType object_type) {
 #line 49 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
 #line 592 "EventTable.c"
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 50 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp7_ = res;
 #line 50 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -622,15 +622,15 @@ static gpointer _database_table_ref0 (gpointer self) {
 
 EventTable* event_table_get_instance (void) {
 	EventTable* result = NULL;
-	EventTable* _tmp0_ = NULL;
-	EventTable* _tmp2_ = NULL;
-	EventTable* _tmp3_ = NULL;
+	EventTable* _tmp0_;
+	EventTable* _tmp2_;
+	EventTable* _tmp3_;
 #line 56 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	_tmp0_ = event_table_instance;
 #line 56 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp0_ == NULL) {
 #line 633 "EventTable.c"
-		EventTable* _tmp1_ = NULL;
+		EventTable* _tmp1_;
 #line 57 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp1_ = event_table_new ();
 #line 57 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -653,12 +653,12 @@ EventTable* event_table_get_instance (void) {
 
 static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_photo_id, const gchar* primary_source_id) {
 	gchar* result = NULL;
-	MediaCollectionRegistry* _tmp0_ = NULL;
-	MediaCollectionRegistry* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	gint64 _tmp7_ = 0LL;
+	MediaCollectionRegistry* _tmp0_;
+	MediaCollectionRegistry* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	gint64 _tmp7_;
 #line 63 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
 #line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -676,8 +676,8 @@ static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_ph
 #line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp4_) {
 #line 679 "EventTable.c"
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 65 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp5_ = primary_source_id;
 #line 65 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -693,9 +693,9 @@ static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_ph
 #line 67 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp7_ != PHOTO_ID_INVALID) {
 #line 696 "EventTable.c"
-		gint64 _tmp8_ = 0LL;
+		gint64 _tmp8_;
 		PhotoID _tmp9_ = {0};
-		gchar* _tmp10_ = NULL;
+		gchar* _tmp10_;
 #line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp8_ = primary_photo_id;
 #line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -719,48 +719,48 @@ static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_ph
 EventRow* event_table_create (EventTable* self, const gchar* primary_source_id, const gchar* comment, GError** error) {
 	EventRow* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp1_;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp3_ = NULL;
+	sqlite3* _tmp3_;
 	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gint _tmp5_;
+	gint _tmp6_;
 	time_t time_created = 0;
-	gulong _tmp7_ = 0UL;
-	sqlite3_stmt* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	GDestroyNotify _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	sqlite3_stmt* _tmp14_ = NULL;
-	time_t _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	sqlite3_stmt* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	GDestroyNotify _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	gint _tmp23_ = 0;
-	sqlite3_stmt* _tmp24_ = NULL;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
+	gulong _tmp7_;
+	sqlite3_stmt* _tmp8_;
+	const gchar* _tmp9_;
+	gchar* _tmp10_;
+	GDestroyNotify _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	sqlite3_stmt* _tmp14_;
+	time_t _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	sqlite3_stmt* _tmp18_;
+	const gchar* _tmp19_;
+	gchar* _tmp20_;
+	GDestroyNotify _tmp21_;
+	gint _tmp22_;
+	gint _tmp23_;
+	sqlite3_stmt* _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
 	EventRow* row = NULL;
-	EventRow* _tmp28_ = NULL;
-	EventRow* _tmp29_ = NULL;
-	sqlite3* _tmp30_ = NULL;
-	gint64 _tmp31_ = 0LL;
-	EventRow* _tmp32_ = NULL;
-	EventRow* _tmp33_ = NULL;
-	const gchar* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
-	EventRow* _tmp36_ = NULL;
-	time_t _tmp37_ = 0;
-	EventRow* _tmp38_ = NULL;
-	const gchar* _tmp39_ = NULL;
-	gchar* _tmp40_ = NULL;
+	EventRow* _tmp28_;
+	EventRow* _tmp29_;
+	sqlite3* _tmp30_;
+	gint64 _tmp31_;
+	EventRow* _tmp32_;
+	EventRow* _tmp33_;
+	const gchar* _tmp34_;
+	gchar* _tmp35_;
+	EventRow* _tmp36_;
+	time_t _tmp37_;
+	EventRow* _tmp38_;
+	const gchar* _tmp39_;
+	gchar* _tmp40_;
 	GError * _inner_error_ = NULL;
 #line 74 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
@@ -769,7 +769,7 @@ EventRow* event_table_create (EventTable* self, const gchar* primary_source_id,
 #line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp1_ != NULL) {
 #line 772 "EventTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp2_ = primary_source_id;
 #line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -856,7 +856,7 @@ EventRow* event_table_create (EventTable* self, const gchar* primary_source_id,
 #line 93 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp26_ != SQLITE_DONE) {
 #line 858 "EventTable.c"
-		gint _tmp27_ = 0;
+		gint _tmp27_;
 #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp27_ = res;
 #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -942,44 +942,44 @@ EventRow* event_table_create (EventTable* self, const gchar* primary_source_id,
 void event_table_create_from_row (EventTable* self, EventRow* row, EventID* result) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	EventRow* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GDestroyNotify _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	sqlite3_stmt* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	sqlite3_stmt* _tmp14_ = NULL;
-	EventRow* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	GDestroyNotify _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	sqlite3_stmt* _tmp21_ = NULL;
-	EventRow* _tmp22_ = NULL;
-	time_t _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	sqlite3_stmt* _tmp26_ = NULL;
-	EventRow* _tmp27_ = NULL;
-	const gchar* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
-	GDestroyNotify _tmp30_ = NULL;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
-	sqlite3_stmt* _tmp33_ = NULL;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
-	sqlite3* _tmp38_ = NULL;
-	gint64 _tmp39_ = 0LL;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	EventRow* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	GDestroyNotify _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	sqlite3_stmt* _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	sqlite3_stmt* _tmp14_;
+	EventRow* _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
+	GDestroyNotify _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
+	sqlite3_stmt* _tmp21_;
+	EventRow* _tmp22_;
+	time_t _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	sqlite3_stmt* _tmp26_;
+	EventRow* _tmp27_;
+	const gchar* _tmp28_;
+	gchar* _tmp29_;
+	GDestroyNotify _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
+	sqlite3_stmt* _tmp33_;
+	gint _tmp34_;
+	gint _tmp35_;
+	sqlite3* _tmp38_;
+	gint64 _tmp39_;
 	EventID _tmp40_ = {0};
 #line 109 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_if_fail (IS_EVENT_TABLE (self));
@@ -1089,7 +1089,7 @@ void event_table_create_from_row (EventTable* self, EventRow* row, EventID* resu
 #line 127 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp35_ != SQLITE_DONE) {
 #line 1090 "EventTable.c"
-		gint _tmp36_ = 0;
+		gint _tmp36_;
 		EventID _tmp37_ = {0};
 #line 128 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp36_ = res;
@@ -1125,41 +1125,41 @@ EventRow* event_table_get_row (EventTable* self, EventID* event_id) {
 	EventRow* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	EventID _tmp5_ = {0};
-	gint64 _tmp6_ = 0LL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	EventID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
 	EventRow* row = NULL;
-	EventRow* _tmp11_ = NULL;
-	EventRow* _tmp12_ = NULL;
-	EventID _tmp13_ = {0};
-	EventRow* _tmp14_ = NULL;
-	sqlite3_stmt* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
+	EventRow* _tmp11_;
+	EventRow* _tmp12_;
+	EventID _tmp13_;
+	EventRow* _tmp14_;
+	sqlite3_stmt* _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
 	gboolean _tmp18_ = FALSE;
-	EventRow* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	EventRow* _tmp26_ = NULL;
-	sqlite3_stmt* _tmp27_ = NULL;
-	gint64 _tmp28_ = 0LL;
-	sqlite3_stmt* _tmp29_ = NULL;
-	const gchar* _tmp30_ = NULL;
-	gchar* _tmp31_ = NULL;
-	EventRow* _tmp32_ = NULL;
-	sqlite3_stmt* _tmp33_ = NULL;
-	gint64 _tmp34_ = 0LL;
-	EventRow* _tmp35_ = NULL;
-	sqlite3_stmt* _tmp36_ = NULL;
-	const gchar* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
+	EventRow* _tmp19_;
+	const gchar* _tmp20_;
+	EventRow* _tmp26_;
+	sqlite3_stmt* _tmp27_;
+	gint64 _tmp28_;
+	sqlite3_stmt* _tmp29_;
+	const gchar* _tmp30_;
+	gchar* _tmp31_;
+	EventRow* _tmp32_;
+	sqlite3_stmt* _tmp33_;
+	gint64 _tmp34_;
+	EventRow* _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	const gchar* _tmp37_;
+	gchar* _tmp38_;
 #line 136 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
 #line 136 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1236,10 +1236,10 @@ EventRow* event_table_get_row (EventTable* self, EventID* event_id) {
 #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp20_ != NULL) {
 #line 1236 "EventTable.c"
-		EventRow* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
-		gint _tmp23_ = 0;
-		gint _tmp24_ = 0;
+		EventRow* _tmp21_;
+		const gchar* _tmp22_;
+		gint _tmp23_;
+		gint _tmp24_;
 #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp21_ = row;
 #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1259,7 +1259,7 @@ EventRow* event_table_get_row (EventTable* self, EventID* event_id) {
 #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp18_) {
 #line 1259 "EventTable.c"
-		EventRow* _tmp25_ = NULL;
+		EventRow* _tmp25_;
 #line 152 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp25_ = row;
 #line 152 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1315,8 +1315,8 @@ EventRow* event_table_get_row (EventTable* self, EventID* event_id) {
 
 
 void event_table_remove (EventTable* self, EventID* event_id, GError** error) {
-	EventID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	EventID _tmp0_;
+	gint64 _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 160 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_if_fail (IS_EVENT_TABLE (self));
@@ -1354,12 +1354,12 @@ GeeArrayList* event_table_get_events (EventTable* self) {
 	GeeArrayList* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	GeeArrayList* event_rows = NULL;
-	GeeArrayList* _tmp4_ = NULL;
+	GeeArrayList* _tmp4_;
 #line 164 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
 #line 166 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1389,33 +1389,33 @@ GeeArrayList* event_table_get_events (EventTable* self) {
 #line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		while (TRUE) {
 #line 1388 "EventTable.c"
-			sqlite3_stmt* _tmp6_ = NULL;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
+			sqlite3_stmt* _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 			EventRow* row = NULL;
-			EventRow* _tmp11_ = NULL;
-			EventRow* _tmp12_ = NULL;
-			sqlite3_stmt* _tmp13_ = NULL;
-			gint64 _tmp14_ = 0LL;
-			EventRow* _tmp15_ = NULL;
-			sqlite3_stmt* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
-			EventRow* _tmp19_ = NULL;
-			sqlite3_stmt* _tmp20_ = NULL;
-			gint64 _tmp21_ = 0LL;
-			sqlite3_stmt* _tmp22_ = NULL;
-			const gchar* _tmp23_ = NULL;
-			gchar* _tmp24_ = NULL;
-			EventRow* _tmp25_ = NULL;
-			sqlite3_stmt* _tmp26_ = NULL;
-			gint64 _tmp27_ = 0LL;
-			EventRow* _tmp28_ = NULL;
-			sqlite3_stmt* _tmp29_ = NULL;
-			const gchar* _tmp30_ = NULL;
-			gchar* _tmp31_ = NULL;
-			GeeArrayList* _tmp32_ = NULL;
-			EventRow* _tmp33_ = NULL;
+			EventRow* _tmp11_;
+			EventRow* _tmp12_;
+			sqlite3_stmt* _tmp13_;
+			gint64 _tmp14_;
+			EventRow* _tmp15_;
+			sqlite3_stmt* _tmp16_;
+			const gchar* _tmp17_;
+			gchar* _tmp18_;
+			EventRow* _tmp19_;
+			sqlite3_stmt* _tmp20_;
+			gint64 _tmp21_;
+			sqlite3_stmt* _tmp22_;
+			const gchar* _tmp23_;
+			gchar* _tmp24_;
+			EventRow* _tmp25_;
+			sqlite3_stmt* _tmp26_;
+			gint64 _tmp27_;
+			EventRow* _tmp28_;
+			sqlite3_stmt* _tmp29_;
+			const gchar* _tmp30_;
+			gchar* _tmp31_;
+			GeeArrayList* _tmp32_;
+			EventRow* _tmp33_;
 #line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 			if (!_tmp5_) {
 #line 1418 "EventTable.c"
@@ -1436,13 +1436,13 @@ GeeArrayList* event_table_get_events (EventTable* self) {
 				break;
 #line 1434 "EventTable.c"
 			} else {
-				gint _tmp9_ = 0;
+				gint _tmp9_;
 #line 175 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 				_tmp9_ = res;
 #line 175 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 				if (_tmp9_ != SQLITE_ROW) {
 #line 1441 "EventTable.c"
-					gint _tmp10_ = 0;
+					gint _tmp10_;
 #line 176 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 					_tmp10_ = res;
 #line 176 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1536,10 +1536,10 @@ GeeArrayList* event_table_get_events (EventTable* self) {
 gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* name) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	EventID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
-	gboolean _tmp5_ = FALSE;
+	const gchar* _tmp1_;
+	EventID _tmp3_;
+	gint64 _tmp4_;
+	gboolean _tmp5_;
 #line 195 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE);
 #line 195 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1549,7 +1549,7 @@ gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* n
 #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp1_ != NULL) {
 #line 1548 "EventTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp2_ = name;
 #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1577,18 +1577,18 @@ gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* n
 gchar* event_table_get_name (EventTable* self, EventID* event_id) {
 	gchar* result = NULL;
 	sqlite3_stmt* stmt = NULL;
-	EventID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	EventID _tmp0_;
+	gint64 _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp3_;
 	gchar* name = NULL;
-	sqlite3_stmt* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	sqlite3_stmt* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 	const gchar* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp14_ = NULL;
+	const gchar* _tmp9_;
+	gchar* _tmp14_;
 #line 199 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
 #line 199 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1626,9 +1626,9 @@ gchar* event_table_get_name (EventTable* self, EventID* event_id) {
 #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp9_ != NULL) {
 #line 1625 "EventTable.c"
-		const gchar* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
+		const gchar* _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
 #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp10_ = name;
 #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1646,7 +1646,7 @@ gchar* event_table_get_name (EventTable* self, EventID* event_id) {
 #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp8_) {
 #line 1645 "EventTable.c"
-		const gchar* _tmp13_ = NULL;
+		const gchar* _tmp13_;
 #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp13_ = name;
 #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1674,13 +1674,13 @@ gchar* event_table_get_name (EventTable* self, EventID* event_id) {
 gchar* event_table_get_primary_source_id (EventTable* self, EventID* event_id) {
 	gchar* result = NULL;
 	sqlite3_stmt* stmt = NULL;
-	EventID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	EventID _tmp0_;
+	gint64 _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	sqlite3_stmt* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gboolean _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 209 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
 #line 209 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1723,10 +1723,10 @@ gchar* event_table_get_primary_source_id (EventTable* self, EventID* event_id) {
 
 gboolean event_table_set_primary_source_id (EventTable* self, EventID* event_id, const gchar* primary_source_id) {
 	gboolean result = FALSE;
-	EventID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	EventID _tmp0_;
+	gint64 _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 #line 217 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE);
 #line 217 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1752,12 +1752,12 @@ gboolean event_table_set_primary_source_id (EventTable* self, EventID* event_id,
 time_t event_table_get_time_created (EventTable* self, EventID* event_id) {
 	time_t result = 0;
 	sqlite3_stmt* stmt = NULL;
-	EventID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	EventID _tmp0_;
+	gint64 _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint64 _tmp5_ = 0LL;
+	gboolean _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint64 _tmp5_;
 #line 221 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), 0);
 #line 221 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1799,10 +1799,10 @@ time_t event_table_get_time_created (EventTable* self, EventID* event_id) {
 gboolean event_table_set_comment (EventTable* self, EventID* event_id, const gchar* new_comment) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	EventID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
-	gboolean _tmp5_ = FALSE;
+	const gchar* _tmp1_;
+	EventID _tmp3_;
+	gint64 _tmp4_;
+	gboolean _tmp5_;
 #line 229 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE);
 #line 229 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1814,7 +1814,7 @@ gboolean event_table_set_comment (EventTable* self, EventID* event_id, const gch
 #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp1_ != NULL) {
 #line 1813 "EventTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp2_ = new_comment;
 #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1852,7 +1852,7 @@ static void event_table_instance_init (EventTable * self) {
 }
 
 
-static void event_table_finalize (DatabaseTable* obj) {
+static void event_table_finalize (DatabaseTable * obj) {
 	EventTable * self;
 #line 33 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_TABLE, EventTable);
diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c
index da28230..45e2254 100644
--- a/src/db/PhotoTable.c
+++ b/src/db/PhotoTable.c
@@ -1,4 +1,4 @@
-/* PhotoTable.c generated by valac 0.34.7, the Vala compiler
+/* PhotoTable.c generated by valac 0.36.6, the Vala compiler
  * generated from PhotoTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -352,7 +352,7 @@ BackingPhotoRow* backing_photo_row_construct (GType object_type);
 #define BACKING_PHOTO_ID_INVALID ((gint64) -1)
 void backing_photo_id_init (BackingPhotoID *self, gint64 id);
 RawDeveloper* raw_developer_as_array (int* result_length1);
-static void photo_row_finalize (PhotoRow* obj);
+static void photo_row_finalize (PhotoRow * obj);
 gpointer database_table_ref (gpointer instance);
 void database_table_unref (gpointer instance);
 GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -420,7 +420,7 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id);
 gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id);
 gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* event_id);
 static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* photo_id);
-gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt** stmt);
+gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt);
 static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID* photo_id, const gchar* trans);
 gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_id, Orientation orientation, GeeHashMap* transformations);
 KeyValueMap* key_value_map_new (const gchar* group);
@@ -435,7 +435,7 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot
 static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format);
 gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format);
 PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format, int* result_length1);
-static void _vala_array_add2 (PhotoID** array, int* length, int* size, const PhotoID* value);
+static void _vala_array_add2 (PhotoID* * array, int* length, int* size, const PhotoID* value);
 void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gchar* backlinks, GError** error);
 void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error);
 void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** error);
@@ -443,7 +443,7 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole
 void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint value, GError** error);
 void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, BackingPhotoID* backing_photo_id, GError** error);
 void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, GError** error);
-static void photo_table_finalize (DatabaseTable* obj);
+static void photo_table_finalize (DatabaseTable * obj);
 gboolean backing_photo_id_is_invalid (BackingPhotoID *self);
 gboolean backing_photo_id_is_valid (BackingPhotoID *self);
 enum  {
@@ -452,7 +452,7 @@ enum  {
 gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* info);
 gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info);
 void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from);
-static void backing_photo_row_finalize (BackingPhotoRow* obj);
+static void backing_photo_row_finalize (BackingPhotoRow * obj);
 GType backing_photo_table_get_type (void) G_GNUC_CONST;
 enum  {
 	BACKING_PHOTO_TABLE_DUMMY_PROPERTY
@@ -467,13 +467,13 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot
 void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backing_id, GError** error);
 void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error);
 void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, GError** error);
-static void backing_photo_table_finalize (DatabaseTable* obj);
+static void backing_photo_table_finalize (DatabaseTable * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
 void photo_id_init (PhotoID *self, gint64 id) {
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	memset (self, 0, sizeof (PhotoID));
 #line 13 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -486,7 +486,7 @@ void photo_id_init (PhotoID *self, gint64 id) {
 
 gboolean photo_id_is_invalid (PhotoID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 17 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = (*self).id;
 #line 17 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -499,7 +499,7 @@ gboolean photo_id_is_invalid (PhotoID *self) {
 
 gboolean photo_id_is_valid (PhotoID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = (*self).id;
 #line 21 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -512,8 +512,8 @@ gboolean photo_id_is_valid (PhotoID *self) {
 
 guint photo_id_hash (PhotoID *self) {
 	guint result = 0U;
-	gint64 _tmp0_ = 0LL;
-	guint _tmp1_ = 0U;
+	gint64 _tmp0_;
+	guint _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = (*self).id;
 #line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -528,10 +528,10 @@ guint photo_id_hash (PhotoID *self) {
 
 gboolean photo_id_equal (void* a, void* b) {
 	gboolean result = FALSE;
-	void* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-	void* _tmp2_ = NULL;
-	gint64 _tmp3_ = 0LL;
+	void* _tmp0_;
+	gint64 _tmp1_;
+	void* _tmp2_;
+	gint64 _tmp3_;
 #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = a;
 #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -550,9 +550,9 @@ gboolean photo_id_equal (void* a, void* b) {
 
 gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id) {
 	gchar* result = NULL;
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	gchar* _tmp2_ = NULL;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	gchar* _tmp2_;
 #line 32 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (photo_id != NULL, NULL);
 #line 33 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -600,7 +600,7 @@ GType photo_id_get_type (void) {
 
 
 void import_id_init (ImportID *self, gint64 id) {
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 42 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	memset (self, 0, sizeof (ImportID));
 #line 43 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -614,8 +614,8 @@ void import_id_init (ImportID *self, gint64 id) {
 void import_id_generate (ImportID* result) {
 	GTimeVal timestamp = {0};
 	gint64 id = 0LL;
-	GTimeVal _tmp0_ = {0};
-	glong _tmp1_ = 0L;
+	GTimeVal _tmp0_;
+	glong _tmp1_;
 	ImportID _tmp2_ = {0};
 #line 47 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_get_current_time (&timestamp);
@@ -639,7 +639,7 @@ void import_id_generate (ImportID* result) {
 
 gboolean import_id_is_invalid (ImportID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 55 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = (*self).id;
 #line 55 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -652,7 +652,7 @@ gboolean import_id_is_invalid (ImportID *self) {
 
 gboolean import_id_is_valid (ImportID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 59 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = (*self).id;
 #line 59 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -666,17 +666,17 @@ gboolean import_id_is_valid (ImportID *self) {
 gint import_id_compare_func (ImportID* a, ImportID* b) {
 	gint result = 0;
 	gboolean _tmp0_ = FALSE;
-	ImportID* _tmp1_ = NULL;
-	ImportID* _tmp3_ = NULL;
-	gint64 _tmp4_ = 0LL;
-	ImportID* _tmp5_ = NULL;
-	gint64 _tmp6_ = 0LL;
+	ImportID* _tmp1_;
+	ImportID* _tmp3_;
+	gint64 _tmp4_;
+	ImportID* _tmp5_;
+	gint64 _tmp6_;
 #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = a;
 #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ != NULL) {
 #line 679 "PhotoTable.c"
-		ImportID* _tmp2_ = NULL;
+		ImportID* _tmp2_;
 #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = b;
 #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -707,10 +707,10 @@ gint import_id_compare_func (ImportID* a, ImportID* b) {
 
 gint64 import_id_comparator (void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-	void* _tmp2_ = NULL;
-	gint64 _tmp3_ = 0LL;
+	void* _tmp0_;
+	gint64 _tmp1_;
+	void* _tmp2_;
+	gint64 _tmp3_;
 #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = a;
 #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -759,14 +759,14 @@ GType import_id_get_type (void) {
 
 PhotoRow* photo_row_construct (GType object_type) {
 	PhotoRow* self = NULL;
-	BackingPhotoRow* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	RawDeveloper* _tmp2_ = NULL;
-	RawDeveloper* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	BackingPhotoID* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	RawDeveloper* _tmp6_ = NULL;
+	BackingPhotoRow* _tmp0_;
+	gint _tmp1_;
+	RawDeveloper* _tmp2_;
+	RawDeveloper* _tmp3_;
+	gint _tmp3__length1;
+	BackingPhotoID* _tmp4_;
+	gint _tmp5_;
+	RawDeveloper* _tmp6_;
 #line 100 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self = (PhotoRow*) g_type_create_instance (object_type);
 #line 101 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -813,11 +813,11 @@ PhotoRow* photo_row_construct (GType object_type) {
 			d = d_collection[d_it];
 #line 815 "PhotoTable.c"
 			{
-				BackingPhotoID* _tmp7_ = NULL;
-				gint _tmp7__length1 = 0;
-				RawDeveloper _tmp8_ = 0;
+				BackingPhotoID* _tmp7_;
+				gint _tmp7__length1;
+				RawDeveloper _tmp8_;
 				BackingPhotoID _tmp9_ = {0};
-				BackingPhotoID _tmp10_ = {0};
+				BackingPhotoID _tmp10_;
 #line 105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp7_ = self->development_ids;
 #line 105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -892,7 +892,7 @@ static gchar* value_photo_row_collect_value (GValue* value, guint n_collect_valu
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (collect_values[0].v_pointer) {
 #line 895 "PhotoTable.c"
-		PhotoRow* object;
+		PhotoRow * object;
 		object = collect_values[0].v_pointer;
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -919,7 +919,7 @@ static gchar* value_photo_row_collect_value (GValue* value, guint n_collect_valu
 
 
 static gchar* value_photo_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PhotoRow** object_p;
+	PhotoRow ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (!object_p) {
@@ -971,7 +971,7 @@ gpointer value_get_photo_row (const GValue* value) {
 
 
 void value_set_photo_row (GValue* value, gpointer v_object) {
-	PhotoRow* old;
+	PhotoRow * old;
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_ROW));
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1002,7 +1002,7 @@ void value_set_photo_row (GValue* value, gpointer v_object) {
 
 
 void value_take_photo_row (GValue* value, gpointer v_object) {
-	PhotoRow* old;
+	PhotoRow * old;
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_ROW));
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1046,7 +1046,7 @@ static void photo_row_instance_init (PhotoRow * self) {
 }
 
 
-static void photo_row_finalize (PhotoRow* obj) {
+static void photo_row_finalize (PhotoRow * obj) {
 	PhotoRow * self;
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_ROW, PhotoRow);
@@ -1089,7 +1089,7 @@ GType photo_row_get_type (void) {
 
 
 gpointer photo_row_ref (gpointer instance) {
-	PhotoRow* self;
+	PhotoRow * self;
 	self = instance;
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1100,7 +1100,7 @@ gpointer photo_row_ref (gpointer instance) {
 
 
 void photo_row_unref (gpointer instance) {
-	PhotoRow* self;
+	PhotoRow * self;
 	self = instance;
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1117,50 +1117,50 @@ static PhotoTable* photo_table_construct (GType object_type) {
 	PhotoTable* self = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 	sqlite3_stmt* stmt2 = NULL;
 	gint res2 = 0;
-	sqlite3* _tmp8_ = NULL;
+	sqlite3* _tmp8_;
 	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	sqlite3* _tmp16_ = NULL;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	sqlite3* _tmp16_;
 	sqlite3_stmt* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	sqlite3_stmt* _tmp20_ = NULL;
-	gint _tmp21_ = 0;
-	gint _tmp22_ = 0;
-	sqlite3* _tmp24_ = NULL;
+	gint _tmp18_;
+	gint _tmp19_;
+	sqlite3_stmt* _tmp20_;
+	gint _tmp21_;
+	gint _tmp22_;
+	sqlite3* _tmp24_;
 	sqlite3_stmt* _tmp25_ = NULL;
-	gint _tmp26_ = 0;
-	gint _tmp27_ = 0;
-	sqlite3_stmt* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	gint _tmp30_ = 0;
-	sqlite3* _tmp32_ = NULL;
+	gint _tmp26_;
+	gint _tmp27_;
+	sqlite3_stmt* _tmp28_;
+	gint _tmp29_;
+	gint _tmp30_;
+	sqlite3* _tmp32_;
 	sqlite3_stmt* _tmp33_ = NULL;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
-	sqlite3_stmt* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	sqlite3* _tmp40_ = NULL;
+	gint _tmp34_;
+	gint _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
+	sqlite3* _tmp40_;
 	sqlite3_stmt* _tmp41_ = NULL;
-	gint _tmp42_ = 0;
-	gint _tmp43_ = 0;
-	sqlite3_stmt* _tmp44_ = NULL;
-	gint _tmp45_ = 0;
-	gint _tmp46_ = 0;
+	gint _tmp42_;
+	gint _tmp43_;
+	sqlite3_stmt* _tmp44_;
+	gint _tmp45_;
+	gint _tmp46_;
 #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self = (PhotoTable*) database_table_construct (object_type);
 #line 114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1188,7 +1188,7 @@ static PhotoTable* photo_table_construct (GType object_type) {
 #line 148 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
 #line 1191 "PhotoTable.c"
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = res;
 #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1220,7 +1220,7 @@ static PhotoTable* photo_table_construct (GType object_type) {
 #line 158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp14_ != SQLITE_DONE) {
 #line 1223 "PhotoTable.c"
-		gint _tmp15_ = 0;
+		gint _tmp15_;
 #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp15_ = res2;
 #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1252,7 +1252,7 @@ static PhotoTable* photo_table_construct (GType object_type) {
 #line 168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp22_ != SQLITE_DONE) {
 #line 1255 "PhotoTable.c"
-		gint _tmp23_ = 0;
+		gint _tmp23_;
 #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp23_ = res;
 #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1285,7 +1285,7 @@ static PhotoTable* photo_table_construct (GType object_type) {
 #line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp30_ != SQLITE_DONE) {
 #line 1287 "PhotoTable.c"
-		gint _tmp31_ = 0;
+		gint _tmp31_;
 #line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp31_ = res;
 #line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1318,7 +1318,7 @@ static PhotoTable* photo_table_construct (GType object_type) {
 #line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp38_ != SQLITE_DONE) {
 #line 1319 "PhotoTable.c"
-		gint _tmp39_ = 0;
+		gint _tmp39_;
 #line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp39_ = res;
 #line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1351,7 +1351,7 @@ static PhotoTable* photo_table_construct (GType object_type) {
 #line 191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp46_ != SQLITE_DONE) {
 #line 1351 "PhotoTable.c"
-		gint _tmp47_ = 0;
+		gint _tmp47_;
 #line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp47_ = res;
 #line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1386,15 +1386,15 @@ static gpointer _database_table_ref0 (gpointer self) {
 
 PhotoTable* photo_table_get_instance (void) {
 	PhotoTable* result = NULL;
-	PhotoTable* _tmp0_ = NULL;
-	PhotoTable* _tmp2_ = NULL;
-	PhotoTable* _tmp3_ = NULL;
+	PhotoTable* _tmp0_;
+	PhotoTable* _tmp2_;
+	PhotoTable* _tmp3_;
 #line 199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = photo_table_instance;
 #line 199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_ == NULL) {
 #line 1394 "PhotoTable.c"
-		PhotoTable* _tmp1_ = NULL;
+		PhotoTable* _tmp1_;
 #line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp1_ = photo_table_new ();
 #line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1418,150 +1418,150 @@ PhotoTable* photo_table_get_instance (void) {
 void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	gulong time_created = 0UL;
-	gulong _tmp4_ = 0UL;
-	sqlite3_stmt* _tmp5_ = NULL;
-	PhotoRow* _tmp6_ = NULL;
-	BackingPhotoRow* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	GDestroyNotify _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	sqlite3_stmt* _tmp13_ = NULL;
-	PhotoRow* _tmp14_ = NULL;
-	BackingPhotoRow* _tmp15_ = NULL;
-	Dimensions _tmp16_ = {0};
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	sqlite3_stmt* _tmp20_ = NULL;
-	PhotoRow* _tmp21_ = NULL;
-	BackingPhotoRow* _tmp22_ = NULL;
-	Dimensions _tmp23_ = {0};
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	sqlite3_stmt* _tmp27_ = NULL;
-	PhotoRow* _tmp28_ = NULL;
-	BackingPhotoRow* _tmp29_ = NULL;
-	gint64 _tmp30_ = 0LL;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
-	sqlite3_stmt* _tmp33_ = NULL;
-	PhotoRow* _tmp34_ = NULL;
-	BackingPhotoRow* _tmp35_ = NULL;
-	time_t _tmp36_ = 0;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	sqlite3_stmt* _tmp39_ = NULL;
-	PhotoRow* _tmp40_ = NULL;
-	time_t _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	gint _tmp43_ = 0;
-	sqlite3_stmt* _tmp44_ = NULL;
-	PhotoRow* _tmp45_ = NULL;
-	BackingPhotoRow* _tmp46_ = NULL;
-	Orientation _tmp47_ = 0;
-	gint _tmp48_ = 0;
-	gint _tmp49_ = 0;
-	sqlite3_stmt* _tmp50_ = NULL;
-	PhotoRow* _tmp51_ = NULL;
-	BackingPhotoRow* _tmp52_ = NULL;
-	Orientation _tmp53_ = 0;
-	gint _tmp54_ = 0;
-	gint _tmp55_ = 0;
-	sqlite3_stmt* _tmp56_ = NULL;
-	PhotoRow* _tmp57_ = NULL;
-	ImportID _tmp58_ = {0};
-	gint64 _tmp59_ = 0LL;
-	gint _tmp60_ = 0;
-	gint _tmp61_ = 0;
-	sqlite3_stmt* _tmp62_ = NULL;
-	gint _tmp63_ = 0;
-	gint _tmp64_ = 0;
-	sqlite3_stmt* _tmp65_ = NULL;
-	PhotoRow* _tmp66_ = NULL;
-	const gchar* _tmp67_ = NULL;
-	gchar* _tmp68_ = NULL;
-	GDestroyNotify _tmp69_ = NULL;
-	gint _tmp70_ = 0;
-	gint _tmp71_ = 0;
-	sqlite3_stmt* _tmp72_ = NULL;
-	PhotoRow* _tmp73_ = NULL;
-	const gchar* _tmp74_ = NULL;
-	gchar* _tmp75_ = NULL;
-	GDestroyNotify _tmp76_ = NULL;
-	gint _tmp77_ = 0;
-	gint _tmp78_ = 0;
-	sqlite3_stmt* _tmp79_ = NULL;
-	PhotoRow* _tmp80_ = NULL;
-	const gchar* _tmp81_ = NULL;
-	gchar* _tmp82_ = NULL;
-	GDestroyNotify _tmp83_ = NULL;
-	gint _tmp84_ = 0;
-	gint _tmp85_ = 0;
-	sqlite3_stmt* _tmp86_ = NULL;
-	gulong _tmp87_ = 0UL;
-	gint _tmp88_ = 0;
-	gint _tmp89_ = 0;
-	sqlite3_stmt* _tmp90_ = NULL;
-	PhotoRow* _tmp91_ = NULL;
-	BackingPhotoRow* _tmp92_ = NULL;
-	PhotoFileFormat _tmp93_ = 0;
-	gint _tmp94_ = 0;
-	gint _tmp95_ = 0;
-	gint _tmp96_ = 0;
-	sqlite3_stmt* _tmp97_ = NULL;
-	PhotoRow* _tmp98_ = NULL;
-	const gchar* _tmp99_ = NULL;
-	gchar* _tmp100_ = NULL;
-	GDestroyNotify _tmp101_ = NULL;
-	gint _tmp102_ = 0;
-	gint _tmp103_ = 0;
-	sqlite3_stmt* _tmp104_ = NULL;
-	PhotoRow* _tmp105_ = NULL;
-	Rating _tmp106_ = 0;
-	gint _tmp107_ = 0;
-	gint _tmp108_ = 0;
-	gint _tmp109_ = 0;
-	sqlite3_stmt* _tmp110_ = NULL;
-	gint _tmp111_ = 0;
-	gint _tmp112_ = 0;
-	sqlite3_stmt* _tmp113_ = NULL;
-	PhotoRow* _tmp114_ = NULL;
-	RawDeveloper _tmp115_ = 0;
-	gchar* _tmp116_ = NULL;
-	GDestroyNotify _tmp117_ = NULL;
-	gint _tmp118_ = 0;
-	gint _tmp119_ = 0;
-	sqlite3_stmt* _tmp120_ = NULL;
-	PhotoRow* _tmp121_ = NULL;
-	const gchar* _tmp122_ = NULL;
-	gchar* _tmp123_ = NULL;
-	GDestroyNotify _tmp124_ = NULL;
-	gint _tmp125_ = 0;
-	gint _tmp126_ = 0;
-	sqlite3_stmt* _tmp127_ = NULL;
-	gint _tmp128_ = 0;
-	gint _tmp129_ = 0;
-	PhotoRow* _tmp133_ = NULL;
-	sqlite3* _tmp134_ = NULL;
-	gint64 _tmp135_ = 0LL;
-	PhotoRow* _tmp136_ = NULL;
-	PhotoRow* _tmp137_ = NULL;
-	BackingPhotoRow* _tmp138_ = NULL;
-	Orientation _tmp139_ = 0;
-	PhotoRow* _tmp140_ = NULL;
-	PhotoRow* _tmp141_ = NULL;
-	gulong _tmp142_ = 0UL;
-	PhotoRow* _tmp143_ = NULL;
-	PhotoRow* _tmp144_ = NULL;
-	PhotoID _tmp145_ = {0};
+	gulong _tmp4_;
+	sqlite3_stmt* _tmp5_;
+	PhotoRow* _tmp6_;
+	BackingPhotoRow* _tmp7_;
+	const gchar* _tmp8_;
+	gchar* _tmp9_;
+	GDestroyNotify _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	sqlite3_stmt* _tmp13_;
+	PhotoRow* _tmp14_;
+	BackingPhotoRow* _tmp15_;
+	Dimensions _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	sqlite3_stmt* _tmp20_;
+	PhotoRow* _tmp21_;
+	BackingPhotoRow* _tmp22_;
+	Dimensions _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
+	sqlite3_stmt* _tmp27_;
+	PhotoRow* _tmp28_;
+	BackingPhotoRow* _tmp29_;
+	gint64 _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
+	sqlite3_stmt* _tmp33_;
+	PhotoRow* _tmp34_;
+	BackingPhotoRow* _tmp35_;
+	time_t _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
+	sqlite3_stmt* _tmp39_;
+	PhotoRow* _tmp40_;
+	time_t _tmp41_;
+	gint _tmp42_;
+	gint _tmp43_;
+	sqlite3_stmt* _tmp44_;
+	PhotoRow* _tmp45_;
+	BackingPhotoRow* _tmp46_;
+	Orientation _tmp47_;
+	gint _tmp48_;
+	gint _tmp49_;
+	sqlite3_stmt* _tmp50_;
+	PhotoRow* _tmp51_;
+	BackingPhotoRow* _tmp52_;
+	Orientation _tmp53_;
+	gint _tmp54_;
+	gint _tmp55_;
+	sqlite3_stmt* _tmp56_;
+	PhotoRow* _tmp57_;
+	ImportID _tmp58_;
+	gint64 _tmp59_;
+	gint _tmp60_;
+	gint _tmp61_;
+	sqlite3_stmt* _tmp62_;
+	gint _tmp63_;
+	gint _tmp64_;
+	sqlite3_stmt* _tmp65_;
+	PhotoRow* _tmp66_;
+	const gchar* _tmp67_;
+	gchar* _tmp68_;
+	GDestroyNotify _tmp69_;
+	gint _tmp70_;
+	gint _tmp71_;
+	sqlite3_stmt* _tmp72_;
+	PhotoRow* _tmp73_;
+	const gchar* _tmp74_;
+	gchar* _tmp75_;
+	GDestroyNotify _tmp76_;
+	gint _tmp77_;
+	gint _tmp78_;
+	sqlite3_stmt* _tmp79_;
+	PhotoRow* _tmp80_;
+	const gchar* _tmp81_;
+	gchar* _tmp82_;
+	GDestroyNotify _tmp83_;
+	gint _tmp84_;
+	gint _tmp85_;
+	sqlite3_stmt* _tmp86_;
+	gulong _tmp87_;
+	gint _tmp88_;
+	gint _tmp89_;
+	sqlite3_stmt* _tmp90_;
+	PhotoRow* _tmp91_;
+	BackingPhotoRow* _tmp92_;
+	PhotoFileFormat _tmp93_;
+	gint _tmp94_;
+	gint _tmp95_;
+	gint _tmp96_;
+	sqlite3_stmt* _tmp97_;
+	PhotoRow* _tmp98_;
+	const gchar* _tmp99_;
+	gchar* _tmp100_;
+	GDestroyNotify _tmp101_;
+	gint _tmp102_;
+	gint _tmp103_;
+	sqlite3_stmt* _tmp104_;
+	PhotoRow* _tmp105_;
+	Rating _tmp106_;
+	gint _tmp107_;
+	gint _tmp108_;
+	gint _tmp109_;
+	sqlite3_stmt* _tmp110_;
+	gint _tmp111_;
+	gint _tmp112_;
+	sqlite3_stmt* _tmp113_;
+	PhotoRow* _tmp114_;
+	RawDeveloper _tmp115_;
+	gchar* _tmp116_;
+	GDestroyNotify _tmp117_;
+	gint _tmp118_;
+	gint _tmp119_;
+	sqlite3_stmt* _tmp120_;
+	PhotoRow* _tmp121_;
+	const gchar* _tmp122_;
+	gchar* _tmp123_;
+	GDestroyNotify _tmp124_;
+	gint _tmp125_;
+	gint _tmp126_;
+	sqlite3_stmt* _tmp127_;
+	gint _tmp128_;
+	gint _tmp129_;
+	PhotoRow* _tmp133_;
+	sqlite3* _tmp134_;
+	gint64 _tmp135_;
+	PhotoRow* _tmp136_;
+	PhotoRow* _tmp137_;
+	BackingPhotoRow* _tmp138_;
+	Orientation _tmp139_;
+	PhotoRow* _tmp140_;
+	PhotoRow* _tmp141_;
+	gulong _tmp142_;
+	PhotoRow* _tmp143_;
+	PhotoRow* _tmp144_;
+	PhotoID _tmp145_;
 #line 207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
 #line 207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1922,14 +1922,14 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) {
 #line 261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp129_ != SQLITE_DONE) {
 #line 1919 "PhotoTable.c"
-		gint _tmp130_ = 0;
+		gint _tmp130_;
 		PhotoID _tmp132_ = {0};
 #line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp130_ = res;
 #line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp130_ != SQLITE_CONSTRAINT) {
 #line 1926 "PhotoTable.c"
-			gint _tmp131_ = 0;
+			gint _tmp131_;
 #line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp131_ = res;
 #line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1995,109 +1995,109 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) {
 void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	time_t time_reimported = 0;
-	gulong _tmp4_ = 0UL;
-	sqlite3_stmt* _tmp5_ = NULL;
-	PhotoRow* _tmp6_ = NULL;
-	BackingPhotoRow* _tmp7_ = NULL;
-	Dimensions _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	PhotoRow* _tmp13_ = NULL;
-	BackingPhotoRow* _tmp14_ = NULL;
-	Dimensions _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	sqlite3_stmt* _tmp19_ = NULL;
-	PhotoRow* _tmp20_ = NULL;
-	BackingPhotoRow* _tmp21_ = NULL;
-	gint64 _tmp22_ = 0LL;
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	sqlite3_stmt* _tmp25_ = NULL;
-	PhotoRow* _tmp26_ = NULL;
-	BackingPhotoRow* _tmp27_ = NULL;
-	time_t _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	gint _tmp30_ = 0;
-	sqlite3_stmt* _tmp31_ = NULL;
-	PhotoRow* _tmp32_ = NULL;
-	time_t _tmp33_ = 0;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
-	sqlite3_stmt* _tmp36_ = NULL;
-	PhotoRow* _tmp37_ = NULL;
-	BackingPhotoRow* _tmp38_ = NULL;
-	Orientation _tmp39_ = 0;
-	gint _tmp40_ = 0;
-	gint _tmp41_ = 0;
-	sqlite3_stmt* _tmp42_ = NULL;
-	PhotoRow* _tmp43_ = NULL;
-	BackingPhotoRow* _tmp44_ = NULL;
-	Orientation _tmp45_ = 0;
-	gint _tmp46_ = 0;
-	gint _tmp47_ = 0;
-	sqlite3_stmt* _tmp48_ = NULL;
-	PhotoRow* _tmp49_ = NULL;
-	const gchar* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
-	GDestroyNotify _tmp52_ = NULL;
-	gint _tmp53_ = 0;
-	gint _tmp54_ = 0;
-	sqlite3_stmt* _tmp55_ = NULL;
-	PhotoRow* _tmp56_ = NULL;
-	const gchar* _tmp57_ = NULL;
-	gchar* _tmp58_ = NULL;
-	GDestroyNotify _tmp59_ = NULL;
-	gint _tmp60_ = 0;
-	gint _tmp61_ = 0;
-	sqlite3_stmt* _tmp62_ = NULL;
-	PhotoRow* _tmp63_ = NULL;
-	const gchar* _tmp64_ = NULL;
-	gchar* _tmp65_ = NULL;
-	GDestroyNotify _tmp66_ = NULL;
-	gint _tmp67_ = 0;
-	gint _tmp68_ = 0;
-	sqlite3_stmt* _tmp69_ = NULL;
-	PhotoRow* _tmp70_ = NULL;
-	BackingPhotoRow* _tmp71_ = NULL;
-	PhotoFileFormat _tmp72_ = 0;
-	gint _tmp73_ = 0;
-	gint _tmp74_ = 0;
-	gint _tmp75_ = 0;
-	sqlite3_stmt* _tmp76_ = NULL;
-	PhotoRow* _tmp77_ = NULL;
-	const gchar* _tmp78_ = NULL;
-	gchar* _tmp79_ = NULL;
-	GDestroyNotify _tmp80_ = NULL;
-	gint _tmp81_ = 0;
-	gint _tmp82_ = 0;
-	sqlite3_stmt* _tmp83_ = NULL;
-	time_t _tmp84_ = 0;
-	gint _tmp85_ = 0;
-	gint _tmp86_ = 0;
-	sqlite3_stmt* _tmp87_ = NULL;
-	PhotoRow* _tmp88_ = NULL;
-	PhotoID _tmp89_ = {0};
-	gint64 _tmp90_ = 0LL;
-	gint _tmp91_ = 0;
-	gint _tmp92_ = 0;
-	sqlite3_stmt* _tmp93_ = NULL;
-	gint _tmp94_ = 0;
-	gint _tmp95_ = 0;
-	PhotoRow* _tmp97_ = NULL;
-	time_t _tmp98_ = 0;
-	PhotoRow* _tmp99_ = NULL;
-	PhotoRow* _tmp100_ = NULL;
-	BackingPhotoRow* _tmp101_ = NULL;
-	Orientation _tmp102_ = 0;
+	gulong _tmp4_;
+	sqlite3_stmt* _tmp5_;
+	PhotoRow* _tmp6_;
+	BackingPhotoRow* _tmp7_;
+	Dimensions _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	PhotoRow* _tmp13_;
+	BackingPhotoRow* _tmp14_;
+	Dimensions _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	sqlite3_stmt* _tmp19_;
+	PhotoRow* _tmp20_;
+	BackingPhotoRow* _tmp21_;
+	gint64 _tmp22_;
+	gint _tmp23_;
+	gint _tmp24_;
+	sqlite3_stmt* _tmp25_;
+	PhotoRow* _tmp26_;
+	BackingPhotoRow* _tmp27_;
+	time_t _tmp28_;
+	gint _tmp29_;
+	gint _tmp30_;
+	sqlite3_stmt* _tmp31_;
+	PhotoRow* _tmp32_;
+	time_t _tmp33_;
+	gint _tmp34_;
+	gint _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	PhotoRow* _tmp37_;
+	BackingPhotoRow* _tmp38_;
+	Orientation _tmp39_;
+	gint _tmp40_;
+	gint _tmp41_;
+	sqlite3_stmt* _tmp42_;
+	PhotoRow* _tmp43_;
+	BackingPhotoRow* _tmp44_;
+	Orientation _tmp45_;
+	gint _tmp46_;
+	gint _tmp47_;
+	sqlite3_stmt* _tmp48_;
+	PhotoRow* _tmp49_;
+	const gchar* _tmp50_;
+	gchar* _tmp51_;
+	GDestroyNotify _tmp52_;
+	gint _tmp53_;
+	gint _tmp54_;
+	sqlite3_stmt* _tmp55_;
+	PhotoRow* _tmp56_;
+	const gchar* _tmp57_;
+	gchar* _tmp58_;
+	GDestroyNotify _tmp59_;
+	gint _tmp60_;
+	gint _tmp61_;
+	sqlite3_stmt* _tmp62_;
+	PhotoRow* _tmp63_;
+	const gchar* _tmp64_;
+	gchar* _tmp65_;
+	GDestroyNotify _tmp66_;
+	gint _tmp67_;
+	gint _tmp68_;
+	sqlite3_stmt* _tmp69_;
+	PhotoRow* _tmp70_;
+	BackingPhotoRow* _tmp71_;
+	PhotoFileFormat _tmp72_;
+	gint _tmp73_;
+	gint _tmp74_;
+	gint _tmp75_;
+	sqlite3_stmt* _tmp76_;
+	PhotoRow* _tmp77_;
+	const gchar* _tmp78_;
+	gchar* _tmp79_;
+	GDestroyNotify _tmp80_;
+	gint _tmp81_;
+	gint _tmp82_;
+	sqlite3_stmt* _tmp83_;
+	time_t _tmp84_;
+	gint _tmp85_;
+	gint _tmp86_;
+	sqlite3_stmt* _tmp87_;
+	PhotoRow* _tmp88_;
+	PhotoID _tmp89_;
+	gint64 _tmp90_;
+	gint _tmp91_;
+	gint _tmp92_;
+	sqlite3_stmt* _tmp93_;
+	gint _tmp94_;
+	gint _tmp95_;
+	PhotoRow* _tmp97_;
+	time_t _tmp98_;
+	PhotoRow* _tmp99_;
+	PhotoRow* _tmp100_;
+	BackingPhotoRow* _tmp101_;
+	Orientation _tmp102_;
 	GError * _inner_error_ = NULL;
 #line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -2367,7 +2367,7 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) {
 #line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp95_ != SQLITE_DONE) {
 #line 2361 "PhotoTable.c"
-		gint _tmp96_ = 0;
+		gint _tmp96_;
 #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp96_ = res;
 #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -2422,59 +2422,59 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint64 _tmp5_ = 0LL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	sqlite3_stmt* _tmp8_ = NULL;
-	glong _tmp9_ = 0L;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	GDestroyNotify _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	sqlite3_stmt* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	GDestroyNotify _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	gint _tmp23_ = 0;
-	sqlite3_stmt* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	GDestroyNotify _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	sqlite3_stmt* _tmp30_ = NULL;
-	PhotoID _tmp31_ = {0};
-	gint64 _tmp32_ = 0LL;
-	gint _tmp33_ = 0;
-	gint _tmp34_ = 0;
-	sqlite3_stmt* _tmp35_ = NULL;
-	gint _tmp36_ = 0;
-	gint _tmp37_ = 0;
-	PhotoRow* _tmp40_ = NULL;
-	BackingPhotoRow* _tmp41_ = NULL;
-	gint64 _tmp42_ = 0LL;
-	PhotoRow* _tmp43_ = NULL;
-	BackingPhotoRow* _tmp44_ = NULL;
-	glong _tmp45_ = 0L;
-	PhotoRow* _tmp46_ = NULL;
-	const gchar* _tmp47_ = NULL;
-	gchar* _tmp48_ = NULL;
-	PhotoRow* _tmp49_ = NULL;
-	const gchar* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
-	PhotoRow* _tmp52_ = NULL;
-	const gchar* _tmp53_ = NULL;
-	gchar* _tmp54_ = NULL;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint64 _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	sqlite3_stmt* _tmp8_;
+	glong _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	const gchar* _tmp13_;
+	gchar* _tmp14_;
+	GDestroyNotify _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	sqlite3_stmt* _tmp18_;
+	const gchar* _tmp19_;
+	gchar* _tmp20_;
+	GDestroyNotify _tmp21_;
+	gint _tmp22_;
+	gint _tmp23_;
+	sqlite3_stmt* _tmp24_;
+	const gchar* _tmp25_;
+	gchar* _tmp26_;
+	GDestroyNotify _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
+	sqlite3_stmt* _tmp30_;
+	PhotoID _tmp31_;
+	gint64 _tmp32_;
+	gint _tmp33_;
+	gint _tmp34_;
+	sqlite3_stmt* _tmp35_;
+	gint _tmp36_;
+	gint _tmp37_;
+	PhotoRow* _tmp40_;
+	BackingPhotoRow* _tmp41_;
+	gint64 _tmp42_;
+	PhotoRow* _tmp43_;
+	BackingPhotoRow* _tmp44_;
+	glong _tmp45_;
+	PhotoRow* _tmp46_;
+	const gchar* _tmp47_;
+	gchar* _tmp48_;
+	PhotoRow* _tmp49_;
+	const gchar* _tmp50_;
+	gchar* _tmp51_;
+	PhotoRow* _tmp52_;
+	const gchar* _tmp53_;
+	gchar* _tmp54_;
 #line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
 #line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -2595,13 +2595,13 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi
 #line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp37_ != SQLITE_DONE) {
 #line 2588 "PhotoTable.c"
-		gint _tmp38_ = 0;
+		gint _tmp38_;
 #line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp38_ = res;
 #line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp38_ != SQLITE_CONSTRAINT) {
 #line 2594 "PhotoTable.c"
-			gint _tmp39_ = 0;
+			gint _tmp39_;
 #line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp39_ = res;
 #line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -2674,8 +2674,8 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi
 
 static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) {
 	gboolean _tmp0_ = FALSE;
-	PhotoRow* _tmp1_ = NULL;
-	Orientation _tmp2_ = 0;
+	PhotoRow* _tmp1_;
+	Orientation _tmp2_;
 #line 377 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
 #line 377 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -2690,8 +2690,8 @@ static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) {
 		_tmp0_ = TRUE;
 #line 2682 "PhotoTable.c"
 	} else {
-		PhotoRow* _tmp3_ = NULL;
-		Orientation _tmp4_ = 0;
+		PhotoRow* _tmp3_;
+		Orientation _tmp4_;
 #line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp3_ = row;
 #line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -2703,9 +2703,9 @@ static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) {
 #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_) {
 #line 2696 "PhotoTable.c"
-		PhotoRow* _tmp5_ = NULL;
-		PhotoID _tmp6_ = {0};
-		PhotoRow* _tmp7_ = NULL;
+		PhotoRow* _tmp5_;
+		PhotoID _tmp6_;
+		PhotoRow* _tmp7_;
 #line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp5_ = row;
 #line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -2725,133 +2725,133 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) {
 	PhotoRow* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	PhotoID _tmp5_ = {0};
-	gint64 _tmp6_ = 0LL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	PhotoID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
 	PhotoRow* row = NULL;
-	PhotoRow* _tmp11_ = NULL;
-	PhotoRow* _tmp12_ = NULL;
-	PhotoID _tmp13_ = {0};
-	PhotoRow* _tmp14_ = NULL;
-	BackingPhotoRow* _tmp15_ = NULL;
-	sqlite3_stmt* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	PhotoRow* _tmp19_ = NULL;
-	BackingPhotoRow* _tmp20_ = NULL;
-	sqlite3_stmt* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	sqlite3_stmt* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	PhotoRow* _tmp25_ = NULL;
-	BackingPhotoRow* _tmp26_ = NULL;
-	sqlite3_stmt* _tmp27_ = NULL;
-	gint64 _tmp28_ = 0LL;
-	PhotoRow* _tmp29_ = NULL;
-	BackingPhotoRow* _tmp30_ = NULL;
-	sqlite3_stmt* _tmp31_ = NULL;
-	gint64 _tmp32_ = 0LL;
-	PhotoRow* _tmp33_ = NULL;
-	sqlite3_stmt* _tmp34_ = NULL;
-	gint64 _tmp35_ = 0LL;
-	PhotoRow* _tmp36_ = NULL;
-	sqlite3_stmt* _tmp37_ = NULL;
-	gint _tmp38_ = 0;
-	PhotoRow* _tmp39_ = NULL;
-	BackingPhotoRow* _tmp40_ = NULL;
-	sqlite3_stmt* _tmp41_ = NULL;
-	gint _tmp42_ = 0;
-	PhotoRow* _tmp43_ = NULL;
-	sqlite3_stmt* _tmp44_ = NULL;
-	gint64 _tmp45_ = 0LL;
-	PhotoRow* _tmp46_ = NULL;
-	sqlite3_stmt* _tmp47_ = NULL;
-	gint64 _tmp48_ = 0LL;
-	PhotoRow* _tmp49_ = NULL;
-	sqlite3_stmt* _tmp50_ = NULL;
-	const gchar* _tmp51_ = NULL;
-	GeeHashMap* _tmp52_ = NULL;
-	PhotoRow* _tmp53_ = NULL;
-	sqlite3_stmt* _tmp54_ = NULL;
-	const gchar* _tmp55_ = NULL;
-	gchar* _tmp56_ = NULL;
-	PhotoRow* _tmp57_ = NULL;
-	sqlite3_stmt* _tmp58_ = NULL;
-	const gchar* _tmp59_ = NULL;
-	gchar* _tmp60_ = NULL;
-	PhotoRow* _tmp61_ = NULL;
-	sqlite3_stmt* _tmp62_ = NULL;
-	const gchar* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
-	PhotoRow* _tmp65_ = NULL;
-	sqlite3_stmt* _tmp66_ = NULL;
-	gint64 _tmp67_ = 0LL;
-	PhotoRow* _tmp68_ = NULL;
-	sqlite3_stmt* _tmp69_ = NULL;
-	gint64 _tmp70_ = 0LL;
-	PhotoRow* _tmp71_ = NULL;
-	sqlite3_stmt* _tmp72_ = NULL;
-	gint _tmp73_ = 0;
-	Rating _tmp74_ = 0;
-	PhotoRow* _tmp75_ = NULL;
-	BackingPhotoRow* _tmp76_ = NULL;
-	sqlite3_stmt* _tmp77_ = NULL;
-	gint _tmp78_ = 0;
-	PhotoFileFormat _tmp79_ = 0;
-	PhotoRow* _tmp80_ = NULL;
-	sqlite3_stmt* _tmp81_ = NULL;
-	const gchar* _tmp82_ = NULL;
-	gchar* _tmp83_ = NULL;
-	PhotoRow* _tmp84_ = NULL;
-	sqlite3_stmt* _tmp85_ = NULL;
-	const gchar* _tmp86_ = NULL;
-	gchar* _tmp87_ = NULL;
-	PhotoRow* _tmp88_ = NULL;
-	sqlite3_stmt* _tmp89_ = NULL;
-	gint64 _tmp90_ = 0LL;
-	PhotoRow* _tmp91_ = NULL;
-	sqlite3_stmt* _tmp92_ = NULL;
-	gint64 _tmp93_ = 0LL;
-	PhotoRow* _tmp94_ = NULL;
-	sqlite3_stmt* _tmp95_ = NULL;
-	gint _tmp96_ = 0;
+	PhotoRow* _tmp11_;
+	PhotoRow* _tmp12_;
+	PhotoID _tmp13_;
+	PhotoRow* _tmp14_;
+	BackingPhotoRow* _tmp15_;
+	sqlite3_stmt* _tmp16_;
+	const gchar* _tmp17_;
+	gchar* _tmp18_;
+	PhotoRow* _tmp19_;
+	BackingPhotoRow* _tmp20_;
+	sqlite3_stmt* _tmp21_;
+	gint _tmp22_;
+	sqlite3_stmt* _tmp23_;
+	gint _tmp24_;
+	PhotoRow* _tmp25_;
+	BackingPhotoRow* _tmp26_;
+	sqlite3_stmt* _tmp27_;
+	gint64 _tmp28_;
+	PhotoRow* _tmp29_;
+	BackingPhotoRow* _tmp30_;
+	sqlite3_stmt* _tmp31_;
+	gint64 _tmp32_;
+	PhotoRow* _tmp33_;
+	sqlite3_stmt* _tmp34_;
+	gint64 _tmp35_;
+	PhotoRow* _tmp36_;
+	sqlite3_stmt* _tmp37_;
+	gint _tmp38_;
+	PhotoRow* _tmp39_;
+	BackingPhotoRow* _tmp40_;
+	sqlite3_stmt* _tmp41_;
+	gint _tmp42_;
+	PhotoRow* _tmp43_;
+	sqlite3_stmt* _tmp44_;
+	gint64 _tmp45_;
+	PhotoRow* _tmp46_;
+	sqlite3_stmt* _tmp47_;
+	gint64 _tmp48_;
+	PhotoRow* _tmp49_;
+	sqlite3_stmt* _tmp50_;
+	const gchar* _tmp51_;
+	GeeHashMap* _tmp52_;
+	PhotoRow* _tmp53_;
+	sqlite3_stmt* _tmp54_;
+	const gchar* _tmp55_;
+	gchar* _tmp56_;
+	PhotoRow* _tmp57_;
+	sqlite3_stmt* _tmp58_;
+	const gchar* _tmp59_;
+	gchar* _tmp60_;
+	PhotoRow* _tmp61_;
+	sqlite3_stmt* _tmp62_;
+	const gchar* _tmp63_;
+	gchar* _tmp64_;
+	PhotoRow* _tmp65_;
+	sqlite3_stmt* _tmp66_;
+	gint64 _tmp67_;
+	PhotoRow* _tmp68_;
+	sqlite3_stmt* _tmp69_;
+	gint64 _tmp70_;
+	PhotoRow* _tmp71_;
+	sqlite3_stmt* _tmp72_;
+	gint _tmp73_;
+	Rating _tmp74_;
+	PhotoRow* _tmp75_;
+	BackingPhotoRow* _tmp76_;
+	sqlite3_stmt* _tmp77_;
+	gint _tmp78_;
+	PhotoFileFormat _tmp79_;
+	PhotoRow* _tmp80_;
+	sqlite3_stmt* _tmp81_;
+	const gchar* _tmp82_;
+	gchar* _tmp83_;
+	PhotoRow* _tmp84_;
+	sqlite3_stmt* _tmp85_;
+	const gchar* _tmp86_;
+	gchar* _tmp87_;
+	PhotoRow* _tmp88_;
+	sqlite3_stmt* _tmp89_;
+	gint64 _tmp90_;
+	PhotoRow* _tmp91_;
+	sqlite3_stmt* _tmp92_;
+	gint64 _tmp93_;
+	PhotoRow* _tmp94_;
+	sqlite3_stmt* _tmp95_;
+	gint _tmp96_;
 	RawDeveloper _tmp97_ = 0;
-	sqlite3_stmt* _tmp98_ = NULL;
-	const gchar* _tmp99_ = NULL;
-	PhotoRow* _tmp103_ = NULL;
-	PhotoRow* _tmp104_ = NULL;
-	BackingPhotoID* _tmp105_ = NULL;
-	gint _tmp105__length1 = 0;
-	sqlite3_stmt* _tmp106_ = NULL;
-	gint64 _tmp107_ = 0LL;
+	sqlite3_stmt* _tmp98_;
+	const gchar* _tmp99_;
+	PhotoRow* _tmp103_;
+	PhotoRow* _tmp104_;
+	BackingPhotoID* _tmp105_;
+	gint _tmp105__length1;
+	sqlite3_stmt* _tmp106_;
+	gint64 _tmp107_;
 	BackingPhotoID _tmp108_ = {0};
-	BackingPhotoID _tmp109_ = {0};
-	PhotoRow* _tmp110_ = NULL;
-	BackingPhotoID* _tmp111_ = NULL;
-	gint _tmp111__length1 = 0;
-	sqlite3_stmt* _tmp112_ = NULL;
-	gint64 _tmp113_ = 0LL;
+	BackingPhotoID _tmp109_;
+	PhotoRow* _tmp110_;
+	BackingPhotoID* _tmp111_;
+	gint _tmp111__length1;
+	sqlite3_stmt* _tmp112_;
+	gint64 _tmp113_;
 	BackingPhotoID _tmp114_ = {0};
-	BackingPhotoID _tmp115_ = {0};
-	PhotoRow* _tmp116_ = NULL;
-	BackingPhotoID* _tmp117_ = NULL;
-	gint _tmp117__length1 = 0;
-	sqlite3_stmt* _tmp118_ = NULL;
-	gint64 _tmp119_ = 0LL;
+	BackingPhotoID _tmp115_;
+	PhotoRow* _tmp116_;
+	BackingPhotoID* _tmp117_;
+	gint _tmp117__length1;
+	sqlite3_stmt* _tmp118_;
+	gint64 _tmp119_;
 	BackingPhotoID _tmp120_ = {0};
-	BackingPhotoID _tmp121_ = {0};
-	PhotoRow* _tmp122_ = NULL;
-	sqlite3_stmt* _tmp123_ = NULL;
-	const gchar* _tmp124_ = NULL;
-	gchar* _tmp125_ = NULL;
+	BackingPhotoID _tmp121_;
+	PhotoRow* _tmp122_;
+	sqlite3_stmt* _tmp123_;
+	const gchar* _tmp124_;
+	gchar* _tmp125_;
 #line 386 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
 #line 386 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -3142,9 +3142,9 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) {
 #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp99_ != NULL) {
 #line 3132 "PhotoTable.c"
-		sqlite3_stmt* _tmp100_ = NULL;
-		const gchar* _tmp101_ = NULL;
-		RawDeveloper _tmp102_ = 0;
+		sqlite3_stmt* _tmp100_;
+		const gchar* _tmp101_;
+		RawDeveloper _tmp102_;
 #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp100_ = stmt;
 #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -3237,12 +3237,12 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) {
 	GeeArrayList* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	GeeArrayList* all = NULL;
-	GeeArrayList* _tmp4_ = NULL;
+	GeeArrayList* _tmp4_;
 #line 438 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
 #line 440 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -3270,129 +3270,129 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) {
 #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	while (TRUE) {
 #line 3256 "PhotoTable.c"
-		sqlite3_stmt* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		sqlite3_stmt* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 		PhotoRow* row = NULL;
-		PhotoRow* _tmp8_ = NULL;
-		PhotoRow* _tmp9_ = NULL;
-		sqlite3_stmt* _tmp10_ = NULL;
-		gint64 _tmp11_ = 0LL;
-		PhotoRow* _tmp12_ = NULL;
-		BackingPhotoRow* _tmp13_ = NULL;
-		sqlite3_stmt* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		PhotoRow* _tmp17_ = NULL;
-		BackingPhotoRow* _tmp18_ = NULL;
-		sqlite3_stmt* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
-		sqlite3_stmt* _tmp21_ = NULL;
-		gint _tmp22_ = 0;
-		PhotoRow* _tmp23_ = NULL;
-		BackingPhotoRow* _tmp24_ = NULL;
-		sqlite3_stmt* _tmp25_ = NULL;
-		gint64 _tmp26_ = 0LL;
-		PhotoRow* _tmp27_ = NULL;
-		BackingPhotoRow* _tmp28_ = NULL;
-		sqlite3_stmt* _tmp29_ = NULL;
-		gint64 _tmp30_ = 0LL;
-		PhotoRow* _tmp31_ = NULL;
-		sqlite3_stmt* _tmp32_ = NULL;
-		gint64 _tmp33_ = 0LL;
-		PhotoRow* _tmp34_ = NULL;
-		sqlite3_stmt* _tmp35_ = NULL;
-		gint _tmp36_ = 0;
-		PhotoRow* _tmp37_ = NULL;
-		BackingPhotoRow* _tmp38_ = NULL;
-		sqlite3_stmt* _tmp39_ = NULL;
-		gint _tmp40_ = 0;
-		PhotoRow* _tmp41_ = NULL;
-		sqlite3_stmt* _tmp42_ = NULL;
-		gint64 _tmp43_ = 0LL;
-		PhotoRow* _tmp44_ = NULL;
-		sqlite3_stmt* _tmp45_ = NULL;
-		gint64 _tmp46_ = 0LL;
-		PhotoRow* _tmp47_ = NULL;
-		sqlite3_stmt* _tmp48_ = NULL;
-		const gchar* _tmp49_ = NULL;
-		GeeHashMap* _tmp50_ = NULL;
-		PhotoRow* _tmp51_ = NULL;
-		sqlite3_stmt* _tmp52_ = NULL;
-		const gchar* _tmp53_ = NULL;
-		gchar* _tmp54_ = NULL;
-		PhotoRow* _tmp55_ = NULL;
-		sqlite3_stmt* _tmp56_ = NULL;
-		const gchar* _tmp57_ = NULL;
-		gchar* _tmp58_ = NULL;
-		PhotoRow* _tmp59_ = NULL;
-		sqlite3_stmt* _tmp60_ = NULL;
-		const gchar* _tmp61_ = NULL;
-		gchar* _tmp62_ = NULL;
-		PhotoRow* _tmp63_ = NULL;
-		sqlite3_stmt* _tmp64_ = NULL;
-		gint64 _tmp65_ = 0LL;
-		PhotoRow* _tmp66_ = NULL;
-		sqlite3_stmt* _tmp67_ = NULL;
-		gint64 _tmp68_ = 0LL;
-		PhotoRow* _tmp69_ = NULL;
-		sqlite3_stmt* _tmp70_ = NULL;
-		gint _tmp71_ = 0;
-		Rating _tmp72_ = 0;
-		PhotoRow* _tmp73_ = NULL;
-		BackingPhotoRow* _tmp74_ = NULL;
-		sqlite3_stmt* _tmp75_ = NULL;
-		gint _tmp76_ = 0;
-		PhotoFileFormat _tmp77_ = 0;
-		PhotoRow* _tmp78_ = NULL;
-		sqlite3_stmt* _tmp79_ = NULL;
-		const gchar* _tmp80_ = NULL;
-		gchar* _tmp81_ = NULL;
-		PhotoRow* _tmp82_ = NULL;
-		sqlite3_stmt* _tmp83_ = NULL;
-		const gchar* _tmp84_ = NULL;
-		gchar* _tmp85_ = NULL;
-		PhotoRow* _tmp86_ = NULL;
-		sqlite3_stmt* _tmp87_ = NULL;
-		gint64 _tmp88_ = 0LL;
-		PhotoRow* _tmp89_ = NULL;
-		sqlite3_stmt* _tmp90_ = NULL;
-		gint64 _tmp91_ = 0LL;
-		PhotoRow* _tmp92_ = NULL;
-		sqlite3_stmt* _tmp93_ = NULL;
-		gint _tmp94_ = 0;
+		PhotoRow* _tmp8_;
+		PhotoRow* _tmp9_;
+		sqlite3_stmt* _tmp10_;
+		gint64 _tmp11_;
+		PhotoRow* _tmp12_;
+		BackingPhotoRow* _tmp13_;
+		sqlite3_stmt* _tmp14_;
+		const gchar* _tmp15_;
+		gchar* _tmp16_;
+		PhotoRow* _tmp17_;
+		BackingPhotoRow* _tmp18_;
+		sqlite3_stmt* _tmp19_;
+		gint _tmp20_;
+		sqlite3_stmt* _tmp21_;
+		gint _tmp22_;
+		PhotoRow* _tmp23_;
+		BackingPhotoRow* _tmp24_;
+		sqlite3_stmt* _tmp25_;
+		gint64 _tmp26_;
+		PhotoRow* _tmp27_;
+		BackingPhotoRow* _tmp28_;
+		sqlite3_stmt* _tmp29_;
+		gint64 _tmp30_;
+		PhotoRow* _tmp31_;
+		sqlite3_stmt* _tmp32_;
+		gint64 _tmp33_;
+		PhotoRow* _tmp34_;
+		sqlite3_stmt* _tmp35_;
+		gint _tmp36_;
+		PhotoRow* _tmp37_;
+		BackingPhotoRow* _tmp38_;
+		sqlite3_stmt* _tmp39_;
+		gint _tmp40_;
+		PhotoRow* _tmp41_;
+		sqlite3_stmt* _tmp42_;
+		gint64 _tmp43_;
+		PhotoRow* _tmp44_;
+		sqlite3_stmt* _tmp45_;
+		gint64 _tmp46_;
+		PhotoRow* _tmp47_;
+		sqlite3_stmt* _tmp48_;
+		const gchar* _tmp49_;
+		GeeHashMap* _tmp50_;
+		PhotoRow* _tmp51_;
+		sqlite3_stmt* _tmp52_;
+		const gchar* _tmp53_;
+		gchar* _tmp54_;
+		PhotoRow* _tmp55_;
+		sqlite3_stmt* _tmp56_;
+		const gchar* _tmp57_;
+		gchar* _tmp58_;
+		PhotoRow* _tmp59_;
+		sqlite3_stmt* _tmp60_;
+		const gchar* _tmp61_;
+		gchar* _tmp62_;
+		PhotoRow* _tmp63_;
+		sqlite3_stmt* _tmp64_;
+		gint64 _tmp65_;
+		PhotoRow* _tmp66_;
+		sqlite3_stmt* _tmp67_;
+		gint64 _tmp68_;
+		PhotoRow* _tmp69_;
+		sqlite3_stmt* _tmp70_;
+		gint _tmp71_;
+		Rating _tmp72_;
+		PhotoRow* _tmp73_;
+		BackingPhotoRow* _tmp74_;
+		sqlite3_stmt* _tmp75_;
+		gint _tmp76_;
+		PhotoFileFormat _tmp77_;
+		PhotoRow* _tmp78_;
+		sqlite3_stmt* _tmp79_;
+		const gchar* _tmp80_;
+		gchar* _tmp81_;
+		PhotoRow* _tmp82_;
+		sqlite3_stmt* _tmp83_;
+		const gchar* _tmp84_;
+		gchar* _tmp85_;
+		PhotoRow* _tmp86_;
+		sqlite3_stmt* _tmp87_;
+		gint64 _tmp88_;
+		PhotoRow* _tmp89_;
+		sqlite3_stmt* _tmp90_;
+		gint64 _tmp91_;
+		PhotoRow* _tmp92_;
+		sqlite3_stmt* _tmp93_;
+		gint _tmp94_;
 		RawDeveloper _tmp95_ = 0;
-		sqlite3_stmt* _tmp96_ = NULL;
-		const gchar* _tmp97_ = NULL;
-		PhotoRow* _tmp101_ = NULL;
-		PhotoRow* _tmp102_ = NULL;
-		BackingPhotoID* _tmp103_ = NULL;
-		gint _tmp103__length1 = 0;
-		sqlite3_stmt* _tmp104_ = NULL;
-		gint64 _tmp105_ = 0LL;
+		sqlite3_stmt* _tmp96_;
+		const gchar* _tmp97_;
+		PhotoRow* _tmp101_;
+		PhotoRow* _tmp102_;
+		BackingPhotoID* _tmp103_;
+		gint _tmp103__length1;
+		sqlite3_stmt* _tmp104_;
+		gint64 _tmp105_;
 		BackingPhotoID _tmp106_ = {0};
-		BackingPhotoID _tmp107_ = {0};
-		PhotoRow* _tmp108_ = NULL;
-		BackingPhotoID* _tmp109_ = NULL;
-		gint _tmp109__length1 = 0;
-		sqlite3_stmt* _tmp110_ = NULL;
-		gint64 _tmp111_ = 0LL;
+		BackingPhotoID _tmp107_;
+		PhotoRow* _tmp108_;
+		BackingPhotoID* _tmp109_;
+		gint _tmp109__length1;
+		sqlite3_stmt* _tmp110_;
+		gint64 _tmp111_;
 		BackingPhotoID _tmp112_ = {0};
-		BackingPhotoID _tmp113_ = {0};
-		PhotoRow* _tmp114_ = NULL;
-		BackingPhotoID* _tmp115_ = NULL;
-		gint _tmp115__length1 = 0;
-		sqlite3_stmt* _tmp116_ = NULL;
-		gint64 _tmp117_ = 0LL;
+		BackingPhotoID _tmp113_;
+		PhotoRow* _tmp114_;
+		BackingPhotoID* _tmp115_;
+		gint _tmp115__length1;
+		sqlite3_stmt* _tmp116_;
+		gint64 _tmp117_;
 		BackingPhotoID _tmp118_ = {0};
-		BackingPhotoID _tmp119_ = {0};
-		PhotoRow* _tmp120_ = NULL;
-		sqlite3_stmt* _tmp121_ = NULL;
-		const gchar* _tmp122_ = NULL;
-		gchar* _tmp123_ = NULL;
-		PhotoRow* _tmp124_ = NULL;
-		GeeArrayList* _tmp125_ = NULL;
-		PhotoRow* _tmp126_ = NULL;
+		BackingPhotoID _tmp119_;
+		PhotoRow* _tmp120_;
+		sqlite3_stmt* _tmp121_;
+		const gchar* _tmp122_;
+		gchar* _tmp123_;
+		PhotoRow* _tmp124_;
+		GeeArrayList* _tmp125_;
+		PhotoRow* _tmp126_;
 #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp5_ = stmt;
 #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -3650,9 +3650,9 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) {
 #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp97_ != NULL) {
 #line 3636 "PhotoTable.c"
-			sqlite3_stmt* _tmp98_ = NULL;
-			const gchar* _tmp99_ = NULL;
-			RawDeveloper _tmp100_ = 0;
+			sqlite3_stmt* _tmp98_;
+			const gchar* _tmp99_;
+			RawDeveloper _tmp100_;
 #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp98_ = stmt;
 #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -3757,170 +3757,170 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) {
 
 void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* new_filename, BackingPhotoID* editable_id, BackingPhotoID* develop_shotwell, BackingPhotoID* develop_camera_id, BackingPhotoID* develop_embedded_id, PhotoID* result) {
 	PhotoRow* original = NULL;
-	PhotoID _tmp0_ = {0};
-	PhotoRow* _tmp1_ = NULL;
+	PhotoID _tmp0_;
+	PhotoRow* _tmp1_;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp2_ = NULL;
+	sqlite3* _tmp2_;
 	sqlite3_stmt* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	sqlite3_stmt* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	GDestroyNotify _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	PhotoRow* _tmp13_ = NULL;
-	BackingPhotoRow* _tmp14_ = NULL;
-	Dimensions _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	sqlite3_stmt* _tmp19_ = NULL;
-	PhotoRow* _tmp20_ = NULL;
-	BackingPhotoRow* _tmp21_ = NULL;
-	Dimensions _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	sqlite3_stmt* _tmp26_ = NULL;
-	PhotoRow* _tmp27_ = NULL;
-	BackingPhotoRow* _tmp28_ = NULL;
-	gint64 _tmp29_ = 0LL;
-	gint _tmp30_ = 0;
-	gint _tmp31_ = 0;
-	sqlite3_stmt* _tmp32_ = NULL;
-	PhotoRow* _tmp33_ = NULL;
-	BackingPhotoRow* _tmp34_ = NULL;
-	time_t _tmp35_ = 0;
-	gint _tmp36_ = 0;
-	gint _tmp37_ = 0;
-	sqlite3_stmt* _tmp38_ = NULL;
-	PhotoRow* _tmp39_ = NULL;
-	time_t _tmp40_ = 0;
-	gint _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	sqlite3_stmt* _tmp43_ = NULL;
-	PhotoRow* _tmp44_ = NULL;
-	Orientation _tmp45_ = 0;
-	gint _tmp46_ = 0;
-	gint _tmp47_ = 0;
-	sqlite3_stmt* _tmp48_ = NULL;
-	PhotoRow* _tmp49_ = NULL;
-	BackingPhotoRow* _tmp50_ = NULL;
-	Orientation _tmp51_ = 0;
-	gint _tmp52_ = 0;
-	gint _tmp53_ = 0;
-	sqlite3_stmt* _tmp54_ = NULL;
-	PhotoRow* _tmp55_ = NULL;
-	ImportID _tmp56_ = {0};
-	gint64 _tmp57_ = 0LL;
-	gint _tmp58_ = 0;
-	gint _tmp59_ = 0;
-	sqlite3_stmt* _tmp60_ = NULL;
-	PhotoRow* _tmp61_ = NULL;
-	EventID _tmp62_ = {0};
-	gint64 _tmp63_ = 0LL;
-	gint _tmp64_ = 0;
-	gint _tmp65_ = 0;
-	sqlite3_stmt* _tmp66_ = NULL;
-	PhotoRow* _tmp67_ = NULL;
-	GeeHashMap* _tmp68_ = NULL;
-	gchar* _tmp69_ = NULL;
-	GDestroyNotify _tmp70_ = NULL;
-	gint _tmp71_ = 0;
-	gint _tmp72_ = 0;
-	sqlite3_stmt* _tmp73_ = NULL;
-	PhotoRow* _tmp74_ = NULL;
-	const gchar* _tmp75_ = NULL;
-	gchar* _tmp76_ = NULL;
-	GDestroyNotify _tmp77_ = NULL;
-	gint _tmp78_ = 0;
-	gint _tmp79_ = 0;
-	sqlite3_stmt* _tmp80_ = NULL;
-	PhotoRow* _tmp81_ = NULL;
-	const gchar* _tmp82_ = NULL;
-	gchar* _tmp83_ = NULL;
-	GDestroyNotify _tmp84_ = NULL;
-	gint _tmp85_ = 0;
-	gint _tmp86_ = 0;
-	sqlite3_stmt* _tmp87_ = NULL;
-	PhotoRow* _tmp88_ = NULL;
-	const gchar* _tmp89_ = NULL;
-	gchar* _tmp90_ = NULL;
-	GDestroyNotify _tmp91_ = NULL;
-	gint _tmp92_ = 0;
-	gint _tmp93_ = 0;
-	sqlite3_stmt* _tmp94_ = NULL;
-	gulong _tmp95_ = 0UL;
-	gint _tmp96_ = 0;
-	gint _tmp97_ = 0;
-	sqlite3_stmt* _tmp98_ = NULL;
-	PhotoRow* _tmp99_ = NULL;
-	guint64 _tmp100_ = 0ULL;
-	gint _tmp101_ = 0;
-	gint _tmp102_ = 0;
-	sqlite3_stmt* _tmp103_ = NULL;
-	PhotoRow* _tmp104_ = NULL;
-	Rating _tmp105_ = 0;
-	gint _tmp106_ = 0;
-	gint _tmp107_ = 0;
-	gint _tmp108_ = 0;
-	sqlite3_stmt* _tmp109_ = NULL;
-	PhotoRow* _tmp110_ = NULL;
-	BackingPhotoRow* _tmp111_ = NULL;
-	PhotoFileFormat _tmp112_ = 0;
-	gint _tmp113_ = 0;
-	gint _tmp114_ = 0;
-	gint _tmp115_ = 0;
-	sqlite3_stmt* _tmp116_ = NULL;
-	PhotoRow* _tmp117_ = NULL;
-	const gchar* _tmp118_ = NULL;
-	gchar* _tmp119_ = NULL;
-	GDestroyNotify _tmp120_ = NULL;
-	gint _tmp121_ = 0;
-	gint _tmp122_ = 0;
-	sqlite3_stmt* _tmp123_ = NULL;
-	BackingPhotoID _tmp124_ = {0};
-	gint64 _tmp125_ = 0LL;
-	gint _tmp126_ = 0;
-	gint _tmp127_ = 0;
-	sqlite3_stmt* _tmp128_ = NULL;
-	PhotoRow* _tmp129_ = NULL;
-	RawDeveloper _tmp130_ = 0;
-	gchar* _tmp131_ = NULL;
-	GDestroyNotify _tmp132_ = NULL;
-	gint _tmp133_ = 0;
-	gint _tmp134_ = 0;
-	sqlite3_stmt* _tmp135_ = NULL;
-	BackingPhotoID _tmp136_ = {0};
-	gint64 _tmp137_ = 0LL;
-	gint _tmp138_ = 0;
-	gint _tmp139_ = 0;
-	sqlite3_stmt* _tmp140_ = NULL;
-	BackingPhotoID _tmp141_ = {0};
-	gint64 _tmp142_ = 0LL;
-	gint _tmp143_ = 0;
-	gint _tmp144_ = 0;
-	sqlite3_stmt* _tmp145_ = NULL;
-	BackingPhotoID _tmp146_ = {0};
-	gint64 _tmp147_ = 0LL;
-	gint _tmp148_ = 0;
-	gint _tmp149_ = 0;
-	sqlite3_stmt* _tmp150_ = NULL;
-	PhotoRow* _tmp151_ = NULL;
-	const gchar* _tmp152_ = NULL;
-	gchar* _tmp153_ = NULL;
-	GDestroyNotify _tmp154_ = NULL;
-	gint _tmp155_ = 0;
-	gint _tmp156_ = 0;
-	sqlite3_stmt* _tmp157_ = NULL;
-	gint _tmp158_ = 0;
-	gint _tmp159_ = 0;
-	sqlite3* _tmp163_ = NULL;
-	gint64 _tmp164_ = 0LL;
+	gint _tmp4_;
+	gint _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	const gchar* _tmp7_;
+	gchar* _tmp8_;
+	GDestroyNotify _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	PhotoRow* _tmp13_;
+	BackingPhotoRow* _tmp14_;
+	Dimensions _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	sqlite3_stmt* _tmp19_;
+	PhotoRow* _tmp20_;
+	BackingPhotoRow* _tmp21_;
+	Dimensions _tmp22_;
+	gint _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	sqlite3_stmt* _tmp26_;
+	PhotoRow* _tmp27_;
+	BackingPhotoRow* _tmp28_;
+	gint64 _tmp29_;
+	gint _tmp30_;
+	gint _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	PhotoRow* _tmp33_;
+	BackingPhotoRow* _tmp34_;
+	time_t _tmp35_;
+	gint _tmp36_;
+	gint _tmp37_;
+	sqlite3_stmt* _tmp38_;
+	PhotoRow* _tmp39_;
+	time_t _tmp40_;
+	gint _tmp41_;
+	gint _tmp42_;
+	sqlite3_stmt* _tmp43_;
+	PhotoRow* _tmp44_;
+	Orientation _tmp45_;
+	gint _tmp46_;
+	gint _tmp47_;
+	sqlite3_stmt* _tmp48_;
+	PhotoRow* _tmp49_;
+	BackingPhotoRow* _tmp50_;
+	Orientation _tmp51_;
+	gint _tmp52_;
+	gint _tmp53_;
+	sqlite3_stmt* _tmp54_;
+	PhotoRow* _tmp55_;
+	ImportID _tmp56_;
+	gint64 _tmp57_;
+	gint _tmp58_;
+	gint _tmp59_;
+	sqlite3_stmt* _tmp60_;
+	PhotoRow* _tmp61_;
+	EventID _tmp62_;
+	gint64 _tmp63_;
+	gint _tmp64_;
+	gint _tmp65_;
+	sqlite3_stmt* _tmp66_;
+	PhotoRow* _tmp67_;
+	GeeHashMap* _tmp68_;
+	gchar* _tmp69_;
+	GDestroyNotify _tmp70_;
+	gint _tmp71_;
+	gint _tmp72_;
+	sqlite3_stmt* _tmp73_;
+	PhotoRow* _tmp74_;
+	const gchar* _tmp75_;
+	gchar* _tmp76_;
+	GDestroyNotify _tmp77_;
+	gint _tmp78_;
+	gint _tmp79_;
+	sqlite3_stmt* _tmp80_;
+	PhotoRow* _tmp81_;
+	const gchar* _tmp82_;
+	gchar* _tmp83_;
+	GDestroyNotify _tmp84_;
+	gint _tmp85_;
+	gint _tmp86_;
+	sqlite3_stmt* _tmp87_;
+	PhotoRow* _tmp88_;
+	const gchar* _tmp89_;
+	gchar* _tmp90_;
+	GDestroyNotify _tmp91_;
+	gint _tmp92_;
+	gint _tmp93_;
+	sqlite3_stmt* _tmp94_;
+	gulong _tmp95_;
+	gint _tmp96_;
+	gint _tmp97_;
+	sqlite3_stmt* _tmp98_;
+	PhotoRow* _tmp99_;
+	guint64 _tmp100_;
+	gint _tmp101_;
+	gint _tmp102_;
+	sqlite3_stmt* _tmp103_;
+	PhotoRow* _tmp104_;
+	Rating _tmp105_;
+	gint _tmp106_;
+	gint _tmp107_;
+	gint _tmp108_;
+	sqlite3_stmt* _tmp109_;
+	PhotoRow* _tmp110_;
+	BackingPhotoRow* _tmp111_;
+	PhotoFileFormat _tmp112_;
+	gint _tmp113_;
+	gint _tmp114_;
+	gint _tmp115_;
+	sqlite3_stmt* _tmp116_;
+	PhotoRow* _tmp117_;
+	const gchar* _tmp118_;
+	gchar* _tmp119_;
+	GDestroyNotify _tmp120_;
+	gint _tmp121_;
+	gint _tmp122_;
+	sqlite3_stmt* _tmp123_;
+	BackingPhotoID _tmp124_;
+	gint64 _tmp125_;
+	gint _tmp126_;
+	gint _tmp127_;
+	sqlite3_stmt* _tmp128_;
+	PhotoRow* _tmp129_;
+	RawDeveloper _tmp130_;
+	gchar* _tmp131_;
+	GDestroyNotify _tmp132_;
+	gint _tmp133_;
+	gint _tmp134_;
+	sqlite3_stmt* _tmp135_;
+	BackingPhotoID _tmp136_;
+	gint64 _tmp137_;
+	gint _tmp138_;
+	gint _tmp139_;
+	sqlite3_stmt* _tmp140_;
+	BackingPhotoID _tmp141_;
+	gint64 _tmp142_;
+	gint _tmp143_;
+	gint _tmp144_;
+	sqlite3_stmt* _tmp145_;
+	BackingPhotoID _tmp146_;
+	gint64 _tmp147_;
+	gint _tmp148_;
+	gint _tmp149_;
+	sqlite3_stmt* _tmp150_;
+	PhotoRow* _tmp151_;
+	const gchar* _tmp152_;
+	gchar* _tmp153_;
+	GDestroyNotify _tmp154_;
+	gint _tmp155_;
+	gint _tmp156_;
+	sqlite3_stmt* _tmp157_;
+	gint _tmp158_;
+	gint _tmp159_;
+	sqlite3* _tmp163_;
+	gint64 _tmp164_;
 	PhotoID _tmp165_ = {0};
 #line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -4373,14 +4373,14 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne
 #line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp159_ != SQLITE_DONE) {
 #line 4355 "PhotoTable.c"
-		gint _tmp160_ = 0;
+		gint _tmp160_;
 		PhotoID _tmp162_ = {0};
 #line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp160_ = res;
 #line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp160_ != SQLITE_CONSTRAINT) {
 #line 4362 "PhotoTable.c"
-			gint _tmp161_ = 0;
+			gint _tmp161_;
 #line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp161_ = res;
 #line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4420,10 +4420,10 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne
 gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar* new_title) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PhotoID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
-	gboolean _tmp5_ = FALSE;
+	const gchar* _tmp1_;
+	PhotoID _tmp3_;
+	gint64 _tmp4_;
+	gboolean _tmp5_;
 #line 572 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
 #line 572 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4433,7 +4433,7 @@ gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar
 #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ != NULL) {
 #line 4415 "PhotoTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = new_title;
 #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4461,10 +4461,10 @@ gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar
 gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gchar* new_comment) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PhotoID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
-	gboolean _tmp5_ = FALSE;
+	const gchar* _tmp1_;
+	PhotoID _tmp3_;
+	gint64 _tmp4_;
+	gboolean _tmp5_;
 #line 576 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
 #line 576 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4474,7 +4474,7 @@ gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gch
 #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ != NULL) {
 #line 4456 "PhotoTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = new_comment;
 #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4500,9 +4500,9 @@ gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gch
 
 
 void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* filepath, GError** error) {
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	const gchar* _tmp2_ = NULL;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	const gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 580 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -4541,9 +4541,9 @@ void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar*
 
 
 void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t timestamp, GError** error) {
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	time_t _tmp2_ = 0;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	time_t _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 584 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -4581,10 +4581,10 @@ void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t t
 
 gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, time_t time) {
 	gboolean result = FALSE;
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	time_t _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	time_t _tmp2_;
+	gboolean _tmp3_;
 #line 588 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
 #line 588 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4606,10 +4606,10 @@ gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, tim
 
 
 void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* import_id, GError** error) {
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	ImportID _tmp2_ = {0};
-	gint64 _tmp3_ = 0LL;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	ImportID _tmp2_;
+	gint64 _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 592 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -4653,19 +4653,19 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) {
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GDestroyNotify _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	GFile* _tmp5_;
+	gchar* _tmp6_;
+	GDestroyNotify _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
 #line 596 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
 #line 596 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4711,7 +4711,7 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) {
 #line 605 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp12_ != SQLITE_DONE) {
 #line 4693 "PhotoTable.c"
-		gint _tmp13_ = 0;
+		gint _tmp13_;
 #line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp13_ = res;
 #line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4735,8 +4735,8 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) {
 
 
 void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error) {
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 614 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -4774,12 +4774,12 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) {
 	GeeArrayList* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	GeeArrayList* photo_ids = NULL;
-	GeeArrayList* _tmp4_ = NULL;
+	GeeArrayList* _tmp4_;
 #line 618 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
 #line 620 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4808,12 +4808,12 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) {
 #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		while (TRUE) {
 #line 4790 "PhotoTable.c"
-			sqlite3_stmt* _tmp6_ = NULL;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
-			GeeArrayList* _tmp11_ = NULL;
-			sqlite3_stmt* _tmp12_ = NULL;
-			gint64 _tmp13_ = 0LL;
+			sqlite3_stmt* _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
+			GeeArrayList* _tmp11_;
+			sqlite3_stmt* _tmp12_;
+			gint64 _tmp13_;
 			PhotoID _tmp14_ = {0};
 #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (!_tmp5_) {
@@ -4835,13 +4835,13 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) {
 				break;
 #line 4816 "PhotoTable.c"
 			} else {
-				gint _tmp9_ = 0;
+				gint _tmp9_;
 #line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp9_ = res;
 #line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				if (_tmp9_ != SQLITE_ROW) {
 #line 4823 "PhotoTable.c"
-					gint _tmp10_ = 0;
+					gint _tmp10_;
 #line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp10_ = res;
 #line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4876,10 +4876,10 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) {
 
 gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orientation orientation) {
 	gboolean result = FALSE;
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	Orientation _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	Orientation _tmp2_;
+	gboolean _tmp3_;
 #line 640 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
 #line 640 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4902,10 +4902,10 @@ gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orien
 
 gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64 flags) {
 	gboolean result = FALSE;
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	guint64 _tmp2_ = 0ULL;
-	gboolean _tmp3_ = FALSE;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	guint64 _tmp2_;
+	gboolean _tmp3_;
 #line 644 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
 #line 644 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4928,11 +4928,11 @@ gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64
 
 gboolean photo_table_set_rating (PhotoTable* self, PhotoID* photo_id, Rating rating) {
 	gboolean result = FALSE;
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	Rating _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gboolean _tmp4_ = FALSE;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	Rating _tmp2_;
+	gint _tmp3_;
+	gboolean _tmp4_;
 #line 648 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
 #line 648 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4959,15 +4959,15 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) {
 	gint result = 0;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	EventID _tmp5_ = {0};
-	gint64 _tmp6_ = 0LL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	EventID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 	gint count = 0;
 #line 652 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), 0);
@@ -5011,10 +5011,10 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) {
 #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		while (TRUE) {
 #line 4993 "PhotoTable.c"
-			sqlite3_stmt* _tmp10_ = NULL;
-			gint _tmp11_ = 0;
-			gint _tmp12_ = 0;
-			gint _tmp15_ = 0;
+			sqlite3_stmt* _tmp10_;
+			gint _tmp11_;
+			gint _tmp12_;
+			gint _tmp15_;
 #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (!_tmp9_) {
 #line 5000 "PhotoTable.c"
@@ -5035,13 +5035,13 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) {
 				break;
 #line 5016 "PhotoTable.c"
 			} else {
-				gint _tmp13_ = 0;
+				gint _tmp13_;
 #line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp13_ = res;
 #line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				if (_tmp13_ != SQLITE_ROW) {
 #line 5023 "PhotoTable.c"
-					gint _tmp14_ = 0;
+					gint _tmp14_;
 #line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp14_ = res;
 #line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5072,17 +5072,17 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event
 	GeeArrayList* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	EventID _tmp5_ = {0};
-	gint64 _tmp6_ = 0LL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	EventID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 	GeeArrayList* _result_ = NULL;
-	GeeArrayList* _tmp9_ = NULL;
+	GeeArrayList* _tmp9_;
 #line 677 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
 #line 677 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5127,15 +5127,15 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event
 #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		while (TRUE) {
 #line 5109 "PhotoTable.c"
-			sqlite3_stmt* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
-			GeeArrayList* _tmp16_ = NULL;
-			sqlite3_stmt* _tmp17_ = NULL;
-			gint64 _tmp18_ = 0LL;
+			sqlite3_stmt* _tmp11_;
+			gint _tmp12_;
+			gint _tmp13_;
+			GeeArrayList* _tmp16_;
+			sqlite3_stmt* _tmp17_;
+			gint64 _tmp18_;
 			PhotoID _tmp19_ = {0};
-			gchar* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
+			gchar* _tmp20_;
+			gchar* _tmp21_;
 #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (!_tmp10_) {
 #line 5121 "PhotoTable.c"
@@ -5156,13 +5156,13 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event
 				break;
 #line 5137 "PhotoTable.c"
 			} else {
-				gint _tmp14_ = 0;
+				gint _tmp14_;
 #line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp14_ = res;
 #line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				if (_tmp14_ != SQLITE_ROW) {
 #line 5144 "PhotoTable.c"
-					gint _tmp15_ = 0;
+					gint _tmp15_;
 #line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp15_ = res;
 #line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5205,18 +5205,18 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) {
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	EventID _tmp5_ = {0};
-	gint64 _tmp6_ = 0LL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	EventID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 #line 702 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
 #line 702 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5267,13 +5267,13 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) {
 		return result;
 #line 5248 "PhotoTable.c"
 	} else {
-		gint _tmp12_ = 0;
+		gint _tmp12_;
 #line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp12_ = res;
 #line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp12_ != SQLITE_ROW) {
 #line 5255 "PhotoTable.c"
-			gint _tmp13_ = 0;
+			gint _tmp13_;
 #line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = res;
 #line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5301,21 +5301,21 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) {
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	sqlite3_stmt* _tmp7_ = NULL;
-	EventID _tmp8_ = {0};
-	gint64 _tmp9_ = 0LL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	sqlite3_stmt* _tmp7_;
+	EventID _tmp8_;
+	gint64 _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
 #line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
 #line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5369,7 +5369,7 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) {
 #line 733 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp14_ != SQLITE_DONE) {
 #line 5351 "PhotoTable.c"
-		gint _tmp15_ = 0;
+		gint _tmp15_;
 #line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp15_ = res;
 #line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5394,11 +5394,11 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) {
 
 gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* event_id) {
 	gboolean result = FALSE;
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	EventID _tmp2_ = {0};
-	gint64 _tmp3_ = 0LL;
-	gboolean _tmp4_ = FALSE;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	EventID _tmp2_;
+	gint64 _tmp3_;
+	gboolean _tmp4_;
 #line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
 #line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5426,16 +5426,16 @@ gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* ev
 static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* photo_id) {
 	gchar* result = NULL;
 	sqlite3_stmt* stmt = NULL;
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp3_;
 	gchar* trans = NULL;
-	sqlite3_stmt* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	sqlite3_stmt* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 	gboolean _tmp7_ = FALSE;
-	const gchar* _tmp8_ = NULL;
+	const gchar* _tmp8_;
 #line 746 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
 #line 746 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5476,9 +5476,9 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph
 		_tmp7_ = TRUE;
 #line 5457 "PhotoTable.c"
 	} else {
-		const gchar* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
+		const gchar* _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
 #line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = trans;
 #line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5513,10 +5513,10 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph
 
 static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID* photo_id, const gchar* trans) {
 	gboolean result = FALSE;
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 #line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
 #line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5543,28 +5543,28 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	Orientation _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	sqlite3_stmt* _tmp8_ = NULL;
-	GeeHashMap* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	GDestroyNotify _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	sqlite3_stmt* _tmp14_ = NULL;
-	PhotoID _tmp15_ = {0};
-	gint64 _tmp16_ = 0LL;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	sqlite3_stmt* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	Orientation _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	sqlite3_stmt* _tmp8_;
+	GeeHashMap* _tmp9_;
+	gchar* _tmp10_;
+	GDestroyNotify _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	sqlite3_stmt* _tmp14_;
+	PhotoID _tmp15_;
+	gint64 _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	sqlite3_stmt* _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
 #line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
 #line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5639,7 +5639,7 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_
 #line 777 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp21_ != SQLITE_DONE) {
 #line 5620 "PhotoTable.c"
-		gint _tmp22_ = 0;
+		gint _tmp22_;
 #line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp22_ = res;
 #line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5665,7 +5665,7 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_
 GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 	GeeHashMap* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = trans;
@@ -5675,9 +5675,9 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 		_tmp0_ = TRUE;
 #line 5655 "PhotoTable.c"
 	} else {
-		const gchar* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		const gchar* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = trans;
 #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5698,24 +5698,24 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 	}
 	{
 		GKeyFile* keyfile = NULL;
-		GKeyFile* _tmp5_ = NULL;
+		GKeyFile* _tmp5_;
 		gboolean _tmp6_ = FALSE;
-		GKeyFile* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
-		gboolean _tmp12_ = FALSE;
+		GKeyFile* _tmp7_;
+		const gchar* _tmp8_;
+		const gchar* _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
+		gboolean _tmp12_;
 		GeeHashMap* map = NULL;
-		GeeHashMap* _tmp13_ = NULL;
+		GeeHashMap* _tmp13_;
 		gchar** objects = NULL;
-		GKeyFile* _tmp14_ = NULL;
+		GKeyFile* _tmp14_;
 		gsize _tmp15_;
-		gchar** _tmp16_ = NULL;
-		gint objects_length1 = 0;
-		gint _objects_size_ = 0;
-		gchar** _tmp17_ = NULL;
-		gint _tmp17__length1 = 0;
+		gchar** _tmp16_;
+		gint objects_length1;
+		gint _objects_size_;
+		gchar** _tmp17_;
+		gint _tmp17__length1;
 #line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp5_ = g_key_file_new ();
 #line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5782,7 +5782,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			for (object_it = 0; object_it < _tmp17__length1; object_it = object_it + 1) {
 #line 5763 "PhotoTable.c"
-				gchar* _tmp18_ = NULL;
+				gchar* _tmp18_;
 				gchar* object = NULL;
 #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp18_ = g_strdup (object_collection[object_it]);
@@ -5791,21 +5791,21 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 #line 5770 "PhotoTable.c"
 				{
 					gchar** keys = NULL;
-					GKeyFile* _tmp19_ = NULL;
-					const gchar* _tmp20_ = NULL;
+					GKeyFile* _tmp19_;
+					const gchar* _tmp20_;
 					gsize _tmp21_;
-					gchar** _tmp22_ = NULL;
-					gint keys_length1 = 0;
-					gint _keys_size_ = 0;
+					gchar** _tmp22_;
+					gint keys_length1;
+					gint _keys_size_;
 					gboolean _tmp23_ = FALSE;
-					gchar** _tmp24_ = NULL;
-					gint _tmp24__length1 = 0;
+					gchar** _tmp24_;
+					gint _tmp24__length1;
 					KeyValueMap* key_map = NULL;
-					const gchar* _tmp26_ = NULL;
-					KeyValueMap* _tmp27_ = NULL;
-					GeeHashMap* _tmp43_ = NULL;
-					const gchar* _tmp44_ = NULL;
-					KeyValueMap* _tmp45_ = NULL;
+					const gchar* _tmp26_;
+					KeyValueMap* _tmp27_;
+					GeeHashMap* _tmp43_;
+					const gchar* _tmp44_;
+					KeyValueMap* _tmp45_;
 #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp19_ = keyfile;
 #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5841,8 +5841,8 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 						_tmp23_ = TRUE;
 #line 5821 "PhotoTable.c"
 					} else {
-						gchar** _tmp25_ = NULL;
-						gint _tmp25__length1 = 0;
+						gchar** _tmp25_;
+						gint _tmp25__length1;
 #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						_tmp25_ = keys;
 #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5880,26 +5880,26 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 							while (TRUE) {
 #line 5861 "PhotoTable.c"
-								gint _tmp30_ = 0;
-								gchar** _tmp31_ = NULL;
-								gint _tmp31__length1 = 0;
+								gint _tmp30_;
+								gchar** _tmp31_;
+								gint _tmp31__length1;
 								gchar* _tmp32_ = NULL;
-								GKeyFile* _tmp33_ = NULL;
-								const gchar* _tmp34_ = NULL;
-								gchar** _tmp35_ = NULL;
-								gint _tmp35__length1 = 0;
-								gint _tmp36_ = 0;
-								const gchar* _tmp37_ = NULL;
-								gchar* _tmp38_ = NULL;
-								KeyValueMap* _tmp39_ = NULL;
-								gchar** _tmp40_ = NULL;
-								gint _tmp40__length1 = 0;
-								gint _tmp41_ = 0;
-								const gchar* _tmp42_ = NULL;
+								GKeyFile* _tmp33_;
+								const gchar* _tmp34_;
+								gchar** _tmp35_;
+								gint _tmp35__length1;
+								gint _tmp36_;
+								const gchar* _tmp37_;
+								gchar* _tmp38_;
+								KeyValueMap* _tmp39_;
+								gchar** _tmp40_;
+								gint _tmp40__length1;
+								gint _tmp41_;
+								const gchar* _tmp42_;
 #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								if (!_tmp28_) {
 #line 5880 "PhotoTable.c"
-									gint _tmp29_ = 0;
+									gint _tmp29_;
 #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 									_tmp29_ = ctr;
 #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6003,7 +6003,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 	__catch17_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp46_ = NULL;
+		const gchar* _tmp46_;
 #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		err = _inner_error_;
 #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6030,18 +6030,18 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) {
 	gchar* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	GeeHashMap* _tmp1_ = NULL;
+	GeeHashMap* _tmp1_;
 	GKeyFile* keyfile = NULL;
-	GKeyFile* _tmp8_ = NULL;
+	GKeyFile* _tmp8_;
 	gsize length = 0UL;
 	gchar* unmarshalled = NULL;
-	GKeyFile* _tmp39_ = NULL;
+	GKeyFile* _tmp39_;
 	gsize _tmp40_ = 0UL;
-	gchar* _tmp41_ = NULL;
-	const gchar* _tmp42_ = NULL;
-	const gchar* _tmp43_ = NULL;
-	gint _tmp44_ = 0;
-	gint _tmp45_ = 0;
+	gchar* _tmp41_;
+	const gchar* _tmp42_;
+	const gchar* _tmp43_;
+	gint _tmp44_;
+	gint _tmp45_;
 #line 816 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail ((transformations == NULL) || GEE_IS_HASH_MAP (transformations), NULL);
 #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6052,12 +6052,12 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 		_tmp0_ = TRUE;
 #line 6032 "PhotoTable.c"
 	} else {
-		GeeHashMap* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeSet* _tmp4_ = NULL;
-		GeeSet* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		GeeHashMap* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeSet* _tmp4_;
+		GeeSet* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = transformations;
 #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6091,12 +6091,12 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 #line 6070 "PhotoTable.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeHashMap* _tmp9_ = NULL;
-		GeeSet* _tmp10_ = NULL;
-		GeeSet* _tmp11_ = NULL;
-		GeeSet* _tmp12_ = NULL;
-		GeeIterator* _tmp13_ = NULL;
-		GeeIterator* _tmp14_ = NULL;
+		GeeHashMap* _tmp9_;
+		GeeSet* _tmp10_;
+		GeeSet* _tmp11_;
+		GeeSet* _tmp12_;
+		GeeIterator* _tmp13_;
+		GeeIterator* _tmp14_;
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = transformations;
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6116,15 +6116,15 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		while (TRUE) {
 #line 6097 "PhotoTable.c"
-			GeeIterator* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
+			GeeIterator* _tmp15_;
+			gboolean _tmp16_;
 			gchar* object = NULL;
-			GeeIterator* _tmp17_ = NULL;
-			gpointer _tmp18_ = NULL;
+			GeeIterator* _tmp17_;
+			gpointer _tmp18_;
 			KeyValueMap* map = NULL;
-			GeeHashMap* _tmp19_ = NULL;
-			const gchar* _tmp20_ = NULL;
-			gpointer _tmp21_ = NULL;
+			GeeHashMap* _tmp19_;
+			const gchar* _tmp20_;
+			gpointer _tmp21_;
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp15_ = _object_it;
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6152,11 +6152,11 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 #line 6131 "PhotoTable.c"
 			{
 				GeeIterator* _key_it = NULL;
-				KeyValueMap* _tmp22_ = NULL;
-				GeeSet* _tmp23_ = NULL;
-				GeeSet* _tmp24_ = NULL;
-				GeeIterator* _tmp25_ = NULL;
-				GeeIterator* _tmp26_ = NULL;
+				KeyValueMap* _tmp22_;
+				GeeSet* _tmp23_;
+				GeeSet* _tmp24_;
+				GeeIterator* _tmp25_;
+				GeeIterator* _tmp26_;
 #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp22_ = map;
 #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6174,20 +6174,20 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				while (TRUE) {
 #line 6155 "PhotoTable.c"
-					GeeIterator* _tmp27_ = NULL;
-					gboolean _tmp28_ = FALSE;
+					GeeIterator* _tmp27_;
+					gboolean _tmp28_;
 					gchar* key = NULL;
-					GeeIterator* _tmp29_ = NULL;
-					gpointer _tmp30_ = NULL;
+					GeeIterator* _tmp29_;
+					gpointer _tmp30_;
 					gchar* value = NULL;
-					KeyValueMap* _tmp31_ = NULL;
-					const gchar* _tmp32_ = NULL;
-					gchar* _tmp33_ = NULL;
-					const gchar* _tmp34_ = NULL;
-					GKeyFile* _tmp35_ = NULL;
-					const gchar* _tmp36_ = NULL;
-					const gchar* _tmp37_ = NULL;
-					const gchar* _tmp38_ = NULL;
+					KeyValueMap* _tmp31_;
+					const gchar* _tmp32_;
+					gchar* _tmp33_;
+					const gchar* _tmp34_;
+					GKeyFile* _tmp35_;
+					const gchar* _tmp36_;
+					const gchar* _tmp37_;
+					const gchar* _tmp38_;
 #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp27_ = _key_it;
 #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6279,11 +6279,11 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, KeyValueMap* map) {
 	gboolean result = FALSE;
 	gchar* trans = NULL;
-	PhotoID _tmp0_ = {0};
-	gchar* _tmp1_ = NULL;
-	PhotoID _tmp38_ = {0};
-	const gchar* _tmp39_ = NULL;
-	gboolean _tmp40_ = FALSE;
+	PhotoID _tmp0_;
+	gchar* _tmp1_;
+	PhotoID _tmp38_;
+	const gchar* _tmp39_;
+	gboolean _tmp40_;
 	GError * _inner_error_ = NULL;
 #line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
@@ -6300,19 +6300,19 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 #line 6279 "PhotoTable.c"
 	{
 		GKeyFile* keyfile = NULL;
-		GKeyFile* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
+		GKeyFile* _tmp2_;
+		const gchar* _tmp3_;
 		GeeSet* keys = NULL;
-		KeyValueMap* _tmp11_ = NULL;
-		GeeSet* _tmp12_ = NULL;
+		KeyValueMap* _tmp11_;
+		GeeSet* _tmp12_;
 		gsize length = 0UL;
-		GKeyFile* _tmp29_ = NULL;
+		GKeyFile* _tmp29_;
 		gsize _tmp30_ = 0UL;
-		gchar* _tmp31_ = NULL;
-		const gchar* _tmp32_ = NULL;
-		const gchar* _tmp33_ = NULL;
-		gint _tmp34_ = 0;
-		gint _tmp35_ = 0;
+		gchar* _tmp31_;
+		const gchar* _tmp32_;
+		const gchar* _tmp33_;
+		gint _tmp34_;
+		gint _tmp35_;
 #line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = g_key_file_new ();
 #line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6323,12 +6323,12 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 		if (_tmp3_ != NULL) {
 #line 6303 "PhotoTable.c"
 			gboolean _tmp4_ = FALSE;
-			GKeyFile* _tmp5_ = NULL;
-			const gchar* _tmp6_ = NULL;
-			const gchar* _tmp7_ = NULL;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
-			gboolean _tmp10_ = FALSE;
+			GKeyFile* _tmp5_;
+			const gchar* _tmp6_;
+			const gchar* _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
+			gboolean _tmp10_;
 #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp5_ = keyfile;
 #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6372,8 +6372,8 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 #line 6351 "PhotoTable.c"
 		{
 			GeeIterator* _key_it = NULL;
-			GeeSet* _tmp13_ = NULL;
-			GeeIterator* _tmp14_ = NULL;
+			GeeSet* _tmp13_;
+			GeeIterator* _tmp14_;
 #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = keys;
 #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6383,22 +6383,22 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			while (TRUE) {
 #line 6364 "PhotoTable.c"
-				GeeIterator* _tmp15_ = NULL;
-				gboolean _tmp16_ = FALSE;
+				GeeIterator* _tmp15_;
+				gboolean _tmp16_;
 				gchar* key = NULL;
-				GeeIterator* _tmp17_ = NULL;
-				gpointer _tmp18_ = NULL;
+				GeeIterator* _tmp17_;
+				gpointer _tmp18_;
 				gchar* value = NULL;
-				KeyValueMap* _tmp19_ = NULL;
-				const gchar* _tmp20_ = NULL;
-				gchar* _tmp21_ = NULL;
-				const gchar* _tmp22_ = NULL;
-				GKeyFile* _tmp23_ = NULL;
-				KeyValueMap* _tmp24_ = NULL;
-				gchar* _tmp25_ = NULL;
-				gchar* _tmp26_ = NULL;
-				const gchar* _tmp27_ = NULL;
-				const gchar* _tmp28_ = NULL;
+				KeyValueMap* _tmp19_;
+				const gchar* _tmp20_;
+				gchar* _tmp21_;
+				const gchar* _tmp22_;
+				GKeyFile* _tmp23_;
+				KeyValueMap* _tmp24_;
+				gchar* _tmp25_;
+				gchar* _tmp26_;
+				const gchar* _tmp27_;
+				const gchar* _tmp28_;
 #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp15_ = _key_it;
 #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6485,7 +6485,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 	__catch18_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp36_ = NULL;
+		const gchar* _tmp36_;
 #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		err = _inner_error_;
 #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6532,12 +6532,12 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, const gchar* object) {
 	gboolean result = FALSE;
 	gchar* trans = NULL;
-	PhotoID _tmp0_ = {0};
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PhotoID _tmp22_ = {0};
-	const gchar* _tmp23_ = NULL;
-	gboolean _tmp24_ = FALSE;
+	PhotoID _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PhotoID _tmp22_;
+	const gchar* _tmp23_;
+	gboolean _tmp24_;
 	GError * _inner_error_ = NULL;
 #line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
@@ -6565,24 +6565,24 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 	}
 	{
 		GKeyFile* keyfile = NULL;
-		GKeyFile* _tmp3_ = NULL;
+		GKeyFile* _tmp3_;
 		gboolean _tmp4_ = FALSE;
-		GKeyFile* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
-		gboolean _tmp10_ = FALSE;
-		GKeyFile* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-		gboolean _tmp13_ = FALSE;
-		GKeyFile* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
+		GKeyFile* _tmp5_;
+		const gchar* _tmp6_;
+		const gchar* _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
+		gboolean _tmp10_;
+		GKeyFile* _tmp11_;
+		const gchar* _tmp12_;
+		gboolean _tmp13_;
+		GKeyFile* _tmp14_;
+		const gchar* _tmp15_;
 		gsize length = 0UL;
-		GKeyFile* _tmp16_ = NULL;
+		GKeyFile* _tmp16_;
 		gsize _tmp17_ = 0UL;
-		gchar* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
+		gchar* _tmp18_;
+		const gchar* _tmp19_;
 #line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp3_ = g_key_file_new ();
 #line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6673,7 +6673,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 	__catch19_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp20_ = NULL;
+		const gchar* _tmp20_;
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		err = _inner_error_;
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6719,13 +6719,13 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 
 gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* photo_id) {
 	gboolean result = FALSE;
-	PhotoID _tmp0_ = {0};
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	PhotoID _tmp4_ = {0};
-	gint64 _tmp5_ = 0LL;
-	gboolean _tmp6_ = FALSE;
+	PhotoID _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gboolean _tmp3_;
+	PhotoID _tmp4_;
+	gint64 _tmp5_;
+	gboolean _tmp6_;
 #line 895 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
 #line 895 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6766,27 +6766,27 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 	sqlite3_stmt* result = NULL;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GFile* _tmp2_ = NULL;
+	GFile* _tmp2_;
 	gchar* sql = NULL;
-	gchar* _tmp5_ = NULL;
+	gchar* _tmp5_;
 	gboolean first = FALSE;
-	GFile* _tmp6_ = NULL;
+	GFile* _tmp6_;
 	gboolean _tmp9_ = FALSE;
-	const gchar* _tmp10_ = NULL;
+	const gchar* _tmp10_;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp33_ = NULL;
-	const gchar* _tmp34_ = NULL;
+	sqlite3* _tmp33_;
+	const gchar* _tmp34_;
 	sqlite3_stmt* _tmp35_ = NULL;
-	gint _tmp36_ = 0;
-	gint _tmp37_ = 0;
+	gint _tmp36_;
+	gint _tmp37_;
 	gint col = 0;
-	GFile* _tmp38_ = NULL;
-	const gchar* _tmp46_ = NULL;
-	const gchar* _tmp54_ = NULL;
+	GFile* _tmp38_;
+	const gchar* _tmp46_;
+	const gchar* _tmp54_;
 	gboolean _tmp62_ = FALSE;
 	gboolean _tmp63_ = FALSE;
-	const gchar* _tmp64_ = NULL;
+	const gchar* _tmp64_;
 #line 904 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
 #line 904 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6799,7 +6799,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp1_ = TRUE;
 #line 6779 "PhotoTable.c"
 	} else {
-		const gchar* _tmp3_ = NULL;
+		const gchar* _tmp3_;
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp3_ = thumbnail_md5;
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6812,7 +6812,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp0_ = TRUE;
 #line 6792 "PhotoTable.c"
 	} else {
-		const gchar* _tmp4_ = NULL;
+		const gchar* _tmp4_;
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp4_ = md5;
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6832,8 +6832,8 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp6_ != NULL) {
 #line 6813 "PhotoTable.c"
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
 #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = sql;
 #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6854,7 +6854,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp9_ = TRUE;
 #line 6834 "PhotoTable.c"
 	} else {
-		const gchar* _tmp11_ = NULL;
+		const gchar* _tmp11_;
 #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp11_ = md5;
 #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6864,21 +6864,21 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp9_) {
 #line 6845 "PhotoTable.c"
-		gboolean _tmp12_ = FALSE;
-		const gchar* _tmp17_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
-		PhotoFileFormat _tmp28_ = 0;
-		const gchar* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
+		gboolean _tmp12_;
+		const gchar* _tmp17_;
+		const gchar* _tmp20_;
+		const gchar* _tmp26_;
+		gchar* _tmp27_;
+		PhotoFileFormat _tmp28_;
+		const gchar* _tmp31_;
+		gchar* _tmp32_;
 #line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp12_ = first;
 #line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp12_) {
 #line 6858 "PhotoTable.c"
-			const gchar* _tmp13_ = NULL;
-			gchar* _tmp14_ = NULL;
+			const gchar* _tmp13_;
+			gchar* _tmp14_;
 #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = sql;
 #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6889,8 +6889,8 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 			sql = _tmp14_;
 #line 6869 "PhotoTable.c"
 		} else {
-			const gchar* _tmp15_ = NULL;
-			gchar* _tmp16_ = NULL;
+			const gchar* _tmp15_;
+			gchar* _tmp16_;
 #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp15_ = sql;
 #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6908,8 +6908,8 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp17_ != NULL) {
 #line 6889 "PhotoTable.c"
-			const gchar* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
+			const gchar* _tmp18_;
+			gchar* _tmp19_;
 #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp18_ = sql;
 #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6925,14 +6925,14 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp20_ != NULL) {
 #line 6906 "PhotoTable.c"
-			const gchar* _tmp21_ = NULL;
+			const gchar* _tmp21_;
 #line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp21_ = md5;
 #line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (_tmp21_ == NULL) {
 #line 6912 "PhotoTable.c"
-				const gchar* _tmp22_ = NULL;
-				gchar* _tmp23_ = NULL;
+				const gchar* _tmp22_;
+				gchar* _tmp23_;
 #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp22_ = sql;
 #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6943,8 +6943,8 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 				sql = _tmp23_;
 #line 6923 "PhotoTable.c"
 			} else {
-				const gchar* _tmp24_ = NULL;
-				gchar* _tmp25_ = NULL;
+				const gchar* _tmp24_;
+				gchar* _tmp25_;
 #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp24_ = sql;
 #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6969,8 +6969,8 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp28_ != PHOTO_FILE_FORMAT_UNKNOWN) {
 #line 6950 "PhotoTable.c"
-			const gchar* _tmp29_ = NULL;
-			gchar* _tmp30_ = NULL;
+			const gchar* _tmp29_;
+			gchar* _tmp30_;
 #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp29_ = sql;
 #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7014,13 +7014,13 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp38_ != NULL) {
 #line 6995 "PhotoTable.c"
-		sqlite3_stmt* _tmp39_ = NULL;
-		gint _tmp40_ = 0;
-		GFile* _tmp41_ = NULL;
-		gchar* _tmp42_ = NULL;
-		GDestroyNotify _tmp43_ = NULL;
-		gint _tmp44_ = 0;
-		gint _tmp45_ = 0;
+		sqlite3_stmt* _tmp39_;
+		gint _tmp40_;
+		GFile* _tmp41_;
+		gchar* _tmp42_;
+		GDestroyNotify _tmp43_;
+		gint _tmp44_;
+		gint _tmp45_;
 #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp39_ = stmt;
 #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7048,13 +7048,13 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp46_ != NULL) {
 #line 7029 "PhotoTable.c"
-		sqlite3_stmt* _tmp47_ = NULL;
-		gint _tmp48_ = 0;
-		const gchar* _tmp49_ = NULL;
-		gchar* _tmp50_ = NULL;
-		GDestroyNotify _tmp51_ = NULL;
-		gint _tmp52_ = 0;
-		gint _tmp53_ = 0;
+		sqlite3_stmt* _tmp47_;
+		gint _tmp48_;
+		const gchar* _tmp49_;
+		gchar* _tmp50_;
+		GDestroyNotify _tmp51_;
+		gint _tmp52_;
+		gint _tmp53_;
 #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp47_ = stmt;
 #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7082,13 +7082,13 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp54_ != NULL) {
 #line 7063 "PhotoTable.c"
-		sqlite3_stmt* _tmp55_ = NULL;
-		gint _tmp56_ = 0;
-		const gchar* _tmp57_ = NULL;
-		gchar* _tmp58_ = NULL;
-		GDestroyNotify _tmp59_ = NULL;
-		gint _tmp60_ = 0;
-		gint _tmp61_ = 0;
+		sqlite3_stmt* _tmp55_;
+		gint _tmp56_;
+		const gchar* _tmp57_;
+		gchar* _tmp58_;
+		GDestroyNotify _tmp59_;
+		gint _tmp60_;
+		gint _tmp61_;
 #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp55_ = stmt;
 #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7119,7 +7119,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp63_ = TRUE;
 #line 7099 "PhotoTable.c"
 	} else {
-		const gchar* _tmp65_ = NULL;
+		const gchar* _tmp65_;
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp65_ = md5;
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7129,7 +7129,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp63_) {
 #line 7110 "PhotoTable.c"
-		PhotoFileFormat _tmp66_ = 0;
+		PhotoFileFormat _tmp66_;
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp66_ = file_format;
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7143,12 +7143,12 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp62_) {
 #line 7124 "PhotoTable.c"
-		sqlite3_stmt* _tmp67_ = NULL;
-		gint _tmp68_ = 0;
-		PhotoFileFormat _tmp69_ = 0;
-		gint _tmp70_ = 0;
-		gint _tmp71_ = 0;
-		gint _tmp72_ = 0;
+		sqlite3_stmt* _tmp67_;
+		gint _tmp68_;
+		PhotoFileFormat _tmp69_;
+		gint _tmp70_;
+		gint _tmp71_;
+		gint _tmp72_;
 #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp67_ = stmt;
 #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7182,15 +7182,15 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format) {
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
-	GFile* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PhotoFileFormat _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
+	GFile* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PhotoFileFormat _tmp3_;
+	sqlite3_stmt* _tmp4_;
 	gint res = 0;
-	sqlite3_stmt* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	sqlite3_stmt* _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
 #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7225,7 +7225,7 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar*
 		return result;
 #line 7205 "PhotoTable.c"
 	} else {
-		gint _tmp8_ = 0;
+		gint _tmp8_;
 #line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp8_ = res;
 #line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7238,7 +7238,7 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar*
 			return result;
 #line 7218 "PhotoTable.c"
 		} else {
-			gint _tmp9_ = 0;
+			gint _tmp9_;
 #line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp9_ = res;
 #line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7258,7 +7258,7 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar*
 }
 
 
-static void _vala_array_add2 (PhotoID** array, int* length, int* size, const PhotoID* value) {
+static void _vala_array_add2 (PhotoID* * array, int* length, int* size, const PhotoID* value) {
 #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if ((*length) == (*size)) {
 #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7276,20 +7276,20 @@ static void _vala_array_add2 (PhotoID** array, int* length, int* size, const Pho
 PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format, int* result_length1) {
 	PhotoID* result = NULL;
 	sqlite3_stmt* stmt = NULL;
-	GFile* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PhotoFileFormat _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
+	GFile* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PhotoFileFormat _tmp3_;
+	sqlite3_stmt* _tmp4_;
 	PhotoID* ids = NULL;
-	PhotoID* _tmp5_ = NULL;
-	gint ids_length1 = 0;
-	gint _ids_size_ = 0;
+	PhotoID* _tmp5_;
+	gint ids_length1;
+	gint _ids_size_;
 	gint res = 0;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	PhotoID* _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	PhotoID* _tmp15_;
+	gint _tmp15__length1;
 #line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
 #line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7323,14 +7323,14 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	while (TRUE) {
 #line 7304 "PhotoTable.c"
-		gint _tmp8_ = 0;
-		PhotoID* _tmp9_ = NULL;
-		gint _tmp9__length1 = 0;
-		sqlite3_stmt* _tmp10_ = NULL;
-		gint64 _tmp11_ = 0LL;
+		gint _tmp8_;
+		PhotoID* _tmp9_;
+		gint _tmp9__length1;
+		sqlite3_stmt* _tmp10_;
+		gint64 _tmp11_;
 		PhotoID _tmp12_ = {0};
-		sqlite3_stmt* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
+		sqlite3_stmt* _tmp13_;
+		gint _tmp14_;
 #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp8_ = res;
 #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7381,9 +7381,9 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 
 void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gchar* backlinks, GError** error) {
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PhotoID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
+	const gchar* _tmp1_;
+	PhotoID _tmp3_;
+	gint64 _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -7394,7 +7394,7 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ != NULL) {
 #line 7375 "PhotoTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = backlinks;
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7434,13 +7434,13 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc
 
 
 void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error) {
-	PhotoRow* _tmp0_ = NULL;
-	PhotoID _tmp1_ = {0};
-	gint64 _tmp2_ = 0LL;
-	BackingPhotoID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
-	PhotoRow* _tmp5_ = NULL;
-	BackingPhotoID _tmp6_ = {0};
+	PhotoRow* _tmp0_;
+	PhotoID _tmp1_;
+	gint64 _tmp2_;
+	BackingPhotoID _tmp3_;
+	gint64 _tmp4_;
+	PhotoRow* _tmp5_;
+	BackingPhotoID _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -7490,10 +7490,10 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI
 
 
 void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** error) {
-	PhotoRow* _tmp0_ = NULL;
-	PhotoID _tmp1_ = {0};
-	gint64 _tmp2_ = 0LL;
-	PhotoRow* _tmp3_ = NULL;
+	PhotoRow* _tmp0_;
+	PhotoID _tmp1_;
+	gint64 _tmp2_;
+	PhotoRow* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -7536,9 +7536,9 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro
 
 void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboolean dirty, GError** error) {
 	gint _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
-	PhotoID _tmp2_ = {0};
-	gint64 _tmp3_ = 0LL;
+	gboolean _tmp1_;
+	PhotoID _tmp2_;
+	gint64 _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -7586,21 +7586,21 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole
 
 void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, BackingPhotoID* backing_photo_id, GError** error) {
 	gchar* col = NULL;
-	RawDeveloper _tmp0_ = 0;
-	PhotoRow* _tmp4_ = NULL;
-	BackingPhotoID* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	RawDeveloper _tmp6_ = 0;
-	BackingPhotoID _tmp7_ = {0};
-	BackingPhotoID _tmp8_ = {0};
-	PhotoRow* _tmp9_ = NULL;
-	PhotoID _tmp10_ = {0};
-	gint64 _tmp11_ = 0LL;
-	const gchar* _tmp12_ = NULL;
-	BackingPhotoID _tmp13_ = {0};
-	gint64 _tmp14_ = 0LL;
-	BackingPhotoID _tmp15_ = {0};
-	gint64 _tmp16_ = 0LL;
+	RawDeveloper _tmp0_;
+	PhotoRow* _tmp4_;
+	BackingPhotoID* _tmp5_;
+	gint _tmp5__length1;
+	RawDeveloper _tmp6_;
+	BackingPhotoID _tmp7_;
+	BackingPhotoID _tmp8_;
+	PhotoRow* _tmp9_;
+	PhotoID _tmp10_;
+	gint64 _tmp11_;
+	const gchar* _tmp12_;
+	BackingPhotoID _tmp13_;
+	gint64 _tmp14_;
+	BackingPhotoID _tmp15_;
+	gint64 _tmp16_;
 	GError * _inner_error_ = NULL;
 #line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -7616,7 +7616,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 		case RAW_DEVELOPER_SHOTWELL:
 #line 7596 "PhotoTable.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp1_ = g_strdup ("develop_shotwell_id");
 #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7631,7 +7631,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 		case RAW_DEVELOPER_CAMERA:
 #line 7611 "PhotoTable.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp2_ = g_strdup ("develop_camera_id");
 #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7646,7 +7646,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 		case RAW_DEVELOPER_EMBEDDED:
 #line 7626 "PhotoTable.c"
 		{
-			gchar* _tmp3_ = NULL;
+			gchar* _tmp3_;
 #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp3_ = g_strdup ("develop_embedded_id");
 #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7722,12 +7722,12 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp16_ != BACKING_PHOTO_ID_INVALID) {
 #line 7703 "PhotoTable.c"
-		PhotoRow* _tmp17_ = NULL;
-		PhotoID _tmp18_ = {0};
-		gint64 _tmp19_ = 0LL;
-		RawDeveloper _tmp20_ = 0;
-		gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
+		PhotoRow* _tmp17_;
+		PhotoID _tmp18_;
+		gint64 _tmp19_;
+		RawDeveloper _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
 #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp17_ = row;
 #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7775,8 +7775,8 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 
 
 void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, GError** error) {
-	PhotoRow* _tmp0_ = NULL;
-	RawDeveloper _tmp1_ = 0;
+	PhotoRow* _tmp0_;
+	RawDeveloper _tmp1_;
 	BackingPhotoID _tmp2_ = {0};
 	GError * _inner_error_ = NULL;
 #line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7826,7 +7826,7 @@ static void photo_table_instance_init (PhotoTable * self) {
 }
 
 
-static void photo_table_finalize (DatabaseTable* obj) {
+static void photo_table_finalize (DatabaseTable * obj) {
 	PhotoTable * self;
 #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_TABLE, PhotoTable);
@@ -7849,7 +7849,7 @@ GType photo_table_get_type (void) {
 
 
 void backing_photo_id_init (BackingPhotoID *self, gint64 id) {
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 1072 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	memset (self, 0, sizeof (BackingPhotoID));
 #line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7862,7 +7862,7 @@ void backing_photo_id_init (BackingPhotoID *self, gint64 id) {
 
 gboolean backing_photo_id_is_invalid (BackingPhotoID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = (*self).id;
 #line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7875,7 +7875,7 @@ gboolean backing_photo_id_is_invalid (BackingPhotoID *self) {
 
 gboolean backing_photo_id_is_valid (BackingPhotoID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = (*self).id;
 #line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7918,13 +7918,13 @@ GType backing_photo_id_get_type (void) {
 
 gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* info) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
-	GFileInfo* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	time_t _tmp3_ = 0;
-	GFileInfo* _tmp4_ = NULL;
+	gint64 _tmp0_;
+	GFileInfo* _tmp1_;
+	gint64 _tmp2_;
+	time_t _tmp3_;
+	GFileInfo* _tmp4_;
 	GTimeVal _tmp5_ = {0};
-	glong _tmp6_ = 0L;
+	glong _tmp6_;
 #line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_BACKING_PHOTO_ROW (self), FALSE);
 #line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7961,13 +7961,13 @@ gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo*
 
 gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
-	GFileInfo* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	time_t _tmp3_ = 0;
-	GFileInfo* _tmp4_ = NULL;
+	gint64 _tmp0_;
+	GFileInfo* _tmp1_;
+	gint64 _tmp2_;
+	time_t _tmp3_;
+	GFileInfo* _tmp4_;
 	GTimeVal _tmp5_ = {0};
-	glong _tmp6_ = 0L;
+	glong _tmp6_;
 #line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_BACKING_PHOTO_ROW (self), FALSE);
 #line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -8003,23 +8003,23 @@ gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) {
 
 
 void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from) {
-	BackingPhotoRow* _tmp0_ = NULL;
-	BackingPhotoID _tmp1_ = {0};
-	BackingPhotoRow* _tmp2_ = NULL;
-	time_t _tmp3_ = 0;
-	BackingPhotoRow* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	BackingPhotoRow* _tmp7_ = NULL;
-	gint64 _tmp8_ = 0LL;
-	BackingPhotoRow* _tmp9_ = NULL;
-	time_t _tmp10_ = 0;
-	BackingPhotoRow* _tmp11_ = NULL;
-	PhotoFileFormat _tmp12_ = 0;
-	BackingPhotoRow* _tmp13_ = NULL;
-	Dimensions _tmp14_ = {0};
-	BackingPhotoRow* _tmp15_ = NULL;
-	Orientation _tmp16_ = 0;
+	BackingPhotoRow* _tmp0_;
+	BackingPhotoID _tmp1_;
+	BackingPhotoRow* _tmp2_;
+	time_t _tmp3_;
+	BackingPhotoRow* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	BackingPhotoRow* _tmp7_;
+	gint64 _tmp8_;
+	BackingPhotoRow* _tmp9_;
+	time_t _tmp10_;
+	BackingPhotoRow* _tmp11_;
+	PhotoFileFormat _tmp12_;
+	BackingPhotoRow* _tmp13_;
+	Dimensions _tmp14_;
+	BackingPhotoRow* _tmp15_;
+	Orientation _tmp16_;
 #line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_ROW (self));
 #line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -8139,7 +8139,7 @@ static gchar* value_backing_photo_row_collect_value (GValue* value, guint n_coll
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (collect_values[0].v_pointer) {
 #line 8120 "PhotoTable.c"
-		BackingPhotoRow* object;
+		BackingPhotoRow * object;
 		object = collect_values[0].v_pointer;
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -8166,7 +8166,7 @@ static gchar* value_backing_photo_row_collect_value (GValue* value, guint n_coll
 
 
 static gchar* value_backing_photo_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	BackingPhotoRow** object_p;
+	BackingPhotoRow ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (!object_p) {
@@ -8218,7 +8218,7 @@ gpointer value_get_backing_photo_row (const GValue* value) {
 
 
 void value_set_backing_photo_row (GValue* value, gpointer v_object) {
-	BackingPhotoRow* old;
+	BackingPhotoRow * old;
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW));
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -8249,7 +8249,7 @@ void value_set_backing_photo_row (GValue* value, gpointer v_object) {
 
 
 void value_take_backing_photo_row (GValue* value, gpointer v_object) {
-	BackingPhotoRow* old;
+	BackingPhotoRow * old;
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW));
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -8295,7 +8295,7 @@ static void backing_photo_row_instance_init (BackingPhotoRow * self) {
 }
 
 
-static void backing_photo_row_finalize (BackingPhotoRow* obj) {
+static void backing_photo_row_finalize (BackingPhotoRow * obj) {
 	BackingPhotoRow * self;
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_ROW, BackingPhotoRow);
@@ -8322,7 +8322,7 @@ GType backing_photo_row_get_type (void) {
 
 
 gpointer backing_photo_row_ref (gpointer instance) {
-	BackingPhotoRow* self;
+	BackingPhotoRow * self;
 	self = instance;
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -8333,7 +8333,7 @@ gpointer backing_photo_row_ref (gpointer instance) {
 
 
 void backing_photo_row_unref (gpointer instance) {
-	BackingPhotoRow* self;
+	BackingPhotoRow * self;
 	self = instance;
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -8350,13 +8350,13 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) {
 	BackingPhotoTable* self = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self = (BackingPhotoTable*) database_table_construct (object_type);
 #line 1126 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -8386,7 +8386,7 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) {
 #line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
 #line 8367 "PhotoTable.c"
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = res;
 #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -8410,15 +8410,15 @@ static BackingPhotoTable* backing_photo_table_new (void) {
 
 BackingPhotoTable* backing_photo_table_get_instance (void) {
 	BackingPhotoTable* result = NULL;
-	BackingPhotoTable* _tmp0_ = NULL;
-	BackingPhotoTable* _tmp2_ = NULL;
-	BackingPhotoTable* _tmp3_ = NULL;
+	BackingPhotoTable* _tmp0_;
+	BackingPhotoTable* _tmp2_;
+	BackingPhotoTable* _tmp3_;
 #line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = backing_photo_table_instance;
 #line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_ == NULL) {
 #line 8399 "PhotoTable.c"
-		BackingPhotoTable* _tmp1_ = NULL;
+		BackingPhotoTable* _tmp1_;
 #line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp1_ = backing_photo_table_new ();
 #line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -8442,64 +8442,64 @@ BackingPhotoTable* backing_photo_table_get_instance (void) {
 void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, GError** error) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	time_t time_created = 0;
-	gulong _tmp4_ = 0UL;
-	sqlite3_stmt* _tmp5_ = NULL;
-	BackingPhotoRow* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	GDestroyNotify _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	BackingPhotoRow* _tmp13_ = NULL;
-	time_t _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	sqlite3_stmt* _tmp17_ = NULL;
-	BackingPhotoRow* _tmp18_ = NULL;
-	gint64 _tmp19_ = 0LL;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	sqlite3_stmt* _tmp22_ = NULL;
-	BackingPhotoRow* _tmp23_ = NULL;
-	Dimensions _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	gint _tmp27_ = 0;
-	sqlite3_stmt* _tmp28_ = NULL;
-	BackingPhotoRow* _tmp29_ = NULL;
-	Dimensions _tmp30_ = {0};
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
-	gint _tmp33_ = 0;
-	sqlite3_stmt* _tmp34_ = NULL;
-	BackingPhotoRow* _tmp35_ = NULL;
-	Orientation _tmp36_ = 0;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	sqlite3_stmt* _tmp39_ = NULL;
-	BackingPhotoRow* _tmp40_ = NULL;
-	PhotoFileFormat _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	gint _tmp43_ = 0;
-	gint _tmp44_ = 0;
-	sqlite3_stmt* _tmp45_ = NULL;
-	time_t _tmp46_ = 0;
-	gint _tmp47_ = 0;
-	gint _tmp48_ = 0;
-	sqlite3_stmt* _tmp49_ = NULL;
-	gint _tmp50_ = 0;
-	gint _tmp51_ = 0;
-	BackingPhotoRow* _tmp53_ = NULL;
-	sqlite3* _tmp54_ = NULL;
-	gint64 _tmp55_ = 0LL;
-	BackingPhotoRow* _tmp56_ = NULL;
-	time_t _tmp57_ = 0;
+	gulong _tmp4_;
+	sqlite3_stmt* _tmp5_;
+	BackingPhotoRow* _tmp6_;
+	const gchar* _tmp7_;
+	gchar* _tmp8_;
+	GDestroyNotify _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	BackingPhotoRow* _tmp13_;
+	time_t _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	sqlite3_stmt* _tmp17_;
+	BackingPhotoRow* _tmp18_;
+	gint64 _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
+	sqlite3_stmt* _tmp22_;
+	BackingPhotoRow* _tmp23_;
+	Dimensions _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
+	gint _tmp27_;
+	sqlite3_stmt* _tmp28_;
+	BackingPhotoRow* _tmp29_;
+	Dimensions _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
+	gint _tmp33_;
+	sqlite3_stmt* _tmp34_;
+	BackingPhotoRow* _tmp35_;
+	Orientation _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
+	sqlite3_stmt* _tmp39_;
+	BackingPhotoRow* _tmp40_;
+	PhotoFileFormat _tmp41_;
+	gint _tmp42_;
+	gint _tmp43_;
+	gint _tmp44_;
+	sqlite3_stmt* _tmp45_;
+	time_t _tmp46_;
+	gint _tmp47_;
+	gint _tmp48_;
+	sqlite3_stmt* _tmp49_;
+	gint _tmp50_;
+	gint _tmp51_;
+	BackingPhotoRow* _tmp53_;
+	sqlite3* _tmp54_;
+	gint64 _tmp55_;
+	BackingPhotoRow* _tmp56_;
+	time_t _tmp57_;
 	GError * _inner_error_ = NULL;
 #line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
@@ -8654,7 +8654,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G
 #line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp51_ != SQLITE_DONE) {
 #line 8635 "PhotoTable.c"
-		gint _tmp52_ = 0;
+		gint _tmp52_;
 #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp52_ = res;
 #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -8707,47 +8707,47 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot
 	BackingPhotoRow* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	BackingPhotoID _tmp5_ = {0};
-	gint64 _tmp6_ = 0LL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	BackingPhotoID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 	BackingPhotoRow* row = NULL;
-	BackingPhotoRow* _tmp14_ = NULL;
-	BackingPhotoRow* _tmp15_ = NULL;
-	BackingPhotoID _tmp16_ = {0};
-	BackingPhotoRow* _tmp17_ = NULL;
-	sqlite3_stmt* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	BackingPhotoRow* _tmp21_ = NULL;
-	sqlite3_stmt* _tmp22_ = NULL;
-	gint64 _tmp23_ = 0LL;
-	BackingPhotoRow* _tmp24_ = NULL;
-	sqlite3_stmt* _tmp25_ = NULL;
-	gint64 _tmp26_ = 0LL;
-	BackingPhotoRow* _tmp27_ = NULL;
-	sqlite3_stmt* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	sqlite3_stmt* _tmp30_ = NULL;
-	gint _tmp31_ = 0;
-	BackingPhotoRow* _tmp32_ = NULL;
-	sqlite3_stmt* _tmp33_ = NULL;
-	gint _tmp34_ = 0;
-	BackingPhotoRow* _tmp35_ = NULL;
-	sqlite3_stmt* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	PhotoFileFormat _tmp38_ = 0;
-	BackingPhotoRow* _tmp39_ = NULL;
-	sqlite3_stmt* _tmp40_ = NULL;
-	gint64 _tmp41_ = 0LL;
+	BackingPhotoRow* _tmp14_;
+	BackingPhotoRow* _tmp15_;
+	BackingPhotoID _tmp16_;
+	BackingPhotoRow* _tmp17_;
+	sqlite3_stmt* _tmp18_;
+	const gchar* _tmp19_;
+	gchar* _tmp20_;
+	BackingPhotoRow* _tmp21_;
+	sqlite3_stmt* _tmp22_;
+	gint64 _tmp23_;
+	BackingPhotoRow* _tmp24_;
+	sqlite3_stmt* _tmp25_;
+	gint64 _tmp26_;
+	BackingPhotoRow* _tmp27_;
+	sqlite3_stmt* _tmp28_;
+	gint _tmp29_;
+	sqlite3_stmt* _tmp30_;
+	gint _tmp31_;
+	BackingPhotoRow* _tmp32_;
+	sqlite3_stmt* _tmp33_;
+	gint _tmp34_;
+	BackingPhotoRow* _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	gint _tmp37_;
+	PhotoFileFormat _tmp38_;
+	BackingPhotoRow* _tmp39_;
+	sqlite3_stmt* _tmp40_;
+	gint64 _tmp41_;
 	GError * _inner_error_ = NULL;
 #line 1192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_BACKING_PHOTO_TABLE (self), NULL);
@@ -8800,13 +8800,13 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot
 		return result;
 #line 8779 "PhotoTable.c"
 	} else {
-		gint _tmp12_ = 0;
+		gint _tmp12_;
 #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp12_ = res;
 #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp12_ != SQLITE_ROW) {
 #line 8786 "PhotoTable.c"
-			gint _tmp13_ = 0;
+			gint _tmp13_;
 #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = res;
 #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -8925,52 +8925,52 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot
 void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, GError** error) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	BackingPhotoRow* _tmp5_ = NULL;
-	time_t _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp9_ = NULL;
-	BackingPhotoRow* _tmp10_ = NULL;
-	gint64 _tmp11_ = 0LL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	sqlite3_stmt* _tmp14_ = NULL;
-	BackingPhotoRow* _tmp15_ = NULL;
-	Dimensions _tmp16_ = {0};
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	sqlite3_stmt* _tmp20_ = NULL;
-	BackingPhotoRow* _tmp21_ = NULL;
-	Dimensions _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	sqlite3_stmt* _tmp26_ = NULL;
-	BackingPhotoRow* _tmp27_ = NULL;
-	Orientation _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	gint _tmp30_ = 0;
-	sqlite3_stmt* _tmp31_ = NULL;
-	BackingPhotoRow* _tmp32_ = NULL;
-	PhotoFileFormat _tmp33_ = 0;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
-	gint _tmp36_ = 0;
-	sqlite3_stmt* _tmp37_ = NULL;
-	BackingPhotoRow* _tmp38_ = NULL;
-	BackingPhotoID _tmp39_ = {0};
-	gint64 _tmp40_ = 0LL;
-	gint _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	sqlite3_stmt* _tmp43_ = NULL;
-	gint _tmp44_ = 0;
-	gint _tmp45_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	BackingPhotoRow* _tmp5_;
+	time_t _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	BackingPhotoRow* _tmp10_;
+	gint64 _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	sqlite3_stmt* _tmp14_;
+	BackingPhotoRow* _tmp15_;
+	Dimensions _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	sqlite3_stmt* _tmp20_;
+	BackingPhotoRow* _tmp21_;
+	Dimensions _tmp22_;
+	gint _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	sqlite3_stmt* _tmp26_;
+	BackingPhotoRow* _tmp27_;
+	Orientation _tmp28_;
+	gint _tmp29_;
+	gint _tmp30_;
+	sqlite3_stmt* _tmp31_;
+	BackingPhotoRow* _tmp32_;
+	PhotoFileFormat _tmp33_;
+	gint _tmp34_;
+	gint _tmp35_;
+	gint _tmp36_;
+	sqlite3_stmt* _tmp37_;
+	BackingPhotoRow* _tmp38_;
+	BackingPhotoID _tmp39_;
+	gint64 _tmp40_;
+	gint _tmp41_;
+	gint _tmp42_;
+	sqlite3_stmt* _tmp43_;
+	gint _tmp44_;
+	gint _tmp45_;
 	GError * _inner_error_ = NULL;
 #line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
@@ -9107,7 +9107,7 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row,
 #line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp45_ != SQLITE_DONE) {
 #line 9087 "PhotoTable.c"
-		gint _tmp46_ = 0;
+		gint _tmp46_;
 #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp46_ = res;
 #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -9145,26 +9145,26 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row,
 void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, gint64 filesize, GError** error) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	time_t _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	sqlite3_stmt* _tmp8_ = NULL;
-	gint64 _tmp9_ = 0LL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	BackingPhotoID _tmp13_ = {0};
-	gint64 _tmp14_ = 0LL;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	sqlite3_stmt* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	time_t _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	sqlite3_stmt* _tmp8_;
+	gint64 _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	BackingPhotoID _tmp13_;
+	gint64 _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	sqlite3_stmt* _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 	GError * _inner_error_ = NULL;
 #line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
@@ -9233,7 +9233,7 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot
 #line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp19_ != SQLITE_DONE) {
 #line 9213 "PhotoTable.c"
-		gint _tmp20_ = 0;
+		gint _tmp20_;
 #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp20_ = res;
 #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -9269,8 +9269,8 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot
 
 
 void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backing_id, GError** error) {
-	BackingPhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	BackingPhotoID _tmp0_;
+	gint64 _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
@@ -9305,9 +9305,9 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin
 
 
 void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error) {
-	BackingPhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	const gchar* _tmp2_ = NULL;
+	BackingPhotoID _tmp0_;
+	gint64 _tmp1_;
+	const gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
@@ -9346,9 +9346,9 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID*
 
 
 void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, GError** error) {
-	BackingPhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	time_t _tmp2_ = 0;
+	BackingPhotoID _tmp0_;
+	gint64 _tmp1_;
+	time_t _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
@@ -9397,7 +9397,7 @@ static void backing_photo_table_instance_init (BackingPhotoTable * self) {
 }
 
 
-static void backing_photo_table_finalize (DatabaseTable* obj) {
+static void backing_photo_table_finalize (DatabaseTable * obj) {
 	BackingPhotoTable * self;
 #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_TABLE, BackingPhotoTable);
diff --git a/src/db/SavedSearchDBTable.c b/src/db/SavedSearchDBTable.c
index 14f8c4c..bedc8f4 100644
--- a/src/db/SavedSearchDBTable.c
+++ b/src/db/SavedSearchDBTable.c
@@ -1,4 +1,4 @@
-/* SavedSearchDBTable.c generated by valac 0.34.7, the Vala compiler
+/* SavedSearchDBTable.c generated by valac 0.36.6, the Vala compiler
  * generated from SavedSearchDBTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -324,7 +324,7 @@ enum  {
 };
 SavedSearchRow* saved_search_row_new (void);
 SavedSearchRow* saved_search_row_construct (GType object_type);
-static void saved_search_row_finalize (SavedSearchRow* obj);
+static void saved_search_row_finalize (SavedSearchRow * obj);
 gpointer database_table_ref (gpointer instance);
 void database_table_unref (gpointer instance);
 GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -419,11 +419,11 @@ SearchOperator search_operator_from_string (const gchar* str);
 GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** error);
 void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* search_id, const gchar* new_name, GError** error);
 void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error);
-static void saved_search_db_table_finalize (DatabaseTable* obj);
+static void saved_search_db_table_finalize (DatabaseTable * obj);
 
 
 void saved_search_id_init (SavedSearchID *self, gint64 id) {
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	memset (self, 0, sizeof (SavedSearchID));
 #line 13 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -436,7 +436,7 @@ void saved_search_id_init (SavedSearchID *self, gint64 id) {
 
 gboolean saved_search_id_is_invalid (SavedSearchID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 17 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	_tmp0_ = (*self).id;
 #line 17 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -449,7 +449,7 @@ gboolean saved_search_id_is_invalid (SavedSearchID *self) {
 
 gboolean saved_search_id_is_valid (SavedSearchID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	_tmp0_ = (*self).id;
 #line 21 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -549,7 +549,7 @@ static gchar* value_saved_search_row_collect_value (GValue* value, guint n_colle
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (collect_values[0].v_pointer) {
 #line 552 "SavedSearchDBTable.c"
-		SavedSearchRow* object;
+		SavedSearchRow * object;
 		object = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -576,7 +576,7 @@ static gchar* value_saved_search_row_collect_value (GValue* value, guint n_colle
 
 
 static gchar* value_saved_search_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SavedSearchRow** object_p;
+	SavedSearchRow ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (!object_p) {
@@ -628,7 +628,7 @@ gpointer value_get_saved_search_row (const GValue* value) {
 
 
 void value_set_saved_search_row (GValue* value, gpointer v_object) {
-	SavedSearchRow* old;
+	SavedSearchRow * old;
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW));
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -659,7 +659,7 @@ void value_set_saved_search_row (GValue* value, gpointer v_object) {
 
 
 void value_take_saved_search_row (GValue* value, gpointer v_object) {
-	SavedSearchRow* old;
+	SavedSearchRow * old;
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW));
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -703,7 +703,7 @@ static void saved_search_row_instance_init (SavedSearchRow * self) {
 }
 
 
-static void saved_search_row_finalize (SavedSearchRow* obj) {
+static void saved_search_row_finalize (SavedSearchRow * obj) {
 	SavedSearchRow * self;
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_ROW, SavedSearchRow);
@@ -732,7 +732,7 @@ GType saved_search_row_get_type (void) {
 
 
 gpointer saved_search_row_ref (gpointer instance) {
-	SavedSearchRow* self;
+	SavedSearchRow * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -743,7 +743,7 @@ gpointer saved_search_row_ref (gpointer instance) {
 
 
 void saved_search_row_unref (gpointer instance) {
-	SavedSearchRow* self;
+	SavedSearchRow * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -760,97 +760,97 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 	SavedSearchDBTable* self = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	sqlite3* _tmp8_ = NULL;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	sqlite3* _tmp8_;
 	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	sqlite3* _tmp16_ = NULL;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	sqlite3* _tmp16_;
 	sqlite3_stmt* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	sqlite3_stmt* _tmp20_ = NULL;
-	gint _tmp21_ = 0;
-	gint _tmp22_ = 0;
-	sqlite3* _tmp24_ = NULL;
+	gint _tmp18_;
+	gint _tmp19_;
+	sqlite3_stmt* _tmp20_;
+	gint _tmp21_;
+	gint _tmp22_;
+	sqlite3* _tmp24_;
 	sqlite3_stmt* _tmp25_ = NULL;
-	gint _tmp26_ = 0;
-	gint _tmp27_ = 0;
-	sqlite3_stmt* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	gint _tmp30_ = 0;
-	sqlite3* _tmp32_ = NULL;
+	gint _tmp26_;
+	gint _tmp27_;
+	sqlite3_stmt* _tmp28_;
+	gint _tmp29_;
+	gint _tmp30_;
+	sqlite3* _tmp32_;
 	sqlite3_stmt* _tmp33_ = NULL;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
-	sqlite3_stmt* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	sqlite3* _tmp40_ = NULL;
+	gint _tmp34_;
+	gint _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
+	sqlite3* _tmp40_;
 	sqlite3_stmt* _tmp41_ = NULL;
-	gint _tmp42_ = 0;
-	gint _tmp43_ = 0;
-	sqlite3_stmt* _tmp44_ = NULL;
-	gint _tmp45_ = 0;
-	gint _tmp46_ = 0;
-	sqlite3* _tmp48_ = NULL;
+	gint _tmp42_;
+	gint _tmp43_;
+	sqlite3_stmt* _tmp44_;
+	gint _tmp45_;
+	gint _tmp46_;
+	sqlite3* _tmp48_;
 	sqlite3_stmt* _tmp49_ = NULL;
-	gint _tmp50_ = 0;
-	gint _tmp51_ = 0;
-	sqlite3_stmt* _tmp52_ = NULL;
-	gint _tmp53_ = 0;
-	gint _tmp54_ = 0;
-	sqlite3* _tmp56_ = NULL;
+	gint _tmp50_;
+	gint _tmp51_;
+	sqlite3_stmt* _tmp52_;
+	gint _tmp53_;
+	gint _tmp54_;
+	sqlite3* _tmp56_;
 	sqlite3_stmt* _tmp57_ = NULL;
-	gint _tmp58_ = 0;
-	gint _tmp59_ = 0;
-	sqlite3_stmt* _tmp60_ = NULL;
-	gint _tmp61_ = 0;
-	gint _tmp62_ = 0;
-	sqlite3* _tmp64_ = NULL;
+	gint _tmp58_;
+	gint _tmp59_;
+	sqlite3_stmt* _tmp60_;
+	gint _tmp61_;
+	gint _tmp62_;
+	sqlite3* _tmp64_;
 	sqlite3_stmt* _tmp65_ = NULL;
-	gint _tmp66_ = 0;
-	gint _tmp67_ = 0;
-	sqlite3_stmt* _tmp68_ = NULL;
-	gint _tmp69_ = 0;
-	gint _tmp70_ = 0;
-	sqlite3* _tmp72_ = NULL;
+	gint _tmp66_;
+	gint _tmp67_;
+	sqlite3_stmt* _tmp68_;
+	gint _tmp69_;
+	gint _tmp70_;
+	sqlite3* _tmp72_;
 	sqlite3_stmt* _tmp73_ = NULL;
-	gint _tmp74_ = 0;
-	gint _tmp75_ = 0;
-	sqlite3_stmt* _tmp76_ = NULL;
-	gint _tmp77_ = 0;
-	gint _tmp78_ = 0;
-	sqlite3* _tmp80_ = NULL;
+	gint _tmp74_;
+	gint _tmp75_;
+	sqlite3_stmt* _tmp76_;
+	gint _tmp77_;
+	gint _tmp78_;
+	sqlite3* _tmp80_;
 	sqlite3_stmt* _tmp81_ = NULL;
-	gint _tmp82_ = 0;
-	gint _tmp83_ = 0;
-	sqlite3_stmt* _tmp84_ = NULL;
-	gint _tmp85_ = 0;
-	gint _tmp86_ = 0;
-	sqlite3* _tmp88_ = NULL;
+	gint _tmp82_;
+	gint _tmp83_;
+	sqlite3_stmt* _tmp84_;
+	gint _tmp85_;
+	gint _tmp86_;
+	sqlite3* _tmp88_;
 	sqlite3_stmt* _tmp89_ = NULL;
-	gint _tmp90_ = 0;
-	gint _tmp91_ = 0;
-	sqlite3_stmt* _tmp92_ = NULL;
-	gint _tmp93_ = 0;
-	gint _tmp94_ = 0;
-	sqlite3* _tmp96_ = NULL;
+	gint _tmp90_;
+	gint _tmp91_;
+	sqlite3_stmt* _tmp92_;
+	gint _tmp93_;
+	gint _tmp94_;
+	sqlite3* _tmp96_;
 	sqlite3_stmt* _tmp97_ = NULL;
-	gint _tmp98_ = 0;
-	gint _tmp99_ = 0;
-	sqlite3_stmt* _tmp100_ = NULL;
-	gint _tmp101_ = 0;
-	gint _tmp102_ = 0;
+	gint _tmp98_;
+	gint _tmp99_;
+	sqlite3_stmt* _tmp100_;
+	gint _tmp101_;
+	gint _tmp102_;
 #line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	self = (SavedSearchDBTable*) database_table_construct (object_type);
 #line 37 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -880,7 +880,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 51 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
 #line 883 "SavedSearchDBTable.c"
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 52 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp7_ = res;
 #line 52 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -912,7 +912,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 67 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp14_ != SQLITE_DONE) {
 #line 915 "SavedSearchDBTable.c"
-		gint _tmp15_ = 0;
+		gint _tmp15_;
 #line 68 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp15_ = res;
 #line 68 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -944,7 +944,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 83 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp22_ != SQLITE_DONE) {
 #line 947 "SavedSearchDBTable.c"
-		gint _tmp23_ = 0;
+		gint _tmp23_;
 #line 84 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp23_ = res;
 #line 84 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -976,7 +976,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 98 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp30_ != SQLITE_DONE) {
 #line 979 "SavedSearchDBTable.c"
-		gint _tmp31_ = 0;
+		gint _tmp31_;
 #line 99 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp31_ = res;
 #line 99 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1008,7 +1008,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 114 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp38_ != SQLITE_DONE) {
 #line 1011 "SavedSearchDBTable.c"
-		gint _tmp39_ = 0;
+		gint _tmp39_;
 #line 115 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp39_ = res;
 #line 115 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1040,7 +1040,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 130 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp46_ != SQLITE_DONE) {
 #line 1043 "SavedSearchDBTable.c"
-		gint _tmp47_ = 0;
+		gint _tmp47_;
 #line 131 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp47_ = res;
 #line 131 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1072,7 +1072,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 147 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp54_ != SQLITE_DONE) {
 #line 1075 "SavedSearchDBTable.c"
-		gint _tmp55_ = 0;
+		gint _tmp55_;
 #line 148 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp55_ = res;
 #line 148 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1104,7 +1104,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 156 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp62_ != SQLITE_DONE) {
 #line 1107 "SavedSearchDBTable.c"
-		gint _tmp63_ = 0;
+		gint _tmp63_;
 #line 157 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp63_ = res;
 #line 157 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1136,7 +1136,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 164 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp70_ != SQLITE_DONE) {
 #line 1139 "SavedSearchDBTable.c"
-		gint _tmp71_ = 0;
+		gint _tmp71_;
 #line 165 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp71_ = res;
 #line 165 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1168,7 +1168,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 172 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp78_ != SQLITE_DONE) {
 #line 1171 "SavedSearchDBTable.c"
-		gint _tmp79_ = 0;
+		gint _tmp79_;
 #line 173 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp79_ = res;
 #line 173 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1200,7 +1200,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 180 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp86_ != SQLITE_DONE) {
 #line 1203 "SavedSearchDBTable.c"
-		gint _tmp87_ = 0;
+		gint _tmp87_;
 #line 181 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp87_ = res;
 #line 181 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1232,7 +1232,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 188 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp94_ != SQLITE_DONE) {
 #line 1235 "SavedSearchDBTable.c"
-		gint _tmp95_ = 0;
+		gint _tmp95_;
 #line 189 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp95_ = res;
 #line 189 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1264,7 +1264,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 196 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp102_ != SQLITE_DONE) {
 #line 1267 "SavedSearchDBTable.c"
-		gint _tmp103_ = 0;
+		gint _tmp103_;
 #line 197 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp103_ = res;
 #line 197 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1295,15 +1295,15 @@ static gpointer _database_table_ref0 (gpointer self) {
 
 SavedSearchDBTable* saved_search_db_table_get_instance (void) {
 	SavedSearchDBTable* result = NULL;
-	SavedSearchDBTable* _tmp0_ = NULL;
-	SavedSearchDBTable* _tmp2_ = NULL;
-	SavedSearchDBTable* _tmp3_ = NULL;
+	SavedSearchDBTable* _tmp0_;
+	SavedSearchDBTable* _tmp2_;
+	SavedSearchDBTable* _tmp3_;
 #line 201 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	_tmp0_ = saved_search_db_table_instance;
 #line 201 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp0_ == NULL) {
 #line 1306 "SavedSearchDBTable.c"
-		SavedSearchDBTable* _tmp1_ = NULL;
+		SavedSearchDBTable* _tmp1_;
 #line 202 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp1_ = saved_search_db_table_new ();
 #line 202 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1335,38 +1335,38 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar
 	SavedSearchRow* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GDestroyNotify _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	sqlite3_stmt* _tmp10_ = NULL;
-	SearchOperator _tmp11_ = 0;
-	gchar* _tmp12_ = NULL;
-	GDestroyNotify _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	sqlite3_stmt* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	GDestroyNotify _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	SearchOperator _tmp11_;
+	gchar* _tmp12_;
+	GDestroyNotify _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
+	sqlite3_stmt* _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
 	SavedSearchRow* row = NULL;
-	SavedSearchRow* _tmp20_ = NULL;
-	SavedSearchRow* _tmp21_ = NULL;
-	sqlite3* _tmp22_ = NULL;
-	gint64 _tmp23_ = 0LL;
-	SavedSearchRow* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	SavedSearchRow* _tmp27_ = NULL;
-	SearchOperator _tmp28_ = 0;
-	SavedSearchRow* _tmp29_ = NULL;
-	GeeArrayList* _tmp30_ = NULL;
-	GeeList* _tmp31_ = NULL;
+	SavedSearchRow* _tmp20_;
+	SavedSearchRow* _tmp21_;
+	sqlite3* _tmp22_;
+	gint64 _tmp23_;
+	SavedSearchRow* _tmp24_;
+	const gchar* _tmp25_;
+	gchar* _tmp26_;
+	SavedSearchRow* _tmp27_;
+	SearchOperator _tmp28_;
+	SavedSearchRow* _tmp29_;
+	GeeArrayList* _tmp30_;
+	GeeList* _tmp31_;
 	GError * _inner_error_ = NULL;
 #line 207 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL);
@@ -1431,7 +1431,7 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar
 #line 220 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp18_ != SQLITE_DONE) {
 #line 1434 "SavedSearchDBTable.c"
-		gint _tmp19_ = 0;
+		gint _tmp19_;
 #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp19_ = res;
 #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1501,12 +1501,12 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar
 #line 1502 "SavedSearchDBTable.c"
 	{
 		GeeArrayList* _sc_list = NULL;
-		GeeArrayList* _tmp32_ = NULL;
-		GeeArrayList* _tmp33_ = NULL;
+		GeeArrayList* _tmp32_;
+		GeeArrayList* _tmp33_;
 		gint _sc_size = 0;
-		GeeArrayList* _tmp34_ = NULL;
-		gint _tmp35_ = 0;
-		gint _tmp36_ = 0;
+		GeeArrayList* _tmp34_;
+		gint _tmp35_;
+		gint _tmp36_;
 		gint _sc_index = 0;
 #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp32_ = conditions;
@@ -1527,16 +1527,16 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar
 #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 1530 "SavedSearchDBTable.c"
-			gint _tmp37_ = 0;
-			gint _tmp38_ = 0;
-			gint _tmp39_ = 0;
+			gint _tmp37_;
+			gint _tmp38_;
+			gint _tmp39_;
 			SearchCondition* sc = NULL;
-			GeeArrayList* _tmp40_ = NULL;
-			gint _tmp41_ = 0;
-			gpointer _tmp42_ = NULL;
-			SavedSearchRow* _tmp43_ = NULL;
-			SavedSearchID _tmp44_ = {0};
-			SearchCondition* _tmp45_ = NULL;
+			GeeArrayList* _tmp40_;
+			gint _tmp41_;
+			gpointer _tmp42_;
+			SavedSearchRow* _tmp43_;
+			SavedSearchID _tmp44_;
+			SearchCondition* _tmp45_;
 #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			_tmp37_ = _sc_index;
 #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1628,7 +1628,7 @@ static gpointer _search_condition_ref0 (gpointer self) {
 
 
 static void saved_search_db_table_add_condition (SavedSearchDBTable* self, SavedSearchID* id, SearchCondition* condition, GError** error) {
-	SearchCondition* _tmp0_ = NULL;
+	SearchCondition* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 236 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
@@ -1642,46 +1642,46 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_TEXT)) {
 #line 1644 "SavedSearchDBTable.c"
 		SearchConditionText* text = NULL;
-		SearchCondition* _tmp1_ = NULL;
-		SearchConditionText* _tmp2_ = NULL;
+		SearchCondition* _tmp1_;
+		SearchConditionText* _tmp2_;
 		sqlite3_stmt* stmt = NULL;
 		gint res = 0;
-		sqlite3* _tmp3_ = NULL;
+		sqlite3* _tmp3_;
 		sqlite3_stmt* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
-		sqlite3_stmt* _tmp7_ = NULL;
-		SavedSearchID _tmp8_ = {0};
-		gint64 _tmp9_ = 0LL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
-		sqlite3_stmt* _tmp12_ = NULL;
-		SearchConditionText* _tmp13_ = NULL;
-		SearchConditionSearchType _tmp14_ = 0;
-		SearchConditionSearchType _tmp15_ = 0;
-		gchar* _tmp16_ = NULL;
-		GDestroyNotify _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
-		sqlite3_stmt* _tmp20_ = NULL;
-		SearchConditionText* _tmp21_ = NULL;
-		SearchConditionTextContext _tmp22_ = 0;
-		SearchConditionTextContext _tmp23_ = 0;
-		gchar* _tmp24_ = NULL;
-		GDestroyNotify _tmp25_ = NULL;
-		gint _tmp26_ = 0;
-		gint _tmp27_ = 0;
-		sqlite3_stmt* _tmp28_ = NULL;
-		SearchConditionText* _tmp29_ = NULL;
-		const gchar* _tmp30_ = NULL;
-		const gchar* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
-		GDestroyNotify _tmp33_ = NULL;
-		gint _tmp34_ = 0;
-		gint _tmp35_ = 0;
-		sqlite3_stmt* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
+		gint _tmp5_;
+		gint _tmp6_;
+		sqlite3_stmt* _tmp7_;
+		SavedSearchID _tmp8_;
+		gint64 _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
+		sqlite3_stmt* _tmp12_;
+		SearchConditionText* _tmp13_;
+		SearchConditionSearchType _tmp14_;
+		SearchConditionSearchType _tmp15_;
+		gchar* _tmp16_;
+		GDestroyNotify _tmp17_;
+		gint _tmp18_;
+		gint _tmp19_;
+		sqlite3_stmt* _tmp20_;
+		SearchConditionText* _tmp21_;
+		SearchConditionTextContext _tmp22_;
+		SearchConditionTextContext _tmp23_;
+		gchar* _tmp24_;
+		GDestroyNotify _tmp25_;
+		gint _tmp26_;
+		gint _tmp27_;
+		sqlite3_stmt* _tmp28_;
+		SearchConditionText* _tmp29_;
+		const gchar* _tmp30_;
+		const gchar* _tmp31_;
+		gchar* _tmp32_;
+		GDestroyNotify _tmp33_;
+		gint _tmp34_;
+		gint _tmp35_;
+		sqlite3_stmt* _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
 #line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp1_ = condition;
 #line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1787,7 +1787,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 #line 258 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		if (_tmp38_ != SQLITE_DONE) {
 #line 1790 "SavedSearchDBTable.c"
-			gint _tmp39_ = 0;
+			gint _tmp39_;
 #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			_tmp39_ = res;
 #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1826,53 +1826,53 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 		_search_condition_unref0 (text);
 #line 1828 "SavedSearchDBTable.c"
 	} else {
-		SearchCondition* _tmp40_ = NULL;
+		SearchCondition* _tmp40_;
 #line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp40_ = condition;
 #line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, TYPE_SEARCH_CONDITION_MEDIA_TYPE)) {
 #line 1835 "SavedSearchDBTable.c"
 			SearchConditionMediaType* media_type = NULL;
-			SearchCondition* _tmp41_ = NULL;
-			SearchConditionMediaType* _tmp42_ = NULL;
+			SearchCondition* _tmp41_;
+			SearchConditionMediaType* _tmp42_;
 			sqlite3_stmt* stmt = NULL;
 			gint res = 0;
-			sqlite3* _tmp43_ = NULL;
+			sqlite3* _tmp43_;
 			sqlite3_stmt* _tmp44_ = NULL;
-			gint _tmp45_ = 0;
-			gint _tmp46_ = 0;
-			sqlite3_stmt* _tmp47_ = NULL;
-			SavedSearchID _tmp48_ = {0};
-			gint64 _tmp49_ = 0LL;
-			gint _tmp50_ = 0;
-			gint _tmp51_ = 0;
-			sqlite3_stmt* _tmp52_ = NULL;
-			SearchConditionMediaType* _tmp53_ = NULL;
-			SearchConditionSearchType _tmp54_ = 0;
-			SearchConditionSearchType _tmp55_ = 0;
-			gchar* _tmp56_ = NULL;
-			GDestroyNotify _tmp57_ = NULL;
-			gint _tmp58_ = 0;
-			gint _tmp59_ = 0;
-			sqlite3_stmt* _tmp60_ = NULL;
-			SearchConditionMediaType* _tmp61_ = NULL;
-			SearchConditionMediaTypeContext _tmp62_ = 0;
-			SearchConditionMediaTypeContext _tmp63_ = 0;
-			gchar* _tmp64_ = NULL;
-			GDestroyNotify _tmp65_ = NULL;
-			gint _tmp66_ = 0;
-			gint _tmp67_ = 0;
-			sqlite3_stmt* _tmp68_ = NULL;
-			SearchConditionMediaType* _tmp69_ = NULL;
-			SearchConditionMediaTypeMediaType _tmp70_ = 0;
-			SearchConditionMediaTypeMediaType _tmp71_ = 0;
-			gchar* _tmp72_ = NULL;
-			GDestroyNotify _tmp73_ = NULL;
-			gint _tmp74_ = 0;
-			gint _tmp75_ = 0;
-			sqlite3_stmt* _tmp76_ = NULL;
-			gint _tmp77_ = 0;
-			gint _tmp78_ = 0;
+			gint _tmp45_;
+			gint _tmp46_;
+			sqlite3_stmt* _tmp47_;
+			SavedSearchID _tmp48_;
+			gint64 _tmp49_;
+			gint _tmp50_;
+			gint _tmp51_;
+			sqlite3_stmt* _tmp52_;
+			SearchConditionMediaType* _tmp53_;
+			SearchConditionSearchType _tmp54_;
+			SearchConditionSearchType _tmp55_;
+			gchar* _tmp56_;
+			GDestroyNotify _tmp57_;
+			gint _tmp58_;
+			gint _tmp59_;
+			sqlite3_stmt* _tmp60_;
+			SearchConditionMediaType* _tmp61_;
+			SearchConditionMediaTypeContext _tmp62_;
+			SearchConditionMediaTypeContext _tmp63_;
+			gchar* _tmp64_;
+			GDestroyNotify _tmp65_;
+			gint _tmp66_;
+			gint _tmp67_;
+			sqlite3_stmt* _tmp68_;
+			SearchConditionMediaType* _tmp69_;
+			SearchConditionMediaTypeMediaType _tmp70_;
+			SearchConditionMediaTypeMediaType _tmp71_;
+			gchar* _tmp72_;
+			GDestroyNotify _tmp73_;
+			gint _tmp74_;
+			gint _tmp75_;
+			sqlite3_stmt* _tmp76_;
+			gint _tmp77_;
+			gint _tmp78_;
 #line 261 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			_tmp41_ = condition;
 #line 261 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1979,7 +1979,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 #line 281 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (_tmp78_ != SQLITE_DONE) {
 #line 1981 "SavedSearchDBTable.c"
-				gint _tmp79_ = 0;
+				gint _tmp79_;
 #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp79_ = res;
 #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2018,45 +2018,45 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 			_search_condition_unref0 (media_type);
 #line 2019 "SavedSearchDBTable.c"
 		} else {
-			SearchCondition* _tmp80_ = NULL;
+			SearchCondition* _tmp80_;
 #line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			_tmp80_ = condition;
 #line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp80_, TYPE_SEARCH_CONDITION_FLAGGED)) {
 #line 2026 "SavedSearchDBTable.c"
 				SearchConditionFlagged* flag_state = NULL;
-				SearchCondition* _tmp81_ = NULL;
-				SearchConditionFlagged* _tmp82_ = NULL;
+				SearchCondition* _tmp81_;
+				SearchConditionFlagged* _tmp82_;
 				sqlite3_stmt* stmt = NULL;
 				gint res = 0;
-				sqlite3* _tmp83_ = NULL;
+				sqlite3* _tmp83_;
 				sqlite3_stmt* _tmp84_ = NULL;
-				gint _tmp85_ = 0;
-				gint _tmp86_ = 0;
-				sqlite3_stmt* _tmp87_ = NULL;
-				SavedSearchID _tmp88_ = {0};
-				gint64 _tmp89_ = 0LL;
-				gint _tmp90_ = 0;
-				gint _tmp91_ = 0;
-				sqlite3_stmt* _tmp92_ = NULL;
-				SearchConditionFlagged* _tmp93_ = NULL;
-				SearchConditionSearchType _tmp94_ = 0;
-				SearchConditionSearchType _tmp95_ = 0;
-				gchar* _tmp96_ = NULL;
-				GDestroyNotify _tmp97_ = NULL;
-				gint _tmp98_ = 0;
-				gint _tmp99_ = 0;
-				sqlite3_stmt* _tmp100_ = NULL;
-				SearchConditionFlagged* _tmp101_ = NULL;
-				SearchConditionFlaggedState _tmp102_ = 0;
-				SearchConditionFlaggedState _tmp103_ = 0;
-				gchar* _tmp104_ = NULL;
-				GDestroyNotify _tmp105_ = NULL;
-				gint _tmp106_ = 0;
-				gint _tmp107_ = 0;
-				sqlite3_stmt* _tmp108_ = NULL;
-				gint _tmp109_ = 0;
-				gint _tmp110_ = 0;
+				gint _tmp85_;
+				gint _tmp86_;
+				sqlite3_stmt* _tmp87_;
+				SavedSearchID _tmp88_;
+				gint64 _tmp89_;
+				gint _tmp90_;
+				gint _tmp91_;
+				sqlite3_stmt* _tmp92_;
+				SearchConditionFlagged* _tmp93_;
+				SearchConditionSearchType _tmp94_;
+				SearchConditionSearchType _tmp95_;
+				gchar* _tmp96_;
+				GDestroyNotify _tmp97_;
+				gint _tmp98_;
+				gint _tmp99_;
+				sqlite3_stmt* _tmp100_;
+				SearchConditionFlagged* _tmp101_;
+				SearchConditionFlaggedState _tmp102_;
+				SearchConditionFlaggedState _tmp103_;
+				gchar* _tmp104_;
+				GDestroyNotify _tmp105_;
+				gint _tmp106_;
+				gint _tmp107_;
+				sqlite3_stmt* _tmp108_;
+				gint _tmp109_;
+				gint _tmp110_;
 #line 284 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp81_ = condition;
 #line 284 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2142,7 +2142,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 #line 301 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (_tmp110_ != SQLITE_DONE) {
 #line 2144 "SavedSearchDBTable.c"
-					gint _tmp111_ = 0;
+					gint _tmp111_;
 #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp111_ = res;
 #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2181,53 +2181,53 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 				_search_condition_unref0 (flag_state);
 #line 2182 "SavedSearchDBTable.c"
 			} else {
-				SearchCondition* _tmp112_ = NULL;
+				SearchCondition* _tmp112_;
 #line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp112_ = condition;
 #line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp112_, TYPE_SEARCH_CONDITION_MODIFIED)) {
 #line 2189 "SavedSearchDBTable.c"
 					SearchConditionModified* modified_state = NULL;
-					SearchCondition* _tmp113_ = NULL;
-					SearchConditionModified* _tmp114_ = NULL;
+					SearchCondition* _tmp113_;
+					SearchConditionModified* _tmp114_;
 					sqlite3_stmt* stmt = NULL;
 					gint res = 0;
-					sqlite3* _tmp115_ = NULL;
+					sqlite3* _tmp115_;
 					sqlite3_stmt* _tmp116_ = NULL;
-					gint _tmp117_ = 0;
-					gint _tmp118_ = 0;
-					sqlite3_stmt* _tmp119_ = NULL;
-					SavedSearchID _tmp120_ = {0};
-					gint64 _tmp121_ = 0LL;
-					gint _tmp122_ = 0;
-					gint _tmp123_ = 0;
-					sqlite3_stmt* _tmp124_ = NULL;
-					SearchConditionModified* _tmp125_ = NULL;
-					SearchConditionSearchType _tmp126_ = 0;
-					SearchConditionSearchType _tmp127_ = 0;
-					gchar* _tmp128_ = NULL;
-					GDestroyNotify _tmp129_ = NULL;
-					gint _tmp130_ = 0;
-					gint _tmp131_ = 0;
-					sqlite3_stmt* _tmp132_ = NULL;
-					SearchConditionModified* _tmp133_ = NULL;
-					SearchConditionModifiedContext _tmp134_ = 0;
-					SearchConditionModifiedContext _tmp135_ = 0;
-					gchar* _tmp136_ = NULL;
-					GDestroyNotify _tmp137_ = NULL;
-					gint _tmp138_ = 0;
-					gint _tmp139_ = 0;
-					sqlite3_stmt* _tmp140_ = NULL;
-					SearchConditionModified* _tmp141_ = NULL;
-					SearchConditionModifiedState _tmp142_ = 0;
-					SearchConditionModifiedState _tmp143_ = 0;
-					gchar* _tmp144_ = NULL;
-					GDestroyNotify _tmp145_ = NULL;
-					gint _tmp146_ = 0;
-					gint _tmp147_ = 0;
-					sqlite3_stmt* _tmp148_ = NULL;
-					gint _tmp149_ = 0;
-					gint _tmp150_ = 0;
+					gint _tmp117_;
+					gint _tmp118_;
+					sqlite3_stmt* _tmp119_;
+					SavedSearchID _tmp120_;
+					gint64 _tmp121_;
+					gint _tmp122_;
+					gint _tmp123_;
+					sqlite3_stmt* _tmp124_;
+					SearchConditionModified* _tmp125_;
+					SearchConditionSearchType _tmp126_;
+					SearchConditionSearchType _tmp127_;
+					gchar* _tmp128_;
+					GDestroyNotify _tmp129_;
+					gint _tmp130_;
+					gint _tmp131_;
+					sqlite3_stmt* _tmp132_;
+					SearchConditionModified* _tmp133_;
+					SearchConditionModifiedContext _tmp134_;
+					SearchConditionModifiedContext _tmp135_;
+					gchar* _tmp136_;
+					GDestroyNotify _tmp137_;
+					gint _tmp138_;
+					gint _tmp139_;
+					sqlite3_stmt* _tmp140_;
+					SearchConditionModified* _tmp141_;
+					SearchConditionModifiedState _tmp142_;
+					SearchConditionModifiedState _tmp143_;
+					gchar* _tmp144_;
+					GDestroyNotify _tmp145_;
+					gint _tmp146_;
+					gint _tmp147_;
+					sqlite3_stmt* _tmp148_;
+					gint _tmp149_;
+					gint _tmp150_;
 #line 304 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp113_ = condition;
 #line 304 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2334,7 +2334,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 #line 324 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					if (_tmp150_ != SQLITE_DONE) {
 #line 2335 "SavedSearchDBTable.c"
-						gint _tmp151_ = 0;
+						gint _tmp151_;
 #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 						_tmp151_ = res;
 #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2373,52 +2373,52 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 					_search_condition_unref0 (modified_state);
 #line 2373 "SavedSearchDBTable.c"
 				} else {
-					SearchCondition* _tmp152_ = NULL;
+					SearchCondition* _tmp152_;
 #line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp152_ = condition;
 #line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp152_, TYPE_SEARCH_CONDITION_RATING)) {
 #line 2380 "SavedSearchDBTable.c"
 						SearchConditionRating* rating = NULL;
-						SearchCondition* _tmp153_ = NULL;
-						SearchConditionRating* _tmp154_ = NULL;
+						SearchCondition* _tmp153_;
+						SearchConditionRating* _tmp154_;
 						sqlite3_stmt* stmt = NULL;
 						gint res = 0;
-						sqlite3* _tmp155_ = NULL;
+						sqlite3* _tmp155_;
 						sqlite3_stmt* _tmp156_ = NULL;
-						gint _tmp157_ = 0;
-						gint _tmp158_ = 0;
-						sqlite3_stmt* _tmp159_ = NULL;
-						SavedSearchID _tmp160_ = {0};
-						gint64 _tmp161_ = 0LL;
-						gint _tmp162_ = 0;
-						gint _tmp163_ = 0;
-						sqlite3_stmt* _tmp164_ = NULL;
-						SearchConditionRating* _tmp165_ = NULL;
-						SearchConditionSearchType _tmp166_ = 0;
-						SearchConditionSearchType _tmp167_ = 0;
-						gchar* _tmp168_ = NULL;
-						GDestroyNotify _tmp169_ = NULL;
-						gint _tmp170_ = 0;
-						gint _tmp171_ = 0;
-						sqlite3_stmt* _tmp172_ = NULL;
-						SearchConditionRating* _tmp173_ = NULL;
-						Rating _tmp174_ = 0;
-						Rating _tmp175_ = 0;
-						gint _tmp176_ = 0;
-						gint _tmp177_ = 0;
-						gint _tmp178_ = 0;
-						sqlite3_stmt* _tmp179_ = NULL;
-						SearchConditionRating* _tmp180_ = NULL;
-						SearchConditionRatingContext _tmp181_ = 0;
-						SearchConditionRatingContext _tmp182_ = 0;
-						gchar* _tmp183_ = NULL;
-						GDestroyNotify _tmp184_ = NULL;
-						gint _tmp185_ = 0;
-						gint _tmp186_ = 0;
-						sqlite3_stmt* _tmp187_ = NULL;
-						gint _tmp188_ = 0;
-						gint _tmp189_ = 0;
+						gint _tmp157_;
+						gint _tmp158_;
+						sqlite3_stmt* _tmp159_;
+						SavedSearchID _tmp160_;
+						gint64 _tmp161_;
+						gint _tmp162_;
+						gint _tmp163_;
+						sqlite3_stmt* _tmp164_;
+						SearchConditionRating* _tmp165_;
+						SearchConditionSearchType _tmp166_;
+						SearchConditionSearchType _tmp167_;
+						gchar* _tmp168_;
+						GDestroyNotify _tmp169_;
+						gint _tmp170_;
+						gint _tmp171_;
+						sqlite3_stmt* _tmp172_;
+						SearchConditionRating* _tmp173_;
+						Rating _tmp174_;
+						Rating _tmp175_;
+						gint _tmp176_;
+						gint _tmp177_;
+						gint _tmp178_;
+						sqlite3_stmt* _tmp179_;
+						SearchConditionRating* _tmp180_;
+						SearchConditionRatingContext _tmp181_;
+						SearchConditionRatingContext _tmp182_;
+						gchar* _tmp183_;
+						GDestroyNotify _tmp184_;
+						gint _tmp185_;
+						gint _tmp186_;
+						sqlite3_stmt* _tmp187_;
+						gint _tmp188_;
+						gint _tmp189_;
 #line 327 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 						_tmp153_ = condition;
 #line 327 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2523,7 +2523,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 #line 347 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 						if (_tmp189_ != SQLITE_DONE) {
 #line 2523 "SavedSearchDBTable.c"
-							gint _tmp190_ = 0;
+							gint _tmp190_;
 #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 							_tmp190_ = res;
 #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2562,59 +2562,59 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 						_search_condition_unref0 (rating);
 #line 2561 "SavedSearchDBTable.c"
 					} else {
-						SearchCondition* _tmp191_ = NULL;
+						SearchCondition* _tmp191_;
 #line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 						_tmp191_ = condition;
 #line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 						if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp191_, TYPE_SEARCH_CONDITION_DATE)) {
 #line 2568 "SavedSearchDBTable.c"
 							SearchConditionDate* date = NULL;
-							SearchCondition* _tmp192_ = NULL;
-							SearchConditionDate* _tmp193_ = NULL;
+							SearchCondition* _tmp192_;
+							SearchConditionDate* _tmp193_;
 							sqlite3_stmt* stmt = NULL;
 							gint res = 0;
-							sqlite3* _tmp194_ = NULL;
+							sqlite3* _tmp194_;
 							sqlite3_stmt* _tmp195_ = NULL;
-							gint _tmp196_ = 0;
-							gint _tmp197_ = 0;
-							sqlite3_stmt* _tmp198_ = NULL;
-							SavedSearchID _tmp199_ = {0};
-							gint64 _tmp200_ = 0LL;
-							gint _tmp201_ = 0;
-							gint _tmp202_ = 0;
-							sqlite3_stmt* _tmp203_ = NULL;
-							SearchConditionDate* _tmp204_ = NULL;
-							SearchConditionSearchType _tmp205_ = 0;
-							SearchConditionSearchType _tmp206_ = 0;
-							gchar* _tmp207_ = NULL;
-							GDestroyNotify _tmp208_ = NULL;
-							gint _tmp209_ = 0;
-							gint _tmp210_ = 0;
-							sqlite3_stmt* _tmp211_ = NULL;
-							SearchConditionDate* _tmp212_ = NULL;
-							SearchConditionDateContext _tmp213_ = 0;
-							SearchConditionDateContext _tmp214_ = 0;
-							gchar* _tmp215_ = NULL;
-							GDestroyNotify _tmp216_ = NULL;
-							gint _tmp217_ = 0;
-							gint _tmp218_ = 0;
-							sqlite3_stmt* _tmp219_ = NULL;
-							SearchConditionDate* _tmp220_ = NULL;
-							GDateTime* _tmp221_ = NULL;
-							GDateTime* _tmp222_ = NULL;
-							gint64 _tmp223_ = 0LL;
-							gint _tmp224_ = 0;
-							gint _tmp225_ = 0;
-							sqlite3_stmt* _tmp226_ = NULL;
-							SearchConditionDate* _tmp227_ = NULL;
-							GDateTime* _tmp228_ = NULL;
-							GDateTime* _tmp229_ = NULL;
-							gint64 _tmp230_ = 0LL;
-							gint _tmp231_ = 0;
-							gint _tmp232_ = 0;
-							sqlite3_stmt* _tmp233_ = NULL;
-							gint _tmp234_ = 0;
-							gint _tmp235_ = 0;
+							gint _tmp196_;
+							gint _tmp197_;
+							sqlite3_stmt* _tmp198_;
+							SavedSearchID _tmp199_;
+							gint64 _tmp200_;
+							gint _tmp201_;
+							gint _tmp202_;
+							sqlite3_stmt* _tmp203_;
+							SearchConditionDate* _tmp204_;
+							SearchConditionSearchType _tmp205_;
+							SearchConditionSearchType _tmp206_;
+							gchar* _tmp207_;
+							GDestroyNotify _tmp208_;
+							gint _tmp209_;
+							gint _tmp210_;
+							sqlite3_stmt* _tmp211_;
+							SearchConditionDate* _tmp212_;
+							SearchConditionDateContext _tmp213_;
+							SearchConditionDateContext _tmp214_;
+							gchar* _tmp215_;
+							GDestroyNotify _tmp216_;
+							gint _tmp217_;
+							gint _tmp218_;
+							sqlite3_stmt* _tmp219_;
+							SearchConditionDate* _tmp220_;
+							GDateTime* _tmp221_;
+							GDateTime* _tmp222_;
+							gint64 _tmp223_;
+							gint _tmp224_;
+							gint _tmp225_;
+							sqlite3_stmt* _tmp226_;
+							SearchConditionDate* _tmp227_;
+							GDateTime* _tmp228_;
+							GDateTime* _tmp229_;
+							gint64 _tmp230_;
+							gint _tmp231_;
+							gint _tmp232_;
+							sqlite3_stmt* _tmp233_;
+							gint _tmp234_;
+							gint _tmp235_;
 #line 350 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 							_tmp192_ = condition;
 #line 350 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2736,7 +2736,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 #line 373 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 							if (_tmp235_ != SQLITE_DONE) {
 #line 2736 "SavedSearchDBTable.c"
-								gint _tmp236_ = 0;
+								gint _tmp236_;
 #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 								_tmp236_ = res;
 #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2788,12 +2788,12 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 
 
 static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) {
-	SavedSearchID _tmp0_ = {0};
-	SavedSearchID _tmp1_ = {0};
-	SavedSearchID _tmp2_ = {0};
-	SavedSearchID _tmp3_ = {0};
-	SavedSearchID _tmp4_ = {0};
-	SavedSearchID _tmp5_ = {0};
+	SavedSearchID _tmp0_;
+	SavedSearchID _tmp1_;
+	SavedSearchID _tmp2_;
+	SavedSearchID _tmp3_;
+	SavedSearchID _tmp4_;
+	SavedSearchID _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 381 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
@@ -2943,22 +2943,22 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB
 static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTable* self, const gchar* table_name, SavedSearchID* search_id, GError** error) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	sqlite3* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	sqlite3_stmt* _tmp8_ = NULL;
-	SavedSearchID _tmp9_ = {0};
-	gint64 _tmp10_ = 0LL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	sqlite3_stmt* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	sqlite3_stmt* _tmp8_;
+	SavedSearchID _tmp9_;
+	gint64 _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	sqlite3_stmt* _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
 	GError * _inner_error_ = NULL;
 #line 390 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
@@ -3015,10 +3015,10 @@ static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTabl
 #line 400 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp15_ != SQLITE_DONE) {
 #line 3015 "SavedSearchDBTable.c"
-		const gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
+		const gchar* _tmp16_;
+		gchar* _tmp17_;
+		gchar* _tmp18_;
+		gint _tmp19_;
 #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp16_ = table_name;
 #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -3064,63 +3064,63 @@ static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTabl
 static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) {
 	GeeList* result = NULL;
 	GeeList* list = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp1_ = NULL;
+	sqlite3* _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	sqlite3_stmt* _tmp5_ = NULL;
-	SavedSearchID _tmp6_ = {0};
-	gint64 _tmp7_ = 0LL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	sqlite3* _tmp27_ = NULL;
+	gint _tmp3_;
+	gint _tmp4_;
+	sqlite3_stmt* _tmp5_;
+	SavedSearchID _tmp6_;
+	gint64 _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	sqlite3* _tmp27_;
 	sqlite3_stmt* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	gint _tmp30_ = 0;
-	sqlite3_stmt* _tmp31_ = NULL;
-	SavedSearchID _tmp32_ = {0};
-	gint64 _tmp33_ = 0LL;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
-	sqlite3* _tmp54_ = NULL;
+	gint _tmp29_;
+	gint _tmp30_;
+	sqlite3_stmt* _tmp31_;
+	SavedSearchID _tmp32_;
+	gint64 _tmp33_;
+	gint _tmp34_;
+	gint _tmp35_;
+	sqlite3* _tmp54_;
 	sqlite3_stmt* _tmp55_ = NULL;
-	gint _tmp56_ = 0;
-	gint _tmp57_ = 0;
-	sqlite3_stmt* _tmp58_ = NULL;
-	SavedSearchID _tmp59_ = {0};
-	gint64 _tmp60_ = 0LL;
-	gint _tmp61_ = 0;
-	gint _tmp62_ = 0;
-	sqlite3* _tmp78_ = NULL;
+	gint _tmp56_;
+	gint _tmp57_;
+	sqlite3_stmt* _tmp58_;
+	SavedSearchID _tmp59_;
+	gint64 _tmp60_;
+	gint _tmp61_;
+	gint _tmp62_;
+	sqlite3* _tmp78_;
 	sqlite3_stmt* _tmp79_ = NULL;
-	gint _tmp80_ = 0;
-	gint _tmp81_ = 0;
-	sqlite3_stmt* _tmp82_ = NULL;
-	SavedSearchID _tmp83_ = {0};
-	gint64 _tmp84_ = 0LL;
-	gint _tmp85_ = 0;
-	gint _tmp86_ = 0;
-	sqlite3* _tmp105_ = NULL;
+	gint _tmp80_;
+	gint _tmp81_;
+	sqlite3_stmt* _tmp82_;
+	SavedSearchID _tmp83_;
+	gint64 _tmp84_;
+	gint _tmp85_;
+	gint _tmp86_;
+	sqlite3* _tmp105_;
 	sqlite3_stmt* _tmp106_ = NULL;
-	gint _tmp107_ = 0;
-	gint _tmp108_ = 0;
-	sqlite3_stmt* _tmp109_ = NULL;
-	SavedSearchID _tmp110_ = {0};
-	gint64 _tmp111_ = 0LL;
-	gint _tmp112_ = 0;
-	gint _tmp113_ = 0;
-	sqlite3* _tmp132_ = NULL;
+	gint _tmp107_;
+	gint _tmp108_;
+	sqlite3_stmt* _tmp109_;
+	SavedSearchID _tmp110_;
+	gint64 _tmp111_;
+	gint _tmp112_;
+	gint _tmp113_;
+	sqlite3* _tmp132_;
 	sqlite3_stmt* _tmp133_ = NULL;
-	gint _tmp134_ = 0;
-	gint _tmp135_ = 0;
-	sqlite3_stmt* _tmp136_ = NULL;
-	SavedSearchID _tmp137_ = {0};
-	gint64 _tmp138_ = 0LL;
-	gint _tmp139_ = 0;
-	gint _tmp140_ = 0;
+	gint _tmp134_;
+	gint _tmp135_;
+	sqlite3_stmt* _tmp136_;
+	SavedSearchID _tmp137_;
+	gint64 _tmp138_;
+	gint _tmp139_;
+	gint _tmp140_;
 	GError * _inner_error_ = NULL;
 #line 405 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL);
@@ -3166,21 +3166,21 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 3166 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
+			sqlite3_stmt* _tmp11_;
+			gint _tmp12_;
+			gint _tmp13_;
 			SearchConditionText* condition = NULL;
-			sqlite3_stmt* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			SearchConditionSearchType _tmp18_ = 0;
-			sqlite3_stmt* _tmp19_ = NULL;
-			const gchar* _tmp20_ = NULL;
-			sqlite3_stmt* _tmp21_ = NULL;
-			const gchar* _tmp22_ = NULL;
-			SearchConditionTextContext _tmp23_ = 0;
-			SearchConditionText* _tmp24_ = NULL;
-			GeeList* _tmp25_ = NULL;
-			SearchConditionText* _tmp26_ = NULL;
+			sqlite3_stmt* _tmp16_;
+			const gchar* _tmp17_;
+			SearchConditionSearchType _tmp18_;
+			sqlite3_stmt* _tmp19_;
+			const gchar* _tmp20_;
+			sqlite3_stmt* _tmp21_;
+			const gchar* _tmp22_;
+			SearchConditionTextContext _tmp23_;
+			SearchConditionText* _tmp24_;
+			GeeList* _tmp25_;
+			SearchConditionText* _tmp26_;
 #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (!_tmp10_) {
 #line 3184 "SavedSearchDBTable.c"
@@ -3201,13 +3201,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 				break;
 #line 3200 "SavedSearchDBTable.c"
 			} else {
-				gint _tmp14_ = 0;
+				gint _tmp14_;
 #line 424 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp14_ = res;
 #line 424 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (_tmp14_ != SQLITE_ROW) {
 #line 3207 "SavedSearchDBTable.c"
-					gint _tmp15_ = 0;
+					gint _tmp15_;
 #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp15_ = res;
 #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -3308,22 +3308,22 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 3308 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp37_ = NULL;
-			gint _tmp38_ = 0;
-			gint _tmp39_ = 0;
+			sqlite3_stmt* _tmp37_;
+			gint _tmp38_;
+			gint _tmp39_;
 			SearchConditionMediaType* condition = NULL;
-			sqlite3_stmt* _tmp42_ = NULL;
-			const gchar* _tmp43_ = NULL;
-			SearchConditionSearchType _tmp44_ = 0;
-			sqlite3_stmt* _tmp45_ = NULL;
-			const gchar* _tmp46_ = NULL;
-			SearchConditionMediaTypeContext _tmp47_ = 0;
-			sqlite3_stmt* _tmp48_ = NULL;
-			const gchar* _tmp49_ = NULL;
-			SearchConditionMediaTypeMediaType _tmp50_ = 0;
-			SearchConditionMediaType* _tmp51_ = NULL;
-			GeeList* _tmp52_ = NULL;
-			SearchConditionMediaType* _tmp53_ = NULL;
+			sqlite3_stmt* _tmp42_;
+			const gchar* _tmp43_;
+			SearchConditionSearchType _tmp44_;
+			sqlite3_stmt* _tmp45_;
+			const gchar* _tmp46_;
+			SearchConditionMediaTypeContext _tmp47_;
+			sqlite3_stmt* _tmp48_;
+			const gchar* _tmp49_;
+			SearchConditionMediaTypeMediaType _tmp50_;
+			SearchConditionMediaType* _tmp51_;
+			GeeList* _tmp52_;
+			SearchConditionMediaType* _tmp53_;
 #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (!_tmp36_) {
 #line 3327 "SavedSearchDBTable.c"
@@ -3344,13 +3344,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 				break;
 #line 3343 "SavedSearchDBTable.c"
 			} else {
-				gint _tmp40_ = 0;
+				gint _tmp40_;
 #line 448 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp40_ = res;
 #line 448 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (_tmp40_ != SQLITE_ROW) {
 #line 3350 "SavedSearchDBTable.c"
-					gint _tmp41_ = 0;
+					gint _tmp41_;
 #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp41_ = res;
 #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -3453,19 +3453,19 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 3453 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp64_ = NULL;
-			gint _tmp65_ = 0;
-			gint _tmp66_ = 0;
+			sqlite3_stmt* _tmp64_;
+			gint _tmp65_;
+			gint _tmp66_;
 			SearchConditionFlagged* condition = NULL;
-			sqlite3_stmt* _tmp69_ = NULL;
-			const gchar* _tmp70_ = NULL;
-			SearchConditionSearchType _tmp71_ = 0;
-			sqlite3_stmt* _tmp72_ = NULL;
-			const gchar* _tmp73_ = NULL;
-			SearchConditionFlaggedState _tmp74_ = 0;
-			SearchConditionFlagged* _tmp75_ = NULL;
-			GeeList* _tmp76_ = NULL;
-			SearchConditionFlagged* _tmp77_ = NULL;
+			sqlite3_stmt* _tmp69_;
+			const gchar* _tmp70_;
+			SearchConditionSearchType _tmp71_;
+			sqlite3_stmt* _tmp72_;
+			const gchar* _tmp73_;
+			SearchConditionFlaggedState _tmp74_;
+			SearchConditionFlagged* _tmp75_;
+			GeeList* _tmp76_;
+			SearchConditionFlagged* _tmp77_;
 #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (!_tmp63_) {
 #line 3469 "SavedSearchDBTable.c"
@@ -3486,13 +3486,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 				break;
 #line 3485 "SavedSearchDBTable.c"
 			} else {
-				gint _tmp67_ = 0;
+				gint _tmp67_;
 #line 472 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp67_ = res;
 #line 472 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (_tmp67_ != SQLITE_ROW) {
 #line 3492 "SavedSearchDBTable.c"
-					gint _tmp68_ = 0;
+					gint _tmp68_;
 #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp68_ = res;
 #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -3590,22 +3590,22 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 3589 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp88_ = NULL;
-			gint _tmp89_ = 0;
-			gint _tmp90_ = 0;
+			sqlite3_stmt* _tmp88_;
+			gint _tmp89_;
+			gint _tmp90_;
 			SearchConditionModified* condition = NULL;
-			sqlite3_stmt* _tmp93_ = NULL;
-			const gchar* _tmp94_ = NULL;
-			SearchConditionSearchType _tmp95_ = 0;
-			sqlite3_stmt* _tmp96_ = NULL;
-			const gchar* _tmp97_ = NULL;
-			SearchConditionModifiedContext _tmp98_ = 0;
-			sqlite3_stmt* _tmp99_ = NULL;
-			const gchar* _tmp100_ = NULL;
-			SearchConditionModifiedState _tmp101_ = 0;
-			SearchConditionModified* _tmp102_ = NULL;
-			GeeList* _tmp103_ = NULL;
-			SearchConditionModified* _tmp104_ = NULL;
+			sqlite3_stmt* _tmp93_;
+			const gchar* _tmp94_;
+			SearchConditionSearchType _tmp95_;
+			sqlite3_stmt* _tmp96_;
+			const gchar* _tmp97_;
+			SearchConditionModifiedContext _tmp98_;
+			sqlite3_stmt* _tmp99_;
+			const gchar* _tmp100_;
+			SearchConditionModifiedState _tmp101_;
+			SearchConditionModified* _tmp102_;
+			GeeList* _tmp103_;
+			SearchConditionModified* _tmp104_;
 #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (!_tmp87_) {
 #line 3608 "SavedSearchDBTable.c"
@@ -3626,13 +3626,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 				break;
 #line 3624 "SavedSearchDBTable.c"
 			} else {
-				gint _tmp91_ = 0;
+				gint _tmp91_;
 #line 495 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp91_ = res;
 #line 495 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (_tmp91_ != SQLITE_ROW) {
 #line 3631 "SavedSearchDBTable.c"
-					gint _tmp92_ = 0;
+					gint _tmp92_;
 #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp92_ = res;
 #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -3735,22 +3735,22 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 3734 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp115_ = NULL;
-			gint _tmp116_ = 0;
-			gint _tmp117_ = 0;
+			sqlite3_stmt* _tmp115_;
+			gint _tmp116_;
+			gint _tmp117_;
 			SearchConditionRating* condition = NULL;
-			sqlite3_stmt* _tmp120_ = NULL;
-			const gchar* _tmp121_ = NULL;
-			SearchConditionSearchType _tmp122_ = 0;
-			sqlite3_stmt* _tmp123_ = NULL;
-			gint _tmp124_ = 0;
-			Rating _tmp125_ = 0;
-			sqlite3_stmt* _tmp126_ = NULL;
-			const gchar* _tmp127_ = NULL;
-			SearchConditionRatingContext _tmp128_ = 0;
-			SearchConditionRating* _tmp129_ = NULL;
-			GeeList* _tmp130_ = NULL;
-			SearchConditionRating* _tmp131_ = NULL;
+			sqlite3_stmt* _tmp120_;
+			const gchar* _tmp121_;
+			SearchConditionSearchType _tmp122_;
+			sqlite3_stmt* _tmp123_;
+			gint _tmp124_;
+			Rating _tmp125_;
+			sqlite3_stmt* _tmp126_;
+			const gchar* _tmp127_;
+			SearchConditionRatingContext _tmp128_;
+			SearchConditionRating* _tmp129_;
+			GeeList* _tmp130_;
+			SearchConditionRating* _tmp131_;
 #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (!_tmp114_) {
 #line 3753 "SavedSearchDBTable.c"
@@ -3771,13 +3771,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 				break;
 #line 3769 "SavedSearchDBTable.c"
 			} else {
-				gint _tmp118_ = 0;
+				gint _tmp118_;
 #line 519 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp118_ = res;
 #line 519 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (_tmp118_ != SQLITE_ROW) {
 #line 3776 "SavedSearchDBTable.c"
-					gint _tmp119_ = 0;
+					gint _tmp119_;
 #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp119_ = res;
 #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -3881,28 +3881,28 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 3879 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp142_ = NULL;
-			gint _tmp143_ = 0;
-			gint _tmp144_ = 0;
+			sqlite3_stmt* _tmp142_;
+			gint _tmp143_;
+			gint _tmp144_;
 			SearchConditionDate* condition = NULL;
-			sqlite3_stmt* _tmp147_ = NULL;
-			const gchar* _tmp148_ = NULL;
-			SearchConditionSearchType _tmp149_ = 0;
-			sqlite3_stmt* _tmp150_ = NULL;
-			const gchar* _tmp151_ = NULL;
-			SearchConditionDateContext _tmp152_ = 0;
-			sqlite3_stmt* _tmp153_ = NULL;
-			gint64 _tmp154_ = 0LL;
-			GDateTime* _tmp155_ = NULL;
-			GDateTime* _tmp156_ = NULL;
-			sqlite3_stmt* _tmp157_ = NULL;
-			gint64 _tmp158_ = 0LL;
-			GDateTime* _tmp159_ = NULL;
-			GDateTime* _tmp160_ = NULL;
-			SearchConditionDate* _tmp161_ = NULL;
-			SearchConditionDate* _tmp162_ = NULL;
-			GeeList* _tmp163_ = NULL;
-			SearchConditionDate* _tmp164_ = NULL;
+			sqlite3_stmt* _tmp147_;
+			const gchar* _tmp148_;
+			SearchConditionSearchType _tmp149_;
+			sqlite3_stmt* _tmp150_;
+			const gchar* _tmp151_;
+			SearchConditionDateContext _tmp152_;
+			sqlite3_stmt* _tmp153_;
+			gint64 _tmp154_;
+			GDateTime* _tmp155_;
+			GDateTime* _tmp156_;
+			sqlite3_stmt* _tmp157_;
+			gint64 _tmp158_;
+			GDateTime* _tmp159_;
+			GDateTime* _tmp160_;
+			SearchConditionDate* _tmp161_;
+			SearchConditionDate* _tmp162_;
+			GeeList* _tmp163_;
+			SearchConditionDate* _tmp164_;
 #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (!_tmp141_) {
 #line 3904 "SavedSearchDBTable.c"
@@ -3923,13 +3923,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 				break;
 #line 3920 "SavedSearchDBTable.c"
 			} else {
-				gint _tmp145_ = 0;
+				gint _tmp145_;
 #line 543 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp145_ = res;
 #line 543 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (_tmp145_ != SQLITE_ROW) {
 #line 3927 "SavedSearchDBTable.c"
-					gint _tmp146_ = 0;
+					gint _tmp146_;
 #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp146_ = res;
 #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -4025,30 +4025,30 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearchRow* row, SavedSearchID* result, GError** error) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	SavedSearchRow* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GDestroyNotify _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	sqlite3_stmt* _tmp11_ = NULL;
-	SavedSearchRow* _tmp12_ = NULL;
-	SearchOperator _tmp13_ = 0;
-	gchar* _tmp14_ = NULL;
-	GDestroyNotify _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	sqlite3_stmt* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	SavedSearchRow* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	GDestroyNotify _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	sqlite3_stmt* _tmp11_;
+	SavedSearchRow* _tmp12_;
+	SearchOperator _tmp13_;
+	gchar* _tmp14_;
+	GDestroyNotify _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	sqlite3_stmt* _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
 	SavedSearchID search_id = {0};
-	sqlite3* _tmp22_ = NULL;
-	gint64 _tmp23_ = 0LL;
+	sqlite3* _tmp22_;
+	gint64 _tmp23_;
 	GError * _inner_error_ = NULL;
 #line 558 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
@@ -4115,7 +4115,7 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc
 #line 570 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp20_ != SQLITE_DONE) {
 #line 4113 "SavedSearchDBTable.c"
-		gint _tmp21_ = 0;
+		gint _tmp21_;
 #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp21_ = res;
 #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -4153,13 +4153,13 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc
 #line 4149 "SavedSearchDBTable.c"
 	{
 		GeeList* _sc_list = NULL;
-		SavedSearchRow* _tmp24_ = NULL;
-		GeeList* _tmp25_ = NULL;
-		GeeList* _tmp26_ = NULL;
+		SavedSearchRow* _tmp24_;
+		GeeList* _tmp25_;
+		GeeList* _tmp26_;
 		gint _sc_size = 0;
-		GeeList* _tmp27_ = NULL;
-		gint _tmp28_ = 0;
-		gint _tmp29_ = 0;
+		GeeList* _tmp27_;
+		gint _tmp28_;
+		gint _tmp29_;
 		gint _sc_index = 0;
 #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp24_ = row;
@@ -4182,15 +4182,15 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc
 #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 4180 "SavedSearchDBTable.c"
-			gint _tmp30_ = 0;
-			gint _tmp31_ = 0;
-			gint _tmp32_ = 0;
+			gint _tmp30_;
+			gint _tmp31_;
+			gint _tmp32_;
 			SearchCondition* sc = NULL;
-			GeeList* _tmp33_ = NULL;
-			gint _tmp34_ = 0;
-			gpointer _tmp35_ = NULL;
-			SavedSearchID _tmp36_ = {0};
-			SearchCondition* _tmp37_ = NULL;
+			GeeList* _tmp33_;
+			gint _tmp34_;
+			gpointer _tmp35_;
+			SavedSearchID _tmp36_;
+			SearchCondition* _tmp37_;
 #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			_tmp30_ = _sc_index;
 #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -4269,9 +4269,9 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc
 
 
 void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) {
-	SavedSearchID _tmp0_ = {0};
-	SavedSearchID _tmp1_ = {0};
-	gint64 _tmp2_ = 0LL;
+	SavedSearchID _tmp0_;
+	SavedSearchID _tmp1_;
+	gint64 _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 582 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
@@ -4332,30 +4332,30 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe
 	SavedSearchRow* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	SavedSearchID _tmp5_ = {0};
-	gint64 _tmp6_ = 0LL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	SavedSearchID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 	SavedSearchRow* row = NULL;
-	SavedSearchRow* _tmp14_ = NULL;
-	SavedSearchRow* _tmp15_ = NULL;
-	SavedSearchID _tmp16_ = {0};
-	SavedSearchRow* _tmp17_ = NULL;
-	sqlite3_stmt* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	SavedSearchRow* _tmp21_ = NULL;
-	sqlite3_stmt* _tmp22_ = NULL;
-	const gchar* _tmp23_ = NULL;
-	SearchOperator _tmp24_ = 0;
+	SavedSearchRow* _tmp14_;
+	SavedSearchRow* _tmp15_;
+	SavedSearchID _tmp16_;
+	SavedSearchRow* _tmp17_;
+	sqlite3_stmt* _tmp18_;
+	const gchar* _tmp19_;
+	gchar* _tmp20_;
+	SavedSearchRow* _tmp21_;
+	sqlite3_stmt* _tmp22_;
+	const gchar* _tmp23_;
+	SearchOperator _tmp24_;
 	GError * _inner_error_ = NULL;
 #line 587 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL);
@@ -4407,13 +4407,13 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe
 		return result;
 #line 4404 "SavedSearchDBTable.c"
 	} else {
-		gint _tmp12_ = 0;
+		gint _tmp12_;
 #line 599 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp12_ = res;
 #line 599 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		if (_tmp12_ != SQLITE_ROW) {
 #line 4411 "SavedSearchDBTable.c"
-			gint _tmp13_ = 0;
+			gint _tmp13_;
 #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			_tmp13_ = res;
 #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -4489,12 +4489,12 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError**
 	GeeList* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	GeeList* rows = NULL;
-	GeeArrayList* _tmp4_ = NULL;
+	GeeArrayList* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 610 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL);
@@ -4524,30 +4524,30 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError**
 #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 4522 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp6_ = NULL;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
+			sqlite3_stmt* _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 			SavedSearchRow* row = NULL;
-			SavedSearchRow* _tmp11_ = NULL;
-			SavedSearchRow* _tmp12_ = NULL;
-			sqlite3_stmt* _tmp13_ = NULL;
-			gint64 _tmp14_ = 0LL;
-			SavedSearchRow* _tmp15_ = NULL;
-			sqlite3_stmt* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
-			SavedSearchRow* _tmp19_ = NULL;
-			sqlite3_stmt* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
-			SearchOperator _tmp22_ = 0;
+			SavedSearchRow* _tmp11_;
+			SavedSearchRow* _tmp12_;
+			sqlite3_stmt* _tmp13_;
+			gint64 _tmp14_;
+			SavedSearchRow* _tmp15_;
+			sqlite3_stmt* _tmp16_;
+			const gchar* _tmp17_;
+			gchar* _tmp18_;
+			SavedSearchRow* _tmp19_;
+			sqlite3_stmt* _tmp20_;
+			const gchar* _tmp21_;
+			SearchOperator _tmp22_;
 			GeeList* _tmp23_ = NULL;
-			SavedSearchRow* _tmp24_ = NULL;
-			SavedSearchID _tmp25_ = {0};
-			GeeList* _tmp26_ = NULL;
-			SavedSearchRow* _tmp27_ = NULL;
-			GeeList* _tmp28_ = NULL;
-			GeeList* _tmp29_ = NULL;
-			SavedSearchRow* _tmp30_ = NULL;
+			SavedSearchRow* _tmp24_;
+			SavedSearchID _tmp25_;
+			GeeList* _tmp26_;
+			SavedSearchRow* _tmp27_;
+			GeeList* _tmp28_;
+			GeeList* _tmp29_;
+			SavedSearchRow* _tmp30_;
 #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (!_tmp5_) {
 #line 4549 "SavedSearchDBTable.c"
@@ -4568,13 +4568,13 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError**
 				break;
 #line 4565 "SavedSearchDBTable.c"
 			} else {
-				gint _tmp9_ = 0;
+				gint _tmp9_;
 #line 622 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp9_ = res;
 #line 622 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (_tmp9_ != SQLITE_ROW) {
 #line 4572 "SavedSearchDBTable.c"
-					gint _tmp10_ = 0;
+					gint _tmp10_;
 #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp10_ = res;
 #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -4715,9 +4715,9 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError**
 
 
 void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* search_id, const gchar* new_name, GError** error) {
-	SavedSearchID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	const gchar* _tmp2_ = NULL;
+	SavedSearchID _tmp0_;
+	gint64 _tmp1_;
+	const gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 637 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
@@ -4768,7 +4768,7 @@ static void saved_search_db_table_instance_init (SavedSearchDBTable * self) {
 }
 
 
-static void saved_search_db_table_finalize (DatabaseTable* obj) {
+static void saved_search_db_table_finalize (DatabaseTable * obj) {
 	SavedSearchDBTable * self;
 #line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_DB_TABLE, SavedSearchDBTable);
diff --git a/src/db/TagTable.c b/src/db/TagTable.c
index e0aa0b1..986af84 100644
--- a/src/db/TagTable.c
+++ b/src/db/TagTable.c
@@ -1,4 +1,4 @@
-/* TagTable.c generated by valac 0.34.7, the Vala compiler
+/* TagTable.c generated by valac 0.36.6, the Vala compiler
  * generated from TagTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -152,7 +152,7 @@ enum  {
 };
 TagRow* tag_row_new (void);
 TagRow* tag_row_construct (GType object_type);
-static void tag_row_finalize (TagRow* obj);
+static void tag_row_finalize (TagRow * obj);
 gpointer database_table_ref (gpointer instance);
 void database_table_unref (gpointer instance);
 GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -183,7 +183,7 @@ static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* sou
 void tag_table_remove (TagTable* self, TagID* tag_id, GError** error);
 void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error);
 gchar* tag_table_get_name (TagTable* self, TagID* tag_id, GError** error);
-gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt** stmt);
+gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt);
 TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error);
 static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* text_list);
 void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error);
@@ -195,14 +195,14 @@ void photo_id_free (PhotoID* self);
 gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id);
 gint64 parse_int64 (const gchar* str, gint num_base);
 void photo_id_init (PhotoID *self, gint64 id);
-static void tag_table_finalize (DatabaseTable* obj);
+static void tag_table_finalize (DatabaseTable * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
 
 
 void tag_id_init (TagID *self, gint64 id) {
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	memset (self, 0, sizeof (TagID));
 #line 13 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -215,7 +215,7 @@ void tag_id_init (TagID *self, gint64 id) {
 
 gboolean tag_id_is_invalid (TagID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 17 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	_tmp0_ = (*self).id;
 #line 17 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -228,7 +228,7 @@ gboolean tag_id_is_invalid (TagID *self) {
 
 gboolean tag_id_is_valid (TagID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	_tmp0_ = (*self).id;
 #line 21 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -328,7 +328,7 @@ static gchar* value_tag_row_collect_value (GValue* value, guint n_collect_values
 #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	if (collect_values[0].v_pointer) {
 #line 331 "TagTable.c"
-		TagRow* object;
+		TagRow * object;
 		object = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -355,7 +355,7 @@ static gchar* value_tag_row_collect_value (GValue* value, guint n_collect_values
 
 
 static gchar* value_tag_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	TagRow** object_p;
+	TagRow ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	if (!object_p) {
@@ -407,7 +407,7 @@ gpointer value_get_tag_row (const GValue* value) {
 
 
 void value_set_tag_row (GValue* value, gpointer v_object) {
-	TagRow* old;
+	TagRow * old;
 #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TAG_ROW));
 #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -438,7 +438,7 @@ void value_set_tag_row (GValue* value, gpointer v_object) {
 
 
 void value_take_tag_row (GValue* value, gpointer v_object) {
-	TagRow* old;
+	TagRow * old;
 #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TAG_ROW));
 #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -482,7 +482,7 @@ static void tag_row_instance_init (TagRow * self) {
 }
 
 
-static void tag_row_finalize (TagRow* obj) {
+static void tag_row_finalize (TagRow * obj) {
 	TagRow * self;
 #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TAG_ROW, TagRow);
@@ -511,7 +511,7 @@ GType tag_row_get_type (void) {
 
 
 gpointer tag_row_ref (gpointer instance) {
-	TagRow* self;
+	TagRow * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -522,7 +522,7 @@ gpointer tag_row_ref (gpointer instance) {
 
 
 void tag_row_unref (gpointer instance) {
-	TagRow* self;
+	TagRow * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -539,13 +539,13 @@ static TagTable* tag_table_construct (GType object_type) {
 	TagTable* self = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 #line 35 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	self = (TagTable*) database_table_construct (object_type);
 #line 36 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -575,7 +575,7 @@ static TagTable* tag_table_construct (GType object_type) {
 #line 50 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
 #line 578 "TagTable.c"
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 51 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		_tmp7_ = res;
 #line 51 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -606,15 +606,15 @@ static gpointer _database_table_ref0 (gpointer self) {
 
 TagTable* tag_table_get_instance (void) {
 	TagTable* result = NULL;
-	TagTable* _tmp0_ = NULL;
-	TagTable* _tmp2_ = NULL;
-	TagTable* _tmp3_ = NULL;
+	TagTable* _tmp0_;
+	TagTable* _tmp2_;
+	TagTable* _tmp3_;
 #line 55 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	_tmp0_ = tag_table_instance;
 #line 55 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	if (_tmp0_ == NULL) {
 #line 617 "TagTable.c"
-		TagTable* _tmp1_ = NULL;
+		TagTable* _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		_tmp1_ = tag_table_new ();
 #line 56 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -644,137 +644,179 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 655 "TagTable.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 661 "TagTable.c"
+	} else {
+		const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 668 "TagTable.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = TRUE;
+#line 674 "TagTable.c"
+	} else {
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 684 "TagTable.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 688 "TagTable.c"
+		gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 696 "TagTable.c"
+	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GRegex* _tmp9_;
+		GRegex* _tmp10_;
+		gchar* _tmp11_ = NULL;
+		GRegex* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 686 "TagTable.c"
+#line 728 "TagTable.c"
 				goto __catch21_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 695 "TagTable.c"
+#line 737 "TagTable.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 711 "TagTable.c"
+#line 753 "TagTable.c"
 				goto __catch21_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 722 "TagTable.c"
+#line 764 "TagTable.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 736 "TagTable.c"
+#line 778 "TagTable.c"
 	}
 	goto __finally21;
 	__catch21_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 750 "TagTable.c"
+#line 792 "TagTable.c"
 	}
 	__finally21:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 761 "TagTable.c"
+#line 803 "TagTable.c"
 	}
 }
 
 
 void tag_table_upgrade_for_htags (void) {
 	TagTable* table = NULL;
-	TagTable* _tmp0_ = NULL;
+	TagTable* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 62 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	_tmp0_ = tag_table_get_instance ();
 #line 62 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	table = _tmp0_;
-#line 774 "TagTable.c"
+#line 816 "TagTable.c"
 	{
 		GeeList* rows = NULL;
-		TagTable* _tmp1_ = NULL;
-		GeeList* _tmp2_ = NULL;
+		TagTable* _tmp1_;
+		GeeList* _tmp2_;
 #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		_tmp1_ = table;
 #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -785,7 +827,7 @@ void tag_table_upgrade_for_htags (void) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 789 "TagTable.c"
+#line 831 "TagTable.c"
 				goto __catch20_database_error;
 			}
 #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -796,16 +838,16 @@ void tag_table_upgrade_for_htags (void) {
 			g_clear_error (&_inner_error_);
 #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			return;
-#line 800 "TagTable.c"
+#line 842 "TagTable.c"
 		}
 		{
 			GeeList* _row_list = NULL;
-			GeeList* _tmp3_ = NULL;
-			GeeList* _tmp4_ = NULL;
+			GeeList* _tmp3_;
+			GeeList* _tmp4_;
 			gint _row_size = 0;
-			GeeList* _tmp5_ = NULL;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
+			GeeList* _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
 			gint _row_index = 0;
 #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			_tmp3_ = rows;
@@ -825,23 +867,23 @@ void tag_table_upgrade_for_htags (void) {
 			_row_index = -1;
 #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			while (TRUE) {
-#line 829 "TagTable.c"
-				gint _tmp8_ = 0;
-				gint _tmp9_ = 0;
-				gint _tmp10_ = 0;
+#line 871 "TagTable.c"
+				gint _tmp8_;
+				gint _tmp9_;
+				gint _tmp10_;
 				TagRow* row = NULL;
-				GeeList* _tmp11_ = NULL;
-				gint _tmp12_ = 0;
-				gpointer _tmp13_ = NULL;
-				TagRow* _tmp14_ = NULL;
-				TagRow* _tmp15_ = NULL;
-				const gchar* _tmp16_ = NULL;
-				gchar* _tmp17_ = NULL;
-				TagTable* _tmp18_ = NULL;
-				TagRow* _tmp19_ = NULL;
-				TagID _tmp20_ = {0};
-				TagRow* _tmp21_ = NULL;
-				const gchar* _tmp22_ = NULL;
+				GeeList* _tmp11_;
+				gint _tmp12_;
+				gpointer _tmp13_;
+				TagRow* _tmp14_;
+				TagRow* _tmp15_;
+				const gchar* _tmp16_;
+				gchar* _tmp17_;
+				TagTable* _tmp18_;
+				TagRow* _tmp19_;
+				TagID _tmp20_;
+				TagRow* _tmp21_;
+				const gchar* _tmp22_;
 #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				_tmp8_ = _row_index;
 #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -854,7 +896,7 @@ void tag_table_upgrade_for_htags (void) {
 				if (!(_tmp9_ < _tmp10_)) {
 #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 					break;
-#line 858 "TagTable.c"
+#line 900 "TagTable.c"
 				}
 #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				_tmp11_ = _row_list;
@@ -898,7 +940,7 @@ void tag_table_upgrade_for_htags (void) {
 					_g_object_unref0 (rows);
 #line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 902 "TagTable.c"
+#line 944 "TagTable.c"
 						goto __catch20_database_error;
 					}
 #line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -915,25 +957,25 @@ void tag_table_upgrade_for_htags (void) {
 					g_clear_error (&_inner_error_);
 #line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 					return;
-#line 919 "TagTable.c"
+#line 961 "TagTable.c"
 				}
 #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				_tag_row_unref0 (row);
-#line 923 "TagTable.c"
+#line 965 "TagTable.c"
 			}
 #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			_g_object_unref0 (_row_list);
-#line 927 "TagTable.c"
+#line 969 "TagTable.c"
 		}
 #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		_g_object_unref0 (rows);
-#line 931 "TagTable.c"
+#line 973 "TagTable.c"
 	}
 	goto __finally20;
 	__catch20_database_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp23_ = NULL;
+		const gchar* _tmp23_;
 #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		e = _inner_error_;
 #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -945,7 +987,7 @@ void tag_table_upgrade_for_htags (void) {
 "ag support: %s", _tmp23_);
 #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		_g_error_free0 (e);
-#line 948 "TagTable.c"
+#line 990 "TagTable.c"
 	}
 	__finally20:
 #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -958,11 +1000,11 @@ void tag_table_upgrade_for_htags (void) {
 		g_clear_error (&_inner_error_);
 #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		return;
-#line 961 "TagTable.c"
+#line 1003 "TagTable.c"
 	}
 #line 61 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	_database_table_unref0 (table);
-#line 965 "TagTable.c"
+#line 1007 "TagTable.c"
 }
 
 
@@ -970,36 +1012,36 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) {
 	TagRow* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	time_t time_created = 0;
-	gulong _tmp4_ = 0UL;
-	sqlite3_stmt* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GDestroyNotify _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	sqlite3_stmt* _tmp11_ = NULL;
-	time_t _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	sqlite3_stmt* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
+	gulong _tmp4_;
+	sqlite3_stmt* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	GDestroyNotify _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	sqlite3_stmt* _tmp11_;
+	time_t _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	sqlite3_stmt* _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
 	TagRow* row = NULL;
-	TagRow* _tmp19_ = NULL;
-	TagRow* _tmp20_ = NULL;
-	sqlite3* _tmp21_ = NULL;
-	gint64 _tmp22_ = 0LL;
-	TagRow* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	TagRow* _tmp26_ = NULL;
-	TagRow* _tmp27_ = NULL;
-	time_t _tmp28_ = 0;
+	TagRow* _tmp19_;
+	TagRow* _tmp20_;
+	sqlite3* _tmp21_;
+	gint64 _tmp22_;
+	TagRow* _tmp23_;
+	const gchar* _tmp24_;
+	gchar* _tmp25_;
+	TagRow* _tmp26_;
+	TagRow* _tmp27_;
+	time_t _tmp28_;
 	GError * _inner_error_ = NULL;
 #line 76 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	g_return_val_if_fail (IS_TAG_TABLE (self), NULL);
@@ -1061,8 +1103,8 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) {
 	_tmp17_ = res;
 #line 90 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	if (_tmp17_ != SQLITE_DONE) {
-#line 1064 "TagTable.c"
-		gint _tmp18_ = 0;
+#line 1106 "TagTable.c"
+		gint _tmp18_;
 #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		_tmp18_ = res;
 #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -1077,7 +1119,7 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) {
 				_sqlite3_finalize0 (stmt);
 #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				return NULL;
-#line 1080 "TagTable.c"
+#line 1122 "TagTable.c"
 			} else {
 #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -1087,7 +1129,7 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) {
 				g_clear_error (&_inner_error_);
 #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				return NULL;
-#line 1090 "TagTable.c"
+#line 1132 "TagTable.c"
 			}
 		}
 	}
@@ -1131,41 +1173,41 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) {
 	_sqlite3_finalize0 (stmt);
 #line 99 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	return result;
-#line 1134 "TagTable.c"
+#line 1176 "TagTable.c"
 }
 
 
 void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GError** error) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	TagRow* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GDestroyNotify _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	sqlite3_stmt* _tmp11_ = NULL;
-	TagRow* _tmp12_ = NULL;
-	GeeSet* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	GDestroyNotify _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	sqlite3_stmt* _tmp18_ = NULL;
-	TagRow* _tmp19_ = NULL;
-	time_t _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	gint _tmp22_ = 0;
-	sqlite3_stmt* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	sqlite3* _tmp27_ = NULL;
-	gint64 _tmp28_ = 0LL;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	TagRow* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	GDestroyNotify _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	sqlite3_stmt* _tmp11_;
+	TagRow* _tmp12_;
+	GeeSet* _tmp13_;
+	gchar* _tmp14_;
+	GDestroyNotify _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	sqlite3_stmt* _tmp18_;
+	TagRow* _tmp19_;
+	time_t _tmp20_;
+	gint _tmp21_;
+	gint _tmp22_;
+	sqlite3_stmt* _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	sqlite3* _tmp27_;
+	gint64 _tmp28_;
 	TagID _tmp29_ = {0};
 	GError * _inner_error_ = NULL;
 #line 103 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -1247,8 +1289,8 @@ void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GErr
 	_tmp25_ = res;
 #line 117 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	if (_tmp25_ != SQLITE_DONE) {
-#line 1249 "TagTable.c"
-		gint _tmp26_ = 0;
+#line 1291 "TagTable.c"
+		gint _tmp26_;
 #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		_tmp26_ = res;
 #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -1263,7 +1305,7 @@ void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GErr
 				_sqlite3_finalize0 (stmt);
 #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				return;
-#line 1265 "TagTable.c"
+#line 1307 "TagTable.c"
 			} else {
 #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -1273,7 +1315,7 @@ void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GErr
 				g_clear_error (&_inner_error_);
 #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				return;
-#line 1275 "TagTable.c"
+#line 1317 "TagTable.c"
 			}
 		}
 	}
@@ -1289,13 +1331,13 @@ void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GErr
 	_sqlite3_finalize0 (stmt);
 #line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	return;
-#line 1291 "TagTable.c"
+#line 1333 "TagTable.c"
 }
 
 
 void tag_table_remove (TagTable* self, TagID* tag_id, GError** error) {
-	TagID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	TagID _tmp0_;
+	gint64 _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 123 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	g_return_if_fail (IS_TAG_TABLE (self));
@@ -1315,7 +1357,7 @@ void tag_table_remove (TagTable* self, TagID* tag_id, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			return;
-#line 1317 "TagTable.c"
+#line 1359 "TagTable.c"
 		} else {
 #line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1323,7 +1365,7 @@ void tag_table_remove (TagTable* self, TagID* tag_id, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			return;
-#line 1325 "TagTable.c"
+#line 1367 "TagTable.c"
 		}
 	}
 }
@@ -1332,13 +1374,13 @@ void tag_table_remove (TagTable* self, TagID* tag_id, GError** error) {
 gchar* tag_table_get_name (TagTable* self, TagID* tag_id, GError** error) {
 	gchar* result = NULL;
 	sqlite3_stmt* stmt = NULL;
-	TagID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	TagID _tmp0_;
+	gint64 _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	sqlite3_stmt* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gboolean _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 127 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	g_return_val_if_fail (IS_TAG_TABLE (self), NULL);
 #line 127 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -1361,7 +1403,7 @@ gchar* tag_table_get_name (TagTable* self, TagID* tag_id, GError** error) {
 		_sqlite3_finalize0 (stmt);
 #line 130 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		return result;
-#line 1363 "TagTable.c"
+#line 1405 "TagTable.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	_tmp4_ = stmt;
@@ -1375,7 +1417,7 @@ gchar* tag_table_get_name (TagTable* self, TagID* tag_id, GError** error) {
 	_sqlite3_finalize0 (stmt);
 #line 132 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	return result;
-#line 1377 "TagTable.c"
+#line 1419 "TagTable.c"
 }
 
 
@@ -1383,33 +1425,33 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) {
 	TagRow* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	TagID _tmp5_ = {0};
-	gint64 _tmp6_ = 0LL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	TagID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 	TagRow* row = NULL;
-	TagRow* _tmp14_ = NULL;
-	TagRow* _tmp15_ = NULL;
-	TagID _tmp16_ = {0};
-	TagRow* _tmp17_ = NULL;
-	sqlite3_stmt* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	TagRow* _tmp21_ = NULL;
-	sqlite3_stmt* _tmp22_ = NULL;
-	const gchar* _tmp23_ = NULL;
-	GeeSet* _tmp24_ = NULL;
-	TagRow* _tmp25_ = NULL;
-	sqlite3_stmt* _tmp26_ = NULL;
-	gint64 _tmp27_ = 0LL;
+	TagRow* _tmp14_;
+	TagRow* _tmp15_;
+	TagID _tmp16_;
+	TagRow* _tmp17_;
+	sqlite3_stmt* _tmp18_;
+	const gchar* _tmp19_;
+	gchar* _tmp20_;
+	TagRow* _tmp21_;
+	sqlite3_stmt* _tmp22_;
+	const gchar* _tmp23_;
+	GeeSet* _tmp24_;
+	TagRow* _tmp25_;
+	sqlite3_stmt* _tmp26_;
+	gint64 _tmp27_;
 	GError * _inner_error_ = NULL;
 #line 135 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	g_return_val_if_fail (IS_TAG_TABLE (self), NULL);
@@ -1459,15 +1501,15 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) {
 		_sqlite3_finalize0 (stmt);
 #line 146 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		return result;
-#line 1461 "TagTable.c"
+#line 1503 "TagTable.c"
 	} else {
-		gint _tmp12_ = 0;
+		gint _tmp12_;
 #line 147 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		_tmp12_ = res;
 #line 147 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		if (_tmp12_ != SQLITE_ROW) {
-#line 1468 "TagTable.c"
-			gint _tmp13_ = 0;
+#line 1510 "TagTable.c"
+			gint _tmp13_;
 #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			_tmp13_ = res;
 #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -1482,7 +1524,7 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) {
 					_sqlite3_finalize0 (stmt);
 #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 					return NULL;
-#line 1484 "TagTable.c"
+#line 1526 "TagTable.c"
 				} else {
 #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 					_sqlite3_finalize0 (stmt);
@@ -1492,7 +1534,7 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) {
 					g_clear_error (&_inner_error_);
 #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 					return NULL;
-#line 1494 "TagTable.c"
+#line 1536 "TagTable.c"
 				}
 			}
 		}
@@ -1545,7 +1587,7 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) {
 	_sqlite3_finalize0 (stmt);
 #line 156 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	return result;
-#line 1547 "TagTable.c"
+#line 1589 "TagTable.c"
 }
 
 
@@ -1553,12 +1595,12 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) {
 	GeeList* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	GeeList* rows = NULL;
-	GeeArrayList* _tmp4_ = NULL;
+	GeeArrayList* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 159 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	g_return_val_if_fail (IS_TAG_TABLE (self), NULL);
@@ -1580,38 +1622,38 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) {
 	_tmp4_ = gee_array_list_new (TYPE_TAG_ROW, (GBoxedCopyFunc) tag_row_ref, (GDestroyNotify) tag_row_unref, NULL, NULL, NULL);
 #line 165 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	rows = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList);
-#line 1582 "TagTable.c"
+#line 1624 "TagTable.c"
 	{
 		gboolean _tmp5_ = FALSE;
 #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		_tmp5_ = TRUE;
 #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		while (TRUE) {
-#line 1589 "TagTable.c"
-			sqlite3_stmt* _tmp6_ = NULL;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
+#line 1631 "TagTable.c"
+			sqlite3_stmt* _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 			TagRow* row = NULL;
-			TagRow* _tmp11_ = NULL;
-			TagRow* _tmp12_ = NULL;
-			sqlite3_stmt* _tmp13_ = NULL;
-			gint64 _tmp14_ = 0LL;
-			TagRow* _tmp15_ = NULL;
-			sqlite3_stmt* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
-			TagRow* _tmp19_ = NULL;
-			sqlite3_stmt* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
-			GeeSet* _tmp22_ = NULL;
-			TagRow* _tmp23_ = NULL;
-			sqlite3_stmt* _tmp24_ = NULL;
-			gint64 _tmp25_ = 0LL;
-			GeeList* _tmp26_ = NULL;
-			TagRow* _tmp27_ = NULL;
+			TagRow* _tmp11_;
+			TagRow* _tmp12_;
+			sqlite3_stmt* _tmp13_;
+			gint64 _tmp14_;
+			TagRow* _tmp15_;
+			sqlite3_stmt* _tmp16_;
+			const gchar* _tmp17_;
+			gchar* _tmp18_;
+			TagRow* _tmp19_;
+			sqlite3_stmt* _tmp20_;
+			const gchar* _tmp21_;
+			GeeSet* _tmp22_;
+			TagRow* _tmp23_;
+			sqlite3_stmt* _tmp24_;
+			gint64 _tmp25_;
+			GeeList* _tmp26_;
+			TagRow* _tmp27_;
 #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			if (!_tmp5_) {
-#line 1613 "TagTable.c"
+#line 1655 "TagTable.c"
 			}
 #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			_tmp5_ = FALSE;
@@ -1627,15 +1669,15 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) {
 			if (_tmp8_ == SQLITE_DONE) {
 #line 170 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				break;
-#line 1629 "TagTable.c"
+#line 1671 "TagTable.c"
 			} else {
-				gint _tmp9_ = 0;
+				gint _tmp9_;
 #line 171 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				_tmp9_ = res;
 #line 171 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				if (_tmp9_ != SQLITE_ROW) {
-#line 1636 "TagTable.c"
-					gint _tmp10_ = 0;
+#line 1678 "TagTable.c"
+					gint _tmp10_;
 #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 					_tmp10_ = res;
 #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -1652,7 +1694,7 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) {
 							_sqlite3_finalize0 (stmt);
 #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 							return NULL;
-#line 1654 "TagTable.c"
+#line 1696 "TagTable.c"
 						} else {
 #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 							_g_object_unref0 (rows);
@@ -1664,7 +1706,7 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) {
 							g_clear_error (&_inner_error_);
 #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 							return NULL;
-#line 1666 "TagTable.c"
+#line 1708 "TagTable.c"
 						}
 					}
 				}
@@ -1721,7 +1763,7 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) {
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_);
 #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			_tag_row_unref0 (row);
-#line 1723 "TagTable.c"
+#line 1765 "TagTable.c"
 		}
 	}
 #line 184 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -1730,14 +1772,14 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) {
 	_sqlite3_finalize0 (stmt);
 #line 184 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	return result;
-#line 1732 "TagTable.c"
+#line 1774 "TagTable.c"
 }
 
 
 void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GError** error) {
-	TagID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	const gchar* _tmp2_ = NULL;
+	TagID _tmp0_;
+	gint64 _tmp1_;
+	const gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 187 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	g_return_if_fail (IS_TAG_TABLE (self));
@@ -1761,7 +1803,7 @@ void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GEr
 			g_propagate_error (error, _inner_error_);
 #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			return;
-#line 1763 "TagTable.c"
+#line 1805 "TagTable.c"
 		} else {
 #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1769,7 +1811,7 @@ void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GEr
 			g_clear_error (&_inner_error_);
 #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			return;
-#line 1771 "TagTable.c"
+#line 1813 "TagTable.c"
 		}
 	}
 }
@@ -1778,24 +1820,24 @@ void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GEr
 void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* source_ids, GError** error) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	GeeCollection* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GDestroyNotify _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	sqlite3_stmt* _tmp10_ = NULL;
-	TagID _tmp11_ = {0};
-	gint64 _tmp12_ = 0LL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	sqlite3_stmt* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	GeeCollection* _tmp5_;
+	gchar* _tmp6_;
+	GDestroyNotify _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	TagID _tmp11_;
+	gint64 _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	sqlite3_stmt* _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
 	GError * _inner_error_ = NULL;
 #line 191 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	g_return_if_fail (IS_TAG_TABLE (self));
@@ -1857,8 +1899,8 @@ void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection*
 	_tmp17_ = res;
 #line 202 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	if (_tmp17_ != SQLITE_DONE) {
-#line 1859 "TagTable.c"
-		gint _tmp18_ = 0;
+#line 1901 "TagTable.c"
+		gint _tmp18_;
 #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		_tmp18_ = res;
 #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -1873,7 +1915,7 @@ void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection*
 				_sqlite3_finalize0 (stmt);
 #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				return;
-#line 1875 "TagTable.c"
+#line 1917 "TagTable.c"
 			} else {
 #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -1883,25 +1925,25 @@ void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection*
 				g_clear_error (&_inner_error_);
 #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				return;
-#line 1885 "TagTable.c"
+#line 1927 "TagTable.c"
 			}
 		}
 	}
 #line 191 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1891 "TagTable.c"
+#line 1933 "TagTable.c"
 }
 
 
 static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* source_ids) {
 	gchar* result = NULL;
-	GeeCollection* _tmp0_ = NULL;
+	GeeCollection* _tmp0_;
 	GString* _result_ = NULL;
-	GString* _tmp1_ = NULL;
+	GString* _tmp1_;
 	const gchar* _tmp11_ = NULL;
-	GString* _tmp12_ = NULL;
-	gssize _tmp13_ = 0L;
-	gchar* _tmp16_ = NULL;
+	GString* _tmp12_;
+	gssize _tmp13_;
+	gchar* _tmp16_;
 #line 206 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	g_return_val_if_fail (IS_TAG_TABLE (self), NULL);
 #line 206 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -1914,17 +1956,17 @@ static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* sou
 		result = NULL;
 #line 208 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		return result;
-#line 1916 "TagTable.c"
+#line 1958 "TagTable.c"
 	}
 #line 210 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	_tmp1_ = g_string_new ("");
 #line 210 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	_result_ = _tmp1_;
-#line 1922 "TagTable.c"
+#line 1964 "TagTable.c"
 	{
 		GeeIterator* _source_id_it = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeCollection* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		_tmp2_ = source_ids;
 #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -1933,15 +1975,15 @@ static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* sou
 		_source_id_it = _tmp3_;
 #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		while (TRUE) {
-#line 1935 "TagTable.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 1977 "TagTable.c"
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			gchar* source_id = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
-			GString* _tmp8_ = NULL;
-			const gchar* _tmp9_ = NULL;
-			GString* _tmp10_ = NULL;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			GString* _tmp8_;
+			const gchar* _tmp9_;
+			GString* _tmp10_;
 #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			_tmp4_ = _source_id_it;
 #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -1950,7 +1992,7 @@ static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* sou
 			if (!_tmp5_) {
 #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				break;
-#line 1952 "TagTable.c"
+#line 1994 "TagTable.c"
 			}
 #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			_tmp6_ = _source_id_it;
@@ -1970,11 +2012,11 @@ static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* sou
 			g_string_append (_tmp10_, ",");
 #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			_g_free0 (source_id);
-#line 1972 "TagTable.c"
+#line 2014 "TagTable.c"
 		}
 #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		_g_object_unref0 (_source_id_it);
-#line 1976 "TagTable.c"
+#line 2018 "TagTable.c"
 	}
 #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	_tmp12_ = _result_;
@@ -1982,20 +2024,20 @@ static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* sou
 	_tmp13_ = _tmp12_->len;
 #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	if (_tmp13_ != ((gssize) 0)) {
-#line 1984 "TagTable.c"
-		GString* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
+#line 2026 "TagTable.c"
+		GString* _tmp14_;
+		const gchar* _tmp15_;
 #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		_tmp14_ = _result_;
 #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		_tmp15_ = _tmp14_->str;
 #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		_tmp11_ = _tmp15_;
-#line 1993 "TagTable.c"
+#line 2035 "TagTable.c"
 	} else {
 #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		_tmp11_ = NULL;
-#line 1997 "TagTable.c"
+#line 2039 "TagTable.c"
 	}
 #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	_tmp16_ = g_strdup (_tmp11_);
@@ -2005,41 +2047,41 @@ static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* sou
 	_g_string_free0 (_result_);
 #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	return result;
-#line 2007 "TagTable.c"
+#line 2049 "TagTable.c"
 }
 
 
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_ = 0L;
-	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2025 "TagTable.c"
+#line 2067 "TagTable.c"
 }
 
 
 static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* text_list) {
 	GeeSet* result = NULL;
 	GeeSet* _result_ = NULL;
-	GeeHashSet* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	GeeHashSet* _tmp0_;
+	const gchar* _tmp1_;
 	gchar** split = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gint split_length1 = 0;
-	gint _split_size_ = 0;
-	gchar** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
+	const gchar* _tmp2_;
+	gchar** _tmp3_;
+	gchar** _tmp4_;
+	gint split_length1;
+	gint _split_size_;
+	gchar** _tmp5_;
+	gint _tmp5__length1;
 #line 220 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	g_return_val_if_fail (IS_TAG_TABLE (self), NULL);
 #line 221 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -2054,7 +2096,7 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te
 		result = _result_;
 #line 224 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		return result;
-#line 2056 "TagTable.c"
+#line 2098 "TagTable.c"
 	}
 #line 226 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	_tmp2_ = text_list;
@@ -2070,7 +2112,7 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te
 	_tmp5_ = split;
 #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	_tmp5__length1 = split_length1;
-#line 2072 "TagTable.c"
+#line 2114 "TagTable.c"
 	{
 		gchar** token_collection = NULL;
 		gint token_collection_length1 = 0;
@@ -2082,20 +2124,20 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te
 		token_collection_length1 = _tmp5__length1;
 #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 		for (token_it = 0; token_it < _tmp5__length1; token_it = token_it + 1) {
-#line 2084 "TagTable.c"
-			gchar* _tmp6_ = NULL;
+#line 2126 "TagTable.c"
+			gchar* _tmp6_;
 			gchar* token = NULL;
 #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			_tmp6_ = g_strdup (token_collection[token_it]);
 #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			token = _tmp6_;
-#line 2091 "TagTable.c"
+#line 2133 "TagTable.c"
 			{
-				const gchar* _tmp7_ = NULL;
-				gboolean _tmp8_ = FALSE;
-				const gchar* _tmp9_ = NULL;
-				gchar _tmp10_ = '\0';
-				gboolean _tmp11_ = FALSE;
+				const gchar* _tmp7_;
+				gboolean _tmp8_;
+				const gchar* _tmp9_;
+				gchar _tmp10_;
+				gboolean _tmp11_;
 #line 228 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				_tmp7_ = token;
 #line 228 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -2106,7 +2148,7 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te
 					_g_free0 (token);
 #line 229 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 					continue;
-#line 2108 "TagTable.c"
+#line 2150 "TagTable.c"
 				}
 #line 236 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				_tmp9_ = token;
@@ -2116,13 +2158,13 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te
 				_tmp11_ = g_ascii_isdigit (_tmp10_);
 #line 236 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				if (_tmp11_) {
-#line 2118 "TagTable.c"
-					GeeSet* _tmp12_ = NULL;
-					const gchar* _tmp13_ = NULL;
-					gint64 _tmp14_ = 0LL;
+#line 2160 "TagTable.c"
+					GeeSet* _tmp12_;
+					const gchar* _tmp13_;
+					gint64 _tmp14_;
 					PhotoID _tmp15_ = {0};
-					gchar* _tmp16_ = NULL;
-					gchar* _tmp17_ = NULL;
+					gchar* _tmp16_;
+					gchar* _tmp17_;
 #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 					_tmp12_ = _result_;
 #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -2139,11 +2181,11 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_);
 #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 					_g_free0 (_tmp17_);
-#line 2141 "TagTable.c"
+#line 2183 "TagTable.c"
 				} else {
-					const gchar* _tmp18_ = NULL;
-					gchar _tmp19_ = '\0';
-					gboolean _tmp20_ = FALSE;
+					const gchar* _tmp18_;
+					gchar _tmp19_;
+					gboolean _tmp20_;
 #line 239 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 					_tmp18_ = token;
 #line 239 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -2152,21 +2194,21 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te
 					_tmp20_ = g_ascii_isalpha (_tmp19_);
 #line 239 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 					if (_tmp20_) {
-#line 2154 "TagTable.c"
-						GeeSet* _tmp21_ = NULL;
-						const gchar* _tmp22_ = NULL;
+#line 2196 "TagTable.c"
+						GeeSet* _tmp21_;
+						const gchar* _tmp22_;
 #line 241 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 						_tmp21_ = _result_;
 #line 241 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 						_tmp22_ = token;
 #line 241 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), _tmp22_);
-#line 2163 "TagTable.c"
+#line 2205 "TagTable.c"
 					}
 				}
 #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 				_g_free0 (token);
-#line 2168 "TagTable.c"
+#line 2210 "TagTable.c"
 			}
 		}
 	}
@@ -2176,7 +2218,7 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te
 	split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
 #line 245 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	return result;
-#line 2178 "TagTable.c"
+#line 2220 "TagTable.c"
 }
 
 
@@ -2185,7 +2227,7 @@ static void tag_table_class_init (TagTableClass * klass) {
 	tag_table_parent_class = g_type_class_peek_parent (klass);
 #line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	((DatabaseTableClass *) klass)->finalize = tag_table_finalize;
-#line 2187 "TagTable.c"
+#line 2229 "TagTable.c"
 }
 
 
@@ -2193,13 +2235,13 @@ static void tag_table_instance_init (TagTable * self) {
 }
 
 
-static void tag_table_finalize (DatabaseTable* obj) {
+static void tag_table_finalize (DatabaseTable * obj) {
 	TagTable * self;
 #line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TAG_TABLE, TagTable);
 #line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	DATABASE_TABLE_CLASS (tag_table_parent_class)->finalize (obj);
-#line 2201 "TagTable.c"
+#line 2243 "TagTable.c"
 }
 
 
diff --git a/src/db/TombstoneTable.c b/src/db/TombstoneTable.c
index 5897398..8c9400e 100644
--- a/src/db/TombstoneTable.c
+++ b/src/db/TombstoneTable.c
@@ -1,4 +1,4 @@
-/* TombstoneTable.c generated by valac 0.34.7, the Vala compiler
+/* TombstoneTable.c generated by valac 0.36.6, the Vala compiler
  * generated from TombstoneTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -150,7 +150,7 @@ enum  {
 };
 TombstoneRow* tombstone_row_new (void);
 TombstoneRow* tombstone_row_construct (GType object_type);
-static void tombstone_row_finalize (TombstoneRow* obj);
+static void tombstone_row_finalize (TombstoneRow * obj);
 gpointer database_table_ref (gpointer instance);
 void database_table_unref (gpointer instance);
 GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -180,13 +180,13 @@ void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_i
 void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error);
 void tombstone_table_remove (TombstoneTable* self, TombstoneID* tombstone_id, GError** error);
 void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error);
-static void tombstone_table_finalize (DatabaseTable* obj);
+static void tombstone_table_finalize (DatabaseTable * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
 void tombstone_id_init (TombstoneID *self, gint64 id) {
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	memset (self, 0, sizeof (TombstoneID));
 #line 13 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
@@ -199,7 +199,7 @@ void tombstone_id_init (TombstoneID *self, gint64 id) {
 
 gboolean tombstone_id_is_invalid (TombstoneID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 17 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	_tmp0_ = (*self).id;
 #line 17 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
@@ -212,7 +212,7 @@ gboolean tombstone_id_is_invalid (TombstoneID *self) {
 
 gboolean tombstone_id_is_valid (TombstoneID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	_tmp0_ = (*self).id;
 #line 21 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
@@ -312,7 +312,7 @@ static gchar* value_tombstone_row_collect_value (GValue* value, guint n_collect_
 #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	if (collect_values[0].v_pointer) {
 #line 315 "TombstoneTable.c"
-		TombstoneRow* object;
+		TombstoneRow * object;
 		object = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -339,7 +339,7 @@ static gchar* value_tombstone_row_collect_value (GValue* value, guint n_collect_
 
 
 static gchar* value_tombstone_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	TombstoneRow** object_p;
+	TombstoneRow ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	if (!object_p) {
@@ -391,7 +391,7 @@ gpointer value_get_tombstone_row (const GValue* value) {
 
 
 void value_set_tombstone_row (GValue* value, gpointer v_object) {
-	TombstoneRow* old;
+	TombstoneRow * old;
 #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONE_ROW));
 #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
@@ -422,7 +422,7 @@ void value_set_tombstone_row (GValue* value, gpointer v_object) {
 
 
 void value_take_tombstone_row (GValue* value, gpointer v_object) {
-	TombstoneRow* old;
+	TombstoneRow * old;
 #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONE_ROW));
 #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
@@ -466,7 +466,7 @@ static void tombstone_row_instance_init (TombstoneRow * self) {
 }
 
 
-static void tombstone_row_finalize (TombstoneRow* obj) {
+static void tombstone_row_finalize (TombstoneRow * obj) {
 	TombstoneRow * self;
 #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE_ROW, TombstoneRow);
@@ -495,7 +495,7 @@ GType tombstone_row_get_type (void) {
 
 
 gpointer tombstone_row_ref (gpointer instance) {
-	TombstoneRow* self;
+	TombstoneRow * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -506,7 +506,7 @@ gpointer tombstone_row_ref (gpointer instance) {
 
 
 void tombstone_row_unref (gpointer instance) {
-	TombstoneRow* self;
+	TombstoneRow * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -523,13 +523,13 @@ static TombstoneTable* tombstone_table_construct (GType object_type) {
 	TombstoneTable* self = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 #line 37 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	self = (TombstoneTable*) database_table_construct (object_type);
 #line 38 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
@@ -559,7 +559,7 @@ static TombstoneTable* tombstone_table_construct (GType object_type) {
 #line 54 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
 #line 562 "TombstoneTable.c"
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 55 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 		_tmp7_ = res;
 #line 55 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
@@ -590,15 +590,15 @@ static gpointer _database_table_ref0 (gpointer self) {
 
 TombstoneTable* tombstone_table_get_instance (void) {
 	TombstoneTable* result = NULL;
-	TombstoneTable* _tmp0_ = NULL;
-	TombstoneTable* _tmp2_ = NULL;
-	TombstoneTable* _tmp3_ = NULL;
+	TombstoneTable* _tmp0_;
+	TombstoneTable* _tmp2_;
+	TombstoneTable* _tmp3_;
 #line 59 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	_tmp0_ = tombstone_table_instance;
 #line 59 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	if (_tmp0_ == NULL) {
 #line 601 "TombstoneTable.c"
-		TombstoneTable* _tmp1_ = NULL;
+		TombstoneTable* _tmp1_;
 #line 60 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 		_tmp1_ = tombstone_table_new ();
 #line 60 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
@@ -623,57 +623,57 @@ TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath,
 	TombstoneRow* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	time_t time_created = 0;
-	gulong _tmp4_ = 0UL;
-	sqlite3_stmt* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GDestroyNotify _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	sqlite3_stmt* _tmp11_ = NULL;
-	gint64 _tmp12_ = 0LL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	sqlite3_stmt* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	GDestroyNotify _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	sqlite3_stmt* _tmp21_ = NULL;
-	time_t _tmp22_ = 0;
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	sqlite3_stmt* _tmp25_ = NULL;
-	TombstoneReason _tmp26_ = 0;
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	sqlite3_stmt* _tmp30_ = NULL;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
+	gulong _tmp4_;
+	sqlite3_stmt* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	GDestroyNotify _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	sqlite3_stmt* _tmp11_;
+	gint64 _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	sqlite3_stmt* _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
+	GDestroyNotify _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
+	sqlite3_stmt* _tmp21_;
+	time_t _tmp22_;
+	gint _tmp23_;
+	gint _tmp24_;
+	sqlite3_stmt* _tmp25_;
+	TombstoneReason _tmp26_;
+	gint _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
+	sqlite3_stmt* _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
 	TombstoneRow* row = NULL;
-	TombstoneRow* _tmp34_ = NULL;
-	TombstoneRow* _tmp35_ = NULL;
-	sqlite3* _tmp36_ = NULL;
-	gint64 _tmp37_ = 0LL;
-	TombstoneRow* _tmp38_ = NULL;
-	const gchar* _tmp39_ = NULL;
-	gchar* _tmp40_ = NULL;
-	TombstoneRow* _tmp41_ = NULL;
-	gint64 _tmp42_ = 0LL;
-	TombstoneRow* _tmp43_ = NULL;
-	const gchar* _tmp44_ = NULL;
-	gchar* _tmp45_ = NULL;
-	TombstoneRow* _tmp46_ = NULL;
-	time_t _tmp47_ = 0;
-	TombstoneRow* _tmp48_ = NULL;
-	TombstoneReason _tmp49_ = 0;
+	TombstoneRow* _tmp34_;
+	TombstoneRow* _tmp35_;
+	sqlite3* _tmp36_;
+	gint64 _tmp37_;
+	TombstoneRow* _tmp38_;
+	const gchar* _tmp39_;
+	gchar* _tmp40_;
+	TombstoneRow* _tmp41_;
+	gint64 _tmp42_;
+	TombstoneRow* _tmp43_;
+	const gchar* _tmp44_;
+	gchar* _tmp45_;
+	TombstoneRow* _tmp46_;
+	time_t _tmp47_;
+	TombstoneRow* _tmp48_;
+	TombstoneReason _tmp49_;
 	GError * _inner_error_ = NULL;
 #line 65 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	g_return_val_if_fail (IS_TOMBSTONE_TABLE (self), NULL);
@@ -778,7 +778,7 @@ TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath,
 #line 88 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	if (_tmp32_ != SQLITE_DONE) {
 #line 781 "TombstoneTable.c"
-		gint _tmp33_ = 0;
+		gint _tmp33_;
 #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 		_tmp33_ = res;
 #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
@@ -877,24 +877,24 @@ static gpointer _tombstone_row_ref0 (gpointer self) {
 TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_length1, GError** error) {
 	TombstoneRow** result = NULL;
 	gint row_count = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp3_ = NULL;
+	sqlite3* _tmp3_;
 	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gint _tmp5_;
+	gint _tmp6_;
 	TombstoneRow** rows = NULL;
-	gint _tmp7_ = 0;
-	TombstoneRow** _tmp8_ = NULL;
-	gint rows_length1 = 0;
-	gint _rows_size_ = 0;
+	gint _tmp7_;
+	TombstoneRow** _tmp8_;
+	gint rows_length1;
+	gint _rows_size_;
 	gint index = 0;
-	gint _tmp42_ = 0;
-	gint _tmp43_ = 0;
-	TombstoneRow** _tmp44_ = NULL;
-	gint _tmp44__length1 = 0;
+	gint _tmp42_;
+	gint _tmp43_;
+	TombstoneRow** _tmp44_;
+	gint _tmp44__length1;
 	GError * _inner_error_ = NULL;
 #line 102 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	g_return_val_if_fail (IS_TOMBSTONE_TABLE (self), NULL);
@@ -907,8 +907,8 @@ TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_leng
 #line 104 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	if (_tmp1_ == 0) {
 #line 910 "TombstoneTable.c"
-		TombstoneRow** _tmp2_ = NULL;
-		gint _tmp2__length1 = 0;
+		TombstoneRow** _tmp2_;
+		gint _tmp2__length1;
 #line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 		_tmp2_ = NULL;
 #line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
@@ -959,38 +959,38 @@ TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_leng
 #line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 		while (TRUE) {
 #line 962 "TombstoneTable.c"
-			sqlite3_stmt* _tmp10_ = NULL;
-			gint _tmp11_ = 0;
-			gint _tmp12_ = 0;
+			sqlite3_stmt* _tmp10_;
+			gint _tmp11_;
+			gint _tmp12_;
 			TombstoneRow* row = NULL;
-			TombstoneRow* _tmp15_ = NULL;
-			TombstoneRow* _tmp16_ = NULL;
-			sqlite3_stmt* _tmp17_ = NULL;
-			gint64 _tmp18_ = 0LL;
-			TombstoneRow* _tmp19_ = NULL;
-			sqlite3_stmt* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
-			gchar* _tmp22_ = NULL;
-			TombstoneRow* _tmp23_ = NULL;
-			sqlite3_stmt* _tmp24_ = NULL;
-			gint64 _tmp25_ = 0LL;
-			TombstoneRow* _tmp26_ = NULL;
-			sqlite3_stmt* _tmp27_ = NULL;
-			const gchar* _tmp28_ = NULL;
-			gchar* _tmp29_ = NULL;
-			TombstoneRow* _tmp30_ = NULL;
-			sqlite3_stmt* _tmp31_ = NULL;
-			gint64 _tmp32_ = 0LL;
-			TombstoneRow* _tmp33_ = NULL;
-			sqlite3_stmt* _tmp34_ = NULL;
-			gint _tmp35_ = 0;
-			TombstoneReason _tmp36_ = 0;
-			TombstoneRow** _tmp37_ = NULL;
-			gint _tmp37__length1 = 0;
-			gint _tmp38_ = 0;
-			TombstoneRow* _tmp39_ = NULL;
-			TombstoneRow* _tmp40_ = NULL;
-			TombstoneRow* _tmp41_ = NULL;
+			TombstoneRow* _tmp15_;
+			TombstoneRow* _tmp16_;
+			sqlite3_stmt* _tmp17_;
+			gint64 _tmp18_;
+			TombstoneRow* _tmp19_;
+			sqlite3_stmt* _tmp20_;
+			const gchar* _tmp21_;
+			gchar* _tmp22_;
+			TombstoneRow* _tmp23_;
+			sqlite3_stmt* _tmp24_;
+			gint64 _tmp25_;
+			TombstoneRow* _tmp26_;
+			sqlite3_stmt* _tmp27_;
+			const gchar* _tmp28_;
+			gchar* _tmp29_;
+			TombstoneRow* _tmp30_;
+			sqlite3_stmt* _tmp31_;
+			gint64 _tmp32_;
+			TombstoneRow* _tmp33_;
+			sqlite3_stmt* _tmp34_;
+			gint _tmp35_;
+			TombstoneReason _tmp36_;
+			TombstoneRow** _tmp37_;
+			gint _tmp37__length1;
+			gint _tmp38_;
+			TombstoneRow* _tmp39_;
+			TombstoneRow* _tmp40_;
+			TombstoneRow* _tmp41_;
 #line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 			if (!_tmp9_) {
 #line 997 "TombstoneTable.c"
@@ -1011,13 +1011,13 @@ TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_leng
 				break;
 #line 1013 "TombstoneTable.c"
 			} else {
-				gint _tmp13_ = 0;
+				gint _tmp13_;
 #line 119 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 				_tmp13_ = res;
 #line 119 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 				if (_tmp13_ != SQLITE_ROW) {
 #line 1020 "TombstoneTable.c"
-					gint _tmp14_ = 0;
+					gint _tmp14_;
 #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 					_tmp14_ = res;
 #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
@@ -1163,9 +1163,9 @@ TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_leng
 
 
 void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_id, const gchar* filepath, GError** error) {
-	TombstoneID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	const gchar* _tmp2_ = NULL;
+	TombstoneID _tmp0_;
+	gint64 _tmp1_;
+	const gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 138 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	g_return_if_fail (IS_TOMBSTONE_TABLE (self));
@@ -1204,8 +1204,8 @@ void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_i
 
 
 void tombstone_table_remove (TombstoneTable* self, TombstoneID* tombstone_id, GError** error) {
-	TombstoneID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	TombstoneID _tmp0_;
+	gint64 _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 142 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	g_return_if_fail (IS_TOMBSTONE_TABLE (self));
@@ -1252,7 +1252,7 @@ static void tombstone_table_instance_init (TombstoneTable * self) {
 }
 
 
-static void tombstone_table_finalize (DatabaseTable* obj) {
+static void tombstone_table_finalize (DatabaseTable * obj) {
 	TombstoneTable * self;
 #line 34 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE_TABLE, TombstoneTable);
diff --git a/src/db/VersionTable.c b/src/db/VersionTable.c
index e678847..4505a6f 100644
--- a/src/db/VersionTable.c
+++ b/src/db/VersionTable.c
@@ -1,4 +1,4 @@
-/* VersionTable.c generated by valac 0.34.7, the Vala compiler
+/* VersionTable.c generated by valac 0.36.6, the Vala compiler
  * generated from VersionTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -87,23 +87,23 @@ DatabaseTable* database_table_construct (GType object_type);
 void database_table_fatal (const gchar* op, gint res);
 void database_table_set_table_name (DatabaseTable* self, const gchar* table_name);
 VersionTable* version_table_get_instance (void);
-gint version_table_get_version (VersionTable* self, gchar** app_version);
+gint version_table_get_version (VersionTable* self, gchar* * app_version);
 void version_table_set_version (VersionTable* self, gint version, const gchar* app_version, const gchar* user_data);
 void version_table_update_version (VersionTable* self, gint version, const gchar* app_version);
-static void version_table_finalize (DatabaseTable* obj);
+static void version_table_finalize (DatabaseTable * obj);
 
 
 static VersionTable* version_table_construct (GType object_type) {
 	VersionTable* self = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 #line 10 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	self = (VersionTable*) database_table_construct (object_type);
 #line 12 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -131,7 +131,7 @@ static VersionTable* version_table_construct (GType object_type) {
 #line 21 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
 #line 134 "VersionTable.c"
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 22 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 		_tmp7_ = res;
 #line 22 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -164,15 +164,15 @@ static gpointer _database_table_ref0 (gpointer self) {
 
 VersionTable* version_table_get_instance (void) {
 	VersionTable* result = NULL;
-	VersionTable* _tmp0_ = NULL;
-	VersionTable* _tmp2_ = NULL;
-	VersionTable* _tmp3_ = NULL;
+	VersionTable* _tmp0_;
+	VersionTable* _tmp2_;
+	VersionTable* _tmp3_;
 #line 28 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	_tmp0_ = version_table_instance;
 #line 28 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	if (_tmp0_ == NULL) {
 #line 175 "VersionTable.c"
-		VersionTable* _tmp1_ = NULL;
+		VersionTable* _tmp1_;
 #line 29 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 		_tmp1_ = version_table_new ();
 #line 29 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -193,23 +193,23 @@ VersionTable* version_table_get_instance (void) {
 }
 
 
-gint version_table_get_version (VersionTable* self, gchar** app_version) {
+gint version_table_get_version (VersionTable* self, gchar* * app_version) {
 	gchar* _vala_app_version = NULL;
 	gint result = 0;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	sqlite3_stmt* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	sqlite3_stmt* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	sqlite3_stmt* _tmp9_;
+	const gchar* _tmp10_;
+	gchar* _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	gint _tmp13_;
 #line 34 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	g_return_val_if_fail (IS_VERSION_TABLE (self), 0);
 #line 36 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -238,13 +238,13 @@ gint version_table_get_version (VersionTable* self, gchar** app_version) {
 #line 41 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	if (_tmp6_ != SQLITE_ROW) {
 #line 240 "VersionTable.c"
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 42 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 		_tmp7_ = res;
 #line 42 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 		if (_tmp7_ != SQLITE_DONE) {
 #line 246 "VersionTable.c"
-			gint _tmp8_ = 0;
+			gint _tmp8_;
 #line 43 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 			_tmp8_ = res;
 #line 43 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -311,27 +311,27 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a
 	sqlite3_stmt* stmt = NULL;
 	gchar* bitbucket = NULL;
 	gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 	gint res = 0;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	sqlite3_stmt* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	GDestroyNotify _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	sqlite3_stmt* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-	GDestroyNotify _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	sqlite3_stmt* _tmp26_ = NULL;
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	sqlite3_stmt* _tmp14_;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
+	GDestroyNotify _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	sqlite3_stmt* _tmp20_;
+	const gchar* _tmp21_;
+	gchar* _tmp22_;
+	GDestroyNotify _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	sqlite3_stmt* _tmp26_;
+	gint _tmp27_;
+	gint _tmp28_;
 #line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	g_return_if_fail (IS_VERSION_TABLE (self));
 #line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -346,10 +346,10 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a
 	if (_tmp1_ != -1) {
 #line 347 "VersionTable.c"
 		gint res = 0;
-		sqlite3* _tmp2_ = NULL;
+		sqlite3* _tmp2_;
 		sqlite3_stmt* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+		gint _tmp4_;
+		gint _tmp5_;
 #line 61 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 		_tmp2_ = database_table_db;
 #line 61 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -367,10 +367,10 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a
 #line 367 "VersionTable.c"
 	} else {
 		gint res = 0;
-		sqlite3* _tmp6_ = NULL;
+		sqlite3* _tmp6_;
 		sqlite3_stmt* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
+		gint _tmp8_;
+		gint _tmp9_;
 #line 66 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 		_tmp6_ = database_table_db;
 #line 66 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -443,12 +443,12 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a
 #line 79 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	if (_tmp28_ != SQLITE_DONE) {
 #line 444 "VersionTable.c"
-		gint _tmp29_ = 0;
-		const gchar* _tmp30_ = NULL;
-		const gchar* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
-		gchar* _tmp33_ = NULL;
-		gint _tmp34_ = 0;
+		gint _tmp29_;
+		const gchar* _tmp30_;
+		const gchar* _tmp31_;
+		gchar* _tmp32_;
+		gchar* _tmp33_;
+		gint _tmp34_;
 #line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 		_tmp29_ = version;
 #line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -478,23 +478,23 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a
 void version_table_update_version (VersionTable* self, gint version, const gchar* app_version) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	sqlite3_stmt* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	GDestroyNotify _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	sqlite3_stmt* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	sqlite3_stmt* _tmp8_;
+	const gchar* _tmp9_;
+	gchar* _tmp10_;
+	GDestroyNotify _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	sqlite3_stmt* _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
 #line 83 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	g_return_if_fail (IS_VERSION_TABLE (self));
 #line 83 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -552,10 +552,10 @@ void version_table_update_version (VersionTable* self, gint version, const gchar
 #line 94 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	if (_tmp16_ != SQLITE_DONE) {
 #line 553 "VersionTable.c"
-		gint _tmp17_ = 0;
-		gchar* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
+		gint _tmp17_;
+		gchar* _tmp18_;
+		gchar* _tmp19_;
+		gint _tmp20_;
 #line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 		_tmp17_ = version;
 #line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -589,7 +589,7 @@ static void version_table_instance_init (VersionTable * self) {
 }
 
 
-static void version_table_finalize (DatabaseTable* obj) {
+static void version_table_finalize (DatabaseTable * obj) {
 	VersionTable * self;
 #line 7 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VERSION_TABLE, VersionTable);
diff --git a/src/db/VideoTable.c b/src/db/VideoTable.c
index da6cbc7..69ca2ca 100644
--- a/src/db/VideoTable.c
+++ b/src/db/VideoTable.c
@@ -1,4 +1,4 @@
-/* VideoTable.c generated by valac 0.34.7, the Vala compiler
+/* VideoTable.c generated by valac 0.36.6, the Vala compiler
  * generated from VideoTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -198,7 +198,7 @@ enum  {
 };
 VideoRow* video_row_new (void);
 VideoRow* video_row_construct (GType object_type);
-static void video_row_finalize (VideoRow* obj);
+static void video_row_finalize (VideoRow * obj);
 gpointer database_table_ref (gpointer instance);
 void database_table_unref (gpointer instance);
 GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -248,14 +248,14 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error);
 static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* file, const gchar* md5);
 gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* md5);
 VideoID* video_table_get_duplicate_ids (VideoTable* self, GFile* file, const gchar* md5, int* result_length1);
-static void _vala_array_add3 (VideoID** array, int* length, int* size, const VideoID* value);
+static void _vala_array_add3 (VideoID* * array, int* length, int* size, const VideoID* value);
 GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event_id);
 void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t timestamp, GError** error);
-static void video_table_finalize (DatabaseTable* obj);
+static void video_table_finalize (DatabaseTable * obj);
 
 
 void video_id_init (VideoID *self, gint64 id) {
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	memset (self, 0, sizeof (VideoID));
 #line 13 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -268,7 +268,7 @@ void video_id_init (VideoID *self, gint64 id) {
 
 gboolean video_id_is_invalid (VideoID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 17 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	_tmp0_ = (*self).id;
 #line 17 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -281,7 +281,7 @@ gboolean video_id_is_invalid (VideoID *self) {
 
 gboolean video_id_is_valid (VideoID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	_tmp0_ = (*self).id;
 #line 21 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -294,9 +294,9 @@ gboolean video_id_is_valid (VideoID *self) {
 
 guint video_id_hash (VideoID* a) {
 	guint result = 0U;
-	VideoID* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-	guint _tmp2_ = 0U;
+	VideoID* _tmp0_;
+	gint64 _tmp1_;
+	guint _tmp2_;
 #line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	_tmp0_ = a;
 #line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -313,10 +313,10 @@ guint video_id_hash (VideoID* a) {
 
 gboolean video_id_equal (void* a, void* b) {
 	gboolean result = FALSE;
-	void* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-	void* _tmp2_ = NULL;
-	gint64 _tmp3_ = 0LL;
+	void* _tmp0_;
+	gint64 _tmp1_;
+	void* _tmp2_;
+	gint64 _tmp3_;
 #line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	_tmp0_ = a;
 #line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -335,9 +335,9 @@ gboolean video_id_equal (void* a, void* b) {
 
 gchar* video_id_upgrade_video_id_to_source_id (VideoID* video_id) {
 	gchar* result = NULL;
-	VideoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	gchar* _tmp2_ = NULL;
+	VideoID _tmp0_;
+	gint64 _tmp1_;
+	gchar* _tmp2_;
 #line 32 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (video_id != NULL, NULL);
 #line 33 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -443,7 +443,7 @@ static gchar* value_video_row_collect_value (GValue* value, guint n_collect_valu
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (collect_values[0].v_pointer) {
 #line 446 "VideoTable.c"
-		VideoRow* object;
+		VideoRow * object;
 		object = collect_values[0].v_pointer;
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -470,7 +470,7 @@ static gchar* value_video_row_collect_value (GValue* value, guint n_collect_valu
 
 
 static gchar* value_video_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	VideoRow** object_p;
+	VideoRow ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (!object_p) {
@@ -522,7 +522,7 @@ gpointer value_get_video_row (const GValue* value) {
 
 
 void value_set_video_row (GValue* value, gpointer v_object) {
-	VideoRow* old;
+	VideoRow * old;
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_ROW));
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -553,7 +553,7 @@ void value_set_video_row (GValue* value, gpointer v_object) {
 
 
 void value_take_video_row (GValue* value, gpointer v_object) {
-	VideoRow* old;
+	VideoRow * old;
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_ROW));
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -597,7 +597,7 @@ static void video_row_instance_init (VideoRow * self) {
 }
 
 
-static void video_row_finalize (VideoRow* obj) {
+static void video_row_finalize (VideoRow * obj) {
 	VideoRow * self;
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_ROW, VideoRow);
@@ -632,7 +632,7 @@ GType video_row_get_type (void) {
 
 
 gpointer video_row_ref (gpointer instance) {
-	VideoRow* self;
+	VideoRow * self;
 	self = instance;
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -643,7 +643,7 @@ gpointer video_row_ref (gpointer instance) {
 
 
 void video_row_unref (gpointer instance) {
-	VideoRow* self;
+	VideoRow * self;
 	self = instance;
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -660,22 +660,22 @@ static VideoTable* video_table_construct (GType object_type) {
 	VideoTable* self = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 	sqlite3_stmt* stmt2 = NULL;
 	gint res2 = 0;
-	sqlite3* _tmp8_ = NULL;
+	sqlite3* _tmp8_;
 	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
 #line 62 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	self = (VideoTable*) database_table_construct (object_type);
 #line 64 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -703,7 +703,7 @@ static VideoTable* video_table_construct (GType object_type) {
 #line 88 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
 #line 706 "VideoTable.c"
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 89 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp7_ = res;
 #line 89 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -735,7 +735,7 @@ static VideoTable* video_table_construct (GType object_type) {
 #line 98 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp14_ != SQLITE_DONE) {
 #line 738 "VideoTable.c"
-		gint _tmp15_ = 0;
+		gint _tmp15_;
 #line 99 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp15_ = res2;
 #line 99 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -770,15 +770,15 @@ static gpointer _database_table_ref0 (gpointer self) {
 
 VideoTable* video_table_get_instance (void) {
 	VideoTable* result = NULL;
-	VideoTable* _tmp0_ = NULL;
-	VideoTable* _tmp2_ = NULL;
-	VideoTable* _tmp3_ = NULL;
+	VideoTable* _tmp0_;
+	VideoTable* _tmp2_;
+	VideoTable* _tmp3_;
 #line 105 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	_tmp0_ = video_table_instance;
 #line 105 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp0_ == NULL) {
 #line 781 "VideoTable.c"
-		VideoTable* _tmp1_ = NULL;
+		VideoTable* _tmp1_;
 #line 106 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp1_ = video_table_new ();
 #line 106 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -802,101 +802,101 @@ VideoTable* video_table_get_instance (void) {
 void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GError** error) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	gulong time_created = 0UL;
-	gulong _tmp4_ = 0UL;
-	sqlite3_stmt* _tmp5_ = NULL;
-	VideoRow* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	GDestroyNotify _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	VideoRow* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	sqlite3_stmt* _tmp17_ = NULL;
-	VideoRow* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	sqlite3_stmt* _tmp22_ = NULL;
-	VideoRow* _tmp23_ = NULL;
-	gdouble _tmp24_ = 0.0;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
+	gulong _tmp4_;
+	sqlite3_stmt* _tmp5_;
+	VideoRow* _tmp6_;
+	const gchar* _tmp7_;
+	gchar* _tmp8_;
+	GDestroyNotify _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	VideoRow* _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	sqlite3_stmt* _tmp17_;
+	VideoRow* _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
+	sqlite3_stmt* _tmp22_;
+	VideoRow* _tmp23_;
+	gdouble _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
 	gint _tmp27_ = 0;
-	VideoRow* _tmp28_ = NULL;
-	gboolean _tmp29_ = FALSE;
-	sqlite3_stmt* _tmp30_ = NULL;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
-	sqlite3_stmt* _tmp33_ = NULL;
-	VideoRow* _tmp34_ = NULL;
-	gint64 _tmp35_ = 0LL;
-	gint _tmp36_ = 0;
-	gint _tmp37_ = 0;
-	sqlite3_stmt* _tmp38_ = NULL;
-	VideoRow* _tmp39_ = NULL;
-	time_t _tmp40_ = 0;
-	gint _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	sqlite3_stmt* _tmp43_ = NULL;
-	VideoRow* _tmp44_ = NULL;
-	time_t _tmp45_ = 0;
-	gint _tmp46_ = 0;
-	gint _tmp47_ = 0;
-	sqlite3_stmt* _tmp48_ = NULL;
-	VideoRow* _tmp49_ = NULL;
-	ImportID _tmp50_ = {0};
-	gint64 _tmp51_ = 0LL;
-	gint _tmp52_ = 0;
-	gint _tmp53_ = 0;
-	sqlite3_stmt* _tmp54_ = NULL;
-	gint _tmp55_ = 0;
-	gint _tmp56_ = 0;
-	sqlite3_stmt* _tmp57_ = NULL;
-	VideoRow* _tmp58_ = NULL;
-	const gchar* _tmp59_ = NULL;
-	gchar* _tmp60_ = NULL;
-	GDestroyNotify _tmp61_ = NULL;
-	gint _tmp62_ = 0;
-	gint _tmp63_ = 0;
-	sqlite3_stmt* _tmp64_ = NULL;
-	gulong _tmp65_ = 0UL;
-	gint _tmp66_ = 0;
-	gint _tmp67_ = 0;
-	sqlite3_stmt* _tmp68_ = NULL;
-	VideoRow* _tmp69_ = NULL;
-	const gchar* _tmp70_ = NULL;
-	gchar* _tmp71_ = NULL;
-	GDestroyNotify _tmp72_ = NULL;
-	gint _tmp73_ = 0;
-	gint _tmp74_ = 0;
-	sqlite3_stmt* _tmp75_ = NULL;
-	VideoRow* _tmp76_ = NULL;
-	const gchar* _tmp77_ = NULL;
-	gchar* _tmp78_ = NULL;
-	GDestroyNotify _tmp79_ = NULL;
-	gint _tmp80_ = 0;
-	gint _tmp81_ = 0;
-	sqlite3_stmt* _tmp82_ = NULL;
-	gint _tmp83_ = 0;
-	gint _tmp84_ = 0;
-	VideoRow* _tmp87_ = NULL;
-	sqlite3* _tmp88_ = NULL;
-	gint64 _tmp89_ = 0LL;
-	VideoRow* _tmp90_ = NULL;
-	VideoRow* _tmp91_ = NULL;
-	gulong _tmp92_ = 0UL;
-	VideoRow* _tmp93_ = NULL;
-	VideoRow* _tmp94_ = NULL;
-	VideoID _tmp95_ = {0};
+	VideoRow* _tmp28_;
+	gboolean _tmp29_;
+	sqlite3_stmt* _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
+	sqlite3_stmt* _tmp33_;
+	VideoRow* _tmp34_;
+	gint64 _tmp35_;
+	gint _tmp36_;
+	gint _tmp37_;
+	sqlite3_stmt* _tmp38_;
+	VideoRow* _tmp39_;
+	time_t _tmp40_;
+	gint _tmp41_;
+	gint _tmp42_;
+	sqlite3_stmt* _tmp43_;
+	VideoRow* _tmp44_;
+	time_t _tmp45_;
+	gint _tmp46_;
+	gint _tmp47_;
+	sqlite3_stmt* _tmp48_;
+	VideoRow* _tmp49_;
+	ImportID _tmp50_;
+	gint64 _tmp51_;
+	gint _tmp52_;
+	gint _tmp53_;
+	sqlite3_stmt* _tmp54_;
+	gint _tmp55_;
+	gint _tmp56_;
+	sqlite3_stmt* _tmp57_;
+	VideoRow* _tmp58_;
+	const gchar* _tmp59_;
+	gchar* _tmp60_;
+	GDestroyNotify _tmp61_;
+	gint _tmp62_;
+	gint _tmp63_;
+	sqlite3_stmt* _tmp64_;
+	gulong _tmp65_;
+	gint _tmp66_;
+	gint _tmp67_;
+	sqlite3_stmt* _tmp68_;
+	VideoRow* _tmp69_;
+	const gchar* _tmp70_;
+	gchar* _tmp71_;
+	GDestroyNotify _tmp72_;
+	gint _tmp73_;
+	gint _tmp74_;
+	sqlite3_stmt* _tmp75_;
+	VideoRow* _tmp76_;
+	const gchar* _tmp77_;
+	gchar* _tmp78_;
+	GDestroyNotify _tmp79_;
+	gint _tmp80_;
+	gint _tmp81_;
+	sqlite3_stmt* _tmp82_;
+	gint _tmp83_;
+	gint _tmp84_;
+	VideoRow* _tmp87_;
+	sqlite3* _tmp88_;
+	gint64 _tmp89_;
+	VideoRow* _tmp90_;
+	VideoRow* _tmp91_;
+	gulong _tmp92_;
+	VideoRow* _tmp93_;
+	VideoRow* _tmp94_;
+	VideoID _tmp95_;
 	GError * _inner_error_ = NULL;
 #line 113 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -1151,13 +1151,13 @@ void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GE
 #line 154 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp84_ != SQLITE_DONE) {
 #line 1152 "VideoTable.c"
-		gint _tmp85_ = 0;
+		gint _tmp85_;
 #line 155 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp85_ = res;
 #line 155 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		if (_tmp85_ != SQLITE_CONSTRAINT) {
 #line 1158 "VideoTable.c"
-			gint _tmp86_ = 0;
+			gint _tmp86_;
 #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 			_tmp86_ = res;
 #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -1227,21 +1227,21 @@ gboolean video_table_drop_event (VideoTable* self, EventID* event_id) {
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	sqlite3_stmt* _tmp7_ = NULL;
-	EventID _tmp8_ = {0};
-	gint64 _tmp9_ = 0LL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	sqlite3_stmt* _tmp7_;
+	EventID _tmp8_;
+	gint64 _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
 #line 168 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE);
 #line 168 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -1295,7 +1295,7 @@ gboolean video_table_drop_event (VideoTable* self, EventID* event_id) {
 #line 179 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp14_ != SQLITE_DONE) {
 #line 1296 "VideoTable.c"
-		gint _tmp15_ = 0;
+		gint _tmp15_;
 #line 180 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp15_ = res;
 #line 180 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -1322,81 +1322,81 @@ VideoRow* video_table_get_row (VideoTable* self, VideoID* video_id) {
 	VideoRow* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	VideoID _tmp5_ = {0};
-	gint64 _tmp6_ = 0LL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	VideoID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
 	VideoRow* row = NULL;
-	VideoRow* _tmp11_ = NULL;
-	VideoRow* _tmp12_ = NULL;
-	VideoID _tmp13_ = {0};
-	VideoRow* _tmp14_ = NULL;
-	sqlite3_stmt* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	VideoRow* _tmp18_ = NULL;
-	sqlite3_stmt* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
-	VideoRow* _tmp21_ = NULL;
-	sqlite3_stmt* _tmp22_ = NULL;
-	gint _tmp23_ = 0;
-	VideoRow* _tmp24_ = NULL;
-	sqlite3_stmt* _tmp25_ = NULL;
-	gdouble _tmp26_ = 0.0;
-	VideoRow* _tmp27_ = NULL;
-	sqlite3_stmt* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	VideoRow* _tmp30_ = NULL;
-	sqlite3_stmt* _tmp31_ = NULL;
-	gint64 _tmp32_ = 0LL;
-	VideoRow* _tmp33_ = NULL;
-	sqlite3_stmt* _tmp34_ = NULL;
-	gint64 _tmp35_ = 0LL;
-	VideoRow* _tmp36_ = NULL;
-	sqlite3_stmt* _tmp37_ = NULL;
-	gint64 _tmp38_ = 0LL;
-	VideoRow* _tmp39_ = NULL;
-	sqlite3_stmt* _tmp40_ = NULL;
-	gint64 _tmp41_ = 0LL;
-	VideoRow* _tmp42_ = NULL;
-	sqlite3_stmt* _tmp43_ = NULL;
-	gint64 _tmp44_ = 0LL;
-	VideoRow* _tmp45_ = NULL;
-	sqlite3_stmt* _tmp46_ = NULL;
-	const gchar* _tmp47_ = NULL;
-	gchar* _tmp48_ = NULL;
-	VideoRow* _tmp49_ = NULL;
-	sqlite3_stmt* _tmp50_ = NULL;
-	gint64 _tmp51_ = 0LL;
-	VideoRow* _tmp52_ = NULL;
-	sqlite3_stmt* _tmp53_ = NULL;
-	gint _tmp54_ = 0;
-	Rating _tmp55_ = 0;
-	VideoRow* _tmp56_ = NULL;
-	sqlite3_stmt* _tmp57_ = NULL;
-	const gchar* _tmp58_ = NULL;
-	gchar* _tmp59_ = NULL;
-	VideoRow* _tmp60_ = NULL;
-	sqlite3_stmt* _tmp61_ = NULL;
-	const gchar* _tmp62_ = NULL;
-	gchar* _tmp63_ = NULL;
-	VideoRow* _tmp64_ = NULL;
-	sqlite3_stmt* _tmp65_ = NULL;
-	gint64 _tmp66_ = 0LL;
-	VideoRow* _tmp67_ = NULL;
-	sqlite3_stmt* _tmp68_ = NULL;
-	gint64 _tmp69_ = 0LL;
-	VideoRow* _tmp70_ = NULL;
-	sqlite3_stmt* _tmp71_ = NULL;
-	const gchar* _tmp72_ = NULL;
-	gchar* _tmp73_ = NULL;
+	VideoRow* _tmp11_;
+	VideoRow* _tmp12_;
+	VideoID _tmp13_;
+	VideoRow* _tmp14_;
+	sqlite3_stmt* _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
+	VideoRow* _tmp18_;
+	sqlite3_stmt* _tmp19_;
+	gint _tmp20_;
+	VideoRow* _tmp21_;
+	sqlite3_stmt* _tmp22_;
+	gint _tmp23_;
+	VideoRow* _tmp24_;
+	sqlite3_stmt* _tmp25_;
+	gdouble _tmp26_;
+	VideoRow* _tmp27_;
+	sqlite3_stmt* _tmp28_;
+	gint _tmp29_;
+	VideoRow* _tmp30_;
+	sqlite3_stmt* _tmp31_;
+	gint64 _tmp32_;
+	VideoRow* _tmp33_;
+	sqlite3_stmt* _tmp34_;
+	gint64 _tmp35_;
+	VideoRow* _tmp36_;
+	sqlite3_stmt* _tmp37_;
+	gint64 _tmp38_;
+	VideoRow* _tmp39_;
+	sqlite3_stmt* _tmp40_;
+	gint64 _tmp41_;
+	VideoRow* _tmp42_;
+	sqlite3_stmt* _tmp43_;
+	gint64 _tmp44_;
+	VideoRow* _tmp45_;
+	sqlite3_stmt* _tmp46_;
+	const gchar* _tmp47_;
+	gchar* _tmp48_;
+	VideoRow* _tmp49_;
+	sqlite3_stmt* _tmp50_;
+	gint64 _tmp51_;
+	VideoRow* _tmp52_;
+	sqlite3_stmt* _tmp53_;
+	gint _tmp54_;
+	Rating _tmp55_;
+	VideoRow* _tmp56_;
+	sqlite3_stmt* _tmp57_;
+	const gchar* _tmp58_;
+	gchar* _tmp59_;
+	VideoRow* _tmp60_;
+	sqlite3_stmt* _tmp61_;
+	const gchar* _tmp62_;
+	gchar* _tmp63_;
+	VideoRow* _tmp64_;
+	sqlite3_stmt* _tmp65_;
+	gint64 _tmp66_;
+	VideoRow* _tmp67_;
+	sqlite3_stmt* _tmp68_;
+	gint64 _tmp69_;
+	VideoRow* _tmp70_;
+	sqlite3_stmt* _tmp71_;
+	const gchar* _tmp72_;
+	gchar* _tmp73_;
 #line 188 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
 #line 188 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -1635,12 +1635,12 @@ GeeArrayList* video_table_get_all (VideoTable* self) {
 	GeeArrayList* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	GeeArrayList* all = NULL;
-	GeeArrayList* _tmp4_ = NULL;
+	GeeArrayList* _tmp4_;
 #line 227 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
 #line 229 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -1666,76 +1666,76 @@ GeeArrayList* video_table_get_all (VideoTable* self) {
 #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	while (TRUE) {
 #line 1663 "VideoTable.c"
-		sqlite3_stmt* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		sqlite3_stmt* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 		VideoRow* row = NULL;
-		VideoRow* _tmp8_ = NULL;
-		VideoRow* _tmp9_ = NULL;
-		sqlite3_stmt* _tmp10_ = NULL;
-		gint64 _tmp11_ = 0LL;
-		VideoRow* _tmp12_ = NULL;
-		sqlite3_stmt* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		VideoRow* _tmp16_ = NULL;
-		sqlite3_stmt* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		VideoRow* _tmp19_ = NULL;
-		sqlite3_stmt* _tmp20_ = NULL;
-		gint _tmp21_ = 0;
-		VideoRow* _tmp22_ = NULL;
-		sqlite3_stmt* _tmp23_ = NULL;
-		gdouble _tmp24_ = 0.0;
-		VideoRow* _tmp25_ = NULL;
-		sqlite3_stmt* _tmp26_ = NULL;
-		gint _tmp27_ = 0;
-		VideoRow* _tmp28_ = NULL;
-		sqlite3_stmt* _tmp29_ = NULL;
-		gint64 _tmp30_ = 0LL;
-		VideoRow* _tmp31_ = NULL;
-		sqlite3_stmt* _tmp32_ = NULL;
-		gint64 _tmp33_ = 0LL;
-		VideoRow* _tmp34_ = NULL;
-		sqlite3_stmt* _tmp35_ = NULL;
-		gint64 _tmp36_ = 0LL;
-		VideoRow* _tmp37_ = NULL;
-		sqlite3_stmt* _tmp38_ = NULL;
-		gint64 _tmp39_ = 0LL;
-		VideoRow* _tmp40_ = NULL;
-		sqlite3_stmt* _tmp41_ = NULL;
-		gint64 _tmp42_ = 0LL;
-		VideoRow* _tmp43_ = NULL;
-		sqlite3_stmt* _tmp44_ = NULL;
-		const gchar* _tmp45_ = NULL;
-		gchar* _tmp46_ = NULL;
-		VideoRow* _tmp47_ = NULL;
-		sqlite3_stmt* _tmp48_ = NULL;
-		gint64 _tmp49_ = 0LL;
-		VideoRow* _tmp50_ = NULL;
-		sqlite3_stmt* _tmp51_ = NULL;
-		gint _tmp52_ = 0;
-		Rating _tmp53_ = 0;
-		VideoRow* _tmp54_ = NULL;
-		sqlite3_stmt* _tmp55_ = NULL;
-		const gchar* _tmp56_ = NULL;
-		gchar* _tmp57_ = NULL;
-		VideoRow* _tmp58_ = NULL;
-		sqlite3_stmt* _tmp59_ = NULL;
-		const gchar* _tmp60_ = NULL;
-		gchar* _tmp61_ = NULL;
-		VideoRow* _tmp62_ = NULL;
-		sqlite3_stmt* _tmp63_ = NULL;
-		gint64 _tmp64_ = 0LL;
-		VideoRow* _tmp65_ = NULL;
-		sqlite3_stmt* _tmp66_ = NULL;
-		gint64 _tmp67_ = 0LL;
-		VideoRow* _tmp68_ = NULL;
-		sqlite3_stmt* _tmp69_ = NULL;
-		const gchar* _tmp70_ = NULL;
-		gchar* _tmp71_ = NULL;
-		GeeArrayList* _tmp72_ = NULL;
-		VideoRow* _tmp73_ = NULL;
+		VideoRow* _tmp8_;
+		VideoRow* _tmp9_;
+		sqlite3_stmt* _tmp10_;
+		gint64 _tmp11_;
+		VideoRow* _tmp12_;
+		sqlite3_stmt* _tmp13_;
+		const gchar* _tmp14_;
+		gchar* _tmp15_;
+		VideoRow* _tmp16_;
+		sqlite3_stmt* _tmp17_;
+		gint _tmp18_;
+		VideoRow* _tmp19_;
+		sqlite3_stmt* _tmp20_;
+		gint _tmp21_;
+		VideoRow* _tmp22_;
+		sqlite3_stmt* _tmp23_;
+		gdouble _tmp24_;
+		VideoRow* _tmp25_;
+		sqlite3_stmt* _tmp26_;
+		gint _tmp27_;
+		VideoRow* _tmp28_;
+		sqlite3_stmt* _tmp29_;
+		gint64 _tmp30_;
+		VideoRow* _tmp31_;
+		sqlite3_stmt* _tmp32_;
+		gint64 _tmp33_;
+		VideoRow* _tmp34_;
+		sqlite3_stmt* _tmp35_;
+		gint64 _tmp36_;
+		VideoRow* _tmp37_;
+		sqlite3_stmt* _tmp38_;
+		gint64 _tmp39_;
+		VideoRow* _tmp40_;
+		sqlite3_stmt* _tmp41_;
+		gint64 _tmp42_;
+		VideoRow* _tmp43_;
+		sqlite3_stmt* _tmp44_;
+		const gchar* _tmp45_;
+		gchar* _tmp46_;
+		VideoRow* _tmp47_;
+		sqlite3_stmt* _tmp48_;
+		gint64 _tmp49_;
+		VideoRow* _tmp50_;
+		sqlite3_stmt* _tmp51_;
+		gint _tmp52_;
+		Rating _tmp53_;
+		VideoRow* _tmp54_;
+		sqlite3_stmt* _tmp55_;
+		const gchar* _tmp56_;
+		gchar* _tmp57_;
+		VideoRow* _tmp58_;
+		sqlite3_stmt* _tmp59_;
+		const gchar* _tmp60_;
+		gchar* _tmp61_;
+		VideoRow* _tmp62_;
+		sqlite3_stmt* _tmp63_;
+		gint64 _tmp64_;
+		VideoRow* _tmp65_;
+		sqlite3_stmt* _tmp66_;
+		gint64 _tmp67_;
+		VideoRow* _tmp68_;
+		sqlite3_stmt* _tmp69_;
+		const gchar* _tmp70_;
+		gchar* _tmp71_;
+		GeeArrayList* _tmp72_;
+		VideoRow* _tmp73_;
 #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp5_ = stmt;
 #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -1949,9 +1949,9 @@ GeeArrayList* video_table_get_all (VideoTable* self) {
 
 
 void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar* filepath, GError** error) {
-	VideoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	const gchar* _tmp2_ = NULL;
+	VideoID _tmp0_;
+	gint64 _tmp1_;
+	const gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 266 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -1991,9 +1991,9 @@ void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar*
 
 void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* new_title, GError** error) {
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	VideoID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
+	const gchar* _tmp1_;
+	VideoID _tmp3_;
+	gint64 _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 270 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2004,7 +2004,7 @@ void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* ne
 #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp1_ != NULL) {
 #line 2001 "VideoTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp2_ = new_title;
 #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2045,9 +2045,9 @@ void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* ne
 
 void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar* new_comment, GError** error) {
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	VideoID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
+	const gchar* _tmp1_;
+	VideoID _tmp3_;
+	gint64 _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 274 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2058,7 +2058,7 @@ void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar*
 #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp1_ != NULL) {
 #line 2055 "VideoTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp2_ = new_comment;
 #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2098,9 +2098,9 @@ void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar*
 
 
 void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t time, GError** error) {
-	VideoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	time_t _tmp2_ = 0;
+	VideoID _tmp0_;
+	gint64 _tmp1_;
+	time_t _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 278 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2137,10 +2137,10 @@ void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t
 
 
 void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating, GError** error) {
-	VideoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	Rating _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	VideoID _tmp0_;
+	gint64 _tmp1_;
+	Rating _tmp2_;
+	gint _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 282 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2179,9 +2179,9 @@ void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating,
 
 
 void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags, GError** error) {
-	VideoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	guint64 _tmp2_ = 0ULL;
+	VideoID _tmp0_;
+	gint64 _tmp1_;
+	guint64 _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 286 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2219,9 +2219,9 @@ void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags,
 
 void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gchar* backlinks, GError** error) {
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	VideoID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
+	const gchar* _tmp1_;
+	VideoID _tmp3_;
+	gint64 _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 290 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2232,7 +2232,7 @@ void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gc
 #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp1_ != NULL) {
 #line 2229 "VideoTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp2_ = backlinks;
 #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2273,9 +2273,9 @@ void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gc
 
 void video_table_update_is_interpretable (VideoTable* self, VideoID* video_id, gboolean is_interpretable, GError** error) {
 	gint _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
-	VideoID _tmp2_ = {0};
-	gint64 _tmp3_ = 0LL;
+	gboolean _tmp1_;
+	VideoID _tmp2_;
+	gint64 _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 294 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2323,11 +2323,11 @@ void video_table_update_is_interpretable (VideoTable* self, VideoID* video_id, g
 
 gboolean video_table_set_event (VideoTable* self, VideoID* video_id, EventID* event_id) {
 	gboolean result = FALSE;
-	VideoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	EventID _tmp2_ = {0};
-	gint64 _tmp3_ = 0LL;
-	gboolean _tmp4_ = FALSE;
+	VideoID _tmp0_;
+	gint64 _tmp1_;
+	EventID _tmp2_;
+	gint64 _tmp3_;
+	gboolean _tmp4_;
 #line 298 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE);
 #line 298 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2355,19 +2355,19 @@ gboolean video_table_set_event (VideoTable* self, VideoID* video_id, EventID* ev
 void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GDestroyNotify _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	GFile* _tmp5_;
+	gchar* _tmp6_;
+	GDestroyNotify _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
 	GError * _inner_error_ = NULL;
 #line 302 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2414,7 +2414,7 @@ void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error)
 #line 311 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp12_ != SQLITE_DONE) {
 #line 2411 "VideoTable.c"
-		gint _tmp13_ = 0;
+		gint _tmp13_;
 #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp13_ = res;
 #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2452,18 +2452,18 @@ void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error)
 void video_table_remove (VideoTable* self, VideoID* videoID, GError** error) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	VideoID _tmp5_ = {0};
-	gint64 _tmp6_ = 0LL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	VideoID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 315 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2508,7 +2508,7 @@ void video_table_remove (VideoTable* self, VideoID* videoID, GError** error) {
 #line 324 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp11_ != SQLITE_DONE) {
 #line 2505 "VideoTable.c"
-		gint _tmp12_ = 0;
+		gint _tmp12_;
 #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp12_ = res;
 #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2545,9 +2545,9 @@ void video_table_remove (VideoTable* self, VideoID* videoID, GError** error) {
 
 gboolean video_table_is_video_stored (VideoTable* self, GFile* file) {
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoID _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp2_;
 #line 328 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE);
 #line 328 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2569,20 +2569,20 @@ gboolean video_table_is_video_stored (VideoTable* self, GFile* file) {
 void video_table_get_id (VideoTable* self, GFile* file, VideoID* result) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GDestroyNotify _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	GFile* _tmp5_;
+	gchar* _tmp6_;
+	GDestroyNotify _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
 	VideoID _tmp12_ = {0};
-	gint _tmp13_ = 0;
+	gint _tmp13_;
 #line 332 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
 #line 332 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2628,8 +2628,8 @@ void video_table_get_id (VideoTable* self, GFile* file, VideoID* result) {
 #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp13_ == SQLITE_ROW) {
 #line 2625 "VideoTable.c"
-		sqlite3_stmt* _tmp14_ = NULL;
-		gint64 _tmp15_ = 0LL;
+		sqlite3_stmt* _tmp14_;
+		gint64 _tmp15_;
 #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp14_ = stmt;
 #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2656,12 +2656,12 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) {
 	GeeArrayList* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	GeeArrayList* video_ids = NULL;
-	GeeArrayList* _tmp4_ = NULL;
+	GeeArrayList* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 345 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
@@ -2691,12 +2691,12 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) {
 #line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		while (TRUE) {
 #line 2688 "VideoTable.c"
-			sqlite3_stmt* _tmp6_ = NULL;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
-			GeeArrayList* _tmp11_ = NULL;
-			sqlite3_stmt* _tmp12_ = NULL;
-			gint64 _tmp13_ = 0LL;
+			sqlite3_stmt* _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
+			GeeArrayList* _tmp11_;
+			sqlite3_stmt* _tmp12_;
+			gint64 _tmp13_;
 			VideoID _tmp14_ = {0};
 #line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 			if (!_tmp5_) {
@@ -2718,13 +2718,13 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) {
 				break;
 #line 2714 "VideoTable.c"
 			} else {
-				gint _tmp9_ = 0;
+				gint _tmp9_;
 #line 355 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 				_tmp9_ = res;
 #line 355 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 				if (_tmp9_ != SQLITE_ROW) {
 #line 2721 "VideoTable.c"
-					gint _tmp10_ = 0;
+					gint _tmp10_;
 #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 					_tmp10_ = res;
 #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2784,22 +2784,22 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) {
 static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* file, const gchar* md5) {
 	sqlite3_stmt* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp1_;
 	gchar* sql = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp3_;
 	gboolean first = FALSE;
-	GFile* _tmp4_ = NULL;
-	const gchar* _tmp7_ = NULL;
+	GFile* _tmp4_;
+	const gchar* _tmp7_;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
+	sqlite3* _tmp13_;
+	const gchar* _tmp14_;
 	sqlite3_stmt* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
+	gint _tmp16_;
+	gint _tmp17_;
 	gint col = 0;
-	GFile* _tmp18_ = NULL;
-	const gchar* _tmp26_ = NULL;
+	GFile* _tmp18_;
+	const gchar* _tmp26_;
 #line 365 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
 #line 365 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2812,7 +2812,7 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi
 		_tmp0_ = TRUE;
 #line 2808 "VideoTable.c"
 	} else {
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp2_ = md5;
 #line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2832,8 +2832,8 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi
 #line 371 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp4_ != NULL) {
 #line 2829 "VideoTable.c"
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp5_ = sql;
 #line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2851,16 +2851,16 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi
 #line 376 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp7_ != NULL) {
 #line 2848 "VideoTable.c"
-		gboolean _tmp8_ = FALSE;
-		const gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
+		gboolean _tmp8_;
+		const gchar* _tmp11_;
+		gchar* _tmp12_;
 #line 377 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp8_ = first;
 #line 377 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		if (!_tmp8_) {
 #line 2856 "VideoTable.c"
-			const gchar* _tmp9_ = NULL;
-			gchar* _tmp10_ = NULL;
+			const gchar* _tmp9_;
+			gchar* _tmp10_;
 #line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 			_tmp9_ = sql;
 #line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2904,13 +2904,13 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi
 #line 389 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp18_ != NULL) {
 #line 2901 "VideoTable.c"
-		sqlite3_stmt* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
-		GFile* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		GDestroyNotify _tmp23_ = NULL;
-		gint _tmp24_ = 0;
-		gint _tmp25_ = 0;
+		sqlite3_stmt* _tmp19_;
+		gint _tmp20_;
+		GFile* _tmp21_;
+		gchar* _tmp22_;
+		GDestroyNotify _tmp23_;
+		gint _tmp24_;
+		gint _tmp25_;
 #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp19_ = stmt;
 #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2938,13 +2938,13 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi
 #line 394 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp26_ != NULL) {
 #line 2935 "VideoTable.c"
-		sqlite3_stmt* _tmp27_ = NULL;
-		gint _tmp28_ = 0;
-		const gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		GDestroyNotify _tmp31_ = NULL;
-		gint _tmp32_ = 0;
-		gint _tmp33_ = 0;
+		sqlite3_stmt* _tmp27_;
+		gint _tmp28_;
+		const gchar* _tmp29_;
+		gchar* _tmp30_;
+		GDestroyNotify _tmp31_;
+		gint _tmp32_;
+		gint _tmp33_;
 #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp27_ = stmt;
 #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2980,13 +2980,13 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi
 gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* md5) {
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
-	GFile* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	const gchar* _tmp1_;
+	sqlite3_stmt* _tmp2_;
 	gint res = 0;
-	sqlite3_stmt* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	sqlite3_stmt* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 402 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE);
 #line 402 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -3017,7 +3017,7 @@ gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar*
 		return result;
 #line 3013 "VideoTable.c"
 	} else {
-		gint _tmp6_ = 0;
+		gint _tmp6_;
 #line 409 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp6_ = res;
 #line 409 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -3030,7 +3030,7 @@ gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar*
 			return result;
 #line 3026 "VideoTable.c"
 		} else {
-			gint _tmp7_ = 0;
+			gint _tmp7_;
 #line 413 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 			_tmp7_ = res;
 #line 413 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -3048,7 +3048,7 @@ gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar*
 }
 
 
-static void _vala_array_add3 (VideoID** array, int* length, int* size, const VideoID* value) {
+static void _vala_array_add3 (VideoID* * array, int* length, int* size, const VideoID* value) {
 #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if ((*length) == (*size)) {
 #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -3066,18 +3066,18 @@ static void _vala_array_add3 (VideoID** array, int* length, int* size, const Vid
 VideoID* video_table_get_duplicate_ids (VideoTable* self, GFile* file, const gchar* md5, int* result_length1) {
 	VideoID* result = NULL;
 	sqlite3_stmt* stmt = NULL;
-	GFile* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	const gchar* _tmp1_;
+	sqlite3_stmt* _tmp2_;
 	VideoID* ids = NULL;
-	VideoID* _tmp3_ = NULL;
-	gint ids_length1 = 0;
-	gint _ids_size_ = 0;
+	VideoID* _tmp3_;
+	gint ids_length1;
+	gint _ids_size_;
 	gint res = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	VideoID* _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	VideoID* _tmp13_;
+	gint _tmp13__length1;
 #line 419 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
 #line 419 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -3107,14 +3107,14 @@ VideoID* video_table_get_duplicate_ids (VideoTable* self, GFile* file, const gch
 #line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	while (TRUE) {
 #line 3104 "VideoTable.c"
-		gint _tmp6_ = 0;
-		VideoID* _tmp7_ = NULL;
-		gint _tmp7__length1 = 0;
-		sqlite3_stmt* _tmp8_ = NULL;
-		gint64 _tmp9_ = 0LL;
+		gint _tmp6_;
+		VideoID* _tmp7_;
+		gint _tmp7__length1;
+		sqlite3_stmt* _tmp8_;
+		gint64 _tmp9_;
 		VideoID _tmp10_ = {0};
-		sqlite3_stmt* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
+		sqlite3_stmt* _tmp11_;
+		gint _tmp12_;
 #line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp6_ = res;
 #line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -3167,17 +3167,17 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event
 	GeeArrayList* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	EventID _tmp5_ = {0};
-	gint64 _tmp6_ = 0LL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	EventID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 	GeeArrayList* _result_ = NULL;
-	GeeArrayList* _tmp9_ = NULL;
+	GeeArrayList* _tmp9_;
 #line 433 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
 #line 433 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -3222,15 +3222,15 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event
 #line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		while (TRUE) {
 #line 3219 "VideoTable.c"
-			sqlite3_stmt* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
-			GeeArrayList* _tmp16_ = NULL;
-			sqlite3_stmt* _tmp17_ = NULL;
-			gint64 _tmp18_ = 0LL;
+			sqlite3_stmt* _tmp11_;
+			gint _tmp12_;
+			gint _tmp13_;
+			GeeArrayList* _tmp16_;
+			sqlite3_stmt* _tmp17_;
+			gint64 _tmp18_;
 			VideoID _tmp19_ = {0};
-			gchar* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
+			gchar* _tmp20_;
+			gchar* _tmp21_;
 #line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 			if (!_tmp10_) {
 #line 3231 "VideoTable.c"
@@ -3251,13 +3251,13 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event
 				break;
 #line 3247 "VideoTable.c"
 			} else {
-				gint _tmp14_ = 0;
+				gint _tmp14_;
 #line 446 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 				_tmp14_ = res;
 #line 446 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 				if (_tmp14_ != SQLITE_ROW) {
 #line 3254 "VideoTable.c"
-					gint _tmp15_ = 0;
+					gint _tmp15_;
 #line 447 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 					_tmp15_ = res;
 #line 447 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -3297,9 +3297,9 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event
 
 
 void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t timestamp, GError** error) {
-	VideoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	time_t _tmp2_ = 0;
+	VideoID _tmp0_;
+	gint64 _tmp1_;
+	time_t _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 458 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -3348,7 +3348,7 @@ static void video_table_instance_init (VideoTable * self) {
 }
 
 
-static void video_table_finalize (DatabaseTable* obj) {
+static void video_table_finalize (DatabaseTable * obj) {
 	VideoTable * self;
 #line 59 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_TABLE, VideoTable);
diff --git a/src/direct/Direct.c b/src/direct/Direct.c
index 1d5987d..36ab376 100644
--- a/src/direct/Direct.c
+++ b/src/direct/Direct.c
@@ -1,4 +1,4 @@
-/* Direct.c generated by valac 0.34.7, the Vala compiler
+/* Direct.c generated by valac 0.36.6, the Vala compiler
  * generated from Direct.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -44,8 +44,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 
 void direct_preconfigure (GFile* initial_file) {
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 20 "/home/jens/Source/shotwell/src/direct/Direct.vala"
 	g_return_if_fail (G_IS_FILE (initial_file));
 #line 21 "/home/jens/Source/shotwell/src/direct/Direct.vala"
@@ -61,8 +61,8 @@ void direct_preconfigure (GFile* initial_file) {
 
 
 void direct_init (GError** error) {
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/direct/Direct.vala"
 	_tmp0_ = direct_initial_file;
 #line 25 "/home/jens/Source/shotwell/src/direct/Direct.vala"
diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c
index 5347674..013bb80 100644
--- a/src/direct/DirectPhoto.c
+++ b/src/direct/DirectPhoto.c
@@ -1,4 +1,4 @@
-/* DirectPhoto.c generated by valac 0.34.7, the Vala compiler
+/* DirectPhoto.c generated by valac 0.36.6, the Vala compiler
  * generated from DirectPhoto.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -349,6 +349,11 @@ typedef struct _PhotoPreview PhotoPreview;
 typedef struct _PhotoPreviewClass PhotoPreviewClass;
 #define _photo_preview_unref0(var) ((var == NULL) ? NULL : (var = (photo_preview_unref (var), NULL)))
 #define _media_metadata_unref0(var) ((var == NULL) ? NULL : (var = (media_metadata_unref (var), NULL)))
+enum  {
+	DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL,
+	DIRECT_PHOTO_LAST_SIGNAL
+};
+static guint direct_photo_signals[DIRECT_PHOTO_LAST_SIGNAL] = {0};
 typedef struct _DataCollectionPrivate DataCollectionPrivate;
 
 #define TYPE_MARKER (marker_get_type ())
@@ -975,7 +980,7 @@ void direct_photo_init (GFile* initial_file);
 void photo_init_photo (void);
 DirectPhotoSourceCollection* direct_photo_source_collection_new (GFile* initial_file);
 DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType object_type, GFile* initial_file);
-gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto** photo, gboolean reimport);
+gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto* * photo, gboolean reimport);
 gboolean data_collection_add (DataCollection* self, DataObject* object);
 void direct_photo_terminate (void);
 void photo_terminate_photo (void);
@@ -994,10 +999,10 @@ void photo_value_set_reimport_master_state (GValue* value, gpointer v_object);
 void photo_value_take_reimport_master_state (GValue* value, gpointer v_object);
 gpointer photo_value_get_reimport_master_state (const GValue* value);
 GType photo_reimport_master_state_get_type (void) G_GNUC_CONST;
-gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState** reimport_state, GError** error);
+gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error);
 GQuark database_error_quark (void);
 void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error);
-ImportResult direct_photo_internal_import (GFile* file, DirectPhoto** photo);
+ImportResult direct_photo_internal_import (GFile* file, DirectPhoto* * photo);
 gpointer photo_import_params_ref (gpointer instance);
 void photo_import_params_unref (gpointer instance);
 GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1059,7 +1064,7 @@ static void direct_photo_real_trash (MediaSource* base);
 static void direct_photo_real_untrash (MediaSource* base);
 static void direct_photo_real_mark_offline (MediaSource* base);
 static void direct_photo_real_mark_online (MediaSource* base);
-static void direct_photo_finalize (GObject* obj);
+static void direct_photo_finalize (GObject * obj);
 GType marker_get_type (void) G_GNUC_CONST;
 gpointer source_backlink_ref (gpointer instance);
 void source_backlink_unref (gpointer instance);
@@ -1107,12 +1112,12 @@ PhotoFileFormat photo_get_file_format (Photo* self);
 gchar* import_result_to_string (ImportResult self);
 gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self, GFile* file);
 DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, GFile* file);
-static void direct_photo_source_collection_finalize (DataCollection* obj);
+static void direct_photo_source_collection_finalize (DataCollection * obj);
 
 
 static DirectPhoto* direct_photo_construct (GType object_type, PhotoRow* row) {
 	DirectPhoto * self = NULL;
-	PhotoRow* _tmp0_ = NULL;
+	PhotoRow* _tmp0_;
 #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (IS_PHOTO_ROW (row), NULL);
 #line 18 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1121,14 +1126,14 @@ static DirectPhoto* direct_photo_construct (GType object_type, PhotoRow* row) {
 	self = (DirectPhoto*) photo_construct (object_type, _tmp0_);
 #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return self;
-#line 1125 "DirectPhoto.c"
+#line 1130 "DirectPhoto.c"
 }
 
 
 static DirectPhoto* direct_photo_new (PhotoRow* row) {
 #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return direct_photo_construct (TYPE_DIRECT_PHOTO, row);
-#line 1132 "DirectPhoto.c"
+#line 1137 "DirectPhoto.c"
 }
 
 
@@ -1147,10 +1152,10 @@ static DirectPhoto* direct_photo_new (PhotoRow* row) {
      * obtained by calling get_orientation() prior to export()ing a DirectPhoto.
      */
 void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, Orientation dest) {
-	PhotoRow* _tmp0_ = NULL;
-	Orientation _tmp1_ = 0;
-	BackingPhotoRow* _tmp2_ = NULL;
-	Orientation _tmp3_ = 0;
+	PhotoRow* _tmp0_;
+	Orientation _tmp1_;
+	BackingPhotoRow* _tmp2_;
+	Orientation _tmp3_;
 #line 35 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO (self));
 #line 36 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1165,22 +1170,22 @@ void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, Orientati
 	_tmp3_ = dest;
 #line 37 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp2_->original_orientation = _tmp3_;
-#line 1169 "DirectPhoto.c"
+#line 1174 "DirectPhoto.c"
 }
 
 
 void direct_photo_init (GFile* initial_file) {
-	GFile* _tmp0_ = NULL;
-	DirectPhotoSourceCollection* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	DirectPhotoSourceCollection* _tmp1_;
 	DirectPhoto* photo = NULL;
 	gchar* reason = NULL;
-	DirectPhotoSourceCollection* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	DirectPhotoSourceCollection* _tmp2_;
+	GFile* _tmp3_;
 	DirectPhoto* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	DirectPhotoSourceCollection* _tmp8_ = NULL;
-	DirectPhoto* _tmp9_ = NULL;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	DirectPhotoSourceCollection* _tmp8_;
+	DirectPhoto* _tmp9_;
 #line 40 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (G_IS_FILE (initial_file));
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1209,13 +1214,13 @@ void direct_photo_init (GFile* initial_file) {
 	_tmp6_ = reason;
 #line 46 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (_tmp6_ != NULL) {
-#line 1213 "DirectPhoto.c"
-		const gchar* _tmp7_ = NULL;
+#line 1218 "DirectPhoto.c"
+		const gchar* _tmp7_;
 #line 47 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp7_ = reason;
 #line 47 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		g_warning ("DirectPhoto.vala:47: fetch error: %s", _tmp7_);
-#line 1219 "DirectPhoto.c"
+#line 1224 "DirectPhoto.c"
 	}
 #line 48 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp8_ = direct_photo_global;
@@ -1227,14 +1232,14 @@ void direct_photo_init (GFile* initial_file) {
 	_g_free0 (reason);
 #line 40 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_g_object_unref0 (photo);
-#line 1231 "DirectPhoto.c"
+#line 1236 "DirectPhoto.c"
 }
 
 
 void direct_photo_terminate (void) {
 #line 52 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	photo_terminate_photo ();
-#line 1238 "DirectPhoto.c"
+#line 1243 "DirectPhoto.c"
 }
 
 
@@ -1242,12 +1247,12 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 	GError * _inner_error_ = NULL;
 #line 57 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO (self));
-#line 1246 "DirectPhoto.c"
+#line 1251 "DirectPhoto.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Scaling _tmp1_ = {0};
-		GdkPixbuf* _tmp2_ = NULL;
-		BackingPhotoRow* _tmp3_ = NULL;
+		GdkPixbuf* _tmp2_;
+		BackingPhotoRow* _tmp3_;
 		Dimensions _tmp4_ = {0};
 #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		scaling_for_original (&_tmp1_);
@@ -1257,7 +1262,7 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		_tmp0_ = _tmp2_;
 #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1261 "DirectPhoto.c"
+#line 1266 "DirectPhoto.c"
 			goto __catch45_g_error;
 		}
 #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1268,14 +1273,14 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		_tmp3_->dim = _tmp4_;
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1272 "DirectPhoto.c"
+#line 1277 "DirectPhoto.c"
 	}
 	goto __finally45;
 	__catch45_g_error:
 	{
 		GError* e = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		e = _inner_error_;
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1290,7 +1295,7 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		_g_free0 (_tmp6_);
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_error_free0 (e);
-#line 1294 "DirectPhoto.c"
+#line 1299 "DirectPhoto.c"
 	}
 	__finally45:
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1301,14 +1306,14 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		g_clear_error (&_inner_error_);
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return;
-#line 1305 "DirectPhoto.c"
+#line 1310 "DirectPhoto.c"
 	}
 }
 
 
 ImportResult direct_photo_demand_load (DirectPhoto* self) {
 	ImportResult result = 0;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	PhotoReimportMasterState* reimport_state = NULL;
 	GError * _inner_error_ = NULL;
 #line 67 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1323,11 +1328,11 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		result = IMPORT_RESULT_SUCCESS;
 #line 70 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return result;
-#line 1327 "DirectPhoto.c"
+#line 1332 "DirectPhoto.c"
 	}
 	{
 		PhotoReimportMasterState* _tmp1_ = NULL;
-		PhotoReimportMasterState* _tmp2_ = NULL;
+		PhotoReimportMasterState* _tmp2_;
 #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		photo_prepare_for_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), &_tmp1_, &_inner_error_);
 #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1336,7 +1341,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		reimport_state = _tmp1_;
 #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1340 "DirectPhoto.c"
+#line 1345 "DirectPhoto.c"
 			goto __catch46_g_error;
 		}
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1345,7 +1350,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		photo_finish_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp2_, &_inner_error_);
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1349 "DirectPhoto.c"
+#line 1354 "DirectPhoto.c"
 			goto __catch46_g_error;
 		}
 	}
@@ -1353,8 +1358,8 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 	__catch46_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
+		GError* _tmp3_;
+		const gchar* _tmp4_;
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		err = _inner_error_;
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1373,7 +1378,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		_photo_reimport_master_state_unref0 (reimport_state);
 #line 79 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return result;
-#line 1377 "DirectPhoto.c"
+#line 1382 "DirectPhoto.c"
 	}
 	__finally46:
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1386,7 +1391,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		g_clear_error (&_inner_error_);
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return 0;
-#line 1390 "DirectPhoto.c"
+#line 1395 "DirectPhoto.c"
 	}
 #line 82 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self->priv->loaded = TRUE;
@@ -1398,23 +1403,23 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 	_photo_reimport_master_state_unref0 (reimport_state);
 #line 84 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1402 "DirectPhoto.c"
+#line 1407 "DirectPhoto.c"
 }
 
 
-ImportResult direct_photo_internal_import (GFile* file, DirectPhoto** photo) {
+ImportResult direct_photo_internal_import (GFile* file, DirectPhoto* * photo) {
 	DirectPhoto* _vala_photo = NULL;
 	ImportResult result = 0;
 	PhotoImportParams* params = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	ImportID _tmp1_ = {0};
-	PhotoImportParams* _tmp2_ = NULL;
-	PhotoTable* _tmp3_ = NULL;
-	PhotoTable* _tmp4_ = NULL;
-	PhotoRow* _tmp5_ = NULL;
+	PhotoImportParams* _tmp2_;
+	PhotoTable* _tmp3_;
+	PhotoTable* _tmp4_;
+	PhotoRow* _tmp5_;
 	PhotoID _tmp6_ = {0};
-	PhotoRow* _tmp7_ = NULL;
-	DirectPhoto* _tmp8_ = NULL;
+	PhotoRow* _tmp7_;
+	DirectPhoto* _tmp8_;
 #line 89 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (G_IS_FILE (file), 0);
 #line 90 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1453,24 +1458,24 @@ ImportResult direct_photo_internal_import (GFile* file, DirectPhoto** photo) {
 	if (photo) {
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		*photo = _vala_photo;
-#line 1457 "DirectPhoto.c"
+#line 1462 "DirectPhoto.c"
 	} else {
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_vala_photo);
-#line 1461 "DirectPhoto.c"
+#line 1466 "DirectPhoto.c"
 	}
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1465 "DirectPhoto.c"
+#line 1470 "DirectPhoto.c"
 }
 
 
 static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scaling* scaling, GError** error) {
 	DirectPhoto * self;
 	GdkPixbuf* result = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp9_ = NULL;
-	GdkPixbuf* _tmp10_ = NULL;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp9_;
+	GdkPixbuf* _tmp10_;
 	GError * _inner_error_ = NULL;
 #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
@@ -1480,11 +1485,11 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 	_tmp0_ = self->priv->preview;
 #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (_tmp0_ == NULL) {
-#line 1484 "DirectPhoto.c"
+#line 1489 "DirectPhoto.c"
 		GdkPixbuf* _tmp1_ = NULL;
-		GdkPixbuf* _tmp2_ = NULL;
-		GdkPixbuf* _tmp3_ = NULL;
-		GdkPixbuf* _tmp4_ = NULL;
+		GdkPixbuf* _tmp2_;
+		GdkPixbuf* _tmp3_;
+		GdkPixbuf* _tmp4_;
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp2_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), DIRECT_PHOTO_PREVIEW_BEST_FIT, &_inner_error_);
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1495,7 +1500,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 			g_propagate_error (error, _inner_error_);
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			return NULL;
-#line 1499 "DirectPhoto.c"
+#line 1504 "DirectPhoto.c"
 		}
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp3_ = _tmp1_;
@@ -1509,11 +1514,11 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 		_tmp4_ = self->priv->preview;
 #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (_tmp4_ == NULL) {
-#line 1513 "DirectPhoto.c"
+#line 1518 "DirectPhoto.c"
 			GdkPixbuf* _tmp5_ = NULL;
-			Scaling _tmp6_ = {0};
-			GdkPixbuf* _tmp7_ = NULL;
-			GdkPixbuf* _tmp8_ = NULL;
+			Scaling _tmp6_;
+			GdkPixbuf* _tmp7_;
+			GdkPixbuf* _tmp8_;
 #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp6_ = *scaling;
 #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1528,7 +1533,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 				_g_object_unref0 (_tmp1_);
 #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				return NULL;
-#line 1532 "DirectPhoto.c"
+#line 1537 "DirectPhoto.c"
 			}
 #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp8_ = _tmp5_;
@@ -1540,11 +1545,11 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 			self->priv->preview = _tmp8_;
 #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_g_object_unref0 (_tmp5_);
-#line 1544 "DirectPhoto.c"
+#line 1549 "DirectPhoto.c"
 		}
 #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1548 "DirectPhoto.c"
+#line 1553 "DirectPhoto.c"
 	}
 #line 107 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp9_ = self->priv->preview;
@@ -1554,24 +1559,24 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 	result = _tmp10_;
 #line 107 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1558 "DirectPhoto.c"
+#line 1563 "DirectPhoto.c"
 }
 
 
 static void direct_photo_real_rotate (Photo* base, Rotation rotation) {
 	DirectPhoto * self;
-	Rotation _tmp0_ = 0;
+	Rotation _tmp0_;
 #line 110 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
 #line 111 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->can_rotate_now = FALSE;
 #line 112 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	g_signal_emit_by_name (self, "can-rotate-changed", FALSE);
+	g_signal_emit (self, direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL], 0, FALSE);
 #line 113 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp0_ = rotation;
 #line 113 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	PHOTO_CLASS (direct_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
-#line 1575 "DirectPhoto.c"
+#line 1580 "DirectPhoto.c"
 }
 
 
@@ -1579,8 +1584,8 @@ static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scal
 	DirectPhoto * self;
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* ret = NULL;
-	Scaling _tmp0_ = {0};
-	GdkPixbuf* _tmp1_ = NULL;
+	Scaling _tmp0_;
+	GdkPixbuf* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 116 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
@@ -1598,17 +1603,17 @@ static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scal
 		g_propagate_error (error, _inner_error_);
 #line 117 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return NULL;
-#line 1602 "DirectPhoto.c"
+#line 1607 "DirectPhoto.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	g_signal_emit_by_name (self, "can-rotate-changed", TRUE);
+	g_signal_emit (self, direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL], 0, TRUE);
 #line 119 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->can_rotate_now = TRUE;
 #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	result = ret;
 #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1612 "DirectPhoto.c"
+#line 1617 "DirectPhoto.c"
 }
 
 
@@ -1616,10 +1621,10 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 	DirectPhoto * self;
 	GdkPixbuf* result = NULL;
 	PhotoMetadata* metadata = NULL;
-	PhotoMetadata* _tmp0_ = NULL;
+	PhotoMetadata* _tmp0_;
 	GdkPixbuf* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-	PhotoMetadata* _tmp3_ = NULL;
+	PhotoMetadata* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 123 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
@@ -1633,17 +1638,17 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 	if (_tmp3_ == NULL) {
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp2_ = TRUE;
-#line 1637 "DirectPhoto.c"
+#line 1642 "DirectPhoto.c"
 	} else {
-		PhotoMetadata* _tmp4_ = NULL;
-		guint _tmp5_ = 0U;
+		PhotoMetadata* _tmp4_;
+		guint _tmp5_;
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp4_ = metadata;
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp5_ = photo_metadata_get_preview_count (_tmp4_);
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp2_ = _tmp5_ == ((guint) 0);
-#line 1647 "DirectPhoto.c"
+#line 1652 "DirectPhoto.c"
 	}
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (_tmp2_) {
@@ -1651,16 +1656,16 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 		_g_object_unref0 (_tmp1_);
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp1_ = NULL;
-#line 1655 "DirectPhoto.c"
+#line 1660 "DirectPhoto.c"
 	} else {
 		GdkPixbuf* _tmp6_ = NULL;
-		PhotoMetadata* _tmp7_ = NULL;
-		PhotoPreview* _tmp8_ = NULL;
-		PhotoPreview* _tmp9_ = NULL;
-		GdkPixbuf* _tmp10_ = NULL;
-		GdkPixbuf* _tmp11_ = NULL;
-		Orientation _tmp12_ = 0;
-		GdkPixbuf* _tmp13_ = NULL;
+		PhotoMetadata* _tmp7_;
+		PhotoPreview* _tmp8_;
+		PhotoPreview* _tmp9_;
+		GdkPixbuf* _tmp10_;
+		GdkPixbuf* _tmp11_;
+		Orientation _tmp12_;
+		GdkPixbuf* _tmp13_;
 #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp7_ = metadata;
 #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1685,7 +1690,7 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 			_media_metadata_unref0 (metadata);
 #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			return NULL;
-#line 1689 "DirectPhoto.c"
+#line 1694 "DirectPhoto.c"
 		}
 #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp12_ = photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo));
@@ -1697,7 +1702,7 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 		_tmp1_ = _tmp13_;
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1701 "DirectPhoto.c"
+#line 1706 "DirectPhoto.c"
 	}
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	result = _tmp1_;
@@ -1705,13 +1710,13 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 	_media_metadata_unref0 (metadata);
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1709 "DirectPhoto.c"
+#line 1714 "DirectPhoto.c"
 }
 
 
 static void direct_photo_real_notify_altered (DataObject* base, Alteration* alteration) {
 	DirectPhoto * self;
-	Alteration* _tmp0_ = NULL;
+	Alteration* _tmp0_;
 #line 130 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
 #line 130 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1724,7 +1729,7 @@ static void direct_photo_real_notify_altered (DataObject* base, Alteration* alte
 	_tmp0_ = alteration;
 #line 133 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	DATA_OBJECT_CLASS (direct_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), _tmp0_);
-#line 1728 "DirectPhoto.c"
+#line 1733 "DirectPhoto.c"
 }
 
 
@@ -1737,7 +1742,7 @@ static gboolean direct_photo_real_has_user_generated_metadata (Photo* base) {
 	result = FALSE;
 #line 138 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1741 "DirectPhoto.c"
+#line 1746 "DirectPhoto.c"
 }
 
 
@@ -1747,7 +1752,7 @@ static void direct_photo_real_set_user_metadata_for_export (Photo* base, PhotoMe
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
 #line 141 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (metadata));
-#line 1751 "DirectPhoto.c"
+#line 1756 "DirectPhoto.c"
 }
 
 
@@ -1757,7 +1762,7 @@ static void direct_photo_real_apply_user_metadata_for_reimport (Photo* base, Pho
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
 #line 145 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (metadata));
-#line 1761 "DirectPhoto.c"
+#line 1766 "DirectPhoto.c"
 }
 
 
@@ -1770,7 +1775,7 @@ static gboolean direct_photo_real_is_trashed (MediaSource* base) {
 	result = FALSE;
 #line 150 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1774 "DirectPhoto.c"
+#line 1779 "DirectPhoto.c"
 }
 
 
@@ -1783,7 +1788,7 @@ static gboolean direct_photo_real_is_offline (MediaSource* base) {
 	result = FALSE;
 #line 155 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1787 "DirectPhoto.c"
+#line 1792 "DirectPhoto.c"
 }
 
 
@@ -1791,7 +1796,7 @@ static void direct_photo_real_trash (MediaSource* base) {
 	DirectPhoto * self;
 #line 158 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
-#line 1795 "DirectPhoto.c"
+#line 1800 "DirectPhoto.c"
 }
 
 
@@ -1799,7 +1804,7 @@ static void direct_photo_real_untrash (MediaSource* base) {
 	DirectPhoto * self;
 #line 162 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
-#line 1803 "DirectPhoto.c"
+#line 1808 "DirectPhoto.c"
 }
 
 
@@ -1807,7 +1812,7 @@ static void direct_photo_real_mark_offline (MediaSource* base) {
 	DirectPhoto * self;
 #line 166 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
-#line 1811 "DirectPhoto.c"
+#line 1816 "DirectPhoto.c"
 }
 
 
@@ -1815,7 +1820,7 @@ static void direct_photo_real_mark_online (MediaSource* base) {
 	DirectPhoto * self;
 #line 170 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
-#line 1819 "DirectPhoto.c"
+#line 1824 "DirectPhoto.c"
 }
 
 
@@ -1825,38 +1830,38 @@ static void direct_photo_class_init (DirectPhotoClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_type_class_add_private (klass, sizeof (DirectPhotoPrivate));
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*)(MediaSource*, Scaling*, GError**)) direct_photo_real_get_preview_pixbuf;
+	((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*) (MediaSource *, Scaling*, GError**)) direct_photo_real_get_preview_pixbuf;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((PhotoClass *) klass)->rotate = (void (*)(Photo*, Rotation)) direct_photo_real_rotate;
+	((PhotoClass *) klass)->rotate = (void (*) (Photo *, Rotation)) direct_photo_real_rotate;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoSource*, Scaling*, GError**)) direct_photo_real_get_pixbuf;
+	((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*) (PhotoSource *, Scaling*, GError**)) direct_photo_real_get_pixbuf;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) direct_photo_real_get_thumbnail;
+	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) direct_photo_real_get_thumbnail;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) direct_photo_real_notify_altered;
+	((DataObjectClass *) klass)->notify_altered = (void (*) (DataObject *, Alteration*)) direct_photo_real_notify_altered;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*)(Photo*)) direct_photo_real_has_user_generated_metadata;
+	((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*) (Photo *)) direct_photo_real_has_user_generated_metadata;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((PhotoClass *) klass)->set_user_metadata_for_export = (void (*)(Photo*, PhotoMetadata*)) direct_photo_real_set_user_metadata_for_export;
+	((PhotoClass *) klass)->set_user_metadata_for_export = (void (*) (Photo *, PhotoMetadata*)) direct_photo_real_set_user_metadata_for_export;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*)(Photo*, PhotoMetadata*)) direct_photo_real_apply_user_metadata_for_reimport;
+	((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*) (Photo *, PhotoMetadata*)) direct_photo_real_apply_user_metadata_for_reimport;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->is_trashed = (gboolean (*)(MediaSource*)) direct_photo_real_is_trashed;
+	((MediaSourceClass *) klass)->is_trashed = (gboolean (*) (MediaSource *)) direct_photo_real_is_trashed;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->is_offline = (gboolean (*)(MediaSource*)) direct_photo_real_is_offline;
+	((MediaSourceClass *) klass)->is_offline = (gboolean (*) (MediaSource *)) direct_photo_real_is_offline;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->trash = (void (*)(MediaSource*)) direct_photo_real_trash;
+	((MediaSourceClass *) klass)->trash = (void (*) (MediaSource *)) direct_photo_real_trash;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->untrash = (void (*)(MediaSource*)) direct_photo_real_untrash;
+	((MediaSourceClass *) klass)->untrash = (void (*) (MediaSource *)) direct_photo_real_untrash;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->mark_offline = (void (*)(MediaSource*)) direct_photo_real_mark_offline;
+	((MediaSourceClass *) klass)->mark_offline = (void (*) (MediaSource *)) direct_photo_real_mark_offline;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->mark_online = (void (*)(MediaSource*)) direct_photo_real_mark_online;
+	((MediaSourceClass *) klass)->mark_online = (void (*) (MediaSource *)) direct_photo_real_mark_online;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	G_OBJECT_CLASS (klass)->finalize = direct_photo_finalize;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	g_signal_new ("can_rotate_changed", TYPE_DIRECT_PHOTO, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 1860 "DirectPhoto.c"
+	direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL] = g_signal_new ("can-rotate-changed", TYPE_DIRECT_PHOTO, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+#line 1865 "DirectPhoto.c"
 }
 
 
@@ -1867,11 +1872,11 @@ static void direct_photo_instance_init (DirectPhoto * self) {
 	self->priv->preview = NULL;
 #line 15 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self->priv->loaded = FALSE;
-#line 1871 "DirectPhoto.c"
+#line 1876 "DirectPhoto.c"
 }
 
 
-static void direct_photo_finalize (GObject* obj) {
+static void direct_photo_finalize (GObject * obj) {
 	DirectPhoto * self;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_PHOTO, DirectPhoto);
@@ -1879,7 +1884,7 @@ static void direct_photo_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->preview);
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	G_OBJECT_CLASS (direct_photo_parent_class)->finalize (obj);
-#line 1883 "DirectPhoto.c"
+#line 1888 "DirectPhoto.c"
 }
 
 
@@ -1900,7 +1905,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
 	result = file_hash ((GFile*) v);
 #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1904 "DirectPhoto.c"
+#line 1909 "DirectPhoto.c"
 }
 
 
@@ -1909,7 +1914,7 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer
 	result = file_equal ((GFile*) a, (GFile*) b);
 #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1913 "DirectPhoto.c"
+#line 1918 "DirectPhoto.c"
 }
 
 
@@ -1918,33 +1923,33 @@ static gint64 _direct_photo_source_collection_get_direct_key_get_source_database
 	result = direct_photo_source_collection_get_direct_key (source);
 #line 183 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1922 "DirectPhoto.c"
+#line 1927 "DirectPhoto.c"
 }
 
 
 static void _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered (DirectoryMonitor* _sender, GFile* file, GFileInfo* info, gpointer self) {
 #line 187 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	direct_photo_source_collection_on_file_discovered ((DirectPhotoSourceCollection*) self, file, info);
-#line 1929 "DirectPhoto.c"
+#line 1934 "DirectPhoto.c"
 }
 
 
 static void _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) {
 #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	direct_photo_source_collection_on_discovery_completed ((DirectPhotoSourceCollection*) self);
-#line 1936 "DirectPhoto.c"
+#line 1941 "DirectPhoto.c"
 }
 
 
 DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType object_type, GFile* initial_file) {
 	DirectPhotoSourceCollection* self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	DirectoryMonitor* _tmp3_ = NULL;
-	DirectoryMonitor* _tmp4_ = NULL;
-	DirectoryMonitor* _tmp5_ = NULL;
-	DirectoryMonitor* _tmp6_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	DirectoryMonitor* _tmp3_;
+	DirectoryMonitor* _tmp4_;
+	DirectoryMonitor* _tmp5_;
+	DirectoryMonitor* _tmp6_;
 #line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (G_IS_FILE (initial_file), NULL);
 #line 183 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1977,21 +1982,21 @@ DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType obj
 	directory_monitor_start_discovery (_tmp6_);
 #line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return self;
-#line 1981 "DirectPhoto.c"
+#line 1986 "DirectPhoto.c"
 }
 
 
 DirectPhotoSourceCollection* direct_photo_source_collection_new (GFile* initial_file) {
 #line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return direct_photo_source_collection_construct (TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, initial_file);
-#line 1988 "DirectPhoto.c"
+#line 1993 "DirectPhoto.c"
 }
 
 
 static gboolean direct_photo_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) {
 	DirectPhotoSourceCollection * self;
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 193 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection);
 #line 193 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2002,26 +2007,26 @@ static gboolean direct_photo_source_collection_real_holds_type_of_source (Source
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DIRECT_PHOTO);
 #line 194 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2006 "DirectPhoto.c"
+#line 2011 "DirectPhoto.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2013 "DirectPhoto.c"
+#line 2018 "DirectPhoto.c"
 }
 
 
 static gint64 direct_photo_source_collection_get_direct_key (DataSource* source) {
 	gint64 result = 0LL;
 	DirectPhoto* photo = NULL;
-	DataSource* _tmp0_ = NULL;
-	DirectPhoto* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	DirectPhoto* _tmp1_;
 	PhotoID photo_id = {0};
 	PhotoID _tmp2_ = {0};
-	PhotoID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
+	PhotoID _tmp3_;
+	gint64 _tmp4_;
 #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
 #line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2044,22 +2049,22 @@ static gint64 direct_photo_source_collection_get_direct_key (DataSource* source)
 	_g_object_unref0 (photo);
 #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2048 "DirectPhoto.c"
+#line 2053 "DirectPhoto.c"
 }
 
 
 static void direct_photo_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added) {
 	DirectPhotoSourceCollection * self;
-	GeeIterable* _tmp16_ = NULL;
+	GeeIterable* _tmp16_;
 #line 204 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection);
 #line 204 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (added));
-#line 2059 "DirectPhoto.c"
+#line 2064 "DirectPhoto.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp0_ = added;
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2068,24 +2073,24 @@ static void direct_photo_source_collection_real_notify_items_added (DataCollecti
 		_object_it = _tmp1_;
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		while (TRUE) {
-#line 2072 "DirectPhoto.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 2077 "DirectPhoto.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			DirectPhoto* photo = NULL;
-			DataObject* _tmp6_ = NULL;
-			DirectPhoto* _tmp7_ = NULL;
+			DataObject* _tmp6_;
+			DirectPhoto* _tmp7_;
 			GFile* file = NULL;
-			DirectPhoto* _tmp8_ = NULL;
-			GFile* _tmp9_ = NULL;
-			GeeHashMap* _tmp10_ = NULL;
-			GFile* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
-			GeeHashMap* _tmp13_ = NULL;
-			GFile* _tmp14_ = NULL;
-			DirectPhoto* _tmp15_ = NULL;
+			DirectPhoto* _tmp8_;
+			GFile* _tmp9_;
+			GeeHashMap* _tmp10_;
+			GFile* _tmp11_;
+			gboolean _tmp12_;
+			GeeHashMap* _tmp13_;
+			GFile* _tmp14_;
+			DirectPhoto* _tmp15_;
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp2_ = _object_it;
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2094,7 +2099,7 @@ static void direct_photo_source_collection_real_notify_items_added (DataCollecti
 			if (!_tmp3_) {
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				break;
-#line 2098 "DirectPhoto.c"
+#line 2103 "DirectPhoto.c"
 			}
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp4_ = _object_it;
@@ -2136,32 +2141,32 @@ static void direct_photo_source_collection_real_notify_items_added (DataCollecti
 			_g_object_unref0 (photo);
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_g_object_unref0 (object);
-#line 2140 "DirectPhoto.c"
+#line 2145 "DirectPhoto.c"
 		}
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_object_it);
-#line 2144 "DirectPhoto.c"
+#line 2149 "DirectPhoto.c"
 	}
 #line 214 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp16_ = added;
 #line 214 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp16_);
-#line 2150 "DirectPhoto.c"
+#line 2155 "DirectPhoto.c"
 }
 
 
 static void direct_photo_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) {
 	DirectPhotoSourceCollection * self;
-	GeeIterable* _tmp14_ = NULL;
+	GeeIterable* _tmp14_;
 #line 217 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection);
 #line 217 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (removed));
-#line 2161 "DirectPhoto.c"
+#line 2166 "DirectPhoto.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp0_ = removed;
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2170,23 +2175,23 @@ static void direct_photo_source_collection_real_notify_items_removed (DataCollec
 		_object_it = _tmp1_;
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		while (TRUE) {
-#line 2174 "DirectPhoto.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 2179 "DirectPhoto.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			DirectPhoto* photo = NULL;
-			DataObject* _tmp6_ = NULL;
-			DirectPhoto* _tmp7_ = NULL;
+			DataObject* _tmp6_;
+			DirectPhoto* _tmp7_;
 			GFile* file = NULL;
-			DirectPhoto* _tmp8_ = NULL;
-			GFile* _tmp9_ = NULL;
+			DirectPhoto* _tmp8_;
+			GFile* _tmp9_;
 			gboolean is_removed = FALSE;
-			GeeHashMap* _tmp10_ = NULL;
-			GFile* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
-			gboolean _tmp13_ = FALSE;
+			GeeHashMap* _tmp10_;
+			GFile* _tmp11_;
+			gboolean _tmp12_;
+			gboolean _tmp13_;
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp2_ = _object_it;
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2195,7 +2200,7 @@ static void direct_photo_source_collection_real_notify_items_removed (DataCollec
 			if (!_tmp3_) {
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				break;
-#line 2199 "DirectPhoto.c"
+#line 2204 "DirectPhoto.c"
 			}
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp4_ = _object_it;
@@ -2233,25 +2238,25 @@ static void direct_photo_source_collection_real_notify_items_removed (DataCollec
 			_g_object_unref0 (photo);
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_g_object_unref0 (object);
-#line 2237 "DirectPhoto.c"
+#line 2242 "DirectPhoto.c"
 		}
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_object_it);
-#line 2241 "DirectPhoto.c"
+#line 2246 "DirectPhoto.c"
 	}
 #line 226 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp14_ = removed;
 #line 226 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp14_);
-#line 2247 "DirectPhoto.c"
+#line 2252 "DirectPhoto.c"
 }
 
 
 gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCollection* self, GFile* file) {
 	gboolean result = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 #line 229 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE);
 #line 229 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2266,26 +2271,26 @@ gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCo
 	result = _tmp2_;
 #line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2270 "DirectPhoto.c"
+#line 2275 "DirectPhoto.c"
 }
 
 
 static void direct_photo_source_collection_on_file_discovered (DirectPhotoSourceCollection* self, GFile* file, GFileInfo* info) {
-	GFile* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GFile* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	GFile* _tmp0_;
+	gboolean _tmp1_;
+	GFile* _tmp2_;
+	gboolean _tmp3_;
 	DirectPhoto* photo = NULL;
 	gchar* reason = NULL;
-	GFile* _tmp4_ = NULL;
+	GFile* _tmp4_;
 	DirectPhoto* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	GeeCollection* _tmp9_ = NULL;
-	DirectPhoto* _tmp10_ = NULL;
-	GeeCollection* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
+	gchar* _tmp6_;
+	const gchar* _tmp7_;
+	GeeCollection* _tmp9_;
+	DirectPhoto* _tmp10_;
+	GeeCollection* _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
 #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self));
 #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2300,7 +2305,7 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource
 	if (_tmp1_) {
 #line 236 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return;
-#line 2304 "DirectPhoto.c"
+#line 2309 "DirectPhoto.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp2_ = file;
@@ -2310,7 +2315,7 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource
 	if (!_tmp3_) {
 #line 240 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return;
-#line 2314 "DirectPhoto.c"
+#line 2319 "DirectPhoto.c"
 	}
 #line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp4_ = file;
@@ -2326,13 +2331,13 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource
 	_tmp7_ = reason;
 #line 244 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (_tmp7_ != NULL) {
-#line 2330 "DirectPhoto.c"
-		const gchar* _tmp8_ = NULL;
+#line 2335 "DirectPhoto.c"
+		const gchar* _tmp8_;
 #line 245 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp8_ = reason;
 #line 245 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		g_warning ("DirectPhoto.vala:245: Error fetching file: %s", _tmp8_);
-#line 2336 "DirectPhoto.c"
+#line 2341 "DirectPhoto.c"
 	}
 #line 246 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp9_ = self->priv->prepared_photos;
@@ -2350,13 +2355,13 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource
 	if (_tmp13_ >= DIRECT_PHOTO_SOURCE_COLLECTION_DISCOVERED_FILES_BATCH_ADD) {
 #line 248 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		direct_photo_source_collection_flush_prepared_photos (self);
-#line 2354 "DirectPhoto.c"
+#line 2359 "DirectPhoto.c"
 	}
 #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_g_free0 (reason);
 #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_g_object_unref0 (photo);
-#line 2360 "DirectPhoto.c"
+#line 2365 "DirectPhoto.c"
 }
 
 
@@ -2365,15 +2370,15 @@ static void direct_photo_source_collection_on_discovery_completed (DirectPhotoSo
 	g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self));
 #line 252 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	direct_photo_source_collection_flush_prepared_photos (self);
-#line 2369 "DirectPhoto.c"
+#line 2374 "DirectPhoto.c"
 }
 
 
 static void direct_photo_source_collection_flush_prepared_photos (DirectPhotoSourceCollection* self) {
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp2_;
+	GeeCollection* _tmp3_;
 #line 255 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self));
 #line 256 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2388,15 +2393,15 @@ static void direct_photo_source_collection_flush_prepared_photos (DirectPhotoSou
 	_tmp3_ = self->priv->prepared_photos;
 #line 257 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	gee_collection_clear (_tmp3_);
-#line 2392 "DirectPhoto.c"
+#line 2397 "DirectPhoto.c"
 }
 
 
 gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* self, GFile* file) {
 	gboolean result = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 #line 260 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE);
 #line 260 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2411,19 +2416,19 @@ gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* s
 	result = _tmp2_;
 #line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2415 "DirectPhoto.c"
+#line 2420 "DirectPhoto.c"
 }
 
 
 void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self, DirectPhoto* photo) {
-	DirectPhoto* _tmp0_ = NULL;
+	DirectPhoto* _tmp0_;
 	DirectPhoto* reimported_photo = NULL;
-	DirectPhoto* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	DirectPhoto* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
 	DirectPhoto* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self));
 #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2452,23 +2457,23 @@ void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection*
 	_g_object_unref0 (_tmp3_);
 #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_g_object_unref0 (reimported_photo);
-#line 2456 "DirectPhoto.c"
+#line 2461 "DirectPhoto.c"
 }
 
 
-gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto** photo, gboolean reimport) {
+gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto* * photo, gboolean reimport) {
 	DirectPhoto* _vala_photo = NULL;
 	gchar* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	DirectPhoto* _tmp3_ = NULL;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gpointer _tmp2_;
+	DirectPhoto* _tmp3_;
 	ImportResult _result_ = 0;
-	GFile* _tmp25_ = NULL;
+	GFile* _tmp25_;
 	DirectPhoto* _tmp26_ = NULL;
-	ImportResult _tmp27_ = 0;
+	ImportResult _tmp27_;
 	gchar* _tmp28_ = NULL;
-	ImportResult _tmp29_ = 0;
+	ImportResult _tmp29_;
 	GError * _inner_error_ = NULL;
 #line 271 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), NULL);
@@ -2488,27 +2493,27 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 	_tmp3_ = _vala_photo;
 #line 274 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (_tmp3_ != NULL) {
-#line 2492 "DirectPhoto.c"
+#line 2497 "DirectPhoto.c"
 		gchar* reason = NULL;
-		gboolean _tmp4_ = FALSE;
+		gboolean _tmp4_;
 #line 275 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		reason = NULL;
 #line 277 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp4_ = reimport;
 #line 277 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (_tmp4_) {
-#line 2501 "DirectPhoto.c"
+#line 2506 "DirectPhoto.c"
 			{
 				Orientation ori_tmp = 0;
 				gboolean should_restore_ori = FALSE;
 				gboolean _tmp5_ = FALSE;
-				DirectPhoto* _tmp6_ = NULL;
-				gboolean _tmp7_ = FALSE;
+				DirectPhoto* _tmp6_;
+				gboolean _tmp7_;
 				PhotoReimportMasterState* reimport_state = NULL;
 				gboolean _tmp12_ = FALSE;
-				DirectPhoto* _tmp13_ = NULL;
+				DirectPhoto* _tmp13_;
 				PhotoReimportMasterState* _tmp14_ = NULL;
-				gboolean _tmp15_ = FALSE;
+				gboolean _tmp15_;
 #line 279 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				ori_tmp = ORIENTATION_TOP_LEFT;
 #line 280 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2521,23 +2526,23 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				if (_tmp7_) {
 #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp5_ = TRUE;
-#line 2525 "DirectPhoto.c"
+#line 2530 "DirectPhoto.c"
 				} else {
-					DirectPhoto* _tmp8_ = NULL;
-					PhotoFileFormat _tmp9_ = 0;
+					DirectPhoto* _tmp8_;
+					PhotoFileFormat _tmp9_;
 #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp8_ = _vala_photo;
 #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp9_ = photo_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo));
 #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp5_ = _tmp9_ == PHOTO_FILE_FORMAT_JFIF;
-#line 2535 "DirectPhoto.c"
+#line 2540 "DirectPhoto.c"
 				}
 #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				if (_tmp5_) {
-#line 2539 "DirectPhoto.c"
-					DirectPhoto* _tmp10_ = NULL;
-					Orientation _tmp11_ = 0;
+#line 2544 "DirectPhoto.c"
+					DirectPhoto* _tmp10_;
+					Orientation _tmp11_;
 #line 284 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp10_ = _vala_photo;
 #line 284 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2546,7 +2551,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 					ori_tmp = _tmp11_;
 #line 285 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					should_restore_ori = TRUE;
-#line 2550 "DirectPhoto.c"
+#line 2555 "DirectPhoto.c"
 				}
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				_tmp13_ = _vala_photo;
@@ -2562,15 +2567,15 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_photo_reimport_master_state_unref0 (reimport_state);
-#line 2566 "DirectPhoto.c"
+#line 2571 "DirectPhoto.c"
 					goto __catch47_g_error;
 				}
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				if (_tmp12_) {
-#line 2571 "DirectPhoto.c"
-					DirectPhoto* _tmp16_ = NULL;
-					PhotoReimportMasterState* _tmp17_ = NULL;
-					gboolean _tmp18_ = FALSE;
+#line 2576 "DirectPhoto.c"
+					DirectPhoto* _tmp16_;
+					PhotoReimportMasterState* _tmp17_;
+					gboolean _tmp18_;
 #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp16_ = _vala_photo;
 #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2581,45 +2586,45 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 						_photo_reimport_master_state_unref0 (reimport_state);
-#line 2585 "DirectPhoto.c"
+#line 2590 "DirectPhoto.c"
 						goto __catch47_g_error;
 					}
 #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp18_ = should_restore_ori;
 #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					if (_tmp18_) {
-#line 2592 "DirectPhoto.c"
-						DirectPhoto* _tmp19_ = NULL;
-						Orientation _tmp20_ = 0;
+#line 2597 "DirectPhoto.c"
+						DirectPhoto* _tmp19_;
+						Orientation _tmp20_;
 #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 						_tmp19_ = _vala_photo;
 #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 						_tmp20_ = ori_tmp;
 #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 						direct_photo_fixup_orientation_after_reimport (_tmp19_, _tmp20_);
-#line 2601 "DirectPhoto.c"
+#line 2606 "DirectPhoto.c"
 					}
 				} else {
-					gchar* _tmp21_ = NULL;
+					gchar* _tmp21_;
 #line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp21_ = import_result_to_string (IMPORT_RESULT_FILE_ERROR);
 #line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_g_free0 (reason);
 #line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					reason = _tmp21_;
-#line 2611 "DirectPhoto.c"
+#line 2616 "DirectPhoto.c"
 				}
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				_photo_reimport_master_state_unref0 (reimport_state);
-#line 2615 "DirectPhoto.c"
+#line 2620 "DirectPhoto.c"
 			}
 			goto __finally47;
 			__catch47_g_error:
 			{
 				GError* err = NULL;
-				GError* _tmp22_ = NULL;
-				const gchar* _tmp23_ = NULL;
-				gchar* _tmp24_ = NULL;
+				GError* _tmp22_;
+				const gchar* _tmp23_;
+				gchar* _tmp24_;
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				err = _inner_error_;
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2636,7 +2641,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				reason = _tmp24_;
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				_g_error_free0 (err);
-#line 2640 "DirectPhoto.c"
+#line 2645 "DirectPhoto.c"
 			}
 			__finally47:
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2649,7 +2654,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				g_clear_error (&_inner_error_);
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				return NULL;
-#line 2653 "DirectPhoto.c"
+#line 2658 "DirectPhoto.c"
 			}
 		}
 #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2658,15 +2663,15 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 		if (photo) {
 #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			*photo = _vala_photo;
-#line 2662 "DirectPhoto.c"
+#line 2667 "DirectPhoto.c"
 		} else {
 #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_g_object_unref0 (_vala_photo);
-#line 2666 "DirectPhoto.c"
+#line 2671 "DirectPhoto.c"
 		}
 #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return result;
-#line 2670 "DirectPhoto.c"
+#line 2675 "DirectPhoto.c"
 	}
 #line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp25_ = file;
@@ -2686,10 +2691,10 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 		_g_free0 (_tmp28_);
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp28_ = NULL;
-#line 2690 "DirectPhoto.c"
+#line 2695 "DirectPhoto.c"
 	} else {
-		ImportResult _tmp30_ = 0;
-		gchar* _tmp31_ = NULL;
+		ImportResult _tmp30_;
+		gchar* _tmp31_;
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp30_ = _result_;
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2698,7 +2703,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 		_g_free0 (_tmp28_);
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp28_ = _tmp31_;
-#line 2702 "DirectPhoto.c"
+#line 2707 "DirectPhoto.c"
 	}
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	result = _tmp28_;
@@ -2706,23 +2711,23 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 	if (photo) {
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		*photo = _vala_photo;
-#line 2710 "DirectPhoto.c"
+#line 2715 "DirectPhoto.c"
 	} else {
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_vala_photo);
-#line 2714 "DirectPhoto.c"
+#line 2719 "DirectPhoto.c"
 	}
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2718 "DirectPhoto.c"
+#line 2723 "DirectPhoto.c"
 }
 
 
 gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self, GFile* file) {
 	gboolean result = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 #line 313 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE);
 #line 313 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2737,15 +2742,15 @@ gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollec
 	result = _tmp2_;
 #line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2741 "DirectPhoto.c"
+#line 2746 "DirectPhoto.c"
 }
 
 
 DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, GFile* file) {
 	DirectPhoto* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gpointer _tmp2_;
 #line 317 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), NULL);
 #line 317 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2760,7 +2765,7 @@ DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCo
 	result = (DirectPhoto*) _tmp2_;
 #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2764 "DirectPhoto.c"
+#line 2769 "DirectPhoto.c"
 }
 
 
@@ -2772,18 +2777,18 @@ static void direct_photo_source_collection_class_init (DirectPhotoSourceCollecti
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_type_class_add_private (klass, sizeof (DirectPhotoSourceCollectionPrivate));
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) direct_photo_source_collection_real_holds_type_of_source;
+	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) direct_photo_source_collection_real_holds_type_of_source;
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) direct_photo_source_collection_real_notify_items_added;
+	((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) direct_photo_source_collection_real_notify_items_added;
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) direct_photo_source_collection_real_notify_items_removed;
-#line 2781 "DirectPhoto.c"
+	((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) direct_photo_source_collection_real_notify_items_removed;
+#line 2786 "DirectPhoto.c"
 }
 
 
 static void direct_photo_source_collection_instance_init (DirectPhotoSourceCollection * self) {
-	GeeArrayList* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeHashMap* _tmp1_;
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self->priv = DIRECT_PHOTO_SOURCE_COLLECTION_GET_PRIVATE (self);
 #line 177 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2794,11 +2799,11 @@ static void direct_photo_source_collection_instance_init (DirectPhotoSourceColle
 	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self->priv->file_map = _tmp1_;
-#line 2798 "DirectPhoto.c"
+#line 2803 "DirectPhoto.c"
 }
 
 
-static void direct_photo_source_collection_finalize (DataCollection* obj) {
+static void direct_photo_source_collection_finalize (DataCollection * obj) {
 	DirectPhotoSourceCollection * self;
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection);
@@ -2810,7 +2815,7 @@ static void direct_photo_source_collection_finalize (DataCollection* obj) {
 	_g_object_unref0 (self->priv->monitor);
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->finalize (obj);
-#line 2814 "DirectPhoto.c"
+#line 2819 "DirectPhoto.c"
 }
 
 
diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c
index 08a3c07..07f26d9 100644
--- a/src/direct/DirectPhotoPage.c
+++ b/src/direct/DirectPhotoPage.c
@@ -1,4 +1,4 @@
-/* DirectPhotoPage.c generated by valac 0.34.7, the Vala compiler
+/* DirectPhotoPage.c generated by valac 0.36.6, the Vala compiler
  * generated from DirectPhotoPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -722,8 +722,8 @@ InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_len
 InjectionGroup* injection_group_new (const gchar* path);
 InjectionGroup* injection_group_construct (GType object_type, const gchar* path);
 void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator);
-static void _vala_array_add61 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add62 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add61 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add62 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 gboolean photo_file_format_is_file_supported (GFile* file);
 #define RESOURCES_APP_TITLE "Shotwell"
@@ -797,7 +797,7 @@ gboolean direct_photo_page_check_quit (DirectPhotoPage* self);
 static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* base, Photo* old_photo, Photo* new_photo);
 void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean scale_up, Scaling* result);
 void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error);
-gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto** photo, gboolean reimport);
+gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto* * photo, gboolean reimport);
 gboolean data_source_equals (DataSource* self, DataSource* source);
 GType direct_view_get_type (void) G_GNUC_CONST;
 DirectView* direct_view_new (DirectPhoto* source);
@@ -850,7 +850,7 @@ static gboolean __lambda16_ (Block7Data* _data7_);
 void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable);
 static gboolean ___lambda16__gsource_func (gpointer self);
 static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base, DataSource* source);
-static void direct_photo_page_finalize (GObject* obj);
+static void direct_photo_page_finalize (GObject * obj);
 GType direct_fullscreen_photo_page_get_type (void) G_GNUC_CONST;
 enum  {
 	DIRECT_FULLSCREEN_PHOTO_PAGE_DUMMY_PROPERTY
@@ -1047,20 +1047,20 @@ static void _direct_photo_page_on_selection_group_altered_view_collection_select
 
 DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) {
 	DirectPhotoPage * self = NULL;
-	DirectPhotoSourceCollection* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	GFile* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	DirectViewCollection* _tmp10_ = NULL;
-	GFile* _tmp11_ = NULL;
-	GFile* _tmp12_ = NULL;
-	DirectPhotoSourceCollection* _tmp13_ = NULL;
-	ViewCollection* _tmp14_ = NULL;
-	ViewCollection* _tmp15_ = NULL;
+	DirectPhotoSourceCollection* _tmp0_;
+	GFile* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	GFile* _tmp4_;
+	gboolean _tmp5_;
+	GFile* _tmp8_;
+	GFile* _tmp9_;
+	DirectViewCollection* _tmp10_;
+	GFile* _tmp11_;
+	GFile* _tmp12_;
+	DirectPhotoSourceCollection* _tmp13_;
+	ViewCollection* _tmp14_;
+	ViewCollection* _tmp15_;
 #line 13 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 14 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1082,8 +1082,8 @@ DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) {
 #line 16 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp5_) {
 #line 1085 "DirectPhotoPage.c"
-		Application* _tmp6_ = NULL;
-		Application* _tmp7_ = NULL;
+		Application* _tmp6_;
+		Application* _tmp7_;
 #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = application_get_instance ();
 #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1145,9 +1145,9 @@ DirectPhotoPage* direct_photo_page_new (GFile* file) {
 
 static void direct_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	DirectPhotoPage * self;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
+	GeeList* _tmp2_;
 #line 35 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 35 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1170,8 +1170,8 @@ static void direct_photo_page_real_init_collect_ui_filenames (Page* base, GeeLis
 
 static void direct_photo_page_real_add_actions (Page* base, GActionMap* map) {
 	DirectPhotoPage * self;
-	GActionMap* _tmp0_ = NULL;
-	GActionMap* _tmp1_ = NULL;
+	GActionMap* _tmp0_;
+	GActionMap* _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 68 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1190,7 +1190,7 @@ static void direct_photo_page_real_add_actions (Page* base, GActionMap* map) {
 
 static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map) {
 	DirectPhotoPage * self;
-	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp0_;
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1217,9 +1217,9 @@ static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map)
 			entry = entry_collection[entry_it];
 #line 1219 "DirectPhotoPage.c"
 			{
-				GActionMap* _tmp1_ = NULL;
-				GActionEntry _tmp2_ = {0};
-				const gchar* _tmp3_ = NULL;
+				GActionMap* _tmp1_;
+				GActionEntry _tmp2_;
+				const gchar* _tmp3_;
 #line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp1_ = map;
 #line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1242,7 +1242,7 @@ static gpointer _injection_group_ref0 (gpointer self) {
 }
 
 
-static void _vala_array_add61 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add61 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if ((*length) == (*size)) {
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1259,7 +1259,7 @@ static void _vala_array_add61 (InjectionGroup*** array, int* length, int* size,
 }
 
 
-static void _vala_array_add62 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add62 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if ((*length) == (*size)) {
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1280,24 +1280,22 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa
 	DirectPhotoPage * self;
 	InjectionGroup** result = NULL;
 	InjectionGroup** groups = NULL;
-	gint _tmp0_ = 0;
-	InjectionGroup** _tmp1_ = NULL;
-	gint groups_length1 = 0;
-	gint _groups_size_ = 0;
+	gint _tmp0_;
+	InjectionGroup** _tmp1_;
+	gint groups_length1;
+	gint _groups_size_;
 	InjectionGroup* print_group = NULL;
-	InjectionGroup* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	InjectionGroup** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	InjectionGroup* _tmp5_ = NULL;
+	InjectionGroup* _tmp2_;
+	InjectionGroup** _tmp3_;
+	gint _tmp3__length1;
+	InjectionGroup* _tmp4_;
 	InjectionGroup* bg_group = NULL;
-	InjectionGroup* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	InjectionGroup** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	InjectionGroup* _tmp9_ = NULL;
-	InjectionGroup** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	InjectionGroup* _tmp5_;
+	InjectionGroup** _tmp6_;
+	gint _tmp6__length1;
+	InjectionGroup* _tmp7_;
+	InjectionGroup** _tmp8_;
+	gint _tmp8__length1;
 #line 81 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1313,62 +1311,58 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa
 #line 84 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	print_group = _tmp2_;
 #line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp3_ = _ ("_Print");
-#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	injection_group_add_menu_item (print_group, _tmp3_, "Print", "<Primary>p");
+	injection_group_add_menu_item (print_group, _ ("_Print"), "Print", "<Primary>p");
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp4_ = groups;
+	_tmp3_ = groups;
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp4__length1 = groups_length1;
+	_tmp3__length1 = groups_length1;
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp5_ = _injection_group_ref0 (print_group);
+	_tmp4_ = _injection_group_ref0 (print_group);
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add61 (&groups, &groups_length1, &_groups_size_, _tmp5_);
+	_vala_array_add61 (&groups, &groups_length1, &_groups_size_, _tmp4_);
 #line 89 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp6_ = injection_group_new ("SetBackgroundPlaceholder");
+	_tmp5_ = injection_group_new ("SetBackgroundPlaceholder");
 #line 89 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	bg_group = _tmp6_;
-#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp7_ = _ ("Set as _Desktop Background");
+	bg_group = _tmp5_;
 #line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	injection_group_add_menu_item (bg_group, _tmp7_, "SetBackground", "<Primary>b");
+	injection_group_add_menu_item (bg_group, _ ("Set as _Desktop Background"), "SetBackground", "<Primary>b");
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp8_ = groups;
+	_tmp6_ = groups;
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp8__length1 = groups_length1;
+	_tmp6__length1 = groups_length1;
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp9_ = _injection_group_ref0 (bg_group);
+	_tmp7_ = _injection_group_ref0 (bg_group);
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add62 (&groups, &groups_length1, &_groups_size_, _tmp9_);
+	_vala_array_add62 (&groups, &groups_length1, &_groups_size_, _tmp7_);
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp10_ = groups;
+	_tmp8_ = groups;
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp10__length1 = groups_length1;
+	_tmp8__length1 = groups_length1;
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (result_length1) {
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*result_length1 = _tmp10__length1;
-#line 1352 "DirectPhotoPage.c"
+		*result_length1 = _tmp8__length1;
+#line 1346 "DirectPhotoPage.c"
 	}
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	result = _tmp10_;
+	result = _tmp8_;
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_injection_group_unref0 (bg_group);
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_injection_group_unref0 (print_group);
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1362 "DirectPhotoPage.c"
+#line 1356 "DirectPhotoPage.c"
 }
 
 
 static gboolean direct_photo_page_check_editable_file (GFile* file) {
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 #line 97 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1385,119 +1379,110 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 	_g_free0 (_tmp2_);
 #line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp4_) {
-#line 1389 "DirectPhotoPage.c"
-		const gchar* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
+#line 1383 "DirectPhotoPage.c"
+		GFile* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp5_ = _ ("%s does not exist.");
+		_tmp5_ = file;
 #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp6_ = file;
+		_tmp6_ = g_file_get_path (_tmp5_);
 #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp7_ = g_file_get_path (_tmp6_);
-#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp9_ = g_strdup_printf (_tmp5_, _tmp8_);
+		_tmp8_ = g_strdup_printf (_ ("%s does not exist."), _tmp7_);
 #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp10_ = _tmp9_;
+		_tmp9_ = _tmp8_;
 #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		app_window_error_message (_tmp10_, NULL);
+		app_window_error_message (_tmp9_, NULL);
 #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_g_free0 (_tmp10_);
+		_g_free0 (_tmp9_);
 #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_g_free0 (_tmp8_);
-#line 1414 "DirectPhotoPage.c"
+		_g_free0 (_tmp7_);
+#line 1405 "DirectPhotoPage.c"
 	} else {
-		GFile* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		gboolean _tmp14_ = FALSE;
-		gboolean _tmp15_ = FALSE;
+		GFile* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		gboolean _tmp13_;
+		gboolean _tmp14_;
 #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp11_ = file;
+		_tmp10_ = file;
 #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp12_ = g_file_get_path (_tmp11_);
+		_tmp11_ = g_file_get_path (_tmp10_);
 #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp13_ = _tmp12_;
+		_tmp12_ = _tmp11_;
 #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp14_ = g_file_test (_tmp13_, G_FILE_TEST_IS_REGULAR);
+		_tmp13_ = g_file_test (_tmp12_, G_FILE_TEST_IS_REGULAR);
 #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp15_ = !_tmp14_;
+		_tmp14_ = !_tmp13_;
 #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_g_free0 (_tmp13_);
+		_g_free0 (_tmp12_);
 #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		if (_tmp15_) {
-#line 1435 "DirectPhotoPage.c"
-			const gchar* _tmp16_ = NULL;
-			GFile* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
-			gchar* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
-#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			_tmp16_ = _ ("%s is not a file.");
-#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			_tmp17_ = file;
+		if (_tmp14_) {
+#line 1426 "DirectPhotoPage.c"
+			GFile* _tmp15_;
+			gchar* _tmp16_;
+			gchar* _tmp17_;
+			gchar* _tmp18_;
+			gchar* _tmp19_;
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			_tmp18_ = g_file_get_path (_tmp17_);
+			_tmp15_ = file;
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			_tmp19_ = _tmp18_;
+			_tmp16_ = g_file_get_path (_tmp15_);
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			_tmp20_ = g_strdup_printf (_tmp16_, _tmp19_);
+			_tmp17_ = _tmp16_;
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			_tmp21_ = _tmp20_;
+			_tmp18_ = g_strdup_printf (_ ("%s is not a file."), _tmp17_);
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			app_window_error_message (_tmp21_, NULL);
+			_tmp19_ = _tmp18_;
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			_g_free0 (_tmp21_);
+			app_window_error_message (_tmp19_, NULL);
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_free0 (_tmp19_);
-#line 1460 "DirectPhotoPage.c"
+#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+			_g_free0 (_tmp17_);
+#line 1448 "DirectPhotoPage.c"
 		} else {
-			GFile* _tmp22_ = NULL;
-			gboolean _tmp23_ = FALSE;
+			GFile* _tmp20_;
+			gboolean _tmp21_;
 #line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			_tmp22_ = file;
+			_tmp20_ = file;
 #line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			_tmp23_ = photo_file_format_is_file_supported (_tmp22_);
+			_tmp21_ = photo_file_format_is_file_supported (_tmp20_);
 #line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			if (!_tmp23_) {
-#line 1470 "DirectPhotoPage.c"
-				const gchar* _tmp24_ = NULL;
-				GFile* _tmp25_ = NULL;
-				gchar* _tmp26_ = NULL;
-				gchar* _tmp27_ = NULL;
-				gchar* _tmp28_ = NULL;
-				gchar* _tmp29_ = NULL;
+			if (!_tmp21_) {
+#line 1458 "DirectPhotoPage.c"
+				GFile* _tmp22_;
+				gchar* _tmp23_;
+				gchar* _tmp24_;
+				gchar* _tmp25_;
+				gchar* _tmp26_;
 #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp24_ = _ ("%s does not support the file format of\n%s.");
+				_tmp22_ = file;
 #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp25_ = file;
+				_tmp23_ = g_file_get_path (_tmp22_);
 #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp26_ = g_file_get_path (_tmp25_);
+				_tmp24_ = _tmp23_;
 #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp27_ = _tmp26_;
+				_tmp25_ = g_strdup_printf (_ ("%s does not support the file format of\n%s."), RESOURCES_APP_TITLE, _tmp24_);
 #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp28_ = g_strdup_printf (_tmp24_, RESOURCES_APP_TITLE, _tmp27_);
+				_tmp26_ = _tmp25_;
 #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp29_ = _tmp28_;
-#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				app_window_error_message (_tmp29_, NULL);
+				app_window_error_message (_tmp26_, NULL);
 #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_g_free0 (_tmp29_);
+				_g_free0 (_tmp26_);
 #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_g_free0 (_tmp27_);
-#line 1495 "DirectPhotoPage.c"
+				_g_free0 (_tmp24_);
+#line 1480 "DirectPhotoPage.c"
 			} else {
 #line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				result = TRUE;
 #line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				return result;
-#line 1501 "DirectPhotoPage.c"
+#line 1486 "DirectPhotoPage.c"
 			}
 		}
 	}
@@ -1505,24 +1490,24 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 	result = FALSE;
 #line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1509 "DirectPhotoPage.c"
+#line 1494 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_real_realize (GtkWidget* base) {
 	DirectPhotoPage * self;
 	DirectPhoto* photo = NULL;
-	DirectPhotoSourceCollection* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	DirectPhoto* _tmp2_ = NULL;
-	DirectPhoto* _tmp3_ = NULL;
+	DirectPhotoSourceCollection* _tmp0_;
+	GFile* _tmp1_;
+	DirectPhoto* _tmp2_;
+	DirectPhoto* _tmp3_;
 #line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 112 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (GTK_WIDGET_CLASS (direct_photo_page_parent_class)->realize != NULL) {
 #line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		GTK_WIDGET_CLASS (direct_photo_page_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget));
-#line 1526 "DirectPhotoPage.c"
+#line 1511 "DirectPhotoPage.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = direct_photo_global;
@@ -1536,42 +1521,39 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
 	_tmp3_ = photo;
 #line 117 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp3_ != NULL) {
-#line 1540 "DirectPhotoPage.c"
-		DirectViewCollection* _tmp4_ = NULL;
-		DirectPhoto* _tmp5_ = NULL;
+#line 1525 "DirectPhotoPage.c"
+		DirectViewCollection* _tmp4_;
+		DirectPhoto* _tmp5_;
 #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = self->priv->view_controller;
 #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp5_ = photo;
 #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo));
-#line 1549 "DirectPhotoPage.c"
+#line 1534 "DirectPhotoPage.c"
 	} else {
-		const gchar* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp6_ = _ ("Unable open photo %s. Sorry.");
+		GFile* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
 #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp7_ = self->priv->initial_file;
+		_tmp6_ = self->priv->initial_file;
 #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp8_ = g_file_get_path (_tmp7_);
+		_tmp7_ = g_file_get_path (_tmp6_);
 #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp9_ = _tmp8_;
+		_tmp8_ = _tmp7_;
 #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp10_ = g_strdup_printf (_tmp6_, _tmp9_);
+		_tmp9_ = g_strdup_printf (_ ("Unable open photo %s. Sorry."), _tmp8_);
 #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp11_ = _tmp10_;
+		_tmp10_ = _tmp9_;
 #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		app_window_panic (_tmp11_);
+		app_window_panic (_tmp10_);
 #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_g_free0 (_tmp11_);
+		_g_free0 (_tmp10_);
 #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_g_free0 (_tmp9_);
-#line 1575 "DirectPhotoPage.c"
+		_g_free0 (_tmp8_);
+#line 1557 "DirectPhotoPage.c"
 	}
 #line 123 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (self->priv->initial_file);
@@ -1579,27 +1561,27 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
 	self->priv->initial_file = NULL;
 #line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 1583 "DirectPhotoPage.c"
+#line 1565 "DirectPhotoPage.c"
 }
 
 
 static void _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed (DirectPhoto* _sender, gboolean b, gpointer self) {
 #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_dphoto_can_rotate_changed ((DirectPhotoPage*) self, b);
-#line 1590 "DirectPhotoPage.c"
+#line 1572 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo* new_photo) {
 	DirectPhotoPage * self;
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	Photo* _tmp8_ = NULL;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
+	gboolean _tmp2_;
+	Photo* _tmp8_;
 	DirectPhoto* tmp = NULL;
-	Photo* _tmp9_ = NULL;
-	DirectPhoto* _tmp10_ = NULL;
-	DirectPhoto* _tmp11_ = NULL;
+	Photo* _tmp9_;
+	DirectPhoto* _tmp10_;
+	DirectPhoto* _tmp11_;
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1614,11 +1596,11 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
 	_g_object_unref0 (_tmp1_);
 #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp2_) {
-#line 1618 "DirectPhotoPage.c"
+#line 1600 "DirectPhotoPage.c"
 		DirectPhoto* tmp = NULL;
-		Photo* _tmp3_ = NULL;
-		DirectPhoto* _tmp4_ = NULL;
-		DirectPhoto* _tmp5_ = NULL;
+		Photo* _tmp3_;
+		DirectPhoto* _tmp4_;
+		DirectPhoto* _tmp5_;
 #line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1627,7 +1609,7 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
 		if (_tmp4_ == NULL) {
 #line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 1631 "DirectPhotoPage.c"
+#line 1613 "DirectPhotoPage.c"
 		}
 #line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		tmp = _tmp4_;
@@ -1635,20 +1617,20 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
 		_tmp5_ = tmp;
 #line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp5_ != NULL) {
-#line 1639 "DirectPhotoPage.c"
-			DirectPhoto* _tmp6_ = NULL;
-			guint _tmp7_ = 0U;
+#line 1621 "DirectPhotoPage.c"
+			DirectPhoto* _tmp6_;
+			guint _tmp7_;
 #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp6_ = tmp;
 #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			g_signal_parse_name ("can-rotate-changed", TYPE_DIRECT_PHOTO, &_tmp7_, NULL, FALSE);
 #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed, self);
-#line 1648 "DirectPhotoPage.c"
+#line 1630 "DirectPhotoPage.c"
 		}
 #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (tmp);
-#line 1652 "DirectPhotoPage.c"
+#line 1634 "DirectPhotoPage.c"
 	}
 #line 135 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = new_photo;
@@ -1664,26 +1646,26 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
 	_tmp11_ = tmp;
 #line 139 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp11_ != NULL) {
-#line 1668 "DirectPhotoPage.c"
-		DirectPhoto* _tmp12_ = NULL;
+#line 1650 "DirectPhotoPage.c"
+		DirectPhoto* _tmp12_;
 #line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = tmp;
 #line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		g_signal_connect_object (_tmp12_, "can-rotate-changed", (GCallback) _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed, self, 0);
-#line 1674 "DirectPhotoPage.c"
+#line 1656 "DirectPhotoPage.c"
 	}
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (tmp);
-#line 1678 "DirectPhotoPage.c"
+#line 1660 "DirectPhotoPage.c"
 }
 
 
 GFile* direct_photo_page_get_current_file (DirectPhotoPage* self) {
 	GFile* result = NULL;
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
 #line 144 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), NULL);
 #line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1700,16 +1682,16 @@ GFile* direct_photo_page_get_current_file (DirectPhotoPage* self) {
 	result = _tmp3_;
 #line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1704 "DirectPhotoPage.c"
+#line 1686 "DirectPhotoPage.c"
 }
 
 
 static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event) {
 	DirectPhotoPage * self;
 	gboolean result = FALSE;
-	GtkMenu* _tmp0_ = NULL;
-	GtkMenu* _tmp1_ = NULL;
-	GdkEventButton* _tmp2_ = NULL;
+	GtkMenu* _tmp0_;
+	GtkMenu* _tmp1_;
+	GdkEventButton* _tmp2_;
 #line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1728,29 +1710,29 @@ static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEv
 	result = TRUE;
 #line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1732 "DirectPhotoPage.c"
+#line 1714 "DirectPhotoPage.c"
 }
 
 
 static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self) {
 	GtkMenu* result = NULL;
-	GtkMenu* _tmp0_ = NULL;
-	GtkMenu* _tmp7_ = NULL;
-	GtkMenu* _tmp8_ = NULL;
+	GtkMenu* _tmp0_;
+	GtkMenu* _tmp7_;
+	GtkMenu* _tmp8_;
 #line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), NULL);
 #line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = self->priv->context_menu;
 #line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 1747 "DirectPhotoPage.c"
+#line 1729 "DirectPhotoPage.c"
 		GMenuModel* model = NULL;
-		GtkBuilder* _tmp1_ = NULL;
-		GObject* _tmp2_ = NULL;
-		GMenuModel* _tmp3_ = NULL;
-		GMenuModel* _tmp4_ = NULL;
-		GtkMenu* _tmp5_ = NULL;
-		GtkMenu* _tmp6_ = NULL;
+		GtkBuilder* _tmp1_;
+		GObject* _tmp2_;
+		GMenuModel* _tmp3_;
+		GMenuModel* _tmp4_;
+		GtkMenu* _tmp5_;
+		GtkMenu* _tmp6_;
 #line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
 #line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1775,7 +1757,7 @@ static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self) {
 		gtk_menu_attach_to_widget (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
 #line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (model);
-#line 1779 "DirectPhotoPage.c"
+#line 1761 "DirectPhotoPage.c"
 	}
 #line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = self->priv->context_menu;
@@ -1785,17 +1767,17 @@ static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self) {
 	result = _tmp8_;
 #line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1789 "DirectPhotoPage.c"
+#line 1771 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp2_;
 	gboolean _tmp4_ = FALSE;
 	ZoomState _tmp5_ = {0};
-	gboolean _tmp6_ = FALSE;
+	gboolean _tmp6_;
 #line 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
 #line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1804,17 +1786,17 @@ static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage
 	_tmp2_ = zoom_state_is_max (&_tmp1_);
 #line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp2_) {
-#line 1808 "DirectPhotoPage.c"
-		gboolean _tmp3_ = FALSE;
+#line 1790 "DirectPhotoPage.c"
+		gboolean _tmp3_;
 #line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = !_tmp3_;
-#line 1814 "DirectPhotoPage.c"
+#line 1796 "DirectPhotoPage.c"
 	} else {
 #line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 1818 "DirectPhotoPage.c"
+#line 1800 "DirectPhotoPage.c"
 	}
 #line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_);
@@ -1824,21 +1806,21 @@ static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage
 	_tmp6_ = zoom_state_is_default (&_tmp5_);
 #line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp6_) {
-#line 1828 "DirectPhotoPage.c"
-		gboolean _tmp7_ = FALSE;
+#line 1810 "DirectPhotoPage.c"
+		gboolean _tmp7_;
 #line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = !_tmp7_;
-#line 1834 "DirectPhotoPage.c"
+#line 1816 "DirectPhotoPage.c"
 	} else {
 #line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 1838 "DirectPhotoPage.c"
+#line 1820 "DirectPhotoPage.c"
 	}
 #line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_);
-#line 1842 "DirectPhotoPage.c"
+#line 1824 "DirectPhotoPage.c"
 }
 
 
@@ -1850,7 +1832,7 @@ static void direct_photo_page_real_on_increase_size (EditingHostPage* base) {
 	EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 1854 "DirectPhotoPage.c"
+#line 1836 "DirectPhotoPage.c"
 }
 
 
@@ -1862,20 +1844,20 @@ static void direct_photo_page_real_on_decrease_size (EditingHostPage* base) {
 	EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 181 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 1866 "DirectPhotoPage.c"
+#line 1848 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* map) {
 	gboolean contains = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	gboolean _tmp14_ = FALSE;
-	gboolean _tmp15_ = FALSE;
+	gboolean _tmp15_;
 	gboolean sensitive = FALSE;
-	gboolean _tmp17_ = FALSE;
+	gboolean _tmp17_;
 	gboolean _tmp19_ = FALSE;
-	gboolean _tmp20_ = FALSE;
-	gboolean _tmp25_ = FALSE;
+	gboolean _tmp20_;
+	gboolean _tmp25_;
 #line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
 #line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1886,22 +1868,22 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_) {
-#line 1890 "DirectPhotoPage.c"
+#line 1872 "DirectPhotoPage.c"
 		Photo* photo = NULL;
-		Photo* _tmp1_ = NULL;
+		Photo* _tmp1_;
 #line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		photo = _tmp1_;
-#line 1897 "DirectPhotoPage.c"
+#line 1879 "DirectPhotoPage.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeMap* _tmp2_ = NULL;
-			GeeSet* _tmp3_ = NULL;
-			GeeSet* _tmp4_ = NULL;
-			GeeSet* _tmp5_ = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			GeeIterator* _tmp7_ = NULL;
+			GeeMap* _tmp2_;
+			GeeSet* _tmp3_;
+			GeeSet* _tmp4_;
+			GeeSet* _tmp5_;
+			GeeIterator* _tmp6_;
+			GeeIterator* _tmp7_;
 #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp2_ = map;
 #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1920,14 +1902,14 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 			_object_it = _tmp7_;
 #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			while (TRUE) {
-#line 1924 "DirectPhotoPage.c"
-				GeeIterator* _tmp8_ = NULL;
-				gboolean _tmp9_ = FALSE;
+#line 1906 "DirectPhotoPage.c"
+				GeeIterator* _tmp8_;
+				gboolean _tmp9_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp10_ = NULL;
-				gpointer _tmp11_ = NULL;
-				DataObject* _tmp12_ = NULL;
-				Photo* _tmp13_ = NULL;
+				GeeIterator* _tmp10_;
+				gpointer _tmp11_;
+				DataObject* _tmp12_;
+				Photo* _tmp13_;
 #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp8_ = _object_it;
 #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1936,7 +1918,7 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 				if (!_tmp9_) {
 #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					break;
-#line 1940 "DirectPhotoPage.c"
+#line 1922 "DirectPhotoPage.c"
 				}
 #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp10_ = _object_it;
@@ -1956,35 +1938,35 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 					_g_object_unref0 (object);
 #line 192 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					break;
-#line 1960 "DirectPhotoPage.c"
+#line 1942 "DirectPhotoPage.c"
 				}
 #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_object_unref0 (object);
-#line 1964 "DirectPhotoPage.c"
+#line 1946 "DirectPhotoPage.c"
 			}
 #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_object_unref0 (_object_it);
-#line 1968 "DirectPhotoPage.c"
+#line 1950 "DirectPhotoPage.c"
 		}
 #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 1972 "DirectPhotoPage.c"
+#line 1954 "DirectPhotoPage.c"
 	}
 #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp15_) {
-#line 1978 "DirectPhotoPage.c"
-		gboolean _tmp16_ = FALSE;
+#line 1960 "DirectPhotoPage.c"
+		gboolean _tmp16_;
 #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp16_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = !_tmp16_;
-#line 1984 "DirectPhotoPage.c"
+#line 1966 "DirectPhotoPage.c"
 	} else {
 #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 1988 "DirectPhotoPage.c"
+#line 1970 "DirectPhotoPage.c"
 	}
 #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	sensitive = _tmp14_;
@@ -1992,23 +1974,23 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 	_tmp17_ = sensitive;
 #line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp17_) {
-#line 1996 "DirectPhotoPage.c"
-		gboolean _tmp18_ = FALSE;
+#line 1978 "DirectPhotoPage.c"
+		gboolean _tmp18_;
 #line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp18_ = contains;
 #line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		sensitive = _tmp18_;
-#line 2002 "DirectPhotoPage.c"
+#line 1984 "DirectPhotoPage.c"
 	}
 #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp20_ = sensitive;
 #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp20_) {
-#line 2008 "DirectPhotoPage.c"
-		Photo* _tmp21_ = NULL;
-		Photo* _tmp22_ = NULL;
-		PhotoFileFormat _tmp23_ = 0;
-		gboolean _tmp24_ = FALSE;
+#line 1990 "DirectPhotoPage.c"
+		Photo* _tmp21_;
+		Photo* _tmp22_;
+		PhotoFileFormat _tmp23_;
+		gboolean _tmp24_;
 #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp21_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2021,11 +2003,11 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 		_tmp19_ = _tmp24_;
 #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp22_);
-#line 2025 "DirectPhotoPage.c"
+#line 2007 "DirectPhotoPage.c"
 	} else {
 #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp19_ = FALSE;
-#line 2029 "DirectPhotoPage.c"
+#line 2011 "DirectPhotoPage.c"
 	}
 #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp19_);
@@ -2033,13 +2015,13 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 	_tmp25_ = sensitive;
 #line 202 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp25_);
-#line 2037 "DirectPhotoPage.c"
+#line 2019 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_selection_group_altered (DirectPhotoPage* self) {
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
 #line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2050,7 +2032,7 @@ static void direct_photo_page_on_selection_group_altered (DirectPhotoPage* self)
 	command_manager_reset (_tmp1_);
 #line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 2054 "DirectPhotoPage.c"
+#line 2036 "DirectPhotoPage.c"
 }
 
 
@@ -2058,11 +2040,11 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G
 	DirectPhotoPage * self;
 	gboolean result = FALSE;
 	FullscreenWindow* fs = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	FullscreenWindow* _tmp1_ = NULL;
-	FullscreenWindow* _tmp2_ = NULL;
-	GdkEventButton* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	GtkWindow* _tmp0_;
+	FullscreenWindow* _tmp1_;
+	FullscreenWindow* _tmp2_;
+	GdkEventButton* _tmp4_;
+	gboolean _tmp5_;
 #line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2075,7 +2057,7 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G
 	if (_tmp1_ == NULL) {
 #line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2079 "DirectPhotoPage.c"
+#line 2061 "DirectPhotoPage.c"
 	}
 #line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	fs = _tmp1_;
@@ -2083,8 +2065,8 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G
 	_tmp2_ = fs;
 #line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 2087 "DirectPhotoPage.c"
-		FullscreenWindow* _tmp3_ = NULL;
+#line 2069 "DirectPhotoPage.c"
+		FullscreenWindow* _tmp3_;
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = fs;
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2095,7 +2077,7 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G
 		_g_object_unref0 (fs);
 #line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 2099 "DirectPhotoPage.c"
+#line 2081 "DirectPhotoPage.c"
 	}
 #line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = event;
@@ -2107,42 +2089,42 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G
 	_g_object_unref0 (fs);
 #line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 2111 "DirectPhotoPage.c"
+#line 2093 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_real_update_ui (EditingHostPage* base, gboolean missing) {
 	DirectPhotoPage * self;
 	gboolean sensitivity = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_ = FALSE;
-	gboolean _tmp10_ = FALSE;
-	gboolean _tmp11_ = FALSE;
-	gboolean _tmp12_ = FALSE;
-	gboolean _tmp13_ = FALSE;
-	gboolean _tmp14_ = FALSE;
-	gboolean _tmp15_ = FALSE;
-	gboolean _tmp16_ = FALSE;
-	gboolean _tmp17_ = FALSE;
-	gboolean _tmp18_ = FALSE;
-	gboolean _tmp19_ = FALSE;
-	gboolean _tmp20_ = FALSE;
-	gboolean _tmp21_ = FALSE;
-	gboolean _tmp22_ = FALSE;
-	gboolean _tmp23_ = FALSE;
-	gboolean _tmp24_ = FALSE;
-	gboolean _tmp25_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp7_;
+	gboolean _tmp8_;
+	gboolean _tmp9_;
+	gboolean _tmp10_;
+	gboolean _tmp11_;
+	gboolean _tmp12_;
+	gboolean _tmp13_;
+	gboolean _tmp14_;
+	gboolean _tmp15_;
+	gboolean _tmp16_;
+	gboolean _tmp17_;
+	gboolean _tmp18_;
+	gboolean _tmp19_;
+	gboolean _tmp20_;
+	gboolean _tmp21_;
+	gboolean _tmp22_;
+	gboolean _tmp23_;
+	gboolean _tmp24_;
+	gboolean _tmp25_;
 	gboolean _tmp26_ = FALSE;
-	gboolean _tmp27_ = FALSE;
-	gboolean _tmp29_ = FALSE;
+	gboolean _tmp27_;
+	gboolean _tmp29_;
 #line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2253,17 +2235,17 @@ static void direct_photo_page_real_update_ui (EditingHostPage* base, gboolean mi
 	_tmp27_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp27_) {
-#line 2257 "DirectPhotoPage.c"
-		gboolean _tmp28_ = FALSE;
+#line 2239 "DirectPhotoPage.c"
+		gboolean _tmp28_;
 #line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp28_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp26_ = !_tmp28_;
-#line 2263 "DirectPhotoPage.c"
+#line 2245 "DirectPhotoPage.c"
 	} else {
 #line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp26_ = FALSE;
-#line 2267 "DirectPhotoPage.c"
+#line 2249 "DirectPhotoPage.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp26_);
@@ -2271,41 +2253,41 @@ static void direct_photo_page_real_update_ui (EditingHostPage* base, gboolean mi
 	_tmp29_ = missing;
 #line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp29_);
-#line 2275 "DirectPhotoPage.c"
+#line 2257 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_real_update_actions (Page* base, gint selected_count, gint count) {
 	DirectPhotoPage * self;
 	gboolean multiple = FALSE;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	gboolean _tmp5_;
 	gboolean revert_possible = FALSE;
 	gboolean _tmp12_ = FALSE;
-	gboolean _tmp13_ = FALSE;
+	gboolean _tmp13_;
 	gboolean rotate_possible = FALSE;
 	gboolean _tmp17_ = FALSE;
-	gboolean _tmp18_ = FALSE;
+	gboolean _tmp18_;
 	gboolean enhance_possible = FALSE;
-	gboolean _tmp22_ = FALSE;
-	gboolean _tmp23_ = FALSE;
-	gboolean _tmp24_ = FALSE;
-	gboolean _tmp25_ = FALSE;
-	gboolean _tmp26_ = FALSE;
-	gboolean _tmp27_ = FALSE;
-	gboolean _tmp28_ = FALSE;
-	gboolean _tmp29_ = FALSE;
-	gboolean _tmp30_ = FALSE;
-	gboolean _tmp31_ = FALSE;
-	Photo* _tmp40_ = NULL;
-	Photo* _tmp41_ = NULL;
-	gboolean _tmp42_ = FALSE;
-	gint _tmp46_ = 0;
-	gint _tmp47_ = 0;
+	gboolean _tmp22_;
+	gboolean _tmp23_;
+	gboolean _tmp24_;
+	gboolean _tmp25_;
+	gboolean _tmp26_;
+	gboolean _tmp27_;
+	gboolean _tmp28_;
+	gboolean _tmp29_;
+	gboolean _tmp30_;
+	gboolean _tmp31_;
+	Photo* _tmp40_;
+	Photo* _tmp41_;
+	gboolean _tmp42_;
+	gint _tmp46_;
+	gint _tmp47_;
 #line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2324,12 +2306,12 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 	_tmp5_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp5_) {
-#line 2328 "DirectPhotoPage.c"
+#line 2310 "DirectPhotoPage.c"
 		gboolean _tmp6_ = FALSE;
-		Photo* _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
-		gboolean _tmp10_ = FALSE;
+		Photo* _tmp7_;
+		Photo* _tmp8_;
+		gboolean _tmp9_;
+		gboolean _tmp10_;
 #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2342,25 +2324,25 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 		_g_object_unref0 (_tmp8_);
 #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp10_) {
-#line 2346 "DirectPhotoPage.c"
-			gboolean _tmp11_ = FALSE;
+#line 2328 "DirectPhotoPage.c"
+			gboolean _tmp11_;
 #line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp11_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp6_ = !_tmp11_;
-#line 2352 "DirectPhotoPage.c"
+#line 2334 "DirectPhotoPage.c"
 		} else {
 #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp6_ = FALSE;
-#line 2356 "DirectPhotoPage.c"
+#line 2338 "DirectPhotoPage.c"
 		}
 #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = _tmp6_;
-#line 2360 "DirectPhotoPage.c"
+#line 2342 "DirectPhotoPage.c"
 	} else {
 #line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 2364 "DirectPhotoPage.c"
+#line 2346 "DirectPhotoPage.c"
 	}
 #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	revert_possible = _tmp4_;
@@ -2368,10 +2350,10 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 	_tmp13_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp13_) {
-#line 2372 "DirectPhotoPage.c"
-		Photo* _tmp14_ = NULL;
-		Photo* _tmp15_ = NULL;
-		gboolean _tmp16_ = FALSE;
+#line 2354 "DirectPhotoPage.c"
+		Photo* _tmp14_;
+		Photo* _tmp15_;
+		gboolean _tmp16_;
 #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2382,11 +2364,11 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 		_tmp12_ = _tmp16_;
 #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp15_);
-#line 2386 "DirectPhotoPage.c"
+#line 2368 "DirectPhotoPage.c"
 	} else {
 #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 2390 "DirectPhotoPage.c"
+#line 2372 "DirectPhotoPage.c"
 	}
 #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	rotate_possible = _tmp12_;
@@ -2394,10 +2376,10 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 	_tmp18_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp18_) {
-#line 2398 "DirectPhotoPage.c"
-		Photo* _tmp19_ = NULL;
-		Photo* _tmp20_ = NULL;
-		gboolean _tmp21_ = FALSE;
+#line 2380 "DirectPhotoPage.c"
+		Photo* _tmp19_;
+		Photo* _tmp20_;
+		gboolean _tmp21_;
 #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp19_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2408,11 +2390,11 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 		_tmp17_ = _tmp21_;
 #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 2412 "DirectPhotoPage.c"
+#line 2394 "DirectPhotoPage.c"
 	} else {
 #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp17_ = FALSE;
-#line 2416 "DirectPhotoPage.c"
+#line 2398 "DirectPhotoPage.c"
 	}
 #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	enhance_possible = _tmp17_;
@@ -2456,15 +2438,15 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 	_tmp31_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 281 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp31_) {
-#line 2460 "DirectPhotoPage.c"
-		Photo* _tmp32_ = NULL;
-		Photo* _tmp33_ = NULL;
+#line 2442 "DirectPhotoPage.c"
+		Photo* _tmp32_;
+		Photo* _tmp33_;
 		Scaling _tmp34_ = {0};
-		gboolean _tmp35_ = FALSE;
-		Photo* _tmp36_ = NULL;
-		Photo* _tmp37_ = NULL;
+		gboolean _tmp35_;
+		Photo* _tmp36_;
+		Photo* _tmp37_;
 		Scaling _tmp38_ = {0};
-		gboolean _tmp39_ = FALSE;
+		gboolean _tmp39_;
 #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp32_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2489,7 +2471,7 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp39_);
 #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp37_);
-#line 2493 "DirectPhotoPage.c"
+#line 2475 "DirectPhotoPage.c"
 	}
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp40_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -2501,10 +2483,10 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 	_g_object_unref0 (_tmp41_);
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp42_) {
-#line 2505 "DirectPhotoPage.c"
-		Photo* _tmp43_ = NULL;
-		Photo* _tmp44_ = NULL;
-		PhotoFileFormat _tmp45_ = 0;
+#line 2487 "DirectPhotoPage.c"
+		Photo* _tmp43_;
+		Photo* _tmp44_;
+		PhotoFileFormat _tmp45_;
 #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp43_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2515,11 +2497,11 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp45_ != PHOTO_FILE_FORMAT_RAW);
 #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp44_);
-#line 2519 "DirectPhotoPage.c"
+#line 2501 "DirectPhotoPage.c"
 	} else {
 #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", FALSE);
-#line 2523 "DirectPhotoPage.c"
+#line 2505 "DirectPhotoPage.c"
 	}
 #line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp46_ = selected_count;
@@ -2527,38 +2509,36 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 	_tmp47_ = count;
 #line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	PAGE_CLASS (direct_photo_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp46_, _tmp47_);
-#line 2531 "DirectPhotoPage.c"
+#line 2513 "DirectPhotoPage.c"
 }
 
 
 static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self, Photo* photo) {
 	gboolean result = FALSE;
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 	gboolean is_writeable = FALSE;
-	Photo* _tmp5_ = NULL;
-	Photo* _tmp6_ = NULL;
-	PhotoFileFormat _tmp7_ = 0;
-	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_ = FALSE;
+	Photo* _tmp5_;
+	Photo* _tmp6_;
+	PhotoFileFormat _tmp7_;
+	gboolean _tmp8_;
+	gboolean _tmp9_;
 	const gchar* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
+	gboolean _tmp11_;
 	gchar* save_option = NULL;
-	gchar* _tmp14_ = NULL;
+	gchar* _tmp12_;
 	GtkResponseType response = 0;
-	const gchar* _tmp15_ = NULL;
-	Photo* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	GtkResponseType _tmp23_ = 0;
-	GtkResponseType _tmp24_ = 0;
-	GtkResponseType _tmp25_ = 0;
+	Photo* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	const gchar* _tmp18_;
+	GtkResponseType _tmp19_;
+	GtkResponseType _tmp20_;
+	GtkResponseType _tmp21_;
 #line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE);
 #line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2571,7 +2551,7 @@ static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self
 		result = TRUE;
 #line 302 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 2575 "DirectPhotoPage.c"
+#line 2555 "DirectPhotoPage.c"
 	}
 #line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = photo;
@@ -2583,14 +2563,14 @@ static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self
 		result = TRUE;
 #line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 2587 "DirectPhotoPage.c"
+#line 2567 "DirectPhotoPage.c"
 	}
 #line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = self->priv->drop_if_dirty;
 #line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp3_) {
-#line 2593 "DirectPhotoPage.c"
-		Photo* _tmp4_ = NULL;
+#line 2573 "DirectPhotoPage.c"
+		Photo* _tmp4_;
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = photo;
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2599,7 +2579,7 @@ static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self
 		result = TRUE;
 #line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 2603 "DirectPhotoPage.c"
+#line 2583 "DirectPhotoPage.c"
 	}
 #line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -2619,146 +2599,135 @@ static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self
 	_tmp11_ = is_writeable;
 #line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp11_) {
-#line 2623 "DirectPhotoPage.c"
-		const gchar* _tmp12_ = NULL;
 #line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp12_ = _ ("_Save");
-#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp10_ = _tmp12_;
-#line 2629 "DirectPhotoPage.c"
+		_tmp10_ = _ ("_Save");
+#line 2605 "DirectPhotoPage.c"
 	} else {
-		const gchar* _tmp13_ = NULL;
-#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp13_ = _ ("_Save a Copy");
 #line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp10_ = _tmp13_;
-#line 2636 "DirectPhotoPage.c"
+		_tmp10_ = _ ("_Save a Copy");
+#line 2609 "DirectPhotoPage.c"
 	}
 #line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp14_ = g_strdup (_tmp10_);
+	_tmp12_ = g_strdup (_tmp10_);
 #line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	save_option = _tmp14_;
+	save_option = _tmp12_;
 #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp15_ = _ ("Lose changes to %s?");
+	_tmp13_ = photo;
 #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp16_ = photo;
+	_tmp14_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp17_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp18_ = _tmp17_;
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp19_ = g_strdup_printf (_tmp15_, _tmp18_);
+	_tmp15_ = _tmp14_;
 #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp20_ = _tmp19_;
+	_tmp16_ = g_strdup_printf (_ ("Lose changes to %s?"), _tmp15_);
 #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp21_ = save_option;
+	_tmp17_ = _tmp16_;
 #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp22_ = _ ("Close _without Saving");
+	_tmp18_ = save_option;
 #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp23_ = app_window_negate_affirm_cancel_question (_tmp20_, _tmp21_, _tmp22_, NULL, NULL);
+	_tmp19_ = app_window_negate_affirm_cancel_question (_tmp17_, _tmp18_, _ ("Close _without Saving"), NULL, NULL);
 #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp24_ = _tmp23_;
+	_tmp20_ = _tmp19_;
 #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_g_free0 (_tmp20_);
+	_g_free0 (_tmp17_);
 #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_g_free0 (_tmp18_);
+	_g_free0 (_tmp15_);
 #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	response = _tmp24_;
+	response = _tmp20_;
 #line 322 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp25_ = response;
+	_tmp21_ = response;
 #line 322 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if (_tmp25_ == GTK_RESPONSE_YES) {
-#line 2672 "DirectPhotoPage.c"
-		Photo* _tmp26_ = NULL;
+	if (_tmp21_ == GTK_RESPONSE_YES) {
+#line 2641 "DirectPhotoPage.c"
+		Photo* _tmp22_;
 #line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp26_ = photo;
+		_tmp22_ = photo;
 #line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		photo_remove_all_transformations (_tmp26_);
-#line 2678 "DirectPhotoPage.c"
+		photo_remove_all_transformations (_tmp22_);
+#line 2647 "DirectPhotoPage.c"
 	} else {
-		GtkResponseType _tmp27_ = 0;
+		GtkResponseType _tmp23_;
 #line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp27_ = response;
+		_tmp23_ = response;
 #line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		if (_tmp27_ == GTK_RESPONSE_NO) {
-#line 2685 "DirectPhotoPage.c"
-			gboolean _tmp28_ = FALSE;
+		if (_tmp23_ == GTK_RESPONSE_NO) {
+#line 2654 "DirectPhotoPage.c"
+			gboolean _tmp24_;
 #line 325 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			_tmp28_ = is_writeable;
+			_tmp24_ = is_writeable;
 #line 325 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			if (_tmp28_) {
-#line 2691 "DirectPhotoPage.c"
-				Photo* _tmp29_ = NULL;
-				GFile* _tmp30_ = NULL;
-				GFile* _tmp31_ = NULL;
-				Photo* _tmp32_ = NULL;
-				Photo* _tmp33_ = NULL;
-				PhotoFileFormat _tmp34_ = 0;
+			if (_tmp24_) {
+#line 2660 "DirectPhotoPage.c"
+				Photo* _tmp25_;
+				GFile* _tmp26_;
+				GFile* _tmp27_;
+				Photo* _tmp28_;
+				Photo* _tmp29_;
+				PhotoFileFormat _tmp30_;
 #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp29_ = photo;
+				_tmp25_ = photo;
 #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp30_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_MEDIA_SOURCE, MediaSource));
+				_tmp26_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp31_ = _tmp30_;
+				_tmp27_ = _tmp26_;
 #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp32_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+				_tmp28_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp33_ = _tmp32_;
+				_tmp29_ = _tmp28_;
 #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp34_ = photo_get_file_format (_tmp33_);
+				_tmp30_ = photo_get_file_format (_tmp29_);
 #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				direct_photo_page_save (self, _tmp31_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, _tmp34_, FALSE, TRUE);
+				direct_photo_page_save (self, _tmp27_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, _tmp30_, FALSE, TRUE);
 #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_g_object_unref0 (_tmp33_);
+				_g_object_unref0 (_tmp29_);
 #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_g_object_unref0 (_tmp31_);
-#line 2716 "DirectPhotoPage.c"
+				_g_object_unref0 (_tmp27_);
+#line 2685 "DirectPhotoPage.c"
 			} else {
 #line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				direct_photo_page_on_save_as (self);
-#line 2720 "DirectPhotoPage.c"
+#line 2689 "DirectPhotoPage.c"
 			}
 		} else {
-			gboolean _tmp35_ = FALSE;
-			gboolean _tmp36_ = FALSE;
-			GtkResponseType _tmp37_ = 0;
+			gboolean _tmp31_ = FALSE;
+			gboolean _tmp32_ = FALSE;
+			GtkResponseType _tmp33_;
 #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			_tmp37_ = response;
+			_tmp33_ = response;
 #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			if (_tmp37_ == GTK_RESPONSE_CANCEL) {
+			if (_tmp33_ == GTK_RESPONSE_CANCEL) {
 #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp36_ = TRUE;
-#line 2732 "DirectPhotoPage.c"
+				_tmp32_ = TRUE;
+#line 2701 "DirectPhotoPage.c"
 			} else {
-				GtkResponseType _tmp38_ = 0;
+				GtkResponseType _tmp34_;
 #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp38_ = response;
+				_tmp34_ = response;
 #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp36_ = _tmp38_ == GTK_RESPONSE_DELETE_EVENT;
-#line 2739 "DirectPhotoPage.c"
+				_tmp32_ = _tmp34_ == GTK_RESPONSE_DELETE_EVENT;
+#line 2708 "DirectPhotoPage.c"
 			}
 #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			if (_tmp36_) {
+			if (_tmp32_) {
 #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp35_ = TRUE;
-#line 2745 "DirectPhotoPage.c"
+				_tmp31_ = TRUE;
+#line 2714 "DirectPhotoPage.c"
 			} else {
-				GtkResponseType _tmp39_ = 0;
+				GtkResponseType _tmp35_;
 #line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp39_ = response;
+				_tmp35_ = response;
 #line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp35_ = _tmp39_ == GTK_RESPONSE_CLOSE;
-#line 2752 "DirectPhotoPage.c"
+				_tmp31_ = _tmp35_ == GTK_RESPONSE_CLOSE;
+#line 2721 "DirectPhotoPage.c"
 			}
 #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			if (_tmp35_) {
+			if (_tmp31_) {
 #line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				result = FALSE;
 #line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (save_option);
 #line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				return result;
-#line 2762 "DirectPhotoPage.c"
+#line 2731 "DirectPhotoPage.c"
 			}
 		}
 	}
@@ -2768,16 +2737,16 @@ static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self
 	_g_free0 (save_option);
 #line 335 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 2772 "DirectPhotoPage.c"
+#line 2741 "DirectPhotoPage.c"
 }
 
 
 gboolean direct_photo_page_check_quit (DirectPhotoPage* self) {
 	gboolean result = FALSE;
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE);
 #line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2794,7 +2763,7 @@ gboolean direct_photo_page_check_quit (DirectPhotoPage* self) {
 	result = _tmp3_;
 #line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 2798 "DirectPhotoPage.c"
+#line 2767 "DirectPhotoPage.c"
 }
 
 
@@ -2802,7 +2771,7 @@ static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* b
 	DirectPhotoPage * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	Photo* _tmp1_ = NULL;
+	Photo* _tmp1_;
 #line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2813,49 +2782,49 @@ static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* b
 	_tmp1_ = old_photo;
 #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp1_ != NULL) {
-#line 2817 "DirectPhotoPage.c"
-		Photo* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+#line 2786 "DirectPhotoPage.c"
+		Photo* _tmp2_;
+		gboolean _tmp3_;
 #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp2_ = old_photo;
 #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = direct_photo_page_check_ok_to_close_photo (self, _tmp2_);
 #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = _tmp3_;
-#line 2826 "DirectPhotoPage.c"
+#line 2795 "DirectPhotoPage.c"
 	} else {
 #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 2830 "DirectPhotoPage.c"
+#line 2799 "DirectPhotoPage.c"
 	}
 #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp0_;
 #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 2836 "DirectPhotoPage.c"
+#line 2805 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint scale, ScaleConstraint constraint, JpegQuality quality, PhotoFileFormat format, gboolean copy_unmodified, gboolean save_metadata) {
 	Scaling scaling = {0};
-	ScaleConstraint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	ScaleConstraint _tmp0_;
+	gint _tmp1_;
 	Scaling _tmp2_ = {0};
 	DirectPhoto* photo = NULL;
-	DirectPhotoSourceCollection* _tmp19_ = NULL;
-	GFile* _tmp20_ = NULL;
-	DirectPhoto* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	Photo* _tmp24_ = NULL;
-	Photo* _tmp25_ = NULL;
-	DirectPhoto* _tmp26_ = NULL;
-	gboolean _tmp27_ = FALSE;
-	gboolean _tmp28_ = FALSE;
-	DirectPhotoSourceCollection* _tmp33_ = NULL;
-	DirectPhoto* _tmp34_ = NULL;
-	DirectViewCollection* _tmp35_ = NULL;
-	DirectPhoto* _tmp36_ = NULL;
+	DirectPhotoSourceCollection* _tmp18_;
+	GFile* _tmp19_;
+	DirectPhoto* _tmp20_ = NULL;
+	gchar* _tmp21_;
+	gchar* _tmp22_;
+	Photo* _tmp23_;
+	Photo* _tmp24_;
+	DirectPhoto* _tmp25_;
+	gboolean _tmp26_;
+	gboolean _tmp27_;
+	DirectPhotoSourceCollection* _tmp32_;
+	DirectPhoto* _tmp33_;
+	DirectViewCollection* _tmp34_;
+	DirectPhoto* _tmp35_;
 	GError * _inner_error_ = NULL;
 #line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
@@ -2869,16 +2838,16 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 	scaling_for_constraint (_tmp0_, _tmp1_, FALSE, &_tmp2_);
 #line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	scaling = _tmp2_;
-#line 2873 "DirectPhotoPage.c"
+#line 2842 "DirectPhotoPage.c"
 	{
-		Photo* _tmp3_ = NULL;
-		Photo* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		Scaling _tmp6_ = {0};
-		JpegQuality _tmp7_ = 0;
-		PhotoFileFormat _tmp8_ = 0;
-		gboolean _tmp9_ = FALSE;
-		gboolean _tmp10_ = FALSE;
+		Photo* _tmp3_;
+		Photo* _tmp4_;
+		GFile* _tmp5_;
+		Scaling _tmp6_;
+		JpegQuality _tmp7_;
+		PhotoFileFormat _tmp8_;
+		gboolean _tmp9_;
+		gboolean _tmp10_;
 #line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2901,7 +2870,7 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 		_g_object_unref0 (_tmp4_);
 #line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2905 "DirectPhotoPage.c"
+#line 2874 "DirectPhotoPage.c"
 			goto __catch48_g_error;
 		}
 	}
@@ -2909,45 +2878,42 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 	__catch48_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp11_ = NULL;
-		GFile* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		GError* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
+		GFile* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
+		GError* _tmp14_;
+		const gchar* _tmp15_;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
 #line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		err = _inner_error_;
 #line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_inner_error_ = NULL;
 #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp11_ = _ ("Error while saving to %s: %s");
-#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp12_ = dest;
+		_tmp11_ = dest;
 #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp13_ = g_file_get_path (_tmp12_);
+		_tmp12_ = g_file_get_path (_tmp11_);
 #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp14_ = _tmp13_;
+		_tmp13_ = _tmp12_;
 #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp15_ = err;
+		_tmp14_ = err;
 #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp16_ = _tmp15_->message;
+		_tmp15_ = _tmp14_->message;
 #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp17_ = g_strdup_printf (_tmp11_, _tmp14_, _tmp16_);
+		_tmp16_ = g_strdup_printf (_ ("Error while saving to %s: %s"), _tmp13_, _tmp15_);
 #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp18_ = _tmp17_;
+		_tmp17_ = _tmp16_;
 #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		app_window_error_message (_tmp18_, NULL);
+		app_window_error_message (_tmp17_, NULL);
 #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_g_free0 (_tmp18_);
+		_g_free0 (_tmp17_);
 #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_g_free0 (_tmp14_);
+		_g_free0 (_tmp13_);
 #line 356 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_error_free0 (err);
 #line 356 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 2951 "DirectPhotoPage.c"
+#line 2917 "DirectPhotoPage.c"
 	}
 	__finally48:
 #line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2958,90 +2924,90 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 		g_clear_error (&_inner_error_);
 #line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 2962 "DirectPhotoPage.c"
+#line 2928 "DirectPhotoPage.c"
 	}
 #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp19_ = direct_photo_global;
+	_tmp18_ = direct_photo_global;
 #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp20_ = dest;
+	_tmp19_ = dest;
 #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp22_ = direct_photo_source_collection_fetch (_tmp19_, _tmp20_, &_tmp21_, TRUE);
+	_tmp21_ = direct_photo_source_collection_fetch (_tmp18_, _tmp19_, &_tmp20_, TRUE);
 #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (photo);
 #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	photo = _tmp21_;
+	photo = _tmp20_;
 #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp23_ = _tmp22_;
+	_tmp22_ = _tmp21_;
 #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_g_free0 (_tmp23_);
+	_g_free0 (_tmp22_);
 #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp24_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	_tmp23_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp25_ = _tmp24_;
+	_tmp24_ = _tmp23_;
 #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp26_ = photo;
+	_tmp25_ = photo;
 #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp27_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource));
+	_tmp26_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_SOURCE, DataSource));
 #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp28_ = !_tmp27_;
+	_tmp27_ = !_tmp26_;
 #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_g_object_unref0 (_tmp25_);
+	_g_object_unref0 (_tmp24_);
 #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if (_tmp28_) {
-#line 2992 "DirectPhotoPage.c"
+	if (_tmp27_) {
+#line 2958 "DirectPhotoPage.c"
 		DirectView* tmp_view = NULL;
-		DirectPhoto* _tmp29_ = NULL;
-		DirectView* _tmp30_ = NULL;
-		DirectViewCollection* _tmp31_ = NULL;
-		DirectView* _tmp32_ = NULL;
+		DirectPhoto* _tmp28_;
+		DirectView* _tmp29_;
+		DirectViewCollection* _tmp30_;
+		DirectView* _tmp31_;
 #line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp29_ = photo;
+		_tmp28_ = photo;
 #line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp30_ = direct_view_new (_tmp29_);
+		_tmp29_ = direct_view_new (_tmp28_);
 #line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		tmp_view = _tmp30_;
+		tmp_view = _tmp29_;
 #line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp31_ = self->priv->view_controller;
+		_tmp30_ = self->priv->view_controller;
 #line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp32_ = tmp_view;
+		_tmp31_ = tmp_view;
 #line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject));
+		data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject));
 #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (tmp_view);
-#line 3012 "DirectPhotoPage.c"
+#line 2978 "DirectPhotoPage.c"
 	}
 #line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp33_ = direct_photo_global;
+	_tmp32_ = direct_photo_global;
 #line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp34_ = photo;
+	_tmp33_ = photo;
 #line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	direct_photo_source_collection_reimport_photo (_tmp33_, _tmp34_);
+	direct_photo_source_collection_reimport_photo (_tmp32_, _tmp33_);
 #line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp35_ = self->priv->view_controller;
+	_tmp34_ = self->priv->view_controller;
 #line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp36_ = photo;
+	_tmp35_ = photo;
 #line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_PHOTO, Photo));
+	editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo));
 #line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 3028 "DirectPhotoPage.c"
+#line 2994 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_save (DirectPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	Photo* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	Photo* _tmp11_ = NULL;
-	Photo* _tmp12_ = NULL;
-	GFile* _tmp13_ = NULL;
-	GFile* _tmp14_ = NULL;
-	Photo* _tmp15_ = NULL;
-	Photo* _tmp16_ = NULL;
-	PhotoFileFormat _tmp17_ = 0;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
+	Photo* _tmp11_;
+	Photo* _tmp12_;
+	GFile* _tmp13_;
+	GFile* _tmp14_;
+	Photo* _tmp15_;
+	Photo* _tmp16_;
+	PhotoFileFormat _tmp17_;
 #line 372 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
 #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3058,12 +3024,12 @@ static void direct_photo_page_on_save (DirectPhotoPage* self) {
 	if (_tmp5_) {
 #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = TRUE;
-#line 3062 "DirectPhotoPage.c"
+#line 3028 "DirectPhotoPage.c"
 	} else {
-		Photo* _tmp6_ = NULL;
-		Photo* _tmp7_ = NULL;
-		PhotoFileFormat _tmp8_ = 0;
-		gboolean _tmp9_ = FALSE;
+		Photo* _tmp6_;
+		Photo* _tmp7_;
+		PhotoFileFormat _tmp8_;
+		gboolean _tmp9_;
 #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3076,26 +3042,26 @@ static void direct_photo_page_on_save (DirectPhotoPage* self) {
 		_tmp1_ = !_tmp9_;
 #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3080 "DirectPhotoPage.c"
+#line 3046 "DirectPhotoPage.c"
 	}
 #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp1_) {
 #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 3086 "DirectPhotoPage.c"
+#line 3052 "DirectPhotoPage.c"
 	} else {
-		gboolean _tmp10_ = FALSE;
+		gboolean _tmp10_;
 #line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = _tmp10_;
-#line 3093 "DirectPhotoPage.c"
+#line 3059 "DirectPhotoPage.c"
 	}
 #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_) {
 #line 375 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 3099 "DirectPhotoPage.c"
+#line 3065 "DirectPhotoPage.c"
 	}
 #line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -3119,370 +3085,364 @@ static void direct_photo_page_on_save (DirectPhotoPage* self) {
 	_g_object_unref0 (_tmp14_);
 #line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 3123 "DirectPhotoPage.c"
+#line 3089 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
 	ExportDialog* export_dialog = NULL;
-	const gchar* _tmp0_ = NULL;
-	ExportDialog* _tmp1_ = NULL;
+	ExportDialog* _tmp0_;
 	gint scale = 0;
 	ScaleConstraint constraint = 0;
 	ExportFormatParameters export_params = {0};
-	ExportFormatParameters _tmp2_ = {0};
-	ExportDialog* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	ScaleConstraint _tmp5_ = 0;
-	gboolean _tmp6_ = FALSE;
+	ExportFormatParameters _tmp1_ = {0};
+	ExportDialog* _tmp2_;
+	gint _tmp3_ = 0;
+	ScaleConstraint _tmp4_ = 0;
+	gboolean _tmp5_;
 	gchar* filename = NULL;
-	Photo* _tmp7_ = NULL;
-	Photo* _tmp8_ = NULL;
-	ExportFormatParameters _tmp9_ = {0};
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
+	Photo* _tmp6_;
+	Photo* _tmp7_;
+	ExportFormatParameters _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
 	PhotoFileFormat effective_export_format = 0;
-	Photo* _tmp12_ = NULL;
-	Photo* _tmp13_ = NULL;
-	ExportFormatParameters _tmp14_ = {0};
-	PhotoFileFormat _tmp15_ = 0;
-	PhotoFileFormat _tmp16_ = 0;
+	Photo* _tmp11_;
+	Photo* _tmp12_;
+	ExportFormatParameters _tmp13_;
+	PhotoFileFormat _tmp14_;
+	PhotoFileFormat _tmp15_;
 	gchar** output_format_extensions = NULL;
-	PhotoFileFormat _tmp17_ = 0;
-	PhotoFileFormatProperties* _tmp18_ = NULL;
-	PhotoFileFormatProperties* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
-	gchar** _tmp21_ = NULL;
-	gchar** _tmp22_ = NULL;
-	gint _tmp22__length1 = 0;
-	gint output_format_extensions_length1 = 0;
-	gint _output_format_extensions_size_ = 0;
+	PhotoFileFormat _tmp16_;
+	PhotoFileFormatProperties* _tmp17_;
+	PhotoFileFormatProperties* _tmp18_;
+	gint _tmp19_;
+	gchar** _tmp20_;
+	gchar** _tmp21_;
+	gint _tmp21__length1;
+	gint output_format_extensions_length1;
+	gint _output_format_extensions_size_;
 	GtkFileFilter* output_format_filter = NULL;
-	GtkFileFilter* _tmp23_ = NULL;
-	gchar** _tmp24_ = NULL;
-	gint _tmp24__length1 = 0;
+	GtkFileFilter* _tmp22_;
+	gchar** _tmp23_;
+	gint _tmp23__length1;
 	GtkFileChooserDialog* save_as_dialog = NULL;
-	const gchar* _tmp36_ = NULL;
-	AppWindow* _tmp37_ = NULL;
-	AppWindow* _tmp38_ = NULL;
-	GtkFileChooserDialog* _tmp39_ = NULL;
-	GtkFileChooserDialog* _tmp40_ = NULL;
-	GtkFileChooserDialog* _tmp41_ = NULL;
-	GtkFileChooserDialog* _tmp42_ = NULL;
-	const gchar* _tmp43_ = NULL;
-	GtkFileChooserDialog* _tmp44_ = NULL;
-	GFile* _tmp45_ = NULL;
-	gchar* _tmp46_ = NULL;
-	gchar* _tmp47_ = NULL;
-	GtkFileChooserDialog* _tmp48_ = NULL;
-	GtkFileFilter* _tmp49_ = NULL;
-	GtkFileFilter* _tmp50_ = NULL;
-	GtkFileChooserDialog* _tmp51_ = NULL;
-	GtkFileChooserDialog* _tmp52_ = NULL;
+	AppWindow* _tmp35_;
+	AppWindow* _tmp36_;
+	GtkFileChooserDialog* _tmp37_;
+	GtkFileChooserDialog* _tmp38_;
+	GtkFileChooserDialog* _tmp39_;
+	GtkFileChooserDialog* _tmp40_;
+	const gchar* _tmp41_;
+	GtkFileChooserDialog* _tmp42_;
+	GFile* _tmp43_;
+	gchar* _tmp44_;
+	gchar* _tmp45_;
+	GtkFileChooserDialog* _tmp46_;
+	GtkFileFilter* _tmp47_;
+	GtkFileFilter* _tmp48_;
+	GtkFileChooserDialog* _tmp49_;
+	GtkFileChooserDialog* _tmp50_;
 	gint response = 0;
-	GtkFileChooserDialog* _tmp53_ = NULL;
-	gint _tmp54_ = 0;
-	gint _tmp55_ = 0;
-	GtkFileChooserDialog* _tmp74_ = NULL;
+	GtkFileChooserDialog* _tmp51_;
+	gint _tmp52_;
+	gint _tmp53_;
+	GtkFileChooserDialog* _tmp72_;
 #line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
 #line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp0_ = _ ("Save As");
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp1_ = export_dialog_new (_tmp0_);
+	_tmp0_ = export_dialog_new (_ ("Save As"));
 #line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	g_object_ref_sink (_tmp1_);
+	g_object_ref_sink (_tmp0_);
 #line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	export_dialog = _tmp1_;
+	export_dialog = _tmp0_;
 #line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	export_format_parameters_last (&_tmp2_);
+	export_format_parameters_last (&_tmp1_);
 #line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	export_params = _tmp2_;
+	export_params = _tmp1_;
 #line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp3_ = export_dialog;
+	_tmp2_ = export_dialog;
 #line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp6_ = export_dialog_execute (_tmp3_, &_tmp4_, &_tmp5_, &export_params);
+	_tmp5_ = export_dialog_execute (_tmp2_, &_tmp3_, &_tmp4_, &export_params);
 #line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	scale = _tmp4_;
+	scale = _tmp3_;
 #line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	constraint = _tmp5_;
+	constraint = _tmp4_;
 #line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if (!_tmp6_) {
+	if (!_tmp5_) {
 #line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (export_dialog);
 #line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 3216 "DirectPhotoPage.c"
+#line 3178 "DirectPhotoPage.c"
 	}
 #line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp8_ = _tmp7_;
+	_tmp7_ = _tmp6_;
 #line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp9_ = export_params;
+	_tmp8_ = export_params;
 #line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp10_ = photo_get_export_basename_for_parameters (_tmp8_, &_tmp9_);
+	_tmp9_ = photo_get_export_basename_for_parameters (_tmp7_, &_tmp8_);
 #line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp11_ = _tmp10_;
+	_tmp10_ = _tmp9_;
 #line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_g_object_unref0 (_tmp8_);
+	_g_object_unref0 (_tmp7_);
 #line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	filename = _tmp11_;
+	filename = _tmp10_;
 #line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp12_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	_tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp13_ = _tmp12_;
+	_tmp12_ = _tmp11_;
 #line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp14_ = export_params;
+	_tmp13_ = export_params;
 #line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp15_ = photo_get_export_format_for_parameters (_tmp13_, &_tmp14_);
+	_tmp14_ = photo_get_export_format_for_parameters (_tmp12_, &_tmp13_);
 #line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp16_ = _tmp15_;
+	_tmp15_ = _tmp14_;
 #line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_g_object_unref0 (_tmp13_);
+	_g_object_unref0 (_tmp12_);
 #line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	effective_export_format = _tmp16_;
+	effective_export_format = _tmp15_;
 #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp17_ = effective_export_format;
+	_tmp16_ = effective_export_format;
 #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp18_ = photo_file_format_get_properties (_tmp17_);
+	_tmp17_ = photo_file_format_get_properties (_tmp16_);
 #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp19_ = _tmp18_;
+	_tmp18_ = _tmp17_;
 #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp21_ = photo_file_format_properties_get_known_extensions (_tmp19_, &_tmp20_);
+	_tmp20_ = photo_file_format_properties_get_known_extensions (_tmp18_, &_tmp19_);
 #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp22_ = _tmp21_;
+	_tmp21_ = _tmp20_;
 #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp22__length1 = _tmp20_;
+	_tmp21__length1 = _tmp19_;
 #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_photo_file_format_properties_unref0 (_tmp19_);
+	_photo_file_format_properties_unref0 (_tmp18_);
 #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	output_format_extensions = _tmp22_;
+	output_format_extensions = _tmp21_;
 #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	output_format_extensions_length1 = _tmp22__length1;
+	output_format_extensions_length1 = _tmp21__length1;
 #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_output_format_extensions_size_ = output_format_extensions_length1;
 #line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp23_ = gtk_file_filter_new ();
+	_tmp22_ = gtk_file_filter_new ();
 #line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	g_object_ref_sink (_tmp23_);
+	g_object_ref_sink (_tmp22_);
 #line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	output_format_filter = _tmp23_;
+	output_format_filter = _tmp22_;
 #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp24_ = output_format_extensions;
+	_tmp23_ = output_format_extensions;
 #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp24__length1 = output_format_extensions_length1;
-#line 3276 "DirectPhotoPage.c"
+	_tmp23__length1 = output_format_extensions_length1;
+#line 3238 "DirectPhotoPage.c"
 	{
 		gchar** extension_collection = NULL;
 		gint extension_collection_length1 = 0;
 		gint _extension_collection_size_ = 0;
 		gint extension_it = 0;
 #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		extension_collection = _tmp24_;
+		extension_collection = _tmp23_;
 #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		extension_collection_length1 = _tmp24__length1;
+		extension_collection_length1 = _tmp23__length1;
 #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		for (extension_it = 0; extension_it < _tmp24__length1; extension_it = extension_it + 1) {
-#line 3288 "DirectPhotoPage.c"
-			gchar* _tmp25_ = NULL;
+		for (extension_it = 0; extension_it < _tmp23__length1; extension_it = extension_it + 1) {
+#line 3250 "DirectPhotoPage.c"
+			gchar* _tmp24_;
 			gchar* extension = NULL;
 #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			_tmp25_ = g_strdup (extension_collection[extension_it]);
+			_tmp24_ = g_strdup (extension_collection[extension_it]);
 #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-			extension = _tmp25_;
-#line 3295 "DirectPhotoPage.c"
+			extension = _tmp24_;
+#line 3257 "DirectPhotoPage.c"
 			{
 				gchar* uppercase_extension = NULL;
-				const gchar* _tmp26_ = NULL;
-				gchar* _tmp27_ = NULL;
-				GtkFileFilter* _tmp28_ = NULL;
-				const gchar* _tmp29_ = NULL;
-				gchar* _tmp30_ = NULL;
-				gchar* _tmp31_ = NULL;
-				GtkFileFilter* _tmp32_ = NULL;
-				const gchar* _tmp33_ = NULL;
-				gchar* _tmp34_ = NULL;
-				gchar* _tmp35_ = NULL;
+				const gchar* _tmp25_;
+				gchar* _tmp26_;
+				GtkFileFilter* _tmp27_;
+				const gchar* _tmp28_;
+				gchar* _tmp29_;
+				gchar* _tmp30_;
+				GtkFileFilter* _tmp31_;
+				const gchar* _tmp32_;
+				gchar* _tmp33_;
+				gchar* _tmp34_;
 #line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp26_ = extension;
+				_tmp25_ = extension;
 #line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp27_ = g_utf8_strup (_tmp26_, (gssize) -1);
+				_tmp26_ = g_utf8_strup (_tmp25_, (gssize) -1);
 #line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				uppercase_extension = _tmp27_;
+				uppercase_extension = _tmp26_;
 #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp28_ = output_format_filter;
+				_tmp27_ = output_format_filter;
 #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp29_ = extension;
+				_tmp28_ = extension;
 #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp30_ = g_strconcat ("*.", _tmp29_, NULL);
+				_tmp29_ = g_strconcat ("*.", _tmp28_, NULL);
 #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp31_ = _tmp30_;
+				_tmp30_ = _tmp29_;
 #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				gtk_file_filter_add_pattern (_tmp28_, _tmp31_);
+				gtk_file_filter_add_pattern (_tmp27_, _tmp30_);
 #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_g_free0 (_tmp31_);
+				_g_free0 (_tmp30_);
 #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp32_ = output_format_filter;
+				_tmp31_ = output_format_filter;
 #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp33_ = uppercase_extension;
+				_tmp32_ = uppercase_extension;
 #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp34_ = g_strconcat ("*.", _tmp33_, NULL);
+				_tmp33_ = g_strconcat ("*.", _tmp32_, NULL);
 #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_tmp35_ = _tmp34_;
+				_tmp34_ = _tmp33_;
 #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				gtk_file_filter_add_pattern (_tmp32_, _tmp35_);
+				gtk_file_filter_add_pattern (_tmp31_, _tmp34_);
 #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-				_g_free0 (_tmp35_);
+				_g_free0 (_tmp34_);
 #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (uppercase_extension);
 #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (extension);
-#line 3342 "DirectPhotoPage.c"
+#line 3304 "DirectPhotoPage.c"
 			}
 		}
 	}
 #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp36_ = _ ("Save As");
-#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp37_ = app_window_get_instance ();
+	_tmp35_ = app_window_get_instance ();
 #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp38_ = _tmp37_;
+	_tmp36_ = _tmp35_;
 #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp39_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
+	_tmp37_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_ ("Save As"), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
 #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	g_object_ref_sink (_tmp39_);
+	g_object_ref_sink (_tmp37_);
 #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp40_ = _tmp39_;
+	_tmp38_ = _tmp37_;
 #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_g_object_unref0 (_tmp38_);
+	_g_object_unref0 (_tmp36_);
 #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	save_as_dialog = _tmp40_;
+	save_as_dialog = _tmp38_;
 #line 407 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp41_ = save_as_dialog;
+	_tmp39_ = save_as_dialog;
 #line 407 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
+	gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
 #line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp42_ = save_as_dialog;
+	_tmp40_ = save_as_dialog;
 #line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp43_ = filename;
+	_tmp41_ = filename;
 #line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp43_);
+	gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp41_);
 #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp44_ = save_as_dialog;
+	_tmp42_ = save_as_dialog;
 #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp45_ = self->priv->current_save_dir;
+	_tmp43_ = self->priv->current_save_dir;
 #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp46_ = g_file_get_path (_tmp45_);
+	_tmp44_ = g_file_get_path (_tmp43_);
 #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp47_ = _tmp46_;
+	_tmp45_ = _tmp44_;
 #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp47_);
+	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp45_);
 #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_g_free0 (_tmp47_);
+	_g_free0 (_tmp45_);
 #line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp48_ = save_as_dialog;
+	_tmp46_ = save_as_dialog;
 #line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp49_ = output_format_filter;
+	_tmp47_ = output_format_filter;
 #line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp50_ = _g_object_ref0 (_tmp49_);
+	_tmp48_ = _g_object_ref0 (_tmp47_);
 #line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	gtk_file_chooser_add_filter (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp50_);
+	gtk_file_chooser_add_filter (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp48_);
 #line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp51_ = save_as_dialog;
+	_tmp49_ = save_as_dialog;
 #line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
+	gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
 #line 412 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp52_ = save_as_dialog;
+	_tmp50_ = save_as_dialog;
 #line 412 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
+	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
 #line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp53_ = save_as_dialog;
+	_tmp51_ = save_as_dialog;
 #line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp54_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_dialog_get_type (), GtkDialog));
+	_tmp52_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_dialog_get_type (), GtkDialog));
 #line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	response = _tmp54_;
+	response = _tmp52_;
 #line 415 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp55_ = response;
+	_tmp53_ = response;
 #line 415 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if (_tmp55_ == ((gint) GTK_RESPONSE_OK)) {
-#line 3410 "DirectPhotoPage.c"
-		GtkFileChooserDialog* _tmp56_ = NULL;
-		gchar* _tmp57_ = NULL;
-		gchar* _tmp58_ = NULL;
-		GFile* _tmp59_ = NULL;
-		GFile* _tmp60_ = NULL;
-		gint _tmp61_ = 0;
-		ScaleConstraint _tmp62_ = 0;
-		ExportFormatParameters _tmp63_ = {0};
-		JpegQuality _tmp64_ = 0;
-		PhotoFileFormat _tmp65_ = 0;
-		ExportFormatParameters _tmp66_ = {0};
-		ExportFormatMode _tmp67_ = 0;
-		ExportFormatParameters _tmp68_ = {0};
-		gboolean _tmp69_ = FALSE;
-		GtkFileChooserDialog* _tmp70_ = NULL;
-		gchar* _tmp71_ = NULL;
-		gchar* _tmp72_ = NULL;
-		GFile* _tmp73_ = NULL;
+	if (_tmp53_ == ((gint) GTK_RESPONSE_OK)) {
+#line 3370 "DirectPhotoPage.c"
+		GtkFileChooserDialog* _tmp54_;
+		gchar* _tmp55_;
+		gchar* _tmp56_;
+		GFile* _tmp57_;
+		GFile* _tmp58_;
+		gint _tmp59_;
+		ScaleConstraint _tmp60_;
+		ExportFormatParameters _tmp61_;
+		JpegQuality _tmp62_;
+		PhotoFileFormat _tmp63_;
+		ExportFormatParameters _tmp64_;
+		ExportFormatMode _tmp65_;
+		ExportFormatParameters _tmp66_;
+		gboolean _tmp67_;
+		GtkFileChooserDialog* _tmp68_;
+		gchar* _tmp69_;
+		gchar* _tmp70_;
+		GFile* _tmp71_;
 #line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self->priv->drop_if_dirty = TRUE;
 #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp56_ = save_as_dialog;
+		_tmp54_ = save_as_dialog;
 #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp57_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+		_tmp55_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
 #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp58_ = _tmp57_;
+		_tmp56_ = _tmp55_;
 #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp59_ = g_file_new_for_uri (_tmp58_);
+		_tmp57_ = g_file_new_for_uri (_tmp56_);
 #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp60_ = _tmp59_;
+		_tmp58_ = _tmp57_;
 #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp61_ = scale;
+		_tmp59_ = scale;
 #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp62_ = constraint;
+		_tmp60_ = constraint;
 #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp63_ = export_params;
+		_tmp61_ = export_params;
 #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp64_ = _tmp63_.quality;
+		_tmp62_ = _tmp61_.quality;
 #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp65_ = effective_export_format;
+		_tmp63_ = effective_export_format;
 #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp66_ = export_params;
+		_tmp64_ = export_params;
 #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp67_ = _tmp66_.mode;
+		_tmp65_ = _tmp64_.mode;
 #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp68_ = export_params;
+		_tmp66_ = export_params;
 #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp69_ = _tmp68_.export_metadata;
+		_tmp67_ = _tmp66_.export_metadata;
 #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		direct_photo_page_save (self, _tmp60_, _tmp61_, _tmp62_, _tmp64_, _tmp65_, _tmp67_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp69_);
+		direct_photo_page_save (self, _tmp58_, _tmp59_, _tmp60_, _tmp62_, _tmp63_, _tmp65_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp67_);
 #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_g_object_unref0 (_tmp60_);
+		_g_object_unref0 (_tmp58_);
 #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_g_free0 (_tmp58_);
+		_g_free0 (_tmp56_);
 #line 422 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self->priv->drop_if_dirty = FALSE;
 #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp70_ = save_as_dialog;
+		_tmp68_ = save_as_dialog;
 #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp71_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+		_tmp69_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
 #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp72_ = _tmp71_;
+		_tmp70_ = _tmp69_;
 #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_tmp73_ = g_file_new_for_path (_tmp72_);
+		_tmp71_ = g_file_new_for_path (_tmp70_);
 #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (self->priv->current_save_dir);
 #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		self->priv->current_save_dir = _tmp73_;
+		self->priv->current_save_dir = _tmp71_;
 #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		_g_free0 (_tmp72_);
-#line 3481 "DirectPhotoPage.c"
+		_g_free0 (_tmp70_);
+#line 3441 "DirectPhotoPage.c"
 	}
 #line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp74_ = save_as_dialog;
+	_tmp72_ = save_as_dialog;
 #line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget));
 #line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (save_as_dialog);
 #line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3493,23 +3453,23 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
 	_g_free0 (filename);
 #line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 3497 "DirectPhotoPage.c"
+#line 3457 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_send_to (DirectPhotoPage* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 430 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
 #line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_) {
-#line 3509 "DirectPhotoPage.c"
-		ViewCollection* _tmp1_ = NULL;
-		ViewCollection* _tmp2_ = NULL;
-		GeeList* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
+#line 3469 "DirectPhotoPage.c"
+		ViewCollection* _tmp1_;
+		ViewCollection* _tmp2_;
+		GeeList* _tmp3_;
+		GeeCollection* _tmp4_;
 #line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3524,7 +3484,7 @@ static void direct_photo_page_on_send_to (DirectPhotoPage* self) {
 		_g_object_unref0 (_tmp4_);
 #line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 3528 "DirectPhotoPage.c"
+#line 3488 "DirectPhotoPage.c"
 	}
 }
 
@@ -3533,18 +3493,18 @@ static gboolean direct_photo_page_real_on_app_key_pressed (Page* base, GdkEventK
 	DirectPhotoPage * self;
 	gboolean result = FALSE;
 	gboolean handled = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	GdkEventKey* _tmp0_;
+	guint _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
 	GQuark _tmp5_ = 0U;
 #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	static GQuark _tmp4_label0 = 0;
 #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 3546 "DirectPhotoPage.c"
+#line 3506 "DirectPhotoPage.c"
 	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
+	gboolean _tmp7_;
 #line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3565,40 +3525,40 @@ static gboolean direct_photo_page_real_on_app_key_pressed (Page* base, GdkEventK
 	if (_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("bracketright")))) {
 #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		switch (0) {
-#line 3569 "DirectPhotoPage.c"
+#line 3529 "DirectPhotoPage.c"
 			default:
 			{
 #line 440 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
 #line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				break;
-#line 3576 "DirectPhotoPage.c"
+#line 3536 "DirectPhotoPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("bracketleft")))) {
 #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		switch (0) {
-#line 3582 "DirectPhotoPage.c"
+#line 3542 "DirectPhotoPage.c"
 			default:
 			{
 #line 444 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
 #line 445 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				break;
-#line 3589 "DirectPhotoPage.c"
+#line 3549 "DirectPhotoPage.c"
 			}
 		}
 	} else {
 #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		switch (0) {
-#line 3595 "DirectPhotoPage.c"
+#line 3555 "DirectPhotoPage.c"
 			default:
 			{
 #line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				handled = FALSE;
 #line 449 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				break;
-#line 3602 "DirectPhotoPage.c"
+#line 3562 "DirectPhotoPage.c"
 			}
 		}
 	}
@@ -3608,31 +3568,31 @@ static gboolean direct_photo_page_real_on_app_key_pressed (Page* base, GdkEventK
 	if (_tmp7_) {
 #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = TRUE;
-#line 3612 "DirectPhotoPage.c"
+#line 3572 "DirectPhotoPage.c"
 	} else {
-		GdkEventKey* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
+		GdkEventKey* _tmp8_;
+		gboolean _tmp9_;
 #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = event;
 #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = PAGE_CLASS (direct_photo_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp8_);
 #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = _tmp9_;
-#line 3622 "DirectPhotoPage.c"
+#line 3582 "DirectPhotoPage.c"
 	}
 #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp6_;
 #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3628 "DirectPhotoPage.c"
+#line 3588 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_print (DirectPhotoPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 #line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
 #line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3647,13 +3607,13 @@ static void direct_photo_page_on_print (DirectPhotoPage* self) {
 	_data_collection_unref0 (_tmp1_);
 #line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp3_) {
-#line 3651 "DirectPhotoPage.c"
-		PrintManager* _tmp4_ = NULL;
-		PrintManager* _tmp5_ = NULL;
-		ViewCollection* _tmp6_ = NULL;
-		ViewCollection* _tmp7_ = NULL;
-		GeeList* _tmp8_ = NULL;
-		GeeCollection* _tmp9_ = NULL;
+#line 3611 "DirectPhotoPage.c"
+		PrintManager* _tmp4_;
+		PrintManager* _tmp5_;
+		ViewCollection* _tmp6_;
+		ViewCollection* _tmp7_;
+		GeeList* _tmp8_;
+		GeeCollection* _tmp9_;
 #line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = print_manager_get_instance ();
 #line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3674,7 +3634,7 @@ static void direct_photo_page_on_print (DirectPhotoPage* self) {
 		_data_collection_unref0 (_tmp7_);
 #line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 3678 "DirectPhotoPage.c"
+#line 3638 "DirectPhotoPage.c"
 	}
 }
 
@@ -3684,7 +3644,7 @@ static Block7Data* block7_data_ref (Block7Data* _data7_) {
 	g_atomic_int_inc (&_data7_->_ref_count_);
 #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return _data7_;
-#line 3688 "DirectPhotoPage.c"
+#line 3648 "DirectPhotoPage.c"
 }
 
 
@@ -3693,7 +3653,7 @@ static void block7_data_unref (void * _userdata_) {
 	_data7_ = (Block7Data*) _userdata_;
 #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) {
-#line 3697 "DirectPhotoPage.c"
+#line 3657 "DirectPhotoPage.c"
 		DirectPhotoPage* self;
 #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self = _data7_->self;
@@ -3701,7 +3661,7 @@ static void block7_data_unref (void * _userdata_) {
 		_g_object_unref0 (self);
 #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		g_slice_free (Block7Data, _data7_);
-#line 3705 "DirectPhotoPage.c"
+#line 3665 "DirectPhotoPage.c"
 	}
 }
 
@@ -3709,7 +3669,7 @@ static void block7_data_unref (void * _userdata_) {
 static gboolean __lambda16_ (Block7Data* _data7_) {
 	DirectPhotoPage* self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = _data7_->self;
 #line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3720,7 +3680,7 @@ static gboolean __lambda16_ (Block7Data* _data7_) {
 	result = FALSE;
 #line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3724 "DirectPhotoPage.c"
+#line 3684 "DirectPhotoPage.c"
 }
 
 
@@ -3729,13 +3689,13 @@ static gboolean ___lambda16__gsource_func (gpointer self) {
 	result = __lambda16_ (self);
 #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3733 "DirectPhotoPage.c"
+#line 3693 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* self, gboolean should_allow_rotation) {
 	Block7Data* _data7_;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
 #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3754,15 +3714,15 @@ static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* sel
 	block7_data_unref (_data7_);
 #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data7_ = NULL;
-#line 3758 "DirectPhotoPage.c"
+#line 3718 "DirectPhotoPage.c"
 }
 
 
 static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base, DataSource* source) {
 	DirectPhotoPage * self;
 	DataView* result = NULL;
-	DataSource* _tmp0_ = NULL;
-	DirectView* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	DirectView* _tmp1_;
 #line 473 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 473 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3775,7 +3735,7 @@ static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
 #line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3779 "DirectPhotoPage.c"
+#line 3739 "DirectPhotoPage.c"
 }
 
 
@@ -3785,38 +3745,38 @@ static void direct_photo_page_class_init (DirectPhotoPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_type_class_add_private (klass, sizeof (DirectPhotoPagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) direct_photo_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) direct_photo_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) direct_photo_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) direct_photo_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) direct_photo_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) direct_photo_page_real_remove_actions;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((PageClass *) klass)->init_collect_injection_groups = (InjectionGroup** (*)(Page*, int*)) direct_photo_page_real_init_collect_injection_groups;
+	((PageClass *) klass)->init_collect_injection_groups = (InjectionGroup** (*) (Page *, int*)) direct_photo_page_real_init_collect_injection_groups;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((GtkWidgetClass *) klass)->realize = (void (*)(GtkWidget*)) direct_photo_page_real_realize;
+	((GtkWidgetClass *) klass)->realize = (void (*) (GtkWidget *)) direct_photo_page_real_realize;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((EditingHostPageClass *) klass)->photo_changing = (void (*)(EditingHostPage*, Photo*)) direct_photo_page_real_photo_changing;
+	((EditingHostPageClass *) klass)->photo_changing = (void (*) (EditingHostPage *, Photo*)) direct_photo_page_real_photo_changing;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((PageClass *) klass)->on_context_buttonpress = (gboolean (*)(Page*, GdkEventButton*)) direct_photo_page_real_on_context_buttonpress;
+	((PageClass *) klass)->on_context_buttonpress = (gboolean (*) (Page *, GdkEventButton*)) direct_photo_page_real_on_context_buttonpress;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((EditingHostPageClass *) klass)->on_increase_size = (void (*)(EditingHostPage*)) direct_photo_page_real_on_increase_size;
+	((EditingHostPageClass *) klass)->on_increase_size = (void (*) (EditingHostPage *)) direct_photo_page_real_on_increase_size;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((EditingHostPageClass *) klass)->on_decrease_size = (void (*)(EditingHostPage*)) direct_photo_page_real_on_decrease_size;
+	((EditingHostPageClass *) klass)->on_decrease_size = (void (*) (EditingHostPage *)) direct_photo_page_real_on_decrease_size;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((EditingHostPageClass *) klass)->on_double_click = (gboolean (*)(EditingHostPage*, GdkEventButton*)) direct_photo_page_real_on_double_click;
+	((EditingHostPageClass *) klass)->on_double_click = (gboolean (*) (EditingHostPage *, GdkEventButton*)) direct_photo_page_real_on_double_click;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((EditingHostPageClass *) klass)->update_ui = (void (*)(EditingHostPage*, gboolean)) direct_photo_page_real_update_ui;
+	((EditingHostPageClass *) klass)->update_ui = (void (*) (EditingHostPage *, gboolean)) direct_photo_page_real_update_ui;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) direct_photo_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) direct_photo_page_real_update_actions;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((EditingHostPageClass *) klass)->confirm_replace_photo = (gboolean (*)(EditingHostPage*, Photo*, Photo*)) direct_photo_page_real_confirm_replace_photo;
+	((EditingHostPageClass *) klass)->confirm_replace_photo = (gboolean (*) (EditingHostPage *, Photo*, Photo*)) direct_photo_page_real_confirm_replace_photo;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((PageClass *) klass)->on_app_key_pressed = (gboolean (*)(Page*, GdkEventKey*)) direct_photo_page_real_on_app_key_pressed;
+	((PageClass *) klass)->on_app_key_pressed = (gboolean (*) (Page *, GdkEventKey*)) direct_photo_page_real_on_app_key_pressed;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((EditingHostPageClass *) klass)->create_photo_view = (DataView* (*)(EditingHostPage*, DataSource*)) direct_photo_page_real_create_photo_view;
+	((EditingHostPageClass *) klass)->create_photo_view = (DataView* (*) (EditingHostPage *, DataSource*)) direct_photo_page_real_create_photo_view;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = direct_photo_page_finalize;
-#line 3820 "DirectPhotoPage.c"
+#line 3780 "DirectPhotoPage.c"
 }
 
 
@@ -3827,14 +3787,14 @@ static void direct_photo_page_instance_init (DirectPhotoPage * self) {
 	self->priv->view_controller = NULL;
 #line 11 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self->priv->drop_if_dirty = FALSE;
-#line 3831 "DirectPhotoPage.c"
+#line 3791 "DirectPhotoPage.c"
 }
 
 
-static void direct_photo_page_finalize (GObject* obj) {
+static void direct_photo_page_finalize (GObject * obj) {
 	DirectPhotoPage * self;
-	DirectPhotoSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	DirectPhotoSourceCollection* _tmp0_;
+	guint _tmp1_;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 32 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3853,7 +3813,7 @@ static void direct_photo_page_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->context_menu);
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	G_OBJECT_CLASS (direct_photo_page_parent_class)->finalize (obj);
-#line 3857 "DirectPhotoPage.c"
+#line 3817 "DirectPhotoPage.c"
 }
 
 
@@ -3871,7 +3831,7 @@ GType direct_photo_page_get_type (void) {
 
 DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type, GFile* file) {
 	DirectFullscreenPhotoPage * self = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 #line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 480 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3880,20 +3840,20 @@ DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_
 	self = (DirectFullscreenPhotoPage*) direct_photo_page_construct (object_type, _tmp0_);
 #line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return self;
-#line 3884 "DirectPhotoPage.c"
+#line 3844 "DirectPhotoPage.c"
 }
 
 
 DirectFullscreenPhotoPage* direct_fullscreen_photo_page_new (GFile* file) {
 #line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return direct_fullscreen_photo_page_construct (TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, file);
-#line 3891 "DirectPhotoPage.c"
+#line 3851 "DirectPhotoPage.c"
 }
 
 
 static void direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	DirectFullscreenPhotoPage * self;
-	GeeList* _tmp0_ = NULL;
+	GeeList* _tmp0_;
 #line 483 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, DirectFullscreenPhotoPage);
 #line 483 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3902,7 +3862,7 @@ static void direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* b
 	_tmp0_ = ui_filenames;
 #line 486 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "direct_context.ui");
-#line 3906 "DirectPhotoPage.c"
+#line 3866 "DirectPhotoPage.c"
 }
 
 
@@ -3910,8 +3870,8 @@ static void direct_fullscreen_photo_page_class_init (DirectFullscreenPhotoPageCl
 #line 478 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_fullscreen_photo_page_parent_class = g_type_class_peek_parent (klass);
 #line 478 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) direct_fullscreen_photo_page_real_init_collect_ui_filenames;
-#line 3915 "DirectPhotoPage.c"
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) direct_fullscreen_photo_page_real_init_collect_ui_filenames;
+#line 3875 "DirectPhotoPage.c"
 }
 
 
diff --git a/src/direct/DirectView.c b/src/direct/DirectView.c
index da18fc5..7ad6acd 100644
--- a/src/direct/DirectView.c
+++ b/src/direct/DirectView.c
@@ -1,4 +1,4 @@
-/* DirectView.c generated by valac 0.34.7, the Vala compiler
+/* DirectView.c generated by valac 0.36.6, the Vala compiler
  * generated from DirectView.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -448,7 +448,7 @@ DataView* data_view_construct (GType object_type, DataSource* source);
 GFile* media_source_get_file (MediaSource* self);
 GFile* direct_view_get_file (DirectView* self);
 gchar* direct_view_get_collate_key (DirectView* self);
-static void direct_view_finalize (GObject* obj);
+static void direct_view_finalize (GObject * obj);
 GType marker_get_type (void) G_GNUC_CONST;
 GType view_collection_get_type (void) G_GNUC_CONST;
 gpointer view_filter_ref (gpointer instance);
@@ -499,9 +499,9 @@ ViewManager* view_manager_construct (GType object_type);
 
 DirectView* direct_view_construct (GType object_type, DirectPhoto* source) {
 	DirectView * self = NULL;
-	DirectPhoto* _tmp0_ = NULL;
-	DirectPhoto* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	DirectPhoto* _tmp0_;
+	DirectPhoto* _tmp1_;
+	GFile* _tmp2_;
 #line 11 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO (source), NULL);
 #line 12 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
@@ -538,8 +538,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 GFile* direct_view_get_file (DirectView* self) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 17 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	g_return_val_if_fail (IS_DIRECT_VIEW (self), NULL);
 #line 18 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
@@ -556,9 +556,9 @@ GFile* direct_view_get_file (DirectView* self) {
 
 gchar* direct_view_get_collate_key (DirectView* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 21 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	g_return_val_if_fail (IS_DIRECT_VIEW (self), NULL);
 #line 22 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
@@ -566,10 +566,10 @@ gchar* direct_view_get_collate_key (DirectView* self) {
 #line 22 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	if (_tmp0_ == NULL) {
 #line 569 "DirectView.c"
-		GFile* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
+		GFile* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
 #line 23 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 		_tmp1_ = self->priv->file;
 #line 23 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
@@ -618,7 +618,7 @@ static void direct_view_instance_init (DirectView * self) {
 }
 
 
-static void direct_view_finalize (GObject* obj) {
+static void direct_view_finalize (GObject * obj) {
 	DirectView * self;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_VIEW, DirectView);
@@ -655,11 +655,11 @@ static gint64 _direct_view_collection_filename_comparator_comparator (void* a, v
 
 DirectViewCollection* direct_view_collection_construct (GType object_type) {
 	DirectViewCollection* self = NULL;
-	DirectPhotoSourceCollection* _tmp0_ = NULL;
-	DirectViewCollectionDirectViewManager* _tmp1_ = NULL;
-	DirectViewCollectionDirectViewManager* _tmp2_ = NULL;
-	ViewCollectionMonitor* _tmp3_ = NULL;
-	ViewCollectionMonitor* _tmp4_ = NULL;
+	DirectPhotoSourceCollection* _tmp0_;
+	DirectViewCollectionDirectViewManager* _tmp1_;
+	DirectViewCollectionDirectViewManager* _tmp2_;
+	ViewCollectionMonitor* _tmp3_;
+	ViewCollectionMonitor* _tmp4_;
 #line 37 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	self = (DirectViewCollection*) view_collection_construct (object_type, "DirectViewCollection");
 #line 39 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
@@ -694,16 +694,16 @@ DirectViewCollection* direct_view_collection_new (void) {
 static gint64 direct_view_collection_filename_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	DirectView* aview = NULL;
-	void* _tmp0_ = NULL;
+	void* _tmp0_;
 	DirectView* bview = NULL;
-	void* _tmp1_ = NULL;
-	GCompareFunc _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	void* _tmp1_;
+	GCompareFunc _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
 #line 44 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	_tmp0_ = a;
 #line 44 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
@@ -741,8 +741,8 @@ static gint64 direct_view_collection_filename_comparator (void* a, void* b) {
 static DataView* direct_view_collection_direct_view_manager_real_create_view (ViewManager* base, DataSource* source) {
 	DirectViewCollectionDirectViewManager * self;
 	DataView* result = NULL;
-	DataSource* _tmp0_ = NULL;
-	DirectView* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	DirectView* _tmp1_;
 #line 31 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DIRECT_VIEW_COLLECTION_TYPE_DIRECT_VIEW_MANAGER, DirectViewCollectionDirectViewManager);
 #line 31 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
@@ -780,7 +780,7 @@ static void direct_view_collection_direct_view_manager_class_init (DirectViewCol
 #line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	direct_view_collection_direct_view_manager_parent_class = g_type_class_peek_parent (klass);
 #line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) direct_view_collection_direct_view_manager_real_create_view;
+	((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) direct_view_collection_direct_view_manager_real_create_view;
 #line 785 "DirectView.c"
 }
 
diff --git a/src/direct/DirectWindow.c b/src/direct/DirectWindow.c
index 265200a..16c0212 100644
--- a/src/direct/DirectWindow.c
+++ b/src/direct/DirectWindow.c
@@ -1,4 +1,4 @@
-/* DirectWindow.c generated by valac 0.34.7, the Vala compiler
+/* DirectWindow.c generated by valac 0.36.6, the Vala compiler
  * generated from DirectWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -358,7 +358,7 @@ static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* e
 static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEventButton* event);
 void app_window_on_fullscreen (AppWindow* self);
 static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey* event);
-static void direct_window_finalize (GObject* obj);
+static void direct_window_finalize (GObject * obj);
 
 
 static void _direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
@@ -377,26 +377,26 @@ static void _direct_window_on_photo_changed_view_collection_items_state_changed
 
 DirectWindow* direct_window_construct (GType object_type, GFile* file) {
 	DirectWindow * self = NULL;
-	GFile* _tmp0_ = NULL;
-	DirectPhotoPage* _tmp1_ = NULL;
-	DirectPhotoPage* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	DirectPhotoPage* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	DirectPhotoPage* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	DirectPhotoPage* _tmp10_ = NULL;
+	GFile* _tmp0_;
+	DirectPhotoPage* _tmp1_;
+	DirectPhotoPage* _tmp2_;
+	ViewCollection* _tmp3_;
+	ViewCollection* _tmp4_;
+	DirectPhotoPage* _tmp5_;
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
+	DirectPhotoPage* _tmp8_;
+	GFile* _tmp9_;
+	DirectPhotoPage* _tmp10_;
 	GtkBox* layout = NULL;
-	GtkBox* _tmp11_ = NULL;
-	DirectPhotoPage* _tmp12_ = NULL;
-	DirectPhotoPage* _tmp13_ = NULL;
-	GtkToolbar* _tmp14_ = NULL;
-	GtkToolbar* _tmp15_ = NULL;
-	DirectPhotoPage* _tmp16_ = NULL;
-	GMenuModel* _tmp17_ = NULL;
-	GMenuModel* _tmp18_ = NULL;
+	GtkBox* _tmp11_;
+	DirectPhotoPage* _tmp12_;
+	DirectPhotoPage* _tmp13_;
+	GtkToolbar* _tmp14_;
+	GtkToolbar* _tmp15_;
+	DirectPhotoPage* _tmp16_;
+	GMenuModel* _tmp17_;
+	GMenuModel* _tmp18_;
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -499,8 +499,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 DirectWindow* direct_window_get_app (void) {
 	DirectWindow* result = NULL;
-	AppWindow* _tmp0_ = NULL;
-	DirectWindow* _tmp1_ = NULL;
+	AppWindow* _tmp0_;
+	DirectWindow* _tmp1_;
 #line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = app_window_instance;
 #line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -515,7 +515,7 @@ DirectWindow* direct_window_get_app (void) {
 
 DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self) {
 	DirectPhotoPage* result = NULL;
-	Page* _tmp0_ = NULL;
+	Page* _tmp0_;
 #line 36 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_val_if_fail (IS_DIRECT_WINDOW (self), NULL);
 #line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -530,17 +530,17 @@ DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self) {
 
 void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modified) {
 	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GFile* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	GFile* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
+	gboolean _tmp1_;
+	GFile* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
+	GFile* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
 #line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_if_fail (IS_DIRECT_WINDOW (self));
 #line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -594,12 +594,12 @@ void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modif
 static void direct_window_real_on_fullscreen (AppWindow* base) {
 	DirectWindow * self;
 	GFile* file = NULL;
-	DirectPhotoPage* _tmp0_ = NULL;
-	DirectPhotoPage* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	DirectFullscreenPhotoPage* _tmp4_ = NULL;
-	DirectFullscreenPhotoPage* _tmp5_ = NULL;
+	DirectPhotoPage* _tmp0_;
+	DirectPhotoPage* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	DirectFullscreenPhotoPage* _tmp4_;
+	DirectFullscreenPhotoPage* _tmp5_;
 #line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
 #line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -633,7 +633,7 @@ static void direct_window_real_on_fullscreen (AppWindow* base) {
 static gchar* direct_window_real_get_app_role (AppWindow* base) {
 	DirectWindow * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 51 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
 #line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -648,9 +648,9 @@ static gchar* direct_window_real_get_app_role (AppWindow* base) {
 
 static void direct_window_on_photo_changed (DirectWindow* self) {
 	Photo* photo = NULL;
-	DirectPhotoPage* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
+	DirectPhotoPage* _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
 #line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_if_fail (IS_DIRECT_WINDOW (self));
 #line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -664,11 +664,11 @@ static void direct_window_on_photo_changed (DirectWindow* self) {
 #line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (_tmp2_ != NULL) {
 #line 667 "DirectWindow.c"
-		Photo* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		Photo* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+		Photo* _tmp3_;
+		GFile* _tmp4_;
+		GFile* _tmp5_;
+		Photo* _tmp6_;
+		gboolean _tmp7_;
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp3_ = photo;
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -693,14 +693,14 @@ static void direct_window_on_photo_changed (DirectWindow* self) {
 
 static void direct_window_real_on_quit (AppWindow* base) {
 	DirectWindow * self;
-	DirectPhotoPage* _tmp0_ = NULL;
-	DirectPhotoPage* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	ConfigFacade* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	Dimensions _tmp7_ = {0};
+	DirectPhotoPage* _tmp0_;
+	DirectPhotoPage* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+	ConfigFacade* _tmp4_;
+	ConfigFacade* _tmp5_;
+	gboolean _tmp6_;
+	Dimensions _tmp7_;
 #line 61 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
 #line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -740,10 +740,10 @@ static void direct_window_real_on_quit (AppWindow* base) {
 static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* event) {
 	DirectWindow * self;
 	gboolean result = FALSE;
-	DirectPhotoPage* _tmp0_ = NULL;
-	DirectPhotoPage* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	DirectPhotoPage* _tmp0_;
+	DirectPhotoPage* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 	gboolean _tmp4_ = FALSE;
 #line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
@@ -770,8 +770,8 @@ static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* e
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event != NULL) {
 #line 773 "DirectWindow.c"
-		GdkEventAny* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		GdkEventAny* _tmp5_;
+		gboolean _tmp6_;
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp5_ = event;
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -795,8 +795,8 @@ static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* e
 static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEventButton* event) {
 	DirectWindow * self;
 	gboolean result = FALSE;
-	GdkEventButton* _tmp0_ = NULL;
-	GdkEventType _tmp1_ = 0;
+	GdkEventButton* _tmp0_;
+	GdkEventType _tmp1_;
 #line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
 #line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -826,9 +826,9 @@ static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEvent
 static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
 	DirectWindow * self;
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
+	GdkEventKey* _tmp0_;
+	guint _tmp1_;
+	const gchar* _tmp2_;
 	gboolean _tmp3_ = FALSE;
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
@@ -853,8 +853,8 @@ static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event != NULL) {
 #line 856 "DirectWindow.c"
-		GdkEventKey* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+		GdkEventKey* _tmp4_;
+		gboolean _tmp5_;
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp4_ = event;
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -881,17 +881,17 @@ static void direct_window_class_init (DirectWindowClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_type_class_add_private (klass, sizeof (DirectWindowPrivate));
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((AppWindowClass *) klass)->on_fullscreen = (void (*)(AppWindow*)) direct_window_real_on_fullscreen;
+	((AppWindowClass *) klass)->on_fullscreen = (void (*) (AppWindow *)) direct_window_real_on_fullscreen;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((AppWindowClass *) klass)->get_app_role = (gchar* (*)(AppWindow*)) direct_window_real_get_app_role;
+	((AppWindowClass *) klass)->get_app_role = (gchar* (*) (AppWindow *)) direct_window_real_get_app_role;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((AppWindowClass *) klass)->on_quit = (void (*)(AppWindow*)) direct_window_real_on_quit;
+	((AppWindowClass *) klass)->on_quit = (void (*) (AppWindow *)) direct_window_real_on_quit;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((GtkWidgetClass *) klass)->delete_event = (gboolean (*)(GtkWidget*, GdkEventAny*)) direct_window_real_delete_event;
+	((GtkWidgetClass *) klass)->delete_event = (gboolean (*) (GtkWidget *, GdkEventAny*)) direct_window_real_delete_event;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*)(GtkWidget*, GdkEventButton*)) direct_window_real_button_press_event;
+	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*) (GtkWidget *, GdkEventButton*)) direct_window_real_button_press_event;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) direct_window_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) direct_window_real_key_press_event;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = direct_window_finalize;
 #line 898 "DirectWindow.c"
@@ -905,7 +905,7 @@ static void direct_window_instance_init (DirectWindow * self) {
 }
 
 
-static void direct_window_finalize (GObject* obj) {
+static void direct_window_finalize (GObject * obj) {
 	DirectWindow * self;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_WINDOW, DirectWindow);
diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c
index b3bf03b..f101fb4 100644
--- a/src/editing_tools/EditingTools.c
+++ b/src/editing_tools/EditingTools.c
@@ -1,4 +1,4 @@
-/* EditingTools.c generated by valac 0.34.7, the Vala compiler
+/* EditingTools.c generated by valac 0.36.6, the Vala compiler
  * generated from EditingTools.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -149,6 +149,12 @@ typedef struct _Scaling Scaling;
 #define TYPE_BOX (box_get_type ())
 typedef struct _Box Box;
 typedef struct _EditingToolsParamSpecPhotoCanvas EditingToolsParamSpecPhotoCanvas;
+enum  {
+	EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL,
+	EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL,
+	EDITING_TOOLS_PHOTO_CANVAS_LAST_SIGNAL
+};
+static guint editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_LAST_SIGNAL] = {0};
 
 #define EDITING_TOOLS_TYPE_EDITING_TOOL (editing_tools_editing_tool_get_type ())
 #define EDITING_TOOLS_EDITING_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool))
@@ -173,6 +179,15 @@ typedef struct _EditingToolsEditingToolPrivate EditingToolsEditingToolPrivate;
 typedef struct _Command Command;
 typedef struct _CommandClass CommandClass;
 typedef struct _EditingToolsParamSpecEditingTool EditingToolsParamSpecEditingTool;
+enum  {
+	EDITING_TOOLS_EDITING_TOOL_ACTIVATED_SIGNAL,
+	EDITING_TOOLS_EDITING_TOOL_DEACTIVATED_SIGNAL,
+	EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL,
+	EDITING_TOOLS_EDITING_TOOL_CANCELLED_SIGNAL,
+	EDITING_TOOLS_EDITING_TOOL_ABORTED_SIGNAL,
+	EDITING_TOOLS_EDITING_TOOL_LAST_SIGNAL
+};
+static guint editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_LAST_SIGNAL] = {0};
 
 #define EDITING_TOOLS_TYPE_CROP_TOOL (editing_tools_crop_tool_get_type ())
 #define EDITING_TOOLS_CROP_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool))
@@ -1047,7 +1062,7 @@ AppWindow* app_window_get_instance (void);
 static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWidget* base, GdkEventButton* event);
 static void editing_tools_editing_tool_window_real_realize (GtkWidget* base);
 #define RESOURCES_TRANSIENT_WINDOW_OPACITY 0.90
-static void editing_tools_editing_tool_window_finalize (GObject* obj);
+static void editing_tools_editing_tool_window_finalize (GObject * obj);
 gpointer editing_tools_photo_canvas_ref (gpointer instance);
 void editing_tools_photo_canvas_unref (gpointer instance);
 GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1120,7 +1135,7 @@ void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* b
 void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self, Box* area);
 static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas* obj);
+static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas * obj);
 gpointer editing_tools_editing_tool_ref (gpointer instance);
 void editing_tools_editing_tool_unref (gpointer instance);
 GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1159,7 +1174,7 @@ void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, cairo_t* c
 static void editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self, cairo_t* ctx);
 GType command_get_type (void) G_GNUC_CONST;
 static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void editing_tools_editing_tool_finalize (EditingToolsEditingTool* obj);
+static void editing_tools_editing_tool_finalize (EditingToolsEditingTool * obj);
 GType editing_tools_crop_tool_get_type (void) G_GNUC_CONST;
 static GType editing_tools_crop_tool_crop_tool_window_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType box_location_get_type (void) G_GNUC_CONST;
@@ -1203,35 +1218,35 @@ void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensi
 void photo_get_original_dimensions (Photo* self, Dimensions* result);
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_new (const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio);
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_construct (GType object_type, const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio);
-static void _vala_array_add4 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add5 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add6 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add7 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add8 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add9 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add10 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add11 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add12 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add13 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add14 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add15 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add16 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add17 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add18 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add19 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add20 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add21 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add22 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add23 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add24 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add25 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add26 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add27 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add28 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add29 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add30 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add31 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add32 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add4 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add5 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add6 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add7 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add8 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add9 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add10 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add11 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add12 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add13 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add14 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add15 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add16 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add17 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add18 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add19 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add20 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add21 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add22 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add23 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add24 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add25 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add26 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add27 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add28 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add29 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add30 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add31 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add32 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
 static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropTool* self);
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_selected_constraint (EditingToolsCropTool* self);
 static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event);
@@ -1315,7 +1330,7 @@ GType generic_photo_transformation_command_get_type (void) G_GNUC_CONST;
 GType crop_command_get_type (void) G_GNUC_CONST;
 void box_get_dimensions (Box *self, Dimensions* result);
 static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self, gdouble center_x, gdouble center_y, gdouble bounds_x, gdouble bounds_y, gdouble user_x);
-static gboolean _box_equal (const Box* s1, const Box* s2);
+static gboolean _box_equal (const Box * s1, const Box * s2);
 static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box* new_crop);
 gboolean box_equals (Box *self, Box* box);
 GType box_complements_get_type (void) G_GNUC_CONST;
@@ -1325,7 +1340,7 @@ void box_get_reduced (Box *self, gint amount, Box* result);
 enum  {
 	EDITING_TOOLS_CROP_TOOL_CONSTRAINT_DESCRIPTION_DUMMY_PROPERTY
 };
-static void editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription* obj);
+static void editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription * obj);
 enum  {
 	EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_DUMMY_PROPERTY
 };
@@ -1333,8 +1348,8 @@ enum  {
 #define EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING 8
 static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (GtkTreeModel* model, GtkTreeIter* iter);
 static gboolean _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self);
-static void editing_tools_crop_tool_crop_tool_window_finalize (GObject* obj);
-static void editing_tools_crop_tool_finalize (EditingToolsEditingTool* obj);
+static void editing_tools_crop_tool_crop_tool_window_finalize (GObject * obj);
+static void editing_tools_crop_tool_finalize (EditingToolsEditingTool * obj);
 GType editing_tools_redeye_instance_get_type (void) G_GNUC_CONST;
 EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self);
 void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self);
@@ -1420,8 +1435,8 @@ enum  {
 };
 #define RESOURCES_APPLY_LABEL _ ("_Apply")
 #define EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_CONTROL_SPACING 8
-static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject* obj);
-static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool* obj);
+static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject * obj);
+static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool * obj);
 GType editing_tools_adjust_tool_get_type (void) G_GNUC_CONST;
 static GType editing_tools_adjust_tool_adjust_tool_window_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 gpointer pixel_transformer_ref (gpointer instance);
@@ -1615,7 +1630,7 @@ enum  {
 #define RESOURCES_OK_LABEL _ ("_OK")
 RGBHistogramManipulator* rgb_histogram_manipulator_new (void);
 RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type);
-static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject* obj);
+static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject * obj);
 GType command_description_get_type (void) G_GNUC_CONST;
 enum  {
 	EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_COMMAND_DUMMY_PROPERTY
@@ -1625,7 +1640,7 @@ static void _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_
 static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust_tool_command_construct (GType object_type, EditingToolsAdjustTool* owner, const gchar* name, const gchar* explanation);
 Command* command_construct (GType object_type, const gchar* name, const gchar* explanation);
 void command_manager_reset (CommandManager* self);
-static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject* obj);
+static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * obj);
 #define EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommandPrivate))
 enum  {
 	EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_DUMMY_PROPERTY
@@ -1637,7 +1652,7 @@ void pixel_transformation_bundle_set_to_identity (PixelTransformationBundle* sel
 static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command* base);
 static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* base);
 static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Command* base, Command* command);
-static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject* obj);
+static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject * obj);
 #define EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommandPrivate))
 enum  {
 	EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_DUMMY_PROPERTY
@@ -1647,7 +1662,7 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Comma
 static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Command* base);
 static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compress (Command* base, Command* command);
 void command_execute (Command* self);
-static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject* obj);
+static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject * obj);
 #define EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommandPrivate))
 enum  {
 	EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_DUMMY_PROPERTY
@@ -1661,8 +1676,8 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 GType enhance_single_command_get_type (void) G_GNUC_CONST;
 DataSource* single_data_source_command_get_source (SingleDataSourceCommand* self);
 gboolean data_source_equals (DataSource* self, DataSource* source);
-static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject* obj);
-static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool* obj);
+static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject * obj);
+static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -1682,18 +1697,18 @@ void editing_tools_terminate (void) {
 static void _editing_tools_editing_tool_window_suppress_warnings_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
 #line 56 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_window_suppress_warnings ((EditingToolsEditingToolWindow*) self, log_domain, log_levels, message);
-#line 1686 "EditingTools.c"
+#line 1701 "EditingTools.c"
 }
 
 
 EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GType object_type, GtkWindow* container) {
 	EditingToolsEditingToolWindow * self = NULL;
-	GtkWindow* _tmp0_ = NULL;
+	GtkWindow* _tmp0_;
 	GtkFrame* outer_frame = NULL;
-	GtkFrame* _tmp1_ = NULL;
-	GtkFrame* _tmp2_ = NULL;
-	GtkFrame* _tmp3_ = NULL;
-	GtkFrame* _tmp4_ = NULL;
+	GtkFrame* _tmp1_;
+	GtkFrame* _tmp2_;
+	GtkFrame* _tmp3_;
+	GtkFrame* _tmp4_;
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1742,14 +1757,14 @@ EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GTyp
 	_g_object_unref0 (outer_frame);
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 1746 "EditingTools.c"
+#line 1761 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkWidget* widget) {
 	EditingToolsEditingToolWindow * self;
-	GtkFrame* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkFrame* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
 #line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1760,13 +1775,13 @@ static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkW
 	_tmp1_ = widget;
 #line 64 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), _tmp1_);
-#line 1764 "EditingTools.c"
+#line 1779 "EditingTools.c"
 }
 
 
 gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingToolWindow* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL_WINDOW (self), FALSE);
 #line 68 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1775,20 +1790,20 @@ gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingTo
 	result = _tmp0_;
 #line 68 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1779 "EditingTools.c"
+#line 1794 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
 	EditingToolsEditingToolWindow * self;
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	AppWindow* _tmp2_ = NULL;
-	AppWindow* _tmp3_ = NULL;
-	GdkEventKey* _tmp4_ = NULL;
+	GdkEventKey* _tmp0_;
+	gboolean _tmp1_;
+	AppWindow* _tmp2_;
+	AppWindow* _tmp3_;
+	GdkEventKey* _tmp4_;
 	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
+	gboolean _tmp6_;
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1803,7 +1818,7 @@ static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidge
 		result = TRUE;
 #line 73 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 1807 "EditingTools.c"
+#line 1822 "EditingTools.c"
 	}
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = app_window_get_instance ();
@@ -1821,23 +1836,23 @@ static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidge
 	result = _tmp6_;
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1825 "EditingTools.c"
+#line 1840 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWidget* base, GdkEventButton* event) {
 	EditingToolsEditingToolWindow * self;
 	gboolean result = FALSE;
-	GdkEventButton* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	GdkEventButton* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	GdkEventButton* _tmp7_ = NULL;
-	gdouble _tmp8_ = 0.0;
-	GdkEventButton* _tmp9_ = NULL;
-	gdouble _tmp10_ = 0.0;
-	GdkEventButton* _tmp11_ = NULL;
-	guint32 _tmp12_ = 0U;
+	GdkEventButton* _tmp0_;
+	guint _tmp1_;
+	GdkEventButton* _tmp5_;
+	guint _tmp6_;
+	GdkEventButton* _tmp7_;
+	gdouble _tmp8_;
+	GdkEventButton* _tmp9_;
+	gdouble _tmp10_;
+	GdkEventButton* _tmp11_;
+	guint32 _tmp12_;
 #line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
 #line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1848,30 +1863,30 @@ static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWi
 	_tmp1_ = _tmp0_->button;
 #line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ != ((guint) 1)) {
-#line 1852 "EditingTools.c"
+#line 1867 "EditingTools.c"
 		gboolean _tmp2_ = FALSE;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event != NULL) {
-#line 1856 "EditingTools.c"
-			GdkEventButton* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 1871 "EditingTools.c"
+			GdkEventButton* _tmp3_;
+			gboolean _tmp4_;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp3_ = event;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp4_ = GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp3_);
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = _tmp4_;
-#line 1865 "EditingTools.c"
+#line 1880 "EditingTools.c"
 		} else {
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = TRUE;
-#line 1869 "EditingTools.c"
+#line 1884 "EditingTools.c"
 		}
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = _tmp2_;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 1875 "EditingTools.c"
+#line 1890 "EditingTools.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = event;
@@ -1897,7 +1912,7 @@ static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWi
 	result = TRUE;
 #line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1901 "EditingTools.c"
+#line 1916 "EditingTools.c"
 }
 
 
@@ -1909,7 +1924,7 @@ static void editing_tools_editing_tool_window_real_realize (GtkWidget* base) {
 	gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_TYPE (self, gtk_widget_get_type ()) ? ((GtkWidget*) self) : NULL, RESOURCES_TRANSIENT_WINDOW_OPACITY);
 #line 92 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget));
-#line 1913 "EditingTools.c"
+#line 1928 "EditingTools.c"
 }
 
 
@@ -1918,7 +1933,7 @@ static void editing_tools_editing_tool_window_suppress_warnings (EditingToolsEdi
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL_WINDOW (self));
 #line 95 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (message != NULL);
-#line 1922 "EditingTools.c"
+#line 1937 "EditingTools.c"
 }
 
 
@@ -1928,21 +1943,21 @@ static void editing_tools_editing_tool_window_class_init (EditingToolsEditingToo
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsEditingToolWindowPrivate));
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((GtkContainerClass *) klass)->add = (void (*)(GtkContainer*, GtkWidget*)) editing_tools_editing_tool_window_real_add;
+	((GtkContainerClass *) klass)->add = (void (*) (GtkContainer *, GtkWidget*)) editing_tools_editing_tool_window_real_add;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) editing_tools_editing_tool_window_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) editing_tools_editing_tool_window_real_key_press_event;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*)(GtkWidget*, GdkEventButton*)) editing_tools_editing_tool_window_real_button_press_event;
+	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*) (GtkWidget *, GdkEventButton*)) editing_tools_editing_tool_window_real_button_press_event;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((GtkWidgetClass *) klass)->realize = (void (*)(GtkWidget*)) editing_tools_editing_tool_window_real_realize;
+	((GtkWidgetClass *) klass)->realize = (void (*) (GtkWidget *)) editing_tools_editing_tool_window_real_realize;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_editing_tool_window_finalize;
-#line 1941 "EditingTools.c"
+#line 1956 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_window_instance_init (EditingToolsEditingToolWindow * self) {
-	GtkFrame* _tmp0_ = NULL;
+	GtkFrame* _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_EDITING_TOOL_WINDOW_GET_PRIVATE (self);
 #line 31 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1953,14 +1968,14 @@ static void editing_tools_editing_tool_window_instance_init (EditingToolsEditing
 	self->priv->layout_frame = _tmp0_;
 #line 32 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_moved = FALSE;
-#line 1957 "EditingTools.c"
+#line 1972 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_window_finalize (GObject* obj) {
+static void editing_tools_editing_tool_window_finalize (GObject * obj) {
 	EditingToolsEditingToolWindow * self;
-	GLogFunc _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
+	GLogFunc _tmp0_;
+	void* _tmp0__target;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
 #line 60 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1973,7 +1988,7 @@ static void editing_tools_editing_tool_window_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->layout_frame);
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_editing_tool_window_parent_class)->finalize (obj);
-#line 1977 "EditingTools.c"
+#line 1992 "EditingTools.c"
 }
 
 
@@ -1992,35 +2007,35 @@ GType editing_tools_editing_tool_window_get_type (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1996 "EditingTools.c"
+#line 2011 "EditingTools.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
 #line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 2003 "EditingTools.c"
+#line 2018 "EditingTools.c"
 }
 
 
 EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type, GtkWindow* container, GdkWindow* drawing_window, Photo* photo, cairo_t* default_ctx, Dimensions* surface_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position) {
 	EditingToolsPhotoCanvas* self = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
-	GdkWindow* _tmp2_ = NULL;
-	GdkWindow* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	Photo* _tmp5_ = NULL;
-	cairo_t* _tmp6_ = NULL;
-	cairo_t* _tmp7_ = NULL;
-	Dimensions _tmp8_ = {0};
-	GdkRectangle _tmp9_ = {0};
-	GdkPixbuf* _tmp10_ = NULL;
-	GdkPixbuf* _tmp11_ = NULL;
-	cairo_t* _tmp12_ = NULL;
-	GdkPixbuf* _tmp13_ = NULL;
-	GdkRectangle _tmp14_ = {0};
-	cairo_surface_t* _tmp15_ = NULL;
+	GtkWindow* _tmp0_;
+	GtkWindow* _tmp1_;
+	GdkWindow* _tmp2_;
+	GdkWindow* _tmp3_;
+	Photo* _tmp4_;
+	Photo* _tmp5_;
+	cairo_t* _tmp6_;
+	cairo_t* _tmp7_;
+	Dimensions _tmp8_;
+	GdkRectangle _tmp9_;
+	GdkPixbuf* _tmp10_;
+	GdkPixbuf* _tmp11_;
+	cairo_t* _tmp12_;
+	GdkPixbuf* _tmp13_;
+	GdkRectangle _tmp14_;
+	cairo_surface_t* _tmp15_;
 #line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2099,13 +2114,13 @@ EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type
 	self->priv->scaled = _tmp15_;
 #line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 2103 "EditingTools.c"
+#line 2118 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* self, GdkRectangle* rectangle, GdkRectangle* result) {
-	Photo* _tmp0_ = NULL;
-	GdkRectangle _tmp1_ = {0};
+	Photo* _tmp0_;
+	GdkRectangle _tmp1_;
 	GdkRectangle _tmp2_ = {0};
 #line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
@@ -2121,7 +2136,7 @@ void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* s
 	*result = _tmp2_;
 #line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2125 "EditingTools.c"
+#line 2140 "EditingTools.c"
 }
 
 
@@ -2129,24 +2144,24 @@ void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanva
 	GdkRectangle scaled_position = {0};
 	GdkRectangle _tmp0_ = {0};
 	Dimensions unscaled_dims = {0};
-	Photo* _tmp1_ = NULL;
+	Photo* _tmp1_;
 	Dimensions _tmp2_ = {0};
 	gdouble scale_factor_x = 0.0;
-	Dimensions _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
+	Dimensions _tmp3_;
+	gint _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
 	gdouble scale_factor_y = 0.0;
-	Dimensions _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	GdkRectangle _tmp9_ = {0};
-	gint _tmp10_ = 0;
+	Dimensions _tmp7_;
+	gint _tmp8_;
+	GdkRectangle _tmp9_;
+	gint _tmp10_;
 	GdkPoint _result_ = {0};
 	GdkPoint _tmp11_ = {0};
-	GdkPoint _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	GdkPoint _tmp14_ = {0};
-	gint _tmp15_ = 0;
+	GdkPoint _tmp12_;
+	gint _tmp13_;
+	GdkPoint _tmp14_;
+	gint _tmp15_;
 #line 134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2201,7 +2216,7 @@ void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanva
 	*result = _result_;
 #line 147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2205 "EditingTools.c"
+#line 2220 "EditingTools.c"
 }
 
 
@@ -2210,35 +2225,35 @@ void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas
 	GdkPoint _tmp0_ = {0};
 	GdkPoint lower_right = {0};
 	GdkPoint _tmp1_ = {0};
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	GdkPoint _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	GdkPoint _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	GdkPoint _tmp14_ = {0};
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkPoint _tmp6_;
+	gint _tmp7_;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
+	GdkPoint _tmp10_;
+	gint _tmp11_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
+	GdkPoint _tmp14_;
 	GdkPoint _tmp15_ = {0};
-	GdkPoint _tmp16_ = {0};
+	GdkPoint _tmp16_;
 	GdkPoint _tmp17_ = {0};
 	GdkRectangle unscaled_rect = {0};
-	GdkPoint _tmp18_ = {0};
-	gint _tmp19_ = 0;
-	GdkPoint _tmp20_ = {0};
-	gint _tmp21_ = 0;
-	GdkPoint _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	GdkPoint _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	GdkPoint _tmp26_ = {0};
-	gint _tmp27_ = 0;
-	GdkPoint _tmp28_ = {0};
-	gint _tmp29_ = 0;
+	GdkPoint _tmp18_;
+	gint _tmp19_;
+	GdkPoint _tmp20_;
+	gint _tmp21_;
+	GdkPoint _tmp22_;
+	gint _tmp23_;
+	GdkPoint _tmp24_;
+	gint _tmp25_;
+	GdkPoint _tmp26_;
+	gint _tmp27_;
+	GdkPoint _tmp28_;
+	gint _tmp29_;
 #line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2333,7 +2348,7 @@ void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas
 	*result = unscaled_rect;
 #line 167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2337 "EditingTools.c"
+#line 2352 "EditingTools.c"
 }
 
 
@@ -2342,14 +2357,14 @@ void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* s
 	GdkRectangle _tmp0_ = {0};
 	GdkPoint _result_ = {0};
 	GdkPoint _tmp1_ = {0};
-	GdkPoint _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	GdkPoint _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
+	GdkPoint _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkPoint _tmp6_;
+	gint _tmp7_;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
 #line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2386,7 +2401,7 @@ void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* s
 	*result = _result_;
 #line 177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2390 "EditingTools.c"
+#line 2405 "EditingTools.c"
 }
 
 
@@ -2395,35 +2410,35 @@ void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* se
 	GdkPoint _tmp0_ = {0};
 	GdkPoint lower_right = {0};
 	GdkPoint _tmp1_ = {0};
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	GdkPoint _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	GdkPoint _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	GdkPoint _tmp14_ = {0};
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkPoint _tmp6_;
+	gint _tmp7_;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
+	GdkPoint _tmp10_;
+	gint _tmp11_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
+	GdkPoint _tmp14_;
 	GdkPoint _tmp15_ = {0};
-	GdkPoint _tmp16_ = {0};
+	GdkPoint _tmp16_;
 	GdkPoint _tmp17_ = {0};
 	GdkRectangle active_rect = {0};
-	GdkPoint _tmp18_ = {0};
-	gint _tmp19_ = 0;
-	GdkPoint _tmp20_ = {0};
-	gint _tmp21_ = 0;
-	GdkPoint _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	GdkPoint _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	GdkPoint _tmp26_ = {0};
-	gint _tmp27_ = 0;
-	GdkPoint _tmp28_ = {0};
-	gint _tmp29_ = 0;
+	GdkPoint _tmp18_;
+	gint _tmp19_;
+	GdkPoint _tmp20_;
+	gint _tmp21_;
+	GdkPoint _tmp22_;
+	gint _tmp23_;
+	GdkPoint _tmp24_;
+	gint _tmp25_;
+	GdkPoint _tmp26_;
+	gint _tmp27_;
+	GdkPoint _tmp28_;
+	gint _tmp29_;
 #line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2518,14 +2533,14 @@ void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* se
 	*result = active_rect;
 #line 197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2522 "EditingTools.c"
+#line 2537 "EditingTools.c"
 }
 
 
 Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self) {
 	Photo* result = NULL;
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
 #line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
 #line 201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2536,14 +2551,14 @@ Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self) {
 	result = _tmp1_;
 #line 201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2540 "EditingTools.c"
+#line 2555 "EditingTools.c"
 }
 
 
 GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* self) {
 	GtkWindow* result = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
+	GtkWindow* _tmp0_;
+	GtkWindow* _tmp1_;
 #line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
 #line 205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2554,14 +2569,14 @@ GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* se
 	result = _tmp1_;
 #line 205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2558 "EditingTools.c"
+#line 2573 "EditingTools.c"
 }
 
 
 GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanvas* self) {
 	GdkWindow* result = NULL;
-	GdkWindow* _tmp0_ = NULL;
-	GdkWindow* _tmp1_ = NULL;
+	GdkWindow* _tmp0_;
+	GdkWindow* _tmp1_;
 #line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
 #line 209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2572,14 +2587,14 @@ GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanva
 	result = _tmp1_;
 #line 209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2576 "EditingTools.c"
+#line 2591 "EditingTools.c"
 }
 
 
 cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* self) {
 	cairo_t* result = NULL;
-	cairo_t* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
+	cairo_t* _tmp0_;
+	cairo_t* _tmp1_;
 #line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
 #line 213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2590,12 +2605,12 @@ cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* se
 	result = _tmp1_;
 #line 213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2594 "EditingTools.c"
+#line 2609 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self, Dimensions* result) {
-	Dimensions _tmp0_ = {0};
+	Dimensions _tmp0_;
 #line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2604,12 +2619,12 @@ void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self,
 	*result = _tmp0_;
 #line 217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2608 "EditingTools.c"
+#line 2623 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, Scaling* result) {
-	Dimensions _tmp0_ = {0};
+	Dimensions _tmp0_;
 	Scaling _tmp1_ = {0};
 #line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
@@ -2621,16 +2636,16 @@ void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, Scal
 	*result = _tmp1_;
 #line 221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2625 "EditingTools.c"
+#line 2640 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cairo_t* default_ctx, Dimensions* surface_dim) {
-	cairo_t* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	Dimensions _tmp2_ = {0};
-	cairo_t* _tmp3_ = NULL;
-	Dimensions _tmp4_ = {0};
+	cairo_t* _tmp0_;
+	cairo_t* _tmp1_;
+	Dimensions _tmp2_;
+	cairo_t* _tmp3_;
+	Dimensions _tmp4_;
 #line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2654,22 +2669,22 @@ void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cair
 #line 228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = *surface_dim;
 #line 228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit_by_name (self, "new-surface", _tmp3_, &_tmp4_);
-#line 2659 "EditingTools.c"
+	g_signal_emit (self, editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL], 0, _tmp3_, &_tmp4_);
+#line 2674 "EditingTools.c"
 }
 
 
 static gpointer _cairo_surface_reference0 (gpointer self) {
 #line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? cairo_surface_reference (self) : NULL;
-#line 2666 "EditingTools.c"
+#line 2681 "EditingTools.c"
 }
 
 
 cairo_surface_t* editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhotoCanvas* self) {
 	cairo_surface_t* result = NULL;
-	cairo_surface_t* _tmp0_ = NULL;
-	cairo_surface_t* _tmp1_ = NULL;
+	cairo_surface_t* _tmp0_;
+	cairo_surface_t* _tmp1_;
 #line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
 #line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2680,14 +2695,14 @@ cairo_surface_t* editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhot
 	result = _tmp1_;
 #line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2684 "EditingTools.c"
+#line 2699 "EditingTools.c"
 }
 
 
 GdkPixbuf* editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas* self) {
 	GdkPixbuf* result = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
 #line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
 #line 236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2698,12 +2713,12 @@ GdkPixbuf* editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas
 	result = _tmp1_;
 #line 236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2702 "EditingTools.c"
+#line 2717 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCanvas* self, GdkRectangle* result) {
-	GdkRectangle _tmp0_ = {0};
+	GdkRectangle _tmp0_;
 #line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2712,21 +2727,21 @@ void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCan
 	*result = _tmp0_;
 #line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2716 "EditingTools.c"
+#line 2731 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position) {
-	cairo_t* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	GdkRectangle _tmp2_ = {0};
-	cairo_surface_t* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	GdkRectangle _tmp6_ = {0};
-	Dimensions _tmp7_ = {0};
-	GdkPixbuf* _tmp8_ = NULL;
-	GdkRectangle _tmp9_ = {0};
+	cairo_t* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	GdkRectangle _tmp2_;
+	cairo_surface_t* _tmp3_;
+	GdkPixbuf* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	GdkRectangle _tmp6_;
+	Dimensions _tmp7_;
+	GdkPixbuf* _tmp8_;
+	GdkRectangle _tmp9_;
 #line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2766,8 +2781,8 @@ void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, D
 #line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = *scaled_position;
 #line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit_by_name (self, "resized-scaled-pixbuf", &_tmp7_, _tmp8_, &_tmp9_);
-#line 2771 "EditingTools.c"
+	g_signal_emit (self, editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL], 0, &_tmp7_, _tmp8_, &_tmp9_);
+#line 2786 "EditingTools.c"
 }
 
 
@@ -2776,7 +2791,7 @@ static void editing_tools_photo_canvas_real_repaint (EditingToolsPhotoCanvas* se
 	g_critical ("Type `%s' does not implement abstract method `editing_tools_photo_canvas_repaint'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2780 "EditingTools.c"
+#line 2795 "EditingTools.c"
 }
 
 
@@ -2785,36 +2800,36 @@ void editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self) {
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->repaint (self);
-#line 2789 "EditingTools.c"
+#line 2804 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, GdkPixbuf* pixbuf) {
-	cairo_t* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
-	Dimensions _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	Dimensions _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	cairo_t* _tmp7_ = NULL;
-	cairo_t* _tmp8_ = NULL;
-	GdkPixbuf* _tmp9_ = NULL;
-	GdkRectangle _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	cairo_t* _tmp14_ = NULL;
-	GdkRectangle _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	GdkRectangle _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	GdkPixbuf* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
-	GdkPixbuf* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	cairo_t* _tmp23_ = NULL;
-	cairo_t* _tmp24_ = NULL;
+	cairo_t* _tmp0_;
+	cairo_t* _tmp1_;
+	cairo_t* _tmp2_;
+	Dimensions _tmp3_;
+	gint _tmp4_;
+	Dimensions _tmp5_;
+	gint _tmp6_;
+	cairo_t* _tmp7_;
+	cairo_t* _tmp8_;
+	GdkPixbuf* _tmp9_;
+	GdkRectangle _tmp10_;
+	gint _tmp11_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
+	cairo_t* _tmp14_;
+	GdkRectangle _tmp15_;
+	gint _tmp16_;
+	GdkRectangle _tmp17_;
+	gint _tmp18_;
+	GdkPixbuf* _tmp19_;
+	gint _tmp20_;
+	GdkPixbuf* _tmp21_;
+	gint _tmp22_;
+	cairo_t* _tmp23_;
+	cairo_t* _tmp24_;
 #line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2885,33 +2900,33 @@ void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, Gdk
 	_tmp24_ = self->priv->default_ctx;
 #line 272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp24_);
-#line 2889 "EditingTools.c"
+#line 2904 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self, GdkPixbuf* pixbuf, Box* source_area) {
-	cairo_t* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	cairo_t* _tmp16_ = NULL;
-	GdkPixbuf* _tmp17_ = NULL;
-	GdkRectangle _tmp18_ = {0};
-	gint _tmp19_ = 0;
-	GdkRectangle _tmp20_ = {0};
-	gint _tmp21_ = 0;
-	cairo_t* _tmp22_ = NULL;
-	GdkRectangle _tmp23_ = {0};
-	gint _tmp24_ = 0;
-	Box _tmp25_ = {0};
-	gint _tmp26_ = 0;
-	GdkRectangle _tmp27_ = {0};
-	gint _tmp28_ = 0;
-	Box _tmp29_ = {0};
-	gint _tmp30_ = 0;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
-	cairo_t* _tmp33_ = NULL;
-	cairo_t* _tmp34_ = NULL;
+	cairo_t* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	gboolean _tmp2_;
+	cairo_t* _tmp16_;
+	GdkPixbuf* _tmp17_;
+	GdkRectangle _tmp18_;
+	gint _tmp19_;
+	GdkRectangle _tmp20_;
+	gint _tmp21_;
+	cairo_t* _tmp22_;
+	GdkRectangle _tmp23_;
+	gint _tmp24_;
+	Box _tmp25_;
+	gint _tmp26_;
+	GdkRectangle _tmp27_;
+	gint _tmp28_;
+	Box _tmp29_;
+	gint _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
+	cairo_t* _tmp33_;
+	cairo_t* _tmp34_;
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2928,20 +2943,20 @@ void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self
 	_tmp2_ = gdk_pixbuf_get_has_alpha (_tmp1_);
 #line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_) {
-#line 2932 "EditingTools.c"
-		cairo_t* _tmp3_ = NULL;
-		cairo_t* _tmp4_ = NULL;
-		GdkRectangle _tmp5_ = {0};
-		gint _tmp6_ = 0;
-		Box _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		GdkRectangle _tmp9_ = {0};
-		gint _tmp10_ = 0;
-		Box _tmp11_ = {0};
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
-		cairo_t* _tmp15_ = NULL;
+#line 2947 "EditingTools.c"
+		cairo_t* _tmp3_;
+		cairo_t* _tmp4_;
+		GdkRectangle _tmp5_;
+		gint _tmp6_;
+		Box _tmp7_;
+		gint _tmp8_;
+		GdkRectangle _tmp9_;
+		gint _tmp10_;
+		Box _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
+		gint _tmp14_;
+		cairo_t* _tmp15_;
 #line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->default_ctx;
 #line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2974,7 +2989,7 @@ void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self
 		_tmp15_ = self->priv->default_ctx;
 #line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_fill (_tmp15_);
-#line 2978 "EditingTools.c"
+#line 2993 "EditingTools.c"
 	}
 #line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->default_ctx;
@@ -3022,28 +3037,28 @@ void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self
 	_tmp34_ = self->priv->default_ctx;
 #line 291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp34_);
-#line 3026 "EditingTools.c"
+#line 3041 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, gboolean over) {
-	cairo_t* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	cairo_t* _tmp4_ = NULL;
-	cairo_surface_t* _tmp5_ = NULL;
-	GdkRectangle _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	cairo_t* _tmp10_ = NULL;
-	cairo_t* _tmp11_ = NULL;
-	cairo_surface_t* _tmp12_ = NULL;
-	GdkRectangle _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	GdkRectangle _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	cairo_t* _tmp17_ = NULL;
-	cairo_t* _tmp18_ = NULL;
+	cairo_t* _tmp0_;
+	gboolean _tmp1_;
+	cairo_t* _tmp4_;
+	cairo_surface_t* _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
+	cairo_t* _tmp10_;
+	cairo_t* _tmp11_;
+	cairo_surface_t* _tmp12_;
+	GdkRectangle _tmp13_;
+	gint _tmp14_;
+	GdkRectangle _tmp15_;
+	gint _tmp16_;
+	cairo_t* _tmp17_;
+	cairo_t* _tmp18_;
 #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3056,20 +3071,20 @@ void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, ca
 	_tmp1_ = over;
 #line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == FALSE) {
-#line 3060 "EditingTools.c"
-		cairo_t* _tmp2_ = NULL;
+#line 3075 "EditingTools.c"
+		cairo_t* _tmp2_;
 #line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->default_ctx;
 #line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE);
-#line 3066 "EditingTools.c"
+#line 3081 "EditingTools.c"
 	} else {
-		cairo_t* _tmp3_ = NULL;
+		cairo_t* _tmp3_;
 #line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->default_ctx;
 #line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER);
-#line 3073 "EditingTools.c"
+#line 3088 "EditingTools.c"
 	}
 #line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->default_ctx;
@@ -3111,50 +3126,50 @@ void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, ca
 	_tmp18_ = self->priv->default_ctx;
 #line 306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp18_);
-#line 3115 "EditingTools.c"
+#line 3130 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, Box* source_area, gboolean over) {
-	cairo_t* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	cairo_t* _tmp4_ = NULL;
-	cairo_surface_t* _tmp5_ = NULL;
-	GdkRectangle _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	cairo_t* _tmp10_ = NULL;
-	GdkRectangle _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	Box _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	GdkRectangle _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	Box _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	cairo_t* _tmp21_ = NULL;
-	cairo_t* _tmp22_ = NULL;
-	cairo_surface_t* _tmp23_ = NULL;
-	GdkRectangle _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	GdkRectangle _tmp26_ = {0};
-	gint _tmp27_ = 0;
-	cairo_t* _tmp28_ = NULL;
-	GdkRectangle _tmp29_ = {0};
-	gint _tmp30_ = 0;
-	Box _tmp31_ = {0};
-	gint _tmp32_ = 0;
-	GdkRectangle _tmp33_ = {0};
-	gint _tmp34_ = 0;
-	Box _tmp35_ = {0};
-	gint _tmp36_ = 0;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	cairo_t* _tmp39_ = NULL;
-	cairo_t* _tmp40_ = NULL;
+	cairo_t* _tmp0_;
+	gboolean _tmp1_;
+	cairo_t* _tmp4_;
+	cairo_surface_t* _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
+	cairo_t* _tmp10_;
+	GdkRectangle _tmp11_;
+	gint _tmp12_;
+	Box _tmp13_;
+	gint _tmp14_;
+	GdkRectangle _tmp15_;
+	gint _tmp16_;
+	Box _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
+	cairo_t* _tmp21_;
+	cairo_t* _tmp22_;
+	cairo_surface_t* _tmp23_;
+	GdkRectangle _tmp24_;
+	gint _tmp25_;
+	GdkRectangle _tmp26_;
+	gint _tmp27_;
+	cairo_t* _tmp28_;
+	GdkRectangle _tmp29_;
+	gint _tmp30_;
+	Box _tmp31_;
+	gint _tmp32_;
+	GdkRectangle _tmp33_;
+	gint _tmp34_;
+	Box _tmp35_;
+	gint _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
+	cairo_t* _tmp39_;
+	cairo_t* _tmp40_;
 #line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3169,20 +3184,20 @@ void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* sel
 	_tmp1_ = over;
 #line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == FALSE) {
-#line 3173 "EditingTools.c"
-		cairo_t* _tmp2_ = NULL;
+#line 3188 "EditingTools.c"
+		cairo_t* _tmp2_;
 #line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->default_ctx;
 #line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE);
-#line 3179 "EditingTools.c"
+#line 3194 "EditingTools.c"
 	} else {
-		cairo_t* _tmp3_ = NULL;
+		cairo_t* _tmp3_;
 #line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->default_ctx;
 #line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER);
-#line 3186 "EditingTools.c"
+#line 3201 "EditingTools.c"
 	}
 #line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->default_ctx;
@@ -3272,29 +3287,29 @@ void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* sel
 	_tmp40_ = self->priv->default_ctx;
 #line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp40_);
-#line 3276 "EditingTools.c"
+#line 3291 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t* ctx, Box* box) {
 	GdkRectangle rect = {0};
 	GdkRectangle _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	cairo_t* _tmp7_ = NULL;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	GdkRectangle _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	GdkRectangle _tmp14_ = {0};
-	gint _tmp15_ = 0;
-	cairo_t* _tmp16_ = NULL;
+	gint _tmp1_;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	cairo_t* _tmp7_;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
+	GdkRectangle _tmp10_;
+	gint _tmp11_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
+	GdkRectangle _tmp14_;
+	gint _tmp15_;
+	cairo_t* _tmp16_;
 #line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3345,37 +3360,37 @@ void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t
 	_tmp16_ = ctx;
 #line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp16_);
-#line 3349 "EditingTools.c"
+#line 3364 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_t* ctx, const gchar* text, gint x, gint y, gboolean use_scaled_pos) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	cairo_text_extents_t extents = {0};
-	cairo_t* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
+	cairo_t* _tmp7_;
+	const gchar* _tmp8_;
 	cairo_text_extents_t _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	cairo_text_extents_t _tmp11_ = {0};
-	gdouble _tmp12_ = 0.0;
-	cairo_t* _tmp13_ = NULL;
+	gint _tmp10_;
+	cairo_text_extents_t _tmp11_;
+	gdouble _tmp12_;
+	cairo_t* _tmp13_;
 	gint pane_border = 0;
-	cairo_t* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	cairo_text_extents_t _tmp17_ = {0};
-	gdouble _tmp18_ = 0.0;
-	cairo_text_extents_t _tmp19_ = {0};
-	gdouble _tmp20_ = 0.0;
-	cairo_text_extents_t _tmp21_ = {0};
-	gdouble _tmp22_ = 0.0;
-	cairo_t* _tmp23_ = NULL;
-	cairo_t* _tmp24_ = NULL;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	cairo_t* _tmp27_ = NULL;
-	cairo_t* _tmp28_ = NULL;
-	const gchar* _tmp29_ = NULL;
+	cairo_t* _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	cairo_text_extents_t _tmp17_;
+	gdouble _tmp18_;
+	cairo_text_extents_t _tmp19_;
+	gdouble _tmp20_;
+	cairo_text_extents_t _tmp21_;
+	gdouble _tmp22_;
+	cairo_t* _tmp23_;
+	cairo_t* _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
+	cairo_t* _tmp27_;
+	cairo_t* _tmp28_;
+	const gchar* _tmp29_;
 #line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3386,13 +3401,13 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_
 	_tmp0_ = use_scaled_pos;
 #line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3390 "EditingTools.c"
-		gint _tmp1_ = 0;
-		GdkRectangle _tmp2_ = {0};
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
-		GdkRectangle _tmp5_ = {0};
-		gint _tmp6_ = 0;
+#line 3405 "EditingTools.c"
+		gint _tmp1_;
+		GdkRectangle _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
+		GdkRectangle _tmp5_;
+		gint _tmp6_;
 #line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
 #line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3409,7 +3424,7 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_
 		_tmp6_ = _tmp5_.y;
 #line 342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3413 "EditingTools.c"
+#line 3428 "EditingTools.c"
 	}
 #line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
@@ -3475,7 +3490,7 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_
 	_tmp29_ = text;
 #line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_show_text (_tmp28_, _tmp29_);
-#line 3479 "EditingTools.c"
+#line 3494 "EditingTools.c"
 }
 
 
@@ -3491,15 +3506,15 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_
      *      position of the scaled image.
      */
 void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint width, gboolean use_scaled_pos) {
-	gboolean _tmp0_ = FALSE;
-	cairo_t* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	cairo_t* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	cairo_t* _tmp14_ = NULL;
+	gboolean _tmp0_;
+	cairo_t* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	cairo_t* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	cairo_t* _tmp14_;
 #line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3508,13 +3523,13 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s
 	_tmp0_ = use_scaled_pos;
 #line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3512 "EditingTools.c"
-		gint _tmp1_ = 0;
-		GdkRectangle _tmp2_ = {0};
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
-		GdkRectangle _tmp5_ = {0};
-		gint _tmp6_ = 0;
+#line 3527 "EditingTools.c"
+		gint _tmp1_;
+		GdkRectangle _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
+		GdkRectangle _tmp5_;
+		gint _tmp6_;
 #line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
 #line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3531,7 +3546,7 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s
 		_tmp6_ = _tmp5_.y;
 #line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3535 "EditingTools.c"
+#line 3550 "EditingTools.c"
 	}
 #line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
@@ -3555,7 +3570,7 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s
 	_tmp14_ = ctx;
 #line 380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp14_);
-#line 3559 "EditingTools.c"
+#line 3574 "EditingTools.c"
 }
 
 
@@ -3571,15 +3586,15 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s
      *      position of the scaled image.
      */
 void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint height, gboolean use_scaled_pos) {
-	gboolean _tmp0_ = FALSE;
-	cairo_t* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	cairo_t* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	cairo_t* _tmp14_ = NULL;
+	gboolean _tmp0_;
+	cairo_t* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	cairo_t* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	cairo_t* _tmp14_;
 #line 394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3588,13 +3603,13 @@ void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* sel
 	_tmp0_ = use_scaled_pos;
 #line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3592 "EditingTools.c"
-		gint _tmp1_ = 0;
-		GdkRectangle _tmp2_ = {0};
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
-		GdkRectangle _tmp5_ = {0};
-		gint _tmp6_ = 0;
+#line 3607 "EditingTools.c"
+		gint _tmp1_;
+		GdkRectangle _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
+		GdkRectangle _tmp5_;
+		gint _tmp6_;
 #line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
 #line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3611,7 +3626,7 @@ void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* sel
 		_tmp6_ = _tmp5_.y;
 #line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3615 "EditingTools.c"
+#line 3630 "EditingTools.c"
 	}
 #line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
@@ -3635,29 +3650,29 @@ void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* sel
 	_tmp14_ = ctx;
 #line 402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp14_);
-#line 3639 "EditingTools.c"
+#line 3654 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas* self, gint x, gint y, gint width) {
-	cairo_t* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
-	cairo_surface_t* _tmp3_ = NULL;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	GdkRectangle _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	cairo_t* _tmp8_ = NULL;
-	GdkRectangle _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	cairo_t* _tmp16_ = NULL;
-	cairo_t* _tmp17_ = NULL;
+	cairo_t* _tmp0_;
+	cairo_t* _tmp1_;
+	cairo_t* _tmp2_;
+	cairo_surface_t* _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
+	cairo_t* _tmp8_;
+	GdkRectangle _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
+	cairo_t* _tmp16_;
+	cairo_t* _tmp17_;
 #line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3708,22 +3723,22 @@ void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas*
 	_tmp17_ = self->priv->default_ctx;
 #line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp17_);
-#line 3712 "EditingTools.c"
+#line 3727 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint active_center_x, gint active_center_y, gint radius) {
 	gint center_x = 0;
-	gint _tmp0_ = 0;
-	GdkRectangle _tmp1_ = {0};
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	GdkRectangle _tmp1_;
+	gint _tmp2_;
 	gint center_y = 0;
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	cairo_t* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	cairo_t* _tmp8_ = NULL;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	cairo_t* _tmp6_;
+	gint _tmp7_;
+	cairo_t* _tmp8_;
 #line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3754,29 +3769,29 @@ void editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self, cair
 	_tmp8_ = ctx;
 #line 423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp8_);
-#line 3758 "EditingTools.c"
+#line 3773 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* self, gint x, gint y, gint height) {
-	cairo_t* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
-	cairo_surface_t* _tmp3_ = NULL;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	GdkRectangle _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	cairo_t* _tmp8_ = NULL;
-	GdkRectangle _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	cairo_t* _tmp16_ = NULL;
-	cairo_t* _tmp17_ = NULL;
+	cairo_t* _tmp0_;
+	cairo_t* _tmp1_;
+	cairo_t* _tmp2_;
+	cairo_surface_t* _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
+	cairo_t* _tmp8_;
+	GdkRectangle _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
+	cairo_t* _tmp16_;
+	cairo_t* _tmp17_;
 #line 426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3827,31 +3842,31 @@ void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* se
 	_tmp17_ = self->priv->default_ctx;
 #line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp17_);
-#line 3831 "EditingTools.c"
+#line 3846 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* box) {
-	Box _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	Box _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	Box _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	Box _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	Box _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	Box _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	Box _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	Box _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	Box _tmp0_;
+	gint _tmp1_;
+	Box _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	Box _tmp5_;
+	gint _tmp6_;
+	Box _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	Box _tmp10_;
+	gint _tmp11_;
+	Box _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	Box _tmp15_;
+	gint _tmp16_;
+	Box _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 #line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3904,21 +3919,21 @@ void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* b
 	_tmp19_ = box_get_height (box);
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_erase_vertical_line (self, _tmp16_, _tmp18_, _tmp19_);
-#line 3908 "EditingTools.c"
+#line 3923 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self, Box* area) {
 	GdkRectangle rect = {0};
 	GdkRectangle _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	GdkWindow* _tmp7_ = NULL;
-	GdkRectangle _tmp8_ = {0};
+	gint _tmp1_;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	GdkWindow* _tmp7_;
+	GdkRectangle _tmp8_;
 #line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3949,23 +3964,23 @@ void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self,
 	_tmp8_ = rect;
 #line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gdk_window_invalidate_rect (_tmp7_, &_tmp8_, FALSE);
-#line 3953 "EditingTools.c"
+#line 3968 "EditingTools.c"
 }
 
 
 static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToolsPhotoCanvas* self, cairo_t* default_ctx, GdkPixbuf* pixbuf, GdkRectangle* pos) {
 	cairo_surface_t* result = NULL;
 	cairo_surface_t* surface = NULL;
-	cairo_t* _tmp0_ = NULL;
-	cairo_surface_t* _tmp1_ = NULL;
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	cairo_surface_t* _tmp6_ = NULL;
+	cairo_t* _tmp0_;
+	cairo_surface_t* _tmp1_;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	cairo_surface_t* _tmp6_;
 	cairo_t* ctx = NULL;
-	cairo_t* _tmp7_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
+	cairo_t* _tmp7_;
+	GdkPixbuf* _tmp8_;
 #line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
 #line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4006,7 +4021,7 @@ static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToo
 	_cairo_destroy0 (ctx);
 #line 465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4010 "EditingTools.c"
+#line 4025 "EditingTools.c"
 }
 
 
@@ -4025,19 +4040,19 @@ static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, GVa
 		data1 = closure->data;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4029 "EditingTools.c"
+#line 4044 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4035 "EditingTools.c"
+#line 4050 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__POINTER_BOXED) (marshal_data ? marshal_data : cc->callback);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_pointer (param_values + 1), g_value_get_boxed (param_values + 2), data2);
-#line 4041 "EditingTools.c"
+#line 4056 "EditingTools.c"
 }
 
 
@@ -4056,26 +4071,26 @@ static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure
 		data1 = closure->data;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4060 "EditingTools.c"
+#line 4075 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4066 "EditingTools.c"
+#line 4081 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__BOXED_OBJECT_BOXED) (marshal_data ? marshal_data : cc->callback);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_boxed (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), data2);
-#line 4072 "EditingTools.c"
+#line 4087 "EditingTools.c"
 }
 
 
 static void editing_tools_value_photo_canvas_init (GValue* value) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 4079 "EditingTools.c"
+#line 4094 "EditingTools.c"
 }
 
 
@@ -4084,7 +4099,7 @@ static void editing_tools_value_photo_canvas_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (value->data[0].v_pointer);
-#line 4088 "EditingTools.c"
+#line 4103 "EditingTools.c"
 	}
 }
 
@@ -4094,11 +4109,11 @@ static void editing_tools_value_photo_canvas_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_photo_canvas_ref (src_value->data[0].v_pointer);
-#line 4098 "EditingTools.c"
+#line 4113 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4102 "EditingTools.c"
+#line 4117 "EditingTools.c"
 	}
 }
 
@@ -4106,66 +4121,66 @@ static void editing_tools_value_photo_canvas_copy_value (const GValue* src_value
 static gpointer editing_tools_value_photo_canvas_peek_pointer (const GValue* value) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4110 "EditingTools.c"
+#line 4125 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_photo_canvas_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 4117 "EditingTools.c"
-		EditingToolsPhotoCanvas* object;
+#line 4132 "EditingTools.c"
+		EditingToolsPhotoCanvas * object;
 		object = collect_values[0].v_pointer;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4124 "EditingTools.c"
+#line 4139 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4128 "EditingTools.c"
+#line 4143 "EditingTools.c"
 		}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_photo_canvas_ref (object);
-#line 4132 "EditingTools.c"
+#line 4147 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4136 "EditingTools.c"
+#line 4151 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4140 "EditingTools.c"
+#line 4155 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_photo_canvas_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	EditingToolsPhotoCanvas** object_p;
+	EditingToolsPhotoCanvas ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!object_p) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4151 "EditingTools.c"
+#line 4166 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 4157 "EditingTools.c"
+#line 4172 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4161 "EditingTools.c"
+#line 4176 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_photo_canvas_ref (value->data[0].v_pointer);
-#line 4165 "EditingTools.c"
+#line 4180 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4169 "EditingTools.c"
+#line 4184 "EditingTools.c"
 }
 
 
@@ -4179,7 +4194,7 @@ GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 4183 "EditingTools.c"
+#line 4198 "EditingTools.c"
 }
 
 
@@ -4188,12 +4203,12 @@ gpointer editing_tools_value_get_photo_canvas (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS), NULL);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4192 "EditingTools.c"
+#line 4207 "EditingTools.c"
 }
 
 
 void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object) {
-	EditingToolsPhotoCanvas* old;
+	EditingToolsPhotoCanvas * old;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS));
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4208,23 +4223,23 @@ void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_ref (value->data[0].v_pointer);
-#line 4212 "EditingTools.c"
+#line 4227 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4216 "EditingTools.c"
+#line 4231 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (old);
-#line 4222 "EditingTools.c"
+#line 4237 "EditingTools.c"
 	}
 }
 
 
 void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object) {
-	EditingToolsPhotoCanvas* old;
+	EditingToolsPhotoCanvas * old;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS));
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4237,17 +4252,17 @@ void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 4241 "EditingTools.c"
+#line 4256 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4245 "EditingTools.c"
+#line 4260 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (old);
-#line 4251 "EditingTools.c"
+#line 4266 "EditingTools.c"
 	}
 }
 
@@ -4260,12 +4275,12 @@ static void editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsPhotoCanvasPrivate));
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsPhotoCanvasClass *) klass)->repaint = (void (*)(EditingToolsPhotoCanvas*)) editing_tools_photo_canvas_real_repaint;
+	((EditingToolsPhotoCanvasClass *) klass)->repaint = (void (*) (EditingToolsPhotoCanvas *)) editing_tools_photo_canvas_real_repaint;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_new ("new_surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__POINTER_BOXED, G_TYPE_NONE, 2, G_TYPE_POINTER, TYPE_DIMENSIONS);
+	editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL] = g_signal_new ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__POINTER_BOXED, G_TYPE_NONE, 2, G_TYPE_POINTER, TYPE_DIMENSIONS);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_new ("resized_scaled_pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED, G_TYPE_NONE, 3, TYPE_DIMENSIONS, gdk_pixbuf_get_type (), gdk_rectangle_get_type ());
-#line 4269 "EditingTools.c"
+	editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL] = g_signal_new ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED, G_TYPE_NONE, 3, TYPE_DIMENSIONS, gdk_pixbuf_get_type (), gdk_rectangle_get_type ());
+#line 4284 "EditingTools.c"
 }
 
 
@@ -4274,11 +4289,11 @@ static void editing_tools_photo_canvas_instance_init (EditingToolsPhotoCanvas *
 	self->priv = EDITING_TOOLS_PHOTO_CANVAS_GET_PRIVATE (self);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 4278 "EditingTools.c"
+#line 4293 "EditingTools.c"
 }
 
 
-static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas* obj) {
+static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas * obj) {
 	EditingToolsPhotoCanvas * self;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvas);
@@ -4296,7 +4311,7 @@ static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas* obj) {
 	_cairo_surface_destroy0 (self->priv->scaled);
 #line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->scaled_pixbuf);
-#line 4300 "EditingTools.c"
+#line 4315 "EditingTools.c"
 }
 
 
@@ -4315,18 +4330,18 @@ GType editing_tools_photo_canvas_get_type (void) {
 
 
 gpointer editing_tools_photo_canvas_ref (gpointer instance) {
-	EditingToolsPhotoCanvas* self;
+	EditingToolsPhotoCanvas * self;
 	self = instance;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 4325 "EditingTools.c"
+#line 4340 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_unref (gpointer instance) {
-	EditingToolsPhotoCanvas* self;
+	EditingToolsPhotoCanvas * self;
 	self = instance;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -4334,15 +4349,15 @@ void editing_tools_photo_canvas_unref (gpointer instance) {
 		EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->finalize (self);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4338 "EditingTools.c"
+#line 4353 "EditingTools.c"
 	}
 }
 
 
 EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type, const gchar* name) {
 	EditingToolsEditingTool* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4357,14 +4372,14 @@ EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type
 	self->name = _tmp1_;
 #line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 4361 "EditingTools.c"
+#line 4376 "EditingTools.c"
 }
 
 
 static gpointer _editing_tools_photo_canvas_ref0 (gpointer self) {
 #line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? editing_tools_photo_canvas_ref (self) : NULL;
-#line 4368 "EditingTools.c"
+#line 4383 "EditingTools.c"
 }
 
 
@@ -4373,17 +4388,17 @@ static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_eve
 	result = editing_tools_editing_tool_on_keypress ((EditingToolsEditingTool*) self, event);
 #line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4377 "EditingTools.c"
+#line 4392 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	EditingToolsEditingToolWindow* _tmp1_ = NULL;
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	EditingToolsPhotoCanvas* _tmp3_ = NULL;
-	EditingToolsEditingToolWindow* _tmp4_ = NULL;
-	EditingToolsEditingToolWindow* _tmp5_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	EditingToolsEditingToolWindow* _tmp1_;
+	EditingToolsPhotoCanvas* _tmp2_;
+	EditingToolsPhotoCanvas* _tmp3_;
+	EditingToolsEditingToolWindow* _tmp4_;
+	EditingToolsEditingToolWindow* _tmp5_;
 #line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
 #line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4412,17 +4427,17 @@ static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* s
 	_tmp5_ = self->priv->tool_window;
 #line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ != NULL) {
-#line 4416 "EditingTools.c"
-		EditingToolsEditingToolWindow* _tmp6_ = NULL;
+#line 4431 "EditingTools.c"
+		EditingToolsEditingToolWindow* _tmp6_;
 #line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->tool_window;
 #line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, self);
-#line 4422 "EditingTools.c"
+#line 4437 "EditingTools.c"
 	}
 #line 509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit_by_name (self, "activated");
-#line 4426 "EditingTools.c"
+	g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ACTIVATED_SIGNAL], 0);
+#line 4441 "EditingTools.c"
 }
 
 
@@ -4431,35 +4446,35 @@ void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, Editing
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->activate (self, canvas);
-#line 4435 "EditingTools.c"
+#line 4450 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool* self) {
 	gboolean _tmp0_ = FALSE;
-	EditingToolsPhotoCanvas* _tmp1_ = NULL;
-	EditingToolsEditingToolWindow* _tmp3_ = NULL;
+	EditingToolsPhotoCanvas* _tmp1_;
+	EditingToolsEditingToolWindow* _tmp3_;
 #line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->canvas;
 #line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == NULL) {
-#line 4447 "EditingTools.c"
-		EditingToolsEditingToolWindow* _tmp2_ = NULL;
+#line 4462 "EditingTools.c"
+		EditingToolsEditingToolWindow* _tmp2_;
 #line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->tool_window;
 #line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 4453 "EditingTools.c"
+#line 4468 "EditingTools.c"
 	} else {
 #line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = FALSE;
-#line 4457 "EditingTools.c"
+#line 4472 "EditingTools.c"
 	}
 #line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
 #line 516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 4463 "EditingTools.c"
+#line 4478 "EditingTools.c"
 	}
 #line 518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_photo_canvas_unref0 (self->canvas);
@@ -4469,9 +4484,9 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool*
 	_tmp3_ = self->priv->tool_window;
 #line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_ != NULL) {
-#line 4473 "EditingTools.c"
-		EditingToolsEditingToolWindow* _tmp4_ = NULL;
-		guint _tmp5_ = 0U;
+#line 4488 "EditingTools.c"
+		EditingToolsEditingToolWindow* _tmp4_;
+		guint _tmp5_;
 #line 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->tool_window;
 #line 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4482,11 +4497,11 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool*
 		_g_object_unref0 (self->priv->tool_window);
 #line 522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->tool_window = NULL;
-#line 4486 "EditingTools.c"
+#line 4501 "EditingTools.c"
 	}
 #line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit_by_name (self, "deactivated");
-#line 4490 "EditingTools.c"
+	g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_DEACTIVATED_SIGNAL], 0);
+#line 4505 "EditingTools.c"
 }
 
 
@@ -4495,13 +4510,13 @@ void editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self) {
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->deactivate (self);
-#line 4499 "EditingTools.c"
+#line 4514 "EditingTools.c"
 }
 
 
 gboolean editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self) {
 	gboolean result = FALSE;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 #line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
 #line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4510,7 +4525,7 @@ gboolean editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self)
 	result = _tmp0_ != NULL;
 #line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4514 "EditingTools.c"
+#line 4529 "EditingTools.c"
 }
 
 
@@ -4520,7 +4535,7 @@ static EditingToolsEditingToolWindow* editing_tools_editing_tool_real_get_tool_w
 	result = NULL;
 #line 533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4524 "EditingTools.c"
+#line 4539 "EditingTools.c"
 }
 
 
@@ -4529,7 +4544,7 @@ EditingToolsEditingToolWindow* editing_tools_editing_tool_get_tool_window (Editi
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL);
 #line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_tool_window (self);
-#line 4533 "EditingTools.c"
+#line 4548 "EditingTools.c"
 }
 
 
@@ -4548,11 +4563,11 @@ static GdkPixbuf* editing_tools_editing_tool_real_get_display_pixbuf (EditingToo
 	if (max_dim) {
 #line 551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 4552 "EditingTools.c"
+#line 4567 "EditingTools.c"
 	}
 #line 551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4556 "EditingTools.c"
+#line 4571 "EditingTools.c"
 }
 
 
@@ -4561,7 +4576,7 @@ GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingToo
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL);
 #line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_display_pixbuf (self, scaling, photo, max_dim, error);
-#line 4565 "EditingTools.c"
+#line 4580 "EditingTools.c"
 }
 
 
@@ -4574,7 +4589,7 @@ void editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self, gi
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_click (self, x, y);
-#line 4578 "EditingTools.c"
+#line 4593 "EditingTools.c"
 }
 
 
@@ -4587,7 +4602,7 @@ void editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self,
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_released (self, x, y);
-#line 4591 "EditingTools.c"
+#line 4606 "EditingTools.c"
 }
 
 
@@ -4600,7 +4615,7 @@ void editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self, gint x
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_motion (self, x, y, mask);
-#line 4604 "EditingTools.c"
+#line 4619 "EditingTools.c"
 }
 
 
@@ -4610,7 +4625,7 @@ static gboolean editing_tools_editing_tool_real_on_leave_notify_event (EditingTo
 	result = FALSE;
 #line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4614 "EditingTools.c"
+#line 4629 "EditingTools.c"
 }
 
 
@@ -4619,15 +4634,15 @@ gboolean editing_tools_editing_tool_on_leave_notify_event (EditingToolsEditingTo
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
 #line 563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_leave_notify_event (self);
-#line 4623 "EditingTools.c"
+#line 4638 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_editing_tool_real_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
+	GdkEventKey* _tmp0_;
+	guint _tmp1_;
+	const gchar* _tmp2_;
 #line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4644,13 +4659,13 @@ static gboolean editing_tools_editing_tool_real_on_keypress (EditingToolsEditing
 		result = TRUE;
 #line 572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 4648 "EditingTools.c"
+#line 4663 "EditingTools.c"
 	}
 #line 575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
 #line 575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4654 "EditingTools.c"
+#line 4669 "EditingTools.c"
 }
 
 
@@ -4659,14 +4674,14 @@ gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self,
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
 #line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_keypress (self, event);
-#line 4663 "EditingTools.c"
+#line 4678 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self, cairo_t* ctx) {
 #line 578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 4670 "EditingTools.c"
+#line 4685 "EditingTools.c"
 }
 
 
@@ -4675,7 +4690,7 @@ void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, cairo_t* c
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->paint (self, ctx);
-#line 4679 "EditingTools.c"
+#line 4694 "EditingTools.c"
 }
 
 
@@ -4683,8 +4698,8 @@ void editing_tools_editing_tool_notify_cancel (EditingToolsEditingTool* self) {
 #line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit_by_name (self, "cancelled");
-#line 4688 "EditingTools.c"
+	g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_CANCELLED_SIGNAL], 0);
+#line 4703 "EditingTools.c"
 }
 
 
@@ -4703,26 +4718,26 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure
 		data1 = closure->data;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4707 "EditingTools.c"
+#line 4722 "EditingTools.c"
 	} else {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4713 "EditingTools.c"
+#line 4728 "EditingTools.c"
 	}
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOXED_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 4719 "EditingTools.c"
+#line 4734 "EditingTools.c"
 }
 
 
 static void editing_tools_value_editing_tool_init (GValue* value) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 4726 "EditingTools.c"
+#line 4741 "EditingTools.c"
 }
 
 
@@ -4731,7 +4746,7 @@ static void editing_tools_value_editing_tool_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (value->data[0].v_pointer);
-#line 4735 "EditingTools.c"
+#line 4750 "EditingTools.c"
 	}
 }
 
@@ -4741,11 +4756,11 @@ static void editing_tools_value_editing_tool_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_editing_tool_ref (src_value->data[0].v_pointer);
-#line 4745 "EditingTools.c"
+#line 4760 "EditingTools.c"
 	} else {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4749 "EditingTools.c"
+#line 4764 "EditingTools.c"
 	}
 }
 
@@ -4753,66 +4768,66 @@ static void editing_tools_value_editing_tool_copy_value (const GValue* src_value
 static gpointer editing_tools_value_editing_tool_peek_pointer (const GValue* value) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4757 "EditingTools.c"
+#line 4772 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_editing_tool_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 4764 "EditingTools.c"
-		EditingToolsEditingTool* object;
+#line 4779 "EditingTools.c"
+		EditingToolsEditingTool * object;
 		object = collect_values[0].v_pointer;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4771 "EditingTools.c"
+#line 4786 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4775 "EditingTools.c"
+#line 4790 "EditingTools.c"
 		}
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_editing_tool_ref (object);
-#line 4779 "EditingTools.c"
+#line 4794 "EditingTools.c"
 	} else {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4783 "EditingTools.c"
+#line 4798 "EditingTools.c"
 	}
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4787 "EditingTools.c"
+#line 4802 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_editing_tool_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	EditingToolsEditingTool** object_p;
+	EditingToolsEditingTool ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!object_p) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4798 "EditingTools.c"
+#line 4813 "EditingTools.c"
 	}
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 4804 "EditingTools.c"
+#line 4819 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4808 "EditingTools.c"
+#line 4823 "EditingTools.c"
 	} else {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_editing_tool_ref (value->data[0].v_pointer);
-#line 4812 "EditingTools.c"
+#line 4827 "EditingTools.c"
 	}
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4816 "EditingTools.c"
+#line 4831 "EditingTools.c"
 }
 
 
@@ -4826,7 +4841,7 @@ GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 4830 "EditingTools.c"
+#line 4845 "EditingTools.c"
 }
 
 
@@ -4835,12 +4850,12 @@ gpointer editing_tools_value_get_editing_tool (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL), NULL);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4839 "EditingTools.c"
+#line 4854 "EditingTools.c"
 }
 
 
 void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object) {
-	EditingToolsEditingTool* old;
+	EditingToolsEditingTool * old;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL));
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4855,23 +4870,23 @@ void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_ref (value->data[0].v_pointer);
-#line 4859 "EditingTools.c"
+#line 4874 "EditingTools.c"
 	} else {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4863 "EditingTools.c"
+#line 4878 "EditingTools.c"
 	}
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (old);
-#line 4869 "EditingTools.c"
+#line 4884 "EditingTools.c"
 	}
 }
 
 
 void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object) {
-	EditingToolsEditingTool* old;
+	EditingToolsEditingTool * old;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL));
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4884,17 +4899,17 @@ void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 4888 "EditingTools.c"
+#line 4903 "EditingTools.c"
 	} else {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4892 "EditingTools.c"
+#line 4907 "EditingTools.c"
 	}
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (old);
-#line 4898 "EditingTools.c"
+#line 4913 "EditingTools.c"
 	}
 }
 
@@ -4907,36 +4922,36 @@ static void editing_tools_editing_tool_class_init (EditingToolsEditingToolClass
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsEditingToolPrivate));
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->activate = (void (*)(EditingToolsEditingTool*, EditingToolsPhotoCanvas*)) editing_tools_editing_tool_real_activate;
+	((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_editing_tool_real_activate;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*)(EditingToolsEditingTool*)) editing_tools_editing_tool_real_deactivate;
+	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_editing_tool_real_deactivate;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*)(EditingToolsEditingTool*)) editing_tools_editing_tool_real_get_tool_window;
+	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_editing_tool_real_get_tool_window;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*)(EditingToolsEditingTool*, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_editing_tool_real_get_display_pixbuf;
+	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*) (EditingToolsEditingTool *, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_editing_tool_real_get_display_pixbuf;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*)(EditingToolsEditingTool*, gint, gint)) editing_tools_editing_tool_real_on_left_click;
+	((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_editing_tool_real_on_left_click;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*)(EditingToolsEditingTool*, gint, gint)) editing_tools_editing_tool_real_on_left_released;
+	((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_editing_tool_real_on_left_released;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*)(EditingToolsEditingTool*, gint, gint, GdkModifierType)) editing_tools_editing_tool_real_on_motion;
+	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_editing_tool_real_on_motion;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_leave_notify_event = (gboolean (*)(EditingToolsEditingTool*)) editing_tools_editing_tool_real_on_leave_notify_event;
+	((EditingToolsEditingToolClass *) klass)->on_leave_notify_event = (gboolean (*) (EditingToolsEditingTool *)) editing_tools_editing_tool_real_on_leave_notify_event;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*)(EditingToolsEditingTool*, GdkEventKey*)) editing_tools_editing_tool_real_on_keypress;
+	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_editing_tool_real_on_keypress;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->paint = (void (*)(EditingToolsEditingTool*, cairo_t*)) editing_tools_editing_tool_real_paint;
+	((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_editing_tool_real_paint;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_new ("activated", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ACTIVATED_SIGNAL] = g_signal_new ("activated", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_new ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_DEACTIVATED_SIGNAL] = g_signal_new ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_new ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN, G_TYPE_NONE, 4, TYPE_COMMAND, gdk_pixbuf_get_type (), TYPE_DIMENSIONS, G_TYPE_BOOLEAN);
+	editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL] = g_signal_new ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN, G_TYPE_NONE, 4, TYPE_COMMAND, gdk_pixbuf_get_type (), TYPE_DIMENSIONS, G_TYPE_BOOLEAN);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_new ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_CANCELLED_SIGNAL] = g_signal_new ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_new ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 4940 "EditingTools.c"
+	editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ABORTED_SIGNAL] = g_signal_new ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 4955 "EditingTools.c"
 }
 
 
@@ -4949,11 +4964,11 @@ static void editing_tools_editing_tool_instance_init (EditingToolsEditingTool *
 	self->priv->tool_window = NULL;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 4953 "EditingTools.c"
+#line 4968 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_finalize (EditingToolsEditingTool* obj) {
+static void editing_tools_editing_tool_finalize (EditingToolsEditingTool * obj) {
 	EditingToolsEditingTool * self;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool);
@@ -4967,7 +4982,7 @@ static void editing_tools_editing_tool_finalize (EditingToolsEditingTool* obj) {
 	_cairo_surface_destroy0 (self->surface);
 #line 474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 4971 "EditingTools.c"
+#line 4986 "EditingTools.c"
 }
 
 
@@ -4986,18 +5001,18 @@ GType editing_tools_editing_tool_get_type (void) {
 
 
 gpointer editing_tools_editing_tool_ref (gpointer instance) {
-	EditingToolsEditingTool* self;
+	EditingToolsEditingTool * self;
 	self = instance;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 4996 "EditingTools.c"
+#line 5011 "EditingTools.c"
 }
 
 
 void editing_tools_editing_tool_unref (gpointer instance) {
-	EditingToolsEditingTool* self;
+	EditingToolsEditingTool * self;
 	self = instance;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -5005,7 +5020,7 @@ void editing_tools_editing_tool_unref (gpointer instance) {
 		EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->finalize (self);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5009 "EditingTools.c"
+#line 5024 "EditingTools.c"
 	}
 }
 
@@ -5017,17 +5032,17 @@ static EditingToolsCropToolReticleOrientation editing_tools_crop_tool_reticle_or
 	if (self == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) {
 #line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT;
-#line 5021 "EditingTools.c"
+#line 5036 "EditingTools.c"
 	} else {
 #line 638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 5025 "EditingTools.c"
+#line 5040 "EditingTools.c"
 	}
 #line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
 #line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5031 "EditingTools.c"
+#line 5046 "EditingTools.c"
 }
 
 
@@ -5061,39 +5076,39 @@ static EditingToolsCropTool* editing_tools_crop_tool_construct (GType object_typ
 	self = (EditingToolsCropTool*) editing_tools_editing_tool_construct (object_type, "CropTool");
 #line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 5065 "EditingTools.c"
+#line 5080 "EditingTools.c"
 }
 
 
 static EditingToolsCropTool* editing_tools_crop_tool_new (void) {
 #line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_construct (EDITING_TOOLS_TYPE_CROP_TOOL);
-#line 5072 "EditingTools.c"
+#line 5087 "EditingTools.c"
 }
 
 
 EditingToolsCropTool* editing_tools_crop_tool_factory (void) {
 	EditingToolsCropTool* result = NULL;
-	EditingToolsCropTool* _tmp0_ = NULL;
+	EditingToolsCropTool* _tmp0_;
 #line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_crop_tool_new ();
 #line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
 #line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5085 "EditingTools.c"
+#line 5100 "EditingTools.c"
 }
 
 
 gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling) {
 	gboolean result = FALSE;
 	Dimensions dim = {0};
-	Photo* _tmp0_ = NULL;
+	Photo* _tmp0_;
 	Dimensions _tmp1_ = {0};
 	Dimensions _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-	Dimensions _tmp4_ = {0};
-	gint _tmp5_ = 0;
+	Dimensions _tmp4_;
+	gint _tmp5_;
 #line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
 #line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5112,646 +5127,617 @@ gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling) {
 	_tmp5_ = _tmp4_.width;
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 5116 "EditingTools.c"
-		Dimensions _tmp6_ = {0};
-		gint _tmp7_ = 0;
+#line 5131 "EditingTools.c"
+		Dimensions _tmp6_;
+		gint _tmp7_;
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = dim;
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_.height;
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 5125 "EditingTools.c"
+#line 5140 "EditingTools.c"
 	} else {
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 5129 "EditingTools.c"
+#line 5144 "EditingTools.c"
 	}
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp3_;
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5135 "EditingTools.c"
+#line 5150 "EditingTools.c"
 }
 
 
-static void _vala_array_add4 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add4 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5146 "EditingTools.c"
+#line 5161 "EditingTools.c"
 	}
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5152 "EditingTools.c"
+#line 5167 "EditingTools.c"
 }
 
 
-static void _vala_array_add5 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add5 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5163 "EditingTools.c"
+#line 5178 "EditingTools.c"
 	}
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5169 "EditingTools.c"
+#line 5184 "EditingTools.c"
 }
 
 
-static void _vala_array_add6 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add6 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5180 "EditingTools.c"
+#line 5195 "EditingTools.c"
 	}
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5186 "EditingTools.c"
+#line 5201 "EditingTools.c"
 }
 
 
-static void _vala_array_add7 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add7 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5197 "EditingTools.c"
+#line 5212 "EditingTools.c"
 	}
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5203 "EditingTools.c"
+#line 5218 "EditingTools.c"
 }
 
 
-static void _vala_array_add8 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add8 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5214 "EditingTools.c"
+#line 5229 "EditingTools.c"
 	}
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5220 "EditingTools.c"
+#line 5235 "EditingTools.c"
 }
 
 
-static void _vala_array_add9 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add9 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5231 "EditingTools.c"
+#line 5246 "EditingTools.c"
 	}
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5237 "EditingTools.c"
+#line 5252 "EditingTools.c"
 }
 
 
-static void _vala_array_add10 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add10 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5248 "EditingTools.c"
+#line 5263 "EditingTools.c"
 	}
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5254 "EditingTools.c"
+#line 5269 "EditingTools.c"
 }
 
 
-static void _vala_array_add11 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add11 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5265 "EditingTools.c"
+#line 5280 "EditingTools.c"
 	}
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5271 "EditingTools.c"
+#line 5286 "EditingTools.c"
 }
 
 
-static void _vala_array_add12 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add12 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5282 "EditingTools.c"
+#line 5297 "EditingTools.c"
 	}
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5288 "EditingTools.c"
+#line 5303 "EditingTools.c"
 }
 
 
-static void _vala_array_add13 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add13 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5299 "EditingTools.c"
+#line 5314 "EditingTools.c"
 	}
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5305 "EditingTools.c"
+#line 5320 "EditingTools.c"
 }
 
 
-static void _vala_array_add14 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add14 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5316 "EditingTools.c"
+#line 5331 "EditingTools.c"
 	}
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5322 "EditingTools.c"
+#line 5337 "EditingTools.c"
 }
 
 
-static void _vala_array_add15 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add15 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5333 "EditingTools.c"
+#line 5348 "EditingTools.c"
 	}
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5339 "EditingTools.c"
+#line 5354 "EditingTools.c"
 }
 
 
-static void _vala_array_add16 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add16 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5350 "EditingTools.c"
+#line 5365 "EditingTools.c"
 	}
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5356 "EditingTools.c"
+#line 5371 "EditingTools.c"
 }
 
 
-static void _vala_array_add17 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add17 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5367 "EditingTools.c"
+#line 5382 "EditingTools.c"
 	}
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5373 "EditingTools.c"
+#line 5388 "EditingTools.c"
 }
 
 
-static void _vala_array_add18 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add18 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5384 "EditingTools.c"
+#line 5399 "EditingTools.c"
 	}
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5390 "EditingTools.c"
+#line 5405 "EditingTools.c"
 }
 
 
-static void _vala_array_add19 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add19 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5401 "EditingTools.c"
+#line 5416 "EditingTools.c"
 	}
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5407 "EditingTools.c"
+#line 5422 "EditingTools.c"
 }
 
 
-static void _vala_array_add20 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add20 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5418 "EditingTools.c"
+#line 5433 "EditingTools.c"
 	}
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5424 "EditingTools.c"
+#line 5439 "EditingTools.c"
 }
 
 
-static void _vala_array_add21 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add21 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5435 "EditingTools.c"
+#line 5450 "EditingTools.c"
 	}
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5441 "EditingTools.c"
+#line 5456 "EditingTools.c"
 }
 
 
-static void _vala_array_add22 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add22 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5452 "EditingTools.c"
+#line 5467 "EditingTools.c"
 	}
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5458 "EditingTools.c"
+#line 5473 "EditingTools.c"
 }
 
 
-static void _vala_array_add23 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add23 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5469 "EditingTools.c"
+#line 5484 "EditingTools.c"
 	}
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5475 "EditingTools.c"
+#line 5490 "EditingTools.c"
 }
 
 
-static void _vala_array_add24 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add24 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5486 "EditingTools.c"
+#line 5501 "EditingTools.c"
 	}
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5492 "EditingTools.c"
+#line 5507 "EditingTools.c"
 }
 
 
-static void _vala_array_add25 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add25 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5503 "EditingTools.c"
+#line 5518 "EditingTools.c"
 	}
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5509 "EditingTools.c"
+#line 5524 "EditingTools.c"
 }
 
 
-static void _vala_array_add26 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add26 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5520 "EditingTools.c"
+#line 5535 "EditingTools.c"
 	}
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5526 "EditingTools.c"
+#line 5541 "EditingTools.c"
 }
 
 
-static void _vala_array_add27 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add27 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5537 "EditingTools.c"
+#line 5552 "EditingTools.c"
 	}
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5543 "EditingTools.c"
+#line 5558 "EditingTools.c"
 }
 
 
-static void _vala_array_add28 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add28 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5554 "EditingTools.c"
+#line 5569 "EditingTools.c"
 	}
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5560 "EditingTools.c"
+#line 5575 "EditingTools.c"
 }
 
 
-static void _vala_array_add29 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add29 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5571 "EditingTools.c"
+#line 5586 "EditingTools.c"
 	}
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5577 "EditingTools.c"
+#line 5592 "EditingTools.c"
 }
 
 
-static void _vala_array_add30 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add30 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5588 "EditingTools.c"
+#line 5603 "EditingTools.c"
 	}
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5594 "EditingTools.c"
+#line 5609 "EditingTools.c"
 }
 
 
-static void _vala_array_add31 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add31 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5605 "EditingTools.c"
+#line 5620 "EditingTools.c"
 	}
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5611 "EditingTools.c"
+#line 5626 "EditingTools.c"
 }
 
 
-static void _vala_array_add32 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add32 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5622 "EditingTools.c"
+#line 5637 "EditingTools.c"
 	}
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5628 "EditingTools.c"
+#line 5643 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_create_constraints (int* result_length1) {
 	EditingToolsCropToolConstraintDescription** result = NULL;
 	EditingToolsCropToolConstraintDescription** _result_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	EditingToolsCropToolConstraintDescription** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp3_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	const gchar* _tmp5_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp6_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	const gchar* _tmp8_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp9_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	const gchar* _tmp11_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp12_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
-	const gchar* _tmp14_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp15_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
-	const gchar* _tmp17_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp18_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
-	const gchar* _tmp20_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp21_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp22_ = NULL;
-	gint _tmp22__length1 = 0;
-	const gchar* _tmp23_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp24_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp25_ = NULL;
-	gint _tmp25__length1 = 0;
-	const gchar* _tmp26_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp27_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp28_ = NULL;
-	gint _tmp28__length1 = 0;
-	const gchar* _tmp29_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp30_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp31_ = NULL;
-	gint _tmp31__length1 = 0;
-	const gchar* _tmp32_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp33_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp34_ = NULL;
-	gint _tmp34__length1 = 0;
-	const gchar* _tmp35_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp36_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp37_ = NULL;
-	gint _tmp37__length1 = 0;
-	const gchar* _tmp38_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp39_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp40_ = NULL;
-	gint _tmp40__length1 = 0;
-	const gchar* _tmp41_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp42_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp43_ = NULL;
-	gint _tmp43__length1 = 0;
-	const gchar* _tmp44_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp45_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp46_ = NULL;
-	gint _tmp46__length1 = 0;
-	const gchar* _tmp47_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp48_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp49_ = NULL;
-	gint _tmp49__length1 = 0;
-	const gchar* _tmp50_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp51_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp52_ = NULL;
-	gint _tmp52__length1 = 0;
-	const gchar* _tmp53_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp54_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp55_ = NULL;
-	gint _tmp55__length1 = 0;
-	const gchar* _tmp56_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp57_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp58_ = NULL;
-	gint _tmp58__length1 = 0;
-	const gchar* _tmp59_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp60_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp61_ = NULL;
-	gint _tmp61__length1 = 0;
-	const gchar* _tmp62_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp63_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp64_ = NULL;
-	gint _tmp64__length1 = 0;
-	const gchar* _tmp65_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp66_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp67_ = NULL;
-	gint _tmp67__length1 = 0;
-	const gchar* _tmp68_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp69_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp70_ = NULL;
-	gint _tmp70__length1 = 0;
-	const gchar* _tmp71_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp72_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp73_ = NULL;
-	gint _tmp73__length1 = 0;
-	const gchar* _tmp74_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp75_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp76_ = NULL;
-	gint _tmp76__length1 = 0;
-	const gchar* _tmp77_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp78_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp79_ = NULL;
-	gint _tmp79__length1 = 0;
-	const gchar* _tmp80_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp81_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp82_ = NULL;
-	gint _tmp82__length1 = 0;
-	const gchar* _tmp83_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp84_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp85_ = NULL;
-	gint _tmp85__length1 = 0;
-	const gchar* _tmp86_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp87_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp88_ = NULL;
-	gint _tmp88__length1 = 0;
+	EditingToolsCropToolConstraintDescription** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	EditingToolsCropToolConstraintDescription** _tmp1_;
+	gint _tmp1__length1;
+	EditingToolsCropToolConstraintDescription* _tmp2_;
+	EditingToolsCropToolConstraintDescription** _tmp3_;
+	gint _tmp3__length1;
+	EditingToolsCropToolConstraintDescription* _tmp4_;
+	EditingToolsCropToolConstraintDescription** _tmp5_;
+	gint _tmp5__length1;
+	EditingToolsCropToolConstraintDescription* _tmp6_;
+	EditingToolsCropToolConstraintDescription** _tmp7_;
+	gint _tmp7__length1;
+	EditingToolsCropToolConstraintDescription* _tmp8_;
+	EditingToolsCropToolConstraintDescription** _tmp9_;
+	gint _tmp9__length1;
+	EditingToolsCropToolConstraintDescription* _tmp10_;
+	EditingToolsCropToolConstraintDescription** _tmp11_;
+	gint _tmp11__length1;
+	EditingToolsCropToolConstraintDescription* _tmp12_;
+	EditingToolsCropToolConstraintDescription** _tmp13_;
+	gint _tmp13__length1;
+	EditingToolsCropToolConstraintDescription* _tmp14_;
+	EditingToolsCropToolConstraintDescription** _tmp15_;
+	gint _tmp15__length1;
+	EditingToolsCropToolConstraintDescription* _tmp16_;
+	EditingToolsCropToolConstraintDescription** _tmp17_;
+	gint _tmp17__length1;
+	EditingToolsCropToolConstraintDescription* _tmp18_;
+	EditingToolsCropToolConstraintDescription** _tmp19_;
+	gint _tmp19__length1;
+	EditingToolsCropToolConstraintDescription* _tmp20_;
+	EditingToolsCropToolConstraintDescription** _tmp21_;
+	gint _tmp21__length1;
+	EditingToolsCropToolConstraintDescription* _tmp22_;
+	EditingToolsCropToolConstraintDescription** _tmp23_;
+	gint _tmp23__length1;
+	EditingToolsCropToolConstraintDescription* _tmp24_;
+	EditingToolsCropToolConstraintDescription** _tmp25_;
+	gint _tmp25__length1;
+	EditingToolsCropToolConstraintDescription* _tmp26_;
+	EditingToolsCropToolConstraintDescription** _tmp27_;
+	gint _tmp27__length1;
+	EditingToolsCropToolConstraintDescription* _tmp28_;
+	EditingToolsCropToolConstraintDescription** _tmp29_;
+	gint _tmp29__length1;
+	EditingToolsCropToolConstraintDescription* _tmp30_;
+	EditingToolsCropToolConstraintDescription** _tmp31_;
+	gint _tmp31__length1;
+	EditingToolsCropToolConstraintDescription* _tmp32_;
+	EditingToolsCropToolConstraintDescription** _tmp33_;
+	gint _tmp33__length1;
+	EditingToolsCropToolConstraintDescription* _tmp34_;
+	EditingToolsCropToolConstraintDescription** _tmp35_;
+	gint _tmp35__length1;
+	EditingToolsCropToolConstraintDescription* _tmp36_;
+	EditingToolsCropToolConstraintDescription** _tmp37_;
+	gint _tmp37__length1;
+	EditingToolsCropToolConstraintDescription* _tmp38_;
+	EditingToolsCropToolConstraintDescription** _tmp39_;
+	gint _tmp39__length1;
+	EditingToolsCropToolConstraintDescription* _tmp40_;
+	EditingToolsCropToolConstraintDescription** _tmp41_;
+	gint _tmp41__length1;
+	EditingToolsCropToolConstraintDescription* _tmp42_;
+	EditingToolsCropToolConstraintDescription** _tmp43_;
+	gint _tmp43__length1;
+	EditingToolsCropToolConstraintDescription* _tmp44_;
+	EditingToolsCropToolConstraintDescription** _tmp45_;
+	gint _tmp45__length1;
+	EditingToolsCropToolConstraintDescription* _tmp46_;
+	EditingToolsCropToolConstraintDescription** _tmp47_;
+	gint _tmp47__length1;
+	EditingToolsCropToolConstraintDescription* _tmp48_;
+	EditingToolsCropToolConstraintDescription** _tmp49_;
+	gint _tmp49__length1;
+	EditingToolsCropToolConstraintDescription* _tmp50_;
+	EditingToolsCropToolConstraintDescription** _tmp51_;
+	gint _tmp51__length1;
+	EditingToolsCropToolConstraintDescription* _tmp52_;
+	EditingToolsCropToolConstraintDescription** _tmp53_;
+	gint _tmp53__length1;
+	EditingToolsCropToolConstraintDescription* _tmp54_;
+	EditingToolsCropToolConstraintDescription** _tmp55_;
+	gint _tmp55__length1;
+	EditingToolsCropToolConstraintDescription* _tmp56_;
+	EditingToolsCropToolConstraintDescription** _tmp57_;
+	gint _tmp57__length1;
+	EditingToolsCropToolConstraintDescription* _tmp58_;
+	EditingToolsCropToolConstraintDescription** _tmp59_;
+	gint _tmp59__length1;
 #line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = g_new0 (EditingToolsCropToolConstraintDescription*, 0 + 1);
 #line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5765,323 +5751,265 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1__length1 = _result__length1;
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = _ ("Unconstrained");
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = editing_tools_crop_tool_constraint_description_new (_tmp2_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO);
+	_tmp2_ = editing_tools_crop_tool_constraint_description_new (_ ("Unconstrained"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO);
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add4 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _result_;
+	_vala_array_add4 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4__length1 = _result__length1;
+	_tmp3_ = _result_;
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = _ ("Square");
+	_tmp3__length1 = _result__length1;
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = editing_tools_crop_tool_constraint_description_new (_tmp5_, 1, 1, FALSE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp4_ = editing_tools_crop_tool_constraint_description_new (_ ("Square"), 1, 1, FALSE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add5 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = _result_;
+	_vala_array_add5 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7__length1 = _result__length1;
+	_tmp5_ = _result_;
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = _ ("Screen");
+	_tmp5__length1 = _result__length1;
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = editing_tools_crop_tool_constraint_description_new (_tmp8_, 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO);
+	_tmp6_ = editing_tools_crop_tool_constraint_description_new (_ ("Screen"), 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO);
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add6 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = _result_;
+	_vala_array_add6 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10__length1 = _result__length1;
+	_tmp7_ = _result_;
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = _ ("Original Size");
+	_tmp7__length1 = _result__length1;
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = editing_tools_crop_tool_constraint_description_new (_tmp11_, 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO);
+	_tmp8_ = editing_tools_crop_tool_constraint_description_new (_ ("Original Size"), 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO);
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = _result_;
+	_vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp8_);
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13__length1 = _result__length1;
+	_tmp9_ = _result_;
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = _ ("-");
+	_tmp9__length1 = _result__length1;
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = editing_tools_crop_tool_constraint_description_new (_tmp14_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
+	_tmp10_ = editing_tools_crop_tool_constraint_description_new (_ ("-"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = _result_;
+	_vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp10_);
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16__length1 = _result__length1;
+	_tmp11_ = _result_;
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = _ ("SD Video (4 ∶ 3)");
+	_tmp11__length1 = _result__length1;
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = editing_tools_crop_tool_constraint_description_new (_tmp17_, 4, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp12_ = editing_tools_crop_tool_constraint_description_new (_ ("SD Video (4 ∶ 3)"), 4, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp18_);
+	_vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp12_);
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = _result_;
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19__length1 = _result__length1;
+	_tmp13_ = _result_;
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = _ ("HD Video (16 ∶ 9)");
+	_tmp13__length1 = _result__length1;
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = editing_tools_crop_tool_constraint_description_new (_tmp20_, 16, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp14_ = editing_tools_crop_tool_constraint_description_new (_ ("HD Video (16 ∶ 9)"), 16, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add10 (&_result_, &_result__length1, &__result__size_, _tmp21_);
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = _result_;
+	_vala_array_add10 (&_result_, &_result__length1, &__result__size_, _tmp14_);
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22__length1 = _result__length1;
+	_tmp15_ = _result_;
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = _ ("-");
+	_tmp15__length1 = _result__length1;
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = editing_tools_crop_tool_constraint_description_new (_tmp23_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
+	_tmp16_ = editing_tools_crop_tool_constraint_description_new (_ ("-"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add11 (&_result_, &_result__length1, &__result__size_, _tmp24_);
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = _result_;
+	_vala_array_add11 (&_result_, &_result__length1, &__result__size_, _tmp16_);
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25__length1 = _result__length1;
+	_tmp17_ = _result_;
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = _ ("Wallet (2 × 3 in.)");
+	_tmp17__length1 = _result__length1;
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = editing_tools_crop_tool_constraint_description_new (_tmp26_, 3, 2, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp18_ = editing_tools_crop_tool_constraint_description_new (_ ("Wallet (2 × 3 in.)"), 3, 2, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp27_);
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = _result_;
+	_vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp18_);
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28__length1 = _result__length1;
+	_tmp19_ = _result_;
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = _ ("Notecard (3 × 5 in.)");
+	_tmp19__length1 = _result__length1;
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp30_ = editing_tools_crop_tool_constraint_description_new (_tmp29_, 5, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp20_ = editing_tools_crop_tool_constraint_description_new (_ ("Notecard (3 × 5 in.)"), 5, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp30_);
+	_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp20_);
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = _result_;
+	_tmp21_ = _result_;
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31__length1 = _result__length1;
+	_tmp21__length1 = _result__length1;
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp32_ = _ ("4 × 6 in.");
+	_tmp22_ = editing_tools_crop_tool_constraint_description_new (_ ("4 × 6 in."), 6, 4, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp33_ = editing_tools_crop_tool_constraint_description_new (_tmp32_, 6, 4, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp33_);
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp34_ = _result_;
+	_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp22_);
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp34__length1 = _result__length1;
+	_tmp23_ = _result_;
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp35_ = _ ("5 × 7 in.");
+	_tmp23__length1 = _result__length1;
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp36_ = editing_tools_crop_tool_constraint_description_new (_tmp35_, 7, 5, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp24_ = editing_tools_crop_tool_constraint_description_new (_ ("5 × 7 in."), 7, 5, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp36_);
+	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp24_);
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp37_ = _result_;
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp37__length1 = _result__length1;
+	_tmp25_ = _result_;
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp38_ = _ ("8 × 10 in.");
+	_tmp25__length1 = _result__length1;
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp39_ = editing_tools_crop_tool_constraint_description_new (_tmp38_, 10, 8, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp26_ = editing_tools_crop_tool_constraint_description_new (_ ("8 × 10 in."), 10, 8, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp39_);
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp40_ = _result_;
+	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp26_);
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp40__length1 = _result__length1;
+	_tmp27_ = _result_;
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp41_ = _ ("Letter (8.5 × 11 in.)");
+	_tmp27__length1 = _result__length1;
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp42_ = editing_tools_crop_tool_constraint_description_new (_tmp41_, 85, 110, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp28_ = editing_tools_crop_tool_constraint_description_new (_ ("Letter (8.5 × 11 in.)"), 85, 110, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp42_);
+	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp28_);
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp43_ = _result_;
+	_tmp29_ = _result_;
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp43__length1 = _result__length1;
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp44_ = _ ("11 × 14 in.");
+	_tmp29__length1 = _result__length1;
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp45_ = editing_tools_crop_tool_constraint_description_new (_tmp44_, 14, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp30_ = editing_tools_crop_tool_constraint_description_new (_ ("11 × 14 in."), 14, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp45_);
+	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp30_);
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp46_ = _result_;
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp46__length1 = _result__length1;
+	_tmp31_ = _result_;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp47_ = _ ("Tabloid (11 × 17 in.)");
+	_tmp31__length1 = _result__length1;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp48_ = editing_tools_crop_tool_constraint_description_new (_tmp47_, 17, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp32_ = editing_tools_crop_tool_constraint_description_new (_ ("Tabloid (11 × 17 in.)"), 17, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp48_);
+	_vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp32_);
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp49_ = _result_;
+	_tmp33_ = _result_;
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp49__length1 = _result__length1;
+	_tmp33__length1 = _result__length1;
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp50_ = _ ("16 × 20 in.");
+	_tmp34_ = editing_tools_crop_tool_constraint_description_new (_ ("16 × 20 in."), 20, 16, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp51_ = editing_tools_crop_tool_constraint_description_new (_tmp50_, 20, 16, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp51_);
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp52_ = _result_;
+	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp34_);
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp52__length1 = _result__length1;
+	_tmp35_ = _result_;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp53_ = _ ("-");
+	_tmp35__length1 = _result__length1;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp54_ = editing_tools_crop_tool_constraint_description_new (_tmp53_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
+	_tmp36_ = editing_tools_crop_tool_constraint_description_new (_ ("-"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp54_);
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp55_ = _result_;
+	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp36_);
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp55__length1 = _result__length1;
+	_tmp37_ = _result_;
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp56_ = _ ("Metric Wallet (9 × 13 cm)");
+	_tmp37__length1 = _result__length1;
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp57_ = editing_tools_crop_tool_constraint_description_new (_tmp56_, 13, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp38_ = editing_tools_crop_tool_constraint_description_new (_ ("Metric Wallet (9 × 13 cm)"), 13, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp57_);
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp58_ = _result_;
+	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp38_);
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp58__length1 = _result__length1;
+	_tmp39_ = _result_;
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp59_ = _ ("Postcard (10 × 15 cm)");
+	_tmp39__length1 = _result__length1;
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp60_ = editing_tools_crop_tool_constraint_description_new (_tmp59_, 15, 10, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp40_ = editing_tools_crop_tool_constraint_description_new (_ ("Postcard (10 × 15 cm)"), 15, 10, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp60_);
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp61_ = _result_;
+	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp40_);
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp61__length1 = _result__length1;
+	_tmp41_ = _result_;
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp62_ = _ ("13 × 18 cm");
+	_tmp41__length1 = _result__length1;
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp63_ = editing_tools_crop_tool_constraint_description_new (_tmp62_, 18, 13, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp42_ = editing_tools_crop_tool_constraint_description_new (_ ("13 × 18 cm"), 18, 13, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp63_);
+	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp42_);
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp64_ = _result_;
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp64__length1 = _result__length1;
+	_tmp43_ = _result_;
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp65_ = _ ("18 × 24 cm");
+	_tmp43__length1 = _result__length1;
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp66_ = editing_tools_crop_tool_constraint_description_new (_tmp65_, 24, 18, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp44_ = editing_tools_crop_tool_constraint_description_new (_ ("18 × 24 cm"), 24, 18, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp66_);
+	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp44_);
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp67_ = _result_;
+	_tmp45_ = _result_;
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp67__length1 = _result__length1;
+	_tmp45__length1 = _result__length1;
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp68_ = _ ("A4 (210 × 297 mm)");
+	_tmp46_ = editing_tools_crop_tool_constraint_description_new (_ ("A4 (210 × 297 mm)"), 210, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp69_ = editing_tools_crop_tool_constraint_description_new (_tmp68_, 210, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp69_);
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp70_ = _result_;
+	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp46_);
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp70__length1 = _result__length1;
+	_tmp47_ = _result_;
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp71_ = _ ("20 × 30 cm");
+	_tmp47__length1 = _result__length1;
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp72_ = editing_tools_crop_tool_constraint_description_new (_tmp71_, 30, 20, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp48_ = editing_tools_crop_tool_constraint_description_new (_ ("20 × 30 cm"), 30, 20, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp72_);
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp73_ = _result_;
+	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp48_);
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp73__length1 = _result__length1;
+	_tmp49_ = _result_;
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp74_ = _ ("24 × 40 cm");
+	_tmp49__length1 = _result__length1;
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp75_ = editing_tools_crop_tool_constraint_description_new (_tmp74_, 40, 24, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp50_ = editing_tools_crop_tool_constraint_description_new (_ ("24 × 40 cm"), 40, 24, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp75_);
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp76_ = _result_;
+	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp50_);
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp76__length1 = _result__length1;
+	_tmp51_ = _result_;
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp77_ = _ ("30 × 40 cm");
+	_tmp51__length1 = _result__length1;
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp78_ = editing_tools_crop_tool_constraint_description_new (_tmp77_, 40, 30, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp52_ = editing_tools_crop_tool_constraint_description_new (_ ("30 × 40 cm"), 40, 30, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp78_);
+	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp52_);
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp79_ = _result_;
+	_tmp53_ = _result_;
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp79__length1 = _result__length1;
+	_tmp53__length1 = _result__length1;
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp80_ = _ ("A3 (297 × 420 mm)");
+	_tmp54_ = editing_tools_crop_tool_constraint_description_new (_ ("A3 (297 × 420 mm)"), 420, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp81_ = editing_tools_crop_tool_constraint_description_new (_tmp80_, 420, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp81_);
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp82_ = _result_;
+	_vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp54_);
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp82__length1 = _result__length1;
+	_tmp55_ = _result_;
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp83_ = _ ("-");
+	_tmp55__length1 = _result__length1;
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp84_ = editing_tools_crop_tool_constraint_description_new (_tmp83_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
+	_tmp56_ = editing_tools_crop_tool_constraint_description_new (_ ("-"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add31 (&_result_, &_result__length1, &__result__size_, _tmp84_);
+	_vala_array_add31 (&_result_, &_result__length1, &__result__size_, _tmp56_);
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp85_ = _result_;
+	_tmp57_ = _result_;
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp85__length1 = _result__length1;
+	_tmp57__length1 = _result__length1;
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp86_ = _ ("Custom");
+	_tmp58_ = editing_tools_crop_tool_constraint_description_new (_ ("Custom"), 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO);
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp87_ = editing_tools_crop_tool_constraint_description_new (_tmp86_, 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO);
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp87_);
+	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp58_);
 #line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp88_ = _result_;
+	_tmp59_ = _result_;
 #line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp88__length1 = _result__length1;
+	_tmp59__length1 = _result__length1;
 #line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (result_length1) {
 #line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*result_length1 = _tmp88__length1;
-#line 6062 "EditingTools.c"
+		*result_length1 = _tmp59__length1;
+#line 5990 "EditingTools.c"
 	}
 #line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	result = _tmp88_;
+	result = _tmp59_;
 #line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6068 "EditingTools.c"
+#line 5996 "EditingTools.c"
 }
 
 
 static gpointer _editing_tools_crop_tool_constraint_description_ref0 (gpointer self) {
 #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? editing_tools_crop_tool_constraint_description_ref (self) : NULL;
-#line 6075 "EditingTools.c"
+#line 6003 "EditingTools.c"
 }
 
 
 static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingToolsCropToolConstraintDescription** constraint_data, int constraint_data_length1) {
 	GtkListStore* result = NULL;
 	GtkListStore* _result_ = NULL;
-	GtkListStore* _tmp0_ = NULL;
+	GtkListStore* _tmp0_;
 	GtkTreeIter iter = {0};
-	EditingToolsCropToolConstraintDescription** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	EditingToolsCropToolConstraintDescription** _tmp1_;
+	gint _tmp1__length1;
 #line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = gtk_list_store_new (1, G_TYPE_STRING, G_TYPE_STRING, -1);
 #line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6090,7 +6018,7 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 	_tmp1_ = constraint_data;
 #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1__length1 = constraint_data_length1;
-#line 6094 "EditingTools.c"
+#line 6022 "EditingTools.c"
 	{
 		EditingToolsCropToolConstraintDescription** constraint_collection = NULL;
 		gint constraint_collection_length1 = 0;
@@ -6102,21 +6030,21 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 		constraint_collection_length1 = _tmp1__length1;
 #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		for (constraint_it = 0; constraint_it < _tmp1__length1; constraint_it = constraint_it + 1) {
-#line 6106 "EditingTools.c"
-			EditingToolsCropToolConstraintDescription* _tmp2_ = NULL;
+#line 6034 "EditingTools.c"
+			EditingToolsCropToolConstraintDescription* _tmp2_;
 			EditingToolsCropToolConstraintDescription* constraint = NULL;
 #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = _editing_tools_crop_tool_constraint_description_ref0 (constraint_collection[constraint_it]);
 #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			constraint = _tmp2_;
-#line 6113 "EditingTools.c"
+#line 6041 "EditingTools.c"
 			{
-				GtkListStore* _tmp3_ = NULL;
+				GtkListStore* _tmp3_;
 				GtkTreeIter _tmp4_ = {0};
-				GtkListStore* _tmp5_ = NULL;
-				GtkTreeIter _tmp6_ = {0};
-				EditingToolsCropToolConstraintDescription* _tmp7_ = NULL;
-				const gchar* _tmp8_ = NULL;
+				GtkListStore* _tmp5_;
+				GtkTreeIter _tmp6_;
+				EditingToolsCropToolConstraintDescription* _tmp7_;
+				const gchar* _tmp8_;
 				GValue _tmp9_ = {0};
 #line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp3_ = _result_;
@@ -6142,7 +6070,7 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 				G_IS_VALUE (&_tmp9_) ? (g_value_unset (&_tmp9_), NULL) : NULL;
 #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_editing_tools_crop_tool_constraint_description_unref0 (constraint);
-#line 6146 "EditingTools.c"
+#line 6074 "EditingTools.c"
 			}
 		}
 	}
@@ -6150,16 +6078,16 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 	result = _result_;
 #line 796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6154 "EditingTools.c"
+#line 6082 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropTool* self) {
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp2_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	GtkButton* _tmp1_;
+	EditingToolsCropToolConstraintDescription* _tmp2_;
+	EditingToolsCropToolConstraintDescription* _tmp3_;
+	gboolean _tmp4_;
 #line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6176,22 +6104,22 @@ static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropT
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _tmp4_);
 #line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp3_);
-#line 6180 "EditingTools.c"
+#line 6108 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_selected_constraint (EditingToolsCropTool* self) {
 	EditingToolsCropToolConstraintDescription* result = NULL;
 	EditingToolsCropToolConstraintDescription* _result_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	EditingToolsCropToolCropToolWindow* _tmp1_ = NULL;
-	GtkComboBox* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	EditingToolsCropToolConstraintDescription* _tmp4_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp5_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp6_ = NULL;
-	gfloat _tmp7_ = 0.0F;
+	EditingToolsCropToolConstraintDescription** _tmp0_;
+	gint _tmp0__length1;
+	EditingToolsCropToolCropToolWindow* _tmp1_;
+	GtkComboBox* _tmp2_;
+	gint _tmp3_;
+	EditingToolsCropToolConstraintDescription* _tmp4_;
+	EditingToolsCropToolConstraintDescription* _tmp5_;
+	EditingToolsCropToolConstraintDescription* _tmp6_;
+	gfloat _tmp7_;
 #line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL);
 #line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6216,15 +6144,15 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 	_tmp7_ = _tmp6_->aspect_ratio;
 #line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp7_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 6220 "EditingTools.c"
-		EditingToolsCropToolConstraintDescription* _tmp8_ = NULL;
-		EditingToolsPhotoCanvas* _tmp9_ = NULL;
+#line 6148 "EditingTools.c"
+		EditingToolsCropToolConstraintDescription* _tmp8_;
+		EditingToolsPhotoCanvas* _tmp9_;
 		GdkRectangle _tmp10_ = {0};
-		gint _tmp11_ = 0;
-		EditingToolsCropToolConstraintDescription* _tmp12_ = NULL;
-		EditingToolsPhotoCanvas* _tmp13_ = NULL;
+		gint _tmp11_;
+		EditingToolsCropToolConstraintDescription* _tmp12_;
+		EditingToolsPhotoCanvas* _tmp13_;
 		GdkRectangle _tmp14_ = {0};
-		gint _tmp15_ = 0;
+		gint _tmp15_;
 #line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _result_;
 #line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6245,26 +6173,26 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 		_tmp15_ = _tmp14_.height;
 #line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_->basis_height = _tmp15_;
-#line 6249 "EditingTools.c"
+#line 6177 "EditingTools.c"
 	} else {
-		EditingToolsCropToolConstraintDescription* _tmp16_ = NULL;
-		gfloat _tmp17_ = 0.0F;
+		EditingToolsCropToolConstraintDescription* _tmp16_;
+		gfloat _tmp17_;
 #line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _result_;
 #line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = _tmp16_->aspect_ratio;
 #line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp17_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 6259 "EditingTools.c"
+#line 6187 "EditingTools.c"
 			GdkScreen* screen = NULL;
-			GdkScreen* _tmp18_ = NULL;
-			GdkScreen* _tmp19_ = NULL;
-			EditingToolsCropToolConstraintDescription* _tmp20_ = NULL;
-			GdkScreen* _tmp21_ = NULL;
-			gint _tmp22_ = 0;
-			EditingToolsCropToolConstraintDescription* _tmp23_ = NULL;
-			GdkScreen* _tmp24_ = NULL;
-			gint _tmp25_ = 0;
+			GdkScreen* _tmp18_;
+			GdkScreen* _tmp19_;
+			EditingToolsCropToolConstraintDescription* _tmp20_;
+			GdkScreen* _tmp21_;
+			gint _tmp22_;
+			EditingToolsCropToolConstraintDescription* _tmp23_;
+			GdkScreen* _tmp24_;
+			gint _tmp25_;
 #line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = gdk_screen_get_default ();
 #line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6289,25 +6217,25 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 			_tmp23_->basis_height = _tmp25_;
 #line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 6293 "EditingTools.c"
+#line 6221 "EditingTools.c"
 		}
 	}
 #line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
 #line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6300 "EditingTools.c"
+#line 6228 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp1_ = NULL;
-	GtkEntry* _tmp2_ = NULL;
-	GtkEntry* _tmp3_ = NULL;
-	GdkEventFocus* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	EditingToolsCropToolCropToolWindow* _tmp1_;
+	GtkEntry* _tmp2_;
+	GtkEntry* _tmp3_;
+	GdkEventFocus* _tmp4_;
+	gboolean _tmp5_;
 #line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
 #line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6332,18 +6260,18 @@ static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCr
 	result = _tmp5_;
 #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6336 "EditingTools.c"
+#line 6264 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp1_ = NULL;
-	GtkEntry* _tmp2_ = NULL;
-	GtkEntry* _tmp3_ = NULL;
-	GdkEventFocus* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	EditingToolsCropToolCropToolWindow* _tmp1_;
+	GtkEntry* _tmp2_;
+	GtkEntry* _tmp3_;
+	GdkEventFocus* _tmp4_;
+	gboolean _tmp5_;
 #line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
 #line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6368,44 +6296,44 @@ static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsC
 	result = _tmp5_;
 #line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6372 "EditingTools.c"
+#line 6300 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
 	gint width = 0;
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	GtkEntry* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gint _tmp4_;
 	gint height = 0;
-	EditingToolsCropToolCropToolWindow* _tmp5_ = NULL;
-	GtkEntry* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	gint _tmp16_ = 0;
+	EditingToolsCropToolCropToolWindow* _tmp5_;
+	GtkEntry* _tmp6_;
+	const gchar* _tmp7_;
+	const gchar* _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	gint _tmp16_;
 	gboolean _tmp22_ = FALSE;
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
-	gfloat _tmp29_ = 0.0F;
-	gint _tmp63_ = 0;
-	gint _tmp64_ = 0;
+	gint _tmp23_;
+	gint _tmp24_;
+	gint _tmp27_;
+	gint _tmp28_;
+	gfloat _tmp29_;
+	gint _tmp63_;
+	gint _tmp64_;
 	Box new_crop = {0};
-	Box _tmp65_ = {0};
+	Box _tmp65_;
 	Box _tmp66_ = {0};
-	Box _tmp67_ = {0};
-	Box _tmp68_ = {0};
-	EditingToolsPhotoCanvas* _tmp69_ = NULL;
-	Box _tmp70_ = {0};
-	EditingToolsPhotoCanvas* _tmp71_ = NULL;
-	gint _tmp72_ = 0;
-	gint _tmp73_ = 0;
+	Box _tmp67_;
+	Box _tmp68_;
+	EditingToolsPhotoCanvas* _tmp69_;
+	Box _tmp70_;
+	EditingToolsPhotoCanvas* _tmp71_;
+	gint _tmp72_;
+	gint _tmp73_;
 #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
 #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6438,12 +6366,12 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 	_tmp10_ = width;
 #line 833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ < 1) {
-#line 6442 "EditingTools.c"
-		EditingToolsCropToolCropToolWindow* _tmp11_ = NULL;
-		GtkEntry* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
+#line 6370 "EditingTools.c"
+		EditingToolsCropToolCropToolWindow* _tmp11_;
+		GtkEntry* _tmp12_;
+		gint _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
 #line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		width = 1;
 #line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6460,18 +6388,18 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 		gtk_entry_set_text (_tmp12_, _tmp15_);
 #line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp15_);
-#line 6464 "EditingTools.c"
+#line 6392 "EditingTools.c"
 	}
 #line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = height;
 #line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp16_ < 1) {
-#line 6470 "EditingTools.c"
-		EditingToolsCropToolCropToolWindow* _tmp17_ = NULL;
-		GtkEntry* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
-		gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
+#line 6398 "EditingTools.c"
+		EditingToolsCropToolCropToolWindow* _tmp17_;
+		GtkEntry* _tmp18_;
+		gint _tmp19_;
+		gchar* _tmp20_;
+		gchar* _tmp21_;
 #line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		height = 1;
 #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6488,7 +6416,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 		gtk_entry_set_text (_tmp18_, _tmp21_);
 #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp21_);
-#line 6492 "EditingTools.c"
+#line 6420 "EditingTools.c"
 	}
 #line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = width;
@@ -6496,20 +6424,20 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 	_tmp24_ = self->priv->custom_width;
 #line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp23_ == _tmp24_) {
-#line 6500 "EditingTools.c"
-		gint _tmp25_ = 0;
-		gint _tmp26_ = 0;
+#line 6428 "EditingTools.c"
+		gint _tmp25_;
+		gint _tmp26_;
 #line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp25_ = height;
 #line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = self->priv->custom_height;
 #line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = _tmp25_ == _tmp26_;
-#line 6509 "EditingTools.c"
+#line 6437 "EditingTools.c"
 	} else {
 #line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = FALSE;
-#line 6513 "EditingTools.c"
+#line 6441 "EditingTools.c"
 	}
 #line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp22_) {
@@ -6517,7 +6445,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 		result = FALSE;
 #line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 6521 "EditingTools.c"
+#line 6449 "EditingTools.c"
 	}
 #line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = width;
@@ -6529,11 +6457,11 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 	_tmp29_ = self->priv->custom_aspect_ratio;
 #line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp29_ < EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO) {
-#line 6533 "EditingTools.c"
-		EditingToolsCropToolCropToolWindow* _tmp30_ = NULL;
-		GtkEntry* _tmp31_ = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp32_ = NULL;
-		GtkEntry* _tmp33_ = NULL;
+#line 6461 "EditingTools.c"
+		EditingToolsCropToolCropToolWindow* _tmp30_;
+		GtkEntry* _tmp31_;
+		EditingToolsCropToolCropToolWindow* _tmp32_;
+		GtkEntry* _tmp33_;
 #line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp30_ = self->priv->crop_tool_window;
 #line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6544,13 +6472,13 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 		_tmp33_ = _tmp32_->custom_height_entry;
 #line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp31_ == _tmp33_) {
-#line 6548 "EditingTools.c"
-			gint _tmp34_ = 0;
-			EditingToolsCropToolCropToolWindow* _tmp35_ = NULL;
-			GtkEntry* _tmp36_ = NULL;
-			gint _tmp37_ = 0;
-			gchar* _tmp38_ = NULL;
-			gchar* _tmp39_ = NULL;
+#line 6476 "EditingTools.c"
+			gint _tmp34_;
+			EditingToolsCropToolCropToolWindow* _tmp35_;
+			GtkEntry* _tmp36_;
+			gint _tmp37_;
+			gchar* _tmp38_;
+			gchar* _tmp39_;
 #line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp34_ = width;
 #line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6569,14 +6497,14 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 			gtk_entry_set_text (_tmp36_, _tmp39_);
 #line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_free0 (_tmp39_);
-#line 6573 "EditingTools.c"
+#line 6501 "EditingTools.c"
 		} else {
-			gint _tmp40_ = 0;
-			EditingToolsCropToolCropToolWindow* _tmp41_ = NULL;
-			GtkEntry* _tmp42_ = NULL;
-			gint _tmp43_ = 0;
-			gchar* _tmp44_ = NULL;
-			gchar* _tmp45_ = NULL;
+			gint _tmp40_;
+			EditingToolsCropToolCropToolWindow* _tmp41_;
+			GtkEntry* _tmp42_;
+			gint _tmp43_;
+			gchar* _tmp44_;
+			gchar* _tmp45_;
 #line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp40_ = height;
 #line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6595,19 +6523,19 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 			gtk_entry_set_text (_tmp42_, _tmp45_);
 #line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_free0 (_tmp45_);
-#line 6599 "EditingTools.c"
+#line 6527 "EditingTools.c"
 		}
 	} else {
-		gfloat _tmp46_ = 0.0F;
+		gfloat _tmp46_;
 #line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp46_ = self->priv->custom_aspect_ratio;
 #line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp46_ > EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO) {
-#line 6607 "EditingTools.c"
-			EditingToolsCropToolCropToolWindow* _tmp47_ = NULL;
-			GtkEntry* _tmp48_ = NULL;
-			EditingToolsCropToolCropToolWindow* _tmp49_ = NULL;
-			GtkEntry* _tmp50_ = NULL;
+#line 6535 "EditingTools.c"
+			EditingToolsCropToolCropToolWindow* _tmp47_;
+			GtkEntry* _tmp48_;
+			EditingToolsCropToolCropToolWindow* _tmp49_;
+			GtkEntry* _tmp50_;
 #line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp47_ = self->priv->crop_tool_window;
 #line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6618,13 +6546,13 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 			_tmp50_ = _tmp49_->custom_height_entry;
 #line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp48_ == _tmp50_) {
-#line 6622 "EditingTools.c"
-				gint _tmp51_ = 0;
-				EditingToolsCropToolCropToolWindow* _tmp52_ = NULL;
-				GtkEntry* _tmp53_ = NULL;
-				gint _tmp54_ = 0;
-				gchar* _tmp55_ = NULL;
-				gchar* _tmp56_ = NULL;
+#line 6550 "EditingTools.c"
+				gint _tmp51_;
+				EditingToolsCropToolCropToolWindow* _tmp52_;
+				GtkEntry* _tmp53_;
+				gint _tmp54_;
+				gchar* _tmp55_;
+				gchar* _tmp56_;
 #line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp51_ = width;
 #line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6643,14 +6571,14 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 				gtk_entry_set_text (_tmp53_, _tmp56_);
 #line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_g_free0 (_tmp56_);
-#line 6647 "EditingTools.c"
+#line 6575 "EditingTools.c"
 			} else {
-				gint _tmp57_ = 0;
-				EditingToolsCropToolCropToolWindow* _tmp58_ = NULL;
-				GtkEntry* _tmp59_ = NULL;
-				gint _tmp60_ = 0;
-				gchar* _tmp61_ = NULL;
-				gchar* _tmp62_ = NULL;
+				gint _tmp57_;
+				EditingToolsCropToolCropToolWindow* _tmp58_;
+				GtkEntry* _tmp59_;
+				gint _tmp60_;
+				gchar* _tmp61_;
+				gchar* _tmp62_;
 #line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp57_ = height;
 #line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6669,7 +6597,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 				gtk_entry_set_text (_tmp59_, _tmp62_);
 #line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_g_free0 (_tmp62_);
-#line 6673 "EditingTools.c"
+#line 6601 "EditingTools.c"
 			}
 		}
 	}
@@ -6715,15 +6643,15 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 	result = FALSE;
 #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6719 "EditingTools.c"
+#line 6647 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool* self, const gchar* text, gint length, gint* position) {
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	GtkEntry* _tmp1_;
+	const gchar* _tmp2_;
+	gint _tmp3_;
 #line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6738,15 +6666,15 @@ static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool*
 	_tmp3_ = length;
 #line 882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position);
-#line 6742 "EditingTools.c"
+#line 6670 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool* self, const gchar* text, gint length, gint* position) {
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	GtkEntry* _tmp1_;
+	const gchar* _tmp2_;
+	gint _tmp3_;
 #line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6761,37 +6689,37 @@ static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool*
 	_tmp3_ = length;
 #line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position);
-#line 6765 "EditingTools.c"
+#line 6693 "EditingTools.c"
 }
 
 
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_ = 0L;
-	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 6783 "EditingTools.c"
+#line 6711 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool* self, GtkEntry* sender, const gchar* text, gint length, gint* position) {
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	gboolean _tmp0_;
+	gint _tmp1_;
 	gchar* new_text = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	gint _tmp23_ = 0;
-	GtkEntry* _tmp29_ = NULL;
+	gchar* _tmp5_;
+	const gchar* _tmp21_;
+	gint _tmp22_;
+	gint _tmp23_;
+	GtkEntry* _tmp29_;
 #line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6804,7 +6732,7 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 	if (_tmp0_) {
 #line 891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 6808 "EditingTools.c"
+#line 6736 "EditingTools.c"
 	}
 #line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->entry_insert_in_progress = TRUE;
@@ -6812,10 +6740,10 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 	_tmp1_ = length;
 #line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == -1) {
-#line 6816 "EditingTools.c"
-		const gchar* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+#line 6744 "EditingTools.c"
+		const gchar* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = text;
 #line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6824,40 +6752,40 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 		_tmp4_ = _tmp3_;
 #line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		length = (gint) _tmp4_;
-#line 6828 "EditingTools.c"
+#line 6756 "EditingTools.c"
 	}
 #line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = g_strdup ("");
 #line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_text = _tmp5_;
-#line 6834 "EditingTools.c"
+#line 6762 "EditingTools.c"
 	{
 		gint ctr = 0;
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		ctr = 0;
-#line 6839 "EditingTools.c"
+#line 6767 "EditingTools.c"
 		{
 			gboolean _tmp6_ = FALSE;
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = TRUE;
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			while (TRUE) {
-#line 6846 "EditingTools.c"
-				gint _tmp8_ = 0;
-				gint _tmp9_ = 0;
-				const gchar* _tmp10_ = NULL;
-				gint _tmp11_ = 0;
-				gchar _tmp12_ = '\0';
-				gboolean _tmp13_ = FALSE;
+#line 6774 "EditingTools.c"
+				gint _tmp8_;
+				gint _tmp9_;
+				const gchar* _tmp10_;
+				gint _tmp11_;
+				gchar _tmp12_;
+				gboolean _tmp13_;
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!_tmp6_) {
-#line 6855 "EditingTools.c"
-					gint _tmp7_ = 0;
+#line 6783 "EditingTools.c"
+					gint _tmp7_;
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp7_ = ctr;
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					ctr = _tmp7_ + 1;
-#line 6861 "EditingTools.c"
+#line 6789 "EditingTools.c"
 				}
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp6_ = FALSE;
@@ -6869,7 +6797,7 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 				if (!(_tmp8_ < _tmp9_)) {
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					break;
-#line 6873 "EditingTools.c"
+#line 6801 "EditingTools.c"
 				}
 #line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp10_ = text;
@@ -6881,14 +6809,14 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 				_tmp13_ = g_ascii_isdigit (_tmp12_);
 #line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp13_) {
-#line 6885 "EditingTools.c"
-					const gchar* _tmp14_ = NULL;
-					const gchar* _tmp15_ = NULL;
-					gint _tmp16_ = 0;
-					gchar _tmp17_ = '\0';
-					gchar* _tmp18_ = NULL;
-					gchar* _tmp19_ = NULL;
-					gchar* _tmp20_ = NULL;
+#line 6813 "EditingTools.c"
+					const gchar* _tmp14_;
+					const gchar* _tmp15_;
+					gint _tmp16_;
+					gchar _tmp17_;
+					gchar* _tmp18_;
+					gchar* _tmp19_;
+					gchar* _tmp20_;
 #line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp14_ = new_text;
 #line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6909,7 +6837,7 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 					new_text = _tmp20_;
 #line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_g_free0 (_tmp19_);
-#line 6913 "EditingTools.c"
+#line 6841 "EditingTools.c"
 				}
 			}
 		}
@@ -6922,12 +6850,12 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 	_tmp23_ = _tmp22_;
 #line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp23_ > 0) {
-#line 6926 "EditingTools.c"
-		GtkEntry* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		gint _tmp27_ = 0;
-		gint _tmp28_ = 0;
+#line 6854 "EditingTools.c"
+		GtkEntry* _tmp24_;
+		const gchar* _tmp25_;
+		const gchar* _tmp26_;
+		gint _tmp27_;
+		gint _tmp28_;
 #line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp24_ = sender;
 #line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6940,7 +6868,7 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 		_tmp28_ = _tmp27_;
 #line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position);
-#line 6944 "EditingTools.c"
+#line 6872 "EditingTools.c"
 	}
 #line 909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = sender;
@@ -6950,19 +6878,19 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 	self->priv->entry_insert_in_progress = FALSE;
 #line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (new_text);
-#line 6954 "EditingTools.c"
+#line 6882 "EditingTools.c"
 }
 
 
 static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsCropTool* self) {
 	gfloat result = 0.0F;
 	gfloat _result_ = 0.0F;
-	EditingToolsCropToolConstraintDescription* _tmp0_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp1_ = NULL;
-	gfloat _tmp2_ = 0.0F;
-	gfloat _tmp3_ = 0.0F;
-	gfloat _tmp4_ = 0.0F;
-	EditingToolsCropToolReticleOrientation _tmp20_ = 0;
+	EditingToolsCropToolConstraintDescription* _tmp0_;
+	EditingToolsCropToolConstraintDescription* _tmp1_;
+	gfloat _tmp2_;
+	gfloat _tmp3_;
+	gfloat _tmp4_;
+	EditingToolsCropToolReticleOrientation _tmp20_;
 #line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F);
 #line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6981,13 +6909,13 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 	_tmp4_ = _result_;
 #line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 6985 "EditingTools.c"
-		EditingToolsPhotoCanvas* _tmp5_ = NULL;
+#line 6913 "EditingTools.c"
+		EditingToolsPhotoCanvas* _tmp5_;
 		GdkRectangle _tmp6_ = {0};
-		gint _tmp7_ = 0;
-		EditingToolsPhotoCanvas* _tmp8_ = NULL;
+		gint _tmp7_;
+		EditingToolsPhotoCanvas* _tmp8_;
 		GdkRectangle _tmp9_ = {0};
-		gint _tmp10_ = 0;
+		gint _tmp10_;
 #line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7002,21 +6930,21 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 		_tmp10_ = _tmp9_.height;
 #line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = ((gfloat) _tmp7_) / ((gfloat) _tmp10_);
-#line 7006 "EditingTools.c"
+#line 6934 "EditingTools.c"
 	} else {
-		gfloat _tmp11_ = 0.0F;
+		gfloat _tmp11_;
 #line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _result_;
 #line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp11_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 7013 "EditingTools.c"
+#line 6941 "EditingTools.c"
 			GdkScreen* screen = NULL;
-			GdkScreen* _tmp12_ = NULL;
-			GdkScreen* _tmp13_ = NULL;
-			GdkScreen* _tmp14_ = NULL;
-			gint _tmp15_ = 0;
-			GdkScreen* _tmp16_ = NULL;
-			gint _tmp17_ = 0;
+			GdkScreen* _tmp12_;
+			GdkScreen* _tmp13_;
+			GdkScreen* _tmp14_;
+			gint _tmp15_;
+			GdkScreen* _tmp16_;
+			gint _tmp17_;
 #line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp12_ = gdk_screen_get_default ();
 #line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7035,20 +6963,20 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 			_result_ = ((gfloat) _tmp15_) / ((gfloat) _tmp17_);
 #line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 7039 "EditingTools.c"
+#line 6967 "EditingTools.c"
 		} else {
-			gfloat _tmp18_ = 0.0F;
+			gfloat _tmp18_;
 #line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = _result_;
 #line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 7046 "EditingTools.c"
-				gfloat _tmp19_ = 0.0F;
+#line 6974 "EditingTools.c"
+				gfloat _tmp19_;
 #line 924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp19_ = self->priv->custom_aspect_ratio;
 #line 924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_result_ = _tmp19_;
-#line 7052 "EditingTools.c"
+#line 6980 "EditingTools.c"
 			}
 		}
 	}
@@ -7056,29 +6984,29 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 	_tmp20_ = self->priv->reticle_orientation;
 #line 926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp20_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
-#line 7060 "EditingTools.c"
-		gfloat _tmp21_ = 0.0F;
+#line 6988 "EditingTools.c"
+		gfloat _tmp21_;
 #line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = _result_;
 #line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = 1.0f / _tmp21_;
-#line 7066 "EditingTools.c"
+#line 6994 "EditingTools.c"
 	}
 #line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
 #line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 7072 "EditingTools.c"
+#line 7000 "EditingTools.c"
 }
 
 
 static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (EditingToolsCropTool* self, EditingToolsCropToolConstraintDescription* constraint, Photo* photo) {
 	gfloat result = 0.0F;
 	gfloat _result_ = 0.0F;
-	EditingToolsCropToolConstraintDescription* _tmp0_ = NULL;
-	gfloat _tmp1_ = 0.0F;
-	gfloat _tmp2_ = 0.0F;
-	EditingToolsCropToolReticleOrientation _tmp18_ = 0;
+	EditingToolsCropToolConstraintDescription* _tmp0_;
+	gfloat _tmp1_;
+	gfloat _tmp2_;
+	EditingToolsCropToolReticleOrientation _tmp18_;
 #line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F);
 #line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7095,14 +7023,14 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 	_tmp2_ = _result_;
 #line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 7099 "EditingTools.c"
+#line 7027 "EditingTools.c"
 		Dimensions orig_dim = {0};
-		Photo* _tmp3_ = NULL;
+		Photo* _tmp3_;
 		Dimensions _tmp4_ = {0};
-		Dimensions _tmp5_ = {0};
-		gint _tmp6_ = 0;
-		Dimensions _tmp7_ = {0};
-		gint _tmp8_ = 0;
+		Dimensions _tmp5_;
+		gint _tmp6_;
+		Dimensions _tmp7_;
+		gint _tmp8_;
 #line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = photo;
 #line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7119,21 +7047,21 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 		_tmp8_ = _tmp7_.height;
 #line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = ((gfloat) _tmp6_) / ((gfloat) _tmp8_);
-#line 7123 "EditingTools.c"
+#line 7051 "EditingTools.c"
 	} else {
-		gfloat _tmp9_ = 0.0F;
+		gfloat _tmp9_;
 #line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _result_;
 #line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp9_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 7130 "EditingTools.c"
+#line 7058 "EditingTools.c"
 			GdkScreen* screen = NULL;
-			GdkScreen* _tmp10_ = NULL;
-			GdkScreen* _tmp11_ = NULL;
-			GdkScreen* _tmp12_ = NULL;
-			gint _tmp13_ = 0;
-			GdkScreen* _tmp14_ = NULL;
-			gint _tmp15_ = 0;
+			GdkScreen* _tmp10_;
+			GdkScreen* _tmp11_;
+			GdkScreen* _tmp12_;
+			gint _tmp13_;
+			GdkScreen* _tmp14_;
+			gint _tmp15_;
 #line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp10_ = gdk_screen_get_default ();
 #line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7152,20 +7080,20 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 			_result_ = ((gfloat) _tmp13_) / ((gfloat) _tmp15_);
 #line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 7156 "EditingTools.c"
+#line 7084 "EditingTools.c"
 		} else {
-			gfloat _tmp16_ = 0.0F;
+			gfloat _tmp16_;
 #line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp16_ = _result_;
 #line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp16_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 7163 "EditingTools.c"
-				gfloat _tmp17_ = 0.0F;
+#line 7091 "EditingTools.c"
+				gfloat _tmp17_;
 #line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp17_ = self->priv->custom_aspect_ratio;
 #line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_result_ = _tmp17_;
-#line 7169 "EditingTools.c"
+#line 7097 "EditingTools.c"
 			}
 		}
 	}
@@ -7173,33 +7101,33 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 	_tmp18_ = self->priv->reticle_orientation;
 #line 944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
-#line 7177 "EditingTools.c"
-		gfloat _tmp19_ = 0.0F;
+#line 7105 "EditingTools.c"
+		gfloat _tmp19_;
 #line 945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = _result_;
 #line 945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = 1.0f / _tmp19_;
-#line 7183 "EditingTools.c"
+#line 7111 "EditingTools.c"
 	}
 #line 947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
 #line 947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 7189 "EditingTools.c"
+#line 7117 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* self) {
 	EditingToolsCropToolConstraintDescription* selected_constraint = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp0_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp1_ = NULL;
-	gfloat _tmp2_ = 0.0F;
-	EditingToolsCropToolConstraintDescription* _tmp13_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	gboolean _tmp16_ = FALSE;
-	gfloat _tmp17_ = 0.0F;
-	gfloat _tmp18_ = 0.0F;
+	EditingToolsCropToolConstraintDescription* _tmp0_;
+	EditingToolsCropToolConstraintDescription* _tmp1_;
+	gfloat _tmp2_;
+	EditingToolsCropToolConstraintDescription* _tmp13_;
+	EditingToolsCropToolConstraintDescription* _tmp14_;
+	gboolean _tmp15_;
+	gboolean _tmp16_;
+	gfloat _tmp17_;
+	gfloat _tmp18_;
 #line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7214,10 +7142,10 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 	if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
 #line 954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_custom_constraint_mode (self);
-#line 7218 "EditingTools.c"
+#line 7146 "EditingTools.c"
 	} else {
-		EditingToolsCropToolConstraintDescription* _tmp3_ = NULL;
-		gfloat _tmp4_ = 0.0F;
+		EditingToolsCropToolConstraintDescription* _tmp3_;
+		gfloat _tmp4_;
 #line 956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_normal_constraint_mode (self);
 #line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7226,15 +7154,15 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 		_tmp4_ = _tmp3_->aspect_ratio;
 #line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp4_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 7230 "EditingTools.c"
-			ConfigFacade* _tmp5_ = NULL;
-			ConfigFacade* _tmp6_ = NULL;
-			gint _tmp7_ = 0;
-			ConfigFacade* _tmp8_ = NULL;
-			ConfigFacade* _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
-			gint _tmp12_ = 0;
+#line 7158 "EditingTools.c"
+			ConfigFacade* _tmp5_;
+			ConfigFacade* _tmp6_;
+			gint _tmp7_;
+			ConfigFacade* _tmp8_;
+			ConfigFacade* _tmp9_;
+			gint _tmp10_;
+			gint _tmp11_;
+			gint _tmp12_;
 #line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp5_ = config_facade_get_instance ();
 #line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7261,7 +7189,7 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 			_tmp12_ = self->priv->custom_init_height;
 #line 964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->custom_aspect_ratio = ((gfloat) _tmp11_) / ((gfloat) _tmp12_);
-#line 7265 "EditingTools.c"
+#line 7193 "EditingTools.c"
 		}
 	}
 #line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7280,7 +7208,7 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 	if (_tmp16_) {
 #line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 7284 "EditingTools.c"
+#line 7212 "EditingTools.c"
 	}
 #line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
@@ -7288,16 +7216,16 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 	_tmp18_ = self->priv->pre_aspect_ratio;
 #line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp17_ != _tmp18_) {
-#line 7292 "EditingTools.c"
+#line 7220 "EditingTools.c"
 		Box new_crop = {0};
-		Box _tmp19_ = {0};
+		Box _tmp19_;
 		Box _tmp20_ = {0};
-		Box _tmp21_ = {0};
-		Box _tmp22_ = {0};
-		EditingToolsPhotoCanvas* _tmp23_ = NULL;
-		Box _tmp24_ = {0};
-		EditingToolsPhotoCanvas* _tmp25_ = NULL;
-		gfloat _tmp26_ = 0.0F;
+		Box _tmp21_;
+		Box _tmp22_;
+		EditingToolsPhotoCanvas* _tmp23_;
+		Box _tmp24_;
+		EditingToolsPhotoCanvas* _tmp25_;
+		gfloat _tmp26_;
 #line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = self->priv->scaled_crop;
 #line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7326,59 +7254,59 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 		_tmp26_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->pre_aspect_ratio = _tmp26_;
-#line 7330 "EditingTools.c"
+#line 7258 "EditingTools.c"
 	}
 #line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (selected_constraint);
-#line 7334 "EditingTools.c"
+#line 7262 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCropTool* self) {
-	EditingToolsCropToolConstraintMode _tmp0_ = 0;
+	EditingToolsCropToolConstraintMode _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	EditingToolsCropToolCropToolWindow* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	EditingToolsCropToolCropToolWindow* _tmp11_ = NULL;
-	GtkBox* _tmp12_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp13_ = NULL;
-	GtkComboBox* _tmp14_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp15_ = NULL;
-	GtkBox* _tmp16_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp17_ = NULL;
-	GtkButton* _tmp18_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp19_ = NULL;
-	GtkBox* _tmp20_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp21_ = NULL;
-	GtkBox* _tmp22_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp23_ = NULL;
-	GtkBox* _tmp24_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp25_ = NULL;
-	GtkComboBox* _tmp26_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp27_ = NULL;
-	GtkBox* _tmp28_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp29_ = NULL;
-	GtkEntry* _tmp30_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp31_ = NULL;
-	GtkBox* _tmp32_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp33_ = NULL;
-	GtkLabel* _tmp34_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp35_ = NULL;
-	GtkBox* _tmp36_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp37_ = NULL;
-	GtkEntry* _tmp38_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp39_ = NULL;
-	GtkBox* _tmp40_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp41_ = NULL;
-	GtkButton* _tmp42_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp43_ = NULL;
-	GtkBox* _tmp44_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp45_ = NULL;
-	GtkBox* _tmp46_ = NULL;
-	EditingToolsCropToolReticleOrientation _tmp47_ = 0;
-	gint _tmp68_ = 0;
-	gint _tmp69_ = 0;
-	EditingToolsCropToolCropToolWindow* _tmp70_ = NULL;
+	EditingToolsCropToolCropToolWindow* _tmp2_;
+	gint _tmp3_;
+	EditingToolsCropToolCropToolWindow* _tmp11_;
+	GtkBox* _tmp12_;
+	EditingToolsCropToolCropToolWindow* _tmp13_;
+	GtkComboBox* _tmp14_;
+	EditingToolsCropToolCropToolWindow* _tmp15_;
+	GtkBox* _tmp16_;
+	EditingToolsCropToolCropToolWindow* _tmp17_;
+	GtkButton* _tmp18_;
+	EditingToolsCropToolCropToolWindow* _tmp19_;
+	GtkBox* _tmp20_;
+	EditingToolsCropToolCropToolWindow* _tmp21_;
+	GtkBox* _tmp22_;
+	EditingToolsCropToolCropToolWindow* _tmp23_;
+	GtkBox* _tmp24_;
+	EditingToolsCropToolCropToolWindow* _tmp25_;
+	GtkComboBox* _tmp26_;
+	EditingToolsCropToolCropToolWindow* _tmp27_;
+	GtkBox* _tmp28_;
+	EditingToolsCropToolCropToolWindow* _tmp29_;
+	GtkEntry* _tmp30_;
+	EditingToolsCropToolCropToolWindow* _tmp31_;
+	GtkBox* _tmp32_;
+	EditingToolsCropToolCropToolWindow* _tmp33_;
+	GtkLabel* _tmp34_;
+	EditingToolsCropToolCropToolWindow* _tmp35_;
+	GtkBox* _tmp36_;
+	EditingToolsCropToolCropToolWindow* _tmp37_;
+	GtkEntry* _tmp38_;
+	EditingToolsCropToolCropToolWindow* _tmp39_;
+	GtkBox* _tmp40_;
+	EditingToolsCropToolCropToolWindow* _tmp41_;
+	GtkButton* _tmp42_;
+	EditingToolsCropToolCropToolWindow* _tmp43_;
+	GtkBox* _tmp44_;
+	EditingToolsCropToolCropToolWindow* _tmp45_;
+	GtkBox* _tmp46_;
+	EditingToolsCropToolReticleOrientation _tmp47_;
+	gint _tmp68_;
+	gint _tmp69_;
+	EditingToolsCropToolCropToolWindow* _tmp70_;
 #line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7387,7 +7315,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM) {
 #line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7391 "EditingTools.c"
+#line 7319 "EditingTools.c"
 	}
 #line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
@@ -7397,24 +7325,24 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	if (_tmp3_ == -1) {
 #line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 7401 "EditingTools.c"
+#line 7329 "EditingTools.c"
 	} else {
-		EditingToolsCropToolCropToolWindow* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
+		EditingToolsCropToolCropToolWindow* _tmp4_;
+		gint _tmp5_;
 #line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->crop_tool_window;
 #line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_->normal_height;
 #line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = _tmp5_ == -1;
-#line 7411 "EditingTools.c"
+#line 7339 "EditingTools.c"
 	}
 #line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 7415 "EditingTools.c"
-		EditingToolsCropToolCropToolWindow* _tmp6_ = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp7_ = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp8_ = NULL;
+#line 7343 "EditingTools.c"
+		EditingToolsCropToolCropToolWindow* _tmp6_;
+		EditingToolsCropToolCropToolWindow* _tmp7_;
+		EditingToolsCropToolCropToolWindow* _tmp8_;
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
 #line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7429,7 +7357,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		_tmp7_->normal_width = _tmp9_;
 #line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_->normal_height = _tmp10_;
-#line 7433 "EditingTools.c"
+#line 7361 "EditingTools.c"
 	}
 #line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->crop_tool_window;
@@ -7525,17 +7453,17 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	_tmp47_ = self->priv->reticle_orientation;
 #line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp47_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) {
-#line 7529 "EditingTools.c"
-		EditingToolsCropToolCropToolWindow* _tmp48_ = NULL;
-		GtkEntry* _tmp49_ = NULL;
-		gint _tmp50_ = 0;
-		gchar* _tmp51_ = NULL;
-		gchar* _tmp52_ = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp53_ = NULL;
-		GtkEntry* _tmp54_ = NULL;
-		gint _tmp55_ = 0;
-		gchar* _tmp56_ = NULL;
-		gchar* _tmp57_ = NULL;
+#line 7457 "EditingTools.c"
+		EditingToolsCropToolCropToolWindow* _tmp48_;
+		GtkEntry* _tmp49_;
+		gint _tmp50_;
+		gchar* _tmp51_;
+		gchar* _tmp52_;
+		EditingToolsCropToolCropToolWindow* _tmp53_;
+		GtkEntry* _tmp54_;
+		gint _tmp55_;
+		gchar* _tmp56_;
+		gchar* _tmp57_;
 #line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp48_ = self->priv->crop_tool_window;
 #line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7564,18 +7492,18 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		gtk_entry_set_text (_tmp54_, _tmp57_);
 #line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp57_);
-#line 7568 "EditingTools.c"
+#line 7496 "EditingTools.c"
 	} else {
-		EditingToolsCropToolCropToolWindow* _tmp58_ = NULL;
-		GtkEntry* _tmp59_ = NULL;
-		gint _tmp60_ = 0;
-		gchar* _tmp61_ = NULL;
-		gchar* _tmp62_ = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp63_ = NULL;
-		GtkEntry* _tmp64_ = NULL;
-		gint _tmp65_ = 0;
-		gchar* _tmp66_ = NULL;
-		gchar* _tmp67_ = NULL;
+		EditingToolsCropToolCropToolWindow* _tmp58_;
+		GtkEntry* _tmp59_;
+		gint _tmp60_;
+		gchar* _tmp61_;
+		gchar* _tmp62_;
+		EditingToolsCropToolCropToolWindow* _tmp63_;
+		GtkEntry* _tmp64_;
+		gint _tmp65_;
+		gchar* _tmp66_;
+		gchar* _tmp67_;
 #line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp58_ = self->priv->crop_tool_window;
 #line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7604,7 +7532,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		gtk_entry_set_text (_tmp64_, _tmp67_);
 #line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp67_);
-#line 7608 "EditingTools.c"
+#line 7536 "EditingTools.c"
 	}
 #line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = self->priv->custom_init_width;
@@ -7618,54 +7546,54 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget));
 #line 1015 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM;
-#line 7622 "EditingTools.c"
+#line 7550 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCropTool* self) {
-	EditingToolsCropToolConstraintMode _tmp0_ = 0;
-	EditingToolsCropToolCropToolWindow* _tmp1_ = NULL;
-	GtkBox* _tmp2_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp3_ = NULL;
-	GtkComboBox* _tmp4_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp5_ = NULL;
-	GtkBox* _tmp6_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp7_ = NULL;
-	GtkEntry* _tmp8_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp9_ = NULL;
-	GtkBox* _tmp10_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp11_ = NULL;
-	GtkLabel* _tmp12_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp13_ = NULL;
-	GtkBox* _tmp14_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp15_ = NULL;
-	GtkEntry* _tmp16_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp17_ = NULL;
-	GtkBox* _tmp18_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp19_ = NULL;
-	GtkButton* _tmp20_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp21_ = NULL;
-	GtkBox* _tmp22_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp23_ = NULL;
-	GtkBox* _tmp24_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp25_ = NULL;
-	GtkBox* _tmp26_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp27_ = NULL;
-	GtkComboBox* _tmp28_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp29_ = NULL;
-	GtkBox* _tmp30_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp31_ = NULL;
-	GtkButton* _tmp32_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp33_ = NULL;
-	GtkBox* _tmp34_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp35_ = NULL;
-	GtkBox* _tmp36_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp37_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp38_ = NULL;
-	gint _tmp39_ = 0;
-	EditingToolsCropToolCropToolWindow* _tmp40_ = NULL;
-	gint _tmp41_ = 0;
-	EditingToolsCropToolCropToolWindow* _tmp42_ = NULL;
+	EditingToolsCropToolConstraintMode _tmp0_;
+	EditingToolsCropToolCropToolWindow* _tmp1_;
+	GtkBox* _tmp2_;
+	EditingToolsCropToolCropToolWindow* _tmp3_;
+	GtkComboBox* _tmp4_;
+	EditingToolsCropToolCropToolWindow* _tmp5_;
+	GtkBox* _tmp6_;
+	EditingToolsCropToolCropToolWindow* _tmp7_;
+	GtkEntry* _tmp8_;
+	EditingToolsCropToolCropToolWindow* _tmp9_;
+	GtkBox* _tmp10_;
+	EditingToolsCropToolCropToolWindow* _tmp11_;
+	GtkLabel* _tmp12_;
+	EditingToolsCropToolCropToolWindow* _tmp13_;
+	GtkBox* _tmp14_;
+	EditingToolsCropToolCropToolWindow* _tmp15_;
+	GtkEntry* _tmp16_;
+	EditingToolsCropToolCropToolWindow* _tmp17_;
+	GtkBox* _tmp18_;
+	EditingToolsCropToolCropToolWindow* _tmp19_;
+	GtkButton* _tmp20_;
+	EditingToolsCropToolCropToolWindow* _tmp21_;
+	GtkBox* _tmp22_;
+	EditingToolsCropToolCropToolWindow* _tmp23_;
+	GtkBox* _tmp24_;
+	EditingToolsCropToolCropToolWindow* _tmp25_;
+	GtkBox* _tmp26_;
+	EditingToolsCropToolCropToolWindow* _tmp27_;
+	GtkComboBox* _tmp28_;
+	EditingToolsCropToolCropToolWindow* _tmp29_;
+	GtkBox* _tmp30_;
+	EditingToolsCropToolCropToolWindow* _tmp31_;
+	GtkButton* _tmp32_;
+	EditingToolsCropToolCropToolWindow* _tmp33_;
+	GtkBox* _tmp34_;
+	EditingToolsCropToolCropToolWindow* _tmp35_;
+	GtkBox* _tmp36_;
+	EditingToolsCropToolCropToolWindow* _tmp37_;
+	EditingToolsCropToolCropToolWindow* _tmp38_;
+	gint _tmp39_;
+	EditingToolsCropToolCropToolWindow* _tmp40_;
+	gint _tmp41_;
+	EditingToolsCropToolCropToolWindow* _tmp42_;
 #line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7674,7 +7602,7 @@ static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCrop
 	if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL) {
 #line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7678 "EditingTools.c"
+#line 7606 "EditingTools.c"
 	}
 #line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
@@ -7784,41 +7712,41 @@ static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCrop
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
 #line 1038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL;
-#line 7788 "EditingTools.c"
+#line 7716 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self, Box* crop, Box* result) {
 	gfloat user_aspect_ratio = 0.0F;
-	gfloat _tmp0_ = 0.0F;
-	gfloat _tmp1_ = 0.0F;
+	gfloat _tmp0_;
+	gfloat _tmp1_;
 	gfloat old_area = 0.0F;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gfloat _tmp5_ = 0.0F;
-	gfloat _tmp6_ = 0.0F;
-	gdouble _tmp7_ = 0.0;
-	gfloat _tmp8_ = 0.0F;
-	gfloat _tmp9_ = 0.0F;
-	gdouble _tmp10_ = 0.0;
+	gint _tmp3_;
+	gint _tmp4_;
+	gfloat _tmp5_;
+	gfloat _tmp6_;
+	gdouble _tmp7_;
+	gfloat _tmp8_;
+	gfloat _tmp9_;
+	gdouble _tmp10_;
 	Dimensions image_size = {0};
 	Dimensions _tmp11_ = {0};
 	gdouble angle = 0.0;
-	EditingToolsPhotoCanvas* _tmp12_ = NULL;
-	Photo* _tmp13_ = NULL;
-	Photo* _tmp14_ = NULL;
+	EditingToolsPhotoCanvas* _tmp12_;
+	Photo* _tmp13_;
+	Photo* _tmp14_;
 	gdouble _tmp15_ = 0.0;
-	Box _tmp16_ = {0};
-	Dimensions _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	Dimensions _tmp19_ = {0};
-	gint _tmp20_ = 0;
-	gdouble _tmp21_ = 0.0;
+	Box _tmp16_;
+	Dimensions _tmp17_;
+	gint _tmp18_;
+	Dimensions _tmp19_;
+	gint _tmp20_;
+	gdouble _tmp21_;
 	Box _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	gfloat _tmp25_ = 0.0F;
-	Box _tmp30_ = {0};
+	gint _tmp23_;
+	gint _tmp24_;
+	gfloat _tmp25_;
+	Box _tmp30_;
 #line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7831,15 +7759,15 @@ static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
 	_tmp1_ = user_aspect_ratio;
 #line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 7835 "EditingTools.c"
-		Box _tmp2_ = {0};
+#line 7763 "EditingTools.c"
+		Box _tmp2_;
 #line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = *crop;
 #line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*result = _tmp2_;
 #line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7843 "EditingTools.c"
+#line 7771 "EditingTools.c"
 	}
 #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = box_get_width (crop);
@@ -7903,26 +7831,26 @@ static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
 	_tmp25_ = user_aspect_ratio;
 #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (((gfloat) _tmp23_) >= (_tmp24_ * _tmp25_)) {
-#line 7907 "EditingTools.c"
-		gint _tmp26_ = 0;
-		gfloat _tmp27_ = 0.0F;
+#line 7835 "EditingTools.c"
+		gint _tmp26_;
+		gfloat _tmp27_;
 #line 1059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = box_get_height (crop);
 #line 1059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp27_ = user_aspect_ratio;
 #line 1059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_adjust_width (crop, (gint) (_tmp26_ * _tmp27_));
-#line 7916 "EditingTools.c"
+#line 7844 "EditingTools.c"
 	} else {
-		gint _tmp28_ = 0;
-		gfloat _tmp29_ = 0.0F;
+		gint _tmp28_;
+		gfloat _tmp29_;
 #line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp28_ = box_get_width (crop);
 #line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp29_ = user_aspect_ratio;
 #line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_adjust_height (crop, (gint) (_tmp28_ / _tmp29_));
-#line 7926 "EditingTools.c"
+#line 7854 "EditingTools.c"
 	}
 #line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = *crop;
@@ -7930,21 +7858,21 @@ static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
 	*result = _tmp30_;
 #line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 7934 "EditingTools.c"
+#line 7862 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_last_constraint (EditingToolsCropTool* self, gint* index) {
 	gint _vala_index = 0;
 	EditingToolsCropToolConstraintDescription* result = NULL;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gint _tmp2_;
 	EditingToolsCropToolConstraintDescription* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	EditingToolsCropToolConstraintDescription** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	EditingToolsCropToolConstraintDescription* _tmp9_ = NULL;
+	gint _tmp4_;
+	EditingToolsCropToolConstraintDescription** _tmp5_;
+	gint _tmp5__length1;
+	EditingToolsCropToolConstraintDescription* _tmp9_;
 #line 1066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL);
 #line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7965,11 +7893,11 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_la
 	_tmp5__length1 = self->priv->constraints_length1;
 #line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ < _tmp5__length1) {
-#line 7969 "EditingTools.c"
-		EditingToolsCropToolConstraintDescription** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-		gint _tmp7_ = 0;
-		EditingToolsCropToolConstraintDescription* _tmp8_ = NULL;
+#line 7897 "EditingTools.c"
+		EditingToolsCropToolConstraintDescription** _tmp6_;
+		gint _tmp6__length1;
+		gint _tmp7_;
+		EditingToolsCropToolConstraintDescription* _tmp8_;
 #line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->constraints;
 #line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7980,11 +7908,11 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_la
 		_tmp8_ = _tmp6_[_tmp7_];
 #line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp8_;
-#line 7984 "EditingTools.c"
+#line 7912 "EditingTools.c"
 	} else {
 #line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = NULL;
-#line 7988 "EditingTools.c"
+#line 7916 "EditingTools.c"
 	}
 #line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp3_);
@@ -7994,91 +7922,91 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_la
 	if (index) {
 #line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*index = _vala_index;
-#line 7998 "EditingTools.c"
+#line 7926 "EditingTools.c"
 	}
 #line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8002 "EditingTools.c"
+#line 7930 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsCropTool * self;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	EditingToolsPhotoCanvas* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
-	cairo_t* _tmp3_ = NULL;
-	EditingToolsPhotoCanvas* _tmp4_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	EditingToolsPhotoCanvas* _tmp1_;
+	cairo_t* _tmp2_;
+	cairo_t* _tmp3_;
+	EditingToolsPhotoCanvas* _tmp4_;
 	Dimensions _tmp5_ = {0};
-	cairo_surface_t* _tmp6_ = NULL;
-	EditingToolsPhotoCanvas* _tmp7_ = NULL;
+	cairo_surface_t* _tmp6_;
+	EditingToolsPhotoCanvas* _tmp7_;
 	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	EditingToolsPhotoCanvas* _tmp10_ = NULL;
+	gint _tmp9_;
+	EditingToolsPhotoCanvas* _tmp10_;
 	GdkRectangle _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	cairo_surface_t* _tmp13_ = NULL;
+	gint _tmp12_;
+	cairo_surface_t* _tmp13_;
 	cairo_t* ctx = NULL;
-	cairo_surface_t* _tmp14_ = NULL;
-	cairo_t* _tmp15_ = NULL;
-	cairo_t* _tmp16_ = NULL;
-	cairo_t* _tmp17_ = NULL;
-	EditingToolsPhotoCanvas* _tmp18_ = NULL;
-	GtkWindow* _tmp19_ = NULL;
-	GtkWindow* _tmp20_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp21_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp22_ = NULL;
-	GtkComboBox* _tmp23_ = NULL;
-	GtkListStore* _tmp24_ = NULL;
-	EditingToolsPhotoCanvas* _tmp25_ = NULL;
-	Photo* _tmp26_ = NULL;
-	Photo* _tmp27_ = NULL;
-	gboolean _tmp28_ = FALSE;
-	gboolean _tmp29_ = FALSE;
+	cairo_surface_t* _tmp14_;
+	cairo_t* _tmp15_;
+	cairo_t* _tmp16_;
+	cairo_t* _tmp17_;
+	EditingToolsPhotoCanvas* _tmp18_;
+	GtkWindow* _tmp19_;
+	GtkWindow* _tmp20_;
+	EditingToolsCropToolCropToolWindow* _tmp21_;
+	EditingToolsCropToolCropToolWindow* _tmp22_;
+	GtkComboBox* _tmp23_;
+	GtkListStore* _tmp24_;
+	EditingToolsPhotoCanvas* _tmp25_;
+	Photo* _tmp26_;
+	Photo* _tmp27_;
+	gboolean _tmp28_;
+	gboolean _tmp29_;
 	Dimensions uncropped_dim = {0};
-	EditingToolsPhotoCanvas* _tmp61_ = NULL;
-	Photo* _tmp62_ = NULL;
-	Photo* _tmp63_ = NULL;
+	EditingToolsPhotoCanvas* _tmp61_;
+	Photo* _tmp62_;
+	Photo* _tmp63_;
 	Dimensions _tmp64_ = {0};
-	Dimensions _tmp65_ = {0};
+	Dimensions _tmp65_;
 	Box crop = {0};
-	EditingToolsPhotoCanvas* _tmp66_ = NULL;
-	Photo* _tmp67_ = NULL;
-	Photo* _tmp68_ = NULL;
+	EditingToolsPhotoCanvas* _tmp66_;
+	Photo* _tmp67_;
+	Photo* _tmp68_;
 	Box _tmp69_ = {0};
-	gboolean _tmp70_ = FALSE;
-	gboolean _tmp71_ = FALSE;
-	Dimensions _tmp84_ = {0};
-	EditingToolsPhotoCanvas* _tmp85_ = NULL;
+	gboolean _tmp70_;
+	gboolean _tmp71_;
+	Dimensions _tmp84_;
+	EditingToolsPhotoCanvas* _tmp85_;
 	GdkRectangle _tmp86_ = {0};
 	Dimensions _tmp87_ = {0};
 	Box _tmp88_ = {0};
-	ConfigFacade* _tmp89_ = NULL;
-	ConfigFacade* _tmp90_ = NULL;
-	gint _tmp91_ = 0;
-	ConfigFacade* _tmp92_ = NULL;
-	ConfigFacade* _tmp93_ = NULL;
-	gint _tmp94_ = 0;
-	gint _tmp95_ = 0;
-	gint _tmp96_ = 0;
-	gint _tmp97_ = 0;
-	gint _tmp98_ = 0;
-	EditingToolsPhotoCanvas* _tmp99_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp100_ = NULL;
-	EditingToolsPhotoCanvas* _tmp101_ = NULL;
-	Photo* _tmp102_ = NULL;
-	Photo* _tmp103_ = NULL;
-	gboolean _tmp104_ = FALSE;
-	gboolean _tmp105_ = FALSE;
+	ConfigFacade* _tmp89_;
+	ConfigFacade* _tmp90_;
+	gint _tmp91_;
+	ConfigFacade* _tmp92_;
+	ConfigFacade* _tmp93_;
+	gint _tmp94_;
+	gint _tmp95_;
+	gint _tmp96_;
+	gint _tmp97_;
+	gint _tmp98_;
+	EditingToolsPhotoCanvas* _tmp99_;
+	EditingToolsCropToolCropToolWindow* _tmp100_;
+	EditingToolsPhotoCanvas* _tmp101_;
+	Photo* _tmp102_;
+	Photo* _tmp103_;
+	gboolean _tmp104_;
+	gboolean _tmp105_;
 	Box new_crop = {0};
-	Box _tmp114_ = {0};
+	Box _tmp114_;
 	Box _tmp115_ = {0};
-	Box _tmp116_ = {0};
-	Box _tmp117_ = {0};
-	EditingToolsPhotoCanvas* _tmp118_ = NULL;
-	Box _tmp119_ = {0};
-	EditingToolsPhotoCanvas* _tmp120_ = NULL;
-	gfloat _tmp121_ = 0.0F;
+	Box _tmp116_;
+	Box _tmp117_;
+	EditingToolsPhotoCanvas* _tmp118_;
+	Box _tmp119_;
+	EditingToolsPhotoCanvas* _tmp120_;
+	gfloat _tmp121_;
 #line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8109,7 +8037,7 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		_cairo_surface_destroy0 (self->priv->crop_surface);
 #line 1078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_surface = NULL;
-#line 8113 "EditingTools.c"
+#line 8041 "EditingTools.c"
 	}
 #line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = canvas;
@@ -8181,13 +8109,13 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 	_g_object_unref0 (_tmp27_);
 #line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp29_) {
-#line 8185 "EditingTools.c"
+#line 8113 "EditingTools.c"
 		gint index = 0;
 		EditingToolsCropToolConstraintDescription* desc = NULL;
 		gint _tmp30_ = 0;
-		EditingToolsCropToolConstraintDescription* _tmp31_ = NULL;
+		EditingToolsCropToolConstraintDescription* _tmp31_;
 		gboolean _tmp32_ = FALSE;
-		EditingToolsCropToolConstraintDescription* _tmp33_ = NULL;
+		EditingToolsCropToolConstraintDescription* _tmp33_;
 #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp31_ = editing_tools_crop_tool_get_last_constraint (self, &_tmp30_);
 #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8198,27 +8126,27 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		_tmp33_ = desc;
 #line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp33_ != NULL) {
-#line 8202 "EditingTools.c"
-			EditingToolsCropToolConstraintDescription* _tmp34_ = NULL;
-			gboolean _tmp35_ = FALSE;
+#line 8130 "EditingTools.c"
+			EditingToolsCropToolConstraintDescription* _tmp34_;
+			gboolean _tmp35_;
 #line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp34_ = desc;
 #line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp35_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp34_);
 #line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp32_ = !_tmp35_;
-#line 8211 "EditingTools.c"
+#line 8139 "EditingTools.c"
 		} else {
 #line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp32_ = FALSE;
-#line 8215 "EditingTools.c"
+#line 8143 "EditingTools.c"
 		}
 #line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp32_) {
-#line 8219 "EditingTools.c"
-			EditingToolsCropToolCropToolWindow* _tmp36_ = NULL;
-			GtkComboBox* _tmp37_ = NULL;
-			gint _tmp38_ = 0;
+#line 8147 "EditingTools.c"
+			EditingToolsCropToolCropToolWindow* _tmp36_;
+			GtkComboBox* _tmp37_;
+			gint _tmp38_;
 #line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp36_ = self->priv->crop_tool_window;
 #line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8227,23 +8155,23 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 			_tmp38_ = index;
 #line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_combo_box_set_active (_tmp37_, _tmp38_);
-#line 8231 "EditingTools.c"
+#line 8159 "EditingTools.c"
 		}
 #line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_editing_tools_crop_tool_constraint_description_unref0 (desc);
-#line 8235 "EditingTools.c"
+#line 8163 "EditingTools.c"
 	} else {
 		Photo* photo = NULL;
-		EditingToolsPhotoCanvas* _tmp39_ = NULL;
-		Photo* _tmp40_ = NULL;
+		EditingToolsPhotoCanvas* _tmp39_;
+		Photo* _tmp40_;
 		Dimensions cropped_dim = {0};
-		Photo* _tmp41_ = NULL;
+		Photo* _tmp41_;
 		Dimensions _tmp42_ = {0};
 		gfloat ratio = 0.0F;
-		Dimensions _tmp43_ = {0};
-		gint _tmp44_ = 0;
-		Dimensions _tmp45_ = {0};
-		gint _tmp46_ = 0;
+		Dimensions _tmp43_;
+		gint _tmp44_;
+		Dimensions _tmp45_;
+		gint _tmp46_;
 #line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp39_ = canvas;
 #line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8266,39 +8194,39 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		_tmp46_ = _tmp45_.height;
 #line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		ratio = ((gfloat) _tmp44_) / ((gfloat) _tmp46_);
-#line 8270 "EditingTools.c"
+#line 8198 "EditingTools.c"
 		{
 			gint index = 0;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			index = 1;
-#line 8275 "EditingTools.c"
+#line 8203 "EditingTools.c"
 			{
 				gboolean _tmp47_ = FALSE;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp47_ = TRUE;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				while (TRUE) {
-#line 8282 "EditingTools.c"
-					gint _tmp49_ = 0;
-					EditingToolsCropToolConstraintDescription** _tmp50_ = NULL;
-					gint _tmp50__length1 = 0;
-					gfloat _tmp51_ = 0.0F;
-					EditingToolsCropToolConstraintDescription** _tmp52_ = NULL;
-					gint _tmp52__length1 = 0;
-					gint _tmp53_ = 0;
-					EditingToolsCropToolConstraintDescription* _tmp54_ = NULL;
-					Photo* _tmp55_ = NULL;
-					gfloat _tmp56_ = 0.0F;
-					gdouble _tmp57_ = 0.0;
+#line 8210 "EditingTools.c"
+					gint _tmp49_;
+					EditingToolsCropToolConstraintDescription** _tmp50_;
+					gint _tmp50__length1;
+					gfloat _tmp51_;
+					EditingToolsCropToolConstraintDescription** _tmp52_;
+					gint _tmp52__length1;
+					gint _tmp53_;
+					EditingToolsCropToolConstraintDescription* _tmp54_;
+					Photo* _tmp55_;
+					gfloat _tmp56_;
+					gdouble _tmp57_;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					if (!_tmp47_) {
-#line 8296 "EditingTools.c"
-						gint _tmp48_ = 0;
+#line 8224 "EditingTools.c"
+						gint _tmp48_;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp48_ = index;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						index = _tmp48_ + 1;
-#line 8302 "EditingTools.c"
+#line 8230 "EditingTools.c"
 					}
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp47_ = FALSE;
@@ -8312,7 +8240,7 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 					if (!(_tmp49_ < _tmp50__length1)) {
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						break;
-#line 8316 "EditingTools.c"
+#line 8244 "EditingTools.c"
 					}
 #line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp51_ = ratio;
@@ -8332,10 +8260,10 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 					_tmp57_ = fabs ((gdouble) (_tmp51_ - _tmp56_));
 #line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					if (_tmp57_ < 0.005) {
-#line 8336 "EditingTools.c"
-						EditingToolsCropToolCropToolWindow* _tmp58_ = NULL;
-						GtkComboBox* _tmp59_ = NULL;
-						gint _tmp60_ = 0;
+#line 8264 "EditingTools.c"
+						EditingToolsCropToolCropToolWindow* _tmp58_;
+						GtkComboBox* _tmp59_;
+						gint _tmp60_;
 #line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp58_ = self->priv->crop_tool_window;
 #line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8344,14 +8272,14 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 						_tmp60_ = index;
 #line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						gtk_combo_box_set_active (_tmp59_, _tmp60_);
-#line 8348 "EditingTools.c"
+#line 8276 "EditingTools.c"
 					}
 				}
 			}
 		}
 #line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (photo);
-#line 8355 "EditingTools.c"
+#line 8283 "EditingTools.c"
 	}
 #line 1111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_update_pivot_button_state (self);
@@ -8389,21 +8317,21 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 	_g_object_unref0 (_tmp68_);
 #line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp71_) {
-#line 8393 "EditingTools.c"
+#line 8321 "EditingTools.c"
 		gint xofs = 0;
-		Dimensions _tmp72_ = {0};
-		gint _tmp73_ = 0;
+		Dimensions _tmp72_;
+		gint _tmp73_;
 		gint yofs = 0;
-		Dimensions _tmp74_ = {0};
-		gint _tmp75_ = 0;
-		gint _tmp76_ = 0;
-		gint _tmp77_ = 0;
-		Dimensions _tmp78_ = {0};
-		gint _tmp79_ = 0;
-		gint _tmp80_ = 0;
-		Dimensions _tmp81_ = {0};
-		gint _tmp82_ = 0;
-		gint _tmp83_ = 0;
+		Dimensions _tmp74_;
+		gint _tmp75_;
+		gint _tmp76_;
+		gint _tmp77_;
+		Dimensions _tmp78_;
+		gint _tmp79_;
+		gint _tmp80_;
+		Dimensions _tmp81_;
+		gint _tmp82_;
+		gint _tmp83_;
 #line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp72_ = uncropped_dim;
 #line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8434,7 +8362,7 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		_tmp83_ = yofs;
 #line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_init (&crop, _tmp76_, _tmp77_, _tmp79_ - _tmp80_, _tmp82_ - _tmp83_);
-#line 8438 "EditingTools.c"
+#line 8366 "EditingTools.c"
 	}
 #line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp84_ = uncropped_dim;
@@ -8506,12 +8434,12 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 	_g_object_unref0 (_tmp103_);
 #line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp105_) {
-#line 8510 "EditingTools.c"
+#line 8438 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription* desc = NULL;
-		EditingToolsCropToolConstraintDescription* _tmp106_ = NULL;
+		EditingToolsCropToolConstraintDescription* _tmp106_;
 		gboolean _tmp107_ = FALSE;
 		gboolean _tmp108_ = FALSE;
-		EditingToolsCropToolConstraintDescription* _tmp109_ = NULL;
+		EditingToolsCropToolConstraintDescription* _tmp109_;
 #line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp106_ = editing_tools_crop_tool_get_last_constraint (self, NULL);
 #line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8520,47 +8448,47 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		_tmp109_ = desc;
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp109_ != NULL) {
-#line 8524 "EditingTools.c"
-			EditingToolsCropToolConstraintDescription* _tmp110_ = NULL;
-			gboolean _tmp111_ = FALSE;
+#line 8452 "EditingTools.c"
+			EditingToolsCropToolConstraintDescription* _tmp110_;
+			gboolean _tmp111_;
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp110_ = desc;
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp111_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp110_);
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp108_ = !_tmp111_;
-#line 8533 "EditingTools.c"
+#line 8461 "EditingTools.c"
 		} else {
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp108_ = FALSE;
-#line 8537 "EditingTools.c"
+#line 8465 "EditingTools.c"
 		}
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp108_) {
-#line 8541 "EditingTools.c"
-			EditingToolsCropToolConstraintDescription* _tmp112_ = NULL;
-			gfloat _tmp113_ = 0.0F;
+#line 8469 "EditingTools.c"
+			EditingToolsCropToolConstraintDescription* _tmp112_;
+			gfloat _tmp113_;
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp112_ = desc;
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp113_ = _tmp112_->aspect_ratio;
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp107_ = _tmp113_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO;
-#line 8550 "EditingTools.c"
+#line 8478 "EditingTools.c"
 		} else {
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp107_ = FALSE;
-#line 8554 "EditingTools.c"
+#line 8482 "EditingTools.c"
 		}
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp107_) {
 #line 1152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			editing_tools_crop_tool_set_custom_constraint_mode (self);
-#line 8560 "EditingTools.c"
+#line 8488 "EditingTools.c"
 		}
 #line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_editing_tools_crop_tool_constraint_description_unref0 (desc);
-#line 8564 "EditingTools.c"
+#line 8492 "EditingTools.c"
 	}
 #line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp114_ = self->priv->scaled_crop;
@@ -8592,27 +8520,27 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 	self->priv->pre_aspect_ratio = _tmp121_;
 #line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 8596 "EditingTools.c"
+#line 8524 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) {
 #line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_prepare_ctx ((EditingToolsCropTool*) self, ctx, dim);
-#line 8603 "EditingTools.c"
+#line 8531 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
 #line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_resized_pixbuf ((EditingToolsCropTool*) self, old_dim, scaled, scaled_position);
-#line 8610 "EditingTools.c"
+#line 8538 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	EditingToolsPhotoCanvas* _tmp1_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	EditingToolsPhotoCanvas* _tmp1_;
 #line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8625,15 +8553,15 @@ static void editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool*
 	_tmp1_ = canvas;
 #line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 8629 "EditingTools.c"
+#line 8557 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	EditingToolsPhotoCanvas* _tmp0_;
+	guint _tmp1_;
+	EditingToolsPhotoCanvas* _tmp2_;
+	guint _tmp3_;
 #line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8650,35 +8578,35 @@ static void editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE);
 #line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 8654 "EditingTools.c"
+#line 8582 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_crop_ok ((EditingToolsCropTool*) self);
-#line 8661 "EditingTools.c"
+#line 8589 "EditingTools.c"
 }
 
 
 static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self);
-#line 8668 "EditingTools.c"
+#line 8596 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_changed ((EditingToolsCropTool*) self);
-#line 8675 "EditingTools.c"
+#line 8603 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_pivot_button_clicked ((EditingToolsCropTool*) self);
-#line 8682 "EditingTools.c"
+#line 8610 "EditingTools.c"
 }
 
 
@@ -8687,7 +8615,7 @@ static gboolean _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_foc
 	result = editing_tools_crop_tool_on_width_entry_focus_out ((EditingToolsCropTool*) self, event);
 #line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8691 "EditingTools.c"
+#line 8619 "EditingTools.c"
 }
 
 
@@ -8696,42 +8624,42 @@ static gboolean _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_fo
 	result = editing_tools_crop_tool_on_height_entry_focus_out ((EditingToolsCropTool*) self, event);
 #line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8700 "EditingTools.c"
+#line 8628 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
 #line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_width_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position);
-#line 8707 "EditingTools.c"
+#line 8635 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
 #line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_height_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position);
-#line 8714 "EditingTools.c"
+#line 8642 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool* self) {
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp1_ = NULL;
-	GtkButton* _tmp2_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp3_ = NULL;
-	GtkButton* _tmp4_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp5_ = NULL;
-	GtkComboBox* _tmp6_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp7_ = NULL;
-	GtkButton* _tmp8_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp9_ = NULL;
-	GtkEntry* _tmp10_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp11_ = NULL;
-	GtkEntry* _tmp12_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp13_ = NULL;
-	GtkEntry* _tmp14_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp15_ = NULL;
-	GtkEntry* _tmp16_ = NULL;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	EditingToolsCropToolCropToolWindow* _tmp1_;
+	GtkButton* _tmp2_;
+	EditingToolsCropToolCropToolWindow* _tmp3_;
+	GtkButton* _tmp4_;
+	EditingToolsCropToolCropToolWindow* _tmp5_;
+	GtkComboBox* _tmp6_;
+	EditingToolsCropToolCropToolWindow* _tmp7_;
+	GtkButton* _tmp8_;
+	EditingToolsCropToolCropToolWindow* _tmp9_;
+	GtkEntry* _tmp10_;
+	EditingToolsCropToolCropToolWindow* _tmp11_;
+	GtkEntry* _tmp12_;
+	EditingToolsCropToolCropToolWindow* _tmp13_;
+	GtkEntry* _tmp14_;
+	EditingToolsCropToolCropToolWindow* _tmp15_;
+	GtkEntry* _tmp16_;
 #line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8786,34 +8714,34 @@ static void editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool*
 	_tmp16_ = _tmp15_->custom_height_entry;
 #line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text, self);
-#line 8790 "EditingTools.c"
+#line 8718 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool* self) {
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	EditingToolsCropToolCropToolWindow* _tmp2_ = NULL;
-	GtkButton* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
-	EditingToolsCropToolCropToolWindow* _tmp5_ = NULL;
-	GtkButton* _tmp6_ = NULL;
-	guint _tmp7_ = 0U;
-	EditingToolsCropToolCropToolWindow* _tmp8_ = NULL;
-	GtkComboBox* _tmp9_ = NULL;
-	guint _tmp10_ = 0U;
-	EditingToolsCropToolCropToolWindow* _tmp11_ = NULL;
-	GtkButton* _tmp12_ = NULL;
-	guint _tmp13_ = 0U;
-	EditingToolsCropToolCropToolWindow* _tmp14_ = NULL;
-	GtkEntry* _tmp15_ = NULL;
-	guint _tmp16_ = 0U;
-	EditingToolsCropToolCropToolWindow* _tmp17_ = NULL;
-	GtkEntry* _tmp18_ = NULL;
-	guint _tmp19_ = 0U;
-	EditingToolsCropToolCropToolWindow* _tmp20_ = NULL;
-	GtkEntry* _tmp21_ = NULL;
-	guint _tmp22_ = 0U;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	guint _tmp1_;
+	EditingToolsCropToolCropToolWindow* _tmp2_;
+	GtkButton* _tmp3_;
+	guint _tmp4_;
+	EditingToolsCropToolCropToolWindow* _tmp5_;
+	GtkButton* _tmp6_;
+	guint _tmp7_;
+	EditingToolsCropToolCropToolWindow* _tmp8_;
+	GtkComboBox* _tmp9_;
+	guint _tmp10_;
+	EditingToolsCropToolCropToolWindow* _tmp11_;
+	GtkButton* _tmp12_;
+	guint _tmp13_;
+	EditingToolsCropToolCropToolWindow* _tmp14_;
+	GtkEntry* _tmp15_;
+	guint _tmp16_;
+	EditingToolsCropToolCropToolWindow* _tmp17_;
+	GtkEntry* _tmp18_;
+	guint _tmp19_;
+	EditingToolsCropToolCropToolWindow* _tmp20_;
+	GtkEntry* _tmp21_;
+	guint _tmp22_;
 #line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8878,7 +8806,7 @@ static void editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool
 	g_signal_parse_name ("insert-text", GTK_TYPE_EDITABLE, &_tmp22_, NULL, FALSE);
 #line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp22_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self);
-#line 8882 "EditingTools.c"
+#line 8810 "EditingTools.c"
 }
 
 
@@ -8887,11 +8815,11 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GdkEventKey* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	const gchar* _tmp4_ = NULL;
-	GdkEventKey* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	GdkEventKey* _tmp2_;
+	guint _tmp3_;
+	const gchar* _tmp4_;
+	GdkEventKey* _tmp11_;
+	gboolean _tmp12_;
 #line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8906,11 +8834,11 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
 #line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 8910 "EditingTools.c"
+#line 8838 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp5_ = NULL;
-		guint _tmp6_ = 0U;
-		const gchar* _tmp7_ = NULL;
+		GdkEventKey* _tmp5_;
+		guint _tmp6_;
+		const gchar* _tmp7_;
 #line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = event;
 #line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8919,17 +8847,17 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 		_tmp7_ = gdk_keyval_name (_tmp6_);
 #line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 8923 "EditingTools.c"
+#line 8851 "EditingTools.c"
 	}
 #line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
 #line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 8929 "EditingTools.c"
+#line 8857 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp8_ = NULL;
-		guint _tmp9_ = 0U;
-		const gchar* _tmp10_ = NULL;
+		GdkEventKey* _tmp8_;
+		guint _tmp9_;
+		const gchar* _tmp10_;
 #line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
 #line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8938,7 +8866,7 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 		_tmp10_ = gdk_keyval_name (_tmp9_);
 #line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 8942 "EditingTools.c"
+#line 8870 "EditingTools.c"
 	}
 #line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
@@ -8948,7 +8876,7 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 		result = TRUE;
 #line 1211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 8952 "EditingTools.c"
+#line 8880 "EditingTools.c"
 	}
 #line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
@@ -8958,17 +8886,17 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 	result = _tmp12_;
 #line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8962 "EditingTools.c"
+#line 8890 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropTool* self) {
-	EditingToolsCropToolConstraintDescription* _tmp0_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp1_ = NULL;
-	gfloat _tmp2_ = 0.0F;
-	gboolean _tmp3_ = FALSE;
-	EditingToolsCropToolReticleOrientation _tmp21_ = 0;
-	EditingToolsCropToolReticleOrientation _tmp22_ = 0;
+	EditingToolsCropToolConstraintDescription* _tmp0_;
+	EditingToolsCropToolConstraintDescription* _tmp1_;
+	gfloat _tmp2_;
+	gboolean _tmp3_;
+	EditingToolsCropToolReticleOrientation _tmp21_;
+	EditingToolsCropToolReticleOrientation _tmp22_;
 #line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8983,27 +8911,27 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp1_);
 #line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_) {
-#line 8987 "EditingTools.c"
+#line 8915 "EditingTools.c"
 		gchar* width_text = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp4_ = NULL;
-		GtkEntry* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		EditingToolsCropToolCropToolWindow* _tmp4_;
+		GtkEntry* _tmp5_;
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
 		gchar* height_text = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp8_ = NULL;
-		GtkEntry* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp12_ = NULL;
-		GtkEntry* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp15_ = NULL;
-		GtkEntry* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
+		EditingToolsCropToolCropToolWindow* _tmp8_;
+		GtkEntry* _tmp9_;
+		const gchar* _tmp10_;
+		gchar* _tmp11_;
+		EditingToolsCropToolCropToolWindow* _tmp12_;
+		GtkEntry* _tmp13_;
+		const gchar* _tmp14_;
+		EditingToolsCropToolCropToolWindow* _tmp15_;
+		GtkEntry* _tmp16_;
+		const gchar* _tmp17_;
 		gint temp = 0;
-		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
-		gint _tmp20_ = 0;
+		gint _tmp18_;
+		gint _tmp19_;
+		gint _tmp20_;
 #line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->crop_tool_window;
 #line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9056,7 +8984,7 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
 		_g_free0 (height_text);
 #line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (width_text);
-#line 9060 "EditingTools.c"
+#line 8988 "EditingTools.c"
 	}
 #line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->reticle_orientation;
@@ -9066,36 +8994,36 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
 	self->priv->reticle_orientation = _tmp22_;
 #line 1229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_changed (self);
-#line 9070 "EditingTools.c"
+#line 8998 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* base) {
 	EditingToolsCropTool * self;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp2_ = NULL;
-	EditingToolsPhotoCanvas* _tmp5_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	EditingToolsCropToolCropToolWindow* _tmp2_;
+	EditingToolsPhotoCanvas* _tmp5_;
 #line 1232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 9085 "EditingTools.c"
-		EditingToolsPhotoCanvas* _tmp1_ = NULL;
+#line 9013 "EditingTools.c"
+		EditingToolsPhotoCanvas* _tmp1_;
 #line 1234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_unbind_canvas_handlers (self, _tmp1_);
-#line 9091 "EditingTools.c"
+#line 9019 "EditingTools.c"
 	}
 #line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
 #line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ != NULL) {
-#line 9097 "EditingTools.c"
-		EditingToolsCropToolCropToolWindow* _tmp3_ = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp4_ = NULL;
+#line 9025 "EditingTools.c"
+		EditingToolsCropToolCropToolWindow* _tmp3_;
+		EditingToolsCropToolCropToolWindow* _tmp4_;
 #line 1237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_unbind_window_handlers (self);
 #line 1238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9110,25 +9038,25 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 		_g_object_unref0 (self->priv->crop_tool_window);
 #line 1240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_tool_window = NULL;
-#line 9114 "EditingTools.c"
+#line 9042 "EditingTools.c"
 	}
 #line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ != NULL) {
-#line 9120 "EditingTools.c"
+#line 9048 "EditingTools.c"
 		GdkWindow* drawing_window = NULL;
-		EditingToolsPhotoCanvas* _tmp6_ = NULL;
-		GdkWindow* _tmp7_ = NULL;
+		EditingToolsPhotoCanvas* _tmp6_;
+		GdkWindow* _tmp7_;
 		GdkDisplay* display = NULL;
-		GdkWindow* _tmp8_ = NULL;
-		GdkDisplay* _tmp9_ = NULL;
-		GdkDisplay* _tmp10_ = NULL;
+		GdkWindow* _tmp8_;
+		GdkDisplay* _tmp9_;
+		GdkDisplay* _tmp10_;
 		GdkCursor* cursor = NULL;
-		GdkDisplay* _tmp11_ = NULL;
-		GdkCursor* _tmp12_ = NULL;
-		GdkWindow* _tmp13_ = NULL;
-		GdkCursor* _tmp14_ = NULL;
+		GdkDisplay* _tmp11_;
+		GdkCursor* _tmp12_;
+		GdkWindow* _tmp13_;
+		GdkCursor* _tmp14_;
 #line 1245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9161,7 +9089,7 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 		_g_object_unref0 (display);
 #line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (drawing_window);
-#line 9165 "EditingTools.c"
+#line 9093 "EditingTools.c"
 	}
 #line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
@@ -9169,15 +9097,15 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 	self->priv->crop_surface = NULL;
 #line 1254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 9173 "EditingTools.c"
+#line 9101 "EditingTools.c"
 }
 
 
 static EditingToolsEditingToolWindow* editing_tools_crop_tool_real_get_tool_window (EditingToolsEditingTool* base) {
 	EditingToolsCropTool * self;
 	EditingToolsEditingToolWindow* result = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	EditingToolsEditingToolWindow* _tmp1_ = NULL;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	EditingToolsEditingToolWindow* _tmp1_;
 #line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9188,7 +9116,7 @@ static EditingToolsEditingToolWindow* editing_tools_crop_tool_real_get_tool_wind
 	result = _tmp1_;
 #line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 9192 "EditingTools.c"
+#line 9120 "EditingTools.c"
 }
 
 
@@ -9196,13 +9124,13 @@ static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsE
 	EditingToolsCropTool * self;
 	Dimensions _vala_max_dim = {0};
 	GdkPixbuf* result = NULL;
-	Photo* _tmp0_ = NULL;
+	Photo* _tmp0_;
 	Dimensions _tmp1_ = {0};
 	GdkPixbuf* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	Scaling _tmp4_ = {0};
-	GdkPixbuf* _tmp5_ = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
+	Photo* _tmp3_;
+	Scaling _tmp4_;
+	GdkPixbuf* _tmp5_;
+	GdkPixbuf* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 1261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
@@ -9230,7 +9158,7 @@ static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsE
 		g_propagate_error (error, _inner_error_);
 #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return NULL;
-#line 9234 "EditingTools.c"
+#line 9162 "EditingTools.c"
 	}
 #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp2_;
@@ -9244,34 +9172,34 @@ static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsE
 	if (max_dim) {
 #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 9248 "EditingTools.c"
+#line 9176 "EditingTools.c"
 	}
 #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 9252 "EditingTools.c"
+#line 9180 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, cairo_t* ctx, Dimensions* dim) {
-	cairo_t* _tmp0_ = NULL;
-	cairo_surface_t* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
-	cairo_t* _tmp3_ = NULL;
-	cairo_t* _tmp4_ = NULL;
-	cairo_t* _tmp5_ = NULL;
-	cairo_surface_t* _tmp6_ = NULL;
-	cairo_t* _tmp7_ = NULL;
-	cairo_t* _tmp8_ = NULL;
-	cairo_t* _tmp9_ = NULL;
-	cairo_t* _tmp10_ = NULL;
-	cairo_surface_t* _tmp11_ = NULL;
-	cairo_t* _tmp12_ = NULL;
-	cairo_t* _tmp13_ = NULL;
-	cairo_t* _tmp14_ = NULL;
-	cairo_t* _tmp15_ = NULL;
-	cairo_surface_t* _tmp16_ = NULL;
-	cairo_t* _tmp17_ = NULL;
-	cairo_t* _tmp18_ = NULL;
+	cairo_t* _tmp0_;
+	cairo_surface_t* _tmp1_;
+	cairo_t* _tmp2_;
+	cairo_t* _tmp3_;
+	cairo_t* _tmp4_;
+	cairo_t* _tmp5_;
+	cairo_surface_t* _tmp6_;
+	cairo_t* _tmp7_;
+	cairo_t* _tmp8_;
+	cairo_t* _tmp9_;
+	cairo_t* _tmp10_;
+	cairo_surface_t* _tmp11_;
+	cairo_t* _tmp12_;
+	cairo_t* _tmp13_;
+	cairo_t* _tmp14_;
+	cairo_t* _tmp15_;
+	cairo_surface_t* _tmp16_;
+	cairo_t* _tmp17_;
+	cairo_t* _tmp18_;
 #line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9346,38 +9274,38 @@ static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, cai
 	_tmp18_ = self->priv->text_ctx;
 #line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_select_font_face (_tmp18_, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-#line 9350 "EditingTools.c"
+#line 9278 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position) {
 	Dimensions new_dim = {0};
-	GdkPixbuf* _tmp0_ = NULL;
+	GdkPixbuf* _tmp0_;
 	Dimensions _tmp1_ = {0};
 	Dimensions uncropped_dim = {0};
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
+	EditingToolsPhotoCanvas* _tmp2_;
+	Photo* _tmp3_;
+	Photo* _tmp4_;
 	Dimensions _tmp5_ = {0};
-	Dimensions _tmp6_ = {0};
+	Dimensions _tmp6_;
 	Box crop = {0};
-	Dimensions _tmp7_ = {0};
-	Dimensions _tmp8_ = {0};
+	Dimensions _tmp7_;
+	Dimensions _tmp8_;
 	Box _tmp9_ = {0};
-	Dimensions _tmp10_ = {0};
-	Dimensions _tmp11_ = {0};
+	Dimensions _tmp10_;
+	Dimensions _tmp11_;
 	Box _tmp12_ = {0};
-	cairo_surface_t* _tmp13_ = NULL;
-	GdkPixbuf* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	GdkPixbuf* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	cairo_surface_t* _tmp20_ = NULL;
+	cairo_surface_t* _tmp13_;
+	GdkPixbuf* _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	GdkPixbuf* _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	cairo_surface_t* _tmp20_;
 	cairo_t* ctx = NULL;
-	cairo_surface_t* _tmp21_ = NULL;
-	cairo_t* _tmp22_ = NULL;
+	cairo_surface_t* _tmp21_;
+	cairo_t* _tmp22_;
 #line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9430,7 +9358,7 @@ static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* sel
 		_cairo_surface_destroy0 (self->priv->crop_surface);
 #line 1295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_surface = NULL;
-#line 9434 "EditingTools.c"
+#line 9362 "EditingTools.c"
 	}
 #line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = scaled;
@@ -9462,33 +9390,33 @@ static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* sel
 	cairo_paint (ctx);
 #line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 9466 "EditingTools.c"
+#line 9394 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y) {
 	EditingToolsCropTool * self;
 	GdkRectangle scaled_pixbuf_pos = {0};
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 	GdkRectangle _tmp1_ = {0};
 	Box offset_scaled_crop = {0};
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
 	Box _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	BoxLocation _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	GdkRectangle _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	GdkRectangle _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	EditingToolsPhotoCanvas* _tmp18_ = NULL;
+	gint _tmp7_;
+	gint _tmp8_;
+	BoxLocation _tmp9_;
+	gint _tmp10_;
+	GdkRectangle _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	GdkRectangle _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	EditingToolsPhotoCanvas* _tmp18_;
 #line 1304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9545,16 +9473,16 @@ static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool*
 	_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp18_);
-#line 9549 "EditingTools.c"
+#line 9477 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y) {
 	EditingToolsCropTool * self;
-	BoxLocation _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	EditingToolsPhotoCanvas* _tmp3_ = NULL;
+	BoxLocation _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	EditingToolsPhotoCanvas* _tmp3_;
 #line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9563,7 +9491,7 @@ static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTo
 	if (_tmp0_ == BOX_LOCATION_OUTSIDE) {
 #line 1322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 9567 "EditingTools.c"
+#line 9495 "EditingTools.c"
 	}
 #line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->in_manipulation = BOX_LOCATION_OUTSIDE;
@@ -9581,32 +9509,32 @@ static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTo
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp3_);
-#line 9585 "EditingTools.c"
+#line 9513 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) {
 	EditingToolsCropTool * self;
-	BoxLocation _tmp0_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	EditingToolsPhotoCanvas* _tmp5_ = NULL;
+	BoxLocation _tmp0_;
+	gint _tmp3_;
+	gint _tmp4_;
+	EditingToolsPhotoCanvas* _tmp5_;
 #line 1335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->in_manipulation;
 #line 1338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != BOX_LOCATION_OUTSIDE) {
-#line 9601 "EditingTools.c"
-		gint _tmp1_ = 0;
-		gint _tmp2_ = 0;
+#line 9529 "EditingTools.c"
+		gint _tmp1_;
+		gint _tmp2_;
 #line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
 #line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = y;
 #line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_on_canvas_manipulation (self, _tmp1_, _tmp2_);
-#line 9610 "EditingTools.c"
+#line 9538 "EditingTools.c"
 	}
 #line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = x;
@@ -9618,40 +9546,40 @@ static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* bas
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp5_);
-#line 9622 "EditingTools.c"
+#line 9550 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, cairo_t* default_ctx) {
 	EditingToolsCropTool * self;
 	gint w = 0;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	GdkWindow* _tmp1_ = NULL;
-	GdkWindow* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	EditingToolsPhotoCanvas* _tmp0_;
+	GdkWindow* _tmp1_;
+	GdkWindow* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	gint h = 0;
-	EditingToolsPhotoCanvas* _tmp5_ = NULL;
-	GdkWindow* _tmp6_ = NULL;
-	GdkWindow* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	cairo_t* _tmp10_ = NULL;
-	cairo_t* _tmp11_ = NULL;
-	cairo_t* _tmp12_ = NULL;
-	cairo_t* _tmp13_ = NULL;
+	EditingToolsPhotoCanvas* _tmp5_;
+	GdkWindow* _tmp6_;
+	GdkWindow* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	cairo_t* _tmp10_;
+	cairo_t* _tmp11_;
+	cairo_t* _tmp12_;
+	cairo_t* _tmp13_;
 	cairo_t* ctx = NULL;
-	cairo_surface_t* _tmp14_ = NULL;
-	cairo_t* _tmp15_ = NULL;
-	Box _tmp16_ = {0};
-	gint _tmp17_ = 0;
-	Box _tmp18_ = {0};
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	EditingToolsPhotoCanvas* _tmp22_ = NULL;
-	cairo_surface_t* _tmp23_ = NULL;
-	Box _tmp24_ = {0};
+	cairo_surface_t* _tmp14_;
+	cairo_t* _tmp15_;
+	Box _tmp16_;
+	gint _tmp17_;
+	Box _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
+	EditingToolsPhotoCanvas* _tmp22_;
+	cairo_surface_t* _tmp23_;
+	Box _tmp24_;
 #line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9742,50 +9670,50 @@ static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, c
 	editing_tools_crop_tool_paint_crop_tool (self, &_tmp24_);
 #line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 9746 "EditingTools.c"
+#line 9674 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self) {
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp2_ = NULL;
-	GtkComboBox* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	ConfigFacade* _tmp5_ = NULL;
-	ConfigFacade* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	ConfigFacade* _tmp8_ = NULL;
-	ConfigFacade* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	EditingToolsCropToolCropToolWindow* _tmp2_;
+	GtkComboBox* _tmp3_;
+	gint _tmp4_;
+	ConfigFacade* _tmp5_;
+	ConfigFacade* _tmp6_;
+	gint _tmp7_;
+	ConfigFacade* _tmp8_;
+	ConfigFacade* _tmp9_;
+	gint _tmp10_;
 	Box crop = {0};
-	EditingToolsPhotoCanvas* _tmp11_ = NULL;
+	EditingToolsPhotoCanvas* _tmp11_;
 	GdkRectangle _tmp12_ = {0};
 	Dimensions _tmp13_ = {0};
-	EditingToolsPhotoCanvas* _tmp14_ = NULL;
-	Photo* _tmp15_ = NULL;
-	Photo* _tmp16_ = NULL;
+	EditingToolsPhotoCanvas* _tmp14_;
+	Photo* _tmp15_;
+	Photo* _tmp16_;
 	Dimensions _tmp17_ = {0};
 	Box _tmp18_ = {0};
-	Box _tmp19_ = {0};
+	Box _tmp19_;
 	GdkPixbuf* cropped = NULL;
-	EditingToolsPhotoCanvas* _tmp20_ = NULL;
-	GdkPixbuf* _tmp21_ = NULL;
-	GdkPixbuf* _tmp22_ = NULL;
-	Box _tmp23_ = {0};
-	gint _tmp24_ = 0;
-	Box _tmp25_ = {0};
-	gint _tmp26_ = 0;
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
-	GdkPixbuf* _tmp29_ = NULL;
-	GdkPixbuf* _tmp30_ = NULL;
-	EditingToolsPhotoCanvas* _tmp31_ = NULL;
-	Photo* _tmp32_ = NULL;
-	Photo* _tmp33_ = NULL;
-	Box _tmp34_ = {0};
-	CropCommand* _tmp35_ = NULL;
-	CropCommand* _tmp36_ = NULL;
+	EditingToolsPhotoCanvas* _tmp20_;
+	GdkPixbuf* _tmp21_;
+	GdkPixbuf* _tmp22_;
+	Box _tmp23_;
+	gint _tmp24_;
+	Box _tmp25_;
+	gint _tmp26_;
+	gint _tmp27_;
+	gint _tmp28_;
+	GdkPixbuf* _tmp29_;
+	GdkPixbuf* _tmp30_;
+	EditingToolsPhotoCanvas* _tmp31_;
+	Photo* _tmp32_;
+	Photo* _tmp33_;
+	Box _tmp34_;
+	CropCommand* _tmp35_;
+	CropCommand* _tmp36_;
 	Dimensions _tmp37_ = {0};
 #line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
@@ -9886,33 +9814,33 @@ static void editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self) {
 #line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_dimensions (&crop, &_tmp37_);
 #line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_COMMAND, Command), cropped, &_tmp37_, TRUE);
+	g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_COMMAND, Command), cropped, &_tmp37_, TRUE);
 #line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp36_);
 #line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp33_);
 #line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (cropped);
-#line 9897 "EditingTools.c"
+#line 9825 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, gint x, gint y) {
 	GdkRectangle scaled_pos = {0};
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 	GdkRectangle _tmp1_ = {0};
 	Box offset_scaled_crop = {0};
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
 	Box _tmp6_ = {0};
 	GdkCursorType cursor_type = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	BoxLocation _tmp9_ = 0;
-	GdkCursorType _tmp10_ = 0;
-	GdkCursorType _tmp11_ = 0;
+	gint _tmp7_;
+	gint _tmp8_;
+	BoxLocation _tmp9_;
+	GdkCursorType _tmp10_;
+	GdkCursorType _tmp11_;
 #line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9945,99 +9873,99 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 	switch (_tmp9_) {
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_LEFT_SIDE:
-#line 9949 "EditingTools.c"
+#line 9877 "EditingTools.c"
 		{
 #line 1403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_LEFT_SIDE;
 #line 1404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9955 "EditingTools.c"
+#line 9883 "EditingTools.c"
 		}
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_SIDE:
-#line 9959 "EditingTools.c"
+#line 9887 "EditingTools.c"
 		{
 #line 1407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_SIDE;
 #line 1408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9965 "EditingTools.c"
+#line 9893 "EditingTools.c"
 		}
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_RIGHT_SIDE:
-#line 9969 "EditingTools.c"
+#line 9897 "EditingTools.c"
 		{
 #line 1411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_RIGHT_SIDE;
 #line 1412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9975 "EditingTools.c"
+#line 9903 "EditingTools.c"
 		}
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_SIDE:
-#line 9979 "EditingTools.c"
+#line 9907 "EditingTools.c"
 		{
 #line 1415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_SIDE;
 #line 1416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9985 "EditingTools.c"
+#line 9913 "EditingTools.c"
 		}
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_LEFT:
-#line 9989 "EditingTools.c"
+#line 9917 "EditingTools.c"
 		{
 #line 1419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_LEFT_CORNER;
 #line 1420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9995 "EditingTools.c"
+#line 9923 "EditingTools.c"
 		}
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_LEFT:
-#line 9999 "EditingTools.c"
+#line 9927 "EditingTools.c"
 		{
 #line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_LEFT_CORNER;
 #line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10005 "EditingTools.c"
+#line 9933 "EditingTools.c"
 		}
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_RIGHT:
-#line 10009 "EditingTools.c"
+#line 9937 "EditingTools.c"
 		{
 #line 1427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_RIGHT_CORNER;
 #line 1428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10015 "EditingTools.c"
+#line 9943 "EditingTools.c"
 		}
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_RIGHT:
-#line 10019 "EditingTools.c"
+#line 9947 "EditingTools.c"
 		{
 #line 1431 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_RIGHT_CORNER;
 #line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10025 "EditingTools.c"
+#line 9953 "EditingTools.c"
 		}
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_INSIDE:
-#line 10029 "EditingTools.c"
+#line 9957 "EditingTools.c"
 		{
 #line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_FLEUR;
 #line 1436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10035 "EditingTools.c"
+#line 9963 "EditingTools.c"
 		}
 		default:
 		{
 #line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10041 "EditingTools.c"
+#line 9969 "EditingTools.c"
 		}
 	}
 #line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10046,21 +9974,21 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 	_tmp11_ = self->priv->current_cursor_type;
 #line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != _tmp11_) {
-#line 10050 "EditingTools.c"
+#line 9978 "EditingTools.c"
 		GdkWindow* drawing_window = NULL;
-		EditingToolsPhotoCanvas* _tmp12_ = NULL;
-		GdkWindow* _tmp13_ = NULL;
+		EditingToolsPhotoCanvas* _tmp12_;
+		GdkWindow* _tmp13_;
 		GdkDisplay* display = NULL;
-		GdkWindow* _tmp14_ = NULL;
-		GdkDisplay* _tmp15_ = NULL;
-		GdkDisplay* _tmp16_ = NULL;
+		GdkWindow* _tmp14_;
+		GdkDisplay* _tmp15_;
+		GdkDisplay* _tmp16_;
 		GdkCursor* cursor = NULL;
-		GdkDisplay* _tmp17_ = NULL;
-		GdkCursorType _tmp18_ = 0;
-		GdkCursor* _tmp19_ = NULL;
-		GdkWindow* _tmp20_ = NULL;
-		GdkCursor* _tmp21_ = NULL;
-		GdkCursorType _tmp22_ = 0;
+		GdkDisplay* _tmp17_;
+		GdkCursorType _tmp18_;
+		GdkCursor* _tmp19_;
+		GdkWindow* _tmp20_;
+		GdkCursor* _tmp21_;
+		GdkCursorType _tmp22_;
 #line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10099,7 +10027,7 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 		_g_object_unref0 (display);
 #line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (drawing_window);
-#line 10103 "EditingTools.c"
+#line 10031 "EditingTools.c"
 	}
 }
 
@@ -10107,14 +10035,14 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self, gdouble center_x, gdouble center_y, gdouble bounds_x, gdouble bounds_y, gdouble user_x) {
 	gint result = 0;
 	gdouble decision_slope = 0.0;
-	gdouble _tmp0_ = 0.0;
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
+	gdouble _tmp0_;
+	gdouble _tmp1_;
+	gdouble _tmp2_;
+	gdouble _tmp3_;
 	gdouble decision_intercept = 0.0;
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
 #line 1452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0);
 #line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10139,42 +10067,42 @@ static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self
 	result = (gint) ((decision_slope * _tmp6_) + decision_intercept);
 #line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 10143 "EditingTools.c"
+#line 10071 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool* self, Dimensions* result) {
 	Dimensions photo_dims = {0};
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
 	Dimensions _tmp3_ = {0};
-	Dimensions _tmp4_ = {0};
+	Dimensions _tmp4_;
 	Dimensions surface_dims = {0};
-	EditingToolsPhotoCanvas* _tmp5_ = NULL;
+	EditingToolsPhotoCanvas* _tmp5_;
 	Dimensions _tmp6_ = {0};
 	gdouble scale_factor = 0.0;
-	Dimensions _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	Dimensions _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	Dimensions _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	Dimensions _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	gdouble _tmp15_ = 0.0;
-	gdouble _tmp16_ = 0.0;
-	gdouble _tmp17_ = 0.0;
-	EditingToolsPhotoCanvas* _tmp18_ = NULL;
-	Photo* _tmp19_ = NULL;
-	Photo* _tmp20_ = NULL;
+	Dimensions _tmp7_;
+	gint _tmp8_;
+	Dimensions _tmp9_;
+	gint _tmp10_;
+	Dimensions _tmp11_;
+	gint _tmp12_;
+	Dimensions _tmp13_;
+	gint _tmp14_;
+	gdouble _tmp15_;
+	gdouble _tmp16_;
+	gdouble _tmp17_;
+	EditingToolsPhotoCanvas* _tmp18_;
+	Photo* _tmp19_;
+	Photo* _tmp20_;
 	Dimensions _tmp21_ = {0};
-	Dimensions _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	gdouble _tmp24_ = 0.0;
-	Dimensions _tmp25_ = {0};
-	gint _tmp26_ = 0;
-	gdouble _tmp27_ = 0.0;
+	Dimensions _tmp22_;
+	gint _tmp23_;
+	gdouble _tmp24_;
+	Dimensions _tmp25_;
+	gint _tmp26_;
+	gdouble _tmp27_;
 	Dimensions _tmp28_ = {0};
 #line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
@@ -10256,109 +10184,109 @@ static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool*
 	*result = _tmp28_;
 #line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 10260 "EditingTools.c"
+#line 10188 "EditingTools.c"
 }
 
 
-static gboolean _box_equal (const Box* s1, const Box* s2) {
+static gboolean _box_equal (const Box * s1, const Box * s2) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1 == s2) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return TRUE;
-#line 10269 "EditingTools.c"
+#line 10197 "EditingTools.c"
 	}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1 == NULL) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10275 "EditingTools.c"
+#line 10203 "EditingTools.c"
 	}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s2 == NULL) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10281 "EditingTools.c"
+#line 10209 "EditingTools.c"
 	}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->left != s2->left) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10287 "EditingTools.c"
+#line 10215 "EditingTools.c"
 	}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->top != s2->top) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10293 "EditingTools.c"
+#line 10221 "EditingTools.c"
 	}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->right != s2->right) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10299 "EditingTools.c"
+#line 10227 "EditingTools.c"
 	}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->bottom != s2->bottom) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10305 "EditingTools.c"
+#line 10233 "EditingTools.c"
 	}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return TRUE;
-#line 10309 "EditingTools.c"
+#line 10237 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCropTool* self, gint x, gint y) {
 	gboolean result = FALSE;
 	GdkRectangle scaled_pos = {0};
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 	GdkRectangle _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	GdkRectangle _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp11_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
+	gint _tmp2_;
+	GdkRectangle _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp11_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
 	gint left = 0;
-	Box _tmp20_ = {0};
-	gint _tmp21_ = 0;
+	Box _tmp20_;
+	gint _tmp21_;
 	gint top = 0;
-	Box _tmp22_ = {0};
-	gint _tmp23_ = 0;
+	Box _tmp22_;
+	gint _tmp23_;
 	gint right = 0;
-	Box _tmp24_ = {0};
-	gint _tmp25_ = 0;
+	Box _tmp24_;
+	gint _tmp25_;
 	gint bottom = 0;
-	Box _tmp26_ = {0};
-	gint _tmp27_ = 0;
+	Box _tmp26_;
+	gint _tmp27_;
 	gint center_x = 0;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
+	gint _tmp28_;
+	gint _tmp29_;
 	gint center_y = 0;
-	gint _tmp30_ = 0;
-	gint _tmp31_ = 0;
-	BoxLocation _tmp32_ = 0;
+	gint _tmp30_;
+	gint _tmp31_;
+	BoxLocation _tmp32_;
 	gint width = 0;
-	gint _tmp199_ = 0;
-	gint _tmp200_ = 0;
+	gint _tmp199_;
+	gint _tmp200_;
 	gint height = 0;
-	gint _tmp201_ = 0;
-	gint _tmp202_ = 0;
+	gint _tmp201_;
+	gint _tmp202_;
 	Dimensions photo_dims = {0};
 	Dimensions _tmp203_ = {0};
 	gdouble angle = 0.0;
-	EditingToolsPhotoCanvas* _tmp204_ = NULL;
-	Photo* _tmp205_ = NULL;
-	Photo* _tmp206_ = NULL;
+	EditingToolsPhotoCanvas* _tmp204_;
+	Photo* _tmp205_;
+	Photo* _tmp206_;
 	gdouble _tmp207_ = 0.0;
 	Box new_crop = {0};
-	gfloat _tmp208_ = 0.0F;
-	BoxLocation _tmp254_ = 0;
-	Box _tmp257_ = {0};
-	gfloat _tmp258_ = 0.0F;
+	gfloat _tmp208_;
+	BoxLocation _tmp254_;
+	Box _tmp257_;
+	gfloat _tmp258_;
 #line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
 #line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10381,11 +10309,11 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	if (_tmp5_ < 0) {
 #line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = 0;
-#line 10385 "EditingTools.c"
+#line 10313 "EditingTools.c"
 	} else {
-		gint _tmp6_ = 0;
-		GdkRectangle _tmp7_ = {0};
-		gint _tmp8_ = 0;
+		gint _tmp6_;
+		GdkRectangle _tmp7_;
+		gint _tmp8_;
 #line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = x;
 #line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10394,16 +10322,16 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		_tmp8_ = _tmp7_.width;
 #line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ >= _tmp8_) {
-#line 10398 "EditingTools.c"
-			GdkRectangle _tmp9_ = {0};
-			gint _tmp10_ = 0;
+#line 10326 "EditingTools.c"
+			GdkRectangle _tmp9_;
+			gint _tmp10_;
 #line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = scaled_pos;
 #line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp10_ = _tmp9_.width;
 #line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			x = _tmp10_ - 1;
-#line 10407 "EditingTools.c"
+#line 10335 "EditingTools.c"
 		}
 	}
 #line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10420,11 +10348,11 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	if (_tmp14_ < 0) {
 #line 1488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = 0;
-#line 10424 "EditingTools.c"
+#line 10352 "EditingTools.c"
 	} else {
-		gint _tmp15_ = 0;
-		GdkRectangle _tmp16_ = {0};
-		gint _tmp17_ = 0;
+		gint _tmp15_;
+		GdkRectangle _tmp16_;
+		gint _tmp17_;
 #line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = y;
 #line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10433,16 +10361,16 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		_tmp17_ = _tmp16_.height;
 #line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp15_ >= _tmp17_) {
-#line 10437 "EditingTools.c"
-			GdkRectangle _tmp18_ = {0};
-			gint _tmp19_ = 0;
+#line 10365 "EditingTools.c"
+			GdkRectangle _tmp18_;
+			gint _tmp19_;
 #line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = scaled_pos;
 #line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp19_ = _tmp18_.height;
 #line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			y = _tmp19_ - 1;
-#line 10446 "EditingTools.c"
+#line 10374 "EditingTools.c"
 		}
 	}
 #line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10487,10 +10415,10 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	switch (_tmp32_) {
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_LEFT_SIDE:
-#line 10491 "EditingTools.c"
+#line 10419 "EditingTools.c"
 		{
-			gint _tmp33_ = 0;
-			gfloat _tmp34_ = 0.0F;
+			gint _tmp33_;
+			gfloat _tmp34_;
 #line 1505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp33_ = x;
 #line 1505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10499,13 +10427,13 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp34_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp34_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10503 "EditingTools.c"
+#line 10431 "EditingTools.c"
 				gfloat new_height = 0.0F;
-				gint _tmp35_ = 0;
-				gint _tmp36_ = 0;
-				gfloat _tmp37_ = 0.0F;
-				gint _tmp38_ = 0;
-				gfloat _tmp39_ = 0.0F;
+				gint _tmp35_;
+				gint _tmp36_;
+				gfloat _tmp37_;
+				gint _tmp38_;
+				gfloat _tmp39_;
 #line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp35_ = right;
 #line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10520,18 +10448,18 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp39_ = new_height;
 #line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp38_ + ((gint) _tmp39_);
-#line 10524 "EditingTools.c"
+#line 10452 "EditingTools.c"
 			}
 #line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10528 "EditingTools.c"
+#line 10456 "EditingTools.c"
 		}
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_SIDE:
-#line 10532 "EditingTools.c"
+#line 10460 "EditingTools.c"
 		{
-			gint _tmp40_ = 0;
-			gfloat _tmp41_ = 0.0F;
+			gint _tmp40_;
+			gfloat _tmp41_;
 #line 1513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp40_ = y;
 #line 1513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10540,13 +10468,13 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp41_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp41_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10544 "EditingTools.c"
+#line 10472 "EditingTools.c"
 				gfloat new_width = 0.0F;
-				gint _tmp42_ = 0;
-				gint _tmp43_ = 0;
-				gfloat _tmp44_ = 0.0F;
-				gint _tmp45_ = 0;
-				gfloat _tmp46_ = 0.0F;
+				gint _tmp42_;
+				gint _tmp43_;
+				gfloat _tmp44_;
+				gint _tmp45_;
+				gfloat _tmp46_;
 #line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp42_ = bottom;
 #line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10561,18 +10489,18 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp46_ = new_width;
 #line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp45_ + ((gint) _tmp46_);
-#line 10565 "EditingTools.c"
+#line 10493 "EditingTools.c"
 			}
 #line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10569 "EditingTools.c"
+#line 10497 "EditingTools.c"
 		}
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_RIGHT_SIDE:
-#line 10573 "EditingTools.c"
+#line 10501 "EditingTools.c"
 		{
-			gint _tmp47_ = 0;
-			gfloat _tmp48_ = 0.0F;
+			gint _tmp47_;
+			gfloat _tmp48_;
 #line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp47_ = x;
 #line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10581,13 +10509,13 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp48_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp48_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10585 "EditingTools.c"
+#line 10513 "EditingTools.c"
 				gfloat new_height = 0.0F;
-				gint _tmp49_ = 0;
-				gint _tmp50_ = 0;
-				gfloat _tmp51_ = 0.0F;
-				gint _tmp52_ = 0;
-				gfloat _tmp53_ = 0.0F;
+				gint _tmp49_;
+				gint _tmp50_;
+				gfloat _tmp51_;
+				gint _tmp52_;
+				gfloat _tmp53_;
 #line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp49_ = right;
 #line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10602,18 +10530,18 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp53_ = new_height;
 #line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp52_ + ((gint) _tmp53_);
-#line 10606 "EditingTools.c"
+#line 10534 "EditingTools.c"
 			}
 #line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10610 "EditingTools.c"
+#line 10538 "EditingTools.c"
 		}
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_SIDE:
-#line 10614 "EditingTools.c"
+#line 10542 "EditingTools.c"
 		{
-			gint _tmp54_ = 0;
-			gfloat _tmp55_ = 0.0F;
+			gint _tmp54_;
+			gfloat _tmp55_;
 #line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp54_ = y;
 #line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10622,13 +10550,13 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp55_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp55_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10626 "EditingTools.c"
+#line 10554 "EditingTools.c"
 				gfloat new_width = 0.0F;
-				gint _tmp56_ = 0;
-				gint _tmp57_ = 0;
-				gfloat _tmp58_ = 0.0F;
-				gint _tmp59_ = 0;
-				gfloat _tmp60_ = 0.0F;
+				gint _tmp56_;
+				gint _tmp57_;
+				gfloat _tmp58_;
+				gint _tmp59_;
+				gfloat _tmp60_;
 #line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp56_ = bottom;
 #line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10643,24 +10571,24 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp60_ = new_width;
 #line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp59_ + ((gint) _tmp60_);
-#line 10647 "EditingTools.c"
+#line 10575 "EditingTools.c"
 			}
 #line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10651 "EditingTools.c"
+#line 10579 "EditingTools.c"
 		}
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_LEFT:
-#line 10655 "EditingTools.c"
+#line 10583 "EditingTools.c"
 		{
-			gfloat _tmp61_ = 0.0F;
+			gfloat _tmp61_;
 #line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp61_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp61_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10662 "EditingTools.c"
-				gint _tmp62_ = 0;
-				gint _tmp63_ = 0;
+#line 10590 "EditingTools.c"
+				gint _tmp62_;
+				gint _tmp63_;
 #line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp62_ = y;
 #line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10669,15 +10597,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp63_ = x;
 #line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = _tmp63_;
-#line 10673 "EditingTools.c"
+#line 10601 "EditingTools.c"
 			} else {
-				gint _tmp64_ = 0;
-				gint _tmp65_ = 0;
-				gint _tmp66_ = 0;
-				gint _tmp67_ = 0;
-				gint _tmp68_ = 0;
-				gint _tmp69_ = 0;
-				gint _tmp70_ = 0;
+				gint _tmp64_;
+				gint _tmp65_;
+				gint _tmp66_;
+				gint _tmp67_;
+				gint _tmp68_;
+				gint _tmp69_;
+				gint _tmp70_;
 #line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp64_ = y;
 #line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10694,14 +10622,14 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp70_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp65_, (gdouble) _tmp66_, (gdouble) _tmp67_, (gdouble) _tmp68_, (gdouble) _tmp69_);
 #line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp64_ < _tmp70_) {
-#line 10698 "EditingTools.c"
-					gint _tmp71_ = 0;
+#line 10626 "EditingTools.c"
+					gint _tmp71_;
 					gfloat new_width = 0.0F;
-					gint _tmp72_ = 0;
-					gint _tmp73_ = 0;
-					gfloat _tmp74_ = 0.0F;
-					gint _tmp75_ = 0;
-					gfloat _tmp76_ = 0.0F;
+					gint _tmp72_;
+					gint _tmp73_;
+					gfloat _tmp74_;
+					gint _tmp75_;
+					gfloat _tmp76_;
 #line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp71_ = y;
 #line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10720,15 +10648,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp76_ = new_width;
 #line 1544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp75_ - ((gint) _tmp76_);
-#line 10724 "EditingTools.c"
+#line 10652 "EditingTools.c"
 				} else {
-					gint _tmp77_ = 0;
+					gint _tmp77_;
 					gfloat new_height = 0.0F;
-					gint _tmp78_ = 0;
-					gint _tmp79_ = 0;
-					gfloat _tmp80_ = 0.0F;
-					gint _tmp81_ = 0;
-					gfloat _tmp82_ = 0.0F;
+					gint _tmp78_;
+					gint _tmp79_;
+					gfloat _tmp80_;
+					gint _tmp81_;
+					gfloat _tmp82_;
 #line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp77_ = x;
 #line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10747,25 +10675,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp82_ = new_height;
 #line 1548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp81_ - ((gint) _tmp82_);
-#line 10751 "EditingTools.c"
+#line 10679 "EditingTools.c"
 				}
 			}
 #line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10756 "EditingTools.c"
+#line 10684 "EditingTools.c"
 		}
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_LEFT:
-#line 10760 "EditingTools.c"
+#line 10688 "EditingTools.c"
 		{
-			gfloat _tmp83_ = 0.0F;
+			gfloat _tmp83_;
 #line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp83_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp83_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10767 "EditingTools.c"
-				gint _tmp84_ = 0;
-				gint _tmp85_ = 0;
+#line 10695 "EditingTools.c"
+				gint _tmp84_;
+				gint _tmp85_;
 #line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp84_ = y;
 #line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10774,15 +10702,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp85_ = x;
 #line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = _tmp85_;
-#line 10778 "EditingTools.c"
+#line 10706 "EditingTools.c"
 			} else {
-				gint _tmp86_ = 0;
-				gint _tmp87_ = 0;
-				gint _tmp88_ = 0;
-				gint _tmp89_ = 0;
-				gint _tmp90_ = 0;
-				gint _tmp91_ = 0;
-				gint _tmp92_ = 0;
+				gint _tmp86_;
+				gint _tmp87_;
+				gint _tmp88_;
+				gint _tmp89_;
+				gint _tmp90_;
+				gint _tmp91_;
+				gint _tmp92_;
 #line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp86_ = y;
 #line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10799,14 +10727,14 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp92_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp87_, (gdouble) _tmp88_, (gdouble) _tmp89_, (gdouble) _tmp90_, (gdouble) _tmp91_);
 #line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp86_ < _tmp92_) {
-#line 10803 "EditingTools.c"
-					gint _tmp93_ = 0;
+#line 10731 "EditingTools.c"
+					gint _tmp93_;
 					gfloat new_height = 0.0F;
-					gint _tmp94_ = 0;
-					gint _tmp95_ = 0;
-					gfloat _tmp96_ = 0.0F;
-					gint _tmp97_ = 0;
-					gfloat _tmp98_ = 0.0F;
+					gint _tmp94_;
+					gint _tmp95_;
+					gfloat _tmp96_;
+					gint _tmp97_;
+					gfloat _tmp98_;
 #line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp93_ = x;
 #line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10825,15 +10753,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp98_ = new_height;
 #line 1561 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp97_ + ((gint) _tmp98_);
-#line 10829 "EditingTools.c"
+#line 10757 "EditingTools.c"
 				} else {
-					gint _tmp99_ = 0;
+					gint _tmp99_;
 					gfloat new_width = 0.0F;
-					gint _tmp100_ = 0;
-					gint _tmp101_ = 0;
-					gfloat _tmp102_ = 0.0F;
-					gint _tmp103_ = 0;
-					gfloat _tmp104_ = 0.0F;
+					gint _tmp100_;
+					gint _tmp101_;
+					gfloat _tmp102_;
+					gint _tmp103_;
+					gfloat _tmp104_;
 #line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp99_ = y;
 #line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10852,25 +10780,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp104_ = new_width;
 #line 1565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp103_ - ((gint) _tmp104_);
-#line 10856 "EditingTools.c"
+#line 10784 "EditingTools.c"
 				}
 			}
 #line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10861 "EditingTools.c"
+#line 10789 "EditingTools.c"
 		}
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_RIGHT:
-#line 10865 "EditingTools.c"
+#line 10793 "EditingTools.c"
 		{
-			gfloat _tmp105_ = 0.0F;
+			gfloat _tmp105_;
 #line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp105_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp105_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10872 "EditingTools.c"
-				gint _tmp106_ = 0;
-				gint _tmp107_ = 0;
+#line 10800 "EditingTools.c"
+				gint _tmp106_;
+				gint _tmp107_;
 #line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp106_ = y;
 #line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10879,15 +10807,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp107_ = x;
 #line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp107_;
-#line 10883 "EditingTools.c"
+#line 10811 "EditingTools.c"
 			} else {
-				gint _tmp108_ = 0;
-				gint _tmp109_ = 0;
-				gint _tmp110_ = 0;
-				gint _tmp111_ = 0;
-				gint _tmp112_ = 0;
-				gint _tmp113_ = 0;
-				gint _tmp114_ = 0;
+				gint _tmp108_;
+				gint _tmp109_;
+				gint _tmp110_;
+				gint _tmp111_;
+				gint _tmp112_;
+				gint _tmp113_;
+				gint _tmp114_;
 #line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp108_ = y;
 #line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10904,14 +10832,14 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp114_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp109_, (gdouble) _tmp110_, (gdouble) _tmp111_, (gdouble) _tmp112_, (gdouble) _tmp113_);
 #line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp108_ < _tmp114_) {
-#line 10908 "EditingTools.c"
-					gint _tmp115_ = 0;
+#line 10836 "EditingTools.c"
+					gint _tmp115_;
 					gfloat new_width = 0.0F;
-					gint _tmp116_ = 0;
-					gint _tmp117_ = 0;
-					gfloat _tmp118_ = 0.0F;
-					gint _tmp119_ = 0;
-					gfloat _tmp120_ = 0.0F;
+					gint _tmp116_;
+					gint _tmp117_;
+					gfloat _tmp118_;
+					gint _tmp119_;
+					gfloat _tmp120_;
 #line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp115_ = y;
 #line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10930,15 +10858,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp120_ = new_width;
 #line 1578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp119_ + ((gint) _tmp120_);
-#line 10934 "EditingTools.c"
+#line 10862 "EditingTools.c"
 				} else {
-					gint _tmp121_ = 0;
+					gint _tmp121_;
 					gfloat new_height = 0.0F;
-					gint _tmp122_ = 0;
-					gint _tmp123_ = 0;
-					gfloat _tmp124_ = 0.0F;
-					gint _tmp125_ = 0;
-					gfloat _tmp126_ = 0.0F;
+					gint _tmp122_;
+					gint _tmp123_;
+					gfloat _tmp124_;
+					gint _tmp125_;
+					gfloat _tmp126_;
 #line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp121_ = x;
 #line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10957,25 +10885,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp126_ = new_height;
 #line 1582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp125_ - ((gint) _tmp126_);
-#line 10961 "EditingTools.c"
+#line 10889 "EditingTools.c"
 				}
 			}
 #line 1585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10966 "EditingTools.c"
+#line 10894 "EditingTools.c"
 		}
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_RIGHT:
-#line 10970 "EditingTools.c"
+#line 10898 "EditingTools.c"
 		{
-			gfloat _tmp127_ = 0.0F;
+			gfloat _tmp127_;
 #line 1588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp127_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp127_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10977 "EditingTools.c"
-				gint _tmp128_ = 0;
-				gint _tmp129_ = 0;
+#line 10905 "EditingTools.c"
+				gint _tmp128_;
+				gint _tmp129_;
 #line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp128_ = y;
 #line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10984,15 +10912,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp129_ = x;
 #line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp129_;
-#line 10988 "EditingTools.c"
+#line 10916 "EditingTools.c"
 			} else {
-				gint _tmp130_ = 0;
-				gint _tmp131_ = 0;
-				gint _tmp132_ = 0;
-				gint _tmp133_ = 0;
-				gint _tmp134_ = 0;
-				gint _tmp135_ = 0;
-				gint _tmp136_ = 0;
+				gint _tmp130_;
+				gint _tmp131_;
+				gint _tmp132_;
+				gint _tmp133_;
+				gint _tmp134_;
+				gint _tmp135_;
+				gint _tmp136_;
 #line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp130_ = y;
 #line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11009,14 +10937,14 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp136_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp131_, (gdouble) _tmp132_, (gdouble) _tmp133_, (gdouble) _tmp134_, (gdouble) _tmp135_);
 #line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp130_ < _tmp136_) {
-#line 11013 "EditingTools.c"
-					gint _tmp137_ = 0;
+#line 10941 "EditingTools.c"
+					gint _tmp137_;
 					gfloat new_height = 0.0F;
-					gint _tmp138_ = 0;
-					gint _tmp139_ = 0;
-					gfloat _tmp140_ = 0.0F;
-					gint _tmp141_ = 0;
-					gfloat _tmp142_ = 0.0F;
+					gint _tmp138_;
+					gint _tmp139_;
+					gfloat _tmp140_;
+					gint _tmp141_;
+					gfloat _tmp142_;
 #line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp137_ = x;
 #line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11035,15 +10963,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp142_ = new_height;
 #line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp141_ + ((gint) _tmp142_);
-#line 11039 "EditingTools.c"
+#line 10967 "EditingTools.c"
 				} else {
-					gint _tmp143_ = 0;
+					gint _tmp143_;
 					gfloat new_width = 0.0F;
-					gint _tmp144_ = 0;
-					gint _tmp145_ = 0;
-					gfloat _tmp146_ = 0.0F;
-					gint _tmp147_ = 0;
-					gfloat _tmp148_ = 0.0F;
+					gint _tmp144_;
+					gint _tmp145_;
+					gfloat _tmp146_;
+					gint _tmp147_;
+					gfloat _tmp148_;
 #line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp143_ = y;
 #line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11062,59 +10990,59 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp148_ = new_width;
 #line 1599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp147_ + ((gint) _tmp148_);
-#line 11066 "EditingTools.c"
+#line 10994 "EditingTools.c"
 				}
 			}
 #line 1602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 11071 "EditingTools.c"
+#line 10999 "EditingTools.c"
 		}
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_INSIDE:
-#line 11075 "EditingTools.c"
+#line 11003 "EditingTools.c"
 		{
-			gint _tmp149_ = 0;
-			gint _tmp150_ = 0;
+			gint _tmp149_;
+			gint _tmp150_;
 			gint delta_x = 0;
-			gint _tmp151_ = 0;
-			gint _tmp152_ = 0;
+			gint _tmp151_;
+			gint _tmp152_;
 			gint delta_y = 0;
-			gint _tmp153_ = 0;
-			gint _tmp154_ = 0;
-			gint _tmp155_ = 0;
-			gint _tmp156_ = 0;
+			gint _tmp153_;
+			gint _tmp154_;
+			gint _tmp155_;
+			gint _tmp156_;
 			gint width = 0;
-			gint _tmp157_ = 0;
-			gint _tmp158_ = 0;
+			gint _tmp157_;
+			gint _tmp158_;
 			gint height = 0;
-			gint _tmp159_ = 0;
-			gint _tmp160_ = 0;
-			gint _tmp161_ = 0;
-			gint _tmp162_ = 0;
-			gint _tmp163_ = 0;
-			gint _tmp164_ = 0;
-			gint _tmp165_ = 0;
-			gint _tmp166_ = 0;
-			gint _tmp167_ = 0;
-			gint _tmp168_ = 0;
-			gint _tmp169_ = 0;
-			gint _tmp170_ = 0;
-			gint _tmp171_ = 0;
-			GdkRectangle _tmp172_ = {0};
-			gint _tmp173_ = 0;
-			gint _tmp176_ = 0;
-			GdkRectangle _tmp177_ = {0};
-			gint _tmp178_ = 0;
+			gint _tmp159_;
+			gint _tmp160_;
+			gint _tmp161_;
+			gint _tmp162_;
+			gint _tmp163_;
+			gint _tmp164_;
+			gint _tmp165_;
+			gint _tmp166_;
+			gint _tmp167_;
+			gint _tmp168_;
+			gint _tmp169_;
+			gint _tmp170_;
+			gint _tmp171_;
+			GdkRectangle _tmp172_;
+			gint _tmp173_;
+			gint _tmp176_;
+			GdkRectangle _tmp177_;
+			gint _tmp178_;
 			gint adj_width = 0;
-			gint _tmp181_ = 0;
-			gint _tmp182_ = 0;
+			gint _tmp181_;
+			gint _tmp182_;
 			gint adj_height = 0;
-			gint _tmp183_ = 0;
-			gint _tmp184_ = 0;
-			gint _tmp185_ = 0;
-			gint _tmp186_ = 0;
-			gint _tmp192_ = 0;
-			gint _tmp193_ = 0;
+			gint _tmp183_;
+			gint _tmp184_;
+			gint _tmp185_;
+			gint _tmp186_;
+			gint _tmp192_;
+			gint _tmp193_;
 #line 1605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp149_ = self->priv->last_grab_x;
 #line 1605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11185,7 +11113,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			if (_tmp169_ < 0) {
 #line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = 0;
-#line 11189 "EditingTools.c"
+#line 11117 "EditingTools.c"
 			}
 #line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp170_ = top;
@@ -11193,7 +11121,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			if (_tmp170_ < 0) {
 #line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				top = 0;
-#line 11197 "EditingTools.c"
+#line 11125 "EditingTools.c"
 			}
 #line 1629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp171_ = right;
@@ -11203,16 +11131,16 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp173_ = _tmp172_.width;
 #line 1629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp171_ >= _tmp173_) {
-#line 11207 "EditingTools.c"
-				GdkRectangle _tmp174_ = {0};
-				gint _tmp175_ = 0;
+#line 11135 "EditingTools.c"
+				GdkRectangle _tmp174_;
+				gint _tmp175_;
 #line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp174_ = scaled_pos;
 #line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp175_ = _tmp174_.width;
 #line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp175_ - 1;
-#line 11216 "EditingTools.c"
+#line 11144 "EditingTools.c"
 			}
 #line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp176_ = bottom;
@@ -11222,16 +11150,16 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp178_ = _tmp177_.height;
 #line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp176_ >= _tmp178_) {
-#line 11226 "EditingTools.c"
-				GdkRectangle _tmp179_ = {0};
-				gint _tmp180_ = 0;
+#line 11154 "EditingTools.c"
+				GdkRectangle _tmp179_;
+				gint _tmp180_;
 #line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp179_ = scaled_pos;
 #line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp180_ = _tmp179_.height;
 #line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp180_ - 1;
-#line 11235 "EditingTools.c"
+#line 11163 "EditingTools.c"
 			}
 #line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp181_ = right;
@@ -11251,32 +11179,32 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp186_ = width;
 #line 1639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp185_ != _tmp186_) {
-#line 11255 "EditingTools.c"
-				gint _tmp187_ = 0;
+#line 11183 "EditingTools.c"
+				gint _tmp187_;
 #line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp187_ = delta_x;
 #line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp187_ < 0) {
-#line 11261 "EditingTools.c"
-					gint _tmp188_ = 0;
-					gint _tmp189_ = 0;
+#line 11189 "EditingTools.c"
+					gint _tmp188_;
+					gint _tmp189_;
 #line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp188_ = left;
 #line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp189_ = width;
 #line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = (_tmp188_ + _tmp189_) - 1;
-#line 11270 "EditingTools.c"
+#line 11198 "EditingTools.c"
 				} else {
-					gint _tmp190_ = 0;
-					gint _tmp191_ = 0;
+					gint _tmp190_;
+					gint _tmp191_;
 #line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp190_ = right;
 #line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp191_ = width;
 #line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = (_tmp190_ - _tmp191_) + 1;
-#line 11280 "EditingTools.c"
+#line 11208 "EditingTools.c"
 				}
 			}
 #line 1646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11285,37 +11213,37 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp193_ = height;
 #line 1646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp192_ != _tmp193_) {
-#line 11289 "EditingTools.c"
-				gint _tmp194_ = 0;
+#line 11217 "EditingTools.c"
+				gint _tmp194_;
 #line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp194_ = delta_y;
 #line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp194_ < 0) {
-#line 11295 "EditingTools.c"
-					gint _tmp195_ = 0;
-					gint _tmp196_ = 0;
+#line 11223 "EditingTools.c"
+					gint _tmp195_;
+					gint _tmp196_;
 #line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp195_ = top;
 #line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp196_ = height;
 #line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = (_tmp195_ + _tmp196_) - 1;
-#line 11304 "EditingTools.c"
+#line 11232 "EditingTools.c"
 				} else {
-					gint _tmp197_ = 0;
-					gint _tmp198_ = 0;
+					gint _tmp197_;
+					gint _tmp198_;
 #line 1650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp197_ = bottom;
 #line 1650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp198_ = height;
 #line 1650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = (_tmp197_ - _tmp198_) + 1;
-#line 11314 "EditingTools.c"
+#line 11242 "EditingTools.c"
 				}
 			}
 #line 1652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 11319 "EditingTools.c"
+#line 11247 "EditingTools.c"
 		}
 		default:
 		{
@@ -11323,7 +11251,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			result = FALSE;
 #line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return result;
-#line 11327 "EditingTools.c"
+#line 11255 "EditingTools.c"
 		}
 	}
 #line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11358,24 +11286,24 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	_tmp208_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp208_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 11362 "EditingTools.c"
-		gint _tmp209_ = 0;
-		gint _tmp210_ = 0;
-		gint _tmp211_ = 0;
-		gint _tmp212_ = 0;
-		BoxLocation _tmp213_ = 0;
-		BoxLocation _tmp218_ = 0;
-		gint _tmp223_ = 0;
-		gint _tmp224_ = 0;
-		gint _tmp225_ = 0;
-		gint _tmp226_ = 0;
+#line 11290 "EditingTools.c"
+		gint _tmp209_;
+		gint _tmp210_;
+		gint _tmp211_;
+		gint _tmp212_;
+		BoxLocation _tmp213_;
+		BoxLocation _tmp218_;
+		gint _tmp223_;
+		gint _tmp224_;
+		gint _tmp225_;
+		gint _tmp226_;
 		Box _tmp227_ = {0};
-		Dimensions _tmp228_ = {0};
-		gint _tmp229_ = 0;
-		Dimensions _tmp230_ = {0};
-		gint _tmp231_ = 0;
-		gdouble _tmp232_ = 0.0;
-		BoxLocation _tmp233_ = 0;
+		Dimensions _tmp228_;
+		gint _tmp229_;
+		Dimensions _tmp230_;
+		gint _tmp231_;
+		gdouble _tmp232_;
+		BoxLocation _tmp233_;
 		Box _tmp234_ = {0};
 #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp209_ = right;
@@ -11399,24 +11327,24 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			case BOX_LOCATION_TOP_LEFT:
 #line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_LEFT:
-#line 11403 "EditingTools.c"
+#line 11331 "EditingTools.c"
 			{
-				gint _tmp214_ = 0;
+				gint _tmp214_;
 #line 1682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp214_ = width;
 #line 1682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp214_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11410 "EditingTools.c"
-					gint _tmp215_ = 0;
+#line 11338 "EditingTools.c"
+					gint _tmp215_;
 #line 1683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp215_ = right;
 #line 1683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp215_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11416 "EditingTools.c"
+#line 11344 "EditingTools.c"
 				}
 #line 1684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11420 "EditingTools.c"
+#line 11348 "EditingTools.c"
 			}
 #line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_RIGHT_SIDE:
@@ -11424,30 +11352,30 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			case BOX_LOCATION_TOP_RIGHT:
 #line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_RIGHT:
-#line 11428 "EditingTools.c"
+#line 11356 "EditingTools.c"
 			{
-				gint _tmp216_ = 0;
+				gint _tmp216_;
 #line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp216_ = width;
 #line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp216_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11435 "EditingTools.c"
-					gint _tmp217_ = 0;
+#line 11363 "EditingTools.c"
+					gint _tmp217_;
 #line 1690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp217_ = left;
 #line 1690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp217_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11441 "EditingTools.c"
+#line 11369 "EditingTools.c"
 				}
 #line 1691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11445 "EditingTools.c"
+#line 11373 "EditingTools.c"
 			}
 			default:
 			{
 #line 1694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11451 "EditingTools.c"
+#line 11379 "EditingTools.c"
 			}
 		}
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11460,24 +11388,24 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			case BOX_LOCATION_TOP_LEFT:
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_RIGHT:
-#line 11464 "EditingTools.c"
+#line 11392 "EditingTools.c"
 			{
-				gint _tmp219_ = 0;
+				gint _tmp219_;
 #line 1701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp219_ = height;
 #line 1701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp219_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11471 "EditingTools.c"
-					gint _tmp220_ = 0;
+#line 11399 "EditingTools.c"
+					gint _tmp220_;
 #line 1702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp220_ = bottom;
 #line 1702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp220_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11477 "EditingTools.c"
+#line 11405 "EditingTools.c"
 				}
 #line 1703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11481 "EditingTools.c"
+#line 11409 "EditingTools.c"
 			}
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_SIDE:
@@ -11485,30 +11413,30 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			case BOX_LOCATION_BOTTOM_LEFT:
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_RIGHT:
-#line 11489 "EditingTools.c"
+#line 11417 "EditingTools.c"
 			{
-				gint _tmp221_ = 0;
+				gint _tmp221_;
 #line 1708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp221_ = height;
 #line 1708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp221_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11496 "EditingTools.c"
-					gint _tmp222_ = 0;
+#line 11424 "EditingTools.c"
+					gint _tmp222_;
 #line 1709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp222_ = top;
 #line 1709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp222_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11502 "EditingTools.c"
+#line 11430 "EditingTools.c"
 				}
 #line 1710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11506 "EditingTools.c"
+#line 11434 "EditingTools.c"
 			}
 			default:
 			{
 #line 1713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11512 "EditingTools.c"
+#line 11440 "EditingTools.c"
 			}
 		}
 #line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11537,25 +11465,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		clamp_inside_rotated_image (&_tmp227_, _tmp229_, _tmp231_, _tmp232_, _tmp233_ == BOX_LOCATION_INSIDE, &_tmp234_);
 #line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		new_crop = _tmp234_;
-#line 11541 "EditingTools.c"
+#line 11469 "EditingTools.c"
 	} else {
-		gint _tmp235_ = 0;
-		gint _tmp236_ = 0;
-		gint _tmp237_ = 0;
-		gint _tmp238_ = 0;
+		gint _tmp235_;
+		gint _tmp236_;
+		gint _tmp237_;
+		gint _tmp238_;
 		Box adjusted = {0};
-		Box _tmp239_ = {0};
-		Dimensions _tmp240_ = {0};
-		gint _tmp241_ = 0;
-		Dimensions _tmp242_ = {0};
-		gint _tmp243_ = 0;
-		gdouble _tmp244_ = 0.0;
-		BoxLocation _tmp245_ = 0;
+		Box _tmp239_;
+		Dimensions _tmp240_;
+		gint _tmp241_;
+		Dimensions _tmp242_;
+		gint _tmp243_;
+		gdouble _tmp244_;
+		BoxLocation _tmp245_;
 		Box _tmp246_ = {0};
 		gboolean _tmp247_ = FALSE;
 		gboolean _tmp248_ = FALSE;
-		Box _tmp249_ = {0};
-		Box _tmp250_ = {0};
+		Box _tmp249_;
+		Box _tmp250_;
 #line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp235_ = left;
 #line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11592,57 +11520,57 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		if (_box_equal (&_tmp249_, &_tmp250_) != TRUE) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp248_ = TRUE;
-#line 11596 "EditingTools.c"
+#line 11524 "EditingTools.c"
 		} else {
-			gint _tmp251_ = 0;
+			gint _tmp251_;
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp251_ = width;
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp248_ = _tmp251_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11603 "EditingTools.c"
+#line 11531 "EditingTools.c"
 		}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp248_) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp247_ = TRUE;
-#line 11609 "EditingTools.c"
+#line 11537 "EditingTools.c"
 		} else {
-			gint _tmp252_ = 0;
+			gint _tmp252_;
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp252_ = height;
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp247_ = _tmp252_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11616 "EditingTools.c"
+#line 11544 "EditingTools.c"
 		}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp247_) {
-#line 11620 "EditingTools.c"
-			Box _tmp253_ = {0};
+#line 11548 "EditingTools.c"
+			Box _tmp253_;
 #line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp253_ = self->priv->scaled_crop;
 #line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			new_crop = _tmp253_;
-#line 11626 "EditingTools.c"
+#line 11554 "EditingTools.c"
 		}
 	}
 #line 1738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp254_ = self->priv->in_manipulation;
 #line 1738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp254_ != BOX_LOCATION_INSIDE) {
-#line 11633 "EditingTools.c"
-		Box _tmp255_ = {0};
+#line 11561 "EditingTools.c"
+		Box _tmp255_;
 #line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp255_ = new_crop;
 #line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_crop_resized (self, &_tmp255_);
-#line 11639 "EditingTools.c"
+#line 11567 "EditingTools.c"
 	} else {
-		Box _tmp256_ = {0};
+		Box _tmp256_;
 #line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp256_ = new_crop;
 #line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_crop_moved (self, &_tmp256_);
-#line 11646 "EditingTools.c"
+#line 11574 "EditingTools.c"
 	}
 #line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp257_ = new_crop;
@@ -11652,11 +11580,11 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	_tmp258_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp258_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 11656 "EditingTools.c"
-		gint _tmp259_ = 0;
-		gint _tmp260_ = 0;
-		gint _tmp261_ = 0;
-		gint _tmp262_ = 0;
+#line 11584 "EditingTools.c"
+		gint _tmp259_;
+		gint _tmp260_;
+		gint _tmp261_;
+		gint _tmp262_;
 #line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp259_ = box_get_width (&self->priv->scaled_crop);
 #line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11671,40 +11599,40 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		_tmp262_ = self->priv->custom_init_height;
 #line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_aspect_ratio = ((gfloat) _tmp261_) / ((gfloat) _tmp262_);
-#line 11675 "EditingTools.c"
+#line 11603 "EditingTools.c"
 	}
 #line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
 #line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 11681 "EditingTools.c"
+#line 11609 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Box* new_crop) {
-	Box _tmp0_ = {0};
-	gboolean _tmp1_ = FALSE;
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	Box _tmp3_ = {0};
+	Box _tmp0_;
+	gboolean _tmp1_;
+	EditingToolsPhotoCanvas* _tmp2_;
+	Box _tmp3_;
 	Box horizontal = {0};
 	gboolean horizontal_enlarged = FALSE;
 	Box vertical = {0};
 	gboolean vertical_enlarged = FALSE;
 	BoxComplements complements = 0;
-	Box _tmp4_ = {0};
+	Box _tmp4_;
 	Box _tmp5_ = {0};
 	gboolean _tmp6_ = FALSE;
 	Box _tmp7_ = {0};
 	gboolean _tmp8_ = FALSE;
-	BoxComplements _tmp9_ = 0;
-	BoxComplements _tmp10_ = 0;
+	BoxComplements _tmp9_;
+	BoxComplements _tmp10_;
 	gboolean _tmp11_ = FALSE;
-	BoxComplements _tmp12_ = 0;
+	BoxComplements _tmp12_;
 	gboolean _tmp17_ = FALSE;
-	BoxComplements _tmp18_ = 0;
-	Box _tmp23_ = {0};
-	EditingToolsPhotoCanvas* _tmp24_ = NULL;
-	Box _tmp25_ = {0};
+	BoxComplements _tmp18_;
+	Box _tmp23_;
+	EditingToolsPhotoCanvas* _tmp24_;
+	Box _tmp25_;
 #line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11717,7 +11645,7 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 	if (_tmp1_) {
 #line 1758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 11721 "EditingTools.c"
+#line 11649 "EditingTools.c"
 	}
 #line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -11749,38 +11677,38 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 	if (_tmp12_ == BOX_COMPLEMENTS_HORIZONTAL) {
 #line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = TRUE;
-#line 11753 "EditingTools.c"
+#line 11681 "EditingTools.c"
 	} else {
-		BoxComplements _tmp13_ = 0;
+		BoxComplements _tmp13_;
 #line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = complements;
 #line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _tmp13_ == BOX_COMPLEMENTS_BOTH;
-#line 11760 "EditingTools.c"
+#line 11688 "EditingTools.c"
 	}
 #line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp11_) {
-#line 11764 "EditingTools.c"
+#line 11692 "EditingTools.c"
 		gdouble _tmp14_ = 0.0;
-		gboolean _tmp15_ = FALSE;
-		Box _tmp16_ = {0};
+		gboolean _tmp15_;
+		Box _tmp16_;
 #line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = horizontal_enlarged;
 #line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp15_) {
 #line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = 0.0;
-#line 11774 "EditingTools.c"
+#line 11702 "EditingTools.c"
 		} else {
 #line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = 0.5;
-#line 11778 "EditingTools.c"
+#line 11706 "EditingTools.c"
 		}
 #line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = horizontal;
 #line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_area_alpha (self, &_tmp16_, _tmp14_);
-#line 11784 "EditingTools.c"
+#line 11712 "EditingTools.c"
 	}
 #line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = complements;
@@ -11788,38 +11716,38 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 	if (_tmp18_ == BOX_COMPLEMENTS_VERTICAL) {
 #line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = TRUE;
-#line 11792 "EditingTools.c"
+#line 11720 "EditingTools.c"
 	} else {
-		BoxComplements _tmp19_ = 0;
+		BoxComplements _tmp19_;
 #line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = complements;
 #line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = _tmp19_ == BOX_COMPLEMENTS_BOTH;
-#line 11799 "EditingTools.c"
+#line 11727 "EditingTools.c"
 	}
 #line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp17_) {
-#line 11803 "EditingTools.c"
+#line 11731 "EditingTools.c"
 		gdouble _tmp20_ = 0.0;
-		gboolean _tmp21_ = FALSE;
-		Box _tmp22_ = {0};
+		gboolean _tmp21_;
+		Box _tmp22_;
 #line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = vertical_enlarged;
 #line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp21_) {
 #line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = 0.0;
-#line 11813 "EditingTools.c"
+#line 11741 "EditingTools.c"
 		} else {
 #line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = 0.5;
-#line 11817 "EditingTools.c"
+#line 11745 "EditingTools.c"
 		}
 #line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = vertical;
 #line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_area_alpha (self, &_tmp22_, _tmp20_);
-#line 11823 "EditingTools.c"
+#line 11751 "EditingTools.c"
 	}
 #line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = *new_crop;
@@ -11831,20 +11759,20 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 	_tmp25_ = *new_crop;
 #line 1780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp24_, &_tmp25_);
-#line 11835 "EditingTools.c"
+#line 11763 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box* new_crop) {
-	Box _tmp0_ = {0};
-	gboolean _tmp1_ = FALSE;
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	Box _tmp3_ = {0};
-	Box _tmp4_ = {0};
-	Box _tmp5_ = {0};
-	Box _tmp6_ = {0};
-	EditingToolsPhotoCanvas* _tmp7_ = NULL;
-	Box _tmp8_ = {0};
+	Box _tmp0_;
+	gboolean _tmp1_;
+	EditingToolsPhotoCanvas* _tmp2_;
+	Box _tmp3_;
+	Box _tmp4_;
+	Box _tmp5_;
+	Box _tmp6_;
+	EditingToolsPhotoCanvas* _tmp7_;
+	Box _tmp8_;
 #line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11857,7 +11785,7 @@ static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box*
 	if (_tmp1_) {
 #line 1786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 11861 "EditingTools.c"
+#line 11789 "EditingTools.c"
 	}
 #line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -11883,24 +11811,24 @@ static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box*
 	_tmp8_ = *new_crop;
 #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp7_, &_tmp8_);
-#line 11887 "EditingTools.c"
+#line 11815 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self, Box* area, gdouble alpha) {
 	cairo_t* ctx = NULL;
-	cairo_surface_t* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	Box _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	Box _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	EditingToolsPhotoCanvas* _tmp9_ = NULL;
-	cairo_surface_t* _tmp10_ = NULL;
-	Box _tmp11_ = {0};
+	cairo_surface_t* _tmp0_;
+	cairo_t* _tmp1_;
+	gdouble _tmp2_;
+	Box _tmp3_;
+	gint _tmp4_;
+	Box _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	EditingToolsPhotoCanvas* _tmp9_;
+	cairo_surface_t* _tmp10_;
+	Box _tmp11_;
 #line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11943,20 +11871,20 @@ static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self,
 	editing_tools_photo_canvas_paint_surface_area (_tmp9_, _tmp10_, &_tmp11_, TRUE);
 #line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 11947 "EditingTools.c"
+#line 11875 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self, Box* crop) {
-	BoxLocation _tmp0_ = 0;
-	EditingToolsPhotoCanvas* _tmp65_ = NULL;
-	cairo_t* _tmp66_ = NULL;
-	Box _tmp67_ = {0};
-	EditingToolsPhotoCanvas* _tmp68_ = NULL;
-	cairo_t* _tmp69_ = NULL;
+	BoxLocation _tmp0_;
+	EditingToolsPhotoCanvas* _tmp65_;
+	cairo_t* _tmp66_;
+	Box _tmp67_;
+	EditingToolsPhotoCanvas* _tmp68_;
+	cairo_t* _tmp69_;
 	Box _tmp70_ = {0};
-	EditingToolsPhotoCanvas* _tmp71_ = NULL;
-	cairo_t* _tmp72_ = NULL;
+	EditingToolsPhotoCanvas* _tmp71_;
+	cairo_t* _tmp72_;
 	Box _tmp73_ = {0};
 #line 1809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
@@ -11966,77 +11894,77 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
 	_tmp0_ = self->priv->in_manipulation;
 #line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != BOX_LOCATION_OUTSIDE) {
-#line 11970 "EditingTools.c"
+#line 11898 "EditingTools.c"
 		gint one_third_x = 0;
-		gint _tmp1_ = 0;
+		gint _tmp1_;
 		gint one_third_y = 0;
-		gint _tmp2_ = 0;
-		EditingToolsPhotoCanvas* _tmp3_ = NULL;
-		cairo_t* _tmp4_ = NULL;
-		Box _tmp5_ = {0};
-		gint _tmp6_ = 0;
-		Box _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-		EditingToolsPhotoCanvas* _tmp11_ = NULL;
-		cairo_t* _tmp12_ = NULL;
-		Box _tmp13_ = {0};
-		gint _tmp14_ = 0;
-		Box _tmp15_ = {0};
-		gint _tmp16_ = 0;
-		gint _tmp17_ = 0;
-		gint _tmp18_ = 0;
-		EditingToolsPhotoCanvas* _tmp19_ = NULL;
-		cairo_t* _tmp20_ = NULL;
-		Box _tmp21_ = {0};
-		gint _tmp22_ = 0;
-		gint _tmp23_ = 0;
-		Box _tmp24_ = {0};
-		gint _tmp25_ = 0;
-		gint _tmp26_ = 0;
-		EditingToolsPhotoCanvas* _tmp27_ = NULL;
-		cairo_t* _tmp28_ = NULL;
-		Box _tmp29_ = {0};
-		gint _tmp30_ = 0;
-		gint _tmp31_ = 0;
-		Box _tmp32_ = {0};
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
+		gint _tmp2_;
+		EditingToolsPhotoCanvas* _tmp3_;
+		cairo_t* _tmp4_;
+		Box _tmp5_;
+		gint _tmp6_;
+		Box _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
+		EditingToolsPhotoCanvas* _tmp11_;
+		cairo_t* _tmp12_;
+		Box _tmp13_;
+		gint _tmp14_;
+		Box _tmp15_;
+		gint _tmp16_;
+		gint _tmp17_;
+		gint _tmp18_;
+		EditingToolsPhotoCanvas* _tmp19_;
+		cairo_t* _tmp20_;
+		Box _tmp21_;
+		gint _tmp22_;
+		gint _tmp23_;
+		Box _tmp24_;
+		gint _tmp25_;
+		gint _tmp26_;
+		EditingToolsPhotoCanvas* _tmp27_;
+		cairo_t* _tmp28_;
+		Box _tmp29_;
+		gint _tmp30_;
+		gint _tmp31_;
+		Box _tmp32_;
+		gint _tmp33_;
+		gint _tmp34_;
 		Box adj_crop = {0};
-		EditingToolsPhotoCanvas* _tmp35_ = NULL;
+		EditingToolsPhotoCanvas* _tmp35_;
 		GdkRectangle _tmp36_ = {0};
 		Dimensions _tmp37_ = {0};
-		EditingToolsPhotoCanvas* _tmp38_ = NULL;
-		Photo* _tmp39_ = NULL;
-		Photo* _tmp40_ = NULL;
+		EditingToolsPhotoCanvas* _tmp38_;
+		Photo* _tmp39_;
+		Photo* _tmp40_;
 		Dimensions _tmp41_ = {0};
 		Box _tmp42_ = {0};
-		Box _tmp43_ = {0};
+		Box _tmp43_;
 		gchar* text = NULL;
-		gint _tmp44_ = 0;
-		gchar* _tmp45_ = NULL;
-		gchar* _tmp46_ = NULL;
-		gchar* _tmp47_ = NULL;
-		gchar* _tmp48_ = NULL;
-		gint _tmp49_ = 0;
-		gchar* _tmp50_ = NULL;
-		gchar* _tmp51_ = NULL;
-		gchar* _tmp52_ = NULL;
-		gchar* _tmp53_ = NULL;
+		gint _tmp44_;
+		gchar* _tmp45_;
+		gchar* _tmp46_;
+		gchar* _tmp47_;
+		gchar* _tmp48_;
+		gint _tmp49_;
+		gchar* _tmp50_;
+		gchar* _tmp51_;
+		gchar* _tmp52_;
+		gchar* _tmp53_;
 		gint x = 0;
-		Box _tmp54_ = {0};
-		gint _tmp55_ = 0;
-		gint _tmp56_ = 0;
+		Box _tmp54_;
+		gint _tmp55_;
+		gint _tmp56_;
 		gint y = 0;
-		Box _tmp57_ = {0};
-		gint _tmp58_ = 0;
-		gint _tmp59_ = 0;
-		EditingToolsPhotoCanvas* _tmp60_ = NULL;
-		cairo_t* _tmp61_ = NULL;
-		const gchar* _tmp62_ = NULL;
-		gint _tmp63_ = 0;
-		gint _tmp64_ = 0;
+		Box _tmp57_;
+		gint _tmp58_;
+		gint _tmp59_;
+		EditingToolsPhotoCanvas* _tmp60_;
+		cairo_t* _tmp61_;
+		const gchar* _tmp62_;
+		gint _tmp63_;
+		gint _tmp64_;
 #line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = box_get_width (crop);
 #line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12197,7 +12125,7 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
 		editing_tools_photo_canvas_draw_text (_tmp60_, _tmp61_, _tmp62_, _tmp63_, _tmp64_, TRUE);
 #line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (text);
-#line 12201 "EditingTools.c"
+#line 12129 "EditingTools.c"
 	}
 #line 1833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp65_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -12223,18 +12151,18 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
 	box_get_reduced (crop, 2, &_tmp73_);
 #line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_box (_tmp71_, _tmp72_, &_tmp73_);
-#line 12227 "EditingTools.c"
+#line 12155 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_construct (GType object_type, const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio) {
 	EditingToolsCropToolConstraintDescription* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gfloat _tmp4_ = 0.0F;
-	gboolean _tmp8_ = FALSE;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gfloat _tmp4_;
+	gboolean _tmp8_;
 #line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (new_name != NULL, NULL);
 #line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12259,23 +12187,23 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constr
 	_tmp4_ = new_aspect_ratio;
 #line 620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS) {
-#line 12263 "EditingTools.c"
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+#line 12191 "EditingTools.c"
+		gint _tmp5_;
+		gint _tmp6_;
 #line 621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->basis_width;
 #line 621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->basis_height;
 #line 621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->aspect_ratio = ((gfloat) _tmp5_) / ((gfloat) _tmp6_);
-#line 12272 "EditingTools.c"
+#line 12200 "EditingTools.c"
 	} else {
-		gfloat _tmp7_ = 0.0F;
+		gfloat _tmp7_;
 #line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = new_aspect_ratio;
 #line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->aspect_ratio = _tmp7_;
-#line 12279 "EditingTools.c"
+#line 12207 "EditingTools.c"
 	}
 #line 624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = new_pivotable;
@@ -12283,51 +12211,51 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constr
 	self->is_pivotable = _tmp8_;
 #line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 12287 "EditingTools.c"
+#line 12215 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_new (const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio) {
 #line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_constraint_description_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION, new_name, new_basis_width, new_basis_height, new_pivotable, new_aspect_ratio);
-#line 12294 "EditingTools.c"
+#line 12222 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_crop_tool_constraint_description_is_separator (EditingToolsCropToolConstraintDescription* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_CROP_TOOL_IS_CONSTRAINT_DESCRIPTION (self), FALSE);
 #line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->is_pivotable;
 #line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp1_) {
-#line 12308 "EditingTools.c"
-		gfloat _tmp2_ = 0.0F;
+#line 12236 "EditingTools.c"
+		gfloat _tmp2_;
 #line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->aspect_ratio;
 #line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp2_ == EDITING_TOOLS_CROP_TOOL_SEPARATOR;
-#line 12314 "EditingTools.c"
+#line 12242 "EditingTools.c"
 	} else {
 #line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = FALSE;
-#line 12318 "EditingTools.c"
+#line 12246 "EditingTools.c"
 	}
 #line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
 #line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12324 "EditingTools.c"
+#line 12252 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_value_constraint_description_init (GValue* value) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 12331 "EditingTools.c"
+#line 12259 "EditingTools.c"
 }
 
 
@@ -12336,7 +12264,7 @@ static void editing_tools_crop_tool_value_constraint_description_free_value (GVa
 	if (value->data[0].v_pointer) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (value->data[0].v_pointer);
-#line 12340 "EditingTools.c"
+#line 12268 "EditingTools.c"
 	}
 }
 
@@ -12346,11 +12274,11 @@ static void editing_tools_crop_tool_value_constraint_description_copy_value (con
 	if (src_value->data[0].v_pointer) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (src_value->data[0].v_pointer);
-#line 12350 "EditingTools.c"
+#line 12278 "EditingTools.c"
 	} else {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 12354 "EditingTools.c"
+#line 12282 "EditingTools.c"
 	}
 }
 
@@ -12358,66 +12286,66 @@ static void editing_tools_crop_tool_value_constraint_description_copy_value (con
 static gpointer editing_tools_crop_tool_value_constraint_description_peek_pointer (const GValue* value) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 12362 "EditingTools.c"
+#line 12290 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_crop_tool_value_constraint_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 12369 "EditingTools.c"
-		EditingToolsCropToolConstraintDescription* object;
+#line 12297 "EditingTools.c"
+		EditingToolsCropToolConstraintDescription * object;
 		object = collect_values[0].v_pointer;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12376 "EditingTools.c"
+#line 12304 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12380 "EditingTools.c"
+#line 12308 "EditingTools.c"
 		}
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (object);
-#line 12384 "EditingTools.c"
+#line 12312 "EditingTools.c"
 	} else {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12388 "EditingTools.c"
+#line 12316 "EditingTools.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 12392 "EditingTools.c"
+#line 12320 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_crop_tool_value_constraint_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	EditingToolsCropToolConstraintDescription** object_p;
+	EditingToolsCropToolConstraintDescription ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!object_p) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 12403 "EditingTools.c"
+#line 12331 "EditingTools.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 12409 "EditingTools.c"
+#line 12337 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 12413 "EditingTools.c"
+#line 12341 "EditingTools.c"
 	} else {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer);
-#line 12417 "EditingTools.c"
+#line 12345 "EditingTools.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 12421 "EditingTools.c"
+#line 12349 "EditingTools.c"
 }
 
 
@@ -12431,7 +12359,7 @@ static GParamSpec* editing_tools_crop_tool_param_spec_constraint_description (co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 12435 "EditingTools.c"
+#line 12363 "EditingTools.c"
 }
 
 
@@ -12440,12 +12368,12 @@ static gpointer editing_tools_crop_tool_value_get_constraint_description (const
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION), NULL);
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 12444 "EditingTools.c"
+#line 12372 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_value_set_constraint_description (GValue* value, gpointer v_object) {
-	EditingToolsCropToolConstraintDescription* old;
+	EditingToolsCropToolConstraintDescription * old;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12460,23 +12388,23 @@ static void editing_tools_crop_tool_value_set_constraint_description (GValue* va
 		value->data[0].v_pointer = v_object;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer);
-#line 12464 "EditingTools.c"
+#line 12392 "EditingTools.c"
 	} else {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12468 "EditingTools.c"
+#line 12396 "EditingTools.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (old);
-#line 12474 "EditingTools.c"
+#line 12402 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_crop_tool_value_take_constraint_description (GValue* value, gpointer v_object) {
-	EditingToolsCropToolConstraintDescription* old;
+	EditingToolsCropToolConstraintDescription * old;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12489,17 +12417,17 @@ static void editing_tools_crop_tool_value_take_constraint_description (GValue* v
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 12493 "EditingTools.c"
+#line 12421 "EditingTools.c"
 	} else {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12497 "EditingTools.c"
+#line 12425 "EditingTools.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (old);
-#line 12503 "EditingTools.c"
+#line 12431 "EditingTools.c"
 	}
 }
 
@@ -12509,18 +12437,18 @@ static void editing_tools_crop_tool_constraint_description_class_init (EditingTo
 	editing_tools_crop_tool_constraint_description_parent_class = g_type_class_peek_parent (klass);
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsCropToolConstraintDescriptionClass *) klass)->finalize = editing_tools_crop_tool_constraint_description_finalize;
-#line 12513 "EditingTools.c"
+#line 12441 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constraint_description_instance_init (EditingToolsCropToolConstraintDescription * self) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 12520 "EditingTools.c"
+#line 12448 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription* obj) {
+static void editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription * obj) {
 	EditingToolsCropToolConstraintDescription * self;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION, EditingToolsCropToolConstraintDescription);
@@ -12528,7 +12456,7 @@ static void editing_tools_crop_tool_constraint_description_finalize (EditingTool
 	g_signal_handlers_destroy (self);
 #line 609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 12532 "EditingTools.c"
+#line 12460 "EditingTools.c"
 }
 
 
@@ -12547,18 +12475,18 @@ static GType editing_tools_crop_tool_constraint_description_get_type (void) {
 
 
 static gpointer editing_tools_crop_tool_constraint_description_ref (gpointer instance) {
-	EditingToolsCropToolConstraintDescription* self;
+	EditingToolsCropToolConstraintDescription * self;
 	self = instance;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 12557 "EditingTools.c"
+#line 12485 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constraint_description_unref (gpointer instance) {
-	EditingToolsCropToolConstraintDescription* self;
+	EditingToolsCropToolConstraintDescription * self;
 	self = instance;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -12566,7 +12494,7 @@ static void editing_tools_crop_tool_constraint_description_unref (gpointer insta
 		EDITING_TOOLS_CROP_TOOL_CONSTRAINT_DESCRIPTION_GET_CLASS (self)->finalize (self);
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 12570 "EditingTools.c"
+#line 12498 "EditingTools.c"
 	}
 }
 
@@ -12576,49 +12504,46 @@ static gboolean _editing_tools_crop_tool_crop_tool_window_constraint_combo_separ
 	result = editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (model, iter);
 #line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12580 "EditingTools.c"
+#line 12508 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_construct (GType object_type, GtkWindow* container) {
 	EditingToolsCropToolCropToolWindow * self = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	GtkButton* _tmp3_ = NULL;
-	GtkButton* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	GtkButton* _tmp6_ = NULL;
-	GtkComboBox* _tmp7_ = NULL;
+	GtkWindow* _tmp0_;
+	GtkButton* _tmp1_;
+	GtkButton* _tmp2_;
+	GtkButton* _tmp3_;
+	GtkButton* _tmp4_;
+	GtkComboBox* _tmp5_;
 	GtkCellRendererText* combo_text_renderer = NULL;
-	GtkCellRendererText* _tmp8_ = NULL;
-	GtkComboBox* _tmp9_ = NULL;
-	GtkComboBox* _tmp10_ = NULL;
-	GtkComboBox* _tmp11_ = NULL;
-	GtkComboBox* _tmp12_ = NULL;
+	GtkCellRendererText* _tmp6_;
+	GtkComboBox* _tmp7_;
+	GtkComboBox* _tmp8_;
+	GtkComboBox* _tmp9_;
+	GtkComboBox* _tmp10_;
 	GtkImage* image = NULL;
-	GtkImage* _tmp13_ = NULL;
-	GtkButton* _tmp14_ = NULL;
-	GtkButton* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	GtkEntry* _tmp17_ = NULL;
-	GtkEntry* _tmp18_ = NULL;
-	GtkEntry* _tmp19_ = NULL;
-	GtkEntry* _tmp20_ = NULL;
-	GtkBox* _tmp21_ = NULL;
-	GtkBox* _tmp22_ = NULL;
-	GtkBox* _tmp23_ = NULL;
-	GtkButton* _tmp24_ = NULL;
-	GtkBox* _tmp25_ = NULL;
-	GtkButton* _tmp26_ = NULL;
-	GtkBox* _tmp27_ = NULL;
-	GtkBox* _tmp28_ = NULL;
-	GtkComboBox* _tmp29_ = NULL;
-	GtkBox* _tmp30_ = NULL;
-	GtkButton* _tmp31_ = NULL;
-	GtkBox* _tmp32_ = NULL;
-	GtkBox* _tmp33_ = NULL;
-	GtkBox* _tmp34_ = NULL;
+	GtkImage* _tmp11_;
+	GtkButton* _tmp12_;
+	GtkButton* _tmp13_;
+	GtkEntry* _tmp14_;
+	GtkEntry* _tmp15_;
+	GtkEntry* _tmp16_;
+	GtkEntry* _tmp17_;
+	GtkBox* _tmp18_;
+	GtkBox* _tmp19_;
+	GtkBox* _tmp20_;
+	GtkButton* _tmp21_;
+	GtkBox* _tmp22_;
+	GtkButton* _tmp23_;
+	GtkBox* _tmp24_;
+	GtkBox* _tmp25_;
+	GtkComboBox* _tmp26_;
+	GtkBox* _tmp27_;
+	GtkButton* _tmp28_;
+	GtkBox* _tmp29_;
+	GtkBox* _tmp30_;
+	GtkBox* _tmp31_;
 #line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12628,165 +12553,159 @@ static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_win
 #line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->cancel_button;
 #line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = _ ("Return to current photo dimensions");
-#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _tmp2_);
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _ ("Return to current photo dimensions"));
 #line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = self->cancel_button;
+	_tmp2_ = self->cancel_button;
 #line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_button_set_image_position (_tmp3_, GTK_POS_LEFT);
-#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = self->ok_button;
+	gtk_button_set_image_position (_tmp2_, GTK_POS_LEFT);
 #line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = _ ("Set the crop for this photo");
+	_tmp3_ = self->ok_button;
 #line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _tmp5_);
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _ ("Set the crop for this photo"));
 #line 670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = self->ok_button;
+	_tmp4_ = self->ok_button;
 #line 670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_button_set_image_position (_tmp6_, GTK_POS_LEFT);
+	gtk_button_set_image_position (_tmp4_, GTK_POS_LEFT);
 #line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = (GtkComboBox*) gtk_combo_box_new ();
+	_tmp5_ = (GtkComboBox*) gtk_combo_box_new ();
 #line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp7_);
+	g_object_ref_sink (_tmp5_);
 #line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->constraint_combo);
 #line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->constraint_combo = _tmp7_;
+	self->constraint_combo = _tmp5_;
 #line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+	_tmp6_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
 #line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp8_);
+	g_object_ref_sink (_tmp6_);
 #line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	combo_text_renderer = _tmp8_;
+	combo_text_renderer = _tmp6_;
 #line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = self->constraint_combo;
+	_tmp7_ = self->constraint_combo;
 #line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
+	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
 #line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = self->constraint_combo;
+	_tmp8_ = self->constraint_combo;
 #line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 0);
+	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 0);
 #line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = self->constraint_combo;
+	_tmp9_ = self->constraint_combo;
 #line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_combo_box_set_row_separator_func (_tmp11_, _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL);
+	gtk_combo_box_set_row_separator_func (_tmp9_, _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL);
 #line 677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = self->constraint_combo;
+	_tmp10_ = self->constraint_combo;
 #line 677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_combo_box_set_active (_tmp12_, 0);
+	gtk_combo_box_set_active (_tmp10_, 0);
 #line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = (GtkImage*) gtk_image_new_from_icon_name ("crop-pivot-reticle", GTK_ICON_SIZE_LARGE_TOOLBAR);
+	_tmp11_ = (GtkImage*) gtk_image_new_from_icon_name ("crop-pivot-reticle", GTK_ICON_SIZE_LARGE_TOOLBAR);
 #line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp13_);
+	g_object_ref_sink (_tmp11_);
 #line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	image = _tmp13_;
+	image = _tmp11_;
 #line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = self->pivot_reticle_button;
+	_tmp12_ = self->pivot_reticle_button;
 #line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_button_set_image (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget));
-#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = self->pivot_reticle_button;
+	gtk_button_set_image (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget));
 #line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = _ ("Pivot the crop rectangle between portrait and landscape orientations");
+	_tmp13_ = self->pivot_reticle_button;
 #line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), _tmp16_);
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), _ ("Pivot the crop rectangle between portrait and landscape orientations"));
 #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = self->custom_width_entry;
+	_tmp14_ = self->custom_width_entry;
 #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_entry_set_width_chars (_tmp17_, 4);
+	gtk_entry_set_width_chars (_tmp14_, 4);
 #line 684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = self->custom_width_entry;
+	_tmp15_ = self->custom_width_entry;
 #line 684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_set (_tmp18_, "editable", TRUE, NULL);
+	g_object_set (_tmp15_, "editable", TRUE, NULL);
 #line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = self->custom_height_entry;
+	_tmp16_ = self->custom_height_entry;
 #line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_entry_set_width_chars (_tmp19_, 4);
+	gtk_entry_set_width_chars (_tmp16_, 4);
 #line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = self->custom_height_entry;
+	_tmp17_ = self->custom_height_entry;
 #line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_set (_tmp20_, "editable", TRUE, NULL);
+	g_object_set (_tmp17_, "editable", TRUE, NULL);
 #line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
+	_tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
 #line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp21_);
+	g_object_ref_sink (_tmp18_);
 #line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->response_layout);
 #line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->response_layout = _tmp21_;
+	self->response_layout = _tmp18_;
 #line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = self->response_layout;
+	_tmp19_ = self->response_layout;
 #line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_set_homogeneous (_tmp22_, TRUE);
+	gtk_box_set_homogeneous (_tmp19_, TRUE);
 #line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = self->response_layout;
+	_tmp20_ = self->response_layout;
 #line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = self->cancel_button;
+	_tmp21_ = self->cancel_button;
 #line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget));
 #line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = self->response_layout;
+	_tmp22_ = self->response_layout;
 #line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = self->ok_button;
+	_tmp23_ = self->ok_button;
 #line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
 #line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
+	_tmp24_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
 #line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp27_);
+	g_object_ref_sink (_tmp24_);
 #line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->layout);
 #line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->layout = _tmp27_;
+	self->layout = _tmp24_;
 #line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = self->layout;
+	_tmp25_ = self->layout;
 #line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = self->constraint_combo;
+	_tmp26_ = self->constraint_combo;
 #line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
 #line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp30_ = self->layout;
+	_tmp27_ = self->layout;
 #line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = self->pivot_reticle_button;
+	_tmp28_ = self->pivot_reticle_button;
 #line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
 #line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp32_ = self->layout;
+	_tmp29_ = self->layout;
 #line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp33_ = self->response_layout;
+	_tmp30_ = self->response_layout;
 #line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget));
 #line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp34_ = self->layout;
+	_tmp31_ = self->layout;
 #line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
 #line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (image);
 #line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (combo_text_renderer);
 #line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 12771 "EditingTools.c"
+#line 12690 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_new (GtkWindow* container) {
 #line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_crop_tool_window_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CROP_TOOL_WINDOW, container);
-#line 12778 "EditingTools.c"
+#line 12697 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (GtkTreeModel* model, GtkTreeIter* iter) {
 	gboolean result = FALSE;
 	GValue val = {0};
-	GtkTreeModel* _tmp0_ = NULL;
-	GtkTreeIter _tmp1_ = {0};
+	GtkTreeModel* _tmp0_;
+	GtkTreeIter _tmp1_;
 	GValue _tmp2_ = {0};
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gboolean _tmp5_;
 #line 701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
 #line 701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12815,7 +12734,7 @@ static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separa
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
 #line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12819 "EditingTools.c"
+#line 12738 "EditingTools.c"
 }
 
 
@@ -12824,17 +12743,17 @@ static void editing_tools_crop_tool_crop_tool_window_class_init (EditingToolsCro
 	editing_tools_crop_tool_crop_tool_window_parent_class = g_type_class_peek_parent (klass);
 #line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_crop_tool_crop_tool_window_finalize;
-#line 12828 "EditingTools.c"
+#line 12747 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_crop_tool_window_instance_init (EditingToolsCropToolCropToolWindow * self) {
-	GtkButton* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	GtkButton* _tmp2_ = NULL;
-	GtkEntry* _tmp3_ = NULL;
-	GtkEntry* _tmp4_ = NULL;
-	GtkLabel* _tmp5_ = NULL;
+	GtkButton* _tmp0_;
+	GtkButton* _tmp1_;
+	GtkButton* _tmp2_;
+	GtkEntry* _tmp3_;
+	GtkEntry* _tmp4_;
+	GtkLabel* _tmp5_;
 #line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = (GtkButton*) gtk_button_new_with_label (RESOURCES_CROP_LABEL);
 #line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12881,11 +12800,11 @@ static void editing_tools_crop_tool_crop_tool_window_instance_init (EditingTools
 	self->normal_width = -1;
 #line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->normal_height = -1;
-#line 12885 "EditingTools.c"
+#line 12804 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_crop_tool_window_finalize (GObject* obj) {
+static void editing_tools_crop_tool_crop_tool_window_finalize (GObject * obj) {
 	EditingToolsCropToolCropToolWindow * self;
 #line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_CROP_TOOL_TYPE_CROP_TOOL_WINDOW, EditingToolsCropToolCropToolWindow);
@@ -12911,7 +12830,7 @@ static void editing_tools_crop_tool_crop_tool_window_finalize (GObject* obj) {
 	_g_object_unref0 (self->layout);
 #line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_crop_tool_crop_tool_window_parent_class)->finalize (obj);
-#line 12915 "EditingTools.c"
+#line 12834 "EditingTools.c"
 }
 
 
@@ -12935,35 +12854,35 @@ static void editing_tools_crop_tool_class_init (EditingToolsCropToolClass * klas
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsCropToolPrivate));
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->activate = (void (*)(EditingToolsEditingTool*, EditingToolsPhotoCanvas*)) editing_tools_crop_tool_real_activate;
+	((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_crop_tool_real_activate;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*)(EditingToolsEditingTool*, GdkEventKey*)) editing_tools_crop_tool_real_on_keypress;
+	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_crop_tool_real_on_keypress;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*)(EditingToolsEditingTool*)) editing_tools_crop_tool_real_deactivate;
+	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_crop_tool_real_deactivate;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*)(EditingToolsEditingTool*)) editing_tools_crop_tool_real_get_tool_window;
+	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_crop_tool_real_get_tool_window;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*)(EditingToolsEditingTool*, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_crop_tool_real_get_display_pixbuf;
+	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*) (EditingToolsEditingTool *, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_crop_tool_real_get_display_pixbuf;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*)(EditingToolsEditingTool*, gint, gint)) editing_tools_crop_tool_real_on_left_click;
+	((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_crop_tool_real_on_left_click;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*)(EditingToolsEditingTool*, gint, gint)) editing_tools_crop_tool_real_on_left_released;
+	((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_crop_tool_real_on_left_released;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*)(EditingToolsEditingTool*, gint, gint, GdkModifierType)) editing_tools_crop_tool_real_on_motion;
+	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_crop_tool_real_on_motion;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->paint = (void (*)(EditingToolsEditingTool*, cairo_t*)) editing_tools_crop_tool_real_paint;
-#line 12956 "EditingTools.c"
+	((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_crop_tool_real_paint;
+#line 12875 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_instance_init (EditingToolsCropTool * self) {
-	gint _tmp0_ = 0;
-	EditingToolsCropToolConstraintDescription** _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	EditingToolsCropToolConstraintDescription** _tmp3_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	GtkListStore* _tmp5_ = NULL;
+	gint _tmp0_;
+	EditingToolsCropToolConstraintDescription** _tmp1_;
+	gint _tmp2_;
+	EditingToolsCropToolConstraintDescription** _tmp3_;
+	EditingToolsCropToolConstraintDescription** _tmp4_;
+	gint _tmp4__length1;
+	GtkListStore* _tmp5_;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_CROP_TOOL_GET_PRIVATE (self);
 #line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13024,11 +12943,11 @@ static void editing_tools_crop_tool_instance_init (EditingToolsCropTool * self)
 	self->priv->custom_init_height = -1;
 #line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->pre_aspect_ratio = EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO;
-#line 13028 "EditingTools.c"
+#line 12947 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_finalize (EditingToolsEditingTool* obj) {
+static void editing_tools_crop_tool_finalize (EditingToolsEditingTool * obj) {
 	EditingToolsCropTool * self;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
@@ -13050,7 +12969,7 @@ static void editing_tools_crop_tool_finalize (EditingToolsEditingTool* obj) {
 	_g_object_unref0 (self->priv->constraint_list);
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->finalize (obj);
-#line 13054 "EditingTools.c"
+#line 12973 "EditingTools.c"
 }
 
 
@@ -13068,7 +12987,7 @@ GType editing_tools_crop_tool_get_type (void) {
 
 static void editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self) {
 	GdkPoint default_center = {0};
-	GdkPoint _tmp0_ = {0};
+	GdkPoint _tmp0_;
 #line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memset (self, 0, sizeof (EditingToolsRedeyeInstance));
 #line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13079,26 +12998,26 @@ static void editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self
 	(*self).center = _tmp0_;
 #line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*self).radius = EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS;
-#line 13083 "EditingTools.c"
+#line 13002 "EditingTools.c"
 }
 
 
 void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* inst, GdkRectangle* result) {
 	GdkRectangle _result_ = {0};
-	EditingToolsRedeyeInstance _tmp0_ = {0};
-	GdkPoint _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	EditingToolsRedeyeInstance _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	EditingToolsRedeyeInstance _tmp5_ = {0};
-	GdkPoint _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	EditingToolsRedeyeInstance _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	EditingToolsRedeyeInstance _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
+	EditingToolsRedeyeInstance _tmp0_;
+	GdkPoint _tmp1_;
+	gint _tmp2_;
+	EditingToolsRedeyeInstance _tmp3_;
+	gint _tmp4_;
+	EditingToolsRedeyeInstance _tmp5_;
+	GdkPoint _tmp6_;
+	gint _tmp7_;
+	EditingToolsRedeyeInstance _tmp8_;
+	gint _tmp9_;
+	EditingToolsRedeyeInstance _tmp10_;
+	gint _tmp11_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
 #line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (inst != NULL);
 #line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13143,26 +13062,26 @@ void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* i
 	*result = _result_;
 #line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13147 "EditingTools.c"
+#line 13066 "EditingTools.c"
 }
 
 
 void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, EditingToolsRedeyeInstance* result) {
 	GdkRectangle in_rect = {0};
-	GdkRectangle _tmp0_ = {0};
+	GdkRectangle _tmp0_;
 	EditingToolsRedeyeInstance _result_ = {0};
-	GdkRectangle _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	GdkRectangle _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	EditingToolsRedeyeInstance _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	GdkRectangle _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	EditingToolsRedeyeInstance _tmp11_ = {0};
-	gint _tmp12_ = 0;
+	GdkRectangle _tmp1_;
+	gint _tmp2_;
+	GdkRectangle _tmp3_;
+	gint _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	EditingToolsRedeyeInstance _tmp7_;
+	gint _tmp8_;
+	GdkRectangle _tmp9_;
+	gint _tmp10_;
+	EditingToolsRedeyeInstance _tmp11_;
+	gint _tmp12_;
 #line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (rect != NULL);
 #line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13205,7 +13124,7 @@ void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, Editing
 	*result = _result_;
 #line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13209 "EditingTools.c"
+#line 13128 "EditingTools.c"
 }
 
 
@@ -13217,14 +13136,14 @@ EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingTool
 	memcpy (dup, self, sizeof (EditingToolsRedeyeInstance));
 #line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return dup;
-#line 13221 "EditingTools.c"
+#line 13140 "EditingTools.c"
 }
 
 
 void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self) {
 #line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_free (self);
-#line 13228 "EditingTools.c"
+#line 13147 "EditingTools.c"
 }
 
 
@@ -13245,39 +13164,39 @@ static EditingToolsRedeyeTool* editing_tools_redeye_tool_construct (GType object
 	self = (EditingToolsRedeyeTool*) editing_tools_editing_tool_construct (object_type, "RedeyeTool");
 #line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 13249 "EditingTools.c"
+#line 13168 "EditingTools.c"
 }
 
 
 static EditingToolsRedeyeTool* editing_tools_redeye_tool_new (void) {
 #line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_redeye_tool_construct (EDITING_TOOLS_TYPE_REDEYE_TOOL);
-#line 13256 "EditingTools.c"
+#line 13175 "EditingTools.c"
 }
 
 
 EditingToolsRedeyeTool* editing_tools_redeye_tool_factory (void) {
 	EditingToolsRedeyeTool* result = NULL;
-	EditingToolsRedeyeTool* _tmp0_ = NULL;
+	EditingToolsRedeyeTool* _tmp0_;
 #line 1928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_redeye_tool_new ();
 #line 1928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
 #line 1928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13269 "EditingTools.c"
+#line 13188 "EditingTools.c"
 }
 
 
 gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling) {
 	gboolean result = FALSE;
 	Dimensions dim = {0};
-	Photo* _tmp0_ = NULL;
+	Photo* _tmp0_;
 	Dimensions _tmp1_ = {0};
 	Dimensions _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-	Dimensions _tmp4_ = {0};
-	gint _tmp5_ = 0;
+	Dimensions _tmp4_;
+	gint _tmp5_;
 #line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
 #line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13296,48 +13215,48 @@ gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling)
 	_tmp5_ = _tmp4_.width;
 #line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2)) {
-#line 13300 "EditingTools.c"
-		Dimensions _tmp6_ = {0};
-		gint _tmp7_ = 0;
+#line 13219 "EditingTools.c"
+		Dimensions _tmp6_;
+		gint _tmp7_;
 #line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = dim;
 #line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_.height;
 #line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2);
-#line 13309 "EditingTools.c"
+#line 13228 "EditingTools.c"
 	} else {
 #line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 13313 "EditingTools.c"
+#line 13232 "EditingTools.c"
 	}
 #line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp3_;
 #line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13319 "EditingTools.c"
+#line 13238 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_new_interaction_instance (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas, EditingToolsRedeyeInstance* result) {
 	GdkRectangle photo_bounds = {0};
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 	GdkRectangle _tmp1_ = {0};
 	GdkPoint photo_center = {0};
 	GdkPoint _tmp2_ = {0};
-	GdkRectangle _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	GdkRectangle _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	GdkRectangle _tmp9_ = {0};
-	gint _tmp10_ = 0;
+	GdkRectangle _tmp3_;
+	gint _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	GdkRectangle _tmp7_;
+	gint _tmp8_;
+	GdkRectangle _tmp9_;
+	gint _tmp10_;
 	EditingToolsRedeyeInstance _result_ = {0};
-	GdkPoint _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	GdkPoint _tmp13_ = {0};
-	gint _tmp14_ = 0;
+	GdkPoint _tmp11_;
+	gint _tmp12_;
+	GdkPoint _tmp13_;
+	gint _tmp14_;
 #line 1938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 1938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13392,21 +13311,21 @@ static void editing_tools_redeye_tool_new_interaction_instance (EditingToolsRede
 	*result = _result_;
 #line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13396 "EditingTools.c"
+#line 13315 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self, cairo_t* ctx, Dimensions* dim) {
-	cairo_t* _tmp0_ = NULL;
-	cairo_surface_t* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
-	cairo_t* _tmp3_ = NULL;
-	cairo_t* _tmp4_ = NULL;
-	cairo_t* _tmp5_ = NULL;
-	cairo_surface_t* _tmp6_ = NULL;
-	cairo_t* _tmp7_ = NULL;
-	cairo_t* _tmp8_ = NULL;
-	cairo_t* _tmp9_ = NULL;
+	cairo_t* _tmp0_;
+	cairo_surface_t* _tmp1_;
+	cairo_t* _tmp2_;
+	cairo_t* _tmp3_;
+	cairo_t* _tmp4_;
+	cairo_t* _tmp5_;
+	cairo_surface_t* _tmp6_;
+	cairo_t* _tmp7_;
+	cairo_t* _tmp8_;
+	cairo_t* _tmp9_;
 #line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13449,31 +13368,31 @@ static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self,
 	_tmp9_ = self->priv->thin_white_ctx;
 #line 1959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp9_, (gdouble) 1);
-#line 13453 "EditingTools.c"
+#line 13372 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTool* self, EditingToolsRedeyeInstance* inst) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	EditingToolsRedeyeInstance _tmp2_ = {0};
-	GdkPoint _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	EditingToolsRedeyeInstance _tmp5_ = {0};
-	GdkPoint _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	EditingToolsRedeyeInstance _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	EditingToolsPhotoCanvas* _tmp10_ = NULL;
-	cairo_t* _tmp11_ = NULL;
-	EditingToolsRedeyeInstance _tmp12_ = {0};
-	GdkPoint _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	EditingToolsRedeyeInstance _tmp15_ = {0};
-	GdkPoint _tmp16_ = {0};
-	gint _tmp17_ = 0;
-	EditingToolsRedeyeInstance _tmp18_ = {0};
-	gint _tmp19_ = 0;
+	EditingToolsPhotoCanvas* _tmp0_;
+	cairo_t* _tmp1_;
+	EditingToolsRedeyeInstance _tmp2_;
+	GdkPoint _tmp3_;
+	gint _tmp4_;
+	EditingToolsRedeyeInstance _tmp5_;
+	GdkPoint _tmp6_;
+	gint _tmp7_;
+	EditingToolsRedeyeInstance _tmp8_;
+	gint _tmp9_;
+	EditingToolsPhotoCanvas* _tmp10_;
+	cairo_t* _tmp11_;
+	EditingToolsRedeyeInstance _tmp12_;
+	GdkPoint _tmp13_;
+	gint _tmp14_;
+	EditingToolsRedeyeInstance _tmp15_;
+	GdkPoint _tmp16_;
+	gint _tmp17_;
+	EditingToolsRedeyeInstance _tmp18_;
+	gint _tmp19_;
 #line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13522,16 +13441,16 @@ static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTo
 	_tmp19_ = _tmp18_.radius;
 #line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_circle (_tmp10_, _tmp11_, _tmp14_, _tmp17_, _tmp19_);
-#line 13526 "EditingTools.c"
+#line 13445 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRedeyeTool* self, GtkScrollType type) {
 	gboolean result = FALSE;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	EditingToolsPhotoCanvas* _tmp3_ = NULL;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
+	EditingToolsPhotoCanvas* _tmp3_;
 #line 1969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self), FALSE);
 #line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13550,57 +13469,57 @@ static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRed
 	result = FALSE;
 #line 1975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13554 "EditingTools.c"
+#line 13473 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self) {
 	GdkRectangle bounds_rect_user = {0};
-	EditingToolsRedeyeInstance _tmp0_ = {0};
+	EditingToolsRedeyeInstance _tmp0_;
 	GdkRectangle _tmp1_ = {0};
 	GdkRectangle bounds_rect_active = {0};
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	GdkRectangle _tmp3_ = {0};
+	EditingToolsPhotoCanvas* _tmp2_;
+	GdkRectangle _tmp3_;
 	GdkRectangle _tmp4_ = {0};
 	GdkRectangle bounds_rect_unscaled = {0};
-	EditingToolsPhotoCanvas* _tmp5_ = NULL;
-	GdkRectangle _tmp6_ = {0};
+	EditingToolsPhotoCanvas* _tmp5_;
+	GdkRectangle _tmp6_;
 	GdkRectangle _tmp7_ = {0};
 	GdkRectangle bounds_rect_raw = {0};
-	EditingToolsPhotoCanvas* _tmp8_ = NULL;
-	GdkRectangle _tmp9_ = {0};
+	EditingToolsPhotoCanvas* _tmp8_;
+	GdkRectangle _tmp9_;
 	GdkRectangle _tmp10_ = {0};
 	EditingToolsRedeyeInstance instance_raw = {0};
-	GdkRectangle _tmp11_ = {0};
+	GdkRectangle _tmp11_;
 	EditingToolsRedeyeInstance _tmp12_ = {0};
 	Dimensions dimensions = {0};
-	EditingToolsPhotoCanvas* _tmp13_ = NULL;
-	Photo* _tmp14_ = NULL;
-	Photo* _tmp15_ = NULL;
+	EditingToolsPhotoCanvas* _tmp13_;
+	Photo* _tmp14_;
+	Photo* _tmp15_;
 	Dimensions _tmp16_ = {0};
-	Dimensions _tmp17_ = {0};
+	Dimensions _tmp17_;
 	gdouble theta = 0.0;
-	EditingToolsPhotoCanvas* _tmp18_ = NULL;
-	Photo* _tmp19_ = NULL;
-	Photo* _tmp20_ = NULL;
+	EditingToolsPhotoCanvas* _tmp18_;
+	Photo* _tmp19_;
+	Photo* _tmp20_;
 	gdouble _tmp21_ = 0.0;
-	EditingToolsRedeyeInstance _tmp22_ = {0};
-	GdkPoint _tmp23_ = {0};
-	Dimensions _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	Dimensions _tmp26_ = {0};
-	gint _tmp27_ = 0;
-	gdouble _tmp28_ = 0.0;
+	EditingToolsRedeyeInstance _tmp22_;
+	GdkPoint _tmp23_;
+	Dimensions _tmp24_;
+	gint _tmp25_;
+	Dimensions _tmp26_;
+	gint _tmp27_;
+	gdouble _tmp28_;
 	GdkPoint _tmp29_ = {0};
 	RedeyeCommand* command = NULL;
-	EditingToolsPhotoCanvas* _tmp30_ = NULL;
-	Photo* _tmp31_ = NULL;
-	Photo* _tmp32_ = NULL;
-	EditingToolsRedeyeInstance _tmp33_ = {0};
-	RedeyeCommand* _tmp34_ = NULL;
-	RedeyeCommand* _tmp35_ = NULL;
-	CommandManager* _tmp36_ = NULL;
-	CommandManager* _tmp37_ = NULL;
+	EditingToolsPhotoCanvas* _tmp30_;
+	Photo* _tmp31_;
+	Photo* _tmp32_;
+	EditingToolsRedeyeInstance _tmp33_;
+	RedeyeCommand* _tmp34_;
+	RedeyeCommand* _tmp35_;
+	CommandManager* _tmp36_;
+	CommandManager* _tmp37_;
 #line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13711,18 +13630,18 @@ static void editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self) {
 	_command_manager_unref0 (_tmp37_);
 #line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 13715 "EditingTools.c"
+#line 13634 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool* self, GeeMap* map) {
-	GeeMap* _tmp0_ = NULL;
-	EditingToolsPhotoCanvas* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	EditingToolsPhotoCanvas* _tmp17_ = NULL;
+	GeeMap* _tmp0_;
+	EditingToolsPhotoCanvas* _tmp1_;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
+	EditingToolsPhotoCanvas* _tmp17_;
 	GError * _inner_error_ = NULL;
 #line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
@@ -13746,18 +13665,18 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 	if (_tmp5_) {
 #line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13750 "EditingTools.c"
+#line 13669 "EditingTools.c"
 	}
 	{
 		GdkPixbuf* _tmp6_ = NULL;
-		EditingToolsPhotoCanvas* _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
-		Photo* _tmp9_ = NULL;
-		EditingToolsPhotoCanvas* _tmp10_ = NULL;
+		EditingToolsPhotoCanvas* _tmp7_;
+		Photo* _tmp8_;
+		Photo* _tmp9_;
+		EditingToolsPhotoCanvas* _tmp10_;
 		Scaling _tmp11_ = {0};
-		GdkPixbuf* _tmp12_ = NULL;
-		GdkPixbuf* _tmp13_ = NULL;
-		GdkPixbuf* _tmp14_ = NULL;
+		GdkPixbuf* _tmp12_;
+		GdkPixbuf* _tmp13_;
+		GdkPixbuf* _tmp14_;
 #line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13778,7 +13697,7 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		_tmp6_ = _tmp13_;
 #line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13782 "EditingTools.c"
+#line 13701 "EditingTools.c"
 			goto __catch22_g_error;
 		}
 #line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13791,14 +13710,14 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		self->priv->current_pixbuf = _tmp14_;
 #line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp6_);
-#line 13795 "EditingTools.c"
+#line 13714 "EditingTools.c"
 	}
 	goto __finally22;
 	__catch22_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
+		GError* _tmp15_;
+		const gchar* _tmp16_;
 #line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		err = _inner_error_;
 #line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13810,12 +13729,12 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 #line 2016 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_warning ("EditingTools.vala:2016: %s", _tmp16_);
 #line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "aborted");
+		g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ABORTED_SIGNAL], 0);
 #line 2019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_error_free0 (err);
 #line 2019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13819 "EditingTools.c"
+#line 13738 "EditingTools.c"
 	}
 	__finally22:
 #line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13826,21 +13745,21 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		g_clear_error (&_inner_error_);
 #line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13830 "EditingTools.c"
+#line 13749 "EditingTools.c"
 	}
 #line 2022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp17_);
-#line 13836 "EditingTools.c"
+#line 13755 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self) {
-	GdkPixbuf* _tmp0_ = NULL;
-	EditingToolsPhotoCanvas* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
+	GdkPixbuf* _tmp0_;
+	EditingToolsPhotoCanvas* _tmp1_;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
 	Dimensions _tmp4_ = {0};
 #line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
@@ -13855,41 +13774,41 @@ static void editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self) {
 #line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp4_);
 #line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", NULL, _tmp0_, &_tmp4_, FALSE);
+	g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, NULL, _tmp0_, &_tmp4_, FALSE);
 #line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp3_);
-#line 13862 "EditingTools.c"
+#line 13781 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool* self) {
 	GdkRectangle scaled_pixbuf_position = {0};
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 	GdkRectangle _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	GdkRectangle _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	GdkRectangle _tmp6_ = {0};
-	gint _tmp7_ = 0;
+	gint _tmp2_;
+	GdkRectangle _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
 	gdouble scale_factor = 0.0;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	GdkRectangle _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	EditingToolsRedeyeInstance _tmp12_ = {0};
-	GdkPoint _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	EditingToolsRedeyeInstance _tmp15_ = {0};
-	GdkPoint _tmp16_ = {0};
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	GdkRectangle _tmp19_ = {0};
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	GdkRectangle _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	GdkRectangle _tmp24_ = {0};
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
+	GdkRectangle _tmp10_;
+	gint _tmp11_;
+	EditingToolsRedeyeInstance _tmp12_;
+	GdkPoint _tmp13_;
+	gint _tmp14_;
+	EditingToolsRedeyeInstance _tmp15_;
+	GdkPoint _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	GdkRectangle _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
+	GdkRectangle _tmp22_;
+	gint _tmp23_;
+	GdkRectangle _tmp24_;
 #line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 2030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13964,58 +13883,58 @@ static void editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool*
 	_g_object_unref0 (self->priv->current_pixbuf);
 #line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_pixbuf = NULL;
-#line 13968 "EditingTools.c"
+#line 13887 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_photos_altered ((EditingToolsRedeyeTool*) self, items);
-#line 13975 "EditingTools.c"
+#line 13894 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsRedeyeTool * self;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 	EditingToolsRedeyeInstance _tmp1_ = {0};
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	cairo_t* _tmp3_ = NULL;
-	cairo_t* _tmp4_ = NULL;
-	EditingToolsPhotoCanvas* _tmp5_ = NULL;
+	EditingToolsPhotoCanvas* _tmp2_;
+	cairo_t* _tmp3_;
+	cairo_t* _tmp4_;
+	EditingToolsPhotoCanvas* _tmp5_;
 	Dimensions _tmp6_ = {0};
-	EditingToolsPhotoCanvas* _tmp7_ = NULL;
-	EditingToolsPhotoCanvas* _tmp8_ = NULL;
+	EditingToolsPhotoCanvas* _tmp7_;
+	EditingToolsPhotoCanvas* _tmp8_;
 	GdkRectangle _tmp9_ = {0};
-	EditingToolsPhotoCanvas* _tmp10_ = NULL;
-	GdkPixbuf* _tmp11_ = NULL;
-	EditingToolsPhotoCanvas* _tmp12_ = NULL;
-	GtkWindow* _tmp13_ = NULL;
-	GtkWindow* _tmp14_ = NULL;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp15_ = NULL;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp16_ = NULL;
-	GtkScale* _tmp17_ = NULL;
-	EditingToolsRedeyeInstance _tmp18_ = {0};
-	gint _tmp19_ = 0;
+	EditingToolsPhotoCanvas* _tmp10_;
+	GdkPixbuf* _tmp11_;
+	EditingToolsPhotoCanvas* _tmp12_;
+	GtkWindow* _tmp13_;
+	GtkWindow* _tmp14_;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp15_;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp16_;
+	GtkScale* _tmp17_;
+	EditingToolsRedeyeInstance _tmp18_;
+	gint _tmp19_;
 	GdkDisplay* display = NULL;
-	EditingToolsPhotoCanvas* _tmp20_ = NULL;
-	GdkWindow* _tmp21_ = NULL;
-	GdkWindow* _tmp22_ = NULL;
-	GdkDisplay* _tmp23_ = NULL;
-	GdkDisplay* _tmp24_ = NULL;
-	GdkDisplay* _tmp25_ = NULL;
-	GdkDisplay* _tmp26_ = NULL;
-	GdkCursor* _tmp27_ = NULL;
-	GdkDisplay* _tmp28_ = NULL;
-	GdkCursor* _tmp29_ = NULL;
+	EditingToolsPhotoCanvas* _tmp20_;
+	GdkWindow* _tmp21_;
+	GdkWindow* _tmp22_;
+	GdkDisplay* _tmp23_;
+	GdkDisplay* _tmp24_;
+	GdkDisplay* _tmp25_;
+	GdkDisplay* _tmp26_;
+	GdkCursor* _tmp27_;
+	GdkDisplay* _tmp28_;
+	GdkCursor* _tmp29_;
 	DataCollection* owner = NULL;
-	EditingToolsPhotoCanvas* _tmp30_ = NULL;
-	Photo* _tmp31_ = NULL;
-	Photo* _tmp32_ = NULL;
-	DataCollection* _tmp33_ = NULL;
-	DataCollection* _tmp34_ = NULL;
-	DataCollection* _tmp35_ = NULL;
-	EditingToolsPhotoCanvas* _tmp37_ = NULL;
+	EditingToolsPhotoCanvas* _tmp30_;
+	Photo* _tmp31_;
+	Photo* _tmp32_;
+	DataCollection* _tmp33_;
+	DataCollection* _tmp34_;
+	DataCollection* _tmp35_;
+	EditingToolsPhotoCanvas* _tmp37_;
 #line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14136,13 +14055,13 @@ static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* ba
 	_tmp35_ = owner;
 #line 2074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp35_ != NULL) {
-#line 14140 "EditingTools.c"
-		DataCollection* _tmp36_ = NULL;
+#line 14059 "EditingTools.c"
+		DataCollection* _tmp36_;
 #line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp36_ = owner;
 #line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_connect (_tmp36_, "items-altered", (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
-#line 14146 "EditingTools.c"
+#line 14065 "EditingTools.c"
 	}
 #line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = canvas;
@@ -14152,29 +14071,29 @@ static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* ba
 	_data_collection_unref0 (owner);
 #line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (display);
-#line 14156 "EditingTools.c"
+#line 14075 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool* base) {
 	EditingToolsRedeyeTool * self;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp10_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp10_;
 #line 2080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 14170 "EditingTools.c"
+#line 14089 "EditingTools.c"
 		DataCollection* owner = NULL;
-		EditingToolsPhotoCanvas* _tmp1_ = NULL;
-		Photo* _tmp2_ = NULL;
-		Photo* _tmp3_ = NULL;
-		DataCollection* _tmp4_ = NULL;
-		DataCollection* _tmp5_ = NULL;
-		DataCollection* _tmp6_ = NULL;
-		EditingToolsPhotoCanvas* _tmp9_ = NULL;
+		EditingToolsPhotoCanvas* _tmp1_;
+		Photo* _tmp2_;
+		Photo* _tmp3_;
+		DataCollection* _tmp4_;
+		DataCollection* _tmp5_;
+		DataCollection* _tmp6_;
+		EditingToolsPhotoCanvas* _tmp9_;
 #line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14193,16 +14112,16 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 		_tmp6_ = owner;
 #line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ != NULL) {
-#line 14197 "EditingTools.c"
-			DataCollection* _tmp7_ = NULL;
-			guint _tmp8_ = 0U;
+#line 14116 "EditingTools.c"
+			DataCollection* _tmp7_;
+			guint _tmp8_;
 #line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = owner;
 #line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE);
 #line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
-#line 14206 "EditingTools.c"
+#line 14125 "EditingTools.c"
 		}
 #line 2086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -14210,15 +14129,15 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 		editing_tools_redeye_tool_unbind_canvas_handlers (self, _tmp9_);
 #line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_data_collection_unref0 (owner);
-#line 14214 "EditingTools.c"
+#line 14133 "EditingTools.c"
 	}
 #line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->redeye_tool_window;
 #line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != NULL) {
-#line 14220 "EditingTools.c"
-		EditingToolsRedeyeToolRedeyeToolWindow* _tmp11_ = NULL;
-		EditingToolsRedeyeToolRedeyeToolWindow* _tmp12_ = NULL;
+#line 14139 "EditingTools.c"
+		EditingToolsRedeyeToolRedeyeToolWindow* _tmp11_;
+		EditingToolsRedeyeToolRedeyeToolWindow* _tmp12_;
 #line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_redeye_tool_unbind_window_handlers (self);
 #line 2091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14233,31 +14152,31 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 		_g_object_unref0 (self->priv->redeye_tool_window);
 #line 2093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->redeye_tool_window = NULL;
-#line 14237 "EditingTools.c"
+#line 14156 "EditingTools.c"
 	}
 #line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 14241 "EditingTools.c"
+#line 14160 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) {
 #line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_prepare_ctx ((EditingToolsRedeyeTool*) self, ctx, dim);
-#line 14248 "EditingTools.c"
+#line 14167 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
 #line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_canvas_resize ((EditingToolsRedeyeTool*) self);
-#line 14255 "EditingTools.c"
+#line 14174 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	EditingToolsPhotoCanvas* _tmp1_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	EditingToolsPhotoCanvas* _tmp1_;
 #line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14270,15 +14189,15 @@ static void editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTo
 	_tmp1_ = canvas;
 #line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 14274 "EditingTools.c"
+#line 14193 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	EditingToolsPhotoCanvas* _tmp0_;
+	guint _tmp1_;
+	EditingToolsPhotoCanvas* _tmp2_;
+	guint _tmp3_;
 #line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14295,21 +14214,21 @@ static void editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeye
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE);
 #line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 14299 "EditingTools.c"
+#line 14218 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_apply_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_apply ((EditingToolsRedeyeTool*) self);
-#line 14306 "EditingTools.c"
+#line 14225 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_close_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_close ((EditingToolsRedeyeTool*) self);
-#line 14313 "EditingTools.c"
+#line 14232 "EditingTools.c"
 }
 
 
@@ -14318,17 +14237,17 @@ static gboolean _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_chang
 	result = editing_tools_redeye_tool_on_size_slider_adjust ((EditingToolsRedeyeTool*) self, scroll);
 #line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14322 "EditingTools.c"
+#line 14241 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTool* self) {
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp2_ = NULL;
-	GtkButton* _tmp3_ = NULL;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp4_ = NULL;
-	GtkScale* _tmp5_ = NULL;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_;
+	GtkButton* _tmp1_;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp2_;
+	GtkButton* _tmp3_;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp4_;
+	GtkScale* _tmp5_;
 #line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14349,20 +14268,20 @@ static void editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTo
 	_tmp5_ = _tmp4_->slider;
 #line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_range_get_type (), GtkRange), "change-value", (GCallback) _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self);
-#line 14353 "EditingTools.c"
+#line 14272 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeyeTool* self) {
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp3_ = NULL;
-	GtkButton* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp6_ = NULL;
-	GtkScale* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_;
+	GtkButton* _tmp1_;
+	guint _tmp2_;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp3_;
+	GtkButton* _tmp4_;
+	guint _tmp5_;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp6_;
+	GtkScale* _tmp7_;
+	guint _tmp8_;
 #line 2115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14389,15 +14308,15 @@ static void editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeye
 	g_signal_parse_name ("change-value", gtk_range_get_type (), &_tmp8_, NULL, FALSE);
 #line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self);
-#line 14393 "EditingTools.c"
+#line 14312 "EditingTools.c"
 }
 
 
 static EditingToolsEditingToolWindow* editing_tools_redeye_tool_real_get_tool_window (EditingToolsEditingTool* base) {
 	EditingToolsRedeyeTool * self;
 	EditingToolsEditingToolWindow* result = NULL;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_ = NULL;
-	EditingToolsEditingToolWindow* _tmp1_ = NULL;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_;
+	EditingToolsEditingToolWindow* _tmp1_;
 #line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14408,22 +14327,22 @@ static EditingToolsEditingToolWindow* editing_tools_redeye_tool_real_get_tool_wi
 	result = _tmp1_;
 #line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14412 "EditingTools.c"
+#line 14331 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx) {
 	EditingToolsRedeyeTool * self;
 	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	EditingToolsPhotoCanvas* _tmp6_ = NULL;
+	GdkPixbuf* _tmp1_;
+	EditingToolsPhotoCanvas* _tmp6_;
 	EditingToolsRedeyeInstance active_inst = {0};
-	EditingToolsRedeyeInstance _tmp7_ = {0};
-	EditingToolsPhotoCanvas* _tmp8_ = NULL;
-	EditingToolsRedeyeInstance _tmp9_ = {0};
-	GdkPoint _tmp10_ = {0};
+	EditingToolsRedeyeInstance _tmp7_;
+	EditingToolsPhotoCanvas* _tmp8_;
+	EditingToolsRedeyeInstance _tmp9_;
+	GdkPoint _tmp10_;
 	GdkPoint _tmp11_ = {0};
-	EditingToolsRedeyeInstance _tmp12_ = {0};
+	EditingToolsRedeyeInstance _tmp12_;
 #line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14432,9 +14351,9 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 	_tmp1_ = self->priv->current_pixbuf;
 #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ != NULL) {
-#line 14436 "EditingTools.c"
-		GdkPixbuf* _tmp2_ = NULL;
-		GdkPixbuf* _tmp3_ = NULL;
+#line 14355 "EditingTools.c"
+		GdkPixbuf* _tmp2_;
+		GdkPixbuf* _tmp3_;
 #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->current_pixbuf;
 #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14443,10 +14362,10 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 		_g_object_unref0 (_tmp0_);
 #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp3_;
-#line 14447 "EditingTools.c"
+#line 14366 "EditingTools.c"
 	} else {
-		EditingToolsPhotoCanvas* _tmp4_ = NULL;
-		GdkPixbuf* _tmp5_ = NULL;
+		EditingToolsPhotoCanvas* _tmp4_;
+		GdkPixbuf* _tmp5_;
 #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14455,7 +14374,7 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 		_g_object_unref0 (_tmp0_);
 #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp5_;
-#line 14459 "EditingTools.c"
+#line 14378 "EditingTools.c"
 	}
 #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -14481,19 +14400,19 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 	editing_tools_redeye_tool_draw_redeye_instance (self, &_tmp12_);
 #line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp0_);
-#line 14485 "EditingTools.c"
+#line 14404 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y) {
 	EditingToolsRedeyeTool * self;
 	GdkRectangle bounds_rect = {0};
-	EditingToolsRedeyeInstance _tmp0_ = {0};
+	EditingToolsRedeyeInstance _tmp0_;
 	GdkRectangle _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gboolean _tmp5_ = FALSE;
+	gint _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gboolean _tmp5_;
 #line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14512,11 +14431,11 @@ static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingToo
 	_tmp5_ = coord_in_rectangle (_tmp2_, _tmp3_, &_tmp4_);
 #line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_) {
-#line 14516 "EditingTools.c"
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-		EditingToolsRedeyeInstance _tmp8_ = {0};
-		GdkPoint _tmp9_ = {0};
+#line 14435 "EditingTools.c"
+		gint _tmp6_;
+		gint _tmp7_;
+		EditingToolsRedeyeInstance _tmp8_;
+		GdkPoint _tmp9_;
 #line 2141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->is_reticle_move_in_progress = TRUE;
 #line 2142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14533,7 +14452,7 @@ static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingToo
 		_tmp9_ = _tmp8_.center;
 #line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_move_anchor = _tmp9_;
-#line 14537 "EditingTools.c"
+#line 14456 "EditingTools.c"
 	}
 }
 
@@ -14544,74 +14463,74 @@ static void editing_tools_redeye_tool_real_on_left_released (EditingToolsEditing
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->is_reticle_move_in_progress = FALSE;
-#line 14548 "EditingTools.c"
+#line 14467 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) {
 	EditingToolsRedeyeTool * self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->is_reticle_move_in_progress;
 #line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 14561 "EditingTools.c"
+#line 14480 "EditingTools.c"
 		GdkRectangle active_region_rect = {0};
-		EditingToolsPhotoCanvas* _tmp1_ = NULL;
+		EditingToolsPhotoCanvas* _tmp1_;
 		GdkRectangle _tmp2_ = {0};
 		gint x_clamp_low = 0;
-		GdkRectangle _tmp3_ = {0};
-		gint _tmp4_ = 0;
-		EditingToolsRedeyeInstance _tmp5_ = {0};
-		gint _tmp6_ = 0;
+		GdkRectangle _tmp3_;
+		gint _tmp4_;
+		EditingToolsRedeyeInstance _tmp5_;
+		gint _tmp6_;
 		gint y_clamp_low = 0;
-		GdkRectangle _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		EditingToolsRedeyeInstance _tmp9_ = {0};
-		gint _tmp10_ = 0;
+		GdkRectangle _tmp7_;
+		gint _tmp8_;
+		EditingToolsRedeyeInstance _tmp9_;
+		gint _tmp10_;
 		gint x_clamp_high = 0;
-		GdkRectangle _tmp11_ = {0};
-		gint _tmp12_ = 0;
-		GdkRectangle _tmp13_ = {0};
-		gint _tmp14_ = 0;
-		EditingToolsRedeyeInstance _tmp15_ = {0};
-		gint _tmp16_ = 0;
+		GdkRectangle _tmp11_;
+		gint _tmp12_;
+		GdkRectangle _tmp13_;
+		gint _tmp14_;
+		EditingToolsRedeyeInstance _tmp15_;
+		gint _tmp16_;
 		gint y_clamp_high = 0;
-		GdkRectangle _tmp17_ = {0};
-		gint _tmp18_ = 0;
-		GdkRectangle _tmp19_ = {0};
-		gint _tmp20_ = 0;
-		EditingToolsRedeyeInstance _tmp21_ = {0};
-		gint _tmp22_ = 0;
+		GdkRectangle _tmp17_;
+		gint _tmp18_;
+		GdkRectangle _tmp19_;
+		gint _tmp20_;
+		EditingToolsRedeyeInstance _tmp21_;
+		gint _tmp22_;
 		gint delta_x = 0;
-		gint _tmp23_ = 0;
-		GdkPoint _tmp24_ = {0};
-		gint _tmp25_ = 0;
+		gint _tmp23_;
+		GdkPoint _tmp24_;
+		gint _tmp25_;
 		gint delta_y = 0;
-		gint _tmp26_ = 0;
-		GdkPoint _tmp27_ = {0};
-		gint _tmp28_ = 0;
-		GdkPoint _tmp29_ = {0};
-		gint _tmp30_ = 0;
-		gint _tmp31_ = 0;
-		GdkPoint _tmp32_ = {0};
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
-		GdkPoint _tmp35_ = {0};
-		gint _tmp36_ = 0;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
-		gint _tmp39_ = 0;
-		gint _tmp40_ = 0;
-		GdkPoint _tmp41_ = {0};
-		gint _tmp42_ = 0;
-		gint _tmp43_ = 0;
-		gint _tmp44_ = 0;
-		gint _tmp45_ = 0;
-		gint _tmp46_ = 0;
-		EditingToolsPhotoCanvas* _tmp47_ = NULL;
+		gint _tmp26_;
+		GdkPoint _tmp27_;
+		gint _tmp28_;
+		GdkPoint _tmp29_;
+		gint _tmp30_;
+		gint _tmp31_;
+		GdkPoint _tmp32_;
+		gint _tmp33_;
+		gint _tmp34_;
+		GdkPoint _tmp35_;
+		gint _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
+		gint _tmp39_;
+		gint _tmp40_;
+		GdkPoint _tmp41_;
+		gint _tmp42_;
+		gint _tmp43_;
+		gint _tmp44_;
+		gint _tmp45_;
+		gint _tmp46_;
+		EditingToolsPhotoCanvas* _tmp47_;
 #line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14730,15 +14649,15 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 		_tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_repaint (_tmp47_);
-#line 14734 "EditingTools.c"
+#line 14653 "EditingTools.c"
 	} else {
 		GdkRectangle bounds = {0};
-		EditingToolsRedeyeInstance _tmp48_ = {0};
+		EditingToolsRedeyeInstance _tmp48_;
 		GdkRectangle _tmp49_ = {0};
-		gint _tmp50_ = 0;
-		gint _tmp51_ = 0;
-		GdkRectangle _tmp52_ = {0};
-		gboolean _tmp53_ = FALSE;
+		gint _tmp50_;
+		gint _tmp51_;
+		GdkRectangle _tmp52_;
+		gboolean _tmp53_;
 #line 2186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp48_ = self->priv->user_interaction_instance;
 #line 2186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14755,11 +14674,11 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 		_tmp53_ = coord_in_rectangle (_tmp50_, _tmp51_, &_tmp52_);
 #line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp53_) {
-#line 14759 "EditingTools.c"
-			EditingToolsPhotoCanvas* _tmp54_ = NULL;
-			GdkWindow* _tmp55_ = NULL;
-			GdkWindow* _tmp56_ = NULL;
-			GdkCursor* _tmp57_ = NULL;
+#line 14678 "EditingTools.c"
+			EditingToolsPhotoCanvas* _tmp54_;
+			GdkWindow* _tmp55_;
+			GdkWindow* _tmp56_;
+			GdkCursor* _tmp57_;
 #line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp54_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14772,12 +14691,12 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 			gdk_window_set_cursor (_tmp56_, _tmp57_);
 #line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp56_);
-#line 14776 "EditingTools.c"
+#line 14695 "EditingTools.c"
 		} else {
-			EditingToolsPhotoCanvas* _tmp58_ = NULL;
-			GdkWindow* _tmp59_ = NULL;
-			GdkWindow* _tmp60_ = NULL;
-			GdkCursor* _tmp61_ = NULL;
+			EditingToolsPhotoCanvas* _tmp58_;
+			GdkWindow* _tmp59_;
+			GdkWindow* _tmp60_;
+			GdkCursor* _tmp61_;
 #line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14790,7 +14709,7 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 			gdk_window_set_cursor (_tmp60_, _tmp61_);
 #line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp60_);
-#line 14794 "EditingTools.c"
+#line 14713 "EditingTools.c"
 		}
 	}
 }
@@ -14801,11 +14720,11 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GdkEventKey* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	const gchar* _tmp4_ = NULL;
-	GdkEventKey* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	GdkEventKey* _tmp2_;
+	guint _tmp3_;
+	const gchar* _tmp4_;
+	GdkEventKey* _tmp11_;
+	gboolean _tmp12_;
 #line 2197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14820,11 +14739,11 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
 #line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 14824 "EditingTools.c"
+#line 14743 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp5_ = NULL;
-		guint _tmp6_ = 0U;
-		const gchar* _tmp7_ = NULL;
+		GdkEventKey* _tmp5_;
+		guint _tmp6_;
+		const gchar* _tmp7_;
 #line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = event;
 #line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14833,17 +14752,17 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 		_tmp7_ = gdk_keyval_name (_tmp6_);
 #line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 14837 "EditingTools.c"
+#line 14756 "EditingTools.c"
 	}
 #line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
 #line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 14843 "EditingTools.c"
+#line 14762 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp8_ = NULL;
-		guint _tmp9_ = 0U;
-		const gchar* _tmp10_ = NULL;
+		GdkEventKey* _tmp8_;
+		guint _tmp9_;
+		const gchar* _tmp10_;
 #line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
 #line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14852,7 +14771,7 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 		_tmp10_ = gdk_keyval_name (_tmp9_);
 #line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 14856 "EditingTools.c"
+#line 14775 "EditingTools.c"
 	}
 #line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
@@ -14862,7 +14781,7 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 		result = TRUE;
 #line 2202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 14866 "EditingTools.c"
+#line 14785 "EditingTools.c"
 	}
 #line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
@@ -14872,27 +14791,25 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 	result = _tmp12_;
 #line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14876 "EditingTools.c"
+#line 14795 "EditingTools.c"
 }
 
 
 static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_construct (GType object_type, GtkWindow* container) {
 	EditingToolsRedeyeToolRedeyeToolWindow * self = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	GtkScale* _tmp2_ = NULL;
-	GtkButton* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GtkButton* _tmp5_ = NULL;
-	GtkButton* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	GtkButton* _tmp8_ = NULL;
+	GtkWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	GtkScale* _tmp2_;
+	GtkButton* _tmp3_;
+	GtkButton* _tmp4_;
+	GtkButton* _tmp5_;
+	GtkButton* _tmp6_;
 	GtkBox* layout = NULL;
-	GtkBox* _tmp9_ = NULL;
-	GtkLabel* _tmp10_ = NULL;
-	GtkScale* _tmp11_ = NULL;
-	GtkButton* _tmp12_ = NULL;
-	GtkButton* _tmp13_ = NULL;
+	GtkBox* _tmp7_;
+	GtkLabel* _tmp8_;
+	GtkScale* _tmp9_;
+	GtkButton* _tmp10_;
+	GtkButton* _tmp11_;
 #line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14910,59 +14827,55 @@ static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_
 #line 1895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->close_button;
 #line 1895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _ ("Close the red-eye tool");
-#line 1895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _tmp4_);
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _ ("Close the red-eye tool"));
 #line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = self->close_button;
+	_tmp4_ = self->close_button;
 #line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_button_set_image_position (_tmp5_, GTK_POS_LEFT);
-#line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = self->apply_button;
+	gtk_button_set_image_position (_tmp4_, GTK_POS_LEFT);
 #line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = _ ("Remove any red-eye effects in the selected region");
+	_tmp5_ = self->apply_button;
 #line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), _tmp7_);
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), _ ("Remove any red-eye effects in the selected region"));
 #line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = self->apply_button;
+	_tmp6_ = self->apply_button;
 #line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_button_set_image_position (_tmp8_, GTK_POS_LEFT);
+	gtk_button_set_image_position (_tmp6_, GTK_POS_LEFT);
 #line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_CONTROL_SPACING);
+	_tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_CONTROL_SPACING);
 #line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp9_);
+	g_object_ref_sink (_tmp7_);
 #line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	layout = _tmp9_;
+	layout = _tmp7_;
 #line 1902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = self->priv->slider_label;
+	_tmp8_ = self->priv->slider_label;
 #line 1902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
 #line 1903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = self->slider;
+	_tmp9_ = self->slider;
 #line 1903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
 #line 1904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = self->close_button;
+	_tmp10_ = self->close_button;
 #line 1904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
 #line 1905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = self->apply_button;
+	_tmp11_ = self->apply_button;
 #line 1905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
 #line 1907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_widget_get_type (), GtkWidget));
 #line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (layout);
 #line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 14959 "EditingTools.c"
+#line 14872 "EditingTools.c"
 }
 
 
 static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_new (GtkWindow* container) {
 #line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_redeye_tool_redeye_tool_window_construct (EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, container);
-#line 14966 "EditingTools.c"
+#line 14879 "EditingTools.c"
 }
 
 
@@ -14973,49 +14886,46 @@ static void editing_tools_redeye_tool_redeye_tool_window_class_init (EditingTool
 	g_type_class_add_private (klass, sizeof (EditingToolsRedeyeToolRedeyeToolWindowPrivate));
 #line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_redeye_tool_redeye_tool_window_finalize;
-#line 14977 "EditingTools.c"
+#line 14890 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_redeye_tool_window_instance_init (EditingToolsRedeyeToolRedeyeToolWindow * self) {
-	const gchar* _tmp0_ = NULL;
-	GtkLabel* _tmp1_ = NULL;
-	GtkButton* _tmp2_ = NULL;
-	GtkButton* _tmp3_ = NULL;
-	GtkScale* _tmp4_ = NULL;
+	GtkLabel* _tmp0_;
+	GtkButton* _tmp1_;
+	GtkButton* _tmp2_;
+	GtkScale* _tmp3_;
 #line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_GET_PRIVATE (self);
 #line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = _ ("Size:");
-#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp0_);
+	_tmp0_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Size:"));
 #line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp1_);
+	g_object_ref_sink (_tmp0_);
 #line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->slider_label = _tmp1_;
+	self->priv->slider_label = _tmp0_;
 #line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_APPLY_LABEL);
+	_tmp1_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_APPLY_LABEL);
 #line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp2_);
+	g_object_ref_sink (_tmp1_);
 #line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->apply_button = _tmp2_;
+	self->apply_button = _tmp1_;
 #line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
+	_tmp2_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
 #line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp3_);
+	g_object_ref_sink (_tmp2_);
 #line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->close_button = _tmp3_;
+	self->close_button = _tmp2_;
 #line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) EDITING_TOOLS_REDEYE_INSTANCE_MIN_RADIUS, (gdouble) EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS, 1.0);
+	_tmp3_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) EDITING_TOOLS_REDEYE_INSTANCE_MIN_RADIUS, (gdouble) EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS, 1.0);
 #line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp4_);
+	g_object_ref_sink (_tmp3_);
 #line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->slider = _tmp4_;
-#line 15015 "EditingTools.c"
+	self->slider = _tmp3_;
+#line 14925 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject* obj) {
+static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject * obj) {
 	EditingToolsRedeyeToolRedeyeToolWindow * self;
 #line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, EditingToolsRedeyeToolRedeyeToolWindow);
@@ -15029,7 +14939,7 @@ static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject* obj)
 	_g_object_unref0 (self->slider);
 #line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_redeye_tool_redeye_tool_window_parent_class)->finalize (obj);
-#line 15033 "EditingTools.c"
+#line 14943 "EditingTools.c"
 }
 
 
@@ -15053,22 +14963,22 @@ static void editing_tools_redeye_tool_class_init (EditingToolsRedeyeToolClass *
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsRedeyeToolPrivate));
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->activate = (void (*)(EditingToolsEditingTool*, EditingToolsPhotoCanvas*)) editing_tools_redeye_tool_real_activate;
+	((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_redeye_tool_real_activate;
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*)(EditingToolsEditingTool*)) editing_tools_redeye_tool_real_deactivate;
+	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_redeye_tool_real_deactivate;
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*)(EditingToolsEditingTool*)) editing_tools_redeye_tool_real_get_tool_window;
+	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_redeye_tool_real_get_tool_window;
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->paint = (void (*)(EditingToolsEditingTool*, cairo_t*)) editing_tools_redeye_tool_real_paint;
+	((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_redeye_tool_real_paint;
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*)(EditingToolsEditingTool*, gint, gint)) editing_tools_redeye_tool_real_on_left_click;
+	((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_redeye_tool_real_on_left_click;
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*)(EditingToolsEditingTool*, gint, gint)) editing_tools_redeye_tool_real_on_left_released;
+	((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_redeye_tool_real_on_left_released;
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*)(EditingToolsEditingTool*, gint, gint, GdkModifierType)) editing_tools_redeye_tool_real_on_motion;
+	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_redeye_tool_real_on_motion;
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*)(EditingToolsEditingTool*, GdkEventKey*)) editing_tools_redeye_tool_real_on_keypress;
-#line 15072 "EditingTools.c"
+	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_redeye_tool_real_on_keypress;
+#line 14982 "EditingTools.c"
 }
 
 
@@ -15085,11 +14995,11 @@ static void editing_tools_redeye_tool_instance_init (EditingToolsRedeyeTool * se
 	self->priv->is_reticle_move_in_progress = FALSE;
 #line 1921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_pixbuf = NULL;
-#line 15089 "EditingTools.c"
+#line 14999 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool* obj) {
+static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool * obj) {
 	EditingToolsRedeyeTool * self;
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
@@ -15107,7 +15017,7 @@ static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool* obj) {
 	_g_object_unref0 (self->priv->current_pixbuf);
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->finalize (obj);
-#line 15111 "EditingTools.c"
+#line 15021 "EditingTools.c"
 }
 
 
@@ -15129,27 +15039,27 @@ static EditingToolsAdjustTool* editing_tools_adjust_tool_construct (GType object
 	self = (EditingToolsAdjustTool*) editing_tools_editing_tool_construct (object_type, "AdjustTool");
 #line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 15133 "EditingTools.c"
+#line 15043 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustTool* editing_tools_adjust_tool_new (void) {
 #line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_construct (EDITING_TOOLS_TYPE_ADJUST_TOOL);
-#line 15140 "EditingTools.c"
+#line 15050 "EditingTools.c"
 }
 
 
 EditingToolsAdjustTool* editing_tools_adjust_tool_factory (void) {
 	EditingToolsAdjustTool* result = NULL;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
 #line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_adjust_tool_new ();
 #line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
 #line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15153 "EditingTools.c"
+#line 15063 "EditingTools.c"
 }
 
 
@@ -15163,135 +15073,135 @@ gboolean editing_tools_adjust_tool_is_available (Photo* photo, Scaling* scaling)
 	result = TRUE;
 #line 2528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15167 "EditingTools.c"
+#line 15077 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_photos_altered ((EditingToolsAdjustTool*) self, items);
-#line 15174 "EditingTools.c"
+#line 15084 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsAdjustTool * self;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
-	GtkWindow* _tmp2_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp3_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	GtkWindow* _tmp1_;
+	GtkWindow* _tmp2_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp3_;
 	Photo* photo = NULL;
-	EditingToolsPhotoCanvas* _tmp4_ = NULL;
-	Photo* _tmp5_ = NULL;
-	Photo* _tmp6_ = NULL;
-	PixelTransformationBundle* _tmp7_ = NULL;
-	PixelTransformationBundle* _tmp8_ = NULL;
-	PixelTransformer* _tmp9_ = NULL;
-	PixelTransformer* _tmp10_ = NULL;
+	EditingToolsPhotoCanvas* _tmp4_;
+	Photo* _tmp5_;
+	Photo* _tmp6_;
+	PixelTransformationBundle* _tmp7_;
+	PixelTransformationBundle* _tmp8_;
+	PixelTransformer* _tmp9_;
+	PixelTransformer* _tmp10_;
 	ExpansionTransformation* expansion_trans = NULL;
-	PixelTransformationBundle* _tmp11_ = NULL;
-	PixelTransformation* _tmp12_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp13_ = NULL;
-	RGBHistogramManipulator* _tmp14_ = NULL;
-	ExpansionTransformation* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp17_ = NULL;
-	RGBHistogramManipulator* _tmp18_ = NULL;
-	ExpansionTransformation* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
+	PixelTransformationBundle* _tmp11_;
+	PixelTransformation* _tmp12_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp13_;
+	RGBHistogramManipulator* _tmp14_;
+	ExpansionTransformation* _tmp15_;
+	gint _tmp16_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp17_;
+	RGBHistogramManipulator* _tmp18_;
+	ExpansionTransformation* _tmp19_;
+	gint _tmp20_;
 	ShadowDetailTransformation* shadows_trans = NULL;
-	PixelTransformationBundle* _tmp21_ = NULL;
-	PixelTransformation* _tmp22_ = NULL;
-	PixelTransformer* _tmp23_ = NULL;
-	ShadowDetailTransformation* _tmp24_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp25_ = NULL;
-	GtkScale* _tmp26_ = NULL;
-	ShadowDetailTransformation* _tmp27_ = NULL;
-	gfloat _tmp28_ = 0.0F;
+	PixelTransformationBundle* _tmp21_;
+	PixelTransformation* _tmp22_;
+	PixelTransformer* _tmp23_;
+	ShadowDetailTransformation* _tmp24_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp25_;
+	GtkScale* _tmp26_;
+	ShadowDetailTransformation* _tmp27_;
+	gfloat _tmp28_;
 	HighlightDetailTransformation* highlights_trans = NULL;
-	PixelTransformationBundle* _tmp29_ = NULL;
-	PixelTransformation* _tmp30_ = NULL;
-	PixelTransformer* _tmp31_ = NULL;
-	HighlightDetailTransformation* _tmp32_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp33_ = NULL;
-	GtkScale* _tmp34_ = NULL;
-	HighlightDetailTransformation* _tmp35_ = NULL;
-	gfloat _tmp36_ = 0.0F;
+	PixelTransformationBundle* _tmp29_;
+	PixelTransformation* _tmp30_;
+	PixelTransformer* _tmp31_;
+	HighlightDetailTransformation* _tmp32_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp33_;
+	GtkScale* _tmp34_;
+	HighlightDetailTransformation* _tmp35_;
+	gfloat _tmp36_;
 	TemperatureTransformation* temp_trans = NULL;
-	PixelTransformationBundle* _tmp37_ = NULL;
-	PixelTransformation* _tmp38_ = NULL;
-	PixelTransformer* _tmp39_ = NULL;
-	TemperatureTransformation* _tmp40_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp41_ = NULL;
-	GtkScale* _tmp42_ = NULL;
-	TemperatureTransformation* _tmp43_ = NULL;
-	gfloat _tmp44_ = 0.0F;
+	PixelTransformationBundle* _tmp37_;
+	PixelTransformation* _tmp38_;
+	PixelTransformer* _tmp39_;
+	TemperatureTransformation* _tmp40_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp41_;
+	GtkScale* _tmp42_;
+	TemperatureTransformation* _tmp43_;
+	gfloat _tmp44_;
 	TintTransformation* tint_trans = NULL;
-	PixelTransformationBundle* _tmp45_ = NULL;
-	PixelTransformation* _tmp46_ = NULL;
-	PixelTransformer* _tmp47_ = NULL;
-	TintTransformation* _tmp48_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp49_ = NULL;
-	GtkScale* _tmp50_ = NULL;
-	TintTransformation* _tmp51_ = NULL;
-	gfloat _tmp52_ = 0.0F;
+	PixelTransformationBundle* _tmp45_;
+	PixelTransformation* _tmp46_;
+	PixelTransformer* _tmp47_;
+	TintTransformation* _tmp48_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp49_;
+	GtkScale* _tmp50_;
+	TintTransformation* _tmp51_;
+	gfloat _tmp52_;
 	SaturationTransformation* sat_trans = NULL;
-	PixelTransformationBundle* _tmp53_ = NULL;
-	PixelTransformation* _tmp54_ = NULL;
-	PixelTransformer* _tmp55_ = NULL;
-	SaturationTransformation* _tmp56_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp57_ = NULL;
-	GtkScale* _tmp58_ = NULL;
-	SaturationTransformation* _tmp59_ = NULL;
-	gfloat _tmp60_ = 0.0F;
+	PixelTransformationBundle* _tmp53_;
+	PixelTransformation* _tmp54_;
+	PixelTransformer* _tmp55_;
+	SaturationTransformation* _tmp56_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp57_;
+	GtkScale* _tmp58_;
+	SaturationTransformation* _tmp59_;
+	gfloat _tmp60_;
 	ExposureTransformation* exposure_trans = NULL;
-	PixelTransformationBundle* _tmp61_ = NULL;
-	PixelTransformation* _tmp62_ = NULL;
-	PixelTransformer* _tmp63_ = NULL;
-	ExposureTransformation* _tmp64_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp65_ = NULL;
-	GtkScale* _tmp66_ = NULL;
-	ExposureTransformation* _tmp67_ = NULL;
-	gfloat _tmp68_ = 0.0F;
+	PixelTransformationBundle* _tmp61_;
+	PixelTransformation* _tmp62_;
+	PixelTransformer* _tmp63_;
+	ExposureTransformation* _tmp64_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp65_;
+	GtkScale* _tmp66_;
+	ExposureTransformation* _tmp67_;
+	gfloat _tmp68_;
 	ContrastTransformation* contrast_trans = NULL;
-	PixelTransformationBundle* _tmp69_ = NULL;
-	PixelTransformation* _tmp70_ = NULL;
-	PixelTransformer* _tmp71_ = NULL;
-	ContrastTransformation* _tmp72_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp73_ = NULL;
-	GtkScale* _tmp74_ = NULL;
-	ContrastTransformation* _tmp75_ = NULL;
-	gfloat _tmp76_ = 0.0F;
-	EditingToolsPhotoCanvas* _tmp77_ = NULL;
-	EditingToolsPhotoCanvas* _tmp78_ = NULL;
-	GdkPixbuf* _tmp79_ = NULL;
-	GdkPixbuf* _tmp80_ = NULL;
-	GdkPixbuf* _tmp81_ = NULL;
-	EditingToolsPhotoCanvas* _tmp82_ = NULL;
-	GdkPixbuf* _tmp83_ = NULL;
-	GdkPixbuf* _tmp84_ = NULL;
+	PixelTransformationBundle* _tmp69_;
+	PixelTransformation* _tmp70_;
+	PixelTransformer* _tmp71_;
+	ContrastTransformation* _tmp72_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp73_;
+	GtkScale* _tmp74_;
+	ContrastTransformation* _tmp75_;
+	gfloat _tmp76_;
+	EditingToolsPhotoCanvas* _tmp77_;
+	EditingToolsPhotoCanvas* _tmp78_;
+	GdkPixbuf* _tmp79_;
+	GdkPixbuf* _tmp80_;
+	GdkPixbuf* _tmp81_;
+	EditingToolsPhotoCanvas* _tmp82_;
+	GdkPixbuf* _tmp83_;
+	GdkPixbuf* _tmp84_;
 	gboolean _tmp85_ = FALSE;
-	GdkPixbuf* _tmp86_ = NULL;
-	gint _tmp87_ = 0;
-	gint _tmp88_ = 0;
+	GdkPixbuf* _tmp86_;
+	gint _tmp87_;
+	gint _tmp88_;
 	gboolean _tmp92_ = FALSE;
 	gboolean _tmp93_ = FALSE;
-	GdkPixbuf* _tmp94_ = NULL;
-	gint _tmp95_ = 0;
-	gint _tmp96_ = 0;
-	GdkPixbuf* _tmp97_ = NULL;
-	gint _tmp98_ = 0;
-	gint _tmp99_ = 0;
-	GdkPixbuf* _tmp116_ = NULL;
-	GdkPixbuf* _tmp117_ = NULL;
+	GdkPixbuf* _tmp94_;
+	gint _tmp95_;
+	gint _tmp96_;
+	GdkPixbuf* _tmp97_;
+	gint _tmp98_;
+	gint _tmp99_;
+	GdkPixbuf* _tmp116_;
+	GdkPixbuf* _tmp117_;
 	DataCollection* owner = NULL;
-	EditingToolsPhotoCanvas* _tmp118_ = NULL;
-	Photo* _tmp119_ = NULL;
-	Photo* _tmp120_ = NULL;
-	DataCollection* _tmp121_ = NULL;
-	DataCollection* _tmp122_ = NULL;
-	DataCollection* _tmp123_ = NULL;
-	EditingToolsPhotoCanvas* _tmp125_ = NULL;
+	EditingToolsPhotoCanvas* _tmp118_;
+	Photo* _tmp119_;
+	Photo* _tmp120_;
+	DataCollection* _tmp121_;
+	DataCollection* _tmp122_;
+	DataCollection* _tmp123_;
+	EditingToolsPhotoCanvas* _tmp125_;
 #line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
 #line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15558,10 +15468,10 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 	_tmp88_ = _tmp87_;
 #line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp88_ == 1) {
-#line 15562 "EditingTools.c"
-		GdkPixbuf* _tmp89_ = NULL;
-		gint _tmp90_ = 0;
-		gint _tmp91_ = 0;
+#line 15472 "EditingTools.c"
+		GdkPixbuf* _tmp89_;
+		gint _tmp90_;
+		gint _tmp91_;
 #line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp89_ = self->priv->draw_to_pixbuf;
 #line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15570,17 +15480,17 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 		_tmp91_ = _tmp90_;
 #line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp85_ = _tmp91_ == 1;
-#line 15574 "EditingTools.c"
+#line 15484 "EditingTools.c"
 	} else {
 #line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp85_ = FALSE;
-#line 15578 "EditingTools.c"
+#line 15488 "EditingTools.c"
 	}
 #line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp85_) {
 #line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->disable_histogram_refresh = TRUE;
-#line 15584 "EditingTools.c"
+#line 15494 "EditingTools.c"
 	}
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp94_ = self->priv->draw_to_pixbuf;
@@ -15596,10 +15506,10 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 	_tmp99_ = _tmp98_;
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((_tmp96_ * _tmp99_) > 8192) {
-#line 15600 "EditingTools.c"
-		GdkPixbuf* _tmp100_ = NULL;
-		gint _tmp101_ = 0;
-		gint _tmp102_ = 0;
+#line 15510 "EditingTools.c"
+		GdkPixbuf* _tmp100_;
+		gint _tmp101_;
+		gint _tmp102_;
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp100_ = self->priv->draw_to_pixbuf;
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15608,18 +15518,18 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 		_tmp102_ = _tmp101_;
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp93_ = _tmp102_ > 1;
-#line 15612 "EditingTools.c"
+#line 15522 "EditingTools.c"
 	} else {
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp93_ = FALSE;
-#line 15616 "EditingTools.c"
+#line 15526 "EditingTools.c"
 	}
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp93_) {
-#line 15620 "EditingTools.c"
-		GdkPixbuf* _tmp103_ = NULL;
-		gint _tmp104_ = 0;
-		gint _tmp105_ = 0;
+#line 15530 "EditingTools.c"
+		GdkPixbuf* _tmp103_;
+		gint _tmp104_;
+		gint _tmp105_;
 #line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp103_ = self->priv->draw_to_pixbuf;
 #line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15628,23 +15538,23 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 		_tmp105_ = _tmp104_;
 #line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp92_ = _tmp105_ > 1;
-#line 15632 "EditingTools.c"
+#line 15542 "EditingTools.c"
 	} else {
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp92_ = FALSE;
-#line 15636 "EditingTools.c"
+#line 15546 "EditingTools.c"
 	}
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp92_) {
-#line 15640 "EditingTools.c"
-		GdkPixbuf* _tmp106_ = NULL;
-		GdkPixbuf* _tmp107_ = NULL;
-		gint _tmp108_ = 0;
-		gint _tmp109_ = 0;
-		GdkPixbuf* _tmp110_ = NULL;
-		gint _tmp111_ = 0;
-		gint _tmp112_ = 0;
-		GdkPixbuf* _tmp113_ = NULL;
+#line 15550 "EditingTools.c"
+		GdkPixbuf* _tmp106_;
+		GdkPixbuf* _tmp107_;
+		gint _tmp108_;
+		gint _tmp109_;
+		GdkPixbuf* _tmp110_;
+		gint _tmp111_;
+		gint _tmp112_;
+		GdkPixbuf* _tmp113_;
 #line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp106_ = self->priv->draw_to_pixbuf;
 #line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15665,10 +15575,10 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 		_g_object_unref0 (self->priv->histogram_pixbuf);
 #line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->histogram_pixbuf = _tmp113_;
-#line 15669 "EditingTools.c"
+#line 15579 "EditingTools.c"
 	} else {
-		GdkPixbuf* _tmp114_ = NULL;
-		GdkPixbuf* _tmp115_ = NULL;
+		GdkPixbuf* _tmp114_;
+		GdkPixbuf* _tmp115_;
 #line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp114_ = self->priv->draw_to_pixbuf;
 #line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15677,7 +15587,7 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 		_g_object_unref0 (self->priv->histogram_pixbuf);
 #line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->histogram_pixbuf = _tmp115_;
-#line 15681 "EditingTools.c"
+#line 15591 "EditingTools.c"
 	}
 #line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp116_ = self->priv->histogram_pixbuf;
@@ -15705,13 +15615,13 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 	_tmp123_ = owner;
 #line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp123_ != NULL) {
-#line 15709 "EditingTools.c"
-		DataCollection* _tmp124_ = NULL;
+#line 15619 "EditingTools.c"
+		DataCollection* _tmp124_;
 #line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp124_ = owner;
 #line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_connect (_tmp124_, "items-altered", (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
-#line 15715 "EditingTools.c"
+#line 15625 "EditingTools.c"
 	}
 #line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp125_ = canvas;
@@ -15737,15 +15647,15 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 	_pixel_transformation_unref0 (expansion_trans);
 #line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (photo);
-#line 15741 "EditingTools.c"
+#line 15651 "EditingTools.c"
 }
 
 
 static EditingToolsEditingToolWindow* editing_tools_adjust_tool_real_get_tool_window (EditingToolsEditingTool* base) {
 	EditingToolsAdjustTool * self;
 	EditingToolsEditingToolWindow* result = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	EditingToolsEditingToolWindow* _tmp1_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	EditingToolsEditingToolWindow* _tmp1_;
 #line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
 #line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15756,29 +15666,29 @@ static EditingToolsEditingToolWindow* editing_tools_adjust_tool_real_get_tool_wi
 	result = _tmp1_;
 #line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15760 "EditingTools.c"
+#line 15670 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool* base) {
 	EditingToolsAdjustTool * self;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp10_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp10_;
 #line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
 #line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 15774 "EditingTools.c"
+#line 15684 "EditingTools.c"
 		DataCollection* owner = NULL;
-		EditingToolsPhotoCanvas* _tmp1_ = NULL;
-		Photo* _tmp2_ = NULL;
-		Photo* _tmp3_ = NULL;
-		DataCollection* _tmp4_ = NULL;
-		DataCollection* _tmp5_ = NULL;
-		DataCollection* _tmp6_ = NULL;
-		EditingToolsPhotoCanvas* _tmp9_ = NULL;
+		EditingToolsPhotoCanvas* _tmp1_;
+		Photo* _tmp2_;
+		Photo* _tmp3_;
+		DataCollection* _tmp4_;
+		DataCollection* _tmp5_;
+		DataCollection* _tmp6_;
+		EditingToolsPhotoCanvas* _tmp9_;
 #line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15797,16 +15707,16 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 		_tmp6_ = owner;
 #line 2629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ != NULL) {
-#line 15801 "EditingTools.c"
-			DataCollection* _tmp7_ = NULL;
-			guint _tmp8_ = 0U;
+#line 15711 "EditingTools.c"
+			DataCollection* _tmp7_;
+			guint _tmp8_;
 #line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = owner;
 #line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE);
 #line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
-#line 15810 "EditingTools.c"
+#line 15720 "EditingTools.c"
 		}
 #line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -15814,15 +15724,15 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 		editing_tools_adjust_tool_unbind_canvas_handlers (self, _tmp9_);
 #line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_data_collection_unref0 (owner);
-#line 15818 "EditingTools.c"
+#line 15728 "EditingTools.c"
 	}
 #line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->adjust_tool_window;
 #line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != NULL) {
-#line 15824 "EditingTools.c"
-		EditingToolsAdjustToolAdjustToolWindow* _tmp11_ = NULL;
-		EditingToolsAdjustToolAdjustToolWindow* _tmp12_ = NULL;
+#line 15734 "EditingTools.c"
+		EditingToolsAdjustToolAdjustToolWindow* _tmp11_;
+		EditingToolsAdjustToolAdjustToolWindow* _tmp12_;
 #line 2636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_adjust_tool_unbind_window_handlers (self);
 #line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15837,7 +15747,7 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 		_g_object_unref0 (self->priv->adjust_tool_window);
 #line 2639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->adjust_tool_window = NULL;
-#line 15841 "EditingTools.c"
+#line 15751 "EditingTools.c"
 	}
 #line 2642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
@@ -15853,15 +15763,15 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 	self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
 #line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 15857 "EditingTools.c"
+#line 15767 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx) {
 	EditingToolsAdjustTool * self;
-	gboolean _tmp0_ = FALSE;
-	EditingToolsPhotoCanvas* _tmp10_ = NULL;
-	GdkPixbuf* _tmp11_ = NULL;
+	gboolean _tmp0_;
+	EditingToolsPhotoCanvas* _tmp10_;
+	GdkPixbuf* _tmp11_;
 #line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
 #line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15870,13 +15780,13 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
 	_tmp0_ = self->priv->suppress_effect_redraw;
 #line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp0_) {
-#line 15874 "EditingTools.c"
-		PixelTransformer* _tmp1_ = NULL;
-		GdkPixbuf* _tmp2_ = NULL;
-		PixelTransformer* _tmp3_ = NULL;
-		GdkPixbuf* _tmp4_ = NULL;
-		GdkPixbuf* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+#line 15784 "EditingTools.c"
+		PixelTransformer* _tmp1_;
+		GdkPixbuf* _tmp2_;
+		PixelTransformer* _tmp3_;
+		GdkPixbuf* _tmp4_;
+		GdkPixbuf* _tmp5_;
+		gboolean _tmp6_;
 #line 2650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->priv->transformer;
 #line 2650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15895,10 +15805,10 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
 		_tmp6_ = self->priv->disable_histogram_refresh;
 #line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (!_tmp6_) {
-#line 15899 "EditingTools.c"
-			EditingToolsAdjustToolAdjustToolWindow* _tmp7_ = NULL;
-			RGBHistogramManipulator* _tmp8_ = NULL;
-			GdkPixbuf* _tmp9_ = NULL;
+#line 15809 "EditingTools.c"
+			EditingToolsAdjustToolAdjustToolWindow* _tmp7_;
+			RGBHistogramManipulator* _tmp8_;
+			GdkPixbuf* _tmp9_;
 #line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = self->priv->adjust_tool_window;
 #line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15907,7 +15817,7 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
 			_tmp9_ = self->priv->histogram_pixbuf;
 #line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			rgb_histogram_manipulator_update_histogram (_tmp8_, _tmp9_);
-#line 15911 "EditingTools.c"
+#line 15821 "EditingTools.c"
 		}
 	}
 #line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15916,7 +15826,7 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
 	_tmp11_ = self->priv->draw_to_pixbuf;
 #line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_paint_pixbuf (_tmp10_, _tmp11_);
-#line 15920 "EditingTools.c"
+#line 15830 "EditingTools.c"
 }
 
 
@@ -15924,15 +15834,15 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool
 	EditingToolsAdjustTool * self;
 	Dimensions _vala_max_dim = {0};
 	GdkPixbuf* result = NULL;
-	Photo* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	Photo* _tmp2_ = NULL;
+	Photo* _tmp0_;
+	gboolean _tmp1_;
+	Photo* _tmp2_;
 	Dimensions _tmp3_ = {0};
 	GdkPixbuf* _tmp4_ = NULL;
-	Photo* _tmp5_ = NULL;
-	Scaling _tmp6_ = {0};
-	GdkPixbuf* _tmp7_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
+	Photo* _tmp5_;
+	Scaling _tmp6_;
+	GdkPixbuf* _tmp7_;
+	GdkPixbuf* _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
@@ -15954,11 +15864,11 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool
 		if (max_dim) {
 #line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			*max_dim = _vala_max_dim;
-#line 15958 "EditingTools.c"
+#line 15868 "EditingTools.c"
 		}
 #line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 15962 "EditingTools.c"
+#line 15872 "EditingTools.c"
 	}
 #line 2668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = photo;
@@ -15980,7 +15890,7 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool
 		g_propagate_error (error, _inner_error_);
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return NULL;
-#line 15984 "EditingTools.c"
+#line 15894 "EditingTools.c"
 	}
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp4_;
@@ -15994,20 +15904,20 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool
 	if (max_dim) {
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 15998 "EditingTools.c"
+#line 15908 "EditingTools.c"
 	}
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 16002 "EditingTools.c"
+#line 15912 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self) {
 	EditingToolsAdjustToolAdjustResetCommand* command = NULL;
-	PixelTransformationBundle* _tmp0_ = NULL;
-	EditingToolsAdjustToolAdjustResetCommand* _tmp1_ = NULL;
-	CommandManager* _tmp2_ = NULL;
-	CommandManager* _tmp3_ = NULL;
+	PixelTransformationBundle* _tmp0_;
+	EditingToolsAdjustToolAdjustResetCommand* _tmp1_;
+	CommandManager* _tmp2_;
+	CommandManager* _tmp3_;
 #line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16026,23 +15936,23 @@ static void editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self) {
 	_command_manager_unref0 (_tmp3_);
 #line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 16030 "EditingTools.c"
+#line 15940 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self) {
-	EditingToolsEditingToolWindow* _tmp0_ = NULL;
-	EditingToolsEditingToolWindow* _tmp1_ = NULL;
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	PixelTransformationBundle* _tmp5_ = NULL;
-	AdjustColorsSingleCommand* _tmp6_ = NULL;
-	AdjustColorsSingleCommand* _tmp7_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
-	EditingToolsPhotoCanvas* _tmp9_ = NULL;
-	Photo* _tmp10_ = NULL;
-	Photo* _tmp11_ = NULL;
+	EditingToolsEditingToolWindow* _tmp0_;
+	EditingToolsEditingToolWindow* _tmp1_;
+	EditingToolsPhotoCanvas* _tmp2_;
+	Photo* _tmp3_;
+	Photo* _tmp4_;
+	PixelTransformationBundle* _tmp5_;
+	AdjustColorsSingleCommand* _tmp6_;
+	AdjustColorsSingleCommand* _tmp7_;
+	GdkPixbuf* _tmp8_;
+	EditingToolsPhotoCanvas* _tmp9_;
+	Photo* _tmp10_;
+	Photo* _tmp11_;
 	Dimensions _tmp12_ = {0};
 #line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
@@ -16079,14 +15989,14 @@ static void editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self) {
 #line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp12_);
 #line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command), _tmp8_, &_tmp12_, FALSE);
+	g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command), _tmp8_, &_tmp12_, FALSE);
 #line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp11_);
 #line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp7_);
 #line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp4_);
-#line 16090 "EditingTools.c"
+#line 16000 "EditingTools.c"
 }
 
 
@@ -16095,14 +16005,14 @@ static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjust
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_transformations));
-#line 16099 "EditingTools.c"
+#line 16009 "EditingTools.c"
 	{
 		GeeIterator* _transformation_it = NULL;
-		PixelTransformationBundle* _tmp0_ = NULL;
-		GeeIterable* _tmp1_ = NULL;
-		GeeIterable* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
+		PixelTransformationBundle* _tmp0_;
+		GeeIterable* _tmp1_;
+		GeeIterable* _tmp2_;
+		GeeIterator* _tmp3_;
+		GeeIterator* _tmp4_;
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = new_transformations;
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16119,13 +16029,13 @@ static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjust
 		_transformation_it = _tmp4_;
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		while (TRUE) {
-#line 16123 "EditingTools.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+#line 16033 "EditingTools.c"
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			PixelTransformation* transformation = NULL;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
-			PixelTransformation* _tmp9_ = NULL;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			PixelTransformation* _tmp9_;
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp5_ = _transformation_it;
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16134,7 +16044,7 @@ static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjust
 			if (!_tmp6_) {
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 16138 "EditingTools.c"
+#line 16048 "EditingTools.c"
 			}
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = _transformation_it;
@@ -16148,28 +16058,28 @@ static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjust
 			editing_tools_adjust_tool_update_transformation (self, _tmp9_);
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (transformation);
-#line 16152 "EditingTools.c"
+#line 16062 "EditingTools.c"
 		}
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_transformation_it);
-#line 16156 "EditingTools.c"
+#line 16066 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustTool* self, PixelTransformation* new_transformation) {
 	PixelTransformation* old_transformation = NULL;
-	PixelTransformationBundle* _tmp0_ = NULL;
-	PixelTransformation* _tmp1_ = NULL;
-	PixelTransformationType _tmp2_ = 0;
-	PixelTransformation* _tmp3_ = NULL;
-	PixelTransformer* _tmp4_ = NULL;
-	PixelTransformation* _tmp5_ = NULL;
-	PixelTransformation* _tmp6_ = NULL;
-	PixelTransformation* _tmp7_ = NULL;
-	PixelTransformationType _tmp8_ = 0;
-	PixelTransformationBundle* _tmp12_ = NULL;
-	PixelTransformation* _tmp13_ = NULL;
+	PixelTransformationBundle* _tmp0_;
+	PixelTransformation* _tmp1_;
+	PixelTransformationType _tmp2_;
+	PixelTransformation* _tmp3_;
+	PixelTransformer* _tmp4_;
+	PixelTransformation* _tmp5_;
+	PixelTransformation* _tmp6_;
+	PixelTransformation* _tmp7_;
+	PixelTransformationType _tmp8_;
+	PixelTransformationBundle* _tmp12_;
+	PixelTransformation* _tmp13_;
 #line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16198,10 +16108,10 @@ static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustT
 	_tmp8_ = pixel_transformation_get_transformation_type (_tmp7_);
 #line 2698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp8_ != PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION) {
-#line 16202 "EditingTools.c"
-		PixelTransformer* _tmp9_ = NULL;
-		PixelTransformation* _tmp10_ = NULL;
-		PixelTransformation* _tmp11_ = NULL;
+#line 16112 "EditingTools.c"
+		PixelTransformer* _tmp9_;
+		PixelTransformation* _tmp10_;
+		PixelTransformation* _tmp11_;
 #line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = self->priv->histogram_transformer;
 #line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16210,7 +16120,7 @@ static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustT
 		_tmp11_ = new_transformation;
 #line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		pixel_transformer_replace_transformation (_tmp9_, _tmp10_, _tmp11_);
-#line 16214 "EditingTools.c"
+#line 16124 "EditingTools.c"
 	}
 #line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->transformations;
@@ -16220,22 +16130,22 @@ static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustT
 	pixel_transformation_bundle_set (_tmp12_, _tmp13_);
 #line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (old_transformation);
-#line 16224 "EditingTools.c"
+#line 16134 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* self, PixelTransformation* new_transformation, const gchar* name) {
 	PixelTransformation* old_transformation = NULL;
-	PixelTransformationBundle* _tmp0_ = NULL;
-	PixelTransformation* _tmp1_ = NULL;
-	PixelTransformationType _tmp2_ = 0;
-	PixelTransformation* _tmp3_ = NULL;
+	PixelTransformationBundle* _tmp0_;
+	PixelTransformation* _tmp1_;
+	PixelTransformationType _tmp2_;
+	PixelTransformation* _tmp3_;
 	EditingToolsAdjustToolSliderAdjustmentCommand* command = NULL;
-	PixelTransformation* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_ = NULL;
-	CommandManager* _tmp7_ = NULL;
-	CommandManager* _tmp8_ = NULL;
+	PixelTransformation* _tmp4_;
+	const gchar* _tmp5_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_;
+	CommandManager* _tmp7_;
+	CommandManager* _tmp8_;
 #line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16272,51 +16182,50 @@ static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* se
 	_g_object_unref0 (command);
 #line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (old_transformation);
-#line 16276 "EditingTools.c"
+#line 16186 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback (gpointer self) {
 #line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_temperature_adjustment ((EditingToolsAdjustTool*) self);
-#line 16283 "EditingTools.c"
+#line 16193 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdjustTool* self) {
-	OneShotScheduler* _tmp0_ = NULL;
-	OneShotScheduler* _tmp2_ = NULL;
+	OneShotScheduler* _tmp0_;
+	OneShotScheduler* _tmp2_;
 #line 2712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->temperature_scheduler;
 #line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16296 "EditingTools.c"
-		OneShotScheduler* _tmp1_ = NULL;
+#line 16206 "EditingTools.c"
+		OneShotScheduler* _tmp1_;
 #line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("temperature", _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback, self);
 #line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->temperature_scheduler);
 #line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->temperature_scheduler = _tmp1_;
-#line 16304 "EditingTools.c"
+#line 16214 "EditingTools.c"
 	}
 #line 2716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->temperature_scheduler;
 #line 2716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16310 "EditingTools.c"
+#line 16220 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_delayed_temperature_adjustment (EditingToolsAdjustTool* self) {
 	TemperatureTransformation* new_temp_trans = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	TemperatureTransformation* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
+	TemperatureTransformation* _tmp3_;
 #line 2719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16330,56 +16239,53 @@ static void editing_tools_adjust_tool_on_delayed_temperature_adjustment (Editing
 #line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_temp_trans = _tmp3_;
 #line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _ ("Temperature");
-#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_temp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
+	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_temp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Temperature"));
 #line 2719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_temp_trans);
-#line 16339 "EditingTools.c"
+#line 16246 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback (gpointer self) {
 #line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_tint_adjustment ((EditingToolsAdjustTool*) self);
-#line 16346 "EditingTools.c"
+#line 16253 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool* self) {
-	OneShotScheduler* _tmp0_ = NULL;
-	OneShotScheduler* _tmp2_ = NULL;
+	OneShotScheduler* _tmp0_;
+	OneShotScheduler* _tmp2_;
 #line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->tint_scheduler;
 #line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16359 "EditingTools.c"
-		OneShotScheduler* _tmp1_ = NULL;
+#line 16266 "EditingTools.c"
+		OneShotScheduler* _tmp1_;
 #line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("tint", _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback, self);
 #line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->tint_scheduler);
 #line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->tint_scheduler = _tmp1_;
-#line 16367 "EditingTools.c"
+#line 16274 "EditingTools.c"
 	}
 #line 2728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->tint_scheduler;
 #line 2728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16373 "EditingTools.c"
+#line 16280 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAdjustTool* self) {
 	TintTransformation* new_tint_trans = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	TintTransformation* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
+	TintTransformation* _tmp3_;
 #line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16393,56 +16299,53 @@ static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAd
 #line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_tint_trans = _tmp3_;
 #line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _ ("Tint");
-#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_tint_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
+	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_tint_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Tint"));
 #line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_tint_trans);
-#line 16402 "EditingTools.c"
+#line 16306 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback (gpointer self) {
 #line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_contrast_adjustment ((EditingToolsAdjustTool*) self);
-#line 16409 "EditingTools.c"
+#line 16313 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjustTool* self) {
-	OneShotScheduler* _tmp0_ = NULL;
-	OneShotScheduler* _tmp2_ = NULL;
+	OneShotScheduler* _tmp0_;
+	OneShotScheduler* _tmp2_;
 #line 2737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->contrast_scheduler;
 #line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16422 "EditingTools.c"
-		OneShotScheduler* _tmp1_ = NULL;
+#line 16326 "EditingTools.c"
+		OneShotScheduler* _tmp1_;
 #line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("contrast", _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback, self);
 #line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->contrast_scheduler);
 #line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->contrast_scheduler = _tmp1_;
-#line 16430 "EditingTools.c"
+#line 16334 "EditingTools.c"
 	}
 #line 2740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->contrast_scheduler;
 #line 2740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16436 "EditingTools.c"
+#line 16340 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToolsAdjustTool* self) {
 	ContrastTransformation* new_exp_trans = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	ContrastTransformation* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
+	ContrastTransformation* _tmp3_;
 #line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16456,56 +16359,53 @@ static void editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToo
 #line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_exp_trans = _tmp3_;
 #line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _ ("Contrast");
-#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
+	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Contrast"));
 #line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16465 "EditingTools.c"
+#line 16366 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback (gpointer self) {
 #line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_saturation_adjustment ((EditingToolsAdjustTool*) self);
-#line 16472 "EditingTools.c"
+#line 16373 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdjustTool* self) {
-	OneShotScheduler* _tmp0_ = NULL;
-	OneShotScheduler* _tmp2_ = NULL;
+	OneShotScheduler* _tmp0_;
+	OneShotScheduler* _tmp2_;
 #line 2750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->saturation_scheduler;
 #line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16485 "EditingTools.c"
-		OneShotScheduler* _tmp1_ = NULL;
+#line 16386 "EditingTools.c"
+		OneShotScheduler* _tmp1_;
 #line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("saturation", _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback, self);
 #line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->saturation_scheduler);
 #line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->saturation_scheduler = _tmp1_;
-#line 16493 "EditingTools.c"
+#line 16394 "EditingTools.c"
 	}
 #line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->saturation_scheduler;
 #line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16499 "EditingTools.c"
+#line 16400 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingToolsAdjustTool* self) {
 	SaturationTransformation* new_sat_trans = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	SaturationTransformation* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
+	SaturationTransformation* _tmp3_;
 #line 2757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16519,56 +16419,53 @@ static void editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingT
 #line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_sat_trans = _tmp3_;
 #line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _ ("Saturation");
-#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_sat_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
+	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_sat_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Saturation"));
 #line 2757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_sat_trans);
-#line 16528 "EditingTools.c"
+#line 16426 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback (gpointer self) {
 #line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_exposure_adjustment ((EditingToolsAdjustTool*) self);
-#line 16535 "EditingTools.c"
+#line 16433 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjustTool* self) {
-	OneShotScheduler* _tmp0_ = NULL;
-	OneShotScheduler* _tmp2_ = NULL;
+	OneShotScheduler* _tmp0_;
+	OneShotScheduler* _tmp2_;
 #line 2763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->exposure_scheduler;
 #line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16548 "EditingTools.c"
-		OneShotScheduler* _tmp1_ = NULL;
+#line 16446 "EditingTools.c"
+		OneShotScheduler* _tmp1_;
 #line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("exposure", _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback, self);
 #line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->exposure_scheduler);
 #line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->exposure_scheduler = _tmp1_;
-#line 16556 "EditingTools.c"
+#line 16454 "EditingTools.c"
 	}
 #line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->exposure_scheduler;
 #line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16562 "EditingTools.c"
+#line 16460 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToolsAdjustTool* self) {
 	ExposureTransformation* new_exp_trans = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	ExposureTransformation* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
+	ExposureTransformation* _tmp3_;
 #line 2770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16582,56 +16479,53 @@ static void editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToo
 #line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_exp_trans = _tmp3_;
 #line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _ ("Exposure");
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
+	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Exposure"));
 #line 2770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16591 "EditingTools.c"
+#line 16486 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback (gpointer self) {
 #line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_shadows_adjustment ((EditingToolsAdjustTool*) self);
-#line 16598 "EditingTools.c"
+#line 16493 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustTool* self) {
-	OneShotScheduler* _tmp0_ = NULL;
-	OneShotScheduler* _tmp2_ = NULL;
+	OneShotScheduler* _tmp0_;
+	OneShotScheduler* _tmp2_;
 #line 2776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->shadows_scheduler;
 #line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16611 "EditingTools.c"
-		OneShotScheduler* _tmp1_ = NULL;
+#line 16506 "EditingTools.c"
+		OneShotScheduler* _tmp1_;
 #line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("shadows", _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback, self);
 #line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->shadows_scheduler);
 #line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->shadows_scheduler = _tmp1_;
-#line 16619 "EditingTools.c"
+#line 16514 "EditingTools.c"
 	}
 #line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->shadows_scheduler;
 #line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16625 "EditingTools.c"
+#line 16520 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingToolsAdjustTool* self) {
 	ShadowDetailTransformation* new_shadows_trans = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	ShadowDetailTransformation* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
+	ShadowDetailTransformation* _tmp3_;
 #line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16645,56 +16539,53 @@ static void editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingTool
 #line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_shadows_trans = _tmp3_;
 #line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _ ("Shadows");
-#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_shadows_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
+	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_shadows_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Shadows"));
 #line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_shadows_trans);
-#line 16654 "EditingTools.c"
+#line 16546 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback (gpointer self) {
 #line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_highlights_adjustment ((EditingToolsAdjustTool*) self);
-#line 16661 "EditingTools.c"
+#line 16553 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdjustTool* self) {
-	OneShotScheduler* _tmp0_ = NULL;
-	OneShotScheduler* _tmp2_ = NULL;
+	OneShotScheduler* _tmp0_;
+	OneShotScheduler* _tmp2_;
 #line 2789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->highlights_scheduler;
 #line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16674 "EditingTools.c"
-		OneShotScheduler* _tmp1_ = NULL;
+#line 16566 "EditingTools.c"
+		OneShotScheduler* _tmp1_;
 #line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("highlights", _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback, self);
 #line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->highlights_scheduler);
 #line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->highlights_scheduler = _tmp1_;
-#line 16682 "EditingTools.c"
+#line 16574 "EditingTools.c"
 	}
 #line 2793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->highlights_scheduler;
 #line 2793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16688 "EditingTools.c"
+#line 16580 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingToolsAdjustTool* self) {
 	HighlightDetailTransformation* new_highlights_trans = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	HighlightDetailTransformation* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
+	HighlightDetailTransformation* _tmp3_;
 #line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16708,27 +16599,24 @@ static void editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingT
 #line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_highlights_trans = _tmp3_;
 #line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _ ("Highlights");
-#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_highlights_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
+	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_highlights_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Highlights"));
 #line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_highlights_trans);
-#line 16717 "EditingTools.c"
+#line 16606 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjustTool* self) {
 	gint expansion_black_point = 0;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	RGBHistogramManipulator* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	RGBHistogramManipulator* _tmp1_;
+	gint _tmp2_;
 	gint expansion_white_point = 0;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp3_ = NULL;
-	RGBHistogramManipulator* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp3_;
+	RGBHistogramManipulator* _tmp4_;
+	gint _tmp5_;
 	ExpansionTransformation* new_exp_trans = NULL;
-	ExpansionTransformation* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
+	ExpansionTransformation* _tmp6_;
 #line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16752,23 +16640,21 @@ static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjus
 #line 2807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_exp_trans = _tmp6_;
 #line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = _ ("Contrast Expansion");
-#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp7_);
+	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Contrast Expansion"));
 #line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16761 "EditingTools.c"
+#line 16647 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool* self) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	EditingToolsPhotoCanvas* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	GdkPixbuf* _tmp2_;
+	GdkPixbuf* _tmp3_;
+	EditingToolsPhotoCanvas* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	GdkPixbuf* _tmp6_;
 #line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16795,19 +16681,19 @@ static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool*
 	editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp6_);
 #line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp6_);
-#line 16799 "EditingTools.c"
+#line 16685 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustTool* self, GtkWidget* widget, GdkEventButton* event) {
 	gboolean result = FALSE;
 	GtkScale* source = NULL;
-	GtkWidget* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
+	GtkWidget* _tmp0_;
+	GtkScale* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-	GdkEventButton* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
+	GdkEventButton* _tmp4_;
+	guint _tmp5_;
 #line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE);
 #line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16826,27 +16712,27 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo
 	_tmp5_ = _tmp4_->button;
 #line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ == ((guint) 1)) {
-#line 16830 "EditingTools.c"
-		GdkEventButton* _tmp6_ = NULL;
-		GdkEventType _tmp7_ = 0;
+#line 16716 "EditingTools.c"
+		GdkEventButton* _tmp6_;
+		GdkEventType _tmp7_;
 #line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = event;
 #line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_->type;
 #line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ == GDK_BUTTON_PRESS;
-#line 16839 "EditingTools.c"
+#line 16725 "EditingTools.c"
 	} else {
 #line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 16843 "EditingTools.c"
+#line 16729 "EditingTools.c"
 	}
 #line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_) {
-#line 16847 "EditingTools.c"
-		GdkEventButton* _tmp8_ = NULL;
-		GdkModifierType _tmp9_ = 0;
-		gboolean _tmp10_ = FALSE;
+#line 16733 "EditingTools.c"
+		GdkEventButton* _tmp8_;
+		GdkModifierType _tmp9_;
+		gboolean _tmp10_;
 #line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
 #line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16855,16 +16741,16 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo
 		_tmp10_ = has_only_key_modifier (_tmp9_, GDK_CONTROL_MASK);
 #line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = _tmp10_;
-#line 16859 "EditingTools.c"
+#line 16745 "EditingTools.c"
 	} else {
 #line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = FALSE;
-#line 16863 "EditingTools.c"
+#line 16749 "EditingTools.c"
 	}
 #line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_) {
-#line 16867 "EditingTools.c"
-		GtkScale* _tmp11_ = NULL;
+#line 16753 "EditingTools.c"
+		GtkScale* _tmp11_;
 #line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = source;
 #line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16875,7 +16761,7 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo
 		_g_object_unref0 (source);
 #line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 16879 "EditingTools.c"
+#line 16765 "EditingTools.c"
 	}
 #line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
@@ -16883,19 +16769,19 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo
 	_g_object_unref0 (source);
 #line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 16887 "EditingTools.c"
+#line 16773 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
 #line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_canvas_resize ((EditingToolsAdjustTool*) self);
-#line 16894 "EditingTools.c"
+#line 16780 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 #line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16904,13 +16790,13 @@ static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTo
 	_tmp0_ = canvas;
 #line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp0_, "resized-scaled-pixbuf", (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 16908 "EditingTools.c"
+#line 16794 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	EditingToolsPhotoCanvas* _tmp0_;
+	guint _tmp1_;
 #line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16921,77 +16807,77 @@ static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjust
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
 #line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 16925 "EditingTools.c"
+#line 16811 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_ok ((EditingToolsAdjustTool*) self);
-#line 16932 "EditingTools.c"
+#line 16818 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_reset_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_reset ((EditingToolsAdjustTool*) self);
-#line 16939 "EditingTools.c"
+#line 16825 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_exposure_adjustment ((EditingToolsAdjustTool*) self);
-#line 16946 "EditingTools.c"
+#line 16832 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_contrast_adjustment ((EditingToolsAdjustTool*) self);
-#line 16953 "EditingTools.c"
+#line 16839 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_saturation_adjustment ((EditingToolsAdjustTool*) self);
-#line 16960 "EditingTools.c"
+#line 16846 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_tint_adjustment ((EditingToolsAdjustTool*) self);
-#line 16967 "EditingTools.c"
+#line 16853 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_temperature_adjustment ((EditingToolsAdjustTool*) self);
-#line 16974 "EditingTools.c"
+#line 16860 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_shadows_adjustment ((EditingToolsAdjustTool*) self);
-#line 16981 "EditingTools.c"
+#line 16867 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_highlights_adjustment ((EditingToolsAdjustTool*) self);
-#line 16988 "EditingTools.c"
+#line 16874 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed (RGBHistogramManipulator* _sender, gpointer self) {
 #line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_histogram_constraint ((EditingToolsAdjustTool*) self);
-#line 16995 "EditingTools.c"
+#line 16881 "EditingTools.c"
 }
 
 
@@ -17000,47 +16886,47 @@ static gboolean _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_pre
 	result = editing_tools_adjust_tool_on_hscale_reset ((EditingToolsAdjustTool*) self, _sender, event);
 #line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 17004 "EditingTools.c"
+#line 16890 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTool* self) {
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp2_ = NULL;
-	GtkButton* _tmp3_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp4_ = NULL;
-	GtkButton* _tmp5_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp6_ = NULL;
-	GtkScale* _tmp7_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp8_ = NULL;
-	GtkScale* _tmp9_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp10_ = NULL;
-	GtkScale* _tmp11_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp12_ = NULL;
-	GtkScale* _tmp13_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp14_ = NULL;
-	GtkScale* _tmp15_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp16_ = NULL;
-	GtkScale* _tmp17_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp18_ = NULL;
-	GtkScale* _tmp19_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp20_ = NULL;
-	RGBHistogramManipulator* _tmp21_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp22_ = NULL;
-	GtkScale* _tmp23_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp24_ = NULL;
-	GtkScale* _tmp25_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp26_ = NULL;
-	GtkScale* _tmp27_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp28_ = NULL;
-	GtkScale* _tmp29_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp30_ = NULL;
-	GtkScale* _tmp31_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp32_ = NULL;
-	GtkScale* _tmp33_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp34_ = NULL;
-	GtkScale* _tmp35_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkButton* _tmp1_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp2_;
+	GtkButton* _tmp3_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp4_;
+	GtkButton* _tmp5_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp6_;
+	GtkScale* _tmp7_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp8_;
+	GtkScale* _tmp9_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp10_;
+	GtkScale* _tmp11_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp12_;
+	GtkScale* _tmp13_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp14_;
+	GtkScale* _tmp15_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp16_;
+	GtkScale* _tmp17_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp18_;
+	GtkScale* _tmp19_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp20_;
+	RGBHistogramManipulator* _tmp21_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp22_;
+	GtkScale* _tmp23_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp24_;
+	GtkScale* _tmp25_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp26_;
+	GtkScale* _tmp27_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp28_;
+	GtkScale* _tmp29_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp30_;
+	GtkScale* _tmp31_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp32_;
+	GtkScale* _tmp33_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp34_;
+	GtkScale* _tmp35_;
 #line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17151,65 +17037,65 @@ static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTo
 	_tmp35_ = _tmp34_->highlights_slider;
 #line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 17155 "EditingTools.c"
+#line 17041 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjustTool* self) {
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp3_ = NULL;
-	GtkButton* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp6_ = NULL;
-	GtkButton* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp9_ = NULL;
-	GtkScale* _tmp10_ = NULL;
-	guint _tmp11_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp12_ = NULL;
-	GtkScale* _tmp13_ = NULL;
-	guint _tmp14_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp15_ = NULL;
-	GtkScale* _tmp16_ = NULL;
-	guint _tmp17_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp18_ = NULL;
-	GtkScale* _tmp19_ = NULL;
-	guint _tmp20_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp21_ = NULL;
-	GtkScale* _tmp22_ = NULL;
-	guint _tmp23_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp24_ = NULL;
-	GtkScale* _tmp25_ = NULL;
-	guint _tmp26_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp27_ = NULL;
-	GtkScale* _tmp28_ = NULL;
-	guint _tmp29_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp30_ = NULL;
-	RGBHistogramManipulator* _tmp31_ = NULL;
-	guint _tmp32_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp33_ = NULL;
-	GtkScale* _tmp34_ = NULL;
-	guint _tmp35_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp36_ = NULL;
-	GtkScale* _tmp37_ = NULL;
-	guint _tmp38_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp39_ = NULL;
-	GtkScale* _tmp40_ = NULL;
-	guint _tmp41_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp42_ = NULL;
-	GtkScale* _tmp43_ = NULL;
-	guint _tmp44_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp45_ = NULL;
-	GtkScale* _tmp46_ = NULL;
-	guint _tmp47_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp48_ = NULL;
-	GtkScale* _tmp49_ = NULL;
-	guint _tmp50_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp51_ = NULL;
-	GtkScale* _tmp52_ = NULL;
-	guint _tmp53_ = 0U;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkButton* _tmp1_;
+	guint _tmp2_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp3_;
+	GtkButton* _tmp4_;
+	guint _tmp5_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp6_;
+	GtkButton* _tmp7_;
+	guint _tmp8_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp9_;
+	GtkScale* _tmp10_;
+	guint _tmp11_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp12_;
+	GtkScale* _tmp13_;
+	guint _tmp14_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp15_;
+	GtkScale* _tmp16_;
+	guint _tmp17_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp18_;
+	GtkScale* _tmp19_;
+	guint _tmp20_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp21_;
+	GtkScale* _tmp22_;
+	guint _tmp23_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp24_;
+	GtkScale* _tmp25_;
+	guint _tmp26_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp27_;
+	GtkScale* _tmp28_;
+	guint _tmp29_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp30_;
+	RGBHistogramManipulator* _tmp31_;
+	guint _tmp32_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp33_;
+	GtkScale* _tmp34_;
+	guint _tmp35_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp36_;
+	GtkScale* _tmp37_;
+	guint _tmp38_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp39_;
+	GtkScale* _tmp40_;
+	guint _tmp41_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp42_;
+	GtkScale* _tmp43_;
+	guint _tmp44_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp45_;
+	GtkScale* _tmp46_;
+	guint _tmp47_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp48_;
+	GtkScale* _tmp49_;
+	guint _tmp50_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp51_;
+	GtkScale* _tmp52_;
+	guint _tmp53_;
 #line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17356,20 +17242,20 @@ static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjust
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp53_, NULL, FALSE);
 #line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp53_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 17360 "EditingTools.c"
+#line 17246 "EditingTools.c"
 }
 
 
 gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self) {
 	gboolean result = FALSE;
 	EditingToolsAdjustToolAdjustEnhanceCommand* command = NULL;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp3_ = NULL;
-	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp4_ = NULL;
-	CommandManager* _tmp5_ = NULL;
-	CommandManager* _tmp6_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp3_;
+	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp4_;
+	CommandManager* _tmp5_;
+	CommandManager* _tmp6_;
 #line 2883 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE);
 #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17400,24 +17286,24 @@ gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self) {
 	_g_object_unref0 (command);
 #line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 17404 "EditingTools.c"
+#line 17290 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool* self, GeeMap* map) {
-	GeeMap* _tmp0_ = NULL;
-	EditingToolsPhotoCanvas* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	GeeMap* _tmp0_;
+	EditingToolsPhotoCanvas* _tmp1_;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
 	PixelTransformationBundle* adjustments = NULL;
-	EditingToolsPhotoCanvas* _tmp6_ = NULL;
-	Photo* _tmp7_ = NULL;
-	Photo* _tmp8_ = NULL;
-	PixelTransformationBundle* _tmp9_ = NULL;
-	PixelTransformationBundle* _tmp10_ = NULL;
-	PixelTransformationBundle* _tmp11_ = NULL;
+	EditingToolsPhotoCanvas* _tmp6_;
+	Photo* _tmp7_;
+	Photo* _tmp8_;
+	PixelTransformationBundle* _tmp9_;
+	PixelTransformationBundle* _tmp10_;
+	PixelTransformationBundle* _tmp11_;
 #line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17440,7 +17326,7 @@ static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool*
 	if (_tmp5_) {
 #line 2892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 17444 "EditingTools.c"
+#line 17330 "EditingTools.c"
 	}
 #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -17462,13 +17348,13 @@ static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool*
 	editing_tools_adjust_tool_set_adjustments (self, _tmp11_);
 #line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (adjustments);
-#line 17466 "EditingTools.c"
+#line 17352 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* self, PixelTransformationBundle* new_adjustments) {
-	PixelTransformationBundle* _tmp0_ = NULL;
-	EditingToolsPhotoCanvas* _tmp11_ = NULL;
+	PixelTransformationBundle* _tmp0_;
+	EditingToolsPhotoCanvas* _tmp11_;
 #line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17479,14 +17365,14 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s
 	_tmp0_ = new_adjustments;
 #line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformations (self, _tmp0_);
-#line 17483 "EditingTools.c"
+#line 17369 "EditingTools.c"
 	{
 		GeeIterator* _adjustment_it = NULL;
-		PixelTransformationBundle* _tmp1_ = NULL;
-		GeeIterable* _tmp2_ = NULL;
-		GeeIterable* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		PixelTransformationBundle* _tmp1_;
+		GeeIterable* _tmp2_;
+		GeeIterable* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = new_adjustments;
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17503,13 +17389,13 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s
 		_adjustment_it = _tmp5_;
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		while (TRUE) {
-#line 17507 "EditingTools.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 17393 "EditingTools.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			PixelTransformation* adjustment = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			PixelTransformation* _tmp10_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			PixelTransformation* _tmp10_;
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = _adjustment_it;
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17518,7 +17404,7 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s
 			if (!_tmp7_) {
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 17522 "EditingTools.c"
+#line 17408 "EditingTools.c"
 			}
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp8_ = _adjustment_it;
@@ -17532,11 +17418,11 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s
 			editing_tools_adjust_tool_update_slider (self, _tmp10_);
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (adjustment);
-#line 17536 "EditingTools.c"
+#line 17422 "EditingTools.c"
 		}
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_adjustment_it);
-#line 17540 "EditingTools.c"
+#line 17426 "EditingTools.c"
 	}
 #line 2906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (self);
@@ -17544,20 +17430,20 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp11_);
-#line 17548 "EditingTools.c"
+#line 17434 "EditingTools.c"
 }
 
 
 static gpointer _pixel_transformation_ref0 (gpointer self) {
 #line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? pixel_transformation_ref (self) : NULL;
-#line 17555 "EditingTools.c"
+#line 17441 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* self, PixelTransformation* transformation) {
-	PixelTransformation* _tmp0_ = NULL;
-	PixelTransformationType _tmp1_ = 0;
+	PixelTransformation* _tmp0_;
+	PixelTransformationType _tmp1_;
 #line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17570,12 +17456,12 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 	switch (_tmp1_) {
 #line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION:
-#line 17574 "EditingTools.c"
+#line 17460 "EditingTools.c"
 		{
 			ExpansionTransformation* expansion = NULL;
-			PixelTransformation* _tmp2_ = NULL;
-			ExpansionTransformation* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+			PixelTransformation* _tmp2_;
+			ExpansionTransformation* _tmp3_;
+			gboolean _tmp4_;
 #line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = transformation;
 #line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17586,15 +17472,15 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 			_tmp4_ = self->priv->disable_histogram_refresh;
 #line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (!_tmp4_) {
-#line 17590 "EditingTools.c"
-				EditingToolsAdjustToolAdjustToolWindow* _tmp5_ = NULL;
-				RGBHistogramManipulator* _tmp6_ = NULL;
-				ExpansionTransformation* _tmp7_ = NULL;
-				gint _tmp8_ = 0;
-				EditingToolsAdjustToolAdjustToolWindow* _tmp9_ = NULL;
-				RGBHistogramManipulator* _tmp10_ = NULL;
-				ExpansionTransformation* _tmp11_ = NULL;
-				gint _tmp12_ = 0;
+#line 17476 "EditingTools.c"
+				EditingToolsAdjustToolAdjustToolWindow* _tmp5_;
+				RGBHistogramManipulator* _tmp6_;
+				ExpansionTransformation* _tmp7_;
+				gint _tmp8_;
+				EditingToolsAdjustToolAdjustToolWindow* _tmp9_;
+				RGBHistogramManipulator* _tmp10_;
+				ExpansionTransformation* _tmp11_;
+				gint _tmp12_;
 #line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp5_ = self->priv->adjust_tool_window;
 #line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17615,22 +17501,22 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 				_tmp12_ = expansion_transformation_get_white_point (_tmp11_);
 #line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				rgb_histogram_manipulator_set_right_nub_position (_tmp10_, _tmp12_);
-#line 17619 "EditingTools.c"
+#line 17505 "EditingTools.c"
 			}
 #line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (expansion);
 #line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17625 "EditingTools.c"
+#line 17511 "EditingTools.c"
 		}
 #line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_SHADOWS:
-#line 17629 "EditingTools.c"
+#line 17515 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp13_ = NULL;
-			GtkScale* _tmp14_ = NULL;
-			PixelTransformation* _tmp15_ = NULL;
-			gfloat _tmp16_ = 0.0F;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp13_;
+			GtkScale* _tmp14_;
+			PixelTransformation* _tmp15_;
+			gfloat _tmp16_;
 #line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = self->priv->adjust_tool_window;
 #line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17643,16 +17529,16 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_range_get_type (), GtkRange), (gdouble) _tmp16_);
 #line 2928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17647 "EditingTools.c"
+#line 17533 "EditingTools.c"
 		}
 #line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_CONTRAST:
-#line 17651 "EditingTools.c"
+#line 17537 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp17_ = NULL;
-			GtkScale* _tmp18_ = NULL;
-			PixelTransformation* _tmp19_ = NULL;
-			gfloat _tmp20_ = 0.0F;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp17_;
+			GtkScale* _tmp18_;
+			PixelTransformation* _tmp19_;
+			gfloat _tmp20_;
 #line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp17_ = self->priv->adjust_tool_window;
 #line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17665,16 +17551,16 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_range_get_type (), GtkRange), (gdouble) _tmp20_);
 #line 2933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17669 "EditingTools.c"
+#line 17555 "EditingTools.c"
 		}
 #line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS:
-#line 17673 "EditingTools.c"
+#line 17559 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp21_ = NULL;
-			GtkScale* _tmp22_ = NULL;
-			PixelTransformation* _tmp23_ = NULL;
-			gfloat _tmp24_ = 0.0F;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp21_;
+			GtkScale* _tmp22_;
+			PixelTransformation* _tmp23_;
+			gfloat _tmp24_;
 #line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp21_ = self->priv->adjust_tool_window;
 #line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17687,16 +17573,16 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_range_get_type (), GtkRange), (gdouble) _tmp24_);
 #line 2938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17691 "EditingTools.c"
+#line 17577 "EditingTools.c"
 		}
 #line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_EXPOSURE:
-#line 17695 "EditingTools.c"
+#line 17581 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp25_ = NULL;
-			GtkScale* _tmp26_ = NULL;
-			PixelTransformation* _tmp27_ = NULL;
-			gfloat _tmp28_ = 0.0F;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp25_;
+			GtkScale* _tmp26_;
+			PixelTransformation* _tmp27_;
+			gfloat _tmp28_;
 #line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp25_ = self->priv->adjust_tool_window;
 #line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17709,16 +17595,16 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_range_get_type (), GtkRange), (gdouble) _tmp28_);
 #line 2943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17713 "EditingTools.c"
+#line 17599 "EditingTools.c"
 		}
 #line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_SATURATION:
-#line 17717 "EditingTools.c"
+#line 17603 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp29_ = NULL;
-			GtkScale* _tmp30_ = NULL;
-			PixelTransformation* _tmp31_ = NULL;
-			gfloat _tmp32_ = 0.0F;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp29_;
+			GtkScale* _tmp30_;
+			PixelTransformation* _tmp31_;
+			gfloat _tmp32_;
 #line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp29_ = self->priv->adjust_tool_window;
 #line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17731,16 +17617,16 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_range_get_type (), GtkRange), (gdouble) _tmp32_);
 #line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17735 "EditingTools.c"
+#line 17621 "EditingTools.c"
 		}
 #line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TINT:
-#line 17739 "EditingTools.c"
+#line 17625 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp33_ = NULL;
-			GtkScale* _tmp34_ = NULL;
-			PixelTransformation* _tmp35_ = NULL;
-			gfloat _tmp36_ = 0.0F;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp33_;
+			GtkScale* _tmp34_;
+			PixelTransformation* _tmp35_;
+			gfloat _tmp36_;
 #line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp33_ = self->priv->adjust_tool_window;
 #line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17753,16 +17639,16 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_range_get_type (), GtkRange), (gdouble) _tmp36_);
 #line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17757 "EditingTools.c"
+#line 17643 "EditingTools.c"
 		}
 #line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TEMPERATURE:
-#line 17761 "EditingTools.c"
+#line 17647 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp37_ = NULL;
-			GtkScale* _tmp38_ = NULL;
-			PixelTransformation* _tmp39_ = NULL;
-			gfloat _tmp40_ = 0.0F;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp37_;
+			GtkScale* _tmp38_;
+			PixelTransformation* _tmp39_;
+			gfloat _tmp40_;
 #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp37_ = self->priv->adjust_tool_window;
 #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17775,19 +17661,19 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_range_get_type (), GtkRange), (gdouble) _tmp40_);
 #line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17779 "EditingTools.c"
+#line 17665 "EditingTools.c"
 		}
 		default:
 		{
-			PixelTransformation* _tmp41_ = NULL;
-			PixelTransformationType _tmp42_ = 0;
+			PixelTransformation* _tmp41_;
+			PixelTransformationType _tmp42_;
 #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp41_ = transformation;
 #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp42_ = pixel_transformation_get_transformation_type (_tmp41_);
 #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_error ("EditingTools.vala:2961: Unknown adjustment: %d", (gint) _tmp42_);
-#line 17791 "EditingTools.c"
+#line 17677 "EditingTools.c"
 		}
 	}
 }
@@ -17795,25 +17681,25 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 
 static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustTool* self, GdkPixbuf* source) {
 	gint source_width = 0;
-	GdkPixbuf* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	GdkPixbuf* _tmp0_;
+	gint _tmp1_;
 	gint source_height = 0;
-	GdkPixbuf* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	GdkPixbuf* _tmp2_;
+	gint _tmp3_;
 	gint source_num_channels = 0;
-	GdkPixbuf* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	GdkPixbuf* _tmp4_;
+	gint _tmp5_;
 	gint source_rowstride = 0;
-	GdkPixbuf* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
+	GdkPixbuf* _tmp6_;
+	gint _tmp7_;
 	guchar* source_pixels = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
-	guint8* _tmp9_ = NULL;
-	gint source_pixels_length1 = 0;
-	gint _source_pixels_size_ = 0;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	gfloat* _tmp12_ = NULL;
+	GdkPixbuf* _tmp8_;
+	guint8* _tmp9_;
+	gint source_pixels_length1;
+	gint _source_pixels_size_;
+	gint _tmp10_;
+	gint _tmp11_;
+	gfloat* _tmp12_;
 	gint cache_pixel_index = 0;
 	gfloat INV_255 = 0.0F;
 #line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17872,37 +17758,37 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 	cache_pixel_index = 0;
 #line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	INV_255 = 1.0f / 255.0f;
-#line 17876 "EditingTools.c"
+#line 17762 "EditingTools.c"
 	{
 		gint j = 0;
 #line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		j = 0;
-#line 17881 "EditingTools.c"
+#line 17767 "EditingTools.c"
 		{
 			gboolean _tmp13_ = FALSE;
 #line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = TRUE;
 #line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			while (TRUE) {
-#line 17888 "EditingTools.c"
-				gint _tmp15_ = 0;
-				gint _tmp16_ = 0;
+#line 17774 "EditingTools.c"
+				gint _tmp15_;
+				gint _tmp16_;
 				gint row_start_index = 0;
-				gint _tmp17_ = 0;
-				gint _tmp18_ = 0;
+				gint _tmp17_;
+				gint _tmp18_;
 				gint row_end_index = 0;
-				gint _tmp19_ = 0;
-				gint _tmp20_ = 0;
-				gint _tmp21_ = 0;
+				gint _tmp19_;
+				gint _tmp20_;
+				gint _tmp21_;
 #line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!_tmp13_) {
-#line 17900 "EditingTools.c"
-					gint _tmp14_ = 0;
+#line 17786 "EditingTools.c"
+					gint _tmp14_;
 #line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp14_ = j;
 #line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					j = _tmp14_ + 1;
-#line 17906 "EditingTools.c"
+#line 17792 "EditingTools.c"
 				}
 #line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp13_ = FALSE;
@@ -17914,7 +17800,7 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 				if (!(_tmp15_ < _tmp16_)) {
 #line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					break;
-#line 17918 "EditingTools.c"
+#line 17804 "EditingTools.c"
 				}
 #line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp17_ = j;
@@ -17930,63 +17816,63 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 				_tmp21_ = source_num_channels;
 #line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				row_end_index = _tmp19_ + (_tmp20_ * _tmp21_);
-#line 17934 "EditingTools.c"
+#line 17820 "EditingTools.c"
 				{
 					gint i = 0;
-					gint _tmp22_ = 0;
+					gint _tmp22_;
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp22_ = row_start_index;
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					i = _tmp22_;
-#line 17942 "EditingTools.c"
+#line 17828 "EditingTools.c"
 					{
 						gboolean _tmp23_ = FALSE;
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp23_ = TRUE;
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						while (TRUE) {
-#line 17949 "EditingTools.c"
-							gint _tmp26_ = 0;
-							gint _tmp27_ = 0;
-							gfloat* _tmp28_ = NULL;
-							gint _tmp28__length1 = 0;
-							gint _tmp29_ = 0;
-							guchar* _tmp30_ = NULL;
-							gint _tmp30__length1 = 0;
-							gint _tmp31_ = 0;
-							guchar _tmp32_ = '\0';
-							gfloat _tmp33_ = 0.0F;
-							gfloat _tmp34_ = 0.0F;
-							gfloat* _tmp35_ = NULL;
-							gint _tmp35__length1 = 0;
-							gint _tmp36_ = 0;
-							guchar* _tmp37_ = NULL;
-							gint _tmp37__length1 = 0;
-							gint _tmp38_ = 0;
-							guchar _tmp39_ = '\0';
-							gfloat _tmp40_ = 0.0F;
-							gfloat _tmp41_ = 0.0F;
-							gfloat* _tmp42_ = NULL;
-							gint _tmp42__length1 = 0;
-							gint _tmp43_ = 0;
-							guchar* _tmp44_ = NULL;
-							gint _tmp44__length1 = 0;
-							gint _tmp45_ = 0;
-							guchar _tmp46_ = '\0';
-							gfloat _tmp47_ = 0.0F;
-							gfloat _tmp48_ = 0.0F;
+#line 17835 "EditingTools.c"
+							gint _tmp26_;
+							gint _tmp27_;
+							gfloat* _tmp28_;
+							gint _tmp28__length1;
+							gint _tmp29_;
+							guchar* _tmp30_;
+							gint _tmp30__length1;
+							gint _tmp31_;
+							guchar _tmp32_;
+							gfloat _tmp33_;
+							gfloat _tmp34_;
+							gfloat* _tmp35_;
+							gint _tmp35__length1;
+							gint _tmp36_;
+							guchar* _tmp37_;
+							gint _tmp37__length1;
+							gint _tmp38_;
+							guchar _tmp39_;
+							gfloat _tmp40_;
+							gfloat _tmp41_;
+							gfloat* _tmp42_;
+							gint _tmp42__length1;
+							gint _tmp43_;
+							guchar* _tmp44_;
+							gint _tmp44__length1;
+							gint _tmp45_;
+							guchar _tmp46_;
+							gfloat _tmp47_;
+							gfloat _tmp48_;
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							if (!_tmp23_) {
-#line 17981 "EditingTools.c"
-								gint _tmp24_ = 0;
-								gint _tmp25_ = 0;
+#line 17867 "EditingTools.c"
+								gint _tmp24_;
+								gint _tmp25_;
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								_tmp24_ = i;
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								_tmp25_ = source_num_channels;
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								i = _tmp24_ + _tmp25_;
-#line 17990 "EditingTools.c"
+#line 17876 "EditingTools.c"
 							}
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp23_ = FALSE;
@@ -17998,7 +17884,7 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 							if (!(_tmp26_ < _tmp27_)) {
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								break;
-#line 18002 "EditingTools.c"
+#line 17888 "EditingTools.c"
 							}
 #line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp28_ = self->priv->fp_pixel_cache;
@@ -18066,7 +17952,7 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 							_tmp42_[_tmp43_] = ((gfloat) _tmp46_) * _tmp47_;
 #line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp48_ = _tmp42_[_tmp43_];
-#line 18070 "EditingTools.c"
+#line 17956 "EditingTools.c"
 						}
 					}
 				}
@@ -18081,11 +17967,11 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GdkEventKey* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	const gchar* _tmp4_ = NULL;
-	GdkEventKey* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	GdkEventKey* _tmp2_;
+	guint _tmp3_;
+	const gchar* _tmp4_;
+	GdkEventKey* _tmp11_;
+	gboolean _tmp12_;
 #line 2987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
 #line 2987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18100,11 +17986,11 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
 #line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 18104 "EditingTools.c"
+#line 17990 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp5_ = NULL;
-		guint _tmp6_ = 0U;
-		const gchar* _tmp7_ = NULL;
+		GdkEventKey* _tmp5_;
+		guint _tmp6_;
+		const gchar* _tmp7_;
 #line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = event;
 #line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18113,17 +17999,17 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 		_tmp7_ = gdk_keyval_name (_tmp6_);
 #line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 18117 "EditingTools.c"
+#line 18003 "EditingTools.c"
 	}
 #line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
 #line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 18123 "EditingTools.c"
+#line 18009 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp8_ = NULL;
-		guint _tmp9_ = 0U;
-		const gchar* _tmp10_ = NULL;
+		GdkEventKey* _tmp8_;
+		guint _tmp9_;
+		const gchar* _tmp10_;
 #line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
 #line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18132,7 +18018,7 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 		_tmp10_ = gdk_keyval_name (_tmp9_);
 #line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 18136 "EditingTools.c"
+#line 18022 "EditingTools.c"
 	}
 #line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
@@ -18142,7 +18028,7 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 		result = TRUE;
 #line 2992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18146 "EditingTools.c"
+#line 18032 "EditingTools.c"
 	}
 #line 2995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
@@ -18152,76 +18038,69 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 	result = _tmp12_;
 #line 2995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 18156 "EditingTools.c"
+#line 18042 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_construct (GType object_type, GtkWindow* container) {
 	EditingToolsAdjustToolAdjustToolWindow * self = NULL;
-	GtkWindow* _tmp0_ = NULL;
+	GtkWindow* _tmp0_;
 	GtkGrid* slider_organizer = NULL;
-	GtkGrid* _tmp1_ = NULL;
+	GtkGrid* _tmp1_;
 	GtkLabel* exposure_label = NULL;
-	const gchar* _tmp2_ = NULL;
-	GtkLabel* _tmp3_ = NULL;
-	GtkScale* _tmp4_ = NULL;
-	GtkScale* _tmp5_ = NULL;
-	GtkScale* _tmp6_ = NULL;
-	GtkScale* _tmp7_ = NULL;
+	GtkLabel* _tmp2_;
+	GtkScale* _tmp3_;
+	GtkScale* _tmp4_;
+	GtkScale* _tmp5_;
+	GtkScale* _tmp6_;
 	GtkLabel* contrast_label = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkLabel* _tmp9_ = NULL;
-	GtkScale* _tmp10_ = NULL;
-	GtkScale* _tmp11_ = NULL;
-	GtkScale* _tmp12_ = NULL;
-	GtkScale* _tmp13_ = NULL;
+	GtkLabel* _tmp7_;
+	GtkScale* _tmp8_;
+	GtkScale* _tmp9_;
+	GtkScale* _tmp10_;
+	GtkScale* _tmp11_;
 	GtkLabel* saturation_label = NULL;
-	const gchar* _tmp14_ = NULL;
-	GtkLabel* _tmp15_ = NULL;
-	GtkScale* _tmp16_ = NULL;
-	GtkScale* _tmp17_ = NULL;
-	GtkScale* _tmp18_ = NULL;
-	GtkScale* _tmp19_ = NULL;
+	GtkLabel* _tmp12_;
+	GtkScale* _tmp13_;
+	GtkScale* _tmp14_;
+	GtkScale* _tmp15_;
+	GtkScale* _tmp16_;
 	GtkLabel* tint_label = NULL;
-	const gchar* _tmp20_ = NULL;
-	GtkLabel* _tmp21_ = NULL;
-	GtkScale* _tmp22_ = NULL;
-	GtkScale* _tmp23_ = NULL;
-	GtkScale* _tmp24_ = NULL;
-	GtkScale* _tmp25_ = NULL;
+	GtkLabel* _tmp17_;
+	GtkScale* _tmp18_;
+	GtkScale* _tmp19_;
+	GtkScale* _tmp20_;
+	GtkScale* _tmp21_;
 	GtkLabel* temperature_label = NULL;
-	const gchar* _tmp26_ = NULL;
-	GtkLabel* _tmp27_ = NULL;
-	GtkScale* _tmp28_ = NULL;
-	GtkScale* _tmp29_ = NULL;
-	GtkScale* _tmp30_ = NULL;
-	GtkScale* _tmp31_ = NULL;
+	GtkLabel* _tmp22_;
+	GtkScale* _tmp23_;
+	GtkScale* _tmp24_;
+	GtkScale* _tmp25_;
+	GtkScale* _tmp26_;
 	GtkLabel* shadows_label = NULL;
-	const gchar* _tmp32_ = NULL;
-	GtkLabel* _tmp33_ = NULL;
-	GtkScale* _tmp34_ = NULL;
-	GtkScale* _tmp35_ = NULL;
-	GtkScale* _tmp36_ = NULL;
-	GtkScale* _tmp37_ = NULL;
+	GtkLabel* _tmp27_;
+	GtkScale* _tmp28_;
+	GtkScale* _tmp29_;
+	GtkScale* _tmp30_;
+	GtkScale* _tmp31_;
 	GtkLabel* highlights_label = NULL;
-	const gchar* _tmp38_ = NULL;
-	GtkLabel* _tmp39_ = NULL;
-	GtkScale* _tmp40_ = NULL;
-	GtkScale* _tmp41_ = NULL;
-	GtkScale* _tmp42_ = NULL;
+	GtkLabel* _tmp32_;
+	GtkScale* _tmp33_;
+	GtkScale* _tmp34_;
+	GtkScale* _tmp35_;
 	GtkBox* button_layouter = NULL;
-	GtkBox* _tmp43_ = NULL;
-	GtkButton* _tmp44_ = NULL;
-	GtkButton* _tmp45_ = NULL;
-	GtkButton* _tmp46_ = NULL;
-	RGBHistogramManipulator* _tmp47_ = NULL;
-	RGBHistogramManipulator* _tmp48_ = NULL;
-	RGBHistogramManipulator* _tmp49_ = NULL;
-	RGBHistogramManipulator* _tmp50_ = NULL;
+	GtkBox* _tmp36_;
+	GtkButton* _tmp37_;
+	GtkButton* _tmp38_;
+	GtkButton* _tmp39_;
+	RGBHistogramManipulator* _tmp40_;
+	RGBHistogramManipulator* _tmp41_;
+	RGBHistogramManipulator* _tmp42_;
+	RGBHistogramManipulator* _tmp43_;
 	GtkBox* pane_layouter = NULL;
-	GtkBox* _tmp51_ = NULL;
-	RGBHistogramManipulator* _tmp52_ = NULL;
-	RGBHistogramManipulator* _tmp53_ = NULL;
+	GtkBox* _tmp44_;
+	RGBHistogramManipulator* _tmp45_;
+	RGBHistogramManipulator* _tmp46_;
 #line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18245,13 +18124,11 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget), 12);
 #line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = _ ("Exposure:");
-#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp2_);
+	_tmp2_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Exposure:"));
 #line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp3_);
+	g_object_ref_sink (_tmp2_);
 #line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	exposure_label = _tmp3_;
+	exposure_label = _tmp2_;
 #line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18259,29 +18136,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), 0, 0, 1, 1);
 #line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = self->exposure_slider;
+	_tmp3_ = self->exposure_slider;
 #line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), 1, 0, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), 1, 0, 1, 1);
 #line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = self->exposure_slider;
+	_tmp4_ = self->exposure_slider;
 #line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = self->exposure_slider;
+	_tmp5_ = self->exposure_slider;
 #line 2258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp6_, FALSE);
+	gtk_scale_set_draw_value (_tmp5_, FALSE);
 #line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = self->exposure_slider;
+	_tmp6_ = self->exposure_slider;
 #line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = _ ("Contrast:");
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp8_);
+	_tmp7_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Contrast:"));
 #line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp9_);
+	g_object_ref_sink (_tmp7_);
 #line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	contrast_label = _tmp9_;
+	contrast_label = _tmp7_;
 #line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18289,29 +18164,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), 0, 1, 1, 1);
 #line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = self->contrast_slider;
+	_tmp8_ = self->contrast_slider;
 #line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 1, 1, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), 1, 1, 1, 1);
 #line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = self->contrast_slider;
+	_tmp9_ = self->contrast_slider;
 #line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = self->contrast_slider;
+	_tmp10_ = self->contrast_slider;
 #line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp12_, FALSE);
+	gtk_scale_set_draw_value (_tmp10_, FALSE);
 #line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = self->contrast_slider;
+	_tmp11_ = self->contrast_slider;
 #line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = _ ("Saturation:");
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp14_);
+	_tmp12_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Saturation:"));
 #line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp15_);
+	g_object_ref_sink (_tmp12_);
 #line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	saturation_label = _tmp15_;
+	saturation_label = _tmp12_;
 #line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18319,29 +18192,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), 0, 2, 1, 1);
 #line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = self->saturation_slider;
+	_tmp13_ = self->saturation_slider;
 #line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), 1, 2, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 1, 2, 1, 1);
 #line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = self->saturation_slider;
+	_tmp14_ = self->saturation_slider;
 #line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = self->saturation_slider;
+	_tmp15_ = self->saturation_slider;
 #line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp18_, FALSE);
+	gtk_scale_set_draw_value (_tmp15_, FALSE);
 #line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = self->saturation_slider;
+	_tmp16_ = self->saturation_slider;
 #line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = _ ("Tint:");
+	_tmp17_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Tint:"));
 #line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp20_);
+	g_object_ref_sink (_tmp17_);
 #line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp21_);
-#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	tint_label = _tmp21_;
+	tint_label = _tmp17_;
 #line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18349,29 +18220,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), 0, 3, 1, 1);
 #line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = self->tint_slider;
+	_tmp18_ = self->tint_slider;
 #line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), 1, 3, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), 1, 3, 1, 1);
 #line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = self->tint_slider;
+	_tmp19_ = self->tint_slider;
 #line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = self->tint_slider;
+	_tmp20_ = self->tint_slider;
 #line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp24_, FALSE);
+	gtk_scale_set_draw_value (_tmp20_, FALSE);
 #line 2286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = self->tint_slider;
+	_tmp21_ = self->tint_slider;
 #line 2286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = _ ("Temperature:");
+	_tmp22_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Temperature:"));
 #line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp26_);
-#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp27_);
+	g_object_ref_sink (_tmp22_);
 #line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	temperature_label = _tmp27_;
+	temperature_label = _tmp22_;
 #line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18379,29 +18248,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), 0, 4, 1, 1);
 #line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = self->temperature_slider;
+	_tmp23_ = self->temperature_slider;
 #line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), 1, 4, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), 1, 4, 1, 1);
 #line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = self->temperature_slider;
+	_tmp24_ = self->temperature_slider;
 #line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp30_ = self->temperature_slider;
+	_tmp25_ = self->temperature_slider;
 #line 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp30_, FALSE);
+	gtk_scale_set_draw_value (_tmp25_, FALSE);
 #line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = self->temperature_slider;
+	_tmp26_ = self->temperature_slider;
 #line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp32_ = _ ("Shadows:");
+	_tmp27_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Shadows:"));
 #line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp33_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp32_);
-#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp33_);
+	g_object_ref_sink (_tmp27_);
 #line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	shadows_label = _tmp33_;
+	shadows_label = _tmp27_;
 #line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18409,29 +18276,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), 0, 5, 1, 1);
 #line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp34_ = self->shadows_slider;
+	_tmp28_ = self->shadows_slider;
 #line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), 1, 5, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), 1, 5, 1, 1);
 #line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp35_ = self->shadows_slider;
+	_tmp29_ = self->shadows_slider;
 #line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp36_ = self->shadows_slider;
+	_tmp30_ = self->shadows_slider;
 #line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp36_, FALSE);
+	gtk_scale_set_draw_value (_tmp30_, FALSE);
 #line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp37_ = self->shadows_slider;
+	_tmp31_ = self->shadows_slider;
 #line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp38_ = _ ("Highlights:");
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp39_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp38_);
+	_tmp32_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Highlights:"));
 #line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp39_);
+	g_object_ref_sink (_tmp32_);
 #line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	highlights_label = _tmp39_;
+	highlights_label = _tmp32_;
 #line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18439,71 +18304,71 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), 0, 6, 1, 1);
 #line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp40_ = self->highlights_slider;
+	_tmp33_ = self->highlights_slider;
 #line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), 1, 6, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), 1, 6, 1, 1);
 #line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp41_ = self->highlights_slider;
+	_tmp34_ = self->highlights_slider;
 #line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp42_ = self->highlights_slider;
+	_tmp35_ = self->highlights_slider;
 #line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp42_, FALSE);
+	gtk_scale_set_draw_value (_tmp35_, FALSE);
 #line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp43_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+	_tmp36_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
 #line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp43_);
+	g_object_ref_sink (_tmp36_);
 #line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	button_layouter = _tmp43_;
+	button_layouter = _tmp36_;
 #line 2316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_set_homogeneous (button_layouter, TRUE);
 #line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp44_ = self->cancel_button;
+	_tmp37_ = self->cancel_button;
 #line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
+	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
 #line 2318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp45_ = self->reset_button;
+	_tmp38_ = self->reset_button;
 #line 2318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
+	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
 #line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp46_ = self->ok_button;
+	_tmp39_ = self->ok_button;
 #line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
+	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
 #line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp47_ = self->histogram_manipulator;
+	_tmp40_ = self->histogram_manipulator;
 #line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), 12);
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), 12);
 #line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp48_ = self->histogram_manipulator;
+	_tmp41_ = self->histogram_manipulator;
 #line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget), 12);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), 12);
 #line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp49_ = self->histogram_manipulator;
+	_tmp42_ = self->histogram_manipulator;
 #line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), 12);
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), 12);
 #line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp50_ = self->histogram_manipulator;
+	_tmp43_ = self->histogram_manipulator;
 #line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), 8);
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), 8);
 #line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp51_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+	_tmp44_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
 #line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp51_);
+	g_object_ref_sink (_tmp44_);
 #line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pane_layouter = _tmp51_;
+	pane_layouter = _tmp44_;
 #line 2327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp52_ = self->histogram_manipulator;
+	_tmp45_ = self->histogram_manipulator;
 #line 2327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
 #line 2328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget));
 #line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (button_layouter, gtk_widget_get_type (), GtkWidget));
 #line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp53_ = self->histogram_manipulator;
+	_tmp46_ = self->histogram_manipulator;
 #line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START);
+	gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START);
 #line 2332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_widget_get_type (), GtkWidget));
 #line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18528,14 +18393,14 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 	_g_object_unref0 (slider_organizer);
 #line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18532 "EditingTools.c"
+#line 18397 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_new (GtkWindow* container) {
 #line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_tool_window_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_WINDOW, container);
-#line 18539 "EditingTools.c"
+#line 18404 "EditingTools.c"
 }
 
 
@@ -18544,23 +18409,22 @@ static void editing_tools_adjust_tool_adjust_tool_window_class_init (EditingTool
 	editing_tools_adjust_tool_adjust_tool_window_parent_class = g_type_class_peek_parent (klass);
 #line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_window_finalize;
-#line 18548 "EditingTools.c"
+#line 18413 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingToolsAdjustToolAdjustToolWindow * self) {
-	GtkScale* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	GtkScale* _tmp2_ = NULL;
-	GtkScale* _tmp3_ = NULL;
-	GtkScale* _tmp4_ = NULL;
-	GtkScale* _tmp5_ = NULL;
-	GtkScale* _tmp6_ = NULL;
-	GtkButton* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkButton* _tmp9_ = NULL;
-	GtkButton* _tmp10_ = NULL;
-	RGBHistogramManipulator* _tmp11_ = NULL;
+	GtkScale* _tmp0_;
+	GtkScale* _tmp1_;
+	GtkScale* _tmp2_;
+	GtkScale* _tmp3_;
+	GtkScale* _tmp4_;
+	GtkScale* _tmp5_;
+	GtkScale* _tmp6_;
+	GtkButton* _tmp7_;
+	GtkButton* _tmp8_;
+	GtkButton* _tmp9_;
+	RGBHistogramManipulator* _tmp10_;
 #line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) EXPOSURE_TRANSFORMATION_MIN_PARAMETER, (gdouble) EXPOSURE_TRANSFORMATION_MAX_PARAMETER, 1.0);
 #line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18610,30 +18474,28 @@ static void editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingT
 #line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ok_button = _tmp7_;
 #line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = _ ("_Reset");
+	_tmp8_ = (GtkButton*) gtk_button_new_with_mnemonic (_ ("_Reset"));
 #line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = (GtkButton*) gtk_button_new_with_mnemonic (_tmp8_);
-#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp9_);
+	g_object_ref_sink (_tmp8_);
 #line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->reset_button = _tmp9_;
+	self->reset_button = _tmp8_;
 #line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
+	_tmp9_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
 #line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp10_);
+	g_object_ref_sink (_tmp9_);
 #line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->cancel_button = _tmp10_;
+	self->cancel_button = _tmp9_;
 #line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = rgb_histogram_manipulator_new ();
+	_tmp10_ = rgb_histogram_manipulator_new ();
 #line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp11_);
+	g_object_ref_sink (_tmp10_);
 #line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->histogram_manipulator = _tmp11_;
-#line 18633 "EditingTools.c"
+	self->histogram_manipulator = _tmp10_;
+#line 18495 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject* obj) {
+static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject * obj) {
 	EditingToolsAdjustToolAdjustToolWindow * self;
 #line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_WINDOW, EditingToolsAdjustToolAdjustToolWindow);
@@ -18661,7 +18523,7 @@ static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject* obj)
 	_g_object_unref0 (self->histogram_manipulator);
 #line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_window_parent_class)->finalize (obj);
-#line 18665 "EditingTools.c"
+#line 18527 "EditingTools.c"
 }
 
 
@@ -18680,16 +18542,16 @@ static GType editing_tools_adjust_tool_adjust_tool_window_get_type (void) {
 static void _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) {
 #line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated ((EditingToolsAdjustToolAdjustToolCommand*) self);
-#line 18684 "EditingTools.c"
+#line 18546 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust_tool_command_construct (GType object_type, EditingToolsAdjustTool* owner, const gchar* name, const gchar* explanation) {
 	EditingToolsAdjustToolAdjustToolCommand * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	EditingToolsAdjustTool* _tmp2_ = NULL;
-	EditingToolsAdjustTool* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	EditingToolsAdjustTool* _tmp2_;
+	EditingToolsAdjustTool* _tmp3_;
 #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
 #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18712,13 +18574,13 @@ static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "deactivated", (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self, 0);
 #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18716 "EditingTools.c"
+#line 18578 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated (EditingToolsAdjustToolAdjustToolCommand* self) {
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
 #line 2351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_ADJUST_TOOL_IS_ADJUST_TOOL_COMMAND (self));
 #line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18729,7 +18591,7 @@ static void editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated (
 	command_manager_reset (_tmp1_);
 #line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 18733 "EditingTools.c"
+#line 18595 "EditingTools.c"
 }
 
 
@@ -18738,7 +18600,7 @@ static void editing_tools_adjust_tool_adjust_tool_command_class_init (EditingToo
 	editing_tools_adjust_tool_adjust_tool_command_parent_class = g_type_class_peek_parent (klass);
 #line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_command_finalize;
-#line 18742 "EditingTools.c"
+#line 18604 "EditingTools.c"
 }
 
 
@@ -18746,29 +18608,29 @@ static void editing_tools_adjust_tool_adjust_tool_command_instance_init (Editing
 }
 
 
-static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject* obj) {
+static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * obj) {
 	EditingToolsAdjustToolAdjustToolCommand * self;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
 #line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand);
 #line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->owner;
 #line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 18759 "EditingTools.c"
-		EditingToolsAdjustTool* _tmp1_ = NULL;
-		guint _tmp2_ = 0U;
+#line 18621 "EditingTools.c"
+		EditingToolsAdjustTool* _tmp1_;
+		guint _tmp2_;
 #line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->owner;
 #line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp2_, NULL, FALSE);
 #line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self);
-#line 18768 "EditingTools.c"
+#line 18630 "EditingTools.c"
 	}
 #line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_command_parent_class)->finalize (obj);
-#line 18772 "EditingTools.c"
+#line 18634 "EditingTools.c"
 }
 
 
@@ -18786,13 +18648,11 @@ static GType editing_tools_adjust_tool_adjust_tool_command_get_type (void) {
 
 static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_construct (GType object_type, EditingToolsAdjustTool* owner, PixelTransformationBundle* current) {
 	EditingToolsAdjustToolAdjustResetCommand * self = NULL;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PixelTransformationBundle* _tmp3_ = NULL;
-	PixelTransformationBundle* _tmp4_ = NULL;
-	PixelTransformationBundle* _tmp5_ = NULL;
-	PixelTransformationBundle* _tmp6_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
+	PixelTransformationBundle* _tmp1_;
+	PixelTransformationBundle* _tmp2_;
+	PixelTransformationBundle* _tmp3_;
+	PixelTransformationBundle* _tmp4_;
 #line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
 #line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18800,46 +18660,42 @@ static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjus
 #line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = owner;
 #line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = _ ("Reset Colors");
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = _ ("Reset all color adjustments to original");
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self = (EditingToolsAdjustToolAdjustResetCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_);
+	self = (EditingToolsAdjustToolAdjustResetCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _ ("Reset Colors"), _ ("Reset all color adjustments to original"));
 #line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = current;
+	_tmp1_ = current;
 #line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = pixel_transformation_bundle_copy (_tmp3_);
+	_tmp2_ = pixel_transformation_bundle_copy (_tmp1_);
 #line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
 #line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->original = _tmp4_;
+	self->priv->original = _tmp2_;
 #line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = pixel_transformation_bundle_new ();
+	_tmp3_ = pixel_transformation_bundle_new ();
 #line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->reset);
 #line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->reset = _tmp5_;
+	self->priv->reset = _tmp3_;
 #line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = self->priv->reset;
+	_tmp4_ = self->priv->reset;
 #line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pixel_transformation_bundle_set_to_identity (_tmp6_);
+	pixel_transformation_bundle_set_to_identity (_tmp4_);
 #line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18829 "EditingTools.c"
+#line 18685 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_new (EditingToolsAdjustTool* owner, PixelTransformationBundle* current) {
 #line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_reset_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, owner, current);
-#line 18836 "EditingTools.c"
+#line 18692 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command* base) {
 	EditingToolsAdjustToolAdjustResetCommand * self;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	PixelTransformationBundle* _tmp1_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
+	PixelTransformationBundle* _tmp1_;
 #line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
 #line 2371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18848,14 +18704,14 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command
 	_tmp1_ = self->priv->reset;
 #line 2371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 18852 "EditingTools.c"
+#line 18708 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* base) {
 	EditingToolsAdjustToolAdjustResetCommand * self;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	PixelTransformationBundle* _tmp1_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
+	PixelTransformationBundle* _tmp1_;
 #line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
 #line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18864,7 +18720,7 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* b
 	_tmp1_ = self->priv->original;
 #line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 18868 "EditingTools.c"
+#line 18724 "EditingTools.c"
 }
 
 
@@ -18872,12 +18728,12 @@ static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Co
 	EditingToolsAdjustToolAdjustResetCommand * self;
 	gboolean result = FALSE;
 	EditingToolsAdjustToolAdjustResetCommand* reset_command = NULL;
-	Command* _tmp0_ = NULL;
-	EditingToolsAdjustToolAdjustResetCommand* _tmp1_ = NULL;
-	EditingToolsAdjustToolAdjustResetCommand* _tmp2_ = NULL;
-	EditingToolsAdjustToolAdjustResetCommand* _tmp3_ = NULL;
-	EditingToolsAdjustTool* _tmp4_ = NULL;
-	EditingToolsAdjustTool* _tmp5_ = NULL;
+	Command* _tmp0_;
+	EditingToolsAdjustToolAdjustResetCommand* _tmp1_;
+	EditingToolsAdjustToolAdjustResetCommand* _tmp2_;
+	EditingToolsAdjustToolAdjustResetCommand* _tmp3_;
+	EditingToolsAdjustTool* _tmp4_;
+	EditingToolsAdjustTool* _tmp5_;
 #line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
 #line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18898,7 +18754,7 @@ static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Co
 		_g_object_unref0 (reset_command);
 #line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18902 "EditingTools.c"
+#line 18758 "EditingTools.c"
 	}
 #line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = reset_command;
@@ -18914,7 +18770,7 @@ static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Co
 		_g_object_unref0 (reset_command);
 #line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18918 "EditingTools.c"
+#line 18774 "EditingTools.c"
 	}
 #line 2387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
@@ -18922,7 +18778,7 @@ static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Co
 	_g_object_unref0 (reset_command);
 #line 2387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 18926 "EditingTools.c"
+#line 18782 "EditingTools.c"
 }
 
 
@@ -18932,25 +18788,25 @@ static void editing_tools_adjust_tool_adjust_reset_command_class_init (EditingTo
 #line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolAdjustResetCommandPrivate));
 #line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) editing_tools_adjust_tool_adjust_reset_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) editing_tools_adjust_tool_adjust_reset_command_real_execute;
 #line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) editing_tools_adjust_tool_adjust_reset_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) editing_tools_adjust_tool_adjust_reset_command_real_undo;
 #line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) editing_tools_adjust_tool_adjust_reset_command_real_compress;
+	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_adjust_reset_command_real_compress;
 #line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_reset_command_finalize;
-#line 18943 "EditingTools.c"
+#line 18799 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_instance_init (EditingToolsAdjustToolAdjustResetCommand * self) {
 #line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_GET_PRIVATE (self);
-#line 18950 "EditingTools.c"
+#line 18806 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject* obj) {
+static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject * obj) {
 	EditingToolsAdjustToolAdjustResetCommand * self;
 #line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
@@ -18960,7 +18816,7 @@ static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject* ob
 	_pixel_transformation_bundle_unref0 (self->priv->reset);
 #line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_reset_command_parent_class)->finalize (obj);
-#line 18964 "EditingTools.c"
+#line 18820 "EditingTools.c"
 }
 
 
@@ -18978,18 +18834,18 @@ static GType editing_tools_adjust_tool_adjust_reset_command_get_type (void) {
 
 static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_construct (GType object_type, EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name) {
 	EditingToolsAdjustToolSliderAdjustmentCommand * self = NULL;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PixelTransformation* _tmp3_ = NULL;
-	PixelTransformation* _tmp4_ = NULL;
-	PixelTransformation* _tmp5_ = NULL;
-	PixelTransformation* _tmp6_ = NULL;
-	PixelTransformation* _tmp7_ = NULL;
-	PixelTransformationType _tmp8_ = 0;
-	PixelTransformation* _tmp9_ = NULL;
-	PixelTransformationType _tmp10_ = 0;
-	PixelTransformationType _tmp11_ = 0;
+	EditingToolsAdjustTool* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PixelTransformation* _tmp3_;
+	PixelTransformation* _tmp4_;
+	PixelTransformation* _tmp5_;
+	PixelTransformation* _tmp6_;
+	PixelTransformation* _tmp7_;
+	PixelTransformationType _tmp8_;
+	PixelTransformation* _tmp9_;
+	PixelTransformationType _tmp10_;
+	PixelTransformationType _tmp11_;
 #line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
 #line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19038,23 +18894,23 @@ static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_
 	_vala_assert (_tmp10_ == _tmp11_, "new_transformation.get_transformation_type() == transformation_type");
 #line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 19042 "EditingTools.c"
+#line 18898 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name) {
 #line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_slider_adjustment_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, owner, old_transformation, new_transformation, name);
-#line 19049 "EditingTools.c"
+#line 18905 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_real_execute (Command* base) {
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	PixelTransformation* _tmp1_ = NULL;
-	EditingToolsAdjustTool* _tmp2_ = NULL;
-	EditingToolsPhotoCanvas* _tmp3_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
+	PixelTransformation* _tmp1_;
+	EditingToolsAdjustTool* _tmp2_;
+	EditingToolsPhotoCanvas* _tmp3_;
 #line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
 #line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19069,20 +18925,20 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_execute (Co
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp3_);
-#line 19073 "EditingTools.c"
+#line 18929 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Command* base) {
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	PixelTransformation* _tmp1_ = NULL;
-	EditingToolsAdjustTool* _tmp2_ = NULL;
-	EditingToolsAdjustTool* _tmp3_ = NULL;
-	PixelTransformation* _tmp4_ = NULL;
-	EditingToolsAdjustTool* _tmp5_ = NULL;
-	EditingToolsAdjustTool* _tmp6_ = NULL;
-	EditingToolsPhotoCanvas* _tmp7_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
+	PixelTransformation* _tmp1_;
+	EditingToolsAdjustTool* _tmp2_;
+	EditingToolsAdjustTool* _tmp3_;
+	PixelTransformation* _tmp4_;
+	EditingToolsAdjustTool* _tmp5_;
+	EditingToolsAdjustTool* _tmp6_;
+	EditingToolsPhotoCanvas* _tmp7_;
 #line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
 #line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19111,20 +18967,20 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Comma
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp7_);
-#line 19115 "EditingTools.c"
+#line 18971 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Command* base) {
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	PixelTransformation* _tmp1_ = NULL;
-	EditingToolsAdjustTool* _tmp2_ = NULL;
-	EditingToolsAdjustTool* _tmp3_ = NULL;
-	PixelTransformation* _tmp4_ = NULL;
-	EditingToolsAdjustTool* _tmp5_ = NULL;
-	EditingToolsAdjustTool* _tmp6_ = NULL;
-	EditingToolsPhotoCanvas* _tmp7_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
+	PixelTransformation* _tmp1_;
+	EditingToolsAdjustTool* _tmp2_;
+	EditingToolsAdjustTool* _tmp3_;
+	PixelTransformation* _tmp4_;
+	EditingToolsAdjustTool* _tmp5_;
+	EditingToolsAdjustTool* _tmp6_;
+	EditingToolsPhotoCanvas* _tmp7_;
 #line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
 #line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19153,7 +19009,7 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Comma
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp7_);
-#line 19157 "EditingTools.c"
+#line 19013 "EditingTools.c"
 }
 
 
@@ -19161,19 +19017,19 @@ static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compres
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
 	gboolean result = FALSE;
 	EditingToolsAdjustToolSliderAdjustmentCommand* slider_adjustment = NULL;
-	Command* _tmp0_ = NULL;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp1_ = NULL;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp2_ = NULL;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp3_ = NULL;
-	EditingToolsAdjustTool* _tmp4_ = NULL;
-	EditingToolsAdjustTool* _tmp5_ = NULL;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_ = NULL;
-	PixelTransformationType _tmp7_ = 0;
-	PixelTransformationType _tmp8_ = 0;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp9_ = NULL;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp10_ = NULL;
-	PixelTransformation* _tmp11_ = NULL;
-	PixelTransformation* _tmp12_ = NULL;
+	Command* _tmp0_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp1_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp2_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp3_;
+	EditingToolsAdjustTool* _tmp4_;
+	EditingToolsAdjustTool* _tmp5_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_;
+	PixelTransformationType _tmp7_;
+	PixelTransformationType _tmp8_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp9_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp10_;
+	PixelTransformation* _tmp11_;
+	PixelTransformation* _tmp12_;
 #line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
 #line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19194,7 +19050,7 @@ static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compres
 		_g_object_unref0 (slider_adjustment);
 #line 2435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19198 "EditingTools.c"
+#line 19054 "EditingTools.c"
 	}
 #line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = slider_adjustment;
@@ -19210,7 +19066,7 @@ static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compres
 		_g_object_unref0 (slider_adjustment);
 #line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19214 "EditingTools.c"
+#line 19070 "EditingTools.c"
 	}
 #line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = slider_adjustment;
@@ -19226,7 +19082,7 @@ static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compres
 		_g_object_unref0 (slider_adjustment);
 #line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19230 "EditingTools.c"
+#line 19086 "EditingTools.c"
 	}
 #line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = slider_adjustment;
@@ -19248,7 +19104,7 @@ static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compres
 	_g_object_unref0 (slider_adjustment);
 #line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 19252 "EditingTools.c"
+#line 19108 "EditingTools.c"
 }
 
 
@@ -19258,27 +19114,27 @@ static void editing_tools_adjust_tool_slider_adjustment_command_class_init (Edit
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolSliderAdjustmentCommandPrivate));
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) editing_tools_adjust_tool_slider_adjustment_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) editing_tools_adjust_tool_slider_adjustment_command_real_execute;
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) editing_tools_adjust_tool_slider_adjustment_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) editing_tools_adjust_tool_slider_adjustment_command_real_undo;
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->redo = (void (*)(Command*)) editing_tools_adjust_tool_slider_adjustment_command_real_redo;
+	((CommandClass *) klass)->redo = (void (*) (Command *)) editing_tools_adjust_tool_slider_adjustment_command_real_redo;
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) editing_tools_adjust_tool_slider_adjustment_command_real_compress;
+	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_slider_adjustment_command_real_compress;
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_slider_adjustment_command_finalize;
-#line 19271 "EditingTools.c"
+#line 19127 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_instance_init (EditingToolsAdjustToolSliderAdjustmentCommand * self) {
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_GET_PRIVATE (self);
-#line 19278 "EditingTools.c"
+#line 19134 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject* obj) {
+static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject * obj) {
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
@@ -19288,7 +19144,7 @@ static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObjec
 	_pixel_transformation_unref0 (self->priv->old_transformation);
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_slider_adjustment_command_parent_class)->finalize (obj);
-#line 19292 "EditingTools.c"
+#line 19148 "EditingTools.c"
 }
 
 
@@ -19306,11 +19162,11 @@ static GType editing_tools_adjust_tool_slider_adjustment_command_get_type (void)
 
 static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_construct (GType object_type, EditingToolsAdjustTool* owner, Photo* photo) {
 	EditingToolsAdjustToolAdjustEnhanceCommand * self = NULL;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	PixelTransformationBundle* _tmp4_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
+	PixelTransformationBundle* _tmp4_;
 #line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
 #line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19337,31 +19193,31 @@ static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adj
 	self->priv->original = _tmp4_;
 #line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 19341 "EditingTools.c"
+#line 19197 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_new (EditingToolsAdjustTool* owner, Photo* photo) {
 #line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_enhance_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, owner, photo);
-#line 19348 "EditingTools.c"
+#line 19204 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Command* base) {
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
-	PixelTransformationBundle* _tmp0_ = NULL;
-	EditingToolsAdjustTool* _tmp3_ = NULL;
-	PixelTransformationBundle* _tmp4_ = NULL;
+	PixelTransformationBundle* _tmp0_;
+	EditingToolsAdjustTool* _tmp3_;
+	PixelTransformationBundle* _tmp4_;
 #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
 #line 2468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->enhanced;
 #line 2468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 19363 "EditingTools.c"
-		Photo* _tmp1_ = NULL;
-		PixelTransformationBundle* _tmp2_ = NULL;
+#line 19219 "EditingTools.c"
+		Photo* _tmp1_;
+		PixelTransformationBundle* _tmp2_;
 #line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->priv->photo;
 #line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19370,7 +19226,7 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Comma
 		_pixel_transformation_bundle_unref0 (self->priv->enhanced);
 #line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->enhanced = _tmp2_;
-#line 19374 "EditingTools.c"
+#line 19230 "EditingTools.c"
 	}
 #line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
@@ -19378,14 +19234,14 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Comma
 	_tmp4_ = self->priv->enhanced;
 #line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp3_, _tmp4_);
-#line 19382 "EditingTools.c"
+#line 19238 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command* base) {
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	PixelTransformationBundle* _tmp1_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
+	PixelTransformationBundle* _tmp1_;
 #line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
 #line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19394,7 +19250,7 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command*
 	_tmp1_ = self->priv->original;
 #line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 19398 "EditingTools.c"
+#line 19254 "EditingTools.c"
 }
 
 
@@ -19402,16 +19258,16 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
 	gboolean result = FALSE;
 	EnhanceSingleCommand* enhance_single = NULL;
-	Command* _tmp0_ = NULL;
-	EnhanceSingleCommand* _tmp1_ = NULL;
-	EnhanceSingleCommand* _tmp2_ = NULL;
+	Command* _tmp0_;
+	EnhanceSingleCommand* _tmp1_;
+	EnhanceSingleCommand* _tmp2_;
 	EditingToolsAdjustToolAdjustEnhanceCommand* enhance_command = NULL;
-	Command* _tmp12_ = NULL;
-	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp13_ = NULL;
-	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp14_ = NULL;
-	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp15_ = NULL;
-	EditingToolsAdjustTool* _tmp16_ = NULL;
-	EditingToolsAdjustTool* _tmp17_ = NULL;
+	Command* _tmp12_;
+	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp13_;
+	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp14_;
+	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp15_;
+	EditingToolsAdjustTool* _tmp16_;
+	EditingToolsAdjustTool* _tmp17_;
 #line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
 #line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19426,17 +19282,17 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 	_tmp2_ = enhance_single;
 #line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ != NULL) {
-#line 19430 "EditingTools.c"
+#line 19286 "EditingTools.c"
 		Photo* photo = NULL;
-		EnhanceSingleCommand* _tmp3_ = NULL;
-		DataSource* _tmp4_ = NULL;
-		Photo* _tmp5_ = NULL;
-		EditingToolsAdjustTool* _tmp6_ = NULL;
-		EditingToolsPhotoCanvas* _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
-		Photo* _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
-		gboolean _tmp11_ = FALSE;
+		EnhanceSingleCommand* _tmp3_;
+		DataSource* _tmp4_;
+		Photo* _tmp5_;
+		EditingToolsAdjustTool* _tmp6_;
+		EditingToolsPhotoCanvas* _tmp7_;
+		Photo* _tmp8_;
+		Photo* _tmp9_;
+		gboolean _tmp10_;
+		gboolean _tmp11_;
 #line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = enhance_single;
 #line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19467,7 +19323,7 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 		_g_object_unref0 (enhance_single);
 #line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19471 "EditingTools.c"
+#line 19327 "EditingTools.c"
 	}
 #line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = command;
@@ -19487,7 +19343,7 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 		_g_object_unref0 (enhance_single);
 #line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19491 "EditingTools.c"
+#line 19347 "EditingTools.c"
 	}
 #line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = enhance_command;
@@ -19505,7 +19361,7 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 		_g_object_unref0 (enhance_single);
 #line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19509 "EditingTools.c"
+#line 19365 "EditingTools.c"
 	}
 #line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
@@ -19515,7 +19371,7 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 	_g_object_unref0 (enhance_single);
 #line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 19519 "EditingTools.c"
+#line 19375 "EditingTools.c"
 }
 
 
@@ -19525,14 +19381,14 @@ static void editing_tools_adjust_tool_adjust_enhance_command_class_init (Editing
 #line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolAdjustEnhanceCommandPrivate));
 #line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) editing_tools_adjust_tool_adjust_enhance_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) editing_tools_adjust_tool_adjust_enhance_command_real_execute;
 #line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) editing_tools_adjust_tool_adjust_enhance_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) editing_tools_adjust_tool_adjust_enhance_command_real_undo;
 #line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) editing_tools_adjust_tool_adjust_enhance_command_real_compress;
+	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_adjust_enhance_command_real_compress;
 #line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_enhance_command_finalize;
-#line 19536 "EditingTools.c"
+#line 19392 "EditingTools.c"
 }
 
 
@@ -19541,11 +19397,11 @@ static void editing_tools_adjust_tool_adjust_enhance_command_instance_init (Edit
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_GET_PRIVATE (self);
 #line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->enhanced = NULL;
-#line 19545 "EditingTools.c"
+#line 19401 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject* obj) {
+static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject * obj) {
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
 #line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
@@ -19557,7 +19413,7 @@ static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject*
 	_pixel_transformation_bundle_unref0 (self->priv->enhanced);
 #line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_enhance_command_parent_class)->finalize (obj);
-#line 19561 "EditingTools.c"
+#line 19417 "EditingTools.c"
 }
 
 
@@ -19581,18 +19437,18 @@ static void editing_tools_adjust_tool_class_init (EditingToolsAdjustToolClass *
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolPrivate));
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->activate = (void (*)(EditingToolsEditingTool*, EditingToolsPhotoCanvas*)) editing_tools_adjust_tool_real_activate;
+	((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_adjust_tool_real_activate;
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*)(EditingToolsEditingTool*)) editing_tools_adjust_tool_real_get_tool_window;
+	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_adjust_tool_real_get_tool_window;
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*)(EditingToolsEditingTool*)) editing_tools_adjust_tool_real_deactivate;
+	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_adjust_tool_real_deactivate;
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->paint = (void (*)(EditingToolsEditingTool*, cairo_t*)) editing_tools_adjust_tool_real_paint;
+	((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_adjust_tool_real_paint;
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*)(EditingToolsEditingTool*, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_adjust_tool_real_get_display_pixbuf;
+	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*) (EditingToolsEditingTool *, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_adjust_tool_real_get_display_pixbuf;
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*)(EditingToolsEditingTool*, GdkEventKey*)) editing_tools_adjust_tool_real_on_keypress;
-#line 19596 "EditingTools.c"
+	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_adjust_tool_real_on_keypress;
+#line 19452 "EditingTools.c"
 }
 
 
@@ -19637,11 +19493,11 @@ static void editing_tools_adjust_tool_instance_init (EditingToolsAdjustTool * se
 	self->priv->shadows_scheduler = NULL;
 #line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->highlights_scheduler = NULL;
-#line 19641 "EditingTools.c"
+#line 19497 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool* obj) {
+static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool * obj) {
 	EditingToolsAdjustTool * self;
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
@@ -19677,7 +19533,7 @@ static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool* obj) {
 	_one_shot_scheduler_unref0 (self->priv->highlights_scheduler);
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->finalize (obj);
-#line 19681 "EditingTools.c"
+#line 19537 "EditingTools.c"
 }
 
 
diff --git a/src/editing_tools/StraightenTool.c b/src/editing_tools/StraightenTool.c
index a0de5bf..9420cb8 100644
--- a/src/editing_tools/StraightenTool.c
+++ b/src/editing_tools/StraightenTool.c
@@ -1,4 +1,4 @@
-/* StraightenTool.c generated by valac 0.34.7, the Vala compiler
+/* StraightenTool.c generated by valac 0.36.6, the Vala compiler
  * generated from StraightenTool.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -480,7 +480,7 @@ gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self,
 static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenTool* self);
 void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self, Dimensions* result);
 void dimensions_with_max (Dimensions *self, gint max_width, gint max_height, Dimensions* result);
-static gboolean _dimensions_equal (const Dimensions* s1, const Dimensions* s2);
+static gboolean _dimensions_equal (const Dimensions * s1, const Dimensions * s2);
 GType photo_exception_get_type (void) G_GNUC_CONST;
 GType backing_fetch_mode_get_type (void) G_GNUC_CONST;
 GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error);
@@ -532,7 +532,7 @@ enum  {
 	EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_GUIDE_DUMMY_PROPERTY
 };
 static gdouble* _double_dup (gdouble* self);
-static void editing_tools_straighten_tool_straighten_guide_finalize (EditingToolsStraightenToolStraightenGuide* obj);
+static void editing_tools_straighten_tool_straighten_guide_finalize (EditingToolsStraightenToolStraightenGuide * obj);
 enum  {
 	EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_DUMMY_PROPERTY
 };
@@ -541,8 +541,8 @@ enum  {
 EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GType object_type, GtkWindow* container);
 static void editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked (EditingToolsStraightenToolStraightenToolWindow* self);
 static void _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObject* obj);
-static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool* obj);
+static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObject * obj);
+static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool * obj);
 
 static const gdouble EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[2] = {(gdouble) 10, (gdouble) 10};
 
@@ -565,7 +565,7 @@ static EditingToolsStraightenTool* editing_tools_straighten_tool_new (void) {
 
 EditingToolsStraightenTool* editing_tools_straighten_tool_factory (void) {
 	EditingToolsStraightenTool* result = NULL;
-	EditingToolsStraightenTool* _tmp0_ = NULL;
+	EditingToolsStraightenTool* _tmp0_;
 #line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = editing_tools_straighten_tool_new ();
 #line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -599,33 +599,33 @@ gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scal
      * of the photo and centered at the Photo's center.
      */
 static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenTool* self) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
 	gdouble slider_val = 0.0;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp3_ = NULL;
-	GtkScale* _tmp4_ = NULL;
-	gdouble _tmp5_ = 0.0;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp3_;
+	GtkScale* _tmp4_;
+	gdouble _tmp5_;
 	GdkPoint new_crop_center = {0};
-	GdkPoint _tmp6_ = {0};
-	Dimensions _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	Dimensions _tmp9_ = {0};
-	gint _tmp10_ = 0;
+	GdkPoint _tmp6_;
+	Dimensions _tmp7_;
+	gint _tmp8_;
+	Dimensions _tmp9_;
+	gint _tmp10_;
 	GdkPoint _tmp11_ = {0};
 	StraightenCommand* command = NULL;
-	EditingToolsPhotoCanvas* _tmp12_ = NULL;
-	Photo* _tmp13_ = NULL;
-	Photo* _tmp14_ = NULL;
-	GdkPoint _tmp15_ = {0};
-	gdouble _tmp16_ = 0.0;
-	gint _tmp17_ = 0;
-	gdouble _tmp18_ = 0.0;
-	gint _tmp19_ = 0;
+	EditingToolsPhotoCanvas* _tmp12_;
+	Photo* _tmp13_;
+	Photo* _tmp14_;
+	GdkPoint _tmp15_;
+	gdouble _tmp16_;
+	gint _tmp17_;
+	gdouble _tmp18_;
+	gint _tmp19_;
 	Box _tmp20_ = {0};
-	StraightenCommand* _tmp21_ = NULL;
-	StraightenCommand* _tmp22_ = NULL;
-	Dimensions _tmp23_ = {0};
+	StraightenCommand* _tmp21_;
+	StraightenCommand* _tmp22_;
+	Dimensions _tmp23_;
 #line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 210 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -697,7 +697,7 @@ static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenT
 
 
 static void editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraightenTool* self) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 #line 227 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 228 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -723,10 +723,10 @@ static void editing_tools_straighten_tool_on_slider_stopped_delayed (EditingTool
 
 static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y) {
 	EditingToolsStraightenTool * self;
-	EditingToolsStraightenToolStraightenGuide* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gdouble _tmp3_ = 0.0;
+	EditingToolsStraightenToolStraightenGuide* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gdouble _tmp3_;
 #line 237 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
 #line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -745,14 +745,14 @@ static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditin
 
 static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y) {
 	EditingToolsStraightenTool * self;
-	EditingToolsStraightenToolStraightenGuide* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	EditingToolsStraightenToolStraightenGuide* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gdouble* a = NULL;
-	EditingToolsStraightenToolStraightenGuide* _tmp3_ = NULL;
-	gdouble* _tmp4_ = NULL;
-	EditingToolsStraightenToolStraightenGuide* _tmp5_ = NULL;
-	gdouble* _tmp6_ = NULL;
+	EditingToolsStraightenToolStraightenGuide* _tmp3_;
+	gdouble* _tmp4_;
+	EditingToolsStraightenToolStraightenGuide* _tmp5_;
+	gdouble* _tmp6_;
 #line 241 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
 #line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -778,9 +778,9 @@ static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEdi
 #line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp6_ != NULL) {
 #line 781 "StraightenTool.c"
-		EditingToolsStraightenToolStraightenToolWindow* _tmp7_ = NULL;
-		GtkScale* _tmp8_ = NULL;
-		gdouble* _tmp9_ = NULL;
+		EditingToolsStraightenToolStraightenToolWindow* _tmp7_;
+		GtkScale* _tmp8_;
+		gdouble* _tmp9_;
 #line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp7_ = self->priv->window;
 #line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -801,10 +801,10 @@ static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEdi
 
 static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) {
 	EditingToolsStraightenTool * self;
-	EditingToolsStraightenToolStraightenGuide* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	EditingToolsStraightenToolStraightenGuide* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 #line 251 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
 #line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -818,7 +818,7 @@ static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingToo
 #line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp3_) {
 #line 821 "StraightenTool.c"
-		EditingToolsPhotoCanvas* _tmp4_ = NULL;
+		EditingToolsPhotoCanvas* _tmp4_;
 #line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -833,14 +833,14 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GdkEventKey* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	const gchar* _tmp4_ = NULL;
-	GdkEventKey* _tmp11_ = NULL;
-	guint _tmp12_ = 0U;
-	const gchar* _tmp13_ = NULL;
-	GdkEventKey* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
+	GdkEventKey* _tmp2_;
+	guint _tmp3_;
+	const gchar* _tmp4_;
+	GdkEventKey* _tmp11_;
+	guint _tmp12_;
+	const gchar* _tmp13_;
+	GdkEventKey* _tmp14_;
+	gboolean _tmp15_;
 #line 256 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
 #line 256 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -857,9 +857,9 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
 		_tmp1_ = TRUE;
 #line 859 "StraightenTool.c"
 	} else {
-		GdkEventKey* _tmp5_ = NULL;
-		guint _tmp6_ = 0U;
-		const gchar* _tmp7_ = NULL;
+		GdkEventKey* _tmp5_;
+		guint _tmp6_;
+		const gchar* _tmp7_;
 #line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp5_ = event;
 #line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -876,9 +876,9 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
 		_tmp0_ = TRUE;
 #line 878 "StraightenTool.c"
 	} else {
-		GdkEventKey* _tmp8_ = NULL;
-		guint _tmp9_ = 0U;
-		const gchar* _tmp10_ = NULL;
+		GdkEventKey* _tmp8_;
+		guint _tmp9_;
+		const gchar* _tmp10_;
 #line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp8_ = event;
 #line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -927,7 +927,7 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
 }
 
 
-static gboolean _dimensions_equal (const Dimensions* s1, const Dimensions* s2) {
+static gboolean _dimensions_equal (const Dimensions * s1, const Dimensions * s2) {
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (s1 == s2) {
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -966,49 +966,49 @@ static gboolean _dimensions_equal (const Dimensions* s1, const Dimensions* s2) {
 
 static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenTool* self) {
 	Dimensions canvas_dims = {0};
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 	Dimensions _tmp1_ = {0};
 	Dimensions viewport = {0};
 	Dimensions _tmp2_ = {0};
-	Dimensions _tmp3_ = {0};
-	Dimensions _tmp4_ = {0};
-	Dimensions _tmp5_ = {0};
+	Dimensions _tmp3_;
+	Dimensions _tmp4_;
+	Dimensions _tmp5_;
 	GdkPixbuf* low_res_tmp = NULL;
-	GdkPixbuf* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	gint _tmp23_ = 0;
-	Dimensions _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	GdkPixbuf* _tmp26_ = NULL;
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
-	GdkPixbuf* _tmp29_ = NULL;
-	gint _tmp30_ = 0;
-	gint _tmp31_ = 0;
-	cairo_surface_t* _tmp32_ = NULL;
+	GdkPixbuf* _tmp21_;
+	gint _tmp22_;
+	gint _tmp23_;
+	Dimensions _tmp24_;
+	gint _tmp25_;
+	GdkPixbuf* _tmp26_;
+	gint _tmp27_;
+	gint _tmp28_;
+	GdkPixbuf* _tmp29_;
+	gint _tmp30_;
+	gint _tmp31_;
+	cairo_surface_t* _tmp32_;
 	cairo_t* ctx = NULL;
-	cairo_surface_t* _tmp33_ = NULL;
-	cairo_t* _tmp34_ = NULL;
-	cairo_t* _tmp35_ = NULL;
-	GdkPixbuf* _tmp36_ = NULL;
-	cairo_t* _tmp37_ = NULL;
-	GdkPixbuf* _tmp38_ = NULL;
-	gint _tmp39_ = 0;
-	gint _tmp40_ = 0;
-	GdkPixbuf* _tmp41_ = NULL;
-	gint _tmp42_ = 0;
-	gint _tmp43_ = 0;
-	cairo_t* _tmp44_ = NULL;
-	cairo_t* _tmp45_ = NULL;
-	gint _tmp46_ = 0;
-	gdouble _tmp47_ = 0.0;
-	gint _tmp48_ = 0;
-	gdouble _tmp49_ = 0.0;
-	gint _tmp50_ = 0;
-	gint _tmp51_ = 0;
-	cairo_surface_t* _tmp52_ = NULL;
-	cairo_surface_t* _tmp53_ = NULL;
-	cairo_t* _tmp54_ = NULL;
+	cairo_surface_t* _tmp33_;
+	cairo_t* _tmp34_;
+	cairo_t* _tmp35_;
+	GdkPixbuf* _tmp36_;
+	cairo_t* _tmp37_;
+	GdkPixbuf* _tmp38_;
+	gint _tmp39_;
+	gint _tmp40_;
+	GdkPixbuf* _tmp41_;
+	gint _tmp42_;
+	gint _tmp43_;
+	cairo_t* _tmp44_;
+	cairo_t* _tmp45_;
+	gint _tmp46_;
+	gdouble _tmp47_;
+	gint _tmp48_;
+	gdouble _tmp49_;
+	gint _tmp50_;
+	gint _tmp51_;
+	cairo_surface_t* _tmp52_;
+	cairo_surface_t* _tmp53_;
+	cairo_t* _tmp54_;
 	GError * _inner_error_ = NULL;
 #line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
@@ -1041,14 +1041,14 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 #line 1042 "StraightenTool.c"
 	{
 		GdkPixbuf* _tmp6_ = NULL;
-		EditingToolsPhotoCanvas* _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
-		Photo* _tmp9_ = NULL;
-		Dimensions _tmp10_ = {0};
+		EditingToolsPhotoCanvas* _tmp7_;
+		Photo* _tmp8_;
+		Photo* _tmp9_;
+		Dimensions _tmp10_;
 		Scaling _tmp11_ = {0};
-		GdkPixbuf* _tmp12_ = NULL;
-		GdkPixbuf* _tmp13_ = NULL;
-		GdkPixbuf* _tmp14_ = NULL;
+		GdkPixbuf* _tmp12_;
+		GdkPixbuf* _tmp13_;
+		GdkPixbuf* _tmp14_;
 #line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1088,12 +1088,12 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 	__catch23_g_error:
 	{
 		GError* e = NULL;
-		EditingToolsPhotoCanvas* _tmp15_ = NULL;
-		Photo* _tmp16_ = NULL;
-		Photo* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		GdkPixbuf* _tmp20_ = NULL;
+		EditingToolsPhotoCanvas* _tmp15_;
+		Photo* _tmp16_;
+		Photo* _tmp17_;
+		gchar* _tmp18_;
+		gchar* _tmp19_;
+		GdkPixbuf* _tmp20_;
 #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		e = _inner_error_;
 #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1244,33 +1244,33 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStraightenTool* self) {
 	gdouble width = 0.0;
 	gdouble height = 0.0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gdouble _tmp2_;
 	gdouble _tmp3_ = 0.0;
 	gdouble _tmp4_ = 0.0;
-	Dimensions _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	Dimensions _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	gdouble _tmp9_ = 0.0;
-	gdouble _tmp10_ = 0.0;
-	gdouble _tmp11_ = 0.0;
-	GdkPoint _tmp12_ = {0};
+	Dimensions _tmp5_;
+	gint _tmp6_;
+	Dimensions _tmp7_;
+	gint _tmp8_;
+	gdouble _tmp9_;
+	gdouble _tmp10_;
+	gdouble _tmp11_;
+	GdkPoint _tmp12_;
 	gint radius_x = 0;
-	gdouble _tmp13_ = 0.0;
+	gdouble _tmp13_;
 	gint radius_y = 0;
-	gdouble _tmp14_ = 0.0;
-	GdkPoint _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	Dimensions _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	GdkPoint _tmp20_ = {0};
-	gint _tmp21_ = 0;
-	Dimensions _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
+	gdouble _tmp14_;
+	GdkPoint _tmp15_;
+	gint _tmp16_;
+	Dimensions _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	GdkPoint _tmp20_;
+	gint _tmp21_;
+	Dimensions _tmp22_;
+	gint _tmp23_;
+	gint _tmp24_;
 #line 309 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1366,57 +1366,57 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsStraightenTool * self;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	EditingToolsPhotoCanvas* _tmp1_ = NULL;
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	EditingToolsPhotoCanvas* _tmp3_ = NULL;
-	EditingToolsPhotoCanvas* _tmp4_ = NULL;
-	Photo* _tmp5_ = NULL;
-	Photo* _tmp6_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	EditingToolsPhotoCanvas* _tmp1_;
+	EditingToolsPhotoCanvas* _tmp2_;
+	EditingToolsPhotoCanvas* _tmp3_;
+	EditingToolsPhotoCanvas* _tmp4_;
+	Photo* _tmp5_;
+	Photo* _tmp6_;
 	Dimensions _tmp7_ = {0};
 	Box crop_region = {0};
-	EditingToolsPhotoCanvas* _tmp8_ = NULL;
-	Photo* _tmp9_ = NULL;
-	Photo* _tmp10_ = NULL;
+	EditingToolsPhotoCanvas* _tmp8_;
+	Photo* _tmp9_;
+	Photo* _tmp10_;
 	Box _tmp11_ = {0};
-	gboolean _tmp12_ = FALSE;
-	gboolean _tmp13_ = FALSE;
+	gboolean _tmp12_;
+	gboolean _tmp13_;
 	gdouble incoming_angle = 0.0;
-	EditingToolsPhotoCanvas* _tmp18_ = NULL;
-	Photo* _tmp19_ = NULL;
-	Photo* _tmp20_ = NULL;
+	EditingToolsPhotoCanvas* _tmp18_;
+	Photo* _tmp19_;
+	Photo* _tmp20_;
 	gdouble _tmp21_ = 0.0;
 	GdkPoint _tmp22_ = {0};
-	Dimensions _tmp23_ = {0};
-	gint _tmp24_ = 0;
-	Dimensions _tmp25_ = {0};
-	gint _tmp26_ = 0;
-	gdouble _tmp27_ = 0.0;
+	Dimensions _tmp23_;
+	gint _tmp24_;
+	Dimensions _tmp25_;
+	gint _tmp26_;
+	gdouble _tmp27_;
 	GdkPoint _tmp28_ = {0};
-	gint _tmp29_ = 0;
-	gint _tmp30_ = 0;
+	gint _tmp29_;
+	gint _tmp30_;
 	GdkWindow* drawing_window = NULL;
-	EditingToolsPhotoCanvas* _tmp31_ = NULL;
-	GdkWindow* _tmp32_ = NULL;
+	EditingToolsPhotoCanvas* _tmp31_;
+	GdkWindow* _tmp32_;
 	GdkDisplay* display = NULL;
-	GdkDisplay* _tmp33_ = NULL;
-	GdkDisplay* _tmp34_ = NULL;
+	GdkDisplay* _tmp33_;
+	GdkDisplay* _tmp34_;
 	GdkCursor* cursor = NULL;
-	GdkCursor* _tmp35_ = NULL;
-	EditingToolsPhotoCanvas* _tmp36_ = NULL;
-	GtkWindow* _tmp37_ = NULL;
-	GtkWindow* _tmp38_ = NULL;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp39_ = NULL;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp40_ = NULL;
-	GtkScale* _tmp41_ = NULL;
-	gdouble _tmp42_ = 0.0;
-	gdouble _tmp43_ = 0.0;
+	GdkCursor* _tmp35_;
+	EditingToolsPhotoCanvas* _tmp36_;
+	GtkWindow* _tmp37_;
+	GtkWindow* _tmp38_;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp39_;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp40_;
+	GtkScale* _tmp41_;
+	gdouble _tmp42_;
+	gdouble _tmp43_;
 	gchar* tmp = NULL;
-	gdouble _tmp44_ = 0.0;
-	gchar* _tmp45_ = NULL;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp46_ = NULL;
-	GtkLabel* _tmp47_ = NULL;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp48_ = NULL;
+	gdouble _tmp44_;
+	gchar* _tmp45_;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp46_;
+	GtkLabel* _tmp47_;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp48_;
 #line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
 #line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1466,10 +1466,10 @@ static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool
 #line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp13_) {
 #line 1469 "StraightenTool.c"
-		Dimensions _tmp14_ = {0};
-		gint _tmp15_ = 0;
-		Dimensions _tmp16_ = {0};
-		gint _tmp17_ = 0;
+		Dimensions _tmp14_;
+		gint _tmp15_;
+		Dimensions _tmp16_;
+		gint _tmp17_;
 #line 342 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		crop_region.left = 0;
 #line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1613,8 +1613,8 @@ static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool
      */
 static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTool* base) {
 	EditingToolsStraightenTool * self;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp0_ = NULL;
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp0_;
+	EditingToolsPhotoCanvas* _tmp2_;
 #line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
 #line 389 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1622,7 +1622,7 @@ static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTo
 #line 389 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp0_ != NULL) {
 #line 1625 "StraightenTool.c"
-		EditingToolsStraightenToolStraightenToolWindow* _tmp1_ = NULL;
+		EditingToolsStraightenToolStraightenToolWindow* _tmp1_;
 #line 391 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_unbind_window_handlers (self);
 #line 393 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1640,10 +1640,10 @@ static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTo
 #line 397 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp2_ != NULL) {
 #line 1643 "StraightenTool.c"
-		EditingToolsPhotoCanvas* _tmp3_ = NULL;
-		EditingToolsPhotoCanvas* _tmp4_ = NULL;
-		GdkWindow* _tmp5_ = NULL;
-		GdkWindow* _tmp6_ = NULL;
+		EditingToolsPhotoCanvas* _tmp3_;
+		EditingToolsPhotoCanvas* _tmp4_;
+		GdkWindow* _tmp5_;
+		GdkWindow* _tmp6_;
 #line 398 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 398 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1674,7 +1674,7 @@ static void _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo
 
 
 static void editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 #line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1688,8 +1688,8 @@ static void editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStra
 
 
 static void editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	EditingToolsPhotoCanvas* _tmp0_;
+	guint _tmp1_;
 #line 409 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 409 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1735,13 +1735,13 @@ static void _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_chan
 
 
 static void editing_tools_straighten_tool_bind_window_handlers (EditingToolsStraightenTool* self) {
-	EditingToolsStraightenToolStraightenToolWindow* _tmp0_ = NULL;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp1_ = NULL;
-	GtkButton* _tmp2_ = NULL;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp3_ = NULL;
-	GtkButton* _tmp4_ = NULL;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp5_ = NULL;
-	GtkScale* _tmp6_ = NULL;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp0_;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp1_;
+	GtkButton* _tmp2_;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp3_;
+	GtkButton* _tmp4_;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp5_;
+	GtkScale* _tmp6_;
 #line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1771,17 +1771,17 @@ static void editing_tools_straighten_tool_bind_window_handlers (EditingToolsStra
 
 
 static void editing_tools_straighten_tool_unbind_window_handlers (EditingToolsStraightenTool* self) {
-	EditingToolsStraightenToolStraightenToolWindow* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp2_ = NULL;
-	GtkButton* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp5_ = NULL;
-	GtkButton* _tmp6_ = NULL;
-	guint _tmp7_ = 0U;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp8_ = NULL;
-	GtkScale* _tmp9_ = NULL;
-	guint _tmp10_ = 0U;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp0_;
+	guint _tmp1_;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp2_;
+	GtkButton* _tmp3_;
+	guint _tmp4_;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp5_;
+	GtkButton* _tmp6_;
+	guint _tmp7_;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp8_;
+	GtkScale* _tmp9_;
+	guint _tmp10_;
 #line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1826,20 +1826,20 @@ static void _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_ca
 
 
 static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraightenTool* self) {
-	EditingToolsStraightenToolStraightenToolWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
 	gchar* tmp = NULL;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp3_ = NULL;
-	GtkScale* _tmp4_ = NULL;
-	gdouble _tmp5_ = 0.0;
-	gchar* _tmp6_ = NULL;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp7_ = NULL;
-	GtkLabel* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	OneShotScheduler* _tmp10_ = NULL;
-	OneShotScheduler* _tmp12_ = NULL;
-	EditingToolsPhotoCanvas* _tmp13_ = NULL;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp3_;
+	GtkScale* _tmp4_;
+	gdouble _tmp5_;
+	gchar* _tmp6_;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp7_;
+	GtkLabel* _tmp8_;
+	const gchar* _tmp9_;
+	OneShotScheduler* _tmp10_;
+	OneShotScheduler* _tmp12_;
+	EditingToolsPhotoCanvas* _tmp13_;
 #line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1873,7 +1873,7 @@ static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraight
 #line 432 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp10_ == NULL) {
 #line 1876 "StraightenTool.c"
-		OneShotScheduler* _tmp11_ = NULL;
+		OneShotScheduler* _tmp11_;
 #line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp11_ = one_shot_scheduler_new ("straighten", _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback, self);
 #line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1927,8 +1927,8 @@ static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraigh
 static EditingToolsEditingToolWindow* editing_tools_straighten_tool_real_get_tool_window (EditingToolsEditingTool* base) {
 	EditingToolsStraightenTool * self;
 	EditingToolsEditingToolWindow* result = NULL;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp0_ = NULL;
-	EditingToolsEditingToolWindow* _tmp1_ = NULL;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp0_;
+	EditingToolsEditingToolWindow* _tmp1_;
 #line 454 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
 #line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1947,15 +1947,15 @@ static EditingToolsEditingToolWindow* editing_tools_straighten_tool_real_get_too
      * Draw the rotated photo and grid.
      */
 static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsStraightenTool* self) {
-	cairo_surface_t* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gdouble _tmp4_ = 0.0;
-	cairo_t* _tmp5_ = NULL;
-	cairo_t* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	cairo_surface_t* _tmp0_;
+	cairo_t* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gdouble _tmp4_;
+	cairo_t* _tmp5_;
+	cairo_t* _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 #line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1996,56 +1996,56 @@ static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsSt
 static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx) {
 	EditingToolsStraightenTool * self;
 	gint w = 0;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	GdkWindow* _tmp1_ = NULL;
-	GdkWindow* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	EditingToolsPhotoCanvas* _tmp0_;
+	GdkWindow* _tmp1_;
+	GdkWindow* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	gint h = 0;
-	EditingToolsPhotoCanvas* _tmp5_ = NULL;
-	GdkWindow* _tmp6_ = NULL;
-	GdkWindow* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	EditingToolsPhotoCanvas* _tmp10_ = NULL;
-	cairo_t* _tmp11_ = NULL;
-	cairo_t* _tmp12_ = NULL;
-	EditingToolsPhotoCanvas* _tmp13_ = NULL;
-	cairo_t* _tmp14_ = NULL;
-	cairo_t* _tmp15_ = NULL;
-	EditingToolsPhotoCanvas* _tmp16_ = NULL;
-	cairo_t* _tmp17_ = NULL;
-	cairo_t* _tmp18_ = NULL;
-	EditingToolsPhotoCanvas* _tmp19_ = NULL;
-	cairo_t* _tmp20_ = NULL;
-	cairo_t* _tmp21_ = NULL;
-	EditingToolsPhotoCanvas* _tmp22_ = NULL;
-	cairo_t* _tmp23_ = NULL;
-	cairo_t* _tmp24_ = NULL;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	EditingToolsPhotoCanvas* _tmp27_ = NULL;
-	cairo_t* _tmp28_ = NULL;
-	cairo_t* _tmp29_ = NULL;
-	cairo_surface_t* _tmp30_ = NULL;
-	EditingToolsPhotoCanvas* _tmp31_ = NULL;
-	cairo_t* _tmp32_ = NULL;
-	cairo_t* _tmp33_ = NULL;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
-	EditingToolsPhotoCanvas* _tmp36_ = NULL;
-	cairo_t* _tmp37_ = NULL;
-	cairo_t* _tmp38_ = NULL;
-	EditingToolsPhotoCanvas* _tmp39_ = NULL;
-	cairo_t* _tmp40_ = NULL;
-	cairo_t* _tmp41_ = NULL;
-	EditingToolsPhotoCanvas* _tmp42_ = NULL;
-	cairo_t* _tmp43_ = NULL;
-	cairo_t* _tmp44_ = NULL;
-	EditingToolsStraightenToolStraightenGuide* _tmp45_ = NULL;
-	EditingToolsPhotoCanvas* _tmp46_ = NULL;
-	cairo_t* _tmp47_ = NULL;
-	cairo_t* _tmp48_ = NULL;
+	EditingToolsPhotoCanvas* _tmp5_;
+	GdkWindow* _tmp6_;
+	GdkWindow* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	EditingToolsPhotoCanvas* _tmp10_;
+	cairo_t* _tmp11_;
+	cairo_t* _tmp12_;
+	EditingToolsPhotoCanvas* _tmp13_;
+	cairo_t* _tmp14_;
+	cairo_t* _tmp15_;
+	EditingToolsPhotoCanvas* _tmp16_;
+	cairo_t* _tmp17_;
+	cairo_t* _tmp18_;
+	EditingToolsPhotoCanvas* _tmp19_;
+	cairo_t* _tmp20_;
+	cairo_t* _tmp21_;
+	EditingToolsPhotoCanvas* _tmp22_;
+	cairo_t* _tmp23_;
+	cairo_t* _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
+	EditingToolsPhotoCanvas* _tmp27_;
+	cairo_t* _tmp28_;
+	cairo_t* _tmp29_;
+	cairo_surface_t* _tmp30_;
+	EditingToolsPhotoCanvas* _tmp31_;
+	cairo_t* _tmp32_;
+	cairo_t* _tmp33_;
+	gint _tmp34_;
+	gint _tmp35_;
+	EditingToolsPhotoCanvas* _tmp36_;
+	cairo_t* _tmp37_;
+	cairo_t* _tmp38_;
+	EditingToolsPhotoCanvas* _tmp39_;
+	cairo_t* _tmp40_;
+	cairo_t* _tmp41_;
+	EditingToolsPhotoCanvas* _tmp42_;
+	cairo_t* _tmp43_;
+	cairo_t* _tmp44_;
+	EditingToolsStraightenToolStraightenGuide* _tmp45_;
+	EditingToolsPhotoCanvas* _tmp46_;
+	cairo_t* _tmp47_;
+	cairo_t* _tmp48_;
 #line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
 #line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2216,41 +2216,41 @@ static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* b
      */
 static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStraightenTool* self, cairo_surface_t* src_surf, cairo_t* dest_ctx, gint src_width, gint src_height, gdouble angle) {
 	gdouble angle_internal = 0.0;
-	gdouble _tmp0_ = 0.0;
-	gdouble _tmp1_ = 0.0;
-	cairo_t* _tmp2_ = NULL;
-	cairo_t* _tmp3_ = NULL;
-	cairo_t* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	cairo_t* _tmp7_ = NULL;
-	cairo_t* _tmp8_ = NULL;
-	cairo_t* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	cairo_t* _tmp12_ = NULL;
-	gdouble _tmp13_ = 0.0;
-	gdouble _tmp14_ = 0.0;
-	cairo_t* _tmp15_ = NULL;
-	gdouble _tmp16_ = 0.0;
-	cairo_t* _tmp17_ = NULL;
-	GdkPoint _tmp18_ = {0};
-	gint _tmp19_ = 0;
-	gdouble _tmp20_ = 0.0;
-	GdkPoint _tmp21_ = {0};
-	gint _tmp22_ = 0;
-	gdouble _tmp23_ = 0.0;
-	cairo_t* _tmp24_ = NULL;
-	cairo_surface_t* _tmp25_ = NULL;
+	gdouble _tmp0_;
+	gdouble _tmp1_;
+	cairo_t* _tmp2_;
+	cairo_t* _tmp3_;
+	cairo_t* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	cairo_t* _tmp7_;
+	cairo_t* _tmp8_;
+	cairo_t* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	cairo_t* _tmp12_;
+	gdouble _tmp13_;
+	gdouble _tmp14_;
+	cairo_t* _tmp15_;
+	gdouble _tmp16_;
+	cairo_t* _tmp17_;
+	GdkPoint _tmp18_;
+	gint _tmp19_;
+	gdouble _tmp20_;
+	GdkPoint _tmp21_;
+	gint _tmp22_;
+	gdouble _tmp23_;
+	cairo_t* _tmp24_;
+	cairo_surface_t* _tmp25_;
 	cairo_filter_t _tmp26_ = 0;
-	gboolean _tmp27_ = FALSE;
-	cairo_t* _tmp28_ = NULL;
-	cairo_pattern_t* _tmp29_ = NULL;
-	cairo_t* _tmp30_ = NULL;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
-	cairo_t* _tmp33_ = NULL;
-	cairo_t* _tmp34_ = NULL;
+	gboolean _tmp27_;
+	cairo_t* _tmp28_;
+	cairo_pattern_t* _tmp29_;
+	cairo_t* _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
+	cairo_t* _tmp33_;
+	cairo_t* _tmp34_;
 #line 508 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 508 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2378,48 +2378,48 @@ static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStrai
      */
 static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsStraightenTool* self, cairo_t* dest_ctx, gint width, gint height) {
 	gint half_width = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gint quarter_width = 0;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 	gint half_height = 0;
-	gint _tmp2_ = 0;
+	gint _tmp2_;
 	gint quarter_height = 0;
-	gint _tmp3_ = 0;
-	cairo_t* _tmp4_ = NULL;
-	cairo_t* _tmp5_ = NULL;
-	EditingToolsPhotoCanvas* _tmp6_ = NULL;
-	cairo_t* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	EditingToolsPhotoCanvas* _tmp9_ = NULL;
-	cairo_t* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	EditingToolsPhotoCanvas* _tmp12_ = NULL;
-	cairo_t* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	EditingToolsPhotoCanvas* _tmp16_ = NULL;
-	cairo_t* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	EditingToolsPhotoCanvas* _tmp19_ = NULL;
-	cairo_t* _tmp20_ = NULL;
-	gint _tmp21_ = 0;
-	EditingToolsPhotoCanvas* _tmp22_ = NULL;
-	cairo_t* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	cairo_t* _tmp26_ = NULL;
-	EditingToolsPhotoCanvas* _tmp27_ = NULL;
-	cairo_t* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	EditingToolsPhotoCanvas* _tmp30_ = NULL;
-	cairo_t* _tmp31_ = NULL;
-	gint _tmp32_ = 0;
-	EditingToolsPhotoCanvas* _tmp33_ = NULL;
-	cairo_t* _tmp34_ = NULL;
-	gint _tmp35_ = 0;
-	EditingToolsPhotoCanvas* _tmp36_ = NULL;
-	cairo_t* _tmp37_ = NULL;
-	gint _tmp38_ = 0;
+	gint _tmp3_;
+	cairo_t* _tmp4_;
+	cairo_t* _tmp5_;
+	EditingToolsPhotoCanvas* _tmp6_;
+	cairo_t* _tmp7_;
+	gint _tmp8_;
+	EditingToolsPhotoCanvas* _tmp9_;
+	cairo_t* _tmp10_;
+	gint _tmp11_;
+	EditingToolsPhotoCanvas* _tmp12_;
+	cairo_t* _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
+	EditingToolsPhotoCanvas* _tmp16_;
+	cairo_t* _tmp17_;
+	gint _tmp18_;
+	EditingToolsPhotoCanvas* _tmp19_;
+	cairo_t* _tmp20_;
+	gint _tmp21_;
+	EditingToolsPhotoCanvas* _tmp22_;
+	cairo_t* _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	cairo_t* _tmp26_;
+	EditingToolsPhotoCanvas* _tmp27_;
+	cairo_t* _tmp28_;
+	gint _tmp29_;
+	EditingToolsPhotoCanvas* _tmp30_;
+	cairo_t* _tmp31_;
+	gint _tmp32_;
+	EditingToolsPhotoCanvas* _tmp33_;
+	cairo_t* _tmp34_;
+	gint _tmp35_;
+	EditingToolsPhotoCanvas* _tmp36_;
+	cairo_t* _tmp37_;
+	gint _tmp38_;
 #line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2541,13 +2541,13 @@ static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsSt
 
 
 static void editing_tools_straighten_tool_straighten_guide_reset (EditingToolsStraightenToolStraightenGuide* self, gint x, gint y, gdouble angle) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	gint _tmp2_[2] = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	gint _tmp3_;
+	gint _tmp4_;
 	gint _tmp5_[2] = {0};
-	gdouble _tmp6_ = 0.0;
+	gdouble _tmp6_;
 #line 31 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self));
 #line 32 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2582,7 +2582,7 @@ static void editing_tools_straighten_tool_straighten_guide_reset (EditingToolsSt
 
 static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingToolsStraightenToolStraightenGuide* self, gint x, gint y) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 38 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_val_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self), FALSE);
 #line 39 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2590,10 +2590,10 @@ static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingTo
 #line 39 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp0_) {
 #line 2593 "StraightenTool.c"
-		gint _tmp1_ = 0;
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		gint _tmp1_;
+		gint _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 40 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp1_ = x;
 #line 40 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2651,19 +2651,19 @@ static gpointer __double_dup0 (gpointer self) {
 static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (EditingToolsStraightenToolStraightenGuide* self) {
 	gdouble* result = NULL;
 	gdouble dx = 0.0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	gdouble dy = 0.0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
-	gdouble _tmp7_ = 0.0;
-	gdouble _tmp8_ = 0.0;
-	gdouble _tmp9_ = 0.0;
-	gdouble _tmp10_ = 0.0;
-	gdouble _tmp11_ = 0.0;
+	gint _tmp2_;
+	gint _tmp3_;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
+	gdouble _tmp7_;
+	gdouble _tmp8_;
+	gdouble _tmp9_;
+	gdouble _tmp10_;
+	gdouble _tmp11_;
 #line 52 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_val_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self), NULL);
 #line 53 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2705,12 +2705,12 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin
 #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp9_ > _tmp11_) {
 #line 2708 "StraightenTool.c"
-		gdouble _tmp12_ = 0.0;
-		gdouble _tmp13_ = 0.0;
-		gdouble _tmp14_ = 0.0;
-		gdouble _tmp15_ = 0.0;
-		gdouble _tmp16_ = 0.0;
-		gdouble* _tmp17_ = NULL;
+		gdouble _tmp12_;
+		gdouble _tmp13_;
+		gdouble _tmp14_;
+		gdouble _tmp15_;
+		gdouble _tmp16_;
+		gdouble* _tmp17_;
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp12_ = self->priv->angle0;
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2729,12 +2729,12 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin
 		return result;
 #line 2731 "StraightenTool.c"
 	} else {
-		gdouble _tmp18_ = 0.0;
-		gdouble _tmp19_ = 0.0;
-		gdouble _tmp20_ = 0.0;
-		gdouble _tmp21_ = 0.0;
-		gdouble _tmp22_ = 0.0;
-		gdouble* _tmp23_ = NULL;
+		gdouble _tmp18_;
+		gdouble _tmp19_;
+		gdouble _tmp20_;
+		gdouble _tmp21_;
+		gdouble _tmp22_;
+		gdouble* _tmp23_;
 #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp18_ = self->priv->angle0;
 #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2757,39 +2757,39 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin
 
 
 static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStraightenToolStraightenGuide* self, cairo_t* ctx) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	gdouble* _tmp1_ = NULL;
-	gdouble* _tmp2_ = NULL;
+	gdouble* _tmp2_;
 	gdouble angle = 0.0;
-	gdouble* _tmp5_ = NULL;
-	gdouble* _tmp6_ = NULL;
-	gdouble _tmp7_ = 0.0;
-	gdouble _tmp8_ = 0.0;
+	gdouble* _tmp5_;
+	gdouble* _tmp6_;
+	gdouble _tmp7_;
+	gdouble _tmp8_;
 	gdouble alpha = 0.0;
 	gboolean _tmp9_ = FALSE;
-	gdouble _tmp10_ = 0.0;
-	cairo_t* _tmp12_ = NULL;
-	gdouble _tmp13_ = 0.0;
-	cairo_t* _tmp14_ = NULL;
-	gdouble _tmp15_ = 0.0;
-	cairo_t* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	cairo_t* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	cairo_t* _tmp22_ = NULL;
-	cairo_t* _tmp23_ = NULL;
-	gdouble _tmp24_ = 0.0;
-	cairo_t* _tmp25_ = NULL;
-	gdouble _tmp26_ = 0.0;
-	cairo_t* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	cairo_t* _tmp30_ = NULL;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
-	cairo_t* _tmp33_ = NULL;
+	gdouble _tmp10_;
+	cairo_t* _tmp12_;
+	gdouble _tmp13_;
+	cairo_t* _tmp14_;
+	gdouble _tmp15_;
+	cairo_t* _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	cairo_t* _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
+	cairo_t* _tmp22_;
+	cairo_t* _tmp23_;
+	gdouble _tmp24_;
+	cairo_t* _tmp25_;
+	gdouble _tmp26_;
+	cairo_t* _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
+	cairo_t* _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
+	cairo_t* _tmp33_;
 #line 67 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self));
 #line 67 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2809,8 +2809,8 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp1_ == NULL) {
 #line 2812 "StraightenTool.c"
-		gdouble _tmp3_ = 0.0;
-		gdouble* _tmp4_ = NULL;
+		gdouble _tmp3_;
+		gdouble* _tmp4_;
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp3_ = 0.0;
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2853,7 +2853,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 		_tmp9_ = TRUE;
 #line 2855 "StraightenTool.c"
 	} else {
-		gdouble _tmp11_ = 0.0;
+		gdouble _tmp11_;
 #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp11_ = angle;
 #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2995,7 +2995,7 @@ static gchar* editing_tools_straighten_tool_value_straighten_guide_collect_value
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (collect_values[0].v_pointer) {
 #line 2998 "StraightenTool.c"
-		EditingToolsStraightenToolStraightenGuide* object;
+		EditingToolsStraightenToolStraightenGuide * object;
 		object = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -3022,7 +3022,7 @@ static gchar* editing_tools_straighten_tool_value_straighten_guide_collect_value
 
 
 static gchar* editing_tools_straighten_tool_value_straighten_guide_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	EditingToolsStraightenToolStraightenGuide** object_p;
+	EditingToolsStraightenToolStraightenGuide ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (!object_p) {
@@ -3074,7 +3074,7 @@ static gpointer editing_tools_straighten_tool_value_get_straighten_guide (const
 
 
 static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* value, gpointer v_object) {
-	EditingToolsStraightenToolStraightenGuide* old;
+	EditingToolsStraightenToolStraightenGuide * old;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE));
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -3105,7 +3105,7 @@ static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* va
 
 
 static void editing_tools_straighten_tool_value_take_straighten_guide (GValue* value, gpointer v_object) {
-	EditingToolsStraightenToolStraightenGuide* old;
+	EditingToolsStraightenToolStraightenGuide * old;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE));
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -3155,7 +3155,7 @@ static void editing_tools_straighten_tool_straighten_guide_instance_init (Editin
 }
 
 
-static void editing_tools_straighten_tool_straighten_guide_finalize (EditingToolsStraightenToolStraightenGuide* obj) {
+static void editing_tools_straighten_tool_straighten_guide_finalize (EditingToolsStraightenToolStraightenGuide * obj) {
 	EditingToolsStraightenToolStraightenGuide * self;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE, EditingToolsStraightenToolStraightenGuide);
@@ -3180,7 +3180,7 @@ static GType editing_tools_straighten_tool_straighten_guide_get_type (void) {
 
 
 static gpointer editing_tools_straighten_tool_straighten_guide_ref (gpointer instance) {
-	EditingToolsStraightenToolStraightenGuide* self;
+	EditingToolsStraightenToolStraightenGuide * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -3191,7 +3191,7 @@ static gpointer editing_tools_straighten_tool_straighten_guide_ref (gpointer ins
 
 
 static void editing_tools_straighten_tool_straighten_guide_unref (gpointer instance) {
-	EditingToolsStraightenToolStraightenGuide* self;
+	EditingToolsStraightenToolStraightenGuide * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -3218,36 +3218,36 @@ static void _editing_tools_straighten_tool_straighten_tool_window_on_reset_click
 
 static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_construct (GType object_type, GtkWindow* container) {
 	EditingToolsStraightenToolStraightenToolWindow * self = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	GtkScale* _tmp2_ = NULL;
-	GtkScale* _tmp3_ = NULL;
-	GtkScale* _tmp4_ = NULL;
-	GtkLabel* _tmp5_ = NULL;
-	GtkLabel* _tmp6_ = NULL;
-	GtkLabel* _tmp7_ = NULL;
-	GtkLabel* _tmp8_ = NULL;
-	GtkLabel* _tmp9_ = NULL;
-	GtkLabel* _tmp10_ = NULL;
-	GtkLabel* _tmp11_ = NULL;
-	GtkLabel* _tmp12_ = NULL;
-	GtkLabel* _tmp13_ = NULL;
+	GtkWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	GtkScale* _tmp2_;
+	GtkScale* _tmp3_;
+	GtkScale* _tmp4_;
+	GtkLabel* _tmp5_;
+	GtkLabel* _tmp6_;
+	GtkLabel* _tmp7_;
+	GtkLabel* _tmp8_;
+	GtkLabel* _tmp9_;
+	GtkLabel* _tmp10_;
+	GtkLabel* _tmp11_;
+	GtkLabel* _tmp12_;
+	GtkLabel* _tmp13_;
 	GtkBox* slider_layout = NULL;
-	GtkBox* _tmp14_ = NULL;
-	GtkScale* _tmp15_ = NULL;
+	GtkBox* _tmp14_;
+	GtkScale* _tmp15_;
 	GtkBox* button_layout = NULL;
-	GtkBox* _tmp16_ = NULL;
-	GtkButton* _tmp17_ = NULL;
-	GtkButton* _tmp18_ = NULL;
-	GtkButton* _tmp19_ = NULL;
-	GtkButton* _tmp20_ = NULL;
-	GtkButton* _tmp21_ = NULL;
-	GtkButton* _tmp22_ = NULL;
+	GtkBox* _tmp16_;
+	GtkButton* _tmp17_;
+	GtkButton* _tmp18_;
+	GtkButton* _tmp19_;
+	GtkButton* _tmp20_;
+	GtkButton* _tmp21_;
+	GtkButton* _tmp22_;
 	GtkBox* main_layout = NULL;
-	GtkBox* _tmp23_ = NULL;
-	GtkLabel* _tmp24_ = NULL;
-	GtkLabel* _tmp25_ = NULL;
-	GtkButton* _tmp26_ = NULL;
+	GtkBox* _tmp23_;
+	GtkLabel* _tmp24_;
+	GtkLabel* _tmp25_;
+	GtkButton* _tmp26_;
 #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 110 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -3392,7 +3392,7 @@ static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_
 
 
 static void editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked (EditingToolsStraightenToolStraightenToolWindow* self) {
-	GtkScale* _tmp0_ = NULL;
+	GtkScale* _tmp0_;
 #line 152 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_TOOL_WINDOW (self));
 #line 153 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -3413,15 +3413,12 @@ static void editing_tools_straighten_tool_straighten_tool_window_class_init (Edi
 
 
 static void editing_tools_straighten_tool_straighten_tool_window_instance_init (EditingToolsStraightenToolStraightenToolWindow * self) {
-	GtkScale* _tmp0_ = NULL;
-	GtkLabel* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	GtkLabel* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GtkButton* _tmp5_ = NULL;
-	GtkButton* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	GtkButton* _tmp8_ = NULL;
+	GtkScale* _tmp0_;
+	GtkLabel* _tmp1_;
+	GtkLabel* _tmp2_;
+	GtkButton* _tmp3_;
+	GtkButton* _tmp4_;
+	GtkButton* _tmp5_;
 #line 97 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_ANGLE, EDITING_TOOLS_STRAIGHTEN_TOOL_MAX_ANGLE, EDITING_TOOLS_STRAIGHTEN_TOOL_INCREMENT);
 #line 97 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -3435,40 +3432,34 @@ static void editing_tools_straighten_tool_straighten_tool_window_instance_init (
 #line 98 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->angle_label = _tmp1_;
 #line 99 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp2_ = _ ("Angle:");
-#line 99 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp3_ = (GtkLabel*) gtk_label_new (_tmp2_);
+	_tmp2_ = (GtkLabel*) gtk_label_new (_ ("Angle:"));
 #line 99 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	g_object_ref_sink (_tmp3_);
+	g_object_ref_sink (_tmp2_);
 #line 99 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->description_label = _tmp3_;
-#line 100 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp4_ = _ ("_Straighten");
+	self->description_label = _tmp2_;
 #line 100 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp5_ = (GtkButton*) gtk_button_new_with_mnemonic (_tmp4_);
+	_tmp3_ = (GtkButton*) gtk_button_new_with_mnemonic (_ ("_Straighten"));
 #line 100 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	g_object_ref_sink (_tmp5_);
+	g_object_ref_sink (_tmp3_);
 #line 100 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->ok_button = _tmp5_;
+	self->ok_button = _tmp3_;
 #line 101 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp6_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
+	_tmp4_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
 #line 101 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	g_object_ref_sink (_tmp6_);
+	g_object_ref_sink (_tmp4_);
 #line 101 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->cancel_button = _tmp6_;
+	self->cancel_button = _tmp4_;
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp7_ = _ ("_Reset");
+	_tmp5_ = (GtkButton*) gtk_button_new_with_mnemonic (_ ("_Reset"));
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp8_ = (GtkButton*) gtk_button_new_with_mnemonic (_tmp7_);
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	g_object_ref_sink (_tmp8_);
+	g_object_ref_sink (_tmp5_);
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->reset_button = _tmp8_;
-#line 3468 "StraightenTool.c"
+	self->reset_button = _tmp5_;
+#line 3459 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObject* obj) {
+static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObject * obj) {
 	EditingToolsStraightenToolStraightenToolWindow * self;
 #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_TOOL_WINDOW, EditingToolsStraightenToolStraightenToolWindow);
@@ -3486,7 +3477,7 @@ static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObje
 	_g_object_unref0 (self->reset_button);
 #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	G_OBJECT_CLASS (editing_tools_straighten_tool_straighten_tool_window_parent_class)->finalize (obj);
-#line 3490 "StraightenTool.c"
+#line 3481 "StraightenTool.c"
 }
 
 
@@ -3510,27 +3501,27 @@ static void editing_tools_straighten_tool_class_init (EditingToolsStraightenTool
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsStraightenToolPrivate));
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*)(EditingToolsEditingTool*, gint, gint)) editing_tools_straighten_tool_real_on_left_click;
+	((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_straighten_tool_real_on_left_click;
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*)(EditingToolsEditingTool*, gint, gint)) editing_tools_straighten_tool_real_on_left_released;
+	((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_straighten_tool_real_on_left_released;
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*)(EditingToolsEditingTool*, gint, gint, GdkModifierType)) editing_tools_straighten_tool_real_on_motion;
+	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_straighten_tool_real_on_motion;
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*)(EditingToolsEditingTool*, GdkEventKey*)) editing_tools_straighten_tool_real_on_keypress;
+	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_straighten_tool_real_on_keypress;
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	((EditingToolsEditingToolClass *) klass)->activate = (void (*)(EditingToolsEditingTool*, EditingToolsPhotoCanvas*)) editing_tools_straighten_tool_real_activate;
+	((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_straighten_tool_real_activate;
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*)(EditingToolsEditingTool*)) editing_tools_straighten_tool_real_deactivate;
+	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_straighten_tool_real_deactivate;
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*)(EditingToolsEditingTool*)) editing_tools_straighten_tool_real_get_tool_window;
+	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_straighten_tool_real_get_tool_window;
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	((EditingToolsEditingToolClass *) klass)->paint = (void (*)(EditingToolsEditingTool*, cairo_t*)) editing_tools_straighten_tool_real_paint;
-#line 3529 "StraightenTool.c"
+	((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_straighten_tool_real_paint;
+#line 3520 "StraightenTool.c"
 }
 
 
 static void editing_tools_straighten_tool_instance_init (EditingToolsStraightenTool * self) {
-	EditingToolsStraightenToolStraightenGuide* _tmp0_ = NULL;
+	EditingToolsStraightenToolStraightenGuide* _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv = EDITING_TOOLS_STRAIGHTEN_TOOL_GET_PRIVATE (self);
 #line 170 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -3543,11 +3534,11 @@ static void editing_tools_straighten_tool_instance_init (EditingToolsStraightenT
 	_tmp0_ = editing_tools_straighten_tool_straighten_guide_new ();
 #line 181 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->guide = _tmp0_;
-#line 3547 "StraightenTool.c"
+#line 3538 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool* obj) {
+static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool * obj) {
 	EditingToolsStraightenTool * self;
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
@@ -3565,7 +3556,7 @@ static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool* obj
 	_editing_tools_straighten_tool_straighten_guide_unref0 (self->priv->guide);
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->finalize (obj);
-#line 3569 "StraightenTool.c"
+#line 3560 "StraightenTool.c"
 }
 
 
diff --git a/src/events/Branch.c b/src/events/Branch.c
index c73d166..32d331d 100644
--- a/src/events/Branch.c
+++ b/src/events/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.7, the Vala compiler
+/* Branch.c generated by valac 0.36.6, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -744,14 +744,14 @@ gchar* events_branch_no_event_icon = NULL;
 static gboolean events_branch_sort_ascending;
 static gboolean events_branch_sort_ascending = FALSE;
 static gpointer events_directory_entry_parent_class = NULL;
-static SidebarExpandableEntryIface* events_directory_entry_sidebar_expandable_entry_parent_iface = NULL;
+static SidebarExpandableEntryIface * events_directory_entry_sidebar_expandable_entry_parent_iface = NULL;
 static gpointer events_master_directory_entry_parent_class = NULL;
 static gpointer events_year_directory_entry_parent_class = NULL;
 static gpointer events_month_directory_entry_parent_class = NULL;
 static gpointer events_undated_directory_entry_parent_class = NULL;
 static gpointer events_event_entry_parent_class = NULL;
-static SidebarRenameableEntryIface* events_event_entry_sidebar_renameable_entry_parent_iface = NULL;
-static SidebarInternalDropTargetEntryIface* events_event_entry_sidebar_internal_drop_target_entry_parent_iface = NULL;
+static SidebarRenameableEntryIface * events_event_entry_sidebar_renameable_entry_parent_iface = NULL;
+static SidebarInternalDropTargetEntryIface * events_event_entry_sidebar_internal_drop_target_entry_parent_iface = NULL;
 static gpointer events_no_event_entry_parent_class = NULL;
 
 GType sidebar_branch_get_type (void) G_GNUC_CONST;
@@ -856,7 +856,7 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc
 static void events_branch_move_event (EventsBranch* self, Event* event);
 GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST;
 static void events_branch_add_undated_event (EventsBranch* self, Event* event);
-static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* event, struct tm* event_tm, SidebarEntry** found_year);
+static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* event, struct tm* event_tm, SidebarEntry* * found_year);
 static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent, Event* event, GCompareFunc comparator);
 static gint _events_branch_event_comparator_gcompare_func (gconstpointer a, gconstpointer b);
 #define SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT _ ("%Y")
@@ -875,18 +875,18 @@ static Block8Data* block8_data_ref (Block8Data* _data8_);
 static void block8_data_unref (void * _userdata_);
 static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm);
 SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target);
-static gboolean __lambda18_ (Block8Data* _data8_, SidebarEntry* entry);
-static gboolean ___lambda18__locator (gconstpointer item, gpointer self);
+static gboolean __lambda19_ (Block8Data* _data8_, SidebarEntry* entry);
+static gboolean ___lambda19__locator (gconstpointer item, gpointer self);
 static Block9Data* block9_data_ref (Block9Data* _data9_);
 static void block9_data_unref (void * _userdata_);
-static gboolean __lambda17_ (Block9Data* _data9_, SidebarEntry* entry);
-static gboolean ___lambda17__locator (gconstpointer item, gpointer self);
+static gboolean __lambda18_ (Block9Data* _data9_, SidebarEntry* entry);
+static gboolean ___lambda18__locator (gconstpointer item, gpointer self);
 gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry);
 static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer a, gconstpointer b);
 EventsEventEntry* events_event_entry_new (Event* event);
 EventsEventEntry* events_event_entry_construct (GType object_type, Event* event);
 void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, SidebarEntry* entry);
-static void events_branch_finalize (GObject* obj);
+static void events_branch_finalize (GObject * obj);
 GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
 GType page_get_type (void) G_GNUC_CONST;
 GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
@@ -921,7 +921,7 @@ GType sub_events_directory_page_directory_type_get_type (void) G_GNUC_CONST;
 SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time);
 SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time);
 GType sub_events_directory_page_get_type (void) G_GNUC_CONST;
-static void events_year_directory_entry_finalize (GObject* obj);
+static void events_year_directory_entry_finalize (GObject * obj);
 #define EVENTS_MONTH_DIRECTORY_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntryPrivate))
 enum  {
 	EVENTS_MONTH_DIRECTORY_ENTRY_DUMMY_PROPERTY
@@ -929,7 +929,7 @@ enum  {
 static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
 gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self);
 static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEntry* base);
-static void events_month_directory_entry_finalize (GObject* obj);
+static void events_month_directory_entry_finalize (GObject * obj);
 enum  {
 	EVENTS_UNDATED_DIRECTORY_ENTRY_DUMMY_PROPERTY
 };
@@ -977,7 +977,7 @@ SetEventCommand* set_event_command_construct (GType object_type, GeeIterable* it
 GType move_photos_command_get_type (void) G_GNUC_CONST;
 GType set_event_command_get_type (void) G_GNUC_CONST;
 static gboolean events_event_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data);
-static void events_event_entry_finalize (GObject* obj);
+static void events_event_entry_finalize (GObject * obj);
 enum  {
 	EVENTS_NO_EVENT_ENTRY_DUMMY_PROPERTY
 };
@@ -1029,152 +1029,149 @@ static gint _events_branch_event_year_comparator_gcompare_func (gconstpointer a,
 
 EventsBranch* events_branch_construct (GType object_type) {
 	EventsBranch * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	SidebarHeader* _tmp1_ = NULL;
-	SidebarHeader* _tmp2_ = NULL;
-	SidebarEntry* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	EventsMasterDirectoryEntry* _tmp5_ = NULL;
-	EventSourceCollection* _tmp16_ = NULL;
-	GeeCollection* _tmp17_ = NULL;
-	GeeCollection* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	EventSourceCollection* _tmp21_ = NULL;
-	EventSourceCollection* _tmp22_ = NULL;
-	EventSourceCollection* _tmp23_ = NULL;
-	ConfigFacade* _tmp24_ = NULL;
-	ConfigFacade* _tmp25_ = NULL;
-#line 25 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp0_ = _ ("Events");
+	SidebarHeader* _tmp0_;
+	SidebarHeader* _tmp1_;
+	SidebarEntry* _tmp2_;
+	SidebarEntry* _tmp3_;
+	EventsMasterDirectoryEntry* _tmp4_;
+	EventSourceCollection* _tmp15_;
+	GeeCollection* _tmp16_;
+	GeeCollection* _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	EventSourceCollection* _tmp20_;
+	EventSourceCollection* _tmp21_;
+	EventSourceCollection* _tmp22_;
+	ConfigFacade* _tmp23_;
+	ConfigFacade* _tmp24_;
 #line 25 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp1_ = sidebar_header_new (_tmp0_, TRUE);
+	_tmp0_ = sidebar_header_new (_ ("Events"), TRUE);
 #line 25 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 25 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	self = (EventsBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, _events_branch_event_year_comparator_gcompare_func, NULL);
+	self = (EventsBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, _events_branch_event_year_comparator_gcompare_func, NULL);
 #line 25 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 28 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp3_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+	_tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
 #line 28 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 28 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp5_ = self->priv->all_events_entry;
+	_tmp4_ = self->priv->all_events_entry;
 #line 28 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
+	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
 #line 28 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_g_object_unref0 (_tmp4_);
-#line 1069 "Branch.c"
+	_g_object_unref0 (_tmp3_);
+#line 1066 "Branch.c"
 	{
 		GeeIterator* _object_it = NULL;
-		EventSourceCollection* _tmp6_ = NULL;
-		GeeCollection* _tmp7_ = NULL;
-		GeeCollection* _tmp8_ = NULL;
-		GeeIterator* _tmp9_ = NULL;
-		GeeIterator* _tmp10_ = NULL;
+		EventSourceCollection* _tmp5_;
+		GeeCollection* _tmp6_;
+		GeeCollection* _tmp7_;
+		GeeIterator* _tmp8_;
+		GeeIterator* _tmp9_;
 #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
-		_tmp6_ = event_global;
+		_tmp5_ = event_global;
 #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
-		_tmp7_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
+		_tmp6_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection));
 #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
-		_tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
-		_tmp10_ = _tmp9_;
+		_tmp9_ = _tmp8_;
 #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
-		_g_object_unref0 (_tmp8_);
+		_g_object_unref0 (_tmp7_);
 #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
-		_object_it = _tmp10_;
+		_object_it = _tmp9_;
 #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		while (TRUE) {
-#line 1093 "Branch.c"
-			GeeIterator* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
+#line 1090 "Branch.c"
+			GeeIterator* _tmp10_;
+			gboolean _tmp11_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp13_ = NULL;
-			gpointer _tmp14_ = NULL;
-			DataObject* _tmp15_ = NULL;
+			GeeIterator* _tmp12_;
+			gpointer _tmp13_;
+			DataObject* _tmp14_;
 #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
-			_tmp11_ = _object_it;
+			_tmp10_ = _object_it;
 #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
-			_tmp12_ = gee_iterator_next (_tmp11_);
+			_tmp11_ = gee_iterator_next (_tmp10_);
 #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
-			if (!_tmp12_) {
+			if (!_tmp11_) {
 #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
 				break;
-#line 1108 "Branch.c"
+#line 1105 "Branch.c"
 			}
 #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
-			_tmp13_ = _object_it;
+			_tmp12_ = _object_it;
 #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
-			_tmp14_ = gee_iterator_get (_tmp13_);
+			_tmp13_ = gee_iterator_get (_tmp12_);
 #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
-			object = (DataObject*) _tmp14_;
+			object = (DataObject*) _tmp13_;
 #line 32 "/home/jens/Source/shotwell/src/events/Branch.vala"
-			_tmp15_ = object;
+			_tmp14_ = object;
 #line 32 "/home/jens/Source/shotwell/src/events/Branch.vala"
-			events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_EVENT, Event));
+			events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_EVENT, Event));
 #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_g_object_unref0 (object);
-#line 1122 "Branch.c"
+#line 1119 "Branch.c"
 		}
 #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_g_object_unref0 (_object_it);
-#line 1126 "Branch.c"
+#line 1123 "Branch.c"
 	}
 #line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp16_ = event_global;
+	_tmp15_ = event_global;
 #line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp17_ = event_source_collection_get_no_event_objects (_tmp16_);
+	_tmp16_ = event_source_collection_get_no_event_objects (_tmp15_);
 #line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp18_ = _tmp17_;
+	_tmp17_ = _tmp16_;
 #line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp19_ = gee_collection_get_size (_tmp18_);
+	_tmp18_ = gee_collection_get_size (_tmp17_);
 #line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp20_ = _tmp19_;
+	_tmp19_ = _tmp18_;
 #line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	events_branch_show_no_events (self, _tmp20_ > 0);
+	events_branch_show_no_events (self, _tmp19_ > 0);
 #line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_g_object_unref0 (_tmp18_);
+	_g_object_unref0 (_tmp17_);
 #line 37 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp21_ = event_global;
+	_tmp20_ = event_global;
 #line 37 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _events_branch_on_events_added_removed_data_collection_contents_altered, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _events_branch_on_events_added_removed_data_collection_contents_altered, self, 0);
 #line 38 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp22_ = event_global;
+	_tmp21_ = event_global;
 #line 38 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _events_branch_on_events_altered_data_collection_items_altered, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _events_branch_on_events_altered_data_collection_items_altered, self, 0);
 #line 39 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp23_ = event_global;
+	_tmp22_ = event_global;
 #line 39 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	g_signal_connect_object (_tmp23_, "no-event-collection-altered", (GCallback) _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered, self, 0);
+	g_signal_connect_object (_tmp22_, "no-event-collection-altered", (GCallback) _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered, self, 0);
 #line 42 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp24_ = config_facade_get_instance ();
+	_tmp23_ = config_facade_get_instance ();
 #line 42 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp25_ = _tmp24_;
+	_tmp24_ = _tmp23_;
 #line 42 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "events-sort-ascending-changed", (GCallback) _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "events-sort-ascending-changed", (GCallback) _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed, self, 0);
 #line 42 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_g_object_unref0 (_tmp25_);
+	_g_object_unref0 (_tmp24_);
 #line 24 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return self;
-#line 1164 "Branch.c"
+#line 1161 "Branch.c"
 }
 
 
 EventsBranch* events_branch_new (void) {
 #line 24 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return events_branch_construct (EVENTS_TYPE_BRANCH);
-#line 1171 "Branch.c"
+#line 1168 "Branch.c"
 }
 
 
 void events_branch_init (void) {
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
 #line 54 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp0_ = config_facade_get_instance ();
 #line 54 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1185,7 +1182,7 @@ void events_branch_init (void) {
 	events_branch_sort_ascending = _tmp2_;
 #line 54 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1189 "Branch.c"
+#line 1186 "Branch.c"
 }
 
 
@@ -1201,21 +1198,21 @@ gboolean events_branch_is_user_renameable (EventsBranch* self) {
 	result = TRUE;
 #line 61 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 1205 "Branch.c"
+#line 1202 "Branch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 65 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1212 "Branch.c"
+#line 1209 "Branch.c"
 }
 
 
 EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self) {
 	EventsMasterDirectoryEntry* result = NULL;
-	EventsMasterDirectoryEntry* _tmp0_ = NULL;
-	EventsMasterDirectoryEntry* _tmp1_ = NULL;
+	EventsMasterDirectoryEntry* _tmp0_;
+	EventsMasterDirectoryEntry* _tmp1_;
 #line 64 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL);
 #line 65 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1226,24 +1223,24 @@ EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self)
 	result = _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 1230 "Branch.c"
+#line 1227 "Branch.c"
 }
 
 
 static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gint result = 0;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
-	SidebarEntry* _tmp6_ = NULL;
-	SidebarEntry* _tmp8_ = NULL;
-	gboolean _tmp10_ = FALSE;
+	SidebarEntry* _tmp0_;
+	SidebarEntry* _tmp1_;
+	SidebarEntry* _tmp2_;
+	SidebarEntry* _tmp6_;
+	SidebarEntry* _tmp8_;
+	gboolean _tmp10_;
 	gint _result_ = 0;
-	SidebarEntry* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	SidebarEntry* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	SidebarEntry* _tmp15_;
+	gint _tmp16_;
+	SidebarEntry* _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 #line 68 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
 #line 68 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1258,14 +1255,14 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
 		result = 0;
 #line 70 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		return result;
-#line 1262 "Branch.c"
+#line 1259 "Branch.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp2_ = a;
 #line 74 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) {
-#line 1268 "Branch.c"
-		SidebarEntry* _tmp3_ = NULL;
+#line 1265 "Branch.c"
+		SidebarEntry* _tmp3_;
 #line 75 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp3_ = b;
 #line 75 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1274,21 +1271,21 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
 			result = -1;
 #line 76 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			return result;
-#line 1278 "Branch.c"
+#line 1275 "Branch.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		result = 1;
 #line 77 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		return result;
-#line 1284 "Branch.c"
+#line 1281 "Branch.c"
 	} else {
-		SidebarEntry* _tmp4_ = NULL;
+		SidebarEntry* _tmp4_;
 #line 78 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp4_ = b;
 #line 78 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) {
-#line 1291 "Branch.c"
-			SidebarEntry* _tmp5_ = NULL;
+#line 1288 "Branch.c"
+			SidebarEntry* _tmp5_;
 #line 79 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_tmp5_ = a;
 #line 79 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1297,13 +1294,13 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
 				result = 1;
 #line 80 "/home/jens/Source/shotwell/src/events/Branch.vala"
 				return result;
-#line 1301 "Branch.c"
+#line 1298 "Branch.c"
 			}
 #line 81 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			result = -1;
 #line 81 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			return result;
-#line 1307 "Branch.c"
+#line 1304 "Branch.c"
 		}
 	}
 #line 84 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1314,9 +1311,9 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
 		result = 1;
 #line 85 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		return result;
-#line 1318 "Branch.c"
+#line 1315 "Branch.c"
 	} else {
-		SidebarEntry* _tmp7_ = NULL;
+		SidebarEntry* _tmp7_;
 #line 86 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp7_ = b;
 #line 86 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1325,7 +1322,7 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
 			result = -1;
 #line 87 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			return result;
-#line 1329 "Branch.c"
+#line 1326 "Branch.c"
 		}
 	}
 #line 90 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1336,9 +1333,9 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
 		result = -1;
 #line 91 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		return result;
-#line 1340 "Branch.c"
+#line 1337 "Branch.c"
 	} else {
-		SidebarEntry* _tmp9_ = NULL;
+		SidebarEntry* _tmp9_;
 #line 92 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp9_ = b;
 #line 92 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1347,19 +1344,19 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
 			result = 1;
 #line 93 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			return result;
-#line 1351 "Branch.c"
+#line 1348 "Branch.c"
 		}
 	}
 #line 95 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp10_ = events_branch_sort_ascending;
 #line 95 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (!_tmp10_) {
-#line 1358 "Branch.c"
+#line 1355 "Branch.c"
 		SidebarEntry* swap = NULL;
-		SidebarEntry* _tmp11_ = NULL;
-		SidebarEntry* _tmp12_ = NULL;
-		SidebarEntry* _tmp13_ = NULL;
-		SidebarEntry* _tmp14_ = NULL;
+		SidebarEntry* _tmp11_;
+		SidebarEntry* _tmp12_;
+		SidebarEntry* _tmp13_;
+		SidebarEntry* _tmp14_;
 #line 96 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp11_ = a;
 #line 96 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1376,7 +1373,7 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
 		b = _tmp14_;
 #line 95 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_g_object_unref0 (swap);
-#line 1380 "Branch.c"
+#line 1377 "Branch.c"
 	}
 #line 101 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp15_ = a;
@@ -1396,21 +1393,21 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
 	result = _result_;
 #line 105 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 1400 "Branch.c"
+#line 1397 "Branch.c"
 }
 
 
 static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gint result = 0;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	SidebarEntry* _tmp0_;
+	SidebarEntry* _tmp1_;
+	gboolean _tmp2_;
 	gint _result_ = 0;
-	SidebarEntry* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	SidebarEntry* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	SidebarEntry* _tmp7_;
+	gint _tmp8_;
+	SidebarEntry* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 #line 108 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
 #line 108 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1425,18 +1422,18 @@ static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry*
 		result = 0;
 #line 110 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		return result;
-#line 1429 "Branch.c"
+#line 1426 "Branch.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp2_ = events_branch_sort_ascending;
 #line 112 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (!_tmp2_) {
-#line 1435 "Branch.c"
+#line 1432 "Branch.c"
 		SidebarEntry* swap = NULL;
-		SidebarEntry* _tmp3_ = NULL;
-		SidebarEntry* _tmp4_ = NULL;
-		SidebarEntry* _tmp5_ = NULL;
-		SidebarEntry* _tmp6_ = NULL;
+		SidebarEntry* _tmp3_;
+		SidebarEntry* _tmp4_;
+		SidebarEntry* _tmp5_;
+		SidebarEntry* _tmp6_;
 #line 113 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp3_ = a;
 #line 113 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1453,7 +1450,7 @@ static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry*
 		b = _tmp6_;
 #line 112 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_g_object_unref0 (swap);
-#line 1457 "Branch.c"
+#line 1454 "Branch.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp7_ = a;
@@ -1473,29 +1470,29 @@ static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry*
 	result = _result_;
 #line 122 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 1477 "Branch.c"
+#line 1474 "Branch.c"
 }
 
 
 static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gint result = 0;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	SidebarEntry* _tmp0_;
+	SidebarEntry* _tmp1_;
+	gboolean _tmp2_;
 	gint64 _result_ = 0LL;
-	SidebarEntry* _tmp7_ = NULL;
-	Event* _tmp8_ = NULL;
-	Event* _tmp9_ = NULL;
-	time_t _tmp10_ = 0;
-	SidebarEntry* _tmp11_ = NULL;
-	Event* _tmp12_ = NULL;
-	Event* _tmp13_ = NULL;
-	time_t _tmp14_ = 0;
-	gint64 _tmp15_ = 0LL;
-	gint64 _tmp16_ = 0LL;
-	gint64 _tmp27_ = 0LL;
+	SidebarEntry* _tmp7_;
+	Event* _tmp8_;
+	Event* _tmp9_;
+	time_t _tmp10_;
+	SidebarEntry* _tmp11_;
+	Event* _tmp12_;
+	Event* _tmp13_;
+	time_t _tmp14_;
+	gint64 _tmp15_;
+	gint64 _tmp16_;
+	gint64 _tmp27_;
 	gint _tmp28_ = 0;
-	gint64 _tmp29_ = 0LL;
+	gint64 _tmp29_;
 #line 125 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
 #line 125 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1510,18 +1507,18 @@ static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) {
 		result = 0;
 #line 127 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		return result;
-#line 1514 "Branch.c"
+#line 1511 "Branch.c"
 	}
 #line 129 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp2_ = events_branch_sort_ascending;
 #line 129 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (!_tmp2_) {
-#line 1520 "Branch.c"
+#line 1517 "Branch.c"
 		SidebarEntry* swap = NULL;
-		SidebarEntry* _tmp3_ = NULL;
-		SidebarEntry* _tmp4_ = NULL;
-		SidebarEntry* _tmp5_ = NULL;
-		SidebarEntry* _tmp6_ = NULL;
+		SidebarEntry* _tmp3_;
+		SidebarEntry* _tmp4_;
+		SidebarEntry* _tmp5_;
+		SidebarEntry* _tmp6_;
 #line 130 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp3_ = a;
 #line 130 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1538,7 +1535,7 @@ static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) {
 		b = _tmp6_;
 #line 129 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_g_object_unref0 (swap);
-#line 1542 "Branch.c"
+#line 1539 "Branch.c"
 	}
 #line 135 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp7_ = a;
@@ -1568,17 +1565,17 @@ static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) {
 	_tmp16_ = _result_;
 #line 139 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (_tmp16_ == ((gint64) 0)) {
-#line 1572 "Branch.c"
-		SidebarEntry* _tmp17_ = NULL;
-		Event* _tmp18_ = NULL;
-		Event* _tmp19_ = NULL;
+#line 1569 "Branch.c"
+		SidebarEntry* _tmp17_;
+		Event* _tmp18_;
+		Event* _tmp19_;
 		EventID _tmp20_ = {0};
-		gint64 _tmp21_ = 0LL;
-		SidebarEntry* _tmp22_ = NULL;
-		Event* _tmp23_ = NULL;
-		Event* _tmp24_ = NULL;
+		gint64 _tmp21_;
+		SidebarEntry* _tmp22_;
+		Event* _tmp23_;
+		Event* _tmp24_;
 		EventID _tmp25_ = {0};
-		gint64 _tmp26_ = 0LL;
+		gint64 _tmp26_;
 #line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp17_ = a;
 #line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1605,7 +1602,7 @@ static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) {
 		_g_object_unref0 (_tmp24_);
 #line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_g_object_unref0 (_tmp19_);
-#line 1609 "Branch.c"
+#line 1606 "Branch.c"
 	}
 #line 144 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp27_ = _result_;
@@ -1617,39 +1614,39 @@ static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) {
 	if (_tmp29_ < ((gint64) 0)) {
 #line 146 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp28_ = -1;
-#line 1621 "Branch.c"
+#line 1618 "Branch.c"
 	} else {
 #line 146 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp28_ = 1;
-#line 1625 "Branch.c"
+#line 1622 "Branch.c"
 	}
 #line 146 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	result = _tmp28_;
 #line 146 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 1631 "Branch.c"
+#line 1628 "Branch.c"
 }
 
 
 static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gint result = 0;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	SidebarEntry* _tmp0_;
+	SidebarEntry* _tmp1_;
+	gboolean _tmp2_;
 	gint ret = 0;
-	SidebarEntry* _tmp7_ = NULL;
-	Event* _tmp8_ = NULL;
-	Event* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	SidebarEntry* _tmp12_ = NULL;
-	Event* _tmp13_ = NULL;
-	Event* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	SidebarEntry* _tmp7_;
+	Event* _tmp8_;
+	Event* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	SidebarEntry* _tmp12_;
+	Event* _tmp13_;
+	Event* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 #line 149 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
 #line 149 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1664,18 +1661,18 @@ static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntr
 		result = 0;
 #line 151 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		return result;
-#line 1668 "Branch.c"
+#line 1665 "Branch.c"
 	}
 #line 153 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp2_ = events_branch_sort_ascending;
 #line 153 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (!_tmp2_) {
-#line 1674 "Branch.c"
+#line 1671 "Branch.c"
 		SidebarEntry* swap = NULL;
-		SidebarEntry* _tmp3_ = NULL;
-		SidebarEntry* _tmp4_ = NULL;
-		SidebarEntry* _tmp5_ = NULL;
-		SidebarEntry* _tmp6_ = NULL;
+		SidebarEntry* _tmp3_;
+		SidebarEntry* _tmp4_;
+		SidebarEntry* _tmp5_;
+		SidebarEntry* _tmp6_;
 #line 154 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp3_ = a;
 #line 154 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1692,7 +1689,7 @@ static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntr
 		b = _tmp6_;
 #line 153 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_g_object_unref0 (swap);
-#line 1696 "Branch.c"
+#line 1693 "Branch.c"
 	}
 #line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp7_ = a;
@@ -1732,15 +1729,15 @@ static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntr
 	_tmp19_ = ret;
 #line 162 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (_tmp19_ == 0) {
-#line 1736 "Branch.c"
-		SidebarEntry* _tmp20_ = NULL;
-		Event* _tmp21_ = NULL;
-		Event* _tmp22_ = NULL;
-		gint64 _tmp23_ = 0LL;
-		SidebarEntry* _tmp24_ = NULL;
-		Event* _tmp25_ = NULL;
-		Event* _tmp26_ = NULL;
-		gint64 _tmp27_ = 0LL;
+#line 1733 "Branch.c"
+		SidebarEntry* _tmp20_;
+		Event* _tmp21_;
+		Event* _tmp22_;
+		gint64 _tmp23_;
+		SidebarEntry* _tmp24_;
+		Event* _tmp25_;
+		Event* _tmp26_;
+		gint64 _tmp27_;
 #line 163 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp20_ = b;
 #line 163 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1763,21 +1760,21 @@ static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntr
 		_g_object_unref0 (_tmp26_);
 #line 163 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_g_object_unref0 (_tmp22_);
-#line 1767 "Branch.c"
+#line 1764 "Branch.c"
 	}
 #line 166 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	result = ret;
 #line 166 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 1773 "Branch.c"
+#line 1770 "Branch.c"
 }
 
 
 EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event* event) {
 	EventsEventEntry* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	Event* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	Event* _tmp1_;
+	gpointer _tmp2_;
 #line 169 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL);
 #line 169 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1792,16 +1789,16 @@ EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event*
 	result = (EventsEventEntry*) _tmp2_;
 #line 170 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 1796 "Branch.c"
+#line 1793 "Branch.c"
 }
 
 
 static void events_branch_on_config_changed (EventsBranch* self) {
 	gboolean value = FALSE;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 173 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
 #line 174 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1820,13 +1817,13 @@ static void events_branch_on_config_changed (EventsBranch* self) {
 	events_branch_sort_ascending = value;
 #line 177 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	sidebar_branch_reorder_all (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 1824 "Branch.c"
+#line 1821 "Branch.c"
 }
 
 
 static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterable* added, GeeIterable* removed) {
-	GeeIterable* _tmp0_ = NULL;
-	GeeIterable* _tmp8_ = NULL;
+	GeeIterable* _tmp0_;
+	GeeIterable* _tmp8_;
 #line 180 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
 #line 180 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1837,11 +1834,11 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab
 	_tmp0_ = added;
 #line 182 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (_tmp0_ != NULL) {
-#line 1841 "Branch.c"
+#line 1838 "Branch.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp1_ = NULL;
-			GeeIterator* _tmp2_ = NULL;
+			GeeIterable* _tmp1_;
+			GeeIterator* _tmp2_;
 #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_tmp1_ = added;
 #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1850,13 +1847,13 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab
 			_object_it = _tmp2_;
 #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			while (TRUE) {
-#line 1854 "Branch.c"
-				GeeIterator* _tmp3_ = NULL;
-				gboolean _tmp4_ = FALSE;
+#line 1851 "Branch.c"
+				GeeIterator* _tmp3_;
+				gboolean _tmp4_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
-				DataObject* _tmp7_ = NULL;
+				GeeIterator* _tmp5_;
+				gpointer _tmp6_;
+				DataObject* _tmp7_;
 #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
 				_tmp3_ = _object_it;
 #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1865,7 +1862,7 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab
 				if (!_tmp4_) {
 #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
 					break;
-#line 1869 "Branch.c"
+#line 1866 "Branch.c"
 				}
 #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
 				_tmp5_ = _object_it;
@@ -1879,22 +1876,22 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab
 				events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_EVENT, Event));
 #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
 				_g_object_unref0 (object);
-#line 1883 "Branch.c"
+#line 1880 "Branch.c"
 			}
 #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_g_object_unref0 (_object_it);
-#line 1887 "Branch.c"
+#line 1884 "Branch.c"
 		}
 	}
 #line 187 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp8_ = removed;
 #line 187 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (_tmp8_ != NULL) {
-#line 1894 "Branch.c"
+#line 1891 "Branch.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp9_ = NULL;
-			GeeIterator* _tmp10_ = NULL;
+			GeeIterable* _tmp9_;
+			GeeIterator* _tmp10_;
 #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_tmp9_ = removed;
 #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1903,13 +1900,13 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab
 			_object_it = _tmp10_;
 #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			while (TRUE) {
-#line 1907 "Branch.c"
-				GeeIterator* _tmp11_ = NULL;
-				gboolean _tmp12_ = FALSE;
+#line 1904 "Branch.c"
+				GeeIterator* _tmp11_;
+				gboolean _tmp12_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp13_ = NULL;
-				gpointer _tmp14_ = NULL;
-				DataObject* _tmp15_ = NULL;
+				GeeIterator* _tmp13_;
+				gpointer _tmp14_;
+				DataObject* _tmp15_;
 #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
 				_tmp11_ = _object_it;
 #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1918,7 +1915,7 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab
 				if (!_tmp12_) {
 #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
 					break;
-#line 1922 "Branch.c"
+#line 1919 "Branch.c"
 				}
 #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
 				_tmp13_ = _object_it;
@@ -1932,11 +1929,11 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab
 				events_branch_remove_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_EVENT, Event));
 #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
 				_g_object_unref0 (object);
-#line 1936 "Branch.c"
+#line 1933 "Branch.c"
 			}
 #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_g_object_unref0 (_object_it);
-#line 1940 "Branch.c"
+#line 1937 "Branch.c"
 		}
 	}
 }
@@ -1947,15 +1944,15 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
 #line 193 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 1951 "Branch.c"
+#line 1948 "Branch.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp0_ = altered;
 #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1974,21 +1971,21 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered
 		_object_it = _tmp5_;
 #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		while (TRUE) {
-#line 1978 "Branch.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 1975 "Branch.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			Event* event = NULL;
-			DataObject* _tmp10_ = NULL;
-			Event* _tmp11_ = NULL;
+			DataObject* _tmp10_;
+			Event* _tmp11_;
 			Alteration* alteration = NULL;
-			GeeMap* _tmp12_ = NULL;
-			DataObject* _tmp13_ = NULL;
-			gpointer _tmp14_ = NULL;
-			Alteration* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
+			GeeMap* _tmp12_;
+			DataObject* _tmp13_;
+			gpointer _tmp14_;
+			Alteration* _tmp15_;
+			gboolean _tmp16_;
 #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_tmp6_ = _object_it;
 #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1997,7 +1994,7 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered
 			if (!_tmp7_) {
 #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
 				break;
-#line 2001 "Branch.c"
+#line 1998 "Branch.c"
 			}
 #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_tmp8_ = _object_it;
@@ -2025,36 +2022,36 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered
 			_tmp16_ = alteration_has_detail (_tmp15_, "metadata", "time");
 #line 198 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			if (_tmp16_) {
-#line 2029 "Branch.c"
-				Event* _tmp17_ = NULL;
+#line 2026 "Branch.c"
+				Event* _tmp17_;
 #line 201 "/home/jens/Source/shotwell/src/events/Branch.vala"
 				_tmp17_ = event;
 #line 201 "/home/jens/Source/shotwell/src/events/Branch.vala"
 				events_branch_move_event (self, _tmp17_);
-#line 2035 "Branch.c"
+#line 2032 "Branch.c"
 			} else {
-				Alteration* _tmp18_ = NULL;
-				gboolean _tmp19_ = FALSE;
+				Alteration* _tmp18_;
+				gboolean _tmp19_;
 #line 202 "/home/jens/Source/shotwell/src/events/Branch.vala"
 				_tmp18_ = alteration;
 #line 202 "/home/jens/Source/shotwell/src/events/Branch.vala"
 				_tmp19_ = alteration_has_detail (_tmp18_, "metadata", "name");
 #line 202 "/home/jens/Source/shotwell/src/events/Branch.vala"
 				if (_tmp19_) {
-#line 2045 "Branch.c"
+#line 2042 "Branch.c"
 					EventsEventEntry* entry = NULL;
-					GeeHashMap* _tmp20_ = NULL;
-					Event* _tmp21_ = NULL;
-					gpointer _tmp22_ = NULL;
-					EventsEventEntry* _tmp23_ = NULL;
-					EventsEventEntry* _tmp24_ = NULL;
-					Event* _tmp25_ = NULL;
-					gchar* _tmp26_ = NULL;
-					gchar* _tmp27_ = NULL;
-					EventsEventEntry* _tmp28_ = NULL;
-					Event* _tmp29_ = NULL;
-					gchar* _tmp30_ = NULL;
-					gchar* _tmp31_ = NULL;
+					GeeHashMap* _tmp20_;
+					Event* _tmp21_;
+					gpointer _tmp22_;
+					EventsEventEntry* _tmp23_;
+					EventsEventEntry* _tmp24_;
+					Event* _tmp25_;
+					gchar* _tmp26_;
+					gchar* _tmp27_;
+					EventsEventEntry* _tmp28_;
+					Event* _tmp29_;
+					gchar* _tmp30_;
+					gchar* _tmp31_;
 #line 203 "/home/jens/Source/shotwell/src/events/Branch.vala"
 					_tmp20_ = self->priv->entry_map;
 #line 203 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2093,7 +2090,7 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered
 					_g_free0 (_tmp31_);
 #line 202 "/home/jens/Source/shotwell/src/events/Branch.vala"
 					_g_object_unref0 (entry);
-#line 2097 "Branch.c"
+#line 2094 "Branch.c"
 				}
 			}
 #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2102,21 +2099,21 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered
 			_g_object_unref0 (event);
 #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_g_object_unref0 (object);
-#line 2106 "Branch.c"
+#line 2103 "Branch.c"
 		}
 #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_g_object_unref0 (_object_it);
-#line 2110 "Branch.c"
+#line 2107 "Branch.c"
 	}
 }
 
 
 static void events_branch_on_no_event_collection_altered (EventsBranch* self) {
-	EventSourceCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	EventSourceCollection* _tmp0_;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 #line 212 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
 #line 213 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2133,22 +2130,22 @@ static void events_branch_on_no_event_collection_altered (EventsBranch* self) {
 	events_branch_show_no_events (self, _tmp4_ > 0);
 #line 213 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2137 "Branch.c"
+#line 2134 "Branch.c"
 }
 
 
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return;
-#line 2152 "Branch.c"
+#line 2149 "Branch.c"
 }
 
 
@@ -2157,53 +2154,53 @@ static gint _events_branch_event_comparator_gcompare_func (gconstpointer a, gcon
 	result = events_branch_event_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
 #line 229 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 2161 "Branch.c"
+#line 2158 "Branch.c"
 }
 
 
 static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* result = NULL;
 	gchar* buffer = NULL;
-	gchar* _tmp0_ = NULL;
-	gint buffer_length1 = 0;
-	gint _buffer_size_ = 0;
-	gchar* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	gint buffer_length1;
+	gint _buffer_size_;
+	gchar* _tmp1_;
+	gint _tmp1__length1;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
+#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2207 "Branch.c"
+#line 2204 "Branch.c"
 }
 
 
@@ -2212,34 +2209,34 @@ static gint _events_branch_event_month_comparator_gcompare_func (gconstpointer a
 	result = events_branch_event_month_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
 #line 237 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 2216 "Branch.c"
+#line 2213 "Branch.c"
 }
 
 
 static void events_branch_add_event (EventsBranch* self, Event* event) {
 	time_t event_time = 0;
-	Event* _tmp0_ = NULL;
-	time_t _tmp1_ = 0;
-	time_t _tmp2_ = 0;
+	Event* _tmp0_;
+	time_t _tmp1_;
+	time_t _tmp2_;
 	struct tm event_tm = {0};
-	time_t _tmp4_ = 0;
+	time_t _tmp4_;
 	struct tm _tmp5_ = {0};
 	SidebarEntry* year = NULL;
 	SidebarEntry* month = NULL;
-	Event* _tmp6_ = NULL;
-	struct tm _tmp7_ = {0};
+	Event* _tmp6_;
+	struct tm _tmp7_;
 	SidebarEntry* _tmp8_ = NULL;
-	SidebarEntry* _tmp9_ = NULL;
-	SidebarEntry* _tmp10_ = NULL;
-	SidebarEntry* _tmp13_ = NULL;
-	gchar* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-	struct tm _tmp23_ = {0};
-	EventsMonthDirectoryEntry* _tmp24_ = NULL;
-	SidebarEntry* _tmp25_ = NULL;
-	SidebarEntry* _tmp26_ = NULL;
-	SidebarEntry* _tmp27_ = NULL;
-	Event* _tmp28_ = NULL;
+	SidebarEntry* _tmp9_;
+	SidebarEntry* _tmp10_;
+	SidebarEntry* _tmp13_;
+	gchar* _tmp21_;
+	gchar* _tmp22_;
+	struct tm _tmp23_;
+	EventsMonthDirectoryEntry* _tmp24_;
+	SidebarEntry* _tmp25_;
+	SidebarEntry* _tmp26_;
+	SidebarEntry* _tmp27_;
+	Event* _tmp28_;
 #line 216 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
 #line 216 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2254,15 +2251,15 @@ static void events_branch_add_event (EventsBranch* self, Event* event) {
 	_tmp2_ = event_time;
 #line 218 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (_tmp2_ == ((time_t) 0)) {
-#line 2258 "Branch.c"
-		Event* _tmp3_ = NULL;
+#line 2255 "Branch.c"
+		Event* _tmp3_;
 #line 219 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp3_ = event;
 #line 219 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		events_branch_add_undated_event (self, _tmp3_);
 #line 221 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		return;
-#line 2266 "Branch.c"
+#line 2263 "Branch.c"
 	}
 #line 224 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp4_ = event_time;
@@ -2286,9 +2283,9 @@ static void events_branch_add_event (EventsBranch* self, Event* event) {
 	_tmp10_ = month;
 #line 228 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (_tmp10_ != NULL) {
-#line 2290 "Branch.c"
-		SidebarEntry* _tmp11_ = NULL;
-		Event* _tmp12_ = NULL;
+#line 2287 "Branch.c"
+		SidebarEntry* _tmp11_;
+		Event* _tmp12_;
 #line 229 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp11_ = month;
 #line 229 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2301,20 +2298,20 @@ static void events_branch_add_event (EventsBranch* self, Event* event) {
 		_g_object_unref0 (year);
 #line 231 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		return;
-#line 2305 "Branch.c"
+#line 2302 "Branch.c"
 	}
 #line 234 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp13_ = year;
 #line 234 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (_tmp13_ == NULL) {
-#line 2311 "Branch.c"
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		struct tm _tmp16_ = {0};
-		EventsYearDirectoryEntry* _tmp17_ = NULL;
-		SidebarEntry* _tmp18_ = NULL;
-		SidebarEntry* _tmp19_ = NULL;
-		SidebarEntry* _tmp20_ = NULL;
+#line 2308 "Branch.c"
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		struct tm _tmp16_;
+		EventsYearDirectoryEntry* _tmp17_;
+		SidebarEntry* _tmp18_;
+		SidebarEntry* _tmp19_;
+		SidebarEntry* _tmp20_;
 #line 235 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp14_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT);
 #line 235 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2339,7 +2336,7 @@ static void events_branch_add_event (EventsBranch* self, Event* event) {
 		sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp19_, _tmp20_, _events_branch_event_month_comparator_gcompare_func);
 #line 237 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_g_object_unref0 (_tmp19_);
-#line 2343 "Branch.c"
+#line 2340 "Branch.c"
 	}
 #line 240 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp21_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT);
@@ -2371,28 +2368,28 @@ static void events_branch_add_event (EventsBranch* self, Event* event) {
 	_g_object_unref0 (month);
 #line 216 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_g_object_unref0 (year);
-#line 2375 "Branch.c"
+#line 2372 "Branch.c"
 }
 
 
 static void events_branch_move_event (EventsBranch* self, Event* event) {
 	time_t event_time = 0;
-	Event* _tmp0_ = NULL;
-	time_t _tmp1_ = 0;
-	time_t _tmp2_ = 0;
+	Event* _tmp0_;
+	time_t _tmp1_;
+	time_t _tmp2_;
 	struct tm event_tm = {0};
-	time_t _tmp4_ = 0;
+	time_t _tmp4_;
 	struct tm _tmp5_ = {0};
 	SidebarEntry* year = NULL;
 	SidebarEntry* month = NULL;
-	Event* _tmp6_ = NULL;
-	struct tm _tmp7_ = {0};
+	Event* _tmp6_;
+	struct tm _tmp7_;
 	SidebarEntry* _tmp8_ = NULL;
-	SidebarEntry* _tmp9_ = NULL;
-	SidebarEntry* _tmp10_ = NULL;
-	SidebarEntry* _tmp18_ = NULL;
-	Event* _tmp25_ = NULL;
-	SidebarEntry* _tmp26_ = NULL;
+	SidebarEntry* _tmp9_;
+	SidebarEntry* _tmp10_;
+	SidebarEntry* _tmp18_;
+	Event* _tmp25_;
+	SidebarEntry* _tmp26_;
 #line 247 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
 #line 247 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2407,15 +2404,15 @@ static void events_branch_move_event (EventsBranch* self, Event* event) {
 	_tmp2_ = event_time;
 #line 249 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (_tmp2_ == ((time_t) 0)) {
-#line 2411 "Branch.c"
-		Event* _tmp3_ = NULL;
+#line 2408 "Branch.c"
+		Event* _tmp3_;
 #line 250 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp3_ = event;
 #line 250 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		events_branch_move_to_undated_event (self, _tmp3_);
 #line 252 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		return;
-#line 2419 "Branch.c"
+#line 2416 "Branch.c"
 	}
 #line 255 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp4_ = event_time;
@@ -2439,14 +2436,14 @@ static void events_branch_move_event (EventsBranch* self, Event* event) {
 	_tmp10_ = year;
 #line 260 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (_tmp10_ == NULL) {
-#line 2443 "Branch.c"
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		struct tm _tmp13_ = {0};
-		EventsYearDirectoryEntry* _tmp14_ = NULL;
-		SidebarEntry* _tmp15_ = NULL;
-		SidebarEntry* _tmp16_ = NULL;
-		SidebarEntry* _tmp17_ = NULL;
+#line 2440 "Branch.c"
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		struct tm _tmp13_;
+		EventsYearDirectoryEntry* _tmp14_;
+		SidebarEntry* _tmp15_;
+		SidebarEntry* _tmp16_;
+		SidebarEntry* _tmp17_;
 #line 261 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp11_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT);
 #line 261 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2471,19 +2468,19 @@ static void events_branch_move_event (EventsBranch* self, Event* event) {
 		sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp16_, _tmp17_, _events_branch_event_month_comparator_gcompare_func);
 #line 263 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_g_object_unref0 (_tmp16_);
-#line 2475 "Branch.c"
+#line 2472 "Branch.c"
 	}
 #line 266 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp18_ = month;
 #line 266 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (_tmp18_ == NULL) {
-#line 2481 "Branch.c"
-		gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		struct tm _tmp21_ = {0};
-		EventsMonthDirectoryEntry* _tmp22_ = NULL;
-		SidebarEntry* _tmp23_ = NULL;
-		SidebarEntry* _tmp24_ = NULL;
+#line 2478 "Branch.c"
+		gchar* _tmp19_;
+		gchar* _tmp20_;
+		struct tm _tmp21_;
+		EventsMonthDirectoryEntry* _tmp22_;
+		SidebarEntry* _tmp23_;
+		SidebarEntry* _tmp24_;
 #line 267 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp19_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT);
 #line 267 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2504,7 +2501,7 @@ static void events_branch_move_event (EventsBranch* self, Event* event) {
 		_tmp24_ = month;
 #line 269 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp23_, _tmp24_, _events_branch_event_comparator_gcompare_func);
-#line 2508 "Branch.c"
+#line 2505 "Branch.c"
 	}
 #line 272 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp25_ = event;
@@ -2516,23 +2513,23 @@ static void events_branch_move_event (EventsBranch* self, Event* event) {
 	_g_object_unref0 (month);
 #line 247 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_g_object_unref0 (year);
-#line 2520 "Branch.c"
+#line 2517 "Branch.c"
 }
 
 
 static void events_branch_remove_event (EventsBranch* self, Event* event) {
 	SidebarEntry* entry = NULL;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	Event* _tmp1_ = NULL;
+	GeeHashMap* _tmp0_;
+	Event* _tmp1_;
 	gpointer _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 	SidebarEntry* parent = NULL;
-	SidebarEntry* _tmp5_ = NULL;
-	SidebarEntry* _tmp6_ = NULL;
-	SidebarEntry* _tmp7_ = NULL;
-	SidebarEntry* _tmp8_ = NULL;
+	SidebarEntry* _tmp5_;
+	SidebarEntry* _tmp6_;
+	SidebarEntry* _tmp7_;
+	SidebarEntry* _tmp8_;
 #line 275 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
 #line 275 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2569,27 +2566,27 @@ static void events_branch_remove_event (EventsBranch* self, Event* event) {
 	sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp8_);
 #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	while (TRUE) {
-#line 2573 "Branch.c"
+#line 2570 "Branch.c"
 		gboolean _tmp9_ = FALSE;
-		SidebarEntry* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
+		SidebarEntry* _tmp10_;
+		gint _tmp11_;
 		SidebarEntry* grandparent = NULL;
-		SidebarEntry* _tmp15_ = NULL;
-		SidebarEntry* _tmp16_ = NULL;
-		SidebarEntry* _tmp17_ = NULL;
-		SidebarEntry* _tmp18_ = NULL;
-		SidebarEntry* _tmp19_ = NULL;
-		SidebarEntry* _tmp20_ = NULL;
+		SidebarEntry* _tmp15_;
+		SidebarEntry* _tmp16_;
+		SidebarEntry* _tmp17_;
+		SidebarEntry* _tmp18_;
+		SidebarEntry* _tmp19_;
+		SidebarEntry* _tmp20_;
 #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp10_ = parent;
 #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp11_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp10_);
 #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		if (_tmp11_ == 0) {
-#line 2590 "Branch.c"
-			SidebarEntry* _tmp12_ = NULL;
-			SidebarEntry* _tmp13_ = NULL;
-			SidebarEntry* _tmp14_ = NULL;
+#line 2587 "Branch.c"
+			SidebarEntry* _tmp12_;
+			SidebarEntry* _tmp13_;
+			SidebarEntry* _tmp14_;
 #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_tmp12_ = parent;
 #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2600,17 +2597,17 @@ static void events_branch_remove_event (EventsBranch* self, Event* event) {
 			_tmp9_ = _tmp12_ != _tmp14_;
 #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_g_object_unref0 (_tmp14_);
-#line 2604 "Branch.c"
+#line 2601 "Branch.c"
 		} else {
 #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_tmp9_ = FALSE;
-#line 2608 "Branch.c"
+#line 2605 "Branch.c"
 		}
 #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		if (!_tmp9_) {
 #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			break;
-#line 2614 "Branch.c"
+#line 2611 "Branch.c"
 		}
 #line 289 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp15_ = parent;
@@ -2636,13 +2633,13 @@ static void events_branch_remove_event (EventsBranch* self, Event* event) {
 		parent = _tmp20_;
 #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_g_object_unref0 (grandparent);
-#line 2640 "Branch.c"
+#line 2637 "Branch.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_g_object_unref0 (parent);
 #line 275 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_g_object_unref0 (entry);
-#line 2646 "Branch.c"
+#line 2643 "Branch.c"
 }
 
 
@@ -2651,7 +2648,7 @@ static Block8Data* block8_data_ref (Block8Data* _data8_) {
 	g_atomic_int_inc (&_data8_->_ref_count_);
 #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return _data8_;
-#line 2655 "Branch.c"
+#line 2652 "Branch.c"
 }
 
 
@@ -2660,7 +2657,7 @@ static void block8_data_unref (void * _userdata_) {
 	_data8_ = (Block8Data*) _userdata_;
 #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) {
-#line 2664 "Branch.c"
+#line 2661 "Branch.c"
 		EventsBranch* self;
 #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		self = _data8_->self;
@@ -2668,17 +2665,17 @@ static void block8_data_unref (void * _userdata_) {
 		_g_object_unref0 (self);
 #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		g_slice_free (Block8Data, _data8_);
-#line 2672 "Branch.c"
+#line 2669 "Branch.c"
 	}
 }
 
 
-static gboolean __lambda18_ (Block8Data* _data8_, SidebarEntry* entry) {
+static gboolean __lambda19_ (Block8Data* _data8_, SidebarEntry* entry) {
 	EventsBranch* self;
 	gboolean result = FALSE;
-	SidebarEntry* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	SidebarEntry* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = _data8_->self;
 #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2693,31 +2690,31 @@ static gboolean __lambda18_ (Block8Data* _data8_, SidebarEntry* entry) {
 	result = _tmp1_ == _tmp2_;
 #line 308 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 2697 "Branch.c"
+#line 2694 "Branch.c"
 }
 
 
-static gboolean ___lambda18__locator (gconstpointer item, gpointer self) {
+static gboolean ___lambda19__locator (gconstpointer item, gpointer self) {
 	gboolean result;
-	result = __lambda18_ (self, (SidebarEntry*) item);
+	result = __lambda19_ (self, (SidebarEntry*) item);
 #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 2706 "Branch.c"
+#line 2703 "Branch.c"
 }
 
 
-static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* event, struct tm* event_tm, SidebarEntry** found_year) {
+static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* event, struct tm* event_tm, SidebarEntry* * found_year) {
 	SidebarEntry* _vala_found_year = NULL;
 	SidebarEntry* result = NULL;
 	Block8Data* _data8_;
-	Event* _tmp0_ = NULL;
-	struct tm _tmp1_ = {0};
-	SidebarEntry* _tmp2_ = NULL;
-	SidebarEntry* _tmp3_ = NULL;
-	struct tm _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	SidebarEntry* _tmp6_ = NULL;
-	SidebarEntry* _tmp7_ = NULL;
+	Event* _tmp0_;
+	struct tm _tmp1_;
+	SidebarEntry* _tmp2_;
+	SidebarEntry* _tmp3_;
+	struct tm _tmp4_;
+	gint _tmp5_;
+	SidebarEntry* _tmp6_;
+	SidebarEntry* _tmp7_;
 #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL);
 #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2754,15 +2751,15 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event*
 		if (found_year) {
 #line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			*found_year = _vala_found_year;
-#line 2758 "Branch.c"
+#line 2755 "Branch.c"
 		} else {
 #line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_g_object_unref0 (_vala_found_year);
-#line 2762 "Branch.c"
+#line 2759 "Branch.c"
 		}
 #line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		return result;
-#line 2766 "Branch.c"
+#line 2763 "Branch.c"
 	}
 #line 304 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp4_ = *event_tm;
@@ -2773,7 +2770,7 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event*
 #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp6_ = _vala_found_year;
 #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp7_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp6_, ___lambda18__locator, _data8_);
+	_tmp7_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp6_, ___lambda19__locator, _data8_);
 #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	result = _tmp7_;
 #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2784,15 +2781,15 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event*
 	if (found_year) {
 #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		*found_year = _vala_found_year;
-#line 2788 "Branch.c"
+#line 2785 "Branch.c"
 	} else {
 #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_g_object_unref0 (_vala_found_year);
-#line 2792 "Branch.c"
+#line 2789 "Branch.c"
 	}
 #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 2796 "Branch.c"
+#line 2793 "Branch.c"
 }
 
 
@@ -2801,7 +2798,7 @@ static Block9Data* block9_data_ref (Block9Data* _data9_) {
 	g_atomic_int_inc (&_data9_->_ref_count_);
 #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return _data9_;
-#line 2805 "Branch.c"
+#line 2802 "Branch.c"
 }
 
 
@@ -2810,7 +2807,7 @@ static void block9_data_unref (void * _userdata_) {
 	_data9_ = (Block9Data*) _userdata_;
 #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) {
-#line 2814 "Branch.c"
+#line 2811 "Branch.c"
 		EventsBranch* self;
 #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		self = _data9_->self;
@@ -2818,17 +2815,17 @@ static void block9_data_unref (void * _userdata_) {
 		_g_object_unref0 (self);
 #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		g_slice_free (Block9Data, _data9_);
-#line 2822 "Branch.c"
+#line 2819 "Branch.c"
 	}
 }
 
 
-static gboolean __lambda17_ (Block9Data* _data9_, SidebarEntry* entry) {
+static gboolean __lambda18_ (Block9Data* _data9_, SidebarEntry* entry) {
 	EventsBranch* self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	SidebarEntry* _tmp2_ = NULL;
+	SidebarEntry* _tmp2_;
 #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = _data9_->self;
 #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2839,27 +2836,27 @@ static gboolean __lambda17_ (Block9Data* _data9_, SidebarEntry* entry) {
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) {
 #line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp1_ = TRUE;
-#line 2843 "Branch.c"
+#line 2840 "Branch.c"
 	} else {
-		SidebarEntry* _tmp3_ = NULL;
+		SidebarEntry* _tmp3_;
 #line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp3_ = entry;
 #line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, EVENTS_TYPE_NO_EVENT_ENTRY);
-#line 2850 "Branch.c"
+#line 2847 "Branch.c"
 	}
 #line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (_tmp1_) {
 #line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp0_ = TRUE;
-#line 2856 "Branch.c"
+#line 2853 "Branch.c"
 	} else {
-		SidebarEntry* _tmp4_ = NULL;
+		SidebarEntry* _tmp4_;
 #line 317 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp4_ = entry;
 #line 317 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY);
-#line 2863 "Branch.c"
+#line 2860 "Branch.c"
 	}
 #line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (_tmp0_) {
@@ -2867,10 +2864,10 @@ static gboolean __lambda17_ (Block9Data* _data9_, SidebarEntry* entry) {
 		result = FALSE;
 #line 318 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		return result;
-#line 2871 "Branch.c"
+#line 2868 "Branch.c"
 	} else {
-		SidebarEntry* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
+		SidebarEntry* _tmp5_;
+		gint _tmp6_;
 #line 320 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp5_ = entry;
 #line 320 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2879,29 +2876,29 @@ static gboolean __lambda17_ (Block9Data* _data9_, SidebarEntry* entry) {
 		result = _tmp6_ == _data9_->event_year;
 #line 320 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		return result;
-#line 2883 "Branch.c"
+#line 2880 "Branch.c"
 	}
 }
 
 
-static gboolean ___lambda17__locator (gconstpointer item, gpointer self) {
+static gboolean ___lambda18__locator (gconstpointer item, gpointer self) {
 	gboolean result;
-	result = __lambda17_ (self, (SidebarEntry*) item);
+	result = __lambda18_ (self, (SidebarEntry*) item);
 #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 2893 "Branch.c"
+#line 2890 "Branch.c"
 }
 
 
 static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm) {
 	SidebarEntry* result = NULL;
 	Block9Data* _data9_;
-	struct tm _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	SidebarEntry* _tmp2_ = NULL;
-	SidebarEntry* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	SidebarEntry* _tmp5_ = NULL;
+	struct tm _tmp0_;
+	gint _tmp1_;
+	SidebarEntry* _tmp2_;
+	SidebarEntry* _tmp3_;
+	SidebarEntry* _tmp4_;
+	SidebarEntry* _tmp5_;
 #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL);
 #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2925,7 +2922,7 @@ static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* e
 #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp3_ = _tmp2_;
 #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp4_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, ___lambda17__locator, _data9_);
+	_tmp4_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, ___lambda18__locator, _data9_);
 #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp5_ = _tmp4_;
 #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2938,7 +2935,7 @@ static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* e
 	_data9_ = NULL;
 #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 2942 "Branch.c"
+#line 2939 "Branch.c"
 }
 
 
@@ -2947,15 +2944,15 @@ static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer
 	result = events_branch_undated_event_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
 #line 326 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 2951 "Branch.c"
+#line 2948 "Branch.c"
 }
 
 
 static void events_branch_add_undated_event (EventsBranch* self, Event* event) {
-	EventsUndatedDirectoryEntry* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	EventsUndatedDirectoryEntry* _tmp5_ = NULL;
-	Event* _tmp6_ = NULL;
+	EventsUndatedDirectoryEntry* _tmp0_;
+	gboolean _tmp1_;
+	EventsUndatedDirectoryEntry* _tmp5_;
+	Event* _tmp6_;
 #line 324 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
 #line 324 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2966,10 +2963,10 @@ static void events_branch_add_undated_event (EventsBranch* self, Event* event) {
 	_tmp1_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 325 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (!_tmp1_) {
-#line 2970 "Branch.c"
-		SidebarEntry* _tmp2_ = NULL;
-		SidebarEntry* _tmp3_ = NULL;
-		EventsUndatedDirectoryEntry* _tmp4_ = NULL;
+#line 2967 "Branch.c"
+		SidebarEntry* _tmp2_;
+		SidebarEntry* _tmp3_;
+		EventsUndatedDirectoryEntry* _tmp4_;
 #line 326 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
 #line 326 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2980,7 +2977,7 @@ static void events_branch_add_undated_event (EventsBranch* self, Event* event) {
 		sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _events_branch_undated_event_comparator_gcompare_func);
 #line 326 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2984 "Branch.c"
+#line 2981 "Branch.c"
 	}
 #line 328 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp5_ = self->priv->undated_entry;
@@ -2988,15 +2985,15 @@ static void events_branch_add_undated_event (EventsBranch* self, Event* event) {
 	_tmp6_ = event;
 #line 328 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	events_branch_graft_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp6_, NULL);
-#line 2992 "Branch.c"
+#line 2989 "Branch.c"
 }
 
 
 static void events_branch_move_to_undated_event (EventsBranch* self, Event* event) {
-	EventsUndatedDirectoryEntry* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	Event* _tmp5_ = NULL;
-	EventsUndatedDirectoryEntry* _tmp6_ = NULL;
+	EventsUndatedDirectoryEntry* _tmp0_;
+	gboolean _tmp1_;
+	Event* _tmp5_;
+	EventsUndatedDirectoryEntry* _tmp6_;
 #line 331 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
 #line 331 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3007,10 +3004,10 @@ static void events_branch_move_to_undated_event (EventsBranch* self, Event* even
 	_tmp1_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 332 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (!_tmp1_) {
-#line 3011 "Branch.c"
-		SidebarEntry* _tmp2_ = NULL;
-		SidebarEntry* _tmp3_ = NULL;
-		EventsUndatedDirectoryEntry* _tmp4_ = NULL;
+#line 3008 "Branch.c"
+		SidebarEntry* _tmp2_;
+		SidebarEntry* _tmp3_;
+		EventsUndatedDirectoryEntry* _tmp4_;
 #line 333 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
 #line 333 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3021,7 +3018,7 @@ static void events_branch_move_to_undated_event (EventsBranch* self, Event* even
 		sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
 #line 333 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_g_object_unref0 (_tmp3_);
-#line 3025 "Branch.c"
+#line 3022 "Branch.c"
 	}
 #line 335 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp5_ = event;
@@ -3029,18 +3026,18 @@ static void events_branch_move_to_undated_event (EventsBranch* self, Event* even
 	_tmp6_ = self->priv->undated_entry;
 #line 335 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	events_branch_reparent_event (self, _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 3033 "Branch.c"
+#line 3030 "Branch.c"
 }
 
 
 static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent, Event* event, GCompareFunc comparator) {
 	EventsEventEntry* entry = NULL;
-	Event* _tmp0_ = NULL;
-	EventsEventEntry* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
-	Event* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	GCompareFunc _tmp5_ = NULL;
+	Event* _tmp0_;
+	EventsEventEntry* _tmp1_;
+	GeeHashMap* _tmp2_;
+	Event* _tmp3_;
+	SidebarEntry* _tmp4_;
+	GCompareFunc _tmp5_;
 #line 338 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
 #line 338 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3067,22 +3064,22 @@ static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent,
 	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp5_);
 #line 338 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_g_object_unref0 (entry);
-#line 3071 "Branch.c"
+#line 3068 "Branch.c"
 }
 
 
 static void events_branch_reparent_event (EventsBranch* self, Event* event, SidebarEntry* new_parent) {
 	EventsEventEntry* entry = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	Event* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	EventsEventEntry* _tmp3_ = NULL;
+	GeeHashMap* _tmp0_;
+	Event* _tmp1_;
+	gpointer _tmp2_;
+	EventsEventEntry* _tmp3_;
 	SidebarEntry* old_parent = NULL;
-	EventsEventEntry* _tmp4_ = NULL;
-	SidebarEntry* _tmp5_ = NULL;
-	SidebarEntry* _tmp6_ = NULL;
-	SidebarEntry* _tmp7_ = NULL;
-	EventsEventEntry* _tmp8_ = NULL;
+	EventsEventEntry* _tmp4_;
+	SidebarEntry* _tmp5_;
+	SidebarEntry* _tmp6_;
+	SidebarEntry* _tmp7_;
+	EventsEventEntry* _tmp8_;
 #line 346 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
 #line 346 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3119,27 +3116,27 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side
 	sidebar_branch_reparent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	while (TRUE) {
-#line 3123 "Branch.c"
+#line 3120 "Branch.c"
 		gboolean _tmp9_ = FALSE;
-		SidebarEntry* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
+		SidebarEntry* _tmp10_;
+		gint _tmp11_;
 		SidebarEntry* grandparent = NULL;
-		SidebarEntry* _tmp15_ = NULL;
-		SidebarEntry* _tmp16_ = NULL;
-		SidebarEntry* _tmp17_ = NULL;
-		SidebarEntry* _tmp18_ = NULL;
-		SidebarEntry* _tmp19_ = NULL;
-		SidebarEntry* _tmp20_ = NULL;
+		SidebarEntry* _tmp15_;
+		SidebarEntry* _tmp16_;
+		SidebarEntry* _tmp17_;
+		SidebarEntry* _tmp18_;
+		SidebarEntry* _tmp19_;
+		SidebarEntry* _tmp20_;
 #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp10_ = old_parent;
 #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp11_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp10_);
 #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		if (_tmp11_ == 0) {
-#line 3140 "Branch.c"
-			SidebarEntry* _tmp12_ = NULL;
-			SidebarEntry* _tmp13_ = NULL;
-			SidebarEntry* _tmp14_ = NULL;
+#line 3137 "Branch.c"
+			SidebarEntry* _tmp12_;
+			SidebarEntry* _tmp13_;
+			SidebarEntry* _tmp14_;
 #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_tmp12_ = old_parent;
 #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3150,17 +3147,17 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side
 			_tmp9_ = _tmp12_ != _tmp14_;
 #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_g_object_unref0 (_tmp14_);
-#line 3154 "Branch.c"
+#line 3151 "Branch.c"
 		} else {
 #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_tmp9_ = FALSE;
-#line 3158 "Branch.c"
+#line 3155 "Branch.c"
 		}
 #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		if (!_tmp9_) {
 #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			break;
-#line 3164 "Branch.c"
+#line 3161 "Branch.c"
 		}
 #line 356 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp15_ = old_parent;
@@ -3186,46 +3183,46 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side
 		old_parent = _tmp20_;
 #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_g_object_unref0 (grandparent);
-#line 3190 "Branch.c"
+#line 3187 "Branch.c"
 	}
 #line 346 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_g_object_unref0 (old_parent);
 #line 346 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_g_object_unref0 (entry);
-#line 3196 "Branch.c"
+#line 3193 "Branch.c"
 }
 
 
 static void events_branch_show_no_events (EventsBranch* self, gboolean show) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 365 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
 #line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp1_ = show;
 #line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (_tmp1_) {
-#line 3209 "Branch.c"
-		EventsNoEventEntry* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+#line 3206 "Branch.c"
+		EventsNoEventEntry* _tmp2_;
+		gboolean _tmp3_;
 #line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp2_ = self->priv->no_event_entry;
 #line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp3_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp0_ = !_tmp3_;
-#line 3218 "Branch.c"
+#line 3215 "Branch.c"
 	} else {
 #line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp0_ = FALSE;
-#line 3222 "Branch.c"
+#line 3219 "Branch.c"
 	}
 #line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (_tmp0_) {
-#line 3226 "Branch.c"
-		SidebarEntry* _tmp4_ = NULL;
-		SidebarEntry* _tmp5_ = NULL;
-		EventsNoEventEntry* _tmp6_ = NULL;
+#line 3223 "Branch.c"
+		SidebarEntry* _tmp4_;
+		SidebarEntry* _tmp5_;
+		EventsNoEventEntry* _tmp6_;
 #line 367 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp4_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
 #line 367 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3236,48 +3233,48 @@ static void events_branch_show_no_events (EventsBranch* self, gboolean show) {
 		sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
 #line 367 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_g_object_unref0 (_tmp5_);
-#line 3240 "Branch.c"
+#line 3237 "Branch.c"
 	} else {
 		gboolean _tmp7_ = FALSE;
-		gboolean _tmp8_ = FALSE;
+		gboolean _tmp8_;
 #line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp8_ = show;
 #line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		if (!_tmp8_) {
-#line 3248 "Branch.c"
-			EventsNoEventEntry* _tmp9_ = NULL;
-			gboolean _tmp10_ = FALSE;
+#line 3245 "Branch.c"
+			EventsNoEventEntry* _tmp9_;
+			gboolean _tmp10_;
 #line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_tmp9_ = self->priv->no_event_entry;
 #line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_tmp10_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_tmp7_ = _tmp10_;
-#line 3257 "Branch.c"
+#line 3254 "Branch.c"
 		} else {
 #line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_tmp7_ = FALSE;
-#line 3261 "Branch.c"
+#line 3258 "Branch.c"
 		}
 #line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		if (_tmp7_) {
-#line 3265 "Branch.c"
-			EventsNoEventEntry* _tmp11_ = NULL;
+#line 3262 "Branch.c"
+			EventsNoEventEntry* _tmp11_;
 #line 369 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_tmp11_ = self->priv->no_event_entry;
 #line 369 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 3271 "Branch.c"
+#line 3268 "Branch.c"
 		}
 	}
 }
 
 
 static void events_branch_class_init (EventsBranchClass * klass) {
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 7 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	events_branch_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3300,15 +3297,15 @@ static void events_branch_class_init (EventsBranchClass * klass) {
 	_tmp3_ = g_strdup (RESOURCES_ICON_NO_EVENT);
 #line 11 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	events_branch_no_event_icon = _tmp3_;
-#line 3304 "Branch.c"
+#line 3301 "Branch.c"
 }
 
 
 static void events_branch_instance_init (EventsBranch * self) {
-	GeeHashMap* _tmp0_ = NULL;
-	EventsUndatedDirectoryEntry* _tmp1_ = NULL;
-	EventsNoEventEntry* _tmp2_ = NULL;
-	EventsMasterDirectoryEntry* _tmp3_ = NULL;
+	GeeHashMap* _tmp0_;
+	EventsUndatedDirectoryEntry* _tmp1_;
+	EventsNoEventEntry* _tmp2_;
+	EventsMasterDirectoryEntry* _tmp3_;
 #line 7 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self->priv = EVENTS_BRANCH_GET_PRIVATE (self);
 #line 18 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3327,21 +3324,21 @@ static void events_branch_instance_init (EventsBranch * self) {
 	_tmp3_ = events_master_directory_entry_new ();
 #line 22 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self->priv->all_events_entry = _tmp3_;
-#line 3331 "Branch.c"
+#line 3328 "Branch.c"
 }
 
 
-static void events_branch_finalize (GObject* obj) {
+static void events_branch_finalize (GObject * obj) {
 	EventsBranch * self;
-	EventSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	EventSourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	EventSourceCollection* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	ConfigFacade* _tmp6_ = NULL;
-	ConfigFacade* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
+	EventSourceCollection* _tmp0_;
+	guint _tmp1_;
+	EventSourceCollection* _tmp2_;
+	guint _tmp3_;
+	EventSourceCollection* _tmp4_;
+	guint _tmp5_;
+	ConfigFacade* _tmp6_;
+	ConfigFacade* _tmp7_;
+	guint _tmp8_;
 #line 7 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_BRANCH, EventsBranch);
 #line 46 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3382,7 +3379,7 @@ static void events_branch_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->all_events_entry);
 #line 7 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	G_OBJECT_CLASS (events_branch_parent_class)->finalize (obj);
-#line 3386 "Branch.c"
+#line 3383 "Branch.c"
 }
 
 
@@ -3404,15 +3401,15 @@ EventsDirectoryEntry* events_directory_entry_construct (GType object_type) {
 	self = (EventsDirectoryEntry*) sidebar_simple_page_entry_construct (object_type);
 #line 374 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return self;
-#line 3408 "Branch.c"
+#line 3405 "Branch.c"
 }
 
 
 static gchar* events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
 	EventsDirectoryEntry * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 377 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_DIRECTORY_ENTRY, EventsDirectoryEntry);
 #line 378 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3423,7 +3420,7 @@ static gchar* events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEnt
 	result = _tmp1_;
 #line 378 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 3427 "Branch.c"
+#line 3424 "Branch.c"
 }
 
 
@@ -3436,7 +3433,7 @@ static gboolean events_directory_entry_real_expand_on_select (SidebarExpandableE
 	result = TRUE;
 #line 382 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 3440 "Branch.c"
+#line 3437 "Branch.c"
 }
 
 
@@ -3444,8 +3441,8 @@ static void events_directory_entry_class_init (EventsDirectoryEntryClass * klass
 #line 373 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	events_directory_entry_parent_class = g_type_class_peek_parent (klass);
 #line 373 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) events_directory_entry_real_get_sidebar_icon;
-#line 3449 "Branch.c"
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_directory_entry_real_get_sidebar_icon;
+#line 3446 "Branch.c"
 }
 
 
@@ -3453,8 +3450,8 @@ static void events_directory_entry_sidebar_expandable_entry_interface_init (Side
 #line 373 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	events_directory_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 373 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	iface->expand_on_select = (gboolean (*)(SidebarExpandableEntry*)) events_directory_entry_real_expand_on_select;
-#line 3458 "Branch.c"
+	iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) events_directory_entry_real_expand_on_select;
+#line 3455 "Branch.c"
 }
 
 
@@ -3482,21 +3479,21 @@ EventsMasterDirectoryEntry* events_master_directory_entry_construct (GType objec
 	self = (EventsMasterDirectoryEntry*) events_directory_entry_construct (object_type);
 #line 387 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return self;
-#line 3486 "Branch.c"
+#line 3483 "Branch.c"
 }
 
 
 EventsMasterDirectoryEntry* events_master_directory_entry_new (void) {
 #line 387 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return events_master_directory_entry_construct (EVENTS_TYPE_MASTER_DIRECTORY_ENTRY);
-#line 3493 "Branch.c"
+#line 3490 "Branch.c"
 }
 
 
 static gchar* events_master_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	EventsMasterDirectoryEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 390 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY, EventsMasterDirectoryEntry);
 #line 391 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3505,15 +3502,15 @@ static gchar* events_master_directory_entry_real_get_sidebar_name (SidebarSimple
 	result = _tmp0_;
 #line 391 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 3509 "Branch.c"
+#line 3506 "Branch.c"
 }
 
 
 static gchar* events_master_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
 	EventsMasterDirectoryEntry * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 394 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY, EventsMasterDirectoryEntry);
 #line 395 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3524,14 +3521,14 @@ static gchar* events_master_directory_entry_real_get_sidebar_icon (SidebarSimple
 	result = _tmp1_;
 #line 395 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 3528 "Branch.c"
+#line 3525 "Branch.c"
 }
 
 
 static Page* events_master_directory_entry_real_create_page (SidebarSimplePageEntry* base) {
 	EventsMasterDirectoryEntry * self;
 	Page* result = NULL;
-	MasterEventsDirectoryPage* _tmp0_ = NULL;
+	MasterEventsDirectoryPage* _tmp0_;
 #line 398 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY, EventsMasterDirectoryEntry);
 #line 399 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3542,7 +3539,7 @@ static Page* events_master_directory_entry_real_create_page (SidebarSimplePageEn
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
 #line 399 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 3546 "Branch.c"
+#line 3543 "Branch.c"
 }
 
 
@@ -3550,12 +3547,12 @@ static void events_master_directory_entry_class_init (EventsMasterDirectoryEntry
 #line 386 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	events_master_directory_entry_parent_class = g_type_class_peek_parent (klass);
 #line 386 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_master_directory_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_get_sidebar_name;
 #line 386 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) events_master_directory_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_get_sidebar_icon;
 #line 386 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_master_directory_entry_real_create_page;
-#line 3559 "Branch.c"
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_create_page;
+#line 3556 "Branch.c"
 }
 
 
@@ -3577,9 +3574,9 @@ GType events_master_directory_entry_get_type (void) {
 
 EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm) {
 	EventsYearDirectoryEntry * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	struct tm _tmp2_ = {0};
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	struct tm _tmp2_;
 #line 407 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 407 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3600,22 +3597,22 @@ EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_ty
 	self->priv->tm = _tmp2_;
 #line 407 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return self;
-#line 3604 "Branch.c"
+#line 3601 "Branch.c"
 }
 
 
 EventsYearDirectoryEntry* events_year_directory_entry_new (const gchar* name, struct tm* tm) {
 #line 407 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return events_year_directory_entry_construct (EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, name, tm);
-#line 3611 "Branch.c"
+#line 3608 "Branch.c"
 }
 
 
 static gchar* events_year_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	EventsYearDirectoryEntry * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 412 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry);
 #line 413 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3626,14 +3623,14 @@ static gchar* events_year_directory_entry_real_get_sidebar_name (SidebarSimplePa
 	result = _tmp1_;
 #line 413 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 3630 "Branch.c"
+#line 3627 "Branch.c"
 }
 
 
 gint events_year_directory_entry_get_year (EventsYearDirectoryEntry* self) {
 	gint result = 0;
-	struct tm _tmp0_ = {0};
-	gint _tmp1_ = 0;
+	struct tm _tmp0_;
+	gint _tmp1_;
 #line 416 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_val_if_fail (EVENTS_IS_YEAR_DIRECTORY_ENTRY (self), 0);
 #line 417 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3644,15 +3641,15 @@ gint events_year_directory_entry_get_year (EventsYearDirectoryEntry* self) {
 	result = _tmp1_ + 1900;
 #line 417 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 3648 "Branch.c"
+#line 3645 "Branch.c"
 }
 
 
 static Page* events_year_directory_entry_real_create_page (SidebarSimplePageEntry* base) {
 	EventsYearDirectoryEntry * self;
 	Page* result = NULL;
-	struct tm _tmp0_ = {0};
-	SubEventsDirectoryPage* _tmp1_ = NULL;
+	struct tm _tmp0_;
+	SubEventsDirectoryPage* _tmp1_;
 #line 420 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry);
 #line 421 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3665,7 +3662,7 @@ static Page* events_year_directory_entry_real_create_page (SidebarSimplePageEntr
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
 #line 421 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 3669 "Branch.c"
+#line 3666 "Branch.c"
 }
 
 
@@ -3675,23 +3672,23 @@ static void events_year_directory_entry_class_init (EventsYearDirectoryEntryClas
 #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_type_class_add_private (klass, sizeof (EventsYearDirectoryEntryPrivate));
 #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_year_directory_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_year_directory_entry_real_get_sidebar_name;
 #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_year_directory_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_year_directory_entry_real_create_page;
 #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = events_year_directory_entry_finalize;
-#line 3684 "Branch.c"
+#line 3681 "Branch.c"
 }
 
 
 static void events_year_directory_entry_instance_init (EventsYearDirectoryEntry * self) {
 #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self->priv = EVENTS_YEAR_DIRECTORY_ENTRY_GET_PRIVATE (self);
-#line 3691 "Branch.c"
+#line 3688 "Branch.c"
 }
 
 
-static void events_year_directory_entry_finalize (GObject* obj) {
+static void events_year_directory_entry_finalize (GObject * obj) {
 	EventsYearDirectoryEntry * self;
 #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry);
@@ -3699,7 +3696,7 @@ static void events_year_directory_entry_finalize (GObject* obj) {
 	_g_free0 (self->priv->name);
 #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	G_OBJECT_CLASS (events_year_directory_entry_parent_class)->finalize (obj);
-#line 3703 "Branch.c"
+#line 3700 "Branch.c"
 }
 
 
@@ -3717,9 +3714,9 @@ GType events_year_directory_entry_get_type (void) {
 
 EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm) {
 	EventsMonthDirectoryEntry * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	struct tm _tmp2_ = {0};
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	struct tm _tmp2_;
 #line 429 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 429 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3740,22 +3737,22 @@ EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_
 	self->priv->tm = _tmp2_;
 #line 429 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return self;
-#line 3744 "Branch.c"
+#line 3741 "Branch.c"
 }
 
 
 EventsMonthDirectoryEntry* events_month_directory_entry_new (const gchar* name, struct tm* tm) {
 #line 429 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return events_month_directory_entry_construct (EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, name, tm);
-#line 3751 "Branch.c"
+#line 3748 "Branch.c"
 }
 
 
 static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	EventsMonthDirectoryEntry * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 434 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry);
 #line 435 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3766,14 +3763,14 @@ static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimpleP
 	result = _tmp1_;
 #line 435 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 3770 "Branch.c"
+#line 3767 "Branch.c"
 }
 
 
 gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self) {
 	gint result = 0;
-	struct tm _tmp0_ = {0};
-	gint _tmp1_ = 0;
+	struct tm _tmp0_;
+	gint _tmp1_;
 #line 438 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_val_if_fail (EVENTS_IS_MONTH_DIRECTORY_ENTRY (self), 0);
 #line 439 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3784,14 +3781,14 @@ gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self) {
 	result = _tmp1_ + 1900;
 #line 439 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 3788 "Branch.c"
+#line 3785 "Branch.c"
 }
 
 
 gint events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self) {
 	gint result = 0;
-	struct tm _tmp0_ = {0};
-	gint _tmp1_ = 0;
+	struct tm _tmp0_;
+	gint _tmp1_;
 #line 442 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_val_if_fail (EVENTS_IS_MONTH_DIRECTORY_ENTRY (self), 0);
 #line 443 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3802,15 +3799,15 @@ gint events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self) {
 	result = _tmp1_ + 1;
 #line 443 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 3806 "Branch.c"
+#line 3803 "Branch.c"
 }
 
 
 static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEntry* base) {
 	EventsMonthDirectoryEntry * self;
 	Page* result = NULL;
-	struct tm _tmp0_ = {0};
-	SubEventsDirectoryPage* _tmp1_ = NULL;
+	struct tm _tmp0_;
+	SubEventsDirectoryPage* _tmp1_;
 #line 446 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry);
 #line 447 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3823,7 +3820,7 @@ static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEnt
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
 #line 447 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 3827 "Branch.c"
+#line 3824 "Branch.c"
 }
 
 
@@ -3833,23 +3830,23 @@ static void events_month_directory_entry_class_init (EventsMonthDirectoryEntryCl
 #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_type_class_add_private (klass, sizeof (EventsMonthDirectoryEntryPrivate));
 #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_month_directory_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_month_directory_entry_real_get_sidebar_name;
 #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_month_directory_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_month_directory_entry_real_create_page;
 #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = events_month_directory_entry_finalize;
-#line 3842 "Branch.c"
+#line 3839 "Branch.c"
 }
 
 
 static void events_month_directory_entry_instance_init (EventsMonthDirectoryEntry * self) {
 #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self->priv = EVENTS_MONTH_DIRECTORY_ENTRY_GET_PRIVATE (self);
-#line 3849 "Branch.c"
+#line 3846 "Branch.c"
 }
 
 
-static void events_month_directory_entry_finalize (GObject* obj) {
+static void events_month_directory_entry_finalize (GObject * obj) {
 	EventsMonthDirectoryEntry * self;
 #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry);
@@ -3857,7 +3854,7 @@ static void events_month_directory_entry_finalize (GObject* obj) {
 	_g_free0 (self->priv->name);
 #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	G_OBJECT_CLASS (events_month_directory_entry_parent_class)->finalize (obj);
-#line 3861 "Branch.c"
+#line 3858 "Branch.c"
 }
 
 
@@ -3879,21 +3876,21 @@ EventsUndatedDirectoryEntry* events_undated_directory_entry_construct (GType obj
 	self = (EventsUndatedDirectoryEntry*) events_directory_entry_construct (object_type);
 #line 452 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return self;
-#line 3883 "Branch.c"
+#line 3880 "Branch.c"
 }
 
 
 EventsUndatedDirectoryEntry* events_undated_directory_entry_new (void) {
 #line 452 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return events_undated_directory_entry_construct (EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY);
-#line 3890 "Branch.c"
+#line 3887 "Branch.c"
 }
 
 
 static gchar* events_undated_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	EventsUndatedDirectoryEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 455 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY, EventsUndatedDirectoryEntry);
 #line 456 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3902,7 +3899,7 @@ static gchar* events_undated_directory_entry_real_get_sidebar_name (SidebarSimpl
 	result = _tmp0_;
 #line 456 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 3906 "Branch.c"
+#line 3903 "Branch.c"
 }
 
 
@@ -3910,7 +3907,7 @@ static Page* events_undated_directory_entry_real_create_page (SidebarSimplePageE
 	EventsUndatedDirectoryEntry * self;
 	Page* result = NULL;
 	struct tm _tmp0_ = {0};
-	SubEventsDirectoryPage* _tmp1_ = NULL;
+	SubEventsDirectoryPage* _tmp1_;
 #line 459 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY, EventsUndatedDirectoryEntry);
 #line 460 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3923,7 +3920,7 @@ static Page* events_undated_directory_entry_real_create_page (SidebarSimplePageE
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
 #line 460 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 3927 "Branch.c"
+#line 3924 "Branch.c"
 }
 
 
@@ -3931,10 +3928,10 @@ static void events_undated_directory_entry_class_init (EventsUndatedDirectoryEnt
 #line 451 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	events_undated_directory_entry_parent_class = g_type_class_peek_parent (klass);
 #line 451 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_undated_directory_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_undated_directory_entry_real_get_sidebar_name;
 #line 451 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_undated_directory_entry_real_create_page;
-#line 3938 "Branch.c"
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_undated_directory_entry_real_create_page;
+#line 3935 "Branch.c"
 }
 
 
@@ -3956,8 +3953,8 @@ GType events_undated_directory_entry_get_type (void) {
 
 EventsEventEntry* events_event_entry_construct (GType object_type, Event* event) {
 	EventsEventEntry * self = NULL;
-	Event* _tmp0_ = NULL;
-	Event* _tmp1_ = NULL;
+	Event* _tmp0_;
+	Event* _tmp1_;
 #line 469 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_val_if_fail (IS_EVENT (event), NULL);
 #line 469 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3972,21 +3969,21 @@ EventsEventEntry* events_event_entry_construct (GType object_type, Event* event)
 	self->priv->event = _tmp1_;
 #line 469 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return self;
-#line 3976 "Branch.c"
+#line 3973 "Branch.c"
 }
 
 
 EventsEventEntry* events_event_entry_new (Event* event) {
 #line 469 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return events_event_entry_construct (EVENTS_TYPE_EVENT_ENTRY, event);
-#line 3983 "Branch.c"
+#line 3980 "Branch.c"
 }
 
 
 Event* events_event_entry_get_event (EventsEventEntry* self) {
 	Event* result = NULL;
-	Event* _tmp0_ = NULL;
-	Event* _tmp1_ = NULL;
+	Event* _tmp0_;
+	Event* _tmp1_;
 #line 473 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_val_if_fail (EVENTS_IS_EVENT_ENTRY (self), NULL);
 #line 474 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3997,15 +3994,15 @@ Event* events_event_entry_get_event (EventsEventEntry* self) {
 	result = _tmp1_;
 #line 474 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 4001 "Branch.c"
+#line 3998 "Branch.c"
 }
 
 
 static gchar* events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	EventsEventEntry * self;
 	gchar* result = NULL;
-	Event* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	Event* _tmp0_;
+	gchar* _tmp1_;
 #line 477 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
 #line 478 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4016,15 +4013,15 @@ static gchar* events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry*
 	result = _tmp1_;
 #line 478 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 4020 "Branch.c"
+#line 4017 "Branch.c"
 }
 
 
 static gchar* events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
 	EventsEventEntry * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 481 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
 #line 482 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4035,15 +4032,15 @@ static gchar* events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry*
 	result = _tmp1_;
 #line 482 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 4039 "Branch.c"
+#line 4036 "Branch.c"
 }
 
 
 static Page* events_event_entry_real_create_page (SidebarSimplePageEntry* base) {
 	EventsEventEntry * self;
 	Page* result = NULL;
-	Event* _tmp0_ = NULL;
-	EventPage* _tmp1_ = NULL;
+	Event* _tmp0_;
+	EventPage* _tmp1_;
 #line 485 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
 #line 486 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4056,7 +4053,7 @@ static Page* events_event_entry_real_create_page (SidebarSimplePageEntry* base)
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
 #line 486 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 4060 "Branch.c"
+#line 4057 "Branch.c"
 }
 
 
@@ -4069,16 +4066,16 @@ static gboolean events_event_entry_real_is_user_renameable (SidebarRenameableEnt
 	result = TRUE;
 #line 490 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 4073 "Branch.c"
+#line 4070 "Branch.c"
 }
 
 
 static void events_event_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) {
 	EventsEventEntry * self;
 	gchar* prepped = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
 #line 493 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
 #line 493 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4093,13 +4090,13 @@ static void events_event_entry_real_rename (SidebarRenameableEntry* base, const
 	_tmp2_ = prepped;
 #line 495 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	if (_tmp2_ != NULL) {
-#line 4097 "Branch.c"
-		CommandManager* _tmp3_ = NULL;
-		CommandManager* _tmp4_ = NULL;
-		Event* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-		RenameEventCommand* _tmp7_ = NULL;
-		RenameEventCommand* _tmp8_ = NULL;
+#line 4094 "Branch.c"
+		CommandManager* _tmp3_;
+		CommandManager* _tmp4_;
+		Event* _tmp5_;
+		const gchar* _tmp6_;
+		RenameEventCommand* _tmp7_;
+		RenameEventCommand* _tmp8_;
 #line 496 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp3_ = app_window_get_command_manager ();
 #line 496 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4118,11 +4115,11 @@ static void events_event_entry_real_rename (SidebarRenameableEntry* base, const
 		_g_object_unref0 (_tmp8_);
 #line 496 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_command_manager_unref0 (_tmp4_);
-#line 4122 "Branch.c"
+#line 4119 "Branch.c"
 	}
 #line 493 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_g_free0 (prepped);
-#line 4126 "Branch.c"
+#line 4123 "Branch.c"
 }
 
 
@@ -4130,13 +4127,13 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
 	EventsEventEntry * self;
 	gboolean result = FALSE;
 	GeeArrayList* views = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	CommandManager* _tmp16_ = NULL;
-	CommandManager* _tmp17_ = NULL;
-	GeeArrayList* _tmp18_ = NULL;
-	Event* _tmp19_ = NULL;
-	SetEventCommand* _tmp20_ = NULL;
-	SetEventCommand* _tmp21_ = NULL;
+	GeeArrayList* _tmp0_;
+	CommandManager* _tmp16_;
+	CommandManager* _tmp17_;
+	GeeArrayList* _tmp18_;
+	Event* _tmp19_;
+	SetEventCommand* _tmp20_;
+	SetEventCommand* _tmp21_;
 #line 499 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
 #line 499 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4145,15 +4142,15 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
 	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 502 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	views = _tmp0_;
-#line 4149 "Branch.c"
+#line 4146 "Branch.c"
 	{
 		GeeList* _media_source_list = NULL;
-		GeeList* _tmp1_ = NULL;
-		GeeList* _tmp2_ = NULL;
+		GeeList* _tmp1_;
+		GeeList* _tmp2_;
 		gint _media_source_size = 0;
-		GeeList* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+		GeeList* _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
 		gint _media_source_index = 0;
 #line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_tmp1_ = media;
@@ -4173,18 +4170,18 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
 		_media_source_index = -1;
 #line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		while (TRUE) {
-#line 4177 "Branch.c"
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
+#line 4174 "Branch.c"
+			gint _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 			MediaSource* media_source = NULL;
-			GeeList* _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			gpointer _tmp11_ = NULL;
-			GeeArrayList* _tmp12_ = NULL;
-			MediaSource* _tmp13_ = NULL;
-			DataView* _tmp14_ = NULL;
-			DataView* _tmp15_ = NULL;
+			GeeList* _tmp9_;
+			gint _tmp10_;
+			gpointer _tmp11_;
+			GeeArrayList* _tmp12_;
+			MediaSource* _tmp13_;
+			DataView* _tmp14_;
+			DataView* _tmp15_;
 #line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_tmp6_ = _media_source_index;
 #line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4197,7 +4194,7 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
 			if (!(_tmp7_ < _tmp8_)) {
 #line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
 				break;
-#line 4201 "Branch.c"
+#line 4198 "Branch.c"
 			}
 #line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_tmp9_ = _media_source_list;
@@ -4221,11 +4218,11 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
 			_g_object_unref0 (_tmp15_);
 #line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
 			_g_object_unref0 (media_source);
-#line 4225 "Branch.c"
+#line 4222 "Branch.c"
 		}
 #line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
 		_g_object_unref0 (_media_source_list);
-#line 4229 "Branch.c"
+#line 4226 "Branch.c"
 	}
 #line 506 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	_tmp16_ = app_window_get_command_manager ();
@@ -4251,7 +4248,7 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
 	_g_object_unref0 (views);
 #line 508 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 4255 "Branch.c"
+#line 4252 "Branch.c"
 }
 
 
@@ -4266,7 +4263,7 @@ static gboolean events_event_entry_real_internal_drop_received_arbitrary (Sideba
 	result = FALSE;
 #line 512 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 4270 "Branch.c"
+#line 4267 "Branch.c"
 }
 
 
@@ -4276,14 +4273,14 @@ static void events_event_entry_class_init (EventsEventEntryClass * klass) {
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_type_class_add_private (klass, sizeof (EventsEventEntryPrivate));
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_event_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_event_entry_real_get_sidebar_name;
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) events_event_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_event_entry_real_get_sidebar_icon;
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_event_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_event_entry_real_create_page;
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = events_event_entry_finalize;
-#line 4287 "Branch.c"
+#line 4284 "Branch.c"
 }
 
 
@@ -4291,10 +4288,10 @@ static void events_event_entry_sidebar_renameable_entry_interface_init (SidebarR
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	events_event_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	iface->is_user_renameable = (gboolean (*)(SidebarRenameableEntry*)) events_event_entry_real_is_user_renameable;
+	iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) events_event_entry_real_is_user_renameable;
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	iface->rename = (void (*)(SidebarRenameableEntry*, const gchar*)) events_event_entry_real_rename;
-#line 4298 "Branch.c"
+	iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) events_event_entry_real_rename;
+#line 4295 "Branch.c"
 }
 
 
@@ -4302,21 +4299,21 @@ static void events_event_entry_sidebar_internal_drop_target_entry_interface_init
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	events_event_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) events_event_entry_real_internal_drop_received;
+	iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) events_event_entry_real_internal_drop_received;
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) events_event_entry_real_internal_drop_received_arbitrary;
-#line 4309 "Branch.c"
+	iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) events_event_entry_real_internal_drop_received_arbitrary;
+#line 4306 "Branch.c"
 }
 
 
 static void events_event_entry_instance_init (EventsEventEntry * self) {
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self->priv = EVENTS_EVENT_ENTRY_GET_PRIVATE (self);
-#line 4316 "Branch.c"
+#line 4313 "Branch.c"
 }
 
 
-static void events_event_entry_finalize (GObject* obj) {
+static void events_event_entry_finalize (GObject * obj) {
 	EventsEventEntry * self;
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
@@ -4324,7 +4321,7 @@ static void events_event_entry_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->event);
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	G_OBJECT_CLASS (events_event_entry_parent_class)->finalize (obj);
-#line 4328 "Branch.c"
+#line 4325 "Branch.c"
 }
 
 
@@ -4350,21 +4347,21 @@ EventsNoEventEntry* events_no_event_entry_construct (GType object_type) {
 	self = (EventsNoEventEntry*) sidebar_simple_page_entry_construct (object_type);
 #line 518 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return self;
-#line 4354 "Branch.c"
+#line 4351 "Branch.c"
 }
 
 
 EventsNoEventEntry* events_no_event_entry_new (void) {
 #line 518 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return events_no_event_entry_construct (EVENTS_TYPE_NO_EVENT_ENTRY);
-#line 4361 "Branch.c"
+#line 4358 "Branch.c"
 }
 
 
 static gchar* events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	EventsNoEventEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 521 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_NO_EVENT_ENTRY, EventsNoEventEntry);
 #line 522 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4373,15 +4370,15 @@ static gchar* events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntr
 	result = _tmp0_;
 #line 522 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 4377 "Branch.c"
+#line 4374 "Branch.c"
 }
 
 
 static gchar* events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
 	EventsNoEventEntry * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 525 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_NO_EVENT_ENTRY, EventsNoEventEntry);
 #line 526 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4392,14 +4389,14 @@ static gchar* events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntr
 	result = _tmp1_;
 #line 526 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 4396 "Branch.c"
+#line 4393 "Branch.c"
 }
 
 
 static Page* events_no_event_entry_real_create_page (SidebarSimplePageEntry* base) {
 	EventsNoEventEntry * self;
 	Page* result = NULL;
-	NoEventPage* _tmp0_ = NULL;
+	NoEventPage* _tmp0_;
 #line 529 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_NO_EVENT_ENTRY, EventsNoEventEntry);
 #line 530 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4410,7 +4407,7 @@ static Page* events_no_event_entry_real_create_page (SidebarSimplePageEntry* bas
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
 #line 530 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	return result;
-#line 4414 "Branch.c"
+#line 4411 "Branch.c"
 }
 
 
@@ -4418,12 +4415,12 @@ static void events_no_event_entry_class_init (EventsNoEventEntryClass * klass) {
 #line 517 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	events_no_event_entry_parent_class = g_type_class_peek_parent (klass);
 #line 517 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_no_event_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_get_sidebar_name;
 #line 517 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) events_no_event_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_get_sidebar_icon;
 #line 517 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_no_event_entry_real_create_page;
-#line 4427 "Branch.c"
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_create_page;
+#line 4424 "Branch.c"
 }
 
 
diff --git a/src/events/EventDirectoryItem.c b/src/events/EventDirectoryItem.c
index b32db57..fd09328 100644
--- a/src/events/EventDirectoryItem.c
+++ b/src/events/EventDirectoryItem.c
@@ -1,4 +1,4 @@
-/* EventDirectoryItem.c generated by valac 0.34.7, the Vala compiler
+/* EventDirectoryItem.c generated by valac 0.36.6, the Vala compiler
  * generated from EventDirectoryItem.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -18,6 +18,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gee.h>
 #include <pango/pango.h>
+#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 
 
@@ -198,6 +199,8 @@ typedef struct _MediaSourceClass MediaSourceClass;
 
 #define PHOTO_TYPE_EXCEPTION (photo_exception_get_type ())
 
+#define THUMBNAIL_CACHE_TYPE_SIZE (thumbnail_cache_size_get_type ())
+
 #define TYPE_PHOTO_SOURCE (photo_source_get_type ())
 #define PHOTO_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_SOURCE, PhotoSource))
 #define PHOTO_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO_SOURCE, PhotoSourceClass))
@@ -229,8 +232,6 @@ typedef struct _LibraryPhoto LibraryPhoto;
 typedef struct _LibraryPhotoClass LibraryPhotoClass;
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
-#define THUMBNAIL_CACHE_TYPE_SIZE (thumbnail_cache_size_get_type ())
-
 struct _DataObject {
 	GObject parent_instance;
 	DataObjectPrivate * priv;
@@ -339,6 +340,7 @@ typedef enum  {
 	PHOTO_EXCEPTION_ALL = 0xFFFFFFFFLL
 } PhotoException;
 
+typedef void (*ThumbnailCacheAsyncFetchCallback) (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, void* user_data);
 typedef enum  {
 	THUMBNAIL_CACHE_SIZE_LARGEST = 360,
 	THUMBNAIL_CACHE_SIZE_BIG = 360,
@@ -410,11 +412,16 @@ GType photo_exception_get_type (void) G_GNUC_CONST;
 void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result);
 static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, GdkRectangle* paul_lynde, GError** error);
 GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, Scaling* scaling, GError** error);
-void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result);
+void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, gint scale, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable);
+GType thumbnail_cache_size_get_type (void) G_GNUC_CONST;
+#define THUMBNAIL_CACHE_DEFAULT_INTERP GDK_INTERP_HYPER
+static void ___lambda17_ (void);
+static void ____lambda17__thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self);
 GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
 GType library_photo_get_type (void) G_GNUC_CONST;
 GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error);
+void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result);
 void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* result);
 gboolean media_source_collection_has_photo (GeeCollection* media);
 GeeCollection* event_source_get_media (EventSource* self);
@@ -444,49 +451,48 @@ void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gd
 gboolean is_string_empty (const gchar* s);
 void checkerboard_item_clear_comment (CheckerboardItem* self);
 void checkerboard_item_set_comment (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment);
-GType thumbnail_cache_size_get_type (void) G_GNUC_CONST;
 gint thumbnail_cache_size_get_scale (ThumbnailCacheSize self);
-static void event_directory_item_finalize (GObject* obj);
+static void event_directory_item_finalize (GObject * obj);
 static void _vala_event_directory_item_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 
 
 static void _event_directory_item_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 39 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	event_directory_item_on_events_altered ((EventDirectoryItem*) self, items);
-#line 457 "EventDirectoryItem.c"
+#line 463 "EventDirectoryItem.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 26 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 464 "EventDirectoryItem.c"
+#line 470 "EventDirectoryItem.c"
 }
 
 
 EventDirectoryItem* event_directory_item_construct (GType object_type, Event* event) {
 	EventDirectoryItem * self = NULL;
-	Event* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	Event* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	Dimensions _tmp5_ = {0};
-	Event* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	Event* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	Event* _tmp12_ = NULL;
-	Event* _tmp13_ = NULL;
-	Event* _tmp14_ = NULL;
-	MediaSource* _tmp15_ = NULL;
-	MediaSource* _tmp16_ = NULL;
+	Event* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	Event* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	Event* _tmp12_;
+	Event* _tmp13_;
+	Event* _tmp14_;
+	MediaSource* _tmp15_;
+	MediaSource* _tmp16_;
 	GdkRectangle _tmp17_ = {0};
-	GdkRectangle _tmp18_ = {0};
+	GdkRectangle _tmp18_;
 	Dimensions _tmp19_ = {0};
-	EventSourceCollection* _tmp20_ = NULL;
+	EventSourceCollection* _tmp20_;
 #line 22 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_return_val_if_fail (IS_EVENT (event), NULL);
 #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -551,41 +557,41 @@ EventDirectoryItem* event_directory_item_construct (GType object_type, Event* ev
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_directory_item_on_events_altered_data_collection_items_altered, self, 0);
 #line 22 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	return self;
-#line 555 "EventDirectoryItem.c"
+#line 561 "EventDirectoryItem.c"
 }
 
 
 EventDirectoryItem* event_directory_item_new (Event* event) {
 #line 22 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	return event_directory_item_construct (TYPE_EVENT_DIRECTORY_ITEM, event);
-#line 562 "EventDirectoryItem.c"
+#line 568 "EventDirectoryItem.c"
 }
 
 
 static void event_directory_item_get_paul_lynde_rect (MediaSource* source, GdkRectangle* result) {
 	Dimensions scaled = {0};
-	MediaSource* _tmp0_ = NULL;
+	MediaSource* _tmp0_;
 	Dimensions _tmp1_ = {0};
 	Dimensions _tmp2_ = {0};
 	GdkRectangle paul_lynde = {0};
-	Dimensions _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	Dimensions _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	Dimensions _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	Dimensions _tmp14_ = {0};
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
+	Dimensions _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	Dimensions _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	Dimensions _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	Dimensions _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
 #line 43 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (source));
 #line 44 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -646,633 +652,750 @@ static void event_directory_item_get_paul_lynde_rect (MediaSource* source, GdkRe
 	*result = paul_lynde;
 #line 52 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	return;
-#line 650 "EventDirectoryItem.c"
+#line 656 "EventDirectoryItem.c"
+}
+
+
+static void ___lambda17_ (void) {
+}
+
+
+static void ____lambda17__thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self) {
+#line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	___lambda17_ ();
+#line 667 "EventDirectoryItem.c"
+}
+
+
+static gpointer _g_error_copy0 (gpointer self) {
+#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	return self ? g_error_copy (self) : NULL;
+#line 674 "EventDirectoryItem.c"
 }
 
 
 static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, GdkRectangle* paul_lynde, GError** error) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* pixbuf = NULL;
-	MediaSource* _tmp0_ = NULL;
-	Scaling _tmp1_ = {0};
-	GdkPixbuf* _tmp2_ = NULL;
 	Dimensions thumbnail_dimensions = {0};
-	GdkPixbuf* _tmp3_ = NULL;
-	Dimensions _tmp4_ = {0};
-	gboolean _tmp5_ = FALSE;
-	Dimensions _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	GdkRectangle _tmp23_ = {0};
-	Dimensions _tmp24_ = {0};
-	GdkRectangle _tmp25_ = {0};
-	GdkPixbuf* _tmp26_ = NULL;
-	GdkRectangle _tmp27_ = {0};
-	gint _tmp28_ = 0;
-	GdkRectangle _tmp29_ = {0};
-	gint _tmp30_ = 0;
-	GdkRectangle _tmp31_ = {0};
-	gint _tmp32_ = 0;
-	GdkRectangle _tmp33_ = {0};
-	gint _tmp34_ = 0;
-	GdkPixbuf* _tmp35_ = NULL;
+	GdkPixbuf* _tmp17_;
+	Dimensions _tmp18_ = {0};
+	gboolean _tmp19_ = FALSE;
+	Dimensions _tmp20_;
+	gint _tmp21_;
+	GdkRectangle _tmp22_;
+	gint _tmp23_;
+	GdkRectangle _tmp37_;
+	Dimensions _tmp38_;
+	GdkRectangle _tmp39_ = {0};
+	GdkPixbuf* _tmp40_;
+	GdkRectangle _tmp41_;
+	gint _tmp42_;
+	GdkRectangle _tmp43_;
+	gint _tmp44_;
+	GdkRectangle _tmp45_;
+	gint _tmp46_;
+	GdkRectangle _tmp47_;
+	gint _tmp48_;
+	GdkPixbuf* _tmp49_;
 	GError * _inner_error_ = NULL;
 #line 56 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (media), NULL);
 #line 56 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_return_val_if_fail (paul_lynde != NULL, NULL);
-#line 57 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp0_ = media;
-#line 57 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp1_ = event_directory_item_squared_scaling;
-#line 57 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp2_ = media_source_get_preview_pixbuf (_tmp0_, &_tmp1_, &_inner_error_);
-#line 57 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	pixbuf = _tmp2_;
-#line 57 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 57 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		g_propagate_error (error, _inner_error_);
-#line 57 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		return NULL;
-#line 700 "EventDirectoryItem.c"
-	}
+#line 707 "EventDirectoryItem.c"
+	{
+		GdkPixbuf* _tmp0_ = NULL;
+		MediaSource* _tmp1_;
+		Scaling _tmp2_;
+		GdkPixbuf* _tmp3_;
+		GdkPixbuf* _tmp4_;
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp1_ = media;
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp2_ = event_directory_item_squared_scaling;
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp3_ = media_source_get_preview_pixbuf (_tmp1_, &_tmp2_, &_inner_error_);
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp0_ = _tmp3_;
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 724 "EventDirectoryItem.c"
+			goto __catch52_g_error;
+		}
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp4_ = _tmp0_;
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp0_ = NULL;
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_g_object_unref0 (pixbuf);
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		pixbuf = _tmp4_;
 #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp3_ = pixbuf;
+		_g_object_unref0 (_tmp0_);
+#line 737 "EventDirectoryItem.c"
+	}
+	goto __finally52;
+	__catch52_g_error:
+	{
+		GError* _error_ = NULL;
+		MediaSource* _tmp5_;
+		Dimensions _tmp6_ = {0};
+		MediaSource* _tmp7_;
 #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	dimensions_for_pixbuf (_tmp3_, &_tmp4_);
+		_error_ = _inner_error_;
 #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	thumbnail_dimensions = _tmp4_;
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp6_ = thumbnail_dimensions;
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp7_ = _tmp6_.width;
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp8_ = *paul_lynde;
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp9_ = _tmp8_.width;
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	if (_tmp7_ > (2 * _tmp9_)) {
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp5_ = TRUE;
-#line 720 "EventDirectoryItem.c"
-	} else {
-		Dimensions _tmp10_ = {0};
-		gint _tmp11_ = 0;
-		GdkRectangle _tmp12_ = {0};
-		gint _tmp13_ = 0;
-#line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp10_ = thumbnail_dimensions;
-#line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp11_ = _tmp10_.height;
+		_inner_error_ = NULL;
 #line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp12_ = *paul_lynde;
+		_tmp5_ = media;
 #line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp13_ = _tmp12_.height;
+		dimensions_init (&_tmp6_, (gint) THUMBNAIL_CACHE_SIZE_BIG, (gint) THUMBNAIL_CACHE_SIZE_BIG);
 #line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp5_ = _tmp11_ > (_tmp13_ * 2);
-#line 736 "EventDirectoryItem.c"
+		thumbnail_cache_fetch_async_scaled (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_BIG, &_tmp6_, THUMBNAIL_CACHE_DEFAULT_INTERP, ____lambda17__thumbnail_cache_async_fetch_callback, NULL, NULL);
+#line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp7_ = media;
+#line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO)) {
+#line 760 "EventDirectoryItem.c"
+			LibraryPhoto* photo = NULL;
+			MediaSource* _tmp8_;
+			LibraryPhoto* _tmp9_;
+			GdkPixbuf* _tmp10_ = NULL;
+			LibraryPhoto* _tmp11_;
+			Scaling _tmp12_;
+			GdkPixbuf* _tmp13_;
+			GdkPixbuf* _tmp14_;
+#line 66 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_tmp8_ = media;
+#line 66 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
+#line 66 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			photo = _tmp9_;
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_tmp11_ = photo;
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_tmp12_ = event_directory_item_squared_scaling;
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_tmp13_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp12_, &_inner_error_);
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_tmp10_ = _tmp13_;
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+				_g_object_unref0 (photo);
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+				_g_error_free0 (_error_);
+#line 789 "EventDirectoryItem.c"
+				goto __finally52;
+			}
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_tmp14_ = _tmp10_;
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_tmp10_ = NULL;
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_g_object_unref0 (pixbuf);
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			pixbuf = _tmp14_;
+#line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_g_object_unref0 (_tmp10_);
+#line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_g_object_unref0 (photo);
+#line 804 "EventDirectoryItem.c"
+		} else {
+			GError* _tmp15_;
+			GError* _tmp16_;
+#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_tmp15_ = _error_;
+#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_tmp16_ = _g_error_copy0 (_tmp15_);
+#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_inner_error_ = _tmp16_;
+#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_g_error_free0 (_error_);
+#line 816 "EventDirectoryItem.c"
+			goto __finally52;
+		}
+#line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_g_error_free0 (_error_);
+#line 821 "EventDirectoryItem.c"
+	}
+	__finally52:
+#line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		g_propagate_error (error, _inner_error_);
+#line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_g_object_unref0 (pixbuf);
+#line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		return NULL;
+#line 832 "EventDirectoryItem.c"
 	}
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	if (_tmp5_) {
-#line 740 "EventDirectoryItem.c"
+#line 73 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp17_ = pixbuf;
+#line 73 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	dimensions_for_pixbuf (_tmp17_, &_tmp18_);
+#line 73 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	thumbnail_dimensions = _tmp18_;
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp20_ = thumbnail_dimensions;
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp21_ = _tmp20_.width;
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp22_ = *paul_lynde;
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp23_ = _tmp22_.width;
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	if (_tmp21_ > (2 * _tmp23_)) {
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp19_ = TRUE;
+#line 852 "EventDirectoryItem.c"
+	} else {
+		Dimensions _tmp24_;
+		gint _tmp25_;
+		GdkRectangle _tmp26_;
+		gint _tmp27_;
+#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp24_ = thumbnail_dimensions;
+#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp25_ = _tmp24_.height;
+#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp26_ = *paul_lynde;
+#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp27_ = _tmp26_.height;
+#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp19_ = _tmp25_ > (_tmp27_ * 2);
+#line 868 "EventDirectoryItem.c"
+	}
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	if (_tmp19_) {
+#line 872 "EventDirectoryItem.c"
 		LibraryPhoto* photo = NULL;
-		MediaSource* _tmp14_ = NULL;
-		LibraryPhoto* _tmp15_ = NULL;
-		GdkPixbuf* _tmp16_ = NULL;
-		LibraryPhoto* _tmp17_ = NULL;
-		Scaling _tmp18_ = {0};
-		GdkPixbuf* _tmp19_ = NULL;
-		GdkPixbuf* _tmp20_ = NULL;
-		GdkPixbuf* _tmp21_ = NULL;
-		Dimensions _tmp22_ = {0};
-#line 63 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp14_ = media;
-#line 63 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 63 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		photo = _tmp15_;
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp17_ = photo;
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp18_ = event_directory_item_squared_scaling;
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp19_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp18_, &_inner_error_);
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp16_ = _tmp19_;
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		MediaSource* _tmp28_;
+		LibraryPhoto* _tmp29_;
+		GdkPixbuf* _tmp30_ = NULL;
+		LibraryPhoto* _tmp31_;
+		Scaling _tmp32_;
+		GdkPixbuf* _tmp33_;
+		GdkPixbuf* _tmp34_;
+		GdkPixbuf* _tmp35_;
+		Dimensions _tmp36_ = {0};
+#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp28_ = media;
+#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
+#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		photo = _tmp29_;
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp31_ = photo;
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp32_ = event_directory_item_squared_scaling;
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp33_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp32_, &_inner_error_);
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp30_ = _tmp33_;
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			g_propagate_error (error, _inner_error_);
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_g_object_unref0 (photo);
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_g_object_unref0 (pixbuf);
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			return NULL;
-#line 775 "EventDirectoryItem.c"
+#line 907 "EventDirectoryItem.c"
 		}
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp20_ = _tmp16_;
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp16_ = NULL;
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp34_ = _tmp30_;
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp30_ = NULL;
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_object_unref0 (pixbuf);
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		pixbuf = _tmp20_;
-#line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp21_ = pixbuf;
-#line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		dimensions_for_pixbuf (_tmp21_, &_tmp22_);
-#line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		thumbnail_dimensions = _tmp22_;
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_g_object_unref0 (_tmp16_);
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		pixbuf = _tmp34_;
+#line 79 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp35_ = pixbuf;
+#line 79 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		dimensions_for_pixbuf (_tmp35_, &_tmp36_);
+#line 79 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		thumbnail_dimensions = _tmp36_;
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_g_object_unref0 (_tmp30_);
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_object_unref0 (photo);
-#line 795 "EventDirectoryItem.c"
+#line 927 "EventDirectoryItem.c"
 	}
-#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp23_ = *paul_lynde;
-#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp24_ = thumbnail_dimensions;
-#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	clamp_rectangle (&_tmp23_, &_tmp24_, &_tmp25_);
-#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	*paul_lynde = _tmp25_;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp26_ = pixbuf;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp27_ = *paul_lynde;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp28_ = _tmp27_.x;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp29_ = *paul_lynde;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp30_ = _tmp29_.y;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp31_ = *paul_lynde;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp32_ = _tmp31_.width;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp33_ = *paul_lynde;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp34_ = _tmp33_.height;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp35_ = gdk_pixbuf_new_subpixbuf (_tmp26_, _tmp28_, _tmp30_, _tmp32_, _tmp34_);
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	result = _tmp35_;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp37_ = *paul_lynde;
+#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp38_ = thumbnail_dimensions;
+#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	clamp_rectangle (&_tmp37_, &_tmp38_, &_tmp39_);
+#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	*paul_lynde = _tmp39_;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp40_ = pixbuf;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp41_ = *paul_lynde;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp42_ = _tmp41_.x;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp43_ = *paul_lynde;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp44_ = _tmp43_.y;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp45_ = *paul_lynde;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp46_ = _tmp45_.width;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp47_ = *paul_lynde;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp48_ = _tmp47_.height;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp49_ = gdk_pixbuf_new_subpixbuf (_tmp40_, _tmp42_, _tmp44_, _tmp46_, _tmp48_);
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	result = _tmp49_;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_g_object_unref0 (pixbuf);
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	return result;
-#line 831 "EventDirectoryItem.c"
+#line 963 "EventDirectoryItem.c"
 }
 
 
 static gchar* event_directory_item_get_formatted_title (Event* event) {
 	gchar* result = NULL;
 	gboolean has_photos = FALSE;
-	Event* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	Event* _tmp0_;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 	gboolean has_videos = FALSE;
-	Event* _tmp5_ = NULL;
-	GeeCollection* _tmp6_ = NULL;
-	GeeCollection* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_ = FALSE;
+	Event* _tmp5_;
+	GeeCollection* _tmp6_;
+	GeeCollection* _tmp7_;
+	gboolean _tmp8_;
+	gboolean _tmp9_;
 	gint count = 0;
-	Event* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
+	Event* _tmp10_;
+	gint _tmp11_;
 	gchar* count_text = NULL;
-	gchar* _tmp12_ = NULL;
+	gchar* _tmp12_;
 	gboolean _tmp13_ = FALSE;
-	gboolean _tmp14_ = FALSE;
+	gboolean _tmp14_;
 	gchar* daterange = NULL;
-	Event* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
+	Event* _tmp26_;
+	gchar* _tmp27_;
 	gchar* name = NULL;
-	Event* _tmp31_ = NULL;
-	gchar* _tmp32_ = NULL;
-	gboolean _tmp33_ = FALSE;
-	const gchar* _tmp34_ = NULL;
-#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	Event* _tmp28_;
+	gchar* _tmp29_;
+	gboolean _tmp30_ = FALSE;
+	const gchar* _tmp31_;
+#line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_return_val_if_fail (IS_EVENT (event), NULL);
-#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp0_ = event;
-#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp1_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource));
-#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp2_ = _tmp1_;
-#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp3_ = media_source_collection_has_photo (_tmp2_);
-#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp4_ = _tmp3_;
-#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_g_object_unref0 (_tmp2_);
-#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	has_photos = _tmp4_;
-#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp5_ = event;
-#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp6_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_EVENT_SOURCE, EventSource));
-#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp7_ = _tmp6_;
-#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp8_ = media_source_collection_has_video (_tmp7_);
-#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp9_ = _tmp8_;
-#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_g_object_unref0 (_tmp7_);
-#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	has_videos = _tmp9_;
-#line 80 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp10_ = event;
-#line 80 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp11_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_EVENT_SOURCE, EventSource));
-#line 80 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	count = _tmp11_;
-#line 81 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp12_ = g_strdup ("");
-#line 81 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	count_text = _tmp12_;
-#line 82 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp14_ = has_photos;
-#line 82 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	if (_tmp14_) {
-#line 908 "EventDirectoryItem.c"
-		gboolean _tmp15_ = FALSE;
-#line 82 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 1040 "EventDirectoryItem.c"
+		gboolean _tmp15_;
+#line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp15_ = has_videos;
-#line 82 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp13_ = _tmp15_;
-#line 914 "EventDirectoryItem.c"
+#line 1046 "EventDirectoryItem.c"
 	} else {
-#line 82 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp13_ = FALSE;
-#line 918 "EventDirectoryItem.c"
+#line 1050 "EventDirectoryItem.c"
 	}
-#line 82 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	if (_tmp13_) {
-#line 922 "EventDirectoryItem.c"
-		gint _tmp16_ = 0;
-		const gchar* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		gchar* _tmp19_ = NULL;
-#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 1054 "EventDirectoryItem.c"
+		gint _tmp16_;
+		gint _tmp17_;
+		gchar* _tmp18_;
+#line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp16_ = count;
-#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp17_ = ngettext ("%d Photo/Video", "%d Photos/Videos", (gulong) _tmp16_);
-#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp18_ = count;
-#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp19_ = g_strdup_printf (_tmp17_, _tmp18_);
-#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp17_ = count;
+#line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp18_ = g_strdup_printf (ngettext ("%d Photo/Video", "%d Photos/Videos", (gulong) _tmp16_), _tmp17_);
+#line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_free0 (count_text);
-#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		count_text = _tmp19_;
-#line 939 "EventDirectoryItem.c"
+#line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		count_text = _tmp18_;
+#line 1068 "EventDirectoryItem.c"
 	} else {
-		gboolean _tmp20_ = FALSE;
-#line 84 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp20_ = has_videos;
-#line 84 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		if (_tmp20_) {
-#line 946 "EventDirectoryItem.c"
-			gint _tmp21_ = 0;
-			const gchar* _tmp22_ = NULL;
-			gint _tmp23_ = 0;
-			gchar* _tmp24_ = NULL;
-#line 85 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		gboolean _tmp19_;
+#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp19_ = has_videos;
+#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		if (_tmp19_) {
+#line 1075 "EventDirectoryItem.c"
+			gint _tmp20_;
+			gint _tmp21_;
+			gchar* _tmp22_;
+#line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_tmp20_ = count;
+#line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_tmp21_ = count;
-#line 85 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-			_tmp22_ = ngettext ("%d Video", "%d Videos", (gulong) _tmp21_);
-#line 85 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-			_tmp23_ = count;
-#line 85 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-			_tmp24_ = g_strdup_printf (_tmp22_, _tmp23_);
-#line 85 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_tmp22_ = g_strdup_printf (ngettext ("%d Video", "%d Videos", (gulong) _tmp20_), _tmp21_);
+#line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_g_free0 (count_text);
-#line 85 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-			count_text = _tmp24_;
-#line 963 "EventDirectoryItem.c"
+#line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			count_text = _tmp22_;
+#line 1089 "EventDirectoryItem.c"
 		} else {
-			gint _tmp25_ = 0;
-			const gchar* _tmp26_ = NULL;
-			gint _tmp27_ = 0;
-			gchar* _tmp28_ = NULL;
-#line 87 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-			_tmp25_ = count;
-#line 87 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-			_tmp26_ = ngettext ("%d Photo", "%d Photos", (gulong) _tmp25_);
-#line 87 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-			_tmp27_ = count;
-#line 87 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-			_tmp28_ = g_strdup_printf (_tmp26_, _tmp27_);
-#line 87 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			gint _tmp23_;
+			gint _tmp24_;
+			gchar* _tmp25_;
+#line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_tmp23_ = count;
+#line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_tmp24_ = count;
+#line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			_tmp25_ = g_strdup_printf (ngettext ("%d Photo", "%d Photos", (gulong) _tmp23_), _tmp24_);
+#line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_g_free0 (count_text);
-#line 87 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-			count_text = _tmp28_;
-#line 981 "EventDirectoryItem.c"
+#line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			count_text = _tmp25_;
+#line 1104 "EventDirectoryItem.c"
 		}
 	}
-#line 89 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp29_ = event;
-#line 89 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp30_ = event_get_formatted_daterange (_tmp29_);
-#line 89 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	daterange = _tmp30_;
-#line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp31_ = event;
-#line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp32_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject));
-#line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	name = _tmp32_;
-#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	_tmp34_ = daterange;
-#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	if (_tmp34_ == NULL) {
-#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp33_ = TRUE;
-#line 1002 "EventDirectoryItem.c"
+#line 103 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp26_ = event;
+#line 103 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp27_ = event_get_formatted_daterange (_tmp26_);
+#line 103 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	daterange = _tmp27_;
+#line 104 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp28_ = event;
+#line 104 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp29_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject));
+#line 104 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	name = _tmp29_;
+#line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	_tmp31_ = daterange;
+#line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	if (_tmp31_ == NULL) {
+#line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp30_ = TRUE;
+#line 1125 "EventDirectoryItem.c"
 	} else {
-		const gchar* _tmp35_ = NULL;
-		const gchar* _tmp36_ = NULL;
-#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp35_ = daterange;
-#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp36_ = name;
-#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp33_ = g_strcmp0 (_tmp35_, _tmp36_) == 0;
-#line 1012 "EventDirectoryItem.c"
+		const gchar* _tmp32_;
+		const gchar* _tmp33_;
+#line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp32_ = daterange;
+#line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp33_ = name;
+#line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp30_ = g_strcmp0 (_tmp32_, _tmp33_) == 0;
+#line 1135 "EventDirectoryItem.c"
 	}
-#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	if (_tmp33_) {
-#line 1016 "EventDirectoryItem.c"
-		const gchar* _tmp37_ = NULL;
-		gchar* _tmp38_ = NULL;
-		gchar* _tmp39_ = NULL;
-		const gchar* _tmp40_ = NULL;
-		gchar* _tmp41_ = NULL;
-		gchar* _tmp42_ = NULL;
-		gchar* _tmp43_ = NULL;
-		gchar* _tmp44_ = NULL;
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp37_ = name;
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	if (_tmp30_) {
+#line 1139 "EventDirectoryItem.c"
+		const gchar* _tmp34_;
+		gchar* _tmp35_;
+		gchar* _tmp36_;
+		const gchar* _tmp37_;
+		gchar* _tmp38_;
+		gchar* _tmp39_;
+		gchar* _tmp40_;
+		gchar* _tmp41_;
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp34_ = name;
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp35_ = guarded_markup_escape_text (_tmp34_);
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp36_ = _tmp35_;
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp37_ = count_text;
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp38_ = guarded_markup_escape_text (_tmp37_);
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp39_ = _tmp38_;
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp40_ = count_text;
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp41_ = guarded_markup_escape_text (_tmp40_);
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp42_ = _tmp41_;
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp43_ = g_strdup_printf ("<b>%s</b>\n%s", _tmp39_, _tmp42_);
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp44_ = _tmp43_;
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_g_free0 (_tmp42_);
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp40_ = g_strdup_printf ("<b>%s</b>\n%s", _tmp36_, _tmp39_);
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp41_ = _tmp40_;
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_free0 (_tmp39_);
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		result = _tmp44_;
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_g_free0 (_tmp36_);
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		result = _tmp41_;
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_free0 (name);
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_free0 (daterange);
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_free0 (count_text);
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		return result;
-#line 1055 "EventDirectoryItem.c"
+#line 1178 "EventDirectoryItem.c"
 	} else {
-		const gchar* _tmp45_ = NULL;
-		gchar* _tmp46_ = NULL;
-		gchar* _tmp47_ = NULL;
-		const gchar* _tmp48_ = NULL;
-		gchar* _tmp49_ = NULL;
-		gchar* _tmp50_ = NULL;
-		const gchar* _tmp51_ = NULL;
-		gchar* _tmp52_ = NULL;
-		gchar* _tmp53_ = NULL;
-		gchar* _tmp54_ = NULL;
-		gchar* _tmp55_ = NULL;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp45_ = name;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		const gchar* _tmp42_;
+		gchar* _tmp43_;
+		gchar* _tmp44_;
+		const gchar* _tmp45_;
+		gchar* _tmp46_;
+		gchar* _tmp47_;
+		const gchar* _tmp48_;
+		gchar* _tmp49_;
+		gchar* _tmp50_;
+		gchar* _tmp51_;
+		gchar* _tmp52_;
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp42_ = name;
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp43_ = guarded_markup_escape_text (_tmp42_);
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp44_ = _tmp43_;
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp45_ = count_text;
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp46_ = guarded_markup_escape_text (_tmp45_);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp47_ = _tmp46_;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp48_ = count_text;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp48_ = daterange;
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp49_ = guarded_markup_escape_text (_tmp48_);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp50_ = _tmp49_;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp51_ = daterange;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp52_ = guarded_markup_escape_text (_tmp51_);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp53_ = _tmp52_;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp54_ = g_strdup_printf ("<b>%s</b>\n%s\n%s", _tmp47_, _tmp50_, _tmp53_);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_tmp55_ = _tmp54_;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		_g_free0 (_tmp53_);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp51_ = g_strdup_printf ("<b>%s</b>\n%s\n%s", _tmp44_, _tmp47_, _tmp50_);
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_tmp52_ = _tmp51_;
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_free0 (_tmp50_);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_free0 (_tmp47_);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		result = _tmp55_;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		_g_free0 (_tmp44_);
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		result = _tmp52_;
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_free0 (name);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_free0 (daterange);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_free0 (count_text);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		return result;
-#line 1106 "EventDirectoryItem.c"
+#line 1229 "EventDirectoryItem.c"
 	}
-#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_g_free0 (name);
-#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_g_free0 (daterange);
-#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_g_free0 (count_text);
-#line 1114 "EventDirectoryItem.c"
+#line 1237 "EventDirectoryItem.c"
 }
 
 
 static void event_directory_item_real_exposed (CheckerboardItem* base) {
 	EventDirectoryItem * self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	GError * _inner_error_ = NULL;
-#line 102 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 103 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 117 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp0_ = checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 103 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 117 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	if (_tmp0_) {
-#line 104 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 118 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		return;
-#line 1130 "EventDirectoryItem.c"
+#line 1253 "EventDirectoryItem.c"
 	}
 	{
 		GdkPixbuf* _tmp1_ = NULL;
-		Event* _tmp2_ = NULL;
-		MediaSource* _tmp3_ = NULL;
-		MediaSource* _tmp4_ = NULL;
-		GdkRectangle _tmp5_ = {0};
-		GdkPixbuf* _tmp6_ = NULL;
-		GdkPixbuf* _tmp7_ = NULL;
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		Event* _tmp2_;
+		MediaSource* _tmp3_;
+		MediaSource* _tmp4_;
+		GdkRectangle _tmp5_;
+		GdkPixbuf* _tmp6_;
+		GdkPixbuf* _tmp7_;
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp2_ = self->event;
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp3_ = event_get_primary_source (_tmp2_);
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp4_ = _tmp3_;
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp5_ = self->priv->paul_lynde;
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp6_ = event_directory_item_get_paul_lynde (_tmp4_, &_tmp5_, &_inner_error_);
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp7_ = _tmp6_;
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_object_unref0 (_tmp4_);
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp1_ = _tmp7_;
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1158 "EventDirectoryItem.c"
-			goto __catch52_g_error;
+#line 1281 "EventDirectoryItem.c"
+			goto __catch53_g_error;
 		}
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp1_);
-#line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1165 "EventDirectoryItem.c"
+#line 1288 "EventDirectoryItem.c"
 	}
-	goto __finally52;
-	__catch52_g_error:
+	goto __finally53;
+	__catch53_g_error:
 	{
 		GError* err = NULL;
-		Event* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		GError* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-#line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		Event* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+		GError* _tmp11_;
+		const gchar* _tmp12_;
+#line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		err = _inner_error_;
-#line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_inner_error_ = NULL;
-#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp8_ = self->event;
-#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
-#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp10_ = _tmp9_;
-#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp11_ = err;
-#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp12_ = _tmp11_->message;
-#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		g_critical ("EventDirectoryItem.vala:109: Unable to fetch preview for %s: %s", _tmp10_, _tmp12_);
-#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		g_critical ("EventDirectoryItem.vala:123: Unable to fetch preview for %s: %s", _tmp10_, _tmp12_);
+#line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_free0 (_tmp10_);
-#line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_error_free0 (err);
-#line 1196 "EventDirectoryItem.c"
+#line 1319 "EventDirectoryItem.c"
 	}
-	__finally52:
-#line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	__finally53:
+#line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		g_clear_error (&_inner_error_);
-#line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		return;
-#line 1207 "EventDirectoryItem.c"
+#line 1330 "EventDirectoryItem.c"
 	}
-#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 126 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	event_directory_item_update_comment (self, FALSE);
-#line 114 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 128 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	CHECKERBOARD_ITEM_CLASS (event_directory_item_parent_class)->exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1213 "EventDirectoryItem.c"
+#line 1336 "EventDirectoryItem.c"
 }
 
 
 static void event_directory_item_real_unexposed (CheckerboardItem* base) {
 	EventDirectoryItem * self;
-	gboolean _tmp0_ = FALSE;
-	GdkRectangle _tmp1_ = {0};
+	gboolean _tmp0_;
+	GdkRectangle _tmp1_;
 	Dimensions _tmp2_ = {0};
-#line 117 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 131 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 118 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp0_ = checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 118 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	if (!_tmp0_) {
-#line 119 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 133 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		return;
-#line 1230 "EventDirectoryItem.c"
+#line 1353 "EventDirectoryItem.c"
 	}
-#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 135 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp1_ = self->priv->paul_lynde;
-#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 135 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	dimensions_for_rectangle (&_tmp1_, &_tmp2_);
-#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 135 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp2_);
-#line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 137 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	CHECKERBOARD_ITEM_CLASS (event_directory_item_parent_class)->unexposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1240 "EventDirectoryItem.c"
+#line 1363 "EventDirectoryItem.c"
 }
 
 
 static void event_directory_item_on_events_altered (EventDirectoryItem* self, GeeMap* map) {
-	GeeMap* _tmp0_ = NULL;
-	Event* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-#line 126 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	GeeMap* _tmp0_;
+	Event* _tmp1_;
+	gboolean _tmp2_;
+#line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_return_if_fail (IS_EVENT_DIRECTORY_ITEM (self));
-#line 126 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 127 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	event_directory_item_update_comment (self, FALSE);
-#line 128 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp0_ = map;
-#line 128 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp1_ = self->event;
-#line 128 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp2_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
-#line 128 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	if (_tmp2_) {
-#line 1262 "EventDirectoryItem.c"
-		Event* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-#line 129 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 1385 "EventDirectoryItem.c"
+		Event* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+#line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp3_ = self->event;
-#line 129 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp4_ = event_directory_item_get_formatted_title (_tmp3_);
-#line 129 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp5_ = _tmp4_;
-#line 129 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		checkerboard_item_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_, TRUE, PANGO_ALIGN_CENTER);
-#line 129 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_free0 (_tmp5_);
-#line 1276 "EventDirectoryItem.c"
+#line 1399 "EventDirectoryItem.c"
 	}
 }
 
@@ -1280,344 +1403,344 @@ static void event_directory_item_on_events_altered (EventDirectoryItem* self, Ge
 static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) {
 	EventDirectoryItem * self;
 	MediaSource* media = NULL;
-	Event* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	MediaSource* _tmp2_ = NULL;
+	Event* _tmp0_;
+	MediaSource* _tmp1_;
+	MediaSource* _tmp2_;
 	GdkRectangle _tmp3_ = {0};
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp4_;
 	GError * _inner_error_ = NULL;
-#line 132 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 133 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp0_ = self->event;
-#line 133 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp1_ = event_get_primary_source (_tmp0_);
-#line 133 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	media = _tmp1_;
-#line 136 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp2_ = media;
-#line 136 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	event_directory_item_get_paul_lynde_rect (_tmp2_, &_tmp3_);
-#line 136 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	self->priv->paul_lynde = _tmp3_;
-#line 138 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 152 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp4_ = checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 138 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 152 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	if (_tmp4_) {
-#line 1308 "EventDirectoryItem.c"
+#line 1431 "EventDirectoryItem.c"
 		{
 			GdkPixbuf* _tmp5_ = NULL;
-			MediaSource* _tmp6_ = NULL;
-			GdkRectangle _tmp7_ = {0};
-			GdkPixbuf* _tmp8_ = NULL;
-#line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			MediaSource* _tmp6_;
+			GdkRectangle _tmp7_;
+			GdkPixbuf* _tmp8_;
+#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_tmp6_ = media;
-#line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_tmp7_ = self->priv->paul_lynde;
-#line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_tmp8_ = event_directory_item_get_paul_lynde (_tmp6_, &_tmp7_, &_inner_error_);
-#line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_tmp5_ = _tmp8_;
-#line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1324 "EventDirectoryItem.c"
-				goto __catch53_g_error;
+#line 1447 "EventDirectoryItem.c"
+				goto __catch54_g_error;
 			}
-#line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_);
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_g_object_unref0 (_tmp5_);
-#line 1331 "EventDirectoryItem.c"
+#line 1454 "EventDirectoryItem.c"
 		}
-		goto __finally53;
-		__catch53_g_error:
+		goto __finally54;
+		__catch54_g_error:
 		{
 			GError* err = NULL;
-			Event* _tmp9_ = NULL;
-			gchar* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-			GError* _tmp12_ = NULL;
-			const gchar* _tmp13_ = NULL;
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			Event* _tmp9_;
+			gchar* _tmp10_;
+			gchar* _tmp11_;
+			GError* _tmp12_;
+			const gchar* _tmp13_;
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			err = _inner_error_;
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_inner_error_ = NULL;
-#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_tmp9_ = self->event;
-#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject));
-#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_tmp11_ = _tmp10_;
-#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_tmp12_ = err;
-#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_tmp13_ = _tmp12_->message;
-#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-			g_critical ("EventDirectoryItem.vala:142: Unable to fetch preview for %s: %s", _tmp11_, _tmp13_);
-#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+			g_critical ("EventDirectoryItem.vala:156: Unable to fetch preview for %s: %s", _tmp11_, _tmp13_);
+#line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_g_free0 (_tmp11_);
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_g_error_free0 (err);
-#line 1362 "EventDirectoryItem.c"
+#line 1485 "EventDirectoryItem.c"
 		}
-		__finally53:
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		__finally54:
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_g_object_unref0 (media);
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			g_clear_error (&_inner_error_);
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			return;
-#line 1375 "EventDirectoryItem.c"
+#line 1498 "EventDirectoryItem.c"
 		}
 	} else {
-		GdkRectangle _tmp14_ = {0};
+		GdkRectangle _tmp14_;
 		Dimensions _tmp15_ = {0};
-#line 145 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp14_ = self->priv->paul_lynde;
-#line 145 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		dimensions_for_rectangle (&_tmp14_, &_tmp15_);
-#line 145 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp15_);
-#line 1386 "EventDirectoryItem.c"
+#line 1509 "EventDirectoryItem.c"
 	}
-#line 148 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 162 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	THUMBNAIL_VIEW_CLASS (event_directory_item_parent_class)->thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), TYPE_THUMBNAIL_VIEW, ThumbnailView));
-#line 132 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_g_object_unref0 (media);
-#line 1392 "EventDirectoryItem.c"
+#line 1515 "EventDirectoryItem.c"
 }
 
 
 static void event_directory_item_real_paint_shadow (CheckerboardItem* base, cairo_t* ctx, Dimensions* dimensions, GdkPoint* origin, gint radius, gfloat initial_alpha) {
 	EventDirectoryItem * self;
 	Dimensions altered = {0};
-	Dimensions _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	Dimensions _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	cairo_t* _tmp4_ = NULL;
-	Dimensions _tmp5_ = {0};
-	GdkPoint _tmp6_ = {0};
-	gfloat _tmp7_ = 0.0F;
-#line 151 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	Dimensions _tmp0_;
+	gint _tmp1_;
+	Dimensions _tmp2_;
+	gint _tmp3_;
+	cairo_t* _tmp4_;
+	Dimensions _tmp5_;
+	GdkPoint _tmp6_;
+	gfloat _tmp7_;
+#line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 151 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_return_if_fail (ctx != NULL);
-#line 151 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_return_if_fail (dimensions != NULL);
-#line 151 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_return_if_fail (origin != NULL);
-#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp0_ = *dimensions;
-#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp1_ = _tmp0_.width;
-#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp2_ = *dimensions;
-#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp3_ = _tmp2_.height;
-#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	dimensions_init (&altered, _tmp1_ - 25, _tmp3_ - 25);
-#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp4_ = ctx;
-#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp5_ = altered;
-#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp6_ = *origin;
-#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp7_ = initial_alpha;
-#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	CHECKERBOARD_ITEM_CLASS (event_directory_item_parent_class)->paint_shadow (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp4_, &_tmp5_, &_tmp6_, 36, _tmp7_);
-#line 1435 "EventDirectoryItem.c"
+#line 1558 "EventDirectoryItem.c"
 }
 
 
 static void event_directory_item_real_paint_border (CheckerboardItem* base, cairo_t* ctx, Dimensions* object_dimensions, GdkPoint* object_origin, gint border_width) {
 	EventDirectoryItem * self;
 	Dimensions dimensions = {0};
-	Dimensions _tmp0_ = {0};
-	gint _tmp1_ = 0;
+	Dimensions _tmp0_;
+	gint _tmp1_;
 	Dimensions _tmp2_ = {0};
 	GdkPoint origin = {0};
-	GdkPoint _tmp3_ = {0};
-	gint _tmp4_ = 0;
+	GdkPoint _tmp3_;
+	gint _tmp4_;
 	GdkPoint _tmp5_ = {0};
-	cairo_t* _tmp6_ = NULL;
-	Dimensions _tmp7_ = {0};
-	GdkPoint _tmp8_ = {0};
-#line 157 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	cairo_t* _tmp6_;
+	Dimensions _tmp7_;
+	GdkPoint _tmp8_;
+#line 171 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 157 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_return_if_fail (ctx != NULL);
-#line 157 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_return_if_fail (object_dimensions != NULL);
-#line 157 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_return_if_fail (object_origin != NULL);
-#line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp0_ = *object_dimensions;
-#line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp1_ = border_width;
-#line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	checkerboard_item_get_border_dimensions (&_tmp0_, _tmp1_, &_tmp2_);
-#line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	dimensions = _tmp2_;
-#line 160 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp3_ = *object_origin;
-#line 160 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp4_ = border_width;
-#line 160 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	checkerboard_item_get_border_origin (&_tmp3_, _tmp4_, &_tmp5_);
-#line 160 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	origin = _tmp5_;
-#line 162 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp6_ = ctx;
-#line 162 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp7_ = dimensions;
-#line 162 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp8_ = origin;
-#line 162 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	draw_rounded_corners_filled (_tmp6_, &_tmp7_, &_tmp8_, 6.0);
-#line 1484 "EventDirectoryItem.c"
+#line 1607 "EventDirectoryItem.c"
 }
 
 
 static void event_directory_item_real_paint_image (CheckerboardItem* base, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin) {
 	EventDirectoryItem * self;
 	Dimensions dimensions = {0};
-	GdkPixbuf* _tmp0_ = NULL;
+	GdkPixbuf* _tmp0_;
 	Dimensions _tmp1_ = {0};
-	GdkPixbuf* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	cairo_t* _tmp7_ = NULL;
-	Dimensions _tmp8_ = {0};
-	GdkPoint _tmp9_ = {0};
-	cairo_t* _tmp10_ = NULL;
-	GdkPixbuf* _tmp11_ = NULL;
-	GdkPoint _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	GdkPoint _tmp14_ = {0};
-	gint _tmp15_ = 0;
-	cairo_t* _tmp16_ = NULL;
-#line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	GdkPixbuf* _tmp2_;
+	gboolean _tmp3_;
+	cairo_t* _tmp7_;
+	Dimensions _tmp8_;
+	GdkPoint _tmp9_;
+	cairo_t* _tmp10_;
+	GdkPixbuf* _tmp11_;
+	GdkPoint _tmp12_;
+	gint _tmp13_;
+	GdkPoint _tmp14_;
+	gint _tmp15_;
+	cairo_t* _tmp16_;
+#line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_return_if_fail (ctx != NULL);
-#line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_return_if_fail (origin != NULL);
-#line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 181 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp0_ = pixbuf;
-#line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 181 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	dimensions_for_pixbuf (_tmp0_, &_tmp1_);
-#line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 181 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	dimensions = _tmp1_;
-#line 169 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp2_ = pixbuf;
-#line 169 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp3_ = gdk_pixbuf_get_has_alpha (_tmp2_);
-#line 169 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	if (_tmp3_) {
-#line 1525 "EventDirectoryItem.c"
-		cairo_t* _tmp4_ = NULL;
-		Dimensions _tmp5_ = {0};
-		GdkPoint _tmp6_ = {0};
-#line 170 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 1648 "EventDirectoryItem.c"
+		cairo_t* _tmp4_;
+		Dimensions _tmp5_;
+		GdkPoint _tmp6_;
+#line 184 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp4_ = ctx;
-#line 170 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp5_ = dimensions;
-#line 170 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp6_ = *origin;
-#line 170 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		draw_rounded_corners_filled (_tmp4_, &_tmp5_, &_tmp6_, 6.0);
-#line 1537 "EventDirectoryItem.c"
+#line 1660 "EventDirectoryItem.c"
 	}
-#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp7_ = ctx;
-#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp8_ = dimensions;
-#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp9_ = *origin;
-#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	context_rounded_corners (_tmp7_, &_tmp8_, &_tmp9_, 6.0);
-#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp10_ = ctx;
-#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp11_ = pixbuf;
-#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp12_ = *origin;
-#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp13_ = _tmp12_.x;
-#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp14_ = *origin;
-#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp15_ = _tmp14_.y;
-#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	gdk_cairo_set_source_pixbuf (_tmp10_, _tmp11_, (gdouble) _tmp13_, (gdouble) _tmp15_);
-#line 175 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp16_ = ctx;
-#line 175 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	cairo_paint (_tmp16_);
-#line 1565 "EventDirectoryItem.c"
+#line 1688 "EventDirectoryItem.c"
 }
 
 
 static void event_directory_item_update_comment (EventDirectoryItem* self, gboolean init) {
 	gchar* comment = NULL;
-	Event* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-#line 178 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+	Event* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
+#line 192 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_return_if_fail (IS_EVENT_DIRECTORY_ITEM (self));
-#line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp0_ = self->event;
-#line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp1_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource));
-#line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	comment = _tmp1_;
-#line 180 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp2_ = comment;
-#line 180 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp3_ = is_string_empty (_tmp2_);
-#line 180 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	if (_tmp3_) {
-#line 181 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		checkerboard_item_clear_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1591 "EventDirectoryItem.c"
+#line 1714 "EventDirectoryItem.c"
 	} else {
-		gboolean _tmp4_ = FALSE;
-#line 182 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+		gboolean _tmp4_;
+#line 196 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp4_ = init;
-#line 182 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 196 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		if (!_tmp4_) {
-#line 1598 "EventDirectoryItem.c"
-			const gchar* _tmp5_ = NULL;
-#line 183 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 1721 "EventDirectoryItem.c"
+			const gchar* _tmp5_;
+#line 197 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_tmp5_ = comment;
-#line 183 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			checkerboard_item_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_, FALSE, PANGO_ALIGN_LEFT);
-#line 1604 "EventDirectoryItem.c"
+#line 1727 "EventDirectoryItem.c"
 		} else {
-#line 185 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			checkerboard_item_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), "", FALSE, PANGO_ALIGN_LEFT);
-#line 1608 "EventDirectoryItem.c"
+#line 1731 "EventDirectoryItem.c"
 		}
 	}
-#line 178 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_g_free0 (comment);
-#line 1613 "EventDirectoryItem.c"
+#line 1736 "EventDirectoryItem.c"
 }
 
 
 static gint event_directory_item_get_CROPPED_SCALE (void) {
 	gint result;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 10 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	_tmp0_ = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM);
 #line 10 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -1628,15 +1751,15 @@ static gint event_directory_item_get_CROPPED_SCALE (void) {
 	result = _tmp0_ + ((_tmp1_ - _tmp2_) / 2);
 #line 10 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	return result;
-#line 1632 "EventDirectoryItem.c"
+#line 1755 "EventDirectoryItem.c"
 }
 
 
 static void event_directory_item_class_init (EventDirectoryItemClass * klass) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	Dimensions _tmp4_ = {0};
 	Scaling _tmp5_ = {0};
 #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -1644,17 +1767,17 @@ static void event_directory_item_class_init (EventDirectoryItemClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	g_type_class_add_private (klass, sizeof (EventDirectoryItemPrivate));
 #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	((CheckerboardItemClass *) klass)->exposed = (void (*)(CheckerboardItem*)) event_directory_item_real_exposed;
+	((CheckerboardItemClass *) klass)->exposed = (void (*) (CheckerboardItem *)) event_directory_item_real_exposed;
 #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	((CheckerboardItemClass *) klass)->unexposed = (void (*)(CheckerboardItem*)) event_directory_item_real_unexposed;
+	((CheckerboardItemClass *) klass)->unexposed = (void (*) (CheckerboardItem *)) event_directory_item_real_unexposed;
 #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	((ThumbnailViewClass *) klass)->thumbnail_altered = (void (*)(ThumbnailView*)) event_directory_item_real_thumbnail_altered;
+	((ThumbnailViewClass *) klass)->thumbnail_altered = (void (*) (ThumbnailView *)) event_directory_item_real_thumbnail_altered;
 #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	((CheckerboardItemClass *) klass)->paint_shadow = (void (*)(CheckerboardItem*, cairo_t*, Dimensions*, GdkPoint*, gint, gfloat)) event_directory_item_real_paint_shadow;
+	((CheckerboardItemClass *) klass)->paint_shadow = (void (*) (CheckerboardItem *, cairo_t*, Dimensions*, GdkPoint*, gint, gfloat)) event_directory_item_real_paint_shadow;
 #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	((CheckerboardItemClass *) klass)->paint_border = (void (*)(CheckerboardItem*, cairo_t*, Dimensions*, GdkPoint*, gint)) event_directory_item_real_paint_border;
+	((CheckerboardItemClass *) klass)->paint_border = (void (*) (CheckerboardItem *, cairo_t*, Dimensions*, GdkPoint*, gint)) event_directory_item_real_paint_border;
 #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	((CheckerboardItemClass *) klass)->paint_image = (void (*)(CheckerboardItem*, cairo_t*, GdkPixbuf*, GdkPoint*)) event_directory_item_real_paint_image;
+	((CheckerboardItemClass *) klass)->paint_image = (void (*) (CheckerboardItem *, cairo_t*, GdkPixbuf*, GdkPoint*)) event_directory_item_real_paint_image;
 #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_event_directory_item_get_property;
 #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -1673,7 +1796,7 @@ static void event_directory_item_class_init (EventDirectoryItemClass * klass) {
 	scaling_to_fill_viewport (&_tmp4_, &_tmp5_);
 #line 15 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	event_directory_item_squared_scaling = _tmp5_;
-#line 1677 "EventDirectoryItem.c"
+#line 1800 "EventDirectoryItem.c"
 }
 
 
@@ -1682,14 +1805,14 @@ static void event_directory_item_instance_init (EventDirectoryItem * self) {
 	self->priv = EVENT_DIRECTORY_ITEM_GET_PRIVATE (self);
 #line 20 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	memset (&self->priv->paul_lynde, 0, sizeof (GdkRectangle));
-#line 1686 "EventDirectoryItem.c"
+#line 1809 "EventDirectoryItem.c"
 }
 
 
-static void event_directory_item_finalize (GObject* obj) {
+static void event_directory_item_finalize (GObject * obj) {
 	EventDirectoryItem * self;
-	EventSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	EventSourceCollection* _tmp0_;
+	guint _tmp1_;
 #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
 #line 39 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -1702,7 +1825,7 @@ static void event_directory_item_finalize (GObject* obj) {
 	_g_object_unref0 (self->event);
 #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	G_OBJECT_CLASS (event_directory_item_parent_class)->finalize (obj);
-#line 1706 "EventDirectoryItem.c"
+#line 1829 "EventDirectoryItem.c"
 }
 
 
@@ -1723,13 +1846,13 @@ static void _vala_event_directory_item_get_property (GObject * object, guint pro
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
 #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	switch (property_id) {
-#line 1727 "EventDirectoryItem.c"
+#line 1850 "EventDirectoryItem.c"
 		default:
 #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		break;
-#line 1733 "EventDirectoryItem.c"
+#line 1856 "EventDirectoryItem.c"
 	}
 }
 
diff --git a/src/events/EventDirectoryItem.vala b/src/events/EventDirectoryItem.vala
index f316de7..f75a8e0 100644
--- a/src/events/EventDirectoryItem.vala
+++ b/src/events/EventDirectoryItem.vala
@@ -54,7 +54,21 @@ class EventDirectoryItem : CheckerboardItem {
     
     // scale and crop the center square of the media
     private static Gdk.Pixbuf get_paul_lynde(MediaSource media, Gdk.Rectangle paul_lynde) throws Error {
-        Gdk.Pixbuf pixbuf = media.get_preview_pixbuf(squared_scaling);
+        Gdk.Pixbuf pixbuf;
+
+        try {
+            pixbuf = media.get_preview_pixbuf(squared_scaling);
+        } catch (Error error) {
+            ThumbnailCache.fetch_async_scaled(media, ThumbnailCache.Size.BIG,
+                                             new Dimensions(ThumbnailCache.Size.BIG, ThumbnailCache.Size.BIG),
+                                             ThumbnailCache.DEFAULT_INTERP, () => {});
+            if (media is LibraryPhoto) {
+                LibraryPhoto photo = (LibraryPhoto) media;
+                pixbuf = photo.get_pixbuf(squared_scaling);
+            } else {
+                throw error;
+            }
+        }
         
         Dimensions thumbnail_dimensions = Dimensions.for_pixbuf(pixbuf);
         
diff --git a/src/events/EventPage.c b/src/events/EventPage.c
index 23ca2e4..7b747fc 100644
--- a/src/events/EventPage.c
+++ b/src/events/EventPage.c
@@ -1,4 +1,4 @@
-/* EventPage.c generated by valac 0.34.7, the Vala compiler
+/* EventPage.c generated by valac 0.36.6, the Vala compiler
  * generated from EventPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -884,7 +884,7 @@ GType app_window_get_type (void) G_GNUC_CONST;
 GType library_window_get_type (void) G_GNUC_CONST;
 LibraryWindow* library_window_get_app (void);
 void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event);
-static void event_page_finalize (GObject* obj);
+static void event_page_finalize (GObject * obj);
 GType no_event_page_get_type (void) G_GNUC_CONST;
 enum  {
 	NO_EVENT_PAGE_DUMMY_PROPERTY
@@ -930,7 +930,7 @@ void event_id_free (EventID* self);
 void media_source_get_event_id (MediaSource* self, EventID* result);
 #define EVENT_ID_INVALID ((gint64) -1)
 gboolean view_manager_include_in_view (ViewManager* self, DataSource* source);
-static void no_event_page_finalize (GObject* obj);
+static void no_event_page_finalize (GObject * obj);
 
 static const GActionEntry EVENT_PAGE_entries[3] = {{"MakePrimary", _event_page_on_make_primary_gsimple_action_activate_callback}, {"Rename", _event_page_on_rename_gsimple_action_activate_callback}, {"EditEventComment", _media_page_on_edit_comment_gsimple_action_activate_callback}};
 
@@ -980,15 +980,15 @@ static DataView* _media_page_create_thumbnail_create_view (DataSource* source, g
 
 EventPage* event_page_construct (GType object_type, Event* page_event) {
 	EventPage * self = NULL;
-	Event* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	Event* _tmp3_ = NULL;
-	Event* _tmp4_ = NULL;
-	Event* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	EventSourceCollection* _tmp8_ = NULL;
+	Event* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	Event* _tmp3_;
+	Event* _tmp4_;
+	Event* _tmp5_;
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
+	EventSourceCollection* _tmp8_;
 #line 10 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_val_if_fail (IS_EVENT (page_event), NULL);
 #line 11 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1040,8 +1040,8 @@ EventPage* event_page_new (Event* page_event) {
 
 Event* event_page_get_event (EventPage* self) {
 	Event* result = NULL;
-	Event* _tmp0_ = NULL;
-	Event* _tmp1_ = NULL;
+	Event* _tmp0_;
+	Event* _tmp1_;
 #line 21 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_val_if_fail (IS_EVENT_PAGE (self), NULL);
 #line 22 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1059,11 +1059,11 @@ Event* event_page_get_event (EventPage* self) {
 static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* event) {
 	EventPage * self;
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
-	GdkEventKey* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	GdkEventKey* _tmp0_;
+	guint _tmp1_;
+	const gchar* _tmp2_;
+	GdkEventKey* _tmp7_;
+	gboolean _tmp8_;
 #line 25 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
 #line 25 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1077,10 +1077,10 @@ static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 #line 30 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (g_strcmp0 (_tmp2_, "F2") == 0) {
 #line 1080 "EventPage.c"
-		ViewCollection* _tmp3_ = NULL;
-		ViewCollection* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gboolean _tmp6_ = FALSE;
+		ViewCollection* _tmp3_;
+		ViewCollection* _tmp4_;
+		gint _tmp5_;
+		gboolean _tmp6_;
 #line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1114,8 +1114,8 @@ static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 
 static void event_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	EventPage * self;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
 #line 44 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
 #line 44 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1134,8 +1134,8 @@ static void event_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_f
 
 static void event_page_real_add_actions (Page* base, GActionMap* map) {
 	EventPage * self;
-	GActionMap* _tmp0_ = NULL;
-	GActionMap* _tmp1_ = NULL;
+	GActionMap* _tmp0_;
+	GActionMap* _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
 #line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1154,7 +1154,7 @@ static void event_page_real_add_actions (Page* base, GActionMap* map) {
 
 static void event_page_real_remove_actions (Page* base, GActionMap* map) {
 	EventPage * self;
-	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp0_;
 #line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
 #line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1181,9 +1181,9 @@ static void event_page_real_remove_actions (Page* base, GActionMap* map) {
 			entry = entry_collection[entry_it];
 #line 1183 "EventPage.c"
 			{
-				GActionMap* _tmp1_ = NULL;
-				GActionEntry _tmp2_ = {0};
-				const gchar* _tmp3_ = NULL;
+				GActionMap* _tmp1_;
+				GActionEntry _tmp2_;
+				const gchar* _tmp3_;
 #line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 				_tmp1_ = map;
 #line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1201,8 +1201,8 @@ static void event_page_real_remove_actions (Page* base, GActionMap* map) {
 
 static void event_page_real_init_actions (Page* base, gint selected_count, gint count) {
 	EventPage * self;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 69 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
 #line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1217,9 +1217,9 @@ static void event_page_real_init_actions (Page* base, gint selected_count, gint
 
 static void event_page_real_update_actions (Page* base, gint selected_count, gint count) {
 	EventPage * self;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 73 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
 #line 74 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1244,8 +1244,8 @@ static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* s
 	EventPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
 #line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1279,10 +1279,10 @@ static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* s
 
 static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
 	EventPage * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gint _tmp3_;
 #line 90 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
 #line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1302,9 +1302,9 @@ static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean so
 
 
 static void event_page_on_events_altered (EventPage* self, GeeMap* map) {
-	GeeMap* _tmp0_ = NULL;
-	Event* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeMap* _tmp0_;
+	Event* _tmp1_;
+	gboolean _tmp2_;
 #line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (IS_EVENT_PAGE (self));
 #line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1318,9 +1318,9 @@ static void event_page_on_events_altered (EventPage* self, GeeMap* map) {
 #line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (_tmp2_) {
 #line 1321 "EventPage.c"
-		Event* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		Event* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp3_ = self->priv->page_event;
 #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1338,10 +1338,10 @@ static void event_page_on_events_altered (EventPage* self, GeeMap* map) {
 
 static void event_page_real_on_edit_comment (MediaPage* base) {
 	EventPage * self;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 #line 99 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
 #line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1358,22 +1358,22 @@ static void event_page_real_on_edit_comment (MediaPage* base) {
 	if (_tmp3_) {
 #line 1360 "EventPage.c"
 		EditCommentDialog* edit_comment_dialog = NULL;
-		Event* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		EditCommentDialog* _tmp7_ = NULL;
-		EditCommentDialog* _tmp8_ = NULL;
+		Event* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		EditCommentDialog* _tmp7_;
+		EditCommentDialog* _tmp8_;
 		gchar* new_comment = NULL;
-		EditCommentDialog* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
+		EditCommentDialog* _tmp9_;
+		gchar* _tmp10_;
+		const gchar* _tmp11_;
 		EditEventCommentCommand* command = NULL;
-		Event* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		EditEventCommentCommand* _tmp14_ = NULL;
-		CommandManager* _tmp15_ = NULL;
-		CommandManager* _tmp16_ = NULL;
-		EditEventCommentCommand* _tmp17_ = NULL;
+		Event* _tmp12_;
+		const gchar* _tmp13_;
+		EditEventCommentCommand* _tmp14_;
+		CommandManager* _tmp15_;
+		CommandManager* _tmp16_;
+		EditEventCommentCommand* _tmp17_;
 #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp4_ = self->priv->page_event;
 #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1441,17 +1441,17 @@ static void event_page_real_on_edit_comment (MediaPage* base) {
 
 
 static void event_page_on_make_primary (EventPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
-	Event* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	DataView* _tmp7_ = NULL;
-	DataView* _tmp8_ = NULL;
-	DataSource* _tmp9_ = NULL;
-	MediaSource* _tmp10_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
+	Event* _tmp4_;
+	ViewCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	DataView* _tmp7_;
+	DataView* _tmp8_;
+	DataSource* _tmp9_;
+	MediaSource* _tmp10_;
 #line 115 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (IS_EVENT_PAGE (self));
 #line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1497,9 +1497,9 @@ static void event_page_on_make_primary (EventPage* self) {
 
 
 static void event_page_on_rename (EventPage* self) {
-	LibraryWindow* _tmp0_ = NULL;
-	LibraryWindow* _tmp1_ = NULL;
-	Event* _tmp2_ = NULL;
+	LibraryWindow* _tmp0_;
+	LibraryWindow* _tmp1_;
+	Event* _tmp2_;
 #line 122 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (IS_EVENT_PAGE (self));
 #line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1522,23 +1522,23 @@ static void event_page_class_init (EventPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_type_class_add_private (klass, sizeof (EventPagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	((PageClass *) klass)->on_app_key_pressed = (gboolean (*)(Page*, GdkEventKey*)) event_page_real_on_app_key_pressed;
+	((PageClass *) klass)->on_app_key_pressed = (gboolean (*) (Page *, GdkEventKey*)) event_page_real_on_app_key_pressed;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) event_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) event_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) event_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) event_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) event_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) event_page_real_remove_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	((PageClass *) klass)->init_actions = (void (*)(Page*, gint, gint)) event_page_real_init_actions;
+	((PageClass *) klass)->init_actions = (void (*) (Page *, gint, gint)) event_page_real_init_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) event_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) event_page_real_update_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) event_page_real_get_config_photos_sort;
+	((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) event_page_real_get_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) event_page_real_set_config_photos_sort;
+	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) event_page_real_set_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	((MediaPageClass *) klass)->on_edit_comment = (void (*)(MediaPage*)) event_page_real_on_edit_comment;
+	((MediaPageClass *) klass)->on_edit_comment = (void (*) (MediaPage *)) event_page_real_on_edit_comment;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = event_page_finalize;
 #line 1545 "EventPage.c"
@@ -1552,12 +1552,12 @@ static void event_page_instance_init (EventPage * self) {
 }
 
 
-static void event_page_finalize (GObject* obj) {
+static void event_page_finalize (GObject * obj) {
 	EventPage * self;
-	EventSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
+	EventSourceCollection* _tmp0_;
+	guint _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_PAGE, EventPage);
 #line 40 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1597,19 +1597,19 @@ GType event_page_get_type (void) {
 NoEventPage* no_event_page_construct (GType object_type) {
 	NoEventPage * self = NULL;
 	ViewManager* filter = NULL;
-	NoEventPageNoEventViewManager* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	LibraryPhotoSourceCollection* _tmp3_ = NULL;
-	Alteration* _tmp4_ = NULL;
-	ViewCollectionMonitor* _tmp5_ = NULL;
-	ViewCollectionMonitor* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	ViewCollection* _tmp8_ = NULL;
-	VideoSourceCollection* _tmp9_ = NULL;
-	Alteration* _tmp10_ = NULL;
-	ViewCollectionMonitor* _tmp11_ = NULL;
-	ViewCollectionMonitor* _tmp12_ = NULL;
+	NoEventPageNoEventViewManager* _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	LibraryPhotoSourceCollection* _tmp3_;
+	Alteration* _tmp4_;
+	ViewCollectionMonitor* _tmp5_;
+	ViewCollectionMonitor* _tmp6_;
+	ViewCollection* _tmp7_;
+	ViewCollection* _tmp8_;
+	VideoSourceCollection* _tmp9_;
+	Alteration* _tmp10_;
+	ViewCollectionMonitor* _tmp11_;
+	ViewCollectionMonitor* _tmp12_;
 #line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = (NoEventPage*) collection_page_construct (object_type, NO_EVENT_PAGE_NAME);
 #line 148 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1667,8 +1667,8 @@ static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean
 	NoEventPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
 #line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1702,10 +1702,10 @@ static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean
 
 static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
 	NoEventPage * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gint _tmp3_;
 #line 157 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NO_EVENT_PAGE, NoEventPage);
 #line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1726,7 +1726,7 @@ static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean
 
 static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_construct (GType object_type, NoEventPage* page) {
 	NoEventPageNoEventViewManager* self = NULL;
-	NoEventPage* _tmp0_ = NULL;
+	NoEventPage* _tmp0_;
 #line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_val_if_fail (IS_NO_EVENT_PAGE (page), NULL);
 #line 133 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1750,9 +1750,9 @@ static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewMa
 	NoEventPageNoEventViewManager * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	DataSource* _tmp1_ = NULL;
+	DataSource* _tmp1_;
 	EventID _tmp2_ = {0};
-	gint64 _tmp3_ = 0LL;
+	gint64 _tmp3_;
 #line 137 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, NO_EVENT_PAGE_TYPE_NO_EVENT_VIEW_MANAGER, NoEventPageNoEventViewManager);
 #line 137 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1769,8 +1769,8 @@ static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewMa
 		_tmp0_ = FALSE;
 #line 1771 "EventPage.c"
 	} else {
-		DataSource* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+		DataSource* _tmp4_;
+		gboolean _tmp5_;
 #line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp4_ = source;
 #line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1791,7 +1791,7 @@ static void no_event_page_no_event_view_manager_class_init (NoEventPageNoEventVi
 #line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	no_event_page_no_event_view_manager_parent_class = g_type_class_peek_parent (klass);
 #line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) no_event_page_no_event_view_manager_real_include_in_view;
+	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) no_event_page_no_event_view_manager_real_include_in_view;
 #line 1796 "EventPage.c"
 }
 
@@ -1813,13 +1813,13 @@ static GType no_event_page_no_event_view_manager_get_type (void) {
 
 
 static void no_event_page_class_init (NoEventPageClass * klass) {
-	Alteration* _tmp0_ = NULL;
+	Alteration* _tmp0_;
 #line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	no_event_page_parent_class = g_type_class_peek_parent (klass);
 #line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) no_event_page_real_get_config_photos_sort;
+	((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) no_event_page_real_get_config_photos_sort;
 #line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) no_event_page_real_set_config_photos_sort;
+	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) no_event_page_real_set_config_photos_sort;
 #line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = no_event_page_finalize;
 #line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1834,7 +1834,7 @@ static void no_event_page_instance_init (NoEventPage * self) {
 }
 
 
-static void no_event_page_finalize (GObject* obj) {
+static void no_event_page_finalize (GObject * obj) {
 	NoEventPage * self;
 #line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NO_EVENT_PAGE, NoEventPage);
diff --git a/src/events/Events.c b/src/events/Events.c
index 97f36d8..270b9ad 100644
--- a/src/events/Events.c
+++ b/src/events/Events.c
@@ -1,4 +1,4 @@
-/* Events.c generated by valac 0.34.7, the Vala compiler
+/* Events.c generated by valac 0.36.6, the Vala compiler
  * generated from Events.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/events/EventsDirectoryPage.c b/src/events/EventsDirectoryPage.c
index 7617f27..897a401 100644
--- a/src/events/EventsDirectoryPage.c
+++ b/src/events/EventsDirectoryPage.c
@@ -1,4 +1,4 @@
-/* EventsDirectoryPage.c generated by valac 0.34.7, the Vala compiler
+/* EventsDirectoryPage.c generated by valac 0.36.6, the Vala compiler
  * generated from EventsDirectoryPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1091,7 +1091,7 @@ GType indexable_get_type (void) G_GNUC_CONST;
 const gchar* indexable_get_indexable_keywords (Indexable* self);
 gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, int* result_length1);
 SearchViewFilter* search_view_filter_construct (GType object_type);
-static void events_directory_page_finalize (GObject* obj);
+static void events_directory_page_finalize (GObject * obj);
 GType master_events_directory_page_get_type (void) G_GNUC_CONST;
 enum  {
 	MASTER_EVENTS_DIRECTORY_PAGE_DUMMY_PROPERTY
@@ -1125,7 +1125,7 @@ enum  {
 };
 static gboolean sub_events_directory_page_sub_event_directory_manager_real_include_in_view (ViewManager* base, DataSource* source);
 gboolean view_manager_include_in_view (ViewManager* self, DataSource* source);
-static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager* obj);
+static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager * obj);
 
 static const GActionEntry EVENTS_DIRECTORY_PAGE_entries[4] = {{"Rename", _events_directory_page_on_rename_gsimple_action_activate_callback}, {"Merge", _events_directory_page_on_merge_gsimple_action_activate_callback}, {"EditComment", _events_directory_page_on_edit_comment_gsimple_action_activate_callback}, {"ViewComment", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _events_directory_page_on_display_comments_gsimple_action_change_state_callback}};
 
@@ -1189,37 +1189,37 @@ static gpointer _view_manager_ref0 (gpointer self) {
 
 EventsDirectoryPage* events_directory_page_construct (GType object_type, const gchar* page_name, ViewManager* view_manager, GeeCollection* initial_events) {
 	EventsDirectoryPage * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	ConfigFacade* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	void* _tmp6_ = NULL;
-	GDestroyNotify _tmp7_ = NULL;
-	Comparator _tmp8_ = NULL;
-	Comparator _tmp9_ = NULL;
-	void* _tmp9__target = NULL;
-	GDestroyNotify _tmp9__target_destroy_notify = NULL;
-	ViewCollection* _tmp10_ = NULL;
-	ViewCollection* _tmp11_ = NULL;
-	EventSourceCollection* _tmp12_ = NULL;
-	ViewManager* _tmp13_ = NULL;
-	GeeCollection* _tmp14_ = NULL;
-	ViewCollectionMonitor* _tmp15_ = NULL;
-	ViewCollectionMonitor* _tmp16_ = NULL;
-	ViewCollection* _tmp17_ = NULL;
-	ViewCollection* _tmp18_ = NULL;
-	ConfigFacade* _tmp19_ = NULL;
-	ConfigFacade* _tmp20_ = NULL;
-	gboolean _tmp21_ = FALSE;
+	const gchar* _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	ConfigFacade* _tmp3_;
+	ConfigFacade* _tmp4_;
+	gboolean _tmp5_;
+	void* _tmp6_;
+	GDestroyNotify _tmp7_;
+	Comparator _tmp8_;
+	Comparator _tmp9_;
+	void* _tmp9__target;
+	GDestroyNotify _tmp9__target_destroy_notify;
+	ViewCollection* _tmp10_;
+	ViewCollection* _tmp11_;
+	EventSourceCollection* _tmp12_;
+	ViewManager* _tmp13_;
+	GeeCollection* _tmp14_;
+	ViewCollectionMonitor* _tmp15_;
+	ViewCollectionMonitor* _tmp16_;
+	ViewCollection* _tmp17_;
+	ViewCollection* _tmp18_;
+	ConfigFacade* _tmp19_;
+	ConfigFacade* _tmp20_;
+	gboolean _tmp21_;
 	GValue _tmp22_ = {0};
-	ViewManager* _tmp23_ = NULL;
-	ViewManager* _tmp24_ = NULL;
+	ViewManager* _tmp23_;
+	ViewManager* _tmp24_;
 	GtkToolbar* toolbar = NULL;
-	GtkToolbar* _tmp25_ = NULL;
+	GtkToolbar* _tmp25_;
 	GtkToolButton* merge_button = NULL;
-	GtkToolButton* _tmp26_ = NULL;
+	GtkToolButton* _tmp26_;
 #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
 #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1344,8 +1344,8 @@ EventsDirectoryPage* events_directory_page_construct (GType object_type, const g
 
 static void events_directory_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	EventsDirectoryPage * self;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
 #line 80 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 80 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1364,8 +1364,8 @@ static void events_directory_page_real_init_collect_ui_filenames (Page* base, Ge
 
 gboolean events_directory_page_event_comparator_predicate (DataObject* object, Alteration* alteration) {
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Alteration* _tmp0_;
+	gboolean _tmp1_;
 #line 86 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
 #line 86 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1385,13 +1385,13 @@ gboolean events_directory_page_event_comparator_predicate (DataObject* object, A
 static gint64 events_directory_page_event_ascending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	time_t start_a = 0;
-	void* _tmp0_ = NULL;
-	Event* _tmp1_ = NULL;
-	time_t _tmp2_ = 0;
+	void* _tmp0_;
+	Event* _tmp1_;
+	time_t _tmp2_;
 	time_t start_b = 0;
-	void* _tmp3_ = NULL;
-	Event* _tmp4_ = NULL;
-	time_t _tmp5_ = 0;
+	void* _tmp3_;
+	Event* _tmp4_;
+	time_t _tmp5_;
 #line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = a;
 #line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1418,9 +1418,9 @@ static gint64 events_directory_page_event_ascending_comparator (void* a, void* b
 
 static gint64 events_directory_page_event_descending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
+	void* _tmp0_;
+	void* _tmp1_;
+	gint64 _tmp2_;
 #line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = b;
 #line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1455,15 +1455,15 @@ static gint64 _events_directory_page_event_descending_comparator_comparator (voi
 
 static Comparator events_directory_page_get_event_comparator (gboolean ascending, void** result_target, GDestroyNotify* result_target_destroy_notify) {
 	Comparator result = NULL;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = ascending;
 #line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_) {
 #line 1464 "EventsDirectoryPage.c"
-		Comparator _tmp1_ = NULL;
-		void* _tmp1__target = NULL;
-		GDestroyNotify _tmp1__target_destroy_notify = NULL;
+		Comparator _tmp1_;
+		void* _tmp1__target;
+		GDestroyNotify _tmp1__target_destroy_notify;
 #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp1_ = _events_directory_page_event_ascending_comparator_comparator;
 #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1480,9 +1480,9 @@ static Comparator events_directory_page_get_event_comparator (gboolean ascending
 		return result;
 #line 1482 "EventsDirectoryPage.c"
 	} else {
-		Comparator _tmp2_ = NULL;
-		void* _tmp2__target = NULL;
-		GDestroyNotify _tmp2__target_destroy_notify = NULL;
+		Comparator _tmp2_;
+		void* _tmp2__target;
+		GDestroyNotify _tmp2__target_destroy_notify;
 #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp2_ = _events_directory_page_event_descending_comparator_comparator;
 #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1511,16 +1511,16 @@ static GVariant* _variant_new14 (gboolean value) {
 
 static void events_directory_page_real_add_actions (Page* base, GActionMap* map) {
 	EventsDirectoryPage * self;
-	GActionMap* _tmp0_ = NULL;
-	GActionMap* _tmp1_ = NULL;
+	GActionMap* _tmp0_;
+	GActionMap* _tmp1_;
 	gboolean display_comments = FALSE;
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	GAction* _tmp6_ = NULL;
-	GAction* _tmp7_ = NULL;
-	GVariant* _tmp8_ = NULL;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
+	GAction* _tmp6_;
+	GAction* _tmp7_;
+	GVariant* _tmp8_;
 #line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1563,7 +1563,7 @@ static void events_directory_page_real_add_actions (Page* base, GActionMap* map)
 
 static void events_directory_page_real_remove_actions (Page* base, GActionMap* map) {
 	EventsDirectoryPage * self;
-	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp0_;
 #line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1590,9 +1590,9 @@ static void events_directory_page_real_remove_actions (Page* base, GActionMap* m
 			entry = entry_collection[entry_it];
 #line 1592 "EventsDirectoryPage.c"
 			{
-				GActionMap* _tmp1_ = NULL;
-				GActionEntry _tmp2_ = {0};
-				const gchar* _tmp3_ = NULL;
+				GActionMap* _tmp1_;
+				GActionEntry _tmp2_;
+				const gchar* _tmp3_;
 #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 				_tmp1_ = map;
 #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1610,11 +1610,11 @@ static void events_directory_page_real_remove_actions (Page* base, GActionMap* m
 
 static void events_directory_page_real_init_actions (Page* base, gint selected_count, gint count) {
 	EventsDirectoryPage * self;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	GSimpleAction* action = NULL;
-	GAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
+	GAction* _tmp2_;
+	GSimpleAction* _tmp3_;
 #line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1647,11 +1647,11 @@ static void events_directory_page_real_init_actions (Page* base, gint selected_c
 
 static void events_directory_page_real_update_actions (Page* base, gint selected_count, gint count) {
 	EventsDirectoryPage * self;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 #line 140 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 141 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1681,56 +1681,50 @@ static void events_directory_page_real_update_actions (Page* base, gint selected
 static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPage* base) {
 	EventsDirectoryPage * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
 #line 149 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp0_ = _ ("No events");
+	_tmp0_ = g_strdup (_ ("No events"));
 #line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1697 "EventsDirectoryPage.c"
+#line 1694 "EventsDirectoryPage.c"
 }
 
 
 static gchar* events_directory_page_real_get_filter_no_match_message (CheckerboardPage* base) {
 	EventsDirectoryPage * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
 #line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp0_ = _ ("No events found");
-#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (_ ("No events found"));
 #line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1716 "EventsDirectoryPage.c"
+#line 1710 "EventsDirectoryPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1723 "EventsDirectoryPage.c"
+#line 1717 "EventsDirectoryPage.c"
 }
 
 
 static void events_directory_page_real_on_item_activated (CheckerboardPage* base, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
 	EventsDirectoryPage * self;
 	EventDirectoryItem* event = NULL;
-	CheckerboardItem* _tmp0_ = NULL;
-	EventDirectoryItem* _tmp1_ = NULL;
-	LibraryWindow* _tmp2_ = NULL;
-	LibraryWindow* _tmp3_ = NULL;
-	Event* _tmp4_ = NULL;
+	CheckerboardItem* _tmp0_;
+	EventDirectoryItem* _tmp1_;
+	LibraryWindow* _tmp2_;
+	LibraryWindow* _tmp3_;
+	Event* _tmp4_;
 #line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1755,23 +1749,23 @@ static void events_directory_page_real_on_item_activated (CheckerboardPage* base
 	_g_object_unref0 (_tmp3_);
 #line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (event);
-#line 1759 "EventsDirectoryPage.c"
+#line 1753 "EventsDirectoryPage.c"
 }
 
 
 static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	GVariant* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	void* _tmp4_ = NULL;
-	GDestroyNotify _tmp5_ = NULL;
-	Comparator _tmp6_ = NULL;
-	Comparator _tmp7_ = NULL;
-	void* _tmp7__target = NULL;
-	GDestroyNotify _tmp7__target_destroy_notify = NULL;
-	GSimpleAction* _tmp8_ = NULL;
-	GVariant* _tmp9_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	GVariant* _tmp2_;
+	const gchar* _tmp3_;
+	void* _tmp4_;
+	GDestroyNotify _tmp5_;
+	Comparator _tmp6_;
+	Comparator _tmp7_;
+	void* _tmp7__target;
+	GDestroyNotify _tmp7__target_destroy_notify;
+	GSimpleAction* _tmp8_;
+	GVariant* _tmp9_;
 #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
 #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1810,39 +1804,39 @@ static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GS
 	_tmp9_ = value;
 #line 168 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_simple_action_set_state (_tmp8_, _tmp9_);
-#line 1814 "EventsDirectoryPage.c"
+#line 1808 "EventsDirectoryPage.c"
 }
 
 
 static void events_directory_page_on_rename (EventsDirectoryPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	EventDirectoryItem* item = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	DataView* _tmp6_ = NULL;
-	EventDirectoryItem* _tmp7_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	DataView* _tmp6_;
+	EventDirectoryItem* _tmp7_;
 	EventRenameDialog* rename_dialog = NULL;
-	EventDirectoryItem* _tmp8_ = NULL;
-	Event* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	EventRenameDialog* _tmp12_ = NULL;
-	EventRenameDialog* _tmp13_ = NULL;
+	EventDirectoryItem* _tmp8_;
+	Event* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	EventRenameDialog* _tmp12_;
+	EventRenameDialog* _tmp13_;
 	gchar* new_name = NULL;
-	EventRenameDialog* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
+	EventRenameDialog* _tmp14_;
+	gchar* _tmp15_;
+	const gchar* _tmp16_;
 	RenameEventCommand* command = NULL;
-	EventDirectoryItem* _tmp17_ = NULL;
-	Event* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	RenameEventCommand* _tmp20_ = NULL;
-	CommandManager* _tmp21_ = NULL;
-	CommandManager* _tmp22_ = NULL;
-	RenameEventCommand* _tmp23_ = NULL;
+	EventDirectoryItem* _tmp17_;
+	Event* _tmp18_;
+	const gchar* _tmp19_;
+	RenameEventCommand* _tmp20_;
+	CommandManager* _tmp21_;
+	CommandManager* _tmp22_;
+	RenameEventCommand* _tmp23_;
 #line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
 #line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1859,7 +1853,7 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
 	if (_tmp3_) {
 #line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1863 "EventsDirectoryPage.c"
+#line 1857 "EventsDirectoryPage.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -1907,7 +1901,7 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
 		_g_object_unref0 (item);
 #line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1911 "EventsDirectoryPage.c"
+#line 1905 "EventsDirectoryPage.c"
 	}
 #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp17_ = item;
@@ -1937,39 +1931,39 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
 	_text_entry_dialog_mediator_unref0 (rename_dialog);
 #line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (item);
-#line 1941 "EventsDirectoryPage.c"
+#line 1935 "EventsDirectoryPage.c"
 }
 
 
 void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	EventDirectoryItem* item = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	DataView* _tmp6_ = NULL;
-	EventDirectoryItem* _tmp7_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	DataView* _tmp6_;
+	EventDirectoryItem* _tmp7_;
 	EditCommentDialog* edit_comment_dialog = NULL;
-	EventDirectoryItem* _tmp8_ = NULL;
-	Event* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	EditCommentDialog* _tmp12_ = NULL;
-	EditCommentDialog* _tmp13_ = NULL;
+	EventDirectoryItem* _tmp8_;
+	Event* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	EditCommentDialog* _tmp12_;
+	EditCommentDialog* _tmp13_;
 	gchar* new_comment = NULL;
-	EditCommentDialog* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
+	EditCommentDialog* _tmp14_;
+	gchar* _tmp15_;
+	const gchar* _tmp16_;
 	EditEventCommentCommand* command = NULL;
-	EventDirectoryItem* _tmp17_ = NULL;
-	Event* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	EditEventCommentCommand* _tmp20_ = NULL;
-	CommandManager* _tmp21_ = NULL;
-	CommandManager* _tmp22_ = NULL;
-	EditEventCommentCommand* _tmp23_ = NULL;
+	EventDirectoryItem* _tmp17_;
+	Event* _tmp18_;
+	const gchar* _tmp19_;
+	EditEventCommentCommand* _tmp20_;
+	CommandManager* _tmp21_;
+	CommandManager* _tmp22_;
+	EditEventCommentCommand* _tmp23_;
 #line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
 #line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1986,7 +1980,7 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
 	if (_tmp3_) {
 #line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1990 "EventsDirectoryPage.c"
+#line 1984 "EventsDirectoryPage.c"
 	}
 #line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -2034,7 +2028,7 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
 		_g_object_unref0 (item);
 #line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 2038 "EventsDirectoryPage.c"
+#line 2032 "EventsDirectoryPage.c"
 	}
 #line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp17_ = item;
@@ -2064,25 +2058,25 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
 #line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (item);
-#line 2068 "EventsDirectoryPage.c"
+#line 2062 "EventsDirectoryPage.c"
 }
 
 
 static void events_directory_page_on_merge (EventsDirectoryPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	MergeEventsCommand* command = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
-	GeeList* _tmp7_ = NULL;
-	MergeEventsCommand* _tmp8_ = NULL;
-	MergeEventsCommand* _tmp9_ = NULL;
-	CommandManager* _tmp10_ = NULL;
-	CommandManager* _tmp11_ = NULL;
-	MergeEventsCommand* _tmp12_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	GeeList* _tmp6_;
+	GeeList* _tmp7_;
+	MergeEventsCommand* _tmp8_;
+	MergeEventsCommand* _tmp9_;
+	CommandManager* _tmp10_;
+	CommandManager* _tmp11_;
+	MergeEventsCommand* _tmp12_;
 #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
 #line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2099,7 +2093,7 @@ static void events_directory_page_on_merge (EventsDirectoryPage* self) {
 	if (_tmp3_) {
 #line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 2103 "EventsDirectoryPage.c"
+#line 2097 "EventsDirectoryPage.c"
 	}
 #line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -2131,18 +2125,18 @@ static void events_directory_page_on_merge (EventsDirectoryPage* self) {
 	_command_manager_unref0 (_tmp11_);
 #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (command);
-#line 2135 "EventsDirectoryPage.c"
+#line 2129 "EventsDirectoryPage.c"
 }
 
 
 static void events_directory_page_on_display_comments (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GVariant* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
+	GVariant* _tmp0_;
+	gboolean _tmp1_;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	GSimpleAction* _tmp4_;
+	GVariant* _tmp5_;
 #line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
 #line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2169,22 +2163,22 @@ static void events_directory_page_on_display_comments (EventsDirectoryPage* self
 	_tmp5_ = value;
 #line 218 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 2173 "EventsDirectoryPage.c"
+#line 2167 "EventsDirectoryPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
 #line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 2180 "EventsDirectoryPage.c"
+#line 2174 "EventsDirectoryPage.c"
 }
 
 
 static SearchViewFilter* events_directory_page_real_get_search_view_filter (CheckerboardPage* base) {
 	EventsDirectoryPage * self;
 	SearchViewFilter* result = NULL;
-	EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_ = NULL;
-	SearchViewFilter* _tmp1_ = NULL;
+	EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_;
+	SearchViewFilter* _tmp1_;
 #line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2195,15 +2189,15 @@ static SearchViewFilter* events_directory_page_real_get_search_view_filter (Chec
 	result = _tmp1_;
 #line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2199 "EventsDirectoryPage.c"
+#line 2193 "EventsDirectoryPage.c"
 }
 
 
 static DataView* events_directory_page_event_directory_manager_real_create_view (ViewManager* base, DataSource* source) {
 	EventsDirectoryPageEventDirectoryManager * self;
 	DataView* result = NULL;
-	DataSource* _tmp0_ = NULL;
-	EventDirectoryItem* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	EventDirectoryItem* _tmp1_;
 #line 9 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER, EventsDirectoryPageEventDirectoryManager);
 #line 9 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2216,7 +2210,7 @@ static DataView* events_directory_page_event_directory_manager_real_create_view
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
 #line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2220 "EventsDirectoryPage.c"
+#line 2214 "EventsDirectoryPage.c"
 }
 
 
@@ -2226,14 +2220,14 @@ EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_
 	self = (EventsDirectoryPageEventDirectoryManager*) view_manager_construct (object_type);
 #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2230 "EventsDirectoryPage.c"
+#line 2224 "EventsDirectoryPage.c"
 }
 
 
 EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_new (void) {
 #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return events_directory_page_event_directory_manager_construct (EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER);
-#line 2237 "EventsDirectoryPage.c"
+#line 2231 "EventsDirectoryPage.c"
 }
 
 
@@ -2241,8 +2235,8 @@ static void events_directory_page_event_directory_manager_class_init (EventsDire
 #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	events_directory_page_event_directory_manager_parent_class = g_type_class_peek_parent (klass);
 #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) events_directory_page_event_directory_manager_real_create_view;
-#line 2246 "EventsDirectoryPage.c"
+	((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) events_directory_page_event_directory_manager_real_create_view;
+#line 2240 "EventsDirectoryPage.c"
 }
 
 
@@ -2271,48 +2265,48 @@ static guint events_directory_page_events_directory_search_view_filter_real_get_
 	result = (guint) SEARCH_FILTER_CRITERIA_TEXT;
 #line 16 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2275 "EventsDirectoryPage.c"
+#line 2269 "EventsDirectoryPage.c"
 }
 
 
 static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2295 "EventsDirectoryPage.c"
+#line 2289 "EventsDirectoryPage.c"
 }
 
 
 static gboolean events_directory_page_events_directory_search_view_filter_real_predicate (ViewFilter* base, DataView* view) {
 	EventsDirectoryPageEventsDirectorySearchViewFilter * self;
 	gboolean result = FALSE;
-	DataView* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	DataSource* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	DataView* _tmp0_;
+	DataSource* _tmp1_;
+	DataSource* _tmp2_;
+	const gchar* _tmp3_;
+	gboolean _tmp4_;
 	Event* source = NULL;
-	DataView* _tmp5_ = NULL;
-	DataSource* _tmp6_ = NULL;
+	DataView* _tmp5_;
+	DataSource* _tmp6_;
 	const gchar* event_keywords = NULL;
-	Event* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	gint _tmp11_ = 0;
-	gchar** _tmp12_ = NULL;
+	Event* _tmp7_;
+	const gchar* _tmp8_;
+	const gchar* _tmp9_;
+	gboolean _tmp10_;
+	gint _tmp11_;
+	gchar** _tmp12_;
 #line 19 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_DIRECTORY_PAGE_TYPE_EVENTS_DIRECTORY_SEARCH_VIEW_FILTER, EventsDirectoryPageEventsDirectorySearchViewFilter);
 #line 19 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2337,7 +2331,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 		result = TRUE;
 #line 22 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2341 "EventsDirectoryPage.c"
+#line 2335 "EventsDirectoryPage.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = view;
@@ -2363,11 +2357,11 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 		_g_object_unref0 (source);
 #line 27 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2367 "EventsDirectoryPage.c"
+#line 2361 "EventsDirectoryPage.c"
 	}
 #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp12_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp11_);
-#line 2371 "EventsDirectoryPage.c"
+#line 2365 "EventsDirectoryPage.c"
 	{
 		gchar** word_collection = NULL;
 		gint word_collection_length1 = 0;
@@ -2379,15 +2373,15 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 		word_collection_length1 = _tmp11_;
 #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		for (word_it = 0; word_it < _tmp11_; word_it = word_it + 1) {
-#line 2383 "EventsDirectoryPage.c"
+#line 2377 "EventsDirectoryPage.c"
 			const gchar* word = NULL;
 #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			word = word_collection[word_it];
-#line 2387 "EventsDirectoryPage.c"
+#line 2381 "EventsDirectoryPage.c"
 			{
-				const gchar* _tmp13_ = NULL;
-				const gchar* _tmp14_ = NULL;
-				gboolean _tmp15_ = FALSE;
+				const gchar* _tmp13_;
+				const gchar* _tmp14_;
+				gboolean _tmp15_;
 #line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 				_tmp13_ = event_keywords;
 #line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2402,7 +2396,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 					_g_object_unref0 (source);
 #line 32 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 					return result;
-#line 2406 "EventsDirectoryPage.c"
+#line 2400 "EventsDirectoryPage.c"
 				}
 			}
 		}
@@ -2413,7 +2407,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 	_g_object_unref0 (source);
 #line 35 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2417 "EventsDirectoryPage.c"
+#line 2411 "EventsDirectoryPage.c"
 }
 
 
@@ -2423,14 +2417,14 @@ static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page
 	self = (EventsDirectoryPageEventsDirectorySearchViewFilter*) search_view_filter_construct (object_type);
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2427 "EventsDirectoryPage.c"
+#line 2421 "EventsDirectoryPage.c"
 }
 
 
 static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_new (void) {
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return events_directory_page_events_directory_search_view_filter_construct (EVENTS_DIRECTORY_PAGE_TYPE_EVENTS_DIRECTORY_SEARCH_VIEW_FILTER);
-#line 2434 "EventsDirectoryPage.c"
+#line 2428 "EventsDirectoryPage.c"
 }
 
 
@@ -2438,10 +2432,10 @@ static void events_directory_page_events_directory_search_view_filter_class_init
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	events_directory_page_events_directory_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) events_directory_page_events_directory_search_view_filter_real_get_criteria;
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) events_directory_page_events_directory_search_view_filter_real_get_criteria;
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) events_directory_page_events_directory_search_view_filter_real_predicate;
-#line 2445 "EventsDirectoryPage.c"
+	((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) events_directory_page_events_directory_search_view_filter_real_predicate;
+#line 2439 "EventsDirectoryPage.c"
 }
 
 
@@ -2467,49 +2461,49 @@ static void events_directory_page_class_init (EventsDirectoryPageClass * klass)
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_type_class_add_private (klass, sizeof (EventsDirectoryPagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) events_directory_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) events_directory_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) events_directory_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) events_directory_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) events_directory_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) events_directory_page_real_remove_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((PageClass *) klass)->init_actions = (void (*)(Page*, gint, gint)) events_directory_page_real_init_actions;
+	((PageClass *) klass)->init_actions = (void (*) (Page *, gint, gint)) events_directory_page_real_init_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) events_directory_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) events_directory_page_real_update_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*)(CheckerboardPage*)) events_directory_page_real_get_view_empty_message;
+	((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*) (CheckerboardPage *)) events_directory_page_real_get_view_empty_message;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((CheckerboardPageClass *) klass)->get_filter_no_match_message = (gchar* (*)(CheckerboardPage*)) events_directory_page_real_get_filter_no_match_message;
+	((CheckerboardPageClass *) klass)->get_filter_no_match_message = (gchar* (*) (CheckerboardPage *)) events_directory_page_real_get_filter_no_match_message;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((CheckerboardPageClass *) klass)->on_item_activated = (void (*)(CheckerboardPage*, CheckerboardItem*, CheckerboardPageActivator, CheckerboardPageKeyboardModifiers*)) events_directory_page_real_on_item_activated;
+	((CheckerboardPageClass *) klass)->on_item_activated = (void (*) (CheckerboardPage *, CheckerboardItem*, CheckerboardPageActivator, CheckerboardPageKeyboardModifiers*)) events_directory_page_real_on_item_activated;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) events_directory_page_real_get_search_view_filter;
+	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) events_directory_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = events_directory_page_finalize;
-#line 2490 "EventsDirectoryPage.c"
+#line 2484 "EventsDirectoryPage.c"
 }
 
 
 static void events_directory_page_instance_init (EventsDirectoryPage * self) {
-	EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_ = NULL;
+	EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv = EVENTS_DIRECTORY_PAGE_GET_PRIVATE (self);
 #line 43 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = events_directory_page_events_directory_search_view_filter_new ();
 #line 43 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->search_filter = _tmp0_;
-#line 2502 "EventsDirectoryPage.c"
+#line 2496 "EventsDirectoryPage.c"
 }
 
 
-static void events_directory_page_finalize (GObject* obj) {
+static void events_directory_page_finalize (GObject * obj) {
 	EventsDirectoryPage * self;
 	GSimpleAction* action = NULL;
-	GAction* _tmp0_ = NULL;
-	GSimpleAction* _tmp1_ = NULL;
-	GSimpleAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
+	GAction* _tmp0_;
+	GSimpleAction* _tmp1_;
+	GSimpleAction* _tmp2_;
+	GSimpleAction* _tmp3_;
+	guint _tmp4_;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2520,7 +2514,7 @@ static void events_directory_page_finalize (GObject* obj) {
 	if (_tmp1_ == NULL) {
 #line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2524 "EventsDirectoryPage.c"
+#line 2518 "EventsDirectoryPage.c"
 	}
 #line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	action = _tmp1_;
@@ -2542,7 +2536,7 @@ static void events_directory_page_finalize (GObject* obj) {
 	_view_filter_unref0 (self->priv->search_filter);
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	G_OBJECT_CLASS (events_directory_page_parent_class)->finalize (obj);
-#line 2546 "EventsDirectoryPage.c"
+#line 2540 "EventsDirectoryPage.c"
 }
 
 
@@ -2560,11 +2554,11 @@ GType events_directory_page_get_type (void) {
 
 MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_type) {
 	MasterEventsDirectoryPage * self = NULL;
-	EventsDirectoryPageEventDirectoryManager* _tmp0_ = NULL;
-	EventsDirectoryPageEventDirectoryManager* _tmp1_ = NULL;
-	EventSourceCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
+	EventsDirectoryPageEventDirectoryManager* _tmp0_;
+	EventsDirectoryPageEventDirectoryManager* _tmp1_;
+	EventSourceCollection* _tmp2_;
+	GeeCollection* _tmp3_;
+	GeeCollection* _tmp4_;
 #line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = events_directory_page_event_directory_manager_new ();
 #line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2583,21 +2577,21 @@ MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_
 	_view_manager_unref0 (_tmp1_);
 #line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2587 "EventsDirectoryPage.c"
+#line 2581 "EventsDirectoryPage.c"
 }
 
 
 MasterEventsDirectoryPage* master_events_directory_page_new (void) {
 #line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return master_events_directory_page_construct (TYPE_MASTER_EVENTS_DIRECTORY_PAGE);
-#line 2594 "EventsDirectoryPage.c"
+#line 2588 "EventsDirectoryPage.c"
 }
 
 
 static void master_events_directory_page_class_init (MasterEventsDirectoryPageClass * klass) {
 #line 226 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	master_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 2601 "EventsDirectoryPage.c"
+#line 2595 "EventsDirectoryPage.c"
 }
 
 
@@ -2632,88 +2626,88 @@ GType sub_events_directory_page_directory_type_get_type (void) {
 static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* result = NULL;
 	gchar* buffer = NULL;
-	gchar* _tmp0_ = NULL;
-	gint buffer_length1 = 0;
-	gint _buffer_size_ = 0;
-	gchar* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	gint buffer_length1;
+	gint _buffer_size_;
+	gchar* _tmp1_;
+	gint _tmp1__length1;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
+#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2675 "EventsDirectoryPage.c"
+#line 2669 "EventsDirectoryPage.c"
 }
 
 
 SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time) {
 	SubEventsDirectoryPage * self = NULL;
 	gchar* page_name = NULL;
-	SubEventsDirectoryPageDirectoryType _tmp0_ = 0;
-	const gchar* _tmp5_ = NULL;
-	SubEventsDirectoryPageDirectoryType _tmp6_ = 0;
-	struct tm _tmp7_ = {0};
-	SubEventsDirectoryPageSubEventDirectoryManager* _tmp8_ = NULL;
-	SubEventsDirectoryPageSubEventDirectoryManager* _tmp9_ = NULL;
+	SubEventsDirectoryPageDirectoryType _tmp0_;
+	const gchar* _tmp5_;
+	SubEventsDirectoryPageDirectoryType _tmp6_;
+	struct tm _tmp7_;
+	SubEventsDirectoryPageSubEventDirectoryManager* _tmp8_;
+	SubEventsDirectoryPageSubEventDirectoryManager* _tmp9_;
 #line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (time != NULL, NULL);
 #line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = type;
 #line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED) {
-#line 2694 "EventsDirectoryPage.c"
-		gchar* _tmp1_ = NULL;
+#line 2688 "EventsDirectoryPage.c"
+		gchar* _tmp1_;
 #line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp1_ = g_strdup (SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME);
 #line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_free0 (page_name);
 #line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		page_name = _tmp1_;
-#line 2702 "EventsDirectoryPage.c"
+#line 2696 "EventsDirectoryPage.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
-		SubEventsDirectoryPageDirectoryType _tmp3_ = 0;
-		gchar* _tmp4_ = NULL;
+		SubEventsDirectoryPageDirectoryType _tmp3_;
+		gchar* _tmp4_;
 #line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp3_ = type;
 #line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		if (_tmp3_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR) {
 #line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT;
-#line 2713 "EventsDirectoryPage.c"
+#line 2707 "EventsDirectoryPage.c"
 		} else {
 #line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT;
-#line 2717 "EventsDirectoryPage.c"
+#line 2711 "EventsDirectoryPage.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp4_ = g_time_format (time, _tmp2_);
@@ -2721,7 +2715,7 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
 		_g_free0 (page_name);
 #line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		page_name = _tmp4_;
-#line 2725 "EventsDirectoryPage.c"
+#line 2719 "EventsDirectoryPage.c"
 	}
 #line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = page_name;
@@ -2741,21 +2735,21 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
 	_g_free0 (page_name);
 #line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2745 "EventsDirectoryPage.c"
+#line 2739 "EventsDirectoryPage.c"
 }
 
 
 SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
 #line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return sub_events_directory_page_construct (TYPE_SUB_EVENTS_DIRECTORY_PAGE, type, time);
-#line 2752 "EventsDirectoryPage.c"
+#line 2746 "EventsDirectoryPage.c"
 }
 
 
 gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self) {
 	gint result = 0;
-	ViewManager* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	ViewManager* _tmp0_;
+	gint _tmp1_;
 #line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
 #line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2766,14 +2760,14 @@ gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self) {
 	result = _tmp1_;
 #line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2770 "EventsDirectoryPage.c"
+#line 2764 "EventsDirectoryPage.c"
 }
 
 
 gint sub_events_directory_page_get_year (SubEventsDirectoryPage* self) {
 	gint result = 0;
-	ViewManager* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	ViewManager* _tmp0_;
+	gint _tmp1_;
 #line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
 #line 303 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2784,14 +2778,14 @@ gint sub_events_directory_page_get_year (SubEventsDirectoryPage* self) {
 	result = _tmp1_;
 #line 303 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2788 "EventsDirectoryPage.c"
+#line 2782 "EventsDirectoryPage.c"
 }
 
 
 SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_directory_type (SubEventsDirectoryPage* self) {
 	SubEventsDirectoryPageDirectoryType result = 0;
-	ViewManager* _tmp0_ = NULL;
-	SubEventsDirectoryPageDirectoryType _tmp1_ = 0;
+	ViewManager* _tmp0_;
+	SubEventsDirectoryPageDirectoryType _tmp1_;
 #line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
 #line 307 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2802,16 +2796,16 @@ SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_director
 	result = _tmp1_;
 #line 307 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2806 "EventsDirectoryPage.c"
+#line 2800 "EventsDirectoryPage.c"
 }
 
 
 static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time) {
 	SubEventsDirectoryPageSubEventDirectoryManager* self = NULL;
-	SubEventsDirectoryPageDirectoryType _tmp0_ = 0;
-	SubEventsDirectoryPageDirectoryType _tmp3_ = 0;
-	struct tm _tmp4_ = {0};
-	gint _tmp5_ = 0;
+	SubEventsDirectoryPageDirectoryType _tmp0_;
+	SubEventsDirectoryPageDirectoryType _tmp3_;
+	struct tm _tmp4_;
+	gint _tmp5_;
 #line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (time != NULL, NULL);
 #line 251 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2820,16 +2814,16 @@ static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page
 	_tmp0_ = type;
 #line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 2824 "EventsDirectoryPage.c"
-		struct tm _tmp1_ = {0};
-		gint _tmp2_ = 0;
+#line 2818 "EventsDirectoryPage.c"
+		struct tm _tmp1_;
+		gint _tmp2_;
 #line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp1_ = *time;
 #line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp2_ = _tmp1_.tm_mon;
 #line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		self->priv->month = _tmp2_;
-#line 2833 "EventsDirectoryPage.c"
+#line 2827 "EventsDirectoryPage.c"
 	}
 #line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = type;
@@ -2843,47 +2837,47 @@ static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page
 	self->priv->year = _tmp5_;
 #line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2847 "EventsDirectoryPage.c"
+#line 2841 "EventsDirectoryPage.c"
 }
 
 
 static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
 #line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return sub_events_directory_page_sub_event_directory_manager_construct (SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, type, time);
-#line 2854 "EventsDirectoryPage.c"
+#line 2848 "EventsDirectoryPage.c"
 }
 
 
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return;
-#line 2869 "EventsDirectoryPage.c"
+#line 2863 "EventsDirectoryPage.c"
 }
 
 
 static gboolean sub_events_directory_page_sub_event_directory_manager_real_include_in_view (ViewManager* base, DataSource* source) {
 	SubEventsDirectoryPageSubEventDirectoryManager * self;
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	DataSource* _tmp0_;
+	gboolean _tmp1_;
 	EventSource* event = NULL;
-	DataSource* _tmp2_ = NULL;
-	EventSource* _tmp3_ = NULL;
+	DataSource* _tmp2_;
+	EventSource* _tmp3_;
 	struct tm event_time = {0};
-	EventSource* _tmp4_ = NULL;
-	time_t _tmp5_ = 0;
+	EventSource* _tmp4_;
+	time_t _tmp5_;
 	struct tm _tmp6_ = {0};
-	struct tm _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
+	struct tm _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
 #line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager);
 #line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2898,7 +2892,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 		result = FALSE;
 #line 261 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2902 "EventsDirectoryPage.c"
+#line 2896 "EventsDirectoryPage.c"
 	}
 #line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = source;
@@ -2922,16 +2916,16 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 	_tmp9_ = self->priv->year;
 #line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp8_ == _tmp9_) {
-#line 2926 "EventsDirectoryPage.c"
-		SubEventsDirectoryPageDirectoryType _tmp10_ = 0;
+#line 2920 "EventsDirectoryPage.c"
+		SubEventsDirectoryPageDirectoryType _tmp10_;
 #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp10_ = self->priv->type;
 #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		if (_tmp10_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 2932 "EventsDirectoryPage.c"
-			struct tm _tmp11_ = {0};
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
+#line 2926 "EventsDirectoryPage.c"
+			struct tm _tmp11_;
+			gint _tmp12_;
+			gint _tmp13_;
 #line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp11_ = event_time;
 #line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2944,7 +2938,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 			_g_object_unref0 (event);
 #line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			return result;
-#line 2948 "EventsDirectoryPage.c"
+#line 2942 "EventsDirectoryPage.c"
 		}
 #line 269 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		result = TRUE;
@@ -2952,7 +2946,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 		_g_object_unref0 (event);
 #line 269 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2956 "EventsDirectoryPage.c"
+#line 2950 "EventsDirectoryPage.c"
 	}
 #line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = FALSE;
@@ -2960,13 +2954,13 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 	_g_object_unref0 (event);
 #line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2964 "EventsDirectoryPage.c"
+#line 2958 "EventsDirectoryPage.c"
 }
 
 
 static gint sub_events_directory_page_sub_event_directory_manager_get_month (SubEventsDirectoryPageSubEventDirectoryManager* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 274 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (SUB_EVENTS_DIRECTORY_PAGE_IS_SUB_EVENT_DIRECTORY_MANAGER (self), 0);
 #line 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2975,13 +2969,13 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_month (Sub
 	result = _tmp0_;
 #line 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2979 "EventsDirectoryPage.c"
+#line 2973 "EventsDirectoryPage.c"
 }
 
 
 static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubEventsDirectoryPageSubEventDirectoryManager* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 278 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (SUB_EVENTS_DIRECTORY_PAGE_IS_SUB_EVENT_DIRECTORY_MANAGER (self), 0);
 #line 279 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2990,13 +2984,13 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubE
 	result = _tmp0_;
 #line 279 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2994 "EventsDirectoryPage.c"
+#line 2988 "EventsDirectoryPage.c"
 }
 
 
 static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (SubEventsDirectoryPageSubEventDirectoryManager* self) {
 	SubEventsDirectoryPageDirectoryType result = 0;
-	SubEventsDirectoryPageDirectoryType _tmp0_ = 0;
+	SubEventsDirectoryPageDirectoryType _tmp0_;
 #line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (SUB_EVENTS_DIRECTORY_PAGE_IS_SUB_EVENT_DIRECTORY_MANAGER (self), 0);
 #line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -3005,7 +2999,7 @@ static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_d
 	result = _tmp0_;
 #line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 3009 "EventsDirectoryPage.c"
+#line 3003 "EventsDirectoryPage.c"
 }
 
 
@@ -3017,8 +3011,8 @@ static void sub_events_directory_page_sub_event_directory_manager_class_init (Su
 #line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_type_class_add_private (klass, sizeof (SubEventsDirectoryPageSubEventDirectoryManagerPrivate));
 #line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) sub_events_directory_page_sub_event_directory_manager_real_include_in_view;
-#line 3022 "EventsDirectoryPage.c"
+	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) sub_events_directory_page_sub_event_directory_manager_real_include_in_view;
+#line 3016 "EventsDirectoryPage.c"
 }
 
 
@@ -3029,17 +3023,17 @@ static void sub_events_directory_page_sub_event_directory_manager_instance_init
 	self->priv->month = 0;
 #line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->year = 0;
-#line 3033 "EventsDirectoryPage.c"
+#line 3027 "EventsDirectoryPage.c"
 }
 
 
-static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager* obj) {
+static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager * obj) {
 	SubEventsDirectoryPageSubEventDirectoryManager * self;
 #line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager);
 #line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->finalize (obj);
-#line 3043 "EventsDirectoryPage.c"
+#line 3037 "EventsDirectoryPage.c"
 }
 
 
@@ -3058,7 +3052,7 @@ static GType sub_events_directory_page_sub_event_directory_manager_get_type (voi
 static void sub_events_directory_page_class_init (SubEventsDirectoryPageClass * klass) {
 #line 234 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	sub_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 3062 "EventsDirectoryPage.c"
+#line 3056 "EventsDirectoryPage.c"
 }
 
 
diff --git a/src/folders/Branch.c b/src/folders/Branch.c
index 5f20e23..95fb127 100644
--- a/src/folders/Branch.c
+++ b/src/folders/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.7, the Vala compiler
+/* Branch.c generated by valac 0.36.6, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -445,7 +445,7 @@ static gpointer folders_root_parent_class = NULL;
 static gpointer folders_sidebar_entry_parent_class = NULL;
 extern gchar* folders_icon;
 extern gchar* folders_have_photos_icon;
-static SidebarExpandableEntryIface* folders_sidebar_entry_sidebar_expandable_entry_parent_iface = NULL;
+static SidebarExpandableEntryIface * folders_sidebar_entry_sidebar_expandable_entry_parent_iface = NULL;
 
 GType sidebar_branch_get_type (void) G_GNUC_CONST;
 GType folders_branch_get_type (void) G_GNUC_CONST;
@@ -516,7 +516,7 @@ gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent);
 GFile* folders_sidebar_entry_get_dir (FoldersSidebarEntry* self);
 SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry);
 void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
-static void folders_branch_finalize (GObject* obj);
+static void folders_branch_finalize (GObject * obj);
 GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
@@ -532,9 +532,9 @@ GType sidebar_contextable_get_type (void) G_GNUC_CONST;
 #define FOLDERS_SIDEBAR_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntryPrivate))
 enum  {
 	FOLDERS_SIDEBAR_ENTRY_DUMMY_PROPERTY,
-	FOLDERS_SIDEBAR_ENTRY_DIR,
-	FOLDERS_SIDEBAR_ENTRY_COLLATION,
-	FOLDERS_SIDEBAR_ENTRY_COUNT
+	FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY,
+	FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY,
+	FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY
 };
 SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type);
 static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, GFile* value);
@@ -552,7 +552,7 @@ GType media_page_get_type (void) G_GNUC_CONST;
 GType collection_page_get_type (void) G_GNUC_CONST;
 GType folders_page_get_type (void) G_GNUC_CONST;
 gchar* sidebar_simple_page_entry_get_sidebar_icon (SidebarSimplePageEntry* self);
-static void folders_sidebar_entry_finalize (GObject* obj);
+static void folders_sidebar_entry_finalize (GObject * obj);
 static void _vala_folders_sidebar_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_folders_sidebar_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 
@@ -593,10 +593,10 @@ static gint _folders_branch_comparator_gcompare_func (gconstpointer a, gconstpoi
 
 FoldersBranch* folders_branch_construct (GType object_type) {
 	FoldersBranch * self = NULL;
-	FoldersRoot* _tmp0_ = NULL;
-	FoldersRoot* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	FoldersRoot* _tmp0_;
+	FoldersRoot* _tmp1_;
+	const gchar* _tmp2_;
+	GFile* _tmp3_;
 #line 13 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp0_ = folders_root_new ();
 #line 13 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -616,12 +616,12 @@ FoldersBranch* folders_branch_construct (GType object_type) {
 #line 617 "Branch.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		MediaCollectionRegistry* _tmp4_ = NULL;
-		MediaCollectionRegistry* _tmp5_ = NULL;
-		GeeCollection* _tmp6_ = NULL;
-		GeeCollection* _tmp7_ = NULL;
-		GeeIterator* _tmp8_ = NULL;
-		GeeIterator* _tmp9_ = NULL;
+		MediaCollectionRegistry* _tmp4_;
+		MediaCollectionRegistry* _tmp5_;
+		GeeCollection* _tmp6_;
+		GeeCollection* _tmp7_;
+		GeeIterator* _tmp8_;
+		GeeIterator* _tmp9_;
 #line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp4_ = media_collection_registry_get_instance ();
 #line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -643,15 +643,15 @@ FoldersBranch* folders_branch_construct (GType object_type) {
 #line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		while (TRUE) {
 #line 646 "Branch.c"
-			GeeIterator* _tmp10_ = NULL;
-			gboolean _tmp11_ = FALSE;
+			GeeIterator* _tmp10_;
+			gboolean _tmp11_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp12_ = NULL;
-			gpointer _tmp13_ = NULL;
-			MediaSourceCollection* _tmp14_ = NULL;
-			GeeCollection* _tmp15_ = NULL;
-			GeeCollection* _tmp16_ = NULL;
-			MediaSourceCollection* _tmp17_ = NULL;
+			GeeIterator* _tmp12_;
+			gpointer _tmp13_;
+			MediaSourceCollection* _tmp14_;
+			GeeCollection* _tmp15_;
+			GeeCollection* _tmp16_;
+			MediaSourceCollection* _tmp17_;
 #line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp10_ = _sources_it;
 #line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -705,18 +705,18 @@ FoldersBranch* folders_branch_new (void) {
 
 static gint folders_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gint result = 0;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarEntry* _tmp1_;
 	gint coll_key_equality = 0;
-	GCompareFunc _tmp2_ = NULL;
-	SidebarEntry* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	SidebarEntry* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
+	GCompareFunc _tmp2_;
+	SidebarEntry* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
+	SidebarEntry* _tmp6_;
+	const gchar* _tmp7_;
+	const gchar* _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
 #line 34 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
 #line 34 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -756,15 +756,15 @@ static gint folders_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 #line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	if (_tmp10_ == 0) {
 #line 759 "Branch.c"
-		GCompareFunc _tmp11_ = NULL;
-		SidebarEntry* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		SidebarEntry* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
+		GCompareFunc _tmp11_;
+		SidebarEntry* _tmp12_;
+		gchar* _tmp13_;
+		gchar* _tmp14_;
+		SidebarEntry* _tmp15_;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
+		gint _tmp18_;
+		gint _tmp19_;
 #line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp11_ = g_strcmp0;
 #line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -802,8 +802,8 @@ static gint folders_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 
 
 static void folders_branch_on_master_source_replaced (FoldersBranch* self, MediaSource* media_source, GFile* old_file, GFile* new_file) {
-	GFile* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	MediaSource* _tmp1_;
 #line 51 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (FOLDERS_IS_BRANCH (self));
 #line 51 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -832,8 +832,8 @@ static void _folders_branch_on_master_source_replaced_media_source_master_replac
 
 
 static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIterable* added, GeeIterable* removed) {
-	GeeIterable* _tmp0_ = NULL;
-	GeeIterable* _tmp9_ = NULL;
+	GeeIterable* _tmp0_;
+	GeeIterable* _tmp9_;
 #line 56 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (FOLDERS_IS_BRANCH (self));
 #line 56 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -847,8 +847,8 @@ static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIt
 #line 848 "Branch.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp1_ = NULL;
-			GeeIterator* _tmp2_ = NULL;
+			GeeIterable* _tmp1_;
+			GeeIterator* _tmp2_;
 #line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp1_ = added;
 #line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -858,13 +858,13 @@ static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIt
 #line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			while (TRUE) {
 #line 861 "Branch.c"
-				GeeIterator* _tmp3_ = NULL;
-				gboolean _tmp4_ = FALSE;
+				GeeIterator* _tmp3_;
+				gboolean _tmp4_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
-				DataObject* _tmp7_ = NULL;
-				DataObject* _tmp8_ = NULL;
+				GeeIterator* _tmp5_;
+				gpointer _tmp6_;
+				DataObject* _tmp7_;
+				DataObject* _tmp8_;
 #line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp3_ = _object_it;
 #line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -905,8 +905,8 @@ static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIt
 #line 906 "Branch.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp10_ = NULL;
-			GeeIterator* _tmp11_ = NULL;
+			GeeIterable* _tmp10_;
+			GeeIterator* _tmp11_;
 #line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp10_ = removed;
 #line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -916,16 +916,16 @@ static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIt
 #line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			while (TRUE) {
 #line 919 "Branch.c"
-				GeeIterator* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
+				GeeIterator* _tmp12_;
+				gboolean _tmp13_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp14_ = NULL;
-				gpointer _tmp15_ = NULL;
-				DataObject* _tmp16_ = NULL;
-				GFile* _tmp17_ = NULL;
-				GFile* _tmp18_ = NULL;
-				DataObject* _tmp19_ = NULL;
-				guint _tmp20_ = 0U;
+				GeeIterator* _tmp14_;
+				gpointer _tmp15_;
+				DataObject* _tmp16_;
+				GFile* _tmp17_;
+				GFile* _tmp18_;
+				DataObject* _tmp19_;
+				guint _tmp20_;
 #line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp12_ = _object_it;
 #line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -979,13 +979,13 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 	GFile* file = NULL;
-	MediaSource* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	MediaSource* _tmp0_;
+	GFile* _tmp1_;
 	GeeArrayList* elements = NULL;
-	GeeArrayList* _tmp2_ = NULL;
+	GeeArrayList* _tmp2_;
 	GFile* parent = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
 	FoldersSidebarEntry* parent_entry = NULL;
 #line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (FOLDERS_IS_BRANCH (self));
@@ -1010,17 +1010,17 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 #line 79 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	while (TRUE) {
 #line 1013 "Branch.c"
-		GFile* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
-		GFile* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
-		gboolean _tmp11_ = FALSE;
-		GeeArrayList* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		GFile* _tmp14_ = NULL;
-		GFile* _tmp15_ = NULL;
+		GFile* _tmp5_;
+		GFile* _tmp6_;
+		GFile* _tmp7_;
+		GFile* _tmp8_;
+		GFile* _tmp9_;
+		gboolean _tmp10_;
+		gboolean _tmp11_;
+		GeeArrayList* _tmp12_;
+		GFile* _tmp13_;
+		GFile* _tmp14_;
+		GFile* _tmp15_;
 #line 79 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp5_ = parent;
 #line 79 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1070,9 +1070,9 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 #line 1071 "Branch.c"
 	{
 		gint ctr = 0;
-		GeeArrayList* _tmp16_ = NULL;
-		gint _tmp17_ = 0;
-		gint _tmp18_ = 0;
+		GeeArrayList* _tmp16_;
+		gint _tmp17_;
+		gint _tmp18_;
 #line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp16_ = elements;
 #line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1089,23 +1089,23 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 #line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			while (TRUE) {
 #line 1092 "Branch.c"
-				gint _tmp21_ = 0;
+				gint _tmp21_;
 				GFile* parent_dir = NULL;
-				GeeArrayList* _tmp22_ = NULL;
-				gint _tmp23_ = 0;
-				gpointer _tmp24_ = NULL;
+				GeeArrayList* _tmp22_;
+				gint _tmp23_;
+				gpointer _tmp24_;
 				FoldersSidebarEntry* old_parent_entry = NULL;
-				FoldersSidebarEntry* _tmp25_ = NULL;
-				FoldersSidebarEntry* _tmp26_ = NULL;
-				GeeHashMap* _tmp27_ = NULL;
-				GFile* _tmp28_ = NULL;
-				gpointer _tmp29_ = NULL;
-				FoldersSidebarEntry* _tmp30_ = NULL;
-				gint _tmp42_ = 0;
+				FoldersSidebarEntry* _tmp25_;
+				FoldersSidebarEntry* _tmp26_;
+				GeeHashMap* _tmp27_;
+				GFile* _tmp28_;
+				gpointer _tmp29_;
+				FoldersSidebarEntry* _tmp30_;
+				gint _tmp42_;
 #line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				if (!_tmp19_) {
 #line 1108 "Branch.c"
-					gint _tmp20_ = 0;
+					gint _tmp20_;
 #line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					_tmp20_ = ctr;
 #line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1151,14 +1151,14 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 #line 99 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				if (_tmp30_ == NULL) {
 #line 1154 "Branch.c"
-					GFile* _tmp31_ = NULL;
-					FoldersSidebarEntry* _tmp32_ = NULL;
-					GeeHashMap* _tmp33_ = NULL;
-					GFile* _tmp34_ = NULL;
-					FoldersSidebarEntry* _tmp35_ = NULL;
+					GFile* _tmp31_;
+					FoldersSidebarEntry* _tmp32_;
+					GeeHashMap* _tmp33_;
+					GFile* _tmp34_;
+					FoldersSidebarEntry* _tmp35_;
 					SidebarEntry* _tmp36_ = NULL;
-					FoldersSidebarEntry* _tmp37_ = NULL;
-					FoldersSidebarEntry* _tmp41_ = NULL;
+					FoldersSidebarEntry* _tmp37_;
+					FoldersSidebarEntry* _tmp41_;
 #line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					_tmp31_ = parent_dir;
 #line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1180,7 +1180,7 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 #line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					if (_tmp37_ == NULL) {
 #line 1183 "Branch.c"
-						SidebarEntry* _tmp38_ = NULL;
+						SidebarEntry* _tmp38_;
 #line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 						_tmp38_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
 #line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1189,8 +1189,8 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 						_tmp36_ = _tmp38_;
 #line 1191 "Branch.c"
 					} else {
-						FoldersSidebarEntry* _tmp39_ = NULL;
-						SidebarEntry* _tmp40_ = NULL;
+						FoldersSidebarEntry* _tmp39_;
+						SidebarEntry* _tmp40_;
 #line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 						_tmp39_ = old_parent_entry;
 #line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1214,9 +1214,9 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 #line 107 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				if (_tmp42_ == 0) {
 #line 1217 "Branch.c"
-					FoldersSidebarEntry* _tmp43_ = NULL;
-					gint _tmp44_ = 0;
-					gint _tmp45_ = 0;
+					FoldersSidebarEntry* _tmp43_;
+					gint _tmp44_;
+					gint _tmp45_;
 #line 108 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					_tmp43_ = parent_entry;
 #line 108 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1249,26 +1249,26 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 
 static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) {
 	FoldersSidebarEntry* folder_entry = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	gpointer _tmp4_ = NULL;
-	FoldersSidebarEntry* _tmp5_ = NULL;
-	FoldersSidebarEntry* _tmp6_ = NULL;
-	FoldersSidebarEntry* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	gpointer _tmp4_;
+	FoldersSidebarEntry* _tmp5_;
+	FoldersSidebarEntry* _tmp6_;
+	FoldersSidebarEntry* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
 	gboolean _tmp10_ = FALSE;
-	FoldersSidebarEntry* _tmp11_ = NULL;
-	FoldersSidebarEntry* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
+	FoldersSidebarEntry* _tmp11_;
+	FoldersSidebarEntry* _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
 	FoldersSidebarEntry* prune_point = NULL;
-	FoldersSidebarEntry* _tmp17_ = NULL;
-	FoldersSidebarEntry* _tmp18_ = NULL;
-	FoldersSidebarEntry* _tmp19_ = NULL;
-	FoldersSidebarEntry* _tmp40_ = NULL;
+	FoldersSidebarEntry* _tmp17_;
+	FoldersSidebarEntry* _tmp18_;
+	FoldersSidebarEntry* _tmp19_;
+	FoldersSidebarEntry* _tmp40_;
 #line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (FOLDERS_IS_BRANCH (self));
 #line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1323,8 +1323,8 @@ static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) {
 		_tmp10_ = TRUE;
 #line 1325 "Branch.c"
 	} else {
-		FoldersSidebarEntry* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
+		FoldersSidebarEntry* _tmp15_;
+		gint _tmp16_;
 #line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp15_ = folder_entry;
 #line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1360,21 +1360,21 @@ static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) {
 		while (TRUE) {
 #line 1362 "Branch.c"
 			gboolean removed = FALSE;
-			GeeHashMap* _tmp21_ = NULL;
-			FoldersSidebarEntry* _tmp22_ = NULL;
-			GFile* _tmp23_ = NULL;
-			GFile* _tmp24_ = NULL;
-			gboolean _tmp25_ = FALSE;
-			gboolean _tmp26_ = FALSE;
+			GeeHashMap* _tmp21_;
+			FoldersSidebarEntry* _tmp22_;
+			GFile* _tmp23_;
+			GFile* _tmp24_;
+			gboolean _tmp25_;
+			gboolean _tmp26_;
 			FoldersSidebarEntry* parent = NULL;
-			FoldersSidebarEntry* _tmp27_ = NULL;
-			SidebarEntry* _tmp28_ = NULL;
-			FoldersSidebarEntry* _tmp29_ = NULL;
+			FoldersSidebarEntry* _tmp27_;
+			SidebarEntry* _tmp28_;
+			FoldersSidebarEntry* _tmp29_;
 			gboolean _tmp30_ = FALSE;
 			gboolean _tmp31_ = FALSE;
-			FoldersSidebarEntry* _tmp32_ = NULL;
-			FoldersSidebarEntry* _tmp38_ = NULL;
-			FoldersSidebarEntry* _tmp39_ = NULL;
+			FoldersSidebarEntry* _tmp32_;
+			FoldersSidebarEntry* _tmp38_;
+			FoldersSidebarEntry* _tmp39_;
 #line 127 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			if (!_tmp20_) {
 #line 1381 "Branch.c"
@@ -1419,9 +1419,9 @@ static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) {
 				_tmp31_ = TRUE;
 #line 1421 "Branch.c"
 			} else {
-				FoldersSidebarEntry* _tmp33_ = NULL;
-				gint _tmp34_ = 0;
-				gint _tmp35_ = 0;
+				FoldersSidebarEntry* _tmp33_;
+				gint _tmp34_;
+				gint _tmp35_;
 #line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp33_ = parent;
 #line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1438,8 +1438,8 @@ static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) {
 				_tmp30_ = TRUE;
 #line 1440 "Branch.c"
 			} else {
-				FoldersSidebarEntry* _tmp36_ = NULL;
-				gint _tmp37_ = 0;
+				FoldersSidebarEntry* _tmp36_;
+				gint _tmp37_;
 #line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp36_ = parent;
 #line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1493,7 +1493,7 @@ static void folders_branch_class_init (FoldersBranchClass * klass) {
 
 
 static void folders_branch_instance_init (FoldersBranch * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self->priv = FOLDERS_BRANCH_GET_PRIVATE (self);
 #line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1504,19 +1504,19 @@ static void folders_branch_instance_init (FoldersBranch * self) {
 }
 
 
-static void folders_branch_finalize (GObject* obj) {
+static void folders_branch_finalize (GObject * obj) {
 	FoldersBranch * self;
 #line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_BRANCH, FoldersBranch);
 #line 1512 "Branch.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1538,13 +1538,13 @@ static void folders_branch_finalize (GObject* obj) {
 #line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		while (TRUE) {
 #line 1541 "Branch.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			MediaSourceCollection* _tmp10_ = NULL;
-			guint _tmp11_ = 0U;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			MediaSourceCollection* _tmp10_;
+			guint _tmp11_;
 #line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp6_ = _sources_it;
 #line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1599,28 +1599,25 @@ GType folders_branch_get_type (void) {
 
 FoldersRoot* folders_root_construct (GType object_type) {
 	FoldersRoot * self = NULL;
-	const gchar* _tmp0_ = NULL;
-#line 144 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	_tmp0_ = _ ("Folders");
 #line 144 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	self = (FoldersRoot*) sidebar_header_construct (object_type, _tmp0_, TRUE);
+	self = (FoldersRoot*) sidebar_header_construct (object_type, _ ("Folders"), TRUE);
 #line 143 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return self;
-#line 1610 "Branch.c"
+#line 1607 "Branch.c"
 }
 
 
 FoldersRoot* folders_root_new (void) {
 #line 143 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return folders_root_construct (FOLDERS_TYPE_ROOT);
-#line 1617 "Branch.c"
+#line 1614 "Branch.c"
 }
 
 
 static void folders_root_class_init (FoldersRootClass * klass) {
 #line 142 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	folders_root_parent_class = g_type_class_peek_parent (klass);
-#line 1624 "Branch.c"
+#line 1621 "Branch.c"
 }
 
 
@@ -1642,12 +1639,12 @@ GType folders_root_get_type (void) {
 
 FoldersSidebarEntry* folders_sidebar_entry_construct (GType object_type, GFile* dir) {
 	FoldersSidebarEntry * self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_val_if_fail (G_IS_FILE (dir), NULL);
 #line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1674,22 +1671,22 @@ FoldersSidebarEntry* folders_sidebar_entry_construct (GType object_type, GFile*
 	_g_free0 (_tmp3_);
 #line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return self;
-#line 1678 "Branch.c"
+#line 1675 "Branch.c"
 }
 
 
 FoldersSidebarEntry* folders_sidebar_entry_new (GFile* dir) {
 #line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return folders_sidebar_entry_construct (FOLDERS_TYPE_SIDEBAR_ENTRY, dir);
-#line 1685 "Branch.c"
+#line 1682 "Branch.c"
 }
 
 
 static gchar* folders_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	FoldersSidebarEntry * self;
 	gchar* result = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
 #line 174 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
 #line 175 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1700,7 +1697,7 @@ static gchar* folders_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntr
 	result = _tmp1_;
 #line 175 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return result;
-#line 1704 "Branch.c"
+#line 1701 "Branch.c"
 }
 
 
@@ -1708,9 +1705,9 @@ static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntr
 	FoldersSidebarEntry * self;
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gchar* _tmp5_ = NULL;
+	gint _tmp1_;
+	gint _tmp2_;
+	gchar* _tmp5_;
 #line 178 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
 #line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1719,20 +1716,20 @@ static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntr
 	_tmp2_ = _tmp1_;
 #line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	if (_tmp2_ == 0) {
-#line 1723 "Branch.c"
-		const gchar* _tmp3_ = NULL;
+#line 1720 "Branch.c"
+		const gchar* _tmp3_;
 #line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp3_ = folders_icon;
 #line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp0_ = _tmp3_;
-#line 1729 "Branch.c"
+#line 1726 "Branch.c"
 	} else {
-		const gchar* _tmp4_ = NULL;
+		const gchar* _tmp4_;
 #line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp4_ = folders_have_photos_icon;
 #line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp0_ = _tmp4_;
-#line 1736 "Branch.c"
+#line 1733 "Branch.c"
 	}
 #line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp5_ = g_strdup (_tmp0_);
@@ -1740,15 +1737,15 @@ static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntr
 	result = _tmp5_;
 #line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return result;
-#line 1744 "Branch.c"
+#line 1741 "Branch.c"
 }
 
 
 static gchar* folders_sidebar_entry_real_to_string (SidebarSimplePageEntry* base) {
 	FoldersSidebarEntry * self;
 	gchar* result = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
 #line 182 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
 #line 183 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1759,7 +1756,7 @@ static gchar* folders_sidebar_entry_real_to_string (SidebarSimplePageEntry* base
 	result = _tmp1_;
 #line 183 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return result;
-#line 1763 "Branch.c"
+#line 1760 "Branch.c"
 }
 
 
@@ -1772,15 +1769,15 @@ static gboolean folders_sidebar_entry_real_expand_on_select (SidebarExpandableEn
 	result = TRUE;
 #line 187 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return result;
-#line 1776 "Branch.c"
+#line 1773 "Branch.c"
 }
 
 
 static Page* folders_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
 	FoldersSidebarEntry * self;
 	Page* result = NULL;
-	GFile* _tmp0_ = NULL;
-	FoldersPage* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	FoldersPage* _tmp1_;
 #line 190 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
 #line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1793,13 +1790,13 @@ static Page* folders_sidebar_entry_real_create_page (SidebarSimplePageEntry* bas
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
 #line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return result;
-#line 1797 "Branch.c"
+#line 1794 "Branch.c"
 }
 
 
 GFile* folders_sidebar_entry_get_dir (FoldersSidebarEntry* self) {
 	GFile* result;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_val_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self), NULL);
 #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1808,32 +1805,36 @@ GFile* folders_sidebar_entry_get_dir (FoldersSidebarEntry* self) {
 	result = _tmp0_;
 #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return result;
-#line 1812 "Branch.c"
+#line 1809 "Branch.c"
 }
 
 
 static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, GFile* value) {
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
 #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self));
 #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	_tmp0_ = value;
+	if (folders_sidebar_entry_get_dir (self) != value) {
+#line 1818 "Branch.c"
+		GFile* _tmp0_;
+		GFile* _tmp1_;
 #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	_g_object_unref0 (self->priv->_dir);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
 #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	self->priv->_dir = _tmp1_;
+		_g_object_unref0 (self->priv->_dir);
 #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	g_object_notify ((GObject *) self, "dir");
+		self->priv->_dir = _tmp1_;
+#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+		g_object_notify ((GObject *) self, "dir");
 #line 1831 "Branch.c"
+	}
 }
 
 
 const gchar* folders_sidebar_entry_get_collation (FoldersSidebarEntry* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_val_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self), NULL);
 #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1842,32 +1843,36 @@ const gchar* folders_sidebar_entry_get_collation (FoldersSidebarEntry* self) {
 	result = _tmp0_;
 #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return result;
-#line 1846 "Branch.c"
+#line 1847 "Branch.c"
 }
 
 
 static void folders_sidebar_entry_set_collation (FoldersSidebarEntry* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
 #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self));
 #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	_tmp0_ = value;
+	if (g_strcmp0 (value, folders_sidebar_entry_get_collation (self)) != 0) {
+#line 1856 "Branch.c"
+		const gchar* _tmp0_;
+		gchar* _tmp1_;
 #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+		_tmp0_ = value;
 #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	_g_free0 (self->priv->_collation);
+		_tmp1_ = g_strdup (_tmp0_);
 #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	self->priv->_collation = _tmp1_;
+		_g_free0 (self->priv->_collation);
 #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	g_object_notify ((GObject *) self, "collation");
-#line 1865 "Branch.c"
+		self->priv->_collation = _tmp1_;
+#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+		g_object_notify ((GObject *) self, "collation");
+#line 1869 "Branch.c"
+	}
 }
 
 
 gint folders_sidebar_entry_get_count (FoldersSidebarEntry* self) {
 	gint result;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 154 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_val_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self), 0);
 #line 155 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1876,17 +1881,17 @@ gint folders_sidebar_entry_get_count (FoldersSidebarEntry* self) {
 	result = _tmp0_;
 #line 155 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return result;
-#line 1880 "Branch.c"
+#line 1885 "Branch.c"
 }
 
 
 void folders_sidebar_entry_set_count (FoldersSidebarEntry* self, gint value) {
 	gint prev_count = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-	gint _tmp4_ = 0;
+	gint _tmp4_;
 #line 158 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self));
 #line 159 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1901,51 +1906,51 @@ void folders_sidebar_entry_set_count (FoldersSidebarEntry* self, gint value) {
 	_tmp4_ = prev_count;
 #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	if (_tmp4_ == 0) {
-#line 1905 "Branch.c"
-		gint _tmp5_ = 0;
+#line 1910 "Branch.c"
+		gint _tmp5_;
 #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp5_ = self->priv->_count;
 #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp3_ = _tmp5_ == 1;
-#line 1911 "Branch.c"
+#line 1916 "Branch.c"
 	} else {
 #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp3_ = FALSE;
-#line 1915 "Branch.c"
+#line 1920 "Branch.c"
 	}
 #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	if (_tmp3_) {
 #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp2_ = TRUE;
-#line 1921 "Branch.c"
+#line 1926 "Branch.c"
 	} else {
 		gboolean _tmp6_ = FALSE;
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp7_ = prev_count;
 #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		if (_tmp7_ == 1) {
-#line 1929 "Branch.c"
-			gint _tmp8_ = 0;
+#line 1934 "Branch.c"
+			gint _tmp8_;
 #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp8_ = self->priv->_count;
 #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp6_ = _tmp8_ == 0;
-#line 1935 "Branch.c"
+#line 1940 "Branch.c"
 		} else {
 #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp6_ = FALSE;
-#line 1939 "Branch.c"
+#line 1944 "Branch.c"
 		}
 #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp2_ = _tmp6_;
-#line 1943 "Branch.c"
+#line 1948 "Branch.c"
 	}
 #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	if (_tmp2_) {
-#line 1947 "Branch.c"
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
+#line 1952 "Branch.c"
+		gchar* _tmp9_;
+		gchar* _tmp10_;
 #line 164 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp9_ = sidebar_simple_page_entry_get_sidebar_icon (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry));
 #line 164 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1954,11 +1959,11 @@ void folders_sidebar_entry_set_count (FoldersSidebarEntry* self, gint value) {
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-icon-changed", _tmp10_);
 #line 164 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_g_free0 (_tmp10_);
-#line 1958 "Branch.c"
+#line 1963 "Branch.c"
 	}
 #line 158 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_object_notify ((GObject *) self, "count");
-#line 1962 "Branch.c"
+#line 1967 "Branch.c"
 }
 
 
@@ -1968,13 +1973,13 @@ static void folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass)
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_type_class_add_private (klass, sizeof (FoldersSidebarEntryPrivate));
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) folders_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) folders_sidebar_entry_real_get_sidebar_name;
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) folders_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) folders_sidebar_entry_real_get_sidebar_icon;
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->to_string = (gchar* (*)(SidebarSimplePageEntry*)) folders_sidebar_entry_real_to_string;
+	((SidebarSimplePageEntryClass *) klass)->to_string = (gchar* (*) (SidebarSimplePageEntry *)) folders_sidebar_entry_real_to_string;
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) folders_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) folders_sidebar_entry_real_create_page;
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_folders_sidebar_entry_get_property;
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1982,12 +1987,12 @@ static void folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass)
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = folders_sidebar_entry_finalize;
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_DIR, g_param_spec_object ("dir", "dir", "dir", g_file_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY, g_param_spec_object ("dir", "dir", "dir", g_file_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COLLATION, g_param_spec_string ("collation", "collation", "collation", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY, g_param_spec_string ("collation", "collation", "collation", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COUNT, g_param_spec_int ("count", "count", "count", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 1991 "Branch.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY, g_param_spec_int ("count", "count", "count", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+#line 1996 "Branch.c"
 }
 
 
@@ -1995,8 +2000,8 @@ static void folders_sidebar_entry_sidebar_expandable_entry_interface_init (Sideb
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	folders_sidebar_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	iface->expand_on_select = (gboolean (*)(SidebarExpandableEntry*)) folders_sidebar_entry_real_expand_on_select;
-#line 2000 "Branch.c"
+	iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) folders_sidebar_entry_real_expand_on_select;
+#line 2005 "Branch.c"
 }
 
 
@@ -2005,11 +2010,11 @@ static void folders_sidebar_entry_instance_init (FoldersSidebarEntry * self) {
 	self->priv = FOLDERS_SIDEBAR_ENTRY_GET_PRIVATE (self);
 #line 152 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self->priv->_count = 0;
-#line 2009 "Branch.c"
+#line 2014 "Branch.c"
 }
 
 
-static void folders_sidebar_entry_finalize (GObject* obj) {
+static void folders_sidebar_entry_finalize (GObject * obj) {
 	FoldersSidebarEntry * self;
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
@@ -2019,7 +2024,7 @@ static void folders_sidebar_entry_finalize (GObject* obj) {
 	_g_free0 (self->priv->_collation);
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	G_OBJECT_CLASS (folders_sidebar_entry_parent_class)->finalize (obj);
-#line 2023 "Branch.c"
+#line 2028 "Branch.c"
 }
 
 
@@ -2043,30 +2048,30 @@ static void _vala_folders_sidebar_entry_get_property (GObject * object, guint pr
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	switch (property_id) {
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		case FOLDERS_SIDEBAR_ENTRY_DIR:
+		case FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY:
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		g_value_set_object (value, folders_sidebar_entry_get_dir (self));
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		break;
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		case FOLDERS_SIDEBAR_ENTRY_COLLATION:
+		case FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY:
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		g_value_set_string (value, folders_sidebar_entry_get_collation (self));
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		break;
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		case FOLDERS_SIDEBAR_ENTRY_COUNT:
+		case FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY:
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		g_value_set_int (value, folders_sidebar_entry_get_count (self));
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		break;
-#line 2064 "Branch.c"
+#line 2069 "Branch.c"
 		default:
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		break;
-#line 2070 "Branch.c"
+#line 2075 "Branch.c"
 	}
 }
 
@@ -2077,30 +2082,30 @@ static void _vala_folders_sidebar_entry_set_property (GObject * object, guint pr
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	switch (property_id) {
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		case FOLDERS_SIDEBAR_ENTRY_DIR:
+		case FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY:
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		folders_sidebar_entry_set_dir (self, g_value_get_object (value));
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		break;
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		case FOLDERS_SIDEBAR_ENTRY_COLLATION:
+		case FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY:
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		folders_sidebar_entry_set_collation (self, g_value_get_string (value));
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		break;
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		case FOLDERS_SIDEBAR_ENTRY_COUNT:
+		case FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY:
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		folders_sidebar_entry_set_count (self, g_value_get_int (value));
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		break;
-#line 2098 "Branch.c"
+#line 2103 "Branch.c"
 		default:
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		break;
-#line 2104 "Branch.c"
+#line 2109 "Branch.c"
 	}
 }
 
diff --git a/src/folders/Folders.c b/src/folders/Folders.c
index cae90dc..eede6db 100644
--- a/src/folders/Folders.c
+++ b/src/folders/Folders.c
@@ -1,4 +1,4 @@
-/* Folders.c generated by valac 0.34.7, the Vala compiler
+/* Folders.c generated by valac 0.36.6, the Vala compiler
  * generated from Folders.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -35,8 +35,8 @@ void folders_terminate (void);
 
 
 void folders_init (GError** error) {
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 22 "/home/jens/Source/shotwell/src/folders/Folders.vala"
 	_tmp0_ = g_strdup (RESOURCES_ICON_FOLDER);
 #line 22 "/home/jens/Source/shotwell/src/folders/Folders.vala"
diff --git a/src/folders/Page.c b/src/folders/Page.c
index 3c05b3e..49bb21a 100644
--- a/src/folders/Page.c
+++ b/src/folders/Page.c
@@ -1,4 +1,4 @@
-/* Page.c generated by valac 0.34.7, the Vala compiler
+/* Page.c generated by valac 0.36.6, the Vala compiler
  * generated from Page.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -675,17 +675,17 @@ static gboolean folders_page_folder_view_manager_real_include_in_view (ViewManag
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 GFile* media_source_get_file (MediaSource* self);
-static void folders_page_folder_view_manager_finalize (ViewManager* obj);
-static void folders_page_finalize (GObject* obj);
+static void folders_page_folder_view_manager_finalize (ViewManager * obj);
+static void folders_page_finalize (GObject * obj);
 
 
 FoldersPage* folders_page_construct (GType object_type, GFile* dir) {
 	FoldersPage * self = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	FoldersPageFolderViewManager* _tmp4_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	GFile* _tmp3_;
+	FoldersPageFolderViewManager* _tmp4_;
 #line 24 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	g_return_val_if_fail (G_IS_FILE (dir), NULL);
 #line 25 "/home/jens/Source/shotwell/src/folders/Page.vala"
@@ -709,12 +709,12 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) {
 #line 710 "Page.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		MediaCollectionRegistry* _tmp5_ = NULL;
-		MediaCollectionRegistry* _tmp6_ = NULL;
-		GeeCollection* _tmp7_ = NULL;
-		GeeCollection* _tmp8_ = NULL;
-		GeeIterator* _tmp9_ = NULL;
-		GeeIterator* _tmp10_ = NULL;
+		MediaCollectionRegistry* _tmp5_;
+		MediaCollectionRegistry* _tmp6_;
+		GeeCollection* _tmp7_;
+		GeeCollection* _tmp8_;
+		GeeIterator* _tmp9_;
+		GeeIterator* _tmp10_;
 #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
 		_tmp5_ = media_collection_registry_get_instance ();
 #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
@@ -736,17 +736,17 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) {
 #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
 		while (TRUE) {
 #line 739 "Page.c"
-			GeeIterator* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
+			GeeIterator* _tmp11_;
+			gboolean _tmp12_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp13_ = NULL;
-			gpointer _tmp14_ = NULL;
-			ViewCollection* _tmp15_ = NULL;
-			ViewCollection* _tmp16_ = NULL;
-			MediaSourceCollection* _tmp17_ = NULL;
-			FoldersPageFolderViewManager* _tmp18_ = NULL;
-			ViewCollectionMonitor* _tmp19_ = NULL;
-			ViewCollectionMonitor* _tmp20_ = NULL;
+			GeeIterator* _tmp13_;
+			gpointer _tmp14_;
+			ViewCollection* _tmp15_;
+			ViewCollection* _tmp16_;
+			MediaSourceCollection* _tmp17_;
+			FoldersPageFolderViewManager* _tmp18_;
+			ViewCollectionMonitor* _tmp19_;
+			ViewCollectionMonitor* _tmp20_;
 #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
 			_tmp11_ = _sources_it;
 #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
@@ -804,8 +804,8 @@ static void folders_page_real_get_config_photos_sort (MediaPage* base, gboolean*
 	FoldersPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
 #line 33 "/home/jens/Source/shotwell/src/folders/Page.vala"
@@ -839,10 +839,10 @@ static void folders_page_real_get_config_photos_sort (MediaPage* base, gboolean*
 
 static void folders_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
 	FoldersPage * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gint _tmp3_;
 #line 37 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_PAGE, FoldersPage);
 #line 38 "/home/jens/Source/shotwell/src/folders/Page.vala"
@@ -870,9 +870,9 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static FoldersPageFolderViewManager* folders_page_folder_view_manager_construct (GType object_type, FoldersPage* owner, GFile* dir) {
 	FoldersPageFolderViewManager* self = NULL;
-	FoldersPage* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	FoldersPage* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
 #line 11 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	g_return_val_if_fail (FOLDERS_IS_PAGE (owner), NULL);
 #line 11 "/home/jens/Source/shotwell/src/folders/Page.vala"
@@ -905,12 +905,12 @@ static FoldersPageFolderViewManager* folders_page_folder_view_manager_new (Folde
 static gboolean folders_page_folder_view_manager_real_include_in_view (ViewManager* base, DataSource* source) {
 	FoldersPageFolderViewManager * self;
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	DataSource* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
 #line 17 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, FoldersPageFolderViewManager);
 #line 17 "/home/jens/Source/shotwell/src/folders/Page.vala"
@@ -943,7 +943,7 @@ static void folders_page_folder_view_manager_class_init (FoldersPageFolderViewMa
 #line 8 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	((ViewManagerClass *) klass)->finalize = folders_page_folder_view_manager_finalize;
 #line 8 "/home/jens/Source/shotwell/src/folders/Page.vala"
-	((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) folders_page_folder_view_manager_real_include_in_view;
+	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) folders_page_folder_view_manager_real_include_in_view;
 #line 948 "Page.c"
 }
 
@@ -952,7 +952,7 @@ static void folders_page_folder_view_manager_instance_init (FoldersPageFolderVie
 }
 
 
-static void folders_page_folder_view_manager_finalize (ViewManager* obj) {
+static void folders_page_folder_view_manager_finalize (ViewManager * obj) {
 	FoldersPageFolderViewManager * self;
 #line 8 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, FoldersPageFolderViewManager);
@@ -982,9 +982,9 @@ static void folders_page_class_init (FoldersPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	g_type_class_add_private (klass, sizeof (FoldersPagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
-	((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) folders_page_real_get_config_photos_sort;
+	((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) folders_page_real_get_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
-	((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) folders_page_real_set_config_photos_sort;
+	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) folders_page_real_set_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = folders_page_finalize;
 #line 991 "Page.c"
@@ -998,7 +998,7 @@ static void folders_page_instance_init (FoldersPage * self) {
 }
 
 
-static void folders_page_finalize (GObject* obj) {
+static void folders_page_finalize (GObject * obj) {
 	FoldersPage * self;
 #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_PAGE, FoldersPage);
diff --git a/src/library/Branch.c b/src/library/Branch.c
index 9a3d452..92955e2 100644
--- a/src/library/Branch.c
+++ b/src/library/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.7, the Vala compiler
+/* Branch.c generated by valac 0.36.6, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -239,6 +239,11 @@ typedef struct _CollectionPageClass CollectionPageClass;
 typedef struct _LibraryMainPage LibraryMainPage;
 typedef struct _LibraryMainPageClass LibraryMainPageClass;
 typedef struct _LibraryHideablePageEntryPrivate LibraryHideablePageEntryPrivate;
+enum  {
+	LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL,
+	LIBRARY_HIDEABLE_PAGE_ENTRY_LAST_SIGNAL
+};
+static guint library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_LAST_SIGNAL] = {0};
 typedef struct _PagePrivate PagePrivate;
 
 #define TYPE_PAGE_WINDOW (page_window_get_type ())
@@ -786,12 +791,12 @@ GType library_trash_sidebar_entry_get_type (void) G_GNUC_CONST;
 #define LIBRARY_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRARY_TYPE_BRANCH, LibraryBranchPrivate))
 enum  {
 	LIBRARY_BRANCH_DUMMY_PROPERTY,
-	LIBRARY_BRANCH_PHOTOS_ENTRY,
-	LIBRARY_BRANCH_FLAGGED_ENTRY,
-	LIBRARY_BRANCH_LAST_IMPORTED_ENTRY,
-	LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY,
-	LIBRARY_BRANCH_OFFLINE_ENTRY,
-	LIBRARY_BRANCH_TRASH_ENTRY
+	LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY
 };
 static GType library_branch_entry_position_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define LIBRARY_BRANCH_POSITION_DATA "x-photos-entry-position"
@@ -847,7 +852,7 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library
 gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self);
 gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry);
 void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
-static void library_branch_finalize (GObject* obj);
+static void library_branch_finalize (GObject * obj);
 static void _vala_library_branch_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_library_branch_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
@@ -871,11 +876,11 @@ GType library_main_page_get_type (void) G_GNUC_CONST;
 #define LIBRARY_HIDEABLE_PAGE_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntryPrivate))
 enum  {
 	LIBRARY_HIDEABLE_PAGE_ENTRY_DUMMY_PROPERTY,
-	LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE
+	LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY
 };
 LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type);
 void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value);
-static void library_hideable_page_entry_finalize (GObject* obj);
+static void library_hideable_page_entry_finalize (GObject * obj);
 static void _vala_library_hideable_page_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_library_hideable_page_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 GType page_window_get_type (void) G_GNUC_CONST;
@@ -991,170 +996,167 @@ static gint _library_branch_comparator_gcompare_func (gconstpointer a, gconstpoi
 	result = library_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
 #line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 995 "Branch.c"
+#line 1000 "Branch.c"
 }
 
 
 static void _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
 #line 43 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_flagged_visibility_changed ((LibraryBranch*) self);
-#line 1002 "Branch.c"
+#line 1007 "Branch.c"
 }
 
 
 static void _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
 #line 46 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_last_imported_visibility_changed ((LibraryBranch*) self);
-#line 1009 "Branch.c"
+#line 1014 "Branch.c"
 }
 
 
 static void _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
 #line 49 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_import_queue_visibility_changed ((LibraryBranch*) self);
-#line 1016 "Branch.c"
+#line 1021 "Branch.c"
 }
 
 
 static void _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
 #line 52 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_offline_visibility_changed ((LibraryBranch*) self);
-#line 1023 "Branch.c"
+#line 1028 "Branch.c"
 }
 
 
 LibraryBranch* library_branch_construct (GType object_type) {
 	LibraryBranch * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	SidebarHeader* _tmp1_ = NULL;
-	SidebarHeader* _tmp2_ = NULL;
-	LibraryPhotosEntry* _tmp3_ = NULL;
-	LibraryPhotosEntry* _tmp4_ = NULL;
-	LibraryTrashSidebarEntry* _tmp5_ = NULL;
-	LibraryTrashSidebarEntry* _tmp6_ = NULL;
-	LibraryLastImportSidebarEntry* _tmp7_ = NULL;
-	LibraryLastImportSidebarEntry* _tmp8_ = NULL;
-	LibraryFlaggedSidebarEntry* _tmp9_ = NULL;
-	LibraryFlaggedSidebarEntry* _tmp10_ = NULL;
-	LibraryOfflineSidebarEntry* _tmp11_ = NULL;
-	LibraryOfflineSidebarEntry* _tmp12_ = NULL;
-	LibraryImportQueueSidebarEntry* _tmp13_ = NULL;
-	LibraryImportQueueSidebarEntry* _tmp14_ = NULL;
-	LibraryPhotosEntry* _tmp15_ = NULL;
-	LibraryTrashSidebarEntry* _tmp16_ = NULL;
-	LibraryFlaggedSidebarEntry* _tmp17_ = NULL;
-	LibraryLastImportSidebarEntry* _tmp18_ = NULL;
-	LibraryImportQueueSidebarEntry* _tmp19_ = NULL;
-	LibraryOfflineSidebarEntry* _tmp20_ = NULL;
-#line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = _ ("Library");
+	SidebarHeader* _tmp0_;
+	SidebarHeader* _tmp1_;
+	LibraryPhotosEntry* _tmp2_;
+	LibraryPhotosEntry* _tmp3_;
+	LibraryTrashSidebarEntry* _tmp4_;
+	LibraryTrashSidebarEntry* _tmp5_;
+	LibraryLastImportSidebarEntry* _tmp6_;
+	LibraryLastImportSidebarEntry* _tmp7_;
+	LibraryFlaggedSidebarEntry* _tmp8_;
+	LibraryFlaggedSidebarEntry* _tmp9_;
+	LibraryOfflineSidebarEntry* _tmp10_;
+	LibraryOfflineSidebarEntry* _tmp11_;
+	LibraryImportQueueSidebarEntry* _tmp12_;
+	LibraryImportQueueSidebarEntry* _tmp13_;
+	LibraryPhotosEntry* _tmp14_;
+	LibraryTrashSidebarEntry* _tmp15_;
+	LibraryFlaggedSidebarEntry* _tmp16_;
+	LibraryLastImportSidebarEntry* _tmp17_;
+	LibraryImportQueueSidebarEntry* _tmp18_;
+	LibraryOfflineSidebarEntry* _tmp19_;
 #line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = sidebar_header_new (_tmp0_, TRUE);
+	_tmp0_ = sidebar_header_new (_ ("Library"), TRUE);
 #line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self = (LibraryBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING, _library_branch_comparator_gcompare_func, NULL);
+	self = (LibraryBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING, _library_branch_comparator_gcompare_func, NULL);
 #line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp3_ = library_photos_entry_new ();
+	_tmp2_ = library_photos_entry_new ();
 #line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_photos_entry (self, _tmp4_);
+	library_branch_set_photos_entry (self, _tmp3_);
 #line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp3_);
 #line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp5_ = library_trash_sidebar_entry_new ();
+	_tmp4_ = library_trash_sidebar_entry_new ();
 #line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_trash_entry (self, _tmp6_);
+	library_branch_set_trash_entry (self, _tmp5_);
 #line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp6_);
+	_g_object_unref0 (_tmp5_);
 #line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp7_ = library_last_import_sidebar_entry_new ();
+	_tmp6_ = library_last_import_sidebar_entry_new ();
 #line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp8_ = _tmp7_;
+	_tmp7_ = _tmp6_;
 #line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_last_imported_entry (self, _tmp8_);
+	library_branch_set_last_imported_entry (self, _tmp7_);
 #line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp8_);
+	_g_object_unref0 (_tmp7_);
 #line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp9_ = library_flagged_sidebar_entry_new ();
+	_tmp8_ = library_flagged_sidebar_entry_new ();
 #line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp10_ = _tmp9_;
+	_tmp9_ = _tmp8_;
 #line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_flagged_entry (self, _tmp10_);
+	library_branch_set_flagged_entry (self, _tmp9_);
 #line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp10_);
+	_g_object_unref0 (_tmp9_);
 #line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp11_ = library_offline_sidebar_entry_new ();
+	_tmp10_ = library_offline_sidebar_entry_new ();
 #line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp12_ = _tmp11_;
+	_tmp11_ = _tmp10_;
 #line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_offline_entry (self, _tmp12_);
+	library_branch_set_offline_entry (self, _tmp11_);
 #line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp12_);
+	_g_object_unref0 (_tmp11_);
 #line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp13_ = library_import_queue_sidebar_entry_new ();
+	_tmp12_ = library_import_queue_sidebar_entry_new ();
 #line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp14_ = _tmp13_;
+	_tmp13_ = _tmp12_;
 #line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_import_queue_entry (self, _tmp14_);
+	library_branch_set_import_queue_entry (self, _tmp13_);
 #line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp14_);
+	_g_object_unref0 (_tmp13_);
 #line 40 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp15_ = self->priv->_photos_entry;
+	_tmp14_ = self->priv->_photos_entry;
 #line 40 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS);
+	library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS);
 #line 41 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp16_ = self->priv->_trash_entry;
+	_tmp15_ = self->priv->_trash_entry;
 #line 41 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_TRASH);
+	library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_TRASH);
 #line 43 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp17_ = self->priv->_flagged_entry;
+	_tmp16_ = self->priv->_flagged_entry;
 #line 43 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
 #line 44 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_flagged_visibility_changed (self);
 #line 46 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp18_ = self->priv->_last_imported_entry;
+	_tmp17_ = self->priv->_last_imported_entry;
 #line 46 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
 #line 47 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_last_imported_visibility_changed (self);
 #line 49 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp19_ = self->priv->_import_queue_entry;
+	_tmp18_ = self->priv->_import_queue_entry;
 #line 49 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
 #line 50 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_import_queue_visibility_changed (self);
 #line 52 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp20_ = self->priv->_offline_entry;
+	_tmp19_ = self->priv->_offline_entry;
 #line 52 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
 #line 53 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_offline_visibility_changed (self);
 #line 29 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return self;
-#line 1142 "Branch.c"
+#line 1144 "Branch.c"
 }
 
 
 LibraryBranch* library_branch_new (void) {
 #line 29 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return library_branch_construct (LIBRARY_TYPE_BRANCH);
-#line 1149 "Branch.c"
+#line 1151 "Branch.c"
 }
 
 
 static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gint position) {
-	SidebarEntry* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	SidebarEntry* _tmp2_ = NULL;
-	SidebarEntry* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
+	SidebarEntry* _tmp0_;
+	gint _tmp1_;
+	SidebarEntry* _tmp2_;
+	SidebarEntry* _tmp3_;
+	SidebarEntry* _tmp4_;
 #line 56 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 56 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1175,62 +1177,62 @@ static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gin
 	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, _tmp4_, NULL);
 #line 58 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1179 "Branch.c"
+#line 1181 "Branch.c"
 }
 
 
 static void library_branch_on_flagged_visibility_changed (LibraryBranch* self) {
-	LibraryFlaggedSidebarEntry* _tmp0_ = NULL;
+	LibraryFlaggedSidebarEntry* _tmp0_;
 #line 61 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 62 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_tmp0_ = self->priv->_flagged_entry;
 #line 62 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED);
-#line 1191 "Branch.c"
+#line 1193 "Branch.c"
 }
 
 
 static void library_branch_on_last_imported_visibility_changed (LibraryBranch* self) {
-	LibraryLastImportSidebarEntry* _tmp0_ = NULL;
+	LibraryLastImportSidebarEntry* _tmp0_;
 #line 65 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 66 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_tmp0_ = self->priv->_last_imported_entry;
 #line 66 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED);
-#line 1203 "Branch.c"
+#line 1205 "Branch.c"
 }
 
 
 static void library_branch_on_import_queue_visibility_changed (LibraryBranch* self) {
-	LibraryImportQueueSidebarEntry* _tmp0_ = NULL;
+	LibraryImportQueueSidebarEntry* _tmp0_;
 #line 69 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 70 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_tmp0_ = self->priv->_import_queue_entry;
 #line 70 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE);
-#line 1215 "Branch.c"
+#line 1217 "Branch.c"
 }
 
 
 static void library_branch_on_offline_visibility_changed (LibraryBranch* self) {
-	LibraryOfflineSidebarEntry* _tmp0_ = NULL;
+	LibraryOfflineSidebarEntry* _tmp0_;
 #line 73 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 74 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_tmp0_ = self->priv->_offline_entry;
 #line 74 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE);
-#line 1227 "Branch.c"
+#line 1229 "Branch.c"
 }
 
 
 static void library_branch_update_entry_visibility (LibraryBranch* self, LibraryHideablePageEntry* entry, gint position) {
-	LibraryHideablePageEntry* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	LibraryHideablePageEntry* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 #line 77 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 77 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1243,42 +1245,42 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library
 	_tmp2_ = _tmp1_;
 #line 78 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	if (_tmp2_) {
-#line 1247 "Branch.c"
-		LibraryHideablePageEntry* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+#line 1249 "Branch.c"
+		LibraryHideablePageEntry* _tmp3_;
+		gboolean _tmp4_;
 #line 79 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		_tmp3_ = entry;
 #line 79 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		_tmp4_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 79 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		if (!_tmp4_) {
-#line 1256 "Branch.c"
-			LibraryHideablePageEntry* _tmp5_ = NULL;
-			gint _tmp6_ = 0;
+#line 1258 "Branch.c"
+			LibraryHideablePageEntry* _tmp5_;
+			gint _tmp6_;
 #line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			_tmp5_ = entry;
 #line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			_tmp6_ = position;
 #line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp6_);
-#line 1265 "Branch.c"
+#line 1267 "Branch.c"
 		}
 	} else {
-		LibraryHideablePageEntry* _tmp7_ = NULL;
-		gboolean _tmp8_ = FALSE;
+		LibraryHideablePageEntry* _tmp7_;
+		gboolean _tmp8_;
 #line 81 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		_tmp7_ = entry;
 #line 81 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		_tmp8_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 81 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		if (_tmp8_) {
-#line 1276 "Branch.c"
-			LibraryHideablePageEntry* _tmp9_ = NULL;
+#line 1278 "Branch.c"
+			LibraryHideablePageEntry* _tmp9_;
 #line 82 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			_tmp9_ = entry;
 #line 82 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 1282 "Branch.c"
+#line 1284 "Branch.c"
 		}
 	}
 }
@@ -1286,10 +1288,10 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library
 
 static gint library_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gint result = 0;
-	SidebarEntry* _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
-	gconstpointer _tmp3_ = NULL;
+	SidebarEntry* _tmp0_;
+	gconstpointer _tmp1_;
+	SidebarEntry* _tmp2_;
+	gconstpointer _tmp3_;
 #line 86 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
 #line 86 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1306,13 +1308,13 @@ static gint library_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	result = ((gint) ((gintptr) _tmp1_)) - ((gint) ((gintptr) _tmp3_));
 #line 87 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1310 "Branch.c"
+#line 1312 "Branch.c"
 }
 
 
 LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) {
 	LibraryPhotosEntry* result;
-	LibraryPhotosEntry* _tmp0_ = NULL;
+	LibraryPhotosEntry* _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1321,39 +1323,43 @@ LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) {
 	result = _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1325 "Branch.c"
+#line 1327 "Branch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1332 "Branch.c"
+#line 1334 "Branch.c"
 }
 
 
 static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosEntry* value) {
-	LibraryPhotosEntry* _tmp0_ = NULL;
-	LibraryPhotosEntry* _tmp1_ = NULL;
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = value;
+	if (library_branch_get_photos_entry (self) != value) {
+#line 1343 "Branch.c"
+		LibraryPhotosEntry* _tmp0_;
+		LibraryPhotosEntry* _tmp1_;
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_photos_entry);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self->priv->_photos_entry = _tmp1_;
+		_g_object_unref0 (self->priv->_photos_entry);
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_notify ((GObject *) self, "photos-entry");
-#line 1351 "Branch.c"
+		self->priv->_photos_entry = _tmp1_;
+#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+		g_object_notify ((GObject *) self, "photos-entry");
+#line 1356 "Branch.c"
+	}
 }
 
 
 LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* self) {
 	LibraryFlaggedSidebarEntry* result;
-	LibraryFlaggedSidebarEntry* _tmp0_ = NULL;
+	LibraryFlaggedSidebarEntry* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1362,32 +1368,36 @@ LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* sel
 	result = _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1366 "Branch.c"
+#line 1372 "Branch.c"
 }
 
 
 static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlaggedSidebarEntry* value) {
-	LibraryFlaggedSidebarEntry* _tmp0_ = NULL;
-	LibraryFlaggedSidebarEntry* _tmp1_ = NULL;
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = value;
+	if (library_branch_get_flagged_entry (self) != value) {
+#line 1381 "Branch.c"
+		LibraryFlaggedSidebarEntry* _tmp0_;
+		LibraryFlaggedSidebarEntry* _tmp1_;
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_flagged_entry);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+		_g_object_unref0 (self->priv->_flagged_entry);
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self->priv->_flagged_entry = _tmp1_;
+		self->priv->_flagged_entry = _tmp1_;
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_notify ((GObject *) self, "flagged-entry");
-#line 1385 "Branch.c"
+		g_object_notify ((GObject *) self, "flagged-entry");
+#line 1394 "Branch.c"
+	}
 }
 
 
 LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBranch* self) {
 	LibraryLastImportSidebarEntry* result;
-	LibraryLastImportSidebarEntry* _tmp0_ = NULL;
+	LibraryLastImportSidebarEntry* _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1396,32 +1406,36 @@ LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBr
 	result = _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1400 "Branch.c"
+#line 1410 "Branch.c"
 }
 
 
 static void library_branch_set_last_imported_entry (LibraryBranch* self, LibraryLastImportSidebarEntry* value) {
-	LibraryLastImportSidebarEntry* _tmp0_ = NULL;
-	LibraryLastImportSidebarEntry* _tmp1_ = NULL;
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = value;
+	if (library_branch_get_last_imported_entry (self) != value) {
+#line 1419 "Branch.c"
+		LibraryLastImportSidebarEntry* _tmp0_;
+		LibraryLastImportSidebarEntry* _tmp1_;
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_last_imported_entry);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self->priv->_last_imported_entry = _tmp1_;
+		_g_object_unref0 (self->priv->_last_imported_entry);
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_notify ((GObject *) self, "last-imported-entry");
-#line 1419 "Branch.c"
+		self->priv->_last_imported_entry = _tmp1_;
+#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+		g_object_notify ((GObject *) self, "last-imported-entry");
+#line 1432 "Branch.c"
+	}
 }
 
 
 LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBranch* self) {
 	LibraryImportQueueSidebarEntry* result;
-	LibraryImportQueueSidebarEntry* _tmp0_ = NULL;
+	LibraryImportQueueSidebarEntry* _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1430,32 +1444,36 @@ LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBr
 	result = _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1434 "Branch.c"
+#line 1448 "Branch.c"
 }
 
 
 static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryImportQueueSidebarEntry* value) {
-	LibraryImportQueueSidebarEntry* _tmp0_ = NULL;
-	LibraryImportQueueSidebarEntry* _tmp1_ = NULL;
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = value;
+	if (library_branch_get_import_queue_entry (self) != value) {
+#line 1457 "Branch.c"
+		LibraryImportQueueSidebarEntry* _tmp0_;
+		LibraryImportQueueSidebarEntry* _tmp1_;
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_import_queue_entry);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self->priv->_import_queue_entry = _tmp1_;
+		_g_object_unref0 (self->priv->_import_queue_entry);
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_notify ((GObject *) self, "import-queue-entry");
-#line 1453 "Branch.c"
+		self->priv->_import_queue_entry = _tmp1_;
+#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+		g_object_notify ((GObject *) self, "import-queue-entry");
+#line 1470 "Branch.c"
+	}
 }
 
 
 LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* self) {
 	LibraryOfflineSidebarEntry* result;
-	LibraryOfflineSidebarEntry* _tmp0_ = NULL;
+	LibraryOfflineSidebarEntry* _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1464,32 +1482,36 @@ LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* sel
 	result = _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1468 "Branch.c"
+#line 1486 "Branch.c"
 }
 
 
 static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflineSidebarEntry* value) {
-	LibraryOfflineSidebarEntry* _tmp0_ = NULL;
-	LibraryOfflineSidebarEntry* _tmp1_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = value;
+	if (library_branch_get_offline_entry (self) != value) {
+#line 1495 "Branch.c"
+		LibraryOfflineSidebarEntry* _tmp0_;
+		LibraryOfflineSidebarEntry* _tmp1_;
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_offline_entry);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+		_g_object_unref0 (self->priv->_offline_entry);
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self->priv->_offline_entry = _tmp1_;
+		self->priv->_offline_entry = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_notify ((GObject *) self, "offline-entry");
-#line 1487 "Branch.c"
+		g_object_notify ((GObject *) self, "offline-entry");
+#line 1508 "Branch.c"
+	}
 }
 
 
 LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) {
 	LibraryTrashSidebarEntry* result;
-	LibraryTrashSidebarEntry* _tmp0_ = NULL;
+	LibraryTrashSidebarEntry* _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1498,26 +1520,30 @@ LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) {
 	result = _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1502 "Branch.c"
+#line 1524 "Branch.c"
 }
 
 
 static void library_branch_set_trash_entry (LibraryBranch* self, LibraryTrashSidebarEntry* value) {
-	LibraryTrashSidebarEntry* _tmp0_ = NULL;
-	LibraryTrashSidebarEntry* _tmp1_ = NULL;
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = value;
+	if (library_branch_get_trash_entry (self) != value) {
+#line 1533 "Branch.c"
+		LibraryTrashSidebarEntry* _tmp0_;
+		LibraryTrashSidebarEntry* _tmp1_;
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_trash_entry);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self->priv->_trash_entry = _tmp1_;
+		_g_object_unref0 (self->priv->_trash_entry);
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_notify ((GObject *) self, "trash-entry");
-#line 1521 "Branch.c"
+		self->priv->_trash_entry = _tmp1_;
+#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+		g_object_notify ((GObject *) self, "trash-entry");
+#line 1546 "Branch.c"
+	}
 }
 
 
@@ -1533,29 +1559,29 @@ static void library_branch_class_init (LibraryBranchClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_branch_finalize;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_PHOTOS_ENTRY, g_param_spec_object ("photos-entry", "photos-entry", "photos-entry", LIBRARY_TYPE_PHOTOS_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY, g_param_spec_object ("photos-entry", "photos-entry", "photos-entry", LIBRARY_TYPE_PHOTOS_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_FLAGGED_ENTRY, g_param_spec_object ("flagged-entry", "flagged-entry", "flagged-entry", LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY, g_param_spec_object ("flagged-entry", "flagged-entry", "flagged-entry", LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_LAST_IMPORTED_ENTRY, g_param_spec_object ("last-imported-entry", "last-imported-entry", "last-imported-entry", LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY, g_param_spec_object ("last-imported-entry", "last-imported-entry", "last-imported-entry", LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY, g_param_spec_object ("import-queue-entry", "import-queue-entry", "import-queue-entry", LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY, g_param_spec_object ("import-queue-entry", "import-queue-entry", "import-queue-entry", LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_OFFLINE_ENTRY, g_param_spec_object ("offline-entry", "offline-entry", "offline-entry", LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY, g_param_spec_object ("offline-entry", "offline-entry", "offline-entry", LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_TRASH_ENTRY, g_param_spec_object ("trash-entry", "trash-entry", "trash-entry", LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 1548 "Branch.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY, g_param_spec_object ("trash-entry", "trash-entry", "trash-entry", LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 1574 "Branch.c"
 }
 
 
 static void library_branch_instance_init (LibraryBranch * self) {
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self->priv = LIBRARY_BRANCH_GET_PRIVATE (self);
-#line 1555 "Branch.c"
+#line 1581 "Branch.c"
 }
 
 
-static void library_branch_finalize (GObject* obj) {
+static void library_branch_finalize (GObject * obj) {
 	LibraryBranch * self;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_BRANCH, LibraryBranch);
@@ -1573,7 +1599,7 @@ static void library_branch_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->_trash_entry);
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	G_OBJECT_CLASS (library_branch_parent_class)->finalize (obj);
-#line 1577 "Branch.c"
+#line 1603 "Branch.c"
 }
 
 
@@ -1595,48 +1621,48 @@ static void _vala_library_branch_get_property (GObject * object, guint property_
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	switch (property_id) {
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_PHOTOS_ENTRY:
+		case LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		g_value_set_object (value, library_branch_get_photos_entry (self));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_FLAGGED_ENTRY:
+		case LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		g_value_set_object (value, library_branch_get_flagged_entry (self));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY:
+		case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		g_value_set_object (value, library_branch_get_last_imported_entry (self));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY:
+		case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		g_value_set_object (value, library_branch_get_import_queue_entry (self));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_OFFLINE_ENTRY:
+		case LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		g_value_set_object (value, library_branch_get_offline_entry (self));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_TRASH_ENTRY:
+		case LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		g_value_set_object (value, library_branch_get_trash_entry (self));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1634 "Branch.c"
+#line 1660 "Branch.c"
 		default:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1640 "Branch.c"
+#line 1666 "Branch.c"
 	}
 }
 
@@ -1647,48 +1673,48 @@ static void _vala_library_branch_set_property (GObject * object, guint property_
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	switch (property_id) {
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_PHOTOS_ENTRY:
+		case LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		library_branch_set_photos_entry (self, g_value_get_object (value));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_FLAGGED_ENTRY:
+		case LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		library_branch_set_flagged_entry (self, g_value_get_object (value));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY:
+		case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		library_branch_set_last_imported_entry (self, g_value_get_object (value));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY:
+		case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		library_branch_set_import_queue_entry (self, g_value_get_object (value));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_OFFLINE_ENTRY:
+		case LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		library_branch_set_offline_entry (self, g_value_get_object (value));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_TRASH_ENTRY:
+		case LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		library_branch_set_trash_entry (self, g_value_get_object (value));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1686 "Branch.c"
+#line 1712 "Branch.c"
 		default:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1692 "Branch.c"
+#line 1718 "Branch.c"
 	}
 }
 
@@ -1699,40 +1725,37 @@ LibraryPhotosEntry* library_photos_entry_construct (GType object_type) {
 	self = (LibraryPhotosEntry*) sidebar_simple_page_entry_construct (object_type);
 #line 93 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return self;
-#line 1703 "Branch.c"
+#line 1729 "Branch.c"
 }
 
 
 LibraryPhotosEntry* library_photos_entry_new (void) {
 #line 93 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return library_photos_entry_construct (LIBRARY_TYPE_PHOTOS_ENTRY);
-#line 1710 "Branch.c"
+#line 1736 "Branch.c"
 }
 
 
 static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	LibraryPhotosEntry * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
 #line 96 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry);
 #line 97 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = _ ("Photos");
+	_tmp0_ = g_strdup (_ ("Photos"));
 #line 97 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 97 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 97 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1729 "Branch.c"
+#line 1752 "Branch.c"
 }
 
 
 static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
 	LibraryPhotosEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 100 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry);
 #line 101 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1741,14 +1764,14 @@ static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry
 	result = _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1745 "Branch.c"
+#line 1768 "Branch.c"
 }
 
 
 static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base) {
 	LibraryPhotosEntry * self;
 	Page* result = NULL;
-	LibraryMainPage* _tmp0_ = NULL;
+	LibraryMainPage* _tmp0_;
 #line 104 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry);
 #line 105 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1759,7 +1782,7 @@ static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
 #line 105 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1763 "Branch.c"
+#line 1786 "Branch.c"
 }
 
 
@@ -1767,12 +1790,12 @@ static void library_photos_entry_class_init (LibraryPhotosEntryClass * klass) {
 #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_photos_entry_parent_class = g_type_class_peek_parent (klass);
 #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_photos_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_get_sidebar_name;
 #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_photos_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_get_sidebar_icon;
 #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_photos_entry_real_create_page;
-#line 1776 "Branch.c"
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_create_page;
+#line 1799 "Branch.c"
 }
 
 
@@ -1798,13 +1821,13 @@ LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_ty
 	self = (LibraryHideablePageEntry*) sidebar_simple_page_entry_construct (object_type);
 #line 125 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return self;
-#line 1802 "Branch.c"
+#line 1825 "Branch.c"
 }
 
 
 gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self) {
 	gboolean result;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 115 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_val_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (self), FALSE);
 #line 115 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1813,15 +1836,15 @@ gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self
 	result = _tmp0_;
 #line 115 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1817 "Branch.c"
+#line 1840 "Branch.c"
 }
 
 
 void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 116 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (self));
 #line 117 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1832,7 +1855,7 @@ void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gb
 	if (_tmp0_ == _tmp1_) {
 #line 118 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		return;
-#line 1836 "Branch.c"
+#line 1859 "Branch.c"
 	}
 #line 120 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_tmp2_ = value;
@@ -1841,10 +1864,10 @@ void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gb
 #line 121 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_tmp3_ = value;
 #line 121 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_signal_emit_by_name (self, "visibility-changed", _tmp3_);
+	g_signal_emit (self, library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL], 0, _tmp3_);
 #line 116 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_object_notify ((GObject *) self, "visible");
-#line 1848 "Branch.c"
+#line 1871 "Branch.c"
 }
 
 
@@ -1860,10 +1883,10 @@ static void library_hideable_page_entry_class_init (LibraryHideablePageEntryClas
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_hideable_page_entry_finalize;
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE, g_param_spec_boolean ("visible", "visible", "visible", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY, g_param_spec_boolean ("visible", "visible", "visible", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_signal_new ("visibility_changed", LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 1867 "Branch.c"
+	library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL] = g_signal_new ("visibility-changed", LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+#line 1890 "Branch.c"
 }
 
 
@@ -1872,17 +1895,17 @@ static void library_hideable_page_entry_instance_init (LibraryHideablePageEntry
 	self->priv = LIBRARY_HIDEABLE_PAGE_ENTRY_GET_PRIVATE (self);
 #line 113 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self->priv->show_entry = FALSE;
-#line 1876 "Branch.c"
+#line 1899 "Branch.c"
 }
 
 
-static void library_hideable_page_entry_finalize (GObject* obj) {
+static void library_hideable_page_entry_finalize (GObject * obj) {
 	LibraryHideablePageEntry * self;
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry);
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	G_OBJECT_CLASS (library_hideable_page_entry_parent_class)->finalize (obj);
-#line 1886 "Branch.c"
+#line 1909 "Branch.c"
 }
 
 
@@ -1904,18 +1927,18 @@ static void _vala_library_hideable_page_entry_get_property (GObject * object, gu
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	switch (property_id) {
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE:
+		case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY:
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		g_value_set_boolean (value, library_hideable_page_entry_get_visible (self));
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1913 "Branch.c"
+#line 1936 "Branch.c"
 		default:
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1919 "Branch.c"
+#line 1942 "Branch.c"
 	}
 }
 
@@ -1926,18 +1949,18 @@ static void _vala_library_hideable_page_entry_set_property (GObject * object, gu
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	switch (property_id) {
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE:
+		case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY:
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		library_hideable_page_entry_set_visible (self, g_value_get_boolean (value));
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1935 "Branch.c"
+#line 1958 "Branch.c"
 		default:
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1941 "Branch.c"
+#line 1964 "Branch.c"
 	}
 }
 
@@ -1946,15 +1969,15 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 	LibraryMainPage * self = NULL;
 #line 133 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self = (LibraryMainPage*) collection_page_construct (object_type, LIBRARY_MAIN_PAGE_NAME);
-#line 1950 "Branch.c"
+#line 1973 "Branch.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1975,21 +1998,21 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 		_sources_it = _tmp5_;
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		while (TRUE) {
-#line 1979 "Branch.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 2002 "Branch.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			ViewCollection* _tmp10_ = NULL;
-			ViewCollection* _tmp11_ = NULL;
-			MediaSourceCollection* _tmp12_ = NULL;
-			CollectionViewManager* _tmp13_ = NULL;
-			CollectionViewManager* _tmp14_ = NULL;
-			ProgressMonitor _tmp15_ = NULL;
-			void* _tmp15__target = NULL;
-			ViewCollectionMonitor* _tmp16_ = NULL;
-			ViewCollectionMonitor* _tmp17_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			ViewCollection* _tmp10_;
+			ViewCollection* _tmp11_;
+			MediaSourceCollection* _tmp12_;
+			CollectionViewManager* _tmp13_;
+			CollectionViewManager* _tmp14_;
+			ProgressMonitor _tmp15_;
+			void* _tmp15__target;
+			ViewCollectionMonitor* _tmp16_;
+			ViewCollectionMonitor* _tmp17_;
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			_tmp6_ = _sources_it;
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1998,7 +2021,7 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 			if (!_tmp7_) {
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 				break;
-#line 2002 "Branch.c"
+#line 2025 "Branch.c"
 			}
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			_tmp8_ = _sources_it;
@@ -2032,22 +2055,22 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 			_data_collection_unref0 (_tmp11_);
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			_data_collection_unref0 (sources);
-#line 2036 "Branch.c"
+#line 2059 "Branch.c"
 		}
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		_g_object_unref0 (_sources_it);
-#line 2040 "Branch.c"
+#line 2063 "Branch.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return self;
-#line 2044 "Branch.c"
+#line 2067 "Branch.c"
 }
 
 
 LibraryMainPage* library_main_page_new (ProgressMonitor monitor, void* monitor_target) {
 #line 132 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return library_main_page_construct (LIBRARY_TYPE_MAIN_PAGE, monitor, monitor_target);
-#line 2051 "Branch.c"
+#line 2074 "Branch.c"
 }
 
 
@@ -2055,8 +2078,8 @@ static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboo
 	LibraryMainPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
 #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -2077,23 +2100,23 @@ static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboo
 	if (sort_order) {
 #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		*sort_order = _vala_sort_order;
-#line 2081 "Branch.c"
+#line 2104 "Branch.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	if (sort_by) {
 #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		*sort_by = _vala_sort_by;
-#line 2087 "Branch.c"
+#line 2110 "Branch.c"
 	}
 }
 
 
 static void library_main_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
 	LibraryMainPage * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gint _tmp3_;
 #line 143 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_MAIN_PAGE, LibraryMainPage);
 #line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -2108,7 +2131,7 @@ static void library_main_page_real_set_config_photos_sort (MediaPage* base, gboo
 	configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
 #line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2112 "Branch.c"
+#line 2135 "Branch.c"
 }
 
 
@@ -2116,10 +2139,10 @@ static void library_main_page_class_init (LibraryMainPageClass * klass) {
 #line 129 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_main_page_parent_class = g_type_class_peek_parent (klass);
 #line 129 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) library_main_page_real_get_config_photos_sort;
+	((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) library_main_page_real_get_config_photos_sort;
 #line 129 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) library_main_page_real_set_config_photos_sort;
-#line 2123 "Branch.c"
+	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) library_main_page_real_set_config_photos_sort;
+#line 2146 "Branch.c"
 }
 
 
diff --git a/src/library/FlaggedPage.c b/src/library/FlaggedPage.c
index 849e784..16a31da 100644
--- a/src/library/FlaggedPage.c
+++ b/src/library/FlaggedPage.c
@@ -1,4 +1,4 @@
-/* FlaggedPage.c generated by valac 0.34.7, the Vala compiler
+/* FlaggedPage.c generated by valac 0.36.6, the Vala compiler
  * generated from FlaggedPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -809,12 +809,12 @@ static guint flagged_page_flagged_search_view_filter_real_get_criteria (SearchVi
 GType search_filter_criteria_get_type (void) G_GNUC_CONST;
 CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_new (void);
 CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_construct (GType object_type);
-static void flagged_page_finalize (GObject* obj);
+static void flagged_page_finalize (GObject * obj);
 
 
 FlaggedPage* flagged_page_construct (GType object_type) {
 	FlaggedPage * self = NULL;
-	FlaggedPageFlaggedViewManager* _tmp0_ = NULL;
+	FlaggedPageFlaggedViewManager* _tmp0_;
 #line 34 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = (FlaggedPage*) collection_page_construct (object_type, FLAGGED_PAGE_NAME);
 #line 36 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -826,12 +826,12 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 #line 827 "FlaggedPage.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		MediaCollectionRegistry* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
+		MediaCollectionRegistry* _tmp1_;
+		MediaCollectionRegistry* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeCollection* _tmp4_;
+		GeeIterator* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		_tmp1_ = media_collection_registry_get_instance ();
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -853,18 +853,18 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		while (TRUE) {
 #line 856 "FlaggedPage.c"
-			GeeIterator* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
-			ViewCollection* _tmp11_ = NULL;
-			ViewCollection* _tmp12_ = NULL;
-			MediaSourceCollection* _tmp13_ = NULL;
-			ViewManager* _tmp14_ = NULL;
-			Alteration* _tmp15_ = NULL;
-			ViewCollectionMonitor* _tmp16_ = NULL;
-			ViewCollectionMonitor* _tmp17_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
+			ViewCollection* _tmp11_;
+			ViewCollection* _tmp12_;
+			MediaSourceCollection* _tmp13_;
+			ViewManager* _tmp14_;
+			Alteration* _tmp15_;
+			ViewCollectionMonitor* _tmp16_;
+			ViewCollectionMonitor* _tmp17_;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 			_tmp7_ = _sources_it;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -924,8 +924,8 @@ static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean*
 	FlaggedPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
 #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -959,10 +959,10 @@ static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean*
 
 static void flagged_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
 	FlaggedPage * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gint _tmp3_;
 #line 46 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLAGGED_PAGE, FlaggedPage);
 #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -991,8 +991,8 @@ static gpointer _view_filter_ref0 (gpointer self) {
 static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardPage* base) {
 	FlaggedPage * self;
 	SearchViewFilter* result = NULL;
-	FlaggedPageFlaggedSearchViewFilter* _tmp0_ = NULL;
-	SearchViewFilter* _tmp1_ = NULL;
+	FlaggedPageFlaggedSearchViewFilter* _tmp0_;
+	SearchViewFilter* _tmp1_;
 #line 50 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLAGGED_PAGE, FlaggedPage);
 #line 51 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1009,7 +1009,7 @@ static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardP
 
 static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_construct (GType object_type, FlaggedPage* owner) {
 	FlaggedPageFlaggedViewManager* self = NULL;
-	FlaggedPage* _tmp0_ = NULL;
+	FlaggedPage* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	g_return_val_if_fail (IS_FLAGGED_PAGE (owner), NULL);
 #line 12 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1040,10 +1040,10 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana
 	FlaggedPageFlaggedViewManager * self;
 	gboolean result = FALSE;
 	Flaggable* flaggable = NULL;
-	DataSource* _tmp0_ = NULL;
-	Flaggable* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	Flaggable* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	Flaggable* _tmp3_ = NULL;
+	Flaggable* _tmp3_;
 #line 15 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FLAGGED_PAGE_TYPE_FLAGGED_VIEW_MANAGER, FlaggedPageFlaggedViewManager);
 #line 15 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1059,8 +1059,8 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	if (_tmp3_ != NULL) {
 #line 1062 "FlaggedPage.c"
-		Flaggable* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+		Flaggable* _tmp4_;
+		gboolean _tmp5_;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		_tmp4_ = flaggable;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1087,7 +1087,7 @@ static void flagged_page_flagged_view_manager_class_init (FlaggedPageFlaggedView
 #line 10 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	flagged_page_flagged_view_manager_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) flagged_page_flagged_view_manager_real_include_in_view;
+	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) flagged_page_flagged_view_manager_real_include_in_view;
 #line 1092 "FlaggedPage.c"
 }
 
@@ -1142,7 +1142,7 @@ static void flagged_page_flagged_search_view_filter_class_init (FlaggedPageFlagg
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	flagged_page_flagged_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) flagged_page_flagged_search_view_filter_real_get_criteria;
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) flagged_page_flagged_search_view_filter_real_get_criteria;
 #line 1147 "FlaggedPage.c"
 }
 
@@ -1169,11 +1169,11 @@ static void flagged_page_class_init (FlaggedPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	g_type_class_add_private (klass, sizeof (FlaggedPagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) flagged_page_real_get_config_photos_sort;
+	((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) flagged_page_real_get_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) flagged_page_real_set_config_photos_sort;
+	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) flagged_page_real_set_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) flagged_page_real_get_search_view_filter;
+	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) flagged_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = flagged_page_finalize;
 #line 1180 "FlaggedPage.c"
@@ -1181,8 +1181,8 @@ static void flagged_page_class_init (FlaggedPageClass * klass) {
 
 
 static void flagged_page_instance_init (FlaggedPage * self) {
-	Alteration* _tmp0_ = NULL;
-	FlaggedPageFlaggedSearchViewFilter* _tmp1_ = NULL;
+	Alteration* _tmp0_;
+	FlaggedPageFlaggedSearchViewFilter* _tmp1_;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self->priv = FLAGGED_PAGE_GET_PRIVATE (self);
 #line 30 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1197,7 +1197,7 @@ static void flagged_page_instance_init (FlaggedPage * self) {
 }
 
 
-static void flagged_page_finalize (GObject* obj) {
+static void flagged_page_finalize (GObject * obj) {
 	FlaggedPage * self;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FLAGGED_PAGE, FlaggedPage);
diff --git a/src/library/FlaggedSidebarEntry.c b/src/library/FlaggedSidebarEntry.c
index 38df252..01f84fd 100644
--- a/src/library/FlaggedSidebarEntry.c
+++ b/src/library/FlaggedSidebarEntry.c
@@ -1,4 +1,4 @@
-/* FlaggedSidebarEntry.c generated by valac 0.34.7, the Vala compiler
+/* FlaggedSidebarEntry.c generated by valac 0.36.6, the Vala compiler
  * generated from FlaggedSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -359,7 +359,7 @@ struct _LibraryFlaggedSidebarEntryClass {
 
 
 static gpointer library_flagged_sidebar_entry_parent_class = NULL;
-static SidebarInternalDropTargetEntryIface* library_flagged_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = NULL;
+static SidebarInternalDropTargetEntryIface * library_flagged_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = NULL;
 
 GType sidebar_tree_get_type (void) G_GNUC_CONST;
 GType sidebar_entry_get_type (void) G_GNUC_CONST;
@@ -433,7 +433,7 @@ GType multiple_data_source_at_once_command_get_type (void) G_GNUC_CONST;
 GType flag_unflag_command_get_type (void) G_GNUC_CONST;
 static gboolean library_flagged_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data);
 GeeCollection* media_source_collection_get_flagged (MediaSourceCollection* self);
-static void library_flagged_sidebar_entry_finalize (GObject* obj);
+static void library_flagged_sidebar_entry_finalize (GObject * obj);
 
 
 static void _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered (MediaSourceCollection* _sender, gpointer self) {
@@ -445,18 +445,18 @@ static void _library_flagged_sidebar_entry_on_flagged_contents_altered_media_sou
 
 LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_construct (GType object_type) {
 	LibraryFlaggedSidebarEntry * self = NULL;
-	gint _tmp11_ = 0;
+	gint _tmp11_;
 #line 8 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	self = (LibraryFlaggedSidebarEntry*) library_hideable_page_entry_construct (object_type);
 #line 452 "FlaggedSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
@@ -478,12 +478,12 @@ LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_construct (GType objec
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		while (TRUE) {
 #line 481 "FlaggedSidebarEntry.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			MediaSourceCollection* _tmp10_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			MediaSourceCollection* _tmp10_;
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
@@ -532,7 +532,7 @@ LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_new (void) {
 static gchar* library_flagged_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	LibraryFlaggedSidebarEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 20 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry);
 #line 21 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
@@ -548,7 +548,7 @@ static gchar* library_flagged_sidebar_entry_real_get_sidebar_name (SidebarSimple
 static gchar* library_flagged_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
 	LibraryFlaggedSidebarEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 24 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry);
 #line 25 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
@@ -564,7 +564,7 @@ static gchar* library_flagged_sidebar_entry_real_get_sidebar_icon (SidebarSimple
 static Page* library_flagged_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
 	LibraryFlaggedSidebarEntry * self;
 	Page* result = NULL;
-	FlaggedPage* _tmp0_ = NULL;
+	FlaggedPage* _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry);
 #line 29 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
@@ -582,11 +582,11 @@ static Page* library_flagged_sidebar_entry_real_create_page (SidebarSimplePageEn
 static gboolean library_flagged_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) {
 	LibraryFlaggedSidebarEntry * self;
 	gboolean result = FALSE;
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	FlagUnflagCommand* _tmp3_ = NULL;
-	FlagUnflagCommand* _tmp4_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
+	GeeList* _tmp2_;
+	FlagUnflagCommand* _tmp3_;
+	FlagUnflagCommand* _tmp4_;
 #line 32 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry);
 #line 32 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
@@ -631,7 +631,7 @@ static gboolean library_flagged_sidebar_entry_real_internal_drop_received_arbitr
 
 
 static void library_flagged_sidebar_entry_on_flagged_contents_altered (LibraryFlaggedSidebarEntry* self) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 42 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	g_return_if_fail (LIBRARY_IS_FLAGGED_SIDEBAR_ENTRY (self));
 #line 43 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
@@ -652,12 +652,12 @@ static gint library_flagged_sidebar_entry_get_total_flagged (LibraryFlaggedSideb
 #line 653 "FlaggedSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
@@ -679,17 +679,17 @@ static gint library_flagged_sidebar_entry_get_total_flagged (LibraryFlaggedSideb
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		while (TRUE) {
 #line 682 "FlaggedSidebarEntry.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			MediaSourceCollection* _tmp11_ = NULL;
-			GeeCollection* _tmp12_ = NULL;
-			GeeCollection* _tmp13_ = NULL;
-			gint _tmp14_ = 0;
-			gint _tmp15_ = 0;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			gint _tmp10_;
+			MediaSourceCollection* _tmp11_;
+			GeeCollection* _tmp12_;
+			GeeCollection* _tmp13_;
+			gint _tmp14_;
+			gint _tmp15_;
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
@@ -742,11 +742,11 @@ static void library_flagged_sidebar_entry_class_init (LibraryFlaggedSidebarEntry
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	library_flagged_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_flagged_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_flagged_sidebar_entry_real_get_sidebar_name;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_flagged_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_flagged_sidebar_entry_real_get_sidebar_icon;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_flagged_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_flagged_sidebar_entry_real_create_page;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_flagged_sidebar_entry_finalize;
 #line 753 "FlaggedSidebarEntry.c"
@@ -757,9 +757,9 @@ static void library_flagged_sidebar_entry_sidebar_internal_drop_target_entry_int
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	library_flagged_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) library_flagged_sidebar_entry_real_internal_drop_received;
+	iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) library_flagged_sidebar_entry_real_internal_drop_received;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) library_flagged_sidebar_entry_real_internal_drop_received_arbitrary;
+	iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) library_flagged_sidebar_entry_real_internal_drop_received_arbitrary;
 #line 764 "FlaggedSidebarEntry.c"
 }
 
@@ -768,19 +768,19 @@ static void library_flagged_sidebar_entry_instance_init (LibraryFlaggedSidebarEn
 }
 
 
-static void library_flagged_sidebar_entry_finalize (GObject* obj) {
+static void library_flagged_sidebar_entry_finalize (GObject * obj) {
 	LibraryFlaggedSidebarEntry * self;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry);
 #line 776 "FlaggedSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
@@ -802,13 +802,13 @@ static void library_flagged_sidebar_entry_finalize (GObject* obj) {
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		while (TRUE) {
 #line 805 "FlaggedSidebarEntry.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			MediaSourceCollection* _tmp10_ = NULL;
-			guint _tmp11_ = 0U;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			MediaSourceCollection* _tmp10_;
+			guint _tmp11_;
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c
index a2794b7..c8d1841 100644
--- a/src/library/ImportQueuePage.c
+++ b/src/library/ImportQueuePage.c
@@ -1,4 +1,4 @@
-/* ImportQueuePage.c generated by valac 0.34.7, the Vala compiler
+/* ImportQueuePage.c generated by valac 0.36.6, the Vala compiler
  * generated from ImportQueuePage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -297,6 +297,12 @@ typedef struct _VideoClass VideoClass;
 typedef struct _VideoView VideoView;
 typedef struct _VideoViewClass VideoViewClass;
 #define _g_free0(var) (var = (g_free (var), NULL))
+enum  {
+	IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL,
+	IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL,
+	IMPORT_QUEUE_PAGE_LAST_SIGNAL
+};
+static guint import_queue_page_signals[IMPORT_QUEUE_PAGE_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -545,29 +551,29 @@ gchar* data_object_get_name (DataObject* self);
 void single_photo_page_blank_display (SinglePhotoPage* self);
 void page_window_set_normal_cursor (PageWindow* self);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
-static void import_queue_page_finalize (GObject* obj);
+static void import_queue_page_finalize (GObject * obj);
 
 static const GActionEntry IMPORT_QUEUE_PAGE_entries[1] = {{"Stop", _import_queue_page_on_stop_gsimple_action_activate_callback}};
 
 static void _import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 62 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_stop ((ImportQueuePage*) self);
-#line 556 "ImportQueuePage.c"
+#line 562 "ImportQueuePage.c"
 }
 
 
 ImportQueuePage* import_queue_page_construct (GType object_type) {
 	ImportQueuePage * self = NULL;
 	GtkToolbar* toolbar = NULL;
-	GtkToolbar* _tmp0_ = NULL;
+	GtkToolbar* _tmp0_;
 	GtkToolButton* stop_button = NULL;
-	GtkToolButton* _tmp1_ = NULL;
+	GtkToolButton* _tmp1_;
 	GtkSeparatorToolItem* separator = NULL;
-	GtkSeparatorToolItem* _tmp2_ = NULL;
+	GtkSeparatorToolItem* _tmp2_;
 	GtkToolItem* progress_item = NULL;
-	GtkToolItem* _tmp3_ = NULL;
-	GtkProgressBar* _tmp4_ = NULL;
-	GtkProgressBar* _tmp5_ = NULL;
+	GtkToolItem* _tmp3_;
+	GtkProgressBar* _tmp4_;
+	GtkProgressBar* _tmp5_;
 #line 25 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self = (ImportQueuePage*) single_photo_page_construct (object_type, IMPORT_QUEUE_PAGE_NAME, FALSE);
 #line 28 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -624,21 +630,21 @@ ImportQueuePage* import_queue_page_construct (GType object_type) {
 	_g_object_unref0 (toolbar);
 #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return self;
-#line 628 "ImportQueuePage.c"
+#line 634 "ImportQueuePage.c"
 }
 
 
 ImportQueuePage* import_queue_page_new (void) {
 #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return import_queue_page_construct (TYPE_IMPORT_QUEUE_PAGE);
-#line 635 "ImportQueuePage.c"
+#line 641 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	ImportQueuePage * self;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage);
 #line 56 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -651,14 +657,14 @@ static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeLis
 	_tmp1_ = ui_filenames;
 #line 59 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	PAGE_CLASS (import_queue_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_);
-#line 655 "ImportQueuePage.c"
+#line 661 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_real_add_actions (Page* base, GActionMap* map) {
 	ImportQueuePage * self;
-	GActionMap* _tmp0_ = NULL;
-	GActionMap* _tmp1_ = NULL;
+	GActionMap* _tmp0_;
+	GActionMap* _tmp1_;
 #line 66 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage);
 #line 66 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -671,13 +677,13 @@ static void import_queue_page_real_add_actions (Page* base, GActionMap* map) {
 	_tmp1_ = map;
 #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_action_map_add_action_entries (_tmp1_, IMPORT_QUEUE_PAGE_entries, G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries), self);
-#line 675 "ImportQueuePage.c"
+#line 681 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_real_remove_actions (Page* base, GActionMap* map) {
 	ImportQueuePage * self;
-	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp0_;
 #line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage);
 #line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -686,7 +692,7 @@ static void import_queue_page_real_remove_actions (Page* base, GActionMap* map)
 	_tmp0_ = map;
 #line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	PAGE_CLASS (import_queue_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
-#line 690 "ImportQueuePage.c"
+#line 696 "ImportQueuePage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -698,15 +704,15 @@ static void import_queue_page_real_remove_actions (Page* base, GActionMap* map)
 		entry_collection_length1 = G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries);
 #line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries); entry_it = entry_it + 1) {
-#line 702 "ImportQueuePage.c"
+#line 708 "ImportQueuePage.c"
 			GActionEntry entry = {0};
 #line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			entry = entry_collection[entry_it];
-#line 706 "ImportQueuePage.c"
+#line 712 "ImportQueuePage.c"
 			{
-				GActionMap* _tmp1_ = NULL;
-				GActionEntry _tmp2_ = {0};
-				const gchar* _tmp3_ = NULL;
+				GActionMap* _tmp1_;
+				GActionEntry _tmp2_;
+				const gchar* _tmp3_;
 #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 				_tmp1_ = map;
 #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -715,7 +721,7 @@ static void import_queue_page_real_remove_actions (Page* base, GActionMap* map)
 				_tmp3_ = _tmp2_.name;
 #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 719 "ImportQueuePage.c"
+#line 725 "ImportQueuePage.c"
 			}
 		}
 	}
@@ -725,62 +731,62 @@ static void import_queue_page_real_remove_actions (Page* base, GActionMap* map)
 static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self) {
 #line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_starting ((ImportQueuePage*) self, _sender);
-#line 729 "ImportQueuePage.c"
+#line 735 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, gpointer self) {
 #line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_preparing ((ImportQueuePage*) self);
-#line 736 "ImportQueuePage.c"
+#line 742 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) {
 #line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_progress ((ImportQueuePage*) self, completed_bytes, total_bytes);
-#line 743 "ImportQueuePage.c"
+#line 749 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, MediaSource* source, GdkPixbuf* pixbuf, gint to_follow, gpointer self) {
 #line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_imported ((ImportQueuePage*) self, source, pixbuf, to_follow);
-#line 750 "ImportQueuePage.c"
+#line 756 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
 #line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_import_complete ((ImportQueuePage*) self, _sender, manifest, import_roll);
-#line 757 "ImportQueuePage.c"
+#line 763 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, ImportResult _result_, const gchar* message, gpointer self) {
 #line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_fatal_error ((ImportQueuePage*) self, _result_, message);
-#line 764 "ImportQueuePage.c"
+#line 770 "ImportQueuePage.c"
 }
 
 
 void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* batch_import, gboolean allow_user_cancel) {
-	GeeArrayList* _tmp0_ = NULL;
-	BatchImport* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	BatchImport* _tmp3_ = NULL;
-	BatchImport* _tmp4_ = NULL;
-	BatchImport* _tmp5_ = NULL;
-	BatchImport* _tmp6_ = NULL;
-	BatchImport* _tmp7_ = NULL;
-	BatchImport* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
-	GeeArrayList* _tmp12_ = NULL;
-	BatchImport* _tmp13_ = NULL;
-	BatchImport* _tmp14_ = NULL;
-	GeeArrayList* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
+	GeeArrayList* _tmp0_;
+	BatchImport* _tmp1_;
+	gboolean _tmp2_;
+	BatchImport* _tmp3_;
+	BatchImport* _tmp4_;
+	BatchImport* _tmp5_;
+	BatchImport* _tmp6_;
+	BatchImport* _tmp7_;
+	BatchImport* _tmp8_;
+	gboolean _tmp9_;
+	GeeArrayList* _tmp12_;
+	BatchImport* _tmp13_;
+	BatchImport* _tmp14_;
+	GeeArrayList* _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
 #line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -821,16 +827,16 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport*
 	_tmp9_ = allow_user_cancel;
 #line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (!_tmp9_) {
-#line 825 "ImportQueuePage.c"
-		GeeHashSet* _tmp10_ = NULL;
-		BatchImport* _tmp11_ = NULL;
+#line 831 "ImportQueuePage.c"
+		GeeHashSet* _tmp10_;
+		BatchImport* _tmp11_;
 #line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp10_ = self->priv->cancel_unallowed;
 #line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp11_ = batch_import;
 #line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_);
-#line 834 "ImportQueuePage.c"
+#line 840 "ImportQueuePage.c"
 	}
 #line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp12_ = self->priv->queue;
@@ -841,7 +847,7 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport*
 #line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp14_ = batch_import;
 #line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_emit_by_name (self, "batch-added", _tmp14_);
+	g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL], 0, _tmp14_);
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp15_ = self->priv->queue;
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -850,25 +856,25 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport*
 	_tmp17_ = _tmp16_;
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp17_ == 1) {
-#line 854 "ImportQueuePage.c"
-		BatchImport* _tmp18_ = NULL;
+#line 860 "ImportQueuePage.c"
+		BatchImport* _tmp18_;
 #line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp18_ = batch_import;
 #line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		batch_import_schedule (_tmp18_);
-#line 860 "ImportQueuePage.c"
+#line 866 "ImportQueuePage.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_update_stop_action (self);
-#line 864 "ImportQueuePage.c"
+#line 870 "ImportQueuePage.c"
 }
 
 
 gint import_queue_page_get_batch_count (ImportQueuePage* self) {
 	gint result = 0;
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_val_if_fail (IS_IMPORT_QUEUE_PAGE (self), 0);
 #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -881,15 +887,15 @@ gint import_queue_page_get_batch_count (ImportQueuePage* self) {
 	result = _tmp2_;
 #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return result;
-#line 885 "ImportQueuePage.c"
+#line 891 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_update_stop_action (ImportQueuePage* self) {
 	gboolean _tmp0_ = FALSE;
-	GeeHashSet* _tmp1_ = NULL;
-	BatchImport* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	GeeHashSet* _tmp1_;
+	BatchImport* _tmp2_;
+	gboolean _tmp3_;
 #line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -900,10 +906,10 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) {
 	_tmp3_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_);
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (!_tmp3_) {
-#line 904 "ImportQueuePage.c"
-		GeeArrayList* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+#line 910 "ImportQueuePage.c"
+		GeeArrayList* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp4_ = self->priv->queue;
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -912,31 +918,31 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) {
 		_tmp6_ = _tmp5_;
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = _tmp6_ > 0;
-#line 916 "ImportQueuePage.c"
+#line 922 "ImportQueuePage.c"
 	} else {
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = FALSE;
-#line 920 "ImportQueuePage.c"
+#line 926 "ImportQueuePage.c"
 	}
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Stop", _tmp0_);
-#line 924 "ImportQueuePage.c"
+#line 930 "ImportQueuePage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 931 "ImportQueuePage.c"
+#line 937 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_on_stop (ImportQueuePage* self) {
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	AppWindow* _tmp3_ = NULL;
-	AppWindow* _tmp4_ = NULL;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	AppWindow* _tmp3_;
+	AppWindow* _tmp4_;
 #line 109 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -951,7 +957,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 	if (_tmp2_ == 0) {
 #line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		return;
-#line 955 "ImportQueuePage.c"
+#line 961 "ImportQueuePage.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp3_ = app_window_get_instance ();
@@ -963,15 +969,15 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 	_g_object_unref0 (_tmp4_);
 #line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->stopped = TRUE;
-#line 967 "ImportQueuePage.c"
+#line 973 "ImportQueuePage.c"
 	{
 		GeeArrayList* _batch_import_list = NULL;
-		GeeArrayList* _tmp5_ = NULL;
-		GeeArrayList* _tmp6_ = NULL;
+		GeeArrayList* _tmp5_;
+		GeeArrayList* _tmp6_;
 		gint _batch_import_size = 0;
-		GeeArrayList* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
+		GeeArrayList* _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
 		gint _batch_import_index = 0;
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp5_ = self->priv->queue;
@@ -991,15 +997,15 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 		_batch_import_index = -1;
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		while (TRUE) {
-#line 995 "ImportQueuePage.c"
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
-			gint _tmp12_ = 0;
+#line 1001 "ImportQueuePage.c"
+			gint _tmp10_;
+			gint _tmp11_;
+			gint _tmp12_;
 			BatchImport* batch_import = NULL;
-			GeeArrayList* _tmp13_ = NULL;
-			gint _tmp14_ = 0;
-			gpointer _tmp15_ = NULL;
-			BatchImport* _tmp16_ = NULL;
+			GeeArrayList* _tmp13_;
+			gint _tmp14_;
+			gpointer _tmp15_;
+			BatchImport* _tmp16_;
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp10_ = _batch_import_index;
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1012,7 +1018,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 			if (!(_tmp11_ < _tmp12_)) {
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 				break;
-#line 1016 "ImportQueuePage.c"
+#line 1022 "ImportQueuePage.c"
 			}
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp13_ = _batch_import_list;
@@ -1028,18 +1034,18 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 			batch_import_user_halt (_tmp16_);
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_g_object_unref0 (batch_import);
-#line 1032 "ImportQueuePage.c"
+#line 1038 "ImportQueuePage.c"
 		}
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_g_object_unref0 (_batch_import_list);
-#line 1036 "ImportQueuePage.c"
+#line 1042 "ImportQueuePage.c"
 	}
 }
 
 
 static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* batch_import) {
-	BatchImport* _tmp0_ = NULL;
-	BatchImport* _tmp1_ = NULL;
+	BatchImport* _tmp0_;
+	BatchImport* _tmp1_;
 #line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1054,36 +1060,33 @@ static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* b
 	_g_object_unref0 (self->priv->current_batch);
 #line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->current_batch = _tmp1_;
-#line 1058 "ImportQueuePage.c"
+#line 1064 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_on_preparing (ImportQueuePage* self) {
-	GtkProgressBar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkProgressBar* _tmp2_ = NULL;
+	GtkProgressBar* _tmp0_;
+	GtkProgressBar* _tmp1_;
 #line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = self->priv->progress_bar;
 #line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = _ ("Preparing to import…");
-#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
+	gtk_progress_bar_set_text (_tmp0_, _ ("Preparing to import…"));
 #line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp2_ = self->priv->progress_bar;
+	_tmp1_ = self->priv->progress_bar;
 #line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	gtk_progress_bar_pulse (_tmp2_);
-#line 1078 "ImportQueuePage.c"
+	gtk_progress_bar_pulse (_tmp1_);
+#line 1081 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_on_progress (ImportQueuePage* self, guint64 completed_bytes, guint64 total_bytes) {
 	gdouble _tmp0_ = 0.0;
-	guint64 _tmp1_ = 0ULL;
-	guint64 _tmp2_ = 0ULL;
+	guint64 _tmp1_;
+	guint64 _tmp2_;
 	gdouble pct = 0.0;
-	GtkProgressBar* _tmp5_ = NULL;
+	GtkProgressBar* _tmp5_;
 #line 133 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1092,20 +1095,20 @@ static void import_queue_page_on_progress (ImportQueuePage* self, guint64 comple
 	_tmp2_ = total_bytes;
 #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp1_ <= _tmp2_) {
-#line 1096 "ImportQueuePage.c"
-		guint64 _tmp3_ = 0ULL;
-		guint64 _tmp4_ = 0ULL;
+#line 1099 "ImportQueuePage.c"
+		guint64 _tmp3_;
+		guint64 _tmp4_;
 #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp3_ = completed_bytes;
 #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp4_ = total_bytes;
 #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = ((gdouble) _tmp3_) / ((gdouble) _tmp4_);
-#line 1105 "ImportQueuePage.c"
+#line 1108 "ImportQueuePage.c"
 	} else {
 #line 135 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = 0.0;
-#line 1109 "ImportQueuePage.c"
+#line 1112 "ImportQueuePage.c"
 	}
 #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	pct = _tmp0_;
@@ -1113,28 +1116,27 @@ static void import_queue_page_on_progress (ImportQueuePage* self, guint64 comple
 	_tmp5_ = self->priv->progress_bar;
 #line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_progress_bar_set_fraction (_tmp5_, pct);
-#line 1117 "ImportQueuePage.c"
+#line 1120 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSource* source, GdkPixbuf* pixbuf, gint to_follow) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
+	gint _tmp1_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
 	Dimensions _tmp5_ = {0};
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
 	gboolean _tmp8_ = FALSE;
-	ThumbnailSource* _tmp9_ = NULL;
-	GtkProgressBar* _tmp22_ = NULL;
-	GtkProgressBar* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	ThumbnailSource* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	gchar* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
+	ThumbnailSource* _tmp9_;
+	GtkProgressBar* _tmp22_;
+	GtkProgressBar* _tmp23_;
+	ThumbnailSource* _tmp24_;
+	gchar* _tmp25_;
+	gchar* _tmp26_;
+	gchar* _tmp27_;
+	gchar* _tmp28_;
 #line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1147,20 +1149,20 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc
 	if (_tmp1_ > 0) {
 #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = TRUE;
-#line 1151 "ImportQueuePage.c"
+#line 1153 "ImportQueuePage.c"
 	} else {
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = !_tmp2_;
-#line 1158 "ImportQueuePage.c"
+#line 1160 "ImportQueuePage.c"
 	}
 #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp0_) {
 #line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		return;
-#line 1164 "ImportQueuePage.c"
+#line 1166 "ImportQueuePage.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp3_ = pixbuf;
@@ -1182,13 +1184,13 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc
 	_tmp9_ = source;
 #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO)) {
-#line 1186 "ImportQueuePage.c"
-		ViewCollection* _tmp10_ = NULL;
-		ViewCollection* _tmp11_ = NULL;
-		ThumbnailSource* _tmp12_ = NULL;
-		PhotoView* _tmp13_ = NULL;
-		PhotoView* _tmp14_ = NULL;
-		gboolean _tmp15_ = FALSE;
+#line 1188 "ImportQueuePage.c"
+		ViewCollection* _tmp10_;
+		ViewCollection* _tmp11_;
+		ThumbnailSource* _tmp12_;
+		PhotoView* _tmp13_;
+		PhotoView* _tmp14_;
+		gboolean _tmp15_;
 #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1207,14 +1209,14 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc
 		_g_object_unref0 (_tmp14_);
 #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_data_collection_unref0 (_tmp11_);
-#line 1211 "ImportQueuePage.c"
+#line 1213 "ImportQueuePage.c"
 	} else {
-		ViewCollection* _tmp16_ = NULL;
-		ViewCollection* _tmp17_ = NULL;
-		ThumbnailSource* _tmp18_ = NULL;
-		VideoView* _tmp19_ = NULL;
-		VideoView* _tmp20_ = NULL;
-		gboolean _tmp21_ = FALSE;
+		ViewCollection* _tmp16_;
+		ViewCollection* _tmp17_;
+		ThumbnailSource* _tmp18_;
+		VideoView* _tmp19_;
+		VideoView* _tmp20_;
+		gboolean _tmp21_;
 #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1233,7 +1235,7 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc
 		_g_object_unref0 (_tmp20_);
 #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 1237 "ImportQueuePage.c"
+#line 1239 "ImportQueuePage.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp22_ = self->priv->progress_bar;
@@ -1242,60 +1244,58 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp23_ = self->priv->progress_bar;
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp24_ = _ ("Imported %s");
-#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp25_ = source;
+	_tmp24_ = source;
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp26_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject));
+	_tmp25_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject));
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp27_ = _tmp26_;
+	_tmp26_ = _tmp25_;
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp28_ = g_strdup_printf (_tmp24_, _tmp27_);
+	_tmp27_ = g_strdup_printf (_ ("Imported %s"), _tmp26_);
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp29_ = _tmp28_;
+	_tmp28_ = _tmp27_;
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	gtk_progress_bar_set_text (_tmp23_, _tmp29_);
+	gtk_progress_bar_set_text (_tmp23_, _tmp28_);
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_g_free0 (_tmp29_);
+	_g_free0 (_tmp28_);
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_g_free0 (_tmp27_);
+	_g_free0 (_tmp26_);
 #line 1263 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchImport* batch_import, ImportManifest* manifest, BatchImportRoll* import_roll) {
-	BatchImport* _tmp0_ = NULL;
-	BatchImport* _tmp1_ = NULL;
-	GeeArrayList* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	GeeArrayList* _tmp5_ = NULL;
-	gpointer _tmp6_ = NULL;
-	BatchImport* _tmp7_ = NULL;
-	BatchImport* _tmp8_ = NULL;
+	BatchImport* _tmp0_;
+	BatchImport* _tmp1_;
+	GeeArrayList* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	GeeArrayList* _tmp5_;
+	gpointer _tmp6_;
+	BatchImport* _tmp7_;
+	BatchImport* _tmp8_;
 	gboolean removed = FALSE;
-	GeeArrayList* _tmp9_ = NULL;
-	BatchImport* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
-	gboolean _tmp12_ = FALSE;
-	GeeHashSet* _tmp13_ = NULL;
-	BatchImport* _tmp14_ = NULL;
-	BatchImport* _tmp15_ = NULL;
-	guint _tmp16_ = 0U;
-	BatchImport* _tmp17_ = NULL;
-	guint _tmp18_ = 0U;
-	BatchImport* _tmp19_ = NULL;
-	guint _tmp20_ = 0U;
-	BatchImport* _tmp21_ = NULL;
-	guint _tmp22_ = 0U;
-	BatchImport* _tmp23_ = NULL;
-	guint _tmp24_ = 0U;
-	BatchImport* _tmp25_ = NULL;
-	guint _tmp26_ = 0U;
-	GeeArrayList* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	BatchImport* _tmp39_ = NULL;
+	GeeArrayList* _tmp9_;
+	BatchImport* _tmp10_;
+	gboolean _tmp11_;
+	gboolean _tmp12_;
+	GeeHashSet* _tmp13_;
+	BatchImport* _tmp14_;
+	BatchImport* _tmp15_;
+	guint _tmp16_;
+	BatchImport* _tmp17_;
+	guint _tmp18_;
+	BatchImport* _tmp19_;
+	guint _tmp20_;
+	BatchImport* _tmp21_;
+	guint _tmp22_;
+	BatchImport* _tmp23_;
+	guint _tmp24_;
+	BatchImport* _tmp25_;
+	guint _tmp26_;
+	GeeArrayList* _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
+	BatchImport* _tmp39_;
 #line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1397,9 +1397,9 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm
 #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp29_ > 0) {
 #line 1400 "ImportQueuePage.c"
-		GeeArrayList* _tmp30_ = NULL;
-		gpointer _tmp31_ = NULL;
-		BatchImport* _tmp32_ = NULL;
+		GeeArrayList* _tmp30_;
+		gpointer _tmp31_;
+		BatchImport* _tmp32_;
 #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp30_ = self->priv->queue;
 #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1412,10 +1412,10 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm
 		_g_object_unref0 (_tmp32_);
 #line 1414 "ImportQueuePage.c"
 	} else {
-		GtkProgressBar* _tmp33_ = NULL;
-		GtkProgressBar* _tmp34_ = NULL;
-		GtkProgressBar* _tmp35_ = NULL;
-		gboolean _tmp36_ = FALSE;
+		GtkProgressBar* _tmp33_;
+		GtkProgressBar* _tmp34_;
+		GtkProgressBar* _tmp35_;
+		gboolean _tmp36_;
 #line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp33_ = self->priv->progress_bar;
 #line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1435,8 +1435,8 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm
 #line 198 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		if (_tmp36_) {
 #line 1438 "ImportQueuePage.c"
-			AppWindow* _tmp37_ = NULL;
-			AppWindow* _tmp38_ = NULL;
+			AppWindow* _tmp37_;
+			AppWindow* _tmp38_;
 #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp37_ = app_window_get_instance ();
 #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1456,13 +1456,13 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm
 #line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp39_ = batch_import;
 #line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_emit_by_name (self, "batch-removed", _tmp39_);
+	g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL], 0, _tmp39_);
 #line 1461 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_on_fatal_error (ImportQueuePage* self, ImportResult _result_, const gchar* message) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1481,25 +1481,25 @@ static void import_queue_page_class_init (ImportQueuePageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_type_class_add_private (klass, sizeof (ImportQueuePagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) import_queue_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) import_queue_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) import_queue_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) import_queue_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) import_queue_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) import_queue_page_real_remove_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	G_OBJECT_CLASS (klass)->finalize = import_queue_page_finalize;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_new ("batch_added", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT);
+	import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL] = g_signal_new ("batch-added", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT);
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_new ("batch_removed", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT);
+	import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL] = g_signal_new ("batch-removed", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT);
 #line 1496 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_instance_init (ImportQueuePage * self) {
-	GeeArrayList* _tmp0_ = NULL;
-	GeeHashSet* _tmp1_ = NULL;
-	GtkProgressBar* _tmp2_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeHashSet* _tmp1_;
+	GtkProgressBar* _tmp2_;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv = IMPORT_QUEUE_PAGE_GET_PRIVATE (self);
 #line 10 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1524,7 +1524,7 @@ static void import_queue_page_instance_init (ImportQueuePage * self) {
 }
 
 
-static void import_queue_page_finalize (GObject* obj) {
+static void import_queue_page_finalize (GObject * obj) {
 	ImportQueuePage * self;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage);
diff --git a/src/library/ImportQueueSidebarEntry.c b/src/library/ImportQueueSidebarEntry.c
index cd17564..bd9e970 100644
--- a/src/library/ImportQueueSidebarEntry.c
+++ b/src/library/ImportQueueSidebarEntry.c
@@ -1,4 +1,4 @@
-/* ImportQueueSidebarEntry.c generated by valac 0.34.7, the Vala compiler
+/* ImportQueueSidebarEntry.c generated by valac 0.36.6, the Vala compiler
  * generated from ImportQueueSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -272,7 +272,7 @@ LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_new (void) {
 static gchar* library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	LibraryImportQueueSidebarEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 19 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, LibraryImportQueueSidebarEntry);
 #line 20 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
@@ -288,7 +288,7 @@ static gchar* library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarS
 static gchar* library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
 	LibraryImportQueueSidebarEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, LibraryImportQueueSidebarEntry);
 #line 24 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
@@ -304,7 +304,7 @@ static gchar* library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarS
 static Page* library_import_queue_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
 	LibraryImportQueueSidebarEntry * self;
 	Page* result = NULL;
-	ImportQueuePage* _tmp0_ = NULL;
+	ImportQueuePage* _tmp0_;
 #line 27 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, LibraryImportQueueSidebarEntry);
 #line 28 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
@@ -321,8 +321,8 @@ static Page* library_import_queue_sidebar_entry_real_create_page (SidebarSimpleP
 
 static ImportQueuePage* library_import_queue_sidebar_entry_get_queue_page (LibraryImportQueueSidebarEntry* self) {
 	ImportQueuePage* result = NULL;
-	Page* _tmp0_ = NULL;
-	ImportQueuePage* _tmp1_ = NULL;
+	Page* _tmp0_;
+	ImportQueuePage* _tmp1_;
 #line 31 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	g_return_val_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self), NULL);
 #line 32 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
@@ -358,10 +358,10 @@ static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import
 
 
 static void library_import_queue_sidebar_entry_on_page_created (LibraryImportQueueSidebarEntry* self) {
-	ImportQueuePage* _tmp0_ = NULL;
-	ImportQueuePage* _tmp1_ = NULL;
-	ImportQueuePage* _tmp2_ = NULL;
-	ImportQueuePage* _tmp3_ = NULL;
+	ImportQueuePage* _tmp0_;
+	ImportQueuePage* _tmp1_;
+	ImportQueuePage* _tmp2_;
+	ImportQueuePage* _tmp3_;
 #line 35 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	g_return_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self));
 #line 36 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
@@ -385,12 +385,12 @@ static void library_import_queue_sidebar_entry_on_page_created (LibraryImportQue
 
 
 static void library_import_queue_sidebar_entry_on_destroying_page (LibraryImportQueueSidebarEntry* self) {
-	ImportQueuePage* _tmp0_ = NULL;
-	ImportQueuePage* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	ImportQueuePage* _tmp3_ = NULL;
-	ImportQueuePage* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
+	ImportQueuePage* _tmp0_;
+	ImportQueuePage* _tmp1_;
+	guint _tmp2_;
+	ImportQueuePage* _tmp3_;
+	ImportQueuePage* _tmp4_;
+	guint _tmp5_;
 #line 40 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	g_return_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self));
 #line 41 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
@@ -418,9 +418,9 @@ static void library_import_queue_sidebar_entry_on_destroying_page (LibraryImport
 
 
 static void library_import_queue_sidebar_entry_on_batch_added_or_removed (LibraryImportQueueSidebarEntry* self) {
-	ImportQueuePage* _tmp0_ = NULL;
-	ImportQueuePage* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	ImportQueuePage* _tmp0_;
+	ImportQueuePage* _tmp1_;
+	gint _tmp2_;
 #line 45 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	g_return_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self));
 #line 46 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
@@ -438,10 +438,10 @@ static void library_import_queue_sidebar_entry_on_batch_added_or_removed (Librar
 
 
 void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self, BatchImport* batch_import, gboolean allow_user_cancel) {
-	ImportQueuePage* _tmp0_ = NULL;
-	ImportQueuePage* _tmp1_ = NULL;
-	BatchImport* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	ImportQueuePage* _tmp0_;
+	ImportQueuePage* _tmp1_;
+	BatchImport* _tmp2_;
+	gboolean _tmp3_;
 #line 49 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	g_return_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self));
 #line 49 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
@@ -468,11 +468,11 @@ static void library_import_queue_sidebar_entry_class_init (LibraryImportQueueSid
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	library_import_queue_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_import_queue_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_import_queue_sidebar_entry_real_get_sidebar_name;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_import_queue_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_import_queue_sidebar_entry_real_get_sidebar_icon;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_import_queue_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_import_queue_sidebar_entry_real_create_page;
 #line 477 "ImportQueueSidebarEntry.c"
 }
 
diff --git a/src/library/LastImportPage.c b/src/library/LastImportPage.c
index 41a084f..fae86fe 100644
--- a/src/library/LastImportPage.c
+++ b/src/library/LastImportPage.c
@@ -1,4 +1,4 @@
-/* LastImportPage.c generated by valac 0.34.7, the Vala compiler
+/* LastImportPage.c generated by valac 0.36.6, the Vala compiler
  * generated from LastImportPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -702,8 +702,8 @@ static gboolean last_import_page_last_import_view_manager_real_include_in_view (
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 void media_source_get_import_id (MediaSource* self, ImportID* result);
-static void last_import_page_last_import_view_manager_finalize (ViewManager* obj);
-static void last_import_page_finalize (GObject* obj);
+static void last_import_page_last_import_view_manager_finalize (ViewManager * obj);
+static void last_import_page_finalize (GObject * obj);
 
 
 static void _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self) {
@@ -720,12 +720,12 @@ LastImportPage* last_import_page_construct (GType object_type) {
 #line 721 "LastImportPage.c"
 	{
 		GeeIterator* _col_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
@@ -747,12 +747,12 @@ LastImportPage* last_import_page_construct (GType object_type) {
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		while (TRUE) {
 #line 750 "LastImportPage.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* col = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			MediaSourceCollection* _tmp10_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			MediaSourceCollection* _tmp10_;
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_tmp6_ = _col_it;
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
@@ -798,20 +798,20 @@ LastImportPage* last_import_page_new (void) {
 
 static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 	ImportID* current_last_import_id = NULL;
-	MediaCollectionRegistry* _tmp0_ = NULL;
-	MediaCollectionRegistry* _tmp1_ = NULL;
-	ImportID* _tmp2_ = NULL;
-	ImportID* _tmp3_ = NULL;
-	ImportID* _tmp4_ = NULL;
-	ImportID* _tmp9_ = NULL;
-	gint64 _tmp10_ = 0LL;
-	ImportID _tmp11_ = {0};
-	gint64 _tmp12_ = 0LL;
-	ImportID* _tmp13_ = NULL;
-	ViewCollection* _tmp14_ = NULL;
-	ViewCollection* _tmp15_ = NULL;
-	ViewCollection* _tmp16_ = NULL;
-	ViewCollection* _tmp17_ = NULL;
+	MediaCollectionRegistry* _tmp0_;
+	MediaCollectionRegistry* _tmp1_;
+	ImportID* _tmp2_;
+	ImportID* _tmp3_;
+	ImportID* _tmp4_;
+	ImportID* _tmp9_;
+	gint64 _tmp10_;
+	ImportID _tmp11_;
+	gint64 _tmp12_;
+	ImportID* _tmp13_;
+	ViewCollection* _tmp14_;
+	ViewCollection* _tmp15_;
+	ViewCollection* _tmp16_;
+	ViewCollection* _tmp17_;
 #line 45 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	g_return_if_fail (IS_LAST_IMPORT_PAGE (self));
 #line 47 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
@@ -831,10 +831,10 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 #line 50 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	if (_tmp4_ == NULL) {
 #line 834 "LastImportPage.c"
-		ViewCollection* _tmp5_ = NULL;
-		ViewCollection* _tmp6_ = NULL;
-		ViewCollection* _tmp7_ = NULL;
-		ViewCollection* _tmp8_ = NULL;
+		ViewCollection* _tmp5_;
+		ViewCollection* _tmp6_;
+		ViewCollection* _tmp7_;
+		ViewCollection* _tmp8_;
 #line 51 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 51 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
@@ -896,12 +896,12 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 #line 897 "LastImportPage.c"
 	{
 		GeeIterator* _col_it = NULL;
-		MediaCollectionRegistry* _tmp18_ = NULL;
-		MediaCollectionRegistry* _tmp19_ = NULL;
-		GeeCollection* _tmp20_ = NULL;
-		GeeCollection* _tmp21_ = NULL;
-		GeeIterator* _tmp22_ = NULL;
-		GeeIterator* _tmp23_ = NULL;
+		MediaCollectionRegistry* _tmp18_;
+		MediaCollectionRegistry* _tmp19_;
+		GeeCollection* _tmp20_;
+		GeeCollection* _tmp21_;
+		GeeIterator* _tmp22_;
+		GeeIterator* _tmp23_;
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		_tmp18_ = media_collection_registry_get_instance ();
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
@@ -923,20 +923,20 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		while (TRUE) {
 #line 926 "LastImportPage.c"
-			GeeIterator* _tmp24_ = NULL;
-			gboolean _tmp25_ = FALSE;
+			GeeIterator* _tmp24_;
+			gboolean _tmp25_;
 			MediaSourceCollection* col = NULL;
-			GeeIterator* _tmp26_ = NULL;
-			gpointer _tmp27_ = NULL;
-			ViewCollection* _tmp28_ = NULL;
-			ViewCollection* _tmp29_ = NULL;
-			MediaSourceCollection* _tmp30_ = NULL;
-			ImportID _tmp31_ = {0};
-			LastImportPageLastImportViewManager* _tmp32_ = NULL;
-			LastImportPageLastImportViewManager* _tmp33_ = NULL;
-			Alteration* _tmp34_ = NULL;
-			ViewCollectionMonitor* _tmp35_ = NULL;
-			ViewCollectionMonitor* _tmp36_ = NULL;
+			GeeIterator* _tmp26_;
+			gpointer _tmp27_;
+			ViewCollection* _tmp28_;
+			ViewCollection* _tmp29_;
+			MediaSourceCollection* _tmp30_;
+			ImportID _tmp31_;
+			LastImportPageLastImportViewManager* _tmp32_;
+			LastImportPageLastImportViewManager* _tmp33_;
+			Alteration* _tmp34_;
+			ViewCollectionMonitor* _tmp35_;
+			ViewCollectionMonitor* _tmp36_;
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_tmp24_ = _col_it;
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
@@ -995,8 +995,8 @@ static void last_import_page_real_get_config_photos_sort (MediaPage* base, gbool
 	LastImportPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
 #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
@@ -1030,10 +1030,10 @@ static void last_import_page_real_get_config_photos_sort (MediaPage* base, gbool
 
 static void last_import_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
 	LastImportPage * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gint _tmp3_;
 #line 75 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LAST_IMPORT_PAGE, LastImportPage);
 #line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
@@ -1054,8 +1054,8 @@ static void last_import_page_real_set_config_photos_sort (MediaPage* base, gbool
 
 static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_construct (GType object_type, LastImportPage* owner, ImportID* import_id) {
 	LastImportPageLastImportViewManager* self = NULL;
-	LastImportPage* _tmp0_ = NULL;
-	ImportID _tmp1_ = {0};
+	LastImportPage* _tmp0_;
+	ImportID _tmp1_;
 #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	g_return_val_if_fail (IS_LAST_IMPORT_PAGE (owner), NULL);
 #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
@@ -1084,11 +1084,11 @@ static LastImportPageLastImportViewManager* last_import_page_last_import_view_ma
 static gboolean last_import_page_last_import_view_manager_real_include_in_view (ViewManager* base, DataSource* source) {
 	LastImportPageLastImportViewManager * self;
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 	ImportID _tmp1_ = {0};
-	gint64 _tmp2_ = 0LL;
-	ImportID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
+	gint64 _tmp2_;
+	ImportID _tmp3_;
+	gint64 _tmp4_;
 #line 19 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, LastImportPageLastImportViewManager);
 #line 19 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
@@ -1119,7 +1119,7 @@ static void last_import_page_last_import_view_manager_class_init (LastImportPage
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	g_type_class_add_private (klass, sizeof (LastImportPageLastImportViewManagerPrivate));
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) last_import_page_last_import_view_manager_real_include_in_view;
+	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) last_import_page_last_import_view_manager_real_include_in_view;
 #line 1124 "LastImportPage.c"
 }
 
@@ -1131,7 +1131,7 @@ static void last_import_page_last_import_view_manager_instance_init (LastImportP
 }
 
 
-static void last_import_page_last_import_view_manager_finalize (ViewManager* obj) {
+static void last_import_page_last_import_view_manager_finalize (ViewManager * obj) {
 	LastImportPageLastImportViewManager * self;
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, LastImportPageLastImportViewManager);
@@ -1159,9 +1159,9 @@ static void last_import_page_class_init (LastImportPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	g_type_class_add_private (klass, sizeof (LastImportPagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) last_import_page_real_get_config_photos_sort;
+	((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) last_import_page_real_get_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) last_import_page_real_set_config_photos_sort;
+	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) last_import_page_real_set_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = last_import_page_finalize;
 #line 1168 "LastImportPage.c"
@@ -1169,7 +1169,7 @@ static void last_import_page_class_init (LastImportPageClass * klass) {
 
 
 static void last_import_page_instance_init (LastImportPage * self) {
-	Alteration* _tmp0_ = NULL;
+	Alteration* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self->priv = LAST_IMPORT_PAGE_GET_PRIVATE (self);
 #line 24 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
@@ -1182,19 +1182,19 @@ static void last_import_page_instance_init (LastImportPage * self) {
 }
 
 
-static void last_import_page_finalize (GObject* obj) {
+static void last_import_page_finalize (GObject * obj) {
 	LastImportPage * self;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LAST_IMPORT_PAGE, LastImportPage);
 #line 1190 "LastImportPage.c"
 	{
 		GeeIterator* _col_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
@@ -1216,13 +1216,13 @@ static void last_import_page_finalize (GObject* obj) {
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		while (TRUE) {
 #line 1219 "LastImportPage.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* col = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			MediaSourceCollection* _tmp10_ = NULL;
-			guint _tmp11_ = 0U;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			MediaSourceCollection* _tmp10_;
+			guint _tmp11_;
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_tmp6_ = _col_it;
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
diff --git a/src/library/LastImportSidebarEntry.c b/src/library/LastImportSidebarEntry.c
index 5032c53..03684ca 100644
--- a/src/library/LastImportSidebarEntry.c
+++ b/src/library/LastImportSidebarEntry.c
@@ -1,4 +1,4 @@
-/* LastImportSidebarEntry.c generated by valac 0.34.7, the Vala compiler
+/* LastImportSidebarEntry.c generated by valac 0.36.6, the Vala compiler
  * generated from LastImportSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -315,7 +315,7 @@ GType checkerboard_page_get_type (void) G_GNUC_CONST;
 GType media_page_get_type (void) G_GNUC_CONST;
 GType collection_page_get_type (void) G_GNUC_CONST;
 GType last_import_page_get_type (void) G_GNUC_CONST;
-static void library_last_import_sidebar_entry_finalize (GObject* obj);
+static void library_last_import_sidebar_entry_finalize (GObject * obj);
 
 
 static void _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self) {
@@ -327,21 +327,21 @@ static void _library_last_import_sidebar_entry_on_import_rolls_altered_media_sou
 
 LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GType object_type) {
 	LibraryLastImportSidebarEntry * self = NULL;
-	MediaCollectionRegistry* _tmp11_ = NULL;
-	MediaCollectionRegistry* _tmp12_ = NULL;
-	ImportID* _tmp13_ = NULL;
-	ImportID* _tmp14_ = NULL;
+	MediaCollectionRegistry* _tmp11_;
+	MediaCollectionRegistry* _tmp12_;
+	ImportID* _tmp13_;
+	ImportID* _tmp14_;
 #line 8 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	self = (LibraryLastImportSidebarEntry*) library_hideable_page_entry_construct (object_type);
 #line 337 "LastImportSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
@@ -363,12 +363,12 @@ LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GTyp
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 		while (TRUE) {
 #line 366 "LastImportSidebarEntry.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			MediaSourceCollection* _tmp10_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			MediaSourceCollection* _tmp10_;
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
@@ -427,7 +427,7 @@ LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_new (void) {
 static gchar* library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	LibraryLastImportSidebarEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 20 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntry);
 #line 21 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
@@ -443,7 +443,7 @@ static gchar* library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSi
 static gchar* library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
 	LibraryLastImportSidebarEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 24 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntry);
 #line 25 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
@@ -459,7 +459,7 @@ static gchar* library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSi
 static Page* library_last_import_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
 	LibraryLastImportSidebarEntry * self;
 	Page* result = NULL;
-	LastImportPage* _tmp0_ = NULL;
+	LastImportPage* _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntry);
 #line 29 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
@@ -475,10 +475,10 @@ static Page* library_last_import_sidebar_entry_real_create_page (SidebarSimplePa
 
 
 static void library_last_import_sidebar_entry_on_import_rolls_altered (LibraryLastImportSidebarEntry* self) {
-	MediaCollectionRegistry* _tmp0_ = NULL;
-	MediaCollectionRegistry* _tmp1_ = NULL;
-	ImportID* _tmp2_ = NULL;
-	ImportID* _tmp3_ = NULL;
+	MediaCollectionRegistry* _tmp0_;
+	MediaCollectionRegistry* _tmp1_;
+	ImportID* _tmp2_;
+	ImportID* _tmp3_;
 #line 32 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	g_return_if_fail (LIBRARY_IS_LAST_IMPORT_SIDEBAR_ENTRY (self));
 #line 33 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
@@ -503,11 +503,11 @@ static void library_last_import_sidebar_entry_class_init (LibraryLastImportSideb
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	library_last_import_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_last_import_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_last_import_sidebar_entry_real_get_sidebar_name;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_last_import_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_last_import_sidebar_entry_real_get_sidebar_icon;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_last_import_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_last_import_sidebar_entry_real_create_page;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_last_import_sidebar_entry_finalize;
 #line 514 "LastImportSidebarEntry.c"
@@ -518,19 +518,19 @@ static void library_last_import_sidebar_entry_instance_init (LibraryLastImportSi
 }
 
 
-static void library_last_import_sidebar_entry_finalize (GObject* obj) {
+static void library_last_import_sidebar_entry_finalize (GObject * obj) {
 	LibraryLastImportSidebarEntry * self;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntry);
 #line 526 "LastImportSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
@@ -552,13 +552,13 @@ static void library_last_import_sidebar_entry_finalize (GObject* obj) {
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 		while (TRUE) {
 #line 555 "LastImportSidebarEntry.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			MediaSourceCollection* _tmp10_ = NULL;
-			guint _tmp11_ = 0U;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			MediaSourceCollection* _tmp10_;
+			guint _tmp11_;
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
diff --git a/src/library/Library.c b/src/library/Library.c
index bb7907e..460fc05 100644
--- a/src/library/Library.c
+++ b/src/library/Library.c
@@ -1,4 +1,4 @@
-/* Library.c generated by valac 0.34.7, the Vala compiler
+/* Library.c generated by valac 0.36.6, the Vala compiler
  * generated from Library.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -22,8 +22,8 @@ void library_trash_sidebar_entry_terminate (void);
 
 
 void library_init (GError** error) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
 #line 10 "/home/jens/Source/shotwell/src/library/Library.vala"
 	library_trash_sidebar_entry_init ();
 #line 11 "/home/jens/Source/shotwell/src/library/Library.vala"
diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c
index 526b38f..00ba201 100644
--- a/src/library/LibraryWindow.c
+++ b/src/library/LibraryWindow.c
@@ -1,4 +1,4 @@
-/* LibraryWindow.c generated by valac 0.34.7, the Vala compiler
+/* LibraryWindow.c generated by valac 0.36.6, the Vala compiler
  * generated from LibraryWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1506,7 +1506,7 @@ gint view_collection_get_selected_count (ViewCollection* self);
 GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t);
 GType library_photo_get_type (void) G_GNUC_CONST;
 GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t);
-static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* page, CollectionPage** collection, Photo** start, ViewCollection** view_collection);
+static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* page, CollectionPage* * collection, Photo* * start, ViewCollection* * view_collection);
 GType events_directory_page_get_type (void) G_GNUC_CONST;
 gint data_collection_get_count (DataCollection* self);
 DataObject* data_collection_get_at (DataCollection* self, gint index);
@@ -1732,8 +1732,8 @@ enum  {
 static void library_window_fullscreen_photo_page_real_switched_to (Page* base);
 static void library_window_fullscreen_photo_page_real_switching_from (Page* base);
 static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
-static void library_window_fullscreen_photo_page_finalize (GObject* obj);
-static void library_window_finalize (GObject* obj);
+static void library_window_fullscreen_photo_page_finalize (GObject * obj);
+static void library_window_finalize (GObject * obj);
 static void _vala_library_window_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
@@ -1972,57 +1972,57 @@ static void _library_window_on_update_properties_now_one_shot_callback (gpointer
 
 LibraryWindow* library_window_construct (GType object_type, ProgressMonitor progress_monitor, void* progress_monitor_target) {
 	LibraryWindow * self = NULL;
-	SidebarTree* _tmp0_ = NULL;
-	SidebarTree* _tmp1_ = NULL;
-	SidebarTree* _tmp2_ = NULL;
-	SidebarTree* _tmp3_ = NULL;
-	SidebarTree* _tmp4_ = NULL;
-	SidebarTree* _tmp5_ = NULL;
-	LibraryBranch* _tmp6_ = NULL;
-	SidebarTree* _tmp7_ = NULL;
-	TagsBranch* _tmp8_ = NULL;
-	SidebarTree* _tmp9_ = NULL;
-	FoldersBranch* _tmp10_ = NULL;
-	SidebarTree* _tmp11_ = NULL;
-	EventsBranch* _tmp12_ = NULL;
-	SidebarTree* _tmp13_ = NULL;
-	CameraBranch* _tmp14_ = NULL;
-	SidebarTree* _tmp15_ = NULL;
-	SearchesBranch* _tmp16_ = NULL;
-	ExtendedPropertiesWindow* _tmp17_ = NULL;
-	ExtendedPropertiesWindow* _tmp18_ = NULL;
-	ExtendedPropertiesWindow* _tmp19_ = NULL;
-	OneShotScheduler* _tmp20_ = NULL;
-	SearchFilterActions* _tmp21_ = NULL;
-	SearchFilterToolbar* _tmp22_ = NULL;
-	LibraryBranch* _tmp23_ = NULL;
-	LibraryPhotosEntry* _tmp24_ = NULL;
-	LibraryPhotosEntry* _tmp25_ = NULL;
-	Page* _tmp26_ = NULL;
-	Page* _tmp27_ = NULL;
+	SidebarTree* _tmp0_;
+	SidebarTree* _tmp1_;
+	SidebarTree* _tmp2_;
+	SidebarTree* _tmp3_;
+	SidebarTree* _tmp4_;
+	SidebarTree* _tmp5_;
+	LibraryBranch* _tmp6_;
+	SidebarTree* _tmp7_;
+	TagsBranch* _tmp8_;
+	SidebarTree* _tmp9_;
+	FoldersBranch* _tmp10_;
+	SidebarTree* _tmp11_;
+	EventsBranch* _tmp12_;
+	SidebarTree* _tmp13_;
+	CameraBranch* _tmp14_;
+	SidebarTree* _tmp15_;
+	SearchesBranch* _tmp16_;
+	ExtendedPropertiesWindow* _tmp17_;
+	ExtendedPropertiesWindow* _tmp18_;
+	ExtendedPropertiesWindow* _tmp19_;
+	OneShotScheduler* _tmp20_;
+	SearchFilterActions* _tmp21_;
+	SearchFilterToolbar* _tmp22_;
+	LibraryBranch* _tmp23_;
+	LibraryPhotosEntry* _tmp24_;
+	LibraryPhotosEntry* _tmp25_;
+	Page* _tmp26_;
+	Page* _tmp27_;
 	GtkTargetEntry* main_window_dnd_targets = NULL;
-	GtkTargetEntry _tmp40_ = {0};
-	GtkTargetEntry _tmp41_ = {0};
-	GtkTargetEntry* _tmp42_ = NULL;
-	gint main_window_dnd_targets_length1 = 0;
-	gint _main_window_dnd_targets_size_ = 0;
-	GtkTargetEntry* _tmp43_ = NULL;
-	gint _tmp43__length1 = 0;
-	MetadataWriter* _tmp44_ = NULL;
-	MetadataWriter* _tmp45_ = NULL;
+	GtkTargetEntry _tmp40_;
+	GtkTargetEntry _tmp41_;
+	GtkTargetEntry* _tmp42_;
+	gint main_window_dnd_targets_length1;
+	gint _main_window_dnd_targets_size_;
+	GtkTargetEntry* _tmp43_;
+	gint _tmp43__length1;
+	MetadataWriter* _tmp44_;
+	MetadataWriter* _tmp45_;
 	LibraryMonitor* monitor = NULL;
-	LibraryMonitorPool* _tmp46_ = NULL;
-	LibraryMonitorPool* _tmp47_ = NULL;
-	LibraryMonitor* _tmp48_ = NULL;
-	LibraryMonitor* _tmp49_ = NULL;
-	LibraryMonitor* _tmp50_ = NULL;
-	LibraryMonitorPool* _tmp52_ = NULL;
-	LibraryMonitorPool* _tmp53_ = NULL;
-	LibraryMonitorPool* _tmp54_ = NULL;
-	LibraryMonitorPool* _tmp55_ = NULL;
-	CameraTable* _tmp56_ = NULL;
-	CameraTable* _tmp57_ = NULL;
-	GtkProgressBar* _tmp58_ = NULL;
+	LibraryMonitorPool* _tmp46_;
+	LibraryMonitorPool* _tmp47_;
+	LibraryMonitor* _tmp48_;
+	LibraryMonitor* _tmp49_;
+	LibraryMonitor* _tmp50_;
+	LibraryMonitorPool* _tmp52_;
+	LibraryMonitorPool* _tmp53_;
+	LibraryMonitorPool* _tmp54_;
+	LibraryMonitorPool* _tmp55_;
+	CameraTable* _tmp56_;
+	CameraTable* _tmp57_;
+	GtkProgressBar* _tmp58_;
 #line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	static const gchar* accels[] = {"<Primary>f", "F8", NULL};
 #line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2138,12 +2138,12 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 #line 2139 "LibraryWindow.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
-		MediaCollectionRegistry* _tmp28_ = NULL;
-		MediaCollectionRegistry* _tmp29_ = NULL;
-		GeeCollection* _tmp30_ = NULL;
-		GeeCollection* _tmp31_ = NULL;
-		GeeIterator* _tmp32_ = NULL;
-		GeeIterator* _tmp33_ = NULL;
+		MediaCollectionRegistry* _tmp28_;
+		MediaCollectionRegistry* _tmp29_;
+		GeeCollection* _tmp30_;
+		GeeCollection* _tmp31_;
+		GeeIterator* _tmp32_;
+		GeeIterator* _tmp33_;
 #line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = media_collection_registry_get_instance ();
 #line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2165,13 +2165,13 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 #line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		while (TRUE) {
 #line 2168 "LibraryWindow.c"
-			GeeIterator* _tmp34_ = NULL;
-			gboolean _tmp35_ = FALSE;
+			GeeIterator* _tmp34_;
+			gboolean _tmp35_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp36_ = NULL;
-			gpointer _tmp37_ = NULL;
-			MediaSourceCollection* _tmp38_ = NULL;
-			MediaSourceCollection* _tmp39_ = NULL;
+			GeeIterator* _tmp36_;
+			gpointer _tmp37_;
+			MediaSourceCollection* _tmp38_;
+			MediaSourceCollection* _tmp39_;
 #line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp34_ = _media_sources_it;
 #line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2251,7 +2251,7 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 #line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp50_ != NULL) {
 #line 2254 "LibraryWindow.c"
-		LibraryMonitor* _tmp51_ = NULL;
+		LibraryMonitor* _tmp51_;
 #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp51_ = monitor;
 #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2348,17 +2348,17 @@ static void _library_window_on_library_monitor_auto_import_progress_library_moni
 
 
 static void library_window_on_library_monitor_installed (LibraryWindow* self, LibraryMonitor* monitor) {
-	LibraryMonitor* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	LibraryMonitor* _tmp5_ = NULL;
-	LibraryMonitor* _tmp6_ = NULL;
-	LibraryMonitor* _tmp7_ = NULL;
-	LibraryMonitor* _tmp8_ = NULL;
-	LibraryMonitor* _tmp9_ = NULL;
-	LibraryMonitor* _tmp10_ = NULL;
+	LibraryMonitor* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	LibraryMonitor* _tmp5_;
+	LibraryMonitor* _tmp6_;
+	LibraryMonitor* _tmp7_;
+	LibraryMonitor* _tmp8_;
+	LibraryMonitor* _tmp9_;
+	LibraryMonitor* _tmp10_;
 #line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2408,23 +2408,23 @@ static void library_window_on_library_monitor_installed (LibraryWindow* self, Li
 
 
 static void library_window_on_library_monitor_destroyed (LibraryWindow* self, LibraryMonitor* monitor) {
-	LibraryMonitor* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	LibraryMonitor* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	LibraryMonitor* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
-	LibraryMonitor* _tmp9_ = NULL;
-	guint _tmp10_ = 0U;
-	LibraryMonitor* _tmp11_ = NULL;
-	guint _tmp12_ = 0U;
-	LibraryMonitor* _tmp13_ = NULL;
-	guint _tmp14_ = 0U;
-	LibraryMonitor* _tmp15_ = NULL;
-	guint _tmp16_ = 0U;
+	LibraryMonitor* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	LibraryMonitor* _tmp5_;
+	guint _tmp6_;
+	LibraryMonitor* _tmp7_;
+	guint _tmp8_;
+	LibraryMonitor* _tmp9_;
+	guint _tmp10_;
+	LibraryMonitor* _tmp11_;
+	guint _tmp12_;
+	LibraryMonitor* _tmp13_;
+	guint _tmp14_;
+	LibraryMonitor* _tmp15_;
+	guint _tmp16_;
 #line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2508,21 +2508,21 @@ static GVariant* _variant_new3 (gboolean value) {
 
 static void library_window_real_add_actions (AppWindow* base) {
 	LibraryWindow * self;
-	SearchFilterActions* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	GActionEntry* _tmp2_ = NULL;
-	SearchFilterActions* _tmp3_ = NULL;
-	GAction* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	ConfigFacade* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	GVariant* _tmp8_ = NULL;
-	GAction* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	GVariant* _tmp11_ = NULL;
-	GAction* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	GVariant* _tmp14_ = NULL;
+	SearchFilterActions* _tmp0_;
+	gint _tmp1_;
+	GActionEntry* _tmp2_;
+	SearchFilterActions* _tmp3_;
+	GAction* _tmp4_;
+	ConfigFacade* _tmp5_;
+	ConfigFacade* _tmp6_;
+	gboolean _tmp7_;
+	GVariant* _tmp8_;
+	GAction* _tmp9_;
+	gboolean _tmp10_;
+	GVariant* _tmp11_;
+	GAction* _tmp12_;
+	gboolean _tmp13_;
+	GVariant* _tmp14_;
 #line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2593,13 +2593,13 @@ static void _library_window_on_view_filter_removed_view_collection_view_filter_r
 
 static void library_window_real_switched_pages (PageWindow* base, Page* old_page, Page* new_page) {
 	LibraryWindow * self;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp11_ = NULL;
-	SearchFilterActions* _tmp18_ = NULL;
-	Page* _tmp19_ = NULL;
-	Page* _tmp20_ = NULL;
+	Page* _tmp0_;
+	Page* _tmp1_;
+	Page* _tmp2_;
+	Page* _tmp11_;
+	SearchFilterActions* _tmp18_;
+	Page* _tmp19_;
+	Page* _tmp20_;
 #line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2617,14 +2617,14 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page
 #line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
 #line 2620 "LibraryWindow.c"
-		Page* _tmp3_ = NULL;
-		ViewCollection* _tmp4_ = NULL;
-		ViewCollection* _tmp5_ = NULL;
-		guint _tmp6_ = 0U;
-		Page* _tmp7_ = NULL;
-		ViewCollection* _tmp8_ = NULL;
-		ViewCollection* _tmp9_ = NULL;
-		guint _tmp10_ = 0U;
+		Page* _tmp3_;
+		ViewCollection* _tmp4_;
+		ViewCollection* _tmp5_;
+		guint _tmp6_;
+		Page* _tmp7_;
+		ViewCollection* _tmp8_;
+		ViewCollection* _tmp9_;
+		guint _tmp10_;
 #line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = old_page;
 #line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2656,12 +2656,12 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page
 #line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp11_ != NULL) {
 #line 2659 "LibraryWindow.c"
-		Page* _tmp12_ = NULL;
-		ViewCollection* _tmp13_ = NULL;
-		ViewCollection* _tmp14_ = NULL;
-		Page* _tmp15_ = NULL;
-		ViewCollection* _tmp16_ = NULL;
-		ViewCollection* _tmp17_ = NULL;
+		Page* _tmp12_;
+		ViewCollection* _tmp13_;
+		ViewCollection* _tmp14_;
+		Page* _tmp15_;
+		ViewCollection* _tmp16_;
+		ViewCollection* _tmp17_;
 #line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = new_page;
 #line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2704,7 +2704,7 @@ static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFi
 
 
 static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFilter* filter) {
-	ViewFilter* _tmp0_ = NULL;
+	ViewFilter* _tmp0_;
 #line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2718,8 +2718,8 @@ static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFi
 
 
 static void library_window_on_view_filter_removed (LibraryWindow* self, ViewFilter* filter) {
-	ViewFilter* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	ViewFilter* _tmp0_;
+	guint _tmp1_;
 #line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2749,16 +2749,16 @@ static GVariant* _variant_new4 (gboolean value) {
 
 
 static void library_window_on_view_filter_refreshed (LibraryWindow* self) {
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	Page* _tmp0_;
+	Page* _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
 	GAction* action = NULL;
-	GAction* _tmp6_ = NULL;
-	GAction* _tmp7_ = NULL;
-	GAction* _tmp8_ = NULL;
+	GAction* _tmp6_;
+	GAction* _tmp7_;
+	GAction* _tmp8_;
 #line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2794,8 +2794,8 @@ static void library_window_on_view_filter_refreshed (LibraryWindow* self) {
 #line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ != NULL) {
 #line 2797 "LibraryWindow.c"
-		GAction* _tmp9_ = NULL;
-		GVariant* _tmp10_ = NULL;
+		GAction* _tmp9_;
+		GVariant* _tmp10_;
 #line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = action;
 #line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2815,23 +2815,23 @@ static void library_window_on_view_filter_refreshed (LibraryWindow* self) {
 static void library_window_real_show_all (GtkWidget* base) {
 	LibraryWindow * self;
 	GAction* basic_properties_action = NULL;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	GAction* _tmp2_ = NULL;
-	GAction* _tmp3_ = NULL;
-	GAction* _tmp4_ = NULL;
-	GAction* _tmp5_ = NULL;
-	GVariant* _tmp6_ = NULL;
-	GVariant* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_ = FALSE;
+	Page* _tmp0_;
+	Page* _tmp1_;
+	GAction* _tmp2_;
+	GAction* _tmp3_;
+	GAction* _tmp4_;
+	GAction* _tmp5_;
+	GVariant* _tmp6_;
+	GVariant* _tmp7_;
+	gboolean _tmp8_;
+	gboolean _tmp9_;
 	CheckerboardPage* current_page = NULL;
-	Page* _tmp11_ = NULL;
-	CheckerboardPage* _tmp12_ = NULL;
-	CheckerboardPage* _tmp13_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	CheckerboardPage* _tmp16_ = NULL;
-	gboolean _tmp17_ = FALSE;
+	Page* _tmp11_;
+	CheckerboardPage* _tmp12_;
+	CheckerboardPage* _tmp13_;
+	gboolean _tmp15_;
+	CheckerboardPage* _tmp16_;
+	gboolean _tmp17_;
 #line 341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2867,7 +2867,7 @@ static void library_window_real_show_all (GtkWidget* base) {
 #line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_) {
 #line 2870 "LibraryWindow.c"
-		GtkFrame* _tmp10_ = NULL;
+		GtkFrame* _tmp10_;
 #line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = self->priv->bottom_frame;
 #line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2891,7 +2891,7 @@ static void library_window_real_show_all (GtkWidget* base) {
 #line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_ != NULL) {
 #line 2894 "LibraryWindow.c"
-		CheckerboardPage* _tmp14_ = NULL;
+		CheckerboardPage* _tmp14_;
 #line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = current_page;
 #line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2918,9 +2918,9 @@ static void library_window_real_show_all (GtkWidget* base) {
 
 LibraryWindow* library_window_get_app (void) {
 	LibraryWindow* result = NULL;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-	LibraryWindow* _tmp2_ = NULL;
+	AppWindow* _tmp0_;
+	AppWindow* _tmp1_;
+	LibraryWindow* _tmp2_;
 #line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = app_window_instance;
 #line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2954,7 +2954,7 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) {
 #line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (scheme_it = 0; scheme_it < G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES); scheme_it = scheme_it + 1) {
 #line 2957 "LibraryWindow.c"
-			gchar* _tmp0_ = NULL;
+			gchar* _tmp0_;
 			gchar* scheme = NULL;
 #line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp0_ = g_strdup (scheme_collection[scheme_it]);
@@ -2962,9 +2962,9 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) {
 			scheme = _tmp0_;
 #line 2964 "LibraryWindow.c"
 			{
-				const gchar* _tmp1_ = NULL;
-				const gchar* _tmp2_ = NULL;
-				gboolean _tmp3_ = FALSE;
+				const gchar* _tmp1_;
+				const gchar* _tmp2_;
+				gboolean _tmp3_;
 #line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp1_ = uri;
 #line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2998,7 +2998,7 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) {
 static gchar* library_window_real_get_app_role (AppWindow* base) {
 	LibraryWindow * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3013,10 +3013,10 @@ static gchar* library_window_real_get_app_role (AppWindow* base) {
 
 void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) {
 	TagsSidebarEntry* entry = NULL;
-	TagsBranch* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
-	TagsSidebarEntry* _tmp2_ = NULL;
-	TagsSidebarEntry* _tmp3_ = NULL;
+	TagsBranch* _tmp0_;
+	Tag* _tmp1_;
+	TagsSidebarEntry* _tmp2_;
+	TagsSidebarEntry* _tmp3_;
 #line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3034,8 +3034,8 @@ void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) {
 #line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
 #line 3037 "LibraryWindow.c"
-		SidebarTree* _tmp4_ = NULL;
-		TagsSidebarEntry* _tmp5_ = NULL;
+		SidebarTree* _tmp4_;
+		TagsSidebarEntry* _tmp5_;
 #line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->sidebar_tree;
 #line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3056,10 +3056,10 @@ void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) {
 
 void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event) {
 	EventsEventEntry* entry = NULL;
-	EventsBranch* _tmp0_ = NULL;
-	Event* _tmp1_ = NULL;
-	EventsEventEntry* _tmp2_ = NULL;
-	EventsEventEntry* _tmp3_ = NULL;
+	EventsBranch* _tmp0_;
+	Event* _tmp1_;
+	EventsEventEntry* _tmp2_;
+	EventsEventEntry* _tmp3_;
 #line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3077,8 +3077,8 @@ void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event)
 #line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
 #line 3080 "LibraryWindow.c"
-		SidebarTree* _tmp4_ = NULL;
-		EventsEventEntry* _tmp5_ = NULL;
+		SidebarTree* _tmp4_;
+		EventsEventEntry* _tmp5_;
 #line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->sidebar_tree;
 #line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3099,10 +3099,10 @@ void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event)
 
 void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* search) {
 	SearchesSidebarEntry* entry = NULL;
-	SearchesBranch* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
-	SearchesSidebarEntry* _tmp2_ = NULL;
-	SearchesSidebarEntry* _tmp3_ = NULL;
+	SearchesBranch* _tmp0_;
+	SavedSearch* _tmp1_;
+	SearchesSidebarEntry* _tmp2_;
+	SearchesSidebarEntry* _tmp3_;
 #line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3120,8 +3120,8 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch*
 #line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
 #line 3123 "LibraryWindow.c"
-		SidebarTree* _tmp4_ = NULL;
-		SearchesSidebarEntry* _tmp5_ = NULL;
+		SidebarTree* _tmp4_;
+		SearchesSidebarEntry* _tmp5_;
 #line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->sidebar_tree;
 #line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3142,15 +3142,15 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch*
 
 static void library_window_real_on_quit (AppWindow* base) {
 	LibraryWindow * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	Dimensions _tmp3_ = {0};
-	ConfigFacade* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	GtkPaned* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	Dimensions _tmp3_;
+	ConfigFacade* _tmp4_;
+	ConfigFacade* _tmp5_;
+	GtkPaned* _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 #line 406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3188,16 +3188,16 @@ static void library_window_real_on_quit (AppWindow* base) {
 static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, CollectionPage* page) {
 	Photo* result = NULL;
 	ViewCollection* view = NULL;
-	CollectionPage* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
+	CollectionPage* _tmp0_;
+	ViewCollection* _tmp1_;
 	GeeList* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	ViewCollection* _tmp3_;
+	gint _tmp4_;
 	GeeList* sources = NULL;
-	GeeList* _tmp9_ = NULL;
+	GeeList* _tmp9_;
 	Photo* _tmp10_ = NULL;
 	gboolean _tmp11_ = FALSE;
-	GeeList* _tmp12_ = NULL;
+	GeeList* _tmp12_;
 #line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), NULL);
 #line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3215,8 +3215,8 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co
 #line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_ > 0) {
 #line 3218 "LibraryWindow.c"
-		ViewCollection* _tmp5_ = NULL;
-		GeeList* _tmp6_ = NULL;
+		ViewCollection* _tmp5_;
+		GeeList* _tmp6_;
 #line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = view;
 #line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3227,8 +3227,8 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co
 		_tmp2_ = _tmp6_;
 #line 3229 "LibraryWindow.c"
 	} else {
-		ViewCollection* _tmp7_ = NULL;
-		GeeList* _tmp8_ = NULL;
+		ViewCollection* _tmp7_;
+		GeeList* _tmp8_;
 #line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = view;
 #line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3248,9 +3248,9 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co
 #line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_ != NULL) {
 #line 3251 "LibraryWindow.c"
-		GeeList* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
-		gint _tmp15_ = 0;
+		GeeList* _tmp13_;
+		gint _tmp14_;
+		gint _tmp15_;
 #line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = sources;
 #line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3268,8 +3268,8 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co
 #line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp11_) {
 #line 3271 "LibraryWindow.c"
-		GeeList* _tmp16_ = NULL;
-		gpointer _tmp17_ = NULL;
+		GeeList* _tmp16_;
+		gpointer _tmp17_;
 #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = sources;
 #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3300,14 +3300,14 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co
 }
 
 
-static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* page, CollectionPage** collection, Photo** start, ViewCollection** view_collection) {
+static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* page, CollectionPage* * collection, Photo* * start, ViewCollection* * view_collection) {
 	CollectionPage* _vala_collection = NULL;
 	Photo* _vala_start = NULL;
 	ViewCollection* _vala_view_collection = NULL;
 	gboolean result = FALSE;
-	Page* _tmp0_ = NULL;
-	Page* _tmp8_ = NULL;
-	Page* _tmp30_ = NULL;
+	Page* _tmp0_;
+	Page* _tmp8_;
+	Page* _tmp30_;
 #line 427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3329,14 +3329,14 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 #line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_COLLECTION_PAGE)) {
 #line 3332 "LibraryWindow.c"
-		Page* _tmp1_ = NULL;
-		CollectionPage* _tmp2_ = NULL;
+		Page* _tmp1_;
+		CollectionPage* _tmp2_;
 		Photo* photo = NULL;
-		CollectionPage* _tmp3_ = NULL;
-		Photo* _tmp4_ = NULL;
-		Photo* _tmp5_ = NULL;
-		Photo* _tmp6_ = NULL;
-		Photo* _tmp7_ = NULL;
+		CollectionPage* _tmp3_;
+		Photo* _tmp4_;
+		Photo* _tmp5_;
+		Photo* _tmp6_;
+		Photo* _tmp7_;
 #line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = page;
 #line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3449,30 +3449,30 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENTS_DIRECTORY_PAGE)) {
 #line 3451 "LibraryWindow.c"
 		ViewCollection* view = NULL;
-		Page* _tmp9_ = NULL;
-		ViewCollection* _tmp10_ = NULL;
-		ViewCollection* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
+		Page* _tmp9_;
+		ViewCollection* _tmp10_;
+		ViewCollection* _tmp11_;
+		gint _tmp12_;
 		Event* event = NULL;
-		ViewCollection* _tmp13_ = NULL;
-		DataObject* _tmp14_ = NULL;
-		DataView* _tmp15_ = NULL;
-		DataSource* _tmp16_ = NULL;
-		Event* _tmp17_ = NULL;
-		Event* _tmp18_ = NULL;
+		ViewCollection* _tmp13_;
+		DataObject* _tmp14_;
+		DataView* _tmp15_;
+		DataSource* _tmp16_;
+		Event* _tmp17_;
+		Event* _tmp18_;
 		EventsEventEntry* entry = NULL;
-		EventsBranch* _tmp19_ = NULL;
-		Event* _tmp20_ = NULL;
-		EventsEventEntry* _tmp21_ = NULL;
-		EventsEventEntry* _tmp22_ = NULL;
-		EventsEventEntry* _tmp23_ = NULL;
-		Page* _tmp24_ = NULL;
+		EventsBranch* _tmp19_;
+		Event* _tmp20_;
+		EventsEventEntry* _tmp21_;
+		EventsEventEntry* _tmp22_;
+		EventsEventEntry* _tmp23_;
+		Page* _tmp24_;
 		Photo* photo = NULL;
-		CollectionPage* _tmp25_ = NULL;
-		Photo* _tmp26_ = NULL;
-		Photo* _tmp27_ = NULL;
-		Photo* _tmp28_ = NULL;
-		Photo* _tmp29_ = NULL;
+		CollectionPage* _tmp25_;
+		Photo* _tmp26_;
+		Photo* _tmp27_;
+		Photo* _tmp28_;
+		Photo* _tmp29_;
 #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = page;
 #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3759,20 +3759,20 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO_PAGE)) {
 #line 3761 "LibraryWindow.c"
 		LibraryPhotoPage* photo_page = NULL;
-		Page* _tmp31_ = NULL;
-		LibraryPhotoPage* _tmp32_ = NULL;
+		Page* _tmp31_;
+		LibraryPhotoPage* _tmp32_;
 		CollectionPage* controller = NULL;
-		LibraryPhotoPage* _tmp33_ = NULL;
-		CollectionPage* _tmp34_ = NULL;
-		CollectionPage* _tmp35_ = NULL;
-		LibraryPhotoPage* _tmp36_ = NULL;
-		gboolean _tmp37_ = FALSE;
-		CollectionPage* _tmp38_ = NULL;
-		CollectionPage* _tmp39_ = NULL;
-		LibraryPhotoPage* _tmp40_ = NULL;
-		Photo* _tmp41_ = NULL;
-		LibraryPhotoPage* _tmp42_ = NULL;
-		ViewCollection* _tmp43_ = NULL;
+		LibraryPhotoPage* _tmp33_;
+		CollectionPage* _tmp34_;
+		CollectionPage* _tmp35_;
+		LibraryPhotoPage* _tmp36_;
+		gboolean _tmp37_;
+		CollectionPage* _tmp38_;
+		CollectionPage* _tmp39_;
+		LibraryPhotoPage* _tmp40_;
+		Photo* _tmp41_;
+		LibraryPhotoPage* _tmp42_;
+		ViewCollection* _tmp43_;
 #line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp31_ = page;
 #line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3980,22 +3980,22 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 static void library_window_real_on_fullscreen (AppWindow* base) {
 	LibraryWindow * self;
 	Page* current_page = NULL;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
+	Page* _tmp0_;
+	Page* _tmp1_;
 	CollectionPage* collection = NULL;
 	Photo* start = NULL;
 	ViewCollection* view = NULL;
-	Page* _tmp2_ = NULL;
+	Page* _tmp2_;
 	CollectionPage* _tmp3_ = NULL;
 	Photo* _tmp4_ = NULL;
 	ViewCollection* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	gboolean _tmp6_;
 	LibraryWindowFullscreenPhotoPage* fs_photo = NULL;
-	CollectionPage* _tmp7_ = NULL;
-	Photo* _tmp8_ = NULL;
-	ViewCollection* _tmp9_ = NULL;
-	LibraryWindowFullscreenPhotoPage* _tmp10_ = NULL;
-	LibraryWindowFullscreenPhotoPage* _tmp11_ = NULL;
+	CollectionPage* _tmp7_;
+	Photo* _tmp8_;
+	ViewCollection* _tmp9_;
+	LibraryWindowFullscreenPhotoPage* _tmp10_;
+	LibraryWindowFullscreenPhotoPage* _tmp11_;
 #line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4092,142 +4092,139 @@ static void _g_slist_free__g_free0_ (GSList* self) {
 
 static void library_window_on_file_import (LibraryWindow* self) {
 	GtkFileChooserDialog* import_dialog = NULL;
-	const gchar* _tmp0_ = NULL;
-	GtkFileChooserDialog* _tmp1_ = NULL;
-	GtkFileChooserDialog* _tmp2_ = NULL;
-	GtkFileChooserDialog* _tmp3_ = NULL;
-	GtkFileChooserDialog* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	GtkFileChooserDialog* _tmp0_;
+	GtkFileChooserDialog* _tmp1_;
+	GtkFileChooserDialog* _tmp2_;
+	GtkFileChooserDialog* _tmp3_;
+	const gchar* _tmp4_;
 	gint response = 0;
-	GtkFileChooserDialog* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	GtkFileChooserDialog* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	GtkFileChooserDialog* _tmp25_ = NULL;
+	GtkFileChooserDialog* _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	GtkFileChooserDialog* _tmp22_;
+	gchar* _tmp23_;
+	GtkFileChooserDialog* _tmp24_;
 #line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = _ ("Import From Folder");
-#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp0_, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
+	_tmp0_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_ ("Import From Folder"), NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
 #line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_object_ref_sink (_tmp1_);
+	g_object_ref_sink (_tmp0_);
 #line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	import_dialog = _tmp1_;
+	import_dialog = _tmp0_;
 #line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = import_dialog;
+	_tmp1_ = import_dialog;
 #line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
+	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
 #line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = import_dialog;
+	_tmp2_ = import_dialog;
 #line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
+	gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
 #line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = import_dialog;
+	_tmp3_ = import_dialog;
 #line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = self->priv->import_dir;
+	_tmp4_ = self->priv->import_dir;
 #line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp5_);
+	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp4_);
 #line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = import_dialog;
+	_tmp5_ = import_dialog;
 #line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_dialog_get_type (), GtkDialog));
+	_tmp6_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_dialog_get_type (), GtkDialog));
 #line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	response = _tmp7_;
+	response = _tmp6_;
 #line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = response;
+	_tmp7_ = response;
 #line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp8_ == ((gint) GTK_RESPONSE_OK)) {
-#line 4143 "LibraryWindow.c"
-		GtkResponseType _tmp9_ = 0;
-		GtkFileChooserDialog* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		GFile* _tmp14_ = NULL;
-		gboolean _tmp15_ = FALSE;
-		gboolean _tmp16_ = FALSE;
+	if (_tmp7_ == ((gint) GTK_RESPONSE_OK)) {
+#line 4140 "LibraryWindow.c"
+		GtkResponseType _tmp8_ = 0;
+		GtkFileChooserDialog* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+		GFile* _tmp12_;
+		GFile* _tmp13_;
+		gboolean _tmp14_;
+		gboolean _tmp15_;
 		GtkResponseType copy_files_response = 0;
-		GtkResponseType _tmp18_ = 0;
+		GtkResponseType _tmp17_;
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp10_ = import_dialog;
+		_tmp9_ = import_dialog;
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp11_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+		_tmp10_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp12_ = _tmp11_;
+		_tmp11_ = _tmp10_;
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp13_ = g_file_new_for_uri (_tmp12_);
+		_tmp12_ = g_file_new_for_uri (_tmp11_);
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp14_ = _tmp13_;
+		_tmp13_ = _tmp12_;
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp15_ = app_dirs_is_in_import_dir (_tmp14_);
+		_tmp14_ = app_dirs_is_in_import_dir (_tmp13_);
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp16_ = _tmp15_;
+		_tmp15_ = _tmp14_;
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp14_);
+		_g_object_unref0 (_tmp13_);
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_free0 (_tmp12_);
+		_g_free0 (_tmp11_);
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp16_) {
+		if (_tmp15_) {
 #line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp9_ = GTK_RESPONSE_REJECT;
-#line 4176 "LibraryWindow.c"
+			_tmp8_ = GTK_RESPONSE_REJECT;
+#line 4173 "LibraryWindow.c"
 		} else {
-			GtkResponseType _tmp17_ = 0;
+			GtkResponseType _tmp16_;
 #line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp17_ = copy_files_dialog ();
+			_tmp16_ = copy_files_dialog ();
 #line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp9_ = _tmp17_;
-#line 4183 "LibraryWindow.c"
+			_tmp8_ = _tmp16_;
+#line 4180 "LibraryWindow.c"
 		}
 #line 518 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		copy_files_response = _tmp9_;
+		copy_files_response = _tmp8_;
 #line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp18_ = copy_files_response;
+		_tmp17_ = copy_files_response;
 #line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp18_ != GTK_RESPONSE_CANCEL) {
-#line 4191 "LibraryWindow.c"
-			GtkFileChooserDialog* _tmp19_ = NULL;
-			GSList* _tmp20_ = NULL;
-			GSList* _tmp21_ = NULL;
-			GtkResponseType _tmp22_ = 0;
+		if (_tmp17_ != GTK_RESPONSE_CANCEL) {
+#line 4188 "LibraryWindow.c"
+			GtkFileChooserDialog* _tmp18_;
+			GSList* _tmp19_;
+			GSList* _tmp20_;
+			GtkResponseType _tmp21_;
 #line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp19_ = import_dialog;
+			_tmp18_ = import_dialog;
 #line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp20_ = gtk_file_chooser_get_uris (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+			_tmp19_ = gtk_file_chooser_get_uris (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
 #line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp21_ = _tmp20_;
+			_tmp20_ = _tmp19_;
 #line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp22_ = copy_files_response;
+			_tmp21_ = copy_files_response;
 #line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			library_window_dispatch_import_jobs (self, _tmp21_, "folders", _tmp22_ == GTK_RESPONSE_ACCEPT);
+			library_window_dispatch_import_jobs (self, _tmp20_, "folders", _tmp21_ == GTK_RESPONSE_ACCEPT);
 #line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			__g_slist_free__g_free0_0 (_tmp21_);
-#line 4208 "LibraryWindow.c"
+			__g_slist_free__g_free0_0 (_tmp20_);
+#line 4205 "LibraryWindow.c"
 		}
 	}
 #line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp23_ = import_dialog;
+	_tmp22_ = import_dialog;
 #line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp24_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+	_tmp23_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
 #line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (self->priv->import_dir);
 #line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->import_dir = _tmp24_;
+	self->priv->import_dir = _tmp23_;
 #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp25_ = import_dialog;
+	_tmp24_ = import_dialog;
 #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
 #line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (import_dialog);
-#line 4225 "LibraryWindow.c"
+#line 4222 "LibraryWindow.c"
 }
 
 
 static void library_window_on_external_library_import (LibraryWindow* self) {
 	GtkDialog* import_dialog = NULL;
-	DataImportsUIDataImportsDialog* _tmp0_ = NULL;
+	DataImportsUIDataImportsDialog* _tmp0_;
 #line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4238,16 +4235,16 @@ static void library_window_on_external_library_import (LibraryWindow* self) {
 	gtk_dialog_run (import_dialog);
 #line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (import_dialog);
-#line 4242 "LibraryWindow.c"
+#line 4239 "LibraryWindow.c"
 }
 
 
 static void library_window_real_update_common_action_availability (AppWindow* base, Page* old_page, Page* new_page) {
 	LibraryWindow * self;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
+	Page* _tmp0_;
+	Page* _tmp1_;
 	gboolean is_checkerboard = FALSE;
-	Page* _tmp2_ = NULL;
+	Page* _tmp2_;
 #line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4268,7 +4265,7 @@ static void library_window_real_update_common_action_availability (AppWindow* ba
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplaySearchbar", is_checkerboard);
 #line 544 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFind", is_checkerboard);
-#line 4272 "LibraryWindow.c"
+#line 4269 "LibraryWindow.c"
 }
 
 
@@ -4277,15 +4274,15 @@ static void library_window_real_update_common_actions (AppWindow* base, Page* pa
 	CollectionPage* collection = NULL;
 	Photo* start = NULL;
 	gboolean can_fullscreen = FALSE;
-	Page* _tmp0_ = NULL;
+	Page* _tmp0_;
 	CollectionPage* _tmp1_ = NULL;
 	Photo* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	Page* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
+	Page* _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 #line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4328,27 +4325,27 @@ static void library_window_real_update_common_actions (AppWindow* base, Page* pa
 	_g_object_unref0 (start);
 #line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 4332 "LibraryWindow.c"
+#line 4329 "LibraryWindow.c"
 }
 
 
 static void library_window_on_trashcan_contents_altered (LibraryWindow* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 563 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = library_window_can_empty_trash (self);
 #line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", _tmp0_);
-#line 4344 "LibraryWindow.c"
+#line 4341 "LibraryWindow.c"
 }
 
 
 static gboolean library_window_can_empty_trash (LibraryWindow* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	LibraryPhotoSourceCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	LibraryPhotoSourceCollection* _tmp1_;
+	gint _tmp2_;
 #line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4359,39 +4356,37 @@ static gboolean library_window_can_empty_trash (LibraryWindow* self) {
 	if (_tmp2_ > 0) {
 #line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = TRUE;
-#line 4363 "LibraryWindow.c"
+#line 4360 "LibraryWindow.c"
 	} else {
-		VideoSourceCollection* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
+		VideoSourceCollection* _tmp3_;
+		gint _tmp4_;
 #line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = video_global;
 #line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp4_ > 0;
-#line 4373 "LibraryWindow.c"
+#line 4370 "LibraryWindow.c"
 	}
 #line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
 #line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 4379 "LibraryWindow.c"
+#line 4376 "LibraryWindow.c"
 }
 
 
 static void library_window_on_empty_trash (LibraryWindow* self) {
 	GeeArrayList* to_remove = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	LibraryPhotoSourceCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	VideoSourceCollection* _tmp4_ = NULL;
-	GeeCollection* _tmp5_ = NULL;
-	GeeCollection* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	CommandManager* _tmp9_ = NULL;
-	CommandManager* _tmp10_ = NULL;
+	GeeArrayList* _tmp0_;
+	LibraryPhotoSourceCollection* _tmp1_;
+	GeeCollection* _tmp2_;
+	GeeCollection* _tmp3_;
+	VideoSourceCollection* _tmp4_;
+	GeeCollection* _tmp5_;
+	GeeCollection* _tmp6_;
+	CommandManager* _tmp7_;
+	CommandManager* _tmp8_;
 #line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4419,28 +4414,24 @@ static void library_window_on_empty_trash (LibraryWindow* self) {
 #line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp6_);
 #line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = _ ("Empty Trash");
-#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = _ ("Emptying Trash…");
-#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (to_remove, GEE_TYPE_COLLECTION, GeeCollection), _tmp7_, _tmp8_);
+	remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (to_remove, GEE_TYPE_COLLECTION, GeeCollection), _ ("Empty Trash"), _ ("Emptying Trash…"));
 #line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = app_window_get_command_manager ();
+	_tmp7_ = app_window_get_command_manager ();
 #line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_ = _tmp9_;
+	_tmp8_ = _tmp7_;
 #line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	command_manager_reset (_tmp10_);
+	command_manager_reset (_tmp8_);
 #line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_command_manager_unref0 (_tmp10_);
+	_command_manager_unref0 (_tmp8_);
 #line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (to_remove);
-#line 4438 "LibraryWindow.c"
+#line 4429 "LibraryWindow.c"
 }
 
 
 static void library_window_on_new_search (LibraryWindow* self) {
-	SavedSearchDialog* _tmp0_ = NULL;
-	SavedSearchDialog* _tmp1_ = NULL;
+	SavedSearchDialog* _tmp0_;
+	SavedSearchDialog* _tmp1_;
 #line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4451,19 +4442,19 @@ static void library_window_on_new_search (LibraryWindow* self) {
 	saved_search_dialog_show (_tmp1_);
 #line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_saved_search_dialog_unref0 (_tmp1_);
-#line 4455 "LibraryWindow.c"
+#line 4446 "LibraryWindow.c"
 }
 
 
 static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 	gboolean result = FALSE;
 	ViewCollection* view = NULL;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	Page* _tmp0_;
+	Page* _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
+	ViewCollection* _tmp4_;
+	gint _tmp5_;
 #line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4484,11 +4475,11 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 	_tmp5_ = view_collection_get_selected_count (_tmp4_);
 #line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_ == 1) {
-#line 4488 "LibraryWindow.c"
+#line 4479 "LibraryWindow.c"
 		DataSource* selected_source = NULL;
-		ViewCollection* _tmp6_ = NULL;
-		DataSource* _tmp7_ = NULL;
-		DataSource* _tmp8_ = NULL;
+		ViewCollection* _tmp6_;
+		DataSource* _tmp7_;
+		DataSource* _tmp8_;
 #line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = view;
 #line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4507,20 +4498,20 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 			_data_collection_unref0 (view);
 #line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 4511 "LibraryWindow.c"
+#line 4502 "LibraryWindow.c"
 		} else {
-			DataSource* _tmp9_ = NULL;
+			DataSource* _tmp9_;
 #line 591 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = selected_source;
 #line 591 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE)) {
-#line 4518 "LibraryWindow.c"
-				ViewCollection* _tmp10_ = NULL;
-				DataSource* _tmp11_ = NULL;
-				MediaSource* _tmp12_ = NULL;
-				Event* _tmp13_ = NULL;
-				Event* _tmp14_ = NULL;
-				gboolean _tmp15_ = FALSE;
+#line 4509 "LibraryWindow.c"
+				ViewCollection* _tmp10_;
+				DataSource* _tmp11_;
+				MediaSource* _tmp12_;
+				Event* _tmp13_;
+				Event* _tmp14_;
+				gboolean _tmp15_;
 #line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp10_ = view;
 #line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4545,7 +4536,7 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 				_data_collection_unref0 (view);
 #line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 4549 "LibraryWindow.c"
+#line 4540 "LibraryWindow.c"
 			} else {
 #line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = FALSE;
@@ -4555,12 +4546,12 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 				_data_collection_unref0 (view);
 #line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 4559 "LibraryWindow.c"
+#line 4550 "LibraryWindow.c"
 			}
 		}
 #line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (selected_source);
-#line 4564 "LibraryWindow.c"
+#line 4555 "LibraryWindow.c"
 	} else {
 #line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = FALSE;
@@ -4568,31 +4559,31 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 		_data_collection_unref0 (view);
 #line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 4572 "LibraryWindow.c"
+#line 4563 "LibraryWindow.c"
 	}
 #line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 4576 "LibraryWindow.c"
+#line 4567 "LibraryWindow.c"
 }
 
 
 static void library_window_on_jump_to_event (LibraryWindow* self) {
 	ViewCollection* view = NULL;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	Page* _tmp0_;
+	Page* _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
+	ViewCollection* _tmp4_;
+	gint _tmp5_;
 	MediaSource* media = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	DataSource* _tmp7_ = NULL;
-	MediaSource* _tmp8_ = NULL;
-	MediaSource* _tmp9_ = NULL;
-	MediaSource* _tmp10_ = NULL;
-	Event* _tmp11_ = NULL;
-	Event* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
+	ViewCollection* _tmp6_;
+	DataSource* _tmp7_;
+	MediaSource* _tmp8_;
+	MediaSource* _tmp9_;
+	MediaSource* _tmp10_;
+	Event* _tmp11_;
+	Event* _tmp12_;
+	gboolean _tmp13_;
 #line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4617,7 +4608,7 @@ static void library_window_on_jump_to_event (LibraryWindow* self) {
 		_data_collection_unref0 (view);
 #line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4621 "LibraryWindow.c"
+#line 4612 "LibraryWindow.c"
 	}
 #line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = view;
@@ -4629,7 +4620,7 @@ static void library_window_on_jump_to_event (LibraryWindow* self) {
 	if (_tmp8_ == NULL) {
 #line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 4633 "LibraryWindow.c"
+#line 4624 "LibraryWindow.c"
 	}
 #line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	media = _tmp8_;
@@ -4643,7 +4634,7 @@ static void library_window_on_jump_to_event (LibraryWindow* self) {
 		_data_collection_unref0 (view);
 #line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4647 "LibraryWindow.c"
+#line 4638 "LibraryWindow.c"
 	}
 #line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = media;
@@ -4657,10 +4648,10 @@ static void library_window_on_jump_to_event (LibraryWindow* self) {
 	_g_object_unref0 (_tmp12_);
 #line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 4661 "LibraryWindow.c"
-		MediaSource* _tmp14_ = NULL;
-		Event* _tmp15_ = NULL;
-		Event* _tmp16_ = NULL;
+#line 4652 "LibraryWindow.c"
+		MediaSource* _tmp14_;
+		Event* _tmp15_;
+		Event* _tmp16_;
 #line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = media;
 #line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4671,29 +4662,29 @@ static void library_window_on_jump_to_event (LibraryWindow* self) {
 		library_window_switch_to_event (self, _tmp16_);
 #line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp16_);
-#line 4675 "LibraryWindow.c"
+#line 4666 "LibraryWindow.c"
 	}
 #line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (media);
 #line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 4681 "LibraryWindow.c"
+#line 4672 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new5 (gboolean value) {
 #line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4688 "LibraryWindow.c"
+#line 4679 "LibraryWindow.c"
 }
 
 
 static void library_window_on_find (LibraryWindow* self) {
 	GAction* action = NULL;
-	GAction* _tmp0_ = NULL;
-	GAction* _tmp1_ = NULL;
-	GVariant* _tmp2_ = NULL;
-	SearchFilterToolbar* _tmp3_ = NULL;
+	GAction* _tmp0_;
+	GAction* _tmp1_;
+	GVariant* _tmp2_;
+	SearchFilterToolbar* _tmp3_;
 #line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4714,37 +4705,37 @@ static void library_window_on_find (LibraryWindow* self) {
 	search_filter_toolbar_take_focus (_tmp3_);
 #line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 4718 "LibraryWindow.c"
+#line 4709 "LibraryWindow.c"
 }
 
 
 static void library_window_on_media_altered (LibraryWindow* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = library_window_can_jump_to_event (self);
 #line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", _tmp0_);
-#line 4730 "LibraryWindow.c"
+#line 4721 "LibraryWindow.c"
 }
 
 
 static void library_window_on_clear_search (LibraryWindow* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->is_search_toolbar_visible;
 #line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 4742 "LibraryWindow.c"
-		SearchFilterActions* _tmp1_ = NULL;
+#line 4733 "LibraryWindow.c"
+		SearchFilterActions* _tmp1_;
 #line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->search_actions;
 #line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_actions_reset (_tmp1_);
-#line 4748 "LibraryWindow.c"
+#line 4739 "LibraryWindow.c"
 	}
 }
 
@@ -4752,10 +4743,10 @@ static void library_window_on_clear_search (LibraryWindow* self) {
 gint library_window_get_events_sort (LibraryWindow* self) {
 	gint result = 0;
 	GSimpleAction* action = NULL;
-	GAction* _tmp0_ = NULL;
-	GSimpleAction* _tmp1_ = NULL;
+	GAction* _tmp0_;
+	GSimpleAction* _tmp1_;
 	gint _tmp2_ = 0;
-	GSimpleAction* _tmp3_ = NULL;
+	GSimpleAction* _tmp3_;
 #line 631 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0);
 #line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4768,14 +4759,14 @@ gint library_window_get_events_sort (LibraryWindow* self) {
 	_tmp3_ = action;
 #line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4772 "LibraryWindow.c"
+#line 4763 "LibraryWindow.c"
 		gint _tmp4_ = 0;
-		GSimpleAction* _tmp5_ = NULL;
-		GVariant* _tmp6_ = NULL;
-		GVariant* _tmp7_ = NULL;
-		GVariant* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
+		GSimpleAction* _tmp5_;
+		GVariant* _tmp6_;
+		GVariant* _tmp7_;
+		GVariant* _tmp8_;
+		const gchar* _tmp9_;
+		gboolean _tmp10_;
 #line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = action;
 #line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4794,19 +4785,19 @@ gint library_window_get_events_sort (LibraryWindow* self) {
 		if (_tmp10_) {
 #line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = 0;
-#line 4798 "LibraryWindow.c"
+#line 4789 "LibraryWindow.c"
 		} else {
 #line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = 1;
-#line 4802 "LibraryWindow.c"
+#line 4793 "LibraryWindow.c"
 		}
 #line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _tmp4_;
-#line 4806 "LibraryWindow.c"
+#line 4797 "LibraryWindow.c"
 	} else {
 #line 636 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = 1;
-#line 4810 "LibraryWindow.c"
+#line 4801 "LibraryWindow.c"
 	}
 #line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp2_;
@@ -4814,17 +4805,17 @@ gint library_window_get_events_sort (LibraryWindow* self) {
 	_g_object_unref0 (action);
 #line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 4818 "LibraryWindow.c"
+#line 4809 "LibraryWindow.c"
 }
 
 
 static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleAction* action, GVariant* value) {
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	GVariant* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	GVariant* _tmp2_;
+	const gchar* _tmp3_;
+	GSimpleAction* _tmp4_;
+	GVariant* _tmp5_;
 #line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4847,7 +4838,7 @@ static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleA
 	_tmp5_ = value;
 #line 644 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 4851 "LibraryWindow.c"
+#line 4842 "LibraryWindow.c"
 }
 
 
@@ -4856,20 +4847,20 @@ static void library_window_on_preferences (LibraryWindow* self) {
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	preferences_dialog_show ();
-#line 4860 "LibraryWindow.c"
+#line 4851 "LibraryWindow.c"
 }
 
 
 static void library_window_on_display_basic_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GVariant* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	ConfigFacade* _tmp10_ = NULL;
-	ConfigFacade* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
-	GSimpleAction* _tmp13_ = NULL;
-	GVariant* _tmp14_ = NULL;
+	GVariant* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+	ConfigFacade* _tmp10_;
+	ConfigFacade* _tmp11_;
+	gboolean _tmp12_;
+	GSimpleAction* _tmp13_;
+	GVariant* _tmp14_;
 #line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4884,11 +4875,11 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi
 	_tmp2_ = display;
 #line 654 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 4888 "LibraryWindow.c"
-		BasicProperties* _tmp3_ = NULL;
-		Page* _tmp4_ = NULL;
-		Page* _tmp5_ = NULL;
-		GtkFrame* _tmp6_ = NULL;
+#line 4879 "LibraryWindow.c"
+		BasicProperties* _tmp3_;
+		Page* _tmp4_;
+		Page* _tmp5_;
+		GtkFrame* _tmp6_;
 #line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->basic_properties;
 #line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4903,23 +4894,23 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi
 		_tmp6_ = self->priv->bottom_frame;
 #line 656 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 4907 "LibraryWindow.c"
+#line 4898 "LibraryWindow.c"
 	} else {
-		GtkPaned* _tmp7_ = NULL;
-		GtkWidget* _tmp8_ = NULL;
+		GtkPaned* _tmp7_;
+		GtkWidget* _tmp8_;
 #line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->sidebar_paned;
 #line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = gtk_paned_get_child2 (_tmp7_);
 #line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp8_ != NULL) {
-#line 4917 "LibraryWindow.c"
-			GtkFrame* _tmp9_ = NULL;
+#line 4908 "LibraryWindow.c"
+			GtkFrame* _tmp9_;
 #line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = self->priv->bottom_frame;
 #line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 4923 "LibraryWindow.c"
+#line 4914 "LibraryWindow.c"
 		}
 	}
 #line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4938,33 +4929,33 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi
 	_tmp14_ = value;
 #line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp13_, _tmp14_);
-#line 4942 "LibraryWindow.c"
+#line 4933 "LibraryWindow.c"
 }
 
 
 static gboolean _variant_get6 (GVariant* value) {
 #line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_get_boolean (value);
-#line 4949 "LibraryWindow.c"
+#line 4940 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new7 (gboolean value) {
 #line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4956 "LibraryWindow.c"
+#line 4947 "LibraryWindow.c"
 }
 
 
 static void library_window_on_action_toggle (LibraryWindow* self, GAction* action, GVariant* value) {
 	GVariant* new_state = NULL;
-	GAction* _tmp0_ = NULL;
-	GVariant* _tmp1_ = NULL;
-	GVariant* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	GVariant* _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
-	GAction* _tmp6_ = NULL;
+	GAction* _tmp0_;
+	GVariant* _tmp1_;
+	GVariant* _tmp2_;
+	gboolean _tmp3_;
+	GVariant* _tmp4_;
+	GVariant* _tmp5_;
+	GAction* _tmp6_;
 #line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4991,13 +4982,13 @@ static void library_window_on_action_toggle (LibraryWindow* self, GAction* actio
 	g_action_change_state (_tmp6_, new_state);
 #line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (new_state);
-#line 4995 "LibraryWindow.c"
+#line 4986 "LibraryWindow.c"
 }
 
 
 static void library_window_on_action_radio (LibraryWindow* self, GAction* action, GVariant* value) {
-	GAction* _tmp0_ = NULL;
-	GVariant* _tmp1_ = NULL;
+	GAction* _tmp0_;
+	GVariant* _tmp1_;
 #line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5008,17 +4999,17 @@ static void library_window_on_action_radio (LibraryWindow* self, GAction* action
 	_tmp1_ = value;
 #line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp0_, _tmp1_);
-#line 5012 "LibraryWindow.c"
+#line 5003 "LibraryWindow.c"
 }
 
 
 static void library_window_on_display_extended_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GVariant* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	GSimpleAction* _tmp8_ = NULL;
-	GVariant* _tmp9_ = NULL;
+	GVariant* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+	GSimpleAction* _tmp8_;
+	GVariant* _tmp9_;
 #line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5033,11 +5024,11 @@ static void library_window_on_display_extended_properties (LibraryWindow* self,
 	_tmp2_ = display;
 #line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 5037 "LibraryWindow.c"
-		ExtendedPropertiesWindow* _tmp3_ = NULL;
-		Page* _tmp4_ = NULL;
-		Page* _tmp5_ = NULL;
-		ExtendedPropertiesWindow* _tmp6_ = NULL;
+#line 5028 "LibraryWindow.c"
+		ExtendedPropertiesWindow* _tmp3_;
+		Page* _tmp4_;
+		Page* _tmp5_;
+		ExtendedPropertiesWindow* _tmp6_;
 #line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->extended_properties;
 #line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5052,14 +5043,14 @@ static void library_window_on_display_extended_properties (LibraryWindow* self,
 		_tmp6_ = self->priv->extended_properties;
 #line 682 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 5056 "LibraryWindow.c"
+#line 5047 "LibraryWindow.c"
 	} else {
-		ExtendedPropertiesWindow* _tmp7_ = NULL;
+		ExtendedPropertiesWindow* _tmp7_;
 #line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->extended_properties;
 #line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 5063 "LibraryWindow.c"
+#line 5054 "LibraryWindow.c"
 	}
 #line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = action;
@@ -5067,25 +5058,25 @@ static void library_window_on_display_extended_properties (LibraryWindow* self,
 	_tmp9_ = value;
 #line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp8_, _tmp9_);
-#line 5071 "LibraryWindow.c"
+#line 5062 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new8 (gboolean value) {
 #line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5078 "LibraryWindow.c"
+#line 5069 "LibraryWindow.c"
 }
 
 
 static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAction* action, GVariant* value) {
 	gboolean is_shown = FALSE;
-	GVariant* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
+	GVariant* _tmp0_;
+	gboolean _tmp1_;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	GSimpleAction* _tmp4_;
+	GVariant* _tmp5_;
 #line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5114,20 +5105,20 @@ static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAct
 	g_simple_action_set_state (_tmp4_, _tmp5_);
 #line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp5_);
-#line 5118 "LibraryWindow.c"
+#line 5109 "LibraryWindow.c"
 }
 
 
 void library_window_show_search_bar (LibraryWindow* self, gboolean display) {
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	Page* _tmp5_ = NULL;
-	CheckerboardPage* _tmp6_ = NULL;
-	CheckerboardPage* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	Page* _tmp0_;
+	Page* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	Page* _tmp5_;
+	CheckerboardPage* _tmp6_;
+	CheckerboardPage* _tmp7_;
+	gboolean _tmp8_;
 #line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5142,7 +5133,7 @@ void library_window_show_search_bar (LibraryWindow* self, gboolean display) {
 	if (_tmp2_) {
 #line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 5146 "LibraryWindow.c"
+#line 5137 "LibraryWindow.c"
 	}
 #line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = display;
@@ -5158,7 +5149,7 @@ void library_window_show_search_bar (LibraryWindow* self, gboolean display) {
 	if (_tmp6_ == NULL) {
 #line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 5162 "LibraryWindow.c"
+#line 5153 "LibraryWindow.c"
 	}
 #line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _tmp6_;
@@ -5170,22 +5161,22 @@ void library_window_show_search_bar (LibraryWindow* self, gboolean display) {
 	_tmp8_ = display;
 #line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp8_) {
-#line 5174 "LibraryWindow.c"
-		SearchFilterActions* _tmp9_ = NULL;
+#line 5165 "LibraryWindow.c"
+		SearchFilterActions* _tmp9_;
 #line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = self->priv->search_actions;
 #line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_actions_reset (_tmp9_);
-#line 5180 "LibraryWindow.c"
+#line 5171 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleAction* action, GVariant* variant) {
-	GVariant* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GSimpleAction* _tmp2_ = NULL;
-	GVariant* _tmp3_ = NULL;
+	GVariant* _tmp0_;
+	gboolean _tmp1_;
+	GSimpleAction* _tmp2_;
+	GVariant* _tmp3_;
 #line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5202,16 +5193,16 @@ static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleActio
 	_tmp3_ = variant;
 #line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp2_, _tmp3_);
-#line 5206 "LibraryWindow.c"
+#line 5197 "LibraryWindow.c"
 }
 
 
 static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean visible) {
-	GtkPaned* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GtkPaned* _tmp0_;
+	gboolean _tmp1_;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	gboolean _tmp4_;
 #line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5230,16 +5221,16 @@ static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean vi
 	configuration_facade_set_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_);
 #line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 5234 "LibraryWindow.c"
+#line 5225 "LibraryWindow.c"
 }
 
 
 static gboolean library_window_is_sidebar_visible (LibraryWindow* self) {
 	gboolean result = FALSE;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5256,15 +5247,15 @@ static gboolean library_window_is_sidebar_visible (LibraryWindow* self) {
 	result = _tmp3_;
 #line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5260 "LibraryWindow.c"
+#line 5251 "LibraryWindow.c"
 }
 
 
 static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleAction* action, GVariant* variant) {
-	GVariant* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GSimpleAction* _tmp2_ = NULL;
-	GVariant* _tmp3_ = NULL;
+	GVariant* _tmp0_;
+	gboolean _tmp1_;
+	GSimpleAction* _tmp2_;
+	GVariant* _tmp3_;
 #line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5281,23 +5272,23 @@ static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleActio
 	_tmp3_ = variant;
 #line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp2_, _tmp3_);
-#line 5285 "LibraryWindow.c"
+#line 5276 "LibraryWindow.c"
 }
 
 
 static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean visible) {
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	Page* _tmp0_;
+	Page* _tmp1_;
+	gboolean _tmp2_;
 	GtkToolbar* toolbar = NULL;
-	Page* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
-	GtkToolbar* _tmp5_ = NULL;
-	GtkToolbar* _tmp6_ = NULL;
-	GtkToolbar* _tmp7_ = NULL;
-	ConfigFacade* _tmp10_ = NULL;
-	ConfigFacade* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	Page* _tmp3_;
+	Page* _tmp4_;
+	GtkToolbar* _tmp5_;
+	GtkToolbar* _tmp6_;
+	GtkToolbar* _tmp7_;
+	ConfigFacade* _tmp10_;
+	ConfigFacade* _tmp11_;
+	gboolean _tmp12_;
 #line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5312,7 +5303,7 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi
 	if (_tmp2_) {
 #line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 5316 "LibraryWindow.c"
+#line 5307 "LibraryWindow.c"
 	}
 #line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
@@ -5330,16 +5321,16 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi
 	_tmp7_ = toolbar;
 #line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp7_ != NULL) {
-#line 5334 "LibraryWindow.c"
-		GtkRevealer* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
+#line 5325 "LibraryWindow.c"
+		GtkRevealer* _tmp8_;
+		gboolean _tmp9_;
 #line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = self->priv->toolbar_revealer;
 #line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = visible;
 #line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_revealer_set_reveal_child (_tmp8_, _tmp9_);
-#line 5343 "LibraryWindow.c"
+#line 5334 "LibraryWindow.c"
 	}
 #line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = config_facade_get_instance ();
@@ -5353,16 +5344,16 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi
 	_g_object_unref0 (_tmp11_);
 #line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (toolbar);
-#line 5357 "LibraryWindow.c"
+#line 5348 "LibraryWindow.c"
 }
 
 
 static gboolean library_window_is_toolbar_visible (LibraryWindow* self) {
 	gboolean result = FALSE;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5379,7 +5370,7 @@ static gboolean library_window_is_toolbar_visible (LibraryWindow* self) {
 	result = _tmp3_;
 #line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5383 "LibraryWindow.c"
+#line 5374 "LibraryWindow.c"
 }
 
 
@@ -5388,7 +5379,7 @@ static void library_window_show_extended_properties (LibraryWindow* self) {
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_sync_extended_properties (self, TRUE);
-#line 5392 "LibraryWindow.c"
+#line 5383 "LibraryWindow.c"
 }
 
 
@@ -5397,26 +5388,26 @@ static void library_window_hide_extended_properties (LibraryWindow* self) {
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_sync_extended_properties (self, FALSE);
-#line 5401 "LibraryWindow.c"
+#line 5392 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new9 (gboolean value) {
 #line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5408 "LibraryWindow.c"
+#line 5399 "LibraryWindow.c"
 }
 
 
 static void library_window_sync_extended_properties (LibraryWindow* self, gboolean show) {
 	GAction* action = NULL;
-	GAction* _tmp0_ = NULL;
-	GAction* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GVariant* _tmp3_ = NULL;
-	ConfigFacade* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	GAction* _tmp0_;
+	GAction* _tmp1_;
+	gboolean _tmp2_;
+	GVariant* _tmp3_;
+	ConfigFacade* _tmp4_;
+	ConfigFacade* _tmp5_;
+	gboolean _tmp6_;
 #line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5445,16 +5436,16 @@ static void library_window_sync_extended_properties (LibraryWindow* self, gboole
 	_g_object_unref0 (_tmp5_);
 #line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 5449 "LibraryWindow.c"
+#line 5440 "LibraryWindow.c"
 }
 
 
 void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel) {
-	LibraryBranch* _tmp0_ = NULL;
-	LibraryImportQueueSidebarEntry* _tmp1_ = NULL;
-	LibraryImportQueueSidebarEntry* _tmp2_ = NULL;
-	BatchImport* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	LibraryBranch* _tmp0_;
+	LibraryImportQueueSidebarEntry* _tmp1_;
+	LibraryImportQueueSidebarEntry* _tmp2_;
+	BatchImport* _tmp3_;
+	gboolean _tmp4_;
 #line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5471,12 +5462,12 @@ void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batc
 	_tmp4_ = allow_user_cancel;
 #line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_import_queue_sidebar_entry_enqueue_and_schedule (_tmp2_, _tmp3_, _tmp4_);
-#line 5475 "LibraryWindow.c"
+#line 5466 "LibraryWindow.c"
 }
 
 
 static void library_window_import_reporter (LibraryWindow* self, ImportManifest* manifest) {
-	ImportManifest* _tmp0_ = NULL;
+	ImportManifest* _tmp0_;
 #line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5485,31 +5476,31 @@ static void library_window_import_reporter (LibraryWindow* self, ImportManifest*
 	_tmp0_ = manifest;
 #line 766 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_ui_report_manifest (_tmp0_, TRUE, NULL);
-#line 5489 "LibraryWindow.c"
+#line 5480 "LibraryWindow.c"
 }
 
 
 static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
 #line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_import_reporter ((LibraryWindow*) self, manifest);
-#line 5496 "LibraryWindow.c"
+#line 5487 "LibraryWindow.c"
 }
 
 
 static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* uris, const gchar* job_name, gboolean copy_to_library) {
 	gboolean _tmp0_ = FALSE;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	const gchar* _tmp5_;
+	gboolean _tmp6_;
 	GeeArrayList* jobs = NULL;
-	GeeArrayList* _tmp18_ = NULL;
-	GSList* _tmp19_ = NULL;
-	GeeArrayList* _tmp33_ = NULL;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
+	GeeArrayList* _tmp15_;
+	GSList* _tmp16_;
+	GeeArrayList* _tmp29_;
+	gint _tmp30_;
+	gint _tmp31_;
 #line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5532,213 +5523,200 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 	_g_object_unref0 (_tmp2_);
 #line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_) {
-#line 5536 "LibraryWindow.c"
-		gboolean _tmp7_ = FALSE;
+#line 5527 "LibraryWindow.c"
+		gboolean _tmp7_;
 #line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->notify_library_is_home_dir;
 #line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp7_;
-#line 5542 "LibraryWindow.c"
+#line 5533 "LibraryWindow.c"
 	} else {
 #line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 5546 "LibraryWindow.c"
+#line 5537 "LibraryWindow.c"
 	}
 #line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 5550 "LibraryWindow.c"
+#line 5541 "LibraryWindow.c"
 		GtkResponseType response = 0;
-		const gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-		AppWindow* _tmp13_ = NULL;
-		AppWindow* _tmp14_ = NULL;
-		GtkResponseType _tmp15_ = 0;
-		GtkResponseType _tmp16_ = 0;
-		GtkResponseType _tmp17_ = 0;
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp8_ = _ ("Shotwell is configured to import photos to your home directory.\n" "We recommend changing this in <span weight=\"bold\">Edit %s Preference" \
-"s</span>.\n" "Do you want to continue importing photos?");
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		AppWindow* _tmp10_;
+		AppWindow* _tmp11_;
+		GtkResponseType _tmp12_;
+		GtkResponseType _tmp13_;
+		GtkResponseType _tmp14_;
 #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = g_strdup_printf (_tmp8_, "▸");
+		_tmp8_ = g_strdup_printf (_ ("Shotwell is configured to import photos to your home directory.\n" "We recommend changing this in <span weight=\"bold\">Edit %s Preference" \
+"s</span>.\n" "Do you want to continue importing photos?"), "▸");
 #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp10_ = _tmp9_;
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp11_ = _ ("_Import");
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp12_ = _ ("Library Location");
+		_tmp9_ = _tmp8_;
 #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp13_ = app_window_get_instance ();
+		_tmp10_ = app_window_get_instance ();
 #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp14_ = _tmp13_;
+		_tmp11_ = _tmp10_;
 #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp15_ = app_window_affirm_cancel_question (_tmp10_, _tmp11_, _tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
+		_tmp12_ = app_window_affirm_cancel_question (_tmp9_, _ ("_Import"), _ ("Library Location"), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow));
 #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp16_ = _tmp15_;
+		_tmp13_ = _tmp12_;
 #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp14_);
+		_g_object_unref0 (_tmp11_);
 #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_free0 (_tmp10_);
+		_g_free0 (_tmp9_);
 #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		response = _tmp16_;
+		response = _tmp13_;
 #line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp17_ = response;
+		_tmp14_ = response;
 #line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp17_ == GTK_RESPONSE_CANCEL) {
+		if (_tmp14_ == GTK_RESPONSE_CANCEL) {
 #line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return;
-#line 5592 "LibraryWindow.c"
+#line 5574 "LibraryWindow.c"
 		}
 #line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->notify_library_is_home_dir = FALSE;
-#line 5596 "LibraryWindow.c"
+#line 5578 "LibraryWindow.c"
 	}
 #line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
+	_tmp15_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
 #line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	jobs = _tmp18_;
+	jobs = _tmp15_;
 #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp19_ = uris;
-#line 5604 "LibraryWindow.c"
+	_tmp16_ = uris;
+#line 5586 "LibraryWindow.c"
 	{
 		GSList* uri_collection = NULL;
 		GSList* uri_it = NULL;
 #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		uri_collection = _tmp19_;
+		uri_collection = _tmp16_;
 #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
-#line 5612 "LibraryWindow.c"
-			gchar* _tmp20_ = NULL;
+#line 5594 "LibraryWindow.c"
+			gchar* _tmp17_;
 			gchar* uri = NULL;
 #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp20_ = g_strdup ((const gchar*) uri_it->data);
+			_tmp17_ = g_strdup ((const gchar*) uri_it->data);
 #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			uri = _tmp20_;
-#line 5619 "LibraryWindow.c"
+			uri = _tmp17_;
+#line 5601 "LibraryWindow.c"
 			{
 				GFile* file_or_dir = NULL;
-				const gchar* _tmp21_ = NULL;
-				GFile* _tmp22_ = NULL;
-				GFile* _tmp23_ = NULL;
-				gchar* _tmp24_ = NULL;
-				gchar* _tmp25_ = NULL;
-				gboolean _tmp26_ = FALSE;
-				GeeArrayList* _tmp28_ = NULL;
-				GFile* _tmp29_ = NULL;
-				gboolean _tmp30_ = FALSE;
-				FileImportJob* _tmp31_ = NULL;
-				FileImportJob* _tmp32_ = NULL;
+				const gchar* _tmp18_;
+				GFile* _tmp19_;
+				GFile* _tmp20_;
+				gchar* _tmp21_;
+				gchar* _tmp22_;
+				gboolean _tmp23_;
+				GeeArrayList* _tmp24_;
+				GFile* _tmp25_;
+				gboolean _tmp26_;
+				FileImportJob* _tmp27_;
+				FileImportJob* _tmp28_;
 #line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp21_ = uri;
+				_tmp18_ = uri;
 #line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp22_ = g_file_new_for_uri (_tmp21_);
+				_tmp19_ = g_file_new_for_uri (_tmp18_);
 #line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				file_or_dir = _tmp22_;
+				file_or_dir = _tmp19_;
 #line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp23_ = file_or_dir;
+				_tmp20_ = file_or_dir;
 #line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp24_ = g_file_get_path (_tmp23_);
+				_tmp21_ = g_file_get_path (_tmp20_);
 #line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp25_ = _tmp24_;
+				_tmp22_ = _tmp21_;
 #line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp26_ = _tmp25_ == NULL;
+				_tmp23_ = _tmp22_ == NULL;
 #line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_g_free0 (_tmp25_);
+				_g_free0 (_tmp22_);
 #line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				if (_tmp26_) {
-#line 5651 "LibraryWindow.c"
-					const gchar* _tmp27_ = NULL;
+				if (_tmp23_) {
 #line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-					_tmp27_ = _ ("Photos cannot be imported from this directory.");
-#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-					app_window_error_message (_tmp27_, NULL);
+					app_window_error_message (_ ("Photos cannot be imported from this directory."), NULL);
 #line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_object_unref0 (file_or_dir);
 #line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (uri);
 #line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					continue;
-#line 5663 "LibraryWindow.c"
+#line 5641 "LibraryWindow.c"
 				}
 #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp28_ = jobs;
+				_tmp24_ = jobs;
 #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp29_ = file_or_dir;
+				_tmp25_ = file_or_dir;
 #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp30_ = copy_to_library;
+				_tmp26_ = copy_to_library;
 #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp31_ = file_import_job_new (_tmp29_, _tmp30_);
+				_tmp27_ = file_import_job_new (_tmp25_, _tmp26_);
 #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp32_ = _tmp31_;
+				_tmp28_ = _tmp27_;
 #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp32_);
+				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_);
 #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_batch_import_job_unref0 (_tmp32_);
+				_batch_import_job_unref0 (_tmp28_);
 #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (file_or_dir);
 #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (uri);
-#line 5683 "LibraryWindow.c"
+#line 5661 "LibraryWindow.c"
 			}
 		}
 	}
 #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp33_ = jobs;
+	_tmp29_ = jobs;
 #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+	_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp35_ = _tmp34_;
+	_tmp31_ = _tmp30_;
 #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp35_ > 0) {
-#line 5695 "LibraryWindow.c"
+	if (_tmp31_ > 0) {
+#line 5673 "LibraryWindow.c"
 		BatchImport* batch_import = NULL;
-		GeeArrayList* _tmp36_ = NULL;
-		const gchar* _tmp37_ = NULL;
-		BatchImport* _tmp38_ = NULL;
-		BatchImport* _tmp39_ = NULL;
+		GeeArrayList* _tmp32_;
+		const gchar* _tmp33_;
+		BatchImport* _tmp34_;
+		BatchImport* _tmp35_;
 #line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp36_ = jobs;
+		_tmp32_ = jobs;
 #line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp37_ = job_name;
+		_tmp33_ = job_name;
 #line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp38_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ITERABLE, GeeIterable), _tmp37_, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL);
+		_tmp34_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ITERABLE, GeeIterable), _tmp33_, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL);
 #line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		batch_import = _tmp38_;
+		batch_import = _tmp34_;
 #line 798 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp39_ = batch_import;
+		_tmp35_ = batch_import;
 #line 798 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_enqueue_batch_import (self, _tmp39_, TRUE);
+		library_window_enqueue_batch_import (self, _tmp35_, TRUE);
 #line 799 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_import_queue_page (self);
 #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (batch_import);
-#line 5717 "LibraryWindow.c"
+#line 5695 "LibraryWindow.c"
 	}
 #line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (jobs);
-#line 5721 "LibraryWindow.c"
+#line 5699 "LibraryWindow.c"
 }
 
 
 static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
 	GdkDragAction result = 0;
 	GdkModifierType mask = 0;
-	GdkWindow* _tmp0_ = NULL;
-	GdkDisplay* _tmp1_ = NULL;
-	GdkDeviceManager* _tmp2_ = NULL;
-	GdkDevice* _tmp3_ = NULL;
+	GdkWindow* _tmp0_;
+	GdkDisplay* _tmp1_;
+	GdkDeviceManager* _tmp2_;
+	GdkDevice* _tmp3_;
 	GdkModifierType _tmp4_ = 0;
 	gboolean ctrl = FALSE;
-	GdkModifierType _tmp5_ = 0;
+	GdkModifierType _tmp5_;
 	gboolean alt = FALSE;
-	GdkModifierType _tmp6_ = 0;
+	GdkModifierType _tmp6_;
 	gboolean shift = FALSE;
-	GdkModifierType _tmp7_ = 0;
+	GdkModifierType _tmp7_;
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
-	gboolean _tmp10_ = FALSE;
+	gboolean _tmp10_;
 #line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0);
 #line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5769,31 +5747,31 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
 	_tmp10_ = ctrl;
 #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp10_) {
-#line 5772 "LibraryWindow.c"
-		gboolean _tmp11_ = FALSE;
+#line 5750 "LibraryWindow.c"
+		gboolean _tmp11_;
 #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = alt;
 #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = !_tmp11_;
-#line 5778 "LibraryWindow.c"
+#line 5756 "LibraryWindow.c"
 	} else {
 #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = FALSE;
-#line 5782 "LibraryWindow.c"
+#line 5760 "LibraryWindow.c"
 	}
 #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_) {
-#line 5786 "LibraryWindow.c"
-		gboolean _tmp12_ = FALSE;
+#line 5764 "LibraryWindow.c"
+		gboolean _tmp12_;
 #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = shift;
 #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = !_tmp12_;
-#line 5792 "LibraryWindow.c"
+#line 5770 "LibraryWindow.c"
 	} else {
 #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = FALSE;
-#line 5796 "LibraryWindow.c"
+#line 5774 "LibraryWindow.c"
 	}
 #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_) {
@@ -5801,40 +5779,40 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
 		result = GDK_ACTION_COPY;
 #line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5804 "LibraryWindow.c"
+#line 5782 "LibraryWindow.c"
 	} else {
 		gboolean _tmp13_ = FALSE;
 		gboolean _tmp14_ = FALSE;
-		gboolean _tmp15_ = FALSE;
+		gboolean _tmp15_;
 #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = ctrl;
 #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp15_) {
-#line 5813 "LibraryWindow.c"
-			gboolean _tmp16_ = FALSE;
+#line 5791 "LibraryWindow.c"
+			gboolean _tmp16_;
 #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp16_ = alt;
 #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = _tmp16_;
-#line 5819 "LibraryWindow.c"
+#line 5797 "LibraryWindow.c"
 		} else {
 #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = FALSE;
-#line 5823 "LibraryWindow.c"
+#line 5801 "LibraryWindow.c"
 		}
 #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp14_) {
-#line 5827 "LibraryWindow.c"
-			gboolean _tmp17_ = FALSE;
+#line 5805 "LibraryWindow.c"
+			gboolean _tmp17_;
 #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = shift;
 #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = !_tmp17_;
-#line 5833 "LibraryWindow.c"
+#line 5811 "LibraryWindow.c"
 		} else {
 #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = FALSE;
-#line 5837 "LibraryWindow.c"
+#line 5815 "LibraryWindow.c"
 		}
 #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp13_) {
@@ -5842,40 +5820,40 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
 			result = GDK_ACTION_ASK;
 #line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 5845 "LibraryWindow.c"
+#line 5823 "LibraryWindow.c"
 		} else {
 			gboolean _tmp18_ = FALSE;
 			gboolean _tmp19_ = FALSE;
-			gboolean _tmp20_ = FALSE;
+			gboolean _tmp20_;
 #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = ctrl;
 #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp20_) {
-#line 5854 "LibraryWindow.c"
-				gboolean _tmp21_ = FALSE;
+#line 5832 "LibraryWindow.c"
+				gboolean _tmp21_;
 #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp21_ = alt;
 #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = !_tmp21_;
-#line 5860 "LibraryWindow.c"
+#line 5838 "LibraryWindow.c"
 			} else {
 #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = FALSE;
-#line 5864 "LibraryWindow.c"
+#line 5842 "LibraryWindow.c"
 			}
 #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp19_) {
-#line 5868 "LibraryWindow.c"
-				gboolean _tmp22_ = FALSE;
+#line 5846 "LibraryWindow.c"
+				gboolean _tmp22_;
 #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp22_ = shift;
 #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = _tmp22_;
-#line 5874 "LibraryWindow.c"
+#line 5852 "LibraryWindow.c"
 			} else {
 #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = FALSE;
-#line 5878 "LibraryWindow.c"
+#line 5856 "LibraryWindow.c"
 			}
 #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp18_) {
@@ -5883,13 +5861,13 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
 				result = GDK_ACTION_LINK;
 #line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 5886 "LibraryWindow.c"
+#line 5864 "LibraryWindow.c"
 			} else {
 #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = GDK_ACTION_DEFAULT;
 #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 5892 "LibraryWindow.c"
+#line 5870 "LibraryWindow.c"
 			}
 		}
 	}
@@ -5900,19 +5878,19 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext
 	LibraryWindow * self;
 	gboolean result = FALSE;
 	GdkAtom target = 0U;
-	GdkDragContext* _tmp0_ = NULL;
-	GtkTargetList* _tmp1_ = NULL;
-	GdkAtom _tmp2_ = 0U;
-	GdkAtom _tmp3_ = 0U;
-	GdkAtom _tmp4_ = 0U;
-	GdkDragContext* _tmp7_ = NULL;
-	GtkWidget* _tmp8_ = NULL;
+	GdkDragContext* _tmp0_;
+	GtkTargetList* _tmp1_;
+	GdkAtom _tmp2_;
+	GdkAtom _tmp3_;
+	GdkAtom _tmp4_;
+	GdkDragContext* _tmp7_;
+	GtkWidget* _tmp8_;
 	GdkDragAction drag_action = 0;
-	GdkDragAction _tmp11_ = 0;
-	GdkDragAction _tmp12_ = 0;
-	GdkDragContext* _tmp13_ = NULL;
-	GdkDragAction _tmp14_ = 0;
-	guint _tmp15_ = 0U;
+	GdkDragAction _tmp11_;
+	GdkDragAction _tmp12_;
+	GdkDragContext* _tmp13_;
+	GdkDragAction _tmp14_;
+	guint _tmp15_;
 #line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5931,9 +5909,9 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext
 	_tmp4_ = GDK_NONE;
 #line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ == _tmp4_) {
-#line 5934 "LibraryWindow.c"
-		GdkDragContext* _tmp5_ = NULL;
-		guint _tmp6_ = 0U;
+#line 5912 "LibraryWindow.c"
+		GdkDragContext* _tmp5_;
+		guint _tmp6_;
 #line 826 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_debug ("LibraryWindow.vala:826: drag target is GDK_NONE");
 #line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5946,7 +5924,7 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext
 		result = TRUE;
 #line 829 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5949 "LibraryWindow.c"
+#line 5927 "LibraryWindow.c"
 	}
 #line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = context;
@@ -5954,9 +5932,9 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext
 	_tmp8_ = gtk_drag_get_source_widget (_tmp7_);
 #line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ != NULL) {
-#line 5957 "LibraryWindow.c"
-		GdkDragContext* _tmp9_ = NULL;
-		guint _tmp10_ = 0U;
+#line 5935 "LibraryWindow.c"
+		GdkDragContext* _tmp9_;
+		guint _tmp10_;
 #line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = context;
 #line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5967,7 +5945,7 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext
 		result = TRUE;
 #line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5970 "LibraryWindow.c"
+#line 5948 "LibraryWindow.c"
 	}
 #line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = library_window_get_drag_action (self);
@@ -5979,7 +5957,7 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext
 	if (_tmp12_ == GDK_ACTION_DEFAULT) {
 #line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		drag_action = GDK_ACTION_ASK;
-#line 5982 "LibraryWindow.c"
+#line 5960 "LibraryWindow.c"
 	}
 #line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = context;
@@ -5993,16 +5971,16 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext
 	result = TRUE;
 #line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5996 "LibraryWindow.c"
+#line 5974 "LibraryWindow.c"
 }
 
 
 static void library_window_real_drag_data_received (GtkWidget* base, GdkDragContext* context, gint x, gint y, GtkSelectionData* selection_data, guint info, guint time) {
 	LibraryWindow * self;
-	GtkSelectionData* _tmp0_ = NULL;
-	guchar* _tmp1_ = NULL;
-	GdkDragContext* _tmp2_ = NULL;
-	GtkWidget* _tmp3_ = NULL;
+	GtkSelectionData* _tmp0_;
+	guchar* _tmp1_;
+	GdkDragContext* _tmp2_;
+	GtkWidget* _tmp3_;
 #line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6017,7 +5995,7 @@ static void library_window_real_drag_data_received (GtkWidget* base, GdkDragCont
 	if (-1 < 0) {
 #line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_debug ("LibraryWindow.vala:853: failed to retrieve SelectionData");
-#line 6020 "LibraryWindow.c"
+#line 5998 "LibraryWindow.c"
 	}
 #line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = context;
@@ -6025,11 +6003,11 @@ static void library_window_real_drag_data_received (GtkWidget* base, GdkDragCont
 	_tmp3_ = gtk_drag_get_source_widget (_tmp2_);
 #line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 6028 "LibraryWindow.c"
-		GdkDragContext* _tmp4_ = NULL;
-		GtkSelectionData* _tmp5_ = NULL;
-		guint _tmp6_ = 0U;
-		guint _tmp7_ = 0U;
+#line 6006 "LibraryWindow.c"
+		GdkDragContext* _tmp4_;
+		GtkSelectionData* _tmp5_;
+		guint _tmp6_;
+		guint _tmp7_;
 #line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = context;
 #line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6040,39 +6018,39 @@ static void library_window_real_drag_data_received (GtkWidget* base, GdkDragCont
 		_tmp7_ = time;
 #line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_external_drop_handler (self, _tmp4_, NULL, _tmp5_, _tmp6_, _tmp7_);
-#line 6043 "LibraryWindow.c"
+#line 6021 "LibraryWindow.c"
 	} else {
-		GdkDragContext* _tmp8_ = NULL;
-		guint _tmp9_ = 0U;
+		GdkDragContext* _tmp8_;
+		guint _tmp9_;
 #line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = context;
 #line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = time;
 #line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_drag_finish (_tmp8_, FALSE, FALSE, (guint32) _tmp9_);
-#line 6053 "LibraryWindow.c"
+#line 6031 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_external_drop_handler (LibraryWindow* self, GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time) {
 	gchar** uris_array = NULL;
-	GtkSelectionData* _tmp0_ = NULL;
-	gchar** _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gint uris_array_length1 = 0;
-	gint _uris_array_size_ = 0;
+	GtkSelectionData* _tmp0_;
+	gchar** _tmp1_;
+	gchar** _tmp2_;
+	gint uris_array_length1;
+	gint _uris_array_size_;
 	GSList* uris = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
 	GdkDragAction selected_action = 0;
-	GdkDragContext* _tmp7_ = NULL;
-	GdkDragAction _tmp8_ = 0;
-	GdkDragAction _tmp9_ = 0;
-	GSList* _tmp21_ = NULL;
-	GdkDragAction _tmp22_ = 0;
-	GdkDragContext* _tmp23_ = NULL;
-	guint _tmp24_ = 0U;
+	GdkDragContext* _tmp7_;
+	GdkDragAction _tmp8_;
+	GdkDragAction _tmp9_;
+	GSList* _tmp21_;
+	GdkDragAction _tmp22_;
+	GdkDragContext* _tmp23_;
+	guint _tmp24_;
 #line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6097,7 +6075,7 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo
 	_tmp3_ = uris_array;
 #line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3__length1 = uris_array_length1;
-#line 6100 "LibraryWindow.c"
+#line 6078 "LibraryWindow.c"
 	{
 		gchar** uri_collection = NULL;
 		gint uri_collection_length1 = 0;
@@ -6109,17 +6087,17 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo
 		uri_collection_length1 = _tmp3__length1;
 #line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (uri_it = 0; uri_it < _tmp3__length1; uri_it = uri_it + 1) {
-#line 6112 "LibraryWindow.c"
-			gchar* _tmp4_ = NULL;
+#line 6090 "LibraryWindow.c"
+			gchar* _tmp4_;
 			gchar* uri = NULL;
 #line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = g_strdup (uri_collection[uri_it]);
 #line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri = _tmp4_;
-#line 6119 "LibraryWindow.c"
+#line 6097 "LibraryWindow.c"
 			{
-				const gchar* _tmp5_ = NULL;
-				gchar* _tmp6_ = NULL;
+				const gchar* _tmp5_;
+				gchar* _tmp6_;
 #line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp5_ = uri;
 #line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6128,7 +6106,7 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo
 				uris = g_slist_append (uris, _tmp6_);
 #line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (uri);
-#line 6131 "LibraryWindow.c"
+#line 6109 "LibraryWindow.c"
 			}
 		}
 	}
@@ -6142,15 +6120,15 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo
 	_tmp9_ = selected_action;
 #line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_ == GDK_ACTION_ASK) {
-#line 6145 "LibraryWindow.c"
+#line 6123 "LibraryWindow.c"
 		GtkResponseType _result_ = 0;
-		GSList* _tmp10_ = NULL;
-		GtkResponseType _tmp18_ = 0;
+		GSList* _tmp10_;
+		GtkResponseType _tmp18_;
 #line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_result_ = GTK_RESPONSE_REJECT;
 #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = uris;
-#line 6153 "LibraryWindow.c"
+#line 6131 "LibraryWindow.c"
 		{
 			GSList* uri_collection = NULL;
 			GSList* uri_it = NULL;
@@ -6158,20 +6136,20 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo
 			uri_collection = _tmp10_;
 #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
-#line 6161 "LibraryWindow.c"
-				gchar* _tmp11_ = NULL;
+#line 6139 "LibraryWindow.c"
+				gchar* _tmp11_;
 				gchar* uri = NULL;
 #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp11_ = g_strdup ((const gchar*) uri_it->data);
 #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uri = _tmp11_;
-#line 6168 "LibraryWindow.c"
+#line 6146 "LibraryWindow.c"
 				{
-					const gchar* _tmp12_ = NULL;
-					GFile* _tmp13_ = NULL;
-					GFile* _tmp14_ = NULL;
-					gboolean _tmp15_ = FALSE;
-					gboolean _tmp16_ = FALSE;
+					const gchar* _tmp12_;
+					GFile* _tmp13_;
+					GFile* _tmp14_;
+					gboolean _tmp15_;
+					gboolean _tmp16_;
 #line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp12_ = uri;
 #line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6186,8 +6164,8 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo
 					_g_object_unref0 (_tmp14_);
 #line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					if (_tmp16_) {
-#line 6189 "LibraryWindow.c"
-						GtkResponseType _tmp17_ = 0;
+#line 6167 "LibraryWindow.c"
+						GtkResponseType _tmp17_;
 #line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_tmp17_ = copy_files_dialog ();
 #line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6196,11 +6174,11 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo
 						_g_free0 (uri);
 #line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						break;
-#line 6199 "LibraryWindow.c"
+#line 6177 "LibraryWindow.c"
 					}
 #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (uri);
-#line 6203 "LibraryWindow.c"
+#line 6181 "LibraryWindow.c"
 				}
 			}
 		}
@@ -6210,28 +6188,28 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo
 		switch (_tmp18_) {
 #line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			case GTK_RESPONSE_ACCEPT:
-#line 6213 "LibraryWindow.c"
+#line 6191 "LibraryWindow.c"
 			{
 #line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				selected_action = GDK_ACTION_COPY;
 #line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 6219 "LibraryWindow.c"
+#line 6197 "LibraryWindow.c"
 			}
 #line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			case GTK_RESPONSE_REJECT:
-#line 6223 "LibraryWindow.c"
+#line 6201 "LibraryWindow.c"
 			{
 #line 889 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				selected_action = GDK_ACTION_LINK;
 #line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 6229 "LibraryWindow.c"
+#line 6207 "LibraryWindow.c"
 			}
 			default:
 			{
-				GdkDragContext* _tmp19_ = NULL;
-				guint _tmp20_ = 0U;
+				GdkDragContext* _tmp19_;
+				guint _tmp20_;
 #line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = context;
 #line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6244,7 +6222,7 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo
 				uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
 #line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return;
-#line 6247 "LibraryWindow.c"
+#line 6225 "LibraryWindow.c"
 			}
 		}
 	}
@@ -6264,16 +6242,16 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo
 	__g_slist_free__g_free0_0 (uris);
 #line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
-#line 6267 "LibraryWindow.c"
+#line 6245 "LibraryWindow.c"
 }
 
 
 void library_window_switch_to_library_page (LibraryWindow* self) {
-	LibraryBranch* _tmp0_ = NULL;
-	LibraryPhotosEntry* _tmp1_ = NULL;
-	LibraryPhotosEntry* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
+	LibraryBranch* _tmp0_;
+	LibraryPhotosEntry* _tmp1_;
+	LibraryPhotosEntry* _tmp2_;
+	Page* _tmp3_;
+	Page* _tmp4_;
 #line 905 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6290,16 +6268,16 @@ void library_window_switch_to_library_page (LibraryWindow* self) {
 	library_window_switch_to_page (self, _tmp4_);
 #line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6293 "LibraryWindow.c"
+#line 6271 "LibraryWindow.c"
 }
 
 
 void library_window_switch_to_event (LibraryWindow* self, Event* event) {
 	EventsEventEntry* entry = NULL;
-	EventsBranch* _tmp0_ = NULL;
-	Event* _tmp1_ = NULL;
-	EventsEventEntry* _tmp2_ = NULL;
-	EventsEventEntry* _tmp3_ = NULL;
+	EventsBranch* _tmp0_;
+	Event* _tmp1_;
+	EventsEventEntry* _tmp2_;
+	EventsEventEntry* _tmp3_;
 #line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6316,10 +6294,10 @@ void library_window_switch_to_event (LibraryWindow* self, Event* event) {
 	_tmp3_ = entry;
 #line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 6319 "LibraryWindow.c"
-		EventsEventEntry* _tmp4_ = NULL;
-		Page* _tmp5_ = NULL;
-		Page* _tmp6_ = NULL;
+#line 6297 "LibraryWindow.c"
+		EventsEventEntry* _tmp4_;
+		Page* _tmp5_;
+		Page* _tmp6_;
 #line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
 #line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6330,20 +6308,20 @@ void library_window_switch_to_event (LibraryWindow* self, Event* event) {
 		library_window_switch_to_page (self, _tmp6_);
 #line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 6333 "LibraryWindow.c"
+#line 6311 "LibraryWindow.c"
 	}
 #line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6337 "LibraryWindow.c"
+#line 6315 "LibraryWindow.c"
 }
 
 
 void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) {
 	TagsSidebarEntry* entry = NULL;
-	TagsBranch* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
-	TagsSidebarEntry* _tmp2_ = NULL;
-	TagsSidebarEntry* _tmp3_ = NULL;
+	TagsBranch* _tmp0_;
+	Tag* _tmp1_;
+	TagsSidebarEntry* _tmp2_;
+	TagsSidebarEntry* _tmp3_;
 #line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6360,10 +6338,10 @@ void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) {
 	_tmp3_ = entry;
 #line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 6363 "LibraryWindow.c"
-		TagsSidebarEntry* _tmp4_ = NULL;
-		Page* _tmp5_ = NULL;
-		Page* _tmp6_ = NULL;
+#line 6341 "LibraryWindow.c"
+		TagsSidebarEntry* _tmp4_;
+		Page* _tmp5_;
+		Page* _tmp6_;
 #line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
 #line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6374,20 +6352,20 @@ void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) {
 		library_window_switch_to_page (self, _tmp6_);
 #line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 6377 "LibraryWindow.c"
+#line 6355 "LibraryWindow.c"
 	}
 #line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6381 "LibraryWindow.c"
+#line 6359 "LibraryWindow.c"
 }
 
 
 void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* search) {
 	SearchesSidebarEntry* entry = NULL;
-	SearchesBranch* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
-	SearchesSidebarEntry* _tmp2_ = NULL;
-	SearchesSidebarEntry* _tmp3_ = NULL;
+	SearchesBranch* _tmp0_;
+	SavedSearch* _tmp1_;
+	SearchesSidebarEntry* _tmp2_;
+	SearchesSidebarEntry* _tmp3_;
 #line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6404,10 +6382,10 @@ void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* se
 	_tmp3_ = entry;
 #line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 6407 "LibraryWindow.c"
-		SearchesSidebarEntry* _tmp4_ = NULL;
-		Page* _tmp5_ = NULL;
-		Page* _tmp6_ = NULL;
+#line 6385 "LibraryWindow.c"
+		SearchesSidebarEntry* _tmp4_;
+		Page* _tmp5_;
+		Page* _tmp6_;
 #line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
 #line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6418,26 +6396,26 @@ void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* se
 		library_window_switch_to_page (self, _tmp6_);
 #line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 6421 "LibraryWindow.c"
+#line 6399 "LibraryWindow.c"
 	}
 #line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6425 "LibraryWindow.c"
+#line 6403 "LibraryWindow.c"
 }
 
 
 void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* controller, Photo* current) {
-	CollectionPage* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	DataView* _tmp4_ = NULL;
-	DataView* _tmp5_ = NULL;
-	LibraryPhotoPage* _tmp6_ = NULL;
-	LibraryPhotoPage* _tmp9_ = NULL;
-	CollectionPage* _tmp10_ = NULL;
-	Photo* _tmp11_ = NULL;
-	LibraryPhotoPage* _tmp12_ = NULL;
+	CollectionPage* _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	Photo* _tmp3_;
+	DataView* _tmp4_;
+	DataView* _tmp5_;
+	LibraryPhotoPage* _tmp6_;
+	LibraryPhotoPage* _tmp9_;
+	CollectionPage* _tmp10_;
+	Photo* _tmp11_;
+	LibraryPhotoPage* _tmp12_;
 #line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6466,9 +6444,9 @@ void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* c
 	_tmp6_ = self->priv->photo_page;
 #line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ == NULL) {
-#line 6469 "LibraryWindow.c"
-		LibraryPhotoPage* _tmp7_ = NULL;
-		LibraryPhotoPage* _tmp8_ = NULL;
+#line 6447 "LibraryWindow.c"
+		LibraryPhotoPage* _tmp7_;
+		LibraryPhotoPage* _tmp8_;
 #line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = library_photo_page_new ();
 #line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6483,7 +6461,7 @@ void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* c
 		library_window_add_to_stack (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
 #line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		spin_event_loop ();
-#line 6486 "LibraryWindow.c"
+#line 6464 "LibraryWindow.c"
 	}
 #line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = self->priv->photo_page;
@@ -6497,16 +6475,16 @@ void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* c
 	_tmp12_ = self->priv->photo_page;
 #line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE, Page));
-#line 6500 "LibraryWindow.c"
+#line 6478 "LibraryWindow.c"
 }
 
 
 void library_window_switch_to_import_queue_page (LibraryWindow* self) {
-	LibraryBranch* _tmp0_ = NULL;
-	LibraryImportQueueSidebarEntry* _tmp1_ = NULL;
-	LibraryImportQueueSidebarEntry* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
+	LibraryBranch* _tmp0_;
+	LibraryImportQueueSidebarEntry* _tmp1_;
+	LibraryImportQueueSidebarEntry* _tmp2_;
+	Page* _tmp3_;
+	Page* _tmp4_;
 #line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6523,26 +6501,26 @@ void library_window_switch_to_import_queue_page (LibraryWindow* self) {
 	library_window_switch_to_page (self, _tmp4_);
 #line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6526 "LibraryWindow.c"
+#line 6504 "LibraryWindow.c"
 }
 
 
 static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamera* camera) {
 	CameraSidebarEntry* entry = NULL;
-	CameraBranch* _tmp0_ = NULL;
-	DiscoveredCamera* _tmp1_ = NULL;
-	CameraSidebarEntry* _tmp2_ = NULL;
-	CameraSidebarEntry* _tmp3_ = NULL;
+	CameraBranch* _tmp0_;
+	DiscoveredCamera* _tmp1_;
+	CameraSidebarEntry* _tmp2_;
+	CameraSidebarEntry* _tmp3_;
 	ImportPage* page = NULL;
-	CameraSidebarEntry* _tmp4_ = NULL;
-	Page* _tmp5_ = NULL;
+	CameraSidebarEntry* _tmp4_;
+	Page* _tmp5_;
 	GFile* uri_file = NULL;
-	DiscoveredCamera* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
+	DiscoveredCamera* _tmp6_;
+	const gchar* _tmp7_;
+	GFile* _tmp8_;
 	GMount* mount = NULL;
 	gboolean _tmp13_ = FALSE;
-	GMount* _tmp14_ = NULL;
+	GMount* _tmp14_;
 	GError * _inner_error_ = NULL;
 #line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
@@ -6564,7 +6542,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 		_g_object_unref0 (entry);
 #line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6567 "LibraryWindow.c"
+#line 6545 "LibraryWindow.c"
 	}
 #line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = entry;
@@ -6582,12 +6560,12 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 	uri_file = _tmp8_;
 #line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mount = NULL;
-#line 6585 "LibraryWindow.c"
+#line 6563 "LibraryWindow.c"
 	{
 		GMount* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
-		GMount* _tmp11_ = NULL;
-		GMount* _tmp12_ = NULL;
+		GFile* _tmp10_;
+		GMount* _tmp11_;
+		GMount* _tmp12_;
 #line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = uri_file;
 #line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6596,7 +6574,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 		_tmp9_ = _tmp11_;
 #line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6599 "LibraryWindow.c"
+#line 6577 "LibraryWindow.c"
 			goto __catch42_g_error;
 		}
 #line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6609,7 +6587,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 		mount = _tmp12_;
 #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp9_);
-#line 6612 "LibraryWindow.c"
+#line 6590 "LibraryWindow.c"
 	}
 	goto __finally42;
 	__catch42_g_error:
@@ -6621,7 +6599,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 		_inner_error_ = NULL;
 #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_error_free0 (err);
-#line 6624 "LibraryWindow.c"
+#line 6602 "LibraryWindow.c"
 	}
 	__finally42:
 #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6640,16 +6618,16 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 		g_clear_error (&_inner_error_);
 #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6643 "LibraryWindow.c"
+#line 6621 "LibraryWindow.c"
 	}
 #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = mount;
 #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp14_ != NULL) {
-#line 6649 "LibraryWindow.c"
-		DiscoveredCamera* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
-		gboolean _tmp17_ = FALSE;
+#line 6627 "LibraryWindow.c"
+		DiscoveredCamera* _tmp15_;
+		const gchar* _tmp16_;
+		gboolean _tmp17_;
 #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = camera;
 #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6658,18 +6636,18 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 		_tmp17_ = g_str_has_prefix (_tmp16_, "file://");
 #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = !_tmp17_;
-#line 6661 "LibraryWindow.c"
+#line 6639 "LibraryWindow.c"
 	} else {
 #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = FALSE;
-#line 6665 "LibraryWindow.c"
+#line 6643 "LibraryWindow.c"
 	}
 #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 6669 "LibraryWindow.c"
-		ImportPage* _tmp18_ = NULL;
-		GMount* _tmp19_ = NULL;
-		gboolean _tmp20_ = FALSE;
+#line 6647 "LibraryWindow.c"
+		ImportPage* _tmp18_;
+		GMount* _tmp19_;
+		gboolean _tmp20_;
 #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = page;
 #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6678,25 +6656,25 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 		_tmp20_ = import_page_unmount_camera (_tmp18_, _tmp19_);
 #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp20_) {
-#line 6681 "LibraryWindow.c"
-			ImportPage* _tmp21_ = NULL;
+#line 6659 "LibraryWindow.c"
+			ImportPage* _tmp21_;
 #line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = page;
 #line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PAGE, Page));
-#line 6687 "LibraryWindow.c"
+#line 6665 "LibraryWindow.c"
 		} else {
 #line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			app_window_error_message ("Unable to unmount the camera at this time.", NULL);
-#line 6691 "LibraryWindow.c"
+#line 6669 "LibraryWindow.c"
 		}
 	} else {
-		ImportPage* _tmp22_ = NULL;
+		ImportPage* _tmp22_;
 #line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp22_ = page;
 #line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE, Page));
-#line 6699 "LibraryWindow.c"
+#line 6677 "LibraryWindow.c"
 	}
 #line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (mount);
@@ -6706,15 +6684,15 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 	_g_object_unref0 (page);
 #line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6709 "LibraryWindow.c"
+#line 6687 "LibraryWindow.c"
 }
 
 
 void library_window_add_to_stack (LibraryWindow* self, Page* page) {
-	Page* _tmp0_ = NULL;
-	GtkStack* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	GtkStack* _tmp3_ = NULL;
+	Page* _tmp0_;
+	GtkStack* _tmp1_;
+	Page* _tmp2_;
+	GtkStack* _tmp3_;
 #line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6733,14 +6711,14 @@ void library_window_add_to_stack (LibraryWindow* self, Page* page) {
 	_tmp3_ = self->priv->stack;
 #line 980 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 6736 "LibraryWindow.c"
+#line 6714 "LibraryWindow.c"
 }
 
 
 static void library_window_remove_from_stack (LibraryWindow* self, Page* page) {
-	GtkStack* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	GtkStack* _tmp2_ = NULL;
+	GtkStack* _tmp0_;
+	Page* _tmp1_;
+	GtkStack* _tmp2_;
 #line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6755,79 +6733,79 @@ static void library_window_remove_from_stack (LibraryWindow* self, Page* page) {
 	_tmp2_ = self->priv->stack;
 #line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 6758 "LibraryWindow.c"
+#line 6736 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new10 (gboolean value) {
 #line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6765 "LibraryWindow.c"
+#line 6743 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new11 (gboolean value) {
 #line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6772 "LibraryWindow.c"
+#line 6750 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new12 (gboolean value) {
 #line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6779 "LibraryWindow.c"
+#line 6757 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new13 (const gchar* value) {
 #line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 6786 "LibraryWindow.c"
+#line 6764 "LibraryWindow.c"
 }
 
 
 static void library_window_load_configuration (LibraryWindow* self) {
 	GAction* basic_display_action = NULL;
-	GAction* _tmp0_ = NULL;
-	GAction* _tmp1_ = NULL;
-	GAction* _tmp2_ = NULL;
-	GAction* _tmp3_ = NULL;
-	ConfigFacade* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	GVariant* _tmp7_ = NULL;
+	GAction* _tmp0_;
+	GAction* _tmp1_;
+	GAction* _tmp2_;
+	GAction* _tmp3_;
+	ConfigFacade* _tmp4_;
+	ConfigFacade* _tmp5_;
+	gboolean _tmp6_;
+	GVariant* _tmp7_;
 	GAction* extended_display_action = NULL;
-	GAction* _tmp8_ = NULL;
-	GAction* _tmp9_ = NULL;
-	GAction* _tmp10_ = NULL;
-	GAction* _tmp11_ = NULL;
-	ConfigFacade* _tmp12_ = NULL;
-	ConfigFacade* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
-	GVariant* _tmp15_ = NULL;
+	GAction* _tmp8_;
+	GAction* _tmp9_;
+	GAction* _tmp10_;
+	GAction* _tmp11_;
+	ConfigFacade* _tmp12_;
+	ConfigFacade* _tmp13_;
+	gboolean _tmp14_;
+	GVariant* _tmp15_;
 	GAction* search_bar_display_action = NULL;
-	GAction* _tmp16_ = NULL;
-	GAction* _tmp17_ = NULL;
-	GAction* _tmp18_ = NULL;
-	GAction* _tmp19_ = NULL;
-	ConfigFacade* _tmp20_ = NULL;
-	ConfigFacade* _tmp21_ = NULL;
-	gboolean _tmp22_ = FALSE;
-	GVariant* _tmp23_ = NULL;
+	GAction* _tmp16_;
+	GAction* _tmp17_;
+	GAction* _tmp18_;
+	GAction* _tmp19_;
+	ConfigFacade* _tmp20_;
+	ConfigFacade* _tmp21_;
+	gboolean _tmp22_;
+	GVariant* _tmp23_;
 	GAction* sort_events_action = NULL;
-	GAction* _tmp24_ = NULL;
-	GAction* _tmp25_ = NULL;
-	GAction* _tmp26_ = NULL;
+	GAction* _tmp24_;
+	GAction* _tmp25_;
+	GAction* _tmp26_;
 	const gchar* _tmp27_ = NULL;
-	ConfigFacade* _tmp28_ = NULL;
-	ConfigFacade* _tmp29_ = NULL;
-	gboolean _tmp30_ = FALSE;
-	gboolean _tmp31_ = FALSE;
+	ConfigFacade* _tmp28_;
+	ConfigFacade* _tmp29_;
+	gboolean _tmp30_;
+	gboolean _tmp31_;
 	gchar* event_sort_val = NULL;
-	gchar* _tmp32_ = NULL;
-	GAction* _tmp33_ = NULL;
-	GVariant* _tmp34_ = NULL;
+	gchar* _tmp32_;
+	GAction* _tmp33_;
+	GVariant* _tmp34_;
 #line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6932,11 +6910,11 @@ static void library_window_load_configuration (LibraryWindow* self) {
 	if (_tmp31_) {
 #line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING;
-#line 6935 "LibraryWindow.c"
+#line 6913 "LibraryWindow.c"
 	} else {
 #line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING;
-#line 6939 "LibraryWindow.c"
+#line 6917 "LibraryWindow.c"
 	}
 #line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = g_strdup (_tmp27_);
@@ -6960,7 +6938,7 @@ static void library_window_load_configuration (LibraryWindow* self) {
 	_g_object_unref0 (extended_display_action);
 #line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (basic_display_action);
-#line 6963 "LibraryWindow.c"
+#line 6941 "LibraryWindow.c"
 }
 
 
@@ -6969,19 +6947,19 @@ static gboolean _library_window_on_pulse_background_progress_bar_gsource_func (g
 	result = library_window_on_pulse_background_progress_bar ((LibraryWindow*) self);
 #line 1028 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 6972 "LibraryWindow.c"
+#line 6950 "LibraryWindow.c"
 }
 
 
 static void library_window_start_pulse_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	GtkProgressBar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	GtkProgressBar* _tmp6_ = NULL;
-	guint _tmp7_ = 0U;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	GtkProgressBar* _tmp4_;
+	const gchar* _tmp5_;
+	GtkProgressBar* _tmp6_;
+	guint _tmp7_;
 #line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6994,7 +6972,7 @@ static void library_window_start_pulse_background_progress_bar (LibraryWindow* s
 	if (_tmp0_ < _tmp1_) {
 #line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6997 "LibraryWindow.c"
+#line 6975 "LibraryWindow.c"
 	}
 #line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
@@ -7020,13 +6998,13 @@ static void library_window_start_pulse_background_progress_bar (LibraryWindow* s
 	_tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) LIBRARY_WINDOW_BACKGROUND_PROGRESS_PULSE_MSEC, _library_window_on_pulse_background_progress_bar_gsource_func, g_object_ref (self), g_object_unref);
 #line 1028 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_pulse_id = _tmp7_;
-#line 7023 "LibraryWindow.c"
+#line 7001 "LibraryWindow.c"
 }
 
 
 static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* self) {
 	gboolean result = FALSE;
-	GtkProgressBar* _tmp0_ = NULL;
+	GtkProgressBar* _tmp0_;
 #line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7037,15 +7015,15 @@ static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow*
 	result = TRUE;
 #line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 7040 "LibraryWindow.c"
+#line 7018 "LibraryWindow.c"
 }
 
 
 static void library_window_stop_pulse_background_progress_bar (LibraryWindow* self, gint priority, gboolean clear) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	guint _tmp2_ = 0U;
-	gboolean _tmp4_ = FALSE;
+	gint _tmp0_;
+	gint _tmp1_;
+	guint _tmp2_;
+	gboolean _tmp4_;
 #line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7056,56 +7034,55 @@ static void library_window_stop_pulse_background_progress_bar (LibraryWindow* se
 	if (_tmp0_ < _tmp1_) {
 #line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7059 "LibraryWindow.c"
+#line 7037 "LibraryWindow.c"
 	}
 #line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->background_progress_pulse_id;
 #line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != ((guint) 0)) {
-#line 7065 "LibraryWindow.c"
-		guint _tmp3_ = 0U;
+#line 7043 "LibraryWindow.c"
+		guint _tmp3_;
 #line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->background_progress_pulse_id;
 #line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_source_remove (_tmp3_);
 #line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_pulse_id = (guint) 0;
-#line 7073 "LibraryWindow.c"
+#line 7051 "LibraryWindow.c"
 	}
 #line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = clear;
 #line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 7079 "LibraryWindow.c"
-		gint _tmp5_ = 0;
+#line 7057 "LibraryWindow.c"
+		gint _tmp5_;
 #line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = priority;
 #line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, _tmp5_);
-#line 7085 "LibraryWindow.c"
+#line 7063 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_update_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority, gdouble count, gdouble total) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-	gdouble _tmp5_ = 0.0;
-	gint _tmp10_ = 0;
+	gdouble _tmp5_;
+	gint _tmp10_;
 	gdouble fraction = 0.0;
-	gdouble _tmp11_ = 0.0;
-	gdouble _tmp12_ = 0.0;
-	GtkProgressBar* _tmp13_ = NULL;
-	gdouble _tmp14_ = 0.0;
-	GtkProgressBar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-	gdouble _tmp18_ = 0.0;
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
+	gdouble _tmp11_;
+	gdouble _tmp12_;
+	GtkProgressBar* _tmp13_;
+	gdouble _tmp14_;
+	GtkProgressBar* _tmp15_;
+	const gchar* _tmp16_;
+	gdouble _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
 #line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7118,7 +7095,7 @@ static void library_window_update_background_progress_bar (LibraryWindow* self,
 	if (_tmp0_ < _tmp1_) {
 #line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7121 "LibraryWindow.c"
+#line 7098 "LibraryWindow.c"
 	}
 #line 1056 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
@@ -7130,42 +7107,42 @@ static void library_window_update_background_progress_bar (LibraryWindow* self,
 	if (_tmp5_ <= 0.0) {
 #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = TRUE;
-#line 7133 "LibraryWindow.c"
+#line 7110 "LibraryWindow.c"
 	} else {
-		gdouble _tmp6_ = 0.0;
+		gdouble _tmp6_;
 #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = total;
 #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = _tmp6_ <= 0.0;
-#line 7140 "LibraryWindow.c"
+#line 7117 "LibraryWindow.c"
 	}
 #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
 #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = TRUE;
-#line 7146 "LibraryWindow.c"
+#line 7123 "LibraryWindow.c"
 	} else {
-		gdouble _tmp7_ = 0.0;
-		gdouble _tmp8_ = 0.0;
+		gdouble _tmp7_;
+		gdouble _tmp8_;
 #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = count;
 #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = total;
 #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = _tmp7_ >= _tmp8_;
-#line 7156 "LibraryWindow.c"
+#line 7133 "LibraryWindow.c"
 	}
 #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 7160 "LibraryWindow.c"
-		gint _tmp9_ = 0;
+#line 7137 "LibraryWindow.c"
+		gint _tmp9_;
 #line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = priority;
 #line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, _tmp9_);
 #line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7168 "LibraryWindow.c"
+#line 7145 "LibraryWindow.c"
 	}
 #line 1064 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = priority;
@@ -7186,31 +7163,29 @@ static void library_window_update_background_progress_bar (LibraryWindow* self,
 #line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->background_progress_bar;
 #line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp16_ = _ ("%s (%d%%)");
-#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17_ = label;
+	_tmp16_ = label;
 #line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_ = fraction;
+	_tmp17_ = fraction;
 #line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp19_ = g_strdup_printf (_tmp16_, _tmp17_, (gint) (_tmp18_ * 100.0));
+	_tmp18_ = g_strdup_printf (_ ("%s (%d%%)"), _tmp16_, (gint) (_tmp17_ * 100.0));
 #line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp20_ = _tmp19_;
+	_tmp19_ = _tmp18_;
 #line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_progress_bar_set_text (_tmp15_, _tmp20_);
+	gtk_progress_bar_set_text (_tmp15_, _tmp19_);
 #line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_free0 (_tmp20_);
+	_g_free0 (_tmp19_);
 #line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_background_progress_bar (self);
-#line 7204 "LibraryWindow.c"
+#line 7179 "LibraryWindow.c"
 }
 
 
 static void library_window_clear_background_progress_bar (LibraryWindow* self, gint priority) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	GtkProgressBar* _tmp3_ = NULL;
-	GtkProgressBar* _tmp4_ = NULL;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	GtkProgressBar* _tmp3_;
+	GtkProgressBar* _tmp4_;
 #line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7221,7 +7196,7 @@ static void library_window_clear_background_progress_bar (LibraryWindow* self, g
 	if (_tmp0_ < _tmp1_) {
 #line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7224 "LibraryWindow.c"
+#line 7199 "LibraryWindow.c"
 	}
 #line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
@@ -7239,22 +7214,22 @@ static void library_window_clear_background_progress_bar (LibraryWindow* self, g
 	gtk_progress_bar_set_text (_tmp4_, "");
 #line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_hide_background_progress_bar (self);
-#line 7242 "LibraryWindow.c"
+#line 7217 "LibraryWindow.c"
 }
 
 
 static void library_window_show_background_progress_bar (LibraryWindow* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_displayed;
 #line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp0_) {
-#line 7254 "LibraryWindow.c"
-		GtkBox* _tmp1_ = NULL;
-		GtkFrame* _tmp2_ = NULL;
-		GtkFrame* _tmp3_ = NULL;
+#line 7229 "LibraryWindow.c"
+		GtkBox* _tmp1_;
+		GtkFrame* _tmp2_;
+		GtkFrame* _tmp3_;
 #line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->top_section;
 #line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7267,22 +7242,22 @@ static void library_window_show_background_progress_bar (LibraryWindow* self) {
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
 #line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_displayed = TRUE;
-#line 7270 "LibraryWindow.c"
+#line 7245 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_hide_background_progress_bar (LibraryWindow* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_displayed;
 #line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 7283 "LibraryWindow.c"
-		GtkBox* _tmp1_ = NULL;
-		GtkFrame* _tmp2_ = NULL;
+#line 7258 "LibraryWindow.c"
+		GtkBox* _tmp1_;
+		GtkFrame* _tmp2_;
 #line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->top_section;
 #line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7291,20 +7266,17 @@ static void library_window_hide_background_progress_bar (LibraryWindow* self) {
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
 #line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_displayed = FALSE;
-#line 7294 "LibraryWindow.c"
+#line 7269 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_on_library_monitor_discovery_started (LibraryWindow* self) {
-	const gchar* _tmp0_ = NULL;
 #line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = _ ("Updating library…");
-#line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY);
-#line 7307 "LibraryWindow.c"
+	library_window_start_pulse_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY);
+#line 7279 "LibraryWindow.c"
 }
 
 
@@ -7313,12 +7285,12 @@ static void library_window_on_library_monitor_discovery_completed (LibraryWindow
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY, TRUE);
-#line 7316 "LibraryWindow.c"
+#line 7288 "LibraryWindow.c"
 }
 
 
 static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, gint completed_files, gint total_files) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 1119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7327,56 +7299,47 @@ static void library_window_on_library_monitor_auto_update_progress (LibraryWindo
 	if (_tmp0_ < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) {
 #line 1121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY);
-#line 7330 "LibraryWindow.c"
+#line 7302 "LibraryWindow.c"
 	} else {
-		const gchar* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
-#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp1_ = _ ("Updating library…");
+		gint _tmp1_;
+		gint _tmp2_;
 #line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp2_ = completed_files;
+		_tmp1_ = completed_files;
 #line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp3_ = total_files;
+		_tmp2_ = total_files;
 #line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_update_background_progress_bar (self, _tmp1_, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY, (gdouble) _tmp2_, (gdouble) _tmp3_);
-#line 7343 "LibraryWindow.c"
+		library_window_update_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_);
+#line 7312 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self) {
-	const gchar* _tmp0_ = NULL;
 #line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = _ ("Preparing to auto-import photos…");
-#line 1129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY);
-#line 7356 "LibraryWindow.c"
+	library_window_start_pulse_background_progress_bar (self, _ ("Preparing to auto-import photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY);
+#line 7322 "LibraryWindow.c"
 }
 
 
 static void library_window_on_library_monitor_auto_import_progress (LibraryWindow* self, guint64 completed_bytes, guint64 total_bytes) {
-	const gchar* _tmp0_ = NULL;
-	guint64 _tmp1_ = 0ULL;
-	guint64 _tmp2_ = 0ULL;
+	guint64 _tmp0_;
+	guint64 _tmp1_;
 #line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = _ ("Auto-importing photos…");
-#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = completed_bytes;
+	_tmp0_ = completed_bytes;
 #line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = total_bytes;
+	_tmp1_ = total_bytes;
 #line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_update_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 7374 "LibraryWindow.c"
+	library_window_update_background_progress_bar (self, _ ("Auto-importing photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY, (gdouble) _tmp0_, (gdouble) _tmp1_);
+#line 7337 "LibraryWindow.c"
 }
 
 
 static void library_window_on_metadata_writer_progress (LibraryWindow* self, guint completed, guint total) {
-	guint _tmp0_ = 0U;
+	guint _tmp0_;
 #line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7385,76 +7348,73 @@ static void library_window_on_metadata_writer_progress (LibraryWindow* self, gui
 	if (_tmp0_ < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) {
 #line 1140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY);
-#line 7388 "LibraryWindow.c"
+#line 7351 "LibraryWindow.c"
 	} else {
-		const gchar* _tmp1_ = NULL;
-		guint _tmp2_ = 0U;
-		guint _tmp3_ = 0U;
+		guint _tmp1_;
+		guint _tmp2_;
 #line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp1_ = _ ("Writing metadata to files…");
+		_tmp1_ = completed;
 #line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp2_ = completed;
+		_tmp2_ = total;
 #line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp3_ = total;
-#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_update_background_progress_bar (self, _tmp1_, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY, (gdouble) _tmp2_, (gdouble) _tmp3_);
-#line 7401 "LibraryWindow.c"
+		library_window_update_background_progress_bar (self, _ ("Writing metadata to files…"), LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_);
+#line 7361 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_create_layout (LibraryWindow* self, Page* start_page) {
 	GtkScrolledWindow* scrolled_sidebar = NULL;
-	GtkScrolledWindow* _tmp0_ = NULL;
-	SidebarTree* _tmp1_ = NULL;
-	GtkFrame* _tmp2_ = NULL;
-	GtkFrame* _tmp3_ = NULL;
-	GtkProgressBar* _tmp4_ = NULL;
-	GtkFrame* _tmp5_ = NULL;
-	GtkStyleContext* _tmp6_ = NULL;
-	BasicProperties* _tmp7_ = NULL;
-	BasicProperties* _tmp8_ = NULL;
-	BasicProperties* _tmp9_ = NULL;
-	BasicProperties* _tmp10_ = NULL;
-	BasicProperties* _tmp11_ = NULL;
-	BasicProperties* _tmp12_ = NULL;
-	BasicProperties* _tmp13_ = NULL;
-	BasicProperties* _tmp14_ = NULL;
-	GtkFrame* _tmp15_ = NULL;
-	BasicProperties* _tmp16_ = NULL;
-	GtkFrame* _tmp17_ = NULL;
-	GtkStyleContext* _tmp18_ = NULL;
-	GtkBox* _tmp19_ = NULL;
-	GtkPaned* _tmp20_ = NULL;
-	GtkBox* _tmp21_ = NULL;
-	GtkPaned* _tmp22_ = NULL;
-	GtkFrame* _tmp23_ = NULL;
-	GtkPaned* _tmp24_ = NULL;
-	GtkBox* _tmp25_ = NULL;
-	GtkBox* _tmp26_ = NULL;
-	SearchFilterToolbar* _tmp27_ = NULL;
-	GtkBox* _tmp28_ = NULL;
-	GtkStack* _tmp29_ = NULL;
-	GtkBox* _tmp30_ = NULL;
-	GtkRevealer* _tmp31_ = NULL;
-	GtkPaned* _tmp32_ = NULL;
-	GtkPaned* _tmp33_ = NULL;
-	GtkPaned* _tmp34_ = NULL;
-	SidebarTree* _tmp35_ = NULL;
-	GtkPaned* _tmp36_ = NULL;
-	GtkBox* _tmp37_ = NULL;
-	GtkPaned* _tmp38_ = NULL;
-	ConfigFacade* _tmp39_ = NULL;
-	ConfigFacade* _tmp40_ = NULL;
-	gint _tmp41_ = 0;
-	GtkStack* _tmp42_ = NULL;
-	gint _tmp43_ = 0;
-	gint _tmp44_ = 0;
-	GtkBox* _tmp45_ = NULL;
-	GtkPaned* _tmp46_ = NULL;
-	GtkBox* _tmp47_ = NULL;
-	Page* _tmp48_ = NULL;
-	Page* _tmp49_ = NULL;
+	GtkScrolledWindow* _tmp0_;
+	SidebarTree* _tmp1_;
+	GtkFrame* _tmp2_;
+	GtkFrame* _tmp3_;
+	GtkProgressBar* _tmp4_;
+	GtkFrame* _tmp5_;
+	GtkStyleContext* _tmp6_;
+	BasicProperties* _tmp7_;
+	BasicProperties* _tmp8_;
+	BasicProperties* _tmp9_;
+	BasicProperties* _tmp10_;
+	BasicProperties* _tmp11_;
+	BasicProperties* _tmp12_;
+	BasicProperties* _tmp13_;
+	BasicProperties* _tmp14_;
+	GtkFrame* _tmp15_;
+	BasicProperties* _tmp16_;
+	GtkFrame* _tmp17_;
+	GtkStyleContext* _tmp18_;
+	GtkBox* _tmp19_;
+	GtkPaned* _tmp20_;
+	GtkBox* _tmp21_;
+	GtkPaned* _tmp22_;
+	GtkFrame* _tmp23_;
+	GtkPaned* _tmp24_;
+	GtkBox* _tmp25_;
+	GtkBox* _tmp26_;
+	SearchFilterToolbar* _tmp27_;
+	GtkBox* _tmp28_;
+	GtkStack* _tmp29_;
+	GtkBox* _tmp30_;
+	GtkRevealer* _tmp31_;
+	GtkPaned* _tmp32_;
+	GtkPaned* _tmp33_;
+	GtkPaned* _tmp34_;
+	SidebarTree* _tmp35_;
+	GtkPaned* _tmp36_;
+	GtkBox* _tmp37_;
+	GtkPaned* _tmp38_;
+	ConfigFacade* _tmp39_;
+	ConfigFacade* _tmp40_;
+	gint _tmp41_;
+	GtkStack* _tmp42_;
+	gint _tmp43_;
+	gint _tmp44_;
+	GtkBox* _tmp45_;
+	GtkPaned* _tmp46_;
+	GtkBox* _tmp47_;
+	Page* _tmp48_;
+	Page* _tmp49_;
 #line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7641,13 +7601,13 @@ static void library_window_create_layout (LibraryWindow* self, Page* start_page)
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
 #line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (scrolled_sidebar);
-#line 7644 "LibraryWindow.c"
+#line 7604 "LibraryWindow.c"
 }
 
 
 static void library_window_real_set_current_page (PageWindow* base, Page* page) {
 	LibraryWindow * self;
-	Page* _tmp0_ = NULL;
+	Page* _tmp0_;
 #line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7656,63 +7616,63 @@ static void library_window_real_set_current_page (PageWindow* base, Page* page)
 	_tmp0_ = page;
 #line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp0_);
-#line 7659 "LibraryWindow.c"
+#line 7619 "LibraryWindow.c"
 }
 
 
 void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = should_enable;
 #line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_switching_enabled = _tmp0_;
-#line 7671 "LibraryWindow.c"
+#line 7631 "LibraryWindow.c"
 }
 
 
 void library_window_switch_to_page (LibraryWindow* self, Page* page) {
-	gboolean _tmp0_ = FALSE;
-	Page* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp0_;
+	Page* _tmp1_;
+	Page* _tmp2_;
+	Page* _tmp3_;
+	gboolean _tmp4_;
 	Page* current_page = NULL;
-	Page* _tmp5_ = NULL;
-	Page* _tmp6_ = NULL;
-	GtkStack* _tmp16_ = NULL;
-	Page* _tmp17_ = NULL;
-	Page* _tmp18_ = NULL;
-	Page* _tmp19_ = NULL;
-	gboolean _tmp21_ = FALSE;
-	Page* _tmp22_ = NULL;
+	Page* _tmp5_;
+	Page* _tmp6_;
+	GtkStack* _tmp16_;
+	Page* _tmp17_;
+	Page* _tmp18_;
+	Page* _tmp19_;
+	gboolean _tmp21_;
+	Page* _tmp22_;
 	SidebarEntry* entry = NULL;
-	GeeHashMap* _tmp23_ = NULL;
-	Page* _tmp24_ = NULL;
-	gpointer _tmp25_ = NULL;
-	SidebarEntry* _tmp26_ = NULL;
-	Page* _tmp37_ = NULL;
-	Page* _tmp39_ = NULL;
-	Page* _tmp40_ = NULL;
-	Page* _tmp41_ = NULL;
-	Page* _tmp42_ = NULL;
-	Page* _tmp43_ = NULL;
-	GMenuModel* _tmp44_ = NULL;
-	GMenuModel* _tmp45_ = NULL;
+	GeeHashMap* _tmp23_;
+	Page* _tmp24_;
+	gpointer _tmp25_;
+	SidebarEntry* _tmp26_;
+	Page* _tmp37_;
+	Page* _tmp39_;
+	Page* _tmp40_;
+	Page* _tmp41_;
+	Page* _tmp42_;
+	Page* _tmp43_;
+	GMenuModel* _tmp44_;
+	GMenuModel* _tmp45_;
 	gboolean old = FALSE;
-	GtkSettings* _tmp46_ = NULL;
-	gboolean _tmp47_ = FALSE;
-	gboolean _tmp48_ = FALSE;
-	GtkSettings* _tmp49_ = NULL;
-	gboolean _tmp50_ = FALSE;
-	GtkSettings* _tmp51_ = NULL;
-	gboolean _tmp52_ = FALSE;
+	GtkSettings* _tmp46_;
+	gboolean _tmp47_;
+	gboolean _tmp48_;
+	GtkSettings* _tmp49_;
+	gboolean _tmp50_;
+	GtkSettings* _tmp51_;
+	gboolean _tmp52_;
 	GtkToolbar* toolbar = NULL;
-	Page* _tmp53_ = NULL;
-	GtkToolbar* _tmp54_ = NULL;
-	GtkToolbar* _tmp55_ = NULL;
-	Page* _tmp61_ = NULL;
+	Page* _tmp53_;
+	GtkToolbar* _tmp54_;
+	GtkToolbar* _tmp55_;
+	Page* _tmp61_;
 #line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7723,7 +7683,7 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 	if (!_tmp0_) {
 #line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7726 "LibraryWindow.c"
+#line 7686 "LibraryWindow.c"
 	}
 #line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
@@ -7739,7 +7699,7 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 	if (_tmp4_) {
 #line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7742 "LibraryWindow.c"
+#line 7702 "LibraryWindow.c"
 	}
 #line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
@@ -7749,14 +7709,14 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 	_tmp6_ = current_page;
 #line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 7752 "LibraryWindow.c"
+#line 7712 "LibraryWindow.c"
 		GtkToolbar* toolbar = NULL;
-		Page* _tmp7_ = NULL;
-		GtkToolbar* _tmp8_ = NULL;
-		GtkToolbar* _tmp9_ = NULL;
-		Page* _tmp12_ = NULL;
-		Page* _tmp13_ = NULL;
-		Page* _tmp15_ = NULL;
+		Page* _tmp7_;
+		GtkToolbar* _tmp8_;
+		GtkToolbar* _tmp9_;
+		Page* _tmp12_;
+		Page* _tmp13_;
+		Page* _tmp15_;
 #line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), FALSE);
 #line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7771,16 +7731,16 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 		_tmp9_ = toolbar;
 #line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp9_ != NULL) {
-#line 7774 "LibraryWindow.c"
-			GtkRevealer* _tmp10_ = NULL;
-			GtkToolbar* _tmp11_ = NULL;
+#line 7734 "LibraryWindow.c"
+			GtkRevealer* _tmp10_;
+			GtkToolbar* _tmp11_;
 #line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp10_ = self->priv->toolbar_revealer;
 #line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp11_ = toolbar;
 #line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 7783 "LibraryWindow.c"
+#line 7743 "LibraryWindow.c"
 		}
 #line 1225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = current_page;
@@ -7790,13 +7750,13 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 		_tmp13_ = current_page;
 #line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 7793 "LibraryWindow.c"
-			SidebarTree* _tmp14_ = NULL;
+#line 7753 "LibraryWindow.c"
+			SidebarTree* _tmp14_;
 #line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = self->priv->sidebar_tree;
 #line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			sidebar_tree_enable_editing (_tmp14_);
-#line 7799 "LibraryWindow.c"
+#line 7759 "LibraryWindow.c"
 		}
 #line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = current_page;
@@ -7804,7 +7764,7 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 		library_window_unsubscribe_from_basic_information (self, _tmp15_);
 #line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (toolbar);
-#line 7807 "LibraryWindow.c"
+#line 7767 "LibraryWindow.c"
 	}
 #line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = self->priv->stack;
@@ -7820,13 +7780,13 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 	_tmp19_ = page;
 #line 1246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 7823 "LibraryWindow.c"
-		SidebarTree* _tmp20_ = NULL;
+#line 7783 "LibraryWindow.c"
+		SidebarTree* _tmp20_;
 #line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = self->priv->sidebar_tree;
 #line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_disable_editing (_tmp20_);
-#line 7829 "LibraryWindow.c"
+#line 7789 "LibraryWindow.c"
 	}
 #line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = library_window_should_show_search_bar (self);
@@ -7846,14 +7806,14 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 	_tmp26_ = entry;
 #line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp26_ != NULL) {
-#line 7849 "LibraryWindow.c"
+#line 7809 "LibraryWindow.c"
 		SidebarExpandableEntry* expandable_entry = NULL;
-		SidebarEntry* _tmp27_ = NULL;
-		SidebarExpandableEntry* _tmp28_ = NULL;
+		SidebarEntry* _tmp27_;
+		SidebarExpandableEntry* _tmp28_;
 		gboolean _tmp29_ = FALSE;
-		SidebarExpandableEntry* _tmp30_ = NULL;
-		SidebarTree* _tmp35_ = NULL;
-		SidebarEntry* _tmp36_ = NULL;
+		SidebarExpandableEntry* _tmp30_;
+		SidebarTree* _tmp35_;
+		SidebarEntry* _tmp36_;
 #line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = entry;
 #line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7864,33 +7824,33 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 		_tmp30_ = expandable_entry;
 #line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp30_ != NULL) {
-#line 7867 "LibraryWindow.c"
-			SidebarExpandableEntry* _tmp31_ = NULL;
-			gboolean _tmp32_ = FALSE;
+#line 7827 "LibraryWindow.c"
+			SidebarExpandableEntry* _tmp31_;
+			gboolean _tmp32_;
 #line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp31_ = expandable_entry;
 #line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp32_ = sidebar_expandable_entry_expand_on_select (_tmp31_);
 #line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp29_ = _tmp32_;
-#line 7876 "LibraryWindow.c"
+#line 7836 "LibraryWindow.c"
 		} else {
 #line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp29_ = FALSE;
-#line 7880 "LibraryWindow.c"
+#line 7840 "LibraryWindow.c"
 		}
 #line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp29_) {
-#line 7884 "LibraryWindow.c"
-			SidebarTree* _tmp33_ = NULL;
-			SidebarEntry* _tmp34_ = NULL;
+#line 7844 "LibraryWindow.c"
+			SidebarTree* _tmp33_;
+			SidebarEntry* _tmp34_;
 #line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp33_ = self->priv->sidebar_tree;
 #line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp34_ = entry;
 #line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			sidebar_tree_expand_to_entry (_tmp33_, _tmp34_);
-#line 7893 "LibraryWindow.c"
+#line 7853 "LibraryWindow.c"
 		}
 #line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp35_ = self->priv->sidebar_tree;
@@ -7900,7 +7860,7 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 		sidebar_tree_place_cursor (_tmp35_, _tmp36_, TRUE);
 #line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (expandable_entry);
-#line 7903 "LibraryWindow.c"
+#line 7863 "LibraryWindow.c"
 	}
 #line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties (self);
@@ -7908,13 +7868,13 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 	_tmp37_ = page;
 #line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, TYPE_CHECKERBOARD_PAGE)) {
-#line 7911 "LibraryWindow.c"
-		Page* _tmp38_ = NULL;
+#line 7871 "LibraryWindow.c"
+		Page* _tmp38_;
 #line 1267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp38_ = page;
 #line 1267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_init_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 7917 "LibraryWindow.c"
+#line 7877 "LibraryWindow.c"
 	}
 #line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp39_ = page;
@@ -7974,12 +7934,12 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 	_tmp55_ = toolbar;
 #line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp55_ != NULL) {
-#line 7977 "LibraryWindow.c"
-		GtkRevealer* _tmp56_ = NULL;
-		GtkToolbar* _tmp57_ = NULL;
-		GtkToolbar* _tmp58_ = NULL;
-		GtkRevealer* _tmp59_ = NULL;
-		gboolean _tmp60_ = FALSE;
+#line 7937 "LibraryWindow.c"
+		GtkRevealer* _tmp56_;
+		GtkToolbar* _tmp57_;
+		GtkToolbar* _tmp58_;
+		GtkRevealer* _tmp59_;
+		gboolean _tmp60_;
 #line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp56_ = self->priv->toolbar_revealer;
 #line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7996,7 +7956,7 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 		_tmp60_ = library_window_is_toolbar_visible (self);
 #line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_revealer_set_reveal_child (_tmp59_, _tmp60_);
-#line 7999 "LibraryWindow.c"
+#line 7959 "LibraryWindow.c"
 	}
 #line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp61_ = page;
@@ -8008,21 +7968,21 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 	_g_object_unref0 (entry);
 #line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 8011 "LibraryWindow.c"
+#line 7971 "LibraryWindow.c"
 }
 
 
 static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPage* page) {
-	SearchFilterToolbar* _tmp0_ = NULL;
-	CheckerboardPage* _tmp1_ = NULL;
-	SearchViewFilter* _tmp2_ = NULL;
-	SearchViewFilter* _tmp3_ = NULL;
-	CheckerboardPage* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	CheckerboardPage* _tmp7_ = NULL;
-	SearchViewFilter* _tmp8_ = NULL;
-	SearchViewFilter* _tmp9_ = NULL;
+	SearchFilterToolbar* _tmp0_;
+	CheckerboardPage* _tmp1_;
+	SearchViewFilter* _tmp2_;
+	SearchViewFilter* _tmp3_;
+	CheckerboardPage* _tmp4_;
+	ViewCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	CheckerboardPage* _tmp7_;
+	SearchViewFilter* _tmp8_;
+	SearchViewFilter* _tmp9_;
 #line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8057,16 +8017,16 @@ static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPa
 	_view_filter_unref0 (_tmp9_);
 #line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 8060 "LibraryWindow.c"
+#line 8020 "LibraryWindow.c"
 }
 
 
 static gboolean library_window_should_show_search_bar (LibraryWindow* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	Page* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	Page* _tmp1_;
+	Page* _tmp2_;
+	gboolean _tmp3_;
 #line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8079,30 +8039,30 @@ static gboolean library_window_should_show_search_bar (LibraryWindow* self) {
 	_g_object_unref0 (_tmp2_);
 #line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 8082 "LibraryWindow.c"
-		gboolean _tmp4_ = FALSE;
+#line 8042 "LibraryWindow.c"
+		gboolean _tmp4_;
 #line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->is_search_toolbar_visible;
 #line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 8088 "LibraryWindow.c"
+#line 8048 "LibraryWindow.c"
 	} else {
 #line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 8092 "LibraryWindow.c"
+#line 8052 "LibraryWindow.c"
 	}
 #line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
 #line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 8098 "LibraryWindow.c"
+#line 8058 "LibraryWindow.c"
 }
 
 
 static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show, CheckerboardPage* page) {
-	SearchFilterToolbar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	SearchFilterToolbar* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 #line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8117,18 +8077,18 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show
 	_tmp2_ = show;
 #line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 8120 "LibraryWindow.c"
-		CheckerboardPage* _tmp3_ = NULL;
-		SearchFilterToolbar* _tmp4_ = NULL;
-		CheckerboardPage* _tmp5_ = NULL;
-		SearchViewFilter* _tmp6_ = NULL;
-		SearchViewFilter* _tmp7_ = NULL;
-		CheckerboardPage* _tmp8_ = NULL;
-		ViewCollection* _tmp9_ = NULL;
-		ViewCollection* _tmp10_ = NULL;
-		CheckerboardPage* _tmp11_ = NULL;
-		SearchViewFilter* _tmp12_ = NULL;
-		SearchViewFilter* _tmp13_ = NULL;
+#line 8080 "LibraryWindow.c"
+		CheckerboardPage* _tmp3_;
+		SearchFilterToolbar* _tmp4_;
+		CheckerboardPage* _tmp5_;
+		SearchViewFilter* _tmp6_;
+		SearchViewFilter* _tmp7_;
+		CheckerboardPage* _tmp8_;
+		ViewCollection* _tmp9_;
+		ViewCollection* _tmp10_;
+		CheckerboardPage* _tmp11_;
+		SearchViewFilter* _tmp12_;
+		SearchViewFilter* _tmp13_;
 #line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = page;
 #line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8163,19 +8123,19 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show
 		_view_filter_unref0 (_tmp13_);
 #line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 8166 "LibraryWindow.c"
+#line 8126 "LibraryWindow.c"
 	} else {
-		CheckerboardPage* _tmp14_ = NULL;
+		CheckerboardPage* _tmp14_;
 #line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = page;
 #line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp14_ != NULL) {
-#line 8173 "LibraryWindow.c"
-			CheckerboardPage* _tmp15_ = NULL;
-			ViewCollection* _tmp16_ = NULL;
-			ViewCollection* _tmp17_ = NULL;
-			DisabledViewFilter* _tmp18_ = NULL;
-			DisabledViewFilter* _tmp19_ = NULL;
+#line 8133 "LibraryWindow.c"
+			CheckerboardPage* _tmp15_;
+			ViewCollection* _tmp16_;
+			ViewCollection* _tmp17_;
+			DisabledViewFilter* _tmp18_;
+			DisabledViewFilter* _tmp19_;
 #line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp15_ = page;
 #line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8192,20 +8152,20 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show
 			_view_filter_unref0 (_tmp19_);
 #line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_tmp17_);
-#line 8195 "LibraryWindow.c"
+#line 8155 "LibraryWindow.c"
 		}
 	}
 }
 
 
 static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepresentative* entry, Page* page) {
-	GeeHashMap* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GeeHashMap* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
-	SidebarPageRepresentative* _tmp5_ = NULL;
-	Page* _tmp6_ = NULL;
+	GeeHashMap* _tmp0_;
+	Page* _tmp1_;
+	gboolean _tmp2_;
+	GeeHashMap* _tmp3_;
+	Page* _tmp4_;
+	SidebarPageRepresentative* _tmp5_;
+	Page* _tmp6_;
 #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8232,20 +8192,20 @@ static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepr
 	_tmp6_ = page;
 #line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_add_to_stack (self, _tmp6_);
-#line 8235 "LibraryWindow.c"
+#line 8195 "LibraryWindow.c"
 }
 
 
 static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageRepresentative* entry, Page* page) {
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	Page* _tmp9_ = NULL;
+	Page* _tmp0_;
+	Page* _tmp1_;
+	Page* _tmp2_;
+	gboolean _tmp3_;
+	Page* _tmp9_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp10_ = NULL;
-	Page* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	GeeHashMap* _tmp10_;
+	Page* _tmp11_;
+	gboolean _tmp12_;
 #line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8264,12 +8224,12 @@ static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageR
 	_g_object_unref0 (_tmp2_);
 #line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 8267 "LibraryWindow.c"
-		LibraryBranch* _tmp4_ = NULL;
-		LibraryPhotosEntry* _tmp5_ = NULL;
-		LibraryPhotosEntry* _tmp6_ = NULL;
-		Page* _tmp7_ = NULL;
-		Page* _tmp8_ = NULL;
+#line 8227 "LibraryWindow.c"
+		LibraryBranch* _tmp4_;
+		LibraryPhotosEntry* _tmp5_;
+		LibraryPhotosEntry* _tmp6_;
+		Page* _tmp7_;
+		Page* _tmp8_;
 #line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->library_branch;
 #line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8284,7 +8244,7 @@ static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageR
 		library_window_switch_to_page (self, _tmp8_);
 #line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp8_);
-#line 8287 "LibraryWindow.c"
+#line 8247 "LibraryWindow.c"
 	}
 #line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = page;
@@ -8300,15 +8260,15 @@ static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageR
 	removed = _tmp12_;
 #line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (removed, "removed");
-#line 8303 "LibraryWindow.c"
+#line 8263 "LibraryWindow.c"
 }
 
 
 static void library_window_on_sidebar_entry_selected (LibraryWindow* self, SidebarSelectableEntry* selectable) {
 	SidebarPageRepresentative* page_rep = NULL;
-	SidebarSelectableEntry* _tmp0_ = NULL;
-	SidebarPageRepresentative* _tmp1_ = NULL;
-	SidebarPageRepresentative* _tmp2_ = NULL;
+	SidebarSelectableEntry* _tmp0_;
+	SidebarPageRepresentative* _tmp1_;
+	SidebarPageRepresentative* _tmp2_;
 #line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8323,10 +8283,10 @@ static void library_window_on_sidebar_entry_selected (LibraryWindow* self, Sideb
 	_tmp2_ = page_rep;
 #line 1334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 8326 "LibraryWindow.c"
-		SidebarPageRepresentative* _tmp3_ = NULL;
-		Page* _tmp4_ = NULL;
-		Page* _tmp5_ = NULL;
+#line 8286 "LibraryWindow.c"
+		SidebarPageRepresentative* _tmp3_;
+		Page* _tmp4_;
+		Page* _tmp5_;
 #line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = page_rep;
 #line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8337,31 +8297,31 @@ static void library_window_on_sidebar_entry_selected (LibraryWindow* self, Sideb
 		library_window_switch_to_page (self, _tmp5_);
 #line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 8340 "LibraryWindow.c"
+#line 8300 "LibraryWindow.c"
 	}
 #line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (page_rep);
-#line 8344 "LibraryWindow.c"
+#line 8304 "LibraryWindow.c"
 }
 
 
 static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* self, SidebarSelectableEntry* selectable) {
 	LibraryLastImportSidebarEntry* last_import_entry = NULL;
-	LibraryBranch* _tmp0_ = NULL;
-	LibraryLastImportSidebarEntry* _tmp1_ = NULL;
-	LibraryLastImportSidebarEntry* _tmp2_ = NULL;
-	LibraryLastImportSidebarEntry* _tmp3_ = NULL;
+	LibraryBranch* _tmp0_;
+	LibraryLastImportSidebarEntry* _tmp1_;
+	LibraryLastImportSidebarEntry* _tmp2_;
+	LibraryLastImportSidebarEntry* _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	SidebarSelectableEntry* _tmp5_ = NULL;
+	SidebarSelectableEntry* _tmp5_;
 	gboolean _tmp12_ = FALSE;
-	SidebarSelectableEntry* _tmp13_ = NULL;
+	SidebarSelectableEntry* _tmp13_;
 	gboolean _tmp21_ = FALSE;
-	SidebarSelectableEntry* _tmp22_ = NULL;
-	LibraryBranch* _tmp30_ = NULL;
-	LibraryPhotosEntry* _tmp31_ = NULL;
-	LibraryPhotosEntry* _tmp32_ = NULL;
-	Page* _tmp33_ = NULL;
-	Page* _tmp34_ = NULL;
+	SidebarSelectableEntry* _tmp22_;
+	LibraryBranch* _tmp30_;
+	LibraryPhotosEntry* _tmp31_;
+	LibraryPhotosEntry* _tmp32_;
+	Page* _tmp33_;
+	Page* _tmp34_;
 #line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8380,10 +8340,10 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel
 	_tmp5_ = selectable;
 #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY)) {
-#line 8383 "LibraryWindow.c"
-		LibraryLastImportSidebarEntry* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
-		gboolean _tmp8_ = FALSE;
+#line 8343 "LibraryWindow.c"
+		LibraryLastImportSidebarEntry* _tmp6_;
+		gboolean _tmp7_;
+		gboolean _tmp8_;
 #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = last_import_entry;
 #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8392,18 +8352,18 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel
 		_tmp8_ = _tmp7_;
 #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = _tmp8_;
-#line 8395 "LibraryWindow.c"
+#line 8355 "LibraryWindow.c"
 	} else {
 #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = FALSE;
-#line 8399 "LibraryWindow.c"
+#line 8359 "LibraryWindow.c"
 	}
 #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 8403 "LibraryWindow.c"
-		LibraryLastImportSidebarEntry* _tmp9_ = NULL;
-		Page* _tmp10_ = NULL;
-		Page* _tmp11_ = NULL;
+#line 8363 "LibraryWindow.c"
+		LibraryLastImportSidebarEntry* _tmp9_;
+		Page* _tmp10_;
+		Page* _tmp11_;
 #line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = last_import_entry;
 #line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8418,35 +8378,35 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel
 		_g_object_unref0 (last_import_entry);
 #line 1348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8421 "LibraryWindow.c"
+#line 8381 "LibraryWindow.c"
 	}
 #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = selectable;
 #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, EVENTS_TYPE_EVENT_ENTRY)) {
-#line 8427 "LibraryWindow.c"
-		EventsBranch* _tmp14_ = NULL;
-		gboolean _tmp15_ = FALSE;
+#line 8387 "LibraryWindow.c"
+		EventsBranch* _tmp14_;
+		gboolean _tmp15_;
 #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = self->priv->events_branch;
 #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
 #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _tmp15_;
-#line 8436 "LibraryWindow.c"
+#line 8396 "LibraryWindow.c"
 	} else {
 #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = FALSE;
-#line 8440 "LibraryWindow.c"
+#line 8400 "LibraryWindow.c"
 	}
 #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_) {
-#line 8444 "LibraryWindow.c"
-		EventsBranch* _tmp16_ = NULL;
-		EventsMasterDirectoryEntry* _tmp17_ = NULL;
-		EventsMasterDirectoryEntry* _tmp18_ = NULL;
-		Page* _tmp19_ = NULL;
-		Page* _tmp20_ = NULL;
+#line 8404 "LibraryWindow.c"
+		EventsBranch* _tmp16_;
+		EventsMasterDirectoryEntry* _tmp17_;
+		EventsMasterDirectoryEntry* _tmp18_;
+		Page* _tmp19_;
+		Page* _tmp20_;
 #line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = self->priv->events_branch;
 #line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8467,35 +8427,35 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel
 		_g_object_unref0 (last_import_entry);
 #line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8470 "LibraryWindow.c"
+#line 8430 "LibraryWindow.c"
 	}
 #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = selectable;
 #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, EVENTS_TYPE_DIRECTORY_ENTRY)) {
-#line 8476 "LibraryWindow.c"
-		EventsBranch* _tmp23_ = NULL;
-		gboolean _tmp24_ = FALSE;
+#line 8436 "LibraryWindow.c"
+		EventsBranch* _tmp23_;
+		gboolean _tmp24_;
 #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = self->priv->events_branch;
 #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp24_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
 #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = _tmp24_;
-#line 8485 "LibraryWindow.c"
+#line 8445 "LibraryWindow.c"
 	} else {
 #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = FALSE;
-#line 8489 "LibraryWindow.c"
+#line 8449 "LibraryWindow.c"
 	}
 #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp21_) {
-#line 8493 "LibraryWindow.c"
-		EventsBranch* _tmp25_ = NULL;
-		EventsMasterDirectoryEntry* _tmp26_ = NULL;
-		EventsMasterDirectoryEntry* _tmp27_ = NULL;
-		Page* _tmp28_ = NULL;
-		Page* _tmp29_ = NULL;
+#line 8453 "LibraryWindow.c"
+		EventsBranch* _tmp25_;
+		EventsMasterDirectoryEntry* _tmp26_;
+		EventsMasterDirectoryEntry* _tmp27_;
+		Page* _tmp28_;
+		Page* _tmp29_;
 #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp25_ = self->priv->events_branch;
 #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8516,7 +8476,7 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel
 		_g_object_unref0 (last_import_entry);
 #line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8519 "LibraryWindow.c"
+#line 8479 "LibraryWindow.c"
 	}
 #line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = self->priv->library_branch;
@@ -8534,42 +8494,42 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel
 	_g_object_unref0 (_tmp34_);
 #line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (last_import_entry);
-#line 8537 "LibraryWindow.c"
+#line 8497 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
 #line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8544 "LibraryWindow.c"
+#line 8504 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8551 "LibraryWindow.c"
+#line 8511 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
 #line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8558 "LibraryWindow.c"
+#line 8518 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
 #line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8565 "LibraryWindow.c"
+#line 8525 "LibraryWindow.c"
 }
 
 
 static void library_window_subscribe_for_basic_information (LibraryWindow* self, Page* page) {
 	ViewCollection* view = NULL;
-	Page* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
+	Page* _tmp0_;
+	ViewCollection* _tmp1_;
 #line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8590,18 +8550,18 @@ static void library_window_subscribe_for_basic_information (LibraryWindow* self,
 	g_signal_connect_object (view, "items-visibility-changed", (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self, 0);
 #line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 8593 "LibraryWindow.c"
+#line 8553 "LibraryWindow.c"
 }
 
 
 static void library_window_unsubscribe_from_basic_information (LibraryWindow* self, Page* page) {
 	ViewCollection* view = NULL;
-	Page* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
-	guint _tmp4_ = 0U;
-	guint _tmp5_ = 0U;
+	Page* _tmp0_;
+	ViewCollection* _tmp1_;
+	guint _tmp2_;
+	guint _tmp3_;
+	guint _tmp4_;
+	guint _tmp5_;
 #line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8630,29 +8590,29 @@ static void library_window_unsubscribe_from_basic_information (LibraryWindow* se
 	g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self);
 #line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 8633 "LibraryWindow.c"
+#line 8593 "LibraryWindow.c"
 }
 
 
 static void library_window_on_update_properties (LibraryWindow* self) {
-	OneShotScheduler* _tmp0_ = NULL;
+	OneShotScheduler* _tmp0_;
 #line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->properties_scheduler;
 #line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	one_shot_scheduler_at_idle (_tmp0_);
-#line 8645 "LibraryWindow.c"
+#line 8605 "LibraryWindow.c"
 }
 
 
 static void library_window_on_update_properties_now (LibraryWindow* self) {
-	GtkFrame* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	ExtendedPropertiesWindow* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	gboolean _tmp8_ = FALSE;
+	GtkFrame* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+	ExtendedPropertiesWindow* _tmp6_;
+	gboolean _tmp7_;
+	gboolean _tmp8_;
 #line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8663,10 +8623,10 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
 	_tmp2_ = _tmp1_;
 #line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 8666 "LibraryWindow.c"
-		BasicProperties* _tmp3_ = NULL;
-		Page* _tmp4_ = NULL;
-		Page* _tmp5_ = NULL;
+#line 8626 "LibraryWindow.c"
+		BasicProperties* _tmp3_;
+		Page* _tmp4_;
+		Page* _tmp5_;
 #line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->basic_properties;
 #line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8677,7 +8637,7 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
 		properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_);
 #line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 8680 "LibraryWindow.c"
+#line 8640 "LibraryWindow.c"
 	}
 #line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->extended_properties;
@@ -8687,10 +8647,10 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
 	_tmp8_ = _tmp7_;
 #line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_) {
-#line 8690 "LibraryWindow.c"
-		ExtendedPropertiesWindow* _tmp9_ = NULL;
-		Page* _tmp10_ = NULL;
-		Page* _tmp11_ = NULL;
+#line 8650 "LibraryWindow.c"
+		ExtendedPropertiesWindow* _tmp9_;
+		Page* _tmp10_;
+		Page* _tmp11_;
 #line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = self->priv->extended_properties;
 #line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8701,143 +8661,185 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
 		extended_properties_window_update_properties (_tmp9_, _tmp11_);
 #line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 8704 "LibraryWindow.c"
+#line 8664 "LibraryWindow.c"
 	}
 }
 
 
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 8718 "LibraryWindow.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 8684 "LibraryWindow.c"
+	} else {
+		const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 8691 "LibraryWindow.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = TRUE;
+#line 8697 "LibraryWindow.c"
+	} else {
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 8707 "LibraryWindow.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 8711 "LibraryWindow.c"
+		gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 8719 "LibraryWindow.c"
+	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GRegex* _tmp9_;
+		GRegex* _tmp10_;
+		gchar* _tmp11_ = NULL;
+		GRegex* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 8749 "LibraryWindow.c"
+#line 8751 "LibraryWindow.c"
 				goto __catch44_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 8758 "LibraryWindow.c"
+#line 8760 "LibraryWindow.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 8774 "LibraryWindow.c"
+#line 8776 "LibraryWindow.c"
 				goto __catch44_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 8785 "LibraryWindow.c"
+#line 8787 "LibraryWindow.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 8799 "LibraryWindow.c"
+#line 8801 "LibraryWindow.c"
 	}
 	goto __finally44;
 	__catch44_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 8813 "LibraryWindow.c"
+#line 8815 "LibraryWindow.c"
 	}
 	__finally44:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 8824 "LibraryWindow.c"
+#line 8826 "LibraryWindow.c"
 	}
 }
 
 
 void library_window_mounted_camera_shell_notification (LibraryWindow* self, const gchar* uri, gboolean at_startup) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 	GFile* uri_file = NULL;
-	const gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
+	const gchar* _tmp4_;
+	GFile* _tmp5_;
 	GMount* mount = NULL;
 	gchar* alt_uri = NULL;
-	const gchar* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	gboolean _tmp18_ = FALSE;
+	const gchar* _tmp12_;
+	gboolean _tmp13_;
+	gboolean _tmp18_;
 	GError * _inner_error_ = NULL;
 #line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
@@ -8853,15 +8855,15 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 	_tmp2_ = library_window_is_mount_uri_supported (_tmp1_);
 #line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp2_) {
-#line 8856 "LibraryWindow.c"
-		const gchar* _tmp3_ = NULL;
+#line 8858 "LibraryWindow.c"
+		const gchar* _tmp3_;
 #line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = uri;
 #line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_debug ("LibraryWindow.vala:1404: Unsupported mount scheme: %s", _tmp3_);
 #line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8864 "LibraryWindow.c"
+#line 8866 "LibraryWindow.c"
 	}
 #line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = uri;
@@ -8871,12 +8873,12 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 	uri_file = _tmp5_;
 #line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mount = NULL;
-#line 8874 "LibraryWindow.c"
+#line 8876 "LibraryWindow.c"
 	{
 		GMount* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
-		GMount* _tmp8_ = NULL;
-		GMount* _tmp9_ = NULL;
+		GFile* _tmp7_;
+		GMount* _tmp8_;
+		GMount* _tmp9_;
 #line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = uri_file;
 #line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8885,7 +8887,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 		_tmp6_ = _tmp8_;
 #line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8888 "LibraryWindow.c"
+#line 8890 "LibraryWindow.c"
 			goto __catch43_g_error;
 		}
 #line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8898,14 +8900,14 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 		mount = _tmp9_;
 #line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 8901 "LibraryWindow.c"
+#line 8903 "LibraryWindow.c"
 	}
 	goto __finally43;
 	__catch43_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
+		GError* _tmp10_;
+		const gchar* _tmp11_;
 #line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		err = _inner_error_;
 #line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8924,7 +8926,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 		_g_object_unref0 (uri_file);
 #line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8927 "LibraryWindow.c"
+#line 8929 "LibraryWindow.c"
 	}
 	__finally43:
 #line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8939,7 +8941,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 		g_clear_error (&_inner_error_);
 #line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8942 "LibraryWindow.c"
+#line 8944 "LibraryWindow.c"
 	}
 #line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	alt_uri = NULL;
@@ -8949,11 +8951,11 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 	_tmp13_ = g_str_has_prefix (_tmp12_, "file://");
 #line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 8952 "LibraryWindow.c"
-		const gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
+#line 8954 "LibraryWindow.c"
+		const gchar* _tmp14_;
+		gchar* _tmp15_;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
 #line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = uri;
 #line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8968,33 +8970,33 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 		alt_uri = _tmp17_;
 #line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (_tmp16_);
-#line 8971 "LibraryWindow.c"
+#line 8973 "LibraryWindow.c"
 	}
 #line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = at_startup;
 #line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp18_) {
-#line 8977 "LibraryWindow.c"
-		const gchar* _tmp19_ = NULL;
-		gboolean _tmp20_ = FALSE;
-		const gchar* _tmp23_ = NULL;
-		gboolean _tmp24_ = FALSE;
+#line 8979 "LibraryWindow.c"
+		const gchar* _tmp19_;
+		gboolean _tmp20_;
+		const gchar* _tmp23_;
+		gboolean _tmp24_;
 #line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = uri;
 #line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = is_string_empty (_tmp19_);
 #line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp20_) {
-#line 8988 "LibraryWindow.c"
-			GeeHashSet* _tmp21_ = NULL;
-			const gchar* _tmp22_ = NULL;
+#line 8990 "LibraryWindow.c"
+			GeeHashSet* _tmp21_;
+			const gchar* _tmp22_;
 #line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = library_window_initial_camera_uris;
 #line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = uri;
 #line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
-#line 8997 "LibraryWindow.c"
+#line 8999 "LibraryWindow.c"
 		}
 #line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = alt_uri;
@@ -9002,16 +9004,16 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 		_tmp24_ = is_string_empty (_tmp23_);
 #line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp24_) {
-#line 9005 "LibraryWindow.c"
-			GeeHashSet* _tmp25_ = NULL;
-			const gchar* _tmp26_ = NULL;
+#line 9007 "LibraryWindow.c"
+			GeeHashSet* _tmp25_;
+			const gchar* _tmp26_;
 #line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp25_ = library_window_initial_camera_uris;
 #line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp26_ = alt_uri;
 #line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_);
-#line 9014 "LibraryWindow.c"
+#line 9016 "LibraryWindow.c"
 		}
 	}
 #line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9020,7 +9022,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 	_g_object_unref0 (mount);
 #line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (uri_file);
-#line 9023 "LibraryWindow.c"
+#line 9025 "LibraryWindow.c"
 }
 
 
@@ -9029,14 +9031,14 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	SidebarTree* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	GdkEventKey* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
-	GdkEventKey* _tmp13_ = NULL;
-	guint _tmp14_ = 0U;
-	const gchar* _tmp15_ = NULL;
+	SidebarTree* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	GdkEventKey* _tmp11_;
+	gboolean _tmp12_;
+	GdkEventKey* _tmp13_;
+	guint _tmp14_;
+	const gchar* _tmp15_;
 #line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9049,10 +9051,10 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
 	_tmp4_ = _tmp3_;
 #line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 9052 "LibraryWindow.c"
-		SidebarTree* _tmp5_ = NULL;
-		GdkEventKey* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+#line 9054 "LibraryWindow.c"
+		SidebarTree* _tmp5_;
+		GdkEventKey* _tmp6_;
+		gboolean _tmp7_;
 #line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = self->priv->sidebar_tree;
 #line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9061,17 +9063,17 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
 		_tmp7_ = sidebar_tree_is_keypress_interpreted (_tmp5_, _tmp6_);
 #line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = _tmp7_;
-#line 9064 "LibraryWindow.c"
+#line 9066 "LibraryWindow.c"
 	} else {
 #line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = FALSE;
-#line 9068 "LibraryWindow.c"
+#line 9070 "LibraryWindow.c"
 	}
 #line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp1_) {
-#line 9072 "LibraryWindow.c"
-		SidebarTree* _tmp8_ = NULL;
-		GdkEventKey* _tmp9_ = NULL;
+#line 9074 "LibraryWindow.c"
+		SidebarTree* _tmp8_;
+		GdkEventKey* _tmp9_;
 		gboolean _tmp10_ = FALSE;
 #line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = self->priv->sidebar_tree;
@@ -9081,11 +9083,11 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp9_, &_tmp10_);
 #line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp10_;
-#line 9084 "LibraryWindow.c"
+#line 9086 "LibraryWindow.c"
 	} else {
 #line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 9088 "LibraryWindow.c"
+#line 9090 "LibraryWindow.c"
 	}
 #line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
@@ -9093,7 +9095,7 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
 		result = TRUE;
 #line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 9096 "LibraryWindow.c"
+#line 9098 "LibraryWindow.c"
 	}
 #line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = event;
@@ -9105,7 +9107,7 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
 		result = TRUE;
 #line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 9108 "LibraryWindow.c"
+#line 9110 "LibraryWindow.c"
 	}
 #line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = event;
@@ -9121,20 +9123,20 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
 		result = TRUE;
 #line 1447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 9124 "LibraryWindow.c"
+#line 9126 "LibraryWindow.c"
 	}
 #line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
 #line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 9130 "LibraryWindow.c"
+#line 9132 "LibraryWindow.c"
 }
 
 
 gint library_window_get_PAGE_MIN_WIDTH (void) {
 	gint result;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 12 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = thumbnail_get_MAX_SCALE ();
 #line 12 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9143,25 +9145,25 @@ gint library_window_get_PAGE_MIN_WIDTH (void) {
 	result = _tmp1_ + (CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING * 2);
 #line 12 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 9146 "LibraryWindow.c"
+#line 9148 "LibraryWindow.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 9153 "LibraryWindow.c"
+#line 9155 "LibraryWindow.c"
 }
 
 
 static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_construct (GType object_type, CollectionPage* collection, Photo* start, ViewCollection* view) {
 	LibraryWindowFullscreenPhotoPage * self = NULL;
-	CollectionPage* _tmp0_ = NULL;
-	CollectionPage* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
+	CollectionPage* _tmp0_;
+	CollectionPage* _tmp1_;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
 #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (collection), NULL);
 #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9196,22 +9198,22 @@ static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_co
 	self->priv->view = _tmp5_;
 #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self;
-#line 9199 "LibraryWindow.c"
+#line 9201 "LibraryWindow.c"
 }
 
 
 static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_new (CollectionPage* collection, Photo* start, ViewCollection* view) {
 #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return library_window_fullscreen_photo_page_construct (LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, collection, start, view);
-#line 9206 "LibraryWindow.c"
+#line 9208 "LibraryWindow.c"
 }
 
 
 static void library_window_fullscreen_photo_page_real_switched_to (Page* base) {
 	LibraryWindowFullscreenPhotoPage * self;
-	CollectionPage* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
+	CollectionPage* _tmp0_;
+	Photo* _tmp1_;
+	ViewCollection* _tmp2_;
 #line 81 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
 #line 82 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9224,7 +9226,7 @@ static void library_window_fullscreen_photo_page_real_switched_to (Page* base) {
 	library_photo_page_display_for_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), _tmp0_, _tmp1_, _tmp2_);
 #line 84 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	PAGE_CLASS (library_window_fullscreen_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), TYPE_PAGE, Page));
-#line 9227 "LibraryWindow.c"
+#line 9229 "LibraryWindow.c"
 }
 
 
@@ -9232,13 +9234,13 @@ static void library_window_fullscreen_photo_page_real_switching_from (Page* base
 	LibraryWindowFullscreenPhotoPage * self;
 #line 87 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
-#line 9235 "LibraryWindow.c"
+#line 9237 "LibraryWindow.c"
 }
 
 
 static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	LibraryWindowFullscreenPhotoPage * self;
-	GeeList* _tmp0_ = NULL;
+	GeeList* _tmp0_;
 #line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
 #line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9247,7 +9249,7 @@ static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames
 	_tmp0_ = ui_filenames;
 #line 93 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui");
-#line 9250 "LibraryWindow.c"
+#line 9252 "LibraryWindow.c"
 }
 
 
@@ -9257,25 +9259,25 @@ static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullsc
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_type_class_add_private (klass, sizeof (LibraryWindowFullscreenPhotoPagePrivate));
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((PageClass *) klass)->switched_to = (void (*)(Page*)) library_window_fullscreen_photo_page_real_switched_to;
+	((PageClass *) klass)->switched_to = (void (*) (Page *)) library_window_fullscreen_photo_page_real_switched_to;
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((PageClass *) klass)->switching_from = (void (*)(Page*)) library_window_fullscreen_photo_page_real_switching_from;
+	((PageClass *) klass)->switching_from = (void (*) (Page *)) library_window_fullscreen_photo_page_real_switching_from;
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) library_window_fullscreen_photo_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) library_window_fullscreen_photo_page_real_init_collect_ui_filenames;
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_window_fullscreen_photo_page_finalize;
-#line 9267 "LibraryWindow.c"
+#line 9269 "LibraryWindow.c"
 }
 
 
 static void library_window_fullscreen_photo_page_instance_init (LibraryWindowFullscreenPhotoPage * self) {
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv = LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_GET_PRIVATE (self);
-#line 9274 "LibraryWindow.c"
+#line 9276 "LibraryWindow.c"
 }
 
 
-static void library_window_fullscreen_photo_page_finalize (GObject* obj) {
+static void library_window_fullscreen_photo_page_finalize (GObject * obj) {
 	LibraryWindowFullscreenPhotoPage * self;
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
@@ -9287,7 +9289,7 @@ static void library_window_fullscreen_photo_page_finalize (GObject* obj) {
 	_data_collection_unref0 (self->priv->view);
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (library_window_fullscreen_photo_page_parent_class)->finalize (obj);
-#line 9290 "LibraryWindow.c"
+#line 9292 "LibraryWindow.c"
 }
 
 
@@ -9304,35 +9306,35 @@ static GType library_window_fullscreen_photo_page_get_type (void) {
 
 
 static void library_window_class_init (LibraryWindowClass * klass) {
-	GeeHashSet* _tmp0_ = NULL;
+	GeeHashSet* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_type_class_add_private (klass, sizeof (LibraryWindowPrivate));
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->add_actions = (void (*)(AppWindow*)) library_window_real_add_actions;
+	((AppWindowClass *) klass)->add_actions = (void (*) (AppWindow *)) library_window_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((PageWindowClass *) klass)->switched_pages = (void (*)(PageWindow*, Page*, Page*)) library_window_real_switched_pages;
+	((PageWindowClass *) klass)->switched_pages = (void (*) (PageWindow *, Page*, Page*)) library_window_real_switched_pages;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((GtkWidgetClass *) klass)->show_all = (void (*)(GtkWidget*)) library_window_real_show_all;
+	((GtkWidgetClass *) klass)->show_all = (void (*) (GtkWidget *)) library_window_real_show_all;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->get_app_role = (gchar* (*)(AppWindow*)) library_window_real_get_app_role;
+	((AppWindowClass *) klass)->get_app_role = (gchar* (*) (AppWindow *)) library_window_real_get_app_role;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->on_quit = (void (*)(AppWindow*)) library_window_real_on_quit;
+	((AppWindowClass *) klass)->on_quit = (void (*) (AppWindow *)) library_window_real_on_quit;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->on_fullscreen = (void (*)(AppWindow*)) library_window_real_on_fullscreen;
+	((AppWindowClass *) klass)->on_fullscreen = (void (*) (AppWindow *)) library_window_real_on_fullscreen;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->update_common_action_availability = (void (*)(AppWindow*, Page*, Page*)) library_window_real_update_common_action_availability;
+	((AppWindowClass *) klass)->update_common_action_availability = (void (*) (AppWindow *, Page*, Page*)) library_window_real_update_common_action_availability;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->update_common_actions = (void (*)(AppWindow*, Page*, gint, gint)) library_window_real_update_common_actions;
+	((AppWindowClass *) klass)->update_common_actions = (void (*) (AppWindow *, Page*, gint, gint)) library_window_real_update_common_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((GtkWidgetClass *) klass)->drag_motion = (gboolean (*)(GtkWidget*, GdkDragContext*, gint, gint, guint)) library_window_real_drag_motion;
+	((GtkWidgetClass *) klass)->drag_motion = (gboolean (*) (GtkWidget *, GdkDragContext*, gint, gint, guint)) library_window_real_drag_motion;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((GtkWidgetClass *) klass)->drag_data_received = (void (*)(GtkWidget*, GdkDragContext*, gint, gint, GtkSelectionData*, guint, guint)) library_window_real_drag_data_received;
+	((GtkWidgetClass *) klass)->drag_data_received = (void (*) (GtkWidget *, GdkDragContext*, gint, gint, GtkSelectionData*, guint, guint)) library_window_real_drag_data_received;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((PageWindowClass *) klass)->set_current_page = (void (*)(PageWindow*, Page*)) library_window_real_set_current_page;
+	((PageWindowClass *) klass)->set_current_page = (void (*) (PageWindow *, Page*)) library_window_real_set_current_page;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) library_window_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) library_window_real_key_press_event;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_library_window_get_property;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9341,31 +9343,31 @@ static void library_window_class_init (LibraryWindowClass * klass) {
 	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_initial_camera_uris = _tmp0_;
-#line 9344 "LibraryWindow.c"
+#line 9346 "LibraryWindow.c"
 }
 
 
 static void library_window_instance_init (LibraryWindow * self) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	GtkPaned* _tmp2_ = NULL;
-	GtkPaned* _tmp3_ = NULL;
-	GtkFrame* _tmp4_ = NULL;
-	LibraryBranch* _tmp5_ = NULL;
-	TagsBranch* _tmp6_ = NULL;
-	FoldersBranch* _tmp7_ = NULL;
-	EventsBranch* _tmp8_ = NULL;
-	CameraBranch* _tmp9_ = NULL;
-	SearchesBranch* _tmp10_ = NULL;
-	GeeHashMap* _tmp11_ = NULL;
-	SearchFilterActions* _tmp12_ = NULL;
-	GtkBox* _tmp13_ = NULL;
-	GtkFrame* _tmp14_ = NULL;
-	GtkProgressBar* _tmp15_ = NULL;
-	BasicProperties* _tmp16_ = NULL;
-	GtkStack* _tmp17_ = NULL;
-	GtkBox* _tmp18_ = NULL;
-	GtkRevealer* _tmp19_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	GtkPaned* _tmp2_;
+	GtkPaned* _tmp3_;
+	GtkFrame* _tmp4_;
+	LibraryBranch* _tmp5_;
+	TagsBranch* _tmp6_;
+	FoldersBranch* _tmp7_;
+	EventsBranch* _tmp8_;
+	CameraBranch* _tmp9_;
+	SearchesBranch* _tmp10_;
+	GeeHashMap* _tmp11_;
+	SearchFilterActions* _tmp12_;
+	GtkBox* _tmp13_;
+	GtkFrame* _tmp14_;
+	GtkProgressBar* _tmp15_;
+	BasicProperties* _tmp16_;
+	GtkStack* _tmp17_;
+	GtkBox* _tmp18_;
+	GtkRevealer* _tmp19_;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv = LIBRARY_WINDOW_GET_PRIVATE (self);
 #line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9482,44 +9484,44 @@ static void library_window_instance_init (LibraryWindow * self) {
 	self->priv->current_progress_priority = 0;
 #line 145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_pulse_id = (guint) 0;
-#line 9485 "LibraryWindow.c"
+#line 9487 "LibraryWindow.c"
 }
 
 
-static void library_window_finalize (GObject* obj) {
+static void library_window_finalize (GObject * obj) {
 	LibraryWindow * self;
-	SidebarTree* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	SidebarTree* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	SidebarTree* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	SidebarTree* _tmp6_ = NULL;
-	guint _tmp7_ = 0U;
-	Page* _tmp8_ = NULL;
-	Page* _tmp9_ = NULL;
-	ExtendedPropertiesWindow* _tmp10_ = NULL;
-	guint _tmp11_ = 0U;
-	ExtendedPropertiesWindow* _tmp12_ = NULL;
-	guint _tmp13_ = 0U;
-	MetadataWriter* _tmp28_ = NULL;
-	MetadataWriter* _tmp29_ = NULL;
-	guint _tmp30_ = 0U;
+	SidebarTree* _tmp0_;
+	guint _tmp1_;
+	SidebarTree* _tmp2_;
+	guint _tmp3_;
+	SidebarTree* _tmp4_;
+	guint _tmp5_;
+	SidebarTree* _tmp6_;
+	guint _tmp7_;
+	Page* _tmp8_;
+	Page* _tmp9_;
+	ExtendedPropertiesWindow* _tmp10_;
+	guint _tmp11_;
+	ExtendedPropertiesWindow* _tmp12_;
+	guint _tmp13_;
+	MetadataWriter* _tmp28_;
+	MetadataWriter* _tmp29_;
+	guint _tmp30_;
 	LibraryMonitor* monitor = NULL;
-	LibraryMonitorPool* _tmp31_ = NULL;
-	LibraryMonitorPool* _tmp32_ = NULL;
-	LibraryMonitor* _tmp33_ = NULL;
-	LibraryMonitor* _tmp34_ = NULL;
-	LibraryMonitor* _tmp35_ = NULL;
-	LibraryMonitorPool* _tmp37_ = NULL;
-	LibraryMonitorPool* _tmp38_ = NULL;
-	guint _tmp39_ = 0U;
-	LibraryMonitorPool* _tmp40_ = NULL;
-	LibraryMonitorPool* _tmp41_ = NULL;
-	guint _tmp42_ = 0U;
-	CameraTable* _tmp43_ = NULL;
-	CameraTable* _tmp44_ = NULL;
-	guint _tmp45_ = 0U;
+	LibraryMonitorPool* _tmp31_;
+	LibraryMonitorPool* _tmp32_;
+	LibraryMonitor* _tmp33_;
+	LibraryMonitor* _tmp34_;
+	LibraryMonitor* _tmp35_;
+	LibraryMonitorPool* _tmp37_;
+	LibraryMonitorPool* _tmp38_;
+	guint _tmp39_;
+	LibraryMonitorPool* _tmp40_;
+	LibraryMonitorPool* _tmp41_;
+	guint _tmp42_;
+	CameraTable* _tmp43_;
+	CameraTable* _tmp44_;
+	guint _tmp45_;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9566,15 +9568,15 @@ static void library_window_finalize (GObject* obj) {
 	g_signal_parse_name ("show", gtk_widget_get_type (), &_tmp13_, NULL, FALSE);
 #line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _library_window_show_extended_properties_gtk_widget_show, self);
-#line 9569 "LibraryWindow.c"
+#line 9571 "LibraryWindow.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
-		MediaCollectionRegistry* _tmp14_ = NULL;
-		MediaCollectionRegistry* _tmp15_ = NULL;
-		GeeCollection* _tmp16_ = NULL;
-		GeeCollection* _tmp17_ = NULL;
-		GeeIterator* _tmp18_ = NULL;
-		GeeIterator* _tmp19_ = NULL;
+		MediaCollectionRegistry* _tmp14_;
+		MediaCollectionRegistry* _tmp15_;
+		GeeCollection* _tmp16_;
+		GeeCollection* _tmp17_;
+		GeeIterator* _tmp18_;
+		GeeIterator* _tmp19_;
 #line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = media_collection_registry_get_instance ();
 #line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9595,16 +9597,16 @@ static void library_window_finalize (GObject* obj) {
 		_media_sources_it = _tmp19_;
 #line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		while (TRUE) {
-#line 9598 "LibraryWindow.c"
-			GeeIterator* _tmp20_ = NULL;
-			gboolean _tmp21_ = FALSE;
+#line 9600 "LibraryWindow.c"
+			GeeIterator* _tmp20_;
+			gboolean _tmp21_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp22_ = NULL;
-			gpointer _tmp23_ = NULL;
-			MediaSourceCollection* _tmp24_ = NULL;
-			guint _tmp25_ = 0U;
-			MediaSourceCollection* _tmp26_ = NULL;
-			guint _tmp27_ = 0U;
+			GeeIterator* _tmp22_;
+			gpointer _tmp23_;
+			MediaSourceCollection* _tmp24_;
+			guint _tmp25_;
+			MediaSourceCollection* _tmp26_;
+			guint _tmp27_;
 #line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = _media_sources_it;
 #line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9613,7 +9615,7 @@ static void library_window_finalize (GObject* obj) {
 			if (!_tmp21_) {
 #line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 9616 "LibraryWindow.c"
+#line 9618 "LibraryWindow.c"
 			}
 #line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = _media_sources_it;
@@ -9635,11 +9637,11 @@ static void library_window_finalize (GObject* obj) {
 			g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp27_, 0, NULL, (GCallback) _library_window_on_media_altered_data_collection_items_altered, self);
 #line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (media_sources);
-#line 9638 "LibraryWindow.c"
+#line 9640 "LibraryWindow.c"
 		}
 #line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 9642 "LibraryWindow.c"
+#line 9644 "LibraryWindow.c"
 	}
 #line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = metadata_writer_get_instance ();
@@ -9667,13 +9669,13 @@ static void library_window_finalize (GObject* obj) {
 	_tmp35_ = monitor;
 #line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp35_ != NULL) {
-#line 9670 "LibraryWindow.c"
-		LibraryMonitor* _tmp36_ = NULL;
+#line 9672 "LibraryWindow.c"
+		LibraryMonitor* _tmp36_;
 #line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = monitor;
 #line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_library_monitor_destroyed (self, _tmp36_);
-#line 9676 "LibraryWindow.c"
+#line 9678 "LibraryWindow.c"
 	}
 #line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp37_ = library_monitor_pool_get_instance ();
@@ -9759,7 +9761,7 @@ static void library_window_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->toolbar_revealer);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (library_window_parent_class)->finalize (obj);
-#line 9762 "LibraryWindow.c"
+#line 9764 "LibraryWindow.c"
 }
 
 
@@ -9780,13 +9782,13 @@ static void _vala_library_window_get_property (GObject * object, guint property_
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	switch (property_id) {
-#line 9783 "LibraryWindow.c"
+#line 9785 "LibraryWindow.c"
 		default:
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		break;
-#line 9789 "LibraryWindow.c"
+#line 9791 "LibraryWindow.c"
 	}
 }
 
diff --git a/src/library/OfflinePage.c b/src/library/OfflinePage.c
index f789adf..b3a06a0 100644
--- a/src/library/OfflinePage.c
+++ b/src/library/OfflinePage.c
@@ -1,4 +1,4 @@
-/* OfflinePage.c generated by valac 0.34.7, the Vala compiler
+/* OfflinePage.c generated by valac 0.36.6, the Vala compiler
  * generated from OfflinePage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -857,7 +857,7 @@ enum  {
 static guint offline_page_offline_search_view_filter_real_get_criteria (SearchViewFilter* base);
 GType search_filter_criteria_get_type (void) G_GNUC_CONST;
 DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type);
-static void offline_page_finalize (GObject* obj);
+static void offline_page_finalize (GObject * obj);
 
 static const GActionEntry OFFLINE_PAGE_entries[1] = {{"RemoveFromLibrary", _offline_page_on_remove_from_library_gsimple_action_activate_callback}};
 
@@ -877,17 +877,17 @@ static void _offline_page_on_remove_from_library_gsimple_action_activate_callbac
 
 OfflinePage* offline_page_construct (GType object_type) {
 	OfflinePage * self = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	MediaViewTracker* _tmp2_ = NULL;
-	LibraryPhotoSourceCollection* _tmp3_ = NULL;
-	VideoSourceCollection* _tmp4_ = NULL;
-	LibraryPhotoSourceCollection* _tmp5_ = NULL;
-	GeeCollection* _tmp6_ = NULL;
-	GeeCollection* _tmp7_ = NULL;
-	VideoSourceCollection* _tmp8_ = NULL;
-	GeeCollection* _tmp9_ = NULL;
-	GeeCollection* _tmp10_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	MediaViewTracker* _tmp2_;
+	LibraryPhotoSourceCollection* _tmp3_;
+	VideoSourceCollection* _tmp4_;
+	LibraryPhotoSourceCollection* _tmp5_;
+	GeeCollection* _tmp6_;
+	GeeCollection* _tmp7_;
+	VideoSourceCollection* _tmp8_;
+	GeeCollection* _tmp9_;
+	GeeCollection* _tmp10_;
 #line 29 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = (OfflinePage*) checkerboard_page_construct (object_type, OFFLINE_PAGE_NAME);
 #line 31 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -949,8 +949,8 @@ OfflinePage* offline_page_new (void) {
 
 static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	OfflinePage * self;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
 #line 49 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 49 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -969,8 +969,8 @@ static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui
 
 static void offline_page_real_add_actions (Page* base, GActionMap* map) {
 	OfflinePage * self;
-	GActionMap* _tmp0_ = NULL;
-	GActionMap* _tmp1_ = NULL;
+	GActionMap* _tmp0_;
+	GActionMap* _tmp1_;
 #line 59 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 59 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -989,7 +989,7 @@ static void offline_page_real_add_actions (Page* base, GActionMap* map) {
 
 static void offline_page_real_remove_actions (Page* base, GActionMap* map) {
 	OfflinePage * self;
-	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp0_;
 #line 65 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 65 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1016,9 +1016,9 @@ static void offline_page_real_remove_actions (Page* base, GActionMap* map) {
 			entry = entry_collection[entry_it];
 #line 1018 "OfflinePage.c"
 			{
-				GActionMap* _tmp1_ = NULL;
-				GActionEntry _tmp2_ = {0};
-				const gchar* _tmp3_ = NULL;
+				GActionMap* _tmp1_;
+				GActionEntry _tmp2_;
+				const gchar* _tmp3_;
 #line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp1_ = map;
 #line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1044,8 +1044,8 @@ static gpointer _core_tracker_ref0 (gpointer self) {
 static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* base) {
 	OfflinePage * self;
 	CoreViewTracker* result = NULL;
-	MediaViewTracker* _tmp0_ = NULL;
-	CoreViewTracker* _tmp1_ = NULL;
+	MediaViewTracker* _tmp0_;
+	CoreViewTracker* _tmp1_;
 #line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1062,9 +1062,9 @@ static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* ba
 
 static void offline_page_real_update_actions (Page* base, gint selected_count, gint count) {
 	OfflinePage * self;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 76 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1082,8 +1082,8 @@ static void offline_page_real_update_actions (Page* base, gint selected_count, g
 
 
 static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeCollection* added, GeeCollection* removed) {
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp12_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp12_;
 #line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail (IS_OFFLINE_PAGE (self));
 #line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1097,8 +1097,8 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 #line 1098 "OfflinePage.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp1_ = NULL;
-			GeeIterator* _tmp2_ = NULL;
+			GeeCollection* _tmp1_;
+			GeeIterator* _tmp2_;
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_tmp1_ = added;
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1108,16 +1108,16 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			while (TRUE) {
 #line 1111 "OfflinePage.c"
-				GeeIterator* _tmp3_ = NULL;
-				gboolean _tmp4_ = FALSE;
+				GeeIterator* _tmp3_;
+				gboolean _tmp4_;
 				MediaSource* source = NULL;
-				GeeIterator* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
-				ViewCollection* _tmp7_ = NULL;
-				ViewCollection* _tmp8_ = NULL;
-				MediaSource* _tmp9_ = NULL;
-				OfflinePageOfflineView* _tmp10_ = NULL;
-				OfflinePageOfflineView* _tmp11_ = NULL;
+				GeeIterator* _tmp5_;
+				gpointer _tmp6_;
+				ViewCollection* _tmp7_;
+				ViewCollection* _tmp8_;
+				MediaSource* _tmp9_;
+				OfflinePageOfflineView* _tmp10_;
+				OfflinePageOfflineView* _tmp11_;
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp3_ = _source_it;
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1165,13 +1165,13 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 	if (_tmp12_ != NULL) {
 #line 1167 "OfflinePage.c"
 		Marker* marker = NULL;
-		ViewCollection* _tmp13_ = NULL;
-		ViewCollection* _tmp14_ = NULL;
-		Marker* _tmp15_ = NULL;
-		Marker* _tmp16_ = NULL;
-		ViewCollection* _tmp29_ = NULL;
-		ViewCollection* _tmp30_ = NULL;
-		Marker* _tmp31_ = NULL;
+		ViewCollection* _tmp13_;
+		ViewCollection* _tmp14_;
+		Marker* _tmp15_;
+		Marker* _tmp16_;
+		ViewCollection* _tmp29_;
+		ViewCollection* _tmp30_;
+		Marker* _tmp31_;
 #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1187,8 +1187,8 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 #line 1188 "OfflinePage.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp17_ = NULL;
-			GeeIterator* _tmp18_ = NULL;
+			GeeCollection* _tmp17_;
+			GeeIterator* _tmp18_;
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_tmp17_ = removed;
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1198,17 +1198,17 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			while (TRUE) {
 #line 1201 "OfflinePage.c"
-				GeeIterator* _tmp19_ = NULL;
-				gboolean _tmp20_ = FALSE;
+				GeeIterator* _tmp19_;
+				gboolean _tmp20_;
 				MediaSource* source = NULL;
-				GeeIterator* _tmp21_ = NULL;
-				gpointer _tmp22_ = NULL;
-				Marker* _tmp23_ = NULL;
-				ViewCollection* _tmp24_ = NULL;
-				ViewCollection* _tmp25_ = NULL;
-				MediaSource* _tmp26_ = NULL;
-				DataView* _tmp27_ = NULL;
-				DataView* _tmp28_ = NULL;
+				GeeIterator* _tmp21_;
+				gpointer _tmp22_;
+				Marker* _tmp23_;
+				ViewCollection* _tmp24_;
+				ViewCollection* _tmp25_;
+				MediaSource* _tmp26_;
+				DataView* _tmp27_;
+				DataView* _tmp28_;
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp19_ = _source_it;
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1279,37 +1279,37 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin
 
 static void offline_page_on_remove_from_library (OfflinePage* self) {
 	GeeCollection* sources = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	AppWindow* _tmp7_ = NULL;
-	AppWindow* _tmp8_ = NULL;
-	GeeCollection* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	gboolean _tmp12_ = FALSE;
-	gboolean _tmp13_ = FALSE;
-	AppWindow* _tmp14_ = NULL;
-	AppWindow* _tmp15_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	GeeList* _tmp2_;
+	GeeCollection* _tmp3_;
+	GeeCollection* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	AppWindow* _tmp7_;
+	AppWindow* _tmp8_;
+	GeeCollection* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	gboolean _tmp12_;
+	gboolean _tmp13_;
+	AppWindow* _tmp14_;
+	AppWindow* _tmp15_;
 	ProgressDialog* progress = NULL;
-	GeeCollection* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
+	GeeCollection* _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
 	GeeArrayList* photos = NULL;
-	GeeArrayList* _tmp23_ = NULL;
+	GeeArrayList* _tmp22_;
 	GeeArrayList* videos = NULL;
-	GeeArrayList* _tmp24_ = NULL;
-	GeeCollection* _tmp25_ = NULL;
-	GeeArrayList* _tmp26_ = NULL;
-	GeeArrayList* _tmp27_ = NULL;
-	ProgressDialog* _tmp28_ = NULL;
-	ProgressDialog* _tmp39_ = NULL;
-	AppWindow* _tmp41_ = NULL;
-	AppWindow* _tmp42_ = NULL;
+	GeeArrayList* _tmp23_;
+	GeeCollection* _tmp24_;
+	GeeArrayList* _tmp25_;
+	GeeArrayList* _tmp26_;
+	ProgressDialog* _tmp27_;
+	ProgressDialog* _tmp38_;
+	AppWindow* _tmp40_;
+	AppWindow* _tmp41_;
 #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail (IS_OFFLINE_PAGE (self));
 #line 98 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1381,111 +1381,108 @@ static void offline_page_on_remove_from_library (OfflinePage* self) {
 #line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	if (_tmp18_ >= 20) {
 #line 1384 "OfflinePage.c"
-		AppWindow* _tmp19_ = NULL;
-		AppWindow* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		ProgressDialog* _tmp22_ = NULL;
+		AppWindow* _tmp19_;
+		AppWindow* _tmp20_;
+		ProgressDialog* _tmp21_;
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp19_ = app_window_get_instance ();
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp20_ = _tmp19_;
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp21_ = _ ("Deleting…");
+		_tmp21_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_window_get_type (), GtkWindow), _ ("Deleting…"), NULL);
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp22_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_window_get_type (), GtkWindow), _tmp21_, NULL);
-#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		g_object_ref_sink (_tmp22_);
+		g_object_ref_sink (_tmp21_);
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (progress);
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		progress = _tmp22_;
+		progress = _tmp21_;
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 1405 "OfflinePage.c"
+#line 1402 "OfflinePage.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp23_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp22_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	photos = _tmp23_;
+	photos = _tmp22_;
 #line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp24_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp23_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	videos = _tmp24_;
+	videos = _tmp23_;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp25_ = sources;
+	_tmp24_ = sources;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp26_ = photos;
+	_tmp25_ = photos;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp27_ = videos;
+	_tmp26_ = videos;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	media_source_collection_filter_media (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
+	media_source_collection_filter_media (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp28_ = progress;
+	_tmp27_ = progress;
 #line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if (_tmp28_ != NULL) {
-#line 1427 "OfflinePage.c"
-		LibraryPhotoSourceCollection* _tmp29_ = NULL;
-		GeeArrayList* _tmp30_ = NULL;
-		ProgressDialog* _tmp31_ = NULL;
-		VideoSourceCollection* _tmp32_ = NULL;
-		GeeArrayList* _tmp33_ = NULL;
-		ProgressDialog* _tmp34_ = NULL;
+	if (_tmp27_ != NULL) {
+#line 1424 "OfflinePage.c"
+		LibraryPhotoSourceCollection* _tmp28_;
+		GeeArrayList* _tmp29_;
+		ProgressDialog* _tmp30_;
+		VideoSourceCollection* _tmp31_;
+		GeeArrayList* _tmp32_;
+		ProgressDialog* _tmp33_;
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp29_ = library_photo_global;
+		_tmp28_ = library_photo_global;
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp30_ = photos;
+		_tmp29_ = photos;
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp31_ = progress;
+		_tmp30_ = progress;
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp31_, NULL);
+		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp30_, NULL);
 #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp32_ = video_global;
+		_tmp31_ = video_global;
 #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp33_ = videos;
+		_tmp32_ = videos;
 #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp34_ = progress;
+		_tmp33_ = progress;
 #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp34_, NULL);
-#line 1450 "OfflinePage.c"
+		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp33_, NULL);
+#line 1447 "OfflinePage.c"
 	} else {
-		LibraryPhotoSourceCollection* _tmp35_ = NULL;
-		GeeArrayList* _tmp36_ = NULL;
-		VideoSourceCollection* _tmp37_ = NULL;
-		GeeArrayList* _tmp38_ = NULL;
+		LibraryPhotoSourceCollection* _tmp34_;
+		GeeArrayList* _tmp35_;
+		VideoSourceCollection* _tmp36_;
+		GeeArrayList* _tmp37_;
 #line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp35_ = library_photo_global;
+		_tmp34_ = library_photo_global;
 #line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp36_ = photos;
+		_tmp35_ = photos;
 #line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL);
+		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL);
 #line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp37_ = video_global;
+		_tmp36_ = video_global;
 #line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp38_ = videos;
+		_tmp37_ = videos;
 #line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL);
-#line 1468 "OfflinePage.c"
+		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL);
+#line 1465 "OfflinePage.c"
 	}
 #line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp39_ = progress;
+	_tmp38_ = progress;
 #line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if (_tmp39_ != NULL) {
-#line 1474 "OfflinePage.c"
-		ProgressDialog* _tmp40_ = NULL;
+	if (_tmp38_ != NULL) {
+#line 1471 "OfflinePage.c"
+		ProgressDialog* _tmp39_;
 #line 125 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp40_ = progress;
+		_tmp39_ = progress;
 #line 125 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		progress_dialog_close (_tmp40_);
-#line 1480 "OfflinePage.c"
+		progress_dialog_close (_tmp39_);
+#line 1477 "OfflinePage.c"
 	}
 #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp41_ = app_window_get_instance ();
+	_tmp40_ = app_window_get_instance ();
 #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp42_ = _tmp41_;
+	_tmp41_ = _tmp40_;
 #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PAGE_WINDOW, PageWindow));
+	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_PAGE_WINDOW, PageWindow));
 #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_g_object_unref0 (_tmp42_);
+	_g_object_unref0 (_tmp41_);
 #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (videos);
 #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1494,22 +1491,22 @@ static void offline_page_on_remove_from_library (OfflinePage* self) {
 	_g_object_unref0 (progress);
 #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (sources);
-#line 1498 "OfflinePage.c"
+#line 1495 "OfflinePage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
 #line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 1505 "OfflinePage.c"
+#line 1502 "OfflinePage.c"
 }
 
 
 static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardPage* base) {
 	OfflinePage * self;
 	SearchViewFilter* result = NULL;
-	OfflinePageOfflineSearchViewFilter* _tmp0_ = NULL;
-	SearchViewFilter* _tmp1_ = NULL;
+	OfflinePageOfflineSearchViewFilter* _tmp0_;
+	SearchViewFilter* _tmp1_;
 #line 130 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1520,17 +1517,17 @@ static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardP
 	result = _tmp1_;
 #line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return result;
-#line 1524 "OfflinePage.c"
+#line 1521 "OfflinePage.c"
 }
 
 
 static OfflinePageOfflineView* offline_page_offline_view_construct (GType object_type, MediaSource* source) {
 	OfflinePageOfflineView * self = NULL;
-	MediaSource* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	MediaSource* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	MediaSource* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	MediaSource* _tmp3_;
+	gboolean _tmp4_;
 #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
 #line 12 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1549,21 +1546,21 @@ static OfflinePageOfflineView* offline_page_offline_view_construct (GType object
 	_vala_assert (_tmp4_, "source.is_offline()");
 #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self;
-#line 1553 "OfflinePage.c"
+#line 1550 "OfflinePage.c"
 }
 
 
 static OfflinePageOfflineView* offline_page_offline_view_new (MediaSource* source) {
 #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return offline_page_offline_view_construct (OFFLINE_PAGE_TYPE_OFFLINE_VIEW, source);
-#line 1560 "OfflinePage.c"
+#line 1557 "OfflinePage.c"
 }
 
 
 static void offline_page_offline_view_class_init (OfflinePageOfflineViewClass * klass) {
 #line 10 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	offline_page_offline_view_parent_class = g_type_class_peek_parent (klass);
-#line 1567 "OfflinePage.c"
+#line 1564 "OfflinePage.c"
 }
 
 
@@ -1592,7 +1589,7 @@ static guint offline_page_offline_search_view_filter_real_get_criteria (SearchVi
 	result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH);
 #line 20 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return result;
-#line 1596 "OfflinePage.c"
+#line 1593 "OfflinePage.c"
 }
 
 
@@ -1602,14 +1599,14 @@ static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filt
 	self = (OfflinePageOfflineSearchViewFilter*) default_search_view_filter_construct (object_type);
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self;
-#line 1606 "OfflinePage.c"
+#line 1603 "OfflinePage.c"
 }
 
 
 static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_new (void) {
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return offline_page_offline_search_view_filter_construct (OFFLINE_PAGE_TYPE_OFFLINE_SEARCH_VIEW_FILTER);
-#line 1613 "OfflinePage.c"
+#line 1610 "OfflinePage.c"
 }
 
 
@@ -1617,8 +1614,8 @@ static void offline_page_offline_search_view_filter_class_init (OfflinePageOffli
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	offline_page_offline_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) offline_page_offline_search_view_filter_real_get_criteria;
-#line 1622 "OfflinePage.c"
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) offline_page_offline_search_view_filter_real_get_criteria;
+#line 1619 "OfflinePage.c"
 }
 
 
@@ -1644,41 +1641,41 @@ static void offline_page_class_init (OfflinePageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_type_class_add_private (klass, sizeof (OfflinePagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) offline_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) offline_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) offline_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) offline_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) offline_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) offline_page_real_remove_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*)(CheckerboardPage*)) offline_page_real_get_view_tracker;
+	((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*) (CheckerboardPage *)) offline_page_real_get_view_tracker;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) offline_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) offline_page_real_update_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) offline_page_real_get_search_view_filter;
+	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) offline_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	G_OBJECT_CLASS (klass)->finalize = offline_page_finalize;
-#line 1661 "OfflinePage.c"
+#line 1658 "OfflinePage.c"
 }
 
 
 static void offline_page_instance_init (OfflinePage * self) {
-	OfflinePageOfflineSearchViewFilter* _tmp0_ = NULL;
+	OfflinePageOfflineSearchViewFilter* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self->priv = OFFLINE_PAGE_GET_PRIVATE (self);
 #line 25 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp0_ = offline_page_offline_search_view_filter_new ();
 #line 25 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self->priv->search_filter = _tmp0_;
-#line 1673 "OfflinePage.c"
+#line 1670 "OfflinePage.c"
 }
 
 
-static void offline_page_finalize (GObject* obj) {
+static void offline_page_finalize (GObject * obj) {
 	OfflinePage * self;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	VideoSourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	LibraryPhotoSourceCollection* _tmp0_;
+	guint _tmp1_;
+	VideoSourceCollection* _tmp2_;
+	guint _tmp3_;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 45 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1699,7 +1696,7 @@ static void offline_page_finalize (GObject* obj) {
 	_core_tracker_unref0 (self->priv->tracker);
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	G_OBJECT_CLASS (offline_page_parent_class)->finalize (obj);
-#line 1703 "OfflinePage.c"
+#line 1700 "OfflinePage.c"
 }
 
 
diff --git a/src/library/OfflineSidebarEntry.c b/src/library/OfflineSidebarEntry.c
index 215616d..0be13f0 100644
--- a/src/library/OfflineSidebarEntry.c
+++ b/src/library/OfflineSidebarEntry.c
@@ -1,4 +1,4 @@
-/* OfflineSidebarEntry.c generated by valac 0.34.7, the Vala compiler
+/* OfflineSidebarEntry.c generated by valac 0.36.6, the Vala compiler
  * generated from OfflineSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -328,7 +328,7 @@ OfflinePage* offline_page_new (void);
 OfflinePage* offline_page_construct (GType object_type);
 GType checkerboard_page_get_type (void) G_GNUC_CONST;
 GType offline_page_get_type (void) G_GNUC_CONST;
-static void library_offline_sidebar_entry_finalize (GObject* obj);
+static void library_offline_sidebar_entry_finalize (GObject * obj);
 
 
 static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
@@ -347,18 +347,18 @@ static void _library_offline_sidebar_entry_on_offline_contents_altered_media_sou
 
 LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType object_type) {
 	LibraryOfflineSidebarEntry * self = NULL;
-	gint _tmp11_ = 0;
+	gint _tmp11_;
 #line 8 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	self = (LibraryOfflineSidebarEntry*) library_hideable_page_entry_construct (object_type);
 #line 354 "OfflineSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -380,12 +380,12 @@ LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType objec
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		while (TRUE) {
 #line 383 "OfflineSidebarEntry.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			MediaSourceCollection* _tmp10_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			MediaSourceCollection* _tmp10_;
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -432,7 +432,7 @@ LibraryOfflineSidebarEntry* library_offline_sidebar_entry_new (void) {
 
 
 static void library_offline_sidebar_entry_on_offline_contents_altered (LibraryOfflineSidebarEntry* self) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	g_return_if_fail (LIBRARY_IS_OFFLINE_SIDEBAR_ENTRY (self));
 #line 22 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -453,12 +453,12 @@ static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSideb
 #line 454 "OfflineSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -480,17 +480,17 @@ static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSideb
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		while (TRUE) {
 #line 483 "OfflineSidebarEntry.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			MediaSourceCollection* _tmp11_ = NULL;
-			GeeCollection* _tmp12_ = NULL;
-			GeeCollection* _tmp13_ = NULL;
-			gint _tmp14_ = 0;
-			gint _tmp15_ = 0;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			gint _tmp10_;
+			MediaSourceCollection* _tmp11_;
+			GeeCollection* _tmp12_;
+			GeeCollection* _tmp13_;
+			gint _tmp14_;
+			gint _tmp15_;
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -542,7 +542,7 @@ static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSideb
 static gchar* library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	LibraryOfflineSidebarEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 33 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntry);
 #line 34 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -558,7 +558,7 @@ static gchar* library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimple
 static gchar* library_offline_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
 	LibraryOfflineSidebarEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 37 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntry);
 #line 38 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -574,7 +574,7 @@ static gchar* library_offline_sidebar_entry_real_get_sidebar_icon (SidebarSimple
 static Page* library_offline_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
 	LibraryOfflineSidebarEntry * self;
 	Page* result = NULL;
-	OfflinePage* _tmp0_ = NULL;
+	OfflinePage* _tmp0_;
 #line 41 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntry);
 #line 42 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -593,11 +593,11 @@ static void library_offline_sidebar_entry_class_init (LibraryOfflineSidebarEntry
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	library_offline_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_offline_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_offline_sidebar_entry_real_get_sidebar_name;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_offline_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_offline_sidebar_entry_real_get_sidebar_icon;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_offline_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_offline_sidebar_entry_real_create_page;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_offline_sidebar_entry_finalize;
 #line 604 "OfflineSidebarEntry.c"
@@ -608,19 +608,19 @@ static void library_offline_sidebar_entry_instance_init (LibraryOfflineSidebarEn
 }
 
 
-static void library_offline_sidebar_entry_finalize (GObject* obj) {
+static void library_offline_sidebar_entry_finalize (GObject * obj) {
 	LibraryOfflineSidebarEntry * self;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntry);
 #line 616 "OfflineSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -642,13 +642,13 @@ static void library_offline_sidebar_entry_finalize (GObject* obj) {
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		while (TRUE) {
 #line 645 "OfflineSidebarEntry.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			MediaSourceCollection* _tmp10_ = NULL;
-			guint _tmp11_ = 0U;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			MediaSourceCollection* _tmp10_;
+			guint _tmp11_;
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
diff --git a/src/library/TrashPage.c b/src/library/TrashPage.c
index b323541..98ee9c1 100644
--- a/src/library/TrashPage.c
+++ b/src/library/TrashPage.c
@@ -1,4 +1,4 @@
-/* TrashPage.c generated by valac 0.34.7, the Vala compiler
+/* TrashPage.c generated by valac 0.36.6, the Vala compiler
  * generated from TrashPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -864,7 +864,7 @@ enum  {
 static guint trash_page_trash_search_view_filter_real_get_criteria (SearchViewFilter* base);
 GType search_filter_criteria_get_type (void) G_GNUC_CONST;
 DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type);
-static void trash_page_finalize (GObject* obj);
+static void trash_page_finalize (GObject * obj);
 
 static const GActionEntry TRASH_PAGE_entries[2] = {{"Delete", _trash_page_on_delete_gsimple_action_activate_callback}, {"Restore", _trash_page_on_restore_gsimple_action_activate_callback}};
 
@@ -891,17 +891,17 @@ static void _trash_page_on_trashcan_contents_altered_media_source_collection_tra
 
 TrashPage* trash_page_construct (GType object_type) {
 	TrashPage * self = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	MediaViewTracker* _tmp2_ = NULL;
-	LibraryPhotoSourceCollection* _tmp3_ = NULL;
-	VideoSourceCollection* _tmp4_ = NULL;
-	LibraryPhotoSourceCollection* _tmp5_ = NULL;
-	GeeCollection* _tmp6_ = NULL;
-	GeeCollection* _tmp7_ = NULL;
-	VideoSourceCollection* _tmp8_ = NULL;
-	GeeCollection* _tmp9_ = NULL;
-	GeeCollection* _tmp10_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	MediaViewTracker* _tmp2_;
+	LibraryPhotoSourceCollection* _tmp3_;
+	VideoSourceCollection* _tmp4_;
+	LibraryPhotoSourceCollection* _tmp5_;
+	GeeCollection* _tmp6_;
+	GeeCollection* _tmp7_;
+	VideoSourceCollection* _tmp8_;
+	GeeCollection* _tmp9_;
+	GeeCollection* _tmp10_;
 #line 29 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = (TrashPage*) checkerboard_page_construct (object_type, TRASH_PAGE_NAME);
 #line 31 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -965,8 +965,8 @@ TrashPage* trash_page_new (void) {
 
 static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	TrashPage * self;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
 #line 44 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
 #line 44 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -985,8 +985,8 @@ static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_f
 
 static void trash_page_real_add_actions (Page* base, GActionMap* map) {
 	TrashPage * self;
-	GActionMap* _tmp0_ = NULL;
-	GActionMap* _tmp1_ = NULL;
+	GActionMap* _tmp0_;
+	GActionMap* _tmp1_;
 #line 55 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
 #line 55 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1005,7 +1005,7 @@ static void trash_page_real_add_actions (Page* base, GActionMap* map) {
 
 static void trash_page_real_remove_actions (Page* base, GActionMap* map) {
 	TrashPage * self;
-	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp0_;
 #line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
 #line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1032,9 +1032,9 @@ static void trash_page_real_remove_actions (Page* base, GActionMap* map) {
 			entry = entry_collection[entry_it];
 #line 1034 "TrashPage.c"
 			{
-				GActionMap* _tmp1_ = NULL;
-				GActionEntry _tmp2_ = {0};
-				const gchar* _tmp3_ = NULL;
+				GActionMap* _tmp1_;
+				GActionEntry _tmp2_;
+				const gchar* _tmp3_;
 #line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp1_ = map;
 #line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1060,8 +1060,8 @@ static gpointer _core_tracker_ref0 (gpointer self) {
 static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base) {
 	TrashPage * self;
 	CoreViewTracker* result = NULL;
-	MediaViewTracker* _tmp0_ = NULL;
-	CoreViewTracker* _tmp1_ = NULL;
+	MediaViewTracker* _tmp0_;
+	CoreViewTracker* _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
 #line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1079,9 +1079,9 @@ static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base
 static void trash_page_real_update_actions (Page* base, gint selected_count, gint count) {
 	TrashPage * self;
 	gboolean has_selected = FALSE;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 72 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
 #line 73 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1109,8 +1109,8 @@ static void trash_page_real_update_actions (Page* base, gint selected_count, gin
 
 
 static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollection* added, GeeCollection* removed) {
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp12_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp12_;
 #line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
 #line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1124,8 +1124,8 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 #line 1125 "TrashPage.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp1_ = NULL;
-			GeeIterator* _tmp2_ = NULL;
+			GeeCollection* _tmp1_;
+			GeeIterator* _tmp2_;
 #line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp1_ = added;
 #line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1135,16 +1135,16 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 #line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			while (TRUE) {
 #line 1138 "TrashPage.c"
-				GeeIterator* _tmp3_ = NULL;
-				gboolean _tmp4_ = FALSE;
+				GeeIterator* _tmp3_;
+				gboolean _tmp4_;
 				MediaSource* source = NULL;
-				GeeIterator* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
-				ViewCollection* _tmp7_ = NULL;
-				ViewCollection* _tmp8_ = NULL;
-				MediaSource* _tmp9_ = NULL;
-				TrashPageTrashView* _tmp10_ = NULL;
-				TrashPageTrashView* _tmp11_ = NULL;
+				GeeIterator* _tmp5_;
+				gpointer _tmp6_;
+				ViewCollection* _tmp7_;
+				ViewCollection* _tmp8_;
+				MediaSource* _tmp9_;
+				TrashPageTrashView* _tmp10_;
+				TrashPageTrashView* _tmp11_;
 #line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp3_ = _source_it;
 #line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1192,13 +1192,13 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 	if (_tmp12_ != NULL) {
 #line 1194 "TrashPage.c"
 		Marker* marker = NULL;
-		ViewCollection* _tmp13_ = NULL;
-		ViewCollection* _tmp14_ = NULL;
-		Marker* _tmp15_ = NULL;
-		Marker* _tmp16_ = NULL;
-		ViewCollection* _tmp29_ = NULL;
-		ViewCollection* _tmp30_ = NULL;
-		Marker* _tmp31_ = NULL;
+		ViewCollection* _tmp13_;
+		ViewCollection* _tmp14_;
+		Marker* _tmp15_;
+		Marker* _tmp16_;
+		ViewCollection* _tmp29_;
+		ViewCollection* _tmp30_;
+		Marker* _tmp31_;
 #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1214,8 +1214,8 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 #line 1215 "TrashPage.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp17_ = NULL;
-			GeeIterator* _tmp18_ = NULL;
+			GeeCollection* _tmp17_;
+			GeeIterator* _tmp18_;
 #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp17_ = removed;
 #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1225,17 +1225,17 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			while (TRUE) {
 #line 1228 "TrashPage.c"
-				GeeIterator* _tmp19_ = NULL;
-				gboolean _tmp20_ = FALSE;
+				GeeIterator* _tmp19_;
+				gboolean _tmp20_;
 				MediaSource* source = NULL;
-				GeeIterator* _tmp21_ = NULL;
-				gpointer _tmp22_ = NULL;
-				Marker* _tmp23_ = NULL;
-				ViewCollection* _tmp24_ = NULL;
-				ViewCollection* _tmp25_ = NULL;
-				MediaSource* _tmp26_ = NULL;
-				DataView* _tmp27_ = NULL;
-				DataView* _tmp28_ = NULL;
+				GeeIterator* _tmp21_;
+				gpointer _tmp22_;
+				Marker* _tmp23_;
+				ViewCollection* _tmp24_;
+				ViewCollection* _tmp25_;
+				MediaSource* _tmp26_;
+				DataView* _tmp27_;
+				DataView* _tmp28_;
 #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp19_ = _source_it;
 #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1296,18 +1296,18 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 
 
 static void trash_page_on_restore (TrashPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
-	CommandManager* _tmp4_ = NULL;
-	CommandManager* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	GeeList* _tmp8_ = NULL;
-	GeeCollection* _tmp9_ = NULL;
-	TrashUntrashPhotosCommand* _tmp10_ = NULL;
-	TrashUntrashPhotosCommand* _tmp11_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
+	CommandManager* _tmp4_;
+	CommandManager* _tmp5_;
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
+	GeeList* _tmp8_;
+	GeeCollection* _tmp9_;
+	TrashUntrashPhotosCommand* _tmp10_;
+	TrashUntrashPhotosCommand* _tmp11_;
 #line 99 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
 #line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1359,33 +1359,29 @@ static void trash_page_on_restore (TrashPage* self) {
 static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base) {
 	TrashPage * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
 #line 107 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
 #line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp0_ = _ ("Trash is empty");
-#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (_ ("Trash is empty"));
 #line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1375 "TrashPage.c"
+#line 1372 "TrashPage.c"
 }
 
 
 static void trash_page_on_delete (TrashPage* self) {
 	const gchar* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gboolean _tmp4_ = FALSE;
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	GeeList* _tmp8_ = NULL;
-	GeeCollection* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	gint _tmp3_;
+	gboolean _tmp4_;
+	ViewCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	GeeList* _tmp7_;
+	GeeCollection* _tmp8_;
 #line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
 #line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1402,47 +1398,42 @@ static void trash_page_on_delete (TrashPage* self) {
 	if (_tmp4_) {
 #line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp0_ = "Deleting a Photo";
-#line 1406 "TrashPage.c"
+#line 1402 "TrashPage.c"
 	} else {
-		const gchar* _tmp5_ = NULL;
 #line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		_tmp5_ = _ ("Deleting Photos");
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		_tmp0_ = _tmp5_;
-#line 1413 "TrashPage.c"
+		_tmp0_ = _ ("Deleting Photos");
+#line 1406 "TrashPage.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp8_ = view_collection_get_selected_sources (_tmp7_);
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
+	_tmp7_ = view_collection_get_selected_sources (_tmp6_);
 #line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp10_ = _ ("Delete");
+	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	remove_from_app (_tmp9_, _tmp10_, _tmp0_);
+	remove_from_app (_tmp8_, _ ("Delete"), _tmp0_);
 #line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_g_object_unref0 (_tmp9_);
+	_g_object_unref0 (_tmp8_);
 #line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_data_collection_unref0 (_tmp7_);
-#line 1431 "TrashPage.c"
+	_data_collection_unref0 (_tmp6_);
+#line 1422 "TrashPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
 #line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 1438 "TrashPage.c"
+#line 1429 "TrashPage.c"
 }
 
 
 static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPage* base) {
 	TrashPage * self;
 	SearchViewFilter* result = NULL;
-	TrashPageTrashSearchViewFilter* _tmp0_ = NULL;
-	SearchViewFilter* _tmp1_ = NULL;
+	TrashPageTrashSearchViewFilter* _tmp0_;
+	SearchViewFilter* _tmp1_;
 #line 116 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
 #line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1453,17 +1444,17 @@ static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPag
 	result = _tmp1_;
 #line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1457 "TrashPage.c"
+#line 1448 "TrashPage.c"
 }
 
 
 static TrashPageTrashView* trash_page_trash_view_construct (GType object_type, MediaSource* source) {
 	TrashPageTrashView * self = NULL;
-	MediaSource* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	MediaSource* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	MediaSource* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	MediaSource* _tmp3_;
+	gboolean _tmp4_;
 #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
 #line 12 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1482,21 +1473,21 @@ static TrashPageTrashView* trash_page_trash_view_construct (GType object_type, M
 	_vala_assert (_tmp4_, "source.is_trashed()");
 #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self;
-#line 1486 "TrashPage.c"
+#line 1477 "TrashPage.c"
 }
 
 
 static TrashPageTrashView* trash_page_trash_view_new (MediaSource* source) {
 #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return trash_page_trash_view_construct (TRASH_PAGE_TYPE_TRASH_VIEW, source);
-#line 1493 "TrashPage.c"
+#line 1484 "TrashPage.c"
 }
 
 
 static void trash_page_trash_view_class_init (TrashPageTrashViewClass * klass) {
 #line 10 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	trash_page_trash_view_parent_class = g_type_class_peek_parent (klass);
-#line 1500 "TrashPage.c"
+#line 1491 "TrashPage.c"
 }
 
 
@@ -1525,7 +1516,7 @@ static guint trash_page_trash_search_view_filter_real_get_criteria (SearchViewFi
 	result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH);
 #line 20 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1529 "TrashPage.c"
+#line 1520 "TrashPage.c"
 }
 
 
@@ -1535,14 +1526,14 @@ static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_const
 	self = (TrashPageTrashSearchViewFilter*) default_search_view_filter_construct (object_type);
 #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self;
-#line 1539 "TrashPage.c"
+#line 1530 "TrashPage.c"
 }
 
 
 static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_new (void) {
 #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return trash_page_trash_search_view_filter_construct (TRASH_PAGE_TYPE_TRASH_SEARCH_VIEW_FILTER);
-#line 1546 "TrashPage.c"
+#line 1537 "TrashPage.c"
 }
 
 
@@ -1550,8 +1541,8 @@ static void trash_page_trash_search_view_filter_class_init (TrashPageTrashSearch
 #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	trash_page_trash_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) trash_page_trash_search_view_filter_real_get_criteria;
-#line 1555 "TrashPage.c"
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) trash_page_trash_search_view_filter_real_get_criteria;
+#line 1546 "TrashPage.c"
 }
 
 
@@ -1577,38 +1568,38 @@ static void trash_page_class_init (TrashPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_type_class_add_private (klass, sizeof (TrashPagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) trash_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) trash_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) trash_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) trash_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) trash_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) trash_page_real_remove_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*)(CheckerboardPage*)) trash_page_real_get_view_tracker;
+	((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*) (CheckerboardPage *)) trash_page_real_get_view_tracker;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) trash_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) trash_page_real_update_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*)(CheckerboardPage*)) trash_page_real_get_view_empty_message;
+	((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*) (CheckerboardPage *)) trash_page_real_get_view_empty_message;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) trash_page_real_get_search_view_filter;
+	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) trash_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = trash_page_finalize;
-#line 1596 "TrashPage.c"
+#line 1587 "TrashPage.c"
 }
 
 
 static void trash_page_instance_init (TrashPage * self) {
-	TrashPageTrashSearchViewFilter* _tmp0_ = NULL;
+	TrashPageTrashSearchViewFilter* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self->priv = TRASH_PAGE_GET_PRIVATE (self);
 #line 25 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = trash_page_trash_search_view_filter_new ();
 #line 25 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self->priv->search_filter = _tmp0_;
-#line 1608 "TrashPage.c"
+#line 1599 "TrashPage.c"
 }
 
 
-static void trash_page_finalize (GObject* obj) {
+static void trash_page_finalize (GObject * obj) {
 	TrashPage * self;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TRASH_PAGE, TrashPage);
@@ -1618,7 +1609,7 @@ static void trash_page_finalize (GObject* obj) {
 	_core_tracker_unref0 (self->priv->tracker);
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	G_OBJECT_CLASS (trash_page_parent_class)->finalize (obj);
-#line 1622 "TrashPage.c"
+#line 1613 "TrashPage.c"
 }
 
 
diff --git a/src/library/TrashSidebarEntry.c b/src/library/TrashSidebarEntry.c
index 8e620d7..9b8a030 100644
--- a/src/library/TrashSidebarEntry.c
+++ b/src/library/TrashSidebarEntry.c
@@ -1,4 +1,4 @@
-/* TrashSidebarEntry.c generated by valac 0.34.7, the Vala compiler
+/* TrashSidebarEntry.c generated by valac 0.36.6, the Vala compiler
  * generated from TrashSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -310,7 +310,7 @@ struct _LibraryTrashSidebarEntryClass {
 
 
 static gpointer library_trash_sidebar_entry_parent_class = NULL;
-static SidebarInternalDropTargetEntryIface* library_trash_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = NULL;
+static SidebarInternalDropTargetEntryIface * library_trash_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = NULL;
 
 GType sidebar_tree_get_type (void) G_GNUC_CONST;
 GType sidebar_entry_get_type (void) G_GNUC_CONST;
@@ -382,7 +382,7 @@ TrashPage* trash_page_new (void);
 TrashPage* trash_page_construct (GType object_type);
 GType checkerboard_page_get_type (void) G_GNUC_CONST;
 GType trash_page_get_type (void) G_GNUC_CONST;
-static void library_trash_sidebar_entry_finalize (GObject* obj);
+static void library_trash_sidebar_entry_finalize (GObject * obj);
 
 
 static void _library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
@@ -399,12 +399,12 @@ LibraryTrashSidebarEntry* library_trash_sidebar_entry_construct (GType object_ty
 #line 400 "TrashSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -426,12 +426,12 @@ LibraryTrashSidebarEntry* library_trash_sidebar_entry_construct (GType object_ty
 #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 		while (TRUE) {
 #line 429 "TrashSidebarEntry.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			MediaSourceCollection* _tmp10_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			MediaSourceCollection* _tmp10_;
 #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -484,7 +484,7 @@ void library_trash_sidebar_entry_terminate (void) {
 static gchar* library_trash_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	LibraryTrashSidebarEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 25 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry);
 #line 26 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -500,7 +500,7 @@ static gchar* library_trash_sidebar_entry_real_get_sidebar_name (SidebarSimplePa
 static gchar* library_trash_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
 	LibraryTrashSidebarEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 29 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry);
 #line 30 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -515,15 +515,15 @@ static gchar* library_trash_sidebar_entry_real_get_sidebar_icon (SidebarSimplePa
 
 static gchar* library_trash_sidebar_entry_get_current_icon (void) {
 	gchar* result = NULL;
-	gchar* _tmp13_ = NULL;
+	gchar* _tmp13_;
 	{
 		GeeIterator* _media_sources_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -545,13 +545,13 @@ static gchar* library_trash_sidebar_entry_get_current_icon (void) {
 #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 		while (TRUE) {
 #line 548 "TrashSidebarEntry.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			MediaSourceCollection* _tmp10_ = NULL;
-			gint _tmp11_ = 0;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			MediaSourceCollection* _tmp10_;
+			gint _tmp11_;
 #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -575,7 +575,7 @@ static gchar* library_trash_sidebar_entry_get_current_icon (void) {
 #line 35 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 			if (_tmp11_ > 0) {
 #line 578 "TrashSidebarEntry.c"
-				gchar* _tmp12_ = NULL;
+				gchar* _tmp12_;
 #line 36 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 				_tmp12_ = g_strdup (RESOURCES_ICON_TRASH_FULL);
 #line 36 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -609,11 +609,11 @@ static gchar* library_trash_sidebar_entry_get_current_icon (void) {
 static gboolean library_trash_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) {
 	LibraryTrashSidebarEntry * self;
 	gboolean result = FALSE;
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	TrashUntrashPhotosCommand* _tmp3_ = NULL;
-	TrashUntrashPhotosCommand* _tmp4_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
+	GeeList* _tmp2_;
+	TrashUntrashPhotosCommand* _tmp3_;
+	TrashUntrashPhotosCommand* _tmp4_;
 #line 42 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry);
 #line 42 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -660,7 +660,7 @@ static gboolean library_trash_sidebar_entry_real_internal_drop_received_arbitrar
 static Page* library_trash_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
 	LibraryTrashSidebarEntry * self;
 	Page* result = NULL;
-	TrashPage* _tmp0_ = NULL;
+	TrashPage* _tmp0_;
 #line 52 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry);
 #line 53 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -676,8 +676,8 @@ static Page* library_trash_sidebar_entry_real_create_page (SidebarSimplePageEntr
 
 
 static void library_trash_sidebar_entry_on_trashcan_contents_altered (LibraryTrashSidebarEntry* self) {
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	g_return_if_fail (LIBRARY_IS_TRASH_SIDEBAR_ENTRY (self));
 #line 57 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -696,11 +696,11 @@ static void library_trash_sidebar_entry_class_init (LibraryTrashSidebarEntryClas
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	library_trash_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_trash_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_trash_sidebar_entry_real_get_sidebar_name;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_trash_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_trash_sidebar_entry_real_get_sidebar_icon;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_trash_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_trash_sidebar_entry_real_create_page;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_trash_sidebar_entry_finalize;
 #line 707 "TrashSidebarEntry.c"
@@ -711,9 +711,9 @@ static void library_trash_sidebar_entry_sidebar_internal_drop_target_entry_inter
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	library_trash_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-	iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) library_trash_sidebar_entry_real_internal_drop_received;
+	iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) library_trash_sidebar_entry_real_internal_drop_received;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-	iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) library_trash_sidebar_entry_real_internal_drop_received_arbitrary;
+	iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) library_trash_sidebar_entry_real_internal_drop_received_arbitrary;
 #line 718 "TrashSidebarEntry.c"
 }
 
@@ -722,19 +722,19 @@ static void library_trash_sidebar_entry_instance_init (LibraryTrashSidebarEntry
 }
 
 
-static void library_trash_sidebar_entry_finalize (GObject* obj) {
+static void library_trash_sidebar_entry_finalize (GObject * obj) {
 	LibraryTrashSidebarEntry * self;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry);
 #line 730 "TrashSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -756,13 +756,13 @@ static void library_trash_sidebar_entry_finalize (GObject* obj) {
 #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 		while (TRUE) {
 #line 759 "TrashSidebarEntry.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			MediaSourceCollection* _tmp10_ = NULL;
-			guint _tmp11_ = 0U;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			MediaSourceCollection* _tmp10_;
+			guint _tmp11_;
 #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
diff --git a/src/main.c b/src/main.c
index 01325d7..0cc8e90 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,4 @@
-/* main.c generated by valac 0.34.7, the Vala compiler
+/* main.c generated by valac 0.36.6, the Vala compiler
  * generated from main.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -460,7 +460,7 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname);
 void library_app_init (GError** error);
 void app_window_panic (const gchar* msg);
 GType db_verify_result_get_type (void) G_GNUC_CONST;
-DbVerifyResult db_verify_database (gchar** app_version, gint* schema_version);
+DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version);
 #define RESOURCES_APP_VERSION _VERSION
 #define DATABASE_TABLE_SCHEMA_VERSION 20
 #define RESOURCES_HOME_URL "https://wiki.gnome.org/Apps/Shotwell"
@@ -645,11 +645,11 @@ DirectWindow* direct_window_construct (GType object_type, GFile* file);
 void direct_app_terminate (void);
 GOptionEntry* commandline_options_get_options (int* result_length1);
 static GOptionEntry* _vala_array_dup26 (GOptionEntry* self, int length);
-static void _vala_array_add70 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value);
-static void _vala_array_add71 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value);
-static void _vala_array_add72 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value);
-static void _vala_array_add73 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value);
-static void _vala_array_add74 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value);
+static void _vala_array_add70 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
+static void _vala_array_add71 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
+static void _vala_array_add72 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
+static void _vala_array_add73 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
+static void _vala_array_add74 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
 static GOptionEntry* _vala_array_dup27 (GOptionEntry* self, int length);
 void _vala_main (gchar** args, int args_length1);
 void app_dirs_init (const gchar* arg0);
@@ -659,7 +659,7 @@ GFile* app_dirs_get_exec_dir (void);
 void app_dirs_terminate (void);
 #define RESOURCES_GIT_VERSION _GIT_VERSION
 gboolean library_window_is_mount_uri_supported (const gchar* uri);
-static void _vala_array_add75 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add75 (gchar** * array, int* length, int* size, gchar* value);
 gboolean is_string_empty (const gchar* s);
 #define DEBUG_LIBRARY_PREFIX "L"
 #define DEBUG_VIEWER_PREFIX "V"
@@ -719,76 +719,76 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 
 void library_exec (gchar** mounts, int mounts_length1) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
 	gchar* errormsg = NULL;
 	gchar* app_version = NULL;
 	gint schema_version = 0;
 	DbVerifyResult _result_ = 0;
 	gchar* _tmp9_ = NULL;
 	gint _tmp10_ = 0;
-	DbVerifyResult _tmp11_ = 0;
-	DbVerifyResult _tmp12_ = 0;
-	const gchar* _tmp33_ = NULL;
+	DbVerifyResult _tmp11_;
+	DbVerifyResult _tmp12_;
+	const gchar* _tmp29_;
 	ProgressDialog* progress_dialog = NULL;
 	AggregateProgressMonitor* aggregate_monitor = NULL;
 	ProgressMonitor monitor = NULL;
-	void* monitor_target = NULL;
-	GDestroyNotify monitor_target_destroy_notify = NULL;
-	gboolean _tmp39_ = FALSE;
-	AggregateProgressMonitor* _tmp70_ = NULL;
-	ProgressMonitor _tmp72_ = NULL;
-	void* _tmp72__target = NULL;
-	AggregateProgressMonitor* _tmp73_ = NULL;
-	ProgressMonitor _tmp75_ = NULL;
-	void* _tmp75__target = NULL;
-	AggregateProgressMonitor* _tmp76_ = NULL;
-	Upgrades* _tmp78_ = NULL;
-	Upgrades* _tmp79_ = NULL;
+	void* monitor_target;
+	GDestroyNotify monitor_target_destroy_notify;
+	gboolean _tmp35_;
+	AggregateProgressMonitor* _tmp65_;
+	ProgressMonitor _tmp67_;
+	void* _tmp67__target;
+	AggregateProgressMonitor* _tmp68_;
+	ProgressMonitor _tmp70_;
+	void* _tmp70__target;
+	AggregateProgressMonitor* _tmp71_;
+	Upgrades* _tmp73_;
+	Upgrades* _tmp74_;
 	MediaCollectionRegistry* registry = NULL;
-	MediaCollectionRegistry* _tmp80_ = NULL;
-	MediaCollectionRegistry* _tmp81_ = NULL;
-	LibraryPhotoSourceCollection* _tmp82_ = NULL;
-	MediaCollectionRegistry* _tmp83_ = NULL;
-	VideoSourceCollection* _tmp84_ = NULL;
-	AggregateProgressMonitor* _tmp85_ = NULL;
-	ProgressMonitor _tmp87_ = NULL;
-	void* _tmp87__target = NULL;
-	AggregateProgressMonitor* _tmp88_ = NULL;
-	ProgressMonitor _tmp90_ = NULL;
-	void* _tmp90__target = NULL;
-	Application* _tmp91_ = NULL;
-	Application* _tmp92_ = NULL;
-	AggregateProgressMonitor* _tmp93_ = NULL;
+	MediaCollectionRegistry* _tmp75_;
+	MediaCollectionRegistry* _tmp76_;
+	LibraryPhotoSourceCollection* _tmp77_;
+	MediaCollectionRegistry* _tmp78_;
+	VideoSourceCollection* _tmp79_;
+	AggregateProgressMonitor* _tmp80_;
+	ProgressMonitor _tmp82_;
+	void* _tmp82__target;
+	AggregateProgressMonitor* _tmp83_;
+	ProgressMonitor _tmp85_;
+	void* _tmp85__target;
+	Application* _tmp86_;
+	Application* _tmp87_;
+	AggregateProgressMonitor* _tmp88_;
 	LibraryWindow* library_window = NULL;
-	ProgressMonitor _tmp95_ = NULL;
-	void* _tmp95__target = NULL;
-	LibraryWindow* _tmp96_ = NULL;
-	AggregateProgressMonitor* _tmp97_ = NULL;
-	ProgressDialog* _tmp99_ = NULL;
-	gchar** _tmp101_ = NULL;
-	gint _tmp101__length1 = 0;
-	LibraryWindow* _tmp105_ = NULL;
+	ProgressMonitor _tmp90_;
+	void* _tmp90__target;
+	LibraryWindow* _tmp91_;
+	AggregateProgressMonitor* _tmp92_;
+	ProgressDialog* _tmp94_;
+	gchar** _tmp96_;
+	gint _tmp96__length1;
+	LibraryWindow* _tmp100_;
 	WelcomeServiceEntry** selected_import_entries = NULL;
-	WelcomeServiceEntry** _tmp106_ = NULL;
-	gint selected_import_entries_length1 = 0;
-	gint _selected_import_entries_size_ = 0;
-	gboolean _tmp107_ = FALSE;
-	ConfigFacade* _tmp108_ = NULL;
-	ConfigFacade* _tmp109_ = NULL;
-	gboolean _tmp110_ = FALSE;
-	gboolean _tmp111_ = FALSE;
-	WelcomeServiceEntry** _tmp125_ = NULL;
-	gint _tmp125__length1 = 0;
-	gboolean _tmp129_ = FALSE;
-	GTimer* _tmp130_ = NULL;
-	gdouble _tmp131_ = 0.0;
-	Application* _tmp132_ = NULL;
-	Application* _tmp133_ = NULL;
+	WelcomeServiceEntry** _tmp101_;
+	gint selected_import_entries_length1;
+	gint _selected_import_entries_size_;
+	gboolean _tmp102_ = FALSE;
+	ConfigFacade* _tmp103_;
+	ConfigFacade* _tmp104_;
+	gboolean _tmp105_;
+	gboolean _tmp106_;
+	WelcomeServiceEntry** _tmp120_;
+	gint _tmp120__length1;
+	gboolean _tmp124_;
+	GTimer* _tmp125_;
+	gdouble _tmp126_;
+	Application* _tmp127_;
+	Application* _tmp128_;
 	GError * _inner_error_ = NULL;
 #line 16 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0_ = application_get_is_remote ();
@@ -799,8 +799,8 @@ void library_exec (gchar** mounts, int mounts_length1) {
 #line 18 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp1_) {
 #line 802 "main.c"
-		gchar** _tmp2_ = NULL;
-		gint _tmp2__length1 = 0;
+		gchar** _tmp2_;
+		gint _tmp2__length1;
 #line 25 "/home/jens/Source/shotwell/src/main.vala"
 		application_present_primary_instance ();
 #line 26 "/home/jens/Source/shotwell/src/main.vala"
@@ -834,15 +834,15 @@ void library_exec (gchar** mounts, int mounts_length1) {
 #line 35 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 837 "main.c"
-			goto __catch221_g_error;
+			goto __catch222_g_error;
 		}
 	}
-	goto __finally221;
-	__catch221_g_error:
+	goto __finally222;
+	__catch222_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
+		GError* _tmp7_;
+		const gchar* _tmp8_;
 #line 34 "/home/jens/Source/shotwell/src/main.vala"
 		err = _inner_error_;
 #line 34 "/home/jens/Source/shotwell/src/main.vala"
@@ -859,7 +859,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		return;
 #line 861 "main.c"
 	}
-	__finally221:
+	__finally222:
 #line 34 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 34 "/home/jens/Source/shotwell/src/main.vala"
@@ -900,151 +900,139 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		case DB_VERIFY_RESULT_FUTURE_VERSION:
 #line 902 "main.c"
 		{
-			const gchar* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			gint _tmp15_ = 0;
-			gchar* _tmp16_ = NULL;
-#line 54 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp13_ = _ ("Your photo library is not compatible with this version of Shotwell. It" \
-" appears it was created by Shotwell %s (schema %d). This version is %s" \
-" (schema %d). Please use the latest version of Shotwell.");
+			const gchar* _tmp13_;
+			gint _tmp14_;
+			gchar* _tmp15_;
 #line 54 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp14_ = app_version;
+			_tmp13_ = app_version;
 #line 54 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp15_ = schema_version;
+			_tmp14_ = schema_version;
 #line 54 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp16_ = g_strdup_printf (_tmp13_, _tmp14_, _tmp15_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION);
+			_tmp15_ = g_strdup_printf (_ ("Your photo library is not compatible with this version of Shotwell. It" \
+" appears it was created by Shotwell %s (schema %d). This version is %s" \
+" (schema %d). Please use the latest version of Shotwell."), _tmp13_, _tmp14_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION);
 #line 54 "/home/jens/Source/shotwell/src/main.vala"
 			_g_free0 (errormsg);
 #line 54 "/home/jens/Source/shotwell/src/main.vala"
-			errormsg = _tmp16_;
+			errormsg = _tmp15_;
 #line 56 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 922 "main.c"
+#line 919 "main.c"
 		}
 #line 48 "/home/jens/Source/shotwell/src/main.vala"
 		case DB_VERIFY_RESULT_UPGRADE_ERROR:
-#line 926 "main.c"
+#line 923 "main.c"
 		{
-			const gchar* _tmp17_ = NULL;
-			const gchar* _tmp18_ = NULL;
-			gint _tmp19_ = 0;
-			gchar* _tmp20_ = NULL;
+			const gchar* _tmp16_;
+			gint _tmp17_;
+			gchar* _tmp18_;
 #line 59 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp17_ = _ ("Shotwell was unable to upgrade your photo library from version %s (sch" \
-"ema %d) to %s (schema %d). For more information please check the Shotw" \
-"ell Wiki at %s");
-#line 59 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp18_ = app_version;
+			_tmp16_ = app_version;
 #line 59 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp19_ = schema_version;
+			_tmp17_ = schema_version;
 #line 59 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp20_ = g_strdup_printf (_tmp17_, _tmp18_, _tmp19_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION, RESOURCES_HOME_URL);
+			_tmp18_ = g_strdup_printf (_ ("Shotwell was unable to upgrade your photo library from version %s (sch" \
+"ema %d) to %s (schema %d). For more information please check the Shotw" \
+"ell Wiki at %s"), _tmp16_, _tmp17_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION, RESOURCES_HOME_URL);
 #line 59 "/home/jens/Source/shotwell/src/main.vala"
 			_g_free0 (errormsg);
 #line 59 "/home/jens/Source/shotwell/src/main.vala"
-			errormsg = _tmp20_;
+			errormsg = _tmp18_;
 #line 62 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 946 "main.c"
+#line 940 "main.c"
 		}
 #line 48 "/home/jens/Source/shotwell/src/main.vala"
 		case DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE:
-#line 950 "main.c"
+#line 944 "main.c"
 		{
-			const gchar* _tmp21_ = NULL;
-			const gchar* _tmp22_ = NULL;
-			gint _tmp23_ = 0;
-			GFile* _tmp24_ = NULL;
-			GFile* _tmp25_ = NULL;
-			gchar* _tmp26_ = NULL;
-			gchar* _tmp27_ = NULL;
-			gchar* _tmp28_ = NULL;
+			const gchar* _tmp19_;
+			gint _tmp20_;
+			GFile* _tmp21_;
+			GFile* _tmp22_;
+			gchar* _tmp23_;
+			gchar* _tmp24_;
+			gchar* _tmp25_;
 #line 65 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp21_ = _ ("Your photo library is not compatible with this version of Shotwell. It" \
-" appears it was created by Shotwell %s (schema %d). This version is %s" \
-" (schema %d). Please clear your library by deleting %s and re-import y" \
-"our photos.");
+			_tmp19_ = app_version;
 #line 65 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp22_ = app_version;
+			_tmp20_ = schema_version;
 #line 65 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp23_ = schema_version;
+			_tmp21_ = app_dirs_get_data_dir ();
 #line 65 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp24_ = app_dirs_get_data_dir ();
+			_tmp22_ = _tmp21_;
 #line 65 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp25_ = _tmp24_;
+			_tmp23_ = g_file_get_path (_tmp22_);
 #line 65 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp26_ = g_file_get_path (_tmp25_);
+			_tmp24_ = _tmp23_;
 #line 65 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp27_ = _tmp26_;
-#line 65 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp28_ = g_strdup_printf (_tmp21_, _tmp22_, _tmp23_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION, _tmp27_);
+			_tmp25_ = g_strdup_printf (_ ("Your photo library is not compatible with this version of Shotwell. It" \
+" appears it was created by Shotwell %s (schema %d). This version is %s" \
+" (schema %d). Please clear your library by deleting %s and re-import y" \
+"our photos."), _tmp19_, _tmp20_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION, _tmp24_);
 #line 65 "/home/jens/Source/shotwell/src/main.vala"
 			_g_free0 (errormsg);
 #line 65 "/home/jens/Source/shotwell/src/main.vala"
-			errormsg = _tmp28_;
+			errormsg = _tmp25_;
 #line 65 "/home/jens/Source/shotwell/src/main.vala"
-			_g_free0 (_tmp27_);
+			_g_free0 (_tmp24_);
 #line 65 "/home/jens/Source/shotwell/src/main.vala"
-			_g_object_unref0 (_tmp25_);
+			_g_object_unref0 (_tmp22_);
 #line 68 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 986 "main.c"
+#line 977 "main.c"
 		}
 		default:
 		{
-			const gchar* _tmp29_ = NULL;
-			DbVerifyResult _tmp30_ = 0;
-			GEnumValue* _tmp31_;
-			gchar* _tmp32_ = NULL;
-#line 71 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp29_ = _ ("Unknown error attempting to verify Shotwell’s database: %s");
+			DbVerifyResult _tmp26_;
+			GEnumValue* _tmp27_;
+			gchar* _tmp28_;
 #line 71 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp30_ = _result_;
+			_tmp26_ = _result_;
 #line 72 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp31_ = g_enum_get_value (g_type_class_ref (DB_TYPE_VERIFY_RESULT), _tmp30_);
+			_tmp27_ = g_enum_get_value (g_type_class_ref (DB_TYPE_VERIFY_RESULT), _tmp26_);
 #line 71 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp32_ = g_strdup_printf (_tmp29_, (_tmp31_ != NULL) ? _tmp31_->value_name : NULL);
+			_tmp28_ = g_strdup_printf (_ ("Unknown error attempting to verify Shotwell’s database: %s"), (_tmp27_ != NULL) ? _tmp27_->value_name : NULL);
 #line 71 "/home/jens/Source/shotwell/src/main.vala"
 			_g_free0 (errormsg);
 #line 71 "/home/jens/Source/shotwell/src/main.vala"
-			errormsg = _tmp32_;
+			errormsg = _tmp28_;
 #line 73 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 1008 "main.c"
+#line 996 "main.c"
 		}
 	}
 #line 76 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp33_ = errormsg;
+	_tmp29_ = errormsg;
 #line 76 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp33_ != NULL) {
-#line 1015 "main.c"
+	if (_tmp29_ != NULL) {
+#line 1003 "main.c"
 		GtkMessageDialog* dialog = NULL;
-		const gchar* _tmp34_ = NULL;
-		GtkMessageDialog* _tmp35_ = NULL;
-		GtkMessageDialog* _tmp36_ = NULL;
-		GtkMessageDialog* _tmp37_ = NULL;
-		GtkMessageDialog* _tmp38_ = NULL;
+		const gchar* _tmp30_;
+		GtkMessageDialog* _tmp31_;
+		GtkMessageDialog* _tmp32_;
+		GtkMessageDialog* _tmp33_;
+		GtkMessageDialog* _tmp34_;
 #line 77 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp34_ = errormsg;
+		_tmp30_ = errormsg;
 #line 77 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp35_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp34_);
+		_tmp31_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp30_);
 #line 77 "/home/jens/Source/shotwell/src/main.vala"
-		g_object_ref_sink (_tmp35_);
+		g_object_ref_sink (_tmp31_);
 #line 77 "/home/jens/Source/shotwell/src/main.vala"
-		dialog = _tmp35_;
+		dialog = _tmp31_;
 #line 79 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp36_ = dialog;
+		_tmp32_ = dialog;
 #line 79 "/home/jens/Source/shotwell/src/main.vala"
-		gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
+		gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
 #line 80 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp37_ = dialog;
+		_tmp33_ = dialog;
 #line 80 "/home/jens/Source/shotwell/src/main.vala"
-		gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_dialog_get_type (), GtkDialog));
+		gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_dialog_get_type (), GtkDialog));
 #line 81 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp38_ = dialog;
+		_tmp34_ = dialog;
 #line 81 "/home/jens/Source/shotwell/src/main.vala"
-		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
+		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
 #line 83 "/home/jens/Source/shotwell/src/main.vala"
 		database_table_terminate ();
 #line 85 "/home/jens/Source/shotwell/src/main.vala"
@@ -1055,7 +1043,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		_g_free0 (errormsg);
 #line 85 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1052 "main.c"
+#line 1040 "main.c"
 	}
 #line 88 "/home/jens/Source/shotwell/src/main.vala"
 	upgrades_init ();
@@ -1070,147 +1058,144 @@ void library_exec (gchar** mounts, int mounts_length1) {
 #line 92 "/home/jens/Source/shotwell/src/main.vala"
 	monitor_target_destroy_notify = NULL;
 #line 94 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp39_ = commandline_options_no_startup_progress;
+	_tmp35_ = commandline_options_no_startup_progress;
 #line 94 "/home/jens/Source/shotwell/src/main.vala"
-	if (!_tmp39_) {
-#line 1070 "main.c"
+	if (!_tmp35_) {
+#line 1058 "main.c"
 		guint64 grand_total = 0ULL;
-		PhotoTable* _tmp40_ = NULL;
-		PhotoTable* _tmp41_ = NULL;
-		gint _tmp42_ = 0;
-		EventTable* _tmp43_ = NULL;
-		EventTable* _tmp44_ = NULL;
-		gint _tmp45_ = 0;
-		TagTable* _tmp46_ = NULL;
-		TagTable* _tmp47_ = NULL;
-		gint _tmp48_ = 0;
-		VideoTable* _tmp49_ = NULL;
-		VideoTable* _tmp50_ = NULL;
-		gint _tmp51_ = 0;
-		Upgrades* _tmp52_ = NULL;
-		Upgrades* _tmp53_ = NULL;
-		guint64 _tmp54_ = 0ULL;
-		guint64 _tmp55_ = 0ULL;
-		guint64 _tmp56_ = 0ULL;
+		PhotoTable* _tmp36_;
+		PhotoTable* _tmp37_;
+		gint _tmp38_;
+		EventTable* _tmp39_;
+		EventTable* _tmp40_;
+		gint _tmp41_;
+		TagTable* _tmp42_;
+		TagTable* _tmp43_;
+		gint _tmp44_;
+		VideoTable* _tmp45_;
+		VideoTable* _tmp46_;
+		gint _tmp47_;
+		Upgrades* _tmp48_;
+		Upgrades* _tmp49_;
+		guint64 _tmp50_;
+		guint64 _tmp51_;
+		guint64 _tmp52_;
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp40_ = photo_table_get_instance ();
+		_tmp36_ = photo_table_get_instance ();
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp41_ = _tmp40_;
+		_tmp37_ = _tmp36_;
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp42_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATABASE_TABLE, DatabaseTable));
+		_tmp38_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_DATABASE_TABLE, DatabaseTable));
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp43_ = event_table_get_instance ();
+		_tmp39_ = event_table_get_instance ();
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp44_ = _tmp43_;
+		_tmp40_ = _tmp39_;
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp45_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_DATABASE_TABLE, DatabaseTable));
+		_tmp41_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATABASE_TABLE, DatabaseTable));
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp46_ = tag_table_get_instance ();
+		_tmp42_ = tag_table_get_instance ();
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp47_ = _tmp46_;
+		_tmp43_ = _tmp42_;
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp48_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_DATABASE_TABLE, DatabaseTable));
+		_tmp44_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATABASE_TABLE, DatabaseTable));
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp49_ = video_table_get_instance ();
+		_tmp45_ = video_table_get_instance ();
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp50_ = _tmp49_;
+		_tmp46_ = _tmp45_;
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp51_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATABASE_TABLE, DatabaseTable));
+		_tmp47_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_DATABASE_TABLE, DatabaseTable));
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp52_ = upgrades_get_instance ();
+		_tmp48_ = upgrades_get_instance ();
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp53_ = _tmp52_;
+		_tmp49_ = _tmp48_;
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp54_ = upgrades_get_step_count (_tmp53_);
+		_tmp50_ = upgrades_get_step_count (_tmp49_);
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp55_ = (((_tmp42_ + _tmp45_) + _tmp48_) + _tmp51_) + _tmp54_;
+		_tmp51_ = (((_tmp38_ + _tmp41_) + _tmp44_) + _tmp47_) + _tmp50_;
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_upgrades_unref0 (_tmp53_);
+		_upgrades_unref0 (_tmp49_);
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_database_table_unref0 (_tmp50_);
+		_database_table_unref0 (_tmp46_);
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_database_table_unref0 (_tmp47_);
+		_database_table_unref0 (_tmp43_);
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_database_table_unref0 (_tmp44_);
+		_database_table_unref0 (_tmp40_);
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		_database_table_unref0 (_tmp41_);
+		_database_table_unref0 (_tmp37_);
 #line 98 "/home/jens/Source/shotwell/src/main.vala"
-		grand_total = _tmp55_;
+		grand_total = _tmp51_;
 #line 103 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp56_ = grand_total;
+		_tmp52_ = grand_total;
 #line 103 "/home/jens/Source/shotwell/src/main.vala"
-		if (_tmp56_ > ((guint64) 5000)) {
-#line 1137 "main.c"
-			const gchar* _tmp57_ = NULL;
-			ProgressDialog* _tmp58_ = NULL;
-			ProgressDialog* _tmp59_ = NULL;
-			ProgressDialog* _tmp60_ = NULL;
-			guint64 _tmp66_ = 0ULL;
-			ProgressDialog* _tmp67_ = NULL;
-			AggregateProgressMonitor* _tmp68_ = NULL;
-			AggregateProgressMonitor* _tmp69_ = NULL;
-#line 104 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp57_ = _ ("Loading Shotwell");
+		if (_tmp52_ > ((guint64) 5000)) {
+#line 1125 "main.c"
+			ProgressDialog* _tmp53_;
+			ProgressDialog* _tmp54_;
+			ProgressDialog* _tmp55_;
+			guint64 _tmp61_;
+			ProgressDialog* _tmp62_;
+			AggregateProgressMonitor* _tmp63_;
+			AggregateProgressMonitor* _tmp64_;
 #line 104 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp58_ = progress_dialog_new (NULL, _tmp57_, NULL);
+			_tmp53_ = progress_dialog_new (NULL, _ ("Loading Shotwell"), NULL);
 #line 104 "/home/jens/Source/shotwell/src/main.vala"
-			g_object_ref_sink (_tmp58_);
+			g_object_ref_sink (_tmp53_);
 #line 104 "/home/jens/Source/shotwell/src/main.vala"
 			_g_object_unref0 (progress_dialog);
 #line 104 "/home/jens/Source/shotwell/src/main.vala"
-			progress_dialog = _tmp58_;
+			progress_dialog = _tmp53_;
 #line 105 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp59_ = progress_dialog;
+			_tmp54_ = progress_dialog;
 #line 105 "/home/jens/Source/shotwell/src/main.vala"
-			progress_dialog_update_display_every (_tmp59_, 100);
+			progress_dialog_update_display_every (_tmp54_, 100);
 #line 106 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp60_ = progress_dialog;
+			_tmp55_ = progress_dialog;
 #line 106 "/home/jens/Source/shotwell/src/main.vala"
-			progress_dialog_set_minimum_on_screen_time_msec (_tmp60_, 250);
-#line 1164 "main.c"
+			progress_dialog_set_minimum_on_screen_time_msec (_tmp55_, 250);
+#line 1149 "main.c"
 			{
-				GdkPixbuf* _tmp61_ = NULL;
-				GdkPixbuf* _tmp62_ = NULL;
-				ProgressDialog* _tmp63_ = NULL;
+				GdkPixbuf* _tmp56_ = NULL;
+				GdkPixbuf* _tmp57_;
+				ProgressDialog* _tmp58_;
 #line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp62_ = gdk_pixbuf_new_from_resource ("/org/gnome/Shotwell/icons/shotwell.svg", &_inner_error_);
+				_tmp57_ = gdk_pixbuf_new_from_resource ("/org/gnome/Shotwell/icons/shotwell.svg", &_inner_error_);
 #line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp61_ = _tmp62_;
+				_tmp56_ = _tmp57_;
 #line 108 "/home/jens/Source/shotwell/src/main.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1175 "main.c"
-					goto __catch222_g_error;
+#line 1160 "main.c"
+					goto __catch223_g_error;
 				}
 #line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp63_ = progress_dialog;
+				_tmp58_ = progress_dialog;
 #line 108 "/home/jens/Source/shotwell/src/main.vala"
-				gtk_window_set_icon (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_window_get_type (), GtkWindow), _tmp61_);
+				gtk_window_set_icon (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_window_get_type (), GtkWindow), _tmp56_);
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
-				_g_object_unref0 (_tmp61_);
-#line 1184 "main.c"
+				_g_object_unref0 (_tmp56_);
+#line 1169 "main.c"
 			}
-			goto __finally222;
-			__catch222_g_error:
+			goto __finally223;
+			__catch223_g_error:
 			{
 				GError* err = NULL;
-				GError* _tmp64_ = NULL;
-				const gchar* _tmp65_ = NULL;
+				GError* _tmp59_;
+				const gchar* _tmp60_;
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 				err = _inner_error_;
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 				_inner_error_ = NULL;
 #line 110 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp64_ = err;
+				_tmp59_ = err;
 #line 110 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp65_ = _tmp64_->message;
+				_tmp60_ = _tmp59_->message;
 #line 110 "/home/jens/Source/shotwell/src/main.vala"
 				g_debug ("main.vala:110: Warning - could not load application icon for loading w" \
-"indow: %s", _tmp65_);
+"indow: %s", _tmp60_);
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 				_g_error_free0 (err);
-#line 1204 "main.c"
+#line 1189 "main.c"
 			}
-			__finally222:
+			__finally223:
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
@@ -1235,20 +1220,20 @@ void library_exec (gchar** mounts, int mounts_length1) {
 				g_clear_error (&_inner_error_);
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 				return;
-#line 1231 "main.c"
+#line 1216 "main.c"
 			}
 #line 113 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp66_ = grand_total;
+			_tmp61_ = grand_total;
 #line 113 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp67_ = progress_dialog;
+			_tmp62_ = progress_dialog;
 #line 113 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp68_ = aggregate_progress_monitor_new (_tmp66_, _progress_dialog_monitor_progress_monitor, _tmp67_);
+			_tmp63_ = aggregate_progress_monitor_new (_tmp61_, _progress_dialog_monitor_progress_monitor, _tmp62_);
 #line 113 "/home/jens/Source/shotwell/src/main.vala"
 			_aggregate_progress_monitor_unref0 (aggregate_monitor);
 #line 113 "/home/jens/Source/shotwell/src/main.vala"
-			aggregate_monitor = _tmp68_;
+			aggregate_monitor = _tmp63_;
 #line 114 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp69_ = aggregate_monitor;
+			_tmp64_ = aggregate_monitor;
 #line 114 "/home/jens/Source/shotwell/src/main.vala"
 			(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
 #line 114 "/home/jens/Source/shotwell/src/main.vala"
@@ -1260,10 +1245,10 @@ void library_exec (gchar** mounts, int mounts_length1) {
 #line 114 "/home/jens/Source/shotwell/src/main.vala"
 			monitor = _aggregate_progress_monitor_monitor_progress_monitor;
 #line 114 "/home/jens/Source/shotwell/src/main.vala"
-			monitor_target = aggregate_progress_monitor_ref (_tmp69_);
+			monitor_target = aggregate_progress_monitor_ref (_tmp64_);
 #line 114 "/home/jens/Source/shotwell/src/main.vala"
 			monitor_target_destroy_notify = aggregate_progress_monitor_unref;
-#line 1259 "main.c"
+#line 1244 "main.c"
 		}
 	}
 #line 118 "/home/jens/Source/shotwell/src/main.vala"
@@ -1271,162 +1256,162 @@ void library_exec (gchar** mounts, int mounts_length1) {
 #line 119 "/home/jens/Source/shotwell/src/main.vala"
 	tombstone_init ();
 #line 121 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp70_ = aggregate_monitor;
+	_tmp65_ = aggregate_monitor;
 #line 121 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp70_ != NULL) {
-#line 1270 "main.c"
-		AggregateProgressMonitor* _tmp71_ = NULL;
+	if (_tmp65_ != NULL) {
+#line 1255 "main.c"
+		AggregateProgressMonitor* _tmp66_;
 #line 122 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp71_ = aggregate_monitor;
+		_tmp66_ = aggregate_monitor;
 #line 122 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp71_, "LibraryPhoto.init");
-#line 1276 "main.c"
+		aggregate_progress_monitor_next_step (_tmp66_, "LibraryPhoto.init");
+#line 1261 "main.c"
 	}
 #line 123 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp72_ = monitor;
+	_tmp67_ = monitor;
 #line 123 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp72__target = monitor_target;
+	_tmp67__target = monitor_target;
 #line 123 "/home/jens/Source/shotwell/src/main.vala"
-	library_photo_init (_tmp72_, _tmp72__target);
+	library_photo_init (_tmp67_, _tmp67__target);
 #line 124 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp73_ = aggregate_monitor;
+	_tmp68_ = aggregate_monitor;
 #line 124 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp73_ != NULL) {
-#line 1288 "main.c"
-		AggregateProgressMonitor* _tmp74_ = NULL;
+	if (_tmp68_ != NULL) {
+#line 1273 "main.c"
+		AggregateProgressMonitor* _tmp69_;
 #line 125 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp74_ = aggregate_monitor;
+		_tmp69_ = aggregate_monitor;
 #line 125 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp74_, "Video.init");
-#line 1294 "main.c"
+		aggregate_progress_monitor_next_step (_tmp69_, "Video.init");
+#line 1279 "main.c"
 	}
 #line 126 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp75_ = monitor;
+	_tmp70_ = monitor;
 #line 126 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp75__target = monitor_target;
+	_tmp70__target = monitor_target;
 #line 126 "/home/jens/Source/shotwell/src/main.vala"
-	video_init (_tmp75_, _tmp75__target);
+	video_init (_tmp70_, _tmp70__target);
 #line 127 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp76_ = aggregate_monitor;
+	_tmp71_ = aggregate_monitor;
 #line 127 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp76_ != NULL) {
-#line 1306 "main.c"
-		AggregateProgressMonitor* _tmp77_ = NULL;
+	if (_tmp71_ != NULL) {
+#line 1291 "main.c"
+		AggregateProgressMonitor* _tmp72_;
 #line 128 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp77_ = aggregate_monitor;
+		_tmp72_ = aggregate_monitor;
 #line 128 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp77_, "Upgrades.execute");
-#line 1312 "main.c"
+		aggregate_progress_monitor_next_step (_tmp72_, "Upgrades.execute");
+#line 1297 "main.c"
 	}
 #line 129 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp78_ = upgrades_get_instance ();
+	_tmp73_ = upgrades_get_instance ();
 #line 129 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp79_ = _tmp78_;
+	_tmp74_ = _tmp73_;
 #line 129 "/home/jens/Source/shotwell/src/main.vala"
-	upgrades_execute (_tmp79_, NULL, NULL);
+	upgrades_execute (_tmp74_, NULL, NULL);
 #line 129 "/home/jens/Source/shotwell/src/main.vala"
-	_upgrades_unref0 (_tmp79_);
+	_upgrades_unref0 (_tmp74_);
 #line 131 "/home/jens/Source/shotwell/src/main.vala"
 	library_monitor_pool_init ();
 #line 132 "/home/jens/Source/shotwell/src/main.vala"
 	media_collection_registry_init ();
 #line 133 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp80_ = media_collection_registry_get_instance ();
+	_tmp75_ = media_collection_registry_get_instance ();
 #line 133 "/home/jens/Source/shotwell/src/main.vala"
-	registry = _tmp80_;
+	registry = _tmp75_;
 #line 134 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp81_ = registry;
+	_tmp76_ = registry;
 #line 134 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp82_ = library_photo_global;
+	_tmp77_ = library_photo_global;
 #line 134 "/home/jens/Source/shotwell/src/main.vala"
-	media_collection_registry_register_collection (_tmp81_, G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
+	media_collection_registry_register_collection (_tmp76_, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 135 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp83_ = registry;
+	_tmp78_ = registry;
 #line 135 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp84_ = video_global;
+	_tmp79_ = video_global;
 #line 135 "/home/jens/Source/shotwell/src/main.vala"
-	media_collection_registry_register_collection (_tmp83_, G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
+	media_collection_registry_register_collection (_tmp78_, G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 137 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp85_ = aggregate_monitor;
+	_tmp80_ = aggregate_monitor;
 #line 137 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp85_ != NULL) {
-#line 1346 "main.c"
-		AggregateProgressMonitor* _tmp86_ = NULL;
+	if (_tmp80_ != NULL) {
+#line 1331 "main.c"
+		AggregateProgressMonitor* _tmp81_;
 #line 138 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp86_ = aggregate_monitor;
+		_tmp81_ = aggregate_monitor;
 #line 138 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp86_, "Event.init");
-#line 1352 "main.c"
+		aggregate_progress_monitor_next_step (_tmp81_, "Event.init");
+#line 1337 "main.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp87_ = monitor;
+	_tmp82_ = monitor;
 #line 139 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp87__target = monitor_target;
+	_tmp82__target = monitor_target;
 #line 139 "/home/jens/Source/shotwell/src/main.vala"
-	event_init (_tmp87_, _tmp87__target);
+	event_init (_tmp82_, _tmp82__target);
 #line 140 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp88_ = aggregate_monitor;
+	_tmp83_ = aggregate_monitor;
 #line 140 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp88_ != NULL) {
-#line 1364 "main.c"
-		AggregateProgressMonitor* _tmp89_ = NULL;
+	if (_tmp83_ != NULL) {
+#line 1349 "main.c"
+		AggregateProgressMonitor* _tmp84_;
 #line 141 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp89_ = aggregate_monitor;
+		_tmp84_ = aggregate_monitor;
 #line 141 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp89_, "Tag.init");
-#line 1370 "main.c"
+		aggregate_progress_monitor_next_step (_tmp84_, "Tag.init");
+#line 1355 "main.c"
 	}
 #line 142 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp90_ = monitor;
+	_tmp85_ = monitor;
 #line 142 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp90__target = monitor_target;
+	_tmp85__target = monitor_target;
 #line 142 "/home/jens/Source/shotwell/src/main.vala"
-	tag_init (_tmp90_, _tmp90__target);
+	tag_init (_tmp85_, _tmp85__target);
 #line 144 "/home/jens/Source/shotwell/src/main.vala"
 	metadata_writer_init ();
 #line 145 "/home/jens/Source/shotwell/src/main.vala"
 	desktop_integration_init ();
 #line 147 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp91_ = application_get_instance ();
+	_tmp86_ = application_get_instance ();
 #line 147 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp92_ = _tmp91_;
+	_tmp87_ = _tmp86_;
 #line 147 "/home/jens/Source/shotwell/src/main.vala"
-	g_signal_emit_by_name (_tmp92_, "init-done");
+	g_signal_emit_by_name (_tmp87_, "init-done");
 #line 147 "/home/jens/Source/shotwell/src/main.vala"
-	_application_unref0 (_tmp92_);
+	_application_unref0 (_tmp87_);
 #line 150 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp93_ = aggregate_monitor;
+	_tmp88_ = aggregate_monitor;
 #line 150 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp93_ != NULL) {
-#line 1394 "main.c"
-		AggregateProgressMonitor* _tmp94_ = NULL;
+	if (_tmp88_ != NULL) {
+#line 1379 "main.c"
+		AggregateProgressMonitor* _tmp89_;
 #line 151 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp94_ = aggregate_monitor;
+		_tmp89_ = aggregate_monitor;
 #line 151 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp94_, "LibraryWindow");
-#line 1400 "main.c"
+		aggregate_progress_monitor_next_step (_tmp89_, "LibraryWindow");
+#line 1385 "main.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp95_ = monitor;
+	_tmp90_ = monitor;
 #line 152 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp95__target = monitor_target;
+	_tmp90__target = monitor_target;
 #line 152 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp96_ = library_window_new (_tmp95_, _tmp95__target);
+	_tmp91_ = library_window_new (_tmp90_, _tmp90__target);
 #line 152 "/home/jens/Source/shotwell/src/main.vala"
-	g_object_ref_sink (_tmp96_);
+	g_object_ref_sink (_tmp91_);
 #line 152 "/home/jens/Source/shotwell/src/main.vala"
-	library_window = _tmp96_;
+	library_window = _tmp91_;
 #line 154 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp97_ = aggregate_monitor;
+	_tmp92_ = aggregate_monitor;
 #line 154 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp97_ != NULL) {
-#line 1416 "main.c"
-		AggregateProgressMonitor* _tmp98_ = NULL;
+	if (_tmp92_ != NULL) {
+#line 1401 "main.c"
+		AggregateProgressMonitor* _tmp93_;
 #line 155 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp98_ = aggregate_monitor;
+		_tmp93_ = aggregate_monitor;
 #line 155 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp98_, "done");
-#line 1422 "main.c"
+		aggregate_progress_monitor_next_step (_tmp93_, "done");
+#line 1407 "main.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/main.vala"
 	(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
@@ -1447,228 +1432,228 @@ void library_exec (gchar** mounts, int mounts_length1) {
 #line 161 "/home/jens/Source/shotwell/src/main.vala"
 	aggregate_monitor = NULL;
 #line 162 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp99_ = progress_dialog;
+	_tmp94_ = progress_dialog;
 #line 162 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp99_ != NULL) {
-#line 1446 "main.c"
-		ProgressDialog* _tmp100_ = NULL;
+	if (_tmp94_ != NULL) {
+#line 1431 "main.c"
+		ProgressDialog* _tmp95_;
 #line 163 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp100_ = progress_dialog;
+		_tmp95_ = progress_dialog;
 #line 163 "/home/jens/Source/shotwell/src/main.vala"
-		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget));
-#line 1452 "main.c"
+		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, gtk_widget_get_type (), GtkWidget));
+#line 1437 "main.c"
 	}
 #line 164 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (progress_dialog);
 #line 164 "/home/jens/Source/shotwell/src/main.vala"
 	progress_dialog = NULL;
 #line 167 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp101_ = mounts;
+	_tmp96_ = mounts;
 #line 167 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp101__length1 = mounts_length1;
-#line 1462 "main.c"
+	_tmp96__length1 = mounts_length1;
+#line 1447 "main.c"
 	{
 		gchar** mount_collection = NULL;
 		gint mount_collection_length1 = 0;
 		gint _mount_collection_size_ = 0;
 		gint mount_it = 0;
 #line 167 "/home/jens/Source/shotwell/src/main.vala"
-		mount_collection = _tmp101_;
+		mount_collection = _tmp96_;
 #line 167 "/home/jens/Source/shotwell/src/main.vala"
-		mount_collection_length1 = _tmp101__length1;
+		mount_collection_length1 = _tmp96__length1;
 #line 167 "/home/jens/Source/shotwell/src/main.vala"
-		for (mount_it = 0; mount_it < _tmp101__length1; mount_it = mount_it + 1) {
-#line 1474 "main.c"
-			gchar* _tmp102_ = NULL;
+		for (mount_it = 0; mount_it < _tmp96__length1; mount_it = mount_it + 1) {
+#line 1459 "main.c"
+			gchar* _tmp97_;
 			gchar* mount = NULL;
 #line 167 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp102_ = g_strdup (mount_collection[mount_it]);
+			_tmp97_ = g_strdup (mount_collection[mount_it]);
 #line 167 "/home/jens/Source/shotwell/src/main.vala"
-			mount = _tmp102_;
-#line 1481 "main.c"
+			mount = _tmp97_;
+#line 1466 "main.c"
 			{
-				LibraryWindow* _tmp103_ = NULL;
-				const gchar* _tmp104_ = NULL;
+				LibraryWindow* _tmp98_;
+				const gchar* _tmp99_;
 #line 168 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp103_ = library_window;
+				_tmp98_ = library_window;
 #line 168 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp104_ = mount;
+				_tmp99_ = mount;
 #line 168 "/home/jens/Source/shotwell/src/main.vala"
-				library_window_mounted_camera_shell_notification (_tmp103_, _tmp104_, TRUE);
+				library_window_mounted_camera_shell_notification (_tmp98_, _tmp99_, TRUE);
 #line 167 "/home/jens/Source/shotwell/src/main.vala"
 				_g_free0 (mount);
-#line 1493 "main.c"
+#line 1478 "main.c"
 			}
 		}
 	}
 #line 170 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp105_ = library_window;
+	_tmp100_ = library_window;
 #line 170 "/home/jens/Source/shotwell/src/main.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget));
 #line 172 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp106_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
+	_tmp101_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
 #line 172 "/home/jens/Source/shotwell/src/main.vala"
-	selected_import_entries = _tmp106_;
+	selected_import_entries = _tmp101_;
 #line 172 "/home/jens/Source/shotwell/src/main.vala"
 	selected_import_entries_length1 = 0;
 #line 172 "/home/jens/Source/shotwell/src/main.vala"
 	_selected_import_entries_size_ = selected_import_entries_length1;
 #line 173 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp108_ = config_facade_get_instance ();
+	_tmp103_ = config_facade_get_instance ();
 #line 173 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp109_ = _tmp108_;
+	_tmp104_ = _tmp103_;
 #line 173 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp110_ = configuration_facade_get_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp105_ = configuration_facade_get_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 173 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp111_ = _tmp110_;
+	_tmp106_ = _tmp105_;
 #line 173 "/home/jens/Source/shotwell/src/main.vala"
-	_g_object_unref0 (_tmp109_);
+	_g_object_unref0 (_tmp104_);
 #line 173 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp111_) {
-#line 1521 "main.c"
-		LibraryPhotoSourceCollection* _tmp112_ = NULL;
-		gint _tmp113_ = 0;
+	if (_tmp106_) {
+#line 1506 "main.c"
+		LibraryPhotoSourceCollection* _tmp107_;
+		gint _tmp108_;
 #line 174 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp112_ = library_photo_global;
+		_tmp107_ = library_photo_global;
 #line 174 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp113_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_DATA_COLLECTION, DataCollection));
+		_tmp108_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_DATA_COLLECTION, DataCollection));
 #line 174 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp107_ = _tmp113_ == 0;
-#line 1530 "main.c"
+		_tmp102_ = _tmp108_ == 0;
+#line 1515 "main.c"
 	} else {
 #line 173 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp107_ = FALSE;
-#line 1534 "main.c"
+		_tmp102_ = FALSE;
+#line 1519 "main.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp107_) {
-#line 1538 "main.c"
+	if (_tmp102_) {
+#line 1523 "main.c"
 		WelcomeDialog* welcome = NULL;
-		LibraryWindow* _tmp114_ = NULL;
-		WelcomeDialog* _tmp115_ = NULL;
-		ConfigFacade* _tmp116_ = NULL;
-		ConfigFacade* _tmp117_ = NULL;
-		WelcomeDialog* _tmp118_ = NULL;
-		WelcomeServiceEntry** _tmp119_ = NULL;
-		gint _tmp120_ = 0;
-		gboolean _tmp121_ = FALSE;
-		gboolean _tmp122_ = FALSE;
+		LibraryWindow* _tmp109_;
+		WelcomeDialog* _tmp110_;
+		ConfigFacade* _tmp111_;
+		ConfigFacade* _tmp112_;
+		WelcomeDialog* _tmp113_;
+		WelcomeServiceEntry** _tmp114_ = NULL;
+		gint _tmp115_;
+		gboolean _tmp116_ = FALSE;
+		gboolean _tmp117_;
 #line 175 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp114_ = library_window;
+		_tmp109_ = library_window;
 #line 175 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp115_ = welcome_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_window_get_type (), GtkWindow));
+		_tmp110_ = welcome_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_window_get_type (), GtkWindow));
 #line 175 "/home/jens/Source/shotwell/src/main.vala"
-		g_object_ref_sink (_tmp115_);
+		g_object_ref_sink (_tmp110_);
 #line 175 "/home/jens/Source/shotwell/src/main.vala"
-		welcome = _tmp115_;
+		welcome = _tmp110_;
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp116_ = config_facade_get_instance ();
+		_tmp111_ = config_facade_get_instance ();
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp117_ = _tmp116_;
+		_tmp112_ = _tmp111_;
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp118_ = welcome;
+		_tmp113_ = welcome;
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp122_ = welcome_dialog_execute (_tmp118_, &_tmp119_, &_tmp120_, &_tmp121_);
+		_tmp117_ = welcome_dialog_execute (_tmp113_, &_tmp114_, &_tmp115_, &_tmp116_);
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
 		selected_import_entries = (_vala_array_free (selected_import_entries, selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
-		selected_import_entries = _tmp119_;
+		selected_import_entries = _tmp114_;
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
-		selected_import_entries_length1 = _tmp120_;
+		selected_import_entries_length1 = _tmp115_;
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
 		_selected_import_entries_size_ = selected_import_entries_length1;
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
-		do_system_pictures_import = _tmp121_;
+		do_system_pictures_import = _tmp116_;
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
-		configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp122_);
+		configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp117_);
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
-		_g_object_unref0 (_tmp117_);
+		_g_object_unref0 (_tmp112_);
 #line 173 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (welcome);
-#line 1581 "main.c"
+#line 1566 "main.c"
 	} else {
-		ConfigFacade* _tmp123_ = NULL;
-		ConfigFacade* _tmp124_ = NULL;
+		ConfigFacade* _tmp118_;
+		ConfigFacade* _tmp119_;
 #line 179 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp123_ = config_facade_get_instance ();
+		_tmp118_ = config_facade_get_instance ();
 #line 179 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp124_ = _tmp123_;
+		_tmp119_ = _tmp118_;
 #line 179 "/home/jens/Source/shotwell/src/main.vala"
-		configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), FALSE);
+		configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), FALSE);
 #line 179 "/home/jens/Source/shotwell/src/main.vala"
-		_g_object_unref0 (_tmp124_);
-#line 1593 "main.c"
+		_g_object_unref0 (_tmp119_);
+#line 1578 "main.c"
 	}
 #line 182 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp125_ = selected_import_entries;
+	_tmp120_ = selected_import_entries;
 #line 182 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp125__length1 = selected_import_entries_length1;
+	_tmp120__length1 = selected_import_entries_length1;
 #line 182 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp125__length1 > 0) {
-#line 1601 "main.c"
-		WelcomeServiceEntry** _tmp126_ = NULL;
-		gint _tmp126__length1 = 0;
+	if (_tmp120__length1 > 0) {
+#line 1586 "main.c"
+		WelcomeServiceEntry** _tmp121_;
+		gint _tmp121__length1;
 #line 183 "/home/jens/Source/shotwell/src/main.vala"
 		do_external_import = TRUE;
 #line 184 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp126_ = selected_import_entries;
+		_tmp121_ = selected_import_entries;
 #line 184 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp126__length1 = selected_import_entries_length1;
-#line 1610 "main.c"
+		_tmp121__length1 = selected_import_entries_length1;
+#line 1595 "main.c"
 		{
 			WelcomeServiceEntry** entry_collection = NULL;
 			gint entry_collection_length1 = 0;
 			gint _entry_collection_size_ = 0;
 			gint entry_it = 0;
 #line 184 "/home/jens/Source/shotwell/src/main.vala"
-			entry_collection = _tmp126_;
+			entry_collection = _tmp121_;
 #line 184 "/home/jens/Source/shotwell/src/main.vala"
-			entry_collection_length1 = _tmp126__length1;
+			entry_collection_length1 = _tmp121__length1;
 #line 184 "/home/jens/Source/shotwell/src/main.vala"
-			for (entry_it = 0; entry_it < _tmp126__length1; entry_it = entry_it + 1) {
-#line 1622 "main.c"
-				WelcomeServiceEntry* _tmp127_ = NULL;
+			for (entry_it = 0; entry_it < _tmp121__length1; entry_it = entry_it + 1) {
+#line 1607 "main.c"
+				WelcomeServiceEntry* _tmp122_;
 				WelcomeServiceEntry* entry = NULL;
 #line 184 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp127_ = _g_object_ref0 (entry_collection[entry_it]);
+				_tmp122_ = _g_object_ref0 (entry_collection[entry_it]);
 #line 184 "/home/jens/Source/shotwell/src/main.vala"
-				entry = _tmp127_;
-#line 1629 "main.c"
+				entry = _tmp122_;
+#line 1614 "main.c"
 				{
-					WelcomeServiceEntry* _tmp128_ = NULL;
+					WelcomeServiceEntry* _tmp123_;
 #line 185 "/home/jens/Source/shotwell/src/main.vala"
-					_tmp128_ = entry;
+					_tmp123_ = entry;
 #line 185 "/home/jens/Source/shotwell/src/main.vala"
-					welcome_service_entry_execute (_tmp128_);
+					welcome_service_entry_execute (_tmp123_);
 #line 184 "/home/jens/Source/shotwell/src/main.vala"
 					_g_object_unref0 (entry);
-#line 1638 "main.c"
+#line 1623 "main.c"
 				}
 			}
 		}
 	}
 #line 187 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp129_ = do_system_pictures_import;
+	_tmp124_ = do_system_pictures_import;
 #line 187 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp129_) {
+	if (_tmp124_) {
 #line 191 "/home/jens/Source/shotwell/src/main.vala"
 		run_system_pictures_import (NULL);
-#line 1649 "main.c"
+#line 1634 "main.c"
 	}
 #line 194 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp130_ = startup_timer;
+	_tmp125_ = startup_timer;
 #line 194 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp131_ = g_timer_elapsed (_tmp130_, NULL);
+	_tmp126_ = g_timer_elapsed (_tmp125_, NULL);
 #line 194 "/home/jens/Source/shotwell/src/main.vala"
-	g_debug ("main.vala:194: %lf seconds to Gtk.main()", _tmp131_);
+	g_debug ("main.vala:194: %lf seconds to Gtk.main()", _tmp126_);
 #line 196 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp132_ = application_get_instance ();
+	_tmp127_ = application_get_instance ();
 #line 196 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp133_ = _tmp132_;
+	_tmp128_ = _tmp127_;
 #line 196 "/home/jens/Source/shotwell/src/main.vala"
-	application_start (_tmp133_, NULL, 0);
+	application_start (_tmp128_, NULL, 0);
 #line 196 "/home/jens/Source/shotwell/src/main.vala"
-	_application_unref0 (_tmp133_);
+	_application_unref0 (_tmp128_);
 #line 198 "/home/jens/Source/shotwell/src/main.vala"
 	desktop_integration_terminate ();
 #line 199 "/home/jens/Source/shotwell/src/main.vala"
@@ -1713,35 +1698,35 @@ void library_exec (gchar** mounts, int mounts_length1) {
 	_g_free0 (app_version);
 #line 15 "/home/jens/Source/shotwell/src/main.vala"
 	_g_free0 (errormsg);
-#line 1709 "main.c"
+#line 1694 "main.c"
 }
 
 
 static void _report_system_pictures_import_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
 #line 223 "/home/jens/Source/shotwell/src/main.vala"
 	report_system_pictures_import (manifest, import_roll);
-#line 1716 "main.c"
+#line 1701 "main.c"
 }
 
 
 void run_system_pictures_import (ImportManifest* external_exclusion_manifest) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	GeeArrayList* jobs = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	GeeArrayList* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	FileImportJob* _tmp5_ = NULL;
-	FileImportJob* _tmp6_ = NULL;
+	GeeArrayList* _tmp1_;
+	GeeArrayList* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
+	FileImportJob* _tmp5_;
+	FileImportJob* _tmp6_;
 	LibraryWindow* library_window = NULL;
-	AppWindow* _tmp7_ = NULL;
+	AppWindow* _tmp7_;
 	BatchImport* batch_import = NULL;
-	GeeArrayList* _tmp8_ = NULL;
-	ImportManifest* _tmp9_ = NULL;
-	BatchImport* _tmp10_ = NULL;
-	LibraryWindow* _tmp11_ = NULL;
-	BatchImport* _tmp12_ = NULL;
-	LibraryWindow* _tmp13_ = NULL;
+	GeeArrayList* _tmp8_;
+	ImportManifest* _tmp9_;
+	BatchImport* _tmp10_;
+	LibraryWindow* _tmp11_;
+	BatchImport* _tmp12_;
+	LibraryWindow* _tmp13_;
 #line 214 "/home/jens/Source/shotwell/src/main.vala"
 	g_return_if_fail ((external_exclusion_manifest == NULL) || IS_IMPORT_MANIFEST (external_exclusion_manifest));
 #line 215 "/home/jens/Source/shotwell/src/main.vala"
@@ -1750,7 +1735,7 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) {
 	if (!_tmp0_) {
 #line 216 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1746 "main.c"
+#line 1731 "main.c"
 	}
 #line 218 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp1_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
@@ -1800,14 +1785,14 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) {
 	_g_object_unref0 (library_window);
 #line 214 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (jobs);
-#line 1796 "main.c"
+#line 1781 "main.c"
 }
 
 
 void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* import_roll) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	ImportManifest* _tmp6_ = NULL;
+	gboolean _tmp1_;
+	ImportManifest* _tmp6_;
 #line 230 "/home/jens/Source/shotwell/src/main.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
 #line 230 "/home/jens/Source/shotwell/src/main.vala"
@@ -1816,11 +1801,11 @@ void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* i
 	_tmp1_ = do_external_import;
 #line 237 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp1_) {
-#line 1812 "main.c"
-		ImportManifest* _tmp2_ = NULL;
-		GeeList* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+#line 1797 "main.c"
+		ImportManifest* _tmp2_;
+		GeeList* _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
 #line 237 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp2_ = manifest;
 #line 237 "/home/jens/Source/shotwell/src/main.vala"
@@ -1831,39 +1816,39 @@ void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* i
 		_tmp5_ = _tmp4_;
 #line 237 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp0_ = _tmp5_ == 0;
-#line 1827 "main.c"
+#line 1812 "main.c"
 	} else {
 #line 237 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp0_ = FALSE;
-#line 1831 "main.c"
+#line 1816 "main.c"
 	}
 #line 237 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp0_) {
 #line 238 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1837 "main.c"
+#line 1822 "main.c"
 	}
 #line 240 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_ = manifest;
 #line 240 "/home/jens/Source/shotwell/src/main.vala"
 	import_ui_report_manifest (_tmp6_, TRUE, NULL);
-#line 1843 "main.c"
+#line 1828 "main.c"
 }
 
 
 void editing_exec (const gchar* filename) {
 	GFile* initial_file = NULL;
-	const gchar* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
 	DirectWindow* direct_window = NULL;
-	GFile* _tmp5_ = NULL;
-	DirectWindow* _tmp6_ = NULL;
-	DirectWindow* _tmp7_ = NULL;
-	GTimer* _tmp8_ = NULL;
-	gdouble _tmp9_ = 0.0;
-	Application* _tmp10_ = NULL;
-	Application* _tmp11_ = NULL;
+	GFile* _tmp5_;
+	DirectWindow* _tmp6_;
+	DirectWindow* _tmp7_;
+	GTimer* _tmp8_;
+	gdouble _tmp9_;
+	Application* _tmp10_;
+	Application* _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 243 "/home/jens/Source/shotwell/src/main.vala"
 	g_return_if_fail (filename != NULL);
@@ -1879,22 +1864,22 @@ void editing_exec (const gchar* filename) {
 	direct_preconfigure (_tmp2_);
 #line 248 "/home/jens/Source/shotwell/src/main.vala"
 	db_preconfigure (NULL);
-#line 1875 "main.c"
+#line 1860 "main.c"
 	{
 #line 252 "/home/jens/Source/shotwell/src/main.vala"
 		direct_app_init (&_inner_error_);
 #line 252 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1881 "main.c"
-			goto __catch223_g_error;
+#line 1866 "main.c"
+			goto __catch224_g_error;
 		}
 	}
-	goto __finally223;
-	__catch223_g_error:
+	goto __finally224;
+	__catch224_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
+		GError* _tmp3_;
+		const gchar* _tmp4_;
 #line 251 "/home/jens/Source/shotwell/src/main.vala"
 		err = _inner_error_;
 #line 251 "/home/jens/Source/shotwell/src/main.vala"
@@ -1911,9 +1896,9 @@ void editing_exec (const gchar* filename) {
 		_g_object_unref0 (initial_file);
 #line 256 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1907 "main.c"
+#line 1892 "main.c"
 	}
-	__finally223:
+	__finally224:
 #line 251 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 251 "/home/jens/Source/shotwell/src/main.vala"
@@ -1924,7 +1909,7 @@ void editing_exec (const gchar* filename) {
 		g_clear_error (&_inner_error_);
 #line 251 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1920 "main.c"
+#line 1905 "main.c"
 	}
 #line 260 "/home/jens/Source/shotwell/src/main.vala"
 	desktop_integration_init ();
@@ -1962,152 +1947,147 @@ void editing_exec (const gchar* filename) {
 	_g_object_unref0 (direct_window);
 #line 243 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (initial_file);
-#line 1958 "main.c"
+#line 1943 "main.c"
 }
 
 
 static GOptionEntry* _vala_array_dup26 (GOptionEntry* self, int length) {
 #line 290 "/home/jens/Source/shotwell/src/main.vala"
 	return g_memdup (self, length * sizeof (GOptionEntry));
-#line 1965 "main.c"
+#line 1950 "main.c"
 }
 
 
-static void _vala_array_add70 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
+static void _vala_array_add70 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
 #line 294 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
 #line 294 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 294 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 1976 "main.c"
+#line 1961 "main.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 1980 "main.c"
+#line 1965 "main.c"
 }
 
 
-static void _vala_array_add71 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
+static void _vala_array_add71 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
 #line 298 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
 #line 298 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 298 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 1991 "main.c"
+#line 1976 "main.c"
 	}
 #line 298 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 1995 "main.c"
+#line 1980 "main.c"
 }
 
 
-static void _vala_array_add72 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
+static void _vala_array_add72 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
 #line 302 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
 #line 302 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 302 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 2006 "main.c"
+#line 1991 "main.c"
 	}
 #line 302 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 2010 "main.c"
+#line 1995 "main.c"
 }
 
 
-static void _vala_array_add73 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
+static void _vala_array_add73 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
 #line 306 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
 #line 306 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 306 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 2021 "main.c"
+#line 2006 "main.c"
 	}
 #line 306 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 2025 "main.c"
+#line 2010 "main.c"
 }
 
 
-static void _vala_array_add74 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
+static void _vala_array_add74 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
 #line 309 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
 #line 309 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 309 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 2036 "main.c"
+#line 2021 "main.c"
 	}
 #line 309 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 2040 "main.c"
+#line 2025 "main.c"
 }
 
 
 static GOptionEntry* _vala_array_dup27 (GOptionEntry* self, int length) {
 #line 311 "/home/jens/Source/shotwell/src/main.vala"
 	return g_memdup (self, length * sizeof (GOptionEntry));
-#line 2047 "main.c"
+#line 2032 "main.c"
 }
 
 
 GOptionEntry* commandline_options_get_options (int* result_length1) {
 	GOptionEntry* result = NULL;
-	GOptionEntry* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	GOptionEntry* _tmp0_;
+	gint _tmp0__length1;
 	GOptionEntry datadir = {0};
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	GOptionEntry _tmp6_ = {0};
-	GOptionEntry* _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	GOptionEntry _tmp8_ = {0};
+	GOptionEntry _tmp4_ = {0};
+	GOptionEntry* _tmp5_;
+	gint _tmp5__length1;
+	GOptionEntry _tmp6_;
 	GOptionEntry no_monitoring = {0};
-	const gchar* _tmp9_ = NULL;
-	GOptionEntry _tmp10_ = {0};
-	GOptionEntry* _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-	GOptionEntry _tmp12_ = {0};
+	GOptionEntry _tmp7_ = {0};
+	GOptionEntry* _tmp8_;
+	gint _tmp8__length1;
+	GOptionEntry _tmp9_;
 	GOptionEntry no_startup = {0};
-	const gchar* _tmp13_ = NULL;
-	GOptionEntry _tmp14_ = {0};
-	GOptionEntry* _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	GOptionEntry _tmp16_ = {0};
+	GOptionEntry _tmp10_ = {0};
+	GOptionEntry* _tmp11_;
+	gint _tmp11__length1;
+	GOptionEntry _tmp12_;
 	GOptionEntry version = {0};
-	const gchar* _tmp17_ = NULL;
-	GOptionEntry _tmp18_ = {0};
-	GOptionEntry* _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
-	GOptionEntry _tmp20_ = {0};
+	GOptionEntry _tmp13_ = {0};
+	GOptionEntry* _tmp14_;
+	gint _tmp14__length1;
+	GOptionEntry _tmp15_;
 	GOptionEntry terminator = {0};
-	GOptionEntry _tmp21_ = {0};
-	GOptionEntry* _tmp22_ = NULL;
-	gint _tmp22__length1 = 0;
-	GOptionEntry _tmp23_ = {0};
-	GOptionEntry* _tmp24_ = NULL;
-	gint _tmp24__length1 = 0;
-	GOptionEntry* _tmp25_ = NULL;
-	gint _tmp25__length1 = 0;
-	GOptionEntry* _tmp26_ = NULL;
-	gint _tmp26__length1 = 0;
+	GOptionEntry _tmp16_ = {0};
+	GOptionEntry* _tmp17_;
+	gint _tmp17__length1;
+	GOptionEntry _tmp18_;
+	GOptionEntry* _tmp19_;
+	gint _tmp19__length1;
+	GOptionEntry* _tmp20_;
+	gint _tmp20__length1;
+	GOptionEntry* _tmp21_;
+	gint _tmp21__length1;
 #line 289 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0_ = commandline_options_entries;
 #line 289 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0__length1 = commandline_options_entries_length1;
 #line 289 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp0_ != NULL) {
-#line 2097 "main.c"
-		GOptionEntry* _tmp1_ = NULL;
-		gint _tmp1__length1 = 0;
-		GOptionEntry* _tmp2_ = NULL;
-		gint _tmp2__length1 = 0;
-		GOptionEntry* _tmp3_ = NULL;
-		gint _tmp3__length1 = 0;
+#line 2077 "main.c"
+		GOptionEntry* _tmp1_;
+		gint _tmp1__length1;
+		GOptionEntry* _tmp2_;
+		gint _tmp2__length1;
+		GOptionEntry* _tmp3_;
+		gint _tmp3__length1;
 #line 290 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp1_ = commandline_options_entries;
 #line 290 "/home/jens/Source/shotwell/src/main.vala"
@@ -2124,238 +2104,228 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
 		if (result_length1) {
 #line 290 "/home/jens/Source/shotwell/src/main.vala"
 			*result_length1 = _tmp3__length1;
-#line 2120 "main.c"
+#line 2100 "main.c"
 		}
 #line 290 "/home/jens/Source/shotwell/src/main.vala"
 		result = _tmp3_;
 #line 290 "/home/jens/Source/shotwell/src/main.vala"
 		return result;
-#line 2126 "main.c"
+#line 2106 "main.c"
 	}
 #line 292 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp4_ = _ ("Path to Shotwell’s private data");
+	_tmp4_.long_name = "datadir";
 #line 292 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp5_ = _ ("DIRECTORY");
+	_tmp4_.short_name = 'd';
 #line 292 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp6_.long_name = "datadir";
+	_tmp4_.flags = 0;
 #line 292 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp6_.short_name = 'd';
+	_tmp4_.arg = G_OPTION_ARG_FILENAME;
 #line 292 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp6_.flags = 0;
+	_tmp4_.arg_data = &commandline_options_data_dir;
 #line 292 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp6_.arg = G_OPTION_ARG_FILENAME;
+	_tmp4_.description = _ ("Path to Shotwell’s private data");
 #line 292 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp6_.arg_data = &commandline_options_data_dir;
+	_tmp4_.arg_description = _ ("DIRECTORY");
 #line 292 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp6_.description = _tmp4_;
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp6_.arg_description = _tmp5_;
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
-	datadir = _tmp6_;
+	datadir = _tmp4_;
 #line 294 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp7_ = commandline_options_entries;
+	_tmp5_ = commandline_options_entries;
 #line 294 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp7__length1 = commandline_options_entries_length1;
+	_tmp5__length1 = commandline_options_entries_length1;
 #line 294 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp8_ = datadir;
+	_tmp6_ = datadir;
 #line 294 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add70 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp8_);
+	_vala_array_add70 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp6_);
 #line 296 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp9_ = _ ("Do not monitor library directory at runtime for changes");
+	_tmp7_.long_name = "no-runtime-monitoring";
 #line 296 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp10_.long_name = "no-runtime-monitoring";
+	_tmp7_.short_name = (gchar) 0;
 #line 296 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp10_.short_name = (gchar) 0;
+	_tmp7_.flags = 0;
 #line 296 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp10_.flags = 0;
+	_tmp7_.arg = G_OPTION_ARG_NONE;
 #line 296 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp10_.arg = G_OPTION_ARG_NONE;
-#line 296 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp10_.arg_data = &commandline_options_no_runtime_monitoring;
+	_tmp7_.arg_data = &commandline_options_no_runtime_monitoring;
 #line 296 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp10_.description = _tmp9_;
+	_tmp7_.description = _ ("Do not monitor library directory at runtime for changes");
 #line 296 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp10_.arg_description = NULL;
+	_tmp7_.arg_description = NULL;
 #line 296 "/home/jens/Source/shotwell/src/main.vala"
-	no_monitoring = _tmp10_;
+	no_monitoring = _tmp7_;
 #line 298 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp11_ = commandline_options_entries;
+	_tmp8_ = commandline_options_entries;
 #line 298 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp11__length1 = commandline_options_entries_length1;
+	_tmp8__length1 = commandline_options_entries_length1;
 #line 298 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp12_ = no_monitoring;
+	_tmp9_ = no_monitoring;
 #line 298 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add71 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp12_);
+	_vala_array_add71 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp9_);
 #line 300 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp13_ = _ ("Don’t display startup progress meter");
+	_tmp10_.long_name = "no-startup-progress";
 #line 300 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp14_.long_name = "no-startup-progress";
-#line 300 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp14_.short_name = (gchar) 0;
+	_tmp10_.short_name = (gchar) 0;
 #line 300 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp14_.flags = 0;
+	_tmp10_.flags = 0;
 #line 300 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp14_.arg = G_OPTION_ARG_NONE;
+	_tmp10_.arg = G_OPTION_ARG_NONE;
 #line 300 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp14_.arg_data = &commandline_options_no_startup_progress;
+	_tmp10_.arg_data = &commandline_options_no_startup_progress;
 #line 300 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp14_.description = _tmp13_;
+	_tmp10_.description = _ ("Don’t display startup progress meter");
 #line 300 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp14_.arg_description = NULL;
+	_tmp10_.arg_description = NULL;
 #line 300 "/home/jens/Source/shotwell/src/main.vala"
-	no_startup = _tmp14_;
+	no_startup = _tmp10_;
 #line 302 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp15_ = commandline_options_entries;
+	_tmp11_ = commandline_options_entries;
 #line 302 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp15__length1 = commandline_options_entries_length1;
+	_tmp11__length1 = commandline_options_entries_length1;
 #line 302 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp16_ = no_startup;
+	_tmp12_ = no_startup;
 #line 302 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add72 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp16_);
+	_vala_array_add72 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp12_);
 #line 304 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp17_ = _ ("Show the application’s version");
+	_tmp13_.long_name = "version";
 #line 304 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp18_.long_name = "version";
+	_tmp13_.short_name = 'V';
 #line 304 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp18_.short_name = 'V';
+	_tmp13_.flags = 0;
 #line 304 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp18_.flags = 0;
+	_tmp13_.arg = G_OPTION_ARG_NONE;
 #line 304 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp18_.arg = G_OPTION_ARG_NONE;
+	_tmp13_.arg_data = &commandline_options_show_version;
 #line 304 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp18_.arg_data = &commandline_options_show_version;
+	_tmp13_.description = _ ("Show the application’s version");
 #line 304 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp18_.description = _tmp17_;
+	_tmp13_.arg_description = NULL;
 #line 304 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp18_.arg_description = NULL;
-#line 304 "/home/jens/Source/shotwell/src/main.vala"
-	version = _tmp18_;
+	version = _tmp13_;
 #line 306 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp19_ = commandline_options_entries;
+	_tmp14_ = commandline_options_entries;
 #line 306 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp19__length1 = commandline_options_entries_length1;
+	_tmp14__length1 = commandline_options_entries_length1;
 #line 306 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp20_ = version;
+	_tmp15_ = version;
 #line 306 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add73 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp20_);
+	_vala_array_add73 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp15_);
 #line 308 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp21_.long_name = NULL;
+	_tmp16_.long_name = NULL;
 #line 308 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp21_.short_name = (gchar) 0;
+	_tmp16_.short_name = (gchar) 0;
 #line 308 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp21_.flags = 0;
+	_tmp16_.flags = 0;
 #line 308 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp21_.arg = 0;
+	_tmp16_.arg = 0;
 #line 308 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp21_.arg_data = NULL;
+	_tmp16_.arg_data = NULL;
 #line 308 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp21_.description = NULL;
+	_tmp16_.description = NULL;
 #line 308 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp21_.arg_description = NULL;
+	_tmp16_.arg_description = NULL;
 #line 308 "/home/jens/Source/shotwell/src/main.vala"
-	terminator = _tmp21_;
+	terminator = _tmp16_;
 #line 309 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp22_ = commandline_options_entries;
+	_tmp17_ = commandline_options_entries;
 #line 309 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp22__length1 = commandline_options_entries_length1;
+	_tmp17__length1 = commandline_options_entries_length1;
 #line 309 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp23_ = terminator;
+	_tmp18_ = terminator;
 #line 309 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add74 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp23_);
+	_vala_array_add74 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp18_);
 #line 311 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp24_ = commandline_options_entries;
+	_tmp19_ = commandline_options_entries;
 #line 311 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp24__length1 = commandline_options_entries_length1;
+	_tmp19__length1 = commandline_options_entries_length1;
 #line 311 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp25_ = (_tmp24_ != NULL) ? _vala_array_dup27 (_tmp24_, _tmp24__length1) : ((gpointer) _tmp24_);
+	_tmp20_ = (_tmp19_ != NULL) ? _vala_array_dup27 (_tmp19_, _tmp19__length1) : ((gpointer) _tmp19_);
 #line 311 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp25__length1 = _tmp24__length1;
+	_tmp20__length1 = _tmp19__length1;
 #line 311 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp26_ = _tmp25_;
+	_tmp21_ = _tmp20_;
 #line 311 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp26__length1 = _tmp25__length1;
+	_tmp21__length1 = _tmp20__length1;
 #line 311 "/home/jens/Source/shotwell/src/main.vala"
 	if (result_length1) {
 #line 311 "/home/jens/Source/shotwell/src/main.vala"
-		*result_length1 = _tmp26__length1;
-#line 2274 "main.c"
+		*result_length1 = _tmp21__length1;
+#line 2244 "main.c"
 	}
 #line 311 "/home/jens/Source/shotwell/src/main.vala"
-	result = _tmp26_;
+	result = _tmp21_;
 #line 311 "/home/jens/Source/shotwell/src/main.vala"
 	return result;
-#line 2280 "main.c"
+#line 2250 "main.c"
 }
 
 
-static void _vala_array_add75 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add75 (gchar** * array, int* length, int* size, gchar* value) {
 #line 376 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
 #line 376 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 376 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 2291 "main.c"
+#line 2261 "main.c"
 	}
 #line 376 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = value;
 #line 376 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[*length] = NULL;
-#line 2297 "main.c"
+#line 2267 "main.c"
 }
 
 
 static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2317 "main.c"
+#line 2287 "main.c"
 }
 
 
 void _vala_main (gchar** args, int args_length1) {
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	const gchar* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp22_ = FALSE;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	const gchar* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp20_;
 	gchar** mounts = NULL;
-	gchar** _tmp23_ = NULL;
-	gint mounts_length1 = 0;
-	gint _mounts_size_ = 0;
+	gchar** _tmp21_;
+	gint mounts_length1;
+	gint _mounts_size_;
 	gchar* filename = NULL;
-	const gchar* _tmp44_ = NULL;
-	const gchar* _tmp45_ = NULL;
-	gboolean _tmp46_ = FALSE;
-	GDateTime* _tmp53_ = NULL;
-	GDateTime* _tmp54_ = NULL;
-	const gchar* _tmp55_ = NULL;
-	const gchar* _tmp56_ = NULL;
-	gboolean _tmp57_ = FALSE;
-	const gchar* _tmp58_ = NULL;
-	gchar** _tmp60_ = NULL;
-	gint _tmp60__length1 = 0;
-	GTimer* _tmp61_ = NULL;
-	GTimer* _tmp62_ = NULL;
-	const gchar* _tmp63_ = NULL;
-	gboolean _tmp64_ = FALSE;
-	gboolean _tmp67_ = FALSE;
-	const gchar* _tmp68_ = NULL;
-	gboolean _tmp69_ = FALSE;
+	const gchar* _tmp42_ = NULL;
+	const gchar* _tmp43_;
+	gboolean _tmp44_;
+	GDateTime* _tmp51_;
+	GDateTime* _tmp52_;
+	const gchar* _tmp53_;
+	const gchar* _tmp54_;
+	gboolean _tmp55_;
+	const gchar* _tmp56_;
+	gchar** _tmp58_;
+	gint _tmp58__length1;
+	GTimer* _tmp59_;
+	GTimer* _tmp60_;
+	const gchar* _tmp61_;
+	gboolean _tmp62_;
+	gboolean _tmp65_ = FALSE;
+	const gchar* _tmp66_;
+	gboolean _tmp67_;
 	GError * _inner_error_ = NULL;
 #line 319 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0_ = args;
@@ -2381,13 +2351,13 @@ void _vala_main (gchar** args, int args_length1) {
 	_g_object_unref0 (_tmp3_);
 #line 335 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp4_) {
-#line 2377 "main.c"
-		GFile* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
+#line 2347 "main.c"
+		GFile* _tmp5_;
+		GFile* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
 #line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp5_ = app_dirs_get_exec_dir ();
 #line 336 "/home/jens/Source/shotwell/src/main.vala"
@@ -2408,79 +2378,73 @@ void _vala_main (gchar** args, int args_length1) {
 		_g_free0 (_tmp8_);
 #line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (_tmp6_);
-#line 2404 "main.c"
+#line 2374 "main.c"
 	}
 	{
-		const gchar* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
-		GOptionEntry* _tmp13_ = NULL;
-		GOptionEntry* _tmp14_ = NULL;
-		gint _tmp14__length1 = 0;
+		gint _tmp11_;
+		GOptionEntry* _tmp12_;
+		GOptionEntry* _tmp13_;
+		gint _tmp13__length1;
 #line 342 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp11_ = _ ("[FILE]");
+		_tmp12_ = commandline_options_get_options (&_tmp11_);
 #line 342 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp13_ = commandline_options_get_options (&_tmp12_);
+		_tmp13_ = _tmp12_;
 #line 342 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp14_ = _tmp13_;
+		_tmp13__length1 = _tmp11_;
 #line 342 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp14__length1 = _tmp12_;
+		gtk_init_with_args (&args_length1, &args, _ ("[FILE]"), _tmp13_, RESOURCES_APP_GETTEXT_PACKAGE, &_inner_error_);
 #line 342 "/home/jens/Source/shotwell/src/main.vala"
-		gtk_init_with_args (&args_length1, &args, _tmp11_, _tmp14_, RESOURCES_APP_GETTEXT_PACKAGE, &_inner_error_);
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp14_ = (g_free (_tmp14_), NULL);
+		_tmp13_ = (g_free (_tmp13_), NULL);
 #line 342 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2426 "main.c"
-			goto __catch224_g_error;
+#line 2393 "main.c"
+			goto __catch225_g_error;
 		}
 	}
-	goto __finally224;
-	__catch224_g_error:
+	goto __finally225;
+	__catch225_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		gchar** _tmp20_ = NULL;
-		gint _tmp20__length1 = 0;
-		const gchar* _tmp21_ = NULL;
+		GError* _tmp14_;
+		const gchar* _tmp15_;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
+		gchar** _tmp18_;
+		gint _tmp18__length1;
+		const gchar* _tmp19_;
 #line 341 "/home/jens/Source/shotwell/src/main.vala"
 		e = _inner_error_;
 #line 341 "/home/jens/Source/shotwell/src/main.vala"
 		_inner_error_ = NULL;
 #line 345 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp15_ = e;
+		_tmp14_ = e;
 #line 345 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp16_ = _tmp15_->message;
+		_tmp15_ = _tmp14_->message;
 #line 345 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp17_ = g_strconcat (_tmp16_, "\n", NULL);
+		_tmp16_ = g_strconcat (_tmp15_, "\n", NULL);
 #line 345 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp18_ = _tmp17_;
+		_tmp17_ = _tmp16_;
 #line 345 "/home/jens/Source/shotwell/src/main.vala"
-		g_print ("%s", _tmp18_);
+		g_print ("%s", _tmp17_);
 #line 345 "/home/jens/Source/shotwell/src/main.vala"
-		_g_free0 (_tmp18_);
-#line 346 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp19_ = _ ("Run “%s --help” to see a full list of available command line options.\n");
+		_g_free0 (_tmp17_);
 #line 346 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp20_ = args;
+		_tmp18_ = args;
 #line 346 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp20__length1 = args_length1;
+		_tmp18__length1 = args_length1;
 #line 346 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp21_ = _tmp20_[0];
+		_tmp19_ = _tmp18_[0];
 #line 346 "/home/jens/Source/shotwell/src/main.vala"
-		g_print (_tmp19_, _tmp21_);
+		g_print (_ ("Run “%s --help” to see a full list of available command line options.\n"), _tmp19_);
 #line 347 "/home/jens/Source/shotwell/src/main.vala"
 		app_dirs_terminate ();
 #line 348 "/home/jens/Source/shotwell/src/main.vala"
 		_g_error_free0 (e);
 #line 348 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 2474 "main.c"
+#line 2438 "main.c"
 	}
-	__finally224:
+	__finally225:
 #line 341 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 341 "/home/jens/Source/shotwell/src/main.vala"
@@ -2489,307 +2453,307 @@ void _vala_main (gchar** args, int args_length1) {
 		g_clear_error (&_inner_error_);
 #line 341 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 2485 "main.c"
+#line 2449 "main.c"
 	}
 #line 351 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp22_ = commandline_options_show_version;
+	_tmp20_ = commandline_options_show_version;
 #line 351 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp22_) {
+	if (_tmp20_) {
 #line 352 "/home/jens/Source/shotwell/src/main.vala"
 		if (RESOURCES_GIT_VERSION != NULL) {
 #line 353 "/home/jens/Source/shotwell/src/main.vala"
 			g_print ("%s %s (%s)\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
-#line 2495 "main.c"
+#line 2459 "main.c"
 		} else {
 #line 355 "/home/jens/Source/shotwell/src/main.vala"
 			g_print ("%s %s\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
-#line 2499 "main.c"
+#line 2463 "main.c"
 		}
 #line 357 "/home/jens/Source/shotwell/src/main.vala"
 		app_dirs_terminate ();
 #line 359 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 2505 "main.c"
+#line 2469 "main.c"
 	}
 #line 369 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp23_ = g_new0 (gchar*, 0 + 1);
+	_tmp21_ = g_new0 (gchar*, 0 + 1);
 #line 369 "/home/jens/Source/shotwell/src/main.vala"
-	mounts = _tmp23_;
+	mounts = _tmp21_;
 #line 369 "/home/jens/Source/shotwell/src/main.vala"
 	mounts_length1 = 0;
 #line 369 "/home/jens/Source/shotwell/src/main.vala"
 	_mounts_size_ = mounts_length1;
 #line 370 "/home/jens/Source/shotwell/src/main.vala"
 	filename = NULL;
-#line 2517 "main.c"
+#line 2481 "main.c"
 	{
 		gint ctr = 0;
 #line 372 "/home/jens/Source/shotwell/src/main.vala"
 		ctr = 1;
-#line 2522 "main.c"
+#line 2486 "main.c"
 		{
-			gboolean _tmp24_ = FALSE;
+			gboolean _tmp22_ = FALSE;
 #line 372 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp24_ = TRUE;
+			_tmp22_ = TRUE;
 #line 372 "/home/jens/Source/shotwell/src/main.vala"
 			while (TRUE) {
-#line 2529 "main.c"
-				gint _tmp26_ = 0;
-				gchar** _tmp27_ = NULL;
-				gint _tmp27__length1 = 0;
+#line 2493 "main.c"
+				gint _tmp24_;
+				gchar** _tmp25_;
+				gint _tmp25__length1;
 				gchar* arg = NULL;
-				gchar** _tmp28_ = NULL;
-				gint _tmp28__length1 = 0;
-				gint _tmp29_ = 0;
-				const gchar* _tmp30_ = NULL;
-				gchar* _tmp31_ = NULL;
-				const gchar* _tmp32_ = NULL;
-				gboolean _tmp33_ = FALSE;
+				gchar** _tmp26_;
+				gint _tmp26__length1;
+				gint _tmp27_;
+				const gchar* _tmp28_;
+				gchar* _tmp29_;
+				const gchar* _tmp30_;
+				gboolean _tmp31_;
 #line 372 "/home/jens/Source/shotwell/src/main.vala"
-				if (!_tmp24_) {
-#line 2543 "main.c"
-					gint _tmp25_ = 0;
+				if (!_tmp22_) {
+#line 2507 "main.c"
+					gint _tmp23_;
 #line 372 "/home/jens/Source/shotwell/src/main.vala"
-					_tmp25_ = ctr;
+					_tmp23_ = ctr;
 #line 372 "/home/jens/Source/shotwell/src/main.vala"
-					ctr = _tmp25_ + 1;
-#line 2549 "main.c"
+					ctr = _tmp23_ + 1;
+#line 2513 "main.c"
 				}
 #line 372 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp24_ = FALSE;
+				_tmp22_ = FALSE;
 #line 372 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp26_ = ctr;
+				_tmp24_ = ctr;
 #line 372 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp27_ = args;
+				_tmp25_ = args;
 #line 372 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp27__length1 = args_length1;
+				_tmp25__length1 = args_length1;
 #line 372 "/home/jens/Source/shotwell/src/main.vala"
-				if (!(_tmp26_ < _tmp27__length1)) {
+				if (!(_tmp24_ < _tmp25__length1)) {
 #line 372 "/home/jens/Source/shotwell/src/main.vala"
 					break;
-#line 2563 "main.c"
+#line 2527 "main.c"
 				}
 #line 373 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp28_ = args;
+				_tmp26_ = args;
 #line 373 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp28__length1 = args_length1;
+				_tmp26__length1 = args_length1;
 #line 373 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp29_ = ctr;
+				_tmp27_ = ctr;
 #line 373 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp30_ = _tmp28_[_tmp29_];
+				_tmp28_ = _tmp26_[_tmp27_];
 #line 373 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp31_ = g_strdup (_tmp30_);
+				_tmp29_ = g_strdup (_tmp28_);
 #line 373 "/home/jens/Source/shotwell/src/main.vala"
-				arg = _tmp31_;
+				arg = _tmp29_;
 #line 375 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp32_ = arg;
+				_tmp30_ = arg;
 #line 375 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp33_ = library_window_is_mount_uri_supported (_tmp32_);
+				_tmp31_ = library_window_is_mount_uri_supported (_tmp30_);
 #line 375 "/home/jens/Source/shotwell/src/main.vala"
-				if (_tmp33_) {
-#line 2583 "main.c"
-					gchar** _tmp34_ = NULL;
-					gint _tmp34__length1 = 0;
-					const gchar* _tmp35_ = NULL;
-					gchar* _tmp36_ = NULL;
+				if (_tmp31_) {
+#line 2547 "main.c"
+					gchar** _tmp32_;
+					gint _tmp32__length1;
+					const gchar* _tmp33_;
+					gchar* _tmp34_;
 #line 376 "/home/jens/Source/shotwell/src/main.vala"
-					_tmp34_ = mounts;
+					_tmp32_ = mounts;
 #line 376 "/home/jens/Source/shotwell/src/main.vala"
-					_tmp34__length1 = mounts_length1;
+					_tmp32__length1 = mounts_length1;
 #line 376 "/home/jens/Source/shotwell/src/main.vala"
-					_tmp35_ = arg;
+					_tmp33_ = arg;
 #line 376 "/home/jens/Source/shotwell/src/main.vala"
-					_tmp36_ = g_strdup (_tmp35_);
+					_tmp34_ = g_strdup (_tmp33_);
 #line 376 "/home/jens/Source/shotwell/src/main.vala"
-					_vala_array_add75 (&mounts, &mounts_length1, &_mounts_size_, _tmp36_);
-#line 2598 "main.c"
+					_vala_array_add75 (&mounts, &mounts_length1, &_mounts_size_, _tmp34_);
+#line 2562 "main.c"
 				} else {
-					gboolean _tmp37_ = FALSE;
-					const gchar* _tmp38_ = NULL;
-					gboolean _tmp39_ = FALSE;
+					gboolean _tmp35_ = FALSE;
+					const gchar* _tmp36_;
+					gboolean _tmp37_;
 #line 377 "/home/jens/Source/shotwell/src/main.vala"
-					_tmp38_ = filename;
+					_tmp36_ = filename;
 #line 377 "/home/jens/Source/shotwell/src/main.vala"
-					_tmp39_ = is_string_empty (_tmp38_);
+					_tmp37_ = is_string_empty (_tmp36_);
 #line 377 "/home/jens/Source/shotwell/src/main.vala"
-					if (_tmp39_) {
-#line 2609 "main.c"
-						const gchar* _tmp40_ = NULL;
-						gboolean _tmp41_ = FALSE;
+					if (_tmp37_) {
+#line 2573 "main.c"
+						const gchar* _tmp38_;
+						gboolean _tmp39_;
 #line 377 "/home/jens/Source/shotwell/src/main.vala"
-						_tmp40_ = arg;
+						_tmp38_ = arg;
 #line 377 "/home/jens/Source/shotwell/src/main.vala"
-						_tmp41_ = string_contains (_tmp40_, "://");
+						_tmp39_ = string_contains (_tmp38_, "://");
 #line 377 "/home/jens/Source/shotwell/src/main.vala"
-						_tmp37_ = !_tmp41_;
-#line 2618 "main.c"
+						_tmp35_ = !_tmp39_;
+#line 2582 "main.c"
 					} else {
 #line 377 "/home/jens/Source/shotwell/src/main.vala"
-						_tmp37_ = FALSE;
-#line 2622 "main.c"
+						_tmp35_ = FALSE;
+#line 2586 "main.c"
 					}
 #line 377 "/home/jens/Source/shotwell/src/main.vala"
-					if (_tmp37_) {
-#line 2626 "main.c"
-						const gchar* _tmp42_ = NULL;
-						gchar* _tmp43_ = NULL;
+					if (_tmp35_) {
+#line 2590 "main.c"
+						const gchar* _tmp40_;
+						gchar* _tmp41_;
 #line 378 "/home/jens/Source/shotwell/src/main.vala"
-						_tmp42_ = arg;
+						_tmp40_ = arg;
 #line 378 "/home/jens/Source/shotwell/src/main.vala"
-						_tmp43_ = g_strdup (_tmp42_);
+						_tmp41_ = g_strdup (_tmp40_);
 #line 378 "/home/jens/Source/shotwell/src/main.vala"
 						_g_free0 (filename);
 #line 378 "/home/jens/Source/shotwell/src/main.vala"
-						filename = _tmp43_;
-#line 2637 "main.c"
+						filename = _tmp41_;
+#line 2601 "main.c"
 					}
 				}
 #line 372 "/home/jens/Source/shotwell/src/main.vala"
 				_g_free0 (arg);
-#line 2642 "main.c"
+#line 2606 "main.c"
 			}
 		}
 	}
 #line 382 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp45_ = filename;
+	_tmp43_ = filename;
 #line 382 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp46_ = is_string_empty (_tmp45_);
+	_tmp44_ = is_string_empty (_tmp43_);
 #line 382 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp46_) {
+	if (_tmp44_) {
 #line 382 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp44_ = DEBUG_LIBRARY_PREFIX;
-#line 2654 "main.c"
+		_tmp42_ = DEBUG_LIBRARY_PREFIX;
+#line 2618 "main.c"
 	} else {
 #line 382 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp44_ = DEBUG_VIEWER_PREFIX;
-#line 2658 "main.c"
+		_tmp42_ = DEBUG_VIEWER_PREFIX;
+#line 2622 "main.c"
 	}
 #line 382 "/home/jens/Source/shotwell/src/main.vala"
-	debug_init (_tmp44_);
+	debug_init (_tmp42_);
 #line 384 "/home/jens/Source/shotwell/src/main.vala"
 	if (RESOURCES_GIT_VERSION != NULL) {
-#line 2664 "main.c"
-		const gchar* _tmp47_ = NULL;
-		const gchar* _tmp48_ = NULL;
-		gboolean _tmp49_ = FALSE;
+#line 2628 "main.c"
+		const gchar* _tmp45_ = NULL;
+		const gchar* _tmp46_;
+		gboolean _tmp47_;
 #line 386 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp48_ = filename;
+		_tmp46_ = filename;
 #line 386 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp49_ = is_string_empty (_tmp48_);
+		_tmp47_ = is_string_empty (_tmp46_);
 #line 386 "/home/jens/Source/shotwell/src/main.vala"
-		if (_tmp49_) {
+		if (_tmp47_) {
 #line 386 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp47_ = RESOURCES_APP_LIBRARY_ROLE;
-#line 2676 "main.c"
+			_tmp45_ = RESOURCES_APP_LIBRARY_ROLE;
+#line 2640 "main.c"
 		} else {
 #line 386 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp47_ = RESOURCES_APP_DIRECT_ROLE;
-#line 2680 "main.c"
+			_tmp45_ = RESOURCES_APP_DIRECT_ROLE;
+#line 2644 "main.c"
 		}
 #line 385 "/home/jens/Source/shotwell/src/main.vala"
-		g_message ("main.vala:385: Shotwell %s %s (%s)", _tmp47_, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
-#line 2684 "main.c"
+		g_message ("main.vala:385: Shotwell %s %s (%s)", _tmp45_, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
+#line 2648 "main.c"
 	} else {
-		const gchar* _tmp50_ = NULL;
-		const gchar* _tmp51_ = NULL;
-		gboolean _tmp52_ = FALSE;
+		const gchar* _tmp48_ = NULL;
+		const gchar* _tmp49_;
+		gboolean _tmp50_;
 #line 390 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp51_ = filename;
+		_tmp49_ = filename;
 #line 390 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp52_ = is_string_empty (_tmp51_);
+		_tmp50_ = is_string_empty (_tmp49_);
 #line 390 "/home/jens/Source/shotwell/src/main.vala"
-		if (_tmp52_) {
+		if (_tmp50_) {
 #line 390 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp50_ = RESOURCES_APP_LIBRARY_ROLE;
-#line 2697 "main.c"
+			_tmp48_ = RESOURCES_APP_LIBRARY_ROLE;
+#line 2661 "main.c"
 		} else {
 #line 390 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp50_ = RESOURCES_APP_DIRECT_ROLE;
-#line 2701 "main.c"
+			_tmp48_ = RESOURCES_APP_DIRECT_ROLE;
+#line 2665 "main.c"
 		}
 #line 389 "/home/jens/Source/shotwell/src/main.vala"
-		g_message ("main.vala:389: Shotwell %s %s", _tmp50_, RESOURCES_APP_VERSION);
-#line 2705 "main.c"
+		g_message ("main.vala:389: Shotwell %s %s", _tmp48_, RESOURCES_APP_VERSION);
+#line 2669 "main.c"
 	}
 #line 393 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp53_ = g_date_time_new_now_local ();
+	_tmp51_ = g_date_time_new_now_local ();
 #line 393 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp54_ = _tmp53_;
+	_tmp52_ = _tmp51_;
 #line 393 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp55_ = g_date_time_get_timezone_abbreviation (_tmp54_);
+	_tmp53_ = g_date_time_get_timezone_abbreviation (_tmp52_);
 #line 393 "/home/jens/Source/shotwell/src/main.vala"
-	g_debug ("main.vala:393: Shotwell is running in timezone %s", _tmp55_);
+	g_debug ("main.vala:393: Shotwell is running in timezone %s", _tmp53_);
 #line 393 "/home/jens/Source/shotwell/src/main.vala"
-	_g_date_time_unref0 (_tmp54_);
+	_g_date_time_unref0 (_tmp52_);
 #line 398 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp56_ = filename;
+	_tmp54_ = filename;
 #line 398 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp57_ = is_string_empty (_tmp56_);
+	_tmp55_ = is_string_empty (_tmp54_);
 #line 398 "/home/jens/Source/shotwell/src/main.vala"
-	application_init (!_tmp57_);
+	application_init (!_tmp55_);
 #line 401 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp58_ = commandline_options_data_dir;
+	_tmp56_ = commandline_options_data_dir;
 #line 401 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp58_ != NULL) {
-#line 2727 "main.c"
-		const gchar* _tmp59_ = NULL;
+	if (_tmp56_ != NULL) {
+#line 2691 "main.c"
+		const gchar* _tmp57_;
 #line 402 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp59_ = commandline_options_data_dir;
+		_tmp57_ = commandline_options_data_dir;
 #line 402 "/home/jens/Source/shotwell/src/main.vala"
-		app_dirs_set_data_dir (_tmp59_);
-#line 2733 "main.c"
+		app_dirs_set_data_dir (_tmp57_);
+#line 2697 "main.c"
 	} else {
 #line 404 "/home/jens/Source/shotwell/src/main.vala"
 		app_dirs_try_migrate_data ();
-#line 2737 "main.c"
+#line 2701 "main.c"
 	}
 #line 407 "/home/jens/Source/shotwell/src/main.vala"
 	app_dirs_verify_data_dir ();
 #line 408 "/home/jens/Source/shotwell/src/main.vala"
 	app_dirs_verify_cache_dir ();
 #line 411 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp60_ = args;
+	_tmp58_ = args;
 #line 411 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp60__length1 = args_length1;
+	_tmp58__length1 = args_length1;
 #line 411 "/home/jens/Source/shotwell/src/main.vala"
-	international_support_init (RESOURCES_APP_GETTEXT_PACKAGE, _tmp60_, _tmp60__length1, INTERNATIONAL_SUPPORT_SYSTEM_LOCALE);
+	international_support_init (RESOURCES_APP_GETTEXT_PACKAGE, _tmp58_, _tmp58__length1, INTERNATIONAL_SUPPORT_SYSTEM_LOCALE);
 #line 413 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp61_ = g_timer_new ();
+	_tmp59_ = g_timer_new ();
 #line 413 "/home/jens/Source/shotwell/src/main.vala"
 	_g_timer_destroy0 (startup_timer);
 #line 413 "/home/jens/Source/shotwell/src/main.vala"
-	startup_timer = _tmp61_;
+	startup_timer = _tmp59_;
 #line 414 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp62_ = startup_timer;
+	_tmp60_ = startup_timer;
 #line 414 "/home/jens/Source/shotwell/src/main.vala"
-	g_timer_start (_tmp62_);
+	g_timer_start (_tmp60_);
 #line 417 "/home/jens/Source/shotwell/src/main.vala"
 	g_set_application_name (RESOURCES_APP_TITLE);
 #line 421 "/home/jens/Source/shotwell/src/main.vala"
 	resources_init ();
 #line 426 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp63_ = filename;
+	_tmp61_ = filename;
 #line 426 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp64_ = is_string_empty (_tmp63_);
+	_tmp62_ = is_string_empty (_tmp61_);
 #line 426 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp64_) {
-#line 2769 "main.c"
-		gchar** _tmp65_ = NULL;
-		gint _tmp65__length1 = 0;
+	if (_tmp62_) {
+#line 2733 "main.c"
+		gchar** _tmp63_;
+		gint _tmp63__length1;
 #line 427 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp65_ = mounts;
+		_tmp63_ = mounts;
 #line 427 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp65__length1 = mounts_length1;
+		_tmp63__length1 = mounts_length1;
 #line 427 "/home/jens/Source/shotwell/src/main.vala"
-		library_exec (_tmp65_, _tmp65__length1);
-#line 2778 "main.c"
+		library_exec (_tmp63_, _tmp63__length1);
+#line 2742 "main.c"
 	} else {
-		const gchar* _tmp66_ = NULL;
+		const gchar* _tmp64_;
 #line 429 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp66_ = filename;
+		_tmp64_ = filename;
 #line 429 "/home/jens/Source/shotwell/src/main.vala"
-		editing_exec (_tmp66_);
-#line 2785 "main.c"
+		editing_exec (_tmp64_);
+#line 2749 "main.c"
 	}
 #line 432 "/home/jens/Source/shotwell/src/main.vala"
 	resources_terminate ();
@@ -2800,124 +2764,124 @@ void _vala_main (gchar** args, int args_length1) {
 #line 435 "/home/jens/Source/shotwell/src/main.vala"
 	app_dirs_terminate ();
 #line 440 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp68_ = filename;
+	_tmp66_ = filename;
 #line 440 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp69_ = is_string_empty (_tmp68_);
+	_tmp67_ = is_string_empty (_tmp66_);
 #line 440 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp69_) {
-#line 2801 "main.c"
-		gboolean _tmp70_ = FALSE;
+	if (_tmp67_) {
+#line 2765 "main.c"
+		gboolean _tmp68_;
 #line 440 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp70_ = was_already_running;
+		_tmp68_ = was_already_running;
 #line 440 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp67_ = !_tmp70_;
-#line 2807 "main.c"
+		_tmp65_ = !_tmp68_;
+#line 2771 "main.c"
 	} else {
 #line 440 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp67_ = FALSE;
-#line 2811 "main.c"
+		_tmp65_ = FALSE;
+#line 2775 "main.c"
 	}
 #line 440 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp67_) {
-#line 2815 "main.c"
+	if (_tmp65_) {
+#line 2779 "main.c"
 		gchar* orig_path = NULL;
-		GFile* _tmp71_ = NULL;
-		GFile* _tmp72_ = NULL;
-		GFile* _tmp73_ = NULL;
-		GFile* _tmp74_ = NULL;
-		gchar* _tmp75_ = NULL;
-		gchar* _tmp76_ = NULL;
+		GFile* _tmp69_;
+		GFile* _tmp70_;
+		GFile* _tmp71_;
+		GFile* _tmp72_;
+		gchar* _tmp73_;
+		gchar* _tmp74_;
 		gchar* backup_path = NULL;
-		const gchar* _tmp77_ = NULL;
-		gchar* _tmp78_ = NULL;
+		const gchar* _tmp75_;
+		gchar* _tmp76_;
 #line 441 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp71_ = app_dirs_get_data_subdir ("data", NULL);
+		_tmp69_ = app_dirs_get_data_subdir ("data", NULL);
 #line 441 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp72_ = _tmp71_;
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp73_ = g_file_get_child (_tmp72_, "photo.db");
+		_tmp70_ = _tmp69_;
 #line 441 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp74_ = _tmp73_;
+		_tmp71_ = g_file_get_child (_tmp70_, "photo.db");
 #line 441 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp75_ = g_file_get_path (_tmp74_);
+		_tmp72_ = _tmp71_;
 #line 441 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp76_ = _tmp75_;
+		_tmp73_ = g_file_get_path (_tmp72_);
 #line 441 "/home/jens/Source/shotwell/src/main.vala"
-		_g_object_unref0 (_tmp74_);
+		_tmp74_ = _tmp73_;
 #line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (_tmp72_);
 #line 441 "/home/jens/Source/shotwell/src/main.vala"
-		orig_path = _tmp76_;
+		_g_object_unref0 (_tmp70_);
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
+		orig_path = _tmp74_;
 #line 442 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp77_ = orig_path;
+		_tmp75_ = orig_path;
 #line 442 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp78_ = g_strconcat (_tmp77_, ".bak", NULL);
+		_tmp76_ = g_strconcat (_tmp75_, ".bak", NULL);
 #line 442 "/home/jens/Source/shotwell/src/main.vala"
-		backup_path = _tmp78_;
-#line 2850 "main.c"
+		backup_path = _tmp76_;
+#line 2814 "main.c"
 		{
 			GFile* src = NULL;
-			const gchar* _tmp79_ = NULL;
-			GFile* _tmp80_ = NULL;
+			const gchar* _tmp77_;
+			GFile* _tmp78_;
 			GFile* dest = NULL;
-			const gchar* _tmp81_ = NULL;
-			GFile* _tmp82_ = NULL;
-			GFile* _tmp83_ = NULL;
-			GFile* _tmp84_ = NULL;
+			const gchar* _tmp79_;
+			GFile* _tmp80_;
+			GFile* _tmp81_;
+			GFile* _tmp82_;
 #line 444 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp79_ = orig_path;
+			_tmp77_ = orig_path;
 #line 444 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp80_ = g_file_new_for_commandline_arg (_tmp79_);
+			_tmp78_ = g_file_new_for_commandline_arg (_tmp77_);
 #line 444 "/home/jens/Source/shotwell/src/main.vala"
-			src = _tmp80_;
+			src = _tmp78_;
 #line 445 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp81_ = backup_path;
+			_tmp79_ = backup_path;
 #line 445 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp82_ = g_file_new_for_commandline_arg (_tmp81_);
+			_tmp80_ = g_file_new_for_commandline_arg (_tmp79_);
 #line 445 "/home/jens/Source/shotwell/src/main.vala"
-			dest = _tmp82_;
+			dest = _tmp80_;
 #line 446 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp83_ = src;
+			_tmp81_ = src;
 #line 446 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp84_ = dest;
+			_tmp82_ = dest;
 #line 446 "/home/jens/Source/shotwell/src/main.vala"
-			g_file_copy (_tmp83_, _tmp84_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_);
+			g_file_copy (_tmp81_, _tmp82_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_);
 #line 446 "/home/jens/Source/shotwell/src/main.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 446 "/home/jens/Source/shotwell/src/main.vala"
 				_g_object_unref0 (dest);
 #line 446 "/home/jens/Source/shotwell/src/main.vala"
 				_g_object_unref0 (src);
-#line 2884 "main.c"
-				goto __catch225_g_error;
+#line 2848 "main.c"
+				goto __catch226_g_error;
 			}
 #line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_g_object_unref0 (dest);
 #line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_g_object_unref0 (src);
-#line 2891 "main.c"
+#line 2855 "main.c"
 		}
-		goto __finally225;
-		__catch225_g_error:
+		goto __finally226;
+		__catch226_g_error:
 		{
 			GError* _error_ = NULL;
-			GError* _tmp85_ = NULL;
-			const gchar* _tmp86_ = NULL;
+			GError* _tmp83_;
+			const gchar* _tmp84_;
 #line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_error_ = _inner_error_;
 #line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_inner_error_ = NULL;
 #line 450 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp85_ = _error_;
+			_tmp83_ = _error_;
 #line 450 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp86_ = _tmp85_->message;
+			_tmp84_ = _tmp83_->message;
 #line 450 "/home/jens/Source/shotwell/src/main.vala"
-			g_warning ("main.vala:450: Failed to create backup file of database: %s", _tmp86_);
+			g_warning ("main.vala:450: Failed to create backup file of database: %s", _tmp84_);
 #line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_g_error_free0 (_error_);
-#line 2911 "main.c"
+#line 2875 "main.c"
 		}
-		__finally225:
+		__finally226:
 #line 443 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 443 "/home/jens/Source/shotwell/src/main.vala"
@@ -2934,7 +2898,7 @@ void _vala_main (gchar** args, int args_length1) {
 			g_clear_error (&_inner_error_);
 #line 443 "/home/jens/Source/shotwell/src/main.vala"
 			return;
-#line 2930 "main.c"
+#line 2894 "main.c"
 		}
 #line 453 "/home/jens/Source/shotwell/src/main.vala"
 		sync ();
@@ -2942,20 +2906,17 @@ void _vala_main (gchar** args, int args_length1) {
 		_g_free0 (backup_path);
 #line 440 "/home/jens/Source/shotwell/src/main.vala"
 		_g_free0 (orig_path);
-#line 2938 "main.c"
+#line 2902 "main.c"
 	}
 #line 316 "/home/jens/Source/shotwell/src/main.vala"
 	_g_free0 (filename);
 #line 316 "/home/jens/Source/shotwell/src/main.vala"
 	mounts = (_vala_array_free (mounts, mounts_length1, (GDestroyNotify) g_free), NULL);
-#line 2944 "main.c"
+#line 2908 "main.c"
 }
 
 
 int main (int argc, char ** argv) {
-#if !GLIB_CHECK_VERSION (2,32,0)
-	g_thread_init (NULL);
-#endif
 #if !GLIB_CHECK_VERSION (2,35,0)
 	g_type_init ();
 #endif
@@ -2963,7 +2924,7 @@ int main (int argc, char ** argv) {
 	_vala_main (argv, argc);
 #line 316 "/home/jens/Source/shotwell/src/main.vala"
 	return 0;
-#line 2959 "main.c"
+#line 2920 "main.c"
 }
 
 
diff --git a/src/photos/BmpSupport.c b/src/photos/BmpSupport.c
index 2425607..eeffbb9 100644
--- a/src/photos/BmpSupport.c
+++ b/src/photos/BmpSupport.c
@@ -1,4 +1,4 @@
-/* BmpSupport.c generated by valac 0.34.7, the Vala compiler
+/* BmpSupport.c generated by valac 0.36.6, the Vala compiler
  * generated from BmpSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -507,7 +507,7 @@ static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (Phot
 static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1);
 static gchar** _vala_array_dup11 (gchar** self, int length);
 PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type);
-static void photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties* obj);
+static void photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties * obj);
 gpointer photo_file_sniffer_ref (gpointer instance);
 void photo_file_sniffer_unref (gpointer instance);
 GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -610,12 +610,12 @@ static PhotoMetadata* photos_bmp_file_format_driver_real_create_metadata (PhotoF
 PhotoMetadata* photo_metadata_new (void);
 PhotoMetadata* photo_metadata_construct (GType object_type);
 PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type);
-static void photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver* obj);
+static void photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver * obj);
 
 static const guint8 PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE[2] = {(guint8) 0x42, (guint8) 0x4D};
 
 void photos_bmp_file_format_properties_init (void) {
-	PhotosBmpFileFormatProperties* _tmp0_ = NULL;
+	PhotosBmpFileFormatProperties* _tmp0_;
 #line 16 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp0_ = photos_bmp_file_format_properties_new ();
 #line 16 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -635,8 +635,8 @@ static gpointer _photo_file_format_properties_ref0 (gpointer self) {
 
 PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_get_instance (void) {
 	PhotosBmpFileFormatProperties* result = NULL;
-	PhotosBmpFileFormatProperties* _tmp0_ = NULL;
-	PhotosBmpFileFormatProperties* _tmp1_ = NULL;
+	PhotosBmpFileFormatProperties* _tmp0_;
+	PhotosBmpFileFormatProperties* _tmp1_;
 #line 20 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp0_ = photos_bmp_file_format_properties_instance;
 #line 20 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -678,29 +678,26 @@ static PhotoFileFormatFlags photos_bmp_file_format_properties_real_get_flags (Ph
 static gchar* photos_bmp_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) {
 	PhotosBmpFileFormatProperties * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
 #line 31 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES, PhotosBmpFileFormatProperties);
 #line 32 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp0_ = _ ("BMP");
+	_tmp0_ = g_strdup (_ ("BMP"));
 #line 32 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 32 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 32 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 694 "BmpSupport.c"
+#line 691 "BmpSupport.c"
 }
 
 
 static gchar* photos_bmp_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) {
 	PhotosBmpFileFormatProperties * self;
 	gchar* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 35 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES, PhotosBmpFileFormatProperties);
 #line 36 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -715,7 +712,7 @@ static gchar* photos_bmp_file_format_properties_real_get_default_extension (Phot
 	result = _tmp2_;
 #line 36 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 719 "BmpSupport.c"
+#line 716 "BmpSupport.c"
 }
 
 
@@ -726,29 +723,29 @@ static gchar** _vala_array_dup10 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 730 "BmpSupport.c"
-		gchar* _tmp0_ = NULL;
+#line 727 "BmpSupport.c"
+		gchar* _tmp0_;
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		result[i] = _tmp0_;
-#line 736 "BmpSupport.c"
+#line 733 "BmpSupport.c"
 	}
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 740 "BmpSupport.c"
+#line 737 "BmpSupport.c"
 }
 
 
 static gchar** photos_bmp_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) {
 	PhotosBmpFileFormatProperties * self;
 	gchar** result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
 #line 39 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES, PhotosBmpFileFormatProperties);
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -767,23 +764,23 @@ static gchar** photos_bmp_file_format_properties_real_get_known_extensions (Phot
 	if (result_length1) {
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 771 "BmpSupport.c"
+#line 768 "BmpSupport.c"
 	}
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	result = _tmp2_;
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 777 "BmpSupport.c"
+#line 774 "BmpSupport.c"
 }
 
 
 static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) {
 	PhotosBmpFileFormatProperties * self;
 	gchar* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 43 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES, PhotosBmpFileFormatProperties);
 #line 44 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -798,7 +795,7 @@ static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (Phot
 	result = _tmp2_;
 #line 44 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 802 "BmpSupport.c"
+#line 799 "BmpSupport.c"
 }
 
 
@@ -809,29 +806,29 @@ static gchar** _vala_array_dup11 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 813 "BmpSupport.c"
-		gchar* _tmp0_ = NULL;
+#line 810 "BmpSupport.c"
+		gchar* _tmp0_;
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		result[i] = _tmp0_;
-#line 819 "BmpSupport.c"
+#line 816 "BmpSupport.c"
 	}
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 823 "BmpSupport.c"
+#line 820 "BmpSupport.c"
 }
 
 
 static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) {
 	PhotosBmpFileFormatProperties * self;
 	gchar** result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
 #line 47 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES, PhotosBmpFileFormatProperties);
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -850,13 +847,13 @@ static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileF
 	if (result_length1) {
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 854 "BmpSupport.c"
+#line 851 "BmpSupport.c"
 	}
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	result = _tmp2_;
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 860 "BmpSupport.c"
+#line 857 "BmpSupport.c"
 }
 
 
@@ -866,41 +863,41 @@ PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_construct (GTyp
 	self = (PhotosBmpFileFormatProperties*) photo_file_format_properties_construct (object_type);
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return self;
-#line 870 "BmpSupport.c"
+#line 867 "BmpSupport.c"
 }
 
 
 PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_new (void) {
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return photos_bmp_file_format_properties_construct (PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES);
-#line 877 "BmpSupport.c"
+#line 874 "BmpSupport.c"
 }
 
 
 static void photos_bmp_file_format_properties_class_init (PhotosBmpFileFormatPropertiesClass * klass) {
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar** _tmp2_;
+	gchar* _tmp3_;
+	gchar** _tmp4_;
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	photos_bmp_file_format_properties_parent_class = g_type_class_peek_parent (klass);
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	((PhotoFileFormatPropertiesClass *) klass)->finalize = photos_bmp_file_format_properties_finalize;
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) photos_bmp_file_format_properties_real_get_file_format;
+	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*) (PhotoFileFormatProperties *)) photos_bmp_file_format_properties_real_get_file_format;
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) photos_bmp_file_format_properties_real_get_flags;
+	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*) (PhotoFileFormatProperties *)) photos_bmp_file_format_properties_real_get_flags;
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) photos_bmp_file_format_properties_real_get_user_visible_name;
+	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*) (PhotoFileFormatProperties *)) photos_bmp_file_format_properties_real_get_user_visible_name;
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) photos_bmp_file_format_properties_real_get_default_extension;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*) (PhotoFileFormatProperties *)) photos_bmp_file_format_properties_real_get_default_extension;
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) photos_bmp_file_format_properties_real_get_known_extensions;
+	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*) (PhotoFileFormatProperties *, int*)) photos_bmp_file_format_properties_real_get_known_extensions;
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) photos_bmp_file_format_properties_real_get_default_mime_type;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*) (PhotoFileFormatProperties *)) photos_bmp_file_format_properties_real_get_default_mime_type;
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) photos_bmp_file_format_properties_real_get_mime_types;
+	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*) (PhotoFileFormatProperties *, int*)) photos_bmp_file_format_properties_real_get_mime_types;
 #line 10 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp0_ = g_strdup ("bmp");
 #line 10 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -925,7 +922,7 @@ static void photos_bmp_file_format_properties_class_init (PhotosBmpFileFormatPro
 	photos_bmp_file_format_properties_KNOWN_MIME_TYPES = _tmp4_;
 #line 11 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	photos_bmp_file_format_properties_KNOWN_MIME_TYPES_length1 = 1;
-#line 929 "BmpSupport.c"
+#line 926 "BmpSupport.c"
 }
 
 
@@ -933,13 +930,13 @@ static void photos_bmp_file_format_properties_instance_init (PhotosBmpFileFormat
 }
 
 
-static void photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties* obj) {
+static void photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties * obj) {
 	PhotosBmpFileFormatProperties * self;
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES, PhotosBmpFileFormatProperties);
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	PHOTO_FILE_FORMAT_PROPERTIES_CLASS (photos_bmp_file_format_properties_parent_class)->finalize (obj);
-#line 943 "BmpSupport.c"
+#line 940 "BmpSupport.c"
 }
 
 
@@ -957,8 +954,8 @@ GType photos_bmp_file_format_properties_get_type (void) {
 
 PhotosBmpSniffer* photos_bmp_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) {
 	PhotosBmpSniffer* self = NULL;
-	GFile* _tmp0_ = NULL;
-	PhotoFileSnifferOptions _tmp1_ = 0;
+	GFile* _tmp0_;
+	PhotoFileSnifferOptions _tmp1_;
 #line 55 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 56 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -969,29 +966,29 @@ PhotosBmpSniffer* photos_bmp_sniffer_construct (GType object_type, GFile* file,
 	self = (PhotosBmpSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_);
 #line 55 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return self;
-#line 973 "BmpSupport.c"
+#line 970 "BmpSupport.c"
 }
 
 
 PhotosBmpSniffer* photos_bmp_sniffer_new (GFile* file, PhotoFileSnifferOptions options) {
 #line 55 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return photos_bmp_sniffer_construct (PHOTOS_TYPE_BMP_SNIFFER, file, options);
-#line 980 "BmpSupport.c"
+#line 977 "BmpSupport.c"
 }
 
 
 static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
 	gboolean result = FALSE;
 	GFileInputStream* instream = NULL;
-	GFile* _tmp0_ = NULL;
-	GFileInputStream* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFileInputStream* _tmp1_;
 	guint8* file_lead_sequence = NULL;
-	guint8* _tmp3_ = NULL;
-	gint file_lead_sequence_length1 = 0;
-	gint _file_lead_sequence_size_ = 0;
-	GFileInputStream* _tmp4_ = NULL;
-	guint8* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
+	guint8* _tmp3_;
+	gint file_lead_sequence_length1;
+	gint _file_lead_sequence_size_;
+	GFileInputStream* _tmp4_;
+	guint8* _tmp5_;
+	gint _tmp5__length1;
 	GError * _inner_error_ = NULL;
 #line 59 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
@@ -1003,13 +1000,13 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
 	instream = _tmp1_;
 #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1007 "BmpSupport.c"
+#line 1004 "BmpSupport.c"
 		gboolean _tmp2_ = FALSE;
 #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		return _tmp2_;
-#line 1013 "BmpSupport.c"
+#line 1010 "BmpSupport.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp3_ = g_new0 (guint8, G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE));
@@ -1029,7 +1026,7 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
 	g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_input_stream_get_type (), GInputStream), _tmp5_, (gsize) _tmp5__length1, NULL, &_inner_error_);
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1033 "BmpSupport.c"
+#line 1030 "BmpSupport.c"
 		gboolean _tmp6_ = FALSE;
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		g_propagate_error (error, _inner_error_);
@@ -1039,36 +1036,36 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
 		_g_object_unref0 (instream);
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		return _tmp6_;
-#line 1043 "BmpSupport.c"
+#line 1040 "BmpSupport.c"
 	}
 	{
 		gint i = 0;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		i = 0;
-#line 1049 "BmpSupport.c"
+#line 1046 "BmpSupport.c"
 		{
 			gboolean _tmp7_ = FALSE;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			_tmp7_ = TRUE;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			while (TRUE) {
-#line 1056 "BmpSupport.c"
-				gint _tmp9_ = 0;
-				guint8* _tmp10_ = NULL;
-				gint _tmp10__length1 = 0;
-				gint _tmp11_ = 0;
-				guint8 _tmp12_ = 0U;
-				gint _tmp13_ = 0;
-				guint8 _tmp14_ = 0U;
+#line 1053 "BmpSupport.c"
+				gint _tmp9_;
+				guint8* _tmp10_;
+				gint _tmp10__length1;
+				gint _tmp11_;
+				guint8 _tmp12_;
+				gint _tmp13_;
+				guint8 _tmp14_;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 				if (!_tmp7_) {
-#line 1066 "BmpSupport.c"
-					gint _tmp8_ = 0;
+#line 1063 "BmpSupport.c"
+					gint _tmp8_;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 					_tmp8_ = i;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 					i = _tmp8_ + 1;
-#line 1072 "BmpSupport.c"
+#line 1069 "BmpSupport.c"
 				}
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 				_tmp7_ = FALSE;
@@ -1078,7 +1075,7 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
 				if (!(_tmp9_ < G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE))) {
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 					break;
-#line 1082 "BmpSupport.c"
+#line 1079 "BmpSupport.c"
 				}
 #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 				_tmp10_ = file_lead_sequence;
@@ -1102,7 +1099,7 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
 					_g_object_unref0 (instream);
 #line 68 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 					return result;
-#line 1106 "BmpSupport.c"
+#line 1103 "BmpSupport.c"
 				}
 			}
 		}
@@ -1115,14 +1112,14 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
 	_g_object_unref0 (instream);
 #line 71 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1119 "BmpSupport.c"
+#line 1116 "BmpSupport.c"
 }
 
 
 static gpointer _detected_photo_information_ref0 (gpointer self) {
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return self ? detected_photo_information_ref (self) : NULL;
-#line 1126 "BmpSupport.c"
+#line 1123 "BmpSupport.c"
 }
 
 
@@ -1131,16 +1128,16 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer
 	gboolean _vala_is_corrupted = FALSE;
 	DetectedPhotoInformation* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 	DetectedPhotoInformation* detected = NULL;
 	gboolean _tmp3_ = FALSE;
-	DetectedPhotoInformation* _tmp4_ = NULL;
-	DetectedPhotoInformation* _tmp5_ = NULL;
+	DetectedPhotoInformation* _tmp4_;
+	DetectedPhotoInformation* _tmp5_;
 	DetectedPhotoInformation* _tmp6_ = NULL;
-	DetectedPhotoInformation* _tmp7_ = NULL;
-	PhotoFileFormat _tmp8_ = 0;
-	DetectedPhotoInformation* _tmp10_ = NULL;
+	DetectedPhotoInformation* _tmp7_;
+	PhotoFileFormat _tmp8_;
+	DetectedPhotoInformation* _tmp10_;
 	GError * _inner_error_ = NULL;
 #line 74 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_SNIFFER, PhotosBmpSniffer);
@@ -1158,7 +1155,7 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer
 		g_propagate_error (error, _inner_error_);
 #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		return NULL;
-#line 1162 "BmpSupport.c"
+#line 1159 "BmpSupport.c"
 	}
 #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (!_tmp0_) {
@@ -1168,11 +1165,11 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer
 		if (is_corrupted) {
 #line 79 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			*is_corrupted = _vala_is_corrupted;
-#line 1172 "BmpSupport.c"
+#line 1169 "BmpSupport.c"
 		}
 #line 79 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		return result;
-#line 1176 "BmpSupport.c"
+#line 1173 "BmpSupport.c"
 	}
 #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp4_ = PHOTO_FILE_SNIFFER_CLASS (photos_bmp_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp3_, &_inner_error_);
@@ -1186,7 +1183,7 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer
 		g_propagate_error (error, _inner_error_);
 #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		return NULL;
-#line 1190 "BmpSupport.c"
+#line 1187 "BmpSupport.c"
 	}
 #line 82 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp5_ = detected;
@@ -1200,11 +1197,11 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer
 		if (is_corrupted) {
 #line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			*is_corrupted = _vala_is_corrupted;
-#line 1204 "BmpSupport.c"
+#line 1201 "BmpSupport.c"
 		}
 #line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		return result;
-#line 1208 "BmpSupport.c"
+#line 1205 "BmpSupport.c"
 	}
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp7_ = detected;
@@ -1212,17 +1209,17 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer
 	_tmp8_ = _tmp7_->file_format;
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (_tmp8_ == PHOTO_FILE_FORMAT_BMP) {
-#line 1216 "BmpSupport.c"
-		DetectedPhotoInformation* _tmp9_ = NULL;
+#line 1213 "BmpSupport.c"
+		DetectedPhotoInformation* _tmp9_;
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp9_ = detected;
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp6_ = _tmp9_;
-#line 1222 "BmpSupport.c"
+#line 1219 "BmpSupport.c"
 	} else {
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp6_ = NULL;
-#line 1226 "BmpSupport.c"
+#line 1223 "BmpSupport.c"
 	}
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp10_ = _detected_photo_information_ref0 (_tmp6_);
@@ -1234,11 +1231,11 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer
 	if (is_corrupted) {
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		*is_corrupted = _vala_is_corrupted;
-#line 1238 "BmpSupport.c"
+#line 1235 "BmpSupport.c"
 	}
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1242 "BmpSupport.c"
+#line 1239 "BmpSupport.c"
 }
 
 
@@ -1246,8 +1243,8 @@ static void photos_bmp_sniffer_class_init (PhotosBmpSnifferClass * klass) {
 #line 52 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	photos_bmp_sniffer_parent_class = g_type_class_peek_parent (klass);
 #line 52 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) photos_bmp_sniffer_real_sniff;
-#line 1251 "BmpSupport.c"
+	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) photos_bmp_sniffer_real_sniff;
+#line 1248 "BmpSupport.c"
 }
 
 
@@ -1269,7 +1266,7 @@ GType photos_bmp_sniffer_get_type (void) {
 
 PhotosBmpReader* photos_bmp_reader_construct (GType object_type, const gchar* filepath) {
 	PhotosBmpReader* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 90 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 91 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1278,14 +1275,14 @@ PhotosBmpReader* photos_bmp_reader_construct (GType object_type, const gchar* fi
 	self = (PhotosBmpReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_BMP);
 #line 90 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return self;
-#line 1282 "BmpSupport.c"
+#line 1279 "BmpSupport.c"
 }
 
 
 PhotosBmpReader* photos_bmp_reader_new (const gchar* filepath) {
 #line 90 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return photos_bmp_reader_construct (PHOTOS_TYPE_BMP_READER, filepath);
-#line 1289 "BmpSupport.c"
+#line 1286 "BmpSupport.c"
 }
 
 
@@ -1295,8 +1292,8 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
 	GdkPixbuf* _result_ = NULL;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	Dimensions _tmp2_ = {0};
-	gint _tmp3_ = 0;
+	Dimensions _tmp2_;
+	gint _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 94 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_READER, PhotosBmpReader);
@@ -1314,24 +1311,24 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
 	if (_tmp3_ > 9999) {
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp1_ = TRUE;
-#line 1318 "BmpSupport.c"
+#line 1315 "BmpSupport.c"
 	} else {
-		Dimensions _tmp4_ = {0};
-		gint _tmp5_ = 0;
+		Dimensions _tmp4_;
+		gint _tmp5_;
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp4_ = *full;
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp5_ = _tmp4_.height;
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp1_ = _tmp5_ > 9999;
-#line 1328 "BmpSupport.c"
+#line 1325 "BmpSupport.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (_tmp1_) {
-#line 1332 "BmpSupport.c"
+#line 1329 "BmpSupport.c"
 		gboolean _tmp6_ = FALSE;
-		Dimensions _tmp7_ = {0};
-		gint _tmp8_ = 0;
+		Dimensions _tmp7_;
+		gint _tmp8_;
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp7_ = *scaled;
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1340,47 +1337,47 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
 		if (_tmp8_ < 100) {
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			_tmp6_ = TRUE;
-#line 1344 "BmpSupport.c"
+#line 1341 "BmpSupport.c"
 		} else {
-			Dimensions _tmp9_ = {0};
-			gint _tmp10_ = 0;
+			Dimensions _tmp9_;
+			gint _tmp10_;
 #line 105 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			_tmp9_ = *scaled;
 #line 105 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			_tmp10_ = _tmp9_.height;
 #line 105 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			_tmp6_ = _tmp10_ < 100;
-#line 1354 "BmpSupport.c"
+#line 1351 "BmpSupport.c"
 		}
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp0_ = _tmp6_;
-#line 1358 "BmpSupport.c"
+#line 1355 "BmpSupport.c"
 	} else {
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp0_ = FALSE;
-#line 1362 "BmpSupport.c"
+#line 1359 "BmpSupport.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (_tmp0_) {
-#line 1366 "BmpSupport.c"
+#line 1363 "BmpSupport.c"
 		Dimensions prefetch_dimensions = {0};
 		Dimensions _tmp11_ = {0};
 		GdkPixbuf* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		Dimensions _tmp15_ = {0};
-		gint _tmp16_ = 0;
-		Dimensions _tmp17_ = {0};
-		gint _tmp18_ = 0;
-		GdkPixbuf* _tmp19_ = NULL;
-		GdkPixbuf* _tmp20_ = NULL;
-		GdkPixbuf* _tmp21_ = NULL;
-		GdkPixbuf* _tmp22_ = NULL;
-		Dimensions _tmp23_ = {0};
-		gint _tmp24_ = 0;
-		Dimensions _tmp25_ = {0};
-		gint _tmp26_ = 0;
-		GdkPixbuf* _tmp27_ = NULL;
+		gchar* _tmp13_;
+		gchar* _tmp14_;
+		Dimensions _tmp15_;
+		gint _tmp16_;
+		Dimensions _tmp17_;
+		gint _tmp18_;
+		GdkPixbuf* _tmp19_;
+		GdkPixbuf* _tmp20_;
+		GdkPixbuf* _tmp21_;
+		GdkPixbuf* _tmp22_;
+		Dimensions _tmp23_;
+		gint _tmp24_;
+		Dimensions _tmp25_;
+		gint _tmp26_;
+		GdkPixbuf* _tmp27_;
 #line 106 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		dimensions_get_scaled_by_constraint (full, 1000, SCALE_CONSTRAINT_DIMENSIONS, &_tmp11_);
 #line 106 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1413,7 +1410,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
 			_g_object_unref0 (_result_);
 #line 109 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			return NULL;
-#line 1417 "BmpSupport.c"
+#line 1414 "BmpSupport.c"
 		}
 #line 109 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp21_ = _tmp12_;
@@ -1441,18 +1438,18 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
 		_result_ = _tmp27_;
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_g_object_unref0 (_tmp12_);
-#line 1445 "BmpSupport.c"
+#line 1442 "BmpSupport.c"
 	} else {
 		GdkPixbuf* _tmp28_ = NULL;
-		gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		Dimensions _tmp31_ = {0};
-		gint _tmp32_ = 0;
-		Dimensions _tmp33_ = {0};
-		gint _tmp34_ = 0;
-		GdkPixbuf* _tmp35_ = NULL;
-		GdkPixbuf* _tmp36_ = NULL;
-		GdkPixbuf* _tmp37_ = NULL;
+		gchar* _tmp29_;
+		gchar* _tmp30_;
+		Dimensions _tmp31_;
+		gint _tmp32_;
+		Dimensions _tmp33_;
+		gint _tmp34_;
+		GdkPixbuf* _tmp35_;
+		GdkPixbuf* _tmp36_;
+		GdkPixbuf* _tmp37_;
 #line 114 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp29_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 114 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1481,7 +1478,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
 			_g_object_unref0 (_result_);
 #line 114 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			return NULL;
-#line 1485 "BmpSupport.c"
+#line 1482 "BmpSupport.c"
 		}
 #line 114 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp37_ = _tmp28_;
@@ -1493,13 +1490,13 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
 		_result_ = _tmp37_;
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_g_object_unref0 (_tmp28_);
-#line 1497 "BmpSupport.c"
+#line 1494 "BmpSupport.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	result = _result_;
 #line 118 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1503 "BmpSupport.c"
+#line 1500 "BmpSupport.c"
 }
 
 
@@ -1507,8 +1504,8 @@ static void photos_bmp_reader_class_init (PhotosBmpReaderClass * klass) {
 #line 89 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	photos_bmp_reader_parent_class = g_type_class_peek_parent (klass);
 #line 89 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) photos_bmp_reader_real_scaled_read;
-#line 1512 "BmpSupport.c"
+	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) photos_bmp_reader_real_scaled_read;
+#line 1509 "BmpSupport.c"
 }
 
 
@@ -1530,7 +1527,7 @@ GType photos_bmp_reader_get_type (void) {
 
 PhotosBmpWriter* photos_bmp_writer_construct (GType object_type, const gchar* filepath) {
 	PhotosBmpWriter* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 123 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 124 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1539,22 +1536,22 @@ PhotosBmpWriter* photos_bmp_writer_construct (GType object_type, const gchar* fi
 	self = (PhotosBmpWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_BMP);
 #line 123 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return self;
-#line 1543 "BmpSupport.c"
+#line 1540 "BmpSupport.c"
 }
 
 
 PhotosBmpWriter* photos_bmp_writer_new (const gchar* filepath) {
 #line 123 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return photos_bmp_writer_construct (PHOTOS_TYPE_BMP_WRITER, filepath);
-#line 1550 "BmpSupport.c"
+#line 1547 "BmpSupport.c"
 }
 
 
 static void photos_bmp_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) {
 	PhotosBmpWriter * self;
-	GdkPixbuf* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	GdkPixbuf* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 127 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_WRITER, PhotosBmpWriter);
@@ -1576,7 +1573,7 @@ static void photos_bmp_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixb
 		g_propagate_error (error, _inner_error_);
 #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		return;
-#line 1580 "BmpSupport.c"
+#line 1577 "BmpSupport.c"
 	}
 }
 
@@ -1585,8 +1582,8 @@ static void photos_bmp_writer_class_init (PhotosBmpWriterClass * klass) {
 #line 122 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	photos_bmp_writer_parent_class = g_type_class_peek_parent (klass);
 #line 122 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) photos_bmp_writer_real_write;
-#line 1590 "BmpSupport.c"
+	((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) photos_bmp_writer_real_write;
+#line 1587 "BmpSupport.c"
 }
 
 
@@ -1608,7 +1605,7 @@ GType photos_bmp_writer_get_type (void) {
 
 PhotosBmpMetadataWriter* photos_bmp_metadata_writer_construct (GType object_type, const gchar* filepath) {
 	PhotosBmpMetadataWriter* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 133 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 134 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1617,14 +1614,14 @@ PhotosBmpMetadataWriter* photos_bmp_metadata_writer_construct (GType object_type
 	self = (PhotosBmpMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_BMP);
 #line 133 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return self;
-#line 1621 "BmpSupport.c"
+#line 1618 "BmpSupport.c"
 }
 
 
 PhotosBmpMetadataWriter* photos_bmp_metadata_writer_new (const gchar* filepath) {
 #line 133 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return photos_bmp_metadata_writer_construct (PHOTOS_TYPE_BMP_METADATA_WRITER, filepath);
-#line 1628 "BmpSupport.c"
+#line 1625 "BmpSupport.c"
 }
 
 
@@ -1634,7 +1631,7 @@ static void photos_bmp_metadata_writer_real_write_metadata (PhotoFileMetadataWri
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_METADATA_WRITER, PhotosBmpMetadataWriter);
 #line 137 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (metadata));
-#line 1638 "BmpSupport.c"
+#line 1635 "BmpSupport.c"
 }
 
 
@@ -1642,8 +1639,8 @@ static void photos_bmp_metadata_writer_class_init (PhotosBmpMetadataWriterClass
 #line 132 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	photos_bmp_metadata_writer_parent_class = g_type_class_peek_parent (klass);
 #line 132 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) photos_bmp_metadata_writer_real_write_metadata;
-#line 1647 "BmpSupport.c"
+	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) photos_bmp_metadata_writer_real_write_metadata;
+#line 1644 "BmpSupport.c"
 }
 
 
@@ -1664,7 +1661,7 @@ GType photos_bmp_metadata_writer_get_type (void) {
 
 
 void photos_bmp_file_format_driver_init (void) {
-	PhotosBmpFileFormatDriver* _tmp0_ = NULL;
+	PhotosBmpFileFormatDriver* _tmp0_;
 #line 146 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp0_ = photos_bmp_file_format_driver_new ();
 #line 146 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1673,21 +1670,21 @@ void photos_bmp_file_format_driver_init (void) {
 	photos_bmp_file_format_driver_instance = _tmp0_;
 #line 147 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	photos_bmp_file_format_properties_init ();
-#line 1677 "BmpSupport.c"
+#line 1674 "BmpSupport.c"
 }
 
 
 static gpointer _photo_file_format_driver_ref0 (gpointer self) {
 #line 151 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return self ? photo_file_format_driver_ref (self) : NULL;
-#line 1684 "BmpSupport.c"
+#line 1681 "BmpSupport.c"
 }
 
 
 PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_get_instance (void) {
 	PhotosBmpFileFormatDriver* result = NULL;
-	PhotosBmpFileFormatDriver* _tmp0_ = NULL;
-	PhotosBmpFileFormatDriver* _tmp1_ = NULL;
+	PhotosBmpFileFormatDriver* _tmp0_;
+	PhotosBmpFileFormatDriver* _tmp1_;
 #line 151 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp0_ = photos_bmp_file_format_driver_instance;
 #line 151 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1696,14 +1693,14 @@ PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_get_instance (void) {
 	result = _tmp1_;
 #line 151 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1700 "BmpSupport.c"
+#line 1697 "BmpSupport.c"
 }
 
 
 static PhotoFileFormatProperties* photos_bmp_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) {
 	PhotosBmpFileFormatDriver * self;
 	PhotoFileFormatProperties* result = NULL;
-	PhotosBmpFileFormatProperties* _tmp0_ = NULL;
+	PhotosBmpFileFormatProperties* _tmp0_;
 #line 154 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver);
 #line 155 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1712,15 +1709,15 @@ static PhotoFileFormatProperties* photos_bmp_file_format_driver_real_get_propert
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties);
 #line 155 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1716 "BmpSupport.c"
+#line 1713 "BmpSupport.c"
 }
 
 
 static PhotoFileReader* photos_bmp_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) {
 	PhotosBmpFileFormatDriver * self;
 	PhotoFileReader* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	PhotosBmpReader* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	PhotosBmpReader* _tmp1_;
 #line 158 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver);
 #line 158 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1733,7 +1730,7 @@ static PhotoFileReader* photos_bmp_file_format_driver_real_create_reader (PhotoF
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader);
 #line 159 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1737 "BmpSupport.c"
+#line 1734 "BmpSupport.c"
 }
 
 
@@ -1746,7 +1743,7 @@ static gboolean photos_bmp_file_format_driver_real_can_write_image (PhotoFileFor
 	result = TRUE;
 #line 163 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1750 "BmpSupport.c"
+#line 1747 "BmpSupport.c"
 }
 
 
@@ -1759,15 +1756,15 @@ static gboolean photos_bmp_file_format_driver_real_can_write_metadata (PhotoFile
 	result = FALSE;
 #line 167 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1763 "BmpSupport.c"
+#line 1760 "BmpSupport.c"
 }
 
 
 static PhotoFileWriter* photos_bmp_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) {
 	PhotosBmpFileFormatDriver * self;
 	PhotoFileWriter* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	PhotosBmpWriter* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	PhotosBmpWriter* _tmp1_;
 #line 170 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver);
 #line 170 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1780,15 +1777,15 @@ static PhotoFileWriter* photos_bmp_file_format_driver_real_create_writer (PhotoF
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter);
 #line 171 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1784 "BmpSupport.c"
+#line 1781 "BmpSupport.c"
 }
 
 
 static PhotoFileMetadataWriter* photos_bmp_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) {
 	PhotosBmpFileFormatDriver * self;
 	PhotoFileMetadataWriter* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	PhotosBmpMetadataWriter* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	PhotosBmpMetadataWriter* _tmp1_;
 #line 174 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver);
 #line 174 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1801,16 +1798,16 @@ static PhotoFileMetadataWriter* photos_bmp_file_format_driver_real_create_metada
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter);
 #line 175 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1805 "BmpSupport.c"
+#line 1802 "BmpSupport.c"
 }
 
 
 static PhotoFileSniffer* photos_bmp_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) {
 	PhotosBmpFileFormatDriver * self;
 	PhotoFileSniffer* result = NULL;
-	GFile* _tmp0_ = NULL;
-	PhotoFileSnifferOptions _tmp1_ = 0;
-	PhotosBmpSniffer* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	PhotoFileSnifferOptions _tmp1_;
+	PhotosBmpSniffer* _tmp2_;
 #line 178 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver);
 #line 178 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1825,14 +1822,14 @@ static PhotoFileSniffer* photos_bmp_file_format_driver_real_create_sniffer (Phot
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer);
 #line 179 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1829 "BmpSupport.c"
+#line 1826 "BmpSupport.c"
 }
 
 
 static PhotoMetadata* photos_bmp_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) {
 	PhotosBmpFileFormatDriver * self;
 	PhotoMetadata* result = NULL;
-	PhotoMetadata* _tmp0_ = NULL;
+	PhotoMetadata* _tmp0_;
 #line 182 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver);
 #line 183 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1841,7 +1838,7 @@ static PhotoMetadata* photos_bmp_file_format_driver_real_create_metadata (PhotoF
 	result = _tmp0_;
 #line 183 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1845 "BmpSupport.c"
+#line 1842 "BmpSupport.c"
 }
 
 
@@ -1851,14 +1848,14 @@ PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_construct (GType object
 	self = (PhotosBmpFileFormatDriver*) photo_file_format_driver_construct (object_type);
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return self;
-#line 1855 "BmpSupport.c"
+#line 1852 "BmpSupport.c"
 }
 
 
 PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_new (void) {
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return photos_bmp_file_format_driver_construct (PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER);
-#line 1862 "BmpSupport.c"
+#line 1859 "BmpSupport.c"
 }
 
 
@@ -1868,22 +1865,22 @@ static void photos_bmp_file_format_driver_class_init (PhotosBmpFileFormatDriverC
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	((PhotoFileFormatDriverClass *) klass)->finalize = photos_bmp_file_format_driver_finalize;
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) photos_bmp_file_format_driver_real_get_properties;
+	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*) (PhotoFileFormatDriver *)) photos_bmp_file_format_driver_real_get_properties;
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) photos_bmp_file_format_driver_real_create_reader;
+	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*) (PhotoFileFormatDriver *, const gchar*)) photos_bmp_file_format_driver_real_create_reader;
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) photos_bmp_file_format_driver_real_can_write_image;
+	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*) (PhotoFileFormatDriver *)) photos_bmp_file_format_driver_real_can_write_image;
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) photos_bmp_file_format_driver_real_can_write_metadata;
+	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*) (PhotoFileFormatDriver *)) photos_bmp_file_format_driver_real_can_write_metadata;
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photos_bmp_file_format_driver_real_create_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photos_bmp_file_format_driver_real_create_writer;
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photos_bmp_file_format_driver_real_create_metadata_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photos_bmp_file_format_driver_real_create_metadata_writer;
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) photos_bmp_file_format_driver_real_create_sniffer;
+	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) photos_bmp_file_format_driver_real_create_sniffer;
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) photos_bmp_file_format_driver_real_create_metadata;
-#line 1887 "BmpSupport.c"
+	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) photos_bmp_file_format_driver_real_create_metadata;
+#line 1884 "BmpSupport.c"
 }
 
 
@@ -1891,13 +1888,13 @@ static void photos_bmp_file_format_driver_instance_init (PhotosBmpFileFormatDriv
 }
 
 
-static void photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver* obj) {
+static void photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver * obj) {
 	PhotosBmpFileFormatDriver * self;
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver);
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	PHOTO_FILE_FORMAT_DRIVER_CLASS (photos_bmp_file_format_driver_parent_class)->finalize (obj);
-#line 1901 "BmpSupport.c"
+#line 1898 "BmpSupport.c"
 }
 
 
diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c
index 27a2ffb..6ea3ba4 100644
--- a/src/photos/GRaw.c
+++ b/src/photos/GRaw.c
@@ -1,4 +1,4 @@
-/* GRaw.c generated by valac 0.34.7, the Vala compiler
+/* GRaw.c generated by valac 0.36.6, the Vala compiler
  * generated from GRaw.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -200,7 +200,7 @@ gushort graw_processed_image_get_colors (GRawProcessedImage* self);
 gushort graw_processed_image_get_bits (GRawProcessedImage* self);
 guint8* graw_processed_image_get_data (GRawProcessedImage* self);
 guint graw_processed_image_get_data_size (GRawProcessedImage* self);
-static void graw_processed_image_finalize (GRawProcessedImage* obj);
+static void graw_processed_image_finalize (GRawProcessedImage * obj);
 gpointer graw_processor_ref (gpointer instance);
 void graw_processor_unref (gpointer instance);
 GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -231,7 +231,7 @@ void graw_processor_unpack (GRawProcessor* self, GError** error);
 void graw_processor_unpack_thumb (GRawProcessor* self, GError** error);
 void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean half_size);
 libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self);
-static void graw_processor_finalize (GRawProcessor* obj);
+static void graw_processor_finalize (GRawProcessor * obj);
 
 
 GType graw_colorspace_get_type (void) {
@@ -314,24 +314,24 @@ GType graw_use_camera_matrix_get_type (void) {
 GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_data_t* proc, GError** error) {
 	GRawProcessedImage* self = NULL;
 	enum LibRaw_errors _result_ = 0;
-	libraw_data_t* _tmp0_ = NULL;
-	libraw_processed_image_t* _tmp1_ = NULL;
-	enum LibRaw_errors _tmp2_ = 0;
-	libraw_processed_image_t* _tmp3_ = NULL;
-	libraw_processed_image_t* _tmp4_ = NULL;
-	guint8* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	libraw_processed_image_t* _tmp6_ = NULL;
-	gushort _tmp7_ = 0U;
-	libraw_processed_image_t* _tmp8_ = NULL;
-	gushort _tmp9_ = 0U;
-	libraw_processed_image_t* _tmp10_ = NULL;
-	gushort _tmp11_ = 0U;
-	libraw_processed_image_t* _tmp12_ = NULL;
-	gushort _tmp13_ = 0U;
-	libraw_processed_image_t* _tmp14_ = NULL;
-	gushort _tmp15_ = 0U;
-	GdkPixbuf* _tmp16_ = NULL;
+	libraw_data_t* _tmp0_;
+	libraw_processed_image_t* _tmp1_;
+	enum LibRaw_errors _tmp2_;
+	libraw_processed_image_t* _tmp3_;
+	libraw_processed_image_t* _tmp4_;
+	guint8* _tmp5_;
+	gint _tmp5__length1;
+	libraw_processed_image_t* _tmp6_;
+	gushort _tmp7_;
+	libraw_processed_image_t* _tmp8_;
+	gushort _tmp9_;
+	libraw_processed_image_t* _tmp10_;
+	gushort _tmp11_;
+	libraw_processed_image_t* _tmp12_;
+	gushort _tmp13_;
+	libraw_processed_image_t* _tmp14_;
+	gushort _tmp15_;
+	GdkPixbuf* _tmp16_;
 	GError * _inner_error_ = NULL;
 #line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (proc != NULL, NULL);
@@ -424,26 +424,26 @@ GRawProcessedImage* graw_processed_image_new (libraw_data_t* proc, GError** erro
 GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type, libraw_data_t* proc, GError** error) {
 	GRawProcessedImage* self = NULL;
 	enum LibRaw_errors _result_ = 0;
-	libraw_data_t* _tmp0_ = NULL;
-	libraw_processed_image_t* _tmp1_ = NULL;
-	enum LibRaw_errors _tmp2_ = 0;
-	libraw_processed_image_t* _tmp3_ = NULL;
-	libraw_processed_image_t* _tmp17_ = NULL;
-	GdkPixbuf* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	libraw_processed_image_t* _tmp21_ = NULL;
-	GdkPixbuf* _tmp22_ = NULL;
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	libraw_processed_image_t* _tmp25_ = NULL;
-	GdkPixbuf* _tmp26_ = NULL;
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
-	libraw_processed_image_t* _tmp29_ = NULL;
-	GdkPixbuf* _tmp30_ = NULL;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
+	libraw_data_t* _tmp0_;
+	libraw_processed_image_t* _tmp1_;
+	enum LibRaw_errors _tmp2_;
+	libraw_processed_image_t* _tmp3_;
+	libraw_processed_image_t* _tmp17_;
+	GdkPixbuf* _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
+	libraw_processed_image_t* _tmp21_;
+	GdkPixbuf* _tmp22_;
+	gint _tmp23_;
+	gint _tmp24_;
+	libraw_processed_image_t* _tmp25_;
+	GdkPixbuf* _tmp26_;
+	gint _tmp27_;
+	gint _tmp28_;
+	libraw_processed_image_t* _tmp29_;
+	GdkPixbuf* _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
 	GError * _inner_error_ = NULL;
 #line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (proc != NULL, NULL);
@@ -491,17 +491,17 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 #line 492 "GRaw.c"
 	{
 		GBytes* bytes = NULL;
-		libraw_processed_image_t* _tmp4_ = NULL;
-		guint8* _tmp5_ = NULL;
-		gint _tmp5__length1 = 0;
-		GBytes* _tmp6_ = NULL;
+		libraw_processed_image_t* _tmp4_;
+		guint8* _tmp5_;
+		gint _tmp5__length1;
+		GBytes* _tmp6_;
 		GdkPixbuf* _tmp7_ = NULL;
-		GBytes* _tmp8_ = NULL;
-		GMemoryInputStream* _tmp9_ = NULL;
-		GMemoryInputStream* _tmp10_ = NULL;
-		GdkPixbuf* _tmp11_ = NULL;
-		GdkPixbuf* _tmp12_ = NULL;
-		GdkPixbuf* _tmp13_ = NULL;
+		GBytes* _tmp8_;
+		GMemoryInputStream* _tmp9_;
+		GMemoryInputStream* _tmp10_;
+		GdkPixbuf* _tmp11_;
+		GdkPixbuf* _tmp12_;
+		GdkPixbuf* _tmp13_;
 #line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp4_ = self->priv->image;
 #line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -551,9 +551,9 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 	__catch29_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-		GError* _tmp16_ = NULL;
+		GError* _tmp14_;
+		const gchar* _tmp15_;
+		GError* _tmp16_;
 #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		err = _inner_error_;
 #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -648,8 +648,8 @@ GRawProcessedImage* graw_processed_image_new_from_thumb (libraw_data_t* proc, GE
 
 GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self) {
 	GdkPixbuf* result = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
 #line 149 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), NULL);
 #line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -666,8 +666,8 @@ GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self) {
 
 gushort graw_processed_image_get_width (GRawProcessedImage* self) {
 	gushort result;
-	libraw_processed_image_t* _tmp0_ = NULL;
-	gushort _tmp1_ = 0U;
+	libraw_processed_image_t* _tmp0_;
+	gushort _tmp1_;
 #line 77 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
 #line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -684,8 +684,8 @@ gushort graw_processed_image_get_width (GRawProcessedImage* self) {
 
 gushort graw_processed_image_get_height (GRawProcessedImage* self) {
 	gushort result;
-	libraw_processed_image_t* _tmp0_ = NULL;
-	gushort _tmp1_ = 0U;
+	libraw_processed_image_t* _tmp0_;
+	gushort _tmp1_;
 #line 83 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
 #line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -702,8 +702,8 @@ gushort graw_processed_image_get_height (GRawProcessedImage* self) {
 
 gushort graw_processed_image_get_colors (GRawProcessedImage* self) {
 	gushort result;
-	libraw_processed_image_t* _tmp0_ = NULL;
-	gushort _tmp1_ = 0U;
+	libraw_processed_image_t* _tmp0_;
+	gushort _tmp1_;
 #line 89 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
 #line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -720,8 +720,8 @@ gushort graw_processed_image_get_colors (GRawProcessedImage* self) {
 
 gushort graw_processed_image_get_bits (GRawProcessedImage* self) {
 	gushort result;
-	libraw_processed_image_t* _tmp0_ = NULL;
-	gushort _tmp1_ = 0U;
+	libraw_processed_image_t* _tmp0_;
+	gushort _tmp1_;
 #line 95 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
 #line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -738,9 +738,9 @@ gushort graw_processed_image_get_bits (GRawProcessedImage* self) {
 
 guint8* graw_processed_image_get_data (GRawProcessedImage* self) {
 	guint8* result;
-	libraw_processed_image_t* _tmp0_ = NULL;
-	guint8* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	libraw_processed_image_t* _tmp0_;
+	guint8* _tmp1_;
+	gint _tmp1__length1;
 #line 101 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), NULL);
 #line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -759,8 +759,8 @@ guint8* graw_processed_image_get_data (GRawProcessedImage* self) {
 
 guint graw_processed_image_get_data_size (GRawProcessedImage* self) {
 	guint result;
-	libraw_processed_image_t* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	libraw_processed_image_t* _tmp0_;
+	guint _tmp1_;
 #line 107 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
 #line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -817,7 +817,7 @@ static gchar* graw_value_processed_image_collect_value (GValue* value, guint n_c
 #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (collect_values[0].v_pointer) {
 #line 820 "GRaw.c"
-		GRawProcessedImage* object;
+		GRawProcessedImage * object;
 		object = collect_values[0].v_pointer;
 #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -844,7 +844,7 @@ static gchar* graw_value_processed_image_collect_value (GValue* value, guint n_c
 
 
 static gchar* graw_value_processed_image_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	GRawProcessedImage** object_p;
+	GRawProcessedImage ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (!object_p) {
@@ -896,7 +896,7 @@ gpointer graw_value_get_processed_image (const GValue* value) {
 
 
 void graw_value_set_processed_image (GValue* value, gpointer v_object) {
-	GRawProcessedImage* old;
+	GRawProcessedImage * old;
 #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE));
 #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -927,7 +927,7 @@ void graw_value_set_processed_image (GValue* value, gpointer v_object) {
 
 
 void graw_value_take_processed_image (GValue* value, gpointer v_object) {
-	GRawProcessedImage* old;
+	GRawProcessedImage * old;
 #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE));
 #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -977,7 +977,7 @@ static void graw_processed_image_instance_init (GRawProcessedImage * self) {
 }
 
 
-static void graw_processed_image_finalize (GRawProcessedImage* obj) {
+static void graw_processed_image_finalize (GRawProcessedImage * obj) {
 	GRawProcessedImage * self;
 #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, GRAW_TYPE_PROCESSED_IMAGE, GRawProcessedImage);
@@ -1006,7 +1006,7 @@ GType graw_processed_image_get_type (void) {
 
 
 gpointer graw_processed_image_ref (gpointer instance) {
-	GRawProcessedImage* self;
+	GRawProcessedImage * self;
 	self = instance;
 #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1017,7 +1017,7 @@ gpointer graw_processed_image_ref (gpointer instance) {
 
 
 void graw_processed_image_unref (gpointer instance) {
-	GRawProcessedImage* self;
+	GRawProcessedImage * self;
 	self = instance;
 #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1032,8 +1032,8 @@ void graw_processed_image_unref (gpointer instance) {
 
 GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_constructor_flags options) {
 	GRawProcessor* self = NULL;
-	enum LibRaw_constructor_flags _tmp0_ = 0;
-	libraw_data_t* _tmp1_ = NULL;
+	enum LibRaw_constructor_flags _tmp0_;
+	libraw_data_t* _tmp1_;
 #line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self = (GRawProcessor*) g_type_create_instance (object_type);
 #line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1058,8 +1058,8 @@ GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options) {
 
 
 void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error) {
-	libraw_data_t* _tmp0_ = NULL;
-	enum LibRaw_errors _tmp1_ = 0;
+	libraw_data_t* _tmp0_;
+	enum LibRaw_errors _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 167 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
@@ -1093,7 +1093,7 @@ void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error)
 
 static libraw_imgother_t libraw_get_image_other (libraw_data_t* self) {
 	libraw_imgother_t result = {0};
-	libraw_imgother_t _tmp0_ = {0};
+	libraw_imgother_t _tmp0_;
 #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp0_ = self->other;
 #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi"
@@ -1106,8 +1106,8 @@ static libraw_imgother_t libraw_get_image_other (libraw_data_t* self) {
 
 libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self) {
 	libraw_imgother_t result = {0};
-	libraw_data_t* _tmp0_ = NULL;
-	libraw_imgother_t _tmp1_ = {0};
+	libraw_data_t* _tmp0_;
+	libraw_imgother_t _tmp1_;
 #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
 #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1122,7 +1122,7 @@ libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self) {
 
 static libraw_iparams_t libraw_get_image_params (libraw_data_t* self) {
 	libraw_iparams_t result = {0};
-	libraw_iparams_t _tmp0_ = {0};
+	libraw_iparams_t _tmp0_;
 #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp0_ = self->idata;
 #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi"
@@ -1135,8 +1135,8 @@ static libraw_iparams_t libraw_get_image_params (libraw_data_t* self) {
 
 libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self) {
 	libraw_iparams_t result = {0};
-	libraw_data_t* _tmp0_ = NULL;
-	libraw_iparams_t _tmp1_ = {0};
+	libraw_data_t* _tmp0_;
+	libraw_iparams_t _tmp1_;
 #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
 #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1151,7 +1151,7 @@ libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self) {
 
 static libraw_image_sizes_t libraw_get_sizes (libraw_data_t* self) {
 	libraw_image_sizes_t result = {0};
-	libraw_image_sizes_t _tmp0_ = {0};
+	libraw_image_sizes_t _tmp0_;
 #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp0_ = self->sizes;
 #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi"
@@ -1164,8 +1164,8 @@ static libraw_image_sizes_t libraw_get_sizes (libraw_data_t* self) {
 
 libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self) {
 	libraw_image_sizes_t result = {0};
-	libraw_data_t* _tmp0_ = NULL;
-	libraw_image_sizes_t _tmp1_ = {0};
+	libraw_data_t* _tmp0_;
+	libraw_image_sizes_t _tmp1_;
 #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
 #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1180,7 +1180,7 @@ libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self) {
 
 static libraw_thumbnail_t libraw_get_thumbnail (libraw_data_t* self) {
 	libraw_thumbnail_t result = {0};
-	libraw_thumbnail_t _tmp0_ = {0};
+	libraw_thumbnail_t _tmp0_;
 #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp0_ = self->thumbnail;
 #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi"
@@ -1193,8 +1193,8 @@ static libraw_thumbnail_t libraw_get_thumbnail (libraw_data_t* self) {
 
 libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self) {
 	libraw_thumbnail_t result = {0};
-	libraw_data_t* _tmp0_ = NULL;
-	libraw_thumbnail_t _tmp1_ = {0};
+	libraw_data_t* _tmp0_;
+	libraw_thumbnail_t _tmp1_;
 #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
 #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1210,9 +1210,9 @@ libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self) {
 GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** error) {
 	GRawProcessedImage* result = NULL;
 	GRawProcessedImage* _tmp0_ = NULL;
-	libraw_data_t* _tmp1_ = NULL;
-	GRawProcessedImage* _tmp2_ = NULL;
-	GRawProcessedImage* _tmp3_ = NULL;
+	libraw_data_t* _tmp1_;
+	GRawProcessedImage* _tmp2_;
+	GRawProcessedImage* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 187 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL);
@@ -1258,9 +1258,9 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError**
 GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError** error) {
 	GRawProcessedImage* result = NULL;
 	GRawProcessedImage* _tmp0_ = NULL;
-	libraw_data_t* _tmp1_ = NULL;
-	GRawProcessedImage* _tmp2_ = NULL;
-	GRawProcessedImage* _tmp3_ = NULL;
+	libraw_data_t* _tmp1_;
+	GRawProcessedImage* _tmp2_;
+	GRawProcessedImage* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 191 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL);
@@ -1304,10 +1304,10 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError
 
 
 void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer_length1, GError** error) {
-	libraw_data_t* _tmp0_ = NULL;
-	guint8* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	enum LibRaw_errors _tmp2_ = 0;
+	libraw_data_t* _tmp0_;
+	guint8* _tmp1_;
+	gint _tmp1__length1;
+	enum LibRaw_errors _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 195 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
@@ -1344,9 +1344,9 @@ void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer
 
 
 void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GError** error) {
-	libraw_data_t* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	enum LibRaw_errors _tmp2_ = 0;
+	libraw_data_t* _tmp0_;
+	const gchar* _tmp1_;
+	enum LibRaw_errors _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 199 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
@@ -1383,8 +1383,8 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro
 
 
 void graw_processor_process (GRawProcessor* self, GError** error) {
-	libraw_data_t* _tmp0_ = NULL;
-	enum LibRaw_errors _tmp1_ = 0;
+	libraw_data_t* _tmp0_;
+	enum LibRaw_errors _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 203 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
@@ -1417,9 +1417,9 @@ void graw_processor_process (GRawProcessor* self, GError** error) {
 
 
 void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, GError** error) {
-	libraw_data_t* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	enum LibRaw_errors _tmp2_ = 0;
+	libraw_data_t* _tmp0_;
+	const gchar* _tmp1_;
+	enum LibRaw_errors _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 207 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
@@ -1456,9 +1456,9 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename,
 
 
 void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GError** error) {
-	libraw_data_t* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	enum LibRaw_errors _tmp2_ = 0;
+	libraw_data_t* _tmp0_;
+	const gchar* _tmp1_;
+	enum LibRaw_errors _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 211 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
@@ -1495,7 +1495,7 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE
 
 
 void graw_processor_recycle (GRawProcessor* self) {
-	libraw_data_t* _tmp0_ = NULL;
+	libraw_data_t* _tmp0_;
 #line 215 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
 #line 216 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1507,8 +1507,8 @@ void graw_processor_recycle (GRawProcessor* self) {
 
 
 void graw_processor_unpack (GRawProcessor* self, GError** error) {
-	libraw_data_t* _tmp0_ = NULL;
-	enum LibRaw_errors _tmp1_ = 0;
+	libraw_data_t* _tmp0_;
+	enum LibRaw_errors _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 219 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
@@ -1541,8 +1541,8 @@ void graw_processor_unpack (GRawProcessor* self, GError** error) {
 
 
 void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) {
-	libraw_data_t* _tmp0_ = NULL;
-	enum LibRaw_errors _tmp1_ = 0;
+	libraw_data_t* _tmp0_;
+	enum LibRaw_errors _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 223 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
@@ -1575,12 +1575,12 @@ void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) {
 
 
 static void lib_raw_output_params_set_chromatic_aberrations (libraw_output_params_t* params, gdouble red_multiplier, gdouble green_multiplier) {
-	libraw_output_params_t* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
-	libraw_output_params_t* _tmp3_ = NULL;
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
+	libraw_output_params_t* _tmp0_;
+	gdouble _tmp1_;
+	gdouble _tmp2_;
+	libraw_output_params_t* _tmp3_;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
 #line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp0_ = params;
 #line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi"
@@ -1602,12 +1602,12 @@ static void lib_raw_output_params_set_chromatic_aberrations (libraw_output_param
 
 
 static void lib_raw_output_params_set_gamma_curve (libraw_output_params_t* params, gdouble power, gdouble slope) {
-	libraw_output_params_t* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
-	libraw_output_params_t* _tmp3_ = NULL;
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
+	libraw_output_params_t* _tmp0_;
+	gdouble _tmp1_;
+	gdouble _tmp2_;
+	libraw_output_params_t* _tmp3_;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
 #line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp0_ = params;
 #line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi"
@@ -1629,37 +1629,37 @@ static void lib_raw_output_params_set_gamma_curve (libraw_output_params_t* param
 
 
 void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean half_size) {
-	libraw_output_params_t* _tmp0_ = NULL;
-	libraw_output_params_t* _tmp1_ = NULL;
-	libraw_output_params_t* _tmp2_ = NULL;
-	libraw_output_params_t* _tmp3_ = NULL;
-	libraw_output_params_t* _tmp4_ = NULL;
-	libraw_output_params_t* _tmp5_ = NULL;
-	libraw_output_params_t* _tmp6_ = NULL;
-	libraw_output_params_t* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
-	libraw_output_params_t* _tmp9_ = NULL;
-	libraw_output_params_t* _tmp10_ = NULL;
-	libraw_output_params_t* _tmp11_ = NULL;
-	libraw_output_params_t* _tmp12_ = NULL;
-	libraw_output_params_t* _tmp13_ = NULL;
-	libraw_output_params_t* _tmp14_ = NULL;
-	libraw_output_params_t* _tmp15_ = NULL;
-	libraw_output_params_t* _tmp16_ = NULL;
-	libraw_output_params_t* _tmp17_ = NULL;
-	libraw_output_params_t* _tmp18_ = NULL;
-	libraw_output_params_t* _tmp19_ = NULL;
-	libraw_output_params_t* _tmp20_ = NULL;
-	libraw_output_params_t* _tmp21_ = NULL;
-	libraw_output_params_t* _tmp22_ = NULL;
-	libraw_output_params_t* _tmp23_ = NULL;
-	libraw_output_params_t* _tmp24_ = NULL;
-	libraw_output_params_t* _tmp25_ = NULL;
-	libraw_output_params_t* _tmp26_ = NULL;
-	libraw_output_params_t* _tmp27_ = NULL;
-	libraw_output_params_t* _tmp28_ = NULL;
-	libraw_output_params_t* _tmp29_ = NULL;
-	libraw_output_params_t* _tmp30_ = NULL;
+	libraw_output_params_t* _tmp0_;
+	libraw_output_params_t* _tmp1_;
+	libraw_output_params_t* _tmp2_;
+	libraw_output_params_t* _tmp3_;
+	libraw_output_params_t* _tmp4_;
+	libraw_output_params_t* _tmp5_;
+	libraw_output_params_t* _tmp6_;
+	libraw_output_params_t* _tmp7_;
+	gboolean _tmp8_;
+	libraw_output_params_t* _tmp9_;
+	libraw_output_params_t* _tmp10_;
+	libraw_output_params_t* _tmp11_;
+	libraw_output_params_t* _tmp12_;
+	libraw_output_params_t* _tmp13_;
+	libraw_output_params_t* _tmp14_;
+	libraw_output_params_t* _tmp15_;
+	libraw_output_params_t* _tmp16_;
+	libraw_output_params_t* _tmp17_;
+	libraw_output_params_t* _tmp18_;
+	libraw_output_params_t* _tmp19_;
+	libraw_output_params_t* _tmp20_;
+	libraw_output_params_t* _tmp21_;
+	libraw_output_params_t* _tmp22_;
+	libraw_output_params_t* _tmp23_;
+	libraw_output_params_t* _tmp24_;
+	libraw_output_params_t* _tmp25_;
+	libraw_output_params_t* _tmp26_;
+	libraw_output_params_t* _tmp27_;
+	libraw_output_params_t* _tmp28_;
+	libraw_output_params_t* _tmp29_;
+	libraw_output_params_t* _tmp30_;
 #line 230 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
 #line 235 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1760,7 +1760,7 @@ void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean hal
 
 libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self) {
 	libraw_output_params_t* result;
-	libraw_data_t* _tmp0_ = NULL;
+	libraw_data_t* _tmp0_;
 #line 156 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL);
 #line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1815,7 +1815,7 @@ static gchar* graw_value_processor_collect_value (GValue* value, guint n_collect
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (collect_values[0].v_pointer) {
 #line 1818 "GRaw.c"
-		GRawProcessor* object;
+		GRawProcessor * object;
 		object = collect_values[0].v_pointer;
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1842,7 +1842,7 @@ static gchar* graw_value_processor_collect_value (GValue* value, guint n_collect
 
 
 static gchar* graw_value_processor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	GRawProcessor** object_p;
+	GRawProcessor ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (!object_p) {
@@ -1894,7 +1894,7 @@ gpointer graw_value_get_processor (const GValue* value) {
 
 
 void graw_value_set_processor (GValue* value, gpointer v_object) {
-	GRawProcessor* old;
+	GRawProcessor * old;
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR));
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1925,7 +1925,7 @@ void graw_value_set_processor (GValue* value, gpointer v_object) {
 
 
 void graw_value_take_processor (GValue* value, gpointer v_object) {
-	GRawProcessor* old;
+	GRawProcessor * old;
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR));
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1973,7 +1973,7 @@ static void graw_processor_instance_init (GRawProcessor * self) {
 }
 
 
-static void graw_processor_finalize (GRawProcessor* obj) {
+static void graw_processor_finalize (GRawProcessor * obj) {
 	GRawProcessor * self;
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, GRAW_TYPE_PROCESSOR, GRawProcessor);
@@ -2000,7 +2000,7 @@ GType graw_processor_get_type (void) {
 
 
 gpointer graw_processor_ref (gpointer instance) {
-	GRawProcessor* self;
+	GRawProcessor * self;
 	self = instance;
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -2011,7 +2011,7 @@ gpointer graw_processor_ref (gpointer instance) {
 
 
 void graw_processor_unref (gpointer instance) {
-	GRawProcessor* self;
+	GRawProcessor * self;
 	self = instance;
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2025,13 +2025,13 @@ void graw_processor_unref (gpointer instance) {
 
 
 void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GError** error) {
-	enum LibRaw_errors _tmp0_ = 0;
+	enum LibRaw_errors _tmp0_;
 	gchar* msg = NULL;
-	const gchar* _tmp7_ = NULL;
-	enum LibRaw_errors _tmp8_ = 0;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	enum LibRaw_errors _tmp11_ = 0;
+	const gchar* _tmp7_;
+	enum LibRaw_errors _tmp8_;
+	const gchar* _tmp9_;
+	gchar* _tmp10_;
+	enum LibRaw_errors _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (caller != NULL);
@@ -2043,17 +2043,17 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 		return;
 #line 2045 "GRaw.c"
 	} else {
-		enum LibRaw_errors _tmp1_ = 0;
+		enum LibRaw_errors _tmp1_;
 #line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp1_ = _result_;
 #line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_tmp1_ > 0) {
 #line 2052 "GRaw.c"
-			const gchar* _tmp2_ = NULL;
-			enum LibRaw_errors _tmp3_ = 0;
-			enum LibRaw_errors _tmp4_ = 0;
-			const gchar* _tmp5_ = NULL;
-			GError* _tmp6_ = NULL;
+			const gchar* _tmp2_;
+			enum LibRaw_errors _tmp3_;
+			enum LibRaw_errors _tmp4_;
+			const gchar* _tmp5_;
+			GError* _tmp6_;
 #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp2_ = caller;
 #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2102,8 +2102,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 		case LIBRAW_UNSPECIFIED_ERROR:
 #line 2104 "GRaw.c"
 		{
-			const gchar* _tmp12_ = NULL;
-			GError* _tmp13_ = NULL;
+			const gchar* _tmp12_;
+			GError* _tmp13_;
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp12_ = msg;
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2135,8 +2135,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 		case LIBRAW_FILE_UNSUPPORTED:
 #line 2137 "GRaw.c"
 		{
-			const gchar* _tmp14_ = NULL;
-			GError* _tmp15_ = NULL;
+			const gchar* _tmp14_;
+			GError* _tmp15_;
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp14_ = msg;
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2168,8 +2168,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 		case LIBRAW_REQUEST_FOR_NONEXISTENT_IMAGE:
 #line 2170 "GRaw.c"
 		{
-			const gchar* _tmp16_ = NULL;
-			GError* _tmp17_ = NULL;
+			const gchar* _tmp16_;
+			GError* _tmp17_;
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp16_ = msg;
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2201,8 +2201,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 		case LIBRAW_OUT_OF_ORDER_CALL:
 #line 2203 "GRaw.c"
 		{
-			const gchar* _tmp18_ = NULL;
-			GError* _tmp19_ = NULL;
+			const gchar* _tmp18_;
+			GError* _tmp19_;
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp18_ = msg;
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2234,8 +2234,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 		case LIBRAW_NO_THUMBNAIL:
 #line 2236 "GRaw.c"
 		{
-			const gchar* _tmp20_ = NULL;
-			GError* _tmp21_ = NULL;
+			const gchar* _tmp20_;
+			GError* _tmp21_;
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp20_ = msg;
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2267,8 +2267,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 		case LIBRAW_UNSUPPORTED_THUMBNAIL:
 #line 2269 "GRaw.c"
 		{
-			const gchar* _tmp22_ = NULL;
-			GError* _tmp23_ = NULL;
+			const gchar* _tmp22_;
+			GError* _tmp23_;
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp22_ = msg;
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2300,8 +2300,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 		case LIBRAW_UNSUFFICIENT_MEMORY:
 #line 2302 "GRaw.c"
 		{
-			const gchar* _tmp24_ = NULL;
-			GError* _tmp25_ = NULL;
+			const gchar* _tmp24_;
+			GError* _tmp25_;
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp24_ = msg;
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2333,8 +2333,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 		case LIBRAW_DATA_ERROR:
 #line 2335 "GRaw.c"
 		{
-			const gchar* _tmp26_ = NULL;
-			GError* _tmp27_ = NULL;
+			const gchar* _tmp26_;
+			GError* _tmp27_;
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp26_ = msg;
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2366,8 +2366,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 		case LIBRAW_IO_ERROR:
 #line 2368 "GRaw.c"
 		{
-			const gchar* _tmp28_ = NULL;
-			GError* _tmp29_ = NULL;
+			const gchar* _tmp28_;
+			GError* _tmp29_;
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp28_ = msg;
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2399,8 +2399,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 		case LIBRAW_CANCELLED_BY_CALLBACK:
 #line 2401 "GRaw.c"
 		{
-			const gchar* _tmp30_ = NULL;
-			GError* _tmp31_ = NULL;
+			const gchar* _tmp30_;
+			GError* _tmp31_;
 #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp30_ = msg;
 #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2432,8 +2432,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 		case LIBRAW_BAD_CROP:
 #line 2434 "GRaw.c"
 		{
-			const gchar* _tmp32_ = NULL;
-			GError* _tmp33_ = NULL;
+			const gchar* _tmp32_;
+			GError* _tmp33_;
 #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp32_ = msg;
 #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
diff --git a/src/photos/GdkSupport.c b/src/photos/GdkSupport.c
index 1fb61f7..4b94f76 100644
--- a/src/photos/GdkSupport.c
+++ b/src/photos/GdkSupport.c
@@ -1,4 +1,4 @@
-/* GdkSupport.c generated by valac 0.34.7, the Vala compiler
+/* GdkSupport.c generated by valac 0.36.6, the Vala compiler
  * generated from GdkSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -289,13 +289,13 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
 static guint8* _vala_array_dup7 (guint8* self, int length);
 void dimensions_init (Dimensions *self, gint width, gint height);
 PhotoFileFormat photo_file_format_from_pixbuf_name (const gchar* name);
-static void gdk_sniffer_finalize (PhotoFileSniffer* obj);
+static void gdk_sniffer_finalize (PhotoFileSniffer * obj);
 
 
 GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) {
 	GdkReader* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	PhotoFileFormat _tmp1_ = 0;
+	const gchar* _tmp0_;
+	PhotoFileFormat _tmp1_;
 #line 8 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 9 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -314,9 +314,9 @@ static PhotoMetadata* gdk_reader_real_read_metadata (PhotoFileReader* base, GErr
 	GdkReader * self;
 	PhotoMetadata* result = NULL;
 	PhotoMetadata* metadata = NULL;
-	PhotoMetadata* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	PhotoMetadata* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 12 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GDK_READER, GdkReader);
@@ -354,11 +354,11 @@ static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError**
 	GdkReader * self;
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
+	GdkPixbuf* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 19 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GDK_READER, GdkReader);
@@ -400,15 +400,15 @@ static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 	GdkReader * self;
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	Dimensions _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	Dimensions _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	GdkPixbuf* _tmp7_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
-	GdkPixbuf* _tmp9_ = NULL;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	Dimensions _tmp3_;
+	gint _tmp4_;
+	Dimensions _tmp5_;
+	gint _tmp6_;
+	GdkPixbuf* _tmp7_;
+	GdkPixbuf* _tmp8_;
+	GdkPixbuf* _tmp9_;
 	GError * _inner_error_ = NULL;
 #line 23 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GDK_READER, GdkReader);
@@ -462,11 +462,11 @@ static void gdk_reader_class_init (GdkReaderClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	gdk_reader_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*)(PhotoFileReader*, GError**)) gdk_reader_real_read_metadata;
+	((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*) (PhotoFileReader *, GError**)) gdk_reader_real_read_metadata;
 #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*)(PhotoFileReader*, GError**)) gdk_reader_real_unscaled_read;
+	((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) gdk_reader_real_unscaled_read;
 #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) gdk_reader_real_scaled_read;
+	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) gdk_reader_real_scaled_read;
 #line 471 "GdkSupport.c"
 }
 
@@ -489,8 +489,8 @@ GType gdk_reader_get_type (void) {
 
 GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) {
 	GdkSniffer* self = NULL;
-	GFile* _tmp0_ = NULL;
-	PhotoFileSnifferOptions _tmp1_ = 0;
+	GFile* _tmp0_;
+	PhotoFileSnifferOptions _tmp1_;
 #line 33 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 34 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -537,36 +537,36 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 	GdkSniffer * self;
 	gboolean _vala_is_corrupted = FALSE;
 	DetectedPhotoInformation* result = NULL;
-	DetectedPhotoInformation* _tmp0_ = NULL;
+	DetectedPhotoInformation* _tmp0_;
 	GdkPixbufLoader* pixbuf_loader = NULL;
-	GdkPixbufLoader* _tmp1_ = NULL;
-	GdkPixbufLoader* _tmp2_ = NULL;
-	GdkPixbufLoader* _tmp3_ = NULL;
+	GdkPixbufLoader* _tmp1_;
+	GdkPixbufLoader* _tmp2_;
+	GdkPixbufLoader* _tmp3_;
 	GChecksum* md5_checksum = NULL;
-	gboolean _tmp4_ = FALSE;
-	DetectedPhotoInformation* _tmp6_ = NULL;
-	PhotoMetadata* _tmp7_ = NULL;
+	gboolean _tmp4_;
+	DetectedPhotoInformation* _tmp6_;
+	PhotoMetadata* _tmp7_;
 	gboolean _tmp12_ = FALSE;
-	gboolean _tmp13_ = FALSE;
+	gboolean _tmp13_;
 	guint8* _tmp38_ = NULL;
 	gint _tmp38__length1 = 0;
 	gint __tmp38__size_ = 0;
-	gboolean _tmp39_ = FALSE;
+	gboolean _tmp39_;
 	guint8* buffer = NULL;
-	guint8* _tmp42_ = NULL;
-	gint _tmp42__length1 = 0;
-	gint buffer_length1 = 0;
-	gint _buffer_size_ = 0;
+	guint8* _tmp42_;
+	gint _tmp42__length1;
+	gint buffer_length1;
+	gint _buffer_size_;
 	gsize count = 0UL;
 	GFileInputStream* fins = NULL;
-	GFile* _tmp43_ = NULL;
-	GFileInputStream* _tmp44_ = NULL;
-	GFileInputStream* _tmp68_ = NULL;
-	gboolean _tmp70_ = FALSE;
+	GFile* _tmp43_;
+	GFileInputStream* _tmp44_;
+	GFileInputStream* _tmp68_;
+	gboolean _tmp70_;
 	gboolean _tmp75_ = FALSE;
-	gboolean _tmp76_ = FALSE;
-	DetectedPhotoInformation* _tmp78_ = NULL;
-	DetectedPhotoInformation* _tmp79_ = NULL;
+	gboolean _tmp76_;
+	DetectedPhotoInformation* _tmp78_;
+	DetectedPhotoInformation* _tmp79_;
 	GError * _inner_error_ = NULL;
 #line 37 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GDK_SNIFFER, GdkSniffer);
@@ -595,7 +595,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 46 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	if (_tmp4_) {
 #line 598 "GdkSupport.c"
-		GChecksum* _tmp5_ = NULL;
+		GChecksum* _tmp5_;
 #line 47 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_tmp5_ = g_checksum_new (G_CHECKSUM_MD5);
 #line 47 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -614,9 +614,9 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 	_tmp6_->metadata = _tmp7_;
 #line 616 "GdkSupport.c"
 	{
-		DetectedPhotoInformation* _tmp8_ = NULL;
-		PhotoMetadata* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
+		DetectedPhotoInformation* _tmp8_;
+		PhotoMetadata* _tmp9_;
+		GFile* _tmp10_;
 #line 51 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_tmp8_ = self->priv->detected;
 #line 51 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -635,7 +635,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 	__catch30_g_error:
 	{
 		GError* err = NULL;
-		DetectedPhotoInformation* _tmp11_ = NULL;
+		DetectedPhotoInformation* _tmp11_;
 #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		err = _inner_error_;
 #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -668,8 +668,8 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	if (_tmp13_) {
 #line 671 "GdkSupport.c"
-		DetectedPhotoInformation* _tmp14_ = NULL;
-		PhotoMetadata* _tmp15_ = NULL;
+		DetectedPhotoInformation* _tmp14_;
+		PhotoMetadata* _tmp15_;
 #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_tmp14_ = self->priv->detected;
 #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -686,25 +686,25 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 	if (_tmp12_) {
 #line 688 "GdkSupport.c"
 		guint8* flattened_sans_thumbnail = NULL;
-		DetectedPhotoInformation* _tmp16_ = NULL;
-		PhotoMetadata* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		guint8* _tmp19_ = NULL;
-		gint flattened_sans_thumbnail_length1 = 0;
-		gint _flattened_sans_thumbnail_size_ = 0;
+		DetectedPhotoInformation* _tmp16_;
+		PhotoMetadata* _tmp17_;
+		gint _tmp18_;
+		guint8* _tmp19_;
+		gint flattened_sans_thumbnail_length1;
+		gint _flattened_sans_thumbnail_size_;
 		gboolean _tmp20_ = FALSE;
-		guint8* _tmp21_ = NULL;
-		gint _tmp21__length1 = 0;
+		guint8* _tmp21_;
+		gint _tmp21__length1;
 		guint8* flattened_thumbnail = NULL;
-		DetectedPhotoInformation* _tmp27_ = NULL;
-		PhotoMetadata* _tmp28_ = NULL;
-		gint _tmp29_ = 0;
-		guint8* _tmp30_ = NULL;
-		gint flattened_thumbnail_length1 = 0;
-		gint _flattened_thumbnail_size_ = 0;
+		DetectedPhotoInformation* _tmp27_;
+		PhotoMetadata* _tmp28_;
+		gint _tmp29_;
+		guint8* _tmp30_;
+		gint flattened_thumbnail_length1;
+		gint _flattened_thumbnail_size_;
 		gboolean _tmp31_ = FALSE;
-		guint8* _tmp32_ = NULL;
-		gint _tmp32__length1 = 0;
+		guint8* _tmp32_;
+		gint _tmp32__length1;
 #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_tmp16_ = self->priv->detected;
 #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -724,8 +724,8 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		if (_tmp21_ != NULL) {
 #line 727 "GdkSupport.c"
-			guint8* _tmp22_ = NULL;
-			gint _tmp22__length1 = 0;
+			guint8* _tmp22_;
+			gint _tmp22__length1;
 #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			_tmp22_ = flattened_sans_thumbnail;
 #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -741,12 +741,12 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		if (_tmp20_) {
 #line 744 "GdkSupport.c"
-			DetectedPhotoInformation* _tmp23_ = NULL;
-			guint8* _tmp24_ = NULL;
-			gint _tmp24__length1 = 0;
-			guint8* _tmp25_ = NULL;
-			gint _tmp25__length1 = 0;
-			gchar* _tmp26_ = NULL;
+			DetectedPhotoInformation* _tmp23_;
+			guint8* _tmp24_;
+			gint _tmp24__length1;
+			guint8* _tmp25_;
+			gint _tmp25__length1;
+			gchar* _tmp26_;
 #line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			_tmp23_ = self->priv->detected;
 #line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -784,8 +784,8 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		if (_tmp32_ != NULL) {
 #line 787 "GdkSupport.c"
-			guint8* _tmp33_ = NULL;
-			gint _tmp33__length1 = 0;
+			guint8* _tmp33_;
+			gint _tmp33__length1;
 #line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			_tmp33_ = flattened_thumbnail;
 #line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -801,12 +801,12 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		if (_tmp31_) {
 #line 804 "GdkSupport.c"
-			DetectedPhotoInformation* _tmp34_ = NULL;
-			guint8* _tmp35_ = NULL;
-			gint _tmp35__length1 = 0;
-			guint8* _tmp36_ = NULL;
-			gint _tmp36__length1 = 0;
-			gchar* _tmp37_ = NULL;
+			DetectedPhotoInformation* _tmp34_;
+			guint8* _tmp35_;
+			gint _tmp35__length1;
+			guint8* _tmp36_;
+			gint _tmp36__length1;
+			gchar* _tmp37_;
 #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			_tmp34_ = self->priv->detected;
 #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -836,7 +836,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	if (_tmp39_) {
 #line 839 "GdkSupport.c"
-		guint8* _tmp40_ = NULL;
+		guint8* _tmp40_;
 #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_tmp40_ = g_new0 (guint8, 64 * 1024);
 #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -849,7 +849,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 		__tmp38__size_ = _tmp38__length1;
 #line 851 "GdkSupport.c"
 	} else {
-		guint8* _tmp41_ = NULL;
+		guint8* _tmp41_;
 #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_tmp41_ = g_new0 (guint8, 8 * 1024);
 #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -904,19 +904,19 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 		while (TRUE) {
 #line 906 "GdkSupport.c"
 			gsize bytes_read = 0UL;
-			GFileInputStream* _tmp46_ = NULL;
-			guint8* _tmp47_ = NULL;
-			gint _tmp47__length1 = 0;
-			gssize _tmp48_ = 0L;
-			gsize _tmp49_ = 0UL;
-			gsize _tmp50_ = 0UL;
-			gsize _tmp51_ = 0UL;
-			gboolean _tmp52_ = FALSE;
+			GFileInputStream* _tmp46_;
+			guint8* _tmp47_;
+			gint _tmp47__length1;
+			gssize _tmp48_;
+			gsize _tmp49_;
+			gsize _tmp50_;
+			gsize _tmp51_;
+			gboolean _tmp52_;
 			gboolean _tmp56_ = FALSE;
-			gboolean _tmp57_ = FALSE;
+			gboolean _tmp57_;
 			gboolean _tmp62_ = FALSE;
 			gboolean _tmp63_ = FALSE;
-			gboolean _tmp64_ = FALSE;
+			gboolean _tmp64_;
 #line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			if (!_tmp45_) {
 #line 923 "GdkSupport.c"
@@ -970,10 +970,10 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			if (_tmp52_) {
 #line 973 "GdkSupport.c"
-				GChecksum* _tmp53_ = NULL;
-				guint8* _tmp54_ = NULL;
-				gint _tmp54__length1 = 0;
-				gsize _tmp55_ = 0UL;
+				GChecksum* _tmp53_;
+				guint8* _tmp54_;
+				gint _tmp54__length1;
+				gsize _tmp55_;
 #line 82 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 				_tmp53_ = md5_checksum;
 #line 82 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -994,7 +994,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 				_tmp56_ = TRUE;
 #line 996 "GdkSupport.c"
 			} else {
-				gboolean _tmp58_ = FALSE;
+				gboolean _tmp58_;
 #line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 				_tmp58_ = self->priv->area_prepared;
 #line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1004,10 +1004,10 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			if (_tmp56_) {
 #line 1007 "GdkSupport.c"
-				GdkPixbufLoader* _tmp59_ = NULL;
-				guint8* _tmp60_ = NULL;
-				gint _tmp60__length1 = 0;
-				gsize _tmp61_ = 0UL;
+				GdkPixbufLoader* _tmp59_;
+				guint8* _tmp60_;
+				gint _tmp60__length1;
+				gsize _tmp61_;
 #line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 				_tmp59_ = pixbuf_loader;
 #line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1042,7 +1042,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			if (!_tmp64_) {
 #line 1045 "GdkSupport.c"
-				gboolean _tmp65_ = FALSE;
+				gboolean _tmp65_;
 #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 				_tmp65_ = self->priv->size_ready;
 #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1056,7 +1056,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			if (_tmp63_) {
 #line 1059 "GdkSupport.c"
-				gboolean _tmp66_ = FALSE;
+				gboolean _tmp66_;
 #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 				_tmp66_ = self->priv->area_prepared;
 #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1076,7 +1076,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 		}
 	}
 	{
-		GdkPixbufLoader* _tmp67_ = NULL;
+		GdkPixbufLoader* _tmp67_;
 #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_tmp67_ = pixbuf_loader;
 #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1123,7 +1123,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 99 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	if (_tmp68_ != NULL) {
 #line 1126 "GdkSupport.c"
-		GFileInputStream* _tmp69_ = NULL;
+		GFileInputStream* _tmp69_;
 #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_tmp69_ = fins;
 #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1152,10 +1152,10 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 102 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	if (_tmp70_) {
 #line 1155 "GdkSupport.c"
-		DetectedPhotoInformation* _tmp71_ = NULL;
-		GChecksum* _tmp72_ = NULL;
-		const gchar* _tmp73_ = NULL;
-		gchar* _tmp74_ = NULL;
+		DetectedPhotoInformation* _tmp71_;
+		GChecksum* _tmp72_;
+		const gchar* _tmp73_;
+		gchar* _tmp74_;
 #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_tmp71_ = self->priv->detected;
 #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1178,7 +1178,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp75_ = TRUE;
 #line 1180 "GdkSupport.c"
 	} else {
-		gboolean _tmp77_ = FALSE;
+		gboolean _tmp77_;
 #line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_tmp77_ = self->priv->area_prepared;
 #line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1216,9 +1216,9 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 
 
 static void gdk_sniffer_on_size_prepared (GdkSniffer* self, GdkPixbufLoader* loader, gint width, gint height) {
-	DetectedPhotoInformation* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	DetectedPhotoInformation* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	g_return_if_fail (IS_GDK_SNIFFER (self));
 #line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1246,29 +1246,29 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static void gdk_sniffer_on_area_prepared (GdkSniffer* self, GdkPixbufLoader* pixbuf_loader) {
 	GdkPixbuf* pixbuf = NULL;
-	GdkPixbufLoader* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	DetectedPhotoInformation* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	GdkColorspace _tmp6_ = 0;
-	DetectedPhotoInformation* _tmp7_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	DetectedPhotoInformation* _tmp10_ = NULL;
-	GdkPixbuf* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
+	GdkPixbufLoader* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	GdkPixbuf* _tmp2_;
+	GdkPixbuf* _tmp3_;
+	DetectedPhotoInformation* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	GdkColorspace _tmp6_;
+	DetectedPhotoInformation* _tmp7_;
+	GdkPixbuf* _tmp8_;
+	gint _tmp9_;
+	DetectedPhotoInformation* _tmp10_;
+	GdkPixbuf* _tmp11_;
+	gint _tmp12_;
 	GdkPixbufFormat* format = NULL;
-	GdkPixbufLoader* _tmp13_ = NULL;
-	GdkPixbufFormat* _tmp14_ = NULL;
-	DetectedPhotoInformation* _tmp15_ = NULL;
-	GdkPixbufFormat* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	DetectedPhotoInformation* _tmp18_ = NULL;
-	DetectedPhotoInformation* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	PhotoFileFormat _tmp21_ = 0;
+	GdkPixbufLoader* _tmp13_;
+	GdkPixbufFormat* _tmp14_;
+	DetectedPhotoInformation* _tmp15_;
+	GdkPixbufFormat* _tmp16_;
+	gchar* _tmp17_;
+	DetectedPhotoInformation* _tmp18_;
+	DetectedPhotoInformation* _tmp19_;
+	const gchar* _tmp20_;
+	PhotoFileFormat _tmp21_;
 #line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	g_return_if_fail (IS_GDK_SNIFFER (self));
 #line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1357,7 +1357,7 @@ static void gdk_sniffer_class_init (GdkSnifferClass * klass) {
 #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	g_type_class_add_private (klass, sizeof (GdkSnifferPrivate));
 #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) gdk_sniffer_real_sniff;
+	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) gdk_sniffer_real_sniff;
 #line 1362 "GdkSupport.c"
 }
 
@@ -1375,7 +1375,7 @@ static void gdk_sniffer_instance_init (GdkSniffer * self) {
 }
 
 
-static void gdk_sniffer_finalize (PhotoFileSniffer* obj) {
+static void gdk_sniffer_finalize (PhotoFileSniffer * obj) {
 	GdkSniffer * self;
 #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_GDK_SNIFFER, GdkSniffer);
diff --git a/src/photos/JfifSupport.c b/src/photos/JfifSupport.c
index 1891b36..baaaf55 100644
--- a/src/photos/JfifSupport.c
+++ b/src/photos/JfifSupport.c
@@ -1,4 +1,4 @@
-/* JfifSupport.c generated by valac 0.34.7, the Vala compiler
+/* JfifSupport.c generated by valac 0.36.6, the Vala compiler
  * generated from JfifSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -555,7 +555,7 @@ JfifSniffer* jfif_sniffer_construct (GType object_type, GFile* file, PhotoFileSn
 GType gdk_sniffer_get_type (void) G_GNUC_CONST;
 GType jfif_sniffer_get_type (void) G_GNUC_CONST;
 PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type);
-static void jfif_file_format_driver_finalize (PhotoFileFormatDriver* obj);
+static void jfif_file_format_driver_finalize (PhotoFileFormatDriver * obj);
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 GType photo_file_format_flags_get_type (void) G_GNUC_CONST;
 enum  {
@@ -573,7 +573,7 @@ static gchar* jfif_file_format_properties_real_get_default_mime_type (PhotoFileF
 static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1);
 static gchar** _vala_array_dup9 (gchar** self, int length);
 PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type);
-static void jfif_file_format_properties_finalize (PhotoFileFormatProperties* obj);
+static void jfif_file_format_properties_finalize (PhotoFileFormatProperties * obj);
 gpointer detected_photo_information_ref (gpointer instance);
 void detected_photo_information_unref (gpointer instance);
 GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -620,7 +620,7 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 
 
 void jfif_file_format_driver_init (void) {
-	JfifFileFormatDriver* _tmp0_ = NULL;
+	JfifFileFormatDriver* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp0_ = jfif_file_format_driver_new ();
 #line 11 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -642,8 +642,8 @@ static gpointer _photo_file_format_driver_ref0 (gpointer self) {
 
 JfifFileFormatDriver* jfif_file_format_driver_get_instance (void) {
 	JfifFileFormatDriver* result = NULL;
-	JfifFileFormatDriver* _tmp0_ = NULL;
-	JfifFileFormatDriver* _tmp1_ = NULL;
+	JfifFileFormatDriver* _tmp0_;
+	JfifFileFormatDriver* _tmp1_;
 #line 16 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp0_ = jfif_file_format_driver_instance;
 #line 16 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -659,7 +659,7 @@ JfifFileFormatDriver* jfif_file_format_driver_get_instance (void) {
 static PhotoFileFormatProperties* jfif_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) {
 	JfifFileFormatDriver * self;
 	PhotoFileFormatProperties* result = NULL;
-	JfifFileFormatProperties* _tmp0_ = NULL;
+	JfifFileFormatProperties* _tmp0_;
 #line 19 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver);
 #line 20 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -675,8 +675,8 @@ static PhotoFileFormatProperties* jfif_file_format_driver_real_get_properties (P
 static PhotoFileReader* jfif_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) {
 	JfifFileFormatDriver * self;
 	PhotoFileReader* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	JfifReader* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	JfifReader* _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver);
 #line 23 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -696,7 +696,7 @@ static PhotoFileReader* jfif_file_format_driver_real_create_reader (PhotoFileFor
 static PhotoMetadata* jfif_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) {
 	JfifFileFormatDriver * self;
 	PhotoMetadata* result = NULL;
-	PhotoMetadata* _tmp0_ = NULL;
+	PhotoMetadata* _tmp0_;
 #line 27 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver);
 #line 28 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -738,8 +738,8 @@ static gboolean jfif_file_format_driver_real_can_write_metadata (PhotoFileFormat
 static PhotoFileWriter* jfif_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) {
 	JfifFileFormatDriver * self;
 	PhotoFileWriter* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	JfifWriter* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	JfifWriter* _tmp1_;
 #line 39 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver);
 #line 39 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -759,8 +759,8 @@ static PhotoFileWriter* jfif_file_format_driver_real_create_writer (PhotoFileFor
 static PhotoFileMetadataWriter* jfif_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) {
 	JfifFileFormatDriver * self;
 	PhotoFileMetadataWriter* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	JfifMetadataWriter* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	JfifMetadataWriter* _tmp1_;
 #line 43 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver);
 #line 43 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -780,9 +780,9 @@ static PhotoFileMetadataWriter* jfif_file_format_driver_real_create_metadata_wri
 static PhotoFileSniffer* jfif_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) {
 	JfifFileFormatDriver * self;
 	PhotoFileSniffer* result = NULL;
-	GFile* _tmp0_ = NULL;
-	PhotoFileSnifferOptions _tmp1_ = 0;
-	JfifSniffer* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	PhotoFileSnifferOptions _tmp1_;
+	JfifSniffer* _tmp2_;
 #line 47 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver);
 #line 47 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -824,21 +824,21 @@ static void jfif_file_format_driver_class_init (JfifFileFormatDriverClass * klas
 #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	((PhotoFileFormatDriverClass *) klass)->finalize = jfif_file_format_driver_finalize;
 #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) jfif_file_format_driver_real_get_properties;
+	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*) (PhotoFileFormatDriver *)) jfif_file_format_driver_real_get_properties;
 #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) jfif_file_format_driver_real_create_reader;
+	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*) (PhotoFileFormatDriver *, const gchar*)) jfif_file_format_driver_real_create_reader;
 #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) jfif_file_format_driver_real_create_metadata;
+	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) jfif_file_format_driver_real_create_metadata;
 #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) jfif_file_format_driver_real_can_write_image;
+	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*) (PhotoFileFormatDriver *)) jfif_file_format_driver_real_can_write_image;
 #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) jfif_file_format_driver_real_can_write_metadata;
+	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*) (PhotoFileFormatDriver *)) jfif_file_format_driver_real_can_write_metadata;
 #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) jfif_file_format_driver_real_create_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*) (PhotoFileFormatDriver *, const gchar*)) jfif_file_format_driver_real_create_writer;
 #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) jfif_file_format_driver_real_create_metadata_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) jfif_file_format_driver_real_create_metadata_writer;
 #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) jfif_file_format_driver_real_create_sniffer;
+	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) jfif_file_format_driver_real_create_sniffer;
 #line 843 "JfifSupport.c"
 }
 
@@ -847,7 +847,7 @@ static void jfif_file_format_driver_instance_init (JfifFileFormatDriver * self)
 }
 
 
-static void jfif_file_format_driver_finalize (PhotoFileFormatDriver* obj) {
+static void jfif_file_format_driver_finalize (PhotoFileFormatDriver * obj) {
 	JfifFileFormatDriver * self;
 #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver);
@@ -870,7 +870,7 @@ GType jfif_file_format_driver_get_type (void) {
 
 
 void jfif_file_format_properties_init (void) {
-	JfifFileFormatProperties* _tmp0_ = NULL;
+	JfifFileFormatProperties* _tmp0_;
 #line 64 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp0_ = jfif_file_format_properties_new ();
 #line 64 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -890,8 +890,8 @@ static gpointer _photo_file_format_properties_ref0 (gpointer self) {
 
 JfifFileFormatProperties* jfif_file_format_properties_get_instance (void) {
 	JfifFileFormatProperties* result = NULL;
-	JfifFileFormatProperties* _tmp0_ = NULL;
-	JfifFileFormatProperties* _tmp1_ = NULL;
+	JfifFileFormatProperties* _tmp0_;
+	JfifFileFormatProperties* _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp0_ = jfif_file_format_properties_instance;
 #line 68 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -933,7 +933,7 @@ static PhotoFileFormatFlags jfif_file_format_properties_real_get_flags (PhotoFil
 static gchar* jfif_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) {
 	JfifFileFormatProperties * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 79 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_PROPERTIES, JfifFileFormatProperties);
 #line 80 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -949,19 +949,16 @@ static gchar* jfif_file_format_properties_real_get_default_extension (PhotoFileF
 static gchar* jfif_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) {
 	JfifFileFormatProperties * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
 #line 83 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_PROPERTIES, JfifFileFormatProperties);
 #line 84 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp0_ = _ ("JPEG");
+	_tmp0_ = g_strdup (_ ("JPEG"));
 #line 84 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 84 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 84 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 965 "JfifSupport.c"
+#line 962 "JfifSupport.c"
 }
 
 
@@ -972,29 +969,29 @@ static gchar** _vala_array_dup8 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 976 "JfifSupport.c"
-		gchar* _tmp0_ = NULL;
+#line 973 "JfifSupport.c"
+		gchar* _tmp0_;
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		result[i] = _tmp0_;
-#line 982 "JfifSupport.c"
+#line 979 "JfifSupport.c"
 	}
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 986 "JfifSupport.c"
+#line 983 "JfifSupport.c"
 }
 
 
 static gchar** jfif_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) {
 	JfifFileFormatProperties * self;
 	gchar** result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
 #line 87 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_PROPERTIES, JfifFileFormatProperties);
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1013,23 +1010,23 @@ static gchar** jfif_file_format_properties_real_get_known_extensions (PhotoFileF
 	if (result_length1) {
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 1017 "JfifSupport.c"
+#line 1014 "JfifSupport.c"
 	}
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	result = _tmp2_;
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1023 "JfifSupport.c"
+#line 1020 "JfifSupport.c"
 }
 
 
 static gchar* jfif_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) {
 	JfifFileFormatProperties * self;
 	gchar* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 91 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_PROPERTIES, JfifFileFormatProperties);
 #line 92 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1044,7 +1041,7 @@ static gchar* jfif_file_format_properties_real_get_default_mime_type (PhotoFileF
 	result = _tmp2_;
 #line 92 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1048 "JfifSupport.c"
+#line 1045 "JfifSupport.c"
 }
 
 
@@ -1055,29 +1052,29 @@ static gchar** _vala_array_dup9 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 1059 "JfifSupport.c"
-		gchar* _tmp0_ = NULL;
+#line 1056 "JfifSupport.c"
+		gchar* _tmp0_;
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		result[i] = _tmp0_;
-#line 1065 "JfifSupport.c"
+#line 1062 "JfifSupport.c"
 	}
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1069 "JfifSupport.c"
+#line 1066 "JfifSupport.c"
 }
 
 
 static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) {
 	JfifFileFormatProperties * self;
 	gchar** result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
 #line 95 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_PROPERTIES, JfifFileFormatProperties);
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1096,13 +1093,13 @@ static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatP
 	if (result_length1) {
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 1100 "JfifSupport.c"
+#line 1097 "JfifSupport.c"
 	}
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	result = _tmp2_;
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1106 "JfifSupport.c"
+#line 1103 "JfifSupport.c"
 }
 
 
@@ -1112,43 +1109,43 @@ JfifFileFormatProperties* jfif_file_format_properties_construct (GType object_ty
 	self = (JfifFileFormatProperties*) photo_file_format_properties_construct (object_type);
 #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return self;
-#line 1116 "JfifSupport.c"
+#line 1113 "JfifSupport.c"
 }
 
 
 JfifFileFormatProperties* jfif_file_format_properties_new (void) {
 #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return jfif_file_format_properties_construct (TYPE_JFIF_FILE_FORMAT_PROPERTIES);
-#line 1123 "JfifSupport.c"
+#line 1120 "JfifSupport.c"
 }
 
 
 static void jfif_file_format_properties_class_init (JfifFileFormatPropertiesClass * klass) {
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar** _tmp6_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar** _tmp4_;
+	gchar* _tmp5_;
+	gchar** _tmp6_;
 #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	jfif_file_format_properties_parent_class = g_type_class_peek_parent (klass);
 #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	((PhotoFileFormatPropertiesClass *) klass)->finalize = jfif_file_format_properties_finalize;
 #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) jfif_file_format_properties_real_get_file_format;
+	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*) (PhotoFileFormatProperties *)) jfif_file_format_properties_real_get_file_format;
 #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) jfif_file_format_properties_real_get_flags;
+	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*) (PhotoFileFormatProperties *)) jfif_file_format_properties_real_get_flags;
 #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) jfif_file_format_properties_real_get_default_extension;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*) (PhotoFileFormatProperties *)) jfif_file_format_properties_real_get_default_extension;
 #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) jfif_file_format_properties_real_get_user_visible_name;
+	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*) (PhotoFileFormatProperties *)) jfif_file_format_properties_real_get_user_visible_name;
 #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) jfif_file_format_properties_real_get_known_extensions;
+	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*) (PhotoFileFormatProperties *, int*)) jfif_file_format_properties_real_get_known_extensions;
 #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) jfif_file_format_properties_real_get_default_mime_type;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*) (PhotoFileFormatProperties *)) jfif_file_format_properties_real_get_default_mime_type;
 #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) jfif_file_format_properties_real_get_mime_types;
+	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*) (PhotoFileFormatProperties *, int*)) jfif_file_format_properties_real_get_mime_types;
 #line 53 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp0_ = g_strdup ("jpg");
 #line 53 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1181,7 +1178,7 @@ static void jfif_file_format_properties_class_init (JfifFileFormatPropertiesClas
 	jfif_file_format_properties_KNOWN_MIME_TYPES = _tmp6_;
 #line 57 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	jfif_file_format_properties_KNOWN_MIME_TYPES_length1 = 1;
-#line 1185 "JfifSupport.c"
+#line 1182 "JfifSupport.c"
 }
 
 
@@ -1189,13 +1186,13 @@ static void jfif_file_format_properties_instance_init (JfifFileFormatProperties
 }
 
 
-static void jfif_file_format_properties_finalize (PhotoFileFormatProperties* obj) {
+static void jfif_file_format_properties_finalize (PhotoFileFormatProperties * obj) {
 	JfifFileFormatProperties * self;
 #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_JFIF_FILE_FORMAT_PROPERTIES, JfifFileFormatProperties);
 #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	PHOTO_FILE_FORMAT_PROPERTIES_CLASS (jfif_file_format_properties_parent_class)->finalize (obj);
-#line 1199 "JfifSupport.c"
+#line 1196 "JfifSupport.c"
 }
 
 
@@ -1213,8 +1210,8 @@ GType jfif_file_format_properties_get_type (void) {
 
 JfifSniffer* jfif_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) {
 	JfifSniffer* self = NULL;
-	GFile* _tmp0_ = NULL;
-	PhotoFileSnifferOptions _tmp1_ = 0;
+	GFile* _tmp0_;
+	PhotoFileSnifferOptions _tmp1_;
 #line 101 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 102 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1225,21 +1222,21 @@ JfifSniffer* jfif_sniffer_construct (GType object_type, GFile* file, PhotoFileSn
 	self = (JfifSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_);
 #line 101 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return self;
-#line 1229 "JfifSupport.c"
+#line 1226 "JfifSupport.c"
 }
 
 
 JfifSniffer* jfif_sniffer_new (GFile* file, PhotoFileSnifferOptions options) {
 #line 101 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return jfif_sniffer_construct (TYPE_JFIF_SNIFFER, file, options);
-#line 1236 "JfifSupport.c"
+#line 1233 "JfifSupport.c"
 }
 
 
 static gpointer _detected_photo_information_ref0 (gpointer self) {
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return self ? detected_photo_information_ref (self) : NULL;
-#line 1243 "JfifSupport.c"
+#line 1240 "JfifSupport.c"
 }
 
 
@@ -1248,16 +1245,16 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base
 	gboolean _vala_is_corrupted = FALSE;
 	DetectedPhotoInformation* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 	DetectedPhotoInformation* detected = NULL;
 	gboolean _tmp3_ = FALSE;
-	DetectedPhotoInformation* _tmp4_ = NULL;
-	DetectedPhotoInformation* _tmp5_ = NULL;
+	DetectedPhotoInformation* _tmp4_;
+	DetectedPhotoInformation* _tmp5_;
 	DetectedPhotoInformation* _tmp6_ = NULL;
-	DetectedPhotoInformation* _tmp7_ = NULL;
-	PhotoFileFormat _tmp8_ = 0;
-	DetectedPhotoInformation* _tmp10_ = NULL;
+	DetectedPhotoInformation* _tmp7_;
+	PhotoFileFormat _tmp8_;
+	DetectedPhotoInformation* _tmp10_;
 	GError * _inner_error_ = NULL;
 #line 105 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_SNIFFER, JfifSniffer);
@@ -1275,7 +1272,7 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base
 		g_propagate_error (error, _inner_error_);
 #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return NULL;
-#line 1279 "JfifSupport.c"
+#line 1276 "JfifSupport.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (!_tmp0_) {
@@ -1285,11 +1282,11 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base
 		if (is_corrupted) {
 #line 110 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			*is_corrupted = _vala_is_corrupted;
-#line 1289 "JfifSupport.c"
+#line 1286 "JfifSupport.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return result;
-#line 1293 "JfifSupport.c"
+#line 1290 "JfifSupport.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp4_ = PHOTO_FILE_SNIFFER_CLASS (jfif_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp3_, &_inner_error_);
@@ -1303,7 +1300,7 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base
 		g_propagate_error (error, _inner_error_);
 #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return NULL;
-#line 1307 "JfifSupport.c"
+#line 1304 "JfifSupport.c"
 	}
 #line 113 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp5_ = detected;
@@ -1317,11 +1314,11 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base
 		if (is_corrupted) {
 #line 114 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			*is_corrupted = _vala_is_corrupted;
-#line 1321 "JfifSupport.c"
+#line 1318 "JfifSupport.c"
 		}
 #line 114 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return result;
-#line 1325 "JfifSupport.c"
+#line 1322 "JfifSupport.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp7_ = detected;
@@ -1329,17 +1326,17 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base
 	_tmp8_ = _tmp7_->file_format;
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (_tmp8_ == PHOTO_FILE_FORMAT_JFIF) {
-#line 1333 "JfifSupport.c"
-		DetectedPhotoInformation* _tmp9_ = NULL;
+#line 1330 "JfifSupport.c"
+		DetectedPhotoInformation* _tmp9_;
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp9_ = detected;
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp6_ = _tmp9_;
-#line 1339 "JfifSupport.c"
+#line 1336 "JfifSupport.c"
 	} else {
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp6_ = NULL;
-#line 1343 "JfifSupport.c"
+#line 1340 "JfifSupport.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp10_ = _detected_photo_information_ref0 (_tmp6_);
@@ -1351,11 +1348,11 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base
 	if (is_corrupted) {
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		*is_corrupted = _vala_is_corrupted;
-#line 1355 "JfifSupport.c"
+#line 1352 "JfifSupport.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1359 "JfifSupport.c"
+#line 1356 "JfifSupport.c"
 }
 
 
@@ -1363,8 +1360,8 @@ static void jfif_sniffer_class_init (JfifSnifferClass * klass) {
 #line 100 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	jfif_sniffer_parent_class = g_type_class_peek_parent (klass);
 #line 100 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) jfif_sniffer_real_sniff;
-#line 1368 "JfifSupport.c"
+	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) jfif_sniffer_real_sniff;
+#line 1365 "JfifSupport.c"
 }
 
 
@@ -1386,7 +1383,7 @@ GType jfif_sniffer_get_type (void) {
 
 JfifReader* jfif_reader_construct (GType object_type, const gchar* filepath) {
 	JfifReader* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 121 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 122 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1395,21 +1392,21 @@ JfifReader* jfif_reader_construct (GType object_type, const gchar* filepath) {
 	self = (JfifReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF);
 #line 121 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return self;
-#line 1399 "JfifSupport.c"
+#line 1396 "JfifSupport.c"
 }
 
 
 JfifReader* jfif_reader_new (const gchar* filepath) {
 #line 121 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return jfif_reader_construct (TYPE_JFIF_READER, filepath);
-#line 1406 "JfifSupport.c"
+#line 1403 "JfifSupport.c"
 }
 
 
 static void jfif_reader_class_init (JfifReaderClass * klass) {
 #line 120 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	jfif_reader_parent_class = g_type_class_peek_parent (klass);
-#line 1413 "JfifSupport.c"
+#line 1410 "JfifSupport.c"
 }
 
 
@@ -1431,7 +1428,7 @@ GType jfif_reader_get_type (void) {
 
 JfifWriter* jfif_writer_construct (GType object_type, const gchar* filepath) {
 	JfifWriter* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 127 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 128 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1440,25 +1437,25 @@ JfifWriter* jfif_writer_construct (GType object_type, const gchar* filepath) {
 	self = (JfifWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF);
 #line 127 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return self;
-#line 1444 "JfifSupport.c"
+#line 1441 "JfifSupport.c"
 }
 
 
 JfifWriter* jfif_writer_new (const gchar* filepath) {
 #line 127 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return jfif_writer_construct (TYPE_JFIF_WRITER, filepath);
-#line 1451 "JfifSupport.c"
+#line 1448 "JfifSupport.c"
 }
 
 
 static void jfif_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) {
 	JfifWriter * self;
-	GdkPixbuf* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	JpegQuality _tmp3_ = 0;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	GdkPixbuf* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	JpegQuality _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 131 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_WRITER, JfifWriter);
@@ -1488,7 +1485,7 @@ static void jfif_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, Jp
 		g_propagate_error (error, _inner_error_);
 #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return;
-#line 1492 "JfifSupport.c"
+#line 1489 "JfifSupport.c"
 	}
 }
 
@@ -1497,8 +1494,8 @@ static void jfif_writer_class_init (JfifWriterClass * klass) {
 #line 126 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	jfif_writer_parent_class = g_type_class_peek_parent (klass);
 #line 126 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) jfif_writer_real_write;
-#line 1502 "JfifSupport.c"
+	((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) jfif_writer_real_write;
+#line 1499 "JfifSupport.c"
 }
 
 
@@ -1520,7 +1517,7 @@ GType jfif_writer_get_type (void) {
 
 JfifMetadataWriter* jfif_metadata_writer_construct (GType object_type, const gchar* filepath) {
 	JfifMetadataWriter* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 137 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 138 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1529,22 +1526,22 @@ JfifMetadataWriter* jfif_metadata_writer_construct (GType object_type, const gch
 	self = (JfifMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF);
 #line 137 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return self;
-#line 1533 "JfifSupport.c"
+#line 1530 "JfifSupport.c"
 }
 
 
 JfifMetadataWriter* jfif_metadata_writer_new (const gchar* filepath) {
 #line 137 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return jfif_metadata_writer_construct (TYPE_JFIF_METADATA_WRITER, filepath);
-#line 1540 "JfifSupport.c"
+#line 1537 "JfifSupport.c"
 }
 
 
 static void jfif_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error) {
 	JfifMetadataWriter * self;
-	PhotoMetadata* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	PhotoMetadata* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 141 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_METADATA_WRITER, JfifMetadataWriter);
@@ -1566,7 +1563,7 @@ static void jfif_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* b
 		g_propagate_error (error, _inner_error_);
 #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return;
-#line 1570 "JfifSupport.c"
+#line 1567 "JfifSupport.c"
 	}
 }
 
@@ -1575,8 +1572,8 @@ static void jfif_metadata_writer_class_init (JfifMetadataWriterClass * klass) {
 #line 136 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	jfif_metadata_writer_parent_class = g_type_class_peek_parent (klass);
 #line 136 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) jfif_metadata_writer_real_write_metadata;
-#line 1580 "JfifSupport.c"
+	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) jfif_metadata_writer_real_write_metadata;
+#line 1577 "JfifSupport.c"
 }
 
 
@@ -1602,7 +1599,7 @@ guint8 jpeg_marker_get_byte (JpegMarker self) {
 	result = (guint8) self;
 #line 160 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1606 "JfifSupport.c"
+#line 1603 "JfifSupport.c"
 }
 
 
@@ -1624,28 +1621,28 @@ gint jpeg_quality_get_pct (JpegQuality self) {
 	result = (gint) self;
 #line 171 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1628 "JfifSupport.c"
+#line 1625 "JfifSupport.c"
 }
 
 
 gchar* jpeg_quality_get_pct_text (JpegQuality self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 175 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp0_ = g_strdup_printf ("%d", (gint) self);
 #line 175 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	result = _tmp0_;
 #line 175 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1641 "JfifSupport.c"
+#line 1638 "JfifSupport.c"
 }
 
 
 JpegQuality* jpeg_quality_get_all (int* result_length1) {
 	JpegQuality* result = NULL;
-	JpegQuality* _tmp0_ = NULL;
-	JpegQuality* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	JpegQuality* _tmp0_;
+	JpegQuality* _tmp1_;
+	gint _tmp1__length1;
 #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp0_ = g_new0 (JpegQuality, 4);
 #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1664,13 +1661,13 @@ JpegQuality* jpeg_quality_get_all (int* result_length1) {
 	if (result_length1) {
 #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		*result_length1 = _tmp1__length1;
-#line 1668 "JfifSupport.c"
+#line 1665 "JfifSupport.c"
 	}
 #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	result = _tmp1_;
 #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1674 "JfifSupport.c"
+#line 1671 "JfifSupport.c"
 }
 
 
@@ -1680,72 +1677,60 @@ gchar* jpeg_quality_to_string (JpegQuality self) {
 	switch (self) {
 #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		case JPEG_QUALITY_LOW:
-#line 1684 "JfifSupport.c"
+#line 1681 "JfifSupport.c"
 		{
-			const gchar* _tmp0_ = NULL;
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp0_;
 #line 185 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-			_tmp0_ = _ ("Low (%d%%)");
+			_tmp0_ = g_strdup_printf (_ ("Low (%d%%)"), (gint) self);
 #line 185 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-			_tmp1_ = g_strdup_printf (_tmp0_, (gint) self);
-#line 185 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-			result = _tmp1_;
+			result = _tmp0_;
 #line 185 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			return result;
-#line 1696 "JfifSupport.c"
+#line 1690 "JfifSupport.c"
 		}
 #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		case JPEG_QUALITY_MEDIUM:
-#line 1700 "JfifSupport.c"
+#line 1694 "JfifSupport.c"
 		{
-			const gchar* _tmp2_ = NULL;
-			gchar* _tmp3_ = NULL;
-#line 188 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-			_tmp2_ = _ ("Medium (%d%%)");
+			gchar* _tmp1_;
 #line 188 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-			_tmp3_ = g_strdup_printf (_tmp2_, (gint) self);
+			_tmp1_ = g_strdup_printf (_ ("Medium (%d%%)"), (gint) self);
 #line 188 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-			result = _tmp3_;
+			result = _tmp1_;
 #line 188 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			return result;
-#line 1712 "JfifSupport.c"
+#line 1703 "JfifSupport.c"
 		}
 #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		case JPEG_QUALITY_HIGH:
-#line 1716 "JfifSupport.c"
+#line 1707 "JfifSupport.c"
 		{
-			const gchar* _tmp4_ = NULL;
-			gchar* _tmp5_ = NULL;
-#line 191 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-			_tmp4_ = _ ("High (%d%%)");
+			gchar* _tmp2_;
 #line 191 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-			_tmp5_ = g_strdup_printf (_tmp4_, (gint) self);
+			_tmp2_ = g_strdup_printf (_ ("High (%d%%)"), (gint) self);
 #line 191 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-			result = _tmp5_;
+			result = _tmp2_;
 #line 191 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			return result;
-#line 1728 "JfifSupport.c"
+#line 1716 "JfifSupport.c"
 		}
 #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		case JPEG_QUALITY_MAXIMUM:
-#line 1732 "JfifSupport.c"
+#line 1720 "JfifSupport.c"
 		{
-			const gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
-#line 194 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-			_tmp6_ = _ ("Maximum (%d%%)");
+			gchar* _tmp3_;
 #line 194 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-			_tmp7_ = g_strdup_printf (_tmp6_, (gint) self);
+			_tmp3_ = g_strdup_printf (_ ("Maximum (%d%%)"), (gint) self);
 #line 194 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-			result = _tmp7_;
+			result = _tmp3_;
 #line 194 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			return result;
-#line 1744 "JfifSupport.c"
+#line 1729 "JfifSupport.c"
 		}
 		default:
 #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		break;
-#line 1749 "JfifSupport.c"
+#line 1734 "JfifSupport.c"
 	}
 #line 197 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	g_warn_if_reached ();
@@ -1753,7 +1738,7 @@ gchar* jpeg_quality_to_string (JpegQuality self) {
 	result = NULL;
 #line 199 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1757 "JfifSupport.c"
+#line 1742 "JfifSupport.c"
 }
 
 
@@ -1772,15 +1757,15 @@ GType jpeg_quality_get_type (void) {
 gboolean jpeg_is_jpeg (GFile* file, GError** error) {
 	gboolean result = FALSE;
 	GFileInputStream* fins = NULL;
-	GFile* _tmp0_ = NULL;
-	GFileInputStream* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFileInputStream* _tmp1_;
 	JpegMarker marker = 0;
 	gint segment_length = 0;
-	GFileInputStream* _tmp3_ = NULL;
+	GFileInputStream* _tmp3_;
 	JpegMarker _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	gint _tmp5_;
 	gboolean _tmp7_ = FALSE;
-	JpegMarker _tmp8_ = 0;
+	JpegMarker _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 203 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
@@ -1792,13 +1777,13 @@ gboolean jpeg_is_jpeg (GFile* file, GError** error) {
 	fins = _tmp1_;
 #line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1796 "JfifSupport.c"
+#line 1781 "JfifSupport.c"
 		gboolean _tmp2_ = FALSE;
 #line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return _tmp2_;
-#line 1802 "JfifSupport.c"
+#line 1787 "JfifSupport.c"
 	}
 #line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp3_ = fins;
@@ -1810,7 +1795,7 @@ gboolean jpeg_is_jpeg (GFile* file, GError** error) {
 	segment_length = _tmp5_;
 #line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1814 "JfifSupport.c"
+#line 1799 "JfifSupport.c"
 		gboolean _tmp6_ = FALSE;
 #line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		g_propagate_error (error, _inner_error_);
@@ -1818,23 +1803,23 @@ gboolean jpeg_is_jpeg (GFile* file, GError** error) {
 		_g_object_unref0 (fins);
 #line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return _tmp6_;
-#line 1822 "JfifSupport.c"
+#line 1807 "JfifSupport.c"
 	}
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp8_ = marker;
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (_tmp8_ == JPEG_MARKER_SOI) {
-#line 1828 "JfifSupport.c"
-		gint _tmp9_ = 0;
+#line 1813 "JfifSupport.c"
+		gint _tmp9_;
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp9_ = segment_length;
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp7_ = _tmp9_ == 0;
-#line 1834 "JfifSupport.c"
+#line 1819 "JfifSupport.c"
 	} else {
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp7_ = FALSE;
-#line 1838 "JfifSupport.c"
+#line 1823 "JfifSupport.c"
 	}
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	result = _tmp7_;
@@ -1842,7 +1827,7 @@ gboolean jpeg_is_jpeg (GFile* file, GError** error) {
 	_g_object_unref0 (fins);
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1846 "JfifSupport.c"
+#line 1831 "JfifSupport.c"
 }
 
 
@@ -1850,22 +1835,22 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 	JpegMarker _vala_marker = 0;
 	gint result = 0;
 	GDataInputStream* dins = NULL;
-	GFileInputStream* _tmp0_ = NULL;
-	GDataInputStream* _tmp1_ = NULL;
-	GDataInputStream* _tmp2_ = NULL;
+	GFileInputStream* _tmp0_;
+	GDataInputStream* _tmp1_;
+	GDataInputStream* _tmp2_;
 	guint8 _tmp3_ = 0U;
-	GDataInputStream* _tmp4_ = NULL;
-	guint8 _tmp5_ = 0U;
+	GDataInputStream* _tmp4_;
+	guint8 _tmp5_;
 	guint8 _tmp7_ = 0U;
-	GDataInputStream* _tmp8_ = NULL;
-	guint8 _tmp9_ = 0U;
+	GDataInputStream* _tmp8_;
+	guint8 _tmp9_;
 	gboolean _tmp11_ = FALSE;
-	JpegMarker _tmp12_ = 0;
+	JpegMarker _tmp12_;
 	guint16 length = 0U;
-	GDataInputStream* _tmp14_ = NULL;
-	guint16 _tmp15_ = 0U;
-	guint16 _tmp17_ = 0U;
-	guint16 _tmp21_ = 0U;
+	GDataInputStream* _tmp14_;
+	guint16 _tmp15_;
+	guint16 _tmp17_;
+	guint16 _tmp21_;
 	GError * _inner_error_ = NULL;
 #line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	g_return_val_if_fail (G_IS_FILE_INPUT_STREAM (fins), 0);
@@ -1889,7 +1874,7 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 	_tmp3_ = _tmp5_;
 #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1893 "JfifSupport.c"
+#line 1878 "JfifSupport.c"
 		gint _tmp6_ = 0;
 #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		g_propagate_error (error, _inner_error_);
@@ -1897,7 +1882,7 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 		_g_object_unref0 (dins);
 #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return _tmp6_;
-#line 1901 "JfifSupport.c"
+#line 1886 "JfifSupport.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (_tmp3_ != JPEG_MARKER_PREFIX) {
@@ -1909,11 +1894,11 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 		if (marker) {
 #line 220 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			*marker = _vala_marker;
-#line 1913 "JfifSupport.c"
+#line 1898 "JfifSupport.c"
 		}
 #line 220 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return result;
-#line 1917 "JfifSupport.c"
+#line 1902 "JfifSupport.c"
 	}
 #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp8_ = dins;
@@ -1923,7 +1908,7 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 	_tmp7_ = _tmp9_;
 #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1927 "JfifSupport.c"
+#line 1912 "JfifSupport.c"
 		gint _tmp10_ = 0;
 #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		g_propagate_error (error, _inner_error_);
@@ -1931,7 +1916,7 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 		_g_object_unref0 (dins);
 #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return _tmp10_;
-#line 1935 "JfifSupport.c"
+#line 1920 "JfifSupport.c"
 	}
 #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_vala_marker = (JpegMarker) _tmp7_;
@@ -1941,14 +1926,14 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 	if (_tmp12_ == JPEG_MARKER_SOI) {
 #line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp11_ = TRUE;
-#line 1945 "JfifSupport.c"
+#line 1930 "JfifSupport.c"
 	} else {
-		JpegMarker _tmp13_ = 0;
+		JpegMarker _tmp13_;
 #line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp13_ = _vala_marker;
 #line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp11_ = _tmp13_ == JPEG_MARKER_EOI;
-#line 1952 "JfifSupport.c"
+#line 1937 "JfifSupport.c"
 	}
 #line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (_tmp11_) {
@@ -1960,11 +1945,11 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 		if (marker) {
 #line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			*marker = _vala_marker;
-#line 1964 "JfifSupport.c"
+#line 1949 "JfifSupport.c"
 		}
 #line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return result;
-#line 1968 "JfifSupport.c"
+#line 1953 "JfifSupport.c"
 	}
 #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp14_ = dins;
@@ -1974,7 +1959,7 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 	length = _tmp15_;
 #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1978 "JfifSupport.c"
+#line 1963 "JfifSupport.c"
 		gint _tmp16_ = 0;
 #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		g_propagate_error (error, _inner_error_);
@@ -1982,16 +1967,16 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 		_g_object_unref0 (dins);
 #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return _tmp16_;
-#line 1986 "JfifSupport.c"
+#line 1971 "JfifSupport.c"
 	}
 #line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp17_ = length;
 #line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (((gint) _tmp17_) < 2) {
-#line 1992 "JfifSupport.c"
-		guint16 _tmp18_ = 0U;
-		GFileInputStream* _tmp19_ = NULL;
-		gint64 _tmp20_ = 0LL;
+#line 1977 "JfifSupport.c"
+		guint16 _tmp18_;
+		GFileInputStream* _tmp19_;
+		gint64 _tmp20_;
 #line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp18_ = length;
 #line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -2008,11 +1993,11 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 		if (marker) {
 #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			*marker = _vala_marker;
-#line 2012 "JfifSupport.c"
+#line 1997 "JfifSupport.c"
 		}
 #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return result;
-#line 2016 "JfifSupport.c"
+#line 2001 "JfifSupport.c"
 	}
 #line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp21_ = length;
@@ -2024,11 +2009,11 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 	if (marker) {
 #line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		*marker = _vala_marker;
-#line 2028 "JfifSupport.c"
+#line 2013 "JfifSupport.c"
 	}
 #line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 2032 "JfifSupport.c"
+#line 2017 "JfifSupport.c"
 }
 
 
diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c
index a2fb384..6ec6ea2 100644
--- a/src/photos/PhotoFileAdapter.c
+++ b/src/photos/PhotoFileAdapter.c
@@ -1,4 +1,4 @@
-/* PhotoFileAdapter.c generated by valac 0.34.7, the Vala compiler
+/* PhotoFileAdapter.c generated by valac 0.36.6, the Vala compiler
  * generated from PhotoFileAdapter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -217,7 +217,7 @@ gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self);
 gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self);
 GFile* photo_file_adapter_get_file (PhotoFileAdapter* self);
 PhotoFileFormat photo_file_adapter_get_file_format (PhotoFileAdapter* self);
-static void photo_file_adapter_finalize (PhotoFileAdapter* obj);
+static void photo_file_adapter_finalize (PhotoFileAdapter * obj);
 GType photo_file_reader_get_type (void) G_GNUC_CONST;
 gpointer media_metadata_ref (gpointer instance);
 void media_metadata_unref (gpointer instance);
@@ -252,7 +252,7 @@ static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dim
 GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp);
 void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role);
 PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self);
-static void photo_file_reader_finalize (PhotoFileAdapter* obj);
+static void photo_file_reader_finalize (PhotoFileAdapter * obj);
 GType jpeg_quality_get_type (void) G_GNUC_CONST;
 enum  {
 	PHOTO_FILE_WRITER_DUMMY_PROPERTY
@@ -273,9 +273,9 @@ static void photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWri
 
 PhotoFileAdapter* photo_file_adapter_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) {
 	PhotoFileAdapter* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	PhotoFileFormat _tmp2_ = 0;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	PhotoFileFormat _tmp2_;
 #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -300,8 +300,8 @@ PhotoFileAdapter* photo_file_adapter_construct (GType object_type, const gchar*
 
 gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 #line 30 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), FALSE);
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -318,8 +318,8 @@ gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self) {
 
 gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), NULL);
 #line 35 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -349,23 +349,23 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 	g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), NULL);
 #line 351 "PhotoFileAdapter.c"
 	{
-		GFile* _tmp0_ = NULL;
+		GFile* _tmp0_;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		_tmp0_ = self->priv->file;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		g_rec_mutex_lock (&self->priv->__lock_file);
 #line 358 "PhotoFileAdapter.c"
 		{
-			GFile* _tmp1_ = NULL;
-			GFile* _tmp4_ = NULL;
-			GFile* _tmp5_ = NULL;
+			GFile* _tmp1_;
+			GFile* _tmp4_;
+			GFile* _tmp5_;
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			_tmp1_ = self->priv->file;
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			if (_tmp1_ == NULL) {
 #line 367 "PhotoFileAdapter.c"
-				const gchar* _tmp2_ = NULL;
-				GFile* _tmp3_ = NULL;
+				const gchar* _tmp2_;
+				GFile* _tmp3_;
 #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 				_tmp2_ = self->priv->filepath;
 #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -388,7 +388,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 		}
 		__finally24:
 		{
-			GFile* _tmp6_ = NULL;
+			GFile* _tmp6_;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			_tmp6_ = self->priv->file;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -418,7 +418,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 
 PhotoFileFormat photo_file_adapter_get_file_format (PhotoFileAdapter* self) {
 	PhotoFileFormat result = 0;
-	PhotoFileFormat _tmp0_ = 0;
+	PhotoFileFormat _tmp0_;
 #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), 0);
 #line 51 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -473,7 +473,7 @@ static gchar* value_photo_file_adapter_collect_value (GValue* value, guint n_col
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (collect_values[0].v_pointer) {
 #line 476 "PhotoFileAdapter.c"
-		PhotoFileAdapter* object;
+		PhotoFileAdapter * object;
 		object = collect_values[0].v_pointer;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -500,7 +500,7 @@ static gchar* value_photo_file_adapter_collect_value (GValue* value, guint n_col
 
 
 static gchar* value_photo_file_adapter_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PhotoFileAdapter** object_p;
+	PhotoFileAdapter ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (!object_p) {
@@ -552,7 +552,7 @@ gpointer value_get_photo_file_adapter (const GValue* value) {
 
 
 void value_set_photo_file_adapter (GValue* value, gpointer v_object) {
-	PhotoFileAdapter* old;
+	PhotoFileAdapter * old;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER));
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -583,7 +583,7 @@ void value_set_photo_file_adapter (GValue* value, gpointer v_object) {
 
 
 void value_take_photo_file_adapter (GValue* value, gpointer v_object) {
-	PhotoFileAdapter* old;
+	PhotoFileAdapter * old;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER));
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -635,7 +635,7 @@ static void photo_file_adapter_instance_init (PhotoFileAdapter * self) {
 }
 
 
-static void photo_file_adapter_finalize (PhotoFileAdapter* obj) {
+static void photo_file_adapter_finalize (PhotoFileAdapter * obj) {
 	PhotoFileAdapter * self;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter);
@@ -666,7 +666,7 @@ GType photo_file_adapter_get_type (void) {
 
 
 gpointer photo_file_adapter_ref (gpointer instance) {
-	PhotoFileAdapter* self;
+	PhotoFileAdapter * self;
 	self = instance;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -677,7 +677,7 @@ gpointer photo_file_adapter_ref (gpointer instance) {
 
 
 void photo_file_adapter_unref (gpointer instance) {
-	PhotoFileAdapter* self;
+	PhotoFileAdapter * self;
 	self = instance;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -704,8 +704,8 @@ GType photo_file_reader_role_get_type (void) {
 
 PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) {
 	PhotoFileReader* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	PhotoFileFormat _tmp1_ = 0;
+	const gchar* _tmp0_;
+	PhotoFileFormat _tmp1_;
 #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -723,12 +723,12 @@ PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* fi
 PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError** error) {
 	PhotoFileWriter* result = NULL;
 	PhotoFileWriter* _tmp0_ = NULL;
-	PhotoFileFormat _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PhotoFileWriter* _tmp4_ = NULL;
-	PhotoFileWriter* _tmp5_ = NULL;
-	PhotoFileWriter* _tmp6_ = NULL;
+	PhotoFileFormat _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	PhotoFileWriter* _tmp4_;
+	PhotoFileWriter* _tmp5_;
+	PhotoFileWriter* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 71 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
@@ -782,12 +782,12 @@ PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError*
 PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileReader* self, GError** error) {
 	PhotoFileMetadataWriter* result = NULL;
 	PhotoFileMetadataWriter* _tmp0_ = NULL;
-	PhotoFileFormat _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PhotoFileMetadataWriter* _tmp4_ = NULL;
-	PhotoFileMetadataWriter* _tmp5_ = NULL;
-	PhotoFileMetadataWriter* _tmp6_ = NULL;
+	PhotoFileFormat _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	PhotoFileMetadataWriter* _tmp4_;
+	PhotoFileMetadataWriter* _tmp5_;
+	PhotoFileMetadataWriter* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 75 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
@@ -877,9 +877,9 @@ GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, GError** erro
 static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	Dimensions _tmp2_ = {0};
-	GdkPixbuf* _tmp3_ = NULL;
+	GdkPixbuf* _tmp1_;
+	Dimensions _tmp2_;
+	GdkPixbuf* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (full != NULL, NULL);
@@ -921,7 +921,7 @@ GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* ful
 
 
 void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role) {
-	PhotoFileReaderRole _tmp0_ = 0;
+	PhotoFileReaderRole _tmp0_;
 #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_if_fail (IS_PHOTO_FILE_READER (self));
 #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -934,7 +934,7 @@ void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role
 
 PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self) {
 	PhotoFileReaderRole result = 0;
-	PhotoFileReaderRole _tmp0_ = 0;
+	PhotoFileReaderRole _tmp0_;
 #line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), 0);
 #line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -955,11 +955,11 @@ static void photo_file_reader_class_init (PhotoFileReaderClass * klass) {
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_type_class_add_private (klass, sizeof (PhotoFileReaderPrivate));
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*)(PhotoFileReader*, GError**)) photo_file_reader_real_read_metadata;
+	((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*) (PhotoFileReader *, GError**)) photo_file_reader_real_read_metadata;
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*)(PhotoFileReader*, GError**)) photo_file_reader_real_unscaled_read;
+	((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) photo_file_reader_real_unscaled_read;
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) photo_file_reader_real_scaled_read;
+	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) photo_file_reader_real_scaled_read;
 #line 964 "PhotoFileAdapter.c"
 }
 
@@ -973,7 +973,7 @@ static void photo_file_reader_instance_init (PhotoFileReader * self) {
 }
 
 
-static void photo_file_reader_finalize (PhotoFileAdapter* obj) {
+static void photo_file_reader_finalize (PhotoFileAdapter * obj) {
 	PhotoFileReader * self;
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_READER, PhotoFileReader);
@@ -997,8 +997,8 @@ GType photo_file_reader_get_type (void) {
 
 PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) {
 	PhotoFileWriter* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	PhotoFileFormat _tmp1_ = 0;
+	const gchar* _tmp0_;
+	PhotoFileFormat _tmp1_;
 #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -1015,11 +1015,11 @@ PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* fi
 
 PhotoFileReader* photo_file_writer_create_reader (PhotoFileWriter* self) {
 	PhotoFileReader* result = NULL;
-	PhotoFileFormat _tmp0_ = 0;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	PhotoFileReader* _tmp3_ = NULL;
-	PhotoFileReader* _tmp4_ = NULL;
+	PhotoFileFormat _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	PhotoFileReader* _tmp3_;
+	PhotoFileReader* _tmp4_;
 #line 105 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_WRITER (self), NULL);
 #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -1064,7 +1064,7 @@ static void photo_file_writer_class_init (PhotoFileWriterClass * klass) {
 #line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	photo_file_writer_parent_class = g_type_class_peek_parent (klass);
 #line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) photo_file_writer_real_write;
+	((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) photo_file_writer_real_write;
 #line 1069 "PhotoFileAdapter.c"
 }
 
@@ -1087,8 +1087,8 @@ GType photo_file_writer_get_type (void) {
 
 PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) {
 	PhotoFileMetadataWriter* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	PhotoFileFormat _tmp1_ = 0;
+	const gchar* _tmp0_;
+	PhotoFileFormat _tmp1_;
 #line 117 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -1105,11 +1105,11 @@ PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type
 
 PhotoFileReader* photo_file_metadata_writer_create_reader (PhotoFileMetadataWriter* self) {
 	PhotoFileReader* result = NULL;
-	PhotoFileFormat _tmp0_ = 0;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	PhotoFileReader* _tmp3_ = NULL;
-	PhotoFileReader* _tmp4_ = NULL;
+	PhotoFileFormat _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	PhotoFileReader* _tmp3_;
+	PhotoFileReader* _tmp4_;
 #line 121 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_METADATA_WRITER (self), NULL);
 #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -1154,7 +1154,7 @@ static void photo_file_metadata_writer_class_init (PhotoFileMetadataWriterClass
 #line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	photo_file_metadata_writer_parent_class = g_type_class_peek_parent (klass);
 #line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) photo_file_metadata_writer_real_write_metadata;
+	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) photo_file_metadata_writer_real_write_metadata;
 #line 1159 "PhotoFileAdapter.c"
 }
 
diff --git a/src/photos/PhotoFileFormat.c b/src/photos/PhotoFileFormat.c
index 578b1b3..a6cb235 100644
--- a/src/photos/PhotoFileFormat.c
+++ b/src/photos/PhotoFileFormat.c
@@ -1,4 +1,4 @@
-/* PhotoFileFormat.c generated by valac 0.34.7, the Vala compiler
+/* PhotoFileFormat.c generated by valac 0.36.6, the Vala compiler
  * generated from PhotoFileFormat.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -263,27 +263,27 @@ GQuark photo_format_error_quark (void);
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataApplicableTest test, void* test_target, int* result_length1);
 PhotoFileFormat* photo_file_format_get_supported (int* result_length1);
-static void _vala_array_add43 (PhotoFileFormat** array, int* length, int* size, PhotoFileFormat value);
+static void _vala_array_add43 (PhotoFileFormat* * array, int* length, int* size, PhotoFileFormat value);
 PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1);
 static gboolean ___lambda4_ (PhotoFileFormat format);
 gboolean photo_file_format_can_write (PhotoFileFormat self);
 static gboolean ____lambda4__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
 static PhotoFileFormat* _vala_array_dup1 (PhotoFileFormat* self, int length);
 PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1);
-static gboolean ___lambda23_ (PhotoFileFormat format);
+static gboolean ___lambda24_ (PhotoFileFormat format);
 gboolean photo_file_format_can_write_image (PhotoFileFormat self);
-static gboolean ____lambda23__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
+static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
 static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length);
 PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_length1);
-static gboolean ___lambda24_ (PhotoFileFormat format);
+static gboolean ___lambda25_ (PhotoFileFormat format);
 gboolean photo_file_format_can_write_metadata (PhotoFileFormat self);
-static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
+static gboolean ____lambda25__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
 static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length);
 PhotoFileFormat* photo_file_format_get_writeable (int* result_length1);
 PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1);
 PhotoFileFormat* photo_file_format_get_metadata_writeable (int* result_length1);
 PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basename);
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
 gboolean is_string_empty (const gchar* s);
 gpointer photo_file_format_driver_ref (gpointer instance);
 void photo_file_format_driver_unref (gpointer instance);
@@ -373,7 +373,7 @@ gchar* photo_file_format_properties_get_default_mime_type (PhotoFileFormatProper
 gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_length1);
 gchar** photo_file_format_properties_get_mime_types (PhotoFileFormatProperties* self, int* result_length1);
 gchar** photo_file_format_get_editable_mime_types (int* result_length1);
-static void _vala_array_add44 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add44 (gchar** * array, int* length, int* size, gchar* value);
 enum  {
 	PHOTO_FILE_FORMAT_DRIVER_DUMMY_PROPERTY
 };
@@ -386,7 +386,7 @@ static PhotoFileWriter* photo_file_format_driver_real_create_writer (PhotoFileFo
 static PhotoFileMetadataWriter* photo_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* self, const gchar* filepath);
 static PhotoFileSniffer* photo_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* self, GFile* file, PhotoFileSnifferOptions options);
 PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type);
-static void photo_file_format_driver_finalize (PhotoFileFormatDriver* obj);
+static void photo_file_format_driver_finalize (PhotoFileFormatDriver * obj);
 GType photo_file_format_flags_get_type (void) G_GNUC_CONST;
 enum  {
 	PHOTO_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY
@@ -406,7 +406,7 @@ gchar* photo_file_format_properties_get_user_visible_name (PhotoFileFormatProper
 static gchar* photo_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* self);
 GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatProperties* self, GFile* file);
 PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type);
-static void photo_file_format_properties_finalize (PhotoFileFormatProperties* obj);
+static void photo_file_format_properties_finalize (PhotoFileFormatProperties * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -416,7 +416,7 @@ GQuark photo_format_error_quark (void) {
 }
 
 
-static void _vala_array_add43 (PhotoFileFormat** array, int* length, int* size, PhotoFileFormat value) {
+static void _vala_array_add43 (PhotoFileFormat* * array, int* length, int* size, PhotoFileFormat value) {
 #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if ((*length) == (*size)) {
 #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -434,13 +434,13 @@ static void _vala_array_add43 (PhotoFileFormat** array, int* length, int* size,
 PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataApplicableTest test, void* test_target, int* result_length1) {
 	PhotoFileFormat* result = NULL;
 	PhotoFileFormat* applicable = NULL;
-	PhotoFileFormat* _tmp0_ = NULL;
-	gint applicable_length1 = 0;
-	gint _applicable_size_ = 0;
-	gint _tmp1_ = 0;
-	PhotoFileFormat* _tmp2_ = NULL;
-	PhotoFileFormat* _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
+	PhotoFileFormat* _tmp0_;
+	gint applicable_length1;
+	gint _applicable_size_;
+	gint _tmp1_;
+	PhotoFileFormat* _tmp2_;
+	PhotoFileFormat* _tmp8_;
+	gint _tmp8__length1;
 #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = g_new0 (PhotoFileFormat, 0);
 #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -469,10 +469,10 @@ PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataAppl
 			format = format_collection[format_it];
 #line 471 "PhotoFileFormat.c"
 			{
-				PhotoFileFormatDataApplicableTest _tmp3_ = NULL;
-				void* _tmp3__target = NULL;
-				PhotoFileFormat _tmp4_ = 0;
-				gboolean _tmp5_ = FALSE;
+				PhotoFileFormatDataApplicableTest _tmp3_;
+				void* _tmp3__target;
+				PhotoFileFormat _tmp4_;
+				gboolean _tmp5_;
 #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 				_tmp3_ = test;
 #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -484,9 +484,9 @@ PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataAppl
 #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 				if (_tmp5_) {
 #line 487 "PhotoFileFormat.c"
-					PhotoFileFormat* _tmp6_ = NULL;
-					gint _tmp6__length1 = 0;
-					PhotoFileFormat _tmp7_ = 0;
+					PhotoFileFormat* _tmp6_;
+					gint _tmp6__length1;
+					PhotoFileFormat _tmp7_;
 #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 					_tmp6_ = applicable;
 #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -523,8 +523,8 @@ PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataAppl
 
 static gboolean ___lambda4_ (PhotoFileFormat format) {
 	gboolean result = FALSE;
-	PhotoFileFormat _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
+	PhotoFileFormat _tmp0_;
+	gboolean _tmp1_;
 #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = format;
 #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -555,14 +555,14 @@ static PhotoFileFormat* _vala_array_dup1 (PhotoFileFormat* self, int length) {
 
 PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) {
 	PhotoFileFormat* result = NULL;
-	PhotoFileFormat* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	PhotoFileFormat* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	PhotoFileFormat* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	PhotoFileFormat* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
+	PhotoFileFormat* _tmp0_;
+	gint _tmp0__length1;
+	PhotoFileFormat* _tmp3_;
+	gint _tmp3__length1;
+	PhotoFileFormat* _tmp4_;
+	gint _tmp4__length1;
+	PhotoFileFormat* _tmp5_;
+	gint _tmp5__length1;
 #line 33 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_data_writeable;
 #line 33 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -570,8 +570,8 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) {
 #line 33 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (_tmp0_ == NULL) {
 #line 573 "PhotoFileFormat.c"
-		gint _tmp1_ = 0;
-		PhotoFileFormat* _tmp2_ = NULL;
+		gint _tmp1_;
+		PhotoFileFormat* _tmp2_;
 #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		_tmp2_ = photo_file_format_data_find_applicable (____lambda4__photo_file_format_data_applicable_test, NULL, &_tmp1_);
 #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -610,10 +610,10 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) {
 }
 
 
-static gboolean ___lambda23_ (PhotoFileFormat format) {
+static gboolean ___lambda24_ (PhotoFileFormat format) {
 	gboolean result = FALSE;
-	PhotoFileFormat _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
+	PhotoFileFormat _tmp0_;
+	gboolean _tmp1_;
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = format;
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -626,9 +626,9 @@ static gboolean ___lambda23_ (PhotoFileFormat format) {
 }
 
 
-static gboolean ____lambda23__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) {
+static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) {
 	gboolean result;
-	result = ___lambda23_ (format);
+	result = ___lambda24_ (format);
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return result;
 #line 635 "PhotoFileFormat.c"
@@ -644,14 +644,14 @@ static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length) {
 
 PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1) {
 	PhotoFileFormat* result = NULL;
-	PhotoFileFormat* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	PhotoFileFormat* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	PhotoFileFormat* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	PhotoFileFormat* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
+	PhotoFileFormat* _tmp0_;
+	gint _tmp0__length1;
+	PhotoFileFormat* _tmp3_;
+	gint _tmp3__length1;
+	PhotoFileFormat* _tmp4_;
+	gint _tmp4__length1;
+	PhotoFileFormat* _tmp5_;
+	gint _tmp5__length1;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_data_image_writeable;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -659,10 +659,10 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (_tmp0_ == NULL) {
 #line 662 "PhotoFileFormat.c"
-		gint _tmp1_ = 0;
-		PhotoFileFormat* _tmp2_ = NULL;
+		gint _tmp1_;
+		PhotoFileFormat* _tmp2_;
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-		_tmp2_ = photo_file_format_data_find_applicable (____lambda23__photo_file_format_data_applicable_test, NULL, &_tmp1_);
+		_tmp2_ = photo_file_format_data_find_applicable (____lambda24__photo_file_format_data_applicable_test, NULL, &_tmp1_);
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		photo_file_format_data_image_writeable = (g_free (photo_file_format_data_image_writeable), NULL);
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -699,10 +699,10 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1
 }
 
 
-static gboolean ___lambda24_ (PhotoFileFormat format) {
+static gboolean ___lambda25_ (PhotoFileFormat format) {
 	gboolean result = FALSE;
-	PhotoFileFormat _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
+	PhotoFileFormat _tmp0_;
+	gboolean _tmp1_;
 #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = format;
 #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -715,9 +715,9 @@ static gboolean ___lambda24_ (PhotoFileFormat format) {
 }
 
 
-static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) {
+static gboolean ____lambda25__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) {
 	gboolean result;
-	result = ___lambda24_ (format);
+	result = ___lambda25_ (format);
 #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return result;
 #line 724 "PhotoFileFormat.c"
@@ -733,14 +733,14 @@ static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length) {
 
 PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_length1) {
 	PhotoFileFormat* result = NULL;
-	PhotoFileFormat* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	PhotoFileFormat* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	PhotoFileFormat* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	PhotoFileFormat* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
+	PhotoFileFormat* _tmp0_;
+	gint _tmp0__length1;
+	PhotoFileFormat* _tmp3_;
+	gint _tmp3__length1;
+	PhotoFileFormat* _tmp4_;
+	gint _tmp4__length1;
+	PhotoFileFormat* _tmp5_;
+	gint _tmp5__length1;
 #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_data_metadata_writeable;
 #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -748,10 +748,10 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng
 #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (_tmp0_ == NULL) {
 #line 751 "PhotoFileFormat.c"
-		gint _tmp1_ = 0;
-		PhotoFileFormat* _tmp2_ = NULL;
+		gint _tmp1_;
+		PhotoFileFormat* _tmp2_;
 #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-		_tmp2_ = photo_file_format_data_find_applicable (____lambda24__photo_file_format_data_applicable_test, NULL, &_tmp1_);
+		_tmp2_ = photo_file_format_data_find_applicable (____lambda25__photo_file_format_data_applicable_test, NULL, &_tmp1_);
 #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		photo_file_format_data_metadata_writeable = (g_free (photo_file_format_data_metadata_writeable), NULL);
 #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -790,9 +790,9 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng
 
 PhotoFileFormat* photo_file_format_get_supported (int* result_length1) {
 	PhotoFileFormat* result = NULL;
-	PhotoFileFormat* _tmp0_ = NULL;
-	PhotoFileFormat* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	PhotoFileFormat* _tmp0_;
+	PhotoFileFormat* _tmp1_;
+	gint _tmp1__length1;
 #line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = g_new0 (PhotoFileFormat, 5);
 #line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -825,10 +825,10 @@ PhotoFileFormat* photo_file_format_get_supported (int* result_length1) {
 
 PhotoFileFormat* photo_file_format_get_writeable (int* result_length1) {
 	PhotoFileFormat* result = NULL;
-	gint _tmp0_ = 0;
-	PhotoFileFormat* _tmp1_ = NULL;
-	PhotoFileFormat* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gint _tmp0_;
+	PhotoFileFormat* _tmp1_;
+	PhotoFileFormat* _tmp2_;
+	gint _tmp2__length1;
 #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp1_ = photo_file_format_data_get_writeable (&_tmp0_);
 #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -851,10 +851,10 @@ PhotoFileFormat* photo_file_format_get_writeable (int* result_length1) {
 
 PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1) {
 	PhotoFileFormat* result = NULL;
-	gint _tmp0_ = 0;
-	PhotoFileFormat* _tmp1_ = NULL;
-	PhotoFileFormat* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gint _tmp0_;
+	PhotoFileFormat* _tmp1_;
+	PhotoFileFormat* _tmp2_;
+	gint _tmp2__length1;
 #line 73 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp1_ = photo_file_format_data_get_image_writeable (&_tmp0_);
 #line 73 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -877,10 +877,10 @@ PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1) {
 
 PhotoFileFormat* photo_file_format_get_metadata_writeable (int* result_length1) {
 	PhotoFileFormat* result = NULL;
-	gint _tmp0_ = 0;
-	PhotoFileFormat* _tmp1_ = NULL;
-	PhotoFileFormat* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gint _tmp0_;
+	PhotoFileFormat* _tmp1_;
+	PhotoFileFormat* _tmp2_;
+	gint _tmp2__length1;
 #line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp1_ = photo_file_format_data_get_metadata_writeable (&_tmp0_);
 #line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -905,13 +905,13 @@ PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basena
 	PhotoFileFormat result = 0;
 	gchar* name = NULL;
 	gchar* ext = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gint _tmp5_ = 0;
-	PhotoFileFormat* _tmp6_ = NULL;
+	const gchar* _tmp3_;
+	gboolean _tmp4_;
+	gint _tmp5_;
+	PhotoFileFormat* _tmp6_;
 #line 80 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (basename != NULL, 0);
 #line 82 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -962,14 +962,14 @@ PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basena
 			file_format = file_format_collection[file_format_it];
 #line 964 "PhotoFileFormat.c"
 			{
-				PhotoFileFormat _tmp7_ = 0;
-				PhotoFileFormatDriver* _tmp8_ = NULL;
-				PhotoFileFormatDriver* _tmp9_ = NULL;
-				PhotoFileFormatProperties* _tmp10_ = NULL;
-				PhotoFileFormatProperties* _tmp11_ = NULL;
-				const gchar* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
-				gboolean _tmp14_ = FALSE;
+				PhotoFileFormat _tmp7_;
+				PhotoFileFormatDriver* _tmp8_;
+				PhotoFileFormatDriver* _tmp9_;
+				PhotoFileFormatProperties* _tmp10_;
+				PhotoFileFormatProperties* _tmp11_;
+				const gchar* _tmp12_;
+				gboolean _tmp13_;
+				gboolean _tmp14_;
 #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 				_tmp7_ = file_format;
 #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1024,11 +1024,11 @@ PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basena
 
 gboolean photo_file_format_is_file_supported (GFile* file) {
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 #line 95 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1055,13 +1055,13 @@ gboolean photo_file_format_is_basename_supported (const gchar* basename) {
 	gboolean result = FALSE;
 	gchar* name = NULL;
 	gchar* ext = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gint _tmp5_ = 0;
-	PhotoFileFormat* _tmp6_ = NULL;
+	const gchar* _tmp3_;
+	gboolean _tmp4_;
+	gint _tmp5_;
+	PhotoFileFormat* _tmp6_;
 #line 99 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (basename != NULL, FALSE);
 #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1112,14 +1112,14 @@ gboolean photo_file_format_is_basename_supported (const gchar* basename) {
 			format = format_collection[format_it];
 #line 1114 "PhotoFileFormat.c"
 			{
-				PhotoFileFormat _tmp7_ = 0;
-				PhotoFileFormatDriver* _tmp8_ = NULL;
-				PhotoFileFormatDriver* _tmp9_ = NULL;
-				PhotoFileFormatProperties* _tmp10_ = NULL;
-				PhotoFileFormatProperties* _tmp11_ = NULL;
-				const gchar* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
-				gboolean _tmp14_ = FALSE;
+				PhotoFileFormat _tmp7_;
+				PhotoFileFormatDriver* _tmp8_;
+				PhotoFileFormatDriver* _tmp9_;
+				PhotoFileFormatProperties* _tmp10_;
+				PhotoFileFormatProperties* _tmp11_;
+				const gchar* _tmp12_;
+				gboolean _tmp13_;
+				gboolean _tmp14_;
 #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 				_tmp7_ = format;
 #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1184,11 +1184,11 @@ PhotoFileFormat photo_file_format_get_system_default_format (void) {
 
 PhotoFileFormat photo_file_format_get_by_file_extension (GFile* file) {
 	PhotoFileFormat result = 0;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	PhotoFileFormat _tmp3_ = 0;
-	PhotoFileFormat _tmp4_ = 0;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	PhotoFileFormat _tmp3_;
+	PhotoFileFormat _tmp4_;
 #line 119 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (G_IS_FILE (file), 0);
 #line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1282,7 +1282,7 @@ gint photo_file_format_serialize (PhotoFileFormat self) {
 
 PhotoFileFormat photo_file_format_unserialize (gint value) {
 	PhotoFileFormat result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = value;
 #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1351,8 +1351,8 @@ PhotoFileFormat photo_file_format_unserialize (gint value) {
 
 PhotoFileFormat photo_file_format_from_gphoto_type (const gchar* type) {
 	PhotoFileFormat result = 0;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GQuark _tmp3_ = 0U;
 #line 170 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (type != NULL, 0);
@@ -1447,8 +1447,8 @@ PhotoFileFormat photo_file_format_from_gphoto_type (const gchar* type) {
 
 PhotoFileFormat photo_file_format_from_pixbuf_name (const gchar* name) {
 	PhotoFileFormat result = 0;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GQuark _tmp3_ = 0U;
 #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	static GQuark _tmp2_label0 = 0;
@@ -1610,7 +1610,7 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self
 		case PHOTO_FILE_FORMAT_JFIF:
 #line 1612 "PhotoFileFormat.c"
 		{
-			JfifFileFormatDriver* _tmp0_ = NULL;
+			JfifFileFormatDriver* _tmp0_;
 #line 244 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 			_tmp0_ = jfif_file_format_driver_get_instance ();
 #line 244 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1623,7 +1623,7 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self
 		case PHOTO_FILE_FORMAT_RAW:
 #line 1625 "PhotoFileFormat.c"
 		{
-			RawFileFormatDriver* _tmp1_ = NULL;
+			RawFileFormatDriver* _tmp1_;
 #line 247 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 			_tmp1_ = raw_file_format_driver_get_instance ();
 #line 247 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1636,7 +1636,7 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self
 		case PHOTO_FILE_FORMAT_PNG:
 #line 1638 "PhotoFileFormat.c"
 		{
-			PngFileFormatDriver* _tmp2_ = NULL;
+			PngFileFormatDriver* _tmp2_;
 #line 250 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 			_tmp2_ = png_file_format_driver_get_instance ();
 #line 250 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1649,7 +1649,7 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self
 		case PHOTO_FILE_FORMAT_TIFF:
 #line 1651 "PhotoFileFormat.c"
 		{
-			PhotosTiffFileFormatDriver* _tmp3_ = NULL;
+			PhotosTiffFileFormatDriver* _tmp3_;
 #line 253 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 			_tmp3_ = photos_tiff_file_format_driver_get_instance ();
 #line 253 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1662,7 +1662,7 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self
 		case PHOTO_FILE_FORMAT_BMP:
 #line 1664 "PhotoFileFormat.c"
 		{
-			PhotosBmpFileFormatDriver* _tmp4_ = NULL;
+			PhotosBmpFileFormatDriver* _tmp4_;
 #line 256 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 			_tmp4_ = photos_bmp_file_format_driver_get_instance ();
 #line 256 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1686,10 +1686,10 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self
 
 PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat self) {
 	PhotoFileFormatProperties* result = NULL;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	PhotoFileFormatProperties* _tmp2_ = NULL;
-	PhotoFileFormatProperties* _tmp3_ = NULL;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	PhotoFileFormatProperties* _tmp2_;
+	PhotoFileFormatProperties* _tmp3_;
 #line 264 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_get_driver (self);
 #line 264 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1710,13 +1710,13 @@ PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat sel
 
 gchar* photo_file_format_get_default_basename (PhotoFileFormat self, const gchar* name) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	PhotoFileFormatProperties* _tmp1_ = NULL;
-	PhotoFileFormatProperties* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	const gchar* _tmp0_;
+	PhotoFileFormatProperties* _tmp1_;
+	PhotoFileFormatProperties* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 268 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1747,11 +1747,11 @@ gchar* photo_file_format_get_default_basename (PhotoFileFormat self, const gchar
 
 PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gchar* filepath) {
 	PhotoFileReader* result = NULL;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PhotoFileReader* _tmp3_ = NULL;
-	PhotoFileReader* _tmp4_ = NULL;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	const gchar* _tmp2_;
+	PhotoFileReader* _tmp3_;
+	PhotoFileReader* _tmp4_;
 #line 272 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1777,13 +1777,13 @@ PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gc
 gboolean photo_file_format_can_write (PhotoFileFormat self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp1_ = photo_file_format_can_write_image (self);
 #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (_tmp1_) {
 #line 1786 "PhotoFileFormat.c"
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		_tmp2_ = photo_file_format_can_write_metadata (self);
 #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1804,10 +1804,10 @@ gboolean photo_file_format_can_write (PhotoFileFormat self) {
 
 gboolean photo_file_format_can_write_image (PhotoFileFormat self) {
 	gboolean result = FALSE;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_get_driver (self);
 #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1828,10 +1828,10 @@ gboolean photo_file_format_can_write_image (PhotoFileFormat self) {
 
 gboolean photo_file_format_can_write_metadata (PhotoFileFormat self) {
 	gboolean result = FALSE;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_get_driver (self);
 #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1853,12 +1853,12 @@ gboolean photo_file_format_can_write_metadata (PhotoFileFormat self) {
 PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gchar* filepath, GError** error) {
 	PhotoFileWriter* result = NULL;
 	PhotoFileWriter* writer = NULL;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PhotoFileWriter* _tmp3_ = NULL;
-	PhotoFileWriter* _tmp4_ = NULL;
-	PhotoFileWriter* _tmp5_ = NULL;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	const gchar* _tmp2_;
+	PhotoFileWriter* _tmp3_;
+	PhotoFileWriter* _tmp4_;
+	PhotoFileWriter* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 289 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
@@ -1882,7 +1882,7 @@ PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gc
 	if (_tmp5_ == NULL) {
 #line 1884 "PhotoFileFormat.c"
 		GEnumValue* _tmp6_;
-		GError* _tmp7_ = NULL;
+		GError* _tmp7_;
 #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		_tmp6_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self);
 #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1921,12 +1921,12 @@ PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gc
 PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, const gchar* filepath, GError** error) {
 	PhotoFileMetadataWriter* result = NULL;
 	PhotoFileMetadataWriter* writer = NULL;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PhotoFileMetadataWriter* _tmp3_ = NULL;
-	PhotoFileMetadataWriter* _tmp4_ = NULL;
-	PhotoFileMetadataWriter* _tmp5_ = NULL;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	const gchar* _tmp2_;
+	PhotoFileMetadataWriter* _tmp3_;
+	PhotoFileMetadataWriter* _tmp4_;
+	PhotoFileMetadataWriter* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 297 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
@@ -1950,7 +1950,7 @@ PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileForm
 	if (_tmp5_ == NULL) {
 #line 1952 "PhotoFileFormat.c"
 		GEnumValue* _tmp6_;
-		GError* _tmp7_ = NULL;
+		GError* _tmp7_;
 #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		_tmp6_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self);
 #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1988,12 +1988,12 @@ PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileForm
 
 PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, GFile* file, PhotoFileSnifferOptions options) {
 	PhotoFileSniffer* result = NULL;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	PhotoFileSnifferOptions _tmp3_ = 0;
-	PhotoFileSniffer* _tmp4_ = NULL;
-	PhotoFileSniffer* _tmp5_ = NULL;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	GFile* _tmp2_;
+	PhotoFileSnifferOptions _tmp3_;
+	PhotoFileSniffer* _tmp4_;
+	PhotoFileSniffer* _tmp5_;
 #line 305 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2020,10 +2020,10 @@ PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, GFile*
 
 PhotoMetadata* photo_file_format_create_metadata (PhotoFileFormat self) {
 	PhotoMetadata* result = NULL;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	PhotoMetadata* _tmp2_ = NULL;
-	PhotoMetadata* _tmp3_ = NULL;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	PhotoMetadata* _tmp2_;
+	PhotoMetadata* _tmp3_;
 #line 310 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_get_driver (self);
 #line 310 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2044,12 +2044,12 @@ PhotoMetadata* photo_file_format_create_metadata (PhotoFileFormat self) {
 
 gchar* photo_file_format_get_default_mime_type (PhotoFileFormat self) {
 	gchar* result = NULL;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	PhotoFileFormatProperties* _tmp2_ = NULL;
-	PhotoFileFormatProperties* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	PhotoFileFormatProperties* _tmp2_;
+	PhotoFileFormatProperties* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 314 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_get_driver (self);
 #line 314 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2076,16 +2076,16 @@ gchar* photo_file_format_get_default_mime_type (PhotoFileFormat self) {
 
 gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_length1) {
 	gchar** result = NULL;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	PhotoFileFormatProperties* _tmp2_ = NULL;
-	PhotoFileFormatProperties* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gchar** _tmp5_ = NULL;
-	gchar** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	PhotoFileFormatProperties* _tmp2_;
+	PhotoFileFormatProperties* _tmp3_;
+	gint _tmp4_;
+	gchar** _tmp5_;
+	gchar** _tmp6_;
+	gint _tmp6__length1;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
 #line 318 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_get_driver (self);
 #line 318 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2122,7 +2122,7 @@ gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_leng
 }
 
 
-static void _vala_array_add44 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add44 (gchar** * array, int* length, int* size, gchar* value) {
 #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if ((*length) == (*size)) {
 #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2142,13 +2142,13 @@ static void _vala_array_add44 (gchar*** array, int* length, int* size, gchar* va
 gchar** photo_file_format_get_editable_mime_types (int* result_length1) {
 	gchar** result = NULL;
 	gchar** mime_types = NULL;
-	gchar** _tmp0_ = NULL;
-	gint mime_types_length1 = 0;
-	gint _mime_types_size_ = 0;
-	gint _tmp1_ = 0;
-	PhotoFileFormat* _tmp2_ = NULL;
-	gchar** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	gchar** _tmp0_;
+	gint mime_types_length1;
+	gint _mime_types_size_;
+	gint _tmp1_;
+	PhotoFileFormat* _tmp2_;
+	gchar** _tmp10_;
+	gint _tmp10__length1;
 #line 322 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = g_new0 (gchar*, 0 + 1);
 #line 322 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2177,9 +2177,9 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) {
 			file_format = file_format_collection[file_format_it];
 #line 2179 "PhotoFileFormat.c"
 			{
-				PhotoFileFormat _tmp3_ = 0;
-				gint _tmp4_ = 0;
-				gchar** _tmp5_ = NULL;
+				PhotoFileFormat _tmp3_;
+				gint _tmp4_;
+				gchar** _tmp5_;
 #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 				_tmp3_ = file_format;
 #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2197,7 +2197,7 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) {
 #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 					for (mime_type_it = 0; mime_type_it < _tmp4_; mime_type_it = mime_type_it + 1) {
 #line 2200 "PhotoFileFormat.c"
-						gchar* _tmp6_ = NULL;
+						gchar* _tmp6_;
 						gchar* mime_type = NULL;
 #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 						_tmp6_ = g_strdup (mime_type_collection[mime_type_it]);
@@ -2205,10 +2205,10 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) {
 						mime_type = _tmp6_;
 #line 2207 "PhotoFileFormat.c"
 						{
-							gchar** _tmp7_ = NULL;
-							gint _tmp7__length1 = 0;
-							const gchar* _tmp8_ = NULL;
-							gchar* _tmp9_ = NULL;
+							gchar** _tmp7_;
+							gint _tmp7__length1;
+							const gchar* _tmp8_;
+							gchar* _tmp9_;
 #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 							_tmp7_ = mime_types;
 #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2462,7 +2462,7 @@ static gchar* value_photo_file_format_driver_collect_value (GValue* value, guint
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (collect_values[0].v_pointer) {
 #line 2465 "PhotoFileFormat.c"
-		PhotoFileFormatDriver* object;
+		PhotoFileFormatDriver * object;
 		object = collect_values[0].v_pointer;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -2489,7 +2489,7 @@ static gchar* value_photo_file_format_driver_collect_value (GValue* value, guint
 
 
 static gchar* value_photo_file_format_driver_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PhotoFileFormatDriver** object_p;
+	PhotoFileFormatDriver ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (!object_p) {
@@ -2541,7 +2541,7 @@ gpointer value_get_photo_file_format_driver (const GValue* value) {
 
 
 void value_set_photo_file_format_driver (GValue* value, gpointer v_object) {
-	PhotoFileFormatDriver* old;
+	PhotoFileFormatDriver * old;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_DRIVER));
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2572,7 +2572,7 @@ void value_set_photo_file_format_driver (GValue* value, gpointer v_object) {
 
 
 void value_take_photo_file_format_driver (GValue* value, gpointer v_object) {
-	PhotoFileFormatDriver* old;
+	PhotoFileFormatDriver * old;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_DRIVER));
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2606,21 +2606,21 @@ static void photo_file_format_driver_class_init (PhotoFileFormatDriverClass * kl
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	((PhotoFileFormatDriverClass *) klass)->finalize = photo_file_format_driver_finalize;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_get_properties;
+	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*) (PhotoFileFormatDriver *)) photo_file_format_driver_real_get_properties;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) photo_file_format_driver_real_create_reader;
+	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*) (PhotoFileFormatDriver *, const gchar*)) photo_file_format_driver_real_create_reader;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_create_metadata;
+	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) photo_file_format_driver_real_create_metadata;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_can_write_image;
+	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*) (PhotoFileFormatDriver *)) photo_file_format_driver_real_can_write_image;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_can_write_metadata;
+	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*) (PhotoFileFormatDriver *)) photo_file_format_driver_real_can_write_metadata;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photo_file_format_driver_real_create_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photo_file_format_driver_real_create_writer;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photo_file_format_driver_real_create_metadata_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photo_file_format_driver_real_create_metadata_writer;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) photo_file_format_driver_real_create_sniffer;
+	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) photo_file_format_driver_real_create_sniffer;
 #line 2625 "PhotoFileFormat.c"
 }
 
@@ -2632,7 +2632,7 @@ static void photo_file_format_driver_instance_init (PhotoFileFormatDriver * self
 }
 
 
-static void photo_file_format_driver_finalize (PhotoFileFormatDriver* obj) {
+static void photo_file_format_driver_finalize (PhotoFileFormatDriver * obj) {
 	PhotoFileFormatDriver * self;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver);
@@ -2657,7 +2657,7 @@ GType photo_file_format_driver_get_type (void) {
 
 
 gpointer photo_file_format_driver_ref (gpointer instance) {
-	PhotoFileFormatDriver* self;
+	PhotoFileFormatDriver * self;
 	self = instance;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -2668,7 +2668,7 @@ gpointer photo_file_format_driver_ref (gpointer instance) {
 
 
 void photo_file_format_driver_unref (gpointer instance) {
-	PhotoFileFormatDriver* self;
+	PhotoFileFormatDriver * self;
 	self = instance;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2731,13 +2731,13 @@ PhotoFileFormatFlags photo_file_format_properties_get_flags (PhotoFileFormatProp
 
 static gboolean photo_file_format_properties_real_is_recognized_extension (PhotoFileFormatProperties* self, const gchar* ext) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	const gchar* _tmp0_;
+	gint _tmp1_;
+	gchar** _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
 #line 380 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (ext != NULL, FALSE);
 #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2872,23 +2872,23 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope
 	GFile* result = NULL;
 	gchar* name = NULL;
 	gchar* ext = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-	const gchar* _tmp6_ = NULL;
-	GFile* _tmp11_ = NULL;
-	GFile* _tmp12_ = NULL;
-	GFile* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	GFile* _tmp19_ = NULL;
-	GFile* _tmp20_ = NULL;
+	const gchar* _tmp6_;
+	GFile* _tmp11_;
+	GFile* _tmp12_;
+	GFile* _tmp13_;
+	const gchar* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	GFile* _tmp19_;
+	GFile* _tmp20_;
 #line 401 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL);
 #line 401 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2916,8 +2916,8 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope
 #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (_tmp6_ != NULL) {
 #line 2919 "PhotoFileFormat.c"
-		const gchar* _tmp7_ = NULL;
-		gboolean _tmp8_ = FALSE;
+		const gchar* _tmp7_;
+		gboolean _tmp8_;
 #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		_tmp7_ = ext;
 #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2933,8 +2933,8 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope
 #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (_tmp5_) {
 #line 2936 "PhotoFileFormat.c"
-		GFile* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
+		GFile* _tmp9_;
+		GFile* _tmp10_;
 #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		_tmp9_ = file;
 #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -3039,7 +3039,7 @@ static gchar* value_photo_file_format_properties_collect_value (GValue* value, g
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (collect_values[0].v_pointer) {
 #line 3042 "PhotoFileFormat.c"
-		PhotoFileFormatProperties* object;
+		PhotoFileFormatProperties * object;
 		object = collect_values[0].v_pointer;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -3066,7 +3066,7 @@ static gchar* value_photo_file_format_properties_collect_value (GValue* value, g
 
 
 static gchar* value_photo_file_format_properties_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PhotoFileFormatProperties** object_p;
+	PhotoFileFormatProperties ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (!object_p) {
@@ -3118,7 +3118,7 @@ gpointer value_get_photo_file_format_properties (const GValue* value) {
 
 
 void value_set_photo_file_format_properties (GValue* value, gpointer v_object) {
-	PhotoFileFormatProperties* old;
+	PhotoFileFormatProperties * old;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_PROPERTIES));
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -3149,7 +3149,7 @@ void value_set_photo_file_format_properties (GValue* value, gpointer v_object) {
 
 
 void value_take_photo_file_format_properties (GValue* value, gpointer v_object) {
-	PhotoFileFormatProperties* old;
+	PhotoFileFormatProperties * old;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_PROPERTIES));
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -3183,21 +3183,21 @@ static void photo_file_format_properties_class_init (PhotoFileFormatPropertiesCl
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	((PhotoFileFormatPropertiesClass *) klass)->finalize = photo_file_format_properties_finalize;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_file_format;
+	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*) (PhotoFileFormatProperties *)) photo_file_format_properties_real_get_file_format;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_flags;
+	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*) (PhotoFileFormatProperties *)) photo_file_format_properties_real_get_flags;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->is_recognized_extension = (gboolean (*)(PhotoFileFormatProperties*, const gchar*)) photo_file_format_properties_real_is_recognized_extension;
+	((PhotoFileFormatPropertiesClass *) klass)->is_recognized_extension = (gboolean (*) (PhotoFileFormatProperties *, const gchar*)) photo_file_format_properties_real_is_recognized_extension;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_default_extension;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*) (PhotoFileFormatProperties *)) photo_file_format_properties_real_get_default_extension;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) photo_file_format_properties_real_get_known_extensions;
+	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*) (PhotoFileFormatProperties *, int*)) photo_file_format_properties_real_get_known_extensions;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_default_mime_type;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*) (PhotoFileFormatProperties *)) photo_file_format_properties_real_get_default_mime_type;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) photo_file_format_properties_real_get_mime_types;
+	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*) (PhotoFileFormatProperties *, int*)) photo_file_format_properties_real_get_mime_types;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_user_visible_name;
+	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*) (PhotoFileFormatProperties *)) photo_file_format_properties_real_get_user_visible_name;
 #line 3202 "PhotoFileFormat.c"
 }
 
@@ -3209,7 +3209,7 @@ static void photo_file_format_properties_instance_init (PhotoFileFormatPropertie
 }
 
 
-static void photo_file_format_properties_finalize (PhotoFileFormatProperties* obj) {
+static void photo_file_format_properties_finalize (PhotoFileFormatProperties * obj) {
 	PhotoFileFormatProperties * self;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties);
@@ -3234,7 +3234,7 @@ GType photo_file_format_properties_get_type (void) {
 
 
 gpointer photo_file_format_properties_ref (gpointer instance) {
-	PhotoFileFormatProperties* self;
+	PhotoFileFormatProperties * self;
 	self = instance;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -3245,7 +3245,7 @@ gpointer photo_file_format_properties_ref (gpointer instance) {
 
 
 void photo_file_format_properties_unref (gpointer instance) {
-	PhotoFileFormatProperties* self;
+	PhotoFileFormatProperties * self;
 	self = instance;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
diff --git a/src/photos/PhotoFileSniffer.c b/src/photos/PhotoFileSniffer.c
index 86295b3..e632525 100644
--- a/src/photos/PhotoFileSniffer.c
+++ b/src/photos/PhotoFileSniffer.c
@@ -1,4 +1,4 @@
-/* PhotoFileSniffer.c generated by valac 0.34.7, the Vala compiler
+/* PhotoFileSniffer.c generated by valac 0.36.6, the Vala compiler
  * generated from PhotoFileSniffer.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -203,7 +203,7 @@ enum  {
 void dimensions_init (Dimensions *self, gint width, gint height);
 DetectedPhotoInformation* detected_photo_information_new (void);
 DetectedPhotoInformation* detected_photo_information_construct (GType object_type);
-static void detected_photo_information_finalize (DetectedPhotoInformation* obj);
+static void detected_photo_information_finalize (DetectedPhotoInformation * obj);
 gpointer photo_file_sniffer_ref (gpointer instance);
 void photo_file_sniffer_unref (gpointer instance);
 GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -218,7 +218,7 @@ enum  {
 PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options);
 DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error);
 static DetectedPhotoInformation* photo_file_sniffer_real_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error);
-static void photo_file_sniffer_finalize (PhotoFileSniffer* obj);
+static void photo_file_sniffer_finalize (PhotoFileSniffer * obj);
 gpointer photo_file_interrogator_ref (gpointer instance);
 void photo_file_interrogator_unref (gpointer instance);
 GParamSpec* param_spec_photo_file_interrogator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -237,7 +237,7 @@ gboolean photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator*
 void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** error);
 PhotoFileFormat* photo_file_format_get_supported (int* result_length1);
 PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, GFile* file, PhotoFileSnifferOptions options);
-static void photo_file_interrogator_finalize (PhotoFileInterrogator* obj);
+static void photo_file_interrogator_finalize (PhotoFileInterrogator * obj);
 
 
 DetectedPhotoInformation* detected_photo_information_construct (GType object_type) {
@@ -299,7 +299,7 @@ static gchar* value_detected_photo_information_collect_value (GValue* value, gui
 #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	if (collect_values[0].v_pointer) {
 #line 302 "PhotoFileSniffer.c"
-		DetectedPhotoInformation* object;
+		DetectedPhotoInformation * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -326,7 +326,7 @@ static gchar* value_detected_photo_information_collect_value (GValue* value, gui
 
 
 static gchar* value_detected_photo_information_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	DetectedPhotoInformation** object_p;
+	DetectedPhotoInformation ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	if (!object_p) {
@@ -378,7 +378,7 @@ gpointer value_get_detected_photo_information (const GValue* value) {
 
 
 void value_set_detected_photo_information (GValue* value, gpointer v_object) {
-	DetectedPhotoInformation* old;
+	DetectedPhotoInformation * old;
 #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DETECTED_PHOTO_INFORMATION));
 #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
@@ -409,7 +409,7 @@ void value_set_detected_photo_information (GValue* value, gpointer v_object) {
 
 
 void value_take_detected_photo_information (GValue* value, gpointer v_object) {
-	DetectedPhotoInformation* old;
+	DetectedPhotoInformation * old;
 #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DETECTED_PHOTO_INFORMATION));
 #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
@@ -473,7 +473,7 @@ static void detected_photo_information_instance_init (DetectedPhotoInformation *
 }
 
 
-static void detected_photo_information_finalize (DetectedPhotoInformation* obj) {
+static void detected_photo_information_finalize (DetectedPhotoInformation * obj) {
 	DetectedPhotoInformation * self;
 #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DETECTED_PHOTO_INFORMATION, DetectedPhotoInformation);
@@ -508,7 +508,7 @@ GType detected_photo_information_get_type (void) {
 
 
 gpointer detected_photo_information_ref (gpointer instance) {
-	DetectedPhotoInformation* self;
+	DetectedPhotoInformation * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -519,7 +519,7 @@ gpointer detected_photo_information_ref (gpointer instance) {
 
 
 void detected_photo_information_unref (gpointer instance) {
-	DetectedPhotoInformation* self;
+	DetectedPhotoInformation * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -553,10 +553,10 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) {
 	PhotoFileSniffer* self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	PhotoFileSnifferOptions _tmp2_ = 0;
-	PhotoFileSnifferOptions _tmp3_ = 0;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	PhotoFileSnifferOptions _tmp2_;
+	PhotoFileSnifferOptions _tmp3_;
 #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
@@ -643,7 +643,7 @@ static gchar* value_photo_file_sniffer_collect_value (GValue* value, guint n_col
 #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	if (collect_values[0].v_pointer) {
 #line 646 "PhotoFileSniffer.c"
-		PhotoFileSniffer* object;
+		PhotoFileSniffer * object;
 		object = collect_values[0].v_pointer;
 #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -670,7 +670,7 @@ static gchar* value_photo_file_sniffer_collect_value (GValue* value, guint n_col
 
 
 static gchar* value_photo_file_sniffer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PhotoFileSniffer** object_p;
+	PhotoFileSniffer ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	if (!object_p) {
@@ -722,7 +722,7 @@ gpointer value_get_photo_file_sniffer (const GValue* value) {
 
 
 void value_set_photo_file_sniffer (GValue* value, gpointer v_object) {
-	PhotoFileSniffer* old;
+	PhotoFileSniffer * old;
 #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_SNIFFER));
 #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
@@ -753,7 +753,7 @@ void value_set_photo_file_sniffer (GValue* value, gpointer v_object) {
 
 
 void value_take_photo_file_sniffer (GValue* value, gpointer v_object) {
-	PhotoFileSniffer* old;
+	PhotoFileSniffer * old;
 #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_SNIFFER));
 #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
@@ -787,7 +787,7 @@ static void photo_file_sniffer_class_init (PhotoFileSnifferClass * klass) {
 #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	((PhotoFileSnifferClass *) klass)->finalize = photo_file_sniffer_finalize;
 #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
-	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) photo_file_sniffer_real_sniff;
+	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) photo_file_sniffer_real_sniff;
 #line 792 "PhotoFileSniffer.c"
 }
 
@@ -799,7 +799,7 @@ static void photo_file_sniffer_instance_init (PhotoFileSniffer * self) {
 }
 
 
-static void photo_file_sniffer_finalize (PhotoFileSniffer* obj) {
+static void photo_file_sniffer_finalize (PhotoFileSniffer * obj) {
 	PhotoFileSniffer * self;
 #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer);
@@ -826,7 +826,7 @@ GType photo_file_sniffer_get_type (void) {
 
 
 gpointer photo_file_sniffer_ref (gpointer instance) {
-	PhotoFileSniffer* self;
+	PhotoFileSniffer * self;
 	self = instance;
 #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -837,7 +837,7 @@ gpointer photo_file_sniffer_ref (gpointer instance) {
 
 
 void photo_file_sniffer_unref (gpointer instance) {
-	PhotoFileSniffer* self;
+	PhotoFileSniffer * self;
 	self = instance;
 #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -852,9 +852,9 @@ void photo_file_sniffer_unref (gpointer instance) {
 
 PhotoFileInterrogator* photo_file_interrogator_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) {
 	PhotoFileInterrogator* self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	PhotoFileSnifferOptions _tmp2_ = 0;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	PhotoFileSnifferOptions _tmp2_;
 #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
@@ -893,8 +893,8 @@ static gpointer _detected_photo_information_ref0 (gpointer self) {
 
 DetectedPhotoInformation* photo_file_interrogator_get_detected_photo_information (PhotoFileInterrogator* self) {
 	DetectedPhotoInformation* result = NULL;
-	DetectedPhotoInformation* _tmp0_ = NULL;
-	DetectedPhotoInformation* _tmp1_ = NULL;
+	DetectedPhotoInformation* _tmp0_;
+	DetectedPhotoInformation* _tmp1_;
 #line 75 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_INTERROGATOR (self), NULL);
 #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
@@ -911,7 +911,7 @@ DetectedPhotoInformation* photo_file_interrogator_get_detected_photo_information
 
 gboolean photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 80 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_INTERROGATOR (self), FALSE);
 #line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
@@ -925,8 +925,8 @@ gboolean photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator*
 
 
 void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** error) {
-	gint _tmp0_ = 0;
-	PhotoFileFormat* _tmp1_ = NULL;
+	gint _tmp0_;
+	PhotoFileFormat* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	g_return_if_fail (IS_PHOTO_FILE_INTERROGATOR (self));
@@ -951,18 +951,18 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError**
 #line 952 "PhotoFileSniffer.c"
 			{
 				PhotoFileSniffer* sniffer = NULL;
-				PhotoFileFormat _tmp2_ = 0;
-				GFile* _tmp3_ = NULL;
-				PhotoFileSnifferOptions _tmp4_ = 0;
-				PhotoFileSniffer* _tmp5_ = NULL;
+				PhotoFileFormat _tmp2_;
+				GFile* _tmp3_;
+				PhotoFileSnifferOptions _tmp4_;
+				PhotoFileSniffer* _tmp5_;
 				gboolean is_corrupted = FALSE;
 				DetectedPhotoInformation* _tmp6_ = NULL;
-				PhotoFileSniffer* _tmp7_ = NULL;
+				PhotoFileSniffer* _tmp7_;
 				gboolean _tmp8_ = FALSE;
-				DetectedPhotoInformation* _tmp9_ = NULL;
-				DetectedPhotoInformation* _tmp10_ = NULL;
+				DetectedPhotoInformation* _tmp9_;
+				DetectedPhotoInformation* _tmp10_;
 				gboolean _tmp11_ = FALSE;
-				DetectedPhotoInformation* _tmp12_ = NULL;
+				DetectedPhotoInformation* _tmp12_;
 #line 86 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 				_tmp2_ = file_format;
 #line 86 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
@@ -1006,7 +1006,7 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError**
 #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 				if (_tmp12_ != NULL) {
 #line 1009 "PhotoFileSniffer.c"
-					gboolean _tmp13_ = FALSE;
+					gboolean _tmp13_;
 #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 					_tmp13_ = is_corrupted;
 #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
@@ -1020,9 +1020,9 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError**
 #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 				if (_tmp11_) {
 #line 1023 "PhotoFileSniffer.c"
-					DetectedPhotoInformation* _tmp14_ = NULL;
-					PhotoFileFormat _tmp15_ = 0;
-					PhotoFileFormat _tmp16_ = 0;
+					DetectedPhotoInformation* _tmp14_;
+					PhotoFileFormat _tmp15_;
+					PhotoFileFormat _tmp16_;
 #line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 					_tmp14_ = self->priv->detected;
 #line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
@@ -1039,15 +1039,15 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError**
 					break;
 #line 1041 "PhotoFileSniffer.c"
 				} else {
-					gboolean _tmp17_ = FALSE;
+					gboolean _tmp17_;
 #line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 					_tmp17_ = is_corrupted;
 #line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 					if (_tmp17_) {
 #line 1048 "PhotoFileSniffer.c"
-						GFile* _tmp18_ = NULL;
-						gchar* _tmp19_ = NULL;
-						gchar* _tmp20_ = NULL;
+						GFile* _tmp18_;
+						gchar* _tmp19_;
+						gchar* _tmp20_;
 #line 95 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 						_tmp18_ = self->priv->file;
 #line 95 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
@@ -1130,7 +1130,7 @@ static gchar* value_photo_file_interrogator_collect_value (GValue* value, guint
 #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	if (collect_values[0].v_pointer) {
 #line 1132 "PhotoFileSniffer.c"
-		PhotoFileInterrogator* object;
+		PhotoFileInterrogator * object;
 		object = collect_values[0].v_pointer;
 #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1157,7 +1157,7 @@ static gchar* value_photo_file_interrogator_collect_value (GValue* value, guint
 
 
 static gchar* value_photo_file_interrogator_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PhotoFileInterrogator** object_p;
+	PhotoFileInterrogator ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	if (!object_p) {
@@ -1209,7 +1209,7 @@ gpointer value_get_photo_file_interrogator (const GValue* value) {
 
 
 void value_set_photo_file_interrogator (GValue* value, gpointer v_object) {
-	PhotoFileInterrogator* old;
+	PhotoFileInterrogator * old;
 #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_INTERROGATOR));
 #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
@@ -1240,7 +1240,7 @@ void value_set_photo_file_interrogator (GValue* value, gpointer v_object) {
 
 
 void value_take_photo_file_interrogator (GValue* value, gpointer v_object) {
-	PhotoFileInterrogator* old;
+	PhotoFileInterrogator * old;
 #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_INTERROGATOR));
 #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
@@ -1292,7 +1292,7 @@ static void photo_file_interrogator_instance_init (PhotoFileInterrogator * self)
 }
 
 
-static void photo_file_interrogator_finalize (PhotoFileInterrogator* obj) {
+static void photo_file_interrogator_finalize (PhotoFileInterrogator * obj) {
 	PhotoFileInterrogator * self;
 #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_INTERROGATOR, PhotoFileInterrogator);
@@ -1321,7 +1321,7 @@ GType photo_file_interrogator_get_type (void) {
 
 
 gpointer photo_file_interrogator_ref (gpointer instance) {
-	PhotoFileInterrogator* self;
+	PhotoFileInterrogator * self;
 	self = instance;
 #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1332,7 +1332,7 @@ gpointer photo_file_interrogator_ref (gpointer instance) {
 
 
 void photo_file_interrogator_unref (gpointer instance) {
-	PhotoFileInterrogator* self;
+	PhotoFileInterrogator * self;
 	self = instance;
 #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
diff --git a/src/photos/PhotoMetadata.c b/src/photos/PhotoMetadata.c
index 6f7c8c7..9950bc1 100644
--- a/src/photos/PhotoMetadata.c
+++ b/src/photos/PhotoMetadata.c
@@ -1,4 +1,4 @@
-/* PhotoMetadata.c generated by valac 0.34.7, the Vala compiler
+/* PhotoMetadata.c generated by valac 0.36.6, the Vala compiler
  * generated from PhotoMetadata.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -491,7 +491,7 @@ enum  {
 GeeList* keyword_transformer_transform (KeywordTransformer* self, const gchar* input, GError** error);
 static GeeList* keyword_transformer_real_transform (KeywordTransformer* self, const gchar* input, GError** error);
 KeywordTransformer* keyword_transformer_construct (GType object_type);
-static void keyword_transformer_finalize (KeywordTransformer* obj);
+static void keyword_transformer_finalize (KeywordTransformer * obj);
 GType null_keyword_transformer_get_type (void) G_GNUC_CONST;
 enum  {
 	NULL_KEYWORD_TRANSFORMER_DUMMY_PROPERTY
@@ -515,7 +515,7 @@ static void _acd_see_keyword_transformer_on_text_gmarkup_parser_text_func (GMark
 static void acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, GError* _error_);
 static void _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func (GMarkupParseContext* context, GError* _error_, gpointer self);
 static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* base, const gchar* input, GError** error);
-static void acd_see_keyword_transformer_finalize (KeywordTransformer* obj);
+static void acd_see_keyword_transformer_finalize (KeywordTransformer * obj);
 gpointer hierarchical_keyword_field_ref (gpointer instance);
 void hierarchical_keyword_field_unref (gpointer instance);
 GParamSpec* param_spec_hierarchical_keyword_field (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -528,7 +528,7 @@ enum  {
 };
 HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer);
 HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_type, const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer);
-static void hierarchical_keyword_field_finalize (HierarchicalKeywordField* obj);
+static void hierarchical_keyword_field_finalize (HierarchicalKeywordField * obj);
 gpointer photo_preview_ref (gpointer instance);
 void photo_preview_unref (gpointer instance);
 GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -554,7 +554,7 @@ static guint8* photo_preview_real_flatten (PhotoPreview* self, int* result_lengt
 GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error);
 static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** error);
 static guint8* _vala_array_dup4 (guint8* self, int length);
-static void photo_preview_finalize (PhotoPreview* obj);
+static void photo_preview_finalize (PhotoPreview * obj);
 gpointer media_metadata_ref (gpointer instance);
 void media_metadata_unref (gpointer instance);
 GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -616,8 +616,8 @@ static void block1_data_unref (void * _userdata_);
 static void __lambda5_ (Block1Data* _data1_, const gchar* tag);
 static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpointer self);
 void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, GeeCollection* collection);
-static void _vala_array_add45 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add46 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add45 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add46 (gchar** * array, int* length, int* size, gchar* value);
 void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags, int tags_length1, GeeCollection* values, PhotoMetadataSetOption option);
 static Block2Data* block2_data_ref (Block2Data* _data2_);
 static void block2_data_unref (void * _userdata_);
@@ -717,7 +717,7 @@ gboolean photo_metadata_has_orientation (PhotoMetadata* self);
 GType orientation_get_type (void) G_GNUC_CONST;
 Orientation photo_metadata_get_orientation (PhotoMetadata* self);
 void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientation);
-gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar** long_ref, gdouble* latitude, gchar** lat_ref, gdouble* altitude);
+gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* * long_ref, gdouble* latitude, gchar* * lat_ref, gdouble* altitude);
 gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exposure);
 gchar* photo_metadata_get_exposure_string (PhotoMetadata* self);
 gboolean metadata_rational_is_valid (MetadataRational *self);
@@ -747,8 +747,8 @@ enum  {
 };
 static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* base, int* result_length1, GError** error);
 static guint8* _vala_array_dup6 (guint8* self, int length);
-static void photo_metadata_internal_photo_preview_finalize (PhotoPreview* obj);
-static void photo_metadata_finalize (MediaMetadata* obj);
+static void photo_metadata_internal_photo_preview_finalize (PhotoPreview * obj);
+static void photo_metadata_finalize (MediaMetadata * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
@@ -837,7 +837,7 @@ static gchar* value_keyword_transformer_collect_value (GValue* value, guint n_co
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (collect_values[0].v_pointer) {
 #line 840 "PhotoMetadata.c"
-		KeywordTransformer* object;
+		KeywordTransformer * object;
 		object = collect_values[0].v_pointer;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -864,7 +864,7 @@ static gchar* value_keyword_transformer_collect_value (GValue* value, guint n_co
 
 
 static gchar* value_keyword_transformer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	KeywordTransformer** object_p;
+	KeywordTransformer ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!object_p) {
@@ -916,7 +916,7 @@ gpointer value_get_keyword_transformer (const GValue* value) {
 
 
 void value_set_keyword_transformer (GValue* value, gpointer v_object) {
-	KeywordTransformer* old;
+	KeywordTransformer * old;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEYWORD_TRANSFORMER));
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -947,7 +947,7 @@ void value_set_keyword_transformer (GValue* value, gpointer v_object) {
 
 
 void value_take_keyword_transformer (GValue* value, gpointer v_object) {
-	KeywordTransformer* old;
+	KeywordTransformer * old;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEYWORD_TRANSFORMER));
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -981,7 +981,7 @@ static void keyword_transformer_class_init (KeywordTransformerClass * klass) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((KeywordTransformerClass *) klass)->finalize = keyword_transformer_finalize;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) keyword_transformer_real_transform;
+	((KeywordTransformerClass *) klass)->transform = (GeeList* (*) (KeywordTransformer *, const gchar*, GError**)) keyword_transformer_real_transform;
 #line 986 "PhotoMetadata.c"
 }
 
@@ -993,7 +993,7 @@ static void keyword_transformer_instance_init (KeywordTransformer * self) {
 }
 
 
-static void keyword_transformer_finalize (KeywordTransformer* obj) {
+static void keyword_transformer_finalize (KeywordTransformer * obj) {
 	KeywordTransformer * self;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer);
@@ -1018,7 +1018,7 @@ GType keyword_transformer_get_type (void) {
 
 
 gpointer keyword_transformer_ref (gpointer instance) {
-	KeywordTransformer* self;
+	KeywordTransformer * self;
 	self = instance;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1029,7 +1029,7 @@ gpointer keyword_transformer_ref (gpointer instance) {
 
 
 void keyword_transformer_unref (gpointer instance) {
-	KeywordTransformer* self;
+	KeywordTransformer * self;
 	self = instance;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1046,8 +1046,8 @@ static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* bas
 	NullKeywordTransformer * self;
 	GeeList* result = NULL;
 	GeeArrayList* _result_ = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	const gchar* _tmp1_;
 #line 36 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_KEYWORD_TRANSFORMER, NullKeywordTransformer);
 #line 36 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1089,7 +1089,7 @@ static void null_keyword_transformer_class_init (NullKeywordTransformerClass * k
 #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	null_keyword_transformer_parent_class = g_type_class_peek_parent (klass);
 #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) null_keyword_transformer_real_transform;
+	((KeywordTransformerClass *) klass)->transform = (GeeList* (*) (KeywordTransformer *, const gchar*, GError**)) null_keyword_transformer_real_transform;
 #line 1094 "PhotoMetadata.c"
 }
 
@@ -1140,8 +1140,8 @@ static void _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func (GMa
 
 ACDSeeKeywordTransformer* acd_see_keyword_transformer_construct (GType object_type) {
 	ACDSeeKeywordTransformer* self = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayQueue* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeArrayQueue* _tmp1_;
 #line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = (ACDSeeKeywordTransformer*) keyword_transformer_construct (object_type);
 #line 63 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1190,14 +1190,14 @@ static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer*
 	ACDSeeKeywordTransformer * self;
 	GeeList* result = NULL;
 	GMarkupParseContext* ctx = NULL;
-	GMarkupParser _tmp0_ = {0};
-	GMarkupParseContext* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	GeeArrayList* _tmp6_ = NULL;
-	GeeList* _tmp7_ = NULL;
+	GMarkupParser _tmp0_;
+	GMarkupParseContext* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	GeeArrayList* _tmp6_;
+	GeeList* _tmp7_;
 	GError * _inner_error_ = NULL;
 #line 72 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ACD_SEE_KEYWORD_TRANSFORMER, ACDSeeKeywordTransformer);
@@ -1244,13 +1244,13 @@ static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer*
 
 
 static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* name, gchar** attribute_names, gchar** attribute_values, GError** error) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	gchar** _tmp4_;
+	gint _tmp4__length1;
 	GError * _inner_error_ = NULL;
 #line 80 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self));
@@ -1311,7 +1311,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self
 
 
 static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* name, GError** error) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self));
 #line 104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1323,9 +1323,9 @@ static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self,
 #line 106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_strcmp0 (_tmp0_, "Category") == 0) {
 #line 1326 "PhotoMetadata.c"
-		GeeArrayQueue* _tmp1_ = NULL;
-		gpointer _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+		GeeArrayQueue* _tmp1_;
+		gpointer _tmp2_;
+		gchar* _tmp3_;
 #line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = self->priv->stack;
 #line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1340,10 +1340,10 @@ static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self,
 
 
 static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* text, GError** error) {
-	const gchar* _tmp0_ = NULL;
-	GeeArrayQueue* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	const gchar* _tmp0_;
+	GeeArrayQueue* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 #line 111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self));
 #line 111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1370,12 +1370,12 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
 	if (_tmp3_) {
 #line 1372 "PhotoMetadata.c"
 		GString* builder = NULL;
-		GString* _tmp4_ = NULL;
-		GString* _tmp13_ = NULL;
-		gssize _tmp14_ = 0L;
-		GeeArrayList* _tmp18_ = NULL;
-		GString* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
+		GString* _tmp4_;
+		GString* _tmp13_;
+		gssize _tmp14_;
+		GeeArrayList* _tmp18_;
+		GString* _tmp19_;
+		const gchar* _tmp20_;
 #line 119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = g_string_new ("");
 #line 119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1383,8 +1383,8 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
 #line 1384 "PhotoMetadata.c"
 		{
 			GeeIterator* _f_it = NULL;
-			GeeArrayQueue* _tmp5_ = NULL;
-			GeeIterator* _tmp6_ = NULL;
+			GeeArrayQueue* _tmp5_;
+			GeeIterator* _tmp6_;
 #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp5_ = self->priv->stack;
 #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1394,13 +1394,13 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
 #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			while (TRUE) {
 #line 1397 "PhotoMetadata.c"
-				GeeIterator* _tmp7_ = NULL;
-				gboolean _tmp8_ = FALSE;
+				GeeIterator* _tmp7_;
+				gboolean _tmp8_;
 				gchar* f = NULL;
-				GeeIterator* _tmp9_ = NULL;
-				gpointer _tmp10_ = NULL;
-				GString* _tmp11_ = NULL;
-				const gchar* _tmp12_ = NULL;
+				GeeIterator* _tmp9_;
+				gpointer _tmp10_;
+				GString* _tmp11_;
+				const gchar* _tmp12_;
 #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp7_ = _f_it;
 #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1438,9 +1438,9 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
 #line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (_tmp14_ > ((gssize) 0)) {
 #line 1441 "PhotoMetadata.c"
-			GString* _tmp15_ = NULL;
-			GString* _tmp16_ = NULL;
-			gssize _tmp17_ = 0L;
+			GString* _tmp15_;
+			GString* _tmp16_;
+			gssize _tmp17_;
 #line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp15_ = builder;
 #line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1474,8 +1474,8 @@ static gpointer _g_error_copy0 (gpointer self) {
 
 
 static void acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, GError* _error_) {
-	GError* _tmp0_ = NULL;
-	GError* _tmp1_ = NULL;
+	GError* _tmp0_;
+	GError* _tmp1_;
 #line 130 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self));
 #line 130 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1500,7 +1500,7 @@ static void acd_see_keyword_transformer_class_init (ACDSeeKeywordTransformerClas
 #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_type_class_add_private (klass, sizeof (ACDSeeKeywordTransformerPrivate));
 #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) acd_see_keyword_transformer_real_transform;
+	((KeywordTransformerClass *) klass)->transform = (GeeList* (*) (KeywordTransformer *, const gchar*, GError**)) acd_see_keyword_transformer_real_transform;
 #line 1505 "PhotoMetadata.c"
 }
 
@@ -1512,7 +1512,7 @@ static void acd_see_keyword_transformer_instance_init (ACDSeeKeywordTransformer
 }
 
 
-static void acd_see_keyword_transformer_finalize (KeywordTransformer* obj) {
+static void acd_see_keyword_transformer_finalize (KeywordTransformer * obj) {
 	ACDSeeKeywordTransformer * self;
 #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ACD_SEE_KEYWORD_TRANSFORMER, ACDSeeKeywordTransformer);
@@ -1549,14 +1549,14 @@ static gpointer _keyword_transformer_ref0 (gpointer self) {
 
 HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_type, const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer) {
 	HierarchicalKeywordField* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	KeywordTransformer* _tmp6_ = NULL;
-	KeywordTransformer* _tmp7_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
+	KeywordTransformer* _tmp6_;
+	KeywordTransformer* _tmp7_;
 #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (field_name != NULL, NULL);
 #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1652,7 +1652,7 @@ static gchar* value_hierarchical_keyword_field_collect_value (GValue* value, gui
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (collect_values[0].v_pointer) {
 #line 1655 "PhotoMetadata.c"
-		HierarchicalKeywordField* object;
+		HierarchicalKeywordField * object;
 		object = collect_values[0].v_pointer;
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1679,7 +1679,7 @@ static gchar* value_hierarchical_keyword_field_collect_value (GValue* value, gui
 
 
 static gchar* value_hierarchical_keyword_field_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	HierarchicalKeywordField** object_p;
+	HierarchicalKeywordField ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!object_p) {
@@ -1731,7 +1731,7 @@ gpointer value_get_hierarchical_keyword_field (const GValue* value) {
 
 
 void value_set_hierarchical_keyword_field (GValue* value, gpointer v_object) {
-	HierarchicalKeywordField* old;
+	HierarchicalKeywordField * old;
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD));
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1762,7 +1762,7 @@ void value_set_hierarchical_keyword_field (GValue* value, gpointer v_object) {
 
 
 void value_take_hierarchical_keyword_field (GValue* value, gpointer v_object) {
-	HierarchicalKeywordField* old;
+	HierarchicalKeywordField * old;
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD));
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1806,7 +1806,7 @@ static void hierarchical_keyword_field_instance_init (HierarchicalKeywordField *
 }
 
 
-static void hierarchical_keyword_field_finalize (HierarchicalKeywordField* obj) {
+static void hierarchical_keyword_field_finalize (HierarchicalKeywordField * obj) {
 	HierarchicalKeywordField * self;
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HIERARCHICAL_KEYWORD_FIELD, HierarchicalKeywordField);
@@ -1837,7 +1837,7 @@ GType hierarchical_keyword_field_get_type (void) {
 
 
 gpointer hierarchical_keyword_field_ref (gpointer instance) {
-	HierarchicalKeywordField* self;
+	HierarchicalKeywordField * self;
 	self = instance;
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1848,7 +1848,7 @@ gpointer hierarchical_keyword_field_ref (gpointer instance) {
 
 
 void hierarchical_keyword_field_unref (gpointer instance) {
-	HierarchicalKeywordField* self;
+	HierarchicalKeywordField * self;
 	self = instance;
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1863,14 +1863,14 @@ void hierarchical_keyword_field_unref (gpointer instance) {
 
 PhotoPreview* photo_preview_construct (GType object_type, const gchar* name, Dimensions* dimensions, guint32 size, const gchar* mime_type, const gchar* extension) {
 	PhotoPreview* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	Dimensions _tmp2_ = {0};
-	guint32 _tmp3_ = 0U;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	Dimensions _tmp2_;
+	guint32 _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
 #line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1921,8 +1921,8 @@ PhotoPreview* photo_preview_construct (GType object_type, const gchar* name, Dim
 
 gchar* photo_preview_get_name (PhotoPreview* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL);
 #line 174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1938,7 +1938,7 @@ gchar* photo_preview_get_name (PhotoPreview* self) {
 
 
 void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result) {
-	Dimensions _tmp0_ = {0};
+	Dimensions _tmp0_;
 #line 177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_PREVIEW (self));
 #line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1953,7 +1953,7 @@ void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result)
 
 guint32 photo_preview_get_size (PhotoPreview* self) {
 	guint32 result = 0U;
-	guint32 _tmp0_ = 0U;
+	guint32 _tmp0_;
 #line 181 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_PREVIEW (self), 0U);
 #line 182 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1968,8 +1968,8 @@ guint32 photo_preview_get_size (PhotoPreview* self) {
 
 gchar* photo_preview_get_mime_type (PhotoPreview* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL);
 #line 186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1986,8 +1986,8 @@ gchar* photo_preview_get_mime_type (PhotoPreview* self) {
 
 gchar* photo_preview_get_extension (PhotoPreview* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 189 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL);
 #line 190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2030,10 +2030,10 @@ static guint8* _vala_array_dup4 (guint8* self, int length) {
 static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** error) {
 	GdkPixbuf* result = NULL;
 	guint8* flattened = NULL;
-	gint _tmp0_ = 0;
-	guint8* _tmp1_ = NULL;
-	gint flattened_length1 = 0;
-	gint _flattened_size_ = 0;
+	gint _tmp0_;
+	guint8* _tmp1_;
+	gint flattened_length1;
+	gint _flattened_size_;
 	GError * _inner_error_ = NULL;
 #line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_preview_flatten (self, &_tmp0_, &_inner_error_);
@@ -2053,13 +2053,13 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
 	}
 	{
 		GdkPixbuf* _tmp2_ = NULL;
-		guint8* _tmp3_ = NULL;
-		gint _tmp3__length1 = 0;
-		GMemoryInputStream* _tmp4_ = NULL;
-		GMemoryInputStream* _tmp5_ = NULL;
-		GdkPixbuf* _tmp6_ = NULL;
-		GdkPixbuf* _tmp7_ = NULL;
-		GdkPixbuf* _tmp8_ = NULL;
+		guint8* _tmp3_;
+		gint _tmp3__length1;
+		GMemoryInputStream* _tmp4_;
+		GMemoryInputStream* _tmp5_;
+		GdkPixbuf* _tmp6_;
+		GdkPixbuf* _tmp7_;
+		GdkPixbuf* _tmp8_;
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = (flattened != NULL) ? _vala_array_dup4 (flattened, flattened_length1) : ((gpointer) flattened);
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2099,9 +2099,9 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
 	__catch25_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp9_ = NULL;
-		GError* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
+		const gchar* _tmp9_;
+		GError* _tmp10_;
+		const gchar* _tmp11_;
 #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		err = _inner_error_;
 #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2186,7 +2186,7 @@ static gchar* value_photo_preview_collect_value (GValue* value, guint n_collect_
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (collect_values[0].v_pointer) {
 #line 2189 "PhotoMetadata.c"
-		PhotoPreview* object;
+		PhotoPreview * object;
 		object = collect_values[0].v_pointer;
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -2213,7 +2213,7 @@ static gchar* value_photo_preview_collect_value (GValue* value, guint n_collect_
 
 
 static gchar* value_photo_preview_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PhotoPreview** object_p;
+	PhotoPreview ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!object_p) {
@@ -2265,7 +2265,7 @@ gpointer value_get_photo_preview (const GValue* value) {
 
 
 void value_set_photo_preview (GValue* value, gpointer v_object) {
-	PhotoPreview* old;
+	PhotoPreview * old;
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW));
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2296,7 +2296,7 @@ void value_set_photo_preview (GValue* value, gpointer v_object) {
 
 
 void value_take_photo_preview (GValue* value, gpointer v_object) {
-	PhotoPreview* old;
+	PhotoPreview * old;
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW));
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2332,9 +2332,9 @@ static void photo_preview_class_init (PhotoPreviewClass * klass) {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_type_class_add_private (klass, sizeof (PhotoPreviewPrivate));
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	((PhotoPreviewClass *) klass)->flatten = (guint8* (*)(PhotoPreview*, int*, GError**)) photo_preview_real_flatten;
+	((PhotoPreviewClass *) klass)->flatten = (guint8* (*) (PhotoPreview *, int*, GError**)) photo_preview_real_flatten;
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	((PhotoPreviewClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoPreview*, GError**)) photo_preview_real_get_pixbuf;
+	((PhotoPreviewClass *) klass)->get_pixbuf = (GdkPixbuf* (*) (PhotoPreview *, GError**)) photo_preview_real_get_pixbuf;
 #line 2339 "PhotoMetadata.c"
 }
 
@@ -2348,7 +2348,7 @@ static void photo_preview_instance_init (PhotoPreview * self) {
 }
 
 
-static void photo_preview_finalize (PhotoPreview* obj) {
+static void photo_preview_finalize (PhotoPreview * obj) {
 	PhotoPreview * self;
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_PREVIEW, PhotoPreview);
@@ -2379,7 +2379,7 @@ GType photo_preview_get_type (void) {
 
 
 gpointer photo_preview_ref (gpointer instance) {
-	PhotoPreview* self;
+	PhotoPreview * self;
 	self = instance;
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -2390,7 +2390,7 @@ gpointer photo_preview_ref (gpointer instance) {
 
 
 void photo_preview_unref (gpointer instance) {
-	PhotoPreview* self;
+	PhotoPreview * self;
 	self = instance;
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2434,17 +2434,17 @@ PhotoMetadata* photo_metadata_new (void) {
 
 static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file, GError** error) {
 	PhotoMetadata * self;
-	GExiv2Metadata* _tmp0_ = NULL;
-	GExiv2Metadata* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	ExifData* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
+	GExiv2Metadata* _tmp0_;
+	GExiv2Metadata* _tmp1_;
+	GFile* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GFile* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	ExifData* _tmp8_;
+	GFile* _tmp9_;
+	gchar* _tmp10_;
 	GError * _inner_error_ = NULL;
 #line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata);
@@ -2507,10 +2507,10 @@ static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file
 
 
 void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** error) {
-	GExiv2Metadata* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	GExiv2Metadata* _tmp0_;
+	GFile* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
@@ -2540,21 +2540,21 @@ void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** er
 
 
 void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int buffer_length1, gint length, GError** error) {
-	gint _tmp0_ = 0;
-	guint8* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	gint _tmp3_ = 0;
-	GExiv2Metadata* _tmp4_ = NULL;
-	GExiv2Metadata* _tmp5_ = NULL;
-	guint8* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	gint _tmp7_ = 0;
-	guint8* _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	gint _tmp9_ = 0;
-	ExifData* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gchar* _tmp12_ = NULL;
+	gint _tmp0_;
+	guint8* _tmp2_;
+	gint _tmp2__length1;
+	gint _tmp3_;
+	GExiv2Metadata* _tmp4_;
+	GExiv2Metadata* _tmp5_;
+	guint8* _tmp6_;
+	gint _tmp6__length1;
+	gint _tmp7_;
+	guint8* _tmp8_;
+	gint _tmp8__length1;
+	gint _tmp9_;
+	ExifData* _tmp10_;
+	gint _tmp11_;
+	gchar* _tmp12_;
 	GError * _inner_error_ = NULL;
 #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
@@ -2563,8 +2563,8 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
 #line 268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ <= 0) {
 #line 2566 "PhotoMetadata.c"
-		guint8* _tmp1_ = NULL;
-		gint _tmp1__length1 = 0;
+		guint8* _tmp1_;
+		gint _tmp1__length1;
 #line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = buffer;
 #line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2634,21 +2634,21 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
 
 
 void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer, int buffer_length1, gint length, GError** error) {
-	gint _tmp0_ = 0;
-	guint8* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	gint _tmp3_ = 0;
-	GExiv2Metadata* _tmp4_ = NULL;
-	GExiv2Metadata* _tmp5_ = NULL;
-	guint8* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	gint _tmp7_ = 0;
-	guint8* _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	gint _tmp9_ = 0;
-	ExifData* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gchar* _tmp12_ = NULL;
+	gint _tmp0_;
+	guint8* _tmp2_;
+	gint _tmp2__length1;
+	gint _tmp3_;
+	GExiv2Metadata* _tmp4_;
+	GExiv2Metadata* _tmp5_;
+	guint8* _tmp6_;
+	gint _tmp6__length1;
+	gint _tmp7_;
+	guint8* _tmp8_;
+	gint _tmp8__length1;
+	gint _tmp9_;
+	ExifData* _tmp10_;
+	gint _tmp11_;
+	gchar* _tmp12_;
 	GError * _inner_error_ = NULL;
 #line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
@@ -2657,8 +2657,8 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer,
 #line 282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ <= 0) {
 #line 2660 "PhotoMetadata.c"
-		guint8* _tmp1_ = NULL;
-		gint _tmp1__length1 = 0;
+		guint8* _tmp1_;
+		gint _tmp1__length1;
 #line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = buffer;
 #line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2729,12 +2729,12 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer,
 
 MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) {
 	MetadataDomain result = 0;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	const gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
+	const gchar* _tmp4_;
+	gboolean _tmp5_;
 #line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, 0);
 #line 296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2783,7 +2783,7 @@ MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) {
 
 gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain) {
 	gboolean result = FALSE;
-	MetadataDomain _tmp0_ = 0;
+	MetadataDomain _tmp0_;
 #line 308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2794,8 +2794,8 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
 		case METADATA_DOMAIN_EXIF:
 #line 2796 "PhotoMetadata.c"
 		{
-			GExiv2Metadata* _tmp1_ = NULL;
-			gboolean _tmp2_ = FALSE;
+			GExiv2Metadata* _tmp1_;
+			gboolean _tmp2_;
 #line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = self->priv->exiv2;
 #line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2810,8 +2810,8 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
 		case METADATA_DOMAIN_XMP:
 #line 2812 "PhotoMetadata.c"
 		{
-			GExiv2Metadata* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+			GExiv2Metadata* _tmp3_;
+			gboolean _tmp4_;
 #line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = self->priv->exiv2;
 #line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2826,8 +2826,8 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
 		case METADATA_DOMAIN_IPTC:
 #line 2828 "PhotoMetadata.c"
 		{
-			GExiv2Metadata* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+			GExiv2Metadata* _tmp5_;
+			gboolean _tmp6_;
 #line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp5_ = self->priv->exiv2;
 #line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2855,7 +2855,7 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
 
 gboolean photo_metadata_has_exif (PhotoMetadata* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 325 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 326 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2870,7 +2870,7 @@ gboolean photo_metadata_has_exif (PhotoMetadata* self) {
 
 gboolean photo_metadata_has_xmp (PhotoMetadata* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 330 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2885,7 +2885,7 @@ gboolean photo_metadata_has_xmp (PhotoMetadata* self) {
 
 gboolean photo_metadata_has_iptc (PhotoMetadata* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 333 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 334 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2900,7 +2900,7 @@ gboolean photo_metadata_has_iptc (PhotoMetadata* self) {
 
 gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain domain) {
 	gboolean result = FALSE;
-	MetadataDomain _tmp0_ = 0;
+	MetadataDomain _tmp0_;
 #line 337 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2911,8 +2911,8 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
 		case METADATA_DOMAIN_EXIF:
 #line 2913 "PhotoMetadata.c"
 		{
-			GExiv2Metadata* _tmp1_ = NULL;
-			gboolean _tmp2_ = FALSE;
+			GExiv2Metadata* _tmp1_;
+			gboolean _tmp2_;
 #line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = self->priv->exiv2;
 #line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2927,8 +2927,8 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
 		case METADATA_DOMAIN_XMP:
 #line 2929 "PhotoMetadata.c"
 		{
-			GExiv2Metadata* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+			GExiv2Metadata* _tmp3_;
+			gboolean _tmp4_;
 #line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = self->priv->exiv2;
 #line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2943,8 +2943,8 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
 		case METADATA_DOMAIN_IPTC:
 #line 2945 "PhotoMetadata.c"
 		{
-			GExiv2Metadata* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+			GExiv2Metadata* _tmp5_;
+			gboolean _tmp6_;
 #line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp5_ = self->priv->exiv2;
 #line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2972,7 +2972,7 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
 
 gboolean photo_metadata_can_write_exif (PhotoMetadata* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 354 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2987,7 +2987,7 @@ gboolean photo_metadata_can_write_exif (PhotoMetadata* self) {
 
 gboolean photo_metadata_can_write_xmp (PhotoMetadata* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 358 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 359 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3002,7 +3002,7 @@ gboolean photo_metadata_can_write_xmp (PhotoMetadata* self) {
 
 gboolean photo_metadata_can_write_iptc (PhotoMetadata* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 363 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3017,9 +3017,9 @@ gboolean photo_metadata_can_write_iptc (PhotoMetadata* self) {
 
 gboolean photo_metadata_has_tag (PhotoMetadata* self, const gchar* tag) {
 	gboolean result = FALSE;
-	GExiv2Metadata* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GExiv2Metadata* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3040,8 +3040,8 @@ gboolean photo_metadata_has_tag (PhotoMetadata* self, const gchar* tag) {
 
 static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) {
 	GeeSet* result = NULL;
-	GCompareDataFunc _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
+	GCompareDataFunc _tmp0_;
+	void* _tmp0__target;
 #line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3051,7 +3051,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
 #line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ == NULL) {
 #line 3054 "PhotoMetadata.c"
-		GeeHashSet* _tmp1_ = NULL;
+		GeeHashSet* _tmp1_;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3068,10 +3068,10 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
 		return result;
 #line 3070 "PhotoMetadata.c"
 	} else {
-		GCompareDataFunc _tmp2_ = NULL;
-		void* _tmp2__target = NULL;
-		GDestroyNotify _tmp2__target_destroy_notify = NULL;
-		GeeTreeSet* _tmp3_ = NULL;
+		GCompareDataFunc _tmp2_;
+		void* _tmp2__target;
+		GDestroyNotify _tmp2__target_destroy_notify;
+		GeeTreeSet* _tmp3_;
 #line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = compare_func;
 #line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3115,19 +3115,19 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
 GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain domain, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) {
 	GeeCollection* result = NULL;
 	gchar** tags = NULL;
-	gint tags_length1 = 0;
-	gint _tags_size_ = 0;
-	MetadataDomain _tmp0_ = 0;
+	gint tags_length1;
+	gint _tags_size_;
+	MetadataDomain _tmp0_;
 	gboolean _tmp10_ = FALSE;
-	gchar** _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
+	gchar** _tmp11_;
+	gint _tmp11__length1;
 	GeeCollection* collection = NULL;
-	GCompareDataFunc _tmp13_ = NULL;
-	void* _tmp13__target = NULL;
-	GDestroyNotify _tmp13__target_destroy_notify = NULL;
-	GeeSet* _tmp14_ = NULL;
-	gchar** _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
+	GCompareDataFunc _tmp13_;
+	void* _tmp13__target;
+	GDestroyNotify _tmp13__target_destroy_notify;
+	GeeSet* _tmp14_;
+	gchar** _tmp15_;
+	gint _tmp15__length1;
 #line 378 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 380 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3144,9 +3144,9 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 		case METADATA_DOMAIN_EXIF:
 #line 3146 "PhotoMetadata.c"
 		{
-			GExiv2Metadata* _tmp1_ = NULL;
-			gchar** _tmp2_ = NULL;
-			gchar** _tmp3_ = NULL;
+			GExiv2Metadata* _tmp1_;
+			gchar** _tmp2_;
+			gchar** _tmp3_;
 #line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = self->priv->exiv2;
 #line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3167,9 +3167,9 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 		case METADATA_DOMAIN_XMP:
 #line 3169 "PhotoMetadata.c"
 		{
-			GExiv2Metadata* _tmp4_ = NULL;
-			gchar** _tmp5_ = NULL;
-			gchar** _tmp6_ = NULL;
+			GExiv2Metadata* _tmp4_;
+			gchar** _tmp5_;
+			gchar** _tmp6_;
 #line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4_ = self->priv->exiv2;
 #line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3190,9 +3190,9 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 		case METADATA_DOMAIN_IPTC:
 #line 3192 "PhotoMetadata.c"
 		{
-			GExiv2Metadata* _tmp7_ = NULL;
-			gchar** _tmp8_ = NULL;
-			gchar** _tmp9_ = NULL;
+			GExiv2Metadata* _tmp7_;
+			gchar** _tmp8_;
+			gchar** _tmp9_;
 #line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp7_ = self->priv->exiv2;
 #line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3224,8 +3224,8 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 		_tmp10_ = TRUE;
 #line 3226 "PhotoMetadata.c"
 	} else {
-		gchar** _tmp12_ = NULL;
-		gint _tmp12__length1 = 0;
+		gchar** _tmp12_;
+		gint _tmp12__length1;
 #line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = tags;
 #line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3285,7 +3285,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 #line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp15__length1; tag_it = tag_it + 1) {
 #line 3288 "PhotoMetadata.c"
-			gchar* _tmp16_ = NULL;
+			gchar* _tmp16_;
 			gchar* tag = NULL;
 #line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp16_ = g_strdup (tag_collection[tag_it]);
@@ -3293,8 +3293,8 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 			tag = _tmp16_;
 #line 3295 "PhotoMetadata.c"
 			{
-				GeeCollection* _tmp17_ = NULL;
-				const gchar* _tmp18_ = NULL;
+				GeeCollection* _tmp17_;
+				const gchar* _tmp18_;
 #line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp17_ = collection;
 #line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3328,27 +3328,27 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) {
 	GeeCollection* result = NULL;
 	GeeCollection* all_tags = NULL;
-	GCompareDataFunc _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	GDestroyNotify _tmp0__target_destroy_notify = NULL;
-	GeeSet* _tmp1_ = NULL;
+	GCompareDataFunc _tmp0_;
+	void* _tmp0__target;
+	GDestroyNotify _tmp0__target_destroy_notify;
+	GeeSet* _tmp1_;
 	GeeCollection* exif_tags = NULL;
-	GeeCollection* _tmp2_ = NULL;
+	GeeCollection* _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	GeeCollection* _tmp4_ = NULL;
+	GeeCollection* _tmp4_;
 	GeeCollection* xmp_tags = NULL;
-	GeeCollection* _tmp10_ = NULL;
+	GeeCollection* _tmp10_;
 	gboolean _tmp11_ = FALSE;
-	GeeCollection* _tmp12_ = NULL;
+	GeeCollection* _tmp12_;
 	GeeCollection* iptc_tags = NULL;
-	GeeCollection* _tmp18_ = NULL;
+	GeeCollection* _tmp18_;
 	gboolean _tmp19_ = FALSE;
-	GeeCollection* _tmp20_ = NULL;
+	GeeCollection* _tmp20_;
 	GeeCollection* _tmp26_ = NULL;
-	GeeCollection* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	GeeCollection* _tmp31_ = NULL;
+	GeeCollection* _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
+	GeeCollection* _tmp31_;
 #line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3376,9 +3376,9 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 #line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ != NULL) {
 #line 3379 "PhotoMetadata.c"
-		GeeCollection* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		GeeCollection* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 #line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = exif_tags;
 #line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3396,8 +3396,8 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 #line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
 #line 3399 "PhotoMetadata.c"
-		GeeCollection* _tmp8_ = NULL;
-		GeeCollection* _tmp9_ = NULL;
+		GeeCollection* _tmp8_;
+		GeeCollection* _tmp9_;
 #line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp8_ = all_tags;
 #line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3415,9 +3415,9 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp12_ != NULL) {
 #line 3418 "PhotoMetadata.c"
-		GeeCollection* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
-		gint _tmp15_ = 0;
+		GeeCollection* _tmp13_;
+		gint _tmp14_;
+		gint _tmp15_;
 #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13_ = xmp_tags;
 #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3435,8 +3435,8 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp11_) {
 #line 3438 "PhotoMetadata.c"
-		GeeCollection* _tmp16_ = NULL;
-		GeeCollection* _tmp17_ = NULL;
+		GeeCollection* _tmp16_;
+		GeeCollection* _tmp17_;
 #line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp16_ = all_tags;
 #line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3454,9 +3454,9 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 #line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp20_ != NULL) {
 #line 3457 "PhotoMetadata.c"
-		GeeCollection* _tmp21_ = NULL;
-		gint _tmp22_ = 0;
-		gint _tmp23_ = 0;
+		GeeCollection* _tmp21_;
+		gint _tmp22_;
+		gint _tmp23_;
 #line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp21_ = iptc_tags;
 #line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3474,8 +3474,8 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 #line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp19_) {
 #line 3477 "PhotoMetadata.c"
-		GeeCollection* _tmp24_ = NULL;
-		GeeCollection* _tmp25_ = NULL;
+		GeeCollection* _tmp24_;
+		GeeCollection* _tmp25_;
 #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp24_ = all_tags;
 #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3493,7 +3493,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp29_ > 0) {
 #line 3496 "PhotoMetadata.c"
-		GeeCollection* _tmp30_ = NULL;
+		GeeCollection* _tmp30_;
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp30_ = all_tags;
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3532,9 +3532,9 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 
 gchar* photo_metadata_get_tag_label (PhotoMetadata* self, const gchar* tag) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 424 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 424 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3555,9 +3555,9 @@ gchar* photo_metadata_get_tag_label (PhotoMetadata* self, const gchar* tag) {
 
 gchar* photo_metadata_get_tag_description (PhotoMetadata* self, const gchar* tag) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3578,13 +3578,13 @@ gchar* photo_metadata_get_tag_description (PhotoMetadata* self, const gchar* tag
 
 gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, PrepareInputTextOptions options) {
 	gchar* result = NULL;
-	GExiv2Metadata* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PrepareInputTextOptions _tmp4_ = 0;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	GExiv2Metadata* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	PrepareInputTextOptions _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 432 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 432 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3615,13 +3615,13 @@ gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, Prepare
 
 gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar* tag, PrepareInputTextOptions options) {
 	gchar* result = NULL;
-	GExiv2Metadata* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PrepareInputTextOptions _tmp4_ = 0;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	GExiv2Metadata* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	PrepareInputTextOptions _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 436 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 436 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3652,8 +3652,8 @@ gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar*
 
 gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int tags_length1) {
 	gchar* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
 #line 440 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3673,7 +3673,7 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
 #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
 #line 3676 "PhotoMetadata.c"
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 			gchar* tag = NULL;
 #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
@@ -3682,9 +3682,9 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
 #line 3683 "PhotoMetadata.c"
 			{
 				gchar* value = NULL;
-				const gchar* _tmp2_ = NULL;
-				gchar* _tmp3_ = NULL;
-				const gchar* _tmp4_ = NULL;
+				const gchar* _tmp2_;
+				gchar* _tmp3_;
+				const gchar* _tmp4_;
 #line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
 #line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3721,8 +3721,8 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
 
 gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar** tags, int tags_length1) {
 	gchar* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
 #line 450 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3742,7 +3742,7 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
 #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
 #line 3745 "PhotoMetadata.c"
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 			gchar* tag = NULL;
 #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
@@ -3751,9 +3751,9 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
 #line 3752 "PhotoMetadata.c"
 			{
 				gchar* value = NULL;
-				const gchar* _tmp2_ = NULL;
-				gchar* _tmp3_ = NULL;
-				const gchar* _tmp4_ = NULL;
+				const gchar* _tmp2_;
+				gchar* _tmp3_;
+				const gchar* _tmp4_;
 #line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
 #line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3791,26 +3791,26 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
 GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* tag) {
 	GeeList* result = NULL;
 	gchar** values = NULL;
-	GExiv2Metadata* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint values_length1 = 0;
-	gint _values_size_ = 0;
+	GExiv2Metadata* _tmp0_;
+	const gchar* _tmp1_;
+	gchar** _tmp2_;
+	gchar** _tmp3_;
+	gint values_length1;
+	gint _values_size_;
 	gboolean _tmp4_ = FALSE;
-	gchar** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
+	gchar** _tmp5_;
+	gint _tmp5__length1;
 	GeeList* list = NULL;
-	GeeArrayList* _tmp7_ = NULL;
+	GeeArrayList* _tmp7_;
 	GeeHashSet* collection = NULL;
-	GeeHashSet* _tmp8_ = NULL;
-	gchar** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
+	GeeHashSet* _tmp8_;
+	gchar** _tmp9_;
+	gint _tmp9__length1;
 	GeeList* _tmp22_ = NULL;
-	GeeList* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	GeeList* _tmp27_ = NULL;
+	GeeList* _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	GeeList* _tmp27_;
 #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3837,8 +3837,8 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 		_tmp4_ = TRUE;
 #line 3839 "PhotoMetadata.c"
 	} else {
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
+		gchar** _tmp6_;
+		gint _tmp6__length1;
 #line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = values;
 #line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3882,7 +3882,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (value_it = 0; value_it < _tmp9__length1; value_it = value_it + 1) {
 #line 3885 "PhotoMetadata.c"
-			gchar* _tmp10_ = NULL;
+			gchar* _tmp10_;
 			gchar* value = NULL;
 #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp10_ = g_strdup (value_collection[value_it]);
@@ -3891,10 +3891,10 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 #line 3892 "PhotoMetadata.c"
 			{
 				gchar* prepped = NULL;
-				const gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
+				const gchar* _tmp11_;
+				gchar* _tmp12_;
 				gboolean _tmp13_ = FALSE;
-				const gchar* _tmp14_ = NULL;
+				const gchar* _tmp14_;
 #line 475 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp11_ = value;
 #line 475 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3906,9 +3906,9 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp14_ != NULL) {
 #line 3909 "PhotoMetadata.c"
-					GeeHashSet* _tmp15_ = NULL;
-					const gchar* _tmp16_ = NULL;
-					gboolean _tmp17_ = FALSE;
+					GeeHashSet* _tmp15_;
+					const gchar* _tmp16_;
+					gboolean _tmp17_;
 #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp15_ = collection;
 #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3926,10 +3926,10 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp13_) {
 #line 3929 "PhotoMetadata.c"
-					GeeList* _tmp18_ = NULL;
-					const gchar* _tmp19_ = NULL;
-					GeeHashSet* _tmp20_ = NULL;
-					const gchar* _tmp21_ = NULL;
+					GeeList* _tmp18_;
+					const gchar* _tmp19_;
+					GeeHashSet* _tmp20_;
+					const gchar* _tmp21_;
 #line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp18_ = list;
 #line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3961,7 +3961,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp25_ > 0) {
 #line 3964 "PhotoMetadata.c"
-		GeeList* _tmp26_ = NULL;
+		GeeList* _tmp26_;
 #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = list;
 #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3990,8 +3990,8 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 
 GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** tags, int tags_length1) {
 	GeeList* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
 #line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4011,7 +4011,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
 #line 4014 "PhotoMetadata.c"
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 			gchar* tag = NULL;
 #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
@@ -4020,10 +4020,10 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 #line 4021 "PhotoMetadata.c"
 			{
 				GeeList* values = NULL;
-				const gchar* _tmp2_ = NULL;
-				GeeList* _tmp3_ = NULL;
+				const gchar* _tmp2_;
+				GeeList* _tmp3_;
 				gboolean _tmp4_ = FALSE;
-				GeeList* _tmp5_ = NULL;
+				GeeList* _tmp5_;
 #line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
 #line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4035,9 +4035,9 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 #line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp5_ != NULL) {
 #line 4038 "PhotoMetadata.c"
-					GeeList* _tmp6_ = NULL;
-					gint _tmp7_ = 0;
-					gint _tmp8_ = 0;
+					GeeList* _tmp6_;
+					gint _tmp7_;
+					gint _tmp8_;
 #line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp6_ = values;
 #line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4080,14 +4080,14 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 
 void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gchar* value, PrepareInputTextOptions options) {
 	gchar* prepped = NULL;
-	const gchar* _tmp0_ = NULL;
-	PrepareInputTextOptions _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	GExiv2Metadata* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	const gchar* _tmp0_;
+	PrepareInputTextOptions _tmp1_;
+	gchar* _tmp2_;
+	const gchar* _tmp3_;
+	GExiv2Metadata* _tmp6_;
+	const gchar* _tmp7_;
+	const gchar* _tmp8_;
+	gboolean _tmp9_;
 #line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4107,8 +4107,8 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
 #line 505 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_ == NULL) {
 #line 4110 "PhotoMetadata.c"
-		const gchar* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+		const gchar* _tmp4_;
+		const gchar* _tmp5_;
 #line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = tag;
 #line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4132,9 +4132,9 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
 #line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp9_) {
 #line 4135 "PhotoMetadata.c"
-		const gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
+		const gchar* _tmp10_;
+		const gchar* _tmp11_;
+		const gchar* _tmp12_;
 #line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = tag;
 #line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4154,11 +4154,11 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
 
 static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, int tags_length1, PhotoMetadataSetOption option, PhotoMetadataSetGenericValue setter, void* setter_target) {
 	gboolean written = FALSE;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp10_ = FALSE;
-	PhotoMetadataSetOption _tmp11_ = 0;
+	PhotoMetadataSetOption _tmp11_;
 #line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4180,7 +4180,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
 #line 4182 "PhotoMetadata.c"
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 			gchar* tag = NULL;
 #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
@@ -4189,7 +4189,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 #line 4189 "PhotoMetadata.c"
 			{
 				gboolean _tmp2_ = FALSE;
-				PhotoMetadataSetOption _tmp3_ = 0;
+				PhotoMetadataSetOption _tmp3_;
 #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp3_ = option;
 #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4198,9 +4198,9 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 					_tmp2_ = TRUE;
 #line 4199 "PhotoMetadata.c"
 				} else {
-					const gchar* _tmp4_ = NULL;
-					MetadataDomain _tmp5_ = 0;
-					gboolean _tmp6_ = FALSE;
+					const gchar* _tmp4_;
+					MetadataDomain _tmp5_;
+					gboolean _tmp6_;
 #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = tag;
 #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4214,9 +4214,9 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp2_) {
 #line 4216 "PhotoMetadata.c"
-					PhotoMetadataSetGenericValue _tmp7_ = NULL;
-					void* _tmp7__target = NULL;
-					const gchar* _tmp8_ = NULL;
+					PhotoMetadataSetGenericValue _tmp7_;
+					void* _tmp7__target;
+					const gchar* _tmp8_;
 #line 521 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = setter;
 #line 521 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4240,7 +4240,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp11_ == PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN) {
 #line 4242 "PhotoMetadata.c"
-		gboolean _tmp12_ = FALSE;
+		gboolean _tmp12_;
 #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = written;
 #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4254,8 +4254,8 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp10_) {
 #line 4256 "PhotoMetadata.c"
-		gchar** _tmp13_ = NULL;
-		gint _tmp13__length1 = 0;
+		gchar** _tmp13_;
+		gint _tmp13__length1;
 #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13_ = tags;
 #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4272,15 +4272,15 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 	if (_tmp9_) {
 #line 4273 "PhotoMetadata.c"
 		MetadataDomain default_domain = 0;
-		gchar** _tmp14_ = NULL;
-		gint _tmp14__length1 = 0;
-		const gchar* _tmp15_ = NULL;
-		MetadataDomain _tmp16_ = 0;
-		PhotoMetadataSetGenericValue _tmp17_ = NULL;
-		void* _tmp17__target = NULL;
-		gchar** _tmp18_ = NULL;
-		gint _tmp18__length1 = 0;
-		const gchar* _tmp19_ = NULL;
+		gchar** _tmp14_;
+		gint _tmp14__length1;
+		const gchar* _tmp15_;
+		MetadataDomain _tmp16_;
+		PhotoMetadataSetGenericValue _tmp17_;
+		void* _tmp17__target;
+		gchar** _tmp18_;
+		gint _tmp18__length1;
+		const gchar* _tmp19_;
 #line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp14_ = tags;
 #line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4316,19 +4316,19 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				while (TRUE) {
 #line 4318 "PhotoMetadata.c"
-					gint _tmp22_ = 0;
-					gchar** _tmp23_ = NULL;
-					gint _tmp23__length1 = 0;
-					gchar** _tmp24_ = NULL;
-					gint _tmp24__length1 = 0;
-					gint _tmp25_ = 0;
-					const gchar* _tmp26_ = NULL;
-					MetadataDomain _tmp27_ = 0;
-					MetadataDomain _tmp28_ = 0;
+					gint _tmp22_;
+					gchar** _tmp23_;
+					gint _tmp23__length1;
+					gchar** _tmp24_;
+					gint _tmp24__length1;
+					gint _tmp25_;
+					const gchar* _tmp26_;
+					MetadataDomain _tmp27_;
+					MetadataDomain _tmp28_;
 #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (!_tmp20_) {
 #line 4330 "PhotoMetadata.c"
-						gint _tmp21_ = 0;
+						gint _tmp21_;
 #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp21_ = ctr;
 #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4364,12 +4364,12 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 #line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (_tmp27_ == _tmp28_) {
 #line 4366 "PhotoMetadata.c"
-						PhotoMetadataSetGenericValue _tmp29_ = NULL;
-						void* _tmp29__target = NULL;
-						gchar** _tmp30_ = NULL;
-						gint _tmp30__length1 = 0;
-						gint _tmp31_ = 0;
-						const gchar* _tmp32_ = NULL;
+						PhotoMetadataSetGenericValue _tmp29_;
+						void* _tmp29__target;
+						gchar** _tmp30_;
+						gint _tmp30__length1;
+						gint _tmp31_;
+						const gchar* _tmp32_;
 #line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp29_ = setter;
 #line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4424,8 +4424,8 @@ static void block1_data_unref (void * _userdata_) {
 
 static void __lambda5_ (Block1Data* _data1_, const gchar* tag) {
 	PhotoMetadata* self;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 #line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = _data1_->self;
 #line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4449,11 +4449,11 @@ static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpoi
 
 void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_length1, const gchar* value, PhotoMetadataSetOption option) {
 	Block1Data* _data1_;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	PhotoMetadataSetOption _tmp3_ = 0;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
+	PhotoMetadataSetOption _tmp3_;
 #line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4488,7 +4488,7 @@ void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_
 }
 
 
-static void _vala_array_add45 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add45 (gchar** * array, int* length, int* size, gchar* value) {
 #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if ((*length) == (*size)) {
 #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4505,7 +4505,7 @@ static void _vala_array_add45 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add46 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add46 (gchar** * array, int* length, int* size, gchar* value) {
 #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if ((*length) == (*size)) {
 #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4524,18 +4524,18 @@ static void _vala_array_add46 (gchar*** array, int* length, int* size, gchar* va
 
 void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, GeeCollection* collection) {
 	gchar** values = NULL;
-	gchar** _tmp0_ = NULL;
-	gint values_length1 = 0;
-	gint _values_size_ = 0;
-	gchar** _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	gchar** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
-	GExiv2Metadata* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	gchar** _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
-	gboolean _tmp20_ = FALSE;
+	gchar** _tmp0_;
+	gint values_length1;
+	gint _values_size_;
+	gchar** _tmp15_;
+	gint _tmp15__length1;
+	gchar** _tmp16_;
+	gint _tmp16__length1;
+	GExiv2Metadata* _tmp17_;
+	const gchar* _tmp18_;
+	gchar** _tmp19_;
+	gint _tmp19__length1;
+	gboolean _tmp20_;
 #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4553,8 +4553,8 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 #line 4553 "PhotoMetadata.c"
 	{
 		GeeIterator* _value_it = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = collection;
 #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4564,15 +4564,15 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		while (TRUE) {
 #line 4566 "PhotoMetadata.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			gchar* value = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
 			gchar* prepped = NULL;
-			const gchar* _tmp7_ = NULL;
-			gchar* _tmp8_ = NULL;
-			const gchar* _tmp9_ = NULL;
+			const gchar* _tmp7_;
+			gchar* _tmp8_;
+			const gchar* _tmp9_;
 #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = _value_it;
 #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4600,10 +4600,10 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 #line 548 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			if (_tmp9_ != NULL) {
 #line 4602 "PhotoMetadata.c"
-				gchar** _tmp10_ = NULL;
-				gint _tmp10__length1 = 0;
-				const gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
+				gchar** _tmp10_;
+				gint _tmp10__length1;
+				const gchar* _tmp11_;
+				gchar* _tmp12_;
 #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp10_ = values;
 #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4616,8 +4616,8 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 				_vala_array_add45 (&values, &values_length1, &_values_size_, _tmp12_);
 #line 4617 "PhotoMetadata.c"
 			} else {
-				const gchar* _tmp13_ = NULL;
-				const gchar* _tmp14_ = NULL;
+				const gchar* _tmp13_;
+				const gchar* _tmp14_;
 #line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp13_ = value;
 #line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4667,10 +4667,10 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 #line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp20_) {
 #line 4669 "PhotoMetadata.c"
-		gchar** _tmp21_ = NULL;
-		gint _tmp21__length1 = 0;
-		const gchar* _tmp22_ = NULL;
-		const gchar* _tmp23_ = NULL;
+		gchar** _tmp21_;
+		gint _tmp21__length1;
+		const gchar* _tmp22_;
+		const gchar* _tmp23_;
 #line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp21_ = values;
 #line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4721,8 +4721,8 @@ static void block2_data_unref (void * _userdata_) {
 
 static void __lambda6_ (Block2Data* _data2_, const gchar* tag) {
 	PhotoMetadata* self;
-	const gchar* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	GeeCollection* _tmp1_;
 #line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = _data2_->self;
 #line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4746,11 +4746,11 @@ static void ___lambda6__photo_metadata_set_generic_value (const gchar* tag, gpoi
 
 void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags, int tags_length1, GeeCollection* values, PhotoMetadataSetOption option) {
 	Block2Data* _data2_;
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	PhotoMetadataSetOption _tmp3_ = 0;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp1_;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
+	PhotoMetadataSetOption _tmp3_;
 #line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4788,11 +4788,11 @@ void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags,
 gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong* value) {
 	glong _vala_value = 0L;
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GExiv2Metadata* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	glong _tmp4_ = 0L;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
+	GExiv2Metadata* _tmp2_;
+	const gchar* _tmp3_;
+	glong _tmp4_;
 #line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4842,8 +4842,8 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong*
 gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int tags_length1, glong* value) {
 	glong _vala_value = 0L;
 	gboolean result = FALSE;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
 #line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4863,7 +4863,7 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
 #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
 #line 4864 "PhotoMetadata.c"
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 			gchar* tag = NULL;
 #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
@@ -4871,9 +4871,9 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
 			tag = _tmp1_;
 #line 4871 "PhotoMetadata.c"
 			{
-				const gchar* _tmp2_ = NULL;
+				const gchar* _tmp2_;
 				glong _tmp3_ = 0L;
-				gboolean _tmp4_ = FALSE;
+				gboolean _tmp4_;
 #line 585 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
 #line 585 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4919,10 +4919,10 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
 
 
 void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value) {
-	GExiv2Metadata* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	glong _tmp2_ = 0L;
-	gboolean _tmp3_ = FALSE;
+	GExiv2Metadata* _tmp0_;
+	const gchar* _tmp1_;
+	glong _tmp2_;
+	gboolean _tmp3_;
 #line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4938,9 +4938,9 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value
 #line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp3_) {
 #line 4939 "PhotoMetadata.c"
-		const gchar* _tmp4_ = NULL;
-		glong _tmp5_ = 0L;
-		const gchar* _tmp6_ = NULL;
+		const gchar* _tmp4_;
+		glong _tmp5_;
+		const gchar* _tmp6_;
 #line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = tag;
 #line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4984,8 +4984,8 @@ static void block3_data_unref (void * _userdata_) {
 
 static void __lambda7_ (Block3Data* _data3_, const gchar* tag) {
 	PhotoMetadata* self;
-	const gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
+	const gchar* _tmp0_;
+	glong _tmp1_;
 #line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = _data3_->self;
 #line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5009,10 +5009,10 @@ static void ___lambda7__photo_metadata_set_generic_value (const gchar* tag, gpoi
 
 void photo_metadata_set_all_long (PhotoMetadata* self, gchar** tags, int tags_length1, glong value, PhotoMetadataSetOption option) {
 	Block3Data* _data3_;
-	glong _tmp0_ = 0L;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PhotoMetadataSetOption _tmp2_ = 0;
+	glong _tmp0_;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	PhotoMetadataSetOption _tmp2_;
 #line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5047,11 +5047,11 @@ gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, Met
 	gint numerator = 0;
 	gint denominator = 0;
 	gboolean _result_ = FALSE;
-	GExiv2Metadata* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	GExiv2Metadata* _tmp0_;
+	const gchar* _tmp1_;
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp4_;
 #line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5087,8 +5087,8 @@ gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, Met
 gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataRational* rational) {
 	MetadataRational _vala_rational = {0};
 	gboolean result = FALSE;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
 #line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5108,7 +5108,7 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
 #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
 #line 5108 "PhotoMetadata.c"
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 			gchar* tag = NULL;
 #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
@@ -5116,9 +5116,9 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
 			tag = _tmp1_;
 #line 5115 "PhotoMetadata.c"
 			{
-				const gchar* _tmp2_ = NULL;
+				const gchar* _tmp2_;
 				MetadataRational _tmp3_ = {0};
-				gboolean _tmp4_ = FALSE;
+				gboolean _tmp4_;
 #line 614 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
 #line 614 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5164,13 +5164,13 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
 
 
 void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, MetadataRational* rational) {
-	GExiv2Metadata* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	MetadataRational _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	MetadataRational _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	gboolean _tmp6_ = FALSE;
+	GExiv2Metadata* _tmp0_;
+	const gchar* _tmp1_;
+	MetadataRational _tmp2_;
+	gint _tmp3_;
+	MetadataRational _tmp4_;
+	gint _tmp5_;
+	gboolean _tmp6_;
 #line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5194,10 +5194,10 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat
 #line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp6_) {
 #line 5194 "PhotoMetadata.c"
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		const gchar* _tmp10_;
 #line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = tag;
 #line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5245,8 +5245,8 @@ static void block4_data_unref (void * _userdata_) {
 
 static void __lambda8_ (Block4Data* _data4_, const gchar* tag) {
 	PhotoMetadata* self;
-	const gchar* _tmp0_ = NULL;
-	MetadataRational _tmp1_ = {0};
+	const gchar* _tmp0_;
+	MetadataRational _tmp1_;
 #line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = _data4_->self;
 #line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5270,10 +5270,10 @@ static void ___lambda8__photo_metadata_set_generic_value (const gchar* tag, gpoi
 
 void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataRational* rational, PhotoMetadataSetOption option) {
 	Block4Data* _data4_;
-	MetadataRational _tmp0_ = {0};
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PhotoMetadataSetOption _tmp2_ = 0;
+	MetadataRational _tmp0_;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	PhotoMetadataSetOption _tmp2_;
 #line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5307,9 +5307,9 @@ void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tag
 MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar* tag) {
 	MetadataDateTime* result = NULL;
 	gchar* value = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 634 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
@@ -5334,8 +5334,8 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 #line 5331 "PhotoMetadata.c"
 	}
 	{
-		const gchar* _tmp3_ = NULL;
-		MetadataDomain _tmp4_ = 0;
+		const gchar* _tmp3_;
+		MetadataDomain _tmp4_;
 #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = tag;
 #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5347,9 +5347,9 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 #line 5344 "PhotoMetadata.c"
 			{
 				MetadataDateTime* _tmp5_ = NULL;
-				const gchar* _tmp6_ = NULL;
-				MetadataDateTime* _tmp7_ = NULL;
-				MetadataDateTime* _tmp8_ = NULL;
+				const gchar* _tmp6_;
+				MetadataDateTime* _tmp7_;
+				MetadataDateTime* _tmp8_;
 #line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp6_ = value;
 #line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5393,9 +5393,9 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 #line 5390 "PhotoMetadata.c"
 			{
 				MetadataDateTime* _tmp9_ = NULL;
-				const gchar* _tmp10_ = NULL;
-				MetadataDateTime* _tmp11_ = NULL;
-				MetadataDateTime* _tmp12_ = NULL;
+				const gchar* _tmp10_;
+				MetadataDateTime* _tmp11_;
+				MetadataDateTime* _tmp12_;
 #line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp10_ = value;
 #line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5427,10 +5427,10 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 	__catch26_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		GError* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
+		const gchar* _tmp13_;
+		const gchar* _tmp14_;
+		GError* _tmp15_;
+		const gchar* _tmp16_;
 #line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		err = _inner_error_;
 #line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5470,8 +5470,8 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 
 MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar** tags, int tags_length1) {
 	MetadataDateTime* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
 #line 660 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5491,7 +5491,7 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
 #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
 #line 5490 "PhotoMetadata.c"
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 			gchar* tag = NULL;
 #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
@@ -5500,9 +5500,9 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
 #line 5497 "PhotoMetadata.c"
 			{
 				MetadataDateTime* date_time = NULL;
-				const gchar* _tmp2_ = NULL;
-				MetadataDateTime* _tmp3_ = NULL;
-				MetadataDateTime* _tmp4_ = NULL;
+				const gchar* _tmp2_;
+				MetadataDateTime* _tmp3_;
+				MetadataDateTime* _tmp4_;
 #line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
 #line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5538,8 +5538,8 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
 
 
 void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, MetadataDateTime* date_time) {
-	const gchar* _tmp0_ = NULL;
-	MetadataDomain _tmp1_ = 0;
+	const gchar* _tmp0_;
+	MetadataDomain _tmp1_;
 #line 670 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 670 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5556,10 +5556,10 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
 		case METADATA_DOMAIN_EXIF:
 #line 5554 "PhotoMetadata.c"
 		{
-			const gchar* _tmp2_ = NULL;
-			MetadataDateTime* _tmp3_ = NULL;
-			gchar* _tmp4_ = NULL;
-			gchar* _tmp5_ = NULL;
+			const gchar* _tmp2_;
+			MetadataDateTime* _tmp3_;
+			gchar* _tmp4_;
+			gchar* _tmp5_;
 #line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp2_ = tag;
 #line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5580,10 +5580,10 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
 		case METADATA_DOMAIN_XMP:
 #line 5578 "PhotoMetadata.c"
 		{
-			const gchar* _tmp6_ = NULL;
-			MetadataDateTime* _tmp7_ = NULL;
-			gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
+			const gchar* _tmp6_;
+			MetadataDateTime* _tmp7_;
+			gchar* _tmp8_;
+			gchar* _tmp9_;
 #line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = tag;
 #line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5605,10 +5605,10 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
 		case METADATA_DOMAIN_IPTC:
 #line 5603 "PhotoMetadata.c"
 		{
-			const gchar* _tmp10_ = NULL;
-			const gchar* _tmp11_ = NULL;
-			const gchar* _tmp12_ = NULL;
-			MetadataDomain _tmp13_ = 0;
+			const gchar* _tmp10_;
+			const gchar* _tmp11_;
+			const gchar* _tmp12_;
+			MetadataDomain _tmp13_;
 			GEnumValue* _tmp14_;
 #line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp10_ = tag;
@@ -5669,8 +5669,8 @@ static void block5_data_unref (void * _userdata_) {
 
 static void __lambda9_ (Block5Data* _data5_, const gchar* tag) {
 	PhotoMetadata* self;
-	const gchar* _tmp0_ = NULL;
-	MetadataDateTime* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	MetadataDateTime* _tmp1_;
 #line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = _data5_->self;
 #line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5694,11 +5694,11 @@ static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, gpoi
 
 void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataDateTime* date_time, PhotoMetadataSetOption option) {
 	Block5Data* _data5_;
-	MetadataDateTime* _tmp0_ = NULL;
-	MetadataDateTime* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	PhotoMetadataSetOption _tmp3_ = 0;
+	MetadataDateTime* _tmp0_;
+	MetadataDateTime* _tmp1_;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
+	PhotoMetadataSetOption _tmp3_;
 #line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5735,28 +5735,28 @@ void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int ta
 
 guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_preview, int* result_length1) {
 	guint8* result = NULL;
-	ExifData* _tmp0_ = NULL;
+	ExifData* _tmp0_;
 	guchar* thumbnail = NULL;
-	ExifData* _tmp2_ = NULL;
-	guchar* _tmp3_ = NULL;
+	ExifData* _tmp2_;
+	guchar* _tmp3_;
 	guint thumbnail_size = 0U;
-	ExifData* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	gboolean _tmp6_ = FALSE;
+	ExifData* _tmp4_;
+	guint _tmp5_;
+	gboolean _tmp6_;
 	guint8* flattened = NULL;
-	gint flattened_length1 = 0;
-	gint _flattened_size_ = 0;
+	gint flattened_length1;
+	gint _flattened_size_;
 	guchar* saved_data = NULL;
 	guint saved_size = 0U;
-	ExifData* _tmp9_ = NULL;
+	ExifData* _tmp9_;
 	gboolean _tmp10_ = FALSE;
-	guint _tmp11_ = 0U;
-	ExifData* _tmp21_ = NULL;
-	guchar* _tmp22_ = NULL;
-	ExifData* _tmp23_ = NULL;
-	guint _tmp24_ = 0U;
-	guint8* _tmp25_ = NULL;
-	gint _tmp25__length1 = 0;
+	guint _tmp11_;
+	ExifData* _tmp21_;
+	guchar* _tmp22_;
+	ExifData* _tmp23_;
+	guint _tmp24_;
+	guint8* _tmp25_;
+	gint _tmp25__length1;
 #line 694 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 695 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5764,8 +5764,8 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 #line 695 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ == NULL) {
 #line 5762 "PhotoMetadata.c"
-		guint8* _tmp1_ = NULL;
-		gint _tmp1__length1 = 0;
+		guint8* _tmp1_;
+		gint _tmp1__length1;
 #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = NULL;
 #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5799,8 +5799,8 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 #line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp6_) {
 #line 5797 "PhotoMetadata.c"
-		ExifData* _tmp7_ = NULL;
-		ExifData* _tmp8_ = NULL;
+		ExifData* _tmp7_;
+		ExifData* _tmp8_;
 #line 703 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = self->priv->exif;
 #line 703 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5830,7 +5830,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp11_ > ((guint) 0)) {
 #line 5828 "PhotoMetadata.c"
-		guchar* _tmp12_ = NULL;
+		guchar* _tmp12_;
 #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = saved_data;
 #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5844,15 +5844,15 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp10_) {
 #line 5842 "PhotoMetadata.c"
-		guint _tmp13_ = 0U;
-		guint8* _tmp14_ = NULL;
-		guint8* _tmp15_ = NULL;
-		gint _tmp15__length1 = 0;
-		guchar* _tmp16_ = NULL;
-		guint _tmp17_ = 0U;
-		ExifMem* _tmp18_ = NULL;
-		ExifMem* _tmp19_ = NULL;
-		guchar* _tmp20_ = NULL;
+		guint _tmp13_;
+		guint8* _tmp14_;
+		guint8* _tmp15_;
+		gint _tmp15__length1;
+		guchar* _tmp16_;
+		guint _tmp17_;
+		ExifMem* _tmp18_;
+		ExifMem* _tmp19_;
+		guchar* _tmp20_;
 #line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13_ = saved_size;
 #line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5932,14 +5932,14 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
 	guchar* _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
 	gint __tmp0__size_ = 0;
-	GExiv2Metadata* _tmp1_ = NULL;
+	GExiv2Metadata* _tmp1_;
 	guint8* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gboolean _tmp4_ = FALSE;
-	guint8* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	guint8* _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
+	gint _tmp3_;
+	gboolean _tmp4_;
+	guint8* _tmp6_;
+	gint _tmp6__length1;
+	guint8* _tmp7_;
+	gint _tmp7__length1;
 #line 728 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5957,8 +5957,8 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
 #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_) {
 #line 5955 "PhotoMetadata.c"
-		guchar* _tmp5_ = NULL;
-		gint _tmp5__length1 = 0;
+		guchar* _tmp5_;
+		gint _tmp5__length1;
 #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = buffer;
 #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6006,14 +6006,14 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
 guint photo_metadata_get_preview_count (PhotoMetadata* self) {
 	guint result = 0U;
 	GExiv2PreviewProperties** props = NULL;
-	GExiv2Metadata* _tmp0_ = NULL;
-	GExiv2PreviewProperties** _tmp1_ = NULL;
-	GExiv2PreviewProperties** _tmp2_ = NULL;
-	gint props_length1 = 0;
-	gint _props_size_ = 0;
+	GExiv2Metadata* _tmp0_;
+	GExiv2PreviewProperties** _tmp1_;
+	GExiv2PreviewProperties** _tmp2_;
+	gint props_length1;
+	gint _props_size_;
 	gint _tmp3_ = 0;
-	GExiv2PreviewProperties** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
+	GExiv2PreviewProperties** _tmp4_;
+	gint _tmp4__length1;
 #line 733 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), 0U);
 #line 734 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6033,8 +6033,8 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) {
 #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ != NULL) {
 #line 6031 "PhotoMetadata.c"
-		GExiv2PreviewProperties** _tmp5_ = NULL;
-		gint _tmp5__length1 = 0;
+		GExiv2PreviewProperties** _tmp5_;
+		gint _tmp5__length1;
 #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = props;
 #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6058,21 +6058,21 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) {
 PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
 	PhotoPreview* result = NULL;
 	GExiv2PreviewProperties** props = NULL;
-	GExiv2Metadata* _tmp0_ = NULL;
-	GExiv2PreviewProperties** _tmp1_ = NULL;
-	GExiv2PreviewProperties** _tmp2_ = NULL;
-	gint props_length1 = 0;
-	gint _props_size_ = 0;
+	GExiv2Metadata* _tmp0_;
+	GExiv2PreviewProperties** _tmp1_;
+	GExiv2PreviewProperties** _tmp2_;
+	gint props_length1;
+	gint _props_size_;
 	gboolean _tmp3_ = FALSE;
-	GExiv2PreviewProperties** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	const gchar* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
-	GExiv2PreviewProperties** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	guint _tmp10_ = 0U;
-	GExiv2PreviewProperties* _tmp11_ = NULL;
-	PhotoMetadataInternalPhotoPreview* _tmp12_ = NULL;
+	GExiv2PreviewProperties** _tmp4_;
+	gint _tmp4__length1;
+	const gchar* _tmp7_;
+	guint _tmp8_;
+	GExiv2PreviewProperties** _tmp9_;
+	gint _tmp9__length1;
+	guint _tmp10_;
+	GExiv2PreviewProperties* _tmp11_;
+	PhotoMetadataInternalPhotoPreview* _tmp12_;
 #line 740 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6095,9 +6095,9 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
 		_tmp3_ = TRUE;
 #line 6092 "PhotoMetadata.c"
 	} else {
-		GExiv2PreviewProperties** _tmp5_ = NULL;
-		gint _tmp5__length1 = 0;
-		guint _tmp6_ = 0U;
+		GExiv2PreviewProperties** _tmp5_;
+		gint _tmp5__length1;
+		guint _tmp6_;
 #line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = props;
 #line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6139,8 +6139,8 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
 
 
 void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) {
-	GExiv2Metadata* _tmp0_ = NULL;
-	ExifData* _tmp1_ = NULL;
+	GExiv2Metadata* _tmp0_;
+	ExifData* _tmp1_;
 #line 748 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 749 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6152,12 +6152,12 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) {
 #line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp1_ != NULL) {
 #line 6150 "PhotoMetadata.c"
-		ExifMem* _tmp2_ = NULL;
-		ExifMem* _tmp3_ = NULL;
-		ExifData* _tmp4_ = NULL;
-		guchar* _tmp5_ = NULL;
-		ExifData* _tmp6_ = NULL;
-		ExifData* _tmp7_ = NULL;
+		ExifMem* _tmp2_;
+		ExifMem* _tmp3_;
+		ExifData* _tmp4_;
+		guchar* _tmp5_;
+		ExifData* _tmp6_;
+		ExifData* _tmp7_;
 #line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = exif_mem_new_default ();
 #line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6184,8 +6184,8 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) {
 
 
 void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag) {
-	GExiv2Metadata* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	GExiv2Metadata* _tmp0_;
+	const gchar* _tmp1_;
 #line 757 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 757 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6201,8 +6201,8 @@ void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag) {
 
 
 void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_length1) {
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
 #line 761 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6222,7 +6222,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
 #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
 #line 6220 "PhotoMetadata.c"
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 			gchar* tag = NULL;
 #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
@@ -6230,7 +6230,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
 			tag = _tmp1_;
 #line 6227 "PhotoMetadata.c"
 			{
-				const gchar* _tmp2_ = NULL;
+				const gchar* _tmp2_;
 #line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
 #line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6245,7 +6245,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
 
 
 void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
-	MetadataDomain _tmp0_ = 0;
+	MetadataDomain _tmp0_;
 #line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6256,7 +6256,7 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
 		case METADATA_DOMAIN_EXIF:
 #line 6253 "PhotoMetadata.c"
 		{
-			GExiv2Metadata* _tmp1_ = NULL;
+			GExiv2Metadata* _tmp1_;
 #line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = self->priv->exiv2;
 #line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6269,7 +6269,7 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
 		case METADATA_DOMAIN_XMP:
 #line 6266 "PhotoMetadata.c"
 		{
-			GExiv2Metadata* _tmp2_ = NULL;
+			GExiv2Metadata* _tmp2_;
 #line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp2_ = self->priv->exiv2;
 #line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6282,7 +6282,7 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
 		case METADATA_DOMAIN_IPTC:
 #line 6279 "PhotoMetadata.c"
 		{
-			GExiv2Metadata* _tmp3_ = NULL;
+			GExiv2Metadata* _tmp3_;
 #line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = self->priv->exiv2;
 #line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6300,7 +6300,7 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
 
 
 void photo_metadata_clear (PhotoMetadata* self) {
-	GExiv2Metadata* _tmp0_ = NULL;
+	GExiv2Metadata* _tmp0_;
 #line 782 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6313,9 +6313,9 @@ void photo_metadata_clear (PhotoMetadata* self) {
 
 MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self) {
 	MetadataDateTime* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	MetadataDateTime* _tmp1_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	MetadataDateTime* _tmp1_;
 #line 793 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6333,7 +6333,7 @@ MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self
 
 
 void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) {
-	MetadataDateTime* _tmp0_ = NULL;
+	MetadataDateTime* _tmp0_;
 #line 797 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 797 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6343,10 +6343,10 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
 #line 799 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
 #line 6341 "PhotoMetadata.c"
-		gchar** _tmp1_ = NULL;
-		gint _tmp1__length1 = 0;
-		MetadataDateTime* _tmp2_ = NULL;
-		PhotoMetadataSetOption _tmp3_ = 0;
+		gchar** _tmp1_;
+		gint _tmp1__length1;
+		MetadataDateTime* _tmp2_;
+		PhotoMetadataSetOption _tmp3_;
 #line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = photo_metadata_DATE_TIME_TAGS;
 #line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6359,8 +6359,8 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
 		photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
 #line 6356 "PhotoMetadata.c"
 	} else {
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
+		gchar** _tmp4_;
+		gint _tmp4__length1;
 #line 802 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = photo_metadata_DATE_TIME_TAGS;
 #line 802 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6374,9 +6374,9 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
 
 MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self) {
 	MetadataDateTime* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	MetadataDateTime* _tmp1_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	MetadataDateTime* _tmp1_;
 #line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6394,7 +6394,7 @@ MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self) {
 
 
 void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) {
-	MetadataDateTime* _tmp0_ = NULL;
+	MetadataDateTime* _tmp0_;
 #line 818 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 818 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6404,10 +6404,10 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
 #line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
 #line 6402 "PhotoMetadata.c"
-		gchar** _tmp1_ = NULL;
-		gint _tmp1__length1 = 0;
-		MetadataDateTime* _tmp2_ = NULL;
-		PhotoMetadataSetOption _tmp3_ = 0;
+		gchar** _tmp1_;
+		gint _tmp1__length1;
+		MetadataDateTime* _tmp2_;
+		PhotoMetadataSetOption _tmp3_;
 #line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS;
 #line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6420,8 +6420,8 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
 		photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
 #line 6417 "PhotoMetadata.c"
 	} else {
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
+		gchar** _tmp4_;
+		gint _tmp4__length1;
 #line 823 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS;
 #line 823 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6435,9 +6435,9 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
 
 MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self) {
 	MetadataDateTime* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	MetadataDateTime* _tmp1_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	MetadataDateTime* _tmp1_;
 #line 831 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6455,7 +6455,7 @@ MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self) {
 
 
 void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) {
-	MetadataDateTime* _tmp0_ = NULL;
+	MetadataDateTime* _tmp0_;
 #line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6465,10 +6465,10 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi
 #line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
 #line 6463 "PhotoMetadata.c"
-		gchar** _tmp1_ = NULL;
-		gint _tmp1__length1 = 0;
-		MetadataDateTime* _tmp2_ = NULL;
-		PhotoMetadataSetOption _tmp3_ = 0;
+		gchar** _tmp1_;
+		gint _tmp1__length1;
+		MetadataDateTime* _tmp2_;
+		PhotoMetadataSetOption _tmp3_;
 #line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS;
 #line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6481,8 +6481,8 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi
 		photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
 #line 6478 "PhotoMetadata.c"
 	} else {
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
+		gchar** _tmp4_;
+		gint _tmp4__length1;
 #line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS;
 #line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6498,8 +6498,8 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada
 	PhotoMetadata * self;
 	MetadataDateTime* result = NULL;
 	MetadataDateTime* creation = NULL;
-	MetadataDateTime* _tmp0_ = NULL;
-	MetadataDateTime* _tmp1_ = NULL;
+	MetadataDateTime* _tmp0_;
+	MetadataDateTime* _tmp1_;
 #line 843 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata);
 #line 844 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6511,7 +6511,7 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada
 #line 845 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp1_ == NULL) {
 #line 6509 "PhotoMetadata.c"
-		MetadataDateTime* _tmp2_ = NULL;
+		MetadataDateTime* _tmp2_;
 #line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = photo_metadata_get_digitized_date_time (self);
 #line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6537,10 +6537,10 @@ static gpointer _dimensions_dup0 (gpointer self) {
 
 Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 	Dimensions* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
 #line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6566,31 +6566,31 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			while (TRUE) {
 #line 6564 "PhotoMetadata.c"
-				gint _tmp4_ = 0;
-				gchar** _tmp5_ = NULL;
-				gint _tmp5__length1 = 0;
+				gint _tmp4_;
+				gchar** _tmp5_;
+				gint _tmp5__length1;
 				glong width = 0L;
-				gchar** _tmp6_ = NULL;
-				gint _tmp6__length1 = 0;
-				gint _tmp7_ = 0;
-				const gchar* _tmp8_ = NULL;
+				gchar** _tmp6_;
+				gint _tmp6__length1;
+				gint _tmp7_;
+				const gchar* _tmp8_;
 				glong _tmp9_ = 0L;
-				gboolean _tmp10_ = FALSE;
+				gboolean _tmp10_;
 				glong height = 0L;
-				gchar** _tmp11_ = NULL;
-				gint _tmp11__length1 = 0;
-				gint _tmp12_ = 0;
-				const gchar* _tmp13_ = NULL;
+				gchar** _tmp11_;
+				gint _tmp11__length1;
+				gint _tmp12_;
+				const gchar* _tmp13_;
 				glong _tmp14_ = 0L;
-				gboolean _tmp15_ = FALSE;
-				glong _tmp16_ = 0L;
-				glong _tmp17_ = 0L;
+				gboolean _tmp15_;
+				glong _tmp16_;
+				glong _tmp17_;
 				Dimensions _tmp18_ = {0};
-				Dimensions* _tmp19_ = NULL;
+				Dimensions* _tmp19_;
 #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp2_) {
 #line 6588 "PhotoMetadata.c"
-					gint _tmp3_ = 0;
+					gint _tmp3_;
 #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp3_ = ctr;
 #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6672,7 +6672,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 
 
 void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, PhotoMetadataSetOption option) {
-	Dimensions* _tmp0_ = NULL;
+	Dimensions* _tmp0_;
 #line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6680,16 +6680,16 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
 #line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
 #line 6678 "PhotoMetadata.c"
-		gchar** _tmp1_ = NULL;
-		gint _tmp1__length1 = 0;
-		Dimensions* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		PhotoMetadataSetOption _tmp4_ = 0;
-		gchar** _tmp5_ = NULL;
-		gint _tmp5__length1 = 0;
-		Dimensions* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		PhotoMetadataSetOption _tmp8_ = 0;
+		gchar** _tmp1_;
+		gint _tmp1__length1;
+		Dimensions* _tmp2_;
+		gint _tmp3_;
+		PhotoMetadataSetOption _tmp4_;
+		gchar** _tmp5_;
+		gint _tmp5__length1;
+		Dimensions* _tmp6_;
+		gint _tmp7_;
+		PhotoMetadataSetOption _tmp8_;
 #line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = photo_metadata_WIDTH_TAGS;
 #line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6716,10 +6716,10 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
 		photo_metadata_set_all_long (self, _tmp5_, _tmp5__length1, (glong) _tmp7_, _tmp8_);
 #line 6713 "PhotoMetadata.c"
 	} else {
-		gchar** _tmp9_ = NULL;
-		gint _tmp9__length1 = 0;
-		gchar** _tmp10_ = NULL;
-		gint _tmp10__length1 = 0;
+		gchar** _tmp9_;
+		gint _tmp9__length1;
+		gchar** _tmp10_;
+		gint _tmp10__length1;
 #line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = photo_metadata_WIDTH_TAGS;
 #line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6740,21 +6740,21 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
 static gchar* string_strip (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 6755 "PhotoMetadata.c"
 }
@@ -6762,19 +6762,19 @@ static gchar* string_strip (const gchar* self) {
 
 static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 6775 "PhotoMetadata.c"
 }
@@ -6784,21 +6784,21 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 	PhotoMetadata * self;
 	gchar* result = NULL;
 	GeeList* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	GeeList* titles = NULL;
-	GeeList* _tmp5_ = NULL;
+	GeeList* _tmp5_;
 	gchar* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-	GeeList* _tmp8_ = NULL;
+	GeeList* _tmp8_;
 	gchar* title = NULL;
-	gchar* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
+	gchar* _tmp14_;
+	const gchar* _tmp15_;
 	const gchar* _tmp18_ = NULL;
 	gboolean _tmp19_ = FALSE;
 	gboolean _tmp20_ = FALSE;
-	const gchar* _tmp21_ = NULL;
-	gboolean _tmp22_ = FALSE;
-	gchar* _tmp28_ = NULL;
+	const gchar* _tmp21_;
+	gboolean _tmp22_;
+	gchar* _tmp28_;
 #line 925 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata);
 #line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6806,7 +6806,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 #line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp1_) {
 #line 6804 "PhotoMetadata.c"
-		GeeList* _tmp2_ = NULL;
+		GeeList* _tmp2_;
 #line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = photo_metadata_get_string_multiple (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
 #line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6815,9 +6815,9 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 		_tmp0_ = _tmp2_;
 #line 6812 "PhotoMetadata.c"
 	} else {
-		gchar** _tmp3_ = NULL;
-		gint _tmp3__length1 = 0;
-		GeeList* _tmp4_ = NULL;
+		gchar** _tmp3_;
+		gint _tmp3__length1;
+		GeeList* _tmp4_;
 #line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = photo_metadata_STANDARD_TITLE_TAGS;
 #line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6839,9 +6839,9 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp8_ != NULL) {
 #line 6837 "PhotoMetadata.c"
-		GeeList* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
+		GeeList* _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
 #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = titles;
 #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6859,8 +6859,8 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp7_) {
 #line 6857 "PhotoMetadata.c"
-		GeeList* _tmp12_ = NULL;
-		gpointer _tmp13_ = NULL;
+		GeeList* _tmp12_;
+		gpointer _tmp13_;
 #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = titles;
 #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6886,8 +6886,8 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 #line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp15_ != NULL) {
 #line 6884 "PhotoMetadata.c"
-		const gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
+		const gchar* _tmp16_;
+		gchar* _tmp17_;
 #line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp16_ = title;
 #line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6905,8 +6905,8 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp22_) {
 #line 6903 "PhotoMetadata.c"
-		const gchar* _tmp23_ = NULL;
-		gboolean _tmp24_ = FALSE;
+		const gchar* _tmp23_;
+		gboolean _tmp24_;
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp23_ = title;
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6922,8 +6922,8 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp20_) {
 #line 6920 "PhotoMetadata.c"
-		const gchar* _tmp25_ = NULL;
-		gboolean _tmp26_ = FALSE;
+		const gchar* _tmp25_;
+		gboolean _tmp26_;
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp25_ = title;
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6939,7 +6939,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp19_) {
 #line 6937 "PhotoMetadata.c"
-		const gchar* _tmp27_ = NULL;
+		const gchar* _tmp27_;
 #line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp27_ = title;
 #line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6969,8 +6969,8 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 
 
 void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMetadataSetOption option) {
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 #line 951 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 952 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6980,23 +6980,23 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
 #line 952 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp1_) {
 #line 6978 "PhotoMetadata.c"
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 953 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
 #line 953 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (_tmp2_) {
 #line 6984 "PhotoMetadata.c"
-			const gchar* _tmp3_ = NULL;
+			const gchar* _tmp3_;
 #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = title;
 #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			photo_metadata_set_string (self, PHOTO_METADATA_IPHOTO_TITLE_TAG, _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
 #line 6990 "PhotoMetadata.c"
 		} else {
-			gchar** _tmp4_ = NULL;
-			gint _tmp4__length1 = 0;
-			const gchar* _tmp5_ = NULL;
-			PhotoMetadataSetOption _tmp6_ = 0;
+			gchar** _tmp4_;
+			gint _tmp4__length1;
+			const gchar* _tmp5_;
+			PhotoMetadataSetOption _tmp6_;
 #line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4_ = photo_metadata_STANDARD_TITLE_TAGS;
 #line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7010,8 +7010,8 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
 #line 7006 "PhotoMetadata.c"
 		}
 	} else {
-		gchar** _tmp7_ = NULL;
-		gint _tmp7__length1 = 0;
+		gchar** _tmp7_;
+		gint _tmp7__length1;
 #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = photo_metadata_STANDARD_TITLE_TAGS;
 #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7026,9 +7026,9 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
 static gchar* photo_metadata_real_get_comment (MediaMetadata* base) {
 	PhotoMetadata * self;
 	gchar* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar* _tmp1_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar* _tmp1_;
 #line 967 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata);
 #line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7076,8 +7076,8 @@ static void block6_data_unref (void * _userdata_) {
 
 static void ___lambda10_ (Block6Data* _data6_, const gchar* tag) {
 	PhotoMetadata* self;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 #line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = _data6_->self;
 #line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7101,10 +7101,10 @@ static void ____lambda10__photo_metadata_set_generic_value (const gchar* tag, gp
 
 void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, PhotoMetadataSetOption option) {
 	Block6Data* _data6_;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 #line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7128,9 +7128,9 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, Phot
 #line 975 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp3_) {
 #line 7126 "PhotoMetadata.c"
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
-		PhotoMetadataSetOption _tmp5_ = 0;
+		gchar** _tmp4_;
+		gint _tmp4__length1;
+		PhotoMetadataSetOption _tmp5_;
 #line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = photo_metadata_COMMENT_TAGS;
 #line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7141,8 +7141,8 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, Phot
 		photo_metadata_set_all_generic (self, _tmp4_, _tmp4__length1, _tmp5_, ____lambda10__photo_metadata_set_generic_value, _data6_);
 #line 7138 "PhotoMetadata.c"
 	} else {
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
+		gchar** _tmp6_;
+		gint _tmp6__length1;
 #line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = photo_metadata_COMMENT_TAGS;
 #line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7162,12 +7162,12 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, Phot
 GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) {
 	GeeSet* result = NULL;
 	GeeSet* keywords = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
 	GeeSet* _tmp22_ = NULL;
 	gboolean _tmp23_ = FALSE;
-	GeeSet* _tmp24_ = NULL;
-	GeeSet* _tmp29_ = NULL;
+	GeeSet* _tmp24_;
+	GeeSet* _tmp29_;
 #line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7189,7 +7189,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 #line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
 #line 7187 "PhotoMetadata.c"
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 			gchar* tag = NULL;
 #line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
@@ -7198,10 +7198,10 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 #line 7194 "PhotoMetadata.c"
 			{
 				GeeCollection* values = NULL;
-				const gchar* _tmp2_ = NULL;
-				GeeList* _tmp3_ = NULL;
+				const gchar* _tmp2_;
+				GeeList* _tmp3_;
 				gboolean _tmp4_ = FALSE;
-				GeeCollection* _tmp5_ = NULL;
+				GeeCollection* _tmp5_;
 #line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
 #line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7213,9 +7213,9 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 #line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp5_ != NULL) {
 #line 7211 "PhotoMetadata.c"
-					GeeCollection* _tmp6_ = NULL;
-					gint _tmp7_ = 0;
-					gint _tmp8_ = 0;
+					GeeCollection* _tmp6_;
+					gint _tmp7_;
+					gint _tmp8_;
 #line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp6_ = values;
 #line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7233,16 +7233,16 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 #line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_) {
 #line 7231 "PhotoMetadata.c"
-					GeeSet* _tmp9_ = NULL;
+					GeeSet* _tmp9_;
 #line 1006 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp9_ = keywords;
 #line 1006 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (_tmp9_ == NULL) {
 #line 7237 "PhotoMetadata.c"
-						GCompareDataFunc _tmp10_ = NULL;
-						void* _tmp10__target = NULL;
-						GDestroyNotify _tmp10__target_destroy_notify = NULL;
-						GeeSet* _tmp11_ = NULL;
+						GCompareDataFunc _tmp10_;
+						void* _tmp10__target;
+						GDestroyNotify _tmp10__target_destroy_notify;
+						GeeSet* _tmp11_;
 #line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp10_ = compare_func;
 #line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7265,8 +7265,8 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 					}
 					{
 						GeeIterator* _current_value_it = NULL;
-						GeeCollection* _tmp12_ = NULL;
-						GeeIterator* _tmp13_ = NULL;
+						GeeCollection* _tmp12_;
+						GeeIterator* _tmp13_;
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp12_ = values;
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7276,15 +7276,15 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						while (TRUE) {
 #line 7274 "PhotoMetadata.c"
-							GeeIterator* _tmp14_ = NULL;
-							gboolean _tmp15_ = FALSE;
+							GeeIterator* _tmp14_;
+							gboolean _tmp15_;
 							gchar* current_value = NULL;
-							GeeIterator* _tmp16_ = NULL;
-							gpointer _tmp17_ = NULL;
-							GeeSet* _tmp18_ = NULL;
-							const gchar* _tmp19_ = NULL;
-							gchar* _tmp20_ = NULL;
-							gchar* _tmp21_ = NULL;
+							GeeIterator* _tmp16_;
+							gpointer _tmp17_;
+							GeeSet* _tmp18_;
+							const gchar* _tmp19_;
+							gchar* _tmp20_;
+							gchar* _tmp21_;
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp14_ = _current_value_it;
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7335,9 +7335,9 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 #line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp24_ != NULL) {
 #line 7333 "PhotoMetadata.c"
-		GeeSet* _tmp25_ = NULL;
-		gint _tmp26_ = 0;
-		gint _tmp27_ = 0;
+		GeeSet* _tmp25_;
+		gint _tmp26_;
+		gint _tmp27_;
 #line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp25_ = keywords;
 #line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7355,7 +7355,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 #line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp23_) {
 #line 7353 "PhotoMetadata.c"
-		GeeSet* _tmp28_ = NULL;
+		GeeSet* _tmp28_;
 #line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp28_ = keywords;
 #line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7395,120 +7395,162 @@ static gpointer _hierarchical_keyword_field_ref0 (gpointer self) {
 
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 7401 "PhotoMetadata.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 7407 "PhotoMetadata.c"
+	} else {
+		const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 7414 "PhotoMetadata.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = TRUE;
+#line 7420 "PhotoMetadata.c"
+	} else {
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 7430 "PhotoMetadata.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 7434 "PhotoMetadata.c"
+		gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 7442 "PhotoMetadata.c"
+	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GRegex* _tmp9_;
+		GRegex* _tmp10_;
+		gchar* _tmp11_ = NULL;
+		GRegex* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 7432 "PhotoMetadata.c"
+#line 7474 "PhotoMetadata.c"
 				goto __catch27_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 7441 "PhotoMetadata.c"
+#line 7483 "PhotoMetadata.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 7457 "PhotoMetadata.c"
+#line 7499 "PhotoMetadata.c"
 				goto __catch27_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 7468 "PhotoMetadata.c"
+#line 7510 "PhotoMetadata.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 7482 "PhotoMetadata.c"
+#line 7524 "PhotoMetadata.c"
 	}
 	goto __finally27;
 	__catch27_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 7496 "PhotoMetadata.c"
+#line 7538 "PhotoMetadata.c"
 	}
 	__finally27:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 7507 "PhotoMetadata.c"
+#line 7549 "PhotoMetadata.c"
 	}
 }
 
@@ -7516,43 +7558,43 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 7531 "PhotoMetadata.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 7573 "PhotoMetadata.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 7539 "PhotoMetadata.c"
+#line 7581 "PhotoMetadata.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 7551 "PhotoMetadata.c"
+#line 7593 "PhotoMetadata.c"
 	}
 }
 
@@ -7561,132 +7603,132 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 7575 "PhotoMetadata.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 7617 "PhotoMetadata.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 7581 "PhotoMetadata.c"
+#line 7623 "PhotoMetadata.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 7585 "PhotoMetadata.c"
+#line 7627 "PhotoMetadata.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 7589 "PhotoMetadata.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 7631 "PhotoMetadata.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 7601 "PhotoMetadata.c"
+#line 7643 "PhotoMetadata.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 7611 "PhotoMetadata.c"
+#line 7653 "PhotoMetadata.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 7617 "PhotoMetadata.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 7659 "PhotoMetadata.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 7631 "PhotoMetadata.c"
+#line 7673 "PhotoMetadata.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 7641 "PhotoMetadata.c"
+#line 7683 "PhotoMetadata.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 7647 "PhotoMetadata.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 7689 "PhotoMetadata.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 7656 "PhotoMetadata.c"
+#line 7698 "PhotoMetadata.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 7676 "PhotoMetadata.c"
+#line 7718 "PhotoMetadata.c"
 }
 
 
 static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* self, HierarchicalTagIndex* index) {
-	HierarchicalKeywordField** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	HierarchicalTagIndex* _tmp4_ = NULL;
-	HierarchicalKeywordField** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
+	HierarchicalKeywordField** _tmp0_;
+	gint _tmp0__length1;
+	HierarchicalTagIndex* _tmp4_;
+	HierarchicalKeywordField** _tmp5_;
+	gint _tmp5__length1;
 #line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7695,7 +7737,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 	_tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
 #line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 7694 "PhotoMetadata.c"
+#line 7736 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** current_field_collection = NULL;
 		gint current_field_collection_length1 = 0;
@@ -7707,17 +7749,17 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 		current_field_collection_length1 = _tmp0__length1;
 #line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (current_field_it = 0; current_field_it < _tmp0__length1; current_field_it = current_field_it + 1) {
-#line 7706 "PhotoMetadata.c"
-			HierarchicalKeywordField* _tmp1_ = NULL;
+#line 7748 "PhotoMetadata.c"
+			HierarchicalKeywordField* _tmp1_;
 			HierarchicalKeywordField* current_field = NULL;
 #line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]);
 #line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			current_field = _tmp1_;
-#line 7713 "PhotoMetadata.c"
+#line 7755 "PhotoMetadata.c"
 			{
-				HierarchicalKeywordField* _tmp2_ = NULL;
-				const gchar* _tmp3_ = NULL;
+				HierarchicalKeywordField* _tmp2_;
+				const gchar* _tmp3_;
 #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = current_field;
 #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7726,7 +7768,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 				photo_metadata_remove_tag (self, _tmp3_);
 #line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (current_field);
-#line 7725 "PhotoMetadata.c"
+#line 7767 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -7736,13 +7778,13 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 	if (_tmp4_ == NULL) {
 #line 1022 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 7735 "PhotoMetadata.c"
+#line 7777 "PhotoMetadata.c"
 	}
 #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
 #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 7741 "PhotoMetadata.c"
+#line 7783 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** current_field_collection = NULL;
 		gint current_field_collection_length1 = 0;
@@ -7754,22 +7796,22 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 		current_field_collection_length1 = _tmp5__length1;
 #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (current_field_it = 0; current_field_it < _tmp5__length1; current_field_it = current_field_it + 1) {
-#line 7753 "PhotoMetadata.c"
-			HierarchicalKeywordField* _tmp6_ = NULL;
+#line 7795 "PhotoMetadata.c"
+			HierarchicalKeywordField* _tmp6_;
 			HierarchicalKeywordField* current_field = NULL;
 #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]);
 #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			current_field = _tmp6_;
-#line 7760 "PhotoMetadata.c"
+#line 7802 "PhotoMetadata.c"
 			{
-				HierarchicalKeywordField* _tmp7_ = NULL;
-				gboolean _tmp8_ = FALSE;
+				HierarchicalKeywordField* _tmp7_;
+				gboolean _tmp8_;
 				GeeSet* writeable_set = NULL;
-				GeeTreeSet* _tmp9_ = NULL;
-				HierarchicalKeywordField* _tmp29_ = NULL;
-				const gchar* _tmp30_ = NULL;
-				GeeSet* _tmp31_ = NULL;
+				GeeTreeSet* _tmp9_;
+				HierarchicalKeywordField* _tmp29_;
+				const gchar* _tmp30_;
+				GeeSet* _tmp31_;
 #line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp7_ = current_field;
 #line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7780,20 +7822,20 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 					_hierarchical_keyword_field_unref0 (current_field);
 #line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 7779 "PhotoMetadata.c"
+#line 7821 "PhotoMetadata.c"
 				}
 #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp9_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				writeable_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_SET, GeeSet);
-#line 7785 "PhotoMetadata.c"
+#line 7827 "PhotoMetadata.c"
 				{
 					GeeIterator* _current_path_it = NULL;
-					HierarchicalTagIndex* _tmp10_ = NULL;
-					GeeCollection* _tmp11_ = NULL;
-					GeeCollection* _tmp12_ = NULL;
-					GeeIterator* _tmp13_ = NULL;
-					GeeIterator* _tmp14_ = NULL;
+					HierarchicalTagIndex* _tmp10_;
+					GeeCollection* _tmp11_;
+					GeeCollection* _tmp12_;
+					GeeIterator* _tmp13_;
+					GeeIterator* _tmp14_;
 #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp10_ = index;
 #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7810,21 +7852,21 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 					_current_path_it = _tmp14_;
 #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					while (TRUE) {
-#line 7809 "PhotoMetadata.c"
-						GeeIterator* _tmp15_ = NULL;
-						gboolean _tmp16_ = FALSE;
+#line 7851 "PhotoMetadata.c"
+						GeeIterator* _tmp15_;
+						gboolean _tmp16_;
 						gchar* current_path = NULL;
-						GeeIterator* _tmp17_ = NULL;
-						gpointer _tmp18_ = NULL;
+						GeeIterator* _tmp17_;
+						gpointer _tmp18_;
 						gchar* writeable_path = NULL;
-						const gchar* _tmp19_ = NULL;
-						HierarchicalKeywordField* _tmp20_ = NULL;
-						const gchar* _tmp21_ = NULL;
-						gchar* _tmp22_ = NULL;
-						HierarchicalKeywordField* _tmp23_ = NULL;
-						gboolean _tmp24_ = FALSE;
-						GeeSet* _tmp27_ = NULL;
-						const gchar* _tmp28_ = NULL;
+						const gchar* _tmp19_;
+						HierarchicalKeywordField* _tmp20_;
+						const gchar* _tmp21_;
+						gchar* _tmp22_;
+						HierarchicalKeywordField* _tmp23_;
+						gboolean _tmp24_;
+						GeeSet* _tmp27_;
+						const gchar* _tmp28_;
 #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp15_ = _current_path_it;
 #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7833,7 +7875,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 						if (!_tmp16_) {
 #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							break;
-#line 7832 "PhotoMetadata.c"
+#line 7874 "PhotoMetadata.c"
 						}
 #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp17_ = _current_path_it;
@@ -7857,9 +7899,9 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 						_tmp24_ = _tmp23_->wants_leading_separator;
 #line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						if (!_tmp24_) {
-#line 7856 "PhotoMetadata.c"
-							const gchar* _tmp25_ = NULL;
-							gchar* _tmp26_ = NULL;
+#line 7898 "PhotoMetadata.c"
+							const gchar* _tmp25_;
+							gchar* _tmp26_;
 #line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp25_ = writeable_path;
 #line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7868,7 +7910,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 							_g_free0 (writeable_path);
 #line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							writeable_path = _tmp26_;
-#line 7867 "PhotoMetadata.c"
+#line 7909 "PhotoMetadata.c"
 						}
 #line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp27_ = writeable_set;
@@ -7880,11 +7922,11 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 						_g_free0 (writeable_path);
 #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (current_path);
-#line 7879 "PhotoMetadata.c"
+#line 7921 "PhotoMetadata.c"
 					}
 #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (_current_path_it);
-#line 7883 "PhotoMetadata.c"
+#line 7925 "PhotoMetadata.c"
 				}
 #line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp29_ = current_field;
@@ -7898,7 +7940,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 				_g_object_unref0 (writeable_set);
 #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (current_field);
-#line 7897 "PhotoMetadata.c"
+#line 7939 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -7907,11 +7949,11 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 
 void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, PhotoMetadataSetOption option) {
 	HierarchicalTagIndex* htag_index = NULL;
-	HierarchicalTagIndex* _tmp0_ = NULL;
+	HierarchicalTagIndex* _tmp0_;
 	GeeSet* flat_keywords = NULL;
-	GeeTreeSet* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp28_ = NULL;
+	GeeTreeSet* _tmp1_;
+	GeeCollection* _tmp2_;
+	GeeCollection* _tmp28_;
 #line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7928,15 +7970,15 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 	_tmp2_ = keywords;
 #line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_ != NULL) {
-#line 7927 "PhotoMetadata.c"
-		GeeSet* _tmp24_ = NULL;
-		HierarchicalTagIndex* _tmp25_ = NULL;
-		GeeCollection* _tmp26_ = NULL;
-		GeeCollection* _tmp27_ = NULL;
+#line 7969 "PhotoMetadata.c"
+		GeeSet* _tmp24_;
+		HierarchicalTagIndex* _tmp25_;
+		GeeCollection* _tmp26_;
+		GeeCollection* _tmp27_;
 		{
 			GeeIterator* _keyword_it = NULL;
-			GeeCollection* _tmp3_ = NULL;
-			GeeIterator* _tmp4_ = NULL;
+			GeeCollection* _tmp3_;
+			GeeIterator* _tmp4_;
 #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = keywords;
 #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7945,14 +7987,14 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 			_keyword_it = _tmp4_;
 #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			while (TRUE) {
-#line 7944 "PhotoMetadata.c"
-				GeeIterator* _tmp5_ = NULL;
-				gboolean _tmp6_ = FALSE;
+#line 7986 "PhotoMetadata.c"
+				GeeIterator* _tmp5_;
+				gboolean _tmp6_;
 				gchar* keyword = NULL;
-				GeeIterator* _tmp7_ = NULL;
-				gpointer _tmp8_ = NULL;
-				const gchar* _tmp9_ = NULL;
-				gboolean _tmp10_ = FALSE;
+				GeeIterator* _tmp7_;
+				gpointer _tmp8_;
+				const gchar* _tmp9_;
+				gboolean _tmp10_;
 #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp5_ = _keyword_it;
 #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7961,7 +8003,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 				if (!_tmp6_) {
 #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					break;
-#line 7960 "PhotoMetadata.c"
+#line 8002 "PhotoMetadata.c"
 				}
 #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp7_ = _keyword_it;
@@ -7975,21 +8017,21 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 				_tmp10_ = g_str_has_prefix (_tmp9_, TAG_PATH_SEPARATOR_STRING);
 #line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp10_) {
-#line 7974 "PhotoMetadata.c"
+#line 8016 "PhotoMetadata.c"
 					GeeCollection* path_components = NULL;
-					const gchar* _tmp11_ = NULL;
-					GeeList* _tmp12_ = NULL;
+					const gchar* _tmp11_;
+					GeeList* _tmp12_;
 #line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp11_ = keyword;
 #line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_);
 #line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					path_components = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 7984 "PhotoMetadata.c"
+#line 8026 "PhotoMetadata.c"
 					{
 						GeeIterator* _component_it = NULL;
-						GeeCollection* _tmp13_ = NULL;
-						GeeIterator* _tmp14_ = NULL;
+						GeeCollection* _tmp13_;
+						GeeIterator* _tmp14_;
 #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp13_ = path_components;
 #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7998,15 +8040,15 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 						_component_it = _tmp14_;
 #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						while (TRUE) {
-#line 7997 "PhotoMetadata.c"
-							GeeIterator* _tmp15_ = NULL;
-							gboolean _tmp16_ = FALSE;
+#line 8039 "PhotoMetadata.c"
+							GeeIterator* _tmp15_;
+							gboolean _tmp16_;
 							gchar* component = NULL;
-							GeeIterator* _tmp17_ = NULL;
-							gpointer _tmp18_ = NULL;
-							HierarchicalTagIndex* _tmp19_ = NULL;
-							const gchar* _tmp20_ = NULL;
-							const gchar* _tmp21_ = NULL;
+							GeeIterator* _tmp17_;
+							gpointer _tmp18_;
+							HierarchicalTagIndex* _tmp19_;
+							const gchar* _tmp20_;
+							const gchar* _tmp21_;
 #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp15_ = _component_it;
 #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8015,7 +8057,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 							if (!_tmp16_) {
 #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 								break;
-#line 8014 "PhotoMetadata.c"
+#line 8056 "PhotoMetadata.c"
 							}
 #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp17_ = _component_it;
@@ -8033,33 +8075,33 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 							hierarchical_tag_index_add_path (_tmp19_, _tmp20_, _tmp21_);
 #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_free0 (component);
-#line 8032 "PhotoMetadata.c"
+#line 8074 "PhotoMetadata.c"
 						}
 #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_object_unref0 (_component_it);
-#line 8036 "PhotoMetadata.c"
+#line 8078 "PhotoMetadata.c"
 					}
 #line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (path_components);
-#line 8040 "PhotoMetadata.c"
+#line 8082 "PhotoMetadata.c"
 				} else {
-					GeeSet* _tmp22_ = NULL;
-					const gchar* _tmp23_ = NULL;
+					GeeSet* _tmp22_;
+					const gchar* _tmp23_;
 #line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp22_ = flat_keywords;
 #line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp23_ = keyword;
 #line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 8050 "PhotoMetadata.c"
+#line 8092 "PhotoMetadata.c"
 				}
 #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (keyword);
-#line 8054 "PhotoMetadata.c"
+#line 8096 "PhotoMetadata.c"
 			}
 #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_object_unref0 (_keyword_it);
-#line 8058 "PhotoMetadata.c"
+#line 8100 "PhotoMetadata.c"
 		}
 #line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp24_ = flat_keywords;
@@ -8073,18 +8115,18 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 		gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_);
 #line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_object_unref0 (_tmp27_);
-#line 8072 "PhotoMetadata.c"
+#line 8114 "PhotoMetadata.c"
 	}
 #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp28_ = keywords;
 #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp28_ != NULL) {
-#line 8078 "PhotoMetadata.c"
-		gchar** _tmp29_ = NULL;
-		gint _tmp29__length1 = 0;
-		GeeSet* _tmp30_ = NULL;
-		PhotoMetadataSetOption _tmp31_ = 0;
-		HierarchicalTagIndex* _tmp32_ = NULL;
+#line 8120 "PhotoMetadata.c"
+		gchar** _tmp29_;
+		gint _tmp29__length1;
+		GeeSet* _tmp30_;
+		PhotoMetadataSetOption _tmp31_;
+		HierarchicalTagIndex* _tmp32_;
 #line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp29_ = photo_metadata_KEYWORD_TAGS;
 #line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8099,10 +8141,10 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 		_tmp32_ = htag_index;
 #line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_internal_set_hierarchical_keywords (self, _tmp32_);
-#line 8098 "PhotoMetadata.c"
+#line 8140 "PhotoMetadata.c"
 	} else {
-		gchar** _tmp33_ = NULL;
-		gint _tmp33__length1 = 0;
+		gchar** _tmp33_;
+		gint _tmp33__length1;
 #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp33_ = photo_metadata_KEYWORD_TAGS;
 #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8111,27 +8153,27 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 		photo_metadata_remove_tags (self, _tmp33_, _tmp33__length1);
 #line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_internal_set_hierarchical_keywords (self, NULL);
-#line 8110 "PhotoMetadata.c"
+#line 8152 "PhotoMetadata.c"
 	}
 #line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (flat_keywords);
 #line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_hierarchical_tag_index_unref0 (htag_index);
-#line 8116 "PhotoMetadata.c"
+#line 8158 "PhotoMetadata.c"
 }
 
 
 gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 	gboolean result = FALSE;
-	HierarchicalKeywordField** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	HierarchicalKeywordField** _tmp0_;
+	gint _tmp0__length1;
 #line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
 #line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 8130 "PhotoMetadata.c"
+#line 8172 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** field_collection = NULL;
 		gint field_collection_length1 = 0;
@@ -8143,21 +8185,21 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 		field_collection_length1 = _tmp0__length1;
 #line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (field_it = 0; field_it < _tmp0__length1; field_it = field_it + 1) {
-#line 8142 "PhotoMetadata.c"
-			HierarchicalKeywordField* _tmp1_ = NULL;
+#line 8184 "PhotoMetadata.c"
+			HierarchicalKeywordField* _tmp1_;
 			HierarchicalKeywordField* field = NULL;
 #line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]);
 #line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			field = _tmp1_;
-#line 8149 "PhotoMetadata.c"
+#line 8191 "PhotoMetadata.c"
 			{
 				GeeCollection* values = NULL;
-				HierarchicalKeywordField* _tmp2_ = NULL;
-				const gchar* _tmp3_ = NULL;
-				GeeList* _tmp4_ = NULL;
+				HierarchicalKeywordField* _tmp2_;
+				const gchar* _tmp3_;
+				GeeList* _tmp4_;
 				gboolean _tmp5_ = FALSE;
-				GeeCollection* _tmp6_ = NULL;
+				GeeCollection* _tmp6_;
 #line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = field;
 #line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8170,10 +8212,10 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 				_tmp6_ = values;
 #line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp6_ != NULL) {
-#line 8169 "PhotoMetadata.c"
-					GeeCollection* _tmp7_ = NULL;
-					gint _tmp8_ = 0;
-					gint _tmp9_ = 0;
+#line 8211 "PhotoMetadata.c"
+					GeeCollection* _tmp7_;
+					gint _tmp8_;
+					gint _tmp9_;
 #line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = values;
 #line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8182,11 +8224,11 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 					_tmp9_ = _tmp8_;
 #line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp5_ = _tmp9_ > 0;
-#line 8181 "PhotoMetadata.c"
+#line 8223 "PhotoMetadata.c"
 				} else {
 #line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp5_ = FALSE;
-#line 8185 "PhotoMetadata.c"
+#line 8227 "PhotoMetadata.c"
 				}
 #line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp5_) {
@@ -8198,13 +8240,13 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 					_hierarchical_keyword_field_unref0 (field);
 #line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 8197 "PhotoMetadata.c"
+#line 8239 "PhotoMetadata.c"
 				}
 #line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (values);
 #line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (field);
-#line 8203 "PhotoMetadata.c"
+#line 8245 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -8212,17 +8254,17 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 	result = FALSE;
 #line 1079 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8211 "PhotoMetadata.c"
+#line 8253 "PhotoMetadata.c"
 }
 
 
 GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 	GeeSet* result = NULL;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	GeeSet* h_keywords = NULL;
-	GeeSet* _tmp1_ = NULL;
-	HierarchicalKeywordField** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	GeeSet* _tmp1_;
+	HierarchicalKeywordField** _tmp2_;
+	gint _tmp2__length1;
 	GError * _inner_error_ = NULL;
 #line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
@@ -8238,7 +8280,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 	_tmp2_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
 #line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 8237 "PhotoMetadata.c"
+#line 8279 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** field_collection = NULL;
 		gint field_collection_length1 = 0;
@@ -8250,23 +8292,23 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 		field_collection_length1 = _tmp2__length1;
 #line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (field_it = 0; field_it < _tmp2__length1; field_it = field_it + 1) {
-#line 8249 "PhotoMetadata.c"
-			HierarchicalKeywordField* _tmp3_ = NULL;
+#line 8291 "PhotoMetadata.c"
+			HierarchicalKeywordField* _tmp3_;
 			HierarchicalKeywordField* field = NULL;
 #line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]);
 #line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			field = _tmp3_;
-#line 8256 "PhotoMetadata.c"
+#line 8298 "PhotoMetadata.c"
 			{
 				GeeCollection* values = NULL;
-				HierarchicalKeywordField* _tmp4_ = NULL;
-				const gchar* _tmp5_ = NULL;
-				GeeList* _tmp6_ = NULL;
+				HierarchicalKeywordField* _tmp4_;
+				const gchar* _tmp5_;
+				GeeList* _tmp6_;
 				gboolean _tmp7_ = FALSE;
-				GeeCollection* _tmp8_ = NULL;
+				GeeCollection* _tmp8_;
 				GeeArrayList* transformed_values = NULL;
-				GeeArrayList* _tmp12_ = NULL;
+				GeeArrayList* _tmp12_;
 #line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp4_ = field;
 #line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8281,11 +8323,11 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 				if (_tmp8_ == NULL) {
 #line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = TRUE;
-#line 8280 "PhotoMetadata.c"
+#line 8322 "PhotoMetadata.c"
 				} else {
-					GeeCollection* _tmp9_ = NULL;
-					gint _tmp10_ = 0;
-					gint _tmp11_ = 0;
+					GeeCollection* _tmp9_;
+					gint _tmp10_;
+					gint _tmp11_;
 #line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp9_ = values;
 #line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8294,7 +8336,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 					_tmp11_ = _tmp10_;
 #line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = _tmp11_ < 1;
-#line 8293 "PhotoMetadata.c"
+#line 8335 "PhotoMetadata.c"
 				}
 #line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp7_) {
@@ -8304,17 +8346,17 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 					_hierarchical_keyword_field_unref0 (field);
 #line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 8303 "PhotoMetadata.c"
+#line 8345 "PhotoMetadata.c"
 				}
 #line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp12_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				transformed_values = _tmp12_;
-#line 8309 "PhotoMetadata.c"
+#line 8351 "PhotoMetadata.c"
 				{
 					GeeIterator* _current_value_it = NULL;
-					GeeCollection* _tmp13_ = NULL;
-					GeeIterator* _tmp14_ = NULL;
+					GeeCollection* _tmp13_;
+					GeeIterator* _tmp14_;
 #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp13_ = values;
 #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8323,12 +8365,12 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 					_current_value_it = _tmp14_;
 #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					while (TRUE) {
-#line 8322 "PhotoMetadata.c"
-						GeeIterator* _tmp15_ = NULL;
-						gboolean _tmp16_ = FALSE;
+#line 8364 "PhotoMetadata.c"
+						GeeIterator* _tmp15_;
+						gboolean _tmp16_;
 						gchar* current_value = NULL;
-						GeeIterator* _tmp17_ = NULL;
-						gpointer _tmp18_ = NULL;
+						GeeIterator* _tmp17_;
+						gpointer _tmp18_;
 #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp15_ = _current_value_it;
 #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8337,7 +8379,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 						if (!_tmp16_) {
 #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							break;
-#line 8336 "PhotoMetadata.c"
+#line 8378 "PhotoMetadata.c"
 						}
 #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp17_ = _current_value_it;
@@ -8345,15 +8387,15 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 						_tmp18_ = gee_iterator_get (_tmp17_);
 #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						current_value = (gchar*) _tmp18_;
-#line 8344 "PhotoMetadata.c"
+#line 8386 "PhotoMetadata.c"
 						{
 							GeeList* transformed = NULL;
-							HierarchicalKeywordField* _tmp19_ = NULL;
-							KeywordTransformer* _tmp20_ = NULL;
-							const gchar* _tmp21_ = NULL;
-							GeeList* _tmp22_ = NULL;
-							GeeArrayList* _tmp23_ = NULL;
-							GeeList* _tmp24_ = NULL;
+							HierarchicalKeywordField* _tmp19_;
+							KeywordTransformer* _tmp20_;
+							const gchar* _tmp21_;
+							GeeList* _tmp22_;
+							GeeArrayList* _tmp23_;
+							GeeList* _tmp24_;
 #line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp19_ = field;
 #line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8366,7 +8408,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 							transformed = _tmp22_;
 #line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8365 "PhotoMetadata.c"
+#line 8407 "PhotoMetadata.c"
 								goto __catch28_g_error;
 							}
 #line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8377,15 +8419,15 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 							gee_array_list_add_all (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_object_unref0 (transformed);
-#line 8376 "PhotoMetadata.c"
+#line 8418 "PhotoMetadata.c"
 						}
 						goto __finally28;
 						__catch28_g_error:
 						{
 							GError* _error_ = NULL;
-							const gchar* _tmp25_ = NULL;
-							GError* _tmp26_ = NULL;
-							const gchar* _tmp27_ = NULL;
+							const gchar* _tmp25_;
+							GError* _tmp26_;
+							const gchar* _tmp27_;
 #line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_error_ = _inner_error_;
 #line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8400,7 +8442,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 							g_critical ("PhotoMetadata.vala:1099: Failed to transform tag value %s: %s", _tmp25_, _tmp27_);
 #line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_error_free0 (_error_);
-#line 8399 "PhotoMetadata.c"
+#line 8441 "PhotoMetadata.c"
 						}
 						__finally28:
 #line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8423,24 +8465,24 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 							g_clear_error (&_inner_error_);
 #line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							return NULL;
-#line 8422 "PhotoMetadata.c"
+#line 8464 "PhotoMetadata.c"
 						}
 #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (current_value);
-#line 8426 "PhotoMetadata.c"
+#line 8468 "PhotoMetadata.c"
 					}
 #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (_current_value_it);
-#line 8430 "PhotoMetadata.c"
+#line 8472 "PhotoMetadata.c"
 				}
 				{
 					GeeArrayList* _current_value_list = NULL;
-					GeeArrayList* _tmp28_ = NULL;
-					GeeArrayList* _tmp29_ = NULL;
+					GeeArrayList* _tmp28_;
+					GeeArrayList* _tmp29_;
 					gint _current_value_size = 0;
-					GeeArrayList* _tmp30_ = NULL;
-					gint _tmp31_ = 0;
-					gint _tmp32_ = 0;
+					GeeArrayList* _tmp30_;
+					gint _tmp31_;
+					gint _tmp32_;
 					gint _current_value_index = 0;
 #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp28_ = transformed_values;
@@ -8460,20 +8502,20 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 					_current_value_index = -1;
 #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					while (TRUE) {
-#line 8459 "PhotoMetadata.c"
-						gint _tmp33_ = 0;
-						gint _tmp34_ = 0;
-						gint _tmp35_ = 0;
+#line 8501 "PhotoMetadata.c"
+						gint _tmp33_;
+						gint _tmp34_;
+						gint _tmp35_;
 						gchar* current_value = NULL;
-						GeeArrayList* _tmp36_ = NULL;
-						gint _tmp37_ = 0;
-						gpointer _tmp38_ = NULL;
+						GeeArrayList* _tmp36_;
+						gint _tmp37_;
+						gpointer _tmp38_;
 						gchar* canonicalized = NULL;
-						const gchar* _tmp39_ = NULL;
-						HierarchicalKeywordField* _tmp40_ = NULL;
-						const gchar* _tmp41_ = NULL;
-						gchar* _tmp42_ = NULL;
-						const gchar* _tmp43_ = NULL;
+						const gchar* _tmp39_;
+						HierarchicalKeywordField* _tmp40_;
+						const gchar* _tmp41_;
+						gchar* _tmp42_;
+						const gchar* _tmp43_;
 #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp33_ = _current_value_index;
 #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8486,7 +8528,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 						if (!(_tmp34_ < _tmp35_)) {
 #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							break;
-#line 8485 "PhotoMetadata.c"
+#line 8527 "PhotoMetadata.c"
 						}
 #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp36_ = _current_value_list;
@@ -8510,26 +8552,26 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 						_tmp43_ = canonicalized;
 #line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						if (_tmp43_ != NULL) {
-#line 8509 "PhotoMetadata.c"
-							GeeSet* _tmp44_ = NULL;
-							const gchar* _tmp45_ = NULL;
+#line 8551 "PhotoMetadata.c"
+							GeeSet* _tmp44_;
+							const gchar* _tmp45_;
 #line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp44_ = h_keywords;
 #line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp45_ = canonicalized;
 #line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), _tmp45_);
-#line 8518 "PhotoMetadata.c"
+#line 8560 "PhotoMetadata.c"
 						}
 #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (canonicalized);
 #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (current_value);
-#line 8524 "PhotoMetadata.c"
+#line 8566 "PhotoMetadata.c"
 					}
 #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (_current_value_list);
-#line 8528 "PhotoMetadata.c"
+#line 8570 "PhotoMetadata.c"
 				}
 #line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (transformed_values);
@@ -8537,7 +8579,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 				_g_object_unref0 (values);
 #line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (field);
-#line 8536 "PhotoMetadata.c"
+#line 8578 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -8545,14 +8587,14 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 	result = h_keywords;
 #line 1115 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8544 "PhotoMetadata.c"
+#line 8586 "PhotoMetadata.c"
 }
 
 
 gboolean photo_metadata_has_orientation (PhotoMetadata* self) {
 	gboolean result = FALSE;
-	GExiv2Metadata* _tmp0_ = NULL;
-	GExiv2Orientation _tmp1_ = 0;
+	GExiv2Metadata* _tmp0_;
+	GExiv2Orientation _tmp1_;
 #line 1118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8563,18 +8605,18 @@ gboolean photo_metadata_has_orientation (PhotoMetadata* self) {
 	result = _tmp1_ == GEXIV2_ORIENTATION_UNSPECIFIED;
 #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8562 "PhotoMetadata.c"
+#line 8604 "PhotoMetadata.c"
 }
 
 
 Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
 	Orientation result = 0;
 	GExiv2Orientation orientation = 0;
-	GExiv2Metadata* _tmp0_ = NULL;
-	GExiv2Orientation _tmp1_ = 0;
+	GExiv2Metadata* _tmp0_;
+	GExiv2Orientation _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-	GExiv2Orientation _tmp4_ = 0;
+	GExiv2Orientation _tmp4_;
 #line 1123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), 0);
 #line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8589,27 +8631,27 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
 	if (_tmp4_ == GEXIV2_ORIENTATION_UNSPECIFIED) {
 #line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = TRUE;
-#line 8588 "PhotoMetadata.c"
+#line 8630 "PhotoMetadata.c"
 	} else {
-		GExiv2Orientation _tmp5_ = 0;
+		GExiv2Orientation _tmp5_;
 #line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = orientation;
 #line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp5_ < ORIENTATION_MIN;
-#line 8595 "PhotoMetadata.c"
+#line 8637 "PhotoMetadata.c"
 	}
 #line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
 #line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = TRUE;
-#line 8601 "PhotoMetadata.c"
+#line 8643 "PhotoMetadata.c"
 	} else {
-		GExiv2Orientation _tmp6_ = 0;
+		GExiv2Orientation _tmp6_;
 #line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = orientation;
 #line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = _tmp6_ > ORIENTATION_MAX;
-#line 8608 "PhotoMetadata.c"
+#line 8650 "PhotoMetadata.c"
 	}
 #line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_) {
@@ -8617,23 +8659,23 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
 		result = ORIENTATION_TOP_LEFT;
 #line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8616 "PhotoMetadata.c"
+#line 8658 "PhotoMetadata.c"
 	} else {
-		GExiv2Orientation _tmp7_ = 0;
+		GExiv2Orientation _tmp7_;
 #line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = orientation;
 #line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = (Orientation) _tmp7_;
 #line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8625 "PhotoMetadata.c"
+#line 8667 "PhotoMetadata.c"
 	}
 }
 
 
 void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientation) {
-	GExiv2Metadata* _tmp0_ = NULL;
-	Orientation _tmp1_ = 0;
+	GExiv2Metadata* _tmp0_;
+	Orientation _tmp1_;
 #line 1134 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8642,24 +8684,24 @@ void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientatio
 	_tmp1_ = orientation;
 #line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_set_orientation (_tmp0_, (GExiv2Orientation) _tmp1_);
-#line 8641 "PhotoMetadata.c"
+#line 8683 "PhotoMetadata.c"
 }
 
 
-gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar** long_ref, gdouble* latitude, gchar** lat_ref, gdouble* altitude) {
+gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* * long_ref, gdouble* latitude, gchar* * lat_ref, gdouble* altitude) {
 	gdouble _vala_longitude = 0.0;
 	gchar* _vala_long_ref = NULL;
 	gdouble _vala_latitude = 0.0;
 	gchar* _vala_lat_ref = NULL;
 	gdouble _vala_altitude = 0.0;
 	gboolean result = FALSE;
-	GExiv2Metadata* _tmp0_ = NULL;
+	GExiv2Metadata* _tmp0_;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
 	gdouble _tmp3_ = 0.0;
-	gboolean _tmp4_ = FALSE;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gboolean _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 1139 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8688,43 +8730,43 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar*
 		if (longitude) {
 #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*longitude = _vala_longitude;
-#line 8687 "PhotoMetadata.c"
+#line 8729 "PhotoMetadata.c"
 		}
 #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (long_ref) {
 #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*long_ref = _vala_long_ref;
-#line 8693 "PhotoMetadata.c"
+#line 8735 "PhotoMetadata.c"
 		} else {
 #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (_vala_long_ref);
-#line 8697 "PhotoMetadata.c"
+#line 8739 "PhotoMetadata.c"
 		}
 #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (latitude) {
 #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*latitude = _vala_latitude;
-#line 8703 "PhotoMetadata.c"
+#line 8745 "PhotoMetadata.c"
 		}
 #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (lat_ref) {
 #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*lat_ref = _vala_lat_ref;
-#line 8709 "PhotoMetadata.c"
+#line 8751 "PhotoMetadata.c"
 		} else {
 #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (_vala_lat_ref);
-#line 8713 "PhotoMetadata.c"
+#line 8755 "PhotoMetadata.c"
 		}
 #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (altitude) {
 #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*altitude = _vala_altitude;
-#line 8719 "PhotoMetadata.c"
+#line 8761 "PhotoMetadata.c"
 		}
 #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8723 "PhotoMetadata.c"
+#line 8765 "PhotoMetadata.c"
 	}
 #line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLongitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -8744,43 +8786,43 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar*
 	if (longitude) {
 #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*longitude = _vala_longitude;
-#line 8743 "PhotoMetadata.c"
+#line 8785 "PhotoMetadata.c"
 	}
 #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (long_ref) {
 #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*long_ref = _vala_long_ref;
-#line 8749 "PhotoMetadata.c"
+#line 8791 "PhotoMetadata.c"
 	} else {
 #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_vala_long_ref);
-#line 8753 "PhotoMetadata.c"
+#line 8795 "PhotoMetadata.c"
 	}
 #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (latitude) {
 #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*latitude = _vala_latitude;
-#line 8759 "PhotoMetadata.c"
+#line 8801 "PhotoMetadata.c"
 	}
 #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (lat_ref) {
 #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*lat_ref = _vala_lat_ref;
-#line 8765 "PhotoMetadata.c"
+#line 8807 "PhotoMetadata.c"
 	} else {
 #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_vala_lat_ref);
-#line 8769 "PhotoMetadata.c"
+#line 8811 "PhotoMetadata.c"
 	}
 #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (altitude) {
 #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*altitude = _vala_altitude;
-#line 8775 "PhotoMetadata.c"
+#line 8817 "PhotoMetadata.c"
 	}
 #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8779 "PhotoMetadata.c"
+#line 8821 "PhotoMetadata.c"
 }
 
 
@@ -8788,7 +8830,7 @@ gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exp
 	MetadataRational _vala_exposure = {0};
 	gboolean result = FALSE;
 	MetadataRational _tmp0_ = {0};
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 1154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8801,11 +8843,11 @@ gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exp
 	if (exposure) {
 #line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*exposure = _vala_exposure;
-#line 8800 "PhotoMetadata.c"
+#line 8842 "PhotoMetadata.c"
 	}
 #line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8804 "PhotoMetadata.c"
+#line 8846 "PhotoMetadata.c"
 }
 
 
@@ -8813,9 +8855,9 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
 	gchar* result = NULL;
 	MetadataRational exposure_time = {0};
 	MetadataRational _tmp0_ = {0};
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gchar* _tmp3_ = NULL;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+	gchar* _tmp3_;
 #line 1158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8828,7 +8870,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
 		result = NULL;
 #line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8827 "PhotoMetadata.c"
+#line 8869 "PhotoMetadata.c"
 	}
 #line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = metadata_rational_is_valid (&exposure_time);
@@ -8838,7 +8880,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
 		result = NULL;
 #line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8837 "PhotoMetadata.c"
+#line 8879 "PhotoMetadata.c"
 	}
 #line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureTime", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -8846,7 +8888,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
 	result = _tmp3_;
 #line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8845 "PhotoMetadata.c"
+#line 8887 "PhotoMetadata.c"
 }
 
 
@@ -8855,10 +8897,10 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
 	gboolean result = FALSE;
 	gboolean fetched_ok = FALSE;
 	glong _tmp0_ = 0L;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	glong _tmp4_ = 0L;
+	glong _tmp4_;
 #line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 1170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8877,11 +8919,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
 		if (iso) {
 #line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*iso = _vala_iso;
-#line 8876 "PhotoMetadata.c"
+#line 8918 "PhotoMetadata.c"
 		}
 #line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8880 "PhotoMetadata.c"
+#line 8922 "PhotoMetadata.c"
 	}
 #line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = _vala_iso;
@@ -8889,14 +8931,14 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
 	if (_tmp4_ < ((glong) 6)) {
 #line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = TRUE;
-#line 8888 "PhotoMetadata.c"
+#line 8930 "PhotoMetadata.c"
 	} else {
-		glong _tmp5_ = 0L;
+		glong _tmp5_;
 #line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = _vala_iso;
 #line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp5_ > ((glong) 409600);
-#line 8895 "PhotoMetadata.c"
+#line 8937 "PhotoMetadata.c"
 	}
 #line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
@@ -8906,11 +8948,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
 		if (iso) {
 #line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*iso = _vala_iso;
-#line 8905 "PhotoMetadata.c"
+#line 8947 "PhotoMetadata.c"
 		}
 #line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8909 "PhotoMetadata.c"
+#line 8951 "PhotoMetadata.c"
 	}
 #line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = TRUE;
@@ -8918,11 +8960,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
 	if (iso) {
 #line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*iso = _vala_iso;
-#line 8917 "PhotoMetadata.c"
+#line 8959 "PhotoMetadata.c"
 	}
 #line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8921 "PhotoMetadata.c"
+#line 8963 "PhotoMetadata.c"
 }
 
 
@@ -8930,8 +8972,8 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) {
 	gchar* result = NULL;
 	glong iso = 0L;
 	glong _tmp0_ = 0L;
-	gboolean _tmp1_ = FALSE;
-	gchar* _tmp2_ = NULL;
+	gboolean _tmp1_;
+	gchar* _tmp2_;
 #line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 1185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8944,7 +8986,7 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) {
 		result = NULL;
 #line 1186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8943 "PhotoMetadata.c"
+#line 8985 "PhotoMetadata.c"
 	}
 #line 1188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ISOSpeedRatings", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -8952,7 +8994,7 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) {
 	result = _tmp2_;
 #line 1188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8951 "PhotoMetadata.c"
+#line 8993 "PhotoMetadata.c"
 }
 
 
@@ -8960,7 +9002,7 @@ gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* ape
 	MetadataRational _vala_aperture = {0};
 	gboolean result = FALSE;
 	MetadataRational _tmp0_ = {0};
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8973,11 +9015,11 @@ gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* ape
 	if (aperture) {
 #line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*aperture = _vala_aperture;
-#line 8972 "PhotoMetadata.c"
+#line 9014 "PhotoMetadata.c"
 	}
 #line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8976 "PhotoMetadata.c"
+#line 9018 "PhotoMetadata.c"
 }
 
 
@@ -8985,22 +9027,22 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
 	gchar* result = NULL;
 	MetadataRational aperture = {0};
 	MetadataRational _tmp0_ = {0};
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	gdouble aperture_value = 0.0;
-	MetadataRational _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	MetadataRational _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	gdouble _tmp6_ = 0.0;
+	MetadataRational _tmp2_;
+	gint _tmp3_;
+	MetadataRational _tmp4_;
+	gint _tmp5_;
+	gdouble _tmp6_;
 	const gchar* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	gboolean _tmp8_;
 	const gchar* _tmp9_ = NULL;
-	gdouble _tmp10_ = 0.0;
-	gdouble _tmp11_ = 0.0;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
+	gdouble _tmp10_;
+	gdouble _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
 #line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 1197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9013,7 +9055,7 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
 		result = NULL;
 #line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 9012 "PhotoMetadata.c"
+#line 9054 "PhotoMetadata.c"
 	}
 #line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = aperture;
@@ -9035,11 +9077,11 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
 	if (_tmp8_) {
 #line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = "<i>f</i>/";
-#line 9034 "PhotoMetadata.c"
+#line 9076 "PhotoMetadata.c"
 	} else {
 #line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = "f/";
-#line 9038 "PhotoMetadata.c"
+#line 9080 "PhotoMetadata.c"
 	}
 #line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = aperture_value;
@@ -9047,11 +9089,11 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
 	if (fmod (_tmp10_, 1) == ((gdouble) 0)) {
 #line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = "%.0f";
-#line 9046 "PhotoMetadata.c"
+#line 9088 "PhotoMetadata.c"
 	} else {
 #line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = "%.1f";
-#line 9050 "PhotoMetadata.c"
+#line 9092 "PhotoMetadata.c"
 	}
 #line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = aperture_value;
@@ -9069,13 +9111,13 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
 	result = _tmp15_;
 #line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9068 "PhotoMetadata.c"
+#line 9110 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_camera_make (PhotoMetadata* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 1207 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 1208 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9084,13 +9126,13 @@ gchar* photo_metadata_get_camera_make (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1208 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9083 "PhotoMetadata.c"
+#line 9125 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_camera_model (PhotoMetadata* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 1211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9099,7 +9141,7 @@ gchar* photo_metadata_get_camera_model (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9098 "PhotoMetadata.c"
+#line 9140 "PhotoMetadata.c"
 }
 
 
@@ -9107,7 +9149,7 @@ gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash) {
 	glong _vala_flash = 0L;
 	gboolean result = FALSE;
 	glong _tmp0_ = 0L;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 1215 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9120,17 +9162,17 @@ gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash) {
 	if (flash) {
 #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*flash = _vala_flash;
-#line 9119 "PhotoMetadata.c"
+#line 9161 "PhotoMetadata.c"
 	}
 #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9123 "PhotoMetadata.c"
+#line 9165 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_flash_string (PhotoMetadata* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 1220 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9139,7 +9181,7 @@ gchar* photo_metadata_get_flash_string (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9138 "PhotoMetadata.c"
+#line 9180 "PhotoMetadata.c"
 }
 
 
@@ -9147,7 +9189,7 @@ gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational*
 	MetadataRational _vala_focal_length = {0};
 	gboolean result = FALSE;
 	MetadataRational _tmp0_ = {0};
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
 #line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9160,17 +9202,17 @@ gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational*
 	if (focal_length) {
 #line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*focal_length = _vala_focal_length;
-#line 9159 "PhotoMetadata.c"
+#line 9201 "PhotoMetadata.c"
 	}
 #line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9163 "PhotoMetadata.c"
+#line 9205 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 1229 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 1230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9179,15 +9221,15 @@ gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9178 "PhotoMetadata.c"
+#line 9220 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_artist (PhotoMetadata* self) {
 	gchar* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar* _tmp1_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar* _tmp1_;
 #line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9200,13 +9242,13 @@ gchar* photo_metadata_get_artist (PhotoMetadata* self) {
 	result = _tmp1_;
 #line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9199 "PhotoMetadata.c"
+#line 9241 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_copyright (PhotoMetadata* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9215,13 +9257,13 @@ gchar* photo_metadata_get_copyright (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9214 "PhotoMetadata.c"
+#line 9256 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_software (PhotoMetadata* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9230,16 +9272,16 @@ gchar* photo_metadata_get_software (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9229 "PhotoMetadata.c"
+#line 9271 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, const gchar* version) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gboolean _tmp4_;
 #line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9262,9 +9304,9 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co
 	_tmp4_ = photo_metadata_has_iptc (self);
 #line 1255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_) {
-#line 9261 "PhotoMetadata.c"
-		const gchar* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+#line 9303 "PhotoMetadata.c"
+		const gchar* _tmp5_;
+		const gchar* _tmp6_;
 #line 1256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = software;
 #line 1256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9273,7 +9315,7 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co
 		_tmp6_ = version;
 #line 1257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_string (self, "Iptc.Application2.ProgramVersion", _tmp6_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 9272 "PhotoMetadata.c"
+#line 9314 "PhotoMetadata.c"
 	}
 }
 
@@ -9287,13 +9329,13 @@ void photo_metadata_remove_software (PhotoMetadata* self) {
 	photo_metadata_remove_tag (self, "Iptc.Application2.Program");
 #line 1264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_remove_tag (self, "Iptc.Application2.ProgramVersion");
-#line 9286 "PhotoMetadata.c"
+#line 9328 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 1268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9302,23 +9344,23 @@ gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9301 "PhotoMetadata.c"
+#line 9343 "PhotoMetadata.c"
 }
 
 
 Rating photo_metadata_get_rating (PhotoMetadata* self) {
 	Rating result = 0;
 	gchar* rating_string = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp6_;
+	const gchar* _tmp7_;
 	gint int_percent_rating = 0;
-	const gchar* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	Rating _tmp18_ = 0;
+	const gchar* _tmp8_;
+	gint _tmp9_;
+	Rating _tmp18_;
 #line 1279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), 0);
 #line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9333,10 +9375,10 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 	_tmp2_ = rating_string;
 #line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_ != NULL) {
-#line 9332 "PhotoMetadata.c"
-		const gchar* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		Rating _tmp5_ = 0;
+#line 9374 "PhotoMetadata.c"
+		const gchar* _tmp3_;
+		gint _tmp4_;
+		Rating _tmp5_;
 #line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = rating_string;
 #line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9349,7 +9391,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 		_g_free0 (rating_string);
 #line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 9348 "PhotoMetadata.c"
+#line 9390 "PhotoMetadata.c"
 	}
 #line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = photo_metadata_get_string (self, "Exif.Image.RatingPercent", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -9367,7 +9409,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 		_g_free0 (rating_string);
 #line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 9366 "PhotoMetadata.c"
+#line 9408 "PhotoMetadata.c"
 	}
 #line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = rating_string;
@@ -9375,32 +9417,32 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 	_tmp9_ = atoi (_tmp8_);
 #line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	int_percent_rating = _tmp9_;
-#line 9374 "PhotoMetadata.c"
+#line 9416 "PhotoMetadata.c"
 	{
 		gint i = 0;
 #line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		i = 5;
-#line 9379 "PhotoMetadata.c"
+#line 9421 "PhotoMetadata.c"
 		{
 			gboolean _tmp10_ = FALSE;
 #line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp10_ = TRUE;
 #line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			while (TRUE) {
-#line 9386 "PhotoMetadata.c"
-				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
-				gint _tmp14_ = 0;
-				gint _tmp15_ = 0;
+#line 9428 "PhotoMetadata.c"
+				gint _tmp12_;
+				gint _tmp13_;
+				gint _tmp14_;
+				gint _tmp15_;
 #line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp10_) {
-#line 9393 "PhotoMetadata.c"
-					gint _tmp11_ = 0;
+#line 9435 "PhotoMetadata.c"
+					gint _tmp11_;
 #line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp11_ = i;
 #line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					i = _tmp11_ - 1;
-#line 9399 "PhotoMetadata.c"
+#line 9441 "PhotoMetadata.c"
 				}
 #line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp10_ = FALSE;
@@ -9410,7 +9452,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 				if (!(_tmp12_ >= 0)) {
 #line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					break;
-#line 9409 "PhotoMetadata.c"
+#line 9451 "PhotoMetadata.c"
 				}
 #line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp13_ = int_percent_rating;
@@ -9420,9 +9462,9 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 				_tmp15_ = RESOURCES_rating_thresholds[_tmp14_];
 #line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp13_ >= _tmp15_) {
-#line 9419 "PhotoMetadata.c"
-					gint _tmp16_ = 0;
-					Rating _tmp17_ = 0;
+#line 9461 "PhotoMetadata.c"
+					gint _tmp16_;
+					Rating _tmp17_;
 #line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp16_ = i;
 #line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9433,7 +9475,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 					_g_free0 (rating_string);
 #line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 9432 "PhotoMetadata.c"
+#line 9474 "PhotoMetadata.c"
 				}
 			}
 		}
@@ -9446,21 +9488,21 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 	_g_free0 (rating_string);
 #line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9445 "PhotoMetadata.c"
+#line 9487 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
 	gint int_rating = 0;
-	Rating _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
+	Rating _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gint _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gint _tmp8_;
 #line 1302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
 #line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9493,11 +9535,11 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
 	_tmp8_ = int_rating;
 #line 1307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (0 <= _tmp8_) {
-#line 9492 "PhotoMetadata.c"
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
+#line 9534 "PhotoMetadata.c"
+		gint _tmp9_;
+		gint _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
 #line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = int_rating;
 #line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9510,11 +9552,11 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
 		photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp12_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
 #line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp12_);
-#line 9509 "PhotoMetadata.c"
+#line 9551 "PhotoMetadata.c"
 	} else {
-		gint _tmp13_ = 0;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
+		gint _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
 #line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13_ = int_rating;
 #line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9525,7 +9567,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
 		photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp15_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
 #line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp15_);
-#line 9524 "PhotoMetadata.c"
+#line 9566 "PhotoMetadata.c"
 	}
 }
 
@@ -9533,27 +9575,27 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
 static gpointer _media_metadata_ref0 (gpointer self) {
 #line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? media_metadata_ref (self) : NULL;
-#line 9532 "PhotoMetadata.c"
+#line 9574 "PhotoMetadata.c"
 }
 
 
 static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_construct (GType object_type, PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props) {
 	PhotoMetadataInternalPhotoPreview* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	GExiv2PreviewProperties* _tmp1_ = NULL;
-	guint32 _tmp2_ = 0U;
-	GExiv2PreviewProperties* _tmp3_ = NULL;
-	guint32 _tmp4_ = 0U;
+	const gchar* _tmp0_;
+	GExiv2PreviewProperties* _tmp1_;
+	guint32 _tmp2_;
+	GExiv2PreviewProperties* _tmp3_;
+	guint32 _tmp4_;
 	Dimensions _tmp5_ = {0};
-	GExiv2PreviewProperties* _tmp6_ = NULL;
-	guint32 _tmp7_ = 0U;
-	GExiv2PreviewProperties* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	GExiv2PreviewProperties* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	PhotoMetadata* _tmp12_ = NULL;
-	PhotoMetadata* _tmp13_ = NULL;
-	guint _tmp14_ = 0U;
+	GExiv2PreviewProperties* _tmp6_;
+	guint32 _tmp7_;
+	GExiv2PreviewProperties* _tmp8_;
+	const gchar* _tmp9_;
+	GExiv2PreviewProperties* _tmp10_;
+	const gchar* _tmp11_;
+	PhotoMetadata* _tmp12_;
+	PhotoMetadata* _tmp13_;
+	guint _tmp14_;
 #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (owner), NULL);
 #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9600,21 +9642,21 @@ static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_
 	self->number = _tmp14_;
 #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self;
-#line 9599 "PhotoMetadata.c"
+#line 9641 "PhotoMetadata.c"
 }
 
 
 static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_new (PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props) {
 #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return photo_metadata_internal_photo_preview_construct (PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, owner, name, number, props);
-#line 9606 "PhotoMetadata.c"
+#line 9648 "PhotoMetadata.c"
 }
 
 
 static guint8* _vala_array_dup6 (guint8* self, int length) {
 #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 9613 "PhotoMetadata.c"
+#line 9655 "PhotoMetadata.c"
 }
 
 
@@ -9622,31 +9664,31 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
 	PhotoMetadataInternalPhotoPreview * self;
 	guint8* result = NULL;
 	GExiv2PreviewProperties** props = NULL;
-	PhotoMetadata* _tmp0_ = NULL;
-	GExiv2Metadata* _tmp1_ = NULL;
-	GExiv2PreviewProperties** _tmp2_ = NULL;
-	GExiv2PreviewProperties** _tmp3_ = NULL;
-	gint props_length1 = 0;
-	gint _props_size_ = 0;
+	PhotoMetadata* _tmp0_;
+	GExiv2Metadata* _tmp1_;
+	GExiv2PreviewProperties** _tmp2_;
+	GExiv2PreviewProperties** _tmp3_;
+	gint props_length1;
+	gint _props_size_;
 	gboolean _tmp4_ = FALSE;
-	GExiv2PreviewProperties** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	PhotoMetadata* _tmp8_ = NULL;
-	GExiv2Metadata* _tmp9_ = NULL;
-	GExiv2PreviewProperties** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	guint _tmp11_ = 0U;
-	GExiv2PreviewProperties* _tmp12_ = NULL;
-	GExiv2PreviewImage* _tmp13_ = NULL;
-	GExiv2PreviewImage* _tmp14_ = NULL;
+	GExiv2PreviewProperties** _tmp5_;
+	gint _tmp5__length1;
+	PhotoMetadata* _tmp8_;
+	GExiv2Metadata* _tmp9_;
+	GExiv2PreviewProperties** _tmp10_;
+	gint _tmp10__length1;
+	guint _tmp11_;
+	GExiv2PreviewProperties* _tmp12_;
+	GExiv2PreviewImage* _tmp13_;
+	GExiv2PreviewImage* _tmp14_;
 	guint32 _tmp15_;
-	guint8* _tmp16_ = NULL;
-	guint8* _tmp17_ = NULL;
-	gint _tmp17__length1 = 0;
-	guint8* _tmp18_ = NULL;
-	gint _tmp18__length1 = 0;
-	guint8* _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
+	guint8* _tmp16_;
+	guint8* _tmp17_;
+	gint _tmp17__length1;
+	guint8* _tmp18_;
+	gint _tmp18__length1;
+	guint8* _tmp19_;
+	gint _tmp19__length1;
 #line 239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, PhotoMetadataInternalPhotoPreview);
 #line 240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9667,10 +9709,10 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
 	_tmp5__length1 = props_length1;
 #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp5_ != NULL) {
-#line 9666 "PhotoMetadata.c"
-		GExiv2PreviewProperties** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-		guint _tmp7_ = 0U;
+#line 9708 "PhotoMetadata.c"
+		GExiv2PreviewProperties** _tmp6_;
+		gint _tmp6__length1;
+		guint _tmp7_;
 #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = props;
 #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9679,11 +9721,11 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
 		_tmp7_ = self->number;
 #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = ((guint) _tmp6__length1) > _tmp7_;
-#line 9678 "PhotoMetadata.c"
+#line 9720 "PhotoMetadata.c"
 	} else {
 #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = FALSE;
-#line 9682 "PhotoMetadata.c"
+#line 9724 "PhotoMetadata.c"
 	}
 #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_assert (_tmp4_, "props != null && props.length > number");
@@ -9723,13 +9765,13 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
 	if (result_length1) {
 #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*result_length1 = _tmp19__length1;
-#line 9722 "PhotoMetadata.c"
+#line 9764 "PhotoMetadata.c"
 	}
 #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp19_;
 #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9728 "PhotoMetadata.c"
+#line 9770 "PhotoMetadata.c"
 }
 
 
@@ -9739,8 +9781,8 @@ static void photo_metadata_internal_photo_preview_class_init (PhotoMetadataInter
 #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((PhotoPreviewClass *) klass)->finalize = photo_metadata_internal_photo_preview_finalize;
 #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	((PhotoPreviewClass *) klass)->flatten = (guint8* (*)(PhotoPreview*, int*, GError**)) photo_metadata_internal_photo_preview_real_flatten;
-#line 9739 "PhotoMetadata.c"
+	((PhotoPreviewClass *) klass)->flatten = (guint8* (*) (PhotoPreview *, int*, GError**)) photo_metadata_internal_photo_preview_real_flatten;
+#line 9781 "PhotoMetadata.c"
 }
 
 
@@ -9748,7 +9790,7 @@ static void photo_metadata_internal_photo_preview_instance_init (PhotoMetadataIn
 }
 
 
-static void photo_metadata_internal_photo_preview_finalize (PhotoPreview* obj) {
+static void photo_metadata_internal_photo_preview_finalize (PhotoPreview * obj) {
 	PhotoMetadataInternalPhotoPreview * self;
 #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, PhotoMetadataInternalPhotoPreview);
@@ -9756,7 +9798,7 @@ static void photo_metadata_internal_photo_preview_finalize (PhotoPreview* obj) {
 	_media_metadata_unref0 (self->owner);
 #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	PHOTO_PREVIEW_CLASS (photo_metadata_internal_photo_preview_parent_class)->finalize (obj);
-#line 9755 "PhotoMetadata.c"
+#line 9797 "PhotoMetadata.c"
 }
 
 
@@ -9773,70 +9815,70 @@ static GType photo_metadata_internal_photo_preview_get_type (void) {
 
 
 static void photo_metadata_class_init (PhotoMetadataClass * klass) {
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar** _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar** _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar** _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	gchar** _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	gchar* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
-	gchar** _tmp30_ = NULL;
-	gchar* _tmp31_ = NULL;
-	gchar* _tmp32_ = NULL;
-	gchar** _tmp33_ = NULL;
-	gchar* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
-	gchar* _tmp36_ = NULL;
-	gchar** _tmp37_ = NULL;
-	NullKeywordTransformer* _tmp38_ = NULL;
-	NullKeywordTransformer* _tmp39_ = NULL;
-	HierarchicalKeywordField* _tmp40_ = NULL;
-	NullKeywordTransformer* _tmp41_ = NULL;
-	NullKeywordTransformer* _tmp42_ = NULL;
-	HierarchicalKeywordField* _tmp43_ = NULL;
-	ACDSeeKeywordTransformer* _tmp44_ = NULL;
-	ACDSeeKeywordTransformer* _tmp45_ = NULL;
-	HierarchicalKeywordField* _tmp46_ = NULL;
-	NullKeywordTransformer* _tmp47_ = NULL;
-	NullKeywordTransformer* _tmp48_ = NULL;
-	HierarchicalKeywordField* _tmp49_ = NULL;
-	NullKeywordTransformer* _tmp50_ = NULL;
-	NullKeywordTransformer* _tmp51_ = NULL;
-	HierarchicalKeywordField* _tmp52_ = NULL;
-	HierarchicalKeywordField** _tmp53_ = NULL;
-	gchar* _tmp54_ = NULL;
-	gchar* _tmp55_ = NULL;
-	gchar* _tmp56_ = NULL;
-	gchar** _tmp57_ = NULL;
-	gchar* _tmp58_ = NULL;
-	gchar* _tmp59_ = NULL;
-	gchar* _tmp60_ = NULL;
-	gchar* _tmp61_ = NULL;
-	gchar* _tmp62_ = NULL;
-	gchar** _tmp63_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar** _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar** _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	gchar** _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	gchar** _tmp19_;
+	gchar* _tmp20_;
+	gchar* _tmp21_;
+	gchar* _tmp22_;
+	gchar* _tmp23_;
+	gchar** _tmp24_;
+	gchar* _tmp25_;
+	gchar* _tmp26_;
+	gchar* _tmp27_;
+	gchar* _tmp28_;
+	gchar* _tmp29_;
+	gchar** _tmp30_;
+	gchar* _tmp31_;
+	gchar* _tmp32_;
+	gchar** _tmp33_;
+	gchar* _tmp34_;
+	gchar* _tmp35_;
+	gchar* _tmp36_;
+	gchar** _tmp37_;
+	NullKeywordTransformer* _tmp38_;
+	NullKeywordTransformer* _tmp39_;
+	HierarchicalKeywordField* _tmp40_;
+	NullKeywordTransformer* _tmp41_;
+	NullKeywordTransformer* _tmp42_;
+	HierarchicalKeywordField* _tmp43_;
+	ACDSeeKeywordTransformer* _tmp44_;
+	ACDSeeKeywordTransformer* _tmp45_;
+	HierarchicalKeywordField* _tmp46_;
+	NullKeywordTransformer* _tmp47_;
+	NullKeywordTransformer* _tmp48_;
+	HierarchicalKeywordField* _tmp49_;
+	NullKeywordTransformer* _tmp50_;
+	NullKeywordTransformer* _tmp51_;
+	HierarchicalKeywordField* _tmp52_;
+	HierarchicalKeywordField** _tmp53_;
+	gchar* _tmp54_;
+	gchar* _tmp55_;
+	gchar* _tmp56_;
+	gchar** _tmp57_;
+	gchar* _tmp58_;
+	gchar* _tmp59_;
+	gchar* _tmp60_;
+	gchar* _tmp61_;
+	gchar* _tmp62_;
+	gchar** _tmp63_;
 #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_parent_class = g_type_class_peek_parent (klass);
 #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9844,13 +9886,13 @@ static void photo_metadata_class_init (PhotoMetadataClass * klass) {
 #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_type_class_add_private (klass, sizeof (PhotoMetadataPrivate));
 #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	((MediaMetadataClass *) klass)->read_from_file = (void (*)(MediaMetadata*, GFile*, GError**)) photo_metadata_real_read_from_file;
+	((MediaMetadataClass *) klass)->read_from_file = (void (*) (MediaMetadata *, GFile*, GError**)) photo_metadata_real_read_from_file;
 #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	((MediaMetadataClass *) klass)->get_creation_date_time = (MetadataDateTime* (*)(MediaMetadata*)) photo_metadata_real_get_creation_date_time;
+	((MediaMetadataClass *) klass)->get_creation_date_time = (MetadataDateTime* (*) (MediaMetadata *)) photo_metadata_real_get_creation_date_time;
 #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	((MediaMetadataClass *) klass)->get_title = (gchar* (*)(MediaMetadata*)) photo_metadata_real_get_title;
+	((MediaMetadataClass *) klass)->get_title = (gchar* (*) (MediaMetadata *)) photo_metadata_real_get_title;
 #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	((MediaMetadataClass *) klass)->get_comment = (gchar* (*)(MediaMetadata*)) photo_metadata_real_get_comment;
+	((MediaMetadataClass *) klass)->get_comment = (gchar* (*) (MediaMetadata *)) photo_metadata_real_get_comment;
 #line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = g_strdup ("Exif.Image.DateTime");
 #line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -10109,13 +10151,13 @@ static void photo_metadata_class_init (PhotoMetadataClass * klass) {
 	photo_metadata_RATING_TAGS = _tmp63_;
 #line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_RATING_TAGS_length1 = 5;
-#line 10108 "PhotoMetadata.c"
+#line 10150 "PhotoMetadata.c"
 }
 
 
 static void photo_metadata_instance_init (PhotoMetadata * self) {
-	GExiv2Metadata* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	GExiv2Metadata* _tmp0_;
+	gchar* _tmp1_;
 #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv = PHOTO_METADATA_GET_PRIVATE (self);
 #line 247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -10128,11 +10170,11 @@ static void photo_metadata_instance_init (PhotoMetadata * self) {
 	_tmp1_ = g_strdup ("<uninitialized>");
 #line 249 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->source_name = _tmp1_;
-#line 10127 "PhotoMetadata.c"
+#line 10169 "PhotoMetadata.c"
 }
 
 
-static void photo_metadata_finalize (MediaMetadata* obj) {
+static void photo_metadata_finalize (MediaMetadata * obj) {
 	PhotoMetadata * self;
 #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_METADATA, PhotoMetadata);
@@ -10144,7 +10186,7 @@ static void photo_metadata_finalize (MediaMetadata* obj) {
 	_g_free0 (self->priv->source_name);
 #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	MEDIA_METADATA_CLASS (photo_metadata_parent_class)->finalize (obj);
-#line 10143 "PhotoMetadata.c"
+#line 10185 "PhotoMetadata.c"
 }
 
 
diff --git a/src/photos/Photos.c b/src/photos/Photos.c
index 72c2778..d859d37 100644
--- a/src/photos/Photos.c
+++ b/src/photos/Photos.c
@@ -1,4 +1,4 @@
-/* Photos.c generated by valac 0.34.7, the Vala compiler
+/* Photos.c generated by valac 0.36.6, the Vala compiler
  * generated from Photos.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -45,8 +45,8 @@ void photos_preconfigure (void) {
 
 
 void photos_init (GError** error) {
-	gint _tmp0_ = 0;
-	PhotoFileFormat* _tmp1_ = NULL;
+	gint _tmp0_;
+	PhotoFileFormat* _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/photos/Photos.vala"
 	_tmp1_ = photo_file_format_get_supported (&_tmp0_);
 #line 53 "Photos.c"
@@ -67,7 +67,7 @@ void photos_init (GError** error) {
 			format = format_collection[format_it];
 #line 69 "Photos.c"
 			{
-				PhotoFileFormat _tmp2_ = 0;
+				PhotoFileFormat _tmp2_;
 #line 24 "/home/jens/Source/shotwell/src/photos/Photos.vala"
 				_tmp2_ = format;
 #line 24 "/home/jens/Source/shotwell/src/photos/Photos.vala"
diff --git a/src/photos/PngSupport.c b/src/photos/PngSupport.c
index 20e79a9..4658dd2 100644
--- a/src/photos/PngSupport.c
+++ b/src/photos/PngSupport.c
@@ -1,4 +1,4 @@
-/* PngSupport.c generated by valac 0.34.7, the Vala compiler
+/* PngSupport.c generated by valac 0.36.6, the Vala compiler
  * generated from PngSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -506,7 +506,7 @@ static gchar* png_file_format_properties_real_get_default_mime_type (PhotoFileFo
 static gchar** png_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1);
 static gchar** _vala_array_dup15 (gchar** self, int length);
 PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type);
-static void png_file_format_properties_finalize (PhotoFileFormatProperties* obj);
+static void png_file_format_properties_finalize (PhotoFileFormatProperties * obj);
 gpointer photo_file_sniffer_ref (gpointer instance);
 void photo_file_sniffer_unref (gpointer instance);
 GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -611,12 +611,12 @@ static PhotoMetadata* png_file_format_driver_real_create_metadata (PhotoFileForm
 PhotoMetadata* photo_metadata_new (void);
 PhotoMetadata* photo_metadata_construct (GType object_type);
 PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type);
-static void png_file_format_driver_finalize (PhotoFileFormatDriver* obj);
+static void png_file_format_driver_finalize (PhotoFileFormatDriver * obj);
 
 static const guint8 PNG_SNIFFER_MAGIC_SEQUENCE[8] = {(guint8) 137, (guint8) 80, (guint8) 78, (guint8) 71, (guint8) 13, (guint8) 10, (guint8) 26, (guint8) 10};
 
 void png_file_format_properties_init (void) {
-	PngFileFormatProperties* _tmp0_ = NULL;
+	PngFileFormatProperties* _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp0_ = png_file_format_properties_new ();
 #line 14 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -636,8 +636,8 @@ static gpointer _photo_file_format_properties_ref0 (gpointer self) {
 
 PngFileFormatProperties* png_file_format_properties_get_instance (void) {
 	PngFileFormatProperties* result = NULL;
-	PngFileFormatProperties* _tmp0_ = NULL;
-	PngFileFormatProperties* _tmp1_ = NULL;
+	PngFileFormatProperties* _tmp0_;
+	PngFileFormatProperties* _tmp1_;
 #line 18 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp0_ = png_file_format_properties_instance;
 #line 18 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -679,29 +679,26 @@ static PhotoFileFormatFlags png_file_format_properties_real_get_flags (PhotoFile
 static gchar* png_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) {
 	PngFileFormatProperties * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
 #line 29 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_PROPERTIES, PngFileFormatProperties);
 #line 30 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	_tmp0_ = _ ("PNG");
+	_tmp0_ = g_strdup (_ ("PNG"));
 #line 30 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 30 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 30 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 695 "PngSupport.c"
+#line 692 "PngSupport.c"
 }
 
 
 static gchar* png_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) {
 	PngFileFormatProperties * self;
 	gchar* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 33 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_PROPERTIES, PngFileFormatProperties);
 #line 34 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -716,7 +713,7 @@ static gchar* png_file_format_properties_real_get_default_extension (PhotoFileFo
 	result = _tmp2_;
 #line 34 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 720 "PngSupport.c"
+#line 717 "PngSupport.c"
 }
 
 
@@ -727,29 +724,29 @@ static gchar** _vala_array_dup14 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 731 "PngSupport.c"
-		gchar* _tmp0_ = NULL;
+#line 728 "PngSupport.c"
+		gchar* _tmp0_;
 #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		result[i] = _tmp0_;
-#line 737 "PngSupport.c"
+#line 734 "PngSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 741 "PngSupport.c"
+#line 738 "PngSupport.c"
 }
 
 
 static gchar** png_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) {
 	PngFileFormatProperties * self;
 	gchar** result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
 #line 37 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_PROPERTIES, PngFileFormatProperties);
 #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -768,23 +765,23 @@ static gchar** png_file_format_properties_real_get_known_extensions (PhotoFileFo
 	if (result_length1) {
 #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 772 "PngSupport.c"
+#line 769 "PngSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	result = _tmp2_;
 #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 778 "PngSupport.c"
+#line 775 "PngSupport.c"
 }
 
 
 static gchar* png_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) {
 	PngFileFormatProperties * self;
 	gchar* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 41 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_PROPERTIES, PngFileFormatProperties);
 #line 42 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -799,7 +796,7 @@ static gchar* png_file_format_properties_real_get_default_mime_type (PhotoFileFo
 	result = _tmp2_;
 #line 42 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 803 "PngSupport.c"
+#line 800 "PngSupport.c"
 }
 
 
@@ -810,29 +807,29 @@ static gchar** _vala_array_dup15 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 814 "PngSupport.c"
-		gchar* _tmp0_ = NULL;
+#line 811 "PngSupport.c"
+		gchar* _tmp0_;
 #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		result[i] = _tmp0_;
-#line 820 "PngSupport.c"
+#line 817 "PngSupport.c"
 	}
 #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 824 "PngSupport.c"
+#line 821 "PngSupport.c"
 }
 
 
 static gchar** png_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) {
 	PngFileFormatProperties * self;
 	gchar** result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
 #line 45 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_PROPERTIES, PngFileFormatProperties);
 #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -851,13 +848,13 @@ static gchar** png_file_format_properties_real_get_mime_types (PhotoFileFormatPr
 	if (result_length1) {
 #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 855 "PngSupport.c"
+#line 852 "PngSupport.c"
 	}
 #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	result = _tmp2_;
 #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 861 "PngSupport.c"
+#line 858 "PngSupport.c"
 }
 
 
@@ -867,40 +864,40 @@ PngFileFormatProperties* png_file_format_properties_construct (GType object_type
 	self = (PngFileFormatProperties*) photo_file_format_properties_construct (object_type);
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return self;
-#line 871 "PngSupport.c"
+#line 868 "PngSupport.c"
 }
 
 
 PngFileFormatProperties* png_file_format_properties_new (void) {
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return png_file_format_properties_construct (TYPE_PNG_FILE_FORMAT_PROPERTIES);
-#line 878 "PngSupport.c"
+#line 875 "PngSupport.c"
 }
 
 
 static void png_file_format_properties_class_init (PngFileFormatPropertiesClass * klass) {
-	gchar* _tmp0_ = NULL;
-	gchar** _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
+	gchar* _tmp0_;
+	gchar** _tmp1_;
+	gchar* _tmp2_;
+	gchar** _tmp3_;
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	png_file_format_properties_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	((PhotoFileFormatPropertiesClass *) klass)->finalize = png_file_format_properties_finalize;
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_file_format;
+	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*) (PhotoFileFormatProperties *)) png_file_format_properties_real_get_file_format;
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_flags;
+	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*) (PhotoFileFormatProperties *)) png_file_format_properties_real_get_flags;
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_user_visible_name;
+	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*) (PhotoFileFormatProperties *)) png_file_format_properties_real_get_user_visible_name;
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_default_extension;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*) (PhotoFileFormatProperties *)) png_file_format_properties_real_get_default_extension;
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) png_file_format_properties_real_get_known_extensions;
+	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*) (PhotoFileFormatProperties *, int*)) png_file_format_properties_real_get_known_extensions;
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_default_mime_type;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*) (PhotoFileFormatProperties *)) png_file_format_properties_real_get_default_mime_type;
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) png_file_format_properties_real_get_mime_types;
+	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*) (PhotoFileFormatProperties *, int*)) png_file_format_properties_real_get_mime_types;
 #line 8 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp0_ = g_strdup ("png");
 #line 8 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -921,7 +918,7 @@ static void png_file_format_properties_class_init (PngFileFormatPropertiesClass
 	png_file_format_properties_KNOWN_MIME_TYPES = _tmp3_;
 #line 9 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	png_file_format_properties_KNOWN_MIME_TYPES_length1 = 1;
-#line 925 "PngSupport.c"
+#line 922 "PngSupport.c"
 }
 
 
@@ -929,13 +926,13 @@ static void png_file_format_properties_instance_init (PngFileFormatProperties *
 }
 
 
-static void png_file_format_properties_finalize (PhotoFileFormatProperties* obj) {
+static void png_file_format_properties_finalize (PhotoFileFormatProperties * obj) {
 	PngFileFormatProperties * self;
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PNG_FILE_FORMAT_PROPERTIES, PngFileFormatProperties);
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	PHOTO_FILE_FORMAT_PROPERTIES_CLASS (png_file_format_properties_parent_class)->finalize (obj);
-#line 939 "PngSupport.c"
+#line 936 "PngSupport.c"
 }
 
 
@@ -953,8 +950,8 @@ GType png_file_format_properties_get_type (void) {
 
 PngSniffer* png_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) {
 	PngSniffer* self = NULL;
-	GFile* _tmp0_ = NULL;
-	PhotoFileSnifferOptions _tmp1_ = 0;
+	GFile* _tmp0_;
+	PhotoFileSnifferOptions _tmp1_;
 #line 53 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 54 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -965,29 +962,29 @@ PngSniffer* png_sniffer_construct (GType object_type, GFile* file, PhotoFileSnif
 	self = (PngSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_);
 #line 53 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return self;
-#line 969 "PngSupport.c"
+#line 966 "PngSupport.c"
 }
 
 
 PngSniffer* png_sniffer_new (GFile* file, PhotoFileSnifferOptions options) {
 #line 53 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return png_sniffer_construct (TYPE_PNG_SNIFFER, file, options);
-#line 976 "PngSupport.c"
+#line 973 "PngSupport.c"
 }
 
 
 static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
 	gboolean result = FALSE;
 	GFileInputStream* instream = NULL;
-	GFile* _tmp0_ = NULL;
-	GFileInputStream* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFileInputStream* _tmp1_;
 	guint8* file_lead_sequence = NULL;
-	guint8* _tmp3_ = NULL;
-	gint file_lead_sequence_length1 = 0;
-	gint _file_lead_sequence_size_ = 0;
-	GFileInputStream* _tmp4_ = NULL;
-	guint8* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
+	guint8* _tmp3_;
+	gint file_lead_sequence_length1;
+	gint _file_lead_sequence_size_;
+	GFileInputStream* _tmp4_;
+	guint8* _tmp5_;
+	gint _tmp5__length1;
 	GError * _inner_error_ = NULL;
 #line 57 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
@@ -999,13 +996,13 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
 	instream = _tmp1_;
 #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1003 "PngSupport.c"
+#line 1000 "PngSupport.c"
 		gboolean _tmp2_ = FALSE;
 #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		return _tmp2_;
-#line 1009 "PngSupport.c"
+#line 1006 "PngSupport.c"
 	}
 #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp3_ = g_new0 (guint8, G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE));
@@ -1025,7 +1022,7 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
 	g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_input_stream_get_type (), GInputStream), _tmp5_, (gsize) _tmp5__length1, NULL, &_inner_error_);
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1029 "PngSupport.c"
+#line 1026 "PngSupport.c"
 		gboolean _tmp6_ = FALSE;
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		g_propagate_error (error, _inner_error_);
@@ -1035,36 +1032,36 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
 		_g_object_unref0 (instream);
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		return _tmp6_;
-#line 1039 "PngSupport.c"
+#line 1036 "PngSupport.c"
 	}
 	{
 		gint i = 0;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		i = 0;
-#line 1045 "PngSupport.c"
+#line 1042 "PngSupport.c"
 		{
 			gboolean _tmp7_ = FALSE;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			_tmp7_ = TRUE;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			while (TRUE) {
-#line 1052 "PngSupport.c"
-				gint _tmp9_ = 0;
-				guint8* _tmp10_ = NULL;
-				gint _tmp10__length1 = 0;
-				gint _tmp11_ = 0;
-				guint8 _tmp12_ = 0U;
-				gint _tmp13_ = 0;
-				guint8 _tmp14_ = 0U;
+#line 1049 "PngSupport.c"
+				gint _tmp9_;
+				guint8* _tmp10_;
+				gint _tmp10__length1;
+				gint _tmp11_;
+				guint8 _tmp12_;
+				gint _tmp13_;
+				guint8 _tmp14_;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 				if (!_tmp7_) {
-#line 1062 "PngSupport.c"
-					gint _tmp8_ = 0;
+#line 1059 "PngSupport.c"
+					gint _tmp8_;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 					_tmp8_ = i;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 					i = _tmp8_ + 1;
-#line 1068 "PngSupport.c"
+#line 1065 "PngSupport.c"
 				}
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 				_tmp7_ = FALSE;
@@ -1074,7 +1071,7 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
 				if (!(_tmp9_ < G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE))) {
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 					break;
-#line 1078 "PngSupport.c"
+#line 1075 "PngSupport.c"
 				}
 #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 				_tmp10_ = file_lead_sequence;
@@ -1098,7 +1095,7 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
 					_g_object_unref0 (instream);
 #line 66 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 					return result;
-#line 1102 "PngSupport.c"
+#line 1099 "PngSupport.c"
 				}
 			}
 		}
@@ -1111,14 +1108,14 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
 	_g_object_unref0 (instream);
 #line 69 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1115 "PngSupport.c"
+#line 1112 "PngSupport.c"
 }
 
 
 static gpointer _detected_photo_information_ref0 (gpointer self) {
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return self ? detected_photo_information_ref (self) : NULL;
-#line 1122 "PngSupport.c"
+#line 1119 "PngSupport.c"
 }
 
 
@@ -1127,16 +1124,16 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
 	gboolean _vala_is_corrupted = FALSE;
 	DetectedPhotoInformation* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 	DetectedPhotoInformation* detected = NULL;
 	gboolean _tmp3_ = FALSE;
-	DetectedPhotoInformation* _tmp4_ = NULL;
-	DetectedPhotoInformation* _tmp5_ = NULL;
+	DetectedPhotoInformation* _tmp4_;
+	DetectedPhotoInformation* _tmp5_;
 	DetectedPhotoInformation* _tmp6_ = NULL;
-	DetectedPhotoInformation* _tmp7_ = NULL;
-	PhotoFileFormat _tmp8_ = 0;
-	DetectedPhotoInformation* _tmp10_ = NULL;
+	DetectedPhotoInformation* _tmp7_;
+	PhotoFileFormat _tmp8_;
+	DetectedPhotoInformation* _tmp10_;
 	GError * _inner_error_ = NULL;
 #line 72 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_SNIFFER, PngSniffer);
@@ -1154,7 +1151,7 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
 		g_propagate_error (error, _inner_error_);
 #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		return NULL;
-#line 1158 "PngSupport.c"
+#line 1155 "PngSupport.c"
 	}
 #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (!_tmp0_) {
@@ -1164,11 +1161,11 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
 		if (is_corrupted) {
 #line 77 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			*is_corrupted = _vala_is_corrupted;
-#line 1168 "PngSupport.c"
+#line 1165 "PngSupport.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		return result;
-#line 1172 "PngSupport.c"
+#line 1169 "PngSupport.c"
 	}
 #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp4_ = PHOTO_FILE_SNIFFER_CLASS (png_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp3_, &_inner_error_);
@@ -1182,7 +1179,7 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
 		g_propagate_error (error, _inner_error_);
 #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		return NULL;
-#line 1186 "PngSupport.c"
+#line 1183 "PngSupport.c"
 	}
 #line 80 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp5_ = detected;
@@ -1196,11 +1193,11 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
 		if (is_corrupted) {
 #line 81 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			*is_corrupted = _vala_is_corrupted;
-#line 1200 "PngSupport.c"
+#line 1197 "PngSupport.c"
 		}
 #line 81 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		return result;
-#line 1204 "PngSupport.c"
+#line 1201 "PngSupport.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp7_ = detected;
@@ -1208,17 +1205,17 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
 	_tmp8_ = _tmp7_->file_format;
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (_tmp8_ == PHOTO_FILE_FORMAT_PNG) {
-#line 1212 "PngSupport.c"
-		DetectedPhotoInformation* _tmp9_ = NULL;
+#line 1209 "PngSupport.c"
+		DetectedPhotoInformation* _tmp9_;
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp9_ = detected;
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp6_ = _tmp9_;
-#line 1218 "PngSupport.c"
+#line 1215 "PngSupport.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp6_ = NULL;
-#line 1222 "PngSupport.c"
+#line 1219 "PngSupport.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp10_ = _detected_photo_information_ref0 (_tmp6_);
@@ -1230,11 +1227,11 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
 	if (is_corrupted) {
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		*is_corrupted = _vala_is_corrupted;
-#line 1234 "PngSupport.c"
+#line 1231 "PngSupport.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1238 "PngSupport.c"
+#line 1235 "PngSupport.c"
 }
 
 
@@ -1242,8 +1239,8 @@ static void png_sniffer_class_init (PngSnifferClass * klass) {
 #line 50 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	png_sniffer_parent_class = g_type_class_peek_parent (klass);
 #line 50 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) png_sniffer_real_sniff;
-#line 1247 "PngSupport.c"
+	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) png_sniffer_real_sniff;
+#line 1244 "PngSupport.c"
 }
 
 
@@ -1265,7 +1262,7 @@ GType png_sniffer_get_type (void) {
 
 PngReader* png_reader_construct (GType object_type, const gchar* filepath) {
 	PngReader* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 88 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 89 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1274,14 +1271,14 @@ PngReader* png_reader_construct (GType object_type, const gchar* filepath) {
 	self = (PngReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG);
 #line 88 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return self;
-#line 1278 "PngSupport.c"
+#line 1275 "PngSupport.c"
 }
 
 
 PngReader* png_reader_new (const gchar* filepath) {
 #line 88 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return png_reader_construct (TYPE_PNG_READER, filepath);
-#line 1285 "PngSupport.c"
+#line 1282 "PngSupport.c"
 }
 
 
@@ -1291,8 +1288,8 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 	GdkPixbuf* _result_ = NULL;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	Dimensions _tmp2_ = {0};
-	gint _tmp3_ = 0;
+	Dimensions _tmp2_;
+	gint _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 92 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_READER, PngReader);
@@ -1310,24 +1307,24 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 	if (_tmp3_ > 9999) {
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp1_ = TRUE;
-#line 1314 "PngSupport.c"
+#line 1311 "PngSupport.c"
 	} else {
-		Dimensions _tmp4_ = {0};
-		gint _tmp5_ = 0;
+		Dimensions _tmp4_;
+		gint _tmp5_;
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp4_ = *full;
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp5_ = _tmp4_.height;
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp1_ = _tmp5_ > 9999;
-#line 1324 "PngSupport.c"
+#line 1321 "PngSupport.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (_tmp1_) {
-#line 1328 "PngSupport.c"
+#line 1325 "PngSupport.c"
 		gboolean _tmp6_ = FALSE;
-		Dimensions _tmp7_ = {0};
-		gint _tmp8_ = 0;
+		Dimensions _tmp7_;
+		gint _tmp8_;
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp7_ = *scaled;
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1336,47 +1333,47 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		if (_tmp8_ < 100) {
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			_tmp6_ = TRUE;
-#line 1340 "PngSupport.c"
+#line 1337 "PngSupport.c"
 		} else {
-			Dimensions _tmp9_ = {0};
-			gint _tmp10_ = 0;
+			Dimensions _tmp9_;
+			gint _tmp10_;
 #line 103 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			_tmp9_ = *scaled;
 #line 103 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			_tmp10_ = _tmp9_.height;
 #line 103 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			_tmp6_ = _tmp10_ < 100;
-#line 1350 "PngSupport.c"
+#line 1347 "PngSupport.c"
 		}
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp0_ = _tmp6_;
-#line 1354 "PngSupport.c"
+#line 1351 "PngSupport.c"
 	} else {
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp0_ = FALSE;
-#line 1358 "PngSupport.c"
+#line 1355 "PngSupport.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (_tmp0_) {
-#line 1362 "PngSupport.c"
+#line 1359 "PngSupport.c"
 		Dimensions prefetch_dimensions = {0};
 		Dimensions _tmp11_ = {0};
 		GdkPixbuf* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		Dimensions _tmp15_ = {0};
-		gint _tmp16_ = 0;
-		Dimensions _tmp17_ = {0};
-		gint _tmp18_ = 0;
-		GdkPixbuf* _tmp19_ = NULL;
-		GdkPixbuf* _tmp20_ = NULL;
-		GdkPixbuf* _tmp21_ = NULL;
-		GdkPixbuf* _tmp22_ = NULL;
-		Dimensions _tmp23_ = {0};
-		gint _tmp24_ = 0;
-		Dimensions _tmp25_ = {0};
-		gint _tmp26_ = 0;
-		GdkPixbuf* _tmp27_ = NULL;
+		gchar* _tmp13_;
+		gchar* _tmp14_;
+		Dimensions _tmp15_;
+		gint _tmp16_;
+		Dimensions _tmp17_;
+		gint _tmp18_;
+		GdkPixbuf* _tmp19_;
+		GdkPixbuf* _tmp20_;
+		GdkPixbuf* _tmp21_;
+		GdkPixbuf* _tmp22_;
+		Dimensions _tmp23_;
+		gint _tmp24_;
+		Dimensions _tmp25_;
+		gint _tmp26_;
+		GdkPixbuf* _tmp27_;
 #line 104 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		dimensions_get_scaled_by_constraint (full, 1000, SCALE_CONSTRAINT_DIMENSIONS, &_tmp11_);
 #line 104 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1409,7 +1406,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 			_g_object_unref0 (_result_);
 #line 107 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			return NULL;
-#line 1413 "PngSupport.c"
+#line 1410 "PngSupport.c"
 		}
 #line 107 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp21_ = _tmp12_;
@@ -1437,18 +1434,18 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		_result_ = _tmp27_;
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_g_object_unref0 (_tmp12_);
-#line 1441 "PngSupport.c"
+#line 1438 "PngSupport.c"
 	} else {
 		GdkPixbuf* _tmp28_ = NULL;
-		gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		Dimensions _tmp31_ = {0};
-		gint _tmp32_ = 0;
-		Dimensions _tmp33_ = {0};
-		gint _tmp34_ = 0;
-		GdkPixbuf* _tmp35_ = NULL;
-		GdkPixbuf* _tmp36_ = NULL;
-		GdkPixbuf* _tmp37_ = NULL;
+		gchar* _tmp29_;
+		gchar* _tmp30_;
+		Dimensions _tmp31_;
+		gint _tmp32_;
+		Dimensions _tmp33_;
+		gint _tmp34_;
+		GdkPixbuf* _tmp35_;
+		GdkPixbuf* _tmp36_;
+		GdkPixbuf* _tmp37_;
 #line 112 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp29_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 112 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1477,7 +1474,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 			_g_object_unref0 (_result_);
 #line 112 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			return NULL;
-#line 1481 "PngSupport.c"
+#line 1478 "PngSupport.c"
 		}
 #line 112 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp37_ = _tmp28_;
@@ -1489,13 +1486,13 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		_result_ = _tmp37_;
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_g_object_unref0 (_tmp28_);
-#line 1493 "PngSupport.c"
+#line 1490 "PngSupport.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	result = _result_;
 #line 116 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1499 "PngSupport.c"
+#line 1496 "PngSupport.c"
 }
 
 
@@ -1503,8 +1500,8 @@ static void png_reader_class_init (PngReaderClass * klass) {
 #line 87 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	png_reader_parent_class = g_type_class_peek_parent (klass);
 #line 87 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) png_reader_real_scaled_read;
-#line 1508 "PngSupport.c"
+	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) png_reader_real_scaled_read;
+#line 1505 "PngSupport.c"
 }
 
 
@@ -1526,7 +1523,7 @@ GType png_reader_get_type (void) {
 
 PngWriter* png_writer_construct (GType object_type, const gchar* filepath) {
 	PngWriter* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 121 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 122 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1535,22 +1532,22 @@ PngWriter* png_writer_construct (GType object_type, const gchar* filepath) {
 	self = (PngWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG);
 #line 121 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return self;
-#line 1539 "PngSupport.c"
+#line 1536 "PngSupport.c"
 }
 
 
 PngWriter* png_writer_new (const gchar* filepath) {
 #line 121 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return png_writer_construct (TYPE_PNG_WRITER, filepath);
-#line 1546 "PngSupport.c"
+#line 1543 "PngSupport.c"
 }
 
 
 static void png_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) {
 	PngWriter * self;
-	GdkPixbuf* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	GdkPixbuf* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 125 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_WRITER, PngWriter);
@@ -1572,7 +1569,7 @@ static void png_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, Jpe
 		g_propagate_error (error, _inner_error_);
 #line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		return;
-#line 1576 "PngSupport.c"
+#line 1573 "PngSupport.c"
 	}
 }
 
@@ -1581,8 +1578,8 @@ static void png_writer_class_init (PngWriterClass * klass) {
 #line 120 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	png_writer_parent_class = g_type_class_peek_parent (klass);
 #line 120 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) png_writer_real_write;
-#line 1586 "PngSupport.c"
+	((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) png_writer_real_write;
+#line 1583 "PngSupport.c"
 }
 
 
@@ -1604,7 +1601,7 @@ GType png_writer_get_type (void) {
 
 PngMetadataWriter* png_metadata_writer_construct (GType object_type, const gchar* filepath) {
 	PngMetadataWriter* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 131 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 132 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1613,22 +1610,22 @@ PngMetadataWriter* png_metadata_writer_construct (GType object_type, const gchar
 	self = (PngMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG);
 #line 131 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return self;
-#line 1617 "PngSupport.c"
+#line 1614 "PngSupport.c"
 }
 
 
 PngMetadataWriter* png_metadata_writer_new (const gchar* filepath) {
 #line 131 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return png_metadata_writer_construct (TYPE_PNG_METADATA_WRITER, filepath);
-#line 1624 "PngSupport.c"
+#line 1621 "PngSupport.c"
 }
 
 
 static void png_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error) {
 	PngMetadataWriter * self;
-	PhotoMetadata* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	PhotoMetadata* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 135 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_METADATA_WRITER, PngMetadataWriter);
@@ -1650,7 +1647,7 @@ static void png_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* ba
 		g_propagate_error (error, _inner_error_);
 #line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		return;
-#line 1654 "PngSupport.c"
+#line 1651 "PngSupport.c"
 	}
 }
 
@@ -1659,8 +1656,8 @@ static void png_metadata_writer_class_init (PngMetadataWriterClass * klass) {
 #line 130 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	png_metadata_writer_parent_class = g_type_class_peek_parent (klass);
 #line 130 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) png_metadata_writer_real_write_metadata;
-#line 1664 "PngSupport.c"
+	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) png_metadata_writer_real_write_metadata;
+#line 1661 "PngSupport.c"
 }
 
 
@@ -1681,7 +1678,7 @@ GType png_metadata_writer_get_type (void) {
 
 
 void png_file_format_driver_init (void) {
-	PngFileFormatDriver* _tmp0_ = NULL;
+	PngFileFormatDriver* _tmp0_;
 #line 144 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp0_ = png_file_format_driver_new ();
 #line 144 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1690,21 +1687,21 @@ void png_file_format_driver_init (void) {
 	png_file_format_driver_instance = _tmp0_;
 #line 145 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	png_file_format_properties_init ();
-#line 1694 "PngSupport.c"
+#line 1691 "PngSupport.c"
 }
 
 
 static gpointer _photo_file_format_driver_ref0 (gpointer self) {
 #line 149 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return self ? photo_file_format_driver_ref (self) : NULL;
-#line 1701 "PngSupport.c"
+#line 1698 "PngSupport.c"
 }
 
 
 PngFileFormatDriver* png_file_format_driver_get_instance (void) {
 	PngFileFormatDriver* result = NULL;
-	PngFileFormatDriver* _tmp0_ = NULL;
-	PngFileFormatDriver* _tmp1_ = NULL;
+	PngFileFormatDriver* _tmp0_;
+	PngFileFormatDriver* _tmp1_;
 #line 149 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp0_ = png_file_format_driver_instance;
 #line 149 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1713,14 +1710,14 @@ PngFileFormatDriver* png_file_format_driver_get_instance (void) {
 	result = _tmp1_;
 #line 149 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1717 "PngSupport.c"
+#line 1714 "PngSupport.c"
 }
 
 
 static PhotoFileFormatProperties* png_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) {
 	PngFileFormatDriver * self;
 	PhotoFileFormatProperties* result = NULL;
-	PngFileFormatProperties* _tmp0_ = NULL;
+	PngFileFormatProperties* _tmp0_;
 #line 152 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver);
 #line 153 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1729,15 +1726,15 @@ static PhotoFileFormatProperties* png_file_format_driver_real_get_properties (Ph
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties);
 #line 153 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1733 "PngSupport.c"
+#line 1730 "PngSupport.c"
 }
 
 
 static PhotoFileReader* png_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) {
 	PngFileFormatDriver * self;
 	PhotoFileReader* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	PngReader* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	PngReader* _tmp1_;
 #line 156 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver);
 #line 156 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1750,7 +1747,7 @@ static PhotoFileReader* png_file_format_driver_real_create_reader (PhotoFileForm
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader);
 #line 157 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1754 "PngSupport.c"
+#line 1751 "PngSupport.c"
 }
 
 
@@ -1763,7 +1760,7 @@ static gboolean png_file_format_driver_real_can_write_image (PhotoFileFormatDriv
 	result = TRUE;
 #line 161 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1767 "PngSupport.c"
+#line 1764 "PngSupport.c"
 }
 
 
@@ -1776,15 +1773,15 @@ static gboolean png_file_format_driver_real_can_write_metadata (PhotoFileFormatD
 	result = TRUE;
 #line 165 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1780 "PngSupport.c"
+#line 1777 "PngSupport.c"
 }
 
 
 static PhotoFileWriter* png_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) {
 	PngFileFormatDriver * self;
 	PhotoFileWriter* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	PngWriter* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	PngWriter* _tmp1_;
 #line 168 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver);
 #line 168 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1797,15 +1794,15 @@ static PhotoFileWriter* png_file_format_driver_real_create_writer (PhotoFileForm
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter);
 #line 169 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1801 "PngSupport.c"
+#line 1798 "PngSupport.c"
 }
 
 
 static PhotoFileMetadataWriter* png_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) {
 	PngFileFormatDriver * self;
 	PhotoFileMetadataWriter* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	PngMetadataWriter* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	PngMetadataWriter* _tmp1_;
 #line 172 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver);
 #line 172 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1818,16 +1815,16 @@ static PhotoFileMetadataWriter* png_file_format_driver_real_create_metadata_writ
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter);
 #line 173 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1822 "PngSupport.c"
+#line 1819 "PngSupport.c"
 }
 
 
 static PhotoFileSniffer* png_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) {
 	PngFileFormatDriver * self;
 	PhotoFileSniffer* result = NULL;
-	GFile* _tmp0_ = NULL;
-	PhotoFileSnifferOptions _tmp1_ = 0;
-	PngSniffer* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	PhotoFileSnifferOptions _tmp1_;
+	PngSniffer* _tmp2_;
 #line 176 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver);
 #line 176 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1842,14 +1839,14 @@ static PhotoFileSniffer* png_file_format_driver_real_create_sniffer (PhotoFileFo
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer);
 #line 177 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1846 "PngSupport.c"
+#line 1843 "PngSupport.c"
 }
 
 
 static PhotoMetadata* png_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) {
 	PngFileFormatDriver * self;
 	PhotoMetadata* result = NULL;
-	PhotoMetadata* _tmp0_ = NULL;
+	PhotoMetadata* _tmp0_;
 #line 180 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver);
 #line 181 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1858,7 +1855,7 @@ static PhotoMetadata* png_file_format_driver_real_create_metadata (PhotoFileForm
 	result = _tmp0_;
 #line 181 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1862 "PngSupport.c"
+#line 1859 "PngSupport.c"
 }
 
 
@@ -1868,14 +1865,14 @@ PngFileFormatDriver* png_file_format_driver_construct (GType object_type) {
 	self = (PngFileFormatDriver*) photo_file_format_driver_construct (object_type);
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return self;
-#line 1872 "PngSupport.c"
+#line 1869 "PngSupport.c"
 }
 
 
 PngFileFormatDriver* png_file_format_driver_new (void) {
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return png_file_format_driver_construct (TYPE_PNG_FILE_FORMAT_DRIVER);
-#line 1879 "PngSupport.c"
+#line 1876 "PngSupport.c"
 }
 
 
@@ -1885,22 +1882,22 @@ static void png_file_format_driver_class_init (PngFileFormatDriverClass * klass)
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	((PhotoFileFormatDriverClass *) klass)->finalize = png_file_format_driver_finalize;
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) png_file_format_driver_real_get_properties;
+	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*) (PhotoFileFormatDriver *)) png_file_format_driver_real_get_properties;
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) png_file_format_driver_real_create_reader;
+	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*) (PhotoFileFormatDriver *, const gchar*)) png_file_format_driver_real_create_reader;
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) png_file_format_driver_real_can_write_image;
+	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*) (PhotoFileFormatDriver *)) png_file_format_driver_real_can_write_image;
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) png_file_format_driver_real_can_write_metadata;
+	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*) (PhotoFileFormatDriver *)) png_file_format_driver_real_can_write_metadata;
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) png_file_format_driver_real_create_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*) (PhotoFileFormatDriver *, const gchar*)) png_file_format_driver_real_create_writer;
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) png_file_format_driver_real_create_metadata_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) png_file_format_driver_real_create_metadata_writer;
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) png_file_format_driver_real_create_sniffer;
+	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) png_file_format_driver_real_create_sniffer;
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) png_file_format_driver_real_create_metadata;
-#line 1904 "PngSupport.c"
+	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) png_file_format_driver_real_create_metadata;
+#line 1901 "PngSupport.c"
 }
 
 
@@ -1908,13 +1905,13 @@ static void png_file_format_driver_instance_init (PngFileFormatDriver * self) {
 }
 
 
-static void png_file_format_driver_finalize (PhotoFileFormatDriver* obj) {
+static void png_file_format_driver_finalize (PhotoFileFormatDriver * obj) {
 	PngFileFormatDriver * self;
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver);
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	PHOTO_FILE_FORMAT_DRIVER_CLASS (png_file_format_driver_parent_class)->finalize (obj);
-#line 1918 "PngSupport.c"
+#line 1915 "PngSupport.c"
 }
 
 
diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c
index 8e23487..8b670ea 100644
--- a/src/photos/RawSupport.c
+++ b/src/photos/RawSupport.c
@@ -1,4 +1,4 @@
-/* RawSupport.c generated by valac 0.34.7, the Vala compiler
+/* RawSupport.c generated by valac 0.36.6, the Vala compiler
  * generated from RawSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -546,7 +546,7 @@ RawSniffer* raw_sniffer_new (GFile* file, PhotoFileSnifferOptions options);
 RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options);
 GType raw_sniffer_get_type (void) G_GNUC_CONST;
 PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type);
-static void raw_file_format_driver_finalize (PhotoFileFormatDriver* obj);
+static void raw_file_format_driver_finalize (PhotoFileFormatDriver * obj);
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 GType photo_file_format_flags_get_type (void) G_GNUC_CONST;
 enum  {
@@ -564,7 +564,7 @@ static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFo
 static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1);
 static gchar** _vala_array_dup13 (gchar** self, int length);
 PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type);
-static void raw_file_format_properties_finalize (PhotoFileFormatProperties* obj);
+static void raw_file_format_properties_finalize (PhotoFileFormatProperties * obj);
 gpointer detected_photo_information_ref (gpointer instance);
 void detected_photo_information_unref (gpointer instance);
 GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -646,7 +646,8 @@ GType backing_photo_row_get_type (void) G_GNUC_CONST;
 BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error);
 BackingPhotoRow* backing_photo_row_new (void);
 BackingPhotoRow* backing_photo_row_construct (GType object_type);
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
+gchar* library_files_convert_basename (const gchar* basename);
 GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error);
 gboolean claim_file (GFile* file, GError** error);
 GType backing_photo_id_get_type (void) G_GNUC_CONST;
@@ -656,7 +657,7 @@ GType orientation_get_type (void) G_GNUC_CONST;
 
 
 void raw_file_format_driver_init (void) {
-	RawFileFormatDriver* _tmp0_ = NULL;
+	RawFileFormatDriver* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = raw_file_format_driver_new ();
 #line 11 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -665,21 +666,21 @@ void raw_file_format_driver_init (void) {
 	raw_file_format_driver_instance = _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_file_format_properties_init ();
-#line 669 "RawSupport.c"
+#line 670 "RawSupport.c"
 }
 
 
 static gpointer _photo_file_format_driver_ref0 (gpointer self) {
 #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self ? photo_file_format_driver_ref (self) : NULL;
-#line 676 "RawSupport.c"
+#line 677 "RawSupport.c"
 }
 
 
 RawFileFormatDriver* raw_file_format_driver_get_instance (void) {
 	RawFileFormatDriver* result = NULL;
-	RawFileFormatDriver* _tmp0_ = NULL;
-	RawFileFormatDriver* _tmp1_ = NULL;
+	RawFileFormatDriver* _tmp0_;
+	RawFileFormatDriver* _tmp1_;
 #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = raw_file_format_driver_instance;
 #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -688,14 +689,14 @@ RawFileFormatDriver* raw_file_format_driver_get_instance (void) {
 	result = _tmp1_;
 #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 692 "RawSupport.c"
+#line 693 "RawSupport.c"
 }
 
 
 static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) {
 	RawFileFormatDriver * self;
 	PhotoFileFormatProperties* result = NULL;
-	RawFileFormatProperties* _tmp0_ = NULL;
+	RawFileFormatProperties* _tmp0_;
 #line 19 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver);
 #line 20 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -704,15 +705,15 @@ static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (Ph
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties);
 #line 20 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 708 "RawSupport.c"
+#line 709 "RawSupport.c"
 }
 
 
 static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) {
 	RawFileFormatDriver * self;
 	PhotoFileReader* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	RawReader* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	RawReader* _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver);
 #line 23 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -725,14 +726,14 @@ static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileForm
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader);
 #line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 729 "RawSupport.c"
+#line 730 "RawSupport.c"
 }
 
 
 static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) {
 	RawFileFormatDriver * self;
 	PhotoMetadata* result = NULL;
-	PhotoMetadata* _tmp0_ = NULL;
+	PhotoMetadata* _tmp0_;
 #line 27 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver);
 #line 28 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -741,7 +742,7 @@ static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileForm
 	result = _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 745 "RawSupport.c"
+#line 746 "RawSupport.c"
 }
 
 
@@ -754,7 +755,7 @@ static gboolean raw_file_format_driver_real_can_write_image (PhotoFileFormatDriv
 	result = FALSE;
 #line 32 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 758 "RawSupport.c"
+#line 759 "RawSupport.c"
 }
 
 
@@ -767,7 +768,7 @@ static gboolean raw_file_format_driver_real_can_write_metadata (PhotoFileFormatD
 	result = FALSE;
 #line 36 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 771 "RawSupport.c"
+#line 772 "RawSupport.c"
 }
 
 
@@ -782,7 +783,7 @@ static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileForm
 	result = NULL;
 #line 40 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 786 "RawSupport.c"
+#line 787 "RawSupport.c"
 }
 
 
@@ -797,16 +798,16 @@ static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writ
 	result = NULL;
 #line 44 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 801 "RawSupport.c"
+#line 802 "RawSupport.c"
 }
 
 
 static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) {
 	RawFileFormatDriver * self;
 	PhotoFileSniffer* result = NULL;
-	GFile* _tmp0_ = NULL;
-	PhotoFileSnifferOptions _tmp1_ = 0;
-	RawSniffer* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	PhotoFileSnifferOptions _tmp1_;
+	RawSniffer* _tmp2_;
 #line 47 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver);
 #line 47 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -821,7 +822,7 @@ static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFo
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer);
 #line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 825 "RawSupport.c"
+#line 826 "RawSupport.c"
 }
 
 
@@ -831,14 +832,14 @@ RawFileFormatDriver* raw_file_format_driver_construct (GType object_type) {
 	self = (RawFileFormatDriver*) photo_file_format_driver_construct (object_type);
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self;
-#line 835 "RawSupport.c"
+#line 836 "RawSupport.c"
 }
 
 
 RawFileFormatDriver* raw_file_format_driver_new (void) {
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return raw_file_format_driver_construct (TYPE_RAW_FILE_FORMAT_DRIVER);
-#line 842 "RawSupport.c"
+#line 843 "RawSupport.c"
 }
 
 
@@ -848,22 +849,22 @@ static void raw_file_format_driver_class_init (RawFileFormatDriverClass * klass)
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileFormatDriverClass *) klass)->finalize = raw_file_format_driver_finalize;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_get_properties;
+	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*) (PhotoFileFormatDriver *)) raw_file_format_driver_real_get_properties;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) raw_file_format_driver_real_create_reader;
+	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*) (PhotoFileFormatDriver *, const gchar*)) raw_file_format_driver_real_create_reader;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_create_metadata;
+	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) raw_file_format_driver_real_create_metadata;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_can_write_image;
+	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*) (PhotoFileFormatDriver *)) raw_file_format_driver_real_can_write_image;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_can_write_metadata;
+	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*) (PhotoFileFormatDriver *)) raw_file_format_driver_real_can_write_metadata;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) raw_file_format_driver_real_create_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*) (PhotoFileFormatDriver *, const gchar*)) raw_file_format_driver_real_create_writer;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) raw_file_format_driver_real_create_metadata_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) raw_file_format_driver_real_create_metadata_writer;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) raw_file_format_driver_real_create_sniffer;
-#line 867 "RawSupport.c"
+	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) raw_file_format_driver_real_create_sniffer;
+#line 868 "RawSupport.c"
 }
 
 
@@ -871,13 +872,13 @@ static void raw_file_format_driver_instance_init (RawFileFormatDriver * self) {
 }
 
 
-static void raw_file_format_driver_finalize (PhotoFileFormatDriver* obj) {
+static void raw_file_format_driver_finalize (PhotoFileFormatDriver * obj) {
 	RawFileFormatDriver * self;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver);
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	PHOTO_FILE_FORMAT_DRIVER_CLASS (raw_file_format_driver_parent_class)->finalize (obj);
-#line 881 "RawSupport.c"
+#line 882 "RawSupport.c"
 }
 
 
@@ -894,28 +895,28 @@ GType raw_file_format_driver_get_type (void) {
 
 
 void raw_file_format_properties_init (void) {
-	RawFileFormatProperties* _tmp0_ = NULL;
+	RawFileFormatProperties* _tmp0_;
 #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = raw_file_format_properties_new ();
 #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_photo_file_format_properties_unref0 (raw_file_format_properties_instance);
 #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_file_format_properties_instance = _tmp0_;
-#line 905 "RawSupport.c"
+#line 906 "RawSupport.c"
 }
 
 
 static gpointer _photo_file_format_properties_ref0 (gpointer self) {
 #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self ? photo_file_format_properties_ref (self) : NULL;
-#line 912 "RawSupport.c"
+#line 913 "RawSupport.c"
 }
 
 
 RawFileFormatProperties* raw_file_format_properties_get_instance (void) {
 	RawFileFormatProperties* result = NULL;
-	RawFileFormatProperties* _tmp0_ = NULL;
-	RawFileFormatProperties* _tmp1_ = NULL;
+	RawFileFormatProperties* _tmp0_;
+	RawFileFormatProperties* _tmp1_;
 #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = raw_file_format_properties_instance;
 #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -924,7 +925,7 @@ RawFileFormatProperties* raw_file_format_properties_get_instance (void) {
 	result = _tmp1_;
 #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 928 "RawSupport.c"
+#line 929 "RawSupport.c"
 }
 
 
@@ -937,26 +938,23 @@ static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFil
 	result = PHOTO_FILE_FORMAT_RAW;
 #line 130 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 941 "RawSupport.c"
+#line 942 "RawSupport.c"
 }
 
 
 static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) {
 	RawFileFormatProperties * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
 #line 133 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties);
 #line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp0_ = _ ("RAW");
+	_tmp0_ = g_strdup (_ ("RAW"));
 #line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 960 "RawSupport.c"
+#line 958 "RawSupport.c"
 }
 
 
@@ -969,14 +967,14 @@ static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFile
 	result = PHOTO_FILE_FORMAT_FLAGS_NONE;
 #line 138 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 973 "RawSupport.c"
+#line 971 "RawSupport.c"
 }
 
 
 static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) {
 	RawFileFormatProperties * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 141 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties);
 #line 145 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -985,7 +983,7 @@ static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFo
 	result = _tmp0_;
 #line 145 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 989 "RawSupport.c"
+#line 987 "RawSupport.c"
 }
 
 
@@ -996,29 +994,29 @@ static gchar** _vala_array_dup12 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 1000 "RawSupport.c"
-		gchar* _tmp0_ = NULL;
+#line 998 "RawSupport.c"
+		gchar* _tmp0_;
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		result[i] = _tmp0_;
-#line 1006 "RawSupport.c"
+#line 1004 "RawSupport.c"
 	}
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1010 "RawSupport.c"
+#line 1008 "RawSupport.c"
 }
 
 
 static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) {
 	RawFileFormatProperties * self;
 	gchar** result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
 #line 148 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties);
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1037,23 +1035,23 @@ static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFo
 	if (result_length1) {
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 1041 "RawSupport.c"
+#line 1039 "RawSupport.c"
 	}
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = _tmp2_;
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1047 "RawSupport.c"
+#line 1045 "RawSupport.c"
 }
 
 
 static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) {
 	RawFileFormatProperties * self;
 	gchar* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 152 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties);
 #line 153 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1068,7 +1066,7 @@ static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFo
 	result = _tmp2_;
 #line 153 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1072 "RawSupport.c"
+#line 1070 "RawSupport.c"
 }
 
 
@@ -1079,29 +1077,29 @@ static gchar** _vala_array_dup13 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 1083 "RawSupport.c"
-		gchar* _tmp0_ = NULL;
+#line 1081 "RawSupport.c"
+		gchar* _tmp0_;
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		result[i] = _tmp0_;
-#line 1089 "RawSupport.c"
+#line 1087 "RawSupport.c"
 	}
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1093 "RawSupport.c"
+#line 1091 "RawSupport.c"
 }
 
 
 static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) {
 	RawFileFormatProperties * self;
 	gchar** result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
 #line 156 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties);
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1120,13 +1118,13 @@ static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatPr
 	if (result_length1) {
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 1124 "RawSupport.c"
+#line 1122 "RawSupport.c"
 	}
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = _tmp2_;
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1130 "RawSupport.c"
+#line 1128 "RawSupport.c"
 }
 
 
@@ -1136,125 +1134,125 @@ RawFileFormatProperties* raw_file_format_properties_construct (GType object_type
 	self = (RawFileFormatProperties*) photo_file_format_properties_construct (object_type);
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self;
-#line 1140 "RawSupport.c"
+#line 1138 "RawSupport.c"
 }
 
 
 RawFileFormatProperties* raw_file_format_properties_new (void) {
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return raw_file_format_properties_construct (TYPE_RAW_FILE_FORMAT_PROPERTIES);
-#line 1147 "RawSupport.c"
+#line 1145 "RawSupport.c"
 }
 
 
 static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass * klass) {
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	gchar* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	gchar* _tmp31_ = NULL;
-	gchar* _tmp32_ = NULL;
-	gchar* _tmp33_ = NULL;
-	gchar* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
-	gchar** _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
-	gchar* _tmp39_ = NULL;
-	gchar* _tmp40_ = NULL;
-	gchar* _tmp41_ = NULL;
-	gchar* _tmp42_ = NULL;
-	gchar* _tmp43_ = NULL;
-	gchar* _tmp44_ = NULL;
-	gchar* _tmp45_ = NULL;
-	gchar* _tmp46_ = NULL;
-	gchar* _tmp47_ = NULL;
-	gchar* _tmp48_ = NULL;
-	gchar* _tmp49_ = NULL;
-	gchar* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
-	gchar* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
-	gchar* _tmp54_ = NULL;
-	gchar* _tmp55_ = NULL;
-	gchar* _tmp56_ = NULL;
-	gchar* _tmp57_ = NULL;
-	gchar* _tmp58_ = NULL;
-	gchar* _tmp59_ = NULL;
-	gchar* _tmp60_ = NULL;
-	gchar* _tmp61_ = NULL;
-	gchar* _tmp62_ = NULL;
-	gchar* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
-	gchar* _tmp65_ = NULL;
-	gchar* _tmp66_ = NULL;
-	gchar* _tmp67_ = NULL;
-	gchar* _tmp68_ = NULL;
-	gchar* _tmp69_ = NULL;
-	gchar* _tmp70_ = NULL;
-	gchar* _tmp71_ = NULL;
-	gchar* _tmp72_ = NULL;
-	gchar* _tmp73_ = NULL;
-	gchar* _tmp74_ = NULL;
-	gchar* _tmp75_ = NULL;
-	gchar* _tmp76_ = NULL;
-	gchar* _tmp77_ = NULL;
-	gchar* _tmp78_ = NULL;
-	gchar* _tmp79_ = NULL;
-	gchar* _tmp80_ = NULL;
-	gchar* _tmp81_ = NULL;
-	gchar* _tmp82_ = NULL;
-	gchar* _tmp83_ = NULL;
-	gchar* _tmp84_ = NULL;
-	gchar* _tmp85_ = NULL;
-	gchar* _tmp86_ = NULL;
-	gchar* _tmp87_ = NULL;
-	gchar** _tmp88_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
+	gchar* _tmp20_;
+	gchar* _tmp21_;
+	gchar* _tmp22_;
+	gchar* _tmp23_;
+	gchar* _tmp24_;
+	gchar* _tmp25_;
+	gchar* _tmp26_;
+	gchar* _tmp27_;
+	gchar* _tmp28_;
+	gchar* _tmp29_;
+	gchar* _tmp30_;
+	gchar* _tmp31_;
+	gchar* _tmp32_;
+	gchar* _tmp33_;
+	gchar* _tmp34_;
+	gchar* _tmp35_;
+	gchar** _tmp36_;
+	gchar* _tmp37_;
+	gchar* _tmp38_;
+	gchar* _tmp39_;
+	gchar* _tmp40_;
+	gchar* _tmp41_;
+	gchar* _tmp42_;
+	gchar* _tmp43_;
+	gchar* _tmp44_;
+	gchar* _tmp45_;
+	gchar* _tmp46_;
+	gchar* _tmp47_;
+	gchar* _tmp48_;
+	gchar* _tmp49_;
+	gchar* _tmp50_;
+	gchar* _tmp51_;
+	gchar* _tmp52_;
+	gchar* _tmp53_;
+	gchar* _tmp54_;
+	gchar* _tmp55_;
+	gchar* _tmp56_;
+	gchar* _tmp57_;
+	gchar* _tmp58_;
+	gchar* _tmp59_;
+	gchar* _tmp60_;
+	gchar* _tmp61_;
+	gchar* _tmp62_;
+	gchar* _tmp63_;
+	gchar* _tmp64_;
+	gchar* _tmp65_;
+	gchar* _tmp66_;
+	gchar* _tmp67_;
+	gchar* _tmp68_;
+	gchar* _tmp69_;
+	gchar* _tmp70_;
+	gchar* _tmp71_;
+	gchar* _tmp72_;
+	gchar* _tmp73_;
+	gchar* _tmp74_;
+	gchar* _tmp75_;
+	gchar* _tmp76_;
+	gchar* _tmp77_;
+	gchar* _tmp78_;
+	gchar* _tmp79_;
+	gchar* _tmp80_;
+	gchar* _tmp81_;
+	gchar* _tmp82_;
+	gchar* _tmp83_;
+	gchar* _tmp84_;
+	gchar* _tmp85_;
+	gchar* _tmp86_;
+	gchar* _tmp87_;
+	gchar** _tmp88_;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_file_format_properties_parent_class = g_type_class_peek_parent (klass);
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileFormatPropertiesClass *) klass)->finalize = raw_file_format_properties_finalize;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_file_format;
+	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*) (PhotoFileFormatProperties *)) raw_file_format_properties_real_get_file_format;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_user_visible_name;
+	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*) (PhotoFileFormatProperties *)) raw_file_format_properties_real_get_user_visible_name;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_flags;
+	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*) (PhotoFileFormatProperties *)) raw_file_format_properties_real_get_flags;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_default_extension;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*) (PhotoFileFormatProperties *)) raw_file_format_properties_real_get_default_extension;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) raw_file_format_properties_real_get_known_extensions;
+	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*) (PhotoFileFormatProperties *, int*)) raw_file_format_properties_real_get_known_extensions;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_default_mime_type;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*) (PhotoFileFormatProperties *)) raw_file_format_properties_real_get_default_mime_type;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) raw_file_format_properties_real_get_mime_types;
+	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*) (PhotoFileFormatProperties *, int*)) raw_file_format_properties_real_get_mime_types;
 #line 53 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = g_strdup ("3fr");
 #line 53 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1615,7 +1613,7 @@ static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass
 	raw_file_format_properties_KNOWN_MIME_TYPES = _tmp88_;
 #line 59 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_file_format_properties_KNOWN_MIME_TYPES_length1 = 51;
-#line 1619 "RawSupport.c"
+#line 1617 "RawSupport.c"
 }
 
 
@@ -1623,13 +1621,13 @@ static void raw_file_format_properties_instance_init (RawFileFormatProperties *
 }
 
 
-static void raw_file_format_properties_finalize (PhotoFileFormatProperties* obj) {
+static void raw_file_format_properties_finalize (PhotoFileFormatProperties * obj) {
 	RawFileFormatProperties * self;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties);
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	PHOTO_FILE_FORMAT_PROPERTIES_CLASS (raw_file_format_properties_parent_class)->finalize (obj);
-#line 1633 "RawSupport.c"
+#line 1631 "RawSupport.c"
 }
 
 
@@ -1647,8 +1645,8 @@ GType raw_file_format_properties_get_type (void) {
 
 RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) {
 	RawSniffer* self = NULL;
-	GFile* _tmp0_ = NULL;
-	PhotoFileSnifferOptions _tmp1_ = 0;
+	GFile* _tmp0_;
+	PhotoFileSnifferOptions _tmp1_;
 #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 163 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1659,21 +1657,21 @@ RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnif
 	self = (RawSniffer*) photo_file_sniffer_construct (object_type, _tmp0_, _tmp1_);
 #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self;
-#line 1663 "RawSupport.c"
+#line 1661 "RawSupport.c"
 }
 
 
 RawSniffer* raw_sniffer_new (GFile* file, PhotoFileSnifferOptions options) {
 #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return raw_sniffer_construct (TYPE_RAW_SNIFFER, file, options);
-#line 1670 "RawSupport.c"
+#line 1668 "RawSupport.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
 #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 1677 "RawSupport.c"
+#line 1675 "RawSupport.c"
 }
 
 
@@ -1682,34 +1680,34 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 	gboolean _vala_is_corrupted = FALSE;
 	DetectedPhotoInformation* result = NULL;
 	DetectedPhotoInformation* detected = NULL;
-	DetectedPhotoInformation* _tmp0_ = NULL;
+	DetectedPhotoInformation* _tmp0_;
 	GRawProcessor* processor = NULL;
-	GRawProcessor* _tmp1_ = NULL;
-	GRawProcessor* _tmp2_ = NULL;
-	libraw_output_params_t* _tmp3_ = NULL;
-	libraw_output_params_t* _tmp4_ = NULL;
-	DetectedPhotoInformation* _tmp14_ = NULL;
-	GRawProcessor* _tmp15_ = NULL;
-	libraw_image_sizes_t _tmp16_ = {0};
-	gushort _tmp17_ = 0U;
-	GRawProcessor* _tmp18_ = NULL;
-	libraw_image_sizes_t _tmp19_ = {0};
-	gushort _tmp20_ = 0U;
-	DetectedPhotoInformation* _tmp21_ = NULL;
-	DetectedPhotoInformation* _tmp22_ = NULL;
-	DetectedPhotoInformation* _tmp23_ = NULL;
+	GRawProcessor* _tmp1_;
+	GRawProcessor* _tmp2_;
+	libraw_output_params_t* _tmp3_;
+	libraw_output_params_t* _tmp4_;
+	DetectedPhotoInformation* _tmp14_;
+	GRawProcessor* _tmp15_;
+	libraw_image_sizes_t _tmp16_;
+	gushort _tmp17_;
+	GRawProcessor* _tmp18_;
+	libraw_image_sizes_t _tmp19_;
+	gushort _tmp20_;
+	DetectedPhotoInformation* _tmp21_;
+	DetectedPhotoInformation* _tmp22_;
+	DetectedPhotoInformation* _tmp23_;
 	RawReader* reader = NULL;
-	GFile* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	RawReader* _tmp27_ = NULL;
-	RawReader* _tmp28_ = NULL;
-	DetectedPhotoInformation* _tmp34_ = NULL;
-	PhotoMetadata* _tmp35_ = NULL;
-	gboolean _tmp58_ = FALSE;
-	DetectedPhotoInformation* _tmp64_ = NULL;
-	gchar* _tmp65_ = NULL;
-	DetectedPhotoInformation* _tmp66_ = NULL;
+	GFile* _tmp24_;
+	gchar* _tmp25_;
+	gchar* _tmp26_;
+	RawReader* _tmp27_;
+	RawReader* _tmp28_;
+	DetectedPhotoInformation* _tmp34_;
+	PhotoMetadata* _tmp35_;
+	gboolean _tmp58_;
+	DetectedPhotoInformation* _tmp64_;
+	gchar* _tmp65_;
+	DetectedPhotoInformation* _tmp66_;
 	GError * _inner_error_ = NULL;
 #line 166 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_SNIFFER, RawSniffer);
@@ -1731,14 +1729,14 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 	_tmp4_ = _tmp3_;
 #line 173 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	(*_tmp4_).user_flip = (gint) GRAW_FLIP_NONE;
-#line 1735 "RawSupport.c"
+#line 1733 "RawSupport.c"
 	{
-		GRawProcessor* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		GRawProcessor* _tmp9_ = NULL;
-		GRawProcessor* _tmp10_ = NULL;
+		GRawProcessor* _tmp5_;
+		GFile* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GRawProcessor* _tmp9_;
+		GRawProcessor* _tmp10_;
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp5_ = processor;
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1755,7 +1753,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 1759 "RawSupport.c"
+#line 1757 "RawSupport.c"
 				goto __catch32_graw_exception;
 			}
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1768,7 +1766,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			g_clear_error (&_inner_error_);
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return NULL;
-#line 1772 "RawSupport.c"
+#line 1770 "RawSupport.c"
 		}
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp9_ = processor;
@@ -1778,7 +1776,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 1782 "RawSupport.c"
+#line 1780 "RawSupport.c"
 				goto __catch32_graw_exception;
 			}
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1791,7 +1789,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			g_clear_error (&_inner_error_);
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return NULL;
-#line 1795 "RawSupport.c"
+#line 1793 "RawSupport.c"
 		}
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp10_ = processor;
@@ -1801,7 +1799,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 1805 "RawSupport.c"
+#line 1803 "RawSupport.c"
 				goto __catch32_graw_exception;
 			}
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1814,16 +1812,16 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			g_clear_error (&_inner_error_);
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return NULL;
-#line 1818 "RawSupport.c"
+#line 1816 "RawSupport.c"
 		}
 	}
 	goto __finally32;
 	__catch32_graw_exception:
 	{
 		GError* exception = NULL;
-		GError* _tmp11_ = NULL;
-		GError* _tmp12_ = NULL;
-		GError* _tmp13_ = NULL;
+		GError* _tmp11_;
+		GError* _tmp12_;
+		GError* _tmp13_;
 #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		exception = _inner_error_;
 #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1844,11 +1842,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			if (is_corrupted) {
 #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				*is_corrupted = _vala_is_corrupted;
-#line 1848 "RawSupport.c"
+#line 1846 "RawSupport.c"
 			}
 #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 1852 "RawSupport.c"
+#line 1850 "RawSupport.c"
 		}
 #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp12_ = exception;
@@ -1858,7 +1856,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_inner_error_ = _tmp13_;
 #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_error_free0 (exception);
-#line 1862 "RawSupport.c"
+#line 1860 "RawSupport.c"
 		goto __finally32;
 	}
 	__finally32:
@@ -1872,7 +1870,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_detected_photo_information_unref0 (detected);
 #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 1876 "RawSupport.c"
+#line 1874 "RawSupport.c"
 	}
 #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp14_ = detected;
@@ -1916,13 +1914,13 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 	_g_free0 (_tmp26_);
 #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	reader = _tmp28_;
-#line 1920 "RawSupport.c"
+#line 1918 "RawSupport.c"
 	{
 		PhotoMetadata* _tmp29_ = NULL;
-		RawReader* _tmp30_ = NULL;
-		PhotoMetadata* _tmp31_ = NULL;
-		DetectedPhotoInformation* _tmp32_ = NULL;
-		PhotoMetadata* _tmp33_ = NULL;
+		RawReader* _tmp30_;
+		PhotoMetadata* _tmp31_;
+		DetectedPhotoInformation* _tmp32_;
+		PhotoMetadata* _tmp33_;
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp30_ = reader;
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1931,7 +1929,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp29_ = _tmp31_;
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1935 "RawSupport.c"
+#line 1933 "RawSupport.c"
 			goto __catch33_g_error;
 		}
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1946,7 +1944,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp32_->metadata = _tmp33_;
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_media_metadata_unref0 (_tmp29_);
-#line 1950 "RawSupport.c"
+#line 1948 "RawSupport.c"
 	}
 	goto __finally33;
 	__catch33_g_error:
@@ -1958,7 +1956,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_inner_error_ = NULL;
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_error_free0 (err);
-#line 1962 "RawSupport.c"
+#line 1960 "RawSupport.c"
 	}
 	__finally33:
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1973,7 +1971,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_detected_photo_information_unref0 (detected);
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 1977 "RawSupport.c"
+#line 1975 "RawSupport.c"
 	}
 #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp34_ = detected;
@@ -1981,27 +1979,27 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 	_tmp35_ = _tmp34_->metadata;
 #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp35_ != NULL) {
-#line 1985 "RawSupport.c"
+#line 1983 "RawSupport.c"
 		guint8* flattened_sans_thumbnail = NULL;
-		DetectedPhotoInformation* _tmp36_ = NULL;
-		PhotoMetadata* _tmp37_ = NULL;
-		gint _tmp38_ = 0;
-		guint8* _tmp39_ = NULL;
-		gint flattened_sans_thumbnail_length1 = 0;
-		gint _flattened_sans_thumbnail_size_ = 0;
+		DetectedPhotoInformation* _tmp36_;
+		PhotoMetadata* _tmp37_;
+		gint _tmp38_;
+		guint8* _tmp39_;
+		gint flattened_sans_thumbnail_length1;
+		gint _flattened_sans_thumbnail_size_;
 		gboolean _tmp40_ = FALSE;
-		guint8* _tmp41_ = NULL;
-		gint _tmp41__length1 = 0;
+		guint8* _tmp41_;
+		gint _tmp41__length1;
 		guint8* flattened_thumbnail = NULL;
-		DetectedPhotoInformation* _tmp47_ = NULL;
-		PhotoMetadata* _tmp48_ = NULL;
-		gint _tmp49_ = 0;
-		guint8* _tmp50_ = NULL;
-		gint flattened_thumbnail_length1 = 0;
-		gint _flattened_thumbnail_size_ = 0;
+		DetectedPhotoInformation* _tmp47_;
+		PhotoMetadata* _tmp48_;
+		gint _tmp49_;
+		guint8* _tmp50_;
+		gint flattened_thumbnail_length1;
+		gint _flattened_thumbnail_size_;
 		gboolean _tmp51_ = FALSE;
-		guint8* _tmp52_ = NULL;
-		gint _tmp52__length1 = 0;
+		guint8* _tmp52_;
+		gint _tmp52__length1;
 #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp36_ = detected;
 #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2020,30 +2018,30 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp41__length1 = flattened_sans_thumbnail_length1;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (_tmp41_ != NULL) {
-#line 2024 "RawSupport.c"
-			guint8* _tmp42_ = NULL;
-			gint _tmp42__length1 = 0;
+#line 2022 "RawSupport.c"
+			guint8* _tmp42_;
+			gint _tmp42__length1;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp42_ = flattened_sans_thumbnail;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp42__length1 = flattened_sans_thumbnail_length1;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp40_ = _tmp42__length1 > 0;
-#line 2033 "RawSupport.c"
+#line 2031 "RawSupport.c"
 		} else {
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp40_ = FALSE;
-#line 2037 "RawSupport.c"
+#line 2035 "RawSupport.c"
 		}
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (_tmp40_) {
-#line 2041 "RawSupport.c"
-			DetectedPhotoInformation* _tmp43_ = NULL;
-			guint8* _tmp44_ = NULL;
-			gint _tmp44__length1 = 0;
-			guint8* _tmp45_ = NULL;
-			gint _tmp45__length1 = 0;
-			gchar* _tmp46_ = NULL;
+#line 2039 "RawSupport.c"
+			DetectedPhotoInformation* _tmp43_;
+			guint8* _tmp44_;
+			gint _tmp44__length1;
+			guint8* _tmp45_;
+			gint _tmp45__length1;
+			gchar* _tmp46_;
 #line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp43_ = detected;
 #line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2060,7 +2058,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			_g_free0 (_tmp43_->exif_md5);
 #line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp43_->exif_md5 = _tmp46_;
-#line 2064 "RawSupport.c"
+#line 2062 "RawSupport.c"
 		}
 #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp47_ = detected;
@@ -2080,30 +2078,30 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp52__length1 = flattened_thumbnail_length1;
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (_tmp52_ != NULL) {
-#line 2084 "RawSupport.c"
-			guint8* _tmp53_ = NULL;
-			gint _tmp53__length1 = 0;
+#line 2082 "RawSupport.c"
+			guint8* _tmp53_;
+			gint _tmp53__length1;
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp53_ = flattened_thumbnail;
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp53__length1 = flattened_thumbnail_length1;
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp51_ = _tmp53__length1 > 0;
-#line 2093 "RawSupport.c"
+#line 2091 "RawSupport.c"
 		} else {
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp51_ = FALSE;
-#line 2097 "RawSupport.c"
+#line 2095 "RawSupport.c"
 		}
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (_tmp51_) {
-#line 2101 "RawSupport.c"
-			DetectedPhotoInformation* _tmp54_ = NULL;
-			guint8* _tmp55_ = NULL;
-			gint _tmp55__length1 = 0;
-			guint8* _tmp56_ = NULL;
-			gint _tmp56__length1 = 0;
-			gchar* _tmp57_ = NULL;
+#line 2099 "RawSupport.c"
+			DetectedPhotoInformation* _tmp54_;
+			guint8* _tmp55_;
+			gint _tmp55__length1;
+			guint8* _tmp56_;
+			gint _tmp56__length1;
+			gchar* _tmp57_;
 #line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp54_ = detected;
 #line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2120,24 +2118,24 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			_g_free0 (_tmp54_->thumbnail_md5);
 #line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp54_->thumbnail_md5 = _tmp57_;
-#line 2124 "RawSupport.c"
+#line 2122 "RawSupport.c"
 		}
 #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		flattened_thumbnail = (g_free (flattened_thumbnail), NULL);
 #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 2130 "RawSupport.c"
+#line 2128 "RawSupport.c"
 	}
 #line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5;
 #line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp58_) {
-#line 2136 "RawSupport.c"
+#line 2134 "RawSupport.c"
 		gchar* _tmp59_ = NULL;
-		GFile* _tmp60_ = NULL;
-		gchar* _tmp61_ = NULL;
-		DetectedPhotoInformation* _tmp62_ = NULL;
-		gchar* _tmp63_ = NULL;
+		GFile* _tmp60_;
+		gchar* _tmp61_;
+		DetectedPhotoInformation* _tmp62_;
+		gchar* _tmp63_;
 #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp60_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file;
 #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2156,7 +2154,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			_detected_photo_information_unref0 (detected);
 #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return NULL;
-#line 2160 "RawSupport.c"
+#line 2158 "RawSupport.c"
 		}
 #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp62_ = detected;
@@ -2170,7 +2168,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp62_->md5 = _tmp63_;
 #line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (_tmp59_);
-#line 2174 "RawSupport.c"
+#line 2172 "RawSupport.c"
 	}
 #line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp64_ = detected;
@@ -2194,11 +2192,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 	if (is_corrupted) {
 #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*is_corrupted = _vala_is_corrupted;
-#line 2198 "RawSupport.c"
+#line 2196 "RawSupport.c"
 	}
 #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2202 "RawSupport.c"
+#line 2200 "RawSupport.c"
 }
 
 
@@ -2206,8 +2204,8 @@ static void raw_sniffer_class_init (RawSnifferClass * klass) {
 #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_sniffer_parent_class = g_type_class_peek_parent (klass);
 #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) raw_sniffer_real_sniff;
-#line 2211 "RawSupport.c"
+	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) raw_sniffer_real_sniff;
+#line 2209 "RawSupport.c"
 }
 
 
@@ -2229,7 +2227,7 @@ GType raw_sniffer_get_type (void) {
 
 RawReader* raw_reader_construct (GType object_type, const gchar* filepath) {
 	RawReader* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2238,14 +2236,14 @@ RawReader* raw_reader_construct (GType object_type, const gchar* filepath) {
 	self = (RawReader*) photo_file_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_RAW);
 #line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self;
-#line 2242 "RawSupport.c"
+#line 2240 "RawSupport.c"
 }
 
 
 RawReader* raw_reader_new (const gchar* filepath) {
 #line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return raw_reader_construct (TYPE_RAW_READER, filepath);
-#line 2249 "RawSupport.c"
+#line 2247 "RawSupport.c"
 }
 
 
@@ -2253,9 +2251,9 @@ static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GErr
 	RawReader * self;
 	PhotoMetadata* result = NULL;
 	PhotoMetadata* metadata = NULL;
-	PhotoMetadata* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	PhotoMetadata* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 223 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader);
@@ -2279,13 +2277,13 @@ static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GErr
 		_media_metadata_unref0 (metadata);
 #line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2283 "RawSupport.c"
+#line 2281 "RawSupport.c"
 	}
 #line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = metadata;
 #line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2289 "RawSupport.c"
+#line 2287 "RawSupport.c"
 }
 
 
@@ -2293,23 +2291,20 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
 	RawReader * self;
 	GdkPixbuf* result = NULL;
 	GRawProcessor* processor = NULL;
-	GRawProcessor* _tmp0_ = NULL;
-	GRawProcessor* _tmp1_ = NULL;
-	GRawProcessor* _tmp2_ = NULL;
-	libraw_output_params_t* _tmp3_ = NULL;
-	libraw_output_params_t* _tmp4_ = NULL;
-	GRawProcessor* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GRawProcessor* _tmp8_ = NULL;
-	GRawProcessor* _tmp9_ = NULL;
+	GRawProcessor* _tmp0_;
+	GRawProcessor* _tmp1_;
+	GRawProcessor* _tmp2_;
+	libraw_output_params_t* _tmp3_;
+	libraw_output_params_t* _tmp4_;
+	GRawProcessor* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	GRawProcessor* _tmp8_;
+	GRawProcessor* _tmp9_;
 	GRawProcessedImage* _tmp10_ = NULL;
-	GRawProcessor* _tmp11_ = NULL;
-	GRawProcessedImage* _tmp12_ = NULL;
-	GRawProcessedImage* _tmp13_ = NULL;
-	GRawProcessedImage* _tmp14_ = NULL;
-	GdkPixbuf* _tmp15_ = NULL;
-	GdkPixbuf* _tmp16_ = NULL;
+	GRawProcessor* _tmp11_;
+	GRawProcessedImage* _tmp12_;
+	GdkPixbuf* _tmp13_;
 	GError * _inner_error_ = NULL;
 #line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader);
@@ -2347,7 +2342,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
 		_graw_processor_unref0 (processor);
 #line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2351 "RawSupport.c"
+#line 2346 "RawSupport.c"
 	}
 #line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp8_ = processor;
@@ -2361,7 +2356,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
 		_graw_processor_unref0 (processor);
 #line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2365 "RawSupport.c"
+#line 2360 "RawSupport.c"
 	}
 #line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp9_ = processor;
@@ -2375,7 +2370,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
 		_graw_processor_unref0 (processor);
 #line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2379 "RawSupport.c"
+#line 2374 "RawSupport.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp11_ = processor;
@@ -2391,29 +2386,19 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
 		_graw_processor_unref0 (processor);
 #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2395 "RawSupport.c"
+#line 2390 "RawSupport.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp13_ = _tmp10_;
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp10_ = NULL;
+	_tmp13_ = graw_processed_image_get_pixbuf_copy (_tmp10_);
 #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp14_ = _tmp13_;
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp15_ = graw_processed_image_get_pixbuf_copy (_tmp14_);
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp16_ = _tmp15_;
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_graw_processed_image_unref0 (_tmp14_);
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	result = _tmp16_;
+	result = _tmp13_;
 #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_graw_processed_image_unref0 (_tmp10_);
 #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_graw_processor_unref0 (processor);
 #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2417 "RawSupport.c"
+#line 2402 "RawSupport.c"
 }
 
 
@@ -2421,39 +2406,39 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 	RawReader * self;
 	GdkPixbuf* result = NULL;
 	gdouble width_proportion = 0.0;
-	Dimensions _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	Dimensions _tmp2_ = {0};
-	gint _tmp3_ = 0;
+	Dimensions _tmp0_;
+	gint _tmp1_;
+	Dimensions _tmp2_;
+	gint _tmp3_;
 	gdouble height_proportion = 0.0;
-	Dimensions _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	Dimensions _tmp6_ = {0};
-	gint _tmp7_ = 0;
+	Dimensions _tmp4_;
+	gint _tmp5_;
+	Dimensions _tmp6_;
+	gint _tmp7_;
 	gboolean _tmp8_ = FALSE;
-	gdouble _tmp9_ = 0.0;
+	gdouble _tmp9_;
 	gboolean half_size = FALSE;
 	GRawProcessor* processor = NULL;
-	GRawProcessor* _tmp11_ = NULL;
-	GRawProcessor* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	GRawProcessor* _tmp14_ = NULL;
-	libraw_output_params_t* _tmp15_ = NULL;
-	libraw_output_params_t* _tmp16_ = NULL;
-	GRawProcessor* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	GRawProcessor* _tmp30_ = NULL;
-	GRawProcessor* _tmp31_ = NULL;
+	GRawProcessor* _tmp11_;
+	GRawProcessor* _tmp12_;
+	gboolean _tmp13_;
+	GRawProcessor* _tmp14_;
+	libraw_output_params_t* _tmp15_;
+	libraw_output_params_t* _tmp16_;
+	GRawProcessor* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
+	GRawProcessor* _tmp30_;
+	GRawProcessor* _tmp31_;
 	GRawProcessedImage* image = NULL;
-	GRawProcessor* _tmp32_ = NULL;
-	GRawProcessedImage* _tmp33_ = NULL;
-	GRawProcessedImage* _tmp34_ = NULL;
-	GdkPixbuf* _tmp35_ = NULL;
-	GdkPixbuf* _tmp36_ = NULL;
-	Dimensions _tmp37_ = {0};
-	GdkPixbuf* _tmp38_ = NULL;
-	GdkPixbuf* _tmp39_ = NULL;
+	GRawProcessor* _tmp32_;
+	GRawProcessedImage* _tmp33_;
+	GRawProcessedImage* _tmp34_;
+	GdkPixbuf* _tmp35_;
+	GdkPixbuf* _tmp36_;
+	Dimensions _tmp37_;
+	GdkPixbuf* _tmp38_;
+	GdkPixbuf* _tmp39_;
 	GError * _inner_error_ = NULL;
 #line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader);
@@ -2485,17 +2470,17 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 	_tmp9_ = width_proportion;
 #line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp9_ < 0.5) {
-#line 2489 "RawSupport.c"
-		gdouble _tmp10_ = 0.0;
+#line 2474 "RawSupport.c"
+		gdouble _tmp10_;
 #line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp10_ = height_proportion;
 #line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp8_ = _tmp10_ < 0.5;
-#line 2495 "RawSupport.c"
+#line 2480 "RawSupport.c"
 	} else {
 #line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp8_ = FALSE;
-#line 2499 "RawSupport.c"
+#line 2484 "RawSupport.c"
 	}
 #line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	half_size = _tmp8_;
@@ -2535,32 +2520,32 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		_graw_processor_unref0 (processor);
 #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2539 "RawSupport.c"
+#line 2524 "RawSupport.c"
 	}
 	{
-		PhotoFileReaderRole _tmp20_ = 0;
+		PhotoFileReaderRole _tmp20_;
 #line 254 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp20_ = photo_file_reader_get_role (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_READER, PhotoFileReader));
 #line 254 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (_tmp20_ == PHOTO_FILE_READER_ROLE_THUMBNAIL) {
-#line 2547 "RawSupport.c"
-			GRawProcessor* _tmp21_ = NULL;
+#line 2532 "RawSupport.c"
+			GRawProcessor* _tmp21_;
 			GRawProcessedImage* image = NULL;
-			GRawProcessor* _tmp22_ = NULL;
-			GRawProcessedImage* _tmp23_ = NULL;
-			GRawProcessedImage* _tmp24_ = NULL;
-			GdkPixbuf* _tmp25_ = NULL;
-			GdkPixbuf* _tmp26_ = NULL;
-			Dimensions _tmp27_ = {0};
-			GdkPixbuf* _tmp28_ = NULL;
-			GdkPixbuf* _tmp29_ = NULL;
+			GRawProcessor* _tmp22_;
+			GRawProcessedImage* _tmp23_;
+			GRawProcessedImage* _tmp24_;
+			GdkPixbuf* _tmp25_;
+			GdkPixbuf* _tmp26_;
+			Dimensions _tmp27_;
+			GdkPixbuf* _tmp28_;
+			GdkPixbuf* _tmp29_;
 #line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp21_ = processor;
 #line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			graw_processor_unpack_thumb (_tmp21_, &_inner_error_);
 #line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2564 "RawSupport.c"
+#line 2549 "RawSupport.c"
 				goto __catch34_g_error;
 			}
 #line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2571,7 +2556,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 			image = _tmp23_;
 #line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2575 "RawSupport.c"
+#line 2560 "RawSupport.c"
 				goto __catch34_g_error;
 			}
 #line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2596,7 +2581,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 			_graw_processor_unref0 (processor);
 #line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2600 "RawSupport.c"
+#line 2585 "RawSupport.c"
 		}
 	}
 	goto __finally34;
@@ -2609,7 +2594,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		_inner_error_ = NULL;
 #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_error_free0 (_error_);
-#line 2613 "RawSupport.c"
+#line 2598 "RawSupport.c"
 	}
 	__finally34:
 #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2620,7 +2605,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		_graw_processor_unref0 (processor);
 #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2624 "RawSupport.c"
+#line 2609 "RawSupport.c"
 	}
 #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp30_ = processor;
@@ -2634,7 +2619,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		_graw_processor_unref0 (processor);
 #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2638 "RawSupport.c"
+#line 2623 "RawSupport.c"
 	}
 #line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp31_ = processor;
@@ -2648,7 +2633,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		_graw_processor_unref0 (processor);
 #line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2652 "RawSupport.c"
+#line 2637 "RawSupport.c"
 	}
 #line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp32_ = processor;
@@ -2664,7 +2649,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		_graw_processor_unref0 (processor);
 #line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2668 "RawSupport.c"
+#line 2653 "RawSupport.c"
 	}
 #line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp34_ = image;
@@ -2688,7 +2673,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 	_graw_processor_unref0 (processor);
 #line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2692 "RawSupport.c"
+#line 2677 "RawSupport.c"
 }
 
 
@@ -2696,12 +2681,12 @@ static void raw_reader_class_init (RawReaderClass * klass) {
 #line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_reader_parent_class = g_type_class_peek_parent (klass);
 #line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*)(PhotoFileReader*, GError**)) raw_reader_real_read_metadata;
+	((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*) (PhotoFileReader *, GError**)) raw_reader_real_read_metadata;
 #line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*)(PhotoFileReader*, GError**)) raw_reader_real_unscaled_read;
+	((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) raw_reader_real_unscaled_read;
 #line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) raw_reader_real_scaled_read;
-#line 2705 "RawSupport.c"
+	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) raw_reader_real_scaled_read;
+#line 2690 "RawSupport.c"
 }
 
 
@@ -2723,9 +2708,9 @@ GType raw_reader_get_type (void) {
 
 RawDeveloper* raw_developer_as_array (int* result_length1) {
 	RawDeveloper* result = NULL;
-	RawDeveloper* _tmp0_ = NULL;
-	RawDeveloper* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	RawDeveloper* _tmp0_;
+	RawDeveloper* _tmp1_;
+	gint _tmp1__length1;
 #line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = g_new0 (RawDeveloper, 3);
 #line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2742,13 +2727,13 @@ RawDeveloper* raw_developer_as_array (int* result_length1) {
 	if (result_length1) {
 #line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*result_length1 = _tmp1__length1;
-#line 2746 "RawSupport.c"
+#line 2731 "RawSupport.c"
 	}
 #line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = _tmp1_;
 #line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2752 "RawSupport.c"
+#line 2737 "RawSupport.c"
 }
 
 
@@ -2758,48 +2743,48 @@ gchar* raw_developer_to_string (RawDeveloper self) {
 	switch (self) {
 #line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 2762 "RawSupport.c"
+#line 2747 "RawSupport.c"
 		{
-			gchar* _tmp0_ = NULL;
+			gchar* _tmp0_;
 #line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp0_ = g_strdup ("SHOTWELL");
 #line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp0_;
 #line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2771 "RawSupport.c"
+#line 2756 "RawSupport.c"
 		}
 #line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 2775 "RawSupport.c"
+#line 2760 "RawSupport.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp1_ = g_strdup ("CAMERA");
 #line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp1_;
 #line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2784 "RawSupport.c"
+#line 2769 "RawSupport.c"
 		}
 #line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 2788 "RawSupport.c"
+#line 2773 "RawSupport.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp2_ = g_strdup ("EMBEDDED");
 #line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp2_;
 #line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2797 "RawSupport.c"
+#line 2782 "RawSupport.c"
 		}
 		default:
 		{
 #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			g_assert_not_reached ();
-#line 2803 "RawSupport.c"
+#line 2788 "RawSupport.c"
 		}
 	}
 }
@@ -2807,8 +2792,8 @@ gchar* raw_developer_to_string (RawDeveloper self) {
 
 RawDeveloper raw_developer_from_string (const gchar* value) {
 	RawDeveloper result = 0;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GQuark _tmp3_ = 0U;
 #line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	static GQuark _tmp2_label0 = 0;
@@ -2828,51 +2813,51 @@ RawDeveloper raw_developer_from_string (const gchar* value) {
 	if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("SHOTWELL")))) {
 #line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2832 "RawSupport.c"
+#line 2817 "RawSupport.c"
 			default:
 			{
 #line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				result = RAW_DEVELOPER_SHOTWELL;
 #line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				return result;
-#line 2839 "RawSupport.c"
+#line 2824 "RawSupport.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("CAMERA")))) {
 #line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2845 "RawSupport.c"
+#line 2830 "RawSupport.c"
 			default:
 			{
 #line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				result = RAW_DEVELOPER_CAMERA;
 #line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				return result;
-#line 2852 "RawSupport.c"
+#line 2837 "RawSupport.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("EMBEDDED")))) {
 #line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2858 "RawSupport.c"
+#line 2843 "RawSupport.c"
 			default:
 			{
 #line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				result = RAW_DEVELOPER_EMBEDDED;
 #line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				return result;
-#line 2865 "RawSupport.c"
+#line 2850 "RawSupport.c"
 			}
 		}
 	} else {
 #line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2871 "RawSupport.c"
+#line 2856 "RawSupport.c"
 			default:
 			{
 #line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				g_assert_not_reached ();
-#line 2876 "RawSupport.c"
+#line 2861 "RawSupport.c"
 			}
 		}
 	}
@@ -2885,43 +2870,37 @@ gchar* raw_developer_get_label (RawDeveloper self) {
 	switch (self) {
 #line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 2889 "RawSupport.c"
+#line 2874 "RawSupport.c"
 		{
-			const gchar* _tmp0_ = NULL;
-			gchar* _tmp1_ = NULL;
-#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp0_ = _ ("Shotwell");
+			gchar* _tmp0_;
 #line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp1_ = g_strdup (_tmp0_);
+			_tmp0_ = g_strdup (_ ("Shotwell"));
 #line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			result = _tmp1_;
+			result = _tmp0_;
 #line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2901 "RawSupport.c"
+#line 2883 "RawSupport.c"
 		}
 #line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_CAMERA:
 #line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 2907 "RawSupport.c"
+#line 2889 "RawSupport.c"
 		{
-			const gchar* _tmp2_ = NULL;
-			gchar* _tmp3_ = NULL;
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp2_ = _ ("Camera");
+			gchar* _tmp1_;
 #line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp3_ = g_strdup (_tmp2_);
+			_tmp1_ = g_strdup (_ ("Camera"));
 #line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			result = _tmp3_;
+			result = _tmp1_;
 #line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2919 "RawSupport.c"
+#line 2898 "RawSupport.c"
 		}
 		default:
 		{
 #line 318 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			g_assert_not_reached ();
-#line 2925 "RawSupport.c"
+#line 2904 "RawSupport.c"
 		}
 	}
 }
@@ -2929,7 +2908,7 @@ gchar* raw_developer_get_label (RawDeveloper self) {
 
 gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) {
 	gboolean result = FALSE;
-	RawDeveloper _tmp0_ = 0;
+	RawDeveloper _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 #line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2940,46 +2919,46 @@ gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) {
 		result = TRUE;
 #line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return result;
-#line 2944 "RawSupport.c"
+#line 2923 "RawSupport.c"
 	}
 #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (self == RAW_DEVELOPER_CAMERA) {
-#line 2948 "RawSupport.c"
-		RawDeveloper _tmp3_ = 0;
+#line 2927 "RawSupport.c"
+		RawDeveloper _tmp3_;
 #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp3_ = d;
 #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp2_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED;
-#line 2954 "RawSupport.c"
+#line 2933 "RawSupport.c"
 	} else {
 #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp2_ = FALSE;
-#line 2958 "RawSupport.c"
+#line 2937 "RawSupport.c"
 	}
 #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp2_) {
 #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp1_ = TRUE;
-#line 2964 "RawSupport.c"
+#line 2943 "RawSupport.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
 #line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (self == RAW_DEVELOPER_EMBEDDED) {
-#line 2969 "RawSupport.c"
-			RawDeveloper _tmp5_ = 0;
+#line 2948 "RawSupport.c"
+			RawDeveloper _tmp5_;
 #line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp5_ = d;
 #line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp4_ = _tmp5_ == RAW_DEVELOPER_CAMERA;
-#line 2975 "RawSupport.c"
+#line 2954 "RawSupport.c"
 		} else {
 #line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp4_ = FALSE;
-#line 2979 "RawSupport.c"
+#line 2958 "RawSupport.c"
 		}
 #line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp1_ = _tmp4_;
-#line 2983 "RawSupport.c"
+#line 2962 "RawSupport.c"
 	}
 #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp1_) {
@@ -2987,46 +2966,49 @@ gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) {
 		result = TRUE;
 #line 330 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return result;
-#line 2991 "RawSupport.c"
+#line 2970 "RawSupport.c"
 	}
 #line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = FALSE;
 #line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2997 "RawSupport.c"
+#line 2976 "RawSupport.c"
 }
 
 
 BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error) {
 	BackingPhotoRow* result = NULL;
 	BackingPhotoRow* ns = NULL;
-	BackingPhotoRow* _tmp0_ = NULL;
+	BackingPhotoRow* _tmp0_;
 	GFile* master = NULL;
-	const gchar* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	const gchar* _tmp1_;
+	GFile* _tmp2_;
 	gchar* name = NULL;
 	gchar* ext = NULL;
-	GFile* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	GFile* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 	gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
 	gchar* basename = NULL;
-	const gchar* _tmp8_ = NULL;
+	const gchar* _tmp8_;
+	gchar* newbasename = NULL;
+	const gchar* _tmp27_;
+	gchar* _tmp28_;
 	gboolean c = FALSE;
 	GFile* new_back = NULL;
-	GFile* _tmp27_ = NULL;
-	GFile* _tmp28_ = NULL;
-	GFile* _tmp29_ = NULL;
-	const gchar* _tmp30_ = NULL;
-	gboolean _tmp31_ = FALSE;
-	GFile* _tmp32_ = NULL;
-	GFile* _tmp33_ = NULL;
-	GFile* _tmp34_ = NULL;
-	BackingPhotoRow* _tmp35_ = NULL;
-	BackingPhotoRow* _tmp36_ = NULL;
-	GFile* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
+	GFile* _tmp29_;
+	GFile* _tmp30_;
+	GFile* _tmp31_;
+	const gchar* _tmp32_;
+	gboolean _tmp33_ = FALSE;
+	GFile* _tmp34_;
+	GFile* _tmp35_;
+	GFile* _tmp36_;
+	BackingPhotoRow* _tmp37_;
+	BackingPhotoRow* _tmp38_;
+	GFile* _tmp39_;
+	gchar* _tmp40_;
 	GError * _inner_error_ = NULL;
 #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (raw_filepath != NULL, NULL);
@@ -3062,25 +3044,25 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper
 	_tmp8_ = camera_development_filename;
 #line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp8_ == NULL) {
-#line 3066 "RawSupport.c"
+#line 3048 "RawSupport.c"
 		gchar* _tmp9_ = NULL;
-		const gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
+		const gchar* _tmp16_;
+		gchar* _tmp17_;
+		gchar* _tmp18_;
+		const gchar* _tmp19_;
+		gchar* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
+		gchar* _tmp23_;
+		gchar* _tmp24_;
 #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (self != RAW_DEVELOPER_CAMERA) {
-#line 3079 "RawSupport.c"
-			gchar* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-			gchar* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			gchar* _tmp14_ = NULL;
+#line 3061 "RawSupport.c"
+			gchar* _tmp10_;
+			gchar* _tmp11_;
+			gchar* _tmp12_;
+			gchar* _tmp13_;
+			gchar* _tmp14_;
 #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp10_ = raw_developer_to_string (self);
 #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -3099,16 +3081,16 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper
 			_g_free0 (_tmp13_);
 #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_g_free0 (_tmp11_);
-#line 3103 "RawSupport.c"
+#line 3085 "RawSupport.c"
 		} else {
-			gchar* _tmp15_ = NULL;
+			gchar* _tmp15_;
 #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp15_ = g_strdup ("");
 #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_g_free0 (_tmp9_);
 #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp9_ = _tmp15_;
-#line 3112 "RawSupport.c"
+#line 3094 "RawSupport.c"
 		}
 #line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp16_ = name;
@@ -3140,10 +3122,10 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper
 		_g_free0 (_tmp18_);
 #line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (_tmp9_);
-#line 3144 "RawSupport.c"
+#line 3126 "RawSupport.c"
 	} else {
-		const gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
+		const gchar* _tmp25_;
+		gchar* _tmp26_;
 #line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp25_ = camera_development_filename;
 #line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -3152,97 +3134,109 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper
 		_g_free0 (basename);
 #line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		basename = _tmp26_;
-#line 3156 "RawSupport.c"
+#line 3138 "RawSupport.c"
 	}
-#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp27_ = master;
-#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp28_ = g_file_get_parent (_tmp27_);
-#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp29_ = _tmp28_;
-#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp30_ = basename;
-#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp32_ = generate_unique_file (_tmp29_, _tmp30_, &_tmp31_, &_inner_error_);
-#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	c = _tmp31_;
-#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp33_ = _tmp32_;
-#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_g_object_unref0 (_tmp29_);
-#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	new_back = _tmp33_;
-#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp27_ = basename;
+#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp28_ = library_files_convert_basename (_tmp27_);
+#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	newbasename = _tmp28_;
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp29_ = master;
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp30_ = g_file_get_parent (_tmp29_);
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp31_ = _tmp30_;
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp32_ = newbasename;
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp34_ = generate_unique_file (_tmp31_, _tmp32_, &_tmp33_, &_inner_error_);
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	c = _tmp33_;
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp35_ = _tmp34_;
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_g_object_unref0 (_tmp31_);
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	new_back = _tmp35_;
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_g_free0 (newbasename);
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (ext);
-#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (name);
-#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_object_unref0 (master);
-#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_backing_photo_row_unref0 (ns);
-#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 3192 "RawSupport.c"
+#line 3182 "RawSupport.c"
 	}
-#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp34_ = new_back;
-#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	claim_file (_tmp34_, &_inner_error_);
-#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp36_ = new_back;
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	claim_file (_tmp36_, &_inner_error_);
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_object_unref0 (new_back);
-#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_g_free0 (newbasename);
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (ext);
-#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (name);
-#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_object_unref0 (master);
-#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_backing_photo_row_unref0 (ns);
-#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 3216 "RawSupport.c"
+#line 3208 "RawSupport.c"
 	}
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp35_ = ns;
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp35_->file_format = PHOTO_FILE_FORMAT_JFIF;
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp36_ = ns;
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp37_ = new_back;
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp38_ = g_file_get_path (_tmp37_);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_g_free0 (_tmp36_->filepath);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp36_->filepath = _tmp38_;
+#line 360 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp37_ = ns;
+#line 360 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp37_->file_format = PHOTO_FILE_FORMAT_JFIF;
 #line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	result = ns;
+	_tmp38_ = ns;
 #line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_g_object_unref0 (new_back);
+	_tmp39_ = new_back;
 #line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_g_free0 (basename);
+	_tmp40_ = g_file_get_path (_tmp39_);
 #line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_g_free0 (ext);
+	_g_free0 (_tmp38_->filepath);
 #line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp38_->filepath = _tmp40_;
+#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	result = ns;
+#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_g_object_unref0 (new_back);
+#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_g_free0 (newbasename);
+#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_g_free0 (basename);
+#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_g_free0 (ext);
+#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (name);
-#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_object_unref0 (master);
-#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 3246 "RawSupport.c"
+#line 3240 "RawSupport.c"
 }
 
 
diff --git a/src/photos/RawSupport.vala b/src/photos/RawSupport.vala
index 05f652c..d11d06e 100644
--- a/src/photos/RawSupport.vala
+++ b/src/photos/RawSupport.vala
@@ -352,8 +352,10 @@ public enum RawDeveloper {
             basename = camera_development_filename;
         }
         
+        string newbasename = LibraryFiles.convert_basename(basename);
+
         bool c;
-        File? new_back = generate_unique_file(master.get_parent(), basename, out c);
+        File? new_back = generate_unique_file(master.get_parent(), newbasename, out c);
         claim_file(new_back);
         ns.file_format = PhotoFileFormat.JFIF;
         ns.filepath = new_back.get_path();
diff --git a/src/photos/TiffSupport.c b/src/photos/TiffSupport.c
index 1fcbfa7..4962cb8 100644
--- a/src/photos/TiffSupport.c
+++ b/src/photos/TiffSupport.c
@@ -1,4 +1,4 @@
-/* TiffSupport.c generated by valac 0.34.7, the Vala compiler
+/* TiffSupport.c generated by valac 0.36.6, the Vala compiler
  * generated from TiffSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -545,7 +545,7 @@ PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type, GFile* file
 GType gdk_sniffer_get_type (void) G_GNUC_CONST;
 GType photos_tiff_sniffer_get_type (void) G_GNUC_CONST;
 PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type);
-static void photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver* obj);
+static void photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver * obj);
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 GType photo_file_format_flags_get_type (void) G_GNUC_CONST;
 enum  {
@@ -563,7 +563,7 @@ static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (Pho
 static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1);
 static gchar** _vala_array_dup17 (gchar** self, int length);
 PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type);
-static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties* obj);
+static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties * obj);
 gpointer detected_photo_information_ref (gpointer instance);
 void detected_photo_information_unref (gpointer instance);
 GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -607,7 +607,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self);
 
 
 void photos_tiff_file_format_driver_init (void) {
-	PhotosTiffFileFormatDriver* _tmp0_ = NULL;
+	PhotosTiffFileFormatDriver* _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp0_ = photos_tiff_file_format_driver_new ();
 #line 13 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -629,8 +629,8 @@ static gpointer _photo_file_format_driver_ref0 (gpointer self) {
 
 PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_get_instance (void) {
 	PhotosTiffFileFormatDriver* result = NULL;
-	PhotosTiffFileFormatDriver* _tmp0_ = NULL;
-	PhotosTiffFileFormatDriver* _tmp1_ = NULL;
+	PhotosTiffFileFormatDriver* _tmp0_;
+	PhotosTiffFileFormatDriver* _tmp1_;
 #line 18 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp0_ = photos_tiff_file_format_driver_instance;
 #line 18 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -646,7 +646,7 @@ PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_get_instance (void) {
 static PhotoFileFormatProperties* photos_tiff_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) {
 	PhotosTiffFileFormatDriver * self;
 	PhotoFileFormatProperties* result = NULL;
-	PhotosTiffFileFormatProperties* _tmp0_ = NULL;
+	PhotosTiffFileFormatProperties* _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver);
 #line 22 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -662,8 +662,8 @@ static PhotoFileFormatProperties* photos_tiff_file_format_driver_real_get_proper
 static PhotoFileReader* photos_tiff_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) {
 	PhotosTiffFileFormatDriver * self;
 	PhotoFileReader* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	PhotosTiffReader* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	PhotosTiffReader* _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver);
 #line 25 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -683,7 +683,7 @@ static PhotoFileReader* photos_tiff_file_format_driver_real_create_reader (Photo
 static PhotoMetadata* photos_tiff_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) {
 	PhotosTiffFileFormatDriver * self;
 	PhotoMetadata* result = NULL;
-	PhotoMetadata* _tmp0_ = NULL;
+	PhotoMetadata* _tmp0_;
 #line 29 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver);
 #line 30 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -725,8 +725,8 @@ static gboolean photos_tiff_file_format_driver_real_can_write_metadata (PhotoFil
 static PhotoFileWriter* photos_tiff_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) {
 	PhotosTiffFileFormatDriver * self;
 	PhotoFileWriter* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	PhotosTiffWriter* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	PhotosTiffWriter* _tmp1_;
 #line 41 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver);
 #line 41 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -746,8 +746,8 @@ static PhotoFileWriter* photos_tiff_file_format_driver_real_create_writer (Photo
 static PhotoFileMetadataWriter* photos_tiff_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) {
 	PhotosTiffFileFormatDriver * self;
 	PhotoFileMetadataWriter* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	PhotosTiffMetadataWriter* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	PhotosTiffMetadataWriter* _tmp1_;
 #line 45 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver);
 #line 45 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -767,9 +767,9 @@ static PhotoFileMetadataWriter* photos_tiff_file_format_driver_real_create_metad
 static PhotoFileSniffer* photos_tiff_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) {
 	PhotosTiffFileFormatDriver * self;
 	PhotoFileSniffer* result = NULL;
-	GFile* _tmp0_ = NULL;
-	PhotoFileSnifferOptions _tmp1_ = 0;
-	PhotosTiffSniffer* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	PhotoFileSnifferOptions _tmp1_;
+	PhotosTiffSniffer* _tmp2_;
 #line 49 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver);
 #line 49 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -811,21 +811,21 @@ static void photos_tiff_file_format_driver_class_init (PhotosTiffFileFormatDrive
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	((PhotoFileFormatDriverClass *) klass)->finalize = photos_tiff_file_format_driver_finalize;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_get_properties;
+	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*) (PhotoFileFormatDriver *)) photos_tiff_file_format_driver_real_get_properties;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) photos_tiff_file_format_driver_real_create_reader;
+	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*) (PhotoFileFormatDriver *, const gchar*)) photos_tiff_file_format_driver_real_create_reader;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_create_metadata;
+	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) photos_tiff_file_format_driver_real_create_metadata;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_can_write_image;
+	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*) (PhotoFileFormatDriver *)) photos_tiff_file_format_driver_real_can_write_image;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_can_write_metadata;
+	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*) (PhotoFileFormatDriver *)) photos_tiff_file_format_driver_real_can_write_metadata;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photos_tiff_file_format_driver_real_create_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photos_tiff_file_format_driver_real_create_writer;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photos_tiff_file_format_driver_real_create_metadata_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photos_tiff_file_format_driver_real_create_metadata_writer;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) photos_tiff_file_format_driver_real_create_sniffer;
+	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) photos_tiff_file_format_driver_real_create_sniffer;
 #line 830 "TiffSupport.c"
 }
 
@@ -834,7 +834,7 @@ static void photos_tiff_file_format_driver_instance_init (PhotosTiffFileFormatDr
 }
 
 
-static void photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver* obj) {
+static void photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver * obj) {
 	PhotosTiffFileFormatDriver * self;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver);
@@ -857,7 +857,7 @@ GType photos_tiff_file_format_driver_get_type (void) {
 
 
 void photos_tiff_file_format_properties_init (void) {
-	PhotosTiffFileFormatProperties* _tmp0_ = NULL;
+	PhotosTiffFileFormatProperties* _tmp0_;
 #line 66 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp0_ = photos_tiff_file_format_properties_new ();
 #line 66 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -877,8 +877,8 @@ static gpointer _photo_file_format_properties_ref0 (gpointer self) {
 
 PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_get_instance (void) {
 	PhotosTiffFileFormatProperties* result = NULL;
-	PhotosTiffFileFormatProperties* _tmp0_ = NULL;
-	PhotosTiffFileFormatProperties* _tmp1_ = NULL;
+	PhotosTiffFileFormatProperties* _tmp0_;
+	PhotosTiffFileFormatProperties* _tmp1_;
 #line 70 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp0_ = photos_tiff_file_format_properties_instance;
 #line 70 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -920,7 +920,7 @@ static PhotoFileFormatFlags photos_tiff_file_format_properties_real_get_flags (P
 static gchar* photos_tiff_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) {
 	PhotosTiffFileFormatProperties * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 81 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties);
 #line 82 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -936,19 +936,16 @@ static gchar* photos_tiff_file_format_properties_real_get_default_extension (Pho
 static gchar* photos_tiff_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) {
 	PhotosTiffFileFormatProperties * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
 #line 85 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties);
 #line 86 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp0_ = _ ("TIFF");
+	_tmp0_ = g_strdup (_ ("TIFF"));
 #line 86 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 86 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 86 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 952 "TiffSupport.c"
+#line 949 "TiffSupport.c"
 }
 
 
@@ -959,29 +956,29 @@ static gchar** _vala_array_dup16 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 963 "TiffSupport.c"
-		gchar* _tmp0_ = NULL;
+#line 960 "TiffSupport.c"
+		gchar* _tmp0_;
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		result[i] = _tmp0_;
-#line 969 "TiffSupport.c"
+#line 966 "TiffSupport.c"
 	}
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 973 "TiffSupport.c"
+#line 970 "TiffSupport.c"
 }
 
 
 static gchar** photos_tiff_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) {
 	PhotosTiffFileFormatProperties * self;
 	gchar** result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
 #line 89 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties);
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1000,23 +997,23 @@ static gchar** photos_tiff_file_format_properties_real_get_known_extensions (Pho
 	if (result_length1) {
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 1004 "TiffSupport.c"
+#line 1001 "TiffSupport.c"
 	}
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	result = _tmp2_;
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 1010 "TiffSupport.c"
+#line 1007 "TiffSupport.c"
 }
 
 
 static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) {
 	PhotosTiffFileFormatProperties * self;
 	gchar* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 93 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties);
 #line 94 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1031,7 +1028,7 @@ static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (Pho
 	result = _tmp2_;
 #line 94 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 1035 "TiffSupport.c"
+#line 1032 "TiffSupport.c"
 }
 
 
@@ -1042,29 +1039,29 @@ static gchar** _vala_array_dup17 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 1046 "TiffSupport.c"
-		gchar* _tmp0_ = NULL;
+#line 1043 "TiffSupport.c"
+		gchar* _tmp0_;
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		result[i] = _tmp0_;
-#line 1052 "TiffSupport.c"
+#line 1049 "TiffSupport.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 1056 "TiffSupport.c"
+#line 1053 "TiffSupport.c"
 }
 
 
 static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) {
 	PhotosTiffFileFormatProperties * self;
 	gchar** result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
 #line 97 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties);
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1083,13 +1080,13 @@ static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFile
 	if (result_length1) {
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 1087 "TiffSupport.c"
+#line 1084 "TiffSupport.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	result = _tmp2_;
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 1093 "TiffSupport.c"
+#line 1090 "TiffSupport.c"
 }
 
 
@@ -1099,41 +1096,41 @@ PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_construct (GT
 	self = (PhotosTiffFileFormatProperties*) photo_file_format_properties_construct (object_type);
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self;
-#line 1103 "TiffSupport.c"
+#line 1100 "TiffSupport.c"
 }
 
 
 PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_new (void) {
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return photos_tiff_file_format_properties_construct (PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES);
-#line 1110 "TiffSupport.c"
+#line 1107 "TiffSupport.c"
 }
 
 
 static void photos_tiff_file_format_properties_class_init (PhotosTiffFileFormatPropertiesClass * klass) {
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar** _tmp2_;
+	gchar* _tmp3_;
+	gchar** _tmp4_;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	photos_tiff_file_format_properties_parent_class = g_type_class_peek_parent (klass);
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	((PhotoFileFormatPropertiesClass *) klass)->finalize = photos_tiff_file_format_properties_finalize;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_file_format;
+	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*) (PhotoFileFormatProperties *)) photos_tiff_file_format_properties_real_get_file_format;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_flags;
+	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*) (PhotoFileFormatProperties *)) photos_tiff_file_format_properties_real_get_flags;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_default_extension;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*) (PhotoFileFormatProperties *)) photos_tiff_file_format_properties_real_get_default_extension;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_user_visible_name;
+	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*) (PhotoFileFormatProperties *)) photos_tiff_file_format_properties_real_get_user_visible_name;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) photos_tiff_file_format_properties_real_get_known_extensions;
+	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*) (PhotoFileFormatProperties *, int*)) photos_tiff_file_format_properties_real_get_known_extensions;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_default_mime_type;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*) (PhotoFileFormatProperties *)) photos_tiff_file_format_properties_real_get_default_mime_type;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) photos_tiff_file_format_properties_real_get_mime_types;
+	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*) (PhotoFileFormatProperties *, int*)) photos_tiff_file_format_properties_real_get_mime_types;
 #line 55 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp0_ = g_strdup ("tif");
 #line 55 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1158,7 +1155,7 @@ static void photos_tiff_file_format_properties_class_init (PhotosTiffFileFormatP
 	photos_tiff_file_format_properties_KNOWN_MIME_TYPES = _tmp4_;
 #line 59 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	photos_tiff_file_format_properties_KNOWN_MIME_TYPES_length1 = 1;
-#line 1162 "TiffSupport.c"
+#line 1159 "TiffSupport.c"
 }
 
 
@@ -1166,13 +1163,13 @@ static void photos_tiff_file_format_properties_instance_init (PhotosTiffFileForm
 }
 
 
-static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties* obj) {
+static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties * obj) {
 	PhotosTiffFileFormatProperties * self;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties);
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	PHOTO_FILE_FORMAT_PROPERTIES_CLASS (photos_tiff_file_format_properties_parent_class)->finalize (obj);
-#line 1176 "TiffSupport.c"
+#line 1173 "TiffSupport.c"
 }
 
 
@@ -1190,8 +1187,8 @@ GType photos_tiff_file_format_properties_get_type (void) {
 
 PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) {
 	PhotosTiffSniffer* self = NULL;
-	GFile* _tmp0_ = NULL;
-	PhotoFileSnifferOptions _tmp1_ = 0;
+	GFile* _tmp0_;
+	PhotoFileSnifferOptions _tmp1_;
 #line 103 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 104 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1202,21 +1199,21 @@ PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type, GFile* file
 	self = (PhotosTiffSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_);
 #line 103 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self;
-#line 1206 "TiffSupport.c"
+#line 1203 "TiffSupport.c"
 }
 
 
 PhotosTiffSniffer* photos_tiff_sniffer_new (GFile* file, PhotoFileSnifferOptions options) {
 #line 103 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return photos_tiff_sniffer_construct (PHOTOS_TYPE_TIFF_SNIFFER, file, options);
-#line 1213 "TiffSupport.c"
+#line 1210 "TiffSupport.c"
 }
 
 
 static gpointer _detected_photo_information_ref0 (gpointer self) {
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self ? detected_photo_information_ref (self) : NULL;
-#line 1220 "TiffSupport.c"
+#line 1217 "TiffSupport.c"
 }
 
 
@@ -1225,16 +1222,16 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe
 	gboolean _vala_is_corrupted = FALSE;
 	DetectedPhotoInformation* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 	DetectedPhotoInformation* detected = NULL;
 	gboolean _tmp3_ = FALSE;
-	DetectedPhotoInformation* _tmp4_ = NULL;
-	DetectedPhotoInformation* _tmp5_ = NULL;
+	DetectedPhotoInformation* _tmp4_;
+	DetectedPhotoInformation* _tmp5_;
 	DetectedPhotoInformation* _tmp6_ = NULL;
-	DetectedPhotoInformation* _tmp7_ = NULL;
-	PhotoFileFormat _tmp8_ = 0;
-	DetectedPhotoInformation* _tmp10_ = NULL;
+	DetectedPhotoInformation* _tmp7_;
+	PhotoFileFormat _tmp8_;
+	DetectedPhotoInformation* _tmp10_;
 	GError * _inner_error_ = NULL;
 #line 107 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_SNIFFER, PhotosTiffSniffer);
@@ -1252,7 +1249,7 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe
 		g_propagate_error (error, _inner_error_);
 #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return NULL;
-#line 1256 "TiffSupport.c"
+#line 1253 "TiffSupport.c"
 	}
 #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (!_tmp0_) {
@@ -1262,11 +1259,11 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe
 		if (is_corrupted) {
 #line 112 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 			*is_corrupted = _vala_is_corrupted;
-#line 1266 "TiffSupport.c"
+#line 1263 "TiffSupport.c"
 		}
 #line 112 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return result;
-#line 1270 "TiffSupport.c"
+#line 1267 "TiffSupport.c"
 	}
 #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp4_ = PHOTO_FILE_SNIFFER_CLASS (photos_tiff_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp3_, &_inner_error_);
@@ -1280,7 +1277,7 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe
 		g_propagate_error (error, _inner_error_);
 #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return NULL;
-#line 1284 "TiffSupport.c"
+#line 1281 "TiffSupport.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp5_ = detected;
@@ -1294,11 +1291,11 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe
 		if (is_corrupted) {
 #line 116 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 			*is_corrupted = _vala_is_corrupted;
-#line 1298 "TiffSupport.c"
+#line 1295 "TiffSupport.c"
 		}
 #line 116 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return result;
-#line 1302 "TiffSupport.c"
+#line 1299 "TiffSupport.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp7_ = detected;
@@ -1306,17 +1303,17 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe
 	_tmp8_ = _tmp7_->file_format;
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (_tmp8_ == PHOTO_FILE_FORMAT_TIFF) {
-#line 1310 "TiffSupport.c"
-		DetectedPhotoInformation* _tmp9_ = NULL;
+#line 1307 "TiffSupport.c"
+		DetectedPhotoInformation* _tmp9_;
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		_tmp9_ = detected;
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		_tmp6_ = _tmp9_;
-#line 1316 "TiffSupport.c"
+#line 1313 "TiffSupport.c"
 	} else {
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		_tmp6_ = NULL;
-#line 1320 "TiffSupport.c"
+#line 1317 "TiffSupport.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp10_ = _detected_photo_information_ref0 (_tmp6_);
@@ -1328,11 +1325,11 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe
 	if (is_corrupted) {
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		*is_corrupted = _vala_is_corrupted;
-#line 1332 "TiffSupport.c"
+#line 1329 "TiffSupport.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 1336 "TiffSupport.c"
+#line 1333 "TiffSupport.c"
 }
 
 
@@ -1340,8 +1337,8 @@ static void photos_tiff_sniffer_class_init (PhotosTiffSnifferClass * klass) {
 #line 102 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	photos_tiff_sniffer_parent_class = g_type_class_peek_parent (klass);
 #line 102 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) photos_tiff_sniffer_real_sniff;
-#line 1345 "TiffSupport.c"
+	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) photos_tiff_sniffer_real_sniff;
+#line 1342 "TiffSupport.c"
 }
 
 
@@ -1363,7 +1360,7 @@ GType photos_tiff_sniffer_get_type (void) {
 
 PhotosTiffReader* photos_tiff_reader_construct (GType object_type, const gchar* filepath) {
 	PhotosTiffReader* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 123 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 124 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1372,21 +1369,21 @@ PhotosTiffReader* photos_tiff_reader_construct (GType object_type, const gchar*
 	self = (PhotosTiffReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF);
 #line 123 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self;
-#line 1376 "TiffSupport.c"
+#line 1373 "TiffSupport.c"
 }
 
 
 PhotosTiffReader* photos_tiff_reader_new (const gchar* filepath) {
 #line 123 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return photos_tiff_reader_construct (PHOTOS_TYPE_TIFF_READER, filepath);
-#line 1383 "TiffSupport.c"
+#line 1380 "TiffSupport.c"
 }
 
 
 static void photos_tiff_reader_class_init (PhotosTiffReaderClass * klass) {
 #line 122 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	photos_tiff_reader_parent_class = g_type_class_peek_parent (klass);
-#line 1390 "TiffSupport.c"
+#line 1387 "TiffSupport.c"
 }
 
 
@@ -1408,7 +1405,7 @@ GType photos_tiff_reader_get_type (void) {
 
 PhotosTiffWriter* photos_tiff_writer_construct (GType object_type, const gchar* filepath) {
 	PhotosTiffWriter* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 135 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 136 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1417,22 +1414,22 @@ PhotosTiffWriter* photos_tiff_writer_construct (GType object_type, const gchar*
 	self = (PhotosTiffWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF);
 #line 135 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self;
-#line 1421 "TiffSupport.c"
+#line 1418 "TiffSupport.c"
 }
 
 
 PhotosTiffWriter* photos_tiff_writer_new (const gchar* filepath) {
 #line 135 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return photos_tiff_writer_construct (PHOTOS_TYPE_TIFF_WRITER, filepath);
-#line 1428 "TiffSupport.c"
+#line 1425 "TiffSupport.c"
 }
 
 
 static void photos_tiff_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) {
 	PhotosTiffWriter * self;
-	GdkPixbuf* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	GdkPixbuf* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 139 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_WRITER, PhotosTiffWriter);
@@ -1454,7 +1451,7 @@ static void photos_tiff_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pix
 		g_propagate_error (error, _inner_error_);
 #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return;
-#line 1458 "TiffSupport.c"
+#line 1455 "TiffSupport.c"
 	}
 }
 
@@ -1463,8 +1460,8 @@ static void photos_tiff_writer_class_init (PhotosTiffWriterClass * klass) {
 #line 128 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	photos_tiff_writer_parent_class = g_type_class_peek_parent (klass);
 #line 128 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) photos_tiff_writer_real_write;
-#line 1468 "TiffSupport.c"
+	((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) photos_tiff_writer_real_write;
+#line 1465 "TiffSupport.c"
 }
 
 
@@ -1486,7 +1483,7 @@ GType photos_tiff_writer_get_type (void) {
 
 PhotosTiffMetadataWriter* photos_tiff_metadata_writer_construct (GType object_type, const gchar* filepath) {
 	PhotosTiffMetadataWriter* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 145 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 146 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1495,22 +1492,22 @@ PhotosTiffMetadataWriter* photos_tiff_metadata_writer_construct (GType object_ty
 	self = (PhotosTiffMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF);
 #line 145 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self;
-#line 1499 "TiffSupport.c"
+#line 1496 "TiffSupport.c"
 }
 
 
 PhotosTiffMetadataWriter* photos_tiff_metadata_writer_new (const gchar* filepath) {
 #line 145 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return photos_tiff_metadata_writer_construct (PHOTOS_TYPE_TIFF_METADATA_WRITER, filepath);
-#line 1506 "TiffSupport.c"
+#line 1503 "TiffSupport.c"
 }
 
 
 static void photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error) {
 	PhotosTiffMetadataWriter * self;
-	PhotoMetadata* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	PhotoMetadata* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 149 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_METADATA_WRITER, PhotosTiffMetadataWriter);
@@ -1532,7 +1529,7 @@ static void photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWr
 		g_propagate_error (error, _inner_error_);
 #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return;
-#line 1536 "TiffSupport.c"
+#line 1533 "TiffSupport.c"
 	}
 }
 
@@ -1541,8 +1538,8 @@ static void photos_tiff_metadata_writer_class_init (PhotosTiffMetadataWriterClas
 #line 144 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	photos_tiff_metadata_writer_parent_class = g_type_class_peek_parent (klass);
 #line 144 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) photos_tiff_metadata_writer_real_write_metadata;
-#line 1546 "TiffSupport.c"
+	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) photos_tiff_metadata_writer_real_write_metadata;
+#line 1543 "TiffSupport.c"
 }
 
 
@@ -1565,22 +1562,22 @@ GType photos_tiff_metadata_writer_get_type (void) {
 gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) {
 	gboolean result = FALSE;
 	GFileInputStream* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFileInputStream* _tmp2_ = NULL;
+	GFile* _tmp1_;
+	GFileInputStream* _tmp2_;
 	GDataInputStream* dins = NULL;
-	GDataInputStream* _tmp4_ = NULL;
+	GDataInputStream* _tmp4_;
 	GDataStreamByteOrder order = 0;
 	guint16 _tmp5_ = 0U;
-	GDataInputStream* _tmp6_ = NULL;
-	GCancellable* _tmp7_ = NULL;
-	guint16 _tmp8_ = 0U;
-	GDataInputStream* _tmp10_ = NULL;
-	GDataStreamByteOrder _tmp11_ = 0;
+	GDataInputStream* _tmp6_;
+	GCancellable* _tmp7_;
+	guint16 _tmp8_;
+	GDataInputStream* _tmp10_;
+	GDataStreamByteOrder _tmp11_;
 	guint16 lue = 0U;
-	GDataInputStream* _tmp12_ = NULL;
-	GCancellable* _tmp13_ = NULL;
-	guint16 _tmp14_ = 0U;
-	guint16 _tmp16_ = 0U;
+	GDataInputStream* _tmp12_;
+	GCancellable* _tmp13_;
+	guint16 _tmp14_;
+	guint16 _tmp16_;
 	GError * _inner_error_ = NULL;
 #line 154 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
@@ -1594,13 +1591,13 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 	_tmp0_ = _tmp2_;
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1598 "TiffSupport.c"
+#line 1595 "TiffSupport.c"
 		gboolean _tmp3_ = FALSE;
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return _tmp3_;
-#line 1604 "TiffSupport.c"
+#line 1601 "TiffSupport.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp4_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
@@ -1616,7 +1613,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 	_tmp5_ = _tmp8_;
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1620 "TiffSupport.c"
+#line 1617 "TiffSupport.c"
 		gboolean _tmp9_ = FALSE;
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		g_propagate_error (error, _inner_error_);
@@ -1626,29 +1623,29 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 		_g_object_unref0 (_tmp0_);
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return _tmp9_;
-#line 1630 "TiffSupport.c"
+#line 1627 "TiffSupport.c"
 	}
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	switch (_tmp5_) {
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		case 0x4949:
-#line 1636 "TiffSupport.c"
+#line 1633 "TiffSupport.c"
 		{
 #line 161 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 			order = G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN;
 #line 162 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 			break;
-#line 1642 "TiffSupport.c"
+#line 1639 "TiffSupport.c"
 		}
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		case 0x4D4D:
-#line 1646 "TiffSupport.c"
+#line 1643 "TiffSupport.c"
 		{
 #line 165 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 			order = G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN;
 #line 166 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 			break;
-#line 1652 "TiffSupport.c"
+#line 1649 "TiffSupport.c"
 		}
 		default:
 		{
@@ -1660,7 +1657,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 			_g_object_unref0 (_tmp0_);
 #line 169 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 			return result;
-#line 1664 "TiffSupport.c"
+#line 1661 "TiffSupport.c"
 		}
 	}
 #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1679,7 +1676,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 	lue = _tmp14_;
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1683 "TiffSupport.c"
+#line 1680 "TiffSupport.c"
 		gboolean _tmp15_ = FALSE;
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		g_propagate_error (error, _inner_error_);
@@ -1689,7 +1686,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 		_g_object_unref0 (_tmp0_);
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return _tmp15_;
-#line 1693 "TiffSupport.c"
+#line 1690 "TiffSupport.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp16_ = lue;
@@ -1703,7 +1700,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 		_g_object_unref0 (_tmp0_);
 #line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return result;
-#line 1707 "TiffSupport.c"
+#line 1704 "TiffSupport.c"
 	}
 #line 180 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	result = TRUE;
@@ -1713,7 +1710,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 	_g_object_unref0 (_tmp0_);
 #line 180 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 1717 "TiffSupport.c"
+#line 1714 "TiffSupport.c"
 }
 
 
diff --git a/src/plugins/DataImportsInterfaces.c b/src/plugins/DataImportsInterfaces.c
index 7a23e74..49b2b48 100644
--- a/src/plugins/DataImportsInterfaces.c
+++ b/src/plugins/DataImportsInterfaces.c
@@ -1,4 +1,4 @@
-/* DataImportsInterfaces.c generated by valac 0.34.7, the Vala compiler
+/* DataImportsInterfaces.c generated by valac 0.36.6, the Vala compiler
  * generated from DataImportsInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/ManifestWidget.c b/src/plugins/ManifestWidget.c
index 6ceefd9..b309c95 100644
--- a/src/plugins/ManifestWidget.c
+++ b/src/plugins/ManifestWidget.c
@@ -1,4 +1,4 @@
-/* ManifestWidget.c generated by valac 0.34.7, the Vala compiler
+/* ManifestWidget.c generated by valac 0.36.6, the Vala compiler
  * generated from ManifestWidget.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -135,13 +135,13 @@ static void plugins_manifest_widget_mediator_set_about_button_sensitivity (Plugi
 gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* self, int* result_length1);
 gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info);
 gboolean is_string_empty (const gchar* s);
-static void _vala_array_add49 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add49 (gchar** * array, int* length, int* size, gchar* value);
 GdkPixbuf* resources_get_icon (const gchar* name, gint scale);
 #define RESOURCES_ICON_GENERIC_PLUGIN "generic-plugin.png"
 #define RESOURCES_DEFAULT_ICON_SCALE 24
 gchar* plugins_get_pluggable_name (const gchar* id);
 GtkWidget* plugins_manifest_widget_mediator_get_widget (PluginsManifestWidgetMediator* self);
-static void plugins_manifest_widget_mediator_finalize (PluginsManifestWidgetMediator* obj);
+static void plugins_manifest_widget_mediator_finalize (PluginsManifestWidgetMediator * obj);
 #define PLUGINS_MANIFEST_LIST_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PLUGINS_TYPE_MANIFEST_LIST_VIEW, PluginsManifestListViewPrivate))
 enum  {
 	PLUGINS_MANIFEST_LIST_VIEW_DUMMY_PROPERTY
@@ -169,12 +169,12 @@ gint plugins_compare_pluggable_names (void* a, void* b);
 static gint _plugins_compare_pluggable_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
 gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled);
 static gchar* plugins_manifest_list_view_get_id_at_path (PluginsManifestListView* self, GtkTreePath* path, GtkTreeIter* iter);
-static void _vala_array_add50 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add50 (gchar** * array, int* length, int* size, gchar* value);
 static void _gtk_tree_path_free0_ (gpointer var);
 static void _g_list_free__gtk_tree_path_free0_ (GList* self);
 static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* base, GdkEventButton* event);
 void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled);
-static void plugins_manifest_list_view_finalize (GObject* obj);
+static void plugins_manifest_list_view_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
@@ -196,13 +196,13 @@ static void _plugins_manifest_widget_mediator_on_selection_changed_gtk_tree_sele
 
 PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_construct (GType object_type) {
 	PluginsManifestWidgetMediator* self = NULL;
-	GtkScrolledWindow* _tmp0_ = NULL;
-	GtkScrolledWindow* _tmp1_ = NULL;
-	PluginsManifestListView* _tmp2_ = NULL;
-	GtkButton* _tmp3_ = NULL;
-	GtkButton* _tmp4_ = NULL;
-	PluginsManifestListView* _tmp5_ = NULL;
-	GtkTreeSelection* _tmp6_ = NULL;
+	GtkScrolledWindow* _tmp0_;
+	GtkScrolledWindow* _tmp1_;
+	PluginsManifestListView* _tmp2_;
+	GtkButton* _tmp3_;
+	GtkButton* _tmp4_;
+	PluginsManifestListView* _tmp5_;
+	GtkTreeSelection* _tmp6_;
 #line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self = (PluginsManifestWidgetMediator*) g_type_create_instance (object_type);
 #line 32 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -243,27 +243,27 @@ PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_new (void) {
 static gchar* string_strip (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 263 "ManifestWidget.c"
 }
 
 
-static void _vala_array_add49 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add49 (gchar** * array, int* length, int* size, gchar* value) {
 #line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if ((*length) == (*size)) {
 #line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -289,67 +289,67 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMediator* self) {
 	gchar** ids = NULL;
-	PluginsManifestListView* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar** _tmp2_ = NULL;
-	gint ids_length1 = 0;
-	gint _ids_size_ = 0;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	PluginsManifestListView* _tmp0_;
+	gint _tmp1_;
+	gchar** _tmp2_;
+	gint ids_length1;
+	gint _ids_size_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
 	gchar* id = NULL;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar** _tmp4_;
+	gint _tmp4__length1;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 	SpitPluggableInfo info = {0};
-	const gchar* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	const gchar* _tmp7_;
+	gboolean _tmp8_;
 	gchar** authors = NULL;
-	gint authors_length1 = 0;
-	gint _authors_size_ = 0;
-	SpitPluggableInfo _tmp10_ = {0};
-	const gchar* _tmp11_ = NULL;
+	gint authors_length1;
+	gint _authors_size_;
+	SpitPluggableInfo _tmp10_;
+	const gchar* _tmp11_;
 	GtkAboutDialog* about_dialog = NULL;
-	GtkAboutDialog* _tmp31_ = NULL;
-	GtkAboutDialog* _tmp32_ = NULL;
-	gchar** _tmp33_ = NULL;
-	gint _tmp33__length1 = 0;
-	GtkAboutDialog* _tmp34_ = NULL;
-	SpitPluggableInfo _tmp35_ = {0};
-	const gchar* _tmp36_ = NULL;
-	GtkAboutDialog* _tmp37_ = NULL;
-	SpitPluggableInfo _tmp38_ = {0};
-	const gchar* _tmp39_ = NULL;
-	GtkAboutDialog* _tmp40_ = NULL;
-	SpitPluggableInfo _tmp41_ = {0};
-	const gchar* _tmp42_ = NULL;
-	GtkAboutDialog* _tmp43_ = NULL;
-	SpitPluggableInfo _tmp44_ = {0};
-	gboolean _tmp45_ = FALSE;
+	GtkAboutDialog* _tmp31_;
+	GtkAboutDialog* _tmp32_;
+	gchar** _tmp33_;
+	gint _tmp33__length1;
+	GtkAboutDialog* _tmp34_;
+	SpitPluggableInfo _tmp35_;
+	const gchar* _tmp36_;
+	GtkAboutDialog* _tmp37_;
+	SpitPluggableInfo _tmp38_;
+	const gchar* _tmp39_;
+	GtkAboutDialog* _tmp40_;
+	SpitPluggableInfo _tmp41_;
+	const gchar* _tmp42_;
+	GtkAboutDialog* _tmp43_;
+	SpitPluggableInfo _tmp44_;
+	gboolean _tmp45_;
 	GdkPixbuf* _tmp46_ = NULL;
 	gboolean _tmp47_ = FALSE;
-	SpitPluggableInfo _tmp48_ = {0};
-	GdkPixbuf** _tmp49_ = NULL;
-	gint _tmp49__length1 = 0;
-	GtkAboutDialog* _tmp57_ = NULL;
-	GtkAboutDialog* _tmp58_ = NULL;
-	const gchar* _tmp59_ = NULL;
-	gchar* _tmp60_ = NULL;
-	gchar* _tmp61_ = NULL;
-	GtkAboutDialog* _tmp62_ = NULL;
-	SpitPluggableInfo _tmp63_ = {0};
-	const gchar* _tmp64_ = NULL;
-	GtkAboutDialog* _tmp65_ = NULL;
-	SpitPluggableInfo _tmp66_ = {0};
-	const gchar* _tmp67_ = NULL;
-	GtkAboutDialog* _tmp68_ = NULL;
-	SpitPluggableInfo _tmp69_ = {0};
-	const gchar* _tmp70_ = NULL;
-	GtkAboutDialog* _tmp71_ = NULL;
-	SpitPluggableInfo _tmp72_ = {0};
-	const gchar* _tmp73_ = NULL;
-	GtkAboutDialog* _tmp74_ = NULL;
-	GtkAboutDialog* _tmp75_ = NULL;
+	SpitPluggableInfo _tmp48_;
+	GdkPixbuf** _tmp49_;
+	gint _tmp49__length1;
+	GtkAboutDialog* _tmp57_;
+	GtkAboutDialog* _tmp58_;
+	const gchar* _tmp59_;
+	gchar* _tmp60_;
+	gchar* _tmp61_;
+	GtkAboutDialog* _tmp62_;
+	SpitPluggableInfo _tmp63_;
+	const gchar* _tmp64_;
+	GtkAboutDialog* _tmp65_;
+	SpitPluggableInfo _tmp66_;
+	const gchar* _tmp67_;
+	GtkAboutDialog* _tmp68_;
+	SpitPluggableInfo _tmp69_;
+	const gchar* _tmp70_;
+	GtkAboutDialog* _tmp71_;
+	SpitPluggableInfo _tmp72_;
+	const gchar* _tmp73_;
+	GtkAboutDialog* _tmp74_;
+	GtkAboutDialog* _tmp75_;
 #line 45 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self));
 #line 46 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -393,7 +393,7 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 #line 53 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (!_tmp8_) {
 #line 396 "ManifestWidget.c"
-		const gchar* _tmp9_ = NULL;
+		const gchar* _tmp9_;
 #line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp9_ = id;
 #line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -422,12 +422,12 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 	if (_tmp11_ != NULL) {
 #line 424 "ManifestWidget.c"
 		gchar** split = NULL;
-		SpitPluggableInfo _tmp12_ = {0};
-		const gchar* _tmp13_ = NULL;
-		gchar** _tmp14_ = NULL;
-		gchar** _tmp15_ = NULL;
-		gint split_length1 = 0;
-		gint _split_size_ = 0;
+		SpitPluggableInfo _tmp12_;
+		const gchar* _tmp13_;
+		gchar** _tmp14_;
+		gchar** _tmp15_;
+		gint split_length1;
+		gint _split_size_;
 #line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp12_ = info;
 #line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -453,21 +453,21 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 #line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				while (TRUE) {
 #line 456 "ManifestWidget.c"
-					gint _tmp18_ = 0;
-					gchar** _tmp19_ = NULL;
-					gint _tmp19__length1 = 0;
+					gint _tmp18_;
+					gchar** _tmp19_;
+					gint _tmp19__length1;
 					gchar* stripped = NULL;
-					gchar** _tmp20_ = NULL;
-					gint _tmp20__length1 = 0;
-					gint _tmp21_ = 0;
-					const gchar* _tmp22_ = NULL;
-					gchar* _tmp23_ = NULL;
-					const gchar* _tmp24_ = NULL;
-					gboolean _tmp25_ = FALSE;
+					gchar** _tmp20_;
+					gint _tmp20__length1;
+					gint _tmp21_;
+					const gchar* _tmp22_;
+					gchar* _tmp23_;
+					const gchar* _tmp24_;
+					gboolean _tmp25_;
 #line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (!_tmp16_) {
 #line 470 "ManifestWidget.c"
-						gint _tmp17_ = 0;
+						gint _tmp17_;
 #line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp17_ = ctr;
 #line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -507,12 +507,12 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 #line 66 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (!_tmp25_) {
 #line 510 "ManifestWidget.c"
-						gchar** _tmp26_ = NULL;
-						gint _tmp26__length1 = 0;
-						gchar** _tmp28_ = NULL;
-						gint _tmp28__length1 = 0;
-						const gchar* _tmp29_ = NULL;
-						gchar* _tmp30_ = NULL;
+						gchar** _tmp26_;
+						gint _tmp26__length1;
+						gchar** _tmp28_;
+						gint _tmp28__length1;
+						const gchar* _tmp29_;
+						gchar* _tmp30_;
 #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp26_ = authors;
 #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -520,7 +520,7 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						if (_tmp26_ == NULL) {
 #line 523 "ManifestWidget.c"
-							gchar** _tmp27_ = NULL;
+							gchar** _tmp27_;
 #line 68 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 							_tmp27_ = g_new0 (gchar*, 0 + 1);
 #line 68 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -610,9 +610,9 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp49_ != NULL) {
 #line 613 "ManifestWidget.c"
-		SpitPluggableInfo _tmp50_ = {0};
-		GdkPixbuf** _tmp51_ = NULL;
-		gint _tmp51__length1 = 0;
+		SpitPluggableInfo _tmp50_;
+		GdkPixbuf** _tmp51_;
+		gint _tmp51__length1;
 #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp50_ = info;
 #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -630,11 +630,11 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp47_) {
 #line 633 "ManifestWidget.c"
-		SpitPluggableInfo _tmp52_ = {0};
-		GdkPixbuf** _tmp53_ = NULL;
-		gint _tmp53__length1 = 0;
-		GdkPixbuf* _tmp54_ = NULL;
-		GdkPixbuf* _tmp55_ = NULL;
+		SpitPluggableInfo _tmp52_;
+		GdkPixbuf** _tmp53_;
+		gint _tmp53__length1;
+		GdkPixbuf* _tmp54_;
+		GdkPixbuf* _tmp55_;
 #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp52_ = info;
 #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -651,7 +651,7 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 		_tmp46_ = _tmp55_;
 #line 653 "ManifestWidget.c"
 	} else {
-		GdkPixbuf* _tmp56_ = NULL;
+		GdkPixbuf* _tmp56_;
 #line 82 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp56_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
 #line 82 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -743,13 +743,13 @@ static void plugins_manifest_widget_mediator_on_selection_changed (PluginsManife
 
 static void plugins_manifest_widget_mediator_set_about_button_sensitivity (PluginsManifestWidgetMediator* self) {
 	gchar** ids = NULL;
-	PluginsManifestListView* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar** _tmp2_ = NULL;
-	gint ids_length1 = 0;
-	gint _ids_size_ = 0;
-	GtkButton* _tmp3_ = NULL;
-	GtkButton* _tmp4_ = NULL;
+	PluginsManifestListView* _tmp0_;
+	gint _tmp1_;
+	gchar** _tmp2_;
+	gint ids_length1;
+	gint _ids_size_;
+	GtkButton* _tmp3_;
+	GtkButton* _tmp4_;
 #line 98 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self));
 #line 103 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -776,8 +776,8 @@ static void plugins_manifest_widget_mediator_set_about_button_sensitivity (Plugi
 
 GtkWidget* plugins_manifest_widget_mediator_get_widget (PluginsManifestWidgetMediator* self) {
 	GtkWidget* result;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
+	GtkBuilder* _tmp0_;
+	GObject* _tmp1_;
 #line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self), NULL);
 #line 12 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -794,8 +794,8 @@ GtkWidget* plugins_manifest_widget_mediator_get_widget (PluginsManifestWidgetMed
 
 static GtkButton* plugins_manifest_widget_mediator_get_about_button (PluginsManifestWidgetMediator* self) {
 	GtkButton* result;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
+	GtkBuilder* _tmp0_;
+	GObject* _tmp1_;
 #line 17 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self), NULL);
 #line 18 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -812,8 +812,8 @@ static GtkButton* plugins_manifest_widget_mediator_get_about_button (PluginsMani
 
 static GtkScrolledWindow* plugins_manifest_widget_mediator_get_list_bin (PluginsManifestWidgetMediator* self) {
 	GtkScrolledWindow* result;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
+	GtkBuilder* _tmp0_;
+	GObject* _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self), NULL);
 #line 24 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -870,7 +870,7 @@ static gchar* plugins_value_manifest_widget_mediator_collect_value (GValue* valu
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (collect_values[0].v_pointer) {
 #line 873 "ManifestWidget.c"
-		PluginsManifestWidgetMediator* object;
+		PluginsManifestWidgetMediator * object;
 		object = collect_values[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -897,7 +897,7 @@ static gchar* plugins_value_manifest_widget_mediator_collect_value (GValue* valu
 
 
 static gchar* plugins_value_manifest_widget_mediator_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PluginsManifestWidgetMediator** object_p;
+	PluginsManifestWidgetMediator ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (!object_p) {
@@ -949,7 +949,7 @@ gpointer plugins_value_get_manifest_widget_mediator (const GValue* value) {
 
 
 void plugins_value_set_manifest_widget_mediator (GValue* value, gpointer v_object) {
-	PluginsManifestWidgetMediator* old;
+	PluginsManifestWidgetMediator * old;
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR));
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -980,7 +980,7 @@ void plugins_value_set_manifest_widget_mediator (GValue* value, gpointer v_objec
 
 
 void plugins_value_take_manifest_widget_mediator (GValue* value, gpointer v_object) {
-	PluginsManifestWidgetMediator* old;
+	PluginsManifestWidgetMediator * old;
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR));
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1020,8 +1020,8 @@ static void plugins_manifest_widget_mediator_class_init (PluginsManifestWidgetMe
 
 
 static void plugins_manifest_widget_mediator_instance_init (PluginsManifestWidgetMediator * self) {
-	GtkBuilder* _tmp0_ = NULL;
-	PluginsManifestListView* _tmp1_ = NULL;
+	GtkBuilder* _tmp0_;
+	PluginsManifestListView* _tmp1_;
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self->priv = PLUGINS_MANIFEST_WIDGET_MEDIATOR_GET_PRIVATE (self);
 #line 28 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1040,14 +1040,14 @@ static void plugins_manifest_widget_mediator_instance_init (PluginsManifestWidge
 }
 
 
-static void plugins_manifest_widget_mediator_finalize (PluginsManifestWidgetMediator* obj) {
+static void plugins_manifest_widget_mediator_finalize (PluginsManifestWidgetMediator * obj) {
 	PluginsManifestWidgetMediator * self;
-	GtkButton* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	PluginsManifestListView* _tmp3_ = NULL;
-	GtkTreeSelection* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
+	GtkButton* _tmp0_;
+	GtkButton* _tmp1_;
+	guint _tmp2_;
+	PluginsManifestListView* _tmp3_;
+	GtkTreeSelection* _tmp4_;
+	guint _tmp5_;
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR, PluginsManifestWidgetMediator);
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1091,7 +1091,7 @@ GType plugins_manifest_widget_mediator_get_type (void) {
 
 
 gpointer plugins_manifest_widget_mediator_ref (gpointer instance) {
-	PluginsManifestWidgetMediator* self;
+	PluginsManifestWidgetMediator * self;
 	self = instance;
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1102,7 +1102,7 @@ gpointer plugins_manifest_widget_mediator_ref (gpointer instance) {
 
 
 void plugins_manifest_widget_mediator_unref (gpointer instance) {
-	PluginsManifestWidgetMediator* self;
+	PluginsManifestWidgetMediator * self;
 	self = instance;
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1147,39 +1147,39 @@ static gint _plugins_compare_pluggable_names_gcompare_data_func (gconstpointer a
 
 PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type) {
 	PluginsManifestListView * self = NULL;
-	GtkTreeStore* _tmp0_ = NULL;
+	GtkTreeStore* _tmp0_;
 	GtkCellRendererToggle* checkbox_renderer = NULL;
-	GtkCellRendererToggle* _tmp1_ = NULL;
-	GtkCellRendererToggle* _tmp2_ = NULL;
-	GtkCellRendererToggle* _tmp3_ = NULL;
+	GtkCellRendererToggle* _tmp1_;
+	GtkCellRendererToggle* _tmp2_;
+	GtkCellRendererToggle* _tmp3_;
 	GtkCellRendererPixbuf* icon_renderer = NULL;
-	GtkCellRendererPixbuf* _tmp4_ = NULL;
-	GtkCellRendererPixbuf* _tmp5_ = NULL;
-	GtkCellRendererPixbuf* _tmp6_ = NULL;
-	GtkCellRendererPixbuf* _tmp7_ = NULL;
+	GtkCellRendererPixbuf* _tmp4_;
+	GtkCellRendererPixbuf* _tmp5_;
+	GtkCellRendererPixbuf* _tmp6_;
+	GtkCellRendererPixbuf* _tmp7_;
 	GtkCellRendererText* text_renderer = NULL;
-	GtkCellRendererText* _tmp8_ = NULL;
+	GtkCellRendererText* _tmp8_;
 	GtkTreeViewColumn* column = NULL;
-	GtkTreeViewColumn* _tmp9_ = NULL;
-	GtkTreeViewColumn* _tmp10_ = NULL;
-	GtkTreeViewColumn* _tmp11_ = NULL;
-	GtkCellRendererToggle* _tmp12_ = NULL;
-	GtkTreeViewColumn* _tmp13_ = NULL;
-	GtkCellRendererPixbuf* _tmp14_ = NULL;
-	GtkTreeViewColumn* _tmp15_ = NULL;
-	GtkCellRendererText* _tmp16_ = NULL;
-	GtkTreeViewColumn* _tmp17_ = NULL;
-	GtkCellRendererToggle* _tmp18_ = NULL;
-	GtkTreeViewColumn* _tmp19_ = NULL;
-	GtkCellRendererToggle* _tmp20_ = NULL;
-	GtkTreeViewColumn* _tmp21_ = NULL;
-	GtkCellRendererPixbuf* _tmp22_ = NULL;
-	GtkTreeViewColumn* _tmp23_ = NULL;
-	GtkCellRendererText* _tmp24_ = NULL;
-	GtkTreeViewColumn* _tmp25_ = NULL;
-	GtkTreeSelection* _tmp26_ = NULL;
+	GtkTreeViewColumn* _tmp9_;
+	GtkTreeViewColumn* _tmp10_;
+	GtkTreeViewColumn* _tmp11_;
+	GtkCellRendererToggle* _tmp12_;
+	GtkTreeViewColumn* _tmp13_;
+	GtkCellRendererPixbuf* _tmp14_;
+	GtkTreeViewColumn* _tmp15_;
+	GtkCellRendererText* _tmp16_;
+	GtkTreeViewColumn* _tmp17_;
+	GtkCellRendererToggle* _tmp18_;
+	GtkTreeViewColumn* _tmp19_;
+	GtkCellRendererToggle* _tmp20_;
+	GtkTreeViewColumn* _tmp21_;
+	GtkCellRendererPixbuf* _tmp22_;
+	GtkTreeViewColumn* _tmp23_;
+	GtkCellRendererText* _tmp24_;
+	GtkTreeViewColumn* _tmp25_;
+	GtkTreeSelection* _tmp26_;
 	GtkIconTheme* icon_theme = NULL;
-	GtkIconTheme* _tmp27_ = NULL;
+	GtkIconTheme* _tmp27_;
 	GError * _inner_error_ = NULL;
 #line 130 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self = (PluginsManifestListView*) g_object_new (object_type, NULL);
@@ -1304,10 +1304,10 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 1305 "ManifestWidget.c"
 	{
 		GeeIterator* _extension_point_it = NULL;
-		GeeCollection* _tmp28_ = NULL;
-		GeeCollection* _tmp29_ = NULL;
-		GeeIterator* _tmp30_ = NULL;
-		GeeIterator* _tmp31_ = NULL;
+		GeeCollection* _tmp28_;
+		GeeCollection* _tmp29_;
+		GeeIterator* _tmp30_;
+		GeeIterator* _tmp31_;
 #line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp28_ = plugins_get_extension_points (_plugins_compare_extension_point_names_gcompare_data_func, NULL, NULL);
 #line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1323,29 +1323,29 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		while (TRUE) {
 #line 1326 "ManifestWidget.c"
-			GeeIterator* _tmp32_ = NULL;
-			gboolean _tmp33_ = FALSE;
+			GeeIterator* _tmp32_;
+			gboolean _tmp33_;
 			PluginsExtensionPoint* extension_point = NULL;
-			GeeIterator* _tmp34_ = NULL;
-			gpointer _tmp35_ = NULL;
+			GeeIterator* _tmp34_;
+			gpointer _tmp35_;
 			GtkTreeIter category_iter = {0};
-			GtkTreeStore* _tmp36_ = NULL;
+			GtkTreeStore* _tmp36_;
 			GtkTreeIter _tmp37_ = {0};
 			GdkPixbuf* icon = NULL;
-			PluginsExtensionPoint* _tmp38_ = NULL;
-			const gchar* _tmp39_ = NULL;
-			const gchar* _tmp40_ = NULL;
-			GtkTreeStore* _tmp59_ = NULL;
-			GtkTreeIter _tmp60_ = {0};
-			PluginsExtensionPoint* _tmp61_ = NULL;
-			const gchar* _tmp62_ = NULL;
-			const gchar* _tmp63_ = NULL;
-			GdkPixbuf* _tmp64_ = NULL;
+			PluginsExtensionPoint* _tmp38_;
+			const gchar* _tmp39_;
+			const gchar* _tmp40_;
+			GtkTreeStore* _tmp59_;
+			GtkTreeIter _tmp60_;
+			PluginsExtensionPoint* _tmp61_;
+			const gchar* _tmp62_;
+			const gchar* _tmp63_;
+			GdkPixbuf* _tmp64_;
 			GeeCollection* pluggables = NULL;
-			PluginsExtensionPoint* _tmp65_ = NULL;
-			GType _tmp66_ = 0UL;
-			GType _tmp67_ = 0UL;
-			GeeCollection* _tmp68_ = NULL;
+			PluginsExtensionPoint* _tmp65_;
+			GType _tmp66_;
+			GType _tmp67_;
+			GeeCollection* _tmp68_;
 #line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp32_ = _extension_point_it;
 #line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1380,15 +1380,15 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 			if (_tmp40_ != NULL) {
 #line 1382 "ManifestWidget.c"
 				GtkIconInfo* icon_info = NULL;
-				GtkIconTheme* _tmp41_ = NULL;
-				PluginsExtensionPoint* _tmp42_ = NULL;
-				const gchar* _tmp43_ = NULL;
-				const gchar* _tmp44_ = NULL;
-				GThemedIcon* _tmp45_ = NULL;
-				GThemedIcon* _tmp46_ = NULL;
-				GtkIconInfo* _tmp47_ = NULL;
-				GtkIconInfo* _tmp48_ = NULL;
-				GtkIconInfo* _tmp49_ = NULL;
+				GtkIconTheme* _tmp41_;
+				PluginsExtensionPoint* _tmp42_;
+				const gchar* _tmp43_;
+				const gchar* _tmp44_;
+				GThemedIcon* _tmp45_;
+				GThemedIcon* _tmp46_;
+				GtkIconInfo* _tmp47_;
+				GtkIconInfo* _tmp48_;
+				GtkIconInfo* _tmp49_;
 #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp41_ = icon_theme;
 #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1416,9 +1416,9 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 1417 "ManifestWidget.c"
 					{
 						GdkPixbuf* _tmp50_ = NULL;
-						GtkIconInfo* _tmp51_ = NULL;
-						GdkPixbuf* _tmp52_ = NULL;
-						GdkPixbuf* _tmp53_ = NULL;
+						GtkIconInfo* _tmp51_;
+						GdkPixbuf* _tmp52_;
+						GdkPixbuf* _tmp53_;
 #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp51_ = icon_info;
 #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1446,11 +1446,11 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 					__catch37_g_error:
 					{
 						GError* err = NULL;
-						PluginsExtensionPoint* _tmp54_ = NULL;
-						const gchar* _tmp55_ = NULL;
-						const gchar* _tmp56_ = NULL;
-						GError* _tmp57_ = NULL;
-						const gchar* _tmp58_ = NULL;
+						PluginsExtensionPoint* _tmp54_;
+						const gchar* _tmp55_;
+						const gchar* _tmp56_;
+						GError* _tmp57_;
+						const gchar* _tmp58_;
 #line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						err = _inner_error_;
 #line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1532,8 +1532,8 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 1533 "ManifestWidget.c"
 			{
 				GeeIterator* _pluggable_it = NULL;
-				GeeCollection* _tmp69_ = NULL;
-				GeeIterator* _tmp70_ = NULL;
+				GeeCollection* _tmp69_;
+				GeeIterator* _tmp70_;
 #line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp69_ = pluggables;
 #line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1543,36 +1543,36 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				while (TRUE) {
 #line 1546 "ManifestWidget.c"
-					GeeIterator* _tmp71_ = NULL;
-					gboolean _tmp72_ = FALSE;
+					GeeIterator* _tmp71_;
+					gboolean _tmp72_;
 					SpitPluggable* pluggable = NULL;
-					GeeIterator* _tmp73_ = NULL;
-					gpointer _tmp74_ = NULL;
+					GeeIterator* _tmp73_;
+					gpointer _tmp74_;
 					gboolean enabled = FALSE;
-					SpitPluggable* _tmp75_ = NULL;
-					const gchar* _tmp76_ = NULL;
+					SpitPluggable* _tmp75_;
+					const gchar* _tmp76_;
 					gboolean _tmp77_ = FALSE;
-					gboolean _tmp78_ = FALSE;
+					gboolean _tmp78_;
 					SpitPluggableInfo info = {0};
-					SpitPluggable* _tmp79_ = NULL;
+					SpitPluggable* _tmp79_;
 					GdkPixbuf* _tmp80_ = NULL;
 					gboolean _tmp81_ = FALSE;
-					SpitPluggableInfo _tmp82_ = {0};
-					GdkPixbuf** _tmp83_ = NULL;
-					gint _tmp83__length1 = 0;
-					GdkPixbuf* _tmp91_ = NULL;
+					SpitPluggableInfo _tmp82_;
+					GdkPixbuf** _tmp83_;
+					gint _tmp83__length1;
+					GdkPixbuf* _tmp91_;
 					GtkTreeIter plugin_iter = {0};
-					GtkTreeStore* _tmp92_ = NULL;
-					GtkTreeIter _tmp93_ = {0};
+					GtkTreeStore* _tmp92_;
+					GtkTreeIter _tmp93_;
 					GtkTreeIter _tmp94_ = {0};
-					GtkTreeStore* _tmp95_ = NULL;
-					GtkTreeIter _tmp96_ = {0};
-					gboolean _tmp97_ = FALSE;
-					SpitPluggable* _tmp98_ = NULL;
-					const gchar* _tmp99_ = NULL;
-					SpitPluggable* _tmp100_ = NULL;
-					const gchar* _tmp101_ = NULL;
-					GdkPixbuf* _tmp102_ = NULL;
+					GtkTreeStore* _tmp95_;
+					GtkTreeIter _tmp96_;
+					gboolean _tmp97_;
+					SpitPluggable* _tmp98_;
+					const gchar* _tmp99_;
+					SpitPluggable* _tmp100_;
+					const gchar* _tmp101_;
+					GdkPixbuf* _tmp102_;
 #line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp71_ = _pluggable_it;
 #line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1620,9 +1620,9 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (_tmp83_ != NULL) {
 #line 1623 "ManifestWidget.c"
-						SpitPluggableInfo _tmp84_ = {0};
-						GdkPixbuf** _tmp85_ = NULL;
-						gint _tmp85__length1 = 0;
+						SpitPluggableInfo _tmp84_;
+						GdkPixbuf** _tmp85_;
+						gint _tmp85__length1;
 #line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp84_ = info;
 #line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1640,11 +1640,11 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (_tmp81_) {
 #line 1643 "ManifestWidget.c"
-						SpitPluggableInfo _tmp86_ = {0};
-						GdkPixbuf** _tmp87_ = NULL;
-						gint _tmp87__length1 = 0;
-						GdkPixbuf* _tmp88_ = NULL;
-						GdkPixbuf* _tmp89_ = NULL;
+						SpitPluggableInfo _tmp86_;
+						GdkPixbuf** _tmp87_;
+						gint _tmp87__length1;
+						GdkPixbuf* _tmp88_;
+						GdkPixbuf* _tmp89_;
 #line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp86_ = info;
 #line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1661,7 +1661,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 						_tmp80_ = _tmp89_;
 #line 1663 "ManifestWidget.c"
 					} else {
-						GdkPixbuf* _tmp90_ = NULL;
+						GdkPixbuf* _tmp90_;
 #line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp90_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE);
 #line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1758,7 +1758,7 @@ static gpointer _gtk_tree_path_copy0 (gpointer self) {
 }
 
 
-static void _vala_array_add50 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add50 (gchar** * array, int* length, int* size, gchar* value) {
 #line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if ((*length) == (*size)) {
 #line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1794,15 +1794,15 @@ static void _g_list_free__gtk_tree_path_free0_ (GList* self) {
 gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* self, int* result_length1) {
 	gchar** result = NULL;
 	gchar** ids = NULL;
-	gchar** _tmp0_ = NULL;
-	gint ids_length1 = 0;
-	gint _ids_size_ = 0;
+	gchar** _tmp0_;
+	gint ids_length1;
+	gint _ids_size_;
 	GList* selected = NULL;
-	GtkTreeSelection* _tmp1_ = NULL;
-	GList* _tmp2_ = NULL;
-	GList* _tmp3_ = NULL;
-	gchar** _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
+	GtkTreeSelection* _tmp1_;
+	GList* _tmp2_;
+	GList* _tmp3_;
+	gchar** _tmp12_;
+	gint _tmp12__length1;
 #line 214 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (PLUGINS_IS_MANIFEST_LIST_VIEW (self), NULL);
 #line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1830,7 +1830,7 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se
 #line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		for (path_it = path_collection; path_it != NULL; path_it = path_it->next) {
 #line 1833 "ManifestWidget.c"
-			GtkTreePath* _tmp4_ = NULL;
+			GtkTreePath* _tmp4_;
 			GtkTreePath* path = NULL;
 #line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp4_ = _gtk_tree_path_copy0 ((GtkTreePath*) path_it->data);
@@ -1840,10 +1840,10 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se
 			{
 				GtkTreeIter iter = {0};
 				gchar* id = NULL;
-				GtkTreePath* _tmp5_ = NULL;
+				GtkTreePath* _tmp5_;
 				GtkTreeIter _tmp6_ = {0};
-				gchar* _tmp7_ = NULL;
-				const gchar* _tmp8_ = NULL;
+				gchar* _tmp7_;
+				const gchar* _tmp8_;
 #line 220 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp5_ = path;
 #line 220 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1857,10 +1857,10 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se
 #line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				if (_tmp8_ != NULL) {
 #line 1860 "ManifestWidget.c"
-					gchar** _tmp9_ = NULL;
-					gint _tmp9__length1 = 0;
-					const gchar* _tmp10_ = NULL;
-					gchar* _tmp11_ = NULL;
+					gchar** _tmp9_;
+					gint _tmp9__length1;
+					const gchar* _tmp10_;
+					gchar* _tmp11_;
 #line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp9_ = ids;
 #line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1904,15 +1904,15 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se
 static gchar* plugins_manifest_list_view_get_id_at_path (PluginsManifestListView* self, GtkTreePath* path, GtkTreeIter* iter) {
 	GtkTreeIter _vala_iter = {0};
 	gchar* result = NULL;
-	GtkTreeStore* _tmp0_ = NULL;
-	GtkTreePath* _tmp1_ = NULL;
+	GtkTreeStore* _tmp0_;
+	GtkTreePath* _tmp1_;
 	GtkTreeIter _tmp2_ = {0};
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp3_;
 	const gchar* id = NULL;
-	GtkTreeStore* _tmp4_ = NULL;
-	GtkTreeIter _tmp5_ = {0};
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	GtkTreeStore* _tmp4_;
+	GtkTreeIter _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
 #line 228 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (PLUGINS_IS_MANIFEST_LIST_VIEW (self), NULL);
 #line 228 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1970,34 +1970,34 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b
 	GtkTreeViewColumn* col = NULL;
 	gint cellx = 0;
 	gint celly = 0;
-	GdkEventButton* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	GdkEventButton* _tmp2_ = NULL;
-	gdouble _tmp3_ = 0.0;
+	GdkEventButton* _tmp0_;
+	gdouble _tmp1_;
+	GdkEventButton* _tmp2_;
+	gdouble _tmp3_;
 	GtkTreePath* _tmp4_ = NULL;
 	GtkTreeViewColumn* _tmp5_ = NULL;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-	gboolean _tmp8_ = FALSE;
-	GtkTreeViewColumn* _tmp9_ = NULL;
+	gboolean _tmp8_;
+	GtkTreeViewColumn* _tmp9_;
 	gboolean _tmp12_ = FALSE;
-	gint _tmp13_ = 0;
+	gint _tmp13_;
 	GtkTreeIter iter = {0};
 	gchar* id = NULL;
-	GtkTreePath* _tmp17_ = NULL;
+	GtkTreePath* _tmp17_;
 	GtkTreeIter _tmp18_ = {0};
-	gchar* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
+	gchar* _tmp19_;
+	const gchar* _tmp20_;
 	gboolean enabled = FALSE;
-	const gchar* _tmp23_ = NULL;
+	const gchar* _tmp23_;
 	gboolean _tmp24_ = FALSE;
-	gboolean _tmp25_ = FALSE;
-	gboolean _tmp28_ = FALSE;
-	const gchar* _tmp29_ = NULL;
-	gboolean _tmp30_ = FALSE;
-	GtkTreeStore* _tmp31_ = NULL;
-	GtkTreeIter _tmp32_ = {0};
-	gboolean _tmp33_ = FALSE;
+	gboolean _tmp25_;
+	gboolean _tmp28_;
+	const gchar* _tmp29_;
+	gboolean _tmp30_;
+	GtkTreeStore* _tmp31_;
+	GtkTreeIter _tmp32_;
+	gboolean _tmp33_;
 #line 246 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_MANIFEST_LIST_VIEW, PluginsManifestListView);
 #line 246 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -2029,8 +2029,8 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b
 #line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (!_tmp8_) {
 #line 2032 "ManifestWidget.c"
-		GdkEventButton* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
+		GdkEventButton* _tmp10_;
+		gboolean _tmp11_;
 #line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp10_ = event;
 #line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -2053,7 +2053,7 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b
 		_tmp12_ = TRUE;
 #line 2055 "ManifestWidget.c"
 	} else {
-		gint _tmp14_ = 0;
+		gint _tmp14_;
 #line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp14_ = cellx;
 #line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -2063,8 +2063,8 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b
 #line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp12_) {
 #line 2066 "ManifestWidget.c"
-		GdkEventButton* _tmp15_ = NULL;
-		gboolean _tmp16_ = FALSE;
+		GdkEventButton* _tmp15_;
+		gboolean _tmp16_;
 #line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp15_ = event;
 #line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -2092,8 +2092,8 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b
 #line 263 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp20_ == NULL) {
 #line 2095 "ManifestWidget.c"
-		GdkEventButton* _tmp21_ = NULL;
-		gboolean _tmp22_ = FALSE;
+		GdkEventButton* _tmp21_;
+		gboolean _tmp22_;
 #line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp21_ = event;
 #line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -2119,8 +2119,8 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b
 #line 267 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (!_tmp25_) {
 #line 2122 "ManifestWidget.c"
-		GdkEventButton* _tmp26_ = NULL;
-		gboolean _tmp27_ = FALSE;
+		GdkEventButton* _tmp26_;
+		gboolean _tmp27_;
 #line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp26_ = event;
 #line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -2175,7 +2175,7 @@ static void plugins_manifest_list_view_class_init (PluginsManifestListViewClass
 #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_type_class_add_private (klass, sizeof (PluginsManifestListViewPrivate));
 #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*)(GtkWidget*, GdkEventButton*)) plugins_manifest_list_view_real_button_press_event;
+	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*) (GtkWidget *, GdkEventButton*)) plugins_manifest_list_view_real_button_press_event;
 #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	G_OBJECT_CLASS (klass)->finalize = plugins_manifest_list_view_finalize;
 #line 2182 "ManifestWidget.c"
@@ -2183,7 +2183,7 @@ static void plugins_manifest_list_view_class_init (PluginsManifestListViewClass
 
 
 static void plugins_manifest_list_view_instance_init (PluginsManifestListView * self) {
-	GtkTreeStore* _tmp0_ = NULL;
+	GtkTreeStore* _tmp0_;
 #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self->priv = PLUGINS_MANIFEST_LIST_VIEW_GET_PRIVATE (self);
 #line 122 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -2194,7 +2194,7 @@ static void plugins_manifest_list_view_instance_init (PluginsManifestListView *
 }
 
 
-static void plugins_manifest_list_view_finalize (GObject* obj) {
+static void plugins_manifest_list_view_finalize (GObject * obj) {
 	PluginsManifestListView * self;
 #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_MANIFEST_LIST_VIEW, PluginsManifestListView);
diff --git a/src/plugins/Plugins.c b/src/plugins/Plugins.c
index aeda91e..3817292 100644
--- a/src/plugins/Plugins.c
+++ b/src/plugins/Plugins.c
@@ -1,4 +1,4 @@
-/* Plugins.c generated by valac 0.34.7, the Vala compiler
+/* Plugins.c generated by valac 0.36.6, the Vala compiler
  * generated from Plugins.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -93,6 +93,11 @@ typedef struct _PluginsNotifierClass PluginsNotifierClass;
 typedef struct _PluginsNotifierPrivate PluginsNotifierPrivate;
 #define _plugins_notifier_unref0(var) ((var == NULL) ? NULL : (var = (plugins_notifier_unref (var), NULL)))
 typedef struct _PluginsParamSpecNotifier PluginsParamSpecNotifier;
+enum  {
+	PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL,
+	PLUGINS_NOTIFIER_LAST_SIGNAL
+};
+static guint plugins_notifier_signals[PLUGINS_NOTIFIER_LAST_SIGNAL] = {0};
 #define _plugins_extension_point_unref0(var) ((var == NULL) ? NULL : (var = (plugins_extension_point_unref (var), NULL)))
 #define _plugins_pluggable_rep_unref0(var) ((var == NULL) ? NULL : (var = (plugins_pluggable_rep_unref (var), NULL)))
 
@@ -245,7 +250,7 @@ const gchar* plugins_extension_point_get_name (PluginsExtensionPoint* self);
 const gchar* plugins_extension_point_get_icon_name (PluginsExtensionPoint* self);
 gchar** plugins_extension_point_get_core_ids (PluginsExtensionPoint* self, int* result_length1);
 static gchar** _vala_array_dup18 (gchar** self, int length);
-static void plugins_extension_point_finalize (PluginsExtensionPoint* obj);
+static void plugins_extension_point_finalize (PluginsExtensionPoint * obj);
 gpointer plugins_module_rep_ref (gpointer instance);
 void plugins_module_rep_unref (gpointer instance);
 GParamSpec* plugins_param_spec_module_rep (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -259,7 +264,7 @@ enum  {
 static PluginsModuleRep* plugins_module_rep_new (GFile* file);
 static PluginsModuleRep* plugins_module_rep_construct (GType object_type, GFile* file);
 PluginsModuleRep* plugins_module_rep_open (GFile* file);
-static void plugins_module_rep_finalize (PluginsModuleRep* obj);
+static void plugins_module_rep_finalize (PluginsModuleRep * obj);
 gpointer plugins_pluggable_rep_ref (gpointer instance);
 void plugins_pluggable_rep_unref (gpointer instance);
 GParamSpec* plugins_param_spec_pluggable_rep (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -291,12 +296,12 @@ gboolean plugins_pluggable_rep_is_enabled (PluginsPluggableRep* self);
 gboolean plugins_pluggable_rep_set_enabled (PluginsPluggableRep* self, gboolean enabled);
 void configuration_facade_set_plugin_enabled (ConfigurationFacade* self, const gchar* id, gboolean enabled);
 gboolean plugins_pluggable_rep_get_activated (PluginsPluggableRep* self);
-static void plugins_pluggable_rep_finalize (PluginsPluggableRep* obj);
+static void plugins_pluggable_rep_finalize (PluginsPluggableRep * obj);
 void plugins_init (GError** error);
 GFile* app_dirs_get_user_plugins_dir (void);
-static void _vala_array_add47 (GFile*** array, int* length, int* size, GFile* value);
+static void _vala_array_add47 (GFile** * array, int* length, int* size, GFile* value);
 GFile* app_dirs_get_system_plugins_dir (void);
-static void _vala_array_add48 (GFile*** array, int* length, int* size, GFile* value);
+static void _vala_array_add48 (GFile** * array, int* length, int* size, GFile* value);
 void plugins_search_for_plugins (GFile* dir, GError** error);
 void plugins_terminate (void);
 gpointer plugins_notifier_ref (gpointer instance);
@@ -313,7 +318,7 @@ static PluginsNotifier* plugins_notifier_new (void);
 static PluginsNotifier* plugins_notifier_construct (GType object_type);
 PluginsNotifier* plugins_notifier_get_instance (void);
 static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void plugins_notifier_finalize (PluginsNotifier* obj);
+static void plugins_notifier_finalize (PluginsNotifier * obj);
 void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1);
 GeeCollection* plugins_get_pluggables (gboolean include_disabled);
 PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle);
@@ -329,7 +334,7 @@ GFile* plugins_get_pluggable_module_file (SpitPluggable* pluggable);
 gint plugins_compare_pluggable_names (void* a, void* b);
 gint plugins_compare_extension_point_names (void* a, void* b);
 gboolean plugins_is_shared_library (GFile* file);
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
 #define UTIL_FILE_ATTRIBUTES "standard::*,time::*,id::file,id::filesystem,etag::value"
 void plugins_load_module (GFile* file);
 GType prepare_input_text_options_get_type (void) G_GNUC_CONST;
@@ -341,11 +346,11 @@ const gchar* PLUGINS_SHARED_LIB_EXTS[2] = {"so", "la"};
 
 PluginsExtensionPoint* plugins_extension_point_construct (GType object_type, GType pluggable_type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1) {
 	PluginsExtensionPoint* self = NULL;
-	GType _tmp0_ = 0UL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	GType _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
 #line 25 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 25 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -370,20 +375,20 @@ PluginsExtensionPoint* plugins_extension_point_construct (GType object_type, GTy
 	plugins_extension_point_set_core_ids (self, _tmp3_, _tmp3__length1);
 #line 25 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return self;
-#line 374 "Plugins.c"
+#line 379 "Plugins.c"
 }
 
 
 PluginsExtensionPoint* plugins_extension_point_new (GType pluggable_type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1) {
 #line 25 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return plugins_extension_point_construct (PLUGINS_TYPE_EXTENSION_POINT, pluggable_type, name, icon_name, core_ids, core_ids_length1);
-#line 381 "Plugins.c"
+#line 386 "Plugins.c"
 }
 
 
 GType plugins_extension_point_get_pluggable_type (PluginsExtensionPoint* self) {
 	GType result;
-	GType _tmp0_ = 0UL;
+	GType _tmp0_;
 #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (PLUGINS_IS_EXTENSION_POINT (self), 0UL);
 #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -392,25 +397,25 @@ GType plugins_extension_point_get_pluggable_type (PluginsExtensionPoint* self) {
 	result = _tmp0_;
 #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 396 "Plugins.c"
+#line 401 "Plugins.c"
 }
 
 
 static void plugins_extension_point_set_pluggable_type (PluginsExtensionPoint* self, GType value) {
-	GType _tmp0_ = 0UL;
+	GType _tmp0_;
 #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_EXTENSION_POINT (self));
 #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = value;
 #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->priv->_pluggable_type = _tmp0_;
-#line 408 "Plugins.c"
+#line 413 "Plugins.c"
 }
 
 
 const gchar* plugins_extension_point_get_name (PluginsExtensionPoint* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (PLUGINS_IS_EXTENSION_POINT (self), NULL);
 #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -419,13 +424,13 @@ const gchar* plugins_extension_point_get_name (PluginsExtensionPoint* self) {
 	result = _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 423 "Plugins.c"
+#line 428 "Plugins.c"
 }
 
 
 static void plugins_extension_point_set_name (PluginsExtensionPoint* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_EXTENSION_POINT (self));
 #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -436,13 +441,13 @@ static void plugins_extension_point_set_name (PluginsExtensionPoint* self, const
 	_g_free0 (self->priv->_name);
 #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->priv->_name = _tmp1_;
-#line 440 "Plugins.c"
+#line 445 "Plugins.c"
 }
 
 
 const gchar* plugins_extension_point_get_icon_name (PluginsExtensionPoint* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (PLUGINS_IS_EXTENSION_POINT (self), NULL);
 #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -451,13 +456,13 @@ const gchar* plugins_extension_point_get_icon_name (PluginsExtensionPoint* self)
 	result = _tmp0_;
 #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 455 "Plugins.c"
+#line 460 "Plugins.c"
 }
 
 
 static void plugins_extension_point_set_icon_name (PluginsExtensionPoint* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_EXTENSION_POINT (self));
 #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -468,16 +473,16 @@ static void plugins_extension_point_set_icon_name (PluginsExtensionPoint* self,
 	_g_free0 (self->priv->_icon_name);
 #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->priv->_icon_name = _tmp1_;
-#line 472 "Plugins.c"
+#line 477 "Plugins.c"
 }
 
 
 gchar** plugins_extension_point_get_core_ids (PluginsExtensionPoint* self, int* result_length1) {
 	gchar** result;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (PLUGINS_IS_EXTENSION_POINT (self), NULL);
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -492,13 +497,13 @@ gchar** plugins_extension_point_get_core_ids (PluginsExtensionPoint* self, int*
 	if (result_length1) {
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*result_length1 = _tmp1__length1;
-#line 496 "Plugins.c"
+#line 501 "Plugins.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	result = _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 502 "Plugins.c"
+#line 507 "Plugins.c"
 }
 
 
@@ -509,25 +514,25 @@ static gchar** _vala_array_dup18 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	for (i = 0; i < length; i++) {
-#line 513 "Plugins.c"
-		gchar* _tmp0_ = NULL;
+#line 518 "Plugins.c"
+		gchar* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		result[i] = _tmp0_;
-#line 519 "Plugins.c"
+#line 524 "Plugins.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 523 "Plugins.c"
+#line 528 "Plugins.c"
 }
 
 
 static void plugins_extension_point_set_core_ids (PluginsExtensionPoint* self, gchar** value, int value_length1) {
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_EXTENSION_POINT (self));
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -546,14 +551,14 @@ static void plugins_extension_point_set_core_ids (PluginsExtensionPoint* self, g
 	self->priv->_core_ids_length1 = _tmp1__length1;
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->priv->__core_ids_size_ = self->priv->_core_ids_length1;
-#line 550 "Plugins.c"
+#line 555 "Plugins.c"
 }
 
 
 static void plugins_value_extension_point_init (GValue* value) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	value->data[0].v_pointer = NULL;
-#line 557 "Plugins.c"
+#line 562 "Plugins.c"
 }
 
 
@@ -562,7 +567,7 @@ static void plugins_value_extension_point_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_extension_point_unref (value->data[0].v_pointer);
-#line 566 "Plugins.c"
+#line 571 "Plugins.c"
 	}
 }
 
@@ -572,11 +577,11 @@ static void plugins_value_extension_point_copy_value (const GValue* src_value, G
 	if (src_value->data[0].v_pointer) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		dest_value->data[0].v_pointer = plugins_extension_point_ref (src_value->data[0].v_pointer);
-#line 576 "Plugins.c"
+#line 581 "Plugins.c"
 	} else {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 580 "Plugins.c"
+#line 585 "Plugins.c"
 	}
 }
 
@@ -584,66 +589,66 @@ static void plugins_value_extension_point_copy_value (const GValue* src_value, G
 static gpointer plugins_value_extension_point_peek_pointer (const GValue* value) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return value->data[0].v_pointer;
-#line 588 "Plugins.c"
+#line 593 "Plugins.c"
 }
 
 
 static gchar* plugins_value_extension_point_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (collect_values[0].v_pointer) {
-#line 595 "Plugins.c"
-		PluginsExtensionPoint* object;
+#line 600 "Plugins.c"
+		PluginsExtensionPoint * object;
 		object = collect_values[0].v_pointer;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 602 "Plugins.c"
+#line 607 "Plugins.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 606 "Plugins.c"
+#line 611 "Plugins.c"
 		}
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = plugins_extension_point_ref (object);
-#line 610 "Plugins.c"
+#line 615 "Plugins.c"
 	} else {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 614 "Plugins.c"
+#line 619 "Plugins.c"
 	}
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return NULL;
-#line 618 "Plugins.c"
+#line 623 "Plugins.c"
 }
 
 
 static gchar* plugins_value_extension_point_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PluginsExtensionPoint** object_p;
+	PluginsExtensionPoint ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!object_p) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 629 "Plugins.c"
+#line 634 "Plugins.c"
 	}
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!value->data[0].v_pointer) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = NULL;
-#line 635 "Plugins.c"
+#line 640 "Plugins.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = value->data[0].v_pointer;
-#line 639 "Plugins.c"
+#line 644 "Plugins.c"
 	} else {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = plugins_extension_point_ref (value->data[0].v_pointer);
-#line 643 "Plugins.c"
+#line 648 "Plugins.c"
 	}
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return NULL;
-#line 647 "Plugins.c"
+#line 652 "Plugins.c"
 }
 
 
@@ -657,7 +662,7 @@ GParamSpec* plugins_param_spec_extension_point (const gchar* name, const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return G_PARAM_SPEC (spec);
-#line 661 "Plugins.c"
+#line 666 "Plugins.c"
 }
 
 
@@ -666,12 +671,12 @@ gpointer plugins_value_get_extension_point (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_EXTENSION_POINT), NULL);
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return value->data[0].v_pointer;
-#line 670 "Plugins.c"
+#line 675 "Plugins.c"
 }
 
 
 void plugins_value_set_extension_point (GValue* value, gpointer v_object) {
-	PluginsExtensionPoint* old;
+	PluginsExtensionPoint * old;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_EXTENSION_POINT));
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -686,23 +691,23 @@ void plugins_value_set_extension_point (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_extension_point_ref (value->data[0].v_pointer);
-#line 690 "Plugins.c"
+#line 695 "Plugins.c"
 	} else {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 694 "Plugins.c"
+#line 699 "Plugins.c"
 	}
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (old) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_extension_point_unref (old);
-#line 700 "Plugins.c"
+#line 705 "Plugins.c"
 	}
 }
 
 
 void plugins_value_take_extension_point (GValue* value, gpointer v_object) {
-	PluginsExtensionPoint* old;
+	PluginsExtensionPoint * old;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_EXTENSION_POINT));
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -715,17 +720,17 @@ void plugins_value_take_extension_point (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = v_object;
-#line 719 "Plugins.c"
+#line 724 "Plugins.c"
 	} else {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 723 "Plugins.c"
+#line 728 "Plugins.c"
 	}
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (old) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_extension_point_unref (old);
-#line 729 "Plugins.c"
+#line 734 "Plugins.c"
 	}
 }
 
@@ -737,7 +742,7 @@ static void plugins_extension_point_class_init (PluginsExtensionPointClass * kla
 	((PluginsExtensionPointClass *) klass)->finalize = plugins_extension_point_finalize;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_type_class_add_private (klass, sizeof (PluginsExtensionPointPrivate));
-#line 741 "Plugins.c"
+#line 746 "Plugins.c"
 }
 
 
@@ -746,11 +751,11 @@ static void plugins_extension_point_instance_init (PluginsExtensionPoint * self)
 	self->priv = PLUGINS_EXTENSION_POINT_GET_PRIVATE (self);
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->ref_count = 1;
-#line 750 "Plugins.c"
+#line 755 "Plugins.c"
 }
 
 
-static void plugins_extension_point_finalize (PluginsExtensionPoint* obj) {
+static void plugins_extension_point_finalize (PluginsExtensionPoint * obj) {
 	PluginsExtensionPoint * self;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_EXTENSION_POINT, PluginsExtensionPoint);
@@ -762,7 +767,7 @@ static void plugins_extension_point_finalize (PluginsExtensionPoint* obj) {
 	_g_free0 (self->priv->_icon_name);
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->priv->_core_ids = (_vala_array_free (self->priv->_core_ids, self->priv->_core_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 766 "Plugins.c"
+#line 771 "Plugins.c"
 }
 
 
@@ -781,18 +786,18 @@ GType plugins_extension_point_get_type (void) {
 
 
 gpointer plugins_extension_point_ref (gpointer instance) {
-	PluginsExtensionPoint* self;
+	PluginsExtensionPoint * self;
 	self = instance;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return instance;
-#line 791 "Plugins.c"
+#line 796 "Plugins.c"
 }
 
 
 void plugins_extension_point_unref (gpointer instance) {
-	PluginsExtensionPoint* self;
+	PluginsExtensionPoint * self;
 	self = instance;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -800,7 +805,7 @@ void plugins_extension_point_unref (gpointer instance) {
 		PLUGINS_EXTENSION_POINT_GET_CLASS (self)->finalize (self);
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 804 "Plugins.c"
+#line 809 "Plugins.c"
 	}
 }
 
@@ -808,18 +813,18 @@ void plugins_extension_point_unref (gpointer instance) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 41 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 812 "Plugins.c"
+#line 817 "Plugins.c"
 }
 
 
 static PluginsModuleRep* plugins_module_rep_construct (GType object_type, GFile* file) {
 	PluginsModuleRep* self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GModule* _tmp5_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GModule* _tmp5_;
 #line 40 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 40 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -848,33 +853,33 @@ static PluginsModuleRep* plugins_module_rep_construct (GType object_type, GFile*
 	_g_free0 (_tmp4_);
 #line 40 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return self;
-#line 852 "Plugins.c"
+#line 857 "Plugins.c"
 }
 
 
 static PluginsModuleRep* plugins_module_rep_new (GFile* file) {
 #line 40 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return plugins_module_rep_construct (PLUGINS_TYPE_MODULE_REP, file);
-#line 859 "Plugins.c"
+#line 864 "Plugins.c"
 }
 
 
 static gpointer _plugins_module_rep_ref0 (gpointer self) {
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return self ? plugins_module_rep_ref (self) : NULL;
-#line 866 "Plugins.c"
+#line 871 "Plugins.c"
 }
 
 
 PluginsModuleRep* plugins_module_rep_open (GFile* file) {
 	PluginsModuleRep* result = NULL;
 	PluginsModuleRep* module_rep = NULL;
-	GFile* _tmp0_ = NULL;
-	PluginsModuleRep* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	PluginsModuleRep* _tmp1_;
 	PluginsModuleRep* _tmp2_ = NULL;
-	PluginsModuleRep* _tmp3_ = NULL;
-	GModule* _tmp4_ = NULL;
-	PluginsModuleRep* _tmp6_ = NULL;
+	PluginsModuleRep* _tmp3_;
+	GModule* _tmp4_;
+	PluginsModuleRep* _tmp6_;
 #line 54 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 55 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -889,17 +894,17 @@ PluginsModuleRep* plugins_module_rep_open (GFile* file) {
 	_tmp4_ = _tmp3_->module;
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp4_ != NULL) {
-#line 893 "Plugins.c"
-		PluginsModuleRep* _tmp5_ = NULL;
+#line 898 "Plugins.c"
+		PluginsModuleRep* _tmp5_;
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp5_ = module_rep;
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp2_ = _tmp5_;
-#line 899 "Plugins.c"
+#line 904 "Plugins.c"
 	} else {
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp2_ = NULL;
-#line 903 "Plugins.c"
+#line 908 "Plugins.c"
 	}
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp6_ = _plugins_module_rep_ref0 (_tmp2_);
@@ -909,14 +914,14 @@ PluginsModuleRep* plugins_module_rep_open (GFile* file) {
 	_plugins_module_rep_unref0 (module_rep);
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 913 "Plugins.c"
+#line 918 "Plugins.c"
 }
 
 
 static void plugins_value_module_rep_init (GValue* value) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	value->data[0].v_pointer = NULL;
-#line 920 "Plugins.c"
+#line 925 "Plugins.c"
 }
 
 
@@ -925,7 +930,7 @@ static void plugins_value_module_rep_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_module_rep_unref (value->data[0].v_pointer);
-#line 929 "Plugins.c"
+#line 934 "Plugins.c"
 	}
 }
 
@@ -935,11 +940,11 @@ static void plugins_value_module_rep_copy_value (const GValue* src_value, GValue
 	if (src_value->data[0].v_pointer) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		dest_value->data[0].v_pointer = plugins_module_rep_ref (src_value->data[0].v_pointer);
-#line 939 "Plugins.c"
+#line 944 "Plugins.c"
 	} else {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 943 "Plugins.c"
+#line 948 "Plugins.c"
 	}
 }
 
@@ -947,66 +952,66 @@ static void plugins_value_module_rep_copy_value (const GValue* src_value, GValue
 static gpointer plugins_value_module_rep_peek_pointer (const GValue* value) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return value->data[0].v_pointer;
-#line 951 "Plugins.c"
+#line 956 "Plugins.c"
 }
 
 
 static gchar* plugins_value_module_rep_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (collect_values[0].v_pointer) {
-#line 958 "Plugins.c"
-		PluginsModuleRep* object;
+#line 963 "Plugins.c"
+		PluginsModuleRep * object;
 		object = collect_values[0].v_pointer;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 965 "Plugins.c"
+#line 970 "Plugins.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 969 "Plugins.c"
+#line 974 "Plugins.c"
 		}
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = plugins_module_rep_ref (object);
-#line 973 "Plugins.c"
+#line 978 "Plugins.c"
 	} else {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 977 "Plugins.c"
+#line 982 "Plugins.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return NULL;
-#line 981 "Plugins.c"
+#line 986 "Plugins.c"
 }
 
 
 static gchar* plugins_value_module_rep_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PluginsModuleRep** object_p;
+	PluginsModuleRep ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!object_p) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 992 "Plugins.c"
+#line 997 "Plugins.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!value->data[0].v_pointer) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = NULL;
-#line 998 "Plugins.c"
+#line 1003 "Plugins.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1002 "Plugins.c"
+#line 1007 "Plugins.c"
 	} else {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = plugins_module_rep_ref (value->data[0].v_pointer);
-#line 1006 "Plugins.c"
+#line 1011 "Plugins.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return NULL;
-#line 1010 "Plugins.c"
+#line 1015 "Plugins.c"
 }
 
 
@@ -1020,7 +1025,7 @@ GParamSpec* plugins_param_spec_module_rep (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return G_PARAM_SPEC (spec);
-#line 1024 "Plugins.c"
+#line 1029 "Plugins.c"
 }
 
 
@@ -1029,12 +1034,12 @@ gpointer plugins_value_get_module_rep (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MODULE_REP), NULL);
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return value->data[0].v_pointer;
-#line 1033 "Plugins.c"
+#line 1038 "Plugins.c"
 }
 
 
 void plugins_value_set_module_rep (GValue* value, gpointer v_object) {
-	PluginsModuleRep* old;
+	PluginsModuleRep * old;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MODULE_REP));
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1049,23 +1054,23 @@ void plugins_value_set_module_rep (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_module_rep_ref (value->data[0].v_pointer);
-#line 1053 "Plugins.c"
+#line 1058 "Plugins.c"
 	} else {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 1057 "Plugins.c"
+#line 1062 "Plugins.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (old) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_module_rep_unref (old);
-#line 1063 "Plugins.c"
+#line 1068 "Plugins.c"
 	}
 }
 
 
 void plugins_value_take_module_rep (GValue* value, gpointer v_object) {
-	PluginsModuleRep* old;
+	PluginsModuleRep * old;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MODULE_REP));
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1078,17 +1083,17 @@ void plugins_value_take_module_rep (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = v_object;
-#line 1082 "Plugins.c"
+#line 1087 "Plugins.c"
 	} else {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 1086 "Plugins.c"
+#line 1091 "Plugins.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (old) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_module_rep_unref (old);
-#line 1092 "Plugins.c"
+#line 1097 "Plugins.c"
 	}
 }
 
@@ -1098,7 +1103,7 @@ static void plugins_module_rep_class_init (PluginsModuleRepClass * klass) {
 	plugins_module_rep_parent_class = g_type_class_peek_parent (klass);
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	((PluginsModuleRepClass *) klass)->finalize = plugins_module_rep_finalize;
-#line 1102 "Plugins.c"
+#line 1107 "Plugins.c"
 }
 
 
@@ -1111,11 +1116,11 @@ static void plugins_module_rep_instance_init (PluginsModuleRep * self) {
 	self->id = NULL;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->ref_count = 1;
-#line 1115 "Plugins.c"
+#line 1120 "Plugins.c"
 }
 
 
-static void plugins_module_rep_finalize (PluginsModuleRep* obj) {
+static void plugins_module_rep_finalize (PluginsModuleRep * obj) {
 	PluginsModuleRep * self;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_MODULE_REP, PluginsModuleRep);
@@ -1133,7 +1138,7 @@ static void plugins_module_rep_finalize (PluginsModuleRep* obj) {
 	_g_object_unref0 (self->spit_module);
 #line 38 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_free0 (self->id);
-#line 1137 "Plugins.c"
+#line 1142 "Plugins.c"
 }
 
 
@@ -1152,18 +1157,18 @@ GType plugins_module_rep_get_type (void) {
 
 
 gpointer plugins_module_rep_ref (gpointer instance) {
-	PluginsModuleRep* self;
+	PluginsModuleRep * self;
 	self = instance;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return instance;
-#line 1162 "Plugins.c"
+#line 1167 "Plugins.c"
 }
 
 
 void plugins_module_rep_unref (gpointer instance) {
-	PluginsModuleRep* self;
+	PluginsModuleRep * self;
 	self = instance;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1171,16 +1176,16 @@ void plugins_module_rep_unref (gpointer instance) {
 		PLUGINS_MODULE_REP_GET_CLASS (self)->finalize (self);
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1175 "Plugins.c"
+#line 1180 "Plugins.c"
 	}
 }
 
 
 PluginsPluggableRep* plugins_pluggable_rep_construct (GType object_type, SpitPluggable* pluggable) {
 	PluginsPluggableRep* self = NULL;
-	SpitPluggable* _tmp0_ = NULL;
-	SpitPluggable* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	SpitPluggable* _tmp0_;
+	SpitPluggable* _tmp1_;
+	const gchar* _tmp2_;
 #line 70 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (SPIT_IS_PLUGGABLE (pluggable), NULL);
 #line 70 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1197,31 +1202,31 @@ PluginsPluggableRep* plugins_pluggable_rep_construct (GType object_type, SpitPlu
 	plugins_pluggable_rep_set_id (self, _tmp2_);
 #line 70 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return self;
-#line 1201 "Plugins.c"
+#line 1206 "Plugins.c"
 }
 
 
 PluginsPluggableRep* plugins_pluggable_rep_new (SpitPluggable* pluggable) {
 #line 70 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return plugins_pluggable_rep_construct (PLUGINS_TYPE_PLUGGABLE_REP, pluggable);
-#line 1208 "Plugins.c"
+#line 1213 "Plugins.c"
 }
 
 
 void plugins_pluggable_rep_activate (PluginsPluggableRep* self) {
-	SpitPluggable* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SpitPluggable* _tmp0_;
+	gboolean _tmp1_;
 	FuzzyPropertyState saved_state = 0;
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	FuzzyPropertyState _tmp5_ = 0;
-	FuzzyPropertyState _tmp6_ = 0;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	const gchar* _tmp4_;
+	FuzzyPropertyState _tmp5_;
+	FuzzyPropertyState _tmp6_;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_ = FALSE;
-	SpitPluggable* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
+	gboolean _tmp9_;
+	SpitPluggable* _tmp14_;
+	gboolean _tmp15_;
 #line 75 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self));
 #line 78 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1248,45 +1253,45 @@ void plugins_pluggable_rep_activate (PluginsPluggableRep* self) {
 	_tmp9_ = self->priv->_is_core;
 #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp9_) {
-#line 1252 "Plugins.c"
-		FuzzyPropertyState _tmp10_ = 0;
+#line 1257 "Plugins.c"
+		FuzzyPropertyState _tmp10_;
 #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp10_ = saved_state;
 #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp8_ = _tmp10_ != FUZZY_PROPERTY_STATE_DISABLED;
-#line 1258 "Plugins.c"
+#line 1263 "Plugins.c"
 	} else {
 #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp8_ = FALSE;
-#line 1262 "Plugins.c"
+#line 1267 "Plugins.c"
 	}
 #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp8_) {
 #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp7_ = TRUE;
-#line 1268 "Plugins.c"
+#line 1273 "Plugins.c"
 	} else {
 		gboolean _tmp11_ = FALSE;
-		gboolean _tmp12_ = FALSE;
+		gboolean _tmp12_;
 #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp12_ = self->priv->_is_core;
 #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		if (!_tmp12_) {
-#line 1276 "Plugins.c"
-			FuzzyPropertyState _tmp13_ = 0;
+#line 1281 "Plugins.c"
+			FuzzyPropertyState _tmp13_;
 #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp13_ = saved_state;
 #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp11_ = _tmp13_ == FUZZY_PROPERTY_STATE_ENABLED;
-#line 1282 "Plugins.c"
+#line 1287 "Plugins.c"
 		} else {
 #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp11_ = FALSE;
-#line 1286 "Plugins.c"
+#line 1291 "Plugins.c"
 		}
 #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp7_ = _tmp11_;
-#line 1290 "Plugins.c"
+#line 1295 "Plugins.c"
 	}
 #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->priv->enabled = _tmp7_;
@@ -1298,13 +1303,13 @@ void plugins_pluggable_rep_activate (PluginsPluggableRep* self) {
 	spit_pluggable_activation (_tmp14_, _tmp15_);
 #line 87 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	plugins_pluggable_rep_set_activated (self, TRUE);
-#line 1302 "Plugins.c"
+#line 1307 "Plugins.c"
 }
 
 
 gboolean plugins_pluggable_rep_is_enabled (PluginsPluggableRep* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 90 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (PLUGINS_IS_PLUGGABLE_REP (self), FALSE);
 #line 91 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1313,21 +1318,21 @@ gboolean plugins_pluggable_rep_is_enabled (PluginsPluggableRep* self) {
 	result = _tmp0_;
 #line 91 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 1317 "Plugins.c"
+#line 1322 "Plugins.c"
 }
 
 
 gboolean plugins_pluggable_rep_set_enabled (PluginsPluggableRep* self, gboolean enabled) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	ConfigFacade* _tmp3_ = NULL;
-	ConfigFacade* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	SpitPluggable* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+	ConfigFacade* _tmp3_;
+	ConfigFacade* _tmp4_;
+	const gchar* _tmp5_;
+	gboolean _tmp6_;
+	SpitPluggable* _tmp7_;
+	gboolean _tmp8_;
 #line 95 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (PLUGINS_IS_PLUGGABLE_REP (self), FALSE);
 #line 96 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1340,7 +1345,7 @@ gboolean plugins_pluggable_rep_set_enabled (PluginsPluggableRep* self, gboolean
 		result = FALSE;
 #line 97 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return result;
-#line 1344 "Plugins.c"
+#line 1349 "Plugins.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp2_ = enabled;
@@ -1368,13 +1373,13 @@ gboolean plugins_pluggable_rep_set_enabled (PluginsPluggableRep* self, gboolean
 	result = TRUE;
 #line 103 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 1372 "Plugins.c"
+#line 1377 "Plugins.c"
 }
 
 
 SpitPluggable* plugins_pluggable_rep_get_pluggable (PluginsPluggableRep* self) {
 	SpitPluggable* result;
-	SpitPluggable* _tmp0_ = NULL;
+	SpitPluggable* _tmp0_;
 #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (PLUGINS_IS_PLUGGABLE_REP (self), NULL);
 #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1383,13 +1388,13 @@ SpitPluggable* plugins_pluggable_rep_get_pluggable (PluginsPluggableRep* self) {
 	result = _tmp0_;
 #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 1387 "Plugins.c"
+#line 1392 "Plugins.c"
 }
 
 
 static void plugins_pluggable_rep_set_pluggable (PluginsPluggableRep* self, SpitPluggable* value) {
-	SpitPluggable* _tmp0_ = NULL;
-	SpitPluggable* _tmp1_ = NULL;
+	SpitPluggable* _tmp0_;
+	SpitPluggable* _tmp1_;
 #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self));
 #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1400,13 +1405,13 @@ static void plugins_pluggable_rep_set_pluggable (PluginsPluggableRep* self, Spit
 	_g_object_unref0 (self->priv->_pluggable);
 #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->priv->_pluggable = _tmp1_;
-#line 1404 "Plugins.c"
+#line 1409 "Plugins.c"
 }
 
 
 const gchar* plugins_pluggable_rep_get_id (PluginsPluggableRep* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (PLUGINS_IS_PLUGGABLE_REP (self), NULL);
 #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1415,13 +1420,13 @@ const gchar* plugins_pluggable_rep_get_id (PluginsPluggableRep* self) {
 	result = _tmp0_;
 #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 1419 "Plugins.c"
+#line 1424 "Plugins.c"
 }
 
 
 static void plugins_pluggable_rep_set_id (PluginsPluggableRep* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self));
 #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1432,13 +1437,13 @@ static void plugins_pluggable_rep_set_id (PluginsPluggableRep* self, const gchar
 	_g_free0 (self->priv->_id);
 #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->priv->_id = _tmp1_;
-#line 1436 "Plugins.c"
+#line 1441 "Plugins.c"
 }
 
 
 gboolean plugins_pluggable_rep_get_is_core (PluginsPluggableRep* self) {
 	gboolean result;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (PLUGINS_IS_PLUGGABLE_REP (self), FALSE);
 #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1447,25 +1452,25 @@ gboolean plugins_pluggable_rep_get_is_core (PluginsPluggableRep* self) {
 	result = _tmp0_;
 #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 1451 "Plugins.c"
+#line 1456 "Plugins.c"
 }
 
 
 static void plugins_pluggable_rep_set_is_core (PluginsPluggableRep* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self));
 #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = value;
 #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->priv->_is_core = _tmp0_;
-#line 1463 "Plugins.c"
+#line 1468 "Plugins.c"
 }
 
 
 gboolean plugins_pluggable_rep_get_activated (PluginsPluggableRep* self) {
 	gboolean result;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (PLUGINS_IS_PLUGGABLE_REP (self), FALSE);
 #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1474,26 +1479,26 @@ gboolean plugins_pluggable_rep_get_activated (PluginsPluggableRep* self) {
 	result = _tmp0_;
 #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 1478 "Plugins.c"
+#line 1483 "Plugins.c"
 }
 
 
 static void plugins_pluggable_rep_set_activated (PluginsPluggableRep* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self));
 #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = value;
 #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->priv->_activated = _tmp0_;
-#line 1490 "Plugins.c"
+#line 1495 "Plugins.c"
 }
 
 
 static void plugins_value_pluggable_rep_init (GValue* value) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	value->data[0].v_pointer = NULL;
-#line 1497 "Plugins.c"
+#line 1502 "Plugins.c"
 }
 
 
@@ -1502,7 +1507,7 @@ static void plugins_value_pluggable_rep_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_pluggable_rep_unref (value->data[0].v_pointer);
-#line 1506 "Plugins.c"
+#line 1511 "Plugins.c"
 	}
 }
 
@@ -1512,11 +1517,11 @@ static void plugins_value_pluggable_rep_copy_value (const GValue* src_value, GVa
 	if (src_value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		dest_value->data[0].v_pointer = plugins_pluggable_rep_ref (src_value->data[0].v_pointer);
-#line 1516 "Plugins.c"
+#line 1521 "Plugins.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1520 "Plugins.c"
+#line 1525 "Plugins.c"
 	}
 }
 
@@ -1524,66 +1529,66 @@ static void plugins_value_pluggable_rep_copy_value (const GValue* src_value, GVa
 static gpointer plugins_value_pluggable_rep_peek_pointer (const GValue* value) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return value->data[0].v_pointer;
-#line 1528 "Plugins.c"
+#line 1533 "Plugins.c"
 }
 
 
 static gchar* plugins_value_pluggable_rep_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (collect_values[0].v_pointer) {
-#line 1535 "Plugins.c"
-		PluginsPluggableRep* object;
+#line 1540 "Plugins.c"
+		PluginsPluggableRep * object;
 		object = collect_values[0].v_pointer;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1542 "Plugins.c"
+#line 1547 "Plugins.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1546 "Plugins.c"
+#line 1551 "Plugins.c"
 		}
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = plugins_pluggable_rep_ref (object);
-#line 1550 "Plugins.c"
+#line 1555 "Plugins.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 1554 "Plugins.c"
+#line 1559 "Plugins.c"
 	}
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return NULL;
-#line 1558 "Plugins.c"
+#line 1563 "Plugins.c"
 }
 
 
 static gchar* plugins_value_pluggable_rep_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PluginsPluggableRep** object_p;
+	PluginsPluggableRep ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!object_p) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1569 "Plugins.c"
+#line 1574 "Plugins.c"
 	}
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = NULL;
-#line 1575 "Plugins.c"
+#line 1580 "Plugins.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1579 "Plugins.c"
+#line 1584 "Plugins.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = plugins_pluggable_rep_ref (value->data[0].v_pointer);
-#line 1583 "Plugins.c"
+#line 1588 "Plugins.c"
 	}
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return NULL;
-#line 1587 "Plugins.c"
+#line 1592 "Plugins.c"
 }
 
 
@@ -1597,7 +1602,7 @@ GParamSpec* plugins_param_spec_pluggable_rep (const gchar* name, const gchar* ni
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return G_PARAM_SPEC (spec);
-#line 1601 "Plugins.c"
+#line 1606 "Plugins.c"
 }
 
 
@@ -1606,12 +1611,12 @@ gpointer plugins_value_get_pluggable_rep (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_PLUGGABLE_REP), NULL);
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return value->data[0].v_pointer;
-#line 1610 "Plugins.c"
+#line 1615 "Plugins.c"
 }
 
 
 void plugins_value_set_pluggable_rep (GValue* value, gpointer v_object) {
-	PluginsPluggableRep* old;
+	PluginsPluggableRep * old;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_PLUGGABLE_REP));
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1626,23 +1631,23 @@ void plugins_value_set_pluggable_rep (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_pluggable_rep_ref (value->data[0].v_pointer);
-#line 1630 "Plugins.c"
+#line 1635 "Plugins.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 1634 "Plugins.c"
+#line 1639 "Plugins.c"
 	}
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (old) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_pluggable_rep_unref (old);
-#line 1640 "Plugins.c"
+#line 1645 "Plugins.c"
 	}
 }
 
 
 void plugins_value_take_pluggable_rep (GValue* value, gpointer v_object) {
-	PluginsPluggableRep* old;
+	PluginsPluggableRep * old;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_PLUGGABLE_REP));
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1655,17 +1660,17 @@ void plugins_value_take_pluggable_rep (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = v_object;
-#line 1659 "Plugins.c"
+#line 1664 "Plugins.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 1663 "Plugins.c"
+#line 1668 "Plugins.c"
 	}
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (old) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_pluggable_rep_unref (old);
-#line 1669 "Plugins.c"
+#line 1674 "Plugins.c"
 	}
 }
 
@@ -1677,7 +1682,7 @@ static void plugins_pluggable_rep_class_init (PluginsPluggableRepClass * klass)
 	((PluginsPluggableRepClass *) klass)->finalize = plugins_pluggable_rep_finalize;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_type_class_add_private (klass, sizeof (PluginsPluggableRepPrivate));
-#line 1681 "Plugins.c"
+#line 1686 "Plugins.c"
 }
 
 
@@ -1692,11 +1697,11 @@ static void plugins_pluggable_rep_instance_init (PluginsPluggableRep * self) {
 	self->priv->enabled = FALSE;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->ref_count = 1;
-#line 1696 "Plugins.c"
+#line 1701 "Plugins.c"
 }
 
 
-static void plugins_pluggable_rep_finalize (PluginsPluggableRep* obj) {
+static void plugins_pluggable_rep_finalize (PluginsPluggableRep * obj) {
 	PluginsPluggableRep * self;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_PLUGGABLE_REP, PluginsPluggableRep);
@@ -1706,7 +1711,7 @@ static void plugins_pluggable_rep_finalize (PluginsPluggableRep* obj) {
 	_g_object_unref0 (self->priv->_pluggable);
 #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_free0 (self->priv->_id);
-#line 1710 "Plugins.c"
+#line 1715 "Plugins.c"
 }
 
 
@@ -1725,18 +1730,18 @@ GType plugins_pluggable_rep_get_type (void) {
 
 
 gpointer plugins_pluggable_rep_ref (gpointer instance) {
-	PluginsPluggableRep* self;
+	PluginsPluggableRep * self;
 	self = instance;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return instance;
-#line 1735 "Plugins.c"
+#line 1740 "Plugins.c"
 }
 
 
 void plugins_pluggable_rep_unref (gpointer instance) {
-	PluginsPluggableRep* self;
+	PluginsPluggableRep * self;
 	self = instance;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1744,60 +1749,60 @@ void plugins_pluggable_rep_unref (gpointer instance) {
 		PLUGINS_PLUGGABLE_REP_GET_CLASS (self)->finalize (self);
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1748 "Plugins.c"
+#line 1753 "Plugins.c"
 	}
 }
 
 
-static void _vala_array_add47 (GFile*** array, int* length, int* size, GFile* value) {
+static void _vala_array_add47 (GFile** * array, int* length, int* size, GFile* value) {
 #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if ((*length) == (*size)) {
 #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*array = g_renew (GFile*, *array, (*size) + 1);
-#line 1760 "Plugins.c"
+#line 1765 "Plugins.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	(*array)[(*length)++] = value;
 #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	(*array)[*length] = NULL;
-#line 1766 "Plugins.c"
+#line 1771 "Plugins.c"
 }
 
 
-static void _vala_array_add48 (GFile*** array, int* length, int* size, GFile* value) {
+static void _vala_array_add48 (GFile** * array, int* length, int* size, GFile* value) {
 #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if ((*length) == (*size)) {
 #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*array = g_renew (GFile*, *array, (*size) + 1);
-#line 1777 "Plugins.c"
+#line 1782 "Plugins.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	(*array)[(*length)++] = value;
 #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	(*array)[*length] = NULL;
-#line 1783 "Plugins.c"
+#line 1788 "Plugins.c"
 }
 
 
 void plugins_init (GError** error) {
-	GFile** _tmp0_ = NULL;
-	GFile** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	GFile* _tmp2_ = NULL;
-	GFile** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GFile* _tmp4_ = NULL;
-	GeeHashMap* _tmp5_ = NULL;
-	GeeHashMap* _tmp6_ = NULL;
-	GeeHashMap* _tmp7_ = NULL;
-	GeeHashSet* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
-	GFile** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	GFile** _tmp0_;
+	GFile** _tmp1_;
+	gint _tmp1__length1;
+	GFile* _tmp2_;
+	GFile** _tmp3_;
+	gint _tmp3__length1;
+	GFile* _tmp4_;
+	GeeHashMap* _tmp5_;
+	GeeHashMap* _tmp6_;
+	GeeHashMap* _tmp7_;
+	GeeHashSet* _tmp8_;
+	gboolean _tmp9_;
+	GFile** _tmp10_;
+	gint _tmp10__length1;
 	GError * _inner_error_ = NULL;
 #line 114 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = g_new0 (GFile*, 0 + 1);
@@ -1858,13 +1863,13 @@ void plugins_init (GError** error) {
 "latform.");
 #line 128 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 1861 "Plugins.c"
+#line 1866 "Plugins.c"
 	}
 #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp10_ = plugins_search_dirs;
 #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp10__length1 = plugins_search_dirs_length1;
-#line 1867 "Plugins.c"
+#line 1872 "Plugins.c"
 	{
 		GFile** dir_collection = NULL;
 		gint dir_collection_length1 = 0;
@@ -1876,24 +1881,24 @@ void plugins_init (GError** error) {
 		dir_collection_length1 = _tmp10__length1;
 #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		for (dir_it = 0; dir_it < _tmp10__length1; dir_it = dir_it + 1) {
-#line 1879 "Plugins.c"
-			GFile* _tmp11_ = NULL;
+#line 1884 "Plugins.c"
+			GFile* _tmp11_;
 			GFile* dir = NULL;
 #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp11_ = _g_object_ref0 (dir_collection[dir_it]);
 #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			dir = _tmp11_;
-#line 1886 "Plugins.c"
+#line 1891 "Plugins.c"
 			{
 				{
-					GFile* _tmp12_ = NULL;
+					GFile* _tmp12_;
 #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_tmp12_ = dir;
 #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					plugins_search_for_plugins (_tmp12_, &_inner_error_);
 #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1896 "Plugins.c"
+#line 1901 "Plugins.c"
 						goto __catch35_g_error;
 					}
 				}
@@ -1901,11 +1906,11 @@ void plugins_init (GError** error) {
 				__catch35_g_error:
 				{
 					GError* err = NULL;
-					GFile* _tmp13_ = NULL;
-					gchar* _tmp14_ = NULL;
-					gchar* _tmp15_ = NULL;
-					GError* _tmp16_ = NULL;
-					const gchar* _tmp17_ = NULL;
+					GFile* _tmp13_;
+					gchar* _tmp14_;
+					gchar* _tmp15_;
+					GError* _tmp16_;
+					const gchar* _tmp17_;
 #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					err = _inner_error_;
 #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1926,7 +1931,7 @@ void plugins_init (GError** error) {
 					_g_free0 (_tmp15_);
 #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_g_error_free0 (err);
-#line 1929 "Plugins.c"
+#line 1934 "Plugins.c"
 				}
 				__finally35:
 #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1937,11 +1942,11 @@ void plugins_init (GError** error) {
 					_g_object_unref0 (dir);
 #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					return;
-#line 1940 "Plugins.c"
+#line 1945 "Plugins.c"
 				}
 #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_g_object_unref0 (dir);
-#line 1944 "Plugins.c"
+#line 1949 "Plugins.c"
 			}
 		}
 	}
@@ -1973,7 +1978,7 @@ void plugins_terminate (void) {
 	_g_object_unref0 (plugins_core_ids);
 #line 145 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	plugins_core_ids = NULL;
-#line 1976 "Plugins.c"
+#line 1981 "Plugins.c"
 }
 
 
@@ -1983,42 +1988,42 @@ static PluginsNotifier* plugins_notifier_construct (GType object_type) {
 	self = (PluginsNotifier*) g_type_create_instance (object_type);
 #line 153 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return self;
-#line 1986 "Plugins.c"
+#line 1991 "Plugins.c"
 }
 
 
 static PluginsNotifier* plugins_notifier_new (void) {
 #line 153 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return plugins_notifier_construct (PLUGINS_TYPE_NOTIFIER);
-#line 1993 "Plugins.c"
+#line 1998 "Plugins.c"
 }
 
 
 static gpointer _plugins_notifier_ref0 (gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return self ? plugins_notifier_ref (self) : NULL;
-#line 2000 "Plugins.c"
+#line 2005 "Plugins.c"
 }
 
 
 PluginsNotifier* plugins_notifier_get_instance (void) {
 	PluginsNotifier* result = NULL;
-	PluginsNotifier* _tmp0_ = NULL;
-	PluginsNotifier* _tmp2_ = NULL;
-	PluginsNotifier* _tmp3_ = NULL;
+	PluginsNotifier* _tmp0_;
+	PluginsNotifier* _tmp2_;
+	PluginsNotifier* _tmp3_;
 #line 157 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = plugins_notifier_instance;
 #line 157 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp0_ == NULL) {
-#line 2013 "Plugins.c"
-		PluginsNotifier* _tmp1_ = NULL;
+#line 2018 "Plugins.c"
+		PluginsNotifier* _tmp1_;
 #line 158 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp1_ = plugins_notifier_new ();
 #line 158 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_plugins_notifier_unref0 (plugins_notifier_instance);
 #line 158 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_notifier_instance = _tmp1_;
-#line 2021 "Plugins.c"
+#line 2026 "Plugins.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp2_ = plugins_notifier_instance;
@@ -2028,7 +2033,7 @@ PluginsNotifier* plugins_notifier_get_instance (void) {
 	result = _tmp3_;
 #line 160 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 2031 "Plugins.c"
+#line 2036 "Plugins.c"
 }
 
 
@@ -2047,26 +2052,26 @@ static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GV
 		data1 = closure->data;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 2050 "Plugins.c"
+#line 2055 "Plugins.c"
 	} else {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		data2 = closure->data;
-#line 2056 "Plugins.c"
+#line 2061 "Plugins.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_boolean (param_values + 2), data2);
-#line 2062 "Plugins.c"
+#line 2067 "Plugins.c"
 }
 
 
 static void plugins_value_notifier_init (GValue* value) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	value->data[0].v_pointer = NULL;
-#line 2069 "Plugins.c"
+#line 2074 "Plugins.c"
 }
 
 
@@ -2075,7 +2080,7 @@ static void plugins_value_notifier_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_notifier_unref (value->data[0].v_pointer);
-#line 2078 "Plugins.c"
+#line 2083 "Plugins.c"
 	}
 }
 
@@ -2085,11 +2090,11 @@ static void plugins_value_notifier_copy_value (const GValue* src_value, GValue*
 	if (src_value->data[0].v_pointer) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		dest_value->data[0].v_pointer = plugins_notifier_ref (src_value->data[0].v_pointer);
-#line 2088 "Plugins.c"
+#line 2093 "Plugins.c"
 	} else {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2092 "Plugins.c"
+#line 2097 "Plugins.c"
 	}
 }
 
@@ -2097,66 +2102,66 @@ static void plugins_value_notifier_copy_value (const GValue* src_value, GValue*
 static gpointer plugins_value_notifier_peek_pointer (const GValue* value) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return value->data[0].v_pointer;
-#line 2100 "Plugins.c"
+#line 2105 "Plugins.c"
 }
 
 
 static gchar* plugins_value_notifier_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (collect_values[0].v_pointer) {
-#line 2107 "Plugins.c"
-		PluginsNotifier* object;
+#line 2112 "Plugins.c"
+		PluginsNotifier * object;
 		object = collect_values[0].v_pointer;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2114 "Plugins.c"
+#line 2119 "Plugins.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2118 "Plugins.c"
+#line 2123 "Plugins.c"
 		}
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = plugins_notifier_ref (object);
-#line 2122 "Plugins.c"
+#line 2127 "Plugins.c"
 	} else {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 2126 "Plugins.c"
+#line 2131 "Plugins.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return NULL;
-#line 2130 "Plugins.c"
+#line 2135 "Plugins.c"
 }
 
 
 static gchar* plugins_value_notifier_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PluginsNotifier** object_p;
+	PluginsNotifier ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!object_p) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2141 "Plugins.c"
+#line 2146 "Plugins.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!value->data[0].v_pointer) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = NULL;
-#line 2147 "Plugins.c"
+#line 2152 "Plugins.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2151 "Plugins.c"
+#line 2156 "Plugins.c"
 	} else {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = plugins_notifier_ref (value->data[0].v_pointer);
-#line 2155 "Plugins.c"
+#line 2160 "Plugins.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return NULL;
-#line 2159 "Plugins.c"
+#line 2164 "Plugins.c"
 }
 
 
@@ -2170,7 +2175,7 @@ GParamSpec* plugins_param_spec_notifier (const gchar* name, const gchar* nick, c
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return G_PARAM_SPEC (spec);
-#line 2173 "Plugins.c"
+#line 2178 "Plugins.c"
 }
 
 
@@ -2179,12 +2184,12 @@ gpointer plugins_value_get_notifier (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_NOTIFIER), NULL);
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return value->data[0].v_pointer;
-#line 2182 "Plugins.c"
+#line 2187 "Plugins.c"
 }
 
 
 void plugins_value_set_notifier (GValue* value, gpointer v_object) {
-	PluginsNotifier* old;
+	PluginsNotifier * old;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_NOTIFIER));
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2199,23 +2204,23 @@ void plugins_value_set_notifier (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_notifier_ref (value->data[0].v_pointer);
-#line 2202 "Plugins.c"
+#line 2207 "Plugins.c"
 	} else {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 2206 "Plugins.c"
+#line 2211 "Plugins.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (old) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_notifier_unref (old);
-#line 2212 "Plugins.c"
+#line 2217 "Plugins.c"
 	}
 }
 
 
 void plugins_value_take_notifier (GValue* value, gpointer v_object) {
-	PluginsNotifier* old;
+	PluginsNotifier * old;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_NOTIFIER));
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2228,17 +2233,17 @@ void plugins_value_take_notifier (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = v_object;
-#line 2231 "Plugins.c"
+#line 2236 "Plugins.c"
 	} else {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 2235 "Plugins.c"
+#line 2240 "Plugins.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (old) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_notifier_unref (old);
-#line 2241 "Plugins.c"
+#line 2246 "Plugins.c"
 	}
 }
 
@@ -2249,25 +2254,25 @@ static void plugins_notifier_class_init (PluginsNotifierClass * klass) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	((PluginsNotifierClass *) klass)->finalize = plugins_notifier_finalize;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	g_signal_new ("pluggable_activation", PLUGINS_TYPE_NOTIFIER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, SPIT_TYPE_PLUGGABLE, G_TYPE_BOOLEAN);
-#line 2253 "Plugins.c"
+	plugins_notifier_signals[PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL] = g_signal_new ("pluggable-activation", PLUGINS_TYPE_NOTIFIER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, SPIT_TYPE_PLUGGABLE, G_TYPE_BOOLEAN);
+#line 2258 "Plugins.c"
 }
 
 
 static void plugins_notifier_instance_init (PluginsNotifier * self) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->ref_count = 1;
-#line 2260 "Plugins.c"
+#line 2265 "Plugins.c"
 }
 
 
-static void plugins_notifier_finalize (PluginsNotifier* obj) {
+static void plugins_notifier_finalize (PluginsNotifier * obj) {
 	PluginsNotifier * self;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_NOTIFIER, PluginsNotifier);
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_signal_handlers_destroy (self);
-#line 2270 "Plugins.c"
+#line 2275 "Plugins.c"
 }
 
 
@@ -2286,18 +2291,18 @@ GType plugins_notifier_get_type (void) {
 
 
 gpointer plugins_notifier_ref (gpointer instance) {
-	PluginsNotifier* self;
+	PluginsNotifier * self;
 	self = instance;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return instance;
-#line 2295 "Plugins.c"
+#line 2300 "Plugins.c"
 }
 
 
 void plugins_notifier_unref (gpointer instance) {
-	PluginsNotifier* self;
+	PluginsNotifier * self;
 	self = instance;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2305,26 +2310,26 @@ void plugins_notifier_unref (gpointer instance) {
 		PLUGINS_NOTIFIER_GET_CLASS (self)->finalize (self);
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2308 "Plugins.c"
+#line 2313 "Plugins.c"
 	}
 }
 
 
 void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1) {
-	GeeHashMap* _tmp0_ = NULL;
-	GType _tmp1_ = 0UL;
-	gboolean _tmp2_ = FALSE;
-	GeeHashMap* _tmp3_ = NULL;
-	GType _tmp4_ = 0UL;
-	GType _tmp5_ = 0UL;
-	const gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gchar** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	PluginsExtensionPoint* _tmp9_ = NULL;
-	PluginsExtensionPoint* _tmp10_ = NULL;
-	gchar** _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
+	GeeHashMap* _tmp0_;
+	GType _tmp1_;
+	gboolean _tmp2_;
+	GeeHashMap* _tmp3_;
+	GType _tmp4_;
+	GType _tmp5_;
+	const gchar* _tmp6_;
+	const gchar* _tmp7_;
+	gchar** _tmp8_;
+	gint _tmp8__length1;
+	PluginsExtensionPoint* _tmp9_;
+	PluginsExtensionPoint* _tmp10_;
+	gchar** _tmp11_;
+	gint _tmp11__length1;
 #line 164 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (name != NULL);
 #line 166 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2363,14 +2368,14 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha
 	_tmp11__length1 = core_ids_length1;
 #line 171 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp11_ != NULL) {
-#line 2366 "Plugins.c"
-		gchar** _tmp12_ = NULL;
-		gint _tmp12__length1 = 0;
+#line 2371 "Plugins.c"
+		gchar** _tmp12_;
+		gint _tmp12__length1;
 #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp12_ = core_ids;
 #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp12__length1 = core_ids_length1;
-#line 2373 "Plugins.c"
+#line 2378 "Plugins.c"
 		{
 			gchar** core_id_collection = NULL;
 			gint core_id_collection_length1 = 0;
@@ -2382,17 +2387,17 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha
 			core_id_collection_length1 = _tmp12__length1;
 #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			for (core_id_it = 0; core_id_it < _tmp12__length1; core_id_it = core_id_it + 1) {
-#line 2385 "Plugins.c"
-				gchar* _tmp13_ = NULL;
+#line 2390 "Plugins.c"
+				gchar* _tmp13_;
 				gchar* core_id = NULL;
 #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp13_ = g_strdup (core_id_collection[core_id_it]);
 #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				core_id = _tmp13_;
-#line 2392 "Plugins.c"
+#line 2397 "Plugins.c"
 				{
-					GeeHashSet* _tmp14_ = NULL;
-					const gchar* _tmp15_ = NULL;
+					GeeHashSet* _tmp14_;
+					const gchar* _tmp15_;
 #line 173 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_tmp14_ = plugins_core_ids;
 #line 173 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2401,19 +2406,19 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_);
 #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_g_free0 (core_id);
-#line 2404 "Plugins.c"
+#line 2409 "Plugins.c"
 				}
 			}
 		}
 	}
 	{
 		GeeIterator* _pluggable_rep_it = NULL;
-		GeeHashMap* _tmp16_ = NULL;
-		GeeCollection* _tmp17_ = NULL;
-		GeeCollection* _tmp18_ = NULL;
-		GeeCollection* _tmp19_ = NULL;
-		GeeIterator* _tmp20_ = NULL;
-		GeeIterator* _tmp21_ = NULL;
+		GeeHashMap* _tmp16_;
+		GeeCollection* _tmp17_;
+		GeeCollection* _tmp18_;
+		GeeCollection* _tmp19_;
+		GeeIterator* _tmp20_;
+		GeeIterator* _tmp21_;
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp16_ = plugins_pluggable_table;
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2432,26 +2437,26 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha
 		_pluggable_rep_it = _tmp21_;
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		while (TRUE) {
-#line 2435 "Plugins.c"
-			GeeIterator* _tmp22_ = NULL;
-			gboolean _tmp23_ = FALSE;
+#line 2440 "Plugins.c"
+			GeeIterator* _tmp22_;
+			gboolean _tmp23_;
 			PluginsPluggableRep* pluggable_rep = NULL;
-			GeeIterator* _tmp24_ = NULL;
-			gpointer _tmp25_ = NULL;
-			PluginsPluggableRep* _tmp26_ = NULL;
-			SpitPluggable* _tmp27_ = NULL;
-			SpitPluggable* _tmp28_ = NULL;
-			GType _tmp29_ = 0UL;
-			GType _tmp30_ = 0UL;
-			gboolean _tmp31_ = FALSE;
-			PluginsPluggableRep* _tmp32_ = NULL;
-			PluginsNotifier* _tmp33_ = NULL;
-			PluginsNotifier* _tmp34_ = NULL;
-			PluginsPluggableRep* _tmp35_ = NULL;
-			SpitPluggable* _tmp36_ = NULL;
-			SpitPluggable* _tmp37_ = NULL;
-			PluginsPluggableRep* _tmp38_ = NULL;
-			gboolean _tmp39_ = FALSE;
+			GeeIterator* _tmp24_;
+			gpointer _tmp25_;
+			PluginsPluggableRep* _tmp26_;
+			SpitPluggable* _tmp27_;
+			SpitPluggable* _tmp28_;
+			GType _tmp29_;
+			GType _tmp30_;
+			gboolean _tmp31_;
+			PluginsPluggableRep* _tmp32_;
+			PluginsNotifier* _tmp33_;
+			PluginsNotifier* _tmp34_;
+			PluginsPluggableRep* _tmp35_;
+			SpitPluggable* _tmp36_;
+			SpitPluggable* _tmp37_;
+			PluginsPluggableRep* _tmp38_;
+			gboolean _tmp39_;
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp22_ = _pluggable_rep_it;
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2460,7 +2465,7 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha
 			if (!_tmp23_) {
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				break;
-#line 2463 "Plugins.c"
+#line 2468 "Plugins.c"
 			}
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp24_ = _pluggable_rep_it;
@@ -2486,7 +2491,7 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha
 				_plugins_pluggable_rep_unref0 (pluggable_rep);
 #line 179 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				continue;
-#line 2489 "Plugins.c"
+#line 2494 "Plugins.c"
 			}
 #line 181 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp32_ = pluggable_rep;
@@ -2507,16 +2512,16 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha
 #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp39_ = plugins_pluggable_rep_is_enabled (_tmp38_);
 #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			g_signal_emit_by_name (_tmp34_, "pluggable-activation", _tmp37_, _tmp39_);
+			g_signal_emit (_tmp34_, plugins_notifier_signals[PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL], 0, _tmp37_, _tmp39_);
 #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_plugins_notifier_unref0 (_tmp34_);
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_plugins_pluggable_rep_unref0 (pluggable_rep);
-#line 2515 "Plugins.c"
+#line 2520 "Plugins.c"
 		}
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_g_object_unref0 (_pluggable_rep_it);
-#line 2519 "Plugins.c"
+#line 2524 "Plugins.c"
 	}
 }
 
@@ -2524,20 +2529,20 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha
 GeeCollection* plugins_get_pluggables (gboolean include_disabled) {
 	GeeCollection* result = NULL;
 	GeeCollection* all = NULL;
-	GeeHashSet* _tmp0_ = NULL;
+	GeeHashSet* _tmp0_;
 #line 187 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = gee_hash_set_new (SPIT_TYPE_PLUGGABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 187 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	all = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2532 "Plugins.c"
+#line 2537 "Plugins.c"
 	{
 		GeeIterator* _pluggable_rep_it = NULL;
-		GeeHashMap* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
+		GeeHashMap* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeCollection* _tmp4_;
+		GeeIterator* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp1_ = plugins_pluggable_table;
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2556,16 +2561,16 @@ GeeCollection* plugins_get_pluggables (gboolean include_disabled) {
 		_pluggable_rep_it = _tmp6_;
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		while (TRUE) {
-#line 2559 "Plugins.c"
-			GeeIterator* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+#line 2564 "Plugins.c"
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			PluginsPluggableRep* pluggable_rep = NULL;
-			GeeIterator* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
 			gboolean _tmp11_ = FALSE;
-			PluginsPluggableRep* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
-			gboolean _tmp14_ = FALSE;
+			PluginsPluggableRep* _tmp12_;
+			gboolean _tmp13_;
+			gboolean _tmp14_;
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp7_ = _pluggable_rep_it;
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2574,7 +2579,7 @@ GeeCollection* plugins_get_pluggables (gboolean include_disabled) {
 			if (!_tmp8_) {
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				break;
-#line 2577 "Plugins.c"
+#line 2582 "Plugins.c"
 			}
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp9_ = _pluggable_rep_it;
@@ -2590,42 +2595,42 @@ GeeCollection* plugins_get_pluggables (gboolean include_disabled) {
 			_tmp14_ = _tmp13_;
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			if (_tmp14_) {
-#line 2593 "Plugins.c"
+#line 2598 "Plugins.c"
 				gboolean _tmp15_ = FALSE;
-				gboolean _tmp16_ = FALSE;
+				gboolean _tmp16_;
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp16_ = include_disabled;
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				if (_tmp16_) {
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_tmp15_ = TRUE;
-#line 2602 "Plugins.c"
+#line 2607 "Plugins.c"
 				} else {
-					PluginsPluggableRep* _tmp17_ = NULL;
-					gboolean _tmp18_ = FALSE;
+					PluginsPluggableRep* _tmp17_;
+					gboolean _tmp18_;
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_tmp17_ = pluggable_rep;
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_tmp18_ = plugins_pluggable_rep_is_enabled (_tmp17_);
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_tmp15_ = _tmp18_;
-#line 2612 "Plugins.c"
+#line 2617 "Plugins.c"
 				}
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp11_ = _tmp15_;
-#line 2616 "Plugins.c"
+#line 2621 "Plugins.c"
 			} else {
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp11_ = FALSE;
-#line 2620 "Plugins.c"
+#line 2625 "Plugins.c"
 			}
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			if (_tmp11_) {
-#line 2624 "Plugins.c"
-				GeeCollection* _tmp19_ = NULL;
-				PluginsPluggableRep* _tmp20_ = NULL;
-				SpitPluggable* _tmp21_ = NULL;
-				SpitPluggable* _tmp22_ = NULL;
+#line 2629 "Plugins.c"
+				GeeCollection* _tmp19_;
+				PluginsPluggableRep* _tmp20_;
+				SpitPluggable* _tmp21_;
+				SpitPluggable* _tmp22_;
 #line 190 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp19_ = all;
 #line 190 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2636,30 +2641,30 @@ GeeCollection* plugins_get_pluggables (gboolean include_disabled) {
 				_tmp22_ = _tmp21_;
 #line 190 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				gee_collection_add (_tmp19_, _tmp22_);
-#line 2639 "Plugins.c"
+#line 2644 "Plugins.c"
 			}
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_plugins_pluggable_rep_unref0 (pluggable_rep);
-#line 2643 "Plugins.c"
+#line 2648 "Plugins.c"
 		}
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_g_object_unref0 (_pluggable_rep_it);
-#line 2647 "Plugins.c"
+#line 2652 "Plugins.c"
 	}
 #line 193 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	result = all;
 #line 193 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 2653 "Plugins.c"
+#line 2658 "Plugins.c"
 }
 
 
 gboolean plugins_is_core_pluggable (SpitPluggable* pluggable) {
 	gboolean result = FALSE;
-	GeeHashSet* _tmp0_ = NULL;
-	SpitPluggable* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	GeeHashSet* _tmp0_;
+	SpitPluggable* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 #line 196 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (SPIT_IS_PLUGGABLE (pluggable), FALSE);
 #line 197 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2674,7 +2679,7 @@ gboolean plugins_is_core_pluggable (SpitPluggable* pluggable) {
 	result = _tmp3_;
 #line 197 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 2677 "Plugins.c"
+#line 2682 "Plugins.c"
 }
 
 
@@ -2685,17 +2690,17 @@ static SpitPluggable** _vala_array_dup19 (SpitPluggable** self, int length) {
 	result = g_new0 (SpitPluggable*, length + 1);
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	for (i = 0; i < length; i++) {
-#line 2688 "Plugins.c"
-		SpitPluggable* _tmp0_ = NULL;
+#line 2693 "Plugins.c"
+		SpitPluggable* _tmp0_;
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		result[i] = _tmp0_;
-#line 2694 "Plugins.c"
+#line 2699 "Plugins.c"
 	}
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 2698 "Plugins.c"
+#line 2703 "Plugins.c"
 }
 
 
@@ -2703,15 +2708,15 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) {
 	PluginsModuleRep* result = NULL;
 #line 200 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (SPIT_IS_PLUGGABLE (needle), NULL);
-#line 2706 "Plugins.c"
+#line 2711 "Plugins.c"
 	{
 		GeeIterator* _module_rep_it = NULL;
-		GeeHashMap* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeHashMap* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp0_ = plugins_module_table;
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2730,23 +2735,23 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) {
 		_module_rep_it = _tmp5_;
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		while (TRUE) {
-#line 2733 "Plugins.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 2738 "Plugins.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			PluginsModuleRep* module_rep = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			SpitPluggable** pluggables = NULL;
-			PluginsModuleRep* _tmp10_ = NULL;
-			SpitModule* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			SpitPluggable** _tmp13_ = NULL;
-			SpitPluggable** _tmp14_ = NULL;
-			gint _tmp14__length1 = 0;
-			gint pluggables_length1 = 0;
-			gint _pluggables_size_ = 0;
-			SpitPluggable** _tmp15_ = NULL;
-			gint _tmp15__length1 = 0;
+			PluginsModuleRep* _tmp10_;
+			SpitModule* _tmp11_;
+			gint _tmp12_;
+			SpitPluggable** _tmp13_;
+			SpitPluggable** _tmp14_;
+			gint _tmp14__length1;
+			gint pluggables_length1;
+			gint _pluggables_size_;
+			SpitPluggable** _tmp15_;
+			gint _tmp15__length1;
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp6_ = _module_rep_it;
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2755,7 +2760,7 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) {
 			if (!_tmp7_) {
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				break;
-#line 2758 "Plugins.c"
+#line 2763 "Plugins.c"
 			}
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp8_ = _module_rep_it;
@@ -2785,14 +2790,14 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) {
 			_tmp15__length1 = pluggables_length1;
 #line 203 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			if (_tmp15_ != NULL) {
-#line 2788 "Plugins.c"
-				SpitPluggable** _tmp16_ = NULL;
-				gint _tmp16__length1 = 0;
+#line 2793 "Plugins.c"
+				SpitPluggable** _tmp16_;
+				gint _tmp16__length1;
 #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp16_ = pluggables;
 #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp16__length1 = pluggables_length1;
-#line 2795 "Plugins.c"
+#line 2800 "Plugins.c"
 				{
 					SpitPluggable** pluggable_collection = NULL;
 					gint pluggable_collection_length1 = 0;
@@ -2804,17 +2809,17 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) {
 					pluggable_collection_length1 = _tmp16__length1;
 #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					for (pluggable_it = 0; pluggable_it < _tmp16__length1; pluggable_it = pluggable_it + 1) {
-#line 2807 "Plugins.c"
-						SpitPluggable* _tmp17_ = NULL;
+#line 2812 "Plugins.c"
+						SpitPluggable* _tmp17_;
 						SpitPluggable* pluggable = NULL;
 #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						_tmp17_ = _g_object_ref0 (pluggable_collection[pluggable_it]);
 #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						pluggable = _tmp17_;
-#line 2814 "Plugins.c"
+#line 2819 "Plugins.c"
 						{
-							SpitPluggable* _tmp18_ = NULL;
-							SpitPluggable* _tmp19_ = NULL;
+							SpitPluggable* _tmp18_;
+							SpitPluggable* _tmp19_;
 #line 205 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 							_tmp18_ = pluggable;
 #line 205 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2831,11 +2836,11 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) {
 								_g_object_unref0 (_module_rep_it);
 #line 206 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 								return result;
-#line 2834 "Plugins.c"
+#line 2839 "Plugins.c"
 							}
 #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 							_g_object_unref0 (pluggable);
-#line 2838 "Plugins.c"
+#line 2843 "Plugins.c"
 						}
 					}
 				}
@@ -2844,28 +2849,28 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) {
 			pluggables = (_vala_array_free (pluggables, pluggables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_plugins_module_rep_unref0 (module_rep);
-#line 2847 "Plugins.c"
+#line 2852 "Plugins.c"
 		}
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_g_object_unref0 (_module_rep_it);
-#line 2851 "Plugins.c"
+#line 2856 "Plugins.c"
 	}
 #line 211 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	result = NULL;
 #line 211 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 2857 "Plugins.c"
+#line 2862 "Plugins.c"
 }
 
 
 gchar* plugins_get_pluggable_module_id (SpitPluggable* needle) {
 	gchar* result = NULL;
 	PluginsModuleRep* module_rep = NULL;
-	SpitPluggable* _tmp0_ = NULL;
-	PluginsModuleRep* _tmp1_ = NULL;
+	SpitPluggable* _tmp0_;
+	PluginsModuleRep* _tmp1_;
 	const gchar* _tmp2_ = NULL;
-	PluginsModuleRep* _tmp3_ = NULL;
-	gchar* _tmp7_ = NULL;
+	PluginsModuleRep* _tmp3_;
+	gchar* _tmp7_;
 #line 214 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (SPIT_IS_PLUGGABLE (needle), NULL);
 #line 215 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2878,10 +2883,10 @@ gchar* plugins_get_pluggable_module_id (SpitPluggable* needle) {
 	_tmp3_ = module_rep;
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp3_ != NULL) {
-#line 2881 "Plugins.c"
-		PluginsModuleRep* _tmp4_ = NULL;
-		SpitModule* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+#line 2886 "Plugins.c"
+		PluginsModuleRep* _tmp4_;
+		SpitModule* _tmp5_;
+		const gchar* _tmp6_;
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp4_ = module_rep;
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2890,11 +2895,11 @@ gchar* plugins_get_pluggable_module_id (SpitPluggable* needle) {
 		_tmp6_ = spit_module_get_id (_tmp5_);
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp2_ = _tmp6_;
-#line 2893 "Plugins.c"
+#line 2898 "Plugins.c"
 	} else {
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp2_ = NULL;
-#line 2897 "Plugins.c"
+#line 2902 "Plugins.c"
 	}
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp7_ = g_strdup (_tmp2_);
@@ -2904,21 +2909,21 @@ gchar* plugins_get_pluggable_module_id (SpitPluggable* needle) {
 	_plugins_module_rep_unref0 (module_rep);
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 2907 "Plugins.c"
+#line 2912 "Plugins.c"
 }
 
 
 GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) {
 	GeeCollection* result = NULL;
 	GeeCollection* sorted = NULL;
-	GCompareDataFunc _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	GDestroyNotify _tmp0__target_destroy_notify = NULL;
-	GeeTreeSet* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
-	GeeCollection* _tmp5_ = NULL;
+	GCompareDataFunc _tmp0_;
+	void* _tmp0__target;
+	GDestroyNotify _tmp0__target_destroy_notify;
+	GeeTreeSet* _tmp1_;
+	GeeHashMap* _tmp2_;
+	GeeCollection* _tmp3_;
+	GeeCollection* _tmp4_;
+	GeeCollection* _tmp5_;
 #line 221 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = compare_func;
 #line 221 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2959,20 +2964,20 @@ GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func, void
 	compare_func_target_destroy_notify = NULL;
 #line 224 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 2962 "Plugins.c"
+#line 2967 "Plugins.c"
 }
 
 
 GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled) {
 	GeeCollection* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GType _tmp1_ = 0UL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	GType _tmp1_;
+	gboolean _tmp2_;
 	GeeCollection* for_type = NULL;
-	GCompareDataFunc _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
-	GDestroyNotify _tmp3__target_destroy_notify = NULL;
-	GeeTreeSet* _tmp4_ = NULL;
+	GCompareDataFunc _tmp3_;
+	void* _tmp3__target;
+	GDestroyNotify _tmp3__target_destroy_notify;
+	GeeTreeSet* _tmp4_;
 #line 230 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = plugins_extension_points;
 #line 230 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2997,15 +3002,15 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com
 	_tmp4_ = gee_tree_set_new (SPIT_TYPE_PLUGGABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp3_, _tmp3__target, _tmp3__target_destroy_notify);
 #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	for_type = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 3000 "Plugins.c"
+#line 3005 "Plugins.c"
 	{
 		GeeIterator* _pluggable_rep_it = NULL;
-		GeeHashMap* _tmp5_ = NULL;
-		GeeCollection* _tmp6_ = NULL;
-		GeeCollection* _tmp7_ = NULL;
-		GeeCollection* _tmp8_ = NULL;
-		GeeIterator* _tmp9_ = NULL;
-		GeeIterator* _tmp10_ = NULL;
+		GeeHashMap* _tmp5_;
+		GeeCollection* _tmp6_;
+		GeeCollection* _tmp7_;
+		GeeCollection* _tmp8_;
+		GeeIterator* _tmp9_;
+		GeeIterator* _tmp10_;
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp5_ = plugins_pluggable_table;
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3024,17 +3029,17 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com
 		_pluggable_rep_it = _tmp10_;
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		while (TRUE) {
-#line 3027 "Plugins.c"
-			GeeIterator* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
+#line 3032 "Plugins.c"
+			GeeIterator* _tmp11_;
+			gboolean _tmp12_;
 			PluginsPluggableRep* pluggable_rep = NULL;
-			GeeIterator* _tmp13_ = NULL;
-			gpointer _tmp14_ = NULL;
+			GeeIterator* _tmp13_;
+			gpointer _tmp14_;
 			gboolean _tmp15_ = FALSE;
 			gboolean _tmp16_ = FALSE;
-			PluginsPluggableRep* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
-			gboolean _tmp19_ = FALSE;
+			PluginsPluggableRep* _tmp17_;
+			gboolean _tmp18_;
+			gboolean _tmp19_;
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp11_ = _pluggable_rep_it;
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3043,7 +3048,7 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com
 			if (!_tmp12_) {
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				break;
-#line 3046 "Plugins.c"
+#line 3051 "Plugins.c"
 			}
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp13_ = _pluggable_rep_it;
@@ -3059,13 +3064,13 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com
 			_tmp19_ = _tmp18_;
 #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			if (_tmp19_) {
-#line 3062 "Plugins.c"
-				PluginsPluggableRep* _tmp20_ = NULL;
-				SpitPluggable* _tmp21_ = NULL;
-				SpitPluggable* _tmp22_ = NULL;
-				GType _tmp23_ = 0UL;
-				GType _tmp24_ = 0UL;
-				gboolean _tmp25_ = FALSE;
+#line 3067 "Plugins.c"
+				PluginsPluggableRep* _tmp20_;
+				SpitPluggable* _tmp21_;
+				SpitPluggable* _tmp22_;
+				GType _tmp23_;
+				GType _tmp24_;
+				gboolean _tmp25_;
 #line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp20_ = pluggable_rep;
 #line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3080,50 +3085,50 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com
 				_tmp25_ = g_type_is_a (_tmp23_, _tmp24_);
 #line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp16_ = _tmp25_;
-#line 3083 "Plugins.c"
+#line 3088 "Plugins.c"
 			} else {
 #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp16_ = FALSE;
-#line 3087 "Plugins.c"
+#line 3092 "Plugins.c"
 			}
 #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			if (_tmp16_) {
-#line 3091 "Plugins.c"
+#line 3096 "Plugins.c"
 				gboolean _tmp26_ = FALSE;
-				gboolean _tmp27_ = FALSE;
+				gboolean _tmp27_;
 #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp27_ = include_disabled;
 #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				if (_tmp27_) {
 #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_tmp26_ = TRUE;
-#line 3100 "Plugins.c"
+#line 3105 "Plugins.c"
 				} else {
-					PluginsPluggableRep* _tmp28_ = NULL;
-					gboolean _tmp29_ = FALSE;
+					PluginsPluggableRep* _tmp28_;
+					gboolean _tmp29_;
 #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_tmp28_ = pluggable_rep;
 #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_tmp29_ = plugins_pluggable_rep_is_enabled (_tmp28_);
 #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_tmp26_ = _tmp29_;
-#line 3110 "Plugins.c"
+#line 3115 "Plugins.c"
 				}
 #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp15_ = _tmp26_;
-#line 3114 "Plugins.c"
+#line 3119 "Plugins.c"
 			} else {
 #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp15_ = FALSE;
-#line 3118 "Plugins.c"
+#line 3123 "Plugins.c"
 			}
 #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			if (_tmp15_) {
-#line 3122 "Plugins.c"
-				GeeCollection* _tmp30_ = NULL;
-				PluginsPluggableRep* _tmp31_ = NULL;
-				SpitPluggable* _tmp32_ = NULL;
-				SpitPluggable* _tmp33_ = NULL;
+#line 3127 "Plugins.c"
+				GeeCollection* _tmp30_;
+				PluginsPluggableRep* _tmp31_;
+				SpitPluggable* _tmp32_;
+				SpitPluggable* _tmp33_;
 #line 237 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp30_ = for_type;
 #line 237 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3134,15 +3139,15 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com
 				_tmp33_ = _tmp32_;
 #line 237 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				gee_collection_add (_tmp30_, _tmp33_);
-#line 3137 "Plugins.c"
+#line 3142 "Plugins.c"
 			}
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_plugins_pluggable_rep_unref0 (pluggable_rep);
-#line 3141 "Plugins.c"
+#line 3146 "Plugins.c"
 		}
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_g_object_unref0 (_pluggable_rep_it);
-#line 3145 "Plugins.c"
+#line 3150 "Plugins.c"
 	}
 #line 241 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	result = for_type;
@@ -3156,20 +3161,20 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com
 	compare_func_target_destroy_notify = NULL;
 #line 241 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3159 "Plugins.c"
+#line 3164 "Plugins.c"
 }
 
 
 gchar* plugins_get_pluggable_name (const gchar* id) {
 	gchar* result = NULL;
 	PluginsPluggableRep* pluggable_rep = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
 	const gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-	PluginsPluggableRep* _tmp5_ = NULL;
-	gchar* _tmp13_ = NULL;
+	PluginsPluggableRep* _tmp5_;
+	gchar* _tmp13_;
 #line 244 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (id != NULL, NULL);
 #line 245 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3184,10 +3189,10 @@ gchar* plugins_get_pluggable_name (const gchar* id) {
 	_tmp5_ = pluggable_rep;
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp5_ != NULL) {
-#line 3187 "Plugins.c"
-		PluginsPluggableRep* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
-		gboolean _tmp8_ = FALSE;
+#line 3192 "Plugins.c"
+		PluginsPluggableRep* _tmp6_;
+		gboolean _tmp7_;
+		gboolean _tmp8_;
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp6_ = pluggable_rep;
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3196,19 +3201,19 @@ gchar* plugins_get_pluggable_name (const gchar* id) {
 		_tmp8_ = _tmp7_;
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp4_ = _tmp8_;
-#line 3199 "Plugins.c"
+#line 3204 "Plugins.c"
 	} else {
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp4_ = FALSE;
-#line 3203 "Plugins.c"
+#line 3208 "Plugins.c"
 	}
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp4_) {
-#line 3207 "Plugins.c"
-		PluginsPluggableRep* _tmp9_ = NULL;
-		SpitPluggable* _tmp10_ = NULL;
-		SpitPluggable* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
+#line 3212 "Plugins.c"
+		PluginsPluggableRep* _tmp9_;
+		SpitPluggable* _tmp10_;
+		SpitPluggable* _tmp11_;
+		const gchar* _tmp12_;
 #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp9_ = pluggable_rep;
 #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3219,11 +3224,11 @@ gchar* plugins_get_pluggable_name (const gchar* id) {
 		_tmp12_ = spit_pluggable_get_pluggable_name (_tmp11_);
 #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp3_ = _tmp12_;
-#line 3222 "Plugins.c"
+#line 3227 "Plugins.c"
 	} else {
 #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp3_ = NULL;
-#line 3226 "Plugins.c"
+#line 3231 "Plugins.c"
 	}
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp13_ = g_strdup (_tmp3_);
@@ -3233,21 +3238,21 @@ gchar* plugins_get_pluggable_name (const gchar* id) {
 	_plugins_pluggable_rep_unref0 (pluggable_rep);
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3236 "Plugins.c"
+#line 3241 "Plugins.c"
 }
 
 
 gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info) {
 	gboolean result = FALSE;
 	PluginsPluggableRep* pluggable_rep = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	PluginsPluggableRep* _tmp4_ = NULL;
-	PluginsPluggableRep* _tmp8_ = NULL;
-	SpitPluggable* _tmp9_ = NULL;
-	SpitPluggable* _tmp10_ = NULL;
+	PluginsPluggableRep* _tmp4_;
+	PluginsPluggableRep* _tmp8_;
+	SpitPluggable* _tmp9_;
+	SpitPluggable* _tmp10_;
 #line 251 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (id != NULL, FALSE);
 #line 251 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3266,11 +3271,11 @@ gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info) {
 	if (_tmp4_ == NULL) {
 #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp3_ = TRUE;
-#line 3269 "Plugins.c"
+#line 3274 "Plugins.c"
 	} else {
-		PluginsPluggableRep* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
-		gboolean _tmp7_ = FALSE;
+		PluginsPluggableRep* _tmp5_;
+		gboolean _tmp6_;
+		gboolean _tmp7_;
 #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp5_ = pluggable_rep;
 #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3279,7 +3284,7 @@ gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info) {
 		_tmp7_ = _tmp6_;
 #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp3_ = !_tmp7_;
-#line 3282 "Plugins.c"
+#line 3287 "Plugins.c"
 	}
 #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp3_) {
@@ -3289,7 +3294,7 @@ gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info) {
 		_plugins_pluggable_rep_unref0 (pluggable_rep);
 #line 254 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return result;
-#line 3292 "Plugins.c"
+#line 3297 "Plugins.c"
 	}
 #line 256 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp8_ = pluggable_rep;
@@ -3305,7 +3310,7 @@ gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info) {
 	_plugins_pluggable_rep_unref0 (pluggable_rep);
 #line 258 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3308 "Plugins.c"
+#line 3313 "Plugins.c"
 }
 
 
@@ -3313,13 +3318,13 @@ gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled) {
 	gboolean _vala_enabled = FALSE;
 	gboolean result = FALSE;
 	PluginsPluggableRep* pluggable_rep = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	PluginsPluggableRep* _tmp4_ = NULL;
-	PluginsPluggableRep* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	PluginsPluggableRep* _tmp4_;
+	PluginsPluggableRep* _tmp8_;
+	gboolean _tmp9_;
 #line 261 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (id != NULL, FALSE);
 #line 262 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3336,11 +3341,11 @@ gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled) {
 	if (_tmp4_ == NULL) {
 #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp3_ = TRUE;
-#line 3339 "Plugins.c"
+#line 3344 "Plugins.c"
 	} else {
-		PluginsPluggableRep* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
-		gboolean _tmp7_ = FALSE;
+		PluginsPluggableRep* _tmp5_;
+		gboolean _tmp6_;
+		gboolean _tmp7_;
 #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp5_ = pluggable_rep;
 #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3349,7 +3354,7 @@ gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled) {
 		_tmp7_ = _tmp6_;
 #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp3_ = !_tmp7_;
-#line 3352 "Plugins.c"
+#line 3357 "Plugins.c"
 	}
 #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp3_) {
@@ -3363,11 +3368,11 @@ gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled) {
 		if (enabled) {
 #line 266 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			*enabled = _vala_enabled;
-#line 3366 "Plugins.c"
+#line 3371 "Plugins.c"
 		}
 #line 266 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return result;
-#line 3370 "Plugins.c"
+#line 3375 "Plugins.c"
 	}
 #line 269 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp8_ = pluggable_rep;
@@ -3383,24 +3388,24 @@ gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled) {
 	if (enabled) {
 #line 271 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*enabled = _vala_enabled;
-#line 3386 "Plugins.c"
+#line 3391 "Plugins.c"
 	}
 #line 271 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3390 "Plugins.c"
+#line 3395 "Plugins.c"
 }
 
 
 void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled) {
 	PluginsPluggableRep* pluggable_rep = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	PluginsPluggableRep* _tmp4_ = NULL;
-	PluginsPluggableRep* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
-	gboolean _tmp10_ = FALSE;
+	PluginsPluggableRep* _tmp4_;
+	PluginsPluggableRep* _tmp8_;
+	gboolean _tmp9_;
+	gboolean _tmp10_;
 #line 274 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (id != NULL);
 #line 275 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3417,11 +3422,11 @@ void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled) {
 	if (_tmp4_ == NULL) {
 #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp3_ = TRUE;
-#line 3420 "Plugins.c"
+#line 3425 "Plugins.c"
 	} else {
-		PluginsPluggableRep* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
-		gboolean _tmp7_ = FALSE;
+		PluginsPluggableRep* _tmp5_;
+		gboolean _tmp6_;
+		gboolean _tmp7_;
 #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp5_ = pluggable_rep;
 #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3430,7 +3435,7 @@ void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled) {
 		_tmp7_ = _tmp6_;
 #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp3_ = !_tmp7_;
-#line 3433 "Plugins.c"
+#line 3438 "Plugins.c"
 	}
 #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp3_) {
@@ -3438,7 +3443,7 @@ void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled) {
 		_plugins_pluggable_rep_unref0 (pluggable_rep);
 #line 277 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 3441 "Plugins.c"
+#line 3446 "Plugins.c"
 	}
 #line 279 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp8_ = pluggable_rep;
@@ -3448,13 +3453,13 @@ void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled) {
 	_tmp10_ = plugins_pluggable_rep_set_enabled (_tmp8_, _tmp9_);
 #line 279 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp10_) {
-#line 3451 "Plugins.c"
-		PluginsNotifier* _tmp11_ = NULL;
-		PluginsNotifier* _tmp12_ = NULL;
-		PluginsPluggableRep* _tmp13_ = NULL;
-		SpitPluggable* _tmp14_ = NULL;
-		SpitPluggable* _tmp15_ = NULL;
-		gboolean _tmp16_ = FALSE;
+#line 3456 "Plugins.c"
+		PluginsNotifier* _tmp11_;
+		PluginsNotifier* _tmp12_;
+		PluginsPluggableRep* _tmp13_;
+		SpitPluggable* _tmp14_;
+		SpitPluggable* _tmp15_;
+		gboolean _tmp16_;
 #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp11_ = plugins_notifier_get_instance ();
 #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3468,25 +3473,25 @@ void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled) {
 #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp16_ = enabled;
 #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		g_signal_emit_by_name (_tmp12_, "pluggable-activation", _tmp15_, _tmp16_);
+		g_signal_emit (_tmp12_, plugins_notifier_signals[PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL], 0, _tmp15_, _tmp16_);
 #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_plugins_notifier_unref0 (_tmp12_);
-#line 3474 "Plugins.c"
+#line 3479 "Plugins.c"
 	}
 #line 274 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_plugins_pluggable_rep_unref0 (pluggable_rep);
-#line 3478 "Plugins.c"
+#line 3483 "Plugins.c"
 }
 
 
 GFile* plugins_get_pluggable_module_file (SpitPluggable* pluggable) {
 	GFile* result = NULL;
 	PluginsModuleRep* module_rep = NULL;
-	SpitPluggable* _tmp0_ = NULL;
-	PluginsModuleRep* _tmp1_ = NULL;
+	SpitPluggable* _tmp0_;
+	PluginsModuleRep* _tmp1_;
 	GFile* _tmp2_ = NULL;
-	PluginsModuleRep* _tmp3_ = NULL;
-	GFile* _tmp6_ = NULL;
+	PluginsModuleRep* _tmp3_;
+	GFile* _tmp6_;
 #line 283 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (SPIT_IS_PLUGGABLE (pluggable), NULL);
 #line 284 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3499,20 +3504,20 @@ GFile* plugins_get_pluggable_module_file (SpitPluggable* pluggable) {
 	_tmp3_ = module_rep;
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp3_ != NULL) {
-#line 3502 "Plugins.c"
-		PluginsModuleRep* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
+#line 3507 "Plugins.c"
+		PluginsModuleRep* _tmp4_;
+		GFile* _tmp5_;
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp4_ = module_rep;
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp5_ = _tmp4_->file;
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp2_ = _tmp5_;
-#line 3511 "Plugins.c"
+#line 3516 "Plugins.c"
 	} else {
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp2_ = NULL;
-#line 3515 "Plugins.c"
+#line 3520 "Plugins.c"
 	}
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp6_ = _g_object_ref0 (_tmp2_);
@@ -3522,19 +3527,19 @@ GFile* plugins_get_pluggable_module_file (SpitPluggable* pluggable) {
 	_plugins_module_rep_unref0 (module_rep);
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3525 "Plugins.c"
+#line 3530 "Plugins.c"
 }
 
 
 gint plugins_compare_pluggable_names (void* a, void* b) {
 	gint result = 0;
 	SpitPluggable* apluggable = NULL;
-	void* _tmp0_ = NULL;
+	void* _tmp0_;
 	SpitPluggable* bpluggable = NULL;
-	void* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	void* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gint _tmp4_;
 #line 290 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = a;
 #line 290 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3553,21 +3558,21 @@ gint plugins_compare_pluggable_names (void* a, void* b) {
 	result = _tmp4_;
 #line 293 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3556 "Plugins.c"
+#line 3561 "Plugins.c"
 }
 
 
 gint plugins_compare_extension_point_names (void* a, void* b) {
 	gint result = 0;
 	PluginsExtensionPoint* apoint = NULL;
-	void* _tmp0_ = NULL;
+	void* _tmp0_;
 	PluginsExtensionPoint* bpoint = NULL;
-	void* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
+	void* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
+	gint _tmp6_;
 #line 297 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = a;
 #line 297 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3590,7 +3595,7 @@ gint plugins_compare_extension_point_names (void* a, void* b) {
 	result = _tmp6_;
 #line 300 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3593 "Plugins.c"
+#line 3598 "Plugins.c"
 }
 
 
@@ -3598,9 +3603,9 @@ gboolean plugins_is_shared_library (GFile* file) {
 	gboolean result = FALSE;
 	gchar* name = NULL;
 	gchar* ext = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
 #line 303 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3623,7 +3628,7 @@ gboolean plugins_is_shared_library (GFile* file) {
 	ext = _tmp4_;
 #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_free0 (_tmp2_);
-#line 3626 "Plugins.c"
+#line 3631 "Plugins.c"
 	{
 		const gchar** shared_ext_collection = NULL;
 		gint shared_ext_collection_length1 = 0;
@@ -3635,17 +3640,17 @@ gboolean plugins_is_shared_library (GFile* file) {
 		shared_ext_collection_length1 = G_N_ELEMENTS (PLUGINS_SHARED_LIB_EXTS);
 #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		for (shared_ext_it = 0; shared_ext_it < G_N_ELEMENTS (PLUGINS_SHARED_LIB_EXTS); shared_ext_it = shared_ext_it + 1) {
-#line 3638 "Plugins.c"
-			gchar* _tmp5_ = NULL;
+#line 3643 "Plugins.c"
+			gchar* _tmp5_;
 			gchar* shared_ext = NULL;
 #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp5_ = g_strdup (shared_ext_collection[shared_ext_it]);
 #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			shared_ext = _tmp5_;
-#line 3645 "Plugins.c"
+#line 3650 "Plugins.c"
 			{
-				const gchar* _tmp6_ = NULL;
-				const gchar* _tmp7_ = NULL;
+				const gchar* _tmp6_;
+				const gchar* _tmp7_;
 #line 308 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp6_ = ext;
 #line 308 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3662,11 +3667,11 @@ gboolean plugins_is_shared_library (GFile* file) {
 					_g_free0 (name);
 #line 309 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					return result;
-#line 3665 "Plugins.c"
+#line 3670 "Plugins.c"
 				}
 #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_g_free0 (shared_ext);
-#line 3669 "Plugins.c"
+#line 3674 "Plugins.c"
 			}
 		}
 	}
@@ -3678,17 +3683,17 @@ gboolean plugins_is_shared_library (GFile* file) {
 	_g_free0 (name);
 #line 312 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3681 "Plugins.c"
+#line 3686 "Plugins.c"
 }
 
 
 void plugins_search_for_plugins (GFile* dir, GError** error) {
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	GFileEnumerator* enumerator = NULL;
-	GFile* _tmp3_ = NULL;
-	GFileEnumerator* _tmp4_ = NULL;
+	GFile* _tmp3_;
+	GFileEnumerator* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 315 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_IS_FILE (dir));
@@ -3714,7 +3719,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 320 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 3717 "Plugins.c"
+#line 3722 "Plugins.c"
 	}
 	{
 		gboolean _tmp5_ = FALSE;
@@ -3722,23 +3727,23 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 		_tmp5_ = TRUE;
 #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		while (TRUE) {
-#line 3725 "Plugins.c"
+#line 3730 "Plugins.c"
 			GFileInfo* info = NULL;
-			GFileEnumerator* _tmp6_ = NULL;
-			GFileInfo* _tmp7_ = NULL;
-			GFileInfo* _tmp8_ = NULL;
-			GFileInfo* _tmp9_ = NULL;
-			gboolean _tmp10_ = FALSE;
+			GFileEnumerator* _tmp6_;
+			GFileInfo* _tmp7_;
+			GFileInfo* _tmp8_;
+			GFileInfo* _tmp9_;
+			gboolean _tmp10_;
 			GFile* file = NULL;
-			GFile* _tmp11_ = NULL;
-			GFileInfo* _tmp12_ = NULL;
-			const gchar* _tmp13_ = NULL;
-			GFile* _tmp14_ = NULL;
-			GFileInfo* _tmp15_ = NULL;
-			GFileType _tmp16_ = 0;
+			GFile* _tmp11_;
+			GFileInfo* _tmp12_;
+			const gchar* _tmp13_;
+			GFile* _tmp14_;
+			GFileInfo* _tmp15_;
+			GFileType _tmp16_;
 #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			if (!_tmp5_) {
-#line 3741 "Plugins.c"
+#line 3746 "Plugins.c"
 			}
 #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp5_ = FALSE;
@@ -3756,7 +3761,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 				_g_object_unref0 (enumerator);
 #line 323 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				return;
-#line 3759 "Plugins.c"
+#line 3764 "Plugins.c"
 			}
 #line 324 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp8_ = info;
@@ -3766,7 +3771,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 				_g_object_unref0 (info);
 #line 325 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				break;
-#line 3769 "Plugins.c"
+#line 3774 "Plugins.c"
 			}
 #line 327 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp9_ = info;
@@ -3778,7 +3783,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 				_g_object_unref0 (info);
 #line 328 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				continue;
-#line 3781 "Plugins.c"
+#line 3786 "Plugins.c"
 			}
 #line 330 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp11_ = dir;
@@ -3798,17 +3803,17 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 			switch (_tmp16_) {
 #line 332 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				case G_FILE_TYPE_DIRECTORY:
-#line 3801 "Plugins.c"
+#line 3806 "Plugins.c"
 				{
 					{
-						GFile* _tmp17_ = NULL;
+						GFile* _tmp17_;
 #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						_tmp17_ = file;
 #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						plugins_search_for_plugins (_tmp17_, &_inner_error_);
 #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3811 "Plugins.c"
+#line 3816 "Plugins.c"
 							goto __catch36_g_error;
 						}
 					}
@@ -3816,11 +3821,11 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 					__catch36_g_error:
 					{
 						GError* err = NULL;
-						GFile* _tmp18_ = NULL;
-						gchar* _tmp19_ = NULL;
-						gchar* _tmp20_ = NULL;
-						GError* _tmp21_ = NULL;
-						const gchar* _tmp22_ = NULL;
+						GFile* _tmp18_;
+						gchar* _tmp19_;
+						gchar* _tmp20_;
+						GError* _tmp21_;
+						const gchar* _tmp22_;
 #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						err = _inner_error_;
 #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3841,7 +3846,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 						_g_free0 (_tmp20_);
 #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						_g_error_free0 (err);
-#line 3844 "Plugins.c"
+#line 3849 "Plugins.c"
 					}
 					__finally36:
 #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3856,117 +3861,117 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 						_g_object_unref0 (enumerator);
 #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						return;
-#line 3859 "Plugins.c"
+#line 3864 "Plugins.c"
 					}
 #line 339 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					break;
-#line 3863 "Plugins.c"
+#line 3868 "Plugins.c"
 				}
 #line 332 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				case G_FILE_TYPE_REGULAR:
-#line 3867 "Plugins.c"
+#line 3872 "Plugins.c"
 				{
-					GFile* _tmp23_ = NULL;
-					gboolean _tmp24_ = FALSE;
+					GFile* _tmp23_;
+					gboolean _tmp24_;
 #line 342 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_tmp23_ = file;
 #line 342 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_tmp24_ = plugins_is_shared_library (_tmp23_);
 #line 342 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					if (_tmp24_) {
-#line 3877 "Plugins.c"
-						GFile* _tmp25_ = NULL;
+#line 3882 "Plugins.c"
+						GFile* _tmp25_;
 #line 343 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						_tmp25_ = file;
 #line 343 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						plugins_load_module (_tmp25_);
-#line 3883 "Plugins.c"
+#line 3888 "Plugins.c"
 					}
 #line 344 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					break;
-#line 3887 "Plugins.c"
+#line 3892 "Plugins.c"
 				}
 				default:
 				{
 #line 348 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					break;
-#line 3893 "Plugins.c"
+#line 3898 "Plugins.c"
 				}
 			}
 #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_g_object_unref0 (file);
 #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_g_object_unref0 (info);
-#line 3900 "Plugins.c"
+#line 3905 "Plugins.c"
 		}
 	}
 #line 315 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_object_unref0 (enumerator);
-#line 3905 "Plugins.c"
+#line 3910 "Plugins.c"
 }
 
 
 void plugins_load_module (GFile* file) {
 	PluginsModuleRep* module_rep = NULL;
-	GFile* _tmp0_ = NULL;
-	PluginsModuleRep* _tmp1_ = NULL;
-	PluginsModuleRep* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	PluginsModuleRep* _tmp1_;
+	PluginsModuleRep* _tmp2_;
 	void* entry = NULL;
-	PluginsModuleRep* _tmp7_ = NULL;
-	GModule* _tmp8_ = NULL;
+	PluginsModuleRep* _tmp7_;
+	GModule* _tmp8_;
 	void* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
+	gboolean _tmp10_;
 	SpitEntryPoint spit_entry_point = NULL;
-	void* _tmp14_ = NULL;
+	void* _tmp14_;
 	gboolean _tmp15_ = FALSE;
 	SpitEntryPointParams params = {0};
-	GFile* _tmp16_ = NULL;
-	GFile* _tmp17_ = NULL;
-	PluginsModuleRep* _tmp18_ = NULL;
-	SpitEntryPoint _tmp19_ = NULL;
-	SpitModule* _tmp20_ = NULL;
-	SpitEntryPointParams _tmp21_ = {0};
-	gint _tmp22_ = 0;
+	GFile* _tmp16_;
+	GFile* _tmp17_;
+	PluginsModuleRep* _tmp18_;
+	SpitEntryPoint _tmp19_;
+	SpitModule* _tmp20_;
+	SpitEntryPointParams _tmp21_;
+	gint _tmp22_;
 	gboolean _tmp26_ = FALSE;
-	SpitEntryPointParams _tmp27_ = {0};
-	gint _tmp28_ = 0;
-	PluginsModuleRep* _tmp36_ = NULL;
-	SpitEntryPointParams _tmp37_ = {0};
-	gint _tmp38_ = 0;
-	PluginsModuleRep* _tmp39_ = NULL;
-	SpitModule* _tmp40_ = NULL;
-	PluginsModuleRep* _tmp42_ = NULL;
-	SpitModule* _tmp43_ = NULL;
-	PluginsModuleRep* _tmp49_ = NULL;
-	PluginsModuleRep* _tmp50_ = NULL;
-	SpitModule* _tmp51_ = NULL;
-	const gchar* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
-	PluginsModuleRep* _tmp54_ = NULL;
-	const gchar* _tmp55_ = NULL;
-	GeeHashMap* _tmp61_ = NULL;
-	PluginsModuleRep* _tmp62_ = NULL;
-	const gchar* _tmp63_ = NULL;
-	gboolean _tmp64_ = FALSE;
-	PluginsModuleRep* _tmp72_ = NULL;
-	SpitModule* _tmp73_ = NULL;
-	const gchar* _tmp74_ = NULL;
-	PluginsModuleRep* _tmp75_ = NULL;
-	SpitModule* _tmp76_ = NULL;
-	const gchar* _tmp77_ = NULL;
-	PluginsModuleRep* _tmp78_ = NULL;
-	const gchar* _tmp79_ = NULL;
-	GFile* _tmp80_ = NULL;
-	gchar* _tmp81_ = NULL;
-	gchar* _tmp82_ = NULL;
-	GeeHashMap* _tmp83_ = NULL;
-	PluginsModuleRep* _tmp84_ = NULL;
-	const gchar* _tmp85_ = NULL;
-	PluginsModuleRep* _tmp86_ = NULL;
-	PluginsModuleRep* _tmp87_ = NULL;
-	SpitModule* _tmp88_ = NULL;
-	gint _tmp89_ = 0;
-	SpitPluggable** _tmp90_ = NULL;
+	SpitEntryPointParams _tmp27_;
+	gint _tmp28_;
+	PluginsModuleRep* _tmp36_;
+	SpitEntryPointParams _tmp37_;
+	gint _tmp38_;
+	PluginsModuleRep* _tmp39_;
+	SpitModule* _tmp40_;
+	PluginsModuleRep* _tmp42_;
+	SpitModule* _tmp43_;
+	PluginsModuleRep* _tmp49_;
+	PluginsModuleRep* _tmp50_;
+	SpitModule* _tmp51_;
+	const gchar* _tmp52_;
+	gchar* _tmp53_;
+	PluginsModuleRep* _tmp54_;
+	const gchar* _tmp55_;
+	GeeHashMap* _tmp61_;
+	PluginsModuleRep* _tmp62_;
+	const gchar* _tmp63_;
+	gboolean _tmp64_;
+	PluginsModuleRep* _tmp72_;
+	SpitModule* _tmp73_;
+	const gchar* _tmp74_;
+	PluginsModuleRep* _tmp75_;
+	SpitModule* _tmp76_;
+	const gchar* _tmp77_;
+	PluginsModuleRep* _tmp78_;
+	const gchar* _tmp79_;
+	GFile* _tmp80_;
+	gchar* _tmp81_;
+	gchar* _tmp82_;
+	GeeHashMap* _tmp83_;
+	PluginsModuleRep* _tmp84_;
+	const gchar* _tmp85_;
+	PluginsModuleRep* _tmp86_;
+	PluginsModuleRep* _tmp87_;
+	SpitModule* _tmp88_;
+	gint _tmp89_;
+	SpitPluggable** _tmp90_;
 #line 353 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_IS_FILE (file));
 #line 354 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3979,11 +3984,11 @@ void plugins_load_module (GFile* file) {
 	_tmp2_ = module_rep;
 #line 355 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp2_ == NULL) {
-#line 3982 "Plugins.c"
-		GFile* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+#line 3987 "Plugins.c"
+		GFile* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		const gchar* _tmp6_;
 #line 356 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp3_ = file;
 #line 356 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -4000,7 +4005,7 @@ void plugins_load_module (GFile* file) {
 		_plugins_module_rep_unref0 (module_rep);
 #line 358 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 4003 "Plugins.c"
+#line 4008 "Plugins.c"
 	}
 #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp7_ = module_rep;
@@ -4012,10 +4017,10 @@ void plugins_load_module (GFile* file) {
 	entry = _tmp9_;
 #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!_tmp10_) {
-#line 4015 "Plugins.c"
-		GFile* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
+#line 4020 "Plugins.c"
+		GFile* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
 #line 364 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp11_ = file;
 #line 364 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -4031,7 +4036,7 @@ void plugins_load_module (GFile* file) {
 		_plugins_module_rep_unref0 (module_rep);
 #line 367 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 4033 "Plugins.c"
+#line 4038 "Plugins.c"
 	}
 #line 370 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp14_ = entry;
@@ -4041,11 +4046,11 @@ void plugins_load_module (GFile* file) {
 	if (PLUGINS_MIN_SPIT_INTERFACE <= SPIT_CURRENT_INTERFACE) {
 #line 372 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp15_ = SPIT_CURRENT_INTERFACE <= PLUGINS_MAX_SPIT_INTERFACE;
-#line 4043 "Plugins.c"
+#line 4048 "Plugins.c"
 	} else {
 #line 372 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp15_ = FALSE;
-#line 4047 "Plugins.c"
+#line 4052 "Plugins.c"
 	}
 #line 372 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_vala_assert (_tmp15_, "MIN_SPIT_INTERFACE <= Spit.CURRENT_INTERFACE && Spit.CURRENT_INTERFACE <= MAX_SPIT_INTERFACE");
@@ -4081,10 +4086,10 @@ void plugins_load_module (GFile* file) {
 	_tmp22_ = _tmp21_.module_spit_interface;
 #line 380 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp22_ == SPIT_UNSUPPORTED_INTERFACE) {
-#line 4083 "Plugins.c"
-		GFile* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
+#line 4088 "Plugins.c"
+		GFile* _tmp23_;
+		gchar* _tmp24_;
+		gchar* _tmp25_;
 #line 381 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp23_ = file;
 #line 381 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -4102,7 +4107,7 @@ void plugins_load_module (GFile* file) {
 		_plugins_module_rep_unref0 (module_rep);
 #line 384 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 4103 "Plugins.c"
+#line 4108 "Plugins.c"
 	}
 #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp27_ = params;
@@ -4112,26 +4117,26 @@ void plugins_load_module (GFile* file) {
 	if (_tmp28_ < PLUGINS_MIN_SPIT_INTERFACE) {
 #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp26_ = TRUE;
-#line 4113 "Plugins.c"
+#line 4118 "Plugins.c"
 	} else {
-		SpitEntryPointParams _tmp29_ = {0};
-		gint _tmp30_ = 0;
+		SpitEntryPointParams _tmp29_;
+		gint _tmp30_;
 #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp29_ = params;
 #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp30_ = _tmp29_.module_spit_interface;
 #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp26_ = _tmp30_ > PLUGINS_MAX_SPIT_INTERFACE;
-#line 4123 "Plugins.c"
+#line 4128 "Plugins.c"
 	}
 #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp26_) {
-#line 4127 "Plugins.c"
-		GFile* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
-		gchar* _tmp33_ = NULL;
-		PluginsModuleRep* _tmp34_ = NULL;
-		gint _tmp35_ = 0;
+#line 4132 "Plugins.c"
+		GFile* _tmp31_;
+		gchar* _tmp32_;
+		gchar* _tmp33_;
+		PluginsModuleRep* _tmp34_;
+		gint _tmp35_;
 #line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp31_ = file;
 #line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -4153,7 +4158,7 @@ void plugins_load_module (GFile* file) {
 		_plugins_module_rep_unref0 (module_rep);
 #line 391 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 4153 "Plugins.c"
+#line 4158 "Plugins.c"
 	}
 #line 394 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp36_ = module_rep;
@@ -4169,15 +4174,15 @@ void plugins_load_module (GFile* file) {
 	_tmp40_ = _tmp39_->spit_module;
 #line 397 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, SPIT_TYPE_MODULE)) {
-#line 4169 "Plugins.c"
-		PluginsModuleRep* _tmp41_ = NULL;
+#line 4174 "Plugins.c"
+		PluginsModuleRep* _tmp41_;
 #line 398 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp41_ = module_rep;
 #line 398 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_g_object_unref0 (_tmp41_->spit_module);
 #line 398 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp41_->spit_module = NULL;
-#line 4177 "Plugins.c"
+#line 4182 "Plugins.c"
 	}
 #line 400 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp42_ = module_rep;
@@ -4185,12 +4190,12 @@ void plugins_load_module (GFile* file) {
 	_tmp43_ = _tmp42_->spit_module;
 #line 400 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp43_ == NULL) {
-#line 4185 "Plugins.c"
-		GFile* _tmp44_ = NULL;
-		gchar* _tmp45_ = NULL;
-		gchar* _tmp46_ = NULL;
-		PluginsModuleRep* _tmp47_ = NULL;
-		gint _tmp48_ = 0;
+#line 4190 "Plugins.c"
+		GFile* _tmp44_;
+		gchar* _tmp45_;
+		gchar* _tmp46_;
+		PluginsModuleRep* _tmp47_;
+		gint _tmp48_;
 #line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp44_ = file;
 #line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -4212,7 +4217,7 @@ void plugins_load_module (GFile* file) {
 		_plugins_module_rep_unref0 (module_rep);
 #line 404 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 4211 "Plugins.c"
+#line 4216 "Plugins.c"
 	}
 #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp49_ = module_rep;
@@ -4234,12 +4239,12 @@ void plugins_load_module (GFile* file) {
 	_tmp55_ = _tmp54_->id;
 #line 410 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp55_ == NULL) {
-#line 4233 "Plugins.c"
-		GFile* _tmp56_ = NULL;
-		gchar* _tmp57_ = NULL;
-		gchar* _tmp58_ = NULL;
-		PluginsModuleRep* _tmp59_ = NULL;
-		gint _tmp60_ = 0;
+#line 4238 "Plugins.c"
+		GFile* _tmp56_;
+		gchar* _tmp57_;
+		gchar* _tmp58_;
+		PluginsModuleRep* _tmp59_;
+		gint _tmp60_;
 #line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp56_ = file;
 #line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -4261,7 +4266,7 @@ void plugins_load_module (GFile* file) {
 		_plugins_module_rep_unref0 (module_rep);
 #line 414 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 4259 "Plugins.c"
+#line 4264 "Plugins.c"
 	}
 #line 417 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp61_ = plugins_module_table;
@@ -4273,14 +4278,14 @@ void plugins_load_module (GFile* file) {
 	_tmp64_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp63_);
 #line 417 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp64_) {
-#line 4271 "Plugins.c"
-		GFile* _tmp65_ = NULL;
-		gchar* _tmp66_ = NULL;
-		gchar* _tmp67_ = NULL;
-		PluginsModuleRep* _tmp68_ = NULL;
-		gint _tmp69_ = 0;
-		PluginsModuleRep* _tmp70_ = NULL;
-		const gchar* _tmp71_ = NULL;
+#line 4276 "Plugins.c"
+		GFile* _tmp65_;
+		gchar* _tmp66_;
+		gchar* _tmp67_;
+		PluginsModuleRep* _tmp68_;
+		gint _tmp69_;
+		PluginsModuleRep* _tmp70_;
+		const gchar* _tmp71_;
 #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp65_ = file;
 #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -4306,7 +4311,7 @@ void plugins_load_module (GFile* file) {
 		_plugins_module_rep_unref0 (module_rep);
 #line 421 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 4303 "Plugins.c"
+#line 4308 "Plugins.c"
 	}
 #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp72_ = module_rep;
@@ -4350,7 +4355,7 @@ void plugins_load_module (GFile* file) {
 	_tmp88_ = _tmp87_->spit_module;
 #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp90_ = spit_module_get_pluggables (_tmp88_, &_tmp89_);
-#line 4347 "Plugins.c"
+#line 4352 "Plugins.c"
 	{
 		SpitPluggable** pluggable_collection = NULL;
 		gint pluggable_collection_length1 = 0;
@@ -4362,21 +4367,21 @@ void plugins_load_module (GFile* file) {
 		pluggable_collection_length1 = _tmp89_;
 #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		for (pluggable_it = 0; pluggable_it < _tmp89_; pluggable_it = pluggable_it + 1) {
-#line 4359 "Plugins.c"
-			SpitPluggable* _tmp91_ = NULL;
+#line 4364 "Plugins.c"
+			SpitPluggable* _tmp91_;
 			SpitPluggable* pluggable = NULL;
 #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp91_ = _g_object_ref0 (pluggable_collection[pluggable_it]);
 #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			pluggable = _tmp91_;
-#line 4366 "Plugins.c"
+#line 4371 "Plugins.c"
 			{
-				GeeHashMap* _tmp92_ = NULL;
-				SpitPluggable* _tmp93_ = NULL;
-				const gchar* _tmp94_ = NULL;
-				SpitPluggable* _tmp95_ = NULL;
-				PluginsPluggableRep* _tmp96_ = NULL;
-				PluginsPluggableRep* _tmp97_ = NULL;
+				GeeHashMap* _tmp92_;
+				SpitPluggable* _tmp93_;
+				const gchar* _tmp94_;
+				SpitPluggable* _tmp95_;
+				PluginsPluggableRep* _tmp96_;
+				PluginsPluggableRep* _tmp97_;
 #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp92_ = plugins_pluggable_table;
 #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -4395,7 +4400,7 @@ void plugins_load_module (GFile* file) {
 				_plugins_pluggable_rep_unref0 (_tmp97_);
 #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_g_object_unref0 (pluggable);
-#line 4392 "Plugins.c"
+#line 4397 "Plugins.c"
 			}
 		}
 	}
@@ -4403,7 +4408,7 @@ void plugins_load_module (GFile* file) {
 	spit_entry_point_params_destroy (&params);
 #line 353 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_plugins_module_rep_unref0 (module_rep);
-#line 4400 "Plugins.c"
+#line 4405 "Plugins.c"
 }
 
 
diff --git a/src/plugins/PublishingInterfaces.c b/src/plugins/PublishingInterfaces.c
index bb5d614..745d106 100644
--- a/src/plugins/PublishingInterfaces.c
+++ b/src/plugins/PublishingInterfaces.c
@@ -1,4 +1,4 @@
-/* PublishingInterfaces.c generated by valac 0.34.7, the Vala compiler
+/* PublishingInterfaces.c generated by valac 0.36.6, the Vala compiler
  * generated from PublishingInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -91,6 +91,12 @@ typedef struct _SpitPublishingPublishableIface SpitPublishingPublishableIface;
 
 typedef struct _SpitPublishingAuthenticator SpitPublishingAuthenticator;
 typedef struct _SpitPublishingAuthenticatorIface SpitPublishingAuthenticatorIface;
+enum  {
+	SPIT_PUBLISHING_AUTHENTICATOR_AUTHENTICATED_SIGNAL,
+	SPIT_PUBLISHING_AUTHENTICATOR_AUTHENTICATION_FAILED_SIGNAL,
+	SPIT_PUBLISHING_AUTHENTICATOR_LAST_SIGNAL
+};
+static guint spit_publishing_authenticator_signals[SPIT_PUBLISHING_AUTHENTICATOR_LAST_SIGNAL] = {0};
 
 #define SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY (spit_publishing_authenticator_factory_get_type ())
 #define SPIT_PUBLISHING_AUTHENTICATOR_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory))
@@ -469,7 +475,7 @@ SpitPublishingService* spit_publishing_publisher_get_service (SpitPublishingPubl
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self), NULL);
 #line 121 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->get_service (self);
-#line 473 "PublishingInterfaces.c"
+#line 479 "PublishingInterfaces.c"
 }
 
 
@@ -484,7 +490,7 @@ void spit_publishing_publisher_start (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 129 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->start (self);
-#line 488 "PublishingInterfaces.c"
+#line 494 "PublishingInterfaces.c"
 }
 
 
@@ -496,7 +502,7 @@ gboolean spit_publishing_publisher_is_running (SpitPublishingPublisher* self) {
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self), FALSE);
 #line 134 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->is_running (self);
-#line 500 "PublishingInterfaces.c"
+#line 506 "PublishingInterfaces.c"
 }
 
 
@@ -509,7 +515,7 @@ void spit_publishing_publisher_stop (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 140 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->stop (self);
-#line 513 "PublishingInterfaces.c"
+#line 519 "PublishingInterfaces.c"
 }
 
 
@@ -522,7 +528,7 @@ void spit_publishing_publisher_reserved0 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 145 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved0 (self);
-#line 526 "PublishingInterfaces.c"
+#line 532 "PublishingInterfaces.c"
 }
 
 
@@ -535,7 +541,7 @@ void spit_publishing_publisher_reserved1 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 146 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved1 (self);
-#line 539 "PublishingInterfaces.c"
+#line 545 "PublishingInterfaces.c"
 }
 
 
@@ -548,7 +554,7 @@ void spit_publishing_publisher_reserved2 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 147 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved2 (self);
-#line 552 "PublishingInterfaces.c"
+#line 558 "PublishingInterfaces.c"
 }
 
 
@@ -561,7 +567,7 @@ void spit_publishing_publisher_reserved3 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 148 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved3 (self);
-#line 565 "PublishingInterfaces.c"
+#line 571 "PublishingInterfaces.c"
 }
 
 
@@ -574,7 +580,7 @@ void spit_publishing_publisher_reserved4 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 149 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved4 (self);
-#line 578 "PublishingInterfaces.c"
+#line 584 "PublishingInterfaces.c"
 }
 
 
@@ -587,7 +593,7 @@ void spit_publishing_publisher_reserved5 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 150 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved5 (self);
-#line 591 "PublishingInterfaces.c"
+#line 597 "PublishingInterfaces.c"
 }
 
 
@@ -600,7 +606,7 @@ void spit_publishing_publisher_reserved6 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 151 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved6 (self);
-#line 604 "PublishingInterfaces.c"
+#line 610 "PublishingInterfaces.c"
 }
 
 
@@ -613,7 +619,7 @@ void spit_publishing_publisher_reserved7 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 152 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved7 (self);
-#line 617 "PublishingInterfaces.c"
+#line 623 "PublishingInterfaces.c"
 }
 
 
@@ -640,7 +646,7 @@ static void spit_publishing_publisher_base_init (SpitPublishingPublisherIface *
 		iface->reserved6 = spit_publishing_publisher_real_reserved6;
 #line 105 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 		iface->reserved7 = spit_publishing_publisher_real_reserved7;
-#line 644 "PublishingInterfaces.c"
+#line 650 "PublishingInterfaces.c"
 	}
 }
 
@@ -692,7 +698,7 @@ GtkWidget* spit_publishing_dialog_pane_get_widget (SpitPublishingDialogPane* sel
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self), NULL);
 #line 197 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->get_widget (self);
-#line 696 "PublishingInterfaces.c"
+#line 702 "PublishingInterfaces.c"
 }
 
 
@@ -705,7 +711,7 @@ SpitPublishingDialogPaneGeometryOptions spit_publishing_dialog_pane_get_preferre
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self), 0);
 #line 203 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->get_preferred_geometry (self);
-#line 709 "PublishingInterfaces.c"
+#line 715 "PublishingInterfaces.c"
 }
 
 
@@ -718,7 +724,7 @@ void spit_publishing_dialog_pane_on_pane_installed (SpitPublishingDialogPane* se
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 209 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->on_pane_installed (self);
-#line 722 "PublishingInterfaces.c"
+#line 728 "PublishingInterfaces.c"
 }
 
 
@@ -731,7 +737,7 @@ void spit_publishing_dialog_pane_on_pane_uninstalled (SpitPublishingDialogPane*
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 215 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->on_pane_uninstalled (self);
-#line 735 "PublishingInterfaces.c"
+#line 741 "PublishingInterfaces.c"
 }
 
 
@@ -744,7 +750,7 @@ void spit_publishing_dialog_pane_reserved0 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 220 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved0 (self);
-#line 748 "PublishingInterfaces.c"
+#line 754 "PublishingInterfaces.c"
 }
 
 
@@ -757,7 +763,7 @@ void spit_publishing_dialog_pane_reserved1 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 221 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved1 (self);
-#line 761 "PublishingInterfaces.c"
+#line 767 "PublishingInterfaces.c"
 }
 
 
@@ -770,7 +776,7 @@ void spit_publishing_dialog_pane_reserved2 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 222 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved2 (self);
-#line 774 "PublishingInterfaces.c"
+#line 780 "PublishingInterfaces.c"
 }
 
 
@@ -783,7 +789,7 @@ void spit_publishing_dialog_pane_reserved3 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 223 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved3 (self);
-#line 787 "PublishingInterfaces.c"
+#line 793 "PublishingInterfaces.c"
 }
 
 
@@ -796,7 +802,7 @@ void spit_publishing_dialog_pane_reserved4 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 224 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved4 (self);
-#line 800 "PublishingInterfaces.c"
+#line 806 "PublishingInterfaces.c"
 }
 
 
@@ -809,7 +815,7 @@ void spit_publishing_dialog_pane_reserved5 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 225 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved5 (self);
-#line 813 "PublishingInterfaces.c"
+#line 819 "PublishingInterfaces.c"
 }
 
 
@@ -822,7 +828,7 @@ void spit_publishing_dialog_pane_reserved6 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 226 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved6 (self);
-#line 826 "PublishingInterfaces.c"
+#line 832 "PublishingInterfaces.c"
 }
 
 
@@ -835,7 +841,7 @@ void spit_publishing_dialog_pane_reserved7 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 227 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved7 (self);
-#line 839 "PublishingInterfaces.c"
+#line 845 "PublishingInterfaces.c"
 }
 
 
@@ -862,7 +868,7 @@ static void spit_publishing_dialog_pane_base_init (SpitPublishingDialogPaneIface
 		iface->reserved6 = spit_publishing_dialog_pane_real_reserved6;
 #line 160 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 		iface->reserved7 = spit_publishing_dialog_pane_real_reserved7;
-#line 866 "PublishingInterfaces.c"
+#line 872 "PublishingInterfaces.c"
 	}
 }
 
@@ -912,7 +918,7 @@ void spit_publishing_plugin_host_post_error (SpitPublishingPluginHost* self, GEr
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 277 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->post_error (self, err);
-#line 916 "PublishingInterfaces.c"
+#line 922 "PublishingInterfaces.c"
 }
 
 
@@ -927,7 +933,7 @@ void spit_publishing_plugin_host_stop_publishing (SpitPublishingPluginHost* self
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 285 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->stop_publishing (self);
-#line 931 "PublishingInterfaces.c"
+#line 937 "PublishingInterfaces.c"
 }
 
 
@@ -939,7 +945,7 @@ SpitPublishingPublisher* spit_publishing_plugin_host_get_publisher (SpitPublishi
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), NULL);
 #line 290 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->get_publisher (self);
-#line 943 "PublishingInterfaces.c"
+#line 949 "PublishingInterfaces.c"
 }
 
 
@@ -966,7 +972,7 @@ void spit_publishing_plugin_host_install_dialog_pane (SpitPublishingPluginHost*
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 310 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_dialog_pane (self, pane, mode);
-#line 970 "PublishingInterfaces.c"
+#line 976 "PublishingInterfaces.c"
 }
 
 
@@ -1001,7 +1007,7 @@ void spit_publishing_plugin_host_install_static_message_pane (SpitPublishingPlug
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 339 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_static_message_pane (self, message, mode);
-#line 1005 "PublishingInterfaces.c"
+#line 1011 "PublishingInterfaces.c"
 }
 
 
@@ -1028,7 +1034,7 @@ void spit_publishing_plugin_host_install_pango_message_pane (SpitPublishingPlugi
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 360 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_pango_message_pane (self, markup, mode);
-#line 1032 "PublishingInterfaces.c"
+#line 1038 "PublishingInterfaces.c"
 }
 
 
@@ -1049,7 +1055,7 @@ void spit_publishing_plugin_host_install_success_pane (SpitPublishingPluginHost*
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 375 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_success_pane (self);
-#line 1053 "PublishingInterfaces.c"
+#line 1059 "PublishingInterfaces.c"
 }
 
 
@@ -1072,7 +1078,7 @@ void spit_publishing_plugin_host_install_account_fetch_wait_pane (SpitPublishing
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 391 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_account_fetch_wait_pane (self);
-#line 1076 "PublishingInterfaces.c"
+#line 1082 "PublishingInterfaces.c"
 }
 
 
@@ -1092,7 +1098,7 @@ void spit_publishing_plugin_host_install_login_wait_pane (SpitPublishingPluginHo
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 405 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_login_wait_pane (self);
-#line 1096 "PublishingInterfaces.c"
+#line 1102 "PublishingInterfaces.c"
 }
 
 
@@ -1121,7 +1127,7 @@ void spit_publishing_plugin_host_install_welcome_pane (SpitPublishingPluginHost*
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 427 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_welcome_pane (self, welcome_message, on_login_clicked, on_login_clicked_target);
-#line 1125 "PublishingInterfaces.c"
+#line 1131 "PublishingInterfaces.c"
 }
 
 
@@ -1144,7 +1150,7 @@ void spit_publishing_plugin_host_set_service_locked (SpitPublishingPluginHost* s
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 444 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->set_service_locked (self, is_locked);
-#line 1148 "PublishingInterfaces.c"
+#line 1154 "PublishingInterfaces.c"
 }
 
 
@@ -1163,7 +1169,7 @@ void spit_publishing_plugin_host_set_dialog_default_widget (SpitPublishingPlugin
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 456 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->set_dialog_default_widget (self, widget);
-#line 1167 "PublishingInterfaces.c"
+#line 1173 "PublishingInterfaces.c"
 }
 
 
@@ -1176,7 +1182,7 @@ SpitPublishingPublishable** spit_publishing_plugin_host_get_publishables (SpitPu
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), NULL);
 #line 462 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->get_publishables (self, result_length1);
-#line 1180 "PublishingInterfaces.c"
+#line 1186 "PublishingInterfaces.c"
 }
 
 
@@ -1215,7 +1221,7 @@ SpitPublishingProgressCallback spit_publishing_plugin_host_serialize_publishable
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), NULL);
 #line 494 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->serialize_publishables (self, content_major_axis, strip_metadata, result_target, result_target_destroy_notify);
-#line 1219 "PublishingInterfaces.c"
+#line 1225 "PublishingInterfaces.c"
 }
 
 
@@ -1229,7 +1235,7 @@ SpitPublishingPublisherMediaType spit_publishing_plugin_host_get_publishable_med
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), 0);
 #line 502 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->get_publishable_media_type (self);
-#line 1233 "PublishingInterfaces.c"
+#line 1239 "PublishingInterfaces.c"
 }
 
 
@@ -1242,7 +1248,7 @@ void spit_publishing_plugin_host_reserved0 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 507 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved0 (self);
-#line 1246 "PublishingInterfaces.c"
+#line 1252 "PublishingInterfaces.c"
 }
 
 
@@ -1255,7 +1261,7 @@ void spit_publishing_plugin_host_reserved1 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 508 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved1 (self);
-#line 1259 "PublishingInterfaces.c"
+#line 1265 "PublishingInterfaces.c"
 }
 
 
@@ -1268,7 +1274,7 @@ void spit_publishing_plugin_host_reserved2 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 509 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved2 (self);
-#line 1272 "PublishingInterfaces.c"
+#line 1278 "PublishingInterfaces.c"
 }
 
 
@@ -1281,7 +1287,7 @@ void spit_publishing_plugin_host_reserved3 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 510 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved3 (self);
-#line 1285 "PublishingInterfaces.c"
+#line 1291 "PublishingInterfaces.c"
 }
 
 
@@ -1294,7 +1300,7 @@ void spit_publishing_plugin_host_reserved4 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 511 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved4 (self);
-#line 1298 "PublishingInterfaces.c"
+#line 1304 "PublishingInterfaces.c"
 }
 
 
@@ -1307,7 +1313,7 @@ void spit_publishing_plugin_host_reserved5 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 512 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved5 (self);
-#line 1311 "PublishingInterfaces.c"
+#line 1317 "PublishingInterfaces.c"
 }
 
 
@@ -1320,7 +1326,7 @@ void spit_publishing_plugin_host_reserved6 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 513 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved6 (self);
-#line 1324 "PublishingInterfaces.c"
+#line 1330 "PublishingInterfaces.c"
 }
 
 
@@ -1333,7 +1339,7 @@ void spit_publishing_plugin_host_reserved7 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 514 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved7 (self);
-#line 1337 "PublishingInterfaces.c"
+#line 1343 "PublishingInterfaces.c"
 }
 
 
@@ -1360,7 +1366,7 @@ static void spit_publishing_plugin_host_base_init (SpitPublishingPluginHostIface
 		iface->reserved6 = spit_publishing_plugin_host_real_reserved6;
 #line 260 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 		iface->reserved7 = spit_publishing_plugin_host_real_reserved7;
-#line 1364 "PublishingInterfaces.c"
+#line 1370 "PublishingInterfaces.c"
 	}
 }
 
@@ -1403,7 +1409,7 @@ GFile* spit_publishing_publishable_get_serialized_file (SpitPublishingPublishabl
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL);
 #line 535 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_serialized_file (self);
-#line 1407 "PublishingInterfaces.c"
+#line 1413 "PublishingInterfaces.c"
 }
 
 
@@ -1419,7 +1425,7 @@ gchar* spit_publishing_publishable_get_publishing_name (SpitPublishingPublishabl
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL);
 #line 544 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_publishing_name (self);
-#line 1423 "PublishingInterfaces.c"
+#line 1429 "PublishingInterfaces.c"
 }
 
 
@@ -1432,7 +1438,7 @@ gchar* spit_publishing_publishable_get_param_string (SpitPublishingPublishable*
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL);
 #line 550 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_param_string (self, name);
-#line 1436 "PublishingInterfaces.c"
+#line 1442 "PublishingInterfaces.c"
 }
 
 
@@ -1445,7 +1451,7 @@ gchar** spit_publishing_publishable_get_publishing_keywords (SpitPublishingPubli
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL);
 #line 556 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_publishing_keywords (self, result_length1);
-#line 1449 "PublishingInterfaces.c"
+#line 1455 "PublishingInterfaces.c"
 }
 
 
@@ -1457,7 +1463,7 @@ SpitPublishingPublisherMediaType spit_publishing_publishable_get_media_type (Spi
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), 0);
 #line 561 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_media_type (self);
-#line 1461 "PublishingInterfaces.c"
+#line 1467 "PublishingInterfaces.c"
 }
 
 
@@ -1469,7 +1475,7 @@ GDateTime* spit_publishing_publishable_get_exposure_date_time (SpitPublishingPub
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL);
 #line 566 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_exposure_date_time (self);
-#line 1473 "PublishingInterfaces.c"
+#line 1479 "PublishingInterfaces.c"
 }
 
 
@@ -1482,7 +1488,7 @@ void spit_publishing_publishable_reserved0 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 571 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved0 (self);
-#line 1486 "PublishingInterfaces.c"
+#line 1492 "PublishingInterfaces.c"
 }
 
 
@@ -1495,7 +1501,7 @@ void spit_publishing_publishable_reserved1 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 572 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved1 (self);
-#line 1499 "PublishingInterfaces.c"
+#line 1505 "PublishingInterfaces.c"
 }
 
 
@@ -1508,7 +1514,7 @@ void spit_publishing_publishable_reserved2 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 573 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved2 (self);
-#line 1512 "PublishingInterfaces.c"
+#line 1518 "PublishingInterfaces.c"
 }
 
 
@@ -1521,7 +1527,7 @@ void spit_publishing_publishable_reserved3 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 574 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved3 (self);
-#line 1525 "PublishingInterfaces.c"
+#line 1531 "PublishingInterfaces.c"
 }
 
 
@@ -1534,7 +1540,7 @@ void spit_publishing_publishable_reserved4 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 575 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved4 (self);
-#line 1538 "PublishingInterfaces.c"
+#line 1544 "PublishingInterfaces.c"
 }
 
 
@@ -1547,7 +1553,7 @@ void spit_publishing_publishable_reserved5 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 576 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved5 (self);
-#line 1551 "PublishingInterfaces.c"
+#line 1557 "PublishingInterfaces.c"
 }
 
 
@@ -1560,7 +1566,7 @@ void spit_publishing_publishable_reserved6 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 577 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved6 (self);
-#line 1564 "PublishingInterfaces.c"
+#line 1570 "PublishingInterfaces.c"
 }
 
 
@@ -1573,7 +1579,7 @@ void spit_publishing_publishable_reserved7 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 578 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved7 (self);
-#line 1577 "PublishingInterfaces.c"
+#line 1583 "PublishingInterfaces.c"
 }
 
 
@@ -1600,7 +1606,7 @@ static void spit_publishing_publishable_base_init (SpitPublishingPublishableIfac
 		iface->reserved6 = spit_publishing_publishable_real_reserved6;
 #line 521 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 		iface->reserved7 = spit_publishing_publishable_real_reserved7;
-#line 1604 "PublishingInterfaces.c"
+#line 1610 "PublishingInterfaces.c"
 	}
 }
 
@@ -1631,7 +1637,7 @@ SpitPublishingPublisher* spit_publishing_service_create_publisher (SpitPublishin
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (self), NULL);
 #line 591 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->create_publisher (self, host);
-#line 1635 "PublishingInterfaces.c"
+#line 1641 "PublishingInterfaces.c"
 }
 
 
@@ -1643,7 +1649,7 @@ SpitPublishingPublisherMediaType spit_publishing_service_get_supported_media (Sp
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (self), 0);
 #line 596 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->get_supported_media (self);
-#line 1647 "PublishingInterfaces.c"
+#line 1653 "PublishingInterfaces.c"
 }
 
 
@@ -1656,7 +1662,7 @@ void spit_publishing_service_reserved0 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 601 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved0 (self);
-#line 1660 "PublishingInterfaces.c"
+#line 1666 "PublishingInterfaces.c"
 }
 
 
@@ -1669,7 +1675,7 @@ void spit_publishing_service_reserved1 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 602 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved1 (self);
-#line 1673 "PublishingInterfaces.c"
+#line 1679 "PublishingInterfaces.c"
 }
 
 
@@ -1682,7 +1688,7 @@ void spit_publishing_service_reserved2 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 603 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved2 (self);
-#line 1686 "PublishingInterfaces.c"
+#line 1692 "PublishingInterfaces.c"
 }
 
 
@@ -1695,7 +1701,7 @@ void spit_publishing_service_reserved3 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 604 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved3 (self);
-#line 1699 "PublishingInterfaces.c"
+#line 1705 "PublishingInterfaces.c"
 }
 
 
@@ -1708,7 +1714,7 @@ void spit_publishing_service_reserved4 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 605 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved4 (self);
-#line 1712 "PublishingInterfaces.c"
+#line 1718 "PublishingInterfaces.c"
 }
 
 
@@ -1721,7 +1727,7 @@ void spit_publishing_service_reserved5 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 606 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved5 (self);
-#line 1725 "PublishingInterfaces.c"
+#line 1731 "PublishingInterfaces.c"
 }
 
 
@@ -1734,7 +1740,7 @@ void spit_publishing_service_reserved6 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 607 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved6 (self);
-#line 1738 "PublishingInterfaces.c"
+#line 1744 "PublishingInterfaces.c"
 }
 
 
@@ -1747,7 +1753,7 @@ void spit_publishing_service_reserved7 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 608 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved7 (self);
-#line 1751 "PublishingInterfaces.c"
+#line 1757 "PublishingInterfaces.c"
 }
 
 
@@ -1774,7 +1780,7 @@ static void spit_publishing_service_base_init (SpitPublishingServiceIface * ifac
 		iface->reserved6 = spit_publishing_service_real_reserved6;
 #line 586 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 		iface->reserved7 = spit_publishing_service_real_reserved7;
-#line 1778 "PublishingInterfaces.c"
+#line 1784 "PublishingInterfaces.c"
 	}
 }
 
@@ -1803,7 +1809,7 @@ void spit_publishing_authenticator_authenticate (SpitPublishingAuthenticator* se
 	g_return_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self));
 #line 615 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->authenticate (self);
-#line 1807 "PublishingInterfaces.c"
+#line 1813 "PublishingInterfaces.c"
 }
 
 
@@ -1812,7 +1818,7 @@ gboolean spit_publishing_authenticator_can_logout (SpitPublishingAuthenticator*
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self), FALSE);
 #line 616 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->can_logout (self);
-#line 1816 "PublishingInterfaces.c"
+#line 1822 "PublishingInterfaces.c"
 }
 
 
@@ -1821,7 +1827,7 @@ void spit_publishing_authenticator_logout (SpitPublishingAuthenticator* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self));
 #line 617 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->logout (self);
-#line 1825 "PublishingInterfaces.c"
+#line 1831 "PublishingInterfaces.c"
 }
 
 
@@ -1830,7 +1836,7 @@ void spit_publishing_authenticator_refresh (SpitPublishingAuthenticator* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self));
 #line 618 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->refresh (self);
-#line 1834 "PublishingInterfaces.c"
+#line 1840 "PublishingInterfaces.c"
 }
 
 
@@ -1839,7 +1845,7 @@ GHashTable* spit_publishing_authenticator_get_authentication_parameter (SpitPubl
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self), NULL);
 #line 620 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->get_authentication_parameter (self);
-#line 1843 "PublishingInterfaces.c"
+#line 1849 "PublishingInterfaces.c"
 }
 
 
@@ -1851,10 +1857,10 @@ static void spit_publishing_authenticator_base_init (SpitPublishingAuthenticator
 #line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 		initialized = TRUE;
 #line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
-		g_signal_new ("authenticated", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+		spit_publishing_authenticator_signals[SPIT_PUBLISHING_AUTHENTICATOR_AUTHENTICATED_SIGNAL] = g_signal_new ("authenticated", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
-		g_signal_new ("authentication_failed", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1858 "PublishingInterfaces.c"
+		spit_publishing_authenticator_signals[SPIT_PUBLISHING_AUTHENTICATOR_AUTHENTICATION_FAILED_SIGNAL] = g_signal_new ("authentication-failed", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 1864 "PublishingInterfaces.c"
 	}
 }
 
@@ -1877,7 +1883,7 @@ GeeList* spit_publishing_authenticator_factory_get_available_authenticators (Spi
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR_FACTORY (self), NULL);
 #line 628 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_AUTHENTICATOR_FACTORY_GET_INTERFACE (self)->get_available_authenticators (self);
-#line 1881 "PublishingInterfaces.c"
+#line 1887 "PublishingInterfaces.c"
 }
 
 
@@ -1886,7 +1892,7 @@ SpitPublishingAuthenticator* spit_publishing_authenticator_factory_create (SpitP
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR_FACTORY (self), NULL);
 #line 629 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_AUTHENTICATOR_FACTORY_GET_INTERFACE (self)->create (self, provider, host);
-#line 1890 "PublishingInterfaces.c"
+#line 1896 "PublishingInterfaces.c"
 }
 
 
@@ -1897,7 +1903,7 @@ static void spit_publishing_authenticator_factory_base_init (SpitPublishingAuthe
 	if (!initialized) {
 #line 623 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 		initialized = TRUE;
-#line 1901 "PublishingInterfaces.c"
+#line 1907 "PublishingInterfaces.c"
 	}
 }
 
diff --git a/src/plugins/SpitInterfaces.c b/src/plugins/SpitInterfaces.c
index 7c1d3cc..83c548d 100644
--- a/src/plugins/SpitInterfaces.c
+++ b/src/plugins/SpitInterfaces.c
@@ -1,4 +1,4 @@
-/* SpitInterfaces.c generated by valac 0.34.7, the Vala compiler
+/* SpitInterfaces.c generated by valac 0.36.6, the Vala compiler
  * generated from SpitInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -233,8 +233,8 @@ gint spit_negotiate_interfaces (gint min_host_interface, gint max_host_interface
 	gint result = 0;
 	gint _tmp0_ = 0;
 	gboolean _tmp1_ = FALSE;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala"
 	_tmp2_ = min_host_interface;
 #line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala"
@@ -245,8 +245,8 @@ gint spit_negotiate_interfaces (gint min_host_interface, gint max_host_interface
 		_tmp1_ = TRUE;
 #line 247 "SpitInterfaces.c"
 	} else {
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+		gint _tmp4_;
+		gint _tmp5_;
 #line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala"
 		_tmp4_ = max_host_interface;
 #line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala"
@@ -261,7 +261,7 @@ gint spit_negotiate_interfaces (gint min_host_interface, gint max_host_interface
 		_tmp0_ = SPIT_UNSUPPORTED_INTERFACE;
 #line 263 "SpitInterfaces.c"
 	} else {
-		gint _tmp6_ = 0;
+		gint _tmp6_;
 #line 48 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala"
 		_tmp6_ = plugin_interface;
 #line 48 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala"
@@ -284,11 +284,11 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 
 void spit_entry_point_params_copy (const SpitEntryPointParams* self, SpitEntryPointParams* dest) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
 #line 62 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala"
 	_tmp0_ = (*self).host_min_spit_interface;
 #line 62 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala"
@@ -576,7 +576,7 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) {
 #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala"
 	for (i = 0; i < length; i++) {
 #line 579 "SpitInterfaces.c"
-		GdkPixbuf* _tmp0_ = NULL;
+		GdkPixbuf* _tmp0_;
 #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala"
@@ -590,27 +590,27 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) {
 
 
 void spit_pluggable_info_copy (const SpitPluggableInfo* self, SpitPluggableInfo* dest) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	GdkPixbuf** _tmp17_ = NULL;
-	gint _tmp17__length1 = 0;
-	GdkPixbuf** _tmp18_ = NULL;
-	gint _tmp18__length1 = 0;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	const gchar* _tmp8_;
+	gchar* _tmp9_;
+	gboolean _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
+	const gchar* _tmp13_;
+	gchar* _tmp14_;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
+	GdkPixbuf** _tmp17_;
+	gint _tmp17__length1;
+	GdkPixbuf** _tmp18_;
+	gint _tmp18__length1;
 #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala"
 	_tmp0_ = (*self).version;
 #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala"
diff --git a/src/plugins/StandardHostInterface.c b/src/plugins/StandardHostInterface.c
index 1694df3..c1b8599 100644
--- a/src/plugins/StandardHostInterface.c
+++ b/src/plugins/StandardHostInterface.c
@@ -1,4 +1,4 @@
-/* StandardHostInterface.c generated by valac 0.34.7, the Vala compiler
+/* StandardHostInterface.c generated by valac 0.36.6, the Vala compiler
  * generated from StandardHostInterface.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -68,7 +68,7 @@ struct _PluginsStandardHostInterfacePrivate {
 
 
 static gpointer plugins_standard_host_interface_parent_class = NULL;
-static SpitHostInterfaceIface* plugins_standard_host_interface_spit_host_interface_parent_iface = NULL;
+static SpitHostInterfaceIface * plugins_standard_host_interface_spit_host_interface_parent_iface = NULL;
 
 GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST;
 #define PLUGINS_STANDARD_HOST_INTERFACE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterfacePrivate))
@@ -101,19 +101,19 @@ static void plugins_standard_host_interface_real_set_config_double (SpitHostInte
 void configuration_facade_set_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble val);
 static void plugins_standard_host_interface_real_unset_config_key (SpitHostInterface* base, const gchar* key);
 void configuration_facade_unset_plugin_key (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key);
-static void plugins_standard_host_interface_finalize (GObject* obj);
+static void plugins_standard_host_interface_finalize (GObject * obj);
 
 
 PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType object_type, SpitPluggable* pluggable, const gchar* config_domain) {
 	PluginsStandardHostInterface * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	SpitPluggable* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	SpitPluggable* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	SpitPluggable* _tmp7_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	SpitPluggable* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	SpitPluggable* _tmp5_;
+	GFile* _tmp6_;
+	SpitPluggable* _tmp7_;
 #line 15 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 	g_return_val_if_fail (SPIT_IS_PLUGGABLE (pluggable), NULL);
 #line 15 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
@@ -165,8 +165,8 @@ PluginsStandardHostInterface* plugins_standard_host_interface_new (SpitPluggable
 
 static gchar* plugins_standard_host_interface_parse_key (const gchar* id) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GQuark _tmp3_ = 0U;
 #line 25 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 	static GQuark _tmp2_label0 = 0;
@@ -191,7 +191,7 @@ static gchar* plugins_standard_host_interface_parse_key (const gchar* id) {
 #line 192 "StandardHostInterface.c"
 			default:
 			{
-				gchar* _tmp4_ = NULL;
+				gchar* _tmp4_;
 #line 27 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 				_tmp4_ = g_strdup ("facebook");
 #line 27 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
@@ -207,7 +207,7 @@ static gchar* plugins_standard_host_interface_parse_key (const gchar* id) {
 #line 208 "StandardHostInterface.c"
 			default:
 			{
-				gchar* _tmp5_ = NULL;
+				gchar* _tmp5_;
 #line 30 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 				_tmp5_ = g_strdup ("picasa");
 #line 30 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
@@ -223,7 +223,7 @@ static gchar* plugins_standard_host_interface_parse_key (const gchar* id) {
 #line 224 "StandardHostInterface.c"
 			default:
 			{
-				gchar* _tmp6_ = NULL;
+				gchar* _tmp6_;
 #line 33 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 				_tmp6_ = g_strdup ("flickr");
 #line 33 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
@@ -239,7 +239,7 @@ static gchar* plugins_standard_host_interface_parse_key (const gchar* id) {
 #line 240 "StandardHostInterface.c"
 			default:
 			{
-				gchar* _tmp7_ = NULL;
+				gchar* _tmp7_;
 #line 36 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 				_tmp7_ = g_strdup ("youtube");
 #line 36 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
@@ -255,8 +255,8 @@ static gchar* plugins_standard_host_interface_parse_key (const gchar* id) {
 #line 256 "StandardHostInterface.c"
 			default:
 			{
-				const gchar* _tmp8_ = NULL;
-				gchar* _tmp9_ = NULL;
+				const gchar* _tmp8_;
+				gchar* _tmp9_;
 #line 39 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 				_tmp8_ = id;
 #line 39 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
@@ -282,8 +282,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 static GFile* plugins_standard_host_interface_real_get_module_file (SpitHostInterface* base) {
 	PluginsStandardHostInterface * self;
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 43 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface);
 #line 44 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
@@ -301,14 +301,14 @@ static GFile* plugins_standard_host_interface_real_get_module_file (SpitHostInte
 static gboolean plugins_standard_host_interface_real_get_config_bool (SpitHostInterface* base, const gchar* key, gboolean def) {
 	PluginsStandardHostInterface * self;
 	gboolean result = FALSE;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp7_;
 #line 47 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface);
 #line 47 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
@@ -341,12 +341,12 @@ static gboolean plugins_standard_host_interface_real_get_config_bool (SpitHostIn
 
 static void plugins_standard_host_interface_real_set_config_bool (SpitHostInterface* base, const gchar* key, gboolean val) {
 	PluginsStandardHostInterface * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gboolean _tmp5_;
 #line 51 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface);
 #line 51 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
@@ -374,14 +374,14 @@ static void plugins_standard_host_interface_real_set_config_bool (SpitHostInterf
 static gint plugins_standard_host_interface_real_get_config_int (SpitHostInterface* base, const gchar* key, gint def) {
 	PluginsStandardHostInterface * self;
 	gint result = 0;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 #line 55 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface);
 #line 55 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
@@ -414,12 +414,12 @@ static gint plugins_standard_host_interface_real_get_config_int (SpitHostInterfa
 
 static void plugins_standard_host_interface_real_set_config_int (SpitHostInterface* base, const gchar* key, gint val) {
 	PluginsStandardHostInterface * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gint _tmp5_;
 #line 59 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface);
 #line 59 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
@@ -447,14 +447,14 @@ static void plugins_standard_host_interface_real_set_config_int (SpitHostInterfa
 static gchar* plugins_standard_host_interface_real_get_config_string (SpitHostInterface* base, const gchar* key, const gchar* def) {
 	PluginsStandardHostInterface * self;
 	gchar* result = NULL;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
 #line 63 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface);
 #line 63 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
@@ -487,12 +487,12 @@ static gchar* plugins_standard_host_interface_real_get_config_string (SpitHostIn
 
 static void plugins_standard_host_interface_real_set_config_string (SpitHostInterface* base, const gchar* key, const gchar* val) {
 	PluginsStandardHostInterface * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
 #line 67 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface);
 #line 67 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
@@ -520,14 +520,14 @@ static void plugins_standard_host_interface_real_set_config_string (SpitHostInte
 static gdouble plugins_standard_host_interface_real_get_config_double (SpitHostInterface* base, const gchar* key, gdouble def) {
 	PluginsStandardHostInterface * self;
 	gdouble result = 0.0;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
-	gdouble _tmp7_ = 0.0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
+	gdouble _tmp7_;
 #line 71 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface);
 #line 71 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
@@ -560,12 +560,12 @@ static gdouble plugins_standard_host_interface_real_get_config_double (SpitHostI
 
 static void plugins_standard_host_interface_real_set_config_double (SpitHostInterface* base, const gchar* key, gdouble val) {
 	PluginsStandardHostInterface * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gdouble _tmp5_ = 0.0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gdouble _tmp5_;
 #line 75 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface);
 #line 75 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
@@ -592,11 +592,11 @@ static void plugins_standard_host_interface_real_set_config_double (SpitHostInte
 
 static void plugins_standard_host_interface_real_unset_config_key (SpitHostInterface* base, const gchar* key) {
 	PluginsStandardHostInterface * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
 #line 79 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface);
 #line 79 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
@@ -634,25 +634,25 @@ static void plugins_standard_host_interface_spit_host_interface_interface_init (
 #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 	plugins_standard_host_interface_spit_host_interface_parent_iface = g_type_interface_peek_parent (iface);
 #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
-	iface->get_module_file = (GFile* (*)(SpitHostInterface*)) plugins_standard_host_interface_real_get_module_file;
+	iface->get_module_file = (GFile* (*) (SpitHostInterface *)) plugins_standard_host_interface_real_get_module_file;
 #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
-	iface->get_config_bool = (gboolean (*)(SpitHostInterface*, const gchar*, gboolean)) plugins_standard_host_interface_real_get_config_bool;
+	iface->get_config_bool = (gboolean (*) (SpitHostInterface *, const gchar*, gboolean)) plugins_standard_host_interface_real_get_config_bool;
 #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
-	iface->set_config_bool = (void (*)(SpitHostInterface*, const gchar*, gboolean)) plugins_standard_host_interface_real_set_config_bool;
+	iface->set_config_bool = (void (*) (SpitHostInterface *, const gchar*, gboolean)) plugins_standard_host_interface_real_set_config_bool;
 #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
-	iface->get_config_int = (gint (*)(SpitHostInterface*, const gchar*, gint)) plugins_standard_host_interface_real_get_config_int;
+	iface->get_config_int = (gint (*) (SpitHostInterface *, const gchar*, gint)) plugins_standard_host_interface_real_get_config_int;
 #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
-	iface->set_config_int = (void (*)(SpitHostInterface*, const gchar*, gint)) plugins_standard_host_interface_real_set_config_int;
+	iface->set_config_int = (void (*) (SpitHostInterface *, const gchar*, gint)) plugins_standard_host_interface_real_set_config_int;
 #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
-	iface->get_config_string = (gchar* (*)(SpitHostInterface*, const gchar*, const gchar*)) plugins_standard_host_interface_real_get_config_string;
+	iface->get_config_string = (gchar* (*) (SpitHostInterface *, const gchar*, const gchar*)) plugins_standard_host_interface_real_get_config_string;
 #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
-	iface->set_config_string = (void (*)(SpitHostInterface*, const gchar*, const gchar*)) plugins_standard_host_interface_real_set_config_string;
+	iface->set_config_string = (void (*) (SpitHostInterface *, const gchar*, const gchar*)) plugins_standard_host_interface_real_set_config_string;
 #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
-	iface->get_config_double = (gdouble (*)(SpitHostInterface*, const gchar*, gdouble)) plugins_standard_host_interface_real_get_config_double;
+	iface->get_config_double = (gdouble (*) (SpitHostInterface *, const gchar*, gdouble)) plugins_standard_host_interface_real_get_config_double;
 #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
-	iface->set_config_double = (void (*)(SpitHostInterface*, const gchar*, gdouble)) plugins_standard_host_interface_real_set_config_double;
+	iface->set_config_double = (void (*) (SpitHostInterface *, const gchar*, gdouble)) plugins_standard_host_interface_real_set_config_double;
 #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
-	iface->unset_config_key = (void (*)(SpitHostInterface*, const gchar*)) plugins_standard_host_interface_real_unset_config_key;
+	iface->unset_config_key = (void (*) (SpitHostInterface *, const gchar*)) plugins_standard_host_interface_real_unset_config_key;
 #line 657 "StandardHostInterface.c"
 }
 
@@ -664,7 +664,7 @@ static void plugins_standard_host_interface_instance_init (PluginsStandardHostIn
 }
 
 
-static void plugins_standard_host_interface_finalize (GObject* obj) {
+static void plugins_standard_host_interface_finalize (GObject * obj) {
 	PluginsStandardHostInterface * self;
 #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface);
diff --git a/src/plugins/TransitionsInterfaces.c b/src/plugins/TransitionsInterfaces.c
index 110b59a..0e06742 100644
--- a/src/plugins/TransitionsInterfaces.c
+++ b/src/plugins/TransitionsInterfaces.c
@@ -1,4 +1,4 @@
-/* TransitionsInterfaces.c generated by valac 0.34.7, the Vala compiler
+/* TransitionsInterfaces.c generated by valac 0.36.6, the Vala compiler
  * generated from TransitionsInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -228,19 +228,19 @@ GType spit_transitions_visuals_get_type (void) G_GNUC_CONST;
 #define SPIT_TRANSITIONS_VISUALS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_TRANSITIONS_TYPE_VISUALS, SpitTransitionsVisualsPrivate))
 enum  {
 	SPIT_TRANSITIONS_VISUALS_DUMMY_PROPERTY,
-	SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF,
-	SPIT_TRANSITIONS_VISUALS_FROM_POS,
-	SPIT_TRANSITIONS_VISUALS_TO_PIXBUF,
-	SPIT_TRANSITIONS_VISUALS_TO_POS,
-	SPIT_TRANSITIONS_VISUALS_BG_COLOR
+	SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY,
+	SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY,
+	SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY,
+	SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY,
+	SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY
 };
 SpitTransitionsVisuals* spit_transitions_visuals_new (GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color);
 SpitTransitionsVisuals* spit_transitions_visuals_construct (GType object_type, GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color);
 static void spit_transitions_visuals_set_from_pixbuf (SpitTransitionsVisuals* self, GdkPixbuf* value);
-static void spit_transitions_visuals_set_from_pos (SpitTransitionsVisuals* self, GdkRectangle* value);
+static void spit_transitions_visuals_set_from_pos (SpitTransitionsVisuals* self, GdkRectangle * value);
 static void spit_transitions_visuals_set_to_pixbuf (SpitTransitionsVisuals* self, GdkPixbuf* value);
-static void spit_transitions_visuals_set_to_pos (SpitTransitionsVisuals* self, GdkRectangle* value);
-static void spit_transitions_visuals_set_bg_color (SpitTransitionsVisuals* self, GdkRGBA* value);
+static void spit_transitions_visuals_set_to_pos (SpitTransitionsVisuals* self, GdkRectangle * value);
+static void spit_transitions_visuals_set_bg_color (SpitTransitionsVisuals* self, GdkRGBA * value);
 void spit_transitions_visuals_reserved0 (SpitTransitionsVisuals* self);
 static void spit_transitions_visuals_real_reserved0 (SpitTransitionsVisuals* self);
 void spit_transitions_visuals_reserved1 (SpitTransitionsVisuals* self);
@@ -258,22 +258,24 @@ static void spit_transitions_visuals_real_reserved6 (SpitTransitionsVisuals* sel
 void spit_transitions_visuals_reserved7 (SpitTransitionsVisuals* self);
 static void spit_transitions_visuals_real_reserved7 (SpitTransitionsVisuals* self);
 GdkPixbuf* spit_transitions_visuals_get_from_pixbuf (SpitTransitionsVisuals* self);
-void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRectangle* result);
+void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRectangle * result);
+static gboolean _cairo_rectangle_int_equal (const cairo_rectangle_int_t * s1, const cairo_rectangle_int_t * s2);
 GdkPixbuf* spit_transitions_visuals_get_to_pixbuf (SpitTransitionsVisuals* self);
-void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRectangle* result);
-void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGBA* result);
-static void spit_transitions_visuals_finalize (GObject* obj);
+void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRectangle * result);
+void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGBA * result);
+static gboolean _gdk_rgba_equal (const GdkRGBA * s1, const GdkRGBA * s2);
+static void spit_transitions_visuals_finalize (GObject * obj);
 static void _vala_spit_transitions_visuals_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_spit_transitions_visuals_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 GType spit_transitions_motion_get_type (void) G_GNUC_CONST;
 #define SPIT_TRANSITIONS_MOTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_TRANSITIONS_TYPE_MOTION, SpitTransitionsMotionPrivate))
 enum  {
 	SPIT_TRANSITIONS_MOTION_DUMMY_PROPERTY,
-	SPIT_TRANSITIONS_MOTION_DIRECTION,
-	SPIT_TRANSITIONS_MOTION_FPS,
-	SPIT_TRANSITIONS_MOTION_DURATION_MSEC,
-	SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES,
-	SPIT_TRANSITIONS_MOTION_TICK_MSEC
+	SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY,
+	SPIT_TRANSITIONS_MOTION_FPS_PROPERTY,
+	SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY,
+	SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES_PROPERTY,
+	SPIT_TRANSITIONS_MOTION_TICK_MSEC_PROPERTY
 };
 SpitTransitionsMotion* spit_transitions_motion_new (SpitTransitionsDirection direction, gint fps, gint duration_msec);
 SpitTransitionsMotion* spit_transitions_motion_construct (GType object_type, SpitTransitionsDirection direction, gint fps, gint duration_msec);
@@ -302,7 +304,7 @@ SpitTransitionsDirection spit_transitions_motion_get_direction (SpitTransitionsM
 gint spit_transitions_motion_get_fps (SpitTransitionsMotion* self);
 gint spit_transitions_motion_get_duration_msec (SpitTransitionsMotion* self);
 gint spit_transitions_motion_get_tick_msec (SpitTransitionsMotion* self);
-static void spit_transitions_motion_finalize (GObject* obj);
+static void spit_transitions_motion_finalize (GObject * obj);
 static void _vala_spit_transitions_motion_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_spit_transitions_motion_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 GType spit_pluggable_info_get_type (void) G_GNUC_CONST;
@@ -379,11 +381,11 @@ GType spit_transitions_direction_get_type (void) {
 
 SpitTransitionsVisuals* spit_transitions_visuals_construct (GType object_type, GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color) {
 	SpitTransitionsVisuals * self = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkRectangle _tmp1_ = {0};
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkRectangle _tmp3_ = {0};
-	GdkRGBA _tmp4_ = {0};
+	GdkPixbuf* _tmp0_;
+	GdkRectangle _tmp1_;
+	GdkPixbuf* _tmp2_;
+	GdkRectangle _tmp3_;
+	GdkRGBA _tmp4_;
 #line 94 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_val_if_fail ((from_pixbuf == NULL) || GDK_IS_PIXBUF (from_pixbuf), NULL);
 #line 94 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
@@ -418,14 +420,14 @@ SpitTransitionsVisuals* spit_transitions_visuals_construct (GType object_type, G
 	spit_transitions_visuals_set_bg_color (self, &_tmp4_);
 #line 94 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return self;
-#line 422 "TransitionsInterfaces.c"
+#line 424 "TransitionsInterfaces.c"
 }
 
 
 SpitTransitionsVisuals* spit_transitions_visuals_new (GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color) {
 #line 94 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return spit_transitions_visuals_construct (SPIT_TRANSITIONS_TYPE_VISUALS, from_pixbuf, from_pos, to_pixbuf, to_pos, bg_color);
-#line 429 "TransitionsInterfaces.c"
+#line 431 "TransitionsInterfaces.c"
 }
 
 
@@ -438,7 +440,7 @@ void spit_transitions_visuals_reserved0 (SpitTransitionsVisuals* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self));
 #line 106 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved0 (self);
-#line 442 "TransitionsInterfaces.c"
+#line 444 "TransitionsInterfaces.c"
 }
 
 
@@ -451,7 +453,7 @@ void spit_transitions_visuals_reserved1 (SpitTransitionsVisuals* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self));
 #line 107 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved1 (self);
-#line 455 "TransitionsInterfaces.c"
+#line 457 "TransitionsInterfaces.c"
 }
 
 
@@ -464,7 +466,7 @@ void spit_transitions_visuals_reserved2 (SpitTransitionsVisuals* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self));
 #line 108 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved2 (self);
-#line 468 "TransitionsInterfaces.c"
+#line 470 "TransitionsInterfaces.c"
 }
 
 
@@ -477,7 +479,7 @@ void spit_transitions_visuals_reserved3 (SpitTransitionsVisuals* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self));
 #line 109 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved3 (self);
-#line 481 "TransitionsInterfaces.c"
+#line 483 "TransitionsInterfaces.c"
 }
 
 
@@ -490,7 +492,7 @@ void spit_transitions_visuals_reserved4 (SpitTransitionsVisuals* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self));
 #line 110 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved4 (self);
-#line 494 "TransitionsInterfaces.c"
+#line 496 "TransitionsInterfaces.c"
 }
 
 
@@ -503,7 +505,7 @@ void spit_transitions_visuals_reserved5 (SpitTransitionsVisuals* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self));
 #line 111 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved5 (self);
-#line 507 "TransitionsInterfaces.c"
+#line 509 "TransitionsInterfaces.c"
 }
 
 
@@ -516,7 +518,7 @@ void spit_transitions_visuals_reserved6 (SpitTransitionsVisuals* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self));
 #line 112 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved6 (self);
-#line 520 "TransitionsInterfaces.c"
+#line 522 "TransitionsInterfaces.c"
 }
 
 
@@ -529,13 +531,13 @@ void spit_transitions_visuals_reserved7 (SpitTransitionsVisuals* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self));
 #line 113 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved7 (self);
-#line 533 "TransitionsInterfaces.c"
+#line 535 "TransitionsInterfaces.c"
 }
 
 
 GdkPixbuf* spit_transitions_visuals_get_from_pixbuf (SpitTransitionsVisuals* self) {
 	GdkPixbuf* result;
-	GdkPixbuf* _tmp0_ = NULL;
+	GdkPixbuf* _tmp0_;
 #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_val_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self), NULL);
 #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
@@ -544,38 +546,42 @@ GdkPixbuf* spit_transitions_visuals_get_from_pixbuf (SpitTransitionsVisuals* sel
 	result = _tmp0_;
 #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return result;
-#line 548 "TransitionsInterfaces.c"
+#line 550 "TransitionsInterfaces.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 555 "TransitionsInterfaces.c"
+#line 557 "TransitionsInterfaces.c"
 }
 
 
 static void spit_transitions_visuals_set_from_pixbuf (SpitTransitionsVisuals* self, GdkPixbuf* value) {
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
 #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self));
 #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	_tmp0_ = value;
+	if (spit_transitions_visuals_get_from_pixbuf (self) != value) {
+#line 566 "TransitionsInterfaces.c"
+		GdkPixbuf* _tmp0_;
+		GdkPixbuf* _tmp1_;
 #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	_g_object_unref0 (self->priv->_from_pixbuf);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		_g_object_unref0 (self->priv->_from_pixbuf);
 #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	self->priv->_from_pixbuf = _tmp1_;
+		self->priv->_from_pixbuf = _tmp1_;
 #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_notify ((GObject *) self, "from-pixbuf");
-#line 574 "TransitionsInterfaces.c"
+		g_object_notify ((GObject *) self, "from-pixbuf");
+#line 579 "TransitionsInterfaces.c"
+	}
 }
 
 
-void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRectangle* result) {
-	GdkRectangle _tmp0_ = {0};
+void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRectangle * result) {
+	GdkRectangle _tmp0_;
 #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self));
 #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
@@ -584,27 +590,81 @@ void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRec
 	*result = _tmp0_;
 #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return;
-#line 588 "TransitionsInterfaces.c"
+#line 594 "TransitionsInterfaces.c"
+}
+
+
+static gboolean _cairo_rectangle_int_equal (const cairo_rectangle_int_t * s1, const cairo_rectangle_int_t * s2) {
+#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+	if (s1 == s2) {
+#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		return TRUE;
+#line 603 "TransitionsInterfaces.c"
+	}
+#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+	if (s1 == NULL) {
+#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		return FALSE;
+#line 609 "TransitionsInterfaces.c"
+	}
+#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+	if (s2 == NULL) {
+#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		return FALSE;
+#line 615 "TransitionsInterfaces.c"
+	}
+#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+	if (s1->x != s2->x) {
+#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		return FALSE;
+#line 621 "TransitionsInterfaces.c"
+	}
+#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+	if (s1->y != s2->y) {
+#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		return FALSE;
+#line 627 "TransitionsInterfaces.c"
+	}
+#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+	if (s1->width != s2->width) {
+#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		return FALSE;
+#line 633 "TransitionsInterfaces.c"
+	}
+#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+	if (s1->height != s2->height) {
+#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		return FALSE;
+#line 639 "TransitionsInterfaces.c"
+	}
+#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+	return TRUE;
+#line 643 "TransitionsInterfaces.c"
 }
 
 
-static void spit_transitions_visuals_set_from_pos (SpitTransitionsVisuals* self, GdkRectangle* value) {
-	GdkRectangle _tmp0_ = {0};
+static void spit_transitions_visuals_set_from_pos (SpitTransitionsVisuals* self, GdkRectangle * value) {
+	GdkRectangle old_value;
 #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self));
 #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	_tmp0_ = *value;
+	if (_cairo_rectangle_int_equal (value, (spit_transitions_visuals_get_from_pos (self, &old_value), &old_value)) != TRUE) {
+#line 653 "TransitionsInterfaces.c"
+		GdkRectangle _tmp0_;
 #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	self->priv->_from_pos = _tmp0_;
+		_tmp0_ = *value;
 #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_notify ((GObject *) self, "from-pos");
-#line 602 "TransitionsInterfaces.c"
+		self->priv->_from_pos = _tmp0_;
+#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		g_object_notify ((GObject *) self, "from-pos");
+#line 661 "TransitionsInterfaces.c"
+	}
 }
 
 
 GdkPixbuf* spit_transitions_visuals_get_to_pixbuf (SpitTransitionsVisuals* self) {
 	GdkPixbuf* result;
-	GdkPixbuf* _tmp0_ = NULL;
+	GdkPixbuf* _tmp0_;
 #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_val_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self), NULL);
 #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
@@ -613,31 +673,35 @@ GdkPixbuf* spit_transitions_visuals_get_to_pixbuf (SpitTransitionsVisuals* self)
 	result = _tmp0_;
 #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return result;
-#line 617 "TransitionsInterfaces.c"
+#line 677 "TransitionsInterfaces.c"
 }
 
 
 static void spit_transitions_visuals_set_to_pixbuf (SpitTransitionsVisuals* self, GdkPixbuf* value) {
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
 #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self));
 #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	_tmp0_ = value;
+	if (spit_transitions_visuals_get_to_pixbuf (self) != value) {
+#line 686 "TransitionsInterfaces.c"
+		GdkPixbuf* _tmp0_;
+		GdkPixbuf* _tmp1_;
 #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	_g_object_unref0 (self->priv->_to_pixbuf);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		_g_object_unref0 (self->priv->_to_pixbuf);
 #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	self->priv->_to_pixbuf = _tmp1_;
+		self->priv->_to_pixbuf = _tmp1_;
 #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_notify ((GObject *) self, "to-pixbuf");
-#line 636 "TransitionsInterfaces.c"
+		g_object_notify ((GObject *) self, "to-pixbuf");
+#line 699 "TransitionsInterfaces.c"
+	}
 }
 
 
-void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRectangle* result) {
-	GdkRectangle _tmp0_ = {0};
+void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRectangle * result) {
+	GdkRectangle _tmp0_;
 #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self));
 #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
@@ -646,26 +710,31 @@ void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRecta
 	*result = _tmp0_;
 #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return;
-#line 650 "TransitionsInterfaces.c"
+#line 714 "TransitionsInterfaces.c"
 }
 
 
-static void spit_transitions_visuals_set_to_pos (SpitTransitionsVisuals* self, GdkRectangle* value) {
-	GdkRectangle _tmp0_ = {0};
+static void spit_transitions_visuals_set_to_pos (SpitTransitionsVisuals* self, GdkRectangle * value) {
+	GdkRectangle old_value;
 #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self));
 #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	_tmp0_ = *value;
+	if (_cairo_rectangle_int_equal (value, (spit_transitions_visuals_get_to_pos (self, &old_value), &old_value)) != TRUE) {
+#line 724 "TransitionsInterfaces.c"
+		GdkRectangle _tmp0_;
 #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	self->priv->_to_pos = _tmp0_;
+		_tmp0_ = *value;
 #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_notify ((GObject *) self, "to-pos");
-#line 664 "TransitionsInterfaces.c"
+		self->priv->_to_pos = _tmp0_;
+#line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		g_object_notify ((GObject *) self, "to-pos");
+#line 732 "TransitionsInterfaces.c"
+	}
 }
 
 
-void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGBA* result) {
-	GdkRGBA _tmp0_ = {0};
+void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGBA * result) {
+	GdkRGBA _tmp0_;
 #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self));
 #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
@@ -674,21 +743,75 @@ void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGB
 	*result = _tmp0_;
 #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return;
-#line 678 "TransitionsInterfaces.c"
+#line 747 "TransitionsInterfaces.c"
+}
+
+
+static gboolean _gdk_rgba_equal (const GdkRGBA * s1, const GdkRGBA * s2) {
+#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+	if (s1 == s2) {
+#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		return TRUE;
+#line 756 "TransitionsInterfaces.c"
+	}
+#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+	if (s1 == NULL) {
+#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		return FALSE;
+#line 762 "TransitionsInterfaces.c"
+	}
+#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+	if (s2 == NULL) {
+#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		return FALSE;
+#line 768 "TransitionsInterfaces.c"
+	}
+#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+	if (s1->red != s2->red) {
+#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		return FALSE;
+#line 774 "TransitionsInterfaces.c"
+	}
+#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+	if (s1->green != s2->green) {
+#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		return FALSE;
+#line 780 "TransitionsInterfaces.c"
+	}
+#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+	if (s1->blue != s2->blue) {
+#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		return FALSE;
+#line 786 "TransitionsInterfaces.c"
+	}
+#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+	if (s1->alpha != s2->alpha) {
+#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		return FALSE;
+#line 792 "TransitionsInterfaces.c"
+	}
+#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+	return TRUE;
+#line 796 "TransitionsInterfaces.c"
 }
 
 
-static void spit_transitions_visuals_set_bg_color (SpitTransitionsVisuals* self, GdkRGBA* value) {
-	GdkRGBA _tmp0_ = {0};
+static void spit_transitions_visuals_set_bg_color (SpitTransitionsVisuals* self, GdkRGBA * value) {
+	GdkRGBA old_value;
 #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self));
 #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	_tmp0_ = *value;
+	if (_gdk_rgba_equal (value, (spit_transitions_visuals_get_bg_color (self, &old_value), &old_value)) != TRUE) {
+#line 806 "TransitionsInterfaces.c"
+		GdkRGBA _tmp0_;
+#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		_tmp0_ = *value;
 #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	self->priv->_bg_color = _tmp0_;
+		self->priv->_bg_color = _tmp0_;
 #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_notify ((GObject *) self, "bg-color");
-#line 692 "TransitionsInterfaces.c"
+		g_object_notify ((GObject *) self, "bg-color");
+#line 814 "TransitionsInterfaces.c"
+	}
 }
 
 
@@ -698,77 +821,77 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_type_class_add_private (klass, sizeof (SpitTransitionsVisualsPrivate));
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	((SpitTransitionsVisualsClass *) klass)->reserved0 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved0;
+	((SpitTransitionsVisualsClass *) klass)->reserved0 = (void (*) (SpitTransitionsVisuals *)) spit_transitions_visuals_real_reserved0;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	((SpitTransitionsVisualsClass *) klass)->reserved1 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved1;
+	((SpitTransitionsVisualsClass *) klass)->reserved1 = (void (*) (SpitTransitionsVisuals *)) spit_transitions_visuals_real_reserved1;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	((SpitTransitionsVisualsClass *) klass)->reserved2 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved2;
+	((SpitTransitionsVisualsClass *) klass)->reserved2 = (void (*) (SpitTransitionsVisuals *)) spit_transitions_visuals_real_reserved2;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	((SpitTransitionsVisualsClass *) klass)->reserved3 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved3;
+	((SpitTransitionsVisualsClass *) klass)->reserved3 = (void (*) (SpitTransitionsVisuals *)) spit_transitions_visuals_real_reserved3;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	((SpitTransitionsVisualsClass *) klass)->reserved4 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved4;
+	((SpitTransitionsVisualsClass *) klass)->reserved4 = (void (*) (SpitTransitionsVisuals *)) spit_transitions_visuals_real_reserved4;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	((SpitTransitionsVisualsClass *) klass)->reserved5 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved5;
+	((SpitTransitionsVisualsClass *) klass)->reserved5 = (void (*) (SpitTransitionsVisuals *)) spit_transitions_visuals_real_reserved5;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	((SpitTransitionsVisualsClass *) klass)->reserved6 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved6;
+	((SpitTransitionsVisualsClass *) klass)->reserved6 = (void (*) (SpitTransitionsVisuals *)) spit_transitions_visuals_real_reserved6;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	((SpitTransitionsVisualsClass *) klass)->reserved7 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved7;
+	((SpitTransitionsVisualsClass *) klass)->reserved7 = (void (*) (SpitTransitionsVisuals *)) spit_transitions_visuals_real_reserved7;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_spit_transitions_visuals_get_property;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_spit_transitions_visuals_set_property;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	G_OBJECT_CLASS (klass)->finalize = spit_transitions_visuals_finalize;
-#line 723 "TransitionsInterfaces.c"
+#line 846 "TransitionsInterfaces.c"
 	/**
 	     * Returns the starting pixbuf (the pixbuf currently on the display).
 	     *
 	     * If transitioning from a blank screen, this will return null.
 	     */
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF, g_param_spec_object ("from-pixbuf", "from-pixbuf", "from-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 731 "TransitionsInterfaces.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY, g_param_spec_object ("from-pixbuf", "from-pixbuf", "from-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 854 "TransitionsInterfaces.c"
 	/**
 	     * Returns the position of the starting pixbuf on the display.
 	     *
 	     * If transitioning from a blank screen, this will be zeroed.
 	     */
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_POS, g_param_spec_boxed ("from-pos", "from-pos", "from-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 739 "TransitionsInterfaces.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY, g_param_spec_boxed ("from-pos", "from-pos", "from-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 862 "TransitionsInterfaces.c"
 	/**
 	     * Returns the ending pixbuf (the pixbuf that the transition should result in).
 	     *
 	     * If transitioning to a blank screen, this will return null.
 	     */
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_PIXBUF, g_param_spec_object ("to-pixbuf", "to-pixbuf", "to-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 747 "TransitionsInterfaces.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY, g_param_spec_object ("to-pixbuf", "to-pixbuf", "to-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 870 "TransitionsInterfaces.c"
 	/**
 	     * Returns the position of the ending pixbuf on the display.
 	     *
 	     * If transitioning to a blank screen, this will be zeroed.
 	     */
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_POS, g_param_spec_boxed ("to-pos", "to-pos", "to-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 755 "TransitionsInterfaces.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY, g_param_spec_boxed ("to-pos", "to-pos", "to-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 878 "TransitionsInterfaces.c"
 	/**
 	     * Returns the background color of the viewport.
 	     */
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_BG_COLOR, g_param_spec_boxed ("bg-color", "bg-color", "bg-color", gdk_rgba_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 761 "TransitionsInterfaces.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY, g_param_spec_boxed ("bg-color", "bg-color", "bg-color", gdk_rgba_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 884 "TransitionsInterfaces.c"
 }
 
 
 static void spit_transitions_visuals_instance_init (SpitTransitionsVisuals * self) {
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	self->priv = SPIT_TRANSITIONS_VISUALS_GET_PRIVATE (self);
-#line 768 "TransitionsInterfaces.c"
+#line 891 "TransitionsInterfaces.c"
 }
 
 
-static void spit_transitions_visuals_finalize (GObject* obj) {
+static void spit_transitions_visuals_finalize (GObject * obj) {
 	SpitTransitionsVisuals * self;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_TRANSITIONS_TYPE_VISUALS, SpitTransitionsVisuals);
@@ -778,7 +901,7 @@ static void spit_transitions_visuals_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->_to_pixbuf);
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	G_OBJECT_CLASS (spit_transitions_visuals_parent_class)->finalize (obj);
-#line 782 "TransitionsInterfaces.c"
+#line 905 "TransitionsInterfaces.c"
 }
 
 
@@ -814,63 +937,63 @@ static void _vala_spit_transitions_visuals_get_property (GObject * object, guint
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	switch (property_id) {
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF:
+		case SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY:
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		g_value_set_object (value, spit_transitions_visuals_get_from_pixbuf (self));
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_VISUALS_FROM_POS:
-#line 825 "TransitionsInterfaces.c"
+		case SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY:
+#line 948 "TransitionsInterfaces.c"
 		{
 			GdkRectangle boxed;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 			spit_transitions_visuals_get_from_pos (self, &boxed);
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 			g_value_set_boxed (value, &boxed);
-#line 832 "TransitionsInterfaces.c"
+#line 955 "TransitionsInterfaces.c"
 		}
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_VISUALS_TO_PIXBUF:
+		case SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY:
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		g_value_set_object (value, spit_transitions_visuals_get_to_pixbuf (self));
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_VISUALS_TO_POS:
-#line 844 "TransitionsInterfaces.c"
+		case SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY:
+#line 967 "TransitionsInterfaces.c"
 		{
 			GdkRectangle boxed;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 			spit_transitions_visuals_get_to_pos (self, &boxed);
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 			g_value_set_boxed (value, &boxed);
-#line 851 "TransitionsInterfaces.c"
+#line 974 "TransitionsInterfaces.c"
 		}
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_VISUALS_BG_COLOR:
-#line 857 "TransitionsInterfaces.c"
+		case SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY:
+#line 980 "TransitionsInterfaces.c"
 		{
 			GdkRGBA boxed;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 			spit_transitions_visuals_get_bg_color (self, &boxed);
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 			g_value_set_boxed (value, &boxed);
-#line 864 "TransitionsInterfaces.c"
+#line 987 "TransitionsInterfaces.c"
 		}
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
-#line 868 "TransitionsInterfaces.c"
+#line 991 "TransitionsInterfaces.c"
 		default:
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
-#line 874 "TransitionsInterfaces.c"
+#line 997 "TransitionsInterfaces.c"
 	}
 }
 
@@ -881,51 +1004,51 @@ static void _vala_spit_transitions_visuals_set_property (GObject * object, guint
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	switch (property_id) {
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF:
+		case SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY:
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		spit_transitions_visuals_set_from_pixbuf (self, g_value_get_object (value));
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_VISUALS_FROM_POS:
+		case SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY:
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		spit_transitions_visuals_set_from_pos (self, g_value_get_boxed (value));
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_VISUALS_TO_PIXBUF:
+		case SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY:
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		spit_transitions_visuals_set_to_pixbuf (self, g_value_get_object (value));
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_VISUALS_TO_POS:
+		case SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY:
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		spit_transitions_visuals_set_to_pos (self, g_value_get_boxed (value));
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_VISUALS_BG_COLOR:
+		case SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY:
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		spit_transitions_visuals_set_bg_color (self, g_value_get_boxed (value));
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
-#line 914 "TransitionsInterfaces.c"
+#line 1037 "TransitionsInterfaces.c"
 		default:
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
-#line 920 "TransitionsInterfaces.c"
+#line 1043 "TransitionsInterfaces.c"
 	}
 }
 
 
 SpitTransitionsMotion* spit_transitions_motion_construct (GType object_type, SpitTransitionsDirection direction, gint fps, gint duration_msec) {
 	SpitTransitionsMotion * self = NULL;
-	SpitTransitionsDirection _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	SpitTransitionsDirection _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 157 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	self = (SpitTransitionsMotion*) g_object_new (object_type, NULL);
 #line 158 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
@@ -942,14 +1065,14 @@ SpitTransitionsMotion* spit_transitions_motion_construct (GType object_type, Spi
 	spit_transitions_motion_set_duration_msec (self, _tmp2_);
 #line 157 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return self;
-#line 946 "TransitionsInterfaces.c"
+#line 1069 "TransitionsInterfaces.c"
 }
 
 
 SpitTransitionsMotion* spit_transitions_motion_new (SpitTransitionsDirection direction, gint fps, gint duration_msec) {
 #line 157 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return spit_transitions_motion_construct (SPIT_TRANSITIONS_TYPE_MOTION, direction, fps, duration_msec);
-#line 953 "TransitionsInterfaces.c"
+#line 1076 "TransitionsInterfaces.c"
 }
 
 
@@ -959,9 +1082,9 @@ SpitTransitionsMotion* spit_transitions_motion_new (SpitTransitionsDirection dir
      */
 gdouble spit_transitions_motion_get_alpha (SpitTransitionsMotion* self, gint frame_number) {
 	gdouble result = 0.0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 167 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0.0);
 #line 168 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
@@ -974,7 +1097,7 @@ gdouble spit_transitions_motion_get_alpha (SpitTransitionsMotion* self, gint fra
 	result = ((gdouble) _tmp0_) / ((gdouble) _tmp2_);
 #line 168 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return result;
-#line 978 "TransitionsInterfaces.c"
+#line 1101 "TransitionsInterfaces.c"
 }
 
 
@@ -987,7 +1110,7 @@ void spit_transitions_motion_reserved0 (SpitTransitionsMotion* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self));
 #line 174 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved0 (self);
-#line 991 "TransitionsInterfaces.c"
+#line 1114 "TransitionsInterfaces.c"
 }
 
 
@@ -1000,7 +1123,7 @@ void spit_transitions_motion_reserved1 (SpitTransitionsMotion* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self));
 #line 175 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved1 (self);
-#line 1004 "TransitionsInterfaces.c"
+#line 1127 "TransitionsInterfaces.c"
 }
 
 
@@ -1013,7 +1136,7 @@ void spit_transitions_motion_reserved2 (SpitTransitionsMotion* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self));
 #line 176 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved2 (self);
-#line 1017 "TransitionsInterfaces.c"
+#line 1140 "TransitionsInterfaces.c"
 }
 
 
@@ -1026,7 +1149,7 @@ void spit_transitions_motion_reserved3 (SpitTransitionsMotion* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self));
 #line 177 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved3 (self);
-#line 1030 "TransitionsInterfaces.c"
+#line 1153 "TransitionsInterfaces.c"
 }
 
 
@@ -1039,7 +1162,7 @@ void spit_transitions_motion_reserved4 (SpitTransitionsMotion* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self));
 #line 178 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved4 (self);
-#line 1043 "TransitionsInterfaces.c"
+#line 1166 "TransitionsInterfaces.c"
 }
 
 
@@ -1052,7 +1175,7 @@ void spit_transitions_motion_reserved5 (SpitTransitionsMotion* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self));
 #line 179 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved5 (self);
-#line 1056 "TransitionsInterfaces.c"
+#line 1179 "TransitionsInterfaces.c"
 }
 
 
@@ -1065,7 +1188,7 @@ void spit_transitions_motion_reserved6 (SpitTransitionsMotion* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self));
 #line 180 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved6 (self);
-#line 1069 "TransitionsInterfaces.c"
+#line 1192 "TransitionsInterfaces.c"
 }
 
 
@@ -1078,13 +1201,13 @@ void spit_transitions_motion_reserved7 (SpitTransitionsMotion* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self));
 #line 181 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved7 (self);
-#line 1082 "TransitionsInterfaces.c"
+#line 1205 "TransitionsInterfaces.c"
 }
 
 
 SpitTransitionsDirection spit_transitions_motion_get_direction (SpitTransitionsMotion* self) {
 	SpitTransitionsDirection result;
-	SpitTransitionsDirection _tmp0_ = 0;
+	SpitTransitionsDirection _tmp0_;
 #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0);
 #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
@@ -1093,27 +1216,31 @@ SpitTransitionsDirection spit_transitions_motion_get_direction (SpitTransitionsM
 	result = _tmp0_;
 #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return result;
-#line 1097 "TransitionsInterfaces.c"
+#line 1220 "TransitionsInterfaces.c"
 }
 
 
 static void spit_transitions_motion_set_direction (SpitTransitionsMotion* self, SpitTransitionsDirection value) {
-	SpitTransitionsDirection _tmp0_ = 0;
 #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self));
 #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	_tmp0_ = value;
+	if (spit_transitions_motion_get_direction (self) != value) {
+#line 1229 "TransitionsInterfaces.c"
+		SpitTransitionsDirection _tmp0_;
 #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	self->priv->_direction = _tmp0_;
+		_tmp0_ = value;
 #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_notify ((GObject *) self, "direction");
-#line 1111 "TransitionsInterfaces.c"
+		self->priv->_direction = _tmp0_;
+#line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		g_object_notify ((GObject *) self, "direction");
+#line 1237 "TransitionsInterfaces.c"
+	}
 }
 
 
 gint spit_transitions_motion_get_fps (SpitTransitionsMotion* self) {
 	gint result;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0);
 #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
@@ -1122,27 +1249,31 @@ gint spit_transitions_motion_get_fps (SpitTransitionsMotion* self) {
 	result = _tmp0_;
 #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return result;
-#line 1126 "TransitionsInterfaces.c"
+#line 1253 "TransitionsInterfaces.c"
 }
 
 
 static void spit_transitions_motion_set_fps (SpitTransitionsMotion* self, gint value) {
-	gint _tmp0_ = 0;
 #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self));
 #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	_tmp0_ = value;
+	if (spit_transitions_motion_get_fps (self) != value) {
+#line 1262 "TransitionsInterfaces.c"
+		gint _tmp0_;
 #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	self->priv->_fps = _tmp0_;
+		_tmp0_ = value;
 #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_notify ((GObject *) self, "fps");
-#line 1140 "TransitionsInterfaces.c"
+		self->priv->_fps = _tmp0_;
+#line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		g_object_notify ((GObject *) self, "fps");
+#line 1270 "TransitionsInterfaces.c"
+	}
 }
 
 
 gint spit_transitions_motion_get_duration_msec (SpitTransitionsMotion* self) {
 	gint result;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0);
 #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
@@ -1151,28 +1282,32 @@ gint spit_transitions_motion_get_duration_msec (SpitTransitionsMotion* self) {
 	result = _tmp0_;
 #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return result;
-#line 1155 "TransitionsInterfaces.c"
+#line 1286 "TransitionsInterfaces.c"
 }
 
 
 static void spit_transitions_motion_set_duration_msec (SpitTransitionsMotion* self, gint value) {
-	gint _tmp0_ = 0;
 #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self));
 #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	_tmp0_ = value;
+	if (spit_transitions_motion_get_duration_msec (self) != value) {
+#line 1295 "TransitionsInterfaces.c"
+		gint _tmp0_;
 #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	self->priv->_duration_msec = _tmp0_;
+		_tmp0_ = value;
 #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_notify ((GObject *) self, "duration-msec");
-#line 1169 "TransitionsInterfaces.c"
+		self->priv->_duration_msec = _tmp0_;
+#line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
+		g_object_notify ((GObject *) self, "duration-msec");
+#line 1303 "TransitionsInterfaces.c"
+	}
 }
 
 
 gint spit_transitions_motion_get_total_frames (SpitTransitionsMotion* self) {
 	gint result;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 143 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0);
 #line 144 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
@@ -1183,13 +1318,13 @@ gint spit_transitions_motion_get_total_frames (SpitTransitionsMotion* self) {
 	result = (gint) (((gdouble) _tmp0_) * (((gdouble) _tmp1_) / 1000.0));
 #line 144 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return result;
-#line 1187 "TransitionsInterfaces.c"
+#line 1322 "TransitionsInterfaces.c"
 }
 
 
 gint spit_transitions_motion_get_tick_msec (SpitTransitionsMotion* self) {
 	gint result;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 152 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0);
 #line 153 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
@@ -1198,7 +1333,7 @@ gint spit_transitions_motion_get_tick_msec (SpitTransitionsMotion* self) {
 	result = (gint) (1000.0 / ((gdouble) _tmp0_));
 #line 153 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return result;
-#line 1202 "TransitionsInterfaces.c"
+#line 1337 "TransitionsInterfaces.c"
 }
 
 
@@ -1208,76 +1343,76 @@ static void spit_transitions_motion_class_init (SpitTransitionsMotionClass * kla
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	g_type_class_add_private (klass, sizeof (SpitTransitionsMotionPrivate));
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	((SpitTransitionsMotionClass *) klass)->reserved0 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved0;
+	((SpitTransitionsMotionClass *) klass)->reserved0 = (void (*) (SpitTransitionsMotion *)) spit_transitions_motion_real_reserved0;
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	((SpitTransitionsMotionClass *) klass)->reserved1 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved1;
+	((SpitTransitionsMotionClass *) klass)->reserved1 = (void (*) (SpitTransitionsMotion *)) spit_transitions_motion_real_reserved1;
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	((SpitTransitionsMotionClass *) klass)->reserved2 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved2;
+	((SpitTransitionsMotionClass *) klass)->reserved2 = (void (*) (SpitTransitionsMotion *)) spit_transitions_motion_real_reserved2;
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	((SpitTransitionsMotionClass *) klass)->reserved3 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved3;
+	((SpitTransitionsMotionClass *) klass)->reserved3 = (void (*) (SpitTransitionsMotion *)) spit_transitions_motion_real_reserved3;
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	((SpitTransitionsMotionClass *) klass)->reserved4 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved4;
+	((SpitTransitionsMotionClass *) klass)->reserved4 = (void (*) (SpitTransitionsMotion *)) spit_transitions_motion_real_reserved4;
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	((SpitTransitionsMotionClass *) klass)->reserved5 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved5;
+	((SpitTransitionsMotionClass *) klass)->reserved5 = (void (*) (SpitTransitionsMotion *)) spit_transitions_motion_real_reserved5;
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	((SpitTransitionsMotionClass *) klass)->reserved6 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved6;
+	((SpitTransitionsMotionClass *) klass)->reserved6 = (void (*) (SpitTransitionsMotion *)) spit_transitions_motion_real_reserved6;
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	((SpitTransitionsMotionClass *) klass)->reserved7 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved7;
+	((SpitTransitionsMotionClass *) klass)->reserved7 = (void (*) (SpitTransitionsMotion *)) spit_transitions_motion_real_reserved7;
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_spit_transitions_motion_get_property;
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_spit_transitions_motion_set_property;
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	G_OBJECT_CLASS (klass)->finalize = spit_transitions_motion_finalize;
-#line 1233 "TransitionsInterfaces.c"
+#line 1368 "TransitionsInterfaces.c"
 	/**
 	     * Returns the direction the transition should occur in (if pertinent to the {@link Effect}.
 	     */
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_DIRECTION, g_param_spec_enum ("direction", "direction", "direction", SPIT_TRANSITIONS_TYPE_DIRECTION, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 1239 "TransitionsInterfaces.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY, g_param_spec_enum ("direction", "direction", "direction", SPIT_TRANSITIONS_TYPE_DIRECTION, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 1374 "TransitionsInterfaces.c"
 	/**
 	     * Returns the frames per second of the {@link Effect}.
 	     */
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_FPS, g_param_spec_int ("fps", "fps", "fps", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 1245 "TransitionsInterfaces.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_FPS_PROPERTY, g_param_spec_int ("fps", "fps", "fps", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 1380 "TransitionsInterfaces.c"
 	/**
 	     * Returns the amount of time the transition should take (in milliseconds).
 	     */
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_DURATION_MSEC, g_param_spec_int ("duration-msec", "duration-msec", "duration-msec", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 1251 "TransitionsInterfaces.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY, g_param_spec_int ("duration-msec", "duration-msec", "duration-msec", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 1386 "TransitionsInterfaces.c"
 	/**
 	     * Returns the number of frames that should be required to perform the transition in the
 	     * expected {@link duration_msec}.
 	     */
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES, g_param_spec_int ("total-frames", "total-frames", "total-frames", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 1258 "TransitionsInterfaces.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES_PROPERTY, g_param_spec_int ("total-frames", "total-frames", "total-frames", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 1393 "TransitionsInterfaces.c"
 	/**
 	     * Returns the approximate time between each frame draw (in milliseconds).
 	     */
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_TICK_MSEC, g_param_spec_int ("tick-msec", "tick-msec", "tick-msec", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 1264 "TransitionsInterfaces.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_TICK_MSEC_PROPERTY, g_param_spec_int ("tick-msec", "tick-msec", "tick-msec", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 1399 "TransitionsInterfaces.c"
 }
 
 
 static void spit_transitions_motion_instance_init (SpitTransitionsMotion * self) {
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	self->priv = SPIT_TRANSITIONS_MOTION_GET_PRIVATE (self);
-#line 1271 "TransitionsInterfaces.c"
+#line 1406 "TransitionsInterfaces.c"
 }
 
 
-static void spit_transitions_motion_finalize (GObject* obj) {
+static void spit_transitions_motion_finalize (GObject * obj) {
 	SpitTransitionsMotion * self;
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_TRANSITIONS_TYPE_MOTION, SpitTransitionsMotion);
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	G_OBJECT_CLASS (spit_transitions_motion_parent_class)->finalize (obj);
-#line 1281 "TransitionsInterfaces.c"
+#line 1416 "TransitionsInterfaces.c"
 }
 
 
@@ -1305,42 +1440,42 @@ static void _vala_spit_transitions_motion_get_property (GObject * object, guint
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	switch (property_id) {
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_MOTION_DIRECTION:
+		case SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY:
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		g_value_set_enum (value, spit_transitions_motion_get_direction (self));
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_MOTION_FPS:
+		case SPIT_TRANSITIONS_MOTION_FPS_PROPERTY:
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		g_value_set_int (value, spit_transitions_motion_get_fps (self));
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_MOTION_DURATION_MSEC:
+		case SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY:
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		g_value_set_int (value, spit_transitions_motion_get_duration_msec (self));
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES:
+		case SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES_PROPERTY:
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		g_value_set_int (value, spit_transitions_motion_get_total_frames (self));
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_MOTION_TICK_MSEC:
+		case SPIT_TRANSITIONS_MOTION_TICK_MSEC_PROPERTY:
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		g_value_set_int (value, spit_transitions_motion_get_tick_msec (self));
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
-#line 1338 "TransitionsInterfaces.c"
+#line 1473 "TransitionsInterfaces.c"
 		default:
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
-#line 1344 "TransitionsInterfaces.c"
+#line 1479 "TransitionsInterfaces.c"
 	}
 }
 
@@ -1351,30 +1486,30 @@ static void _vala_spit_transitions_motion_set_property (GObject * object, guint
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	switch (property_id) {
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_MOTION_DIRECTION:
+		case SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY:
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		spit_transitions_motion_set_direction (self, g_value_get_enum (value));
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_MOTION_FPS:
+		case SPIT_TRANSITIONS_MOTION_FPS_PROPERTY:
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		spit_transitions_motion_set_fps (self, g_value_get_int (value));
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-		case SPIT_TRANSITIONS_MOTION_DURATION_MSEC:
+		case SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY:
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		spit_transitions_motion_set_duration_msec (self, g_value_get_int (value));
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
-#line 1372 "TransitionsInterfaces.c"
+#line 1507 "TransitionsInterfaces.c"
 		default:
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		break;
-#line 1378 "TransitionsInterfaces.c"
+#line 1513 "TransitionsInterfaces.c"
 	}
 }
 
@@ -1387,7 +1522,7 @@ SpitTransitionsEffect* spit_transitions_descriptor_create (SpitTransitionsDescri
 	g_return_val_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self), NULL);
 #line 191 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->create (self, host);
-#line 1391 "TransitionsInterfaces.c"
+#line 1526 "TransitionsInterfaces.c"
 }
 
 
@@ -1400,7 +1535,7 @@ void spit_transitions_descriptor_reserved0 (SpitTransitionsDescriptor* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self));
 #line 196 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved0 (self);
-#line 1404 "TransitionsInterfaces.c"
+#line 1539 "TransitionsInterfaces.c"
 }
 
 
@@ -1413,7 +1548,7 @@ void spit_transitions_descriptor_reserved1 (SpitTransitionsDescriptor* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self));
 #line 197 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved1 (self);
-#line 1417 "TransitionsInterfaces.c"
+#line 1552 "TransitionsInterfaces.c"
 }
 
 
@@ -1426,7 +1561,7 @@ void spit_transitions_descriptor_reserved2 (SpitTransitionsDescriptor* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self));
 #line 198 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved2 (self);
-#line 1430 "TransitionsInterfaces.c"
+#line 1565 "TransitionsInterfaces.c"
 }
 
 
@@ -1439,7 +1574,7 @@ void spit_transitions_descriptor_reserved3 (SpitTransitionsDescriptor* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self));
 #line 199 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved3 (self);
-#line 1443 "TransitionsInterfaces.c"
+#line 1578 "TransitionsInterfaces.c"
 }
 
 
@@ -1452,7 +1587,7 @@ void spit_transitions_descriptor_reserved4 (SpitTransitionsDescriptor* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self));
 #line 200 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved4 (self);
-#line 1456 "TransitionsInterfaces.c"
+#line 1591 "TransitionsInterfaces.c"
 }
 
 
@@ -1465,7 +1600,7 @@ void spit_transitions_descriptor_reserved5 (SpitTransitionsDescriptor* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self));
 #line 201 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved5 (self);
-#line 1469 "TransitionsInterfaces.c"
+#line 1604 "TransitionsInterfaces.c"
 }
 
 
@@ -1478,7 +1613,7 @@ void spit_transitions_descriptor_reserved6 (SpitTransitionsDescriptor* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self));
 #line 202 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved6 (self);
-#line 1482 "TransitionsInterfaces.c"
+#line 1617 "TransitionsInterfaces.c"
 }
 
 
@@ -1491,7 +1626,7 @@ void spit_transitions_descriptor_reserved7 (SpitTransitionsDescriptor* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self));
 #line 203 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved7 (self);
-#line 1495 "TransitionsInterfaces.c"
+#line 1630 "TransitionsInterfaces.c"
 }
 
 
@@ -1518,7 +1653,7 @@ static void spit_transitions_descriptor_base_init (SpitTransitionsDescriptorIfac
 		iface->reserved6 = spit_transitions_descriptor_real_reserved6;
 #line 187 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		iface->reserved7 = spit_transitions_descriptor_real_reserved7;
-#line 1522 "TransitionsInterfaces.c"
+#line 1657 "TransitionsInterfaces.c"
 	}
 }
 
@@ -1555,7 +1690,7 @@ void spit_transitions_effect_get_fps (SpitTransitionsEffect* self, gint* desired
 	g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self));
 #line 240 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->get_fps (self, desired_fps, min_fps);
-#line 1559 "TransitionsInterfaces.c"
+#line 1694 "TransitionsInterfaces.c"
 }
 
 
@@ -1569,7 +1704,7 @@ void spit_transitions_effect_start (SpitTransitionsEffect* self, SpitTransitions
 	g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self));
 #line 247 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->start (self, visuals, motion);
-#line 1573 "TransitionsInterfaces.c"
+#line 1708 "TransitionsInterfaces.c"
 }
 
 
@@ -1581,7 +1716,7 @@ gboolean spit_transitions_effect_needs_clear_background (SpitTransitionsEffect*
 	g_return_val_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self), FALSE);
 #line 252 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	return SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->needs_clear_background (self);
-#line 1585 "TransitionsInterfaces.c"
+#line 1720 "TransitionsInterfaces.c"
 }
 
 
@@ -1601,7 +1736,7 @@ void spit_transitions_effect_paint (SpitTransitionsEffect* self, SpitTransitions
 	g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self));
 #line 265 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->paint (self, visuals, motion, ctx, width, height, frame_number);
-#line 1605 "TransitionsInterfaces.c"
+#line 1740 "TransitionsInterfaces.c"
 }
 
 
@@ -1619,7 +1754,7 @@ void spit_transitions_effect_advance (SpitTransitionsEffect* self, SpitTransitio
 	g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self));
 #line 277 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->advance (self, visuals, motion, frame_number);
-#line 1623 "TransitionsInterfaces.c"
+#line 1758 "TransitionsInterfaces.c"
 }
 
 
@@ -1633,7 +1768,7 @@ void spit_transitions_effect_cancel (SpitTransitionsEffect* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self));
 #line 284 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->cancel (self);
-#line 1637 "TransitionsInterfaces.c"
+#line 1772 "TransitionsInterfaces.c"
 }
 
 
@@ -1646,7 +1781,7 @@ void spit_transitions_effect_reserved0 (SpitTransitionsEffect* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self));
 #line 289 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved0 (self);
-#line 1650 "TransitionsInterfaces.c"
+#line 1785 "TransitionsInterfaces.c"
 }
 
 
@@ -1659,7 +1794,7 @@ void spit_transitions_effect_reserved1 (SpitTransitionsEffect* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self));
 #line 290 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved1 (self);
-#line 1663 "TransitionsInterfaces.c"
+#line 1798 "TransitionsInterfaces.c"
 }
 
 
@@ -1672,7 +1807,7 @@ void spit_transitions_effect_reserved2 (SpitTransitionsEffect* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self));
 #line 291 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved2 (self);
-#line 1676 "TransitionsInterfaces.c"
+#line 1811 "TransitionsInterfaces.c"
 }
 
 
@@ -1685,7 +1820,7 @@ void spit_transitions_effect_reserved3 (SpitTransitionsEffect* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self));
 #line 292 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved3 (self);
-#line 1689 "TransitionsInterfaces.c"
+#line 1824 "TransitionsInterfaces.c"
 }
 
 
@@ -1698,7 +1833,7 @@ void spit_transitions_effect_reserved4 (SpitTransitionsEffect* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self));
 #line 293 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved4 (self);
-#line 1702 "TransitionsInterfaces.c"
+#line 1837 "TransitionsInterfaces.c"
 }
 
 
@@ -1711,7 +1846,7 @@ void spit_transitions_effect_reserved5 (SpitTransitionsEffect* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self));
 #line 294 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved5 (self);
-#line 1715 "TransitionsInterfaces.c"
+#line 1850 "TransitionsInterfaces.c"
 }
 
 
@@ -1724,7 +1859,7 @@ void spit_transitions_effect_reserved6 (SpitTransitionsEffect* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self));
 #line 295 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved6 (self);
-#line 1728 "TransitionsInterfaces.c"
+#line 1863 "TransitionsInterfaces.c"
 }
 
 
@@ -1737,7 +1872,7 @@ void spit_transitions_effect_reserved7 (SpitTransitionsEffect* self) {
 	g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self));
 #line 296 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 	SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved7 (self);
-#line 1741 "TransitionsInterfaces.c"
+#line 1876 "TransitionsInterfaces.c"
 }
 
 
@@ -1764,7 +1899,7 @@ static void spit_transitions_effect_base_init (SpitTransitionsEffectIface * ifac
 		iface->reserved6 = spit_transitions_effect_real_reserved6;
 #line 229 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
 		iface->reserved7 = spit_transitions_effect_real_reserved7;
-#line 1768 "TransitionsInterfaces.c"
+#line 1903 "TransitionsInterfaces.c"
 	}
 }
 
diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c
index ec2098d..04da15d 100644
--- a/src/publishing/APIGlue.c
+++ b/src/publishing/APIGlue.c
@@ -1,4 +1,4 @@
-/* APIGlue.c generated by valac 0.34.7, the Vala compiler
+/* APIGlue.c generated by valac 0.36.6, the Vala compiler
  * generated from APIGlue.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -269,7 +269,7 @@ static gpointer publishing_glue_media_source_publishable_wrapper_parent_class =
 static gint publishing_glue_media_source_publishable_wrapper_name_ticker;
 static gint publishing_glue_media_source_publishable_wrapper_name_ticker = 0;
 extern TagSourceCollection* tag_global;
-static SpitPublishingPublishableIface* publishing_glue_media_source_publishable_wrapper_spit_publishing_publishable_parent_iface = NULL;
+static SpitPublishingPublishableIface * publishing_glue_media_source_publishable_wrapper_spit_publishing_publishable_parent_iface = NULL;
 
 GType publishing_glue_media_source_publishable_wrapper_get_type (void) G_GNUC_CONST;
 GType data_object_get_type (void) G_GNUC_CONST;
@@ -312,7 +312,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 gchar* data_object_get_name (DataObject* self);
 GType video_source_get_type (void) G_GNUC_CONST;
 GType video_get_type (void) G_GNUC_CONST;
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
 GFile* media_source_get_file (MediaSource* self);
 void video_export (Video* self, GFile* dest_file, GError** error);
 static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishing_name (SpitPublishingPublishable* base);
@@ -331,13 +331,13 @@ GType database_source_collection_get_type (void) G_GNUC_CONST;
 GType container_source_collection_get_type (void) G_GNUC_CONST;
 GType tag_source_collection_get_type (void) G_GNUC_CONST;
 GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection* self, MediaSource* photo);
-static void _vala_array_add60 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add60 (gchar** * array, int* length, int* size, gchar* value);
 static gchar** _vala_array_dup22 (gchar** self, int length);
 static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable_wrapper_real_get_media_type (SpitPublishingPublishable* base);
 static GFile* publishing_glue_media_source_publishable_wrapper_real_get_serialized_file (SpitPublishingPublishable* base);
 static GDateTime* publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time (SpitPublishingPublishable* base);
 time_t media_source_get_exposure_time (MediaSource* self);
-static void publishing_glue_media_source_publishable_wrapper_finalize (GObject* obj);
+static void publishing_glue_media_source_publishable_wrapper_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -351,8 +351,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_construct (GType object_type, MediaSource* to_wrap) {
 	PublishingGlueMediaSourcePublishableWrapper * self = NULL;
-	MediaSource* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
+	MediaSource* _tmp0_;
+	MediaSource* _tmp1_;
 #line 15 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (to_wrap), NULL);
 #line 15 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -381,10 +381,10 @@ PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publis
 
 
 void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMediaSourcePublishableWrapper* self) {
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 20 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	g_return_if_fail (PUBLISHING_GLUE_IS_MEDIA_SOURCE_PUBLISHABLE_WRAPPER (self));
@@ -408,7 +408,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 	_g_free0 (_tmp3_);
 #line 410 "APIGlue.c"
 	{
-		GFile* _tmp4_ = NULL;
+		GFile* _tmp4_;
 #line 27 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp4_ = self->priv->serialized_file;
 #line 27 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -423,9 +423,9 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 	__catch39_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		GFile* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		err = _inner_error_;
 #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -464,22 +464,22 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 
 
 static void publishing_glue_media_source_publishable_wrapper_setup_parameters (PublishingGlueMediaSourcePublishableWrapper* self) {
-	GeeMap* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	GeeMap* _tmp4_ = NULL;
-	MediaSource* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GeeMap* _tmp8_ = NULL;
-	MediaSource* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	MediaSource* _tmp12_ = NULL;
-	Event* _tmp13_ = NULL;
-	Event* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
+	GeeMap* _tmp0_;
+	MediaSource* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	GeeMap* _tmp4_;
+	MediaSource* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	GeeMap* _tmp8_;
+	MediaSource* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	MediaSource* _tmp12_;
+	Event* _tmp13_;
+	Event* _tmp14_;
+	gboolean _tmp15_;
 #line 35 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	g_return_if_fail (PUBLISHING_GLUE_IS_MEDIA_SOURCE_PUBLISHABLE_WRAPPER (self));
 #line 36 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -531,12 +531,12 @@ static void publishing_glue_media_source_publishable_wrapper_setup_parameters (P
 #line 40 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	if (_tmp15_) {
 #line 534 "APIGlue.c"
-		GeeMap* _tmp16_ = NULL;
-		MediaSource* _tmp17_ = NULL;
-		Event* _tmp18_ = NULL;
-		Event* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
+		GeeMap* _tmp16_;
+		MediaSource* _tmp17_;
+		Event* _tmp18_;
+		Event* _tmp19_;
+		gchar* _tmp20_;
+		gchar* _tmp21_;
 #line 41 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp16_ = self->priv->param_string;
 #line 41 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -557,7 +557,7 @@ static void publishing_glue_media_source_publishable_wrapper_setup_parameters (P
 		_g_object_unref0 (_tmp19_);
 #line 559 "APIGlue.c"
 	} else {
-		GeeMap* _tmp22_ = NULL;
+		GeeMap* _tmp22_;
 #line 43 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp22_ = self->priv->param_string;
 #line 43 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -569,9 +569,9 @@ static void publishing_glue_media_source_publishable_wrapper_setup_parameters (P
 
 GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self, gint content_major_axis, gboolean strip_metadata, GError** error) {
 	GFile* result = NULL;
-	MediaSource* _tmp0_ = NULL;
-	GFile* _tmp63_ = NULL;
-	GFile* _tmp64_ = NULL;
+	MediaSource* _tmp0_;
+	GFile* _tmp63_;
+	GFile* _tmp64_;
 	GError * _inner_error_ = NULL;
 #line 46 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	g_return_val_if_fail (PUBLISHING_GLUE_IS_MEDIA_SOURCE_PUBLISHABLE_WRAPPER (self), NULL);
@@ -581,24 +581,24 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO)) {
 #line 583 "APIGlue.c"
 		LibraryPhoto* photo = NULL;
-		MediaSource* _tmp1_ = NULL;
-		LibraryPhoto* _tmp2_ = NULL;
+		MediaSource* _tmp1_;
+		LibraryPhoto* _tmp2_;
 		GFile* to_file = NULL;
-		GFile* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		GFile* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
-		LibraryPhoto* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		GFile* _tmp30_ = NULL;
-		GFile* _tmp31_ = NULL;
+		GFile* _tmp3_;
+		GFile* _tmp4_;
+		gint _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		GFile* _tmp8_;
+		GFile* _tmp9_;
+		LibraryPhoto* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		GFile* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		GFile* _tmp30_;
+		GFile* _tmp31_;
 #line 50 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp1_ = self->priv->wrapped;
 #line 50 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -649,18 +649,18 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 #line 649 "APIGlue.c"
 		{
 			Scaling _tmp16_ = {0};
-			gint _tmp17_ = 0;
+			gint _tmp17_;
 			Scaling scaling = {0};
-			LibraryPhoto* _tmp21_ = NULL;
-			GFile* _tmp22_ = NULL;
-			Scaling _tmp23_ = {0};
-			gboolean _tmp24_ = FALSE;
+			LibraryPhoto* _tmp21_;
+			GFile* _tmp22_;
+			Scaling _tmp23_;
+			gboolean _tmp24_;
 #line 58 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			_tmp17_ = content_major_axis;
 #line 58 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			if (_tmp17_ > 0) {
 #line 662 "APIGlue.c"
-				gint _tmp18_ = 0;
+				gint _tmp18_;
 				Scaling _tmp19_ = {0};
 #line 59 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				_tmp18_ = content_major_axis;
@@ -699,11 +699,11 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 		__catch40_g_error:
 		{
 			GError* err = NULL;
-			LibraryPhoto* _tmp25_ = NULL;
-			gchar* _tmp26_ = NULL;
-			gchar* _tmp27_ = NULL;
-			GError* _tmp28_ = NULL;
-			GError* _tmp29_ = NULL;
+			LibraryPhoto* _tmp25_;
+			gchar* _tmp26_;
+			gchar* _tmp27_;
+			GError* _tmp28_;
+			GError* _tmp29_;
 #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			err = _inner_error_;
 #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -769,39 +769,39 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 		_g_object_unref0 (photo);
 #line 770 "APIGlue.c"
 	} else {
-		MediaSource* _tmp32_ = NULL;
+		MediaSource* _tmp32_;
 #line 67 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp32_ = self->priv->wrapped;
 #line 67 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, TYPE_VIDEO)) {
 #line 777 "APIGlue.c"
 			Video* video = NULL;
-			MediaSource* _tmp33_ = NULL;
-			Video* _tmp34_ = NULL;
+			MediaSource* _tmp33_;
+			Video* _tmp34_;
 			gchar* basename = NULL;
 			gchar* extension = NULL;
-			Video* _tmp35_ = NULL;
-			GFile* _tmp36_ = NULL;
-			GFile* _tmp37_ = NULL;
-			gchar* _tmp38_ = NULL;
-			gchar* _tmp39_ = NULL;
+			Video* _tmp35_;
+			GFile* _tmp36_;
+			GFile* _tmp37_;
+			gchar* _tmp38_;
+			gchar* _tmp39_;
 			gchar* _tmp40_ = NULL;
 			gchar* _tmp41_ = NULL;
 			GFile* to_file = NULL;
-			gint _tmp42_ = 0;
-			const gchar* _tmp43_ = NULL;
-			gchar* _tmp44_ = NULL;
-			gchar* _tmp45_ = NULL;
-			GFile* _tmp46_ = NULL;
-			GFile* _tmp47_ = NULL;
-			Video* _tmp48_ = NULL;
-			gchar* _tmp49_ = NULL;
-			gchar* _tmp50_ = NULL;
-			GFile* _tmp51_ = NULL;
-			gchar* _tmp52_ = NULL;
-			gchar* _tmp53_ = NULL;
-			GFile* _tmp61_ = NULL;
-			GFile* _tmp62_ = NULL;
+			gint _tmp42_;
+			const gchar* _tmp43_;
+			gchar* _tmp44_;
+			gchar* _tmp45_;
+			GFile* _tmp46_;
+			GFile* _tmp47_;
+			Video* _tmp48_;
+			gchar* _tmp49_;
+			gchar* _tmp50_;
+			GFile* _tmp51_;
+			gchar* _tmp52_;
+			gchar* _tmp53_;
+			GFile* _tmp61_;
+			GFile* _tmp62_;
 #line 68 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			_tmp33_ = self->priv->wrapped;
 #line 68 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -871,8 +871,8 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 			_g_free0 (_tmp50_);
 #line 871 "APIGlue.c"
 			{
-				Video* _tmp54_ = NULL;
-				GFile* _tmp55_ = NULL;
+				Video* _tmp54_;
+				GFile* _tmp55_;
 #line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				_tmp54_ = video;
 #line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -889,11 +889,11 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 			__catch41_g_error:
 			{
 				GError* err = NULL;
-				Video* _tmp56_ = NULL;
-				gchar* _tmp57_ = NULL;
-				gchar* _tmp58_ = NULL;
-				GError* _tmp59_ = NULL;
-				GError* _tmp60_ = NULL;
+				Video* _tmp56_;
+				gchar* _tmp57_;
+				gchar* _tmp58_;
+				GError* _tmp59_;
+				GError* _tmp60_;
 #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				err = _inner_error_;
 #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -993,10 +993,10 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	MediaSource* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gboolean _tmp4_;
 #line 94 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1012,8 +1012,8 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	if (_tmp4_) {
 #line 1012 "APIGlue.c"
-		MediaSource* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+		MediaSource* _tmp5_;
+		gchar* _tmp6_;
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp5_ = self->priv->wrapped;
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1024,7 +1024,7 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi
 		_tmp0_ = _tmp6_;
 #line 1023 "APIGlue.c"
 	} else {
-		gchar* _tmp7_ = NULL;
+		gchar* _tmp7_;
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp7_ = g_strdup ("");
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1044,9 +1044,9 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi
 static gchar* publishing_glue_media_source_publishable_wrapper_real_get_param_string (SpitPublishingPublishable* base, const gchar* name) {
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	gchar* result = NULL;
-	GeeMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
 #line 98 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 98 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1065,7 +1065,7 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_param_st
 }
 
 
-static void _vala_array_add60 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add60 (gchar** * array, int* length, int* size, gchar* value) {
 #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	if ((*length) == (*size)) {
 #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1090,7 +1090,7 @@ static gchar** _vala_array_dup22 (gchar** self, int length) {
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	for (i = 0; i < length; i++) {
 #line 1090 "APIGlue.c"
-		gchar* _tmp0_ = NULL;
+		gchar* _tmp0_;
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1107,23 +1107,23 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	gchar** result = NULL;
 	gchar** _result_ = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
+	gchar** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
 	GeeCollection* tagset = NULL;
-	TagSourceCollection* _tmp1_ = NULL;
-	MediaSource* _tmp2_ = NULL;
-	GeeSortedSet* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
+	TagSourceCollection* _tmp1_;
+	MediaSource* _tmp2_;
+	GeeSortedSet* _tmp3_;
+	GeeCollection* _tmp4_;
 	gchar** _tmp14_ = NULL;
 	gint _tmp14__length1 = 0;
 	gint __tmp14__size_ = 0;
-	gchar** _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	gchar** _tmp17_ = NULL;
-	gint _tmp17__length1 = 0;
-	gchar** _tmp18_ = NULL;
-	gint _tmp18__length1 = 0;
+	gchar** _tmp15_;
+	gint _tmp15__length1;
+	gchar** _tmp17_;
+	gint _tmp17__length1;
+	gchar** _tmp18_;
+	gint _tmp18__length1;
 #line 102 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 103 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1149,8 +1149,8 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 #line 1147 "APIGlue.c"
 		{
 			GeeIterator* _tag_it = NULL;
-			GeeCollection* _tmp5_ = NULL;
-			GeeIterator* _tmp6_ = NULL;
+			GeeCollection* _tmp5_;
+			GeeIterator* _tmp6_;
 #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			_tmp5_ = tagset;
 #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1160,15 +1160,15 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			while (TRUE) {
 #line 1160 "APIGlue.c"
-				GeeIterator* _tmp7_ = NULL;
-				gboolean _tmp8_ = FALSE;
+				GeeIterator* _tmp7_;
+				gboolean _tmp8_;
 				Tag* tag = NULL;
-				GeeIterator* _tmp9_ = NULL;
-				gpointer _tmp10_ = NULL;
-				gchar** _tmp11_ = NULL;
-				gint _tmp11__length1 = 0;
-				Tag* _tmp12_ = NULL;
-				gchar* _tmp13_ = NULL;
+				GeeIterator* _tmp9_;
+				gpointer _tmp10_;
+				gchar** _tmp11_;
+				gint _tmp11__length1;
+				Tag* _tmp12_;
+				gchar* _tmp13_;
 #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				_tmp7_ = _tag_it;
 #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1211,8 +1211,8 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	if (_tmp15__length1 > 0) {
 #line 1211 "APIGlue.c"
-		gchar** _tmp16_ = NULL;
-		gint _tmp16__length1 = 0;
+		gchar** _tmp16_;
+		gint _tmp16__length1;
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp16_ = _result_;
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1262,7 +1262,7 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable_wrapper_real_get_media_type (SpitPublishingPublishable* base) {
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	SpitPublishingPublisherMediaType result = 0;
-	MediaSource* _tmp0_ = NULL;
+	MediaSource* _tmp0_;
 #line 115 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 116 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1275,7 +1275,7 @@ static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable
 		return result;
 #line 1274 "APIGlue.c"
 	} else {
-		MediaSource* _tmp1_ = NULL;
+		MediaSource* _tmp1_;
 #line 118 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp1_ = self->priv->wrapped;
 #line 118 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1299,8 +1299,8 @@ static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable
 static GFile* publishing_glue_media_source_publishable_wrapper_real_get_serialized_file (SpitPublishingPublishable* base) {
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 124 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 125 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1318,9 +1318,9 @@ static GFile* publishing_glue_media_source_publishable_wrapper_real_get_serializ
 static GDateTime* publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time (SpitPublishingPublishable* base) {
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	GDateTime* result = NULL;
-	MediaSource* _tmp0_ = NULL;
-	time_t _tmp1_ = 0;
-	GDateTime* _tmp2_ = NULL;
+	MediaSource* _tmp0_;
+	time_t _tmp1_;
+	GDateTime* _tmp2_;
 #line 128 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 129 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1352,23 +1352,23 @@ static void publishing_glue_media_source_publishable_wrapper_spit_publishing_pub
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	publishing_glue_media_source_publishable_wrapper_spit_publishing_publishable_parent_iface = g_type_interface_peek_parent (iface);
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_publishing_name = (gchar* (*)(SpitPublishingPublishable*)) publishing_glue_media_source_publishable_wrapper_real_get_publishing_name;
+	iface->get_publishing_name = (gchar* (*) (SpitPublishingPublishable *)) publishing_glue_media_source_publishable_wrapper_real_get_publishing_name;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_param_string = (gchar* (*)(SpitPublishingPublishable*, const gchar*)) publishing_glue_media_source_publishable_wrapper_real_get_param_string;
+	iface->get_param_string = (gchar* (*) (SpitPublishingPublishable *, const gchar*)) publishing_glue_media_source_publishable_wrapper_real_get_param_string;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_publishing_keywords = (gchar** (*)(SpitPublishingPublishable*, int*)) publishing_glue_media_source_publishable_wrapper_real_get_publishing_keywords;
+	iface->get_publishing_keywords = (gchar** (*) (SpitPublishingPublishable *, int*)) publishing_glue_media_source_publishable_wrapper_real_get_publishing_keywords;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_media_type = (SpitPublishingPublisherMediaType (*)(SpitPublishingPublishable*)) publishing_glue_media_source_publishable_wrapper_real_get_media_type;
+	iface->get_media_type = (SpitPublishingPublisherMediaType (*) (SpitPublishingPublishable *)) publishing_glue_media_source_publishable_wrapper_real_get_media_type;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_serialized_file = (GFile* (*)(SpitPublishingPublishable*)) publishing_glue_media_source_publishable_wrapper_real_get_serialized_file;
+	iface->get_serialized_file = (GFile* (*) (SpitPublishingPublishable *)) publishing_glue_media_source_publishable_wrapper_real_get_serialized_file;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_exposure_date_time = (GDateTime* (*)(SpitPublishingPublishable*)) publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time;
+	iface->get_exposure_date_time = (GDateTime* (*) (SpitPublishingPublishable *)) publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time;
 #line 1364 "APIGlue.c"
 }
 
 
 static void publishing_glue_media_source_publishable_wrapper_instance_init (PublishingGlueMediaSourcePublishableWrapper * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self->priv = PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER_GET_PRIVATE (self);
 #line 12 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1381,7 +1381,7 @@ static void publishing_glue_media_source_publishable_wrapper_instance_init (Publ
 }
 
 
-static void publishing_glue_media_source_publishable_wrapper_finalize (GObject* obj) {
+static void publishing_glue_media_source_publishable_wrapper_finalize (GObject * obj) {
 	PublishingGlueMediaSourcePublishableWrapper * self;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
diff --git a/src/publishing/Publishing.c b/src/publishing/Publishing.c
index 5ee2728..5ae726a 100644
--- a/src/publishing/Publishing.c
+++ b/src/publishing/Publishing.c
@@ -1,4 +1,4 @@
-/* Publishing.c generated by valac 0.34.7, the Vala compiler
+/* Publishing.c generated by valac 0.36.6, the Vala compiler
  * generated from Publishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -18,10 +18,10 @@
 
 
 void publishing_init (GError** error);
-static void _vala_array_add51 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add52 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add53 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add54 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add51 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add52 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add53 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add54 (gchar** * array, int* length, int* size, gchar* value);
 void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1);
 #define RESOURCES_PUBLISH "applications-internet"
 void publishing_terminate (void);
@@ -29,7 +29,7 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
-static void _vala_array_add51 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add51 (gchar** * array, int* length, int* size, gchar* value) {
 #line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	if ((*length) == (*size)) {
 #line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -46,7 +46,7 @@ static void _vala_array_add51 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add52 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add52 (gchar** * array, int* length, int* size, gchar* value) {
 #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	if ((*length) == (*size)) {
 #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -63,7 +63,7 @@ static void _vala_array_add52 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add53 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add53 (gchar** * array, int* length, int* size, gchar* value) {
 #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	if ((*length) == (*size)) {
 #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -80,7 +80,7 @@ static void _vala_array_add53 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add54 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add54 (gchar** * array, int* length, int* size, gchar* value) {
 #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	if ((*length) == (*size)) {
 #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -99,24 +99,23 @@ static void _vala_array_add54 (gchar*** array, int* length, int* size, gchar* va
 
 void publishing_init (GError** error) {
 	gchar** core_ids = NULL;
-	gchar** _tmp0_ = NULL;
-	gint core_ids_length1 = 0;
-	gint _core_ids_size_ = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar* _tmp4_ = NULL;
-	gchar** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	gchar* _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	gchar** _tmp0_;
+	gint core_ids_length1;
+	gint _core_ids_size_;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar* _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
+	gchar** _tmp5_;
+	gint _tmp5__length1;
+	gchar* _tmp6_;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
+	gchar* _tmp8_;
+	gchar** _tmp9_;
+	gint _tmp9__length1;
 #line 10 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp0_ = g_new0 (gchar*, 0 + 1);
 #line 10 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -158,16 +157,14 @@ void publishing_init (GError** error) {
 #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_vala_array_add54 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp8_);
 #line 16 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
-	_tmp9_ = _ ("Publishing");
+	_tmp9_ = core_ids;
 #line 16 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
-	_tmp10_ = core_ids;
+	_tmp9__length1 = core_ids_length1;
 #line 16 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
-	_tmp10__length1 = core_ids_length1;
-#line 16 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
-	plugins_register_extension_point (SPIT_PUBLISHING_TYPE_SERVICE, _tmp9_, RESOURCES_PUBLISH, _tmp10_, _tmp10__length1);
+	plugins_register_extension_point (SPIT_PUBLISHING_TYPE_SERVICE, _ ("Publishing"), RESOURCES_PUBLISH, _tmp9_, _tmp9__length1);
 #line 9 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	core_ids = (_vala_array_free (core_ids, core_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 171 "Publishing.c"
+#line 168 "Publishing.c"
 }
 
 
diff --git a/src/publishing/PublishingPluginHost.c b/src/publishing/PublishingPluginHost.c
index 63e16c4..54f1495 100644
--- a/src/publishing/PublishingPluginHost.c
+++ b/src/publishing/PublishingPluginHost.c
@@ -1,4 +1,4 @@
-/* PublishingPluginHost.c generated by valac 0.34.7, the Vala compiler
+/* PublishingPluginHost.c generated by valac 0.36.6, the Vala compiler
  * generated from PublishingPluginHost.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -166,7 +166,7 @@ struct _SpitPublishingConcretePublishingHostPrivate {
 
 
 static gpointer spit_publishing_concrete_publishing_host_parent_class = NULL;
-static SpitPublishingPluginHostIface* spit_publishing_concrete_publishing_host_spit_publishing_plugin_host_parent_iface = NULL;
+static SpitPublishingPluginHostIface * spit_publishing_concrete_publishing_host_spit_publishing_plugin_host_parent_iface = NULL;
 
 GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST;
 GType spit_publishing_concrete_publishing_host_get_type (void) G_GNUC_CONST;
@@ -238,7 +238,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 void spin_event_loop (void);
 GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self, gint content_major_axis, gboolean strip_metadata, GError** error);
 static void _spit_publishing_concrete_publishing_host_report_plugin_upload_progress_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
-static void spit_publishing_concrete_publishing_host_finalize (GObject* obj);
+static void spit_publishing_concrete_publishing_host_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -258,7 +258,7 @@ static SpitPublishingPublishable** _vala_array_dup20 (SpitPublishingPublishable*
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	for (i = 0; i < length; i++) {
 #line 261 "PublishingPluginHost.c"
-		SpitPublishingPublishable* _tmp0_ = NULL;
+		SpitPublishingPublishable* _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -273,16 +273,16 @@ static SpitPublishingPublishable** _vala_array_dup20 (SpitPublishingPublishable*
 
 SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_construct (GType object_type, SpitPublishingService* service, PublishingUIPublishingDialog* dialog, SpitPublishingPublishable** publishables, int publishables_length1) {
 	SpitPublishingConcretePublishingHost * self = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	PublishingUIPublishingDialog* _tmp1_ = NULL;
-	SpitPublishingPublishable** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	SpitPublishingPublishable** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	SpitPublishingPublishable** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	SpitPublishingService* _tmp9_ = NULL;
-	SpitPublishingPublisher* _tmp10_ = NULL;
+	SpitPublishingService* _tmp0_;
+	PublishingUIPublishingDialog* _tmp1_;
+	SpitPublishingPublishable** _tmp2_;
+	gint _tmp2__length1;
+	SpitPublishingPublishable** _tmp3_;
+	gint _tmp3__length1;
+	SpitPublishingPublishable** _tmp4_;
+	gint _tmp4__length1;
+	SpitPublishingService* _tmp9_;
+	SpitPublishingPublisher* _tmp10_;
 #line 24 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
 #line 24 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -328,7 +328,7 @@ SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_c
 #line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		for (curr_publishable_it = 0; curr_publishable_it < _tmp4__length1; curr_publishable_it = curr_publishable_it + 1) {
 #line 331 "PublishingPluginHost.c"
-			SpitPublishingPublishable* _tmp5_ = NULL;
+			SpitPublishingPublishable* _tmp5_;
 			SpitPublishingPublishable* curr_publishable = NULL;
 #line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 			_tmp5_ = _g_object_ref0 (curr_publishable_collection[curr_publishable_it]);
@@ -336,9 +336,9 @@ SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_c
 			curr_publishable = _tmp5_;
 #line 338 "PublishingPluginHost.c"
 			{
-				SpitPublishingPublisherMediaType _tmp6_ = 0;
-				SpitPublishingPublishable* _tmp7_ = NULL;
-				SpitPublishingPublisherMediaType _tmp8_ = 0;
+				SpitPublishingPublisherMediaType _tmp6_;
+				SpitPublishingPublishable* _tmp7_;
+				SpitPublishingPublisherMediaType _tmp8_;
 #line 31 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 				_tmp6_ = self->priv->media_type;
 #line 31 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -375,8 +375,8 @@ SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_n
 
 
 static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPublishingConcretePublishingHost* self) {
-	SpitPublishingLoginCallback _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
+	SpitPublishingLoginCallback _tmp0_;
+	void* _tmp0__target;
 #line 36 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
 #line 37 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -386,8 +386,8 @@ static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPubli
 #line 37 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	if (_tmp0_ != NULL) {
 #line 389 "PublishingPluginHost.c"
-		SpitPublishingLoginCallback _tmp1_ = NULL;
-		void* _tmp1__target = NULL;
+		SpitPublishingLoginCallback _tmp1_;
+		void* _tmp1__target;
 #line 38 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp1_ = self->priv->current_login_callback;
 #line 38 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -400,8 +400,8 @@ static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPubli
 
 
 static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingConcretePublishingHost* self) {
-	SpitPublishingPublishable** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	SpitPublishingPublishable** _tmp0_;
+	gint _tmp0__length1;
 #line 41 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
 #line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -421,7 +421,7 @@ static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingCon
 #line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		for (publishable_it = 0; publishable_it < _tmp0__length1; publishable_it = publishable_it + 1) {
 #line 424 "PublishingPluginHost.c"
-			SpitPublishingPublishable* _tmp1_ = NULL;
+			SpitPublishingPublishable* _tmp1_;
 			SpitPublishingPublishable* publishable = NULL;
 #line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 			_tmp1_ = _g_object_ref0 (publishable_collection[publishable_it]);
@@ -429,7 +429,7 @@ static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingCon
 			publishable = _tmp1_;
 #line 431 "PublishingPluginHost.c"
 			{
-				SpitPublishingPublishable* _tmp2_ = NULL;
+				SpitPublishingPublishable* _tmp2_;
 #line 43 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 				_tmp2_ = publishable;
 #line 43 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -444,23 +444,23 @@ static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingCon
 
 
 static void spit_publishing_concrete_publishing_host_report_plugin_upload_progress (SpitPublishingConcretePublishingHost* self, gint file_number, gdouble fraction_complete) {
-	PublishingUIPublishingDialog* _tmp0_ = NULL;
-	SpitPublishingDialogPane* _tmp1_ = NULL;
-	SpitPublishingDialogPane* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	PublishingUIPublishingDialog* _tmp0_;
+	SpitPublishingDialogPane* _tmp1_;
+	SpitPublishingDialogPane* _tmp2_;
+	gboolean _tmp3_;
 	PublishingUIProgressPane* pane = NULL;
-	PublishingUIPublishingDialog* _tmp4_ = NULL;
-	SpitPublishingDialogPane* _tmp5_ = NULL;
+	PublishingUIPublishingDialog* _tmp4_;
+	SpitPublishingDialogPane* _tmp5_;
 	gchar* status_string = NULL;
-	gint _tmp6_ = 0;
-	SpitPublishingPublishable** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	gchar* _tmp8_ = NULL;
+	gint _tmp6_;
+	SpitPublishingPublishable** _tmp7_;
+	gint _tmp7__length1;
+	gchar* _tmp8_;
 	gdouble status_fraction = 0.0;
-	gdouble _tmp9_ = 0.0;
-	PublishingUIProgressPane* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gdouble _tmp12_ = 0.0;
+	gdouble _tmp9_;
+	PublishingUIProgressPane* _tmp10_;
+	const gchar* _tmp11_;
+	gdouble _tmp12_;
 #line 46 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
 #line 48 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -517,8 +517,8 @@ static void spit_publishing_concrete_publishing_host_report_plugin_upload_progre
 
 static void spit_publishing_concrete_publishing_host_install_progress_pane (SpitPublishingConcretePublishingHost* self) {
 	PublishingUIProgressPane* progress_pane = NULL;
-	PublishingUIProgressPane* _tmp0_ = NULL;
-	PublishingUIPublishingDialog* _tmp1_ = NULL;
+	PublishingUIProgressPane* _tmp0_;
+	PublishingUIPublishingDialog* _tmp1_;
 #line 61 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
 #line 62 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -540,10 +540,10 @@ static void spit_publishing_concrete_publishing_host_install_progress_pane (Spit
 static void spit_publishing_concrete_publishing_host_real_install_dialog_pane (SpitPublishingPluginHost* base, SpitPublishingDialogPane* pane, SpitPublishingPluginHostButtonMode button_mode) {
 	SpitPublishingConcretePublishingHost * self;
 	gboolean _tmp0_ = FALSE;
-	SpitPublishingPublisher* _tmp1_ = NULL;
-	PublishingUIPublishingDialog* _tmp4_ = NULL;
-	SpitPublishingDialogPane* _tmp5_ = NULL;
-	SpitPublishingPluginHostButtonMode _tmp6_ = 0;
+	SpitPublishingPublisher* _tmp1_;
+	PublishingUIPublishingDialog* _tmp4_;
+	SpitPublishingDialogPane* _tmp5_;
+	SpitPublishingPluginHostButtonMode _tmp6_;
 #line 68 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 68 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -559,8 +559,8 @@ static void spit_publishing_concrete_publishing_host_real_install_dialog_pane (S
 		_tmp0_ = TRUE;
 #line 560 "PublishingPluginHost.c"
 	} else {
-		SpitPublishingPublisher* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+		SpitPublishingPublisher* _tmp2_;
+		gboolean _tmp3_;
 #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp2_ = self->priv->active_publisher;
 #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -592,113 +592,107 @@ static void spit_publishing_concrete_publishing_host_real_install_dialog_pane (S
 static void spit_publishing_concrete_publishing_host_real_post_error (SpitPublishingPluginHost* base, GError* err) {
 	SpitPublishingConcretePublishingHost * self;
 	gchar* msg = NULL;
-	const gchar* _tmp0_ = NULL;
-	SpitPublishingPublisher* _tmp1_ = NULL;
-	SpitPublishingService* _tmp2_ = NULL;
-	SpitPublishingService* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	GError* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	PublishingUIPublishingDialog* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-	PublishingUIStaticMessagePane* _tmp18_ = NULL;
-	PublishingUIStaticMessagePane* _tmp19_ = NULL;
-	PublishingUIPublishingDialog* _tmp20_ = NULL;
-	PublishingUIPublishingDialog* _tmp21_ = NULL;
-	SpitPublishingPublisher* _tmp22_ = NULL;
+	SpitPublishingPublisher* _tmp0_;
+	SpitPublishingService* _tmp1_;
+	SpitPublishingService* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	GError* _tmp7_;
+	const gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
+	PublishingUIPublishingDialog* _tmp14_;
+	const gchar* _tmp15_;
+	PublishingUIStaticMessagePane* _tmp16_;
+	PublishingUIStaticMessagePane* _tmp17_;
+	PublishingUIPublishingDialog* _tmp18_;
+	PublishingUIPublishingDialog* _tmp19_;
+	SpitPublishingPublisher* _tmp20_;
 #line 80 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp0_ = _ ("Publishing to %s can’t continue because an error occurred:");
-#line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp1_ = self->priv->active_publisher;
+	_tmp0_ = self->priv->active_publisher;
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp2_ = spit_publishing_publisher_get_service (_tmp1_);
+	_tmp1_ = spit_publishing_publisher_get_service (_tmp0_);
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp4_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+	_tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp5_ = g_strdup_printf (_tmp0_, _tmp4_);
+	_tmp4_ = g_strdup_printf (_ ("Publishing to %s can’t continue because an error occurred:"), _tmp3_);
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_g_object_unref0 (_tmp3_);
+	_g_object_unref0 (_tmp2_);
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	msg = _tmp6_;
+	msg = _tmp5_;
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp7_ = msg;
+	_tmp6_ = msg;
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp8_ = err;
+	_tmp7_ = err;
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp9_ = _tmp8_->message;
+	_tmp8_ = _tmp7_->message;
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp10_ = g_markup_printf_escaped ("\n\n<i>%s</i>\n\n", _tmp9_);
+	_tmp9_ = g_markup_printf_escaped ("\n\n<i>%s</i>\n\n", _tmp8_);
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp11_ = _tmp10_;
+	_tmp10_ = _tmp9_;
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp12_ = g_strconcat (_tmp7_, _tmp11_, NULL);
+	_tmp11_ = g_strconcat (_tmp6_, _tmp10_, NULL);
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_g_free0 (msg);
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	msg = _tmp12_;
+	msg = _tmp11_;
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_g_free0 (_tmp11_);
-#line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp13_ = msg;
+	_g_free0 (_tmp10_);
 #line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp14_ = _ ("To try publishing to another service, select one from the above menu.");
+	_tmp12_ = msg;
 #line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp15_ = g_strconcat (_tmp13_, _tmp14_, NULL);
+	_tmp13_ = g_strconcat (_tmp12_, _ ("To try publishing to another service, select one from the above menu."), NULL);
 #line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_g_free0 (msg);
 #line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	msg = _tmp15_;
+	msg = _tmp13_;
 #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp16_ = self->priv->dialog;
+	_tmp14_ = self->priv->dialog;
 #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp17_ = msg;
+	_tmp15_ = msg;
 #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp18_ = publishing_ui_static_message_pane_new (_tmp17_, TRUE);
+	_tmp16_ = publishing_ui_static_message_pane_new (_tmp15_, TRUE);
 #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp19_ = _tmp18_;
+	_tmp17_ = _tmp16_;
 #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	publishing_ui_publishing_dialog_install_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
+	publishing_ui_publishing_dialog_install_pane (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
 #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_g_object_unref0 (_tmp19_);
+	_g_object_unref0 (_tmp17_);
 #line 87 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp20_ = self->priv->dialog;
+	_tmp18_ = self->priv->dialog;
 #line 87 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	publishing_ui_publishing_dialog_set_close_button_mode (_tmp20_);
+	publishing_ui_publishing_dialog_set_close_button_mode (_tmp18_);
 #line 88 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp21_ = self->priv->dialog;
+	_tmp19_ = self->priv->dialog;
 #line 88 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	publishing_ui_publishing_dialog_unlock_service (_tmp21_);
+	publishing_ui_publishing_dialog_unlock_service (_tmp19_);
 #line 90 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp22_ = self->priv->active_publisher;
+	_tmp20_ = self->priv->active_publisher;
 #line 90 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	spit_publishing_publisher_stop (_tmp22_);
+	spit_publishing_publisher_stop (_tmp20_);
 #line 95 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	spit_publishing_concrete_publishing_host_clean_up (self);
 #line 80 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_g_free0 (msg);
-#line 694 "PublishingPluginHost.c"
+#line 688 "PublishingPluginHost.c"
 }
 
 
 static void spit_publishing_concrete_publishing_host_real_stop_publishing (SpitPublishingPluginHost* base) {
 	SpitPublishingConcretePublishingHost * self;
-	SpitPublishingPublisher* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SpitPublishingPublisher* _tmp0_;
+	gboolean _tmp1_;
 #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 99 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -710,26 +704,26 @@ static void spit_publishing_concrete_publishing_host_real_stop_publishing (SpitP
 	_tmp1_ = spit_publishing_publisher_is_running (_tmp0_);
 #line 101 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	if (_tmp1_) {
-#line 712 "PublishingPluginHost.c"
-		SpitPublishingPublisher* _tmp2_ = NULL;
+#line 706 "PublishingPluginHost.c"
+		SpitPublishingPublisher* _tmp2_;
 #line 102 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp2_ = self->priv->active_publisher;
 #line 102 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		spit_publishing_publisher_stop (_tmp2_);
-#line 718 "PublishingPluginHost.c"
+#line 712 "PublishingPluginHost.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	spit_publishing_concrete_publishing_host_clean_up (self);
 #line 106 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self->priv->publishing_halted = TRUE;
-#line 724 "PublishingPluginHost.c"
+#line 718 "PublishingPluginHost.c"
 }
 
 
 void spit_publishing_concrete_publishing_host_start_publishing (SpitPublishingConcretePublishingHost* self) {
-	SpitPublishingPublisher* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	SpitPublishingPublisher* _tmp2_ = NULL;
+	SpitPublishingPublisher* _tmp0_;
+	gboolean _tmp1_;
+	SpitPublishingPublisher* _tmp2_;
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
 #line 110 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -740,7 +734,7 @@ void spit_publishing_concrete_publishing_host_start_publishing (SpitPublishingCo
 	if (_tmp1_) {
 #line 111 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		return;
-#line 742 "PublishingPluginHost.c"
+#line 736 "PublishingPluginHost.c"
 	}
 #line 113 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	g_debug ("PublishingPluginHost.vala:113: ConcretePublishingHost.start_publishing" \
@@ -749,15 +743,15 @@ void spit_publishing_concrete_publishing_host_start_publishing (SpitPublishingCo
 	_tmp2_ = self->priv->active_publisher;
 #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	spit_publishing_publisher_start (_tmp2_);
-#line 750 "PublishingPluginHost.c"
+#line 744 "PublishingPluginHost.c"
 }
 
 
 static SpitPublishingPublisher* spit_publishing_concrete_publishing_host_real_get_publisher (SpitPublishingPluginHost* base) {
 	SpitPublishingConcretePublishingHost * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPublisher* _tmp0_ = NULL;
-	SpitPublishingPublisher* _tmp1_ = NULL;
+	SpitPublishingPublisher* _tmp0_;
+	SpitPublishingPublisher* _tmp1_;
 #line 118 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 119 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -768,17 +762,17 @@ static SpitPublishingPublisher* spit_publishing_concrete_publishing_host_real_ge
 	result = _tmp1_;
 #line 119 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	return result;
-#line 769 "PublishingPluginHost.c"
+#line 763 "PublishingPluginHost.c"
 }
 
 
 static void spit_publishing_concrete_publishing_host_real_install_static_message_pane (SpitPublishingPluginHost* base, const gchar* message, SpitPublishingPluginHostButtonMode button_mode) {
 	SpitPublishingConcretePublishingHost * self;
-	SpitPublishingPluginHostButtonMode _tmp0_ = 0;
-	PublishingUIPublishingDialog* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingUIStaticMessagePane* _tmp3_ = NULL;
-	PublishingUIStaticMessagePane* _tmp4_ = NULL;
+	SpitPublishingPluginHostButtonMode _tmp0_;
+	PublishingUIPublishingDialog* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingUIStaticMessagePane* _tmp3_;
+	PublishingUIStaticMessagePane* _tmp4_;
 #line 122 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 122 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -799,17 +793,17 @@ static void spit_publishing_concrete_publishing_host_real_install_static_message
 	publishing_ui_publishing_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
 #line 127 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_g_object_unref0 (_tmp4_);
-#line 800 "PublishingPluginHost.c"
+#line 794 "PublishingPluginHost.c"
 }
 
 
 static void spit_publishing_concrete_publishing_host_real_install_pango_message_pane (SpitPublishingPluginHost* base, const gchar* markup, SpitPublishingPluginHostButtonMode button_mode) {
 	SpitPublishingConcretePublishingHost * self;
-	SpitPublishingPluginHostButtonMode _tmp0_ = 0;
-	PublishingUIPublishingDialog* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingUIStaticMessagePane* _tmp3_ = NULL;
-	PublishingUIStaticMessagePane* _tmp4_ = NULL;
+	SpitPublishingPluginHostButtonMode _tmp0_;
+	PublishingUIPublishingDialog* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingUIStaticMessagePane* _tmp3_;
+	PublishingUIStaticMessagePane* _tmp4_;
 #line 130 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 130 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -830,19 +824,19 @@ static void spit_publishing_concrete_publishing_host_real_install_pango_message_
 	publishing_ui_publishing_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
 #line 134 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_g_object_unref0 (_tmp4_);
-#line 831 "PublishingPluginHost.c"
+#line 825 "PublishingPluginHost.c"
 }
 
 
 static void spit_publishing_concrete_publishing_host_real_install_success_pane (SpitPublishingPluginHost* base) {
 	SpitPublishingConcretePublishingHost * self;
-	PublishingUIPublishingDialog* _tmp0_ = NULL;
-	SpitPublishingPublisherMediaType _tmp1_ = 0;
-	SpitPublishingPublishable** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	PublishingUISuccessPane* _tmp3_ = NULL;
-	PublishingUISuccessPane* _tmp4_ = NULL;
-	PublishingUIPublishingDialog* _tmp5_ = NULL;
+	PublishingUIPublishingDialog* _tmp0_;
+	SpitPublishingPublisherMediaType _tmp1_;
+	SpitPublishingPublishable** _tmp2_;
+	gint _tmp2__length1;
+	PublishingUISuccessPane* _tmp3_;
+	PublishingUISuccessPane* _tmp4_;
+	PublishingUIPublishingDialog* _tmp5_;
 #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -867,15 +861,15 @@ static void spit_publishing_concrete_publishing_host_real_install_success_pane (
 	publishing_ui_publishing_dialog_set_close_button_mode (_tmp5_);
 #line 144 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	spit_publishing_concrete_publishing_host_clean_up (self);
-#line 868 "PublishingPluginHost.c"
+#line 862 "PublishingPluginHost.c"
 }
 
 
 static void spit_publishing_concrete_publishing_host_real_install_account_fetch_wait_pane (SpitPublishingPluginHost* base) {
 	SpitPublishingConcretePublishingHost * self;
-	PublishingUIPublishingDialog* _tmp0_ = NULL;
-	PublishingUIAccountFetchWaitPane* _tmp1_ = NULL;
-	PublishingUIAccountFetchWaitPane* _tmp2_ = NULL;
+	PublishingUIPublishingDialog* _tmp0_;
+	PublishingUIAccountFetchWaitPane* _tmp1_;
+	PublishingUIAccountFetchWaitPane* _tmp2_;
 #line 147 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 148 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -890,15 +884,15 @@ static void spit_publishing_concrete_publishing_host_real_install_account_fetch_
 	_g_object_unref0 (_tmp2_);
 #line 149 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	spit_publishing_concrete_publishing_host_set_button_mode (self, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 891 "PublishingPluginHost.c"
+#line 885 "PublishingPluginHost.c"
 }
 
 
 static void spit_publishing_concrete_publishing_host_real_install_login_wait_pane (SpitPublishingPluginHost* base) {
 	SpitPublishingConcretePublishingHost * self;
-	PublishingUIPublishingDialog* _tmp0_ = NULL;
-	PublishingUILoginWaitPane* _tmp1_ = NULL;
-	PublishingUILoginWaitPane* _tmp2_ = NULL;
+	PublishingUIPublishingDialog* _tmp0_;
+	PublishingUILoginWaitPane* _tmp1_;
+	PublishingUILoginWaitPane* _tmp2_;
 #line 152 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 153 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -911,25 +905,25 @@ static void spit_publishing_concrete_publishing_host_real_install_login_wait_pan
 	publishing_ui_publishing_dialog_install_pane (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
 #line 153 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_g_object_unref0 (_tmp2_);
-#line 912 "PublishingPluginHost.c"
+#line 906 "PublishingPluginHost.c"
 }
 
 
 static void _spit_publishing_concrete_publishing_host_on_login_clicked_publishing_ui_login_welcome_pane_login_requested (PublishingUILoginWelcomePane* _sender, gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	spit_publishing_concrete_publishing_host_on_login_clicked ((SpitPublishingConcretePublishingHost*) self);
-#line 919 "PublishingPluginHost.c"
+#line 913 "PublishingPluginHost.c"
 }
 
 
 static void spit_publishing_concrete_publishing_host_real_install_welcome_pane (SpitPublishingPluginHost* base, const gchar* welcome_message, SpitPublishingLoginCallback login_clicked_callback, void* login_clicked_callback_target) {
 	SpitPublishingConcretePublishingHost * self;
 	PublishingUILoginWelcomePane* login_pane = NULL;
-	const gchar* _tmp0_ = NULL;
-	PublishingUILoginWelcomePane* _tmp1_ = NULL;
-	SpitPublishingLoginCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	PublishingUIPublishingDialog* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	PublishingUILoginWelcomePane* _tmp1_;
+	SpitPublishingLoginCallback _tmp2_;
+	void* _tmp2__target;
+	PublishingUIPublishingDialog* _tmp3_;
 #line 156 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 156 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -958,70 +952,70 @@ static void spit_publishing_concrete_publishing_host_real_install_welcome_pane (
 	publishing_ui_publishing_dialog_install_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (login_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
 #line 156 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_g_object_unref0 (login_pane);
-#line 959 "PublishingPluginHost.c"
+#line 953 "PublishingPluginHost.c"
 }
 
 
 static void spit_publishing_concrete_publishing_host_real_set_service_locked (SpitPublishingPluginHost* base, gboolean locked) {
 	SpitPublishingConcretePublishingHost * self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 167 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 168 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_tmp0_ = locked;
 #line 168 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	if (_tmp0_) {
-#line 972 "PublishingPluginHost.c"
-		PublishingUIPublishingDialog* _tmp1_ = NULL;
+#line 966 "PublishingPluginHost.c"
+		PublishingUIPublishingDialog* _tmp1_;
 #line 169 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp1_ = self->priv->dialog;
 #line 169 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		publishing_ui_publishing_dialog_lock_service (_tmp1_);
-#line 978 "PublishingPluginHost.c"
+#line 972 "PublishingPluginHost.c"
 	} else {
-		PublishingUIPublishingDialog* _tmp2_ = NULL;
+		PublishingUIPublishingDialog* _tmp2_;
 #line 171 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp2_ = self->priv->dialog;
 #line 171 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		publishing_ui_publishing_dialog_unlock_service (_tmp2_);
-#line 985 "PublishingPluginHost.c"
+#line 979 "PublishingPluginHost.c"
 	}
 }
 
 
 void spit_publishing_concrete_publishing_host_set_button_mode (SpitPublishingConcretePublishingHost* self, SpitPublishingPluginHostButtonMode mode) {
-	SpitPublishingPluginHostButtonMode _tmp0_ = 0;
+	SpitPublishingPluginHostButtonMode _tmp0_;
 #line 174 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
 #line 175 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_tmp0_ = mode;
 #line 175 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	if (_tmp0_ == SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE) {
-#line 998 "PublishingPluginHost.c"
-		PublishingUIPublishingDialog* _tmp1_ = NULL;
+#line 992 "PublishingPluginHost.c"
+		PublishingUIPublishingDialog* _tmp1_;
 #line 176 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp1_ = self->priv->dialog;
 #line 176 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		publishing_ui_publishing_dialog_set_close_button_mode (_tmp1_);
-#line 1004 "PublishingPluginHost.c"
+#line 998 "PublishingPluginHost.c"
 	} else {
-		SpitPublishingPluginHostButtonMode _tmp2_ = 0;
+		SpitPublishingPluginHostButtonMode _tmp2_;
 #line 177 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp2_ = mode;
 #line 177 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		if (_tmp2_ == SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL) {
-#line 1011 "PublishingPluginHost.c"
-			PublishingUIPublishingDialog* _tmp3_ = NULL;
+#line 1005 "PublishingPluginHost.c"
+			PublishingUIPublishingDialog* _tmp3_;
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 			_tmp3_ = self->priv->dialog;
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 			publishing_ui_publishing_dialog_set_cancel_button_mode (_tmp3_);
-#line 1017 "PublishingPluginHost.c"
+#line 1011 "PublishingPluginHost.c"
 		} else {
 #line 180 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 			g_error ("PublishingPluginHost.vala:180: unrecognized button mode enumeration va" \
 "lue");
-#line 1021 "PublishingPluginHost.c"
+#line 1015 "PublishingPluginHost.c"
 		}
 	}
 }
@@ -1029,9 +1023,9 @@ void spit_publishing_concrete_publishing_host_set_button_mode (SpitPublishingCon
 
 static void spit_publishing_concrete_publishing_host_real_set_dialog_default_widget (SpitPublishingPluginHost* base, GtkWidget* widget) {
 	SpitPublishingConcretePublishingHost * self;
-	GtkWidget* _tmp0_ = NULL;
-	PublishingUIPublishingDialog* _tmp1_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
+	GtkWidget* _tmp0_;
+	PublishingUIPublishingDialog* _tmp1_;
+	GtkWidget* _tmp2_;
 #line 183 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 183 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1046,14 +1040,14 @@ static void spit_publishing_concrete_publishing_host_real_set_dialog_default_wid
 	_tmp2_ = widget;
 #line 185 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow), _tmp2_);
-#line 1046 "PublishingPluginHost.c"
+#line 1040 "PublishingPluginHost.c"
 }
 
 
 static SpitPublishingPublisherMediaType spit_publishing_concrete_publishing_host_real_get_publishable_media_type (SpitPublishingPluginHost* base) {
 	SpitPublishingConcretePublishingHost * self;
 	SpitPublishingPublisherMediaType result = 0;
-	SpitPublishingPublisherMediaType _tmp0_ = 0;
+	SpitPublishingPublisherMediaType _tmp0_;
 #line 188 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 189 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1062,7 +1056,7 @@ static SpitPublishingPublisherMediaType spit_publishing_concrete_publishing_host
 	result = _tmp0_;
 #line 189 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	return result;
-#line 1062 "PublishingPluginHost.c"
+#line 1056 "PublishingPluginHost.c"
 }
 
 
@@ -1073,29 +1067,29 @@ static SpitPublishingPublishable** _vala_array_dup21 (SpitPublishingPublishable*
 	result = g_new0 (SpitPublishingPublishable*, length + 1);
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	for (i = 0; i < length; i++) {
-#line 1073 "PublishingPluginHost.c"
-		SpitPublishingPublishable* _tmp0_ = NULL;
+#line 1067 "PublishingPluginHost.c"
+		SpitPublishingPublishable* _tmp0_;
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		result[i] = _tmp0_;
-#line 1079 "PublishingPluginHost.c"
+#line 1073 "PublishingPluginHost.c"
 	}
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	return result;
-#line 1083 "PublishingPluginHost.c"
+#line 1077 "PublishingPluginHost.c"
 }
 
 
 static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real_get_publishables (SpitPublishingPluginHost* base, int* result_length1) {
 	SpitPublishingConcretePublishingHost * self;
 	SpitPublishingPublishable** result = NULL;
-	SpitPublishingPublishable** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	SpitPublishingPublishable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	SpitPublishingPublishable** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	SpitPublishingPublishable** _tmp0_;
+	gint _tmp0__length1;
+	SpitPublishingPublishable** _tmp1_;
+	gint _tmp1__length1;
+	SpitPublishingPublishable** _tmp2_;
+	gint _tmp2__length1;
 #line 192 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1114,20 +1108,20 @@ static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real
 	if (result_length1) {
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		*result_length1 = _tmp2__length1;
-#line 1114 "PublishingPluginHost.c"
+#line 1108 "PublishingPluginHost.c"
 	}
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	result = _tmp2_;
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	return result;
-#line 1120 "PublishingPluginHost.c"
+#line 1114 "PublishingPluginHost.c"
 }
 
 
 static void _spit_publishing_concrete_publishing_host_report_plugin_upload_progress_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	spit_publishing_concrete_publishing_host_report_plugin_upload_progress ((SpitPublishingConcretePublishingHost*) self, file_number, fraction_complete);
-#line 1127 "PublishingPluginHost.c"
+#line 1121 "PublishingPluginHost.c"
 }
 
 
@@ -1135,14 +1129,14 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 	SpitPublishingConcretePublishingHost * self;
 	SpitPublishingProgressCallback result = NULL;
 	PublishingUIProgressPane* progress_pane = NULL;
-	PublishingUIPublishingDialog* _tmp0_ = NULL;
-	SpitPublishingDialogPane* _tmp1_ = NULL;
+	PublishingUIPublishingDialog* _tmp0_;
+	SpitPublishingDialogPane* _tmp1_;
 	gint i = 0;
-	SpitPublishingPublishable** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	SpitPublishingProgressCallback _tmp25_ = NULL;
-	void* _tmp25__target = NULL;
-	GDestroyNotify _tmp25__target_destroy_notify = NULL;
+	SpitPublishingPublishable** _tmp2_;
+	gint _tmp2__length1;
+	SpitPublishingProgressCallback _tmp25_;
+	void* _tmp25__target;
+	GDestroyNotify _tmp25__target_destroy_notify;
 	GError * _inner_error_ = NULL;
 #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
@@ -1162,7 +1156,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 	_tmp2_ = self->priv->publishables;
 #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_tmp2__length1 = self->priv->publishables_length1;
-#line 1162 "PublishingPluginHost.c"
+#line 1156 "PublishingPluginHost.c"
 	{
 		SpitPublishingPublishable** publishable_collection = NULL;
 		gint publishable_collection_length1 = 0;
@@ -1174,51 +1168,51 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 		publishable_collection_length1 = _tmp2__length1;
 #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		for (publishable_it = 0; publishable_it < _tmp2__length1; publishable_it = publishable_it + 1) {
-#line 1174 "PublishingPluginHost.c"
-			SpitPublishingPublishable* _tmp3_ = NULL;
+#line 1168 "PublishingPluginHost.c"
+			SpitPublishingPublishable* _tmp3_;
 			SpitPublishingPublishable* publishable = NULL;
 #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 			_tmp3_ = _g_object_ref0 (publishable_collection[publishable_it]);
 #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 			publishable = _tmp3_;
-#line 1181 "PublishingPluginHost.c"
+#line 1175 "PublishingPluginHost.c"
 			{
 				gboolean _tmp4_ = FALSE;
-				gboolean _tmp5_ = FALSE;
+				gboolean _tmp5_;
 				gdouble phase_fraction_complete = 0.0;
-				gint _tmp18_ = 0;
-				SpitPublishingPublishable** _tmp19_ = NULL;
-				gint _tmp19__length1 = 0;
+				gint _tmp18_;
+				SpitPublishingPublishable** _tmp19_;
+				gint _tmp19__length1;
 				gdouble fraction_complete = 0.0;
-				gdouble _tmp20_ = 0.0;
-				gdouble _tmp21_ = 0.0;
-				PublishingUIProgressPane* _tmp22_ = NULL;
-				gdouble _tmp23_ = 0.0;
-				gint _tmp24_ = 0;
+				gdouble _tmp20_;
+				gdouble _tmp21_;
+				PublishingUIProgressPane* _tmp22_;
+				gdouble _tmp23_;
+				gint _tmp24_;
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 				_tmp5_ = self->priv->publishing_halted;
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 				if (_tmp5_) {
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					_tmp4_ = TRUE;
-#line 1201 "PublishingPluginHost.c"
+#line 1195 "PublishingPluginHost.c"
 				} else {
-					SpitPublishingPublisher* _tmp6_ = NULL;
-					gboolean _tmp7_ = FALSE;
+					SpitPublishingPublisher* _tmp6_;
+					gboolean _tmp7_;
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					_tmp6_ = self->priv->active_publisher;
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					_tmp7_ = spit_publishing_publisher_is_running (_tmp6_);
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					_tmp4_ = !_tmp7_;
-#line 1211 "PublishingPluginHost.c"
+#line 1205 "PublishingPluginHost.c"
 				}
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 				if (_tmp4_) {
-#line 1215 "PublishingPluginHost.c"
-					SpitPublishingProgressCallback _tmp8_ = NULL;
-					void* _tmp8__target = NULL;
-					GDestroyNotify _tmp8__target_destroy_notify = NULL;
+#line 1209 "PublishingPluginHost.c"
+					SpitPublishingProgressCallback _tmp8_;
+					void* _tmp8__target;
+					GDestroyNotify _tmp8__target_destroy_notify;
 #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					_tmp8_ = NULL;
 #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1237,17 +1231,17 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					_g_object_unref0 (progress_pane);
 #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					return result;
-#line 1237 "PublishingPluginHost.c"
+#line 1231 "PublishingPluginHost.c"
 				}
 				{
 					PublishingGlueMediaSourcePublishableWrapper* wrapper = NULL;
-					SpitPublishingPublishable* _tmp9_ = NULL;
-					PublishingGlueMediaSourcePublishableWrapper* _tmp10_ = NULL;
-					PublishingGlueMediaSourcePublishableWrapper* _tmp11_ = NULL;
-					gint _tmp12_ = 0;
-					gboolean _tmp13_ = FALSE;
-					GFile* _tmp14_ = NULL;
-					GFile* _tmp15_ = NULL;
+					SpitPublishingPublishable* _tmp9_;
+					PublishingGlueMediaSourcePublishableWrapper* _tmp10_;
+					PublishingGlueMediaSourcePublishableWrapper* _tmp11_;
+					gint _tmp12_;
+					gboolean _tmp13_;
+					GFile* _tmp14_;
+					GFile* _tmp15_;
 #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					_tmp9_ = publishable;
 #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1272,7 +1266,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 						_g_object_unref0 (wrapper);
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1272 "PublishingPluginHost.c"
+#line 1266 "PublishingPluginHost.c"
 							goto __catch38_spit_publishing_publishing_error;
 						}
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1287,20 +1281,20 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 						g_clear_error (&_inner_error_);
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 						return NULL;
-#line 1287 "PublishingPluginHost.c"
+#line 1281 "PublishingPluginHost.c"
 					}
 #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					_g_object_unref0 (wrapper);
-#line 1291 "PublishingPluginHost.c"
+#line 1285 "PublishingPluginHost.c"
 				}
 				goto __finally38;
 				__catch38_spit_publishing_publishing_error:
 				{
 					GError* err = NULL;
-					GError* _tmp16_ = NULL;
-					SpitPublishingProgressCallback _tmp17_ = NULL;
-					void* _tmp17__target = NULL;
-					GDestroyNotify _tmp17__target_destroy_notify = NULL;
+					GError* _tmp16_;
+					SpitPublishingProgressCallback _tmp17_;
+					void* _tmp17__target;
+					GDestroyNotify _tmp17__target_destroy_notify;
 #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					err = _inner_error_;
 #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1329,7 +1323,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					_g_object_unref0 (progress_pane);
 #line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					return result;
-#line 1329 "PublishingPluginHost.c"
+#line 1323 "PublishingPluginHost.c"
 				}
 				__finally38:
 #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1344,7 +1338,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					g_clear_error (&_inner_error_);
 #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					return NULL;
-#line 1344 "PublishingPluginHost.c"
+#line 1338 "PublishingPluginHost.c"
 				}
 #line 221 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 				_tmp18_ = i;
@@ -1377,7 +1371,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 				i = _tmp24_ + 1;
 #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 				_g_object_unref0 (publishable);
-#line 1376 "PublishingPluginHost.c"
+#line 1370 "PublishingPluginHost.c"
 			}
 		}
 	}
@@ -1397,7 +1391,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 	_g_object_unref0 (progress_pane);
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	return result;
-#line 1396 "PublishingPluginHost.c"
+#line 1390 "PublishingPluginHost.c"
 }
 
 
@@ -1408,7 +1402,7 @@ static void spit_publishing_concrete_publishing_host_class_init (SpitPublishingC
 	g_type_class_add_private (klass, sizeof (SpitPublishingConcretePublishingHostPrivate));
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	G_OBJECT_CLASS (klass)->finalize = spit_publishing_concrete_publishing_host_finalize;
-#line 1407 "PublishingPluginHost.c"
+#line 1401 "PublishingPluginHost.c"
 }
 
 
@@ -1416,36 +1410,36 @@ static void spit_publishing_concrete_publishing_host_spit_publishing_plugin_host
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	spit_publishing_concrete_publishing_host_spit_publishing_plugin_host_parent_iface = g_type_interface_peek_parent (iface);
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->install_dialog_pane = (void (*)(SpitPublishingPluginHost*, SpitPublishingDialogPane*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_dialog_pane;
+	iface->install_dialog_pane = (void (*) (SpitPublishingPluginHost *, SpitPublishingDialogPane*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_dialog_pane;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->post_error = (void (*)(SpitPublishingPluginHost*, GError*)) spit_publishing_concrete_publishing_host_real_post_error;
+	iface->post_error = (void (*) (SpitPublishingPluginHost *, GError*)) spit_publishing_concrete_publishing_host_real_post_error;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->stop_publishing = (void (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_stop_publishing;
+	iface->stop_publishing = (void (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_stop_publishing;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->get_publisher = (SpitPublishingPublisher* (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_get_publisher;
+	iface->get_publisher = (SpitPublishingPublisher* (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_get_publisher;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->install_static_message_pane = (void (*)(SpitPublishingPluginHost*, const gchar*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_static_message_pane;
+	iface->install_static_message_pane = (void (*) (SpitPublishingPluginHost *, const gchar*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_static_message_pane;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->install_pango_message_pane = (void (*)(SpitPublishingPluginHost*, const gchar*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_pango_message_pane;
+	iface->install_pango_message_pane = (void (*) (SpitPublishingPluginHost *, const gchar*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_pango_message_pane;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->install_success_pane = (void (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_install_success_pane;
+	iface->install_success_pane = (void (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_install_success_pane;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->install_account_fetch_wait_pane = (void (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_install_account_fetch_wait_pane;
+	iface->install_account_fetch_wait_pane = (void (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_install_account_fetch_wait_pane;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->install_login_wait_pane = (void (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_install_login_wait_pane;
+	iface->install_login_wait_pane = (void (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_install_login_wait_pane;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->install_welcome_pane = (void (*)(SpitPublishingPluginHost*, const gchar*, SpitPublishingLoginCallback, void*)) spit_publishing_concrete_publishing_host_real_install_welcome_pane;
+	iface->install_welcome_pane = (void (*) (SpitPublishingPluginHost *, const gchar*, SpitPublishingLoginCallback, void*)) spit_publishing_concrete_publishing_host_real_install_welcome_pane;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->set_service_locked = (void (*)(SpitPublishingPluginHost*, gboolean)) spit_publishing_concrete_publishing_host_real_set_service_locked;
+	iface->set_service_locked = (void (*) (SpitPublishingPluginHost *, gboolean)) spit_publishing_concrete_publishing_host_real_set_service_locked;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->set_dialog_default_widget = (void (*)(SpitPublishingPluginHost*, GtkWidget*)) spit_publishing_concrete_publishing_host_real_set_dialog_default_widget;
+	iface->set_dialog_default_widget = (void (*) (SpitPublishingPluginHost *, GtkWidget*)) spit_publishing_concrete_publishing_host_real_set_dialog_default_widget;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->get_publishable_media_type = (SpitPublishingPublisherMediaType (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_get_publishable_media_type;
+	iface->get_publishable_media_type = (SpitPublishingPublisherMediaType (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_get_publishable_media_type;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->get_publishables = (SpitPublishingPublishable** (*)(SpitPublishingPluginHost*, int*)) spit_publishing_concrete_publishing_host_real_get_publishables;
+	iface->get_publishables = (SpitPublishingPublishable** (*) (SpitPublishingPluginHost *, int*)) spit_publishing_concrete_publishing_host_real_get_publishables;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->serialize_publishables = (SpitPublishingProgressCallback (*)(SpitPublishingPluginHost*, gint, gboolean, void**, GDestroyNotify*)) spit_publishing_concrete_publishing_host_real_serialize_publishables;
-#line 1444 "PublishingPluginHost.c"
+	iface->serialize_publishables = (SpitPublishingProgressCallback (*) (SpitPublishingPluginHost *, gint, gboolean, void**, GDestroyNotify*)) spit_publishing_concrete_publishing_host_real_serialize_publishables;
+#line 1438 "PublishingPluginHost.c"
 }
 
 
@@ -1464,15 +1458,17 @@ static void spit_publishing_concrete_publishing_host_instance_init (SpitPublishi
 	self->priv->_publishables_size_ = self->priv->publishables_length1;
 #line 19 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self->priv->current_login_callback = NULL;
+#line 19 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
+	self->priv->current_login_callback_target = self;
 #line 20 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self->priv->publishing_halted = FALSE;
 #line 21 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self->priv->media_type = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_NONE;
-#line 1467 "PublishingPluginHost.c"
+#line 1463 "PublishingPluginHost.c"
 }
 
 
-static void spit_publishing_concrete_publishing_host_finalize (GObject* obj) {
+static void spit_publishing_concrete_publishing_host_finalize (GObject * obj) {
 	SpitPublishingConcretePublishingHost * self;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
@@ -1482,7 +1478,7 @@ static void spit_publishing_concrete_publishing_host_finalize (GObject* obj) {
 	self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	G_OBJECT_CLASS (spit_publishing_concrete_publishing_host_parent_class)->finalize (obj);
-#line 1481 "PublishingPluginHost.c"
+#line 1477 "PublishingPluginHost.c"
 }
 
 
diff --git a/src/publishing/PublishingUI.c b/src/publishing/PublishingUI.c
index 0da6971..a0fe079 100644
--- a/src/publishing/PublishingUI.c
+++ b/src/publishing/PublishingUI.c
@@ -1,4 +1,4 @@
-/* PublishingUI.c generated by valac 0.34.7, the Vala compiler
+/* PublishingUI.c generated by valac 0.36.6, the Vala compiler
  * generated from PublishingUI.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -54,6 +54,11 @@ typedef struct _PublishingUIStaticMessagePanePrivate PublishingUIStaticMessagePa
 typedef struct _PublishingUILoginWelcomePane PublishingUILoginWelcomePane;
 typedef struct _PublishingUILoginWelcomePaneClass PublishingUILoginWelcomePaneClass;
 typedef struct _PublishingUILoginWelcomePanePrivate PublishingUILoginWelcomePanePrivate;
+enum  {
+	PUBLISHING_UI_LOGIN_WELCOME_PANE_LOGIN_REQUESTED_SIGNAL,
+	PUBLISHING_UI_LOGIN_WELCOME_PANE_LAST_SIGNAL
+};
+static guint publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOME_PANE_LAST_SIGNAL] = {0};
 
 #define PUBLISHING_UI_TYPE_PROGRESS_PANE (publishing_ui_progress_pane_get_type ())
 #define PUBLISHING_UI_PROGRESS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_UI_TYPE_PROGRESS_PANE, PublishingUIProgressPane))
@@ -378,7 +383,7 @@ struct _PublishingUIPublishingDialogPrivate {
 
 
 static gpointer publishing_ui_concrete_dialog_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_ui_static_message_pane_parent_class = NULL;
 static gpointer publishing_ui_login_welcome_pane_parent_class = NULL;
 static gpointer publishing_ui_progress_pane_parent_class = NULL;
@@ -404,7 +409,7 @@ static GtkWidget* publishing_ui_concrete_dialog_pane_real_get_widget (SpitPublis
 static SpitPublishingDialogPaneGeometryOptions publishing_ui_concrete_dialog_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
 static void publishing_ui_concrete_dialog_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
 static void publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void publishing_ui_concrete_dialog_pane_finalize (GObject* obj);
+static void publishing_ui_concrete_dialog_pane_finalize (GObject * obj);
 GType publishing_ui_static_message_pane_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_UI_STATIC_MESSAGE_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_UI_TYPE_STATIC_MESSAGE_PANE, PublishingUIStaticMessagePanePrivate))
 enum  {
@@ -412,7 +417,7 @@ enum  {
 };
 PublishingUIStaticMessagePane* publishing_ui_static_message_pane_new (const gchar* message_string, gboolean enable_markup);
 PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GType object_type, const gchar* message_string, gboolean enable_markup);
-static void publishing_ui_static_message_pane_finalize (GObject* obj);
+static void publishing_ui_static_message_pane_finalize (GObject * obj);
 GType publishing_ui_login_welcome_pane_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_UI_LOGIN_WELCOME_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, PublishingUILoginWelcomePanePrivate))
 enum  {
@@ -422,7 +427,7 @@ PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_new (const gchar*
 PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType object_type, const gchar* service_welcome_message);
 static void publishing_ui_login_welcome_pane_on_login_clicked (PublishingUILoginWelcomePane* self);
 static void _publishing_ui_login_welcome_pane_on_login_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void publishing_ui_login_welcome_pane_finalize (GObject* obj);
+static void publishing_ui_login_welcome_pane_finalize (GObject * obj);
 GType publishing_ui_progress_pane_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_UI_PROGRESS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_UI_TYPE_PROGRESS_PANE, PublishingUIProgressPanePrivate))
 enum  {
@@ -433,7 +438,7 @@ PublishingUIProgressPane* publishing_ui_progress_pane_construct (GType object_ty
 void publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self, const gchar* text);
 void publishing_ui_progress_pane_set_progress (PublishingUIProgressPane* self, gdouble progress);
 void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, const gchar* status_text, gdouble progress);
-static void publishing_ui_progress_pane_finalize (GObject* obj);
+static void publishing_ui_progress_pane_finalize (GObject * obj);
 GType publishing_ui_success_pane_get_type (void) G_GNUC_CONST;
 enum  {
 	PUBLISHING_UI_SUCCESS_PANE_DUMMY_PROPERTY
@@ -483,7 +488,7 @@ static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_dele
 PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_new (MediaSource* to_wrap);
 PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_construct (GType object_type, MediaSource* to_wrap);
 GType publishing_glue_media_source_publishable_wrapper_get_type (void) G_GNUC_CONST;
-static void _vala_array_add55 (SpitPublishingPublishable*** array, int* length, int* size, SpitPublishingPublishable* value);
+static void _vala_array_add55 (SpitPublishingPublishable** * array, int* length, int* size, SpitPublishingPublishable* value);
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
@@ -500,13 +505,13 @@ static void publishing_ui_publishing_dialog_set_standard_window_mode (Publishing
 static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services (int* result_length1);
 GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled);
 gchar* plugins_get_pluggable_module_id (SpitPluggable* needle);
-static void _vala_array_add56 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value);
+static void _vala_array_add56 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
 static gint __lambda15_ (void* a, void* b);
 gint utf8_cs_compare (void* a, void* b);
 static gint ___lambda15____compar_fn_t (void* key1, void* key2);
-static void _vala_array_add57 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value);
-static void _vala_array_add58 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value);
-static void _vala_array_add59 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value);
+static void _vala_array_add57 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
+static void _vala_array_add58 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
+static void _vala_array_add59 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
 void publishing_ui_publishing_dialog_go (GeeCollection* to_publish);
 GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
@@ -530,14 +535,14 @@ void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublish
 void publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self);
 void publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self);
 void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* self, SpitPublishingDialogPane* pane);
-static void publishing_ui_publishing_dialog_finalize (GObject* obj);
+static void publishing_ui_publishing_dialog_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
 PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_construct (GType object_type) {
 	PublishingUIConcreteDialogPane * self = NULL;
-	GtkBuilder* _tmp0_ = NULL;
+	GtkBuilder* _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = (PublishingUIConcreteDialogPane*) g_object_new (object_type, NULL);
 #line 14 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -548,29 +553,29 @@ PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_construct (GT
 	self->builder = _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 552 "PublishingUI.c"
+#line 557 "PublishingUI.c"
 }
 
 
 PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_new (void) {
 #line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_concrete_dialog_pane_construct (PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE);
-#line 559 "PublishingUI.c"
+#line 564 "PublishingUI.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 18 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 566 "PublishingUI.c"
+#line 571 "PublishingUI.c"
 }
 
 
 static GtkWidget* publishing_ui_concrete_dialog_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	PublishingUIConcreteDialogPane * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 17 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane);
 #line 18 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -581,7 +586,7 @@ static GtkWidget* publishing_ui_concrete_dialog_pane_real_get_widget (SpitPublis
 	result = _tmp1_;
 #line 18 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 585 "PublishingUI.c"
+#line 590 "PublishingUI.c"
 }
 
 
@@ -594,7 +599,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_ui_concrete_dialog_pan
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 22 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 598 "PublishingUI.c"
+#line 603 "PublishingUI.c"
 }
 
 
@@ -602,7 +607,7 @@ static void publishing_ui_concrete_dialog_pane_real_on_pane_installed (SpitPubli
 	PublishingUIConcreteDialogPane * self;
 #line 25 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane);
-#line 606 "PublishingUI.c"
+#line 611 "PublishingUI.c"
 }
 
 
@@ -610,7 +615,7 @@ static void publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitPub
 	PublishingUIConcreteDialogPane * self;
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane);
-#line 614 "PublishingUI.c"
+#line 619 "PublishingUI.c"
 }
 
 
@@ -619,7 +624,7 @@ static void publishing_ui_concrete_dialog_pane_class_init (PublishingUIConcreteD
 	publishing_ui_concrete_dialog_pane_parent_class = g_type_class_peek_parent (klass);
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_ui_concrete_dialog_pane_finalize;
-#line 623 "PublishingUI.c"
+#line 628 "PublishingUI.c"
 }
 
 
@@ -627,14 +632,14 @@ static void publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_inter
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_ui_concrete_dialog_pane_real_get_widget;
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_ui_concrete_dialog_pane_real_get_widget;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_ui_concrete_dialog_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_ui_concrete_dialog_pane_real_get_preferred_geometry;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_ui_concrete_dialog_pane_real_on_pane_installed;
+	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_ui_concrete_dialog_pane_real_on_pane_installed;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled;
-#line 638 "PublishingUI.c"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled;
+#line 643 "PublishingUI.c"
 }
 
 
@@ -643,11 +648,11 @@ static void publishing_ui_concrete_dialog_pane_instance_init (PublishingUIConcre
 	self->pane_widget = NULL;
 #line 11 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->builder = NULL;
-#line 647 "PublishingUI.c"
+#line 652 "PublishingUI.c"
 }
 
 
-static void publishing_ui_concrete_dialog_pane_finalize (GObject* obj) {
+static void publishing_ui_concrete_dialog_pane_finalize (GObject * obj) {
 	PublishingUIConcreteDialogPane * self;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane);
@@ -657,7 +662,7 @@ static void publishing_ui_concrete_dialog_pane_finalize (GObject* obj) {
 	_g_object_unref0 (self->builder);
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (publishing_ui_concrete_dialog_pane_parent_class)->finalize (obj);
-#line 661 "PublishingUI.c"
+#line 666 "PublishingUI.c"
 }
 
 
@@ -677,13 +682,13 @@ GType publishing_ui_concrete_dialog_pane_get_type (void) {
 
 PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GType object_type, const gchar* message_string, gboolean enable_markup) {
 	PublishingUIStaticMessagePane * self = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	GtkLabel* _tmp2_ = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GObject* _tmp4_ = NULL;
-	GtkBox* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	GtkBuilder* _tmp0_;
+	GObject* _tmp1_;
+	GtkLabel* _tmp2_;
+	GtkBuilder* _tmp3_;
+	GObject* _tmp4_;
+	GtkBox* _tmp5_;
+	gboolean _tmp6_;
 #line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (message_string != NULL, NULL);
 #line 36 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -712,11 +717,11 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp
 	_tmp6_ = enable_markup;
 #line 40 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp6_) {
-#line 716 "PublishingUI.c"
-		GtkLabel* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		GtkLabel* _tmp9_ = NULL;
-		GtkLabel* _tmp10_ = NULL;
+#line 721 "PublishingUI.c"
+		GtkLabel* _tmp7_;
+		const gchar* _tmp8_;
+		GtkLabel* _tmp9_;
+		GtkLabel* _tmp10_;
 #line 41 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp7_ = self->priv->msg_label;
 #line 41 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -731,28 +736,28 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp
 		_tmp10_ = self->priv->msg_label;
 #line 43 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_label_set_use_markup (_tmp10_, TRUE);
-#line 735 "PublishingUI.c"
+#line 740 "PublishingUI.c"
 	} else {
-		GtkLabel* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
+		GtkLabel* _tmp11_;
+		const gchar* _tmp12_;
 #line 45 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp11_ = self->priv->msg_label;
 #line 45 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp12_ = message_string;
 #line 45 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_label_set_label (_tmp11_, _tmp12_);
-#line 745 "PublishingUI.c"
+#line 750 "PublishingUI.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 749 "PublishingUI.c"
+#line 754 "PublishingUI.c"
 }
 
 
 PublishingUIStaticMessagePane* publishing_ui_static_message_pane_new (const gchar* message_string, gboolean enable_markup) {
 #line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_static_message_pane_construct (PUBLISHING_UI_TYPE_STATIC_MESSAGE_PANE, message_string, enable_markup);
-#line 756 "PublishingUI.c"
+#line 761 "PublishingUI.c"
 }
 
 
@@ -763,7 +768,7 @@ static void publishing_ui_static_message_pane_class_init (PublishingUIStaticMess
 	g_type_class_add_private (klass, sizeof (PublishingUIStaticMessagePanePrivate));
 #line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_ui_static_message_pane_finalize;
-#line 767 "PublishingUI.c"
+#line 772 "PublishingUI.c"
 }
 
 
@@ -772,11 +777,11 @@ static void publishing_ui_static_message_pane_instance_init (PublishingUIStaticM
 	self->priv = PUBLISHING_UI_STATIC_MESSAGE_PANE_GET_PRIVATE (self);
 #line 33 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->msg_label = NULL;
-#line 776 "PublishingUI.c"
+#line 781 "PublishingUI.c"
 }
 
 
-static void publishing_ui_static_message_pane_finalize (GObject* obj) {
+static void publishing_ui_static_message_pane_finalize (GObject * obj) {
 	PublishingUIStaticMessagePane * self;
 #line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_STATIC_MESSAGE_PANE, PublishingUIStaticMessagePane);
@@ -784,7 +789,7 @@ static void publishing_ui_static_message_pane_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->msg_label);
 #line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (publishing_ui_static_message_pane_parent_class)->finalize (obj);
-#line 788 "PublishingUI.c"
+#line 793 "PublishingUI.c"
 }
 
 
@@ -803,25 +808,25 @@ GType publishing_ui_static_message_pane_get_type (void) {
 static void _publishing_ui_login_welcome_pane_on_login_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 62 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_login_welcome_pane_on_login_clicked ((PublishingUILoginWelcomePane*) self);
-#line 807 "PublishingUI.c"
+#line 812 "PublishingUI.c"
 }
 
 
 PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType object_type, const gchar* service_welcome_message) {
 	PublishingUILoginWelcomePane * self = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	GtkBox* _tmp2_ = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GObject* _tmp4_ = NULL;
-	GtkButton* _tmp5_ = NULL;
-	GtkBuilder* _tmp6_ = NULL;
-	GObject* _tmp7_ = NULL;
-	GtkLabel* _tmp8_ = NULL;
-	GtkButton* _tmp9_ = NULL;
-	GtkLabel* _tmp10_ = NULL;
-	GtkLabel* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
+	GtkBuilder* _tmp0_;
+	GObject* _tmp1_;
+	GtkBox* _tmp2_;
+	GtkBuilder* _tmp3_;
+	GObject* _tmp4_;
+	GtkButton* _tmp5_;
+	GtkBuilder* _tmp6_;
+	GObject* _tmp7_;
+	GtkLabel* _tmp8_;
+	GtkButton* _tmp9_;
+	GtkLabel* _tmp10_;
+	GtkLabel* _tmp11_;
+	const gchar* _tmp12_;
 #line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (service_welcome_message != NULL, NULL);
 #line 57 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -872,14 +877,14 @@ PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType
 	gtk_label_set_markup (_tmp11_, _tmp12_);
 #line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 876 "PublishingUI.c"
+#line 881 "PublishingUI.c"
 }
 
 
 PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_new (const gchar* service_welcome_message) {
 #line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_login_welcome_pane_construct (PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, service_welcome_message);
-#line 883 "PublishingUI.c"
+#line 888 "PublishingUI.c"
 }
 
 
@@ -887,8 +892,8 @@ static void publishing_ui_login_welcome_pane_on_login_clicked (PublishingUILogin
 #line 67 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_LOGIN_WELCOME_PANE (self));
 #line 68 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_signal_emit_by_name (self, "login-requested");
-#line 892 "PublishingUI.c"
+	g_signal_emit (self, publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOME_PANE_LOGIN_REQUESTED_SIGNAL], 0);
+#line 897 "PublishingUI.c"
 }
 
 
@@ -900,8 +905,8 @@ static void publishing_ui_login_welcome_pane_class_init (PublishingUILoginWelcom
 #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_ui_login_welcome_pane_finalize;
 #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_signal_new ("login_requested", PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 905 "PublishingUI.c"
+	publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOME_PANE_LOGIN_REQUESTED_SIGNAL] = g_signal_new ("login-requested", PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 910 "PublishingUI.c"
 }
 
 
@@ -912,11 +917,11 @@ static void publishing_ui_login_welcome_pane_instance_init (PublishingUILoginWel
 	self->priv->login_button = NULL;
 #line 52 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->not_logged_in_label = NULL;
-#line 916 "PublishingUI.c"
+#line 921 "PublishingUI.c"
 }
 
 
-static void publishing_ui_login_welcome_pane_finalize (GObject* obj) {
+static void publishing_ui_login_welcome_pane_finalize (GObject * obj) {
 	PublishingUILoginWelcomePane * self;
 #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, PublishingUILoginWelcomePane);
@@ -926,7 +931,7 @@ static void publishing_ui_login_welcome_pane_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->not_logged_in_label);
 #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (publishing_ui_login_welcome_pane_parent_class)->finalize (obj);
-#line 930 "PublishingUI.c"
+#line 935 "PublishingUI.c"
 }
 
 
@@ -944,12 +949,12 @@ GType publishing_ui_login_welcome_pane_get_type (void) {
 
 PublishingUIProgressPane* publishing_ui_progress_pane_construct (GType object_type) {
 	PublishingUIProgressPane * self = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	GtkBox* _tmp2_ = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GObject* _tmp4_ = NULL;
-	GtkProgressBar* _tmp5_ = NULL;
+	GtkBuilder* _tmp0_;
+	GObject* _tmp1_;
+	GtkBox* _tmp2_;
+	GtkBuilder* _tmp3_;
+	GObject* _tmp4_;
+	GtkProgressBar* _tmp5_;
 #line 76 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = (PublishingUIProgressPane*) publishing_ui_concrete_dialog_pane_construct (object_type);
 #line 77 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -974,20 +979,20 @@ PublishingUIProgressPane* publishing_ui_progress_pane_construct (GType object_ty
 	self->priv->progress_bar = _tmp5_;
 #line 75 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 978 "PublishingUI.c"
+#line 983 "PublishingUI.c"
 }
 
 
 PublishingUIProgressPane* publishing_ui_progress_pane_new (void) {
 #line 75 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_progress_pane_construct (PUBLISHING_UI_TYPE_PROGRESS_PANE);
-#line 985 "PublishingUI.c"
+#line 990 "PublishingUI.c"
 }
 
 
 void publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self, const gchar* text) {
-	GtkProgressBar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	GtkProgressBar* _tmp0_;
+	const gchar* _tmp1_;
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PROGRESS_PANE (self));
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -998,13 +1003,13 @@ void publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self, const
 	_tmp1_ = text;
 #line 82 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 1002 "PublishingUI.c"
+#line 1007 "PublishingUI.c"
 }
 
 
 void publishing_ui_progress_pane_set_progress (PublishingUIProgressPane* self, gdouble progress) {
-	GtkProgressBar* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
+	GtkProgressBar* _tmp0_;
+	gdouble _tmp1_;
 #line 85 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PROGRESS_PANE (self));
 #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1013,15 +1018,15 @@ void publishing_ui_progress_pane_set_progress (PublishingUIProgressPane* self, g
 	_tmp1_ = progress;
 #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
-#line 1017 "PublishingUI.c"
+#line 1022 "PublishingUI.c"
 }
 
 
 void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, const gchar* status_text, gdouble progress) {
-	const gchar* _tmp0_ = NULL;
-	GtkProgressBar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gdouble _tmp5_ = 0.0;
+	const gchar* _tmp0_;
+	GtkProgressBar* _tmp1_;
+	const gchar* _tmp2_;
+	gdouble _tmp5_;
 #line 89 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PROGRESS_PANE (self));
 #line 89 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1034,22 +1039,22 @@ void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, con
 	_tmp2_ = gtk_progress_bar_get_text (_tmp1_);
 #line 90 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (g_strcmp0 (_tmp0_, _tmp2_) != 0) {
-#line 1038 "PublishingUI.c"
-		GtkProgressBar* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
+#line 1043 "PublishingUI.c"
+		GtkProgressBar* _tmp3_;
+		const gchar* _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp3_ = self->priv->progress_bar;
 #line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = status_text;
 #line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_progress_bar_set_text (_tmp3_, _tmp4_);
-#line 1047 "PublishingUI.c"
+#line 1052 "PublishingUI.c"
 	}
 #line 93 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp5_ = progress;
 #line 93 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_progress_pane_set_progress (self, _tmp5_);
-#line 1053 "PublishingUI.c"
+#line 1058 "PublishingUI.c"
 }
 
 
@@ -1060,7 +1065,7 @@ static void publishing_ui_progress_pane_class_init (PublishingUIProgressPaneClas
 	g_type_class_add_private (klass, sizeof (PublishingUIProgressPanePrivate));
 #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_ui_progress_pane_finalize;
-#line 1064 "PublishingUI.c"
+#line 1069 "PublishingUI.c"
 }
 
 
@@ -1069,11 +1074,11 @@ static void publishing_ui_progress_pane_instance_init (PublishingUIProgressPane
 	self->priv = PUBLISHING_UI_PROGRESS_PANE_GET_PRIVATE (self);
 #line 73 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->progress_bar = NULL;
-#line 1073 "PublishingUI.c"
+#line 1078 "PublishingUI.c"
 }
 
 
-static void publishing_ui_progress_pane_finalize (GObject* obj) {
+static void publishing_ui_progress_pane_finalize (GObject * obj) {
 	PublishingUIProgressPane * self;
 #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_PROGRESS_PANE, PublishingUIProgressPane);
@@ -1081,7 +1086,7 @@ static void publishing_ui_progress_pane_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->progress_bar);
 #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (publishing_ui_progress_pane_parent_class)->finalize (obj);
-#line 1085 "PublishingUI.c"
+#line 1090 "PublishingUI.c"
 }
 
 
@@ -1100,98 +1105,89 @@ GType publishing_ui_progress_pane_get_type (void) {
 PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type, SpitPublishingPublisherMediaType published_media, gint num_uploaded) {
 	PublishingUISuccessPane * self = NULL;
 	gchar* message_string = NULL;
-	SpitPublishingPublisherMediaType _tmp0_ = 0;
-	const gchar* _tmp11_ = NULL;
+	SpitPublishingPublisherMediaType _tmp0_;
+	const gchar* _tmp8_;
 #line 99 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	message_string = NULL;
 #line 103 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = published_media;
 #line 103 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1112 "PublishingUI.c"
-		gint _tmp1_ = 0;
-		const gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+#line 1117 "PublishingUI.c"
+		gint _tmp1_;
+		gchar* _tmp2_;
 #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp1_ = num_uploaded;
 #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp2_ = ngettext ("The selected video was successfully published.", "The selected videos were successfully published.", (gulong) _tmp1_);
-#line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp3_ = g_strdup (_tmp2_);
+		_tmp2_ = g_strdup (ngettext ("The selected video was successfully published.", "The selected videos were successfully published.", (gulong) _tmp1_));
 #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_free0 (message_string);
 #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		message_string = _tmp3_;
-#line 1126 "PublishingUI.c"
+		message_string = _tmp2_;
+#line 1128 "PublishingUI.c"
 	} else {
-		SpitPublishingPublisherMediaType _tmp4_ = 0;
+		SpitPublishingPublisherMediaType _tmp3_;
 #line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp4_ = published_media;
+		_tmp3_ = published_media;
 #line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		if (_tmp4_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 1133 "PublishingUI.c"
-			gint _tmp5_ = 0;
-			const gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
-#line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp5_ = num_uploaded;
+		if (_tmp3_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
+#line 1135 "PublishingUI.c"
+			gint _tmp4_;
+			gchar* _tmp5_;
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp6_ = ngettext ("The selected photo was successfully published.", "The selected photos were successfully published.", (gulong) _tmp5_);
+			_tmp4_ = num_uploaded;
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp7_ = g_strdup (_tmp6_);
+			_tmp5_ = g_strdup (ngettext ("The selected photo was successfully published.", "The selected photos were successfully published.", (gulong) _tmp4_));
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (message_string);
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			message_string = _tmp7_;
-#line 1147 "PublishingUI.c"
+			message_string = _tmp5_;
+#line 1146 "PublishingUI.c"
 		} else {
-			SpitPublishingPublisherMediaType _tmp8_ = 0;
+			SpitPublishingPublisherMediaType _tmp6_;
 #line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp8_ = published_media;
+			_tmp6_ = published_media;
 #line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			if (_tmp8_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
-#line 1154 "PublishingUI.c"
-				const gchar* _tmp9_ = NULL;
-				gchar* _tmp10_ = NULL;
+			if (_tmp6_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
+#line 1153 "PublishingUI.c"
+				gchar* _tmp7_;
 #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp9_ = _ ("The selected photos/videos were successfully published.");
-#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp10_ = g_strdup (_tmp9_);
+				_tmp7_ = g_strdup (_ ("The selected photos/videos were successfully published."));
 #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_free0 (message_string);
 #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				message_string = _tmp10_;
-#line 1165 "PublishingUI.c"
+				message_string = _tmp7_;
+#line 1161 "PublishingUI.c"
 			} else {
 #line 118 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				g_assert_not_reached ();
-#line 1169 "PublishingUI.c"
+#line 1165 "PublishingUI.c"
 			}
 		}
 	}
 #line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp11_ = message_string;
+	_tmp8_ = message_string;
 #line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self = (PublishingUISuccessPane*) publishing_ui_static_message_pane_construct (object_type, _tmp11_, FALSE);
+	self = (PublishingUISuccessPane*) publishing_ui_static_message_pane_construct (object_type, _tmp8_, FALSE);
 #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_free0 (message_string);
 #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 1181 "PublishingUI.c"
+#line 1177 "PublishingUI.c"
 }
 
 
 PublishingUISuccessPane* publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media, gint num_uploaded) {
 #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_success_pane_construct (PUBLISHING_UI_TYPE_SUCCESS_PANE, published_media, num_uploaded);
-#line 1188 "PublishingUI.c"
+#line 1184 "PublishingUI.c"
 }
 
 
 static void publishing_ui_success_pane_class_init (PublishingUISuccessPaneClass * klass) {
 #line 97 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_success_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1195 "PublishingUI.c"
+#line 1191 "PublishingUI.c"
 }
 
 
@@ -1213,28 +1209,25 @@ GType publishing_ui_success_pane_get_type (void) {
 
 PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_construct (GType object_type) {
 	PublishingUIAccountFetchWaitPane * self = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 127 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp0_ = _ ("Fetching account information…");
-#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self = (PublishingUIAccountFetchWaitPane*) publishing_ui_static_message_pane_construct (object_type, _tmp0_, FALSE);
+	self = (PublishingUIAccountFetchWaitPane*) publishing_ui_static_message_pane_construct (object_type, _ ("Fetching account information…"), FALSE);
 #line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 1224 "PublishingUI.c"
+#line 1217 "PublishingUI.c"
 }
 
 
 PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_new (void) {
 #line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_account_fetch_wait_pane_construct (PUBLISHING_UI_TYPE_ACCOUNT_FETCH_WAIT_PANE);
-#line 1231 "PublishingUI.c"
+#line 1224 "PublishingUI.c"
 }
 
 
 static void publishing_ui_account_fetch_wait_pane_class_init (PublishingUIAccountFetchWaitPaneClass * klass) {
 #line 125 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_account_fetch_wait_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1238 "PublishingUI.c"
+#line 1231 "PublishingUI.c"
 }
 
 
@@ -1256,28 +1249,25 @@ GType publishing_ui_account_fetch_wait_pane_get_type (void) {
 
 PublishingUILoginWaitPane* publishing_ui_login_wait_pane_construct (GType object_type) {
 	PublishingUILoginWaitPane * self = NULL;
-	const gchar* _tmp0_ = NULL;
-#line 133 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp0_ = _ ("Logging in…");
 #line 133 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self = (PublishingUILoginWaitPane*) publishing_ui_static_message_pane_construct (object_type, _tmp0_, FALSE);
+	self = (PublishingUILoginWaitPane*) publishing_ui_static_message_pane_construct (object_type, _ ("Logging in…"), FALSE);
 #line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 1267 "PublishingUI.c"
+#line 1257 "PublishingUI.c"
 }
 
 
 PublishingUILoginWaitPane* publishing_ui_login_wait_pane_new (void) {
 #line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_login_wait_pane_construct (PUBLISHING_UI_TYPE_LOGIN_WAIT_PANE);
-#line 1274 "PublishingUI.c"
+#line 1264 "PublishingUI.c"
 }
 
 
 static void publishing_ui_login_wait_pane_class_init (PublishingUILoginWaitPaneClass * klass) {
 #line 131 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_login_wait_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1281 "PublishingUI.c"
+#line 1271 "PublishingUI.c"
 }
 
 
@@ -1302,99 +1292,99 @@ static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_dele
 	result = publishing_ui_publishing_dialog_on_window_close ((PublishingUIPublishingDialog*) self, event);
 #line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 1306 "PublishingUI.c"
+#line 1296 "PublishingUI.c"
 }
 
 
-static void _vala_array_add55 (SpitPublishingPublishable*** array, int* length, int* size, SpitPublishingPublishable* value) {
+static void _vala_array_add55 (SpitPublishingPublishable** * array, int* length, int* size, SpitPublishingPublishable* value) {
 #line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
 #line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingPublishable*, *array, (*size) + 1);
-#line 1317 "PublishingUI.c"
+#line 1307 "PublishingUI.c"
 	}
 #line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
 #line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 1323 "PublishingUI.c"
+#line 1313 "PublishingUI.c"
 }
 
 
 static void _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_on_service_changed ((PublishingUIPublishingDialog*) self);
-#line 1330 "PublishingUI.c"
+#line 1320 "PublishingUI.c"
 }
 
 
 static void _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_on_close_cancel_clicked ((PublishingUIPublishingDialog*) self);
-#line 1337 "PublishingUI.c"
+#line 1327 "PublishingUI.c"
 }
 
 
 PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType object_type, GeeCollection* to_publish) {
 	PublishingUIPublishingDialog * self = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gboolean use_header = FALSE;
-	GtkSettings* _tmp3_ = NULL;
+	GtkSettings* _tmp3_;
 	gint _tmp4_ = 0;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	AppWindow* _tmp8_ = NULL;
-	AppWindow* _tmp9_ = NULL;
-	SpitPublishingPublishable** _tmp10_ = NULL;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	AppWindow* _tmp8_;
+	AppWindow* _tmp9_;
+	SpitPublishingPublishable** _tmp10_;
 	gboolean has_photos = FALSE;
 	gboolean has_videos = FALSE;
 	gchar* title = NULL;
 	gchar* label = NULL;
 	gboolean _tmp26_ = FALSE;
-	gboolean _tmp27_ = FALSE;
-	const gchar* _tmp44_ = NULL;
-	GtkListStore* _tmp45_ = NULL;
-	GtkListStore* _tmp46_ = NULL;
-	GtkComboBox* _tmp47_ = NULL;
+	gboolean _tmp27_;
+	const gchar* _tmp38_;
+	GtkListStore* _tmp39_;
+	GtkListStore* _tmp40_;
+	GtkComboBox* _tmp41_;
 	GtkCellRendererPixbuf* renderer_pix = NULL;
-	GtkCellRendererPixbuf* _tmp48_ = NULL;
-	GtkComboBox* _tmp49_ = NULL;
-	GtkCellRendererPixbuf* _tmp50_ = NULL;
-	GtkComboBox* _tmp51_ = NULL;
-	GtkCellRendererPixbuf* _tmp52_ = NULL;
+	GtkCellRendererPixbuf* _tmp42_;
+	GtkComboBox* _tmp43_;
+	GtkCellRendererPixbuf* _tmp44_;
+	GtkComboBox* _tmp45_;
+	GtkCellRendererPixbuf* _tmp46_;
 	GtkCellRendererText* renderer_text = NULL;
-	GtkCellRendererText* _tmp53_ = NULL;
-	GtkComboBox* _tmp54_ = NULL;
-	GtkCellRendererText* _tmp55_ = NULL;
-	GtkComboBox* _tmp56_ = NULL;
-	GtkCellRendererText* _tmp57_ = NULL;
-	GtkComboBox* _tmp58_ = NULL;
+	GtkCellRendererText* _tmp47_;
+	GtkComboBox* _tmp48_;
+	GtkCellRendererText* _tmp49_;
+	GtkComboBox* _tmp50_;
+	GtkCellRendererText* _tmp51_;
+	GtkComboBox* _tmp52_;
 	gchar* last_used_service = NULL;
-	ConfigFacade* _tmp59_ = NULL;
-	ConfigFacade* _tmp60_ = NULL;
-	gchar* _tmp61_ = NULL;
-	gchar* _tmp62_ = NULL;
+	ConfigFacade* _tmp53_;
+	ConfigFacade* _tmp54_;
+	gchar* _tmp55_;
+	gchar* _tmp56_;
 	SpitPublishingService** loaded_services = NULL;
-	gboolean _tmp63_ = FALSE;
-	gboolean _tmp64_ = FALSE;
-	gint _tmp65_ = 0;
-	SpitPublishingService** _tmp66_ = NULL;
-	gint loaded_services_length1 = 0;
-	gint _loaded_services_size_ = 0;
+	gboolean _tmp57_;
+	gboolean _tmp58_;
+	gint _tmp59_;
+	SpitPublishingService** _tmp60_;
+	gint loaded_services_length1;
+	gint _loaded_services_size_;
 	GtkTreeIter iter = {0};
-	SpitPublishingService** _tmp67_ = NULL;
-	gint _tmp67__length1 = 0;
-	GtkComboBox* _tmp105_ = NULL;
-	gboolean _tmp106_ = FALSE;
-	GtkBox* _tmp136_ = NULL;
-	GtkBox* _tmp137_ = NULL;
-	GtkBox* _tmp138_ = NULL;
-	gboolean _tmp139_ = FALSE;
-	GtkButton* _tmp149_ = NULL;
+	SpitPublishingService** _tmp61_;
+	gint _tmp61__length1;
+	GtkComboBox* _tmp99_;
+	gboolean _tmp100_;
+	GtkBox* _tmp130_;
+	GtkBox* _tmp131_;
+	GtkBox* _tmp132_;
+	gboolean _tmp133_;
+	GtkButton* _tmp142_;
 #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (to_publish), NULL);
 #line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1417,11 +1407,11 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 	if (_tmp5_) {
 #line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = 1;
-#line 1421 "PublishingUI.c"
+#line 1411 "PublishingUI.c"
 	} else {
 #line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = 0;
-#line 1425 "PublishingUI.c"
+#line 1415 "PublishingUI.c"
 	}
 #line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = (PublishingUIPublishingDialog*) g_object_new (object_type, "use-header-bar", _tmp4_, NULL);
@@ -1429,13 +1419,13 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 	_tmp6_ = use_header;
 #line 167 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp6_) {
-#line 1433 "PublishingUI.c"
-		GtkWidget* _tmp7_ = NULL;
+#line 1423 "PublishingUI.c"
+		GtkWidget* _tmp7_;
 #line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp7_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE);
-#line 1439 "PublishingUI.c"
+#line 1429 "PublishingUI.c"
 	}
 #line 170 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
@@ -1465,11 +1455,11 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 	has_photos = FALSE;
 #line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	has_videos = FALSE;
-#line 1469 "PublishingUI.c"
+#line 1459 "PublishingUI.c"
 	{
 		GeeIterator* _media_it = NULL;
-		GeeCollection* _tmp11_ = NULL;
-		GeeIterator* _tmp12_ = NULL;
+		GeeCollection* _tmp11_;
+		GeeIterator* _tmp12_;
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp11_ = to_publish;
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1478,21 +1468,21 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 		_media_it = _tmp12_;
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		while (TRUE) {
-#line 1482 "PublishingUI.c"
-			GeeIterator* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
+#line 1472 "PublishingUI.c"
+			GeeIterator* _tmp13_;
+			gboolean _tmp14_;
 			MediaSource* media = NULL;
-			GeeIterator* _tmp15_ = NULL;
-			gpointer _tmp16_ = NULL;
+			GeeIterator* _tmp15_;
+			gpointer _tmp16_;
 			SpitPublishingPublishable* publishable = NULL;
-			MediaSource* _tmp17_ = NULL;
-			PublishingGlueMediaSourcePublishableWrapper* _tmp18_ = NULL;
-			SpitPublishingPublishable* _tmp19_ = NULL;
-			SpitPublishingPublisherMediaType _tmp20_ = 0;
-			SpitPublishingPublishable** _tmp23_ = NULL;
-			gint _tmp23__length1 = 0;
-			SpitPublishingPublishable* _tmp24_ = NULL;
-			SpitPublishingPublishable* _tmp25_ = NULL;
+			MediaSource* _tmp17_;
+			PublishingGlueMediaSourcePublishableWrapper* _tmp18_;
+			SpitPublishingPublishable* _tmp19_;
+			SpitPublishingPublisherMediaType _tmp20_;
+			SpitPublishingPublishable** _tmp23_;
+			gint _tmp23__length1;
+			SpitPublishingPublishable* _tmp24_;
+			SpitPublishingPublishable* _tmp25_;
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp13_ = _media_it;
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1501,7 +1491,7 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 			if (!_tmp14_) {
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				break;
-#line 1505 "PublishingUI.c"
+#line 1495 "PublishingUI.c"
 			}
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp15_ = _media_it;
@@ -1523,10 +1513,10 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 			if (_tmp20_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
 #line 182 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				has_photos = TRUE;
-#line 1527 "PublishingUI.c"
+#line 1517 "PublishingUI.c"
 			} else {
-				SpitPublishingPublishable* _tmp21_ = NULL;
-				SpitPublishingPublisherMediaType _tmp22_ = 0;
+				SpitPublishingPublishable* _tmp21_;
+				SpitPublishingPublisherMediaType _tmp22_;
 #line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp21_ = publishable;
 #line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1535,11 +1525,11 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 				if (_tmp22_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
 #line 184 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					has_videos = TRUE;
-#line 1539 "PublishingUI.c"
+#line 1529 "PublishingUI.c"
 				} else {
 #line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					g_assert_not_reached ();
-#line 1543 "PublishingUI.c"
+#line 1533 "PublishingUI.c"
 				}
 			}
 #line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1556,11 +1546,11 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 			_g_object_unref0 (publishable);
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_object_unref0 (media);
-#line 1560 "PublishingUI.c"
+#line 1550 "PublishingUI.c"
 		}
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (_media_it);
-#line 1564 "PublishingUI.c"
+#line 1554 "PublishingUI.c"
 	}
 #line 191 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	title = NULL;
@@ -1570,626 +1560,605 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 	_tmp27_ = has_photos;
 #line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp27_) {
-#line 1574 "PublishingUI.c"
-		gboolean _tmp28_ = FALSE;
+#line 1564 "PublishingUI.c"
+		gboolean _tmp28_;
 #line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp28_ = has_videos;
 #line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp26_ = !_tmp28_;
-#line 1580 "PublishingUI.c"
+#line 1570 "PublishingUI.c"
 	} else {
 #line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp26_ = FALSE;
-#line 1584 "PublishingUI.c"
+#line 1574 "PublishingUI.c"
 	}
 #line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp26_) {
-#line 1588 "PublishingUI.c"
-		const gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		const gchar* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp29_ = _ ("Publish Photos");
+#line 1578 "PublishingUI.c"
+		gchar* _tmp29_;
+		gchar* _tmp30_;
 #line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp30_ = g_strdup (_tmp29_);
+		_tmp29_ = g_strdup (_ ("Publish Photos"));
 #line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_free0 (title);
 #line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		title = _tmp30_;
+		title = _tmp29_;
 #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp31_ = _ ("Publish photos _to:");
-#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp32_ = g_strdup (_tmp31_);
+		_tmp30_ = g_strdup (_ ("Publish photos _to:"));
 #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_free0 (label);
 #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		label = _tmp32_;
-#line 1609 "PublishingUI.c"
+		label = _tmp30_;
+#line 1593 "PublishingUI.c"
 	} else {
-		gboolean _tmp33_ = FALSE;
-		gboolean _tmp34_ = FALSE;
+		gboolean _tmp31_ = FALSE;
+		gboolean _tmp32_;
 #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp34_ = has_photos;
+		_tmp32_ = has_photos;
 #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		if (!_tmp34_) {
-#line 1617 "PublishingUI.c"
-			gboolean _tmp35_ = FALSE;
+		if (!_tmp32_) {
+#line 1601 "PublishingUI.c"
+			gboolean _tmp33_;
 #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp35_ = has_videos;
+			_tmp33_ = has_videos;
 #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp33_ = _tmp35_;
-#line 1623 "PublishingUI.c"
+			_tmp31_ = _tmp33_;
+#line 1607 "PublishingUI.c"
 		} else {
 #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp33_ = FALSE;
-#line 1627 "PublishingUI.c"
+			_tmp31_ = FALSE;
+#line 1611 "PublishingUI.c"
 		}
 #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		if (_tmp33_) {
-#line 1631 "PublishingUI.c"
-			const gchar* _tmp36_ = NULL;
-			gchar* _tmp37_ = NULL;
-			const gchar* _tmp38_ = NULL;
-			gchar* _tmp39_ = NULL;
-#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp36_ = _ ("Publish Videos");
+		if (_tmp31_) {
+#line 1615 "PublishingUI.c"
+			gchar* _tmp34_;
+			gchar* _tmp35_;
 #line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp37_ = g_strdup (_tmp36_);
+			_tmp34_ = g_strdup (_ ("Publish Videos"));
 #line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (title);
 #line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			title = _tmp37_;
-#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp38_ = _ ("Publish videos _to");
+			title = _tmp34_;
 #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp39_ = g_strdup (_tmp38_);
+			_tmp35_ = g_strdup (_ ("Publish videos _to"));
 #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (label);
 #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			label = _tmp39_;
-#line 1652 "PublishingUI.c"
+			label = _tmp35_;
+#line 1630 "PublishingUI.c"
 		} else {
-			const gchar* _tmp40_ = NULL;
-			gchar* _tmp41_ = NULL;
-			const gchar* _tmp42_ = NULL;
-			gchar* _tmp43_ = NULL;
+			gchar* _tmp36_;
+			gchar* _tmp37_;
 #line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp40_ = _ ("Publish Photos and Videos");
-#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp41_ = g_strdup (_tmp40_);
+			_tmp36_ = g_strdup (_ ("Publish Photos and Videos"));
 #line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (title);
 #line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			title = _tmp41_;
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp42_ = _ ("Publish photos and videos _to");
+			title = _tmp36_;
 #line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp43_ = g_strdup (_tmp42_);
+			_tmp37_ = g_strdup (_ ("Publish photos and videos _to"));
 #line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (label);
 #line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			label = _tmp43_;
-#line 1674 "PublishingUI.c"
+			label = _tmp37_;
+#line 1646 "PublishingUI.c"
 		}
 	}
 #line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp44_ = title;
+	_tmp38_ = title;
 #line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp44_);
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp38_);
 #line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp45_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
+	_tmp39_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
 #line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->service_selector_box_model);
 #line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self->priv->service_selector_box_model = _tmp45_;
+	self->priv->service_selector_box_model = _tmp39_;
 #line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp46_ = self->priv->service_selector_box_model;
+	_tmp40_ = self->priv->service_selector_box_model;
 #line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp47_ = (GtkComboBox*) gtk_combo_box_new_with_model (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
+	_tmp41_ = (GtkComboBox*) gtk_combo_box_new_with_model (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
 #line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_object_ref_sink (_tmp47_);
+	g_object_ref_sink (_tmp41_);
 #line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->service_selector_box);
 #line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self->priv->service_selector_box = _tmp47_;
+	self->priv->service_selector_box = _tmp41_;
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp48_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
+	_tmp42_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_object_ref_sink (_tmp48_);
+	g_object_ref_sink (_tmp42_);
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	renderer_pix = _tmp48_;
+	renderer_pix = _tmp42_;
 #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp49_ = self->priv->service_selector_box;
+	_tmp43_ = self->priv->service_selector_box;
 #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp50_ = renderer_pix;
+	_tmp44_ = renderer_pix;
 #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
+	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
 #line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp51_ = self->priv->service_selector_box;
+	_tmp45_ = self->priv->service_selector_box;
 #line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp52_ = renderer_pix;
+	_tmp46_ = renderer_pix;
 #line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
+	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
 #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp53_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+	_tmp47_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
 #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_object_ref_sink (_tmp53_);
+	g_object_ref_sink (_tmp47_);
 #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	renderer_text = _tmp53_;
+	renderer_text = _tmp47_;
 #line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp54_ = self->priv->service_selector_box;
+	_tmp48_ = self->priv->service_selector_box;
 #line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp55_ = renderer_text;
+	_tmp49_ = renderer_text;
 #line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
+	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp56_ = self->priv->service_selector_box;
+	_tmp50_ = self->priv->service_selector_box;
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp57_ = renderer_text;
+	_tmp51_ = renderer_text;
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
+	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
 #line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp58_ = self->priv->service_selector_box;
+	_tmp52_ = self->priv->service_selector_box;
 #line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_combo_box_set_active (_tmp58_, 0);
+	gtk_combo_box_set_active (_tmp52_, 0);
 #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp59_ = config_facade_get_instance ();
+	_tmp53_ = config_facade_get_instance ();
 #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp60_ = _tmp59_;
+	_tmp54_ = _tmp53_;
 #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp61_ = configuration_facade_get_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp55_ = configuration_facade_get_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp62_ = _tmp61_;
+	_tmp56_ = _tmp55_;
 #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_g_object_unref0 (_tmp60_);
+	_g_object_unref0 (_tmp54_);
 #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	last_used_service = _tmp62_;
+	last_used_service = _tmp56_;
 #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp63_ = has_photos;
+	_tmp57_ = has_photos;
 #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp64_ = has_videos;
+	_tmp58_ = has_videos;
 #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp66_ = publishing_ui_publishing_dialog_load_services (_tmp63_, _tmp64_, &_tmp65_);
+	_tmp60_ = publishing_ui_publishing_dialog_load_services (_tmp57_, _tmp58_, &_tmp59_);
 #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	loaded_services = _tmp66_;
+	loaded_services = _tmp60_;
 #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	loaded_services_length1 = _tmp65_;
+	loaded_services_length1 = _tmp59_;
 #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_loaded_services_size_ = loaded_services_length1;
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp67_ = loaded_services;
+	_tmp61_ = loaded_services;
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp67__length1 = loaded_services_length1;
-#line 1765 "PublishingUI.c"
+	_tmp61__length1 = loaded_services_length1;
+#line 1737 "PublishingUI.c"
 	{
 		SpitPublishingService** service_collection = NULL;
 		gint service_collection_length1 = 0;
 		gint _service_collection_size_ = 0;
 		gint service_it = 0;
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		service_collection = _tmp67_;
+		service_collection = _tmp61_;
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		service_collection_length1 = _tmp67__length1;
+		service_collection_length1 = _tmp61__length1;
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		for (service_it = 0; service_it < _tmp67__length1; service_it = service_it + 1) {
-#line 1777 "PublishingUI.c"
-			SpitPublishingService* _tmp68_ = NULL;
+		for (service_it = 0; service_it < _tmp61__length1; service_it = service_it + 1) {
+#line 1749 "PublishingUI.c"
+			SpitPublishingService* _tmp62_;
 			SpitPublishingService* service = NULL;
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp68_ = _g_object_ref0 (service_collection[service_it]);
+			_tmp62_ = _g_object_ref0 (service_collection[service_it]);
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			service = _tmp68_;
-#line 1784 "PublishingUI.c"
+			service = _tmp62_;
+#line 1756 "PublishingUI.c"
 			{
-				GtkListStore* _tmp69_ = NULL;
-				GtkTreeIter _tmp70_ = {0};
+				GtkListStore* _tmp63_;
+				GtkTreeIter _tmp64_ = {0};
 				gchar* curr_service_id = NULL;
-				SpitPublishingService* _tmp71_ = NULL;
-				const gchar* _tmp72_ = NULL;
-				gchar* _tmp73_ = NULL;
-				SpitPublishingService* _tmp74_ = NULL;
-				gboolean _tmp75_ = FALSE;
-				SpitPluggableInfo _tmp76_ = {0};
-				GdkPixbuf** _tmp77_ = NULL;
-				gint _tmp77__length1 = 0;
-				const gchar* _tmp95_ = NULL;
+				SpitPublishingService* _tmp65_;
+				const gchar* _tmp66_;
+				gchar* _tmp67_;
+				SpitPublishingService* _tmp68_;
+				gboolean _tmp69_ = FALSE;
+				SpitPluggableInfo _tmp70_;
+				GdkPixbuf** _tmp71_;
+				gint _tmp71__length1;
+				const gchar* _tmp89_;
 #line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp69_ = self->priv->service_selector_box_model;
+				_tmp63_ = self->priv->service_selector_box_model;
 #line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				gtk_list_store_append (_tmp69_, &_tmp70_);
+				gtk_list_store_append (_tmp63_, &_tmp64_);
 #line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				iter = _tmp70_;
+				iter = _tmp64_;
 #line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp71_ = service;
+				_tmp65_ = service;
 #line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp72_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+				_tmp66_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp73_ = g_strdup (_tmp72_);
+				_tmp67_ = g_strdup (_tmp66_);
 #line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				curr_service_id = _tmp73_;
+				curr_service_id = _tmp67_;
 #line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp74_ = service;
+				_tmp68_ = service;
 #line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				spit_pluggable_get_info (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, SPIT_TYPE_PLUGGABLE, SpitPluggable), &self->priv->info);
+				spit_pluggable_get_info (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, SPIT_TYPE_PLUGGABLE, SpitPluggable), &self->priv->info);
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp76_ = self->priv->info;
+				_tmp70_ = self->priv->info;
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp77_ = _tmp76_.icons;
+				_tmp71_ = _tmp70_.icons;
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp77__length1 = _tmp76_.icons_length1;
+				_tmp71__length1 = _tmp70_.icons_length1;
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				if (NULL != _tmp77_) {
-#line 1824 "PublishingUI.c"
-					SpitPluggableInfo _tmp78_ = {0};
-					GdkPixbuf** _tmp79_ = NULL;
-					gint _tmp79__length1 = 0;
+				if (NULL != _tmp71_) {
+#line 1796 "PublishingUI.c"
+					SpitPluggableInfo _tmp72_;
+					GdkPixbuf** _tmp73_;
+					gint _tmp73__length1;
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp78_ = self->priv->info;
+					_tmp72_ = self->priv->info;
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp79_ = _tmp78_.icons;
+					_tmp73_ = _tmp72_.icons;
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp79__length1 = _tmp78_.icons_length1;
+					_tmp73__length1 = _tmp72_.icons_length1;
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp75_ = 0 < _tmp79__length1;
-#line 1836 "PublishingUI.c"
+					_tmp69_ = 0 < _tmp73__length1;
+#line 1808 "PublishingUI.c"
 				} else {
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp75_ = FALSE;
-#line 1840 "PublishingUI.c"
+					_tmp69_ = FALSE;
+#line 1812 "PublishingUI.c"
 				}
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				if (_tmp75_) {
-#line 1844 "PublishingUI.c"
-					GtkListStore* _tmp80_ = NULL;
-					GtkTreeIter _tmp81_ = {0};
-					SpitPluggableInfo _tmp82_ = {0};
-					GdkPixbuf** _tmp83_ = NULL;
-					gint _tmp83__length1 = 0;
-					GdkPixbuf* _tmp84_ = NULL;
-					SpitPublishingService* _tmp85_ = NULL;
-					const gchar* _tmp86_ = NULL;
-					GdkPixbuf* _tmp87_ = NULL;
-					GdkPixbuf* _tmp88_ = NULL;
+				if (_tmp69_) {
+#line 1816 "PublishingUI.c"
+					GtkListStore* _tmp74_;
+					GtkTreeIter _tmp75_;
+					SpitPluggableInfo _tmp76_;
+					GdkPixbuf** _tmp77_;
+					gint _tmp77__length1;
+					GdkPixbuf* _tmp78_;
+					SpitPublishingService* _tmp79_;
+					const gchar* _tmp80_;
+					GdkPixbuf* _tmp81_;
+					GdkPixbuf* _tmp82_;
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp80_ = self->priv->service_selector_box_model;
+					_tmp74_ = self->priv->service_selector_box_model;
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp81_ = iter;
+					_tmp75_ = iter;
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp82_ = self->priv->info;
+					_tmp76_ = self->priv->info;
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp83_ = _tmp82_.icons;
+					_tmp77_ = _tmp76_.icons;
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp83__length1 = _tmp82_.icons_length1;
+					_tmp77__length1 = _tmp76_.icons_length1;
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp84_ = _tmp83_[0];
+					_tmp78_ = _tmp77_[0];
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp85_ = service;
+					_tmp79_ = service;
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp86_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+					_tmp80_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					gtk_list_store_set (_tmp80_, &_tmp81_, 0, _tmp84_, 1, _tmp86_, -1);
+					gtk_list_store_set (_tmp74_, &_tmp75_, 0, _tmp78_, 1, _tmp80_, -1);
 #line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp87_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
+					_tmp81_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
 #line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_object_unref0 (self->priv->info.icons[0]);
 #line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					self->priv->info.icons[0] = _tmp87_;
+					self->priv->info.icons[0] = _tmp81_;
 #line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp88_ = self->priv->info.icons[0];
-#line 1881 "PublishingUI.c"
+					_tmp82_ = self->priv->info.icons[0];
+#line 1853 "PublishingUI.c"
 				} else {
-					GtkListStore* _tmp89_ = NULL;
-					GtkTreeIter _tmp90_ = {0};
-					GdkPixbuf* _tmp91_ = NULL;
-					GdkPixbuf* _tmp92_ = NULL;
-					SpitPublishingService* _tmp93_ = NULL;
-					const gchar* _tmp94_ = NULL;
+					GtkListStore* _tmp83_;
+					GtkTreeIter _tmp84_;
+					GdkPixbuf* _tmp85_;
+					GdkPixbuf* _tmp86_;
+					SpitPublishingService* _tmp87_;
+					const gchar* _tmp88_;
 #line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp89_ = self->priv->service_selector_box_model;
+					_tmp83_ = self->priv->service_selector_box_model;
 #line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp90_ = iter;
+					_tmp84_ = iter;
 #line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp91_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
+					_tmp85_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
 #line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp92_ = _tmp91_;
+					_tmp86_ = _tmp85_;
 #line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp93_ = service;
+					_tmp87_ = service;
 #line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp94_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+					_tmp88_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					gtk_list_store_set (_tmp89_, &_tmp90_, 0, _tmp92_, 1, _tmp94_, -1);
+					gtk_list_store_set (_tmp83_, &_tmp84_, 0, _tmp86_, 1, _tmp88_, -1);
 #line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_g_object_unref0 (_tmp92_);
-#line 1905 "PublishingUI.c"
+					_g_object_unref0 (_tmp86_);
+#line 1877 "PublishingUI.c"
 				}
 #line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp95_ = last_used_service;
+				_tmp89_ = last_used_service;
 #line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				if (_tmp95_ == NULL) {
-#line 1911 "PublishingUI.c"
-					GtkComboBox* _tmp96_ = NULL;
-					GtkTreeIter _tmp97_ = {0};
-					SpitPublishingService* _tmp98_ = NULL;
-					const gchar* _tmp99_ = NULL;
-					gchar* _tmp100_ = NULL;
+				if (_tmp89_ == NULL) {
+#line 1883 "PublishingUI.c"
+					GtkComboBox* _tmp90_;
+					GtkTreeIter _tmp91_;
+					SpitPublishingService* _tmp92_;
+					const gchar* _tmp93_;
+					gchar* _tmp94_;
 #line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp96_ = self->priv->service_selector_box;
+					_tmp90_ = self->priv->service_selector_box;
 #line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp97_ = iter;
+					_tmp91_ = iter;
 #line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					gtk_combo_box_set_active_iter (_tmp96_, &_tmp97_);
+					gtk_combo_box_set_active_iter (_tmp90_, &_tmp91_);
 #line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp98_ = service;
+					_tmp92_ = service;
 #line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp99_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+					_tmp93_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp100_ = g_strdup (_tmp99_);
+					_tmp94_ = g_strdup (_tmp93_);
 #line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_free0 (last_used_service);
 #line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					last_used_service = _tmp100_;
-#line 1933 "PublishingUI.c"
+					last_used_service = _tmp94_;
+#line 1905 "PublishingUI.c"
 				} else {
-					const gchar* _tmp101_ = NULL;
-					const gchar* _tmp102_ = NULL;
+					const gchar* _tmp95_;
+					const gchar* _tmp96_;
 #line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp101_ = last_used_service;
+					_tmp95_ = last_used_service;
 #line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp102_ = curr_service_id;
+					_tmp96_ = curr_service_id;
 #line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					if (g_strcmp0 (_tmp101_, _tmp102_) == 0) {
-#line 1943 "PublishingUI.c"
-						GtkComboBox* _tmp103_ = NULL;
-						GtkTreeIter _tmp104_ = {0};
+					if (g_strcmp0 (_tmp95_, _tmp96_) == 0) {
+#line 1915 "PublishingUI.c"
+						GtkComboBox* _tmp97_;
+						GtkTreeIter _tmp98_;
 #line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-						_tmp103_ = self->priv->service_selector_box;
+						_tmp97_ = self->priv->service_selector_box;
 #line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-						_tmp104_ = iter;
+						_tmp98_ = iter;
 #line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-						gtk_combo_box_set_active_iter (_tmp103_, &_tmp104_);
-#line 1952 "PublishingUI.c"
+						gtk_combo_box_set_active_iter (_tmp97_, &_tmp98_);
+#line 1924 "PublishingUI.c"
 					}
 				}
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_free0 (curr_service_id);
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (service);
-#line 1959 "PublishingUI.c"
+#line 1931 "PublishingUI.c"
 			}
 		}
 	}
 #line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp105_ = self->priv->service_selector_box;
+	_tmp99_ = self->priv->service_selector_box;
 #line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_signal_connect_object (_tmp105_, "changed", (GCallback) _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
+	g_signal_connect_object (_tmp99_, "changed", (GCallback) _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
 #line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp106_ = use_header;
+	_tmp100_ = use_header;
 #line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	if (!_tmp106_) {
-#line 1971 "PublishingUI.c"
+	if (!_tmp100_) {
+#line 1943 "PublishingUI.c"
 		GtkLabel* service_selector_box_label = NULL;
-		const gchar* _tmp107_ = NULL;
-		GtkLabel* _tmp108_ = NULL;
-		GtkLabel* _tmp109_ = NULL;
-		GtkComboBox* _tmp110_ = NULL;
-		GtkLabel* _tmp111_ = NULL;
-		GtkLabel* _tmp112_ = NULL;
-		GtkComboBox* _tmp113_ = NULL;
-		GtkComboBox* _tmp114_ = NULL;
-		GtkComboBox* _tmp115_ = NULL;
-		GtkComboBox* _tmp116_ = NULL;
+		const gchar* _tmp101_;
+		GtkLabel* _tmp102_;
+		GtkLabel* _tmp103_;
+		GtkComboBox* _tmp104_;
+		GtkLabel* _tmp105_;
+		GtkLabel* _tmp106_;
+		GtkComboBox* _tmp107_;
+		GtkComboBox* _tmp108_;
+		GtkComboBox* _tmp109_;
+		GtkComboBox* _tmp110_;
 		GtkBox* service_selector_layouter = NULL;
-		GtkBox* _tmp117_ = NULL;
-		GtkBox* _tmp118_ = NULL;
-		GtkBox* _tmp119_ = NULL;
-		GtkBox* _tmp120_ = NULL;
-		GtkLabel* _tmp121_ = NULL;
-		GtkBox* _tmp122_ = NULL;
-		GtkComboBox* _tmp123_ = NULL;
+		GtkBox* _tmp111_;
+		GtkBox* _tmp112_;
+		GtkBox* _tmp113_;
+		GtkBox* _tmp114_;
+		GtkLabel* _tmp115_;
+		GtkBox* _tmp116_;
+		GtkComboBox* _tmp117_;
 		GtkBox* service_area_layouter = NULL;
-		GtkBox* _tmp124_ = NULL;
-		GtkBox* _tmp125_ = NULL;
-		GtkBox* _tmp126_ = NULL;
-		GtkBox* _tmp127_ = NULL;
-		GtkSeparator* _tmp128_ = NULL;
-		GtkSeparator* _tmp129_ = NULL;
-		GtkBox* _tmp130_ = NULL;
-		GtkBox* _tmp131_ = NULL;
-		GtkBox* _tmp132_ = NULL;
-		GtkBox* _tmp133_ = NULL;
-		GtkBox* _tmp134_ = NULL;
-		GtkBox* _tmp135_ = NULL;
+		GtkBox* _tmp118_;
+		GtkBox* _tmp119_;
+		GtkBox* _tmp120_;
+		GtkBox* _tmp121_;
+		GtkSeparator* _tmp122_;
+		GtkSeparator* _tmp123_;
+		GtkBox* _tmp124_;
+		GtkBox* _tmp125_;
+		GtkBox* _tmp126_;
+		GtkBox* _tmp127_;
+		GtkBox* _tmp128_;
+		GtkBox* _tmp129_;
 #line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp107_ = label;
+		_tmp101_ = label;
 #line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp108_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp107_);
+		_tmp102_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp101_);
 #line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		g_object_ref_sink (_tmp108_);
+		g_object_ref_sink (_tmp102_);
 #line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		service_selector_box_label = _tmp108_;
+		service_selector_box_label = _tmp102_;
 #line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp109_ = service_selector_box_label;
+		_tmp103_ = service_selector_box_label;
 #line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp110_ = self->priv->service_selector_box;
+		_tmp104_ = self->priv->service_selector_box;
 #line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_label_set_mnemonic_widget (_tmp109_, G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget));
+		gtk_label_set_mnemonic_widget (_tmp103_, G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, gtk_widget_get_type (), GtkWidget));
 #line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp111_ = service_selector_box_label;
+		_tmp105_ = service_selector_box_label;
 #line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp112_ = service_selector_box_label;
+		_tmp106_ = service_selector_box_label;
 #line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 267 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp113_ = self->priv->service_selector_box;
+		_tmp107_ = self->priv->service_selector_box;
 #line 267 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp113_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
+		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
 #line 268 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp114_ = self->priv->service_selector_box;
+		_tmp108_ = self->priv->service_selector_box;
 #line 268 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp115_ = self->priv->service_selector_box;
+		_tmp109_ = self->priv->service_selector_box;
 #line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, gtk_widget_get_type (), GtkWidget), FALSE);
+		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp116_ = self->priv->service_selector_box;
+		_tmp110_ = self->priv->service_selector_box;
 #line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_widget_get_type (), GtkWidget), FALSE);
+		gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp117_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+		_tmp111_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
 #line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		g_object_ref_sink (_tmp117_);
+		g_object_ref_sink (_tmp111_);
 #line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		service_selector_layouter = _tmp117_;
+		service_selector_layouter = _tmp111_;
 #line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp118_ = service_selector_layouter;
+		_tmp112_ = service_selector_layouter;
 #line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, gtk_container_get_type (), GtkContainer), (guint) 12);
+		gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_container_get_type (), GtkContainer), (guint) 12);
 #line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp119_ = service_selector_layouter;
+		_tmp113_ = service_selector_layouter;
 #line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, gtk_widget_get_type (), GtkWidget), TRUE);
+		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp113_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp120_ = service_selector_layouter;
+		_tmp114_ = service_selector_layouter;
 #line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp121_ = service_selector_box_label;
+		_tmp115_ = service_selector_box_label;
 #line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget));
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, gtk_widget_get_type (), GtkWidget));
 #line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp122_ = service_selector_layouter;
+		_tmp116_ = service_selector_layouter;
 #line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp123_ = self->priv->service_selector_box;
+		_tmp117_ = self->priv->service_selector_box;
 #line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_box_pack_start (_tmp122_, G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+		gtk_box_pack_start (_tmp116_, G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp124_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+		_tmp118_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 #line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		g_object_ref_sink (_tmp124_);
+		g_object_ref_sink (_tmp118_);
 #line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		service_area_layouter = _tmp124_;
+		service_area_layouter = _tmp118_;
 #line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp125_ = service_area_layouter;
+		_tmp119_ = service_area_layouter;
 #line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp126_ = service_selector_layouter;
+		_tmp120_ = service_selector_layouter;
 #line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, gtk_widget_get_type (), GtkWidget));
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, gtk_widget_get_type (), GtkWidget));
 #line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp127_ = service_area_layouter;
+		_tmp121_ = service_area_layouter;
 #line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp128_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+		_tmp122_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
 #line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		g_object_ref_sink (_tmp128_);
+		g_object_ref_sink (_tmp122_);
 #line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp129_ = _tmp128_;
+		_tmp123_ = _tmp122_;
 #line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, gtk_widget_get_type (), GtkWidget));
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_widget_get_type (), GtkWidget));
 #line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_g_object_unref0 (_tmp129_);
+		_g_object_unref0 (_tmp123_);
 #line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp130_ = service_area_layouter;
+		_tmp124_ = service_area_layouter;
 #line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
 #line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp131_ = service_area_layouter;
+		_tmp125_ = service_area_layouter;
 #line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp132_ = service_area_layouter;
+		_tmp126_ = service_area_layouter;
 #line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget), TRUE);
+		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp133_ = service_area_layouter;
+		_tmp127_ = service_area_layouter;
 #line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, gtk_widget_get_type (), GtkWidget), FALSE);
+		gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp134_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+		_tmp128_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp135_ = service_area_layouter;
+		_tmp129_ = service_area_layouter;
 #line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_box_pack_start (_tmp134_, G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+		gtk_box_pack_start (_tmp128_, G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (service_area_layouter);
 #line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (service_selector_layouter);
 #line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (service_selector_box_label);
-#line 2120 "PublishingUI.c"
+#line 2092 "PublishingUI.c"
 	}
 #line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp136_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	_tmp130_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 #line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_object_ref_sink (_tmp136_);
+	g_object_ref_sink (_tmp130_);
 #line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->central_area_layouter);
 #line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self->priv->central_area_layouter = _tmp136_;
+	self->priv->central_area_layouter = _tmp130_;
 #line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp137_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+	_tmp131_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp138_ = self->priv->central_area_layouter;
+	_tmp132_ = self->priv->central_area_layouter;
 #line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_box_pack_start (_tmp137_, G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (_tmp131_, G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp139_ = use_header;
+	_tmp133_ = use_header;
 #line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	if (_tmp139_) {
-#line 2140 "PublishingUI.c"
-		GtkButton* _tmp140_ = NULL;
-		GtkButton* _tmp141_ = NULL;
-		GtkWidget* _tmp142_ = NULL;
-		GtkButton* _tmp143_ = NULL;
-		GtkWidget* _tmp144_ = NULL;
-		GtkComboBox* _tmp145_ = NULL;
+	if (_tmp133_) {
+#line 2112 "PublishingUI.c"
+		GtkButton* _tmp134_;
+		GtkButton* _tmp135_;
+		GtkWidget* _tmp136_;
+		GtkButton* _tmp137_;
+		GtkWidget* _tmp138_;
+		GtkComboBox* _tmp139_;
 #line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp140_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
+		_tmp134_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
 #line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		g_object_ref_sink (_tmp140_);
+		g_object_ref_sink (_tmp134_);
 #line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (self->priv->close_cancel_button);
 #line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		self->priv->close_cancel_button = _tmp140_;
+		self->priv->close_cancel_button = _tmp134_;
 #line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp141_ = self->priv->close_cancel_button;
+		_tmp135_ = self->priv->close_cancel_button;
 #line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, gtk_widget_get_type (), GtkWidget), TRUE);
+		gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp142_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+		_tmp136_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp143_ = self->priv->close_cancel_button;
+		_tmp137_ = self->priv->close_cancel_button;
 #line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_widget_get_type (), GtkWidget));
+		gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp136_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, gtk_widget_get_type (), GtkWidget));
 #line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp144_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+		_tmp138_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp145_ = self->priv->service_selector_box;
+		_tmp139_ = self->priv->service_selector_box;
 #line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp145_, gtk_widget_get_type (), GtkWidget));
-#line 2171 "PublishingUI.c"
+		gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, gtk_widget_get_type (), GtkWidget));
+#line 2143 "PublishingUI.c"
 	} else {
-		const gchar* _tmp146_ = NULL;
-		GtkWidget* _tmp147_ = NULL;
-		GtkButton* _tmp148_ = NULL;
+		GtkWidget* _tmp140_;
+		GtkButton* _tmp141_;
 #line 303 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp146_ = _ ("_Cancel");
-#line 303 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _tmp146_, (gint) GTK_RESPONSE_CANCEL);
+		gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL);
 #line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp147_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
+		_tmp140_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
 #line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp148_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp147_, gtk_button_get_type ()) ? ((GtkButton*) _tmp147_) : NULL);
+		_tmp141_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp140_, gtk_button_get_type ()) ? ((GtkButton*) _tmp140_) : NULL);
 #line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (self->priv->close_cancel_button);
 #line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		self->priv->close_cancel_button = _tmp148_;
-#line 2188 "PublishingUI.c"
+		self->priv->close_cancel_button = _tmp141_;
+#line 2157 "PublishingUI.c"
 	}
 #line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp149_ = self->priv->close_cancel_button;
+	_tmp142_ = self->priv->close_cancel_button;
 #line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_signal_connect_object (_tmp149_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp142_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
 #line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_set_standard_window_mode (self);
 #line 310 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2208,41 +2177,41 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 	_g_free0 (title);
 #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 2212 "PublishingUI.c"
+#line 2181 "PublishingUI.c"
 }
 
 
 PublishingUIPublishingDialog* publishing_ui_publishing_dialog_new (GeeCollection* to_publish) {
 #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_publishing_dialog_construct (PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, to_publish);
-#line 2219 "PublishingUI.c"
+#line 2188 "PublishingUI.c"
 }
 
 
-static void _vala_array_add56 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
+static void _vala_array_add56 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
 #line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
 #line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2230 "PublishingUI.c"
+#line 2199 "PublishingUI.c"
 	}
 #line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
 #line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2236 "PublishingUI.c"
+#line 2205 "PublishingUI.c"
 }
 
 
 static gint __lambda15_ (void* a, void* b) {
 	gint result = 0;
-	void* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	void* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	void* _tmp0_;
+	const gchar* _tmp1_;
+	void* _tmp2_;
+	const gchar* _tmp3_;
+	gint _tmp4_;
 #line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = a;
 #line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2257,7 +2226,7 @@ static gint __lambda15_ (void* a, void* b) {
 	result = _tmp4_;
 #line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2261 "PublishingUI.c"
+#line 2230 "PublishingUI.c"
 }
 
 
@@ -2266,27 +2235,27 @@ static gint ___lambda15____compar_fn_t (void* key1, void* key2) {
 	result = __lambda15_ (key1, key2);
 #line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2270 "PublishingUI.c"
+#line 2239 "PublishingUI.c"
 }
 
 
 static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services (int* result_length1) {
 	SpitPublishingService** result = NULL;
 	SpitPublishingService** loaded_services = NULL;
-	SpitPublishingService** _tmp0_ = NULL;
-	gint loaded_services_length1 = 0;
-	gint _loaded_services_size_ = 0;
+	SpitPublishingService** _tmp0_;
+	gint loaded_services_length1;
+	gint _loaded_services_size_;
 	GeeCollection* pluggables = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	SpitPublishingService** _tmp25_ = NULL;
-	gint _tmp25__length1 = 0;
-	SpitPublishingService** _tmp26_ = NULL;
-	gint _tmp26__length1 = 0;
-	SpitPublishingService** _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	SpitPublishingService** _tmp25_;
+	gint _tmp25__length1;
+	SpitPublishingService** _tmp26_;
+	gint _tmp26__length1;
+	SpitPublishingService** _tmp27_;
+	gint _tmp27__length1;
 #line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = g_new0 (SpitPublishingService*, 0 + 1);
 #line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2308,11 +2277,11 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 #line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_debug ("PublishingUI.vala:320: PublisingDialog: discovered %d pluggable publis" \
 "hing services.", _tmp4_);
-#line 2311 "PublishingUI.c"
+#line 2280 "PublishingUI.c"
 	{
 		GeeIterator* _pluggable_it = NULL;
-		GeeCollection* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
+		GeeCollection* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp5_ = pluggables;
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2321,25 +2290,25 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 		_pluggable_it = _tmp6_;
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		while (TRUE) {
-#line 2324 "PublishingUI.c"
-			GeeIterator* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+#line 2293 "PublishingUI.c"
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			SpitPluggable* pluggable = NULL;
-			GeeIterator* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
 			gint pluggable_interface = 0;
-			SpitPluggable* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
+			SpitPluggable* _tmp11_;
+			gint _tmp12_;
+			gint _tmp13_;
 			SpitPublishingService* service = NULL;
-			SpitPluggable* _tmp18_ = NULL;
-			SpitPublishingService* _tmp19_ = NULL;
-			SpitPublishingService* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
-			SpitPublishingService** _tmp22_ = NULL;
-			gint _tmp22__length1 = 0;
-			SpitPublishingService* _tmp23_ = NULL;
-			SpitPublishingService* _tmp24_ = NULL;
+			SpitPluggable* _tmp18_;
+			SpitPublishingService* _tmp19_;
+			SpitPublishingService* _tmp20_;
+			const gchar* _tmp21_;
+			SpitPublishingService** _tmp22_;
+			gint _tmp22__length1;
+			SpitPublishingService* _tmp23_;
+			SpitPublishingService* _tmp24_;
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = _pluggable_it;
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2348,7 +2317,7 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 			if (!_tmp8_) {
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				break;
-#line 2351 "PublishingUI.c"
+#line 2320 "PublishingUI.c"
 			}
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp9_ = _pluggable_it;
@@ -2366,11 +2335,11 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 			_tmp13_ = pluggable_interface;
 #line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			if (_tmp13_ != SPIT_PUBLISHING_CURRENT_INTERFACE) {
-#line 2369 "PublishingUI.c"
-				SpitPluggable* _tmp14_ = NULL;
-				gchar* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
-				gint _tmp17_ = 0;
+#line 2338 "PublishingUI.c"
+				SpitPluggable* _tmp14_;
+				gchar* _tmp15_;
+				gchar* _tmp16_;
+				gint _tmp17_;
 #line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp14_ = pluggable;
 #line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2388,7 +2357,7 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 				_g_object_unref0 (pluggable);
 #line 329 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				continue;
-#line 2390 "PublishingUI.c"
+#line 2359 "PublishingUI.c"
 			}
 #line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp18_ = pluggable;
@@ -2417,11 +2386,11 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 			_g_object_unref0 (service);
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_object_unref0 (pluggable);
-#line 2418 "PublishingUI.c"
+#line 2387 "PublishingUI.c"
 		}
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (_pluggable_it);
-#line 2422 "PublishingUI.c"
+#line 2391 "PublishingUI.c"
 	}
 #line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp25_ = loaded_services;
@@ -2441,7 +2410,7 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 	if (result_length1) {
 #line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*result_length1 = _tmp27__length1;
-#line 2442 "PublishingUI.c"
+#line 2411 "PublishingUI.c"
 	}
 #line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _tmp27_;
@@ -2449,92 +2418,92 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 	_g_object_unref0 (pluggables);
 #line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2450 "PublishingUI.c"
+#line 2419 "PublishingUI.c"
 }
 
 
-static void _vala_array_add57 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
+static void _vala_array_add57 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
 #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
 #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2461 "PublishingUI.c"
+#line 2430 "PublishingUI.c"
 	}
 #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
 #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2467 "PublishingUI.c"
+#line 2436 "PublishingUI.c"
 }
 
 
-static void _vala_array_add58 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
+static void _vala_array_add58 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
 #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
 #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2478 "PublishingUI.c"
+#line 2447 "PublishingUI.c"
 	}
 #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
 #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2484 "PublishingUI.c"
+#line 2453 "PublishingUI.c"
 }
 
 
-static void _vala_array_add59 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
+static void _vala_array_add59 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
 #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
 #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2495 "PublishingUI.c"
+#line 2464 "PublishingUI.c"
 	}
 #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
 #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2501 "PublishingUI.c"
+#line 2470 "PublishingUI.c"
 }
 
 
 static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gboolean has_photos, gboolean has_videos, int* result_length1) {
 	SpitPublishingService** result = NULL;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	SpitPublishingService** filtered_services = NULL;
-	SpitPublishingService** _tmp3_ = NULL;
-	gint filtered_services_length1 = 0;
-	gint _filtered_services_size_ = 0;
+	SpitPublishingService** _tmp3_;
+	gint filtered_services_length1;
+	gint _filtered_services_size_;
 	SpitPublishingService** all_services = NULL;
-	gint _tmp4_ = 0;
-	SpitPublishingService** _tmp5_ = NULL;
-	gint all_services_length1 = 0;
-	gint _all_services_size_ = 0;
-	SpitPublishingService** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	SpitPublishingService** _tmp32_ = NULL;
-	gint _tmp32__length1 = 0;
+	gint _tmp4_;
+	SpitPublishingService** _tmp5_;
+	gint all_services_length1;
+	gint _all_services_size_;
+	SpitPublishingService** _tmp6_;
+	gint _tmp6__length1;
+	SpitPublishingService** _tmp32_;
+	gint _tmp32__length1;
 #line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = has_photos;
 #line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp1_) {
 #line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp0_ = TRUE;
-#line 2528 "PublishingUI.c"
+#line 2497 "PublishingUI.c"
 	} else {
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp2_ = has_videos;
 #line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp0_ = _tmp2_;
-#line 2535 "PublishingUI.c"
+#line 2504 "PublishingUI.c"
 	}
 #line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_vala_assert (_tmp0_, "has_photos || has_videos");
@@ -2558,7 +2527,7 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
 	_tmp6_ = all_services;
 #line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp6__length1 = all_services_length1;
-#line 2559 "PublishingUI.c"
+#line 2528 "PublishingUI.c"
 	{
 		SpitPublishingService** service_collection = NULL;
 		gint service_collection_length1 = 0;
@@ -2570,49 +2539,49 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
 		service_collection_length1 = _tmp6__length1;
 #line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		for (service_it = 0; service_it < _tmp6__length1; service_it = service_it + 1) {
-#line 2571 "PublishingUI.c"
-			SpitPublishingService* _tmp7_ = NULL;
+#line 2540 "PublishingUI.c"
+			SpitPublishingService* _tmp7_;
 			SpitPublishingService* service = NULL;
 #line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = _g_object_ref0 (service_collection[service_it]);
 #line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			service = _tmp7_;
-#line 2578 "PublishingUI.c"
+#line 2547 "PublishingUI.c"
 			{
 				gboolean _tmp8_ = FALSE;
-				gboolean _tmp9_ = FALSE;
+				gboolean _tmp9_;
 #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp9_ = has_photos;
 #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp9_) {
-#line 2586 "PublishingUI.c"
-					gboolean _tmp10_ = FALSE;
+#line 2555 "PublishingUI.c"
+					gboolean _tmp10_;
 #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp10_ = has_videos;
 #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp8_ = !_tmp10_;
-#line 2592 "PublishingUI.c"
+#line 2561 "PublishingUI.c"
 				} else {
 #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp8_ = FALSE;
-#line 2596 "PublishingUI.c"
+#line 2565 "PublishingUI.c"
 				}
 #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp8_) {
-#line 2600 "PublishingUI.c"
-					SpitPublishingService* _tmp11_ = NULL;
-					SpitPublishingPublisherMediaType _tmp12_ = 0;
+#line 2569 "PublishingUI.c"
+					SpitPublishingService* _tmp11_;
+					SpitPublishingPublisherMediaType _tmp12_;
 #line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp11_ = service;
 #line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp12_ = spit_publishing_service_get_supported_media (_tmp11_);
 #line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if ((_tmp12_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 2609 "PublishingUI.c"
-						SpitPublishingService** _tmp13_ = NULL;
-						gint _tmp13__length1 = 0;
-						SpitPublishingService* _tmp14_ = NULL;
-						SpitPublishingService* _tmp15_ = NULL;
+#line 2578 "PublishingUI.c"
+						SpitPublishingService** _tmp13_;
+						gint _tmp13__length1;
+						SpitPublishingService* _tmp14_;
+						SpitPublishingService* _tmp15_;
 #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp13_ = filtered_services;
 #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2623,43 +2592,43 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
 						_tmp15_ = _g_object_ref0 (_tmp14_);
 #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_vala_array_add57 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp15_);
-#line 2624 "PublishingUI.c"
+#line 2593 "PublishingUI.c"
 					}
 				} else {
 					gboolean _tmp16_ = FALSE;
-					gboolean _tmp17_ = FALSE;
+					gboolean _tmp17_;
 #line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp17_ = has_photos;
 #line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if (!_tmp17_) {
-#line 2633 "PublishingUI.c"
-						gboolean _tmp18_ = FALSE;
+#line 2602 "PublishingUI.c"
+						gboolean _tmp18_;
 #line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp18_ = has_videos;
 #line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp16_ = _tmp18_;
-#line 2639 "PublishingUI.c"
+#line 2608 "PublishingUI.c"
 					} else {
 #line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp16_ = FALSE;
-#line 2643 "PublishingUI.c"
+#line 2612 "PublishingUI.c"
 					}
 #line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if (_tmp16_) {
-#line 2647 "PublishingUI.c"
-						SpitPublishingService* _tmp19_ = NULL;
-						SpitPublishingPublisherMediaType _tmp20_ = 0;
+#line 2616 "PublishingUI.c"
+						SpitPublishingService* _tmp19_;
+						SpitPublishingPublisherMediaType _tmp20_;
 #line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp19_ = service;
 #line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp20_ = spit_publishing_service_get_supported_media (_tmp19_);
 #line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						if ((_tmp20_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0) {
-#line 2656 "PublishingUI.c"
-							SpitPublishingService** _tmp21_ = NULL;
-							gint _tmp21__length1 = 0;
-							SpitPublishingService* _tmp22_ = NULL;
-							SpitPublishingService* _tmp23_ = NULL;
+#line 2625 "PublishingUI.c"
+							SpitPublishingService** _tmp21_;
+							gint _tmp21__length1;
+							SpitPublishingService* _tmp22_;
+							SpitPublishingService* _tmp23_;
 #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp21_ = filtered_services;
 #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2670,40 +2639,40 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
 							_tmp23_ = _g_object_ref0 (_tmp22_);
 #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_vala_array_add58 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp23_);
-#line 2671 "PublishingUI.c"
+#line 2640 "PublishingUI.c"
 						}
 					} else {
 						gboolean _tmp24_ = FALSE;
-						SpitPublishingService* _tmp25_ = NULL;
-						SpitPublishingPublisherMediaType _tmp26_ = 0;
+						SpitPublishingService* _tmp25_;
+						SpitPublishingPublisherMediaType _tmp26_;
 #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp25_ = service;
 #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp26_ = spit_publishing_service_get_supported_media (_tmp25_);
 #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						if ((_tmp26_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 2683 "PublishingUI.c"
-							SpitPublishingService* _tmp27_ = NULL;
-							SpitPublishingPublisherMediaType _tmp28_ = 0;
+#line 2652 "PublishingUI.c"
+							SpitPublishingService* _tmp27_;
+							SpitPublishingPublisherMediaType _tmp28_;
 #line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp27_ = service;
 #line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp28_ = spit_publishing_service_get_supported_media (_tmp27_);
 #line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp24_ = (_tmp28_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
-#line 2692 "PublishingUI.c"
+#line 2661 "PublishingUI.c"
 						} else {
 #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp24_ = FALSE;
-#line 2696 "PublishingUI.c"
+#line 2665 "PublishingUI.c"
 						}
 #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						if (_tmp24_) {
-#line 2700 "PublishingUI.c"
-							SpitPublishingService** _tmp29_ = NULL;
-							gint _tmp29__length1 = 0;
-							SpitPublishingService* _tmp30_ = NULL;
-							SpitPublishingService* _tmp31_ = NULL;
+#line 2669 "PublishingUI.c"
+							SpitPublishingService** _tmp29_;
+							gint _tmp29__length1;
+							SpitPublishingService* _tmp30_;
+							SpitPublishingService* _tmp31_;
 #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp29_ = filtered_services;
 #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2714,13 +2683,13 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
 							_tmp31_ = _g_object_ref0 (_tmp30_);
 #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_vala_array_add59 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp31_);
-#line 2715 "PublishingUI.c"
+#line 2684 "PublishingUI.c"
 						}
 					}
 				}
 #line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (service);
-#line 2721 "PublishingUI.c"
+#line 2690 "PublishingUI.c"
 			}
 		}
 	}
@@ -2732,7 +2701,7 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
 	if (result_length1) {
 #line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*result_length1 = _tmp32__length1;
-#line 2733 "PublishingUI.c"
+#line 2702 "PublishingUI.c"
 	}
 #line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _tmp32_;
@@ -2740,37 +2709,37 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
 	all_services = (_vala_array_free (all_services, all_services_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2741 "PublishingUI.c"
+#line 2710 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
-	PublishingUIPublishingDialog* _tmp0_ = NULL;
-	GTimer* _tmp1_ = NULL;
+	PublishingUIPublishingDialog* _tmp0_;
+	GTimer* _tmp1_;
 	GeeArrayList* photos = NULL;
-	GeeArrayList* _tmp10_ = NULL;
+	GeeArrayList* _tmp10_;
 	GeeArrayList* videos = NULL;
-	GeeArrayList* _tmp11_ = NULL;
-	GeeCollection* _tmp12_ = NULL;
-	GeeArrayList* _tmp13_ = NULL;
-	GeeArrayList* _tmp14_ = NULL;
+	GeeArrayList* _tmp11_;
+	GeeCollection* _tmp12_;
+	GeeArrayList* _tmp13_;
+	GeeArrayList* _tmp14_;
 	SpitPublishingService** avail_services = NULL;
-	GeeArrayList* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	GeeArrayList* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	SpitPublishingService** _tmp22_ = NULL;
-	gint avail_services_length1 = 0;
-	gint _avail_services_size_ = 0;
-	SpitPublishingService** _tmp23_ = NULL;
-	gint _tmp23__length1 = 0;
-	GeeCollection* _tmp28_ = NULL;
-	PublishingUIPublishingDialog* _tmp29_ = NULL;
-	PublishingUIPublishingDialog* _tmp30_ = NULL;
-	GTimer* _tmp31_ = NULL;
+	GeeArrayList* _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	GeeArrayList* _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
+	SpitPublishingService** _tmp22_;
+	gint avail_services_length1;
+	gint _avail_services_size_;
+	SpitPublishingService** _tmp23_;
+	gint _tmp23__length1;
+	GeeCollection* _tmp26_;
+	PublishingUIPublishingDialog* _tmp27_;
+	PublishingUIPublishingDialog* _tmp28_;
+	GTimer* _tmp29_;
 #line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (to_publish));
 #line 386 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2779,16 +2748,16 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
 	if (_tmp0_ != NULL) {
 #line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		return;
-#line 2780 "PublishingUI.c"
+#line 2749 "PublishingUI.c"
 	}
 #line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = publishing_ui_publishing_dialog_since_last_start;
 #line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp1_ == NULL) {
-#line 2786 "PublishingUI.c"
-		GTimer* _tmp2_ = NULL;
-		GTimer* _tmp3_ = NULL;
-		GTimer* _tmp4_ = NULL;
+#line 2755 "PublishingUI.c"
+		GTimer* _tmp2_;
+		GTimer* _tmp3_;
+		GTimer* _tmp4_;
 #line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp2_ = g_timer_new ();
 #line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2805,13 +2774,13 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
 		g_timer_reset (_tmp4_);
 #line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_elapsed_is_valid = FALSE;
-#line 2806 "PublishingUI.c"
+#line 2775 "PublishingUI.c"
 	} else {
 		gdouble elapsed = 0.0;
-		GTimer* _tmp5_ = NULL;
-		gdouble _tmp6_ = 0.0;
+		GTimer* _tmp5_;
+		gdouble _tmp6_;
 		gboolean _tmp7_ = FALSE;
-		gdouble _tmp8_ = 0.0;
+		gdouble _tmp8_;
 #line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp5_ = publishing_ui_publishing_dialog_since_last_start;
 #line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2822,23 +2791,23 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
 		_tmp8_ = elapsed;
 #line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (_tmp8_ < 0.05) {
-#line 2823 "PublishingUI.c"
-			gboolean _tmp9_ = FALSE;
+#line 2792 "PublishingUI.c"
+			gboolean _tmp9_;
 #line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp9_ = publishing_ui_publishing_dialog_elapsed_is_valid;
 #line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = _tmp9_;
-#line 2829 "PublishingUI.c"
+#line 2798 "PublishingUI.c"
 		} else {
 #line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = FALSE;
-#line 2833 "PublishingUI.c"
+#line 2802 "PublishingUI.c"
 		}
 #line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (_tmp7_) {
 #line 399 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			return;
-#line 2839 "PublishingUI.c"
+#line 2808 "PublishingUI.c"
 		}
 	}
 #line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2883,26 +2852,20 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
 	_tmp23__length1 = avail_services_length1;
 #line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp23__length1 == 0) {
-#line 2884 "PublishingUI.c"
-		const gchar* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
-#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp24_ = _ ("Unable to publish");
+#line 2853 "PublishingUI.c"
+		gchar* _tmp24_;
+		gchar* _tmp25_;
 #line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp25_ = _ ("Shotwell cannot publish the selected items because you do not have a c" \
+		_tmp24_ = g_strdup_printf (_ ("Shotwell cannot publish the selected items because you do not have a c" \
 "ompatible publishing plugin enabled. To correct this, choose <b>Edit %" \
 "s Preferences</b> and enable one or more of the publishing plugins on " \
-"the <b>Plugins</b> tab.");
+"the <b>Plugins</b> tab."), "▸");
 #line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp26_ = g_strdup_printf (_tmp25_, "▸");
+		_tmp25_ = _tmp24_;
 #line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp27_ = _tmp26_;
+		app_window_error_message_with_title (_ ("Unable to publish"), _tmp25_, NULL, FALSE);
 #line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		app_window_error_message_with_title (_tmp24_, _tmp27_, NULL, FALSE);
-#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_g_free0 (_tmp27_);
+		_g_free0 (_tmp25_);
 #line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		avail_services = (_vala_array_free (avail_services, avail_services_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2911,32 +2874,32 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
 		_g_object_unref0 (photos);
 #line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		return;
-#line 2909 "PublishingUI.c"
+#line 2872 "PublishingUI.c"
 	}
 #line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_debug ("PublishingUI.vala:422: PublishingDialog.go( )");
 #line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp28_ = to_publish;
+	_tmp26_ = to_publish;
 #line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp29_ = publishing_ui_publishing_dialog_new (_tmp28_);
+	_tmp27_ = publishing_ui_publishing_dialog_new (_tmp26_);
 #line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_object_ref_sink (_tmp29_);
+	g_object_ref_sink (_tmp27_);
 #line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (publishing_ui_publishing_dialog_active_instance);
 #line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	publishing_ui_publishing_dialog_active_instance = _tmp29_;
+	publishing_ui_publishing_dialog_active_instance = _tmp27_;
 #line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp30_ = publishing_ui_publishing_dialog_active_instance;
+	_tmp28_ = publishing_ui_publishing_dialog_active_instance;
 #line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	publishing_ui_publishing_dialog_run (_tmp30_);
+	publishing_ui_publishing_dialog_run (_tmp28_);
 #line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (publishing_ui_publishing_dialog_active_instance);
 #line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_active_instance = NULL;
 #line 431 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp31_ = publishing_ui_publishing_dialog_since_last_start;
+	_tmp29_ = publishing_ui_publishing_dialog_since_last_start;
 #line 431 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_timer_start (_tmp31_);
+	g_timer_start (_tmp29_);
 #line 432 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_elapsed_is_valid = TRUE;
 #line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2945,13 +2908,13 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
 	_g_object_unref0 (videos);
 #line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (photos);
-#line 2943 "PublishingUI.c"
+#line 2906 "PublishingUI.c"
 }
 
 
 static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self, GdkEventAny* evt) {
 	gboolean result = FALSE;
-	SpitPublishingConcretePublishingHost* _tmp0_ = NULL;
+	SpitPublishingConcretePublishingHost* _tmp0_;
 #line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), FALSE);
 #line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2972,42 +2935,42 @@ static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPub
 	result = TRUE;
 #line 441 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2970 "PublishingUI.c"
+#line 2933 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPublishingDialog* self) {
 	GtkTreeIter iter = {0};
 	gboolean have_active_iter = FALSE;
-	GtkComboBox* _tmp0_ = NULL;
+	GtkComboBox* _tmp0_;
 	GtkTreeIter _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 	GValue service_name_val = {0};
-	GtkListStore* _tmp7_ = NULL;
-	GtkTreeIter _tmp8_ = {0};
+	GtkListStore* _tmp7_;
+	GtkTreeIter _tmp8_;
 	GValue _tmp9_ = {0};
 	gchar* service_name = NULL;
-	GValue _tmp10_ = {0};
-	gchar* _tmp11_ = NULL;
+	GValue _tmp10_;
+	gchar* _tmp11_;
 	SpitPublishingService* selected_service = NULL;
 	SpitPublishingService** services = NULL;
-	gint _tmp12_ = 0;
-	SpitPublishingService** _tmp13_ = NULL;
-	gint services_length1 = 0;
-	gint _services_size_ = 0;
-	SpitPublishingService** _tmp14_ = NULL;
-	gint _tmp14__length1 = 0;
-	SpitPublishingService* _tmp21_ = NULL;
-	ConfigFacade* _tmp22_ = NULL;
-	ConfigFacade* _tmp23_ = NULL;
-	SpitPublishingService* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	SpitPublishingService* _tmp26_ = NULL;
-	SpitPublishingPublishable** _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
-	SpitPublishingConcretePublishingHost* _tmp28_ = NULL;
-	SpitPublishingConcretePublishingHost* _tmp29_ = NULL;
+	gint _tmp12_;
+	SpitPublishingService** _tmp13_;
+	gint services_length1;
+	gint _services_size_;
+	SpitPublishingService** _tmp14_;
+	gint _tmp14__length1;
+	SpitPublishingService* _tmp21_;
+	ConfigFacade* _tmp22_;
+	ConfigFacade* _tmp23_;
+	SpitPublishingService* _tmp24_;
+	const gchar* _tmp25_;
+	SpitPublishingService* _tmp26_;
+	SpitPublishingPublishable** _tmp27_;
+	gint _tmp27__length1;
+	SpitPublishingConcretePublishingHost* _tmp28_;
+	SpitPublishingConcretePublishingHost* _tmp29_;
 #line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3024,9 +2987,9 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
 	_tmp3_ = have_active_iter;
 #line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (!_tmp3_) {
-#line 3022 "PublishingUI.c"
-		GtkComboBox* _tmp4_ = NULL;
-		GtkComboBox* _tmp5_ = NULL;
+#line 2985 "PublishingUI.c"
+		GtkComboBox* _tmp4_;
+		GtkComboBox* _tmp5_;
 		GtkTreeIter _tmp6_ = {0};
 #line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = self->priv->service_selector_box;
@@ -3038,7 +3001,7 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
 		gtk_combo_box_get_active_iter (_tmp5_, &_tmp6_);
 #line 455 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		iter = _tmp6_;
-#line 3036 "PublishingUI.c"
+#line 2999 "PublishingUI.c"
 	}
 #line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp7_ = self->priv->service_selector_box_model;
@@ -3070,7 +3033,7 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
 	_tmp14_ = services;
 #line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp14__length1 = services_length1;
-#line 3068 "PublishingUI.c"
+#line 3031 "PublishingUI.c"
 	{
 		SpitPublishingService** service_collection = NULL;
 		gint service_collection_length1 = 0;
@@ -3082,18 +3045,18 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
 		service_collection_length1 = _tmp14__length1;
 #line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		for (service_it = 0; service_it < _tmp14__length1; service_it = service_it + 1) {
-#line 3080 "PublishingUI.c"
-			SpitPublishingService* _tmp15_ = NULL;
+#line 3043 "PublishingUI.c"
+			SpitPublishingService* _tmp15_;
 			SpitPublishingService* service = NULL;
 #line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp15_ = _g_object_ref0 (service_collection[service_it]);
 #line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			service = _tmp15_;
-#line 3087 "PublishingUI.c"
+#line 3050 "PublishingUI.c"
 			{
-				SpitPublishingService* _tmp16_ = NULL;
-				const gchar* _tmp17_ = NULL;
-				const gchar* _tmp18_ = NULL;
+				SpitPublishingService* _tmp16_;
+				const gchar* _tmp17_;
+				const gchar* _tmp18_;
 #line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp16_ = service;
 #line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3102,9 +3065,9 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
 				_tmp18_ = service_name;
 #line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
-#line 3100 "PublishingUI.c"
-					SpitPublishingService* _tmp19_ = NULL;
-					SpitPublishingService* _tmp20_ = NULL;
+#line 3063 "PublishingUI.c"
+					SpitPublishingService* _tmp19_;
+					SpitPublishingService* _tmp20_;
 #line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp19_ = service;
 #line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3117,11 +3080,11 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
 					_g_object_unref0 (service);
 #line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					break;
-#line 3115 "PublishingUI.c"
+#line 3078 "PublishingUI.c"
 				}
 #line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (service);
-#line 3119 "PublishingUI.c"
+#line 3082 "PublishingUI.c"
 			}
 		}
 	}
@@ -3165,12 +3128,12 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
 	_g_free0 (service_name);
 #line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL;
-#line 3163 "PublishingUI.c"
+#line 3126 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_on_close_cancel_clicked (PublishingUIPublishingDialog* self) {
-	SpitPublishingConcretePublishingHost* _tmp0_ = NULL;
+	SpitPublishingConcretePublishingHost* _tmp0_;
 #line 479 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 480 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3188,12 +3151,12 @@ static void publishing_ui_publishing_dialog_on_close_cancel_clicked (PublishingU
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 485 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 3185 "PublishingUI.c"
+#line 3148 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_large_window_mode (PublishingUIPublishingDialog* self) {
-	GtkBox* _tmp0_ = NULL;
+	GtkBox* _tmp0_;
 #line 488 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 489 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3204,12 +3167,12 @@ static void publishing_ui_publishing_dialog_set_large_window_mode (PublishingUIP
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
 #line 492 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3201 "PublishingUI.c"
+#line 3164 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_colossal_window_mode (PublishingUIPublishingDialog* self) {
-	GtkBox* _tmp0_ = NULL;
+	GtkBox* _tmp0_;
 #line 495 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 496 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3220,12 +3183,12 @@ static void publishing_ui_publishing_dialog_set_colossal_window_mode (Publishing
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
 #line 499 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3217 "PublishingUI.c"
+#line 3180 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_standard_window_mode (PublishingUIPublishingDialog* self) {
-	GtkBox* _tmp0_ = NULL;
+	GtkBox* _tmp0_;
 #line 502 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 503 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3236,7 +3199,7 @@ static void publishing_ui_publishing_dialog_set_standard_window_mode (Publishing
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
 #line 506 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3233 "PublishingUI.c"
+#line 3196 "PublishingUI.c"
 }
 
 
@@ -3245,7 +3208,7 @@ static void publishing_ui_publishing_dialog_set_free_sizable_window_mode (Publis
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 510 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 3242 "PublishingUI.c"
+#line 3205 "PublishingUI.c"
 }
 
 
@@ -3254,14 +3217,14 @@ static void publishing_ui_publishing_dialog_clear_free_sizable_window_mode (Publ
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 514 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3251 "PublishingUI.c"
+#line 3214 "PublishingUI.c"
 }
 
 
 SpitPublishingDialogPane* publishing_ui_publishing_dialog_get_active_pane (PublishingUIPublishingDialog* self) {
 	SpitPublishingDialogPane* result = NULL;
-	SpitPublishingDialogPane* _tmp0_ = NULL;
-	SpitPublishingDialogPane* _tmp1_ = NULL;
+	SpitPublishingDialogPane* _tmp0_;
+	SpitPublishingDialogPane* _tmp1_;
 #line 517 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), NULL);
 #line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3272,83 +3235,77 @@ SpitPublishingDialogPane* publishing_ui_publishing_dialog_get_active_pane (Publi
 	result = _tmp1_;
 #line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 3269 "PublishingUI.c"
+#line 3232 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_set_close_button_mode (PublishingUIPublishingDialog* self) {
-	GtkButton* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkButton* _tmp2_ = NULL;
+	GtkButton* _tmp0_;
+	GtkButton* _tmp1_;
 #line 521 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 522 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->close_cancel_button;
 #line 522 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp1_ = _ ("_Close");
-#line 522 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_button_set_label (_tmp0_, _tmp1_);
+	gtk_button_set_label (_tmp0_, _ ("_Close"));
 #line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp2_ = self->priv->close_cancel_button;
+	_tmp1_ = self->priv->close_cancel_button;
 #line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 3289 "PublishingUI.c"
+	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
+#line 3249 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublishingDialog* self) {
-	GtkButton* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	GtkButton* _tmp0_;
 #line 526 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->close_cancel_button;
 #line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp1_ = _ ("_Cancel");
-#line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_button_set_label (_tmp0_, _tmp1_);
-#line 3304 "PublishingUI.c"
+	gtk_button_set_label (_tmp0_, _ ("_Cancel"));
+#line 3261 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self) {
-	GtkComboBox* _tmp0_ = NULL;
+	GtkComboBox* _tmp0_;
 #line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 531 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
 #line 531 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 3316 "PublishingUI.c"
+#line 3273 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self) {
-	GtkComboBox* _tmp0_ = NULL;
+	GtkComboBox* _tmp0_;
 #line 534 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 535 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
 #line 535 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3328 "PublishingUI.c"
+#line 3285 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* self, SpitPublishingDialogPane* pane) {
-	SpitPublishingDialogPane* _tmp0_ = NULL;
-	GtkBox* _tmp6_ = NULL;
-	SpitPublishingDialogPane* _tmp7_ = NULL;
-	GtkWidget* _tmp8_ = NULL;
-	GtkWidget* _tmp9_ = NULL;
+	SpitPublishingDialogPane* _tmp0_;
+	GtkBox* _tmp6_;
+	SpitPublishingDialogPane* _tmp7_;
+	GtkWidget* _tmp8_;
+	GtkWidget* _tmp9_;
 	SpitPublishingDialogPaneGeometryOptions geometry_options = 0;
-	SpitPublishingDialogPane* _tmp10_ = NULL;
-	SpitPublishingDialogPaneGeometryOptions _tmp11_ = 0;
-	SpitPublishingDialogPaneGeometryOptions _tmp12_ = 0;
-	SpitPublishingDialogPaneGeometryOptions _tmp14_ = 0;
-	SpitPublishingDialogPane* _tmp15_ = NULL;
-	SpitPublishingDialogPane* _tmp16_ = NULL;
-	SpitPublishingDialogPane* _tmp17_ = NULL;
+	SpitPublishingDialogPane* _tmp10_;
+	SpitPublishingDialogPaneGeometryOptions _tmp11_;
+	SpitPublishingDialogPaneGeometryOptions _tmp12_;
+	SpitPublishingDialogPaneGeometryOptions _tmp14_;
+	SpitPublishingDialogPane* _tmp15_;
+	SpitPublishingDialogPane* _tmp16_;
+	SpitPublishingDialogPane* _tmp17_;
 #line 538 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 538 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3359,12 +3316,12 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog*
 	_tmp0_ = self->priv->active_pane;
 #line 541 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp0_ != NULL) {
-#line 3356 "PublishingUI.c"
-		SpitPublishingDialogPane* _tmp1_ = NULL;
-		GtkBox* _tmp2_ = NULL;
-		SpitPublishingDialogPane* _tmp3_ = NULL;
-		GtkWidget* _tmp4_ = NULL;
-		GtkWidget* _tmp5_ = NULL;
+#line 3313 "PublishingUI.c"
+		SpitPublishingDialogPane* _tmp1_;
+		GtkBox* _tmp2_;
+		SpitPublishingDialogPane* _tmp3_;
+		GtkWidget* _tmp4_;
+		GtkWidget* _tmp5_;
 #line 542 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_debug ("PublishingUI.vala:542: PublishingDialog: install_pane( ): a pane is al" \
 "ready installed; removing it.");
@@ -3384,7 +3341,7 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog*
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), _tmp5_);
 #line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (_tmp5_);
-#line 3380 "PublishingUI.c"
+#line 3337 "PublishingUI.c"
 	}
 #line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp6_ = self->priv->central_area_layouter;
@@ -3412,20 +3369,20 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog*
 	if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) {
 #line 554 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_set_large_window_mode (self);
-#line 3408 "PublishingUI.c"
+#line 3365 "PublishingUI.c"
 	} else {
-		SpitPublishingDialogPaneGeometryOptions _tmp13_ = 0;
+		SpitPublishingDialogPaneGeometryOptions _tmp13_;
 #line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp13_ = geometry_options;
 #line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if ((_tmp13_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) {
 #line 556 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			publishing_ui_publishing_dialog_set_colossal_window_mode (self);
-#line 3417 "PublishingUI.c"
+#line 3374 "PublishingUI.c"
 		} else {
 #line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			publishing_ui_publishing_dialog_set_standard_window_mode (self);
-#line 3421 "PublishingUI.c"
+#line 3378 "PublishingUI.c"
 		}
 	}
 #line 560 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3434,11 +3391,11 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog*
 	if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) {
 #line 561 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_set_free_sizable_window_mode (self);
-#line 3430 "PublishingUI.c"
+#line 3387 "PublishingUI.c"
 	} else {
 #line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_clear_free_sizable_window_mode (self);
-#line 3434 "PublishingUI.c"
+#line 3391 "PublishingUI.c"
 	}
 #line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp15_ = pane;
@@ -3452,14 +3409,14 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog*
 	_tmp17_ = pane;
 #line 566 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	spit_publishing_dialog_pane_on_pane_installed (_tmp17_);
-#line 3448 "PublishingUI.c"
+#line 3405 "PublishingUI.c"
 }
 
 
 gint publishing_ui_publishing_dialog_run (PublishingUIPublishingDialog* self) {
 	gint result = 0;
 	gint _result_ = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 569 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), 0);
 #line 570 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3476,7 +3433,7 @@ gint publishing_ui_publishing_dialog_run (PublishingUIPublishingDialog* self) {
 	result = _result_;
 #line 576 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 3472 "PublishingUI.c"
+#line 3429 "PublishingUI.c"
 }
 
 
@@ -3487,18 +3444,18 @@ static void publishing_ui_publishing_dialog_class_init (PublishingUIPublishingDi
 	g_type_class_add_private (klass, sizeof (PublishingUIPublishingDialogPrivate));
 #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_ui_publishing_dialog_finalize;
-#line 3483 "PublishingUI.c"
+#line 3440 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_instance_init (PublishingUIPublishingDialog * self) {
 #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv = PUBLISHING_UI_PUBLISHING_DIALOG_GET_PRIVATE (self);
-#line 3490 "PublishingUI.c"
+#line 3447 "PublishingUI.c"
 }
 
 
-static void publishing_ui_publishing_dialog_finalize (GObject* obj) {
+static void publishing_ui_publishing_dialog_finalize (GObject * obj) {
 	PublishingUIPublishingDialog * self;
 #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, PublishingUIPublishingDialog);
@@ -3520,7 +3477,7 @@ static void publishing_ui_publishing_dialog_finalize (GObject* obj) {
 	spit_pluggable_info_destroy (&self->priv->info);
 #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (publishing_ui_publishing_dialog_parent_class)->finalize (obj);
-#line 3516 "PublishingUI.c"
+#line 3473 "PublishingUI.c"
 }
 
 
diff --git a/src/searches/Branch.c b/src/searches/Branch.c
index 2da9433..a1664ff 100644
--- a/src/searches/Branch.c
+++ b/src/searches/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.7, the Vala compiler
+/* Branch.c generated by valac 0.36.6, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -479,12 +479,12 @@ struct _SearchesSidebarEntryPrivate {
 
 static gpointer searches_branch_parent_class = NULL;
 static gpointer searches_header_parent_class = NULL;
-static SidebarContextableIface* searches_header_sidebar_contextable_parent_iface = NULL;
+static SidebarContextableIface * searches_header_sidebar_contextable_parent_iface = NULL;
 static gpointer searches_sidebar_entry_parent_class = NULL;
 static gchar* searches_sidebar_entry_single_search_icon;
 static gchar* searches_sidebar_entry_single_search_icon = NULL;
-static SidebarRenameableEntryIface* searches_sidebar_entry_sidebar_renameable_entry_parent_iface = NULL;
-static SidebarDestroyableEntryIface* searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = NULL;
+static SidebarRenameableEntryIface * searches_sidebar_entry_sidebar_renameable_entry_parent_iface = NULL;
+static SidebarDestroyableEntryIface * searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = NULL;
 
 GType sidebar_branch_get_type (void) G_GNUC_CONST;
 GType searches_branch_get_type (void) G_GNUC_CONST;
@@ -532,7 +532,7 @@ SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, Saved
 void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator);
 SidebarEntry* sidebar_branch_get_root (SidebarBranch* self);
 void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
-static void searches_branch_finalize (GObject* obj);
+static void searches_branch_finalize (GObject * obj);
 GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
@@ -556,7 +556,7 @@ GType application_get_type (void) G_GNUC_CONST;
 Application* application_get_instance (void);
 void application_panic (Application* self);
 static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event);
-static void searches_header_finalize (GObject* obj);
+static void searches_header_finalize (GObject * obj);
 GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
 GType page_get_type (void) G_GNUC_CONST;
 GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
@@ -602,7 +602,7 @@ gboolean dialogs_confirm_delete_saved_search (SavedSearch* search);
 DeleteSavedSearchCommand* delete_saved_search_command_new (SavedSearch* search);
 DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type, SavedSearch* search);
 GType delete_saved_search_command_get_type (void) G_GNUC_CONST;
-static void searches_sidebar_entry_finalize (GObject* obj);
+static void searches_sidebar_entry_finalize (GObject * obj);
 
 
 static void _searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender, SavedSearch* search, gpointer self) {
@@ -630,12 +630,12 @@ static gint _searches_branch_comparator_gcompare_func (gconstpointer a, gconstpo
 
 SearchesBranch* searches_branch_construct (GType object_type) {
 	SearchesBranch * self = NULL;
-	SearchesHeader* _tmp0_ = NULL;
-	SearchesHeader* _tmp1_ = NULL;
-	SavedSearchTable* _tmp13_ = NULL;
-	SavedSearchTable* _tmp14_ = NULL;
-	SavedSearchTable* _tmp15_ = NULL;
-	SavedSearchTable* _tmp16_ = NULL;
+	SearchesHeader* _tmp0_;
+	SearchesHeader* _tmp1_;
+	SavedSearchTable* _tmp13_;
+	SavedSearchTable* _tmp14_;
+	SavedSearchTable* _tmp15_;
+	SavedSearchTable* _tmp16_;
 #line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = searches_header_new ();
 #line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -647,12 +647,12 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 #line 648 "Branch.c"
 	{
 		GeeIterator* _search_it = NULL;
-		SavedSearchTable* _tmp2_ = NULL;
-		SavedSearchTable* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeCollection* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
-		GeeIterator* _tmp7_ = NULL;
+		SavedSearchTable* _tmp2_;
+		SavedSearchTable* _tmp3_;
+		GeeCollection* _tmp4_;
+		GeeCollection* _tmp5_;
+		GeeIterator* _tmp6_;
+		GeeIterator* _tmp7_;
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp2_ = saved_search_table_get_instance ();
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -674,12 +674,12 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		while (TRUE) {
 #line 677 "Branch.c"
-			GeeIterator* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			GeeIterator* _tmp8_;
+			gboolean _tmp9_;
 			SavedSearch* search = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			gpointer _tmp11_ = NULL;
-			SavedSearch* _tmp12_ = NULL;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			SavedSearch* _tmp12_;
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_tmp8_ = _search_it;
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -739,9 +739,9 @@ SearchesBranch* searches_branch_new (void) {
 
 SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, SavedSearch* search) {
 	SearchesSidebarEntry* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	SavedSearch* _tmp1_;
+	gpointer _tmp2_;
 #line 32 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_val_if_fail (SEARCHES_IS_BRANCH (self), NULL);
 #line 32 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -762,13 +762,13 @@ SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch
 
 static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gint result = 0;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
-	SavedSearch* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	SavedSearch* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
+	SidebarEntry* _tmp0_;
+	SidebarEntry* _tmp1_;
+	SidebarEntry* _tmp2_;
+	SavedSearch* _tmp3_;
+	SidebarEntry* _tmp4_;
+	SavedSearch* _tmp5_;
+	gint _tmp6_;
 #line 36 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
 #line 36 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -805,12 +805,12 @@ static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 
 static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSearch* search) {
 	SearchesSidebarEntry* entry = NULL;
-	SavedSearch* _tmp0_ = NULL;
-	SearchesSidebarEntry* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
-	SavedSearch* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	SidebarEntry* _tmp5_ = NULL;
+	SavedSearch* _tmp0_;
+	SearchesSidebarEntry* _tmp1_;
+	GeeHashMap* _tmp2_;
+	SavedSearch* _tmp3_;
+	SidebarEntry* _tmp4_;
+	SidebarEntry* _tmp5_;
 #line 44 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_if_fail (SEARCHES_IS_BRANCH (self));
 #line 44 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -845,13 +845,13 @@ static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSe
 
 static void searches_branch_on_saved_search_removed (SearchesBranch* self, SavedSearch* search) {
 	SearchesSidebarEntry* entry = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	SavedSearch* _tmp1_;
+	gpointer _tmp2_;
 	gboolean is_removed = FALSE;
-	GeeHashMap* _tmp3_ = NULL;
-	SavedSearch* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	GeeHashMap* _tmp3_;
+	SavedSearch* _tmp4_;
+	gboolean _tmp5_;
 #line 51 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_if_fail (SEARCHES_IS_BRANCH (self));
 #line 51 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -898,7 +898,7 @@ static void searches_branch_class_init (SearchesBranchClass * klass) {
 
 
 static void searches_branch_instance_init (SearchesBranch * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv = SEARCHES_BRANCH_GET_PRIVATE (self);
 #line 8 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -909,14 +909,14 @@ static void searches_branch_instance_init (SearchesBranch * self) {
 }
 
 
-static void searches_branch_finalize (GObject* obj) {
+static void searches_branch_finalize (GObject * obj) {
 	SearchesBranch * self;
-	SavedSearchTable* _tmp0_ = NULL;
-	SavedSearchTable* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	SavedSearchTable* _tmp3_ = NULL;
-	SavedSearchTable* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
+	SavedSearchTable* _tmp0_;
+	SavedSearchTable* _tmp1_;
+	guint _tmp2_;
+	SavedSearchTable* _tmp3_;
+	SavedSearchTable* _tmp4_;
+	guint _tmp5_;
 #line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_BRANCH, SearchesBranch);
 #line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -961,35 +961,32 @@ GType searches_branch_get_type (void) {
 
 SearchesHeader* searches_header_construct (GType object_type) {
 	SearchesHeader * self = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 68 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = _ ("Saved Searches");
-#line 68 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self = (SearchesHeader*) sidebar_header_construct (object_type, _tmp0_, TRUE);
+	self = (SearchesHeader*) sidebar_header_construct (object_type, _ ("Saved Searches"), TRUE);
 #line 69 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_header_setup_context_menu (self);
 #line 67 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self;
-#line 974 "Branch.c"
+#line 971 "Branch.c"
 }
 
 
 SearchesHeader* searches_header_new (void) {
 #line 67 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return searches_header_construct (SEARCHES_TYPE_HEADER);
-#line 981 "Branch.c"
+#line 978 "Branch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 988 "Branch.c"
+#line 985 "Branch.c"
 }
 
 
 static void searches_header_setup_context_menu (SearchesHeader* self) {
-	GtkBuilder* _tmp0_ = NULL;
+	GtkBuilder* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 72 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_if_fail (SEARCHES_IS_HEADER (self));
@@ -999,17 +996,17 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 	_g_object_unref0 (self->priv->builder);
 #line 73 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv->builder = _tmp0_;
-#line 1003 "Branch.c"
+#line 1000 "Branch.c"
 	{
-		GtkBuilder* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+		GtkBuilder* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
 		GMenuModel* model = NULL;
-		GtkBuilder* _tmp4_ = NULL;
-		GObject* _tmp5_ = NULL;
-		GMenuModel* _tmp6_ = NULL;
-		GMenuModel* _tmp7_ = NULL;
-		GtkMenu* _tmp8_ = NULL;
+		GtkBuilder* _tmp4_;
+		GObject* _tmp5_;
+		GMenuModel* _tmp6_;
+		GMenuModel* _tmp7_;
+		GtkMenu* _tmp8_;
 #line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp1_ = self->priv->builder;
 #line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1022,8 +1019,8 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		_g_free0 (_tmp3_);
 #line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1026 "Branch.c"
-			goto __catch76_g_error;
+#line 1023 "Branch.c"
+			goto __catch77_g_error;
 		}
 #line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp4_ = self->priv->builder;
@@ -1045,18 +1042,18 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		self->priv->context_menu = _tmp8_;
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_object_unref0 (model);
-#line 1049 "Branch.c"
+#line 1046 "Branch.c"
 	}
-	goto __finally76;
-	__catch76_g_error:
+	goto __finally77;
+	__catch77_g_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		Application* _tmp13_ = NULL;
-		Application* _tmp14_ = NULL;
+		GError* _tmp9_;
+		const gchar* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		Application* _tmp13_;
+		Application* _tmp14_;
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_error_ = _inner_error_;
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1083,9 +1080,9 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		_application_unref0 (_tmp14_);
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_error_free0 (_error_);
-#line 1087 "Branch.c"
+#line 1084 "Branch.c"
 	}
-	__finally76:
+	__finally77:
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1094,7 +1091,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		g_clear_error (&_inner_error_);
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		return;
-#line 1098 "Branch.c"
+#line 1095 "Branch.c"
 	}
 }
 
@@ -1102,8 +1099,8 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event) {
 	SearchesHeader * self;
 	GtkMenu* result = NULL;
-	GtkMenu* _tmp0_ = NULL;
-	GtkMenu* _tmp1_ = NULL;
+	GtkMenu* _tmp0_;
+	GtkMenu* _tmp1_;
 #line 85 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_HEADER, SearchesHeader);
 #line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1114,7 +1111,7 @@ static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextabl
 	result = _tmp1_;
 #line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1118 "Branch.c"
+#line 1115 "Branch.c"
 }
 
 
@@ -1125,7 +1122,7 @@ static void searches_header_class_init (SearchesHeaderClass * klass) {
 	g_type_class_add_private (klass, sizeof (SearchesHeaderPrivate));
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_header_finalize;
-#line 1129 "Branch.c"
+#line 1126 "Branch.c"
 }
 
 
@@ -1133,8 +1130,8 @@ static void searches_header_sidebar_contextable_interface_init (SidebarContextab
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface);
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	iface->get_sidebar_context_menu = (GtkMenu* (*)(SidebarContextable*, GdkEventButton*)) searches_header_real_get_sidebar_context_menu;
-#line 1138 "Branch.c"
+	iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) searches_header_real_get_sidebar_context_menu;
+#line 1135 "Branch.c"
 }
 
 
@@ -1143,11 +1140,11 @@ static void searches_header_instance_init (SearchesHeader * self) {
 	self->priv = SEARCHES_HEADER_GET_PRIVATE (self);
 #line 65 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv->context_menu = NULL;
-#line 1147 "Branch.c"
+#line 1144 "Branch.c"
 }
 
 
-static void searches_header_finalize (GObject* obj) {
+static void searches_header_finalize (GObject * obj) {
 	SearchesHeader * self;
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_HEADER, SearchesHeader);
@@ -1157,7 +1154,7 @@ static void searches_header_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->context_menu);
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (searches_header_parent_class)->finalize (obj);
-#line 1161 "Branch.c"
+#line 1158 "Branch.c"
 }
 
 
@@ -1177,8 +1174,8 @@ GType searches_header_get_type (void) {
 
 SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, SavedSearch* search) {
 	SearchesSidebarEntry * self = NULL;
-	SavedSearch* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
+	SavedSearch* _tmp0_;
+	SavedSearch* _tmp1_;
 #line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
 #line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1193,14 +1190,14 @@ SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, Saved
 	self->priv->search = _tmp1_;
 #line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self;
-#line 1197 "Branch.c"
+#line 1194 "Branch.c"
 }
 
 
 SearchesSidebarEntry* searches_sidebar_entry_new (SavedSearch* search) {
 #line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return searches_sidebar_entry_construct (SEARCHES_TYPE_SIDEBAR_ENTRY, search);
-#line 1204 "Branch.c"
+#line 1201 "Branch.c"
 }
 
 
@@ -1214,8 +1211,8 @@ void searches_sidebar_entry_terminate (void) {
 
 SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self) {
 	SavedSearch* result = NULL;
-	SavedSearch* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
+	SavedSearch* _tmp0_;
+	SavedSearch* _tmp1_;
 #line 106 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_val_if_fail (SEARCHES_IS_SIDEBAR_ENTRY (self), NULL);
 #line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1226,15 +1223,15 @@ SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self
 	result = _tmp1_;
 #line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1230 "Branch.c"
+#line 1227 "Branch.c"
 }
 
 
 static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	SearchesSidebarEntry * self;
 	gchar* result = NULL;
-	SavedSearch* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SavedSearch* _tmp0_;
+	gchar* _tmp1_;
 #line 110 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
 #line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1245,15 +1242,15 @@ static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEnt
 	result = _tmp1_;
 #line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1249 "Branch.c"
+#line 1246 "Branch.c"
 }
 
 
 static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
 	SearchesSidebarEntry * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 114 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
 #line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1264,15 +1261,15 @@ static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEnt
 	result = _tmp1_;
 #line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1268 "Branch.c"
+#line 1265 "Branch.c"
 }
 
 
 static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
 	SearchesSidebarEntry * self;
 	Page* result = NULL;
-	SavedSearch* _tmp0_ = NULL;
-	SavedSearchPage* _tmp1_ = NULL;
+	SavedSearch* _tmp0_;
+	SavedSearchPage* _tmp1_;
 #line 118 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
 #line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1285,7 +1282,7 @@ static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* ba
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
 #line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1289 "Branch.c"
+#line 1286 "Branch.c"
 }
 
 
@@ -1298,17 +1295,17 @@ static gboolean searches_sidebar_entry_real_is_user_renameable (SidebarRenameabl
 	result = TRUE;
 #line 123 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1302 "Branch.c"
+#line 1299 "Branch.c"
 }
 
 
 static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) {
 	SearchesSidebarEntry * self;
-	SavedSearchTable* _tmp0_ = NULL;
-	SavedSearchTable* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	SavedSearchTable* _tmp0_;
+	SavedSearchTable* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 #line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
 #line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1327,13 +1324,13 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co
 	_saved_search_table_unref0 (_tmp1_);
 #line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (_tmp4_) {
-#line 1331 "Branch.c"
-		CommandManager* _tmp5_ = NULL;
-		CommandManager* _tmp6_ = NULL;
-		SavedSearch* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		RenameSavedSearchCommand* _tmp9_ = NULL;
-		RenameSavedSearchCommand* _tmp10_ = NULL;
+#line 1328 "Branch.c"
+		CommandManager* _tmp5_;
+		CommandManager* _tmp6_;
+		SavedSearch* _tmp7_;
+		const gchar* _tmp8_;
+		RenameSavedSearchCommand* _tmp9_;
+		RenameSavedSearchCommand* _tmp10_;
 #line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp5_ = app_window_get_command_manager ();
 #line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1352,13 +1349,13 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co
 		_g_object_unref0 (_tmp10_);
 #line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 1356 "Branch.c"
+#line 1353 "Branch.c"
 	} else {
-		const gchar* _tmp11_ = NULL;
-		SavedSearch* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gboolean _tmp15_ = FALSE;
+		const gchar* _tmp11_;
+		SavedSearch* _tmp12_;
+		gchar* _tmp13_;
+		gchar* _tmp14_;
+		gboolean _tmp15_;
 #line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp11_ = new_name;
 #line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1373,10 +1370,10 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co
 		_g_free0 (_tmp14_);
 #line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		if (_tmp15_) {
-#line 1377 "Branch.c"
-			const gchar* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
+#line 1374 "Branch.c"
+			const gchar* _tmp16_;
+			gchar* _tmp17_;
+			gchar* _tmp18_;
 #line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_tmp16_ = new_name;
 #line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1387,7 +1384,7 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co
 			app_window_error_message (_tmp18_, NULL);
 #line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_g_free0 (_tmp18_);
-#line 1391 "Branch.c"
+#line 1388 "Branch.c"
 		}
 	}
 }
@@ -1395,8 +1392,8 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co
 
 static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base) {
 	SearchesSidebarEntry * self;
-	SavedSearch* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SavedSearch* _tmp0_;
+	gboolean _tmp1_;
 #line 133 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
 #line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1405,12 +1402,12 @@ static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry*
 	_tmp1_ = dialogs_confirm_delete_saved_search (_tmp0_);
 #line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (_tmp1_) {
-#line 1409 "Branch.c"
-		CommandManager* _tmp2_ = NULL;
-		CommandManager* _tmp3_ = NULL;
-		SavedSearch* _tmp4_ = NULL;
-		DeleteSavedSearchCommand* _tmp5_ = NULL;
-		DeleteSavedSearchCommand* _tmp6_ = NULL;
+#line 1406 "Branch.c"
+		CommandManager* _tmp2_;
+		CommandManager* _tmp3_;
+		SavedSearch* _tmp4_;
+		DeleteSavedSearchCommand* _tmp5_;
+		DeleteSavedSearchCommand* _tmp6_;
 #line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp2_ = app_window_get_command_manager ();
 #line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1427,30 +1424,30 @@ static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry*
 		_g_object_unref0 (_tmp6_);
 #line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_command_manager_unref0 (_tmp3_);
-#line 1431 "Branch.c"
+#line 1428 "Branch.c"
 	}
 }
 
 
 static void searches_sidebar_entry_class_init (SearchesSidebarEntryClass * klass) {
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_type_class_add_private (klass, sizeof (SearchesSidebarEntryPrivate));
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) searches_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_get_sidebar_name;
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) searches_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_get_sidebar_icon;
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) searches_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_create_page;
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_sidebar_entry_finalize;
 #line 92 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = g_strdup ("edit-find");
 #line 92 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_single_search_icon = _tmp0_;
-#line 1454 "Branch.c"
+#line 1451 "Branch.c"
 }
 
 
@@ -1458,10 +1455,10 @@ static void searches_sidebar_entry_sidebar_renameable_entry_interface_init (Side
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	iface->is_user_renameable = (gboolean (*)(SidebarRenameableEntry*)) searches_sidebar_entry_real_is_user_renameable;
+	iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) searches_sidebar_entry_real_is_user_renameable;
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	iface->rename = (void (*)(SidebarRenameableEntry*, const gchar*)) searches_sidebar_entry_real_rename;
-#line 1465 "Branch.c"
+	iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) searches_sidebar_entry_real_rename;
+#line 1462 "Branch.c"
 }
 
 
@@ -1469,19 +1466,19 @@ static void searches_sidebar_entry_sidebar_destroyable_entry_interface_init (Sid
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	iface->destroy_source = (void (*)(SidebarDestroyableEntry*)) searches_sidebar_entry_real_destroy_source;
-#line 1474 "Branch.c"
+	iface->destroy_source = (void (*) (SidebarDestroyableEntry *)) searches_sidebar_entry_real_destroy_source;
+#line 1471 "Branch.c"
 }
 
 
 static void searches_sidebar_entry_instance_init (SearchesSidebarEntry * self) {
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv = SEARCHES_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 1481 "Branch.c"
+#line 1478 "Branch.c"
 }
 
 
-static void searches_sidebar_entry_finalize (GObject* obj) {
+static void searches_sidebar_entry_finalize (GObject * obj) {
 	SearchesSidebarEntry * self;
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
@@ -1489,7 +1486,7 @@ static void searches_sidebar_entry_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->search);
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (searches_sidebar_entry_parent_class)->finalize (obj);
-#line 1493 "Branch.c"
+#line 1490 "Branch.c"
 }
 
 
diff --git a/src/searches/SavedSearchDialog.c b/src/searches/SavedSearchDialog.c
index 2489f21..86fd417 100644
--- a/src/searches/SavedSearchDialog.c
+++ b/src/searches/SavedSearchDialog.c
@@ -1,4 +1,4 @@
-/* SavedSearchDialog.c generated by valac 0.34.7, the Vala compiler
+/* SavedSearchDialog.c generated by valac 0.36.6, the Vala compiler
  * generated from SavedSearchDialog.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -191,6 +191,12 @@ typedef struct _SavedSearchDialogSearchRowRatingClass SavedSearchDialogSearchRow
 typedef struct _SavedSearchDialogSearchRowDate SavedSearchDialogSearchRowDate;
 typedef struct _SavedSearchDialogSearchRowDateClass SavedSearchDialogSearchRowDateClass;
 typedef struct _SavedSearchDialogParamSpecSearchRowContainer SavedSearchDialogParamSpecSearchRowContainer;
+enum  {
+	SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL,
+	SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL,
+	SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_LAST_SIGNAL
+};
+static guint saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_LAST_SIGNAL] = {0};
 typedef struct _SavedSearchDialogSearchRowPrivate SavedSearchDialogSearchRowPrivate;
 typedef struct _SavedSearchDialogParamSpecSearchRow SavedSearchDialogParamSpecSearchRow;
 typedef struct _SavedSearchDialogSearchRowTextPrivate SavedSearchDialogSearchRowTextPrivate;
@@ -680,7 +686,7 @@ static GType saved_search_dialog_search_row_date_get_type (void) G_GNUC_CONST G_
 static SearchCondition* saved_search_dialog_search_row_get_search_condition (SavedSearchDialogSearchRow* self);
 static gboolean saved_search_dialog_search_row_is_complete (SavedSearchDialogSearchRow* self);
 static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer* obj);
+static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer * obj);
 enum  {
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_DUMMY_PROPERTY
 };
@@ -689,7 +695,7 @@ static SearchCondition* saved_search_dialog_search_row_real_get_search_condition
 static void saved_search_dialog_search_row_real_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc);
 static gboolean saved_search_dialog_search_row_real_is_complete (SavedSearchDialogSearchRow* self);
 static SavedSearchDialogSearchRow* saved_search_dialog_search_row_construct (GType object_type);
-static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow* obj);
+static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow * obj);
 #define SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowTextPrivate))
 enum  {
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_DUMMY_PROPERTY
@@ -708,7 +714,7 @@ static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialog
 SearchConditionTextContext search_condition_text_get_context (SearchConditionText* self);
 const gchar* search_condition_text_get_text (SearchConditionText* self);
 static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearchDialogSearchRow* base);
-static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow* obj);
+static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow * obj);
 #define SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaTypePrivate))
 enum  {
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_DUMMY_PROPERTY
@@ -726,7 +732,7 @@ static void saved_search_dialog_search_row_media_type_real_populate (SavedSearch
 SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchConditionMediaType* self);
 SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (SearchConditionMediaType* self);
 static gboolean saved_search_dialog_search_row_media_type_real_is_complete (SavedSearchDialogSearchRow* base);
-static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow* obj);
+static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow * obj);
 #define SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModifiedPrivate))
 enum  {
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_DUMMY_PROPERTY
@@ -744,7 +750,7 @@ static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDi
 SearchConditionModifiedState search_condition_modified_get_state (SearchConditionModified* self);
 SearchConditionModifiedContext search_condition_modified_get_context (SearchConditionModified* self);
 static gboolean saved_search_dialog_search_row_modified_real_is_complete (SavedSearchDialogSearchRow* base);
-static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow* obj);
+static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow * obj);
 #define SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlaggedPrivate))
 enum  {
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_DUMMY_PROPERTY
@@ -760,7 +766,7 @@ SearchConditionFlagged* search_condition_flagged_construct (GType object_type, S
 static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc);
 SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionFlagged* self);
 static gboolean saved_search_dialog_search_row_flagged_real_is_complete (SavedSearchDialogSearchRow* base);
-static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow* obj);
+static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow * obj);
 #define SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRatingPrivate))
 enum  {
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_DUMMY_PROPERTY
@@ -779,7 +785,7 @@ static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDial
 SearchConditionRatingContext search_condition_rating_get_context (SearchConditionRating* self);
 Rating search_condition_rating_get_rating (SearchConditionRating* self);
 static gboolean saved_search_dialog_search_row_rating_real_is_complete (SavedSearchDialogSearchRow* base);
-static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow* obj);
+static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow * obj);
 #define SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDatePrivate))
 enum  {
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DUMMY_PROPERTY
@@ -816,29 +822,29 @@ static void __lambda13_ (SavedSearchDialogSearchRowDate* self);
 static void ___lambda13__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self);
 static void __lambda14_ (Block10Data* _data10_);
 static void ___lambda14__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self);
-static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow* obj);
-static void saved_search_dialog_finalize (SavedSearchDialog* obj);
+static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow * obj);
+static void saved_search_dialog_finalize (SavedSearchDialog * obj);
 
 
 static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_title_changed ((SavedSearchDialog*) self);
-#line 827 "SavedSearchDialog.c"
+#line 833 "SavedSearchDialog.c"
 }
 
 
 SavedSearchDialog* saved_search_dialog_construct (GType object_type) {
 	SavedSearchDialog* self = NULL;
-	GtkEntry* _tmp0_ = NULL;
-	SavedSearchTable* _tmp1_ = NULL;
-	SavedSearchTable* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GtkEntry* _tmp5_ = NULL;
-	GeeArrayList* _tmp6_ = NULL;
-	gpointer _tmp7_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp8_ = NULL;
-	GtkDialog* _tmp9_ = NULL;
+	GtkEntry* _tmp0_;
+	SavedSearchTable* _tmp1_;
+	SavedSearchTable* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GtkEntry* _tmp5_;
+	GeeArrayList* _tmp6_;
+	gpointer _tmp7_;
+	SavedSearchDialogSearchRowContainer* _tmp8_;
+	GtkDialog* _tmp9_;
 #line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialog*) g_type_create_instance (object_type);
 #line 649 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -883,39 +889,39 @@ SavedSearchDialog* saved_search_dialog_construct (GType object_type) {
 	saved_search_dialog_set_valid (self, FALSE);
 #line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 887 "SavedSearchDialog.c"
+#line 893 "SavedSearchDialog.c"
 }
 
 
 SavedSearchDialog* saved_search_dialog_new (void) {
 #line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_construct (TYPE_SAVED_SEARCH_DIALOG);
-#line 894 "SavedSearchDialog.c"
+#line 900 "SavedSearchDialog.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 901 "SavedSearchDialog.c"
+#line 907 "SavedSearchDialog.c"
 }
 
 
 SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type, SavedSearch* saved_search) {
 	SavedSearchDialog* self = NULL;
-	SavedSearch* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
-	GtkDialog* _tmp2_ = NULL;
-	GtkComboBoxText* _tmp3_ = NULL;
-	SavedSearch* _tmp4_ = NULL;
-	SearchOperator _tmp5_ = 0;
-	GtkEntry* _tmp6_ = NULL;
-	SavedSearch* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	GeeArrayList* _tmp24_ = NULL;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
+	SavedSearch* _tmp0_;
+	SavedSearch* _tmp1_;
+	GtkDialog* _tmp2_;
+	GtkComboBoxText* _tmp3_;
+	SavedSearch* _tmp4_;
+	SearchOperator _tmp5_;
+	GtkEntry* _tmp6_;
+	SavedSearch* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	GeeArrayList* _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
 #line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (saved_search), NULL);
 #line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -956,15 +962,15 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 	gtk_entry_set_text (_tmp6_, _tmp9_);
 #line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (_tmp9_);
-#line 960 "SavedSearchDialog.c"
+#line 966 "SavedSearchDialog.c"
 	{
 		GeeList* _sc_list = NULL;
-		SavedSearch* _tmp10_ = NULL;
-		GeeList* _tmp11_ = NULL;
+		SavedSearch* _tmp10_;
+		GeeList* _tmp11_;
 		gint _sc_size = 0;
-		GeeList* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
+		GeeList* _tmp12_;
+		gint _tmp13_;
+		gint _tmp14_;
 		gint _sc_index = 0;
 #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp10_ = saved_search;
@@ -984,17 +990,17 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 		_sc_index = -1;
 #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		while (TRUE) {
-#line 988 "SavedSearchDialog.c"
-			gint _tmp15_ = 0;
-			gint _tmp16_ = 0;
-			gint _tmp17_ = 0;
+#line 994 "SavedSearchDialog.c"
+			gint _tmp15_;
+			gint _tmp16_;
+			gint _tmp17_;
 			SearchCondition* sc = NULL;
-			GeeList* _tmp18_ = NULL;
-			gint _tmp19_ = 0;
-			gpointer _tmp20_ = NULL;
-			SearchCondition* _tmp21_ = NULL;
-			SavedSearchDialogSearchRowContainer* _tmp22_ = NULL;
-			SavedSearchDialogSearchRowContainer* _tmp23_ = NULL;
+			GeeList* _tmp18_;
+			gint _tmp19_;
+			gpointer _tmp20_;
+			SearchCondition* _tmp21_;
+			SavedSearchDialogSearchRowContainer* _tmp22_;
+			SavedSearchDialogSearchRowContainer* _tmp23_;
 #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp15_ = _sc_index;
 #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1007,7 +1013,7 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 			if (!(_tmp16_ < _tmp17_)) {
 #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				break;
-#line 1011 "SavedSearchDialog.c"
+#line 1017 "SavedSearchDialog.c"
 			}
 #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp18_ = _sc_list;
@@ -1029,11 +1035,11 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 			_saved_search_dialog_search_row_container_unref0 (_tmp23_);
 #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_search_condition_unref0 (sc);
-#line 1033 "SavedSearchDialog.c"
+#line 1039 "SavedSearchDialog.c"
 		}
 #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (_sc_list);
-#line 1037 "SavedSearchDialog.c"
+#line 1043 "SavedSearchDialog.c"
 	}
 #line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp24_ = self->priv->row_list;
@@ -1043,10 +1049,10 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 	_tmp26_ = _tmp25_;
 #line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp26_ == 1) {
-#line 1047 "SavedSearchDialog.c"
-		GeeArrayList* _tmp27_ = NULL;
-		gpointer _tmp28_ = NULL;
-		SavedSearchDialogSearchRowContainer* _tmp29_ = NULL;
+#line 1053 "SavedSearchDialog.c"
+		GeeArrayList* _tmp27_;
+		gpointer _tmp28_;
+		SavedSearchDialogSearchRowContainer* _tmp29_;
 #line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp27_ = self->priv->row_list;
 #line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1057,27 +1063,27 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 		saved_search_dialog_search_row_container_allow_removal (_tmp29_, FALSE);
 #line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_dialog_search_row_container_unref0 (_tmp29_);
-#line 1061 "SavedSearchDialog.c"
+#line 1067 "SavedSearchDialog.c"
 	}
 #line 680 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, TRUE);
 #line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 1067 "SavedSearchDialog.c"
+#line 1073 "SavedSearchDialog.c"
 }
 
 
 SavedSearchDialog* saved_search_dialog_new_edit_existing (SavedSearch* saved_search) {
 #line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_construct_edit_existing (TYPE_SAVED_SEARCH_DIALOG, saved_search);
-#line 1074 "SavedSearchDialog.c"
+#line 1080 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_on_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
 #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_response ((SavedSearchDialog*) self, response_id);
-#line 1081 "SavedSearchDialog.c"
+#line 1087 "SavedSearchDialog.c"
 }
 
 
@@ -1086,52 +1092,46 @@ static gboolean _saved_search_dialog_on_add_criteria_gtk_widget_button_press_eve
 	result = saved_search_dialog_on_add_criteria ((SavedSearchDialog*) self, event);
 #line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 1090 "SavedSearchDialog.c"
+#line 1096 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_setup_dialog (SavedSearchDialog* self) {
-	GtkBuilder* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	AppWindow* _tmp2_ = NULL;
-	AppWindow* _tmp3_ = NULL;
-	GdkWindow* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	GtkDialog* _tmp7_ = NULL;
-	GtkDialog* _tmp8_ = NULL;
-	GtkDialog* _tmp9_ = NULL;
-	AppWindow* _tmp10_ = NULL;
-	AppWindow* _tmp11_ = NULL;
-	GtkDialog* _tmp12_ = NULL;
-	GtkDialog* _tmp13_ = NULL;
-	GtkDialog* _tmp14_ = NULL;
-	GtkBox* _tmp15_ = NULL;
-	GtkBuilder* _tmp16_ = NULL;
-	GObject* _tmp17_ = NULL;
-	GtkDialog* _tmp18_ = NULL;
-	GtkBuilder* _tmp19_ = NULL;
-	GObject* _tmp20_ = NULL;
-	GtkButton* _tmp21_ = NULL;
-	GtkButton* _tmp22_ = NULL;
-	GtkBuilder* _tmp23_ = NULL;
-	GObject* _tmp24_ = NULL;
-	GtkEntry* _tmp25_ = NULL;
-	GtkEntry* _tmp26_ = NULL;
-	GtkEntry* _tmp27_ = NULL;
-	GtkBuilder* _tmp28_ = NULL;
-	GObject* _tmp29_ = NULL;
-	GtkBox* _tmp30_ = NULL;
-	GtkBuilder* _tmp31_ = NULL;
-	GObject* _tmp32_ = NULL;
-	GtkComboBoxText* _tmp33_ = NULL;
-	GtkComboBoxText* _tmp34_ = NULL;
-	const gchar* _tmp35_ = NULL;
-	GtkComboBoxText* _tmp36_ = NULL;
-	const gchar* _tmp37_ = NULL;
-	GtkComboBoxText* _tmp38_ = NULL;
-	const gchar* _tmp39_ = NULL;
-	GtkComboBoxText* _tmp40_ = NULL;
+	GtkBuilder* _tmp0_;
+	AppWindow* _tmp1_;
+	AppWindow* _tmp2_;
+	GdkWindow* _tmp3_;
+	GtkDialog* _tmp4_;
+	GtkDialog* _tmp5_;
+	GtkDialog* _tmp6_;
+	AppWindow* _tmp7_;
+	AppWindow* _tmp8_;
+	GtkDialog* _tmp9_;
+	GtkDialog* _tmp10_;
+	GtkDialog* _tmp11_;
+	GtkBox* _tmp12_;
+	GtkBuilder* _tmp13_;
+	GObject* _tmp14_;
+	GtkDialog* _tmp15_;
+	GtkBuilder* _tmp16_;
+	GObject* _tmp17_;
+	GtkButton* _tmp18_;
+	GtkButton* _tmp19_;
+	GtkBuilder* _tmp20_;
+	GObject* _tmp21_;
+	GtkEntry* _tmp22_;
+	GtkEntry* _tmp23_;
+	GtkEntry* _tmp24_;
+	GtkBuilder* _tmp25_;
+	GObject* _tmp26_;
+	GtkBox* _tmp27_;
+	GtkBuilder* _tmp28_;
+	GObject* _tmp29_;
+	GtkComboBoxText* _tmp30_;
+	GtkComboBoxText* _tmp31_;
+	GtkComboBoxText* _tmp32_;
+	GtkComboBoxText* _tmp33_;
+	GtkComboBoxText* _tmp34_;
 #line 688 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
 #line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1141,144 +1141,132 @@ static void saved_search_dialog_setup_dialog (SavedSearchDialog* self) {
 #line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->builder = _tmp0_;
 #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = _ ("Search");
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = app_window_get_instance ();
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = _tmp2_;
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
+	_tmp1_ = app_window_get_instance ();
 #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = _ ("Cancel");
+	_tmp2_ = _tmp1_;
 #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = _ ("OK");
+	_tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
 #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = (GtkDialog*) gtk_dialog_new_with_buttons (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow), (GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT) | GTK_DIALOG_USE_HEADER_BAR, _tmp5_, GTK_RESPONSE_CANCEL, _tmp6_, GTK_RESPONSE_OK, NULL, NULL);
+	_tmp4_ = (GtkDialog*) gtk_dialog_new_with_buttons (_ ("Search"), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_window_get_type (), GtkWindow), (GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT) | GTK_DIALOG_USE_HEADER_BAR, _ ("Cancel"), GTK_RESPONSE_CANCEL, _ ("OK"), GTK_RESPONSE_OK, NULL, NULL);
 #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp7_);
+	g_object_ref_sink (_tmp4_);
 #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->dialog);
 #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->dialog = _tmp7_;
+	self->priv->dialog = _tmp4_;
 #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (_tmp3_);
+	_g_object_unref0 (_tmp2_);
 #line 699 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = self->priv->dialog;
+	_tmp5_ = self->priv->dialog;
 #line 699 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), FALSE);
+	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow), FALSE);
 #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = self->priv->dialog;
+	_tmp6_ = self->priv->dialog;
 #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = app_window_get_instance ();
+	_tmp7_ = app_window_get_instance ();
 #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = _tmp10_;
+	_tmp8_ = _tmp7_;
 #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow));
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow));
 #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (_tmp11_);
+	_g_object_unref0 (_tmp8_);
 #line 701 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = self->priv->dialog;
+	_tmp9_ = self->priv->dialog;
 #line 701 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_dialog_set_default_response (_tmp12_, (gint) GTK_RESPONSE_OK);
+	gtk_dialog_set_default_response (_tmp9_, (gint) GTK_RESPONSE_OK);
 #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = self->priv->dialog;
+	_tmp10_ = self->priv->dialog;
 #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (_tmp13_, "response", (GCallback) _saved_search_dialog_on_response_gtk_dialog_response, self);
+	g_signal_connect (_tmp10_, "response", (GCallback) _saved_search_dialog_on_response_gtk_dialog_response, self);
 #line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp14_ = self->priv->dialog;
+	_tmp11_ = self->priv->dialog;
 #line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp15_ = (GtkBox*) gtk_dialog_get_content_area (_tmp14_);
+	_tmp12_ = (GtkBox*) gtk_dialog_get_content_area (_tmp11_);
 #line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp16_ = self->priv->builder;
+	_tmp13_ = self->priv->builder;
 #line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp17_ = gtk_builder_get_object (_tmp16_, "criteria");
+	_tmp14_ = gtk_builder_get_object (_tmp13_, "criteria");
 #line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp17_) : NULL);
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp14_) : NULL);
 #line 704 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp18_ = self->priv->dialog;
+	_tmp15_ = self->priv->dialog;
 #line 704 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_dialog_set_default_response (_tmp18_, (gint) GTK_RESPONSE_OK);
+	gtk_dialog_set_default_response (_tmp15_, (gint) GTK_RESPONSE_OK);
 #line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = self->priv->builder;
+	_tmp16_ = self->priv->builder;
 #line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp20_ = gtk_builder_get_object (_tmp19_, "Add search button");
+	_tmp17_ = gtk_builder_get_object (_tmp16_, "Add search button");
 #line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_button_get_type ()) ? ((GtkButton*) _tmp20_) : NULL);
+	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_button_get_type ()) ? ((GtkButton*) _tmp17_) : NULL);
 #line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->add_criteria);
 #line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->add_criteria = _tmp21_;
+	self->priv->add_criteria = _tmp18_;
 #line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = self->priv->add_criteria;
+	_tmp19_ = self->priv->add_criteria;
 #line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _saved_search_dialog_on_add_criteria_gtk_widget_button_press_event, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _saved_search_dialog_on_add_criteria_gtk_widget_button_press_event, self);
 #line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp23_ = self->priv->builder;
+	_tmp20_ = self->priv->builder;
 #line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp24_ = gtk_builder_get_object (_tmp23_, "Search title");
+	_tmp21_ = gtk_builder_get_object (_tmp20_, "Search title");
 #line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp24_) : NULL);
+	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp21_) : NULL);
 #line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->search_title);
 #line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->search_title = _tmp25_;
+	self->priv->search_title = _tmp22_;
 #line 710 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp26_ = self->priv->search_title;
+	_tmp23_ = self->priv->search_title;
 #line 710 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_entry_set_activates_default (_tmp26_, TRUE);
+	gtk_entry_set_activates_default (_tmp23_, TRUE);
 #line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp27_ = self->priv->search_title;
+	_tmp24_ = self->priv->search_title;
 #line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self);
 #line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp28_ = self->priv->builder;
+	_tmp25_ = self->priv->builder;
 #line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp29_ = gtk_builder_get_object (_tmp28_, "row_box");
+	_tmp26_ = gtk_builder_get_object (_tmp25_, "row_box");
 #line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_box_get_type ()) ? ((GtkBox*) _tmp29_) : NULL);
+	_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_box_get_type ()) ? ((GtkBox*) _tmp26_) : NULL);
 #line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->row_box);
 #line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->row_box = _tmp30_;
+	self->priv->row_box = _tmp27_;
 #line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp31_ = self->priv->builder;
+	_tmp28_ = self->priv->builder;
 #line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp32_ = gtk_builder_get_object (_tmp31_, "Type of search criteria");
+	_tmp29_ = gtk_builder_get_object (_tmp28_, "Type of search criteria");
 #line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp32_) : NULL);
+	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp29_) : NULL);
 #line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->operator);
 #line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->operator = _tmp33_;
-#line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp34_ = self->priv->operator;
+	self->priv->operator = _tmp30_;
 #line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp35_ = _ ("any");
+	_tmp31_ = self->priv->operator;
 #line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp34_, _tmp35_);
+	gtk_combo_box_text_append_text (_tmp31_, _ ("any"));
 #line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp36_ = self->priv->operator;
+	_tmp32_ = self->priv->operator;
 #line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp37_ = _ ("all");
-#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp36_, _tmp37_);
-#line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp38_ = self->priv->operator;
+	gtk_combo_box_text_append_text (_tmp32_, _ ("all"));
 #line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp39_ = _ ("none");
+	_tmp33_ = self->priv->operator;
 #line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp38_, _tmp39_);
+	gtk_combo_box_text_append_text (_tmp33_, _ ("none"));
 #line 719 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp40_ = self->priv->operator;
+	_tmp34_ = self->priv->operator;
 #line 719 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 1276 "SavedSearchDialog.c"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 1264 "SavedSearchDialog.c"
 }
 
 
 void saved_search_dialog_show (SavedSearchDialog* self) {
-	GtkDialog* _tmp0_ = NULL;
-	GtkDialog* _tmp1_ = NULL;
+	GtkDialog* _tmp0_;
+	GtkDialog* _tmp1_;
 #line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
 #line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1289,7 +1277,7 @@ void saved_search_dialog_show (SavedSearchDialog* self) {
 	_tmp1_ = self->priv->dialog;
 #line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 1293 "SavedSearchDialog.c"
+#line 1281 "SavedSearchDialog.c"
 }
 
 
@@ -1305,13 +1293,13 @@ static gboolean saved_search_dialog_on_add_criteria (SavedSearchDialog* self, Gd
 	result = FALSE;
 #line 731 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 1309 "SavedSearchDialog.c"
+#line 1297 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_add_text_search (SavedSearchDialog* self) {
 	SavedSearchDialogSearchRowContainer* text = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
 #line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
 #line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1322,38 +1310,38 @@ static void saved_search_dialog_add_text_search (SavedSearchDialog* self) {
 	saved_search_dialog_add_row (self, text);
 #line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (text);
-#line 1326 "SavedSearchDialog.c"
+#line 1314 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self) {
 #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_remove_row ((SavedSearchDialog*) self, this_row);
-#line 1333 "SavedSearchDialog.c"
+#line 1321 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self) {
 #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_row_changed ((SavedSearchDialog*) self, this_row);
-#line 1340 "SavedSearchDialog.c"
+#line 1328 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) {
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	GtkBox* _tmp6_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp7_ = NULL;
-	GtkWidget* _tmp8_ = NULL;
-	GtkWidget* _tmp9_ = NULL;
-	GeeArrayList* _tmp10_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp11_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp12_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp13_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	GtkBox* _tmp6_;
+	SavedSearchDialogSearchRowContainer* _tmp7_;
+	GtkWidget* _tmp8_;
+	GtkWidget* _tmp9_;
+	GeeArrayList* _tmp10_;
+	SavedSearchDialogSearchRowContainer* _tmp11_;
+	SavedSearchDialogSearchRowContainer* _tmp12_;
+	SavedSearchDialogSearchRowContainer* _tmp13_;
+	SavedSearchDialogSearchRowContainer* _tmp14_;
+	gboolean _tmp15_;
 #line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
 #line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1366,10 +1354,10 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia
 	_tmp2_ = _tmp1_;
 #line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp2_ == 1) {
-#line 1370 "SavedSearchDialog.c"
-		GeeArrayList* _tmp3_ = NULL;
-		gpointer _tmp4_ = NULL;
-		SavedSearchDialogSearchRowContainer* _tmp5_ = NULL;
+#line 1358 "SavedSearchDialog.c"
+		GeeArrayList* _tmp3_;
+		gpointer _tmp4_;
+		SavedSearchDialogSearchRowContainer* _tmp5_;
 #line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->row_list;
 #line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1380,7 +1368,7 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia
 		saved_search_dialog_search_row_container_allow_removal (_tmp5_, TRUE);
 #line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_dialog_search_row_container_unref0 (_tmp5_);
-#line 1384 "SavedSearchDialog.c"
+#line 1372 "SavedSearchDialog.c"
 	}
 #line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->row_box;
@@ -1414,24 +1402,24 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia
 	_tmp15_ = saved_search_dialog_search_row_container_is_complete (_tmp14_);
 #line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, _tmp15_);
-#line 1418 "SavedSearchDialog.c"
+#line 1406 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) {
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	SavedSearchDialogSearchRowContainer* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	GtkBox* _tmp4_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp5_ = NULL;
-	GtkWidget* _tmp6_ = NULL;
-	GtkWidget* _tmp7_ = NULL;
-	GeeArrayList* _tmp8_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp9_ = NULL;
-	GeeArrayList* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	guint _tmp1_;
+	SavedSearchDialogSearchRowContainer* _tmp2_;
+	guint _tmp3_;
+	GtkBox* _tmp4_;
+	SavedSearchDialogSearchRowContainer* _tmp5_;
+	GtkWidget* _tmp6_;
+	GtkWidget* _tmp7_;
+	GeeArrayList* _tmp8_;
+	SavedSearchDialogSearchRowContainer* _tmp9_;
+	GeeArrayList* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
 #line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
 #line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1474,10 +1462,10 @@ static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSea
 	_tmp12_ = _tmp11_;
 #line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp12_ == 1) {
-#line 1478 "SavedSearchDialog.c"
-		GeeArrayList* _tmp13_ = NULL;
-		gpointer _tmp14_ = NULL;
-		SavedSearchDialogSearchRowContainer* _tmp15_ = NULL;
+#line 1466 "SavedSearchDialog.c"
+		GeeArrayList* _tmp13_;
+		gpointer _tmp14_;
+		SavedSearchDialogSearchRowContainer* _tmp15_;
 #line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp13_ = self->priv->row_list;
 #line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1488,44 +1476,44 @@ static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSea
 		saved_search_dialog_search_row_container_allow_removal (_tmp15_, FALSE);
 #line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_dialog_search_row_container_unref0 (_tmp15_);
-#line 1492 "SavedSearchDialog.c"
+#line 1480 "SavedSearchDialog.c"
 	}
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, TRUE);
-#line 1496 "SavedSearchDialog.c"
+#line 1484 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_on_response (SavedSearchDialog* self, gint response_id) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 761 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
 #line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = response_id;
 #line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 1508 "SavedSearchDialog.c"
+#line 1496 "SavedSearchDialog.c"
 		gboolean _tmp1_ = FALSE;
-		SavedSearchTable* _tmp2_ = NULL;
-		SavedSearchTable* _tmp3_ = NULL;
-		GtkEntry* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
-		gboolean _tmp7_ = FALSE;
-		gboolean _tmp19_ = FALSE;
+		SavedSearchTable* _tmp2_;
+		SavedSearchTable* _tmp3_;
+		GtkEntry* _tmp4_;
+		const gchar* _tmp5_;
+		gboolean _tmp6_;
+		gboolean _tmp7_;
+		gboolean _tmp19_;
 		GeeArrayList* conditions = NULL;
-		GeeArrayList* _tmp23_ = NULL;
+		GeeArrayList* _tmp23_;
 		SearchOperator search_operator = 0;
-		GtkComboBoxText* _tmp39_ = NULL;
-		gint _tmp40_ = 0;
-		SavedSearchTable* _tmp41_ = NULL;
-		SavedSearchTable* _tmp42_ = NULL;
-		GtkEntry* _tmp43_ = NULL;
-		const gchar* _tmp44_ = NULL;
-		SearchOperator _tmp45_ = 0;
-		GeeArrayList* _tmp46_ = NULL;
-		SavedSearch* _tmp47_ = NULL;
-		SavedSearch* _tmp48_ = NULL;
+		GtkComboBoxText* _tmp39_;
+		gint _tmp40_;
+		SavedSearchTable* _tmp41_;
+		SavedSearchTable* _tmp42_;
+		GtkEntry* _tmp43_;
+		const gchar* _tmp44_;
+		SearchOperator _tmp45_;
+		GeeArrayList* _tmp46_;
+		SavedSearch* _tmp47_;
+		SavedSearch* _tmp48_;
 #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp2_ = saved_search_table_get_instance ();
 #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1542,19 +1530,19 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 		_saved_search_table_unref0 (_tmp3_);
 #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp7_) {
-#line 1546 "SavedSearchDialog.c"
+#line 1534 "SavedSearchDialog.c"
 			gboolean _tmp8_ = FALSE;
-			gboolean _tmp9_ = FALSE;
+			gboolean _tmp9_;
 #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp9_ = self->priv->edit_mode;
 #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			if (_tmp9_) {
-#line 1553 "SavedSearchDialog.c"
-				SavedSearch* _tmp10_ = NULL;
-				gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
-				GtkEntry* _tmp13_ = NULL;
-				const gchar* _tmp14_ = NULL;
+#line 1541 "SavedSearchDialog.c"
+				SavedSearch* _tmp10_;
+				gchar* _tmp11_;
+				gchar* _tmp12_;
+				GtkEntry* _tmp13_;
+				const gchar* _tmp14_;
 #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp10_ = self->priv->previous_search;
 #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1569,27 +1557,27 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 				_tmp8_ = g_strcmp0 (_tmp12_, _tmp14_) == 0;
 #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_g_free0 (_tmp12_);
-#line 1573 "SavedSearchDialog.c"
+#line 1561 "SavedSearchDialog.c"
 			} else {
 #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp8_ = FALSE;
-#line 1577 "SavedSearchDialog.c"
+#line 1565 "SavedSearchDialog.c"
 			}
 #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp1_ = !_tmp8_;
-#line 1581 "SavedSearchDialog.c"
+#line 1569 "SavedSearchDialog.c"
 		} else {
 #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp1_ = FALSE;
-#line 1585 "SavedSearchDialog.c"
+#line 1573 "SavedSearchDialog.c"
 		}
 #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp1_) {
-#line 1589 "SavedSearchDialog.c"
-			GtkEntry* _tmp15_ = NULL;
-			const gchar* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
+#line 1577 "SavedSearchDialog.c"
+			GtkEntry* _tmp15_;
+			const gchar* _tmp16_;
+			gchar* _tmp17_;
+			gchar* _tmp18_;
 #line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp15_ = self->priv->search_title;
 #line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1604,16 +1592,16 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 			_g_free0 (_tmp18_);
 #line 766 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return;
-#line 1608 "SavedSearchDialog.c"
+#line 1596 "SavedSearchDialog.c"
 		}
 #line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp19_ = self->priv->edit_mode;
 #line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp19_) {
-#line 1614 "SavedSearchDialog.c"
-			SavedSearchTable* _tmp20_ = NULL;
-			SavedSearchTable* _tmp21_ = NULL;
-			SavedSearch* _tmp22_ = NULL;
+#line 1602 "SavedSearchDialog.c"
+			SavedSearchTable* _tmp20_;
+			SavedSearchTable* _tmp21_;
+			SavedSearch* _tmp22_;
 #line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp20_ = saved_search_table_get_instance ();
 #line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1624,21 +1612,21 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 			saved_search_table_remove (_tmp21_, _tmp22_);
 #line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_table_unref0 (_tmp21_);
-#line 1628 "SavedSearchDialog.c"
+#line 1616 "SavedSearchDialog.c"
 		}
 #line 775 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp23_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, (GDestroyNotify) search_condition_unref, NULL, NULL, NULL);
 #line 775 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		conditions = _tmp23_;
-#line 1634 "SavedSearchDialog.c"
+#line 1622 "SavedSearchDialog.c"
 		{
 			GeeArrayList* _c_list = NULL;
-			GeeArrayList* _tmp24_ = NULL;
-			GeeArrayList* _tmp25_ = NULL;
+			GeeArrayList* _tmp24_;
+			GeeArrayList* _tmp25_;
 			gint _c_size = 0;
-			GeeArrayList* _tmp26_ = NULL;
-			gint _tmp27_ = 0;
-			gint _tmp28_ = 0;
+			GeeArrayList* _tmp26_;
+			gint _tmp27_;
+			gint _tmp28_;
 			gint _c_index = 0;
 #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp24_ = self->priv->row_list;
@@ -1658,18 +1646,18 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 			_c_index = -1;
 #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			while (TRUE) {
-#line 1662 "SavedSearchDialog.c"
-				gint _tmp29_ = 0;
-				gint _tmp30_ = 0;
-				gint _tmp31_ = 0;
+#line 1650 "SavedSearchDialog.c"
+				gint _tmp29_;
+				gint _tmp30_;
+				gint _tmp31_;
 				SavedSearchDialogSearchRowContainer* c = NULL;
-				GeeArrayList* _tmp32_ = NULL;
-				gint _tmp33_ = 0;
-				gpointer _tmp34_ = NULL;
-				GeeArrayList* _tmp35_ = NULL;
-				SavedSearchDialogSearchRowContainer* _tmp36_ = NULL;
-				SearchCondition* _tmp37_ = NULL;
-				SearchCondition* _tmp38_ = NULL;
+				GeeArrayList* _tmp32_;
+				gint _tmp33_;
+				gpointer _tmp34_;
+				GeeArrayList* _tmp35_;
+				SavedSearchDialogSearchRowContainer* _tmp36_;
+				SearchCondition* _tmp37_;
+				SearchCondition* _tmp38_;
 #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp29_ = _c_index;
 #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1682,7 +1670,7 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 				if (!(_tmp30_ < _tmp31_)) {
 #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					break;
-#line 1686 "SavedSearchDialog.c"
+#line 1674 "SavedSearchDialog.c"
 				}
 #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp32_ = _c_list;
@@ -1706,11 +1694,11 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 				_search_condition_unref0 (_tmp38_);
 #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_saved_search_dialog_search_row_container_unref0 (c);
-#line 1710 "SavedSearchDialog.c"
+#line 1698 "SavedSearchDialog.c"
 			}
 #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_g_object_unref0 (_c_list);
-#line 1714 "SavedSearchDialog.c"
+#line 1702 "SavedSearchDialog.c"
 		}
 #line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp39_ = self->priv->operator;
@@ -1740,14 +1728,14 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 		_saved_search_table_unref0 (_tmp42_);
 #line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (conditions);
-#line 1744 "SavedSearchDialog.c"
+#line 1732 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_on_row_changed (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) {
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	gboolean _tmp1_;
 #line 786 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
 #line 786 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1758,42 +1746,42 @@ static void saved_search_dialog_on_row_changed (SavedSearchDialog* self, SavedSe
 	_tmp1_ = saved_search_dialog_search_row_container_is_complete (_tmp0_);
 #line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, _tmp1_);
-#line 1762 "SavedSearchDialog.c"
+#line 1750 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_on_title_changed (SavedSearchDialog* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 790 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
 #line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = saved_search_dialog_is_title_valid (self);
 #line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, _tmp0_);
-#line 1774 "SavedSearchDialog.c"
+#line 1762 "SavedSearchDialog.c"
 }
 
 
 static gchar* string_chomp (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1191 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1218 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strchomp (_tmp1_);
-#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1797 "SavedSearchDialog.c"
+#line 1785 "SavedSearchDialog.c"
 }
 
 
@@ -1801,44 +1789,44 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	GtkEntry* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	SavedSearchTable* _tmp14_ = NULL;
-	SavedSearchTable* _tmp15_ = NULL;
-	GtkEntry* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-	gboolean _tmp18_ = FALSE;
-	gboolean _tmp19_ = FALSE;
+	gboolean _tmp2_;
+	GtkEntry* _tmp9_;
+	const gchar* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	gboolean _tmp13_;
+	SavedSearchTable* _tmp14_;
+	SavedSearchTable* _tmp15_;
+	GtkEntry* _tmp16_;
+	const gchar* _tmp17_;
+	gboolean _tmp18_;
+	gboolean _tmp19_;
 #line 794 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_DIALOG (self), FALSE);
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->edit_mode;
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp2_) {
-#line 1823 "SavedSearchDialog.c"
-		SavedSearch* _tmp3_ = NULL;
+#line 1811 "SavedSearchDialog.c"
+		SavedSearch* _tmp3_;
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->previous_search;
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 1829 "SavedSearchDialog.c"
+#line 1817 "SavedSearchDialog.c"
 	} else {
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = FALSE;
-#line 1833 "SavedSearchDialog.c"
+#line 1821 "SavedSearchDialog.c"
 	}
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp1_) {
-#line 1837 "SavedSearchDialog.c"
-		SavedSearch* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		GtkEntry* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
+#line 1825 "SavedSearchDialog.c"
+		SavedSearch* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		GtkEntry* _tmp7_;
+		const gchar* _tmp8_;
 #line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = self->priv->previous_search;
 #line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1853,11 +1841,11 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) {
 		_tmp0_ = g_strcmp0 (_tmp6_, _tmp8_) == 0;
 #line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_free0 (_tmp6_);
-#line 1857 "SavedSearchDialog.c"
+#line 1845 "SavedSearchDialog.c"
 	} else {
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = FALSE;
-#line 1861 "SavedSearchDialog.c"
+#line 1849 "SavedSearchDialog.c"
 	}
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_) {
@@ -1865,7 +1853,7 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) {
 		result = TRUE;
 #line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return result;
-#line 1869 "SavedSearchDialog.c"
+#line 1857 "SavedSearchDialog.c"
 	}
 #line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->search_title;
@@ -1885,7 +1873,7 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) {
 		result = FALSE;
 #line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return result;
-#line 1889 "SavedSearchDialog.c"
+#line 1877 "SavedSearchDialog.c"
 	}
 #line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = saved_search_table_get_instance ();
@@ -1907,20 +1895,20 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) {
 		result = FALSE;
 #line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return result;
-#line 1911 "SavedSearchDialog.c"
+#line 1899 "SavedSearchDialog.c"
 	}
 #line 802 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
 #line 802 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 1917 "SavedSearchDialog.c"
+#line 1905 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) {
-	gboolean _tmp0_ = FALSE;
-	GtkDialog* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
+	gboolean _tmp0_;
+	GtkDialog* _tmp22_;
+	gboolean _tmp23_;
 #line 806 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
 #line 807 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1929,39 +1917,39 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v)
 	if (!_tmp0_) {
 #line 808 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		self->priv->valid = FALSE;
-#line 1933 "SavedSearchDialog.c"
+#line 1921 "SavedSearchDialog.c"
 	} else {
-		gboolean _tmp1_ = FALSE;
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp1_;
+		gboolean _tmp2_;
 #line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = v;
 #line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp2_ = self->priv->valid;
 #line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp1_ != _tmp2_) {
-#line 1943 "SavedSearchDialog.c"
-			gboolean _tmp3_ = FALSE;
+#line 1931 "SavedSearchDialog.c"
+			gboolean _tmp3_;
 #line 810 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp3_ = saved_search_dialog_is_title_valid (self);
 #line 810 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			if (_tmp3_) {
-#line 1949 "SavedSearchDialog.c"
+#line 1937 "SavedSearchDialog.c"
 				gint valid_rows = 0;
-				gint _tmp18_ = 0;
-				GeeArrayList* _tmp19_ = NULL;
-				gint _tmp20_ = 0;
-				gint _tmp21_ = 0;
+				gint _tmp18_;
+				GeeArrayList* _tmp19_;
+				gint _tmp20_;
+				gint _tmp21_;
 #line 812 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				valid_rows = 0;
-#line 1957 "SavedSearchDialog.c"
+#line 1945 "SavedSearchDialog.c"
 				{
 					GeeArrayList* _c_list = NULL;
-					GeeArrayList* _tmp4_ = NULL;
-					GeeArrayList* _tmp5_ = NULL;
+					GeeArrayList* _tmp4_;
+					GeeArrayList* _tmp5_;
 					gint _c_size = 0;
-					GeeArrayList* _tmp6_ = NULL;
-					gint _tmp7_ = 0;
-					gint _tmp8_ = 0;
+					GeeArrayList* _tmp6_;
+					gint _tmp7_;
+					gint _tmp8_;
 					gint _c_index = 0;
 #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp4_ = self->priv->row_list;
@@ -1981,16 +1969,16 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v)
 					_c_index = -1;
 #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					while (TRUE) {
-#line 1985 "SavedSearchDialog.c"
-						gint _tmp9_ = 0;
-						gint _tmp10_ = 0;
-						gint _tmp11_ = 0;
+#line 1973 "SavedSearchDialog.c"
+						gint _tmp9_;
+						gint _tmp10_;
+						gint _tmp11_;
 						SavedSearchDialogSearchRowContainer* c = NULL;
-						GeeArrayList* _tmp12_ = NULL;
-						gint _tmp13_ = 0;
-						gpointer _tmp14_ = NULL;
-						SavedSearchDialogSearchRowContainer* _tmp15_ = NULL;
-						gboolean _tmp16_ = FALSE;
+						GeeArrayList* _tmp12_;
+						gint _tmp13_;
+						gpointer _tmp14_;
+						SavedSearchDialogSearchRowContainer* _tmp15_;
+						gboolean _tmp16_;
 #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp9_ = _c_index;
 #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2003,7 +1991,7 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v)
 						if (!(_tmp10_ < _tmp11_)) {
 #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 							break;
-#line 2007 "SavedSearchDialog.c"
+#line 1995 "SavedSearchDialog.c"
 						}
 #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp12_ = _c_list;
@@ -2019,21 +2007,21 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v)
 						_tmp16_ = saved_search_dialog_search_row_container_is_complete (_tmp15_);
 #line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						if (_tmp16_) {
-#line 2023 "SavedSearchDialog.c"
-							gint _tmp17_ = 0;
+#line 2011 "SavedSearchDialog.c"
+							gint _tmp17_;
 #line 815 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 							_tmp17_ = valid_rows;
 #line 815 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 							valid_rows = _tmp17_ + 1;
-#line 2029 "SavedSearchDialog.c"
+#line 2017 "SavedSearchDialog.c"
 						}
 #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_saved_search_dialog_search_row_container_unref0 (c);
-#line 2033 "SavedSearchDialog.c"
+#line 2021 "SavedSearchDialog.c"
 					}
 #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_g_object_unref0 (_c_list);
-#line 2037 "SavedSearchDialog.c"
+#line 2025 "SavedSearchDialog.c"
 				}
 #line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp18_ = valid_rows;
@@ -2045,11 +2033,11 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v)
 				_tmp21_ = _tmp20_;
 #line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				self->priv->valid = _tmp18_ == _tmp21_;
-#line 2049 "SavedSearchDialog.c"
+#line 2037 "SavedSearchDialog.c"
 			} else {
 #line 819 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				self->priv->valid = FALSE;
-#line 2053 "SavedSearchDialog.c"
+#line 2041 "SavedSearchDialog.c"
 			}
 		}
 	}
@@ -2059,7 +2047,7 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v)
 	_tmp23_ = self->priv->valid;
 #line 823 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_dialog_set_response_sensitive (_tmp22_, (gint) GTK_RESPONSE_OK, _tmp23_);
-#line 2063 "SavedSearchDialog.c"
+#line 2051 "SavedSearchDialog.c"
 }
 
 
@@ -2073,27 +2061,27 @@ static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_conta
 	saved_search_dialog_search_row_container_set_type (self, SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT);
 #line 23 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 2077 "SavedSearchDialog.c"
+#line 2065 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new (void) {
 #line 23 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_container_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER);
-#line 2084 "SavedSearchDialog.c"
+#line 2072 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct_edit_existing (GType object_type, SearchCondition* sc) {
 	SavedSearchDialogSearchRowContainer* self = NULL;
-	SearchCondition* _tmp0_ = NULL;
-	SearchConditionSearchType _tmp1_ = 0;
-	SearchConditionSearchType _tmp2_ = 0;
-	SearchCondition* _tmp3_ = NULL;
-	SearchConditionSearchType _tmp4_ = 0;
-	SearchConditionSearchType _tmp5_ = 0;
-	SavedSearchDialogSearchRow* _tmp6_ = NULL;
-	SearchCondition* _tmp7_ = NULL;
+	SearchCondition* _tmp0_;
+	SearchConditionSearchType _tmp1_;
+	SearchConditionSearchType _tmp2_;
+	SearchCondition* _tmp3_;
+	SearchConditionSearchType _tmp4_;
+	SearchConditionSearchType _tmp5_;
+	SavedSearchDialogSearchRow* _tmp6_;
+	SearchCondition* _tmp7_;
 #line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION (sc), NULL);
 #line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2124,21 +2112,21 @@ static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_conta
 	saved_search_dialog_search_row_populate (_tmp6_, _tmp7_);
 #line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 2128 "SavedSearchDialog.c"
+#line 2116 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new_edit_existing (SearchCondition* sc) {
 #line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_container_construct_edit_existing (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, sc);
-#line 2135 "SavedSearchDialog.c"
+#line 2123 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 48 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_on_type_changed ((SavedSearchDialogSearchRowContainer*) self);
-#line 2142 "SavedSearchDialog.c"
+#line 2130 "SavedSearchDialog.c"
 }
 
 
@@ -2147,24 +2135,24 @@ static gboolean _saved_search_dialog_search_row_container_on_removed_gtk_widget_
 	result = saved_search_dialog_search_row_container_on_removed ((SavedSearchDialogSearchRowContainer*) self, event);
 #line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2151 "SavedSearchDialog.c"
+#line 2139 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialogSearchRowContainer* self) {
-	gint _tmp0_ = 0;
-	SearchConditionSearchType* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
-	GtkComboBoxText* _tmp3_ = NULL;
-	GtkComboBoxText* _tmp18_ = NULL;
-	GtkButton* _tmp19_ = NULL;
-	GtkButton* _tmp20_ = NULL;
-	GtkBox* _tmp21_ = NULL;
-	GtkBox* _tmp22_ = NULL;
-	GtkComboBoxText* _tmp23_ = NULL;
-	GtkBox* _tmp24_ = NULL;
-	GtkButton* _tmp25_ = NULL;
-	GtkBox* _tmp26_ = NULL;
+	gint _tmp0_;
+	SearchConditionSearchType* _tmp1_;
+	GeeHashMap* _tmp2_;
+	GtkComboBoxText* _tmp3_;
+	GtkComboBoxText* _tmp18_;
+	GtkButton* _tmp19_;
+	GtkButton* _tmp20_;
+	GtkBox* _tmp21_;
+	GtkBox* _tmp22_;
+	GtkComboBoxText* _tmp23_;
+	GtkBox* _tmp24_;
+	GtkButton* _tmp25_;
+	GtkBox* _tmp26_;
 #line 36 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
 #line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2193,43 +2181,43 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo
 	_g_object_unref0 (self->priv->type_combo);
 #line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->type_combo = _tmp3_;
-#line 2197 "SavedSearchDialog.c"
+#line 2185 "SavedSearchDialog.c"
 	{
 		gint i = 0;
 #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		i = 0;
-#line 2202 "SavedSearchDialog.c"
+#line 2190 "SavedSearchDialog.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp4_ = TRUE;
 #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			while (TRUE) {
-#line 2209 "SavedSearchDialog.c"
-				gint _tmp6_ = 0;
-				SearchConditionSearchType* _tmp7_ = NULL;
-				gint _tmp7__length1 = 0;
+#line 2197 "SavedSearchDialog.c"
+				gint _tmp6_;
+				SearchConditionSearchType* _tmp7_;
+				gint _tmp7__length1;
 				SearchConditionSearchType st = 0;
-				SearchConditionSearchType* _tmp8_ = NULL;
-				gint _tmp8__length1 = 0;
-				gint _tmp9_ = 0;
-				SearchConditionSearchType _tmp10_ = 0;
-				GeeHashMap* _tmp11_ = NULL;
-				SearchConditionSearchType _tmp12_ = 0;
-				gint _tmp13_ = 0;
-				GtkComboBoxText* _tmp14_ = NULL;
-				SearchConditionSearchType _tmp15_ = 0;
-				gchar* _tmp16_ = NULL;
-				gchar* _tmp17_ = NULL;
+				SearchConditionSearchType* _tmp8_;
+				gint _tmp8__length1;
+				gint _tmp9_;
+				SearchConditionSearchType _tmp10_;
+				GeeHashMap* _tmp11_;
+				SearchConditionSearchType _tmp12_;
+				gint _tmp13_;
+				GtkComboBoxText* _tmp14_;
+				SearchConditionSearchType _tmp15_;
+				gchar* _tmp16_;
+				gchar* _tmp17_;
 #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				if (!_tmp4_) {
-#line 2227 "SavedSearchDialog.c"
-					gint _tmp5_ = 0;
+#line 2215 "SavedSearchDialog.c"
+					gint _tmp5_;
 #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp5_ = i;
 #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					i = _tmp5_ + 1;
-#line 2233 "SavedSearchDialog.c"
+#line 2221 "SavedSearchDialog.c"
 				}
 #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp4_ = FALSE;
@@ -2243,7 +2231,7 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo
 				if (!(_tmp6_ < _tmp7__length1)) {
 #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					break;
-#line 2247 "SavedSearchDialog.c"
+#line 2235 "SavedSearchDialog.c"
 				}
 #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp8_ = self->priv->search_types;
@@ -2275,7 +2263,7 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo
 				gtk_combo_box_text_append_text (_tmp14_, _tmp17_);
 #line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_g_free0 (_tmp17_);
-#line 2279 "SavedSearchDialog.c"
+#line 2267 "SavedSearchDialog.c"
 			}
 		}
 	}
@@ -2321,12 +2309,12 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo
 	_tmp26_ = self->priv->box;
 #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
-#line 2325 "SavedSearchDialog.c"
+#line 2313 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_on_type_changed (SavedSearchDialogSearchRowContainer* self) {
-	SearchConditionSearchType _tmp0_ = 0;
+	SearchConditionSearchType _tmp0_;
 #line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
 #line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2334,16 +2322,16 @@ static void saved_search_dialog_search_row_container_on_type_changed (SavedSearc
 #line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_set_type (self, _tmp0_);
 #line 61 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_emit_by_name (self, "changed", self);
-#line 2339 "SavedSearchDialog.c"
+	g_signal_emit (self, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, self);
+#line 2327 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSearchDialogSearchRowContainer* self, SearchConditionSearchType st) {
-	GtkComboBoxText* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	SearchConditionSearchType _tmp2_ = 0;
-	gpointer _tmp3_ = NULL;
+	GtkComboBoxText* _tmp0_;
+	GeeHashMap* _tmp1_;
+	SearchConditionSearchType _tmp2_;
+	gpointer _tmp3_;
 #line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
 #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2356,28 +2344,28 @@ static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSe
 	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp2_));
 #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((gintptr) _tmp3_));
-#line 2360 "SavedSearchDialog.c"
+#line 2348 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_set_type (SavedSearchDialogSearchRowContainer* self, SearchConditionSearchType type) {
-	SavedSearchDialogSearchRow* _tmp0_ = NULL;
-	SearchConditionSearchType _tmp5_ = 0;
-	GtkBox* _tmp12_ = NULL;
-	SavedSearchDialogSearchRow* _tmp13_ = NULL;
-	GtkWidget* _tmp14_ = NULL;
-	GtkWidget* _tmp15_ = NULL;
+	SavedSearchDialogSearchRow* _tmp0_;
+	SearchConditionSearchType _tmp5_;
+	GtkBox* _tmp12_;
+	SavedSearchDialogSearchRow* _tmp13_;
+	GtkWidget* _tmp14_;
+	GtkWidget* _tmp15_;
 #line 68 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
 #line 69 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->my_row;
 #line 69 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_ != NULL) {
-#line 2377 "SavedSearchDialog.c"
-		GtkBox* _tmp1_ = NULL;
-		SavedSearchDialogSearchRow* _tmp2_ = NULL;
-		GtkWidget* _tmp3_ = NULL;
-		GtkWidget* _tmp4_ = NULL;
+#line 2365 "SavedSearchDialog.c"
+		GtkBox* _tmp1_;
+		SavedSearchDialogSearchRow* _tmp2_;
+		GtkWidget* _tmp3_;
+		GtkWidget* _tmp4_;
 #line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = self->priv->box;
 #line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2390,7 +2378,7 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), _tmp4_);
 #line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2394 "SavedSearchDialog.c"
+#line 2382 "SavedSearchDialog.c"
 	}
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = type;
@@ -2408,9 +2396,9 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog
 		case SEARCH_CONDITION_SEARCH_TYPE_COMMENT:
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_TITLE:
-#line 2412 "SavedSearchDialog.c"
+#line 2400 "SavedSearchDialog.c"
 		{
-			SavedSearchDialogSearchRowText* _tmp6_ = NULL;
+			SavedSearchDialogSearchRowText* _tmp6_;
 #line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp6_ = saved_search_dialog_search_row_text_new (self);
 #line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2419,13 +2407,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
 #line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2423 "SavedSearchDialog.c"
+#line 2411 "SavedSearchDialog.c"
 		}
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE:
-#line 2427 "SavedSearchDialog.c"
+#line 2415 "SavedSearchDialog.c"
 		{
-			SavedSearchDialogSearchRowMediaType* _tmp7_ = NULL;
+			SavedSearchDialogSearchRowMediaType* _tmp7_;
 #line 83 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp7_ = saved_search_dialog_search_row_media_type_new (self);
 #line 83 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2434,13 +2422,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
 #line 84 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2438 "SavedSearchDialog.c"
+#line 2426 "SavedSearchDialog.c"
 		}
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE:
-#line 2442 "SavedSearchDialog.c"
+#line 2430 "SavedSearchDialog.c"
 		{
-			SavedSearchDialogSearchRowFlagged* _tmp8_ = NULL;
+			SavedSearchDialogSearchRowFlagged* _tmp8_;
 #line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp8_ = saved_search_dialog_search_row_flagged_new (self);
 #line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2449,13 +2437,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
 #line 88 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2453 "SavedSearchDialog.c"
+#line 2441 "SavedSearchDialog.c"
 		}
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE:
-#line 2457 "SavedSearchDialog.c"
+#line 2445 "SavedSearchDialog.c"
 		{
-			SavedSearchDialogSearchRowModified* _tmp9_ = NULL;
+			SavedSearchDialogSearchRowModified* _tmp9_;
 #line 91 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp9_ = saved_search_dialog_search_row_modified_new (self);
 #line 91 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2464,13 +2452,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
 #line 92 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2468 "SavedSearchDialog.c"
+#line 2456 "SavedSearchDialog.c"
 		}
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_RATING:
-#line 2472 "SavedSearchDialog.c"
+#line 2460 "SavedSearchDialog.c"
 		{
-			SavedSearchDialogSearchRowRating* _tmp10_ = NULL;
+			SavedSearchDialogSearchRowRating* _tmp10_;
 #line 95 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp10_ = saved_search_dialog_search_row_rating_new (self);
 #line 95 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2479,13 +2467,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
 #line 96 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2483 "SavedSearchDialog.c"
+#line 2471 "SavedSearchDialog.c"
 		}
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_DATE:
-#line 2487 "SavedSearchDialog.c"
+#line 2475 "SavedSearchDialog.c"
 		{
-			SavedSearchDialogSearchRowDate* _tmp11_ = NULL;
+			SavedSearchDialogSearchRowDate* _tmp11_;
 #line 99 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp11_ = saved_search_dialog_search_row_date_new (self);
 #line 99 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2494,13 +2482,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
 #line 100 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2498 "SavedSearchDialog.c"
+#line 2486 "SavedSearchDialog.c"
 		}
 		default:
 		{
 #line 103 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			g_assert_not_reached ();
-#line 2504 "SavedSearchDialog.c"
+#line 2492 "SavedSearchDialog.c"
 		}
 	}
 #line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2515,17 +2503,17 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog
 	gtk_box_pack_start (_tmp12_, _tmp15_, TRUE, TRUE, (guint) 0);
 #line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp15_);
-#line 2519 "SavedSearchDialog.c"
+#line 2507 "SavedSearchDialog.c"
 }
 
 
 static SearchConditionSearchType saved_search_dialog_search_row_container_get_search_type (SavedSearchDialogSearchRowContainer* self) {
 	SearchConditionSearchType result = 0;
-	SearchConditionSearchType* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	GtkComboBoxText* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	SearchConditionSearchType _tmp3_ = 0;
+	SearchConditionSearchType* _tmp0_;
+	gint _tmp0__length1;
+	GtkComboBoxText* _tmp1_;
+	gint _tmp2_;
+	SearchConditionSearchType _tmp3_;
 #line 109 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), 0);
 #line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2542,7 +2530,7 @@ static SearchConditionSearchType saved_search_dialog_search_row_container_get_se
 	result = _tmp3_;
 #line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2546 "SavedSearchDialog.c"
+#line 2534 "SavedSearchDialog.c"
 }
 
 
@@ -2553,18 +2541,18 @@ static gboolean saved_search_dialog_search_row_container_on_removed (SavedSearch
 #line 113 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 114 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_emit_by_name (self, "remove", self);
+	g_signal_emit (self, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL], 0, self);
 #line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = FALSE;
 #line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2562 "SavedSearchDialog.c"
+#line 2550 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_allow_removal (SavedSearchDialogSearchRowContainer* self, gboolean allow) {
-	GtkButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GtkButton* _tmp0_;
+	gboolean _tmp1_;
 #line 118 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
 #line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2573,14 +2561,14 @@ static void saved_search_dialog_search_row_container_allow_removal (SavedSearchD
 	_tmp1_ = allow;
 #line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 2577 "SavedSearchDialog.c"
+#line 2565 "SavedSearchDialog.c"
 }
 
 
 static GtkWidget* saved_search_dialog_search_row_container_get_widget (SavedSearchDialogSearchRowContainer* self) {
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 122 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), NULL);
 #line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2591,14 +2579,14 @@ static GtkWidget* saved_search_dialog_search_row_container_get_widget (SavedSear
 	result = _tmp1_;
 #line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2595 "SavedSearchDialog.c"
+#line 2583 "SavedSearchDialog.c"
 }
 
 
 static SearchCondition* saved_search_dialog_search_row_container_get_search_condition (SavedSearchDialogSearchRowContainer* self) {
 	SearchCondition* result = NULL;
-	SavedSearchDialogSearchRow* _tmp0_ = NULL;
-	SearchCondition* _tmp1_ = NULL;
+	SavedSearchDialogSearchRow* _tmp0_;
+	SearchCondition* _tmp1_;
 #line 126 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), NULL);
 #line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2609,14 +2597,14 @@ static SearchCondition* saved_search_dialog_search_row_container_get_search_cond
 	result = _tmp1_;
 #line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2613 "SavedSearchDialog.c"
+#line 2601 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_container_is_complete (SavedSearchDialogSearchRowContainer* self) {
 	gboolean result = FALSE;
-	SavedSearchDialogSearchRow* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SavedSearchDialogSearchRow* _tmp0_;
+	gboolean _tmp1_;
 #line 130 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), FALSE);
 #line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2627,7 +2615,7 @@ static gboolean saved_search_dialog_search_row_container_is_complete (SavedSearc
 	result = _tmp1_;
 #line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2631 "SavedSearchDialog.c"
+#line 2619 "SavedSearchDialog.c"
 }
 
 
@@ -2646,26 +2634,26 @@ static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAIN
 		data1 = closure->data;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 2650 "SavedSearchDialog.c"
+#line 2638 "SavedSearchDialog.c"
 	} else {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		data2 = closure->data;
-#line 2656 "SavedSearchDialog.c"
+#line 2644 "SavedSearchDialog.c"
 	}
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	callback = (GMarshalFunc_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER) (marshal_data ? marshal_data : cc->callback);
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	callback (data1, saved_search_dialog_value_get_search_row_container (param_values + 1), data2);
-#line 2662 "SavedSearchDialog.c"
+#line 2650 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_search_row_container_init (GValue* value) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	value->data[0].v_pointer = NULL;
-#line 2669 "SavedSearchDialog.c"
+#line 2657 "SavedSearchDialog.c"
 }
 
 
@@ -2674,7 +2662,7 @@ static void saved_search_dialog_value_search_row_container_free_value (GValue* v
 	if (value->data[0].v_pointer) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_unref (value->data[0].v_pointer);
-#line 2678 "SavedSearchDialog.c"
+#line 2666 "SavedSearchDialog.c"
 	}
 }
 
@@ -2684,11 +2672,11 @@ static void saved_search_dialog_value_search_row_container_copy_value (const GVa
 	if (src_value->data[0].v_pointer) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = saved_search_dialog_search_row_container_ref (src_value->data[0].v_pointer);
-#line 2688 "SavedSearchDialog.c"
+#line 2676 "SavedSearchDialog.c"
 	} else {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2692 "SavedSearchDialog.c"
+#line 2680 "SavedSearchDialog.c"
 	}
 }
 
@@ -2696,66 +2684,66 @@ static void saved_search_dialog_value_search_row_container_copy_value (const GVa
 static gpointer saved_search_dialog_value_search_row_container_peek_pointer (const GValue* value) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 2700 "SavedSearchDialog.c"
+#line 2688 "SavedSearchDialog.c"
 }
 
 
 static gchar* saved_search_dialog_value_search_row_container_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (collect_values[0].v_pointer) {
-#line 2707 "SavedSearchDialog.c"
-		SavedSearchDialogSearchRowContainer* object;
+#line 2695 "SavedSearchDialog.c"
+		SavedSearchDialogSearchRowContainer * object;
 		object = collect_values[0].v_pointer;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2714 "SavedSearchDialog.c"
+#line 2702 "SavedSearchDialog.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2718 "SavedSearchDialog.c"
+#line 2706 "SavedSearchDialog.c"
 		}
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = saved_search_dialog_search_row_container_ref (object);
-#line 2722 "SavedSearchDialog.c"
+#line 2710 "SavedSearchDialog.c"
 	} else {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 2726 "SavedSearchDialog.c"
+#line 2714 "SavedSearchDialog.c"
 	}
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2730 "SavedSearchDialog.c"
+#line 2718 "SavedSearchDialog.c"
 }
 
 
 static gchar* saved_search_dialog_value_search_row_container_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SavedSearchDialogSearchRowContainer** object_p;
+	SavedSearchDialogSearchRowContainer ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!object_p) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2741 "SavedSearchDialog.c"
+#line 2729 "SavedSearchDialog.c"
 	}
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!value->data[0].v_pointer) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = NULL;
-#line 2747 "SavedSearchDialog.c"
+#line 2735 "SavedSearchDialog.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2751 "SavedSearchDialog.c"
+#line 2739 "SavedSearchDialog.c"
 	} else {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = saved_search_dialog_search_row_container_ref (value->data[0].v_pointer);
-#line 2755 "SavedSearchDialog.c"
+#line 2743 "SavedSearchDialog.c"
 	}
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2759 "SavedSearchDialog.c"
+#line 2747 "SavedSearchDialog.c"
 }
 
 
@@ -2769,7 +2757,7 @@ static GParamSpec* saved_search_dialog_param_spec_search_row_container (const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return G_PARAM_SPEC (spec);
-#line 2773 "SavedSearchDialog.c"
+#line 2761 "SavedSearchDialog.c"
 }
 
 
@@ -2778,12 +2766,12 @@ static gpointer saved_search_dialog_value_get_search_row_container (const GValue
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER), NULL);
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 2782 "SavedSearchDialog.c"
+#line 2770 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_set_search_row_container (GValue* value, gpointer v_object) {
-	SavedSearchDialogSearchRowContainer* old;
+	SavedSearchDialogSearchRowContainer * old;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER));
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2798,23 +2786,23 @@ static void saved_search_dialog_value_set_search_row_container (GValue* value, g
 		value->data[0].v_pointer = v_object;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_ref (value->data[0].v_pointer);
-#line 2802 "SavedSearchDialog.c"
+#line 2790 "SavedSearchDialog.c"
 	} else {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 2806 "SavedSearchDialog.c"
+#line 2794 "SavedSearchDialog.c"
 	}
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_unref (old);
-#line 2812 "SavedSearchDialog.c"
+#line 2800 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_value_take_search_row_container (GValue* value, gpointer v_object) {
-	SavedSearchDialogSearchRowContainer* old;
+	SavedSearchDialogSearchRowContainer * old;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER));
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2827,17 +2815,17 @@ static void saved_search_dialog_value_take_search_row_container (GValue* value,
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 2831 "SavedSearchDialog.c"
+#line 2819 "SavedSearchDialog.c"
 	} else {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 2835 "SavedSearchDialog.c"
+#line 2823 "SavedSearchDialog.c"
 	}
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_unref (old);
-#line 2841 "SavedSearchDialog.c"
+#line 2829 "SavedSearchDialog.c"
 	}
 }
 
@@ -2850,10 +2838,10 @@ static void saved_search_dialog_search_row_container_class_init (SavedSearchDial
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowContainerPrivate));
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_new ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER);
+	saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL] = g_signal_new ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER);
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_new ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER);
-#line 2857 "SavedSearchDialog.c"
+	saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL] = g_signal_new ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER);
+#line 2845 "SavedSearchDialog.c"
 }
 
 
@@ -2864,11 +2852,11 @@ static void saved_search_dialog_search_row_container_instance_init (SavedSearchD
 	self->priv->my_row = NULL;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->ref_count = 1;
-#line 2868 "SavedSearchDialog.c"
+#line 2856 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer* obj) {
+static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer * obj) {
 	SavedSearchDialogSearchRowContainer * self;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, SavedSearchDialogSearchRowContainer);
@@ -2886,7 +2874,7 @@ static void saved_search_dialog_search_row_container_finalize (SavedSearchDialog
 	_g_object_unref0 (self->priv->search_types_index);
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 2890 "SavedSearchDialog.c"
+#line 2878 "SavedSearchDialog.c"
 }
 
 
@@ -2905,18 +2893,18 @@ static GType saved_search_dialog_search_row_container_get_type (void) {
 
 
 static gpointer saved_search_dialog_search_row_container_ref (gpointer instance) {
-	SavedSearchDialogSearchRowContainer* self;
+	SavedSearchDialogSearchRowContainer * self;
 	self = instance;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return instance;
-#line 2915 "SavedSearchDialog.c"
+#line 2903 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_unref (gpointer instance) {
-	SavedSearchDialogSearchRowContainer* self;
+	SavedSearchDialogSearchRowContainer * self;
 	self = instance;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2924,7 +2912,7 @@ static void saved_search_dialog_search_row_container_unref (gpointer instance) {
 		SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_GET_CLASS (self)->finalize (self);
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2928 "SavedSearchDialog.c"
+#line 2916 "SavedSearchDialog.c"
 	}
 }
 
@@ -2934,7 +2922,7 @@ static GtkWidget* saved_search_dialog_search_row_real_get_widget (SavedSearchDia
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_get_widget'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2938 "SavedSearchDialog.c"
+#line 2926 "SavedSearchDialog.c"
 }
 
 
@@ -2943,7 +2931,7 @@ GtkWidget* saved_search_dialog_search_row_get_widget (SavedSearchDialogSearchRow
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL);
 #line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_widget (self);
-#line 2947 "SavedSearchDialog.c"
+#line 2935 "SavedSearchDialog.c"
 }
 
 
@@ -2952,7 +2940,7 @@ static SearchCondition* saved_search_dialog_search_row_real_get_search_condition
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_get_search_condition'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2956 "SavedSearchDialog.c"
+#line 2944 "SavedSearchDialog.c"
 }
 
 
@@ -2961,7 +2949,7 @@ SearchCondition* saved_search_dialog_search_row_get_search_condition (SavedSearc
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL);
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_search_condition (self);
-#line 2965 "SavedSearchDialog.c"
+#line 2953 "SavedSearchDialog.c"
 }
 
 
@@ -2970,7 +2958,7 @@ static void saved_search_dialog_search_row_real_populate (SavedSearchDialogSearc
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_populate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return;
-#line 2974 "SavedSearchDialog.c"
+#line 2962 "SavedSearchDialog.c"
 }
 
 
@@ -2979,7 +2967,7 @@ void saved_search_dialog_search_row_populate (SavedSearchDialogSearchRow* self,
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self));
 #line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->populate (self, sc);
-#line 2983 "SavedSearchDialog.c"
+#line 2971 "SavedSearchDialog.c"
 }
 
 
@@ -2989,7 +2977,7 @@ static gboolean saved_search_dialog_search_row_real_is_complete (SavedSearchDial
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_is_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return _tmp0_;
-#line 2993 "SavedSearchDialog.c"
+#line 2981 "SavedSearchDialog.c"
 }
 
 
@@ -2998,7 +2986,7 @@ gboolean saved_search_dialog_search_row_is_complete (SavedSearchDialogSearchRow*
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), FALSE);
 #line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->is_complete (self);
-#line 3002 "SavedSearchDialog.c"
+#line 2990 "SavedSearchDialog.c"
 }
 
 
@@ -3008,14 +2996,14 @@ static SavedSearchDialogSearchRow* saved_search_dialog_search_row_construct (GTy
 	self = (SavedSearchDialogSearchRow*) g_type_create_instance (object_type);
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3012 "SavedSearchDialog.c"
+#line 3000 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_search_row_init (GValue* value) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	value->data[0].v_pointer = NULL;
-#line 3019 "SavedSearchDialog.c"
+#line 3007 "SavedSearchDialog.c"
 }
 
 
@@ -3024,7 +3012,7 @@ static void saved_search_dialog_value_search_row_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (value->data[0].v_pointer);
-#line 3028 "SavedSearchDialog.c"
+#line 3016 "SavedSearchDialog.c"
 	}
 }
 
@@ -3034,11 +3022,11 @@ static void saved_search_dialog_value_search_row_copy_value (const GValue* src_v
 	if (src_value->data[0].v_pointer) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = saved_search_dialog_search_row_ref (src_value->data[0].v_pointer);
-#line 3038 "SavedSearchDialog.c"
+#line 3026 "SavedSearchDialog.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3042 "SavedSearchDialog.c"
+#line 3030 "SavedSearchDialog.c"
 	}
 }
 
@@ -3046,66 +3034,66 @@ static void saved_search_dialog_value_search_row_copy_value (const GValue* src_v
 static gpointer saved_search_dialog_value_search_row_peek_pointer (const GValue* value) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 3050 "SavedSearchDialog.c"
+#line 3038 "SavedSearchDialog.c"
 }
 
 
 static gchar* saved_search_dialog_value_search_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (collect_values[0].v_pointer) {
-#line 3057 "SavedSearchDialog.c"
-		SavedSearchDialogSearchRow* object;
+#line 3045 "SavedSearchDialog.c"
+		SavedSearchDialogSearchRow * object;
 		object = collect_values[0].v_pointer;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3064 "SavedSearchDialog.c"
+#line 3052 "SavedSearchDialog.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3068 "SavedSearchDialog.c"
+#line 3056 "SavedSearchDialog.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = saved_search_dialog_search_row_ref (object);
-#line 3072 "SavedSearchDialog.c"
+#line 3060 "SavedSearchDialog.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3076 "SavedSearchDialog.c"
+#line 3064 "SavedSearchDialog.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 3080 "SavedSearchDialog.c"
+#line 3068 "SavedSearchDialog.c"
 }
 
 
 static gchar* saved_search_dialog_value_search_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SavedSearchDialogSearchRow** object_p;
+	SavedSearchDialogSearchRow ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!object_p) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3091 "SavedSearchDialog.c"
+#line 3079 "SavedSearchDialog.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!value->data[0].v_pointer) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = NULL;
-#line 3097 "SavedSearchDialog.c"
+#line 3085 "SavedSearchDialog.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3101 "SavedSearchDialog.c"
+#line 3089 "SavedSearchDialog.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = saved_search_dialog_search_row_ref (value->data[0].v_pointer);
-#line 3105 "SavedSearchDialog.c"
+#line 3093 "SavedSearchDialog.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 3109 "SavedSearchDialog.c"
+#line 3097 "SavedSearchDialog.c"
 }
 
 
@@ -3119,7 +3107,7 @@ static GParamSpec* saved_search_dialog_param_spec_search_row (const gchar* name,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return G_PARAM_SPEC (spec);
-#line 3123 "SavedSearchDialog.c"
+#line 3111 "SavedSearchDialog.c"
 }
 
 
@@ -3128,12 +3116,12 @@ static gpointer saved_search_dialog_value_get_search_row (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW), NULL);
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 3132 "SavedSearchDialog.c"
+#line 3120 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_set_search_row (GValue* value, gpointer v_object) {
-	SavedSearchDialogSearchRow* old;
+	SavedSearchDialogSearchRow * old;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW));
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3148,23 +3136,23 @@ static void saved_search_dialog_value_set_search_row (GValue* value, gpointer v_
 		value->data[0].v_pointer = v_object;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_ref (value->data[0].v_pointer);
-#line 3152 "SavedSearchDialog.c"
+#line 3140 "SavedSearchDialog.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3156 "SavedSearchDialog.c"
+#line 3144 "SavedSearchDialog.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (old);
-#line 3162 "SavedSearchDialog.c"
+#line 3150 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_value_take_search_row (GValue* value, gpointer v_object) {
-	SavedSearchDialogSearchRow* old;
+	SavedSearchDialogSearchRow * old;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW));
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3177,17 +3165,17 @@ static void saved_search_dialog_value_take_search_row (GValue* value, gpointer v
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 3181 "SavedSearchDialog.c"
+#line 3169 "SavedSearchDialog.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3185 "SavedSearchDialog.c"
+#line 3173 "SavedSearchDialog.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (old);
-#line 3191 "SavedSearchDialog.c"
+#line 3179 "SavedSearchDialog.c"
 	}
 }
 
@@ -3198,31 +3186,31 @@ static void saved_search_dialog_search_row_class_init (SavedSearchDialogSearchRo
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_finalize;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_real_get_widget;
+	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_get_widget;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_real_get_search_condition;
+	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_get_search_condition;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_real_populate;
+	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_real_populate;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_real_is_complete;
-#line 3209 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_is_complete;
+#line 3197 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_instance_init (SavedSearchDialogSearchRow * self) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->ref_count = 1;
-#line 3216 "SavedSearchDialog.c"
+#line 3204 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow* obj) {
+static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow * obj) {
 	SavedSearchDialogSearchRow * self;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_destroy (self);
-#line 3226 "SavedSearchDialog.c"
+#line 3214 "SavedSearchDialog.c"
 }
 
 
@@ -3241,18 +3229,18 @@ static GType saved_search_dialog_search_row_get_type (void) {
 
 
 static gpointer saved_search_dialog_search_row_ref (gpointer instance) {
-	SavedSearchDialogSearchRow* self;
+	SavedSearchDialogSearchRow * self;
 	self = instance;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return instance;
-#line 3251 "SavedSearchDialog.c"
+#line 3239 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_unref (gpointer instance) {
-	SavedSearchDialogSearchRow* self;
+	SavedSearchDialogSearchRow * self;
 	self = instance;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -3260,7 +3248,7 @@ static void saved_search_dialog_search_row_unref (gpointer instance) {
 		SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->finalize (self);
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3264 "SavedSearchDialog.c"
+#line 3252 "SavedSearchDialog.c"
 	}
 }
 
@@ -3268,55 +3256,48 @@ static void saved_search_dialog_search_row_unref (gpointer instance) {
 static void _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self);
-#line 3272 "SavedSearchDialog.c"
+#line 3260 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self);
-#line 3279 "SavedSearchDialog.c"
+#line 3267 "SavedSearchDialog.c"
 }
 
 
 static gpointer _saved_search_dialog_search_row_container_ref0 (gpointer self) {
 #line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self ? saved_search_dialog_search_row_container_ref (self) : NULL;
-#line 3286 "SavedSearchDialog.c"
+#line 3274 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) {
 	SavedSearchDialogSearchRowText* self = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
-	GtkComboBoxText* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GtkComboBoxText* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	GtkComboBoxText* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkComboBoxText* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	GtkComboBoxText* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	GtkComboBoxText* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	GtkComboBoxText* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	GtkComboBoxText* _tmp17_ = NULL;
-	GtkComboBoxText* _tmp18_ = NULL;
-	GtkEntry* _tmp19_ = NULL;
-	GtkEntry* _tmp20_ = NULL;
-	GtkEntry* _tmp21_ = NULL;
-	GtkEntry* _tmp22_ = NULL;
-	GtkBox* _tmp23_ = NULL;
-	GtkBox* _tmp24_ = NULL;
-	GtkComboBoxText* _tmp25_ = NULL;
-	GtkBox* _tmp26_ = NULL;
-	GtkEntry* _tmp27_ = NULL;
-	GtkBox* _tmp28_ = NULL;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	SavedSearchDialogSearchRowContainer* _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	GtkComboBoxText* _tmp3_;
+	GtkComboBoxText* _tmp4_;
+	GtkComboBoxText* _tmp5_;
+	GtkComboBoxText* _tmp6_;
+	GtkComboBoxText* _tmp7_;
+	GtkComboBoxText* _tmp8_;
+	GtkComboBoxText* _tmp9_;
+	GtkComboBoxText* _tmp10_;
+	GtkComboBoxText* _tmp11_;
+	GtkEntry* _tmp12_;
+	GtkEntry* _tmp13_;
+	GtkEntry* _tmp14_;
+	GtkEntry* _tmp15_;
+	GtkBox* _tmp16_;
+	GtkBox* _tmp17_;
+	GtkComboBoxText* _tmp18_;
+	GtkBox* _tmp19_;
+	GtkEntry* _tmp20_;
+	GtkBox* _tmp21_;
 #line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
 #line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3340,115 +3321,101 @@ static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_const
 #line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->text_context;
 #line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = _ ("contains");
-#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp3_, _tmp4_);
+	gtk_combo_box_text_append_text (_tmp3_, _ ("contains"));
 #line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->text_context;
-#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = _ ("is exactly");
+	_tmp4_ = self->priv->text_context;
 #line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp5_, _tmp6_);
+	gtk_combo_box_text_append_text (_tmp4_, _ ("is exactly"));
 #line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = self->priv->text_context;
-#line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = _ ("starts with");
+	_tmp5_ = self->priv->text_context;
 #line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp7_, _tmp8_);
+	gtk_combo_box_text_append_text (_tmp5_, _ ("starts with"));
 #line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = self->priv->text_context;
-#line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = _ ("ends with");
+	_tmp6_ = self->priv->text_context;
 #line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp9_, _tmp10_);
+	gtk_combo_box_text_append_text (_tmp6_, _ ("ends with"));
 #line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = self->priv->text_context;
-#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = _ ("does not contain");
+	_tmp7_ = self->priv->text_context;
 #line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp11_, _tmp12_);
-#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = self->priv->text_context;
+	gtk_combo_box_text_append_text (_tmp7_, _ ("does not contain"));
 #line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp14_ = _ ("is not set");
+	_tmp8_ = self->priv->text_context;
 #line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp13_, _tmp14_);
+	gtk_combo_box_text_append_text (_tmp8_, _ ("is not set"));
 #line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp15_ = self->priv->text_context;
-#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp16_ = _ ("is set");
+	_tmp9_ = self->priv->text_context;
 #line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp15_, _tmp16_);
+	gtk_combo_box_text_append_text (_tmp9_, _ ("is set"));
 #line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp17_ = self->priv->text_context;
+	_tmp10_ = self->priv->text_context;
 #line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp18_ = self->priv->text_context;
+	_tmp11_ = self->priv->text_context;
 #line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed, self);
 #line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = (GtkEntry*) gtk_entry_new ();
+	_tmp12_ = (GtkEntry*) gtk_entry_new ();
 #line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp19_);
+	g_object_ref_sink (_tmp12_);
 #line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->entry);
 #line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->entry = _tmp19_;
+	self->priv->entry = _tmp12_;
 #line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp20_ = self->priv->entry;
+	_tmp13_ = self->priv->entry;
 #line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_entry_set_width_chars (_tmp20_, 25);
+	gtk_entry_set_width_chars (_tmp13_, 25);
 #line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp21_ = self->priv->entry;
+	_tmp14_ = self->priv->entry;
 #line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_entry_set_activates_default (_tmp21_, TRUE);
+	gtk_entry_set_activates_default (_tmp14_, TRUE);
 #line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = self->priv->entry;
+	_tmp15_ = self->priv->entry;
 #line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self);
 #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+	_tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp23_);
+	g_object_ref_sink (_tmp16_);
 #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
 #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->box = _tmp23_;
+	self->priv->box = _tmp16_;
 #line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp24_ = self->priv->box;
+	_tmp17_ = self->priv->box;
 #line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp25_ = self->priv->text_context;
+	_tmp18_ = self->priv->text_context;
 #line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp26_ = self->priv->box;
+	_tmp19_ = self->priv->box;
 #line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp27_ = self->priv->entry;
+	_tmp20_ = self->priv->entry;
 #line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp28_ = self->priv->box;
+	_tmp21_ = self->priv->box;
 #line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget));
 #line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3437 "SavedSearchDialog.c"
+#line 3404 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_new (SavedSearchDialogSearchRowContainer* parent) {
 #line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_text_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, parent);
-#line 3444 "SavedSearchDialog.c"
+#line 3411 "SavedSearchDialog.c"
 }
 
 
 static GtkWidget* saved_search_dialog_search_row_text_real_get_widget (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowText * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 188 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
 #line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3459,7 +3426,7 @@ static GtkWidget* saved_search_dialog_search_row_text_real_get_widget (SavedSear
 	result = _tmp1_;
 #line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3463 "SavedSearchDialog.c"
+#line 3430 "SavedSearchDialog.c"
 }
 
 
@@ -3467,16 +3434,16 @@ static SearchCondition* saved_search_dialog_search_row_text_real_get_search_cond
 	SavedSearchDialogSearchRowText * self;
 	SearchCondition* result = NULL;
 	SearchConditionSearchType type = 0;
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	SearchConditionSearchType _tmp1_ = 0;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	SearchConditionSearchType _tmp1_;
 	gchar* text = NULL;
-	GtkEntry* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	GtkEntry* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
 	SearchConditionTextContext context = 0;
-	SearchConditionTextContext _tmp5_ = 0;
+	SearchConditionTextContext _tmp5_;
 	SearchConditionText* c = NULL;
-	SearchConditionText* _tmp6_ = NULL;
+	SearchConditionText* _tmp6_;
 #line 192 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
 #line 193 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3507,28 +3474,28 @@ static SearchCondition* saved_search_dialog_search_row_text_real_get_search_cond
 	_g_free0 (text);
 #line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3511 "SavedSearchDialog.c"
+#line 3478 "SavedSearchDialog.c"
 }
 
 
 static gpointer _search_condition_ref0 (gpointer self) {
 #line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self ? search_condition_ref (self) : NULL;
-#line 3518 "SavedSearchDialog.c"
+#line 3485 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) {
 	SavedSearchDialogSearchRowText * self;
 	SearchConditionText* text = NULL;
-	SearchCondition* _tmp0_ = NULL;
-	SearchConditionText* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
-	SearchConditionTextContext _tmp3_ = 0;
-	SearchConditionTextContext _tmp4_ = 0;
-	GtkEntry* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
+	SearchCondition* _tmp0_;
+	SearchConditionText* _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	SearchConditionTextContext _tmp3_;
+	SearchConditionTextContext _tmp4_;
+	GtkEntry* _tmp5_;
+	const gchar* _tmp6_;
+	const gchar* _tmp7_;
 #line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
 #line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3561,7 +3528,7 @@ static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialog
 	saved_search_dialog_search_row_text_on_changed (self);
 #line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (text);
-#line 3565 "SavedSearchDialog.c"
+#line 3532 "SavedSearchDialog.c"
 }
 
 
@@ -3570,12 +3537,12 @@ static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearc
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GtkEntry* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
+	GtkEntry* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gboolean _tmp7_;
 #line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
 #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3596,40 +3563,40 @@ static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearc
 	if (_tmp7_) {
 #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = TRUE;
-#line 3600 "SavedSearchDialog.c"
+#line 3567 "SavedSearchDialog.c"
 	} else {
-		SearchConditionTextContext _tmp8_ = 0;
+		SearchConditionTextContext _tmp8_;
 #line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp8_ = saved_search_dialog_search_row_text_get_text_context (self);
 #line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = _tmp8_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET;
-#line 3607 "SavedSearchDialog.c"
+#line 3574 "SavedSearchDialog.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp1_) {
 #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = TRUE;
-#line 3613 "SavedSearchDialog.c"
+#line 3580 "SavedSearchDialog.c"
 	} else {
-		SearchConditionTextContext _tmp9_ = 0;
+		SearchConditionTextContext _tmp9_;
 #line 211 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp9_ = saved_search_dialog_search_row_text_get_text_context (self);
 #line 211 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = _tmp9_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET;
-#line 3620 "SavedSearchDialog.c"
+#line 3587 "SavedSearchDialog.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp0_;
 #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3626 "SavedSearchDialog.c"
+#line 3593 "SavedSearchDialog.c"
 }
 
 
 static SearchConditionTextContext saved_search_dialog_search_row_text_get_text_context (SavedSearchDialogSearchRowText* self) {
 	SearchConditionTextContext result = 0;
-	GtkComboBoxText* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	GtkComboBoxText* _tmp0_;
+	gint _tmp1_;
 #line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_TEXT (self), 0);
 #line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3640,15 +3607,15 @@ static SearchConditionTextContext saved_search_dialog_search_row_text_get_text_c
 	result = (SearchConditionTextContext) _tmp1_;
 #line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3644 "SavedSearchDialog.c"
+#line 3611 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSearchRowText* self) {
 	gboolean _tmp0_ = FALSE;
-	SearchConditionTextContext _tmp1_ = 0;
-	SavedSearchDialogSearchRowContainer* _tmp5_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp6_ = NULL;
+	SearchConditionTextContext _tmp1_;
+	SavedSearchDialogSearchRowContainer* _tmp5_;
+	SavedSearchDialogSearchRowContainer* _tmp6_;
 #line 218 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_TEXT (self));
 #line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3657,39 +3624,39 @@ static void saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSea
 	if (_tmp1_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET) {
 #line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = TRUE;
-#line 3661 "SavedSearchDialog.c"
+#line 3628 "SavedSearchDialog.c"
 	} else {
-		SearchConditionTextContext _tmp2_ = 0;
+		SearchConditionTextContext _tmp2_;
 #line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp2_ = saved_search_dialog_search_row_text_get_text_context (self);
 #line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = _tmp2_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET;
-#line 3668 "SavedSearchDialog.c"
+#line 3635 "SavedSearchDialog.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_) {
-#line 3672 "SavedSearchDialog.c"
-		GtkEntry* _tmp3_ = NULL;
+#line 3639 "SavedSearchDialog.c"
+		GtkEntry* _tmp3_;
 #line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->entry;
 #line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 3678 "SavedSearchDialog.c"
+#line 3645 "SavedSearchDialog.c"
 	} else {
-		GtkEntry* _tmp4_ = NULL;
+		GtkEntry* _tmp4_;
 #line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = self->priv->entry;
 #line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 3685 "SavedSearchDialog.c"
+#line 3652 "SavedSearchDialog.c"
 	}
 #line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->parent;
 #line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->parent;
 #line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_emit_by_name (_tmp5_, "changed", _tmp6_);
-#line 3693 "SavedSearchDialog.c"
+	g_signal_emit (_tmp5_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp6_);
+#line 3660 "SavedSearchDialog.c"
 }
 
 
@@ -3701,30 +3668,30 @@ static void saved_search_dialog_search_row_text_class_init (SavedSearchDialogSea
 #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowTextPrivate));
 #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_text_real_get_widget;
+	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_get_widget;
 #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_text_real_get_search_condition;
+	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_get_search_condition;
 #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_text_real_populate;
+	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_text_real_populate;
 #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_text_real_is_complete;
-#line 3712 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_is_complete;
+#line 3679 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_text_instance_init (SavedSearchDialogSearchRowText * self) {
 #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_GET_PRIVATE (self);
-#line 3719 "SavedSearchDialog.c"
+#line 3686 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow* obj) {
+static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow * obj) {
 	SavedSearchDialogSearchRowText * self;
-	GtkComboBoxText* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	GtkEntry* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	GtkComboBoxText* _tmp0_;
+	guint _tmp1_;
+	GtkEntry* _tmp2_;
+	guint _tmp3_;
 #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
 #line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3749,7 +3716,7 @@ static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearc
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_text_parent_class)->finalize (obj);
-#line 3753 "SavedSearchDialog.c"
+#line 3720 "SavedSearchDialog.c"
 }
 
 
@@ -3768,36 +3735,31 @@ static GType saved_search_dialog_search_row_text_get_type (void) {
 static void _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_media_type_on_changed ((SavedSearchDialogSearchRowMediaType*) self);
-#line 3772 "SavedSearchDialog.c"
+#line 3739 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) {
 	SavedSearchDialogSearchRowMediaType* self = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
-	GtkComboBoxText* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GtkComboBoxText* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	GtkComboBoxText* _tmp7_ = NULL;
-	GtkComboBoxText* _tmp8_ = NULL;
-	GtkComboBoxText* _tmp9_ = NULL;
-	GtkComboBoxText* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	GtkComboBoxText* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	GtkComboBoxText* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	GtkComboBoxText* _tmp16_ = NULL;
-	GtkComboBoxText* _tmp17_ = NULL;
-	GtkBox* _tmp18_ = NULL;
-	GtkBox* _tmp19_ = NULL;
-	GtkComboBoxText* _tmp20_ = NULL;
-	GtkBox* _tmp21_ = NULL;
-	GtkComboBoxText* _tmp22_ = NULL;
-	GtkBox* _tmp23_ = NULL;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	SavedSearchDialogSearchRowContainer* _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	GtkComboBoxText* _tmp3_;
+	GtkComboBoxText* _tmp4_;
+	GtkComboBoxText* _tmp5_;
+	GtkComboBoxText* _tmp6_;
+	GtkComboBoxText* _tmp7_;
+	GtkComboBoxText* _tmp8_;
+	GtkComboBoxText* _tmp9_;
+	GtkComboBoxText* _tmp10_;
+	GtkComboBoxText* _tmp11_;
+	GtkComboBoxText* _tmp12_;
+	GtkBox* _tmp13_;
+	GtkBox* _tmp14_;
+	GtkComboBoxText* _tmp15_;
+	GtkBox* _tmp16_;
+	GtkComboBoxText* _tmp17_;
+	GtkBox* _tmp18_;
 #line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
 #line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3821,99 +3783,89 @@ static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media
 #line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->media_context;
 #line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = _ ("is");
-#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp3_, _tmp4_);
+	gtk_combo_box_text_append_text (_tmp3_, _ ("is"));
 #line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->media_context;
+	_tmp4_ = self->priv->media_context;
 #line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = _ ("is not");
-#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp5_, _tmp6_);
+	gtk_combo_box_text_append_text (_tmp4_, _ ("is not"));
 #line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = self->priv->media_context;
+	_tmp5_ = self->priv->media_context;
 #line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 245 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = self->priv->media_context;
+	_tmp6_ = self->priv->media_context;
 #line 245 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
 #line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+	_tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
 #line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp9_);
+	g_object_ref_sink (_tmp7_);
 #line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->media_type);
 #line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->media_type = _tmp9_;
-#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = self->priv->media_type;
+	self->priv->media_type = _tmp7_;
 #line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = _ ("any photo");
+	_tmp8_ = self->priv->media_type;
 #line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp10_, _tmp11_);
-#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = self->priv->media_type;
+	gtk_combo_box_text_append_text (_tmp8_, _ ("any photo"));
 #line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = _ ("a raw photo");
+	_tmp9_ = self->priv->media_type;
 #line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp12_, _tmp13_);
-#line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp14_ = self->priv->media_type;
+	gtk_combo_box_text_append_text (_tmp9_, _ ("a raw photo"));
 #line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp15_ = _ ("a video");
+	_tmp10_ = self->priv->media_type;
 #line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp14_, _tmp15_);
+	gtk_combo_box_text_append_text (_tmp10_, _ ("a video"));
 #line 252 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp16_ = self->priv->media_type;
+	_tmp11_ = self->priv->media_type;
 #line 252 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp17_ = self->priv->media_type;
+	_tmp12_ = self->priv->media_type;
 #line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
 #line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 #line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp18_);
+	g_object_ref_sink (_tmp13_);
 #line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
 #line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->box = _tmp18_;
+	self->priv->box = _tmp13_;
 #line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = self->priv->box;
+	_tmp14_ = self->priv->box;
 #line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp20_ = self->priv->media_context;
+	_tmp15_ = self->priv->media_context;
 #line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp21_ = self->priv->box;
+	_tmp16_ = self->priv->box;
 #line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = self->priv->media_type;
+	_tmp17_ = self->priv->media_type;
 #line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp23_ = self->priv->box;
+	_tmp18_ = self->priv->box;
 #line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
 #line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3902 "SavedSearchDialog.c"
+#line 3854 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_new (SavedSearchDialogSearchRowContainer* parent) {
 #line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_media_type_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, parent);
-#line 3909 "SavedSearchDialog.c"
+#line 3861 "SavedSearchDialog.c"
 }
 
 
 static GtkWidget* saved_search_dialog_search_row_media_type_real_get_widget (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowMediaType * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 266 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
 #line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3924,7 +3876,7 @@ static GtkWidget* saved_search_dialog_search_row_media_type_real_get_widget (Sav
 	result = _tmp1_;
 #line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3928 "SavedSearchDialog.c"
+#line 3880 "SavedSearchDialog.c"
 }
 
 
@@ -3932,16 +3884,16 @@ static SearchCondition* saved_search_dialog_search_row_media_type_real_get_searc
 	SavedSearchDialogSearchRowMediaType * self;
 	SearchCondition* result = NULL;
 	SearchConditionSearchType search_type = 0;
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	SearchConditionSearchType _tmp1_ = 0;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	SearchConditionSearchType _tmp1_;
 	SearchConditionMediaTypeContext context = 0;
-	GtkComboBoxText* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	GtkComboBoxText* _tmp2_;
+	gint _tmp3_;
 	SearchConditionMediaTypeMediaType type = 0;
-	GtkComboBoxText* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	GtkComboBoxText* _tmp4_;
+	gint _tmp5_;
 	SearchConditionMediaType* c = NULL;
-	SearchConditionMediaType* _tmp6_ = NULL;
+	SearchConditionMediaType* _tmp6_;
 #line 270 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
 #line 271 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3970,21 +3922,21 @@ static SearchCondition* saved_search_dialog_search_row_media_type_real_get_searc
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 275 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3974 "SavedSearchDialog.c"
+#line 3926 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_media_type_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) {
 	SavedSearchDialogSearchRowMediaType * self;
 	SearchConditionMediaType* media = NULL;
-	SearchCondition* _tmp0_ = NULL;
-	SearchConditionMediaType* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
-	SearchConditionMediaTypeContext _tmp3_ = 0;
-	SearchConditionMediaTypeContext _tmp4_ = 0;
-	GtkComboBoxText* _tmp5_ = NULL;
-	SearchConditionMediaTypeMediaType _tmp6_ = 0;
-	SearchConditionMediaTypeMediaType _tmp7_ = 0;
+	SearchCondition* _tmp0_;
+	SearchConditionMediaType* _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	SearchConditionMediaTypeContext _tmp3_;
+	SearchConditionMediaTypeContext _tmp4_;
+	GtkComboBoxText* _tmp5_;
+	SearchConditionMediaTypeMediaType _tmp6_;
+	SearchConditionMediaTypeMediaType _tmp7_;
 #line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
 #line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4015,7 +3967,7 @@ static void saved_search_dialog_search_row_media_type_real_populate (SavedSearch
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_);
 #line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (media);
-#line 4019 "SavedSearchDialog.c"
+#line 3971 "SavedSearchDialog.c"
 }
 
 
@@ -4028,13 +3980,13 @@ static gboolean saved_search_dialog_search_row_media_type_real_is_complete (Save
 	result = TRUE;
 #line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4032 "SavedSearchDialog.c"
+#line 3984 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDialogSearchRowMediaType* self) {
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp1_ = NULL;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	SavedSearchDialogSearchRowContainer* _tmp1_;
 #line 289 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_MEDIA_TYPE (self));
 #line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4042,8 +3994,8 @@ static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDia
 #line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
 #line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
-#line 4047 "SavedSearchDialog.c"
+	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
+#line 3999 "SavedSearchDialog.c"
 }
 
 
@@ -4055,30 +4007,30 @@ static void saved_search_dialog_search_row_media_type_class_init (SavedSearchDia
 #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowMediaTypePrivate));
 #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_media_type_real_get_widget;
+	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_get_widget;
 #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_media_type_real_get_search_condition;
+	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_get_search_condition;
 #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_media_type_real_populate;
+	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_media_type_real_populate;
 #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_media_type_real_is_complete;
-#line 4066 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_is_complete;
+#line 4018 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_media_type_instance_init (SavedSearchDialogSearchRowMediaType * self) {
 #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_GET_PRIVATE (self);
-#line 4073 "SavedSearchDialog.c"
+#line 4025 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow* obj) {
+static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow * obj) {
 	SavedSearchDialogSearchRowMediaType * self;
-	GtkComboBoxText* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	GtkComboBoxText* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	GtkComboBoxText* _tmp0_;
+	guint _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	guint _tmp3_;
 #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
 #line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4103,7 +4055,7 @@ static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialo
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_media_type_parent_class)->finalize (obj);
-#line 4107 "SavedSearchDialog.c"
+#line 4059 "SavedSearchDialog.c"
 }
 
 
@@ -4122,36 +4074,31 @@ static GType saved_search_dialog_search_row_media_type_get_type (void) {
 static void _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_modified_on_changed ((SavedSearchDialogSearchRowModified*) self);
-#line 4126 "SavedSearchDialog.c"
+#line 4078 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) {
 	SavedSearchDialogSearchRowModified* self = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
-	GtkComboBoxText* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GtkComboBoxText* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	GtkComboBoxText* _tmp7_ = NULL;
-	GtkComboBoxText* _tmp8_ = NULL;
-	GtkComboBoxText* _tmp9_ = NULL;
-	GtkComboBoxText* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	GtkComboBoxText* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	GtkComboBoxText* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	GtkComboBoxText* _tmp16_ = NULL;
-	GtkComboBoxText* _tmp17_ = NULL;
-	GtkBox* _tmp18_ = NULL;
-	GtkBox* _tmp19_ = NULL;
-	GtkComboBoxText* _tmp20_ = NULL;
-	GtkBox* _tmp21_ = NULL;
-	GtkComboBoxText* _tmp22_ = NULL;
-	GtkBox* _tmp23_ = NULL;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	SavedSearchDialogSearchRowContainer* _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	GtkComboBoxText* _tmp3_;
+	GtkComboBoxText* _tmp4_;
+	GtkComboBoxText* _tmp5_;
+	GtkComboBoxText* _tmp6_;
+	GtkComboBoxText* _tmp7_;
+	GtkComboBoxText* _tmp8_;
+	GtkComboBoxText* _tmp9_;
+	GtkComboBoxText* _tmp10_;
+	GtkComboBoxText* _tmp11_;
+	GtkComboBoxText* _tmp12_;
+	GtkBox* _tmp13_;
+	GtkBox* _tmp14_;
+	GtkComboBoxText* _tmp15_;
+	GtkBox* _tmp16_;
+	GtkComboBoxText* _tmp17_;
+	GtkBox* _tmp18_;
 #line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
 #line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4175,99 +4122,89 @@ static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modifi
 #line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->modified_context;
 #line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = _ ("has");
-#line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp3_, _tmp4_);
-#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->modified_context;
+	gtk_combo_box_text_append_text (_tmp3_, _ ("has"));
 #line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = _ ("has no");
+	_tmp4_ = self->priv->modified_context;
 #line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp5_, _tmp6_);
+	gtk_combo_box_text_append_text (_tmp4_, _ ("has no"));
 #line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = self->priv->modified_context;
+	_tmp5_ = self->priv->modified_context;
 #line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 308 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = self->priv->modified_context;
+	_tmp6_ = self->priv->modified_context;
 #line 308 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
 #line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+	_tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
 #line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp9_);
+	g_object_ref_sink (_tmp7_);
 #line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->modified_state);
 #line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->modified_state = _tmp9_;
-#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = self->priv->modified_state;
+	self->priv->modified_state = _tmp7_;
 #line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = _ ("modifications");
+	_tmp8_ = self->priv->modified_state;
 #line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp10_, _tmp11_);
+	gtk_combo_box_text_append_text (_tmp8_, _ ("modifications"));
 #line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = self->priv->modified_state;
-#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = _ ("internal modifications");
+	_tmp9_ = self->priv->modified_state;
 #line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp12_, _tmp13_);
-#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp14_ = self->priv->modified_state;
+	gtk_combo_box_text_append_text (_tmp9_, _ ("internal modifications"));
 #line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp15_ = _ ("external modifications");
+	_tmp10_ = self->priv->modified_state;
 #line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp14_, _tmp15_);
+	gtk_combo_box_text_append_text (_tmp10_, _ ("external modifications"));
 #line 314 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp16_ = self->priv->modified_state;
+	_tmp11_ = self->priv->modified_state;
 #line 314 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp17_ = self->priv->modified_state;
+	_tmp12_ = self->priv->modified_state;
 #line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
 #line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 #line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp18_);
+	g_object_ref_sink (_tmp13_);
 #line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
 #line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->box = _tmp18_;
+	self->priv->box = _tmp13_;
 #line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = self->priv->box;
+	_tmp14_ = self->priv->box;
 #line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp20_ = self->priv->modified_context;
+	_tmp15_ = self->priv->modified_context;
 #line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp21_ = self->priv->box;
+	_tmp16_ = self->priv->box;
 #line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = self->priv->modified_state;
+	_tmp17_ = self->priv->modified_state;
 #line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp23_ = self->priv->box;
+	_tmp18_ = self->priv->box;
 #line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
 #line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4256 "SavedSearchDialog.c"
+#line 4193 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_new (SavedSearchDialogSearchRowContainer* parent) {
 #line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_modified_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, parent);
-#line 4263 "SavedSearchDialog.c"
+#line 4200 "SavedSearchDialog.c"
 }
 
 
 static GtkWidget* saved_search_dialog_search_row_modified_real_get_widget (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowModified * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 328 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
 #line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4278,7 +4215,7 @@ static GtkWidget* saved_search_dialog_search_row_modified_real_get_widget (Saved
 	result = _tmp1_;
 #line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4282 "SavedSearchDialog.c"
+#line 4219 "SavedSearchDialog.c"
 }
 
 
@@ -4286,16 +4223,16 @@ static SearchCondition* saved_search_dialog_search_row_modified_real_get_search_
 	SavedSearchDialogSearchRowModified * self;
 	SearchCondition* result = NULL;
 	SearchConditionSearchType search_type = 0;
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	SearchConditionSearchType _tmp1_ = 0;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	SearchConditionSearchType _tmp1_;
 	SearchConditionModifiedContext context = 0;
-	GtkComboBoxText* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	GtkComboBoxText* _tmp2_;
+	gint _tmp3_;
 	SearchConditionModifiedState state = 0;
-	GtkComboBoxText* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	GtkComboBoxText* _tmp4_;
+	gint _tmp5_;
 	SearchConditionModified* c = NULL;
-	SearchConditionModified* _tmp6_ = NULL;
+	SearchConditionModified* _tmp6_;
 #line 332 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
 #line 333 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4324,21 +4261,21 @@ static SearchCondition* saved_search_dialog_search_row_modified_real_get_search_
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 337 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4328 "SavedSearchDialog.c"
+#line 4265 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) {
 	SavedSearchDialogSearchRowModified * self;
 	SearchConditionModified* scm = NULL;
-	SearchCondition* _tmp0_ = NULL;
-	SearchConditionModified* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
-	SearchConditionModifiedState _tmp3_ = 0;
-	SearchConditionModifiedState _tmp4_ = 0;
-	GtkComboBoxText* _tmp5_ = NULL;
-	SearchConditionModifiedContext _tmp6_ = 0;
-	SearchConditionModifiedContext _tmp7_ = 0;
+	SearchCondition* _tmp0_;
+	SearchConditionModified* _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	SearchConditionModifiedState _tmp3_;
+	SearchConditionModifiedState _tmp4_;
+	GtkComboBoxText* _tmp5_;
+	SearchConditionModifiedContext _tmp6_;
+	SearchConditionModifiedContext _tmp7_;
 #line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
 #line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4369,7 +4306,7 @@ static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDi
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_);
 #line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (scm);
-#line 4373 "SavedSearchDialog.c"
+#line 4310 "SavedSearchDialog.c"
 }
 
 
@@ -4382,13 +4319,13 @@ static gboolean saved_search_dialog_search_row_modified_real_is_complete (SavedS
 	result = TRUE;
 #line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4386 "SavedSearchDialog.c"
+#line 4323 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialogSearchRowModified* self) {
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp1_ = NULL;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	SavedSearchDialogSearchRowContainer* _tmp1_;
 #line 351 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_MODIFIED (self));
 #line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4396,8 +4333,8 @@ static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialo
 #line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
 #line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
-#line 4401 "SavedSearchDialog.c"
+	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
+#line 4338 "SavedSearchDialog.c"
 }
 
 
@@ -4409,30 +4346,30 @@ static void saved_search_dialog_search_row_modified_class_init (SavedSearchDialo
 #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowModifiedPrivate));
 #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_modified_real_get_widget;
+	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_get_widget;
 #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_modified_real_get_search_condition;
+	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_get_search_condition;
 #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_modified_real_populate;
+	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_modified_real_populate;
 #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_modified_real_is_complete;
-#line 4420 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_is_complete;
+#line 4357 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_modified_instance_init (SavedSearchDialogSearchRowModified * self) {
 #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_GET_PRIVATE (self);
-#line 4427 "SavedSearchDialog.c"
+#line 4364 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow* obj) {
+static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow * obj) {
 	SavedSearchDialogSearchRowModified * self;
-	GtkComboBoxText* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	GtkComboBoxText* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	GtkComboBoxText* _tmp0_;
+	guint _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	guint _tmp3_;
 #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
 #line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4457,7 +4394,7 @@ static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogS
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_modified_parent_class)->finalize (obj);
-#line 4461 "SavedSearchDialog.c"
+#line 4398 "SavedSearchDialog.c"
 }
 
 
@@ -4476,29 +4413,26 @@ static GType saved_search_dialog_search_row_modified_get_type (void) {
 static void _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_flagged_on_changed ((SavedSearchDialogSearchRowFlagged*) self);
-#line 4480 "SavedSearchDialog.c"
+#line 4417 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) {
 	SavedSearchDialogSearchRowFlagged* self = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
-	GtkComboBoxText* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GtkComboBoxText* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	GtkComboBoxText* _tmp7_ = NULL;
-	GtkComboBoxText* _tmp8_ = NULL;
-	GtkBox* _tmp9_ = NULL;
-	GtkBox* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	GtkLabel* _tmp12_ = NULL;
-	GtkLabel* _tmp13_ = NULL;
-	GtkBox* _tmp14_ = NULL;
-	GtkComboBoxText* _tmp15_ = NULL;
-	GtkBox* _tmp16_ = NULL;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	SavedSearchDialogSearchRowContainer* _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	GtkComboBoxText* _tmp3_;
+	GtkComboBoxText* _tmp4_;
+	GtkComboBoxText* _tmp5_;
+	GtkComboBoxText* _tmp6_;
+	GtkBox* _tmp7_;
+	GtkBox* _tmp8_;
+	GtkLabel* _tmp9_;
+	GtkLabel* _tmp10_;
+	GtkBox* _tmp11_;
+	GtkComboBoxText* _tmp12_;
+	GtkBox* _tmp13_;
 #line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
 #line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4522,73 +4456,67 @@ static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged
 #line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->flagged_state;
 #line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = _ ("flagged");
-#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp3_, _tmp4_);
-#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->flagged_state;
+	gtk_combo_box_text_append_text (_tmp3_, _ ("flagged"));
 #line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = _ ("not flagged");
+	_tmp4_ = self->priv->flagged_state;
 #line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp5_, _tmp6_);
+	gtk_combo_box_text_append_text (_tmp4_, _ ("not flagged"));
 #line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = self->priv->flagged_state;
+	_tmp5_ = self->priv->flagged_state;
 #line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 370 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = self->priv->flagged_state;
+	_tmp6_ = self->priv->flagged_state;
 #line 370 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed, self);
 #line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+	_tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 #line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp9_);
+	g_object_ref_sink (_tmp7_);
 #line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
 #line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->box = _tmp9_;
+	self->priv->box = _tmp7_;
 #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = self->priv->box;
+	_tmp8_ = self->priv->box;
 #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = _ ("is");
+	_tmp9_ = (GtkLabel*) gtk_label_new (_ ("is"));
 #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = (GtkLabel*) gtk_label_new (_tmp11_);
-#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp12_);
+	g_object_ref_sink (_tmp9_);
 #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = _tmp12_;
+	_tmp10_ = _tmp9_;
 #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (_tmp13_);
+	_g_object_unref0 (_tmp10_);
 #line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp14_ = self->priv->box;
+	_tmp11_ = self->priv->box;
 #line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp15_ = self->priv->flagged_state;
+	_tmp12_ = self->priv->flagged_state;
 #line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp16_ = self->priv->box;
+	_tmp13_ = self->priv->box;
 #line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
 #line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4577 "SavedSearchDialog.c"
+#line 4505 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_new (SavedSearchDialogSearchRowContainer* parent) {
 #line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_flagged_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, parent);
-#line 4584 "SavedSearchDialog.c"
+#line 4512 "SavedSearchDialog.c"
 }
 
 
 static GtkWidget* saved_search_dialog_search_row_flagged_real_get_widget (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowFlagged * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 382 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
 #line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4599,7 +4527,7 @@ static GtkWidget* saved_search_dialog_search_row_flagged_real_get_widget (SavedS
 	result = _tmp1_;
 #line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4603 "SavedSearchDialog.c"
+#line 4531 "SavedSearchDialog.c"
 }
 
 
@@ -4607,13 +4535,13 @@ static SearchCondition* saved_search_dialog_search_row_flagged_real_get_search_c
 	SavedSearchDialogSearchRowFlagged * self;
 	SearchCondition* result = NULL;
 	SearchConditionSearchType search_type = 0;
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	SearchConditionSearchType _tmp1_ = 0;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	SearchConditionSearchType _tmp1_;
 	SearchConditionFlaggedState state = 0;
-	GtkComboBoxText* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	GtkComboBoxText* _tmp2_;
+	gint _tmp3_;
 	SearchConditionFlagged* c = NULL;
-	SearchConditionFlagged* _tmp4_ = NULL;
+	SearchConditionFlagged* _tmp4_;
 #line 386 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
 #line 387 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4636,18 +4564,18 @@ static SearchCondition* saved_search_dialog_search_row_flagged_real_get_search_c
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 390 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4640 "SavedSearchDialog.c"
+#line 4568 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) {
 	SavedSearchDialogSearchRowFlagged * self;
 	SearchConditionFlagged* f = NULL;
-	SearchCondition* _tmp0_ = NULL;
-	SearchConditionFlagged* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
-	SearchConditionFlaggedState _tmp3_ = 0;
-	SearchConditionFlaggedState _tmp4_ = 0;
+	SearchCondition* _tmp0_;
+	SearchConditionFlagged* _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	SearchConditionFlaggedState _tmp3_;
+	SearchConditionFlaggedState _tmp4_;
 #line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
 #line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4670,7 +4598,7 @@ static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDia
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
 #line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (f);
-#line 4674 "SavedSearchDialog.c"
+#line 4602 "SavedSearchDialog.c"
 }
 
 
@@ -4683,13 +4611,13 @@ static gboolean saved_search_dialog_search_row_flagged_real_is_complete (SavedSe
 	result = TRUE;
 #line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4687 "SavedSearchDialog.c"
+#line 4615 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialogSearchRowFlagged* self) {
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp1_ = NULL;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	SavedSearchDialogSearchRowContainer* _tmp1_;
 #line 403 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_FLAGGED (self));
 #line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4697,8 +4625,8 @@ static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialog
 #line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
 #line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
-#line 4702 "SavedSearchDialog.c"
+	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
+#line 4630 "SavedSearchDialog.c"
 }
 
 
@@ -4710,28 +4638,28 @@ static void saved_search_dialog_search_row_flagged_class_init (SavedSearchDialog
 #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowFlaggedPrivate));
 #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_flagged_real_get_widget;
+	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_get_widget;
 #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_flagged_real_get_search_condition;
+	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_get_search_condition;
 #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_flagged_real_populate;
+	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_flagged_real_populate;
 #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_flagged_real_is_complete;
-#line 4721 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_is_complete;
+#line 4649 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_flagged_instance_init (SavedSearchDialogSearchRowFlagged * self) {
 #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_GET_PRIVATE (self);
-#line 4728 "SavedSearchDialog.c"
+#line 4656 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow* obj) {
+static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow * obj) {
 	SavedSearchDialogSearchRowFlagged * self;
-	GtkComboBoxText* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	GtkComboBoxText* _tmp0_;
+	guint _tmp1_;
 #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
 #line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4748,7 +4676,7 @@ static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSe
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_flagged_parent_class)->finalize (obj);
-#line 4752 "SavedSearchDialog.c"
+#line 4680 "SavedSearchDialog.c"
 }
 
 
@@ -4767,50 +4695,46 @@ static GType saved_search_dialog_search_row_flagged_get_type (void) {
 static void _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_rating_on_changed ((SavedSearchDialogSearchRowRating*) self);
-#line 4771 "SavedSearchDialog.c"
+#line 4699 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) {
 	SavedSearchDialogSearchRowRating* self = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
-	GtkComboBoxText* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GtkComboBoxText* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	GtkComboBoxText* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkComboBoxText* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	GtkComboBoxText* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	GtkComboBoxText* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	GtkComboBoxText* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	GtkComboBoxText* _tmp17_ = NULL;
-	GtkComboBoxText* _tmp18_ = NULL;
-	GtkComboBoxText* _tmp19_ = NULL;
-	GtkComboBoxText* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	GtkComboBoxText* _tmp22_ = NULL;
-	const gchar* _tmp23_ = NULL;
-	GtkComboBoxText* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	GtkComboBoxText* _tmp26_ = NULL;
-	GtkComboBoxText* _tmp27_ = NULL;
-	GtkBox* _tmp28_ = NULL;
-	GtkBox* _tmp29_ = NULL;
-	const gchar* _tmp30_ = NULL;
-	GtkLabel* _tmp31_ = NULL;
-	GtkLabel* _tmp32_ = NULL;
-	GtkBox* _tmp33_ = NULL;
-	GtkComboBoxText* _tmp34_ = NULL;
-	GtkBox* _tmp35_ = NULL;
-	GtkComboBoxText* _tmp36_ = NULL;
-	GtkBox* _tmp37_ = NULL;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	SavedSearchDialogSearchRowContainer* _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	GtkComboBoxText* _tmp3_;
+	const gchar* _tmp4_;
+	GtkComboBoxText* _tmp5_;
+	const gchar* _tmp6_;
+	GtkComboBoxText* _tmp7_;
+	const gchar* _tmp8_;
+	GtkComboBoxText* _tmp9_;
+	const gchar* _tmp10_;
+	GtkComboBoxText* _tmp11_;
+	const gchar* _tmp12_;
+	GtkComboBoxText* _tmp13_;
+	const gchar* _tmp14_;
+	GtkComboBoxText* _tmp15_;
+	const gchar* _tmp16_;
+	GtkComboBoxText* _tmp17_;
+	GtkComboBoxText* _tmp18_;
+	GtkComboBoxText* _tmp19_;
+	GtkComboBoxText* _tmp20_;
+	GtkComboBoxText* _tmp21_;
+	GtkComboBoxText* _tmp22_;
+	GtkComboBoxText* _tmp23_;
+	GtkComboBoxText* _tmp24_;
+	GtkBox* _tmp25_;
+	GtkBox* _tmp26_;
+	GtkLabel* _tmp27_;
+	GtkLabel* _tmp28_;
+	GtkBox* _tmp29_;
+	GtkComboBoxText* _tmp30_;
+	GtkBox* _tmp31_;
+	GtkComboBoxText* _tmp32_;
+	GtkBox* _tmp33_;
 #line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
 #line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4892,85 +4816,77 @@ static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_c
 #line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = self->priv->context;
 #line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp21_ = _ ("and higher");
-#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp20_, _tmp21_);
-#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = self->priv->context;
+	gtk_combo_box_text_append_text (_tmp20_, _ ("and higher"));
 #line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp23_ = _ ("only");
+	_tmp21_ = self->priv->context;
 #line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp22_, _tmp23_);
+	gtk_combo_box_text_append_text (_tmp21_, _ ("only"));
 #line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp24_ = self->priv->context;
-#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp25_ = _ ("and lower");
+	_tmp22_ = self->priv->context;
 #line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp24_, _tmp25_);
+	gtk_combo_box_text_append_text (_tmp22_, _ ("and lower"));
 #line 434 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp26_ = self->priv->context;
+	_tmp23_ = self->priv->context;
 #line 434 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp27_ = self->priv->context;
+	_tmp24_ = self->priv->context;
 #line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
 #line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp28_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+	_tmp25_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 #line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp28_);
+	g_object_ref_sink (_tmp25_);
 #line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
 #line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->box = _tmp28_;
+	self->priv->box = _tmp25_;
 #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp29_ = self->priv->box;
-#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp30_ = _ ("is");
+	_tmp26_ = self->priv->box;
 #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp31_ = (GtkLabel*) gtk_label_new (_tmp30_);
+	_tmp27_ = (GtkLabel*) gtk_label_new (_ ("is"));
 #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp31_);
+	g_object_ref_sink (_tmp27_);
 #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp32_ = _tmp31_;
+	_tmp28_ = _tmp27_;
 #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (_tmp32_);
+	_g_object_unref0 (_tmp28_);
 #line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp33_ = self->priv->box;
+	_tmp29_ = self->priv->box;
 #line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp34_ = self->priv->rating;
+	_tmp30_ = self->priv->rating;
 #line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp35_ = self->priv->box;
+	_tmp31_ = self->priv->box;
 #line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp36_ = self->priv->context;
+	_tmp32_ = self->priv->context;
 #line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 441 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp37_ = self->priv->box;
+	_tmp33_ = self->priv->box;
 #line 441 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
 #line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4959 "SavedSearchDialog.c"
+#line 4875 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_new (SavedSearchDialogSearchRowContainer* parent) {
 #line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_rating_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, parent);
-#line 4966 "SavedSearchDialog.c"
+#line 4882 "SavedSearchDialog.c"
 }
 
 
 static GtkWidget* saved_search_dialog_search_row_rating_real_get_widget (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowRating * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 449 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
 #line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4981,7 +4897,7 @@ static GtkWidget* saved_search_dialog_search_row_rating_real_get_widget (SavedSe
 	result = _tmp1_;
 #line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4985 "SavedSearchDialog.c"
+#line 4901 "SavedSearchDialog.c"
 }
 
 
@@ -4989,16 +4905,16 @@ static SearchCondition* saved_search_dialog_search_row_rating_real_get_search_co
 	SavedSearchDialogSearchRowRating * self;
 	SearchCondition* result = NULL;
 	SearchConditionSearchType search_type = 0;
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	SearchConditionSearchType _tmp1_ = 0;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	SearchConditionSearchType _tmp1_;
 	Rating search_rating = 0;
-	GtkComboBoxText* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	GtkComboBoxText* _tmp2_;
+	gint _tmp3_;
 	SearchConditionRatingContext search_context = 0;
-	GtkComboBoxText* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	GtkComboBoxText* _tmp4_;
+	gint _tmp5_;
 	SearchConditionRating* c = NULL;
-	SearchConditionRating* _tmp6_ = NULL;
+	SearchConditionRating* _tmp6_;
 #line 453 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
 #line 454 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5027,21 +4943,21 @@ static SearchCondition* saved_search_dialog_search_row_rating_real_get_search_co
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 458 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5031 "SavedSearchDialog.c"
+#line 4947 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) {
 	SavedSearchDialogSearchRowRating * self;
 	SearchConditionRating* r = NULL;
-	SearchCondition* _tmp0_ = NULL;
-	SearchConditionRating* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
-	SearchConditionRatingContext _tmp3_ = 0;
-	SearchConditionRatingContext _tmp4_ = 0;
-	GtkComboBoxText* _tmp5_ = NULL;
-	Rating _tmp6_ = 0;
-	Rating _tmp7_ = 0;
+	SearchCondition* _tmp0_;
+	SearchConditionRating* _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	SearchConditionRatingContext _tmp3_;
+	SearchConditionRatingContext _tmp4_;
+	GtkComboBoxText* _tmp5_;
+	Rating _tmp6_;
+	Rating _tmp7_;
 #line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
 #line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5072,7 +4988,7 @@ static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDial
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) (_tmp7_ - RATING_REJECTED));
 #line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (r);
-#line 5076 "SavedSearchDialog.c"
+#line 4992 "SavedSearchDialog.c"
 }
 
 
@@ -5085,13 +5001,13 @@ static gboolean saved_search_dialog_search_row_rating_real_is_complete (SavedSea
 	result = TRUE;
 #line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5089 "SavedSearchDialog.c"
+#line 5005 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogSearchRowRating* self) {
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp1_ = NULL;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	SavedSearchDialogSearchRowContainer* _tmp1_;
 #line 472 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_RATING (self));
 #line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5099,8 +5015,8 @@ static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogS
 #line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
 #line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
-#line 5104 "SavedSearchDialog.c"
+	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
+#line 5020 "SavedSearchDialog.c"
 }
 
 
@@ -5112,30 +5028,30 @@ static void saved_search_dialog_search_row_rating_class_init (SavedSearchDialogS
 #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowRatingPrivate));
 #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_rating_real_get_widget;
+	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_get_widget;
 #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_rating_real_get_search_condition;
+	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_get_search_condition;
 #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_rating_real_populate;
+	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_rating_real_populate;
 #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_rating_real_is_complete;
-#line 5123 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_is_complete;
+#line 5039 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_rating_instance_init (SavedSearchDialogSearchRowRating * self) {
 #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_GET_PRIVATE (self);
-#line 5130 "SavedSearchDialog.c"
+#line 5046 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow* obj) {
+static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow * obj) {
 	SavedSearchDialogSearchRowRating * self;
-	GtkComboBoxText* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	GtkComboBoxText* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	GtkComboBoxText* _tmp0_;
+	guint _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	guint _tmp3_;
 #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
 #line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5160,7 +5076,7 @@ static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSea
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_rating_parent_class)->finalize (obj);
-#line 5164 "SavedSearchDialog.c"
+#line 5080 "SavedSearchDialog.c"
 }
 
 
@@ -5179,59 +5095,53 @@ static GType saved_search_dialog_search_row_rating_get_type (void) {
 static void _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_changed ((SavedSearchDialogSearchRowDate*) self);
-#line 5183 "SavedSearchDialog.c"
+#line 5099 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_one_clicked ((SavedSearchDialogSearchRowDate*) self);
-#line 5190 "SavedSearchDialog.c"
+#line 5106 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_two_clicked ((SavedSearchDialogSearchRowDate*) self);
-#line 5197 "SavedSearchDialog.c"
+#line 5113 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) {
 	SavedSearchDialogSearchRowDate* self = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
-	GtkComboBoxText* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GtkComboBoxText* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	GtkComboBoxText* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkComboBoxText* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	GtkComboBoxText* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	GtkComboBoxText* _tmp13_ = NULL;
-	GtkComboBoxText* _tmp14_ = NULL;
-	GtkCalendar* _tmp15_ = NULL;
-	GtkCalendar* _tmp16_ = NULL;
-	GtkButton* _tmp17_ = NULL;
-	GtkButton* _tmp18_ = NULL;
-	GtkButton* _tmp19_ = NULL;
-	GtkButton* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	GtkLabel* _tmp22_ = NULL;
-	GtkBox* _tmp23_ = NULL;
-	GtkBox* _tmp24_ = NULL;
-	GtkComboBoxText* _tmp25_ = NULL;
-	GtkBox* _tmp26_ = NULL;
-	GtkButton* _tmp27_ = NULL;
-	GtkBox* _tmp28_ = NULL;
-	GtkLabel* _tmp29_ = NULL;
-	GtkBox* _tmp30_ = NULL;
-	GtkButton* _tmp31_ = NULL;
-	GtkBox* _tmp32_ = NULL;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	SavedSearchDialogSearchRowContainer* _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	GtkComboBoxText* _tmp3_;
+	GtkComboBoxText* _tmp4_;
+	GtkComboBoxText* _tmp5_;
+	GtkComboBoxText* _tmp6_;
+	GtkComboBoxText* _tmp7_;
+	GtkComboBoxText* _tmp8_;
+	GtkComboBoxText* _tmp9_;
+	GtkCalendar* _tmp10_;
+	GtkCalendar* _tmp11_;
+	GtkButton* _tmp12_;
+	GtkButton* _tmp13_;
+	GtkButton* _tmp14_;
+	GtkButton* _tmp15_;
+	GtkLabel* _tmp16_;
+	GtkBox* _tmp17_;
+	GtkBox* _tmp18_;
+	GtkComboBoxText* _tmp19_;
+	GtkBox* _tmp20_;
+	GtkButton* _tmp21_;
+	GtkBox* _tmp22_;
+	GtkLabel* _tmp23_;
+	GtkBox* _tmp24_;
+	GtkButton* _tmp25_;
+	GtkBox* _tmp26_;
 #line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
 #line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5255,157 +5165,145 @@ static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_const
 #line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->context;
 #line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = _ ("is exactly");
-#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp3_, _tmp4_);
-#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->context;
+	gtk_combo_box_text_append_text (_tmp3_, _ ("is exactly"));
 #line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = _ ("is after");
+	_tmp4_ = self->priv->context;
 #line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp5_, _tmp6_);
-#line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = self->priv->context;
+	gtk_combo_box_text_append_text (_tmp4_, _ ("is after"));
 #line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = _ ("is before");
+	_tmp5_ = self->priv->context;
 #line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp7_, _tmp8_);
+	gtk_combo_box_text_append_text (_tmp5_, _ ("is before"));
 #line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = self->priv->context;
+	_tmp6_ = self->priv->context;
 #line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = _ ("is between");
-#line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp9_, _tmp10_);
-#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = self->priv->context;
+	gtk_combo_box_text_append_text (_tmp6_, _ ("is between"));
 #line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = _ ("is not set");
+	_tmp7_ = self->priv->context;
 #line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp11_, _tmp12_);
+	gtk_combo_box_text_append_text (_tmp7_, _ ("is not set"));
 #line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = self->priv->context;
+	_tmp8_ = self->priv->context;
 #line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp14_ = self->priv->context;
+	_tmp9_ = self->priv->context;
 #line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed, self);
 #line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp15_ = (GtkCalendar*) gtk_calendar_new ();
+	_tmp10_ = (GtkCalendar*) gtk_calendar_new ();
 #line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp15_);
+	g_object_ref_sink (_tmp10_);
 #line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->cal_one);
 #line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->cal_one = _tmp15_;
+	self->priv->cal_one = _tmp10_;
 #line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp16_ = (GtkCalendar*) gtk_calendar_new ();
+	_tmp11_ = (GtkCalendar*) gtk_calendar_new ();
 #line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp16_);
+	g_object_ref_sink (_tmp11_);
 #line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->cal_two);
 #line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->cal_two = _tmp16_;
+	self->priv->cal_two = _tmp11_;
 #line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp17_ = (GtkButton*) gtk_button_new ();
+	_tmp12_ = (GtkButton*) gtk_button_new ();
 #line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp17_);
+	g_object_ref_sink (_tmp12_);
 #line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->label_one);
 #line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->label_one = _tmp17_;
+	self->priv->label_one = _tmp12_;
 #line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp18_ = self->priv->label_one;
+	_tmp13_ = self->priv->label_one;
 #line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (_tmp18_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked, self);
+	g_signal_connect (_tmp13_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked, self);
 #line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = (GtkButton*) gtk_button_new ();
+	_tmp14_ = (GtkButton*) gtk_button_new ();
 #line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp19_);
+	g_object_ref_sink (_tmp14_);
 #line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->label_two);
 #line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->label_two = _tmp19_;
+	self->priv->label_two = _tmp14_;
 #line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp20_ = self->priv->label_two;
+	_tmp15_ = self->priv->label_two;
 #line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (_tmp20_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked, self);
-#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp21_ = _ ("and");
+	g_signal_connect (_tmp15_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked, self);
 #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = (GtkLabel*) gtk_label_new (_tmp21_);
+	_tmp16_ = (GtkLabel*) gtk_label_new (_ ("and"));
 #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp22_);
+	g_object_ref_sink (_tmp16_);
 #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->and);
 #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->and = _tmp22_;
+	self->priv->and = _tmp16_;
 #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+	_tmp17_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp23_);
+	g_object_ref_sink (_tmp17_);
 #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
 #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->box = _tmp23_;
+	self->priv->box = _tmp17_;
 #line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp24_ = self->priv->box;
+	_tmp18_ = self->priv->box;
 #line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp25_ = self->priv->context;
+	_tmp19_ = self->priv->context;
 #line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp26_ = self->priv->box;
+	_tmp20_ = self->priv->box;
 #line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp27_ = self->priv->label_one;
+	_tmp21_ = self->priv->label_one;
 #line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp28_ = self->priv->box;
+	_tmp22_ = self->priv->box;
 #line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp29_ = self->priv->and;
+	_tmp23_ = self->priv->and;
 #line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp30_ = self->priv->box;
+	_tmp24_ = self->priv->box;
 #line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp31_ = self->priv->label_two;
+	_tmp25_ = self->priv->label_two;
 #line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp32_ = self->priv->box;
+	_tmp26_ = self->priv->box;
 #line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
 #line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
 #line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 5384 "SavedSearchDialog.c"
+#line 5282 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_new (SavedSearchDialogSearchRowContainer* parent) {
 #line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_date_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, parent);
-#line 5391 "SavedSearchDialog.c"
+#line 5289 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchDialogSearchRowDate* self) {
 	SearchConditionDateContext c = 0;
-	GtkComboBoxText* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	SearchConditionDateContext _tmp2_ = 0;
-	GtkButton* _tmp13_ = NULL;
-	GDateTime* _tmp14_ = NULL;
-	GDateTime* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	GtkButton* _tmp18_ = NULL;
-	GDateTime* _tmp19_ = NULL;
-	GDateTime* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
+	GtkComboBoxText* _tmp0_;
+	gint _tmp1_;
+	SearchConditionDateContext _tmp2_;
+	GtkButton* _tmp13_;
+	GDateTime* _tmp14_;
+	GDateTime* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	GtkButton* _tmp18_;
+	GDateTime* _tmp19_;
+	GDateTime* _tmp20_;
+	gchar* _tmp21_;
+	gchar* _tmp22_;
 #line 526 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
 #line 527 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5418,10 +5316,10 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD
 	_tmp2_ = c;
 #line 530 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp2_ == SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) {
-#line 5422 "SavedSearchDialog.c"
-		GtkButton* _tmp3_ = NULL;
-		GtkLabel* _tmp4_ = NULL;
-		GtkButton* _tmp5_ = NULL;
+#line 5320 "SavedSearchDialog.c"
+		GtkButton* _tmp3_;
+		GtkLabel* _tmp4_;
+		GtkButton* _tmp5_;
 #line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->label_one;
 #line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5434,17 +5332,17 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD
 		_tmp5_ = self->priv->label_two;
 #line 533 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 5438 "SavedSearchDialog.c"
+#line 5336 "SavedSearchDialog.c"
 	} else {
-		SearchConditionDateContext _tmp6_ = 0;
+		SearchConditionDateContext _tmp6_;
 #line 534 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp6_ = c;
 #line 534 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp6_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET) {
-#line 5445 "SavedSearchDialog.c"
-			GtkButton* _tmp7_ = NULL;
-			GtkLabel* _tmp8_ = NULL;
-			GtkButton* _tmp9_ = NULL;
+#line 5343 "SavedSearchDialog.c"
+			GtkButton* _tmp7_;
+			GtkLabel* _tmp8_;
+			GtkButton* _tmp9_;
 #line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp7_ = self->priv->label_one;
 #line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5457,11 +5355,11 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD
 			_tmp9_ = self->priv->label_two;
 #line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 5461 "SavedSearchDialog.c"
+#line 5359 "SavedSearchDialog.c"
 		} else {
-			GtkButton* _tmp10_ = NULL;
-			GtkLabel* _tmp11_ = NULL;
-			GtkButton* _tmp12_ = NULL;
+			GtkButton* _tmp10_;
+			GtkLabel* _tmp11_;
+			GtkButton* _tmp12_;
 #line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp10_ = self->priv->label_one;
 #line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5474,7 +5372,7 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD
 			_tmp12_ = self->priv->label_two;
 #line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 5478 "SavedSearchDialog.c"
+#line 5376 "SavedSearchDialog.c"
 		}
 	}
 #line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5509,15 +5407,15 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD
 	_g_free0 (_tmp22_);
 #line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_date_time_unref0 (_tmp20_);
-#line 5513 "SavedSearchDialog.c"
+#line 5411 "SavedSearchDialog.c"
 }
 
 
 static GtkWidget* saved_search_dialog_search_row_date_real_get_widget (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowDate * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 549 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
 #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5528,22 +5426,22 @@ static GtkWidget* saved_search_dialog_search_row_date_real_get_widget (SavedSear
 	result = _tmp1_;
 #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5532 "SavedSearchDialog.c"
+#line 5430 "SavedSearchDialog.c"
 }
 
 
 static GDateTime* saved_search_dialog_search_row_date_get_date_one (SavedSearchDialogSearchRowDate* self) {
 	GDateTime* result = NULL;
-	GtkCalendar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	GtkCalendar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	GtkCalendar* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	GDateTime* _tmp9_ = NULL;
+	GtkCalendar* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	GtkCalendar* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	GtkCalendar* _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	GDateTime* _tmp9_;
 #line 553 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self), NULL);
 #line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5570,22 +5468,22 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_one (SavedSearchD
 	result = _tmp9_;
 #line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5574 "SavedSearchDialog.c"
+#line 5472 "SavedSearchDialog.c"
 }
 
 
 static GDateTime* saved_search_dialog_search_row_date_get_date_two (SavedSearchDialogSearchRowDate* self) {
 	GDateTime* result = NULL;
-	GtkCalendar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	GtkCalendar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	GtkCalendar* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	GDateTime* _tmp9_ = NULL;
+	GtkCalendar* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	GtkCalendar* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	GtkCalendar* _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	GDateTime* _tmp9_;
 #line 557 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self), NULL);
 #line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5612,20 +5510,20 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_two (SavedSearchD
 	result = _tmp9_;
 #line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5616 "SavedSearchDialog.c"
+#line 5514 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogSearchRowDate* self, GDateTime* date) {
-	GtkCalendar* _tmp0_ = NULL;
-	GDateTime* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	GtkCalendar* _tmp3_ = NULL;
-	GDateTime* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	GtkCalendar* _tmp6_ = NULL;
-	GDateTime* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
+	GtkCalendar* _tmp0_;
+	GDateTime* _tmp1_;
+	gint _tmp2_;
+	GtkCalendar* _tmp3_;
+	GDateTime* _tmp4_;
+	gint _tmp5_;
+	GtkCalendar* _tmp6_;
+	GDateTime* _tmp7_;
+	gint _tmp8_;
 #line 561 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
 #line 561 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5654,20 +5552,20 @@ static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogS
 	_tmp8_ = g_date_time_get_year (_tmp7_);
 #line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp6_, "year", _tmp8_, NULL);
-#line 5658 "SavedSearchDialog.c"
+#line 5556 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogSearchRowDate* self, GDateTime* date) {
-	GtkCalendar* _tmp0_ = NULL;
-	GDateTime* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	GtkCalendar* _tmp3_ = NULL;
-	GDateTime* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	GtkCalendar* _tmp6_ = NULL;
-	GDateTime* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
+	GtkCalendar* _tmp0_;
+	GDateTime* _tmp1_;
+	gint _tmp2_;
+	GtkCalendar* _tmp3_;
+	GDateTime* _tmp4_;
+	gint _tmp5_;
+	GtkCalendar* _tmp6_;
+	GDateTime* _tmp7_;
+	gint _tmp8_;
 #line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
 #line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5696,7 +5594,7 @@ static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogS
 	_tmp8_ = g_date_time_get_year (_tmp7_);
 #line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp6_, "year", _tmp8_, NULL);
-#line 5700 "SavedSearchDialog.c"
+#line 5598 "SavedSearchDialog.c"
 }
 
 
@@ -5704,18 +5602,18 @@ static SearchCondition* saved_search_dialog_search_row_date_real_get_search_cond
 	SavedSearchDialogSearchRowDate * self;
 	SearchCondition* result = NULL;
 	SearchConditionSearchType search_type = 0;
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	SearchConditionSearchType _tmp1_ = 0;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	SearchConditionSearchType _tmp1_;
 	SearchConditionDateContext search_context = 0;
-	GtkComboBoxText* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	GtkComboBoxText* _tmp2_;
+	gint _tmp3_;
 	SearchConditionDate* c = NULL;
-	GDateTime* _tmp4_ = NULL;
-	GDateTime* _tmp5_ = NULL;
-	GDateTime* _tmp6_ = NULL;
-	GDateTime* _tmp7_ = NULL;
-	SearchConditionDate* _tmp8_ = NULL;
-	SearchConditionDate* _tmp9_ = NULL;
+	GDateTime* _tmp4_;
+	GDateTime* _tmp5_;
+	GDateTime* _tmp6_;
+	GDateTime* _tmp7_;
+	SearchConditionDate* _tmp8_;
+	SearchConditionDate* _tmp9_;
 #line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
 #line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5752,22 +5650,22 @@ static SearchCondition* saved_search_dialog_search_row_date_real_get_search_cond
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 578 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5756 "SavedSearchDialog.c"
+#line 5654 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) {
 	SavedSearchDialogSearchRowDate * self;
 	SearchConditionDate* cond = NULL;
-	SearchCondition* _tmp0_ = NULL;
-	SearchConditionDate* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
-	SearchConditionDateContext _tmp3_ = 0;
-	SearchConditionDateContext _tmp4_ = 0;
-	GDateTime* _tmp5_ = NULL;
-	GDateTime* _tmp6_ = NULL;
-	GDateTime* _tmp7_ = NULL;
-	GDateTime* _tmp8_ = NULL;
+	SearchCondition* _tmp0_;
+	SearchConditionDate* _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	SearchConditionDateContext _tmp3_;
+	SearchConditionDateContext _tmp4_;
+	GDateTime* _tmp5_;
+	GDateTime* _tmp6_;
+	GDateTime* _tmp7_;
+	GDateTime* _tmp8_;
 #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
 #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5804,7 +5702,7 @@ static void saved_search_dialog_search_row_date_real_populate (SavedSearchDialog
 	saved_search_dialog_search_row_date_update_date_labels (self);
 #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (cond);
-#line 5808 "SavedSearchDialog.c"
+#line 5706 "SavedSearchDialog.c"
 }
 
 
@@ -5817,13 +5715,13 @@ static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearc
 	result = TRUE;
 #line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5821 "SavedSearchDialog.c"
+#line 5719 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSearchRowDate* self) {
-	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-	SavedSearchDialogSearchRowContainer* _tmp1_ = NULL;
+	SavedSearchDialogSearchRowContainer* _tmp0_;
+	SavedSearchDialogSearchRowContainer* _tmp1_;
 #line 594 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
 #line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5831,10 +5729,10 @@ static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSea
 #line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
 #line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
+	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
 #line 596 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 5838 "SavedSearchDialog.c"
+#line 5736 "SavedSearchDialog.c"
 }
 
 
@@ -5843,7 +5741,7 @@ static Block10Data* block10_data_ref (Block10Data* _data10_) {
 	g_atomic_int_inc (&_data10_->_ref_count_);
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return _data10_;
-#line 5847 "SavedSearchDialog.c"
+#line 5745 "SavedSearchDialog.c"
 }
 
 
@@ -5852,7 +5750,7 @@ static void block10_data_unref (void * _userdata_) {
 	_data10_ = (Block10Data*) _userdata_;
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (g_atomic_int_dec_and_test (&_data10_->_ref_count_)) {
-#line 5856 "SavedSearchDialog.c"
+#line 5754 "SavedSearchDialog.c"
 		SavedSearchDialogSearchRowDate* self;
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		self = _data10_->self;
@@ -5862,7 +5760,7 @@ static void block10_data_unref (void * _userdata_) {
 		_saved_search_dialog_search_row_unref0 (self);
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_slice_free (Block10Data, _data10_);
-#line 5866 "SavedSearchDialog.c"
+#line 5764 "SavedSearchDialog.c"
 	}
 }
 
@@ -5870,74 +5768,74 @@ static void block10_data_unref (void * _userdata_) {
 static void __lambda13_ (SavedSearchDialogSearchRowDate* self) {
 #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 5874 "SavedSearchDialog.c"
+#line 5772 "SavedSearchDialog.c"
 }
 
 
 static void ___lambda13__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
 #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	__lambda13_ ((SavedSearchDialogSearchRowDate*) self);
-#line 5881 "SavedSearchDialog.c"
+#line 5779 "SavedSearchDialog.c"
 }
 
 
 static void __lambda14_ (Block10Data* _data10_) {
 	SavedSearchDialogSearchRowDate* self;
-	GtkDialog* _tmp0_ = NULL;
+	GtkDialog* _tmp0_;
 #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = _data10_->self;
 #line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = _data10_->d;
 #line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_dialog_response (_tmp0_, (gint) GTK_RESPONSE_ACCEPT);
-#line 5894 "SavedSearchDialog.c"
+#line 5792 "SavedSearchDialog.c"
 }
 
 
 static void ___lambda14__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) {
 #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	__lambda14_ (self);
-#line 5901 "SavedSearchDialog.c"
+#line 5799 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialogSearchRowDate* self, GtkCalendar* cal) {
 	Block10Data* _data10_;
 	gint orig_day = 0;
-	GtkCalendar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GtkCalendar* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gint orig_month = 0;
-	GtkCalendar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	GtkCalendar* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 	gint orig_year = 0;
-	GtkCalendar* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	GtkDialog* _tmp9_ = NULL;
-	GtkDialog* _tmp10_ = NULL;
-	GtkDialog* _tmp11_ = NULL;
-	GtkDialog* _tmp12_ = NULL;
-	GtkDialog* _tmp13_ = NULL;
-	GtkBox* _tmp14_ = NULL;
-	GtkCalendar* _tmp15_ = NULL;
+	GtkCalendar* _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	GtkDialog* _tmp9_;
+	GtkDialog* _tmp10_;
+	GtkDialog* _tmp11_;
+	GtkDialog* _tmp12_;
+	GtkDialog* _tmp13_;
+	GtkBox* _tmp14_;
+	GtkCalendar* _tmp15_;
 	gulong id_1 = 0UL;
-	GtkCalendar* _tmp16_ = NULL;
-	gulong _tmp17_ = 0UL;
+	GtkCalendar* _tmp16_;
+	gulong _tmp17_;
 	gulong id_2 = 0UL;
-	GtkCalendar* _tmp18_ = NULL;
-	gulong _tmp19_ = 0UL;
-	GtkDialog* _tmp20_ = NULL;
+	GtkCalendar* _tmp18_;
+	gulong _tmp19_;
+	GtkDialog* _tmp20_;
 	gint res = 0;
-	GtkDialog* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	gint _tmp23_ = 0;
-	GtkCalendar* _tmp30_ = NULL;
-	gulong _tmp31_ = 0UL;
-	GtkCalendar* _tmp32_ = NULL;
-	gulong _tmp33_ = 0UL;
-	GtkDialog* _tmp34_ = NULL;
+	GtkDialog* _tmp21_;
+	gint _tmp22_;
+	gint _tmp23_;
+	GtkCalendar* _tmp30_;
+	gulong _tmp31_;
+	GtkCalendar* _tmp32_;
+	gulong _tmp33_;
+	GtkDialog* _tmp34_;
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -6024,13 +5922,13 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo
 	_tmp23_ = res;
 #line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp23_ != ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 6028 "SavedSearchDialog.c"
-		GtkCalendar* _tmp24_ = NULL;
-		gint _tmp25_ = 0;
-		GtkCalendar* _tmp26_ = NULL;
-		gint _tmp27_ = 0;
-		GtkCalendar* _tmp28_ = NULL;
-		gint _tmp29_ = 0;
+#line 5926 "SavedSearchDialog.c"
+		GtkCalendar* _tmp24_;
+		gint _tmp25_;
+		GtkCalendar* _tmp26_;
+		gint _tmp27_;
+		GtkCalendar* _tmp28_;
+		gint _tmp29_;
 #line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp24_ = cal;
 #line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -6049,7 +5947,7 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo
 		_tmp29_ = orig_year;
 #line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_object_set (_tmp28_, "year", _tmp29_, NULL);
-#line 6053 "SavedSearchDialog.c"
+#line 5951 "SavedSearchDialog.c"
 	}
 #line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp30_ = cal;
@@ -6073,31 +5971,31 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo
 	block10_data_unref (_data10_);
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data10_ = NULL;
-#line 6077 "SavedSearchDialog.c"
+#line 5975 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_on_one_clicked (SavedSearchDialogSearchRowDate* self) {
-	GtkCalendar* _tmp0_ = NULL;
+	GtkCalendar* _tmp0_;
 #line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
 #line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_one;
 #line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_);
-#line 6089 "SavedSearchDialog.c"
+#line 5987 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_on_two_clicked (SavedSearchDialogSearchRowDate* self) {
-	GtkCalendar* _tmp0_ = NULL;
+	GtkCalendar* _tmp0_;
 #line 632 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
 #line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_two;
 #line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_);
-#line 6101 "SavedSearchDialog.c"
+#line 5999 "SavedSearchDialog.c"
 }
 
 
@@ -6109,28 +6007,28 @@ static void saved_search_dialog_search_row_date_class_init (SavedSearchDialogSea
 #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowDatePrivate));
 #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_date_real_get_widget;
+	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_get_widget;
 #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_date_real_get_search_condition;
+	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_get_search_condition;
 #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_date_real_populate;
+	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_date_real_populate;
 #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_date_real_is_complete;
-#line 6120 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_is_complete;
+#line 6018 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_instance_init (SavedSearchDialogSearchRowDate * self) {
 #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_GET_PRIVATE (self);
-#line 6127 "SavedSearchDialog.c"
+#line 6025 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow* obj) {
+static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow * obj) {
 	SavedSearchDialogSearchRowDate * self;
-	GtkComboBoxText* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	GtkComboBoxText* _tmp0_;
+	guint _tmp1_;
 #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
 #line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -6157,7 +6055,7 @@ static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearc
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_date_parent_class)->finalize (obj);
-#line 6161 "SavedSearchDialog.c"
+#line 6059 "SavedSearchDialog.c"
 }
 
 
@@ -6176,7 +6074,7 @@ static GType saved_search_dialog_search_row_date_get_type (void) {
 static void value_saved_search_dialog_init (GValue* value) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	value->data[0].v_pointer = NULL;
-#line 6180 "SavedSearchDialog.c"
+#line 6078 "SavedSearchDialog.c"
 }
 
 
@@ -6185,7 +6083,7 @@ static void value_saved_search_dialog_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_unref (value->data[0].v_pointer);
-#line 6189 "SavedSearchDialog.c"
+#line 6087 "SavedSearchDialog.c"
 	}
 }
 
@@ -6195,11 +6093,11 @@ static void value_saved_search_dialog_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = saved_search_dialog_ref (src_value->data[0].v_pointer);
-#line 6199 "SavedSearchDialog.c"
+#line 6097 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6203 "SavedSearchDialog.c"
+#line 6101 "SavedSearchDialog.c"
 	}
 }
 
@@ -6207,66 +6105,66 @@ static void value_saved_search_dialog_copy_value (const GValue* src_value, GValu
 static gpointer value_saved_search_dialog_peek_pointer (const GValue* value) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 6211 "SavedSearchDialog.c"
+#line 6109 "SavedSearchDialog.c"
 }
 
 
 static gchar* value_saved_search_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (collect_values[0].v_pointer) {
-#line 6218 "SavedSearchDialog.c"
-		SavedSearchDialog* object;
+#line 6116 "SavedSearchDialog.c"
+		SavedSearchDialog * object;
 		object = collect_values[0].v_pointer;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6225 "SavedSearchDialog.c"
+#line 6123 "SavedSearchDialog.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6229 "SavedSearchDialog.c"
+#line 6127 "SavedSearchDialog.c"
 		}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = saved_search_dialog_ref (object);
-#line 6233 "SavedSearchDialog.c"
+#line 6131 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 6237 "SavedSearchDialog.c"
+#line 6135 "SavedSearchDialog.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 6241 "SavedSearchDialog.c"
+#line 6139 "SavedSearchDialog.c"
 }
 
 
 static gchar* value_saved_search_dialog_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SavedSearchDialog** object_p;
+	SavedSearchDialog ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!object_p) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6252 "SavedSearchDialog.c"
+#line 6150 "SavedSearchDialog.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = NULL;
-#line 6258 "SavedSearchDialog.c"
+#line 6156 "SavedSearchDialog.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6262 "SavedSearchDialog.c"
+#line 6160 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = saved_search_dialog_ref (value->data[0].v_pointer);
-#line 6266 "SavedSearchDialog.c"
+#line 6164 "SavedSearchDialog.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 6270 "SavedSearchDialog.c"
+#line 6168 "SavedSearchDialog.c"
 }
 
 
@@ -6280,7 +6178,7 @@ GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return G_PARAM_SPEC (spec);
-#line 6284 "SavedSearchDialog.c"
+#line 6182 "SavedSearchDialog.c"
 }
 
 
@@ -6289,12 +6187,12 @@ gpointer value_get_saved_search_dialog (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_DIALOG), NULL);
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 6293 "SavedSearchDialog.c"
+#line 6191 "SavedSearchDialog.c"
 }
 
 
 void value_set_saved_search_dialog (GValue* value, gpointer v_object) {
-	SavedSearchDialog* old;
+	SavedSearchDialog * old;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_DIALOG));
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -6309,23 +6207,23 @@ void value_set_saved_search_dialog (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_ref (value->data[0].v_pointer);
-#line 6313 "SavedSearchDialog.c"
+#line 6211 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 6317 "SavedSearchDialog.c"
+#line 6215 "SavedSearchDialog.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_unref (old);
-#line 6323 "SavedSearchDialog.c"
+#line 6221 "SavedSearchDialog.c"
 	}
 }
 
 
 void value_take_saved_search_dialog (GValue* value, gpointer v_object) {
-	SavedSearchDialog* old;
+	SavedSearchDialog * old;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_DIALOG));
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -6338,17 +6236,17 @@ void value_take_saved_search_dialog (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 6342 "SavedSearchDialog.c"
+#line 6240 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 6346 "SavedSearchDialog.c"
+#line 6244 "SavedSearchDialog.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_unref (old);
-#line 6352 "SavedSearchDialog.c"
+#line 6250 "SavedSearchDialog.c"
 	}
 }
 
@@ -6360,12 +6258,12 @@ static void saved_search_dialog_class_init (SavedSearchDialogClass * klass) {
 	((SavedSearchDialogClass *) klass)->finalize = saved_search_dialog_finalize;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogPrivate));
-#line 6364 "SavedSearchDialog.c"
+#line 6262 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_instance_init (SavedSearchDialog * self) {
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_GET_PRIVATE (self);
 #line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -6380,14 +6278,14 @@ static void saved_search_dialog_instance_init (SavedSearchDialog * self) {
 	self->priv->valid = FALSE;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->ref_count = 1;
-#line 6384 "SavedSearchDialog.c"
+#line 6282 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_finalize (SavedSearchDialog* obj) {
+static void saved_search_dialog_finalize (SavedSearchDialog * obj) {
 	SavedSearchDialog * self;
-	GtkEntry* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	GtkEntry* _tmp0_;
+	guint _tmp1_;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_DIALOG, SavedSearchDialog);
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -6414,7 +6312,7 @@ static void saved_search_dialog_finalize (SavedSearchDialog* obj) {
 	_g_object_unref0 (self->priv->row_list);
 #line 645 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->previous_search);
-#line 6418 "SavedSearchDialog.c"
+#line 6316 "SavedSearchDialog.c"
 }
 
 
@@ -6433,18 +6331,18 @@ GType saved_search_dialog_get_type (void) {
 
 
 gpointer saved_search_dialog_ref (gpointer instance) {
-	SavedSearchDialog* self;
+	SavedSearchDialog * self;
 	self = instance;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return instance;
-#line 6443 "SavedSearchDialog.c"
+#line 6341 "SavedSearchDialog.c"
 }
 
 
 void saved_search_dialog_unref (gpointer instance) {
-	SavedSearchDialog* self;
+	SavedSearchDialog * self;
 	self = instance;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -6452,7 +6350,7 @@ void saved_search_dialog_unref (gpointer instance) {
 		SAVED_SEARCH_DIALOG_GET_CLASS (self)->finalize (self);
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6456 "SavedSearchDialog.c"
+#line 6354 "SavedSearchDialog.c"
 	}
 }
 
diff --git a/src/searches/SavedSearchPage.c b/src/searches/SavedSearchPage.c
index 2f44fd0..92f433b 100644
--- a/src/searches/SavedSearchPage.c
+++ b/src/searches/SavedSearchPage.c
@@ -1,4 +1,4 @@
-/* SavedSearchPage.c generated by valac 0.34.7, the Vala compiler
+/* SavedSearchPage.c generated by valac 0.36.6, the Vala compiler
  * generated from SavedSearchPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -690,7 +690,7 @@ static gboolean saved_search_manager_real_include_in_view (ViewManager* base, Da
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 gboolean saved_search_predicate (SavedSearch* self, MediaSource* source);
-static void saved_search_manager_finalize (ViewManager* obj);
+static void saved_search_manager_finalize (ViewManager * obj);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType fullscreen_window_get_type (void) G_GNUC_CONST;
 gpointer injection_group_ref (gpointer instance);
@@ -821,7 +821,7 @@ void saved_search_dialog_show (SavedSearchDialog* self);
 static void saved_search_page_real_update_actions (Page* base, gint selected_count, gint count);
 void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
 void page_update_actions (Page* self, gint selected_count, gint count);
-static void saved_search_page_finalize (GObject* obj);
+static void saved_search_page_finalize (GObject * obj);
 
 static const GActionEntry SAVED_SEARCH_PAGE_entries[3] = {{"RenameSearch", _saved_search_page_on_rename_search_gsimple_action_activate_callback}, {"EditSearch", _saved_search_page_on_edit_search_gsimple_action_activate_callback}, {"DeleteSearch", _saved_search_page_on_delete_search_gsimple_action_activate_callback}};
 
@@ -834,9 +834,9 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 SavedSearchManager* saved_search_manager_construct (GType object_type, SavedSearchPage* owner, SavedSearch* search) {
 	SavedSearchManager* self = NULL;
-	SavedSearchPage* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
-	SavedSearch* _tmp2_ = NULL;
+	SavedSearchPage* _tmp0_;
+	SavedSearch* _tmp1_;
+	SavedSearch* _tmp2_;
 #line 10 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_PAGE (owner), NULL);
 #line 10 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -869,9 +869,9 @@ SavedSearchManager* saved_search_manager_new (SavedSearchPage* owner, SavedSearc
 static gboolean saved_search_manager_real_include_in_view (ViewManager* base, DataSource* source) {
 	SavedSearchManager * self;
 	gboolean result = FALSE;
-	SavedSearch* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	SavedSearch* _tmp0_;
+	DataSource* _tmp1_;
+	gboolean _tmp2_;
 #line 15 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_MANAGER, SavedSearchManager);
 #line 15 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -898,7 +898,7 @@ static void saved_search_manager_class_init (SavedSearchManagerClass * klass) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchManagerPrivate));
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) saved_search_manager_real_include_in_view;
+	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) saved_search_manager_real_include_in_view;
 #line 903 "SavedSearchPage.c"
 }
 
@@ -910,7 +910,7 @@ static void saved_search_manager_instance_init (SavedSearchManager * self) {
 }
 
 
-static void saved_search_manager_finalize (ViewManager* obj) {
+static void saved_search_manager_finalize (ViewManager * obj) {
 	SavedSearchManager * self;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_MANAGER, SavedSearchManager);
@@ -957,11 +957,11 @@ static void _saved_search_page_on_delete_search_gsimple_action_activate_callback
 
 SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* search) {
 	SavedSearchPage * self = NULL;
-	SavedSearch* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	SavedSearch* _tmp3_ = NULL;
-	SavedSearch* _tmp4_ = NULL;
+	SavedSearch* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	SavedSearch* _tmp3_;
+	SavedSearch* _tmp4_;
 #line 26 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
 #line 27 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -985,12 +985,12 @@ SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* se
 #line 986 "SavedSearchPage.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		MediaCollectionRegistry* _tmp5_ = NULL;
-		MediaCollectionRegistry* _tmp6_ = NULL;
-		GeeCollection* _tmp7_ = NULL;
-		GeeCollection* _tmp8_ = NULL;
-		GeeIterator* _tmp9_ = NULL;
-		GeeIterator* _tmp10_ = NULL;
+		MediaCollectionRegistry* _tmp5_;
+		MediaCollectionRegistry* _tmp6_;
+		GeeCollection* _tmp7_;
+		GeeCollection* _tmp8_;
+		GeeIterator* _tmp9_;
+		GeeIterator* _tmp10_;
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_tmp5_ = media_collection_registry_get_instance ();
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1012,19 +1012,19 @@ SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* se
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		while (TRUE) {
 #line 1015 "SavedSearchPage.c"
-			GeeIterator* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
+			GeeIterator* _tmp11_;
+			gboolean _tmp12_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp13_ = NULL;
-			gpointer _tmp14_ = NULL;
-			ViewCollection* _tmp15_ = NULL;
-			ViewCollection* _tmp16_ = NULL;
-			MediaSourceCollection* _tmp17_ = NULL;
-			SavedSearch* _tmp18_ = NULL;
-			SavedSearchManager* _tmp19_ = NULL;
-			SavedSearchManager* _tmp20_ = NULL;
-			ViewCollectionMonitor* _tmp21_ = NULL;
-			ViewCollectionMonitor* _tmp22_ = NULL;
+			GeeIterator* _tmp13_;
+			gpointer _tmp14_;
+			ViewCollection* _tmp15_;
+			ViewCollection* _tmp16_;
+			MediaSourceCollection* _tmp17_;
+			SavedSearch* _tmp18_;
+			SavedSearchManager* _tmp19_;
+			SavedSearchManager* _tmp20_;
+			ViewCollectionMonitor* _tmp21_;
+			ViewCollectionMonitor* _tmp22_;
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 			_tmp11_ = _sources_it;
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1090,8 +1090,8 @@ static void saved_search_page_real_get_config_photos_sort (MediaPage* base, gboo
 	SavedSearchPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
 #line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1125,10 +1125,10 @@ static void saved_search_page_real_get_config_photos_sort (MediaPage* base, gboo
 
 static void saved_search_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
 	SavedSearchPage * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gint _tmp3_;
 #line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
 #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1149,8 +1149,8 @@ static void saved_search_page_real_set_config_photos_sort (MediaPage* base, gboo
 
 static void saved_search_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	SavedSearchPage * self;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
 #line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
 #line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1169,8 +1169,8 @@ static void saved_search_page_real_init_collect_ui_filenames (Page* base, GeeLis
 
 static void saved_search_page_real_add_actions (Page* base, GActionMap* map) {
 	SavedSearchPage * self;
-	GActionMap* _tmp0_ = NULL;
-	GActionMap* _tmp1_ = NULL;
+	GActionMap* _tmp0_;
+	GActionMap* _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
 #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1189,7 +1189,7 @@ static void saved_search_page_real_add_actions (Page* base, GActionMap* map) {
 
 static void saved_search_page_real_remove_actions (Page* base, GActionMap* map) {
 	SavedSearchPage * self;
-	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp0_;
 #line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
 #line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1216,9 +1216,9 @@ static void saved_search_page_real_remove_actions (Page* base, GActionMap* map)
 			entry = entry_collection[entry_it];
 #line 1218 "SavedSearchPage.c"
 			{
-				GActionMap* _tmp1_ = NULL;
-				GActionEntry _tmp2_ = {0};
-				const gchar* _tmp3_ = NULL;
+				GActionMap* _tmp1_;
+				GActionEntry _tmp2_;
+				const gchar* _tmp3_;
 #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 				_tmp1_ = map;
 #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1235,8 +1235,8 @@ static void saved_search_page_real_remove_actions (Page* base, GActionMap* map)
 
 
 static void saved_search_page_on_delete_search (SavedSearchPage* self) {
-	SavedSearch* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SavedSearch* _tmp0_;
+	gboolean _tmp1_;
 #line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_PAGE (self));
 #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1246,11 +1246,11 @@ static void saved_search_page_on_delete_search (SavedSearchPage* self) {
 #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	if (_tmp1_) {
 #line 1249 "SavedSearchPage.c"
-		CommandManager* _tmp2_ = NULL;
-		CommandManager* _tmp3_ = NULL;
-		SavedSearch* _tmp4_ = NULL;
-		DeleteSavedSearchCommand* _tmp5_ = NULL;
-		DeleteSavedSearchCommand* _tmp6_ = NULL;
+		CommandManager* _tmp2_;
+		CommandManager* _tmp3_;
+		SavedSearch* _tmp4_;
+		DeleteSavedSearchCommand* _tmp5_;
+		DeleteSavedSearchCommand* _tmp6_;
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_tmp2_ = app_window_get_command_manager ();
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1273,9 +1273,9 @@ static void saved_search_page_on_delete_search (SavedSearchPage* self) {
 
 
 static void saved_search_page_on_rename_search (SavedSearchPage* self) {
-	LibraryWindow* _tmp0_ = NULL;
-	LibraryWindow* _tmp1_ = NULL;
-	SavedSearch* _tmp2_ = NULL;
+	LibraryWindow* _tmp0_;
+	LibraryWindow* _tmp1_;
+	SavedSearch* _tmp2_;
 #line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_PAGE (self));
 #line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1294,8 +1294,8 @@ static void saved_search_page_on_rename_search (SavedSearchPage* self) {
 
 static void saved_search_page_on_edit_search (SavedSearchPage* self) {
 	SavedSearchDialog* ssd = NULL;
-	SavedSearch* _tmp0_ = NULL;
-	SavedSearchDialog* _tmp1_ = NULL;
+	SavedSearch* _tmp0_;
+	SavedSearchDialog* _tmp1_;
 #line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_PAGE (self));
 #line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1314,8 +1314,8 @@ static void saved_search_page_on_edit_search (SavedSearchPage* self) {
 
 static void saved_search_page_real_update_actions (Page* base, gint selected_count, gint count) {
 	SavedSearchPage * self;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 84 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
 #line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1340,17 +1340,17 @@ static void saved_search_page_class_init (SavedSearchPageClass * klass) {
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchPagePrivate));
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) saved_search_page_real_get_config_photos_sort;
+	((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) saved_search_page_real_get_config_photos_sort;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) saved_search_page_real_set_config_photos_sort;
+	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) saved_search_page_real_set_config_photos_sort;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) saved_search_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) saved_search_page_real_init_collect_ui_filenames;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) saved_search_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) saved_search_page_real_add_actions;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) saved_search_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) saved_search_page_real_remove_actions;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) saved_search_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) saved_search_page_real_update_actions;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = saved_search_page_finalize;
 #line 1357 "SavedSearchPage.c"
@@ -1364,7 +1364,7 @@ static void saved_search_page_instance_init (SavedSearchPage * self) {
 }
 
 
-static void saved_search_page_finalize (GObject* obj) {
+static void saved_search_page_finalize (GObject * obj) {
 	SavedSearchPage * self;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c
index 86c96d0..a32204d 100644
--- a/src/searches/SearchBoolean.c
+++ b/src/searches/SearchBoolean.c
@@ -1,4 +1,4 @@
-/* SearchBoolean.c generated by valac 0.34.7, the Vala compiler
+/* SearchBoolean.c generated by valac 0.36.6, the Vala compiler
  * generated from SearchBoolean.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -405,6 +405,12 @@ typedef struct _LibraryWindow LibraryWindow;
 typedef struct _LibraryWindowClass LibraryWindowClass;
 typedef struct _SavedSearchTablePrivate SavedSearchTablePrivate;
 typedef struct _ParamSpecSavedSearchTable ParamSpecSavedSearchTable;
+enum  {
+	SAVED_SEARCH_TABLE_SEARCH_ADDED_SIGNAL,
+	SAVED_SEARCH_TABLE_SEARCH_REMOVED_SIGNAL,
+	SAVED_SEARCH_TABLE_LAST_SIGNAL
+};
+static guint saved_search_table_signals[SAVED_SEARCH_TABLE_LAST_SIGNAL] = {0};
 
 typedef enum  {
 	SEARCH_OPERATOR_ANY = 0,
@@ -753,7 +759,7 @@ static gboolean search_condition_real_predicate (SearchCondition* self, MediaSou
 SearchCondition* search_condition_construct (GType object_type);
 SearchConditionSearchType search_condition_get_search_type (SearchCondition* self);
 void search_condition_set_search_type (SearchCondition* self, SearchConditionSearchType value);
-static void search_condition_finalize (SearchCondition* obj);
+static void search_condition_finalize (SearchCondition * obj);
 GType search_condition_text_get_type (void) G_GNUC_CONST;
 GType search_condition_text_context_get_type (void) G_GNUC_CONST;
 #define SEARCH_CONDITION_TEXT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_TEXT, SearchConditionTextPrivate))
@@ -793,7 +799,7 @@ Event* media_source_get_event (MediaSource* self);
 gchar* data_object_get_name (DataObject* self);
 gchar* media_source_get_comment (MediaSource* self);
 gchar* media_source_get_basename (MediaSource* self);
-static void search_condition_text_finalize (SearchCondition* obj);
+static void search_condition_text_finalize (SearchCondition * obj);
 GType search_condition_media_type_get_type (void) G_GNUC_CONST;
 GType search_condition_media_type_media_type_get_type (void) G_GNUC_CONST;
 GType search_condition_media_type_context_get_type (void) G_GNUC_CONST;
@@ -817,7 +823,7 @@ SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchC
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 PhotoFileFormat photo_get_master_file_format (Photo* self);
 GType video_source_get_type (void) G_GNUC_CONST;
-static void search_condition_media_type_finalize (SearchCondition* obj);
+static void search_condition_media_type_finalize (SearchCondition * obj);
 GType search_condition_flagged_get_type (void) G_GNUC_CONST;
 GType search_condition_flagged_state_get_type (void) G_GNUC_CONST;
 #define SEARCH_CONDITION_FLAGGED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_FLAGGED, SearchConditionFlaggedPrivate))
@@ -833,7 +839,7 @@ static gboolean search_condition_flagged_real_predicate (SearchCondition* base,
 SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionFlagged* self);
 GType flaggable_get_type (void) G_GNUC_CONST;
 gboolean flaggable_is_flagged (Flaggable* self);
-static void search_condition_flagged_finalize (SearchCondition* obj);
+static void search_condition_flagged_finalize (SearchCondition * obj);
 GType search_condition_modified_get_type (void) G_GNUC_CONST;
 GType search_condition_modified_state_get_type (void) G_GNUC_CONST;
 GType search_condition_modified_context_get_type (void) G_GNUC_CONST;
@@ -854,7 +860,7 @@ SearchConditionModifiedState search_condition_modified_get_state (SearchConditio
 gboolean photo_has_transformations (Photo* self);
 gboolean photo_has_editable (Photo* self);
 SearchConditionModifiedContext search_condition_modified_get_context (SearchConditionModified* self);
-static void search_condition_modified_finalize (SearchCondition* obj);
+static void search_condition_modified_finalize (SearchCondition * obj);
 GType search_condition_rating_get_type (void) G_GNUC_CONST;
 GType rating_get_type (void) G_GNUC_CONST;
 GType search_condition_rating_context_get_type (void) G_GNUC_CONST;
@@ -872,7 +878,7 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M
 Rating media_source_get_rating (MediaSource* self);
 SearchConditionRatingContext search_condition_rating_get_context (SearchConditionRating* self);
 Rating search_condition_rating_get_rating (SearchConditionRating* self);
-static void search_condition_rating_finalize (SearchCondition* obj);
+static void search_condition_rating_finalize (SearchCondition * obj);
 GType search_condition_date_get_type (void) G_GNUC_CONST;
 GType search_condition_date_context_get_type (void) G_GNUC_CONST;
 #define SEARCH_CONDITION_DATE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_DATE, SearchConditionDatePrivate))
@@ -891,7 +897,7 @@ time_t media_source_get_exposure_time (MediaSource* self);
 SearchConditionDateContext search_condition_date_get_context (SearchConditionDate* self);
 GDateTime* search_condition_date_get_date_one (SearchConditionDate* self);
 GDateTime* search_condition_date_get_date_two (SearchConditionDate* self);
-static void search_condition_date_finalize (SearchCondition* obj);
+static void search_condition_date_finalize (SearchCondition * obj);
 gpointer alteration_ref (gpointer instance);
 void alteration_unref (gpointer instance);
 GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -974,7 +980,7 @@ LibraryWindow* library_window_get_app (void);
 void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* search);
 GeeList* saved_search_get_conditions (SavedSearch* self);
 SearchOperator saved_search_get_operator (SavedSearch* self);
-static void saved_search_finalize (GObject* obj);
+static void saved_search_finalize (GObject * obj);
 #define SAVED_SEARCH_TABLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SAVED_SEARCH_TABLE, SavedSearchTablePrivate))
 enum  {
 	SAVED_SEARCH_TABLE_DUMMY_PROPERTY
@@ -992,7 +998,7 @@ GeeIterable* saved_search_table_get_saved_searches (SavedSearchTable* self);
 gint saved_search_table_get_count (SavedSearchTable* self);
 gchar* saved_search_table_generate_unique_name (SavedSearchTable* self);
 #define RESOURCES_DEFAULT_SAVED_SEARCH_NAME _ ("Saved Search")
-static void saved_search_table_finalize (SavedSearchTable* obj);
+static void saved_search_table_finalize (SavedSearchTable * obj);
 
 
 gchar* search_operator_to_string (SearchOperator self) {
@@ -1001,48 +1007,48 @@ gchar* search_operator_to_string (SearchOperator self) {
 	switch (self) {
 #line 14 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_OPERATOR_ANY:
-#line 1005 "SearchBoolean.c"
+#line 1011 "SearchBoolean.c"
 		{
-			gchar* _tmp0_ = NULL;
+			gchar* _tmp0_;
 #line 16 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp0_ = g_strdup ("ANY");
 #line 16 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp0_;
 #line 16 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1014 "SearchBoolean.c"
+#line 1020 "SearchBoolean.c"
 		}
 #line 14 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_OPERATOR_ALL:
-#line 1018 "SearchBoolean.c"
+#line 1024 "SearchBoolean.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 19 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp1_ = g_strdup ("ALL");
 #line 19 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp1_;
 #line 19 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1027 "SearchBoolean.c"
+#line 1033 "SearchBoolean.c"
 		}
 #line 14 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_OPERATOR_NONE:
-#line 1031 "SearchBoolean.c"
+#line 1037 "SearchBoolean.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 22 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp2_ = g_strdup ("NONE");
 #line 22 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp2_;
 #line 22 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1040 "SearchBoolean.c"
+#line 1046 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 25 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:25: unrecognized search operator enumeration value");
-#line 1046 "SearchBoolean.c"
+#line 1052 "SearchBoolean.c"
 		}
 	}
 }
@@ -1050,7 +1056,7 @@ gchar* search_operator_to_string (SearchOperator self) {
 
 SearchOperator search_operator_from_string (const gchar* str) {
 	SearchOperator result = 0;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 29 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 30 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1061,9 +1067,9 @@ SearchOperator search_operator_from_string (const gchar* str) {
 		result = SEARCH_OPERATOR_ANY;
 #line 31 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 1065 "SearchBoolean.c"
+#line 1071 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_ = NULL;
+		const gchar* _tmp1_;
 #line 33 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = str;
 #line 33 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1072,9 +1078,9 @@ SearchOperator search_operator_from_string (const gchar* str) {
 			result = SEARCH_OPERATOR_ALL;
 #line 34 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1076 "SearchBoolean.c"
+#line 1082 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_ = NULL;
+			const gchar* _tmp2_;
 #line 36 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp2_ = str;
 #line 36 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1083,14 +1089,14 @@ SearchOperator search_operator_from_string (const gchar* str) {
 				result = SEARCH_OPERATOR_NONE;
 #line 37 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 1087 "SearchBoolean.c"
+#line 1093 "SearchBoolean.c"
 			} else {
-				const gchar* _tmp3_ = NULL;
+				const gchar* _tmp3_;
 #line 40 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp3_ = str;
 #line 40 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				g_error ("SearchBoolean.vala:40: unrecognized search operator name: %s", _tmp3_);
-#line 1094 "SearchBoolean.c"
+#line 1100 "SearchBoolean.c"
 			}
 		}
 	}
@@ -1111,9 +1117,9 @@ GType search_operator_get_type (void) {
 
 SearchConditionSearchType* search_condition_search_type_as_array (int* result_length1) {
 	SearchConditionSearchType* result = NULL;
-	SearchConditionSearchType* _tmp0_ = NULL;
-	SearchConditionSearchType* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	SearchConditionSearchType* _tmp0_;
+	SearchConditionSearchType* _tmp1_;
+	gint _tmp1__length1;
 #line 64 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = g_new0 (SearchConditionSearchType, 11);
 #line 64 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1146,23 +1152,23 @@ SearchConditionSearchType* search_condition_search_type_as_array (int* result_le
 	if (result_length1) {
 #line 64 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		*result_length1 = _tmp1__length1;
-#line 1150 "SearchBoolean.c"
+#line 1156 "SearchBoolean.c"
 	}
 #line 64 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	result = _tmp1_;
 #line 64 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 1156 "SearchBoolean.c"
+#line 1162 "SearchBoolean.c"
 }
 
 
 static gint __lambda12_ (void* a, void* b) {
 	gint result = 0;
-	void* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	void* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	void* _tmp0_;
+	gchar* _tmp1_;
+	void* _tmp2_;
+	gchar* _tmp3_;
+	gint _tmp4_;
 #line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = a;
 #line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1177,7 +1183,7 @@ static gint __lambda12_ (void* a, void* b) {
 	result = _tmp4_;
 #line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 1181 "SearchBoolean.c"
+#line 1187 "SearchBoolean.c"
 }
 
 
@@ -1186,15 +1192,15 @@ static gint ___lambda12____compar_fn_t (void* key1, void* key2) {
 	result = __lambda12_ (key1, key2);
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 1190 "SearchBoolean.c"
+#line 1196 "SearchBoolean.c"
 }
 
 
 void search_condition_search_type_sort_array (SearchConditionSearchType** array, int* array_length1) {
-	SearchConditionSearchType* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	SearchConditionSearchType* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	SearchConditionSearchType* _tmp0_;
+	gint _tmp0__length1;
+	SearchConditionSearchType* _tmp1_;
+	gint _tmp1__length1;
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = *array;
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1205,7 +1211,7 @@ void search_condition_search_type_sort_array (SearchConditionSearchType** array,
 	_tmp1__length1 = *array_length1;
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	qsort (_tmp0_, (gsize) _tmp1__length1, (gsize) sizeof (SearchConditionSearchType), ___lambda12____compar_fn_t);
-#line 1209 "SearchBoolean.c"
+#line 1215 "SearchBoolean.c"
 }
 
 
@@ -1215,152 +1221,152 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) {
 	switch (self) {
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT:
-#line 1219 "SearchBoolean.c"
+#line 1225 "SearchBoolean.c"
 		{
-			gchar* _tmp0_ = NULL;
+			gchar* _tmp0_;
 #line 79 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp0_ = g_strdup ("ANY_TEXT");
 #line 79 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp0_;
 #line 79 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1228 "SearchBoolean.c"
+#line 1234 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_TITLE:
-#line 1232 "SearchBoolean.c"
+#line 1238 "SearchBoolean.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 82 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp1_ = g_strdup ("TITLE");
 #line 82 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp1_;
 #line 82 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1241 "SearchBoolean.c"
+#line 1247 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_TAG:
-#line 1245 "SearchBoolean.c"
+#line 1251 "SearchBoolean.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 85 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp2_ = g_strdup ("TAG");
 #line 85 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp2_;
 #line 85 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1254 "SearchBoolean.c"
+#line 1260 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_COMMENT:
-#line 1258 "SearchBoolean.c"
+#line 1264 "SearchBoolean.c"
 		{
-			gchar* _tmp3_ = NULL;
+			gchar* _tmp3_;
 #line 88 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp3_ = g_strdup ("COMMENT");
 #line 88 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp3_;
 #line 88 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1267 "SearchBoolean.c"
+#line 1273 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME:
-#line 1271 "SearchBoolean.c"
+#line 1277 "SearchBoolean.c"
 		{
-			gchar* _tmp4_ = NULL;
+			gchar* _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp4_ = g_strdup ("EVENT_NAME");
 #line 91 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1280 "SearchBoolean.c"
+#line 1286 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME:
-#line 1284 "SearchBoolean.c"
+#line 1290 "SearchBoolean.c"
 		{
-			gchar* _tmp5_ = NULL;
+			gchar* _tmp5_;
 #line 94 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp5_ = g_strdup ("FILE_NAME");
 #line 94 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp5_;
 #line 94 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1293 "SearchBoolean.c"
+#line 1299 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE:
-#line 1297 "SearchBoolean.c"
+#line 1303 "SearchBoolean.c"
 		{
-			gchar* _tmp6_ = NULL;
+			gchar* _tmp6_;
 #line 97 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp6_ = g_strdup ("MEDIA_TYPE");
 #line 97 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp6_;
 #line 97 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1306 "SearchBoolean.c"
+#line 1312 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE:
-#line 1310 "SearchBoolean.c"
+#line 1316 "SearchBoolean.c"
 		{
-			gchar* _tmp7_ = NULL;
+			gchar* _tmp7_;
 #line 100 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp7_ = g_strdup ("FLAG_STATE");
 #line 100 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp7_;
 #line 100 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1319 "SearchBoolean.c"
+#line 1325 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE:
-#line 1323 "SearchBoolean.c"
+#line 1329 "SearchBoolean.c"
 		{
-			gchar* _tmp8_ = NULL;
+			gchar* _tmp8_;
 #line 103 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp8_ = g_strdup ("MODIFIED_STATE");
 #line 103 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp8_;
 #line 103 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1332 "SearchBoolean.c"
+#line 1338 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_RATING:
-#line 1336 "SearchBoolean.c"
+#line 1342 "SearchBoolean.c"
 		{
-			gchar* _tmp9_ = NULL;
+			gchar* _tmp9_;
 #line 106 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp9_ = g_strdup ("RATING");
 #line 106 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp9_;
 #line 106 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1345 "SearchBoolean.c"
+#line 1351 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_DATE:
-#line 1349 "SearchBoolean.c"
+#line 1355 "SearchBoolean.c"
 		{
-			gchar* _tmp10_ = NULL;
+			gchar* _tmp10_;
 #line 109 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp10_ = g_strdup ("DATE");
 #line 109 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp10_;
 #line 109 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1358 "SearchBoolean.c"
+#line 1364 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 112 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:112: unrecognized search type enumeration value");
-#line 1364 "SearchBoolean.c"
+#line 1370 "SearchBoolean.c"
 		}
 	}
 }
@@ -1368,7 +1374,7 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) {
 
 SearchConditionSearchType search_condition_search_type_from_string (const gchar* str) {
 	SearchConditionSearchType result = 0;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 116 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 117 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1379,9 +1385,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar*
 		result = SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT;
 #line 118 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 1383 "SearchBoolean.c"
+#line 1389 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_ = NULL;
+		const gchar* _tmp1_;
 #line 120 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = str;
 #line 120 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1390,9 +1396,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar*
 			result = SEARCH_CONDITION_SEARCH_TYPE_TITLE;
 #line 121 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1394 "SearchBoolean.c"
+#line 1400 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_ = NULL;
+			const gchar* _tmp2_;
 #line 123 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp2_ = str;
 #line 123 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1401,9 +1407,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar*
 				result = SEARCH_CONDITION_SEARCH_TYPE_TAG;
 #line 124 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 1405 "SearchBoolean.c"
+#line 1411 "SearchBoolean.c"
 			} else {
-				const gchar* _tmp3_ = NULL;
+				const gchar* _tmp3_;
 #line 126 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp3_ = str;
 #line 126 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1412,9 +1418,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar*
 					result = SEARCH_CONDITION_SEARCH_TYPE_COMMENT;
 #line 127 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					return result;
-#line 1416 "SearchBoolean.c"
+#line 1422 "SearchBoolean.c"
 				} else {
-					const gchar* _tmp4_ = NULL;
+					const gchar* _tmp4_;
 #line 129 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					_tmp4_ = str;
 #line 129 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1423,9 +1429,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar*
 						result = SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME;
 #line 130 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 						return result;
-#line 1427 "SearchBoolean.c"
+#line 1433 "SearchBoolean.c"
 					} else {
-						const gchar* _tmp5_ = NULL;
+						const gchar* _tmp5_;
 #line 132 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 						_tmp5_ = str;
 #line 132 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1434,9 +1440,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar*
 							result = SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME;
 #line 133 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 							return result;
-#line 1438 "SearchBoolean.c"
+#line 1444 "SearchBoolean.c"
 						} else {
-							const gchar* _tmp6_ = NULL;
+							const gchar* _tmp6_;
 #line 135 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 							_tmp6_ = str;
 #line 135 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1445,9 +1451,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar*
 								result = SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE;
 #line 136 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 								return result;
-#line 1449 "SearchBoolean.c"
+#line 1455 "SearchBoolean.c"
 							} else {
-								const gchar* _tmp7_ = NULL;
+								const gchar* _tmp7_;
 #line 138 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 								_tmp7_ = str;
 #line 138 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1456,9 +1462,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar*
 									result = SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE;
 #line 139 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 									return result;
-#line 1460 "SearchBoolean.c"
+#line 1466 "SearchBoolean.c"
 								} else {
-									const gchar* _tmp8_ = NULL;
+									const gchar* _tmp8_;
 #line 141 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 									_tmp8_ = str;
 #line 141 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1467,9 +1473,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar*
 										result = SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE;
 #line 142 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 										return result;
-#line 1471 "SearchBoolean.c"
+#line 1477 "SearchBoolean.c"
 									} else {
-										const gchar* _tmp9_ = NULL;
+										const gchar* _tmp9_;
 #line 144 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 										_tmp9_ = str;
 #line 144 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1478,9 +1484,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar*
 											result = SEARCH_CONDITION_SEARCH_TYPE_RATING;
 #line 145 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 											return result;
-#line 1482 "SearchBoolean.c"
+#line 1488 "SearchBoolean.c"
 										} else {
-											const gchar* _tmp10_ = NULL;
+											const gchar* _tmp10_;
 #line 147 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 											_tmp10_ = str;
 #line 147 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1489,14 +1495,14 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar*
 												result = SEARCH_CONDITION_SEARCH_TYPE_DATE;
 #line 148 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 												return result;
-#line 1493 "SearchBoolean.c"
+#line 1499 "SearchBoolean.c"
 											} else {
-												const gchar* _tmp11_ = NULL;
+												const gchar* _tmp11_;
 #line 151 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 												_tmp11_ = str;
 #line 151 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 												g_error ("SearchBoolean.vala:151: unrecognized search type name: %s", _tmp11_);
-#line 1500 "SearchBoolean.c"
+#line 1506 "SearchBoolean.c"
 											}
 										}
 									}
@@ -1517,32 +1523,26 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self
 	switch (self) {
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT:
-#line 1521 "SearchBoolean.c"
+#line 1527 "SearchBoolean.c"
 		{
-			const gchar* _tmp0_ = NULL;
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp0_;
 #line 157 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp0_ = _ ("Any text");
+			_tmp0_ = g_strdup (_ ("Any text"));
 #line 157 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp1_ = g_strdup (_tmp0_);
-#line 157 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp1_;
+			result = _tmp0_;
 #line 157 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1533 "SearchBoolean.c"
+#line 1536 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_TITLE:
-#line 1537 "SearchBoolean.c"
+#line 1540 "SearchBoolean.c"
 		{
-			const gchar* _tmp2_ = NULL;
-			gchar* _tmp3_ = NULL;
-#line 160 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp2_ = _ ("Title");
+			gchar* _tmp1_;
 #line 160 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp3_ = g_strdup (_tmp2_);
+			_tmp1_ = g_strdup (_ ("Title"));
 #line 160 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp3_;
+			result = _tmp1_;
 #line 160 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
 #line 1549 "SearchBoolean.c"
@@ -1551,151 +1551,124 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self
 		case SEARCH_CONDITION_SEARCH_TYPE_TAG:
 #line 1553 "SearchBoolean.c"
 		{
-			const gchar* _tmp4_ = NULL;
-			gchar* _tmp5_ = NULL;
-#line 163 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp4_ = _ ("Tag");
+			gchar* _tmp2_;
 #line 163 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp5_ = g_strdup (_tmp4_);
+			_tmp2_ = g_strdup (_ ("Tag"));
 #line 163 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp5_;
+			result = _tmp2_;
 #line 163 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1565 "SearchBoolean.c"
+#line 1562 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_COMMENT:
-#line 1569 "SearchBoolean.c"
+#line 1566 "SearchBoolean.c"
 		{
-			const gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
-#line 166 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp6_ = _ ("Comment");
+			gchar* _tmp3_;
 #line 166 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp7_ = g_strdup (_tmp6_);
+			_tmp3_ = g_strdup (_ ("Comment"));
 #line 166 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp7_;
+			result = _tmp3_;
 #line 166 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1581 "SearchBoolean.c"
+#line 1575 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME:
-#line 1585 "SearchBoolean.c"
+#line 1579 "SearchBoolean.c"
 		{
-			const gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
+			gchar* _tmp4_;
 #line 169 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp8_ = _ ("Event name");
+			_tmp4_ = g_strdup (_ ("Event name"));
 #line 169 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp9_ = g_strdup (_tmp8_);
-#line 169 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp9_;
+			result = _tmp4_;
 #line 169 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1597 "SearchBoolean.c"
+#line 1588 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME:
-#line 1601 "SearchBoolean.c"
+#line 1592 "SearchBoolean.c"
 		{
-			const gchar* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-#line 172 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp10_ = _ ("File name");
+			gchar* _tmp5_;
 #line 172 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp11_ = g_strdup (_tmp10_);
+			_tmp5_ = g_strdup (_ ("File name"));
 #line 172 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp11_;
+			result = _tmp5_;
 #line 172 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1613 "SearchBoolean.c"
+#line 1601 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE:
-#line 1617 "SearchBoolean.c"
+#line 1605 "SearchBoolean.c"
 		{
-			const gchar* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-#line 175 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp12_ = _ ("Media type");
+			gchar* _tmp6_;
 #line 175 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp13_ = g_strdup (_tmp12_);
+			_tmp6_ = g_strdup (_ ("Media type"));
 #line 175 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp13_;
+			result = _tmp6_;
 #line 175 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1629 "SearchBoolean.c"
+#line 1614 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE:
-#line 1633 "SearchBoolean.c"
+#line 1618 "SearchBoolean.c"
 		{
-			const gchar* _tmp14_ = NULL;
-			gchar* _tmp15_ = NULL;
-#line 178 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp14_ = _ ("Flag state");
+			gchar* _tmp7_;
 #line 178 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp15_ = g_strdup (_tmp14_);
+			_tmp7_ = g_strdup (_ ("Flag state"));
 #line 178 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp15_;
+			result = _tmp7_;
 #line 178 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1645 "SearchBoolean.c"
+#line 1627 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE:
-#line 1649 "SearchBoolean.c"
+#line 1631 "SearchBoolean.c"
 		{
-			const gchar* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
-#line 181 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp16_ = _ ("Photo state");
+			gchar* _tmp8_;
 #line 181 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp17_ = g_strdup (_tmp16_);
+			_tmp8_ = g_strdup (_ ("Photo state"));
 #line 181 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp17_;
+			result = _tmp8_;
 #line 181 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1661 "SearchBoolean.c"
+#line 1640 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_RATING:
-#line 1665 "SearchBoolean.c"
+#line 1644 "SearchBoolean.c"
 		{
-			const gchar* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
+			gchar* _tmp9_;
 #line 184 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp18_ = _ ("Rating");
+			_tmp9_ = g_strdup (_ ("Rating"));
 #line 184 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp19_ = g_strdup (_tmp18_);
-#line 184 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp19_;
+			result = _tmp9_;
 #line 184 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1677 "SearchBoolean.c"
+#line 1653 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_DATE:
-#line 1681 "SearchBoolean.c"
+#line 1657 "SearchBoolean.c"
 		{
-			const gchar* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
+			gchar* _tmp10_;
 #line 187 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp20_ = _ ("Date");
+			_tmp10_ = g_strdup (_ ("Date"));
 #line 187 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp21_ = g_strdup (_tmp20_);
-#line 187 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp21_;
+			result = _tmp10_;
 #line 187 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1693 "SearchBoolean.c"
+#line 1666 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 190 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:190: unrecognized search type enumeration value");
-#line 1699 "SearchBoolean.c"
+#line 1672 "SearchBoolean.c"
 		}
 	}
 }
@@ -1719,7 +1692,7 @@ static gboolean search_condition_real_predicate (SearchCondition* self, MediaSou
 	g_critical ("Type `%s' does not implement abstract method `search_condition_predicate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 198 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return _tmp0_;
-#line 1723 "SearchBoolean.c"
+#line 1696 "SearchBoolean.c"
 }
 
 
@@ -1728,7 +1701,7 @@ gboolean search_condition_predicate (SearchCondition* self, MediaSource* source)
 	g_return_val_if_fail (IS_SEARCH_CONDITION (self), FALSE);
 #line 198 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return SEARCH_CONDITION_GET_CLASS (self)->predicate (self, source);
-#line 1732 "SearchBoolean.c"
+#line 1705 "SearchBoolean.c"
 }
 
 
@@ -1738,13 +1711,13 @@ SearchCondition* search_condition_construct (GType object_type) {
 	self = (SearchCondition*) g_type_create_instance (object_type);
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 1742 "SearchBoolean.c"
+#line 1715 "SearchBoolean.c"
 }
 
 
 SearchConditionSearchType search_condition_get_search_type (SearchCondition* self) {
 	SearchConditionSearchType result;
-	SearchConditionSearchType _tmp0_ = 0;
+	SearchConditionSearchType _tmp0_;
 #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION (self), 0);
 #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1753,26 +1726,26 @@ SearchConditionSearchType search_condition_get_search_type (SearchCondition* sel
 	result = _tmp0_;
 #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 1757 "SearchBoolean.c"
+#line 1730 "SearchBoolean.c"
 }
 
 
 void search_condition_set_search_type (SearchCondition* self, SearchConditionSearchType value) {
-	SearchConditionSearchType _tmp0_ = 0;
+	SearchConditionSearchType _tmp0_;
 #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (self));
 #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = value;
 #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_search_type = _tmp0_;
-#line 1769 "SearchBoolean.c"
+#line 1742 "SearchBoolean.c"
 }
 
 
 static void value_search_condition_init (GValue* value) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	value->data[0].v_pointer = NULL;
-#line 1776 "SearchBoolean.c"
+#line 1749 "SearchBoolean.c"
 }
 
 
@@ -1781,7 +1754,7 @@ static void value_search_condition_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		search_condition_unref (value->data[0].v_pointer);
-#line 1785 "SearchBoolean.c"
+#line 1758 "SearchBoolean.c"
 	}
 }
 
@@ -1791,11 +1764,11 @@ static void value_search_condition_copy_value (const GValue* src_value, GValue*
 	if (src_value->data[0].v_pointer) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		dest_value->data[0].v_pointer = search_condition_ref (src_value->data[0].v_pointer);
-#line 1795 "SearchBoolean.c"
+#line 1768 "SearchBoolean.c"
 	} else {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1799 "SearchBoolean.c"
+#line 1772 "SearchBoolean.c"
 	}
 }
 
@@ -1803,66 +1776,66 @@ static void value_search_condition_copy_value (const GValue* src_value, GValue*
 static gpointer value_search_condition_peek_pointer (const GValue* value) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return value->data[0].v_pointer;
-#line 1807 "SearchBoolean.c"
+#line 1780 "SearchBoolean.c"
 }
 
 
 static gchar* value_search_condition_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (collect_values[0].v_pointer) {
-#line 1814 "SearchBoolean.c"
-		SearchCondition* object;
+#line 1787 "SearchBoolean.c"
+		SearchCondition * object;
 		object = collect_values[0].v_pointer;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1821 "SearchBoolean.c"
+#line 1794 "SearchBoolean.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1825 "SearchBoolean.c"
+#line 1798 "SearchBoolean.c"
 		}
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = search_condition_ref (object);
-#line 1829 "SearchBoolean.c"
+#line 1802 "SearchBoolean.c"
 	} else {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 1833 "SearchBoolean.c"
+#line 1806 "SearchBoolean.c"
 	}
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return NULL;
-#line 1837 "SearchBoolean.c"
+#line 1810 "SearchBoolean.c"
 }
 
 
 static gchar* value_search_condition_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SearchCondition** object_p;
+	SearchCondition ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (!object_p) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1848 "SearchBoolean.c"
+#line 1821 "SearchBoolean.c"
 	}
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (!value->data[0].v_pointer) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		*object_p = NULL;
-#line 1854 "SearchBoolean.c"
+#line 1827 "SearchBoolean.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1858 "SearchBoolean.c"
+#line 1831 "SearchBoolean.c"
 	} else {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		*object_p = search_condition_ref (value->data[0].v_pointer);
-#line 1862 "SearchBoolean.c"
+#line 1835 "SearchBoolean.c"
 	}
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return NULL;
-#line 1866 "SearchBoolean.c"
+#line 1839 "SearchBoolean.c"
 }
 
 
@@ -1876,7 +1849,7 @@ GParamSpec* param_spec_search_condition (const gchar* name, const gchar* nick, c
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return G_PARAM_SPEC (spec);
-#line 1880 "SearchBoolean.c"
+#line 1853 "SearchBoolean.c"
 }
 
 
@@ -1885,12 +1858,12 @@ gpointer value_get_search_condition (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_CONDITION), NULL);
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return value->data[0].v_pointer;
-#line 1889 "SearchBoolean.c"
+#line 1862 "SearchBoolean.c"
 }
 
 
 void value_set_search_condition (GValue* value, gpointer v_object) {
-	SearchCondition* old;
+	SearchCondition * old;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_CONDITION));
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1905,23 +1878,23 @@ void value_set_search_condition (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		search_condition_ref (value->data[0].v_pointer);
-#line 1909 "SearchBoolean.c"
+#line 1882 "SearchBoolean.c"
 	} else {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 1913 "SearchBoolean.c"
+#line 1886 "SearchBoolean.c"
 	}
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (old) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		search_condition_unref (old);
-#line 1919 "SearchBoolean.c"
+#line 1892 "SearchBoolean.c"
 	}
 }
 
 
 void value_take_search_condition (GValue* value, gpointer v_object) {
-	SearchCondition* old;
+	SearchCondition * old;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_CONDITION));
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1934,17 +1907,17 @@ void value_take_search_condition (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = v_object;
-#line 1938 "SearchBoolean.c"
+#line 1911 "SearchBoolean.c"
 	} else {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 1942 "SearchBoolean.c"
+#line 1915 "SearchBoolean.c"
 	}
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (old) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		search_condition_unref (old);
-#line 1948 "SearchBoolean.c"
+#line 1921 "SearchBoolean.c"
 	}
 }
 
@@ -1957,8 +1930,8 @@ static void search_condition_class_init (SearchConditionClass * klass) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_type_class_add_private (klass, sizeof (SearchConditionPrivate));
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_real_predicate;
-#line 1962 "SearchBoolean.c"
+	((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_real_predicate;
+#line 1935 "SearchBoolean.c"
 }
 
 
@@ -1967,17 +1940,17 @@ static void search_condition_instance_init (SearchCondition * self) {
 	self->priv = SEARCH_CONDITION_GET_PRIVATE (self);
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->ref_count = 1;
-#line 1971 "SearchBoolean.c"
+#line 1944 "SearchBoolean.c"
 }
 
 
-static void search_condition_finalize (SearchCondition* obj) {
+static void search_condition_finalize (SearchCondition * obj) {
 	SearchCondition * self;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_signal_handlers_destroy (self);
-#line 1981 "SearchBoolean.c"
+#line 1954 "SearchBoolean.c"
 }
 
 
@@ -1996,18 +1969,18 @@ GType search_condition_get_type (void) {
 
 
 gpointer search_condition_ref (gpointer instance) {
-	SearchCondition* self;
+	SearchCondition * self;
 	self = instance;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return instance;
-#line 2006 "SearchBoolean.c"
+#line 1979 "SearchBoolean.c"
 }
 
 
 void search_condition_unref (gpointer instance) {
-	SearchCondition* self;
+	SearchCondition * self;
 	self = instance;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2015,7 +1988,7 @@ void search_condition_unref (gpointer instance) {
 		SEARCH_CONDITION_GET_CLASS (self)->finalize (self);
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2019 "SearchBoolean.c"
+#line 1992 "SearchBoolean.c"
 	}
 }
 
@@ -2026,101 +1999,101 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self)
 	switch (self) {
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS:
-#line 2030 "SearchBoolean.c"
+#line 2003 "SearchBoolean.c"
 		{
-			gchar* _tmp0_ = NULL;
+			gchar* _tmp0_;
 #line 215 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp0_ = g_strdup ("CONTAINS");
 #line 215 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp0_;
 #line 215 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2039 "SearchBoolean.c"
+#line 2012 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY:
-#line 2043 "SearchBoolean.c"
+#line 2016 "SearchBoolean.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 218 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp1_ = g_strdup ("IS_EXACTLY");
 #line 218 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp1_;
 #line 218 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2052 "SearchBoolean.c"
+#line 2025 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH:
-#line 2056 "SearchBoolean.c"
+#line 2029 "SearchBoolean.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 221 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp2_ = g_strdup ("STARTS_WITH");
 #line 221 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp2_;
 #line 221 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2065 "SearchBoolean.c"
+#line 2038 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH:
-#line 2069 "SearchBoolean.c"
+#line 2042 "SearchBoolean.c"
 		{
-			gchar* _tmp3_ = NULL;
+			gchar* _tmp3_;
 #line 224 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp3_ = g_strdup ("ENDS_WITH");
 #line 224 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp3_;
 #line 224 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2078 "SearchBoolean.c"
+#line 2051 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN:
-#line 2082 "SearchBoolean.c"
+#line 2055 "SearchBoolean.c"
 		{
-			gchar* _tmp4_ = NULL;
+			gchar* _tmp4_;
 #line 227 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp4_ = g_strdup ("DOES_NOT_CONTAIN");
 #line 227 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp4_;
 #line 227 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2091 "SearchBoolean.c"
+#line 2064 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET:
-#line 2095 "SearchBoolean.c"
+#line 2068 "SearchBoolean.c"
 		{
-			gchar* _tmp5_ = NULL;
+			gchar* _tmp5_;
 #line 230 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp5_ = g_strdup ("IS_NOT_SET");
 #line 230 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp5_;
 #line 230 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2104 "SearchBoolean.c"
+#line 2077 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_SET:
-#line 2108 "SearchBoolean.c"
+#line 2081 "SearchBoolean.c"
 		{
-			gchar* _tmp6_ = NULL;
+			gchar* _tmp6_;
 #line 233 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp6_ = g_strdup ("IS_SET");
 #line 233 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp6_;
 #line 233 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2117 "SearchBoolean.c"
+#line 2090 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 236 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:236: unrecognized text search context enumeration v" \
 "alue");
-#line 2123 "SearchBoolean.c"
+#line 2096 "SearchBoolean.c"
 		}
 	}
 }
@@ -2128,7 +2101,7 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self)
 
 SearchConditionTextContext search_condition_text_context_from_string (const gchar* str) {
 	SearchConditionTextContext result = 0;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 240 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 241 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2139,9 +2112,9 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha
 		result = SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS;
 #line 242 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 2142 "SearchBoolean.c"
+#line 2115 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_ = NULL;
+		const gchar* _tmp1_;
 #line 244 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = str;
 #line 244 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2150,9 +2123,9 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha
 			result = SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY;
 #line 245 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2153 "SearchBoolean.c"
+#line 2126 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_ = NULL;
+			const gchar* _tmp2_;
 #line 247 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp2_ = str;
 #line 247 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2161,9 +2134,9 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha
 				result = SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH;
 #line 248 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 2164 "SearchBoolean.c"
+#line 2137 "SearchBoolean.c"
 			} else {
-				const gchar* _tmp3_ = NULL;
+				const gchar* _tmp3_;
 #line 250 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp3_ = str;
 #line 250 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2172,9 +2145,9 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha
 					result = SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH;
 #line 251 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					return result;
-#line 2175 "SearchBoolean.c"
+#line 2148 "SearchBoolean.c"
 				} else {
-					const gchar* _tmp4_ = NULL;
+					const gchar* _tmp4_;
 #line 253 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					_tmp4_ = str;
 #line 253 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2183,9 +2156,9 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha
 						result = SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN;
 #line 254 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 						return result;
-#line 2186 "SearchBoolean.c"
+#line 2159 "SearchBoolean.c"
 					} else {
-						const gchar* _tmp5_ = NULL;
+						const gchar* _tmp5_;
 #line 256 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 						_tmp5_ = str;
 #line 256 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2194,9 +2167,9 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha
 							result = SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET;
 #line 257 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 							return result;
-#line 2197 "SearchBoolean.c"
+#line 2170 "SearchBoolean.c"
 						} else {
-							const gchar* _tmp6_ = NULL;
+							const gchar* _tmp6_;
 #line 259 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 							_tmp6_ = str;
 #line 259 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2205,14 +2178,14 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha
 								result = SEARCH_CONDITION_TEXT_CONTEXT_IS_SET;
 #line 260 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 								return result;
-#line 2208 "SearchBoolean.c"
+#line 2181 "SearchBoolean.c"
 							} else {
-								const gchar* _tmp7_ = NULL;
+								const gchar* _tmp7_;
 #line 263 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 								_tmp7_ = str;
 #line 263 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 								g_error ("SearchBoolean.vala:263: unrecognized text search context name: %s", _tmp7_);
-#line 2215 "SearchBoolean.c"
+#line 2188 "SearchBoolean.c"
 							}
 						}
 					}
@@ -2237,10 +2210,10 @@ GType search_condition_text_context_get_type (void) {
 
 SearchConditionText* search_condition_text_construct (GType object_type, SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context) {
 	SearchConditionText* self = NULL;
-	SearchConditionSearchType _tmp0_ = 0;
+	SearchConditionSearchType _tmp0_;
 	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	SearchConditionTextContext _tmp8_ = 0;
+	const gchar* _tmp2_;
+	SearchConditionTextContext _tmp8_;
 #line 273 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = (SearchConditionText*) search_condition_construct (object_type);
 #line 274 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2251,11 +2224,11 @@ SearchConditionText* search_condition_text_construct (GType object_type, SearchC
 	_tmp2_ = text;
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp2_ != NULL) {
-#line 2254 "SearchBoolean.c"
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+#line 2227 "SearchBoolean.c"
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp3_ = text;
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2270,16 +2243,16 @@ SearchConditionText* search_condition_text_construct (GType object_type, SearchC
 		_tmp1_ = _tmp6_;
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_free0 (_tmp5_);
-#line 2273 "SearchBoolean.c"
+#line 2246 "SearchBoolean.c"
 	} else {
-		gchar* _tmp7_ = NULL;
+		gchar* _tmp7_;
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp7_ = g_strdup ("");
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_free0 (_tmp1_);
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = _tmp7_;
-#line 2282 "SearchBoolean.c"
+#line 2255 "SearchBoolean.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	search_condition_text_set_text (self, _tmp1_);
@@ -2291,40 +2264,40 @@ SearchConditionText* search_condition_text_construct (GType object_type, SearchC
 	_g_free0 (_tmp1_);
 #line 273 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 2294 "SearchBoolean.c"
+#line 2267 "SearchBoolean.c"
 }
 
 
 SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context) {
 #line 273 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return search_condition_text_construct (TYPE_SEARCH_CONDITION_TEXT, search_type, text, context);
-#line 2301 "SearchBoolean.c"
+#line 2274 "SearchBoolean.c"
 }
 
 
 static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2321 "SearchBoolean.c"
+#line 2294 "SearchBoolean.c"
 }
 
 
 static gboolean search_condition_text_string_match (SearchConditionText* self, const gchar* needle, const gchar* haystack) {
 	gboolean result = FALSE;
-	SearchConditionTextContext _tmp0_ = 0;
+	SearchConditionTextContext _tmp0_;
 #line 280 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION_TEXT (self), FALSE);
 #line 280 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2337,21 +2310,21 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c
 		case SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS:
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN:
-#line 2340 "SearchBoolean.c"
+#line 2313 "SearchBoolean.c"
 		{
 			gboolean _tmp1_ = FALSE;
-			const gchar* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			const gchar* _tmp2_;
+			gboolean _tmp3_;
 #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp2_ = haystack;
 #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp3_ = is_string_empty (_tmp2_);
 #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (!_tmp3_) {
-#line 2351 "SearchBoolean.c"
-				const gchar* _tmp4_ = NULL;
-				const gchar* _tmp5_ = NULL;
-				gboolean _tmp6_ = FALSE;
+#line 2324 "SearchBoolean.c"
+				const gchar* _tmp4_;
+				const gchar* _tmp5_;
+				gboolean _tmp6_;
 #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp4_ = haystack;
 #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2360,69 +2333,69 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c
 				_tmp6_ = string_contains (_tmp4_, _tmp5_);
 #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp1_ = _tmp6_;
-#line 2363 "SearchBoolean.c"
+#line 2336 "SearchBoolean.c"
 			} else {
 #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp1_ = FALSE;
-#line 2367 "SearchBoolean.c"
+#line 2340 "SearchBoolean.c"
 			}
 #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp1_;
 #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2373 "SearchBoolean.c"
+#line 2346 "SearchBoolean.c"
 		}
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY:
-#line 2377 "SearchBoolean.c"
+#line 2350 "SearchBoolean.c"
 		{
 			gboolean _tmp7_ = FALSE;
-			const gchar* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			const gchar* _tmp8_;
+			gboolean _tmp9_;
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp8_ = haystack;
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp9_ = is_string_empty (_tmp8_);
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (!_tmp9_) {
-#line 2388 "SearchBoolean.c"
-				const gchar* _tmp10_ = NULL;
-				const gchar* _tmp11_ = NULL;
+#line 2361 "SearchBoolean.c"
+				const gchar* _tmp10_;
+				const gchar* _tmp11_;
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp10_ = haystack;
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp11_ = needle;
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp7_ = g_strcmp0 (_tmp10_, _tmp11_) == 0;
-#line 2397 "SearchBoolean.c"
+#line 2370 "SearchBoolean.c"
 			} else {
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp7_ = FALSE;
-#line 2401 "SearchBoolean.c"
+#line 2374 "SearchBoolean.c"
 			}
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp7_;
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2407 "SearchBoolean.c"
+#line 2380 "SearchBoolean.c"
 		}
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH:
-#line 2411 "SearchBoolean.c"
+#line 2384 "SearchBoolean.c"
 		{
 			gboolean _tmp12_ = FALSE;
-			const gchar* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
+			const gchar* _tmp13_;
+			gboolean _tmp14_;
 #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp13_ = haystack;
 #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp14_ = is_string_empty (_tmp13_);
 #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (!_tmp14_) {
-#line 2422 "SearchBoolean.c"
-				const gchar* _tmp15_ = NULL;
-				const gchar* _tmp16_ = NULL;
-				gboolean _tmp17_ = FALSE;
+#line 2395 "SearchBoolean.c"
+				const gchar* _tmp15_;
+				const gchar* _tmp16_;
+				gboolean _tmp17_;
 #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp15_ = haystack;
 #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2431,35 +2404,35 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c
 				_tmp17_ = g_str_has_prefix (_tmp15_, _tmp16_);
 #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp12_ = _tmp17_;
-#line 2434 "SearchBoolean.c"
+#line 2407 "SearchBoolean.c"
 			} else {
 #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp12_ = FALSE;
-#line 2438 "SearchBoolean.c"
+#line 2411 "SearchBoolean.c"
 			}
 #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp12_;
 #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2444 "SearchBoolean.c"
+#line 2417 "SearchBoolean.c"
 		}
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH:
-#line 2448 "SearchBoolean.c"
+#line 2421 "SearchBoolean.c"
 		{
 			gboolean _tmp18_ = FALSE;
-			const gchar* _tmp19_ = NULL;
-			gboolean _tmp20_ = FALSE;
+			const gchar* _tmp19_;
+			gboolean _tmp20_;
 #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp19_ = haystack;
 #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp20_ = is_string_empty (_tmp19_);
 #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (!_tmp20_) {
-#line 2459 "SearchBoolean.c"
-				const gchar* _tmp21_ = NULL;
-				const gchar* _tmp22_ = NULL;
-				gboolean _tmp23_ = FALSE;
+#line 2432 "SearchBoolean.c"
+				const gchar* _tmp21_;
+				const gchar* _tmp22_;
+				gboolean _tmp23_;
 #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp21_ = haystack;
 #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2468,24 +2441,24 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c
 				_tmp23_ = g_str_has_suffix (_tmp21_, _tmp22_);
 #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp18_ = _tmp23_;
-#line 2471 "SearchBoolean.c"
+#line 2444 "SearchBoolean.c"
 			} else {
 #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp18_ = FALSE;
-#line 2475 "SearchBoolean.c"
+#line 2448 "SearchBoolean.c"
 			}
 #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp18_;
 #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2481 "SearchBoolean.c"
+#line 2454 "SearchBoolean.c"
 		}
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET:
-#line 2485 "SearchBoolean.c"
+#line 2458 "SearchBoolean.c"
 		{
-			const gchar* _tmp24_ = NULL;
-			gboolean _tmp25_ = FALSE;
+			const gchar* _tmp24_;
+			gboolean _tmp25_;
 #line 296 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp24_ = haystack;
 #line 296 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2494,14 +2467,14 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c
 			result = _tmp25_;
 #line 296 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2497 "SearchBoolean.c"
+#line 2470 "SearchBoolean.c"
 		}
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_SET:
-#line 2501 "SearchBoolean.c"
+#line 2474 "SearchBoolean.c"
 		{
-			const gchar* _tmp26_ = NULL;
-			gboolean _tmp27_ = FALSE;
+			const gchar* _tmp26_;
+			gboolean _tmp27_;
 #line 299 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp26_ = haystack;
 #line 299 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2510,25 +2483,25 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c
 			result = !_tmp27_;
 #line 299 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2513 "SearchBoolean.c"
+#line 2486 "SearchBoolean.c"
 		}
 		default:
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		break;
-#line 2518 "SearchBoolean.c"
+#line 2491 "SearchBoolean.c"
 	}
 #line 302 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	result = FALSE;
 #line 302 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 2524 "SearchBoolean.c"
+#line 2497 "SearchBoolean.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2531 "SearchBoolean.c"
+#line 2504 "SearchBoolean.c"
 }
 
 
@@ -2537,22 +2510,22 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 	gboolean result = FALSE;
 	gboolean ret = FALSE;
 	gboolean _tmp0_ = FALSE;
-	SearchConditionSearchType _tmp1_ = 0;
-	SearchConditionSearchType _tmp2_ = 0;
+	SearchConditionSearchType _tmp1_;
+	SearchConditionSearchType _tmp2_;
 	gboolean _tmp21_ = FALSE;
-	SearchConditionSearchType _tmp22_ = 0;
-	SearchConditionSearchType _tmp23_ = 0;
+	SearchConditionSearchType _tmp22_;
+	SearchConditionSearchType _tmp23_;
 	gboolean _tmp52_ = FALSE;
-	SearchConditionSearchType _tmp53_ = 0;
-	SearchConditionSearchType _tmp54_ = 0;
+	SearchConditionSearchType _tmp53_;
+	SearchConditionSearchType _tmp54_;
 	gboolean _tmp75_ = FALSE;
-	SearchConditionSearchType _tmp76_ = 0;
-	SearchConditionSearchType _tmp77_ = 0;
+	SearchConditionSearchType _tmp76_;
+	SearchConditionSearchType _tmp77_;
 	gboolean _tmp91_ = FALSE;
-	SearchConditionSearchType _tmp92_ = 0;
-	SearchConditionSearchType _tmp93_ = 0;
+	SearchConditionSearchType _tmp92_;
+	SearchConditionSearchType _tmp93_;
 	gboolean _tmp106_ = FALSE;
-	SearchConditionTextContext _tmp107_ = 0;
+	SearchConditionTextContext _tmp107_;
 #line 306 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_TEXT, SearchConditionText);
 #line 306 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2567,32 +2540,32 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 	if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp2_) {
 #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp0_ = TRUE;
-#line 2570 "SearchBoolean.c"
+#line 2543 "SearchBoolean.c"
 	} else {
-		SearchConditionSearchType _tmp3_ = 0;
-		SearchConditionSearchType _tmp4_ = 0;
+		SearchConditionSearchType _tmp3_;
+		SearchConditionSearchType _tmp4_;
 #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp3_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
 #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp4_ = _tmp3_;
 #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp0_ = SEARCH_CONDITION_SEARCH_TYPE_TITLE == _tmp4_;
-#line 2580 "SearchBoolean.c"
+#line 2553 "SearchBoolean.c"
 	}
 #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp0_) {
-#line 2584 "SearchBoolean.c"
+#line 2557 "SearchBoolean.c"
 		gchar* _tmp5_ = NULL;
-		MediaSource* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
+		MediaSource* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		gboolean _tmp9_;
 		gchar* title = NULL;
-		gchar* _tmp16_ = NULL;
-		gboolean _tmp17_ = FALSE;
-		const gchar* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		gboolean _tmp20_ = FALSE;
+		gchar* _tmp16_;
+		gboolean _tmp17_;
+		const gchar* _tmp18_;
+		const gchar* _tmp19_;
+		gboolean _tmp20_;
 #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp6_ = source;
 #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2605,13 +2578,13 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 		_g_free0 (_tmp8_);
 #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		if (_tmp9_) {
-#line 2608 "SearchBoolean.c"
-			MediaSource* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-			gchar* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			gchar* _tmp14_ = NULL;
-			gchar* _tmp15_ = NULL;
+#line 2581 "SearchBoolean.c"
+			MediaSource* _tmp10_;
+			gchar* _tmp11_;
+			gchar* _tmp12_;
+			gchar* _tmp13_;
+			gchar* _tmp14_;
+			gchar* _tmp15_;
 #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp10_ = source;
 #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2632,13 +2605,13 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 			_g_free0 (_tmp14_);
 #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_free0 (_tmp12_);
-#line 2635 "SearchBoolean.c"
+#line 2608 "SearchBoolean.c"
 		} else {
 #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_free0 (_tmp5_);
 #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp5_ = NULL;
-#line 2641 "SearchBoolean.c"
+#line 2614 "SearchBoolean.c"
 		}
 #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp16_ = g_strdup (_tmp5_);
@@ -2658,7 +2631,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 		_g_free0 (title);
 #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_free0 (_tmp5_);
-#line 2661 "SearchBoolean.c"
+#line 2634 "SearchBoolean.c"
 	}
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp22_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
@@ -2668,26 +2641,26 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 	if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp23_) {
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp21_ = TRUE;
-#line 2671 "SearchBoolean.c"
+#line 2644 "SearchBoolean.c"
 	} else {
-		SearchConditionSearchType _tmp24_ = 0;
-		SearchConditionSearchType _tmp25_ = 0;
+		SearchConditionSearchType _tmp24_;
+		SearchConditionSearchType _tmp25_;
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp24_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp25_ = _tmp24_;
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp21_ = SEARCH_CONDITION_SEARCH_TYPE_TAG == _tmp25_;
-#line 2681 "SearchBoolean.c"
+#line 2654 "SearchBoolean.c"
 	}
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp21_) {
-#line 2685 "SearchBoolean.c"
+#line 2658 "SearchBoolean.c"
 		GeeList* tag_list = NULL;
-		TagSourceCollection* _tmp26_ = NULL;
-		MediaSource* _tmp27_ = NULL;
-		GeeList* _tmp28_ = NULL;
-		GeeList* _tmp29_ = NULL;
+		TagSourceCollection* _tmp26_;
+		MediaSource* _tmp27_;
+		GeeList* _tmp28_;
+		GeeList* _tmp29_;
 #line 318 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp26_ = tag_global;
 #line 318 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2700,16 +2673,16 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 		_tmp29_ = tag_list;
 #line 319 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		if (NULL != _tmp29_) {
-#line 2703 "SearchBoolean.c"
+#line 2676 "SearchBoolean.c"
 			gchar* itag = NULL;
 			{
 				GeeList* _tag_list = NULL;
-				GeeList* _tmp30_ = NULL;
-				GeeList* _tmp31_ = NULL;
+				GeeList* _tmp30_;
+				GeeList* _tmp31_;
 				gint _tag_size = 0;
-				GeeList* _tmp32_ = NULL;
-				gint _tmp33_ = 0;
-				gint _tmp34_ = 0;
+				GeeList* _tmp32_;
+				gint _tmp33_;
+				gint _tmp34_;
 				gint _tag_index = 0;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp30_ = tag_list;
@@ -2729,22 +2702,22 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 				_tag_index = -1;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				while (TRUE) {
-#line 2732 "SearchBoolean.c"
-					gint _tmp35_ = 0;
-					gint _tmp36_ = 0;
-					gint _tmp37_ = 0;
+#line 2705 "SearchBoolean.c"
+					gint _tmp35_;
+					gint _tmp36_;
+					gint _tmp37_;
 					Tag* tag = NULL;
-					GeeList* _tmp38_ = NULL;
-					gint _tmp39_ = 0;
-					gpointer _tmp40_ = NULL;
-					Tag* _tmp41_ = NULL;
-					gchar* _tmp42_ = NULL;
-					gchar* _tmp43_ = NULL;
-					gchar* _tmp44_ = NULL;
-					gboolean _tmp45_ = FALSE;
-					const gchar* _tmp46_ = NULL;
-					const gchar* _tmp47_ = NULL;
-					gboolean _tmp48_ = FALSE;
+					GeeList* _tmp38_;
+					gint _tmp39_;
+					gpointer _tmp40_;
+					Tag* _tmp41_;
+					gchar* _tmp42_;
+					gchar* _tmp43_;
+					gchar* _tmp44_;
+					gboolean _tmp45_;
+					const gchar* _tmp46_;
+					const gchar* _tmp47_;
+					gboolean _tmp48_;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					_tmp35_ = _tag_index;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2757,7 +2730,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 					if (!(_tmp36_ < _tmp37_)) {
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 						break;
-#line 2760 "SearchBoolean.c"
+#line 2733 "SearchBoolean.c"
 					}
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					_tmp38_ = _tag_list;
@@ -2793,19 +2766,19 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 					ret = _tmp45_ | _tmp48_;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					_g_object_unref0 (tag);
-#line 2796 "SearchBoolean.c"
+#line 2769 "SearchBoolean.c"
 				}
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_g_object_unref0 (_tag_list);
-#line 2800 "SearchBoolean.c"
+#line 2773 "SearchBoolean.c"
 			}
 #line 319 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_free0 (itag);
-#line 2804 "SearchBoolean.c"
+#line 2777 "SearchBoolean.c"
 		} else {
-			gboolean _tmp49_ = FALSE;
-			const gchar* _tmp50_ = NULL;
-			gboolean _tmp51_ = FALSE;
+			gboolean _tmp49_;
+			const gchar* _tmp50_;
+			gboolean _tmp51_;
 #line 326 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp49_ = ret;
 #line 326 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2814,11 +2787,11 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 			_tmp51_ = search_condition_text_string_match (self, _tmp50_, NULL);
 #line 326 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			ret = _tmp49_ | _tmp51_;
-#line 2817 "SearchBoolean.c"
+#line 2790 "SearchBoolean.c"
 		}
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_object_unref0 (tag_list);
-#line 2821 "SearchBoolean.c"
+#line 2794 "SearchBoolean.c"
 	}
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp53_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
@@ -2828,32 +2801,32 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 	if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp54_) {
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp52_ = TRUE;
-#line 2831 "SearchBoolean.c"
+#line 2804 "SearchBoolean.c"
 	} else {
-		SearchConditionSearchType _tmp55_ = 0;
-		SearchConditionSearchType _tmp56_ = 0;
+		SearchConditionSearchType _tmp55_;
+		SearchConditionSearchType _tmp56_;
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp55_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp56_ = _tmp55_;
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp52_ = SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME == _tmp56_;
-#line 2841 "SearchBoolean.c"
+#line 2814 "SearchBoolean.c"
 	}
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp52_) {
-#line 2845 "SearchBoolean.c"
+#line 2818 "SearchBoolean.c"
 		gchar* _tmp57_ = NULL;
-		MediaSource* _tmp58_ = NULL;
-		Event* _tmp59_ = NULL;
-		Event* _tmp60_ = NULL;
-		gboolean _tmp61_ = FALSE;
+		MediaSource* _tmp58_;
+		Event* _tmp59_;
+		Event* _tmp60_;
+		gboolean _tmp61_;
 		gchar* event_name = NULL;
-		gchar* _tmp70_ = NULL;
-		gboolean _tmp71_ = FALSE;
-		const gchar* _tmp72_ = NULL;
-		const gchar* _tmp73_ = NULL;
-		gboolean _tmp74_ = FALSE;
+		gchar* _tmp70_;
+		gboolean _tmp71_;
+		const gchar* _tmp72_;
+		const gchar* _tmp73_;
+		gboolean _tmp74_;
 #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp58_ = source;
 #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2866,15 +2839,15 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 		_g_object_unref0 (_tmp60_);
 #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		if (_tmp61_) {
-#line 2869 "SearchBoolean.c"
-			MediaSource* _tmp62_ = NULL;
-			Event* _tmp63_ = NULL;
-			Event* _tmp64_ = NULL;
-			gchar* _tmp65_ = NULL;
-			gchar* _tmp66_ = NULL;
-			gchar* _tmp67_ = NULL;
-			gchar* _tmp68_ = NULL;
-			gchar* _tmp69_ = NULL;
+#line 2842 "SearchBoolean.c"
+			MediaSource* _tmp62_;
+			Event* _tmp63_;
+			Event* _tmp64_;
+			gchar* _tmp65_;
+			gchar* _tmp66_;
+			gchar* _tmp67_;
+			gchar* _tmp68_;
+			gchar* _tmp69_;
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp62_ = source;
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2901,13 +2874,13 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 			_g_free0 (_tmp66_);
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_object_unref0 (_tmp64_);
-#line 2904 "SearchBoolean.c"
+#line 2877 "SearchBoolean.c"
 		} else {
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_free0 (_tmp57_);
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp57_ = NULL;
-#line 2910 "SearchBoolean.c"
+#line 2883 "SearchBoolean.c"
 		}
 #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp70_ = g_strdup (_tmp57_);
@@ -2927,7 +2900,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 		_g_free0 (event_name);
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_free0 (_tmp57_);
-#line 2930 "SearchBoolean.c"
+#line 2903 "SearchBoolean.c"
 	}
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp76_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
@@ -2937,25 +2910,25 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 	if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp77_) {
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp75_ = TRUE;
-#line 2940 "SearchBoolean.c"
+#line 2913 "SearchBoolean.c"
 	} else {
-		SearchConditionSearchType _tmp78_ = 0;
-		SearchConditionSearchType _tmp79_ = 0;
+		SearchConditionSearchType _tmp78_;
+		SearchConditionSearchType _tmp79_;
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp78_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp79_ = _tmp78_;
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp75_ = SEARCH_CONDITION_SEARCH_TYPE_COMMENT == _tmp79_;
-#line 2950 "SearchBoolean.c"
+#line 2923 "SearchBoolean.c"
 	}
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp75_) {
-#line 2954 "SearchBoolean.c"
+#line 2927 "SearchBoolean.c"
 		gchar* comment = NULL;
-		MediaSource* _tmp80_ = NULL;
-		gchar* _tmp81_ = NULL;
-		const gchar* _tmp82_ = NULL;
+		MediaSource* _tmp80_;
+		gchar* _tmp81_;
+		const gchar* _tmp82_;
 #line 339 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp80_ = source;
 #line 339 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2966,15 +2939,15 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 		_tmp82_ = comment;
 #line 340 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		if (NULL != _tmp82_) {
-#line 2969 "SearchBoolean.c"
-			gboolean _tmp83_ = FALSE;
-			const gchar* _tmp84_ = NULL;
-			const gchar* _tmp85_ = NULL;
-			gchar* _tmp86_ = NULL;
-			gchar* _tmp87_ = NULL;
-			gchar* _tmp88_ = NULL;
-			gchar* _tmp89_ = NULL;
-			gboolean _tmp90_ = FALSE;
+#line 2942 "SearchBoolean.c"
+			gboolean _tmp83_;
+			const gchar* _tmp84_;
+			const gchar* _tmp85_;
+			gchar* _tmp86_;
+			gchar* _tmp87_;
+			gchar* _tmp88_;
+			gchar* _tmp89_;
+			gboolean _tmp90_;
 #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp83_ = ret;
 #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2997,11 +2970,11 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 			_g_free0 (_tmp89_);
 #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_free0 (_tmp87_);
-#line 3000 "SearchBoolean.c"
+#line 2973 "SearchBoolean.c"
 		}
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_free0 (comment);
-#line 3004 "SearchBoolean.c"
+#line 2977 "SearchBoolean.c"
 	}
 #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp92_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
@@ -3011,31 +2984,31 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 	if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp93_) {
 #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp91_ = TRUE;
-#line 3014 "SearchBoolean.c"
+#line 2987 "SearchBoolean.c"
 	} else {
-		SearchConditionSearchType _tmp94_ = 0;
-		SearchConditionSearchType _tmp95_ = 0;
+		SearchConditionSearchType _tmp94_;
+		SearchConditionSearchType _tmp95_;
 #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp94_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
 #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp95_ = _tmp94_;
 #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp91_ = SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME == _tmp95_;
-#line 3024 "SearchBoolean.c"
+#line 2997 "SearchBoolean.c"
 	}
 #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp91_) {
-#line 3028 "SearchBoolean.c"
-		gboolean _tmp96_ = FALSE;
-		const gchar* _tmp97_ = NULL;
-		MediaSource* _tmp98_ = NULL;
-		gchar* _tmp99_ = NULL;
-		gchar* _tmp100_ = NULL;
-		gchar* _tmp101_ = NULL;
-		gchar* _tmp102_ = NULL;
-		gchar* _tmp103_ = NULL;
-		gchar* _tmp104_ = NULL;
-		gboolean _tmp105_ = FALSE;
+#line 3001 "SearchBoolean.c"
+		gboolean _tmp96_;
+		const gchar* _tmp97_;
+		MediaSource* _tmp98_;
+		gchar* _tmp99_;
+		gchar* _tmp100_;
+		gchar* _tmp101_;
+		gchar* _tmp102_;
+		gchar* _tmp103_;
+		gchar* _tmp104_;
+		gboolean _tmp105_;
 #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp96_ = ret;
 #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3064,38 +3037,38 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 		_g_free0 (_tmp102_);
 #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_free0 (_tmp100_);
-#line 3067 "SearchBoolean.c"
+#line 3040 "SearchBoolean.c"
 	}
 #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp107_ = self->priv->_context;
 #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp107_ == SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN) {
-#line 3073 "SearchBoolean.c"
-		gboolean _tmp108_ = FALSE;
+#line 3046 "SearchBoolean.c"
+		gboolean _tmp108_;
 #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp108_ = ret;
 #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp106_ = !_tmp108_;
-#line 3079 "SearchBoolean.c"
+#line 3052 "SearchBoolean.c"
 	} else {
-		gboolean _tmp109_ = FALSE;
+		gboolean _tmp109_;
 #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp109_ = ret;
 #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp106_ = _tmp109_;
-#line 3086 "SearchBoolean.c"
+#line 3059 "SearchBoolean.c"
 	}
 #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	result = _tmp106_;
 #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 3092 "SearchBoolean.c"
+#line 3065 "SearchBoolean.c"
 }
 
 
 const gchar* search_condition_text_get_text (SearchConditionText* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION_TEXT (self), NULL);
 #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3104,13 +3077,13 @@ const gchar* search_condition_text_get_text (SearchConditionText* self) {
 	result = _tmp0_;
 #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 3107 "SearchBoolean.c"
+#line 3080 "SearchBoolean.c"
 }
 
 
 static void search_condition_text_set_text (SearchConditionText* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_TEXT (self));
 #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3121,13 +3094,13 @@ static void search_condition_text_set_text (SearchConditionText* self, const gch
 	_g_free0 (self->priv->_text);
 #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_text = _tmp1_;
-#line 3124 "SearchBoolean.c"
+#line 3097 "SearchBoolean.c"
 }
 
 
 SearchConditionTextContext search_condition_text_get_context (SearchConditionText* self) {
 	SearchConditionTextContext result;
-	SearchConditionTextContext _tmp0_ = 0;
+	SearchConditionTextContext _tmp0_;
 #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION_TEXT (self), 0);
 #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3136,19 +3109,19 @@ SearchConditionTextContext search_condition_text_get_context (SearchConditionTex
 	result = _tmp0_;
 #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 3139 "SearchBoolean.c"
+#line 3112 "SearchBoolean.c"
 }
 
 
 static void search_condition_text_set_context (SearchConditionText* self, SearchConditionTextContext value) {
-	SearchConditionTextContext _tmp0_ = 0;
+	SearchConditionTextContext _tmp0_;
 #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_TEXT (self));
 #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = value;
 #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_context = _tmp0_;
-#line 3151 "SearchBoolean.c"
+#line 3124 "SearchBoolean.c"
 }
 
 
@@ -3160,19 +3133,19 @@ static void search_condition_text_class_init (SearchConditionTextClass * klass)
 #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_type_class_add_private (klass, sizeof (SearchConditionTextPrivate));
 #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_text_real_predicate;
-#line 3164 "SearchBoolean.c"
+	((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_text_real_predicate;
+#line 3137 "SearchBoolean.c"
 }
 
 
 static void search_condition_text_instance_init (SearchConditionText * self) {
 #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv = SEARCH_CONDITION_TEXT_GET_PRIVATE (self);
-#line 3171 "SearchBoolean.c"
+#line 3144 "SearchBoolean.c"
 }
 
 
-static void search_condition_text_finalize (SearchCondition* obj) {
+static void search_condition_text_finalize (SearchCondition * obj) {
 	SearchConditionText * self;
 #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_TEXT, SearchConditionText);
@@ -3180,7 +3153,7 @@ static void search_condition_text_finalize (SearchCondition* obj) {
 	_g_free0 (self->priv->_text);
 #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	SEARCH_CONDITION_CLASS (search_condition_text_parent_class)->finalize (obj);
-#line 3183 "SearchBoolean.c"
+#line 3156 "SearchBoolean.c"
 }
 
 
@@ -3202,36 +3175,36 @@ gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeCo
 	switch (self) {
 #line 360 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS:
-#line 3205 "SearchBoolean.c"
+#line 3178 "SearchBoolean.c"
 		{
-			gchar* _tmp0_ = NULL;
+			gchar* _tmp0_;
 #line 362 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp0_ = g_strdup ("IS");
 #line 362 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp0_;
 #line 362 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3214 "SearchBoolean.c"
+#line 3187 "SearchBoolean.c"
 		}
 #line 360 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT:
-#line 3218 "SearchBoolean.c"
+#line 3191 "SearchBoolean.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 365 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp1_ = g_strdup ("IS_NOT");
 #line 365 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp1_;
 #line 365 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3227 "SearchBoolean.c"
+#line 3200 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 368 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:368: unrecognized media search context enumeration " \
 "value");
-#line 3233 "SearchBoolean.c"
+#line 3206 "SearchBoolean.c"
 		}
 	}
 }
@@ -3239,7 +3212,7 @@ gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeCo
 
 SearchConditionMediaTypeContext search_condition_media_type_context_from_string (const gchar* str) {
 	SearchConditionMediaTypeContext result = 0;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 372 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 373 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3250,9 +3223,9 @@ SearchConditionMediaTypeContext search_condition_media_type_context_from_string
 		result = SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS;
 #line 374 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 3252 "SearchBoolean.c"
+#line 3225 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_ = NULL;
+		const gchar* _tmp1_;
 #line 376 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = str;
 #line 376 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3261,14 +3234,14 @@ SearchConditionMediaTypeContext search_condition_media_type_context_from_string
 			result = SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT;
 #line 377 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3263 "SearchBoolean.c"
+#line 3236 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_ = NULL;
+			const gchar* _tmp2_;
 #line 380 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp2_ = str;
 #line 380 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:380: unrecognized media search context name: %s", _tmp2_);
-#line 3270 "SearchBoolean.c"
+#line 3243 "SearchBoolean.c"
 		}
 	}
 }
@@ -3292,49 +3265,49 @@ gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTyp
 	switch (self) {
 #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL:
-#line 3294 "SearchBoolean.c"
+#line 3267 "SearchBoolean.c"
 		{
-			gchar* _tmp0_ = NULL;
+			gchar* _tmp0_;
 #line 392 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp0_ = g_strdup ("PHOTO_ALL");
 #line 392 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp0_;
 #line 392 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3303 "SearchBoolean.c"
+#line 3276 "SearchBoolean.c"
 		}
 #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW:
-#line 3307 "SearchBoolean.c"
+#line 3280 "SearchBoolean.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 395 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp1_ = g_strdup ("PHOTO_RAW");
 #line 395 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp1_;
 #line 395 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3316 "SearchBoolean.c"
+#line 3289 "SearchBoolean.c"
 		}
 #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO:
-#line 3320 "SearchBoolean.c"
+#line 3293 "SearchBoolean.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 398 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp2_ = g_strdup ("VIDEO");
 #line 398 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp2_;
 #line 398 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3329 "SearchBoolean.c"
+#line 3302 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 401 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:401: unrecognized media search type enumeration val" \
 "ue");
-#line 3335 "SearchBoolean.c"
+#line 3308 "SearchBoolean.c"
 		}
 	}
 }
@@ -3342,7 +3315,7 @@ gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTyp
 
 SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_string (const gchar* str) {
 	SearchConditionMediaTypeMediaType result = 0;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 405 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 406 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3353,9 +3326,9 @@ SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_st
 		result = SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL;
 #line 407 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 3354 "SearchBoolean.c"
+#line 3327 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_ = NULL;
+		const gchar* _tmp1_;
 #line 409 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = str;
 #line 409 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3364,9 +3337,9 @@ SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_st
 			result = SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW;
 #line 410 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3365 "SearchBoolean.c"
+#line 3338 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_ = NULL;
+			const gchar* _tmp2_;
 #line 412 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp2_ = str;
 #line 412 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3375,14 +3348,14 @@ SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_st
 				result = SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO;
 #line 413 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3376 "SearchBoolean.c"
+#line 3349 "SearchBoolean.c"
 			} else {
-				const gchar* _tmp3_ = NULL;
+				const gchar* _tmp3_;
 #line 416 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp3_ = str;
 #line 416 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				g_error ("SearchBoolean.vala:416: unrecognized media search type name: %s", _tmp3_);
-#line 3383 "SearchBoolean.c"
+#line 3356 "SearchBoolean.c"
 			}
 		}
 	}
@@ -3403,9 +3376,9 @@ GType search_condition_media_type_media_type_get_type (void) {
 
 SearchConditionMediaType* search_condition_media_type_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type) {
 	SearchConditionMediaType* self = NULL;
-	SearchConditionSearchType _tmp0_ = 0;
-	SearchConditionMediaTypeContext _tmp1_ = 0;
-	SearchConditionMediaTypeMediaType _tmp2_ = 0;
+	SearchConditionSearchType _tmp0_;
+	SearchConditionMediaTypeContext _tmp1_;
+	SearchConditionMediaTypeMediaType _tmp2_;
 #line 426 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = (SearchConditionMediaType*) search_condition_construct (object_type);
 #line 427 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3422,21 +3395,21 @@ SearchConditionMediaType* search_condition_media_type_construct (GType object_ty
 	search_condition_media_type_set_media_type (self, _tmp2_);
 #line 426 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 3423 "SearchBoolean.c"
+#line 3396 "SearchBoolean.c"
 }
 
 
 SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type) {
 #line 426 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return search_condition_media_type_construct (TYPE_SEARCH_CONDITION_MEDIA_TYPE, search_type, context, media_type);
-#line 3430 "SearchBoolean.c"
+#line 3403 "SearchBoolean.c"
 }
 
 
 static gboolean search_condition_media_type_real_predicate (SearchCondition* base, MediaSource* source) {
 	SearchConditionMediaType * self;
 	gboolean result = FALSE;
-	SearchConditionMediaTypeMediaType _tmp0_ = 0;
+	SearchConditionMediaTypeMediaType _tmp0_;
 #line 433 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_MEDIA_TYPE, SearchConditionMediaType);
 #line 433 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3447,107 +3420,107 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas
 	switch (_tmp0_) {
 #line 436 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL:
-#line 3448 "SearchBoolean.c"
+#line 3421 "SearchBoolean.c"
 		{
-			MediaSource* _tmp1_ = NULL;
+			MediaSource* _tmp1_;
 #line 438 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp1_ = source;
 #line 438 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_PHOTO)) {
-#line 3455 "SearchBoolean.c"
-				SearchConditionMediaTypeContext _tmp2_ = 0;
+#line 3428 "SearchBoolean.c"
+				SearchConditionMediaTypeContext _tmp2_;
 #line 439 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp2_ = self->priv->_context;
 #line 439 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				result = _tmp2_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS;
 #line 439 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3463 "SearchBoolean.c"
+#line 3436 "SearchBoolean.c"
 			} else {
-				SearchConditionMediaTypeContext _tmp3_ = 0;
+				SearchConditionMediaTypeContext _tmp3_;
 #line 441 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp3_ = self->priv->_context;
 #line 441 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				result = _tmp3_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT;
 #line 441 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3472 "SearchBoolean.c"
+#line 3445 "SearchBoolean.c"
 			}
 		}
 #line 436 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW:
-#line 3477 "SearchBoolean.c"
+#line 3450 "SearchBoolean.c"
 		{
 			gboolean _tmp4_ = FALSE;
-			MediaSource* _tmp5_ = NULL;
+			MediaSource* _tmp5_;
 #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp5_ = source;
 #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_PHOTO)) {
-#line 3485 "SearchBoolean.c"
-				MediaSource* _tmp6_ = NULL;
-				PhotoFileFormat _tmp7_ = 0;
+#line 3458 "SearchBoolean.c"
+				MediaSource* _tmp6_;
+				PhotoFileFormat _tmp7_;
 #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp6_ = source;
 #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp7_ = photo_get_master_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo));
 #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp4_ = _tmp7_ == PHOTO_FILE_FORMAT_RAW;
-#line 3494 "SearchBoolean.c"
+#line 3467 "SearchBoolean.c"
 			} else {
 #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp4_ = FALSE;
-#line 3498 "SearchBoolean.c"
+#line 3471 "SearchBoolean.c"
 			}
 #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_tmp4_) {
-#line 3502 "SearchBoolean.c"
-				SearchConditionMediaTypeContext _tmp8_ = 0;
+#line 3475 "SearchBoolean.c"
+				SearchConditionMediaTypeContext _tmp8_;
 #line 445 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp8_ = self->priv->_context;
 #line 445 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				result = _tmp8_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS;
 #line 445 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3510 "SearchBoolean.c"
+#line 3483 "SearchBoolean.c"
 			} else {
-				SearchConditionMediaTypeContext _tmp9_ = 0;
+				SearchConditionMediaTypeContext _tmp9_;
 #line 447 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp9_ = self->priv->_context;
 #line 447 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				result = _tmp9_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT;
 #line 447 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3519 "SearchBoolean.c"
+#line 3492 "SearchBoolean.c"
 			}
 		}
 #line 436 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO:
-#line 3524 "SearchBoolean.c"
+#line 3497 "SearchBoolean.c"
 		{
-			MediaSource* _tmp10_ = NULL;
+			MediaSource* _tmp10_;
 #line 450 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp10_ = source;
 #line 450 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_VIDEO_SOURCE)) {
-#line 3531 "SearchBoolean.c"
-				SearchConditionMediaTypeContext _tmp11_ = 0;
+#line 3504 "SearchBoolean.c"
+				SearchConditionMediaTypeContext _tmp11_;
 #line 451 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp11_ = self->priv->_context;
 #line 451 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				result = _tmp11_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS;
 #line 451 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3539 "SearchBoolean.c"
+#line 3512 "SearchBoolean.c"
 			} else {
-				SearchConditionMediaTypeContext _tmp12_ = 0;
+				SearchConditionMediaTypeContext _tmp12_;
 #line 453 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp12_ = self->priv->_context;
 #line 453 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				result = _tmp12_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT;
 #line 453 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3548 "SearchBoolean.c"
+#line 3521 "SearchBoolean.c"
 			}
 		}
 		default:
@@ -3555,7 +3528,7 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas
 #line 456 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:456: unrecognized media search type enumeration val" \
 "ue");
-#line 3555 "SearchBoolean.c"
+#line 3528 "SearchBoolean.c"
 		}
 	}
 }
@@ -3563,7 +3536,7 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas
 
 SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (SearchConditionMediaType* self) {
 	SearchConditionMediaTypeMediaType result;
-	SearchConditionMediaTypeMediaType _tmp0_ = 0;
+	SearchConditionMediaTypeMediaType _tmp0_;
 #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION_MEDIA_TYPE (self), 0);
 #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3572,25 +3545,25 @@ SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (Se
 	result = _tmp0_;
 #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 3572 "SearchBoolean.c"
+#line 3545 "SearchBoolean.c"
 }
 
 
 static void search_condition_media_type_set_media_type (SearchConditionMediaType* self, SearchConditionMediaTypeMediaType value) {
-	SearchConditionMediaTypeMediaType _tmp0_ = 0;
+	SearchConditionMediaTypeMediaType _tmp0_;
 #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_MEDIA_TYPE (self));
 #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = value;
 #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_media_type = _tmp0_;
-#line 3584 "SearchBoolean.c"
+#line 3557 "SearchBoolean.c"
 }
 
 
 SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchConditionMediaType* self) {
 	SearchConditionMediaTypeContext result;
-	SearchConditionMediaTypeContext _tmp0_ = 0;
+	SearchConditionMediaTypeContext _tmp0_;
 #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION_MEDIA_TYPE (self), 0);
 #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3599,19 +3572,19 @@ SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchC
 	result = _tmp0_;
 #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 3599 "SearchBoolean.c"
+#line 3572 "SearchBoolean.c"
 }
 
 
 static void search_condition_media_type_set_context (SearchConditionMediaType* self, SearchConditionMediaTypeContext value) {
-	SearchConditionMediaTypeContext _tmp0_ = 0;
+	SearchConditionMediaTypeContext _tmp0_;
 #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_MEDIA_TYPE (self));
 #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = value;
 #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_context = _tmp0_;
-#line 3611 "SearchBoolean.c"
+#line 3584 "SearchBoolean.c"
 }
 
 
@@ -3623,25 +3596,25 @@ static void search_condition_media_type_class_init (SearchConditionMediaTypeClas
 #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_type_class_add_private (klass, sizeof (SearchConditionMediaTypePrivate));
 #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_media_type_real_predicate;
-#line 3624 "SearchBoolean.c"
+	((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_media_type_real_predicate;
+#line 3597 "SearchBoolean.c"
 }
 
 
 static void search_condition_media_type_instance_init (SearchConditionMediaType * self) {
 #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv = SEARCH_CONDITION_MEDIA_TYPE_GET_PRIVATE (self);
-#line 3631 "SearchBoolean.c"
+#line 3604 "SearchBoolean.c"
 }
 
 
-static void search_condition_media_type_finalize (SearchCondition* obj) {
+static void search_condition_media_type_finalize (SearchCondition * obj) {
 	SearchConditionMediaType * self;
 #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_MEDIA_TYPE, SearchConditionMediaType);
 #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	SEARCH_CONDITION_CLASS (search_condition_media_type_parent_class)->finalize (obj);
-#line 3641 "SearchBoolean.c"
+#line 3614 "SearchBoolean.c"
 }
 
 
@@ -3663,36 +3636,36 @@ gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState sel
 	switch (self) {
 #line 468 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_FLAGGED_STATE_FLAGGED:
-#line 3663 "SearchBoolean.c"
+#line 3636 "SearchBoolean.c"
 		{
-			gchar* _tmp0_ = NULL;
+			gchar* _tmp0_;
 #line 470 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp0_ = g_strdup ("FLAGGED");
 #line 470 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp0_;
 #line 470 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3672 "SearchBoolean.c"
+#line 3645 "SearchBoolean.c"
 		}
 #line 468 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED:
-#line 3676 "SearchBoolean.c"
+#line 3649 "SearchBoolean.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 473 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp1_ = g_strdup ("UNFLAGGED");
 #line 473 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp1_;
 #line 473 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3685 "SearchBoolean.c"
+#line 3658 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 476 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:476: unrecognized flagged search state enumeration " \
 "value");
-#line 3691 "SearchBoolean.c"
+#line 3664 "SearchBoolean.c"
 		}
 	}
 }
@@ -3700,7 +3673,7 @@ gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState sel
 
 SearchConditionFlaggedState search_condition_flagged_state_from_string (const gchar* str) {
 	SearchConditionFlaggedState result = 0;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 480 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 481 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3711,9 +3684,9 @@ SearchConditionFlaggedState search_condition_flagged_state_from_string (const gc
 		result = SEARCH_CONDITION_FLAGGED_STATE_FLAGGED;
 #line 482 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 3710 "SearchBoolean.c"
+#line 3683 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_ = NULL;
+		const gchar* _tmp1_;
 #line 484 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = str;
 #line 484 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3722,14 +3695,14 @@ SearchConditionFlaggedState search_condition_flagged_state_from_string (const gc
 			result = SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED;
 #line 485 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3721 "SearchBoolean.c"
+#line 3694 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_ = NULL;
+			const gchar* _tmp2_;
 #line 488 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp2_ = str;
 #line 488 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:488: unrecognized flagged search state name: %s", _tmp2_);
-#line 3728 "SearchBoolean.c"
+#line 3701 "SearchBoolean.c"
 		}
 	}
 }
@@ -3749,8 +3722,8 @@ GType search_condition_flagged_state_get_type (void) {
 
 SearchConditionFlagged* search_condition_flagged_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionFlaggedState state) {
 	SearchConditionFlagged* self = NULL;
-	SearchConditionSearchType _tmp0_ = 0;
-	SearchConditionFlaggedState _tmp1_ = 0;
+	SearchConditionSearchType _tmp0_;
+	SearchConditionFlaggedState _tmp1_;
 #line 495 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = (SearchConditionFlagged*) search_condition_construct (object_type);
 #line 496 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3763,21 +3736,21 @@ SearchConditionFlagged* search_condition_flagged_construct (GType object_type, S
 	search_condition_flagged_set_state (self, _tmp1_);
 #line 495 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 3762 "SearchBoolean.c"
+#line 3735 "SearchBoolean.c"
 }
 
 
 SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type, SearchConditionFlaggedState state) {
 #line 495 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return search_condition_flagged_construct (TYPE_SEARCH_CONDITION_FLAGGED, search_type, state);
-#line 3769 "SearchBoolean.c"
+#line 3742 "SearchBoolean.c"
 }
 
 
 static gboolean search_condition_flagged_real_predicate (SearchCondition* base, MediaSource* source) {
 	SearchConditionFlagged * self;
 	gboolean result = FALSE;
-	SearchConditionFlaggedState _tmp0_ = 0;
+	SearchConditionFlaggedState _tmp0_;
 #line 501 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_FLAGGED, SearchConditionFlagged);
 #line 501 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3786,9 +3759,9 @@ static gboolean search_condition_flagged_real_predicate (SearchCondition* base,
 	_tmp0_ = self->priv->_state;
 #line 502 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp0_ == SEARCH_CONDITION_FLAGGED_STATE_FLAGGED) {
-#line 3785 "SearchBoolean.c"
-		MediaSource* _tmp1_ = NULL;
-		gboolean _tmp2_ = FALSE;
+#line 3758 "SearchBoolean.c"
+		MediaSource* _tmp1_;
+		gboolean _tmp2_;
 #line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = source;
 #line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3797,16 +3770,16 @@ static gboolean search_condition_flagged_real_predicate (SearchCondition* base,
 		result = _tmp2_;
 #line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 3796 "SearchBoolean.c"
+#line 3769 "SearchBoolean.c"
 	} else {
-		SearchConditionFlaggedState _tmp3_ = 0;
+		SearchConditionFlaggedState _tmp3_;
 #line 504 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp3_ = self->priv->_state;
 #line 504 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		if (_tmp3_ == SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED) {
-#line 3803 "SearchBoolean.c"
-			MediaSource* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 3776 "SearchBoolean.c"
+			MediaSource* _tmp4_;
+			gboolean _tmp5_;
 #line 505 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp4_ = source;
 #line 505 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3815,11 +3788,11 @@ static gboolean search_condition_flagged_real_predicate (SearchCondition* base,
 			result = !_tmp5_;
 #line 505 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3814 "SearchBoolean.c"
+#line 3787 "SearchBoolean.c"
 		} else {
 #line 507 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:507: unrecognized flagged search state");
-#line 3818 "SearchBoolean.c"
+#line 3791 "SearchBoolean.c"
 		}
 	}
 }
@@ -3827,7 +3800,7 @@ static gboolean search_condition_flagged_real_predicate (SearchCondition* base,
 
 SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionFlagged* self) {
 	SearchConditionFlaggedState result;
-	SearchConditionFlaggedState _tmp0_ = 0;
+	SearchConditionFlaggedState _tmp0_;
 #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION_FLAGGED (self), 0);
 #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3836,19 +3809,19 @@ SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionF
 	result = _tmp0_;
 #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 3835 "SearchBoolean.c"
+#line 3808 "SearchBoolean.c"
 }
 
 
 static void search_condition_flagged_set_state (SearchConditionFlagged* self, SearchConditionFlaggedState value) {
-	SearchConditionFlaggedState _tmp0_ = 0;
+	SearchConditionFlaggedState _tmp0_;
 #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_FLAGGED (self));
 #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = value;
 #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_state = _tmp0_;
-#line 3847 "SearchBoolean.c"
+#line 3820 "SearchBoolean.c"
 }
 
 
@@ -3860,25 +3833,25 @@ static void search_condition_flagged_class_init (SearchConditionFlaggedClass * k
 #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_type_class_add_private (klass, sizeof (SearchConditionFlaggedPrivate));
 #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_flagged_real_predicate;
-#line 3860 "SearchBoolean.c"
+	((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_flagged_real_predicate;
+#line 3833 "SearchBoolean.c"
 }
 
 
 static void search_condition_flagged_instance_init (SearchConditionFlagged * self) {
 #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv = SEARCH_CONDITION_FLAGGED_GET_PRIVATE (self);
-#line 3867 "SearchBoolean.c"
+#line 3840 "SearchBoolean.c"
 }
 
 
-static void search_condition_flagged_finalize (SearchCondition* obj) {
+static void search_condition_flagged_finalize (SearchCondition * obj) {
 	SearchConditionFlagged * self;
 #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_FLAGGED, SearchConditionFlagged);
 #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	SEARCH_CONDITION_CLASS (search_condition_flagged_parent_class)->finalize (obj);
-#line 3877 "SearchBoolean.c"
+#line 3850 "SearchBoolean.c"
 }
 
 
@@ -3900,36 +3873,36 @@ gchar* search_condition_modified_context_to_string (SearchConditionModifiedConte
 	switch (self) {
 #line 520 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MODIFIED_CONTEXT_HAS:
-#line 3899 "SearchBoolean.c"
+#line 3872 "SearchBoolean.c"
 		{
-			gchar* _tmp0_ = NULL;
+			gchar* _tmp0_;
 #line 522 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp0_ = g_strdup ("HAS");
 #line 522 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp0_;
 #line 522 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3908 "SearchBoolean.c"
+#line 3881 "SearchBoolean.c"
 		}
 #line 520 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO:
-#line 3912 "SearchBoolean.c"
+#line 3885 "SearchBoolean.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 525 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp1_ = g_strdup ("HAS_NO");
 #line 525 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp1_;
 #line 525 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3921 "SearchBoolean.c"
+#line 3894 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 528 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:528: unrecognized modified search context enumerati" \
 "on value");
-#line 3927 "SearchBoolean.c"
+#line 3900 "SearchBoolean.c"
 		}
 	}
 }
@@ -3937,7 +3910,7 @@ gchar* search_condition_modified_context_to_string (SearchConditionModifiedConte
 
 SearchConditionModifiedContext search_condition_modified_context_from_string (const gchar* str) {
 	SearchConditionModifiedContext result = 0;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 532 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 533 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3948,9 +3921,9 @@ SearchConditionModifiedContext search_condition_modified_context_from_string (co
 		result = SEARCH_CONDITION_MODIFIED_CONTEXT_HAS;
 #line 534 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 3946 "SearchBoolean.c"
+#line 3919 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_ = NULL;
+		const gchar* _tmp1_;
 #line 536 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = str;
 #line 536 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3959,14 +3932,14 @@ SearchConditionModifiedContext search_condition_modified_context_from_string (co
 			result = SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO;
 #line 537 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3957 "SearchBoolean.c"
+#line 3930 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_ = NULL;
+			const gchar* _tmp2_;
 #line 540 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp2_ = str;
 #line 540 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:540: unrecognized modified search context name: %s", _tmp2_);
-#line 3964 "SearchBoolean.c"
+#line 3937 "SearchBoolean.c"
 		}
 	}
 }
@@ -3990,49 +3963,49 @@ gchar* search_condition_modified_state_to_string (SearchConditionModifiedState s
 	switch (self) {
 #line 550 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MODIFIED_STATE_MODIFIED:
-#line 3988 "SearchBoolean.c"
+#line 3961 "SearchBoolean.c"
 		{
-			gchar* _tmp0_ = NULL;
+			gchar* _tmp0_;
 #line 552 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp0_ = g_strdup ("MODIFIED");
 #line 552 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp0_;
 #line 552 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3997 "SearchBoolean.c"
+#line 3970 "SearchBoolean.c"
 		}
 #line 550 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES:
-#line 4001 "SearchBoolean.c"
+#line 3974 "SearchBoolean.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 555 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp1_ = g_strdup ("INTERNAL_CHANGES");
 #line 555 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp1_;
 #line 555 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4010 "SearchBoolean.c"
+#line 3983 "SearchBoolean.c"
 		}
 #line 550 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES:
-#line 4014 "SearchBoolean.c"
+#line 3987 "SearchBoolean.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 558 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp2_ = g_strdup ("EXTERNAL_CHANGES");
 #line 558 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp2_;
 #line 558 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4023 "SearchBoolean.c"
+#line 3996 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 561 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:561: unrecognized modified search state enumeration" \
 " value");
-#line 4029 "SearchBoolean.c"
+#line 4002 "SearchBoolean.c"
 		}
 	}
 }
@@ -4040,7 +4013,7 @@ gchar* search_condition_modified_state_to_string (SearchConditionModifiedState s
 
 SearchConditionModifiedState search_condition_modified_state_from_string (const gchar* str) {
 	SearchConditionModifiedState result = 0;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 565 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 566 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4051,9 +4024,9 @@ SearchConditionModifiedState search_condition_modified_state_from_string (const
 		result = SEARCH_CONDITION_MODIFIED_STATE_MODIFIED;
 #line 567 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4048 "SearchBoolean.c"
+#line 4021 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_ = NULL;
+		const gchar* _tmp1_;
 #line 569 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = str;
 #line 569 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4062,9 +4035,9 @@ SearchConditionModifiedState search_condition_modified_state_from_string (const
 			result = SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES;
 #line 570 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4059 "SearchBoolean.c"
+#line 4032 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_ = NULL;
+			const gchar* _tmp2_;
 #line 572 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp2_ = str;
 #line 572 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4073,14 +4046,14 @@ SearchConditionModifiedState search_condition_modified_state_from_string (const
 				result = SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES;
 #line 573 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 4070 "SearchBoolean.c"
+#line 4043 "SearchBoolean.c"
 			} else {
-				const gchar* _tmp3_ = NULL;
+				const gchar* _tmp3_;
 #line 576 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp3_ = str;
 #line 576 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				g_error ("SearchBoolean.vala:576: unrecognized modified search state name: %s", _tmp3_);
-#line 4077 "SearchBoolean.c"
+#line 4050 "SearchBoolean.c"
 			}
 		}
 	}
@@ -4101,9 +4074,9 @@ GType search_condition_modified_state_get_type (void) {
 
 SearchConditionModified* search_condition_modified_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state) {
 	SearchConditionModified* self = NULL;
-	SearchConditionSearchType _tmp0_ = 0;
-	SearchConditionModifiedContext _tmp1_ = 0;
-	SearchConditionModifiedState _tmp2_ = 0;
+	SearchConditionSearchType _tmp0_;
+	SearchConditionModifiedContext _tmp1_;
+	SearchConditionModifiedState _tmp2_;
 #line 586 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = (SearchConditionModified*) search_condition_construct (object_type);
 #line 587 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4120,14 +4093,14 @@ SearchConditionModified* search_condition_modified_construct (GType object_type,
 	search_condition_modified_set_state (self, _tmp2_);
 #line 586 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 4117 "SearchBoolean.c"
+#line 4090 "SearchBoolean.c"
 }
 
 
 SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state) {
 #line 586 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return search_condition_modified_construct (TYPE_SEARCH_CONDITION_MODIFIED, search_type, context, state);
-#line 4124 "SearchBoolean.c"
+#line 4097 "SearchBoolean.c"
 }
 
 
@@ -4135,12 +4108,12 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base,
 	SearchConditionModified * self;
 	gboolean result = FALSE;
 	Photo* photo = NULL;
-	MediaSource* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
+	MediaSource* _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
 	gboolean match = FALSE;
-	SearchConditionModifiedState _tmp3_ = 0;
-	gboolean _tmp15_ = FALSE;
+	SearchConditionModifiedState _tmp3_;
+	gboolean _tmp15_;
 #line 593 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_MODIFIED, SearchConditionModified);
 #line 593 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4161,16 +4134,16 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base,
 		_g_object_unref0 (photo);
 #line 597 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4158 "SearchBoolean.c"
+#line 4131 "SearchBoolean.c"
 	}
 #line 600 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp3_ = self->priv->_state;
 #line 600 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp3_ == SEARCH_CONDITION_MODIFIED_STATE_MODIFIED) {
-#line 4164 "SearchBoolean.c"
+#line 4137 "SearchBoolean.c"
 		gboolean _tmp4_ = FALSE;
-		Photo* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		Photo* _tmp5_;
+		gboolean _tmp6_;
 #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp5_ = photo;
 #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4179,57 +4152,57 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base,
 		if (_tmp6_) {
 #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp4_ = TRUE;
-#line 4176 "SearchBoolean.c"
+#line 4149 "SearchBoolean.c"
 		} else {
-			Photo* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+			Photo* _tmp7_;
+			gboolean _tmp8_;
 #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp7_ = photo;
 #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp8_ = photo_has_editable (_tmp7_);
 #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp4_ = _tmp8_;
-#line 4186 "SearchBoolean.c"
+#line 4159 "SearchBoolean.c"
 		}
 #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		match = _tmp4_;
-#line 4190 "SearchBoolean.c"
+#line 4163 "SearchBoolean.c"
 	} else {
-		SearchConditionModifiedState _tmp9_ = 0;
+		SearchConditionModifiedState _tmp9_;
 #line 602 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp9_ = self->priv->_state;
 #line 602 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		if (_tmp9_ == SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES) {
-#line 4197 "SearchBoolean.c"
-			Photo* _tmp10_ = NULL;
-			gboolean _tmp11_ = FALSE;
+#line 4170 "SearchBoolean.c"
+			Photo* _tmp10_;
+			gboolean _tmp11_;
 #line 603 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp10_ = photo;
 #line 603 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp11_ = photo_has_transformations (_tmp10_);
 #line 603 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			match = _tmp11_;
-#line 4206 "SearchBoolean.c"
+#line 4179 "SearchBoolean.c"
 		} else {
-			SearchConditionModifiedState _tmp12_ = 0;
+			SearchConditionModifiedState _tmp12_;
 #line 604 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp12_ = self->priv->_state;
 #line 604 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_tmp12_ == SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES) {
-#line 4213 "SearchBoolean.c"
-				Photo* _tmp13_ = NULL;
-				gboolean _tmp14_ = FALSE;
+#line 4186 "SearchBoolean.c"
+				Photo* _tmp13_;
+				gboolean _tmp14_;
 #line 605 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp13_ = photo;
 #line 605 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp14_ = photo_has_editable (_tmp13_);
 #line 605 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				match = _tmp14_;
-#line 4222 "SearchBoolean.c"
+#line 4195 "SearchBoolean.c"
 			} else {
 #line 607 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				g_error ("SearchBoolean.vala:607: unrecognized modified search state");
-#line 4226 "SearchBoolean.c"
+#line 4199 "SearchBoolean.c"
 			}
 		}
 	}
@@ -4237,8 +4210,8 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base,
 	_tmp15_ = match;
 #line 609 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp15_) {
-#line 4234 "SearchBoolean.c"
-		SearchConditionModifiedContext _tmp16_ = 0;
+#line 4207 "SearchBoolean.c"
+		SearchConditionModifiedContext _tmp16_;
 #line 610 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp16_ = self->priv->_context;
 #line 610 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4247,9 +4220,9 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base,
 		_g_object_unref0 (photo);
 #line 610 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4244 "SearchBoolean.c"
+#line 4217 "SearchBoolean.c"
 	} else {
-		SearchConditionModifiedContext _tmp17_ = 0;
+		SearchConditionModifiedContext _tmp17_;
 #line 612 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp17_ = self->priv->_context;
 #line 612 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4258,17 +4231,17 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base,
 		_g_object_unref0 (photo);
 #line 612 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4255 "SearchBoolean.c"
+#line 4228 "SearchBoolean.c"
 	}
 #line 593 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_g_object_unref0 (photo);
-#line 4259 "SearchBoolean.c"
+#line 4232 "SearchBoolean.c"
 }
 
 
 SearchConditionModifiedState search_condition_modified_get_state (SearchConditionModified* self) {
 	SearchConditionModifiedState result;
-	SearchConditionModifiedState _tmp0_ = 0;
+	SearchConditionModifiedState _tmp0_;
 #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION_MODIFIED (self), 0);
 #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4277,25 +4250,25 @@ SearchConditionModifiedState search_condition_modified_get_state (SearchConditio
 	result = _tmp0_;
 #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 4274 "SearchBoolean.c"
+#line 4247 "SearchBoolean.c"
 }
 
 
 static void search_condition_modified_set_state (SearchConditionModified* self, SearchConditionModifiedState value) {
-	SearchConditionModifiedState _tmp0_ = 0;
+	SearchConditionModifiedState _tmp0_;
 #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_MODIFIED (self));
 #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = value;
 #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_state = _tmp0_;
-#line 4286 "SearchBoolean.c"
+#line 4259 "SearchBoolean.c"
 }
 
 
 SearchConditionModifiedContext search_condition_modified_get_context (SearchConditionModified* self) {
 	SearchConditionModifiedContext result;
-	SearchConditionModifiedContext _tmp0_ = 0;
+	SearchConditionModifiedContext _tmp0_;
 #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION_MODIFIED (self), 0);
 #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4304,19 +4277,19 @@ SearchConditionModifiedContext search_condition_modified_get_context (SearchCond
 	result = _tmp0_;
 #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 4301 "SearchBoolean.c"
+#line 4274 "SearchBoolean.c"
 }
 
 
 static void search_condition_modified_set_context (SearchConditionModified* self, SearchConditionModifiedContext value) {
-	SearchConditionModifiedContext _tmp0_ = 0;
+	SearchConditionModifiedContext _tmp0_;
 #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_MODIFIED (self));
 #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = value;
 #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_context = _tmp0_;
-#line 4313 "SearchBoolean.c"
+#line 4286 "SearchBoolean.c"
 }
 
 
@@ -4328,25 +4301,25 @@ static void search_condition_modified_class_init (SearchConditionModifiedClass *
 #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_type_class_add_private (klass, sizeof (SearchConditionModifiedPrivate));
 #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_modified_real_predicate;
-#line 4326 "SearchBoolean.c"
+	((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_modified_real_predicate;
+#line 4299 "SearchBoolean.c"
 }
 
 
 static void search_condition_modified_instance_init (SearchConditionModified * self) {
 #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv = SEARCH_CONDITION_MODIFIED_GET_PRIVATE (self);
-#line 4333 "SearchBoolean.c"
+#line 4306 "SearchBoolean.c"
 }
 
 
-static void search_condition_modified_finalize (SearchCondition* obj) {
+static void search_condition_modified_finalize (SearchCondition * obj) {
 	SearchConditionModified * self;
 #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_MODIFIED, SearchConditionModified);
 #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	SEARCH_CONDITION_CLASS (search_condition_modified_parent_class)->finalize (obj);
-#line 4343 "SearchBoolean.c"
+#line 4316 "SearchBoolean.c"
 }
 
 
@@ -4368,49 +4341,49 @@ gchar* search_condition_rating_context_to_string (SearchConditionRatingContext s
 	switch (self) {
 #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER:
-#line 4365 "SearchBoolean.c"
+#line 4338 "SearchBoolean.c"
 		{
-			gchar* _tmp0_ = NULL;
+			gchar* _tmp0_;
 #line 627 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp0_ = g_strdup ("AND_HIGHER");
 #line 627 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp0_;
 #line 627 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4374 "SearchBoolean.c"
+#line 4347 "SearchBoolean.c"
 		}
 #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_RATING_CONTEXT_ONLY:
-#line 4378 "SearchBoolean.c"
+#line 4351 "SearchBoolean.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 630 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp1_ = g_strdup ("ONLY");
 #line 630 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp1_;
 #line 630 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4387 "SearchBoolean.c"
+#line 4360 "SearchBoolean.c"
 		}
 #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER:
-#line 4391 "SearchBoolean.c"
+#line 4364 "SearchBoolean.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 633 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp2_ = g_strdup ("AND_LOWER");
 #line 633 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp2_;
 #line 633 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4400 "SearchBoolean.c"
+#line 4373 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 636 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:636: unrecognized rating search context enumeration" \
 " value");
-#line 4406 "SearchBoolean.c"
+#line 4379 "SearchBoolean.c"
 		}
 	}
 }
@@ -4418,7 +4391,7 @@ gchar* search_condition_rating_context_to_string (SearchConditionRatingContext s
 
 SearchConditionRatingContext search_condition_rating_context_from_string (const gchar* str) {
 	SearchConditionRatingContext result = 0;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 640 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 641 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4429,9 +4402,9 @@ SearchConditionRatingContext search_condition_rating_context_from_string (const
 		result = SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER;
 #line 642 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4425 "SearchBoolean.c"
+#line 4398 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_ = NULL;
+		const gchar* _tmp1_;
 #line 644 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = str;
 #line 644 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4440,9 +4413,9 @@ SearchConditionRatingContext search_condition_rating_context_from_string (const
 			result = SEARCH_CONDITION_RATING_CONTEXT_ONLY;
 #line 645 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4436 "SearchBoolean.c"
+#line 4409 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_ = NULL;
+			const gchar* _tmp2_;
 #line 647 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp2_ = str;
 #line 647 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4451,14 +4424,14 @@ SearchConditionRatingContext search_condition_rating_context_from_string (const
 				result = SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER;
 #line 648 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 4447 "SearchBoolean.c"
+#line 4420 "SearchBoolean.c"
 			} else {
-				const gchar* _tmp3_ = NULL;
+				const gchar* _tmp3_;
 #line 651 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp3_ = str;
 #line 651 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				g_error ("SearchBoolean.vala:651: unrecognized rating search context name: %s", _tmp3_);
-#line 4454 "SearchBoolean.c"
+#line 4427 "SearchBoolean.c"
 			}
 		}
 	}
@@ -4479,9 +4452,9 @@ GType search_condition_rating_context_get_type (void) {
 
 SearchConditionRating* search_condition_rating_construct (GType object_type, SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context) {
 	SearchConditionRating* self = NULL;
-	SearchConditionSearchType _tmp0_ = 0;
-	Rating _tmp1_ = 0;
-	SearchConditionRatingContext _tmp2_ = 0;
+	SearchConditionSearchType _tmp0_;
+	Rating _tmp1_;
+	SearchConditionRatingContext _tmp2_;
 #line 661 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = (SearchConditionRating*) search_condition_construct (object_type);
 #line 662 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4498,14 +4471,14 @@ SearchConditionRating* search_condition_rating_construct (GType object_type, Sea
 	search_condition_rating_set_context (self, _tmp2_);
 #line 661 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 4494 "SearchBoolean.c"
+#line 4467 "SearchBoolean.c"
 }
 
 
 SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context) {
 #line 661 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return search_condition_rating_construct (TYPE_SEARCH_CONDITION_RATING, search_type, rating, context);
-#line 4501 "SearchBoolean.c"
+#line 4474 "SearchBoolean.c"
 }
 
 
@@ -4513,9 +4486,9 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M
 	SearchConditionRating * self;
 	gboolean result = FALSE;
 	Rating source_rating = 0;
-	MediaSource* _tmp0_ = NULL;
-	Rating _tmp1_ = 0;
-	SearchConditionRatingContext _tmp2_ = 0;
+	MediaSource* _tmp0_;
+	Rating _tmp1_;
+	SearchConditionRatingContext _tmp2_;
 #line 668 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_RATING, SearchConditionRating);
 #line 668 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4530,9 +4503,9 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M
 	_tmp2_ = self->priv->_context;
 #line 670 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp2_ == SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER) {
-#line 4526 "SearchBoolean.c"
-		Rating _tmp3_ = 0;
-		Rating _tmp4_ = 0;
+#line 4499 "SearchBoolean.c"
+		Rating _tmp3_;
+		Rating _tmp4_;
 #line 671 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp3_ = source_rating;
 #line 671 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4541,16 +4514,16 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M
 		result = _tmp3_ >= _tmp4_;
 #line 671 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4537 "SearchBoolean.c"
+#line 4510 "SearchBoolean.c"
 	} else {
-		SearchConditionRatingContext _tmp5_ = 0;
+		SearchConditionRatingContext _tmp5_;
 #line 672 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp5_ = self->priv->_context;
 #line 672 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		if (_tmp5_ == SEARCH_CONDITION_RATING_CONTEXT_ONLY) {
-#line 4544 "SearchBoolean.c"
-			Rating _tmp6_ = 0;
-			Rating _tmp7_ = 0;
+#line 4517 "SearchBoolean.c"
+			Rating _tmp6_;
+			Rating _tmp7_;
 #line 673 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp6_ = source_rating;
 #line 673 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4559,16 +4532,16 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M
 			result = _tmp6_ == _tmp7_;
 #line 673 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4555 "SearchBoolean.c"
+#line 4528 "SearchBoolean.c"
 		} else {
-			SearchConditionRatingContext _tmp8_ = 0;
+			SearchConditionRatingContext _tmp8_;
 #line 674 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp8_ = self->priv->_context;
 #line 674 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_tmp8_ == SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER) {
-#line 4562 "SearchBoolean.c"
-				Rating _tmp9_ = 0;
-				Rating _tmp10_ = 0;
+#line 4535 "SearchBoolean.c"
+				Rating _tmp9_;
+				Rating _tmp10_;
 #line 675 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp9_ = source_rating;
 #line 675 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4577,11 +4550,11 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M
 				result = _tmp9_ <= _tmp10_;
 #line 675 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 4573 "SearchBoolean.c"
+#line 4546 "SearchBoolean.c"
 			} else {
 #line 677 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				g_error ("SearchBoolean.vala:677: unknown rating search context");
-#line 4577 "SearchBoolean.c"
+#line 4550 "SearchBoolean.c"
 			}
 		}
 	}
@@ -4590,7 +4563,7 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M
 
 Rating search_condition_rating_get_rating (SearchConditionRating* self) {
 	Rating result;
-	Rating _tmp0_ = 0;
+	Rating _tmp0_;
 #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION_RATING (self), 0);
 #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4599,25 +4572,25 @@ Rating search_condition_rating_get_rating (SearchConditionRating* self) {
 	result = _tmp0_;
 #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 4595 "SearchBoolean.c"
+#line 4568 "SearchBoolean.c"
 }
 
 
 static void search_condition_rating_set_rating (SearchConditionRating* self, Rating value) {
-	Rating _tmp0_ = 0;
+	Rating _tmp0_;
 #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_RATING (self));
 #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = value;
 #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_rating = _tmp0_;
-#line 4607 "SearchBoolean.c"
+#line 4580 "SearchBoolean.c"
 }
 
 
 SearchConditionRatingContext search_condition_rating_get_context (SearchConditionRating* self) {
 	SearchConditionRatingContext result;
-	SearchConditionRatingContext _tmp0_ = 0;
+	SearchConditionRatingContext _tmp0_;
 #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION_RATING (self), 0);
 #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4626,19 +4599,19 @@ SearchConditionRatingContext search_condition_rating_get_context (SearchConditio
 	result = _tmp0_;
 #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 4622 "SearchBoolean.c"
+#line 4595 "SearchBoolean.c"
 }
 
 
 static void search_condition_rating_set_context (SearchConditionRating* self, SearchConditionRatingContext value) {
-	SearchConditionRatingContext _tmp0_ = 0;
+	SearchConditionRatingContext _tmp0_;
 #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_RATING (self));
 #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = value;
 #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_context = _tmp0_;
-#line 4634 "SearchBoolean.c"
+#line 4607 "SearchBoolean.c"
 }
 
 
@@ -4650,25 +4623,25 @@ static void search_condition_rating_class_init (SearchConditionRatingClass * kla
 #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_type_class_add_private (klass, sizeof (SearchConditionRatingPrivate));
 #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_rating_real_predicate;
-#line 4647 "SearchBoolean.c"
+	((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_rating_real_predicate;
+#line 4620 "SearchBoolean.c"
 }
 
 
 static void search_condition_rating_instance_init (SearchConditionRating * self) {
 #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv = SEARCH_CONDITION_RATING_GET_PRIVATE (self);
-#line 4654 "SearchBoolean.c"
+#line 4627 "SearchBoolean.c"
 }
 
 
-static void search_condition_rating_finalize (SearchCondition* obj) {
+static void search_condition_rating_finalize (SearchCondition * obj) {
 	SearchConditionRating * self;
 #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_RATING, SearchConditionRating);
 #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	SEARCH_CONDITION_CLASS (search_condition_rating_parent_class)->finalize (obj);
-#line 4664 "SearchBoolean.c"
+#line 4637 "SearchBoolean.c"
 }
 
 
@@ -4690,75 +4663,75 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self)
 	switch (self) {
 #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_EXACT:
-#line 4686 "SearchBoolean.c"
+#line 4659 "SearchBoolean.c"
 		{
-			gchar* _tmp0_ = NULL;
+			gchar* _tmp0_;
 #line 694 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp0_ = g_strdup ("EXACT");
 #line 694 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp0_;
 #line 694 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4695 "SearchBoolean.c"
+#line 4668 "SearchBoolean.c"
 		}
 #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_AFTER:
-#line 4699 "SearchBoolean.c"
+#line 4672 "SearchBoolean.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 697 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp1_ = g_strdup ("AFTER");
 #line 697 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp1_;
 #line 697 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4708 "SearchBoolean.c"
+#line 4681 "SearchBoolean.c"
 		}
 #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_BEFORE:
-#line 4712 "SearchBoolean.c"
+#line 4685 "SearchBoolean.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 700 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp2_ = g_strdup ("BEFORE");
 #line 700 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp2_;
 #line 700 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4721 "SearchBoolean.c"
+#line 4694 "SearchBoolean.c"
 		}
 #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_BETWEEN:
-#line 4725 "SearchBoolean.c"
+#line 4698 "SearchBoolean.c"
 		{
-			gchar* _tmp3_ = NULL;
+			gchar* _tmp3_;
 #line 703 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp3_ = g_strdup ("BETWEEN");
 #line 703 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp3_;
 #line 703 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4734 "SearchBoolean.c"
+#line 4707 "SearchBoolean.c"
 		}
 #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET:
-#line 4738 "SearchBoolean.c"
+#line 4711 "SearchBoolean.c"
 		{
-			gchar* _tmp4_ = NULL;
+			gchar* _tmp4_;
 #line 706 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp4_ = g_strdup ("IS_NOT_SET");
 #line 706 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp4_;
 #line 706 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4747 "SearchBoolean.c"
+#line 4720 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 709 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:709: unrecognized date search context enumeration v" \
 "alue");
-#line 4753 "SearchBoolean.c"
+#line 4726 "SearchBoolean.c"
 		}
 	}
 }
@@ -4766,8 +4739,8 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self)
 
 SearchConditionDateContext search_condition_date_context_from_string (const gchar* str) {
 	SearchConditionDateContext result = 0;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 #line 713 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 714 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4778,7 +4751,7 @@ SearchConditionDateContext search_condition_date_context_from_string (const gcha
 		result = SEARCH_CONDITION_DATE_CONTEXT_EXACT;
 #line 715 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4773 "SearchBoolean.c"
+#line 4746 "SearchBoolean.c"
 	}
 #line 717 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp1_ = str;
@@ -4788,9 +4761,9 @@ SearchConditionDateContext search_condition_date_context_from_string (const gcha
 		result = SEARCH_CONDITION_DATE_CONTEXT_AFTER;
 #line 718 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4783 "SearchBoolean.c"
+#line 4756 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 720 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp2_ = str;
 #line 720 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4799,9 +4772,9 @@ SearchConditionDateContext search_condition_date_context_from_string (const gcha
 			result = SEARCH_CONDITION_DATE_CONTEXT_BEFORE;
 #line 721 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4794 "SearchBoolean.c"
+#line 4767 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp3_ = NULL;
+			const gchar* _tmp3_;
 #line 723 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp3_ = str;
 #line 723 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4810,9 +4783,9 @@ SearchConditionDateContext search_condition_date_context_from_string (const gcha
 				result = SEARCH_CONDITION_DATE_CONTEXT_BETWEEN;
 #line 724 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 4805 "SearchBoolean.c"
+#line 4778 "SearchBoolean.c"
 			} else {
-				const gchar* _tmp4_ = NULL;
+				const gchar* _tmp4_;
 #line 726 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp4_ = str;
 #line 726 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4821,14 +4794,14 @@ SearchConditionDateContext search_condition_date_context_from_string (const gcha
 					result = SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET;
 #line 727 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					return result;
-#line 4816 "SearchBoolean.c"
+#line 4789 "SearchBoolean.c"
 				} else {
-					const gchar* _tmp5_ = NULL;
+					const gchar* _tmp5_;
 #line 730 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					_tmp5_ = str;
 #line 730 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					g_error ("SearchBoolean.vala:730: unrecognized date search context name: %s", _tmp5_);
-#line 4823 "SearchBoolean.c"
+#line 4796 "SearchBoolean.c"
 				}
 			}
 		}
@@ -4850,10 +4823,10 @@ GType search_condition_date_context_get_type (void) {
 
 SearchConditionDate* search_condition_date_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two) {
 	SearchConditionDate* self = NULL;
-	SearchConditionSearchType _tmp0_ = 0;
-	SearchConditionDateContext _tmp1_ = 0;
+	SearchConditionSearchType _tmp0_;
+	SearchConditionDateContext _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	SearchConditionDateContext _tmp3_ = 0;
+	SearchConditionDateContext _tmp3_;
 #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (date_one != NULL, NULL);
 #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4874,11 +4847,11 @@ SearchConditionDate* search_condition_date_construct (GType object_type, SearchC
 	if (_tmp3_ != SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) {
 #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp2_ = TRUE;
-#line 4869 "SearchBoolean.c"
+#line 4842 "SearchBoolean.c"
 	} else {
-		GDateTime* _tmp4_ = NULL;
-		GDateTime* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
+		GDateTime* _tmp4_;
+		GDateTime* _tmp5_;
+		gint _tmp6_;
 #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp4_ = date_two;
 #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4887,13 +4860,13 @@ SearchConditionDate* search_condition_date_construct (GType object_type, SearchC
 		_tmp6_ = g_date_time_compare (_tmp4_, _tmp5_);
 #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp2_ = _tmp6_ >= 1;
-#line 4882 "SearchBoolean.c"
+#line 4855 "SearchBoolean.c"
 	}
 #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp2_) {
-#line 4886 "SearchBoolean.c"
-		GDateTime* _tmp7_ = NULL;
-		GDateTime* _tmp8_ = NULL;
+#line 4859 "SearchBoolean.c"
+		GDateTime* _tmp7_;
+		GDateTime* _tmp8_;
 #line 746 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp7_ = date_one;
 #line 746 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4902,10 +4875,10 @@ SearchConditionDate* search_condition_date_construct (GType object_type, SearchC
 		_tmp8_ = date_two;
 #line 747 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		search_condition_date_set_date_two (self, _tmp8_);
-#line 4897 "SearchBoolean.c"
+#line 4870 "SearchBoolean.c"
 	} else {
-		GDateTime* _tmp9_ = NULL;
-		GDateTime* _tmp10_ = NULL;
+		GDateTime* _tmp9_;
+		GDateTime* _tmp10_;
 #line 749 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp9_ = date_two;
 #line 749 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4914,18 +4887,18 @@ SearchConditionDate* search_condition_date_construct (GType object_type, SearchC
 		_tmp10_ = date_one;
 #line 750 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		search_condition_date_set_date_two (self, _tmp10_);
-#line 4909 "SearchBoolean.c"
+#line 4882 "SearchBoolean.c"
 	}
 #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 4913 "SearchBoolean.c"
+#line 4886 "SearchBoolean.c"
 }
 
 
 SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two) {
 #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return search_condition_date_construct (TYPE_SEARCH_CONDITION_DATE, search_type, context, date_one, date_two);
-#line 4920 "SearchBoolean.c"
+#line 4893 "SearchBoolean.c"
 }
 
 
@@ -4933,13 +4906,13 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med
 	SearchConditionDate * self;
 	gboolean result = FALSE;
 	time_t exposure_time = 0;
-	MediaSource* _tmp0_ = NULL;
-	time_t _tmp1_ = 0;
-	time_t _tmp2_ = 0;
+	MediaSource* _tmp0_;
+	time_t _tmp1_;
+	time_t _tmp2_;
 	GDateTime* dt = NULL;
-	time_t _tmp4_ = 0;
-	GDateTime* _tmp5_ = NULL;
-	SearchConditionDateContext _tmp6_ = 0;
+	time_t _tmp4_;
+	GDateTime* _tmp5_;
+	SearchConditionDateContext _tmp6_;
 #line 756 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_DATE, SearchConditionDate);
 #line 756 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4954,15 +4927,15 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med
 	_tmp2_ = exposure_time;
 #line 758 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp2_ == ((time_t) 0)) {
-#line 4949 "SearchBoolean.c"
-		SearchConditionDateContext _tmp3_ = 0;
+#line 4922 "SearchBoolean.c"
+		SearchConditionDateContext _tmp3_;
 #line 759 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp3_ = self->priv->_context;
 #line 759 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		result = _tmp3_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET;
 #line 759 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4957 "SearchBoolean.c"
+#line 4930 "SearchBoolean.c"
 	}
 #line 761 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp4_ = exposure_time;
@@ -4976,15 +4949,15 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med
 	switch (_tmp6_) {
 #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_EXACT:
-#line 4971 "SearchBoolean.c"
+#line 4944 "SearchBoolean.c"
 		{
 			GDateTime* second = NULL;
-			GDateTime* _tmp7_ = NULL;
-			GDateTime* _tmp8_ = NULL;
+			GDateTime* _tmp7_;
+			GDateTime* _tmp8_;
 			gboolean _tmp9_ = FALSE;
-			GDateTime* _tmp10_ = NULL;
-			GDateTime* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
+			GDateTime* _tmp10_;
+			GDateTime* _tmp11_;
+			gint _tmp12_;
 #line 764 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp7_ = self->priv->_date_one;
 #line 764 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4999,10 +4972,10 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med
 			_tmp12_ = g_date_time_compare (_tmp10_, _tmp11_);
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_tmp12_ >= 0) {
-#line 4994 "SearchBoolean.c"
-				GDateTime* _tmp13_ = NULL;
-				GDateTime* _tmp14_ = NULL;
-				gint _tmp15_ = 0;
+#line 4967 "SearchBoolean.c"
+				GDateTime* _tmp13_;
+				GDateTime* _tmp14_;
+				gint _tmp15_;
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp13_ = dt;
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5011,11 +4984,11 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med
 				_tmp15_ = g_date_time_compare (_tmp13_, _tmp14_);
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp9_ = _tmp15_ < 0;
-#line 5006 "SearchBoolean.c"
+#line 4979 "SearchBoolean.c"
 			} else {
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp9_ = FALSE;
-#line 5010 "SearchBoolean.c"
+#line 4983 "SearchBoolean.c"
 			}
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp9_;
@@ -5025,15 +4998,15 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med
 			_g_date_time_unref0 (dt);
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 5020 "SearchBoolean.c"
+#line 4993 "SearchBoolean.c"
 		}
 #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_AFTER:
-#line 5024 "SearchBoolean.c"
+#line 4997 "SearchBoolean.c"
 		{
-			GDateTime* _tmp16_ = NULL;
-			GDateTime* _tmp17_ = NULL;
-			gint _tmp18_ = 0;
+			GDateTime* _tmp16_;
+			GDateTime* _tmp17_;
+			gint _tmp18_;
 #line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp16_ = dt;
 #line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5046,15 +5019,15 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med
 			_g_date_time_unref0 (dt);
 #line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 5041 "SearchBoolean.c"
+#line 5014 "SearchBoolean.c"
 		}
 #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_BEFORE:
-#line 5045 "SearchBoolean.c"
+#line 5018 "SearchBoolean.c"
 		{
-			GDateTime* _tmp19_ = NULL;
-			GDateTime* _tmp20_ = NULL;
-			gint _tmp21_ = 0;
+			GDateTime* _tmp19_;
+			GDateTime* _tmp20_;
+			gint _tmp21_;
 #line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp19_ = dt;
 #line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5067,19 +5040,19 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med
 			_g_date_time_unref0 (dt);
 #line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 5062 "SearchBoolean.c"
+#line 5035 "SearchBoolean.c"
 		}
 #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_BETWEEN:
-#line 5066 "SearchBoolean.c"
+#line 5039 "SearchBoolean.c"
 		{
 			GDateTime* second = NULL;
-			GDateTime* _tmp22_ = NULL;
-			GDateTime* _tmp23_ = NULL;
+			GDateTime* _tmp22_;
+			GDateTime* _tmp23_;
 			gboolean _tmp24_ = FALSE;
-			GDateTime* _tmp25_ = NULL;
-			GDateTime* _tmp26_ = NULL;
-			gint _tmp27_ = 0;
+			GDateTime* _tmp25_;
+			GDateTime* _tmp26_;
+			gint _tmp27_;
 #line 774 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp22_ = self->priv->_date_two;
 #line 774 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5094,10 +5067,10 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med
 			_tmp27_ = g_date_time_compare (_tmp25_, _tmp26_);
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_tmp27_ >= 0) {
-#line 5089 "SearchBoolean.c"
-				GDateTime* _tmp28_ = NULL;
-				GDateTime* _tmp29_ = NULL;
-				gint _tmp30_ = 0;
+#line 5062 "SearchBoolean.c"
+				GDateTime* _tmp28_;
+				GDateTime* _tmp29_;
+				gint _tmp30_;
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp28_ = dt;
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5106,11 +5079,11 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med
 				_tmp30_ = g_date_time_compare (_tmp28_, _tmp29_);
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp24_ = _tmp30_ < 0;
-#line 5101 "SearchBoolean.c"
+#line 5074 "SearchBoolean.c"
 			} else {
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp24_ = FALSE;
-#line 5105 "SearchBoolean.c"
+#line 5078 "SearchBoolean.c"
 			}
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp24_;
@@ -5120,11 +5093,11 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med
 			_g_date_time_unref0 (dt);
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 5115 "SearchBoolean.c"
+#line 5088 "SearchBoolean.c"
 		}
 #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET:
-#line 5119 "SearchBoolean.c"
+#line 5092 "SearchBoolean.c"
 		{
 #line 778 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = FALSE;
@@ -5132,25 +5105,25 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med
 			_g_date_time_unref0 (dt);
 #line 778 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 5127 "SearchBoolean.c"
+#line 5100 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 781 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:781: unrecognized date search context enumeration v" \
 "alue");
-#line 5133 "SearchBoolean.c"
+#line 5106 "SearchBoolean.c"
 		}
 	}
 #line 756 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_g_date_time_unref0 (dt);
-#line 5138 "SearchBoolean.c"
+#line 5111 "SearchBoolean.c"
 }
 
 
 GDateTime* search_condition_date_get_date_one (SearchConditionDate* self) {
 	GDateTime* result;
-	GDateTime* _tmp0_ = NULL;
+	GDateTime* _tmp0_;
 #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION_DATE (self), NULL);
 #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5159,20 +5132,20 @@ GDateTime* search_condition_date_get_date_one (SearchConditionDate* self) {
 	result = _tmp0_;
 #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5153 "SearchBoolean.c"
+#line 5126 "SearchBoolean.c"
 }
 
 
 static gpointer _g_date_time_ref0 (gpointer self) {
 #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self ? g_date_time_ref (self) : NULL;
-#line 5160 "SearchBoolean.c"
+#line 5133 "SearchBoolean.c"
 }
 
 
 static void search_condition_date_set_date_one (SearchConditionDate* self, GDateTime* value) {
-	GDateTime* _tmp0_ = NULL;
-	GDateTime* _tmp1_ = NULL;
+	GDateTime* _tmp0_;
+	GDateTime* _tmp1_;
 #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_DATE (self));
 #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5183,13 +5156,13 @@ static void search_condition_date_set_date_one (SearchConditionDate* self, GDate
 	_g_date_time_unref0 (self->priv->_date_one);
 #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_date_one = _tmp1_;
-#line 5177 "SearchBoolean.c"
+#line 5150 "SearchBoolean.c"
 }
 
 
 GDateTime* search_condition_date_get_date_two (SearchConditionDate* self) {
 	GDateTime* result;
-	GDateTime* _tmp0_ = NULL;
+	GDateTime* _tmp0_;
 #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION_DATE (self), NULL);
 #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5198,13 +5171,13 @@ GDateTime* search_condition_date_get_date_two (SearchConditionDate* self) {
 	result = _tmp0_;
 #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5192 "SearchBoolean.c"
+#line 5165 "SearchBoolean.c"
 }
 
 
 static void search_condition_date_set_date_two (SearchConditionDate* self, GDateTime* value) {
-	GDateTime* _tmp0_ = NULL;
-	GDateTime* _tmp1_ = NULL;
+	GDateTime* _tmp0_;
+	GDateTime* _tmp1_;
 #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_DATE (self));
 #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5215,13 +5188,13 @@ static void search_condition_date_set_date_two (SearchConditionDate* self, GDate
 	_g_date_time_unref0 (self->priv->_date_two);
 #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_date_two = _tmp1_;
-#line 5209 "SearchBoolean.c"
+#line 5182 "SearchBoolean.c"
 }
 
 
 SearchConditionDateContext search_condition_date_get_context (SearchConditionDate* self) {
 	SearchConditionDateContext result;
-	SearchConditionDateContext _tmp0_ = 0;
+	SearchConditionDateContext _tmp0_;
 #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION_DATE (self), 0);
 #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5230,19 +5203,19 @@ SearchConditionDateContext search_condition_date_get_context (SearchConditionDat
 	result = _tmp0_;
 #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5224 "SearchBoolean.c"
+#line 5197 "SearchBoolean.c"
 }
 
 
 static void search_condition_date_set_context (SearchConditionDate* self, SearchConditionDateContext value) {
-	SearchConditionDateContext _tmp0_ = 0;
+	SearchConditionDateContext _tmp0_;
 #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_DATE (self));
 #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = value;
 #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_context = _tmp0_;
-#line 5236 "SearchBoolean.c"
+#line 5209 "SearchBoolean.c"
 }
 
 
@@ -5254,19 +5227,19 @@ static void search_condition_date_class_init (SearchConditionDateClass * klass)
 #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_type_class_add_private (klass, sizeof (SearchConditionDatePrivate));
 #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_date_real_predicate;
-#line 5249 "SearchBoolean.c"
+	((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_date_real_predicate;
+#line 5222 "SearchBoolean.c"
 }
 
 
 static void search_condition_date_instance_init (SearchConditionDate * self) {
 #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv = SEARCH_CONDITION_DATE_GET_PRIVATE (self);
-#line 5256 "SearchBoolean.c"
+#line 5229 "SearchBoolean.c"
 }
 
 
-static void search_condition_date_finalize (SearchCondition* obj) {
+static void search_condition_date_finalize (SearchCondition * obj) {
 	SearchConditionDate * self;
 #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_DATE, SearchConditionDate);
@@ -5276,7 +5249,7 @@ static void search_condition_date_finalize (SearchCondition* obj) {
 	_g_date_time_unref0 (self->priv->_date_two);
 #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	SEARCH_CONDITION_CLASS (search_condition_date_parent_class)->finalize (obj);
-#line 5270 "SearchBoolean.c"
+#line 5243 "SearchBoolean.c"
 }
 
 
@@ -5295,15 +5268,15 @@ GType search_condition_date_get_type (void) {
 static gpointer _saved_search_row_ref0 (gpointer self) {
 #line 797 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self ? saved_search_row_ref (self) : NULL;
-#line 5289 "SearchBoolean.c"
+#line 5262 "SearchBoolean.c"
 }
 
 
 SavedSearch* saved_search_construct (GType object_type, SavedSearchRow* row, gint64 object_id) {
 	SavedSearch * self = NULL;
-	gint64 _tmp0_ = 0LL;
-	SavedSearchRow* _tmp1_ = NULL;
-	SavedSearchRow* _tmp2_ = NULL;
+	gint64 _tmp0_;
+	SavedSearchRow* _tmp1_;
+	SavedSearchRow* _tmp2_;
 #line 794 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_ROW (row), NULL);
 #line 795 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5320,23 +5293,23 @@ SavedSearch* saved_search_construct (GType object_type, SavedSearchRow* row, gin
 	self->priv->row = _tmp2_;
 #line 794 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 5314 "SearchBoolean.c"
+#line 5287 "SearchBoolean.c"
 }
 
 
 SavedSearch* saved_search_new (SavedSearchRow* row, gint64 object_id) {
 #line 794 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return saved_search_construct (TYPE_SAVED_SEARCH, row, object_id);
-#line 5321 "SearchBoolean.c"
+#line 5294 "SearchBoolean.c"
 }
 
 
 static gchar* saved_search_real_get_name (DataObject* base) {
 	SavedSearch * self;
 	gchar* result = NULL;
-	SavedSearchRow* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	SavedSearchRow* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 800 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH, SavedSearch);
 #line 801 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5349,17 +5322,17 @@ static gchar* saved_search_real_get_name (DataObject* base) {
 	result = _tmp2_;
 #line 801 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5343 "SearchBoolean.c"
+#line 5316 "SearchBoolean.c"
 }
 
 
 static gchar* saved_search_real_to_string (DataObject* base) {
 	SavedSearch * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 804 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH, SavedSearch);
 #line 805 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5376,14 +5349,14 @@ static gchar* saved_search_real_to_string (DataObject* base) {
 	result = _tmp3_;
 #line 805 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5370 "SearchBoolean.c"
+#line 5343 "SearchBoolean.c"
 }
 
 
 static gchar* saved_search_real_get_typename (DataSource* base) {
 	SavedSearch * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 808 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH, SavedSearch);
 #line 809 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5392,13 +5365,13 @@ static gchar* saved_search_real_get_typename (DataSource* base) {
 	result = _tmp0_;
 #line 809 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5386 "SearchBoolean.c"
+#line 5359 "SearchBoolean.c"
 }
 
 
 void saved_search_get_saved_search_id (SavedSearch* self, SavedSearchID* result) {
-	SavedSearchRow* _tmp0_ = NULL;
-	SavedSearchID _tmp1_ = {0};
+	SavedSearchRow* _tmp0_;
+	SavedSearchID _tmp1_;
 #line 812 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (self));
 #line 813 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5409,7 +5382,7 @@ void saved_search_get_saved_search_id (SavedSearch* self, SavedSearchID* result)
 	*result = _tmp1_;
 #line 813 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return;
-#line 5403 "SearchBoolean.c"
+#line 5376 "SearchBoolean.c"
 }
 
 
@@ -5417,7 +5390,7 @@ static gint64 saved_search_real_get_instance_id (DataSource* base) {
 	SavedSearch * self;
 	gint64 result = 0LL;
 	SavedSearchID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	gint64 _tmp1_;
 #line 816 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH, SavedSearch);
 #line 817 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5428,19 +5401,19 @@ static gint64 saved_search_real_get_instance_id (DataSource* base) {
 	result = _tmp1_;
 #line 817 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5422 "SearchBoolean.c"
+#line 5395 "SearchBoolean.c"
 }
 
 
 gint saved_search_compare_names (void* a, void* b) {
 	gint result = 0;
 	SavedSearch* asearch = NULL;
-	void* _tmp0_ = NULL;
+	void* _tmp0_;
 	SavedSearch* bsearch = NULL;
-	void* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	void* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gint _tmp4_;
 #line 821 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = a;
 #line 821 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5459,7 +5432,7 @@ gint saved_search_compare_names (void* a, void* b) {
 	result = _tmp4_;
 #line 824 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5453 "SearchBoolean.c"
+#line 5426 "SearchBoolean.c"
 }
 
 
@@ -5467,8 +5440,8 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 	gboolean result = FALSE;
 	gboolean ret = FALSE;
 	gboolean _tmp0_ = FALSE;
-	SavedSearchRow* _tmp1_ = NULL;
-	SearchOperator _tmp2_ = 0;
+	SavedSearchRow* _tmp1_;
+	SearchOperator _tmp2_;
 #line 827 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (self), FALSE);
 #line 827 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5481,37 +5454,37 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 	if (SEARCH_OPERATOR_ALL == _tmp2_) {
 #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp0_ = TRUE;
-#line 5475 "SearchBoolean.c"
+#line 5448 "SearchBoolean.c"
 	} else {
-		SavedSearchRow* _tmp3_ = NULL;
-		SearchOperator _tmp4_ = 0;
+		SavedSearchRow* _tmp3_;
+		SearchOperator _tmp4_;
 #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp3_ = self->priv->row;
 #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp4_ = _tmp3_->operator;
 #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp0_ = SEARCH_OPERATOR_NONE == _tmp4_;
-#line 5485 "SearchBoolean.c"
+#line 5458 "SearchBoolean.c"
 	}
 #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp0_) {
 #line 830 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		ret = TRUE;
-#line 5491 "SearchBoolean.c"
+#line 5464 "SearchBoolean.c"
 	} else {
 #line 832 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		ret = FALSE;
-#line 5495 "SearchBoolean.c"
+#line 5468 "SearchBoolean.c"
 	}
 	{
 		GeeList* _c_list = NULL;
-		SavedSearchRow* _tmp5_ = NULL;
-		GeeList* _tmp6_ = NULL;
-		GeeList* _tmp7_ = NULL;
+		SavedSearchRow* _tmp5_;
+		GeeList* _tmp6_;
+		GeeList* _tmp7_;
 		gint _c_size = 0;
-		GeeList* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
+		GeeList* _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
 		gint _c_index = 0;
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp5_ = self->priv->row;
@@ -5533,16 +5506,16 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 		_c_index = -1;
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		while (TRUE) {
-#line 5527 "SearchBoolean.c"
-			gint _tmp11_ = 0;
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
+#line 5500 "SearchBoolean.c"
+			gint _tmp11_;
+			gint _tmp12_;
+			gint _tmp13_;
 			SearchCondition* c = NULL;
-			GeeList* _tmp14_ = NULL;
-			gint _tmp15_ = 0;
-			gpointer _tmp16_ = NULL;
-			SavedSearchRow* _tmp17_ = NULL;
-			SearchOperator _tmp18_ = 0;
+			GeeList* _tmp14_;
+			gint _tmp15_;
+			gpointer _tmp16_;
+			SavedSearchRow* _tmp17_;
+			SearchOperator _tmp18_;
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp11_ = _c_index;
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5555,7 +5528,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 			if (!(_tmp12_ < _tmp13_)) {
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				break;
-#line 5549 "SearchBoolean.c"
+#line 5522 "SearchBoolean.c"
 			}
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp14_ = _c_list;
@@ -5571,11 +5544,11 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 			_tmp18_ = _tmp17_->operator;
 #line 835 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (SEARCH_OPERATOR_ALL == _tmp18_) {
-#line 5565 "SearchBoolean.c"
-				gboolean _tmp19_ = FALSE;
-				SearchCondition* _tmp20_ = NULL;
-				MediaSource* _tmp21_ = NULL;
-				gboolean _tmp22_ = FALSE;
+#line 5538 "SearchBoolean.c"
+				gboolean _tmp19_;
+				SearchCondition* _tmp20_;
+				MediaSource* _tmp21_;
+				gboolean _tmp22_;
 #line 836 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp19_ = ret;
 #line 836 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5586,21 +5559,21 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 				_tmp22_ = search_condition_predicate (_tmp20_, _tmp21_);
 #line 836 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				ret = _tmp19_ & _tmp22_;
-#line 5580 "SearchBoolean.c"
+#line 5553 "SearchBoolean.c"
 			} else {
-				SavedSearchRow* _tmp23_ = NULL;
-				SearchOperator _tmp24_ = 0;
+				SavedSearchRow* _tmp23_;
+				SearchOperator _tmp24_;
 #line 837 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp23_ = self->priv->row;
 #line 837 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp24_ = _tmp23_->operator;
 #line 837 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				if (SEARCH_OPERATOR_ANY == _tmp24_) {
-#line 5590 "SearchBoolean.c"
-					gboolean _tmp25_ = FALSE;
-					SearchCondition* _tmp26_ = NULL;
-					MediaSource* _tmp27_ = NULL;
-					gboolean _tmp28_ = FALSE;
+#line 5563 "SearchBoolean.c"
+					gboolean _tmp25_;
+					SearchCondition* _tmp26_;
+					MediaSource* _tmp27_;
+					gboolean _tmp28_;
 #line 838 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					_tmp25_ = ret;
 #line 838 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5611,21 +5584,21 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 					_tmp28_ = search_condition_predicate (_tmp26_, _tmp27_);
 #line 838 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					ret = _tmp25_ | _tmp28_;
-#line 5605 "SearchBoolean.c"
+#line 5578 "SearchBoolean.c"
 				} else {
-					SavedSearchRow* _tmp29_ = NULL;
-					SearchOperator _tmp30_ = 0;
+					SavedSearchRow* _tmp29_;
+					SearchOperator _tmp30_;
 #line 839 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					_tmp29_ = self->priv->row;
 #line 839 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					_tmp30_ = _tmp29_->operator;
 #line 839 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					if (SEARCH_OPERATOR_NONE == _tmp30_) {
-#line 5615 "SearchBoolean.c"
-						gboolean _tmp31_ = FALSE;
-						SearchCondition* _tmp32_ = NULL;
-						MediaSource* _tmp33_ = NULL;
-						gboolean _tmp34_ = FALSE;
+#line 5588 "SearchBoolean.c"
+						gboolean _tmp31_;
+						SearchCondition* _tmp32_;
+						MediaSource* _tmp33_;
+						gboolean _tmp34_;
 #line 840 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 						_tmp31_ = ret;
 #line 840 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5636,43 +5609,43 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 						_tmp34_ = search_condition_predicate (_tmp32_, _tmp33_);
 #line 840 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 						ret = _tmp31_ & (!_tmp34_);
-#line 5630 "SearchBoolean.c"
+#line 5603 "SearchBoolean.c"
 					}
 				}
 			}
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_search_condition_unref0 (c);
-#line 5636 "SearchBoolean.c"
+#line 5609 "SearchBoolean.c"
 		}
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_object_unref0 (_c_list);
-#line 5640 "SearchBoolean.c"
+#line 5613 "SearchBoolean.c"
 	}
 #line 842 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	result = ret;
 #line 842 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5646 "SearchBoolean.c"
+#line 5619 "SearchBoolean.c"
 }
 
 
 void saved_search_reconstitute (SavedSearch* self) {
-	SavedSearchTable* _tmp8_ = NULL;
-	SavedSearchTable* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
+	SavedSearchTable* _tmp8_;
+	SavedSearchTable* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 845 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (self));
-#line 5658 "SearchBoolean.c"
+#line 5631 "SearchBoolean.c"
 	{
 		SavedSearchID _tmp0_ = {0};
-		SavedSearchDBTable* _tmp1_ = NULL;
-		SavedSearchDBTable* _tmp2_ = NULL;
-		SavedSearchRow* _tmp3_ = NULL;
+		SavedSearchDBTable* _tmp1_;
+		SavedSearchDBTable* _tmp2_;
+		SavedSearchRow* _tmp3_;
 		SavedSearchID _tmp4_ = {0};
-		SavedSearchID _tmp5_ = {0};
-		SavedSearchRow* _tmp6_ = NULL;
+		SavedSearchID _tmp5_;
+		SavedSearchRow* _tmp6_;
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = saved_search_db_table_get_instance ();
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5691,8 +5664,8 @@ void saved_search_reconstitute (SavedSearch* self) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5685 "SearchBoolean.c"
-				goto __catch77_database_error;
+#line 5658 "SearchBoolean.c"
+				goto __catch78_database_error;
 			}
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5700,19 +5673,19 @@ void saved_search_reconstitute (SavedSearch* self) {
 			g_clear_error (&_inner_error_);
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return;
-#line 5694 "SearchBoolean.c"
+#line 5667 "SearchBoolean.c"
 		}
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp6_ = self->priv->row;
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp6_->search_id = _tmp0_;
-#line 5700 "SearchBoolean.c"
+#line 5673 "SearchBoolean.c"
 	}
-	goto __finally77;
-	__catch77_database_error:
+	goto __finally78;
+	__catch78_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp7_ = NULL;
+		GError* _tmp7_;
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		err = _inner_error_;
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5723,9 +5696,9 @@ void saved_search_reconstitute (SavedSearch* self) {
 		app_window_database_error (_tmp7_);
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_error_free0 (err);
-#line 5717 "SearchBoolean.c"
+#line 5690 "SearchBoolean.c"
 	}
-	__finally77:
+	__finally78:
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5734,7 +5707,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 		g_clear_error (&_inner_error_);
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return;
-#line 5728 "SearchBoolean.c"
+#line 5701 "SearchBoolean.c"
 	}
 #line 852 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp8_ = saved_search_table_get_instance ();
@@ -5752,28 +5725,28 @@ void saved_search_reconstitute (SavedSearch* self) {
 	g_debug ("SearchBoolean.vala:853: Reconstituted %s", _tmp11_);
 #line 853 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_g_free0 (_tmp11_);
-#line 5746 "SearchBoolean.c"
+#line 5719 "SearchBoolean.c"
 }
 
 
 gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	SavedSearchTable* _tmp2_ = NULL;
-	SavedSearchTable* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	SavedSearchTable* _tmp15_ = NULL;
-	SavedSearchTable* _tmp16_ = NULL;
-	SavedSearchRow* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	SavedSearchTable* _tmp20_ = NULL;
-	SavedSearchTable* _tmp21_ = NULL;
-	LibraryWindow* _tmp22_ = NULL;
-	LibraryWindow* _tmp23_ = NULL;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
+	SavedSearchTable* _tmp2_;
+	SavedSearchTable* _tmp3_;
+	const gchar* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	SavedSearchTable* _tmp15_;
+	SavedSearchTable* _tmp16_;
+	SavedSearchRow* _tmp17_;
+	const gchar* _tmp18_;
+	gchar* _tmp19_;
+	SavedSearchTable* _tmp20_;
+	SavedSearchTable* _tmp21_;
+	LibraryWindow* _tmp22_;
+	LibraryWindow* _tmp23_;
 	GError * _inner_error_ = NULL;
 #line 857 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (self), FALSE);
@@ -5789,7 +5762,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 		result = FALSE;
 #line 859 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 5783 "SearchBoolean.c"
+#line 5756 "SearchBoolean.c"
 	}
 #line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp2_ = saved_search_table_get_instance ();
@@ -5809,14 +5782,14 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 		result = FALSE;
 #line 862 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 5803 "SearchBoolean.c"
+#line 5776 "SearchBoolean.c"
 	}
 	{
-		SavedSearchDBTable* _tmp7_ = NULL;
-		SavedSearchDBTable* _tmp8_ = NULL;
-		SavedSearchRow* _tmp9_ = NULL;
-		SavedSearchID _tmp10_ = {0};
-		const gchar* _tmp11_ = NULL;
+		SavedSearchDBTable* _tmp7_;
+		SavedSearchDBTable* _tmp8_;
+		SavedSearchRow* _tmp9_;
+		SavedSearchID _tmp10_;
+		const gchar* _tmp11_;
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp7_ = saved_search_db_table_get_instance ();
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5833,12 +5806,12 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 		_database_table_unref0 (_tmp8_);
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5827 "SearchBoolean.c"
+#line 5800 "SearchBoolean.c"
 			gboolean _tmp12_ = FALSE;
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5831 "SearchBoolean.c"
-				goto __catch78_database_error;
+#line 5804 "SearchBoolean.c"
+				goto __catch79_database_error;
 			}
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5846,14 +5819,14 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 			g_clear_error (&_inner_error_);
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return _tmp12_;
-#line 5840 "SearchBoolean.c"
+#line 5813 "SearchBoolean.c"
 		}
 	}
-	goto __finally78;
-	__catch78_database_error:
+	goto __finally79;
+	__catch79_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp13_ = NULL;
+		GError* _tmp13_;
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		err = _inner_error_;
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5868,12 +5841,12 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 		_g_error_free0 (err);
 #line 868 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 5862 "SearchBoolean.c"
+#line 5835 "SearchBoolean.c"
 	}
-	__finally78:
+	__finally79:
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5867 "SearchBoolean.c"
+#line 5840 "SearchBoolean.c"
 		gboolean _tmp14_ = FALSE;
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5881,7 +5854,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 		g_clear_error (&_inner_error_);
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return _tmp14_;
-#line 5875 "SearchBoolean.c"
+#line 5848 "SearchBoolean.c"
 	}
 #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp15_ = saved_search_table_get_instance ();
@@ -5921,16 +5894,16 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 	result = TRUE;
 #line 876 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5915 "SearchBoolean.c"
+#line 5888 "SearchBoolean.c"
 }
 
 
 GeeList* saved_search_get_conditions (SavedSearch* self) {
 	GeeList* result = NULL;
-	SavedSearchRow* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	GeeList* _tmp3_ = NULL;
+	SavedSearchRow* _tmp0_;
+	GeeList* _tmp1_;
+	GeeList* _tmp2_;
+	GeeList* _tmp3_;
 #line 879 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (self), NULL);
 #line 880 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5945,14 +5918,14 @@ GeeList* saved_search_get_conditions (SavedSearch* self) {
 	result = _tmp3_;
 #line 880 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5939 "SearchBoolean.c"
+#line 5912 "SearchBoolean.c"
 }
 
 
 SearchOperator saved_search_get_operator (SavedSearch* self) {
 	SearchOperator result = 0;
-	SavedSearchRow* _tmp0_ = NULL;
-	SearchOperator _tmp1_ = 0;
+	SavedSearchRow* _tmp0_;
+	SearchOperator _tmp1_;
 #line 883 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (self), 0);
 #line 884 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5963,7 +5936,7 @@ SearchOperator saved_search_get_operator (SavedSearch* self) {
 	result = _tmp1_;
 #line 884 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5957 "SearchBoolean.c"
+#line 5930 "SearchBoolean.c"
 }
 
 
@@ -5973,27 +5946,27 @@ static void saved_search_class_init (SavedSearchClass * klass) {
 #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchPrivate));
 #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) saved_search_real_get_name;
+	((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) saved_search_real_get_name;
 #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) saved_search_real_to_string;
+	((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) saved_search_real_to_string;
 #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) saved_search_real_get_typename;
+	((DataSourceClass *) klass)->get_typename = (gchar* (*) (DataSource *)) saved_search_real_get_typename;
 #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) saved_search_real_get_instance_id;
+	((DataSourceClass *) klass)->get_instance_id = (gint64 (*) (DataSource *)) saved_search_real_get_instance_id;
 #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	G_OBJECT_CLASS (klass)->finalize = saved_search_finalize;
-#line 5976 "SearchBoolean.c"
+#line 5949 "SearchBoolean.c"
 }
 
 
 static void saved_search_instance_init (SavedSearch * self) {
 #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv = SAVED_SEARCH_GET_PRIVATE (self);
-#line 5983 "SearchBoolean.c"
+#line 5956 "SearchBoolean.c"
 }
 
 
-static void saved_search_finalize (GObject* obj) {
+static void saved_search_finalize (GObject * obj) {
 	SavedSearch * self;
 #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH, SavedSearch);
@@ -6001,7 +5974,7 @@ static void saved_search_finalize (GObject* obj) {
 	_saved_search_row_unref0 (self->priv->row);
 #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	G_OBJECT_CLASS (saved_search_parent_class)->finalize (obj);
-#line 5995 "SearchBoolean.c"
+#line 5968 "SearchBoolean.c"
 }
 
 
@@ -6022,13 +5995,13 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 	GError * _inner_error_ = NULL;
 #line 897 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = (SavedSearchTable*) g_type_create_instance (object_type);
-#line 6016 "SearchBoolean.c"
+#line 5989 "SearchBoolean.c"
 	{
 		GeeList* _tmp0_ = NULL;
-		SavedSearchDBTable* _tmp1_ = NULL;
-		SavedSearchDBTable* _tmp2_ = NULL;
-		GeeList* _tmp3_ = NULL;
-		GeeList* _tmp4_ = NULL;
+		SavedSearchDBTable* _tmp1_;
+		SavedSearchDBTable* _tmp2_;
+		GeeList* _tmp3_;
+		GeeList* _tmp4_;
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = saved_search_db_table_get_instance ();
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6045,8 +6018,8 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6039 "SearchBoolean.c"
-				goto __catch79_database_error;
+#line 6012 "SearchBoolean.c"
+				goto __catch80_database_error;
 			}
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6054,20 +6027,18 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 			g_clear_error (&_inner_error_);
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return NULL;
-#line 6048 "SearchBoolean.c"
+#line 6021 "SearchBoolean.c"
 		}
 		{
 			GeeList* _row_list = NULL;
-			GeeList* _tmp5_ = NULL;
+			GeeList* _tmp5_;
 			gint _row_size = 0;
-			GeeList* _tmp6_ = NULL;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
+			GeeList* _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 			gint _row_index = 0;
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp5_ = _tmp0_;
-#line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp0_ = NULL;
+			_tmp5_ = _g_object_ref0 (_tmp0_);
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_row_list = _tmp5_;
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6082,17 +6053,17 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 			_row_index = -1;
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			while (TRUE) {
-#line 6076 "SearchBoolean.c"
-				gint _tmp9_ = 0;
-				gint _tmp10_ = 0;
-				gint _tmp11_ = 0;
+#line 6047 "SearchBoolean.c"
+				gint _tmp9_;
+				gint _tmp10_;
+				gint _tmp11_;
 				SavedSearchRow* row = NULL;
-				GeeList* _tmp12_ = NULL;
-				gint _tmp13_ = 0;
-				gpointer _tmp14_ = NULL;
-				SavedSearchRow* _tmp15_ = NULL;
-				SavedSearch* _tmp16_ = NULL;
-				SavedSearch* _tmp17_ = NULL;
+				GeeList* _tmp12_;
+				gint _tmp13_;
+				gpointer _tmp14_;
+				SavedSearchRow* _tmp15_;
+				SavedSearch* _tmp16_;
+				SavedSearch* _tmp17_;
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp9_ = _row_index;
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6105,7 +6076,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 				if (!(_tmp10_ < _tmp11_)) {
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					break;
-#line 6099 "SearchBoolean.c"
+#line 6070 "SearchBoolean.c"
 				}
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp12_ = _row_list;
@@ -6127,21 +6098,21 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 				_g_object_unref0 (_tmp17_);
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_saved_search_row_unref0 (row);
-#line 6121 "SearchBoolean.c"
+#line 6092 "SearchBoolean.c"
 			}
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_object_unref0 (_row_list);
-#line 6125 "SearchBoolean.c"
+#line 6096 "SearchBoolean.c"
 		}
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_object_unref0 (_tmp0_);
-#line 6129 "SearchBoolean.c"
+#line 6100 "SearchBoolean.c"
 	}
-	goto __finally79;
-	__catch79_database_error:
+	goto __finally80;
+	__catch80_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp18_ = NULL;
+		GError* _tmp18_;
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		err = _inner_error_;
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6152,9 +6123,9 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		app_window_database_error (_tmp18_);
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_error_free0 (err);
-#line 6146 "SearchBoolean.c"
+#line 6117 "SearchBoolean.c"
 	}
-	__finally79:
+	__finally80:
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6163,46 +6134,46 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		g_clear_error (&_inner_error_);
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return NULL;
-#line 6157 "SearchBoolean.c"
+#line 6128 "SearchBoolean.c"
 	}
 #line 897 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 6161 "SearchBoolean.c"
+#line 6132 "SearchBoolean.c"
 }
 
 
 static SavedSearchTable* saved_search_table_new (void) {
 #line 897 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return saved_search_table_construct (TYPE_SAVED_SEARCH_TABLE);
-#line 6168 "SearchBoolean.c"
+#line 6139 "SearchBoolean.c"
 }
 
 
 static gpointer _saved_search_table_ref0 (gpointer self) {
 #line 912 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self ? saved_search_table_ref (self) : NULL;
-#line 6175 "SearchBoolean.c"
+#line 6146 "SearchBoolean.c"
 }
 
 
 SavedSearchTable* saved_search_table_get_instance (void) {
 	SavedSearchTable* result = NULL;
-	SavedSearchTable* _tmp0_ = NULL;
-	SavedSearchTable* _tmp2_ = NULL;
-	SavedSearchTable* _tmp3_ = NULL;
+	SavedSearchTable* _tmp0_;
+	SavedSearchTable* _tmp2_;
+	SavedSearchTable* _tmp3_;
 #line 909 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = saved_search_table_instance;
 #line 909 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp0_ == NULL) {
-#line 6188 "SearchBoolean.c"
-		SavedSearchTable* _tmp1_ = NULL;
+#line 6159 "SearchBoolean.c"
+		SavedSearchTable* _tmp1_;
 #line 910 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = saved_search_table_new ();
 #line 910 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_saved_search_table_unref0 (saved_search_table_instance);
 #line 910 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		saved_search_table_instance = _tmp1_;
-#line 6196 "SearchBoolean.c"
+#line 6167 "SearchBoolean.c"
 	}
 #line 912 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp2_ = saved_search_table_instance;
@@ -6212,15 +6183,15 @@ SavedSearchTable* saved_search_table_get_instance (void) {
 	result = _tmp3_;
 #line 912 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6206 "SearchBoolean.c"
+#line 6177 "SearchBoolean.c"
 }
 
 
 GeeCollection* saved_search_table_get_all (SavedSearchTable* self) {
 	GeeCollection* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp2_;
 #line 915 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), NULL);
 #line 916 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6233,17 +6204,17 @@ GeeCollection* saved_search_table_get_all (SavedSearchTable* self) {
 	result = _tmp2_;
 #line 916 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6227 "SearchBoolean.c"
+#line 6198 "SearchBoolean.c"
 }
 
 
 SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* name, SearchOperator operator, GeeArrayList* conditions) {
 	SavedSearch* result = NULL;
 	SavedSearch* search = NULL;
-	SavedSearch* _tmp10_ = NULL;
-	LibraryWindow* _tmp11_ = NULL;
-	LibraryWindow* _tmp12_ = NULL;
-	SavedSearch* _tmp13_ = NULL;
+	SavedSearch* _tmp10_;
+	LibraryWindow* _tmp11_;
+	LibraryWindow* _tmp12_;
+	SavedSearch* _tmp13_;
 	GError * _inner_error_ = NULL;
 #line 921 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), NULL);
@@ -6253,17 +6224,17 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 	g_return_val_if_fail (GEE_IS_ARRAY_LIST (conditions), NULL);
 #line 923 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	search = NULL;
-#line 6247 "SearchBoolean.c"
+#line 6218 "SearchBoolean.c"
 	{
 		SavedSearchRow* _tmp0_ = NULL;
-		SavedSearchDBTable* _tmp1_ = NULL;
-		SavedSearchDBTable* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		SearchOperator _tmp4_ = 0;
-		GeeArrayList* _tmp5_ = NULL;
-		SavedSearchRow* _tmp6_ = NULL;
-		SavedSearchRow* _tmp7_ = NULL;
-		SavedSearch* _tmp8_ = NULL;
+		SavedSearchDBTable* _tmp1_;
+		SavedSearchDBTable* _tmp2_;
+		const gchar* _tmp3_;
+		SearchOperator _tmp4_;
+		GeeArrayList* _tmp5_;
+		SavedSearchRow* _tmp6_;
+		SavedSearchRow* _tmp7_;
+		SavedSearch* _tmp8_;
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = saved_search_db_table_get_instance ();
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6286,8 +6257,8 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6280 "SearchBoolean.c"
-				goto __catch80_database_error;
+#line 6251 "SearchBoolean.c"
+				goto __catch81_database_error;
 			}
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_object_unref0 (search);
@@ -6297,7 +6268,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 			g_clear_error (&_inner_error_);
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return NULL;
-#line 6291 "SearchBoolean.c"
+#line 6262 "SearchBoolean.c"
 		}
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp8_ = saved_search_new (_tmp0_, DATA_OBJECT_INVALID_OBJECT_ID);
@@ -6307,13 +6278,13 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		search = _tmp8_;
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_saved_search_row_unref0 (_tmp0_);
-#line 6301 "SearchBoolean.c"
+#line 6272 "SearchBoolean.c"
 	}
-	goto __finally80;
-	__catch80_database_error:
+	goto __finally81;
+	__catch81_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp9_ = NULL;
+		GError* _tmp9_;
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		err = _inner_error_;
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6324,9 +6295,9 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		app_window_database_error (_tmp9_);
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_error_free0 (err);
-#line 6318 "SearchBoolean.c"
+#line 6289 "SearchBoolean.c"
 	}
-	__finally80:
+	__finally81:
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6337,7 +6308,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		g_clear_error (&_inner_error_);
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return NULL;
-#line 6331 "SearchBoolean.c"
+#line 6302 "SearchBoolean.c"
 	}
 #line 932 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp10_ = search;
@@ -6357,22 +6328,22 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 	result = search;
 #line 934 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6351 "SearchBoolean.c"
+#line 6322 "SearchBoolean.c"
 }
 
 
 void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
-	SavedSearch* _tmp5_ = NULL;
+	SavedSearch* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 938 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_TABLE (self));
 #line 938 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 6362 "SearchBoolean.c"
+#line 6333 "SearchBoolean.c"
 	{
-		SavedSearchDBTable* _tmp0_ = NULL;
-		SavedSearchDBTable* _tmp1_ = NULL;
-		SavedSearch* _tmp2_ = NULL;
+		SavedSearchDBTable* _tmp0_;
+		SavedSearchDBTable* _tmp1_;
+		SavedSearch* _tmp2_;
 		SavedSearchID _tmp3_ = {0};
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp0_ = saved_search_db_table_get_instance ();
@@ -6390,8 +6361,8 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6384 "SearchBoolean.c"
-				goto __catch81_database_error;
+#line 6355 "SearchBoolean.c"
+				goto __catch82_database_error;
 			}
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6399,14 +6370,14 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 			g_clear_error (&_inner_error_);
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return;
-#line 6393 "SearchBoolean.c"
+#line 6364 "SearchBoolean.c"
 		}
 	}
-	goto __finally81;
-	__catch81_database_error:
+	goto __finally82;
+	__catch82_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp4_ = NULL;
+		GError* _tmp4_;
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		err = _inner_error_;
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6417,9 +6388,9 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 		app_window_database_error (_tmp4_);
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_error_free0 (err);
-#line 6411 "SearchBoolean.c"
+#line 6382 "SearchBoolean.c"
 	}
-	__finally81:
+	__finally82:
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6428,23 +6399,23 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 		g_clear_error (&_inner_error_);
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return;
-#line 6422 "SearchBoolean.c"
+#line 6393 "SearchBoolean.c"
 	}
 #line 945 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp5_ = search;
 #line 945 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	saved_search_table_remove_from_map (self, _tmp5_);
-#line 6428 "SearchBoolean.c"
+#line 6399 "SearchBoolean.c"
 }
 
 
 void saved_search_table_add_to_map (SavedSearchTable* self, SavedSearch* search) {
-	GeeHashMap* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	SavedSearch* _tmp4_ = NULL;
-	SavedSearch* _tmp5_ = NULL;
+	GeeHashMap* _tmp0_;
+	SavedSearch* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	SavedSearch* _tmp4_;
+	SavedSearch* _tmp5_;
 #line 948 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_TABLE (self));
 #line 948 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6466,17 +6437,17 @@ void saved_search_table_add_to_map (SavedSearchTable* self, SavedSearch* search)
 #line 950 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp5_ = search;
 #line 950 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	g_signal_emit_by_name (self, "search-added", _tmp5_);
-#line 6461 "SearchBoolean.c"
+	g_signal_emit (self, saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_ADDED_SIGNAL], 0, _tmp5_);
+#line 6432 "SearchBoolean.c"
 }
 
 
 void saved_search_table_remove_from_map (SavedSearchTable* self, SavedSearch* search) {
-	GeeHashMap* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	SavedSearch* _tmp4_ = NULL;
+	GeeHashMap* _tmp0_;
+	SavedSearch* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	SavedSearch* _tmp4_;
 #line 953 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_TABLE (self));
 #line 953 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6496,16 +6467,16 @@ void saved_search_table_remove_from_map (SavedSearchTable* self, SavedSearch* se
 #line 955 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp4_ = search;
 #line 955 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	g_signal_emit_by_name (self, "search-removed", _tmp4_);
-#line 6491 "SearchBoolean.c"
+	g_signal_emit (self, saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_REMOVED_SIGNAL], 0, _tmp4_);
+#line 6462 "SearchBoolean.c"
 }
 
 
 GeeIterable* saved_search_table_get_saved_searches (SavedSearchTable* self) {
 	GeeIterable* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp2_;
 #line 958 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), NULL);
 #line 959 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6518,15 +6489,15 @@ GeeIterable* saved_search_table_get_saved_searches (SavedSearchTable* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable);
 #line 959 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6512 "SearchBoolean.c"
+#line 6483 "SearchBoolean.c"
 }
 
 
 gint saved_search_table_get_count (SavedSearchTable* self) {
 	gint result = 0;
-	GeeHashMap* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeHashMap* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 962 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), 0);
 #line 963 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6539,15 +6510,15 @@ gint saved_search_table_get_count (SavedSearchTable* self) {
 	result = _tmp2_;
 #line 963 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6533 "SearchBoolean.c"
+#line 6504 "SearchBoolean.c"
 }
 
 
 gboolean saved_search_table_exists (SavedSearchTable* self, const gchar* search_name) {
 	gboolean result = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 966 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), FALSE);
 #line 966 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6562,43 +6533,43 @@ gboolean saved_search_table_exists (SavedSearchTable* self, const gchar* search_
 	result = _tmp2_;
 #line 967 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6556 "SearchBoolean.c"
+#line 6527 "SearchBoolean.c"
 }
 
 
 gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) {
 	gchar* result = NULL;
-	gchar* _tmp7_ = NULL;
+	gchar* _tmp7_;
 #line 971 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), NULL);
-#line 6565 "SearchBoolean.c"
+#line 6536 "SearchBoolean.c"
 	{
 		gint ctr = 0;
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		ctr = 1;
-#line 6570 "SearchBoolean.c"
+#line 6541 "SearchBoolean.c"
 		{
 			gboolean _tmp0_ = FALSE;
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp0_ = TRUE;
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			while (TRUE) {
-#line 6577 "SearchBoolean.c"
-				gint _tmp2_ = 0;
+#line 6548 "SearchBoolean.c"
+				gint _tmp2_;
 				gchar* name = NULL;
-				gint _tmp3_ = 0;
-				gchar* _tmp4_ = NULL;
-				const gchar* _tmp5_ = NULL;
-				gboolean _tmp6_ = FALSE;
+				gint _tmp3_;
+				gchar* _tmp4_;
+				const gchar* _tmp5_;
+				gboolean _tmp6_;
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				if (!_tmp0_) {
-#line 6586 "SearchBoolean.c"
-					gint _tmp1_ = 0;
+#line 6557 "SearchBoolean.c"
+					gint _tmp1_;
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					_tmp1_ = ctr;
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					ctr = _tmp1_ + 1;
-#line 6592 "SearchBoolean.c"
+#line 6563 "SearchBoolean.c"
 				}
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp0_ = FALSE;
@@ -6608,7 +6579,7 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) {
 				if (!(_tmp2_ < G_MAXINT)) {
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					break;
-#line 6602 "SearchBoolean.c"
+#line 6573 "SearchBoolean.c"
 				}
 #line 973 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp3_ = ctr;
@@ -6626,11 +6597,11 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) {
 					result = name;
 #line 976 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					return result;
-#line 6620 "SearchBoolean.c"
+#line 6591 "SearchBoolean.c"
 				}
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_g_free0 (name);
-#line 6624 "SearchBoolean.c"
+#line 6595 "SearchBoolean.c"
 			}
 		}
 	}
@@ -6640,14 +6611,14 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) {
 	result = _tmp7_;
 #line 978 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6634 "SearchBoolean.c"
+#line 6605 "SearchBoolean.c"
 }
 
 
 static void value_saved_search_table_init (GValue* value) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	value->data[0].v_pointer = NULL;
-#line 6641 "SearchBoolean.c"
+#line 6612 "SearchBoolean.c"
 }
 
 
@@ -6656,7 +6627,7 @@ static void value_saved_search_table_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		saved_search_table_unref (value->data[0].v_pointer);
-#line 6650 "SearchBoolean.c"
+#line 6621 "SearchBoolean.c"
 	}
 }
 
@@ -6666,11 +6637,11 @@ static void value_saved_search_table_copy_value (const GValue* src_value, GValue
 	if (src_value->data[0].v_pointer) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		dest_value->data[0].v_pointer = saved_search_table_ref (src_value->data[0].v_pointer);
-#line 6660 "SearchBoolean.c"
+#line 6631 "SearchBoolean.c"
 	} else {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6664 "SearchBoolean.c"
+#line 6635 "SearchBoolean.c"
 	}
 }
 
@@ -6678,66 +6649,66 @@ static void value_saved_search_table_copy_value (const GValue* src_value, GValue
 static gpointer value_saved_search_table_peek_pointer (const GValue* value) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return value->data[0].v_pointer;
-#line 6672 "SearchBoolean.c"
+#line 6643 "SearchBoolean.c"
 }
 
 
 static gchar* value_saved_search_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (collect_values[0].v_pointer) {
-#line 6679 "SearchBoolean.c"
-		SavedSearchTable* object;
+#line 6650 "SearchBoolean.c"
+		SavedSearchTable * object;
 		object = collect_values[0].v_pointer;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6686 "SearchBoolean.c"
+#line 6657 "SearchBoolean.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6690 "SearchBoolean.c"
+#line 6661 "SearchBoolean.c"
 		}
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = saved_search_table_ref (object);
-#line 6694 "SearchBoolean.c"
+#line 6665 "SearchBoolean.c"
 	} else {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 6698 "SearchBoolean.c"
+#line 6669 "SearchBoolean.c"
 	}
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return NULL;
-#line 6702 "SearchBoolean.c"
+#line 6673 "SearchBoolean.c"
 }
 
 
 static gchar* value_saved_search_table_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SavedSearchTable** object_p;
+	SavedSearchTable ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (!object_p) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6713 "SearchBoolean.c"
+#line 6684 "SearchBoolean.c"
 	}
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (!value->data[0].v_pointer) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		*object_p = NULL;
-#line 6719 "SearchBoolean.c"
+#line 6690 "SearchBoolean.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6723 "SearchBoolean.c"
+#line 6694 "SearchBoolean.c"
 	} else {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		*object_p = saved_search_table_ref (value->data[0].v_pointer);
-#line 6727 "SearchBoolean.c"
+#line 6698 "SearchBoolean.c"
 	}
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return NULL;
-#line 6731 "SearchBoolean.c"
+#line 6702 "SearchBoolean.c"
 }
 
 
@@ -6751,7 +6722,7 @@ GParamSpec* param_spec_saved_search_table (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return G_PARAM_SPEC (spec);
-#line 6745 "SearchBoolean.c"
+#line 6716 "SearchBoolean.c"
 }
 
 
@@ -6760,12 +6731,12 @@ gpointer value_get_saved_search_table (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_TABLE), NULL);
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return value->data[0].v_pointer;
-#line 6754 "SearchBoolean.c"
+#line 6725 "SearchBoolean.c"
 }
 
 
 void value_set_saved_search_table (GValue* value, gpointer v_object) {
-	SavedSearchTable* old;
+	SavedSearchTable * old;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_TABLE));
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6780,23 +6751,23 @@ void value_set_saved_search_table (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		saved_search_table_ref (value->data[0].v_pointer);
-#line 6774 "SearchBoolean.c"
+#line 6745 "SearchBoolean.c"
 	} else {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 6778 "SearchBoolean.c"
+#line 6749 "SearchBoolean.c"
 	}
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (old) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		saved_search_table_unref (old);
-#line 6784 "SearchBoolean.c"
+#line 6755 "SearchBoolean.c"
 	}
 }
 
 
 void value_take_saved_search_table (GValue* value, gpointer v_object) {
-	SavedSearchTable* old;
+	SavedSearchTable * old;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_TABLE));
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6809,17 +6780,17 @@ void value_take_saved_search_table (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = v_object;
-#line 6803 "SearchBoolean.c"
+#line 6774 "SearchBoolean.c"
 	} else {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 6807 "SearchBoolean.c"
+#line 6778 "SearchBoolean.c"
 	}
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (old) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		saved_search_table_unref (old);
-#line 6813 "SearchBoolean.c"
+#line 6784 "SearchBoolean.c"
 	}
 }
 
@@ -6832,15 +6803,15 @@ static void saved_search_table_class_init (SavedSearchTableClass * klass) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchTablePrivate));
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	g_signal_new ("search_added", TYPE_SAVED_SEARCH_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
+	saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_ADDED_SIGNAL] = g_signal_new ("search-added", TYPE_SAVED_SEARCH_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	g_signal_new ("search_removed", TYPE_SAVED_SEARCH_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
-#line 6829 "SearchBoolean.c"
+	saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_REMOVED_SIGNAL] = g_signal_new ("search-removed", TYPE_SAVED_SEARCH_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
+#line 6800 "SearchBoolean.c"
 }
 
 
 static void saved_search_table_instance_init (SavedSearchTable * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv = SAVED_SEARCH_TABLE_GET_PRIVATE (self);
 #line 892 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6849,11 +6820,11 @@ static void saved_search_table_instance_init (SavedSearchTable * self) {
 	self->priv->search_map = _tmp0_;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->ref_count = 1;
-#line 6843 "SearchBoolean.c"
+#line 6814 "SearchBoolean.c"
 }
 
 
-static void saved_search_table_finalize (SavedSearchTable* obj) {
+static void saved_search_table_finalize (SavedSearchTable * obj) {
 	SavedSearchTable * self;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_TABLE, SavedSearchTable);
@@ -6861,7 +6832,7 @@ static void saved_search_table_finalize (SavedSearchTable* obj) {
 	g_signal_handlers_destroy (self);
 #line 892 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_g_object_unref0 (self->priv->search_map);
-#line 6855 "SearchBoolean.c"
+#line 6826 "SearchBoolean.c"
 }
 
 
@@ -6880,18 +6851,18 @@ GType saved_search_table_get_type (void) {
 
 
 gpointer saved_search_table_ref (gpointer instance) {
-	SavedSearchTable* self;
+	SavedSearchTable * self;
 	self = instance;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return instance;
-#line 6880 "SearchBoolean.c"
+#line 6851 "SearchBoolean.c"
 }
 
 
 void saved_search_table_unref (gpointer instance) {
-	SavedSearchTable* self;
+	SavedSearchTable * self;
 	self = instance;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -6899,7 +6870,7 @@ void saved_search_table_unref (gpointer instance) {
 		SAVED_SEARCH_TABLE_GET_CLASS (self)->finalize (self);
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6893 "SearchBoolean.c"
+#line 6864 "SearchBoolean.c"
 	}
 }
 
diff --git a/src/searches/Searches.c b/src/searches/Searches.c
index 33bbc33..70622ce 100644
--- a/src/searches/Searches.c
+++ b/src/searches/Searches.c
@@ -1,4 +1,4 @@
-/* Searches.c generated by valac 0.34.7, the Vala compiler
+/* Searches.c generated by valac 0.36.6, the Vala compiler
  * generated from Searches.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/sidebar/Branch.c b/src/sidebar/Branch.c
index 26b9a21..a49cdac 100644
--- a/src/sidebar/Branch.c
+++ b/src/sidebar/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.7, the Vala compiler
+/* Branch.c generated by valac 0.36.6, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -60,6 +60,16 @@ typedef struct _SidebarTreeClass SidebarTreeClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 typedef struct _SidebarBranchNodePrivate SidebarBranchNodePrivate;
 typedef struct _SidebarBranchParamSpecNode SidebarBranchParamSpecNode;
+enum  {
+	SIDEBAR_BRANCH_ENTRY_ADDED_SIGNAL,
+	SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL,
+	SIDEBAR_BRANCH_ENTRY_MOVED_SIGNAL,
+	SIDEBAR_BRANCH_ENTRY_REPARENTED_SIGNAL,
+	SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL,
+	SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL,
+	SIDEBAR_BRANCH_LAST_SIGNAL
+};
+static guint sidebar_branch_signals[SIDEBAR_BRANCH_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -188,8 +198,8 @@ enum  {
 static gint sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode, SidebarBranchNode* bnode);
 static gint _sidebar_branch_node_comparator_wrapper_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
 static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, SidebarBranchNode* child);
-static void sidebar_branch_node_finalize (SidebarBranchNode* obj);
-static void sidebar_branch_finalize (GObject* obj);
+static void sidebar_branch_node_finalize (SidebarBranchNode * obj);
+static void sidebar_branch_finalize (GObject * obj);
 
 
 gboolean sidebar_branch_options_is_hide_if_empty (SidebarBranchOptions self) {
@@ -198,7 +208,7 @@ gboolean sidebar_branch_options_is_hide_if_empty (SidebarBranchOptions self) {
 	result = (self & SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY) != 0;
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 202 "Branch.c"
+#line 212 "Branch.c"
 }
 
 
@@ -208,7 +218,7 @@ gboolean sidebar_branch_options_is_auto_open_on_new_child (SidebarBranchOptions
 	result = (self & SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD) != 0;
 #line 23 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 212 "Branch.c"
+#line 222 "Branch.c"
 }
 
 
@@ -218,7 +228,7 @@ gboolean sidebar_branch_options_is_startup_expand_to_first_child (SidebarBranchO
 	result = (self & SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD) != 0;
 #line 27 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 222 "Branch.c"
+#line 232 "Branch.c"
 }
 
 
@@ -228,7 +238,7 @@ gboolean sidebar_branch_options_is_startup_open_grouping (SidebarBranchOptions s
 	result = (self & SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING) != 0;
 #line 31 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 232 "Branch.c"
+#line 242 "Branch.c"
 }
 
 
@@ -246,17 +256,17 @@ GType sidebar_branch_options_get_type (void) {
 
 SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator) {
 	SidebarBranch * self = NULL;
-	GCompareFunc _tmp0_ = NULL;
+	GCompareFunc _tmp0_;
 	GCompareFunc _tmp1_ = NULL;
-	GCompareFunc _tmp2_ = NULL;
-	SidebarEntry* _tmp5_ = NULL;
-	SidebarBranchNode* _tmp6_ = NULL;
-	SidebarBranchOptions _tmp7_ = 0;
-	GeeHashMap* _tmp8_ = NULL;
-	SidebarEntry* _tmp9_ = NULL;
-	SidebarBranchNode* _tmp10_ = NULL;
-	SidebarBranchOptions _tmp11_ = 0;
-	gboolean _tmp12_ = FALSE;
+	GCompareFunc _tmp2_;
+	SidebarEntry* _tmp5_;
+	SidebarBranchNode* _tmp6_;
+	SidebarBranchOptions _tmp7_;
+	GeeHashMap* _tmp8_;
+	SidebarEntry* _tmp9_;
+	SidebarBranchNode* _tmp10_;
+	SidebarBranchOptions _tmp11_;
+	gboolean _tmp12_;
 #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (root), NULL);
 #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -269,20 +279,20 @@ SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root,
 	_tmp2_ = root_comparator;
 #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (_tmp2_ != NULL) {
-#line 273 "Branch.c"
-		GCompareFunc _tmp3_ = NULL;
+#line 283 "Branch.c"
+		GCompareFunc _tmp3_;
 #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp3_ = root_comparator;
 #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp1_ = _tmp3_;
-#line 279 "Branch.c"
+#line 289 "Branch.c"
 	} else {
-		GCompareFunc _tmp4_ = NULL;
+		GCompareFunc _tmp4_;
 #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp4_ = default_comparator;
 #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp1_ = _tmp4_;
-#line 286 "Branch.c"
+#line 296 "Branch.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp5_ = root;
@@ -312,33 +322,33 @@ SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root,
 	if (_tmp12_) {
 #line 216 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_set_show_branch (self, FALSE);
-#line 316 "Branch.c"
+#line 326 "Branch.c"
 	}
 #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return self;
-#line 320 "Branch.c"
+#line 330 "Branch.c"
 }
 
 
 SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator) {
 #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return sidebar_branch_construct (SIDEBAR_TYPE_BRANCH, root, options, default_comparator, root_comparator);
-#line 327 "Branch.c"
+#line 337 "Branch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 220 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 334 "Branch.c"
+#line 344 "Branch.c"
 }
 
 
 SidebarEntry* sidebar_branch_get_root (SidebarBranch* self) {
 	SidebarEntry* result = NULL;
-	SidebarBranchNode* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
+	SidebarBranchNode* _tmp0_;
+	SidebarEntry* _tmp1_;
+	SidebarEntry* _tmp2_;
 #line 219 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL);
 #line 220 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -351,15 +361,15 @@ SidebarEntry* sidebar_branch_get_root (SidebarBranch* self) {
 	result = _tmp2_;
 #line 220 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 355 "Branch.c"
+#line 365 "Branch.c"
 }
 
 
 void sidebar_branch_set_show_branch (SidebarBranch* self, gboolean shown) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 223 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 224 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -370,7 +380,7 @@ void sidebar_branch_set_show_branch (SidebarBranch* self, gboolean shown) {
 	if (_tmp0_ == _tmp1_) {
 #line 225 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return;
-#line 374 "Branch.c"
+#line 384 "Branch.c"
 	}
 #line 227 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp2_ = shown;
@@ -379,14 +389,14 @@ void sidebar_branch_set_show_branch (SidebarBranch* self, gboolean shown) {
 #line 228 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp3_ = shown;
 #line 228 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit_by_name (self, "show-branch", _tmp3_);
-#line 384 "Branch.c"
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL], 0, _tmp3_);
+#line 394 "Branch.c"
 }
 
 
 gboolean sidebar_branch_get_show_branch (SidebarBranch* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 231 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE);
 #line 232 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -395,14 +405,14 @@ gboolean sidebar_branch_get_show_branch (SidebarBranch* self) {
 	result = _tmp0_;
 #line 232 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 399 "Branch.c"
+#line 409 "Branch.c"
 }
 
 
 gboolean sidebar_branch_is_auto_open_on_new_child (SidebarBranch* self) {
 	gboolean result = FALSE;
-	SidebarBranchOptions _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
+	SidebarBranchOptions _tmp0_;
+	gboolean _tmp1_;
 #line 235 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE);
 #line 236 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -413,14 +423,14 @@ gboolean sidebar_branch_is_auto_open_on_new_child (SidebarBranch* self) {
 	result = _tmp1_;
 #line 236 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 417 "Branch.c"
+#line 427 "Branch.c"
 }
 
 
 gboolean sidebar_branch_is_startup_expand_to_first_child (SidebarBranch* self) {
 	gboolean result = FALSE;
-	SidebarBranchOptions _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
+	SidebarBranchOptions _tmp0_;
+	gboolean _tmp1_;
 #line 239 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE);
 #line 240 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -431,14 +441,14 @@ gboolean sidebar_branch_is_startup_expand_to_first_child (SidebarBranch* self) {
 	result = _tmp1_;
 #line 240 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 435 "Branch.c"
+#line 445 "Branch.c"
 }
 
 
 gboolean sidebar_branch_is_startup_open_grouping (SidebarBranch* self) {
 	gboolean result = FALSE;
-	SidebarBranchOptions _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
+	SidebarBranchOptions _tmp0_;
+	gboolean _tmp1_;
 #line 243 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE);
 #line 244 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -449,33 +459,33 @@ gboolean sidebar_branch_is_startup_open_grouping (SidebarBranch* self) {
 	result = _tmp1_;
 #line 244 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 453 "Branch.c"
+#line 463 "Branch.c"
 }
 
 
 void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator) {
-	GeeHashMap* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GeeHashMap* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	SidebarBranchOptions _tmp6_ = 0;
-	gboolean _tmp7_ = FALSE;
+	GeeHashMap* _tmp0_;
+	SidebarEntry* _tmp1_;
+	gboolean _tmp2_;
+	GeeHashMap* _tmp3_;
+	SidebarEntry* _tmp4_;
+	gboolean _tmp5_;
+	SidebarBranchOptions _tmp6_;
+	gboolean _tmp7_;
 	SidebarBranchNode* parent_node = NULL;
-	GeeHashMap* _tmp8_ = NULL;
-	SidebarEntry* _tmp9_ = NULL;
-	gpointer _tmp10_ = NULL;
+	GeeHashMap* _tmp8_;
+	SidebarEntry* _tmp9_;
+	gpointer _tmp10_;
 	GCompareFunc _tmp11_ = NULL;
-	GCompareFunc _tmp12_ = NULL;
+	GCompareFunc _tmp12_;
 	SidebarBranchNode* entry_node = NULL;
-	SidebarEntry* _tmp15_ = NULL;
-	SidebarBranchNode* _tmp16_ = NULL;
-	SidebarBranchNode* _tmp17_ = NULL;
-	SidebarBranchNode* _tmp18_ = NULL;
-	GeeHashMap* _tmp19_ = NULL;
-	SidebarEntry* _tmp20_ = NULL;
-	SidebarEntry* _tmp21_ = NULL;
+	SidebarEntry* _tmp15_;
+	SidebarBranchNode* _tmp16_;
+	SidebarBranchNode* _tmp17_;
+	SidebarBranchNode* _tmp18_;
+	GeeHashMap* _tmp19_;
+	SidebarEntry* _tmp20_;
+	SidebarEntry* _tmp21_;
 #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -506,7 +516,7 @@ void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEnt
 	if (_tmp7_) {
 #line 253 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_set_show_branch (self, TRUE);
-#line 510 "Branch.c"
+#line 520 "Branch.c"
 	}
 #line 255 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp8_ = self->priv->map;
@@ -520,20 +530,20 @@ void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEnt
 	_tmp12_ = comparator;
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (_tmp12_ != NULL) {
-#line 524 "Branch.c"
-		GCompareFunc _tmp13_ = NULL;
+#line 534 "Branch.c"
+		GCompareFunc _tmp13_;
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp13_ = comparator;
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp11_ = _tmp13_;
-#line 530 "Branch.c"
+#line 540 "Branch.c"
 	} else {
-		GCompareFunc _tmp14_ = NULL;
+		GCompareFunc _tmp14_;
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp14_ = self->priv->default_comparator;
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp11_ = _tmp14_;
-#line 537 "Branch.c"
+#line 547 "Branch.c"
 	}
 #line 256 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp15_ = entry;
@@ -556,48 +566,48 @@ void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEnt
 #line 262 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp21_ = entry;
 #line 262 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit_by_name (self, "entry-added", _tmp21_);
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_ADDED_SIGNAL], 0, _tmp21_);
 #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
 #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (parent_node);
-#line 565 "Branch.c"
+#line 575 "Branch.c"
 }
 
 
 static void _sidebar_branch_prune_callback_sidebar_branch_node_prune_callback (SidebarBranchNode* node, gpointer self) {
 #line 272 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_prune_callback ((SidebarBranch*) self, node);
-#line 572 "Branch.c"
+#line 582 "Branch.c"
 }
 
 
 void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry) {
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarBranchNode* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	SidebarEntry* _tmp0_;
+	SidebarBranchNode* _tmp1_;
+	SidebarEntry* _tmp2_;
+	GeeHashMap* _tmp3_;
+	SidebarEntry* _tmp4_;
+	gboolean _tmp5_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp6_ = NULL;
-	SidebarEntry* _tmp7_ = NULL;
-	gpointer _tmp8_ = NULL;
-	SidebarBranchNode* _tmp9_ = NULL;
-	SidebarBranchNode* _tmp10_ = NULL;
-	SidebarBranchNode* _tmp11_ = NULL;
-	SidebarBranchNode* _tmp12_ = NULL;
-	SidebarBranchNode* _tmp13_ = NULL;
-	SidebarBranchNode* _tmp14_ = NULL;
+	GeeHashMap* _tmp6_;
+	SidebarEntry* _tmp7_;
+	gpointer _tmp8_;
+	SidebarBranchNode* _tmp9_;
+	SidebarBranchNode* _tmp10_;
+	SidebarBranchNode* _tmp11_;
+	SidebarBranchNode* _tmp12_;
+	SidebarBranchNode* _tmp13_;
+	SidebarBranchNode* _tmp14_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp15_ = NULL;
-	SidebarEntry* _tmp16_ = NULL;
-	gboolean _tmp17_ = FALSE;
-	gboolean _tmp18_ = FALSE;
-	SidebarEntry* _tmp19_ = NULL;
+	GeeHashMap* _tmp15_;
+	SidebarEntry* _tmp16_;
+	gboolean _tmp17_;
+	gboolean _tmp18_;
+	SidebarEntry* _tmp19_;
 	gboolean _tmp20_ = FALSE;
-	SidebarBranchOptions _tmp21_ = 0;
-	gboolean _tmp22_ = FALSE;
+	SidebarBranchOptions _tmp21_;
+	gboolean _tmp22_;
 #line 266 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 266 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -659,65 +669,65 @@ void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry) {
 #line 280 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp19_ = entry;
 #line 280 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit_by_name (self, "entry-removed", _tmp19_);
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL], 0, _tmp19_);
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp21_ = self->priv->options;
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp22_ = sidebar_branch_options_is_hide_if_empty (_tmp21_);
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (_tmp22_) {
-#line 670 "Branch.c"
-		SidebarBranchNode* _tmp23_ = NULL;
-		gboolean _tmp24_ = FALSE;
+#line 680 "Branch.c"
+		SidebarBranchNode* _tmp23_;
+		gboolean _tmp24_;
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp23_ = self->priv->root;
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp24_ = sidebar_branch_node_has_children (_tmp23_);
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp20_ = !_tmp24_;
-#line 679 "Branch.c"
+#line 689 "Branch.c"
 	} else {
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp20_ = FALSE;
-#line 683 "Branch.c"
+#line 693 "Branch.c"
 	}
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (_tmp20_) {
 #line 283 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_set_show_branch (self, FALSE);
-#line 689 "Branch.c"
+#line 699 "Branch.c"
 	}
 #line 266 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
-#line 693 "Branch.c"
+#line 703 "Branch.c"
 }
 
 
 void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, SidebarEntry* entry) {
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarBranchNode* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	GeeHashMap* _tmp6_ = NULL;
-	SidebarEntry* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	SidebarEntry* _tmp0_;
+	SidebarBranchNode* _tmp1_;
+	SidebarEntry* _tmp2_;
+	GeeHashMap* _tmp3_;
+	SidebarEntry* _tmp4_;
+	gboolean _tmp5_;
+	GeeHashMap* _tmp6_;
+	SidebarEntry* _tmp7_;
+	gboolean _tmp8_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp9_ = NULL;
-	SidebarEntry* _tmp10_ = NULL;
-	gpointer _tmp11_ = NULL;
+	GeeHashMap* _tmp9_;
+	SidebarEntry* _tmp10_;
+	gpointer _tmp11_;
 	SidebarBranchNode* new_parent_node = NULL;
-	GeeHashMap* _tmp12_ = NULL;
-	SidebarEntry* _tmp13_ = NULL;
-	gpointer _tmp14_ = NULL;
-	SidebarBranchNode* _tmp15_ = NULL;
+	GeeHashMap* _tmp12_;
+	SidebarEntry* _tmp13_;
+	gpointer _tmp14_;
+	SidebarBranchNode* _tmp15_;
 	SidebarEntry* old_parent = NULL;
-	SidebarBranchNode* _tmp16_ = NULL;
-	SidebarEntry* _tmp17_ = NULL;
-	SidebarEntry* _tmp18_ = NULL;
-	SidebarBranchNode* _tmp19_ = NULL;
-	SidebarEntry* _tmp20_ = NULL;
+	SidebarBranchNode* _tmp16_;
+	SidebarEntry* _tmp17_;
+	SidebarEntry* _tmp18_;
+	SidebarBranchNode* _tmp19_;
+	SidebarEntry* _tmp20_;
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -785,23 +795,23 @@ void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, Sid
 #line 301 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp20_ = entry;
 #line 301 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit_by_name (self, "entry-reparented", _tmp20_, old_parent);
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REPARENTED_SIGNAL], 0, _tmp20_, old_parent);
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (old_parent);
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (new_parent_node);
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
-#line 796 "Branch.c"
+#line 806 "Branch.c"
 }
 
 
 gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	SidebarBranchNode* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
-	SidebarEntry* _tmp3_ = NULL;
+	SidebarBranchNode* _tmp1_;
+	SidebarEntry* _tmp2_;
+	SidebarEntry* _tmp3_;
 #line 304 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE);
 #line 304 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -816,11 +826,11 @@ gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry) {
 	if (_tmp2_ == _tmp3_) {
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp0_ = TRUE;
-#line 820 "Branch.c"
+#line 830 "Branch.c"
 	} else {
-		GeeHashMap* _tmp4_ = NULL;
-		SidebarEntry* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		GeeHashMap* _tmp4_;
+		SidebarEntry* _tmp5_;
+		gboolean _tmp6_;
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp4_ = self->priv->map;
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -829,31 +839,31 @@ gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry) {
 		_tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp0_ = _tmp6_;
-#line 833 "Branch.c"
+#line 843 "Branch.c"
 	}
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = _tmp0_;
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 839 "Branch.c"
+#line 849 "Branch.c"
 }
 
 
 void sidebar_branch_reorder (SidebarBranch* self, SidebarEntry* entry) {
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarBranchNode* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarBranchNode* _tmp1_;
+	SidebarEntry* _tmp2_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	gpointer _tmp5_ = NULL;
-	SidebarBranchNode* _tmp6_ = NULL;
-	SidebarBranchNode* _tmp7_ = NULL;
-	SidebarBranchNode* _tmp8_ = NULL;
-	SidebarBranchNode* _tmp9_ = NULL;
-	SidebarBranchNode* _tmp10_ = NULL;
-	SidebarBranchNode* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	GeeHashMap* _tmp3_;
+	SidebarEntry* _tmp4_;
+	gpointer _tmp5_;
+	SidebarBranchNode* _tmp6_;
+	SidebarBranchNode* _tmp7_;
+	SidebarBranchNode* _tmp8_;
+	SidebarBranchNode* _tmp9_;
+	SidebarBranchNode* _tmp10_;
+	SidebarBranchNode* _tmp11_;
+	gboolean _tmp12_;
 #line 310 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 310 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -894,45 +904,45 @@ void sidebar_branch_reorder (SidebarBranch* self, SidebarEntry* entry) {
 	_tmp12_ = sidebar_branch_node_reorder_child (_tmp10_, _tmp11_);
 #line 317 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (_tmp12_) {
-#line 898 "Branch.c"
-		SidebarEntry* _tmp13_ = NULL;
+#line 908 "Branch.c"
+		SidebarEntry* _tmp13_;
 #line 318 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp13_ = entry;
 #line 318 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		g_signal_emit_by_name (self, "entry-moved", _tmp13_);
-#line 904 "Branch.c"
+		g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_MOVED_SIGNAL], 0, _tmp13_);
+#line 914 "Branch.c"
 	}
 #line 310 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
-#line 908 "Branch.c"
+#line 918 "Branch.c"
 }
 
 
 static void _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback (SidebarBranchNode* node, gpointer self) {
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_children_reordered_callback ((SidebarBranch*) self, node);
-#line 915 "Branch.c"
+#line 925 "Branch.c"
 }
 
 
 void sidebar_branch_reorder_all (SidebarBranch* self) {
-	SidebarBranchNode* _tmp0_ = NULL;
+	SidebarBranchNode* _tmp0_;
 #line 322 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->root;
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_node_reorder_children (_tmp0_, TRUE, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
-#line 927 "Branch.c"
+#line 937 "Branch.c"
 }
 
 
 void sidebar_branch_reorder_children (SidebarBranch* self, SidebarEntry* entry, gboolean recursive) {
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	GeeHashMap* _tmp0_;
+	SidebarEntry* _tmp1_;
+	gpointer _tmp2_;
+	gboolean _tmp3_;
 #line 327 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 327 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -953,13 +963,13 @@ void sidebar_branch_reorder_children (SidebarBranch* self, SidebarEntry* entry,
 	sidebar_branch_node_reorder_children (entry_node, _tmp3_, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
 #line 327 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
-#line 957 "Branch.c"
+#line 967 "Branch.c"
 }
 
 
 void sidebar_branch_change_all_comparators (SidebarBranch* self, GCompareFunc comparator) {
-	SidebarBranchNode* _tmp0_ = NULL;
-	GCompareFunc _tmp1_ = NULL;
+	SidebarBranchNode* _tmp0_;
+	GCompareFunc _tmp1_;
 #line 334 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 335 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -968,17 +978,17 @@ void sidebar_branch_change_all_comparators (SidebarBranch* self, GCompareFunc co
 	_tmp1_ = comparator;
 #line 335 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_node_change_comparator (_tmp0_, _tmp1_, TRUE, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
-#line 972 "Branch.c"
+#line 982 "Branch.c"
 }
 
 
 void sidebar_branch_change_comparator (SidebarBranch* self, SidebarEntry* entry, gboolean recursive, GCompareFunc comparator) {
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	GCompareFunc _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GeeHashMap* _tmp0_;
+	SidebarEntry* _tmp1_;
+	gpointer _tmp2_;
+	GCompareFunc _tmp3_;
+	gboolean _tmp4_;
 #line 338 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 338 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1001,20 +1011,20 @@ void sidebar_branch_change_comparator (SidebarBranch* self, SidebarEntry* entry,
 	sidebar_branch_node_change_comparator (entry_node, _tmp3_, _tmp4_, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
 #line 338 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
-#line 1005 "Branch.c"
+#line 1015 "Branch.c"
 }
 
 
 gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent) {
 	gint result = 0;
 	SidebarBranchNode* parent_node = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	SidebarBranchNode* _tmp3_ = NULL;
+	GeeHashMap* _tmp0_;
+	SidebarEntry* _tmp1_;
+	gpointer _tmp2_;
+	SidebarBranchNode* _tmp3_;
 	gint _tmp4_ = 0;
-	SidebarBranchNode* _tmp5_ = NULL;
-	GeeSortedSet* _tmp6_ = NULL;
+	SidebarBranchNode* _tmp5_;
+	GeeSortedSet* _tmp6_;
 #line 346 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), 0);
 #line 346 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1037,11 +1047,11 @@ gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent)
 	_tmp6_ = _tmp5_->children;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (_tmp6_ != NULL) {
-#line 1041 "Branch.c"
-		SidebarBranchNode* _tmp7_ = NULL;
-		GeeSortedSet* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
+#line 1051 "Branch.c"
+		SidebarBranchNode* _tmp7_;
+		GeeSortedSet* _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp7_ = parent_node;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1052,11 +1062,11 @@ gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent)
 		_tmp10_ = _tmp9_;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp4_ = _tmp10_;
-#line 1056 "Branch.c"
+#line 1066 "Branch.c"
 	} else {
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp4_ = 0;
-#line 1060 "Branch.c"
+#line 1070 "Branch.c"
 	}
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = _tmp4_;
@@ -1064,23 +1074,23 @@ gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent)
 	_sidebar_branch_node_unref0 (parent_node);
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1068 "Branch.c"
+#line 1078 "Branch.c"
 }
 
 
 GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent) {
 	GeeList* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	SidebarEntry* _tmp1_;
+	gboolean _tmp2_;
 	SidebarBranchNode* parent_node = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	gpointer _tmp5_ = NULL;
-	SidebarBranchNode* _tmp6_ = NULL;
-	GeeSortedSet* _tmp7_ = NULL;
+	GeeHashMap* _tmp3_;
+	SidebarEntry* _tmp4_;
+	gpointer _tmp5_;
+	SidebarBranchNode* _tmp6_;
+	GeeSortedSet* _tmp7_;
 	GeeList* child_entries = NULL;
-	GeeArrayList* _tmp8_ = NULL;
+	GeeArrayList* _tmp8_;
 #line 355 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL);
 #line 355 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1113,18 +1123,18 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent)
 		_sidebar_branch_node_unref0 (parent_node);
 #line 360 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1117 "Branch.c"
+#line 1127 "Branch.c"
 	}
 #line 362 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp8_ = gee_array_list_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 362 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	child_entries = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_LIST, GeeList);
-#line 1123 "Branch.c"
+#line 1133 "Branch.c"
 	{
 		GeeIterator* _child_it = NULL;
-		SidebarBranchNode* _tmp9_ = NULL;
-		GeeSortedSet* _tmp10_ = NULL;
-		GeeIterator* _tmp11_ = NULL;
+		SidebarBranchNode* _tmp9_;
+		GeeSortedSet* _tmp10_;
+		GeeIterator* _tmp11_;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp9_ = parent_node;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1135,15 +1145,15 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent)
 		_child_it = _tmp11_;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 1139 "Branch.c"
-			GeeIterator* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
+#line 1149 "Branch.c"
+			GeeIterator* _tmp12_;
+			gboolean _tmp13_;
 			SidebarBranchNode* child = NULL;
-			GeeIterator* _tmp14_ = NULL;
-			gpointer _tmp15_ = NULL;
-			GeeList* _tmp16_ = NULL;
-			SidebarBranchNode* _tmp17_ = NULL;
-			SidebarEntry* _tmp18_ = NULL;
+			GeeIterator* _tmp14_;
+			gpointer _tmp15_;
+			GeeList* _tmp16_;
+			SidebarBranchNode* _tmp17_;
+			SidebarEntry* _tmp18_;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp12_ = _child_it;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1152,7 +1162,7 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent)
 			if (!_tmp13_) {
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 1156 "Branch.c"
+#line 1166 "Branch.c"
 			}
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp14_ = _child_it;
@@ -1170,11 +1180,11 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent)
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_);
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (child);
-#line 1174 "Branch.c"
+#line 1184 "Branch.c"
 		}
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_child_it);
-#line 1178 "Branch.c"
+#line 1188 "Branch.c"
 	}
 #line 366 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = child_entries;
@@ -1182,19 +1192,19 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent)
 	_sidebar_branch_node_unref0 (parent_node);
 #line 366 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1186 "Branch.c"
+#line 1196 "Branch.c"
 }
 
 
 SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target) {
 	SidebarEntry* result = NULL;
 	SidebarBranchNode* parent_node = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	SidebarBranchNode* _tmp3_ = NULL;
-	SidebarBranchNode* _tmp4_ = NULL;
-	GeeSortedSet* _tmp5_ = NULL;
+	GeeHashMap* _tmp0_;
+	SidebarEntry* _tmp1_;
+	gpointer _tmp2_;
+	SidebarBranchNode* _tmp3_;
+	SidebarBranchNode* _tmp4_;
+	GeeSortedSet* _tmp5_;
 #line 369 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL);
 #line 369 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1223,13 +1233,13 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry
 		_sidebar_branch_node_unref0 (parent_node);
 #line 374 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1227 "Branch.c"
+#line 1237 "Branch.c"
 	}
 	{
 		GeeIterator* _child_it = NULL;
-		SidebarBranchNode* _tmp6_ = NULL;
-		GeeSortedSet* _tmp7_ = NULL;
-		GeeIterator* _tmp8_ = NULL;
+		SidebarBranchNode* _tmp6_;
+		GeeSortedSet* _tmp7_;
+		GeeIterator* _tmp8_;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp6_ = parent_node;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1240,17 +1250,17 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry
 		_child_it = _tmp8_;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 1244 "Branch.c"
-			GeeIterator* _tmp9_ = NULL;
-			gboolean _tmp10_ = FALSE;
+#line 1254 "Branch.c"
+			GeeIterator* _tmp9_;
+			gboolean _tmp10_;
 			SidebarBranchNode* child = NULL;
-			GeeIterator* _tmp11_ = NULL;
-			gpointer _tmp12_ = NULL;
-			Locator _tmp13_ = NULL;
-			void* _tmp13__target = NULL;
-			SidebarBranchNode* _tmp14_ = NULL;
-			SidebarEntry* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
+			GeeIterator* _tmp11_;
+			gpointer _tmp12_;
+			Locator _tmp13_;
+			void* _tmp13__target;
+			SidebarBranchNode* _tmp14_;
+			SidebarEntry* _tmp15_;
+			gboolean _tmp16_;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp9_ = _child_it;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1259,7 +1269,7 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry
 			if (!_tmp10_) {
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 1263 "Branch.c"
+#line 1273 "Branch.c"
 			}
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp11_ = _child_it;
@@ -1279,10 +1289,10 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry
 			_tmp16_ = _tmp13_ (_tmp15_, _tmp13__target);
 #line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			if (_tmp16_) {
-#line 1283 "Branch.c"
-				SidebarBranchNode* _tmp17_ = NULL;
-				SidebarEntry* _tmp18_ = NULL;
-				SidebarEntry* _tmp19_ = NULL;
+#line 1293 "Branch.c"
+				SidebarBranchNode* _tmp17_;
+				SidebarEntry* _tmp18_;
+				SidebarEntry* _tmp19_;
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				_tmp17_ = child;
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1299,15 +1309,15 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry
 				_sidebar_branch_node_unref0 (parent_node);
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				return result;
-#line 1303 "Branch.c"
+#line 1313 "Branch.c"
 			}
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (child);
-#line 1307 "Branch.c"
+#line 1317 "Branch.c"
 		}
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_child_it);
-#line 1311 "Branch.c"
+#line 1321 "Branch.c"
 	}
 #line 381 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = NULL;
@@ -1315,26 +1325,26 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry
 	_sidebar_branch_node_unref0 (parent_node);
 #line 381 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1319 "Branch.c"
+#line 1329 "Branch.c"
 }
 
 
 SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry) {
 	SidebarEntry* result = NULL;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarBranchNode* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarBranchNode* _tmp1_;
+	SidebarEntry* _tmp2_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	gpointer _tmp5_ = NULL;
-	SidebarBranchNode* _tmp6_ = NULL;
-	SidebarBranchNode* _tmp7_ = NULL;
-	SidebarBranchNode* _tmp8_ = NULL;
-	SidebarBranchNode* _tmp9_ = NULL;
-	SidebarBranchNode* _tmp10_ = NULL;
-	SidebarEntry* _tmp11_ = NULL;
-	SidebarEntry* _tmp12_ = NULL;
+	GeeHashMap* _tmp3_;
+	SidebarEntry* _tmp4_;
+	gpointer _tmp5_;
+	SidebarBranchNode* _tmp6_;
+	SidebarBranchNode* _tmp7_;
+	SidebarBranchNode* _tmp8_;
+	SidebarBranchNode* _tmp9_;
+	SidebarBranchNode* _tmp10_;
+	SidebarEntry* _tmp11_;
+	SidebarEntry* _tmp12_;
 #line 385 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL);
 #line 385 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1351,7 +1361,7 @@ SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entr
 		result = NULL;
 #line 387 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1355 "Branch.c"
+#line 1365 "Branch.c"
 	}
 #line 389 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp3_ = self->priv->map;
@@ -1385,34 +1395,34 @@ SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entr
 	_sidebar_branch_node_unref0 (entry_node);
 #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1389 "Branch.c"
+#line 1399 "Branch.c"
 }
 
 
 SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, SidebarEntry* entry) {
 	SidebarEntry* result = NULL;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarBranchNode* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarBranchNode* _tmp1_;
+	SidebarEntry* _tmp2_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	gpointer _tmp5_ = NULL;
-	SidebarBranchNode* _tmp6_ = NULL;
-	SidebarBranchNode* _tmp7_ = NULL;
-	SidebarBranchNode* _tmp8_ = NULL;
-	SidebarBranchNode* _tmp9_ = NULL;
-	SidebarBranchNode* _tmp10_ = NULL;
-	GeeSortedSet* _tmp11_ = NULL;
+	GeeHashMap* _tmp3_;
+	SidebarEntry* _tmp4_;
+	gpointer _tmp5_;
+	SidebarBranchNode* _tmp6_;
+	SidebarBranchNode* _tmp7_;
+	SidebarBranchNode* _tmp8_;
+	SidebarBranchNode* _tmp9_;
+	SidebarBranchNode* _tmp10_;
+	GeeSortedSet* _tmp11_;
 	SidebarBranchNode* sibling = NULL;
-	SidebarBranchNode* _tmp12_ = NULL;
-	SidebarBranchNode* _tmp13_ = NULL;
-	GeeSortedSet* _tmp14_ = NULL;
-	SidebarBranchNode* _tmp15_ = NULL;
-	gpointer _tmp16_ = NULL;
+	SidebarBranchNode* _tmp12_;
+	SidebarBranchNode* _tmp13_;
+	GeeSortedSet* _tmp14_;
+	SidebarBranchNode* _tmp15_;
+	gpointer _tmp16_;
 	SidebarEntry* _tmp17_ = NULL;
-	SidebarBranchNode* _tmp18_ = NULL;
-	SidebarEntry* _tmp21_ = NULL;
+	SidebarBranchNode* _tmp18_;
+	SidebarEntry* _tmp21_;
 #line 397 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL);
 #line 397 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1429,7 +1439,7 @@ SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, SidebarE
 		result = NULL;
 #line 399 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1433 "Branch.c"
+#line 1443 "Branch.c"
 	}
 #line 401 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp3_ = self->priv->map;
@@ -1473,20 +1483,20 @@ SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, SidebarE
 	_tmp18_ = sibling;
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (_tmp18_ != NULL) {
-#line 1477 "Branch.c"
-		SidebarBranchNode* _tmp19_ = NULL;
-		SidebarEntry* _tmp20_ = NULL;
+#line 1487 "Branch.c"
+		SidebarBranchNode* _tmp19_;
+		SidebarEntry* _tmp20_;
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp19_ = sibling;
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp20_ = _tmp19_->entry;
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp17_ = _tmp20_;
-#line 1486 "Branch.c"
+#line 1496 "Branch.c"
 	} else {
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp17_ = NULL;
-#line 1490 "Branch.c"
+#line 1500 "Branch.c"
 	}
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp21_ = _g_object_ref0 (_tmp17_);
@@ -1498,34 +1508,34 @@ SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, SidebarE
 	_sidebar_branch_node_unref0 (entry_node);
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1502 "Branch.c"
+#line 1512 "Branch.c"
 }
 
 
 SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, SidebarEntry* entry) {
 	SidebarEntry* result = NULL;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarBranchNode* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarBranchNode* _tmp1_;
+	SidebarEntry* _tmp2_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	gpointer _tmp5_ = NULL;
-	SidebarBranchNode* _tmp6_ = NULL;
-	SidebarBranchNode* _tmp7_ = NULL;
-	SidebarBranchNode* _tmp8_ = NULL;
-	SidebarBranchNode* _tmp9_ = NULL;
-	SidebarBranchNode* _tmp10_ = NULL;
-	GeeSortedSet* _tmp11_ = NULL;
+	GeeHashMap* _tmp3_;
+	SidebarEntry* _tmp4_;
+	gpointer _tmp5_;
+	SidebarBranchNode* _tmp6_;
+	SidebarBranchNode* _tmp7_;
+	SidebarBranchNode* _tmp8_;
+	SidebarBranchNode* _tmp9_;
+	SidebarBranchNode* _tmp10_;
+	GeeSortedSet* _tmp11_;
 	SidebarBranchNode* sibling = NULL;
-	SidebarBranchNode* _tmp12_ = NULL;
-	SidebarBranchNode* _tmp13_ = NULL;
-	GeeSortedSet* _tmp14_ = NULL;
-	SidebarBranchNode* _tmp15_ = NULL;
-	gpointer _tmp16_ = NULL;
+	SidebarBranchNode* _tmp12_;
+	SidebarBranchNode* _tmp13_;
+	GeeSortedSet* _tmp14_;
+	SidebarBranchNode* _tmp15_;
+	gpointer _tmp16_;
 	SidebarEntry* _tmp17_ = NULL;
-	SidebarBranchNode* _tmp18_ = NULL;
-	SidebarEntry* _tmp21_ = NULL;
+	SidebarBranchNode* _tmp18_;
+	SidebarEntry* _tmp21_;
 #line 412 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL);
 #line 412 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1542,7 +1552,7 @@ SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, SidebarEntry
 		result = NULL;
 #line 414 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1546 "Branch.c"
+#line 1556 "Branch.c"
 	}
 #line 416 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp3_ = self->priv->map;
@@ -1586,20 +1596,20 @@ SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, SidebarEntry
 	_tmp18_ = sibling;
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (_tmp18_ != NULL) {
-#line 1590 "Branch.c"
-		SidebarBranchNode* _tmp19_ = NULL;
-		SidebarEntry* _tmp20_ = NULL;
+#line 1600 "Branch.c"
+		SidebarBranchNode* _tmp19_;
+		SidebarEntry* _tmp20_;
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp19_ = sibling;
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp20_ = _tmp19_->entry;
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp17_ = _tmp20_;
-#line 1599 "Branch.c"
+#line 1609 "Branch.c"
 	} else {
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp17_ = NULL;
-#line 1603 "Branch.c"
+#line 1613 "Branch.c"
 	}
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp21_ = _g_object_ref0 (_tmp17_);
@@ -1611,13 +1621,13 @@ SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, SidebarEntry
 	_sidebar_branch_node_unref0 (entry_node);
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1615 "Branch.c"
+#line 1625 "Branch.c"
 }
 
 
 static void sidebar_branch_prune_callback (SidebarBranch* self, SidebarBranchNode* node) {
-	SidebarBranchNode* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
+	SidebarBranchNode* _tmp0_;
+	SidebarEntry* _tmp1_;
 #line 426 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 426 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1627,14 +1637,14 @@ static void sidebar_branch_prune_callback (SidebarBranch* self, SidebarBranchNod
 #line 427 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp1_ = _tmp0_->entry;
 #line 427 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit_by_name (self, "entry-removed", _tmp1_);
-#line 1632 "Branch.c"
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL], 0, _tmp1_);
+#line 1642 "Branch.c"
 }
 
 
 static void sidebar_branch_children_reordered_callback (SidebarBranch* self, SidebarBranchNode* node) {
-	SidebarBranchNode* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
+	SidebarBranchNode* _tmp0_;
+	SidebarEntry* _tmp1_;
 #line 430 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 430 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1644,8 +1654,8 @@ static void sidebar_branch_children_reordered_callback (SidebarBranch* self, Sid
 #line 431 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp1_ = _tmp0_->entry;
 #line 431 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit_by_name (self, "children-reordered", _tmp1_);
-#line 1649 "Branch.c"
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL], 0, _tmp1_);
+#line 1659 "Branch.c"
 }
 
 
@@ -1664,28 +1674,28 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 		data1 = closure->data;
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 1668 "Branch.c"
+#line 1678 "Branch.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		data2 = closure->data;
-#line 1674 "Branch.c"
+#line 1684 "Branch.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 1680 "Branch.c"
+#line 1690 "Branch.c"
 }
 
 
 static SidebarBranchNode* sidebar_branch_node_construct (GType object_type, SidebarEntry* entry, SidebarBranchNode* parent, GCompareFunc comparator) {
 	SidebarBranchNode* self = NULL;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	SidebarBranchNode* _tmp2_ = NULL;
-	GCompareFunc _tmp3_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarEntry* _tmp1_;
+	SidebarBranchNode* _tmp2_;
+	GCompareFunc _tmp3_;
 #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
 #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1710,33 +1720,33 @@ static SidebarBranchNode* sidebar_branch_node_construct (GType object_type, Side
 	self->comparator = _tmp3_;
 #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return self;
-#line 1714 "Branch.c"
+#line 1724 "Branch.c"
 }
 
 
 static SidebarBranchNode* sidebar_branch_node_new (SidebarEntry* entry, SidebarBranchNode* parent, GCompareFunc comparator) {
 #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return sidebar_branch_node_construct (SIDEBAR_BRANCH_TYPE_NODE, entry, parent, comparator);
-#line 1721 "Branch.c"
+#line 1731 "Branch.c"
 }
 
 
 static gint sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode, SidebarBranchNode* bnode) {
 	gint result = 0;
-	SidebarBranchNode* _tmp0_ = NULL;
-	SidebarBranchNode* _tmp1_ = NULL;
-	SidebarBranchNode* _tmp2_ = NULL;
-	SidebarBranchNode* _tmp3_ = NULL;
-	SidebarBranchNode* _tmp4_ = NULL;
-	SidebarBranchNode* _tmp5_ = NULL;
-	SidebarBranchNode* _tmp6_ = NULL;
-	SidebarBranchNode* _tmp7_ = NULL;
-	GCompareFunc _tmp8_ = NULL;
-	SidebarBranchNode* _tmp9_ = NULL;
-	SidebarEntry* _tmp10_ = NULL;
-	SidebarBranchNode* _tmp11_ = NULL;
-	SidebarEntry* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
+	SidebarBranchNode* _tmp0_;
+	SidebarBranchNode* _tmp1_;
+	SidebarBranchNode* _tmp2_;
+	SidebarBranchNode* _tmp3_;
+	SidebarBranchNode* _tmp4_;
+	SidebarBranchNode* _tmp5_;
+	SidebarBranchNode* _tmp6_;
+	SidebarBranchNode* _tmp7_;
+	GCompareFunc _tmp8_;
+	SidebarBranchNode* _tmp9_;
+	SidebarEntry* _tmp10_;
+	SidebarBranchNode* _tmp11_;
+	SidebarEntry* _tmp12_;
+	gint _tmp13_;
 #line 51 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_BRANCH_IS_NODE (anode), 0);
 #line 51 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1751,7 +1761,7 @@ static gint sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode, Si
 		result = 0;
 #line 53 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1755 "Branch.c"
+#line 1765 "Branch.c"
 	}
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp2_ = anode;
@@ -1783,24 +1793,24 @@ static gint sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode, Si
 	result = _tmp13_;
 #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1787 "Branch.c"
+#line 1797 "Branch.c"
 }
 
 
 static gboolean sidebar_branch_node_has_children (SidebarBranchNode* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	GeeSortedSet* _tmp1_ = NULL;
+	GeeSortedSet* _tmp1_;
 #line 60 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_BRANCH_IS_NODE (self), FALSE);
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp1_ = self->children;
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (_tmp1_ != NULL) {
-#line 1801 "Branch.c"
-		GeeSortedSet* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+#line 1811 "Branch.c"
+		GeeSortedSet* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp2_ = self->children;
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1809,17 +1819,17 @@ static gboolean sidebar_branch_node_has_children (SidebarBranchNode* self) {
 		_tmp4_ = _tmp3_;
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp0_ = _tmp4_ > 0;
-#line 1813 "Branch.c"
+#line 1823 "Branch.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp0_ = FALSE;
-#line 1817 "Branch.c"
+#line 1827 "Branch.c"
 	}
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = _tmp0_;
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1823 "Branch.c"
+#line 1833 "Branch.c"
 }
 
 
@@ -1828,17 +1838,17 @@ static gint _sidebar_branch_node_comparator_wrapper_gcompare_data_func (gconstpo
 	result = sidebar_branch_node_comparator_wrapper ((SidebarBranchNode*) a, (SidebarBranchNode*) b);
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1832 "Branch.c"
+#line 1842 "Branch.c"
 }
 
 
 static void sidebar_branch_node_add_child (SidebarBranchNode* self, SidebarBranchNode* child) {
-	SidebarBranchNode* _tmp0_ = NULL;
-	GeeSortedSet* _tmp1_ = NULL;
+	SidebarBranchNode* _tmp0_;
+	GeeSortedSet* _tmp1_;
 	gboolean added = FALSE;
-	GeeSortedSet* _tmp3_ = NULL;
-	SidebarBranchNode* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	GeeSortedSet* _tmp3_;
+	SidebarBranchNode* _tmp4_;
+	gboolean _tmp5_;
 #line 64 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self));
 #line 64 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1851,15 +1861,15 @@ static void sidebar_branch_node_add_child (SidebarBranchNode* self, SidebarBranc
 	_tmp1_ = self->children;
 #line 67 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (_tmp1_ == NULL) {
-#line 1855 "Branch.c"
-		GeeTreeSet* _tmp2_ = NULL;
+#line 1865 "Branch.c"
+		GeeTreeSet* _tmp2_;
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp2_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL);
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (self->children);
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		self->children = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 1863 "Branch.c"
+#line 1873 "Branch.c"
 	}
 #line 70 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp3_ = self->children;
@@ -1871,20 +1881,20 @@ static void sidebar_branch_node_add_child (SidebarBranchNode* self, SidebarBranc
 	added = _tmp5_;
 #line 71 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_vala_assert (added, "added");
-#line 1875 "Branch.c"
+#line 1885 "Branch.c"
 }
 
 
 static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBranchNode* child) {
-	GeeSortedSet* _tmp0_ = NULL;
+	GeeSortedSet* _tmp0_;
 	GeeSortedSet* new_children = NULL;
-	GeeTreeSet* _tmp1_ = NULL;
+	GeeTreeSet* _tmp1_;
 	gboolean found = FALSE;
-	gboolean _tmp12_ = FALSE;
-	GeeSortedSet* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	SidebarBranchNode* _tmp18_ = NULL;
+	gboolean _tmp12_;
+	GeeSortedSet* _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
+	SidebarBranchNode* _tmp18_;
 #line 74 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self));
 #line 74 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1899,11 +1909,11 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr
 	new_children = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet);
 #line 81 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	found = FALSE;
-#line 1903 "Branch.c"
+#line 1913 "Branch.c"
 	{
 		GeeIterator* _c_it = NULL;
-		GeeSortedSet* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeSortedSet* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp2_ = self->children;
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1912,14 +1922,14 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr
 		_c_it = _tmp3_;
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 1916 "Branch.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 1926 "Branch.c"
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			SidebarBranchNode* c = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
-			SidebarBranchNode* _tmp8_ = NULL;
-			SidebarBranchNode* _tmp9_ = NULL;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			SidebarBranchNode* _tmp8_;
+			SidebarBranchNode* _tmp9_;
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp4_ = _c_it;
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1928,7 +1938,7 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr
 			if (!_tmp5_) {
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 1932 "Branch.c"
+#line 1942 "Branch.c"
 			}
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp6_ = _c_it;
@@ -1942,28 +1952,28 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr
 			_tmp9_ = child;
 #line 83 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			if (_tmp8_ != _tmp9_) {
-#line 1946 "Branch.c"
-				GeeSortedSet* _tmp10_ = NULL;
-				SidebarBranchNode* _tmp11_ = NULL;
+#line 1956 "Branch.c"
+				GeeSortedSet* _tmp10_;
+				SidebarBranchNode* _tmp11_;
 #line 84 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				_tmp10_ = new_children;
 #line 84 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				_tmp11_ = c;
 #line 84 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_);
-#line 1955 "Branch.c"
+#line 1965 "Branch.c"
 			} else {
 #line 86 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				found = TRUE;
-#line 1959 "Branch.c"
+#line 1969 "Branch.c"
 			}
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (c);
-#line 1963 "Branch.c"
+#line 1973 "Branch.c"
 		}
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_c_it);
-#line 1967 "Branch.c"
+#line 1977 "Branch.c"
 	}
 #line 89 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp12_ = found;
@@ -1977,9 +1987,9 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr
 	_tmp15_ = _tmp14_;
 #line 91 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (_tmp15_ != 0) {
-#line 1981 "Branch.c"
-		GeeSortedSet* _tmp16_ = NULL;
-		GeeSortedSet* _tmp17_ = NULL;
+#line 1991 "Branch.c"
+		GeeSortedSet* _tmp16_;
+		GeeSortedSet* _tmp17_;
 #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp16_ = new_children;
 #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1988,13 +1998,13 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr
 		_g_object_unref0 (self->children);
 #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		self->children = _tmp17_;
-#line 1992 "Branch.c"
+#line 2002 "Branch.c"
 	} else {
 #line 94 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (self->children);
 #line 94 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		self->children = NULL;
-#line 1998 "Branch.c"
+#line 2008 "Branch.c"
 	}
 #line 96 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp18_ = child;
@@ -2002,15 +2012,15 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr
 	_tmp18_->parent = NULL;
 #line 74 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (new_children);
-#line 2006 "Branch.c"
+#line 2016 "Branch.c"
 }
 
 
 static void sidebar_branch_node_prune_children (SidebarBranchNode* self, SidebarBranchNodePruneCallback cb, void* cb_target) {
-	GeeSortedSet* _tmp0_ = NULL;
+	GeeSortedSet* _tmp0_;
 	GeeSortedSet* old_children = NULL;
-	GeeSortedSet* _tmp9_ = NULL;
-	GeeSortedSet* _tmp10_ = NULL;
+	GeeSortedSet* _tmp9_;
+	GeeSortedSet* _tmp10_;
 #line 99 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self));
 #line 100 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2019,12 +2029,12 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar
 	if (_tmp0_ == NULL) {
 #line 101 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return;
-#line 2023 "Branch.c"
+#line 2033 "Branch.c"
 	}
 	{
 		GeeIterator* _child_it = NULL;
-		GeeSortedSet* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeSortedSet* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp1_ = self->children;
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2033,15 +2043,15 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar
 		_child_it = _tmp2_;
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 2037 "Branch.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 2047 "Branch.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			SidebarBranchNode* child = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
-			SidebarBranchNode* _tmp7_ = NULL;
-			SidebarBranchNodePruneCallback _tmp8_ = NULL;
-			void* _tmp8__target = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
+			SidebarBranchNode* _tmp7_;
+			SidebarBranchNodePruneCallback _tmp8_;
+			void* _tmp8__target;
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp3_ = _child_it;
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2050,7 +2060,7 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar
 			if (!_tmp4_) {
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 2054 "Branch.c"
+#line 2064 "Branch.c"
 			}
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp5_ = _child_it;
@@ -2068,11 +2078,11 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar
 			sidebar_branch_node_prune_children (_tmp7_, _tmp8_, _tmp8__target);
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (child);
-#line 2072 "Branch.c"
+#line 2082 "Branch.c"
 		}
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_child_it);
-#line 2076 "Branch.c"
+#line 2086 "Branch.c"
 	}
 #line 106 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp9_ = self->children;
@@ -2084,11 +2094,11 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar
 	_g_object_unref0 (self->children);
 #line 107 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self->children = NULL;
-#line 2088 "Branch.c"
+#line 2098 "Branch.c"
 	{
 		GeeIterator* _child_it = NULL;
-		GeeSortedSet* _tmp11_ = NULL;
-		GeeIterator* _tmp12_ = NULL;
+		GeeSortedSet* _tmp11_;
+		GeeIterator* _tmp12_;
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp11_ = old_children;
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2097,15 +2107,15 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar
 		_child_it = _tmp12_;
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 2101 "Branch.c"
-			GeeIterator* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
+#line 2111 "Branch.c"
+			GeeIterator* _tmp13_;
+			gboolean _tmp14_;
 			SidebarBranchNode* child = NULL;
-			GeeIterator* _tmp15_ = NULL;
-			gpointer _tmp16_ = NULL;
-			SidebarBranchNodePruneCallback _tmp17_ = NULL;
-			void* _tmp17__target = NULL;
-			SidebarBranchNode* _tmp18_ = NULL;
+			GeeIterator* _tmp15_;
+			gpointer _tmp16_;
+			SidebarBranchNodePruneCallback _tmp17_;
+			void* _tmp17__target;
+			SidebarBranchNode* _tmp18_;
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp13_ = _child_it;
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2114,7 +2124,7 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar
 			if (!_tmp14_) {
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 2118 "Branch.c"
+#line 2128 "Branch.c"
 			}
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp15_ = _child_it;
@@ -2132,21 +2142,21 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar
 			_tmp17_ (_tmp18_, _tmp17__target);
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (child);
-#line 2136 "Branch.c"
+#line 2146 "Branch.c"
 		}
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_child_it);
-#line 2140 "Branch.c"
+#line 2150 "Branch.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (old_children);
-#line 2144 "Branch.c"
+#line 2154 "Branch.c"
 }
 
 
 static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, SidebarBranchNode* child) {
 	gint result = 0;
-	GeeSortedSet* _tmp0_ = NULL;
+	GeeSortedSet* _tmp0_;
 	gint index = 0;
 #line 118 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_BRANCH_IS_NODE (self), 0);
@@ -2160,15 +2170,15 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self,
 		result = -1;
 #line 120 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 2164 "Branch.c"
+#line 2174 "Branch.c"
 	}
 #line 122 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	index = 0;
-#line 2168 "Branch.c"
+#line 2178 "Branch.c"
 	{
 		GeeIterator* _c_it = NULL;
-		GeeSortedSet* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeSortedSet* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp1_ = self->children;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2177,15 +2187,15 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self,
 		_c_it = _tmp2_;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 2181 "Branch.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 2191 "Branch.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			SidebarBranchNode* c = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
-			SidebarBranchNode* _tmp7_ = NULL;
-			SidebarBranchNode* _tmp8_ = NULL;
-			gint _tmp9_ = 0;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
+			SidebarBranchNode* _tmp7_;
+			SidebarBranchNode* _tmp8_;
+			gint _tmp9_;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp3_ = _c_it;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2194,7 +2204,7 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self,
 			if (!_tmp4_) {
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 2198 "Branch.c"
+#line 2208 "Branch.c"
 			}
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp5_ = _c_it;
@@ -2216,7 +2226,7 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self,
 				_g_object_unref0 (_c_it);
 #line 125 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				return result;
-#line 2220 "Branch.c"
+#line 2230 "Branch.c"
 			}
 #line 127 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp9_ = index;
@@ -2224,35 +2234,35 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self,
 			index = _tmp9_ + 1;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (c);
-#line 2228 "Branch.c"
+#line 2238 "Branch.c"
 		}
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_c_it);
-#line 2232 "Branch.c"
+#line 2242 "Branch.c"
 	}
 #line 130 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = -1;
 #line 130 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 2238 "Branch.c"
+#line 2248 "Branch.c"
 }
 
 
 static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, SidebarBranchNode* child) {
 	gboolean result = FALSE;
-	GeeSortedSet* _tmp0_ = NULL;
+	GeeSortedSet* _tmp0_;
 	gint old_index = 0;
-	SidebarBranchNode* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	SidebarBranchNode* _tmp1_;
+	gint _tmp2_;
 	GeeSortedSet* new_children = NULL;
-	GeeTreeSet* _tmp3_ = NULL;
+	GeeTreeSet* _tmp3_;
 	gboolean added = FALSE;
-	GeeSortedSet* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	GeeSortedSet* _tmp6_ = NULL;
+	GeeSortedSet* _tmp4_;
+	gboolean _tmp5_;
+	GeeSortedSet* _tmp6_;
 	gint new_index = 0;
-	SidebarBranchNode* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
+	SidebarBranchNode* _tmp7_;
+	gint _tmp8_;
 #line 134 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_BRANCH_IS_NODE (self), FALSE);
 #line 134 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2301,21 +2311,21 @@ static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, Side
 	_g_object_unref0 (new_children);
 #line 155 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 2305 "Branch.c"
+#line 2315 "Branch.c"
 }
 
 
 static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gboolean recursive, SidebarBranchNodeChildrenReorderedCallback cb, void* cb_target) {
-	GeeSortedSet* _tmp0_ = NULL;
+	GeeSortedSet* _tmp0_;
 	GeeSortedSet* reordered = NULL;
-	GeeTreeSet* _tmp1_ = NULL;
-	GeeSortedSet* _tmp2_ = NULL;
-	GeeSortedSet* _tmp3_ = NULL;
-	GeeSortedSet* _tmp4_ = NULL;
-	GeeSortedSet* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	SidebarBranchNodeChildrenReorderedCallback _tmp15_ = NULL;
-	void* _tmp15__target = NULL;
+	GeeTreeSet* _tmp1_;
+	GeeSortedSet* _tmp2_;
+	GeeSortedSet* _tmp3_;
+	GeeSortedSet* _tmp4_;
+	GeeSortedSet* _tmp5_;
+	gboolean _tmp6_;
+	SidebarBranchNodeChildrenReorderedCallback _tmp15_;
+	void* _tmp15__target;
 #line 158 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self));
 #line 159 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2324,7 +2334,7 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool
 	if (_tmp0_ == NULL) {
 #line 160 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return;
-#line 2328 "Branch.c"
+#line 2338 "Branch.c"
 	}
 #line 162 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp1_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL);
@@ -2348,11 +2358,11 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool
 	_tmp6_ = recursive;
 #line 166 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (_tmp6_) {
-#line 2352 "Branch.c"
+#line 2362 "Branch.c"
 		{
 			GeeIterator* _child_it = NULL;
-			GeeSortedSet* _tmp7_ = NULL;
-			GeeIterator* _tmp8_ = NULL;
+			GeeSortedSet* _tmp7_;
+			GeeIterator* _tmp8_;
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp7_ = self->children;
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2361,15 +2371,15 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool
 			_child_it = _tmp8_;
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			while (TRUE) {
-#line 2365 "Branch.c"
-				GeeIterator* _tmp9_ = NULL;
-				gboolean _tmp10_ = FALSE;
+#line 2375 "Branch.c"
+				GeeIterator* _tmp9_;
+				gboolean _tmp10_;
 				SidebarBranchNode* child = NULL;
-				GeeIterator* _tmp11_ = NULL;
-				gpointer _tmp12_ = NULL;
-				SidebarBranchNode* _tmp13_ = NULL;
-				SidebarBranchNodeChildrenReorderedCallback _tmp14_ = NULL;
-				void* _tmp14__target = NULL;
+				GeeIterator* _tmp11_;
+				gpointer _tmp12_;
+				SidebarBranchNode* _tmp13_;
+				SidebarBranchNodeChildrenReorderedCallback _tmp14_;
+				void* _tmp14__target;
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				_tmp9_ = _child_it;
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2378,7 +2388,7 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool
 				if (!_tmp10_) {
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 					break;
-#line 2382 "Branch.c"
+#line 2392 "Branch.c"
 				}
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				_tmp11_ = _child_it;
@@ -2396,11 +2406,11 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool
 				sidebar_branch_node_reorder_children (_tmp13_, TRUE, _tmp14_, _tmp14__target);
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				_sidebar_branch_node_unref0 (child);
-#line 2400 "Branch.c"
+#line 2410 "Branch.c"
 			}
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_g_object_unref0 (_child_it);
-#line 2404 "Branch.c"
+#line 2414 "Branch.c"
 		}
 	}
 #line 171 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2411,15 +2421,15 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool
 	_tmp15_ (self, _tmp15__target);
 #line 158 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (reordered);
-#line 2415 "Branch.c"
+#line 2425 "Branch.c"
 }
 
 
 static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCompareFunc comparator, gboolean recursive, SidebarBranchNodeChildrenReorderedCallback cb, void* cb_target) {
-	GCompareFunc _tmp0_ = NULL;
-	SidebarBranchNodeChildrenReorderedCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	gboolean _tmp2_ = FALSE;
+	GCompareFunc _tmp0_;
+	SidebarBranchNodeChildrenReorderedCallback _tmp1_;
+	void* _tmp1__target;
+	gboolean _tmp2_;
 #line 174 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self));
 #line 176 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2436,11 +2446,11 @@ static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCom
 	_tmp2_ = recursive;
 #line 181 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (_tmp2_) {
-#line 2440 "Branch.c"
+#line 2450 "Branch.c"
 		{
 			GeeIterator* _child_it = NULL;
-			GeeSortedSet* _tmp3_ = NULL;
-			GeeIterator* _tmp4_ = NULL;
+			GeeSortedSet* _tmp3_;
+			GeeIterator* _tmp4_;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp3_ = self->children;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2449,16 +2459,16 @@ static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCom
 			_child_it = _tmp4_;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			while (TRUE) {
-#line 2453 "Branch.c"
-				GeeIterator* _tmp5_ = NULL;
-				gboolean _tmp6_ = FALSE;
+#line 2463 "Branch.c"
+				GeeIterator* _tmp5_;
+				gboolean _tmp6_;
 				SidebarBranchNode* child = NULL;
-				GeeIterator* _tmp7_ = NULL;
-				gpointer _tmp8_ = NULL;
-				SidebarBranchNode* _tmp9_ = NULL;
-				GCompareFunc _tmp10_ = NULL;
-				SidebarBranchNodeChildrenReorderedCallback _tmp11_ = NULL;
-				void* _tmp11__target = NULL;
+				GeeIterator* _tmp7_;
+				gpointer _tmp8_;
+				SidebarBranchNode* _tmp9_;
+				GCompareFunc _tmp10_;
+				SidebarBranchNodeChildrenReorderedCallback _tmp11_;
+				void* _tmp11__target;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				_tmp5_ = _child_it;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2467,7 +2477,7 @@ static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCom
 				if (!_tmp6_) {
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 					break;
-#line 2471 "Branch.c"
+#line 2481 "Branch.c"
 				}
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				_tmp7_ = _child_it;
@@ -2487,11 +2497,11 @@ static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCom
 				sidebar_branch_node_change_comparator (_tmp9_, _tmp10_, TRUE, _tmp11_, _tmp11__target);
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				_sidebar_branch_node_unref0 (child);
-#line 2491 "Branch.c"
+#line 2501 "Branch.c"
 			}
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_g_object_unref0 (_child_it);
-#line 2495 "Branch.c"
+#line 2505 "Branch.c"
 		}
 	}
 }
@@ -2500,7 +2510,7 @@ static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCom
 static void sidebar_branch_value_node_init (GValue* value) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	value->data[0].v_pointer = NULL;
-#line 2504 "Branch.c"
+#line 2514 "Branch.c"
 }
 
 
@@ -2509,7 +2519,7 @@ static void sidebar_branch_value_node_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_node_unref (value->data[0].v_pointer);
-#line 2513 "Branch.c"
+#line 2523 "Branch.c"
 	}
 }
 
@@ -2519,11 +2529,11 @@ static void sidebar_branch_value_node_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		dest_value->data[0].v_pointer = sidebar_branch_node_ref (src_value->data[0].v_pointer);
-#line 2523 "Branch.c"
+#line 2533 "Branch.c"
 	} else {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2527 "Branch.c"
+#line 2537 "Branch.c"
 	}
 }
 
@@ -2531,66 +2541,66 @@ static void sidebar_branch_value_node_copy_value (const GValue* src_value, GValu
 static gpointer sidebar_branch_value_node_peek_pointer (const GValue* value) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return value->data[0].v_pointer;
-#line 2535 "Branch.c"
+#line 2545 "Branch.c"
 }
 
 
 static gchar* sidebar_branch_value_node_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (collect_values[0].v_pointer) {
-#line 2542 "Branch.c"
-		SidebarBranchNode* object;
+#line 2552 "Branch.c"
+		SidebarBranchNode * object;
 		object = collect_values[0].v_pointer;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2549 "Branch.c"
+#line 2559 "Branch.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2553 "Branch.c"
+#line 2563 "Branch.c"
 		}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		value->data[0].v_pointer = sidebar_branch_node_ref (object);
-#line 2557 "Branch.c"
+#line 2567 "Branch.c"
 	} else {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		value->data[0].v_pointer = NULL;
-#line 2561 "Branch.c"
+#line 2571 "Branch.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return NULL;
-#line 2565 "Branch.c"
+#line 2575 "Branch.c"
 }
 
 
 static gchar* sidebar_branch_value_node_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SidebarBranchNode** object_p;
+	SidebarBranchNode ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (!object_p) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2576 "Branch.c"
+#line 2586 "Branch.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (!value->data[0].v_pointer) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		*object_p = NULL;
-#line 2582 "Branch.c"
+#line 2592 "Branch.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2586 "Branch.c"
+#line 2596 "Branch.c"
 	} else {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		*object_p = sidebar_branch_node_ref (value->data[0].v_pointer);
-#line 2590 "Branch.c"
+#line 2600 "Branch.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return NULL;
-#line 2594 "Branch.c"
+#line 2604 "Branch.c"
 }
 
 
@@ -2604,7 +2614,7 @@ static GParamSpec* sidebar_branch_param_spec_node (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return G_PARAM_SPEC (spec);
-#line 2608 "Branch.c"
+#line 2618 "Branch.c"
 }
 
 
@@ -2613,12 +2623,12 @@ static gpointer sidebar_branch_value_get_node (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SIDEBAR_BRANCH_TYPE_NODE), NULL);
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return value->data[0].v_pointer;
-#line 2617 "Branch.c"
+#line 2627 "Branch.c"
 }
 
 
 static void sidebar_branch_value_set_node (GValue* value, gpointer v_object) {
-	SidebarBranchNode* old;
+	SidebarBranchNode * old;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SIDEBAR_BRANCH_TYPE_NODE));
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2633,23 +2643,23 @@ static void sidebar_branch_value_set_node (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_node_ref (value->data[0].v_pointer);
-#line 2637 "Branch.c"
+#line 2647 "Branch.c"
 	} else {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		value->data[0].v_pointer = NULL;
-#line 2641 "Branch.c"
+#line 2651 "Branch.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (old) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_node_unref (old);
-#line 2647 "Branch.c"
+#line 2657 "Branch.c"
 	}
 }
 
 
 static void sidebar_branch_value_take_node (GValue* value, gpointer v_object) {
-	SidebarBranchNode* old;
+	SidebarBranchNode * old;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SIDEBAR_BRANCH_TYPE_NODE));
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2662,17 +2672,17 @@ static void sidebar_branch_value_take_node (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		value->data[0].v_pointer = v_object;
-#line 2666 "Branch.c"
+#line 2676 "Branch.c"
 	} else {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		value->data[0].v_pointer = NULL;
-#line 2670 "Branch.c"
+#line 2680 "Branch.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (old) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_node_unref (old);
-#line 2676 "Branch.c"
+#line 2686 "Branch.c"
 	}
 }
 
@@ -2682,7 +2692,7 @@ static void sidebar_branch_node_class_init (SidebarBranchNodeClass * klass) {
 	sidebar_branch_node_parent_class = g_type_class_peek_parent (klass);
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	((SidebarBranchNodeClass *) klass)->finalize = sidebar_branch_node_finalize;
-#line 2686 "Branch.c"
+#line 2696 "Branch.c"
 }
 
 
@@ -2691,11 +2701,11 @@ static void sidebar_branch_node_instance_init (SidebarBranchNode * self) {
 	self->children = NULL;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self->ref_count = 1;
-#line 2695 "Branch.c"
+#line 2705 "Branch.c"
 }
 
 
-static void sidebar_branch_node_finalize (SidebarBranchNode* obj) {
+static void sidebar_branch_node_finalize (SidebarBranchNode * obj) {
 	SidebarBranchNode * self;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_BRANCH_TYPE_NODE, SidebarBranchNode);
@@ -2705,7 +2715,7 @@ static void sidebar_branch_node_finalize (SidebarBranchNode* obj) {
 	_g_object_unref0 (self->entry);
 #line 43 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (self->children);
-#line 2709 "Branch.c"
+#line 2719 "Branch.c"
 }
 
 
@@ -2724,18 +2734,18 @@ static GType sidebar_branch_node_get_type (void) {
 
 
 static gpointer sidebar_branch_node_ref (gpointer instance) {
-	SidebarBranchNode* self;
+	SidebarBranchNode * self;
 	self = instance;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return instance;
-#line 2734 "Branch.c"
+#line 2744 "Branch.c"
 }
 
 
 static void sidebar_branch_node_unref (gpointer instance) {
-	SidebarBranchNode* self;
+	SidebarBranchNode * self;
 	self = instance;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2743,7 +2753,7 @@ static void sidebar_branch_node_unref (gpointer instance) {
 		SIDEBAR_BRANCH_NODE_GET_CLASS (self)->finalize (self);
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2747 "Branch.c"
+#line 2757 "Branch.c"
 	}
 }
 
@@ -2756,23 +2766,23 @@ static void sidebar_branch_class_init (SidebarBranchClass * klass) {
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = sidebar_branch_finalize;
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_new ("entry_added", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY);
+	sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_ADDED_SIGNAL] = g_signal_new ("entry-added", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY);
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_new ("entry_removed", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY);
+	sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL] = g_signal_new ("entry-removed", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY);
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_new ("entry_moved", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY);
+	sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_MOVED_SIGNAL] = g_signal_new ("entry-moved", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY);
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_new ("entry_reparented", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_ENTRY, SIDEBAR_TYPE_ENTRY);
+	sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REPARENTED_SIGNAL] = g_signal_new ("entry-reparented", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_ENTRY, SIDEBAR_TYPE_ENTRY);
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_new ("children_reordered", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY);
+	sidebar_branch_signals[SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL] = g_signal_new ("children-reordered", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY);
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_new ("show_branch", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 2771 "Branch.c"
+	sidebar_branch_signals[SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL] = g_signal_new ("show-branch", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+#line 2781 "Branch.c"
 }
 
 
 static void sidebar_branch_instance_init (SidebarBranch * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self->priv = SIDEBAR_BRANCH_GET_PRIVATE (self);
 #line 190 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2781,11 +2791,11 @@ static void sidebar_branch_instance_init (SidebarBranch * self) {
 	_tmp0_ = gee_hash_map_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 192 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self->priv->map = _tmp0_;
-#line 2785 "Branch.c"
+#line 2795 "Branch.c"
 }
 
 
-static void sidebar_branch_finalize (GObject* obj) {
+static void sidebar_branch_finalize (GObject * obj) {
 	SidebarBranch * self;
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_BRANCH, SidebarBranch);
@@ -2795,7 +2805,7 @@ static void sidebar_branch_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->map);
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	G_OBJECT_CLASS (sidebar_branch_parent_class)->finalize (obj);
-#line 2799 "Branch.c"
+#line 2809 "Branch.c"
 }
 
 
diff --git a/src/sidebar/Entry.c b/src/sidebar/Entry.c
index 1456a05..254fe54 100644
--- a/src/sidebar/Entry.c
+++ b/src/sidebar/Entry.c
@@ -1,4 +1,4 @@
-/* Entry.c generated by valac 0.34.7, the Vala compiler
+/* Entry.c generated by valac 0.36.6, the Vala compiler
  * generated from Entry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -32,6 +32,12 @@ typedef struct _SidebarEntryIface SidebarEntryIface;
 
 typedef struct _SidebarTree SidebarTree;
 typedef struct _SidebarTreeClass SidebarTreeClass;
+enum  {
+	SIDEBAR_ENTRY_SIDEBAR_TOOLTIP_CHANGED_SIGNAL,
+	SIDEBAR_ENTRY_SIDEBAR_ICON_CHANGED_SIGNAL,
+	SIDEBAR_ENTRY_LAST_SIGNAL
+};
+static guint sidebar_entry_signals[SIDEBAR_ENTRY_LAST_SIGNAL] = {0};
 
 #define SIDEBAR_TYPE_EXPANDABLE_ENTRY (sidebar_expandable_entry_get_type ())
 #define SIDEBAR_EXPANDABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EXPANDABLE_ENTRY, SidebarExpandableEntry))
@@ -66,6 +72,12 @@ typedef struct _SidebarPageRepresentativeIface SidebarPageRepresentativeIface;
 
 typedef struct _Page Page;
 typedef struct _PageClass PageClass;
+enum  {
+	SIDEBAR_PAGE_REPRESENTATIVE_PAGE_CREATED_SIGNAL,
+	SIDEBAR_PAGE_REPRESENTATIVE_DESTROYING_PAGE_SIGNAL,
+	SIDEBAR_PAGE_REPRESENTATIVE_LAST_SIGNAL
+};
+static guint sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_LAST_SIGNAL] = {0};
 
 #define SIDEBAR_TYPE_RENAMEABLE_ENTRY (sidebar_renameable_entry_get_type ())
 #define SIDEBAR_RENAMEABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry))
@@ -74,6 +86,11 @@ typedef struct _PageClass PageClass;
 
 typedef struct _SidebarRenameableEntry SidebarRenameableEntry;
 typedef struct _SidebarRenameableEntryIface SidebarRenameableEntryIface;
+enum  {
+	SIDEBAR_RENAMEABLE_ENTRY_SIDEBAR_NAME_CHANGED_SIGNAL,
+	SIDEBAR_RENAMEABLE_ENTRY_LAST_SIGNAL
+};
+static guint sidebar_renameable_entry_signals[SIDEBAR_RENAMEABLE_ENTRY_LAST_SIGNAL] = {0};
 
 #define SIDEBAR_TYPE_EMPHASIZABLE_ENTRY (sidebar_emphasizable_entry_get_type ())
 #define SIDEBAR_EMPHASIZABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, SidebarEmphasizableEntry))
@@ -82,6 +99,11 @@ typedef struct _SidebarRenameableEntryIface SidebarRenameableEntryIface;
 
 typedef struct _SidebarEmphasizableEntry SidebarEmphasizableEntry;
 typedef struct _SidebarEmphasizableEntryIface SidebarEmphasizableEntryIface;
+enum  {
+	SIDEBAR_EMPHASIZABLE_ENTRY_IS_EMPHASIZED_CHANGED_SIGNAL,
+	SIDEBAR_EMPHASIZABLE_ENTRY_LAST_SIGNAL
+};
+static guint sidebar_emphasizable_entry_signals[SIDEBAR_EMPHASIZABLE_ENTRY_LAST_SIGNAL] = {0};
 
 #define SIDEBAR_TYPE_DESTROYABLE_ENTRY (sidebar_destroyable_entry_get_type ())
 #define SIDEBAR_DESTROYABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_DESTROYABLE_ENTRY, SidebarDestroyableEntry))
@@ -241,7 +263,7 @@ gchar* sidebar_entry_get_sidebar_name (SidebarEntry* self) {
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL);
 #line 12 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_ENTRY_GET_INTERFACE (self)->get_sidebar_name (self);
-#line 245 "Entry.c"
+#line 267 "Entry.c"
 }
 
 
@@ -250,7 +272,7 @@ gchar* sidebar_entry_get_sidebar_tooltip (SidebarEntry* self) {
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL);
 #line 14 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_ENTRY_GET_INTERFACE (self)->get_sidebar_tooltip (self);
-#line 254 "Entry.c"
+#line 276 "Entry.c"
 }
 
 
@@ -259,7 +281,7 @@ gchar* sidebar_entry_get_sidebar_icon (SidebarEntry* self) {
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL);
 #line 16 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_ENTRY_GET_INTERFACE (self)->get_sidebar_icon (self);
-#line 263 "Entry.c"
+#line 285 "Entry.c"
 }
 
 
@@ -268,14 +290,14 @@ gchar* sidebar_entry_to_string (SidebarEntry* self) {
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL);
 #line 18 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_ENTRY_GET_INTERFACE (self)->to_string (self);
-#line 272 "Entry.c"
+#line 294 "Entry.c"
 }
 
 
 static void sidebar_entry_real_grafted (SidebarEntry* self, SidebarTree* tree) {
 #line 20 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (tree));
-#line 279 "Entry.c"
+#line 301 "Entry.c"
 }
 
 
@@ -284,14 +306,14 @@ void sidebar_entry_grafted (SidebarEntry* self, SidebarTree* tree) {
 	g_return_if_fail (SIDEBAR_IS_ENTRY (self));
 #line 20 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	SIDEBAR_ENTRY_GET_INTERFACE (self)->grafted (self, tree);
-#line 288 "Entry.c"
+#line 310 "Entry.c"
 }
 
 
 static void sidebar_entry_real_pruned (SidebarEntry* self, SidebarTree* tree) {
 #line 23 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (tree));
-#line 295 "Entry.c"
+#line 317 "Entry.c"
 }
 
 
@@ -300,7 +322,7 @@ void sidebar_entry_pruned (SidebarEntry* self, SidebarTree* tree) {
 	g_return_if_fail (SIDEBAR_IS_ENTRY (self));
 #line 23 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	SIDEBAR_ENTRY_GET_INTERFACE (self)->pruned (self, tree);
-#line 304 "Entry.c"
+#line 326 "Entry.c"
 }
 
 
@@ -312,14 +334,14 @@ static void sidebar_entry_base_init (SidebarEntryIface * iface) {
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
-		g_signal_new ("sidebar_tooltip_changed", SIDEBAR_TYPE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+		sidebar_entry_signals[SIDEBAR_ENTRY_SIDEBAR_TOOLTIP_CHANGED_SIGNAL] = g_signal_new ("sidebar-tooltip-changed", SIDEBAR_TYPE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
-		g_signal_new ("sidebar_icon_changed", SIDEBAR_TYPE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+		sidebar_entry_signals[SIDEBAR_ENTRY_SIDEBAR_ICON_CHANGED_SIGNAL] = g_signal_new ("sidebar-icon-changed", SIDEBAR_TYPE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		iface->grafted = sidebar_entry_real_grafted;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		iface->pruned = sidebar_entry_real_pruned;
-#line 323 "Entry.c"
+#line 345 "Entry.c"
 	}
 }
 
@@ -342,7 +364,7 @@ gboolean sidebar_expandable_entry_expand_on_select (SidebarExpandableEntry* self
 	g_return_val_if_fail (SIDEBAR_IS_EXPANDABLE_ENTRY (self), FALSE);
 #line 28 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_EXPANDABLE_ENTRY_GET_INTERFACE (self)->expand_on_select (self);
-#line 346 "Entry.c"
+#line 368 "Entry.c"
 }
 
 
@@ -353,7 +375,7 @@ static void sidebar_expandable_entry_base_init (SidebarExpandableEntryIface * if
 	if (!initialized) {
 #line 27 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 357 "Entry.c"
+#line 379 "Entry.c"
 	}
 }
 
@@ -378,7 +400,7 @@ static void sidebar_selectable_entry_base_init (SidebarSelectableEntryIface * if
 	if (!initialized) {
 #line 31 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 382 "Entry.c"
+#line 404 "Entry.c"
 	}
 }
 
@@ -401,7 +423,7 @@ gboolean sidebar_page_representative_has_page (SidebarPageRepresentative* self)
 	g_return_val_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (self), FALSE);
 #line 41 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_PAGE_REPRESENTATIVE_GET_INTERFACE (self)->has_page (self);
-#line 405 "Entry.c"
+#line 427 "Entry.c"
 }
 
 
@@ -410,7 +432,7 @@ Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self) {
 	g_return_val_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (self), NULL);
 #line 43 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_PAGE_REPRESENTATIVE_GET_INTERFACE (self)->get_page (self);
-#line 414 "Entry.c"
+#line 436 "Entry.c"
 }
 
 
@@ -422,10 +444,10 @@ static void sidebar_page_representative_base_init (SidebarPageRepresentativeIfac
 #line 34 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
 #line 34 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
-		g_signal_new ("page_created", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_PAGE);
+		sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_PAGE_CREATED_SIGNAL] = g_signal_new ("page-created", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_PAGE);
 #line 34 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
-		g_signal_new ("destroying_page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_PAGE);
-#line 429 "Entry.c"
+		sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_DESTROYING_PAGE_SIGNAL] = g_signal_new ("destroying-page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_PAGE);
+#line 451 "Entry.c"
 	}
 }
 
@@ -449,7 +471,7 @@ void sidebar_renameable_entry_rename (SidebarRenameableEntry* self, const gchar*
 	g_return_if_fail (SIDEBAR_IS_RENAMEABLE_ENTRY (self));
 #line 49 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	SIDEBAR_RENAMEABLE_ENTRY_GET_INTERFACE (self)->rename (self, new_name);
-#line 453 "Entry.c"
+#line 475 "Entry.c"
 }
 
 
@@ -458,7 +480,7 @@ gboolean sidebar_renameable_entry_is_user_renameable (SidebarRenameableEntry* se
 	g_return_val_if_fail (SIDEBAR_IS_RENAMEABLE_ENTRY (self), FALSE);
 #line 52 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_RENAMEABLE_ENTRY_GET_INTERFACE (self)->is_user_renameable (self);
-#line 462 "Entry.c"
+#line 484 "Entry.c"
 }
 
 
@@ -470,8 +492,8 @@ static void sidebar_renameable_entry_base_init (SidebarRenameableEntryIface * if
 #line 46 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
 #line 46 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
-		g_signal_new ("sidebar_name_changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 475 "Entry.c"
+		sidebar_renameable_entry_signals[SIDEBAR_RENAMEABLE_ENTRY_SIDEBAR_NAME_CHANGED_SIGNAL] = g_signal_new ("sidebar-name-changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+#line 497 "Entry.c"
 	}
 }
 
@@ -494,7 +516,7 @@ gboolean sidebar_emphasizable_entry_is_emphasized (SidebarEmphasizableEntry* sel
 	g_return_val_if_fail (SIDEBAR_IS_EMPHASIZABLE_ENTRY (self), FALSE);
 #line 58 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_EMPHASIZABLE_ENTRY_GET_INTERFACE (self)->is_emphasized (self);
-#line 498 "Entry.c"
+#line 520 "Entry.c"
 }
 
 
@@ -506,8 +528,8 @@ static void sidebar_emphasizable_entry_base_init (SidebarEmphasizableEntryIface
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
-		g_signal_new ("is_emphasized_changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 511 "Entry.c"
+		sidebar_emphasizable_entry_signals[SIDEBAR_EMPHASIZABLE_ENTRY_IS_EMPHASIZED_CHANGED_SIGNAL] = g_signal_new ("is-emphasized-changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+#line 533 "Entry.c"
 	}
 }
 
@@ -530,7 +552,7 @@ void sidebar_destroyable_entry_destroy_source (SidebarDestroyableEntry* self) {
 	g_return_if_fail (SIDEBAR_IS_DESTROYABLE_ENTRY (self));
 #line 62 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	SIDEBAR_DESTROYABLE_ENTRY_GET_INTERFACE (self)->destroy_source (self);
-#line 534 "Entry.c"
+#line 556 "Entry.c"
 }
 
 
@@ -541,7 +563,7 @@ static void sidebar_destroyable_entry_base_init (SidebarDestroyableEntryIface *
 	if (!initialized) {
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 545 "Entry.c"
+#line 567 "Entry.c"
 	}
 }
 
@@ -564,7 +586,7 @@ gboolean sidebar_internal_drop_target_entry_internal_drop_received (SidebarInter
 	g_return_val_if_fail (SIDEBAR_IS_INTERNAL_DROP_TARGET_ENTRY (self), FALSE);
 #line 67 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_INTERNAL_DROP_TARGET_ENTRY_GET_INTERFACE (self)->internal_drop_received (self, sources);
-#line 568 "Entry.c"
+#line 590 "Entry.c"
 }
 
 
@@ -573,7 +595,7 @@ gboolean sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (Si
 	g_return_val_if_fail (SIDEBAR_IS_INTERNAL_DROP_TARGET_ENTRY (self), FALSE);
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_INTERNAL_DROP_TARGET_ENTRY_GET_INTERFACE (self)->internal_drop_received_arbitrary (self, data);
-#line 577 "Entry.c"
+#line 599 "Entry.c"
 }
 
 
@@ -584,7 +606,7 @@ static void sidebar_internal_drop_target_entry_base_init (SidebarInternalDropTar
 	if (!initialized) {
 #line 65 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 588 "Entry.c"
+#line 610 "Entry.c"
 	}
 }
 
@@ -607,7 +629,7 @@ void sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalD
 	g_return_if_fail (SIDEBAR_IS_INTERNAL_DRAG_SOURCE_ENTRY (self));
 #line 72 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	SIDEBAR_INTERNAL_DRAG_SOURCE_ENTRY_GET_INTERFACE (self)->prepare_selection_data (self, data);
-#line 611 "Entry.c"
+#line 633 "Entry.c"
 }
 
 
@@ -618,7 +640,7 @@ static void sidebar_internal_drag_source_entry_base_init (SidebarInternalDragSou
 	if (!initialized) {
 #line 71 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 622 "Entry.c"
+#line 644 "Entry.c"
 	}
 }
 
diff --git a/src/sidebar/Sidebar.c b/src/sidebar/Sidebar.c
index 9bffe74..7a44e33 100644
--- a/src/sidebar/Sidebar.c
+++ b/src/sidebar/Sidebar.c
@@ -1,4 +1,4 @@
-/* Sidebar.c generated by valac 0.34.7, the Vala compiler
+/* Sidebar.c generated by valac 0.36.6, the Vala compiler
  * generated from Sidebar.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/sidebar/Tree.c b/src/sidebar/Tree.c
index 31d8b38..c6bb85d 100644
--- a/src/sidebar/Tree.c
+++ b/src/sidebar/Tree.c
@@ -1,4 +1,4 @@
-/* Tree.c generated by valac 0.34.7, the Vala compiler
+/* Tree.c generated by valac 0.36.6, the Vala compiler
  * generated from Tree.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -325,6 +325,17 @@ typedef struct _LibraryWindowClass LibraryWindowClass;
 
 typedef struct _Tag Tag;
 typedef struct _TagClass TagClass;
+enum  {
+	SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL,
+	SIDEBAR_TREE_SELECTED_ENTRY_REMOVED_SIGNAL,
+	SIDEBAR_TREE_BRANCH_ADDED_SIGNAL,
+	SIDEBAR_TREE_BRANCH_REMOVED_SIGNAL,
+	SIDEBAR_TREE_BRANCH_SHOWN_SIGNAL,
+	SIDEBAR_TREE_PAGE_CREATED_SIGNAL,
+	SIDEBAR_TREE_DESTROYING_PAGE_SIGNAL,
+	SIDEBAR_TREE_LAST_SIGNAL
+};
+static guint sidebar_tree_signals[SIDEBAR_TREE_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -486,7 +497,7 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self);
 static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self);
 GType library_window_target_type_get_type (void) G_GNUC_CONST;
-static void _vala_array_add64 (GtkTargetEntry** array, int* length, int* size, const GtkTargetEntry* value);
+static void _vala_array_add64 (GtkTargetEntry* * array, int* length, int* size, const GtkTargetEntry* value);
 static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self);
 static gboolean _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self);
 static void sidebar_tree_setup_default_context_menu (SidebarTree* self);
@@ -668,26 +679,26 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 enum  {
 	SIDEBAR_TREE_ENTRY_WRAPPER_DUMMY_PROPERTY
 };
-static void sidebar_tree_entry_wrapper_finalize (GObject* obj);
+static void sidebar_tree_entry_wrapper_finalize (GObject * obj);
 enum  {
 	SIDEBAR_TREE_ROOT_WRAPPER_DUMMY_PROPERTY
 };
-static void sidebar_tree_root_wrapper_finalize (GObject* obj);
-static void sidebar_tree_finalize (GObject* obj);
+static void sidebar_tree_root_wrapper_finalize (GObject * obj);
+static void sidebar_tree_finalize (GObject * obj);
 
 static const GActionEntry SIDEBAR_TREE_entries[2] = {{"tag.new", _sidebar_tree_on_new_tag_gsimple_action_activate_callback}, {"search.new", _sidebar_tree_on_new_search_gsimple_action_activate_callback}};
 
 static void _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled (GtkCellRenderer* _sender, gpointer self) {
 #line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_editing_canceled ((SidebarTree*) self);
-#line 684 "Tree.c"
+#line 695 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started (GtkCellRenderer* _sender, GtkCellEditable* editable, const gchar* path, gpointer self) {
 #line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_editing_started ((SidebarTree*) self, editable, path);
-#line 691 "Tree.c"
+#line 702 "Tree.c"
 }
 
 
@@ -706,28 +717,28 @@ static GType sidebar_tree_columns_get_type (void) {
 static void _sidebar_tree_on_new_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_new_tag ((SidebarTree*) self);
-#line 710 "Tree.c"
+#line 721 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_new_search ((SidebarTree*) self);
-#line 717 "Tree.c"
+#line 728 "Tree.c"
 }
 
 
 static void _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self) {
 #line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_icon_renderer_function ((SidebarTree*) self, cell_layout, cell, tree_model, iter);
-#line 724 "Tree.c"
+#line 735 "Tree.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 731 "Tree.c"
+#line 742 "Tree.c"
 }
 
 
@@ -736,7 +747,7 @@ static gboolean _sidebar_tree_on_selection_gtk_tree_selection_func (GtkTreeSelec
 	result = sidebar_tree_on_selection ((SidebarTree*) self, selection, model, path, path_currently_selected);
 #line 129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 740 "Tree.c"
+#line 751 "Tree.c"
 }
 
 
@@ -745,7 +756,7 @@ static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTr
 	result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path);
 #line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 749 "Tree.c"
+#line 760 "Tree.c"
 }
 
 
@@ -754,22 +765,22 @@ static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (Gtk
 	result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path);
 #line 132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 758 "Tree.c"
+#line 769 "Tree.c"
 }
 
 
-static void _vala_array_add64 (GtkTargetEntry** array, int* length, int* size, const GtkTargetEntry* value) {
+static void _vala_array_add64 (GtkTargetEntry* * array, int* length, int* size, const GtkTargetEntry* value) {
 #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if ((*length) == (*size)) {
 #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		*array = g_renew (GtkTargetEntry, *array, *size);
-#line 769 "Tree.c"
+#line 780 "Tree.c"
 	}
 #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	(*array)[(*length)++] = *value;
-#line 773 "Tree.c"
+#line 784 "Tree.c"
 }
 
 
@@ -778,21 +789,21 @@ static gboolean _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (Gt
 	result = sidebar_tree_on_context_menu_keypress ((SidebarTree*) self);
 #line 146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 782 "Tree.c"
+#line 793 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
 #line 150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_drag_begin ((SidebarTree*) self, context);
-#line 789 "Tree.c"
+#line 800 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
 #line 151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_drag_end ((SidebarTree*) self, context);
-#line 796 "Tree.c"
+#line 807 "Tree.c"
 }
 
 
@@ -801,47 +812,47 @@ static gboolean _sidebar_tree_on_drag_motion_gtk_widget_drag_motion (GtkWidget*
 	result = sidebar_tree_on_drag_motion ((SidebarTree*) self, context, x, y, time_);
 #line 152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 805 "Tree.c"
+#line 816 "Tree.c"
 }
 
 
 SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target) {
 	SidebarTree * self = NULL;
-	GtkTreeStore* _tmp0_ = NULL;
-	GtkStyleContext* _tmp1_ = NULL;
+	GtkTreeStore* _tmp0_;
+	GtkStyleContext* _tmp1_;
 	GtkTreeViewColumn* text_column = NULL;
-	GtkTreeViewColumn* _tmp2_ = NULL;
+	GtkTreeViewColumn* _tmp2_;
 	GtkCellRendererPixbuf* icon_renderer = NULL;
-	GtkCellRendererPixbuf* _tmp3_ = NULL;
-	GtkCellRendererText* _tmp4_ = NULL;
-	GtkCellRendererText* _tmp5_ = NULL;
-	GtkCellRendererText* _tmp6_ = NULL;
-	GtkCellRendererText* _tmp7_ = NULL;
-	GtkCellRendererText* _tmp8_ = NULL;
-	GtkCellRendererText* _tmp9_ = NULL;
+	GtkCellRendererPixbuf* _tmp3_;
+	GtkCellRendererText* _tmp4_;
+	GtkCellRendererText* _tmp5_;
+	GtkCellRendererText* _tmp6_;
+	GtkCellRendererText* _tmp7_;
+	GtkCellRendererText* _tmp8_;
+	GtkCellRendererText* _tmp9_;
 	GtkCellRendererText* invisitext = NULL;
-	GtkCellRendererText* _tmp10_ = NULL;
+	GtkCellRendererText* _tmp10_;
 	GtkTreeViewColumn* page_holder = NULL;
-	GtkTreeViewColumn* _tmp11_ = NULL;
+	GtkTreeViewColumn* _tmp11_;
 	GtkTreeSelection* selection = NULL;
-	GtkTreeSelection* _tmp12_ = NULL;
-	GtkTreeSelection* _tmp13_ = NULL;
-	GtkTargetEntry* _tmp14_ = NULL;
-	gint _tmp14__length1 = 0;
-	GdkDragAction _tmp15_ = 0;
+	GtkTreeSelection* _tmp12_;
+	GtkTreeSelection* _tmp13_;
+	GtkTargetEntry* _tmp14_;
+	gint _tmp14__length1;
+	GdkDragAction _tmp15_;
 	GtkTargetEntry* source_entries = NULL;
-	GtkTargetEntry* _tmp16_ = NULL;
-	gint source_entries_length1 = 0;
-	gint _source_entries_size_ = 0;
-	GtkTargetEntry* _tmp17_ = NULL;
-	gint _tmp17__length1 = 0;
-	GtkTargetEntry* _tmp18_ = NULL;
-	gint _tmp18__length1 = 0;
-	GtkTargetEntry _tmp19_ = {0};
-	GtkTargetEntry* _tmp20_ = NULL;
-	gint _tmp20__length1 = 0;
-	SidebarTreeExternalDropHandler _tmp21_ = NULL;
-	void* _tmp21__target = NULL;
+	GtkTargetEntry* _tmp16_;
+	gint source_entries_length1;
+	gint _source_entries_size_;
+	GtkTargetEntry* _tmp17_;
+	gint _tmp17__length1;
+	GtkTargetEntry* _tmp18_;
+	gint _tmp18__length1;
+	GtkTargetEntry _tmp19_;
+	GtkTargetEntry* _tmp20_;
+	gint _tmp20__length1;
+	SidebarTreeExternalDropHandler _tmp21_;
+	void* _tmp21__target;
 #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = (SidebarTree*) g_object_new (object_type, NULL);
 #line 95 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1016,25 +1027,25 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e
 	_g_object_unref0 (text_column);
 #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self;
-#line 1020 "Tree.c"
+#line 1031 "Tree.c"
 }
 
 
 SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target) {
 #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return sidebar_tree_construct (SIDEBAR_TYPE_TREE, target_entries, target_entries_length1, actions, drop_handler, drop_handler_target);
-#line 1027 "Tree.c"
+#line 1038 "Tree.c"
 }
 
 
 void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layout, GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter) {
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	GtkTreeIter _tmp0_ = {0};
-	SidebarTreeEntryWrapper* _tmp1_ = NULL;
-	SidebarTreeEntryWrapper* _tmp2_ = NULL;
-	GtkCellRenderer* _tmp3_ = NULL;
-	SidebarTreeEntryWrapper* _tmp4_ = NULL;
-	SidebarEntry* _tmp5_ = NULL;
+	GtkTreeIter _tmp0_;
+	SidebarTreeEntryWrapper* _tmp1_;
+	SidebarTreeEntryWrapper* _tmp2_;
+	GtkCellRenderer* _tmp3_;
+	SidebarTreeEntryWrapper* _tmp4_;
+	SidebarEntry* _tmp5_;
 #line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1059,7 +1070,7 @@ void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layo
 		_g_object_unref0 (wrapper);
 #line 163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 1063 "Tree.c"
+#line 1074 "Tree.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = renderer;
@@ -1071,7 +1082,7 @@ void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layo
 	gtk_cell_renderer_set_visible (_tmp3_, !G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_HEADER));
 #line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1075 "Tree.c"
+#line 1086 "Tree.c"
 }
 
 
@@ -1082,7 +1093,7 @@ static void sidebar_tree_on_drag_begin (SidebarTree* self, GdkDragContext* ctx)
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (ctx));
 #line 169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->is_internal_drag_in_progress = TRUE;
-#line 1086 "Tree.c"
+#line 1097 "Tree.c"
 }
 
 
@@ -1097,14 +1108,14 @@ static void sidebar_tree_on_drag_end (SidebarTree* self, GdkDragContext* ctx) {
 	_g_object_unref0 (self->priv->internal_drag_source_entry);
 #line 174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->internal_drag_source_entry = NULL;
-#line 1101 "Tree.c"
+#line 1112 "Tree.c"
 }
 
 
 static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext* context, gint x, gint y, guint time_) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1113,28 +1124,28 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
 	_tmp1_ = self->priv->is_internal_drag_in_progress;
 #line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_) {
-#line 1117 "Tree.c"
-		SidebarEntry* _tmp2_ = NULL;
+#line 1128 "Tree.c"
+		SidebarEntry* _tmp2_;
 #line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = self->priv->internal_drag_source_entry;
 #line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 1123 "Tree.c"
+#line 1134 "Tree.c"
 	} else {
 #line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp0_ = FALSE;
-#line 1127 "Tree.c"
+#line 1138 "Tree.c"
 	}
 #line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_) {
-#line 1131 "Tree.c"
+#line 1142 "Tree.c"
 		GtkTreePath* path = NULL;
 		GtkTreeViewDropPosition position = 0;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		gint _tmp3_;
+		gint _tmp4_;
 		GtkTreePath* _tmp5_ = NULL;
 		GtkTreeViewDropPosition _tmp6_ = 0;
-		GtkTreePath* _tmp7_ = NULL;
+		GtkTreePath* _tmp7_;
 #line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = x;
 #line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1151,11 +1162,11 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
 		_tmp7_ = path;
 #line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp7_ != NULL) {
-#line 1155 "Tree.c"
+#line 1166 "Tree.c"
 			SidebarTreeEntryWrapper* wrapper = NULL;
-			GtkTreePath* _tmp8_ = NULL;
-			SidebarTreeEntryWrapper* _tmp9_ = NULL;
-			SidebarTreeEntryWrapper* _tmp10_ = NULL;
+			GtkTreePath* _tmp8_;
+			SidebarTreeEntryWrapper* _tmp9_;
+			SidebarTreeEntryWrapper* _tmp10_;
 #line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp8_ = path;
 #line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1166,10 +1177,10 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
 			_tmp10_ = wrapper;
 #line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp10_ != NULL) {
-#line 1170 "Tree.c"
-				SidebarTreeEntryWrapper* _tmp11_ = NULL;
-				SidebarEntry* _tmp12_ = NULL;
-				SidebarEntry* _tmp13_ = NULL;
+#line 1181 "Tree.c"
+				SidebarTreeEntryWrapper* _tmp11_;
+				SidebarEntry* _tmp12_;
+				SidebarEntry* _tmp13_;
 #line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp11_ = wrapper;
 #line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1180,21 +1191,21 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
 				_g_object_unref0 (self->priv->internal_drag_source_entry);
 #line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				self->priv->internal_drag_source_entry = _tmp13_;
-#line 1184 "Tree.c"
+#line 1195 "Tree.c"
 			}
 #line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 1188 "Tree.c"
+#line 1199 "Tree.c"
 		}
 #line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1192 "Tree.c"
+#line 1203 "Tree.c"
 	}
 #line 190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
 #line 190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1198 "Tree.c"
+#line 1209 "Tree.c"
 }
 
 
@@ -1202,22 +1213,22 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 	GError * _inner_error_ = NULL;
 #line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1206 "Tree.c"
+#line 1217 "Tree.c"
 	{
-		GtkBuilder* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
+		GtkBuilder* _tmp0_;
+		gchar* _tmp1_;
+		gchar* _tmp2_;
 		GMenuModel* model = NULL;
-		GtkBuilder* _tmp3_ = NULL;
-		GObject* _tmp4_ = NULL;
-		GMenuModel* _tmp5_ = NULL;
-		GMenuModel* _tmp6_ = NULL;
-		GtkMenu* _tmp7_ = NULL;
+		GtkBuilder* _tmp3_;
+		GObject* _tmp4_;
+		GMenuModel* _tmp5_;
+		GMenuModel* _tmp6_;
+		GtkMenu* _tmp7_;
 		GSimpleActionGroup* group = NULL;
-		GSimpleActionGroup* _tmp8_ = NULL;
-		GSimpleActionGroup* _tmp9_ = NULL;
-		GSimpleActionGroup* _tmp10_ = NULL;
-		GtkMenu* _tmp11_ = NULL;
+		GSimpleActionGroup* _tmp8_;
+		GSimpleActionGroup* _tmp9_;
+		GSimpleActionGroup* _tmp10_;
+		GtkMenu* _tmp11_;
 #line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp0_ = self->priv->builder;
 #line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1230,7 +1241,7 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 		_g_free0 (_tmp2_);
 #line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1234 "Tree.c"
+#line 1245 "Tree.c"
 			goto __catch51_g_error;
 		}
 #line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1271,18 +1282,18 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 		_g_object_unref0 (group);
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (model);
-#line 1275 "Tree.c"
+#line 1286 "Tree.c"
 	}
 	goto __finally51;
 	__catch51_g_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		Application* _tmp16_ = NULL;
-		Application* _tmp17_ = NULL;
+		GError* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		Application* _tmp16_;
+		Application* _tmp17_;
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_error_ = _inner_error_;
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1309,7 +1320,7 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 		_application_unref0 (_tmp17_);
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_error_free0 (_error_);
-#line 1313 "Tree.c"
+#line 1324 "Tree.c"
 	}
 	__finally51:
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1320,16 +1331,16 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 		g_clear_error (&_inner_error_);
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 1324 "Tree.c"
+#line 1335 "Tree.c"
 	}
 }
 
 
 static gboolean sidebar_tree_has_wrapper (SidebarTree* self, SidebarEntry* entry) {
 	gboolean result = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	SidebarEntry* _tmp1_;
+	gboolean _tmp2_;
 #line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1344,17 +1355,17 @@ static gboolean sidebar_tree_has_wrapper (SidebarTree* self, SidebarEntry* entry
 	result = _tmp2_;
 #line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1348 "Tree.c"
+#line 1359 "Tree.c"
 }
 
 
 static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, SidebarEntry* entry) {
 	SidebarTreeEntryWrapper* result = NULL;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	SidebarTreeEntryWrapper* _tmp3_ = NULL;
+	GeeHashMap* _tmp0_;
+	SidebarEntry* _tmp1_;
+	gpointer _tmp2_;
+	SidebarTreeEntryWrapper* _tmp3_;
 #line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
 #line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1371,10 +1382,10 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, Sid
 	_tmp3_ = wrapper;
 #line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 1375 "Tree.c"
-		SidebarEntry* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+#line 1386 "Tree.c"
+		SidebarEntry* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = entry;
 #line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1385,26 +1396,26 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, Sid
 		g_warning ("Tree.vala:221: Entry %s not found in sidebar", _tmp6_);
 #line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (_tmp6_);
-#line 1389 "Tree.c"
+#line 1400 "Tree.c"
 	}
 #line 223 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = wrapper;
 #line 223 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1395 "Tree.c"
+#line 1406 "Tree.c"
 }
 
 
 static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* self, GtkTreeIter* iter) {
 	SidebarTreeEntryWrapper* result = NULL;
 	GValue val = {0};
-	GtkTreeStore* _tmp0_ = NULL;
-	GtkTreeIter _tmp1_ = {0};
+	GtkTreeStore* _tmp0_;
+	GtkTreeIter _tmp1_;
 	GValue _tmp2_ = {0};
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	GValue _tmp3_ = {0};
-	SidebarTreeEntryWrapper* _tmp4_ = NULL;
-	SidebarTreeEntryWrapper* _tmp5_ = NULL;
+	GValue _tmp3_;
+	SidebarTreeEntryWrapper* _tmp4_;
+	SidebarTreeEntryWrapper* _tmp5_;
 #line 226 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
 #line 226 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1429,13 +1440,13 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
 	_tmp5_ = wrapper;
 #line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_ == NULL) {
-#line 1433 "Tree.c"
-		GtkTreeStore* _tmp6_ = NULL;
-		GtkTreeIter _tmp7_ = {0};
-		GtkTreePath* _tmp8_ = NULL;
-		GtkTreePath* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
+#line 1444 "Tree.c"
+		GtkTreeStore* _tmp6_;
+		GtkTreeIter _tmp7_;
+		GtkTreePath* _tmp8_;
+		GtkTreePath* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
 #line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = self->priv->store;
 #line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1454,7 +1465,7 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
 		_g_free0 (_tmp11_);
 #line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (_tmp9_);
-#line 1458 "Tree.c"
+#line 1469 "Tree.c"
 	}
 #line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = wrapper;
@@ -1462,19 +1473,19 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
 #line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1466 "Tree.c"
+#line 1477 "Tree.c"
 }
 
 
 static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* self, GtkTreePath* path) {
 	SidebarTreeEntryWrapper* result = NULL;
 	GtkTreeIter iter = {0};
-	GtkTreeStore* _tmp0_ = NULL;
-	GtkTreePath* _tmp1_ = NULL;
+	GtkTreeStore* _tmp0_;
+	GtkTreePath* _tmp1_;
 	GtkTreeIter _tmp2_ = {0};
-	gboolean _tmp3_ = FALSE;
-	GtkTreeIter _tmp7_ = {0};
-	SidebarTreeEntryWrapper* _tmp8_ = NULL;
+	gboolean _tmp3_;
+	GtkTreeIter _tmp7_;
+	SidebarTreeEntryWrapper* _tmp8_;
 #line 237 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
 #line 237 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1489,10 +1500,10 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* s
 	iter = _tmp2_;
 #line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp3_) {
-#line 1493 "Tree.c"
-		GtkTreePath* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+#line 1504 "Tree.c"
+		GtkTreePath* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = path;
 #line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1507,7 +1518,7 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* s
 		result = NULL;
 #line 242 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1511 "Tree.c"
+#line 1522 "Tree.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = iter;
@@ -1517,28 +1528,28 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* s
 	result = _tmp8_;
 #line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1521 "Tree.c"
+#line 1532 "Tree.c"
 }
 
 
 gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboolean mask_signal) {
 	gboolean result = FALSE;
-	SidebarEntry* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SidebarEntry* _tmp0_;
+	gboolean _tmp1_;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp2_ = NULL;
-	SidebarTreeEntryWrapper* _tmp3_ = NULL;
-	SidebarTreeEntryWrapper* _tmp4_ = NULL;
-	GtkTreeSelection* _tmp5_ = NULL;
-	SidebarTreeEntryWrapper* _tmp6_ = NULL;
-	GtkTreePath* _tmp7_ = NULL;
-	GtkTreePath* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
-	SidebarTreeEntryWrapper* _tmp10_ = NULL;
-	GtkTreePath* _tmp11_ = NULL;
-	GtkTreePath* _tmp12_ = NULL;
-	SidebarEntry* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
+	SidebarEntry* _tmp2_;
+	SidebarTreeEntryWrapper* _tmp3_;
+	SidebarTreeEntryWrapper* _tmp4_;
+	GtkTreeSelection* _tmp5_;
+	SidebarTreeEntryWrapper* _tmp6_;
+	GtkTreePath* _tmp7_;
+	GtkTreePath* _tmp8_;
+	gboolean _tmp9_;
+	SidebarTreeEntryWrapper* _tmp10_;
+	GtkTreePath* _tmp11_;
+	GtkTreePath* _tmp12_;
+	SidebarEntry* _tmp13_;
+	gboolean _tmp14_;
 #line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1553,7 +1564,7 @@ gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboo
 		result = FALSE;
 #line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1557 "Tree.c"
+#line 1568 "Tree.c"
 	}
 #line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = entry;
@@ -1571,7 +1582,7 @@ gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboo
 		_g_object_unref0 (wrapper);
 #line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1575 "Tree.c"
+#line 1586 "Tree.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
@@ -1611,21 +1622,21 @@ gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboo
 	_g_object_unref0 (wrapper);
 #line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1615 "Tree.c"
+#line 1626 "Tree.c"
 }
 
 
 gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry) {
 	gboolean result = FALSE;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarTreeEntryWrapper* _tmp1_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp1_;
 	GtkTreeSelection* selection = NULL;
-	GtkTreeSelection* _tmp2_ = NULL;
-	GtkTreeSelection* _tmp3_ = NULL;
-	GtkTreeSelection* _tmp4_ = NULL;
+	GtkTreeSelection* _tmp2_;
+	GtkTreeSelection* _tmp3_;
+	GtkTreeSelection* _tmp4_;
 	gboolean _tmp5_ = FALSE;
-	SidebarTreeEntryWrapper* _tmp6_ = NULL;
+	SidebarTreeEntryWrapper* _tmp6_;
 #line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1654,18 +1665,18 @@ gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry) {
 		_g_object_unref0 (wrapper);
 #line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1658 "Tree.c"
+#line 1669 "Tree.c"
 	}
 #line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = wrapper;
 #line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ != NULL) {
-#line 1664 "Tree.c"
-		GtkTreeSelection* _tmp7_ = NULL;
-		SidebarTreeEntryWrapper* _tmp8_ = NULL;
-		GtkTreePath* _tmp9_ = NULL;
-		GtkTreePath* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
+#line 1675 "Tree.c"
+		GtkTreeSelection* _tmp7_;
+		SidebarTreeEntryWrapper* _tmp8_;
+		GtkTreePath* _tmp9_;
+		GtkTreePath* _tmp10_;
+		gboolean _tmp11_;
 #line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = selection;
 #line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1680,11 +1691,11 @@ gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry) {
 		_tmp5_ = _tmp11_;
 #line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (_tmp10_);
-#line 1684 "Tree.c"
+#line 1695 "Tree.c"
 	} else {
 #line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = FALSE;
-#line 1688 "Tree.c"
+#line 1699 "Tree.c"
 	}
 #line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp5_;
@@ -1694,14 +1705,14 @@ gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry) {
 	_g_object_unref0 (wrapper);
 #line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1698 "Tree.c"
+#line 1709 "Tree.c"
 }
 
 
 gboolean sidebar_tree_is_any_selected (SidebarTree* self) {
 	gboolean result = FALSE;
-	GtkTreeSelection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	GtkTreeSelection* _tmp0_;
+	gint _tmp1_;
 #line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1712,21 +1723,21 @@ gboolean sidebar_tree_is_any_selected (SidebarTree* self) {
 	result = _tmp1_ != 0;
 #line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1716 "Tree.c"
+#line 1727 "Tree.c"
 }
 
 
 static gpointer _gtk_tree_path_copy0 (gpointer self) {
 #line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self ? gtk_tree_path_copy (self) : NULL;
-#line 1723 "Tree.c"
+#line 1734 "Tree.c"
 }
 
 
 static void _gtk_tree_path_free0_ (gpointer var) {
 #line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	(var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL));
-#line 1730 "Tree.c"
+#line 1741 "Tree.c"
 }
 
 
@@ -1735,7 +1746,7 @@ static void _g_list_free__gtk_tree_path_free0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _gtk_tree_path_free0_, NULL);
 #line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_list_free (self);
-#line 1739 "Tree.c"
+#line 1750 "Tree.c"
 }
 
 
@@ -1743,21 +1754,21 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
 	GtkTreePath* result = NULL;
 	GtkTreeModel* model = NULL;
 	GtkTreeSelection* selection = NULL;
-	GtkTreeSelection* _tmp0_ = NULL;
-	GtkTreeSelection* _tmp1_ = NULL;
-	GtkTreeSelection* _tmp2_ = NULL;
+	GtkTreeSelection* _tmp0_;
+	GtkTreeSelection* _tmp1_;
+	GtkTreeSelection* _tmp2_;
 	GList* rows = NULL;
-	GtkTreeSelection* _tmp3_ = NULL;
+	GtkTreeSelection* _tmp3_;
 	GtkTreeModel* _tmp4_ = NULL;
-	GList* _tmp5_ = NULL;
-	GtkTreeModel* _tmp6_ = NULL;
+	GList* _tmp5_;
+	GtkTreeModel* _tmp6_;
 	gboolean _tmp7_ = FALSE;
-	GList* _tmp8_ = NULL;
-	guint _tmp9_ = 0U;
+	GList* _tmp8_;
+	guint _tmp9_;
 	GtkTreePath* _tmp12_ = NULL;
-	GList* _tmp13_ = NULL;
-	guint _tmp14_ = 0U;
-	GtkTreePath* _tmp17_ = NULL;
+	GList* _tmp13_;
+	guint _tmp14_;
+	GtkTreePath* _tmp17_;
 #line 283 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
 #line 285 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1778,7 +1789,7 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
 		_g_object_unref0 (model);
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1782 "Tree.c"
+#line 1793 "Tree.c"
 	}
 #line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = selection;
@@ -1800,17 +1811,17 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
 	if (_tmp9_ == ((guint) 0)) {
 #line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = TRUE;
-#line 1804 "Tree.c"
+#line 1815 "Tree.c"
 	} else {
-		GList* _tmp10_ = NULL;
-		guint _tmp11_ = 0U;
+		GList* _tmp10_;
+		guint _tmp11_;
 #line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = rows;
 #line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = g_list_length (_tmp10_);
 #line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp11_ == ((guint) 1);
-#line 1814 "Tree.c"
+#line 1825 "Tree.c"
 	}
 #line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp7_, "rows.length() == 0 || rows.length() == 1");
@@ -1820,20 +1831,20 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
 	_tmp14_ = g_list_length (_tmp13_);
 #line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp14_ != ((guint) 0)) {
-#line 1824 "Tree.c"
-		GList* _tmp15_ = NULL;
-		gconstpointer _tmp16_ = NULL;
+#line 1835 "Tree.c"
+		GList* _tmp15_;
+		gconstpointer _tmp16_;
 #line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = rows;
 #line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = g_list_nth_data (_tmp15_, (guint) 0);
 #line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = (GtkTreePath*) _tmp16_;
-#line 1833 "Tree.c"
+#line 1844 "Tree.c"
 	} else {
 #line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = NULL;
-#line 1837 "Tree.c"
+#line 1848 "Tree.c"
 	}
 #line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = _gtk_tree_path_copy0 (_tmp12_);
@@ -1847,23 +1858,23 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
 	_g_object_unref0 (model);
 #line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1851 "Tree.c"
+#line 1862 "Tree.c"
 }
 
 
 static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry* entry) {
 	gchar* result = NULL;
 	gchar* name = NULL;
-	SidebarEntry* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	SidebarEntry* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 	SidebarEmphasizableEntry* emphasizable_entry = NULL;
-	SidebarEntry* _tmp5_ = NULL;
-	SidebarEmphasizableEntry* _tmp6_ = NULL;
+	SidebarEntry* _tmp5_;
+	SidebarEmphasizableEntry* _tmp6_;
 	gboolean _tmp7_ = FALSE;
-	SidebarEmphasizableEntry* _tmp8_ = NULL;
+	SidebarEmphasizableEntry* _tmp8_;
 #line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
 #line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1892,26 +1903,26 @@ static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry*
 	_tmp8_ = emphasizable_entry;
 #line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp8_ != NULL) {
-#line 1896 "Tree.c"
-		SidebarEmphasizableEntry* _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
+#line 1907 "Tree.c"
+		SidebarEmphasizableEntry* _tmp9_;
+		gboolean _tmp10_;
 #line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = emphasizable_entry;
 #line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = sidebar_emphasizable_entry_is_emphasized (_tmp9_);
 #line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp10_;
-#line 1905 "Tree.c"
+#line 1916 "Tree.c"
 	} else {
 #line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = FALSE;
-#line 1909 "Tree.c"
+#line 1920 "Tree.c"
 	}
 #line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_) {
-#line 1913 "Tree.c"
-		const gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
+#line 1924 "Tree.c"
+		const gchar* _tmp11_;
+		gchar* _tmp12_;
 #line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = name;
 #line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1920,7 +1931,7 @@ static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry*
 		_g_free0 (name);
 #line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		name = _tmp12_;
-#line 1924 "Tree.c"
+#line 1935 "Tree.c"
 	}
 #line 302 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = name;
@@ -1928,7 +1939,7 @@ static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry*
 	_g_object_unref0 (emphasizable_entry);
 #line 302 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1932 "Tree.c"
+#line 1943 "Tree.c"
 }
 
 
@@ -1938,7 +1949,7 @@ static gboolean sidebar_tree_real_accept_cursor_changed (SidebarTree* self) {
 	result = TRUE;
 #line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1942 "Tree.c"
+#line 1953 "Tree.c"
 }
 
 
@@ -1947,20 +1958,20 @@ gboolean sidebar_tree_accept_cursor_changed (SidebarTree* self) {
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return SIDEBAR_TREE_GET_CLASS (self)->accept_cursor_changed (self);
-#line 1951 "Tree.c"
+#line 1962 "Tree.c"
 }
 
 
 static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 	SidebarTree * self;
 	GtkTreePath* path = NULL;
-	GtkTreePath* _tmp0_ = NULL;
-	GtkTreePath* _tmp1_ = NULL;
+	GtkTreePath* _tmp0_;
+	GtkTreePath* _tmp1_;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	GtkTreePath* _tmp2_ = NULL;
-	SidebarTreeEntryWrapper* _tmp3_ = NULL;
-	SidebarTreeEntryWrapper* _tmp4_ = NULL;
-	SidebarTreeEntryWrapper* _tmp5_ = NULL;
+	GtkTreePath* _tmp2_;
+	SidebarTreeEntryWrapper* _tmp3_;
+	SidebarTreeEntryWrapper* _tmp4_;
+	SidebarTreeEntryWrapper* _tmp5_;
 #line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
 #line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1975,13 +1986,13 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 		if (GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed != NULL) {
 #line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 1979 "Tree.c"
+#line 1990 "Tree.c"
 		}
 #line 314 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
 #line 314 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 1985 "Tree.c"
+#line 1996 "Tree.c"
 	}
 #line 317 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = path;
@@ -1995,16 +2006,16 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 	_tmp5_ = wrapper;
 #line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ != _tmp5_) {
-#line 1999 "Tree.c"
+#line 2010 "Tree.c"
 		SidebarTreeEntryWrapper* old_wrapper = NULL;
-		SidebarTreeEntryWrapper* _tmp6_ = NULL;
-		SidebarTreeEntryWrapper* _tmp7_ = NULL;
-		SidebarTreeEntryWrapper* _tmp8_ = NULL;
+		SidebarTreeEntryWrapper* _tmp6_;
+		SidebarTreeEntryWrapper* _tmp7_;
+		SidebarTreeEntryWrapper* _tmp8_;
 		gboolean _tmp9_ = FALSE;
 		gboolean _tmp10_ = FALSE;
-		gint _tmp11_ = 0;
+		gint _tmp11_;
 		gboolean _tmp19_ = FALSE;
-		SidebarTreeEntryWrapper* _tmp20_ = NULL;
+		SidebarTreeEntryWrapper* _tmp20_;
 #line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = self->priv->selected_wrapper;
 #line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2019,42 +2030,42 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 		_tmp11_ = self->priv->editing_disabled;
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_ == 0) {
-#line 2023 "Tree.c"
-			SidebarTreeEntryWrapper* _tmp12_ = NULL;
+#line 2034 "Tree.c"
+			SidebarTreeEntryWrapper* _tmp12_;
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = wrapper;
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = _tmp12_ != NULL;
-#line 2029 "Tree.c"
+#line 2040 "Tree.c"
 		} else {
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = FALSE;
-#line 2033 "Tree.c"
+#line 2044 "Tree.c"
 		}
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp10_) {
-#line 2037 "Tree.c"
-			SidebarTreeEntryWrapper* _tmp13_ = NULL;
-			SidebarEntry* _tmp14_ = NULL;
+#line 2048 "Tree.c"
+			SidebarTreeEntryWrapper* _tmp13_;
+			SidebarEntry* _tmp14_;
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = wrapper;
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = _tmp13_->entry;
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, SIDEBAR_TYPE_RENAMEABLE_ENTRY);
-#line 2046 "Tree.c"
+#line 2057 "Tree.c"
 		} else {
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = FALSE;
-#line 2050 "Tree.c"
+#line 2061 "Tree.c"
 		}
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_) {
-#line 2054 "Tree.c"
-			GtkCellRendererText* _tmp15_ = NULL;
-			SidebarTreeEntryWrapper* _tmp16_ = NULL;
-			SidebarEntry* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
+#line 2065 "Tree.c"
+			GtkCellRendererText* _tmp15_;
+			SidebarTreeEntryWrapper* _tmp16_;
+			SidebarEntry* _tmp17_;
+			gboolean _tmp18_;
 #line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = self->priv->text_renderer;
 #line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2065,32 +2076,32 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 			_tmp18_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
 #line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			g_object_set (_tmp15_, "editable", _tmp18_, NULL);
-#line 2069 "Tree.c"
+#line 2080 "Tree.c"
 		}
 #line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp20_ = wrapper;
 #line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp20_ != NULL) {
-#line 2075 "Tree.c"
-			gboolean _tmp21_ = FALSE;
+#line 2086 "Tree.c"
+			gboolean _tmp21_;
 #line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = self->priv->mask_entry_selected_signal;
 #line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = !_tmp21_;
-#line 2081 "Tree.c"
+#line 2092 "Tree.c"
 		} else {
 #line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = FALSE;
-#line 2085 "Tree.c"
+#line 2096 "Tree.c"
 		}
 #line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp19_) {
-#line 2089 "Tree.c"
+#line 2100 "Tree.c"
 			SidebarSelectableEntry* selectable = NULL;
-			SidebarTreeEntryWrapper* _tmp22_ = NULL;
-			SidebarEntry* _tmp23_ = NULL;
-			SidebarSelectableEntry* _tmp24_ = NULL;
-			SidebarSelectableEntry* _tmp25_ = NULL;
+			SidebarTreeEntryWrapper* _tmp22_;
+			SidebarEntry* _tmp23_;
+			SidebarSelectableEntry* _tmp24_;
+			SidebarSelectableEntry* _tmp25_;
 #line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp22_ = wrapper;
 #line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2103,55 +2114,55 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 			_tmp25_ = selectable;
 #line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp25_ != NULL) {
-#line 2107 "Tree.c"
-				gboolean _tmp26_ = FALSE;
+#line 2118 "Tree.c"
+				gboolean _tmp26_;
 #line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp26_ = sidebar_tree_accept_cursor_changed (self);
 #line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (_tmp26_) {
-#line 2113 "Tree.c"
-					SidebarSelectableEntry* _tmp27_ = NULL;
+#line 2124 "Tree.c"
+					SidebarSelectableEntry* _tmp27_;
 #line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp27_ = selectable;
 #line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-					g_signal_emit_by_name (self, "entry-selected", _tmp27_);
-#line 2119 "Tree.c"
+					g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL], 0, _tmp27_);
+#line 2130 "Tree.c"
 				} else {
-					SidebarTreeEntryWrapper* _tmp28_ = NULL;
-					SidebarEntry* _tmp29_ = NULL;
+					SidebarTreeEntryWrapper* _tmp28_;
+					SidebarEntry* _tmp29_;
 #line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp28_ = old_wrapper;
 #line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp29_ = _tmp28_->entry;
 #line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					sidebar_tree_place_cursor (self, _tmp29_, TRUE);
-#line 2129 "Tree.c"
+#line 2140 "Tree.c"
 				}
 			}
 #line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (selectable);
-#line 2134 "Tree.c"
+#line 2145 "Tree.c"
 		}
 #line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (old_wrapper);
-#line 2138 "Tree.c"
+#line 2149 "Tree.c"
 	}
 #line 338 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed != NULL) {
 #line 339 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 2144 "Tree.c"
+#line 2155 "Tree.c"
 	}
 #line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
 #line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 2150 "Tree.c"
+#line 2161 "Tree.c"
 }
 
 
 void sidebar_tree_disable_editing (SidebarTree* self) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 342 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2160,23 +2171,23 @@ void sidebar_tree_disable_editing (SidebarTree* self) {
 	self->priv->editing_disabled = _tmp0_ + 1;
 #line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ == 0) {
-#line 2164 "Tree.c"
-		GtkCellRendererText* _tmp1_ = NULL;
+#line 2175 "Tree.c"
+		GtkCellRendererText* _tmp1_;
 #line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = self->priv->text_renderer;
 #line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_object_set (_tmp1_, "editable", FALSE, NULL);
-#line 2170 "Tree.c"
+#line 2181 "Tree.c"
 	}
 }
 
 
 void sidebar_tree_enable_editing (SidebarTree* self) {
 	GtkTreePath* path = NULL;
-	GtkTreePath* _tmp0_ = NULL;
+	GtkTreePath* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	GtkTreePath* _tmp3_ = NULL;
+	GtkTreePath* _tmp3_;
 #line 347 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2187,23 +2198,23 @@ void sidebar_tree_enable_editing (SidebarTree* self) {
 	_tmp3_ = path;
 #line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ != NULL) {
-#line 2191 "Tree.c"
-		gint _tmp4_ = 0;
+#line 2202 "Tree.c"
+		gint _tmp4_;
 #line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = self->priv->editing_disabled;
 #line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _tmp4_ > 0;
-#line 2197 "Tree.c"
+#line 2208 "Tree.c"
 	} else {
 #line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = FALSE;
-#line 2201 "Tree.c"
+#line 2212 "Tree.c"
 	}
 #line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_) {
-#line 2205 "Tree.c"
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+#line 2216 "Tree.c"
+		gint _tmp5_;
+		gint _tmp6_;
 #line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = self->priv->editing_disabled;
 #line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2212,20 +2223,20 @@ void sidebar_tree_enable_editing (SidebarTree* self) {
 		_tmp6_ = self->priv->editing_disabled;
 #line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = _tmp6_ == 0;
-#line 2216 "Tree.c"
+#line 2227 "Tree.c"
 	} else {
 #line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = FALSE;
-#line 2220 "Tree.c"
+#line 2231 "Tree.c"
 	}
 #line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_) {
-#line 2224 "Tree.c"
+#line 2235 "Tree.c"
 		SidebarTreeEntryWrapper* wrapper = NULL;
-		GtkTreePath* _tmp7_ = NULL;
-		SidebarTreeEntryWrapper* _tmp8_ = NULL;
+		GtkTreePath* _tmp7_;
+		SidebarTreeEntryWrapper* _tmp8_;
 		gboolean _tmp9_ = FALSE;
-		SidebarTreeEntryWrapper* _tmp10_ = NULL;
+		SidebarTreeEntryWrapper* _tmp10_;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = path;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2236,28 +2247,28 @@ void sidebar_tree_enable_editing (SidebarTree* self) {
 		_tmp10_ = wrapper;
 #line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp10_ != NULL) {
-#line 2240 "Tree.c"
-			SidebarTreeEntryWrapper* _tmp11_ = NULL;
-			SidebarEntry* _tmp12_ = NULL;
+#line 2251 "Tree.c"
+			SidebarTreeEntryWrapper* _tmp11_;
+			SidebarEntry* _tmp12_;
 #line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = wrapper;
 #line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = _tmp11_->entry;
 #line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_RENAMEABLE_ENTRY);
-#line 2249 "Tree.c"
+#line 2260 "Tree.c"
 		} else {
 #line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = FALSE;
-#line 2253 "Tree.c"
+#line 2264 "Tree.c"
 		}
 #line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_) {
-#line 2257 "Tree.c"
-			GtkCellRendererText* _tmp13_ = NULL;
-			SidebarTreeEntryWrapper* _tmp14_ = NULL;
-			SidebarEntry* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
+#line 2268 "Tree.c"
+			GtkCellRendererText* _tmp13_;
+			SidebarTreeEntryWrapper* _tmp14_;
+			SidebarEntry* _tmp15_;
+			gboolean _tmp16_;
 #line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = self->priv->text_renderer;
 #line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2268,21 +2279,21 @@ void sidebar_tree_enable_editing (SidebarTree* self) {
 			_tmp16_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
 #line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			g_object_set (_tmp13_, "editable", _tmp16_, NULL);
-#line 2272 "Tree.c"
+#line 2283 "Tree.c"
 		}
 #line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 2276 "Tree.c"
+#line 2287 "Tree.c"
 	}
 #line 347 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 2280 "Tree.c"
+#line 2291 "Tree.c"
 }
 
 
 void sidebar_tree_toggle_branch_expansion (SidebarTree* self, GtkTreePath* path, gboolean expand_all) {
-	GtkTreePath* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GtkTreePath* _tmp0_;
+	gboolean _tmp1_;
 #line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2295,23 +2306,23 @@ void sidebar_tree_toggle_branch_expansion (SidebarTree* self, GtkTreePath* path,
 	_tmp1_ = gtk_tree_view_row_expanded (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp0_);
 #line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_) {
-#line 2299 "Tree.c"
-		GtkTreePath* _tmp2_ = NULL;
+#line 2310 "Tree.c"
+		GtkTreePath* _tmp2_;
 #line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = path;
 #line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_view_collapse_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp2_);
-#line 2305 "Tree.c"
+#line 2316 "Tree.c"
 	} else {
-		GtkTreePath* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+		GtkTreePath* _tmp3_;
+		gboolean _tmp4_;
 #line 362 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = path;
 #line 362 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = expand_all;
 #line 362 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_view_expand_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp3_, _tmp4_);
-#line 2315 "Tree.c"
+#line 2326 "Tree.c"
 	}
 }
 
@@ -2319,12 +2330,12 @@ void sidebar_tree_toggle_branch_expansion (SidebarTree* self, GtkTreePath* path,
 gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry) {
 	gboolean result = FALSE;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarTreeEntryWrapper* _tmp1_ = NULL;
-	SidebarTreeEntryWrapper* _tmp2_ = NULL;
-	SidebarTreeEntryWrapper* _tmp3_ = NULL;
-	GtkTreePath* _tmp4_ = NULL;
-	GtkTreePath* _tmp5_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp1_;
+	SidebarTreeEntryWrapper* _tmp2_;
+	SidebarTreeEntryWrapper* _tmp3_;
+	GtkTreePath* _tmp4_;
+	GtkTreePath* _tmp5_;
 #line 365 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 365 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2347,7 +2358,7 @@ gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry) {
 		_g_object_unref0 (wrapper);
 #line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 2351 "Tree.c"
+#line 2362 "Tree.c"
 	}
 #line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
@@ -2365,20 +2376,20 @@ gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry) {
 	_g_object_unref0 (wrapper);
 #line 373 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 2369 "Tree.c"
+#line 2380 "Tree.c"
 }
 
 
 void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry) {
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarTreeEntryWrapper* _tmp1_ = NULL;
-	SidebarTreeEntryWrapper* _tmp2_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp1_;
+	SidebarTreeEntryWrapper* _tmp2_;
 	GtkTreePath* path = NULL;
-	SidebarTreeEntryWrapper* _tmp3_ = NULL;
-	GtkTreePath* _tmp4_ = NULL;
+	SidebarTreeEntryWrapper* _tmp3_;
+	GtkTreePath* _tmp4_;
 	GtkTreeIter iter = {0};
-	GtkTreePath* _tmp13_ = NULL;
+	GtkTreePath* _tmp13_;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2399,7 +2410,7 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
 		_g_object_unref0 (wrapper);
 #line 380 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 2403 "Tree.c"
+#line 2414 "Tree.c"
 	}
 #line 382 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
@@ -2409,15 +2420,15 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
 	path = _tmp4_;
 #line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 2413 "Tree.c"
-		GtkTreeStore* _tmp5_ = NULL;
-		GtkTreePath* _tmp6_ = NULL;
+#line 2424 "Tree.c"
+		GtkTreeStore* _tmp5_;
+		GtkTreePath* _tmp6_;
 		GtkTreeIter _tmp7_ = {0};
-		gboolean _tmp8_ = FALSE;
-		GtkTreeStore* _tmp9_ = NULL;
-		GtkTreeIter _tmp10_ = {0};
-		gboolean _tmp11_ = FALSE;
-		GtkTreePath* _tmp12_ = NULL;
+		gboolean _tmp8_;
+		GtkTreeStore* _tmp9_;
+		GtkTreeIter _tmp10_;
+		gboolean _tmp11_;
+		GtkTreePath* _tmp12_;
 #line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = self->priv->store;
 #line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2430,7 +2441,7 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
 		if (!_tmp8_) {
 #line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2434 "Tree.c"
+#line 2445 "Tree.c"
 		}
 #line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = self->priv->store;
@@ -2442,13 +2453,13 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
 		if (!_tmp11_) {
 #line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2446 "Tree.c"
+#line 2457 "Tree.c"
 		}
 #line 389 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = path;
 #line 389 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_path_down (_tmp12_);
-#line 2452 "Tree.c"
+#line 2463 "Tree.c"
 	}
 #line 392 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = path;
@@ -2458,69 +2469,69 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
 	_gtk_tree_path_free0 (path);
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 2462 "Tree.c"
+#line 2473 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
 #line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_added ((SidebarTree*) self, _sender, entry);
-#line 2469 "Tree.c"
+#line 2480 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
 #line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_removed ((SidebarTree*) self, _sender, entry);
-#line 2476 "Tree.c"
+#line 2487 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
 #line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_moved ((SidebarTree*) self, _sender, entry);
-#line 2483 "Tree.c"
+#line 2494 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented (SidebarBranch* _sender, SidebarEntry* entry, SidebarEntry* old_parent, gpointer self) {
 #line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_reparented ((SidebarTree*) self, _sender, entry, old_parent);
-#line 2490 "Tree.c"
+#line 2501 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
 #line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_children_reordered ((SidebarTree*) self, _sender, entry);
-#line 2497 "Tree.c"
+#line 2508 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_show_branch_sidebar_branch_show_branch (SidebarBranch* _sender, gboolean show, gpointer self) {
 #line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_show_branch ((SidebarTree*) self, _sender, show);
-#line 2504 "Tree.c"
+#line 2515 "Tree.c"
 }
 
 
 void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position) {
-	gint _tmp0_ = 0;
-	GeeHashMap* _tmp1_ = NULL;
-	SidebarBranch* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	GeeHashMap* _tmp4_ = NULL;
-	SidebarBranch* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	SidebarBranch* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
-	SidebarBranch* _tmp20_ = NULL;
-	SidebarBranch* _tmp21_ = NULL;
-	SidebarBranch* _tmp22_ = NULL;
-	SidebarBranch* _tmp23_ = NULL;
-	SidebarBranch* _tmp24_ = NULL;
-	SidebarBranch* _tmp25_ = NULL;
-	SidebarBranch* _tmp26_ = NULL;
+	gint _tmp0_;
+	GeeHashMap* _tmp1_;
+	SidebarBranch* _tmp2_;
+	gboolean _tmp3_;
+	GeeHashMap* _tmp4_;
+	SidebarBranch* _tmp5_;
+	gint _tmp6_;
+	SidebarBranch* _tmp7_;
+	gboolean _tmp8_;
+	SidebarBranch* _tmp20_;
+	SidebarBranch* _tmp21_;
+	SidebarBranch* _tmp22_;
+	SidebarBranch* _tmp23_;
+	SidebarBranch* _tmp24_;
+	SidebarBranch* _tmp25_;
+	SidebarBranch* _tmp26_;
 #line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2551,12 +2562,12 @@ void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position
 	_tmp8_ = sidebar_branch_get_show_branch (_tmp7_);
 #line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp8_) {
-#line 2555 "Tree.c"
-		SidebarBranch* _tmp9_ = NULL;
-		SidebarBranch* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
-		SidebarBranch* _tmp15_ = NULL;
-		gboolean _tmp16_ = FALSE;
+#line 2566 "Tree.c"
+		SidebarBranch* _tmp9_;
+		SidebarBranch* _tmp10_;
+		gboolean _tmp11_;
+		SidebarBranch* _tmp15_;
+		gboolean _tmp16_;
 #line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = branch;
 #line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2567,10 +2578,10 @@ void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position
 		_tmp11_ = sidebar_branch_is_startup_expand_to_first_child (_tmp10_);
 #line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_) {
-#line 2571 "Tree.c"
-			SidebarBranch* _tmp12_ = NULL;
-			SidebarEntry* _tmp13_ = NULL;
-			SidebarEntry* _tmp14_ = NULL;
+#line 2582 "Tree.c"
+			SidebarBranch* _tmp12_;
+			SidebarEntry* _tmp13_;
+			SidebarEntry* _tmp14_;
 #line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = branch;
 #line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2581,7 +2592,7 @@ void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position
 			sidebar_tree_expand_to_first_child (self, _tmp14_);
 #line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (_tmp14_);
-#line 2585 "Tree.c"
+#line 2596 "Tree.c"
 		}
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = branch;
@@ -2589,10 +2600,10 @@ void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position
 		_tmp16_ = sidebar_branch_is_startup_open_grouping (_tmp15_);
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp16_) {
-#line 2593 "Tree.c"
-			SidebarBranch* _tmp17_ = NULL;
-			SidebarEntry* _tmp18_ = NULL;
-			SidebarEntry* _tmp19_ = NULL;
+#line 2604 "Tree.c"
+			SidebarBranch* _tmp17_;
+			SidebarEntry* _tmp18_;
+			SidebarEntry* _tmp19_;
 #line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = branch;
 #line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2603,7 +2614,7 @@ void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position
 			sidebar_tree_expand_to_entry (self, _tmp19_);
 #line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (_tmp19_);
-#line 2607 "Tree.c"
+#line 2618 "Tree.c"
 		}
 	}
 #line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2633,8 +2644,8 @@ void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position
 #line 417 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = branch;
 #line 417 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_emit_by_name (self, "branch-added", _tmp26_);
-#line 2638 "Tree.c"
+	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_ADDED_SIGNAL], 0, _tmp26_);
+#line 2649 "Tree.c"
 }
 
 
@@ -2646,52 +2657,52 @@ static GtkTreeIter* _gtk_tree_iter_dup (GtkTreeIter* self) {
 	memcpy (dup, self, sizeof (GtkTreeIter));
 #line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return dup;
-#line 2650 "Tree.c"
+#line 2661 "Tree.c"
 }
 
 
 static gpointer __gtk_tree_iter_dup0 (gpointer self) {
 #line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self ? _gtk_tree_iter_dup (self) : NULL;
-#line 2657 "Tree.c"
+#line 2668 "Tree.c"
 }
 
 
 static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* branch) {
-	GeeHashMap* _tmp0_ = NULL;
-	SidebarBranch* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	SidebarBranch* _tmp1_;
+	gboolean _tmp2_;
 	gint position = 0;
-	GeeHashMap* _tmp3_ = NULL;
-	SidebarBranch* _tmp4_ = NULL;
-	gpointer _tmp5_ = NULL;
+	GeeHashMap* _tmp3_;
+	SidebarBranch* _tmp4_;
+	gpointer _tmp5_;
 	GtkTreeIter* insertion_iter = NULL;
 	GtkTreeIter iter = {0};
 	gboolean found = FALSE;
-	GtkTreeStore* _tmp6_ = NULL;
+	GtkTreeStore* _tmp6_;
 	GtkTreeIter _tmp7_ = {0};
-	gboolean _tmp8_ = FALSE;
-	GtkTreeIter* _tmp24_ = NULL;
-	GtkTreeIter* _tmp29_ = NULL;
-	GtkTreeStore* _tmp30_ = NULL;
-	SidebarBranch* _tmp31_ = NULL;
-	SidebarEntry* _tmp32_ = NULL;
-	SidebarEntry* _tmp33_ = NULL;
-	GtkTreeStore* _tmp34_ = NULL;
-	GtkTreeIter* _tmp35_ = NULL;
-	GtkTreeIter _tmp36_ = {0};
-	GtkTreePath* _tmp37_ = NULL;
-	GtkTreePath* _tmp38_ = NULL;
-	gint _tmp39_ = 0;
-	SidebarTreeRootWrapper* _tmp40_ = NULL;
-	SidebarTreeRootWrapper* _tmp41_ = NULL;
-	GtkTreeIter _tmp42_ = {0};
-	SidebarBranch* _tmp43_ = NULL;
-	SidebarBranch* _tmp44_ = NULL;
-	SidebarEntry* _tmp45_ = NULL;
-	SidebarEntry* _tmp46_ = NULL;
-	GtkTreeIter* _tmp47_ = NULL;
-	GtkTreeIter _tmp48_ = {0};
+	gboolean _tmp8_;
+	GtkTreeIter* _tmp24_;
+	GtkTreeIter* _tmp29_;
+	GtkTreeStore* _tmp30_;
+	SidebarBranch* _tmp31_;
+	SidebarEntry* _tmp32_;
+	SidebarEntry* _tmp33_;
+	GtkTreeStore* _tmp34_;
+	GtkTreeIter* _tmp35_;
+	GtkTreeIter _tmp36_;
+	GtkTreePath* _tmp37_;
+	GtkTreePath* _tmp38_;
+	gint _tmp39_;
+	SidebarTreeRootWrapper* _tmp40_;
+	SidebarTreeRootWrapper* _tmp41_;
+	GtkTreeIter _tmp42_;
+	SidebarBranch* _tmp43_;
+	SidebarBranch* _tmp44_;
+	SidebarEntry* _tmp45_;
+	SidebarEntry* _tmp46_;
+	GtkTreeIter* _tmp47_;
+	GtkTreeIter _tmp48_;
 #line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2724,25 +2735,25 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
 	found = _tmp8_;
 #line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 2728 "Tree.c"
-		gboolean _tmp9_ = FALSE;
+#line 2739 "Tree.c"
+		gboolean _tmp9_;
 		SidebarTreeRootWrapper* root_wrapper = NULL;
-		GtkTreeIter _tmp10_ = {0};
-		SidebarTreeEntryWrapper* _tmp11_ = NULL;
-		SidebarTreeRootWrapper* _tmp12_ = NULL;
-		SidebarTreeRootWrapper* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
-		SidebarTreeRootWrapper* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
-		GtkTreeStore* _tmp22_ = NULL;
-		gboolean _tmp23_ = FALSE;
+		GtkTreeIter _tmp10_;
+		SidebarTreeEntryWrapper* _tmp11_;
+		SidebarTreeRootWrapper* _tmp12_;
+		SidebarTreeRootWrapper* _tmp13_;
+		gint _tmp14_;
+		SidebarTreeRootWrapper* _tmp15_;
+		gint _tmp16_;
+		GtkTreeStore* _tmp22_;
+		gboolean _tmp23_;
 #line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = found;
 #line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp9_) {
 #line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2746 "Tree.c"
+#line 2757 "Tree.c"
 		}
 #line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = iter;
@@ -2754,7 +2765,7 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
 		if (_tmp12_ == NULL) {
 #line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (_tmp11_);
-#line 2758 "Tree.c"
+#line 2769 "Tree.c"
 		}
 #line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		root_wrapper = _tmp12_;
@@ -2770,12 +2781,12 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
 		_tmp16_ = _tmp15_->root_position;
 #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp14_ < _tmp16_) {
-#line 2774 "Tree.c"
-			GtkTreeStore* _tmp17_ = NULL;
-			GtkTreeIter _tmp18_ = {0};
+#line 2785 "Tree.c"
+			GtkTreeStore* _tmp17_;
+			GtkTreeIter _tmp18_;
 			GtkTreeIter _tmp19_ = {0};
-			GtkTreeIter _tmp20_ = {0};
-			GtkTreeIter* _tmp21_ = NULL;
+			GtkTreeIter _tmp20_;
+			GtkTreeIter* _tmp21_;
 #line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = self->priv->store;
 #line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2794,7 +2805,7 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
 			_g_object_unref0 (root_wrapper);
 #line 438 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2798 "Tree.c"
+#line 2809 "Tree.c"
 		}
 #line 441 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ = self->priv->store;
@@ -2804,17 +2815,17 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
 		found = _tmp23_;
 #line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (root_wrapper);
-#line 2808 "Tree.c"
+#line 2819 "Tree.c"
 	}
 #line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = insertion_iter;
 #line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp24_ == NULL) {
-#line 2814 "Tree.c"
-		GtkTreeStore* _tmp25_ = NULL;
+#line 2825 "Tree.c"
+		GtkTreeStore* _tmp25_;
 		GtkTreeIter _tmp26_ = {0};
-		GtkTreeIter _tmp27_ = {0};
-		GtkTreeIter* _tmp28_ = NULL;
+		GtkTreeIter _tmp27_;
+		GtkTreeIter* _tmp28_;
 #line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = self->priv->store;
 #line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2827,7 +2838,7 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
 		_tmp28_ = __gtk_tree_iter_dup0 (&_tmp27_);
 #line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		insertion_iter = _tmp28_;
-#line 2831 "Tree.c"
+#line 2842 "Tree.c"
 	}
 #line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp29_ = insertion_iter;
@@ -2883,16 +2894,16 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
 	_g_object_unref0 (_tmp46_);
 #line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (insertion_iter);
-#line 2887 "Tree.c"
+#line 2898 "Tree.c"
 }
 
 
 static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* branch, SidebarEntry* parent, GtkTreeIter* parent_iter) {
 	GeeList* children = NULL;
-	SidebarBranch* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	GeeList* _tmp3_ = NULL;
+	SidebarBranch* _tmp0_;
+	SidebarEntry* _tmp1_;
+	GeeList* _tmp2_;
+	GeeList* _tmp3_;
 #line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2917,16 +2928,16 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
 		_g_object_unref0 (children);
 #line 460 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 2921 "Tree.c"
+#line 2932 "Tree.c"
 	}
 	{
 		GeeList* _child_list = NULL;
-		GeeList* _tmp4_ = NULL;
-		GeeList* _tmp5_ = NULL;
+		GeeList* _tmp4_;
+		GeeList* _tmp5_;
 		gint _child_size = 0;
-		GeeList* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
+		GeeList* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
 		gint _child_index = 0;
 #line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = children;
@@ -2946,23 +2957,23 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
 		_child_index = -1;
 #line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 2950 "Tree.c"
-			gint _tmp9_ = 0;
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
+#line 2961 "Tree.c"
+			gint _tmp9_;
+			gint _tmp10_;
+			gint _tmp11_;
 			SidebarEntry* child = NULL;
-			GeeList* _tmp12_ = NULL;
-			gint _tmp13_ = 0;
-			gpointer _tmp14_ = NULL;
+			GeeList* _tmp12_;
+			gint _tmp13_;
+			gpointer _tmp14_;
 			GtkTreeIter append_iter = {0};
-			GtkTreeStore* _tmp15_ = NULL;
-			GtkTreeIter _tmp16_ = {0};
+			GtkTreeStore* _tmp15_;
+			GtkTreeIter _tmp16_;
 			GtkTreeIter _tmp17_ = {0};
-			GtkTreeIter _tmp18_ = {0};
-			SidebarEntry* _tmp19_ = NULL;
-			SidebarBranch* _tmp20_ = NULL;
-			SidebarEntry* _tmp21_ = NULL;
-			GtkTreeIter _tmp22_ = {0};
+			GtkTreeIter _tmp18_;
+			SidebarEntry* _tmp19_;
+			SidebarBranch* _tmp20_;
+			SidebarEntry* _tmp21_;
+			GtkTreeIter _tmp22_;
 #line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = _child_index;
 #line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2975,7 +2986,7 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
 			if (!(_tmp10_ < _tmp11_)) {
 #line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 2979 "Tree.c"
+#line 2990 "Tree.c"
 			}
 #line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = _child_list;
@@ -3009,28 +3020,28 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
 			sidebar_tree_associate_children (self, _tmp20_, _tmp21_, &_tmp22_);
 #line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child);
-#line 3013 "Tree.c"
+#line 3024 "Tree.c"
 		}
 #line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_list);
-#line 3017 "Tree.c"
+#line 3028 "Tree.c"
 	}
 #line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 3021 "Tree.c"
+#line 3032 "Tree.c"
 }
 
 
 static void sidebar_tree_associate_entry (SidebarTree* self, GtkTreeIter* assoc_iter, SidebarEntry* entry) {
-	GtkTreeIter _tmp0_ = {0};
-	GtkTreeStore* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
-	GtkTreeStore* _tmp3_ = NULL;
-	GtkTreeIter _tmp4_ = {0};
-	GtkTreePath* _tmp5_ = NULL;
-	GtkTreePath* _tmp6_ = NULL;
-	SidebarTreeEntryWrapper* _tmp7_ = NULL;
-	SidebarTreeEntryWrapper* _tmp8_ = NULL;
+	GtkTreeIter _tmp0_;
+	GtkTreeStore* _tmp1_;
+	SidebarEntry* _tmp2_;
+	GtkTreeStore* _tmp3_;
+	GtkTreeIter _tmp4_;
+	GtkTreePath* _tmp5_;
+	GtkTreePath* _tmp6_;
+	SidebarTreeEntryWrapper* _tmp7_;
+	SidebarTreeEntryWrapper* _tmp8_;
 #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3061,94 +3072,94 @@ static void sidebar_tree_associate_entry (SidebarTree* self, GtkTreeIter* assoc_
 	_g_object_unref0 (_tmp8_);
 #line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp6_);
-#line 3065 "Tree.c"
+#line 3076 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed (SidebarEntry* _sender, const gchar* tooltip, gpointer self) {
 #line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_tooltip_changed ((SidebarTree*) self, _sender, tooltip);
-#line 3072 "Tree.c"
+#line 3083 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed (SidebarEntry* _sender, const gchar* icon, gpointer self) {
 #line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_icon_changed ((SidebarTree*) self, _sender, icon);
-#line 3079 "Tree.c"
+#line 3090 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, Page* page, gpointer self) {
 #line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_page_created ((SidebarTree*) self, _sender, page);
-#line 3086 "Tree.c"
+#line 3097 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self) {
 #line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_destroying_page ((SidebarTree*) self, _sender, page);
-#line 3093 "Tree.c"
+#line 3104 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed (SidebarEmphasizableEntry* _sender, gboolean emphasized, gpointer self) {
 #line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_is_emphasized_changed ((SidebarTree*) self, _sender, emphasized);
-#line 3100 "Tree.c"
+#line 3111 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed (SidebarRenameableEntry* _sender, const gchar* name, gpointer self) {
 #line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_name_changed ((SidebarTree*) self, _sender, name);
-#line 3107 "Tree.c"
+#line 3118 "Tree.c"
 }
 
 
 static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* assoc_iter, SidebarTreeEntryWrapper* wrapper) {
 	SidebarEntry* entry = NULL;
-	SidebarTreeEntryWrapper* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	GeeHashMap* _tmp6_ = NULL;
-	SidebarEntry* _tmp7_ = NULL;
-	SidebarTreeEntryWrapper* _tmp8_ = NULL;
-	GtkTreeStore* _tmp9_ = NULL;
-	GtkTreeIter _tmp10_ = {0};
-	SidebarEntry* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	GtkTreeStore* _tmp14_ = NULL;
-	GtkTreeIter _tmp15_ = {0};
-	SidebarEntry* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	GtkTreeStore* _tmp21_ = NULL;
-	GtkTreeIter _tmp22_ = {0};
-	SidebarTreeEntryWrapper* _tmp23_ = NULL;
-	GtkTreeIter _tmp24_ = {0};
-	SidebarEntry* _tmp25_ = NULL;
-	SidebarEntry* _tmp26_ = NULL;
+	SidebarTreeEntryWrapper* _tmp0_;
+	SidebarEntry* _tmp1_;
+	SidebarEntry* _tmp2_;
+	GeeHashMap* _tmp3_;
+	SidebarEntry* _tmp4_;
+	gboolean _tmp5_;
+	GeeHashMap* _tmp6_;
+	SidebarEntry* _tmp7_;
+	SidebarTreeEntryWrapper* _tmp8_;
+	GtkTreeStore* _tmp9_;
+	GtkTreeIter _tmp10_;
+	SidebarEntry* _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	GtkTreeStore* _tmp14_;
+	GtkTreeIter _tmp15_;
+	SidebarEntry* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
+	gchar* _tmp20_;
+	GtkTreeStore* _tmp21_;
+	GtkTreeIter _tmp22_;
+	SidebarTreeEntryWrapper* _tmp23_;
+	GtkTreeIter _tmp24_;
+	SidebarEntry* _tmp25_;
+	SidebarEntry* _tmp26_;
 	SidebarPageRepresentative* pageable = NULL;
-	SidebarEntry* _tmp27_ = NULL;
-	SidebarPageRepresentative* _tmp28_ = NULL;
-	SidebarPageRepresentative* _tmp29_ = NULL;
+	SidebarEntry* _tmp27_;
+	SidebarPageRepresentative* _tmp28_;
+	SidebarPageRepresentative* _tmp29_;
 	SidebarEmphasizableEntry* emphasizable = NULL;
-	SidebarEntry* _tmp32_ = NULL;
-	SidebarEmphasizableEntry* _tmp33_ = NULL;
-	SidebarEmphasizableEntry* _tmp34_ = NULL;
+	SidebarEntry* _tmp32_;
+	SidebarEmphasizableEntry* _tmp33_;
+	SidebarEmphasizableEntry* _tmp34_;
 	SidebarRenameableEntry* renameable = NULL;
-	SidebarEntry* _tmp36_ = NULL;
-	SidebarRenameableEntry* _tmp37_ = NULL;
-	SidebarRenameableEntry* _tmp38_ = NULL;
-	SidebarEntry* _tmp40_ = NULL;
+	SidebarEntry* _tmp36_;
+	SidebarRenameableEntry* _tmp37_;
+	SidebarRenameableEntry* _tmp38_;
+	SidebarEntry* _tmp40_;
 #line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3243,9 +3254,9 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso
 	_tmp29_ = pageable;
 #line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp29_ != NULL) {
-#line 3247 "Tree.c"
-		SidebarPageRepresentative* _tmp30_ = NULL;
-		SidebarPageRepresentative* _tmp31_ = NULL;
+#line 3258 "Tree.c"
+		SidebarPageRepresentative* _tmp30_;
+		SidebarPageRepresentative* _tmp31_;
 #line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp30_ = pageable;
 #line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3254,7 +3265,7 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso
 		_tmp31_ = pageable;
 #line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (_tmp31_, "destroying-page", (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self, 0);
-#line 3258 "Tree.c"
+#line 3269 "Tree.c"
 	}
 #line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = entry;
@@ -3266,13 +3277,13 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso
 	_tmp34_ = emphasizable;
 #line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp34_ != NULL) {
-#line 3270 "Tree.c"
-		SidebarEmphasizableEntry* _tmp35_ = NULL;
+#line 3281 "Tree.c"
+		SidebarEmphasizableEntry* _tmp35_;
 #line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp35_ = emphasizable;
 #line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (_tmp35_, "is-emphasized-changed", (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self, 0);
-#line 3276 "Tree.c"
+#line 3287 "Tree.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = entry;
@@ -3284,13 +3295,13 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso
 	_tmp38_ = renameable;
 #line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp38_ != NULL) {
-#line 3288 "Tree.c"
-		SidebarRenameableEntry* _tmp39_ = NULL;
+#line 3299 "Tree.c"
+		SidebarRenameableEntry* _tmp39_;
 #line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp39_ = renameable;
 #line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (_tmp39_, "sidebar-name-changed", (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self, 0);
-#line 3294 "Tree.c"
+#line 3305 "Tree.c"
 	}
 #line 503 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp40_ = entry;
@@ -3304,41 +3315,41 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso
 	_g_object_unref0 (pageable);
 #line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (entry);
-#line 3308 "Tree.c"
+#line 3319 "Tree.c"
 }
 
 
 static SidebarTreeEntryWrapper* sidebar_tree_reparent_wrapper (SidebarTree* self, GtkTreeIter* new_iter, SidebarTreeEntryWrapper* current_wrapper) {
 	SidebarTreeEntryWrapper* result = NULL;
 	SidebarEntry* entry = NULL;
-	SidebarTreeEntryWrapper* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
+	SidebarTreeEntryWrapper* _tmp0_;
+	SidebarEntry* _tmp1_;
+	SidebarEntry* _tmp2_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GeeHashMap* _tmp3_;
+	gboolean _tmp4_;
 	SidebarTreeEntryWrapper* new_wrapper = NULL;
-	GtkTreeStore* _tmp5_ = NULL;
-	GtkTreeStore* _tmp6_ = NULL;
-	GtkTreeIter _tmp7_ = {0};
-	GtkTreePath* _tmp8_ = NULL;
-	GtkTreePath* _tmp9_ = NULL;
-	SidebarTreeEntryWrapper* _tmp10_ = NULL;
-	SidebarTreeEntryWrapper* _tmp11_ = NULL;
-	GeeHashMap* _tmp12_ = NULL;
-	GtkTreeStore* _tmp13_ = NULL;
-	GtkTreeIter _tmp14_ = {0};
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	GtkTreeStore* _tmp17_ = NULL;
-	GtkTreeIter _tmp18_ = {0};
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-	GtkTreeStore* _tmp23_ = NULL;
-	GtkTreeIter _tmp24_ = {0};
-	GtkTreeIter _tmp25_ = {0};
+	GtkTreeStore* _tmp5_;
+	GtkTreeStore* _tmp6_;
+	GtkTreeIter _tmp7_;
+	GtkTreePath* _tmp8_;
+	GtkTreePath* _tmp9_;
+	SidebarTreeEntryWrapper* _tmp10_;
+	SidebarTreeEntryWrapper* _tmp11_;
+	GeeHashMap* _tmp12_;
+	GtkTreeStore* _tmp13_;
+	GtkTreeIter _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	GtkTreeStore* _tmp17_;
+	GtkTreeIter _tmp18_;
+	gchar* _tmp19_;
+	gchar* _tmp20_;
+	gchar* _tmp21_;
+	gchar* _tmp22_;
+	GtkTreeStore* _tmp23_;
+	GtkTreeIter _tmp24_;
+	GtkTreeIter _tmp25_;
 #line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
 #line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3429,36 +3440,36 @@ static SidebarTreeEntryWrapper* sidebar_tree_reparent_wrapper (SidebarTree* self
 	_g_object_unref0 (entry);
 #line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 3433 "Tree.c"
+#line 3444 "Tree.c"
 }
 
 
 void sidebar_tree_prune (SidebarTree* self, SidebarBranch* branch) {
-	GeeHashMap* _tmp0_ = NULL;
-	SidebarBranch* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	SidebarBranch* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	SidebarEntry* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-	SidebarBranch* _tmp9_ = NULL;
-	guint _tmp10_ = 0U;
-	SidebarBranch* _tmp11_ = NULL;
-	guint _tmp12_ = 0U;
-	SidebarBranch* _tmp13_ = NULL;
-	guint _tmp14_ = 0U;
-	SidebarBranch* _tmp15_ = NULL;
-	guint _tmp16_ = 0U;
-	SidebarBranch* _tmp17_ = NULL;
-	guint _tmp18_ = 0U;
-	SidebarBranch* _tmp19_ = NULL;
-	guint _tmp20_ = 0U;
+	GeeHashMap* _tmp0_;
+	SidebarBranch* _tmp1_;
+	gboolean _tmp2_;
+	SidebarBranch* _tmp3_;
+	SidebarEntry* _tmp4_;
+	SidebarEntry* _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp7_;
+	SidebarBranch* _tmp9_;
+	guint _tmp10_;
+	SidebarBranch* _tmp11_;
+	guint _tmp12_;
+	SidebarBranch* _tmp13_;
+	guint _tmp14_;
+	SidebarBranch* _tmp15_;
+	guint _tmp16_;
+	SidebarBranch* _tmp17_;
+	guint _tmp18_;
+	SidebarBranch* _tmp19_;
+	guint _tmp20_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp21_ = NULL;
-	SidebarBranch* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
-	SidebarBranch* _tmp24_ = NULL;
+	GeeHashMap* _tmp21_;
+	SidebarBranch* _tmp22_;
+	gboolean _tmp23_;
+	SidebarBranch* _tmp24_;
 #line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3485,13 +3496,13 @@ void sidebar_tree_prune (SidebarTree* self, SidebarBranch* branch) {
 	_g_object_unref0 (_tmp5_);
 #line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_) {
-#line 3489 "Tree.c"
-		SidebarBranch* _tmp8_ = NULL;
+#line 3500 "Tree.c"
+		SidebarBranch* _tmp8_;
 #line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = branch;
 #line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_disassociate_branch (self, _tmp8_);
-#line 3495 "Tree.c"
+#line 3506 "Tree.c"
 	}
 #line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = branch;
@@ -3542,19 +3553,19 @@ void sidebar_tree_prune (SidebarTree* self, SidebarBranch* branch) {
 #line 539 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = branch;
 #line 539 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_emit_by_name (self, "branch-removed", _tmp24_);
-#line 3547 "Tree.c"
+	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_REMOVED_SIGNAL], 0, _tmp24_);
+#line 3558 "Tree.c"
 }
 
 
 static void sidebar_tree_disassociate_branch (SidebarTree* self, SidebarBranch* branch) {
 	SidebarTreeRootWrapper* root_wrapper = NULL;
-	SidebarBranch* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
-	SidebarTreeEntryWrapper* _tmp3_ = NULL;
-	SidebarTreeRootWrapper* _tmp4_ = NULL;
-	SidebarTreeRootWrapper* _tmp5_ = NULL;
+	SidebarBranch* _tmp0_;
+	SidebarEntry* _tmp1_;
+	SidebarEntry* _tmp2_;
+	SidebarTreeEntryWrapper* _tmp3_;
+	SidebarTreeRootWrapper* _tmp4_;
+	SidebarTreeRootWrapper* _tmp5_;
 #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3573,7 +3584,7 @@ static void sidebar_tree_disassociate_branch (SidebarTree* self, SidebarBranch*
 	if (_tmp4_ == NULL) {
 #line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_tmp3_);
-#line 3577 "Tree.c"
+#line 3588 "Tree.c"
 	}
 #line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
@@ -3587,18 +3598,18 @@ static void sidebar_tree_disassociate_branch (SidebarTree* self, SidebarBranch*
 	sidebar_tree_disassociate_wrapper_and_signal (self, G_TYPE_CHECK_INSTANCE_CAST (root_wrapper, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper), FALSE);
 #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (root_wrapper);
-#line 3591 "Tree.c"
+#line 3602 "Tree.c"
 }
 
 
 static void sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self, SidebarTreeEntryWrapper* wrapper, gboolean only_children) {
 	gboolean selected = FALSE;
-	SidebarTreeEntryWrapper* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	SidebarTreeEntryWrapper* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	SidebarTreeEntryWrapper* _tmp0_;
+	SidebarEntry* _tmp1_;
+	gboolean _tmp2_;
+	SidebarTreeEntryWrapper* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
 #line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3621,13 +3632,13 @@ static void sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self, Sid
 	_tmp5_ = selected;
 #line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_) {
-#line 3625 "Tree.c"
+#line 3636 "Tree.c"
 		SidebarSelectableEntry* selectable = NULL;
-		SidebarTreeEntryWrapper* _tmp6_ = NULL;
-		SidebarEntry* _tmp7_ = NULL;
-		SidebarSelectableEntry* _tmp8_ = NULL;
-		SidebarSelectableEntry* _tmp9_ = NULL;
-		SidebarSelectableEntry* _tmp10_ = NULL;
+		SidebarTreeEntryWrapper* _tmp6_;
+		SidebarEntry* _tmp7_;
+		SidebarSelectableEntry* _tmp8_;
+		SidebarSelectableEntry* _tmp9_;
+		SidebarSelectableEntry* _tmp10_;
 #line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = wrapper;
 #line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3643,57 +3654,57 @@ static void sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self, Sid
 #line 560 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = selectable;
 #line 560 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_emit_by_name (self, "selected-entry-removed", _tmp10_);
+		g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_SELECTED_ENTRY_REMOVED_SIGNAL], 0, _tmp10_);
 #line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selectable);
-#line 3650 "Tree.c"
+#line 3661 "Tree.c"
 	}
 }
 
 
 static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEntryWrapper* wrapper, gboolean only_children) {
 	GeeArrayList* children = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 	GtkTreeIter child_iter = {0};
 	gboolean found = FALSE;
-	GtkTreeStore* _tmp1_ = NULL;
-	SidebarTreeEntryWrapper* _tmp2_ = NULL;
+	GtkTreeStore* _tmp1_;
+	SidebarTreeEntryWrapper* _tmp2_;
 	GtkTreeIter _tmp3_ = {0};
 	GtkTreeIter _tmp4_ = {0};
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp26_ = FALSE;
+	gboolean _tmp5_;
+	gboolean _tmp26_;
 	GtkTreeIter iter = {0};
-	SidebarTreeEntryWrapper* _tmp27_ = NULL;
+	SidebarTreeEntryWrapper* _tmp27_;
 	GtkTreeIter _tmp28_ = {0};
-	GtkTreeStore* _tmp29_ = NULL;
-	SidebarTreeEntryWrapper* _tmp30_ = NULL;
-	SidebarTreeEntryWrapper* _tmp31_ = NULL;
+	GtkTreeStore* _tmp29_;
+	SidebarTreeEntryWrapper* _tmp30_;
+	SidebarTreeEntryWrapper* _tmp31_;
 	SidebarEntry* entry = NULL;
-	SidebarTreeEntryWrapper* _tmp32_ = NULL;
-	SidebarEntry* _tmp33_ = NULL;
-	SidebarEntry* _tmp34_ = NULL;
-	SidebarEntry* _tmp35_ = NULL;
-	SidebarEntry* _tmp36_ = NULL;
-	guint _tmp37_ = 0U;
-	SidebarEntry* _tmp38_ = NULL;
-	guint _tmp39_ = 0U;
+	SidebarTreeEntryWrapper* _tmp32_;
+	SidebarEntry* _tmp33_;
+	SidebarEntry* _tmp34_;
+	SidebarEntry* _tmp35_;
+	SidebarEntry* _tmp36_;
+	guint _tmp37_;
+	SidebarEntry* _tmp38_;
+	guint _tmp39_;
 	SidebarPageRepresentative* pageable = NULL;
-	SidebarEntry* _tmp40_ = NULL;
-	SidebarPageRepresentative* _tmp41_ = NULL;
-	SidebarPageRepresentative* _tmp42_ = NULL;
+	SidebarEntry* _tmp40_;
+	SidebarPageRepresentative* _tmp41_;
+	SidebarPageRepresentative* _tmp42_;
 	SidebarRenameableEntry* renameable = NULL;
-	SidebarEntry* _tmp47_ = NULL;
-	SidebarRenameableEntry* _tmp48_ = NULL;
-	SidebarRenameableEntry* _tmp49_ = NULL;
+	SidebarEntry* _tmp47_;
+	SidebarRenameableEntry* _tmp48_;
+	SidebarRenameableEntry* _tmp49_;
 	SidebarEmphasizableEntry* emphasizable = NULL;
-	SidebarEntry* _tmp52_ = NULL;
-	SidebarEmphasizableEntry* _tmp53_ = NULL;
-	SidebarEmphasizableEntry* _tmp54_ = NULL;
+	SidebarEntry* _tmp52_;
+	SidebarEmphasizableEntry* _tmp53_;
+	SidebarEmphasizableEntry* _tmp54_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp57_ = NULL;
-	SidebarEntry* _tmp58_ = NULL;
-	gboolean _tmp59_ = FALSE;
-	gboolean _tmp60_ = FALSE;
+	GeeHashMap* _tmp57_;
+	SidebarEntry* _tmp58_;
+	gboolean _tmp59_;
+	gboolean _tmp60_;
 #line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3716,23 +3727,23 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 	found = _tmp5_;
 #line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 3720 "Tree.c"
-		gboolean _tmp6_ = FALSE;
+#line 3731 "Tree.c"
+		gboolean _tmp6_;
 		SidebarTreeEntryWrapper* child_wrapper = NULL;
-		GtkTreeIter _tmp7_ = {0};
-		SidebarTreeEntryWrapper* _tmp8_ = NULL;
-		SidebarTreeEntryWrapper* _tmp9_ = NULL;
-		GeeArrayList* _tmp10_ = NULL;
-		SidebarTreeEntryWrapper* _tmp11_ = NULL;
-		GtkTreeStore* _tmp12_ = NULL;
-		gboolean _tmp13_ = FALSE;
+		GtkTreeIter _tmp7_;
+		SidebarTreeEntryWrapper* _tmp8_;
+		SidebarTreeEntryWrapper* _tmp9_;
+		GeeArrayList* _tmp10_;
+		SidebarTreeEntryWrapper* _tmp11_;
+		GtkTreeStore* _tmp12_;
+		gboolean _tmp13_;
 #line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = found;
 #line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp6_) {
 #line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 3736 "Tree.c"
+#line 3747 "Tree.c"
 		}
 #line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = child_iter;
@@ -3758,16 +3769,16 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 		found = _tmp13_;
 #line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (child_wrapper);
-#line 3762 "Tree.c"
+#line 3773 "Tree.c"
 	}
 	{
 		GeeArrayList* _child_wrapper_list = NULL;
-		GeeArrayList* _tmp14_ = NULL;
-		GeeArrayList* _tmp15_ = NULL;
+		GeeArrayList* _tmp14_;
+		GeeArrayList* _tmp15_;
 		gint _child_wrapper_size = 0;
-		GeeArrayList* _tmp16_ = NULL;
-		gint _tmp17_ = 0;
-		gint _tmp18_ = 0;
+		GeeArrayList* _tmp16_;
+		gint _tmp17_;
+		gint _tmp18_;
 		gint _child_wrapper_index = 0;
 #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = children;
@@ -3787,15 +3798,15 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 		_child_wrapper_index = -1;
 #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 3791 "Tree.c"
-			gint _tmp19_ = 0;
-			gint _tmp20_ = 0;
-			gint _tmp21_ = 0;
+#line 3802 "Tree.c"
+			gint _tmp19_;
+			gint _tmp20_;
+			gint _tmp21_;
 			SidebarTreeEntryWrapper* child_wrapper = NULL;
-			GeeArrayList* _tmp22_ = NULL;
-			gint _tmp23_ = 0;
-			gpointer _tmp24_ = NULL;
-			SidebarTreeEntryWrapper* _tmp25_ = NULL;
+			GeeArrayList* _tmp22_;
+			gint _tmp23_;
+			gpointer _tmp24_;
+			SidebarTreeEntryWrapper* _tmp25_;
 #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = _child_wrapper_index;
 #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3808,7 +3819,7 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 			if (!(_tmp20_ < _tmp21_)) {
 #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 3812 "Tree.c"
+#line 3823 "Tree.c"
 			}
 #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp22_ = _child_wrapper_list;
@@ -3824,11 +3835,11 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 			sidebar_tree_disassociate_wrapper (self, _tmp25_, FALSE);
 #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child_wrapper);
-#line 3828 "Tree.c"
+#line 3839 "Tree.c"
 		}
 #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_wrapper_list);
-#line 3832 "Tree.c"
+#line 3843 "Tree.c"
 	}
 #line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = only_children;
@@ -3838,7 +3849,7 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 		_g_object_unref0 (children);
 #line 582 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 3842 "Tree.c"
+#line 3853 "Tree.c"
 	}
 #line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = wrapper;
@@ -3858,7 +3869,7 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 	if (_tmp30_ == _tmp31_) {
 #line 588 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->selected_wrapper = NULL;
-#line 3862 "Tree.c"
+#line 3873 "Tree.c"
 	}
 #line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = wrapper;
@@ -3894,11 +3905,11 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 	_tmp42_ = pageable;
 #line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp42_ != NULL) {
-#line 3898 "Tree.c"
-		SidebarPageRepresentative* _tmp43_ = NULL;
-		guint _tmp44_ = 0U;
-		SidebarPageRepresentative* _tmp45_ = NULL;
-		guint _tmp46_ = 0U;
+#line 3909 "Tree.c"
+		SidebarPageRepresentative* _tmp43_;
+		guint _tmp44_;
+		SidebarPageRepresentative* _tmp45_;
+		guint _tmp46_;
 #line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp43_ = pageable;
 #line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3911,7 +3922,7 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 		g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp46_, NULL, FALSE);
 #line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_handlers_disconnect_matched (_tmp45_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp46_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self);
-#line 3915 "Tree.c"
+#line 3926 "Tree.c"
 	}
 #line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp47_ = entry;
@@ -3923,16 +3934,16 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 	_tmp49_ = renameable;
 #line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp49_ != NULL) {
-#line 3927 "Tree.c"
-		SidebarRenameableEntry* _tmp50_ = NULL;
-		guint _tmp51_ = 0U;
+#line 3938 "Tree.c"
+		SidebarRenameableEntry* _tmp50_;
+		guint _tmp51_;
 #line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp50_ = renameable;
 #line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_parse_name ("sidebar-name-changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, &_tmp51_, NULL, FALSE);
 #line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_handlers_disconnect_matched (_tmp50_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp51_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self);
-#line 3936 "Tree.c"
+#line 3947 "Tree.c"
 	}
 #line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp52_ = entry;
@@ -3944,16 +3955,16 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 	_tmp54_ = emphasizable;
 #line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp54_ != NULL) {
-#line 3948 "Tree.c"
-		SidebarEmphasizableEntry* _tmp55_ = NULL;
-		guint _tmp56_ = 0U;
+#line 3959 "Tree.c"
+		SidebarEmphasizableEntry* _tmp55_;
+		guint _tmp56_;
 #line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp55_ = emphasizable;
 #line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_parse_name ("is-emphasized-changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, &_tmp56_, NULL, FALSE);
 #line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_handlers_disconnect_matched (_tmp55_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp56_, 0, NULL, (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self);
-#line 3957 "Tree.c"
+#line 3968 "Tree.c"
 	}
 #line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp57_ = self->priv->entry_map;
@@ -3977,33 +3988,33 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 	_g_object_unref0 (entry);
 #line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 3981 "Tree.c"
+#line 3992 "Tree.c"
 }
 
 
 static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry) {
 	SidebarEntry* parent = NULL;
-	SidebarBranch* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
-	SidebarEntry* _tmp3_ = NULL;
+	SidebarBranch* _tmp0_;
+	SidebarEntry* _tmp1_;
+	SidebarEntry* _tmp2_;
+	SidebarEntry* _tmp3_;
 	SidebarTreeEntryWrapper* parent_wrapper = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	SidebarTreeEntryWrapper* _tmp5_ = NULL;
-	SidebarTreeEntryWrapper* _tmp6_ = NULL;
+	SidebarEntry* _tmp4_;
+	SidebarTreeEntryWrapper* _tmp5_;
+	SidebarTreeEntryWrapper* _tmp6_;
 	GtkTreeIter insertion_iter = {0};
 	SidebarEntry* next = NULL;
-	SidebarBranch* _tmp7_ = NULL;
-	SidebarEntry* _tmp8_ = NULL;
-	SidebarEntry* _tmp9_ = NULL;
-	SidebarEntry* _tmp10_ = NULL;
-	GtkTreeIter _tmp23_ = {0};
-	SidebarEntry* _tmp24_ = NULL;
-	SidebarBranch* _tmp25_ = NULL;
-	SidebarEntry* _tmp26_ = NULL;
-	GtkTreeIter _tmp27_ = {0};
-	SidebarBranch* _tmp28_ = NULL;
-	gboolean _tmp29_ = FALSE;
+	SidebarBranch* _tmp7_;
+	SidebarEntry* _tmp8_;
+	SidebarEntry* _tmp9_;
+	SidebarEntry* _tmp10_;
+	GtkTreeIter _tmp23_;
+	SidebarEntry* _tmp24_;
+	SidebarBranch* _tmp25_;
+	SidebarEntry* _tmp26_;
+	GtkTreeIter _tmp27_;
+	SidebarBranch* _tmp28_;
+	gboolean _tmp29_;
 #line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4044,14 +4055,14 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
 	_tmp10_ = next;
 #line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp10_ != NULL) {
-#line 4048 "Tree.c"
+#line 4059 "Tree.c"
 		SidebarTreeEntryWrapper* next_wrapper = NULL;
-		SidebarEntry* _tmp11_ = NULL;
-		SidebarTreeEntryWrapper* _tmp12_ = NULL;
-		GtkTreeStore* _tmp13_ = NULL;
-		SidebarTreeEntryWrapper* _tmp14_ = NULL;
+		SidebarEntry* _tmp11_;
+		SidebarTreeEntryWrapper* _tmp12_;
+		GtkTreeStore* _tmp13_;
+		SidebarTreeEntryWrapper* _tmp14_;
 		GtkTreeIter _tmp15_ = {0};
-		SidebarTreeEntryWrapper* _tmp16_ = NULL;
+		SidebarTreeEntryWrapper* _tmp16_;
 		GtkTreeIter _tmp17_ = {0};
 		GtkTreeIter _tmp18_ = {0};
 #line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4076,10 +4087,10 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
 		insertion_iter = _tmp18_;
 #line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (next_wrapper);
-#line 4080 "Tree.c"
+#line 4091 "Tree.c"
 	} else {
-		GtkTreeStore* _tmp19_ = NULL;
-		SidebarTreeEntryWrapper* _tmp20_ = NULL;
+		GtkTreeStore* _tmp19_;
+		SidebarTreeEntryWrapper* _tmp20_;
 		GtkTreeIter _tmp21_ = {0};
 		GtkTreeIter _tmp22_ = {0};
 #line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4092,7 +4103,7 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
 		gtk_tree_store_append (_tmp19_, &_tmp22_, &_tmp21_);
 #line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		insertion_iter = _tmp22_;
-#line 4096 "Tree.c"
+#line 4107 "Tree.c"
 	}
 #line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = insertion_iter;
@@ -4114,13 +4125,13 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
 	_tmp29_ = sidebar_branch_is_auto_open_on_new_child (_tmp28_);
 #line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp29_) {
-#line 4118 "Tree.c"
-		SidebarEntry* _tmp30_ = NULL;
+#line 4129 "Tree.c"
+		SidebarEntry* _tmp30_;
 #line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp30_ = entry;
 #line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_expand_to_entry (self, _tmp30_);
-#line 4124 "Tree.c"
+#line 4135 "Tree.c"
 	}
 #line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (next);
@@ -4128,14 +4139,14 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
 	_g_object_unref0 (parent_wrapper);
 #line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent);
-#line 4132 "Tree.c"
+#line 4143 "Tree.c"
 }
 
 
 static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry) {
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarTreeEntryWrapper* _tmp1_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp1_;
 #line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4156,27 +4167,27 @@ static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, SidebarBran
 	sidebar_tree_disassociate_wrapper_and_signal (self, wrapper, FALSE);
 #line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4160 "Tree.c"
+#line 4171 "Tree.c"
 }
 
 
 static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry) {
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarTreeEntryWrapper* _tmp1_ = NULL;
-	SidebarTreeEntryWrapper* _tmp2_ = NULL;
-	SidebarTreeEntryWrapper* _tmp3_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp1_;
+	SidebarTreeEntryWrapper* _tmp2_;
+	SidebarTreeEntryWrapper* _tmp3_;
 	GtkTreeIter* prev_iter = NULL;
 	SidebarEntry* prev = NULL;
-	SidebarBranch* _tmp4_ = NULL;
-	SidebarEntry* _tmp5_ = NULL;
-	SidebarEntry* _tmp6_ = NULL;
-	SidebarEntry* _tmp7_ = NULL;
+	SidebarBranch* _tmp4_;
+	SidebarEntry* _tmp5_;
+	SidebarEntry* _tmp6_;
+	SidebarEntry* _tmp7_;
 	GtkTreeIter entry_iter = {0};
-	SidebarTreeEntryWrapper* _tmp14_ = NULL;
+	SidebarTreeEntryWrapper* _tmp14_;
 	GtkTreeIter _tmp15_ = {0};
-	GtkTreeStore* _tmp16_ = NULL;
-	GtkTreeIter* _tmp17_ = NULL;
+	GtkTreeStore* _tmp16_;
+	GtkTreeIter* _tmp17_;
 #line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4211,14 +4222,14 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch
 	_tmp7_ = prev;
 #line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_ != NULL) {
-#line 4215 "Tree.c"
+#line 4226 "Tree.c"
 		SidebarTreeEntryWrapper* prev_wrapper = NULL;
-		SidebarEntry* _tmp8_ = NULL;
-		SidebarTreeEntryWrapper* _tmp9_ = NULL;
-		SidebarTreeEntryWrapper* _tmp10_ = NULL;
-		SidebarTreeEntryWrapper* _tmp11_ = NULL;
+		SidebarEntry* _tmp8_;
+		SidebarTreeEntryWrapper* _tmp9_;
+		SidebarTreeEntryWrapper* _tmp10_;
+		SidebarTreeEntryWrapper* _tmp11_;
 		GtkTreeIter _tmp12_ = {0};
-		GtkTreeIter* _tmp13_ = NULL;
+		GtkTreeIter* _tmp13_;
 #line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = prev;
 #line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4241,7 +4252,7 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch
 		prev_iter = _tmp13_;
 #line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (prev_wrapper);
-#line 4245 "Tree.c"
+#line 4256 "Tree.c"
 	}
 #line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = wrapper;
@@ -4261,54 +4272,54 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch
 	_g_free0 (prev_iter);
 #line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4265 "Tree.c"
+#line 4276 "Tree.c"
 }
 
 
 static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry, SidebarEntry* old_parent) {
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarTreeEntryWrapper* _tmp1_ = NULL;
-	SidebarTreeEntryWrapper* _tmp2_ = NULL;
-	SidebarTreeEntryWrapper* _tmp3_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp1_;
+	SidebarTreeEntryWrapper* _tmp2_;
+	SidebarTreeEntryWrapper* _tmp3_;
 	gboolean selected = FALSE;
-	GtkTreePath* _tmp4_ = NULL;
-	GtkTreePath* _tmp5_ = NULL;
-	SidebarTreeEntryWrapper* _tmp6_ = NULL;
-	GtkTreePath* _tmp7_ = NULL;
-	GtkTreePath* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gboolean _tmp10_ = FALSE;
+	GtkTreePath* _tmp4_;
+	GtkTreePath* _tmp5_;
+	SidebarTreeEntryWrapper* _tmp6_;
+	GtkTreePath* _tmp7_;
+	GtkTreePath* _tmp8_;
+	gint _tmp9_;
+	gboolean _tmp10_;
 	GtkTreeIter iter = {0};
-	SidebarTreeEntryWrapper* _tmp11_ = NULL;
+	SidebarTreeEntryWrapper* _tmp11_;
 	GtkTreeIter _tmp12_ = {0};
-	GtkTreeStore* _tmp13_ = NULL;
+	GtkTreeStore* _tmp13_;
 	SidebarEntry* parent = NULL;
-	SidebarBranch* _tmp14_ = NULL;
-	SidebarEntry* _tmp15_ = NULL;
-	SidebarEntry* _tmp16_ = NULL;
-	SidebarEntry* _tmp17_ = NULL;
+	SidebarBranch* _tmp14_;
+	SidebarEntry* _tmp15_;
+	SidebarEntry* _tmp16_;
+	SidebarEntry* _tmp17_;
 	SidebarTreeEntryWrapper* parent_wrapper = NULL;
-	SidebarEntry* _tmp18_ = NULL;
-	SidebarTreeEntryWrapper* _tmp19_ = NULL;
-	SidebarTreeEntryWrapper* _tmp20_ = NULL;
+	SidebarEntry* _tmp18_;
+	SidebarTreeEntryWrapper* _tmp19_;
+	SidebarTreeEntryWrapper* _tmp20_;
 	GtkTreeIter* prev_iter = NULL;
 	SidebarEntry* prev = NULL;
-	SidebarBranch* _tmp21_ = NULL;
-	SidebarEntry* _tmp22_ = NULL;
-	SidebarEntry* _tmp23_ = NULL;
-	SidebarEntry* _tmp24_ = NULL;
+	SidebarBranch* _tmp21_;
+	SidebarEntry* _tmp22_;
+	SidebarEntry* _tmp23_;
+	SidebarEntry* _tmp24_;
 	GtkTreeIter new_iter = {0};
-	GtkTreeStore* _tmp31_ = NULL;
-	SidebarTreeEntryWrapper* _tmp32_ = NULL;
+	GtkTreeStore* _tmp31_;
+	SidebarTreeEntryWrapper* _tmp32_;
 	GtkTreeIter _tmp33_ = {0};
-	GtkTreeIter* _tmp34_ = NULL;
+	GtkTreeIter* _tmp34_;
 	GtkTreeIter _tmp35_ = {0};
 	SidebarTreeEntryWrapper* new_wrapper = NULL;
-	GtkTreeIter _tmp36_ = {0};
-	SidebarTreeEntryWrapper* _tmp37_ = NULL;
-	SidebarTreeEntryWrapper* _tmp38_ = NULL;
-	gboolean _tmp39_ = FALSE;
+	GtkTreeIter _tmp36_;
+	SidebarTreeEntryWrapper* _tmp37_;
+	SidebarTreeEntryWrapper* _tmp38_;
+	gboolean _tmp39_;
 #line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4397,14 +4408,14 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
 	_tmp24_ = prev;
 #line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp24_ != NULL) {
-#line 4401 "Tree.c"
+#line 4412 "Tree.c"
 		SidebarTreeEntryWrapper* prev_wrapper = NULL;
-		SidebarEntry* _tmp25_ = NULL;
-		SidebarTreeEntryWrapper* _tmp26_ = NULL;
-		SidebarTreeEntryWrapper* _tmp27_ = NULL;
-		SidebarTreeEntryWrapper* _tmp28_ = NULL;
+		SidebarEntry* _tmp25_;
+		SidebarTreeEntryWrapper* _tmp26_;
+		SidebarTreeEntryWrapper* _tmp27_;
+		SidebarTreeEntryWrapper* _tmp28_;
 		GtkTreeIter _tmp29_ = {0};
-		GtkTreeIter* _tmp30_ = NULL;
+		GtkTreeIter* _tmp30_;
 #line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = prev;
 #line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4427,7 +4438,7 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
 		prev_iter = _tmp30_;
 #line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (prev_wrapper);
-#line 4431 "Tree.c"
+#line 4442 "Tree.c"
 	}
 #line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = self->priv->store;
@@ -4453,11 +4464,11 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
 	_tmp39_ = selected;
 #line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp39_) {
-#line 4457 "Tree.c"
-		SidebarTreeEntryWrapper* _tmp40_ = NULL;
-		SidebarEntry* _tmp41_ = NULL;
-		SidebarTreeEntryWrapper* _tmp42_ = NULL;
-		SidebarEntry* _tmp43_ = NULL;
+#line 4468 "Tree.c"
+		SidebarTreeEntryWrapper* _tmp40_;
+		SidebarEntry* _tmp41_;
+		SidebarTreeEntryWrapper* _tmp42_;
+		SidebarEntry* _tmp43_;
 #line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp40_ = new_wrapper;
 #line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4470,7 +4481,7 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
 		_tmp43_ = _tmp42_->entry;
 #line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_place_cursor (self, _tmp43_, FALSE);
-#line 4474 "Tree.c"
+#line 4485 "Tree.c"
 	}
 #line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (new_wrapper);
@@ -4484,16 +4495,16 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
 	_g_object_unref0 (parent);
 #line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4488 "Tree.c"
+#line 4499 "Tree.c"
 }
 
 
 static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry) {
 	GeeList* children = NULL;
-	SidebarBranch* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	GeeList* _tmp3_ = NULL;
+	SidebarBranch* _tmp0_;
+	SidebarEntry* _tmp1_;
+	GeeList* _tmp2_;
+	GeeList* _tmp3_;
 #line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4516,16 +4527,16 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
 		_g_object_unref0 (children);
 #line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 4520 "Tree.c"
+#line 4531 "Tree.c"
 	}
 	{
 		GeeList* _child_list = NULL;
-		GeeList* _tmp4_ = NULL;
-		GeeList* _tmp5_ = NULL;
+		GeeList* _tmp4_;
+		GeeList* _tmp5_;
 		gint _child_size = 0;
-		GeeList* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
+		GeeList* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
 		gint _child_index = 0;
 #line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = children;
@@ -4545,22 +4556,22 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
 		_child_index = -1;
 #line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 4549 "Tree.c"
-			gint _tmp9_ = 0;
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
+#line 4560 "Tree.c"
+			gint _tmp9_;
+			gint _tmp10_;
+			gint _tmp11_;
 			SidebarEntry* child = NULL;
-			GeeList* _tmp12_ = NULL;
-			gint _tmp13_ = 0;
-			gpointer _tmp14_ = NULL;
+			GeeList* _tmp12_;
+			gint _tmp13_;
+			gpointer _tmp14_;
 			SidebarTreeEntryWrapper* child_wrapper = NULL;
-			SidebarEntry* _tmp15_ = NULL;
-			SidebarTreeEntryWrapper* _tmp16_ = NULL;
-			SidebarTreeEntryWrapper* _tmp17_ = NULL;
+			SidebarEntry* _tmp15_;
+			SidebarTreeEntryWrapper* _tmp16_;
+			SidebarTreeEntryWrapper* _tmp17_;
 			GtkTreeIter child_iter = {0};
-			SidebarTreeEntryWrapper* _tmp18_ = NULL;
+			SidebarTreeEntryWrapper* _tmp18_;
 			GtkTreeIter _tmp19_ = {0};
-			GtkTreeStore* _tmp20_ = NULL;
+			GtkTreeStore* _tmp20_;
 #line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = _child_index;
 #line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4573,7 +4584,7 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
 			if (!(_tmp10_ < _tmp11_)) {
 #line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 4577 "Tree.c"
+#line 4588 "Tree.c"
 			}
 #line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = _child_list;
@@ -4607,22 +4618,22 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
 			_g_object_unref0 (child_wrapper);
 #line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child);
-#line 4611 "Tree.c"
+#line 4622 "Tree.c"
 		}
 #line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_list);
-#line 4615 "Tree.c"
+#line 4626 "Tree.c"
 	}
 #line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 4619 "Tree.c"
+#line 4630 "Tree.c"
 }
 
 
 static void sidebar_tree_on_show_branch (SidebarTree* self, SidebarBranch* branch, gboolean shown) {
-	gboolean _tmp0_ = FALSE;
-	SidebarBranch* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp0_;
+	SidebarBranch* _tmp3_;
+	gboolean _tmp4_;
 #line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4631,40 +4642,40 @@ static void sidebar_tree_on_show_branch (SidebarTree* self, SidebarBranch* branc
 	_tmp0_ = shown;
 #line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_) {
-#line 4635 "Tree.c"
-		SidebarBranch* _tmp1_ = NULL;
+#line 4646 "Tree.c"
+		SidebarBranch* _tmp1_;
 #line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = branch;
 #line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_associate_branch (self, _tmp1_);
-#line 4641 "Tree.c"
+#line 4652 "Tree.c"
 	} else {
-		SidebarBranch* _tmp2_ = NULL;
+		SidebarBranch* _tmp2_;
 #line 727 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = branch;
 #line 727 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_disassociate_branch (self, _tmp2_);
-#line 4648 "Tree.c"
+#line 4659 "Tree.c"
 	}
 #line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = branch;
 #line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = shown;
 #line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_emit_by_name (self, "branch-shown", _tmp3_, _tmp4_);
-#line 4656 "Tree.c"
+	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_SHOWN_SIGNAL], 0, _tmp3_, _tmp4_);
+#line 4667 "Tree.c"
 }
 
 
 static void sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self, SidebarEntry* entry, const gchar* tooltip) {
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarTreeEntryWrapper* _tmp1_ = NULL;
-	GtkTreeStore* _tmp2_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp1_;
+	GtkTreeStore* _tmp2_;
 	GtkTreeIter _tmp3_ = {0};
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4693,17 +4704,17 @@ static void sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self, SidebarE
 	_g_free0 (_tmp6_);
 #line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4697 "Tree.c"
+#line 4708 "Tree.c"
 }
 
 
 static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntry* entry, const gchar* icon) {
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarTreeEntryWrapper* _tmp1_ = NULL;
-	GtkTreeStore* _tmp2_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp1_;
+	GtkTreeStore* _tmp2_;
 	GtkTreeIter _tmp3_ = {0};
-	const gchar* _tmp4_ = NULL;
+	const gchar* _tmp4_;
 #line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4726,19 +4737,19 @@ static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntr
 	gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_ICON, _tmp4_, -1);
 #line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4730 "Tree.c"
+#line 4741 "Tree.c"
 }
 
 
 static void sidebar_tree_rename_entry (SidebarTree* self, SidebarEntry* entry) {
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarTreeEntryWrapper* _tmp1_ = NULL;
-	GtkTreeStore* _tmp2_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp1_;
+	GtkTreeStore* _tmp2_;
 	GtkTreeIter _tmp3_ = {0};
-	SidebarEntry* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	SidebarEntry* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 746 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 746 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4767,12 +4778,12 @@ static void sidebar_tree_rename_entry (SidebarTree* self, SidebarEntry* entry) {
 	_g_free0 (_tmp6_);
 #line 746 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4771 "Tree.c"
+#line 4782 "Tree.c"
 }
 
 
 static void sidebar_tree_on_sidebar_name_changed (SidebarTree* self, SidebarEntry* entry, const gchar* name) {
-	SidebarEntry* _tmp0_ = NULL;
+	SidebarEntry* _tmp0_;
 #line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4783,13 +4794,13 @@ static void sidebar_tree_on_sidebar_name_changed (SidebarTree* self, SidebarEntr
 	_tmp0_ = entry;
 #line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_rename_entry (self, _tmp0_);
-#line 4787 "Tree.c"
+#line 4798 "Tree.c"
 }
 
 
 static void sidebar_tree_on_sidebar_page_created (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) {
-	SidebarPageRepresentative* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
+	SidebarPageRepresentative* _tmp0_;
+	Page* _tmp1_;
 #line 757 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 757 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4801,13 +4812,13 @@ static void sidebar_tree_on_sidebar_page_created (SidebarTree* self, SidebarPage
 #line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = page;
 #line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_emit_by_name (self, "page-created", _tmp0_, _tmp1_);
-#line 4806 "Tree.c"
+	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_PAGE_CREATED_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 4817 "Tree.c"
 }
 
 
 static void sidebar_tree_on_is_emphasized_changed (SidebarTree* self, SidebarEmphasizableEntry* entry, gboolean is_emphasized) {
-	SidebarEmphasizableEntry* _tmp0_ = NULL;
+	SidebarEmphasizableEntry* _tmp0_;
 #line 761 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 761 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4816,13 +4827,13 @@ static void sidebar_tree_on_is_emphasized_changed (SidebarTree* self, SidebarEmp
 	_tmp0_ = entry;
 #line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_rename_entry (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 4820 "Tree.c"
+#line 4831 "Tree.c"
 }
 
 
 static void sidebar_tree_on_sidebar_destroying_page (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) {
-	SidebarPageRepresentative* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
+	SidebarPageRepresentative* _tmp0_;
+	Page* _tmp1_;
 #line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4834,23 +4845,23 @@ static void sidebar_tree_on_sidebar_destroying_page (SidebarTree* self, SidebarP
 #line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = page;
 #line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_emit_by_name (self, "destroying-page", _tmp0_, _tmp1_);
-#line 4839 "Tree.c"
+	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_DESTROYING_PAGE_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 4850 "Tree.c"
 }
 
 
 static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter) {
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	GtkTreeIter _tmp0_ = {0};
-	SidebarTreeEntryWrapper* _tmp1_ = NULL;
-	SidebarTreeEntryWrapper* _tmp2_ = NULL;
+	GtkTreeIter _tmp0_;
+	SidebarTreeEntryWrapper* _tmp1_;
+	SidebarTreeEntryWrapper* _tmp2_;
 	gchar* icon = NULL;
-	SidebarTreeEntryWrapper* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	GtkTreeStore* _tmp6_ = NULL;
-	GtkTreeIter _tmp7_ = {0};
-	const gchar* _tmp8_ = NULL;
+	SidebarTreeEntryWrapper* _tmp3_;
+	SidebarEntry* _tmp4_;
+	gchar* _tmp5_;
+	GtkTreeStore* _tmp6_;
+	GtkTreeIter _tmp7_;
+	const gchar* _tmp8_;
 #line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4869,7 +4880,7 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter)
 		_g_object_unref0 (wrapper);
 #line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 4873 "Tree.c"
+#line 4884 "Tree.c"
 	}
 #line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
@@ -4891,17 +4902,17 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter)
 	_g_free0 (icon);
 #line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4895 "Tree.c"
+#line 4906 "Tree.c"
 }
 
 
 static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter) {
-	GtkTreeIter _tmp0_ = {0};
+	GtkTreeIter _tmp0_;
 	GtkTreeIter child_iter = {0};
-	GtkTreeStore* _tmp1_ = NULL;
-	GtkTreeIter _tmp2_ = {0};
+	GtkTreeStore* _tmp1_;
+	GtkTreeIter _tmp2_;
 	GtkTreeIter _tmp3_ = {0};
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp4_;
 #line 777 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 777 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4920,20 +4931,20 @@ static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter
 	child_iter = _tmp3_;
 #line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 4924 "Tree.c"
+#line 4935 "Tree.c"
 		{
 			gboolean _tmp5_ = FALSE;
 #line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp5_ = TRUE;
 #line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			while (TRUE) {
-#line 4931 "Tree.c"
-				GtkTreeIter _tmp8_ = {0};
+#line 4942 "Tree.c"
+				GtkTreeIter _tmp8_;
 #line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (!_tmp5_) {
-#line 4935 "Tree.c"
-					GtkTreeStore* _tmp6_ = NULL;
-					gboolean _tmp7_ = FALSE;
+#line 4946 "Tree.c"
+					GtkTreeStore* _tmp6_;
+					gboolean _tmp7_;
 #line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp6_ = self->priv->store;
 #line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4942,7 +4953,7 @@ static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter
 					if (!_tmp7_) {
 #line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 						break;
-#line 4946 "Tree.c"
+#line 4957 "Tree.c"
 					}
 				}
 #line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4951,7 +4962,7 @@ static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter
 				_tmp8_ = child_iter;
 #line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				sidebar_tree_load_branch_icons (self, &_tmp8_);
-#line 4955 "Tree.c"
+#line 4966 "Tree.c"
 			}
 		}
 	}
@@ -4961,10 +4972,10 @@ static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter
 static gboolean sidebar_tree_on_selection (SidebarTree* self, GtkTreeSelection* selection, GtkTreeModel* model, GtkTreePath* path, gboolean path_currently_selected) {
 	gboolean result = FALSE;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	GtkTreePath* _tmp0_ = NULL;
-	SidebarTreeEntryWrapper* _tmp1_ = NULL;
+	GtkTreePath* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	SidebarTreeEntryWrapper* _tmp3_ = NULL;
+	SidebarTreeEntryWrapper* _tmp3_;
 #line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4983,20 +4994,20 @@ static gboolean sidebar_tree_on_selection (SidebarTree* self, GtkTreeSelection*
 	_tmp3_ = wrapper;
 #line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ != NULL) {
-#line 4987 "Tree.c"
-		SidebarTreeEntryWrapper* _tmp4_ = NULL;
-		SidebarEntry* _tmp5_ = NULL;
+#line 4998 "Tree.c"
+		SidebarTreeEntryWrapper* _tmp4_;
+		SidebarEntry* _tmp5_;
 #line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = wrapper;
 #line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp4_->entry;
 #line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_SELECTABLE_ENTRY);
-#line 4996 "Tree.c"
+#line 5007 "Tree.c"
 	} else {
 #line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = FALSE;
-#line 5000 "Tree.c"
+#line 5011 "Tree.c"
 	}
 #line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp2_;
@@ -5004,7 +5015,7 @@ static gboolean sidebar_tree_on_selection (SidebarTree* self, GtkTreeSelection*
 	_g_object_unref0 (wrapper);
 #line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5008 "Tree.c"
+#line 5019 "Tree.c"
 }
 
 
@@ -5013,11 +5024,11 @@ static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, GdkEven
 	gint x = 0;
 	gint y = 0;
 	GdkModifierType mask = 0;
-	GdkEventButton* _tmp0_ = NULL;
-	GdkWindow* _tmp1_ = NULL;
-	GdkDisplay* _tmp2_ = NULL;
-	GdkDeviceManager* _tmp3_ = NULL;
-	GdkDevice* _tmp4_ = NULL;
+	GdkEventButton* _tmp0_;
+	GdkWindow* _tmp1_;
+	GdkDisplay* _tmp2_;
+	GdkDeviceManager* _tmp3_;
+	GdkDevice* _tmp4_;
 	gint _tmp5_ = 0;
 	gint _tmp6_ = 0;
 	GdkModifierType _tmp7_ = 0;
@@ -5025,13 +5036,13 @@ static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, GdkEven
 	gint cell_y = 0;
 	GtkTreePath* path = NULL;
 	GtkTreePath* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
+	gint _tmp9_;
+	gint _tmp10_;
 	GtkTreePath* _tmp11_ = NULL;
 	gint _tmp12_ = 0;
 	gint _tmp13_ = 0;
-	gboolean _tmp14_ = FALSE;
-	GtkTreePath* _tmp16_ = NULL;
+	gboolean _tmp14_;
+	GtkTreePath* _tmp16_;
 #line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
 #line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5070,17 +5081,17 @@ static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, GdkEven
 	cell_y = _tmp13_;
 #line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp14_) {
-#line 5074 "Tree.c"
-		GtkTreePath* _tmp15_ = NULL;
+#line 5085 "Tree.c"
+		GtkTreePath* _tmp15_;
 #line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = path;
 #line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _tmp15_;
-#line 5080 "Tree.c"
+#line 5091 "Tree.c"
 	} else {
 #line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = NULL;
-#line 5084 "Tree.c"
+#line 5095 "Tree.c"
 	}
 #line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = _gtk_tree_path_copy0 (_tmp8_);
@@ -5090,7 +5101,7 @@ static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, GdkEven
 	_gtk_tree_path_free0 (path);
 #line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5094 "Tree.c"
+#line 5105 "Tree.c"
 }
 
 
@@ -5098,17 +5109,17 @@ static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) {
 	GtkTreePath* result = NULL;
 	GtkTreeModel* model = NULL;
 	GList* rows = NULL;
-	GtkTreeSelection* _tmp0_ = NULL;
+	GtkTreeSelection* _tmp0_;
 	GtkTreeModel* _tmp1_ = NULL;
-	GList* _tmp2_ = NULL;
-	GtkTreeModel* _tmp3_ = NULL;
+	GList* _tmp2_;
+	GtkTreeModel* _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	GList* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
+	GList* _tmp5_;
+	guint _tmp6_;
 	GtkTreePath* _tmp9_ = NULL;
-	GList* _tmp10_ = NULL;
-	guint _tmp11_ = 0U;
-	GtkTreePath* _tmp14_ = NULL;
+	GList* _tmp10_;
+	guint _tmp11_;
+	GtkTreePath* _tmp14_;
 #line 807 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
 #line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5131,17 +5142,17 @@ static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) {
 	if (_tmp6_ == ((guint) 0)) {
 #line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = TRUE;
-#line 5135 "Tree.c"
+#line 5146 "Tree.c"
 	} else {
-		GList* _tmp7_ = NULL;
-		guint _tmp8_ = 0U;
+		GList* _tmp7_;
+		guint _tmp8_;
 #line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = rows;
 #line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = g_list_length (_tmp7_);
 #line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = _tmp8_ == ((guint) 1);
-#line 5145 "Tree.c"
+#line 5156 "Tree.c"
 	}
 #line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp4_, "rows.length() == 0 || rows.length() == 1");
@@ -5151,20 +5162,20 @@ static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) {
 	_tmp11_ = g_list_length (_tmp10_);
 #line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp11_ != ((guint) 0)) {
-#line 5155 "Tree.c"
-		GList* _tmp12_ = NULL;
-		gconstpointer _tmp13_ = NULL;
+#line 5166 "Tree.c"
+		GList* _tmp12_;
+		gconstpointer _tmp13_;
 #line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = rows;
 #line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = g_list_nth_data (_tmp12_, (guint) 0);
 #line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = (GtkTreePath*) _tmp13_;
-#line 5164 "Tree.c"
+#line 5175 "Tree.c"
 	} else {
 #line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = NULL;
-#line 5168 "Tree.c"
+#line 5179 "Tree.c"
 	}
 #line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = _gtk_tree_path_copy0 (_tmp9_);
@@ -5176,24 +5187,24 @@ static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) {
 	_g_object_unref0 (model);
 #line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5180 "Tree.c"
+#line 5191 "Tree.c"
 }
 
 
 static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) {
 	gboolean result = FALSE;
 	GList* rows = NULL;
-	GtkTreeSelection* _tmp0_ = NULL;
-	GList* _tmp1_ = NULL;
-	GList* _tmp2_ = NULL;
+	GtkTreeSelection* _tmp0_;
+	GList* _tmp1_;
+	GList* _tmp2_;
 	GtkTreePath* path = NULL;
-	GList* _tmp3_ = NULL;
-	gconstpointer _tmp4_ = NULL;
-	GtkTreePath* _tmp5_ = NULL;
-	GtkTreePath* _tmp6_ = NULL;
-	GtkTreePath* _tmp7_ = NULL;
-	GtkTreePath* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	GList* _tmp3_;
+	gconstpointer _tmp4_;
+	GtkTreePath* _tmp5_;
+	GtkTreePath* _tmp6_;
+	GtkTreePath* _tmp7_;
+	GtkTreePath* _tmp8_;
+	gboolean _tmp9_;
 #line 815 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 816 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5212,7 +5223,7 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) {
 		__g_list_free__gtk_tree_path_free0_0 (rows);
 #line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5216 "Tree.c"
+#line 5227 "Tree.c"
 	}
 #line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = rows;
@@ -5234,7 +5245,7 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) {
 		__g_list_free__gtk_tree_path_free0_0 (rows);
 #line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5238 "Tree.c"
+#line 5249 "Tree.c"
 	}
 #line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = path;
@@ -5252,34 +5263,34 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) {
 	__g_list_free__gtk_tree_path_free0_0 (rows);
 #line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5256 "Tree.c"
+#line 5267 "Tree.c"
 }
 
 
 static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath* path, GdkEventButton* event) {
 	gboolean result = FALSE;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	GtkTreePath* _tmp0_ = NULL;
-	SidebarTreeEntryWrapper* _tmp1_ = NULL;
-	SidebarTreeEntryWrapper* _tmp2_ = NULL;
+	GtkTreePath* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp1_;
+	SidebarTreeEntryWrapper* _tmp2_;
 	SidebarContextable* contextable = NULL;
-	SidebarTreeEntryWrapper* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	SidebarContextable* _tmp5_ = NULL;
-	SidebarContextable* _tmp6_ = NULL;
+	SidebarTreeEntryWrapper* _tmp3_;
+	SidebarEntry* _tmp4_;
+	SidebarContextable* _tmp5_;
+	SidebarContextable* _tmp6_;
 	SidebarSelectableEntry* selectable = NULL;
-	SidebarTreeEntryWrapper* _tmp7_ = NULL;
-	SidebarEntry* _tmp8_ = NULL;
-	SidebarSelectableEntry* _tmp9_ = NULL;
-	SidebarSelectableEntry* _tmp10_ = NULL;
+	SidebarTreeEntryWrapper* _tmp7_;
+	SidebarEntry* _tmp8_;
+	SidebarSelectableEntry* _tmp9_;
+	SidebarSelectableEntry* _tmp10_;
 	GtkMenu* context_menu = NULL;
-	SidebarContextable* _tmp12_ = NULL;
-	GdkEventButton* _tmp13_ = NULL;
-	GtkMenu* _tmp14_ = NULL;
-	GtkMenu* _tmp15_ = NULL;
-	GtkMenu* _tmp16_ = NULL;
-	GtkWidget* _tmp17_ = NULL;
-	GdkEventButton* _tmp19_ = NULL;
+	SidebarContextable* _tmp12_;
+	GdkEventButton* _tmp13_;
+	GtkMenu* _tmp14_;
+	GtkMenu* _tmp15_;
+	GtkMenu* _tmp16_;
+	GtkWidget* _tmp17_;
+	GdkEventButton* _tmp19_;
 #line 829 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 829 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5300,7 +5311,7 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 		_g_object_unref0 (wrapper);
 #line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5304 "Tree.c"
+#line 5315 "Tree.c"
 	}
 #line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
@@ -5322,7 +5333,7 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 		_g_object_unref0 (wrapper);
 #line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5326 "Tree.c"
+#line 5337 "Tree.c"
 	}
 #line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = wrapper;
@@ -5336,13 +5347,13 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 	_tmp10_ = selectable;
 #line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp10_ != NULL) {
-#line 5340 "Tree.c"
-		SidebarSelectableEntry* _tmp11_ = NULL;
+#line 5351 "Tree.c"
+		SidebarSelectableEntry* _tmp11_;
 #line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = selectable;
 #line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_emit_by_name (self, "entry-selected", _tmp11_);
-#line 5346 "Tree.c"
+		g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL], 0, _tmp11_);
+#line 5357 "Tree.c"
 	}
 #line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = contextable;
@@ -5368,7 +5379,7 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 		_g_object_unref0 (wrapper);
 #line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5372 "Tree.c"
+#line 5383 "Tree.c"
 	}
 #line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = context_menu;
@@ -5376,24 +5387,24 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 	_tmp17_ = gtk_menu_get_attach_widget (_tmp16_);
 #line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp17_ == NULL) {
-#line 5380 "Tree.c"
-		GtkMenu* _tmp18_ = NULL;
+#line 5391 "Tree.c"
+		GtkMenu* _tmp18_;
 #line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp18_ = context_menu;
 #line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_menu_attach_to_widget (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
-#line 5386 "Tree.c"
+#line 5397 "Tree.c"
 	}
 #line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = event;
 #line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp19_ != NULL) {
-#line 5392 "Tree.c"
-		GtkMenu* _tmp20_ = NULL;
-		GdkEventButton* _tmp21_ = NULL;
-		guint _tmp22_ = 0U;
-		GdkEventButton* _tmp23_ = NULL;
-		guint32 _tmp24_ = 0U;
+#line 5403 "Tree.c"
+		GtkMenu* _tmp20_;
+		GdkEventButton* _tmp21_;
+		guint _tmp22_;
+		GdkEventButton* _tmp23_;
+		guint32 _tmp24_;
 #line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp20_ = context_menu;
 #line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5406,17 +5417,17 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 		_tmp24_ = _tmp23_->time;
 #line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_menu_popup (_tmp20_, NULL, NULL, NULL, NULL, _tmp22_, _tmp24_);
-#line 5410 "Tree.c"
+#line 5421 "Tree.c"
 	} else {
-		GtkMenu* _tmp25_ = NULL;
-		guint32 _tmp26_ = 0U;
+		GtkMenu* _tmp25_;
+		guint32 _tmp26_;
 #line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = context_menu;
 #line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp26_ = gtk_get_current_event_time ();
 #line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_menu_popup (_tmp25_, NULL, NULL, NULL, NULL, (guint) 0, _tmp26_);
-#line 5420 "Tree.c"
+#line 5431 "Tree.c"
 	}
 #line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
@@ -5430,17 +5441,17 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 	_g_object_unref0 (wrapper);
 #line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5434 "Tree.c"
+#line 5445 "Tree.c"
 }
 
 
 static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-	GtkMenu* _tmp0_ = NULL;
-	GdkEventButton* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	GdkEventButton* _tmp3_ = NULL;
-	guint32 _tmp4_ = 0U;
+	GtkMenu* _tmp0_;
+	GdkEventButton* _tmp1_;
+	guint _tmp2_;
+	GdkEventButton* _tmp3_;
+	guint32 _tmp4_;
 #line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5461,23 +5472,23 @@ static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self, GdkE
 	result = TRUE;
 #line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5465 "Tree.c"
+#line 5476 "Tree.c"
 }
 
 
 gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTreePath* path) {
 	gboolean result = FALSE;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	GtkTreeIter _tmp0_ = {0};
-	SidebarTreeEntryWrapper* _tmp1_ = NULL;
-	SidebarTreeEntryWrapper* _tmp2_ = NULL;
+	GtkTreeIter _tmp0_;
+	SidebarTreeEntryWrapper* _tmp1_;
+	SidebarTreeEntryWrapper* _tmp2_;
 	gboolean should_allow_toggle = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp3_;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-	GtkTreePath* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	gboolean _tmp16_ = FALSE;
+	GtkTreePath* _tmp6_;
+	gboolean _tmp7_;
+	gboolean _tmp16_;
 #line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5500,7 +5511,7 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 		_g_object_unref0 (wrapper);
 #line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5504 "Tree.c"
+#line 5515 "Tree.c"
 	}
 #line 872 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->expander_called_manually;
@@ -5514,10 +5525,10 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 	_tmp7_ = gtk_tree_view_row_expanded (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp6_);
 #line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_) {
-#line 5518 "Tree.c"
-		GtkTreeStore* _tmp8_ = NULL;
-		GtkTreeIter _tmp9_ = {0};
-		gboolean _tmp10_ = FALSE;
+#line 5529 "Tree.c"
+		GtkTreeStore* _tmp8_;
+		GtkTreeIter _tmp9_;
+		gboolean _tmp10_;
 #line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = self->priv->store;
 #line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5526,34 +5537,34 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 		_tmp10_ = gtk_tree_model_iter_has_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp9_);
 #line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp10_;
-#line 5530 "Tree.c"
+#line 5541 "Tree.c"
 	} else {
 #line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = FALSE;
-#line 5534 "Tree.c"
+#line 5545 "Tree.c"
 	}
 #line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_) {
-#line 5538 "Tree.c"
-		SidebarTreeEntryWrapper* _tmp11_ = NULL;
-		SidebarEntry* _tmp12_ = NULL;
+#line 5549 "Tree.c"
+		SidebarTreeEntryWrapper* _tmp11_;
+		SidebarEntry* _tmp12_;
 #line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = wrapper;
 #line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = _tmp11_->entry;
 #line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_SELECTABLE_ENTRY);
-#line 5547 "Tree.c"
+#line 5558 "Tree.c"
 	} else {
 #line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = FALSE;
-#line 5551 "Tree.c"
+#line 5562 "Tree.c"
 	}
 #line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 5555 "Tree.c"
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
+#line 5566 "Tree.c"
+		gint _tmp13_;
+		gint _tmp14_;
 #line 880 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = self->priv->expander_special_count;
 #line 880 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5568,19 +5579,19 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 			_g_object_unref0 (wrapper);
 #line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return result;
-#line 5572 "Tree.c"
+#line 5583 "Tree.c"
 		} else {
-			gboolean _tmp15_ = FALSE;
+			gboolean _tmp15_;
 #line 886 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = should_allow_toggle;
 #line 886 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			should_allow_toggle = !_tmp15_;
-#line 5579 "Tree.c"
+#line 5590 "Tree.c"
 		}
 	} else {
 #line 890 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->expander_special_count = 0;
-#line 5584 "Tree.c"
+#line 5595 "Tree.c"
 	}
 #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = should_allow_toggle;
@@ -5592,7 +5603,7 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 		_g_object_unref0 (wrapper);
 #line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5596 "Tree.c"
+#line 5607 "Tree.c"
 	}
 #line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
@@ -5600,7 +5611,7 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 	_g_object_unref0 (wrapper);
 #line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5604 "Tree.c"
+#line 5615 "Tree.c"
 }
 
 
@@ -5608,15 +5619,15 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 	SidebarTree * self;
 	gboolean result = FALSE;
 	GtkTreePath* path = NULL;
-	GdkEventButton* _tmp0_ = NULL;
-	GtkTreePath* _tmp1_ = NULL;
+	GdkEventButton* _tmp0_;
+	GtkTreePath* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	GtkTreePath* _tmp3_ = NULL;
+	GtkTreePath* _tmp3_;
 	gboolean _tmp6_ = FALSE;
-	GdkEventButton* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
-	GdkEventButton* _tmp58_ = NULL;
-	gboolean _tmp59_ = FALSE;
+	GdkEventButton* _tmp7_;
+	guint _tmp8_;
+	GdkEventButton* _tmp58_;
+	gboolean _tmp59_;
 #line 900 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
 #line 900 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5631,20 +5642,20 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 	_tmp3_ = path;
 #line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 5635 "Tree.c"
-		GdkEventButton* _tmp4_ = NULL;
-		guint _tmp5_ = 0U;
+#line 5646 "Tree.c"
+		GdkEventButton* _tmp4_;
+		guint _tmp5_;
 #line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = event;
 #line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp4_->button;
 #line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _tmp5_ != ((guint) 3);
-#line 5644 "Tree.c"
+#line 5655 "Tree.c"
 	} else {
 #line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = FALSE;
-#line 5648 "Tree.c"
+#line 5659 "Tree.c"
 	}
 #line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_) {
@@ -5654,7 +5665,7 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 		_gtk_tree_path_free0 (path);
 #line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5658 "Tree.c"
+#line 5669 "Tree.c"
 	}
 #line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = event;
@@ -5662,99 +5673,99 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 	_tmp8_ = _tmp7_->button;
 #line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp8_ == ((guint) 3)) {
-#line 5666 "Tree.c"
-		GdkEventButton* _tmp9_ = NULL;
-		GdkEventType _tmp10_ = 0;
+#line 5677 "Tree.c"
+		GdkEventButton* _tmp9_;
+		GdkEventType _tmp10_;
 #line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = event;
 #line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = _tmp9_->type;
 #line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _tmp10_ == GDK_BUTTON_PRESS;
-#line 5675 "Tree.c"
+#line 5686 "Tree.c"
 	} else {
 #line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = FALSE;
-#line 5679 "Tree.c"
+#line 5690 "Tree.c"
 	}
 #line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_) {
-#line 5683 "Tree.c"
-		GtkTreePath* _tmp11_ = NULL;
+#line 5694 "Tree.c"
+		GtkTreePath* _tmp11_;
 #line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = path;
 #line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_ != NULL) {
-#line 5689 "Tree.c"
-			GtkTreePath* _tmp12_ = NULL;
-			GdkEventButton* _tmp13_ = NULL;
+#line 5700 "Tree.c"
+			GtkTreePath* _tmp12_;
+			GdkEventButton* _tmp13_;
 #line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = path;
 #line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = event;
 #line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_popup_context_menu (self, _tmp12_, _tmp13_);
-#line 5698 "Tree.c"
+#line 5709 "Tree.c"
 		} else {
-			GdkEventButton* _tmp14_ = NULL;
+			GdkEventButton* _tmp14_;
 #line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = event;
 #line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_popup_default_context_menu (self, _tmp14_);
-#line 5705 "Tree.c"
+#line 5716 "Tree.c"
 		}
 	} else {
 		gboolean _tmp15_ = FALSE;
-		GdkEventButton* _tmp16_ = NULL;
-		guint _tmp17_ = 0U;
+		GdkEventButton* _tmp16_;
+		guint _tmp17_;
 #line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = event;
 #line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp17_ = _tmp16_->button;
 #line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp17_ == ((guint) 1)) {
-#line 5717 "Tree.c"
-			GdkEventButton* _tmp18_ = NULL;
-			GdkEventType _tmp19_ = 0;
+#line 5728 "Tree.c"
+			GdkEventButton* _tmp18_;
+			GdkEventType _tmp19_;
 #line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = event;
 #line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = _tmp18_->type;
 #line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = _tmp19_ == GDK_BUTTON_PRESS;
-#line 5726 "Tree.c"
+#line 5737 "Tree.c"
 		} else {
 #line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = FALSE;
-#line 5730 "Tree.c"
+#line 5741 "Tree.c"
 		}
 #line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp15_) {
-#line 5734 "Tree.c"
-			GtkTreePath* _tmp20_ = NULL;
+#line 5745 "Tree.c"
+			GtkTreePath* _tmp20_;
 			SidebarTreeEntryWrapper* wrapper = NULL;
-			GtkTreePath* _tmp23_ = NULL;
-			SidebarTreeEntryWrapper* _tmp24_ = NULL;
-			SidebarTreeEntryWrapper* _tmp25_ = NULL;
+			GtkTreePath* _tmp23_;
+			SidebarTreeEntryWrapper* _tmp24_;
+			SidebarTreeEntryWrapper* _tmp25_;
 			gboolean _tmp28_ = FALSE;
-			SidebarTreeEntryWrapper* _tmp29_ = NULL;
-			SidebarEntry* _tmp30_ = NULL;
+			SidebarTreeEntryWrapper* _tmp29_;
+			SidebarEntry* _tmp30_;
 			gboolean _tmp34_ = FALSE;
 			gboolean _tmp35_ = FALSE;
-			const GtkTreeRowReference* _tmp36_ = NULL;
+			const GtkTreeRowReference* _tmp36_;
 			gboolean _tmp48_ = FALSE;
-			SidebarTreeEntryWrapper* _tmp49_ = NULL;
-			SidebarEntry* _tmp50_ = NULL;
-			GtkTreeStore* _tmp55_ = NULL;
-			GtkTreePath* _tmp56_ = NULL;
-			GtkTreeRowReference* _tmp57_ = NULL;
+			SidebarTreeEntryWrapper* _tmp49_;
+			SidebarEntry* _tmp50_;
+			GtkTreeStore* _tmp55_;
+			GtkTreePath* _tmp56_;
+			GtkTreeRowReference* _tmp57_;
 #line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = path;
 #line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp20_ == NULL) {
-#line 5756 "Tree.c"
-				GdkEventButton* _tmp21_ = NULL;
-				gboolean _tmp22_ = FALSE;
+#line 5767 "Tree.c"
+				GdkEventButton* _tmp21_;
+				gboolean _tmp22_;
 #line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
 #line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5769,7 +5780,7 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 				_gtk_tree_path_free0 (path);
 #line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5773 "Tree.c"
+#line 5784 "Tree.c"
 			}
 #line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp23_ = path;
@@ -5781,9 +5792,9 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 			_tmp25_ = wrapper;
 #line 922 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp25_ == NULL) {
-#line 5785 "Tree.c"
-				GdkEventButton* _tmp26_ = NULL;
-				gboolean _tmp27_ = FALSE;
+#line 5796 "Tree.c"
+				GdkEventButton* _tmp26_;
+				gboolean _tmp27_;
 #line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
 #line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5800,7 +5811,7 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 				_gtk_tree_path_free0 (path);
 #line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5804 "Tree.c"
+#line 5815 "Tree.c"
 			}
 #line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp29_ = wrapper;
@@ -5810,36 +5821,36 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, SIDEBAR_TYPE_EXPANDABLE_ENTRY)) {
 #line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp28_ = TRUE;
-#line 5814 "Tree.c"
+#line 5825 "Tree.c"
 			} else {
-				SidebarTreeEntryWrapper* _tmp31_ = NULL;
-				SidebarEntry* _tmp32_ = NULL;
+				SidebarTreeEntryWrapper* _tmp31_;
+				SidebarEntry* _tmp32_;
 #line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp31_ = wrapper;
 #line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp32_ = _tmp31_->entry;
 #line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY);
-#line 5824 "Tree.c"
+#line 5835 "Tree.c"
 			}
 #line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp28_) {
-#line 5828 "Tree.c"
-				GtkTreePath* _tmp33_ = NULL;
+#line 5839 "Tree.c"
+				GtkTreePath* _tmp33_;
 #line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp33_ = path;
 #line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				sidebar_tree_toggle_branch_expansion (self, _tmp33_, FALSE);
-#line 5834 "Tree.c"
+#line 5845 "Tree.c"
 			}
 #line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp36_ = self->priv->old_path_ref;
 #line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp36_ != NULL) {
-#line 5840 "Tree.c"
-				const GtkTreeRowReference* _tmp37_ = NULL;
-				GtkTreePath* _tmp38_ = NULL;
-				GtkTreePath* _tmp39_ = NULL;
+#line 5851 "Tree.c"
+				const GtkTreeRowReference* _tmp37_;
+				GtkTreePath* _tmp38_;
+				GtkTreePath* _tmp39_;
 #line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp37_ = self->priv->old_path_ref;
 #line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5850,20 +5861,20 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 				_tmp35_ = _tmp39_ != NULL;
 #line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (_tmp39_);
-#line 5854 "Tree.c"
+#line 5865 "Tree.c"
 			} else {
 #line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp35_ = FALSE;
-#line 5858 "Tree.c"
+#line 5869 "Tree.c"
 			}
 #line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp35_) {
-#line 5862 "Tree.c"
-				const GtkTreeRowReference* _tmp40_ = NULL;
-				GtkTreePath* _tmp41_ = NULL;
-				GtkTreePath* _tmp42_ = NULL;
-				GtkTreePath* _tmp43_ = NULL;
-				gint _tmp44_ = 0;
+#line 5873 "Tree.c"
+				const GtkTreeRowReference* _tmp40_;
+				GtkTreePath* _tmp41_;
+				GtkTreePath* _tmp42_;
+				GtkTreePath* _tmp43_;
+				gint _tmp44_;
 #line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp40_ = self->priv->old_path_ref;
 #line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5878,18 +5889,18 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 				_tmp34_ = _tmp44_ == 0;
 #line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (_tmp42_);
-#line 5882 "Tree.c"
+#line 5893 "Tree.c"
 			} else {
 #line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp34_ = FALSE;
-#line 5886 "Tree.c"
+#line 5897 "Tree.c"
 			}
 #line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp34_) {
-#line 5890 "Tree.c"
-				GtkCellRendererText* _tmp45_ = NULL;
-				GdkEventButton* _tmp46_ = NULL;
-				gboolean _tmp47_ = FALSE;
+#line 5901 "Tree.c"
+				GtkCellRendererText* _tmp45_;
+				GdkEventButton* _tmp46_;
+				gboolean _tmp47_;
 #line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp45_ = self->priv->text_renderer;
 #line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5906,7 +5917,7 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 				_gtk_tree_path_free0 (path);
 #line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5910 "Tree.c"
+#line 5921 "Tree.c"
 			}
 #line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = wrapper;
@@ -5914,10 +5925,10 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 			_tmp50_ = _tmp49_->entry;
 #line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp50_, SIDEBAR_TYPE_RENAMEABLE_ENTRY)) {
-#line 5918 "Tree.c"
-				SidebarTreeEntryWrapper* _tmp51_ = NULL;
-				SidebarEntry* _tmp52_ = NULL;
-				gboolean _tmp53_ = FALSE;
+#line 5929 "Tree.c"
+				SidebarTreeEntryWrapper* _tmp51_;
+				SidebarEntry* _tmp52_;
+				gboolean _tmp53_;
 #line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp51_ = wrapper;
 #line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5926,21 +5937,21 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 				_tmp53_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
 #line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp48_ = _tmp53_;
-#line 5930 "Tree.c"
+#line 5941 "Tree.c"
 			} else {
 #line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp48_ = FALSE;
-#line 5934 "Tree.c"
+#line 5945 "Tree.c"
 			}
 #line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp48_) {
-#line 5938 "Tree.c"
-				GtkCellRendererText* _tmp54_ = NULL;
+#line 5949 "Tree.c"
+				GtkCellRendererText* _tmp54_;
 #line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp54_ = self->priv->text_renderer;
 #line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				g_object_set (_tmp54_, "editable", TRUE, NULL);
-#line 5944 "Tree.c"
+#line 5955 "Tree.c"
 			}
 #line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp55_ = self->priv->store;
@@ -5954,7 +5965,7 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 			self->priv->old_path_ref = _tmp57_;
 #line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 5958 "Tree.c"
+#line 5969 "Tree.c"
 		}
 	}
 #line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5967,16 +5978,16 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 	_gtk_tree_path_free0 (path);
 #line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5971 "Tree.c"
+#line 5982 "Tree.c"
 }
 
 
 gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	GdkEventKey* _tmp0_;
+	guint _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
 	GQuark _tmp5_ = 0U;
 #line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label0 = 0;
@@ -6004,27 +6015,27 @@ gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* e
 	if ((((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("F2")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("Delete"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("Return"))))) || (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("KP_Enter"))))) {
 #line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6008 "Tree.c"
+#line 6019 "Tree.c"
 			default:
 			{
 #line 963 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = TRUE;
 #line 963 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6015 "Tree.c"
+#line 6026 "Tree.c"
 			}
 		}
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6021 "Tree.c"
+#line 6032 "Tree.c"
 			default:
 			{
 #line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = FALSE;
 #line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6028 "Tree.c"
+#line 6039 "Tree.c"
 			}
 		}
 	}
@@ -6034,10 +6045,10 @@ gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* e
 static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
 	SidebarTree * self;
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	GdkEventKey* _tmp0_;
+	guint _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
 	GQuark _tmp5_ = 0U;
 #line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label0 = 0;
@@ -6047,9 +6058,9 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
 	static GQuark _tmp4_label2 = 0;
 #line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 6051 "Tree.c"
-	GdkEventKey* _tmp15_ = NULL;
-	gboolean _tmp16_ = FALSE;
+#line 6062 "Tree.c"
+	GdkEventKey* _tmp15_;
+	gboolean _tmp16_;
 #line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
 #line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6068,12 +6079,12 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
 	if ((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("Return")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("KP_Enter"))))) {
 #line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6072 "Tree.c"
+#line 6083 "Tree.c"
 			default:
 			{
 				GtkTreePath* path = NULL;
-				GtkTreePath* _tmp6_ = NULL;
-				GtkTreePath* _tmp7_ = NULL;
+				GtkTreePath* _tmp6_;
+				GtkTreePath* _tmp7_;
 #line 974 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp6_ = sidebar_tree_get_current_path (self);
 #line 974 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6082,13 +6093,13 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
 				_tmp7_ = path;
 #line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (_tmp7_ != NULL) {
-#line 6086 "Tree.c"
-					GtkTreePath* _tmp8_ = NULL;
+#line 6097 "Tree.c"
+					GtkTreePath* _tmp8_;
 #line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp8_ = path;
 #line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					sidebar_tree_toggle_branch_expansion (self, _tmp8_, FALSE);
-#line 6092 "Tree.c"
+#line 6103 "Tree.c"
 				}
 #line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = TRUE;
@@ -6096,35 +6107,35 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
 				_gtk_tree_path_free0 (path);
 #line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6100 "Tree.c"
+#line 6111 "Tree.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("F2")))) {
 #line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6106 "Tree.c"
+#line 6117 "Tree.c"
 			default:
 			{
-				gboolean _tmp9_ = FALSE;
+				gboolean _tmp9_;
 #line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp9_ = sidebar_tree_rename_in_place (self);
 #line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp9_;
 #line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6116 "Tree.c"
+#line 6127 "Tree.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("Delete")))) {
 #line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6122 "Tree.c"
+#line 6133 "Tree.c"
 			default:
 			{
 				GtkTreePath* path = NULL;
-				GtkTreePath* _tmp10_ = NULL;
+				GtkTreePath* _tmp10_;
 				gboolean _tmp11_ = FALSE;
-				GtkTreePath* _tmp12_ = NULL;
+				GtkTreePath* _tmp12_;
 #line 984 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp10_ = sidebar_tree_get_current_path (self);
 #line 984 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6133,20 +6144,20 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
 				_tmp12_ = path;
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (_tmp12_ != NULL) {
-#line 6137 "Tree.c"
-					GtkTreePath* _tmp13_ = NULL;
-					gboolean _tmp14_ = FALSE;
+#line 6148 "Tree.c"
+					GtkTreePath* _tmp13_;
+					gboolean _tmp14_;
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp13_ = path;
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp14_ = sidebar_tree_destroy_path (self, _tmp13_);
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp11_ = _tmp14_;
-#line 6146 "Tree.c"
+#line 6157 "Tree.c"
 				} else {
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp11_ = FALSE;
-#line 6150 "Tree.c"
+#line 6161 "Tree.c"
 				}
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp11_;
@@ -6154,7 +6165,7 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
 				_gtk_tree_path_free0 (path);
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6158 "Tree.c"
+#line 6169 "Tree.c"
 			}
 		}
 	}
@@ -6166,17 +6177,17 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
 	result = _tmp16_;
 #line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6170 "Tree.c"
+#line 6181 "Tree.c"
 }
 
 
 gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* entry) {
 	gboolean result = FALSE;
-	SidebarEntry* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	SidebarEntry* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	SidebarEntry* _tmp0_;
+	gboolean _tmp1_;
+	SidebarEntry* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 #line 992 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 992 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6191,7 +6202,7 @@ gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* en
 		result = FALSE;
 #line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6195 "Tree.c"
+#line 6206 "Tree.c"
 	}
 #line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = entry;
@@ -6203,7 +6214,7 @@ gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* en
 		result = FALSE;
 #line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6207 "Tree.c"
+#line 6218 "Tree.c"
 	}
 #line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_rename_in_place (self);
@@ -6211,7 +6222,7 @@ gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* en
 	result = _tmp4_;
 #line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6215 "Tree.c"
+#line 6226 "Tree.c"
 }
 
 
@@ -6221,9 +6232,9 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) {
 	GtkTreeViewColumn* cursor_column = NULL;
 	GtkTreePath* _tmp0_ = NULL;
 	GtkTreeViewColumn* _tmp1_ = NULL;
-	GtkTreeViewColumn* _tmp2_ = NULL;
-	GtkTreePath* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GtkTreeViewColumn* _tmp2_;
+	GtkTreePath* _tmp3_;
+	gboolean _tmp4_;
 #line 1002 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6244,10 +6255,10 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) {
 	_tmp4_ = sidebar_tree_can_rename_path (self, _tmp3_);
 #line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 6248 "Tree.c"
-		GtkTreePath* _tmp5_ = NULL;
-		GtkTreeViewColumn* _tmp6_ = NULL;
-		GtkCellRendererText* _tmp7_ = NULL;
+#line 6259 "Tree.c"
+		GtkTreePath* _tmp5_;
+		GtkTreeViewColumn* _tmp6_;
+		GtkCellRendererText* _tmp7_;
 #line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = cursor_path;
 #line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6264,7 +6275,7 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) {
 		_gtk_tree_path_free0 (cursor_path);
 #line 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6268 "Tree.c"
+#line 6279 "Tree.c"
 	}
 #line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
@@ -6274,19 +6285,19 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) {
 	_gtk_tree_path_free0 (cursor_path);
 #line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6278 "Tree.c"
+#line 6289 "Tree.c"
 }
 
 
 gboolean sidebar_tree_scroll_to_entry (SidebarTree* self, SidebarEntry* entry) {
 	gboolean result = FALSE;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarTreeEntryWrapper* _tmp1_ = NULL;
-	SidebarTreeEntryWrapper* _tmp2_ = NULL;
-	SidebarTreeEntryWrapper* _tmp3_ = NULL;
-	GtkTreePath* _tmp4_ = NULL;
-	GtkTreePath* _tmp5_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp1_;
+	SidebarTreeEntryWrapper* _tmp2_;
+	SidebarTreeEntryWrapper* _tmp3_;
+	GtkTreePath* _tmp4_;
+	GtkTreePath* _tmp5_;
 #line 1016 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 1016 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6307,7 +6318,7 @@ gboolean sidebar_tree_scroll_to_entry (SidebarTree* self, SidebarEntry* entry) {
 		_g_object_unref0 (wrapper);
 #line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6311 "Tree.c"
+#line 6322 "Tree.c"
 	}
 #line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
@@ -6325,17 +6336,17 @@ gboolean sidebar_tree_scroll_to_entry (SidebarTree* self, SidebarEntry* entry) {
 	_g_object_unref0 (wrapper);
 #line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6329 "Tree.c"
+#line 6340 "Tree.c"
 }
 
 
 static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time) {
 	SidebarTree * self;
 	SidebarInternalDragSourceEntry* drag_source = NULL;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarInternalDragSourceEntry* _tmp6_ = NULL;
-	SidebarInternalDragSourceEntry* _tmp16_ = NULL;
-	GtkSelectionData* _tmp17_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarInternalDragSourceEntry* _tmp6_;
+	SidebarInternalDragSourceEntry* _tmp16_;
+	GtkSelectionData* _tmp17_;
 #line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
 #line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6348,11 +6359,11 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 	_tmp0_ = self->priv->internal_drag_source_entry;
 #line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ != NULL) {
-#line 6352 "Tree.c"
+#line 6363 "Tree.c"
 		SidebarSelectableEntry* selectable = NULL;
-		SidebarEntry* _tmp1_ = NULL;
-		SidebarSelectableEntry* _tmp2_ = NULL;
-		SidebarSelectableEntry* _tmp3_ = NULL;
+		SidebarEntry* _tmp1_;
+		SidebarSelectableEntry* _tmp2_;
+		SidebarSelectableEntry* _tmp3_;
 #line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = self->priv->internal_drag_source_entry;
 #line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6363,9 +6374,9 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 		_tmp3_ = selectable;
 #line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp3_ == NULL) {
-#line 6367 "Tree.c"
-			SidebarEntry* _tmp4_ = NULL;
-			SidebarInternalDragSourceEntry* _tmp5_ = NULL;
+#line 6378 "Tree.c"
+			SidebarEntry* _tmp4_;
+			SidebarInternalDragSourceEntry* _tmp5_;
 #line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp4_ = self->priv->internal_drag_source_entry;
 #line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6374,28 +6385,28 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 			_g_object_unref0 (drag_source);
 #line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			drag_source = _tmp5_;
-#line 6378 "Tree.c"
+#line 6389 "Tree.c"
 		}
 #line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selectable);
-#line 6382 "Tree.c"
+#line 6393 "Tree.c"
 	}
 #line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = drag_source;
 #line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 6388 "Tree.c"
+#line 6399 "Tree.c"
 		GtkTreePath* selected_path = NULL;
-		GtkTreePath* _tmp7_ = NULL;
-		GtkTreePath* _tmp8_ = NULL;
+		GtkTreePath* _tmp7_;
+		GtkTreePath* _tmp8_;
 		SidebarTreeEntryWrapper* wrapper = NULL;
-		GtkTreePath* _tmp9_ = NULL;
-		SidebarTreeEntryWrapper* _tmp10_ = NULL;
-		SidebarTreeEntryWrapper* _tmp11_ = NULL;
-		SidebarTreeEntryWrapper* _tmp12_ = NULL;
-		SidebarEntry* _tmp13_ = NULL;
-		SidebarInternalDragSourceEntry* _tmp14_ = NULL;
-		SidebarInternalDragSourceEntry* _tmp15_ = NULL;
+		GtkTreePath* _tmp9_;
+		SidebarTreeEntryWrapper* _tmp10_;
+		SidebarTreeEntryWrapper* _tmp11_;
+		SidebarTreeEntryWrapper* _tmp12_;
+		SidebarEntry* _tmp13_;
+		SidebarInternalDragSourceEntry* _tmp14_;
+		SidebarInternalDragSourceEntry* _tmp15_;
 #line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = sidebar_tree_get_selected_path (self);
 #line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6410,7 +6421,7 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 			_g_object_unref0 (drag_source);
 #line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6414 "Tree.c"
+#line 6425 "Tree.c"
 		}
 #line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = selected_path;
@@ -6430,7 +6441,7 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 			_g_object_unref0 (drag_source);
 #line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6434 "Tree.c"
+#line 6445 "Tree.c"
 		}
 #line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = wrapper;
@@ -6454,13 +6465,13 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 			_g_object_unref0 (drag_source);
 #line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6458 "Tree.c"
+#line 6469 "Tree.c"
 		}
 #line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
 #line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (selected_path);
-#line 6464 "Tree.c"
+#line 6475 "Tree.c"
 	}
 #line 1052 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = drag_source;
@@ -6470,7 +6481,7 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 	sidebar_internal_drag_source_entry_prepare_selection_data (_tmp16_, _tmp17_);
 #line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (drag_source);
-#line 6474 "Tree.c"
+#line 6485 "Tree.c"
 }
 
 
@@ -6478,31 +6489,31 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 	SidebarTree * self;
 	GtkTreePath* path = NULL;
 	GtkTreeViewDropPosition pos = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	GtkTreePath* _tmp2_ = NULL;
 	GtkTreeViewDropPosition _tmp3_ = 0;
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp4_;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	GtkTreePath* _tmp14_ = NULL;
-	SidebarTreeEntryWrapper* _tmp15_ = NULL;
-	GdkDragContext* _tmp16_ = NULL;
-	GtkWidget* _tmp17_ = NULL;
-	SidebarTreeEntryWrapper* _tmp27_ = NULL;
+	GtkTreePath* _tmp14_;
+	SidebarTreeEntryWrapper* _tmp15_;
+	GdkDragContext* _tmp16_;
+	GtkWidget* _tmp17_;
+	SidebarTreeEntryWrapper* _tmp27_;
 	SidebarInternalDropTargetEntry* targetable = NULL;
-	SidebarTreeEntryWrapper* _tmp30_ = NULL;
-	SidebarEntry* _tmp31_ = NULL;
-	SidebarInternalDropTargetEntry* _tmp32_ = NULL;
-	SidebarInternalDropTargetEntry* _tmp33_ = NULL;
+	SidebarTreeEntryWrapper* _tmp30_;
+	SidebarEntry* _tmp31_;
+	SidebarInternalDropTargetEntry* _tmp32_;
+	SidebarInternalDropTargetEntry* _tmp33_;
 	gboolean success = FALSE;
-	GtkSelectionData* _tmp36_ = NULL;
-	GdkAtom _tmp37_ = 0U;
-	gchar* _tmp38_ = NULL;
-	gchar* _tmp39_ = NULL;
-	gboolean _tmp40_ = FALSE;
-	GdkDragContext* _tmp57_ = NULL;
-	gboolean _tmp58_ = FALSE;
-	guint _tmp59_ = 0U;
+	GtkSelectionData* _tmp36_;
+	GdkAtom _tmp37_;
+	gchar* _tmp38_;
+	gchar* _tmp39_;
+	gboolean _tmp40_;
+	GdkDragContext* _tmp57_;
+	gboolean _tmp58_;
+	guint _tmp59_;
 #line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
 #line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6523,22 +6534,22 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 	pos = _tmp3_;
 #line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp4_) {
-#line 6527 "Tree.c"
-		GdkDragContext* _tmp5_ = NULL;
-		GtkWidget* _tmp6_ = NULL;
+#line 6538 "Tree.c"
+		GdkDragContext* _tmp5_;
+		GtkWidget* _tmp6_;
 #line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = context;
 #line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = gtk_drag_get_source_widget (_tmp5_);
 #line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp6_ == NULL) {
-#line 6536 "Tree.c"
-			SidebarTreeExternalDropHandler _tmp7_ = NULL;
-			void* _tmp7__target = NULL;
-			GdkDragContext* _tmp8_ = NULL;
-			GtkSelectionData* _tmp9_ = NULL;
-			guint _tmp10_ = 0U;
-			guint _tmp11_ = 0U;
+#line 6547 "Tree.c"
+			SidebarTreeExternalDropHandler _tmp7_;
+			void* _tmp7__target;
+			GdkDragContext* _tmp8_;
+			GtkSelectionData* _tmp9_;
+			guint _tmp10_;
+			guint _tmp11_;
 #line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp7_ = self->priv->drop_handler;
 #line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6553,23 +6564,23 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 			_tmp11_ = time;
 #line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp7_ (_tmp8_, NULL, _tmp9_, _tmp10_, _tmp11_, _tmp7__target);
-#line 6557 "Tree.c"
+#line 6568 "Tree.c"
 		} else {
-			GdkDragContext* _tmp12_ = NULL;
-			guint _tmp13_ = 0U;
+			GdkDragContext* _tmp12_;
+			guint _tmp13_;
 #line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = context;
 #line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = time;
 #line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_drag_finish (_tmp12_, FALSE, FALSE, (guint32) _tmp13_);
-#line 6567 "Tree.c"
+#line 6578 "Tree.c"
 		}
 #line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
 #line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6573 "Tree.c"
+#line 6584 "Tree.c"
 	}
 #line 1071 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = path;
@@ -6583,33 +6594,33 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 	_tmp17_ = gtk_drag_get_source_widget (_tmp16_);
 #line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp17_ == NULL) {
-#line 6587 "Tree.c"
+#line 6598 "Tree.c"
 		SidebarEntry* _tmp18_ = NULL;
-		SidebarTreeEntryWrapper* _tmp19_ = NULL;
-		SidebarTreeExternalDropHandler _tmp22_ = NULL;
-		void* _tmp22__target = NULL;
-		GdkDragContext* _tmp23_ = NULL;
-		GtkSelectionData* _tmp24_ = NULL;
-		guint _tmp25_ = 0U;
-		guint _tmp26_ = 0U;
+		SidebarTreeEntryWrapper* _tmp19_;
+		SidebarTreeExternalDropHandler _tmp22_;
+		void* _tmp22__target;
+		GdkDragContext* _tmp23_;
+		GtkSelectionData* _tmp24_;
+		guint _tmp25_;
+		guint _tmp26_;
 #line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp19_ = wrapper;
 #line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp19_ != NULL) {
-#line 6600 "Tree.c"
-			SidebarTreeEntryWrapper* _tmp20_ = NULL;
-			SidebarEntry* _tmp21_ = NULL;
+#line 6611 "Tree.c"
+			SidebarTreeEntryWrapper* _tmp20_;
+			SidebarEntry* _tmp21_;
 #line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = wrapper;
 #line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = _tmp20_->entry;
 #line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = _tmp21_;
-#line 6609 "Tree.c"
+#line 6620 "Tree.c"
 		} else {
 #line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = NULL;
-#line 6613 "Tree.c"
+#line 6624 "Tree.c"
 		}
 #line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ = self->priv->drop_handler;
@@ -6631,15 +6642,15 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 		_gtk_tree_path_free0 (path);
 #line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6635 "Tree.c"
+#line 6646 "Tree.c"
 	}
 #line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = wrapper;
 #line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp27_ == NULL) {
-#line 6641 "Tree.c"
-		GdkDragContext* _tmp28_ = NULL;
-		guint _tmp29_ = 0U;
+#line 6652 "Tree.c"
+		GdkDragContext* _tmp28_;
+		guint _tmp29_;
 #line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp28_ = context;
 #line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6652,7 +6663,7 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 		_gtk_tree_path_free0 (path);
 #line 1085 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6656 "Tree.c"
+#line 6667 "Tree.c"
 	}
 #line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp30_ = wrapper;
@@ -6666,9 +6677,9 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 	_tmp33_ = targetable;
 #line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp33_ == NULL) {
-#line 6670 "Tree.c"
-		GdkDragContext* _tmp34_ = NULL;
-		guint _tmp35_ = 0U;
+#line 6681 "Tree.c"
+		GdkDragContext* _tmp34_;
+		guint _tmp35_;
 #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp34_ = context;
 #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6683,7 +6694,7 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 		_gtk_tree_path_free0 (path);
 #line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6687 "Tree.c"
+#line 6698 "Tree.c"
 	}
 #line 1095 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	success = FALSE;
@@ -6701,10 +6712,10 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 	_g_free0 (_tmp39_);
 #line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp40_) {
-#line 6705 "Tree.c"
-		SidebarInternalDropTargetEntry* _tmp41_ = NULL;
-		GtkSelectionData* _tmp42_ = NULL;
-		gboolean _tmp43_ = FALSE;
+#line 6716 "Tree.c"
+		SidebarInternalDropTargetEntry* _tmp41_;
+		GtkSelectionData* _tmp42_;
+		gboolean _tmp43_;
 #line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp41_ = targetable;
 #line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6713,16 +6724,16 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 		_tmp43_ = sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (_tmp41_, _tmp42_);
 #line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		success = _tmp43_;
-#line 6717 "Tree.c"
+#line 6728 "Tree.c"
 	} else {
 		GeeList* media = NULL;
-		GtkSelectionData* _tmp44_ = NULL;
-		guchar* _tmp45_ = NULL;
-		GtkSelectionData* _tmp46_ = NULL;
-		gint _tmp47_ = 0;
-		GeeList* _tmp48_ = NULL;
+		GtkSelectionData* _tmp44_;
+		guchar* _tmp45_;
+		GtkSelectionData* _tmp46_;
+		gint _tmp47_;
+		GeeList* _tmp48_;
 		gboolean _tmp49_ = FALSE;
-		GeeList* _tmp50_ = NULL;
+		GeeList* _tmp50_;
 #line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp44_ = selection_data;
 #line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6739,10 +6750,10 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 		_tmp50_ = media;
 #line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp50_ != NULL) {
-#line 6743 "Tree.c"
-			GeeList* _tmp51_ = NULL;
-			gint _tmp52_ = 0;
-			gint _tmp53_ = 0;
+#line 6754 "Tree.c"
+			GeeList* _tmp51_;
+			gint _tmp52_;
+			gint _tmp53_;
 #line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp51_ = media;
 #line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6751,18 +6762,18 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 			_tmp53_ = _tmp52_;
 #line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = _tmp53_ > 0;
-#line 6755 "Tree.c"
+#line 6766 "Tree.c"
 		} else {
 #line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = FALSE;
-#line 6759 "Tree.c"
+#line 6770 "Tree.c"
 		}
 #line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp49_) {
-#line 6763 "Tree.c"
-			SidebarInternalDropTargetEntry* _tmp54_ = NULL;
-			GeeList* _tmp55_ = NULL;
-			gboolean _tmp56_ = FALSE;
+#line 6774 "Tree.c"
+			SidebarInternalDropTargetEntry* _tmp54_;
+			GeeList* _tmp55_;
+			gboolean _tmp56_;
 #line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp54_ = targetable;
 #line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6771,11 +6782,11 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 			_tmp56_ = sidebar_internal_drop_target_entry_internal_drop_received (_tmp54_, _tmp55_);
 #line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			success = _tmp56_;
-#line 6775 "Tree.c"
+#line 6786 "Tree.c"
 		}
 #line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (media);
-#line 6779 "Tree.c"
+#line 6790 "Tree.c"
 	}
 #line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp57_ = context;
@@ -6791,31 +6802,31 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 	_g_object_unref0 (wrapper);
 #line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 6795 "Tree.c"
+#line 6806 "Tree.c"
 }
 
 
 static gboolean sidebar_tree_real_drag_motion (GtkWidget* base, GdkDragContext* context, gint x, gint y, guint time) {
 	SidebarTree * self;
 	gboolean result = FALSE;
-	GdkDragContext* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	guint _tmp3_ = 0U;
+	GdkDragContext* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	guint _tmp3_;
 	GtkTreePath* path = NULL;
 	GtkTreeViewDropPosition pos = 0;
 	gboolean has_dest = FALSE;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	gint _tmp4_;
+	gint _tmp5_;
 	GtkTreePath* _tmp6_ = NULL;
 	GtkTreeViewDropPosition _tmp7_ = 0;
-	gboolean _tmp8_ = FALSE;
+	gboolean _tmp8_;
 	gboolean _tmp9_ = FALSE;
-	gboolean _tmp10_ = FALSE;
-	GdkDragContext* _tmp15_ = NULL;
-	GdkDragContext* _tmp16_ = NULL;
-	GdkDragAction _tmp17_ = 0;
-	guint _tmp18_ = 0U;
+	gboolean _tmp10_;
+	GdkDragContext* _tmp15_;
+	GdkDragContext* _tmp16_;
+	GdkDragAction _tmp17_;
+	guint _tmp18_;
 #line 1109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
 #line 1109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6850,37 +6861,37 @@ static gboolean sidebar_tree_real_drag_motion (GtkWidget* base, GdkDragContext*
 	if (!_tmp10_) {
 #line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = TRUE;
-#line 6854 "Tree.c"
+#line 6865 "Tree.c"
 	} else {
-		GtkTreeViewDropPosition _tmp11_ = 0;
+		GtkTreeViewDropPosition _tmp11_;
 #line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = pos;
 #line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = _tmp11_ == GTK_TREE_VIEW_DROP_BEFORE;
-#line 6861 "Tree.c"
+#line 6872 "Tree.c"
 	}
 #line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp9_) {
-#line 6865 "Tree.c"
-		GtkTreePath* _tmp12_ = NULL;
+#line 6876 "Tree.c"
+		GtkTreePath* _tmp12_;
 #line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = path;
 #line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_view_set_drag_dest_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp12_, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
-#line 6871 "Tree.c"
+#line 6882 "Tree.c"
 	} else {
-		GtkTreeViewDropPosition _tmp13_ = 0;
+		GtkTreeViewDropPosition _tmp13_;
 #line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = pos;
 #line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp13_ == GTK_TREE_VIEW_DROP_AFTER) {
-#line 6878 "Tree.c"
-			GtkTreePath* _tmp14_ = NULL;
+#line 6889 "Tree.c"
+			GtkTreePath* _tmp14_;
 #line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = path;
 #line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_tree_view_set_drag_dest_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp14_, GTK_TREE_VIEW_DROP_INTO_OR_AFTER);
-#line 6884 "Tree.c"
+#line 6895 "Tree.c"
 		}
 	}
 #line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6899,26 +6910,26 @@ static gboolean sidebar_tree_real_drag_motion (GtkWidget* base, GdkDragContext*
 	_gtk_tree_path_free0 (path);
 #line 1125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6903 "Tree.c"
+#line 6914 "Tree.c"
 }
 
 
 static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* path) {
 	gboolean result = FALSE;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	GtkTreePath* _tmp1_ = NULL;
-	SidebarTreeEntryWrapper* _tmp2_ = NULL;
-	SidebarTreeEntryWrapper* _tmp3_ = NULL;
+	GtkTreePath* _tmp1_;
+	SidebarTreeEntryWrapper* _tmp2_;
+	SidebarTreeEntryWrapper* _tmp3_;
 	SidebarRenameableEntry* renameable = NULL;
-	SidebarTreeEntryWrapper* _tmp4_ = NULL;
-	SidebarEntry* _tmp5_ = NULL;
-	SidebarRenameableEntry* _tmp6_ = NULL;
-	SidebarRenameableEntry* _tmp7_ = NULL;
-	SidebarTreeEntryWrapper* _tmp8_ = NULL;
-	SidebarEntry* _tmp9_ = NULL;
-	GtkTreeSelection* _tmp10_ = NULL;
-	GtkTreePath* _tmp11_ = NULL;
+	SidebarTreeEntryWrapper* _tmp4_;
+	SidebarEntry* _tmp5_;
+	SidebarRenameableEntry* _tmp6_;
+	SidebarRenameableEntry* _tmp7_;
+	SidebarTreeEntryWrapper* _tmp8_;
+	SidebarEntry* _tmp9_;
+	GtkTreeSelection* _tmp10_;
+	GtkTreePath* _tmp11_;
 #line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6931,7 +6942,7 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
 		result = FALSE;
 #line 1131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6935 "Tree.c"
+#line 6946 "Tree.c"
 	}
 #line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = path;
@@ -6949,7 +6960,7 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
 		_g_object_unref0 (wrapper);
 #line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6953 "Tree.c"
+#line 6964 "Tree.c"
 	}
 #line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = wrapper;
@@ -6971,7 +6982,7 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
 		_g_object_unref0 (wrapper);
 #line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6975 "Tree.c"
+#line 6986 "Tree.c"
 	}
 #line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = wrapper;
@@ -6987,7 +6998,7 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
 		_g_object_unref0 (wrapper);
 #line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6991 "Tree.c"
+#line 7002 "Tree.c"
 	}
 #line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
@@ -7003,22 +7014,22 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
 	_g_object_unref0 (wrapper);
 #line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7007 "Tree.c"
+#line 7018 "Tree.c"
 }
 
 
 static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path) {
 	gboolean result = FALSE;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	GtkTreePath* _tmp0_ = NULL;
-	SidebarTreeEntryWrapper* _tmp1_ = NULL;
-	SidebarTreeEntryWrapper* _tmp2_ = NULL;
+	GtkTreePath* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp1_;
+	SidebarTreeEntryWrapper* _tmp2_;
 	SidebarDestroyableEntry* destroyable = NULL;
-	SidebarTreeEntryWrapper* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	SidebarDestroyableEntry* _tmp5_ = NULL;
-	SidebarDestroyableEntry* _tmp6_ = NULL;
-	SidebarDestroyableEntry* _tmp7_ = NULL;
+	SidebarTreeEntryWrapper* _tmp3_;
+	SidebarEntry* _tmp4_;
+	SidebarDestroyableEntry* _tmp5_;
+	SidebarDestroyableEntry* _tmp6_;
+	SidebarDestroyableEntry* _tmp7_;
 #line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7039,7 +7050,7 @@ static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path)
 		_g_object_unref0 (wrapper);
 #line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7043 "Tree.c"
+#line 7054 "Tree.c"
 	}
 #line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
@@ -7061,7 +7072,7 @@ static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path)
 		_g_object_unref0 (wrapper);
 #line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7065 "Tree.c"
+#line 7076 "Tree.c"
 	}
 #line 1158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = destroyable;
@@ -7075,14 +7086,14 @@ static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path)
 	_g_object_unref0 (wrapper);
 #line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7079 "Tree.c"
+#line 7090 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done (GtkCellEditable* _sender, gpointer self) {
 #line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_editing_done ((SidebarTree*) self);
-#line 7086 "Tree.c"
+#line 7097 "Tree.c"
 }
 
 
@@ -7091,12 +7102,12 @@ static gboolean _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event (G
 	result = sidebar_tree_on_editing_focus_out ((SidebarTree*) self, event);
 #line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7095 "Tree.c"
+#line 7106 "Tree.c"
 }
 
 
 static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable* editable, const gchar* path) {
-	GtkCellEditable* _tmp0_ = NULL;
+	GtkCellEditable* _tmp0_;
 #line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7107,12 +7118,12 @@ static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable*
 	_tmp0_ = editable;
 #line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_entry_get_type ())) {
-#line 7111 "Tree.c"
-		GtkCellEditable* _tmp1_ = NULL;
-		GtkEntry* _tmp2_ = NULL;
-		GtkEntry* _tmp3_ = NULL;
-		GtkEntry* _tmp4_ = NULL;
-		GtkEntry* _tmp5_ = NULL;
+#line 7122 "Tree.c"
+		GtkCellEditable* _tmp1_;
+		GtkEntry* _tmp2_;
+		GtkEntry* _tmp3_;
+		GtkEntry* _tmp4_;
+		GtkEntry* _tmp5_;
 #line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = editable;
 #line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7133,17 +7144,17 @@ static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable*
 		_tmp5_ = self->priv->text_entry;
 #line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_object_set (_tmp5_, "editable", TRUE, NULL);
-#line 7137 "Tree.c"
+#line 7148 "Tree.c"
 	}
 }
 
 
 static void sidebar_tree_on_editing_canceled (SidebarTree* self) {
-	GtkEntry* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	GtkEntry* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
+	GtkEntry* _tmp0_;
+	GtkEntry* _tmp1_;
+	guint _tmp2_;
+	GtkEntry* _tmp3_;
+	guint _tmp4_;
 #line 1172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7162,22 +7173,22 @@ static void sidebar_tree_on_editing_canceled (SidebarTree* self) {
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp4_, NULL, FALSE);
 #line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self);
-#line 7166 "Tree.c"
+#line 7177 "Tree.c"
 }
 
 
 static void sidebar_tree_on_editing_done (SidebarTree* self) {
-	GtkEntry* _tmp0_ = NULL;
+	GtkEntry* _tmp0_;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	GtkTreePath* _tmp1_ = NULL;
-	GtkTreePath* _tmp2_ = NULL;
-	SidebarTreeEntryWrapper* _tmp3_ = NULL;
-	SidebarTreeEntryWrapper* _tmp4_ = NULL;
-	SidebarTreeEntryWrapper* _tmp5_ = NULL;
-	GtkEntry* _tmp13_ = NULL;
-	guint _tmp14_ = 0U;
-	GtkEntry* _tmp15_ = NULL;
-	guint _tmp16_ = 0U;
+	GtkTreePath* _tmp1_;
+	GtkTreePath* _tmp2_;
+	SidebarTreeEntryWrapper* _tmp3_;
+	SidebarTreeEntryWrapper* _tmp4_;
+	SidebarTreeEntryWrapper* _tmp5_;
+	GtkEntry* _tmp13_;
+	guint _tmp14_;
+	GtkEntry* _tmp15_;
+	guint _tmp16_;
 #line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7200,12 +7211,12 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) {
 	_tmp5_ = wrapper;
 #line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_ != NULL) {
-#line 7204 "Tree.c"
+#line 7215 "Tree.c"
 		SidebarRenameableEntry* renameable = NULL;
-		SidebarTreeEntryWrapper* _tmp6_ = NULL;
-		SidebarEntry* _tmp7_ = NULL;
-		SidebarRenameableEntry* _tmp8_ = NULL;
-		SidebarRenameableEntry* _tmp9_ = NULL;
+		SidebarTreeEntryWrapper* _tmp6_;
+		SidebarEntry* _tmp7_;
+		SidebarRenameableEntry* _tmp8_;
+		SidebarRenameableEntry* _tmp9_;
 #line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = wrapper;
 #line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7218,10 +7229,10 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) {
 		_tmp9_ = renameable;
 #line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_ != NULL) {
-#line 7222 "Tree.c"
-			SidebarRenameableEntry* _tmp10_ = NULL;
-			GtkEntry* _tmp11_ = NULL;
-			const gchar* _tmp12_ = NULL;
+#line 7233 "Tree.c"
+			SidebarRenameableEntry* _tmp10_;
+			GtkEntry* _tmp11_;
+			const gchar* _tmp12_;
 #line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = renameable;
 #line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7230,11 +7241,11 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) {
 			_tmp12_ = gtk_entry_get_text (_tmp11_);
 #line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_renameable_entry_rename (_tmp10_, _tmp12_);
-#line 7234 "Tree.c"
+#line 7245 "Tree.c"
 		}
 #line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (renameable);
-#line 7238 "Tree.c"
+#line 7249 "Tree.c"
 	}
 #line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = self->priv->text_entry;
@@ -7250,7 +7261,7 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) {
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self);
 #line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 7254 "Tree.c"
+#line 7265 "Tree.c"
 }
 
 
@@ -7264,13 +7275,13 @@ static gboolean sidebar_tree_on_editing_focus_out (SidebarTree* self, GdkEventFo
 	result = FALSE;
 #line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7268 "Tree.c"
+#line 7279 "Tree.c"
 }
 
 
 static void sidebar_tree_on_new_search (SidebarTree* self) {
-	SavedSearchDialog* _tmp0_ = NULL;
-	SavedSearchDialog* _tmp1_ = NULL;
+	SavedSearchDialog* _tmp0_;
+	SavedSearchDialog* _tmp1_;
 #line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7281,19 +7292,19 @@ static void sidebar_tree_on_new_search (SidebarTree* self) {
 	saved_search_dialog_show (_tmp1_);
 #line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_saved_search_dialog_unref0 (_tmp1_);
-#line 7285 "Tree.c"
+#line 7296 "Tree.c"
 }
 
 
 static void sidebar_tree_on_new_tag (SidebarTree* self) {
 	NewRootTagCommand* creation_command = NULL;
-	NewRootTagCommand* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
-	CommandManager* _tmp2_ = NULL;
-	LibraryWindow* _tmp3_ = NULL;
-	LibraryWindow* _tmp4_ = NULL;
-	Tag* _tmp5_ = NULL;
-	Tag* _tmp6_ = NULL;
+	NewRootTagCommand* _tmp0_;
+	CommandManager* _tmp1_;
+	CommandManager* _tmp2_;
+	LibraryWindow* _tmp3_;
+	LibraryWindow* _tmp4_;
+	Tag* _tmp5_;
+	Tag* _tmp6_;
 #line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7324,7 +7335,7 @@ static void sidebar_tree_on_new_tag (SidebarTree* self) {
 	_g_object_unref0 (_tmp4_);
 #line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (creation_command);
-#line 7328 "Tree.c"
+#line 7339 "Tree.c"
 }
 
 
@@ -7343,19 +7354,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GV
 		data1 = closure->data;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7347 "Tree.c"
+#line 7358 "Tree.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data2 = closure->data;
-#line 7353 "Tree.c"
+#line 7364 "Tree.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_boolean (param_values + 2), data2);
-#line 7359 "Tree.c"
+#line 7370 "Tree.c"
 }
 
 
@@ -7374,29 +7385,29 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 		data1 = closure->data;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7378 "Tree.c"
+#line 7389 "Tree.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data2 = closure->data;
-#line 7384 "Tree.c"
+#line 7395 "Tree.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 7390 "Tree.c"
+#line 7401 "Tree.c"
 }
 
 
 static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_construct (GType object_type, GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path) {
 	SidebarTreeEntryWrapper * self = NULL;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	GtkTreeModel* _tmp2_ = NULL;
-	GtkTreePath* _tmp3_ = NULL;
-	GtkTreeRowReference* _tmp4_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarEntry* _tmp1_;
+	GtkTreeModel* _tmp2_;
+	GtkTreePath* _tmp3_;
+	GtkTreeRowReference* _tmp4_;
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL);
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7425,21 +7436,21 @@ static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_construct (GType obje
 	self->row = _tmp4_;
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self;
-#line 7429 "Tree.c"
+#line 7440 "Tree.c"
 }
 
 
 static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_new (GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path) {
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return sidebar_tree_entry_wrapper_construct (SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, model, entry, path);
-#line 7436 "Tree.c"
+#line 7447 "Tree.c"
 }
 
 
 static GtkTreePath* sidebar_tree_entry_wrapper_get_path (SidebarTreeEntryWrapper* self) {
 	GtkTreePath* result = NULL;
-	const GtkTreeRowReference* _tmp0_ = NULL;
-	GtkTreePath* _tmp1_ = NULL;
+	const GtkTreeRowReference* _tmp0_;
+	GtkTreePath* _tmp1_;
 #line 24 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (self), NULL);
 #line 25 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7450,20 +7461,20 @@ static GtkTreePath* sidebar_tree_entry_wrapper_get_path (SidebarTreeEntryWrapper
 	result = _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7454 "Tree.c"
+#line 7465 "Tree.c"
 }
 
 
 static void sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self, GtkTreeIter* result) {
 	GtkTreeIter iter = {0};
 	gboolean valid = FALSE;
-	const GtkTreeRowReference* _tmp0_ = NULL;
-	GtkTreeModel* _tmp1_ = NULL;
-	GtkTreePath* _tmp2_ = NULL;
-	GtkTreePath* _tmp3_ = NULL;
+	const GtkTreeRowReference* _tmp0_;
+	GtkTreeModel* _tmp1_;
+	GtkTreePath* _tmp2_;
+	GtkTreePath* _tmp3_;
 	GtkTreeIter _tmp4_ = {0};
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
 #line 28 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (self));
 #line 30 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7490,7 +7501,7 @@ static void sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self,
 	*result = iter;
 #line 33 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return;
-#line 7494 "Tree.c"
+#line 7505 "Tree.c"
 }
 
 
@@ -7499,7 +7510,7 @@ static void sidebar_tree_entry_wrapper_class_init (SidebarTreeEntryWrapperClass
 	sidebar_tree_entry_wrapper_parent_class = g_type_class_peek_parent (klass);
 #line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (klass)->finalize = sidebar_tree_entry_wrapper_finalize;
-#line 7503 "Tree.c"
+#line 7514 "Tree.c"
 }
 
 
@@ -7507,7 +7518,7 @@ static void sidebar_tree_entry_wrapper_instance_init (SidebarTreeEntryWrapper *
 }
 
 
-static void sidebar_tree_entry_wrapper_finalize (GObject* obj) {
+static void sidebar_tree_entry_wrapper_finalize (GObject * obj) {
 	SidebarTreeEntryWrapper * self;
 #line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper);
@@ -7517,7 +7528,7 @@ static void sidebar_tree_entry_wrapper_finalize (GObject* obj) {
 	_gtk_tree_row_reference_free0 (self->row);
 #line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (sidebar_tree_entry_wrapper_parent_class)->finalize (obj);
-#line 7521 "Tree.c"
+#line 7532 "Tree.c"
 }
 
 
@@ -7535,10 +7546,10 @@ static GType sidebar_tree_entry_wrapper_get_type (void) {
 
 static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_construct (GType object_type, GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path, gint root_position) {
 	SidebarTreeRootWrapper * self = NULL;
-	GtkTreeModel* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	GtkTreePath* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	GtkTreeModel* _tmp0_;
+	SidebarEntry* _tmp1_;
+	GtkTreePath* _tmp2_;
+	gint _tmp3_;
 #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL);
 #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7559,14 +7570,14 @@ static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_construct (GType object
 	self->root_position = _tmp3_;
 #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self;
-#line 7563 "Tree.c"
+#line 7574 "Tree.c"
 }
 
 
 static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_new (GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path, gint root_position) {
 #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return sidebar_tree_root_wrapper_construct (SIDEBAR_TREE_TYPE_ROOT_WRAPPER, model, entry, path, root_position);
-#line 7570 "Tree.c"
+#line 7581 "Tree.c"
 }
 
 
@@ -7575,7 +7586,7 @@ static void sidebar_tree_root_wrapper_class_init (SidebarTreeRootWrapperClass *
 	sidebar_tree_root_wrapper_parent_class = g_type_class_peek_parent (klass);
 #line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (klass)->finalize = sidebar_tree_root_wrapper_finalize;
-#line 7579 "Tree.c"
+#line 7590 "Tree.c"
 }
 
 
@@ -7583,13 +7594,13 @@ static void sidebar_tree_root_wrapper_instance_init (SidebarTreeRootWrapper * se
 }
 
 
-static void sidebar_tree_root_wrapper_finalize (GObject* obj) {
+static void sidebar_tree_root_wrapper_finalize (GObject * obj) {
 	SidebarTreeRootWrapper * self;
 #line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TREE_TYPE_ROOT_WRAPPER, SidebarTreeRootWrapper);
 #line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (sidebar_tree_root_wrapper_parent_class)->finalize (obj);
-#line 7593 "Tree.c"
+#line 7604 "Tree.c"
 }
 
 
@@ -7611,44 +7622,44 @@ static void sidebar_tree_class_init (SidebarTreeClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_type_class_add_private (klass, sizeof (SidebarTreePrivate));
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	((SidebarTreeClass *) klass)->accept_cursor_changed = (gboolean (*)(SidebarTree*)) sidebar_tree_real_accept_cursor_changed;
+	((SidebarTreeClass *) klass)->accept_cursor_changed = (gboolean (*) (SidebarTree *)) sidebar_tree_real_accept_cursor_changed;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	((GtkTreeViewClass *) klass)->cursor_changed = (void (*)(GtkTreeView*)) sidebar_tree_real_cursor_changed;
+	((GtkTreeViewClass *) klass)->cursor_changed = (void (*) (GtkTreeView *)) sidebar_tree_real_cursor_changed;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*)(GtkWidget*, GdkEventButton*)) sidebar_tree_real_button_press_event;
+	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*) (GtkWidget *, GdkEventButton*)) sidebar_tree_real_button_press_event;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) sidebar_tree_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) sidebar_tree_real_key_press_event;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	((GtkWidgetClass *) klass)->drag_data_get = (void (*)(GtkWidget*, GdkDragContext*, GtkSelectionData*, guint, guint)) sidebar_tree_real_drag_data_get;
+	((GtkWidgetClass *) klass)->drag_data_get = (void (*) (GtkWidget *, GdkDragContext*, GtkSelectionData*, guint, guint)) sidebar_tree_real_drag_data_get;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	((GtkWidgetClass *) klass)->drag_data_received = (void (*)(GtkWidget*, GdkDragContext*, gint, gint, GtkSelectionData*, guint, guint)) sidebar_tree_real_drag_data_received;
+	((GtkWidgetClass *) klass)->drag_data_received = (void (*) (GtkWidget *, GdkDragContext*, gint, gint, GtkSelectionData*, guint, guint)) sidebar_tree_real_drag_data_received;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	((GtkWidgetClass *) klass)->drag_motion = (gboolean (*)(GtkWidget*, GdkDragContext*, gint, gint, guint)) sidebar_tree_real_drag_motion;
+	((GtkWidgetClass *) klass)->drag_motion = (gboolean (*) (GtkWidget *, GdkDragContext*, gint, gint, guint)) sidebar_tree_real_drag_motion;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (klass)->finalize = sidebar_tree_finalize;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_new ("entry_selected", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_SELECTABLE_ENTRY);
+	sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL] = g_signal_new ("entry-selected", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_SELECTABLE_ENTRY);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_new ("selected_entry_removed", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_SELECTABLE_ENTRY);
+	sidebar_tree_signals[SIDEBAR_TREE_SELECTED_ENTRY_REMOVED_SIGNAL] = g_signal_new ("selected-entry-removed", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_SELECTABLE_ENTRY);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_new ("branch_added", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_BRANCH);
+	sidebar_tree_signals[SIDEBAR_TREE_BRANCH_ADDED_SIGNAL] = g_signal_new ("branch-added", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_BRANCH);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_new ("branch_removed", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_BRANCH);
+	sidebar_tree_signals[SIDEBAR_TREE_BRANCH_REMOVED_SIGNAL] = g_signal_new ("branch-removed", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_BRANCH);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_new ("branch_shown", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, SIDEBAR_TYPE_BRANCH, G_TYPE_BOOLEAN);
+	sidebar_tree_signals[SIDEBAR_TREE_BRANCH_SHOWN_SIGNAL] = g_signal_new ("branch-shown", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, SIDEBAR_TYPE_BRANCH, G_TYPE_BOOLEAN);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_new ("page_created", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE);
+	sidebar_tree_signals[SIDEBAR_TREE_PAGE_CREATED_SIGNAL] = g_signal_new ("page-created", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_new ("destroying_page", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE);
-#line 7644 "Tree.c"
+	sidebar_tree_signals[SIDEBAR_TREE_DESTROYING_PAGE_SIGNAL] = g_signal_new ("destroying-page", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE);
+#line 7655 "Tree.c"
 }
 
 
 static void sidebar_tree_instance_init (SidebarTree * self) {
-	GtkTreeStore* _tmp0_ = NULL;
-	GtkBuilder* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
-	GeeHashMap* _tmp3_ = NULL;
+	GtkTreeStore* _tmp0_;
+	GtkBuilder* _tmp1_;
+	GeeHashMap* _tmp2_;
+	GeeHashMap* _tmp3_;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv = SIDEBAR_TREE_GET_PRIVATE (self);
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7687,16 +7698,16 @@ static void sidebar_tree_instance_init (SidebarTree * self) {
 	self->priv->internal_drag_source_entry = NULL;
 #line 77 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->old_path_ref = NULL;
-#line 7691 "Tree.c"
+#line 7702 "Tree.c"
 }
 
 
-static void sidebar_tree_finalize (GObject* obj) {
+static void sidebar_tree_finalize (GObject * obj) {
 	SidebarTree * self;
-	GtkCellRendererText* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	GtkCellRendererText* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	GtkCellRendererText* _tmp0_;
+	guint _tmp1_;
+	GtkCellRendererText* _tmp2_;
+	guint _tmp3_;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_TREE, SidebarTree);
 #line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7731,7 +7742,7 @@ static void sidebar_tree_finalize (GObject* obj) {
 	_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (sidebar_tree_parent_class)->finalize (obj);
-#line 7735 "Tree.c"
+#line 7746 "Tree.c"
 }
 
 
diff --git a/src/sidebar/common.c b/src/sidebar/common.c
index 4a8f7f4..4b46c50 100644
--- a/src/sidebar/common.c
+++ b/src/sidebar/common.c
@@ -1,4 +1,4 @@
-/* common.c generated by valac 0.34.7, the Vala compiler
+/* common.c generated by valac 0.36.6, the Vala compiler
  * generated from common.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -266,17 +266,17 @@ struct _SidebarHeaderPrivate {
 
 
 static gpointer sidebar_grouping_parent_class = NULL;
-static SidebarEntryIface* sidebar_grouping_sidebar_entry_parent_iface = NULL;
-static SidebarExpandableEntryIface* sidebar_grouping_sidebar_expandable_entry_parent_iface = NULL;
-static SidebarRenameableEntryIface* sidebar_grouping_sidebar_renameable_entry_parent_iface = NULL;
+static SidebarEntryIface * sidebar_grouping_sidebar_entry_parent_iface = NULL;
+static SidebarExpandableEntryIface * sidebar_grouping_sidebar_expandable_entry_parent_iface = NULL;
+static SidebarRenameableEntryIface * sidebar_grouping_sidebar_renameable_entry_parent_iface = NULL;
 static gpointer sidebar_simple_page_entry_parent_class = NULL;
-static SidebarEntryIface* sidebar_simple_page_entry_sidebar_entry_parent_iface = NULL;
-static SidebarSelectableEntryIface* sidebar_simple_page_entry_sidebar_selectable_entry_parent_iface = NULL;
-static SidebarPageRepresentativeIface* sidebar_simple_page_entry_sidebar_page_representative_parent_iface = NULL;
-static SidebarContextableIface* sidebar_simple_page_entry_sidebar_contextable_parent_iface = NULL;
+static SidebarEntryIface * sidebar_simple_page_entry_sidebar_entry_parent_iface = NULL;
+static SidebarSelectableEntryIface * sidebar_simple_page_entry_sidebar_selectable_entry_parent_iface = NULL;
+static SidebarPageRepresentativeIface * sidebar_simple_page_entry_sidebar_page_representative_parent_iface = NULL;
+static SidebarContextableIface * sidebar_simple_page_entry_sidebar_contextable_parent_iface = NULL;
 static gpointer sidebar_root_only_branch_parent_class = NULL;
 static gpointer sidebar_header_parent_class = NULL;
-static SidebarEmphasizableEntryIface* sidebar_header_sidebar_emphasizable_entry_parent_iface = NULL;
+static SidebarEmphasizableEntryIface * sidebar_header_sidebar_emphasizable_entry_parent_iface = NULL;
 
 GType sidebar_tree_get_type (void) G_GNUC_CONST;
 GType sidebar_entry_get_type (void) G_GNUC_CONST;
@@ -296,7 +296,7 @@ static gchar* sidebar_grouping_real_get_sidebar_tooltip (SidebarEntry* base);
 static gchar* sidebar_grouping_real_get_sidebar_icon (SidebarEntry* base);
 static gchar* sidebar_grouping_real_to_string (SidebarEntry* base);
 static gboolean sidebar_grouping_real_expand_on_select (SidebarExpandableEntry* base);
-static void sidebar_grouping_finalize (GObject* obj);
+static void sidebar_grouping_finalize (GObject * obj);
 GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
 GType page_get_type (void) G_GNUC_CONST;
 GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
@@ -323,7 +323,7 @@ static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, SidebarTr
 static GtkMenu* sidebar_simple_page_entry_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event);
 Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self);
 GtkMenu* page_get_page_context_menu (Page* self);
-static void sidebar_simple_page_entry_finalize (GObject* obj);
+static void sidebar_simple_page_entry_finalize (GObject * obj);
 GType sidebar_branch_get_type (void) G_GNUC_CONST;
 GType sidebar_root_only_branch_get_type (void) G_GNUC_CONST;
 enum  {
@@ -345,18 +345,18 @@ enum  {
 SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
 SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
 static gboolean sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* base);
-static void sidebar_header_finalize (GObject* obj);
+static void sidebar_header_finalize (GObject * obj);
 GtkMenu* sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self, GdkEventButton* event);
 
 
 SidebarGrouping* sidebar_grouping_construct (GType object_type, const gchar* name, const gchar* icon, const gchar* tooltip) {
 	SidebarGrouping * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 15 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 15 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -400,9 +400,9 @@ SidebarGrouping* sidebar_grouping_new (const gchar* name, const gchar* icon, con
 
 static void sidebar_grouping_real_rename (SidebarRenameableEntry* base, const gchar* name) {
 	SidebarGrouping * self;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
 #line 21 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
 #line 21 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -439,8 +439,8 @@ static gboolean sidebar_grouping_real_is_user_renameable (SidebarRenameableEntry
 static gchar* sidebar_grouping_real_get_sidebar_name (SidebarEntry* base) {
 	SidebarGrouping * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 30 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
 #line 31 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -458,8 +458,8 @@ static gchar* sidebar_grouping_real_get_sidebar_name (SidebarEntry* base) {
 static gchar* sidebar_grouping_real_get_sidebar_tooltip (SidebarEntry* base) {
 	SidebarGrouping * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 34 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
 #line 35 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -477,8 +477,8 @@ static gchar* sidebar_grouping_real_get_sidebar_tooltip (SidebarEntry* base) {
 static gchar* sidebar_grouping_real_get_sidebar_icon (SidebarEntry* base) {
 	SidebarGrouping * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 38 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
 #line 39 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -496,8 +496,8 @@ static gchar* sidebar_grouping_real_get_sidebar_icon (SidebarEntry* base) {
 static gchar* sidebar_grouping_real_to_string (SidebarEntry* base) {
 	SidebarGrouping * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 42 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
 #line 43 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -540,13 +540,13 @@ static void sidebar_grouping_sidebar_entry_interface_init (SidebarEntryIface * i
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_grouping_sidebar_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->get_sidebar_name = (gchar* (*)(SidebarEntry*)) sidebar_grouping_real_get_sidebar_name;
+	iface->get_sidebar_name = (gchar* (*) (SidebarEntry *)) sidebar_grouping_real_get_sidebar_name;
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->get_sidebar_tooltip = (gchar* (*)(SidebarEntry*)) sidebar_grouping_real_get_sidebar_tooltip;
+	iface->get_sidebar_tooltip = (gchar* (*) (SidebarEntry *)) sidebar_grouping_real_get_sidebar_tooltip;
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->get_sidebar_icon = (gchar* (*)(SidebarEntry*)) sidebar_grouping_real_get_sidebar_icon;
+	iface->get_sidebar_icon = (gchar* (*) (SidebarEntry *)) sidebar_grouping_real_get_sidebar_icon;
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->to_string = (gchar* (*)(SidebarEntry*)) sidebar_grouping_real_to_string;
+	iface->to_string = (gchar* (*) (SidebarEntry *)) sidebar_grouping_real_to_string;
 #line 551 "common.c"
 }
 
@@ -555,7 +555,7 @@ static void sidebar_grouping_sidebar_expandable_entry_interface_init (SidebarExp
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_grouping_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->expand_on_select = (gboolean (*)(SidebarExpandableEntry*)) sidebar_grouping_real_expand_on_select;
+	iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) sidebar_grouping_real_expand_on_select;
 #line 560 "common.c"
 }
 
@@ -564,9 +564,9 @@ static void sidebar_grouping_sidebar_renameable_entry_interface_init (SidebarRen
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_grouping_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->rename = (void (*)(SidebarRenameableEntry*, const gchar*)) sidebar_grouping_real_rename;
+	iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) sidebar_grouping_real_rename;
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->is_user_renameable = (gboolean (*)(SidebarRenameableEntry*)) sidebar_grouping_real_is_user_renameable;
+	iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) sidebar_grouping_real_is_user_renameable;
 #line 571 "common.c"
 }
 
@@ -578,7 +578,7 @@ static void sidebar_grouping_instance_init (SidebarGrouping * self) {
 }
 
 
-static void sidebar_grouping_finalize (GObject* obj) {
+static void sidebar_grouping_finalize (GObject * obj) {
 	SidebarGrouping * self;
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
@@ -642,7 +642,7 @@ gchar* sidebar_simple_page_entry_get_sidebar_name (SidebarSimplePageEntry* self)
 
 static gchar* sidebar_simple_page_entry_real_get_sidebar_tooltip (SidebarSimplePageEntry* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 64 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	_tmp0_ = sidebar_simple_page_entry_get_sidebar_name (self);
 #line 64 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -682,7 +682,7 @@ gchar* sidebar_simple_page_entry_get_sidebar_icon (SidebarSimplePageEntry* self)
 
 static gchar* sidebar_simple_page_entry_real_to_string (SidebarSimplePageEntry* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 70 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	_tmp0_ = sidebar_simple_page_entry_get_sidebar_name (self);
 #line 70 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -723,7 +723,7 @@ Page* sidebar_simple_page_entry_create_page (SidebarSimplePageEntry* self) {
 static gboolean sidebar_simple_page_entry_real_has_page (SidebarPageRepresentative* base) {
 	SidebarSimplePageEntry * self;
 	gboolean result = FALSE;
-	Page* _tmp0_ = NULL;
+	Page* _tmp0_;
 #line 75 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry);
 #line 76 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -746,9 +746,9 @@ static gpointer _g_object_ref0 (gpointer self) {
 static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative* base) {
 	SidebarSimplePageEntry * self;
 	Page* result = NULL;
-	Page* _tmp0_ = NULL;
-	Page* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
+	Page* _tmp0_;
+	Page* _tmp3_;
+	Page* _tmp4_;
 #line 79 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry);
 #line 80 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -756,8 +756,8 @@ static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative*
 #line 80 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	if (_tmp0_ == NULL) {
 #line 759 "common.c"
-		Page* _tmp1_ = NULL;
-		Page* _tmp2_ = NULL;
+		Page* _tmp1_;
+		Page* _tmp2_;
 #line 81 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 		_tmp1_ = sidebar_simple_page_entry_create_page (self);
 #line 81 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -784,9 +784,9 @@ static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative*
 
 static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, SidebarTree* tree) {
 	SidebarSimplePageEntry * self;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
+	Page* _tmp0_;
+	Page* _tmp1_;
+	Page* _tmp2_;
 #line 88 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry);
 #line 88 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -818,10 +818,10 @@ static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, SidebarTr
 static GtkMenu* sidebar_simple_page_entry_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event) {
 	SidebarSimplePageEntry * self;
 	GtkMenu* result = NULL;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	GtkMenu* _tmp2_ = NULL;
-	GtkMenu* _tmp3_ = NULL;
+	Page* _tmp0_;
+	Page* _tmp1_;
+	GtkMenu* _tmp2_;
+	GtkMenu* _tmp3_;
 #line 97 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry);
 #line 98 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -848,15 +848,15 @@ static void sidebar_simple_page_entry_class_init (SidebarSimplePageEntryClass *
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_type_class_add_private (klass, sizeof (SidebarSimplePageEntryPrivate));
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) sidebar_simple_page_entry_real_get_sidebar_name;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_tooltip = (gchar* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_get_sidebar_tooltip;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_tooltip = (gchar* (*) (SidebarSimplePageEntry *)) sidebar_simple_page_entry_real_get_sidebar_tooltip;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) sidebar_simple_page_entry_real_get_sidebar_icon;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	((SidebarSimplePageEntryClass *) klass)->to_string = (gchar* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_to_string;
+	((SidebarSimplePageEntryClass *) klass)->to_string = (gchar* (*) (SidebarSimplePageEntry *)) sidebar_simple_page_entry_real_to_string;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) sidebar_simple_page_entry_real_create_page;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	G_OBJECT_CLASS (klass)->finalize = sidebar_simple_page_entry_finalize;
 #line 863 "common.c"
@@ -867,15 +867,15 @@ static void sidebar_simple_page_entry_sidebar_entry_interface_init (SidebarEntry
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_simple_page_entry_sidebar_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->get_sidebar_name = (gchar* (*)(SidebarEntry*)) sidebar_simple_page_entry_get_sidebar_name;
+	iface->get_sidebar_name = (gchar* (*) (SidebarEntry *)) sidebar_simple_page_entry_get_sidebar_name;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->get_sidebar_tooltip = (gchar* (*)(SidebarEntry*)) sidebar_simple_page_entry_get_sidebar_tooltip;
+	iface->get_sidebar_tooltip = (gchar* (*) (SidebarEntry *)) sidebar_simple_page_entry_get_sidebar_tooltip;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->get_sidebar_icon = (gchar* (*)(SidebarEntry*)) sidebar_simple_page_entry_get_sidebar_icon;
+	iface->get_sidebar_icon = (gchar* (*) (SidebarEntry *)) sidebar_simple_page_entry_get_sidebar_icon;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->to_string = (gchar* (*)(SidebarEntry*)) sidebar_simple_page_entry_to_string;
+	iface->to_string = (gchar* (*) (SidebarEntry *)) sidebar_simple_page_entry_to_string;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->pruned = (void (*)(SidebarEntry*, SidebarTree*)) sidebar_simple_page_entry_real_pruned;
+	iface->pruned = (void (*) (SidebarEntry *, SidebarTree*)) sidebar_simple_page_entry_real_pruned;
 #line 880 "common.c"
 }
 
@@ -891,9 +891,9 @@ static void sidebar_simple_page_entry_sidebar_page_representative_interface_init
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_simple_page_entry_sidebar_page_representative_parent_iface = g_type_interface_peek_parent (iface);
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->has_page = (gboolean (*)(SidebarPageRepresentative*)) sidebar_simple_page_entry_real_has_page;
+	iface->has_page = (gboolean (*) (SidebarPageRepresentative *)) sidebar_simple_page_entry_real_has_page;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->get_page = (Page* (*)(SidebarPageRepresentative*)) sidebar_simple_page_entry_real_get_page;
+	iface->get_page = (Page* (*) (SidebarPageRepresentative *)) sidebar_simple_page_entry_real_get_page;
 #line 898 "common.c"
 }
 
@@ -902,7 +902,7 @@ static void sidebar_simple_page_entry_sidebar_contextable_interface_init (Sideba
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_simple_page_entry_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface);
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->get_sidebar_context_menu = (GtkMenu* (*)(SidebarContextable*, GdkEventButton*)) sidebar_simple_page_entry_real_get_sidebar_context_menu;
+	iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) sidebar_simple_page_entry_real_get_sidebar_context_menu;
 #line 907 "common.c"
 }
 
@@ -916,7 +916,7 @@ static void sidebar_simple_page_entry_instance_init (SidebarSimplePageEntry * se
 }
 
 
-static void sidebar_simple_page_entry_finalize (GObject* obj) {
+static void sidebar_simple_page_entry_finalize (GObject * obj) {
 	SidebarSimplePageEntry * self;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry);
@@ -959,7 +959,7 @@ static gint _sidebar_root_only_branch_null_comparator_gcompare_func (gconstpoint
 
 SidebarRootOnlyBranch* sidebar_root_only_branch_construct (GType object_type, SidebarEntry* root) {
 	SidebarRootOnlyBranch * self = NULL;
-	SidebarEntry* _tmp0_ = NULL;
+	SidebarEntry* _tmp0_;
 #line 104 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (root), NULL);
 #line 105 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -982,8 +982,8 @@ SidebarRootOnlyBranch* sidebar_root_only_branch_new (SidebarEntry* root) {
 static gint sidebar_root_only_branch_null_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-	SidebarEntry* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
+	SidebarEntry* _tmp1_;
+	SidebarEntry* _tmp2_;
 #line 108 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
 #line 108 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -1035,8 +1035,8 @@ GType sidebar_root_only_branch_get_type (void) {
 
 SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized) {
 	SidebarHeader * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 124 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -1063,7 +1063,7 @@ SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized) {
 static gboolean sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* base) {
 	SidebarHeader * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 128 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_HEADER, SidebarHeader);
 #line 129 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -1091,7 +1091,7 @@ static void sidebar_header_sidebar_emphasizable_entry_interface_init (SidebarEmp
 #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_header_sidebar_emphasizable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->is_emphasized = (gboolean (*)(SidebarEmphasizableEntry*)) sidebar_header_real_is_emphasized;
+	iface->is_emphasized = (gboolean (*) (SidebarEmphasizableEntry *)) sidebar_header_real_is_emphasized;
 #line 1096 "common.c"
 }
 
@@ -1103,7 +1103,7 @@ static void sidebar_header_instance_init (SidebarHeader * self) {
 }
 
 
-static void sidebar_header_finalize (GObject* obj) {
+static void sidebar_header_finalize (GObject * obj) {
 	SidebarHeader * self;
 #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_HEADER, SidebarHeader);
diff --git a/src/slideshow/Slideshow.c b/src/slideshow/Slideshow.c
index 4955bbd..df6975c 100644
--- a/src/slideshow/Slideshow.c
+++ b/src/slideshow/Slideshow.c
@@ -1,4 +1,4 @@
-/* Slideshow.c generated by valac 0.34.7, the Vala compiler
+/* Slideshow.c generated by valac 0.36.6, the Vala compiler
  * generated from Slideshow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -18,16 +18,16 @@
 
 
 void slideshow_init (GError** error);
-static void _vala_array_add33 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add34 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add35 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add36 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add37 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add38 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add39 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add40 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add41 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add42 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add33 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add34 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add35 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add36 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add37 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add38 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add39 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add40 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add41 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add42 (gchar** * array, int* length, int* size, gchar* value);
 void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1);
 #define RESOURCES_ICON_SLIDESHOW_EXTENSION_POINT "slideshow-extension-point"
 void transition_effects_manager_init (void);
@@ -37,7 +37,7 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
-static void _vala_array_add33 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add33 (gchar** * array, int* length, int* size, gchar* value) {
 #line 11 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 11 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -54,7 +54,7 @@ static void _vala_array_add33 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add34 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add34 (gchar** * array, int* length, int* size, gchar* value) {
 #line 12 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 12 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -71,7 +71,7 @@ static void _vala_array_add34 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add35 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add35 (gchar** * array, int* length, int* size, gchar* value) {
 #line 13 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 13 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -88,7 +88,7 @@ static void _vala_array_add35 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add36 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add36 (gchar** * array, int* length, int* size, gchar* value) {
 #line 14 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 14 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -105,7 +105,7 @@ static void _vala_array_add36 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add37 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add37 (gchar** * array, int* length, int* size, gchar* value) {
 #line 15 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 15 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -122,7 +122,7 @@ static void _vala_array_add37 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add38 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add38 (gchar** * array, int* length, int* size, gchar* value) {
 #line 16 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 16 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -139,7 +139,7 @@ static void _vala_array_add38 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add39 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add39 (gchar** * array, int* length, int* size, gchar* value) {
 #line 17 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 17 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -156,7 +156,7 @@ static void _vala_array_add39 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add40 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add40 (gchar** * array, int* length, int* size, gchar* value) {
 #line 18 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 18 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -173,7 +173,7 @@ static void _vala_array_add40 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add41 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add41 (gchar** * array, int* length, int* size, gchar* value) {
 #line 19 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 19 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -190,7 +190,7 @@ static void _vala_array_add41 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add42 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add42 (gchar** * array, int* length, int* size, gchar* value) {
 #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -209,42 +209,41 @@ static void _vala_array_add42 (gchar*** array, int* length, int* size, gchar* va
 
 void slideshow_init (GError** error) {
 	gchar** core_ids = NULL;
-	gchar** _tmp0_ = NULL;
-	gint core_ids_length1 = 0;
-	gint _core_ids_size_ = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar* _tmp4_ = NULL;
-	gchar** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	gchar* _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	gchar* _tmp8_ = NULL;
-	gchar** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	gchar* _tmp10_ = NULL;
-	gchar** _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-	gchar* _tmp12_ = NULL;
-	gchar** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
-	gchar* _tmp14_ = NULL;
-	gchar** _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	gchar* _tmp16_ = NULL;
-	gchar** _tmp17_ = NULL;
-	gint _tmp17__length1 = 0;
-	gchar* _tmp18_ = NULL;
-	gchar** _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
-	gchar* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	gchar** _tmp22_ = NULL;
-	gint _tmp22__length1 = 0;
+	gchar** _tmp0_;
+	gint core_ids_length1;
+	gint _core_ids_size_;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar* _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
+	gchar** _tmp5_;
+	gint _tmp5__length1;
+	gchar* _tmp6_;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
+	gchar* _tmp8_;
+	gchar** _tmp9_;
+	gint _tmp9__length1;
+	gchar* _tmp10_;
+	gchar** _tmp11_;
+	gint _tmp11__length1;
+	gchar* _tmp12_;
+	gchar** _tmp13_;
+	gint _tmp13__length1;
+	gchar* _tmp14_;
+	gchar** _tmp15_;
+	gint _tmp15__length1;
+	gchar* _tmp16_;
+	gchar** _tmp17_;
+	gint _tmp17__length1;
+	gchar* _tmp18_;
+	gchar** _tmp19_;
+	gint _tmp19__length1;
+	gchar* _tmp20_;
+	gchar** _tmp21_;
+	gint _tmp21__length1;
 #line 10 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp0_ = g_new0 (gchar*, 0 + 1);
 #line 10 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -334,25 +333,23 @@ void slideshow_init (GError** error) {
 #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_vala_array_add42 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp20_);
 #line 22 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	_tmp21_ = _ ("Slideshow Transitions");
+	_tmp21_ = core_ids;
 #line 22 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	_tmp22_ = core_ids;
+	_tmp21__length1 = core_ids_length1;
 #line 22 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	_tmp22__length1 = core_ids_length1;
-#line 22 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	plugins_register_extension_point (SPIT_TRANSITIONS_TYPE_DESCRIPTOR, _tmp21_, RESOURCES_ICON_SLIDESHOW_EXTENSION_POINT, _tmp22_, _tmp22__length1);
+	plugins_register_extension_point (SPIT_TRANSITIONS_TYPE_DESCRIPTOR, _ ("Slideshow Transitions"), RESOURCES_ICON_SLIDESHOW_EXTENSION_POINT, _tmp21_, _tmp21__length1);
 #line 24 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	transition_effects_manager_init ();
 #line 9 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	core_ids = (_vala_array_free (core_ids, core_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 349 "Slideshow.c"
+#line 346 "Slideshow.c"
 }
 
 
 void slideshow_terminate (void) {
 #line 28 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	transition_effects_manager_terminate ();
-#line 356 "Slideshow.c"
+#line 353 "Slideshow.c"
 }
 
 
diff --git a/src/slideshow/TransitionEffects.c b/src/slideshow/TransitionEffects.c
index 0e05963..fc72cc9 100644
--- a/src/slideshow/TransitionEffects.c
+++ b/src/slideshow/TransitionEffects.c
@@ -1,4 +1,4 @@
-/* TransitionEffects.c generated by valac 0.34.7, the Vala compiler
+/* TransitionEffects.c generated by valac 0.36.6, the Vala compiler
  * generated from TransitionEffects.vala, do not modify */
 
 /* Copyright 2010 Maxim Kartashev
@@ -205,13 +205,13 @@ static TransitionEffectsManager* transition_effects_manager_instance;
 static TransitionEffectsManager* transition_effects_manager_instance = NULL;
 static gpointer transition_clock_parent_class = NULL;
 static gpointer null_transition_descriptor_parent_class = NULL;
-static SpitPluggableIface* null_transition_descriptor_spit_pluggable_parent_iface = NULL;
-static SpitTransitionsDescriptorIface* null_transition_descriptor_spit_transitions_descriptor_parent_iface = NULL;
+static SpitPluggableIface * null_transition_descriptor_spit_pluggable_parent_iface = NULL;
+static SpitTransitionsDescriptorIface * null_transition_descriptor_spit_transitions_descriptor_parent_iface = NULL;
 static gpointer null_effect_parent_class = NULL;
-static SpitTransitionsEffectIface* null_effect_spit_transitions_effect_parent_iface = NULL;
+static SpitTransitionsEffectIface * null_effect_spit_transitions_effect_parent_iface = NULL;
 static gpointer random_effect_descriptor_parent_class = NULL;
-static SpitPluggableIface* random_effect_descriptor_spit_pluggable_parent_iface = NULL;
-static SpitTransitionsDescriptorIface* random_effect_descriptor_spit_transitions_descriptor_parent_iface = NULL;
+static SpitPluggableIface * random_effect_descriptor_spit_pluggable_parent_iface = NULL;
+static SpitTransitionsDescriptorIface * random_effect_descriptor_spit_transitions_descriptor_parent_iface = NULL;
 
 gpointer transition_effects_manager_ref (gpointer instance);
 void transition_effects_manager_unref (gpointer instance);
@@ -268,7 +268,7 @@ TransitionClock* transition_effects_manager_create_transition_clock (TransitionE
 TransitionClock* transition_clock_new (SpitTransitionsDescriptor* desc);
 TransitionClock* transition_clock_construct (GType object_type, SpitTransitionsDescriptor* desc);
 TransitionClock* transition_effects_manager_create_null_transition_clock (TransitionEffectsManager* self);
-static void transition_effects_manager_finalize (TransitionEffectsManager* obj);
+static void transition_effects_manager_finalize (TransitionEffectsManager * obj);
 gpointer op_timer_ref (gpointer instance);
 void op_timer_unref (gpointer instance);
 GParamSpec* param_spec_op_timer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -298,7 +298,7 @@ void transition_clock_cancel (TransitionClock* self);
 gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width, gint height);
 void op_timer_start (OpTimer* self);
 void op_timer_stop (OpTimer* self);
-static void transition_clock_finalize (TransitionClock* obj);
+static void transition_clock_finalize (TransitionClock * obj);
 enum  {
 	NULL_TRANSITION_DESCRIPTOR_DUMMY_PROPERTY
 };
@@ -340,8 +340,8 @@ static void _transition_effects_manager_load_transitions_plugins_notifier_plugga
 
 static TransitionEffectsManager* transition_effects_manager_construct (GType object_type) {
 	TransitionEffectsManager* self = NULL;
-	PluginsNotifier* _tmp0_ = NULL;
-	PluginsNotifier* _tmp1_ = NULL;
+	PluginsNotifier* _tmp0_;
+	PluginsNotifier* _tmp1_;
 #line 19 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self = (TransitionEffectsManager*) g_type_create_instance (object_type);
 #line 20 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -375,17 +375,17 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 
 static void transition_effects_manager_load_transitions (TransitionEffectsManager* self) {
-	GeeMap* _tmp0_ = NULL;
-	GeeMap* _tmp1_ = NULL;
-	SpitTransitionsDescriptor* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	SpitTransitionsDescriptor* _tmp4_ = NULL;
-	GeeMap* _tmp5_ = NULL;
-	SpitTransitionsDescriptor* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	SpitTransitionsDescriptor* _tmp8_ = NULL;
+	GeeMap* _tmp0_;
+	GeeMap* _tmp1_;
+	SpitTransitionsDescriptor* _tmp2_;
+	const gchar* _tmp3_;
+	SpitTransitionsDescriptor* _tmp4_;
+	GeeMap* _tmp5_;
+	SpitTransitionsDescriptor* _tmp6_;
+	const gchar* _tmp7_;
+	SpitTransitionsDescriptor* _tmp8_;
 	GeeCollection* pluggables = NULL;
-	GeeCollection* _tmp9_ = NULL;
+	GeeCollection* _tmp9_;
 #line 28 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self));
 #line 29 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -419,8 +419,8 @@ static void transition_effects_manager_load_transitions (TransitionEffectsManage
 #line 420 "TransitionEffects.c"
 	{
 		GeeIterator* _pluggable_it = NULL;
-		GeeCollection* _tmp10_ = NULL;
-		GeeIterator* _tmp11_ = NULL;
+		GeeCollection* _tmp10_;
+		GeeIterator* _tmp11_;
 #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp10_ = pluggables;
 #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -430,22 +430,22 @@ static void transition_effects_manager_load_transitions (TransitionEffectsManage
 #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		while (TRUE) {
 #line 433 "TransitionEffects.c"
-			GeeIterator* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
+			GeeIterator* _tmp12_;
+			gboolean _tmp13_;
 			SpitPluggable* pluggable = NULL;
-			GeeIterator* _tmp14_ = NULL;
-			gpointer _tmp15_ = NULL;
+			GeeIterator* _tmp14_;
+			gpointer _tmp15_;
 			gint pluggable_interface = 0;
-			SpitPluggable* _tmp16_ = NULL;
-			gint _tmp17_ = 0;
-			gint _tmp18_ = 0;
+			SpitPluggable* _tmp16_;
+			gint _tmp17_;
+			gint _tmp18_;
 			SpitTransitionsDescriptor* desc = NULL;
-			SpitPluggable* _tmp23_ = NULL;
-			SpitTransitionsDescriptor* _tmp24_ = NULL;
-			GeeMap* _tmp25_ = NULL;
-			SpitTransitionsDescriptor* _tmp26_ = NULL;
-			const gchar* _tmp27_ = NULL;
-			gboolean _tmp28_ = FALSE;
+			SpitPluggable* _tmp23_;
+			SpitTransitionsDescriptor* _tmp24_;
+			GeeMap* _tmp25_;
+			SpitTransitionsDescriptor* _tmp26_;
+			const gchar* _tmp27_;
+			gboolean _tmp28_;
 #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 			_tmp12_ = _pluggable_it;
 #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -473,10 +473,10 @@ static void transition_effects_manager_load_transitions (TransitionEffectsManage
 #line 41 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 			if (_tmp18_ != SPIT_TRANSITIONS_CURRENT_INTERFACE) {
 #line 476 "TransitionEffects.c"
-				SpitPluggable* _tmp19_ = NULL;
-				gchar* _tmp20_ = NULL;
-				gchar* _tmp21_ = NULL;
-				gint _tmp22_ = 0;
+				SpitPluggable* _tmp19_;
+				gchar* _tmp20_;
+				gchar* _tmp21_;
+				gint _tmp22_;
 #line 42 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 				_tmp19_ = pluggable;
 #line 42 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -513,8 +513,8 @@ static void transition_effects_manager_load_transitions (TransitionEffectsManage
 #line 49 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 			if (_tmp28_) {
 #line 515 "TransitionEffects.c"
-				SpitTransitionsDescriptor* _tmp29_ = NULL;
-				const gchar* _tmp30_ = NULL;
+				SpitTransitionsDescriptor* _tmp29_;
+				const gchar* _tmp30_;
 #line 50 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 				_tmp29_ = desc;
 #line 50 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -524,10 +524,10 @@ static void transition_effects_manager_load_transitions (TransitionEffectsManage
 "t ID %s", _tmp30_);
 #line 524 "TransitionEffects.c"
 			} else {
-				GeeMap* _tmp31_ = NULL;
-				SpitTransitionsDescriptor* _tmp32_ = NULL;
-				const gchar* _tmp33_ = NULL;
-				SpitTransitionsDescriptor* _tmp34_ = NULL;
+				GeeMap* _tmp31_;
+				SpitTransitionsDescriptor* _tmp32_;
+				const gchar* _tmp33_;
+				SpitTransitionsDescriptor* _tmp34_;
 #line 52 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 				_tmp31_ = self->priv->effects;
 #line 52 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -557,7 +557,7 @@ static void transition_effects_manager_load_transitions (TransitionEffectsManage
 
 
 void transition_effects_manager_init (void) {
-	TransitionEffectsManager* _tmp0_ = NULL;
+	TransitionEffectsManager* _tmp0_;
 #line 57 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp0_ = transition_effects_manager_new ();
 #line 57 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -586,9 +586,9 @@ static gpointer _transition_effects_manager_ref0 (gpointer self) {
 
 TransitionEffectsManager* transition_effects_manager_get_instance (void) {
 	TransitionEffectsManager* result = NULL;
-	TransitionEffectsManager* _tmp0_ = NULL;
-	TransitionEffectsManager* _tmp1_ = NULL;
-	TransitionEffectsManager* _tmp2_ = NULL;
+	TransitionEffectsManager* _tmp0_;
+	TransitionEffectsManager* _tmp1_;
+	TransitionEffectsManager* _tmp2_;
 #line 65 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp0_ = transition_effects_manager_instance;
 #line 65 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -607,9 +607,9 @@ TransitionEffectsManager* transition_effects_manager_get_instance (void) {
 
 GeeCollection* transition_effects_manager_get_effect_ids (TransitionEffectsManager* self) {
 	GeeCollection* result = NULL;
-	GeeMap* _tmp0_ = NULL;
-	GeeSet* _tmp1_ = NULL;
-	GeeSet* _tmp2_ = NULL;
+	GeeMap* _tmp0_;
+	GeeSet* _tmp1_;
+	GeeSet* _tmp2_;
 #line 70 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL);
 #line 71 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -629,10 +629,10 @@ GeeCollection* transition_effects_manager_get_effect_ids (TransitionEffectsManag
 GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsManager* self, GCompareDataFunc comparator, void* comparator_target, GDestroyNotify comparator_target_destroy_notify) {
 	GeeCollection* result = NULL;
 	GeeCollection* effect_names = NULL;
-	GCompareDataFunc _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	GDestroyNotify _tmp0__target_destroy_notify = NULL;
-	GeeTreeSet* _tmp1_ = NULL;
+	GCompareDataFunc _tmp0_;
+	void* _tmp0__target;
+	GDestroyNotify _tmp0__target_destroy_notify;
+	GeeTreeSet* _tmp1_;
 #line 74 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL);
 #line 75 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -654,12 +654,12 @@ GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsMan
 #line 653 "TransitionEffects.c"
 	{
 		GeeIterator* _desc_it = NULL;
-		GeeMap* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeCollection* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
-		GeeIterator* _tmp7_ = NULL;
+		GeeMap* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeCollection* _tmp4_;
+		GeeCollection* _tmp5_;
+		GeeIterator* _tmp6_;
+		GeeIterator* _tmp7_;
 #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp2_ = self->priv->effects;
 #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -679,14 +679,14 @@ GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsMan
 #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		while (TRUE) {
 #line 680 "TransitionEffects.c"
-			GeeIterator* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			GeeIterator* _tmp8_;
+			gboolean _tmp9_;
 			SpitTransitionsDescriptor* desc = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			gpointer _tmp11_ = NULL;
-			GeeCollection* _tmp12_ = NULL;
-			SpitTransitionsDescriptor* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			GeeCollection* _tmp12_;
+			SpitTransitionsDescriptor* _tmp13_;
+			const gchar* _tmp14_;
 #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 			_tmp8_ = _desc_it;
 #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -744,12 +744,12 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag
 #line 743 "TransitionEffects.c"
 	{
 		GeeIterator* _desc_it = NULL;
-		GeeMap* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMap* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp0_ = self->priv->effects;
 #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -769,14 +769,14 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag
 #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		while (TRUE) {
 #line 770 "TransitionEffects.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			SpitTransitionsDescriptor* desc = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			SpitTransitionsDescriptor* _tmp10_ = NULL;
-			const gchar* _tmp11_ = NULL;
-			const gchar* _tmp12_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			SpitTransitionsDescriptor* _tmp10_;
+			const gchar* _tmp11_;
+			const gchar* _tmp12_;
 #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 			_tmp6_ = _desc_it;
 #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -802,9 +802,9 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag
 #line 84 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 			if (g_strcmp0 (_tmp11_, _tmp12_) == 0) {
 #line 803 "TransitionEffects.c"
-				SpitTransitionsDescriptor* _tmp13_ = NULL;
-				const gchar* _tmp14_ = NULL;
-				gchar* _tmp15_ = NULL;
+				SpitTransitionsDescriptor* _tmp13_;
+				const gchar* _tmp14_;
+				gchar* _tmp15_;
 #line 85 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 				_tmp13_ = desc;
 #line 85 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -839,9 +839,9 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag
 
 SpitTransitionsDescriptor* transition_effects_manager_get_effect_descriptor (TransitionEffectsManager* self, const gchar* effect_id) {
 	SpitTransitionsDescriptor* result = NULL;
-	GeeMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
 #line 91 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL);
 #line 91 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -863,11 +863,11 @@ SpitTransitionsDescriptor* transition_effects_manager_get_effect_descriptor (Tra
 gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* self, const gchar* effect_id) {
 	gchar* result = NULL;
 	SpitTransitionsDescriptor* desc = NULL;
-	const gchar* _tmp0_ = NULL;
-	SpitTransitionsDescriptor* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	SpitTransitionsDescriptor* _tmp1_;
 	const gchar* _tmp2_ = NULL;
-	SpitTransitionsDescriptor* _tmp3_ = NULL;
-	gchar* _tmp7_ = NULL;
+	SpitTransitionsDescriptor* _tmp3_;
+	gchar* _tmp6_;
 #line 95 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL);
 #line 95 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -883,8 +883,8 @@ gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* sel
 #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (_tmp3_ != NULL) {
 #line 884 "TransitionEffects.c"
-		SpitTransitionsDescriptor* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+		SpitTransitionsDescriptor* _tmp4_;
+		const gchar* _tmp5_;
 #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp4_ = desc;
 #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -893,29 +893,26 @@ gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* sel
 		_tmp2_ = _tmp5_;
 #line 893 "TransitionEffects.c"
 	} else {
-		const gchar* _tmp6_ = NULL;
 #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-		_tmp6_ = _ ("(None)");
-#line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-		_tmp2_ = _tmp6_;
-#line 900 "TransitionEffects.c"
+		_tmp2_ = _ ("(None)");
+#line 897 "TransitionEffects.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	_tmp7_ = g_strdup (_tmp2_);
+	_tmp6_ = g_strdup (_tmp2_);
 #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	result = _tmp7_;
+	result = _tmp6_;
 #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_g_object_unref0 (desc);
 #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 910 "TransitionEffects.c"
+#line 907 "TransitionEffects.c"
 }
 
 
 SpitTransitionsDescriptor* transition_effects_manager_get_null_descriptor (TransitionEffectsManager* self) {
 	SpitTransitionsDescriptor* result = NULL;
-	SpitTransitionsDescriptor* _tmp0_ = NULL;
-	SpitTransitionsDescriptor* _tmp1_ = NULL;
+	SpitTransitionsDescriptor* _tmp0_;
+	SpitTransitionsDescriptor* _tmp1_;
 #line 101 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL);
 #line 102 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -926,17 +923,17 @@ SpitTransitionsDescriptor* transition_effects_manager_get_null_descriptor (Trans
 	result = _tmp1_;
 #line 102 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 928 "TransitionEffects.c"
+#line 925 "TransitionEffects.c"
 }
 
 
 TransitionClock* transition_effects_manager_create_transition_clock (TransitionEffectsManager* self, const gchar* effect_id) {
 	TransitionClock* result = NULL;
 	SpitTransitionsDescriptor* desc = NULL;
-	const gchar* _tmp0_ = NULL;
-	SpitTransitionsDescriptor* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	SpitTransitionsDescriptor* _tmp1_;
 	TransitionClock* _tmp2_ = NULL;
-	SpitTransitionsDescriptor* _tmp3_ = NULL;
+	SpitTransitionsDescriptor* _tmp3_;
 #line 105 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL);
 #line 105 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -951,9 +948,9 @@ TransitionClock* transition_effects_manager_create_transition_clock (TransitionE
 	_tmp3_ = desc;
 #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (_tmp3_ != NULL) {
-#line 953 "TransitionEffects.c"
-		SpitTransitionsDescriptor* _tmp4_ = NULL;
-		TransitionClock* _tmp5_ = NULL;
+#line 950 "TransitionEffects.c"
+		SpitTransitionsDescriptor* _tmp4_;
+		TransitionClock* _tmp5_;
 #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp4_ = desc;
 #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -962,13 +959,13 @@ TransitionClock* transition_effects_manager_create_transition_clock (TransitionE
 		_transition_clock_unref0 (_tmp2_);
 #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp2_ = _tmp5_;
-#line 964 "TransitionEffects.c"
+#line 961 "TransitionEffects.c"
 	} else {
 #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_transition_clock_unref0 (_tmp2_);
 #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp2_ = NULL;
-#line 970 "TransitionEffects.c"
+#line 967 "TransitionEffects.c"
 	}
 #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	result = _tmp2_;
@@ -976,14 +973,14 @@ TransitionClock* transition_effects_manager_create_transition_clock (TransitionE
 	_g_object_unref0 (desc);
 #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 978 "TransitionEffects.c"
+#line 975 "TransitionEffects.c"
 }
 
 
 TransitionClock* transition_effects_manager_create_null_transition_clock (TransitionEffectsManager* self) {
 	TransitionClock* result = NULL;
-	SpitTransitionsDescriptor* _tmp0_ = NULL;
-	TransitionClock* _tmp1_ = NULL;
+	SpitTransitionsDescriptor* _tmp0_;
+	TransitionClock* _tmp1_;
 #line 111 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL);
 #line 112 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -994,14 +991,14 @@ TransitionClock* transition_effects_manager_create_null_transition_clock (Transi
 	result = _tmp1_;
 #line 112 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 996 "TransitionEffects.c"
+#line 993 "TransitionEffects.c"
 }
 
 
 static void value_transition_effects_manager_init (GValue* value) {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	value->data[0].v_pointer = NULL;
-#line 1003 "TransitionEffects.c"
+#line 1000 "TransitionEffects.c"
 }
 
 
@@ -1010,7 +1007,7 @@ static void value_transition_effects_manager_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		transition_effects_manager_unref (value->data[0].v_pointer);
-#line 1012 "TransitionEffects.c"
+#line 1009 "TransitionEffects.c"
 	}
 }
 
@@ -1020,11 +1017,11 @@ static void value_transition_effects_manager_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		dest_value->data[0].v_pointer = transition_effects_manager_ref (src_value->data[0].v_pointer);
-#line 1022 "TransitionEffects.c"
+#line 1019 "TransitionEffects.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1026 "TransitionEffects.c"
+#line 1023 "TransitionEffects.c"
 	}
 }
 
@@ -1032,66 +1029,66 @@ static void value_transition_effects_manager_copy_value (const GValue* src_value
 static gpointer value_transition_effects_manager_peek_pointer (const GValue* value) {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return value->data[0].v_pointer;
-#line 1034 "TransitionEffects.c"
+#line 1031 "TransitionEffects.c"
 }
 
 
 static gchar* value_transition_effects_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (collect_values[0].v_pointer) {
-#line 1041 "TransitionEffects.c"
-		TransitionEffectsManager* object;
+#line 1038 "TransitionEffects.c"
+		TransitionEffectsManager * object;
 		object = collect_values[0].v_pointer;
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1048 "TransitionEffects.c"
+#line 1045 "TransitionEffects.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1052 "TransitionEffects.c"
+#line 1049 "TransitionEffects.c"
 		}
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = transition_effects_manager_ref (object);
-#line 1056 "TransitionEffects.c"
+#line 1053 "TransitionEffects.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = NULL;
-#line 1060 "TransitionEffects.c"
+#line 1057 "TransitionEffects.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return NULL;
-#line 1064 "TransitionEffects.c"
+#line 1061 "TransitionEffects.c"
 }
 
 
 static gchar* value_transition_effects_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	TransitionEffectsManager** object_p;
+	TransitionEffectsManager ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (!object_p) {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1075 "TransitionEffects.c"
+#line 1072 "TransitionEffects.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (!value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		*object_p = NULL;
-#line 1081 "TransitionEffects.c"
+#line 1078 "TransitionEffects.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1085 "TransitionEffects.c"
+#line 1082 "TransitionEffects.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		*object_p = transition_effects_manager_ref (value->data[0].v_pointer);
-#line 1089 "TransitionEffects.c"
+#line 1086 "TransitionEffects.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return NULL;
-#line 1093 "TransitionEffects.c"
+#line 1090 "TransitionEffects.c"
 }
 
 
@@ -1105,7 +1102,7 @@ GParamSpec* param_spec_transition_effects_manager (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return G_PARAM_SPEC (spec);
-#line 1107 "TransitionEffects.c"
+#line 1104 "TransitionEffects.c"
 }
 
 
@@ -1114,12 +1111,12 @@ gpointer value_get_transition_effects_manager (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_EFFECTS_MANAGER), NULL);
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return value->data[0].v_pointer;
-#line 1116 "TransitionEffects.c"
+#line 1113 "TransitionEffects.c"
 }
 
 
 void value_set_transition_effects_manager (GValue* value, gpointer v_object) {
-	TransitionEffectsManager* old;
+	TransitionEffectsManager * old;
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_EFFECTS_MANAGER));
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -1134,23 +1131,23 @@ void value_set_transition_effects_manager (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		transition_effects_manager_ref (value->data[0].v_pointer);
-#line 1136 "TransitionEffects.c"
+#line 1133 "TransitionEffects.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = NULL;
-#line 1140 "TransitionEffects.c"
+#line 1137 "TransitionEffects.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (old) {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		transition_effects_manager_unref (old);
-#line 1146 "TransitionEffects.c"
+#line 1143 "TransitionEffects.c"
 	}
 }
 
 
 void value_take_transition_effects_manager (GValue* value, gpointer v_object) {
-	TransitionEffectsManager* old;
+	TransitionEffectsManager * old;
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_EFFECTS_MANAGER));
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -1163,17 +1160,17 @@ void value_take_transition_effects_manager (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = v_object;
-#line 1165 "TransitionEffects.c"
+#line 1162 "TransitionEffects.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = NULL;
-#line 1169 "TransitionEffects.c"
+#line 1166 "TransitionEffects.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (old) {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		transition_effects_manager_unref (old);
-#line 1175 "TransitionEffects.c"
+#line 1172 "TransitionEffects.c"
 	}
 }
 
@@ -1185,14 +1182,14 @@ static void transition_effects_manager_class_init (TransitionEffectsManagerClass
 	((TransitionEffectsManagerClass *) klass)->finalize = transition_effects_manager_finalize;
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_type_class_add_private (klass, sizeof (TransitionEffectsManagerPrivate));
-#line 1187 "TransitionEffects.c"
+#line 1184 "TransitionEffects.c"
 }
 
 
 static void transition_effects_manager_instance_init (TransitionEffectsManager * self) {
-	GeeHashMap* _tmp0_ = NULL;
-	NullTransitionDescriptor* _tmp1_ = NULL;
-	RandomEffectDescriptor* _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	NullTransitionDescriptor* _tmp1_;
+	RandomEffectDescriptor* _tmp2_;
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self->priv = TRANSITION_EFFECTS_MANAGER_GET_PRIVATE (self);
 #line 14 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -1209,15 +1206,15 @@ static void transition_effects_manager_instance_init (TransitionEffectsManager *
 	self->priv->random_descriptor = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TRANSITIONS_TYPE_DESCRIPTOR, SpitTransitionsDescriptor);
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self->ref_count = 1;
-#line 1211 "TransitionEffects.c"
+#line 1208 "TransitionEffects.c"
 }
 
 
-static void transition_effects_manager_finalize (TransitionEffectsManager* obj) {
+static void transition_effects_manager_finalize (TransitionEffectsManager * obj) {
 	TransitionEffectsManager * self;
-	PluginsNotifier* _tmp0_ = NULL;
-	PluginsNotifier* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
+	PluginsNotifier* _tmp0_;
+	PluginsNotifier* _tmp1_;
+	guint _tmp2_;
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TRANSITION_EFFECTS_MANAGER, TransitionEffectsManager);
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -1238,7 +1235,7 @@ static void transition_effects_manager_finalize (TransitionEffectsManager* obj)
 	_g_object_unref0 (self->priv->null_descriptor);
 #line 17 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_g_object_unref0 (self->priv->random_descriptor);
-#line 1240 "TransitionEffects.c"
+#line 1237 "TransitionEffects.c"
 }
 
 
@@ -1257,18 +1254,18 @@ GType transition_effects_manager_get_type (void) {
 
 
 gpointer transition_effects_manager_ref (gpointer instance) {
-	TransitionEffectsManager* self;
+	TransitionEffectsManager * self;
 	self = instance;
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return instance;
-#line 1265 "TransitionEffects.c"
+#line 1262 "TransitionEffects.c"
 }
 
 
 void transition_effects_manager_unref (gpointer instance) {
-	TransitionEffectsManager* self;
+	TransitionEffectsManager * self;
 	self = instance;
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1276,26 +1273,26 @@ void transition_effects_manager_unref (gpointer instance) {
 		TRANSITION_EFFECTS_MANAGER_GET_CLASS (self)->finalize (self);
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1278 "TransitionEffects.c"
+#line 1275 "TransitionEffects.c"
 	}
 }
 
 
 TransitionClock* transition_clock_construct (GType object_type, SpitTransitionsDescriptor* desc) {
 	TransitionClock* self = NULL;
-	SpitTransitionsDescriptor* _tmp0_ = NULL;
-	SpitTransitionsDescriptor* _tmp1_ = NULL;
-	SpitTransitionsDescriptor* _tmp2_ = NULL;
-	SpitTransitionsDescriptor* _tmp3_ = NULL;
-	PluginsStandardHostInterface* _tmp4_ = NULL;
-	PluginsStandardHostInterface* _tmp5_ = NULL;
-	SpitTransitionsEffect* _tmp6_ = NULL;
-	SpitTransitionsEffect* _tmp7_ = NULL;
+	SpitTransitionsDescriptor* _tmp0_;
+	SpitTransitionsDescriptor* _tmp1_;
+	SpitTransitionsDescriptor* _tmp2_;
+	SpitTransitionsDescriptor* _tmp3_;
+	PluginsStandardHostInterface* _tmp4_;
+	PluginsStandardHostInterface* _tmp5_;
+	SpitTransitionsEffect* _tmp6_;
+	SpitTransitionsEffect* _tmp7_;
 	gint _tmp8_ = 0;
 	gint _tmp9_ = 0;
-	SpitTransitionsDescriptor* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	OpTimer* _tmp12_ = NULL;
+	SpitTransitionsDescriptor* _tmp10_;
+	const gchar* _tmp11_;
+	OpTimer* _tmp12_;
 #line 136 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_val_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (desc), NULL);
 #line 136 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -1344,14 +1341,14 @@ TransitionClock* transition_clock_construct (GType object_type, SpitTransitionsD
 	self->priv->paint_timer = _tmp12_;
 #line 136 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return self;
-#line 1346 "TransitionEffects.c"
+#line 1343 "TransitionEffects.c"
 }
 
 
 TransitionClock* transition_clock_new (SpitTransitionsDescriptor* desc) {
 #line 136 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return transition_clock_construct (TYPE_TRANSITION_CLOCK, desc);
-#line 1353 "TransitionEffects.c"
+#line 1350 "TransitionEffects.c"
 }
 
 
@@ -1359,32 +1356,32 @@ gboolean transition_clock_is_in_progress (TransitionClock* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp2_;
 #line 151 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_val_if_fail (IS_TRANSITION_CLOCK (self), FALSE);
 #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp2_ = self->priv->cancelled;
 #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (!_tmp2_) {
-#line 1368 "TransitionEffects.c"
-		SpitTransitionsMotion* _tmp3_ = NULL;
+#line 1365 "TransitionEffects.c"
+		SpitTransitionsMotion* _tmp3_;
 #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp3_ = self->priv->motion;
 #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 1374 "TransitionEffects.c"
+#line 1371 "TransitionEffects.c"
 	} else {
 #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp1_ = FALSE;
-#line 1378 "TransitionEffects.c"
+#line 1375 "TransitionEffects.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (_tmp1_) {
-#line 1382 "TransitionEffects.c"
-		gint _tmp4_ = 0;
-		SpitTransitionsMotion* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+#line 1379 "TransitionEffects.c"
+		gint _tmp4_;
+		SpitTransitionsMotion* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp4_ = self->priv->frame_number;
 #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -1395,17 +1392,17 @@ gboolean transition_clock_is_in_progress (TransitionClock* self) {
 		_tmp7_ = _tmp6_;
 #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp0_ = _tmp4_ < _tmp7_;
-#line 1397 "TransitionEffects.c"
+#line 1394 "TransitionEffects.c"
 	} else {
 #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp0_ = FALSE;
-#line 1401 "TransitionEffects.c"
+#line 1398 "TransitionEffects.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	result = _tmp0_;
 #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 1407 "TransitionEffects.c"
+#line 1404 "TransitionEffects.c"
 }
 
 
@@ -1414,28 +1411,28 @@ static gboolean _transition_clock_tick_gsource_func (gpointer self) {
 	result = transition_clock_tick ((TransitionClock*) self);
 #line 173 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 1416 "TransitionEffects.c"
+#line 1413 "TransitionEffects.c"
 }
 
 
 void transition_clock_start (TransitionClock* self, SpitTransitionsVisuals* visuals, SpitTransitionsDirection direction, gint duration_msec, TransitionClockRepaintCallback repaint, void* repaint_target) {
-	gint _tmp0_ = 0;
-	SpitTransitionsVisuals* _tmp1_ = NULL;
-	SpitTransitionsVisuals* _tmp2_ = NULL;
-	TransitionClockRepaintCallback _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
-	SpitTransitionsDirection _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	SpitTransitionsMotion* _tmp7_ = NULL;
-	SpitTransitionsEffect* _tmp8_ = NULL;
-	SpitTransitionsVisuals* _tmp9_ = NULL;
-	SpitTransitionsMotion* _tmp10_ = NULL;
-	gulong _tmp11_ = 0UL;
-	SpitTransitionsMotion* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	guint _tmp15_ = 0U;
+	gint _tmp0_;
+	SpitTransitionsVisuals* _tmp1_;
+	SpitTransitionsVisuals* _tmp2_;
+	TransitionClockRepaintCallback _tmp3_;
+	void* _tmp3__target;
+	SpitTransitionsDirection _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	SpitTransitionsMotion* _tmp7_;
+	SpitTransitionsEffect* _tmp8_;
+	SpitTransitionsVisuals* _tmp9_;
+	SpitTransitionsMotion* _tmp10_;
+	gulong _tmp11_;
+	SpitTransitionsMotion* _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	guint _tmp15_;
 #line 155 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_if_fail (IS_TRANSITION_CLOCK (self));
 #line 155 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -1448,7 +1445,7 @@ void transition_clock_start (TransitionClock* self, SpitTransitionsVisuals* visu
 	if (_tmp0_ == 0) {
 #line 161 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		return;
-#line 1450 "TransitionEffects.c"
+#line 1447 "TransitionEffects.c"
 	}
 #line 163 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp1_ = visuals;
@@ -1500,7 +1497,7 @@ void transition_clock_start (TransitionClock* self, SpitTransitionsVisuals* visu
 	_tmp15_ = g_timeout_add_full (G_PRIORITY_HIGH, (guint) _tmp14_, _transition_clock_tick_gsource_func, transition_clock_ref (self), transition_clock_unref);
 #line 173 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self->priv->timer_id = _tmp15_;
-#line 1502 "TransitionEffects.c"
+#line 1499 "TransitionEffects.c"
 }
 
 
@@ -1529,45 +1526,45 @@ static void transition_clock_reset (TransitionClock* self) {
 	self->priv->current_fps = 0;
 #line 185 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self->priv->cancelled = FALSE;
-#line 1531 "TransitionEffects.c"
+#line 1528 "TransitionEffects.c"
 }
 
 
 static void transition_clock_cancel_timer (TransitionClock* self) {
-	guint _tmp0_ = 0U;
+	guint _tmp0_;
 #line 188 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_if_fail (IS_TRANSITION_CLOCK (self));
 #line 189 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp0_ = self->priv->timer_id;
 #line 189 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (_tmp0_ != ((guint) 0)) {
-#line 1543 "TransitionEffects.c"
-		guint _tmp1_ = 0U;
+#line 1540 "TransitionEffects.c"
+		guint _tmp1_;
 #line 190 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp1_ = self->priv->timer_id;
 #line 190 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		g_source_remove (_tmp1_);
 #line 191 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		self->priv->timer_id = (guint) 0;
-#line 1551 "TransitionEffects.c"
+#line 1548 "TransitionEffects.c"
 	}
 }
 
 
 static gboolean transition_clock_is_fps_ok (TransitionClock* self) {
 	gboolean result = FALSE;
-	gulong _tmp0_ = 0UL;
-	gint _tmp1_ = 0;
+	gulong _tmp0_;
+	gint _tmp1_;
 	gdouble elapsed_msec = 0.0;
-	gulong _tmp2_ = 0UL;
-	gulong _tmp3_ = 0UL;
-	gdouble _tmp4_ = 0.0;
-	gint _tmp5_ = 0;
-	gdouble _tmp6_ = 0.0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
+	gulong _tmp2_;
+	gulong _tmp3_;
+	gdouble _tmp4_;
+	gint _tmp5_;
+	gdouble _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	gint _tmp13_;
+	gint _tmp14_;
 #line 196 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_val_if_fail (IS_TRANSITION_CLOCK (self), FALSE);
 #line 197 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -1582,7 +1579,7 @@ static gboolean transition_clock_is_fps_ok (TransitionClock* self) {
 		result = TRUE;
 #line 200 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		return result;
-#line 1584 "TransitionEffects.c"
+#line 1581 "TransitionEffects.c"
 	}
 #line 202 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp2_ = now_ms ();
@@ -1598,7 +1595,7 @@ static gboolean transition_clock_is_fps_ok (TransitionClock* self) {
 		result = TRUE;
 #line 204 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		return result;
-#line 1600 "TransitionEffects.c"
+#line 1597 "TransitionEffects.c"
 	}
 #line 206 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp5_ = self->priv->frame_number;
@@ -1612,11 +1609,11 @@ static gboolean transition_clock_is_fps_ok (TransitionClock* self) {
 	_tmp8_ = self->priv->min_fps;
 #line 207 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (_tmp7_ < _tmp8_) {
-#line 1614 "TransitionEffects.c"
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-		gdouble _tmp11_ = 0.0;
-		gint _tmp12_ = 0;
+#line 1611 "TransitionEffects.c"
+		gint _tmp9_;
+		gint _tmp10_;
+		gdouble _tmp11_;
+		gint _tmp12_;
 #line 208 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp9_ = self->priv->current_fps;
 #line 208 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -1628,7 +1625,7 @@ static gboolean transition_clock_is_fps_ok (TransitionClock* self) {
 #line 208 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		g_debug ("TransitionEffects.vala:208: Transition rate of %dfps below minimum of " \
 "%dfps (elapsed=%lf frames=%d)", _tmp9_, _tmp10_, _tmp11_, _tmp12_);
-#line 1629 "TransitionEffects.c"
+#line 1626 "TransitionEffects.c"
 	}
 #line 212 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp13_ = self->priv->current_fps;
@@ -1638,14 +1635,14 @@ static gboolean transition_clock_is_fps_ok (TransitionClock* self) {
 	result = _tmp13_ >= _tmp14_;
 #line 212 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 1639 "TransitionEffects.c"
+#line 1636 "TransitionEffects.c"
 }
 
 
 void transition_clock_cancel (TransitionClock* self) {
-	SpitTransitionsEffect* _tmp0_ = NULL;
-	TransitionClockRepaintCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
+	SpitTransitionsEffect* _tmp0_;
+	TransitionClockRepaintCallback _tmp1_;
+	void* _tmp1__target;
 #line 216 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_if_fail (IS_TRANSITION_CLOCK (self));
 #line 217 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -1662,26 +1659,26 @@ void transition_clock_cancel (TransitionClock* self) {
 	_tmp1__target = self->priv->repaint_target;
 #line 222 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp1_ (_tmp1__target);
-#line 1663 "TransitionEffects.c"
+#line 1660 "TransitionEffects.c"
 }
 
 
 gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width, gint height) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	OpTimer* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
-	SpitTransitionsEffect* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	SpitTransitionsEffect* _tmp26_ = NULL;
-	SpitTransitionsVisuals* _tmp27_ = NULL;
-	SpitTransitionsMotion* _tmp28_ = NULL;
-	cairo_t* _tmp29_ = NULL;
-	gint _tmp30_ = 0;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
-	cairo_t* _tmp33_ = NULL;
-	OpTimer* _tmp34_ = NULL;
+	gboolean _tmp0_;
+	OpTimer* _tmp1_;
+	cairo_t* _tmp2_;
+	SpitTransitionsEffect* _tmp3_;
+	gboolean _tmp4_;
+	SpitTransitionsEffect* _tmp26_;
+	SpitTransitionsVisuals* _tmp27_;
+	SpitTransitionsMotion* _tmp28_;
+	cairo_t* _tmp29_;
+	gint _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
+	cairo_t* _tmp33_;
+	OpTimer* _tmp34_;
 #line 227 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_val_if_fail (IS_TRANSITION_CLOCK (self), FALSE);
 #line 227 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -1694,7 +1691,7 @@ gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width
 		result = FALSE;
 #line 229 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		return result;
-#line 1695 "TransitionEffects.c"
+#line 1692 "TransitionEffects.c"
 	}
 #line 231 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp1_ = self->priv->paint_timer;
@@ -1710,28 +1707,28 @@ gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width
 	_tmp4_ = spit_transitions_effect_needs_clear_background (_tmp3_);
 #line 235 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (_tmp4_) {
-#line 1711 "TransitionEffects.c"
-		cairo_t* _tmp5_ = NULL;
-		SpitTransitionsVisuals* _tmp6_ = NULL;
+#line 1708 "TransitionEffects.c"
+		cairo_t* _tmp5_;
+		SpitTransitionsVisuals* _tmp6_;
 		GdkRGBA _tmp7_ = {0};
-		GdkRGBA _tmp8_ = {0};
-		gdouble _tmp9_ = 0.0;
-		SpitTransitionsVisuals* _tmp10_ = NULL;
+		GdkRGBA _tmp8_;
+		gdouble _tmp9_;
+		SpitTransitionsVisuals* _tmp10_;
 		GdkRGBA _tmp11_ = {0};
-		GdkRGBA _tmp12_ = {0};
-		gdouble _tmp13_ = 0.0;
-		SpitTransitionsVisuals* _tmp14_ = NULL;
+		GdkRGBA _tmp12_;
+		gdouble _tmp13_;
+		SpitTransitionsVisuals* _tmp14_;
 		GdkRGBA _tmp15_ = {0};
-		GdkRGBA _tmp16_ = {0};
-		gdouble _tmp17_ = 0.0;
-		SpitTransitionsVisuals* _tmp18_ = NULL;
+		GdkRGBA _tmp16_;
+		gdouble _tmp17_;
+		SpitTransitionsVisuals* _tmp18_;
 		GdkRGBA _tmp19_ = {0};
-		GdkRGBA _tmp20_ = {0};
-		gdouble _tmp21_ = 0.0;
-		cairo_t* _tmp22_ = NULL;
-		gint _tmp23_ = 0;
-		gint _tmp24_ = 0;
-		cairo_t* _tmp25_ = NULL;
+		GdkRGBA _tmp20_;
+		gdouble _tmp21_;
+		cairo_t* _tmp22_;
+		gint _tmp23_;
+		gint _tmp24_;
+		cairo_t* _tmp25_;
 #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp5_ = ctx;
 #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -1780,7 +1777,7 @@ gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width
 		_tmp25_ = ctx;
 #line 239 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		cairo_fill (_tmp25_);
-#line 1781 "TransitionEffects.c"
+#line 1778 "TransitionEffects.c"
 	}
 #line 242 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp26_ = self->priv->effect;
@@ -1810,20 +1807,20 @@ gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width
 	result = TRUE;
 #line 248 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 1811 "TransitionEffects.c"
+#line 1808 "TransitionEffects.c"
 }
 
 
 static gboolean transition_clock_tick (TransitionClock* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	TransitionClockRepaintCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
-	SpitTransitionsMotion* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gboolean _tmp0_;
+	TransitionClockRepaintCallback _tmp1_;
+	void* _tmp1__target;
+	gboolean _tmp2_;
+	gint _tmp3_;
+	SpitTransitionsMotion* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 #line 251 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_val_if_fail (IS_TRANSITION_CLOCK (self), FALSE);
 #line 252 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -1834,7 +1831,7 @@ static gboolean transition_clock_tick (TransitionClock* self) {
 		g_debug ("TransitionEffects.vala:253: Cancelling transition: below minimum fps");
 #line 254 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		transition_clock_cancel (self);
-#line 1835 "TransitionEffects.c"
+#line 1832 "TransitionEffects.c"
 	}
 #line 259 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp1_ = self->priv->repaint;
@@ -1852,7 +1849,7 @@ static gboolean transition_clock_tick (TransitionClock* self) {
 		result = FALSE;
 #line 264 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		return result;
-#line 1853 "TransitionEffects.c"
+#line 1850 "TransitionEffects.c"
 	}
 #line 268 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp3_ = self->priv->frame_number;
@@ -1864,12 +1861,12 @@ static gboolean transition_clock_tick (TransitionClock* self) {
 	_tmp6_ = _tmp5_;
 #line 268 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (_tmp3_ < _tmp6_) {
-#line 1865 "TransitionEffects.c"
-		SpitTransitionsEffect* _tmp7_ = NULL;
-		SpitTransitionsVisuals* _tmp8_ = NULL;
-		SpitTransitionsMotion* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
+#line 1862 "TransitionEffects.c"
+		SpitTransitionsEffect* _tmp7_;
+		SpitTransitionsVisuals* _tmp8_;
+		SpitTransitionsMotion* _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
 #line 269 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp7_ = self->priv->effect;
 #line 269 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -1884,20 +1881,20 @@ static gboolean transition_clock_tick (TransitionClock* self) {
 		_tmp11_ = self->priv->frame_number;
 #line 269 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		spit_transitions_effect_advance (_tmp7_, _tmp8_, _tmp9_, _tmp11_);
-#line 1885 "TransitionEffects.c"
+#line 1882 "TransitionEffects.c"
 	}
 #line 271 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	result = TRUE;
 #line 271 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 1891 "TransitionEffects.c"
+#line 1888 "TransitionEffects.c"
 }
 
 
 static void value_transition_clock_init (GValue* value) {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	value->data[0].v_pointer = NULL;
-#line 1898 "TransitionEffects.c"
+#line 1895 "TransitionEffects.c"
 }
 
 
@@ -1906,7 +1903,7 @@ static void value_transition_clock_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		transition_clock_unref (value->data[0].v_pointer);
-#line 1907 "TransitionEffects.c"
+#line 1904 "TransitionEffects.c"
 	}
 }
 
@@ -1916,11 +1913,11 @@ static void value_transition_clock_copy_value (const GValue* src_value, GValue*
 	if (src_value->data[0].v_pointer) {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		dest_value->data[0].v_pointer = transition_clock_ref (src_value->data[0].v_pointer);
-#line 1917 "TransitionEffects.c"
+#line 1914 "TransitionEffects.c"
 	} else {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1921 "TransitionEffects.c"
+#line 1918 "TransitionEffects.c"
 	}
 }
 
@@ -1928,66 +1925,66 @@ static void value_transition_clock_copy_value (const GValue* src_value, GValue*
 static gpointer value_transition_clock_peek_pointer (const GValue* value) {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return value->data[0].v_pointer;
-#line 1929 "TransitionEffects.c"
+#line 1926 "TransitionEffects.c"
 }
 
 
 static gchar* value_transition_clock_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (collect_values[0].v_pointer) {
-#line 1936 "TransitionEffects.c"
-		TransitionClock* object;
+#line 1933 "TransitionEffects.c"
+		TransitionClock * object;
 		object = collect_values[0].v_pointer;
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1943 "TransitionEffects.c"
+#line 1940 "TransitionEffects.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1947 "TransitionEffects.c"
+#line 1944 "TransitionEffects.c"
 		}
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = transition_clock_ref (object);
-#line 1951 "TransitionEffects.c"
+#line 1948 "TransitionEffects.c"
 	} else {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = NULL;
-#line 1955 "TransitionEffects.c"
+#line 1952 "TransitionEffects.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return NULL;
-#line 1959 "TransitionEffects.c"
+#line 1956 "TransitionEffects.c"
 }
 
 
 static gchar* value_transition_clock_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	TransitionClock** object_p;
+	TransitionClock ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (!object_p) {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1970 "TransitionEffects.c"
+#line 1967 "TransitionEffects.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (!value->data[0].v_pointer) {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		*object_p = NULL;
-#line 1976 "TransitionEffects.c"
+#line 1973 "TransitionEffects.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1980 "TransitionEffects.c"
+#line 1977 "TransitionEffects.c"
 	} else {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		*object_p = transition_clock_ref (value->data[0].v_pointer);
-#line 1984 "TransitionEffects.c"
+#line 1981 "TransitionEffects.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return NULL;
-#line 1988 "TransitionEffects.c"
+#line 1985 "TransitionEffects.c"
 }
 
 
@@ -2001,7 +1998,7 @@ GParamSpec* param_spec_transition_clock (const gchar* name, const gchar* nick, c
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return G_PARAM_SPEC (spec);
-#line 2002 "TransitionEffects.c"
+#line 1999 "TransitionEffects.c"
 }
 
 
@@ -2010,12 +2007,12 @@ gpointer value_get_transition_clock (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_CLOCK), NULL);
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return value->data[0].v_pointer;
-#line 2011 "TransitionEffects.c"
+#line 2008 "TransitionEffects.c"
 }
 
 
 void value_set_transition_clock (GValue* value, gpointer v_object) {
-	TransitionClock* old;
+	TransitionClock * old;
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_CLOCK));
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -2030,23 +2027,23 @@ void value_set_transition_clock (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		transition_clock_ref (value->data[0].v_pointer);
-#line 2031 "TransitionEffects.c"
+#line 2028 "TransitionEffects.c"
 	} else {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = NULL;
-#line 2035 "TransitionEffects.c"
+#line 2032 "TransitionEffects.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (old) {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		transition_clock_unref (old);
-#line 2041 "TransitionEffects.c"
+#line 2038 "TransitionEffects.c"
 	}
 }
 
 
 void value_take_transition_clock (GValue* value, gpointer v_object) {
-	TransitionClock* old;
+	TransitionClock * old;
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_CLOCK));
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -2059,17 +2056,17 @@ void value_take_transition_clock (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = v_object;
-#line 2060 "TransitionEffects.c"
+#line 2057 "TransitionEffects.c"
 	} else {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = NULL;
-#line 2064 "TransitionEffects.c"
+#line 2061 "TransitionEffects.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (old) {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		transition_clock_unref (old);
-#line 2070 "TransitionEffects.c"
+#line 2067 "TransitionEffects.c"
 	}
 }
 
@@ -2081,7 +2078,7 @@ static void transition_clock_class_init (TransitionClockClass * klass) {
 	((TransitionClockClass *) klass)->finalize = transition_clock_finalize;
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_type_class_add_private (klass, sizeof (TransitionClockPrivate));
-#line 2082 "TransitionEffects.c"
+#line 2079 "TransitionEffects.c"
 }
 
 
@@ -2096,6 +2093,8 @@ static void transition_clock_instance_init (TransitionClock * self) {
 	self->priv->motion = NULL;
 #line 130 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self->priv->repaint = NULL;
+#line 130 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
+	self->priv->repaint_target = self;
 #line 131 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self->priv->timer_id = (guint) 0;
 #line 132 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -2106,20 +2105,20 @@ static void transition_clock_instance_init (TransitionClock * self) {
 	self->priv->cancelled = FALSE;
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self->ref_count = 1;
-#line 2107 "TransitionEffects.c"
+#line 2106 "TransitionEffects.c"
 }
 
 
-static void transition_clock_finalize (TransitionClock* obj) {
+static void transition_clock_finalize (TransitionClock * obj) {
 	TransitionClock * self;
 	gint _tmp0_ = 0;
-	SpitTransitionsMotion* _tmp1_ = NULL;
-	OpTimer* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
+	SpitTransitionsMotion* _tmp1_;
+	OpTimer* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TRANSITION_CLOCK, TransitionClock);
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -2130,10 +2129,10 @@ static void transition_clock_finalize (TransitionClock* obj) {
 	_tmp1_ = self->priv->motion;
 #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (_tmp1_ != NULL) {
-#line 2131 "TransitionEffects.c"
-		SpitTransitionsMotion* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+#line 2130 "TransitionEffects.c"
+		SpitTransitionsMotion* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp2_ = self->priv->motion;
 #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -2142,11 +2141,11 @@ static void transition_clock_finalize (TransitionClock* obj) {
 		_tmp4_ = _tmp3_;
 #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp0_ = _tmp4_;
-#line 2143 "TransitionEffects.c"
+#line 2142 "TransitionEffects.c"
 	} else {
 #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp0_ = 0;
-#line 2147 "TransitionEffects.c"
+#line 2146 "TransitionEffects.c"
 	}
 #line 147 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp5_ = self->priv->paint_timer;
@@ -2175,7 +2174,7 @@ static void transition_clock_finalize (TransitionClock* obj) {
 	_g_object_unref0 (self->priv->visuals);
 #line 129 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_g_object_unref0 (self->priv->motion);
-#line 2175 "TransitionEffects.c"
+#line 2174 "TransitionEffects.c"
 }
 
 
@@ -2194,18 +2193,18 @@ GType transition_clock_get_type (void) {
 
 
 gpointer transition_clock_ref (gpointer instance) {
-	TransitionClock* self;
+	TransitionClock * self;
 	self = instance;
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return instance;
-#line 2200 "TransitionEffects.c"
+#line 2199 "TransitionEffects.c"
 }
 
 
 void transition_clock_unref (gpointer instance) {
-	TransitionClock* self;
+	TransitionClock * self;
 	self = instance;
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2213,7 +2212,7 @@ void transition_clock_unref (gpointer instance) {
 		TRANSITION_CLOCK_GET_CLASS (self)->finalize (self);
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2213 "TransitionEffects.c"
+#line 2212 "TransitionEffects.c"
 	}
 }
 
@@ -2227,7 +2226,7 @@ static gint null_transition_descriptor_real_get_pluggable_interface (SpitPluggab
 	result = SPIT_TRANSITIONS_CURRENT_INTERFACE;
 #line 279 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 2227 "TransitionEffects.c"
+#line 2226 "TransitionEffects.c"
 }
 
 
@@ -2240,23 +2239,20 @@ static const gchar* null_transition_descriptor_real_get_id (SpitPluggable* base)
 	result = NULL_TRANSITION_DESCRIPTOR_EFFECT_ID;
 #line 283 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 2240 "TransitionEffects.c"
+#line 2239 "TransitionEffects.c"
 }
 
 
 static const gchar* null_transition_descriptor_real_get_pluggable_name (SpitPluggable* base) {
 	NullTransitionDescriptor * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 286 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_TRANSITION_DESCRIPTOR, NullTransitionDescriptor);
 #line 287 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	_tmp0_ = _ ("None");
-#line 287 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	result = _tmp0_;
+	result = _ ("None");
 #line 287 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 2256 "TransitionEffects.c"
+#line 2252 "TransitionEffects.c"
 }
 
 
@@ -2266,7 +2262,7 @@ static void null_transition_descriptor_real_get_info (SpitPluggable* base, SpitP
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_TRANSITION_DESCRIPTOR, NullTransitionDescriptor);
 #line 290 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_if_fail (info != NULL);
-#line 2266 "TransitionEffects.c"
+#line 2262 "TransitionEffects.c"
 }
 
 
@@ -2274,14 +2270,14 @@ static void null_transition_descriptor_real_activation (SpitPluggable* base, gbo
 	NullTransitionDescriptor * self;
 #line 293 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_TRANSITION_DESCRIPTOR, NullTransitionDescriptor);
-#line 2274 "TransitionEffects.c"
+#line 2270 "TransitionEffects.c"
 }
 
 
 static SpitTransitionsEffect* null_transition_descriptor_real_create (SpitTransitionsDescriptor* base, SpitHostInterface* host) {
 	NullTransitionDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
-	NullEffect* _tmp0_ = NULL;
+	NullEffect* _tmp0_;
 #line 296 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_TRANSITION_DESCRIPTOR, NullTransitionDescriptor);
 #line 296 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -2292,7 +2288,7 @@ static SpitTransitionsEffect* null_transition_descriptor_real_create (SpitTransi
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
 #line 297 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 2292 "TransitionEffects.c"
+#line 2288 "TransitionEffects.c"
 }
 
 
@@ -2302,21 +2298,21 @@ NullTransitionDescriptor* null_transition_descriptor_construct (GType object_typ
 	self = (NullTransitionDescriptor*) g_object_new (object_type, NULL);
 #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return self;
-#line 2302 "TransitionEffects.c"
+#line 2298 "TransitionEffects.c"
 }
 
 
 NullTransitionDescriptor* null_transition_descriptor_new (void) {
 #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return null_transition_descriptor_construct (TYPE_NULL_TRANSITION_DESCRIPTOR);
-#line 2309 "TransitionEffects.c"
+#line 2305 "TransitionEffects.c"
 }
 
 
 static void null_transition_descriptor_class_init (NullTransitionDescriptorClass * klass) {
 #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	null_transition_descriptor_parent_class = g_type_class_peek_parent (klass);
-#line 2316 "TransitionEffects.c"
+#line 2312 "TransitionEffects.c"
 }
 
 
@@ -2324,16 +2320,16 @@ static void null_transition_descriptor_spit_pluggable_interface_init (SpitPlugga
 #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	null_transition_descriptor_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) null_transition_descriptor_real_get_pluggable_interface;
+	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) null_transition_descriptor_real_get_pluggable_interface;
 #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->get_id = (const gchar* (*)(SpitPluggable*)) null_transition_descriptor_real_get_id;
+	iface->get_id = (const gchar* (*) (SpitPluggable *)) null_transition_descriptor_real_get_id;
 #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) null_transition_descriptor_real_get_pluggable_name;
+	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) null_transition_descriptor_real_get_pluggable_name;
 #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) null_transition_descriptor_real_get_info;
+	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) null_transition_descriptor_real_get_info;
 #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->activation = (void (*)(SpitPluggable*, gboolean)) null_transition_descriptor_real_activation;
-#line 2333 "TransitionEffects.c"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) null_transition_descriptor_real_activation;
+#line 2329 "TransitionEffects.c"
 }
 
 
@@ -2341,8 +2337,8 @@ static void null_transition_descriptor_spit_transitions_descriptor_interface_ini
 #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	null_transition_descriptor_spit_transitions_descriptor_parent_iface = g_type_interface_peek_parent (iface);
 #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->create = (SpitTransitionsEffect* (*)(SpitTransitionsDescriptor*, SpitHostInterface*)) null_transition_descriptor_real_create;
-#line 2342 "TransitionEffects.c"
+	iface->create = (SpitTransitionsEffect* (*) (SpitTransitionsDescriptor *, SpitHostInterface*)) null_transition_descriptor_real_create;
+#line 2338 "TransitionEffects.c"
 }
 
 
@@ -2372,14 +2368,14 @@ NullEffect* null_effect_construct (GType object_type) {
 	self = (NullEffect*) g_object_new (object_type, NULL);
 #line 302 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return self;
-#line 2372 "TransitionEffects.c"
+#line 2368 "TransitionEffects.c"
 }
 
 
 NullEffect* null_effect_new (void) {
 #line 302 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return null_effect_construct (TYPE_NULL_EFFECT);
-#line 2379 "TransitionEffects.c"
+#line 2375 "TransitionEffects.c"
 }
 
 
@@ -2397,13 +2393,13 @@ static void null_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired
 	if (desired_fps) {
 #line 305 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		*desired_fps = _vala_desired_fps;
-#line 2397 "TransitionEffects.c"
+#line 2393 "TransitionEffects.c"
 	}
 #line 305 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (min_fps) {
 #line 305 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		*min_fps = _vala_min_fps;
-#line 2403 "TransitionEffects.c"
+#line 2399 "TransitionEffects.c"
 	}
 }
 
@@ -2416,7 +2412,7 @@ static void null_effect_real_start (SpitTransitionsEffect* base, SpitTransitions
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 310 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 2416 "TransitionEffects.c"
+#line 2412 "TransitionEffects.c"
 }
 
 
@@ -2429,7 +2425,7 @@ static gboolean null_effect_real_needs_clear_background (SpitTransitionsEffect*
 	result = FALSE;
 #line 314 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 2429 "TransitionEffects.c"
+#line 2425 "TransitionEffects.c"
 }
 
 
@@ -2443,7 +2439,7 @@ static void null_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
 #line 317 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2443 "TransitionEffects.c"
+#line 2439 "TransitionEffects.c"
 }
 
 
@@ -2455,7 +2451,7 @@ static void null_effect_real_advance (SpitTransitionsEffect* base, SpitTransitio
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 321 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 2455 "TransitionEffects.c"
+#line 2451 "TransitionEffects.c"
 }
 
 
@@ -2463,14 +2459,14 @@ static void null_effect_real_cancel (SpitTransitionsEffect* base) {
 	NullEffect * self;
 #line 324 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_EFFECT, NullEffect);
-#line 2463 "TransitionEffects.c"
+#line 2459 "TransitionEffects.c"
 }
 
 
 static void null_effect_class_init (NullEffectClass * klass) {
 #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	null_effect_parent_class = g_type_class_peek_parent (klass);
-#line 2470 "TransitionEffects.c"
+#line 2466 "TransitionEffects.c"
 }
 
 
@@ -2478,18 +2474,18 @@ static void null_effect_spit_transitions_effect_interface_init (SpitTransitionsE
 #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	null_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
 #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) null_effect_real_get_fps;
+	iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) null_effect_real_get_fps;
 #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) null_effect_real_start;
+	iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) null_effect_real_start;
 #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) null_effect_real_needs_clear_background;
+	iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) null_effect_real_needs_clear_background;
 #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) null_effect_real_paint;
+	iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) null_effect_real_paint;
 #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) null_effect_real_advance;
+	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) null_effect_real_advance;
 #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->cancel = (void (*)(SpitTransitionsEffect*)) null_effect_real_cancel;
-#line 2489 "TransitionEffects.c"
+	iface->cancel = (void (*) (SpitTransitionsEffect *)) null_effect_real_cancel;
+#line 2485 "TransitionEffects.c"
 }
 
 
@@ -2520,7 +2516,7 @@ static gint random_effect_descriptor_real_get_pluggable_interface (SpitPluggable
 	result = SPIT_TRANSITIONS_CURRENT_INTERFACE;
 #line 331 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 2520 "TransitionEffects.c"
+#line 2516 "TransitionEffects.c"
 }
 
 
@@ -2533,23 +2529,20 @@ static const gchar* random_effect_descriptor_real_get_id (SpitPluggable* base) {
 	result = RANDOM_EFFECT_DESCRIPTOR_EFFECT_ID;
 #line 335 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 2533 "TransitionEffects.c"
+#line 2529 "TransitionEffects.c"
 }
 
 
 static const gchar* random_effect_descriptor_real_get_pluggable_name (SpitPluggable* base) {
 	RandomEffectDescriptor * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 338 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RANDOM_EFFECT_DESCRIPTOR, RandomEffectDescriptor);
 #line 339 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	_tmp0_ = _ ("Random");
-#line 339 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	result = _tmp0_;
+	result = _ ("Random");
 #line 339 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 2549 "TransitionEffects.c"
+#line 2542 "TransitionEffects.c"
 }
 
 
@@ -2559,7 +2552,7 @@ static void random_effect_descriptor_real_get_info (SpitPluggable* base, SpitPlu
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RANDOM_EFFECT_DESCRIPTOR, RandomEffectDescriptor);
 #line 342 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_if_fail (info != NULL);
-#line 2559 "TransitionEffects.c"
+#line 2552 "TransitionEffects.c"
 }
 
 
@@ -2567,14 +2560,14 @@ static void random_effect_descriptor_real_activation (SpitPluggable* base, gbool
 	RandomEffectDescriptor * self;
 #line 345 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RANDOM_EFFECT_DESCRIPTOR, RandomEffectDescriptor);
-#line 2567 "TransitionEffects.c"
+#line 2560 "TransitionEffects.c"
 }
 
 
 static SpitTransitionsEffect* random_effect_descriptor_real_create (SpitTransitionsDescriptor* base, SpitHostInterface* host) {
 	RandomEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
-	NullEffect* _tmp0_ = NULL;
+	NullEffect* _tmp0_;
 #line 348 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RANDOM_EFFECT_DESCRIPTOR, RandomEffectDescriptor);
 #line 348 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -2585,7 +2578,7 @@ static SpitTransitionsEffect* random_effect_descriptor_real_create (SpitTransiti
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
 #line 349 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 2585 "TransitionEffects.c"
+#line 2578 "TransitionEffects.c"
 }
 
 
@@ -2595,21 +2588,21 @@ RandomEffectDescriptor* random_effect_descriptor_construct (GType object_type) {
 	self = (RandomEffectDescriptor*) g_object_new (object_type, NULL);
 #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return self;
-#line 2595 "TransitionEffects.c"
+#line 2588 "TransitionEffects.c"
 }
 
 
 RandomEffectDescriptor* random_effect_descriptor_new (void) {
 #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return random_effect_descriptor_construct (TYPE_RANDOM_EFFECT_DESCRIPTOR);
-#line 2602 "TransitionEffects.c"
+#line 2595 "TransitionEffects.c"
 }
 
 
 static void random_effect_descriptor_class_init (RandomEffectDescriptorClass * klass) {
 #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	random_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
-#line 2609 "TransitionEffects.c"
+#line 2602 "TransitionEffects.c"
 }
 
 
@@ -2617,16 +2610,16 @@ static void random_effect_descriptor_spit_pluggable_interface_init (SpitPluggabl
 #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	random_effect_descriptor_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) random_effect_descriptor_real_get_pluggable_interface;
+	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) random_effect_descriptor_real_get_pluggable_interface;
 #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->get_id = (const gchar* (*)(SpitPluggable*)) random_effect_descriptor_real_get_id;
+	iface->get_id = (const gchar* (*) (SpitPluggable *)) random_effect_descriptor_real_get_id;
 #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) random_effect_descriptor_real_get_pluggable_name;
+	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) random_effect_descriptor_real_get_pluggable_name;
 #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) random_effect_descriptor_real_get_info;
+	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) random_effect_descriptor_real_get_info;
 #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->activation = (void (*)(SpitPluggable*, gboolean)) random_effect_descriptor_real_activation;
-#line 2626 "TransitionEffects.c"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) random_effect_descriptor_real_activation;
+#line 2619 "TransitionEffects.c"
 }
 
 
@@ -2634,8 +2627,8 @@ static void random_effect_descriptor_spit_transitions_descriptor_interface_init
 #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	random_effect_descriptor_spit_transitions_descriptor_parent_iface = g_type_interface_peek_parent (iface);
 #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	iface->create = (SpitTransitionsEffect* (*)(SpitTransitionsDescriptor*, SpitHostInterface*)) random_effect_descriptor_real_create;
-#line 2635 "TransitionEffects.c"
+	iface->create = (SpitTransitionsEffect* (*) (SpitTransitionsDescriptor *, SpitHostInterface*)) random_effect_descriptor_real_create;
+#line 2628 "TransitionEffects.c"
 }
 
 
diff --git a/src/tags/Branch.c b/src/tags/Branch.c
index 9bad2d8..0c02a90 100644
--- a/src/tags/Branch.c
+++ b/src/tags/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.7, the Vala compiler
+/* Branch.c generated by valac 0.36.6, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -640,15 +640,15 @@ struct _TagsSidebarEntryPrivate {
 static gpointer tags_branch_parent_class = NULL;
 extern TagSourceCollection* tag_global;
 static gpointer tags_header_parent_class = NULL;
-static SidebarInternalDropTargetEntryIface* tags_header_sidebar_internal_drop_target_entry_parent_iface = NULL;
-static SidebarInternalDragSourceEntryIface* tags_header_sidebar_internal_drag_source_entry_parent_iface = NULL;
-static SidebarContextableIface* tags_header_sidebar_contextable_parent_iface = NULL;
+static SidebarInternalDropTargetEntryIface * tags_header_sidebar_internal_drop_target_entry_parent_iface = NULL;
+static SidebarInternalDragSourceEntryIface * tags_header_sidebar_internal_drag_source_entry_parent_iface = NULL;
+static SidebarContextableIface * tags_header_sidebar_contextable_parent_iface = NULL;
 static gpointer tags_sidebar_entry_parent_class = NULL;
-static SidebarRenameableEntryIface* tags_sidebar_entry_sidebar_renameable_entry_parent_iface = NULL;
-static SidebarDestroyableEntryIface* tags_sidebar_entry_sidebar_destroyable_entry_parent_iface = NULL;
-static SidebarInternalDropTargetEntryIface* tags_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = NULL;
-static SidebarExpandableEntryIface* tags_sidebar_entry_sidebar_expandable_entry_parent_iface = NULL;
-static SidebarInternalDragSourceEntryIface* tags_sidebar_entry_sidebar_internal_drag_source_entry_parent_iface = NULL;
+static SidebarRenameableEntryIface * tags_sidebar_entry_sidebar_renameable_entry_parent_iface = NULL;
+static SidebarDestroyableEntryIface * tags_sidebar_entry_sidebar_destroyable_entry_parent_iface = NULL;
+static SidebarInternalDropTargetEntryIface * tags_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = NULL;
+static SidebarExpandableEntryIface * tags_sidebar_entry_sidebar_expandable_entry_parent_iface = NULL;
+static SidebarInternalDragSourceEntryIface * tags_sidebar_entry_sidebar_internal_drag_source_entry_parent_iface = NULL;
 
 GType sidebar_branch_get_type (void) G_GNUC_CONST;
 GType tags_branch_get_type (void) G_GNUC_CONST;
@@ -713,7 +713,7 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc
 GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST;
 gchar* tag_get_user_visible_name (Tag* self);
 void sidebar_branch_reorder (SidebarBranch* self, SidebarEntry* entry);
-static void tags_branch_finalize (GObject* obj);
+static void tags_branch_finalize (GObject * obj);
 GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
@@ -776,7 +776,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 GType reparent_tag_command_get_type (void) G_GNUC_CONST;
 static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data);
 static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event);
-static void tags_header_finalize (GObject* obj);
+static void tags_header_finalize (GObject * obj);
 GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
 GType page_get_type (void) G_GNUC_CONST;
 GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
@@ -819,7 +819,7 @@ gchar* tag_get_path (Tag* self);
 GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path);
 static gboolean tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base);
 static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data);
-static void tags_sidebar_entry_finalize (GObject* obj);
+static void tags_sidebar_entry_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -849,13 +849,13 @@ static gint _tags_branch_comparator_gcompare_func (gconstpointer a, gconstpointe
 
 TagsBranch* tags_branch_construct (GType object_type) {
 	TagsBranch * self = NULL;
-	TagsHeader* _tmp0_ = NULL;
-	TagsHeader* _tmp1_ = NULL;
-	TagSourceCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
-	TagSourceCollection* _tmp5_ = NULL;
-	TagSourceCollection* _tmp6_ = NULL;
+	TagsHeader* _tmp0_;
+	TagsHeader* _tmp1_;
+	TagSourceCollection* _tmp2_;
+	GeeCollection* _tmp3_;
+	GeeCollection* _tmp4_;
+	TagSourceCollection* _tmp5_;
+	TagSourceCollection* _tmp6_;
 #line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = tags_header_new ();
 #line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -897,9 +897,9 @@ TagsBranch* tags_branch_new (void) {
 
 TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, Tag* tag) {
 	TagsSidebarEntry* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	Tag* _tmp1_;
+	gpointer _tmp2_;
 #line 30 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (TAGS_IS_BRANCH (self), NULL);
 #line 30 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -932,16 +932,16 @@ gboolean tags_branch_is_user_renameable (TagsBranch* self) {
 
 static gint tags_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gint result = 0;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
-	Tag* _tmp3_ = NULL;
-	Tag* _tmp4_ = NULL;
-	SidebarEntry* _tmp5_ = NULL;
-	Tag* _tmp6_ = NULL;
-	Tag* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
+	SidebarEntry* _tmp0_;
+	SidebarEntry* _tmp1_;
+	SidebarEntry* _tmp2_;
+	Tag* _tmp3_;
+	Tag* _tmp4_;
+	SidebarEntry* _tmp5_;
+	Tag* _tmp6_;
+	Tag* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
 #line 38 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
 #line 38 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1004,8 +1004,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* added_raw, GeeIterable* removed) {
 	Tag* restore_point = NULL;
-	GeeIterable* _tmp0_ = NULL;
-	GeeIterable* _tmp49_ = NULL;
+	GeeIterable* _tmp0_;
+	GeeIterable* _tmp49_;
 #line 46 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_if_fail (TAGS_IS_BRANCH (self));
 #line 46 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1020,7 +1020,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 	if (_tmp0_ != NULL) {
 #line 1022 "Branch.c"
 		GeeSortedSet* added = NULL;
-		GeeTreeSet* _tmp1_ = NULL;
+		GeeTreeSet* _tmp1_;
 #line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp1_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL);
 #line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1028,8 +1028,8 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 #line 1029 "Branch.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp2_ = NULL;
-			GeeIterator* _tmp3_ = NULL;
+			GeeIterable* _tmp2_;
+			GeeIterator* _tmp3_;
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp2_ = added_raw;
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1039,16 +1039,16 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			while (TRUE) {
 #line 1042 "Branch.c"
-				GeeIterator* _tmp4_ = NULL;
-				gboolean _tmp5_ = FALSE;
+				GeeIterator* _tmp4_;
+				gboolean _tmp5_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp6_ = NULL;
-				gpointer _tmp7_ = NULL;
+				GeeIterator* _tmp6_;
+				gpointer _tmp7_;
 				Tag* tag = NULL;
-				DataObject* _tmp8_ = NULL;
-				Tag* _tmp9_ = NULL;
-				GeeSortedSet* _tmp10_ = NULL;
-				Tag* _tmp11_ = NULL;
+				DataObject* _tmp8_;
+				Tag* _tmp9_;
+				GeeSortedSet* _tmp10_;
+				Tag* _tmp11_;
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp4_ = _object_it;
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1089,8 +1089,8 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 		}
 		{
 			GeeIterator* _tag_it = NULL;
-			GeeSortedSet* _tmp12_ = NULL;
-			GeeIterator* _tmp13_ = NULL;
+			GeeSortedSet* _tmp12_;
+			GeeIterator* _tmp13_;
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp12_ = added;
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1100,25 +1100,25 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			while (TRUE) {
 #line 1103 "Branch.c"
-				GeeIterator* _tmp14_ = NULL;
-				gboolean _tmp15_ = FALSE;
+				GeeIterator* _tmp14_;
+				gboolean _tmp15_;
 				Tag* tag = NULL;
-				GeeIterator* _tmp16_ = NULL;
-				gpointer _tmp17_ = NULL;
+				GeeIterator* _tmp16_;
+				gpointer _tmp17_;
 				Tag* parent_tag = NULL;
-				Tag* _tmp18_ = NULL;
-				Tag* _tmp19_ = NULL;
+				Tag* _tmp18_;
+				Tag* _tmp19_;
 				TagsSidebarEntry* entry = NULL;
-				Tag* _tmp31_ = NULL;
-				TagsSidebarEntry* _tmp32_ = NULL;
-				GeeHashMap* _tmp33_ = NULL;
-				Tag* _tmp34_ = NULL;
-				TagsSidebarEntry* _tmp35_ = NULL;
-				Tag* _tmp36_ = NULL;
-				Tag* _tmp37_ = NULL;
-				Tag* _tmp38_ = NULL;
-				Tag* _tmp47_ = NULL;
-				Tag* _tmp48_ = NULL;
+				Tag* _tmp31_;
+				TagsSidebarEntry* _tmp32_;
+				GeeHashMap* _tmp33_;
+				Tag* _tmp34_;
+				TagsSidebarEntry* _tmp35_;
+				Tag* _tmp36_;
+				Tag* _tmp37_;
+				Tag* _tmp38_;
+				Tag* _tmp47_;
+				Tag* _tmp48_;
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp14_ = _tag_it;
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1144,12 +1144,12 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 #line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				while (TRUE) {
 #line 1147 "Branch.c"
-					Tag* _tmp20_ = NULL;
-					GeeHashMap* _tmp21_ = NULL;
-					Tag* _tmp22_ = NULL;
-					gboolean _tmp23_ = FALSE;
-					Tag* _tmp29_ = NULL;
-					Tag* _tmp30_ = NULL;
+					Tag* _tmp20_;
+					GeeHashMap* _tmp21_;
+					Tag* _tmp22_;
+					gboolean _tmp23_;
+					Tag* _tmp29_;
+					Tag* _tmp30_;
 #line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_tmp20_ = parent_tag;
 #line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1168,11 +1168,11 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 					if (!_tmp23_) {
 #line 1170 "Branch.c"
 						TagsSidebarEntry* parent_entry = NULL;
-						Tag* _tmp24_ = NULL;
-						TagsSidebarEntry* _tmp25_ = NULL;
-						GeeHashMap* _tmp26_ = NULL;
-						Tag* _tmp27_ = NULL;
-						TagsSidebarEntry* _tmp28_ = NULL;
+						Tag* _tmp24_;
+						TagsSidebarEntry* _tmp25_;
+						GeeHashMap* _tmp26_;
+						Tag* _tmp27_;
+						TagsSidebarEntry* _tmp28_;
 #line 69 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 						_tmp24_ = parent_tag;
 #line 69 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1229,11 +1229,11 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				if (_tmp38_ != NULL) {
 #line 1231 "Branch.c"
 					TagsSidebarEntry* parent_entry = NULL;
-					GeeHashMap* _tmp39_ = NULL;
-					Tag* _tmp40_ = NULL;
-					gpointer _tmp41_ = NULL;
-					TagsSidebarEntry* _tmp42_ = NULL;
-					TagsSidebarEntry* _tmp43_ = NULL;
+					GeeHashMap* _tmp39_;
+					Tag* _tmp40_;
+					gpointer _tmp41_;
+					TagsSidebarEntry* _tmp42_;
+					TagsSidebarEntry* _tmp43_;
 #line 82 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_tmp39_ = self->priv->entry_map;
 #line 82 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1252,9 +1252,9 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 					_g_object_unref0 (parent_entry);
 #line 1254 "Branch.c"
 				} else {
-					SidebarEntry* _tmp44_ = NULL;
-					SidebarEntry* _tmp45_ = NULL;
-					TagsSidebarEntry* _tmp46_ = NULL;
+					SidebarEntry* _tmp44_;
+					SidebarEntry* _tmp45_;
+					TagsSidebarEntry* _tmp46_;
 #line 85 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_tmp44_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
 #line 85 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1298,8 +1298,8 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 #line 1299 "Branch.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp50_ = NULL;
-			GeeIterator* _tmp51_ = NULL;
+			GeeIterable* _tmp50_;
+			GeeIterator* _tmp51_;
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp50_ = removed;
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1309,25 +1309,25 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			while (TRUE) {
 #line 1312 "Branch.c"
-				GeeIterator* _tmp52_ = NULL;
-				gboolean _tmp53_ = FALSE;
+				GeeIterator* _tmp52_;
+				gboolean _tmp53_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp54_ = NULL;
-				gpointer _tmp55_ = NULL;
+				GeeIterator* _tmp54_;
+				gpointer _tmp55_;
 				Tag* tag = NULL;
-				DataObject* _tmp56_ = NULL;
-				Tag* _tmp57_ = NULL;
+				DataObject* _tmp56_;
+				Tag* _tmp57_;
 				TagsSidebarEntry* entry = NULL;
-				GeeHashMap* _tmp58_ = NULL;
-				Tag* _tmp59_ = NULL;
-				gpointer _tmp60_ = NULL;
-				TagsSidebarEntry* _tmp61_ = NULL;
+				GeeHashMap* _tmp58_;
+				Tag* _tmp59_;
+				gpointer _tmp60_;
+				TagsSidebarEntry* _tmp61_;
 				gboolean is_removed = FALSE;
-				GeeHashMap* _tmp62_ = NULL;
-				Tag* _tmp63_ = NULL;
-				gboolean _tmp64_ = FALSE;
-				gboolean _tmp65_ = FALSE;
-				TagsSidebarEntry* _tmp66_ = NULL;
+				GeeHashMap* _tmp62_;
+				Tag* _tmp63_;
+				gboolean _tmp64_;
+				gboolean _tmp65_;
+				TagsSidebarEntry* _tmp66_;
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp52_ = _object_it;
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1405,12 +1405,12 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 #line 1406 "Branch.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp0_ = altered;
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1430,34 +1430,34 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		while (TRUE) {
 #line 1433 "Branch.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			GeeMap* _tmp10_ = NULL;
-			DataObject* _tmp11_ = NULL;
-			gpointer _tmp12_ = NULL;
-			Alteration* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
-			gboolean _tmp15_ = FALSE;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			GeeMap* _tmp10_;
+			DataObject* _tmp11_;
+			gpointer _tmp12_;
+			Alteration* _tmp13_;
+			gboolean _tmp14_;
+			gboolean _tmp15_;
 			Tag* tag = NULL;
-			DataObject* _tmp16_ = NULL;
-			Tag* _tmp17_ = NULL;
+			DataObject* _tmp16_;
+			Tag* _tmp17_;
 			TagsSidebarEntry* entry = NULL;
-			GeeHashMap* _tmp18_ = NULL;
-			Tag* _tmp19_ = NULL;
-			gpointer _tmp20_ = NULL;
-			TagsSidebarEntry* _tmp21_ = NULL;
-			TagsSidebarEntry* _tmp22_ = NULL;
-			Tag* _tmp23_ = NULL;
-			gchar* _tmp24_ = NULL;
-			gchar* _tmp25_ = NULL;
-			TagsSidebarEntry* _tmp26_ = NULL;
-			Tag* _tmp27_ = NULL;
-			gchar* _tmp28_ = NULL;
-			gchar* _tmp29_ = NULL;
-			TagsSidebarEntry* _tmp30_ = NULL;
+			GeeHashMap* _tmp18_;
+			Tag* _tmp19_;
+			gpointer _tmp20_;
+			TagsSidebarEntry* _tmp21_;
+			TagsSidebarEntry* _tmp22_;
+			Tag* _tmp23_;
+			gchar* _tmp24_;
+			gchar* _tmp25_;
+			TagsSidebarEntry* _tmp26_;
+			Tag* _tmp27_;
+			gchar* _tmp28_;
+			gchar* _tmp29_;
+			TagsSidebarEntry* _tmp30_;
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp6_ = _object_it;
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1569,7 +1569,7 @@ static void tags_branch_class_init (TagsBranchClass * klass) {
 
 
 static void tags_branch_instance_init (TagsBranch * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv = TAGS_BRANCH_GET_PRIVATE (self);
 #line 8 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1580,12 +1580,12 @@ static void tags_branch_instance_init (TagsBranch * self) {
 }
 
 
-static void tags_branch_finalize (GObject* obj) {
+static void tags_branch_finalize (GObject * obj) {
 	TagsBranch * self;
-	TagSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	TagSourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	TagSourceCollection* _tmp0_;
+	guint _tmp1_;
+	TagSourceCollection* _tmp2_;
+	guint _tmp3_;
 #line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_BRANCH, TagsBranch);
 #line 26 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1622,28 +1622,25 @@ GType tags_branch_get_type (void) {
 
 TagsHeader* tags_header_construct (GType object_type) {
 	TagsHeader * self = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 131 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp0_ = _ ("Tags");
-#line 131 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	self = (TagsHeader*) sidebar_header_construct (object_type, _tmp0_, TRUE);
+	self = (TagsHeader*) sidebar_header_construct (object_type, _ ("Tags"), TRUE);
 #line 132 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_header_setup_context_menu (self);
 #line 130 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return self;
-#line 1635 "Branch.c"
+#line 1632 "Branch.c"
 }
 
 
 TagsHeader* tags_header_new (void) {
 #line 130 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return tags_header_construct (TAGS_TYPE_HEADER);
-#line 1642 "Branch.c"
+#line 1639 "Branch.c"
 }
 
 
 static void tags_header_setup_context_menu (TagsHeader* self) {
-	GtkBuilder* _tmp0_ = NULL;
+	GtkBuilder* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 135 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_if_fail (TAGS_IS_HEADER (self));
@@ -1653,17 +1650,17 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
 	_g_object_unref0 (self->priv->builder);
 #line 136 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv->builder = _tmp0_;
-#line 1657 "Branch.c"
+#line 1654 "Branch.c"
 	{
-		GtkBuilder* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+		GtkBuilder* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
 		GMenuModel* model = NULL;
-		GtkBuilder* _tmp4_ = NULL;
-		GObject* _tmp5_ = NULL;
-		GMenuModel* _tmp6_ = NULL;
-		GMenuModel* _tmp7_ = NULL;
-		GtkMenu* _tmp8_ = NULL;
+		GtkBuilder* _tmp4_;
+		GObject* _tmp5_;
+		GMenuModel* _tmp6_;
+		GMenuModel* _tmp7_;
+		GtkMenu* _tmp8_;
 #line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp1_ = self->priv->builder;
 #line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1676,8 +1673,8 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
 		_g_free0 (_tmp3_);
 #line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1680 "Branch.c"
-			goto __catch54_g_error;
+#line 1677 "Branch.c"
+			goto __catch55_g_error;
 		}
 #line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp4_ = self->priv->builder;
@@ -1699,18 +1696,18 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
 		self->priv->context_menu = _tmp8_;
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (model);
-#line 1703 "Branch.c"
+#line 1700 "Branch.c"
 	}
-	goto __finally54;
-	__catch54_g_error:
+	goto __finally55;
+	__catch55_g_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		Application* _tmp13_ = NULL;
-		Application* _tmp14_ = NULL;
+		GError* _tmp9_;
+		const gchar* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		Application* _tmp13_;
+		Application* _tmp14_;
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_error_ = _inner_error_;
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1737,9 +1734,9 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
 		_application_unref0 (_tmp14_);
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_error_free0 (_error_);
-#line 1741 "Branch.c"
+#line 1738 "Branch.c"
 	}
-	__finally54:
+	__finally55:
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1748,7 +1745,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
 		g_clear_error (&_inner_error_);
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return;
-#line 1752 "Branch.c"
+#line 1749 "Branch.c"
 	}
 }
 
@@ -1757,23 +1754,23 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg
 	TagsHeader * self;
 	gboolean result = FALSE;
 	AddTagsDialog* dialog = NULL;
-	AddTagsDialog* _tmp0_ = NULL;
+	AddTagsDialog* _tmp0_;
 	gchar** names = NULL;
-	AddTagsDialog* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gchar** _tmp3_ = NULL;
-	gint names_length1 = 0;
-	gint _names_size_ = 0;
+	AddTagsDialog* _tmp1_;
+	gint _tmp2_;
+	gchar** _tmp3_;
+	gint names_length1;
+	gint _names_size_;
 	gboolean _tmp4_ = FALSE;
-	gchar** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	CommandManager* _tmp7_ = NULL;
-	CommandManager* _tmp8_ = NULL;
-	gchar** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	GeeList* _tmp10_ = NULL;
-	AddTagsCommand* _tmp11_ = NULL;
-	AddTagsCommand* _tmp12_ = NULL;
+	gchar** _tmp5_;
+	gint _tmp5__length1;
+	CommandManager* _tmp7_;
+	CommandManager* _tmp8_;
+	gchar** _tmp9_;
+	gint _tmp9__length1;
+	GeeList* _tmp10_;
+	AddTagsCommand* _tmp11_;
+	AddTagsCommand* _tmp12_;
 #line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
 #line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1800,17 +1797,17 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg
 	if (_tmp5_ == NULL) {
 #line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp4_ = TRUE;
-#line 1804 "Branch.c"
+#line 1801 "Branch.c"
 	} else {
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
+		gchar** _tmp6_;
+		gint _tmp6__length1;
 #line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp6_ = names;
 #line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp6__length1 = names_length1;
 #line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp4_ = _tmp6__length1 == 0;
-#line 1814 "Branch.c"
+#line 1811 "Branch.c"
 	}
 #line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp4_) {
@@ -1822,7 +1819,7 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg
 		_text_entry_dialog_mediator_unref0 (dialog);
 #line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return result;
-#line 1826 "Branch.c"
+#line 1823 "Branch.c"
 	}
 #line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp7_ = app_window_get_command_manager ();
@@ -1852,18 +1849,18 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg
 	_text_entry_dialog_mediator_unref0 (dialog);
 #line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 1856 "Branch.c"
+#line 1853 "Branch.c"
 }
 
 
 static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) {
 	TagsHeader * self;
 	gboolean result = FALSE;
-	GtkSelectionData* _tmp0_ = NULL;
-	GdkAtom _tmp1_ = 0U;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GtkSelectionData* _tmp0_;
+	GdkAtom _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gboolean _tmp4_;
 #line 159 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
 #line 159 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1882,27 +1879,27 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern
 	_g_free0 (_tmp3_);
 #line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp4_) {
-#line 1886 "Branch.c"
+#line 1883 "Branch.c"
 		gchar* old_tag_path = NULL;
-		GtkSelectionData* _tmp5_ = NULL;
-		guchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		TagSourceCollection* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
-		const gchar* _tmp11_ = NULL;
-		GeeList* _tmp12_ = NULL;
-		GeeList* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
-		gint _tmp15_ = 0;
-		gboolean _tmp16_ = FALSE;
-		CommandManager* _tmp17_ = NULL;
-		CommandManager* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		Tag* _tmp20_ = NULL;
-		Tag* _tmp21_ = NULL;
-		ReparentTagCommand* _tmp22_ = NULL;
-		ReparentTagCommand* _tmp23_ = NULL;
+		GtkSelectionData* _tmp5_;
+		guchar* _tmp6_;
+		gchar* _tmp7_;
+		TagSourceCollection* _tmp8_;
+		const gchar* _tmp9_;
+		gboolean _tmp10_;
+		const gchar* _tmp11_;
+		GeeList* _tmp12_;
+		GeeList* _tmp13_;
+		gint _tmp14_;
+		gint _tmp15_;
+		gboolean _tmp16_;
+		CommandManager* _tmp17_;
+		CommandManager* _tmp18_;
+		const gchar* _tmp19_;
+		Tag* _tmp20_;
+		Tag* _tmp21_;
+		ReparentTagCommand* _tmp22_;
+		ReparentTagCommand* _tmp23_;
 #line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp5_ = data;
 #line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1941,7 +1938,7 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern
 			_g_free0 (old_tag_path);
 #line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			return result;
-#line 1945 "Branch.c"
+#line 1942 "Branch.c"
 		}
 #line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp17_ = app_window_get_command_manager ();
@@ -1971,13 +1968,13 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern
 		_g_free0 (old_tag_path);
 #line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return result;
-#line 1975 "Branch.c"
+#line 1972 "Branch.c"
 	}
 #line 174 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = FALSE;
 #line 174 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 1981 "Branch.c"
+#line 1978 "Branch.c"
 }
 
 
@@ -1987,15 +1984,15 @@ static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEn
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
 #line 177 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_if_fail (data != NULL);
-#line 1991 "Branch.c"
+#line 1988 "Branch.c"
 }
 
 
 static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event) {
 	TagsHeader * self;
 	GtkMenu* result = NULL;
-	GtkMenu* _tmp0_ = NULL;
-	GtkMenu* _tmp1_ = NULL;
+	GtkMenu* _tmp0_;
+	GtkMenu* _tmp1_;
 #line 181 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
 #line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2006,7 +2003,7 @@ static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* b
 	result = _tmp1_;
 #line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2010 "Branch.c"
+#line 2007 "Branch.c"
 }
 
 
@@ -2017,7 +2014,7 @@ static void tags_header_class_init (TagsHeaderClass * klass) {
 	g_type_class_add_private (klass, sizeof (TagsHeaderPrivate));
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = tags_header_finalize;
-#line 2021 "Branch.c"
+#line 2018 "Branch.c"
 }
 
 
@@ -2025,10 +2022,10 @@ static void tags_header_sidebar_internal_drop_target_entry_interface_init (Sideb
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_header_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) tags_header_real_internal_drop_received;
+	iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) tags_header_real_internal_drop_received;
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) tags_header_real_internal_drop_received_arbitrary;
-#line 2032 "Branch.c"
+	iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) tags_header_real_internal_drop_received_arbitrary;
+#line 2029 "Branch.c"
 }
 
 
@@ -2036,8 +2033,8 @@ static void tags_header_sidebar_internal_drag_source_entry_interface_init (Sideb
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_header_sidebar_internal_drag_source_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	iface->prepare_selection_data = (void (*)(SidebarInternalDragSourceEntry*, GtkSelectionData*)) tags_header_real_prepare_selection_data;
-#line 2041 "Branch.c"
+	iface->prepare_selection_data = (void (*) (SidebarInternalDragSourceEntry *, GtkSelectionData*)) tags_header_real_prepare_selection_data;
+#line 2038 "Branch.c"
 }
 
 
@@ -2045,8 +2042,8 @@ static void tags_header_sidebar_contextable_interface_init (SidebarContextableIf
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface);
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	iface->get_sidebar_context_menu = (GtkMenu* (*)(SidebarContextable*, GdkEventButton*)) tags_header_real_get_sidebar_context_menu;
-#line 2050 "Branch.c"
+	iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) tags_header_real_get_sidebar_context_menu;
+#line 2047 "Branch.c"
 }
 
 
@@ -2055,11 +2052,11 @@ static void tags_header_instance_init (TagsHeader * self) {
 	self->priv = TAGS_HEADER_GET_PRIVATE (self);
 #line 128 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv->context_menu = NULL;
-#line 2059 "Branch.c"
+#line 2056 "Branch.c"
 }
 
 
-static void tags_header_finalize (GObject* obj) {
+static void tags_header_finalize (GObject * obj) {
 	TagsHeader * self;
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_HEADER, TagsHeader);
@@ -2069,7 +2066,7 @@ static void tags_header_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->context_menu);
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (tags_header_parent_class)->finalize (obj);
-#line 2073 "Branch.c"
+#line 2070 "Branch.c"
 }
 
 
@@ -2093,8 +2090,8 @@ GType tags_header_get_type (void) {
 
 TagsSidebarEntry* tags_sidebar_entry_construct (GType object_type, Tag* tag) {
 	TagsSidebarEntry * self = NULL;
-	Tag* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
+	Tag* _tmp0_;
+	Tag* _tmp1_;
 #line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (IS_TAG (tag), NULL);
 #line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2109,14 +2106,14 @@ TagsSidebarEntry* tags_sidebar_entry_construct (GType object_type, Tag* tag) {
 	self->priv->tag = _tmp1_;
 #line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return self;
-#line 2113 "Branch.c"
+#line 2110 "Branch.c"
 }
 
 
 TagsSidebarEntry* tags_sidebar_entry_new (Tag* tag) {
 #line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return tags_sidebar_entry_construct (TAGS_TYPE_SIDEBAR_ENTRY, tag);
-#line 2120 "Branch.c"
+#line 2117 "Branch.c"
 }
 
 
@@ -2130,8 +2127,8 @@ void tags_sidebar_entry_terminate (void) {
 
 Tag* tags_sidebar_entry_for_tag (TagsSidebarEntry* self) {
 	Tag* result = NULL;
-	Tag* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
+	Tag* _tmp0_;
+	Tag* _tmp1_;
 #line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (TAGS_IS_SIDEBAR_ENTRY (self), NULL);
 #line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2142,15 +2139,15 @@ Tag* tags_sidebar_entry_for_tag (TagsSidebarEntry* self) {
 	result = _tmp1_;
 #line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2146 "Branch.c"
+#line 2143 "Branch.c"
 }
 
 
 static gchar* tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	TagsSidebarEntry * self;
 	gchar* result = NULL;
-	Tag* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	Tag* _tmp0_;
+	gchar* _tmp1_;
 #line 207 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
 #line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2161,15 +2158,15 @@ static gchar* tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry*
 	result = _tmp1_;
 #line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2165 "Branch.c"
+#line 2162 "Branch.c"
 }
 
 
 static gchar* tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
 	TagsSidebarEntry * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 211 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
 #line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2180,15 +2177,15 @@ static gchar* tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry*
 	result = _tmp1_;
 #line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2184 "Branch.c"
+#line 2181 "Branch.c"
 }
 
 
 static Page* tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
 	TagsSidebarEntry * self;
 	Page* result = NULL;
-	Tag* _tmp0_ = NULL;
-	TagPage* _tmp1_ = NULL;
+	Tag* _tmp0_;
+	TagPage* _tmp1_;
 #line 215 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
 #line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2201,7 +2198,7 @@ static Page* tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base)
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
 #line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2205 "Branch.c"
+#line 2202 "Branch.c"
 }
 
 
@@ -2214,126 +2211,168 @@ static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEnt
 	result = TRUE;
 #line 220 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2218 "Branch.c"
+#line 2215 "Branch.c"
 }
 
 
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 2231 "Branch.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 2234 "Branch.c"
+	} else {
+		const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 2241 "Branch.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = TRUE;
+#line 2247 "Branch.c"
+	} else {
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 2257 "Branch.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 2261 "Branch.c"
+		gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 2269 "Branch.c"
+	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GRegex* _tmp9_;
+		GRegex* _tmp10_;
+		gchar* _tmp11_ = NULL;
+		GRegex* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2262 "Branch.c"
-				goto __catch55_g_regex_error;
+#line 2301 "Branch.c"
+				goto __catch56_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 2271 "Branch.c"
+#line 2310 "Branch.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2287 "Branch.c"
-				goto __catch55_g_regex_error;
+#line 2326 "Branch.c"
+				goto __catch56_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 2298 "Branch.c"
+#line 2337 "Branch.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2312 "Branch.c"
+#line 2351 "Branch.c"
 	}
-	goto __finally55;
-	__catch55_g_regex_error:
+	goto __finally56;
+	__catch56_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 2326 "Branch.c"
+#line 2365 "Branch.c"
 	}
-	__finally55:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	__finally56:
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 2337 "Branch.c"
+#line 2376 "Branch.c"
 	}
 }
 
@@ -2341,23 +2380,23 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) {
 	TagsSidebarEntry * self;
 	gchar* prepped = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	Tag* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
-	const gchar* _tmp10_ = NULL;
-	CommandManager* _tmp11_ = NULL;
-	CommandManager* _tmp12_ = NULL;
-	Tag* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	RenameTagCommand* _tmp15_ = NULL;
-	RenameTagCommand* _tmp16_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	const gchar* _tmp5_;
+	Tag* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gboolean _tmp9_;
+	const gchar* _tmp10_;
+	CommandManager* _tmp11_;
+	CommandManager* _tmp12_;
+	Tag* _tmp13_;
+	const gchar* _tmp14_;
+	RenameTagCommand* _tmp15_;
+	RenameTagCommand* _tmp16_;
 #line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
 #line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2376,7 +2415,7 @@ static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const
 		_g_free0 (prepped);
 #line 226 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return;
-#line 2380 "Branch.c"
+#line 2419 "Branch.c"
 	}
 #line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = prepped;
@@ -2404,7 +2443,7 @@ static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const
 		_g_free0 (prepped);
 #line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return;
-#line 2408 "Branch.c"
+#line 2447 "Branch.c"
 	}
 #line 233 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp10_ = prepped;
@@ -2414,7 +2453,7 @@ static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const
 		_g_free0 (prepped);
 #line 234 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return;
-#line 2418 "Branch.c"
+#line 2457 "Branch.c"
 	}
 #line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp11_ = app_window_get_command_manager ();
@@ -2436,14 +2475,14 @@ static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const
 	_command_manager_unref0 (_tmp12_);
 #line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (prepped);
-#line 2440 "Branch.c"
+#line 2479 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base) {
 	TagsSidebarEntry * self;
-	Tag* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Tag* _tmp0_;
+	gboolean _tmp1_;
 #line 239 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
 #line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2452,12 +2491,12 @@ static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* bas
 	_tmp1_ = dialogs_confirm_delete_tag (_tmp0_);
 #line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp1_) {
-#line 2456 "Branch.c"
-		CommandManager* _tmp2_ = NULL;
-		CommandManager* _tmp3_ = NULL;
-		Tag* _tmp4_ = NULL;
-		DeleteTagCommand* _tmp5_ = NULL;
-		DeleteTagCommand* _tmp6_ = NULL;
+#line 2495 "Branch.c"
+		CommandManager* _tmp2_;
+		CommandManager* _tmp3_;
+		Tag* _tmp4_;
+		DeleteTagCommand* _tmp5_;
+		DeleteTagCommand* _tmp6_;
 #line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp2_ = app_window_get_command_manager ();
 #line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2474,7 +2513,7 @@ static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* bas
 		_g_object_unref0 (_tmp6_);
 #line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_command_manager_unref0 (_tmp3_);
-#line 2478 "Branch.c"
+#line 2517 "Branch.c"
 	}
 }
 
@@ -2482,15 +2521,15 @@ static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* bas
 static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) {
 	TagsSidebarEntry * self;
 	gboolean result = FALSE;
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
-	Tag* _tmp2_ = NULL;
-	GeeList* _tmp3_ = NULL;
-	GeeList* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	TagUntagPhotosCommand* _tmp7_ = NULL;
-	TagUntagPhotosCommand* _tmp8_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
+	Tag* _tmp2_;
+	GeeList* _tmp3_;
+	GeeList* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	TagUntagPhotosCommand* _tmp7_;
+	TagUntagPhotosCommand* _tmp8_;
 #line 244 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
 #line 244 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2523,18 +2562,18 @@ static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalD
 	result = TRUE;
 #line 248 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2527 "Branch.c"
+#line 2566 "Branch.c"
 }
 
 
 static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) {
 	TagsSidebarEntry * self;
 	gboolean result = FALSE;
-	GtkSelectionData* _tmp0_ = NULL;
-	GdkAtom _tmp1_ = 0U;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GtkSelectionData* _tmp0_;
+	GdkAtom _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gboolean _tmp4_;
 #line 251 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
 #line 251 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2553,35 +2592,35 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 	_g_free0 (_tmp3_);
 #line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp4_) {
-#line 2557 "Branch.c"
+#line 2596 "Branch.c"
 		gchar* old_tag_path = NULL;
-		GtkSelectionData* _tmp5_ = NULL;
-		guchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		Tag* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
-		TagSourceCollection* _tmp29_ = NULL;
-		const gchar* _tmp30_ = NULL;
-		gboolean _tmp31_ = FALSE;
+		GtkSelectionData* _tmp5_;
+		guchar* _tmp6_;
+		gchar* _tmp7_;
+		const gchar* _tmp8_;
+		Tag* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+		gboolean _tmp12_;
+		TagSourceCollection* _tmp29_;
+		const gchar* _tmp30_;
+		gboolean _tmp31_;
 		Tag* old_tag = NULL;
-		const gchar* _tmp32_ = NULL;
-		Tag* _tmp33_ = NULL;
+		const gchar* _tmp32_;
+		Tag* _tmp33_;
 		Tag* old_tag_parent = NULL;
-		Tag* _tmp34_ = NULL;
-		Tag* _tmp35_ = NULL;
+		Tag* _tmp34_;
+		Tag* _tmp35_;
 		gboolean _tmp36_ = FALSE;
-		Tag* _tmp37_ = NULL;
-		CommandManager* _tmp44_ = NULL;
-		CommandManager* _tmp45_ = NULL;
-		Tag* _tmp46_ = NULL;
-		Tag* _tmp47_ = NULL;
-		gchar* _tmp48_ = NULL;
-		gchar* _tmp49_ = NULL;
-		ReparentTagCommand* _tmp50_ = NULL;
-		ReparentTagCommand* _tmp51_ = NULL;
+		Tag* _tmp37_;
+		CommandManager* _tmp44_;
+		CommandManager* _tmp45_;
+		Tag* _tmp46_;
+		Tag* _tmp47_;
+		gchar* _tmp48_;
+		gchar* _tmp49_;
+		ReparentTagCommand* _tmp50_;
+		ReparentTagCommand* _tmp51_;
 #line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp5_ = data;
 #line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2610,19 +2649,19 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 			_g_free0 (old_tag_path);
 #line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			return result;
-#line 2614 "Branch.c"
+#line 2653 "Branch.c"
 		}
 		{
 			GeeList* _parent_path_list = NULL;
-			Tag* _tmp13_ = NULL;
-			gchar* _tmp14_ = NULL;
-			gchar* _tmp15_ = NULL;
-			GeeList* _tmp16_ = NULL;
-			GeeList* _tmp17_ = NULL;
+			Tag* _tmp13_;
+			gchar* _tmp14_;
+			gchar* _tmp15_;
+			GeeList* _tmp16_;
+			GeeList* _tmp17_;
 			gint _parent_path_size = 0;
-			GeeList* _tmp18_ = NULL;
-			gint _tmp19_ = 0;
-			gint _tmp20_ = 0;
+			GeeList* _tmp18_;
+			gint _tmp19_;
+			gint _tmp20_;
 			gint _parent_path_index = 0;
 #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp13_ = self->priv->tag;
@@ -2650,16 +2689,16 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 			_parent_path_index = -1;
 #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			while (TRUE) {
-#line 2654 "Branch.c"
-				gint _tmp21_ = 0;
-				gint _tmp22_ = 0;
-				gint _tmp23_ = 0;
+#line 2693 "Branch.c"
+				gint _tmp21_;
+				gint _tmp22_;
+				gint _tmp23_;
 				gchar* parent_path = NULL;
-				GeeList* _tmp24_ = NULL;
-				gint _tmp25_ = 0;
-				gpointer _tmp26_ = NULL;
-				const gchar* _tmp27_ = NULL;
-				const gchar* _tmp28_ = NULL;
+				GeeList* _tmp24_;
+				gint _tmp25_;
+				gpointer _tmp26_;
+				const gchar* _tmp27_;
+				const gchar* _tmp28_;
 #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp21_ = _parent_path_index;
 #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2672,7 +2711,7 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 				if (!(_tmp22_ < _tmp23_)) {
 #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					break;
-#line 2676 "Branch.c"
+#line 2715 "Branch.c"
 				}
 #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp24_ = _parent_path_list;
@@ -2698,15 +2737,15 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 					_g_free0 (old_tag_path);
 #line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					return result;
-#line 2702 "Branch.c"
+#line 2741 "Branch.c"
 				}
 #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_g_free0 (parent_path);
-#line 2706 "Branch.c"
+#line 2745 "Branch.c"
 			}
 #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (_parent_path_list);
-#line 2710 "Branch.c"
+#line 2749 "Branch.c"
 		}
 #line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp29_ = tag_global;
@@ -2732,13 +2771,13 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 		_tmp37_ = old_tag_parent;
 #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (_tmp37_ != NULL) {
-#line 2736 "Branch.c"
-			Tag* _tmp38_ = NULL;
-			gchar* _tmp39_ = NULL;
-			gchar* _tmp40_ = NULL;
-			Tag* _tmp41_ = NULL;
-			gchar* _tmp42_ = NULL;
-			gchar* _tmp43_ = NULL;
+#line 2775 "Branch.c"
+			Tag* _tmp38_;
+			gchar* _tmp39_;
+			gchar* _tmp40_;
+			Tag* _tmp41_;
+			gchar* _tmp42_;
+			gchar* _tmp43_;
 #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp38_ = old_tag_parent;
 #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2757,11 +2796,11 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 			_g_free0 (_tmp43_);
 #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (_tmp40_);
-#line 2761 "Branch.c"
+#line 2800 "Branch.c"
 		} else {
 #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp36_ = FALSE;
-#line 2765 "Branch.c"
+#line 2804 "Branch.c"
 		}
 #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (_tmp36_) {
@@ -2775,7 +2814,7 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 			_g_free0 (old_tag_path);
 #line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			return result;
-#line 2779 "Branch.c"
+#line 2818 "Branch.c"
 		}
 #line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp44_ = app_window_get_command_manager ();
@@ -2811,13 +2850,13 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 		_g_free0 (old_tag_path);
 #line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return result;
-#line 2815 "Branch.c"
+#line 2854 "Branch.c"
 	}
 #line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = FALSE;
 #line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2821 "Branch.c"
+#line 2860 "Branch.c"
 }
 
 
@@ -2830,71 +2869,71 @@ static gboolean tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry
 	result = FALSE;
 #line 283 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2834 "Branch.c"
+#line 2873 "Branch.c"
 }
 
 
 static guint8* string_get_data (const gchar* self, int* result_length1) {
 	guint8* result;
 	guint8* res = NULL;
-	gint res_length1 = 0;
-	gint _res_size_ = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	guint8* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	guint8* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint res_length1;
+	gint _res_size_;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	guint8* _tmp3_;
+	gint _tmp3__length1;
+	guint8* _tmp4_;
+	gint _tmp4__length1;
+#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 2878 "Branch.c"
+#line 2917 "Branch.c"
 	}
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2884 "Branch.c"
+#line 2923 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data) {
 	TagsSidebarEntry * self;
-	GtkSelectionData* _tmp0_ = NULL;
-	GdkAtom _tmp1_ = 0U;
-	Tag* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	guint8* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	guint8* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
+	GtkSelectionData* _tmp0_;
+	GdkAtom _tmp1_;
+	Tag* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	guint8* _tmp5_;
+	gint _tmp5__length1;
+	guint8* _tmp6_;
+	gint _tmp6__length1;
 #line 286 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
 #line 286 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2919,7 +2958,7 @@ static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragS
 	gtk_selection_data_set (_tmp0_, _tmp1_, 0, _tmp6_, _tmp6__length1);
 #line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (_tmp4_);
-#line 2923 "Branch.c"
+#line 2962 "Branch.c"
 }
 
 
@@ -2929,14 +2968,14 @@ static void tags_sidebar_entry_class_init (TagsSidebarEntryClass * klass) {
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_type_class_add_private (klass, sizeof (TagsSidebarEntryPrivate));
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) tags_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) tags_sidebar_entry_real_get_sidebar_name;
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) tags_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) tags_sidebar_entry_real_get_sidebar_icon;
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) tags_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) tags_sidebar_entry_real_create_page;
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = tags_sidebar_entry_finalize;
-#line 2940 "Branch.c"
+#line 2979 "Branch.c"
 }
 
 
@@ -2944,10 +2983,10 @@ static void tags_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarR
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	iface->is_user_renameable = (gboolean (*)(SidebarRenameableEntry*)) tags_sidebar_entry_real_is_user_renameable;
+	iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) tags_sidebar_entry_real_is_user_renameable;
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	iface->rename = (void (*)(SidebarRenameableEntry*, const gchar*)) tags_sidebar_entry_real_rename;
-#line 2951 "Branch.c"
+	iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) tags_sidebar_entry_real_rename;
+#line 2990 "Branch.c"
 }
 
 
@@ -2955,8 +2994,8 @@ static void tags_sidebar_entry_sidebar_destroyable_entry_interface_init (Sidebar
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	iface->destroy_source = (void (*)(SidebarDestroyableEntry*)) tags_sidebar_entry_real_destroy_source;
-#line 2960 "Branch.c"
+	iface->destroy_source = (void (*) (SidebarDestroyableEntry *)) tags_sidebar_entry_real_destroy_source;
+#line 2999 "Branch.c"
 }
 
 
@@ -2964,10 +3003,10 @@ static void tags_sidebar_entry_sidebar_internal_drop_target_entry_interface_init
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) tags_sidebar_entry_real_internal_drop_received;
+	iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) tags_sidebar_entry_real_internal_drop_received;
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) tags_sidebar_entry_real_internal_drop_received_arbitrary;
-#line 2971 "Branch.c"
+	iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) tags_sidebar_entry_real_internal_drop_received_arbitrary;
+#line 3010 "Branch.c"
 }
 
 
@@ -2975,8 +3014,8 @@ static void tags_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarE
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	iface->expand_on_select = (gboolean (*)(SidebarExpandableEntry*)) tags_sidebar_entry_real_expand_on_select;
-#line 2980 "Branch.c"
+	iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) tags_sidebar_entry_real_expand_on_select;
+#line 3019 "Branch.c"
 }
 
 
@@ -2984,24 +3023,24 @@ static void tags_sidebar_entry_sidebar_internal_drag_source_entry_interface_init
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_internal_drag_source_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	iface->prepare_selection_data = (void (*)(SidebarInternalDragSourceEntry*, GtkSelectionData*)) tags_sidebar_entry_real_prepare_selection_data;
-#line 2989 "Branch.c"
+	iface->prepare_selection_data = (void (*) (SidebarInternalDragSourceEntry *, GtkSelectionData*)) tags_sidebar_entry_real_prepare_selection_data;
+#line 3028 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_instance_init (TagsSidebarEntry * self) {
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv = TAGS_SIDEBAR_ENTRY_GET_PRIVATE (self);
 #line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = g_strdup (RESOURCES_ICON_ONE_TAG);
 #line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv->single_tag_icon = _tmp0_;
-#line 3001 "Branch.c"
+#line 3040 "Branch.c"
 }
 
 
-static void tags_sidebar_entry_finalize (GObject* obj) {
+static void tags_sidebar_entry_finalize (GObject * obj) {
 	TagsSidebarEntry * self;
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
@@ -3011,7 +3050,7 @@ static void tags_sidebar_entry_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->tag);
 #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (tags_sidebar_entry_parent_class)->finalize (obj);
-#line 3015 "Branch.c"
+#line 3054 "Branch.c"
 }
 
 
diff --git a/src/tags/HierarchicalTagIndex.c b/src/tags/HierarchicalTagIndex.c
index 82dfdda..c188835 100644
--- a/src/tags/HierarchicalTagIndex.c
+++ b/src/tags/HierarchicalTagIndex.c
@@ -1,4 +1,4 @@
-/* HierarchicalTagIndex.c generated by valac 0.34.7, the Vala compiler
+/* HierarchicalTagIndex.c generated by valac 0.36.6, the Vala compiler
  * generated from HierarchicalTagIndex.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -140,16 +140,16 @@ GeeCollection* hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self);
 gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, const gchar* path);
 gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, const gchar* name);
 gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, gchar** names, int names_length1, int* result_length1);
-static void _vala_array_add65 (gchar*** array, int* length, int* size, gchar* value);
-static void hierarchical_tag_index_finalize (HierarchicalTagIndex* obj);
+static void _vala_array_add65 (gchar** * array, int* length, int* size, gchar* value);
+static void hierarchical_tag_index_finalize (HierarchicalTagIndex * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
 HierarchicalTagIndex* hierarchical_tag_index_construct (GType object_type) {
 	HierarchicalTagIndex* self = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GeeTreeSet* _tmp1_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeTreeSet* _tmp1_;
 #line 11 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	self = (HierarchicalTagIndex*) g_type_create_instance (object_type);
 #line 12 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -180,11 +180,11 @@ HierarchicalTagIndex* hierarchical_tag_index_new (void) {
 HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_paths) {
 	HierarchicalTagIndex* result = NULL;
 	GeeCollection* paths = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp2_;
 	HierarchicalTagIndex* _result_ = NULL;
-	HierarchicalTagIndex* _tmp3_ = NULL;
+	HierarchicalTagIndex* _tmp3_;
 #line 16 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (client_paths), NULL);
 #line 17 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -202,8 +202,8 @@ HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_p
 #line 203 "HierarchicalTagIndex.c"
 	{
 		GeeIterator* _path_it = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeCollection* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 		_tmp4_ = paths;
 #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -213,13 +213,13 @@ HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_p
 #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 		while (TRUE) {
 #line 216 "HierarchicalTagIndex.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			gchar* path = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			const gchar* _tmp10_ = NULL;
-			gboolean _tmp11_ = FALSE;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			const gchar* _tmp10_;
+			gboolean _tmp11_;
 #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 			_tmp6_ = _path_it;
 #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -244,8 +244,8 @@ HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_p
 			if (_tmp11_) {
 #line 246 "HierarchicalTagIndex.c"
 				GeeCollection* components = NULL;
-				const gchar* _tmp12_ = NULL;
-				GeeList* _tmp13_ = NULL;
+				const gchar* _tmp12_;
+				GeeList* _tmp13_;
 #line 23 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 				_tmp12_ = path;
 #line 23 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -255,8 +255,8 @@ HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_p
 #line 256 "HierarchicalTagIndex.c"
 				{
 					GeeIterator* _component_it = NULL;
-					GeeCollection* _tmp14_ = NULL;
-					GeeIterator* _tmp15_ = NULL;
+					GeeCollection* _tmp14_;
+					GeeIterator* _tmp15_;
 #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 					_tmp14_ = components;
 #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -266,14 +266,14 @@ HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_p
 #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 					while (TRUE) {
 #line 269 "HierarchicalTagIndex.c"
-						GeeIterator* _tmp16_ = NULL;
-						gboolean _tmp17_ = FALSE;
+						GeeIterator* _tmp16_;
+						gboolean _tmp17_;
 						gchar* component = NULL;
-						GeeIterator* _tmp18_ = NULL;
-						gpointer _tmp19_ = NULL;
-						HierarchicalTagIndex* _tmp20_ = NULL;
-						const gchar* _tmp21_ = NULL;
-						const gchar* _tmp22_ = NULL;
+						GeeIterator* _tmp18_;
+						gpointer _tmp19_;
+						HierarchicalTagIndex* _tmp20_;
+						const gchar* _tmp21_;
+						const gchar* _tmp22_;
 #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 						_tmp16_ = _component_it;
 #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -310,9 +310,9 @@ HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_p
 				_g_object_unref0 (components);
 #line 312 "HierarchicalTagIndex.c"
 			} else {
-				HierarchicalTagIndex* _tmp23_ = NULL;
-				const gchar* _tmp24_ = NULL;
-				const gchar* _tmp25_ = NULL;
+				HierarchicalTagIndex* _tmp23_;
+				const gchar* _tmp24_;
+				const gchar* _tmp25_;
 #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 				_tmp23_ = _result_;
 #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -343,11 +343,11 @@ HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_p
 
 HierarchicalTagIndex* hierarchical_tag_index_get_global_index (void) {
 	HierarchicalTagIndex* result = NULL;
-	TagSourceCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	HierarchicalTagIndex* _tmp3_ = NULL;
-	HierarchicalTagIndex* _tmp4_ = NULL;
+	TagSourceCollection* _tmp0_;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp2_;
+	HierarchicalTagIndex* _tmp3_;
+	HierarchicalTagIndex* _tmp4_;
 #line 37 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	_tmp0_ = tag_global;
 #line 37 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -369,16 +369,16 @@ HierarchicalTagIndex* hierarchical_tag_index_get_global_index (void) {
 
 
 void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* tag, const gchar* path) {
-	GeeMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GeeMap* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gpointer _tmp9_ = NULL;
-	GeeCollection* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	GeeSortedSet* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
+	GeeMap* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
+	GeeMap* _tmp7_;
+	const gchar* _tmp8_;
+	gpointer _tmp9_;
+	GeeCollection* _tmp10_;
+	const gchar* _tmp11_;
+	GeeSortedSet* _tmp12_;
+	const gchar* _tmp13_;
 #line 40 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	g_return_if_fail (IS_HIERARCHICAL_TAG_INDEX (self));
 #line 40 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -394,10 +394,10 @@ void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* t
 #line 41 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	if (!_tmp2_) {
 #line 397 "HierarchicalTagIndex.c"
-		GeeMap* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		GeeArrayList* _tmp5_ = NULL;
-		GeeArrayList* _tmp6_ = NULL;
+		GeeMap* _tmp3_;
+		const gchar* _tmp4_;
+		GeeArrayList* _tmp5_;
+		GeeArrayList* _tmp6_;
 #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 		_tmp3_ = self->priv->tag_table;
 #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -438,9 +438,9 @@ void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* t
 
 GeeCollection* hierarchical_tag_index_get_all_paths (HierarchicalTagIndex* self) {
 	GeeCollection* result = NULL;
-	GeeSortedSet* _tmp0_ = NULL;
-	GeeSortedSet* _tmp1_ = NULL;
-	GeeSortedSet* _tmp2_ = NULL;
+	GeeSortedSet* _tmp0_;
+	GeeSortedSet* _tmp1_;
+	GeeSortedSet* _tmp2_;
 #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), NULL);
 #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -459,9 +459,9 @@ GeeCollection* hierarchical_tag_index_get_all_paths (HierarchicalTagIndex* self)
 
 gboolean hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, const gchar* tag) {
 	gboolean result = FALSE;
-	GeeMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeMap* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 53 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), FALSE);
 #line 53 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -482,9 +482,9 @@ gboolean hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, con
 
 GeeCollection* hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self) {
 	GeeCollection* result = NULL;
-	GeeMap* _tmp0_ = NULL;
-	GeeSet* _tmp1_ = NULL;
-	GeeSet* _tmp2_ = NULL;
+	GeeMap* _tmp0_;
+	GeeSet* _tmp1_;
+	GeeSet* _tmp2_;
 #line 57 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), NULL);
 #line 58 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -503,9 +503,9 @@ GeeCollection* hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self)
 
 gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, const gchar* path) {
 	gboolean result = FALSE;
-	GeeSortedSet* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeSortedSet* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 61 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), FALSE);
 #line 61 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -526,12 +526,12 @@ gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, const
 
 gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, const gchar* name) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 	GeeCollection* paths = NULL;
-	GeeMap* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gpointer _tmp6_ = NULL;
+	GeeMap* _tmp4_;
+	const gchar* _tmp5_;
+	gpointer _tmp6_;
 #line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), NULL);
 #line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -543,8 +543,8 @@ gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, con
 #line 66 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	if (!_tmp1_) {
 #line 546 "HierarchicalTagIndex.c"
-		const gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+		const gchar* _tmp2_;
+		gchar* _tmp3_;
 #line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 		_tmp2_ = name;
 #line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -566,8 +566,8 @@ gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, con
 #line 567 "HierarchicalTagIndex.c"
 	{
 		GeeIterator* _path_it = NULL;
-		GeeCollection* _tmp7_ = NULL;
-		GeeIterator* _tmp8_ = NULL;
+		GeeCollection* _tmp7_;
+		GeeIterator* _tmp8_;
 #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 		_tmp7_ = paths;
 #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -577,22 +577,22 @@ gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, con
 #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 		while (TRUE) {
 #line 580 "HierarchicalTagIndex.c"
-			GeeIterator* _tmp9_ = NULL;
-			gboolean _tmp10_ = FALSE;
+			GeeIterator* _tmp9_;
+			gboolean _tmp10_;
 			gchar* path = NULL;
-			GeeIterator* _tmp11_ = NULL;
-			gpointer _tmp12_ = NULL;
+			GeeIterator* _tmp11_;
+			gpointer _tmp12_;
 			GeeList* components = NULL;
-			const gchar* _tmp13_ = NULL;
-			GeeList* _tmp14_ = NULL;
-			GeeList* _tmp15_ = NULL;
-			GeeList* _tmp16_ = NULL;
-			gint _tmp17_ = 0;
-			gint _tmp18_ = 0;
-			gpointer _tmp19_ = NULL;
-			gchar* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
-			gboolean _tmp22_ = FALSE;
+			const gchar* _tmp13_;
+			GeeList* _tmp14_;
+			GeeList* _tmp15_;
+			GeeList* _tmp16_;
+			gint _tmp17_;
+			gint _tmp18_;
+			gpointer _tmp19_;
+			gchar* _tmp20_;
+			const gchar* _tmp21_;
+			gboolean _tmp22_;
 #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 			_tmp9_ = _path_it;
 #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -665,7 +665,7 @@ gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, con
 }
 
 
-static void _vala_array_add65 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add65 (gchar** * array, int* length, int* size, gchar* value) {
 #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	if ((*length) == (*size)) {
 #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -685,13 +685,13 @@ static void _vala_array_add65 (gchar*** array, int* length, int* size, gchar* va
 gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, gchar** names, int names_length1, int* result_length1) {
 	gchar** result = NULL;
 	gchar** _result_ = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
+	gchar** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar** _tmp6_;
+	gint _tmp6__length1;
 #line 80 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), NULL);
 #line 81 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -719,7 +719,7 @@ gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex*
 #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 		for (name_it = 0; name_it < _tmp1__length1; name_it = name_it + 1) {
 #line 722 "HierarchicalTagIndex.c"
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 			gchar* name = NULL;
 #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 			_tmp2_ = g_strdup (name_collection[name_it]);
@@ -727,10 +727,10 @@ gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex*
 			name = _tmp2_;
 #line 729 "HierarchicalTagIndex.c"
 			{
-				gchar** _tmp3_ = NULL;
-				gint _tmp3__length1 = 0;
-				const gchar* _tmp4_ = NULL;
-				gchar* _tmp5_ = NULL;
+				gchar** _tmp3_;
+				gint _tmp3__length1;
+				const gchar* _tmp4_;
+				gchar* _tmp5_;
 #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 				_tmp3_ = _result_;
 #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -807,7 +807,7 @@ static gchar* value_hierarchical_tag_index_collect_value (GValue* value, guint n
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	if (collect_values[0].v_pointer) {
 #line 810 "HierarchicalTagIndex.c"
-		HierarchicalTagIndex* object;
+		HierarchicalTagIndex * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -834,7 +834,7 @@ static gchar* value_hierarchical_tag_index_collect_value (GValue* value, guint n
 
 
 static gchar* value_hierarchical_tag_index_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	HierarchicalTagIndex** object_p;
+	HierarchicalTagIndex ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	if (!object_p) {
@@ -886,7 +886,7 @@ gpointer value_get_hierarchical_tag_index (const GValue* value) {
 
 
 void value_set_hierarchical_tag_index (GValue* value, gpointer v_object) {
-	HierarchicalTagIndex* old;
+	HierarchicalTagIndex * old;
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_INDEX));
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -917,7 +917,7 @@ void value_set_hierarchical_tag_index (GValue* value, gpointer v_object) {
 
 
 void value_take_hierarchical_tag_index (GValue* value, gpointer v_object) {
-	HierarchicalTagIndex* old;
+	HierarchicalTagIndex * old;
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_INDEX));
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -965,7 +965,7 @@ static void hierarchical_tag_index_instance_init (HierarchicalTagIndex * self) {
 }
 
 
-static void hierarchical_tag_index_finalize (HierarchicalTagIndex* obj) {
+static void hierarchical_tag_index_finalize (HierarchicalTagIndex * obj) {
 	HierarchicalTagIndex * self;
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HIERARCHICAL_TAG_INDEX, HierarchicalTagIndex);
@@ -994,7 +994,7 @@ GType hierarchical_tag_index_get_type (void) {
 
 
 gpointer hierarchical_tag_index_ref (gpointer instance) {
-	HierarchicalTagIndex* self;
+	HierarchicalTagIndex * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1005,7 +1005,7 @@ gpointer hierarchical_tag_index_ref (gpointer instance) {
 
 
 void hierarchical_tag_index_unref (gpointer instance) {
-	HierarchicalTagIndex* self;
+	HierarchicalTagIndex * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
diff --git a/src/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c
index f213e17..f8cfd5d 100644
--- a/src/tags/HierarchicalTagUtilities.c
+++ b/src/tags/HierarchicalTagUtilities.c
@@ -1,4 +1,4 @@
-/* HierarchicalTagUtilities.c generated by valac 0.34.7, the Vala compiler
+/* HierarchicalTagUtilities.c generated by valac 0.36.6, the Vala compiler
  * generated from HierarchicalTagUtilities.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -198,7 +198,7 @@ GeeList* tag_get_hierarchical_children (Tag* self);
 void tag_flatten (Tag* self);
 HierarchicalTagUtilities* hierarchical_tag_utilities_new (void);
 HierarchicalTagUtilities* hierarchical_tag_utilities_construct (GType object_type);
-static void hierarchical_tag_utilities_finalize (HierarchicalTagUtilities* obj);
+static void hierarchical_tag_utilities_finalize (HierarchicalTagUtilities * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
@@ -211,8 +211,8 @@ static gint _vala_array_length (gpointer array);
      */
 gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 #line 14 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 15 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -222,8 +222,8 @@ gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name) {
 #line 15 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	if (!_tmp1_) {
 #line 225 "HierarchicalTagUtilities.c"
-		const gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+		const gchar* _tmp2_;
+		gchar* _tmp3_;
 #line 16 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp2_ = name;
 #line 16 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -234,8 +234,8 @@ gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name) {
 		return result;
 #line 236 "HierarchicalTagUtilities.c"
 	} else {
-		const gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 18 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp4_ = name;
 #line 18 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -259,41 +259,41 @@ gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name) {
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 279 "HierarchicalTagUtilities.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 287 "HierarchicalTagUtilities.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 299 "HierarchicalTagUtilities.c"
 	}
@@ -304,121 +304,121 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 323 "HierarchicalTagUtilities.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 329 "HierarchicalTagUtilities.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 333 "HierarchicalTagUtilities.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 337 "HierarchicalTagUtilities.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 349 "HierarchicalTagUtilities.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 359 "HierarchicalTagUtilities.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 365 "HierarchicalTagUtilities.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 379 "HierarchicalTagUtilities.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 389 "HierarchicalTagUtilities.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 395 "HierarchicalTagUtilities.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 404 "HierarchicalTagUtilities.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 424 "HierarchicalTagUtilities.c"
 }
@@ -426,8 +426,8 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 
 gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 #line 28 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	g_return_val_if_fail (path != NULL, NULL);
 #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -437,13 +437,13 @@ gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path) {
 #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	if (_tmp1_) {
 #line 440 "HierarchicalTagUtilities.c"
-		const gchar* _tmp2_ = NULL;
-		GeeList* _tmp3_ = NULL;
-		GeeList* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
+		const gchar* _tmp2_;
+		GeeList* _tmp3_;
+		GeeList* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
 #line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp2_ = path;
 #line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -468,8 +468,8 @@ gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path) {
 		return result;
 #line 470 "HierarchicalTagUtilities.c"
 	} else {
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
+		const gchar* _tmp9_;
+		gchar* _tmp10_;
 #line 34 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp9_ = path;
 #line 34 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -491,12 +491,12 @@ gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path) {
 GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path) {
 	GeeList* result = NULL;
 	gchar* path = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	GeeList* _result_ = NULL;
-	GeeArrayList* _tmp2_ = NULL;
+	GeeArrayList* _tmp2_;
 	gchar* accumulator = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp3_;
 #line 43 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	g_return_val_if_fail (in_path != NULL, NULL);
 #line 44 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -516,12 +516,12 @@ GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path
 #line 517 "HierarchicalTagUtilities.c"
 	{
 		GeeList* _component_list = NULL;
-		const gchar* _tmp4_ = NULL;
-		GeeList* _tmp5_ = NULL;
+		const gchar* _tmp4_;
+		GeeList* _tmp5_;
 		gint _component_size = 0;
-		GeeList* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
+		GeeList* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
 		gint _component_index = 0;
 #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp4_ = path;
@@ -542,20 +542,20 @@ GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path
 #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		while (TRUE) {
 #line 545 "HierarchicalTagUtilities.c"
-			gint _tmp9_ = 0;
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
+			gint _tmp9_;
+			gint _tmp10_;
+			gint _tmp11_;
 			gchar* component = NULL;
-			GeeList* _tmp12_ = NULL;
-			gint _tmp13_ = 0;
-			gpointer _tmp14_ = NULL;
-			const gchar* _tmp15_ = NULL;
-			const gchar* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
-			const gchar* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
+			GeeList* _tmp12_;
+			gint _tmp13_;
+			gpointer _tmp14_;
+			const gchar* _tmp15_;
+			const gchar* _tmp16_;
+			gchar* _tmp17_;
+			gchar* _tmp18_;
+			gchar* _tmp19_;
+			const gchar* _tmp20_;
+			const gchar* _tmp21_;
 #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			_tmp9_ = _component_index;
 #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -601,8 +601,8 @@ GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path
 #line 51 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			if (g_strcmp0 (_tmp20_, _tmp21_) != 0) {
 #line 604 "HierarchicalTagUtilities.c"
-				GeeList* _tmp22_ = NULL;
-				const gchar* _tmp23_ = NULL;
+				GeeList* _tmp22_;
+				const gchar* _tmp23_;
 #line 52 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 				_tmp22_ = _result_;
 #line 52 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -640,21 +640,21 @@ GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path
 GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_path) {
 	GeeList* result = NULL;
 	gchar* path = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	GeeArrayList* components = NULL;
-	GeeArrayList* _tmp2_ = NULL;
+	GeeArrayList* _tmp2_;
 	gchar** raw_components = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gchar** _tmp5_ = NULL;
-	gint raw_components_length1 = 0;
-	gint _raw_components_size_ = 0;
-	gchar** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	GeeArrayList* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
+	const gchar* _tmp3_;
+	gchar** _tmp4_;
+	gchar** _tmp5_;
+	gint raw_components_length1;
+	gint _raw_components_size_;
+	gchar** _tmp6_;
+	gint _tmp6__length1;
+	GeeArrayList* _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
 #line 64 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	g_return_val_if_fail (in_path != NULL, NULL);
 #line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -694,7 +694,7 @@ GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_p
 #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		for (component_it = 0; component_it < _tmp6__length1; component_it = component_it + 1) {
 #line 697 "HierarchicalTagUtilities.c"
-			gchar* _tmp7_ = NULL;
+			gchar* _tmp7_;
 			gchar* component = NULL;
 #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			_tmp7_ = g_strdup (component_collection[component_it]);
@@ -702,14 +702,14 @@ GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_p
 			component = _tmp7_;
 #line 704 "HierarchicalTagUtilities.c"
 			{
-				const gchar* _tmp8_ = NULL;
+				const gchar* _tmp8_;
 #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 				_tmp8_ = component;
 #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 				if (g_strcmp0 (_tmp8_, "") != 0) {
 #line 711 "HierarchicalTagUtilities.c"
-					GeeArrayList* _tmp9_ = NULL;
-					const gchar* _tmp10_ = NULL;
+					GeeArrayList* _tmp9_;
+					const gchar* _tmp10_;
 #line 73 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 					_tmp9_ = components;
 #line 73 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -751,408 +751,408 @@ GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_p
      */
 static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		separator = "";
 #line 766 "HierarchicalTagUtilities.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
 #line 776 "HierarchicalTagUtilities.c"
 	} else {
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp4_;
+		gint _tmp4__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
 #line 786 "HierarchicalTagUtilities.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
 #line 792 "HierarchicalTagUtilities.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
 #line 803 "HierarchicalTagUtilities.c"
-			gchar** _tmp7_ = NULL;
-			gint _tmp7__length1 = 0;
-			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			gchar** _tmp7_;
+			gint _tmp7__length1;
+			const gchar* _tmp8_;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
 #line 815 "HierarchicalTagUtilities.c"
 		} else {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
 #line 819 "HierarchicalTagUtilities.c"
 		}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
 #line 823 "HierarchicalTagUtilities.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 827 "HierarchicalTagUtilities.c"
 		gint i = 0;
 		gsize len = 0UL;
-		gint _tmp31_ = 0;
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
-		gsize _tmp35_ = 0UL;
-		const gchar* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
-		gint _tmp39_ = 0;
+		gint _tmp31_;
+		gint _tmp33_;
+		gint _tmp34_;
+		gsize _tmp35_;
+		const gchar* _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
+		gint _tmp39_;
 		const gchar* res = NULL;
-		gsize _tmp40_ = 0UL;
-		void* _tmp41_ = NULL;
+		gsize _tmp40_;
+		void* _tmp41_;
 		void* ptr = NULL;
-		const gchar* _tmp42_ = NULL;
-		gchar** _tmp43_ = NULL;
-		gint _tmp43__length1 = 0;
-		const gchar* _tmp44_ = NULL;
-		void* _tmp45_ = NULL;
-		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp42_;
+		gchar** _tmp43_;
+		gint _tmp43__length1;
+		const gchar* _tmp44_;
+		void* _tmp45_;
+		const gchar* _tmp62_;
+#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
 #line 850 "HierarchicalTagUtilities.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 859 "HierarchicalTagUtilities.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
+				gchar** _tmp13_;
+				gint _tmp13__length1;
 				gint _tmp21_ = 0;
-				gchar** _tmp22_ = NULL;
-				gint _tmp22__length1 = 0;
-				gint _tmp23_ = 0;
-				const gchar* _tmp24_ = NULL;
-				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp22_;
+				gint _tmp22__length1;
+				gint _tmp23_;
+				const gchar* _tmp24_;
+				gsize _tmp30_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
 #line 872 "HierarchicalTagUtilities.c"
-					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp10_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
 #line 878 "HierarchicalTagUtilities.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
 #line 888 "HierarchicalTagUtilities.c"
-					gint _tmp14_ = 0;
-					gchar** _tmp15_ = NULL;
-					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp14_;
+					gchar** _tmp15_;
+					gint _tmp15__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
 #line 900 "HierarchicalTagUtilities.c"
 				} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
 #line 904 "HierarchicalTagUtilities.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
 #line 910 "HierarchicalTagUtilities.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_ = NULL;
-					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp17_;
+					gint _tmp17__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
 #line 921 "HierarchicalTagUtilities.c"
-						gchar** _tmp18_ = NULL;
-						gint _tmp18__length1 = 0;
-						gint _tmp19_ = 0;
-						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+						gchar** _tmp18_;
+						gint _tmp18__length1;
+						gint _tmp19_;
+						const gchar* _tmp20_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
 #line 936 "HierarchicalTagUtilities.c"
 					} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
 #line 940 "HierarchicalTagUtilities.c"
 					}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
 #line 944 "HierarchicalTagUtilities.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
 #line 950 "HierarchicalTagUtilities.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
 #line 962 "HierarchicalTagUtilities.c"
-					gchar** _tmp25_ = NULL;
-					gint _tmp25__length1 = 0;
-					gint _tmp26_ = 0;
-					const gchar* _tmp27_ = NULL;
-					gint _tmp28_ = 0;
-					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp25_;
+					gint _tmp25__length1;
+					gint _tmp26_;
+					const gchar* _tmp27_;
+					gint _tmp28_;
+					gint _tmp29_;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
 #line 983 "HierarchicalTagUtilities.c"
 				} else {
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
 #line 987 "HierarchicalTagUtilities.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
 #line 993 "HierarchicalTagUtilities.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
 #line 1000 "HierarchicalTagUtilities.c"
-			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			gchar* _tmp32_;
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return result;
 #line 1008 "HierarchicalTagUtilities.c"
 		}
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
 #line 1046 "HierarchicalTagUtilities.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 1055 "HierarchicalTagUtilities.c"
-				gint _tmp48_ = 0;
-				gchar** _tmp49_ = NULL;
-				gint _tmp49__length1 = 0;
-				void* _tmp50_ = NULL;
-				const gchar* _tmp51_ = NULL;
-				void* _tmp52_ = NULL;
+				gint _tmp48_;
+				gchar** _tmp49_;
+				gint _tmp49__length1;
+				void* _tmp50_;
+				const gchar* _tmp51_;
+				void* _tmp52_;
 				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_ = NULL;
-				gint _tmp54__length1 = 0;
-				gint _tmp55_ = 0;
-				const gchar* _tmp56_ = NULL;
-				void* _tmp60_ = NULL;
-				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp54_;
+				gint _tmp54__length1;
+				gint _tmp55_;
+				const gchar* _tmp56_;
+				void* _tmp60_;
+				void* _tmp61_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
 #line 1071 "HierarchicalTagUtilities.c"
-					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp47_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
 #line 1077 "HierarchicalTagUtilities.c"
 				}
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
 #line 1091 "HierarchicalTagUtilities.c"
 				}
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
 #line 1111 "HierarchicalTagUtilities.c"
-					gchar** _tmp57_ = NULL;
-					gint _tmp57__length1 = 0;
-					gint _tmp58_ = 0;
-					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp57_;
+					gint _tmp57__length1;
+					gint _tmp58_;
+					const gchar* _tmp59_;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
 #line 1126 "HierarchicalTagUtilities.c"
 				} else {
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
 #line 1130 "HierarchicalTagUtilities.c"
 				}
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
 #line 1138 "HierarchicalTagUtilities.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 1149 "HierarchicalTagUtilities.c"
 	} else {
-		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp63_;
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 1158 "HierarchicalTagUtilities.c"
 	}
@@ -1161,20 +1161,20 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 
 gchar* hierarchical_tag_utilities_join_path_components (gchar** path_components, int path_components_length1) {
 	gchar* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
 	gchar* tmp = NULL;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar** _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar** _tmp6_;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
 #line 87 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	_tmp0_ = path_components;
 #line 87 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -1230,14 +1230,14 @@ gchar* hierarchical_tag_utilities_join_path_components (gchar** path_components,
 gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path) {
 	gchar* result = NULL;
 	gchar* path = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	GeeList* components = NULL;
-	GeeList* _tmp2_ = NULL;
+	GeeList* _tmp2_;
 	gchar* basename = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gpointer _tmp5_ = NULL;
+	gint _tmp3_;
+	gint _tmp4_;
+	gpointer _tmp5_;
 #line 93 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	g_return_val_if_fail (in_path != NULL, NULL);
 #line 94 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -1272,154 +1272,196 @@ gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path) {
 
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 1283 "HierarchicalTagUtilities.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 1289 "HierarchicalTagUtilities.c"
+	} else {
+		const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 1296 "HierarchicalTagUtilities.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = TRUE;
+#line 1302 "HierarchicalTagUtilities.c"
+	} else {
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 1312 "HierarchicalTagUtilities.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 1316 "HierarchicalTagUtilities.c"
+		gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 1324 "HierarchicalTagUtilities.c"
+	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GRegex* _tmp9_;
+		GRegex* _tmp10_;
+		gchar* _tmp11_ = NULL;
+		GRegex* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1314 "HierarchicalTagUtilities.c"
-				goto __catch56_g_regex_error;
+#line 1356 "HierarchicalTagUtilities.c"
+				goto __catch57_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 1323 "HierarchicalTagUtilities.c"
+#line 1365 "HierarchicalTagUtilities.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1339 "HierarchicalTagUtilities.c"
-				goto __catch56_g_regex_error;
+#line 1381 "HierarchicalTagUtilities.c"
+				goto __catch57_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 1350 "HierarchicalTagUtilities.c"
+#line 1392 "HierarchicalTagUtilities.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1364 "HierarchicalTagUtilities.c"
+#line 1406 "HierarchicalTagUtilities.c"
 	}
-	goto __finally56;
-	__catch56_g_regex_error:
+	goto __finally57;
+	__catch57_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 1378 "HierarchicalTagUtilities.c"
+#line 1420 "HierarchicalTagUtilities.c"
 	}
-	__finally56:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	__finally57:
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 1389 "HierarchicalTagUtilities.c"
+#line 1431 "HierarchicalTagUtilities.c"
 	}
 }
 
 
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_ = 0L;
-	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1408 "HierarchicalTagUtilities.c"
+#line 1450 "HierarchicalTagUtilities.c"
 }
 
 
 gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar* foreign_separator) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gboolean _tmp4_;
 	gboolean is_valid = FALSE;
 	const gchar* _tmp17_ = NULL;
-	gboolean _tmp18_ = FALSE;
-	gchar* _tmp20_ = NULL;
+	gboolean _tmp18_;
+	gchar* _tmp20_;
 #line 103 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	g_return_val_if_fail (in_tag != NULL, NULL);
 #line 103 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -1438,9 +1480,9 @@ gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar
 	_tmp4_ = g_str_has_prefix (_tmp3_, TAG_PATH_SEPARATOR_STRING);
 #line 106 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	if (!_tmp4_) {
-#line 1442 "HierarchicalTagUtilities.c"
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+#line 1484 "HierarchicalTagUtilities.c"
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 107 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp5_ = _result_;
 #line 107 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -1449,40 +1491,40 @@ gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar
 		_g_free0 (_result_);
 #line 107 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_result_ = _tmp6_;
-#line 1453 "HierarchicalTagUtilities.c"
+#line 1495 "HierarchicalTagUtilities.c"
 	}
 #line 110 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	is_valid = FALSE;
-#line 1457 "HierarchicalTagUtilities.c"
+#line 1499 "HierarchicalTagUtilities.c"
 	{
 		gint i = 0;
 #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		i = 0;
-#line 1462 "HierarchicalTagUtilities.c"
+#line 1504 "HierarchicalTagUtilities.c"
 		{
 			gboolean _tmp7_ = FALSE;
 #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			_tmp7_ = TRUE;
 #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			while (TRUE) {
-#line 1469 "HierarchicalTagUtilities.c"
-				gint _tmp9_ = 0;
-				const gchar* _tmp10_ = NULL;
-				gint _tmp11_ = 0;
-				gint _tmp12_ = 0;
-				const gchar* _tmp13_ = NULL;
-				gint _tmp14_ = 0;
-				gchar _tmp15_ = '\0';
-				gchar _tmp16_ = '\0';
+#line 1511 "HierarchicalTagUtilities.c"
+				gint _tmp9_;
+				const gchar* _tmp10_;
+				gint _tmp11_;
+				gint _tmp12_;
+				const gchar* _tmp13_;
+				gint _tmp14_;
+				gchar _tmp15_;
+				gchar _tmp16_;
 #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 				if (!_tmp7_) {
-#line 1480 "HierarchicalTagUtilities.c"
-					gint _tmp8_ = 0;
+#line 1522 "HierarchicalTagUtilities.c"
+					gint _tmp8_;
 #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 					_tmp8_ = i;
 #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 					i = _tmp8_ + 1;
-#line 1486 "HierarchicalTagUtilities.c"
+#line 1528 "HierarchicalTagUtilities.c"
 				}
 #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 				_tmp7_ = FALSE;
@@ -1498,7 +1540,7 @@ gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar
 				if (!(_tmp9_ < _tmp12_)) {
 #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 					break;
-#line 1502 "HierarchicalTagUtilities.c"
+#line 1544 "HierarchicalTagUtilities.c"
 				}
 #line 112 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 				_tmp13_ = _result_;
@@ -1514,7 +1556,7 @@ gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar
 					is_valid = TRUE;
 #line 114 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 					break;
-#line 1518 "HierarchicalTagUtilities.c"
+#line 1560 "HierarchicalTagUtilities.c"
 				}
 			}
 		}
@@ -1523,17 +1565,17 @@ gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar
 	_tmp18_ = is_valid;
 #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	if (_tmp18_) {
-#line 1527 "HierarchicalTagUtilities.c"
-		const gchar* _tmp19_ = NULL;
+#line 1569 "HierarchicalTagUtilities.c"
+		const gchar* _tmp19_;
 #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp19_ = _result_;
 #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp17_ = _tmp19_;
-#line 1533 "HierarchicalTagUtilities.c"
+#line 1575 "HierarchicalTagUtilities.c"
 	} else {
 #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp17_ = NULL;
-#line 1537 "HierarchicalTagUtilities.c"
+#line 1579 "HierarchicalTagUtilities.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	_tmp20_ = g_strdup (_tmp17_);
@@ -1543,14 +1585,14 @@ gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar
 	_g_free0 (_result_);
 #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	return result;
-#line 1547 "HierarchicalTagUtilities.c"
+#line 1589 "HierarchicalTagUtilities.c"
 }
 
 
 gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 121 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	g_return_val_if_fail (in_tag != NULL, NULL);
 #line 122 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -1561,25 +1603,25 @@ gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag) {
 	result = _tmp1_;
 #line 122 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	return result;
-#line 1565 "HierarchicalTagUtilities.c"
+#line 1607 "HierarchicalTagUtilities.c"
 }
 
 
 HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_keywords (GeeCollection* h_keywords) {
 	HierarchicalTagIndex* result = NULL;
 	HierarchicalTagIndex* index = NULL;
-	HierarchicalTagIndex* _tmp0_ = NULL;
+	HierarchicalTagIndex* _tmp0_;
 #line 125 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (h_keywords), NULL);
 #line 126 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	_tmp0_ = hierarchical_tag_index_new ();
 #line 126 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	index = _tmp0_;
-#line 1579 "HierarchicalTagUtilities.c"
+#line 1621 "HierarchicalTagUtilities.c"
 	{
 		GeeIterator* _keyword_it = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
 #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp1_ = h_keywords;
 #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -1588,29 +1630,29 @@ HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_key
 		_keyword_it = _tmp2_;
 #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		while (TRUE) {
-#line 1592 "HierarchicalTagUtilities.c"
-			GeeIterator* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 1634 "HierarchicalTagUtilities.c"
+			GeeIterator* _tmp3_;
+			gboolean _tmp4_;
 			gchar* keyword = NULL;
-			GeeIterator* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
 			GeeList* parent_paths = NULL;
-			const gchar* _tmp7_ = NULL;
-			GeeList* _tmp8_ = NULL;
+			const gchar* _tmp7_;
+			GeeList* _tmp8_;
 			GeeList* path_components = NULL;
-			const gchar* _tmp9_ = NULL;
-			GeeList* _tmp10_ = NULL;
-			GeeList* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
-			GeeList* _tmp14_ = NULL;
-			gint _tmp15_ = 0;
-			gint _tmp16_ = 0;
-			HierarchicalTagIndex* _tmp39_ = NULL;
-			const gchar* _tmp40_ = NULL;
-			gchar* _tmp41_ = NULL;
-			gchar* _tmp42_ = NULL;
-			const gchar* _tmp43_ = NULL;
+			const gchar* _tmp9_;
+			GeeList* _tmp10_;
+			GeeList* _tmp11_;
+			gint _tmp12_;
+			gint _tmp13_;
+			GeeList* _tmp14_;
+			gint _tmp15_;
+			gint _tmp16_;
+			HierarchicalTagIndex* _tmp39_;
+			const gchar* _tmp40_;
+			gchar* _tmp41_;
+			gchar* _tmp42_;
+			const gchar* _tmp43_;
 #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			_tmp3_ = _keyword_it;
 #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -1619,7 +1661,7 @@ HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_key
 			if (!_tmp4_) {
 #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 				break;
-#line 1623 "HierarchicalTagUtilities.c"
+#line 1665 "HierarchicalTagUtilities.c"
 			}
 #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			_tmp5_ = _keyword_it;
@@ -1653,39 +1695,39 @@ HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_key
 			_tmp16_ = _tmp15_;
 #line 134 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			_vala_assert (_tmp13_ <= _tmp16_, "parent_paths.size <= path_components.size");
-#line 1657 "HierarchicalTagUtilities.c"
+#line 1699 "HierarchicalTagUtilities.c"
 			{
 				gint i = 0;
 #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 				i = 0;
-#line 1662 "HierarchicalTagUtilities.c"
+#line 1704 "HierarchicalTagUtilities.c"
 				{
 					gboolean _tmp17_ = FALSE;
 #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 					_tmp17_ = TRUE;
 #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 					while (TRUE) {
-#line 1669 "HierarchicalTagUtilities.c"
-						gint _tmp19_ = 0;
-						GeeList* _tmp20_ = NULL;
-						gint _tmp21_ = 0;
-						gint _tmp22_ = 0;
-						HierarchicalTagIndex* _tmp23_ = NULL;
-						GeeList* _tmp24_ = NULL;
-						gint _tmp25_ = 0;
-						gpointer _tmp26_ = NULL;
-						gchar* _tmp27_ = NULL;
-						gboolean _tmp28_ = FALSE;
-						gboolean _tmp29_ = FALSE;
+#line 1711 "HierarchicalTagUtilities.c"
+						gint _tmp19_;
+						GeeList* _tmp20_;
+						gint _tmp21_;
+						gint _tmp22_;
+						HierarchicalTagIndex* _tmp23_;
+						GeeList* _tmp24_;
+						gint _tmp25_;
+						gpointer _tmp26_;
+						gchar* _tmp27_;
+						gboolean _tmp28_;
+						gboolean _tmp29_;
 #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 						if (!_tmp17_) {
-#line 1683 "HierarchicalTagUtilities.c"
-							gint _tmp18_ = 0;
+#line 1725 "HierarchicalTagUtilities.c"
+							gint _tmp18_;
 #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 							_tmp18_ = i;
 #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 							i = _tmp18_ + 1;
-#line 1689 "HierarchicalTagUtilities.c"
+#line 1731 "HierarchicalTagUtilities.c"
 						}
 #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 						_tmp17_ = FALSE;
@@ -1701,7 +1743,7 @@ HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_key
 						if (!(_tmp19_ < _tmp22_)) {
 #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 							break;
-#line 1705 "HierarchicalTagUtilities.c"
+#line 1747 "HierarchicalTagUtilities.c"
 						}
 #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 						_tmp23_ = index;
@@ -1721,16 +1763,16 @@ HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_key
 						_g_free0 (_tmp27_);
 #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 						if (_tmp29_) {
-#line 1725 "HierarchicalTagUtilities.c"
-							HierarchicalTagIndex* _tmp30_ = NULL;
-							GeeList* _tmp31_ = NULL;
-							gint _tmp32_ = 0;
-							gpointer _tmp33_ = NULL;
-							gchar* _tmp34_ = NULL;
-							GeeList* _tmp35_ = NULL;
-							gint _tmp36_ = 0;
-							gpointer _tmp37_ = NULL;
-							gchar* _tmp38_ = NULL;
+#line 1767 "HierarchicalTagUtilities.c"
+							HierarchicalTagIndex* _tmp30_;
+							GeeList* _tmp31_;
+							gint _tmp32_;
+							gpointer _tmp33_;
+							gchar* _tmp34_;
+							GeeList* _tmp35_;
+							gint _tmp36_;
+							gpointer _tmp37_;
+							gchar* _tmp38_;
 #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 							_tmp30_ = index;
 #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -1755,7 +1797,7 @@ HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_key
 							_g_free0 (_tmp38_);
 #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 							_g_free0 (_tmp34_);
-#line 1759 "HierarchicalTagUtilities.c"
+#line 1801 "HierarchicalTagUtilities.c"
 						}
 					}
 				}
@@ -1780,40 +1822,40 @@ HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_key
 			_g_object_unref0 (parent_paths);
 #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			_g_free0 (keyword);
-#line 1784 "HierarchicalTagUtilities.c"
+#line 1826 "HierarchicalTagUtilities.c"
 		}
 #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_g_object_unref0 (_keyword_it);
-#line 1788 "HierarchicalTagUtilities.c"
+#line 1830 "HierarchicalTagUtilities.c"
 	}
 #line 144 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	result = index;
 #line 144 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	return result;
-#line 1794 "HierarchicalTagUtilities.c"
+#line 1836 "HierarchicalTagUtilities.c"
 }
 
 
 gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	GeeList* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gboolean _tmp6_ = FALSE;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	GeeList* _tmp2_;
+	GeeList* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gboolean _tmp6_;
 	gchar* path = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	TagSourceCollection* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
+	const gchar* _tmp9_;
+	gchar* _tmp10_;
+	TagSourceCollection* _tmp11_;
+	const gchar* _tmp12_;
+	gboolean _tmp13_;
 	const gchar* _tmp20_ = NULL;
-	TagSourceCollection* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
-	gchar* _tmp25_ = NULL;
+	TagSourceCollection* _tmp21_;
+	const gchar* _tmp22_;
+	gboolean _tmp23_;
+	gchar* _tmp25_;
 #line 148 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	_tmp0_ = client_path;
 #line 148 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -1822,7 +1864,7 @@ gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path)
 		result = NULL;
 #line 149 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		return result;
-#line 1826 "HierarchicalTagUtilities.c"
+#line 1868 "HierarchicalTagUtilities.c"
 	}
 #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	_tmp1_ = client_path;
@@ -1840,9 +1882,9 @@ gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path)
 	_g_object_unref0 (_tmp3_);
 #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	if (_tmp6_) {
-#line 1844 "HierarchicalTagUtilities.c"
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
+#line 1886 "HierarchicalTagUtilities.c"
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
 #line 152 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp7_ = client_path;
 #line 152 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -1851,7 +1893,7 @@ gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path)
 		result = _tmp8_;
 #line 152 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		return result;
-#line 1855 "HierarchicalTagUtilities.c"
+#line 1897 "HierarchicalTagUtilities.c"
 	}
 #line 154 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	_tmp9_ = client_path;
@@ -1867,18 +1909,18 @@ gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path)
 	_tmp13_ = tag_source_collection_exists (_tmp11_, _tmp12_, FALSE);
 #line 156 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	if (!_tmp13_) {
-#line 1871 "HierarchicalTagUtilities.c"
-		const gchar* _tmp14_ = NULL;
-		gboolean _tmp15_ = FALSE;
+#line 1913 "HierarchicalTagUtilities.c"
+		const gchar* _tmp14_;
+		gboolean _tmp15_;
 #line 157 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp14_ = path;
 #line 157 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp15_ = g_str_has_prefix (_tmp14_, TAG_PATH_SEPARATOR_STRING);
 #line 157 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		if (_tmp15_) {
-#line 1880 "HierarchicalTagUtilities.c"
-			const gchar* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
+#line 1922 "HierarchicalTagUtilities.c"
+			const gchar* _tmp16_;
+			gchar* _tmp17_;
 #line 158 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			_tmp16_ = path;
 #line 158 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -1887,10 +1929,10 @@ gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path)
 			_g_free0 (path);
 #line 158 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			path = _tmp17_;
-#line 1891 "HierarchicalTagUtilities.c"
+#line 1933 "HierarchicalTagUtilities.c"
 		} else {
-			const gchar* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
+			const gchar* _tmp18_;
+			gchar* _tmp19_;
 #line 160 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			_tmp18_ = path;
 #line 160 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -1899,7 +1941,7 @@ gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path)
 			_g_free0 (path);
 #line 160 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			path = _tmp19_;
-#line 1903 "HierarchicalTagUtilities.c"
+#line 1945 "HierarchicalTagUtilities.c"
 		}
 	}
 #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -1910,17 +1952,17 @@ gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path)
 	_tmp23_ = tag_source_collection_exists (_tmp21_, _tmp22_, FALSE);
 #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	if (_tmp23_) {
-#line 1914 "HierarchicalTagUtilities.c"
-		const gchar* _tmp24_ = NULL;
+#line 1956 "HierarchicalTagUtilities.c"
+		const gchar* _tmp24_;
 #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp24_ = path;
 #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp20_ = _tmp24_;
-#line 1920 "HierarchicalTagUtilities.c"
+#line 1962 "HierarchicalTagUtilities.c"
 	} else {
 #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp20_ = NULL;
-#line 1924 "HierarchicalTagUtilities.c"
+#line 1966 "HierarchicalTagUtilities.c"
 	}
 #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	_tmp25_ = g_strdup (_tmp20_);
@@ -1930,17 +1972,17 @@ gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path)
 	_g_free0 (path);
 #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	return result;
-#line 1934 "HierarchicalTagUtilities.c"
+#line 1976 "HierarchicalTagUtilities.c"
 }
 
 
 void hierarchical_tag_utilities_cleanup_root_path (const gchar* path) {
 	GeeList* paths = NULL;
-	const gchar* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	const gchar* _tmp0_;
+	GeeList* _tmp1_;
+	GeeList* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 #line 166 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	g_return_if_fail (path != NULL);
 #line 167 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -1957,17 +1999,17 @@ void hierarchical_tag_utilities_cleanup_root_path (const gchar* path) {
 	_tmp4_ = _tmp3_;
 #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	if (_tmp4_ == 0) {
-#line 1961 "HierarchicalTagUtilities.c"
+#line 2003 "HierarchicalTagUtilities.c"
 		gchar* actual_path = NULL;
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
+		const gchar* _tmp7_;
 		Tag* t = NULL;
-		TagSourceCollection* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
+		TagSourceCollection* _tmp8_;
+		const gchar* _tmp9_;
+		gboolean _tmp10_;
 		gboolean _tmp13_ = FALSE;
-		Tag* _tmp14_ = NULL;
+		Tag* _tmp14_;
 #line 170 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp5_ = path;
 #line 170 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -1984,7 +2026,7 @@ void hierarchical_tag_utilities_cleanup_root_path (const gchar* path) {
 			_g_object_unref0 (paths);
 #line 173 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			return;
-#line 1988 "HierarchicalTagUtilities.c"
+#line 2030 "HierarchicalTagUtilities.c"
 		}
 #line 175 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		t = NULL;
@@ -1996,9 +2038,9 @@ void hierarchical_tag_utilities_cleanup_root_path (const gchar* path) {
 		_tmp10_ = tag_source_collection_exists (_tmp8_, _tmp9_, FALSE);
 #line 176 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		if (_tmp10_) {
-#line 2000 "HierarchicalTagUtilities.c"
-			const gchar* _tmp11_ = NULL;
-			Tag* _tmp12_ = NULL;
+#line 2042 "HierarchicalTagUtilities.c"
+			const gchar* _tmp11_;
+			Tag* _tmp12_;
 #line 177 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			_tmp11_ = actual_path;
 #line 177 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -2007,18 +2049,18 @@ void hierarchical_tag_utilities_cleanup_root_path (const gchar* path) {
 			_g_object_unref0 (t);
 #line 177 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			t = _tmp12_;
-#line 2011 "HierarchicalTagUtilities.c"
+#line 2053 "HierarchicalTagUtilities.c"
 		}
 #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_tmp14_ = t;
 #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		if (_tmp14_ != NULL) {
-#line 2017 "HierarchicalTagUtilities.c"
-			Tag* _tmp15_ = NULL;
-			GeeList* _tmp16_ = NULL;
-			GeeList* _tmp17_ = NULL;
-			gint _tmp18_ = 0;
-			gint _tmp19_ = 0;
+#line 2059 "HierarchicalTagUtilities.c"
+			Tag* _tmp15_;
+			GeeList* _tmp16_;
+			GeeList* _tmp17_;
+			gint _tmp18_;
+			gint _tmp19_;
 #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			_tmp15_ = t;
 #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -2033,31 +2075,31 @@ void hierarchical_tag_utilities_cleanup_root_path (const gchar* path) {
 			_tmp13_ = _tmp19_ == 0;
 #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			_g_object_unref0 (_tmp17_);
-#line 2037 "HierarchicalTagUtilities.c"
+#line 2079 "HierarchicalTagUtilities.c"
 		} else {
 #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			_tmp13_ = FALSE;
-#line 2041 "HierarchicalTagUtilities.c"
+#line 2083 "HierarchicalTagUtilities.c"
 		}
 #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		if (_tmp13_) {
-#line 2045 "HierarchicalTagUtilities.c"
-			Tag* _tmp20_ = NULL;
+#line 2087 "HierarchicalTagUtilities.c"
+			Tag* _tmp20_;
 #line 180 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			_tmp20_ = t;
 #line 180 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			tag_flatten (_tmp20_);
-#line 2051 "HierarchicalTagUtilities.c"
+#line 2093 "HierarchicalTagUtilities.c"
 		}
 #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_g_object_unref0 (t);
 #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		_g_free0 (actual_path);
-#line 2057 "HierarchicalTagUtilities.c"
+#line 2099 "HierarchicalTagUtilities.c"
 	}
 #line 166 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	_g_object_unref0 (paths);
-#line 2061 "HierarchicalTagUtilities.c"
+#line 2103 "HierarchicalTagUtilities.c"
 }
 
 
@@ -2067,21 +2109,21 @@ HierarchicalTagUtilities* hierarchical_tag_utilities_construct (GType object_typ
 	self = (HierarchicalTagUtilities*) g_type_create_instance (object_type);
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	return self;
-#line 2071 "HierarchicalTagUtilities.c"
+#line 2113 "HierarchicalTagUtilities.c"
 }
 
 
 HierarchicalTagUtilities* hierarchical_tag_utilities_new (void) {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	return hierarchical_tag_utilities_construct (TYPE_HIERARCHICAL_TAG_UTILITIES);
-#line 2078 "HierarchicalTagUtilities.c"
+#line 2120 "HierarchicalTagUtilities.c"
 }
 
 
 static void value_hierarchical_tag_utilities_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	value->data[0].v_pointer = NULL;
-#line 2085 "HierarchicalTagUtilities.c"
+#line 2127 "HierarchicalTagUtilities.c"
 }
 
 
@@ -2090,7 +2132,7 @@ static void value_hierarchical_tag_utilities_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		hierarchical_tag_utilities_unref (value->data[0].v_pointer);
-#line 2094 "HierarchicalTagUtilities.c"
+#line 2136 "HierarchicalTagUtilities.c"
 	}
 }
 
@@ -2100,11 +2142,11 @@ static void value_hierarchical_tag_utilities_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		dest_value->data[0].v_pointer = hierarchical_tag_utilities_ref (src_value->data[0].v_pointer);
-#line 2104 "HierarchicalTagUtilities.c"
+#line 2146 "HierarchicalTagUtilities.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2108 "HierarchicalTagUtilities.c"
+#line 2150 "HierarchicalTagUtilities.c"
 	}
 }
 
@@ -2112,66 +2154,66 @@ static void value_hierarchical_tag_utilities_copy_value (const GValue* src_value
 static gpointer value_hierarchical_tag_utilities_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	return value->data[0].v_pointer;
-#line 2116 "HierarchicalTagUtilities.c"
+#line 2158 "HierarchicalTagUtilities.c"
 }
 
 
 static gchar* value_hierarchical_tag_utilities_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	if (collect_values[0].v_pointer) {
-#line 2123 "HierarchicalTagUtilities.c"
-		HierarchicalTagUtilities* object;
+#line 2165 "HierarchicalTagUtilities.c"
+		HierarchicalTagUtilities * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2130 "HierarchicalTagUtilities.c"
+#line 2172 "HierarchicalTagUtilities.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2134 "HierarchicalTagUtilities.c"
+#line 2176 "HierarchicalTagUtilities.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		value->data[0].v_pointer = hierarchical_tag_utilities_ref (object);
-#line 2138 "HierarchicalTagUtilities.c"
+#line 2180 "HierarchicalTagUtilities.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		value->data[0].v_pointer = NULL;
-#line 2142 "HierarchicalTagUtilities.c"
+#line 2184 "HierarchicalTagUtilities.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	return NULL;
-#line 2146 "HierarchicalTagUtilities.c"
+#line 2188 "HierarchicalTagUtilities.c"
 }
 
 
 static gchar* value_hierarchical_tag_utilities_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	HierarchicalTagUtilities** object_p;
+	HierarchicalTagUtilities ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2157 "HierarchicalTagUtilities.c"
+#line 2199 "HierarchicalTagUtilities.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		*object_p = NULL;
-#line 2163 "HierarchicalTagUtilities.c"
+#line 2205 "HierarchicalTagUtilities.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2167 "HierarchicalTagUtilities.c"
+#line 2209 "HierarchicalTagUtilities.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		*object_p = hierarchical_tag_utilities_ref (value->data[0].v_pointer);
-#line 2171 "HierarchicalTagUtilities.c"
+#line 2213 "HierarchicalTagUtilities.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	return NULL;
-#line 2175 "HierarchicalTagUtilities.c"
+#line 2217 "HierarchicalTagUtilities.c"
 }
 
 
@@ -2185,7 +2227,7 @@ GParamSpec* param_spec_hierarchical_tag_utilities (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	return G_PARAM_SPEC (spec);
-#line 2189 "HierarchicalTagUtilities.c"
+#line 2231 "HierarchicalTagUtilities.c"
 }
 
 
@@ -2194,12 +2236,12 @@ gpointer value_get_hierarchical_tag_utilities (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_UTILITIES), NULL);
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	return value->data[0].v_pointer;
-#line 2198 "HierarchicalTagUtilities.c"
+#line 2240 "HierarchicalTagUtilities.c"
 }
 
 
 void value_set_hierarchical_tag_utilities (GValue* value, gpointer v_object) {
-	HierarchicalTagUtilities* old;
+	HierarchicalTagUtilities * old;
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_UTILITIES));
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -2214,23 +2256,23 @@ void value_set_hierarchical_tag_utilities (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		hierarchical_tag_utilities_ref (value->data[0].v_pointer);
-#line 2218 "HierarchicalTagUtilities.c"
+#line 2260 "HierarchicalTagUtilities.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		value->data[0].v_pointer = NULL;
-#line 2222 "HierarchicalTagUtilities.c"
+#line 2264 "HierarchicalTagUtilities.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		hierarchical_tag_utilities_unref (old);
-#line 2228 "HierarchicalTagUtilities.c"
+#line 2270 "HierarchicalTagUtilities.c"
 	}
 }
 
 
 void value_take_hierarchical_tag_utilities (GValue* value, gpointer v_object) {
-	HierarchicalTagUtilities* old;
+	HierarchicalTagUtilities * old;
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_UTILITIES));
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -2243,17 +2285,17 @@ void value_take_hierarchical_tag_utilities (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		value->data[0].v_pointer = v_object;
-#line 2247 "HierarchicalTagUtilities.c"
+#line 2289 "HierarchicalTagUtilities.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		value->data[0].v_pointer = NULL;
-#line 2251 "HierarchicalTagUtilities.c"
+#line 2293 "HierarchicalTagUtilities.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		hierarchical_tag_utilities_unref (old);
-#line 2257 "HierarchicalTagUtilities.c"
+#line 2299 "HierarchicalTagUtilities.c"
 	}
 }
 
@@ -2263,24 +2305,24 @@ static void hierarchical_tag_utilities_class_init (HierarchicalTagUtilitiesClass
 	hierarchical_tag_utilities_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	((HierarchicalTagUtilitiesClass *) klass)->finalize = hierarchical_tag_utilities_finalize;
-#line 2267 "HierarchicalTagUtilities.c"
+#line 2309 "HierarchicalTagUtilities.c"
 }
 
 
 static void hierarchical_tag_utilities_instance_init (HierarchicalTagUtilities * self) {
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	self->ref_count = 1;
-#line 2274 "HierarchicalTagUtilities.c"
+#line 2316 "HierarchicalTagUtilities.c"
 }
 
 
-static void hierarchical_tag_utilities_finalize (HierarchicalTagUtilities* obj) {
+static void hierarchical_tag_utilities_finalize (HierarchicalTagUtilities * obj) {
 	HierarchicalTagUtilities * self;
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HIERARCHICAL_TAG_UTILITIES, HierarchicalTagUtilities);
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	g_signal_handlers_destroy (self);
-#line 2284 "HierarchicalTagUtilities.c"
+#line 2326 "HierarchicalTagUtilities.c"
 }
 
 
@@ -2299,18 +2341,18 @@ GType hierarchical_tag_utilities_get_type (void) {
 
 
 gpointer hierarchical_tag_utilities_ref (gpointer instance) {
-	HierarchicalTagUtilities* self;
+	HierarchicalTagUtilities * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	return instance;
-#line 2309 "HierarchicalTagUtilities.c"
+#line 2351 "HierarchicalTagUtilities.c"
 }
 
 
 void hierarchical_tag_utilities_unref (gpointer instance) {
-	HierarchicalTagUtilities* self;
+	HierarchicalTagUtilities * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2318,7 +2360,7 @@ void hierarchical_tag_utilities_unref (gpointer instance) {
 		HIERARCHICAL_TAG_UTILITIES_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2322 "HierarchicalTagUtilities.c"
+#line 2364 "HierarchicalTagUtilities.c"
 	}
 }
 
diff --git a/src/tags/TagPage.c b/src/tags/TagPage.c
index 6e347f7..efc0340 100644
--- a/src/tags/TagPage.c
+++ b/src/tags/TagPage.c
@@ -1,4 +1,4 @@
-/* TagPage.c generated by valac 0.34.7, the Vala compiler
+/* TagPage.c generated by valac 0.36.6, the Vala compiler
  * generated from TagPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -730,7 +730,7 @@ GType media_source_get_type (void) G_GNUC_CONST;
 TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, GeeCollection* sources, gint count, gboolean attach);
 TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Tag* tag, GeeCollection* sources, gint count, gboolean attach);
 GType tag_untag_photos_command_get_type (void) G_GNUC_CONST;
-static void tag_page_finalize (GObject* obj);
+static void tag_page_finalize (GObject * obj);
 
 static const GActionEntry TAG_PAGE_entries[4] = {{"DeleteTag", _tag_page_on_delete_tag_gsimple_action_activate_callback}, {"RenameTag", _tag_page_on_rename_tag_gsimple_action_activate_callback}, {"RemoveTagFromPhotos", _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback}, {"NewChildTagSidebar", _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback}};
 
@@ -787,15 +787,15 @@ static DataView* _media_page_create_thumbnail_create_view (DataSource* source, g
 
 TagPage* tag_page_construct (GType object_type, Tag* tag) {
 	TagPage * self = NULL;
-	Tag* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	Tag* _tmp3_ = NULL;
-	Tag* _tmp4_ = NULL;
-	TagSourceCollection* _tmp5_ = NULL;
-	Tag* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	ViewCollection* _tmp8_ = NULL;
+	Tag* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	Tag* _tmp3_;
+	Tag* _tmp4_;
+	TagSourceCollection* _tmp5_;
+	Tag* _tmp6_;
+	ViewCollection* _tmp7_;
+	ViewCollection* _tmp8_;
 #line 10 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_val_if_fail (IS_TAG (tag), NULL);
 #line 11 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -847,8 +847,8 @@ TagPage* tag_page_new (Tag* tag) {
 
 static void tag_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	TagPage * self;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
 #line 26 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage);
 #line 26 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -867,8 +867,8 @@ static void tag_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_fil
 
 Tag* tag_page_get_tag (TagPage* self) {
 	Tag* result = NULL;
-	Tag* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
+	Tag* _tmp0_;
+	Tag* _tmp1_;
 #line 31 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_val_if_fail (IS_TAG_PAGE (self), NULL);
 #line 32 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -887,8 +887,8 @@ static void tag_page_real_get_config_photos_sort (MediaPage* base, gboolean* sor
 	TagPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
 #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -922,10 +922,10 @@ static void tag_page_real_get_config_photos_sort (MediaPage* base, gboolean* sor
 
 static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
 	TagPage * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gint _tmp3_;
 #line 39 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage);
 #line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -946,8 +946,8 @@ static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort
 
 static void tag_page_real_add_actions (Page* base, GActionMap* map) {
 	TagPage * self;
-	GActionMap* _tmp0_ = NULL;
-	GActionMap* _tmp1_ = NULL;
+	GActionMap* _tmp0_;
+	GActionMap* _tmp1_;
 #line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage);
 #line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -966,7 +966,7 @@ static void tag_page_real_add_actions (Page* base, GActionMap* map) {
 
 static void tag_page_real_remove_actions (Page* base, GActionMap* map) {
 	TagPage * self;
-	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp0_;
 #line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage);
 #line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -993,9 +993,9 @@ static void tag_page_real_remove_actions (Page* base, GActionMap* map) {
 			entry = entry_collection[entry_it];
 #line 995 "TagPage.c"
 			{
-				GActionMap* _tmp1_ = NULL;
-				GActionEntry _tmp2_ = {0};
-				const gchar* _tmp3_ = NULL;
+				GActionMap* _tmp1_;
+				GActionEntry _tmp2_;
+				const gchar* _tmp3_;
 #line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 				_tmp1_ = map;
 #line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -1012,9 +1012,9 @@ static void tag_page_real_remove_actions (Page* base, GActionMap* map) {
 
 
 static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) {
-	GeeMap* _tmp0_ = NULL;
-	Tag* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeMap* _tmp0_;
+	Tag* _tmp1_;
+	gboolean _tmp2_;
 #line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_if_fail (IS_TAG_PAGE (self));
 #line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -1028,15 +1028,15 @@ static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) {
 #line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	if (_tmp2_) {
 #line 1031 "TagPage.c"
-		Tag* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		ViewCollection* _tmp6_ = NULL;
-		ViewCollection* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		ViewCollection* _tmp9_ = NULL;
-		ViewCollection* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
+		Tag* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		ViewCollection* _tmp6_;
+		ViewCollection* _tmp7_;
+		gint _tmp8_;
+		ViewCollection* _tmp9_;
+		ViewCollection* _tmp10_;
+		gint _tmp11_;
 #line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp3_ = self->priv->tag;
 #line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -1072,21 +1072,21 @@ static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) {
 
 static void tag_page_real_switched_to (Page* base) {
 	TagPage * self;
-	Tag* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	Tag* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	Tag* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
+	Tag* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	Tag* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	Tag* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
 #line 70 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage);
 #line 71 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -1145,25 +1145,25 @@ static void tag_page_real_switched_to (Page* base) {
 
 static void tag_page_real_update_actions (Page* base, gint selected_count, gint count) {
 	TagPage * self;
-	Tag* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	Tag* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	Tag* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
+	Tag* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	Tag* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	Tag* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	gint _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
 #line 80 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage);
 #line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -1230,14 +1230,14 @@ static void tag_page_real_update_actions (Page* base, gint selected_count, gint
 
 static void tag_page_on_new_child_tag_sidebar (TagPage* self) {
 	NewChildTagCommand* creation_command = NULL;
-	Tag* _tmp0_ = NULL;
-	NewChildTagCommand* _tmp1_ = NULL;
-	CommandManager* _tmp2_ = NULL;
-	CommandManager* _tmp3_ = NULL;
-	LibraryWindow* _tmp4_ = NULL;
-	LibraryWindow* _tmp5_ = NULL;
-	Tag* _tmp6_ = NULL;
-	Tag* _tmp7_ = NULL;
+	Tag* _tmp0_;
+	NewChildTagCommand* _tmp1_;
+	CommandManager* _tmp2_;
+	CommandManager* _tmp3_;
+	LibraryWindow* _tmp4_;
+	LibraryWindow* _tmp5_;
+	Tag* _tmp6_;
+	Tag* _tmp7_;
 #line 99 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_if_fail (IS_TAG_PAGE (self));
 #line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -1275,9 +1275,9 @@ static void tag_page_on_new_child_tag_sidebar (TagPage* self) {
 
 
 static void tag_page_on_rename_tag (TagPage* self) {
-	LibraryWindow* _tmp0_ = NULL;
-	LibraryWindow* _tmp1_ = NULL;
-	Tag* _tmp2_ = NULL;
+	LibraryWindow* _tmp0_;
+	LibraryWindow* _tmp1_;
+	Tag* _tmp2_;
 #line 107 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_if_fail (IS_TAG_PAGE (self));
 #line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -1295,8 +1295,8 @@ static void tag_page_on_rename_tag (TagPage* self) {
 
 
 static void tag_page_on_delete_tag (TagPage* self) {
-	Tag* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Tag* _tmp0_;
+	gboolean _tmp1_;
 #line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_if_fail (IS_TAG_PAGE (self));
 #line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -1306,11 +1306,11 @@ static void tag_page_on_delete_tag (TagPage* self) {
 #line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	if (_tmp1_) {
 #line 1309 "TagPage.c"
-		CommandManager* _tmp2_ = NULL;
-		CommandManager* _tmp3_ = NULL;
-		Tag* _tmp4_ = NULL;
-		DeleteTagCommand* _tmp5_ = NULL;
-		DeleteTagCommand* _tmp6_ = NULL;
+		CommandManager* _tmp2_;
+		CommandManager* _tmp3_;
+		Tag* _tmp4_;
+		DeleteTagCommand* _tmp5_;
+		DeleteTagCommand* _tmp6_;
 #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp2_ = app_window_get_command_manager ();
 #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -1333,10 +1333,10 @@ static void tag_page_on_delete_tag (TagPage* self) {
 
 
 static void tag_page_on_remove_tag_from_photos (TagPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 #line 116 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_if_fail (IS_TAG_PAGE (self));
 #line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -1352,18 +1352,18 @@ static void tag_page_on_remove_tag_from_photos (TagPage* self) {
 #line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	if (_tmp3_) {
 #line 1355 "TagPage.c"
-		CommandManager* _tmp4_ = NULL;
-		CommandManager* _tmp5_ = NULL;
-		Tag* _tmp6_ = NULL;
-		ViewCollection* _tmp7_ = NULL;
-		ViewCollection* _tmp8_ = NULL;
-		GeeList* _tmp9_ = NULL;
-		GeeCollection* _tmp10_ = NULL;
-		ViewCollection* _tmp11_ = NULL;
-		ViewCollection* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
-		TagUntagPhotosCommand* _tmp14_ = NULL;
-		TagUntagPhotosCommand* _tmp15_ = NULL;
+		CommandManager* _tmp4_;
+		CommandManager* _tmp5_;
+		Tag* _tmp6_;
+		ViewCollection* _tmp7_;
+		ViewCollection* _tmp8_;
+		GeeList* _tmp9_;
+		GeeCollection* _tmp10_;
+		ViewCollection* _tmp11_;
+		ViewCollection* _tmp12_;
+		gint _tmp13_;
+		TagUntagPhotosCommand* _tmp14_;
+		TagUntagPhotosCommand* _tmp15_;
 #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
@@ -1411,19 +1411,19 @@ static void tag_page_class_init (TagPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_type_class_add_private (klass, sizeof (TagPagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) tag_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) tag_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) tag_page_real_get_config_photos_sort;
+	((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) tag_page_real_get_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) tag_page_real_set_config_photos_sort;
+	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) tag_page_real_set_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) tag_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) tag_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) tag_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) tag_page_real_remove_actions;
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	((PageClass *) klass)->switched_to = (void (*)(Page*)) tag_page_real_switched_to;
+	((PageClass *) klass)->switched_to = (void (*) (Page *)) tag_page_real_switched_to;
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) tag_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) tag_page_real_update_actions;
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = tag_page_finalize;
 #line 1430 "TagPage.c"
@@ -1437,12 +1437,12 @@ static void tag_page_instance_init (TagPage * self) {
 }
 
 
-static void tag_page_finalize (GObject* obj) {
+static void tag_page_finalize (GObject * obj) {
 	TagPage * self;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	TagSourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	TagSourceCollection* _tmp2_;
+	guint _tmp3_;
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TAG_PAGE, TagPage);
 #line 22 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
diff --git a/src/tags/Tags.c b/src/tags/Tags.c
index d2d0690..f9f80dc 100644
--- a/src/tags/Tags.c
+++ b/src/tags/Tags.c
@@ -1,4 +1,4 @@
-/* Tags.c generated by valac 0.34.7, the Vala compiler
+/* Tags.c generated by valac 0.36.6, the Vala compiler
  * generated from Tags.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/threads/BackgroundJob.c b/src/threads/BackgroundJob.c
index cfb54d3..f2ba99a 100644
--- a/src/threads/BackgroundJob.c
+++ b/src/threads/BackgroundJob.c
@@ -1,4 +1,4 @@
-/* BackgroundJob.c generated by valac 0.34.7, the Vala compiler
+/* BackgroundJob.c generated by valac 0.36.6, the Vala compiler
  * generated from BackgroundJob.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -209,7 +209,7 @@ enum  {
 	NOTIFICATION_OBJECT_DUMMY_PROPERTY
 };
 NotificationObject* notification_object_construct (GType object_type);
-static void notification_object_finalize (NotificationObject* obj);
+static void notification_object_finalize (NotificationObject * obj);
 GType interlocked_notification_object_get_type (void) G_GNUC_CONST;
 gpointer abstract_semaphore_ref (gpointer instance);
 void abstract_semaphore_unref (gpointer instance);
@@ -230,7 +230,7 @@ void abstract_semaphore_wait (AbstractSemaphore* self);
 void interlocked_notification_object_internal_completed (InterlockedNotificationObject* self);
 void abstract_semaphore_notify (AbstractSemaphore* self);
 InterlockedNotificationObject* interlocked_notification_object_construct (GType object_type);
-static void interlocked_notification_object_finalize (NotificationObject* obj);
+static void interlocked_notification_object_finalize (NotificationObject * obj);
 GType background_job_job_priority_get_type (void) G_GNUC_CONST;
 #define BACKGROUND_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_BACKGROUND_JOB, BackgroundJobPrivate))
 enum  {
@@ -269,8 +269,8 @@ static gboolean _background_job_on_notification_ready_gsource_func (gpointer sel
 enum  {
 	BACKGROUND_JOB_NOTIFICATION_JOB_DUMMY_PROPERTY
 };
-static void background_job_notification_job_finalize (BackgroundJobNotificationJob* obj);
-static void background_job_finalize (BackgroundJob* obj);
+static void background_job_notification_job_finalize (BackgroundJobNotificationJob * obj);
+static void background_job_finalize (BackgroundJob * obj);
 
 
 NotificationObject* notification_object_construct (GType object_type) {
@@ -325,7 +325,7 @@ static gchar* value_notification_object_collect_value (GValue* value, guint n_co
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (collect_values[0].v_pointer) {
 #line 328 "BackgroundJob.c"
-		NotificationObject* object;
+		NotificationObject * object;
 		object = collect_values[0].v_pointer;
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -352,7 +352,7 @@ static gchar* value_notification_object_collect_value (GValue* value, guint n_co
 
 
 static gchar* value_notification_object_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	NotificationObject** object_p;
+	NotificationObject ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (!object_p) {
@@ -404,7 +404,7 @@ gpointer value_get_notification_object (const GValue* value) {
 
 
 void value_set_notification_object (GValue* value, gpointer v_object) {
-	NotificationObject* old;
+	NotificationObject * old;
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFICATION_OBJECT));
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -435,7 +435,7 @@ void value_set_notification_object (GValue* value, gpointer v_object) {
 
 
 void value_take_notification_object (GValue* value, gpointer v_object) {
-	NotificationObject* old;
+	NotificationObject * old;
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFICATION_OBJECT));
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -479,7 +479,7 @@ static void notification_object_instance_init (NotificationObject * self) {
 }
 
 
-static void notification_object_finalize (NotificationObject* obj) {
+static void notification_object_finalize (NotificationObject * obj) {
 	NotificationObject * self;
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFICATION_OBJECT, NotificationObject);
@@ -504,7 +504,7 @@ GType notification_object_get_type (void) {
 
 
 gpointer notification_object_ref (gpointer instance) {
-	NotificationObject* self;
+	NotificationObject * self;
 	self = instance;
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -515,7 +515,7 @@ gpointer notification_object_ref (gpointer instance) {
 
 
 void notification_object_unref (gpointer instance) {
-	NotificationObject* self;
+	NotificationObject * self;
 	self = instance;
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -529,7 +529,7 @@ void notification_object_unref (gpointer instance) {
 
 
 void interlocked_notification_object_internal_wait_for_completion (InterlockedNotificationObject* self) {
-	Semaphore* _tmp0_ = NULL;
+	Semaphore* _tmp0_;
 #line 41 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (IS_INTERLOCKED_NOTIFICATION_OBJECT (self));
 #line 42 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -541,7 +541,7 @@ void interlocked_notification_object_internal_wait_for_completion (InterlockedNo
 
 
 void interlocked_notification_object_internal_completed (InterlockedNotificationObject* self) {
-	Semaphore* _tmp0_ = NULL;
+	Semaphore* _tmp0_;
 #line 46 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (IS_INTERLOCKED_NOTIFICATION_OBJECT (self));
 #line 47 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -574,7 +574,7 @@ static void interlocked_notification_object_class_init (InterlockedNotificationO
 
 
 static void interlocked_notification_object_instance_init (InterlockedNotificationObject * self) {
-	Semaphore* _tmp0_ = NULL;
+	Semaphore* _tmp0_;
 #line 37 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	self->priv = INTERLOCKED_NOTIFICATION_OBJECT_GET_PRIVATE (self);
 #line 38 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -585,7 +585,7 @@ static void interlocked_notification_object_instance_init (InterlockedNotificati
 }
 
 
-static void interlocked_notification_object_finalize (NotificationObject* obj) {
+static void interlocked_notification_object_finalize (NotificationObject * obj) {
 	InterlockedNotificationObject * self;
 #line 37 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_INTERLOCKED_NOTIFICATION_OBJECT, InterlockedNotificationObject);
@@ -611,7 +611,7 @@ GType interlocked_notification_object_get_type (void) {
 
 gint background_job_job_priority_compare (BackgroundJobJobPriority self, BackgroundJobJobPriority other) {
 	gint result = 0;
-	BackgroundJobJobPriority _tmp0_ = 0;
+	BackgroundJobJobPriority _tmp0_;
 #line 75 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	_tmp0_ = other;
 #line 75 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -624,8 +624,8 @@ gint background_job_job_priority_compare (BackgroundJobJobPriority self, Backgro
 
 gint background_job_job_priority_compare_func (BackgroundJobJobPriority a, BackgroundJobJobPriority b) {
 	gint result = 0;
-	BackgroundJobJobPriority _tmp0_ = 0;
-	BackgroundJobJobPriority _tmp1_ = 0;
+	BackgroundJobJobPriority _tmp0_;
+	BackgroundJobJobPriority _tmp1_;
 #line 79 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	_tmp0_ = b;
 #line 79 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -666,16 +666,16 @@ static gpointer _abstract_semaphore_ref0 (gpointer self) {
 
 BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore) {
 	BackgroundJob* self = NULL;
-	GObject* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	CompletionCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	GCancellable* _tmp3_ = NULL;
-	GCancellable* _tmp4_ = NULL;
-	CancellationCallback _tmp5_ = NULL;
-	void* _tmp5__target = NULL;
-	AbstractSemaphore* _tmp6_ = NULL;
-	AbstractSemaphore* _tmp7_ = NULL;
+	GObject* _tmp0_;
+	GObject* _tmp1_;
+	CompletionCallback _tmp2_;
+	void* _tmp2__target;
+	GCancellable* _tmp3_;
+	GCancellable* _tmp4_;
+	CancellationCallback _tmp5_;
+	void* _tmp5__target;
+	AbstractSemaphore* _tmp6_;
+	AbstractSemaphore* _tmp7_;
 #line 113 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_val_if_fail ((owner == NULL) || G_IS_OBJECT (owner), NULL);
 #line 113 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -769,11 +769,11 @@ BackgroundJobJobPriority background_job_get_priority (BackgroundJob* self) {
 
 gint background_job_priority_compare_func (BackgroundJob* a, BackgroundJob* b) {
 	gint result = 0;
-	BackgroundJob* _tmp0_ = NULL;
-	BackgroundJobJobPriority _tmp1_ = 0;
-	BackgroundJob* _tmp2_ = NULL;
-	BackgroundJobJobPriority _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	BackgroundJob* _tmp0_;
+	BackgroundJobJobPriority _tmp1_;
+	BackgroundJob* _tmp2_;
+	BackgroundJobJobPriority _tmp3_;
+	gint _tmp4_;
 #line 130 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_val_if_fail (IS_BACKGROUND_JOB (a), 0);
 #line 130 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -798,9 +798,9 @@ gint background_job_priority_compare_func (BackgroundJob* a, BackgroundJob* b) {
 
 gint64 background_job_priority_comparator (void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	void* _tmp0_;
+	void* _tmp1_;
+	gint _tmp2_;
 #line 136 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	_tmp0_ = a;
 #line 136 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -816,7 +816,7 @@ gint64 background_job_priority_comparator (void* a, void* b) {
 
 
 void background_job_set_completion_priority (BackgroundJob* self, gint priority) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 140 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (self));
 #line 141 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -828,7 +828,7 @@ void background_job_set_completion_priority (BackgroundJob* self, gint priority)
 
 
 void background_job_set_notification_priority (BackgroundJob* self, gint priority) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 145 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (self));
 #line 146 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -840,7 +840,7 @@ void background_job_set_notification_priority (BackgroundJob* self, gint priorit
 
 
 void background_job_wait_for_completion (BackgroundJob* self) {
-	AbstractSemaphore* _tmp0_ = NULL;
+	AbstractSemaphore* _tmp0_;
 #line 152 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (self));
 #line 153 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -848,7 +848,7 @@ void background_job_wait_for_completion (BackgroundJob* self) {
 #line 153 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp0_ != NULL) {
 #line 851 "BackgroundJob.c"
-		AbstractSemaphore* _tmp1_ = NULL;
+		AbstractSemaphore* _tmp1_;
 #line 154 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp1_ = self->priv->semaphore;
 #line 154 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -860,8 +860,8 @@ void background_job_wait_for_completion (BackgroundJob* self) {
 
 GCancellable* background_job_get_cancellable (BackgroundJob* self) {
 	GCancellable* result = NULL;
-	GCancellable* _tmp0_ = NULL;
-	GCancellable* _tmp1_ = NULL;
+	GCancellable* _tmp0_;
+	GCancellable* _tmp1_;
 #line 157 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_val_if_fail (IS_BACKGROUND_JOB (self), NULL);
 #line 158 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -879,7 +879,7 @@ GCancellable* background_job_get_cancellable (BackgroundJob* self) {
 gboolean background_job_is_cancelled (BackgroundJob* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	GCancellable* _tmp1_ = NULL;
+	GCancellable* _tmp1_;
 #line 161 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_val_if_fail (IS_BACKGROUND_JOB (self), FALSE);
 #line 162 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -887,8 +887,8 @@ gboolean background_job_is_cancelled (BackgroundJob* self) {
 #line 162 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp1_ != NULL) {
 #line 890 "BackgroundJob.c"
-		GCancellable* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+		GCancellable* _tmp2_;
+		gboolean _tmp3_;
 #line 162 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp2_ = self->priv->cancellable;
 #line 162 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -910,7 +910,7 @@ gboolean background_job_is_cancelled (BackgroundJob* self) {
 
 
 void background_job_cancel (BackgroundJob* self) {
-	GCancellable* _tmp0_ = NULL;
+	GCancellable* _tmp0_;
 #line 165 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (self));
 #line 166 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -918,7 +918,7 @@ void background_job_cancel (BackgroundJob* self) {
 #line 166 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp0_ != NULL) {
 #line 921 "BackgroundJob.c"
-		GCancellable* _tmp1_ = NULL;
+		GCancellable* _tmp1_;
 #line 167 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp1_ = self->priv->cancellable;
 #line 167 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -945,14 +945,14 @@ static gboolean _background_job_on_notify_completion_gsource_func (gpointer self
 
 
 void background_job_internal_notify_completion (BackgroundJob* self) {
-	AbstractSemaphore* _tmp0_ = NULL;
+	AbstractSemaphore* _tmp0_;
 	gboolean _tmp2_ = FALSE;
-	CompletionCallback _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
+	CompletionCallback _tmp3_;
+	void* _tmp3__target;
 	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	BackgroundJob* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
+	gboolean _tmp6_;
+	BackgroundJob* _tmp8_;
+	gint _tmp9_;
 #line 171 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (self));
 #line 172 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -960,7 +960,7 @@ void background_job_internal_notify_completion (BackgroundJob* self) {
 #line 172 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp0_ != NULL) {
 #line 963 "BackgroundJob.c"
-		AbstractSemaphore* _tmp1_ = NULL;
+		AbstractSemaphore* _tmp1_;
 #line 173 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp1_ = self->priv->semaphore;
 #line 173 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -974,8 +974,8 @@ void background_job_internal_notify_completion (BackgroundJob* self) {
 #line 175 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp3_ == NULL) {
 #line 977 "BackgroundJob.c"
-		CancellationCallback _tmp4_ = NULL;
-		void* _tmp4__target = NULL;
+		CancellationCallback _tmp4_;
+		void* _tmp4__target;
 #line 175 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp4_ = self->priv->cancellation;
 #line 175 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -999,8 +999,8 @@ void background_job_internal_notify_completion (BackgroundJob* self) {
 #line 178 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp6_) {
 #line 1002 "BackgroundJob.c"
-		CancellationCallback _tmp7_ = NULL;
-		void* _tmp7__target = NULL;
+		CancellationCallback _tmp7_;
+		void* _tmp7__target;
 #line 178 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp7_ = self->priv->cancellation;
 #line 178 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1035,7 +1035,7 @@ void background_job_internal_notify_completion (BackgroundJob* self) {
 
 static gboolean background_job_on_notify_completion (BackgroundJob* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 188 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_val_if_fail (IS_BACKGROUND_JOB (self), FALSE);
 #line 193 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1043,8 +1043,8 @@ static gboolean background_job_on_notify_completion (BackgroundJob* self) {
 #line 193 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp0_) {
 #line 1046 "BackgroundJob.c"
-		CancellationCallback _tmp1_ = NULL;
-		void* _tmp1__target = NULL;
+		CancellationCallback _tmp1_;
+		void* _tmp1__target;
 #line 194 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp1_ = self->priv->cancellation;
 #line 194 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1052,8 +1052,8 @@ static gboolean background_job_on_notify_completion (BackgroundJob* self) {
 #line 194 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		if (_tmp1_ != NULL) {
 #line 1055 "BackgroundJob.c"
-			CancellationCallback _tmp2_ = NULL;
-			void* _tmp2__target = NULL;
+			CancellationCallback _tmp2_;
+			void* _tmp2__target;
 #line 195 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			_tmp2_ = self->priv->cancellation;
 #line 195 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1063,8 +1063,8 @@ static gboolean background_job_on_notify_completion (BackgroundJob* self) {
 #line 1064 "BackgroundJob.c"
 		}
 	} else {
-		CompletionCallback _tmp3_ = NULL;
-		void* _tmp3__target = NULL;
+		CompletionCallback _tmp3_;
+		void* _tmp3__target;
 #line 197 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp3_ = self->priv->callback;
 #line 197 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1072,8 +1072,8 @@ static gboolean background_job_on_notify_completion (BackgroundJob* self) {
 #line 197 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		if (_tmp3_ != NULL) {
 #line 1075 "BackgroundJob.c"
-			CompletionCallback _tmp4_ = NULL;
-			void* _tmp4__target = NULL;
+			CompletionCallback _tmp4_;
+			void* _tmp4__target;
 #line 198 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			_tmp4_ = self->priv->callback;
 #line 198 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1112,11 +1112,11 @@ static gpointer _notification_object_ref0 (gpointer self) {
 
 
 void background_job_notify (BackgroundJob* self, NotificationCallback callback, void* callback_target, NotificationObject* user) {
-	gint _tmp7_ = 0;
+	gint _tmp7_;
 	InterlockedNotificationObject* interlocked = NULL;
-	NotificationObject* _tmp8_ = NULL;
-	InterlockedNotificationObject* _tmp9_ = NULL;
-	InterlockedNotificationObject* _tmp10_ = NULL;
+	NotificationObject* _tmp8_;
+	InterlockedNotificationObject* _tmp9_;
+	InterlockedNotificationObject* _tmp10_;
 	GError * _inner_error_ = NULL;
 #line 209 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (self));
@@ -1124,19 +1124,19 @@ void background_job_notify (BackgroundJob* self, NotificationCallback callback,
 	g_return_if_fail ((user == NULL) || IS_NOTIFICATION_OBJECT (user));
 #line 1126 "BackgroundJob.c"
 	{
-		GeeArrayList* _tmp0_ = NULL;
+		GeeArrayList* _tmp0_;
 #line 210 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp0_ = background_job_notify_queue;
 #line 210 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		g_rec_mutex_lock (&__lock_background_job_notify_queue);
 #line 1133 "BackgroundJob.c"
 		{
-			GeeArrayList* _tmp1_ = NULL;
-			NotificationCallback _tmp2_ = NULL;
-			void* _tmp2__target = NULL;
-			NotificationObject* _tmp3_ = NULL;
-			BackgroundJobNotificationJob* _tmp4_ = NULL;
-			BackgroundJobNotificationJob* _tmp5_ = NULL;
+			GeeArrayList* _tmp1_;
+			NotificationCallback _tmp2_;
+			void* _tmp2__target;
+			NotificationObject* _tmp3_;
+			BackgroundJobNotificationJob* _tmp4_;
+			BackgroundJobNotificationJob* _tmp5_;
 #line 211 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			_tmp1_ = background_job_notify_queue;
 #line 211 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1157,7 +1157,7 @@ void background_job_notify (BackgroundJob* self, NotificationCallback callback,
 		}
 		__finally13:
 		{
-			GeeArrayList* _tmp6_ = NULL;
+			GeeArrayList* _tmp6_;
 #line 210 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			_tmp6_ = background_job_notify_queue;
 #line 210 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1190,7 +1190,7 @@ void background_job_notify (BackgroundJob* self, NotificationCallback callback,
 #line 219 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp10_ != NULL) {
 #line 1193 "BackgroundJob.c"
-		InterlockedNotificationObject* _tmp11_ = NULL;
+		InterlockedNotificationObject* _tmp11_;
 #line 220 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp11_ = interlocked;
 #line 220 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1206,19 +1206,19 @@ void background_job_notify (BackgroundJob* self, NotificationCallback callback,
 static gboolean background_job_on_notification_ready (BackgroundJob* self) {
 	gboolean result = FALSE;
 	BackgroundJobNotificationJob* notification_job = NULL;
-	BackgroundJobNotificationJob* _tmp8_ = NULL;
-	BackgroundJobNotificationJob* _tmp9_ = NULL;
-	NotificationCallback _tmp10_ = NULL;
-	void* _tmp10__target = NULL;
-	BackgroundJobNotificationJob* _tmp11_ = NULL;
-	BackgroundJob* _tmp12_ = NULL;
-	BackgroundJobNotificationJob* _tmp13_ = NULL;
-	NotificationObject* _tmp14_ = NULL;
+	BackgroundJobNotificationJob* _tmp8_;
+	BackgroundJobNotificationJob* _tmp9_;
+	NotificationCallback _tmp10_;
+	void* _tmp10__target;
+	BackgroundJobNotificationJob* _tmp11_;
+	BackgroundJob* _tmp12_;
+	BackgroundJobNotificationJob* _tmp13_;
+	NotificationObject* _tmp14_;
 	InterlockedNotificationObject* interlocked = NULL;
-	BackgroundJobNotificationJob* _tmp15_ = NULL;
-	NotificationObject* _tmp16_ = NULL;
-	InterlockedNotificationObject* _tmp17_ = NULL;
-	InterlockedNotificationObject* _tmp18_ = NULL;
+	BackgroundJobNotificationJob* _tmp15_;
+	NotificationObject* _tmp16_;
+	InterlockedNotificationObject* _tmp17_;
+	InterlockedNotificationObject* _tmp18_;
 	GError * _inner_error_ = NULL;
 #line 223 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_val_if_fail (IS_BACKGROUND_JOB (self), FALSE);
@@ -1226,16 +1226,16 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) {
 	notification_job = NULL;
 #line 1228 "BackgroundJob.c"
 	{
-		GeeArrayList* _tmp0_ = NULL;
+		GeeArrayList* _tmp0_;
 #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp0_ = background_job_notify_queue;
 #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		g_rec_mutex_lock (&__lock_background_job_notify_queue);
 #line 1235 "BackgroundJob.c"
 		{
-			GeeArrayList* _tmp1_ = NULL;
-			gint _tmp2_ = 0;
-			gint _tmp3_ = 0;
+			GeeArrayList* _tmp1_;
+			gint _tmp2_;
+			gint _tmp3_;
 #line 228 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			_tmp1_ = background_job_notify_queue;
 #line 228 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1245,8 +1245,8 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) {
 #line 228 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			if (_tmp3_ > 0) {
 #line 1248 "BackgroundJob.c"
-				GeeArrayList* _tmp4_ = NULL;
-				gpointer _tmp5_ = NULL;
+				GeeArrayList* _tmp4_;
+				gpointer _tmp5_;
 #line 229 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 				_tmp4_ = background_job_notify_queue;
 #line 229 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1260,7 +1260,7 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) {
 		}
 		__finally14:
 		{
-			GeeArrayList* _tmp6_ = NULL;
+			GeeArrayList* _tmp6_;
 #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			_tmp6_ = background_job_notify_queue;
 #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1315,7 +1315,7 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) {
 #line 237 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp18_ != NULL) {
 #line 1318 "BackgroundJob.c"
-		InterlockedNotificationObject* _tmp19_ = NULL;
+		InterlockedNotificationObject* _tmp19_;
 #line 238 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp19_ = interlocked;
 #line 238 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1336,12 +1336,12 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) {
 
 static BackgroundJobNotificationJob* background_job_notification_job_construct (GType object_type, NotificationCallback callback, void* callback_target, BackgroundJob* background_job, NotificationObject* user) {
 	BackgroundJobNotificationJob* self = NULL;
-	NotificationCallback _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	BackgroundJob* _tmp1_ = NULL;
-	BackgroundJob* _tmp2_ = NULL;
-	NotificationObject* _tmp3_ = NULL;
-	NotificationObject* _tmp4_ = NULL;
+	NotificationCallback _tmp0_;
+	void* _tmp0__target;
+	BackgroundJob* _tmp1_;
+	BackgroundJob* _tmp2_;
+	NotificationObject* _tmp3_;
+	NotificationObject* _tmp4_;
 #line 88 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_val_if_fail (IS_BACKGROUND_JOB (background_job), NULL);
 #line 88 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1427,7 +1427,7 @@ static gchar* background_job_value_notification_job_collect_value (GValue* value
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (collect_values[0].v_pointer) {
 #line 1430 "BackgroundJob.c"
-		BackgroundJobNotificationJob* object;
+		BackgroundJobNotificationJob * object;
 		object = collect_values[0].v_pointer;
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1454,7 +1454,7 @@ static gchar* background_job_value_notification_job_collect_value (GValue* value
 
 
 static gchar* background_job_value_notification_job_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	BackgroundJobNotificationJob** object_p;
+	BackgroundJobNotificationJob ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (!object_p) {
@@ -1506,7 +1506,7 @@ static gpointer background_job_value_get_notification_job (const GValue* value)
 
 
 static void background_job_value_set_notification_job (GValue* value, gpointer v_object) {
-	BackgroundJobNotificationJob* old;
+	BackgroundJobNotificationJob * old;
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, BACKGROUND_JOB_TYPE_NOTIFICATION_JOB));
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1537,7 +1537,7 @@ static void background_job_value_set_notification_job (GValue* value, gpointer v
 
 
 static void background_job_value_take_notification_job (GValue* value, gpointer v_object) {
-	BackgroundJobNotificationJob* old;
+	BackgroundJobNotificationJob * old;
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, BACKGROUND_JOB_TYPE_NOTIFICATION_JOB));
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1581,7 +1581,7 @@ static void background_job_notification_job_instance_init (BackgroundJobNotifica
 }
 
 
-static void background_job_notification_job_finalize (BackgroundJobNotificationJob* obj) {
+static void background_job_notification_job_finalize (BackgroundJobNotificationJob * obj) {
 	BackgroundJobNotificationJob * self;
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, BACKGROUND_JOB_TYPE_NOTIFICATION_JOB, BackgroundJobNotificationJob);
@@ -1610,7 +1610,7 @@ static GType background_job_notification_job_get_type (void) {
 
 
 static gpointer background_job_notification_job_ref (gpointer instance) {
-	BackgroundJobNotificationJob* self;
+	BackgroundJobNotificationJob * self;
 	self = instance;
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1621,7 +1621,7 @@ static gpointer background_job_notification_job_ref (gpointer instance) {
 
 
 static void background_job_notification_job_unref (gpointer instance) {
-	BackgroundJobNotificationJob* self;
+	BackgroundJobNotificationJob * self;
 	self = instance;
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1676,7 +1676,7 @@ static gchar* value_background_job_collect_value (GValue* value, guint n_collect
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (collect_values[0].v_pointer) {
 #line 1679 "BackgroundJob.c"
-		BackgroundJob* object;
+		BackgroundJob * object;
 		object = collect_values[0].v_pointer;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1703,7 +1703,7 @@ static gchar* value_background_job_collect_value (GValue* value, guint n_collect
 
 
 static gchar* value_background_job_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	BackgroundJob** object_p;
+	BackgroundJob ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (!object_p) {
@@ -1755,7 +1755,7 @@ gpointer value_get_background_job (const GValue* value) {
 
 
 void value_set_background_job (GValue* value, gpointer v_object) {
-	BackgroundJob* old;
+	BackgroundJob * old;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKGROUND_JOB));
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1786,7 +1786,7 @@ void value_set_background_job (GValue* value, gpointer v_object) {
 
 
 void value_take_background_job (GValue* value, gpointer v_object) {
-	BackgroundJob* old;
+	BackgroundJob * old;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKGROUND_JOB));
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1815,7 +1815,7 @@ void value_take_background_job (GValue* value, gpointer v_object) {
 
 
 static void background_job_class_init (BackgroundJobClass * klass) {
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	background_job_parent_class = g_type_class_peek_parent (klass);
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1823,9 +1823,9 @@ static void background_job_class_init (BackgroundJobClass * klass) {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_type_class_add_private (klass, sizeof (BackgroundJobPrivate));
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) background_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) background_job_real_execute;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	((BackgroundJobClass *) klass)->get_priority = (BackgroundJobJobPriority (*)(BackgroundJob*)) background_job_real_get_priority;
+	((BackgroundJobClass *) klass)->get_priority = (BackgroundJobJobPriority (*) (BackgroundJob *)) background_job_real_get_priority;
 #line 96 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_rec_mutex_init (&__lock_background_job_notify_queue);
 #line 96 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1853,7 +1853,7 @@ static void background_job_instance_init (BackgroundJob * self) {
 }
 
 
-static void background_job_finalize (BackgroundJob* obj) {
+static void background_job_finalize (BackgroundJob * obj) {
 	BackgroundJob * self;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKGROUND_JOB, BackgroundJob);
@@ -1886,7 +1886,7 @@ GType background_job_get_type (void) {
 
 
 gpointer background_job_ref (gpointer instance) {
-	BackgroundJob* self;
+	BackgroundJob * self;
 	self = instance;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1897,7 +1897,7 @@ gpointer background_job_ref (gpointer instance) {
 
 
 void background_job_unref (gpointer instance) {
-	BackgroundJob* self;
+	BackgroundJob * self;
 	self = instance;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
diff --git a/src/threads/Semaphore.c b/src/threads/Semaphore.c
index 5a3b050..c93420b 100644
--- a/src/threads/Semaphore.c
+++ b/src/threads/Semaphore.c
@@ -1,4 +1,4 @@
-/* Semaphore.c generated by valac 0.34.7, the Vala compiler
+/* Semaphore.c generated by valac 0.36.6, the Vala compiler
  * generated from Semaphore.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -183,7 +183,7 @@ static AbstractSemaphoreWaitAction abstract_semaphore_real_do_wait (AbstractSema
 gboolean abstract_semaphore_reset (AbstractSemaphore* self);
 gboolean abstract_semaphore_do_reset (AbstractSemaphore* self);
 static gboolean abstract_semaphore_real_do_reset (AbstractSemaphore* self);
-static void abstract_semaphore_finalize (AbstractSemaphore* obj);
+static void abstract_semaphore_finalize (AbstractSemaphore * obj);
 GType semaphore_get_type (void) G_GNUC_CONST;
 #define SEMAPHORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEMAPHORE, SemaphorePrivate))
 enum  {
@@ -193,7 +193,7 @@ Semaphore* semaphore_new (void);
 Semaphore* semaphore_construct (GType object_type);
 static AbstractSemaphoreNotifyAction semaphore_real_do_notify (AbstractSemaphore* base);
 static AbstractSemaphoreWaitAction semaphore_real_do_wait (AbstractSemaphore* base);
-static void semaphore_finalize (AbstractSemaphore* obj);
+static void semaphore_finalize (AbstractSemaphore * obj);
 GType countdown_semaphore_get_type (void) G_GNUC_CONST;
 #define COUNTDOWN_SEMAPHORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_COUNTDOWN_SEMAPHORE, CountdownSemaphorePrivate))
 enum  {
@@ -203,7 +203,7 @@ CountdownSemaphore* countdown_semaphore_new (gint total);
 CountdownSemaphore* countdown_semaphore_construct (GType object_type, gint total);
 static AbstractSemaphoreNotifyAction countdown_semaphore_real_do_notify (AbstractSemaphore* base);
 static AbstractSemaphoreWaitAction countdown_semaphore_real_do_wait (AbstractSemaphore* base);
-static void countdown_semaphore_finalize (AbstractSemaphore* obj);
+static void countdown_semaphore_finalize (AbstractSemaphore * obj);
 GType event_semaphore_get_type (void) G_GNUC_CONST;
 #define EVENT_SEMAPHORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EVENT_SEMAPHORE, EventSemaphorePrivate))
 enum  {
@@ -214,7 +214,7 @@ EventSemaphore* event_semaphore_construct (GType object_type);
 static AbstractSemaphoreNotifyAction event_semaphore_real_do_notify (AbstractSemaphore* base);
 static AbstractSemaphoreWaitAction event_semaphore_real_do_wait (AbstractSemaphore* base);
 static gboolean event_semaphore_real_do_reset (AbstractSemaphore* base);
-static void event_semaphore_finalize (AbstractSemaphore* obj);
+static void event_semaphore_finalize (AbstractSemaphore * obj);
 static void _vala_clear_GMutex (GMutex * mutex);
 static void _vala_clear_GRecMutex (GRecMutex * mutex);
 static void _vala_clear_GRWLock (GRWLock * mutex);
@@ -260,8 +260,8 @@ GType abstract_semaphore_wait_action_get_type (void) {
 AbstractSemaphore* abstract_semaphore_construct (GType object_type, AbstractSemaphoreType type) {
 	AbstractSemaphore* self = NULL;
 	gboolean _tmp0_ = FALSE;
-	AbstractSemaphoreType _tmp1_ = 0;
-	AbstractSemaphoreType _tmp3_ = 0;
+	AbstractSemaphoreType _tmp1_;
+	AbstractSemaphoreType _tmp3_;
 #line 30 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = (AbstractSemaphore*) g_type_create_instance (object_type);
 #line 31 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -272,7 +272,7 @@ AbstractSemaphore* abstract_semaphore_construct (GType object_type, AbstractSema
 		_tmp0_ = TRUE;
 #line 274 "Semaphore.c"
 	} else {
-		AbstractSemaphoreType _tmp2_ = 0;
+		AbstractSemaphoreType _tmp2_;
 #line 31 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 		_tmp2_ = type;
 #line 31 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -292,7 +292,7 @@ AbstractSemaphore* abstract_semaphore_construct (GType object_type, AbstractSema
 
 
 static void abstract_semaphore_trigger (AbstractSemaphore* self) {
-	AbstractSemaphoreType _tmp0_ = 0;
+	AbstractSemaphoreType _tmp0_;
 #line 36 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_return_if_fail (IS_ABSTRACT_SEMAPHORE (self));
 #line 37 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -312,8 +312,8 @@ static void abstract_semaphore_trigger (AbstractSemaphore* self) {
 
 void abstract_semaphore_notify (AbstractSemaphore* self) {
 	AbstractSemaphoreNotifyAction action = 0;
-	AbstractSemaphoreNotifyAction _tmp0_ = 0;
-	AbstractSemaphoreNotifyAction _tmp1_ = 0;
+	AbstractSemaphoreNotifyAction _tmp0_;
+	AbstractSemaphoreNotifyAction _tmp1_;
 #line 43 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_return_if_fail (IS_ABSTRACT_SEMAPHORE (self));
 #line 44 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -346,7 +346,7 @@ void abstract_semaphore_notify (AbstractSemaphore* self) {
 		}
 		default:
 		{
-			AbstractSemaphoreNotifyAction _tmp2_ = 0;
+			AbstractSemaphoreNotifyAction _tmp2_;
 			GEnumValue* _tmp3_;
 #line 57 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 			_tmp2_ = action;
@@ -389,7 +389,7 @@ void abstract_semaphore_wait (AbstractSemaphore* self) {
 #line 69 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	while (TRUE) {
 #line 392 "Semaphore.c"
-		AbstractSemaphoreWaitAction _tmp0_ = 0;
+		AbstractSemaphoreWaitAction _tmp0_;
 #line 69 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 		_tmp0_ = abstract_semaphore_do_wait (self);
 #line 69 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -429,7 +429,7 @@ AbstractSemaphoreWaitAction abstract_semaphore_do_wait (AbstractSemaphore* self)
 gboolean abstract_semaphore_reset (AbstractSemaphore* self) {
 	gboolean result = FALSE;
 	gboolean is_reset = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 79 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_return_val_if_fail (IS_ABSTRACT_SEMAPHORE (self), FALSE);
 #line 80 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -509,7 +509,7 @@ static gchar* value_abstract_semaphore_collect_value (GValue* value, guint n_col
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	if (collect_values[0].v_pointer) {
 #line 512 "Semaphore.c"
-		AbstractSemaphore* object;
+		AbstractSemaphore * object;
 		object = collect_values[0].v_pointer;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -536,7 +536,7 @@ static gchar* value_abstract_semaphore_collect_value (GValue* value, guint n_col
 
 
 static gchar* value_abstract_semaphore_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	AbstractSemaphore** object_p;
+	AbstractSemaphore ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	if (!object_p) {
@@ -588,7 +588,7 @@ gpointer value_get_abstract_semaphore (const GValue* value) {
 
 
 void value_set_abstract_semaphore (GValue* value, gpointer v_object) {
-	AbstractSemaphore* old;
+	AbstractSemaphore * old;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ABSTRACT_SEMAPHORE));
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -619,7 +619,7 @@ void value_set_abstract_semaphore (GValue* value, gpointer v_object) {
 
 
 void value_take_abstract_semaphore (GValue* value, gpointer v_object) {
-	AbstractSemaphore* old;
+	AbstractSemaphore * old;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ABSTRACT_SEMAPHORE));
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -655,11 +655,11 @@ static void abstract_semaphore_class_init (AbstractSemaphoreClass * klass) {
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_type_class_add_private (klass, sizeof (AbstractSemaphorePrivate));
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*)(AbstractSemaphore*)) abstract_semaphore_real_do_notify;
+	((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*) (AbstractSemaphore *)) abstract_semaphore_real_do_notify;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) abstract_semaphore_real_do_wait;
+	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*) (AbstractSemaphore *)) abstract_semaphore_real_do_wait;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*)(AbstractSemaphore*)) abstract_semaphore_real_do_reset;
+	((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*) (AbstractSemaphore *)) abstract_semaphore_real_do_reset;
 #line 664 "Semaphore.c"
 }
 
@@ -677,7 +677,7 @@ static void abstract_semaphore_instance_init (AbstractSemaphore * self) {
 }
 
 
-static void abstract_semaphore_finalize (AbstractSemaphore* obj) {
+static void abstract_semaphore_finalize (AbstractSemaphore * obj) {
 	AbstractSemaphore * self;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore);
@@ -706,7 +706,7 @@ GType abstract_semaphore_get_type (void) {
 
 
 gpointer abstract_semaphore_ref (gpointer instance) {
-	AbstractSemaphore* self;
+	AbstractSemaphore * self;
 	self = instance;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -717,7 +717,7 @@ gpointer abstract_semaphore_ref (gpointer instance) {
 
 
 void abstract_semaphore_unref (gpointer instance) {
-	AbstractSemaphore* self;
+	AbstractSemaphore * self;
 	self = instance;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -750,7 +750,7 @@ Semaphore* semaphore_new (void) {
 static AbstractSemaphoreNotifyAction semaphore_real_do_notify (AbstractSemaphore* base) {
 	Semaphore * self;
 	AbstractSemaphoreNotifyAction result = 0;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEMAPHORE, Semaphore);
 #line 102 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -777,7 +777,7 @@ static AbstractSemaphoreWaitAction semaphore_real_do_wait (AbstractSemaphore* ba
 	Semaphore * self;
 	AbstractSemaphoreWaitAction result = 0;
 	AbstractSemaphoreWaitAction _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 110 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEMAPHORE, Semaphore);
 #line 111 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -808,9 +808,9 @@ static void semaphore_class_init (SemaphoreClass * klass) {
 #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_type_class_add_private (klass, sizeof (SemaphorePrivate));
 #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*)(AbstractSemaphore*)) semaphore_real_do_notify;
+	((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*) (AbstractSemaphore *)) semaphore_real_do_notify;
 #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) semaphore_real_do_wait;
+	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*) (AbstractSemaphore *)) semaphore_real_do_wait;
 #line 815 "Semaphore.c"
 }
 
@@ -824,7 +824,7 @@ static void semaphore_instance_init (Semaphore * self) {
 }
 
 
-static void semaphore_finalize (AbstractSemaphore* obj) {
+static void semaphore_finalize (AbstractSemaphore * obj) {
 	Semaphore * self;
 #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEMAPHORE, Semaphore);
@@ -848,7 +848,7 @@ GType semaphore_get_type (void) {
 
 CountdownSemaphore* countdown_semaphore_construct (GType object_type, gint total) {
 	CountdownSemaphore* self = NULL;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 120 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = (CountdownSemaphore*) abstract_semaphore_construct (object_type, ABSTRACT_SEMAPHORE_TYPE_BROADCAST);
 #line 122 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -871,12 +871,12 @@ CountdownSemaphore* countdown_semaphore_new (gint total) {
 static AbstractSemaphoreNotifyAction countdown_semaphore_real_do_notify (AbstractSemaphore* base) {
 	CountdownSemaphore * self;
 	AbstractSemaphoreNotifyAction result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	AbstractSemaphoreNotifyAction _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 #line 125 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COUNTDOWN_SEMAPHORE, CountdownSemaphore);
 #line 126 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -886,8 +886,8 @@ static AbstractSemaphoreNotifyAction countdown_semaphore_real_do_notify (Abstrac
 #line 126 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	if (_tmp0_ >= _tmp1_) {
 #line 889 "Semaphore.c"
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		gint _tmp2_;
+		gint _tmp3_;
 #line 127 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 		_tmp2_ = self->priv->passed;
 #line 127 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -926,8 +926,8 @@ static AbstractSemaphoreWaitAction countdown_semaphore_real_do_wait (AbstractSem
 	CountdownSemaphore * self;
 	AbstractSemaphoreWaitAction result = 0;
 	AbstractSemaphoreWaitAction _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 132 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COUNTDOWN_SEMAPHORE, CountdownSemaphore);
 #line 133 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -960,9 +960,9 @@ static void countdown_semaphore_class_init (CountdownSemaphoreClass * klass) {
 #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_type_class_add_private (klass, sizeof (CountdownSemaphorePrivate));
 #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*)(AbstractSemaphore*)) countdown_semaphore_real_do_notify;
+	((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*) (AbstractSemaphore *)) countdown_semaphore_real_do_notify;
 #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) countdown_semaphore_real_do_wait;
+	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*) (AbstractSemaphore *)) countdown_semaphore_real_do_wait;
 #line 967 "Semaphore.c"
 }
 
@@ -976,7 +976,7 @@ static void countdown_semaphore_instance_init (CountdownSemaphore * self) {
 }
 
 
-static void countdown_semaphore_finalize (AbstractSemaphore* obj) {
+static void countdown_semaphore_finalize (AbstractSemaphore * obj) {
 	CountdownSemaphore * self;
 #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COUNTDOWN_SEMAPHORE, CountdownSemaphore);
@@ -1034,7 +1034,7 @@ static AbstractSemaphoreWaitAction event_semaphore_real_do_wait (AbstractSemapho
 	EventSemaphore * self;
 	AbstractSemaphoreWaitAction result = 0;
 	AbstractSemaphoreWaitAction _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 150 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_SEMAPHORE, EventSemaphore);
 #line 151 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -1080,11 +1080,11 @@ static void event_semaphore_class_init (EventSemaphoreClass * klass) {
 #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_type_class_add_private (klass, sizeof (EventSemaphorePrivate));
 #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*)(AbstractSemaphore*)) event_semaphore_real_do_notify;
+	((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*) (AbstractSemaphore *)) event_semaphore_real_do_notify;
 #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) event_semaphore_real_do_wait;
+	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*) (AbstractSemaphore *)) event_semaphore_real_do_wait;
 #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*)(AbstractSemaphore*)) event_semaphore_real_do_reset;
+	((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*) (AbstractSemaphore *)) event_semaphore_real_do_reset;
 #line 1089 "Semaphore.c"
 }
 
@@ -1098,7 +1098,7 @@ static void event_semaphore_instance_init (EventSemaphore * self) {
 }
 
 
-static void event_semaphore_finalize (AbstractSemaphore* obj) {
+static void event_semaphore_finalize (AbstractSemaphore * obj) {
 	EventSemaphore * self;
 #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_SEMAPHORE, EventSemaphore);
diff --git a/src/threads/Threads.c b/src/threads/Threads.c
index b2cace8..04aae36 100644
--- a/src/threads/Threads.c
+++ b/src/threads/Threads.c
@@ -1,4 +1,4 @@
-/* Threads.c generated by valac 0.34.7, the Vala compiler
+/* Threads.c generated by valac 0.36.6, the Vala compiler
  * generated from Threads.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/threads/Workers.c b/src/threads/Workers.c
index ff9d180..0391730 100644
--- a/src/threads/Workers.c
+++ b/src/threads/Workers.c
@@ -1,4 +1,4 @@
-/* Workers.c generated by valac 0.34.7, the Vala compiler
+/* Workers.c generated by valac 0.36.6, the Vala compiler
  * generated from Workers.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -192,7 +192,7 @@ gint workers_get_pending_job_count (Workers* self);
 gboolean background_job_is_cancelled (BackgroundJob* self);
 void background_job_execute (BackgroundJob* self);
 void background_job_internal_notify_completion (BackgroundJob* self);
-static void workers_finalize (Workers* obj);
+static void workers_finalize (Workers * obj);
 
 
 static gint64 _background_job_priority_comparator_comparator (void* a, void* b, gpointer self) {
@@ -261,8 +261,8 @@ static void _workers_thread_start_gfunc (gpointer data, gpointer self) {
 Workers* workers_construct (GType object_type, guint max_threads, gboolean exclusive) {
 	Workers* self = NULL;
 	gboolean _tmp0_ = FALSE;
-	guint _tmp1_ = 0U;
-	EventSemaphore* _tmp3_ = NULL;
+	guint _tmp1_;
+	EventSemaphore* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 23 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	self = (Workers*) g_type_create_instance (object_type);
@@ -271,7 +271,7 @@ Workers* workers_construct (GType object_type, guint max_threads, gboolean exclu
 #line 24 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (_tmp1_ <= ((guint) 0)) {
 #line 274 "Workers.c"
-		guint _tmp2_ = 0U;
+		guint _tmp2_;
 #line 24 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp2_ = max_threads;
 #line 24 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -295,10 +295,10 @@ Workers* workers_construct (GType object_type, guint max_threads, gboolean exclu
 #line 296 "Workers.c"
 	{
 		GThreadPool* _tmp4_ = NULL;
-		guint _tmp5_ = 0U;
-		gboolean _tmp6_ = FALSE;
-		GThreadPool* _tmp7_ = NULL;
-		GThreadPool* _tmp8_ = NULL;
+		guint _tmp5_;
+		gboolean _tmp6_;
+		GThreadPool* _tmp7_;
+		GThreadPool* _tmp8_;
 #line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp5_ = max_threads;
 #line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -338,7 +338,7 @@ Workers* workers_construct (GType object_type, guint max_threads, gboolean exclu
 	__catch8_g_thread_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp9_ = NULL;
+		const gchar* _tmp9_;
 #line 30 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		err = _inner_error_;
 #line 30 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -377,14 +377,14 @@ Workers* workers_new (guint max_threads, gboolean exclusive) {
 
 guint workers_threads_per_cpu (gint per, gint max) {
 	guint result = 0U;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	guint count = 0U;
-	guint _tmp1_ = 0U;
-	gint _tmp2_ = 0;
+	guint _tmp1_;
+	gint _tmp2_;
 	guint _tmp3_ = 0U;
-	gint _tmp4_ = 0;
-	guint _tmp9_ = 0U;
-	guint _tmp10_ = 0U;
+	gint _tmp4_;
+	guint _tmp9_;
+	guint _tmp10_;
 #line 37 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	_tmp0_ = per;
 #line 37 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -400,16 +400,16 @@ guint workers_threads_per_cpu (gint per, gint max) {
 #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (_tmp4_ < 0) {
 #line 403 "Workers.c"
-		guint _tmp5_ = 0U;
+		guint _tmp5_;
 #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp5_ = count;
 #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp3_ = _tmp5_;
 #line 409 "Workers.c"
 	} else {
-		guint _tmp6_ = 0U;
-		gint _tmp7_ = 0;
-		guint _tmp8_ = 0U;
+		guint _tmp6_;
+		gint _tmp7_;
+		guint _tmp8_;
 #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp6_ = count;
 #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -434,10 +434,10 @@ guint workers_threads_per_cpu (gint per, gint max) {
 
 guint workers_thread_per_cpu_minus_one (void) {
 	guint result = 0U;
-	guint _tmp0_ = 0U;
-	guint _tmp1_ = 0U;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
+	guint _tmp0_;
+	guint _tmp1_;
+	guint _tmp2_;
+	guint _tmp3_;
 #line 46 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	_tmp0_ = g_get_num_processors ();
 #line 46 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -471,7 +471,7 @@ static gint _background_job_priority_compare_func_gcompare_data_func (gconstpoin
 
 
 void workers_enqueue (Workers* self, BackgroundJob* job) {
-	EventSemaphore* _tmp0_ = NULL;
+	EventSemaphore* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 51 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	g_return_if_fail (IS_WORKERS (self));
@@ -483,17 +483,17 @@ void workers_enqueue (Workers* self, BackgroundJob* job) {
 	abstract_semaphore_reset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore));
 #line 485 "Workers.c"
 	{
-		GAsyncQueue* _tmp1_ = NULL;
+		GAsyncQueue* _tmp1_;
 #line 54 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp1_ = self->priv->queue;
 #line 54 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		g_rec_mutex_lock (&self->priv->__lock_queue);
 #line 492 "Workers.c"
 		{
-			GAsyncQueue* _tmp2_ = NULL;
-			BackgroundJob* _tmp3_ = NULL;
-			BackgroundJob* _tmp4_ = NULL;
-			gint _tmp5_ = 0;
+			GAsyncQueue* _tmp2_;
+			BackgroundJob* _tmp3_;
+			BackgroundJob* _tmp4_;
+			gint _tmp5_;
 #line 55 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			_tmp2_ = self->priv->queue;
 #line 55 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -510,7 +510,7 @@ void workers_enqueue (Workers* self, BackgroundJob* job) {
 		}
 		__finally9:
 		{
-			GAsyncQueue* _tmp6_ = NULL;
+			GAsyncQueue* _tmp6_;
 #line 54 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			_tmp6_ = self->priv->queue;
 #line 54 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -529,8 +529,8 @@ void workers_enqueue (Workers* self, BackgroundJob* job) {
 		}
 	}
 	{
-		GThreadPool* _tmp7_ = NULL;
-		BackgroundJob* _tmp8_ = NULL;
+		GThreadPool* _tmp7_;
+		BackgroundJob* _tmp8_;
 #line 60 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp7_ = self->priv->thread_pool;
 #line 60 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -557,8 +557,8 @@ void workers_enqueue (Workers* self, BackgroundJob* job) {
 	__catch10_g_thread_error:
 	{
 		GError* err = NULL;
-		GError* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
+		GError* _tmp9_;
+		const gchar* _tmp10_;
 #line 59 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		err = _inner_error_;
 #line 59 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -595,8 +595,8 @@ void workers_enqueue_many (Workers* self, BackgroundJobBatch* batch) {
 #line 596 "Workers.c"
 	{
 		GeeIterator* _job_it = NULL;
-		BackgroundJobBatch* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		BackgroundJobBatch* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp0_ = batch;
 #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -606,12 +606,12 @@ void workers_enqueue_many (Workers* self, BackgroundJobBatch* batch) {
 #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		while (TRUE) {
 #line 609 "Workers.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			BackgroundJob* job = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			BackgroundJob* _tmp6_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			BackgroundJob* _tmp6_;
 #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			_tmp2_ = _job_it;
 #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -644,7 +644,7 @@ void workers_enqueue_many (Workers* self, BackgroundJobBatch* batch) {
 
 
 void workers_wait_for_empty_queue (Workers* self) {
-	EventSemaphore* _tmp0_ = NULL;
+	EventSemaphore* _tmp0_;
 #line 73 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	g_return_if_fail (IS_WORKERS (self));
 #line 74 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -662,7 +662,7 @@ gint workers_get_pending_job_count (Workers* self) {
 	g_return_val_if_fail (IS_WORKERS (self), 0);
 #line 664 "Workers.c"
 	{
-		GAsyncQueue* _tmp0_ = NULL;
+		GAsyncQueue* _tmp0_;
 		gint _tmp4_ = 0;
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp0_ = self->priv->queue;
@@ -670,14 +670,14 @@ gint workers_get_pending_job_count (Workers* self) {
 		g_rec_mutex_lock (&self->priv->__lock_queue);
 #line 672 "Workers.c"
 		{
-			gint _tmp1_ = 0;
+			gint _tmp1_;
 #line 80 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			_tmp1_ = self->priv->enqueued;
 #line 80 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			result = _tmp1_;
 #line 679 "Workers.c"
 			{
-				GAsyncQueue* _tmp2_ = NULL;
+				GAsyncQueue* _tmp2_;
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 				_tmp2_ = self->priv->queue;
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -690,7 +690,7 @@ gint workers_get_pending_job_count (Workers* self) {
 		}
 		__finally11:
 		{
-			GAsyncQueue* _tmp3_ = NULL;
+			GAsyncQueue* _tmp3_;
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			_tmp3_ = self->priv->queue;
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -711,24 +711,24 @@ gint workers_get_pending_job_count (Workers* self) {
 static void workers_thread_start (Workers* self, void* ignored) {
 	BackgroundJob* job = NULL;
 	gboolean empty = FALSE;
-	gboolean _tmp7_ = FALSE;
+	gboolean _tmp7_;
 	GError * _inner_error_ = NULL;
 #line 84 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	g_return_if_fail (IS_WORKERS (self));
 #line 719 "Workers.c"
 	{
-		GAsyncQueue* _tmp0_ = NULL;
+		GAsyncQueue* _tmp0_;
 #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp0_ = self->priv->queue;
 #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		g_rec_mutex_lock (&self->priv->__lock_queue);
 #line 726 "Workers.c"
 		{
-			GAsyncQueue* _tmp1_ = NULL;
-			gpointer _tmp2_ = NULL;
-			gint _tmp3_ = 0;
-			gint _tmp4_ = 0;
-			gint _tmp5_ = 0;
+			GAsyncQueue* _tmp1_;
+			gpointer _tmp2_;
+			gint _tmp3_;
+			gint _tmp4_;
+			gint _tmp5_;
 #line 88 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			_tmp1_ = self->priv->queue;
 #line 88 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -755,7 +755,7 @@ static void workers_thread_start (Workers* self, void* ignored) {
 		}
 		__finally12:
 		{
-			GAsyncQueue* _tmp6_ = NULL;
+			GAsyncQueue* _tmp6_;
 #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			_tmp6_ = self->priv->queue;
 #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -788,7 +788,7 @@ static void workers_thread_start (Workers* self, void* ignored) {
 #line 100 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (empty) {
 #line 791 "Workers.c"
-		EventSemaphore* _tmp8_ = NULL;
+		EventSemaphore* _tmp8_;
 #line 101 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp8_ = self->priv->empty_event;
 #line 101 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -843,7 +843,7 @@ static gchar* value_workers_collect_value (GValue* value, guint n_collect_values
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (collect_values[0].v_pointer) {
 #line 846 "Workers.c"
-		Workers* object;
+		Workers * object;
 		object = collect_values[0].v_pointer;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -870,7 +870,7 @@ static gchar* value_workers_collect_value (GValue* value, guint n_collect_values
 
 
 static gchar* value_workers_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	Workers** object_p;
+	Workers ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (!object_p) {
@@ -922,7 +922,7 @@ gpointer value_get_workers (const GValue* value) {
 
 
 void value_set_workers (GValue* value, gpointer v_object) {
-	Workers* old;
+	Workers * old;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_WORKERS));
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -953,7 +953,7 @@ void value_set_workers (GValue* value, gpointer v_object) {
 
 
 void value_take_workers (GValue* value, gpointer v_object) {
-	Workers* old;
+	Workers * old;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_WORKERS));
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -993,8 +993,8 @@ static void workers_class_init (WorkersClass * klass) {
 
 
 static void workers_instance_init (Workers * self) {
-	GAsyncQueue* _tmp0_ = NULL;
-	EventSemaphore* _tmp1_ = NULL;
+	GAsyncQueue* _tmp0_;
+	EventSemaphore* _tmp1_;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	self->priv = WORKERS_GET_PRIVATE (self);
 #line 19 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -1015,7 +1015,7 @@ static void workers_instance_init (Workers * self) {
 }
 
 
-static void workers_finalize (Workers* obj) {
+static void workers_finalize (Workers * obj) {
 	Workers * self;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_WORKERS, Workers);
@@ -1048,7 +1048,7 @@ GType workers_get_type (void) {
 
 
 gpointer workers_ref (gpointer instance) {
-	Workers* self;
+	Workers * self;
 	self = instance;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1059,7 +1059,7 @@ gpointer workers_ref (gpointer instance) {
 
 
 void workers_unref (gpointer instance) {
-	Workers* self;
+	Workers * self;
 	self = instance;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
diff --git a/src/unit/Unit.c b/src/unit/Unit.c
index 242cbd4..6ca2115 100644
--- a/src/unit/Unit.c
+++ b/src/unit/Unit.c
@@ -1,4 +1,4 @@
-/* Unit.c generated by valac 0.34.7, the Vala compiler
+/* Unit.c generated by valac 0.36.6, the Vala compiler
  * generated from Unit.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/KeyValueMap.c b/src/util/KeyValueMap.c
index 1c584c3..ff453c2 100644
--- a/src/util/KeyValueMap.c
+++ b/src/util/KeyValueMap.c
@@ -1,4 +1,4 @@
-/* KeyValueMap.c generated by valac 0.34.7, the Vala compiler
+/* KeyValueMap.c generated by valac 0.36.6, the Vala compiler
  * generated from KeyValueMap.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -90,13 +90,13 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)
 gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean def);
 void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def, GdkPoint* result);
 void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* point);
-static void key_value_map_finalize (KeyValueMap* obj);
+static void key_value_map_finalize (KeyValueMap * obj);
 
 
 KeyValueMap* key_value_map_construct (GType object_type, const gchar* group) {
 	KeyValueMap* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_val_if_fail (group != NULL, NULL);
 #line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -125,8 +125,8 @@ KeyValueMap* key_value_map_new (const gchar* group) {
 KeyValueMap* key_value_map_copy (KeyValueMap* self) {
 	KeyValueMap* result = NULL;
 	KeyValueMap* clone = NULL;
-	const gchar* _tmp0_ = NULL;
-	KeyValueMap* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	KeyValueMap* _tmp1_;
 #line 15 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL);
 #line 16 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -138,12 +138,12 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) {
 #line 139 "KeyValueMap.c"
 	{
 		GeeIterator* _key_it = NULL;
-		GeeHashMap* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeSet* _tmp4_ = NULL;
-		GeeSet* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
-		GeeIterator* _tmp7_ = NULL;
+		GeeHashMap* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeSet* _tmp4_;
+		GeeSet* _tmp5_;
+		GeeIterator* _tmp6_;
+		GeeIterator* _tmp7_;
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp2_ = self->priv->map;
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -163,18 +163,18 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) {
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		while (TRUE) {
 #line 166 "KeyValueMap.c"
-			GeeIterator* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			GeeIterator* _tmp8_;
+			gboolean _tmp9_;
 			gchar* key = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			gpointer _tmp11_ = NULL;
-			KeyValueMap* _tmp12_ = NULL;
-			GeeHashMap* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			GeeHashMap* _tmp15_ = NULL;
-			const gchar* _tmp16_ = NULL;
-			gpointer _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			KeyValueMap* _tmp12_;
+			GeeHashMap* _tmp13_;
+			const gchar* _tmp14_;
+			GeeHashMap* _tmp15_;
+			const gchar* _tmp16_;
+			gpointer _tmp17_;
+			gchar* _tmp18_;
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 			_tmp8_ = _key_it;
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -227,8 +227,8 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) {
 
 gchar* key_value_map_get_group (KeyValueMap* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL);
 #line 24 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -245,9 +245,9 @@ gchar* key_value_map_get_group (KeyValueMap* self) {
 
 GeeSet* key_value_map_get_keys (KeyValueMap* self) {
 	GeeSet* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GeeSet* _tmp1_ = NULL;
-	GeeSet* _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeSet* _tmp1_;
+	GeeSet* _tmp2_;
 #line 27 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL);
 #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -266,9 +266,9 @@ GeeSet* key_value_map_get_keys (KeyValueMap* self) {
 
 gboolean key_value_map_has_key (KeyValueMap* self, const gchar* key) {
 	gboolean result = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 31 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), FALSE);
 #line 31 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -288,10 +288,10 @@ gboolean key_value_map_has_key (KeyValueMap* self, const gchar* key) {
 
 
 void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	GeeHashMap* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
 #line 35 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_if_fail (IS_KEY_VALUE_MAP (self));
 #line 35 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -315,12 +315,12 @@ void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar*
 
 
 void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value) {
-	const gchar* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	GeeHashMap* _tmp1_;
+	const gchar* _tmp2_;
+	gint _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 41 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_if_fail (IS_KEY_VALUE_MAP (self));
 #line 41 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -349,41 +349,41 @@ void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value) {
 
 static gchar* double_to_string (gdouble self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gint _tmp1__length1;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1__length1 = G_ASCII_DTOSTR_BUF_SIZE;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = g_ascii_dtostr (_tmp1_, G_ASCII_DTOSTR_BUF_SIZE, self);
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = (g_free (_tmp1_), NULL);
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 377 "KeyValueMap.c"
 }
 
 
 void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble value) {
-	const gchar* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gdouble _tmp3_ = 0.0;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	GeeHashMap* _tmp1_;
+	const gchar* _tmp2_;
+	gdouble _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 47 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_if_fail (IS_KEY_VALUE_MAP (self));
 #line 47 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -411,12 +411,12 @@ void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble valu
 
 
 void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value) {
-	const gchar* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gfloat _tmp3_ = 0.0F;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	GeeHashMap* _tmp1_;
+	const gchar* _tmp2_;
+	gfloat _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 53 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_if_fail (IS_KEY_VALUE_MAP (self));
 #line 53 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -445,24 +445,24 @@ void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value)
 
 static gchar* bool_to_string (gboolean self) {
 	gchar* result = NULL;
-#line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 37 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (self) {
 #line 451 "KeyValueMap.c"
-		gchar* _tmp0_ = NULL;
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp0_;
+#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strdup ("true");
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp0_;
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 459 "KeyValueMap.c"
 	} else {
-		gchar* _tmp1_ = NULL;
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp1_;
+#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = g_strdup ("false");
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp1_;
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 468 "KeyValueMap.c"
 	}
@@ -470,12 +470,12 @@ static gchar* bool_to_string (gboolean self) {
 
 
 void key_value_map_set_bool (KeyValueMap* self, const gchar* key, gboolean value) {
-	const gchar* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	GeeHashMap* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 59 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_if_fail (IS_KEY_VALUE_MAP (self));
 #line 59 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -505,12 +505,12 @@ void key_value_map_set_bool (KeyValueMap* self, const gchar* key, gboolean value
 gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gchar* def) {
 	gchar* result = NULL;
 	gchar* value = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
 	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp7_ = NULL;
+	const gchar* _tmp4_;
+	gchar* _tmp7_;
 #line 65 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL);
 #line 65 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -528,14 +528,14 @@ gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gcha
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (_tmp4_ != NULL) {
 #line 531 "KeyValueMap.c"
-		const gchar* _tmp5_ = NULL;
+		const gchar* _tmp5_;
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp5_ = value;
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp3_ = _tmp5_;
 #line 537 "KeyValueMap.c"
 	} else {
-		const gchar* _tmp6_ = NULL;
+		const gchar* _tmp6_;
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp6_ = def;
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -557,11 +557,11 @@ gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gcha
 gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) {
 	gint result = 0;
 	gchar* value = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
 	gint _tmp3_ = 0;
-	const gchar* _tmp4_ = NULL;
+	const gchar* _tmp4_;
 #line 71 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), 0);
 #line 71 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -579,8 +579,8 @@ gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) {
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (_tmp4_ != NULL) {
 #line 582 "KeyValueMap.c"
-		const gchar* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
+		const gchar* _tmp5_;
+		gint _tmp6_;
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp5_ = value;
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -589,7 +589,7 @@ gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) {
 		_tmp3_ = _tmp6_;
 #line 591 "KeyValueMap.c"
 	} else {
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp7_ = def;
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -608,17 +608,17 @@ gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) {
 
 static gdouble double_parse (const gchar* str) {
 	gdouble result = 0.0;
-	const gchar* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-#line 869 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gdouble _tmp1_;
+#line 877 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, 0.0);
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = g_ascii_strtod (_tmp0_, NULL);
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 624 "KeyValueMap.c"
 }
@@ -627,11 +627,11 @@ static gdouble double_parse (const gchar* str) {
 gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble def) {
 	gdouble result = 0.0;
 	gchar* value = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
 	gdouble _tmp3_ = 0.0;
-	const gchar* _tmp4_ = NULL;
+	const gchar* _tmp4_;
 #line 77 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), 0.0);
 #line 77 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -649,8 +649,8 @@ gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble d
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (_tmp4_ != NULL) {
 #line 652 "KeyValueMap.c"
-		const gchar* _tmp5_ = NULL;
-		gdouble _tmp6_ = 0.0;
+		const gchar* _tmp5_;
+		gdouble _tmp6_;
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp5_ = value;
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -659,7 +659,7 @@ gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble d
 		_tmp3_ = _tmp6_;
 #line 661 "KeyValueMap.c"
 	} else {
-		gdouble _tmp7_ = 0.0;
+		gdouble _tmp7_;
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp7_ = def;
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -679,11 +679,11 @@ gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble d
 gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def) {
 	gfloat result = 0.0F;
 	gchar* value = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
 	gfloat _tmp3_ = 0.0F;
-	const gchar* _tmp4_ = NULL;
+	const gchar* _tmp4_;
 #line 83 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), 0.0F);
 #line 83 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -701,8 +701,8 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (_tmp4_ != NULL) {
 #line 704 "KeyValueMap.c"
-		const gchar* _tmp5_ = NULL;
-		gdouble _tmp6_ = 0.0;
+		const gchar* _tmp5_;
+		gdouble _tmp6_;
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp5_ = value;
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -711,7 +711,7 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)
 		_tmp3_ = (gfloat) _tmp6_;
 #line 713 "KeyValueMap.c"
 	} else {
-		gfloat _tmp7_ = 0.0F;
+		gfloat _tmp7_;
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp7_ = def;
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -730,22 +730,22 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)
 
 static gboolean bool_parse (const gchar* str) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-#line 44 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+#line 44 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, FALSE);
-#line 45 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 45 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 45 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 45 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (g_strcmp0 (_tmp0_, "true") == 0) {
-#line 46 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 46 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = TRUE;
-#line 46 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 46 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 745 "KeyValueMap.c"
 	} else {
-#line 48 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 48 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = FALSE;
-#line 48 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 48 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 751 "KeyValueMap.c"
 	}
@@ -755,11 +755,11 @@ static gboolean bool_parse (const gchar* str) {
 gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean def) {
 	gboolean result = FALSE;
 	gchar* value = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	const gchar* _tmp4_ = NULL;
+	const gchar* _tmp4_;
 #line 89 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), FALSE);
 #line 89 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -777,8 +777,8 @@ gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean d
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (_tmp4_ != NULL) {
 #line 780 "KeyValueMap.c"
-		const gchar* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		const gchar* _tmp5_;
+		gboolean _tmp6_;
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp5_ = value;
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -787,7 +787,7 @@ gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean d
 		_tmp3_ = _tmp6_;
 #line 789 "KeyValueMap.c"
 	} else {
-		gboolean _tmp7_ = FALSE;
+		gboolean _tmp7_;
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp7_ = def;
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -806,10 +806,10 @@ gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean d
 
 void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def, GdkPoint* result) {
 	gchar* value = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
+	const gchar* _tmp3_;
 #line 100 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_if_fail (IS_KEY_VALUE_MAP (self));
 #line 100 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -829,7 +829,7 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def
 #line 103 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (_tmp3_ == NULL) {
 #line 832 "KeyValueMap.c"
-		GdkPoint _tmp4_ = {0};
+		GdkPoint _tmp4_;
 #line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp4_ = *def;
 #line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -842,8 +842,8 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def
 	} else {
 		GdkPoint _result_ = {0};
 		GdkPoint _tmp5_ = {0};
-		const gchar* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
+		const gchar* _tmp6_;
+		gint _tmp7_;
 #line 106 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp5_.x = 0;
 #line 106 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -862,7 +862,7 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def
 			return;
 #line 864 "KeyValueMap.c"
 		} else {
-			GdkPoint _tmp8_ = {0};
+			GdkPoint _tmp8_;
 #line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 			_tmp8_ = *def;
 #line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -881,14 +881,14 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def
 
 
 void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* point) {
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GdkPoint _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkPoint _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	GdkPoint _tmp2_;
+	gint _tmp3_;
+	GdkPoint _tmp4_;
+	gint _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
 #line 114 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_if_fail (IS_KEY_VALUE_MAP (self));
 #line 114 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -961,7 +961,7 @@ static gchar* value_key_value_map_collect_value (GValue* value, guint n_collect_
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (collect_values[0].v_pointer) {
 #line 964 "KeyValueMap.c"
-		KeyValueMap* object;
+		KeyValueMap * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -988,7 +988,7 @@ static gchar* value_key_value_map_collect_value (GValue* value, guint n_collect_
 
 
 static gchar* value_key_value_map_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	KeyValueMap** object_p;
+	KeyValueMap ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (!object_p) {
@@ -1040,7 +1040,7 @@ gpointer value_get_key_value_map (const GValue* value) {
 
 
 void value_set_key_value_map (GValue* value, gpointer v_object) {
-	KeyValueMap* old;
+	KeyValueMap * old;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEY_VALUE_MAP));
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -1071,7 +1071,7 @@ void value_set_key_value_map (GValue* value, gpointer v_object) {
 
 
 void value_take_key_value_map (GValue* value, gpointer v_object) {
-	KeyValueMap* old;
+	KeyValueMap * old;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEY_VALUE_MAP));
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -1111,7 +1111,7 @@ static void key_value_map_class_init (KeyValueMapClass * klass) {
 
 
 static void key_value_map_instance_init (KeyValueMap * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	self->priv = KEY_VALUE_MAP_GET_PRIVATE (self);
 #line 9 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -1124,7 +1124,7 @@ static void key_value_map_instance_init (KeyValueMap * self) {
 }
 
 
-static void key_value_map_finalize (KeyValueMap* obj) {
+static void key_value_map_finalize (KeyValueMap * obj) {
 	KeyValueMap * self;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_KEY_VALUE_MAP, KeyValueMap);
@@ -1153,7 +1153,7 @@ GType key_value_map_get_type (void) {
 
 
 gpointer key_value_map_ref (gpointer instance) {
-	KeyValueMap* self;
+	KeyValueMap * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1164,7 +1164,7 @@ gpointer key_value_map_ref (gpointer instance) {
 
 
 void key_value_map_unref (gpointer instance) {
-	KeyValueMap* self;
+	KeyValueMap * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
diff --git a/src/util/Util.c b/src/util/Util.c
index 65ba704..45f48d9 100644
--- a/src/util/Util.c
+++ b/src/util/Util.c
@@ -1,4 +1,4 @@
-/* Util.c generated by valac 0.34.7, the Vala compiler
+/* Util.c generated by valac 0.36.6, the Vala compiler
  * generated from Util.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/file.c b/src/util/file.c
index 3f4b228..2afe738 100644
--- a/src/util/file.c
+++ b/src/util/file.c
@@ -1,4 +1,4 @@
-/* file.c generated by valac 0.34.7, the Vala compiler
+/* file.c generated by valac 0.36.6, the Vala compiler
  * generated from file.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -29,7 +29,7 @@ typedef gboolean (*ProgressMonitor) (guint64 current, guint64 total, gboolean do
 
 gboolean claim_file (GFile* file, GError** error);
 GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error);
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
 glong find_last_offset (const gchar* str, gchar c);
 guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GError** error);
 void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, void* monitor_target, guint64 file_count, GCancellable* cancellable, GError** error);
@@ -60,9 +60,9 @@ gboolean claim_file (GFile* file, GError** error) {
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 62 "file.c"
 	{
-		GFile* _tmp0_ = NULL;
-		GFileOutputStream* _tmp1_ = NULL;
-		GFileOutputStream* _tmp2_ = NULL;
+		GFile* _tmp0_;
+		GFileOutputStream* _tmp1_;
+		GFileOutputStream* _tmp2_;
 #line 14 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = file;
 #line 14 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -86,7 +86,7 @@ gboolean claim_file (GFile* file, GError** error) {
 	__catch0_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 13 "/home/jens/Source/shotwell/src/util/file.vala"
 		err = _inner_error_;
 #line 13 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -96,13 +96,13 @@ gboolean claim_file (GFile* file, GError** error) {
 #line 20 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (!g_error_matches (_tmp3_, G_IO_ERROR, G_IO_ERROR_EXISTS)) {
 #line 99 "file.c"
-			GFile* _tmp4_ = NULL;
-			gchar* _tmp5_ = NULL;
-			gchar* _tmp6_ = NULL;
-			GError* _tmp7_ = NULL;
-			const gchar* _tmp8_ = NULL;
-			GError* _tmp9_ = NULL;
-			GError* _tmp10_ = NULL;
+			GFile* _tmp4_;
+			gchar* _tmp5_;
+			gchar* _tmp6_;
+			GError* _tmp7_;
+			const gchar* _tmp8_;
+			GError* _tmp9_;
+			GError* _tmp10_;
 #line 21 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp4_ = file;
 #line 21 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -149,21 +149,21 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 	gboolean _vala_collision = FALSE;
 	GFile* result = NULL;
 	GFile* file = NULL;
-	GFile* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	const gchar* _tmp1_;
+	GFile* _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	GFile* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	GFile* _tmp4_;
+	gboolean _tmp5_;
 	gchar* name = NULL;
 	gchar* ext = NULL;
-	const gchar* _tmp6_ = NULL;
+	const gchar* _tmp6_;
 	gchar* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
-	GFile* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	const gchar* _tmp31_ = NULL;
+	GFile* _tmp28_;
+	gchar* _tmp29_;
+	gchar* _tmp30_;
+	const gchar* _tmp31_;
 	GError * _inner_error_ = NULL;
 #line 36 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE (dir), NULL);
@@ -236,21 +236,21 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 			while (TRUE) {
 #line 239 "file.c"
-				gint _tmp11_ = 0;
+				gint _tmp11_;
 				gchar* _tmp12_ = NULL;
-				const gchar* _tmp13_ = NULL;
+				const gchar* _tmp13_;
 				gchar* new_name = NULL;
-				gchar* _tmp21_ = NULL;
-				GFile* _tmp22_ = NULL;
-				const gchar* _tmp23_ = NULL;
-				GFile* _tmp24_ = NULL;
+				gchar* _tmp21_;
+				GFile* _tmp22_;
+				const gchar* _tmp23_;
+				GFile* _tmp24_;
 				gboolean _tmp25_ = FALSE;
-				GFile* _tmp26_ = NULL;
-				gboolean _tmp27_ = FALSE;
+				GFile* _tmp26_;
+				gboolean _tmp27_;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 				if (!_tmp9_) {
 #line 253 "file.c"
-					gint _tmp10_ = 0;
+					gint _tmp10_;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 					_tmp10_ = ctr;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -272,10 +272,10 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
 				if (_tmp13_ != NULL) {
 #line 275 "file.c"
-					const gchar* _tmp14_ = NULL;
-					gint _tmp15_ = 0;
-					const gchar* _tmp16_ = NULL;
-					gchar* _tmp17_ = NULL;
+					const gchar* _tmp14_;
+					gint _tmp15_;
+					const gchar* _tmp16_;
+					gchar* _tmp17_;
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
 					_tmp14_ = name;
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -290,9 +290,9 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 					_tmp12_ = _tmp17_;
 #line 292 "file.c"
 				} else {
-					const gchar* _tmp18_ = NULL;
-					gint _tmp19_ = 0;
-					gchar* _tmp20_ = NULL;
+					const gchar* _tmp18_;
+					gint _tmp19_;
+					gchar* _tmp20_;
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
 					_tmp18_ = name;
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -408,41 +408,41 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 428 "file.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 436 "file.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 448 "file.c"
 	}
@@ -453,133 +453,133 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 472 "file.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 478 "file.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 482 "file.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 486 "file.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 498 "file.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 508 "file.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 514 "file.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 528 "file.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 538 "file.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 544 "file.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 553 "file.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 573 "file.c"
 }
 
 
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext) {
 	gchar* _vala_name = NULL;
 	gchar* _vala_ext = NULL;
 	glong offset = 0L;
-	const gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	glong _tmp2_ = 0L;
+	const gchar* _tmp0_;
+	glong _tmp1_;
+	glong _tmp2_;
 #line 65 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_if_fail (basename != NULL);
 #line 66 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -593,8 +593,8 @@ void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
 #line 67 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp2_ <= ((glong) 0)) {
 #line 596 "file.c"
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
 #line 68 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp3_ = basename;
 #line 68 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -609,12 +609,12 @@ void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
 		_vala_ext = NULL;
 #line 611 "file.c"
 	} else {
-		const gchar* _tmp5_ = NULL;
-		glong _tmp6_ = 0L;
-		gchar* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		glong _tmp9_ = 0L;
-		gchar* _tmp10_ = NULL;
+		const gchar* _tmp5_;
+		glong _tmp6_;
+		gchar* _tmp7_;
+		const gchar* _tmp8_;
+		glong _tmp9_;
+		gchar* _tmp10_;
 #line 71 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp5_ = basename;
 #line 71 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -663,9 +663,9 @@ void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
 guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GError** error) {
 	guint64 result = 0ULL;
 	GFileType type = 0;
-	GFile* _tmp0_ = NULL;
-	GFileType _tmp1_ = 0;
-	GFileType _tmp2_ = 0;
+	GFile* _tmp0_;
+	GFileType _tmp1_;
+	GFileType _tmp2_;
 	GFileEnumerator* enumerator = NULL;
 	guint64 total_bytes = 0ULL;
 	GFileInfo* info = NULL;
@@ -686,17 +686,17 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 	if (_tmp2_ == G_FILE_TYPE_REGULAR) {
 #line 688 "file.c"
 		GFileInfo* info = NULL;
-		GFileInfo* _tmp17_ = NULL;
-		gint64 _tmp18_ = 0LL;
+		GFileInfo* _tmp17_;
+		gint64 _tmp18_;
 #line 80 "/home/jens/Source/shotwell/src/util/file.vala"
 		info = NULL;
 #line 694 "file.c"
 		{
 			GFileInfo* _tmp3_ = NULL;
-			GFile* _tmp4_ = NULL;
-			GCancellable* _tmp5_ = NULL;
-			GFileInfo* _tmp6_ = NULL;
-			GFileInfo* _tmp7_ = NULL;
+			GFile* _tmp4_;
+			GCancellable* _tmp5_;
+			GFileInfo* _tmp6_;
+			GFileInfo* _tmp7_;
 #line 82 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp4_ = file_or_dir;
 #line 82 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -726,12 +726,12 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 		__catch1_g_error:
 		{
 			GError* err = NULL;
-			GError* _tmp8_ = NULL;
-			GFile* _tmp11_ = NULL;
-			gchar* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			GError* _tmp14_ = NULL;
-			const gchar* _tmp15_ = NULL;
+			GError* _tmp8_;
+			GFile* _tmp11_;
+			gchar* _tmp12_;
+			gchar* _tmp13_;
+			GError* _tmp14_;
+			const gchar* _tmp15_;
 #line 81 "/home/jens/Source/shotwell/src/util/file.vala"
 			err = _inner_error_;
 #line 81 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -741,8 +741,8 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 #line 85 "/home/jens/Source/shotwell/src/util/file.vala"
 			if (g_error_matches (_tmp8_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
 #line 744 "file.c"
-				GError* _tmp9_ = NULL;
-				GError* _tmp10_ = NULL;
+				GError* _tmp9_;
+				GError* _tmp10_;
 #line 86 "/home/jens/Source/shotwell/src/util/file.vala"
 				_tmp9_ = err;
 #line 86 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -803,7 +803,7 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 		return result;
 #line 805 "file.c"
 	} else {
-		GFileType _tmp19_ = 0;
+		GFileType _tmp19_;
 #line 94 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp19_ = type;
 #line 94 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -817,11 +817,11 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 	}
 	{
 		GFileEnumerator* _tmp20_ = NULL;
-		GFile* _tmp21_ = NULL;
-		GCancellable* _tmp22_ = NULL;
-		GFileEnumerator* _tmp23_ = NULL;
-		GFileEnumerator* _tmp24_ = NULL;
-		GFileEnumerator* _tmp25_ = NULL;
+		GFile* _tmp21_;
+		GCancellable* _tmp22_;
+		GFileEnumerator* _tmp23_;
+		GFileEnumerator* _tmp24_;
+		GFileEnumerator* _tmp25_;
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp21_ = file_or_dir;
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -866,9 +866,9 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 	{
 		GError* err = NULL;
 		gboolean _tmp26_ = FALSE;
-		GError* _tmp27_ = NULL;
-		GError* _tmp29_ = NULL;
-		GError* _tmp30_ = NULL;
+		GError* _tmp27_;
+		GError* _tmp29_;
+		GError* _tmp30_;
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
 		err = _inner_error_;
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -881,7 +881,7 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 			_tmp26_ = TRUE;
 #line 883 "file.c"
 		} else {
-			GError* _tmp28_ = NULL;
+			GError* _tmp28_;
 #line 106 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp28_ = err;
 #line 106 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -932,21 +932,21 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 	while (TRUE) {
 #line 934 "file.c"
 		GFileInfo* _tmp32_ = NULL;
-		GFileEnumerator* _tmp33_ = NULL;
-		GCancellable* _tmp34_ = NULL;
-		GFileInfo* _tmp35_ = NULL;
-		GFileInfo* _tmp37_ = NULL;
-		GFileInfo* _tmp38_ = NULL;
+		GFileEnumerator* _tmp33_;
+		GCancellable* _tmp34_;
+		GFileInfo* _tmp35_;
+		GFileInfo* _tmp37_;
+		GFileInfo* _tmp38_;
 		guint64 _tmp39_ = 0ULL;
-		GFile* _tmp40_ = NULL;
-		GFileInfo* _tmp41_ = NULL;
-		const gchar* _tmp42_ = NULL;
-		GFile* _tmp43_ = NULL;
-		GFile* _tmp44_ = NULL;
-		GCancellable* _tmp45_ = NULL;
-		guint64 _tmp46_ = 0ULL;
-		guint64 _tmp47_ = 0ULL;
-		guint64 _tmp49_ = 0ULL;
+		GFile* _tmp40_;
+		GFileInfo* _tmp41_;
+		const gchar* _tmp42_;
+		GFile* _tmp43_;
+		GFile* _tmp44_;
+		GCancellable* _tmp45_;
+		guint64 _tmp46_;
+		guint64 _tmp47_;
+		guint64 _tmp49_;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp33_ = enumerator;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1045,13 +1045,13 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 
 void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, void* monitor_target, guint64 file_count, GCancellable* cancellable, GError** error) {
 	GFileType type = 0;
-	GFile* _tmp0_ = NULL;
-	GFileType _tmp1_ = 0;
-	GFileType _tmp2_ = 0;
+	GFile* _tmp0_;
+	GFileType _tmp1_;
+	GFileType _tmp2_;
 	GFileEnumerator* enumerator = NULL;
-	GFile* _tmp10_ = NULL;
-	GCancellable* _tmp11_ = NULL;
-	GFileEnumerator* _tmp12_ = NULL;
+	GFile* _tmp10_;
+	GCancellable* _tmp11_;
+	GFileEnumerator* _tmp12_;
 	GFileInfo* info = NULL;
 	guint64 i = 0ULL;
 	GError * _inner_error_ = NULL;
@@ -1072,13 +1072,13 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 #line 128 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp2_ != G_FILE_TYPE_DIRECTORY) {
 #line 1075 "file.c"
-		GFile* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-		GError* _tmp9_ = NULL;
+		GFile* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		GError* _tmp8_;
+		GError* _tmp9_;
 #line 129 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp3_ = dir;
 #line 129 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1129,23 +1129,23 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 	while (TRUE) {
 #line 1131 "file.c"
 		GFileInfo* _tmp13_ = NULL;
-		GFileEnumerator* _tmp14_ = NULL;
-		GCancellable* _tmp15_ = NULL;
-		GFileInfo* _tmp16_ = NULL;
-		GFileInfo* _tmp17_ = NULL;
-		GFileInfo* _tmp18_ = NULL;
-		GFileInfo* _tmp19_ = NULL;
-		GFileType _tmp20_ = 0;
+		GFileEnumerator* _tmp14_;
+		GCancellable* _tmp15_;
+		GFileInfo* _tmp16_;
+		GFileInfo* _tmp17_;
+		GFileInfo* _tmp18_;
+		GFileInfo* _tmp19_;
+		GFileType _tmp20_;
 		gboolean _tmp21_ = FALSE;
-		GeeSet* _tmp22_ = NULL;
+		GeeSet* _tmp22_;
 		GFile* file = NULL;
-		GFile* _tmp27_ = NULL;
-		GFileInfo* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		GFile* _tmp30_ = NULL;
+		GFile* _tmp27_;
+		GFileInfo* _tmp28_;
+		const gchar* _tmp29_;
+		GFile* _tmp30_;
 		gboolean _tmp38_ = FALSE;
-		ProgressMonitor _tmp39_ = NULL;
-		void* _tmp39__target = NULL;
+		ProgressMonitor _tmp39_;
+		void* _tmp39__target;
 #line 135 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp14_ = enumerator;
 #line 135 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1201,10 +1201,10 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 #line 139 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (_tmp22_ != NULL) {
 #line 1204 "file.c"
-			GeeSet* _tmp23_ = NULL;
-			GFileInfo* _tmp24_ = NULL;
-			const gchar* _tmp25_ = NULL;
-			gboolean _tmp26_ = FALSE;
+			GeeSet* _tmp23_;
+			GFileInfo* _tmp24_;
+			const gchar* _tmp25_;
+			gboolean _tmp26_;
 #line 139 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp23_ = exceptions;
 #line 139 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1241,8 +1241,8 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 		file = _tmp30_;
 #line 1243 "file.c"
 		{
-			GFile* _tmp31_ = NULL;
-			GCancellable* _tmp32_ = NULL;
+			GFile* _tmp31_;
+			GCancellable* _tmp32_;
 #line 144 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp31_ = file;
 #line 144 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1259,11 +1259,11 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 		__catch3_g_error:
 		{
 			GError* err = NULL;
-			GFile* _tmp33_ = NULL;
-			gchar* _tmp34_ = NULL;
-			gchar* _tmp35_ = NULL;
-			GError* _tmp36_ = NULL;
-			const gchar* _tmp37_ = NULL;
+			GFile* _tmp33_;
+			gchar* _tmp34_;
+			gchar* _tmp35_;
+			GError* _tmp36_;
+			const gchar* _tmp37_;
 #line 143 "/home/jens/Source/shotwell/src/util/file.vala"
 			err = _inner_error_;
 #line 143 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1310,7 +1310,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (_tmp39_ != NULL) {
 #line 1313 "file.c"
-			guint64 _tmp40_ = 0ULL;
+			guint64 _tmp40_;
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp40_ = file_count;
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1324,11 +1324,11 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (_tmp38_) {
 #line 1327 "file.c"
-			ProgressMonitor _tmp41_ = NULL;
-			void* _tmp41__target = NULL;
-			guint64 _tmp42_ = 0ULL;
-			guint64 _tmp43_ = 0ULL;
-			guint64 _tmp44_ = 0ULL;
+			ProgressMonitor _tmp41_;
+			void* _tmp41__target;
+			guint64 _tmp42_;
+			guint64 _tmp43_;
+			guint64 _tmp44_;
 #line 150 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp41_ = monitor;
 #line 150 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1362,10 +1362,10 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 time_t query_file_modified (GFile* file, GError** error) {
 	time_t result = 0;
 	GFileInfo* info = NULL;
-	GFile* _tmp0_ = NULL;
-	GFileInfo* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFileInfo* _tmp1_;
 	GTimeVal _tmp3_ = {0};
-	glong _tmp4_ = 0L;
+	glong _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 154 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE (file), 0);
@@ -1401,8 +1401,8 @@ time_t query_file_modified (GFile* file, GError** error) {
 
 gboolean query_is_directory (GFile* file) {
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	GFileType _tmp1_ = 0;
+	GFile* _tmp0_;
+	GFileType _tmp1_;
 #line 161 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 162 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1419,18 +1419,15 @@ gboolean query_is_directory (GFile* file) {
 
 gboolean query_is_directory_empty (GFile* dir, GError** error) {
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	GFileType _tmp1_ = 0;
+	GFile* _tmp0_;
+	GFileType _tmp1_;
 	GFileEnumerator* enumerator = NULL;
-	GFile* _tmp2_ = NULL;
-	GFileEnumerator* _tmp3_ = NULL;
-	GFileEnumerator* _tmp5_ = NULL;
+	GFile* _tmp2_;
+	GFileEnumerator* _tmp3_;
+	GFileEnumerator* _tmp5_;
 	GFileInfo* _tmp6_ = NULL;
-	GFileEnumerator* _tmp7_ = NULL;
-	GFileInfo* _tmp8_ = NULL;
-	GFileInfo* _tmp10_ = NULL;
-	GFileInfo* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	GFileEnumerator* _tmp7_;
+	GFileInfo* _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 165 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE (dir), FALSE);
@@ -1444,7 +1441,7 @@ gboolean query_is_directory_empty (GFile* dir, GError** error) {
 		result = FALSE;
 #line 167 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1448 "file.c"
+#line 1445 "file.c"
 	}
 #line 169 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp2_ = dir;
@@ -1454,13 +1451,13 @@ gboolean query_is_directory_empty (GFile* dir, GError** error) {
 	enumerator = _tmp3_;
 #line 169 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1458 "file.c"
+#line 1455 "file.c"
 		gboolean _tmp4_ = FALSE;
 #line 169 "/home/jens/Source/shotwell/src/util/file.vala"
 		g_propagate_error (error, _inner_error_);
 #line 169 "/home/jens/Source/shotwell/src/util/file.vala"
 		return _tmp4_;
-#line 1464 "file.c"
+#line 1461 "file.c"
 	}
 #line 171 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp5_ = enumerator;
@@ -1472,7 +1469,7 @@ gboolean query_is_directory_empty (GFile* dir, GError** error) {
 		_g_object_unref0 (enumerator);
 #line 172 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1476 "file.c"
+#line 1473 "file.c"
 	}
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp7_ = enumerator;
@@ -1482,7 +1479,7 @@ gboolean query_is_directory_empty (GFile* dir, GError** error) {
 	_tmp6_ = _tmp8_;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1486 "file.c"
+#line 1483 "file.c"
 		gboolean _tmp9_ = FALSE;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 		g_propagate_error (error, _inner_error_);
@@ -1490,43 +1487,33 @@ gboolean query_is_directory_empty (GFile* dir, GError** error) {
 		_g_object_unref0 (enumerator);
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 		return _tmp9_;
-#line 1494 "file.c"
+#line 1491 "file.c"
 	}
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp10_ = _tmp6_;
-#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp6_ = NULL;
-#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp11_ = _tmp10_;
-#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp12_ = _tmp11_ == NULL;
-#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_g_object_unref0 (_tmp11_);
-#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	result = _tmp12_;
+	result = _tmp6_ == NULL;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 	_g_object_unref0 (_tmp6_);
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 	_g_object_unref0 (enumerator);
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1514 "file.c"
+#line 1501 "file.c"
 }
 
 
 gchar* get_display_pathname (GFile* file) {
 	gchar* result = NULL;
 	gchar* path = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
 	gchar* home = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
+	const gchar* _tmp7_;
+	const gchar* _tmp8_;
+	gboolean _tmp9_;
 #line 177 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 179 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1547,8 +1534,8 @@ gchar* get_display_pathname (GFile* file) {
 	_tmp5_ = home;
 #line 182 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 1551 "file.c"
-		gchar* _tmp6_ = NULL;
+#line 1538 "file.c"
+		gchar* _tmp6_;
 #line 183 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp6_ = g_strdup ("~");
 #line 183 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1559,7 +1546,7 @@ gchar* get_display_pathname (GFile* file) {
 		_g_free0 (path);
 #line 183 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1563 "file.c"
+#line 1550 "file.c"
 	}
 #line 185 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp7_ = path;
@@ -1569,15 +1556,15 @@ gchar* get_display_pathname (GFile* file) {
 	_tmp9_ = g_str_has_prefix (_tmp7_, _tmp8_);
 #line 185 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp9_) {
-#line 1573 "file.c"
-		const gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
+#line 1560 "file.c"
+		const gchar* _tmp10_;
+		const gchar* _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
 #line 186 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp10_ = path;
 #line 186 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1604,7 +1591,7 @@ gchar* get_display_pathname (GFile* file) {
 		_g_free0 (path);
 #line 186 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1608 "file.c"
+#line 1595 "file.c"
 	}
 #line 188 "/home/jens/Source/shotwell/src/util/file.vala"
 	result = path;
@@ -1612,20 +1599,20 @@ gchar* get_display_pathname (GFile* file) {
 	_g_free0 (home);
 #line 188 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1616 "file.c"
+#line 1603 "file.c"
 }
 
 
 gchar* strip_pretty_path (const gchar* path) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
 #line 191 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (path != NULL, NULL);
 #line 192 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1634,9 +1621,9 @@ gchar* strip_pretty_path (const gchar* path) {
 	_tmp1_ = g_str_has_prefix (_tmp0_, "~");
 #line 192 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (!_tmp1_) {
-#line 1638 "file.c"
-		const gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+#line 1625 "file.c"
+		const gchar* _tmp2_;
+		gchar* _tmp3_;
 #line 193 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp2_ = path;
 #line 193 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1645,7 +1632,7 @@ gchar* strip_pretty_path (const gchar* path) {
 		result = _tmp3_;
 #line 193 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1649 "file.c"
+#line 1636 "file.c"
 	}
 #line 195 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp4_ = g_get_home_dir ();
@@ -1665,15 +1652,15 @@ gchar* strip_pretty_path (const gchar* path) {
 	result = _tmp9_;
 #line 195 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1669 "file.c"
+#line 1656 "file.c"
 }
 
 
 gchar* get_file_info_id (GFileInfo* info) {
 	gchar* result = NULL;
-	GFileInfo* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	GFileInfo* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 198 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE_INFO (info), NULL);
 #line 199 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1686,7 +1673,7 @@ gchar* get_file_info_id (GFileInfo* info) {
 	result = _tmp2_;
 #line 199 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1690 "file.c"
+#line 1677 "file.c"
 }
 
 
@@ -1696,24 +1683,24 @@ void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error) {
 	g_return_if_fail (G_IS_INPUT_STREAM (input));
 #line 204 "/home/jens/Source/shotwell/src/util/file.vala"
 	while (TRUE) {
-#line 1700 "file.c"
-		guint64 _tmp0_ = 0ULL;
-		guint64 _tmp1_ = 0ULL;
+#line 1687 "file.c"
+		guint64 _tmp0_;
+		guint64 _tmp1_;
 #line 204 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = skip_amount;
 #line 204 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (!(_tmp0_ > ((guint64) 0))) {
 #line 204 "/home/jens/Source/shotwell/src/util/file.vala"
 			break;
-#line 1709 "file.c"
+#line 1696 "file.c"
 		}
 #line 206 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp1_ = skip_amount;
 #line 206 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (_tmp1_ >= ((guint64) G_MAXSSIZE)) {
-#line 1715 "file.c"
-			GInputStream* _tmp2_ = NULL;
-			guint64 _tmp3_ = 0ULL;
+#line 1702 "file.c"
+			GInputStream* _tmp2_;
+			guint64 _tmp3_;
 #line 207 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp2_ = input;
 #line 207 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1724,16 +1711,16 @@ void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error) {
 				g_propagate_error (error, _inner_error_);
 #line 207 "/home/jens/Source/shotwell/src/util/file.vala"
 				return;
-#line 1728 "file.c"
+#line 1715 "file.c"
 			}
 #line 208 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp3_ = skip_amount;
 #line 208 "/home/jens/Source/shotwell/src/util/file.vala"
 			skip_amount = _tmp3_ - G_MAXSSIZE;
-#line 1734 "file.c"
+#line 1721 "file.c"
 		} else {
-			GInputStream* _tmp4_ = NULL;
-			guint64 _tmp5_ = 0ULL;
+			GInputStream* _tmp4_;
+			guint64 _tmp5_;
 #line 210 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp4_ = input;
 #line 210 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1746,11 +1733,11 @@ void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error) {
 				g_propagate_error (error, _inner_error_);
 #line 210 "/home/jens/Source/shotwell/src/util/file.vala"
 				return;
-#line 1750 "file.c"
+#line 1737 "file.c"
 			}
 #line 211 "/home/jens/Source/shotwell/src/util/file.vala"
 			skip_amount = (guint64) 0;
-#line 1754 "file.c"
+#line 1741 "file.c"
 		}
 	}
 }
@@ -1758,12 +1745,12 @@ void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error) {
 
 guint64 count_files_in_directory (GFile* dir, GError** error) {
 	guint64 result = 0ULL;
-	GFile* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GFile* _tmp0_;
+	gboolean _tmp1_;
 	guint64 count = 0ULL;
 	GFileEnumerator* enumerator = NULL;
-	GFile* _tmp2_ = NULL;
-	GFileEnumerator* _tmp3_ = NULL;
+	GFile* _tmp2_;
+	GFileEnumerator* _tmp3_;
 	GFileInfo* info = NULL;
 	GError * _inner_error_ = NULL;
 #line 217 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1778,7 +1765,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
 		result = (guint64) 0;
 #line 219 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1782 "file.c"
+#line 1769 "file.c"
 	}
 #line 221 "/home/jens/Source/shotwell/src/util/file.vala"
 	count = (guint64) 0;
@@ -1790,25 +1777,25 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
 	enumerator = _tmp3_;
 #line 222 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1794 "file.c"
+#line 1781 "file.c"
 		guint64 _tmp4_ = 0ULL;
 #line 222 "/home/jens/Source/shotwell/src/util/file.vala"
 		g_propagate_error (error, _inner_error_);
 #line 222 "/home/jens/Source/shotwell/src/util/file.vala"
 		return _tmp4_;
-#line 1800 "file.c"
+#line 1787 "file.c"
 	}
 #line 225 "/home/jens/Source/shotwell/src/util/file.vala"
 	info = NULL;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 	while (TRUE) {
-#line 1806 "file.c"
+#line 1793 "file.c"
 		GFileInfo* _tmp5_ = NULL;
-		GFileEnumerator* _tmp6_ = NULL;
-		GFileInfo* _tmp7_ = NULL;
-		GFileInfo* _tmp9_ = NULL;
-		GFileInfo* _tmp10_ = NULL;
-		guint64 _tmp11_ = 0ULL;
+		GFileEnumerator* _tmp6_;
+		GFileInfo* _tmp7_;
+		GFileInfo* _tmp9_;
+		GFileInfo* _tmp10_;
+		guint64 _tmp11_;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp6_ = enumerator;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1817,7 +1804,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
 		_tmp5_ = _tmp7_;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1821 "file.c"
+#line 1808 "file.c"
 			guint64 _tmp8_ = 0ULL;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 			g_propagate_error (error, _inner_error_);
@@ -1827,7 +1814,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
 			_g_object_unref0 (enumerator);
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 			return _tmp8_;
-#line 1831 "file.c"
+#line 1818 "file.c"
 		}
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp9_ = _tmp5_;
@@ -1845,7 +1832,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
 			_g_object_unref0 (_tmp5_);
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 			break;
-#line 1849 "file.c"
+#line 1836 "file.c"
 		}
 #line 227 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp11_ = count;
@@ -1853,7 +1840,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
 		count = _tmp11_ + 1;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (_tmp5_);
-#line 1857 "file.c"
+#line 1844 "file.c"
 	}
 #line 229 "/home/jens/Source/shotwell/src/util/file.vala"
 	result = count;
@@ -1863,7 +1850,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
 	_g_object_unref0 (enumerator);
 #line 229 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1867 "file.c"
+#line 1854 "file.c"
 }
 
 
@@ -1871,7 +1858,7 @@ gboolean file_equal (GFile* a, GFile* b) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GFile* _tmp2_ = NULL;
+	GFile* _tmp2_;
 #line 233 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail ((a == NULL) || G_IS_FILE (a), FALSE);
 #line 233 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1880,24 +1867,24 @@ gboolean file_equal (GFile* a, GFile* b) {
 	_tmp2_ = a;
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp2_ != NULL) {
-#line 1884 "file.c"
-		GFile* _tmp3_ = NULL;
+#line 1871 "file.c"
+		GFile* _tmp3_;
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp3_ = b;
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 1890 "file.c"
+#line 1877 "file.c"
 	} else {
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp1_ = FALSE;
-#line 1894 "file.c"
+#line 1881 "file.c"
 	}
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp1_) {
-#line 1898 "file.c"
-		GFile* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+#line 1885 "file.c"
+		GFile* _tmp4_;
+		GFile* _tmp5_;
+		gboolean _tmp6_;
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp4_ = a;
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1906,50 +1893,50 @@ gboolean file_equal (GFile* a, GFile* b) {
 		_tmp6_ = g_file_equal (_tmp4_, _tmp5_);
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = _tmp6_;
-#line 1910 "file.c"
+#line 1897 "file.c"
 	} else {
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = FALSE;
-#line 1914 "file.c"
+#line 1901 "file.c"
 	}
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 	result = _tmp0_;
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1920 "file.c"
+#line 1907 "file.c"
 }
 
 
 guint file_hash (GFile* file) {
 	guint result = 0U;
 	guint _tmp0_ = 0U;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp1_;
 #line 238 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), 0U);
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp1_ = file;
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp1_ != NULL) {
-#line 1934 "file.c"
-		GFile* _tmp2_ = NULL;
-		guint _tmp3_ = 0U;
+#line 1921 "file.c"
+		GFile* _tmp2_;
+		guint _tmp3_;
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp2_ = file;
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp3_ = g_file_hash (_tmp2_);
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = _tmp3_;
-#line 1943 "file.c"
+#line 1930 "file.c"
 	} else {
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = (guint) 0;
-#line 1947 "file.c"
+#line 1934 "file.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 	result = _tmp0_;
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1953 "file.c"
+#line 1940 "file.c"
 }
 
 
diff --git a/src/util/image.c b/src/util/image.c
index 1bc543b..d103a3f 100644
--- a/src/util/image.c
+++ b/src/util/image.c
@@ -1,4 +1,4 @@
-/* image.c generated by valac 0.34.7, the Vala compiler
+/* image.c generated by valac 0.36.6, the Vala compiler
  * generated from image.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -94,8 +94,8 @@ const gchar* fallback_image_missing[103] = {"48 48 54 1 ", "  c #6A6D67", ". c #
 gboolean is_color_parsable (const gchar* spec) {
 	gboolean result = FALSE;
 	GdkRGBA color = {0};
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 #line 117 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_val_if_fail (spec != NULL, FALSE);
 #line 118 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -113,7 +113,7 @@ gboolean is_color_parsable (const gchar* spec) {
 
 
 void parse_color (const gchar* spec, GdkRGBA* result) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	GdkRGBA _tmp1_ = {0};
 #line 122 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (spec != NULL);
@@ -131,8 +131,8 @@ void parse_color (const gchar* spec, GdkRGBA* result) {
 
 void fetch_color (const gchar* spec, GdkRGBA* result) {
 	GdkRGBA rgba = {0};
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 #line 126 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (spec != NULL);
 #line 127 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -144,7 +144,7 @@ void fetch_color (const gchar* spec, GdkRGBA* result) {
 #line 128 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (!_tmp1_) {
 #line 147 "image.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 129 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = spec;
 #line 129 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -161,17 +161,17 @@ void fetch_color (const gchar* spec, GdkRGBA* result) {
 
 void set_source_color_from_string (cairo_t* ctx, const gchar* spec) {
 	GdkRGBA rgba = {0};
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	GdkRGBA _tmp1_ = {0};
-	cairo_t* _tmp2_ = NULL;
-	GdkRGBA _tmp3_ = {0};
-	gdouble _tmp4_ = 0.0;
-	GdkRGBA _tmp5_ = {0};
-	gdouble _tmp6_ = 0.0;
-	GdkRGBA _tmp7_ = {0};
-	gdouble _tmp8_ = 0.0;
-	GdkRGBA _tmp9_ = {0};
-	gdouble _tmp10_ = 0.0;
+	cairo_t* _tmp2_;
+	GdkRGBA _tmp3_;
+	gdouble _tmp4_;
+	GdkRGBA _tmp5_;
+	gdouble _tmp6_;
+	GdkRGBA _tmp7_;
+	gdouble _tmp8_;
+	GdkRGBA _tmp9_;
+	gdouble _tmp10_;
 #line 134 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (ctx != NULL);
 #line 134 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -222,11 +222,11 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 #line 223 "image.c"
 	{
 		GtkIconTheme* icon_theme = NULL;
-		GtkIconTheme* _tmp0_ = NULL;
-		GtkIconTheme* _tmp1_ = NULL;
+		GtkIconTheme* _tmp0_;
+		GtkIconTheme* _tmp1_;
 		GdkPixbuf* _tmp2_ = NULL;
-		GdkPixbuf* _tmp3_ = NULL;
-		GdkPixbuf* _tmp4_ = NULL;
+		GdkPixbuf* _tmp3_;
+		GdkPixbuf* _tmp4_;
 #line 147 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = gtk_icon_theme_get_default ();
 #line 147 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -262,9 +262,9 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 	__catch4_g_error:
 	{
 		GError* _error_ = NULL;
-		GdkPixbuf* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+		GdkPixbuf* _tmp5_;
+		GError* _tmp6_;
+		const gchar* _tmp7_;
 #line 146 "/home/jens/Source/shotwell/src/util/image.vala"
 		_error_ = _inner_error_;
 #line 146 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -309,25 +309,25 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up) {
 	GdkPixbuf* result = NULL;
 	Dimensions original = {0};
-	GdkPixbuf* _tmp0_ = NULL;
+	GdkPixbuf* _tmp0_;
 	Dimensions _tmp1_ = {0};
 	Dimensions scaled = {0};
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	Dimensions _tmp4_ = {0};
 	gboolean _tmp5_ = FALSE;
-	Dimensions _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	Dimensions _tmp8_ = {0};
-	gint _tmp9_ = 0;
+	Dimensions _tmp6_;
+	gint _tmp7_;
+	Dimensions _tmp8_;
+	gint _tmp9_;
 	Dimensions _tmp16_ = {0};
-	GdkPixbuf* _tmp17_ = NULL;
-	Dimensions _tmp18_ = {0};
-	gint _tmp19_ = 0;
-	Dimensions _tmp20_ = {0};
-	gint _tmp21_ = 0;
-	GdkInterpType _tmp22_ = 0;
-	GdkPixbuf* _tmp23_ = NULL;
+	GdkPixbuf* _tmp17_;
+	Dimensions _tmp18_;
+	gint _tmp19_;
+	Dimensions _tmp20_;
+	gint _tmp21_;
+	GdkInterpType _tmp22_;
+	GdkPixbuf* _tmp23_;
 #line 158 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
 #line 159 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -355,10 +355,10 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp7_ == _tmp9_) {
 #line 358 "image.c"
-		Dimensions _tmp10_ = {0};
-		gint _tmp11_ = 0;
-		Dimensions _tmp12_ = {0};
-		gint _tmp13_ = 0;
+		Dimensions _tmp10_;
+		gint _tmp11_;
+		Dimensions _tmp12_;
+		gint _tmp13_;
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp10_ = original;
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -378,8 +378,8 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp5_) {
 #line 381 "image.c"
-		GdkPixbuf* _tmp14_ = NULL;
-		GdkPixbuf* _tmp15_ = NULL;
+		GdkPixbuf* _tmp14_;
+		GdkPixbuf* _tmp15_;
 #line 162 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp14_ = pixbuf;
 #line 162 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -419,21 +419,21 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp) {
 	GdkPixbuf* result = NULL;
 	Dimensions original = {0};
-	GdkPixbuf* _tmp0_ = NULL;
+	GdkPixbuf* _tmp0_;
 	Dimensions _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-	Dimensions _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	Dimensions _tmp5_ = {0};
-	gint _tmp6_ = 0;
+	Dimensions _tmp3_;
+	gint _tmp4_;
+	Dimensions _tmp5_;
+	gint _tmp6_;
 	Dimensions _tmp13_ = {0};
-	GdkPixbuf* _tmp14_ = NULL;
-	Dimensions _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	Dimensions _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	GdkInterpType _tmp19_ = 0;
-	GdkPixbuf* _tmp20_ = NULL;
+	GdkPixbuf* _tmp14_;
+	Dimensions _tmp15_;
+	gint _tmp16_;
+	Dimensions _tmp17_;
+	gint _tmp18_;
+	GdkInterpType _tmp19_;
+	GdkPixbuf* _tmp20_;
 #line 170 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
 #line 170 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -455,10 +455,10 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp4_ == _tmp6_) {
 #line 458 "image.c"
-		Dimensions _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		Dimensions _tmp9_ = {0};
-		gint _tmp10_ = 0;
+		Dimensions _tmp7_;
+		gint _tmp8_;
+		Dimensions _tmp9_;
+		gint _tmp10_;
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp7_ = original;
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -478,8 +478,8 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp2_) {
 #line 481 "image.c"
-		GdkPixbuf* _tmp11_ = NULL;
-		GdkPixbuf* _tmp12_ = NULL;
+		GdkPixbuf* _tmp11_;
+		GdkPixbuf* _tmp12_;
 #line 173 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp11_ = pixbuf;
 #line 173 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -517,11 +517,11 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 
 
 void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion) {
-	cairo_t* _tmp0_ = NULL;
-	Dimensions _tmp1_ = {0};
-	GdkPoint _tmp2_ = {0};
-	gdouble _tmp3_ = 0.0;
-	cairo_t* _tmp4_ = NULL;
+	cairo_t* _tmp0_;
+	Dimensions _tmp1_;
+	GdkPoint _tmp2_;
+	gdouble _tmp3_;
+	cairo_t* _tmp4_;
 #line 183 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (ctx != NULL);
 #line 183 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -547,33 +547,33 @@ void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origi
 
 
 void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion) {
-	gdouble _tmp0_ = 0.0;
-	gdouble _tmp1_ = 0.0;
+	gdouble _tmp0_;
+	gdouble _tmp1_;
 	gdouble left = 0.0;
-	GdkPoint _tmp2_ = {0};
-	gint _tmp3_ = 0;
+	GdkPoint _tmp2_;
+	gint _tmp3_;
 	gdouble top = 0.0;
-	GdkPoint _tmp4_ = {0};
-	gint _tmp5_ = 0;
+	GdkPoint _tmp4_;
+	gint _tmp5_;
 	gdouble right = 0.0;
-	GdkPoint _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	Dimensions _tmp8_ = {0};
-	gint _tmp9_ = 0;
+	GdkPoint _tmp6_;
+	gint _tmp7_;
+	Dimensions _tmp8_;
+	gint _tmp9_;
 	gdouble bottom = 0.0;
-	GdkPoint _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	Dimensions _tmp12_ = {0};
-	gint _tmp13_ = 0;
+	GdkPoint _tmp10_;
+	gint _tmp11_;
+	Dimensions _tmp12_;
+	gint _tmp13_;
 	gdouble radius = 0.0;
-	gint _tmp14_ = 0;
-	gdouble _tmp15_ = 0.0;
-	cairo_t* _tmp16_ = NULL;
-	cairo_t* _tmp17_ = NULL;
-	cairo_t* _tmp18_ = NULL;
-	cairo_t* _tmp19_ = NULL;
-	cairo_t* _tmp20_ = NULL;
-	cairo_t* _tmp21_ = NULL;
+	gint _tmp14_;
+	gdouble _tmp15_;
+	cairo_t* _tmp16_;
+	cairo_t* _tmp17_;
+	cairo_t* _tmp18_;
+	cairo_t* _tmp19_;
+	cairo_t* _tmp20_;
+	cairo_t* _tmp21_;
 #line 189 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (cx != NULL);
 #line 189 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -654,9 +654,9 @@ void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gd
 
 inline guchar shift_color_byte (gint b, gint shift) {
 	guchar result = '\0';
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 213 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp0_ = b;
 #line 213 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -673,33 +673,33 @@ inline guchar shift_color_byte (gint b, gint shift) {
 
 void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alpha) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 	gboolean _tmp3_ = FALSE;
-	gint _tmp4_ = 0;
+	gint _tmp4_;
 	gboolean _tmp6_ = FALSE;
-	gint _tmp7_ = 0;
+	gint _tmp7_;
 	gboolean _tmp9_ = FALSE;
-	gint _tmp10_ = 0;
+	gint _tmp10_;
 	gint width = 0;
-	GdkPixbuf* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
+	GdkPixbuf* _tmp12_;
+	gint _tmp13_;
 	gint height = 0;
-	GdkPixbuf* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
+	GdkPixbuf* _tmp14_;
+	gint _tmp15_;
 	gint rowstride = 0;
-	GdkPixbuf* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
+	GdkPixbuf* _tmp16_;
+	gint _tmp17_;
 	gint channels = 0;
-	GdkPixbuf* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
+	GdkPixbuf* _tmp18_;
+	gint _tmp19_;
 	guchar* pixels = NULL;
-	GdkPixbuf* _tmp20_ = NULL;
-	guint8* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	GdkPixbuf* _tmp23_ = NULL;
-	GdkColorspace _tmp24_ = 0;
-	GdkPixbuf* _tmp25_ = NULL;
-	gint _tmp26_ = 0;
+	GdkPixbuf* _tmp20_;
+	guint8* _tmp21_;
+	gint _tmp22_;
+	GdkPixbuf* _tmp23_;
+	GdkColorspace _tmp24_;
+	GdkPixbuf* _tmp25_;
+	gint _tmp26_;
 #line 216 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -707,7 +707,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp1_ >= -255) {
 #line 710 "image.c"
-		gint _tmp2_ = 0;
+		gint _tmp2_;
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = red;
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -725,7 +725,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp4_ >= -255) {
 #line 728 "image.c"
-		gint _tmp5_ = 0;
+		gint _tmp5_;
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp5_ = green;
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -743,7 +743,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp7_ >= -255) {
 #line 746 "image.c"
-		gint _tmp8_ = 0;
+		gint _tmp8_;
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp8_ = blue;
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -761,7 +761,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp10_ >= -255) {
 #line 764 "image.c"
-		gint _tmp11_ = 0;
+		gint _tmp11_;
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp11_ = alpha;
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -833,15 +833,15 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 			while (TRUE) {
 #line 836 "image.c"
-				gint _tmp29_ = 0;
-				gint _tmp30_ = 0;
+				gint _tmp29_;
+				gint _tmp30_;
 				gint y_offset = 0;
-				gint _tmp31_ = 0;
-				gint _tmp32_ = 0;
+				gint _tmp31_;
+				gint _tmp32_;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 				if (!_tmp27_) {
 #line 844 "image.c"
-					gint _tmp28_ = 0;
+					gint _tmp28_;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp28_ = y;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -879,21 +879,21 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 						while (TRUE) {
 #line 882 "image.c"
-							gint _tmp35_ = 0;
-							gint _tmp36_ = 0;
+							gint _tmp35_;
+							gint _tmp36_;
 							gint offset = 0;
-							gint _tmp37_ = 0;
-							gint _tmp38_ = 0;
-							gint _tmp39_ = 0;
-							gint _tmp40_ = 0;
-							gint _tmp49_ = 0;
-							gint _tmp58_ = 0;
+							gint _tmp37_;
+							gint _tmp38_;
+							gint _tmp39_;
+							gint _tmp40_;
+							gint _tmp49_;
+							gint _tmp58_;
 							gboolean _tmp67_ = FALSE;
-							gint _tmp68_ = 0;
+							gint _tmp68_;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (!_tmp33_) {
 #line 896 "image.c"
-								gint _tmp34_ = 0;
+								gint _tmp34_;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp34_ = x;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -925,14 +925,14 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 238 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp40_ != 0) {
 #line 928 "image.c"
-								guchar* _tmp41_ = NULL;
-								gint _tmp42_ = 0;
-								guchar* _tmp43_ = NULL;
-								gint _tmp44_ = 0;
-								guchar _tmp45_ = '\0';
-								gint _tmp46_ = 0;
-								guchar _tmp47_ = '\0';
-								guchar _tmp48_ = '\0';
+								guchar* _tmp41_;
+								gint _tmp42_;
+								guchar* _tmp43_;
+								gint _tmp44_;
+								guchar _tmp45_;
+								gint _tmp46_;
+								guchar _tmp47_;
+								guchar _tmp48_;
 #line 239 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp41_ = pixels;
 #line 239 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -958,14 +958,14 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 241 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp49_ != 0) {
 #line 961 "image.c"
-								guchar* _tmp50_ = NULL;
-								gint _tmp51_ = 0;
-								guchar* _tmp52_ = NULL;
-								gint _tmp53_ = 0;
-								guchar _tmp54_ = '\0';
-								gint _tmp55_ = 0;
-								guchar _tmp56_ = '\0';
-								guchar _tmp57_ = '\0';
+								guchar* _tmp50_;
+								gint _tmp51_;
+								guchar* _tmp52_;
+								gint _tmp53_;
+								guchar _tmp54_;
+								gint _tmp55_;
+								guchar _tmp56_;
+								guchar _tmp57_;
 #line 242 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp50_ = pixels;
 #line 242 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -991,14 +991,14 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 244 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp58_ != 0) {
 #line 994 "image.c"
-								guchar* _tmp59_ = NULL;
-								gint _tmp60_ = 0;
-								guchar* _tmp61_ = NULL;
-								gint _tmp62_ = 0;
-								guchar _tmp63_ = '\0';
-								gint _tmp64_ = 0;
-								guchar _tmp65_ = '\0';
-								guchar _tmp66_ = '\0';
+								guchar* _tmp59_;
+								gint _tmp60_;
+								guchar* _tmp61_;
+								gint _tmp62_;
+								guchar _tmp63_;
+								gint _tmp64_;
+								guchar _tmp65_;
+								guchar _tmp66_;
 #line 245 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp59_ = pixels;
 #line 245 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1024,7 +1024,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp68_ != 0) {
 #line 1027 "image.c"
-								gint _tmp69_ = 0;
+								gint _tmp69_;
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp69_ = channels;
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1038,14 +1038,14 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp67_) {
 #line 1041 "image.c"
-								guchar* _tmp70_ = NULL;
-								gint _tmp71_ = 0;
-								guchar* _tmp72_ = NULL;
-								gint _tmp73_ = 0;
-								guchar _tmp74_ = '\0';
-								gint _tmp75_ = 0;
-								guchar _tmp76_ = '\0';
-								guchar _tmp77_ = '\0';
+								guchar* _tmp70_;
+								gint _tmp71_;
+								guchar* _tmp72_;
+								gint _tmp73_;
+								guchar _tmp74_;
+								gint _tmp75_;
+								guchar _tmp76_;
+								guchar _tmp77_;
 #line 248 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp70_ = pixels;
 #line 248 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1080,9 +1080,9 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
 #line 253 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_val_if_fail (rect != NULL, FALSE);
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1094,11 +1094,11 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp3_ >= _tmp5_) {
 #line 1097 "image.c"
-		gint _tmp6_ = 0;
-		GdkRectangle _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		GdkRectangle _tmp9_ = {0};
-		gint _tmp10_ = 0;
+		gint _tmp6_;
+		GdkRectangle _tmp7_;
+		gint _tmp8_;
+		GdkRectangle _tmp9_;
+		gint _tmp10_;
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp6_ = x;
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1120,9 +1120,9 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp2_) {
 #line 1123 "image.c"
-		gint _tmp11_ = 0;
-		GdkRectangle _tmp12_ = {0};
-		gint _tmp13_ = 0;
+		gint _tmp11_;
+		GdkRectangle _tmp12_;
+		gint _tmp13_;
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp11_ = y;
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1140,11 +1140,11 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp1_) {
 #line 1143 "image.c"
-		gint _tmp14_ = 0;
-		GdkRectangle _tmp15_ = {0};
-		gint _tmp16_ = 0;
-		GdkRectangle _tmp17_ = {0};
-		gint _tmp18_ = 0;
+		gint _tmp14_;
+		GdkRectangle _tmp15_;
+		gint _tmp16_;
+		GdkRectangle _tmp17_;
+		gint _tmp18_;
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp14_ = y;
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1176,10 +1176,10 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	GdkRectangle _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
+	GdkRectangle _tmp3_;
+	gint _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
 #line 257 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_val_if_fail (a != NULL, FALSE);
 #line 257 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1195,10 +1195,10 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp4_ == _tmp6_) {
 #line 1198 "image.c"
-		GdkRectangle _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		GdkRectangle _tmp9_ = {0};
-		gint _tmp10_ = 0;
+		GdkRectangle _tmp7_;
+		gint _tmp8_;
+		GdkRectangle _tmp9_;
+		gint _tmp10_;
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp7_ = *a;
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1218,10 +1218,10 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp2_) {
 #line 1221 "image.c"
-		GdkRectangle _tmp11_ = {0};
-		gint _tmp12_ = 0;
-		GdkRectangle _tmp13_ = {0};
-		gint _tmp14_ = 0;
+		GdkRectangle _tmp11_;
+		gint _tmp12_;
+		GdkRectangle _tmp13_;
+		gint _tmp14_;
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp11_ = *a;
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1241,10 +1241,10 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp1_) {
 #line 1244 "image.c"
-		GdkRectangle _tmp15_ = {0};
-		gint _tmp16_ = 0;
-		GdkRectangle _tmp17_ = {0};
-		gint _tmp18_ = 0;
+		GdkRectangle _tmp15_;
+		gint _tmp16_;
+		GdkRectangle _tmp17_;
+		gint _tmp18_;
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp15_ = *a;
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1271,15 +1271,15 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 
 gchar* rectangle_to_string (GdkRectangle* rect) {
 	gchar* result = NULL;
-	GdkRectangle _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	GdkRectangle _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	gchar* _tmp8_ = NULL;
+	GdkRectangle _tmp0_;
+	gint _tmp1_;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
+	gchar* _tmp8_;
 #line 261 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_val_if_fail (rect != NULL, NULL);
 #line 262 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1310,26 +1310,26 @@ gchar* rectangle_to_string (GdkRectangle* rect) {
 
 void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* result) {
 	GdkRectangle rect = {0};
-	GdkRectangle _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	Dimensions _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	Dimensions _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	GdkRectangle _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	Dimensions _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	GdkRectangle _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	Dimensions _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	GdkRectangle _tmp0_;
+	gint _tmp1_;
+	Dimensions _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	Dimensions _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	GdkRectangle _tmp10_;
+	gint _tmp11_;
+	Dimensions _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	GdkRectangle _tmp15_;
+	gint _tmp16_;
+	Dimensions _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 #line 265 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (original != NULL);
 #line 265 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1395,12 +1395,12 @@ void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* res
 void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result) {
 	GdkPoint _result_ = {0};
 	GdkPoint _tmp0_ = {0};
-	gdouble _tmp1_ = 0.0;
-	GdkPoint _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gdouble _tmp4_ = 0.0;
-	GdkPoint _tmp5_ = {0};
-	gint _tmp6_ = 0;
+	gdouble _tmp1_;
+	GdkPoint _tmp2_;
+	gint _tmp3_;
+	gdouble _tmp4_;
+	GdkPoint _tmp5_;
+	gint _tmp6_;
 #line 275 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (p != NULL);
 #line 276 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1434,14 +1434,14 @@ void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result) {
 void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
 	GdkPoint _result_ = {0};
 	GdkPoint _tmp0_ = {0};
-	GdkPoint _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	GdkPoint _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	GdkPoint _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	GdkPoint _tmp7_ = {0};
-	gint _tmp8_ = 0;
+	GdkPoint _tmp1_;
+	gint _tmp2_;
+	GdkPoint _tmp3_;
+	gint _tmp4_;
+	GdkPoint _tmp5_;
+	gint _tmp6_;
+	GdkPoint _tmp7_;
+	gint _tmp8_;
 #line 283 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (p1 != NULL);
 #line 283 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1481,14 +1481,14 @@ void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
 void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
 	GdkPoint _result_ = {0};
 	GdkPoint _tmp0_ = {0};
-	GdkPoint _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	GdkPoint _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	GdkPoint _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	GdkPoint _tmp7_ = {0};
-	gint _tmp8_ = 0;
+	GdkPoint _tmp1_;
+	gint _tmp2_;
+	GdkPoint _tmp3_;
+	gint _tmp4_;
+	GdkPoint _tmp5_;
+	gint _tmp6_;
+	GdkPoint _tmp7_;
+	gint _tmp8_;
 #line 291 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (p1 != NULL);
 #line 291 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1527,9 +1527,9 @@ void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
 
 void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 	guchar* gdk_pixels = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	void* _tmp2_ = NULL;
+	GdkPixbuf* _tmp0_;
+	void* _tmp1_;
+	void* _tmp2_;
 #line 300 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
 #line 301 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1553,25 +1553,25 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 #line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 			while (TRUE) {
 #line 1556 "image.c"
-				gint _tmp5_ = 0;
-				GdkPixbuf* _tmp6_ = NULL;
-				gint _tmp7_ = 0;
-				gint _tmp8_ = 0;
+				gint _tmp5_;
+				GdkPixbuf* _tmp6_;
+				gint _tmp7_;
+				gint _tmp8_;
 				guchar* p = NULL;
-				guchar* _tmp9_ = NULL;
+				guchar* _tmp9_;
 				guchar* end = NULL;
-				guchar* _tmp10_ = NULL;
-				GdkPixbuf* _tmp11_ = NULL;
-				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
-				guchar* _tmp26_ = NULL;
-				GdkPixbuf* _tmp27_ = NULL;
-				gint _tmp28_ = 0;
-				gint _tmp29_ = 0;
+				guchar* _tmp10_;
+				GdkPixbuf* _tmp11_;
+				gint _tmp12_;
+				gint _tmp13_;
+				guchar* _tmp26_;
+				GdkPixbuf* _tmp27_;
+				gint _tmp28_;
+				gint _tmp29_;
 #line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 				if (!_tmp3_) {
 #line 1574 "image.c"
-					gint _tmp4_ = 0;
+					gint _tmp4_;
 #line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp4_ = j;
 #line 302 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1611,19 +1611,19 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 #line 306 "/home/jens/Source/shotwell/src/util/image.vala"
 				while (TRUE) {
 #line 1614 "image.c"
-					guchar* _tmp14_ = NULL;
-					guchar* _tmp15_ = NULL;
+					guchar* _tmp14_;
+					guchar* _tmp15_;
 					guchar tmp = '\0';
-					guchar* _tmp16_ = NULL;
-					guchar _tmp17_ = '\0';
-					guchar* _tmp18_ = NULL;
-					guchar* _tmp19_ = NULL;
-					guchar _tmp20_ = '\0';
-					guchar _tmp21_ = '\0';
-					guchar* _tmp22_ = NULL;
-					guchar _tmp23_ = '\0';
-					guchar _tmp24_ = '\0';
-					guchar* _tmp25_ = NULL;
+					guchar* _tmp16_;
+					guchar _tmp17_;
+					guchar* _tmp18_;
+					guchar* _tmp19_;
+					guchar _tmp20_;
+					guchar _tmp21_;
+					guchar* _tmp22_;
+					guchar _tmp23_;
+					guchar _tmp24_;
+					guchar* _tmp25_;
 #line 306 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp14_ = p;
 #line 306 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1694,22 +1694,22 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble angle, gdouble* dest_width, gdouble* dest_height) {
 	gdouble _vala_dest_width = 0.0;
 	gdouble _vala_dest_height = 0.0;
-	gdouble _tmp0_ = 0.0;
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
-	gdouble _tmp7_ = 0.0;
-	gdouble _tmp8_ = 0.0;
-	gdouble _tmp9_ = 0.0;
-	gdouble _tmp10_ = 0.0;
-	gdouble _tmp11_ = 0.0;
-	gdouble _tmp12_ = 0.0;
-	gdouble _tmp13_ = 0.0;
-	gdouble _tmp14_ = 0.0;
-	gdouble _tmp15_ = 0.0;
+	gdouble _tmp0_;
+	gdouble _tmp1_;
+	gdouble _tmp2_;
+	gdouble _tmp3_;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
+	gdouble _tmp7_;
+	gdouble _tmp8_;
+	gdouble _tmp9_;
+	gdouble _tmp10_;
+	gdouble _tmp11_;
+	gdouble _tmp12_;
+	gdouble _tmp13_;
+	gdouble _tmp14_;
+	gdouble _tmp15_;
 #line 337 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp0_ = angle;
 #line 337 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1773,77 +1773,77 @@ void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble an
  */
 GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
 	GdkPixbuf* result = NULL;
-	gdouble _tmp0_ = 0.0;
+	gdouble _tmp0_;
 	gdouble x_tmp = 0.0;
 	gdouble y_tmp = 0.0;
-	GdkPixbuf* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	GdkPixbuf* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gdouble _tmp9_ = 0.0;
+	GdkPixbuf* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	GdkPixbuf* _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	gdouble _tmp9_;
 	gdouble _tmp10_ = 0.0;
 	gdouble _tmp11_ = 0.0;
 	GdkPixbuf* dest_pixbuf = NULL;
-	gdouble _tmp12_ = 0.0;
-	gdouble _tmp13_ = 0.0;
-	gdouble _tmp14_ = 0.0;
-	gdouble _tmp15_ = 0.0;
-	GdkPixbuf* _tmp16_ = NULL;
+	gdouble _tmp12_;
+	gdouble _tmp13_;
+	gdouble _tmp14_;
+	gdouble _tmp15_;
+	GdkPixbuf* _tmp16_;
 	cairo_format_t _tmp17_ = 0;
-	GdkPixbuf* _tmp18_ = NULL;
-	gboolean _tmp19_ = FALSE;
-	gboolean _tmp20_ = FALSE;
+	GdkPixbuf* _tmp18_;
+	gboolean _tmp19_;
+	gboolean _tmp20_;
 	cairo_surface_t* surface = NULL;
-	GdkPixbuf* _tmp21_ = NULL;
-	void* _tmp22_ = NULL;
-	void* _tmp23_ = NULL;
-	GdkPixbuf* _tmp24_ = NULL;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	GdkPixbuf* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	GdkPixbuf* _tmp30_ = NULL;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
-	cairo_surface_t* _tmp33_ = NULL;
+	GdkPixbuf* _tmp21_;
+	void* _tmp22_;
+	void* _tmp23_;
+	GdkPixbuf* _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
+	GdkPixbuf* _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
+	GdkPixbuf* _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
+	cairo_surface_t* _tmp33_;
 	cairo_t* context = NULL;
-	cairo_surface_t* _tmp34_ = NULL;
-	cairo_t* _tmp35_ = NULL;
-	cairo_t* _tmp36_ = NULL;
-	cairo_t* _tmp37_ = NULL;
-	GdkPixbuf* _tmp38_ = NULL;
-	gint _tmp39_ = 0;
-	gint _tmp40_ = 0;
-	GdkPixbuf* _tmp41_ = NULL;
-	gint _tmp42_ = 0;
-	gint _tmp43_ = 0;
-	cairo_t* _tmp44_ = NULL;
-	cairo_t* _tmp45_ = NULL;
-	GdkPixbuf* _tmp46_ = NULL;
-	gint _tmp47_ = 0;
-	gint _tmp48_ = 0;
-	GdkPixbuf* _tmp49_ = NULL;
-	gint _tmp50_ = 0;
-	gint _tmp51_ = 0;
-	cairo_t* _tmp52_ = NULL;
-	gdouble _tmp53_ = 0.0;
-	gdouble _tmp54_ = 0.0;
-	cairo_t* _tmp55_ = NULL;
-	GdkPixbuf* _tmp56_ = NULL;
-	gint _tmp57_ = 0;
-	gint _tmp58_ = 0;
-	GdkPixbuf* _tmp59_ = NULL;
-	gint _tmp60_ = 0;
-	gint _tmp61_ = 0;
-	cairo_t* _tmp62_ = NULL;
-	GdkPixbuf* _tmp63_ = NULL;
-	cairo_t* _tmp64_ = NULL;
-	cairo_pattern_t* _tmp65_ = NULL;
-	cairo_t* _tmp66_ = NULL;
-	GdkPixbuf* _tmp67_ = NULL;
+	cairo_surface_t* _tmp34_;
+	cairo_t* _tmp35_;
+	cairo_t* _tmp36_;
+	cairo_t* _tmp37_;
+	GdkPixbuf* _tmp38_;
+	gint _tmp39_;
+	gint _tmp40_;
+	GdkPixbuf* _tmp41_;
+	gint _tmp42_;
+	gint _tmp43_;
+	cairo_t* _tmp44_;
+	cairo_t* _tmp45_;
+	GdkPixbuf* _tmp46_;
+	gint _tmp47_;
+	gint _tmp48_;
+	GdkPixbuf* _tmp49_;
+	gint _tmp50_;
+	gint _tmp51_;
+	cairo_t* _tmp52_;
+	gdouble _tmp53_;
+	gdouble _tmp54_;
+	cairo_t* _tmp55_;
+	GdkPixbuf* _tmp56_;
+	gint _tmp57_;
+	gint _tmp58_;
+	GdkPixbuf* _tmp59_;
+	gint _tmp60_;
+	gint _tmp61_;
+	cairo_t* _tmp62_;
+	GdkPixbuf* _tmp63_;
+	cairo_t* _tmp64_;
+	cairo_pattern_t* _tmp65_;
+	cairo_t* _tmp66_;
+	GdkPixbuf* _tmp67_;
 #line 349 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (source_pixbuf), NULL);
 #line 353 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1851,8 +1851,8 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
 #line 353 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp0_ == 0.0) {
 #line 1854 "image.c"
-		GdkPixbuf* _tmp1_ = NULL;
-		GdkPixbuf* _tmp2_ = NULL;
+		GdkPixbuf* _tmp1_;
+		GdkPixbuf* _tmp2_;
 #line 354 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = source_pixbuf;
 #line 354 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2055,30 +2055,30 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
  * @param angle The angle the source image is to be rotated by to straighten it.
  */
 void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, gboolean invert, GdkPoint* result) {
-	gdouble _tmp0_ = 0.0;
+	gdouble _tmp0_;
 	gdouble dest_width = 0.0;
 	gdouble dest_height = 0.0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gdouble _tmp4_ = 0.0;
+	gint _tmp2_;
+	gint _tmp3_;
+	gdouble _tmp4_;
 	gdouble _tmp5_ = 0.0;
 	gdouble _tmp6_ = 0.0;
 	cairo_matrix_t matrix = {0};
-	gdouble _tmp7_ = 0.0;
-	gdouble _tmp8_ = 0.0;
-	gdouble _tmp9_ = 0.0;
-	gdouble _tmp10_ = 0.0;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	gboolean _tmp13_ = FALSE;
+	gdouble _tmp7_;
+	gdouble _tmp8_;
+	gdouble _tmp9_;
+	gdouble _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	gboolean _tmp13_;
 	gdouble dest_x = 0.0;
-	GdkPoint _tmp15_ = {0};
-	gint _tmp16_ = 0;
+	GdkPoint _tmp15_;
+	gint _tmp16_;
 	gdouble dest_y = 0.0;
-	GdkPoint _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	gdouble _tmp19_ = 0.0;
-	gdouble _tmp20_ = 0.0;
+	GdkPoint _tmp17_;
+	gint _tmp18_;
+	gdouble _tmp19_;
+	gdouble _tmp20_;
 	GdkPoint _tmp21_ = {0};
 #line 406 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (source_point != NULL);
@@ -2087,7 +2087,7 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
 #line 409 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp0_ == 0.0) {
 #line 2090 "image.c"
-		GdkPoint _tmp1_ = {0};
+		GdkPoint _tmp1_;
 #line 411 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = *source_point;
 #line 411 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2133,7 +2133,7 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
 #line 422 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp13_) {
 #line 2136 "image.c"
-		cairo_status_t _tmp14_ = 0;
+		cairo_status_t _tmp14_;
 #line 423 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp14_ = cairo_matrix_invert (&matrix);
 #line 423 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2184,10 +2184,10 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
  * @param angle The angle the source image is to be rotated by to straighten it.
  */
 void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, GdkPoint* result) {
-	GdkPoint _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gdouble _tmp3_ = 0.0;
+	GdkPoint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gdouble _tmp3_;
 	GdkPoint _tmp4_ = {0};
 #line 445 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (source_point != NULL);
@@ -2211,84 +2211,84 @@ void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble
 
 void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle_deg, gboolean preserve_geom, Box* result) {
 	GdkPoint top_left = {0};
-	Box _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	Box _tmp2_ = {0};
-	gint _tmp3_ = 0;
+	Box _tmp0_;
+	gint _tmp1_;
+	Box _tmp2_;
+	gint _tmp3_;
 	GdkPoint _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gdouble _tmp7_ = 0.0;
+	gint _tmp5_;
+	gint _tmp6_;
+	gdouble _tmp7_;
 	GdkPoint _tmp8_ = {0};
 	GdkPoint top_right = {0};
-	Box _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	Box _tmp11_ = {0};
-	gint _tmp12_ = 0;
+	Box _tmp9_;
+	gint _tmp10_;
+	Box _tmp11_;
+	gint _tmp12_;
 	GdkPoint _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	gdouble _tmp16_ = 0.0;
+	gint _tmp14_;
+	gint _tmp15_;
+	gdouble _tmp16_;
 	GdkPoint _tmp17_ = {0};
 	GdkPoint bottom_left = {0};
-	Box _tmp18_ = {0};
-	gint _tmp19_ = 0;
-	Box _tmp20_ = {0};
-	gint _tmp21_ = 0;
+	Box _tmp18_;
+	gint _tmp19_;
+	Box _tmp20_;
+	gint _tmp21_;
 	GdkPoint _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	gdouble _tmp25_ = 0.0;
+	gint _tmp23_;
+	gint _tmp24_;
+	gdouble _tmp25_;
 	GdkPoint _tmp26_ = {0};
 	GdkPoint bottom_right = {0};
-	Box _tmp27_ = {0};
-	gint _tmp28_ = 0;
-	Box _tmp29_ = {0};
-	gint _tmp30_ = 0;
+	Box _tmp27_;
+	gint _tmp28_;
+	Box _tmp29_;
+	gint _tmp30_;
 	GdkPoint _tmp31_ = {0};
-	gint _tmp32_ = 0;
-	gint _tmp33_ = 0;
-	gdouble _tmp34_ = 0.0;
+	gint _tmp32_;
+	gint _tmp33_;
+	gdouble _tmp34_;
 	GdkPoint _tmp35_ = {0};
 	gdouble angle = 0.0;
-	gdouble _tmp36_ = 0.0;
-	gdouble _tmp37_ = 0.0;
+	gdouble _tmp36_;
+	gdouble _tmp37_;
 	gint top_offset = 0;
 	gint bottom_offset = 0;
 	gint left_offset = 0;
 	gint right_offset = 0;
 	gint top = 0;
-	GdkPoint _tmp38_ = {0};
-	gint _tmp39_ = 0;
-	GdkPoint _tmp40_ = {0};
-	gint _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	gint _tmp43_ = 0;
+	GdkPoint _tmp38_;
+	gint _tmp39_;
+	GdkPoint _tmp40_;
+	gint _tmp41_;
+	gint _tmp42_;
+	gint _tmp43_;
 	gint bottom = 0;
-	GdkPoint _tmp47_ = {0};
-	gint _tmp48_ = 0;
-	GdkPoint _tmp49_ = {0};
-	gint _tmp50_ = 0;
-	gint _tmp51_ = 0;
-	gint _tmp52_ = 0;
-	gint _tmp53_ = 0;
+	GdkPoint _tmp47_;
+	gint _tmp48_;
+	GdkPoint _tmp49_;
+	gint _tmp50_;
+	gint _tmp51_;
+	gint _tmp52_;
+	gint _tmp53_;
 	gint left = 0;
-	GdkPoint _tmp58_ = {0};
-	gint _tmp59_ = 0;
-	GdkPoint _tmp60_ = {0};
-	gint _tmp61_ = 0;
-	gint _tmp62_ = 0;
-	gint _tmp63_ = 0;
+	GdkPoint _tmp58_;
+	gint _tmp59_;
+	GdkPoint _tmp60_;
+	gint _tmp61_;
+	gint _tmp62_;
+	gint _tmp63_;
 	gint right = 0;
-	GdkPoint _tmp67_ = {0};
-	gint _tmp68_ = 0;
-	GdkPoint _tmp69_ = {0};
-	gint _tmp70_ = 0;
-	gint _tmp71_ = 0;
-	gint _tmp72_ = 0;
-	gint _tmp73_ = 0;
+	GdkPoint _tmp67_;
+	gint _tmp68_;
+	GdkPoint _tmp69_;
+	gint _tmp70_;
+	gint _tmp71_;
+	gint _tmp72_;
+	gint _tmp73_;
 	Box _tmp78_ = {0};
-	gboolean _tmp79_ = FALSE;
+	gboolean _tmp79_;
 #line 451 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (src != NULL);
 #line 454 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2410,9 +2410,9 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 #line 463 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp43_ < 0) {
 #line 2413 "image.c"
-		gint _tmp44_ = 0;
-		gdouble _tmp45_ = 0.0;
-		gdouble _tmp46_ = 0.0;
+		gint _tmp44_;
+		gdouble _tmp45_;
+		gdouble _tmp46_;
 #line 464 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp44_ = top;
 #line 464 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2442,10 +2442,10 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 #line 467 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp52_ > _tmp53_) {
 #line 2445 "image.c"
-		gint _tmp54_ = 0;
-		gint _tmp55_ = 0;
-		gdouble _tmp56_ = 0.0;
-		gdouble _tmp57_ = 0.0;
+		gint _tmp54_;
+		gint _tmp55_;
+		gdouble _tmp56_;
+		gdouble _tmp57_;
 #line 468 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp54_ = img_h;
 #line 468 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2475,9 +2475,9 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 #line 471 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp63_ < 0) {
 #line 2478 "image.c"
-		gint _tmp64_ = 0;
-		gdouble _tmp65_ = 0.0;
-		gdouble _tmp66_ = 0.0;
+		gint _tmp64_;
+		gdouble _tmp65_;
+		gdouble _tmp66_;
 #line 472 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp64_ = left;
 #line 472 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2507,10 +2507,10 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 #line 475 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp72_ > _tmp73_) {
 #line 2510 "image.c"
-		gint _tmp74_ = 0;
-		gint _tmp75_ = 0;
-		gdouble _tmp76_ = 0.0;
-		gdouble _tmp77_ = 0.0;
+		gint _tmp74_;
+		gint _tmp75_;
+		gdouble _tmp76_;
+		gdouble _tmp77_;
 #line 476 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp74_ = img_w;
 #line 476 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2528,10 +2528,10 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 #line 478 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp79_) {
 #line 2531 "image.c"
-		gint _tmp80_ = 0;
-		gint _tmp81_ = 0;
-		gint _tmp82_ = 0;
-		gint _tmp83_ = 0;
+		gint _tmp80_;
+		gint _tmp81_;
+		gint _tmp82_;
+		gint _tmp83_;
 		Box _tmp84_ = {0};
 #line 478 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp80_ = left_offset;
@@ -2547,18 +2547,18 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 		_tmp78_ = _tmp84_;
 #line 2549 "image.c"
 	} else {
-		Box _tmp85_ = {0};
-		gint _tmp86_ = 0;
-		gint _tmp87_ = 0;
-		Box _tmp88_ = {0};
-		gint _tmp89_ = 0;
-		gint _tmp90_ = 0;
-		Box _tmp91_ = {0};
-		gint _tmp92_ = 0;
-		gint _tmp93_ = 0;
-		Box _tmp94_ = {0};
-		gint _tmp95_ = 0;
-		gint _tmp96_ = 0;
+		Box _tmp85_;
+		gint _tmp86_;
+		gint _tmp87_;
+		Box _tmp88_;
+		gint _tmp89_;
+		gint _tmp90_;
+		Box _tmp91_;
+		gint _tmp92_;
+		gint _tmp93_;
+		Box _tmp94_;
+		gint _tmp95_;
+		gint _tmp96_;
 #line 479 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp85_ = *src;
 #line 479 "/home/jens/Source/shotwell/src/util/image.vala"
diff --git a/src/util/misc.c b/src/util/misc.c
index 69a38e7..98b6719 100644
--- a/src/util/misc.c
+++ b/src/util/misc.c
@@ -1,4 +1,4 @@
-/* misc.c generated by valac 0.34.7, the Vala compiler
+/* misc.c generated by valac 0.36.6, the Vala compiler
  * generated from misc.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -251,7 +251,7 @@ static gboolean one_shot_scheduler_callback_wrapper (OneShotScheduler* self);
 static gboolean _one_shot_scheduler_callback_wrapper_gsource_func (gpointer self);
 void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule);
 void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint priority, guint msec, gboolean reschedule);
-static void one_shot_scheduler_finalize (OneShotScheduler* obj);
+static void one_shot_scheduler_finalize (OneShotScheduler * obj);
 gpointer op_timer_ref (gpointer instance);
 void op_timer_unref (gpointer instance);
 GParamSpec* param_spec_op_timer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -268,13 +268,13 @@ OpTimer* op_timer_construct (GType object_type, const gchar* name);
 void op_timer_start (OpTimer* self);
 void op_timer_stop (OpTimer* self);
 gchar* op_timer_to_string (OpTimer* self);
-static void op_timer_finalize (OpTimer* obj);
+static void op_timer_finalize (OpTimer * obj);
 
 
 guint int64_hash (gint64* n) {
 	guint result = 0U;
 	guint8* u8 = NULL;
-	gint64* _tmp0_ = NULL;
+	gint64* _tmp0_;
 	guint hash = 0U;
 #line 9 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = n;
@@ -295,14 +295,14 @@ guint int64_hash (gint64* n) {
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 			while (TRUE) {
 #line 298 "misc.c"
-				gint _tmp3_ = 0;
-				guint _tmp4_ = 0U;
-				guint _tmp5_ = 0U;
-				guint8* _tmp6_ = NULL;
+				gint _tmp3_;
+				guint _tmp4_;
+				guint _tmp5_;
+				guint8* _tmp6_;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 				if (!_tmp1_) {
 #line 305 "misc.c"
-					gint _tmp2_ = 0;
+					gint _tmp2_;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 					_tmp2_ = ctr;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -344,9 +344,9 @@ guint int64_hash (gint64* n) {
 gboolean int64_equal (gint64* a, gint64* b) {
 	gboolean result = FALSE;
 	gint64* bia = NULL;
-	gint64* _tmp0_ = NULL;
+	gint64* _tmp0_;
 	gint64* bib = NULL;
-	gint64* _tmp1_ = NULL;
+	gint64* _tmp1_;
 #line 19 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = a;
 #line 19 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -366,9 +366,9 @@ gboolean int64_equal (gint64* a, gint64* b) {
 gint int64_compare (gint64* a, gint64* b) {
 	gint result = 0;
 	gint64 diff = 0LL;
-	gint64* _tmp0_ = NULL;
-	gint64* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
+	gint64* _tmp0_;
+	gint64* _tmp1_;
+	gint64 _tmp2_;
 #line 26 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = a;
 #line 26 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -385,7 +385,7 @@ gint int64_compare (gint64* a, gint64* b) {
 		return result;
 #line 387 "misc.c"
 	} else {
-		gint64 _tmp3_ = 0LL;
+		gint64 _tmp3_;
 #line 29 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = diff;
 #line 29 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -409,11 +409,11 @@ gint int64_compare (gint64* a, gint64* b) {
 gint uint64_compare (guint64* a, guint64* b) {
 	gint result = 0;
 	guint64 a64 = 0ULL;
-	guint64* _tmp0_ = NULL;
+	guint64* _tmp0_;
 	guint64 b64 = 0ULL;
-	guint64* _tmp1_ = NULL;
-	guint64 _tmp2_ = 0ULL;
-	guint64 _tmp3_ = 0ULL;
+	guint64* _tmp1_;
+	guint64 _tmp2_;
+	guint64 _tmp3_;
 #line 36 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = a;
 #line 36 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -434,8 +434,8 @@ gint uint64_compare (guint64* a, guint64* b) {
 		return result;
 #line 436 "misc.c"
 	} else {
-		guint64 _tmp4_ = 0ULL;
-		guint64 _tmp5_ = 0ULL;
+		guint64 _tmp4_;
+		guint64 _tmp5_;
 #line 41 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp4_ = a64;
 #line 41 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -460,8 +460,8 @@ gint uint64_compare (guint64* a, guint64* b) {
 
 gboolean bool_value_equals (GValue* a, GValue* b) {
 	gboolean result = FALSE;
-	GValue _tmp0_ = {0};
-	GValue _tmp1_ = {0};
+	GValue _tmp0_;
+	GValue _tmp1_;
 #line 49 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (a != NULL, FALSE);
 #line 49 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -480,8 +480,8 @@ gboolean bool_value_equals (GValue* a, GValue* b) {
 
 gboolean int_value_equals (GValue* a, GValue* b) {
 	gboolean result = FALSE;
-	GValue _tmp0_ = {0};
-	GValue _tmp1_ = {0};
+	GValue _tmp0_;
+	GValue _tmp1_;
 #line 53 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (a != NULL, FALSE);
 #line 53 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -500,10 +500,10 @@ gboolean int_value_equals (GValue* a, GValue* b) {
 
 gulong timeval_to_ms (GTimeVal* time_val) {
 	gulong result = 0UL;
-	GTimeVal _tmp0_ = {0};
-	glong _tmp1_ = 0L;
-	GTimeVal _tmp2_ = {0};
-	glong _tmp3_ = 0L;
+	GTimeVal _tmp0_;
+	glong _tmp1_;
+	GTimeVal _tmp2_;
+	glong _tmp3_;
 #line 57 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (time_val != NULL, 0UL);
 #line 58 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -525,7 +525,7 @@ gulong timeval_to_ms (GTimeVal* time_val) {
 gulong now_ms (void) {
 	gulong result = 0UL;
 	GTimeVal _tmp0_ = {0};
-	gulong _tmp1_ = 0UL;
+	gulong _tmp1_;
 #line 62 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_get_current_time (&_tmp0_);
 #line 62 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -541,8 +541,8 @@ gulong now_ms (void) {
 gulong now_sec (void) {
 	gulong result = 0UL;
 	GTimeVal time_val = {0};
-	GTimeVal _tmp0_ = {0};
-	glong _tmp1_ = 0L;
+	GTimeVal _tmp0_;
+	glong _tmp1_;
 #line 66 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_get_current_time (&time_val);
 #line 68 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -559,7 +559,7 @@ gulong now_sec (void) {
 
 inline time_t now_time_t (void) {
 	time_t result = 0;
-	gulong _tmp0_ = 0UL;
+	gulong _tmp0_;
 #line 72 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = now_sec ();
 #line 72 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -572,13 +572,13 @@ inline time_t now_time_t (void) {
 
 gchar* md5_binary (guint8* buffer, gsize length) {
 	gchar* result = NULL;
-	gsize _tmp0_ = 0UL;
+	gsize _tmp0_;
 	GChecksum* md5 = NULL;
-	GChecksum* _tmp1_ = NULL;
-	guint8* _tmp2_ = NULL;
-	gsize _tmp3_ = 0UL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	GChecksum* _tmp1_;
+	guint8* _tmp2_;
+	gsize _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 76 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = length;
 #line 76 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -610,17 +610,17 @@ gchar* md5_binary (guint8* buffer, gsize length) {
 gchar* md5_file (GFile* file, GError** error) {
 	gchar* result = NULL;
 	GChecksum* md5 = NULL;
-	GChecksum* _tmp0_ = NULL;
+	GChecksum* _tmp0_;
 	guint8* buffer = NULL;
-	guint8* _tmp1_ = NULL;
-	gint buffer_length1 = 0;
-	gint _buffer_size_ = 0;
+	guint8* _tmp1_;
+	gint buffer_length1;
+	gint _buffer_size_;
 	GFileInputStream* fins = NULL;
-	GFile* _tmp2_ = NULL;
-	GFileInputStream* _tmp3_ = NULL;
-	GChecksum* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
+	GFile* _tmp2_;
+	GFileInputStream* _tmp3_;
+	GChecksum* _tmp18_;
+	const gchar* _tmp19_;
+	gchar* _tmp20_;
 	GError * _inner_error_ = NULL;
 #line 84 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
@@ -662,15 +662,15 @@ gchar* md5_file (GFile* file, GError** error) {
 		while (TRUE) {
 #line 664 "misc.c"
 			gsize bytes_read = 0UL;
-			GFileInputStream* _tmp5_ = NULL;
-			guint8* _tmp6_ = NULL;
-			gint _tmp6__length1 = 0;
-			gssize _tmp7_ = 0L;
-			gsize _tmp8_ = 0UL;
-			GChecksum* _tmp9_ = NULL;
-			guint8* _tmp10_ = NULL;
-			gint _tmp10__length1 = 0;
-			gsize _tmp11_ = 0UL;
+			GFileInputStream* _tmp5_;
+			guint8* _tmp6_;
+			gint _tmp6__length1;
+			gssize _tmp7_;
+			gsize _tmp8_;
+			GChecksum* _tmp9_;
+			guint8* _tmp10_;
+			gint _tmp10__length1;
+			gsize _tmp11_;
 #line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (!_tmp4_) {
 #line 677 "misc.c"
@@ -723,7 +723,7 @@ gchar* md5_file (GFile* file, GError** error) {
 		}
 	}
 	{
-		GFileInputStream* _tmp12_ = NULL;
+		GFileInputStream* _tmp12_;
 #line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp12_ = fins;
 #line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -738,11 +738,11 @@ gchar* md5_file (GFile* file, GError** error) {
 	__catch5_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		GError* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
+		GFile* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		GError* _tmp16_;
+		const gchar* _tmp17_;
 #line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
 		err = _inner_error_;
 #line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -804,20 +804,20 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GeeSet* _tmp2_ = NULL;
+	GeeSet* _tmp2_;
 	gboolean _tmp7_ = FALSE;
-	GeeSet* _tmp8_ = NULL;
+	GeeSet* _tmp8_;
 	gboolean _tmp14_ = FALSE;
 	gboolean _tmp15_ = FALSE;
-	GeeSet* _tmp16_ = NULL;
+	GeeSet* _tmp16_;
 	gboolean _tmp21_ = FALSE;
-	GeeSet* _tmp22_ = NULL;
-	GeeSet* _tmp24_ = NULL;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	GeeSet* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
+	GeeSet* _tmp22_;
+	GeeSet* _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
+	GeeSet* _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
 #line 107 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail ((a == NULL) || GEE_IS_SET (a), FALSE);
 #line 107 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -827,9 +827,9 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp2_ != NULL) {
 #line 830 "misc.c"
-		GeeSet* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+		GeeSet* _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = a;
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -847,7 +847,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_) {
 #line 850 "misc.c"
-		GeeSet* _tmp6_ = NULL;
+		GeeSet* _tmp6_;
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = b;
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -872,15 +872,15 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 	if (_tmp8_ == NULL) {
 #line 874 "misc.c"
 		gboolean _tmp9_ = FALSE;
-		GeeSet* _tmp10_ = NULL;
+		GeeSet* _tmp10_;
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp10_ = b;
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp10_ != NULL) {
 #line 881 "misc.c"
-			GeeSet* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
+			GeeSet* _tmp11_;
+			gint _tmp12_;
+			gint _tmp13_;
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp11_ = b;
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -916,7 +916,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp16_ == NULL) {
 #line 919 "misc.c"
-		GeeSet* _tmp17_ = NULL;
+		GeeSet* _tmp17_;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp17_ = b;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -934,13 +934,13 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 #line 935 "misc.c"
 	} else {
 		gboolean _tmp18_ = FALSE;
-		GeeSet* _tmp19_ = NULL;
+		GeeSet* _tmp19_;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp19_ = a;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp19_ != NULL) {
 #line 943 "misc.c"
-			GeeSet* _tmp20_ = NULL;
+			GeeSet* _tmp20_;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp20_ = b;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -968,7 +968,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp22_ == NULL) {
 #line 971 "misc.c"
-		GeeSet* _tmp23_ = NULL;
+		GeeSet* _tmp23_;
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp23_ = b;
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1009,8 +1009,8 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 	}
 	{
 		GeeIterator* _element_it = NULL;
-		GeeSet* _tmp30_ = NULL;
-		GeeIterator* _tmp31_ = NULL;
+		GeeSet* _tmp30_;
+		GeeIterator* _tmp31_;
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp30_ = a;
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1020,14 +1020,14 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
 #line 1023 "misc.c"
-			GeeIterator* _tmp32_ = NULL;
-			gboolean _tmp33_ = FALSE;
+			GeeIterator* _tmp32_;
+			gboolean _tmp33_;
 			gchar* element = NULL;
-			GeeIterator* _tmp34_ = NULL;
-			gpointer _tmp35_ = NULL;
-			GeeSet* _tmp36_ = NULL;
-			const gchar* _tmp37_ = NULL;
-			gboolean _tmp38_ = FALSE;
+			GeeIterator* _tmp34_;
+			gpointer _tmp35_;
+			GeeSet* _tmp36_;
+			const gchar* _tmp37_;
+			gboolean _tmp38_;
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp32_ = _element_it;
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1088,16 +1088,16 @@ static gpointer _g_object_ref0 (gpointer self) {
 GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 	GeeSet* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	GeeSet* _tmp1_ = NULL;
+	GeeSet* _tmp1_;
 	gboolean _tmp6_ = FALSE;
-	GeeSet* _tmp7_ = NULL;
+	GeeSet* _tmp7_;
 	GeeSet* intersection = NULL;
-	GeeHashSet* _tmp12_ = NULL;
+	GeeHashSet* _tmp12_;
 	GeeSet* _tmp41_ = NULL;
-	GeeSet* _tmp42_ = NULL;
-	gint _tmp43_ = 0;
-	gint _tmp44_ = 0;
-	GeeSet* _tmp46_ = NULL;
+	GeeSet* _tmp42_;
+	gint _tmp43_;
+	gint _tmp44_;
+	GeeSet* _tmp46_;
 #line 134 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail ((a == NULL) || GEE_IS_SET (a), NULL);
 #line 134 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1109,7 +1109,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_ != NULL) {
 #line 1112 "misc.c"
-		GeeSet* _tmp2_ = NULL;
+		GeeSet* _tmp2_;
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp2_ = b;
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1123,14 +1123,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_) {
 #line 1126 "misc.c"
-		GeeSet* _tmp3_ = NULL;
+		GeeSet* _tmp3_;
 #line 137 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = excluded;
 #line 137 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp3_ != NULL) {
 #line 1132 "misc.c"
-			GeeSet* _tmp4_ = NULL;
-			GeeSet* _tmp5_ = NULL;
+			GeeSet* _tmp4_;
+			GeeSet* _tmp5_;
 #line 138 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp4_ = excluded;
 #line 138 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1150,7 +1150,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp7_ == NULL) {
 #line 1153 "misc.c"
-		GeeSet* _tmp8_ = NULL;
+		GeeSet* _tmp8_;
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp8_ = b;
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1164,14 +1164,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp6_) {
 #line 1167 "misc.c"
-		GeeSet* _tmp9_ = NULL;
+		GeeSet* _tmp9_;
 #line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp9_ = excluded;
 #line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp9_ != NULL) {
 #line 1173 "misc.c"
-			GeeSet* _tmp10_ = NULL;
-			GeeSet* _tmp11_ = NULL;
+			GeeSet* _tmp10_;
+			GeeSet* _tmp11_;
 #line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp10_ = excluded;
 #line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1193,8 +1193,8 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 1194 "misc.c"
 	{
 		GeeIterator* _element_it = NULL;
-		GeeSet* _tmp13_ = NULL;
-		GeeIterator* _tmp14_ = NULL;
+		GeeSet* _tmp13_;
+		GeeIterator* _tmp14_;
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp13_ = a;
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1204,14 +1204,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
 #line 1207 "misc.c"
-			GeeIterator* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
+			GeeIterator* _tmp15_;
+			gboolean _tmp16_;
 			gchar* element = NULL;
-			GeeIterator* _tmp17_ = NULL;
-			gpointer _tmp18_ = NULL;
-			GeeSet* _tmp19_ = NULL;
-			const gchar* _tmp20_ = NULL;
-			gboolean _tmp21_ = FALSE;
+			GeeIterator* _tmp17_;
+			gpointer _tmp18_;
+			GeeSet* _tmp19_;
+			const gchar* _tmp20_;
+			gboolean _tmp21_;
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp15_ = _element_it;
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1237,8 +1237,8 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 153 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (_tmp21_) {
 #line 1240 "misc.c"
-				GeeSet* _tmp22_ = NULL;
-				const gchar* _tmp23_ = NULL;
+				GeeSet* _tmp22_;
+				const gchar* _tmp23_;
 #line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp22_ = intersection;
 #line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1247,14 +1247,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
 #line 1249 "misc.c"
 			} else {
-				GeeSet* _tmp24_ = NULL;
+				GeeSet* _tmp24_;
 #line 155 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp24_ = excluded;
 #line 155 "/home/jens/Source/shotwell/src/util/misc.vala"
 				if (_tmp24_ != NULL) {
 #line 1256 "misc.c"
-					GeeSet* _tmp25_ = NULL;
-					const gchar* _tmp26_ = NULL;
+					GeeSet* _tmp25_;
+					const gchar* _tmp26_;
 #line 156 "/home/jens/Source/shotwell/src/util/misc.vala"
 					_tmp25_ = excluded;
 #line 156 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1274,8 +1274,8 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 	}
 	{
 		GeeIterator* _element_it = NULL;
-		GeeSet* _tmp27_ = NULL;
-		GeeIterator* _tmp28_ = NULL;
+		GeeSet* _tmp27_;
+		GeeIterator* _tmp28_;
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp27_ = b;
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1285,14 +1285,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
 #line 1288 "misc.c"
-			GeeIterator* _tmp29_ = NULL;
-			gboolean _tmp30_ = FALSE;
+			GeeIterator* _tmp29_;
+			gboolean _tmp30_;
 			gchar* element = NULL;
-			GeeIterator* _tmp31_ = NULL;
-			gpointer _tmp32_ = NULL;
-			GeeSet* _tmp33_ = NULL;
-			const gchar* _tmp34_ = NULL;
-			gboolean _tmp35_ = FALSE;
+			GeeIterator* _tmp31_;
+			gpointer _tmp32_;
+			GeeSet* _tmp33_;
+			const gchar* _tmp34_;
+			gboolean _tmp35_;
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp29_ = _element_it;
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1318,8 +1318,8 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 160 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (_tmp35_) {
 #line 1321 "misc.c"
-				GeeSet* _tmp36_ = NULL;
-				const gchar* _tmp37_ = NULL;
+				GeeSet* _tmp36_;
+				const gchar* _tmp37_;
 #line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp36_ = intersection;
 #line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1328,14 +1328,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_);
 #line 1330 "misc.c"
 			} else {
-				GeeSet* _tmp38_ = NULL;
+				GeeSet* _tmp38_;
 #line 162 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp38_ = excluded;
 #line 162 "/home/jens/Source/shotwell/src/util/misc.vala"
 				if (_tmp38_ != NULL) {
 #line 1337 "misc.c"
-					GeeSet* _tmp39_ = NULL;
-					const gchar* _tmp40_ = NULL;
+					GeeSet* _tmp39_;
+					const gchar* _tmp40_;
 #line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
 					_tmp39_ = excluded;
 #line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1362,7 +1362,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp44_ > 0) {
 #line 1365 "misc.c"
-		GeeSet* _tmp45_ = NULL;
+		GeeSet* _tmp45_;
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp45_ = intersection;
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1388,25 +1388,25 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 	guchar* result = NULL;
 	gint64* ids = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint64* _tmp3_ = NULL;
-	gint ids_length1 = 0;
-	gint _ids_size_ = 0;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint64* _tmp3_;
+	gint ids_length1;
+	gint _ids_size_;
 	gint ctr = 0;
 	gsize bytes = 0UL;
-	GeeCollection* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
+	GeeCollection* _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
 	guchar* serialized = NULL;
-	guchar* _tmp19_ = NULL;
-	gint serialized_length1 = 0;
-	gint _serialized_size_ = 0;
-	gint64* _tmp20_ = NULL;
-	gint _tmp20__length1 = 0;
-	guchar* _tmp21_ = NULL;
-	gint _tmp21__length1 = 0;
+	guchar* _tmp19_;
+	gint serialized_length1;
+	gint _serialized_size_;
+	gint64* _tmp20_;
+	gint _tmp20__length1;
+	guchar* _tmp21_;
+	gint _tmp21__length1;
 #line 169 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (photos), NULL);
 #line 170 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1428,8 +1428,8 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 #line 1429 "misc.c"
 	{
 		GeeIterator* _photo_it = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeCollection* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp4_ = photos;
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1439,18 +1439,18 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
 #line 1442 "misc.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			Photo* photo = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			gint64* _tmp10_ = NULL;
-			gint _tmp10__length1 = 0;
-			gint _tmp11_ = 0;
-			Photo* _tmp12_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			gint64* _tmp10_;
+			gint _tmp10__length1;
+			gint _tmp11_;
+			Photo* _tmp12_;
 			PhotoID _tmp13_ = {0};
-			gint64 _tmp14_ = 0LL;
-			gint64 _tmp15_ = 0LL;
+			gint64 _tmp14_;
+			gint64 _tmp15_;
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp6_ = _photo_it;
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1538,22 +1538,22 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 	GeeList* result = NULL;
 	gsize count = 0UL;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	gsize _tmp2_ = 0UL;
+	gsize _tmp2_;
 	gint64* ids = NULL;
-	gsize _tmp4_ = 0UL;
-	gint64* _tmp5_ = NULL;
-	gint ids_length1 = 0;
-	gint _ids_size_ = 0;
-	gint64* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	guchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
+	gsize _tmp4_;
+	gint64* _tmp5_;
+	gint ids_length1;
+	gint _ids_size_;
+	gint64* _tmp6_;
+	gint _tmp6__length1;
+	guchar* _tmp7_;
+	gint _tmp8_;
 	GeeArrayList* list = NULL;
-	GeeArrayList* _tmp9_ = NULL;
-	gint64* _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	GeeArrayList* _tmp9_;
+	gint64* _tmp10_;
+	gint _tmp10__length1;
 #line 183 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = size;
 #line 183 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1566,7 +1566,7 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 		_tmp1_ = TRUE;
 #line 1568 "misc.c"
 	} else {
-		guchar* _tmp3_ = NULL;
+		guchar* _tmp3_;
 #line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = serialized;
 #line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1627,8 +1627,8 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 			id = id_collection[id_it];
 #line 1629 "misc.c"
 			{
-				GeeArrayList* _tmp11_ = NULL;
-				gint64 _tmp12_ = 0LL;
+				GeeArrayList* _tmp11_;
+				gint64 _tmp12_;
 				PhotoID _tmp13_ = {0};
 #line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp11_ = list;
@@ -1655,25 +1655,25 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 	guchar* result = NULL;
 	GdkAtom* atoms = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	GdkAtom* _tmp3_ = NULL;
-	gint atoms_length1 = 0;
-	gint _atoms_size_ = 0;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	GdkAtom* _tmp3_;
+	gint atoms_length1;
+	gint _atoms_size_;
 	gint ctr = 0;
 	gsize bytes = 0UL;
-	GeeCollection* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	GeeCollection* _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 	guchar* serialized = NULL;
-	guchar* _tmp20_ = NULL;
-	gint serialized_length1 = 0;
-	gint _serialized_size_ = 0;
-	GdkAtom* _tmp21_ = NULL;
-	gint _tmp21__length1 = 0;
-	guchar* _tmp22_ = NULL;
-	gint _tmp22__length1 = 0;
+	guchar* _tmp20_;
+	gint serialized_length1;
+	gint _serialized_size_;
+	GdkAtom* _tmp21_;
+	gint _tmp21__length1;
+	guchar* _tmp22_;
+	gint _tmp22__length1;
 #line 197 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (media), NULL);
 #line 198 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1695,8 +1695,8 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 #line 1696 "misc.c"
 	{
 		GeeIterator* _current_media_it = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeCollection* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp4_ = media;
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1706,19 +1706,19 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
 #line 1709 "misc.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSource* current_media = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			GdkAtom* _tmp10_ = NULL;
-			gint _tmp10__length1 = 0;
-			gint _tmp11_ = 0;
-			MediaSource* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			gchar* _tmp14_ = NULL;
-			GdkAtom _tmp15_ = 0U;
-			GdkAtom _tmp16_ = 0U;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			GdkAtom* _tmp10_;
+			gint _tmp10__length1;
+			gint _tmp11_;
+			MediaSource* _tmp12_;
+			gchar* _tmp13_;
+			gchar* _tmp14_;
+			GdkAtom _tmp15_;
+			GdkAtom _tmp16_;
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp6_ = _current_media_it;
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1810,22 +1810,22 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 	GeeList* result = NULL;
 	gsize count = 0UL;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	gsize _tmp2_ = 0UL;
+	gsize _tmp2_;
 	GdkAtom* atoms = NULL;
-	gsize _tmp4_ = 0UL;
-	GdkAtom* _tmp5_ = NULL;
-	gint atoms_length1 = 0;
-	gint _atoms_size_ = 0;
-	GdkAtom* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	guchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
+	gsize _tmp4_;
+	GdkAtom* _tmp5_;
+	gint atoms_length1;
+	gint _atoms_size_;
+	GdkAtom* _tmp6_;
+	gint _tmp6__length1;
+	guchar* _tmp7_;
+	gint _tmp8_;
 	GeeArrayList* list = NULL;
-	GeeArrayList* _tmp9_ = NULL;
-	GdkAtom* _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	GeeArrayList* _tmp9_;
+	GdkAtom* _tmp10_;
+	gint _tmp10__length1;
 #line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = size;
 #line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1838,7 +1838,7 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 		_tmp1_ = TRUE;
 #line 1840 "misc.c"
 	} else {
-		guchar* _tmp3_ = NULL;
+		guchar* _tmp3_;
 #line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = serialized;
 #line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1900,16 +1900,16 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 #line 1901 "misc.c"
 			{
 				MediaSource* media = NULL;
-				MediaCollectionRegistry* _tmp11_ = NULL;
-				MediaCollectionRegistry* _tmp12_ = NULL;
-				GdkAtom _tmp13_ = 0U;
-				gchar* _tmp14_ = NULL;
-				gchar* _tmp15_ = NULL;
-				MediaSource* _tmp16_ = NULL;
-				MediaSource* _tmp17_ = NULL;
-				MediaSource* _tmp18_ = NULL;
-				GeeArrayList* _tmp19_ = NULL;
-				MediaSource* _tmp20_ = NULL;
+				MediaCollectionRegistry* _tmp11_;
+				MediaCollectionRegistry* _tmp12_;
+				GdkAtom _tmp13_;
+				gchar* _tmp14_;
+				gchar* _tmp15_;
+				MediaSource* _tmp16_;
+				MediaSource* _tmp17_;
+				MediaSource* _tmp18_;
+				GeeArrayList* _tmp19_;
+				MediaSource* _tmp20_;
 #line 220 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp11_ = media_collection_registry_get_instance ();
 #line 220 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1959,44 +1959,44 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* result = NULL;
 	gchar* buffer = NULL;
-	gchar* _tmp0_ = NULL;
-	gint buffer_length1 = 0;
-	gint _buffer_size_ = 0;
-	gchar* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	gint buffer_length1;
+	gint _buffer_size_;
+	gchar* _tmp1_;
+	gint _tmp1__length1;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
+#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 2002 "misc.c"
 }
@@ -2006,20 +2006,20 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 	gchar* result = NULL;
 	gchar* from_format = NULL;
 	gchar* to_format = NULL;
-	struct tm _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	struct tm _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	const gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	gchar* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
+	struct tm _tmp0_;
+	gint _tmp1_;
+	struct tm _tmp2_;
+	gint _tmp3_;
+	const gchar* _tmp19_;
+	gchar* _tmp20_;
+	gchar* _tmp21_;
+	const gchar* _tmp22_;
+	gchar* _tmp23_;
+	gchar* _tmp24_;
+	gchar* _tmp25_;
+	gchar* _tmp26_;
+	gchar* _tmp27_;
+	gchar* _tmp28_;
 #line 228 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (from_date != NULL, NULL);
 #line 228 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2036,10 +2036,10 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 	if (_tmp1_ == _tmp3_) {
 #line 2038 "misc.c"
 		gboolean _tmp4_ = FALSE;
-		struct tm _tmp5_ = {0};
-		gint _tmp6_ = 0;
-		struct tm _tmp7_ = {0};
-		gint _tmp8_ = 0;
+		struct tm _tmp5_;
+		gint _tmp6_;
+		struct tm _tmp7_;
+		gint _tmp8_;
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp5_ = *from_date;
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2051,10 +2051,10 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp6_ == _tmp8_) {
 #line 2054 "misc.c"
-			struct tm _tmp9_ = {0};
-			gint _tmp10_ = 0;
-			struct tm _tmp11_ = {0};
-			gint _tmp12_ = 0;
+			struct tm _tmp9_;
+			gint _tmp10_;
+			struct tm _tmp11_;
+			gint _tmp12_;
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp9_ = *from_date;
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2074,8 +2074,8 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp4_) {
 #line 2077 "misc.c"
-			gchar* _tmp13_ = NULL;
-			gchar* _tmp14_ = NULL;
+			gchar* _tmp13_;
+			gchar* _tmp14_;
 #line 237 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp13_ = resources_get_start_multiday_span_format_string ();
 #line 237 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2090,8 +2090,8 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 			to_format = _tmp14_;
 #line 2092 "misc.c"
 		} else {
-			gchar* _tmp15_ = NULL;
-			gchar* _tmp16_ = NULL;
+			gchar* _tmp15_;
+			gchar* _tmp16_;
 #line 242 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp15_ = resources_get_start_multimonth_span_format_string ();
 #line 242 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2107,8 +2107,8 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 #line 2108 "misc.c"
 		}
 	} else {
-		gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
+		gchar* _tmp17_;
+		gchar* _tmp18_;
 #line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp17_ = resources_get_long_date_format_string ();
 #line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2163,12 +2163,12 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 
 gchar* format_local_date (struct tm* date) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 256 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (date != NULL, NULL);
 #line 257 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2197,10 +2197,10 @@ gchar* format_local_date (struct tm* date) {
 
 OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target) {
 	OneShotScheduler* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	OneShotCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	OneShotCallback _tmp2_;
+	void* _tmp2__target;
 #line 267 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 267 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2236,7 +2236,7 @@ OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback cal
 
 gboolean one_shot_scheduler_is_scheduled (OneShotScheduler* self) {
 	gboolean result = FALSE;
-	guint _tmp0_ = 0U;
+	guint _tmp0_;
 #line 280 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (IS_ONE_SHOT_SCHEDULER (self), FALSE);
 #line 281 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2268,7 +2268,7 @@ static gboolean _one_shot_scheduler_callback_wrapper_gsource_func (gpointer self
 
 
 void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority) {
-	guint _tmp0_ = 0U;
+	guint _tmp0_;
 #line 288 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
 #line 289 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2276,8 +2276,8 @@ void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority)
 #line 289 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_ == ((guint) 0)) {
 #line 2279 "misc.c"
-		gint _tmp1_ = 0;
-		guint _tmp2_ = 0U;
+		gint _tmp1_;
+		guint _tmp2_;
 #line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = priority;
 #line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2290,8 +2290,8 @@ void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority)
 
 
 void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule) {
-	guint _tmp0_ = 0U;
-	gboolean _tmp1_ = FALSE;
+	guint _tmp0_;
+	gboolean _tmp1_;
 #line 293 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
 #line 294 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2306,11 +2306,11 @@ void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gbool
 
 void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint priority, guint msec, gboolean reschedule) {
 	gboolean _tmp0_ = FALSE;
-	guint _tmp1_ = 0U;
-	guint _tmp3_ = 0U;
-	gint _tmp5_ = 0;
-	guint _tmp6_ = 0U;
-	guint _tmp7_ = 0U;
+	guint _tmp1_;
+	guint _tmp3_;
+	gint _tmp5_;
+	guint _tmp6_;
+	guint _tmp7_;
 #line 297 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2318,7 +2318,7 @@ void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint pri
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_ != ((guint) 0)) {
 #line 2321 "misc.c"
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp2_ = reschedule;
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2340,7 +2340,7 @@ void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint pri
 #line 301 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp3_ != ((guint) 0)) {
 #line 2343 "misc.c"
-		guint _tmp4_ = 0U;
+		guint _tmp4_;
 #line 302 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp4_ = self->priv->scheduled;
 #line 302 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2360,8 +2360,8 @@ void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint pri
 
 
 void one_shot_scheduler_cancel (OneShotScheduler* self) {
-	guint _tmp0_ = 0U;
-	guint _tmp1_ = 0U;
+	guint _tmp0_;
+	guint _tmp1_;
 #line 307 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
 #line 308 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2384,8 +2384,8 @@ void one_shot_scheduler_cancel (OneShotScheduler* self) {
 
 static gboolean one_shot_scheduler_callback_wrapper (OneShotScheduler* self) {
 	gboolean result = FALSE;
-	OneShotCallback _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
+	OneShotCallback _tmp0_;
+	void* _tmp0__target;
 #line 315 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (IS_ONE_SHOT_SCHEDULER (self), FALSE);
 #line 316 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2446,7 +2446,7 @@ static gchar* value_one_shot_scheduler_collect_value (GValue* value, guint n_col
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (collect_values[0].v_pointer) {
 #line 2449 "misc.c"
-		OneShotScheduler* object;
+		OneShotScheduler * object;
 		object = collect_values[0].v_pointer;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -2473,7 +2473,7 @@ static gchar* value_one_shot_scheduler_collect_value (GValue* value, guint n_col
 
 
 static gchar* value_one_shot_scheduler_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	OneShotScheduler** object_p;
+	OneShotScheduler ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (!object_p) {
@@ -2525,7 +2525,7 @@ gpointer value_get_one_shot_scheduler (const GValue* value) {
 
 
 void value_set_one_shot_scheduler (GValue* value, gpointer v_object) {
-	OneShotScheduler* old;
+	OneShotScheduler * old;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER));
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2556,7 +2556,7 @@ void value_set_one_shot_scheduler (GValue* value, gpointer v_object) {
 
 
 void value_take_one_shot_scheduler (GValue* value, gpointer v_object) {
-	OneShotScheduler* old;
+	OneShotScheduler * old;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER));
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2606,7 +2606,7 @@ static void one_shot_scheduler_instance_init (OneShotScheduler * self) {
 }
 
 
-static void one_shot_scheduler_finalize (OneShotScheduler* obj) {
+static void one_shot_scheduler_finalize (OneShotScheduler * obj) {
 	OneShotScheduler * self;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ONE_SHOT_SCHEDULER, OneShotScheduler);
@@ -2635,7 +2635,7 @@ GType one_shot_scheduler_get_type (void) {
 
 
 gpointer one_shot_scheduler_ref (gpointer instance) {
-	OneShotScheduler* self;
+	OneShotScheduler * self;
 	self = instance;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -2646,7 +2646,7 @@ gpointer one_shot_scheduler_ref (gpointer instance) {
 
 
 void one_shot_scheduler_unref (gpointer instance) {
-	OneShotScheduler* self;
+	OneShotScheduler * self;
 	self = instance;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2661,8 +2661,8 @@ void one_shot_scheduler_unref (gpointer instance) {
 
 OpTimer* op_timer_construct (GType object_type, const gchar* name) {
 	OpTimer* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2689,7 +2689,7 @@ OpTimer* op_timer_new (const gchar* name) {
 
 
 void op_timer_start (OpTimer* self) {
-	GTimer* _tmp0_ = NULL;
+	GTimer* _tmp0_;
 #line 335 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_OP_TIMER (self));
 #line 336 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2702,15 +2702,15 @@ void op_timer_start (OpTimer* self) {
 
 void op_timer_stop (OpTimer* self) {
 	gdouble time = 0.0;
-	GTimer* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp7_ = 0.0;
-	gdouble _tmp8_ = 0.0;
-	glong _tmp10_ = 0L;
+	GTimer* _tmp0_;
+	gdouble _tmp1_;
+	gdouble _tmp2_;
+	gdouble _tmp3_;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp7_;
+	gdouble _tmp8_;
+	glong _tmp10_;
 #line 339 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_OP_TIMER (self));
 #line 340 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2732,7 +2732,7 @@ void op_timer_stop (OpTimer* self) {
 #line 344 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp4_ < _tmp5_) {
 #line 2735 "misc.c"
-		gdouble _tmp6_ = 0.0;
+		gdouble _tmp6_;
 #line 345 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = time;
 #line 345 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2746,7 +2746,7 @@ void op_timer_stop (OpTimer* self) {
 #line 347 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp7_ > _tmp8_) {
 #line 2749 "misc.c"
-		gdouble _tmp9_ = 0.0;
+		gdouble _tmp9_;
 #line 348 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp9_ = time;
 #line 348 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2763,7 +2763,7 @@ void op_timer_stop (OpTimer* self) {
 
 gchar* op_timer_to_string (OpTimer* self) {
 	gchar* result = NULL;
-	glong _tmp0_ = 0L;
+	glong _tmp0_;
 #line 353 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (IS_OP_TIMER (self), NULL);
 #line 354 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2771,14 +2771,14 @@ gchar* op_timer_to_string (OpTimer* self) {
 #line 354 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_ > ((glong) 0)) {
 #line 2774 "misc.c"
-		const gchar* _tmp1_ = NULL;
-		glong _tmp2_ = 0L;
-		gdouble _tmp3_ = 0.0;
-		gdouble _tmp4_ = 0.0;
-		gdouble _tmp5_ = 0.0;
-		glong _tmp6_ = 0L;
-		gdouble _tmp7_ = 0.0;
-		gchar* _tmp8_ = NULL;
+		const gchar* _tmp1_;
+		glong _tmp2_;
+		gdouble _tmp3_;
+		gdouble _tmp4_;
+		gdouble _tmp5_;
+		glong _tmp6_;
+		gdouble _tmp7_;
+		gchar* _tmp8_;
 #line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = self->priv->name;
 #line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2801,8 +2801,8 @@ gchar* op_timer_to_string (OpTimer* self) {
 		return result;
 #line 2803 "misc.c"
 	} else {
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
+		const gchar* _tmp9_;
+		gchar* _tmp10_;
 #line 358 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp9_ = self->priv->name;
 #line 358 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2858,7 +2858,7 @@ static gchar* value_op_timer_collect_value (GValue* value, guint n_collect_value
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (collect_values[0].v_pointer) {
 #line 2861 "misc.c"
-		OpTimer* object;
+		OpTimer * object;
 		object = collect_values[0].v_pointer;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -2885,7 +2885,7 @@ static gchar* value_op_timer_collect_value (GValue* value, guint n_collect_value
 
 
 static gchar* value_op_timer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	OpTimer** object_p;
+	OpTimer ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (!object_p) {
@@ -2937,7 +2937,7 @@ gpointer value_get_op_timer (const GValue* value) {
 
 
 void value_set_op_timer (GValue* value, gpointer v_object) {
-	OpTimer* old;
+	OpTimer * old;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER));
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2968,7 +2968,7 @@ void value_set_op_timer (GValue* value, gpointer v_object) {
 
 
 void value_take_op_timer (GValue* value, gpointer v_object) {
-	OpTimer* old;
+	OpTimer * old;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER));
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -3008,7 +3008,7 @@ static void op_timer_class_init (OpTimerClass * klass) {
 
 
 static void op_timer_instance_init (OpTimer * self) {
-	GTimer* _tmp0_ = NULL;
+	GTimer* _tmp0_;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv = OP_TIMER_GET_PRIVATE (self);
 #line 325 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -3029,7 +3029,7 @@ static void op_timer_instance_init (OpTimer * self) {
 }
 
 
-static void op_timer_finalize (OpTimer* obj) {
+static void op_timer_finalize (OpTimer * obj) {
 	OpTimer * self;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_OP_TIMER, OpTimer);
@@ -3058,7 +3058,7 @@ GType op_timer_get_type (void) {
 
 
 gpointer op_timer_ref (gpointer instance) {
-	OpTimer* self;
+	OpTimer * self;
 	self = instance;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -3069,7 +3069,7 @@ gpointer op_timer_ref (gpointer instance) {
 
 
 void op_timer_unref (gpointer instance) {
-	OpTimer* self;
+	OpTimer * self;
 	self = instance;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
diff --git a/src/util/string.c b/src/util/string.c
index ee1a1bb..642e9fa 100644
--- a/src/util/string.c
+++ b/src/util/string.c
@@ -1,4 +1,4 @@
-/* string.c generated by valac 0.34.7, the Vala compiler
+/* string.c generated by valac 0.36.6, the Vala compiler
  * generated from string.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -37,7 +37,7 @@ gint utf8_cs_compare (void* a, void* b);
 gint utf8_ci_compare (void* a, void* b);
 gchar* uchar_array_to_string (guchar* data, int data_length1, gint length);
 guchar* string_to_uchar_array (const gchar* str, int* result_length1);
-static void _vala_array_add1 (guchar** array, int* length, int* size, guchar value);
+static void _vala_array_add1 (guchar* * array, int* length, int* size, guchar value);
 gchar* guarded_markup_escape_text (const gchar* plain);
 glong find_last_offset (const gchar* str, gchar c);
 gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1);
@@ -65,17 +65,17 @@ gboolean string_precollated_equals (const gchar* astr, const gchar* akey, const
 
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_ = 0L;
-	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 81 "string.c"
 }
@@ -84,7 +84,7 @@ static gchar string_get (const gchar* self, glong index) {
 inline gboolean is_string_empty (const gchar* s) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp1_;
 #line 12 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp1_ = s;
 #line 12 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -93,8 +93,8 @@ inline gboolean is_string_empty (const gchar* s) {
 		_tmp0_ = TRUE;
 #line 95 "string.c"
 	} else {
-		const gchar* _tmp2_ = NULL;
-		gchar _tmp3_ = '\0';
+		const gchar* _tmp2_;
+		gchar _tmp3_;
 #line 12 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp2_ = s;
 #line 12 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -113,9 +113,9 @@ inline gboolean is_string_empty (const gchar* s) {
 
 gint utf8_cs_compare (void* a, void* b) {
 	gint result = 0;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	void* _tmp0_;
+	void* _tmp1_;
+	gint _tmp2_;
 #line 17 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = a;
 #line 17 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -132,14 +132,14 @@ gint utf8_cs_compare (void* a, void* b) {
 
 gint utf8_ci_compare (void* a, void* b) {
 	gint result = 0;
-	void* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	void* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	void* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	void* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 #line 22 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = a;
 #line 22 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -170,19 +170,19 @@ gint utf8_ci_compare (void* a, void* b) {
 
 gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
 	gchar* result = NULL;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GString* builder = NULL;
-	GString* _tmp2_ = NULL;
-	GString* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
+	GString* _tmp2_;
+	GString* _tmp14_;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
 #line 27 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = length;
 #line 27 "/home/jens/Source/shotwell/src/util/string.vala"
 	if (_tmp0_ < 0) {
 #line 184 "string.c"
-		guchar* _tmp1_ = NULL;
-		gint _tmp1__length1 = 0;
+		guchar* _tmp1_;
+		gint _tmp1__length1;
 #line 28 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp1_ = data;
 #line 28 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -208,16 +208,16 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
 #line 31 "/home/jens/Source/shotwell/src/util/string.vala"
 			while (TRUE) {
 #line 211 "string.c"
-				gint _tmp5_ = 0;
-				gint _tmp6_ = 0;
-				guchar* _tmp7_ = NULL;
-				gint _tmp7__length1 = 0;
-				gint _tmp8_ = 0;
-				guchar _tmp9_ = '\0';
+				gint _tmp5_;
+				gint _tmp6_;
+				guchar* _tmp7_;
+				gint _tmp7__length1;
+				gint _tmp8_;
+				guchar _tmp9_;
 #line 31 "/home/jens/Source/shotwell/src/util/string.vala"
 				if (!_tmp3_) {
 #line 220 "string.c"
-					gint _tmp4_ = 0;
+					gint _tmp4_;
 #line 31 "/home/jens/Source/shotwell/src/util/string.vala"
 					_tmp4_ = ctr;
 #line 31 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -247,11 +247,11 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
 #line 32 "/home/jens/Source/shotwell/src/util/string.vala"
 				if (_tmp9_ != ((guchar) '\0')) {
 #line 250 "string.c"
-					GString* _tmp10_ = NULL;
-					guchar* _tmp11_ = NULL;
-					gint _tmp11__length1 = 0;
-					gint _tmp12_ = 0;
-					guchar _tmp13_ = '\0';
+					GString* _tmp10_;
+					guchar* _tmp11_;
+					gint _tmp11__length1;
+					gint _tmp12_;
+					guchar _tmp13_;
 #line 33 "/home/jens/Source/shotwell/src/util/string.vala"
 					_tmp10_ = builder;
 #line 33 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -289,7 +289,7 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
 }
 
 
-static void _vala_array_add1 (guchar** array, int* length, int* size, guchar value) {
+static void _vala_array_add1 (guchar* * array, int* length, int* size, guchar value) {
 #line 45 "/home/jens/Source/shotwell/src/util/string.vala"
 	if ((*length) == (*size)) {
 #line 45 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -307,11 +307,11 @@ static void _vala_array_add1 (guchar** array, int* length, int* size, guchar val
 guchar* string_to_uchar_array (const gchar* str, int* result_length1) {
 	guchar* result = NULL;
 	guchar* data = NULL;
-	guchar* _tmp0_ = NULL;
-	gint data_length1 = 0;
-	gint _data_size_ = 0;
-	guchar* _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
+	guchar* _tmp0_;
+	gint data_length1;
+	gint _data_size_;
+	guchar* _tmp11_;
+	gint _tmp11__length1;
 #line 42 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (str != NULL, NULL);
 #line 43 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -335,19 +335,19 @@ guchar* string_to_uchar_array (const gchar* str, int* result_length1) {
 #line 44 "/home/jens/Source/shotwell/src/util/string.vala"
 			while (TRUE) {
 #line 338 "string.c"
-				gint _tmp3_ = 0;
-				const gchar* _tmp4_ = NULL;
-				gint _tmp5_ = 0;
-				gint _tmp6_ = 0;
-				guchar* _tmp7_ = NULL;
-				gint _tmp7__length1 = 0;
-				const gchar* _tmp8_ = NULL;
-				gint _tmp9_ = 0;
-				gchar _tmp10_ = '\0';
+				gint _tmp3_;
+				const gchar* _tmp4_;
+				gint _tmp5_;
+				gint _tmp6_;
+				guchar* _tmp7_;
+				gint _tmp7__length1;
+				const gchar* _tmp8_;
+				gint _tmp9_;
+				gchar _tmp10_;
 #line 44 "/home/jens/Source/shotwell/src/util/string.vala"
 				if (!_tmp1_) {
 #line 350 "string.c"
-					gint _tmp2_ = 0;
+					gint _tmp2_;
 #line 44 "/home/jens/Source/shotwell/src/util/string.vala"
 					_tmp2_ = ctr;
 #line 44 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -408,8 +408,8 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp2_ = plain;
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -417,8 +417,8 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
 	if (!_tmp3_) {
 #line 420 "string.c"
-		const gchar* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+		const gchar* _tmp4_;
+		gboolean _tmp5_;
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp4_ = plain;
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -434,8 +434,8 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
 	if (_tmp1_) {
 #line 437 "string.c"
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp6_ = plain;
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -446,7 +446,7 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
 		_tmp0_ = _tmp7_;
 #line 448 "string.c"
 	} else {
-		gchar* _tmp8_ = NULL;
+		gchar* _tmp8_;
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp8_ = g_strdup ("");
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -466,9 +466,9 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
 glong find_last_offset (const gchar* str, gchar c) {
 	glong result = 0L;
 	glong offset = 0L;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	const gchar* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 61 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (str != NULL, 0L);
 #line 62 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -482,12 +482,12 @@ glong find_last_offset (const gchar* str, gchar c) {
 #line 63 "/home/jens/Source/shotwell/src/util/string.vala"
 	while (TRUE) {
 #line 485 "string.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		const gchar* _tmp5_ = NULL;
-		glong _tmp6_ = 0L;
-		gchar _tmp7_ = '\0';
-		gchar _tmp8_ = '\0';
+		glong _tmp3_;
+		glong _tmp4_;
+		const gchar* _tmp5_;
+		glong _tmp6_;
+		gchar _tmp7_;
+		gchar _tmp8_;
 #line 63 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp3_ = offset;
 #line 63 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -528,10 +528,10 @@ glong find_last_offset (const gchar* str, gchar c) {
 gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1) {
 	gboolean result = FALSE;
 	gchar* strdown = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
 #line 73 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (str != NULL, FALSE);
 #line 74 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -557,7 +557,7 @@ gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1)
 #line 75 "/home/jens/Source/shotwell/src/util/string.vala"
 		for (str_element_it = 0; str_element_it < _tmp2__length1; str_element_it = str_element_it + 1) {
 #line 560 "string.c"
-			gchar* _tmp3_ = NULL;
+			gchar* _tmp3_;
 			gchar* str_element = NULL;
 #line 75 "/home/jens/Source/shotwell/src/util/string.vala"
 			_tmp3_ = g_strdup (str_element_collection[str_element_it]);
@@ -565,8 +565,8 @@ gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1)
 			str_element = _tmp3_;
 #line 567 "string.c"
 			{
-				const gchar* _tmp4_ = NULL;
-				const gchar* _tmp5_ = NULL;
+				const gchar* _tmp4_;
+				const gchar* _tmp5_;
 #line 76 "/home/jens/Source/shotwell/src/util/string.vala"
 				_tmp4_ = strdown;
 #line 76 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -617,11 +617,11 @@ gchar* guess_convert (const gchar* text) {
 	gsize bytes_read = 0UL;
 	const gchar* charset = NULL;
 	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gsize _tmp30_ = 0UL;
-	const gchar* _tmp31_ = NULL;
-	gint _tmp32_ = 0;
-	gint _tmp33_ = 0;
+	gboolean _tmp1_;
+	gsize _tmp30_;
+	const gchar* _tmp31_;
+	gint _tmp32_;
+	gint _tmp33_;
 	GError * _inner_error_ = NULL;
 #line 94 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (text != NULL, NULL);
@@ -641,16 +641,16 @@ gchar* guess_convert (const gchar* text) {
 #line 101 "/home/jens/Source/shotwell/src/util/string.vala"
 	if (!_tmp1_) {
 #line 643 "string.c"
-		const gchar* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+		const gchar* _tmp2_;
+		const gchar* _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
 		gsize _tmp6_ = 0UL;
-		gchar* _tmp7_ = NULL;
-		gsize _tmp8_ = 0UL;
-		const gchar* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
+		gchar* _tmp7_;
+		gsize _tmp8_;
+		const gchar* _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
 #line 102 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp2_ = text;
 #line 102 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -678,7 +678,7 @@ gchar* guess_convert (const gchar* text) {
 #line 103 "/home/jens/Source/shotwell/src/util/string.vala"
 		if (_tmp8_ == ((gsize) _tmp11_)) {
 #line 680 "string.c"
-			const gchar* _tmp12_ = NULL;
+			const gchar* _tmp12_;
 #line 104 "/home/jens/Source/shotwell/src/util/string.vala"
 			_tmp12_ = charset;
 #line 104 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -692,13 +692,13 @@ gchar* guess_convert (const gchar* text) {
 	}
 	{
 		gchar* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
-		gint _tmp17_ = 0;
+		const gchar* _tmp14_;
+		const gchar* _tmp15_;
+		gint _tmp16_;
+		gint _tmp17_;
 		gsize _tmp18_ = 0UL;
-		gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
+		gchar* _tmp19_;
+		gchar* _tmp20_;
 #line 110 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp14_ = text;
 #line 110 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -748,7 +748,7 @@ gchar* guess_convert (const gchar* text) {
 	__catch6_g_convert_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp21_ = NULL;
+		GError* _tmp21_;
 #line 109 "/home/jens/Source/shotwell/src/util/string.vala"
 		_error_ = _inner_error_;
 #line 109 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -760,13 +760,13 @@ gchar* guess_convert (const gchar* text) {
 #line 760 "string.c"
 			{
 				gchar* _tmp22_ = NULL;
-				const gchar* _tmp23_ = NULL;
-				const gchar* _tmp24_ = NULL;
-				gint _tmp25_ = 0;
-				gint _tmp26_ = 0;
+				const gchar* _tmp23_;
+				const gchar* _tmp24_;
+				gint _tmp25_;
+				gint _tmp26_;
 				gsize _tmp27_ = 0UL;
-				gchar* _tmp28_ = NULL;
-				gchar* _tmp29_ = NULL;
+				gchar* _tmp28_;
+				gchar* _tmp29_;
 #line 115 "/home/jens/Source/shotwell/src/util/string.vala"
 				_tmp23_ = text;
 #line 115 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -858,7 +858,7 @@ gchar* guess_convert (const gchar* text) {
 #line 121 "/home/jens/Source/shotwell/src/util/string.vala"
 	if (_tmp30_ == ((gsize) _tmp33_)) {
 #line 860 "string.c"
-		const gchar* _tmp34_ = NULL;
+		const gchar* _tmp34_;
 #line 122 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp34_ = charset;
 #line 122 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -882,21 +882,21 @@ gchar* guess_convert (const gchar* text) {
 static gchar* string_strip (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 901 "string.c"
 }
@@ -905,29 +905,29 @@ static gchar* string_strip (const gchar* self) {
 static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar new_delimiter) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar _tmp3_ = '\0';
-#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar _tmp3_;
+#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (delimiters != NULL, NULL);
-#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = delimiters;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = new_delimiter;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strdelimit (_tmp1_, _tmp2_, _tmp3_);
-#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 932 "string.c"
 }
@@ -935,17 +935,17 @@ static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar
 
 gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gchar* prepped = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	PrepareInputTextOptions _tmp3_ = 0;
-	PrepareInputTextOptions _tmp12_ = 0;
-	PrepareInputTextOptions _tmp15_ = 0;
-	PrepareInputTextOptions _tmp18_ = 0;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	PrepareInputTextOptions _tmp3_;
+	PrepareInputTextOptions _tmp12_;
+	PrepareInputTextOptions _tmp15_;
+	PrepareInputTextOptions _tmp18_;
 	gboolean _tmp21_ = FALSE;
-	PrepareInputTextOptions _tmp22_ = 0;
-	gint _tmp25_ = 0;
+	PrepareInputTextOptions _tmp22_;
+	gint _tmp25_;
 #line 131 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = text;
 #line 131 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -967,8 +967,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
 #line 135 "/home/jens/Source/shotwell/src/util/string.vala"
 	if ((_tmp3_ & PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) == PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) {
 #line 969 "string.c"
-		const gchar* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+		const gchar* _tmp4_;
+		gboolean _tmp5_;
 #line 136 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp4_ = text;
 #line 136 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -976,9 +976,9 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
 #line 136 "/home/jens/Source/shotwell/src/util/string.vala"
 		if (!_tmp5_) {
 #line 978 "string.c"
-			const gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
-			const gchar* _tmp8_ = NULL;
+			const gchar* _tmp6_;
+			gchar* _tmp7_;
+			const gchar* _tmp8_;
 #line 137 "/home/jens/Source/shotwell/src/util/string.vala"
 			_tmp6_ = text;
 #line 137 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -993,8 +993,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
 			if (_tmp8_ == NULL) {
 #line 994 "string.c"
 				const gchar* _tmp9_ = NULL;
-				PrepareInputTextOptions _tmp10_ = 0;
-				gchar* _tmp11_ = NULL;
+				PrepareInputTextOptions _tmp10_;
+				gchar* _tmp11_;
 #line 140 "/home/jens/Source/shotwell/src/util/string.vala"
 				_tmp10_ = options;
 #line 140 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1024,8 +1024,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
 #line 149 "/home/jens/Source/shotwell/src/util/string.vala"
 	if ((_tmp12_ & PREPARE_INPUT_TEXT_OPTIONS_NORMALIZE) != 0) {
 #line 1026 "string.c"
-		const gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
 #line 150 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp13_ = prepped;
 #line 150 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1041,8 +1041,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
 #line 152 "/home/jens/Source/shotwell/src/util/string.vala"
 	if ((_tmp15_ & PREPARE_INPUT_TEXT_OPTIONS_STRIP) != 0) {
 #line 1043 "string.c"
-		const gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
+		const gchar* _tmp16_;
+		gchar* _tmp17_;
 #line 153 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp16_ = prepped;
 #line 153 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1058,8 +1058,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
 #line 157 "/home/jens/Source/shotwell/src/util/string.vala"
 	if ((_tmp18_ & PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF) != 0) {
 #line 1060 "string.c"
-		const gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
+		const gchar* _tmp19_;
+		gchar* _tmp20_;
 #line 158 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp19_ = prepped;
 #line 158 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1075,8 +1075,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
 #line 160 "/home/jens/Source/shotwell/src/util/string.vala"
 	if ((_tmp22_ & PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL) != 0) {
 #line 1077 "string.c"
-		const gchar* _tmp23_ = NULL;
-		gboolean _tmp24_ = FALSE;
+		const gchar* _tmp23_;
+		gboolean _tmp24_;
 #line 160 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp23_ = prepped;
 #line 160 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1105,13 +1105,13 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
 	if (_tmp25_ >= 0) {
 #line 1106 "string.c"
 		GString* sb = NULL;
-		const gchar* _tmp26_ = NULL;
-		GString* _tmp27_ = NULL;
-		GString* _tmp28_ = NULL;
-		gint _tmp29_ = 0;
-		GString* _tmp30_ = NULL;
-		const gchar* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
+		const gchar* _tmp26_;
+		GString* _tmp27_;
+		GString* _tmp28_;
+		gint _tmp29_;
+		GString* _tmp30_;
+		const gchar* _tmp31_;
+		gchar* _tmp32_;
 #line 167 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp26_ = prepped;
 #line 167 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1150,9 +1150,9 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
 
 gint64 parse_int64 (const gchar* str, gint num_base) {
 	gint64 result = 0LL;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint64 _tmp2_ = 0LL;
+	const gchar* _tmp0_;
+	gint _tmp1_;
+	gint64 _tmp2_;
 #line 176 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (str != NULL, 0LL);
 #line 177 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1172,37 +1172,37 @@ gint64 parse_int64 (const gchar* str, gint num_base) {
 static gint string_index_of_char (const gchar* self, gunichar c, gint start_index) {
 	gint result = 0;
 	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	gunichar _tmp1_ = 0U;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint _tmp0_;
+	gunichar _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1031 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 1193 "string.c"
-		gchar* _tmp4_ = NULL;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp4_;
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 1201 "string.c"
 	} else {
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 1207 "string.c"
 	}
@@ -1211,9 +1211,9 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde
 
 inline gboolean string_contains_char (const gchar* haystack, gunichar needle) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gunichar _tmp1_ = 0U;
-	gint _tmp2_ = 0;
+	const gchar* _tmp0_;
+	gunichar _tmp1_;
+	gint _tmp2_;
 #line 182 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (haystack != NULL, FALSE);
 #line 183 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1233,39 +1233,39 @@ inline gboolean string_contains_char (const gchar* haystack, gunichar needle) {
 static gint string_index_of (const gchar* self, const gchar* needle, gint start_index) {
 	gint result = 0;
 	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 1256 "string.c"
-		gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp4_;
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 1264 "string.c"
 	} else {
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = -1;
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 1270 "string.c"
 	}
@@ -1274,9 +1274,9 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
 
 inline gboolean string_contains_str (const gchar* haystack, const gchar* needle) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gint _tmp2_;
 #line 186 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (haystack != NULL, FALSE);
 #line 186 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1298,117 +1298,117 @@ inline gboolean string_contains_str (const gchar* haystack, const gchar* needle)
 static gchar* string_slice (const gchar* self, glong start, glong end) {
 	gchar* result = NULL;
 	glong string_length = 0L;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	glong _tmp2_ = 0L;
-	glong _tmp5_ = 0L;
+	gint _tmp0_;
+	gint _tmp1_;
+	glong _tmp2_;
+	glong _tmp5_;
 	gboolean _tmp8_ = FALSE;
-	glong _tmp9_ = 0L;
+	glong _tmp9_;
 	gboolean _tmp12_ = FALSE;
-	glong _tmp13_ = 0L;
-	glong _tmp16_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp13_;
+	glong _tmp16_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	gchar* _tmp21_;
+#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
 #line 1327 "string.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp3_;
+		glong _tmp4_;
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
 #line 1336 "string.c"
 	}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
 #line 1342 "string.c"
-		glong _tmp6_ = 0L;
-		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp6_;
+		glong _tmp7_;
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
 #line 1351 "string.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
 #line 1357 "string.c"
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
 #line 1366 "string.c"
 	} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
 #line 1370 "string.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
 #line 1378 "string.c"
-		glong _tmp14_ = 0L;
-		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp14_;
+		glong _tmp15_;
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
 #line 1387 "string.c"
 	} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
 #line 1391 "string.c"
 	}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 1413 "string.c"
 }
@@ -1417,7 +1417,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 inline gchar* string_sliced_at (const gchar* str, gint index) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 #line 190 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (str != NULL, NULL);
 #line 191 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1425,12 +1425,12 @@ inline gchar* string_sliced_at (const gchar* str, gint index) {
 #line 191 "/home/jens/Source/shotwell/src/util/string.vala"
 	if (_tmp1_ >= 0) {
 #line 1427 "string.c"
-		const gchar* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		const gchar* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
-		gchar* _tmp7_ = NULL;
+		const gchar* _tmp2_;
+		gint _tmp3_;
+		const gchar* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
+		gchar* _tmp7_;
 #line 191 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp2_ = str;
 #line 191 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1465,12 +1465,12 @@ inline gchar* string_sliced_at (const gchar* str, gint index) {
 
 inline gchar* string_sliced_at_first_str (const gchar* haystack, const gchar* needle, gint start_index) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gchar* _tmp5_;
 #line 194 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (haystack != NULL, NULL);
 #line 194 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1498,39 +1498,39 @@ inline gchar* string_sliced_at_first_str (const gchar* haystack, const gchar* ne
 static gint string_last_index_of (const gchar* self, const gchar* needle, gint start_index) {
 	gint result = 0;
 	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, 0);
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = needle;
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 1521 "string.c"
-		gchar* _tmp4_ = NULL;
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp4_;
+#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 1529 "string.c"
 	} else {
-#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 1535 "string.c"
 	}
@@ -1539,12 +1539,12 @@ static gint string_last_index_of (const gchar* self, const gchar* needle, gint s
 
 inline gchar* string_sliced_at_last_str (const gchar* haystack, const gchar* needle, gint start_index) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gchar* _tmp5_;
 #line 198 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (haystack != NULL, NULL);
 #line 198 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1571,12 +1571,12 @@ inline gchar* string_sliced_at_last_str (const gchar* haystack, const gchar* nee
 
 inline gchar* string_sliced_at_first_char (const gchar* haystack, gunichar ch, gint start_index) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gunichar _tmp2_ = 0U;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gunichar _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gchar* _tmp5_;
 #line 202 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (haystack != NULL, NULL);
 #line 203 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1602,37 +1602,37 @@ inline gchar* string_sliced_at_first_char (const gchar* haystack, gunichar ch, g
 static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) {
 	gint result = 0;
 	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	gunichar _tmp1_ = 0U;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint _tmp0_;
+	gunichar _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1041 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 1623 "string.c"
-		gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp4_;
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 1631 "string.c"
 	} else {
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 1637 "string.c"
 	}
@@ -1641,12 +1641,12 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 
 inline gchar* string_sliced_at_last_char (const gchar* haystack, gunichar ch, gint start_index) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gunichar _tmp2_ = 0U;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gunichar _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gchar* _tmp5_;
 #line 206 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (haystack != NULL, NULL);
 #line 207 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1671,17 +1671,17 @@ inline gchar* string_sliced_at_last_char (const gchar* haystack, gunichar ch, gi
 
 static gunichar string_get_char (const gchar* self, glong index) {
 	gunichar result = 0U;
-	glong _tmp0_ = 0L;
-	gunichar _tmp1_ = 0U;
-#line 1116 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gunichar _tmp1_;
+#line 1140 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0U);
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 1686 "string.c"
 }
@@ -1690,11 +1690,11 @@ static gunichar string_get_char (const gchar* self, glong index) {
 gchar* string_strip_leading_zeroes (const gchar* str) {
 	gchar* result = NULL;
 	GString* stripped = NULL;
-	GString* _tmp0_ = NULL;
+	GString* _tmp0_;
 	gboolean prev_is_space = FALSE;
-	GString* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
+	GString* _tmp16_;
+	const gchar* _tmp17_;
+	gchar* _tmp18_;
 #line 211 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (str != NULL, NULL);
 #line 212 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1706,7 +1706,7 @@ gchar* string_strip_leading_zeroes (const gchar* str) {
 #line 1706 "string.c"
 	{
 		const gchar* iter = NULL;
-		const gchar* _tmp1_ = NULL;
+		const gchar* _tmp1_;
 #line 214 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp1_ = str;
 #line 214 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1719,18 +1719,18 @@ gchar* string_strip_leading_zeroes (const gchar* str) {
 #line 214 "/home/jens/Source/shotwell/src/util/string.vala"
 			while (TRUE) {
 #line 1721 "string.c"
-				const gchar* _tmp5_ = NULL;
-				gunichar _tmp6_ = 0U;
+				const gchar* _tmp5_;
+				gunichar _tmp6_;
 				gunichar ch = 0U;
-				const gchar* _tmp7_ = NULL;
-				gunichar _tmp8_ = 0U;
+				const gchar* _tmp7_;
+				gunichar _tmp8_;
 				gboolean _tmp9_ = FALSE;
-				gboolean _tmp10_ = FALSE;
+				gboolean _tmp10_;
 #line 214 "/home/jens/Source/shotwell/src/util/string.vala"
 				if (!_tmp2_) {
 #line 1731 "string.c"
-					const gchar* _tmp3_ = NULL;
-					const gchar* _tmp4_ = NULL;
+					const gchar* _tmp3_;
+					const gchar* _tmp4_;
 #line 214 "/home/jens/Source/shotwell/src/util/string.vala"
 					_tmp3_ = iter;
 #line 214 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1765,7 +1765,7 @@ gchar* string_strip_leading_zeroes (const gchar* str) {
 					_tmp9_ = TRUE;
 #line 1766 "string.c"
 				} else {
-					gunichar _tmp11_ = 0U;
+					gunichar _tmp11_;
 #line 217 "/home/jens/Source/shotwell/src/util/string.vala"
 					_tmp11_ = ch;
 #line 217 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1775,10 +1775,10 @@ gchar* string_strip_leading_zeroes (const gchar* str) {
 #line 217 "/home/jens/Source/shotwell/src/util/string.vala"
 				if (_tmp9_) {
 #line 1777 "string.c"
-					GString* _tmp12_ = NULL;
-					gunichar _tmp13_ = 0U;
-					gunichar _tmp14_ = 0U;
-					gboolean _tmp15_ = FALSE;
+					GString* _tmp12_;
+					gunichar _tmp13_;
+					gunichar _tmp14_;
+					gboolean _tmp15_;
 #line 218 "/home/jens/Source/shotwell/src/util/string.vala"
 					_tmp12_ = stripped;
 #line 218 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1815,57 +1815,57 @@ gchar* string_strip_leading_zeroes (const gchar* str) {
 static gboolean string_get_next_char (const gchar* self, gint* index, gunichar* c) {
 	gunichar _vala_c = 0U;
 	gboolean result = FALSE;
-	gint _tmp0_ = 0;
-	gunichar _tmp1_ = 0U;
-	gunichar _tmp2_ = 0U;
-#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint _tmp0_;
+	gunichar _tmp1_;
+	gunichar _tmp2_;
+#line 1129 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1130 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = *index;
-#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1130 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1130 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_vala_c = _tmp1_;
-#line 1107 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1131 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = _vala_c;
-#line 1107 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1131 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_ != ((gunichar) 0)) {
 #line 1833 "string.c"
-		gint _tmp3_ = 0;
-		gchar* _tmp4_ = NULL;
-#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp3_;
+		gchar* _tmp4_;
+#line 1132 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = *index;
-#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1132 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = g_utf8_next_char (((gchar*) self) + _tmp3_);
-#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1132 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		*index = (gint) (_tmp4_ - ((gchar*) self));
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1133 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = TRUE;
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1133 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (c) {
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1133 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			*c = _vala_c;
 #line 1848 "string.c"
 		}
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1133 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 1852 "string.c"
 	} else {
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1135 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = FALSE;
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1135 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (c) {
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1135 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			*c = _vala_c;
 #line 1860 "string.c"
 		}
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1135 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 1864 "string.c"
 	}
-#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1129 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (c) {
-#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1129 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		*c = _vala_c;
 #line 1870 "string.c"
 	}
@@ -1875,12 +1875,12 @@ static gboolean string_get_next_char (const gchar* self, gint* index, gunichar*
 gchar* string_remove_diacritics (const gchar* istring) {
 	gchar* result = NULL;
 	GString* builder = NULL;
-	GString* _tmp0_ = NULL;
+	GString* _tmp0_;
 	gunichar ch = 0U;
 	gint i = 0;
-	GString* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	GString* _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
 #line 226 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (istring != NULL, NULL);
 #line 227 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1892,16 +1892,16 @@ gchar* string_remove_diacritics (const gchar* istring) {
 #line 230 "/home/jens/Source/shotwell/src/util/string.vala"
 	while (TRUE) {
 #line 1894 "string.c"
-		const gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+		const gchar* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
 		gunichar _tmp4_ = 0U;
-		gboolean _tmp5_ = FALSE;
-		gboolean _tmp6_ = FALSE;
-		gunichar _tmp7_ = 0U;
-		GUnicodeType _tmp8_ = 0;
-		GString* _tmp9_ = NULL;
-		gunichar _tmp10_ = 0U;
+		gboolean _tmp5_;
+		gboolean _tmp6_;
+		gunichar _tmp7_;
+		GUnicodeType _tmp8_;
+		GString* _tmp9_;
+		gunichar _tmp10_;
 #line 230 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp1_ = istring;
 #line 230 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1978,12 +1978,12 @@ gchar* string_remove_diacritics (const gchar* istring) {
 gchar* string_to_hex_string (const gchar* str) {
 	gchar* result = NULL;
 	GString* builder = NULL;
-	GString* _tmp0_ = NULL;
+	GString* _tmp0_;
 	guint8* data = NULL;
-	const gchar* _tmp1_ = NULL;
-	GString* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
+	const gchar* _tmp1_;
+	GString* _tmp7_;
+	const gchar* _tmp8_;
+	gchar* _tmp9_;
 #line 246 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (str != NULL, NULL);
 #line 247 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1997,11 +1997,11 @@ gchar* string_to_hex_string (const gchar* str) {
 #line 250 "/home/jens/Source/shotwell/src/util/string.vala"
 	while (TRUE) {
 #line 1999 "string.c"
-		guint8* _tmp2_ = NULL;
+		guint8* _tmp2_;
 		const gchar* _tmp3_ = NULL;
-		guint8* _tmp4_ = NULL;
-		GString* _tmp5_ = NULL;
-		guint8* _tmp6_ = NULL;
+		guint8* _tmp4_;
+		GString* _tmp5_;
+		guint8* _tmp6_;
 #line 250 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp2_ = data;
 #line 250 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2051,13 +2051,13 @@ gchar* string_to_hex_string (const gchar* str) {
 guint string_collated_hash (void* ptr) {
 	guint result = 0U;
 	gchar* str = NULL;
-	void* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	GHashFunc _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	guint _tmp6_ = 0U;
+	void* _tmp0_;
+	gchar* _tmp1_;
+	GHashFunc _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	guint _tmp5_;
+	guint _tmp6_;
 #line 273 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = ptr;
 #line 273 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2088,9 +2088,9 @@ guint string_collated_hash (void* ptr) {
 
 guint string_precollated_hash (void* ptr) {
 	guint result = 0U;
-	GHashFunc _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
+	GHashFunc _tmp0_;
+	void* _tmp1_;
+	guint _tmp2_;
 #line 280 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = g_str_hash;
 #line 280 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2108,17 +2108,17 @@ guint string_precollated_hash (void* ptr) {
 gint string_collated_compare (void* a, void* b) {
 	gint result = 0;
 	gchar* astr = NULL;
-	void* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	void* _tmp0_;
+	gchar* _tmp1_;
 	gchar* bstr = NULL;
-	void* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	void* _tmp2_;
+	gchar* _tmp3_;
 	gint _result_ = 0;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
+	gint _tmp6_;
 	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	gint _tmp8_;
 #line 285 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = a;
 #line 285 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2144,17 +2144,17 @@ gint string_collated_compare (void* a, void* b) {
 #line 290 "/home/jens/Source/shotwell/src/util/string.vala"
 	if (_tmp8_ != 0) {
 #line 2146 "string.c"
-		gint _tmp9_ = 0;
+		gint _tmp9_;
 #line 290 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp9_ = _result_;
 #line 290 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp7_ = _tmp9_;
 #line 2152 "string.c"
 	} else {
-		GCompareFunc _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
+		GCompareFunc _tmp10_;
+		const gchar* _tmp11_;
+		const gchar* _tmp12_;
+		gint _tmp13_;
 #line 290 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp10_ = g_strcmp0;
 #line 290 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2182,12 +2182,12 @@ gint string_collated_compare (void* a, void* b) {
 gint string_precollated_compare (const gchar* astr, const gchar* akey, const gchar* bstr, const gchar* bkey) {
 	gint result = 0;
 	gint _result_ = 0;
-	GCompareFunc _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	GCompareFunc _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gint _tmp3_;
 	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	gint _tmp5_;
 #line 294 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (astr != NULL, 0);
 #line 294 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2211,17 +2211,17 @@ gint string_precollated_compare (const gchar* astr, const gchar* akey, const gch
 #line 297 "/home/jens/Source/shotwell/src/util/string.vala"
 	if (_tmp5_ != 0) {
 #line 2213 "string.c"
-		gint _tmp6_ = 0;
+		gint _tmp6_;
 #line 297 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp6_ = _result_;
 #line 297 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp4_ = _tmp6_;
 #line 2219 "string.c"
 	} else {
-		GCompareFunc _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
+		GCompareFunc _tmp7_;
+		const gchar* _tmp8_;
+		const gchar* _tmp9_;
+		gint _tmp10_;
 #line 297 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp7_ = g_strcmp0;
 #line 297 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2244,9 +2244,9 @@ gint string_precollated_compare (const gchar* astr, const gchar* akey, const gch
 
 gboolean string_collated_equals (void* a, void* b) {
 	gboolean result = FALSE;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	void* _tmp0_;
+	void* _tmp1_;
+	gint _tmp2_;
 #line 302 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = a;
 #line 302 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2263,11 +2263,11 @@ gboolean string_collated_equals (void* a, void* b) {
 
 gboolean string_precollated_equals (const gchar* astr, const gchar* akey, const gchar* bstr, const gchar* bkey) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gint _tmp4_;
 #line 306 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (astr != NULL, FALSE);
 #line 306 "/home/jens/Source/shotwell/src/util/string.vala"
diff --git a/src/util/system.c b/src/util/system.c
index e7ff262..d099120 100644
--- a/src/util/system.c
+++ b/src/util/system.c
@@ -1,4 +1,4 @@
-/* system.c generated by valac 0.34.7, the Vala compiler
+/* system.c generated by valac 0.36.6, the Vala compiler
  * generated from system.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -32,13 +32,13 @@ void show_file_in_nautilus (const gchar* filename, GError** error);
 GFile* get_sys_install_dir (GFile* exec_dir) {
 	GFile* result = NULL;
 	GFile* child = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
 #line 8 "/home/jens/Source/shotwell/src/util/system.vala"
 	g_return_val_if_fail (G_IS_FILE (exec_dir), NULL);
 #line 10 "/home/jens/Source/shotwell/src/util/system.vala"
@@ -62,7 +62,7 @@ GFile* get_sys_install_dir (GFile* exec_dir) {
 #line 12 "/home/jens/Source/shotwell/src/util/system.vala"
 	if (_tmp6_) {
 #line 65 "system.c"
-		GFile* _tmp7_ = NULL;
+		GFile* _tmp7_;
 #line 13 "/home/jens/Source/shotwell/src/util/system.vala"
 		_tmp7_ = g_file_new_for_path (RESOURCES_PREFIX);
 #line 13 "/home/jens/Source/shotwell/src/util/system.vala"
@@ -85,7 +85,7 @@ GFile* get_sys_install_dir (GFile* exec_dir) {
 
 gchar* get_nautilus_install_location (void) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 20 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp0_ = g_find_program_in_path ("nautilus");
 #line 20 "/home/jens/Source/shotwell/src/util/system.vala"
@@ -97,8 +97,8 @@ gchar* get_nautilus_install_location (void) {
 
 
 void sys_show_uri (GdkScreen* screen, const gchar* uri, GError** error) {
-	GdkScreen* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	GdkScreen* _tmp0_;
+	const gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 23 "/home/jens/Source/shotwell/src/util/system.vala"
 	g_return_if_fail (GDK_IS_SCREEN (screen));
@@ -122,13 +122,13 @@ void sys_show_uri (GdkScreen* screen, const gchar* uri, GError** error) {
 
 
 void show_file_in_nautilus (const gchar* filename, GError** error) {
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 27 "/home/jens/Source/shotwell/src/util/system.vala"
 	g_return_if_fail (filename != NULL);
diff --git a/src/util/ui.c b/src/util/ui.c
index e881e93..8a7e0d7 100644
--- a/src/util/ui.c
+++ b/src/util/ui.c
@@ -1,4 +1,4 @@
-/* ui.c generated by valac 0.34.7, the Vala compiler
+/* ui.c generated by valac 0.36.6, the Vala compiler
  * generated from ui.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -130,7 +130,7 @@ void spin_event_loop (void) {
 #line 39 "/home/jens/Source/shotwell/src/util/ui.vala"
 	while (TRUE) {
 #line 133 "ui.c"
-		gboolean _tmp0_ = FALSE;
+		gboolean _tmp0_;
 #line 39 "/home/jens/Source/shotwell/src/util/ui.vala"
 		_tmp0_ = gtk_events_pending ();
 #line 39 "/home/jens/Source/shotwell/src/util/ui.vala"
@@ -148,9 +148,9 @@ void spin_event_loop (void) {
 
 AdjustmentRelation get_adjustment_relation (GtkAdjustment* adjustment, gint value) {
 	AdjustmentRelation result = 0;
-	gint _tmp0_ = 0;
-	GtkAdjustment* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
+	gint _tmp0_;
+	GtkAdjustment* _tmp1_;
+	gdouble _tmp2_;
 #line 43 "/home/jens/Source/shotwell/src/util/ui.vala"
 	g_return_val_if_fail (GTK_IS_ADJUSTMENT (adjustment), 0);
 #line 44 "/home/jens/Source/shotwell/src/util/ui.vala"
@@ -167,11 +167,11 @@ AdjustmentRelation get_adjustment_relation (GtkAdjustment* adjustment, gint valu
 		return result;
 #line 169 "ui.c"
 	} else {
-		gint _tmp3_ = 0;
-		GtkAdjustment* _tmp4_ = NULL;
-		gdouble _tmp5_ = 0.0;
-		GtkAdjustment* _tmp6_ = NULL;
-		gdouble _tmp7_ = 0.0;
+		gint _tmp3_;
+		GtkAdjustment* _tmp4_;
+		gdouble _tmp5_;
+		GtkAdjustment* _tmp6_;
+		gdouble _tmp7_;
 #line 46 "/home/jens/Source/shotwell/src/util/ui.vala"
 		_tmp3_ = value;
 #line 46 "/home/jens/Source/shotwell/src/util/ui.vala"
@@ -202,14 +202,14 @@ AdjustmentRelation get_adjustment_relation (GtkAdjustment* adjustment, gint valu
 
 void get_adjustment_page (GtkAdjustment* hadj, GtkAdjustment* vadj, GdkRectangle* result) {
 	GdkRectangle rect = {0};
-	GtkAdjustment* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	GtkAdjustment* _tmp2_ = NULL;
-	gdouble _tmp3_ = 0.0;
-	GtkAdjustment* _tmp4_ = NULL;
-	gdouble _tmp5_ = 0.0;
-	GtkAdjustment* _tmp6_ = NULL;
-	gdouble _tmp7_ = 0.0;
+	GtkAdjustment* _tmp0_;
+	gdouble _tmp1_;
+	GtkAdjustment* _tmp2_;
+	gdouble _tmp3_;
+	GtkAdjustment* _tmp4_;
+	gdouble _tmp5_;
+	GtkAdjustment* _tmp6_;
+	gdouble _tmp7_;
 #line 52 "/home/jens/Source/shotwell/src/util/ui.vala"
 	g_return_if_fail (GTK_IS_ADJUSTMENT (hadj));
 #line 52 "/home/jens/Source/shotwell/src/util/ui.vala"
@@ -250,8 +250,8 @@ void get_adjustment_page (GtkAdjustment* hadj, GtkAdjustment* vadj, GdkRectangle
 
 gboolean has_only_key_modifier (GdkModifierType field, GdkModifierType mask) {
 	gboolean result = FALSE;
-	GdkModifierType _tmp0_ = 0;
-	GdkModifierType _tmp1_ = 0;
+	GdkModifierType _tmp0_;
+	GdkModifierType _tmp1_;
 #line 77 "/home/jens/Source/shotwell/src/util/ui.vala"
 	_tmp0_ = field;
 #line 77 "/home/jens/Source/shotwell/src/util/ui.vala"